From 74b04a01b71feddabe49b31d752556fa1583ee23 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Sun, 26 Apr 2020 15:13:23 +0100
Subject: [PATCH] New upstream version 1.43.0+dfsg1

---
 CONTRIBUTING.md                               |     3 +
 Cargo.lock                                    |   606 +-
 Cargo.toml                                    |     7 -
 RELEASES.md                                   |   162 +-
 config.toml.example                           |    16 +-
 git-commit-hash                               |     2 +-
 src/bootstrap/bin/rustc.rs                    |    11 +-
 src/bootstrap/bin/rustdoc.rs                  |     2 +-
 src/bootstrap/bootstrap.py                    |    17 +-
 src/bootstrap/builder.rs                      |    79 +-
 src/bootstrap/builder/tests.rs                |     1 -
 src/bootstrap/channel.rs                      |     2 +-
 src/bootstrap/compile.rs                      |    22 +-
 src/bootstrap/config.rs                       |    28 +-
 src/bootstrap/configure.py                    |    18 +-
 src/bootstrap/dist.rs                         |    16 +-
 src/bootstrap/doc.rs                          |     2 +-
 src/bootstrap/flags.rs                        |     4 +-
 src/bootstrap/format.rs                       |    13 +-
 src/bootstrap/install.rs                      |     5 +-
 src/bootstrap/lib.rs                          |    23 +-
 src/bootstrap/metadata.rs                     |     1 -
 src/bootstrap/native.rs                       |    28 +-
 src/bootstrap/sanity.rs                       |     9 +-
 src/bootstrap/test.rs                         |   125 +-
 src/bootstrap/tool.rs                         |     2 +-
 src/bootstrap/toolstate.rs                    |   202 +-
 src/bootstrap/util.rs                         |     2 +-
 src/ci/azure-pipelines/try.yml                |     2 +-
 src/ci/cpu-usage-over-time.py                 |     6 +-
 src/ci/docker/dist-various-2/Dockerfile       |     2 +-
 src/ci/docker/x86_64-gnu-tools/checktools.sh  |     2 +-
 src/ci/scripts/install-msys2-packages.sh      |     5 +-
 src/doc/book/.cargo/config                    |     3 +
 src/doc/book/.travis.yml                      |     2 +-
 .../2018-edition/src/ch18-02-refutability.md  |     2 +-
 src/doc/book/ADMIN_TASKS.md                   |   109 +
 src/doc/book/Cargo.lock                       |   251 +-
 src/doc/book/Cargo.toml                       |    20 +-
 src/doc/book/README.md                        |    14 -
 src/doc/book/ci/dictionary.txt                |     5 +
 .../listing-02-01/Cargo.lock                  |     6 +
 .../listing-02-01/Cargo.toml                  |     9 +
 .../listing-02-01/src/main.rs                 |    31 +
 .../listing-02-02/Cargo.lock                  |    87 +
 .../listing-02-02/Cargo.toml                  |    10 +
 .../listing-02-02/src/main.rs                 |    15 +
 .../listing-02-03/Cargo.lock                  |    87 +
 .../listing-02-03/Cargo.toml                  |    10 +
 .../listing-02-03/src/main.rs                 |    28 +
 .../listing-02-04/Cargo.lock                  |    87 +
 .../listing-02-04/Cargo.toml                  |    10 +
 .../listing-02-04/output.txt                  |    21 +
 .../listing-02-04/src/main.rs                 |    32 +
 .../listing-02-05/Cargo.lock                  |    87 +
 .../listing-02-05/Cargo.toml                  |    10 +
 .../listing-02-05/src/main.rs                 |    45 +
 .../listing-02-06/Cargo.lock                  |    87 +
 .../listing-02-06/Cargo.toml                  |    10 +
 .../listing-02-06/src/main.rs                 |    35 +
 .../no-listing-01-cargo-new/Cargo.lock        |     6 +
 .../no-listing-01-cargo-new/Cargo.toml        |     9 +
 .../no-listing-01-cargo-new/output.txt        |     5 +
 .../no-listing-01-cargo-new/src/main.rs       |     3 +
 .../no-listing-02-without-expect/Cargo.lock   |     6 +
 .../no-listing-02-without-expect/Cargo.toml   |     9 +
 .../no-listing-02-without-expect/output.txt   |    12 +
 .../no-listing-02-without-expect/src/main.rs  |    13 +
 .../Cargo.lock                                |    87 +
 .../Cargo.toml                                |    10 +
 .../src/main.rs                               |    33 +
 .../no-listing-04-looping/Cargo.lock          |    87 +
 .../no-listing-04-looping/Cargo.toml          |    10 +
 .../no-listing-04-looping/src/main.rs         |    40 +
 .../no-listing-05-quitting/Cargo.lock         |    87 +
 .../no-listing-05-quitting/Cargo.toml         |    10 +
 .../no-listing-05-quitting/src/main.rs        |    38 +
 .../listing-03-01/Cargo.lock                  |     6 +
 .../listing-03-01/Cargo.toml                  |     7 +
 .../listing-03-01/src/main.rs                 |     3 +
 .../listing-03-02/Cargo.lock                  |     6 +
 .../listing-03-02/Cargo.toml                  |     7 +
 .../listing-03-02/output.txt                  |     5 +
 .../listing-03-02/src/main.rs                 |     6 +
 .../listing-03-03/Cargo.lock                  |     6 +
 .../listing-03-03/Cargo.toml                  |     7 +
 .../listing-03-03/src/main.rs                 |    11 +
 .../listing-03-04/Cargo.lock                  |     6 +
 .../listing-03-04/Cargo.toml                  |     7 +
 .../listing-03-04/output.txt                  |     9 +
 .../listing-03-04/src/main.rs                 |    10 +
 .../listing-03-05/Cargo.lock                  |     6 +
 .../listing-03-05/Cargo.toml                  |     7 +
 .../listing-03-05/src/main.rs                 |     7 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    20 +
 .../src/main.rs                               |     6 +
 .../no-listing-02-adding-mut/Cargo.lock       |     6 +
 .../no-listing-02-adding-mut/Cargo.toml       |     7 +
 .../no-listing-02-adding-mut/output.txt       |     6 +
 .../no-listing-02-adding-mut/src/main.rs      |     6 +
 .../no-listing-03-shadowing/Cargo.lock        |     6 +
 .../no-listing-03-shadowing/Cargo.toml        |     7 +
 .../no-listing-03-shadowing/output.txt        |     5 +
 .../no-listing-03-shadowing/src/main.rs       |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    14 +
 .../src/main.rs                               |     6 +
 .../no-listing-06-floating-point/Cargo.lock   |     6 +
 .../no-listing-06-floating-point/Cargo.toml   |     7 +
 .../no-listing-06-floating-point/src/main.rs  |     5 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    16 +
 .../no-listing-08-boolean/Cargo.lock          |     6 +
 .../no-listing-08-boolean/Cargo.toml          |     7 +
 .../no-listing-08-boolean/src/main.rs         |     5 +
 .../no-listing-09-char/Cargo.lock             |     6 +
 .../no-listing-09-char/Cargo.toml             |     7 +
 .../no-listing-09-char/src/main.rs            |     5 +
 .../no-listing-10-tuples/Cargo.lock           |     6 +
 .../no-listing-10-tuples/Cargo.toml           |     7 +
 .../no-listing-10-tuples/src/main.rs          |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     7 +
 .../no-listing-12-tuple-indexing/Cargo.lock   |     6 +
 .../no-listing-12-tuple-indexing/Cargo.toml   |     7 +
 .../no-listing-12-tuple-indexing/src/main.rs  |     9 +
 .../no-listing-13-arrays/Cargo.lock           |     6 +
 .../no-listing-13-arrays/Cargo.toml           |     7 +
 .../no-listing-13-arrays/src/main.rs          |     3 +
 .../no-listing-14-array-indexing/Cargo.lock   |     6 +
 .../no-listing-14-array-indexing/Cargo.toml   |     7 +
 .../no-listing-14-array-indexing/src/main.rs  |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     6 +
 .../src/main.rs                               |     8 +
 .../no-listing-16-functions/Cargo.lock        |     6 +
 .../no-listing-16-functions/Cargo.toml        |     7 +
 .../no-listing-16-functions/output.txt        |     6 +
 .../no-listing-16-functions/src/main.rs       |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     5 +
 .../src/main.rs                               |     7 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     6 +
 .../src/main.rs                               |     8 +
 .../Cargo.lock                                |     4 +
 .../Cargo.toml                                |     7 +
 .../rustfmt-ignore                            |     1 +
 .../src/main.rs                               |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    10 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     5 +
 .../src/main.rs                               |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    18 +
 .../src/main.rs                               |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     4 +
 .../no-listing-26-if-true/Cargo.lock          |     6 +
 .../no-listing-26-if-true/Cargo.toml          |     7 +
 .../no-listing-26-if-true/output.txt          |     5 +
 .../no-listing-26-if-true/src/main.rs         |     9 +
 .../no-listing-27-if-false/Cargo.lock         |     6 +
 .../no-listing-27-if-false/Cargo.toml         |     7 +
 .../no-listing-27-if-false/output.txt         |     5 +
 .../no-listing-27-if-false/src/main.rs        |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    14 +
 .../src/main.rs                               |     7 +
 .../no-listing-29-if-not-equal-0/Cargo.lock   |     6 +
 .../no-listing-29-if-not-equal-0/Cargo.toml   |     7 +
 .../no-listing-29-if-not-equal-0/src/main.rs  |     7 +
 .../no-listing-30-else-if/Cargo.lock          |     6 +
 .../no-listing-30-else-if/Cargo.toml          |     7 +
 .../no-listing-30-else-if/output.txt          |     5 +
 .../no-listing-30-else-if/src/main.rs         |    13 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/main.rs                               |     7 +
 .../no-listing-32-loop/Cargo.lock             |     6 +
 .../no-listing-32-loop/Cargo.toml             |     7 +
 .../no-listing-32-loop/src/main.rs            |     5 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    13 +
 .../no-listing-34-for-range/Cargo.lock        |     6 +
 .../no-listing-34-for-range/Cargo.toml        |     7 +
 .../no-listing-34-for-range/src/main.rs       |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     9 +
 .../output.txt                                |    14 +
 .../src/main.rs                               |     3 +
 .../listing-04-01/Cargo.lock                  |     4 +
 .../listing-04-01/Cargo.toml                  |     7 +
 .../listing-04-01/rustfmt-ignore              |     3 +
 .../listing-04-01/src/main.rs                 |     9 +
 .../listing-04-02/Cargo.lock                  |     6 +
 .../listing-04-02/Cargo.toml                  |     7 +
 .../listing-04-02/src/main.rs                 |     6 +
 .../listing-04-03/Cargo.lock                  |     4 +
 .../listing-04-03/Cargo.toml                  |     7 +
 .../listing-04-03/rustfmt-ignore              |     3 +
 .../listing-04-03/src/main.rs                 |    23 +
 .../listing-04-04/Cargo.lock                  |     4 +
 .../listing-04-04/Cargo.toml                  |     7 +
 .../listing-04-04/rustfmt-ignore              |     3 +
 .../listing-04-04/src/main.rs                 |    29 +
 .../listing-04-05/Cargo.lock                  |     6 +
 .../listing-04-05/Cargo.toml                  |     7 +
 .../listing-04-05/src/main.rs                 |    13 +
 .../listing-04-06/Cargo.lock                  |     6 +
 .../listing-04-06/Cargo.toml                  |     7 +
 .../listing-04-06/output.txt                  |    16 +
 .../listing-04-06/src/main.rs                 |     9 +
 .../listing-04-07/Cargo.lock                  |     6 +
 .../listing-04-07/Cargo.toml                  |     7 +
 .../listing-04-07/src/main.rs                 |    21 +
 .../listing-04-08/Cargo.lock                  |     6 +
 .../listing-04-08/Cargo.toml                  |     7 +
 .../listing-04-08/src/main.rs                 |    24 +
 .../listing-04-09/Cargo.lock                  |     6 +
 .../listing-04-09/Cargo.toml                  |     7 +
 .../listing-04-09/src/main.rs                 |    31 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     9 +
 .../no-listing-02-string-scope/Cargo.lock     |     4 +
 .../no-listing-02-string-scope/Cargo.toml     |     7 +
 .../no-listing-02-string-scope/rustfmt-ignore |     3 +
 .../no-listing-02-string-scope/src/main.rs    |    10 +
 .../no-listing-03-string-move/Cargo.lock      |     6 +
 .../no-listing-03-string-move/Cargo.toml      |     7 +
 .../no-listing-03-string-move/src/main.rs     |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    19 +
 .../src/main.rs                               |     8 +
 .../no-listing-05-clone/Cargo.lock            |     6 +
 .../no-listing-05-clone/Cargo.toml            |     7 +
 .../no-listing-05-clone/src/main.rs           |     8 +
 .../no-listing-06-copy/Cargo.lock             |     6 +
 .../no-listing-06-copy/Cargo.toml             |     7 +
 .../no-listing-06-copy/src/main.rs            |     8 +
 .../no-listing-07-reference/Cargo.lock        |     6 +
 .../no-listing-07-reference/Cargo.toml        |     7 +
 .../no-listing-07-reference/src/main.rs       |    15 +
 .../Cargo.lock                                |     4 +
 .../Cargo.toml                                |     7 +
 .../rustfmt-ignore                            |     3 +
 .../src/main.rs                               |    14 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    19 +
 .../src/main.rs                               |    10 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    20 +
 .../src/main.rs                               |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    13 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/main.rs                               |     9 +
 .../Cargo.lock                                |     4 +
 .../Cargo.toml                                |     7 +
 .../rustfmt-ignore                            |     3 +
 .../src/main.rs                               |    13 +
 .../no-listing-16-no-dangle/Cargo.lock        |     6 +
 .../no-listing-16-no-dangle/Cargo.toml        |     7 +
 .../no-listing-16-no-dangle/src/main.rs       |    11 +
 .../no-listing-17-slice/Cargo.lock            |     6 +
 .../no-listing-17-slice/Cargo.toml            |     7 +
 .../no-listing-17-slice/src/main.rs           |     8 +
 .../no-listing-18-first-word-slice/Cargo.lock |     6 +
 .../no-listing-18-first-word-slice/Cargo.toml |     7 +
 .../src/main.rs                               |    15 +
 .../no-listing-19-slice-error/Cargo.lock      |     6 +
 .../no-listing-19-slice-error/Cargo.toml      |     7 +
 .../no-listing-19-slice-error/output.txt      |    20 +
 .../no-listing-19-slice-error/src/main.rs     |    23 +
 .../listing-05-01/Cargo.lock                  |     6 +
 .../listing-05-01/Cargo.toml                  |     7 +
 .../listing-05-01/src/main.rs                 |    10 +
 .../listing-05-02/Cargo.lock                  |     6 +
 .../listing-05-02/Cargo.toml                  |     7 +
 .../listing-05-02/src/main.rs                 |    17 +
 .../listing-05-03/Cargo.lock                  |     6 +
 .../listing-05-03/Cargo.toml                  |     7 +
 .../listing-05-03/src/main.rs                 |    19 +
 .../listing-05-04/Cargo.lock                  |     6 +
 .../listing-05-04/Cargo.toml                  |     7 +
 .../listing-05-04/src/main.rs                 |    24 +
 .../listing-05-05/Cargo.lock                  |     6 +
 .../listing-05-05/Cargo.toml                  |     7 +
 .../listing-05-05/src/main.rs                 |    24 +
 .../listing-05-06/Cargo.lock                  |     6 +
 .../listing-05-06/Cargo.toml                  |     7 +
 .../listing-05-06/src/main.rs                 |    24 +
 .../listing-05-07/Cargo.lock                  |     6 +
 .../listing-05-07/Cargo.toml                  |     7 +
 .../listing-05-07/src/main.rs                 |    23 +
 .../listing-05-08/Cargo.lock                  |     6 +
 .../listing-05-08/Cargo.toml                  |     7 +
 .../listing-05-08/output.txt                  |     5 +
 .../listing-05-08/src/main.rs                 |    17 +
 .../listing-05-09/Cargo.lock                  |     6 +
 .../listing-05-09/Cargo.toml                  |     7 +
 .../listing-05-09/src/main.rs                 |    12 +
 .../listing-05-10/Cargo.lock                  |     6 +
 .../listing-05-10/Cargo.toml                  |     7 +
 .../listing-05-10/src/main.rs                 |    20 +
 .../listing-05-11/Cargo.lock                  |     6 +
 .../listing-05-11/Cargo.toml                  |     7 +
 .../listing-05-11/output.txt                  |    18 +
 .../listing-05-11/src/main.rs                 |    13 +
 .../listing-05-12/Cargo.lock                  |     6 +
 .../listing-05-12/Cargo.toml                  |     7 +
 .../listing-05-12/output.txt                  |     5 +
 .../listing-05-12/src/main.rs                 |    14 +
 .../listing-05-13/Cargo.lock                  |     6 +
 .../listing-05-13/Cargo.toml                  |     7 +
 .../listing-05-13/src/main.rs                 |    23 +
 .../listing-05-14/Cargo.lock                  |     6 +
 .../listing-05-14/Cargo.toml                  |     7 +
 .../listing-05-14/src/main.rs                 |    17 +
 .../listing-05-15/Cargo.lock                  |     6 +
 .../listing-05-15/Cargo.toml                  |     7 +
 .../listing-05-15/src/main.rs                 |    35 +
 .../listing-05-16/Cargo.lock                  |     6 +
 .../listing-05-16/Cargo.toml                  |     7 +
 .../listing-05-16/src/main.rs                 |    37 +
 .../no-listing-01-tuple-structs/Cargo.lock    |     6 +
 .../no-listing-01-tuple-structs/Cargo.toml    |     7 +
 .../no-listing-01-tuple-structs/src/main.rs   |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     9 +
 .../output.txt                                |    20 +
 .../src/main.rs                               |    15 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    20 +
 .../output-only-01-debug/Cargo.lock           |     6 +
 .../output-only-01-debug/Cargo.toml           |     7 +
 .../output-only-01-debug/output.txt           |    18 +
 .../output-only-01-debug/src/main.rs          |    13 +
 .../output-only-02-pretty-debug/Cargo.lock    |     6 +
 .../output-only-02-pretty-debug/Cargo.toml    |     7 +
 .../output-only-02-pretty-debug/output.txt    |     8 +
 .../output-only-02-pretty-debug/src/main.rs   |    14 +
 .../listing-06-01/Cargo.lock                  |     6 +
 .../listing-06-01/Cargo.toml                  |     7 +
 .../listing-06-01/src/main.rs                 |    23 +
 .../listing-06-02/Cargo.lock                  |     6 +
 .../listing-06-02/Cargo.toml                  |     7 +
 .../listing-06-02/src/main.rs                 |    10 +
 .../listing-06-03/Cargo.lock                  |     6 +
 .../listing-06-03/Cargo.toml                  |     7 +
 .../listing-06-03/src/main.rs                 |    19 +
 .../listing-06-04/Cargo.lock                  |     6 +
 .../listing-06-04/Cargo.toml                  |     7 +
 .../listing-06-04/src/main.rs                 |    17 +
 .../listing-06-05/Cargo.lock                  |     6 +
 .../listing-06-05/Cargo.toml                  |     7 +
 .../listing-06-05/src/main.rs                 |    18 +
 .../listing-06-06/Cargo.lock                  |     6 +
 .../listing-06-06/Cargo.toml                  |     7 +
 .../listing-06-06/src/main.rs                 |     9 +
 .../no-listing-01-defining-enums/Cargo.lock   |     6 +
 .../no-listing-01-defining-enums/Cargo.toml   |     7 +
 .../no-listing-01-defining-enums/src/main.rs  |    22 +
 .../no-listing-02-enum-with-data/Cargo.lock   |     6 +
 .../no-listing-02-enum-with-data/Cargo.toml   |     7 +
 .../no-listing-02-enum-with-data/src/main.rs  |    12 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    12 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    11 +
 .../no-listing-05-methods-on-enums/Cargo.lock |     6 +
 .../no-listing-05-methods-on-enums/Cargo.toml |     7 +
 .../src/main.rs                               |    19 +
 .../no-listing-06-option-examples/Cargo.lock  |     6 +
 .../no-listing-06-option-examples/Cargo.toml  |     7 +
 .../no-listing-06-option-examples/src/main.rs |     8 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/main.rs                               |     8 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    22 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    31 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/main.rs                               |    13 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    12 +
 .../no-listing-12-if-let/Cargo.lock           |     6 +
 .../no-listing-12-if-let/Cargo.toml           |     7 +
 .../no-listing-12-if-let/src/main.rs          |     8 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    24 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    25 +
 .../listing-07-01/Cargo.lock                  |     6 +
 .../listing-07-01/Cargo.toml                  |     7 +
 .../listing-07-01/src/lib.rs                  |    19 +
 .../listing-07-03/Cargo.lock                  |     6 +
 .../listing-07-03/Cargo.toml                  |     7 +
 .../listing-07-03/output.txt                  |    20 +
 .../listing-07-03/src/lib.rs                  |    13 +
 .../listing-07-05/Cargo.lock                  |     6 +
 .../listing-07-05/Cargo.toml                  |     7 +
 .../listing-07-05/output.txt                  |    20 +
 .../listing-07-05/src/lib.rs                  |    13 +
 .../listing-07-07/Cargo.lock                  |     6 +
 .../listing-07-07/Cargo.toml                  |     7 +
 .../listing-07-07/src/lib.rs                  |    17 +
 .../listing-07-08/Cargo.lock                  |     6 +
 .../listing-07-08/Cargo.toml                  |     7 +
 .../listing-07-08/src/lib.rs                  |    14 +
 .../listing-07-09/Cargo.lock                  |     6 +
 .../listing-07-09/Cargo.toml                  |     7 +
 .../listing-07-09/src/lib.rs                  |    27 +
 .../listing-07-10/Cargo.lock                  |     6 +
 .../listing-07-10/Cargo.toml                  |     7 +
 .../listing-07-10/src/lib.rs                  |    11 +
 .../listing-07-11/Cargo.lock                  |     6 +
 .../listing-07-11/Cargo.toml                  |     7 +
 .../listing-07-11/src/lib.rs                  |    17 +
 .../listing-07-12/Cargo.lock                  |     6 +
 .../listing-07-12/Cargo.toml                  |     7 +
 .../listing-07-12/src/lib.rs                  |    17 +
 .../listing-07-13/Cargo.lock                  |     6 +
 .../listing-07-13/Cargo.toml                  |     7 +
 .../listing-07-13/src/lib.rs                  |    17 +
 .../listing-07-14/Cargo.lock                  |     6 +
 .../listing-07-14/Cargo.toml                  |     7 +
 .../listing-07-14/src/main.rs                 |     6 +
 .../listing-07-15/Cargo.lock                  |     6 +
 .../listing-07-15/Cargo.toml                  |     7 +
 .../listing-07-15/src/lib.rs                  |    18 +
 .../listing-07-16/Cargo.lock                  |     6 +
 .../listing-07-16/Cargo.toml                  |     7 +
 .../listing-07-16/src/lib.rs                  |    18 +
 .../listing-07-17/Cargo.lock                  |     6 +
 .../listing-07-17/Cargo.toml                  |     7 +
 .../listing-07-17/src/lib.rs                  |    17 +
 .../listing-07-18/Cargo.lock                  |    87 +
 .../listing-07-18/Cargo.toml                  |     8 +
 .../listing-07-18/src/main.rs                 |    32 +
 .../listing-07-19/Cargo.lock                  |     6 +
 .../listing-07-19/Cargo.toml                  |     7 +
 .../listing-07-19/src/lib.rs                  |     2 +
 .../listing-07-20/Cargo.lock                  |     6 +
 .../listing-07-20/Cargo.toml                  |     7 +
 .../listing-07-20/src/lib.rs                  |     1 +
 .../listing-07-21-and-22/Cargo.lock           |     6 +
 .../listing-07-21-and-22/Cargo.toml           |     7 +
 .../src/front_of_house.rs                     |     3 +
 .../listing-07-21-and-22/src/lib.rs           |     9 +
 .../no-listing-01-use-std-unnested/Cargo.lock |    87 +
 .../no-listing-01-use-std-unnested/Cargo.toml |    10 +
 .../src/main.rs                               |    31 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/front_of_house.rs                     |     1 +
 .../src/front_of_house/hosting.rs             |     1 +
 .../src/lib.rs                                |     9 +
 .../listing-08-01/Cargo.lock                  |     6 +
 .../listing-08-01/Cargo.toml                  |     7 +
 .../listing-08-01/src/main.rs                 |     5 +
 .../listing-08-02/Cargo.lock                  |     6 +
 .../listing-08-02/Cargo.toml                  |     7 +
 .../listing-08-02/src/main.rs                 |     5 +
 .../listing-08-03/Cargo.lock                  |     6 +
 .../listing-08-03/Cargo.toml                  |     7 +
 .../listing-08-03/src/main.rs                 |    10 +
 .../listing-08-04/Cargo.lock                  |     6 +
 .../listing-08-04/Cargo.toml                  |     7 +
 .../listing-08-04/src/main.rs                 |     9 +
 .../listing-08-05/Cargo.lock                  |     6 +
 .../listing-08-05/Cargo.toml                  |     7 +
 .../listing-08-05/src/main.rs                 |    13 +
 .../listing-08-06/Cargo.lock                  |     6 +
 .../listing-08-06/Cargo.toml                  |     7 +
 .../listing-08-06/src/main.rs                 |     8 +
 .../listing-08-07/Cargo.lock                  |     6 +
 .../listing-08-07/Cargo.toml                  |     7 +
 .../listing-08-07/output.txt                  |    20 +
 .../listing-08-07/src/main.rs                 |    11 +
 .../listing-08-08/Cargo.lock                  |     6 +
 .../listing-08-08/Cargo.toml                  |     7 +
 .../listing-08-08/src/main.rs                 |     8 +
 .../listing-08-09/Cargo.lock                  |     6 +
 .../listing-08-09/Cargo.toml                  |     7 +
 .../listing-08-09/src/main.rs                 |     8 +
 .../listing-08-10/Cargo.lock                  |     6 +
 .../listing-08-10/Cargo.toml                  |     7 +
 .../listing-08-10/src/main.rs                 |    15 +
 .../listing-08-11/Cargo.lock                  |     6 +
 .../listing-08-11/Cargo.toml                  |     7 +
 .../listing-08-11/src/main.rs                 |     5 +
 .../listing-08-12/Cargo.lock                  |     6 +
 .../listing-08-12/Cargo.toml                  |     7 +
 .../listing-08-12/src/main.rs                 |    10 +
 .../listing-08-13/Cargo.lock                  |     6 +
 .../listing-08-13/Cargo.toml                  |     7 +
 .../listing-08-13/src/main.rs                 |     5 +
 .../listing-08-14/Cargo.lock                  |     6 +
 .../listing-08-14/Cargo.toml                  |     7 +
 .../listing-08-14/src/main.rs                 |    19 +
 .../listing-08-15/Cargo.lock                  |     6 +
 .../listing-08-15/Cargo.toml                  |     7 +
 .../listing-08-15/src/main.rs                 |     6 +
 .../listing-08-16/Cargo.lock                  |     6 +
 .../listing-08-16/Cargo.toml                  |     7 +
 .../listing-08-16/src/main.rs                 |     8 +
 .../listing-08-17/Cargo.lock                  |     6 +
 .../listing-08-17/Cargo.toml                  |     7 +
 .../listing-08-17/src/main.rs                 |     6 +
 .../listing-08-18/Cargo.lock                  |     6 +
 .../listing-08-18/Cargo.toml                  |     7 +
 .../listing-08-18/src/main.rs                 |     7 +
 .../listing-08-19/Cargo.lock                  |     6 +
 .../listing-08-19/Cargo.toml                  |     7 +
 .../listing-08-19/output.txt                  |    16 +
 .../listing-08-19/src/main.rs                 |     6 +
 .../listing-08-20/Cargo.lock                  |     6 +
 .../listing-08-20/Cargo.toml                  |     7 +
 .../listing-08-20/src/main.rs                 |    10 +
 .../listing-08-21/Cargo.lock                  |     6 +
 .../listing-08-21/Cargo.toml                  |     7 +
 .../listing-08-21/src/main.rs                 |    11 +
 .../listing-08-22/Cargo.lock                  |     6 +
 .../listing-08-22/Cargo.toml                  |     7 +
 .../listing-08-22/src/main.rs                 |    13 +
 .../listing-08-23/Cargo.lock                  |     6 +
 .../listing-08-23/Cargo.toml                  |     7 +
 .../listing-08-23/src/main.rs                 |    13 +
 .../listing-08-24/Cargo.lock                  |     6 +
 .../listing-08-24/Cargo.toml                  |     7 +
 .../listing-08-24/src/main.rs                 |    12 +
 .../listing-08-25/Cargo.lock                  |     6 +
 .../listing-08-25/Cargo.toml                  |     7 +
 .../listing-08-25/src/main.rs                 |    13 +
 .../listing-08-26/Cargo.lock                  |     6 +
 .../listing-08-26/Cargo.toml                  |     7 +
 .../listing-08-26/src/main.rs                 |    16 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     9 +
 .../no-listing-02-format/Cargo.lock           |     6 +
 .../no-listing-02-format/Cargo.toml           |     7 +
 .../no-listing-02-format/src/main.rs          |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    14 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     6 +
 .../src/main.rs                               |     5 +
 .../listing-09-01/Cargo.lock                  |     6 +
 .../listing-09-01/Cargo.toml                  |     7 +
 .../listing-09-01/output.txt                  |     6 +
 .../listing-09-01/src/main.rs                 |     5 +
 .../listing-09-03/Cargo.lock                  |     6 +
 .../listing-09-03/Cargo.toml                  |     7 +
 .../listing-09-03/src/main.rs                 |     5 +
 .../listing-09-04/Cargo.lock                  |     6 +
 .../listing-09-04/Cargo.toml                  |     7 +
 .../listing-09-04/output.txt                  |     6 +
 .../listing-09-04/src/main.rs                 |    10 +
 .../listing-09-05/Cargo.lock                  |     6 +
 .../listing-09-05/Cargo.toml                  |     7 +
 .../listing-09-05/src/main.rs                 |    19 +
 .../listing-09-06/Cargo.lock                  |     6 +
 .../listing-09-06/Cargo.toml                  |     7 +
 .../listing-09-06/src/main.rs                 |    25 +
 .../listing-09-07/Cargo.lock                  |     6 +
 .../listing-09-07/Cargo.toml                  |     7 +
 .../listing-09-07/src/main.rs                 |    16 +
 .../listing-09-08/Cargo.lock                  |     6 +
 .../listing-09-08/Cargo.toml                  |     7 +
 .../listing-09-08/src/main.rs                 |    17 +
 .../listing-09-09/Cargo.lock                  |     6 +
 .../listing-09-09/Cargo.toml                  |     7 +
 .../listing-09-09/src/main.rs                 |    12 +
 .../listing-09-10/Cargo.lock                  |    87 +
 .../listing-09-10/Cargo.toml                  |     8 +
 .../listing-09-10/src/main.rs                 |    55 +
 .../no-listing-01-panic/Cargo.lock            |     6 +
 .../no-listing-01-panic/Cargo.toml            |     7 +
 .../no-listing-01-panic/output.txt            |     6 +
 .../no-listing-01-panic/src/main.rs           |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    19 +
 .../src/main.rs                               |     7 +
 .../no-listing-03-closures/Cargo.lock         |     6 +
 .../no-listing-03-closures/Cargo.toml         |     7 +
 .../no-listing-03-closures/src/main.rs        |    14 +
 .../no-listing-04-unwrap/Cargo.lock           |     6 +
 .../no-listing-04-unwrap/Cargo.toml           |     7 +
 .../no-listing-04-unwrap/src/main.rs          |     5 +
 .../no-listing-05-expect/Cargo.lock           |     6 +
 .../no-listing-05-expect/Cargo.toml           |     7 +
 .../no-listing-05-expect/src/main.rs          |     5 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    20 +
 .../src/main.rs                               |     5 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     8 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     7 +
 .../Cargo.lock                                |    87 +
 .../Cargo.toml                                |     8 +
 .../src/main.rs                               |    47 +
 .../listing-10-01/Cargo.lock                  |     6 +
 .../listing-10-01/Cargo.toml                  |     7 +
 .../listing-10-01/src/main.rs                 |    18 +
 .../listing-10-02/Cargo.lock                  |     6 +
 .../listing-10-02/Cargo.toml                  |     7 +
 .../listing-10-02/src/main.rs                 |    25 +
 .../listing-10-03/Cargo.lock                  |     6 +
 .../listing-10-03/Cargo.toml                  |     7 +
 .../listing-10-03/src/main.rs                 |    31 +
 .../listing-10-04/Cargo.lock                  |     6 +
 .../listing-10-04/Cargo.toml                  |     7 +
 .../listing-10-04/src/main.rs                 |    43 +
 .../listing-10-05/Cargo.lock                  |     6 +
 .../listing-10-05/Cargo.toml                  |     7 +
 .../listing-10-05/output.txt                  |    18 +
 .../listing-10-05/src/main.rs                 |    23 +
 .../listing-10-06/Cargo.lock                  |     6 +
 .../listing-10-06/Cargo.toml                  |     7 +
 .../listing-10-06/src/main.rs                 |     9 +
 .../listing-10-07/Cargo.lock                  |     6 +
 .../listing-10-07/Cargo.toml                  |     7 +
 .../listing-10-07/output.txt                  |    14 +
 .../listing-10-07/src/main.rs                 |     8 +
 .../listing-10-08/Cargo.lock                  |     6 +
 .../listing-10-08/Cargo.toml                  |     7 +
 .../listing-10-08/src/main.rs                 |    10 +
 .../listing-10-09/Cargo.lock                  |     6 +
 .../listing-10-09/Cargo.toml                  |     7 +
 .../listing-10-09/src/main.rs                 |    16 +
 .../listing-10-10/Cargo.lock                  |     6 +
 .../listing-10-10/Cargo.toml                  |     7 +
 .../listing-10-10/src/main.rs                 |    24 +
 .../listing-10-11/Cargo.lock                  |     6 +
 .../listing-10-11/Cargo.toml                  |     7 +
 .../listing-10-11/src/main.rs                 |    22 +
 .../listing-10-12/Cargo.lock                  |     6 +
 .../listing-10-12/Cargo.toml                  |     7 +
 .../listing-10-12/src/lib.rs                  |     3 +
 .../listing-10-13/Cargo.lock                  |     6 +
 .../listing-10-13/Cargo.toml                  |     7 +
 .../listing-10-13/src/lib.rs                  |    31 +
 .../listing-10-14/Cargo.lock                  |     6 +
 .../listing-10-14/Cargo.toml                  |     7 +
 .../listing-10-14/src/lib.rs                  |    29 +
 .../listing-10-15/Cargo.lock                  |     6 +
 .../listing-10-15/Cargo.toml                  |     7 +
 .../listing-10-15/src/main.rs                 |    23 +
 .../listing-10-16/Cargo.lock                  |     6 +
 .../listing-10-16/Cargo.toml                  |     7 +
 .../listing-10-16/src/lib.rs                  |    22 +
 .../listing-10-17/Cargo.lock                  |     6 +
 .../listing-10-17/Cargo.toml                  |     7 +
 .../listing-10-17/output.txt                  |    19 +
 .../listing-10-17/src/main.rs                 |    14 +
 .../listing-10-18/Cargo.lock                  |     4 +
 .../listing-10-18/Cargo.toml                  |     7 +
 .../listing-10-18/rustfmt-ignore              |     3 +
 .../listing-10-18/src/main.rs                 |    14 +
 .../listing-10-19/Cargo.lock                  |     4 +
 .../listing-10-19/Cargo.toml                  |     7 +
 .../listing-10-19/rustfmt-ignore              |     3 +
 .../listing-10-19/src/main.rs                 |    12 +
 .../listing-10-20/Cargo.lock                  |     6 +
 .../listing-10-20/Cargo.toml                  |     7 +
 .../listing-10-20/src/main.rs                 |     7 +
 .../listing-10-21/Cargo.lock                  |     6 +
 .../listing-10-21/Cargo.toml                  |     7 +
 .../listing-10-21/output.txt                  |    16 +
 .../listing-10-21/src/main.rs                 |    17 +
 .../listing-10-22/Cargo.lock                  |     6 +
 .../listing-10-22/Cargo.toml                  |     7 +
 .../listing-10-22/src/main.rs                 |    17 +
 .../listing-10-23/Cargo.lock                  |     6 +
 .../listing-10-23/Cargo.toml                  |     7 +
 .../listing-10-23/src/main.rs                 |    19 +
 .../listing-10-24/Cargo.lock                  |     6 +
 .../listing-10-24/Cargo.toml                  |     7 +
 .../listing-10-24/output.txt                  |    18 +
 .../listing-10-24/src/main.rs                 |    19 +
 .../listing-10-25/Cargo.lock                  |     6 +
 .../listing-10-25/Cargo.toml                  |     7 +
 .../listing-10-25/src/main.rs                 |    11 +
 .../listing-10-26/Cargo.lock                  |     6 +
 .../listing-10-26/Cargo.toml                  |     7 +
 .../listing-10-26/src/main.rs                 |    29 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    29 +
 .../src/main.rs                               |    16 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    27 +
 .../src/main.rs                               |    17 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    24 +
 .../src/main.rs                               |    16 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    35 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    42 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    56 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    29 +
 .../src/main.rs                               |    25 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    13 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    17 +
 .../src/main.rs                               |    14 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    28 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    31 +
 .../listing-11-01/Cargo.lock                  |     6 +
 .../listing-11-01/Cargo.toml                  |     7 +
 .../listing-11-01/output.txt                  |    16 +
 .../listing-11-01/src/lib.rs                  |    11 +
 .../listing-11-03/Cargo.lock                  |     6 +
 .../listing-11-03/Cargo.toml                  |     7 +
 .../listing-11-03/output.txt                  |    22 +
 .../listing-11-03/src/lib.rs                  |    16 +
 .../listing-11-05/Cargo.lock                  |     6 +
 .../listing-11-05/Cargo.toml                  |     7 +
 .../listing-11-05/src/lib.rs                  |    15 +
 .../listing-11-06/Cargo.lock                  |     6 +
 .../listing-11-06/Cargo.toml                  |     7 +
 .../listing-11-06/output.txt                  |    16 +
 .../listing-11-06/src/lib.rs                  |    34 +
 .../listing-11-07/Cargo.lock                  |     6 +
 .../listing-11-07/Cargo.toml                  |     7 +
 .../listing-11-07/output.txt                  |    16 +
 .../listing-11-07/src/lib.rs                  |    17 +
 .../listing-11-08/Cargo.lock                  |     6 +
 .../listing-11-08/Cargo.toml                  |     7 +
 .../listing-11-08/output.txt                  |    16 +
 .../listing-11-08/src/lib.rs                  |    28 +
 .../listing-11-09/Cargo.lock                  |     6 +
 .../listing-11-09/Cargo.toml                  |     7 +
 .../listing-11-09/src/lib.rs                  |    37 +
 .../listing-11-10/Cargo.lock                  |     6 +
 .../listing-11-10/Cargo.toml                  |     7 +
 .../listing-11-10/output.txt                  |    25 +
 .../listing-11-10/src/lib.rs                  |    21 +
 .../listing-11-11/Cargo.lock                  |     6 +
 .../listing-11-11/Cargo.toml                  |     7 +
 .../listing-11-11/output.txt                  |    18 +
 .../listing-11-11/src/lib.rs                  |    23 +
 .../listing-11-12/Cargo.lock                  |     6 +
 .../listing-11-12/Cargo.toml                  |     7 +
 .../listing-11-12/src/lib.rs                  |    21 +
 .../listing-11-13/Cargo.lock                  |     6 +
 .../listing-11-13/Cargo.toml                  |     7 +
 .../listing-11-13/output.txt                  |    23 +
 .../listing-11-13/src/lib.rs                  |    17 +
 .../listing-11-13/tests/integration_test.rs   |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/lib.rs                                |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    17 +
 .../src/lib.rs                                |    51 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    22 +
 .../src/lib.rs                                |    49 +
 .../no-listing-04-bug-in-add-two/Cargo.lock   |     6 +
 .../no-listing-04-bug-in-add-two/Cargo.toml   |     7 +
 .../no-listing-04-bug-in-add-two/output.txt   |    23 +
 .../no-listing-04-bug-in-add-two/src/lib.rs   |    17 +
 .../no-listing-05-greeter/Cargo.lock          |     6 +
 .../no-listing-05-greeter/Cargo.toml          |     7 +
 .../no-listing-05-greeter/src/lib.rs          |    18 +
 .../no-listing-06-greeter-with-bug/Cargo.lock |     6 +
 .../no-listing-06-greeter-with-bug/Cargo.toml |     7 +
 .../no-listing-06-greeter-with-bug/output.txt |    21 +
 .../no-listing-06-greeter-with-bug/src/lib.rs |    18 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    21 +
 .../src/lib.rs                                |    20 +
 .../no-listing-08-guess-with-bug/Cargo.lock   |     6 +
 .../no-listing-08-guess-with-bug/Cargo.toml   |     7 +
 .../no-listing-08-guess-with-bug/output.txt   |    19 +
 .../no-listing-08-guess-with-bug/src/lib.rs   |    29 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    23 +
 .../src/lib.rs                                |    34 +
 .../no-listing-10-result-in-tests/Cargo.lock  |     6 +
 .../no-listing-10-result-in-tests/Cargo.toml  |     7 +
 .../no-listing-10-result-in-tests/src/lib.rs  |    11 +
 .../no-listing-11-ignore-a-test/Cargo.lock    |     6 +
 .../no-listing-11-ignore-a-test/Cargo.toml    |     7 +
 .../no-listing-11-ignore-a-test/output.txt    |    17 +
 .../no-listing-11-ignore-a-test/src/lib.rs    |    14 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    29 +
 .../src/lib.rs                                |    17 +
 .../tests/common.rs                           |     3 +
 .../tests/integration_test.rs                 |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    17 +
 .../tests/common/mod.rs                       |     3 +
 .../tests/integration_test.rs                 |     9 +
 .../output-only-01-show-output/Cargo.lock     |     6 +
 .../output-only-01-show-output/Cargo.toml     |     7 +
 .../output-only-01-show-output/output.txt     |    34 +
 .../output-only-01-show-output/src/lib.rs     |    21 +
 .../output-only-02-single-test/Cargo.lock     |     6 +
 .../output-only-02-single-test/Cargo.toml     |     7 +
 .../output-only-02-single-test/output.txt     |    10 +
 .../output-only-02-single-test/src/lib.rs     |    23 +
 .../output-only-03-multiple-tests/Cargo.lock  |     6 +
 .../output-only-03-multiple-tests/Cargo.toml  |     7 +
 .../output-only-03-multiple-tests/output.txt  |    11 +
 .../output-only-03-multiple-tests/src/lib.rs  |    23 +
 .../output-only-04-running-ignored/Cargo.lock |     6 +
 .../output-only-04-running-ignored/Cargo.toml |     7 +
 .../output-only-04-running-ignored/output.txt |    16 +
 .../output-only-04-running-ignored/src/lib.rs |    14 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    10 +
 .../src/lib.rs                                |    17 +
 .../tests/integration_test.rs                 |     6 +
 .../listing-12-01/Cargo.lock                  |     6 +
 .../listing-12-01/Cargo.toml                  |     7 +
 .../listing-12-01/output.txt                  |     5 +
 .../listing-12-01/src/main.rs                 |     6 +
 .../listing-12-02/Cargo.lock                  |     6 +
 .../listing-12-02/Cargo.toml                  |     7 +
 .../listing-12-02/output.txt                  |     6 +
 .../listing-12-02/src/main.rs                 |    11 +
 .../listing-12-03/Cargo.lock                  |     6 +
 .../listing-12-03/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-03/poem.txt |     9 +
 .../listing-12-03/src/main.rs                 |    11 +
 .../listing-12-04/Cargo.lock                  |     6 +
 .../listing-12-04/Cargo.toml                  |     7 +
 .../listing-12-04/output.txt                  |    17 +
 .../ch12-an-io-project/listing-12-04/poem.txt |     9 +
 .../listing-12-04/src/main.rs                 |    22 +
 .../listing-12-05/Cargo.lock                  |     6 +
 .../listing-12-05/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-05/poem.txt |     9 +
 .../listing-12-05/src/main.rs                 |    29 +
 .../listing-12-06/Cargo.lock                  |     6 +
 .../listing-12-06/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-06/poem.txt |     9 +
 .../listing-12-06/src/main.rs                 |    34 +
 .../listing-12-07/Cargo.lock                  |     6 +
 .../listing-12-07/Cargo.toml                  |     7 +
 .../listing-12-07/output.txt                  |     6 +
 .../ch12-an-io-project/listing-12-07/poem.txt |     9 +
 .../listing-12-07/src/main.rs                 |    40 +
 .../listing-12-08/Cargo.lock                  |     6 +
 .../listing-12-08/Cargo.toml                  |     7 +
 .../listing-12-08/output.txt                  |     6 +
 .../ch12-an-io-project/listing-12-08/poem.txt |     9 +
 .../listing-12-08/src/main.rs                 |    38 +
 .../listing-12-09/Cargo.lock                  |     6 +
 .../listing-12-09/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-09/poem.txt |     9 +
 .../listing-12-09/src/main.rs                 |    36 +
 .../listing-12-10/Cargo.lock                  |     6 +
 .../listing-12-10/Cargo.toml                  |     7 +
 .../listing-12-10/output.txt                  |     5 +
 .../ch12-an-io-project/listing-12-10/poem.txt |     9 +
 .../listing-12-10/src/main.rs                 |    42 +
 .../listing-12-11/Cargo.lock                  |     6 +
 .../listing-12-11/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-11/poem.txt |     9 +
 .../listing-12-11/src/main.rs                 |    50 +
 .../listing-12-12/Cargo.lock                  |     6 +
 .../listing-12-12/Cargo.toml                  |     7 +
 .../listing-12-12/output.txt                  |    26 +
 .../ch12-an-io-project/listing-12-12/poem.txt |     9 +
 .../listing-12-12/src/main.rs                 |    51 +
 .../listing-12-13/Cargo.lock                  |     6 +
 .../listing-12-13/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-13/poem.txt |     9 +
 .../listing-12-13/src/lib.rs                  |    36 +
 .../listing-12-13/src/main.rs                 |    20 +
 .../listing-12-14/Cargo.lock                  |     6 +
 .../listing-12-14/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-14/poem.txt |     9 +
 .../listing-12-14/src/lib.rs                  |    28 +
 .../listing-12-14/src/main.rs                 |    30 +
 .../listing-12-15/Cargo.lock                  |     6 +
 .../listing-12-15/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-15/poem.txt |     9 +
 .../listing-12-15/src/lib.rs                  |    46 +
 .../listing-12-15/src/main.rs                 |    19 +
 .../listing-12-16/Cargo.lock                  |     6 +
 .../listing-12-16/Cargo.toml                  |     7 +
 .../listing-12-16/output.txt                  |    23 +
 .../ch12-an-io-project/listing-12-16/poem.txt |     9 +
 .../listing-12-16/src/lib.rs                  |    50 +
 .../listing-12-16/src/main.rs                 |    19 +
 .../listing-12-17/Cargo.lock                  |     6 +
 .../listing-12-17/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-17/poem.txt |     9 +
 .../listing-12-17/src/lib.rs                  |    50 +
 .../listing-12-17/src/main.rs                 |    19 +
 .../listing-12-18/Cargo.lock                  |     6 +
 .../listing-12-18/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-18/poem.txt |     9 +
 .../listing-12-18/src/lib.rs                  |    52 +
 .../listing-12-18/src/main.rs                 |    19 +
 .../listing-12-19/Cargo.lock                  |     6 +
 .../listing-12-19/Cargo.toml                  |     7 +
 .../listing-12-19/output.txt                  |    22 +
 .../ch12-an-io-project/listing-12-19/poem.txt |     9 +
 .../listing-12-19/src/lib.rs                  |    58 +
 .../listing-12-19/src/main.rs                 |    19 +
 .../listing-12-20/Cargo.lock                  |     6 +
 .../listing-12-20/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-20/poem.txt |     9 +
 .../listing-12-20/src/lib.rs                  |    78 +
 .../listing-12-20/src/main.rs                 |    19 +
 .../listing-12-21/Cargo.lock                  |     6 +
 .../listing-12-21/Cargo.toml                  |     7 +
 .../listing-12-21/output.txt                  |    23 +
 .../ch12-an-io-project/listing-12-21/poem.txt |     9 +
 .../listing-12-21/src/lib.rs                  |    94 +
 .../listing-12-21/src/main.rs                 |    19 +
 .../listing-12-22/Cargo.lock                  |     6 +
 .../listing-12-22/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-22/poem.txt |     9 +
 .../listing-12-22/src/lib.rs                  |   103 +
 .../listing-12-22/src/main.rs                 |    19 +
 .../listing-12-23/Cargo.lock                  |     6 +
 .../listing-12-23/Cargo.toml                  |     7 +
 .../listing-12-23/output.txt                  |     6 +
 .../ch12-an-io-project/listing-12-23/poem.txt |     9 +
 .../listing-12-23/src/lib.rs                  |   112 +
 .../listing-12-23/src/main.rs                 |    19 +
 .../listing-12-24/Cargo.lock                  |     6 +
 .../listing-12-24/Cargo.toml                  |     7 +
 .../ch12-an-io-project/listing-12-24/poem.txt |     9 +
 .../listing-12-24/src/lib.rs                  |   104 +
 .../listing-12-24/src/main.rs                 |    21 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../poem.txt                                  |     9 +
 .../src/main.rs                               |    54 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     5 +
 .../poem.txt                                  |     9 +
 .../src/lib.rs                                |    60 +
 .../src/main.rs                               |    19 +
 .../output-only-01-with-args/Cargo.lock       |     6 +
 .../output-only-01-with-args/Cargo.toml       |     7 +
 .../output-only-01-with-args/output.txt       |     5 +
 .../output-only-01-with-args/src/main.rs      |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../output-only-02-missing-lifetimes/poem.txt |     9 +
 .../src/lib.rs                                |    50 +
 .../src/main.rs                               |    19 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |     7 +
 .../output-only-03-multiple-matches/poem.txt  |     9 +
 .../src/lib.rs                                |    60 +
 .../src/main.rs                               |    19 +
 .../output-only-04-no-matches/Cargo.lock      |     6 +
 .../output-only-04-no-matches/Cargo.toml      |     7 +
 .../output-only-04-no-matches/output.txt      |     4 +
 .../output-only-04-no-matches/poem.txt        |     9 +
 .../output-only-04-no-matches/src/lib.rs      |    60 +
 .../output-only-04-no-matches/src/main.rs     |    19 +
 .../listing-12-23-reproduced/Cargo.lock       |     6 +
 .../listing-12-23-reproduced/Cargo.toml       |     7 +
 .../listing-12-23-reproduced/poem.txt         |     9 +
 .../listing-12-23-reproduced/src/lib.rs       |   108 +
 .../listing-12-23-reproduced/src/main.rs      |    19 +
 .../listing-12-24-reproduced/Cargo.lock       |     6 +
 .../listing-12-24-reproduced/Cargo.toml       |     7 +
 .../listing-12-24-reproduced/poem.txt         |     9 +
 .../listing-12-24-reproduced/src/lib.rs       |   104 +
 .../listing-12-24-reproduced/src/main.rs      |    25 +
 .../listing-13-01/Cargo.lock                  |     6 +
 .../listing-13-01/Cargo.toml                  |     7 +
 .../listing-13-01/src/main.rs                 |    12 +
 .../listing-13-02/Cargo.lock                  |     6 +
 .../listing-13-02/Cargo.toml                  |     7 +
 .../listing-13-02/src/main.rs                 |    19 +
 .../listing-13-03/Cargo.lock                  |     6 +
 .../listing-13-03/Cargo.toml                  |     7 +
 .../listing-13-03/src/main.rs                 |    39 +
 .../listing-13-04/Cargo.lock                  |     6 +
 .../listing-13-04/Cargo.toml                  |     7 +
 .../listing-13-04/src/main.rs                 |    32 +
 .../listing-13-05/Cargo.lock                  |     6 +
 .../listing-13-05/Cargo.toml                  |     7 +
 .../listing-13-05/src/main.rs                 |    33 +
 .../listing-13-06/Cargo.lock                  |     6 +
 .../listing-13-06/Cargo.toml                  |     7 +
 .../listing-13-06/src/main.rs                 |    33 +
 .../listing-13-07/Cargo.lock                  |     6 +
 .../listing-13-07/Cargo.toml                  |     7 +
 .../listing-13-07/src/main.rs                 |    33 +
 .../listing-13-08/Cargo.lock                  |     6 +
 .../listing-13-08/Cargo.toml                  |     7 +
 .../listing-13-08/output.txt                  |    17 +
 .../listing-13-08/src/main.rs                 |     8 +
 .../listing-13-09/Cargo.lock                  |     6 +
 .../listing-13-09/Cargo.toml                  |     7 +
 .../listing-13-09/src/main.rs                 |    11 +
 .../listing-13-10/Cargo.lock                  |     6 +
 .../listing-13-10/Cargo.toml                  |     7 +
 .../listing-13-10/src/main.rs                 |    34 +
 .../listing-13-11/Cargo.lock                  |     6 +
 .../listing-13-11/Cargo.toml                  |     7 +
 .../listing-13-11/src/main.rs                 |    64 +
 .../listing-13-12/Cargo.lock                  |     6 +
 .../listing-13-12/Cargo.toml                  |     7 +
 .../listing-13-12/src/main.rs                 |     9 +
 .../listing-13-13/Cargo.lock                  |     6 +
 .../listing-13-13/Cargo.toml                  |     7 +
 .../listing-13-13/src/main.rs                 |     7 +
 .../listing-13-14/Cargo.lock                  |     6 +
 .../listing-13-14/Cargo.toml                  |     7 +
 .../listing-13-14/src/main.rs                 |    11 +
 .../listing-13-15/Cargo.lock                  |     6 +
 .../listing-13-15/Cargo.toml                  |     7 +
 .../listing-13-15/src/lib.rs                  |    18 +
 .../listing-13-16/Cargo.lock                  |     6 +
 .../listing-13-16/Cargo.toml                  |     7 +
 .../listing-13-16/src/lib.rs                  |    17 +
 .../listing-13-17/Cargo.lock                  |     6 +
 .../listing-13-17/Cargo.toml                  |     7 +
 .../listing-13-17/output.txt                  |    13 +
 .../listing-13-17/src/main.rs                 |     7 +
 .../listing-13-18/Cargo.lock                  |     6 +
 .../listing-13-18/Cargo.toml                  |     7 +
 .../listing-13-18/src/main.rs                 |     9 +
 .../listing-13-19/Cargo.lock                  |     6 +
 .../listing-13-19/Cargo.toml                  |     7 +
 .../listing-13-19/src/lib.rs                  |    50 +
 .../listing-13-20/Cargo.lock                  |     6 +
 .../listing-13-20/Cargo.toml                  |     7 +
 .../listing-13-20/src/lib.rs                  |    11 +
 .../listing-13-21/Cargo.lock                  |     6 +
 .../listing-13-21/Cargo.toml                  |     7 +
 .../listing-13-21/src/lib.rs                  |    26 +
 .../listing-13-22/Cargo.lock                  |     6 +
 .../listing-13-22/Cargo.toml                  |     7 +
 .../listing-13-22/src/lib.rs                  |    43 +
 .../listing-13-23/Cargo.lock                  |     6 +
 .../listing-13-23/Cargo.toml                  |     7 +
 .../listing-13-23/src/lib.rs                  |    53 +
 .../listing-13-25/Cargo.lock                  |     6 +
 .../listing-13-25/Cargo.toml                  |     7 +
 .../listing-13-25/poem.txt                    |     9 +
 .../listing-13-25/src/lib.rs                  |   104 +
 .../listing-13-25/src/main.rs                 |    23 +
 .../listing-13-26/Cargo.lock                  |     6 +
 .../listing-13-26/Cargo.toml                  |     7 +
 .../listing-13-26/poem.txt                    |     9 +
 .../listing-13-26/src/lib.rs                  |   107 +
 .../listing-13-26/src/main.rs                 |    17 +
 .../listing-13-27/Cargo.lock                  |     6 +
 .../listing-13-27/Cargo.toml                  |     7 +
 .../listing-13-27/poem.txt                    |     9 +
 .../listing-13-27/src/lib.rs                  |   113 +
 .../listing-13-27/src/main.rs                 |    17 +
 .../listing-13-29/Cargo.lock                  |     6 +
 .../listing-13-29/Cargo.toml                  |     7 +
 .../listing-13-29/poem.txt                    |     9 +
 .../listing-13-29/src/lib.rs                  |   106 +
 .../listing-13-29/src/main.rs                 |    17 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    23 +
 .../src/lib.rs                                |    47 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/main.rs                               |    11 +
 .../no-listing-03-move-closures/Cargo.lock    |     6 +
 .../no-listing-03-move-closures/Cargo.toml    |     7 +
 .../no-listing-03-move-closures/output.txt    |    22 +
 .../no-listing-03-move-closures/src/main.rs   |    11 +
 .../listing-14-01/Cargo.lock                  |     6 +
 .../listing-14-01/Cargo.toml                  |     7 +
 .../listing-14-01/src/lib.rs                  |    13 +
 .../listing-14-02/Cargo.lock                  |     6 +
 .../listing-14-02/Cargo.toml                  |     7 +
 .../listing-14-02/src/lib.rs                  |    21 +
 .../listing-14-03/Cargo.lock                  |     6 +
 .../listing-14-03/Cargo.toml                  |     7 +
 .../listing-14-03/src/lib.rs                  |    36 +
 .../listing-14-04/Cargo.lock                  |     6 +
 .../listing-14-04/Cargo.toml                  |     7 +
 .../listing-14-04/src/lib.rs                  |    29 +
 .../listing-14-04/src/main.rs                 |     8 +
 .../listing-14-05/Cargo.lock                  |     6 +
 .../listing-14-05/Cargo.toml                  |     7 +
 .../listing-14-05/src/lib.rs                  |    41 +
 .../listing-14-06/Cargo.lock                  |     6 +
 .../listing-14-06/Cargo.toml                  |     7 +
 .../listing-14-06/src/lib.rs                  |    33 +
 .../listing-14-06/src/main.rs                 |    13 +
 .../listing-14-07/add/Cargo.lock              |    13 +
 .../listing-14-07/add/Cargo.toml              |     6 +
 .../listing-14-07/add/add-one/Cargo.toml      |     7 +
 .../listing-14-07/add/add-one/src/lib.rs      |     3 +
 .../listing-14-07/add/adder/Cargo.toml        |     9 +
 .../listing-14-07/add/adder/src/main.rs       |    10 +
 .../add/Cargo.lock                            |     6 +
 .../add/Cargo.toml                            |     5 +
 .../add/adder/Cargo.toml                      |     7 +
 .../add/adder/src/main.rs                     |     3 +
 .../add/Cargo.lock                            |    13 +
 .../add/Cargo.toml                            |     6 +
 .../add/add-one/Cargo.toml                    |     7 +
 .../add/add-one/src/lib.rs                    |     3 +
 .../add/adder/Cargo.toml                      |     9 +
 .../add/adder/src/main.rs                     |     3 +
 .../add/Cargo.lock                            |    94 +
 .../add/Cargo.toml                            |     6 +
 .../add/add-one/Cargo.toml                    |     8 +
 .../add/add-one/src/lib.rs                    |     5 +
 .../add/adder/Cargo.toml                      |     9 +
 .../add/adder/src/main.rs                     |    10 +
 .../add/Cargo.lock                            |    13 +
 .../add/Cargo.toml                            |     6 +
 .../add/add-one/Cargo.toml                    |     7 +
 .../add/add-one/src/lib.rs                    |    13 +
 .../add/adder/Cargo.toml                      |     9 +
 .../add/adder/src/main.rs                     |    10 +
 .../output-only-01-adder-crate/add/Cargo.toml |     5 +
 .../add/rustfmt-ignore                        |     2 +
 .../output-only-02-add-one/add/Cargo.lock     |    13 +
 .../output-only-02-add-one/add/Cargo.toml     |     6 +
 .../add/add-one/Cargo.toml                    |     9 +
 .../add/add-one/src/lib.rs                    |     7 +
 .../add/adder/Cargo.toml                      |     9 +
 .../add/adder/src/main.rs                     |     3 +
 .../output-only-03-use-rand/add/Cargo.lock    |    94 +
 .../output-only-03-use-rand/add/Cargo.toml    |     6 +
 .../add/add-one/Cargo.toml                    |     8 +
 .../add/add-one/src/lib.rs                    |     5 +
 .../add/adder/Cargo.toml                      |     9 +
 .../add/adder/src/main.rs                     |    11 +
 .../listing-15-01/Cargo.lock                  |     6 +
 .../listing-15-01/Cargo.toml                  |     7 +
 .../listing-15-01/src/main.rs                 |     4 +
 .../listing-15-02/Cargo.lock                  |     6 +
 .../listing-15-02/Cargo.toml                  |     7 +
 .../listing-15-02/src/main.rs                 |     8 +
 .../listing-15-03/Cargo.lock                  |     6 +
 .../listing-15-03/Cargo.toml                  |     7 +
 .../listing-15-03/output.txt                  |    28 +
 .../listing-15-03/src/main.rs                 |    12 +
 .../listing-15-05/Cargo.lock                  |     6 +
 .../listing-15-05/Cargo.toml                  |     7 +
 .../listing-15-05/src/main.rs                 |    10 +
 .../listing-15-06/Cargo.lock                  |     6 +
 .../listing-15-06/Cargo.toml                  |     7 +
 .../listing-15-06/src/main.rs                 |     7 +
 .../listing-15-07/Cargo.lock                  |     6 +
 .../listing-15-07/Cargo.toml                  |     7 +
 .../listing-15-07/src/main.rs                 |     7 +
 .../listing-15-08/Cargo.lock                  |     6 +
 .../listing-15-08/Cargo.toml                  |     7 +
 .../listing-15-08/src/main.rs                 |    11 +
 .../listing-15-09/Cargo.lock                  |     6 +
 .../listing-15-09/Cargo.toml                  |     7 +
 .../listing-15-09/output.txt                  |    14 +
 .../listing-15-09/src/main.rs                 |    17 +
 .../listing-15-10/Cargo.lock                  |     6 +
 .../listing-15-10/Cargo.toml                  |     7 +
 .../listing-15-10/src/main.rs                 |    27 +
 .../listing-15-11/Cargo.lock                  |     6 +
 .../listing-15-11/Cargo.toml                  |     7 +
 .../listing-15-11/src/main.rs                 |     7 +
 .../listing-15-12/Cargo.lock                  |     6 +
 .../listing-15-12/Cargo.toml                  |     7 +
 .../listing-15-12/src/main.rs                 |    28 +
 .../listing-15-13/Cargo.lock                  |     6 +
 .../listing-15-13/Cargo.toml                  |     7 +
 .../listing-15-13/src/main.rs                 |    28 +
 .../listing-15-14/Cargo.lock                  |     6 +
 .../listing-15-14/Cargo.toml                  |     7 +
 .../listing-15-14/output.txt                  |     7 +
 .../listing-15-14/src/main.rs                 |    19 +
 .../listing-15-15/Cargo.lock                  |     6 +
 .../listing-15-15/Cargo.toml                  |     7 +
 .../listing-15-15/output.txt                  |    14 +
 .../listing-15-15/src/main.rs                 |    20 +
 .../listing-15-16/Cargo.lock                  |     6 +
 .../listing-15-16/Cargo.toml                  |     7 +
 .../listing-15-16/output.txt                  |     7 +
 .../listing-15-16/src/main.rs                 |    20 +
 .../listing-15-17/Cargo.lock                  |     6 +
 .../listing-15-17/Cargo.toml                  |     7 +
 .../listing-15-17/output.txt                  |    18 +
 .../listing-15-17/src/main.rs                 |    12 +
 .../listing-15-18/Cargo.lock                  |     6 +
 .../listing-15-18/Cargo.toml                  |     7 +
 .../listing-15-18/src/main.rs                 |    13 +
 .../listing-15-19/Cargo.lock                  |     6 +
 .../listing-15-19/Cargo.toml                  |     7 +
 .../listing-15-19/output.txt                  |     8 +
 .../listing-15-19/src/main.rs                 |    21 +
 .../listing-15-20/Cargo.lock                  |     6 +
 .../listing-15-20/Cargo.toml                  |     7 +
 .../listing-15-20/src/lib.rs                  |    38 +
 .../listing-15-21/Cargo.lock                  |     6 +
 .../listing-15-21/Cargo.toml                  |     7 +
 .../listing-15-21/output.txt                  |    16 +
 .../listing-15-21/src/lib.rs                  |    73 +
 .../listing-15-22/Cargo.lock                  |     6 +
 .../listing-15-22/Cargo.toml                  |     7 +
 .../listing-15-22/src/lib.rs                  |    80 +
 .../listing-15-23/Cargo.lock                  |     6 +
 .../listing-15-23/Cargo.toml                  |     7 +
 .../listing-15-23/output.txt                  |    21 +
 .../listing-15-23/src/lib.rs                  |    78 +
 .../listing-15-24/Cargo.lock                  |     6 +
 .../listing-15-24/Cargo.toml                  |     7 +
 .../listing-15-24/output.txt                  |     7 +
 .../listing-15-24/src/main.rs                 |    24 +
 .../listing-15-25/Cargo.lock                  |     6 +
 .../listing-15-25/Cargo.toml                  |     7 +
 .../listing-15-25/src/main.rs                 |    20 +
 .../listing-15-26/Cargo.lock                  |     6 +
 .../listing-15-26/Cargo.toml                  |     7 +
 .../listing-15-26/output.txt                  |    11 +
 .../listing-15-26/src/main.rs                 |    44 +
 .../listing-15-27/Cargo.lock                  |     6 +
 .../listing-15-27/Cargo.toml                  |     7 +
 .../listing-15-27/src/main.rs                 |    24 +
 .../listing-15-28/Cargo.lock                  |     6 +
 .../listing-15-28/Cargo.toml                  |     7 +
 .../listing-15-28/src/main.rs                 |    33 +
 .../listing-15-29/Cargo.lock                  |     6 +
 .../listing-15-29/Cargo.toml                  |     7 +
 .../listing-15-29/src/main.rs                 |    54 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/main.rs                               |     4 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    17 +
 .../src/main.rs                               |     7 +
 .../listing-16-01/Cargo.lock                  |     6 +
 .../listing-16-01/Cargo.toml                  |     7 +
 .../listing-16-01/src/main.rs                 |    16 +
 .../listing-16-02/Cargo.lock                  |     6 +
 .../listing-16-02/Cargo.toml                  |     7 +
 .../listing-16-02/src/main.rs                 |    18 +
 .../listing-16-03/Cargo.lock                  |     6 +
 .../listing-16-03/Cargo.toml                  |     7 +
 .../listing-16-03/output.txt                  |    29 +
 .../listing-16-03/src/main.rs                 |    11 +
 .../listing-16-04/Cargo.lock                  |     6 +
 .../listing-16-04/Cargo.toml                  |     7 +
 .../listing-16-04/src/main.rs                 |    13 +
 .../listing-16-05/Cargo.lock                  |     6 +
 .../listing-16-05/Cargo.toml                  |     7 +
 .../listing-16-05/src/main.rs                 |    11 +
 .../listing-16-06/Cargo.lock                  |     6 +
 .../listing-16-06/Cargo.toml                  |     7 +
 .../listing-16-06/src/main.rs                 |     5 +
 .../listing-16-07/Cargo.lock                  |     6 +
 .../listing-16-07/Cargo.toml                  |     7 +
 .../listing-16-07/src/main.rs                 |    11 +
 .../listing-16-08/Cargo.lock                  |     6 +
 .../listing-16-08/Cargo.toml                  |     7 +
 .../listing-16-08/src/main.rs                 |    14 +
 .../listing-16-09/Cargo.lock                  |     6 +
 .../listing-16-09/Cargo.toml                  |     7 +
 .../listing-16-09/output.txt                  |    18 +
 .../listing-16-09/src/main.rs                 |    15 +
 .../listing-16-10/Cargo.lock                  |     6 +
 .../listing-16-10/Cargo.toml                  |     7 +
 .../listing-16-10/src/main.rs                 |    25 +
 .../listing-16-11/Cargo.lock                  |     6 +
 .../listing-16-11/Cargo.toml                  |     7 +
 .../listing-16-11/src/main.rs                 |    46 +
 .../listing-16-12/Cargo.lock                  |     6 +
 .../listing-16-12/Cargo.toml                  |     7 +
 .../listing-16-12/src/main.rs                 |    12 +
 .../listing-16-13/Cargo.lock                  |     6 +
 .../listing-16-13/Cargo.toml                  |     7 +
 .../listing-16-13/output.txt                  |    19 +
 .../listing-16-13/src/main.rs                 |    22 +
 .../listing-16-14/Cargo.lock                  |     6 +
 .../listing-16-14/Cargo.toml                  |     7 +
 .../listing-16-14/output.txt                  |    17 +
 .../listing-16-14/src/main.rs                 |    24 +
 .../listing-16-15/Cargo.lock                  |     6 +
 .../listing-16-15/Cargo.toml                  |     7 +
 .../listing-16-15/src/main.rs                 |    23 +
 .../no-listing-01-join-too-early/Cargo.lock   |     6 +
 .../no-listing-01-join-too-early/Cargo.toml   |     7 +
 .../no-listing-01-join-too-early/src/main.rs  |    18 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    27 +
 .../output-only-01-move-drop/Cargo.lock       |     6 +
 .../output-only-01-move-drop/Cargo.toml       |     7 +
 .../output-only-01-move-drop/output.txt       |    22 +
 .../output-only-01-move-drop/src/main.rs      |    13 +
 .../ch17-oop/listing-17-01/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-01/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-01/src/lib.rs         |     4 +
 .../ch17-oop/listing-17-02/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-02/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-02/src/lib.rs         |    33 +
 .../ch17-oop/listing-17-03/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-03/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-03/src/lib.rs         |     3 +
 .../ch17-oop/listing-17-04/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-04/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-04/src/lib.rs         |     9 +
 .../ch17-oop/listing-17-05/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-05/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-05/src/lib.rs         |    17 +
 .../ch17-oop/listing-17-06/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-06/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-06/src/lib.rs         |    20 +
 .../ch17-oop/listing-17-07/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-07/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-07/src/lib.rs         |    31 +
 .../ch17-oop/listing-17-08/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-08/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-08/src/lib.rs         |    27 +
 .../ch17-oop/listing-17-08/src/main.rs        |    17 +
 .../ch17-oop/listing-17-09/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-09/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-09/src/lib.rs         |    27 +
 .../ch17-oop/listing-17-09/src/main.rs        |    40 +
 .../ch17-oop/listing-17-10/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-10/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-10/output.txt         |    16 +
 .../ch17-oop/listing-17-10/src/lib.rs         |    27 +
 .../ch17-oop/listing-17-10/src/main.rs        |     9 +
 .../ch17-oop/listing-17-11/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-11/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-11/src/main.rs        |    20 +
 .../ch17-oop/listing-17-12/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-12/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-12/src/lib.rs         |    19 +
 .../ch17-oop/listing-17-12/src/main.rs        |    14 +
 .../ch17-oop/listing-17-13/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-13/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-13/src/lib.rs         |    30 +
 .../ch17-oop/listing-17-13/src/main.rs        |    14 +
 .../ch17-oop/listing-17-14/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-14/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-14/src/lib.rs         |    34 +
 .../ch17-oop/listing-17-14/src/main.rs        |    14 +
 .../ch17-oop/listing-17-15/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-15/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-15/src/lib.rs         |    54 +
 .../ch17-oop/listing-17-15/src/main.rs        |    14 +
 .../ch17-oop/listing-17-16/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-16/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-16/src/lib.rs         |    85 +
 .../ch17-oop/listing-17-16/src/main.rs        |    14 +
 .../ch17-oop/listing-17-17/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-17/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-17/src/lib.rs         |    82 +
 .../ch17-oop/listing-17-17/src/main.rs        |    14 +
 .../ch17-oop/listing-17-18/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-18/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-18/src/lib.rs         |    94 +
 .../ch17-oop/listing-17-18/src/main.rs        |    14 +
 .../ch17-oop/listing-17-19/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-19/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-19/src/lib.rs         |    25 +
 .../ch17-oop/listing-17-20/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-20/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-20/src/lib.rs         |    48 +
 .../ch17-oop/listing-17-21/Cargo.lock         |     6 +
 .../ch17-oop/listing-17-21/Cargo.toml         |     7 +
 .../ch17-oop/listing-17-21/src/lib.rs         |    43 +
 .../ch17-oop/listing-17-21/src/main.rs        |    13 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    16 +
 .../src/lib.rs                                |     3 +
 .../listing-18-01/Cargo.lock                  |     6 +
 .../listing-18-01/Cargo.toml                  |     7 +
 .../listing-18-01/src/main.rs                 |    19 +
 .../listing-18-02/Cargo.lock                  |     6 +
 .../listing-18-02/Cargo.toml                  |     7 +
 .../listing-18-02/src/main.rs                 |    13 +
 .../listing-18-03/Cargo.lock                  |     6 +
 .../listing-18-03/Cargo.toml                  |     7 +
 .../listing-18-03/output.txt                  |     7 +
 .../listing-18-03/src/main.rs                 |     9 +
 .../listing-18-04/Cargo.lock                  |     6 +
 .../listing-18-04/Cargo.toml                  |     7 +
 .../listing-18-04/src/main.rs                 |     5 +
 .../listing-18-05/Cargo.lock                  |     6 +
 .../listing-18-05/Cargo.toml                  |     7 +
 .../listing-18-05/output.txt                  |    17 +
 .../listing-18-05/src/main.rs                 |     5 +
 .../listing-18-06/Cargo.lock                  |     6 +
 .../listing-18-06/Cargo.toml                  |     7 +
 .../listing-18-06/src/main.rs                 |     7 +
 .../listing-18-07/Cargo.lock                  |     6 +
 .../listing-18-07/Cargo.toml                  |     7 +
 .../listing-18-07/src/main.rs                 |     8 +
 .../listing-18-08/Cargo.lock                  |     6 +
 .../listing-18-08/Cargo.toml                  |     7 +
 .../listing-18-08/output.txt                  |    21 +
 .../listing-18-08/src/main.rs                 |     6 +
 .../listing-18-09/Cargo.lock                  |     6 +
 .../listing-18-09/Cargo.toml                  |     7 +
 .../listing-18-09/src/main.rs                 |     8 +
 .../listing-18-10/Cargo.lock                  |     6 +
 .../listing-18-10/Cargo.toml                  |     7 +
 .../listing-18-10/output.txt                  |    15 +
 .../listing-18-10/src/main.rs                 |     7 +
 .../listing-18-11/Cargo.lock                  |     6 +
 .../listing-18-11/Cargo.toml                  |     7 +
 .../listing-18-11/src/main.rs                 |    14 +
 .../listing-18-12/Cargo.lock                  |     6 +
 .../listing-18-12/Cargo.toml                  |     7 +
 .../listing-18-12/src/main.rs                 |    12 +
 .../listing-18-13/Cargo.lock                  |     6 +
 .../listing-18-13/Cargo.toml                  |     7 +
 .../listing-18-13/src/main.rs                 |    12 +
 .../listing-18-14/Cargo.lock                  |     6 +
 .../listing-18-14/Cargo.toml                  |     7 +
 .../listing-18-14/src/main.rs                 |    16 +
 .../listing-18-15/Cargo.lock                  |     6 +
 .../listing-18-15/Cargo.toml                  |     7 +
 .../listing-18-15/src/main.rs                 |    27 +
 .../listing-18-16/Cargo.lock                  |     6 +
 .../listing-18-16/Cargo.toml                  |     7 +
 .../listing-18-16/src/main.rs                 |    27 +
 .../listing-18-17/Cargo.lock                  |     6 +
 .../listing-18-17/Cargo.toml                  |     7 +
 .../listing-18-17/src/main.rs                 |     7 +
 .../listing-18-18/Cargo.lock                  |     6 +
 .../listing-18-18/Cargo.toml                  |     7 +
 .../listing-18-18/src/main.rs                 |    17 +
 .../listing-18-19/Cargo.lock                  |     6 +
 .../listing-18-19/Cargo.toml                  |     7 +
 .../listing-18-19/src/main.rs                 |    11 +
 .../listing-18-20/Cargo.lock                  |     6 +
 .../listing-18-20/Cargo.toml                  |     7 +
 .../listing-18-20/src/main.rs                 |     4 +
 .../listing-18-21/Cargo.lock                  |     6 +
 .../listing-18-21/Cargo.toml                  |     7 +
 .../listing-18-21/src/main.rs                 |    11 +
 .../listing-18-22/Cargo.lock                  |     6 +
 .../listing-18-22/Cargo.toml                  |     7 +
 .../listing-18-22/src/main.rs                 |    11 +
 .../listing-18-23/Cargo.lock                  |     6 +
 .../listing-18-23/Cargo.toml                  |     7 +
 .../listing-18-23/src/main.rs                 |    15 +
 .../listing-18-24/Cargo.lock                  |     6 +
 .../listing-18-24/Cargo.toml                  |     7 +
 .../listing-18-24/src/main.rs                 |     9 +
 .../listing-18-25/Cargo.lock                  |     4 +
 .../listing-18-25/Cargo.toml                  |     7 +
 .../listing-18-25/output.txt                  |    15 +
 .../listing-18-25/rustfmt-ignore              |     1 +
 .../listing-18-25/src/main.rs                 |     9 +
 .../listing-18-26/Cargo.lock                  |     6 +
 .../listing-18-26/Cargo.toml                  |     7 +
 .../listing-18-26/src/main.rs                 |    11 +
 .../listing-18-27/Cargo.lock                  |     6 +
 .../listing-18-27/Cargo.toml                  |     7 +
 .../listing-18-27/src/main.rs                 |    12 +
 .../listing-18-28/Cargo.lock                  |     6 +
 .../listing-18-28/Cargo.toml                  |     7 +
 .../listing-18-28/src/main.rs                 |    11 +
 .../listing-18-29/Cargo.lock                  |     6 +
 .../listing-18-29/Cargo.toml                  |     7 +
 .../listing-18-29/src/main.rs                 |    19 +
 .../no-listing-01-literals/Cargo.lock         |     6 +
 .../no-listing-01-literals/Cargo.toml         |     7 +
 .../no-listing-01-literals/src/main.rs        |    12 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    11 +
 .../no-listing-03-ranges/Cargo.lock           |     6 +
 .../no-listing-03-ranges/Cargo.toml           |     7 +
 .../no-listing-03-ranges/src/main.rs          |    10 +
 .../no-listing-04-ranges-of-char/Cargo.lock   |     6 +
 .../no-listing-04-ranges-of-char/Cargo.toml   |     7 +
 .../no-listing-04-ranges-of-char/src/main.rs  |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    10 +
 .../listing-13-21-reproduced/Cargo.lock       |     6 +
 .../listing-13-21-reproduced/Cargo.toml       |     7 +
 .../listing-13-21-reproduced/src/lib.rs       |    27 +
 .../listing-19-01/Cargo.lock                  |     6 +
 .../listing-19-01/Cargo.toml                  |     7 +
 .../listing-19-01/src/main.rs                 |     8 +
 .../listing-19-02/Cargo.lock                  |     6 +
 .../listing-19-02/Cargo.toml                  |     7 +
 .../listing-19-02/src/main.rs                 |     6 +
 .../listing-19-03/Cargo.lock                  |     6 +
 .../listing-19-03/Cargo.toml                  |     7 +
 .../listing-19-03/src/main.rs                 |    13 +
 .../listing-19-04/Cargo.lock                  |     6 +
 .../listing-19-04/Cargo.toml                  |     7 +
 .../listing-19-04/src/main.rs                 |    12 +
 .../listing-19-05/Cargo.lock                  |     6 +
 .../listing-19-05/Cargo.toml                  |     7 +
 .../listing-19-05/output.txt                  |    21 +
 .../listing-19-05/src/main.rs                 |    14 +
 .../listing-19-06/Cargo.lock                  |     6 +
 .../listing-19-06/Cargo.toml                  |     7 +
 .../listing-19-06/src/main.rs                 |    22 +
 .../listing-19-07/Cargo.lock                  |     6 +
 .../listing-19-07/Cargo.toml                  |     7 +
 .../listing-19-07/src/main.rs                 |    10 +
 .../listing-19-08/Cargo.lock                  |     6 +
 .../listing-19-08/Cargo.toml                  |     7 +
 .../listing-19-08/src/main.rs                 |     9 +
 .../listing-19-09/Cargo.lock                  |     6 +
 .../listing-19-09/Cargo.toml                  |     7 +
 .../listing-19-09/src/main.rs                 |     5 +
 .../listing-19-10/Cargo.lock                  |     6 +
 .../listing-19-10/Cargo.toml                  |     7 +
 .../listing-19-10/src/main.rs                 |    15 +
 .../listing-19-11/Cargo.lock                  |     6 +
 .../listing-19-11/Cargo.toml                  |     7 +
 .../listing-19-11/src/main.rs                 |     9 +
 .../listing-19-12/Cargo.lock                  |     6 +
 .../listing-19-12/Cargo.toml                  |     7 +
 .../listing-19-12/src/lib.rs                  |     5 +
 .../listing-19-13/Cargo.lock                  |     6 +
 .../listing-19-13/Cargo.toml                  |     7 +
 .../listing-19-13/src/lib.rs                  |     3 +
 .../listing-19-14/Cargo.lock                  |     6 +
 .../listing-19-14/Cargo.toml                  |     7 +
 .../listing-19-14/src/main.rs                 |    25 +
 .../listing-19-15/Cargo.lock                  |     6 +
 .../listing-19-15/Cargo.toml                  |     7 +
 .../listing-19-15/src/lib.rs                  |    12 +
 .../listing-19-16/Cargo.lock                  |     6 +
 .../listing-19-16/Cargo.toml                  |     7 +
 .../listing-19-16/src/main.rs                 |    31 +
 .../listing-19-17/Cargo.lock                  |     6 +
 .../listing-19-17/Cargo.toml                  |     7 +
 .../listing-19-17/src/main.rs                 |    34 +
 .../listing-19-18/Cargo.lock                  |     6 +
 .../listing-19-18/Cargo.toml                  |     7 +
 .../listing-19-18/output.txt                  |     7 +
 .../listing-19-18/src/main.rs                 |    36 +
 .../listing-19-19/Cargo.lock                  |     6 +
 .../listing-19-19/Cargo.toml                  |     7 +
 .../listing-19-19/output.txt                  |     5 +
 .../listing-19-19/src/main.rs                 |    21 +
 .../listing-19-20/Cargo.lock                  |     6 +
 .../listing-19-20/Cargo.toml                  |     7 +
 .../listing-19-20/output.txt                  |    19 +
 .../listing-19-20/src/main.rs                 |    23 +
 .../listing-19-21/Cargo.lock                  |     6 +
 .../listing-19-21/Cargo.toml                  |     7 +
 .../listing-19-21/output.txt                  |     5 +
 .../listing-19-21/src/main.rs                 |    23 +
 .../listing-19-22/Cargo.lock                  |     6 +
 .../listing-19-22/Cargo.toml                  |     7 +
 .../listing-19-22/src/main.rs                 |    17 +
 .../listing-19-23/Cargo.lock                  |     6 +
 .../listing-19-23/Cargo.toml                  |     7 +
 .../listing-19-23/src/main.rs                 |    14 +
 .../listing-19-24/Cargo.lock                  |     6 +
 .../listing-19-24/Cargo.toml                  |     7 +
 .../listing-19-24/src/main.rs                 |    16 +
 .../listing-19-25/Cargo.lock                  |     6 +
 .../listing-19-25/Cargo.toml                  |     7 +
 .../listing-19-25/src/main.rs                 |    18 +
 .../listing-19-27/Cargo.lock                  |     6 +
 .../listing-19-27/Cargo.toml                  |     7 +
 .../listing-19-27/src/main.rs                 |    13 +
 .../listing-19-28/Cargo.lock                  |     6 +
 .../listing-19-28/Cargo.toml                  |     7 +
 .../listing-19-28/src/lib.rs                  |    12 +
 .../listing-19-30/Cargo.lock                  |     6 +
 .../listing-19-30/Cargo.toml                  |     7 +
 .../listing-19-30/src/main.rs                 |     9 +
 .../listing-19-31/hello_macro/Cargo.lock      |     6 +
 .../listing-19-31/hello_macro/Cargo.toml      |     7 +
 .../hello_macro/hello_macro_derive/Cargo.lock |    46 +
 .../hello_macro/hello_macro_derive/Cargo.toml |    12 +
 .../hello_macro/hello_macro_derive/src/lib.rs |    15 +
 .../listing-19-31/hello_macro/src/lib.rs      |     3 +
 .../listing-19-31/hello_macro/src/main.rs     |    13 +
 .../listing-19-33/hello_macro/Cargo.lock      |     6 +
 .../listing-19-33/hello_macro/Cargo.toml      |     7 +
 .../hello_macro/hello_macro_derive/Cargo.lock |    46 +
 .../hello_macro/hello_macro_derive/Cargo.toml |    12 +
 .../hello_macro/hello_macro_derive/src/lib.rs |    29 +
 .../listing-19-33/hello_macro/src/lib.rs      |     3 +
 .../listing-19-33/hello_macro/src/main.rs     |    13 +
 .../no-listing-01-unsafe-fn/Cargo.lock        |     6 +
 .../no-listing-01-unsafe-fn/Cargo.toml        |     7 +
 .../no-listing-01-unsafe-fn/src/main.rs       |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../output.txt                                |    17 +
 .../src/main.rs                               |    27 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |    33 +
 .../no-listing-04-kilometers-alias/Cargo.lock |     6 +
 .../no-listing-04-kilometers-alias/Cargo.toml |     7 +
 .../src/main.rs                               |    12 +
 .../no-listing-05-write-trait/Cargo.lock      |     6 +
 .../no-listing-05-write-trait/Cargo.toml      |     7 +
 .../no-listing-05-write-trait/src/lib.rs      |    10 +
 .../no-listing-06-result-alias/Cargo.lock     |     6 +
 .../no-listing-06-result-alias/Cargo.toml     |     7 +
 .../no-listing-06-result-alias/src/lib.rs     |    17 +
 .../no-listing-07-never-type/Cargo.lock       |     6 +
 .../no-listing-07-never-type/Cargo.toml       |     7 +
 .../no-listing-07-never-type/src/lib.rs       |    10 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     9 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |    17 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/main.rs                               |     9 +
 .../no-listing-11-cant-create-str/Cargo.lock  |     6 +
 .../no-listing-11-cant-create-str/Cargo.toml  |     7 +
 .../no-listing-11-cant-create-str/src/main.rs |     6 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |     3 +
 .../no-listing-15-map-closure/Cargo.lock      |     6 +
 .../no-listing-15-map-closure/Cargo.toml      |     7 +
 .../no-listing-15-map-closure/src/main.rs     |     7 +
 .../no-listing-16-map-function/Cargo.lock     |     6 +
 .../no-listing-16-map-function/Cargo.toml     |     7 +
 .../no-listing-16-map-function/src/main.rs    |     7 +
 .../no-listing-17-map-initializer/Cargo.lock  |     6 +
 .../no-listing-17-map-initializer/Cargo.toml  |     7 +
 .../no-listing-17-map-initializer/src/main.rs |    10 +
 .../no-listing-18-returns-closure/Cargo.lock  |     6 +
 .../no-listing-18-returns-closure/Cargo.toml  |     7 +
 .../no-listing-18-returns-closure/output.txt  |    30 +
 .../no-listing-18-returns-closure/src/lib.rs  |     3 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../src/lib.rs                                |     3 +
 .../hello_macro/Cargo.lock                    |     6 +
 .../hello_macro/Cargo.toml                    |     7 +
 .../hello_macro/src/lib.rs                    |     3 +
 .../pancakes/Cargo.lock                       |    13 +
 .../pancakes/Cargo.toml                       |     8 +
 .../pancakes/src/main.rs                      |    13 +
 .../hello_macro/Cargo.lock                    |     6 +
 .../hello_macro/Cargo.toml                    |     7 +
 .../hello_macro/hello_macro_derive/Cargo.lock |    46 +
 .../hello_macro/hello_macro_derive/Cargo.toml |    12 +
 .../hello_macro/hello_macro_derive/src/lib.rs |    27 +
 .../hello_macro/src/lib.rs                    |     3 +
 .../hello_macro/src/main.rs                   |    13 +
 .../pancakes/Cargo.lock                       |    58 +
 .../pancakes/Cargo.toml                       |     9 +
 .../pancakes/src/main.rs                      |     9 +
 .../output-only-01-missing-unsafe/Cargo.lock  |     6 +
 .../output-only-01-missing-unsafe/Cargo.toml  |     7 +
 .../output-only-01-missing-unsafe/output.txt  |    16 +
 .../output-only-01-missing-unsafe/src/main.rs |     7 +
 .../ch20-web-server/listing-20-01/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-01/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-01/src/main.rs |    11 +
 .../ch20-web-server/listing-20-02/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-02/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-02/src/main.rs |    21 +
 .../ch20-web-server/listing-20-03/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-03/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-03/src/main.rs |    26 +
 .../ch20-web-server/listing-20-04/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-04/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-04/hello.html  |    11 +
 .../ch20-web-server/listing-20-04/src/main.rs |    24 +
 .../ch20-web-server/listing-20-05/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-05/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-05/hello.html  |    11 +
 .../ch20-web-server/listing-20-05/src/main.rs |    32 +
 .../ch20-web-server/listing-20-06/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-06/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-06/hello.html  |    11 +
 .../ch20-web-server/listing-20-06/src/main.rs |    36 +
 .../ch20-web-server/listing-20-07/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-07/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-07/hello.html  |    11 +
 .../ch20-web-server/listing-20-07/src/main.rs |    41 +
 .../ch20-web-server/listing-20-08/404.html    |    11 +
 .../ch20-web-server/listing-20-08/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-08/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-08/hello.html  |    11 +
 .../ch20-web-server/listing-20-08/src/main.rs |    38 +
 .../ch20-web-server/listing-20-09/404.html    |    11 +
 .../ch20-web-server/listing-20-09/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-09/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-09/hello.html  |    11 +
 .../ch20-web-server/listing-20-09/src/main.rs |    42 +
 .../ch20-web-server/listing-20-10/404.html    |    11 +
 .../ch20-web-server/listing-20-10/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-10/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-10/hello.html  |    11 +
 .../ch20-web-server/listing-20-10/src/main.rs |    53 +
 .../ch20-web-server/listing-20-11/404.html    |    11 +
 .../ch20-web-server/listing-20-11/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-11/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-11/hello.html  |    11 +
 .../ch20-web-server/listing-20-11/src/main.rs |    44 +
 .../ch20-web-server/listing-20-12/404.html    |    11 +
 .../ch20-web-server/listing-20-12/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-12/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-12/hello.html  |    11 +
 .../ch20-web-server/listing-20-12/output.txt  |    14 +
 .../ch20-web-server/listing-20-12/src/main.rs |    45 +
 .../ch20-web-server/listing-20-13/404.html    |    11 +
 .../ch20-web-server/listing-20-13/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-13/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-13/hello.html  |    11 +
 .../listing-20-13/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-13/src/lib.rs  |    30 +
 .../ch20-web-server/listing-20-14/404.html    |    11 +
 .../ch20-web-server/listing-20-14/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-14/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-14/hello.html  |    11 +
 .../listing-20-14/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-14/src/lib.rs  |    41 +
 .../ch20-web-server/listing-20-15/404.html    |    11 +
 .../ch20-web-server/listing-20-15/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-15/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-15/hello.html  |    11 +
 .../listing-20-15/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-15/src/lib.rs  |    55 +
 .../ch20-web-server/listing-20-16/404.html    |    11 +
 .../ch20-web-server/listing-20-16/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-16/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-16/hello.html  |    11 +
 .../listing-20-16/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-16/src/lib.rs  |    62 +
 .../ch20-web-server/listing-20-17/404.html    |    11 +
 .../ch20-web-server/listing-20-17/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-17/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-17/hello.html  |    11 +
 .../ch20-web-server/listing-20-17/output.txt  |    17 +
 .../listing-20-17/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-17/src/lib.rs  |    66 +
 .../ch20-web-server/listing-20-18/404.html    |    11 +
 .../ch20-web-server/listing-20-18/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-18/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-18/hello.html  |    11 +
 .../listing-20-18/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-18/src/lib.rs  |    78 +
 .../ch20-web-server/listing-20-19/404.html    |    11 +
 .../ch20-web-server/listing-20-19/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-19/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-19/hello.html  |    11 +
 .../listing-20-19/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-19/src/lib.rs  |    71 +
 .../ch20-web-server/listing-20-20/404.html    |    11 +
 .../ch20-web-server/listing-20-20/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-20/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-20/hello.html  |    11 +
 .../listing-20-20/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-20/src/lib.rs  |    68 +
 .../ch20-web-server/listing-20-21/404.html    |    11 +
 .../ch20-web-server/listing-20-21/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-21/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-21/hello.html  |    11 +
 .../listing-20-21/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-21/src/lib.rs  |    67 +
 .../ch20-web-server/listing-20-22/404.html    |    11 +
 .../ch20-web-server/listing-20-22/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-22/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-22/hello.html  |    11 +
 .../ch20-web-server/listing-20-22/output.txt  |    14 +
 .../listing-20-22/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-22/src/lib.rs  |    76 +
 .../ch20-web-server/listing-20-23/404.html    |    11 +
 .../ch20-web-server/listing-20-23/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-23/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-23/hello.html  |    11 +
 .../listing-20-23/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-23/src/lib.rs  |   107 +
 .../ch20-web-server/listing-20-24/404.html    |    11 +
 .../ch20-web-server/listing-20-24/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-24/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-24/hello.html  |    11 +
 .../listing-20-24/src/bin/main.rs             |    44 +
 .../ch20-web-server/listing-20-24/src/lib.rs  |   103 +
 .../ch20-web-server/listing-20-25/404.html    |    11 +
 .../ch20-web-server/listing-20-25/Cargo.lock  |     6 +
 .../ch20-web-server/listing-20-25/Cargo.toml  |     7 +
 .../ch20-web-server/listing-20-25/hello.html  |    11 +
 .../listing-20-25/src/bin/main.rs             |    50 +
 .../ch20-web-server/listing-20-25/src/lib.rs  |   105 +
 .../404.html                                  |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../hello.html                                |    11 +
 .../output.txt                                |    14 +
 .../src/bin/main.rs                           |    46 +
 .../src/lib.rs                                |     1 +
 .../404.html                                  |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../hello.html                                |    11 +
 .../output.txt                                |    14 +
 .../src/bin/main.rs                           |    44 +
 .../src/lib.rs                                |    11 +
 .../no-listing-03-define-execute/404.html     |    11 +
 .../no-listing-03-define-execute/Cargo.lock   |     6 +
 .../no-listing-03-define-execute/Cargo.toml   |     7 +
 .../no-listing-03-define-execute/hello.html   |    11 +
 .../no-listing-03-define-execute/output.txt   |     3 +
 .../src/bin/main.rs                           |    44 +
 .../no-listing-03-define-execute/src/lib.rs   |    20 +
 .../404.html                                  |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../hello.html                                |    11 +
 .../output.txt                                |    27 +
 .../src/bin/main.rs                           |    44 +
 .../src/lib.rs                                |    76 +
 .../no-listing-05-fix-worker-new/404.html     |    11 +
 .../no-listing-05-fix-worker-new/Cargo.lock   |     6 +
 .../no-listing-05-fix-worker-new/Cargo.toml   |     7 +
 .../no-listing-05-fix-worker-new/hello.html   |    11 +
 .../src/bin/main.rs                           |    44 +
 .../no-listing-05-fix-worker-new/src/lib.rs   |    83 +
 .../404.html                                  |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../hello.html                                |    11 +
 .../src/bin/main.rs                           |    44 +
 .../src/lib.rs                                |    81 +
 .../404.html                                  |    11 +
 .../Cargo.lock                                |     6 +
 .../Cargo.toml                                |     7 +
 .../hello.html                                |    11 +
 .../src/bin/main.rs                           |    44 +
 .../src/lib.rs                                |    88 +
 src/doc/book/rust-toolchain                   |     2 +-
 src/doc/book/rustfmt.toml                     |     1 +
 .../src/ch18-02-refutability.md               |     2 +-
 src/doc/book/src/appendix-01-keywords.md      |     2 +-
 src/doc/book/src/appendix-02-operators.md     |     2 +-
 src/doc/book/src/appendix-06-translation.md   |     4 +-
 src/doc/book/src/appendix-07-nightly-rust.md  |     2 +-
 src/doc/book/src/ch01-03-hello-cargo.md       |     7 +-
 .../src/ch02-00-guessing-game-tutorial.md     |   303 +-
 .../ch03-00-common-programming-concepts.md    |     4 +-
 .../src/ch03-01-variables-and-mutability.md   |    61 +-
 src/doc/book/src/ch03-02-data-types.md        |    94 +-
 .../book/src/ch03-03-how-functions-work.md    |   118 +-
 src/doc/book/src/ch03-04-comments.md          |    15 +-
 src/doc/book/src/ch03-05-control-flow.md      |   197 +-
 src/doc/book/src/ch04-01-what-is-ownership.md |   138 +-
 .../src/ch04-02-references-and-borrowing.md   |   143 +-
 src/doc/book/src/ch04-03-slices.md            |   114 +-
 src/doc/book/src/ch05-01-defining-structs.md  |   138 +-
 src/doc/book/src/ch05-02-example-structs.md   |    89 +-
 src/doc/book/src/ch05-03-method-syntax.md     |    77 +-
 src/doc/book/src/ch06-01-defining-an-enum.md  |   117 +-
 src/doc/book/src/ch06-02-match.md             |   112 +-
 src/doc/book/src/ch06-03-if-let.md            |    50 +-
 .../book/src/ch07-01-packages-and-crates.md   |     2 +-
 ...ng-modules-to-control-scope-and-privacy.md |    18 +-
 ...referring-to-an-item-in-the-module-tree.md |   123 +-
 ...g-paths-into-scope-with-the-use-keyword.md |   117 +-
 ...separating-modules-into-different-files.md |    20 +-
 src/doc/book/src/ch08-01-vectors.md           |    85 +-
 src/doc/book/src/ch08-02-strings.md           |    67 +-
 src/doc/book/src/ch08-03-hash-maps.md         |    99 +-
 ...ch09-01-unrecoverable-errors-with-panic.md |   142 +-
 .../ch09-02-recoverable-errors-with-result.md |   171 +-
 .../src/ch09-03-to-panic-or-not-to-panic.md   |    46 +-
 src/doc/book/src/ch10-00-generics.md          |    67 +-
 src/doc/book/src/ch10-01-syntax.md            |   163 +-
 src/doc/book/src/ch10-02-traits.md            |   194 +-
 src/doc/book/src/ch10-03-lifetime-syntax.md   |   199 +-
 src/doc/book/src/ch11-01-writing-tests.md     |   377 +-
 src/doc/book/src/ch11-02-running-tests.md     |   149 +-
 src/doc/book/src/ch11-03-test-organization.md |   105 +-
 ...h12-01-accepting-command-line-arguments.md |    36 +-
 src/doc/book/src/ch12-02-reading-a-file.md    |    46 +-
 ...improving-error-handling-and-modularity.md |   205 +-
 ...2-04-testing-the-librarys-functionality.md |   125 +-
 ...2-05-working-with-environment-variables.md |   137 +-
 ...-06-writing-to-stderr-instead-of-stdout.md |    19 +-
 src/doc/book/src/ch13-01-closures.md          |   315 +-
 src/doc/book/src/ch13-02-iterators.md         |   186 +-
 .../src/ch13-03-improving-our-io-project.md   |    87 +-
 src/doc/book/src/ch14-01-release-profiles.md  |    11 +-
 .../src/ch14-02-publishing-to-crates-io.md    |   124 +-
 src/doc/book/src/ch14-03-cargo-workspaces.md  |   122 +-
 .../book/src/ch14-04-installing-binaries.md   |    25 +-
 src/doc/book/src/ch15-01-box.md               |    55 +-
 src/doc/book/src/ch15-02-deref.md             |   140 +-
 src/doc/book/src/ch15-03-drop.md              |    54 +-
 src/doc/book/src/ch15-04-rc.md                |    65 +-
 .../book/src/ch15-05-interior-mutability.md   |   199 +-
 src/doc/book/src/ch15-06-reference-cycles.md  |   206 +-
 src/doc/book/src/ch16-01-threads.md           |   139 +-
 src/doc/book/src/ch16-02-message-passing.md   |   143 +-
 src/doc/book/src/ch16-03-shared-state.md      |   115 +-
 ...04-extensible-concurrency-sync-and-send.md |     7 +-
 src/doc/book/src/ch17-01-what-is-oo.md        |    36 +-
 src/doc/book/src/ch17-02-trait-objects.md     |   134 +-
 .../book/src/ch17-03-oo-design-patterns.md    |   267 +-
 .../ch18-01-all-the-places-for-patterns.md    |    66 +-
 src/doc/book/src/ch18-02-refutability.md      |    29 +-
 src/doc/book/src/ch18-03-pattern-syntax.md    |   298 +-
 src/doc/book/src/ch19-01-unsafe-rust.md       |   148 +-
 src/doc/book/src/ch19-03-advanced-traits.md   |   274 +-
 src/doc/book/src/ch19-04-advanced-types.md    |   108 +-
 ...ch19-05-advanced-functions-and-closures.md |    58 +-
 src/doc/book/src/ch19-06-macros.md            |   107 +-
 src/doc/book/src/ch20-01-single-threaded.md   |   167 +-
 src/doc/book/src/ch20-02-multithreaded.md     |   536 +-
 .../ch20-03-graceful-shutdown-and-cleanup.md  |   332 +-
 src/doc/book/src/title-page.md                |     2 +-
 src/doc/book/tools/nostarch.sh                |    15 +-
 src/doc/book/tools/src/bin/concat_chapters.rs |    35 +-
 src/doc/book/tools/src/bin/convert_quotes.rs  |    50 +-
 src/doc/book/tools/src/bin/lfp.rs             |    93 +-
 src/doc/book/tools/src/bin/link2print.rs      |    62 +-
 .../book/tools/src/bin/release_listings.rs    |   159 +
 .../book/tools/src/bin/remove_hidden_lines.rs |    83 +
 src/doc/book/tools/src/bin/remove_links.rs    |    18 +-
 src/doc/book/tools/src/bin/remove_markup.rs   |    40 +-
 src/doc/book/tools/update-rustc.sh            |    76 +
 .../cargo-check-for-faster-checking.md        |     2 +-
 src/doc/embedded-book/ci/install.sh           |     4 +-
 src/doc/embedded-book/ci/script.sh            |     6 +-
 src/doc/embedded-book/src/SUMMARY.md          |     4 +
 .../embedded-book/src/appendix/glossary.md    |    16 +
 .../src/interoperability/c-with-rust.md       |     2 +-
 src/doc/embedded-book/src/intro/index.md      |    20 +
 .../src/static-guarantees/design-contracts.md |     2 +-
 .../typestate-programming.md                  |    50 +-
 src/doc/nomicon/book.toml                     |     7 +
 src/doc/nomicon/src/destructors.md            |     6 +-
 src/doc/nomicon/src/ffi.md                    |     4 +-
 src/doc/nomicon/src/lifetimes.md              |     2 +
 src/doc/nomicon/src/safe-unsafe-meaning.md    |     2 +-
 src/doc/nomicon/src/subtyping.md              |     8 +-
 src/doc/nomicon/src/vec-alloc.md              |     2 +-
 src/doc/nomicon/src/vec-final.md              |     4 +-
 src/doc/reference/src/attributes.md           |     2 +-
 .../src/behavior-considered-undefined.md      |     2 +-
 src/doc/reference/src/const_eval.md           |     6 +-
 .../reference/src/expressions/array-expr.md   |     2 +-
 .../reference/src/expressions/block-expr.md   |     2 +-
 .../reference/src/items/associated-items.md   |    28 +-
 src/doc/reference/src/items/enumerations.md   |     2 +-
 src/doc/reference/src/items/traits.md         |    96 +
 .../reference/src/items/use-declarations.md   |     2 +-
 src/doc/reference/src/macro-ambiguity.md      |     2 +-
 src/doc/reference/src/paths.md                |     3 +-
 src/doc/reference/src/tokens.md               |     2 +-
 src/doc/reference/src/type-layout.md          |    28 +-
 src/doc/reference/src/types/pointer.md        |     6 +-
 src/doc/reference/src/types/trait-object.md   |     2 +-
 src/doc/robots.txt                            |     1 -
 .../src/conversion/from_into.md               |     4 +-
 .../reenter_question_mark.md                  |     4 +-
 .../rust-by-example/src/flow_control/for.md   |    15 +-
 .../src/flow_control/if_let.md                |     6 +-
 src/doc/rust-by-example/src/mod/visibility.md |     2 +-
 .../.editorconfig                             |     0
 .../.travis.yml                               |     4 +-
 src/doc/rustc-dev-guide/CNAME                 |     1 +
 .../CODE_OF_CONDUCT.md                        |     0
 .../LICENSE-APACHE                            |     0
 .../LICENSE-MIT                               |     0
 src/doc/rustc-dev-guide/README.md             |    85 +
 src/doc/rustc-dev-guide/book.toml             |    20 +
 .../ci/check_line_lengths.sh                  |     0
 .../src/SUMMARY.md                            |     4 +
 .../src/about-this-guide.md                   |     2 +-
 .../src/appendix/background.md                |     0
 .../src/appendix/bibliography.md              |     0
 .../src/appendix/code-index.md                |    10 +-
 .../src/appendix/compiler-lecture.md          |    27 +
 .../rustc-dev-guide/src/appendix/glossary.md  |    88 +
 .../src/appendix/humorust.md                  |     1 +
 .../src/appendix/stupid-stats.md              |     4 +-
 .../src/borrow_check.md                       |     0
 .../borrow_check/moves_and_initialization.md  |     0
 .../moves_and_initialization/move_paths.md    |     0
 .../src/borrow_check/region_inference.md      |     3 +-
 .../region_inference/closure_constraints.md   |     0
 .../constraint_propagation.md                 |     4 +-
 .../region_inference/error_reporting.md       |     0
 .../region_inference/lifetime_parameters.md   |     0
 .../region_inference/member_constraints.md    |     0
 .../placeholders_and_universes.md             |     0
 .../src/borrow_check/two_phase_borrows.md     |     0
 .../src/borrow_check/type_check.md            |     0
 .../src/bug-fix-procedure.md                  |     2 +-
 .../src/building/bootstrapping.md             |     0
 .../build-install-distribution-artifacts.md   |     0
 .../src/building/compiler-documenting.md      |     0
 .../src/building/ctags.md                     |     0
 .../src/building/how-to-build-and-run.md      |     0
 .../src/building/suggested.md                 |     0
 .../src/closure.md                            |     0
 .../src/codegen.md                            |     0
 .../src/codegen/backend-agnostic.md           |     4 +-
 .../src/codegen/debugging.md                  |     2 +
 .../src/codegen/updating-llvm.md              |     0
 .../src/compiler-debugging.md                 |     0
 .../src/compiler-team.md                      |     0
 .../src/compiletest.md                        |     0
 .../src/const-eval.md                         |     0
 .../src/conventions.md                        |     2 +-
 .../src/crates-io.md                          |     0
 .../src/debugging-support-in-rustc.md         |     6 +-
 .../src/diagnostics.md                        |    10 +-
 .../src/diagnostics/diagnostic-codes.md       |     2 +-
 .../src/diagnostics/lintstore.md              |     0
 .../src/generic_arguments.md                  |     0
 src/doc/rustc-dev-guide/src/generics.md       |   144 +
 .../src/high-level-overview.md                |     6 +-
 .../src/hir-debugging.md                      |     0
 .../src/hir.md                                |     2 +-
 .../src/ice-breaker/about.md                  |     2 +
 .../src/ice-breaker/cleanup-crew.md           |   114 +
 .../src/ice-breaker/llvm.md                   |     2 +-
 .../src/img/rustc_stages.svg                  |     0
 .../src/implementing_new_features.md          |     8 +-
 .../src/incrcomp-debugging.md                 |     0
 .../src/lowering.md                           |     0
 .../src/macro-expansion.md                    |    45 +-
 src/doc/rustc-dev-guide/src/memory.md         |    88 +
 .../src/method-lookup.md                      |     0
 .../src/mir/construction.md                   |     0
 .../src/mir/debugging.md                      |     0
 .../src/mir/index.md                          |    32 +-
 .../src/mir/mir_detailed.dot                  |     0
 .../src/mir/mir_detailed.svg                  |     0
 .../src/mir/mir_overview.dot                  |     0
 .../src/mir/mir_overview.svg                  |     0
 .../src/mir/optimizations.md                  |    10 +-
 .../src/mir/passes.md                         |     0
 .../src/mir/visitor.md                        |     0
 .../src/miri.md                               |     0
 .../src/name-resolution.md                    |    27 +-
 .../src/opaque-types-type-alias-impl-trait.md |     0
 .../src/panic-implementation.md               |     0
 .../src/param_env.md                          |     0
 .../src/part-1-intro.md                       |     2 +-
 .../src/part-2-intro.md                       |     2 +-
 .../src/profile-guided-optimization.md        |     0
 .../src/profiling.md                          |     0
 .../src/profiling/with_perf.md                |     0
 .../src/queries/example-0.counts.txt          |     0
 .../src/queries/example-0.html                |     0
 .../src/queries/example-0.png                 |   Bin
 .../incremental-compilation-in-detail.md      |     0
 .../src/queries/incremental-compilation.md    |     0
 .../src/queries/profiling.md                  |     0
 .../query-evaluation-model-in-detail.md       |     2 +-
 .../src/query.md                              |    52 +-
 .../src/rustc-driver.md                       |    13 -
 .../src/rustdoc.md                            |     0
 .../src/salsa.md                              |     0
 src/doc/rustc-dev-guide/src/sanitizers.md     |    74 +
 .../src/stability.md                          |     0
 .../src/stabilization_guide.md                |     0
 .../src/test-implementation.md                |    14 +-
 .../src/tests/adding.md                       |    19 +-
 .../src/tests/intro.md                        |    15 +-
 .../src/tests/running.md                      |    20 +-
 .../src/the-parser.md                         |    12 +-
 .../src/traits/associated-types.md            |     0
 .../src/traits/bibliography.md                |     0
 .../src/traits/caching.md                     |     0
 .../src/traits/canonical-queries.md           |     0
 .../src/traits/canonicalization.md            |     0
 .../src/traits/chalk-overview.md              |     2 +-
 .../src/traits/goals-and-clauses.md           |     0
 .../src/traits/hrtb.md                        |     2 +-
 .../src/traits/implied-bounds.md              |     0
 .../src/traits/index.md                       |     0
 .../src/traits/lowering-module.md             |    56 +
 .../src/traits/lowering-rules.md              |     0
 .../src/traits/lowering-to-logic.md           |     0
 .../src/traits/regions.md                     |     0
 .../src/traits/resolution.md                  |     0
 .../src/traits/slg.md                         |     0
 .../src/traits/specialization.md              |     0
 .../src/traits/wf.md                          |     0
 src/doc/rustc-dev-guide/src/ty-fold.md        |   105 +
 src/doc/rustc-dev-guide/src/ty.md             |   331 +
 .../src/type-checking.md                      |     0
 .../src/type-inference.md                     |     9 +-
 .../src/variance.md                           |     0
 .../src/walkthrough.md                        |     0
 .../triagebot.toml                            |     0
 src/doc/rustc-guide/README.md                 |    85 -
 src/doc/rustc-guide/book.toml                 |    20 -
 src/doc/rustc-guide/ci/install.sh             |    24 -
 .../src/appendix/compiler-lecture.md          |    51 -
 src/doc/rustc-guide/src/appendix/glossary.md  |    87 -
 src/doc/rustc-guide/src/sanitizers.md         |    68 -
 .../rustc-guide/src/traits/lowering-module.md |    65 -
 src/doc/rustc-guide/src/ty.md                 |   636 -
 src/doc/rustc-ux-guidelines.md                |     2 +-
 src/doc/rustc/src/command-line-arguments.md   |     9 +
 src/doc/rustc/src/lints/levels.md             |    12 +
 src/doc/rustdoc/book.toml                     |     4 +
 src/doc/rustdoc/src/the-doc-attribute.md      |     2 +-
 src/doc/rustdoc/src/unstable-features.md      |    23 +-
 .../src/compiler-flags/control-flow-guard.md  |    34 +
 .../src/compiler-flags/sanitizer.md           |    86 +-
 .../src/compiler-flags/self-profile-events.md |    74 +
 .../src/compiler-flags/self-profile.md        |    47 +
 .../src/language-features/const-eval-limit.md |     7 +
 .../const-in-array-repeat-expressions.md      |     2 +-
 .../src/language-features/doc-spotlight.md    |    30 -
 .../src/language-features/generators.md       |    26 +-
 .../impl-trait-in-bindings.md                 |     4 +-
 .../src/language-features/link-cfg.md         |     5 +
 .../language-features/marker-trait-attr.md    |     2 +-
 .../src/language-features/no-sanitize.md      |    29 +
 .../src/language-features/plugin.md           |     6 +-
 .../src/language-features/trait-alias.md      |     2 +-
 .../language-features/transparent-unions.md   |     2 +-
 .../src/library-features/allocator-api.md     |     2 +-
 .../src/library-features/read-initializer.md  |     7 -
 .../tidy-test-never-used-anywhere-else.md     |     5 +
 src/etc/debugger_pretty_printers_common.py    |     6 +-
 src/etc/dec2flt_table.py                      |     2 +-
 src/etc/gdb_rust_pretty_printing.py           |    43 +-
 src/etc/generate-deriving-span-tests.py       |    15 +-
 src/etc/generate-keyword-tests.py             |     1 -
 src/etc/htmldocck.py                          |    40 +-
 src/etc/installer/gfx/rust-logo.png           |   Bin 5844 -> 3909 bytes
 src/etc/lldb_batchmode.py                     |     1 +
 src/etc/lldb_rust_formatters.py               |    48 +-
 src/liballoc/alloc.rs                         |    76 +-
 src/liballoc/alloc/tests.rs                   |     2 +-
 src/liballoc/benches/btree/map.rs             |    56 +
 src/liballoc/benches/btree/set.rs             |   101 +-
 src/liballoc/boxed.rs                         |    64 +-
 src/liballoc/collections/binary_heap.rs       |    20 +-
 src/liballoc/collections/btree/map.rs         |   484 +-
 src/liballoc/collections/btree/mod.rs         |    12 +
 src/liballoc/collections/btree/navigate.rs    |   243 +
 src/liballoc/collections/btree/node.rs        |   334 +-
 src/liballoc/collections/btree/search.rs      |    16 +-
 src/liballoc/collections/btree/set.rs         |    13 +-
 src/liballoc/collections/linked_list.rs       |    73 +-
 src/liballoc/collections/vec_deque.rs         |   131 +-
 src/liballoc/collections/vec_deque/drain.rs   |   126 +
 src/liballoc/fmt.rs                           |    15 +
 src/liballoc/lib.rs                           |     1 +
 src/liballoc/raw_vec.rs                       |    74 +-
 src/liballoc/raw_vec/tests.rs                 |     4 +-
 src/liballoc/rc.rs                            |     6 +-
 src/liballoc/string.rs                        |    27 +-
 src/liballoc/sync.rs                          |     6 +-
 src/liballoc/tests/binary_heap.rs             |    33 +
 src/liballoc/tests/btree/map.rs               |   121 +-
 src/liballoc/tests/btree/set.rs               |    27 +-
 src/liballoc/tests/heap.rs                    |     6 +-
 src/liballoc/tests/lib.rs                     |     1 +
 src/liballoc/tests/linked_list.rs             |    70 +-
 src/liballoc/tests/slice.rs                   |    84 +-
 src/liballoc/tests/str.rs                     |    43 +
 src/liballoc/tests/string.rs                  |     4 +
 src/liballoc/tests/vec.rs                     |    64 +
 src/liballoc/tests/vec_deque.rs               |    74 +-
 src/liballoc/vec.rs                           |    70 +-
 src/libcore/alloc.rs                          |   552 +-
 src/libcore/any.rs                            |     8 +-
 src/libcore/cell.rs                           |    64 +
 src/libcore/char/methods.rs                   |    80 +-
 src/libcore/cmp.rs                            |    64 +-
 src/libcore/convert/mod.rs                    |     2 +-
 src/libcore/fmt/float.rs                      |     2 -
 src/libcore/fmt/mod.rs                        |    68 +-
 src/libcore/fmt/num.rs                        |   163 +
 src/libcore/fmt/rt/v1.rs                      |     9 -
 src/libcore/future/future.rs                  |     1 -
 src/libcore/hash/sip.rs                       |     6 +-
 src/libcore/intrinsics.rs                     |   511 +-
 src/libcore/iter/adapters/mod.rs              |   113 +-
 src/libcore/iter/mod.rs                       |     7 +-
 src/libcore/iter/range.rs                     |    38 +-
 src/libcore/iter/sources.rs                   |    20 +-
 src/libcore/iter/traits/exact_size.rs         |     4 +-
 src/libcore/iter/traits/iterator.rs           |   107 +-
 src/libcore/lib.rs                            |    20 +-
 src/libcore/marker.rs                         |     4 +
 src/libcore/mem/manually_drop.rs              |     2 +-
 src/libcore/mem/maybe_uninit.rs               |     2 +-
 src/libcore/mem/mod.rs                        |     5 +-
 src/libcore/num/dec2flt/rawfp.rs              |    10 +-
 src/libcore/num/f32.rs                        |   118 +-
 src/libcore/num/f64.rs                        |   111 +-
 src/libcore/num/flt2dec/mod.rs                |    32 +-
 src/libcore/num/i128.rs                       |     3 +
 src/libcore/num/i16.rs                        |     3 +
 src/libcore/num/i32.rs                        |     3 +
 src/libcore/num/i64.rs                        |     3 +
 src/libcore/num/i8.rs                         |     3 +
 src/libcore/num/int_macros.rs                 |    26 +-
 src/libcore/num/isize.rs                      |     3 +
 src/libcore/num/mod.rs                        |   522 +-
 src/libcore/num/u128.rs                       |     5 +-
 src/libcore/num/u16.rs                        |     5 +-
 src/libcore/num/u32.rs                        |     5 +-
 src/libcore/num/u64.rs                        |     5 +-
 src/libcore/num/u8.rs                         |     5 +-
 src/libcore/num/uint_macros.rs                |    13 -
 src/libcore/num/usize.rs                      |     5 +-
 src/libcore/ops/generator.rs                  |    35 +-
 src/libcore/ops/range.rs                      |    53 +-
 src/libcore/option.rs                         |    36 +-
 src/libcore/pin.rs                            |     4 +-
 src/libcore/primitive.rs                      |    67 +
 src/libcore/ptr/const_ptr.rs                  |     8 +-
 src/libcore/ptr/mod.rs                        |    73 +-
 src/libcore/ptr/mut_ptr.rs                    |    10 +-
 src/libcore/result.rs                         |   118 +-
 src/libcore/slice/mod.rs                      |   386 +-
 src/libcore/str/mod.rs                        |   177 +-
 src/libcore/str/pattern.rs                    |     2 +-
 src/libcore/sync/atomic.rs                    |     4 +-
 src/libcore/tests/alloc.rs                    |     3 +
 src/libcore/tests/fmt/num.rs                  |    80 +
 src/libcore/tests/hash/sip.rs                 |    38 +-
 src/libcore/tests/iter.rs                     |    18 +
 src/libcore/tests/lib.rs                      |     4 +-
 src/libcore/tests/num/flt2dec/mod.rs          |   460 +-
 src/libcore/tests/slice.rs                    |    12 +
 src/libcore/tests/time.rs                     |     6 +
 src/libfmt_macros/lib.rs                      |     2 +-
 src/libgraphviz/lib.rs                        |    10 +
 src/libpanic_unwind/seh.rs                    |    17 +-
 src/libproc_macro/bridge/client.rs            |     4 +-
 src/libproc_macro/diagnostic.rs               |    17 +-
 src/librustc/Cargo.toml                       |     8 +-
 src/librustc/arena.rs                         |    17 +-
 src/librustc/benches/lib.rs                   |     1 -
 src/librustc/dep_graph/dep_node.rs            |   204 +-
 src/librustc/dep_graph/graph.rs               |    44 +-
 src/librustc/dep_graph/mod.rs                 |     3 +-
 src/librustc/dep_graph/safe.rs                |     2 +-
 src/librustc/hir/check_attr.rs                |   587 -
 src/librustc/hir/exports.rs                   |     2 +-
 src/librustc/hir/map/blocks.rs                |     2 +-
 src/librustc/hir/map/collector.rs             |    12 +-
 src/librustc/hir/map/definitions.rs           |     6 +-
 src/librustc/hir/map/hir_id_validator.rs      |     2 +-
 src/librustc/hir/map/mod.rs                   |   141 +-
 src/librustc/hir/mod.rs                       |    54 +-
 src/librustc/ich/hcx.rs                       |    37 +-
 src/librustc/ich/impls_hir.rs                 |    43 +-
 src/librustc/ich/impls_syntax.rs              |    15 +-
 src/librustc/ich/impls_ty.rs                  |     5 +-
 src/librustc/infer/canonical.rs               |   357 +
 src/librustc/infer/canonical/mod.rs           |   493 -
 src/librustc/infer/error_reporting/mod.rs     |  2070 ----
 .../error_reporting/nice_region_error/mod.rs  |    91 -
 .../error_reporting/nice_region_error/util.rs |   132 -
 src/librustc/infer/higher_ranked/mod.rs       |   138 -
 .../infer/lexical_region_resolve/mod.rs       |   940 --
 src/librustc/infer/mod.rs                     |  1756 +--
 src/librustc/infer/nll_relate/mod.rs          |   996 --
 src/librustc/infer/opaque_types/mod.rs        |  1289 --
 src/librustc/infer/region_constraints/mod.rs  |   938 --
 src/librustc/infer/unify_key.rs               |    18 +-
 src/librustc/lib.rs                           |    15 +-
 src/librustc/lint.rs                          |   244 +-
 src/librustc/macros.rs                        |    37 -
 src/librustc/middle/codegen_fn_attrs.rs       |    13 +-
 src/librustc/middle/cstore.rs                 |     9 +-
 src/librustc/middle/free_region.rs            |    60 +-
 src/librustc/middle/lang_items.rs             |   425 +-
 src/librustc/middle/limits.rs                 |    66 +
 src/librustc/middle/mod.rs                    |     3 +-
 src/librustc/middle/recursion_limit.rs        |    33 -
 src/librustc/middle/region.rs                 |     2 +-
 src/librustc/middle/stability.rs              |    42 +-
 src/librustc/middle/weak_lang_items.rs        |   167 -
 src/librustc/mir/interpret/allocation.rs      |    22 +-
 src/librustc/mir/interpret/error.rs           |   217 +-
 src/librustc/mir/interpret/mod.rs             |    22 +-
 src/librustc/mir/interpret/pointer.rs         |     4 +-
 src/librustc/mir/interpret/queries.rs         |    36 +-
 src/librustc/mir/interpret/value.rs           |    90 +-
 src/librustc/mir/mod.rs                       |   141 +-
 src/librustc/mir/mono.rs                      |     6 +-
 src/librustc/mir/query.rs                     |     8 +-
 src/librustc/mir/tcx.rs                       |     8 +-
 src/librustc/mir/traversal.rs                 |     4 +-
 src/librustc/mir/visit.rs                     |    20 +-
 src/librustc/query/mod.rs                     |   143 +-
 src/librustc/traits/chalk_fulfill.rs          |   159 -
 src/librustc/traits/codegen/mod.rs            |   110 -
 src/librustc/traits/error_reporting/mod.rs    |  1427 ---
 .../error_reporting/on_unimplemented.rs       |   213 -
 src/librustc/traits/misc.rs                   |   202 -
 src/librustc/traits/mod.rs                    |   984 +-
 src/librustc/traits/object_safety.rs          |   730 --
 src/librustc/traits/on_unimplemented.rs       |   385 -
 src/librustc/traits/query.rs                  |   332 +
 src/librustc/traits/query/dropck_outlives.rs  |   206 -
 src/librustc/traits/query/method_autoderef.rs |    33 -
 src/librustc/traits/query/mod.rs              |    50 -
 src/librustc/traits/query/normalize.rs        |   190 -
 src/librustc/traits/query/outlives_bounds.rs  |   139 -
 .../traits/query/type_op/ascribe_user_type.rs |    36 -
 src/librustc/traits/query/type_op/eq.rs       |    33 -
 src/librustc/traits/query/type_op/mod.rs      |   134 -
 .../traits/query/type_op/normalize.rs         |    80 -
 src/librustc/traits/query/type_op/subtype.rs  |    30 -
 src/librustc/traits/select.rs                 |  3887 +-----
 src/librustc/traits/specialization_graph.rs   |   202 +
 src/librustc/traits/specialize/mod.rs         |   462 -
 .../traits/specialize/specialization_graph.rs |   527 -
 src/librustc/traits/structural_impls.rs       |   148 +-
 src/librustc/traits/util.rs                   |   672 --
 src/librustc/ty/adjustment.rs                 |     1 +
 src/librustc/ty/cast.rs                       |     2 +-
 src/librustc/ty/codec.rs                      |     1 +
 src/librustc/ty/context.rs                    |   145 +-
 src/librustc/ty/error.rs                      |    19 +-
 src/librustc/ty/fast_reject.rs                |     2 +-
 src/librustc/ty/flags.rs                      |    23 +-
 src/librustc/ty/fold.rs                       |    22 +-
 src/librustc/ty/free_region_map.rs            |    89 +-
 src/librustc/ty/instance.rs                   |   177 +-
 src/librustc/ty/layout.rs                     |    76 +-
 src/librustc/ty/mod.rs                        |   367 +-
 src/librustc/ty/normalize_erasing_regions.rs  |     5 +-
 src/librustc/ty/print/mod.rs                  |     2 +-
 src/librustc/ty/print/pretty.rs               |    35 +-
 src/librustc/ty/query/caches.rs               |   112 +
 src/librustc/ty/query/config.rs               |    22 +-
 src/librustc/ty/query/job.rs                  |   309 +-
 src/librustc/ty/query/keys.rs                 |    51 +-
 src/librustc/ty/query/mod.rs                  |   141 +-
 src/librustc/ty/query/on_disk_cache.rs        |    66 +-
 src/librustc/ty/query/plumbing.rs             |   714 +-
 src/librustc/ty/query/profiling_support.rs    |    43 +-
 src/librustc/ty/query/stats.rs                |   139 +
 src/librustc/ty/query/values.rs               |     7 -
 src/librustc/ty/relate.rs                     |     6 +-
 src/librustc/ty/structural_impls.rs           |    25 +-
 src/librustc/ty/sty.rs                        |   185 +-
 src/librustc/ty/util.rs                       |   146 +-
 src/librustc_ast/Cargo.toml                   |    21 +
 src/librustc_ast/README.md                    |     9 +
 src/{libsyntax => librustc_ast}/ast.rs        |   336 +-
 src/{libsyntax => librustc_ast}/ast/tests.rs  |     0
 src/librustc_ast/attr/mod.rs                  |   729 ++
 src/{libsyntax => librustc_ast}/build.rs      |     0
 src/{libsyntax => librustc_ast}/entry.rs      |     0
 .../expand/allocator.rs                       |     0
 src/{libsyntax => librustc_ast}/expand/mod.rs |     0
 src/librustc_ast/lib.rs                       |    63 +
 src/{libsyntax => librustc_ast}/mut_visit.rs  |   106 +-
 src/librustc_ast/node_id.rs                   |    48 +
 src/{libsyntax => librustc_ast}/ptr.rs        |     0
 src/{libsyntax => librustc_ast}/token.rs      |   208 +-
 .../tokenstream.rs                            |     7 +
 .../util/classify.rs                          |     0
 .../util/comments.rs                          |    11 +-
 .../util/comments/tests.rs                    |     0
 .../util/lev_distance.rs                      |     0
 .../util/lev_distance/tests.rs                |     0
 .../util/literal.rs                           |     4 +-
 .../util/map_in_place.rs                      |     0
 .../util/parser.rs                            |     2 +-
 src/{libsyntax => librustc_ast}/visit.rs      |   196 +-
 src/librustc_ast_lowering/Cargo.toml          |     3 +-
 src/librustc_ast_lowering/expr.rs             |    31 +-
 src/librustc_ast_lowering/item.rs             |   241 +-
 src/librustc_ast_lowering/lib.rs              |   125 +-
 src/librustc_ast_lowering/pat.rs              |     4 +-
 src/librustc_ast_lowering/path.rs             |     8 +-
 src/librustc_ast_passes/Cargo.toml            |     4 +-
 src/librustc_ast_passes/ast_validation.rs     |   631 +-
 src/librustc_ast_passes/feature_gate.rs       |    99 +-
 src/librustc_ast_passes/lib.rs                |     5 +-
 .../node_count.rs                             |    12 +-
 src/librustc_ast_passes/show_span.rs          |     6 +-
 src/librustc_ast_pretty/Cargo.toml            |    16 +
 .../print => librustc_ast_pretty}/helpers.rs  |     2 +-
 src/librustc_ast_pretty/lib.rs                |     7 +
 .../print => librustc_ast_pretty}/pp.rs       |     0
 .../print => librustc_ast_pretty}/pprust.rs   |   396 +-
 .../pprust/tests.rs                           |    20 +-
 src/librustc_attr/Cargo.toml                  |    22 +
 src/librustc_attr/builtin.rs                  |  1072 ++
 src/librustc_attr/lib.rs                      |    16 +
 src/librustc_builtin_macros/Cargo.toml        |     4 +-
 src/librustc_builtin_macros/asm.rs            |    28 +-
 src/librustc_builtin_macros/assert.rs         |    24 +-
 src/librustc_builtin_macros/cfg.rs            |     8 +-
 src/librustc_builtin_macros/cmdline_attrs.rs  |     8 +-
 src/librustc_builtin_macros/compile_error.rs  |     2 +-
 src/librustc_builtin_macros/concat.rs         |     6 +-
 src/librustc_builtin_macros/concat_idents.rs  |     8 +-
 .../deriving/bounds.rs                        |     2 +-
 src/librustc_builtin_macros/deriving/clone.rs |     4 +-
 .../deriving/cmp/eq.rs                        |     8 +-
 .../deriving/cmp/ord.rs                       |     4 +-
 .../deriving/cmp/partial_eq.rs                |     4 +-
 .../deriving/cmp/partial_ord.rs               |     4 +-
 src/librustc_builtin_macros/deriving/debug.rs |     6 +-
 .../deriving/decodable.rs                     |     6 +-
 .../deriving/default.rs                       |     4 +-
 .../deriving/encodable.rs                     |     4 +-
 .../deriving/generic/mod.rs                   |    59 +-
 .../deriving/generic/ty.rs                    |     4 +-
 src/librustc_builtin_macros/deriving/hash.rs  |     4 +-
 src/librustc_builtin_macros/deriving/mod.rs   |     8 +-
 src/librustc_builtin_macros/env.rs            |     4 +-
 src/librustc_builtin_macros/format.rs         |    91 +-
 .../global_allocator.rs                       |    21 +-
 src/librustc_builtin_macros/global_asm.rs     |     8 +-
 src/librustc_builtin_macros/lib.rs            |     2 +-
 src/librustc_builtin_macros/log_syntax.rs     |     7 +-
 .../proc_macro_harness.rs                     |    75 +-
 src/librustc_builtin_macros/source_util.rs    |    10 +-
 .../standard_library_imports.rs               |     6 +-
 src/librustc_builtin_macros/test.rs           |   179 +-
 src/librustc_builtin_macros/test_harness.rs   |    40 +-
 src/librustc_builtin_macros/trace_macros.rs   |     2 +-
 src/librustc_builtin_macros/util.rs           |     2 +-
 src/librustc_codegen_llvm/Cargo.toml          |     4 +-
 src/librustc_codegen_llvm/abi.rs              |     2 +-
 src/librustc_codegen_llvm/allocator.rs        |     2 +-
 src/librustc_codegen_llvm/asm.rs              |    14 +-
 src/librustc_codegen_llvm/attributes.rs       |    28 +-
 src/librustc_codegen_llvm/back/lto.rs         |   184 +-
 src/librustc_codegen_llvm/back/profiling.rs   |    58 +
 src/librustc_codegen_llvm/back/write.rs       |   215 +-
 src/librustc_codegen_llvm/base.rs             |     7 +-
 src/librustc_codegen_llvm/builder.rs          |    41 +-
 src/librustc_codegen_llvm/common.rs           |     3 +-
 src/librustc_codegen_llvm/consts.rs           |     8 +-
 src/librustc_codegen_llvm/context.rs          |    21 +-
 .../debuginfo/create_scope_map.rs             |    10 +-
 src/librustc_codegen_llvm/debuginfo/gdb.rs    |     2 +-
 .../debuginfo/metadata.rs                     |   281 +-
 src/librustc_codegen_llvm/debuginfo/mod.rs    |   155 +-
 .../debuginfo/namespace.rs                    |    12 +-
 .../debuginfo/source_loc.rs                   |    90 +-
 src/librustc_codegen_llvm/declare.rs          |    16 -
 src/librustc_codegen_llvm/intrinsic.rs        |     4 +-
 src/librustc_codegen_llvm/lib.rs              |    55 +-
 src/librustc_codegen_llvm/llvm/ffi.rs         |   109 +-
 src/librustc_codegen_llvm/llvm/mod.rs         |     1 +
 src/librustc_codegen_llvm/llvm_util.rs        |    20 +-
 src/librustc_codegen_llvm/metadata.rs         |    16 +-
 src/librustc_codegen_llvm/type_.rs            |     2 +-
 src/librustc_codegen_llvm/va_arg.rs           |     3 +-
 src/librustc_codegen_ssa/Cargo.toml           |     3 +-
 src/librustc_codegen_ssa/back/link.rs         |   125 +-
 src/librustc_codegen_ssa/back/linker.rs       |    21 +
 .../back/symbol_export.rs                     |     2 +-
 src/librustc_codegen_ssa/back/write.rs        |    42 +-
 src/librustc_codegen_ssa/base.rs              |    37 +-
 src/librustc_codegen_ssa/build.rs             |     4 +
 src/librustc_codegen_ssa/lib.rs               |     5 -
 src/librustc_codegen_ssa/mir/analyze.rs       |    27 +-
 src/librustc_codegen_ssa/mir/block.rs         |    28 +-
 src/librustc_codegen_ssa/mir/constant.rs      |    30 +-
 src/librustc_codegen_ssa/mir/debuginfo.rs     |   228 +-
 src/librustc_codegen_ssa/mir/mod.rs           |    20 +-
 src/librustc_codegen_ssa/mir/operand.rs       |    25 +-
 src/librustc_codegen_ssa/mir/place.rs         |    10 +-
 src/librustc_codegen_ssa/mir/rvalue.rs        |     8 +-
 src/librustc_codegen_ssa/mir/statement.rs     |     6 +-
 src/librustc_codegen_ssa/traits/backend.rs    |     5 +-
 src/librustc_codegen_ssa/traits/builder.rs    |     2 +-
 src/librustc_codegen_ssa/traits/debuginfo.rs  |    30 +-
 src/librustc_codegen_ssa/traits/mod.rs        |     3 +-
 src/librustc_codegen_utils/Cargo.toml         |     2 +-
 src/librustc_codegen_utils/codegen_backend.rs |    13 +-
 src/librustc_codegen_utils/lib.rs             |     4 -
 src/librustc_codegen_utils/link.rs            |     4 +-
 src/librustc_codegen_utils/symbol_names.rs    |     2 +-
 src/librustc_codegen_utils/symbol_names/v0.rs |     2 +-
 src/librustc_data_structures/box_region.rs    |    39 +
 .../graph/vec_graph/tests.rs                  |     2 +-
 src/librustc_data_structures/lib.rs           |     3 -
 src/librustc_data_structures/macros.rs        |    38 +
 .../obligation_forest/graphviz.rs             |     5 +-
 .../obligation_forest/mod.rs                  |    39 +-
 .../obligation_forest/tests.rs                |     4 +-
 src/librustc_data_structures/profiling.rs     |   129 +-
 src/librustc_data_structures/sharded.rs       |    17 +-
 src/librustc_data_structures/sip128.rs        |   121 +-
 src/librustc_data_structures/sorted_map.rs    |     4 +
 .../sorted_map/index_map.rs                   |   218 +
 .../sorted_map/tests.rs                       |    28 +-
 src/librustc_data_structures/stable_hasher.rs |     1 +
 src/librustc_data_structures/sync.rs          |    10 +-
 src/librustc_driver/Cargo.toml                |     4 +-
 src/librustc_driver/args.rs                   |     2 +-
 src/librustc_driver/lib.rs                    |    72 +-
 src/librustc_driver/pretty.rs                 |    39 +-
 src/librustc_error_codes/error_codes.rs       |     8 +-
 src/librustc_error_codes/error_codes/E0009.md |     6 +-
 src/librustc_error_codes/error_codes/E0080.md |     9 +-
 src/librustc_error_codes/error_codes/E0133.md |     4 +-
 src/librustc_error_codes/error_codes/E0154.md |     7 +-
 src/librustc_error_codes/error_codes/E0260.md |     7 +-
 src/librustc_error_codes/error_codes/E0263.md |    17 +-
 src/librustc_error_codes/error_codes/E0264.md |     4 +-
 src/librustc_error_codes/error_codes/E0267.md |     6 +-
 src/librustc_error_codes/error_codes/E0268.md |     7 +-
 src/librustc_error_codes/error_codes/E0271.md |    12 +-
 src/librustc_error_codes/error_codes/E0275.md |    10 +-
 src/librustc_error_codes/error_codes/E0276.md |     5 +-
 src/librustc_error_codes/error_codes/E0277.md |     4 +-
 src/librustc_error_codes/error_codes/E0282.md |    18 +-
 src/librustc_error_codes/error_codes/E0283.md |     9 +-
 src/librustc_error_codes/error_codes/E0303.md |     4 +-
 src/librustc_error_codes/error_codes/E0307.md |    20 +-
 src/librustc_error_codes/error_codes/E0309.md |    22 +-
 src/librustc_error_codes/error_codes/E0310.md |    13 +-
 src/librustc_error_codes/error_codes/E0317.md |    30 +-
 src/librustc_error_codes/error_codes/E0321.md |     4 +-
 src/librustc_error_codes/error_codes/E0322.md |    10 +
 src/librustc_error_codes/error_codes/E0323.md |     1 +
 src/librustc_error_codes/error_codes/E0324.md |     5 +-
 src/librustc_error_codes/error_codes/E0325.md |     1 +
 src/librustc_error_codes/error_codes/E0326.md |     8 +-
 src/librustc_error_codes/error_codes/E0364.md |     6 +-
 src/librustc_error_codes/error_codes/E0365.md |     6 +-
 src/librustc_error_codes/error_codes/E0367.md |     5 +-
 src/librustc_error_codes/error_codes/E0368.md |     6 +-
 src/librustc_error_codes/error_codes/E0369.md |     1 +
 src/librustc_error_codes/error_codes/E0370.md |     4 +-
 src/librustc_error_codes/error_codes/E0371.md |    12 +-
 src/librustc_error_codes/error_codes/E0373.md |    10 +-
 src/librustc_error_codes/error_codes/E0374.md |    14 +-
 src/librustc_error_codes/error_codes/E0375.md |    19 +-
 src/librustc_error_codes/error_codes/E0376.md |    21 +-
 src/librustc_error_codes/error_codes/E0378.md |    42 +-
 src/librustc_error_codes/error_codes/E0379.md |    12 +
 src/librustc_error_codes/error_codes/E0380.md |    14 +-
 src/librustc_error_codes/error_codes/E0382.md |     9 +-
 src/librustc_error_codes/error_codes/E0384.md |     2 +-
 src/librustc_error_codes/error_codes/E0387.md |     4 +-
 src/librustc_error_codes/error_codes/E0390.md |     4 +-
 src/librustc_error_codes/error_codes/E0391.md |     8 +-
 src/librustc_error_codes/error_codes/E0392.md |     5 +-
 src/librustc_error_codes/error_codes/E0393.md |     3 +-
 src/librustc_error_codes/error_codes/E0399.md |     4 +-
 src/librustc_error_codes/error_codes/E0454.md |     2 +-
 src/librustc_error_codes/error_codes/E0455.md |     6 +-
 src/librustc_error_codes/error_codes/E0458.md |     2 +-
 src/librustc_error_codes/error_codes/E0459.md |     2 +-
 src/librustc_error_codes/error_codes/E0499.md |    10 +-
 src/librustc_error_codes/error_codes/E0501.md |     7 +-
 src/librustc_error_codes/error_codes/E0502.md |     6 +-
 src/librustc_error_codes/error_codes/E0503.md |     6 +-
 src/librustc_error_codes/error_codes/E0505.md |     6 +-
 src/librustc_error_codes/error_codes/E0507.md |     6 +-
 src/librustc_error_codes/error_codes/E0511.md |     2 +-
 src/librustc_error_codes/error_codes/E0525.md |     6 +-
 src/librustc_error_codes/error_codes/E0534.md |     8 +-
 src/librustc_error_codes/error_codes/E0535.md |     8 +-
 src/librustc_error_codes/error_codes/E0536.md |     6 +-
 src/librustc_error_codes/error_codes/E0537.md |     6 +-
 src/librustc_error_codes/error_codes/E0565.md |    14 +-
 src/librustc_error_codes/error_codes/E0591.md |     2 +-
 src/librustc_error_codes/error_codes/E0601.md |     6 +-
 src/librustc_error_codes/error_codes/E0610.md |     7 +-
 src/librustc_error_codes/error_codes/E0626.md |    10 +-
 src/librustc_error_codes/error_codes/E0633.md |     4 +-
 src/librustc_error_codes/error_codes/E0637.md |    32 +
 src/librustc_error_codes/error_codes/E0660.md |     7 +-
 src/librustc_error_codes/error_codes/E0661.md |     7 +-
 src/librustc_error_codes/error_codes/E0662.md |     7 +-
 src/librustc_error_codes/error_codes/E0663.md |     7 +-
 src/librustc_error_codes/error_codes/E0664.md |     7 +-
 src/librustc_error_codes/error_codes/E0668.md |     2 +-
 src/librustc_error_codes/error_codes/E0719.md |    35 +
 src/librustc_error_codes/error_codes/E0727.md |    26 +
 src/librustc_error_codes/error_codes/E0747.md |    20 +
 src/librustc_error_codes/error_codes/E0748.md |    16 +
 src/librustc_error_codes/lib.rs               |     5 +-
 src/librustc_errors/Cargo.toml                |     2 +-
 .../annotate_snippet_emitter_writer.rs        |    10 +-
 src/librustc_errors/diagnostic.rs             |     7 +-
 src/librustc_errors/diagnostic_builder.rs     |    23 +-
 src/librustc_errors/emitter.rs                |   240 +-
 src/librustc_errors/json.rs                   |    44 +-
 src/librustc_errors/lib.rs                    |    52 +-
 src/librustc_errors/registry.rs               |    24 +-
 src/librustc_errors/snippet.rs                |     2 +-
 src/librustc_expand/Cargo.toml                |     4 +-
 src/librustc_expand/base.rs                   |    89 +-
 src/librustc_expand/build.rs                  |    19 +-
 src/librustc_expand/expand.rs                 |   340 +-
 src/librustc_expand/lib.rs                    |     1 +
 src/librustc_expand/mbe.rs                    |     6 +-
 src/librustc_expand/mbe/macro_check.rs        |     8 +-
 src/librustc_expand/mbe/macro_parser.rs       |    79 +-
 src/librustc_expand/mbe/macro_rules.rs        |    87 +-
 src/librustc_expand/mbe/quoted.rs             |    14 +-
 src/librustc_expand/mbe/transcribe.rs         |    17 +-
 src/librustc_expand/mut_visit/tests.rs        |     8 +-
 src/librustc_expand/parse/lexer/tests.rs      |     8 +-
 src/librustc_expand/parse/tests.rs            |    18 +-
 src/librustc_expand/placeholders.rs           |    48 +-
 src/librustc_expand/proc_macro.rs             |     6 +-
 src/librustc_expand/proc_macro_server.rs      |    30 +-
 src/librustc_expand/tests.rs                  |     8 +-
 src/librustc_expand/tokenstream/tests.rs      |     8 +-
 src/librustc_feature/active.rs                |    32 +-
 src/librustc_feature/builtin_attrs.rs         |    21 +-
 src/librustc_feature/removed.rs               |     6 +-
 src/librustc_hir/Cargo.toml                   |     5 +-
 src/librustc_hir/def.rs                       |     4 +-
 src/librustc_hir/hir.rs                       |   167 +-
 src/librustc_hir/intravisit.rs                |     8 +-
 src/librustc_hir/lang_items.rs                |   261 +
 src/librustc_hir/lib.rs                       |     8 +-
 src/librustc_hir/pat_util.rs                  |     2 +-
 src/librustc_hir/print.rs                     |    33 +-
 src/librustc_hir/stable_hash_impls.rs         |    29 +-
 src/librustc_hir/target.rs                    |   125 +
 src/librustc_hir/weak_lang_items.rs           |    48 +
 src/librustc_incremental/Cargo.toml           |     2 +-
 src/librustc_incremental/assert_dep_graph.rs  |     6 +-
 .../assert_module_sources.rs                  |     9 +-
 src/librustc_incremental/lib.rs               |     1 -
 .../persist/dirty_clean.rs                    |    14 +-
 .../persist/file_format.rs                    |     3 +-
 src/librustc_incremental/persist/fs.rs        |     6 +-
 .../persist/work_product.rs                   |     4 +-
 src/librustc_index/vec.rs                     |     8 +
 src/librustc_infer/Cargo.toml                 |    28 +
 src/{librustc => librustc_infer}/infer/at.rs  |     6 +-
 .../infer/canonical/canonicalizer.rs          |    45 +-
 src/librustc_infer/infer/canonical/mod.rs     |   163 +
 .../infer/canonical/query_response.rs         |    99 +-
 .../infer/canonical/substitute.rs             |    35 +-
 .../infer/combine.rs                          |    64 +-
 .../infer/equate.rs                           |    33 +-
 .../infer/error_reporting/mod.rs              |  2106 ++++
 .../infer/error_reporting/need_type_info.rs   |    27 +-
 .../nice_region_error/different_lifetimes.rs  |     4 +-
 .../nice_region_error/find_anon_type.rs       |     6 +-
 .../error_reporting/nice_region_error/mod.rs  |    87 +
 .../nice_region_error/named_anon_conflict.rs  |     8 +-
 .../nice_region_error/outlives_closure.rs     |     4 +-
 .../nice_region_error/placeholder_error.rs    |    27 +-
 .../nice_region_error/static_impl_trait.rs    |     4 +-
 .../trait_impl_difference.rs                  |     4 +-
 .../error_reporting/nice_region_error/util.rs |   132 +
 .../infer/error_reporting/note.rs             |    11 +-
 .../infer/freshen.rs                          |    29 +-
 .../infer/fudge.rs                            |    36 +-
 src/{librustc => librustc_infer}/infer/glb.rs |    13 +-
 .../infer/higher_ranked/README.md             |     0
 src/librustc_infer/infer/higher_ranked/mod.rs |   148 +
 .../infer/lattice.rs                          |    10 +-
 .../infer/lexical_region_resolve/README.md    |     0
 .../infer/lexical_region_resolve/graphviz.rs  |     6 +-
 .../infer/lexical_region_resolve/mod.rs       |  1029 ++
 src/{librustc => librustc_infer}/infer/lub.rs |    13 +-
 src/librustc_infer/infer/mod.rs               |  1816 +++
 src/librustc_infer/infer/nll_relate/mod.rs    |  1007 ++
 src/librustc_infer/infer/opaque_types/mod.rs  |  1328 ++
 .../infer/outlives/env.rs                     |     4 +-
 .../infer/outlives/mod.rs                     |     0
 .../infer/outlives/obligations.rs             |    12 +-
 .../infer/outlives/verify.rs                  |    20 +-
 .../infer/region_constraints/README.md        |     0
 .../infer/region_constraints/leak_check.rs    |    20 +-
 .../infer/region_constraints/mod.rs           |   918 ++
 .../infer/resolve.rs                          |    23 +-
 src/{librustc => librustc_infer}/infer/sub.rs |    23 +-
 .../infer/type_variable.rs                    |    17 +-
 src/librustc_infer/lib.rs                     |    38 +
 .../traits/auto_trait.rs                      |    28 +-
 src/librustc_infer/traits/codegen/mod.rs      |   114 +
 .../traits/coherence.rs                       |    57 +-
 .../traits/engine.rs                          |    12 +-
 .../traits/error_reporting/mod.rs             |  1643 +++
 .../error_reporting/on_unimplemented.rs       |   223 +
 .../traits/error_reporting/suggestions.rs     |   119 +-
 .../traits/fulfill.rs                         |    56 +-
 src/librustc_infer/traits/misc.rs             |    71 +
 src/librustc_infer/traits/mod.rs              |   642 +
 src/librustc_infer/traits/object_safety.rs    |   777 ++
 src/librustc_infer/traits/on_unimplemented.rs |   383 +
 .../traits/project.rs                         |   211 +-
 .../traits/query/dropck_outlives.rs           |   137 +
 .../traits/query/evaluate_obligation.rs       |     0
 .../traits/query/method_autoderef.rs          |     1 +
 src/librustc_infer/traits/query/mod.rs        |    15 +
 src/librustc_infer/traits/query/normalize.rs  |   189 +
 .../traits/query/outlives_bounds.rs           |   103 +
 .../traits/query/type_op/ascribe_user_type.rs |    23 +
 .../traits/query/type_op/custom.rs            |     0
 src/librustc_infer/traits/query/type_op/eq.rs |    23 +
 .../query/type_op/implied_outlives_bounds.rs  |     2 +-
 .../traits/query/type_op/mod.rs               |   136 +
 .../traits/query/type_op/normalize.rs         |    68 +
 .../traits/query/type_op/outlives.rs          |     2 +-
 .../traits/query/type_op/prove_predicate.rs   |    13 +-
 .../traits/query/type_op/subtype.rs           |    20 +
 src/librustc_infer/traits/select.rs           |  3823 ++++++
 src/librustc_infer/traits/specialize/mod.rs   |   472 +
 .../traits/specialize/specialization_graph.rs |   379 +
 src/librustc_infer/traits/structural_impls.rs |    71 +
 .../traits/structural_match.rs                |     9 +-
 src/librustc_infer/traits/util.rs             |   675 ++
 src/{librustc => librustc_infer}/traits/wf.rs |    49 +-
 src/librustc_interface/Cargo.toml             |     4 +-
 src/librustc_interface/callbacks.rs           |     6 +-
 src/librustc_interface/interface.rs           |    25 +-
 src/librustc_interface/lib.rs                 |     2 -
 src/librustc_interface/passes.rs              |    35 +-
 src/librustc_interface/proc_macro_decls.rs    |     2 +-
 src/librustc_interface/queries.rs             |    45 +-
 src/librustc_interface/tests.rs               |    11 +-
 src/librustc_interface/util.rs                |    45 +-
 src/librustc_lexer/src/lib.rs                 |     2 +-
 src/librustc_lexer/src/unescape.rs            |     4 +-
 src/librustc_lint/Cargo.toml                  |     5 +-
 src/librustc_lint/array_into_iter.rs          |     7 +-
 src/librustc_lint/builtin.rs                  |   704 +-
 src/librustc_lint/context.rs                  |   239 +-
 src/librustc_lint/early.rs                    |    68 +-
 src/librustc_lint/internal.rs                 |   114 +-
 src/librustc_lint/late.rs                     |    25 +-
 src/librustc_lint/levels.rs                   |   125 +-
 src/librustc_lint/lib.rs                      |    70 +-
 src/librustc_lint/non_ascii_idents.rs         |    20 +-
 src/librustc_lint/nonstandard_style.rs        |    83 +-
 src/librustc_lint/passes.rs                   |     7 +-
 src/librustc_lint/redundant_semicolon.rs      |    63 +-
 src/librustc_lint/types.rs                    |   223 +-
 src/librustc_lint/unused.rs                   |   196 +-
 src/librustc_llvm/build.rs                    |     2 +-
 src/librustc_macros/Cargo.toml                |     1 -
 src/librustc_macros/src/hash_stable.rs        |     1 -
 src/librustc_macros/src/lib.rs                |     2 -
 src/librustc_macros/src/lift.rs               |     2 -
 src/librustc_macros/src/query.rs              |   105 +-
 src/librustc_macros/src/symbols.rs            |     1 -
 src/librustc_macros/src/type_foldable.rs      |     2 -
 src/librustc_metadata/Cargo.toml              |     4 +-
 src/librustc_metadata/creader.rs              |    46 +-
 src/librustc_metadata/dependency_format.rs    |     2 +-
 src/librustc_metadata/lib.rs                  |     5 -
 src/librustc_metadata/locator.rs              |     2 +-
 src/librustc_metadata/native_libs.rs          |     2 +-
 src/librustc_metadata/rmeta/decoder.rs        |   254 +-
 .../rmeta/decoder/cstore_impl.rs              |    23 +-
 src/librustc_metadata/rmeta/encoder.rs        |    41 +-
 src/librustc_metadata/rmeta/mod.rs            |    11 +-
 src/librustc_mir/Cargo.toml                   |     7 +-
 .../borrow_check/constraint_generation.rs     |    10 +-
 .../diagnostics/conflict_errors.rs            |    91 +-
 .../diagnostics/explain_borrow.rs             |     2 +-
 .../borrow_check/diagnostics/mod.rs           |    46 +-
 .../borrow_check/diagnostics/move_errors.rs   |    15 +-
 .../diagnostics/mutability_errors.rs          |   223 +-
 .../borrow_check/diagnostics/region_errors.rs |    51 +-
 .../borrow_check/diagnostics/region_name.rs   |     6 +-
 src/librustc_mir/borrow_check/facts.rs        |    54 +-
 src/librustc_mir/borrow_check/flows.rs        |   142 -
 src/librustc_mir/borrow_check/invalidation.rs |    10 +-
 .../borrow_check/member_constraints.rs        |     4 +-
 src/librustc_mir/borrow_check/mod.rs          |   384 +-
 src/librustc_mir/borrow_check/nll.rs          |    88 +-
 src/librustc_mir/borrow_check/place_ext.rs    |     2 +-
 .../borrow_check/places_conflict.rs           |    10 +-
 src/librustc_mir/borrow_check/prefixes.rs     |    14 +-
 .../borrow_check/region_infer/dump_mir.rs     |     2 +-
 .../borrow_check/region_infer/mod.rs          |    71 +-
 .../borrow_check/region_infer/opaque_types.rs |   149 +
 .../borrow_check/region_infer/reverse_sccs.rs |    68 +
 .../borrow_check/region_infer/values.rs       |     2 +-
 src/librustc_mir/borrow_check/renumber.rs     |     2 +-
 .../type_check/constraint_conversion.rs       |    18 +-
 .../type_check/free_region_relations.rs       |    21 +-
 .../borrow_check/type_check/input_output.rs   |     2 +-
 .../borrow_check/type_check/liveness/mod.rs   |     6 +-
 .../type_check/liveness/polonius.rs           |    45 +-
 .../borrow_check/type_check/liveness/trace.rs |    50 +-
 .../borrow_check/type_check/mod.rs            |   181 +-
 .../borrow_check/type_check/relate_tys.rs     |    10 +-
 .../borrow_check/universal_regions.rs         |    31 +-
 src/librustc_mir/const_eval.rs                |    92 -
 src/librustc_mir/const_eval/error.rs          |    28 +-
 src/librustc_mir/const_eval/eval_queries.rs   |    49 +-
 src/librustc_mir/const_eval/fn_queries.rs     |   132 +-
 src/librustc_mir/const_eval/machine.rs        |   106 +-
 src/librustc_mir/const_eval/mod.rs            |    87 +
 src/librustc_mir/dataflow/at_location.rs      |    41 -
 src/librustc_mir/dataflow/generic/cursor.rs   |     7 +
 src/librustc_mir/dataflow/generic/engine.rs   |   131 +-
 src/librustc_mir/dataflow/generic/graphviz.rs |   132 +-
 src/librustc_mir/dataflow/generic/mod.rs      |    97 +
 src/librustc_mir/dataflow/generic/visitor.rs  |   272 +
 src/librustc_mir/dataflow/graphviz.rs         |     2 +-
 .../dataflow/impls/borrowed_locals.rs         |   292 +-
 src/librustc_mir/dataflow/impls/borrows.rs    |    96 +-
 .../dataflow/impls/indirect_mutation.rs       |   136 -
 src/librustc_mir/dataflow/impls/mod.rs        |   254 +-
 .../dataflow/impls/storage_liveness.rs        |   285 +-
 src/librustc_mir/dataflow/mod.rs              |    18 +-
 .../dataflow/move_paths/builder.rs            |    10 +-
 src/librustc_mir/dataflow/move_paths/mod.rs   |    99 +-
 src/librustc_mir/interpret/cast.rs            |     4 +-
 src/librustc_mir/interpret/eval_context.rs    |    30 +-
 src/librustc_mir/interpret/intern.rs          |    20 +-
 src/librustc_mir/interpret/intrinsics.rs      |    85 +-
 .../interpret/intrinsics/caller_location.rs   |    12 +-
 src/librustc_mir/interpret/machine.rs         |    51 +-
 src/librustc_mir/interpret/memory.rs          |    98 +-
 src/librustc_mir/interpret/operand.rs         |    73 +-
 src/librustc_mir/interpret/operator.rs        |    78 +-
 src/librustc_mir/interpret/place.rs           |    10 +-
 src/librustc_mir/interpret/snapshot.rs        |     4 +-
 src/librustc_mir/interpret/step.rs            |     5 +-
 src/librustc_mir/interpret/terminator.rs      |    11 +-
 src/librustc_mir/interpret/validity.rs        |   549 +-
 src/librustc_mir/interpret/visitor.rs         |   120 +-
 src/librustc_mir/lib.rs                       |     9 +-
 src/librustc_mir/monomorphize/collector.rs    |    45 +-
 src/librustc_mir/monomorphize/mod.rs          |     4 +-
 src/librustc_mir/monomorphize/partitioning.rs |    13 +-
 src/librustc_mir/shim.rs                      |     3 +-
 src/librustc_mir/transform/add_retag.rs       |     8 +-
 .../transform/check_consts/ops.rs             |     6 +-
 .../transform/check_consts/qualifs.rs         |    55 +-
 .../transform/check_consts/resolver.rs        |    18 +-
 .../transform/check_consts/validation.rs      |   145 +-
 src/librustc_mir/transform/check_unsafety.rs  |   171 +-
 src/librustc_mir/transform/const_prop.rs      |   295 +-
 src/librustc_mir/transform/dump_mir.rs        |     2 +-
 src/librustc_mir/transform/elaborate_drops.rs |   153 +-
 src/librustc_mir/transform/generator.rs       |   252 +-
 src/librustc_mir/transform/inline.rs          |    33 +-
 src/librustc_mir/transform/mod.rs             |     6 +-
 src/librustc_mir/transform/promote_consts.rs  |    25 +-
 .../transform/qualify_min_const_fn.rs         |    14 +-
 src/librustc_mir/transform/rustc_peek.rs      |    86 +-
 src/librustc_mir/transform/simplify.rs        |     2 +-
 src/librustc_mir/transform/simplify_try.rs    |     5 +-
 .../transform/uninhabited_enum_branching.rs   |     4 +-
 src/librustc_mir/util/aggregate.rs            |     1 -
 src/librustc_mir/util/alignment.rs            |     2 +-
 src/librustc_mir/util/elaborate_drops.rs      |    55 +-
 src/librustc_mir/util/liveness.rs             |     5 +-
 src/librustc_mir/util/patch.rs                |     2 +-
 src/librustc_mir/util/pretty.rs               |     6 +-
 src/librustc_mir_build/Cargo.toml             |     5 +-
 src/librustc_mir_build/build/block.rs         |     2 +-
 src/librustc_mir_build/build/expr/as_place.rs |     8 +-
 .../build/expr/as_rvalue.rs                   |    36 +-
 src/librustc_mir_build/build/expr/category.rs |     2 +-
 src/librustc_mir_build/build/expr/into.rs     |    21 +-
 src/librustc_mir_build/build/matches/mod.rs   |   862 +-
 .../build/matches/simplify.rs                 |    56 +-
 src/librustc_mir_build/build/matches/test.rs  |    49 +-
 src/librustc_mir_build/build/mod.rs           |    86 +-
 src/librustc_mir_build/hair/constant.rs       |     4 +-
 src/librustc_mir_build/hair/cx/block.rs       |     2 +-
 src/librustc_mir_build/hair/cx/expr.rs        |    35 +-
 src/librustc_mir_build/hair/cx/mod.rs         |    28 +-
 src/librustc_mir_build/hair/mod.rs            |    11 -
 src/librustc_mir_build/hair/pattern/_match.rs |    79 +-
 .../hair/pattern/check_match.rs               |   255 +-
 .../hair/pattern/const_to_pat.rs              |    29 +-
 src/librustc_mir_build/hair/pattern/mod.rs    |    11 +-
 src/librustc_mir_build/lib.rs                 |     1 -
 src/librustc_mir_build/lints.rs               |    23 +-
 src/librustc_parse/Cargo.toml                 |     4 +-
 src/librustc_parse/config.rs                  |   129 +-
 src/librustc_parse/lexer/mod.rs               |    36 +-
 src/librustc_parse/lexer/tokentrees.rs        |    30 +-
 .../lexer/unescape_error_reporting.rs         |     2 +-
 src/librustc_parse/lib.rs                     |    32 +-
 src/librustc_parse/parser/attr.rs             |    26 +-
 src/librustc_parse/parser/diagnostics.rs      |   170 +-
 src/librustc_parse/parser/expr.rs             |   368 +-
 src/librustc_parse/parser/generics.rs         |    51 +-
 src/librustc_parse/parser/item.rs             |  1778 ++-
 src/librustc_parse/parser/mod.rs              |   392 +-
 src/librustc_parse/parser/module.rs           |    42 +-
 src/librustc_parse/parser/pat.rs              |    85 +-
 src/librustc_parse/parser/path.rs             |    81 +-
 src/librustc_parse/parser/stmt.rs             |   305 +-
 src/librustc_parse/parser/ty.rs               |   132 +-
 src/librustc_parse/validate_attr.rs           |    14 +-
 src/librustc_passes/Cargo.toml                |     4 +-
 src/librustc_passes/check_attr.rs             |   481 +
 src/librustc_passes/check_const.rs            |     7 +-
 src/librustc_passes/dead.rs                   |    22 +-
 src/librustc_passes/diagnostic_items.rs       |     6 +-
 src/librustc_passes/entry.rs                  |    12 +-
 src/librustc_passes/hir_stats.rs              |    25 +-
 src/librustc_passes/lang_items.rs             |   174 +
 src/librustc_passes/layout_test.rs            |     2 +-
 src/librustc_passes/lib.rs                    |     8 +-
 src/librustc_passes/lib_features.rs           |     2 +-
 src/librustc_passes/liveness.rs               |   138 +-
 src/librustc_passes/loops.rs                  |     2 +-
 src/librustc_passes/reachable.rs              |    12 +-
 src/librustc_passes/region.rs                 |     6 +-
 src/librustc_passes/stability.rs              |   318 +-
 .../hir => librustc_passes}/upvars.rs         |     6 +-
 src/librustc_passes/weak_lang_items.rs        |   103 +
 src/librustc_plugin_impl/Cargo.toml           |     2 +-
 src/librustc_plugin_impl/build.rs             |     2 +-
 src/librustc_plugin_impl/load.rs              |     2 +-
 src/librustc_privacy/Cargo.toml               |     3 +-
 src/librustc_privacy/lib.rs                   |    37 +-
 src/librustc_resolve/Cargo.toml               |     5 +-
 src/librustc_resolve/build_reduced_graph.rs   |   118 +-
 src/librustc_resolve/check_unused.rs          |    44 +-
 src/librustc_resolve/def_collector.rs         |    55 +-
 src/librustc_resolve/diagnostics.rs           |   139 +-
 src/librustc_resolve/imports.rs               |   383 +-
 src/librustc_resolve/late.rs                  |   241 +-
 src/librustc_resolve/late/diagnostics.rs      |   281 +-
 src/librustc_resolve/{ => late}/lifetimes.rs  |   187 +-
 src/librustc_resolve/lib.rs                   |   124 +-
 src/librustc_resolve/macros.rs                |     6 +-
 src/librustc_save_analysis/Cargo.toml         |     3 +-
 src/librustc_save_analysis/dump_visitor.rs    |    99 +-
 src/librustc_save_analysis/lib.rs             |    68 +-
 src/librustc_save_analysis/sig.rs             |    72 +-
 src/librustc_save_analysis/span_utils.rs      |     2 +-
 src/librustc_session/Cargo.toml               |     1 +
 src/librustc_session/code_stats.rs            |     2 +-
 src/librustc_session/config.rs                |    50 +-
 src/librustc_session/lib.rs                   |     1 -
 src/librustc_session/lint.rs                  |     3 +-
 src/librustc_session/lint/builtin.rs          |    39 +-
 src/librustc_session/node_id.rs               |    40 -
 src/librustc_session/options.rs               |    32 +-
 src/librustc_session/parse.rs                 |    36 +-
 src/librustc_session/session.rs               |    26 +-
 src/librustc_span/caching_source_map_view.rs  |     8 +-
 src/{librustc_hir => librustc_span}/def_id.rs |    28 +-
 src/librustc_span/lib.rs                      |    20 +-
 src/librustc_span/source_map.rs               |    82 +-
 src/librustc_span/symbol.rs                   |    97 +-
 src/librustc_target/abi/call/aarch64.rs       |     2 +-
 src/librustc_target/abi/call/arm.rs           |     2 +-
 src/librustc_target/abi/call/mod.rs           |   173 +-
 src/librustc_target/abi/call/powerpc64.rs     |     2 +-
 src/librustc_target/abi/call/riscv.rs         |   335 +-
 src/librustc_target/abi/call/sparc64.rs       |     2 +-
 src/librustc_target/abi/call/wasm32.rs        |     2 +-
 src/librustc_target/abi/call/x86.rs           |     2 +-
 src/librustc_target/abi/call/x86_64.rs        |    24 +-
 src/librustc_target/abi/mod.rs                |    28 +-
 src/librustc_target/lib.rs                    |     2 -
 src/librustc_target/spec/apple_base.rs        |     2 +-
 .../spec/i686_pc_windows_gnu.rs               |     1 +
 src/librustc_target/spec/i686_unknown_uefi.rs |     4 +-
 .../spec/nvptx64_nvidia_cuda.rs               |     4 +-
 src/librustc_target/spec/thumb_base.rs        |     3 +
 src/librustc_target/spec/windows_msvc_base.rs |     7 +-
 .../spec/x86_64_pc_windows_gnu.rs             |     1 +
 src/librustc_traits/Cargo.toml                |     4 +-
 src/librustc_traits/chalk_context/mod.rs      |   638 -
 .../chalk_context/program_clauses/builtin.rs  |   316 -
 .../chalk_context/program_clauses/mod.rs      |   300 -
 .../program_clauses/primitive.rs              |   168 -
 .../chalk_context/resolvent_ops.rs            |   293 -
 src/librustc_traits/chalk_context/unify.rs    |    85 -
 src/librustc_traits/dropck_outlives.rs        |    18 +-
 src/librustc_traits/evaluate_obligation.rs    |     9 +-
 src/librustc_traits/generic_types.rs          |    67 -
 .../implied_outlives_bounds.rs                |    16 +-
 src/librustc_traits/lib.rs                    |     3 -
 src/librustc_traits/lowering/environment.rs   |     2 +-
 src/librustc_traits/lowering/mod.rs           |     4 +-
 .../normalize_erasing_regions.rs              |     3 +-
 .../normalize_projection_ty.rs                |     9 +-
 src/librustc_traits/type_op.rs                |    20 +-
 src/librustc_ty/Cargo.toml                    |     2 +
 src/librustc_ty/common_traits.rs              |    41 +
 src/librustc_ty/instance.rs                   |   136 +
 src/librustc_ty/lib.rs                        |     7 +-
 src/librustc_ty/needs_drop.rs                 |   165 +
 src/librustc_ty/ty.rs                         |    23 +-
 src/librustc_typeck/Cargo.toml                |     4 +-
 src/librustc_typeck/astconv.rs                |   444 +-
 src/librustc_typeck/check/_match.rs           |     6 +-
 src/librustc_typeck/check/autoderef.rs        |    10 +-
 src/librustc_typeck/check/callee.rs           |     6 +-
 src/librustc_typeck/check/cast.rs             |    32 +-
 src/librustc_typeck/check/closure.rs          |    41 +-
 src/librustc_typeck/check/coercion.rs         |    15 +-
 src/librustc_typeck/check/compare_method.rs   |     4 +-
 src/librustc_typeck/check/demand.rs           |    60 +-
 src/librustc_typeck/check/dropck.rs           |     7 +-
 src/librustc_typeck/check/expr.rs             |    28 +-
 .../check/generator_interior.rs               |    48 +-
 src/librustc_typeck/check/method/confirm.rs   |    42 +-
 src/librustc_typeck/check/method/mod.rs       |    62 +-
 src/librustc_typeck/check/method/probe.rs     |   303 +-
 src/librustc_typeck/check/method/suggest.rs   |   338 +-
 src/librustc_typeck/check/mod.rs              |   387 +-
 src/librustc_typeck/check/op.rs               |    94 +-
 src/librustc_typeck/check/pat.rs              |   295 +-
 src/librustc_typeck/check/regionck.rs         |     4 +-
 src/librustc_typeck/check/upvar.rs            |     4 +-
 src/librustc_typeck/check/wfcheck.rs          |   220 +-
 src/librustc_typeck/check/writeback.rs        |     9 +-
 src/librustc_typeck/check_unused.rs           |    87 +-
 src/librustc_typeck/coherence/builtin.rs      |    24 +-
 .../coherence/inherent_impls.rs               |     8 +-
 .../coherence/inherent_impls_overlap.rs       |   138 +-
 src/librustc_typeck/coherence/mod.rs          |    86 +-
 src/librustc_typeck/coherence/orphan.rs       |     9 +-
 src/librustc_typeck/collect.rs                |   949 +-
 src/librustc_typeck/collect/type_of.rs        |   661 +
 src/librustc_typeck/expr_use_visitor.rs       |     2 +-
 src/librustc_typeck/impl_wf_check.rs          |    21 +-
 src/librustc_typeck/lib.rs                    |    10 +-
 src/librustc_typeck/mem_categorization.rs     |     3 +-
 src/librustc_typeck/namespace.rs              |    27 -
 .../outlives/implicit_infer.rs                |     6 +-
 src/librustc_typeck/outlives/mod.rs           |     2 +-
 src/librustc_typeck/outlives/utils.rs         |     2 +-
 src/librustc_typeck/variance/constraints.rs   |     2 +-
 src/librustc_typeck/variance/mod.rs           |     3 +-
 src/librustdoc/Cargo.toml                     |     2 +-
 src/librustdoc/clean/auto_trait.rs            |     4 +-
 src/librustdoc/clean/blanket_impl.rs          |     6 +-
 src/librustdoc/clean/cfg.rs                   |     4 +-
 src/librustdoc/clean/cfg/tests.rs             |     6 +-
 src/librustdoc/clean/inline.rs                |    50 +-
 src/librustdoc/clean/mod.rs                   |    56 +-
 src/librustdoc/clean/types.rs                 |    41 +-
 src/librustdoc/clean/utils.rs                 |    41 +-
 src/librustdoc/config.rs                      |     7 +-
 src/librustdoc/core.rs                        |    14 +-
 src/librustdoc/docfs.rs                       |    12 +-
 src/librustdoc/doctree.rs                     |     8 +-
 src/librustdoc/html/format.rs                 |    27 +-
 src/librustdoc/html/highlight.rs              |    23 +-
 src/librustdoc/html/item_type.rs              |    10 +-
 src/librustdoc/html/markdown.rs               |   192 +-
 src/librustdoc/html/render.rs                 |   123 +-
 src/librustdoc/html/render/cache.rs           |    33 +-
 src/librustdoc/html/static/brush.svg          |     2 +-
 src/librustdoc/html/static/down-arrow.svg     |     2 +-
 src/librustdoc/html/static/main.js            |    58 +-
 src/librustdoc/html/static/rustdoc.css        |   100 +-
 src/librustdoc/html/static/themes/dark.css    |    33 -
 src/librustdoc/html/static/themes/light.css   |    33 -
 src/librustdoc/html/static/wheel.svg          |     2 +-
 src/librustdoc/lib.rs                         |     9 +-
 src/librustdoc/markdown.rs                    |     3 +-
 .../passes/calculate_doc_coverage.rs          |     2 +-
 .../passes/check_code_block_syntax.rs         |     8 +-
 .../passes/collect_intra_doc_links.rs         |   285 +-
 src/librustdoc/passes/mod.rs                  |    19 +-
 src/librustdoc/test.rs                        |    25 +-
 src/librustdoc/theme.rs                       |    35 +-
 src/librustdoc/theme/tests.rs                 |    13 +
 src/librustdoc/visit_ast.rs                   |     2 +-
 src/libserialize/leb128.rs                    |    64 +-
 src/libserialize/lib.rs                       |     1 -
 src/libserialize/opaque.rs                    |    12 +-
 src/libserialize/serialize.rs                 |    19 +
 src/libstd/Cargo.toml                         |     2 +-
 src/libstd/alloc.rs                           |    47 +-
 src/libstd/backtrace.rs                       |    71 +-
 src/libstd/collections/hash/map.rs            |   128 +-
 src/libstd/collections/hash/set.rs            |    20 +-
 src/libstd/f32.rs                             |     3 +
 src/libstd/f64.rs                             |     3 +
 src/libstd/ffi/c_str.rs                       |    27 +
 src/libstd/fs.rs                              |    14 +-
 src/libstd/future.rs                          |     8 +-
 src/libstd/io/buffered.rs                     |    45 +
 src/libstd/io/cursor.rs                       |     2 +-
 src/libstd/io/mod.rs                          |    12 +-
 src/libstd/io/stdio.rs                        |     2 +-
 src/libstd/keyword_docs.rs                    |    58 +-
 src/libstd/lib.rs                             |    18 +-
 src/libstd/macros.rs                          |    23 +-
 src/libstd/net/addr.rs                        |     2 +-
 src/libstd/net/ip.rs                          |    74 +-
 src/libstd/net/parser.rs                      |     2 +-
 src/libstd/os/linux/fs.rs                     |     2 +-
 src/libstd/panicking.rs                       |     4 +-
 src/libstd/path.rs                            |     2 +-
 src/libstd/primitive_docs.rs                  |    28 +-
 src/libstd/sync/mpsc/spsc_queue.rs            |     2 +-
 src/libstd/sync/mutex.rs                      |     2 +-
 src/libstd/sync/once.rs                       |    11 +-
 src/libstd/sync/rwlock.rs                     |     7 +-
 src/libstd/sys/sgx/abi/entry.S                |    40 +-
 src/libstd/sys/sgx/abi/usercalls/alloc.rs     |     2 +-
 src/libstd/sys/sgx/args.rs                    |     7 +-
 src/libstd/sys/sgx/rwlock.rs                  |    24 +-
 src/libstd/sys/unix/mod.rs                    |     2 +-
 src/libstd/sys/unix/net.rs                    |     2 +-
 src/libstd/sys/unix/process/process_common.rs |     8 +-
 src/libstd/sys/unix/stack_overflow.rs         |    28 +-
 src/libstd/sys/unix/thread.rs                 |     9 +-
 src/libstd/sys/unix/time.rs                   |     1 -
 src/libstd/sys/vxworks/mod.rs                 |     2 +-
 src/libstd/sys/wasi/fd.rs                     |    12 +-
 src/libstd/sys/wasi/fs.rs                     |    10 +-
 src/libstd/sys_common/backtrace.rs            |     1 +
 src/libstd/tests/run-time-detect.rs           |     1 +
 src/libstd/time.rs                            |     6 +-
 src/libsyntax/Cargo.toml                      |    24 -
 src/libsyntax/README.md                       |     9 -
 src/libsyntax/attr/builtin.rs                 |  1032 --
 src/libsyntax/attr/mod.rs                     |   737 --
 src/libsyntax/lib.rs                          |   104 -
 src/libtest/cli.rs                            |     5 +-
 src/libtest/console.rs                        |     2 -
 src/libtest/formatters/json.rs                |     2 +-
 src/libtest/lib.rs                            |    32 +-
 src/libtest/options.rs                        |     2 +-
 src/libtest/test_result.rs                    |     4 +-
 src/rustllvm/ArchiveWrapper.cpp               |     3 +
 src/rustllvm/PassWrapper.cpp                  |   336 +-
 src/rustllvm/RustWrapper.cpp                  |   160 +-
 src/stage0.txt                                |    15 +-
 src/stdarch/.github/workflows/main.yml        |   209 +
 src/stdarch/QUESTIONS.md                      |    31 -
 src/stdarch/README.md                         |     5 +-
 src/stdarch/ci/azure-install-rust.yml         |    76 -
 src/stdarch/ci/azure.yml                      |   221 -
 .../mipsel-unknown-linux-musl/Dockerfile      |     4 +-
 src/stdarch/ci/dox.sh                         |     2 +
 src/stdarch/ci/style.sh                       |     8 +-
 .../crates/assert-instr-macro/Cargo.toml      |     6 +-
 .../crates/assert-instr-macro/src/lib.rs      |    30 +-
 src/stdarch/crates/core_arch/Cargo.toml       |     1 -
 src/stdarch/crates/core_arch/README.md        |     4 +-
 src/stdarch/crates/core_arch/rustfmt.toml     |     3 +
 src/stdarch/crates/core_arch/src/arm/neon.rs  |     4 +-
 src/stdarch/crates/core_arch/src/mips/msa.rs  |     6 +-
 src/stdarch/crates/core_arch/src/simd.rs      |     1 -
 src/stdarch/crates/core_arch/src/simd_llvm.rs |    30 +
 .../crates/core_arch/src/wasm32/simd128.rs    |     2 +-
 src/stdarch/crates/core_arch/src/x86/avx.rs   |    28 +-
 src/stdarch/crates/core_arch/src/x86/avx2.rs  |    32 +-
 src/stdarch/crates/core_arch/src/x86/bswap.rs |     8 +-
 src/stdarch/crates/core_arch/src/x86/fma.rs   |    17 +-
 src/stdarch/crates/core_arch/src/x86/mod.rs   |    49 +-
 src/stdarch/crates/core_arch/src/x86/sse.rs   |    17 +
 src/stdarch/crates/core_arch/src/x86/sse2.rs  |    34 +-
 src/stdarch/crates/core_arch/src/x86/sse41.rs |    18 +-
 .../crates/core_arch/src/x86_64/bswap.rs      |     8 +-
 .../crates/core_arch/tests/cpu-detection.rs   |    17 +
 src/stdarch/crates/simd-test-macro/Cargo.toml |     4 +-
 src/stdarch/crates/std_detect/Cargo.toml      |     8 +-
 src/stdarch/crates/std_detect/README.md       |     4 +-
 .../std_detect/src/detect/arch/aarch64.rs     |   114 +-
 .../crates/std_detect/src/detect/arch/arm.rs  |    48 +-
 .../crates/std_detect/src/detect/arch/mips.rs |    32 +-
 .../std_detect/src/detect/arch/mips64.rs      |    32 +-
 .../std_detect/src/detect/arch/powerpc.rs     |    45 +-
 .../std_detect/src/detect/arch/powerpc64.rs   |    45 +-
 .../crates/std_detect/src/detect/arch/x86.rs  |   426 +-
 .../crates/std_detect/src/detect/cache.rs     |   132 +-
 .../crates/std_detect/src/detect/macros.rs    |   103 +
 .../crates/std_detect/src/detect/mod.rs       |    63 +-
 .../std_detect/src/detect/os/aarch64.rs       |    19 +-
 .../src/detect/os/freebsd/aarch64.rs          |     9 +-
 .../std_detect/src/detect/os/freebsd/arm.rs   |    12 +-
 .../src/detect/os/freebsd/auxvec.rs           |    36 +-
 .../std_detect/src/detect/os/freebsd/mod.rs   |     2 +-
 .../src/detect/os/freebsd/powerpc.rs          |    12 +-
 .../std_detect/src/detect/os/linux/aarch64.rs |    29 +-
 .../std_detect/src/detect/os/linux/arm.rs     |    21 +-
 .../std_detect/src/detect/os/linux/auxvec.rs  |    33 +-
 .../std_detect/src/detect/os/linux/cpuinfo.rs |     5 +-
 .../std_detect/src/detect/os/linux/mips.rs    |    10 +-
 .../std_detect/src/detect/os/linux/powerpc.rs |    10 +-
 .../crates/std_detect/src/detect/os/other.rs  |     8 +-
 .../src/detect/os/windows/aarch64.rs          |    55 +
 .../crates/std_detect/src/detect/os/x86.rs    |   156 +-
 src/stdarch/crates/std_detect/src/lib.rs      |     9 +-
 .../crates/std_detect/tests/cpu-detection.rs  |    49 +-
 .../crates/std_detect/tests/x86-specific.rs   |   158 +
 .../crates/stdarch-test/src/disassembly.rs    |   139 +-
 src/stdarch/crates/stdarch-test/src/lib.rs    |     3 +-
 src/stdarch/crates/stdarch-test/src/wasm.rs   |     3 +-
 src/stdarch/crates/stdarch-verify/Cargo.toml  |     6 +-
 src/stdarch/crates/stdarch-verify/src/lib.rs  |    46 +-
 src/test/auxiliary/rust_test_helpers.c        |   113 +
 .../partitioning/extern-drop-glue.rs          |    17 +-
 .../partitioning/local-drop-glue.rs           |    39 +-
 src/test/codegen/cfguard_checks.rs            |    10 +
 src/test/codegen/cfguard_disabled.rs          |    10 +
 src/test/codegen/cfguard_nochecks.rs          |    10 +
 src/test/codegen/enum-discriminant-value.rs   |    27 +
 src/test/codegen/issue-45222.rs               |    34 +-
 src/test/codegen/issue-56927.rs               |     2 +-
 src/test/codegen/naked-functions.rs           |     8 +-
 .../riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs |   181 +
 .../codegen/riscv-abi/riscv64-lp64d-abi.rs    |   293 +
 .../riscv-abi/riscv64-lp64f-lp64d-abi.rs      |   277 +
 .../codegen/sanitizer-memory-track-orgins.rs  |     8 +-
 .../codegen/sanitizer-no-sanitize-inlining.rs |    32 +
 src/test/codegen/sanitizer-no-sanitize.rs     |    29 +
 src/test/codegen/sanitizer-recover.rs         |     4 +-
 .../chalkify/chalk_initial_program.rs         |    16 -
 .../compile-fail/chalkify/generic_impls.rs    |    18 -
 src/test/compile-fail/chalkify/impl_wf.rs     |    39 -
 .../recursive_where_clause_on_type.rs         |    28 -
 src/test/compile-fail/chalkify/type_wf.rs     |    24 -
 src/test/compile-fail/consts/const-err3.rs    |    20 -
 src/test/debuginfo/empty-string.rs            |     1 +
 src/test/debuginfo/generator-locals.rs        |     6 +-
 src/test/debuginfo/generator-objects.rs       |     6 +-
 src/test/debuginfo/issue-12886.rs             |     2 +-
 src/test/debuginfo/issue-57822.rs             |     2 +-
 src/test/debuginfo/no-debug-attribute.rs      |    37 -
 .../incremental/const-generics/issue-68477.rs |    23 +
 src/test/incremental/crate_hash_reorder.rs    |     8 +-
 .../incremental/cyclic-trait-hierarchy.rs     |     2 +-
 src/test/incremental/issue-38222.rs           |    12 +-
 .../issue-62649-path-collisions-happen.rs     |    13 +
 src/test/incremental/krate-inherent.rs        |     8 +-
 src/test/incremental/krate-inlined.rs         |     4 +-
 .../cgu_invalidated_when_export_added.rs      |    26 +
 .../cgu_invalidated_when_export_removed.rs    |    26 +
 .../cgu_invalidated_when_import_added.rs      |     2 +-
 .../cgu_invalidated_when_import_removed.rs    |     2 +-
 src/test/incremental/warnings-reemitted.rs    |     4 +-
 src/test/mir-opt/const_prop/discriminant.rs   |    20 +-
 src/test/mir-opt/exponential-or.rs            |    76 +
 src/test/mir-opt/generator-drop-cleanup.rs    |     8 +-
 .../mir-opt/generator-storage-dead-unwind.rs  |    52 +-
 src/test/mir-opt/issue-62289.rs               |    38 +-
 src/test/mir-opt/match-arm-scopes.rs          |   110 +-
 src/test/mir-opt/match_false_edges.rs         |   118 +-
 src/test/mir-opt/match_test.rs                |    28 +-
 src/test/mir-opt/remove_fake_borrows.rs       |    24 +-
 src/test/mir-opt/simplify_try.rs              |    40 +-
 src/test/pretty/gat-bounds.rs                 |    16 +
 src/test/pretty/if-attr.rs                    |    37 +
 .../issue-68710-field-attr-proc-mac-lost.rs   |    16 +
 .../pretty/nested-item-vis-defaultness.rs     |    47 +
 src/test/pretty/trait-inner-attr.rs           |     7 +
 .../run-fail/generator-resume-after-panic.rs  |     4 +-
 src/test/run-fail/mir_indexing_oob_1.rs       |     2 +-
 src/test/run-fail/mir_indexing_oob_2.rs       |     2 +-
 src/test/run-fail/mir_indexing_oob_3.rs       |     2 +-
 src/test/run-fail/overflowing-add.rs          |     2 +-
 src/test/run-fail/overflowing-lsh-1.rs        |     2 +-
 src/test/run-fail/overflowing-lsh-2.rs        |     2 +-
 src/test/run-fail/overflowing-lsh-3.rs        |     2 +-
 src/test/run-fail/overflowing-lsh-4.rs        |     2 +-
 src/test/run-fail/overflowing-mul.rs          |     2 +-
 src/test/run-fail/overflowing-neg.rs          |     2 +-
 src/test/run-fail/overflowing-rsh-1.rs        |     2 +-
 src/test/run-fail/overflowing-rsh-2.rs        |     2 +-
 src/test/run-fail/overflowing-rsh-3.rs        |     2 +-
 src/test/run-fail/overflowing-rsh-4.rs        |     2 +-
 src/test/run-fail/overflowing-rsh-5.rs        |     2 +-
 src/test/run-fail/overflowing-rsh-6.rs        |     2 +-
 src/test/run-fail/overflowing-sub.rs          |     2 +-
 src/test/run-fail/promoted_div_by_zero.rs     |     2 +-
 src/test/run-fail/promoted_overflow.rs        |     2 +-
 .../arguments-non-c-like-enum/Makefile        |     7 +
 .../arguments-non-c-like-enum/nonclike.rs     |    31 +
 .../arguments-non-c-like-enum/test.c          |    66 +
 .../hotplug_codegen_backend/the_backend.rs    |    18 +-
 .../run-make-fulldeps/issue-69368/Makefile    |    18 +
 src/test/run-make-fulldeps/issue-69368/a.rs   |    16 +
 src/test/run-make-fulldeps/issue-69368/b.rs   |     8 +
 src/test/run-make-fulldeps/issue-69368/c.rs   |    34 +
 .../min-global-align/min_global_align.rs      |    10 +-
 .../pass-non-c-like-enum-to-c/Makefile        |     5 +
 .../pass-non-c-like-enum-to-c/nonclike.rs     |    21 +
 .../pass-non-c-like-enum-to-c/test.c          |    85 +
 .../return-non-c-like-enum-from-c/Makefile    |     5 +
 .../return-non-c-like-enum-from-c/nonclike.rs |    31 +
 .../return-non-c-like-enum-from-c/test.c      |    61 +
 .../return-non-c-like-enum/Makefile           |     7 +
 .../return-non-c-like-enum/nonclike.rs        |    21 +
 .../return-non-c-like-enum/test.c             |    63 +
 .../wasm-stringify-ints-small/Makefile        |     2 +-
 src/test/rustdoc-js/struct-like-variant.js    |     7 +
 src/test/rustdoc-js/struct-like-variant.rs    |     8 +
 .../deny-intra-link-resolution-failure.stderr |     2 +-
 .../rustdoc-ui/deny-missing-docs-crate.stderr |     2 +-
 .../rustdoc-ui/deny-missing-docs-macro.stderr |     2 +-
 src/test/rustdoc-ui/deprecated-attrs.stderr   |     4 +-
 .../rustdoc-ui/doc-without-codeblock.stderr   |     2 +-
 .../rustdoc-ui/intra-doc-alias-ice.stderr     |     2 +-
 .../intra-link-span-ice-55723.stderr          |     2 +-
 .../rustdoc-ui/intra-links-ambiguity.stderr   |     2 +-
 .../rustdoc-ui/intra-links-anchors.stderr     |     2 +-
 .../rustdoc-ui/intra-links-warning.stderr     |     1 +
 src/test/rustdoc-ui/lint-group.stderr         |     6 +-
 .../lint-missing-doc-code-example.stderr      |     2 +-
 .../rustdoc-ui/private-item-doc-test.stderr   |     2 +-
 .../rustdoc/auxiliary/primitive-reexport.rs   |     8 +
 src/test/rustdoc/comment-in-doctest.rs        |     2 +-
 src/test/rustdoc/crate-version-escape.rs      |     6 +
 src/test/rustdoc/doc-spotlight.rs             |    36 -
 .../inline_cross/auxiliary/proc_macro.rs      |    13 +
 src/test/rustdoc/inline_cross/proc_macro.rs   |     8 +
 src/test/rustdoc/primitive-reexport.rs        |    28 +
 src/test/rustdoc/show-const-contents.rs       |     6 +-
 .../auxiliary/issue-40001-plugin.rs           |    39 +-
 .../auxiliary/lint-for-crate-rpass.rs         |    18 +-
 .../ui-fulldeps/auxiliary/lint-for-crate.rs   |    19 +-
 .../auxiliary/lint-group-plugin-test.rs       |    24 +-
 .../ui-fulldeps/auxiliary/lint-plugin-test.rs |    16 +-
 .../ui-fulldeps/auxiliary/lint-tool-test.rs   |    28 +-
 .../ui-fulldeps/auxiliary/macro-crate-test.rs |     2 +-
 .../ui-fulldeps/feature-gate-plugin.stderr    |     2 +-
 src/test/ui-fulldeps/gated-plugin.stderr      |     2 +-
 .../hash-stable-is-unstable.stderr            |    11 +-
 .../internal-lints/default_hash_types.stderr  |     2 +-
 .../lint_pass_impl_without_macro.stderr       |     3 +-
 .../internal-lints/pass_ty_by_ref.stderr      |     2 +-
 .../qualified_ty_ty_ctxt.stderr               |     2 +-
 .../internal-lints/ty_tykind_usage.stderr     |     2 +-
 .../lint-group-denied-lint-allowed.rs         |     7 +
 .../ui-fulldeps/lint-plugin-deny-attr.stderr  |     2 +-
 .../lint-plugin-forbid-attrs.stderr           |     2 +-
 src/test/ui-fulldeps/lint-tool-test.stderr    |     4 +-
 .../ui-fulldeps/mod_dir_path_canonicalized.rs |     9 +-
 .../pathless-extern-unstable.stderr           |     2 +-
 .../ui-fulldeps/plugin-as-extern-crate.rs     |     2 +-
 src/test/ui-fulldeps/pprust-expr-roundtrip.rs |    20 +-
 src/test/ui/abi/abi-sysv64-arg-passing.rs     |    81 +
 src/test/ui/abi/struct-enums/struct-return.rs |    52 +-
 src/test/ui/allocator-alloc-one.rs            |    18 -
 src/test/ui/allocator/custom.rs               |     6 +-
 src/test/ui/allocator/not-an-allocator.stderr |     4 +
 src/test/ui/allocator/two-allocators.stderr   |     4 +-
 src/test/ui/allocator/xcrate-use.rs           |     6 +-
 src/test/ui/anon-params-deprecated.stderr     |     2 +-
 src/test/ui/arg-count-mismatch.rs             |     2 +-
 src/test/ui/arg-count-mismatch.stderr         |     6 +-
 src/test/ui/asm/issue-62046.rs                |    11 +
 src/test/ui/asm/issue-62046.stderr            |    11 +
 src/test/ui/assign-to-method.rs               |    22 -
 src/test/ui/assign-to-method.stderr           |    19 -
 .../associated-const-dead-code.stderr         |     2 +-
 .../associated-const-in-trait.stderr          |     6 +-
 .../associated-const-no-item.stderr           |     7 +-
 ...iated-const-type-parameter-arrays-2.stderr |     8 +-
 ...ociated-const-type-parameter-arrays.stderr |     8 +-
 .../associated-const/defaults-cyclic-fail.rs  |    17 +
 .../defaults-cyclic-fail.stderr               |    31 +
 .../associated-const/defaults-cyclic-pass.rs  |    36 +
 .../defaults-not-assumed-fail.rs              |    45 +
 .../defaults-not-assumed-fail.stderr          |    31 +
 .../defaults-not-assumed-pass.rs              |    42 +
 .../associated-item-duplicate-bounds.rs       |    11 +
 .../associated-item-duplicate-bounds.stderr   |    11 +
 .../ui/associated-item/issue-48027.stderr     |     6 +-
 .../bad-bounds-on-assoc-in-trait.rs           |     1 -
 .../bad-bounds-on-assoc-in-trait.stderr       |    77 +-
 .../ui/associated-type-bounds/duplicate.rs    |     1 -
 .../associated-type-bounds/duplicate.stderr   |   195 +-
 .../implied-region-constraints.nll.stderr     |     4 +-
 .../implied-region-constraints.rs             |     2 -
 .../implied-region-constraints.stderr         |     4 +-
 .../ui/associated-type-bounds/inside-adt.rs   |     1 -
 .../associated-type-bounds/inside-adt.stderr  |    36 +-
 ...rojection-from-multiple-supertraits.stderr |     2 +-
 ...types-invalid-trait-ref-issue-18865.stderr |     8 +-
 .../associated-types-no-suitable-bound.stderr |    11 +-
 ...associated-types-overridden-binding.stderr |     8 +-
 .../associated-types-overridden-default.rs    |    11 +-
 ...associated-types-overridden-default.stderr |     9 -
 ...ciated-types-project-from-hrtb-in-fn.fixed |    37 +
 ...ssociated-types-project-from-hrtb-in-fn.rs |     2 +
 ...iated-types-project-from-hrtb-in-fn.stderr |     4 +-
 ...iated-types-project-from-hrtb-in-struct.rs |    20 +-
 ...d-types-project-from-hrtb-in-struct.stderr |    47 +-
 ...es-project-from-hrtb-in-trait-method.fixed |    38 +
 ...types-project-from-hrtb-in-trait-method.rs |    15 +
 ...s-project-from-hrtb-in-trait-method.stderr |    12 +-
 .../defaults-cyclic-fail-1.rs                 |    45 +
 .../defaults-cyclic-fail-1.stderr             |    33 +
 .../defaults-cyclic-fail-2.rs                 |    47 +
 .../defaults-cyclic-fail-2.stderr             |    33 +
 .../defaults-cyclic-pass-1.rs                 |    56 +
 .../defaults-cyclic-pass-2.rs                 |    56 +
 .../defaults-in-other-trait-items-pass.rs     |    37 +
 .../defaults-in-other-trait-items.rs          |    50 +
 .../defaults-in-other-trait-items.stderr      |    25 +
 .../ui/associated-types/defaults-mixed.rs     |    34 +
 .../ui/associated-types/defaults-mixed.stderr |    21 +
 .../defaults-specialization.rs                |    95 +
 .../defaults-specialization.stderr            |   123 +
 .../associated-types/defaults-suitability.rs  |   106 +
 .../defaults-suitability.stderr               |   140 +
 .../defaults-unsound-62211-1.rs               |    63 +
 .../defaults-unsound-62211-1.stderr           |    95 +
 .../defaults-unsound-62211-2.rs               |    63 +
 .../defaults-unsound-62211-2.stderr           |    95 +
 src/test/ui/associated-types/issue-26681.rs   |    20 +
 .../ui/associated-types/issue-26681.stderr    |    14 +
 src/test/ui/associated-types/issue-32350.rs   |    29 +
 src/test/ui/associated-types/issue-41868.rs   |    23 +
 src/test/ui/associated-types/issue-43924.rs   |    15 +
 .../ui/associated-types/issue-43924.stderr    |    23 +
 src/test/ui/associated-types/issue-47385.rs   |    16 +
 src/test/ui/associated-types/issue-54182-1.rs |    92 +
 src/test/ui/associated-types/issue-54182-2.rs |    19 +
 src/test/ui/associated-types/issue-63593.rs   |    13 +
 .../ui/associated-types/issue-63593.stderr    |    14 +
 src/test/ui/associated-types/issue-65774-1.rs |    58 +
 .../ui/associated-types/issue-65774-1.stderr  |    17 +
 src/test/ui/associated-types/issue-65774-2.rs |    58 +
 .../ui/associated-types/issue-65774-2.stderr  |    17 +
 src/test/ui/ast-json/ast-json-output.stdout   |     2 +-
 src/test/ui/async-await/async-fn-nonsend.rs   |     1 -
 .../ui/async-await/async-fn-nonsend.stderr    |    12 +-
 src/test/ui/async-await/async-trait-fn.rs     |     4 +-
 src/test/ui/async-await/async-trait-fn.stderr |    12 +-
 ...015-edition-error-various-positions.stderr |     2 +-
 .../await-keyword/2015-edition-warning.stderr |     2 +-
 .../dont-print-desugared-async.stderr         |     5 +-
 .../edition-deny-async-fns-2015.rs            |     2 +-
 .../edition-deny-async-fns-2015.stderr        |    42 +-
 .../async-await/feature-async-closure.stderr  |     2 +-
 .../issue-54239-private-type-triggers-lint.rs |    17 +
 .../async-await/issues/issue-62097.nll.stderr |     6 +-
 .../issues/issue-63388-1.nll.stderr           |    13 +-
 .../issues/issue-63388-2.nll.stderr           |     2 +
 .../async-await/issues/issue-63388-2.stderr   |     2 +
 ...65419-generator-resume-after-completion.rs |     6 +-
 src/test/ui/async-await/no-async-const.rs     |     3 +-
 src/test/ui/async-await/no-async-const.stderr |     6 +-
 src/test/ui/async-await/no-const-async.rs     |     5 +-
 src/test/ui/async-await/no-const-async.stderr |    19 +-
 .../no-move-across-await-struct.rs            |     1 -
 .../no-move-across-await-struct.stderr        |     2 +-
 .../async-await/no-move-across-await-tuple.rs |     1 -
 .../no-move-across-await-tuple.stderr         |     2 +-
 .../no-non-guaranteed-initialization.rs       |     1 -
 .../no-non-guaranteed-initialization.stderr   |     2 +-
 src/test/ui/async-await/no-unsafe-async.rs    |     2 +-
 .../ui/async-await/no-unsafe-async.stderr     |     9 +-
 .../ui/async-await/unreachable-lint-1.stderr  |     2 +-
 .../ui/async-await/unused-lifetime.stderr     |     2 +-
 .../attributes/register-attr-tool-import.rs   |     2 +
 .../register-attr-tool-import.stderr          |    12 +-
 .../register-attr-tool-unused.stderr          |     2 +-
 src/test/ui/auto-ref-slice-plus-ref.stderr    |    28 +-
 src/test/ui/autoderef-full-lval.stderr        |     4 -
 src/test/ui/bad/bad-lint-cap2.stderr          |     2 +-
 src/test/ui/bad/bad-lint-cap3.stderr          |     2 +-
 .../ui/bad/bad-method-typaram-kind.stderr     |     7 +-
 ...her-can-live-while-the-other-survives-2.rs |    15 -
 ...can-live-while-the-other-survives-2.stderr |    11 -
 ...her-can-live-while-the-other-survives-3.rs |    18 -
 ...can-live-while-the-other-survives-3.stderr |    11 -
 ...her-can-live-while-the-other-survives-4.rs |    15 -
 ...can-live-while-the-other-survives-4.stderr |    11 -
 src/test/ui/binop/binop-bitxor-str.stderr     |     2 -
 src/test/ui/binop/binop-consume-args.stderr   |   200 +-
 src/test/ui/binop/binop-move-semantics.stderr |    20 +-
 src/test/ui/binop/binop-mul-bool.stderr       |     2 -
 src/test/ui/binop/binop-typeck.stderr         |     2 -
 .../ui/blind/blind-item-block-middle.stderr   |     9 +-
 src/test/ui/block-expr-precedence.stderr      |     2 +-
 ...or-patterns-slice-patterns-box-patterns.rs |   224 +
 ...atterns-slice-patterns-box-patterns.stderr |   208 +
 ...row-immutable-upvar-mutation-impl-trait.rs |    14 +
 ...immutable-upvar-mutation-impl-trait.stderr |    16 +
 .../borrow-immutable-upvar-mutation.rs        |    31 +-
 .../borrow-immutable-upvar-mutation.stderr    |   114 +-
 .../borrow-raw-address-of-mutability.stderr   |    32 +-
 .../borrowck-borrowed-uniq-rvalue-2.stderr    |     2 +-
 .../borrowck-feature-nll-overrides-migrate.rs |     4 +-
 .../borrowck/borrowck-unboxed-closures.stderr |    10 +-
 src/test/ui/borrowck/issue-45983.nll.stderr   |     2 +-
 src/test/ui/borrowck/issue-64453.stderr       |     4 +-
 src/test/ui/borrowck/issue-7573.nll.stderr    |     2 +-
 .../ui/borrowck/move-error-snippets.stderr    |    22 +-
 src/test/ui/borrowck/mutability-errors.stderr |   128 +-
 src/test/ui/borrowck/or-patterns.rs           |    64 +
 src/test/ui/borrowck/or-patterns.stderr       |   141 +
 .../regions-escape-bound-fn-2.nll.stderr      |     2 +-
 .../regions-escape-bound-fn.nll.stderr        |     2 +-
 .../regions-escape-unboxed-closure.nll.stderr |     2 +-
 .../two-phase-nonrecv-autoref.nll.stderr      |    14 +-
 .../ui/borrowck/two-phase-nonrecv-autoref.rs  |     7 -
 ...ing-interference-future-compat-lint.stderr |     4 +-
 src/test/ui/bound-suggestions.fixed           |    39 +
 src/test/ui/bound-suggestions.rs              |    39 +
 src/test/ui/bound-suggestions.stderr          |    93 +
 ...builtin-superkinds-double-superkind.stderr |    18 +-
 .../builtin-superkinds-in-metadata.stderr     |     9 +-
 .../builtin-superkinds-self-type.stderr       |     2 +-
 ...builtin-superkinds-typaram-not-send.stderr |     9 +-
 src/test/ui/c-variadic/variadic-ffi-1.rs      |     4 +-
 src/test/ui/c-variadic/variadic-ffi-1.stderr  |    12 +-
 src/test/ui/cast-char.stderr                  |     2 +-
 src/test/ui/cast/cast-ptr-to-int-const.stderr |     4 +-
 src/test/ui/chalkify/builtin-copy-clone.rs    |    44 -
 src/test/ui/chalkify/inherent_impl.rs         |    42 -
 src/test/ui/chalkify/lower_env1.rs            |    14 -
 src/test/ui/chalkify/lower_env1.stderr        |    22 -
 src/test/ui/chalkify/lower_env2.rs            |    16 -
 src/test/ui/chalkify/lower_env2.stderr        |    23 -
 src/test/ui/chalkify/lower_env3.rs            |    16 -
 src/test/ui/chalkify/lower_env3.stderr        |    20 -
 src/test/ui/chalkify/lower_impl.rs            |    19 -
 src/test/ui/chalkify/lower_impl.stderr        |    18 -
 src/test/ui/chalkify/lower_struct.rs          |     8 -
 src/test/ui/chalkify/lower_struct.stderr      |    13 -
 src/test/ui/chalkify/lower_trait.rs           |    13 -
 src/test/ui/chalkify/lower_trait.stderr       |    24 -
 .../ui/chalkify/lower_trait_higher_rank.rs    |    10 -
 .../chalkify/lower_trait_higher_rank.stderr   |    13 -
 .../ui/chalkify/lower_trait_where_clause.rs   |    17 -
 .../chalkify/lower_trait_where_clause.stderr  |    15 -
 src/test/ui/chalkify/projection.rs            |    25 -
 src/test/ui/chalkify/super_trait.rs           |    19 -
 src/test/ui/chalkify/trait_implied_bound.rs   |    18 -
 src/test/ui/chalkify/type_implied_bound.rs    |    29 -
 src/test/ui/chalkify/type_inference.rs        |    26 -
 src/test/ui/chalkify/type_inference.stderr    |    23 -
 .../check-static-immutable-mut-slices.stderr  |     2 +-
 ...ds-cant-promote-superkind-in-struct.stderr |    21 +-
 .../ui/closures/closure-bounds-subtype.stderr |     8 +-
 .../expect-region-supply-region.nll.stderr    |     4 +-
 .../ui/closures/deeply-nested_closures.rs     |    23 +
 src/test/ui/closures/issue-52437.stderr       |     2 +-
 src/test/ui/closures/issue-67123.stderr       |     7 +-
 .../ui/codemap_tests/bad-format-args.stderr   |     2 +-
 src/test/ui/codemap_tests/issue-28308.stderr  |     2 +
 ...herence-conflicting-negative-trait-impl.rs |     7 +-
 ...nce-conflicting-negative-trait-impl.stderr |    14 +-
 ...ce-impl-trait-for-trait-object-safe.stderr |     6 +-
 src/test/ui/coherence/coherence-impls-send.rs |     4 +-
 .../ui/coherence/coherence-impls-send.stderr  |    23 +-
 ...erence-inherited-assoc-ty-cycle-err.stderr |     4 +-
 .../coherence-inherited-subtyping.old.stderr  |    14 +
 .../coherence-inherited-subtyping.re.stderr   |    14 +
 .../coherence-inherited-subtyping.rs          |    21 +
 .../coherence-negative-impls-safe.stderr      |     4 +-
 .../coherence/coherence-subtyping.old.stderr  |    14 +
 .../coherence/coherence-subtyping.re.stderr   |    14 +
 src/test/ui/coherence/coherence-subtyping.rs  |    13 +-
 .../cfg-attr-crate-2.stderr                   |     2 +-
 .../cfg-attr-empty-is-unused.stderr           |     2 +-
 .../cfg-attr-multi-invalid-1.stderr           |     2 +-
 .../cfg-attr-multi-invalid-2.stderr           |     2 +-
 .../cfg-attr-multi-true.stderr                |     2 +-
 .../cfg-attr-syntax-validation.stderr         |     2 +
 ...r-unknown-attribute-macro-expansion.stderr |     2 +
 .../core-traits-no-impls-length-33.rs         |     1 -
 .../core-traits-no-impls-length-33.stderr     |    24 +-
 .../into-iter-no-impls-length-33.stderr       |    28 +-
 .../ui/const-generics/broken-mir-2.stderr     |     1 +
 .../const-arg-type-arg-misordered.rs          |    10 +
 .../const-arg-type-arg-misordered.stderr      |    19 +
 .../const-fn-with-const-param.rs              |     2 +-
 .../const-fn-with-const-param.stderr          |     8 +-
 .../const-param-after-const-literal-arg.rs    |    10 +
 .../const-param-before-other-params.rs        |     1 +
 .../const-param-before-other-params.stderr    |     4 +-
 .../const-param-elided-lifetime.stderr        |     1 +
 .../const-param-in-trait-ungated.stderr       |     2 +-
 ...-type-depends-on-type-param-ungated.stderr |     2 +-
 .../const-parameter-uppercase-lint.stderr     |     2 +-
 .../derive-debug-array-wrapper.stderr         |     1 +
 .../const-generics/issues/issue-60263.stderr  |     2 +-
 .../ui/const-generics/issues/issue-65675.rs   |    10 -
 .../const-generics/issues/issue-65675.stderr  |     8 -
 src/test/ui/consts/array-literal-index-oob.rs |     4 +-
 .../ui/consts/array-literal-index-oob.stderr  |    18 +-
 src/test/ui/consts/ascii_ctype.rs             |    55 +
 .../ui/consts/assoc_const_generic_impl.stderr |     2 +-
 .../ui/consts/const-address-of-mut.stderr     |     8 +-
 src/test/ui/consts/const-deref-ptr.stderr     |     2 +-
 src/test/ui/consts/const-err-early.stderr     |     2 +-
 src/test/ui/consts/const-err-multi.stderr     |     2 +-
 src/test/ui/consts/const-err.rs               |     2 +-
 src/test/ui/consts/const-err.stderr           |     2 +-
 src/test/ui/consts/const-err2.noopt.stderr    |    48 +
 src/test/ui/consts/const-err2.opt.stderr      |    48 +
 ...const-err2.opt_with_overflow_checks.stderr |    48 +
 src/test/ui/consts/const-err2.rs              |    25 +-
 src/test/ui/consts/const-err2.stderr          |    38 -
 src/test/ui/consts/const-err3.rs              |    32 -
 src/test/ui/consts/const-err3.stderr          |    38 -
 .../conditional_array_execution.stderr        |     2 +-
 .../const-eval/const-eval-overflow2.stderr    |     2 +-
 .../const-eval/const-eval-overflow2b.stderr   |     2 +-
 .../const-eval/const-eval-overflow2c.stderr   |     2 +-
 .../const-eval/const_fn_ptr_fail2.stderr      |     4 +-
 .../ui/consts/const-eval/const_panic.stderr   |     6 +-
 .../const-eval/const_panic_libcore.stderr     |     6 +-
 .../const_panic_libcore_main.stderr           |     6 +-
 src/test/ui/consts/const-eval/dangling.rs     |     2 +-
 src/test/ui/consts/const-eval/dangling.stderr |     2 +-
 .../feature-gate-const_fn_union.stderr        |     2 +-
 .../feature-gate-const_panic.stderr           |    12 +-
 .../index-out-of-bounds-never-type.stderr     |     2 +-
 .../index_out_of_bounds_propagated.rs         |     2 +-
 .../index_out_of_bounds_propagated.stderr     |     6 +-
 .../ui/consts/const-eval/infinite_loop.stderr |     4 +-
 .../ui/consts/const-eval/issue-43197.stderr   |     2 +-
 .../ui/consts/const-eval/issue-52442.stderr   |     4 +-
 .../ui/consts/const-eval/issue-52475.stderr   |     2 +-
 .../ui/consts/const-eval/issue-62272.stderr   |     4 +-
 .../ui/consts/const-eval/issue-65394.stderr   |     2 +-
 .../const-eval/match-test-ptr-null.stderr     |     4 +-
 .../const-eval/panic-assoc-never-type.stderr  |     4 +-
 .../consts/const-eval/panic-never-type.stderr |     4 +-
 .../const-eval/promoted_errors.noopt.stderr   |    78 +
 .../const-eval/promoted_errors.opt.stderr     |    72 +
 ...ted_errors.opt_with_overflow_checks.stderr |    78 +
 .../ui/consts/const-eval/promoted_errors.rs   |    23 +-
 .../consts/const-eval/promoted_errors.stderr  |    60 -
 .../ui/consts/const-eval/promoted_errors2.rs  |    24 -
 .../consts/const-eval/promoted_errors2.stderr |    66 -
 .../ui/consts/const-eval/pub_const_err.stderr |     2 +-
 .../const-eval/pub_const_err_bin.stderr       |     2 +-
 .../consts/const-eval/transmute-const.stderr  |     2 +-
 src/test/ui/consts/const-eval/ub-enum.rs      |    83 +-
 src/test/ui/consts/const-eval/ub-enum.stderr  |    82 +-
 src/test/ui/consts/const-eval/ub-nonnull.rs   |     6 +-
 .../ui/consts/const-eval/ub-nonnull.stderr    |     6 +-
 src/test/ui/consts/const-eval/ub-ref.rs       |    15 +-
 src/test/ui/consts/const-eval/ub-ref.stderr   |    46 +-
 src/test/ui/consts/const-eval/ub-uninhabit.rs |    10 +-
 .../ui/consts/const-eval/ub-uninhabit.stderr  |    10 +-
 .../ui/consts/const-eval/ub-upvars.stderr     |     2 +-
 src/test/ui/consts/const-eval/ub-wide-ptr.rs  |   139 +-
 .../ui/consts/const-eval/ub-wide-ptr.stderr   |   162 +-
 src/test/ui/consts/const-eval/union-ub.stderr |     2 +-
 .../validate_uninhabited_zsts.stderr          |     4 +-
 .../const-extern-fn-call-extern-fn.stderr     |     4 +-
 .../const-extern-fn-min-const-fn.stderr       |     8 +-
 .../feature-gate-const_extern_fn.rs           |    14 +-
 .../feature-gate-const_extern_fn.stderr       |    48 +-
 ...const-extern-fns-dont-need-fn-specifier.rs |     1 -
 ...t-extern-fns-dont-need-fn-specifier.stderr |    12 +-
 .../const-external-macro-const-err.stderr     |     2 +-
 src/test/ui/consts/const-fn-mismatch.rs       |     8 +-
 src/test/ui/consts/const-fn-mismatch.stderr   |     6 +-
 src/test/ui/consts/const-fn-not-in-trait.rs   |    10 +-
 .../ui/consts/const-fn-not-in-trait.stderr    |    10 +-
 .../consts/const-int-arithmetic-overflow.rs   |    26 +
 src/test/ui/consts/const-int-arithmetic.rs    |   147 +
 src/test/ui/consts/const-int-pow-rpass.rs     |    37 +
 src/test/ui/consts/const-int-unchecked.rs     |    22 +
 src/test/ui/consts/const-int-unchecked.stderr |   138 +-
 src/test/ui/consts/const-labeled-break.stderr |     2 +-
 .../ui/consts/const-match-pattern-arm.stderr  |     4 +-
 src/test/ui/consts/const-multi-ref.stderr     |     2 +-
 .../feature-gate-const_mut_refs.stderr        |     2 +-
 src/test/ui/consts/const-nonzero.rs           |    11 +-
 .../ui/consts/const-points-to-static.stderr   |     2 +-
 src/test/ui/consts/const-prop-ice.rs          |     2 +-
 src/test/ui/consts/const-prop-ice.stderr      |     6 +-
 src/test/ui/consts/const-prop-ice2.rs         |     2 +-
 src/test/ui/consts/const-prop-ice2.stderr     |     6 +-
 src/test/ui/consts/const_let_assign3.stderr   |     4 +-
 src/test/ui/consts/const_let_eq.rs            |     1 +
 src/test/ui/consts/const_let_eq_float.rs      |     1 +
 src/test/ui/consts/const_let_refutable.rs     |     8 +-
 src/test/ui/consts/const_let_refutable.stderr |    30 +-
 .../const_eval_limit_not_reached.rs           |    15 +
 .../const_limit/const_eval_limit_overflow.rs  |    15 +
 .../const_eval_limit_overflow.stderr          |    10 +
 .../const_limit/const_eval_limit_reached.rs   |    21 +
 .../const_eval_limit_reached.stderr           |    16 +
 .../feature-gate-const_eval_limit.rs          |    14 +
 .../feature-gate-const_eval_limit.stderr      |    12 +
 src/test/ui/consts/const_short_circuit.stderr |     4 +-
 .../ui/consts/control-flow/assert.both.stderr |     2 +-
 .../control-flow/assert.if_match.stderr       |     8 +-
 .../consts/control-flow/assert.panic.stderr   |     6 +-
 .../consts/control-flow/assert.stock.stderr   |     6 +-
 .../feature-gate-const-if-match.stock.stderr  |    48 +-
 .../control-flow/issue-46843.stock.stderr     |     2 +-
 .../control-flow/issue-50577.if_match.stderr  |     2 +-
 .../control-flow/issue-50577.stock.stderr     |    14 +-
 .../consts/control-flow/loop.if_match.stderr  |    26 +-
 .../ui/consts/control-flow/loop.loop_.stderr  |    14 +-
 .../ui/consts/control-flow/loop.stock.stderr  |    30 +-
 .../control-flow/short-circuit.stock.stderr   |     4 +-
 src/test/ui/consts/enum-discr-type-err.stderr |     2 +
 src/test/ui/consts/is_ascii.rs                |    15 +
 src/test/ui/consts/issue-63952.rs             |    28 +
 src/test/ui/consts/issue-63952.stderr         |    17 +
 src/test/ui/consts/issue-64059-2.rs           |     6 -
 src/test/ui/consts/issue-64059.rs             |     5 +
 src/test/ui/consts/issue-68684.rs             |    15 +
 src/test/ui/consts/issue-69020.noopt.stderr   |    30 +
 src/test/ui/consts/issue-69020.opt.stderr     |    30 +
 ...ssue-69020.opt_with_overflow_checks.stderr |    30 +
 src/test/ui/consts/issue-69020.rs             |    29 +
 src/test/ui/consts/issue-69312.rs             |    10 +
 .../ui/consts/min_const_fn/address_of.stderr  |     4 +-
 .../min_const_fn/allow_const_fn_ptr.stderr    |     2 +-
 .../allow_const_fn_ptr_feature_gate.stderr    |     1 -
 .../min_const_fn/bad_const_fn_body_ice.stderr |     4 +-
 .../ui/consts/min_const_fn/cast_errors.stderr |    10 +-
 .../min_const_fn/cmp_fn_pointers.stderr       |     2 +-
 .../ui/consts/min_const_fn/loop_ice.stderr    |     2 +-
 .../ui/consts/min_const_fn/min_const_fn.rs    |     3 -
 .../consts/min_const_fn/min_const_fn.stderr   |    92 +-
 .../min_const_fn/min_const_fn_dyn.stderr      |     4 +-
 .../min_const_fn/min_const_fn_fn_ptr.stderr   |     4 +-
 .../min_const_fn/min_const_fn_impl_trait.rs   |     9 +
 .../min_const_fn_impl_trait.stderr            |    21 +
 .../min_const_fn_libstd_stability.stderr      |     8 +-
 .../min_const_fn_unsafe_bad.stderr            |     8 +-
 ...in_const_unsafe_fn_libstd_stability.stderr |     8 +-
 ...n_const_unsafe_fn_libstd_stability2.stderr |     6 +-
 .../consts/min_const_fn/mutable_borrow.stderr |     4 +-
 .../const_refers_to_static.stderr             |     6 +-
 .../miri_unleashed/mutable_const.stderr       |     2 +-
 .../miri_unleashed/mutable_const2.stderr      |     2 +-
 .../consts/miri_unleashed/non_const_fn.stderr |     2 +-
 .../consts/projection_qualif.mut_refs.stderr  |     2 +-
 .../ui/consts/projection_qualif.stock.stderr  |     4 +-
 ...tatic_mut_containing_mut_ref2.stock.stderr |     2 +-
 src/test/ui/consts/std/char.rs                |     9 -
 .../ui/consts/too_generic_eval_ice.stderr     |     8 +-
 .../ui/consts/validate_never_arrays.stderr    |     6 +-
 .../cross-crate-macro-backtrace/main.stderr   |     2 +-
 .../ui/cross/cross-file-errors/main.stderr    |     2 +
 .../ui/custom_test_frameworks/mismatch.stderr |     1 +
 src/test/ui/definition-reachable/nested-fn.rs |     2 +-
 .../ui/dep-graph/dep-graph-variance-alias.rs  |     9 +-
 .../dep-graph/dep-graph-variance-alias.stderr |     2 +-
 .../ui/deprecation/deprecation-lint-2.stderr  |     4 +-
 .../ui/deprecation/deprecation-lint-3.stderr  |     4 +-
 .../deprecation-lint-nested.stderr            |     2 +-
 .../ui/deprecation/deprecation-lint.stderr    |     2 +-
 .../rustc_deprecation-in-future.stderr        |     2 +-
 src/test/ui/deprecation/suggestion.stderr     |     2 +-
 src/test/ui/deref-suggestion.stderr           |     4 +-
 .../derives/derive-assoc-type-not-impl.stderr |    11 +-
 ...ives-span-Clone-enum-struct-variant.stderr |     1 +
 .../ui/derives/derives-span-Clone-enum.stderr |     1 +
 .../derives/derives-span-Clone-struct.stderr  |     1 +
 .../derives-span-Clone-tuple-struct.stderr    |     1 +
 ...ives-span-Debug-enum-struct-variant.stderr |     1 +
 .../ui/derives/derives-span-Debug-enum.stderr |     1 +
 .../derives/derives-span-Debug-struct.stderr  |     1 +
 .../derives-span-Debug-tuple-struct.stderr    |     1 +
 .../derives-span-Default-struct.stderr        |     1 +
 .../derives-span-Default-tuple-struct.stderr  |     1 +
 ...derives-span-Eq-enum-struct-variant.stderr |     1 +
 .../ui/derives/derives-span-Eq-enum.stderr    |     1 +
 .../ui/derives/derives-span-Eq-struct.stderr  |     1 +
 .../derives-span-Eq-tuple-struct.stderr       |     1 +
 ...rives-span-Hash-enum-struct-variant.stderr |     2 +
 .../ui/derives/derives-span-Hash-enum.stderr  |     2 +
 .../derives/derives-span-Hash-struct.stderr   |     2 +
 .../derives-span-Hash-tuple-struct.stderr     |     2 +
 ...erives-span-Ord-enum-struct-variant.stderr |     1 +
 .../ui/derives/derives-span-Ord-enum.stderr   |     1 +
 .../ui/derives/derives-span-Ord-struct.stderr |     1 +
 .../derives-span-Ord-tuple-struct.stderr      |     1 +
 ...-span-PartialEq-enum-struct-variant.stderr |     2 +
 .../derives-span-PartialEq-enum.stderr        |     2 +
 .../derives-span-PartialEq-struct.stderr      |     2 +
 ...derives-span-PartialEq-tuple-struct.stderr |     2 +
 ...span-PartialOrd-enum-struct-variant.stderr |     5 +
 .../derives-span-PartialOrd-enum.stderr       |     5 +
 .../derives-span-PartialOrd-struct.stderr     |     5 +
 ...erives-span-PartialOrd-tuple-struct.stderr |     5 +
 .../deriving-meta-empty-trait-list.stderr     |     2 +-
 ...eriving-no-inner-impl-error-message.stderr |     3 +
 .../derives/deriving-with-repr-packed.stderr  |     6 +-
 src/test/ui/destructure-trait-ref.stderr      |     4 +-
 .../note-unsupported.stderr                   |     4 -
 .../ui/did_you_mean/bad-assoc-expr.stderr     |     2 +
 src/test/ui/did_you_mean/bad-assoc-pat.stderr |     4 +
 src/test/ui/did_you_mean/bad-assoc-ty.rs      |    37 +-
 src/test/ui/did_you_mean/bad-assoc-ty.stderr  |   146 +-
 src/test/ui/did_you_mean/issue-40006.rs       |    20 +-
 src/test/ui/did_you_mean/issue-40006.stderr   |    92 +-
 .../ui/did_you_mean/recursion_limit.stderr    |     2 +-
 .../did_you_mean/recursion_limit_deref.stderr |     2 +-
 .../did_you_mean/recursion_limit_macro.stderr |     3 +-
 ...reference-without-parens-suggestion.stderr |     2 +-
 .../directory_ownership/macro-expanded-mod.rs |     3 +-
 .../macro-expanded-mod.stderr                 |     9 +-
 .../dollar-crate-is-keyword-2.stderr          |     6 +
 .../dollar-crate-is-keyword.stderr            |     8 +
 src/test/ui/drop/dynamic-drop-async.rs        |    10 +
 src/test/ui/drop/dynamic-drop.rs              |    58 +-
 .../dst/dst-object-from-unsized-type.stderr   |     4 +-
 src/test/ui/duplicate/dupe-symbols-7.rs       |     2 +-
 src/test/ui/duplicate/dupe-symbols-7.stderr   |     2 +-
 src/test/ui/duplicate/dupe-symbols-8.rs       |    12 +
 src/test/ui/duplicate/dupe-symbols-8.stderr   |    15 +
 src/test/ui/duplicate_entry_error.stderr      |     2 +-
 ...dyn-2015-edition-keyword-ident-lint.stderr |     2 +-
 .../edition-extern-crate-allowed.stderr       |     2 +-
 .../ui/editions/edition-imports-2015.stderr   |     2 +-
 .../ui/editions/edition-imports-2018.stderr   |     2 +-
 .../edition-imports-virtual-2015-gated.stderr |     2 +-
 ...dition-keywords-2015-2018-expansion.stderr |     2 +-
 ...dition-keywords-2018-2018-expansion.stderr |     2 +-
 .../edition-raw-pointer-method-2015.stderr    |     2 +-
 .../elide-errors-on-mismatched-tuple.stderr   |     4 +-
 src/test/ui/empty/empty-never-array.rs        |     1 -
 src/test/ui/empty/empty-never-array.stderr    |    11 +-
 .../ui/enable-unstable-lib-feature.stderr     |     2 +-
 ...re-gate-arbitrary_enum_discriminant.stderr |     6 +-
 .../ui/enum/enum-discrim-too-small2.stderr    |     2 +-
 src/test/ui/enum/enum-size-variance.stderr    |     2 +-
 src/test/ui/error-codes/E0001.stderr          |     2 +-
 src/test/ui/error-codes/E0009.rs              |     9 -
 src/test/ui/error-codes/E0009.stderr          |    11 -
 src/test/ui/error-codes/E0017.stderr          |     8 +-
 src/test/ui/error-codes/E0033-teach.stderr    |     9 +-
 src/test/ui/error-codes/E0033.stderr          |     9 +-
 src/test/ui/error-codes/E0038.stderr          |    10 +-
 src/test/ui/error-codes/E0055.stderr          |     2 +-
 src/test/ui/error-codes/E0057.stderr          |    12 +-
 src/test/ui/error-codes/E0060.rs              |     2 +-
 src/test/ui/error-codes/E0060.stderr          |     6 +-
 src/test/ui/error-codes/E0061.rs              |     4 +-
 src/test/ui/error-codes/E0061.stderr          |    12 +-
 src/test/ui/error-codes/E0067.stderr          |     2 -
 src/test/ui/error-codes/E0106.stderr          |    16 +-
 src/test/ui/error-codes/E0152.stderr          |     2 +-
 src/test/ui/error-codes/E0184.stderr          |     2 +
 src/test/ui/error-codes/E0197.stderr          |     4 +-
 src/test/ui/error-codes/E0198.stderr          |     4 +-
 src/test/ui/error-codes/E0275.stderr          |     6 +-
 src/test/ui/error-codes/E0388.stderr          |     6 +-
 src/test/ui/error-codes/E0395.stderr          |     2 +-
 src/test/ui/error-codes/E0396.stderr          |     2 +-
 src/test/ui/error-codes/E0637.stderr          |     1 +
 src/test/ui/error-codes/E0658.stderr          |     2 +-
 src/test/ui/error-codes/E0665.stderr          |     2 +
 src/test/ui/error-codes/E0719.stderr          |     1 +
 src/test/ui/error-festival.stderr             |     2 -
 src/test/ui/exclusive-drop-and-copy.stderr    |     4 +
 src/test/ui/explain.stdout                    |     2 +-
 src/test/ui/explore-issue-38412.stderr        |    14 +-
 src/test/ui/expr_attr_paren_order.stderr      |     2 +-
 .../ui/extern-flag/public-and-private.stderr  |     2 +-
 src/test/ui/extern/extern-const.stderr        |     8 +-
 src/test/ui/extern/extern-ffi-fn-with-body.rs |     2 +-
 .../ui/extern/extern-ffi-fn-with-body.stderr  |    10 +-
 .../ui/extern/extern-types-unsized.stderr     |     4 +-
 .../ui/feature-gate-optimize_attribute.stderr |    10 +-
 .../feature-gate-c_variadic.stderr            |     2 +-
 .../feature-gate-static-nobundle-2.stderr     |     2 +-
 ...issue-43106-gating-of-builtin-attrs.stderr |     4 +-
 src/test/ui/feature-gate/rustc-private.stderr |     2 +-
 .../unstable-attribute-allow-issue-0.rs       |     6 +-
 .../unstable-attribute-allow-issue-0.stderr   |    18 +-
 .../feature-gate-abi-msp430-interrupt.stderr  |     2 +-
 .../ui/feature-gates/feature-gate-abi.stderr  |    96 +-
 .../feature-gate-alloc-error-handler.stderr   |     2 +-
 ...-allow-internal-unsafe-nested-macro.stderr |     1 +
 ...llow-internal-unstable-nested-macro.stderr |     1 +
 .../feature-gate-allow_fail.stderr            |     2 +-
 .../feature-gate-arbitrary-self-types.stderr  |     6 +-
 ...te-arbitrary_self_types-raw-pointer.stderr |     6 +-
 .../ui/feature-gates/feature-gate-asm.stderr  |     2 +-
 .../ui/feature-gates/feature-gate-asm2.stderr |     2 +-
 .../feature-gate-assoc-type-defaults.stderr   |     2 +-
 ...feature-gate-associated_type_bounds.stderr |    26 +-
 .../feature-gate-box-expr.stderr              |     2 +-
 .../feature-gate-box_patterns.stderr          |     2 +-
 .../feature-gate-box_syntax.stderr            |     2 +-
 .../feature-gate-cfg-target-has-atomic.stderr |    36 +-
 ...eature-gate-cfg-target-thread-local.stderr |     2 +-
 .../feature-gate-cfg_sanitize.stderr          |     2 +-
 .../feature-gate-concat_idents.stderr         |     4 +-
 .../feature-gate-concat_idents2.stderr        |     4 +-
 .../feature-gate-concat_idents3.stderr        |     4 +-
 .../ui/feature-gates/feature-gate-const_fn.rs |     6 +-
 .../feature-gate-const_fn.stderr              |    16 +-
 .../feature-gate-const_generics-ptr.stderr    |     8 +-
 .../feature-gate-const_generics.stderr        |     4 +-
 ...e-const_in_array_repeat_expressions.stderr |     2 +-
 ...ture-gate-crate_visibility_modifier.stderr |     2 +-
 ...feature-gate-custom_test_frameworks.stderr |     4 +-
 .../feature-gate-decl_macro.stderr            |     2 +-
 .../feature-gate-doc_alias.stderr             |     2 +-
 .../feature-gates/feature-gate-doc_cfg.stderr |     2 +-
 .../feature-gate-doc_keyword.stderr           |     2 +-
 .../feature-gate-doc_masked.stderr            |     2 +-
 .../feature-gate-doc_spotlight.rs             |     4 -
 .../feature-gate-doc_spotlight.stderr         |    12 -
 ...eature-gate-exclusive-range-pattern.stderr |     2 +-
 .../feature-gate-extern_types.stderr          |     2 +-
 .../feature-gate-external_doc.stderr          |     4 +-
 .../feature-gate-feature-gate.stderr          |     2 +-
 .../feature-gate-ffi_returns_twice.stderr     |     2 +-
 .../feature-gate-fundamental.stderr           |     2 +-
 .../feature-gate-generators.stderr            |     6 +-
 ...ature-gate-generic_associated_types.stderr |    18 +-
 .../feature-gate-global_asm.stderr            |     2 +-
 ...-infer_static_outlives_requirements.stderr |     2 +-
 .../feature-gate-is_sorted.stderr             |     8 +-
 .../feature-gate-label_break_value.stderr     |     2 +-
 .../feature-gate-link_args.stderr             |     6 +-
 .../feature-gate-link_cfg.stderr              |     2 +-
 .../feature-gate-link_llvm_intrinsics.stderr  |     2 +-
 .../feature-gates/feature-gate-linkage.stderr |     2 +-
 .../feature-gate-lint-reasons.stderr          |     6 +-
 .../feature-gate-log_syntax.stderr            |     2 +-
 .../feature-gate-log_syntax2.stderr           |     2 +-
 .../ui/feature-gates/feature-gate-main.stderr |     2 +-
 .../feature-gate-marker_trait_attr.stderr     |     2 +-
 .../feature-gate-may-dangle.stderr            |     2 +-
 .../feature-gate-member-constraints.rs        |     5 +-
 .../feature-gate-member-constraints.stderr    |    10 +-
 .../feature-gate-min_const_fn.rs              |     6 +-
 .../feature-gate-min_const_fn.stderr          |    16 +-
 .../feature-gate-naked_functions.stderr       |     4 +-
 .../feature-gate-never_type.stderr            |    10 +-
 .../feature-gates/feature-gate-no-debug-2.rs  |     5 -
 .../feature-gate-no-debug-2.stderr            |    14 -
 .../ui/feature-gates/feature-gate-no-debug.rs |     4 -
 .../feature-gate-no-debug.stderr              |    12 -
 .../feature-gates/feature-gate-no_core.stderr |     2 +-
 .../feature-gates/feature-gate-no_sanitize.rs |     4 +
 .../feature-gate-no_sanitize.stderr           |    12 +
 .../feature-gate-non_ascii_idents.stderr      |    26 +-
 ...ature-gate-object_safe_for_dispatch.stderr |    51 +-
 .../feature-gate-optin-builtin-traits.stderr  |     4 +-
 .../feature-gate-plugin_registrar.stderr      |     4 +-
 .../feature-gate-register_attr.stderr         |     2 +-
 .../feature-gate-register_tool.stderr         |     2 +-
 .../feature-gate-repr-simd.stderr             |     4 +-
 .../feature-gates/feature-gate-repr128.stderr |     2 +-
 .../feature-gate-rustc-attrs-1.stderr         |     3 -
 .../feature-gate-rustc-attrs.stderr           |     4 -
 .../ui/feature-gates/feature-gate-simd.stderr |     2 +-
 .../feature-gates/feature-gate-start.stderr   |     2 +-
 .../feature-gate-static-nobundle.stderr       |     2 +-
 .../feature-gate-stmt_expr_attributes.stderr  |     2 +-
 .../feature-gate-thread_local.stderr          |     2 +-
 .../feature-gate-trace_macros.stderr          |     2 +-
 .../feature-gate-track_caller.stderr          |     2 +-
 .../feature-gate-trait-alias.stderr           |     2 +-
 .../feature-gate-transparent_unions.stderr    |     2 +-
 .../feature-gate-try_blocks.stderr            |     2 +-
 .../feature-gate-try_reserve.stderr           |     2 +-
 .../feature-gate-type_alias_impl_trait.stderr |    24 +-
 .../feature-gate-type_ascription.stderr       |     2 +-
 ...-gate-unboxed-closures-manual-impls.stderr |    14 +-
 ...-gate-unboxed-closures-method-calls.stderr |     6 +-
 ...re-gate-unboxed-closures-ufcs-calls.stderr |     6 +-
 .../feature-gate-unboxed-closures.stderr      |     4 +-
 ...feature-gate-unsized_tuple_coercion.stderr |     2 +-
 .../feature-gate-untagged_unions.stderr       |     6 +-
 .../feature-gate-unwind-attributes.stderr     |     2 +-
 src/test/ui/fmt/send-sync.stderr              |    20 +-
 src/test/ui/fn/fn-closure-mutable-capture.rs  |     4 +-
 .../ui/fn/fn-closure-mutable-capture.stderr   |    13 +-
 src/test/ui/fn_must_use.stderr                |     2 +-
 src/test/ui/for/for-loop-type-error.stderr    |     2 -
 .../ui/future-incompatible-lint-group.stderr  |     2 +-
 .../generator-yielding-or-returning-itself.rs |     2 +-
 ...erator-yielding-or-returning-itself.stderr |    27 +-
 .../async-generator-issue-67158.stderr        |     1 +
 .../generator/auxiliary/xcrate-reachable.rs   |     2 +-
 src/test/ui/generator/auxiliary/xcrate.rs     |     4 +-
 src/test/ui/generator/borrowing.rs            |     2 +-
 src/test/ui/generator/borrowing.stderr        |     2 +-
 src/test/ui/generator/conditional-drop.rs     |     8 +-
 src/test/ui/generator/control-flow.rs         |     4 +-
 src/test/ui/generator/drop-and-replace.rs     |     2 +-
 src/test/ui/generator/drop-env.rs             |     4 +-
 src/test/ui/generator/dropck-resume.rs        |    33 +
 src/test/ui/generator/dropck-resume.stderr    |    15 +
 src/test/ui/generator/dropck.rs               |     2 +-
 .../generator-region-requirements.rs          |     2 +-
 src/test/ui/generator/issue-44197.rs          |    13 +-
 .../issue-61442-stmt-expr-with-drop.rs        |     4 +-
 .../issue-64620-yield-array-element.rs        |     9 +
 .../issue-64620-yield-array-element.stderr    |     9 +
 src/test/ui/generator/issue-69017.rs          |    18 +
 src/test/ui/generator/issue-69039.rs          |    30 +
 src/test/ui/generator/iterator-count.rs       |     6 +-
 .../ui/generator/live-upvar-across-yield.rs   |     2 +-
 src/test/ui/generator/nested_generators.rs    |     2 +-
 .../generator/no-parameters-on-generators.rs  |     8 -
 .../no-parameters-on-generators.stderr        |    21 -
 src/test/ui/generator/not-send-sync.stderr    |     2 +-
 src/test/ui/generator/panic-drops-resume.rs   |    37 +
 src/test/ui/generator/panic-drops.rs          |     4 +-
 src/test/ui/generator/panic-safe.rs           |     4 +-
 .../ref-escapes-but-not-over-yield.stderr     |     2 +-
 src/test/ui/generator/resume-after-return.rs  |     4 +-
 .../ui/generator/resume-arg-late-bound.rs     |    17 +
 .../ui/generator/resume-arg-late-bound.stderr |    15 +
 .../ui/generator/resume-live-across-yield.rs  |    45 +
 src/test/ui/generator/retain-resume-ref.rs    |    25 +
 .../ui/generator/retain-resume-ref.stderr     |    14 +
 src/test/ui/generator/sized-yield.rs          |     2 +-
 src/test/ui/generator/sized-yield.stderr      |     2 +-
 src/test/ui/generator/smoke-resume-args.rs    |    97 +
 src/test/ui/generator/smoke.rs                |    28 +-
 src/test/ui/generator/static-generators.rs    |     4 +-
 src/test/ui/generator/static-not-unpin.rs     |     2 +-
 src/test/ui/generator/static-not-unpin.stderr |     2 +-
 src/test/ui/generator/too-many-parameters.rs  |     8 +
 .../ui/generator/too-many-parameters.stderr   |     8 +
 src/test/ui/generator/type-mismatch-error.rs  |    22 +
 .../ui/generator/type-mismatch-error.stderr   |    19 +
 .../type-mismatch-signature-deduction.rs      |     6 +-
 .../type-mismatch-signature-deduction.stderr  |    25 +-
 src/test/ui/generator/xcrate-reachable.rs     |     2 +-
 src/test/ui/generator/xcrate.rs               |     6 +-
 .../ui/generator/yield-while-iterating.rs     |     6 +-
 .../ui/generator/yield-while-iterating.stderr |     2 +-
 .../generator/yield-while-local-borrowed.rs   |     6 +-
 .../generator/yield-while-ref-reborrowed.rs   |     6 +-
 .../yield-while-ref-reborrowed.stderr         |     2 +-
 .../collections.stderr                        |     4 +-
 .../empty_generics.stderr                     |     5 +
 .../gat-dont-ice-on-absent-feature-2.stderr   |     6 +-
 .../gat-dont-ice-on-absent-feature.stderr     |     2 +-
 .../generic-associated-types-where.stderr     |     6 +-
 .../impl_bounds.stderr                        |     8 +-
 .../issue-47206-where-clause.stderr           |     2 +-
 .../issue-62326-parameter-out-of-range.rs     |     2 +-
 .../issue-62326-parameter-out-of-range.stderr |    15 +-
 .../issue-67424.stderr                        |     4 +-
 .../generic-associated-types/issue-68653.rs   |    16 +
 .../generic-associated-types/iterable.stderr  |    26 +-
 .../parameter_number_and_kind.stderr          |     8 +-
 .../pointer_family.stderr                     |     2 +-
 .../ui/generic-associated-types/shadowing.rs  |     4 +-
 .../generic-associated-types/shadowing.stderr |    25 +-
 .../generic/generic-arg-mismatch-recover.rs   |     1 -
 .../generic-arg-mismatch-recover.stderr       |    18 +-
 .../ui/generic/generic-extern-lifetime.stderr |    12 +
 src/test/ui/generic/generic-no-mangle.stderr  |     2 +-
 ...rrect-explicit-lifetime-name-needed.stderr |     3 +-
 ...ature-gate-half-open-range-patterns.stderr |    12 +-
 ...pats-inclusive-dotdotdot-bad-syntax.stderr |     2 +
 ...lf-open-range-pats-inclusive-no-end.stderr |     2 +
 ...pe.bound_a_b_ret_a_vs_bound_a_ret_a.stderr |     1 +
 .../hr-subtype.bound_a_b_vs_bound_a.stderr    |     1 +
 .../hr-subtype.bound_a_vs_free_x.stderr       |     1 +
 ...-subtype.bound_co_a_b_vs_bound_co_a.stderr |     1 +
 ...ubtype.bound_co_a_co_b_ret_contra_a.stderr |     1 +
 ...pe.bound_contra_a_contra_b_ret_co_a.stderr |     1 +
 ...ubtype.bound_inv_a_b_vs_bound_inv_a.stderr |     1 +
 ...ubtype.free_inv_x_vs_free_inv_y.nll.stderr |     2 +
 ...hr-subtype.free_inv_x_vs_free_inv_y.stderr |     2 +
 .../hr-subtype.free_x_vs_free_y.nll.stderr    |     1 +
 .../hr-subtype.free_x_vs_free_y.stderr        |     1 +
 ...igher-ranker-supertraits-transitive.stderr |     9 +-
 .../hrtb-higher-ranker-supertraits.stderr     |    18 +-
 src/test/ui/hrtb/issue-58451.rs               |     2 +-
 src/test/ui/hrtb/issue-58451.stderr           |     6 +-
 src/test/ui/huge-array-simple-32.rs           |     2 +-
 src/test/ui/huge-array-simple-64.rs           |     2 +-
 src/test/ui/hygiene/assoc_item_ctxt.stderr    |     4 +
 src/test/ui/hygiene/assoc_ty_bindings.rs      |     4 +-
 .../ui/hygiene/duplicate_lifetimes.stderr     |     4 +
 .../extern-prelude-from-opaque-fail.stderr    |     4 +
 src/test/ui/hygiene/fields-definition.stderr  |     6 +-
 src/test/ui/hygiene/fields-move.stderr        |     1 +
 src/test/ui/hygiene/fields.stderr             |     8 +
 src/test/ui/hygiene/generate-mod.stderr       |     8 +
 src/test/ui/hygiene/globs.stderr              |     3 +
 src/test/ui/hygiene/hygienic-label-1.stderr   |     2 +
 src/test/ui/hygiene/hygienic-label-3.stderr   |     2 +
 .../ui/hygiene/hygienic-labels-in-let.stderr  |    32 +
 src/test/ui/hygiene/hygienic-labels.stderr    |    32 +
 src/test/ui/hygiene/impl_items.stderr         |     2 +
 src/test/ui/hygiene/intercrate.stderr         |     2 +-
 .../ui/hygiene/no_implicit_prelude.stderr     |     5 +-
 src/test/ui/hygiene/privacy-early.stderr      |     1 +
 src/test/ui/hygiene/trait_items.stderr        |     1 +
 src/test/ui/if-attrs/bad-cfg.rs               |     5 +
 src/test/ui/if-attrs/bad-cfg.stderr           |     8 +
 src/test/ui/if-attrs/builtin-if-attr.rs       |    12 +
 src/test/ui/if-attrs/cfg-false-if-attr.rs     |    43 +
 src/test/ui/if-attrs/else-attrs.rs            |    25 +
 src/test/ui/if-attrs/else-attrs.stderr        |    27 +
 src/test/ui/if-attrs/gate-whole-expr.rs       |    15 +
 src/test/ui/if-attrs/let-chains-attr.rs       |    13 +
 src/test/ui/if-attrs/let-chains-attr.stderr   |     8 +
 src/test/ui/if-attrs/stmt-expr-gated.rs       |     6 +
 src/test/ui/if-attrs/stmt-expr-gated.stderr   |    12 +
 src/test/ui/if/if-let.stderr                  |     3 +
 src/test/ui/if/ifmt-bad-arg.stderr            |     2 +
 src/test/ui/if/ifmt-bad-format-args.stderr    |     2 +
 src/test/ui/if/ifmt-unimpl.stderr             |     1 +
 src/test/ui/ifmt.rs                           |     6 -
 .../assoc-type.stderr                         |     8 +-
 src/test/ui/impl-trait/auto-trait-leak.stderr |   150 +
 .../ui/impl-trait/bound-normalization-fail.rs |     1 -
 .../bound-normalization-fail.stderr           |     8 +-
 .../ui/impl-trait/equal-hidden-lifetimes.rs   |    49 +
 .../impl-trait/equal-hidden-lifetimes.stderr  |     8 +
 src/test/ui/impl-trait/issue-55872-1.stderr   |    15 +-
 src/test/ui/impl-trait/issue-57200.rs         |    15 +
 src/test/ui/impl-trait/issue-57200.stderr     |     8 +
 src/test/ui/impl-trait/issue-57201.rs         |    15 +
 src/test/ui/impl-trait/issue-57201.stderr     |     8 +
 src/test/ui/impl-trait/issue-60473.rs         |    17 +
 src/test/ui/impl-trait/issue-60473.stderr     |    11 +
 src/test/ui/impl-trait/issue-67166.rs         |    11 +
 src/test/ui/impl-trait/issue-67166.stderr     |    11 +
 ...e-21659-show-relevant-trait-impls-3.stderr |     7 +-
 .../multiple-lifetimes/error-handling-2.rs    |    29 +
 .../error-handling-2.stderr                   |    15 +
 .../multiple-lifetimes/error-handling.rs      |    13 +-
 .../multiple-lifetimes/error-handling.stderr  |    17 +-
 .../ordinary-bounds-unrelated.nll.stderr      |     2 +
 .../ordinary-bounds-unsuited.nll.stderr       |     2 +
 .../must_outlive_least_region_or_bound.rs     |     2 +-
 .../must_outlive_least_region_or_bound.stderr |     2 +-
 src/test/ui/impl-trait/nested-return-type.rs  |    16 +
 .../no-method-suggested-traits.stderr         |    42 +-
 ...-trait-in-return-position-dyn-trait.stderr |    26 +-
 .../recursive-impl-trait-type-direct.rs       |     5 +-
 .../recursive-impl-trait-type-direct.stderr   |     2 +-
 .../recursive-impl-trait-type-indirect.rs     |    65 +-
 .../recursive-impl-trait-type-indirect.stderr |    42 +-
 src/test/ui/impl-trait/trait_type.stderr      |     2 +-
 .../type_parameters_captured.stderr           |     2 +-
 .../ui/impl-trait/unsafety-checking-cycle.rs  |    32 +
 src/test/ui/impl-trait/where-allowed.stderr   |     6 +-
 src/test/ui/imports/extern-crate-used.stderr  |     2 +-
 .../extern-prelude-extern-crate-fail.stderr   |     2 +
 ...e-extern-crate-restricted-shadowing.stderr |     3 +
 src/test/ui/imports/import-crate-var.stderr   |     2 +-
 .../ui/imports/import-prefix-macro-1.stderr   |     2 +
 .../ui/imports/import-prefix-macro-2.stderr   |     2 +
 .../local-modularized-tricky-fail-1.stderr    |     4 +
 .../local-modularized-tricky-fail-2.stderr    |     9 +-
 .../local-modularized-tricky-fail-3.stderr    |     2 +
 src/test/ui/imports/reexports.stderr          |     2 +-
 .../ui/imports/shadow_builtin_macros.stderr   |     1 +
 .../ui/imports/unresolved-imports-used.stderr |     2 +-
 src/test/ui/imports/unused-macro-use.stderr   |     2 +-
 src/test/ui/imports/unused.stderr             |     2 +-
 .../in-band-lifetimes/elided-lifetimes.fixed  |     2 +-
 .../ui/in-band-lifetimes/elided-lifetimes.rs  |     2 +-
 .../in-band-lifetimes/elided-lifetimes.stderr |     6 +-
 ...anon-lifetime-in-struct-declaration.stderr |     4 +-
 .../no_introducing_in_band_in_locals.stderr   |    10 +
 .../ui/include-macros/mismatched-types.stderr |     2 +
 .../infer-binary-operand-behind-reference.rs  |    30 +
 .../inference_unstable_forced.stderr          |     2 +-
 .../ui/infinite/infinite-autoderef.stderr     |     6 +-
 .../infinite/infinite-macro-expansion.stderr  |     3 +-
 src/test/ui/inline-asm-bad-constraint.stderr  |     6 +
 .../internal/internal-unstable-const.stderr   |     2 +-
 .../internal/internal-unstable-noallow.stderr |     8 +-
 src/test/ui/internal/internal-unstable.stderr |     1 +
 .../ui/invalid-self-argument/bare-fn-start.rs |     6 +-
 .../bare-fn-start.stderr                      |     6 +-
 src/test/ui/invalid-self-argument/bare-fn.rs  |     3 +-
 .../ui/invalid-self-argument/bare-fn.stderr   |     4 +-
 src/test/ui/invalid-self-argument/trait-fn.rs |     2 +-
 .../ui/invalid-self-argument/trait-fn.stderr  |     2 +-
 src/test/ui/invalid/invalid-no-sanitize.rs    |     5 +
 .../ui/invalid/invalid-no-sanitize.stderr     |    10 +
 .../ui/invalid/invalid-plugin-attr.stderr     |     2 +-
 src/test/ui/issues/auxiliary/issue-51798.rs   |     3 +
 src/test/ui/issues/auxiliary/issue-69725.rs   |     8 +
 src/test/ui/issues/issue-10656.stderr         |     2 +-
 src/test/ui/issues/issue-12116.stderr         |     2 +-
 src/test/ui/issues/issue-12369.stderr         |     2 +-
 src/test/ui/issues/issue-12552.stderr         |     3 +
 src/test/ui/issues/issue-12567.stderr         |     4 +-
 src/test/ui/issues/issue-12997-2.stderr       |     2 +
 src/test/ui/issues/issue-13446.stderr         |     2 +-
 src/test/ui/issues/issue-13727.stderr         |     2 +-
 src/test/ui/issues/issue-14091-2.stderr       |     1 +
 src/test/ui/issues/issue-14221.stderr         |     2 +-
 src/test/ui/issues/issue-14309.stderr         |    12 +-
 src/test/ui/issues/issue-14915.stderr         |     2 -
 src/test/ui/issues/issue-15167.stderr         |     8 +
 src/test/ui/issues/issue-15381.rs             |     1 -
 src/test/ui/issues/issue-15381.stderr         |    11 +-
 src/test/ui/issues/issue-16098.stderr         |     3 +-
 src/test/ui/issues/issue-16250.stderr         |     4 +-
 src/test/ui/issues/issue-16683.nll.stderr     |     6 +-
 src/test/ui/issues/issue-16939.stderr         |     6 +-
 src/test/ui/issues/issue-16966.stderr         |     2 +-
 src/test/ui/issues/issue-17337.stderr         |     2 +-
 src/test/ui/issues/issue-17458.stderr         |     2 +-
 .../issue-17718-const-bad-values.stderr       |     4 +-
 .../ui/issues/issue-17718-const-naming.stderr |     4 +-
 src/test/ui/issues/issue-17758.nll.stderr     |     6 +-
 src/test/ui/issues/issue-17999.stderr         |     2 +-
 src/test/ui/issues/issue-18294.stderr         |     2 +-
 src/test/ui/issues/issue-18400.stderr         |     2 +-
 src/test/ui/issues/issue-18819.stderr         |     6 +-
 src/test/ui/issues/issue-18919.stderr         |     8 +-
 src/test/ui/issues/issue-18959.stderr         |    10 +-
 src/test/ui/issues/issue-19380.stderr         |     9 +-
 src/test/ui/issues/issue-19538.stderr         |    13 +-
 src/test/ui/issues/issue-19707.stderr         |    22 +-
 src/test/ui/issues/issue-20005.rs             |     4 +-
 src/test/ui/issues/issue-20005.stderr         |    17 +-
 src/test/ui/issues/issue-20313.stderr         |     2 +-
 src/test/ui/issues/issue-20413.rs             |     4 +-
 src/test/ui/issues/issue-20413.stderr         |    33 +-
 src/test/ui/issues/issue-20433.stderr         |     4 +-
 src/test/ui/issues/issue-20692.rs             |     2 +-
 src/test/ui/issues/issue-20692.stderr         |    15 +-
 .../ui/issues/issue-20831-debruijn.stderr     |    48 +-
 src/test/ui/issues/issue-21160.stderr         |     2 +
 src/test/ui/issues/issue-2150.stderr          |     3 +-
 src/test/ui/issues/issue-21596.stderr         |     3 +-
 src/test/ui/issues/issue-21600.stderr         |    33 +-
 src/test/ui/issues/issue-21837.stderr         |    10 +-
 src/test/ui/issues/issue-21974.rs             |     4 +-
 src/test/ui/issues/issue-21974.stderr         |    16 +-
 src/test/ui/issues/issue-22599.stderr         |     2 +-
 src/test/ui/issues/issue-22644.stderr         |     2 +-
 src/test/ui/issues/issue-22777.rs             |     2 +-
 src/test/ui/issues/issue-22933-3.rs           |     4 -
 src/test/ui/issues/issue-22933-3.stderr       |    14 -
 src/test/ui/issues/issue-23024.stderr         |     2 +-
 src/test/ui/issues/issue-23122-2.stderr       |     4 +-
 src/test/ui/issues/issue-23281.stderr         |     4 +-
 src/test/ui/issues/issue-24204.stderr         |     4 +-
 src/test/ui/issues/issue-24363.stderr         |     2 -
 src/test/ui/issues/issue-24424.stderr         |     4 +-
 src/test/ui/issues/issue-25385.stderr         |     2 +
 src/test/ui/issues/issue-25386.stderr         |     4 +
 src/test/ui/issues/issue-25439.stderr         |     3 +-
 src/test/ui/issues/issue-25793.stderr         |     2 +
 src/test/ui/issues/issue-25826.stderr         |     2 +-
 src/test/ui/issues/issue-26056.stderr         |     7 +-
 src/test/ui/issues/issue-26093.stderr         |     4 +
 src/test/ui/issues/issue-26094.rs             |     8 +-
 src/test/ui/issues/issue-26094.stderr         |     8 +-
 src/test/ui/issues/issue-26459.rs             |     2 +
 src/test/ui/issues/issue-26459.stderr         |     2 +-
 src/test/ui/issues/issue-26638.stderr         |     6 +-
 src/test/ui/issues/issue-27060-2.stderr       |     2 +-
 src/test/ui/issues/issue-27060.stderr         |     2 +-
 src/test/ui/issues/issue-27340.stderr         |     2 +
 src/test/ui/issues/issue-27592.stderr         |     4 +
 src/test/ui/issues/issue-27942.stderr         |     8 +-
 src/test/ui/issues/issue-28576.stderr         |     9 +-
 src/test/ui/issues/issue-29084.stderr         |     2 +
 src/test/ui/issues/issue-30240-b.stderr       |     2 +-
 src/test/ui/issues/issue-30255.stderr         |    18 +-
 src/test/ui/issues/issue-30302.stderr         |     2 +-
 src/test/ui/issues/issue-3044.rs              |     2 +-
 src/test/ui/issues/issue-3044.stderr          |    10 +-
 src/test/ui/issues/issue-30730.stderr         |     2 +-
 src/test/ui/issues/issue-31011.stderr         |     2 +
 src/test/ui/issues/issue-31076.stderr         |     4 -
 src/test/ui/issues/issue-31173.rs             |     4 +
 src/test/ui/issues/issue-31173.stderr         |    24 +-
 src/test/ui/issues/issue-31221.stderr         |     2 +-
 src/test/ui/issues/issue-32655.stderr         |     2 +
 src/test/ui/issues/issue-32782.stderr         |     1 +
 src/test/ui/issues/issue-32829.stderr         |     4 +-
 src/test/ui/issues/issue-32950.stderr         |     2 +
 .../issue-33140-traitobject-crate.stderr      |     2 +-
 src/test/ui/issues/issue-3344.stderr          |     2 +-
 src/test/ui/issues/issue-33504.stderr         |     9 +-
 src/test/ui/issues/issue-34229.stderr         |     5 +
 src/test/ui/issues/issue-34255-1.stderr       |     2 +-
 src/test/ui/issues/issue-34334.stderr         |     2 +-
 src/test/ui/issues/issue-34721.stderr         |    10 +-
 src/test/ui/issues/issue-35668.stderr         |     2 -
 src/test/ui/issues/issue-35677.stderr         |     4 +-
 src/test/ui/issues/issue-35976.stderr         |     3 +
 src/test/ui/issues/issue-37026.stderr         |     4 +-
 src/test/ui/issues/issue-37515.stderr         |     2 +-
 src/test/ui/issues/issue-37550.stderr         |     2 +-
 src/test/ui/issues/issue-3763.rs              |     3 +
 src/test/ui/issues/issue-3763.stderr          |    10 +-
 src/test/ui/issues/issue-37887.stderr         |     2 +-
 src/test/ui/issues/issue-38404.stderr         |     6 +-
 src/test/ui/issues/issue-38604.stderr         |    13 +-
 src/test/ui/issues/issue-38821.stderr         |     1 +
 src/test/ui/issues/issue-38940.stderr         |     2 +-
 src/test/ui/issues/issue-38954.stderr         |     4 +-
 src/test/ui/issues/issue-39559.stderr         |     4 -
 src/test/ui/issues/issue-39616.rs             |     3 +-
 src/test/ui/issues/issue-39616.stderr         |     4 +-
 src/test/ui/issues/issue-39848.rs             |     3 +-
 src/test/ui/issues/issue-39848.stderr         |    12 +-
 src/test/ui/issues/issue-40610.stderr         |     2 -
 src/test/ui/issues/issue-41229-ref-str.stderr |     4 +-
 src/test/ui/issues/issue-41255.stderr         |     2 +-
 src/test/ui/issues/issue-41394.stderr         |     2 -
 src/test/ui/issues/issue-42312.stderr         |    12 +-
 src/test/ui/issues/issue-42954.stderr         |     2 +
 .../issues/issue-43784-associated-type.stderr |    11 +-
 .../ui/issues/issue-43784-supertrait.stderr   |    10 +-
 src/test/ui/issues/issue-44406.stderr         |     2 +-
 ...45107-unnecessary-unsafe-in-closure.stderr |     2 +-
 src/test/ui/issues/issue-46576.stderr         |     2 +-
 src/test/ui/issues/issue-46604.stderr         |     2 +-
 src/test/ui/issues/issue-48131.stderr         |     2 +-
 src/test/ui/issues/issue-48364.stderr         |     1 +
 src/test/ui/issues/issue-48728.stderr         |     1 +
 src/test/ui/issues/issue-4935.rs              |     2 +-
 src/test/ui/issues/issue-4935.stderr          |     6 +-
 src/test/ui/issues/issue-4968.stderr          |     9 +-
 src/test/ui/issues/issue-49934.rs             |     2 +-
 src/test/ui/issues/issue-49934.stderr         |     2 +-
 .../option-as_deref.stderr                    |     3 +-
 .../option-as_deref_mut.stderr                |     3 +-
 .../result-as_deref.stderr                    |     3 +-
 .../result-as_deref_err.stderr                |     3 +-
 .../result-as_deref_mut.stderr                |     3 +-
 .../result-as_deref_mut_err.stderr            |     3 +-
 src/test/ui/issues/issue-50480.stderr         |     2 +
 src/test/ui/issues/issue-50781.stderr         |     8 +-
 src/test/ui/issues/issue-5100.stderr          |    11 +
 src/test/ui/issues/issue-5153.stderr          |     7 +-
 src/test/ui/issues/issue-51714.stderr         |     2 +-
 src/test/ui/issues/issue-51798.rs             |    14 +
 src/test/ui/issues/issue-51848.stderr         |     1 +
 ...issue-52023-array-size-pointer-cast.stderr |     2 +-
 src/test/ui/issues/issue-53251.stderr         |     4 +
 src/test/ui/issues/issue-53840.rs             |    20 -
 src/test/ui/issues/issue-53840.stderr         |    20 -
 src/test/ui/issues/issue-54348.rs             |     4 +-
 src/test/ui/issues/issue-54348.stderr         |    10 +-
 src/test/ui/issues/issue-54954.rs             |     2 +-
 src/test/ui/issues/issue-54954.stderr         |     4 +-
 src/test/ui/issues/issue-55511.stderr         |     2 +-
 src/test/ui/issues/issue-56411.stderr         |     2 +
 src/test/ui/issues/issue-56685.stderr         |     2 +-
 src/test/ui/issues/issue-57362-1.stderr       |     7 +-
 src/test/ui/issues/issue-57362-2.stderr       |     7 +-
 src/test/ui/issues/issue-57472.stderr         |     2 +-
 src/test/ui/issues/issue-58856-1.stderr       |     6 +
 src/test/ui/issues/issue-58856-2.rs           |     2 +-
 src/test/ui/issues/issue-58856-2.stderr       |    12 +-
 src/test/ui/issues/issue-59488.stderr         |     9 +-
 src/test/ui/issues/issue-59896.stderr         |     2 +-
 src/test/ui/issues/issue-60075.rs             |     6 +-
 src/test/ui/issues/issue-60075.stderr         |    22 +-
 src/test/ui/issues/issue-60622.stderr         |     2 +-
 src/test/ui/issues/issue-6596-1.rs            |     2 +-
 src/test/ui/issues/issue-6596-1.stderr        |     6 +-
 src/test/ui/issues/issue-6596-2.rs            |     2 +-
 src/test/ui/issues/issue-6596-2.stderr        |     6 +-
 src/test/ui/issues/issue-6804.stderr          |     2 +-
 .../issue-68091-unicode-ident-after-if.stderr |     2 +
 .../issues/issue-68696-catch-during-unwind.rs |    26 +
 src/test/ui/issues/issue-69306.rs             |    45 +
 src/test/ui/issues/issue-69306.stderr         |   115 +
 .../issue-69396-const-no-type-in-macro.stderr |     5 +
 ...issue-69602-type-err-during-codegen-ice.rs |    22 +
 ...e-69602-type-err-during-codegen-ice.stderr |    19 +
 src/test/ui/issues/issue-69725.rs             |    11 +
 src/test/ui/issues/issue-69725.stderr         |    18 +
 src/test/ui/issues/issue-7246.stderr          |     2 +-
 src/test/ui/issues/issue-7867.stderr          |     5 +
 .../ui/issues/issue-8460-const.noopt.stderr   |   150 +
 .../ui/issues/issue-8460-const.opt.stderr     |   150 +
 ...8460-const.opt_with_overflow_checks.stderr |   150 +
 src/test/ui/issues/issue-8460-const.rs        |    66 +-
 src/test/ui/issues/issue-8460-const.stderr    |   188 -
 src/test/ui/issues/issue-8460-const2.rs       |    50 -
 src/test/ui/issues/issue-8460-const2.stderr   |   128 -
 src/test/ui/json-short.stderr                 |     6 +-
 .../kindck/kindck-impl-type-params.nll.stderr |    32 +-
 .../ui/kindck/kindck-impl-type-params.stderr  |    32 +-
 .../kindck-inherited-copy-bound.curr.stderr   |    13 +-
 ...copy-bound.object_safe_for_dispatch.stderr |     6 +-
 .../label/label_break_value_illegal_uses.rs   |     2 +-
 .../label_break_value_illegal_uses.stderr     |     4 +-
 .../homogeneous-aggr-zero-sized-c-struct.rs   |     4 +-
 ...omogeneous-aggr-zero-sized-c-struct.stderr |     4 +-
 .../homogeneous-aggr-zero-sized-repr-rust.rs  |    10 +-
 ...mogeneous-aggr-zero-sized-repr-rust.stderr |    10 +-
 src/test/ui/layout/unsafe-cell-hides-niche.rs |    32 +
 src/test/ui/layout/zero-sized-array-union.rs  |     8 +-
 .../ui/layout/zero-sized-array-union.stderr   |     8 +-
 .../ui/lifetime_starts_expressions.stderr     |     2 +-
 .../lifetimes/borrowck-let-suggestion.stderr  |     2 +-
 .../lifetime-doesnt-live-long-enough.stderr   |    80 +-
 ...urn-type-requires-explicit-lifetime.stderr |    12 +-
 ...xisting-name-if-else-using-impl.nll.stderr |     2 +-
 ...isting-name-return-type-is-anon.nll.stderr |     2 +-
 ...-one-existing-name-self-is-anon.nll.stderr |     2 +-
 .../ex1b-return-no-names-if-else.stderr       |     6 +-
 ...non-regions-return-type-is-anon.nll.stderr |     2 +-
 ...-both-anon-regions-self-is-anon.nll.stderr |     2 +-
 src/test/ui/linkage-attr/linkage4.stderr      |     2 +-
 src/test/ui/lint/dead-code/basic.stderr       |     2 +-
 .../lint/dead-code/empty-unused-enum.stderr   |     2 +-
 src/test/ui/lint/dead-code/impl-trait.stderr  |     2 +-
 .../ui/lint/dead-code/lint-dead-code-1.stderr |     2 +-
 .../ui/lint/dead-code/lint-dead-code-2.stderr |     2 +-
 .../ui/lint/dead-code/lint-dead-code-3.stderr |     2 +-
 .../ui/lint/dead-code/lint-dead-code-4.stderr |     2 +-
 .../ui/lint/dead-code/lint-dead-code-5.stderr |     2 +-
 .../ui/lint/dead-code/newline-span.stderr     |     2 +-
 src/test/ui/lint/dead-code/type-alias.stderr  |     2 +-
 src/test/ui/lint/dead-code/unused-enum.stderr |     2 +-
 .../dead-code/unused-struct-variant.stderr    |     2 +-
 .../ui/lint/dead-code/unused-variant.stderr   |     2 +-
 .../ui/lint/dead-code/with-core-crate.stderr  |     2 +-
 .../inclusive-range-pattern-syntax.stderr     |     2 +-
 .../inline-trait-and-foreign-items.stderr     |     6 +-
 ...0-unused-variable-in-struct-pattern.stderr |     6 +-
 .../lint/issue-54180-unused-ref-field.stderr  |     2 +-
 .../ui/lint/issue-54538-unused-parens-lint.rs |     1 -
 .../issue-54538-unused-parens-lint.stderr     |    60 +-
 ...o-snake-case-warning-for-field-puns.stderr |     2 +-
 .../ui/lint/lint-attr-non-item-node.stderr    |     2 +-
 src/test/ui/lint/lint-change-warnings.stderr  |     4 +-
 src/test/ui/lint/lint-ctypes-enum.stderr      |     8 +-
 src/test/ui/lint/lint-ctypes.stderr           |    10 +-
 ...directives-on-use-items-issue-10534.stderr |     4 +-
 .../lint-exceeding-bitshifts.noopt.stderr     |   146 +
 .../lint/lint-exceeding-bitshifts.opt.stderr  |   146 +
 ...-bitshifts.opt_with_overflow_checks.stderr |   146 +
 src/test/ui/lint/lint-exceeding-bitshifts.rs  |    71 +-
 .../ui/lint/lint-exceeding-bitshifts.stderr   |   116 -
 src/test/ui/lint/lint-exceeding-bitshifts2.rs |    20 -
 .../ui/lint/lint-exceeding-bitshifts2.stderr  |    32 -
 .../lint/lint-forbid-internal-unsafe.stderr   |     2 +-
 .../lint/lint-group-nonstandard-style.stderr  |    10 +-
 src/test/ui/lint/lint-impl-fn.stderr          |     6 +-
 ...lint-lowercase-static-const-pattern.stderr |     2 +-
 src/test/ui/lint/lint-match-arms.rs           |     2 +-
 src/test/ui/lint/lint-match-arms.stderr       |     2 +-
 src/test/ui/lint/lint-misplaced-attr.stderr   |     2 +-
 .../lint-missing-copy-implementations.stderr  |     2 +-
 src/test/ui/lint/lint-missing-doc.rs          |     2 +-
 src/test/ui/lint/lint-missing-doc.stderr      |     2 +-
 .../ui/lint/lint-non-camel-case-types.stderr  |     2 +-
 .../lint/lint-non-snake-case-crate-2.stderr   |     2 +-
 .../ui/lint/lint-non-snake-case-crate.stderr  |     2 +-
 .../lint/lint-non-snake-case-functions.stderr |     2 +-
 .../lint/lint-non-snake-case-lifetimes.stderr |     2 +-
 .../lint/lint-non-snake-case-modules.stderr   |     2 +-
 ...lint-non-uppercase-associated-const.stderr |     2 +-
 .../ui/lint/lint-non-uppercase-statics.stderr |     2 +-
 .../ui/lint/lint-owned-heap-memory.stderr     |     2 +-
 src/test/ui/lint/lint-qualification.stderr    |     2 +-
 .../lint/lint-range-endpoint-overflow.stderr  |     2 +-
 src/test/ui/lint/lint-removed-allow.stderr    |     2 +-
 src/test/ui/lint/lint-removed-cmdline.stderr  |     2 +-
 src/test/ui/lint/lint-removed.stderr          |     2 +-
 src/test/ui/lint/lint-renamed-allow.stderr    |     2 +-
 src/test/ui/lint/lint-renamed-cmdline.stderr  |     2 +-
 src/test/ui/lint/lint-renamed.stderr          |     2 +-
 src/test/ui/lint/lint-shorthand-field.stderr  |     2 +-
 .../ui/lint/lint-stability-deprecated.stderr  |     2 +-
 .../lint-stability-fields-deprecated.stderr   |     2 +-
 src/test/ui/lint/lint-stability2.stderr       |     4 +-
 src/test/ui/lint/lint-stability3.stderr       |     4 +-
 src/test/ui/lint/lint-type-limits2.stderr     |     2 +-
 src/test/ui/lint/lint-type-limits3.stderr     |     2 +-
 src/test/ui/lint/lint-type-overflow.stderr    |     2 +-
 src/test/ui/lint/lint-type-overflow2.stderr   |     2 +-
 .../lint/lint-unconditional-recursion.stderr  |     2 +-
 src/test/ui/lint/lint-unknown-lint.stderr     |     2 +-
 .../lint-unnecessary-import-braces.stderr     |     2 +-
 src/test/ui/lint/lint-unnecessary-parens.rs   |     3 +
 .../ui/lint/lint-unnecessary-parens.stderr    |    38 +-
 src/test/ui/lint/lint-unsafe-code.stderr      |     4 +-
 .../ui/lint/lint-unused-extern-crate.stderr   |     2 +-
 src/test/ui/lint/lint-unused-imports.stderr   |     2 +-
 src/test/ui/lint/lint-unused-mut-self.stderr  |     2 +-
 src/test/ui/lint/lint-unused-mut-variables.rs |    52 +-
 .../ui/lint/lint-unused-mut-variables.stderr  |    72 +-
 src/test/ui/lint/lint-unused-variables.stderr |     2 +-
 .../ui/lint/lint-uppercase-variables.stderr   |     4 +-
 .../ui/lint/lints-in-foreign-macros.stderr    |     5 +-
 src/test/ui/lint/must-use-ops.stderr          |     2 +-
 src/test/ui/lint/must_use-array.stderr        |     2 +-
 src/test/ui/lint/must_use-trait.stderr        |     2 +-
 src/test/ui/lint/must_use-tuple.stderr        |     2 +-
 src/test/ui/lint/must_use-unit.stderr         |     2 +-
 src/test/ui/lint/opaque-ty-ffi-unsafe.stderr  |     2 +-
 src/test/ui/lint/reasons.rs                   |     4 +-
 src/test/ui/lint/reasons.stderr               |     4 +-
 .../redundant-semi-proc-macro.rs              |     2 +-
 .../redundant-semi-proc-macro.stderr          |     8 +-
 .../lint-non-ascii-idents.stderr              |     2 +-
 .../lint-uncommon-codepoints.stderr           |     2 +-
 src/test/ui/lint/suggestions.rs               |     4 -
 src/test/ui/lint/suggestions.stderr           |    34 +-
 src/test/ui/lint/test-inner-fn.stderr         |     3 +
 ...ial-casts-featuring-type-ascription.stderr |     4 +-
 src/test/ui/lint/trivial-casts.stderr         |     4 +-
 src/test/ui/lint/type-overflow.stderr         |     2 +-
 src/test/ui/lint/uninitialized-zeroed.stderr  |     2 +-
 .../ui/lint/unreachable_pub-pub_crate.stderr  |     3 +-
 src/test/ui/lint/unreachable_pub.stderr       |     3 +-
 .../unused_import_warning_issue_45268.stderr  |     2 +-
 src/test/ui/lint/unused_labels.stderr         |     2 +-
 .../lint/unused_parens_json_suggestion.stderr |     2 +-
 ...nused_parens_remove_json_suggestion.stderr |     2 +-
 src/test/ui/lint/use-redundant.stderr         |     2 +-
 ...warn-unused-inline-on-fn-prototypes.stderr |     2 +-
 src/test/ui/liveness/liveness-dead.stderr     |     2 +-
 .../liveness-return-last-stmt-semi.stderr     |     2 +
 src/test/ui/liveness/liveness-unused.stderr   |     6 +-
 .../main.-Zmacro-backtrace.stderr             |    78 +
 .../ui/macro_backtrace/main.default.stderr    |    35 +
 src/test/ui/macro_backtrace/main.rs           |     3 +-
 src/test/ui/macro_backtrace/main.stderr       |    78 -
 src/test/ui/macros/assert-trailing-junk.rs    |     6 +-
 .../ui/macros/assert-trailing-junk.stderr     |    14 +-
 src/test/ui/macros/assert.stderr              |     2 +-
 src/test/ui/macros/cfg.stderr                 |     2 +
 .../derive-in-eager-expansion-hang.stderr     |     1 +
 src/test/ui/macros/format-parse-errors.stderr |     2 +-
 src/test/ui/macros/issue-54441.rs             |     2 +-
 src/test/ui/macros/issue-54441.stderr         |     8 +-
 .../issue-61053-different-kleene.stderr       |     2 +-
 .../issue-61053-duplicate-binder.stderr       |     2 +-
 .../issue-61053-missing-repetition.stderr     |     2 +-
 src/test/ui/macros/issue-61053-unbound.stderr |     2 +-
 src/test/ui/macros/issue-68060.rs             |    16 +
 src/test/ui/macros/issue-68060.stderr         |    24 +
 src/test/ui/macros/issue-70446.rs             |    13 +
 .../macro-backtrace-invalid-internals.stderr  |    14 +
 .../ui/macros/macro-backtrace-nested.stderr   |     4 +
 .../ui/macros/macro-backtrace-println.stderr  |     2 +
 src/test/ui/macros/macro-context.stderr       |     2 +
 .../macro-lifetime-used-with-labels.stderr    |     2 +
 .../macros/macro-local-data-key-priv.stderr   |     2 +-
 src/test/ui/macros/macro-shadowing.stderr     |     2 +
 .../ui/macros/macro-use-all-and-none.stderr   |     2 +-
 .../ui/macros/macros-nonfatal-errors.stderr   |     6 +
 .../ui/macros/must-use-in-macro-55516.stderr  |     2 +-
 .../ui/macros/nonterminal-matching.stderr     |     2 +
 .../macros/restricted-shadowing-legacy.stderr |     8 +
 .../macros/restricted-shadowing-modern.stderr |     6 +
 src/test/ui/macros/same-sequence-span.stderr  |     7 +-
 .../ui/macros/span-covering-argument-1.stderr |     2 +
 src/test/ui/macros/trace_faulty_macros.stderr |     5 +-
 .../malformed/malformed-derive-entry.stderr   |     4 +
 .../malformed/malformed-interpolated.stderr   |     4 +
 .../match/match-arm-resolving-to-never.stderr |     2 -
 src/test/ui/match/match-ill-type2.stderr      |     3 +
 .../match-no-arms-unreachable-after.stderr    |     2 +-
 src/test/ui/match/match-tag-nullary.stderr    |     7 +-
 src/test/ui/methods/assign-to-method.rs       |    24 +
 src/test/ui/methods/assign-to-method.stderr   |    19 +
 src/test/ui/methods/method-call-err-msg.rs    |     8 +-
 .../ui/methods/method-call-err-msg.stderr     |    52 +-
 ...method-call-lifetime-args-lint-fail.stderr |     2 +-
 .../method-call-lifetime-args-lint.stderr     |     2 +-
 .../method-on-ambiguous-numeric-type.stderr   |     2 -
 src/test/ui/minus-string.stderr               |     2 -
 .../mir-dataflow/indirect-mutation-offset.rs  |     7 +
 .../indirect-mutation-offset.stderr           |     2 +-
 .../mir-inlining/var-debuginfo-issue-67586.rs |    11 +
 src/test/ui/mir/mir_assign_eval_order.rs      |     2 +-
 src/test/ui/mir/mir_raw_fat_ptr.rs            |    59 +-
 src/test/ui/mismatched_types/E0409.stderr     |     8 +-
 .../mismatched_types/const-fn-in-trait.stderr |     8 +-
 .../ui/mismatched_types/issue-26480.stderr    |     2 +
 src/test/ui/mismatched_types/issue-36053-2.rs |     4 +
 .../ui/mismatched_types/issue-36053-2.stderr  |    24 +-
 .../ui/mismatched_types/issue-38371.stderr    |     9 +-
 .../method-help-unsatisfied-bound.stderr      |     5 +-
 .../mismatched_types/overloaded-calls-bad.rs  |     4 +-
 .../overloaded-calls-bad.stderr               |    12 +-
 src/test/ui/missing/missing-items/m2.stderr   |     2 +-
 .../ui/missing/missing-semicolon-warning.rs   |    12 -
 .../missing/missing-semicolon-warning.stderr  |    22 -
 src/test/ui/missing_debug_impls.rs            |     4 +-
 src/test/ui/missing_debug_impls.stderr        |     6 +-
 src/test/ui/moves/move-out-of-slice-2.rs      |     2 +-
 ...-on-type-no-recursive-stack-closure.stderr |    10 +-
 src/test/ui/mut/mut-pattern-mismatched.stderr |     6 +
 .../ui/never_type/defaulted-never-note.stderr |     2 +-
 .../feature-gate-never_type_fallback.stderr   |     1 -
 src/test/ui/never_type/issue-2149.stderr      |     7 +-
 .../never_type/never-assign-dead-code.stderr  |     5 +-
 src/test/ui/nll/capture-mut-ref.stderr        |     2 +-
 src/test/ui/nll/closure-captures.stderr       |   120 +-
 ...er-to-static-comparing-against-free.stderr |     2 +-
 src/test/ui/nll/dont-print-desugared.stderr   |     5 +-
 .../nll/issue-54556-used-vs-unused-tails.rs   |     2 +-
 src/test/ui/nll/issue-55850.rs                |     2 +-
 src/test/ui/nll/issue-61424.stderr            |     2 +-
 src/test/ui/nll/outlives-suggestion-simple.rs |     2 +-
 .../ui/nll/outlives-suggestion-simple.stderr  |     8 +-
 ...ojection-two-region-trait-bound-closure.rs |     4 +-
 src/test/ui/nll/unused-mut-issue-50343.stderr |     2 +-
 .../type-annotation-with-hrtb.rs              |    33 +
 src/test/ui/no-patterns-in-args-2.rs          |     4 +-
 src/test/ui/no-patterns-in-args-2.stderr      |     8 +-
 src/test/ui/no-patterns-in-args-macro.rs      |     6 +-
 src/test/ui/no-patterns-in-args-macro.stderr  |     4 +-
 src/test/ui/not-enough-arguments.rs           |     2 +-
 src/test/ui/not-enough-arguments.stderr       |     6 +-
 src/test/ui/object-pointer-types.stderr       |    14 +-
 ...bject-safety-associated-consts.curr.stderr |    10 +-
 ...ted-consts.object_safe_for_dispatch.stderr |     5 +-
 .../object-safety-generics.curr.stderr        |    20 +-
 ...y-generics.object_safe_for_dispatch.stderr |    10 +-
 .../object-safety-issue-22040.stderr          |     7 +-
 .../object-safety-mentions-Self.curr.stderr   |    20 +-
 ...tions-Self.object_safe_for_dispatch.stderr |    10 +-
 .../object-safety-no-static.curr.stderr       |    13 +-
 ...-no-static.object_safe_for_dispatch.stderr |     8 +-
 .../object-safety-sized-2.curr.stderr         |    11 +-
 ...ty-sized-2.object_safe_for_dispatch.stderr |     6 +-
 .../object-safety-sized.curr.stderr           |    11 +-
 ...fety-sized.object_safe_for_dispatch.stderr |     6 +-
 ...ect-safety-supertrait-mentions-Self.stderr |     7 +-
 .../feature-gate-on-unimplemented.stderr      |     1 -
 src/test/ui/on-unimplemented/no-debug.stderr  |     4 +
 .../ui/once-cant-call-twice-on-heap.stderr    |    10 +-
 src/test/ui/or-patterns/already-bound-name.rs |     1 -
 .../ui/or-patterns/already-bound-name.stderr  |    46 +-
 src/test/ui/or-patterns/basic-switch.rs       |    33 +
 src/test/ui/or-patterns/basic-switchint.rs    |    54 +
 src/test/ui/or-patterns/bindings-runpass-1.rs |    25 +
 src/test/ui/or-patterns/bindings-runpass-2.rs |    32 +
 src/test/ui/or-patterns/box-patterns.rs       |    37 +
 .../ui/or-patterns/consistent-bindings.rs     |    47 +-
 .../ui/or-patterns/consistent-bindings.stderr |    17 -
 .../exhaustiveness-non-exhaustive.rs          |    12 +-
 .../exhaustiveness-non-exhaustive.stderr      |    14 +-
 .../ui/or-patterns/exhaustiveness-pass.rs     |    18 +-
 .../ui/or-patterns/exhaustiveness-pass.stderr |     8 -
 .../exhaustiveness-unreachable-pattern.rs     |    27 +-
 .../exhaustiveness-unreachable-pattern.stderr |    50 +-
 .../ui/or-patterns/feature-gate-const-fn.rs   |     3 +-
 .../or-patterns/feature-gate-const-fn.stderr  |    41 +-
 ...eature-gate-or_patterns-leading-for.stderr |     2 +-
 ...eature-gate-or_patterns-leading-let.stderr |     2 +-
 .../feature-gate-or_patterns.stderr           |    38 +-
 src/test/ui/or-patterns/for-loop.rs           |    18 +
 src/test/ui/or-patterns/if-let-while-let.rs   |    22 +
 src/test/ui/or-patterns/inconsistent-modes.rs |    18 +-
 .../ui/or-patterns/inconsistent-modes.stderr  |    64 +-
 .../issue-67514-irrefutable-param.rs          |    11 +
 .../issue-68785-irrefutable-param-with-at.rs  |    14 +
 src/test/ui/or-patterns/let-pattern.rs        |    19 +
 src/test/ui/or-patterns/missing-bindings.rs   |     2 -
 .../ui/or-patterns/missing-bindings.stderr    |    60 +-
 src/test/ui/or-patterns/mix-with-wild.rs      |    19 +
 .../ui/or-patterns/multiple-pattern-typo.rs   |     1 -
 .../or-patterns/multiple-pattern-typo.stderr  |    22 +-
 .../ui/or-patterns/or-pattern-mismatch.rs     |     4 -
 .../ui/or-patterns/or-pattern-mismatch.stderr |     9 -
 .../or-patterns-binding-type-mismatch.rs      |    68 +
 .../or-patterns-binding-type-mismatch.stderr  |   257 +
 .../or-patterns-default-binding-modes.rs      |   132 +
 .../or-patterns/or-patterns-syntactic-fail.rs |     1 -
 .../or-patterns-syntactic-fail.stderr         |    40 +-
 .../or-patterns/or-patterns-syntactic-pass.rs |     2 +-
 .../or-patterns-syntactic-pass.stderr         |     8 -
 .../ui/or-patterns/search-via-bindings.rs     |    66 +
 src/test/ui/or-patterns/slice-patterns.rs     |    53 +
 src/test/ui/or-patterns/struct-like.rs        |    42 +
 src/test/ui/out-of-order-shadowing.stderr     |     2 +-
 ...lap-doesnt-conflict-with-specialization.rs |     3 +-
 src/test/ui/overlap-marker-trait.rs           |    31 -
 src/test/ui/overlap-marker-trait.stderr       |    12 -
 .../panic-handler-duplicate.stderr            |     2 +-
 .../ui/panic-handler/panic-handler-std.stderr |     2 +-
 src/test/ui/panic-runtime/needs-gate.stderr   |     4 +-
 .../assoc-const-underscore-semantic-fail.rs   |    17 +
 ...ssoc-const-underscore-semantic-fail.stderr |    27 +
 .../assoc-const-underscore-syntactic-pass.rs  |    18 +
 .../ui/parser/assoc-static-semantic-fail.rs   |    51 +
 .../parser/assoc-static-semantic-fail.stderr  |   167 +
 .../ui/parser/assoc-static-syntactic-fail.rs  |    33 +
 .../parser/assoc-static-syntactic-fail.stderr |   122 +
 src/test/ui/parser/attr-before-eof.stderr     |     4 +-
 src/test/ui/parser/attr-dangling-in-fn.stderr |     6 +-
 .../ui/parser/attr-dangling-in-mod.stderr     |     4 +-
 src/test/ui/parser/attr-stmt-expr-attr-bad.rs |    10 +-
 .../ui/parser/attr-stmt-expr-attr-bad.stderr  |   108 +-
 src/test/ui/parser/attrs-after-extern-mod.rs  |    10 +-
 .../ui/parser/attrs-after-extern-mod.stderr   |     8 +-
 src/test/ui/parser/bounds-lifetime-where.rs   |     2 +-
 .../ui/parser/bounds-lifetime-where.stderr    |     4 +-
 .../ui/parser/default-on-wrong-item-kind.rs   |   140 +
 .../parser/default-on-wrong-item-kind.stderr  |   688 ++
 src/test/ui/parser/default-unmatched-assoc.rs |    16 +
 .../ui/parser/default-unmatched-assoc.stderr  |    54 +
 .../ui/parser/default-unmatched-extern.rs     |     8 +
 .../ui/parser/default-unmatched-extern.stderr |    28 +
 src/test/ui/parser/default-unmatched.rs       |     6 +
 src/test/ui/parser/default-unmatched.stderr   |    16 +
 src/test/ui/parser/default.rs                 |     4 +-
 src/test/ui/parser/default.stderr             |    19 +-
 src/test/ui/parser/doc-before-attr.stderr     |     6 +-
 .../ui/parser/doc-before-extern-rbrace.rs     |     4 +-
 .../ui/parser/doc-before-extern-rbrace.stderr |     7 +-
 src/test/ui/parser/doc-before-semi.rs         |     2 -
 src/test/ui/parser/doc-before-semi.stderr     |     8 -
 src/test/ui/parser/doc-comment-in-stmt.rs     |    20 +
 src/test/ui/parser/doc-comment-in-stmt.stderr |    50 +
 .../ui/parser/doc-inside-trait-item.stderr    |     2 +-
 src/test/ui/parser/duplicate-visibility.rs    |     5 +-
 .../ui/parser/duplicate-visibility.stderr     |    21 +-
 .../extern-abi-from-mac-literal-frag.rs       |    22 +-
 src/test/ui/parser/extern-crate-async.rs      |    12 +
 .../parser/extern-crate-unexpected-token.rs   |     2 +-
 .../extern-crate-unexpected-token.stderr      |     4 +-
 .../ui/parser/extern-expected-fn-or-brace.rs  |     5 +-
 .../parser/extern-expected-fn-or-brace.stderr |     6 +-
 src/test/ui/parser/extern-no-fn.rs            |     4 +-
 src/test/ui/parser/extern-no-fn.stderr        |    14 +-
 .../parser/fn-body-optional-semantic-fail.rs  |    27 +
 .../fn-body-optional-semantic-fail.stderr     |    40 +
 .../parser/fn-body-optional-syntactic-pass.rs |    31 +
 src/test/ui/parser/fn-header-semantic-fail.rs |    58 +
 .../ui/parser/fn-header-semantic-fail.stderr  |   201 +
 .../ui/parser/fn-header-syntactic-pass.rs     |    47 +
 .../ui/parser/foreign-const-semantic-fail.rs  |     9 +
 .../parser/foreign-const-semantic-fail.stderr |    35 +
 .../ui/parser/foreign-const-syntactic-fail.rs |     9 +
 .../foreign-const-syntactic-fail.stderr       |    22 +
 .../ui/parser/foreign-static-semantic-fail.rs |     8 +
 .../foreign-static-semantic-fail.stderr       |    27 +
 .../parser/foreign-static-syntactic-pass.rs   |    11 +
 .../ui/parser/foreign-ty-semantic-fail.rs     |    18 +
 .../ui/parser/foreign-ty-semantic-fail.stderr |    65 +
 .../ui/parser/foreign-ty-syntactic-pass.rs    |    12 +
 .../impl-item-type-no-body-semantic-fail.rs   |     4 +-
 ...mpl-item-type-no-body-semantic-fail.stderr |     4 +-
 src/test/ui/parser/impl-parsing.rs            |     3 +-
 src/test/ui/parser/impl-parsing.stderr        |    16 +-
 .../inner-attr-after-doc-comment.stderr       |     2 +-
 src/test/ui/parser/inner-attr-in-trait-def.rs |     9 +
 src/test/ui/parser/inner-attr.stderr          |     2 +-
 src/test/ui/parser/inverted-parameters.rs     |     1 +
 src/test/ui/parser/inverted-parameters.stderr |     6 +-
 src/test/ui/parser/issue-14303-fncall.rs      |     2 +-
 src/test/ui/parser/issue-14303-fncall.stderr  |     9 +-
 src/test/ui/parser/issue-14303-path.rs        |     2 +-
 src/test/ui/parser/issue-14303-path.stderr    |     9 +-
 src/test/ui/parser/issue-17383.stderr         |     2 +-
 src/test/ui/parser/issue-19398.rs             |     3 +-
 src/test/ui/parser/issue-19398.stderr         |     9 +-
 src/test/ui/parser/issue-20711-2.rs           |     3 +-
 src/test/ui/parser/issue-20711-2.stderr       |    12 +-
 src/test/ui/parser/issue-20711.rs             |     3 +-
 src/test/ui/parser/issue-20711.stderr         |    11 +-
 src/test/ui/parser/issue-21153.rs             |     3 +-
 src/test/ui/parser/issue-21153.stderr         |    15 +-
 src/test/ui/parser/issue-24780.rs             |     2 +-
 src/test/ui/parser/issue-24780.stderr         |     4 +-
 src/test/ui/parser/issue-32446.stderr         |     7 +-
 .../parser/issue-35813-postfix-after-cast.rs  |   171 +
 .../issue-35813-postfix-after-cast.stderr     |   392 +
 src/test/ui/parser/issue-41155.rs             |     4 +-
 src/test/ui/parser/issue-41155.stderr         |    20 +-
 ...not-interpolate-impl-items-bad-variants.rs |    44 +
 ...interpolate-impl-items-bad-variants.stderr |    53 +
 ...37-macros-cannot-interpolate-impl-items.rs |    34 +
 ...-58094-missing-right-square-bracket.stderr |     4 +-
 src/test/ui/parser/issue-62524.stderr         |     5 +-
 src/test/ui/parser/issue-62894.rs             |     7 +
 src/test/ui/parser/issue-62894.stderr         |    47 +
 src/test/ui/parser/issue-63135.rs             |     2 +-
 src/test/ui/parser/issue-63135.stderr         |     8 +-
 ...sue-65122-mac-invoc-in-mut-patterns.stderr |     4 +
 src/test/ui/parser/issue-6610.stderr          |     6 +-
 src/test/ui/parser/issue-68629.rs             |   Bin 0 -> 336 bytes
 src/test/ui/parser/issue-68629.stderr         |   Bin 0 -> 1441 bytes
 src/test/ui/parser/issue-68730.rs             |   Bin 0 -> 170 bytes
 src/test/ui/parser/issue-68730.stderr         |   Bin 0 -> 956 bytes
 .../issue-68788-in-trait-item-propagation.rs  |    21 +
 src/test/ui/parser/issue-68890.rs             |     4 +
 src/test/ui/parser/issue-68890.stderr         |    20 +
 ...sue-70050-ntliteral-accepts-negated-lit.rs |    16 +
 ...e-70552-ascription-in-parens-after-call.rs |     3 +
 ...552-ascription-in-parens-after-call.stderr |     8 +
 .../item-free-const-no-body-semantic-fail.rs  |     7 +
 ...em-free-const-no-body-semantic-fail.stderr |    24 +
 .../item-free-const-no-body-syntactic-pass.rs |     8 +
 .../item-free-static-no-body-semantic-fail.rs |    11 +
 ...m-free-static-no-body-semantic-fail.stderr |    46 +
 ...item-free-static-no-body-syntactic-pass.rs |     8 +
 .../item-free-type-bounds-semantic-fail.rs    |    20 +
 ...item-free-type-bounds-semantic-fail.stderr |    67 +
 .../item-free-type-bounds-syntactic-pass.rs   |    13 +
 src/test/ui/parser/macro/issue-37113.stderr   |     2 +
 src/test/ui/parser/macro/issue-37234.stderr   |     2 +
 .../macro/macro-incomplete-parse.stderr       |     2 +
 src/test/ui/parser/macro/pub-item-macro.rs    |    11 +-
 .../ui/parser/macro/pub-item-macro.stderr     |    14 +-
 .../ui/parser/macro/trait-non-item-macros.rs  |    11 +-
 .../parser/macro/trait-non-item-macros.stderr |    23 +-
 .../ui/parser/mbe_missing_right_paren.stderr  |     8 +-
 .../missing-close-brace-in-impl-trait.rs      |     7 +-
 .../missing-close-brace-in-impl-trait.stderr  |    27 +-
 .../missing-close-brace-in-trait.rs           |     4 +-
 .../missing-close-brace-in-trait.stderr       |    21 +-
 .../mismatched-delim-brace-empty-block.stderr |    10 +-
 src/test/ui/parser/missing-semicolon.rs       |     8 +
 src/test/ui/parser/missing-semicolon.stderr   |    13 +
 src/test/ui/parser/missing_right_paren.rs     |     2 +-
 src/test/ui/parser/missing_right_paren.stderr |     8 +-
 src/test/ui/parser/mut-patterns.rs            |     2 +
 src/test/ui/parser/mut-patterns.stderr        |    32 +-
 .../ui/parser/no-const-fn-in-extern-block.rs  |     4 +-
 .../parser/no-const-fn-in-extern-block.stderr |    21 +-
 src/test/ui/parser/not-a-pred.stderr          |     4 +-
 .../ui/parser/omitted-arg-in-item-fn.stderr   |     4 +
 src/test/ui/parser/pat-lt-bracket-2.stderr    |     4 +
 src/test/ui/parser/pub-method-macro.rs        |     3 +-
 src/test/ui/parser/pub-method-macro.stderr    |     2 +-
 .../parser/qualified-path-in-turbofish.fixed  |    19 +
 .../ui/parser/qualified-path-in-turbofish.rs  |    19 +
 .../parser/qualified-path-in-turbofish.stderr |     8 +
 src/test/ui/parser/raw-byte-string-eof.stderr |     3 +-
 .../ui/parser/raw-str-unterminated.stderr     |     3 +-
 src/test/ui/parser/raw/raw_string.stderr      |     3 +-
 .../ui/parser/recover-from-bad-variant.stderr |     2 +-
 src/test/ui/parser/recover-range-pats.stderr  |     8 +-
 src/test/ui/parser/recovery-attr-on-if.rs     |     9 -
 src/test/ui/parser/recovery-attr-on-if.stderr |    35 -
 .../ui/parser/removed-syntax-extern-const.rs  |     6 -
 .../parser/removed-syntax-extern-const.stderr |     8 -
 .../ui/parser/removed-syntax-static-fn.rs     |     4 +-
 .../ui/parser/removed-syntax-static-fn.stderr |    25 +-
 .../ui/parser/removed-syntax-with-1.stderr    |     5 +-
 .../ui/parser/self-in-function-arg.stderr     |     4 +-
 .../ui/parser/self-param-semantic-fail.rs     |    64 +
 .../ui/parser/self-param-semantic-fail.stderr |   220 +
 .../ui/parser/self-param-syntactic-pass.rs    |    66 +
 .../tag-variant-disr-non-nullary.stderr       |     2 +-
 ...item-with-defaultness-fail-semantic.stderr |    24 +-
 .../parser/type-parameters-in-field-exprs.rs  |     6 +-
 .../type-parameters-in-field-exprs.stderr     |     6 +-
 .../underscore-suffix-for-string.stderr       |     2 +-
 .../ui/parser/underscore_item_not_const.rs    |    16 +-
 .../parser/underscore_item_not_const.stderr   |    44 +-
 src/test/ui/path-lookahead.stderr             |     2 +-
 ...her-can-live-while-the-other-survives-1.rs |    23 +-
 ...can-live-while-the-other-survives-1.stderr |    59 +-
 .../bind-by-move-no-subbindings-fun-param.rs  |     4 +-
 ...nd-by-move-no-subbindings-fun-param.stderr |    13 +-
 .../borrowck-move-and-move.rs                 |    36 +-
 .../borrowck-move-and-move.stderr             |    69 +-
 .../borrowck-pat-at-and-box-pass.rs           |    11 +
 .../borrowck-pat-at-and-box.rs                |    55 +-
 .../borrowck-pat-at-and-box.stderr            |   151 +-
 ...k-pat-by-move-and-ref-inverse-promotion.rs |    10 +
 ...t-by-move-and-ref-inverse-promotion.stderr |    12 +
 .../borrowck-pat-by-move-and-ref-inverse.rs   |    98 +
 ...orrowck-pat-by-move-and-ref-inverse.stderr |   503 +
 .../borrowck-pat-by-move-and-ref.rs           |    73 +-
 .../borrowck-pat-by-move-and-ref.stderr       |   243 +-
 .../borrowck-pat-ref-mut-and-ref.rs           |    64 +-
 .../borrowck-pat-ref-mut-and-ref.stderr       |   305 +-
 .../borrowck-pat-ref-mut-twice.rs             |    48 +-
 .../borrowck-pat-ref-mut-twice.stderr         |   249 +-
 .../pattern/bindings-after-at/box-patterns.rs |    36 +
 .../bindings-after-at/copy-and-move-mixed.rs  |     8 +-
 .../copy-and-move-mixed.stderr                |    25 +-
 ...lt-binding-modes-both-sides-independent.rs |    25 +-
 ...inding-modes-both-sides-independent.stderr |    74 +-
 .../feature-gate-bindings_after_at.stderr     |     2 +-
 .../nested-binding-mode-lint.rs               |    13 +
 .../nested-binding-modes-mut.rs               |    13 +
 .../nested-binding-modes-mut.stderr           |    21 +
 .../nested-binding-modes-ref.rs               |    13 +
 .../nested-binding-modes-ref.stderr           |    15 +
 .../or-patterns-box-patterns.rs               |    45 +
 .../or-patterns-slice-patterns.rs             |    56 +
 .../pattern/bindings-after-at/or-patterns.rs  |    40 +
 .../pat-at-same-name-both.rs                  |     1 -
 .../pat-at-same-name-both.stderr              |    28 +-
 .../bindings-after-at/slice-patterns.rs       |    40 +
 .../deny-irrefutable-let-patterns.stderr      |     2 +-
 .../borrowck-move-ref-pattern-pass.rs         |    31 +
 .../borrowck-move-ref-pattern.rs              |    50 +
 .../borrowck-move-ref-pattern.stderr          |   208 +
 .../by-move-sub-pat-unreachable.rs            |    15 +
 .../feature-gate-move_ref_pattern.rs          |    23 +
 .../feature-gate-move_ref_pattern.stderr      |    66 +
 .../pattern/move-ref-patterns/issue-53840.rs  |    22 +
 ...ve-ref-patterns-closure-captures-inside.rs |   122 +
 ...ef-patterns-closure-captures-inside.stderr |   404 +
 ...move-ref-patterns-closure-captures-pass.rs |    30 +
 .../move-ref-patterns-closure-captures.rs     |    34 +
 .../move-ref-patterns-closure-captures.stderr |    39 +
 ...move-ref-patterns-default-binding-modes.rs |    16 +
 ...-ref-patterns-default-binding-modes.stderr |    21 +
 .../move-ref-patterns-dynamic-semantics.rs    |    81 +
 src/test/ui/pattern/pat-tuple-bad-type.stderr |     2 +
 .../ui/pattern/pat-tuple-overfield.stderr     |     5 +
 .../pattern-ident-path-generics.stderr        |     2 +
 src/test/ui/pattern/pattern-tyvar-2.stderr    |     2 -
 .../pattern/rest-pat-semantic-disallowed.rs   |     2 +-
 .../rest-pat-semantic-disallowed.stderr       |     1 +
 .../exhaustive_integer_patterns.stderr        |     4 +-
 .../ui/pattern/usefulness/issue-43253.stderr  |     4 +-
 .../usefulness/match-arm-statics.stderr       |     2 +-
 .../match-byte-array-patterns.stderr          |     2 +-
 .../match-empty-exhaustive_patterns.stderr    |     2 +-
 .../match-range-fail-dominate.stderr          |     2 +-
 .../pattern/usefulness/match-ref-ice.stderr   |     2 +-
 .../pattern/usefulness/match-vec-fixed.stderr |     2 +-
 .../usefulness/match-vec-unreachable.stderr   |     2 +-
 .../usefulness/slice-pattern-const-2.stderr   |     2 +-
 .../usefulness/slice-pattern-const-3.stderr   |     2 +-
 .../usefulness/slice-pattern-const.stderr     |     2 +-
 .../slice-patterns-reachability.stderr        |     2 +-
 .../struct-pattern-match-useless.stderr       |     2 +-
 .../usefulness/top-level-alternation.stderr   |     2 +-
 src/test/ui/phantom-oibit.stderr              |    16 +-
 .../associated-item-privacy-inherent.stderr   |    42 +
 .../privacy/associated-item-privacy-trait.rs  |     9 +-
 .../associated-item-privacy-trait.stderr      |   155 +-
 .../associated-item-privacy-type-binding.rs   |    16 +-
 ...ssociated-item-privacy-type-binding.stderr |    72 +-
 .../ui/privacy/private-in-public-assoc-ty.rs  |     5 +
 .../privacy/private-in-public-assoc-ty.stderr |    25 +-
 .../private-in-public-non-principal.stderr    |     2 +-
 .../ui/privacy/private-in-public-warn.stderr  |     2 +-
 .../ui/privacy/private-inferred-type-3.stderr |    14 +-
 .../ui/privacy/private-inferred-type.stderr   |    12 +
 .../ui/privacy/pub-priv-dep/pub-priv1.stderr  |     2 +-
 src/test/ui/proc-macro/attr-stmt-expr.stderr  |     4 +-
 .../ui/proc-macro/attributes-included.stderr  |     2 +-
 .../attributes-on-modules-fail.stderr         |     8 +-
 .../auxiliary/generate-dollar-ident.rs        |    17 +
 .../ui/proc-macro/auxiliary/issue-59191.rs    |    16 +
 src/test/ui/proc-macro/derive-bad.stderr      |     2 +
 .../proc-macro/derive-helper-shadowing.stderr |     4 +
 src/test/ui/proc-macro/dollar-crate.stderr    |     3 +-
 .../ui/proc-macro/expand-to-unstable-2.stderr |     2 +-
 .../ui/proc-macro/expand-to-unstable.stderr   |     1 +
 .../proc-macro/gen-macro-rules-hygiene.stderr |     4 +
 .../ui/proc-macro/generate-dollar-ident.rs    |    18 +
 src/test/ui/proc-macro/generate-mod.stderr    |    14 +-
 .../proc-macro/invalid-punct-ident-4.stderr   |     7 +-
 src/test/ui/proc-macro/issue-38586.stderr     |     2 +
 src/test/ui/proc-macro/issue-50493.stderr     |     4 +
 .../issue-59191-replace-root-with-fn.rs       |     8 +
 .../issue-59191-replace-root-with-fn.stderr   |    19 +
 src/test/ui/proc-macro/item-error.stderr      |     4 +-
 .../ui/proc-macro/lints_in_proc_macros.stderr |     7 +-
 src/test/ui/proc-macro/mixed-site-span.stderr |    15 +-
 src/test/ui/proc-macro/multispan.stderr       |     7 +
 .../ui/proc-macro/no-macro-use-attr.stderr    |     2 +-
 .../ui/proc-macro/parent-source-spans.stderr  |    18 +
 .../ui/proc-macro/proc-macro-gates.stderr     |    26 +-
 src/test/ui/proc-macro/subspan.stderr         |    24 +-
 src/test/ui/proc-macro/three-equals.stderr    |     1 +
 src/test/ui/proc-macro/trait-fn-args-2015.rs  |    14 +
 src/test/ui/pub/pub-restricted-error-fn.rs    |     5 +-
 .../ui/pub/pub-restricted-error-fn.stderr     |    16 +-
 .../range-inclusive-pattern-precedence.stderr |     2 +-
 src/test/ui/range/range_traits-1.stderr       |    36 +
 src/test/ui/range/range_traits-2.stderr       |     2 +
 src/test/ui/range/range_traits-3.stderr       |     2 +
 src/test/ui/range/range_traits-6.stderr       |     2 +
 .../ui/raw-ref-op/feature-raw-ref-op.stderr   |    12 +-
 src/test/ui/reachable/expr_add.stderr         |     2 +-
 src/test/ui/reachable/expr_again.stderr       |     4 +-
 src/test/ui/reachable/expr_array.stderr       |     2 +-
 src/test/ui/reachable/expr_assign.stderr      |     2 +-
 src/test/ui/reachable/expr_block.stderr       |     4 +-
 src/test/ui/reachable/expr_box.stderr         |     2 +-
 src/test/ui/reachable/expr_call.stderr        |     2 +-
 src/test/ui/reachable/expr_cast.stderr        |     2 +-
 src/test/ui/reachable/expr_if.stderr          |     4 +-
 src/test/ui/reachable/expr_loop.stderr        |     8 +-
 src/test/ui/reachable/expr_match.stderr       |     6 +-
 src/test/ui/reachable/expr_method.stderr      |     2 +-
 src/test/ui/reachable/expr_repeat.stderr      |     2 +-
 src/test/ui/reachable/expr_return.stderr      |     2 +-
 .../ui/reachable/expr_return_in_macro.stderr  |     2 +-
 src/test/ui/reachable/expr_struct.stderr      |     2 +-
 src/test/ui/reachable/expr_tup.stderr         |     2 +-
 src/test/ui/reachable/expr_type.stderr        |     2 +-
 src/test/ui/reachable/expr_unary.stderr       |     2 +-
 src/test/ui/reachable/expr_while.stderr       |     2 +-
 src/test/ui/reachable/unreachable-arm.stderr  |     2 +-
 src/test/ui/reachable/unreachable-code.stderr |     2 +-
 .../ui/reachable/unreachable-in-call.stderr   |     2 +-
 .../unreachable-loop-patterns.stderr          |     2 +-
 .../reachable/unreachable-try-pattern.stderr  |     4 +-
 .../reachable/unwarned-match-on-never.stderr  |     2 +-
 src/test/ui/realloc-16687.rs                  |    14 +-
 src/test/ui/recursion/recursion.rs            |     1 +
 src/test/ui/recursion/recursion.stderr        |     2 +-
 .../recursive-types-are-not-uninhabited.rs    |     1 -
 ...recursive-types-are-not-uninhabited.stderr |    11 +-
 src/test/ui/recursion_limit/empty.rs          |     6 +
 src/test/ui/recursion_limit/empty.stderr      |    10 +
 src/test/ui/recursion_limit/invalid_digit.rs  |     6 +
 .../ui/recursion_limit/invalid_digit.stderr   |    10 +
 src/test/ui/recursion_limit/overflow.rs       |     7 +
 src/test/ui/recursion_limit/overflow.stderr   |    10 +
 src/test/ui/recursion_limit/zero.rs           |    12 +
 src/test/ui/recursion_limit/zero.stderr       |    10 +
 ...hod-type-parameters-trait-bound.nll.stderr |     2 +-
 .../regions-close-object-into-object-5.stderr |    14 +-
 ...regions-close-over-type-parameter-1.stderr |     8 +-
 .../regions-close-param-into-object.stderr    |     8 +-
 .../ui/regions/regions-enum-not-wf.stderr     |     8 +-
 ...gions-free-region-ordering-callee-4.stderr |    10 +-
 ...ons-implied-bounds-projection-gap-1.stderr |     2 +-
 ...-implied-bounds-projection-gap-hr-1.stderr |     9 +-
 .../ui/regions/regions-in-enums-anon.stderr   |     4 +-
 .../ui/regions/regions-in-structs-anon.stderr |     4 +-
 .../regions-infer-bound-from-trait.stderr     |     4 +-
 src/test/ui/regions/regions-mock-codegen.rs   |    16 +-
 .../ui/regions/regions-name-undeclared.stderr |    20 +
 .../ui/regions/regions-nested-fns.nll.stderr  |     2 +-
 ...ions-normalize-in-where-clause-list.stderr |    22 +-
 src/test/ui/regions/regions-trait-object-1.rs |     4 +-
 .../regions-var-type-out-of-scope.stderr      |     1 -
 src/test/ui/removing-extern-crate.stderr      |     2 +-
 src/test/ui/repr/feature-gate-no-niche.rs     |    20 +
 src/test/ui/repr/feature-gate-no-niche.stderr |    35 +
 .../repr-no-niche-inapplicable-to-unions.rs   |    14 +
 ...epr-no-niche-inapplicable-to-unions.stderr |    19 +
 src/test/ui/repr/repr-no-niche.rs             |   329 +
 .../ui/reserved/reserved-attr-on-macro.stderr |     1 -
 src/test/ui/resolve/issue-3907-2.stderr       |     6 +-
 .../issue-69401-trait-fn-no-body-ty-local.rs  |     6 +
 ...sue-69401-trait-fn-no-body-ty-local.stderr |     9 +
 src/test/ui/resolve/name-clash-nullary.stderr |     4 +-
 .../resolve-inconsistent-binding-mode.rs      |    33 +-
 .../resolve-inconsistent-binding-mode.stderr  |    61 +-
 .../ui/resolve/resolve-inconsistent-names.rs  |     2 +-
 .../resolve/resolve-inconsistent-names.stderr |     8 +-
 .../ui/resolve/resolve-primitive-fallback.rs  |     2 +-
 .../resolve/resolve-primitive-fallback.stderr |    11 +-
 .../typo-suggestion-named-underscore.rs       |    14 +
 .../typo-suggestion-named-underscore.stderr   |    16 +
 .../ui/return/return-match-array-const.stderr |     6 +-
 .../termination-trait-test-wrong-type.stderr  |     1 +
 .../const.stderr                              |    11 +-
 .../ui/rfc-2005-default-binding-mode/for.rs   |     7 +-
 .../rfc-2005-default-binding-mode/for.stderr  |    15 +-
 .../issue-44912-or.rs                         |     2 +-
 .../issue-44912-or.stderr                     |     2 +-
 .../rfc-2005-default-binding-mode/lit.stderr  |     4 +
 .../extern_crate_improper.stderr              |     2 +-
 .../issue-65157-repeated-match-arm.stderr     |     2 +-
 .../uninhabited/patterns_same_crate.stderr    |     2 +-
 .../caller-location-fnptr-rt-ctfe-equiv.rs    |    32 +
 ...caller-location-fnptr-rt-ctfe-equiv.stderr |     6 +
 .../dont-infer-static.stderr                  |     2 +-
 .../regions-enum-not-wf.stderr                |     8 +-
 .../regions-struct-not-wf.stderr              |     4 +-
 .../dbg-macro-move-semantics.stderr           |     2 -
 .../dbg-macro-requires-debug.stderr           |     2 +-
 .../disallowed-positions.stderr               |    12 +-
 .../feature-gate.stderr                       |    64 +-
 .../param-attrs-cfg.stderr                    |     2 +-
 .../feature-gate-raw-dylib-2.stderr           |     2 +-
 .../feature-gate-raw-dylib.stderr             |     2 +-
 .../rfc-2632-const-trait-impl/assoc-type.rs   |    28 +
 .../call-const-trait-method-fail.rs           |    30 +
 .../call-const-trait-method-fail.stderr       |     9 +
 .../call-const-trait-method-pass.rs           |    41 +
 .../const-and-non-const-impl.rs               |    33 +
 .../const-and-non-const-impl.stderr           |    34 +
 .../const-check-fns-in-const-impl.rs          |    16 +
 .../const-check-fns-in-const-impl.stderr      |    12 +
 .../feature-gate.stock.stderr                 |     2 +-
 .../feature-gate.gated.stderr                 |     8 +-
 .../rfc-2632-const-trait-impl/feature-gate.rs |     5 +-
 .../feature-gate.stock.stderr                 |    12 +-
 .../generic-bound.rs                          |    32 +
 .../inherent-impl.rs                          |     2 -
 .../inherent-impl.stderr                      |    24 +-
 .../ui/rfc-2632-const-trait-impl/stability.rs |    43 +
 .../stability.stderr                          |    24 +
 ...ide-behind-doubly-indirect-embedded.stderr |     2 +-
 ...t-hide-behind-doubly-indirect-param.stderr |     2 +-
 ...ide-behind-indirect-struct-embedded.stderr |     2 +-
 ...t-hide-behind-indirect-struct-param.stderr |     2 +-
 .../ui/rfc1445/feature-gate.no_gate.stderr    |     4 +-
 ...-match-ref-ref-forbidden-without-eq.stderr |     2 +-
 src/test/ui/rfc1623-2.rs                      |    13 +
 src/test/ui/rfc1623-2.stderr                  |    29 +
 src/test/ui/rfc1623.rs                        |    13 +-
 src/test/ui/rfc1623.stderr                    |    51 +-
 .../ui/rust-2018/async-ident-allowed.stderr   |     2 +-
 src/test/ui/rust-2018/async-ident.stderr      |     2 +-
 src/test/ui/rust-2018/dyn-keyword.stderr      |     2 +-
 .../edition-lint-fully-qualified-paths.stderr |     2 +-
 ...ition-lint-infer-outlives-multispan.stderr |     2 +-
 .../edition-lint-infer-outlives.stderr        |     2 +-
 .../edition-lint-nested-empty-paths.stderr    |     2 +-
 .../edition-lint-nested-paths.stderr          |     2 +-
 .../ui/rust-2018/edition-lint-paths.stderr    |     2 +-
 .../extern-crate-idiomatic-in-2018.stderr     |     2 +-
 .../ui/rust-2018/extern-crate-rename.stderr   |     2 +-
 .../ui/rust-2018/extern-crate-submod.stderr   |     2 +-
 ...54400-unused-extern-crate-attr-span.stderr |     2 +-
 .../ui/rust-2018/macro-use-warned-against.rs  |     2 +-
 .../rust-2018/macro-use-warned-against.stderr |     6 +-
 .../ui/rust-2018/remove-extern-crate.stderr   |     2 +-
 .../suggestions-not-always-applicable.stderr  |     4 +-
 src/test/ui/rust-2018/try-ident.stderr        |     2 +-
 src/test/ui/rust-2018/try-macro.stderr        |     2 +-
 .../ambiguity-macros-nested.stderr            |     1 +
 .../uniform-paths/ambiguity-macros.stderr     |     1 +
 src/test/ui/sanitize-inline-always.rs         |    15 +
 src/test/ui/sanitize-inline-always.stderr     |    13 +
 src/test/ui/sanitize/address.rs               |    20 +
 src/test/ui/sanitize/badfree.rs               |    19 +
 .../ui/{sanitize-cfg.rs => sanitize/cfg.rs}   |     0
 .../{sanitizer-leak.rs => sanitize/leak.rs}   |     0
 .../memory.rs}                                |     0
 .../new-llvm-pass-manager-thin-lto.rs         |    27 +
 .../unsupported-target.rs}                    |     0
 .../unsupported-target.stderr}                |     0
 src/test/ui/sanitize/use-after-scope.rs       |    18 +
 src/test/ui/sanitizer-address.rs              |    21 -
 src/test/ui/save-analysis/issue-68621.rs      |    17 +
 src/test/ui/save-analysis/issue-68621.stderr  |     8 +
 ...ary-self-types-not-object-safe.curr.stderr |    14 +-
 ...bject-safe.object_safe_for_dispatch.stderr |     7 +-
 ...f_types_pin_lifetime_impl_trait.nll.stderr |     2 +-
 ...rary_self_types_pin_lifetime_impl_trait.rs |     2 -
 ..._self_types_pin_lifetime_impl_trait.stderr |     8 +-
 ...pes_pin_lifetime_mismatch-async.nll.stderr |    25 +-
 ...elf_types_pin_lifetime_mismatch.nll.stderr |    12 +-
 ...itrary_self_types_pin_lifetime_mismatch.rs |     2 -
 ...ry_self_types_pin_lifetime_mismatch.stderr |     6 +-
 .../self/elision/lt-ref-self-async.nll.stderr |    63 +-
 .../ui/self/elision/lt-ref-self.nll.stderr    |    12 +-
 .../elision/ref-mut-self-async.nll.stderr     |    63 +-
 .../ui/self/elision/ref-mut-self.nll.stderr   |    12 +-
 .../elision/ref-mut-struct-async.nll.stderr   |    53 +-
 .../ui/self/elision/ref-mut-struct.nll.stderr |    10 +-
 .../ui/self/elision/ref-self-async.nll.stderr |     2 +-
 src/test/ui/self/elision/ref-self.nll.stderr  |    14 +-
 .../self/elision/ref-struct-async.nll.stderr  |    53 +-
 .../ui/self/elision/ref-struct.nll.stderr     |    10 +-
 ...at-arbitrary-self-type-trait-method.stderr |     8 +-
 src/test/ui/self/self-infer.rs                |     2 -
 src/test/ui/self/self-infer.stderr            |    16 +-
 src/test/ui/shadow-bool.rs                    |    18 +
 .../ui/single-use-lifetime/fn-types.stderr    |     2 +-
 .../one-use-in-fn-argument-in-band.stderr     |     2 +-
 .../one-use-in-fn-argument.stderr             |     2 +-
 .../one-use-in-inherent-impl-header.stderr    |     2 +-
 ...one-use-in-inherent-method-argument.stderr |     2 +-
 .../one-use-in-inherent-method-return.stderr  |     2 +-
 .../one-use-in-trait-method-argument.stderr   |     2 +-
 ...inherent-method-argument-and-return.stderr |     2 +-
 .../zero-uses-in-fn.stderr                    |     2 +-
 .../zero-uses-in-impl.stderr                  |     2 +-
 ...ghtly-nice-generic-literal-messages.stderr |     2 +
 src/test/ui/span/E0057.stderr                 |    12 +-
 src/test/ui/span/E0204.stderr                 |     4 +
 src/test/ui/span/coerce-suggestions.stderr    |     2 +-
 .../ui/span/gated-features-attr-spans.stderr  |     2 +-
 .../ui/span/impl-wrong-item-for-trait.stderr  |     2 +-
 src/test/ui/span/issue-24690.stderr           |     2 +-
 src/test/ui/span/issue-33884.stderr           |     2 +-
 src/test/ui/span/issue-34264.stderr           |    20 +-
 src/test/ui/span/issue-36530.stderr           |     2 +-
 src/test/ui/span/issue-39018.stderr           |     4 -
 src/test/ui/span/issue-7575.stderr            |    13 +-
 src/test/ui/span/lint-unused-unsafe.stderr    |     2 +-
 .../ui/span/macro-span-replacement.stderr     |     3 +-
 src/test/ui/span/missing-unit-argument.stderr |    28 +-
 src/test/ui/span/multispan-import-lint.stderr |     2 +-
 src/test/ui/span/slice-borrow.stderr          |     2 +-
 .../unused-warning-point-at-identifier.stderr |     2 +-
 ...specialization-feature-gate-default.stderr |     2 +-
 ...pecialization-trait-not-implemented.stderr |    14 +-
 .../defaultimpl/specialization-wfcheck.stderr |    10 +-
 .../specialization/defaultimpl/validation.rs  |     2 +-
 .../defaultimpl/validation.stderr             |     8 +-
 src/test/ui/specialization/issue-39618.rs     |    27 +
 .../soundness/partial_eq_range_inclusive.rs   |    35 +
 .../soundness/partial_ord_slice.rs            |    42 +
 ...specialization-feature-gate-default.stderr |     2 +-
 .../stability-attribute-issue.stderr          |     4 +-
 .../stability-attribute-sanity-2.rs           |     3 +-
 .../stability-attribute-sanity-2.stderr       |     8 +-
 src/test/ui/stable-features.stderr            |     2 +-
 src/test/ui/std-backtrace.rs                  |     4 +-
 src/test/ui/stmt_expr_attrs_no_feature.stderr |    18 +-
 src/test/ui/str/str-mut-idx.stderr            |     4 +-
 .../ui/suggestions/attribute-typos.stderr     |     1 -
 .../ui/suggestions/const-in-struct-pat.rs     |    11 +
 .../ui/suggestions/const-in-struct-pat.stderr |    16 +
 ...gest-deref-inside-macro-issue-58298.stderr |     7 +-
 .../duplicate-suggestions.stderr              |    30 +-
 .../dont-suggest-ref/simple.stderr            |    51 +-
 .../dont-suggest-try_into-in-macros.stderr    |     2 +-
 .../expected-boxed-future-isnt-pinned.rs      |    29 +
 .../expected-boxed-future-isnt-pinned.stderr  |    20 +
 .../fn-missing-lifetime-in-item.rs            |     8 +
 .../fn-missing-lifetime-in-item.stderr        |    49 +
 .../ui/suggestions/imm-ref-trait-object.rs    |     5 +
 .../suggestions/imm-ref-trait-object.stderr   |     7 +-
 .../impl-trait-missing-lifetime.rs            |     2 +
 .../impl-trait-missing-lifetime.stderr        |    14 +
 src/test/ui/suggestions/issue-61963.stderr    |     2 +-
 .../suggestions/issue-64252-self-type.stderr  |     4 +
 .../ui/suggestions/match-ergonomics.stderr    |     6 +-
 .../suggestions/method-missing-parentheses.rs |     5 +
 .../method-missing-parentheses.stderr         |    17 +
 ...sing-assoc-fn-applicable-suggestions.fixed |    21 +
 ...missing-assoc-fn-applicable-suggestions.rs |    18 +
 ...ing-assoc-fn-applicable-suggestions.stderr |    16 +
 src/test/ui/suggestions/missing-assoc-fn.rs   |    22 +
 .../ui/suggestions/missing-assoc-fn.stderr    |    36 +
 ...issing-assoc-type-bound-restriction.stderr |    21 +-
 .../missing-trait-bounds-for-method-call.rs   |    31 +
 ...issing-trait-bounds-for-method-call.stderr |    39 +
 .../ui/suggestions/missing-trait-item.fixed   |     8 +-
 .../suggestions/mut-borrow-needed-by-trait.rs |     4 +
 .../mut-borrow-needed-by-trait.stderr         |    18 +-
 .../object-unsafe-trait-references-self.rs    |    12 +
 ...object-unsafe-trait-references-self.stderr |    30 +
 .../object-unsafe-trait-should-use-self.rs    |    16 +
 ...object-unsafe-trait-should-use-self.stderr |    54 +
 ...-unsafe-trait-should-use-where-sized.fixed |    13 +
 ...ect-unsafe-trait-should-use-where-sized.rs |    13 +
 ...unsafe-trait-should-use-where-sized.stderr |    35 +
 src/test/ui/suggestions/path-display.stderr   |     1 +
 .../suggestions/restrict-type-argument.stderr |    54 +-
 .../return-without-lifetime.stderr            |     4 +-
 .../suggestions/struct-initializer-comma.rs   |    13 +
 .../struct-initializer-comma.stderr           |    23 +
 .../suggest-impl-trait-lifetime.fixed         |     2 +-
 .../suggest-impl-trait-lifetime.rs            |     2 +-
 .../suggest-impl-trait-lifetime.stderr        |     7 +-
 src/test/ui/suggestions/suggest-move-types.rs |     8 +-
 .../ui/suggestions/suggest-move-types.stderr  |    29 +-
 .../suggestions/suggest-remove-refs-1.stderr  |     2 +-
 .../ui/suggestions/suggest-split-at-mut.rs    |     8 +
 .../suggestions/suggest-split-at-mut.stderr   |    15 +
 .../type-ascription-instead-of-method.stderr  |     2 +-
 .../type-ascription-instead-of-path-2.stderr  |     2 +-
 .../type-ascription-instead-of-variant.stderr |     2 +-
 .../unused-closure-argument.stderr            |     2 +-
 .../suggestions/vec-macro-in-pattern.stderr   |     2 +-
 src/test/ui/super-fast-paren-parsing.rs       |     1 +
 src/test/ui/suppressed-error.stderr           |     4 +-
 .../syntax-trait-polarity-feature-gate.stderr |     2 +-
 src/test/ui/syntax-trait-polarity.stderr      |     8 +-
 src/test/ui/target-feature/gate.stderr        |     2 +-
 .../ui/test-attrs/test-warns-dead-code.stderr |     2 +-
 src/test/ui/test-panic-abort-nocapture.rs     |    39 +
 .../ui/test-panic-abort-nocapture.run.stderr  |     9 +
 .../ui/test-panic-abort-nocapture.run.stdout  |    23 +
 .../ui/tool-attributes/diagnostic_item.stderr |     1 -
 src/test/ui/tool_lints-fail.stderr            |     2 +-
 src/test/ui/trace_macros-gate.stderr          |     9 +-
 ...overlap-not-permitted-for-builtin-trait.rs |    11 +
 ...lap-not-permitted-for-builtin-trait.stderr |    11 +
 ...overlap-permitted-for-marker-traits-neg.rs |    12 -
 .../overlap-permitted-for-marker-traits.rs    |    27 -
 .../reservation-impl-coherence-conflict.rs    |     2 -
 ...reservation-impl-coherence-conflict.stderr |     2 +-
 .../reservation-impl-no-use.rs                |     2 -
 .../reservation-impl-no-use.stderr            |     2 +-
 .../trait-alias/trait-alias-object-fail.rs    |     5 +
 .../trait-alias-object-fail.stderr            |     9 +-
 .../traits/trait-alias/trait-alias-wf.stderr  |    13 +-
 ...-bounds-on-structs-and-enums-in-fns.stderr |     8 +-
 ...rait-bounds-on-structs-and-enums-xc.stderr |     8 +-
 .../trait-bounds-on-structs-and-enums.stderr  |    26 +-
 src/test/ui/traits/trait-item-privacy.stderr  |    33 +-
 .../traits/trait-object-macro-matcher.stderr  |     2 +-
 src/test/ui/traits/trait-object-safety.stderr |    17 +-
 .../ui/traits/trait-object-vs-lifetime.rs     |     2 +-
 .../ui/traits/trait-object-vs-lifetime.stderr |    17 +-
 .../trait-resolution-in-overloaded-op.stderr  |     2 -
 .../traits/trait-safety-inherent-impl.stderr  |     6 +-
 .../traits/trait-suggest-where-clause.stderr  |     4 +-
 src/test/ui/traits/trait-test-2.stderr        |    19 +-
 .../traits-repeated-supertrait-ambig.stderr   |    16 +-
 .../ui/traits/wf-trait-object-maybe-bound.rs  |     2 -
 .../traits/wf-trait-object-maybe-bound.stderr |    10 +-
 .../trivial-bounds/trivial-bounds-leak.stderr |     7 +-
 .../trivial-bounds/trivial-bounds-lint.stderr |     2 +-
 src/test/ui/trivial_casts.stderr              |     4 +-
 .../ui/try-block/try-block-opt-init.stderr    |     2 +-
 .../try-block-unreachable-code-lint.stderr    |     2 +-
 .../ui/tuple/tuple-struct-fields/test2.stderr |     2 +
 .../ui/tuple/tuple-struct-fields/test3.stderr |     2 +
 ...ant-priority-higher-than-other-inherent.rs |     2 +-
 ...priority-higher-than-other-inherent.stderr |     6 +-
 ...riority-lint-ambiguous_associated_items.rs |     1 +
 ...ity-lint-ambiguous_associated_items.stderr |     4 +-
 .../type-alias-impl-trait/assoc-type-const.rs |    12 +-
 .../assoc-type-lifetime-unconstrained.rs      |    26 +
 .../assoc-type-lifetime-unconstrained.stderr  |     9 +
 .../assoc-type-lifetime.rs                    |     6 +-
 .../bound_reduction2.stderr                   |     7 +-
 .../generic_duplicate_lifetime_param.stderr   |     8 +-
 .../generic_duplicate_param_use6.rs           |     6 +-
 .../generic_duplicate_param_use6.stderr       |     4 +-
 ...eric_type_does_not_live_long_enough.stderr |     2 +-
 .../generic_underconstrained.stderr           |     8 +-
 .../generic_underconstrained2.stderr          |    14 +-
 .../issue-52843-closure-constrain.rs          |     2 +-
 .../issue-52843-closure-constrain.stderr      |    18 +-
 .../type-alias-impl-trait/issue-60371.stderr  |     2 +-
 .../ui/type-alias-impl-trait/issue-60564.rs   |     2 +-
 .../ui/type-alias-impl-trait/issue-63279.rs   |     2 +
 .../type-alias-impl-trait/issue-63279.stderr  |     4 +-
 ...sue-65679-inst-opaque-ty-from-val-twice.rs |     1 +
 .../ui/type-alias-impl-trait/issue-65918.rs   |     4 +-
 .../issue-67844-nested-opaque.rs              |    32 +
 .../ui/type/ascription/issue-47666.stderr     |     4 +-
 src/test/ui/type/ascription/issue-54516.rs    |     4 +-
 .../ui/type/ascription/issue-54516.stderr     |    28 +-
 src/test/ui/type/ascription/issue-60933.rs    |     4 +-
 .../ui/type/ascription/issue-60933.stderr     |    28 +-
 .../type-ascription-instead-of-initializer.rs |     2 +-
 ...e-ascription-instead-of-initializer.stderr |     6 +-
 ...ascription-instead-of-statement-end.stderr |     4 +-
 src/test/ui/type/type-check-defaults.stderr   |    13 +-
 .../cannot_infer_local_or_vec.stderr          |     2 +-
 ...cannot_infer_local_or_vec_in_tuples.stderr |     2 +-
 src/test/ui/type/type-check/issue-40294.rs    |     4 +-
 .../ui/type/type-check/issue-40294.stderr     |    16 +-
 ...ter-defaults-referencing-Self-ppaux.stderr |     6 +-
 ...-52082-type-param-shadows-existing-type.rs |     2 +-
 ...ypeck-default-trait-impl-send-param.stderr |     7 +-
 .../ui/typeck/typeck_type_placeholder_item.rs |   208 +
 .../typeck_type_placeholder_item.stderr       |   608 +
 src/test/ui/ufcs/ufcs-partially-resolved.rs   |     4 +-
 .../ui/ufcs/ufcs-partially-resolved.stderr    |    10 +-
 .../unboxed-closure-feature-gate.stderr       |     2 +-
 .../unboxed-closure-no-cyclic-sig.stderr      |     3 +-
 ...oxed-closure-sugar-lifetime-elision.stderr |     4 +-
 ...nboxed-closure-sugar-not-used-on-fn.stderr |     4 +-
 .../unboxed-closures-mutate-upvar.stderr      |    16 +-
 ...sures-mutated-upvar-from-fn-closure.stderr |    16 +-
 .../unboxed-closures-unique-type-id.rs        |     2 +-
 src/test/ui/underscore-imports/basic.stderr   |     2 +-
 .../ui/underscore-imports/unused-2018.stderr  |     2 +-
 .../dyn-trait-underscore-in-struct.stderr     |     4 +-
 .../ui/underscore-lifetime/in-binder.stderr   |     1 +
 .../in-fn-return-illegal.stderr               |     6 +-
 .../ui/underscore-lifetime/in-struct.stderr   |     8 +-
 .../underscore-lifetime-binders.stderr        |     9 +-
 .../underscore-outlives-bounds.stderr         |     1 +
 ...se-inherent-impl-ampersand.rust2015.stderr |     1 +
 ...se-inherent-impl-ampersand.rust2018.stderr |     1 +
 ...e-inherent-impl-underscore.rust2015.stderr |     1 +
 ...e-inherent-impl-underscore.rust2018.stderr |     1 +
 ...e-clause-trait-impl-region.rust2015.stderr |     1 +
 ...e-clause-trait-impl-region.rust2018.stderr |     1 +
 ...ause-trait-impl-underscore.rust2015.stderr |     1 +
 ...ause-trait-impl-underscore.rust2018.stderr |     1 +
 .../underscore-lifetime/where-clauses.stderr  |     1 +
 .../uninhabited/uninhabited-patterns.stderr   |     2 +-
 src/test/ui/union/union-derive-clone.stderr   |    15 +-
 src/test/ui/union/union-derive-eq.stderr      |     1 +
 src/test/ui/union/union-fields-1.stderr       |     2 +-
 src/test/ui/union/union-lint-dead-code.stderr |     2 +-
 src/test/ui/union/union-repr-c.stderr         |     4 +-
 src/test/ui/union/union-sized-field.stderr    |     6 +-
 src/test/ui/unique-object-noncopyable.rs      |     4 +
 src/test/ui/unique-object-noncopyable.stderr  |    21 +-
 src/test/ui/unique-pinned-nocopy.rs           |     4 +
 src/test/ui/unique-pinned-nocopy.stderr       |    13 +-
 src/test/ui/unnecessary-extern-crate.stderr   |     2 +-
 src/test/ui/unop-move-semantics.stderr        |    10 +-
 src/test/ui/unop-neg-bool.stderr              |     2 -
 src/test/ui/unreachable-code-ret.stderr       |     4 +-
 src/test/ui/unsafe/ranged_ints2_const.stderr  |     4 +-
 ...fe-around-compiler-generated-unsafe.stderr |     2 +-
 .../ui/unsafe/unsafe-block-without-braces.rs  |     2 +-
 .../unsafe/unsafe-block-without-braces.stderr |     4 +-
 .../by-value-trait-object-safety.stderr       |     3 +
 .../ui/unsized/unsized-bare-typaram.stderr    |     4 +-
 src/test/ui/unsized/unsized-enum.stderr       |     4 +-
 src/test/ui/unsized/unsized-enum2.stderr      |     8 +-
 .../unsized-inherent-impl-self-type.stderr    |     4 +-
 src/test/ui/unsized/unsized-struct.stderr     |     8 +-
 .../unsized-trait-impl-self-type.stderr       |     4 +-
 .../unsized-trait-impl-trait-arg.stderr       |     4 +-
 src/test/ui/unsized3.stderr                   |    20 +-
 src/test/ui/unsized5.stderr                   |     8 +-
 src/test/ui/unsized6.stderr                   |    30 +-
 src/test/ui/unsized7.stderr                   |     4 +-
 src/test/ui/unused/unused-attr.stderr         |     2 +-
 src/test/ui/unused/unused-macro-rules.stderr  |     6 +-
 src/test/ui/unused/unused-macro.stderr        |     4 +-
 .../unused-mut-warning-captured-var.stderr    |     2 +-
 src/test/ui/unused/unused-result.rs           |     4 +-
 src/test/ui/unused/unused-result.stderr       |     4 +-
 src/test/ui/use-module-level-int-consts.rs    |    11 +
 .../use-nested-groups-unused-imports.stderr   |     2 +-
 src/test/ui/useless-comment.stderr            |    24 +-
 src/test/ui/utf8_idents.stderr                |     8 +-
 .../variants/variant-size-differences.stderr  |     2 +-
 src/test/ui/vec/vec-res-add.stderr            |     2 -
 src/test/ui/wf/wf-array-elem-sized.rs         |     2 +-
 .../wf/wf-convert-unsafe-trait-obj-box.stderr |    18 +-
 .../ui/wf/wf-convert-unsafe-trait-obj.stderr  |    18 +-
 src/test/ui/wf/wf-enum-bound.rs               |     4 +-
 src/test/ui/wf/wf-enum-bound.stderr           |    23 +-
 .../wf/wf-enum-fields-struct-variant.stderr   |     9 +-
 src/test/ui/wf/wf-enum-fields.stderr          |     8 +-
 src/test/ui/wf/wf-fn-where-clause.stderr      |    31 +-
 .../wf/wf-impl-associated-type-region.stderr  |     2 +-
 .../wf/wf-impl-associated-type-trait.stderr   |     8 +-
 src/test/ui/wf/wf-in-fn-arg.stderr            |    21 +-
 src/test/ui/wf/wf-in-fn-ret.stderr            |    21 +-
 src/test/ui/wf/wf-in-fn-type-arg.stderr       |     9 +-
 src/test/ui/wf/wf-in-fn-type-ret.stderr       |     9 +-
 src/test/ui/wf/wf-in-fn-type-static.stderr    |     4 +-
 src/test/ui/wf/wf-in-fn-where-clause.rs       |     4 +-
 src/test/ui/wf/wf-in-fn-where-clause.stderr   |    20 +-
 src/test/ui/wf/wf-in-obj-type-static.stderr   |     2 +-
 src/test/ui/wf/wf-in-obj-type-trait.stderr    |     9 +-
 ...f-inherent-impl-method-where-clause.stderr |    19 +-
 .../wf/wf-inherent-impl-where-clause.stderr   |    21 +-
 src/test/ui/wf/wf-object-safe.stderr          |     6 +-
 .../wf/wf-outlives-ty-in-fn-or-trait.stderr   |     4 +-
 src/test/ui/wf/wf-struct-bound.rs             |     4 +-
 src/test/ui/wf/wf-struct-bound.stderr         |    23 +-
 src/test/ui/wf/wf-struct-field.stderr         |     8 +-
 .../ui/wf/wf-trait-associated-type-bound.rs   |     4 +-
 .../wf/wf-trait-associated-type-bound.stderr  |    23 +-
 src/test/ui/wf/wf-trait-bound.rs              |     4 +-
 src/test/ui/wf/wf-trait-bound.stderr          |    22 +-
 src/test/ui/wf/wf-trait-default-fn-arg.stderr |    19 +-
 src/test/ui/wf/wf-trait-default-fn-ret.stderr |    20 +-
 .../wf-trait-default-fn-where-clause.stderr   |    19 +-
 src/test/ui/wf/wf-trait-fn-arg.stderr         |     9 +-
 src/test/ui/wf/wf-trait-fn-ret.stderr         |     9 +-
 .../ui/wf/wf-trait-fn-where-clause.stderr     |     9 +-
 src/test/ui/wf/wf-trait-superbound.stderr     |    20 +-
 .../ui/wf/wf-unsafe-trait-obj-match.stderr    |    12 +-
 ...traints-are-local-for-inherent-impl.stderr |     9 +-
 ...onstraints-are-local-for-trait-impl.stderr |     9 +-
 .../where-equality-constraints.stderr         |     4 +-
 src/test/ui/while-let.stderr                  |     3 +
 src/tools/compiletest/src/common.rs           |     1 -
 src/tools/compiletest/src/errors.rs           |     2 +-
 src/tools/compiletest/src/header.rs           |   248 +-
 src/tools/compiletest/src/header/tests.rs     |   173 +-
 src/tools/compiletest/src/main.rs             |     5 +-
 src/tools/compiletest/src/runtest.rs          |    42 +-
 src/tools/error_index_generator/main.rs       |     4 +-
 src/tools/linkchecker/linkcheck.sh            |   113 +
 src/tools/publish_toolstate.py                |    36 +-
 src/tools/rustbook/Cargo.toml                 |     3 +-
 src/tools/rustbook/src/main.rs                |   108 +-
 src/tools/tidy/src/deps.rs                    |     3 +-
 src/tools/tidy/src/features.rs                |    14 -
 src/tools/tidy/src/lib.rs                     |     1 +
 src/tools/tidy/src/pal.rs                     |     4 +-
 src/tools/tidy/src/unstable_book.rs           |    18 +-
 src/tools/unicode-table-generator/src/main.rs |     2 +-
 vendor/backtrace/.cargo-checksum.json         |     2 +-
 vendor/backtrace/Cargo.lock                   |   210 +-
 vendor/backtrace/Cargo.toml                   |     8 +-
 .../docker/aarch64-linux-android/Dockerfile   |     2 +-
 .../docker/armv7-linux-androideabi/Dockerfile |     2 +-
 .../ci/docker/i686-linux-android/Dockerfile   |     2 +-
 .../powerpc64-unknown-linux-gnu/Dockerfile    |     2 +-
 .../ci/docker/x86_64-linux-android/Dockerfile |     2 +-
 .../docker/x86_64-pc-windows-gnu/Dockerfile   |     2 +-
 vendor/backtrace/src/backtrace/dbghelp.rs     |    40 +-
 vendor/backtrace/src/backtrace/libunwind.rs   |    93 +-
 vendor/backtrace/src/backtrace/mod.rs         |     5 +-
 vendor/backtrace/src/lib.rs                   |     5 +-
 vendor/backtrace/src/print.rs                 |     3 +-
 vendor/backtrace/src/symbolize/gimli.rs       |    30 +-
 .../backtrace/src/symbolize/libbacktrace.rs   |    52 +-
 vendor/backtrace/src/symbolize/mod.rs         |     4 +-
 vendor/backtrace/src/windows.rs               |    28 +-
 vendor/chalk-engine/.cargo-checksum.json      |     1 -
 vendor/chalk-engine/Cargo.toml                |    34 -
 vendor/chalk-engine/README.md                 |     3 -
 vendor/chalk-engine/src/README.md             |   280 -
 vendor/chalk-engine/src/context.rs            |   378 -
 vendor/chalk-engine/src/context/prelude.rs    |     8 -
 vendor/chalk-engine/src/derived.rs            |    92 -
 vendor/chalk-engine/src/fallible.rs           |     8 -
 vendor/chalk-engine/src/forest.rs             |   181 -
 vendor/chalk-engine/src/hh.rs                 |    25 -
 vendor/chalk-engine/src/lib.rs                |   334 -
 vendor/chalk-engine/src/logic.rs              |  1341 ---
 vendor/chalk-engine/src/simplify.rs           |    79 -
 vendor/chalk-engine/src/stack.rs              |    79 -
 vendor/chalk-engine/src/strand.rs             |    46 -
 vendor/chalk-engine/src/table.rs              |   139 -
 vendor/chalk-engine/src/tables.rs             |    66 -
 vendor/chalk-macros/.cargo-checksum.json      |     1 -
 vendor/chalk-macros/Cargo.toml                |    23 -
 vendor/chalk-macros/README.md                 |     1 -
 vendor/chalk-macros/src/index.rs              |    73 -
 vendor/chalk-macros/src/lib.rs                |   137 -
 vendor/crossbeam-channel/.cargo-checksum.json |     2 +-
 vendor/crossbeam-channel/CHANGELOG.md         |    12 +
 vendor/crossbeam-channel/Cargo.lock           |   251 +
 vendor/crossbeam-channel/Cargo.toml           |    12 +-
 vendor/crossbeam-channel/LICENSE-MIT          |     4 +
 vendor/crossbeam-channel/README.md            |     9 +-
 vendor/crossbeam-channel/benches/crossbeam.rs |   715 ++
 vendor/crossbeam-channel/examples/matching.rs |     3 +-
 vendor/crossbeam-channel/src/channel.rs       |    67 +-
 vendor/crossbeam-channel/src/context.rs       |     6 +-
 vendor/crossbeam-channel/src/counter.rs       |    36 +-
 vendor/crossbeam-channel/src/err.rs           |    16 +-
 vendor/crossbeam-channel/src/flavors/array.rs |    69 +-
 vendor/crossbeam-channel/src/flavors/list.rs  |    59 +-
 vendor/crossbeam-channel/src/flavors/tick.rs  |     2 +-
 vendor/crossbeam-channel/src/flavors/zero.rs  |    15 +-
 vendor/crossbeam-channel/src/lib.rs           |    10 +-
 vendor/crossbeam-channel/src/select.rs        |   178 +-
 vendor/crossbeam-channel/src/select_macro.rs  |    45 +-
 vendor/crossbeam-channel/src/utils.rs         |    40 +-
 vendor/crossbeam-channel/src/waker.rs         |     8 +-
 vendor/crossbeam-channel/tests/after.rs       |    12 +-
 vendor/crossbeam-channel/tests/array.rs       |    89 +-
 vendor/crossbeam-channel/tests/golang.rs      |   503 +-
 vendor/crossbeam-channel/tests/iter.rs        |     9 +-
 vendor/crossbeam-channel/tests/list.rs        |    74 +-
 vendor/crossbeam-channel/tests/mpsc.rs        |   411 +-
 vendor/crossbeam-channel/tests/ready.rs       |    55 +-
 .../crossbeam-channel/tests/same_channel.rs   |   114 +
 vendor/crossbeam-channel/tests/select.rs      |   187 +-
 .../crossbeam-channel/tests/select_macro.rs   |   126 +-
 .../crossbeam-channel/tests/thread_locals.rs  |     4 +-
 vendor/crossbeam-channel/tests/tick.rs        |     9 +-
 vendor/crossbeam-channel/tests/zero.rs        |    98 +-
 vendor/crossbeam-utils/.cargo-checksum.json   |     1 +
 vendor/crossbeam-utils/CHANGELOG.md           |   104 +
 vendor/crossbeam-utils/Cargo.toml             |    40 +
 .../LICENSE-APACHE                            |     0
 vendor/crossbeam-utils/LICENSE-MIT            |    27 +
 vendor/crossbeam-utils/README.md              |    77 +
 vendor/crossbeam-utils/benches/atomic_cell.rs |   157 +
 vendor/crossbeam-utils/build.rs               |     8 +
 .../crossbeam-utils/src/atomic/atomic_cell.rs |   902 ++
 vendor/crossbeam-utils/src/atomic/consume.rs  |    82 +
 vendor/crossbeam-utils/src/atomic/mod.rs      |    25 +
 vendor/crossbeam-utils/src/atomic/seq_lock.rs |    88 +
 .../src/atomic/seq_lock_wide.rs               |   132 +
 vendor/crossbeam-utils/src/backoff.rs         |   292 +
 vendor/crossbeam-utils/src/cache_padded.rs    |   131 +
 vendor/crossbeam-utils/src/lib.rs             |    64 +
 vendor/crossbeam-utils/src/sync/mod.rs        |    17 +
 vendor/crossbeam-utils/src/sync/parker.rs     |   311 +
 .../crossbeam-utils/src/sync/sharded_lock.rs  |   600 +
 vendor/crossbeam-utils/src/sync/wait_group.rs |   139 +
 vendor/crossbeam-utils/src/thread.rs          |   529 +
 vendor/crossbeam-utils/tests/atomic_cell.rs   |   234 +
 vendor/crossbeam-utils/tests/cache_padded.rs  |   112 +
 vendor/crossbeam-utils/tests/parker.rs        |    43 +
 vendor/crossbeam-utils/tests/sharded_lock.rs  |   255 +
 vendor/crossbeam-utils/tests/thread.rs        |   181 +
 vendor/crossbeam-utils/tests/wait_group.rs    |    66 +
 vendor/filetime/.cargo-checksum.json          |     2 +-
 vendor/filetime/Cargo.toml                    |    16 +-
 vendor/filetime/README.md                     |    13 +-
 vendor/filetime/appveyor.yml                  |    17 -
 vendor/filetime/src/lib.rs                    |   258 +-
 vendor/filetime/src/redox.rs                  |    25 +-
 vendor/filetime/src/unix/linux.rs             |   122 +-
 vendor/filetime/src/unix/macos.rs             |   110 +
 vendor/filetime/src/unix/mod.rs               |    76 +-
 vendor/filetime/src/unix/utimensat.rs         |    57 +-
 vendor/filetime/src/unix/utimes.rs            |    97 +-
 vendor/filetime/src/wasm.rs                   |    40 +
 vendor/filetime/src/windows.rs                |    88 +-
 vendor/ignore/.cargo-checksum.json            |     2 +-
 vendor/ignore/Cargo.lock                      |    75 +-
 vendor/ignore/Cargo.toml                      |     6 +-
 vendor/ignore/src/dir.rs                      |   325 +-
 vendor/ignore/src/gitignore.rs                |     6 +-
 vendor/ignore/src/types.rs                    |     2 +-
 vendor/ignore/src/walk.rs                     |   437 +-
 vendor/kernel32-sys/.cargo-checksum.json      |     1 -
 vendor/kernel32-sys/Cargo.toml                |    17 -
 vendor/kernel32-sys/README.md                 |    13 -
 vendor/kernel32-sys/build.rs                  |     6 -
 vendor/kernel32-sys/src/lib.rs                |  2754 -----
 .../lazy_static-0.2.11/.cargo-checksum.json   |     1 -
 vendor/lazy_static-0.2.11/Cargo.toml          |    43 -
 vendor/lazy_static-0.2.11/LICENSE-MIT         |    25 -
 vendor/lazy_static-0.2.11/README.md           |    69 -
 vendor/lazy_static-0.2.11/appveyor.yml        |    59 -
 vendor/lazy_static-0.2.11/src/core_lazy.rs    |    33 -
 vendor/lazy_static-0.2.11/src/lazy.rs         |    39 -
 vendor/lazy_static-0.2.11/src/lib.rs          |   212 -
 vendor/lazy_static-0.2.11/src/nightly_lazy.rs |    43 -
 .../tests/compile-fail/README.md              |    22 -
 .../incorrect_visibility_restriction.rs       |    10 -
 .../tests/compile-fail/static_is_private.rs   |    14 -
 .../tests/compile-fail/static_is_sized.rs     |    11 -
 .../tests/compile-fail/static_never_used.rs   |    10 -
 .../lazy_static-0.2.11/tests/compile_tests.rs |    18 -
 vendor/lazy_static-0.2.11/tests/no_std.rs     |    21 -
 vendor/lazy_static-0.2.11/tests/test.rs       |   164 -
 vendor/memchr/.cargo-checksum.json            |     2 +-
 vendor/memchr/Cargo.toml                      |    16 +-
 vendor/memchr/README.md                       |    45 +-
 vendor/memchr/build.rs                        |    79 +-
 vendor/memchr/rustfmt.toml                    |     2 +
 vendor/memchr/src/fallback.rs                 |    80 +-
 vendor/memchr/src/iter.rs                     |    10 +-
 vendor/memchr/src/lib.rs                      |   207 +-
 vendor/memchr/src/naive.rs                    |    24 +-
 vendor/memchr/src/tests/iter.rs               |    11 +-
 vendor/memchr/src/tests/miri.rs               |    19 +
 vendor/memchr/src/tests/mod.rs                |   126 +-
 vendor/memchr/src/x86/avx.rs                  |    70 +-
 vendor/memchr/src/x86/mod.rs                  |    26 +-
 vendor/memchr/src/x86/sse2.rs                 |    72 +-
 .../.cargo-checksum.json                      |     0
 .../CHANGELOG.md                              |     0
 .../Cargo.toml                                |     0
 .../LICENSE-APACHE                            |     0
 .../LICENSE-MIT                               |     0
 .../README.md                                 |     0
 .../appveyor.yml                              |     0
 .../build.rs                                  |     0
 .../src/condvar.rs                            |     0
 .../src/deadlock.rs                           |     0
 .../src/elision.rs                            |     0
 .../src/lib.rs                                |     0
 .../src/mutex.rs                              |     0
 .../src/once.rs                               |     0
 .../src/raw_mutex.rs                          |     0
 .../src/raw_rwlock.rs                         |     0
 .../src/remutex.rs                            |     0
 .../src/rwlock.rs                             |     0
 .../src/util.rs                               |     0
 .../.cargo-checksum.json                      |     0
 .../Cargo.toml                                |     0
 .../LICENSE-APACHE                            |     0
 .../LICENSE-MIT                               |     0
 .../build.rs                                  |     0
 .../src/lib.rs                                |     0
 .../src/parking_lot.rs                        |     0
 .../src/spinwait.rs                           |     0
 .../src/thread_parker/cloudabi.rs             |     0
 .../src/thread_parker/generic.rs              |     0
 .../src/thread_parker/linux.rs                |     0
 .../src/thread_parker/mod.rs                  |     0
 .../src/thread_parker/redox.rs                |     0
 .../src/thread_parker/sgx.rs                  |     0
 .../src/thread_parker/unix.rs                 |     0
 .../src/thread_parker/wasm.rs                 |     0
 .../src/thread_parker/wasm_atomic.rs          |     0
 .../src/thread_parker/windows/keyed_event.rs  |     0
 .../src/thread_parker/windows/mod.rs          |     0
 .../src/thread_parker/windows/waitaddress.rs  |     0
 .../src/util.rs                               |     0
 .../src/word_lock.rs                          |     0
 vendor/polonius-engine/.cargo-checksum.json   |     2 +-
 vendor/polonius-engine/Cargo.toml             |     2 +-
 vendor/polonius-engine/src/facts.rs           |    73 +-
 .../src/output/datafrog_opt.rs                |    62 +-
 .../src/output/initialization.rs              |   303 +-
 vendor/polonius-engine/src/output/liveness.rs |   148 +-
 .../src/output/location_insensitive.rs        |     8 +-
 vendor/polonius-engine/src/output/mod.rs      |    99 +-
 vendor/polonius-engine/src/output/naive.rs    |    30 +-
 .../pulldown-cmark-0.5.3/.cargo-checksum.json |     1 -
 vendor/pulldown-cmark-0.5.3/CONTRIBUTING.md   |    11 -
 vendor/pulldown-cmark-0.5.3/Cargo.toml        |    64 -
 vendor/pulldown-cmark-0.5.3/README.md         |   150 -
 .../pulldown-cmark-0.5.3/azure-pipelines.yml  |    17 -
 vendor/pulldown-cmark-0.5.3/benches/lib.rs    |   151 -
 .../pulldown-cmark-0.5.3/specs/footnotes.txt  |   153 -
 .../pulldown-cmark-0.5.3/specs/regression.txt |   482 -
 vendor/pulldown-cmark-0.5.3/specs/table.txt   |   217 -
 vendor/pulldown-cmark-0.5.3/src/lib.rs        |    74 -
 vendor/pulldown-cmark-0.5.3/src/main.rs       |   290 -
 .../tests/suite/regression.rs                 |   557 -
 .../third_party/CommonMark/LICENSE            |   105 -
 .../third_party/CommonMark/README.google      |    12 -
 .../third_party/CommonMark/spec.txt           |  9710 ---------------
 .../third_party/GitHub/LICENSE                |   170 -
 .../third_party/GitHub/gfm_strikethrough.txt  |    27 -
 .../third_party/GitHub/gfm_table.txt          |   209 -
 .../third_party/GitHub/gfm_tasklist.txt       |    55 -
 .../third_party/GitHub/spec.txt               | 10041 ----------------
 .../third_party/xi-editor/LICENSE             |   203 -
 .../third_party/xi-editor/crdt.md             |  1097 --
 .../pulldown-cmark-0.5.3/tools/mk_entities.py |    74 -
 .../tools/mk_puncttable.py                    |   130 -
 .../pulldown-cmark-0.6.1/.cargo-checksum.json |     1 +
 vendor/pulldown-cmark-0.6.1/CONTRIBUTING.md   |    21 +
 vendor/pulldown-cmark-0.6.1/Cargo.lock        |   871 ++
 vendor/pulldown-cmark-0.6.1/Cargo.toml        |    65 +
 .../LICENSE                                   |     0
 vendor/pulldown-cmark-0.6.1/README.md         |   152 +
 .../benches/html_rendering.rs                 |     0
 vendor/pulldown-cmark-0.6.1/benches/lib.rs    |    49 +
 .../build.rs                                  |     0
 .../examples/event-filter.rs                  |     0
 .../examples/string-to-string.rs              |     0
 .../src/entities.rs                           |     0
 .../src/escape.rs                             |    41 +-
 .../src/html.rs                               |    28 +-
 vendor/pulldown-cmark-0.6.1/src/lib.rs        |    74 +
 .../src/linklabel.rs                          |    29 +-
 vendor/pulldown-cmark-0.6.1/src/main.rs       |   109 +
 .../src/parse.rs                              |   587 +-
 .../src/puncttable.rs                         |     0
 .../src/scanners.rs                           |   227 +-
 .../src/simd.rs                               |     0
 .../src/strings.rs                            |    33 +-
 .../src/tree.rs                               |     0
 .../tests/errors.rs                           |     0
 .../tests/html.rs                             |     0
 .../tests/lib.rs                              |     0
 .../tests/suite/footnotes.rs                  |     0
 .../tests/suite/gfm_strikethrough.rs          |     0
 .../tests/suite/gfm_table.rs                  |     0
 .../tests/suite/gfm_tasklist.rs               |     0
 .../tests/suite/mod.rs                        |     0
 .../tests/suite/regression.rs                 |   807 ++
 .../tests/suite/spec.rs                       |     0
 .../tests/suite/table.rs                      |     0
 vendor/pulldown-cmark/.cargo-checksum.json    |     2 +-
 vendor/pulldown-cmark/Cargo.lock              |   556 +-
 vendor/pulldown-cmark/Cargo.toml              |     6 +-
 vendor/pulldown-cmark/README.md               |     4 +-
 vendor/pulldown-cmark/src/html.rs             |    21 +-
 vendor/pulldown-cmark/src/lib.rs              |     4 +-
 vendor/pulldown-cmark/src/parse.rs            |   107 +-
 vendor/pulldown-cmark/src/scanners.rs         |     2 +-
 .../pulldown-cmark/tests/suite/regression.rs  |    46 +-
 vendor/pulldown-cmark/tests/suite/spec.rs     |     9 +-
 vendor/pulldown-cmark/tests/suite/table.rs    |     3 +-
 vendor/tar/.cargo-checksum.json               |     2 +-
 vendor/tar/Cargo.toml                         |     8 +-
 vendor/tar/README.md                          |     6 +-
 vendor/tar/src/archive.rs                     |    13 +-
 vendor/tar/src/builder.rs                     |   165 +-
 vendor/tar/src/entry.rs                       |   193 +-
 vendor/tar/src/error.rs                       |     2 +-
 vendor/tar/src/header.rs                      |    59 +-
 vendor/tar/src/lib.rs                         |    22 +-
 vendor/tar/src/pax.rs                         |     2 +-
 vendor/tar/tests/all.rs                       |   156 +-
 vendor/tar/tests/archives/directory.tar       |   Bin 10240 -> 0 bytes
 vendor/tar/tests/archives/duplicate_dirs.tar  |   Bin 2048 -> 0 bytes
 vendor/tar/tests/archives/empty_filename.tar  |   Bin 512 -> 0 bytes
 vendor/tar/tests/archives/file_times.tar      |   Bin 1536 -> 0 bytes
 vendor/tar/tests/archives/link.tar            |   Bin 10240 -> 0 bytes
 vendor/tar/tests/archives/pax.tar             |   Bin 10240 -> 0 bytes
 vendor/tar/tests/archives/pax2.tar            |   Bin 10240 -> 0 bytes
 vendor/tar/tests/archives/reading_files.tar   |   Bin 10240 -> 0 bytes
 vendor/tar/tests/archives/simple.tar          |   Bin 10240 -> 0 bytes
 .../archives/simple_missing_last_header.tar   |   Bin 9728 -> 0 bytes
 vendor/tar/tests/archives/spaces.tar          |   Bin 2048 -> 0 bytes
 vendor/tar/tests/archives/sparse.tar          |   Bin 10240 -> 0 bytes
 vendor/tar/tests/archives/xattrs.tar          |   Bin 10240 -> 0 bytes
 vendor/tar/tests/entry.rs                     |    26 +
 vendor/term_size/.cargo-checksum.json         |     1 -
 vendor/term_size/CHANGELOG.md                 |    48 -
 vendor/term_size/CONTRIBUTORS.md              |    11 -
 vendor/term_size/Cargo.toml                   |    84 -
 vendor/term_size/LICENSE-MIT                  |    21 -
 vendor/term_size/README.md                    |    63 -
 vendor/term_size/appveyor.yml                 |    12 -
 vendor/term_size/index.html                   |     1 -
 vendor/term_size/justfile                     |    39 -
 vendor/term_size/rustfmt.toml                 |     4 -
 vendor/term_size/src/lib.rs                   |   237 -
 vendor/termize/.cargo-checksum.json           |     1 +
 vendor/termize/CHANGELOG.md                   |     9 +
 vendor/termize/CODE_OF_CONDUCT.md             |    76 +
 vendor/termize/CONTRIBUTING.md                |    22 +
 vendor/termize/Cargo.toml                     |    56 +
 vendor/{term_size => termize}/LICENSE-APACHE  |     0
 vendor/termize/LICENSE-MIT                    |    22 +
 vendor/termize/README.md                      |    51 +
 vendor/termize/src/lib.rs                     |    34 +
 vendor/termize/src/platform/mod.rs            |    15 +
 vendor/termize/src/platform/unix.rs           |   232 +
 vendor/termize/src/platform/unsupported.rs    |    12 +
 vendor/termize/src/platform/windows.rs        |   107 +
 .../thread_local-0.3.6/.cargo-checksum.json   |     1 +
 vendor/thread_local-0.3.6/Cargo.toml          |    26 +
 .../LICENSE-APACHE                            |     0
 vendor/thread_local-0.3.6/LICENSE-MIT         |    25 +
 vendor/thread_local-0.3.6/README.md           |    41 +
 .../benches/thread_local.rs                   |    18 +
 vendor/thread_local-0.3.6/src/lib.rs          |   757 ++
 vendor/thread_local-0.3.6/src/thread_id.rs    |    61 +
 vendor/thread_local-0.3.6/src/unreachable.rs  |    74 +
 vendor/thread_local/.cargo-checksum.json      |     2 +-
 vendor/thread_local/Cargo.toml                |     4 +-
 vendor/thread_local/README.md                 |     2 +-
 vendor/thread_local/src/cached.rs             |   198 +
 vendor/thread_local/src/lib.rs                |   330 +-
 vendor/unicase/.cargo-checksum.json           |     2 +-
 vendor/unicase/Cargo.toml                     |     8 +-
 vendor/unicase/build.rs                       |    14 +-
 vendor/unicase/src/ascii.rs                   |    14 +-
 vendor/unicase/src/lib.rs                     |    47 +-
 vendor/unicase/src/unicode/map.rs             |     2 +-
 vendor/unicase/src/unicode/mod.rs             |    26 +-
 .../version_check-0.1.5/.cargo-checksum.json  |     1 -
 vendor/version_check-0.1.5/Cargo.toml         |    24 -
 vendor/version_check-0.1.5/README.md          |    67 -
 vendor/version_check-0.1.5/src/lib.rs         |   255 -
 vendor/version_check/.cargo-checksum.json     |     1 +
 vendor/version_check/Cargo.toml               |    24 +
 vendor/version_check/LICENSE-APACHE           |   201 +
 .../LICENSE-MIT                               |     0
 vendor/version_check/README.md                |    76 +
 vendor/version_check/src/channel.rs           |   192 +
 vendor/version_check/src/date.rs              |   167 +
 vendor/version_check/src/lib.rs               |   288 +
 vendor/version_check/src/version.rs           |   238 +
 vendor/winapi-0.2.8/.cargo-checksum.json      |     1 -
 vendor/winapi-0.2.8/Cargo.toml                |    61 -
 vendor/winapi-0.2.8/LICENSE.md                |    21 -
 vendor/winapi-0.2.8/src/activation.rs         |     5 -
 vendor/winapi-0.2.8/src/audioclient.rs        |    71 -
 vendor/winapi-0.2.8/src/audiosessiontypes.rs  |    11 -
 vendor/winapi-0.2.8/src/basetsd.rs            |    99 -
 vendor/winapi-0.2.8/src/bcrypt.rs             |   356 -
 vendor/winapi-0.2.8/src/cfg.rs                |   134 -
 vendor/winapi-0.2.8/src/cfgmgr32.rs           |   758 --
 vendor/winapi-0.2.8/src/combaseapi.rs         |    17 -
 vendor/winapi-0.2.8/src/commctrl.rs           |  3578 ------
 vendor/winapi-0.2.8/src/commdlg.rs            |   583 -
 vendor/winapi-0.2.8/src/corsym.rs             |    79 -
 vendor/winapi-0.2.8/src/d2d1.rs               |   734 --
 vendor/winapi-0.2.8/src/d2dbasetypes.rs       |    61 -
 vendor/winapi-0.2.8/src/d3d10shader.rs        |   110 -
 vendor/winapi-0.2.8/src/d3d11.rs              |  2665 ----
 vendor/winapi-0.2.8/src/d3d11shader.rs        |   320 -
 vendor/winapi-0.2.8/src/d3d12.rs              |  2324 ----
 vendor/winapi-0.2.8/src/d3d12sdklayers.rs     |  1063 --
 vendor/winapi-0.2.8/src/d3d12shader.rs        |   320 -
 vendor/winapi-0.2.8/src/d3d9.rs               |   713 --
 vendor/winapi-0.2.8/src/d3d9caps.rs           |   349 -
 vendor/winapi-0.2.8/src/d3d9types.rs          |  1397 ---
 vendor/winapi-0.2.8/src/d3dcommon.rs          |   753 --
 vendor/winapi-0.2.8/src/d3dcompiler.rs        |    74 -
 vendor/winapi-0.2.8/src/dbghelp.rs            |   340 -
 vendor/winapi-0.2.8/src/dcommon.rs            |    18 -
 vendor/winapi-0.2.8/src/devpropdef.rs         |    71 -
 vendor/winapi-0.2.8/src/docobj.rs             |    22 -
 vendor/winapi-0.2.8/src/dpapi.rs              |    11 -
 vendor/winapi-0.2.8/src/dsgetdc.rs            |   113 -
 vendor/winapi-0.2.8/src/dsound.rs             |   132 -
 vendor/winapi-0.2.8/src/dsrole.rs             |    50 -
 vendor/winapi-0.2.8/src/dwmapi.rs             |     9 -
 vendor/winapi-0.2.8/src/dwrite.rs             |  1038 --
 vendor/winapi-0.2.8/src/dxgi.rs               |   240 -
 vendor/winapi-0.2.8/src/dxgi1_2.rs            |   288 -
 vendor/winapi-0.2.8/src/dxgi1_3.rs            |   131 -
 vendor/winapi-0.2.8/src/dxgi1_4.rs            |    82 -
 vendor/winapi-0.2.8/src/dxgiformat.rs         |   124 -
 vendor/winapi-0.2.8/src/dxgitype.rs           |    86 -
 vendor/winapi-0.2.8/src/errhandlingapi.rs     |     7 -
 vendor/winapi-0.2.8/src/excpt.rs              |    14 -
 vendor/winapi-0.2.8/src/fileapi.rs            |   152 -
 vendor/winapi-0.2.8/src/gl.rs                 |    35 -
 vendor/winapi-0.2.8/src/guiddef.rs            |    20 -
 vendor/winapi-0.2.8/src/heapapi.rs            |    12 -
 vendor/winapi-0.2.8/src/hidclass.rs           |    56 -
 vendor/winapi-0.2.8/src/hidpi.rs              |   182 -
 vendor/winapi-0.2.8/src/hidsdi.rs             |    15 -
 vendor/winapi-0.2.8/src/hidusage.rs           |   270 -
 vendor/winapi-0.2.8/src/hstring.rs            |    16 -
 vendor/winapi-0.2.8/src/http.rs               |   828 --
 vendor/winapi-0.2.8/src/imm.rs                |     3 -
 vendor/winapi-0.2.8/src/inaddr.rs             |    22 -
 vendor/winapi-0.2.8/src/inspectable.rs        |    15 -
 vendor/winapi-0.2.8/src/ksmedia.rs            |    18 -
 vendor/winapi-0.2.8/src/lib.rs                |   368 -
 vendor/winapi-0.2.8/src/libloaderapi.rs       |    23 -
 vendor/winapi-0.2.8/src/lmaccess.rs           |   853 --
 vendor/winapi-0.2.8/src/lmcons.rs             |    55 -
 vendor/winapi-0.2.8/src/lmdfs.rs              |   311 -
 vendor/winapi-0.2.8/src/lmerrlog.rs           |   263 -
 vendor/winapi-0.2.8/src/lmjoin.rs             |    80 -
 vendor/winapi-0.2.8/src/lsalookup.rs          |    69 -
 vendor/winapi-0.2.8/src/macros.rs             |   270 -
 vendor/winapi-0.2.8/src/memoryapi.rs          |    19 -
 vendor/winapi-0.2.8/src/minschannel.rs        |    56 -
 vendor/winapi-0.2.8/src/minwinbase.rs         |   253 -
 vendor/winapi-0.2.8/src/minwindef.rs          |    89 -
 vendor/winapi-0.2.8/src/mmdeviceapi.rs        |    63 -
 vendor/winapi-0.2.8/src/mmreg.rs              |   304 -
 vendor/winapi-0.2.8/src/mmsystem.rs           |   259 -
 vendor/winapi-0.2.8/src/mscat.rs              |    28 -
 vendor/winapi-0.2.8/src/mssip.rs              |   103 -
 vendor/winapi-0.2.8/src/nb30.rs               |   200 -
 vendor/winapi-0.2.8/src/ncrypt.rs             |     9 -
 vendor/winapi-0.2.8/src/ntdef.rs              |     7 -
 vendor/winapi-0.2.8/src/ntsecapi.rs           |  1589 ---
 vendor/winapi-0.2.8/src/ntstatus.rs           |  2474 ----
 vendor/winapi-0.2.8/src/oaidl.rs              |   590 -
 vendor/winapi-0.2.8/src/objbase.rs            |     5 -
 vendor/winapi-0.2.8/src/objidl.rs             |   100 -
 vendor/winapi-0.2.8/src/objidlbase.rs         |    93 -
 vendor/winapi-0.2.8/src/olectl.rs             |    10 -
 vendor/winapi-0.2.8/src/pdh.rs                |    52 -
 vendor/winapi-0.2.8/src/playsoundapi.rs       |    19 -
 vendor/winapi-0.2.8/src/processsnapshot.rs    |    58 -
 vendor/winapi-0.2.8/src/processthreadsapi.rs  |    62 -
 vendor/winapi-0.2.8/src/propidl.rs            |    10 -
 vendor/winapi-0.2.8/src/propsys.rs            |     4 -
 vendor/winapi-0.2.8/src/prsht.rs              |   262 -
 vendor/winapi-0.2.8/src/psapi.rs              |   166 -
 vendor/winapi-0.2.8/src/qos.rs                |    16 -
 vendor/winapi-0.2.8/src/reason.rs             |    63 -
 .../winapi-0.2.8/src/restrictederrorinfo.rs   |     9 -
 vendor/winapi-0.2.8/src/roapi.rs              |    13 -
 vendor/winapi-0.2.8/src/roerrorapi.rs         |    11 -
 vendor/winapi-0.2.8/src/rpc.rs                |     5 -
 vendor/winapi-0.2.8/src/rpcdce.rs             |   535 -
 vendor/winapi-0.2.8/src/sapi.rs               |  2431 ----
 vendor/winapi-0.2.8/src/schannel.rs           |   333 -
 vendor/winapi-0.2.8/src/servprov.rs           |    11 -
 vendor/winapi-0.2.8/src/setupapi.rs           |  1301 --
 vendor/winapi-0.2.8/src/shellapi.rs           |    62 -
 vendor/winapi-0.2.8/src/shellscalingapi.rs    |    19 -
 vendor/winapi-0.2.8/src/shlguid.rs            |     2 -
 vendor/winapi-0.2.8/src/shlobj.rs             |    94 -
 vendor/winapi-0.2.8/src/shobjidl.rs           |   652 -
 vendor/winapi-0.2.8/src/shtypes.rs            |    40 -
 vendor/winapi-0.2.8/src/spapidef.rs           |    48 -
 vendor/winapi-0.2.8/src/sql.rs                |   179 -
 vendor/winapi-0.2.8/src/sqltypes.rs           |   130 -
 vendor/winapi-0.2.8/src/sspi.rs               |   657 -
 vendor/winapi-0.2.8/src/strmif.rs             |     4 -
 vendor/winapi-0.2.8/src/subauth.rs            |   198 -
 vendor/winapi-0.2.8/src/synchapi.rs           |    14 -
 vendor/winapi-0.2.8/src/sysinfoapi.rs         |    46 -
 vendor/winapi-0.2.8/src/threadpoolapi.rs      |     7 -
 vendor/winapi-0.2.8/src/timezoneapi.rs        |    27 -
 vendor/winapi-0.2.8/src/tlhelp32.rs           |   104 -
 vendor/winapi-0.2.8/src/unknwnbase.rs         |    29 -
 vendor/winapi-0.2.8/src/urlhist.rs            |    56 -
 vendor/winapi-0.2.8/src/urlmon.rs             |     6 -
 vendor/winapi-0.2.8/src/usb.rs                |    18 -
 vendor/winapi-0.2.8/src/usbspec.rs            |    41 -
 vendor/winapi-0.2.8/src/usp10.rs              |   201 -
 vendor/winapi-0.2.8/src/vadefs.rs             |     7 -
 vendor/winapi-0.2.8/src/vsbackup.rs           |   303 -
 vendor/winapi-0.2.8/src/vss.rs                |   256 -
 vendor/winapi-0.2.8/src/vsserror.rs           |    85 -
 vendor/winapi-0.2.8/src/vswriter.rs           |   241 -
 vendor/winapi-0.2.8/src/werapi.rs             |     8 -
 vendor/winapi-0.2.8/src/winbase.rs            |   552 -
 vendor/winapi-0.2.8/src/wincon.rs             |   198 -
 vendor/winapi-0.2.8/src/wincred.rs            |   209 -
 vendor/winapi-0.2.8/src/wincrypt.rs           |  2206 ----
 vendor/winapi-0.2.8/src/windef.rs             |    57 -
 vendor/winapi-0.2.8/src/windowscodecs.rs      |   363 -
 vendor/winapi-0.2.8/src/windowsx.rs           |    22 -
 vendor/winapi-0.2.8/src/winerror.rs           |  6065 ----------
 vendor/winapi-0.2.8/src/winevt.rs             |    40 -
 vendor/winapi-0.2.8/src/wingdi.rs             |  1238 --
 vendor/winapi-0.2.8/src/winhttp.rs            |   441 -
 vendor/winapi-0.2.8/src/winioctl.rs           |   754 --
 vendor/winapi-0.2.8/src/winnetwk.rs           |   275 -
 vendor/winapi-0.2.8/src/winnls.rs             |   164 -
 vendor/winapi-0.2.8/src/winnt.rs              |  2368 ----
 vendor/winapi-0.2.8/src/winreg.rs             |    41 -
 vendor/winapi-0.2.8/src/winscard.rs           |   269 -
 vendor/winapi-0.2.8/src/winsmcrd.rs           |   157 -
 vendor/winapi-0.2.8/src/winsock2.rs           |   429 -
 vendor/winapi-0.2.8/src/winspool.rs           |    29 -
 vendor/winapi-0.2.8/src/winstring.rs          |     3 -
 vendor/winapi-0.2.8/src/winsvc.rs             |   200 -
 vendor/winapi-0.2.8/src/winusb.rs             |    33 -
 vendor/winapi-0.2.8/src/winusbio.rs           |    18 -
 vendor/winapi-0.2.8/src/winuser.rs            |  2334 ----
 vendor/winapi-0.2.8/src/ws2def.rs             |   279 -
 vendor/winapi-0.2.8/src/ws2ipdef.rs           |    42 -
 vendor/winapi-0.2.8/src/ws2spi.rs             |    57 -
 vendor/winapi-0.2.8/src/ws2tcpip.rs           |    27 -
 vendor/winapi-0.2.8/src/wtypes.rs             |    75 -
 vendor/winapi-0.2.8/src/wtypesbase.rs         |    37 -
 vendor/winapi-0.2.8/src/xinput.rs             |   118 -
 vendor/winapi-build/.cargo-checksum.json      |     1 -
 vendor/winapi-build/Cargo.toml                |    11 -
 vendor/winapi-build/src/lib.rs                |    14 -
 version                                       |     2 +-
 6099 files changed, 125847 insertions(+), 156396 deletions(-)
 create mode 100644 src/doc/book/.cargo/config
 create mode 100644 src/doc/book/ADMIN_TASKS.md
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/output.txt
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.lock
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.toml
 create mode 100644 src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/src/main.rs
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.lock
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.toml
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt
 create mode 100644 src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-01/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-03/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-04/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-06/output.txt
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/listing-04-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/src/main.rs
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.lock
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.toml
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt
 create mode 100644 src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/output.txt
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/output.txt
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/output.txt
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/src/main.rs
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.lock
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.toml
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/output.txt
 create mode 100644 src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/src/main.rs
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.lock
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.toml
 create mode 100644 src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/src/main.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/output.txt
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/output.txt
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/front_of_house.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/lib.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/src/main.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.lock
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.toml
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house/hosting.rs
 create mode 100644 src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/lib.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-07/output.txt
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-19/output.txt
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-19/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-20/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-21/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-22/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-23/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-24/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-25/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/listing-08-26/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-02-format/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/src/main.rs
 create mode 100644 src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.lock
 create mode 100644 src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.toml
 create mode 100644 src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt
 create mode 100644 src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-01/output.txt
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-04/output.txt
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/listing-09-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-01-panic/output.txt
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-01-panic/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-03-closures/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-05-expect/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/src/main.rs
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.lock
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.toml
 create mode 100644 src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/src/lib.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/output.txt
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/src/main.rs
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.lock
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.toml
 create mode 100644 src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/src/main.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/tests/integration_test.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/common.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/integration_test.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/common/mod.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/integration_test.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.lock
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.toml
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/src/lib.rs
 create mode 100644 src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/tests/integration_test.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-01/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-02/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-03/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-04/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-04/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-05/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-06/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-07/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-07/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-08/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-08/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-09/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-10/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-10/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-11/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-12/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-12/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-13/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-14/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-14/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-15/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-15/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-16/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-16/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-16/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-17/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-17/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-18/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-18/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-19/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-19/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-19/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-19/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-20/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-20/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-20/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-21/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-21/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-21/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-21/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-22/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-22/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-22/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-23/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-23/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-23/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-23/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-24/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/listing-12-24/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/main.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.lock
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.toml
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/output.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/poem.txt
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/lib.rs
 create mode 100644 src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/poem.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/poem.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-08/output.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-15/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-16/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-17/output.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-19/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-20/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-21/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-22/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-23/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-25/poem.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-25/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-25/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-26/poem.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-26/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-26/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-27/poem.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-27/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-27/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-29/poem.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-29/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/listing-13-29/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/src/lib.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/output.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/src/main.rs
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.lock
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.toml
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/output.txt
 create mode 100644 src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-01/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-02/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-03/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.lock
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/src/lib.rs
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/Cargo.toml
 create mode 100644 src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-03/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-09/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-14/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-15/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-16/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-17/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-19/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-19/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-20/src/lib.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-21/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-21/src/lib.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-22/src/lib.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-23/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-23/src/lib.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-24/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-24/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-25/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-26/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-26/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-27/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-28/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/listing-15-29/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/src/main.rs
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.lock
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.toml
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/output.txt
 create mode 100644 src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/output.txt
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/output.txt
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/output.txt
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/output.txt
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/src/main.rs
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.lock
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.toml
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt
 create mode 100644 src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-01/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-02/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-03/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-04/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-05/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-06/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-07/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-08/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-09/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-10/output.txt
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-10/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-12/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-14/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-15/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-16/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-17/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-18/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-19/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-20/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-21/src/lib.rs
 create mode 100644 src/doc/book/listings/ch17-oop/listing-17-21/src/main.rs
 create mode 100644 src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.lock
 create mode 100644 src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.toml
 create mode 100644 src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt
 create mode 100644 src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/src/lib.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/output.txt
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/output.txt
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/output.txt
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/output.txt
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/output.txt
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/rustfmt-ignore
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/src/main.rs
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.lock
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.toml
 create mode 100644 src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-05/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-12/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-14/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-15/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-16/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-17/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-18/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-18/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-19/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-19/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-20/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-20/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-21/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-21/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-22/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-23/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-24/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-25/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-27/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-28/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-30/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/lib.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/src/main.rs
 create mode 100644 src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.lock
 create mode 100644 src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.toml
 create mode 100644 src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/output.txt
 create mode 100644 src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-01/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-02/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-03/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-04/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-04/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-05/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-05/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-06/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-06/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-07/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-07/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-08/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-08/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-08/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-09/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-09/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-09/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-10/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-10/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-10/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-11/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-11/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-11/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-12/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-12/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-12/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-12/src/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-13/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-13/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-13/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-13/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-14/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-14/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-14/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-14/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-15/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-15/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-15/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-15/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-16/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-16/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-16/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-16/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-17/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-18/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-18/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-18/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-18/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-19/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-19/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-19/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-19/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-20/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-20/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-20/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-20/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-21/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-21/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-21/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-21/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-22/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-23/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-23/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-23/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-23/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-24/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-24/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-24/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-24/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-25/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-25/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-25/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/listing-20-25/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/lib.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/404.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.lock
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.toml
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/hello.html
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/bin/main.rs
 create mode 100644 src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/lib.rs
 create mode 100644 src/doc/book/rustfmt.toml
 create mode 100644 src/doc/book/tools/src/bin/release_listings.rs
 create mode 100644 src/doc/book/tools/src/bin/remove_hidden_lines.rs
 create mode 100755 src/doc/book/tools/update-rustc.sh
 create mode 100644 src/doc/embedded-book/src/appendix/glossary.md
 create mode 100644 src/doc/nomicon/book.toml
 rename src/doc/{rustc-guide => rustc-dev-guide}/.editorconfig (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/.travis.yml (89%)
 create mode 100644 src/doc/rustc-dev-guide/CNAME
 rename src/doc/{rustc-guide => rustc-dev-guide}/CODE_OF_CONDUCT.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/LICENSE-APACHE (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/LICENSE-MIT (100%)
 create mode 100644 src/doc/rustc-dev-guide/README.md
 create mode 100644 src/doc/rustc-dev-guide/book.toml
 rename src/doc/{rustc-guide => rustc-dev-guide}/ci/check_line_lengths.sh (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/SUMMARY.md (96%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/about-this-guide.md (95%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/appendix/background.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/appendix/bibliography.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/appendix/code-index.md (86%)
 create mode 100644 src/doc/rustc-dev-guide/src/appendix/compiler-lecture.md
 create mode 100644 src/doc/rustc-dev-guide/src/appendix/glossary.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/appendix/humorust.md (80%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/appendix/stupid-stats.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/moves_and_initialization.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/moves_and_initialization/move_paths.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference/closure_constraints.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference/constraint_propagation.md (97%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference/error_reporting.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference/lifetime_parameters.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference/member_constraints.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/region_inference/placeholders_and_universes.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/two_phase_borrows.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/borrow_check/type_check.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/bug-fix-procedure.md (99%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/building/bootstrapping.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/building/build-install-distribution-artifacts.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/building/compiler-documenting.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/building/ctags.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/building/how-to-build-and-run.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/building/suggested.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/closure.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/codegen.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/codegen/backend-agnostic.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/codegen/debugging.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/codegen/updating-llvm.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/compiler-debugging.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/compiler-team.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/compiletest.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/const-eval.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/conventions.md (99%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/crates-io.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/debugging-support-in-rustc.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/diagnostics.md (97%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/diagnostics/diagnostic-codes.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/diagnostics/lintstore.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/generic_arguments.md (100%)
 create mode 100644 src/doc/rustc-dev-guide/src/generics.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/high-level-overview.md (97%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/hir-debugging.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/hir.md (98%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/ice-breaker/about.md (94%)
 create mode 100644 src/doc/rustc-dev-guide/src/ice-breaker/cleanup-crew.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/ice-breaker/llvm.md (93%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/img/rustc_stages.svg (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/implementing_new_features.md (95%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/incrcomp-debugging.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/lowering.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/macro-expansion.md (96%)
 create mode 100644 src/doc/rustc-dev-guide/src/memory.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/method-lookup.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/construction.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/debugging.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/index.md (87%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/mir_detailed.dot (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/mir_detailed.svg (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/mir_overview.dot (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/mir_overview.svg (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/optimizations.md (84%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/passes.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/mir/visitor.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/miri.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/name-resolution.md (86%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/opaque-types-type-alias-impl-trait.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/panic-implementation.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/param_env.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/part-1-intro.md (78%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/part-2-intro.md (85%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/profile-guided-optimization.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/profiling.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/profiling/with_perf.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/example-0.counts.txt (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/example-0.html (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/example-0.png (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/incremental-compilation-in-detail.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/incremental-compilation.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/profiling.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/queries/query-evaluation-model-in-detail.md (99%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/query.md (82%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/rustc-driver.md (80%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/rustdoc.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/salsa.md (100%)
 create mode 100644 src/doc/rustc-dev-guide/src/sanitizers.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/stability.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/stabilization_guide.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/test-implementation.md (90%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/tests/adding.md (95%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/tests/intro.md (95%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/tests/running.md (89%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/the-parser.md (86%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/associated-types.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/bibliography.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/caching.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/canonical-queries.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/canonicalization.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/chalk-overview.md (99%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/goals-and-clauses.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/hrtb.md (97%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/implied-bounds.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/index.md (100%)
 create mode 100644 src/doc/rustc-dev-guide/src/traits/lowering-module.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/lowering-rules.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/lowering-to-logic.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/regions.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/resolution.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/slg.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/specialization.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/traits/wf.md (100%)
 create mode 100644 src/doc/rustc-dev-guide/src/ty-fold.md
 create mode 100644 src/doc/rustc-dev-guide/src/ty.md
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/type-checking.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/type-inference.md (97%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/variance.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/src/walkthrough.md (100%)
 rename src/doc/{rustc-guide => rustc-dev-guide}/triagebot.toml (100%)
 delete mode 100644 src/doc/rustc-guide/README.md
 delete mode 100644 src/doc/rustc-guide/book.toml
 delete mode 100755 src/doc/rustc-guide/ci/install.sh
 delete mode 100644 src/doc/rustc-guide/src/appendix/compiler-lecture.md
 delete mode 100644 src/doc/rustc-guide/src/appendix/glossary.md
 delete mode 100644 src/doc/rustc-guide/src/sanitizers.md
 delete mode 100644 src/doc/rustc-guide/src/traits/lowering-module.md
 delete mode 100644 src/doc/rustc-guide/src/ty.md
 create mode 100644 src/doc/rustdoc/book.toml
 create mode 100644 src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
 create mode 100644 src/doc/unstable-book/src/compiler-flags/self-profile-events.md
 create mode 100644 src/doc/unstable-book/src/compiler-flags/self-profile.md
 create mode 100644 src/doc/unstable-book/src/language-features/const-eval-limit.md
 delete mode 100644 src/doc/unstable-book/src/language-features/doc-spotlight.md
 create mode 100644 src/doc/unstable-book/src/language-features/link-cfg.md
 create mode 100644 src/doc/unstable-book/src/language-features/no-sanitize.md
 delete mode 100644 src/doc/unstable-book/src/library-features/read-initializer.md
 create mode 100644 src/doc/unstable-book/src/library-features/tidy-test-never-used-anywhere-else.md
 create mode 100644 src/liballoc/collections/btree/navigate.rs
 create mode 100644 src/liballoc/collections/vec_deque/drain.rs
 delete mode 100644 src/libcore/num/uint_macros.rs
 create mode 100644 src/libcore/primitive.rs
 delete mode 100644 src/librustc/hir/check_attr.rs
 create mode 100644 src/librustc/infer/canonical.rs
 delete mode 100644 src/librustc/infer/canonical/mod.rs
 delete mode 100644 src/librustc/infer/error_reporting/mod.rs
 delete mode 100644 src/librustc/infer/error_reporting/nice_region_error/mod.rs
 delete mode 100644 src/librustc/infer/error_reporting/nice_region_error/util.rs
 delete mode 100644 src/librustc/infer/higher_ranked/mod.rs
 delete mode 100644 src/librustc/infer/lexical_region_resolve/mod.rs
 delete mode 100644 src/librustc/infer/nll_relate/mod.rs
 delete mode 100644 src/librustc/infer/opaque_types/mod.rs
 delete mode 100644 src/librustc/infer/region_constraints/mod.rs
 create mode 100644 src/librustc/middle/limits.rs
 delete mode 100644 src/librustc/middle/recursion_limit.rs
 delete mode 100644 src/librustc/middle/weak_lang_items.rs
 delete mode 100644 src/librustc/traits/chalk_fulfill.rs
 delete mode 100644 src/librustc/traits/codegen/mod.rs
 delete mode 100644 src/librustc/traits/error_reporting/mod.rs
 delete mode 100644 src/librustc/traits/error_reporting/on_unimplemented.rs
 delete mode 100644 src/librustc/traits/misc.rs
 delete mode 100644 src/librustc/traits/object_safety.rs
 delete mode 100644 src/librustc/traits/on_unimplemented.rs
 create mode 100644 src/librustc/traits/query.rs
 delete mode 100644 src/librustc/traits/query/dropck_outlives.rs
 delete mode 100644 src/librustc/traits/query/method_autoderef.rs
 delete mode 100644 src/librustc/traits/query/mod.rs
 delete mode 100644 src/librustc/traits/query/normalize.rs
 delete mode 100644 src/librustc/traits/query/outlives_bounds.rs
 delete mode 100644 src/librustc/traits/query/type_op/ascribe_user_type.rs
 delete mode 100644 src/librustc/traits/query/type_op/eq.rs
 delete mode 100644 src/librustc/traits/query/type_op/mod.rs
 delete mode 100644 src/librustc/traits/query/type_op/normalize.rs
 delete mode 100644 src/librustc/traits/query/type_op/subtype.rs
 create mode 100644 src/librustc/traits/specialization_graph.rs
 delete mode 100644 src/librustc/traits/specialize/mod.rs
 delete mode 100644 src/librustc/traits/specialize/specialization_graph.rs
 delete mode 100644 src/librustc/traits/util.rs
 create mode 100644 src/librustc/ty/query/caches.rs
 create mode 100644 src/librustc/ty/query/stats.rs
 create mode 100644 src/librustc_ast/Cargo.toml
 create mode 100644 src/librustc_ast/README.md
 rename src/{libsyntax => librustc_ast}/ast.rs (92%)
 rename src/{libsyntax => librustc_ast}/ast/tests.rs (100%)
 create mode 100644 src/librustc_ast/attr/mod.rs
 rename src/{libsyntax => librustc_ast}/build.rs (100%)
 rename src/{libsyntax => librustc_ast}/entry.rs (100%)
 rename src/{libsyntax => librustc_ast}/expand/allocator.rs (100%)
 rename src/{libsyntax => librustc_ast}/expand/mod.rs (100%)
 create mode 100644 src/librustc_ast/lib.rs
 rename src/{libsyntax => librustc_ast}/mut_visit.rs (94%)
 create mode 100644 src/librustc_ast/node_id.rs
 rename src/{libsyntax => librustc_ast}/ptr.rs (100%)
 rename src/{libsyntax => librustc_ast}/token.rs (78%)
 rename src/{libsyntax => librustc_ast}/tokenstream.rs (98%)
 rename src/{libsyntax => librustc_ast}/util/classify.rs (100%)
 rename src/{libsyntax => librustc_ast}/util/comments.rs (97%)
 rename src/{libsyntax => librustc_ast}/util/comments/tests.rs (100%)
 rename src/{libsyntax => librustc_ast}/util/lev_distance.rs (100%)
 rename src/{libsyntax => librustc_ast}/util/lev_distance/tests.rs (100%)
 rename src/{libsyntax => librustc_ast}/util/literal.rs (98%)
 rename src/{libsyntax => librustc_ast}/util/map_in_place.rs (100%)
 rename src/{libsyntax => librustc_ast}/util/parser.rs (99%)
 rename src/{libsyntax => librustc_ast}/visit.rs (87%)
 rename src/{libsyntax/util => librustc_ast_passes}/node_count.rs (93%)
 create mode 100644 src/librustc_ast_pretty/Cargo.toml
 rename src/{libsyntax/print => librustc_ast_pretty}/helpers.rs (95%)
 create mode 100644 src/librustc_ast_pretty/lib.rs
 rename src/{libsyntax/print => librustc_ast_pretty}/pp.rs (100%)
 rename src/{libsyntax/print => librustc_ast_pretty}/pprust.rs (89%)
 rename src/{libsyntax/print => librustc_ast_pretty}/pprust/tests.rs (75%)
 create mode 100644 src/librustc_attr/Cargo.toml
 create mode 100644 src/librustc_attr/builtin.rs
 create mode 100644 src/librustc_attr/lib.rs
 create mode 100644 src/librustc_codegen_llvm/back/profiling.rs
 create mode 100644 src/librustc_codegen_ssa/build.rs
 create mode 100644 src/librustc_data_structures/sorted_map/index_map.rs
 create mode 100644 src/librustc_error_codes/error_codes/E0637.md
 create mode 100644 src/librustc_error_codes/error_codes/E0719.md
 create mode 100644 src/librustc_error_codes/error_codes/E0727.md
 create mode 100644 src/librustc_error_codes/error_codes/E0747.md
 create mode 100644 src/librustc_error_codes/error_codes/E0748.md
 create mode 100644 src/librustc_hir/lang_items.rs
 create mode 100644 src/librustc_hir/target.rs
 create mode 100644 src/librustc_hir/weak_lang_items.rs
 create mode 100644 src/librustc_infer/Cargo.toml
 rename src/{librustc => librustc_infer}/infer/at.rs (98%)
 rename src/{librustc => librustc_infer}/infer/canonical/canonicalizer.rs (95%)
 create mode 100644 src/librustc_infer/infer/canonical/mod.rs
 rename src/{librustc => librustc_infer}/infer/canonical/query_response.rs (89%)
 rename src/{librustc => librustc_infer}/infer/canonical/substitute.rs (78%)
 rename src/{librustc => librustc_infer}/infer/combine.rs (92%)
 rename src/{librustc => librustc_infer}/infer/equate.rs (76%)
 create mode 100644 src/librustc_infer/infer/error_reporting/mod.rs
 rename src/{librustc => librustc_infer}/infer/error_reporting/need_type_info.rs (96%)
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/different_lifetimes.rs (98%)
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/find_anon_type.rs (99%)
 create mode 100644 src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/named_anon_conflict.rs (96%)
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/outlives_closure.rs (98%)
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/placeholder_error.rs (95%)
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/static_impl_trait.rs (97%)
 rename src/{librustc => librustc_infer}/infer/error_reporting/nice_region_error/trait_impl_difference.rs (97%)
 create mode 100644 src/librustc_infer/infer/error_reporting/nice_region_error/util.rs
 rename src/{librustc => librustc_infer}/infer/error_reporting/note.rs (99%)
 rename src/{librustc => librustc_infer}/infer/freshen.rs (93%)
 rename src/{librustc => librustc_infer}/infer/fudge.rs (88%)
 rename src/{librustc => librustc_infer}/infer/glb.rs (90%)
 rename src/{librustc => librustc_infer}/infer/higher_ranked/README.md (100%)
 create mode 100644 src/librustc_infer/infer/higher_ranked/mod.rs
 rename src/{librustc => librustc_infer}/infer/lattice.rs (93%)
 rename src/{librustc => librustc_infer}/infer/lexical_region_resolve/README.md (100%)
 rename src/{librustc => librustc_infer}/infer/lexical_region_resolve/graphviz.rs (98%)
 create mode 100644 src/librustc_infer/infer/lexical_region_resolve/mod.rs
 rename src/{librustc => librustc_infer}/infer/lub.rs (90%)
 create mode 100644 src/librustc_infer/infer/mod.rs
 create mode 100644 src/librustc_infer/infer/nll_relate/mod.rs
 create mode 100644 src/librustc_infer/infer/opaque_types/mod.rs
 rename src/{librustc => librustc_infer}/infer/outlives/env.rs (99%)
 rename src/{librustc => librustc_infer}/infer/outlives/mod.rs (100%)
 rename src/{librustc => librustc_infer}/infer/outlives/obligations.rs (98%)
 rename src/{librustc => librustc_infer}/infer/outlives/verify.rs (94%)
 rename src/{librustc => librustc_infer}/infer/region_constraints/README.md (100%)
 rename src/{librustc => librustc_infer}/infer/region_constraints/leak_check.rs (87%)
 create mode 100644 src/librustc_infer/infer/region_constraints/mod.rs
 rename src/{librustc => librustc_infer}/infer/resolve.rs (93%)
 rename src/{librustc => librustc_infer}/infer/sub.rs (89%)
 rename src/{librustc => librustc_infer}/infer/type_variable.rs (97%)
 create mode 100644 src/librustc_infer/lib.rs
 rename src/{librustc => librustc_infer}/traits/auto_trait.rs (98%)
 create mode 100644 src/librustc_infer/traits/codegen/mod.rs
 rename src/{librustc => librustc_infer}/traits/coherence.rs (92%)
 rename src/{librustc => librustc_infer}/traits/engine.rs (86%)
 create mode 100644 src/librustc_infer/traits/error_reporting/mod.rs
 create mode 100644 src/librustc_infer/traits/error_reporting/on_unimplemented.rs
 rename src/{librustc => librustc_infer}/traits/error_reporting/suggestions.rs (94%)
 rename src/{librustc => librustc_infer}/traits/fulfill.rs (92%)
 create mode 100644 src/librustc_infer/traits/misc.rs
 create mode 100644 src/librustc_infer/traits/mod.rs
 create mode 100644 src/librustc_infer/traits/object_safety.rs
 create mode 100644 src/librustc_infer/traits/on_unimplemented.rs
 rename src/{librustc => librustc_infer}/traits/project.rs (92%)
 create mode 100644 src/librustc_infer/traits/query/dropck_outlives.rs
 rename src/{librustc => librustc_infer}/traits/query/evaluate_obligation.rs (100%)
 create mode 100644 src/librustc_infer/traits/query/method_autoderef.rs
 create mode 100644 src/librustc_infer/traits/query/mod.rs
 create mode 100644 src/librustc_infer/traits/query/normalize.rs
 create mode 100644 src/librustc_infer/traits/query/outlives_bounds.rs
 create mode 100644 src/librustc_infer/traits/query/type_op/ascribe_user_type.rs
 rename src/{librustc => librustc_infer}/traits/query/type_op/custom.rs (100%)
 create mode 100644 src/librustc_infer/traits/query/type_op/eq.rs
 rename src/{librustc => librustc_infer}/traits/query/type_op/implied_outlives_bounds.rs (96%)
 create mode 100644 src/librustc_infer/traits/query/type_op/mod.rs
 create mode 100644 src/librustc_infer/traits/query/type_op/normalize.rs
 rename src/{librustc => librustc_infer}/traits/query/type_op/outlives.rs (97%)
 rename src/{librustc => librustc_infer}/traits/query/type_op/prove_predicate.rs (78%)
 create mode 100644 src/librustc_infer/traits/query/type_op/subtype.rs
 create mode 100644 src/librustc_infer/traits/select.rs
 create mode 100644 src/librustc_infer/traits/specialize/mod.rs
 create mode 100644 src/librustc_infer/traits/specialize/specialization_graph.rs
 create mode 100644 src/librustc_infer/traits/structural_impls.rs
 rename src/{librustc => librustc_infer}/traits/structural_match.rs (97%)
 create mode 100644 src/librustc_infer/traits/util.rs
 rename src/{librustc => librustc_infer}/traits/wf.rs (96%)
 delete mode 100644 src/librustc_mir/borrow_check/flows.rs
 create mode 100644 src/librustc_mir/borrow_check/region_infer/opaque_types.rs
 create mode 100644 src/librustc_mir/borrow_check/region_infer/reverse_sccs.rs
 delete mode 100644 src/librustc_mir/const_eval.rs
 create mode 100644 src/librustc_mir/const_eval/mod.rs
 create mode 100644 src/librustc_mir/dataflow/generic/visitor.rs
 delete mode 100644 src/librustc_mir/dataflow/impls/indirect_mutation.rs
 create mode 100644 src/librustc_passes/check_attr.rs
 create mode 100644 src/librustc_passes/lang_items.rs
 rename src/{librustc/hir => librustc_passes}/upvars.rs (97%)
 create mode 100644 src/librustc_passes/weak_lang_items.rs
 rename src/librustc_resolve/{ => late}/lifetimes.rs (95%)
 delete mode 100644 src/librustc_session/node_id.rs
 rename src/{librustc_hir => librustc_span}/def_id.rs (95%)
 delete mode 100644 src/librustc_traits/chalk_context/mod.rs
 delete mode 100644 src/librustc_traits/chalk_context/program_clauses/builtin.rs
 delete mode 100644 src/librustc_traits/chalk_context/program_clauses/mod.rs
 delete mode 100644 src/librustc_traits/chalk_context/program_clauses/primitive.rs
 delete mode 100644 src/librustc_traits/chalk_context/resolvent_ops.rs
 delete mode 100644 src/librustc_traits/chalk_context/unify.rs
 delete mode 100644 src/librustc_traits/generic_types.rs
 create mode 100644 src/librustc_ty/common_traits.rs
 create mode 100644 src/librustc_ty/instance.rs
 create mode 100644 src/librustc_ty/needs_drop.rs
 create mode 100644 src/librustc_typeck/collect/type_of.rs
 delete mode 100644 src/librustc_typeck/namespace.rs
 delete mode 100644 src/libsyntax/Cargo.toml
 delete mode 100644 src/libsyntax/README.md
 delete mode 100644 src/libsyntax/attr/builtin.rs
 delete mode 100644 src/libsyntax/attr/mod.rs
 delete mode 100644 src/libsyntax/lib.rs
 create mode 100644 src/stdarch/.github/workflows/main.yml
 delete mode 100644 src/stdarch/QUESTIONS.md
 delete mode 100644 src/stdarch/ci/azure-install-rust.yml
 delete mode 100644 src/stdarch/ci/azure.yml
 mode change 100644 => 100755 src/stdarch/ci/style.sh
 create mode 100644 src/stdarch/crates/core_arch/rustfmt.toml
 create mode 100644 src/stdarch/crates/std_detect/src/detect/macros.rs
 create mode 100644 src/stdarch/crates/std_detect/src/detect/os/windows/aarch64.rs
 create mode 100644 src/stdarch/crates/std_detect/tests/x86-specific.rs
 create mode 100644 src/test/codegen/cfguard_checks.rs
 create mode 100644 src/test/codegen/cfguard_disabled.rs
 create mode 100644 src/test/codegen/cfguard_nochecks.rs
 create mode 100644 src/test/codegen/enum-discriminant-value.rs
 create mode 100644 src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
 create mode 100644 src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs
 create mode 100644 src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
 create mode 100644 src/test/codegen/sanitizer-no-sanitize-inlining.rs
 create mode 100644 src/test/codegen/sanitizer-no-sanitize.rs
 delete mode 100644 src/test/compile-fail/chalkify/chalk_initial_program.rs
 delete mode 100644 src/test/compile-fail/chalkify/generic_impls.rs
 delete mode 100644 src/test/compile-fail/chalkify/impl_wf.rs
 delete mode 100644 src/test/compile-fail/chalkify/recursive_where_clause_on_type.rs
 delete mode 100644 src/test/compile-fail/chalkify/type_wf.rs
 delete mode 100644 src/test/compile-fail/consts/const-err3.rs
 delete mode 100644 src/test/debuginfo/no-debug-attribute.rs
 create mode 100644 src/test/incremental/const-generics/issue-68477.rs
 create mode 100644 src/test/incremental/issue-62649-path-collisions-happen.rs
 create mode 100644 src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs
 create mode 100644 src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs
 create mode 100644 src/test/mir-opt/exponential-or.rs
 create mode 100644 src/test/pretty/gat-bounds.rs
 create mode 100644 src/test/pretty/if-attr.rs
 create mode 100644 src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs
 create mode 100644 src/test/pretty/nested-item-vis-defaultness.rs
 create mode 100644 src/test/pretty/trait-inner-attr.rs
 create mode 100644 src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile
 create mode 100644 src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
 create mode 100644 src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
 create mode 100644 src/test/run-make-fulldeps/issue-69368/Makefile
 create mode 100644 src/test/run-make-fulldeps/issue-69368/a.rs
 create mode 100644 src/test/run-make-fulldeps/issue-69368/b.rs
 create mode 100644 src/test/run-make-fulldeps/issue-69368/c.rs
 create mode 100644 src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile
 create mode 100644 src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
 create mode 100644 src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
 create mode 100644 src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile
 create mode 100644 src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
 create mode 100644 src/test/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
 create mode 100644 src/test/run-make-fulldeps/return-non-c-like-enum/Makefile
 create mode 100644 src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
 create mode 100644 src/test/run-make-fulldeps/return-non-c-like-enum/test.c
 create mode 100644 src/test/rustdoc-js/struct-like-variant.js
 create mode 100644 src/test/rustdoc-js/struct-like-variant.rs
 create mode 100644 src/test/rustdoc/auxiliary/primitive-reexport.rs
 create mode 100644 src/test/rustdoc/crate-version-escape.rs
 delete mode 100644 src/test/rustdoc/doc-spotlight.rs
 create mode 100644 src/test/rustdoc/primitive-reexport.rs
 create mode 100644 src/test/ui-fulldeps/lint-group-denied-lint-allowed.rs
 delete mode 100644 src/test/ui/allocator-alloc-one.rs
 create mode 100644 src/test/ui/asm/issue-62046.rs
 create mode 100644 src/test/ui/asm/issue-62046.stderr
 delete mode 100644 src/test/ui/assign-to-method.rs
 delete mode 100644 src/test/ui/assign-to-method.stderr
 create mode 100644 src/test/ui/associated-const/defaults-cyclic-fail.rs
 create mode 100644 src/test/ui/associated-const/defaults-cyclic-fail.stderr
 create mode 100644 src/test/ui/associated-const/defaults-cyclic-pass.rs
 create mode 100644 src/test/ui/associated-const/defaults-not-assumed-fail.rs
 create mode 100644 src/test/ui/associated-const/defaults-not-assumed-fail.stderr
 create mode 100644 src/test/ui/associated-const/defaults-not-assumed-pass.rs
 create mode 100644 src/test/ui/associated-item/associated-item-duplicate-bounds.rs
 create mode 100644 src/test/ui/associated-item/associated-item-duplicate-bounds.stderr
 delete mode 100644 src/test/ui/associated-types/associated-types-overridden-default.stderr
 create mode 100644 src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed
 create mode 100644 src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed
 create mode 100644 src/test/ui/associated-types/defaults-cyclic-fail-1.rs
 create mode 100644 src/test/ui/associated-types/defaults-cyclic-fail-1.stderr
 create mode 100644 src/test/ui/associated-types/defaults-cyclic-fail-2.rs
 create mode 100644 src/test/ui/associated-types/defaults-cyclic-fail-2.stderr
 create mode 100644 src/test/ui/associated-types/defaults-cyclic-pass-1.rs
 create mode 100644 src/test/ui/associated-types/defaults-cyclic-pass-2.rs
 create mode 100644 src/test/ui/associated-types/defaults-in-other-trait-items-pass.rs
 create mode 100644 src/test/ui/associated-types/defaults-in-other-trait-items.rs
 create mode 100644 src/test/ui/associated-types/defaults-in-other-trait-items.stderr
 create mode 100644 src/test/ui/associated-types/defaults-mixed.rs
 create mode 100644 src/test/ui/associated-types/defaults-mixed.stderr
 create mode 100644 src/test/ui/associated-types/defaults-specialization.rs
 create mode 100644 src/test/ui/associated-types/defaults-specialization.stderr
 create mode 100644 src/test/ui/associated-types/defaults-suitability.rs
 create mode 100644 src/test/ui/associated-types/defaults-suitability.stderr
 create mode 100644 src/test/ui/associated-types/defaults-unsound-62211-1.rs
 create mode 100644 src/test/ui/associated-types/defaults-unsound-62211-1.stderr
 create mode 100644 src/test/ui/associated-types/defaults-unsound-62211-2.rs
 create mode 100644 src/test/ui/associated-types/defaults-unsound-62211-2.stderr
 create mode 100644 src/test/ui/associated-types/issue-26681.rs
 create mode 100644 src/test/ui/associated-types/issue-26681.stderr
 create mode 100644 src/test/ui/associated-types/issue-32350.rs
 create mode 100644 src/test/ui/associated-types/issue-41868.rs
 create mode 100644 src/test/ui/associated-types/issue-43924.rs
 create mode 100644 src/test/ui/associated-types/issue-43924.stderr
 create mode 100644 src/test/ui/associated-types/issue-47385.rs
 create mode 100644 src/test/ui/associated-types/issue-54182-1.rs
 create mode 100644 src/test/ui/associated-types/issue-54182-2.rs
 create mode 100644 src/test/ui/associated-types/issue-63593.rs
 create mode 100644 src/test/ui/associated-types/issue-63593.stderr
 create mode 100644 src/test/ui/associated-types/issue-65774-1.rs
 create mode 100644 src/test/ui/associated-types/issue-65774-1.stderr
 create mode 100644 src/test/ui/associated-types/issue-65774-2.rs
 create mode 100644 src/test/ui/associated-types/issue-65774-2.stderr
 create mode 100644 src/test/ui/async-await/issue-54239-private-type-triggers-lint.rs
 delete mode 100644 src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs
 delete mode 100644 src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr
 delete mode 100644 src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs
 delete mode 100644 src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr
 delete mode 100644 src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs
 delete mode 100644 src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr
 create mode 100644 src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs
 create mode 100644 src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr
 create mode 100644 src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs
 create mode 100644 src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr
 create mode 100644 src/test/ui/borrowck/or-patterns.rs
 create mode 100644 src/test/ui/borrowck/or-patterns.stderr
 create mode 100644 src/test/ui/bound-suggestions.fixed
 create mode 100644 src/test/ui/bound-suggestions.rs
 create mode 100644 src/test/ui/bound-suggestions.stderr
 delete mode 100644 src/test/ui/chalkify/builtin-copy-clone.rs
 delete mode 100644 src/test/ui/chalkify/inherent_impl.rs
 delete mode 100644 src/test/ui/chalkify/lower_env1.rs
 delete mode 100644 src/test/ui/chalkify/lower_env1.stderr
 delete mode 100644 src/test/ui/chalkify/lower_env2.rs
 delete mode 100644 src/test/ui/chalkify/lower_env2.stderr
 delete mode 100644 src/test/ui/chalkify/lower_env3.rs
 delete mode 100644 src/test/ui/chalkify/lower_env3.stderr
 delete mode 100644 src/test/ui/chalkify/lower_impl.rs
 delete mode 100644 src/test/ui/chalkify/lower_impl.stderr
 delete mode 100644 src/test/ui/chalkify/lower_struct.rs
 delete mode 100644 src/test/ui/chalkify/lower_struct.stderr
 delete mode 100644 src/test/ui/chalkify/lower_trait.rs
 delete mode 100644 src/test/ui/chalkify/lower_trait.stderr
 delete mode 100644 src/test/ui/chalkify/lower_trait_higher_rank.rs
 delete mode 100644 src/test/ui/chalkify/lower_trait_higher_rank.stderr
 delete mode 100644 src/test/ui/chalkify/lower_trait_where_clause.rs
 delete mode 100644 src/test/ui/chalkify/lower_trait_where_clause.stderr
 delete mode 100644 src/test/ui/chalkify/projection.rs
 delete mode 100644 src/test/ui/chalkify/super_trait.rs
 delete mode 100644 src/test/ui/chalkify/trait_implied_bound.rs
 delete mode 100644 src/test/ui/chalkify/type_implied_bound.rs
 delete mode 100644 src/test/ui/chalkify/type_inference.rs
 delete mode 100644 src/test/ui/chalkify/type_inference.stderr
 create mode 100644 src/test/ui/closures/deeply-nested_closures.rs
 create mode 100644 src/test/ui/coherence/coherence-inherited-subtyping.old.stderr
 create mode 100644 src/test/ui/coherence/coherence-inherited-subtyping.re.stderr
 create mode 100644 src/test/ui/coherence/coherence-inherited-subtyping.rs
 create mode 100644 src/test/ui/coherence/coherence-subtyping.old.stderr
 create mode 100644 src/test/ui/coherence/coherence-subtyping.re.stderr
 create mode 100644 src/test/ui/const-generics/const-arg-type-arg-misordered.rs
 create mode 100644 src/test/ui/const-generics/const-arg-type-arg-misordered.stderr
 create mode 100644 src/test/ui/const-generics/const-param-after-const-literal-arg.rs
 delete mode 100644 src/test/ui/const-generics/issues/issue-65675.rs
 delete mode 100644 src/test/ui/const-generics/issues/issue-65675.stderr
 create mode 100644 src/test/ui/consts/ascii_ctype.rs
 create mode 100644 src/test/ui/consts/const-err2.noopt.stderr
 create mode 100644 src/test/ui/consts/const-err2.opt.stderr
 create mode 100644 src/test/ui/consts/const-err2.opt_with_overflow_checks.stderr
 delete mode 100644 src/test/ui/consts/const-err2.stderr
 delete mode 100644 src/test/ui/consts/const-err3.rs
 delete mode 100644 src/test/ui/consts/const-err3.stderr
 create mode 100644 src/test/ui/consts/const-eval/promoted_errors.noopt.stderr
 create mode 100644 src/test/ui/consts/const-eval/promoted_errors.opt.stderr
 create mode 100644 src/test/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr
 delete mode 100644 src/test/ui/consts/const-eval/promoted_errors.stderr
 delete mode 100644 src/test/ui/consts/const-eval/promoted_errors2.rs
 delete mode 100644 src/test/ui/consts/const-eval/promoted_errors2.stderr
 create mode 100644 src/test/ui/consts/const-int-arithmetic-overflow.rs
 create mode 100644 src/test/ui/consts/const-int-arithmetic.rs
 create mode 100644 src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs
 create mode 100644 src/test/ui/consts/const_limit/const_eval_limit_overflow.rs
 create mode 100644 src/test/ui/consts/const_limit/const_eval_limit_overflow.stderr
 create mode 100644 src/test/ui/consts/const_limit/const_eval_limit_reached.rs
 create mode 100644 src/test/ui/consts/const_limit/const_eval_limit_reached.stderr
 create mode 100644 src/test/ui/consts/const_limit/feature-gate-const_eval_limit.rs
 create mode 100644 src/test/ui/consts/const_limit/feature-gate-const_eval_limit.stderr
 create mode 100644 src/test/ui/consts/is_ascii.rs
 create mode 100644 src/test/ui/consts/issue-63952.rs
 create mode 100644 src/test/ui/consts/issue-63952.stderr
 delete mode 100644 src/test/ui/consts/issue-64059-2.rs
 create mode 100644 src/test/ui/consts/issue-68684.rs
 create mode 100644 src/test/ui/consts/issue-69020.noopt.stderr
 create mode 100644 src/test/ui/consts/issue-69020.opt.stderr
 create mode 100644 src/test/ui/consts/issue-69020.opt_with_overflow_checks.stderr
 create mode 100644 src/test/ui/consts/issue-69020.rs
 create mode 100644 src/test/ui/consts/issue-69312.rs
 create mode 100644 src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs
 create mode 100644 src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr
 delete mode 100644 src/test/ui/consts/std/char.rs
 create mode 100644 src/test/ui/duplicate/dupe-symbols-8.rs
 create mode 100644 src/test/ui/duplicate/dupe-symbols-8.stderr
 delete mode 100644 src/test/ui/error-codes/E0009.rs
 delete mode 100644 src/test/ui/error-codes/E0009.stderr
 delete mode 100644 src/test/ui/feature-gates/feature-gate-doc_spotlight.rs
 delete mode 100644 src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr
 delete mode 100644 src/test/ui/feature-gates/feature-gate-no-debug-2.rs
 delete mode 100644 src/test/ui/feature-gates/feature-gate-no-debug-2.stderr
 delete mode 100644 src/test/ui/feature-gates/feature-gate-no-debug.rs
 delete mode 100644 src/test/ui/feature-gates/feature-gate-no-debug.stderr
 create mode 100644 src/test/ui/feature-gates/feature-gate-no_sanitize.rs
 create mode 100644 src/test/ui/feature-gates/feature-gate-no_sanitize.stderr
 create mode 100644 src/test/ui/generator/dropck-resume.rs
 create mode 100644 src/test/ui/generator/dropck-resume.stderr
 create mode 100644 src/test/ui/generator/issue-64620-yield-array-element.rs
 create mode 100644 src/test/ui/generator/issue-64620-yield-array-element.stderr
 create mode 100644 src/test/ui/generator/issue-69017.rs
 create mode 100644 src/test/ui/generator/issue-69039.rs
 delete mode 100644 src/test/ui/generator/no-parameters-on-generators.rs
 delete mode 100644 src/test/ui/generator/no-parameters-on-generators.stderr
 create mode 100644 src/test/ui/generator/panic-drops-resume.rs
 create mode 100644 src/test/ui/generator/resume-arg-late-bound.rs
 create mode 100644 src/test/ui/generator/resume-arg-late-bound.stderr
 create mode 100644 src/test/ui/generator/resume-live-across-yield.rs
 create mode 100644 src/test/ui/generator/retain-resume-ref.rs
 create mode 100644 src/test/ui/generator/retain-resume-ref.stderr
 create mode 100644 src/test/ui/generator/smoke-resume-args.rs
 create mode 100644 src/test/ui/generator/too-many-parameters.rs
 create mode 100644 src/test/ui/generator/too-many-parameters.stderr
 create mode 100644 src/test/ui/generator/type-mismatch-error.rs
 create mode 100644 src/test/ui/generator/type-mismatch-error.stderr
 create mode 100644 src/test/ui/generic-associated-types/issue-68653.rs
 create mode 100644 src/test/ui/if-attrs/bad-cfg.rs
 create mode 100644 src/test/ui/if-attrs/bad-cfg.stderr
 create mode 100644 src/test/ui/if-attrs/builtin-if-attr.rs
 create mode 100644 src/test/ui/if-attrs/cfg-false-if-attr.rs
 create mode 100644 src/test/ui/if-attrs/else-attrs.rs
 create mode 100644 src/test/ui/if-attrs/else-attrs.stderr
 create mode 100644 src/test/ui/if-attrs/gate-whole-expr.rs
 create mode 100644 src/test/ui/if-attrs/let-chains-attr.rs
 create mode 100644 src/test/ui/if-attrs/let-chains-attr.stderr
 create mode 100644 src/test/ui/if-attrs/stmt-expr-gated.rs
 create mode 100644 src/test/ui/if-attrs/stmt-expr-gated.stderr
 create mode 100644 src/test/ui/impl-trait/equal-hidden-lifetimes.rs
 create mode 100644 src/test/ui/impl-trait/equal-hidden-lifetimes.stderr
 create mode 100644 src/test/ui/impl-trait/issue-57200.rs
 create mode 100644 src/test/ui/impl-trait/issue-57200.stderr
 create mode 100644 src/test/ui/impl-trait/issue-57201.rs
 create mode 100644 src/test/ui/impl-trait/issue-57201.stderr
 create mode 100644 src/test/ui/impl-trait/issue-60473.rs
 create mode 100644 src/test/ui/impl-trait/issue-60473.stderr
 create mode 100644 src/test/ui/impl-trait/issue-67166.rs
 create mode 100644 src/test/ui/impl-trait/issue-67166.stderr
 create mode 100644 src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.rs
 create mode 100644 src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr
 create mode 100644 src/test/ui/impl-trait/nested-return-type.rs
 create mode 100644 src/test/ui/impl-trait/unsafety-checking-cycle.rs
 create mode 100644 src/test/ui/inference/infer-binary-operand-behind-reference.rs
 create mode 100644 src/test/ui/invalid/invalid-no-sanitize.rs
 create mode 100644 src/test/ui/invalid/invalid-no-sanitize.stderr
 create mode 100644 src/test/ui/issues/auxiliary/issue-51798.rs
 create mode 100644 src/test/ui/issues/auxiliary/issue-69725.rs
 delete mode 100644 src/test/ui/issues/issue-22933-3.rs
 delete mode 100644 src/test/ui/issues/issue-22933-3.stderr
 create mode 100644 src/test/ui/issues/issue-51798.rs
 delete mode 100644 src/test/ui/issues/issue-53840.rs
 delete mode 100644 src/test/ui/issues/issue-53840.stderr
 create mode 100644 src/test/ui/issues/issue-68696-catch-during-unwind.rs
 create mode 100644 src/test/ui/issues/issue-69306.rs
 create mode 100644 src/test/ui/issues/issue-69306.stderr
 create mode 100644 src/test/ui/issues/issue-69602-type-err-during-codegen-ice.rs
 create mode 100644 src/test/ui/issues/issue-69602-type-err-during-codegen-ice.stderr
 create mode 100644 src/test/ui/issues/issue-69725.rs
 create mode 100644 src/test/ui/issues/issue-69725.stderr
 create mode 100644 src/test/ui/issues/issue-8460-const.noopt.stderr
 create mode 100644 src/test/ui/issues/issue-8460-const.opt.stderr
 create mode 100644 src/test/ui/issues/issue-8460-const.opt_with_overflow_checks.stderr
 delete mode 100644 src/test/ui/issues/issue-8460-const.stderr
 delete mode 100644 src/test/ui/issues/issue-8460-const2.rs
 delete mode 100644 src/test/ui/issues/issue-8460-const2.stderr
 create mode 100644 src/test/ui/layout/unsafe-cell-hides-niche.rs
 create mode 100644 src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr
 create mode 100644 src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr
 create mode 100644 src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
 delete mode 100644 src/test/ui/lint/lint-exceeding-bitshifts.stderr
 delete mode 100644 src/test/ui/lint/lint-exceeding-bitshifts2.rs
 delete mode 100644 src/test/ui/lint/lint-exceeding-bitshifts2.stderr
 create mode 100644 src/test/ui/macro_backtrace/main.-Zmacro-backtrace.stderr
 create mode 100644 src/test/ui/macro_backtrace/main.default.stderr
 delete mode 100644 src/test/ui/macro_backtrace/main.stderr
 create mode 100644 src/test/ui/macros/issue-68060.rs
 create mode 100644 src/test/ui/macros/issue-68060.stderr
 create mode 100644 src/test/ui/macros/issue-70446.rs
 create mode 100644 src/test/ui/methods/assign-to-method.rs
 create mode 100644 src/test/ui/methods/assign-to-method.stderr
 create mode 100644 src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
 delete mode 100644 src/test/ui/missing/missing-semicolon-warning.rs
 delete mode 100644 src/test/ui/missing/missing-semicolon-warning.stderr
 create mode 100644 src/test/ui/nll/user-annotations/type-annotation-with-hrtb.rs
 create mode 100644 src/test/ui/or-patterns/basic-switch.rs
 create mode 100644 src/test/ui/or-patterns/basic-switchint.rs
 create mode 100644 src/test/ui/or-patterns/bindings-runpass-1.rs
 create mode 100644 src/test/ui/or-patterns/bindings-runpass-2.rs
 create mode 100644 src/test/ui/or-patterns/box-patterns.rs
 delete mode 100644 src/test/ui/or-patterns/consistent-bindings.stderr
 delete mode 100644 src/test/ui/or-patterns/exhaustiveness-pass.stderr
 create mode 100644 src/test/ui/or-patterns/for-loop.rs
 create mode 100644 src/test/ui/or-patterns/if-let-while-let.rs
 create mode 100644 src/test/ui/or-patterns/issue-67514-irrefutable-param.rs
 create mode 100644 src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
 create mode 100644 src/test/ui/or-patterns/let-pattern.rs
 create mode 100644 src/test/ui/or-patterns/mix-with-wild.rs
 delete mode 100644 src/test/ui/or-patterns/or-pattern-mismatch.rs
 delete mode 100644 src/test/ui/or-patterns/or-pattern-mismatch.stderr
 create mode 100644 src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
 create mode 100644 src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
 create mode 100644 src/test/ui/or-patterns/or-patterns-default-binding-modes.rs
 delete mode 100644 src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr
 create mode 100644 src/test/ui/or-patterns/search-via-bindings.rs
 create mode 100644 src/test/ui/or-patterns/slice-patterns.rs
 create mode 100644 src/test/ui/or-patterns/struct-like.rs
 delete mode 100644 src/test/ui/overlap-marker-trait.rs
 delete mode 100644 src/test/ui/overlap-marker-trait.stderr
 create mode 100644 src/test/ui/parser/assoc-const-underscore-semantic-fail.rs
 create mode 100644 src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/assoc-static-semantic-fail.rs
 create mode 100644 src/test/ui/parser/assoc-static-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/assoc-static-syntactic-fail.rs
 create mode 100644 src/test/ui/parser/assoc-static-syntactic-fail.stderr
 create mode 100644 src/test/ui/parser/default-on-wrong-item-kind.rs
 create mode 100644 src/test/ui/parser/default-on-wrong-item-kind.stderr
 create mode 100644 src/test/ui/parser/default-unmatched-assoc.rs
 create mode 100644 src/test/ui/parser/default-unmatched-assoc.stderr
 create mode 100644 src/test/ui/parser/default-unmatched-extern.rs
 create mode 100644 src/test/ui/parser/default-unmatched-extern.stderr
 create mode 100644 src/test/ui/parser/default-unmatched.rs
 create mode 100644 src/test/ui/parser/default-unmatched.stderr
 create mode 100644 src/test/ui/parser/doc-comment-in-stmt.rs
 create mode 100644 src/test/ui/parser/doc-comment-in-stmt.stderr
 create mode 100644 src/test/ui/parser/extern-crate-async.rs
 create mode 100644 src/test/ui/parser/fn-body-optional-semantic-fail.rs
 create mode 100644 src/test/ui/parser/fn-body-optional-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/fn-body-optional-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/fn-header-semantic-fail.rs
 create mode 100644 src/test/ui/parser/fn-header-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/fn-header-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/foreign-const-semantic-fail.rs
 create mode 100644 src/test/ui/parser/foreign-const-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/foreign-const-syntactic-fail.rs
 create mode 100644 src/test/ui/parser/foreign-const-syntactic-fail.stderr
 create mode 100644 src/test/ui/parser/foreign-static-semantic-fail.rs
 create mode 100644 src/test/ui/parser/foreign-static-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/foreign-static-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/foreign-ty-semantic-fail.rs
 create mode 100644 src/test/ui/parser/foreign-ty-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/foreign-ty-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/inner-attr-in-trait-def.rs
 create mode 100644 src/test/ui/parser/issue-35813-postfix-after-cast.rs
 create mode 100644 src/test/ui/parser/issue-35813-postfix-after-cast.stderr
 create mode 100644 src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
 create mode 100644 src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
 create mode 100644 src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items.rs
 create mode 100644 src/test/ui/parser/issue-62894.rs
 create mode 100644 src/test/ui/parser/issue-62894.stderr
 create mode 100644 src/test/ui/parser/issue-68629.rs
 create mode 100644 src/test/ui/parser/issue-68629.stderr
 create mode 100644 src/test/ui/parser/issue-68730.rs
 create mode 100644 src/test/ui/parser/issue-68730.stderr
 create mode 100644 src/test/ui/parser/issue-68788-in-trait-item-propagation.rs
 create mode 100644 src/test/ui/parser/issue-68890.rs
 create mode 100644 src/test/ui/parser/issue-68890.stderr
 create mode 100644 src/test/ui/parser/issue-70050-ntliteral-accepts-negated-lit.rs
 create mode 100644 src/test/ui/parser/issue-70552-ascription-in-parens-after-call.rs
 create mode 100644 src/test/ui/parser/issue-70552-ascription-in-parens-after-call.stderr
 create mode 100644 src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
 create mode 100644 src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
 create mode 100644 src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/item-free-type-bounds-semantic-fail.rs
 create mode 100644 src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs
 create mode 100644 src/test/ui/parser/missing-semicolon.rs
 create mode 100644 src/test/ui/parser/missing-semicolon.stderr
 create mode 100644 src/test/ui/parser/qualified-path-in-turbofish.fixed
 create mode 100644 src/test/ui/parser/qualified-path-in-turbofish.rs
 create mode 100644 src/test/ui/parser/qualified-path-in-turbofish.stderr
 delete mode 100644 src/test/ui/parser/recovery-attr-on-if.rs
 delete mode 100644 src/test/ui/parser/recovery-attr-on-if.stderr
 delete mode 100644 src/test/ui/parser/removed-syntax-extern-const.rs
 delete mode 100644 src/test/ui/parser/removed-syntax-extern-const.stderr
 create mode 100644 src/test/ui/parser/self-param-semantic-fail.rs
 create mode 100644 src/test/ui/parser/self-param-semantic-fail.stderr
 create mode 100644 src/test/ui/parser/self-param-syntactic-pass.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr
 create mode 100644 src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr
 create mode 100644 src/test/ui/pattern/bindings-after-at/box-patterns.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr
 create mode 100644 src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr
 create mode 100644 src/test/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/or-patterns.rs
 create mode 100644 src/test/ui/pattern/bindings-after-at/slice-patterns.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
 create mode 100644 src/test/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.stderr
 create mode 100644 src/test/ui/pattern/move-ref-patterns/issue-53840.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr
 create mode 100644 src/test/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs
 create mode 100644 src/test/ui/proc-macro/auxiliary/generate-dollar-ident.rs
 create mode 100644 src/test/ui/proc-macro/auxiliary/issue-59191.rs
 create mode 100644 src/test/ui/proc-macro/generate-dollar-ident.rs
 create mode 100644 src/test/ui/proc-macro/issue-59191-replace-root-with-fn.rs
 create mode 100644 src/test/ui/proc-macro/issue-59191-replace-root-with-fn.stderr
 create mode 100644 src/test/ui/proc-macro/trait-fn-args-2015.rs
 create mode 100644 src/test/ui/recursion_limit/empty.rs
 create mode 100644 src/test/ui/recursion_limit/empty.stderr
 create mode 100644 src/test/ui/recursion_limit/invalid_digit.rs
 create mode 100644 src/test/ui/recursion_limit/invalid_digit.stderr
 create mode 100644 src/test/ui/recursion_limit/overflow.rs
 create mode 100644 src/test/ui/recursion_limit/overflow.stderr
 create mode 100644 src/test/ui/recursion_limit/zero.rs
 create mode 100644 src/test/ui/recursion_limit/zero.stderr
 create mode 100644 src/test/ui/repr/feature-gate-no-niche.rs
 create mode 100644 src/test/ui/repr/feature-gate-no-niche.stderr
 create mode 100644 src/test/ui/repr/repr-no-niche-inapplicable-to-unions.rs
 create mode 100644 src/test/ui/repr/repr-no-niche-inapplicable-to-unions.stderr
 create mode 100644 src/test/ui/repr/repr-no-niche.rs
 create mode 100644 src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
 create mode 100644 src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
 create mode 100644 src/test/ui/resolve/typo-suggestion-named-underscore.rs
 create mode 100644 src/test/ui/resolve/typo-suggestion-named-underscore.stderr
 create mode 100644 src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
 create mode 100644 src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/stability.rs
 create mode 100644 src/test/ui/rfc-2632-const-trait-impl/stability.stderr
 create mode 100644 src/test/ui/rfc1623-2.rs
 create mode 100644 src/test/ui/rfc1623-2.stderr
 create mode 100644 src/test/ui/sanitize-inline-always.rs
 create mode 100644 src/test/ui/sanitize-inline-always.stderr
 create mode 100644 src/test/ui/sanitize/address.rs
 create mode 100644 src/test/ui/sanitize/badfree.rs
 rename src/test/ui/{sanitize-cfg.rs => sanitize/cfg.rs} (100%)
 rename src/test/ui/{sanitizer-leak.rs => sanitize/leak.rs} (100%)
 rename src/test/ui/{sanitizer-memory.rs => sanitize/memory.rs} (100%)
 create mode 100644 src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
 rename src/test/ui/{sanitizer-unsupported-target.rs => sanitize/unsupported-target.rs} (100%)
 rename src/test/ui/{sanitizer-unsupported-target.stderr => sanitize/unsupported-target.stderr} (100%)
 create mode 100644 src/test/ui/sanitize/use-after-scope.rs
 delete mode 100644 src/test/ui/sanitizer-address.rs
 create mode 100644 src/test/ui/save-analysis/issue-68621.rs
 create mode 100644 src/test/ui/save-analysis/issue-68621.stderr
 create mode 100644 src/test/ui/shadow-bool.rs
 create mode 100644 src/test/ui/specialization/issue-39618.rs
 create mode 100644 src/test/ui/specialization/soundness/partial_eq_range_inclusive.rs
 create mode 100644 src/test/ui/specialization/soundness/partial_ord_slice.rs
 create mode 100644 src/test/ui/suggestions/const-in-struct-pat.rs
 create mode 100644 src/test/ui/suggestions/const-in-struct-pat.stderr
 create mode 100644 src/test/ui/suggestions/expected-boxed-future-isnt-pinned.rs
 create mode 100644 src/test/ui/suggestions/expected-boxed-future-isnt-pinned.stderr
 create mode 100644 src/test/ui/suggestions/fn-missing-lifetime-in-item.rs
 create mode 100644 src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr
 create mode 100644 src/test/ui/suggestions/impl-trait-missing-lifetime.rs
 create mode 100644 src/test/ui/suggestions/impl-trait-missing-lifetime.stderr
 create mode 100644 src/test/ui/suggestions/method-missing-parentheses.rs
 create mode 100644 src/test/ui/suggestions/method-missing-parentheses.stderr
 create mode 100644 src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed
 create mode 100644 src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs
 create mode 100644 src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr
 create mode 100644 src/test/ui/suggestions/missing-assoc-fn.rs
 create mode 100644 src/test/ui/suggestions/missing-assoc-fn.stderr
 create mode 100644 src/test/ui/suggestions/missing-trait-bounds-for-method-call.rs
 create mode 100644 src/test/ui/suggestions/missing-trait-bounds-for-method-call.stderr
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-references-self.rs
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-references-self.stderr
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-should-use-self.rs
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs
 create mode 100644 src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr
 create mode 100644 src/test/ui/suggestions/struct-initializer-comma.rs
 create mode 100644 src/test/ui/suggestions/struct-initializer-comma.stderr
 create mode 100644 src/test/ui/suggestions/suggest-split-at-mut.rs
 create mode 100644 src/test/ui/suggestions/suggest-split-at-mut.stderr
 create mode 100644 src/test/ui/test-panic-abort-nocapture.rs
 create mode 100644 src/test/ui/test-panic-abort-nocapture.run.stderr
 create mode 100644 src/test/ui/test-panic-abort-nocapture.run.stdout
 create mode 100644 src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs
 create mode 100644 src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr
 delete mode 100644 src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs
 delete mode 100644 src/test/ui/traits/overlap-permitted-for-marker-traits.rs
 create mode 100644 src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs
 create mode 100644 src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr
 create mode 100644 src/test/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs
 create mode 100644 src/test/ui/typeck/typeck_type_placeholder_item.rs
 create mode 100644 src/test/ui/typeck/typeck_type_placeholder_item.stderr
 create mode 100644 src/test/ui/use-module-level-int-consts.rs
 create mode 100755 src/tools/linkchecker/linkcheck.sh
 delete mode 100644 vendor/chalk-engine/.cargo-checksum.json
 delete mode 100644 vendor/chalk-engine/Cargo.toml
 delete mode 100644 vendor/chalk-engine/README.md
 delete mode 100644 vendor/chalk-engine/src/README.md
 delete mode 100644 vendor/chalk-engine/src/context.rs
 delete mode 100644 vendor/chalk-engine/src/context/prelude.rs
 delete mode 100644 vendor/chalk-engine/src/derived.rs
 delete mode 100644 vendor/chalk-engine/src/fallible.rs
 delete mode 100644 vendor/chalk-engine/src/forest.rs
 delete mode 100644 vendor/chalk-engine/src/hh.rs
 delete mode 100644 vendor/chalk-engine/src/lib.rs
 delete mode 100644 vendor/chalk-engine/src/logic.rs
 delete mode 100644 vendor/chalk-engine/src/simplify.rs
 delete mode 100644 vendor/chalk-engine/src/stack.rs
 delete mode 100644 vendor/chalk-engine/src/strand.rs
 delete mode 100644 vendor/chalk-engine/src/table.rs
 delete mode 100644 vendor/chalk-engine/src/tables.rs
 delete mode 100644 vendor/chalk-macros/.cargo-checksum.json
 delete mode 100644 vendor/chalk-macros/Cargo.toml
 delete mode 100644 vendor/chalk-macros/README.md
 delete mode 100644 vendor/chalk-macros/src/index.rs
 delete mode 100644 vendor/chalk-macros/src/lib.rs
 create mode 100644 vendor/crossbeam-channel/Cargo.lock
 create mode 100644 vendor/crossbeam-channel/benches/crossbeam.rs
 create mode 100644 vendor/crossbeam-channel/tests/same_channel.rs
 create mode 100644 vendor/crossbeam-utils/.cargo-checksum.json
 create mode 100644 vendor/crossbeam-utils/CHANGELOG.md
 create mode 100644 vendor/crossbeam-utils/Cargo.toml
 rename vendor/{lazy_static-0.2.11 => crossbeam-utils}/LICENSE-APACHE (100%)
 create mode 100644 vendor/crossbeam-utils/LICENSE-MIT
 create mode 100644 vendor/crossbeam-utils/README.md
 create mode 100644 vendor/crossbeam-utils/benches/atomic_cell.rs
 create mode 100644 vendor/crossbeam-utils/build.rs
 create mode 100644 vendor/crossbeam-utils/src/atomic/atomic_cell.rs
 create mode 100644 vendor/crossbeam-utils/src/atomic/consume.rs
 create mode 100644 vendor/crossbeam-utils/src/atomic/mod.rs
 create mode 100644 vendor/crossbeam-utils/src/atomic/seq_lock.rs
 create mode 100644 vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs
 create mode 100644 vendor/crossbeam-utils/src/backoff.rs
 create mode 100644 vendor/crossbeam-utils/src/cache_padded.rs
 create mode 100644 vendor/crossbeam-utils/src/lib.rs
 create mode 100644 vendor/crossbeam-utils/src/sync/mod.rs
 create mode 100644 vendor/crossbeam-utils/src/sync/parker.rs
 create mode 100644 vendor/crossbeam-utils/src/sync/sharded_lock.rs
 create mode 100644 vendor/crossbeam-utils/src/sync/wait_group.rs
 create mode 100644 vendor/crossbeam-utils/src/thread.rs
 create mode 100644 vendor/crossbeam-utils/tests/atomic_cell.rs
 create mode 100644 vendor/crossbeam-utils/tests/cache_padded.rs
 create mode 100644 vendor/crossbeam-utils/tests/parker.rs
 create mode 100644 vendor/crossbeam-utils/tests/sharded_lock.rs
 create mode 100644 vendor/crossbeam-utils/tests/thread.rs
 create mode 100644 vendor/crossbeam-utils/tests/wait_group.rs
 delete mode 100644 vendor/filetime/appveyor.yml
 create mode 100644 vendor/filetime/src/unix/macos.rs
 create mode 100644 vendor/filetime/src/wasm.rs
 delete mode 100644 vendor/kernel32-sys/.cargo-checksum.json
 delete mode 100644 vendor/kernel32-sys/Cargo.toml
 delete mode 100644 vendor/kernel32-sys/README.md
 delete mode 100644 vendor/kernel32-sys/build.rs
 delete mode 100644 vendor/kernel32-sys/src/lib.rs
 delete mode 100644 vendor/lazy_static-0.2.11/.cargo-checksum.json
 delete mode 100644 vendor/lazy_static-0.2.11/Cargo.toml
 delete mode 100644 vendor/lazy_static-0.2.11/LICENSE-MIT
 delete mode 100644 vendor/lazy_static-0.2.11/README.md
 delete mode 100644 vendor/lazy_static-0.2.11/appveyor.yml
 delete mode 100644 vendor/lazy_static-0.2.11/src/core_lazy.rs
 delete mode 100644 vendor/lazy_static-0.2.11/src/lazy.rs
 delete mode 100644 vendor/lazy_static-0.2.11/src/lib.rs
 delete mode 100644 vendor/lazy_static-0.2.11/src/nightly_lazy.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/compile-fail/README.md
 delete mode 100644 vendor/lazy_static-0.2.11/tests/compile-fail/incorrect_visibility_restriction.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/compile-fail/static_is_private.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/compile-fail/static_is_sized.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/compile-fail/static_never_used.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/compile_tests.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/no_std.rs
 delete mode 100644 vendor/lazy_static-0.2.11/tests/test.rs
 create mode 100644 vendor/memchr/rustfmt.toml
 create mode 100644 vendor/memchr/src/tests/miri.rs
 rename vendor/{parking_lot => parking_lot-0.9.0}/.cargo-checksum.json (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/CHANGELOG.md (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/Cargo.toml (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/LICENSE-APACHE (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/LICENSE-MIT (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/README.md (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/appveyor.yml (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/build.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/condvar.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/deadlock.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/elision.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/lib.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/mutex.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/once.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/raw_mutex.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/raw_rwlock.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/remutex.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/rwlock.rs (100%)
 rename vendor/{parking_lot => parking_lot-0.9.0}/src/util.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/.cargo-checksum.json (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/Cargo.toml (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/LICENSE-APACHE (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/LICENSE-MIT (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/build.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/lib.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/parking_lot.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/spinwait.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/cloudabi.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/generic.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/linux.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/mod.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/redox.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/sgx.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/unix.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/wasm.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/wasm_atomic.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/windows/keyed_event.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/windows/mod.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/thread_parker/windows/waitaddress.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/util.rs (100%)
 rename vendor/{parking_lot_core => parking_lot_core-0.6.2}/src/word_lock.rs (100%)
 delete mode 100644 vendor/pulldown-cmark-0.5.3/.cargo-checksum.json
 delete mode 100644 vendor/pulldown-cmark-0.5.3/CONTRIBUTING.md
 delete mode 100644 vendor/pulldown-cmark-0.5.3/Cargo.toml
 delete mode 100644 vendor/pulldown-cmark-0.5.3/README.md
 delete mode 100644 vendor/pulldown-cmark-0.5.3/azure-pipelines.yml
 delete mode 100644 vendor/pulldown-cmark-0.5.3/benches/lib.rs
 delete mode 100644 vendor/pulldown-cmark-0.5.3/specs/footnotes.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/specs/regression.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/specs/table.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/src/lib.rs
 delete mode 100644 vendor/pulldown-cmark-0.5.3/src/main.rs
 delete mode 100644 vendor/pulldown-cmark-0.5.3/tests/suite/regression.rs
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/CommonMark/LICENSE
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/CommonMark/README.google
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/CommonMark/spec.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/GitHub/LICENSE
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_strikethrough.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_table.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_tasklist.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/GitHub/spec.txt
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/xi-editor/LICENSE
 delete mode 100644 vendor/pulldown-cmark-0.5.3/third_party/xi-editor/crdt.md
 delete mode 100644 vendor/pulldown-cmark-0.5.3/tools/mk_entities.py
 delete mode 100644 vendor/pulldown-cmark-0.5.3/tools/mk_puncttable.py
 create mode 100644 vendor/pulldown-cmark-0.6.1/.cargo-checksum.json
 create mode 100644 vendor/pulldown-cmark-0.6.1/CONTRIBUTING.md
 create mode 100644 vendor/pulldown-cmark-0.6.1/Cargo.lock
 create mode 100644 vendor/pulldown-cmark-0.6.1/Cargo.toml
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/LICENSE (100%)
 create mode 100644 vendor/pulldown-cmark-0.6.1/README.md
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/benches/html_rendering.rs (100%)
 create mode 100644 vendor/pulldown-cmark-0.6.1/benches/lib.rs
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/build.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/examples/event-filter.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/examples/string-to-string.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/entities.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/escape.rs (90%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/html.rs (96%)
 create mode 100644 vendor/pulldown-cmark-0.6.1/src/lib.rs
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/linklabel.rs (85%)
 create mode 100644 vendor/pulldown-cmark-0.6.1/src/main.rs
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/parse.rs (85%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/puncttable.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/scanners.rs (86%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/simd.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/strings.rs (86%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/src/tree.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/errors.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/html.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/lib.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/footnotes.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/gfm_strikethrough.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/gfm_table.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/gfm_tasklist.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/mod.rs (100%)
 create mode 100644 vendor/pulldown-cmark-0.6.1/tests/suite/regression.rs
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/spec.rs (100%)
 rename vendor/{pulldown-cmark-0.5.3 => pulldown-cmark-0.6.1}/tests/suite/table.rs (100%)
 delete mode 100644 vendor/tar/tests/archives/directory.tar
 delete mode 100644 vendor/tar/tests/archives/duplicate_dirs.tar
 delete mode 100644 vendor/tar/tests/archives/empty_filename.tar
 delete mode 100644 vendor/tar/tests/archives/file_times.tar
 delete mode 100644 vendor/tar/tests/archives/link.tar
 delete mode 100644 vendor/tar/tests/archives/pax.tar
 delete mode 100644 vendor/tar/tests/archives/pax2.tar
 delete mode 100644 vendor/tar/tests/archives/reading_files.tar
 delete mode 100644 vendor/tar/tests/archives/simple.tar
 delete mode 100644 vendor/tar/tests/archives/simple_missing_last_header.tar
 delete mode 100644 vendor/tar/tests/archives/spaces.tar
 delete mode 100644 vendor/tar/tests/archives/sparse.tar
 delete mode 100644 vendor/tar/tests/archives/xattrs.tar
 delete mode 100644 vendor/term_size/.cargo-checksum.json
 delete mode 100644 vendor/term_size/CHANGELOG.md
 delete mode 100644 vendor/term_size/CONTRIBUTORS.md
 delete mode 100644 vendor/term_size/Cargo.toml
 delete mode 100644 vendor/term_size/LICENSE-MIT
 delete mode 100644 vendor/term_size/README.md
 delete mode 100644 vendor/term_size/appveyor.yml
 delete mode 100644 vendor/term_size/index.html
 delete mode 100644 vendor/term_size/justfile
 delete mode 100644 vendor/term_size/rustfmt.toml
 delete mode 100644 vendor/term_size/src/lib.rs
 create mode 100644 vendor/termize/.cargo-checksum.json
 create mode 100644 vendor/termize/CHANGELOG.md
 create mode 100644 vendor/termize/CODE_OF_CONDUCT.md
 create mode 100644 vendor/termize/CONTRIBUTING.md
 create mode 100644 vendor/termize/Cargo.toml
 rename vendor/{term_size => termize}/LICENSE-APACHE (100%)
 create mode 100644 vendor/termize/LICENSE-MIT
 create mode 100644 vendor/termize/README.md
 create mode 100644 vendor/termize/src/lib.rs
 create mode 100644 vendor/termize/src/platform/mod.rs
 create mode 100644 vendor/termize/src/platform/unix.rs
 create mode 100644 vendor/termize/src/platform/unsupported.rs
 create mode 100644 vendor/termize/src/platform/windows.rs
 create mode 100644 vendor/thread_local-0.3.6/.cargo-checksum.json
 create mode 100644 vendor/thread_local-0.3.6/Cargo.toml
 rename vendor/{version_check-0.1.5 => thread_local-0.3.6}/LICENSE-APACHE (100%)
 create mode 100644 vendor/thread_local-0.3.6/LICENSE-MIT
 create mode 100644 vendor/thread_local-0.3.6/README.md
 create mode 100644 vendor/thread_local-0.3.6/benches/thread_local.rs
 create mode 100644 vendor/thread_local-0.3.6/src/lib.rs
 create mode 100644 vendor/thread_local-0.3.6/src/thread_id.rs
 create mode 100644 vendor/thread_local-0.3.6/src/unreachable.rs
 create mode 100644 vendor/thread_local/src/cached.rs
 delete mode 100644 vendor/version_check-0.1.5/.cargo-checksum.json
 delete mode 100644 vendor/version_check-0.1.5/Cargo.toml
 delete mode 100644 vendor/version_check-0.1.5/README.md
 delete mode 100644 vendor/version_check-0.1.5/src/lib.rs
 create mode 100644 vendor/version_check/.cargo-checksum.json
 create mode 100644 vendor/version_check/Cargo.toml
 create mode 100644 vendor/version_check/LICENSE-APACHE
 rename vendor/{version_check-0.1.5 => version_check}/LICENSE-MIT (100%)
 create mode 100644 vendor/version_check/README.md
 create mode 100644 vendor/version_check/src/channel.rs
 create mode 100644 vendor/version_check/src/date.rs
 create mode 100644 vendor/version_check/src/lib.rs
 create mode 100644 vendor/version_check/src/version.rs
 delete mode 100644 vendor/winapi-0.2.8/.cargo-checksum.json
 delete mode 100644 vendor/winapi-0.2.8/Cargo.toml
 delete mode 100644 vendor/winapi-0.2.8/LICENSE.md
 delete mode 100644 vendor/winapi-0.2.8/src/activation.rs
 delete mode 100644 vendor/winapi-0.2.8/src/audioclient.rs
 delete mode 100644 vendor/winapi-0.2.8/src/audiosessiontypes.rs
 delete mode 100644 vendor/winapi-0.2.8/src/basetsd.rs
 delete mode 100644 vendor/winapi-0.2.8/src/bcrypt.rs
 delete mode 100644 vendor/winapi-0.2.8/src/cfg.rs
 delete mode 100644 vendor/winapi-0.2.8/src/cfgmgr32.rs
 delete mode 100644 vendor/winapi-0.2.8/src/combaseapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/commctrl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/commdlg.rs
 delete mode 100644 vendor/winapi-0.2.8/src/corsym.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d2d1.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d2dbasetypes.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d10shader.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d11.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d11shader.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d12.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d12sdklayers.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d12shader.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d9.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d9caps.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3d9types.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3dcommon.rs
 delete mode 100644 vendor/winapi-0.2.8/src/d3dcompiler.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dbghelp.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dcommon.rs
 delete mode 100644 vendor/winapi-0.2.8/src/devpropdef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/docobj.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dpapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dsgetdc.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dsound.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dsrole.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dwmapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dwrite.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dxgi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dxgi1_2.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dxgi1_3.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dxgi1_4.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dxgiformat.rs
 delete mode 100644 vendor/winapi-0.2.8/src/dxgitype.rs
 delete mode 100644 vendor/winapi-0.2.8/src/errhandlingapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/excpt.rs
 delete mode 100644 vendor/winapi-0.2.8/src/fileapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/gl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/guiddef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/heapapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/hidclass.rs
 delete mode 100644 vendor/winapi-0.2.8/src/hidpi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/hidsdi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/hidusage.rs
 delete mode 100644 vendor/winapi-0.2.8/src/hstring.rs
 delete mode 100644 vendor/winapi-0.2.8/src/http.rs
 delete mode 100644 vendor/winapi-0.2.8/src/imm.rs
 delete mode 100644 vendor/winapi-0.2.8/src/inaddr.rs
 delete mode 100644 vendor/winapi-0.2.8/src/inspectable.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ksmedia.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lib.rs
 delete mode 100644 vendor/winapi-0.2.8/src/libloaderapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lmaccess.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lmcons.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lmdfs.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lmerrlog.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lmjoin.rs
 delete mode 100644 vendor/winapi-0.2.8/src/lsalookup.rs
 delete mode 100644 vendor/winapi-0.2.8/src/macros.rs
 delete mode 100644 vendor/winapi-0.2.8/src/memoryapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/minschannel.rs
 delete mode 100644 vendor/winapi-0.2.8/src/minwinbase.rs
 delete mode 100644 vendor/winapi-0.2.8/src/minwindef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/mmdeviceapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/mmreg.rs
 delete mode 100644 vendor/winapi-0.2.8/src/mmsystem.rs
 delete mode 100644 vendor/winapi-0.2.8/src/mscat.rs
 delete mode 100644 vendor/winapi-0.2.8/src/mssip.rs
 delete mode 100644 vendor/winapi-0.2.8/src/nb30.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ncrypt.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ntdef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ntsecapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ntstatus.rs
 delete mode 100644 vendor/winapi-0.2.8/src/oaidl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/objbase.rs
 delete mode 100644 vendor/winapi-0.2.8/src/objidl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/objidlbase.rs
 delete mode 100644 vendor/winapi-0.2.8/src/olectl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/pdh.rs
 delete mode 100644 vendor/winapi-0.2.8/src/playsoundapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/processsnapshot.rs
 delete mode 100644 vendor/winapi-0.2.8/src/processthreadsapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/propidl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/propsys.rs
 delete mode 100644 vendor/winapi-0.2.8/src/prsht.rs
 delete mode 100644 vendor/winapi-0.2.8/src/psapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/qos.rs
 delete mode 100644 vendor/winapi-0.2.8/src/reason.rs
 delete mode 100644 vendor/winapi-0.2.8/src/restrictederrorinfo.rs
 delete mode 100644 vendor/winapi-0.2.8/src/roapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/roerrorapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/rpc.rs
 delete mode 100644 vendor/winapi-0.2.8/src/rpcdce.rs
 delete mode 100644 vendor/winapi-0.2.8/src/sapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/schannel.rs
 delete mode 100644 vendor/winapi-0.2.8/src/servprov.rs
 delete mode 100644 vendor/winapi-0.2.8/src/setupapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/shellapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/shellscalingapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/shlguid.rs
 delete mode 100644 vendor/winapi-0.2.8/src/shlobj.rs
 delete mode 100644 vendor/winapi-0.2.8/src/shobjidl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/shtypes.rs
 delete mode 100644 vendor/winapi-0.2.8/src/spapidef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/sql.rs
 delete mode 100644 vendor/winapi-0.2.8/src/sqltypes.rs
 delete mode 100644 vendor/winapi-0.2.8/src/sspi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/strmif.rs
 delete mode 100644 vendor/winapi-0.2.8/src/subauth.rs
 delete mode 100644 vendor/winapi-0.2.8/src/synchapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/sysinfoapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/threadpoolapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/timezoneapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/tlhelp32.rs
 delete mode 100644 vendor/winapi-0.2.8/src/unknwnbase.rs
 delete mode 100644 vendor/winapi-0.2.8/src/urlhist.rs
 delete mode 100644 vendor/winapi-0.2.8/src/urlmon.rs
 delete mode 100644 vendor/winapi-0.2.8/src/usb.rs
 delete mode 100644 vendor/winapi-0.2.8/src/usbspec.rs
 delete mode 100644 vendor/winapi-0.2.8/src/usp10.rs
 delete mode 100644 vendor/winapi-0.2.8/src/vadefs.rs
 delete mode 100644 vendor/winapi-0.2.8/src/vsbackup.rs
 delete mode 100644 vendor/winapi-0.2.8/src/vss.rs
 delete mode 100644 vendor/winapi-0.2.8/src/vsserror.rs
 delete mode 100644 vendor/winapi-0.2.8/src/vswriter.rs
 delete mode 100644 vendor/winapi-0.2.8/src/werapi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winbase.rs
 delete mode 100644 vendor/winapi-0.2.8/src/wincon.rs
 delete mode 100644 vendor/winapi-0.2.8/src/wincred.rs
 delete mode 100644 vendor/winapi-0.2.8/src/wincrypt.rs
 delete mode 100644 vendor/winapi-0.2.8/src/windef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/windowscodecs.rs
 delete mode 100644 vendor/winapi-0.2.8/src/windowsx.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winerror.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winevt.rs
 delete mode 100644 vendor/winapi-0.2.8/src/wingdi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winhttp.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winioctl.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winnetwk.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winnls.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winnt.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winreg.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winscard.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winsmcrd.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winsock2.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winspool.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winstring.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winsvc.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winusb.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winusbio.rs
 delete mode 100644 vendor/winapi-0.2.8/src/winuser.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ws2def.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ws2ipdef.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ws2spi.rs
 delete mode 100644 vendor/winapi-0.2.8/src/ws2tcpip.rs
 delete mode 100644 vendor/winapi-0.2.8/src/wtypes.rs
 delete mode 100644 vendor/winapi-0.2.8/src/wtypesbase.rs
 delete mode 100644 vendor/winapi-0.2.8/src/xinput.rs
 delete mode 100644 vendor/winapi-build/.cargo-checksum.json
 delete mode 100644 vendor/winapi-build/Cargo.toml
 delete mode 100644 vendor/winapi-build/src/lib.rs

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fc8ca5d07b..d6840b20c8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -50,6 +50,9 @@ is a bug or not, feel free to file a bug anyway.
 **If you believe reporting your bug publicly represents a security risk to Rust users,
 please follow our [instructions for reporting security vulnerabilities](https://www.rust-lang.org/policies/security)**.
 
+If you're using the nightly channel, please check if the bug exists in the
+latest toolchain before filing your bug. It might be fixed already.
+
 If you have the chance, before reporting a bug, please [search existing
 issues](https://github.com/rust-lang/rust/search?q=&type=Issues&utf8=%E2%9C%93),
 as it's possible that someone else has already reported your error. This doesn't
diff --git a/Cargo.lock b/Cargo.lock
index 80c90243e5..d41517cd4f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -121,9 +121,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
 
 [[package]]
 name = "backtrace"
-version = "0.3.40"
+version = "0.3.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"
+checksum = "e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536"
 dependencies = [
  "backtrace-sys",
  "cfg-if",
@@ -281,7 +281,7 @@ dependencies = [
 
 [[package]]
 name = "cargo"
-version = "0.43.0"
+version = "0.44.0"
 dependencies = [
  "anyhow",
  "atty",
@@ -292,6 +292,7 @@ dependencies = [
  "clap",
  "core-foundation 0.7.0",
  "crates-io",
+ "crossbeam-channel",
  "crossbeam-utils 0.7.0",
  "crypto-hash",
  "curl",
@@ -418,25 +419,6 @@ dependencies = [
  "rustc-std-workspace-core",
 ]
 
-[[package]]
-name = "chalk-engine"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ec698a6f053a23bfbe646d9f2fde4b02abc19125595270a99e6f44ae0bdd1a"
-dependencies = [
- "chalk-macros",
- "rustc-hash",
-]
-
-[[package]]
-name = "chalk-macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "295635afd6853aa9f20baeb7f0204862440c0fe994c5a253d5f479dac41d047e"
-dependencies = [
- "lazy_static 0.2.11",
-]
-
 [[package]]
 name = "chrono"
 version = "0.4.6"
@@ -473,7 +455,6 @@ dependencies = [
  "clippy_lints",
  "compiletest_rs",
  "derive-new",
- "git2",
  "lazy_static 1.4.0",
  "regex",
  "rustc-workspace-hack",
@@ -497,7 +478,7 @@ dependencies = [
  "itertools 0.8.0",
  "lazy_static 1.4.0",
  "matches",
- "pulldown-cmark 0.6.1",
+ "pulldown-cmark 0.7.0",
  "quine-mc_cluskey",
  "regex-syntax",
  "semver",
@@ -721,12 +702,11 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.8"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"
+checksum = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
 dependencies = [
- "crossbeam-utils 0.6.5",
- "smallvec 0.6.10",
+ "crossbeam-utils 0.7.0",
 ]
 
 [[package]]
@@ -879,14 +859,13 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.13.0"
+version = "0.99.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f57d78cf3bd45270dad4e70c21ec77a960b36c7a841ff9db76aaa775a8fb871"
+checksum = "2159be042979966de68315bce7034bb000c775f22e3e834e1c52ff78f041cae8"
 dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.12",
- "rustc_version",
- "syn 0.15.35",
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.11",
 ]
 
 [[package]]
@@ -1077,13 +1056,14 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 
 [[package]]
 name = "filetime"
-version = "0.2.4"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646"
+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
+ "winapi 0.3.8",
 ]
 
 [[package]]
@@ -1254,9 +1234,9 @@ dependencies = [
 
 [[package]]
 name = "git2"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4"
+checksum = "b7da16ceafe24cedd9ba02c4463a2b506b6493baf4317c79c5acb553134a3c15"
 dependencies = [
  "bitflags",
  "libc",
@@ -1269,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "git2-curl"
-version = "0.12.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2559abb1d87d27668d31bd868a000f0e2e0065d10e78961b62da95d7a7f1cc7"
+checksum = "502d532a2d06184beb3bc869d4d90236e60934e3382c921b203fa3c33e212bd7"
 dependencies = [
  "curl",
  "git2",
@@ -1537,9 +1517,9 @@ checksum = "c3360c7b59e5ffa2653671fb74b4741a5d343c03f331c0a4aeda42b5c2b0ec7d"
 
 [[package]]
 name = "ignore"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7"
+checksum = "522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e"
 dependencies = [
  "crossbeam-channel",
  "globset",
@@ -1548,7 +1528,7 @@ dependencies = [
  "memchr",
  "regex",
  "same-file",
- "thread_local",
+ "thread_local 1.0.1",
  "walkdir",
  "winapi-util",
 ]
@@ -1564,7 +1544,7 @@ dependencies = [
  "rand_xoshiro",
  "sized-chunks",
  "typenum",
- "version_check 0.9.1",
+ "version_check",
 ]
 
 [[package]]
@@ -1657,9 +1637,9 @@ checksum = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
 
 [[package]]
 name = "jsonrpc-client-transports"
-version = "13.1.0"
+version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39577db48b004cffb4c5b8e5c9b993c177c52599ecbee88711e815acf65144db"
+checksum = "0a9ae166c4d1f702d297cd76d4b55758ace80272ffc6dbb139fdc1bf810de40b"
 dependencies = [
  "failure",
  "futures",
@@ -1676,9 +1656,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core"
-version = "13.2.0"
+version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d767c183a7e58618a609499d359ce3820700b3ebb4823a18c343b4a2a41a0d"
+checksum = "fe3b688648f1ef5d5072229e2d672ecb92cbff7d1c79bcf3fd5898f3f3df0970"
 dependencies = [
  "futures",
  "log",
@@ -1689,63 +1669,62 @@ dependencies = [
 
 [[package]]
 name = "jsonrpc-core-client"
-version = "13.1.0"
+version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f047c10738edee7c3c6acf5241a0ce33df32ef9230c1a7fb03e4a77ee72c992f"
+checksum = "080dc110be17701097df238fad3c816d4a478a1899dfbcf8ec8957dd40ec7304"
 dependencies = [
  "jsonrpc-client-transports",
 ]
 
 [[package]]
 name = "jsonrpc-derive"
-version = "13.1.0"
+version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f9149f785deaae92a4c834a9a1a83a4313b8cfedccf15362cd4cf039a64501"
+checksum = "8609af8f63b626e8e211f52441fcdb6ec54f1a446606b10d5c89ae9bf8a20058"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 0.4.30",
- "quote 0.6.12",
- "syn 0.15.35",
+ "proc-macro2 1.0.3",
+ "quote 1.0.2",
+ "syn 1.0.11",
 ]
 
 [[package]]
 name = "jsonrpc-ipc-server"
-version = "13.1.0"
+version = "14.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256c5e4292c17b4c2ecdf542299dc8e9d6b3939c075c54825570ad9317fe5751"
+checksum = "b579cd0840d7db3ebaadf52f6f31ec601a260e78d610e44f68634f919e34497a"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-server-utils",
  "log",
  "parity-tokio-ipc",
- "parking_lot",
+ "parking_lot 0.9.0",
  "tokio-service",
 ]
 
 [[package]]
 name = "jsonrpc-pubsub"
-version = "13.1.0"
+version = "14.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2c08b444cc0ed70263798834343d0ac875e664257df8079160f23ac1ea79446"
+checksum = "5b31c9b90731276fdd24d896f31bb10aecf2e5151733364ae81123186643d939"
 dependencies = [
  "jsonrpc-core",
  "log",
- "parking_lot",
+ "parking_lot 0.10.0",
  "serde",
 ]
 
 [[package]]
 name = "jsonrpc-server-utils"
-version = "13.1.0"
+version = "14.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44561bfdd31401bad790527f1e951dde144f2341ddc3e1b859d32945e1a34eff"
+checksum = "95b7635e618a0edbbe0d2a2bbbc69874277c49383fcf6c3c0414491cfb517d22"
 dependencies = [
  "bytes",
  "globset",
  "jsonrpc-core",
  "lazy_static 1.4.0",
  "log",
- "num_cpus",
  "tokio",
  "tokio-codec",
  "unicase",
@@ -1790,9 +1769,9 @@ dependencies = [
 
 [[package]]
 name = "libgit2-sys"
-version = "0.10.0"
+version = "0.12.0+0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9ec6bca50549d34a392611dde775123086acbd994e3fff64954777ce2dc2e51"
+checksum = "05dff41ac39e7b653f5f1550886cf00ba52f8e7f57210b633cdeedb3de5b236c"
 dependencies = [
  "cc",
  "libc",
@@ -2009,15 +1988,15 @@ checksum = "fef709d3257013bba7cff14fc504e07e80631d3fe0f6d38ce63b8f6510ccb932"
 dependencies = [
  "byteorder",
  "memmap",
- "parking_lot",
+ "parking_lot 0.9.0",
  "rustc-hash",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.2.0"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
+checksum = "53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"
 
 [[package]]
 name = "memmap"
@@ -2157,6 +2136,7 @@ dependencies = [
  "rustc-workspace-hack",
  "rustc_version",
  "serde",
+ "serde_json",
  "shell-escape",
  "vergen",
 ]
@@ -2351,10 +2331,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.6.2",
  "rustc_version",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.7.0",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
@@ -2370,6 +2360,20 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
+dependencies = [
+ "cfg-if",
+ "cloudabi",
+ "libc",
+ "redox_syscall",
+ "smallvec 1.0.0",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "1.0.1"
@@ -2471,9 +2475,9 @@ checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 
 [[package]]
 name = "polonius-engine"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e478d7c38eb785c6416cbe58df12aa55d7aefa3759b6d3e044b2ed03f423cec"
+checksum = "04d8ef65e3f89ecaec9ca7cb0e0911b4617352d4494018bcf934992f03f2024c"
 dependencies = [
  "datafrog",
  "log",
@@ -2504,12 +2508,11 @@ dependencies = [
 
 [[package]]
 name = "pretty_env_logger"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8b3f4e0475def7d9c2e5de8e5a1306949849761e107b360d03e98eafaffd61"
+checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d"
 dependencies = [
- "chrono",
- "env_logger 0.6.2",
+ "env_logger 0.7.1",
  "log",
 ]
 
@@ -2582,23 +2585,23 @@ dependencies = [
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.5.3"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357"
+checksum = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e"
 dependencies = [
  "bitflags",
+ "getopts",
  "memchr",
  "unicase",
 ]
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e"
+checksum = "2c2d7fd131800e0d63df52aff46201acaab70b431a4a1ec6f0343fe8e64f35a4"
 dependencies = [
  "bitflags",
- "getopts",
  "memchr",
  "unicase",
 ]
@@ -2641,18 +2644,24 @@ dependencies = [
 
 [[package]]
 name = "racer"
-version = "2.1.29"
+version = "2.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6d7ffceb4da3e0a29c18986f0469c209f4db3ab9f2ffe286eaa1104a3e5028"
+checksum = "0ff33fa15ac0384376741d16ddb05a65263dde4e2c5d0f7a9f3747db788764aa"
 dependencies = [
  "bitflags",
  "clap",
  "derive_more",
- "env_logger 0.6.2",
- "humantime 1.3.0",
+ "env_logger 0.7.1",
+ "humantime 2.0.0",
  "lazy_static 1.4.0",
  "log",
  "rls-span",
+ "rustc-ap-rustc_ast_pretty",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_errors",
+ "rustc-ap-rustc_parse",
+ "rustc-ap-rustc_session",
+ "rustc-ap-rustc_span",
  "rustc-ap-syntax",
 ]
 
@@ -2876,7 +2885,7 @@ dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
+ "thread_local 0.3.6",
  "utf8-ranges",
 ]
 
@@ -3033,7 +3042,6 @@ version = "0.6.0"
 dependencies = [
  "clippy_lints",
  "env_logger 0.7.1",
- "failure",
  "futures",
  "log",
  "rand 0.7.3",
@@ -3067,6 +3075,7 @@ name = "rustbook"
 version = "0.1.0"
 dependencies = [
  "clap",
+ "codespan",
  "codespan-reporting",
  "failure",
  "mdbook",
@@ -3082,17 +3091,16 @@ dependencies = [
  "backtrace",
  "bitflags",
  "byteorder",
- "chalk-engine",
- "fmt_macros",
- "graphviz",
  "jobserver",
  "log",
  "measureme",
- "parking_lot",
+ "parking_lot 0.9.0",
  "polonius-engine",
  "rustc-rayon",
  "rustc-rayon-core",
  "rustc_apfloat",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3105,31 +3113,61 @@ dependencies = [
  "scoped-tls",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
 name = "rustc-ap-arena"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7475f4c707269b56eb7144c53591e3cd6369a5aa1d66434829ea11df96d5e7e3"
+checksum = "ea82fa3d9a8add7422228ca1a2cbba0784fa8861f56148ff64da08b3c7921b03"
 dependencies = [
  "rustc-ap-rustc_data_structures",
- "smallvec 0.6.10",
+ "smallvec 1.0.0",
 ]
 
 [[package]]
 name = "rustc-ap-graphviz"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e59a55520f140a70a3e0fad80a36e807caa85e9d7016167b91a5b521ea929be"
+checksum = "638d0b2b3bcf99824e0cb5a25dbc547b61dc20942e11daf6a97e981918aa18e5"
+
+[[package]]
+name = "rustc-ap-rustc_ast_pretty"
+version = "642.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38bab04dd676dee6d2f9670506a18c31bfce38bf7f8420aa83eb1140ecde049"
+dependencies = [
+ "log",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_span",
+ "rustc-ap-syntax",
+]
+
+[[package]]
+name = "rustc-ap-rustc_attr"
+version = "642.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10b843ba8b1ed43739133047673b9f6a54d3b3b4d328d69c6ea89ff971395f35"
+dependencies = [
+ "rustc-ap-rustc_ast_pretty",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_errors",
+ "rustc-ap-rustc_feature",
+ "rustc-ap-rustc_macros",
+ "rustc-ap-rustc_session",
+ "rustc-ap-rustc_span",
+ "rustc-ap-serialize",
+ "rustc-ap-syntax",
+ "smallvec 1.0.0",
+]
 
 [[package]]
 name = "rustc-ap-rustc_data_structures"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6420857d5a088f680ec1ba736ffba4ee9c1964b0d397e6318f38d461f4f7d5cb"
+checksum = "dc3d1c6d0a80ab0c1df76405377cec0f3d5423fb5b0953a8eac70a2ad6c44df2"
 dependencies = [
+ "bitflags",
  "cfg-if",
  "crossbeam-utils 0.6.5",
  "ena",
@@ -3137,58 +3175,78 @@ dependencies = [
  "jobserver",
  "lazy_static 1.4.0",
  "log",
- "parking_lot",
+ "measureme",
+ "parking_lot 0.9.0",
  "rustc-ap-graphviz",
  "rustc-ap-rustc_index",
  "rustc-ap-serialize",
  "rustc-hash",
  "rustc-rayon",
  "rustc-rayon-core",
- "smallvec 0.6.10",
+ "smallvec 1.0.0",
  "stable_deref_trait",
+ "winapi 0.3.8",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_errors"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8abfca0960131262254a91d02ff4903526a261ede730d7a2c75b4234c867cdc0"
+checksum = "4909a1eca29331332257230f29120a8ff68c9e37d868c564fcd599e430cf8914"
 dependencies = [
  "annotate-snippets",
  "atty",
  "log",
  "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_span",
  "rustc-ap-serialize",
- "rustc-ap-syntax_pos",
- "term_size",
  "termcolor",
+ "termize",
  "unicode-width",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "rustc-ap-rustc_feature"
+version = "642.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63ab887a181d795cf5fd3edadf367760deafb90aefb844f168ab5255266e3478"
+dependencies = [
+ "lazy_static 1.4.0",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_span",
 ]
 
+[[package]]
+name = "rustc-ap-rustc_fs_util"
+version = "642.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70814116df3c5fbec8f06f6a1d013ca481f620fd22a9475754e9bf3ee9ba70d8"
+
 [[package]]
 name = "rustc-ap-rustc_index"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a395509dcb90a92c1479c085639594624e06b4ab3fc7c1b795b46a61f2d4f65"
+checksum = "ac1bf1d3cf3d119d41353d6fd229ef7272d5097bc0924de021c0294bf86d48bf"
 dependencies = [
  "rustc-ap-serialize",
- "smallvec 0.6.10",
+ "smallvec 1.0.0",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64eac8a0e6efb8f55292aa24be0208c7c0538236c613e79952fd1fa3d54bcf8e"
+checksum = "4cda21a32cebdc11ec4f5393aa2fcde5ed1b2f673a8571e5a4dcdf07e4ae9cac"
 dependencies = [
  "unicode-xid 0.2.0",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_macros"
-version = "610.0.0"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f99795e8be4877e9e05d59f201e1740c1cf673364655def5848606d9e25b75af"
+checksum = "75c47b48ea51910ecfd853c9248a9bf4c767bc823449ab6a1d864dff65fbae16"
 dependencies = [
  "itertools 0.8.0",
  "proc-macro2 1.0.3",
@@ -3198,63 +3256,102 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustc-ap-rustc_target"
-version = "610.0.0"
+name = "rustc-ap-rustc_parse"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22e21fdd8e1c0030f507158fa79b9f1e080e6241aba994d0f97c14a0a07a826"
+checksum = "abd88e89cd5b5d28dcd3a347a3d534c08627d9455570dc1a2d402cb8437b9d30"
 dependencies = [
  "bitflags",
  "log",
+ "rustc-ap-rustc_ast_pretty",
+ "rustc-ap-rustc_attr",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_errors",
+ "rustc-ap-rustc_feature",
+ "rustc-ap-rustc_lexer",
+ "rustc-ap-rustc_session",
+ "rustc-ap-rustc_span",
+ "rustc-ap-syntax",
+ "smallvec 1.0.0",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "rustc-ap-rustc_session"
+version = "642.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8487b4575fbb2d1fc6f1cd61225efd108a4d36817e6fb9b643d57fcae9cb12"
+dependencies = [
+ "log",
+ "num_cpus",
  "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_errors",
+ "rustc-ap-rustc_feature",
+ "rustc-ap-rustc_fs_util",
  "rustc-ap-rustc_index",
+ "rustc-ap-rustc_span",
+ "rustc-ap-rustc_target",
  "rustc-ap-serialize",
- "rustc-ap-syntax_pos",
+ "rustc-ap-syntax",
 ]
 
 [[package]]
-name = "rustc-ap-serialize"
-version = "610.0.0"
+name = "rustc-ap-rustc_span"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb1cd6ef5135408d62559866e79986ca261f4c1333253d500e5e66fe66d1432e"
+checksum = "f69746c0d4c21bf20a5bb2bd247261a1aa8631f04202d7303352942dde70d987"
 dependencies = [
- "indexmap",
- "smallvec 0.6.10",
+ "cfg-if",
+ "log",
+ "rustc-ap-arena",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_index",
+ "rustc-ap-rustc_macros",
+ "rustc-ap-serialize",
+ "scoped-tls",
+ "unicode-width",
 ]
 
 [[package]]
-name = "rustc-ap-syntax"
-version = "610.0.0"
+name = "rustc-ap-rustc_target"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61fc1c901d2cbd24cae95d7bc5a58aa7661ec3dc5320c78c32830a52a685c33c"
+checksum = "8bbc6ae09b5d42ec66edd520e8412e0615c53a7c93607fe33dc4abab60ba7c8b"
 dependencies = [
  "bitflags",
- "lazy_static 1.4.0",
  "log",
  "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
  "rustc-ap-rustc_index",
- "rustc-ap-rustc_lexer",
- "rustc-ap-rustc_target",
+ "rustc-ap-rustc_macros",
+ "rustc-ap-rustc_span",
  "rustc-ap-serialize",
- "rustc-ap-syntax_pos",
- "scoped-tls",
- "smallvec 0.6.10",
 ]
 
 [[package]]
-name = "rustc-ap-syntax_pos"
-version = "610.0.0"
+name = "rustc-ap-serialize"
+version = "642.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230534f638255853bb9f13987537e00a818435a0cc54b68d97221b6822c8f1bc"
+checksum = "e13a1ead0252fc3d96da4c336a95950be6795f2b00c84a67ccadf26142f8cb41"
 dependencies = [
- "cfg-if",
- "rustc-ap-arena",
+ "indexmap",
+ "smallvec 1.0.0",
+]
+
+[[package]]
+name = "rustc-ap-syntax"
+version = "642.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1f59f48ca3a2ec16a7e82e718ed5aadf9c9e08cf63015d28b4e774767524a6a"
+dependencies = [
+ "log",
  "rustc-ap-rustc_data_structures",
  "rustc-ap-rustc_index",
+ "rustc-ap-rustc_lexer",
  "rustc-ap-rustc_macros",
+ "rustc-ap-rustc_span",
  "rustc-ap-serialize",
  "scoped-tls",
- "unicode-width",
+ "smallvec 1.0.0",
 ]
 
 [[package]]
@@ -3352,12 +3449,29 @@ dependencies = [
  "smallvec 1.0.0",
 ]
 
+[[package]]
+name = "rustc_ast"
+version = "0.0.0"
+dependencies = [
+ "log",
+ "rustc_data_structures",
+ "rustc_index",
+ "rustc_lexer",
+ "rustc_macros",
+ "rustc_span",
+ "scoped-tls",
+ "serialize",
+ "smallvec 1.0.0",
+]
+
 [[package]]
 name = "rustc_ast_lowering"
 version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
+ "rustc_ast_pretty",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
@@ -3366,7 +3480,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3374,13 +3487,41 @@ name = "rustc_ast_passes"
 version = "0.0.0"
 dependencies = [
  "log",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
  "rustc_parse",
  "rustc_session",
  "rustc_span",
- "syntax",
+]
+
+[[package]]
+name = "rustc_ast_pretty"
+version = "0.0.0"
+dependencies = [
+ "log",
+ "rustc_ast",
+ "rustc_data_structures",
+ "rustc_span",
+]
+
+[[package]]
+name = "rustc_attr"
+version = "0.0.0"
+dependencies = [
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_data_structures",
+ "rustc_errors",
+ "rustc_feature",
+ "rustc_macros",
+ "rustc_session",
+ "rustc_span",
+ "serialize",
+ "smallvec 1.0.0",
 ]
 
 [[package]]
@@ -3389,6 +3530,9 @@ version = "0.0.0"
 dependencies = [
  "fmt_macros",
  "log",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3398,7 +3542,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3409,8 +3552,11 @@ dependencies = [
  "flate2",
  "libc",
  "log",
+ "measureme",
  "rustc",
  "rustc-demangle",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_codegen_ssa",
  "rustc_codegen_utils",
  "rustc_data_structures",
@@ -3426,7 +3572,6 @@ dependencies = [
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3442,6 +3587,8 @@ dependencies = [
  "num_cpus",
  "rustc",
  "rustc_apfloat",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_codegen_utils",
  "rustc_data_structures",
  "rustc_errors",
@@ -3453,7 +3600,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "serialize",
- "syntax",
  "tempfile",
 ]
 
@@ -3465,12 +3611,12 @@ dependencies = [
  "punycode",
  "rustc",
  "rustc-demangle",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_metadata",
  "rustc_span",
  "rustc_target",
- "syntax",
 ]
 
 [[package]]
@@ -3487,7 +3633,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "log",
  "measureme",
- "parking_lot",
+ "parking_lot 0.9.0",
  "rustc-hash",
  "rustc-rayon",
  "rustc-rayon-core",
@@ -3506,6 +3652,9 @@ dependencies = [
  "lazy_static 1.4.0",
  "log",
  "rustc",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_codegen_ssa",
  "rustc_codegen_utils",
  "rustc_data_structures",
  "rustc_error_codes",
@@ -3522,7 +3671,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "serialize",
- "syntax",
  "winapi 0.3.8",
 ]
 
@@ -3540,8 +3688,8 @@ dependencies = [
  "rustc_data_structures",
  "rustc_span",
  "serialize",
- "term_size",
  "termcolor",
+ "termize",
  "unicode-width",
  "winapi 0.3.8",
 ]
@@ -3551,7 +3699,10 @@ name = "rustc_expand"
 version = "0.0.0"
 dependencies = [
  "log",
+ "rustc_ast",
  "rustc_ast_passes",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3561,7 +3712,6 @@ dependencies = [
  "rustc_span",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3581,16 +3731,17 @@ version = "0.0.0"
 name = "rustc_hir"
 version = "0.0.0"
 dependencies = [
+ "lazy_static 1.4.0",
+ "rustc_ast",
+ "rustc_ast_pretty",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_index",
  "rustc_macros",
- "rustc_session",
  "rustc_span",
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3601,13 +3752,13 @@ dependencies = [
  "log",
  "rand 0.7.3",
  "rustc",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_fs_util",
  "rustc_hir",
  "rustc_session",
  "rustc_span",
  "serialize",
- "syntax",
 ]
 
 [[package]]
@@ -3618,6 +3769,28 @@ dependencies = [
  "smallvec 1.0.0",
 ]
 
+[[package]]
+name = "rustc_infer"
+version = "0.0.0"
+dependencies = [
+ "fmt_macros",
+ "graphviz",
+ "log",
+ "rustc",
+ "rustc_ast",
+ "rustc_attr",
+ "rustc_data_structures",
+ "rustc_error_codes",
+ "rustc_errors",
+ "rustc_hir",
+ "rustc_index",
+ "rustc_macros",
+ "rustc_session",
+ "rustc_span",
+ "rustc_target",
+ "smallvec 1.0.0",
+]
+
 [[package]]
 name = "rustc_interface"
 version = "0.0.0"
@@ -3626,8 +3799,10 @@ dependencies = [
  "once_cell",
  "rustc",
  "rustc-rayon",
+ "rustc_ast",
  "rustc_ast_lowering",
  "rustc_ast_passes",
+ "rustc_attr",
  "rustc_builtin_macros",
  "rustc_codegen_llvm",
  "rustc_codegen_ssa",
@@ -3637,6 +3812,7 @@ dependencies = [
  "rustc_expand",
  "rustc_hir",
  "rustc_incremental",
+ "rustc_infer",
  "rustc_lint",
  "rustc_metadata",
  "rustc_mir",
@@ -3654,7 +3830,6 @@ dependencies = [
  "rustc_typeck",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
  "tempfile",
  "winapi 0.3.8",
 ]
@@ -3672,15 +3847,18 @@ version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
  "rustc_hir",
  "rustc_index",
+ "rustc_infer",
  "rustc_session",
  "rustc_span",
  "rustc_target",
- "syntax",
  "unicode-security",
 ]
 
@@ -3697,7 +3875,6 @@ dependencies = [
 name = "rustc_macros"
 version = "0.1.0"
 dependencies = [
- "itertools 0.8.0",
  "proc-macro2 1.0.3",
  "quote 1.0.2",
  "syn 1.0.11",
@@ -3712,6 +3889,9 @@ dependencies = [
  "log",
  "memmap",
  "rustc",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
@@ -3723,7 +3903,6 @@ dependencies = [
  "serialize",
  "smallvec 1.0.0",
  "stable_deref_trait",
- "syntax",
  "winapi 0.3.8",
 ]
 
@@ -3739,17 +3918,20 @@ dependencies = [
  "polonius-engine",
  "rustc",
  "rustc_apfloat",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
  "rustc_index",
+ "rustc_infer",
  "rustc_lexer",
  "rustc_macros",
  "rustc_span",
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3757,21 +3939,22 @@ name = "rustc_mir_build"
 version = "0.0.0"
 dependencies = [
  "arena",
- "itertools 0.8.0",
  "log",
  "rustc",
  "rustc_apfloat",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
  "rustc_index",
+ "rustc_infer",
  "rustc_macros",
  "rustc_session",
  "rustc_span",
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3780,6 +3963,9 @@ version = "0.0.0"
 dependencies = [
  "bitflags",
  "log",
+ "rustc_ast",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3787,7 +3973,6 @@ dependencies = [
  "rustc_session",
  "rustc_span",
  "smallvec 1.0.0",
- "syntax",
  "unicode-normalization",
 ]
 
@@ -3797,15 +3982,17 @@ version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
  "rustc_hir",
  "rustc_index",
+ "rustc_infer",
  "rustc_session",
  "rustc_span",
  "rustc_target",
- "syntax",
 ]
 
 [[package]]
@@ -3813,12 +4000,12 @@ name = "rustc_plugin_impl"
 version = "0.0.0"
 dependencies = [
  "rustc",
+ "rustc_ast",
  "rustc_errors",
  "rustc_hir",
  "rustc_lint",
  "rustc_metadata",
  "rustc_span",
- "syntax",
 ]
 
 [[package]]
@@ -3827,12 +4014,13 @@ version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
  "rustc_span",
  "rustc_typeck",
- "syntax",
 ]
 
 [[package]]
@@ -3843,17 +4031,20 @@ dependencies = [
  "bitflags",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_ast_lowering",
+ "rustc_ast_pretty",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_expand",
  "rustc_feature",
  "rustc_hir",
+ "rustc_infer",
  "rustc_metadata",
  "rustc_session",
  "rustc_span",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3864,13 +4055,14 @@ dependencies = [
  "rls-data",
  "rls-span",
  "rustc",
+ "rustc_ast",
+ "rustc_ast_pretty",
  "rustc_codegen_utils",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_parse",
  "rustc_span",
  "serde_json",
- "syntax",
 ]
 
 [[package]]
@@ -3879,6 +4071,7 @@ version = "0.0.0"
 dependencies = [
  "log",
  "num_cpus",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -3931,16 +4124,16 @@ checksum = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee"
 name = "rustc_traits"
 version = "0.0.0"
 dependencies = [
- "chalk-engine",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_hir",
+ "rustc_infer",
  "rustc_macros",
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3951,7 +4144,9 @@ dependencies = [
  "rustc",
  "rustc_data_structures",
  "rustc_hir",
+ "rustc_infer",
  "rustc_span",
+ "rustc_target",
 ]
 
 [[package]]
@@ -3961,14 +4156,16 @@ dependencies = [
  "arena",
  "log",
  "rustc",
+ "rustc_ast",
+ "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
  "rustc_index",
+ "rustc_infer",
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3986,7 +4183,7 @@ version = "0.0.0"
 dependencies = [
  "itertools 0.8.0",
  "minifier",
- "pulldown-cmark 0.5.3",
+ "pulldown-cmark 0.7.0",
  "rustc-rayon",
  "serde",
  "serde_json",
@@ -4040,7 +4237,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.11"
+version = "1.4.12"
 dependencies = [
  "annotate-snippets",
  "bytecount",
@@ -4056,9 +4253,14 @@ dependencies = [
  "lazy_static 1.4.0",
  "log",
  "regex",
+ "rustc-ap-rustc_ast_pretty",
+ "rustc-ap-rustc_data_structures",
+ "rustc-ap-rustc_errors",
+ "rustc-ap-rustc_parse",
+ "rustc-ap-rustc_session",
+ "rustc-ap-rustc_span",
  "rustc-ap-rustc_target",
  "rustc-ap-syntax",
- "rustc-ap-syntax_pos",
  "rustc-workspace-hack",
  "rustfmt-config_proc_macro",
  "serde",
@@ -4475,29 +4677,11 @@ dependencies = [
  "unicode-xid 0.2.0",
 ]
 
-[[package]]
-name = "syntax"
-version = "0.0.0"
-dependencies = [
- "log",
- "rustc_data_structures",
- "rustc_errors",
- "rustc_feature",
- "rustc_index",
- "rustc_lexer",
- "rustc_macros",
- "rustc_session",
- "rustc_span",
- "scoped-tls",
- "serialize",
- "smallvec 1.0.0",
-]
-
 [[package]]
 name = "tar"
-version = "0.4.20"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2"
+checksum = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"
 dependencies = [
  "filetime",
  "libc",
@@ -4549,17 +4733,6 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
-[[package]]
-name = "term_size"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
-dependencies = [
- "kernel32-sys",
- "libc",
- "winapi 0.2.8",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.0.4"
@@ -4580,6 +4753,16 @@ dependencies = [
  "redox_termios",
 ]
 
+[[package]]
+name = "termize"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295"
+dependencies = [
+ "libc",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "test"
 version = "0.0.0"
@@ -4623,6 +4806,15 @@ dependencies = [
  "lazy_static 1.4.0",
 ]
 
+[[package]]
+name = "thread_local"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+dependencies = [
+ "lazy_static 1.4.0",
+]
+
 [[package]]
 name = "tidy"
 version = "0.1.0"
@@ -4777,7 +4969,7 @@ dependencies = [
  "log",
  "mio",
  "num_cpus",
- "parking_lot",
+ "parking_lot 0.9.0",
  "slab",
  "tokio-executor",
  "tokio-io",
@@ -4976,11 +5168,11 @@ checksum = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86"
 
 [[package]]
 name = "unicase"
-version = "2.5.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
 dependencies = [
- "version_check 0.1.5",
+ "version_check",
 ]
 
 [[package]]
@@ -5150,12 +5342,6 @@ dependencies = [
  "failure",
 ]
 
-[[package]]
-name = "version_check"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-
 [[package]]
 name = "version_check"
 version = "0.9.1"
diff --git a/Cargo.toml b/Cargo.toml
index 9d5c27b96d..2f5a708e8d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,13 +31,6 @@ exclude = [
   "obj",
 ]
 
-# Curiously, LLVM 7.0 will segfault if compiled with opt-level=3
-# See issue https://github.com/rust-lang/rust/issues/52378
-[profile.release]
-opt-level = 2
-[profile.bench]
-opt-level = 2
-
 # These options are controlled from our rustc wrapper script, so turn them off
 # here and have them controlled elsewhere.
 [profile.dev]
diff --git a/RELEASES.md b/RELEASES.md
index 77d0bbe579..36597b1864 100644
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -1,3 +1,152 @@
+Version 1.43.0 (2020-04-23)
+==========================
+
+Language
+--------
+- [Fixed using binary operations with `&{number}` (e.g. `&1.0`) not having
+  the type inferred correctly.][68129]
+- [Attributes such as `#[cfg()]` can now be used on `if` expressions.][69201]
+
+**Syntax only changes**
+- [Allow `type Foo: Ord` syntactically.][69361]
+- [Fuse associated and extern items up to defaultness.][69194]
+- [Syntactically allow `self` in all `fn` contexts.][68764]
+- [Merge `fn` syntax + cleanup item parsing.][68728]
+- [`item` macro fragments can be interpolated into `trait`s, `impl`s, and `extern` blocks.][69366]
+  For example, you may now write:
+  ```rust 
+  macro_rules! mac_trait {
+      ($i:item) => {
+          trait T { $i }
+      }
+  }
+  mac_trait! {
+      fn foo() {}
+  }
+  ```
+
+These are still rejected *semantically*, so you will likely receive an error but
+these changes can be seen and parsed by macros and
+conditional compilation.
+
+
+Compiler
+--------
+- [You can now pass multiple lint flags to rustc to override the previous
+  flags.][67885] For example; `rustc -D unused -A unused-variables` denies
+  everything in the `unused` lint group except `unused-variables` which
+  is explicitly allowed. However, passing `rustc -A unused-variables -D unused` denies
+  everything in the `unused` lint group **including** `unused-variables` since
+  the allow flag is specified before the deny flag (and therefore overridden).
+- [rustc will now prefer your system MinGW libraries over its bundled libraries
+  if they are available on `windows-gnu`.][67429]
+- [rustc now buffers errors/warnings printed in JSON.][69227]
+
+Libraries
+---------
+- [`Arc<[T; N]>`, `Box<[T; N]>`, and `Rc<[T; N]>`, now implement
+  `TryFrom<Arc<[T]>>`,`TryFrom<Box<[T]>>`, and `TryFrom<Rc<[T]>>`
+  respectively.][69538] **Note** These conversions are only available when `N`
+  is `0..=32`.
+- [You can now use associated constants on floats and integers directly, rather
+  than having to import the module.][68952] e.g. You can now write `u32::MAX` or
+  `f32::NAN` with no imports.
+- [`u8::is_ascii` is now `const`.][68984]
+- [`String` now implements `AsMut<str>`.][68742]
+- [Added the `primitive` module to `std` and `core`.][67637] This module
+  reexports Rust's primitive types. This is mainly useful in macros
+  where you want avoid these types being shadowed.
+- [Relaxed some of the trait bounds on `HashMap` and `HashSet`.][67642]
+- [`string::FromUtf8Error` now implements `Clone + Eq`.][68738]
+
+Stabilized APIs
+---------------
+- [`Once::is_completed`]
+- [`f32::LOG10_2`]
+- [`f32::LOG2_10`]
+- [`f64::LOG10_2`]
+- [`f64::LOG2_10`]
+- [`iter::once_with`]
+
+Cargo
+-----
+- [You can now set config `[profile]`s in your `.cargo/config`, or through
+  your environment.][cargo/7823]
+- [Cargo will now set `CARGO_BIN_EXE_<name>` pointing to a binary's
+  executable path when running integration tests or benchmarks.][cargo/7697]
+  `<name>` is the name of your binary as-is e.g. If you wanted the executable
+  path for a binary named `my-program`you would use `env!("CARGO_BIN_EXE_my-program")`.
+
+Misc
+----
+- [Certain checks in the `const_err` lint were deemed unrelated to const
+  evaluation][69185], and have been moved to the `unconditional_panic` and
+  `arithmetic_overflow` lints.
+  
+Compatibility Notes
+-------------------
+
+- [Having trailing syntax in the `assert!` macro is now a hard error.][69548] This
+  has been a warning since 1.36.0.
+- [Fixed `Self` not having the correctly inferred type.][69340] This incorrectly
+  led to some instances being accepted, and now correctly emits a hard error.
+
+[69340]: https://github.com/rust-lang/rust/pull/69340
+
+Internal Only
+-------------
+These changes provide no direct user facing benefits, but represent significant
+improvements to the internals and overall performance of `rustc` and
+related tools.
+
+- [All components are now built with `opt-level=3` instead of `2`.][67878]
+- [Improved how rustc generates drop code.][67332]
+- [Improved performance from `#[inline]`-ing certain hot functions.][69256]
+- [traits: preallocate 2 Vecs of known initial size][69022]
+- [Avoid exponential behaviour when relating types][68772]
+- [Skip `Drop` terminators for enum variants without drop glue][68943]
+- [Improve performance of coherence checks][68966]
+- [Deduplicate types in the generator witness][68672]
+- [Invert control in struct_lint_level.][68725]
+
+[67332]: https://github.com/rust-lang/rust/pull/67332/
+[67429]: https://github.com/rust-lang/rust/pull/67429/
+[67637]: https://github.com/rust-lang/rust/pull/67637/
+[67642]: https://github.com/rust-lang/rust/pull/67642/
+[67878]: https://github.com/rust-lang/rust/pull/67878/
+[67885]: https://github.com/rust-lang/rust/pull/67885/
+[68129]: https://github.com/rust-lang/rust/pull/68129/
+[68672]: https://github.com/rust-lang/rust/pull/68672/
+[68725]: https://github.com/rust-lang/rust/pull/68725/
+[68728]: https://github.com/rust-lang/rust/pull/68728/
+[68738]: https://github.com/rust-lang/rust/pull/68738/
+[68742]: https://github.com/rust-lang/rust/pull/68742/
+[68764]: https://github.com/rust-lang/rust/pull/68764/
+[68772]: https://github.com/rust-lang/rust/pull/68772/
+[68943]: https://github.com/rust-lang/rust/pull/68943/
+[68952]: https://github.com/rust-lang/rust/pull/68952/
+[68966]: https://github.com/rust-lang/rust/pull/68966/
+[68984]: https://github.com/rust-lang/rust/pull/68984/
+[69022]: https://github.com/rust-lang/rust/pull/69022/
+[69185]: https://github.com/rust-lang/rust/pull/69185/
+[69194]: https://github.com/rust-lang/rust/pull/69194/
+[69201]: https://github.com/rust-lang/rust/pull/69201/
+[69227]: https://github.com/rust-lang/rust/pull/69227/
+[69548]: https://github.com/rust-lang/rust/pull/69548/
+[69256]: https://github.com/rust-lang/rust/pull/69256/
+[69361]: https://github.com/rust-lang/rust/pull/69361/
+[69366]: https://github.com/rust-lang/rust/pull/69366/
+[69538]: https://github.com/rust-lang/rust/pull/69538/
+[cargo/7823]: https://github.com/rust-lang/cargo/pull/7823
+[cargo/7697]: https://github.com/rust-lang/cargo/pull/7697
+[`Once::is_completed`]: https://doc.rust-lang.org/std/sync/struct.Once.html#method.is_completed
+[`f32::LOG10_2`]: https://doc.rust-lang.org/std/f32/consts/constant.LOG10_2.html
+[`f32::LOG2_10`]: https://doc.rust-lang.org/std/f32/consts/constant.LOG2_10.html
+[`f64::LOG10_2`]: https://doc.rust-lang.org/std/f64/consts/constant.LOG10_2.html
+[`f64::LOG2_10`]: https://doc.rust-lang.org/std/f64/consts/constant.LOG2_10.html
+[`iter::once_with`]: https://doc.rust-lang.org/std/iter/fn.once_with.html
+
+
 Version 1.42.0 (2020-03-12)
 ==========================
 
@@ -71,15 +220,7 @@ Compatibility Notes
 -------------------
 - [`Error::description` has been deprecated, and its use will now produce a
   warning.][66919] It's recommended to use `Display`/`to_string` instead.
-- [`use $crate;` inside macros is now a hard error.][37390] The compiler
-  emitted forward compatibility warnings since Rust 1.14.0.
-- [As previously announced, this release reduces the level of support for
-  32-bit Apple targets to tier 3.][apple-32bit-drop]. This means that the
-  source code is still available to build, but the targets are no longer tested
-  and no release binary is distributed by the Rust project. Please refer to the
-  linked blog post for more information.
-
-[37390]: https://github.com/rust-lang/rust/issues/37390/
+
 [68253]: https://github.com/rust-lang/rust/pull/68253/
 [68348]: https://github.com/rust-lang/rust/pull/68348/
 [67935]: https://github.com/rust-lang/rust/pull/67935/
@@ -4846,7 +4987,6 @@ Version 1.11.0 (2016-08-18)
 Language
 --------
 
-* [`cfg_attr` works on `path` attributes](https://github.com/rust-lang/rust/pull/34546)
 * [Support nested `cfg_attr` attributes](https://github.com/rust-lang/rust/pull/34216)
 * [Allow statement-generating braced macro invocations at the end of blocks](https://github.com/rust-lang/rust/pull/34436)
 * [Macros can be expanded inside of trait definitions](https://github.com/rust-lang/rust/pull/34213)
@@ -4965,8 +5105,6 @@ Version 1.10.0 (2016-07-07)
 Language
 --------
 
-* [Allow `concat_idents!` in type positions as well as in expression
-  positions](https://github.com/rust-lang/rust/pull/33735).
 * [`Copy` types are required to have a trivial implementation of `Clone`](https://github.com/rust-lang/rust/pull/33420).
   [RFC 1521](https://github.com/rust-lang/rfcs/blob/master/text/1521-copy-clone-semantics.md).
 * [Single-variant enums support the `#[repr(..)]` attribute](https://github.com/rust-lang/rust/pull/33355).
diff --git a/config.toml.example b/config.toml.example
index c9e17337ee..ce21b63467 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -315,7 +315,7 @@
 # `0` - no debug info
 # `1` - line tables only
 # `2` - full debug info with variable and type information
-# Can be overriden for specific subsets of Rust code (rustc, std or tools).
+# Can be overridden for specific subsets of Rust code (rustc, std or tools).
 # Debuginfo for tests run with compiletest is not controlled by this option
 # and needs to be enabled separately with `debuginfo-level-tests`.
 #debuginfo-level = if debug { 2 } else { 0 }
@@ -395,6 +395,15 @@
 # rustc to execute.
 #lld = false
 
+# Indicates whether LLD will be used to link Rust crates during bootstrap on
+# supported platforms. The LLD from the bootstrap distribution will be used
+# and not the LLD compiled during the bootstrap.
+#
+# LLD will not be used if we're cross linking or running tests.
+#
+# Explicitly setting the linker for a target will override this option.
+#use-lld = false
+
 # Indicates whether some LLVM tools, like llvm-objdump, will be made available in the
 # sysroot.
 #llvm-tools = false
@@ -435,6 +444,10 @@
 # Use LLVM libunwind as the implementation for Rust's unwinder.
 #llvm-libunwind = false
 
+# Enable Windows Control Flow Guard checks in the standard library.
+# This only applies from stage 1 onwards, and only for Windows targets.
+#control-flow-guard = false
+
 # =============================================================================
 # Options for specific targets
 #
@@ -463,6 +476,7 @@
 # Linker to be used to link Rust code. Note that the
 # default value is platform specific, and if not specified it may also depend on
 # what platform is crossing to what platform.
+# Setting this will override the `use-lld` option for Rust code.
 #linker = "cc"
 
 # Path to the `llvm-config` binary of the installation of a custom LLVM to link
diff --git a/git-commit-hash b/git-commit-hash
index 1a947ee947..5dad6a9f56 100644
--- a/git-commit-hash
+++ b/git-commit-hash
@@ -1 +1 @@
-b8cedc00407a4c56a3bda1ed605c6fc166655447
\ No newline at end of file
+4fb7144ed159f94491249e86d5bbd033b5d60550
\ No newline at end of file
diff --git a/src/bootstrap/bin/rustc.rs b/src/bootstrap/bin/rustc.rs
index a34ec44566..daa030c59d 100644
--- a/src/bootstrap/bin/rustc.rs
+++ b/src/bootstrap/bin/rustc.rs
@@ -47,7 +47,7 @@ fn main() {
     };
     let stage = env::var("RUSTC_STAGE").expect("RUSTC_STAGE was not set");
     let sysroot = env::var_os("RUSTC_SYSROOT").expect("RUSTC_SYSROOT was not set");
-    let on_fail = env::var_os("RUSTC_ON_FAIL").map(|of| Command::new(of));
+    let on_fail = env::var_os("RUSTC_ON_FAIL").map(Command::new);
 
     let rustc = env::var_os(rustc).unwrap_or_else(|| panic!("{:?} was not set", rustc));
     let libdir = env::var_os(libdir).unwrap_or_else(|| panic!("{:?} was not set", libdir));
@@ -64,7 +64,7 @@ fn main() {
     if let Some(crate_name) = crate_name {
         if let Some(target) = env::var_os("RUSTC_TIME") {
             if target == "all"
-                || target.into_string().unwrap().split(",").any(|c| c.trim() == crate_name)
+                || target.into_string().unwrap().split(',').any(|c| c.trim() == crate_name)
             {
                 cmd.arg("-Ztime");
             }
@@ -134,6 +134,11 @@ fn main() {
             cmd.arg(format!("-Clinker={}", host_linker));
         }
 
+        // Override linker flavor if necessary.
+        if let Ok(host_linker_flavor) = env::var("RUSTC_HOST_LINKER_FLAVOR") {
+            cmd.arg(format!("-Clinker-flavor={}", host_linker_flavor));
+        }
+
         if let Ok(s) = env::var("RUSTC_HOST_CRT_STATIC") {
             if s == "true" {
                 cmd.arg("-C").arg("target-feature=+crt-static");
@@ -189,7 +194,7 @@ fn main() {
                 crate_name,
                 is_test,
                 dur.as_secs(),
-                dur.subsec_nanos() / 1_000_000
+                dur.subsec_millis()
             );
 
             match status.code() {
diff --git a/src/bootstrap/bin/rustdoc.rs b/src/bootstrap/bin/rustdoc.rs
index 8c8b33a4e4..04345867bf 100644
--- a/src/bootstrap/bin/rustdoc.rs
+++ b/src/bootstrap/bin/rustdoc.rs
@@ -61,7 +61,7 @@ fn main() {
     }
 
     // Needed to be able to run all rustdoc tests.
-    if let Some(_) = env::var_os("RUSTDOC_GENERATE_REDIRECT_PAGES") {
+    if env::var_os("RUSTDOC_GENERATE_REDIRECT_PAGES").is_some() {
         // This "unstable-options" can be removed when `--generate-redirect-pages` is stabilized
         if !has_unstable {
             cmd.arg("-Z").arg("unstable-options");
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 6737086f6e..50e1726240 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -80,7 +80,7 @@ def _download(path, url, probably_big, verbose, exception):
             option = "-s"
         run(["curl", option,
              "-y", "30", "-Y", "10",    # timeout if speed is < 10 bytes/sec for > 30 seconds
-             "--connect-timeout", "30", # timeout if cannot connect within 30 seconds
+             "--connect-timeout", "30",  # timeout if cannot connect within 30 seconds
              "--retry", "3", "-Sf", "-o", path, url],
             verbose=verbose,
             exception=exception)
@@ -332,7 +332,6 @@ class RustBuild(object):
         self.use_vendored_sources = ''
         self.verbose = False
 
-
     def download_stage0(self):
         """Fetch the build system for Rust, written in Rust
 
@@ -351,7 +350,7 @@ class RustBuild(object):
             try:
                 with tempfile.NamedTemporaryFile(delete=False) as temp_file:
                     temp_path = temp_file.name
-                with tarfile.open(temp_path, "w:xz") as tar:
+                with tarfile.open(temp_path, "w:xz"):
                     pass
                 return True
             except tarfile.CompressionError:
@@ -397,7 +396,7 @@ class RustBuild(object):
 
         if self.rustfmt() and self.rustfmt().startswith(self.bin_root()) and (
             not os.path.exists(self.rustfmt())
-            or self.program_out_of_date(self.rustfmt_stamp())
+            or self.program_out_of_date(self.rustfmt_stamp(), self.rustfmt_channel)
         ):
             if rustfmt_channel:
                 tarball_suffix = '.tar.xz' if support_xz() else '.tar.gz'
@@ -407,7 +406,7 @@ class RustBuild(object):
                 self.fix_executable("{}/bin/rustfmt".format(self.bin_root()))
                 self.fix_executable("{}/bin/cargo-fmt".format(self.bin_root()))
                 with output(self.rustfmt_stamp()) as rustfmt_stamp:
-                    rustfmt_stamp.write(self.date)
+                    rustfmt_stamp.write(self.date + self.rustfmt_channel)
 
     def _download_stage0_helper(self, filename, pattern, tarball_suffix, date=None):
         if date is None:
@@ -521,12 +520,12 @@ class RustBuild(object):
         """
         return os.path.join(self.bin_root(), '.rustfmt-stamp')
 
-    def program_out_of_date(self, stamp_path):
+    def program_out_of_date(self, stamp_path, extra=""):
         """Check if the given program stamp is out of date"""
         if not os.path.exists(stamp_path) or self.clean:
             return True
         with open(stamp_path, 'r') as stamp:
-            return self.date != stamp.read()
+            return (self.date + extra) != stamp.read()
 
     def bin_root(self):
         """Return the binary root directory
@@ -825,7 +824,7 @@ class RustBuild(object):
                 if not os.path.exists(vendor_dir):
                     print('error: vendoring required, but vendor directory does not exist.')
                     print('       Run `cargo vendor` without sudo to initialize the '
-                        'vendor directory.')
+                          'vendor directory.')
                     raise Exception("{} not found".format(vendor_dir))
 
         if self.use_vendored_sources:
@@ -839,7 +838,7 @@ class RustBuild(object):
                     "\n"
                     "[source.vendored-sources]\n"
                     "directory = '{}/vendor'\n"
-                .format(self.rust_root))
+                    .format(self.rust_root))
         else:
             if os.path.exists('.cargo'):
                 shutil.rmtree('.cargo')
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index d9c894aa9c..eb0199fd02 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -510,7 +510,7 @@ impl<'a> Builder<'a> {
             Subcommand::Format { .. } | Subcommand::Clean { .. } => panic!(),
         };
 
-        let builder = Builder {
+        Builder {
             build,
             top_stage: build.config.stage.unwrap_or(2),
             kind,
@@ -518,9 +518,7 @@ impl<'a> Builder<'a> {
             stack: RefCell::new(Vec::new()),
             time_spent_on_dependencies: Cell::new(Duration::new(0, 0)),
             paths: paths.to_owned(),
-        };
-
-        builder
+        }
     }
 
     pub fn execute_cli(&self) {
@@ -694,7 +692,7 @@ impl<'a> Builder<'a> {
         cmd.env_remove("MAKEFLAGS");
         cmd.env_remove("MFLAGS");
 
-        if let Some(linker) = self.linker(compiler.host) {
+        if let Some(linker) = self.linker(compiler.host, true) {
             cmd.env("RUSTC_TARGET_LINKER", linker);
         }
         cmd
@@ -727,7 +725,11 @@ impl<'a> Builder<'a> {
             self.clear_if_dirty(&my_out, &rustdoc);
         }
 
-        cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd).arg("-Zconfig-profile");
+        cargo.env("CARGO_TARGET_DIR", &out_dir).arg(cmd);
+
+        if !self.local_rebuild {
+            cargo.arg("-Zconfig-profile");
+        }
 
         let profile_var = |name: &str| {
             let profile = if self.config.rust_optimize { "RELEASE" } else { "DEV" };
@@ -753,13 +755,12 @@ impl<'a> Builder<'a> {
             cargo.env("RUST_CHECK", "1");
         }
 
-        let stage;
-        if compiler.stage == 0 && self.local_rebuild {
+        let stage = if compiler.stage == 0 && self.local_rebuild {
             // Assume the local-rebuild rustc already has stage1 features.
-            stage = 1;
+            1
         } else {
-            stage = compiler.stage;
-        }
+            compiler.stage
+        };
 
         let mut rustflags = Rustflags::new(&target);
         if stage != 0 {
@@ -850,7 +851,13 @@ impl<'a> Builder<'a> {
             rustflags.arg("-Zforce-unstable-if-unmarked");
         }
 
-        rustflags.arg("-Zexternal-macro-backtrace");
+        // cfg(bootstrap): the flag was renamed from `-Zexternal-macro-backtrace`
+        // to `-Zmacro-backtrace`, keep only the latter after beta promotion.
+        if stage == 0 {
+            rustflags.arg("-Zexternal-macro-backtrace");
+        } else {
+            rustflags.arg("-Zmacro-backtrace");
+        }
 
         let want_rustdoc = self.doc_tests != DocTests::No;
 
@@ -949,10 +956,31 @@ impl<'a> Builder<'a> {
             }
         }
 
-        if let Some(host_linker) = self.linker(compiler.host) {
+        // FIXME: Don't use LLD if we're compiling libtest, since it fails to link it.
+        // See https://github.com/rust-lang/rust/issues/68647.
+        let can_use_lld = mode != Mode::Std;
+
+        // FIXME: The beta compiler doesn't pick the `lld-link` flavor for `*-pc-windows-msvc`
+        // Remove `RUSTC_HOST_LINKER_FLAVOR` when this is fixed
+        let lld_linker_flavor = |linker: &Path, target: Interned<String>| {
+            compiler.stage == 0
+                && linker.file_name() == Some(OsStr::new("rust-lld"))
+                && target.contains("pc-windows-msvc")
+        };
+
+        if let Some(host_linker) = self.linker(compiler.host, can_use_lld) {
+            if lld_linker_flavor(host_linker, compiler.host) {
+                cargo.env("RUSTC_HOST_LINKER_FLAVOR", "lld-link");
+            }
+
             cargo.env("RUSTC_HOST_LINKER", host_linker);
         }
-        if let Some(target_linker) = self.linker(target) {
+
+        if let Some(target_linker) = self.linker(target, can_use_lld) {
+            if lld_linker_flavor(target_linker, target) {
+                rustflags.arg("-Clinker-flavor=lld-link");
+            }
+
             let target = crate::envify(&target);
             cargo.env(&format!("CARGO_TARGET_{}_LINKER", target), target_linker);
         }
@@ -1111,6 +1139,20 @@ impl<'a> Builder<'a> {
             );
         }
 
+        // If Control Flow Guard is enabled, pass the `control_flow_guard=checks` flag to rustc
+        // when compiling the standard library, since this might be linked into the final outputs
+        // produced by rustc. Since this mitigation is only available on Windows, only enable it
+        // for the standard library in case the compiler is run on a non-Windows platform.
+        // This is not needed for stage 0 artifacts because these will only be used for building
+        // the stage 1 compiler.
+        if cfg!(windows)
+            && mode == Mode::Std
+            && self.config.control_flow_guard
+            && compiler.stage >= 1
+        {
+            rustflags.arg("-Zcontrol_flow_guard=checks");
+        }
+
         // For `cargo doc` invocations, make rustdoc print the Rust version into the docs
         cargo.env("RUSTDOC_CRATE_VERSION", self.rust_version());
 
@@ -1252,12 +1294,7 @@ impl<'a> Builder<'a> {
         };
 
         if self.config.print_step_timings && dur > Duration::from_millis(100) {
-            println!(
-                "[TIMING] {:?} -- {}.{:03}",
-                step,
-                dur.as_secs(),
-                dur.subsec_nanos() / 1_000_000
-            );
+            println!("[TIMING] {:?} -- {}.{:03}", step, dur.as_secs(), dur.subsec_millis());
         }
 
         {
@@ -1302,7 +1339,7 @@ impl Rustflags {
 
     fn arg(&mut self, arg: &str) -> &mut Self {
         assert_eq!(arg.split_whitespace().count(), 1);
-        if self.0.len() > 0 {
+        if !self.0.is_empty() {
             self.0.push_str(" ");
         }
         self.0.push_str(arg);
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index 5fefb97286..cca8ab80c9 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -19,7 +19,6 @@ fn configure(host: &[&str], target: &[&str]) -> Config {
     config.out = dir;
     config.build = INTERNER.intern_str("A");
     config.hosts = vec![config.build]
-        .clone()
         .into_iter()
         .chain(host.iter().map(|s| INTERNER.intern_str(s)))
         .collect::<Vec<_>>();
diff --git a/src/bootstrap/channel.rs b/src/bootstrap/channel.rs
index 38810237ef..504cba4557 100644
--- a/src/bootstrap/channel.rs
+++ b/src/bootstrap/channel.rs
@@ -13,7 +13,7 @@ use build_helper::output;
 use crate::Build;
 
 // The version number
-pub const CFG_RELEASE_NUM: &str = "1.42.0";
+pub const CFG_RELEASE_NUM: &str = "1.43.0";
 
 pub struct GitInfo {
     inner: Option<Info>,
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
index eced03506a..65a00db339 100644
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@ -18,7 +18,6 @@ use std::str;
 use build_helper::{output, t, up_to_date};
 use filetime::FileTime;
 use serde::Deserialize;
-use serde_json;
 
 use crate::builder::Cargo;
 use crate::dist;
@@ -142,14 +141,15 @@ fn copy_third_party_objects(
         copy_and_stamp(&srcdir, "crt1.o");
     }
 
-    // Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx.
+    // Copies libunwind.a compiled to be linked with x86_64-fortanix-unknown-sgx.
     //
     // This target needs to be linked to Fortanix's port of llvm's libunwind.
     // libunwind requires support for rwlock and printing to stderr,
     // which is provided by std for this target.
     if target == "x86_64-fortanix-unknown-sgx" {
         let src_path_env = "X86_FORTANIX_SGX_LIBS";
-        let src = env::var(src_path_env).expect(&format!("{} not found in env", src_path_env));
+        let src =
+            env::var(src_path_env).unwrap_or_else(|_| panic!("{} not found in env", src_path_env));
         copy_and_stamp(Path::new(&src), "libunwind.a");
     }
 
@@ -361,7 +361,7 @@ impl Step for StartupObjects {
                 );
             }
 
-            let target = sysroot_dir.join(file.to_string() + ".o");
+            let target = sysroot_dir.join((*file).to_string() + ".o");
             builder.copy(dst_file, &target);
             target_deps.push(target);
         }
@@ -515,7 +515,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: Interne
         .env("CFG_VERSION", builder.rust_version())
         .env("CFG_PREFIX", builder.config.prefix.clone().unwrap_or_default());
 
-    let libdir_relative = builder.config.libdir_relative().unwrap_or(Path::new("lib"));
+    let libdir_relative = builder.config.libdir_relative().unwrap_or_else(|| Path::new("lib"));
     cargo.env("CFG_LIBDIR_RELATIVE", libdir_relative);
 
     if let Some(ref ver_date) = builder.rust_info.commit_date() {
@@ -843,11 +843,11 @@ pub fn run_cargo(
         };
         for filename in filenames {
             // Skip files like executables
-            if !filename.ends_with(".rlib")
-                && !filename.ends_with(".lib")
-                && !filename.ends_with(".a")
-                && !is_dylib(&filename)
-                && !(is_check && filename.ends_with(".rmeta"))
+            if !(filename.ends_with(".rlib")
+                || filename.ends_with(".lib")
+                || filename.ends_with(".a")
+                || is_dylib(&filename)
+                || (is_check && filename.ends_with(".rmeta")))
             {
                 continue;
             }
@@ -905,7 +905,7 @@ pub fn run_cargo(
     for (prefix, extension, expected_len) in toplevel {
         let candidates = contents.iter().filter(|&&(_, ref filename, ref meta)| {
             filename.starts_with(&prefix[..])
-                && filename[prefix.len()..].starts_with("-")
+                && filename[prefix.len()..].starts_with('-')
                 && filename.ends_with(&extension[..])
                 && meta.len() == expected_len
         });
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
index 110c8b844d..56164b74f3 100644
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
@@ -16,7 +16,6 @@ use crate::flags::Flags;
 pub use crate::flags::Subcommand;
 use build_helper::t;
 use serde::Deserialize;
-use toml;
 
 /// Global configuration for the entire build and/or bootstrap.
 ///
@@ -83,6 +82,7 @@ pub struct Config {
     pub llvm_use_linker: Option<String>,
     pub llvm_allow_old_toolchain: Option<bool>,
 
+    pub use_lld: bool,
     pub lld_enabled: bool,
     pub lldb_enabled: bool,
     pub llvm_tools_enabled: bool,
@@ -116,6 +116,7 @@ pub struct Config {
     pub targets: Vec<Interned<String>>,
     pub local_rebuild: bool,
     pub jemalloc: bool,
+    pub control_flow_guard: bool,
 
     // dist misc
     pub dist_sign_folder: Option<PathBuf>,
@@ -176,6 +177,15 @@ pub struct Target {
     pub no_std: bool,
 }
 
+impl Target {
+    pub fn from_triple(triple: &str) -> Self {
+        let mut target: Self = Default::default();
+        if triple.contains("-none") || triple.contains("nvptx") {
+            target.no_std = true;
+        }
+        target
+    }
+}
 /// Structure of the `config.toml` file that configuration is read from.
 ///
 /// This structure uses `Decodable` to automatically decode a TOML configuration
@@ -322,6 +332,7 @@ struct Rust {
     save_toolstates: Option<String>,
     codegen_backends: Option<Vec<String>>,
     lld: Option<bool>,
+    use_lld: Option<bool>,
     llvm_tools: Option<bool>,
     lldb: Option<bool>,
     deny_warnings: Option<bool>,
@@ -332,6 +343,7 @@ struct Rust {
     jemalloc: Option<bool>,
     test_compare_mode: Option<bool>,
     llvm_libunwind: Option<bool>,
+    control_flow_guard: Option<bool>,
 }
 
 /// TOML representation of how each build target is configured.
@@ -350,6 +362,7 @@ struct TomlTarget {
     musl_root: Option<String>,
     wasi_root: Option<String>,
     qemu_rootfs: Option<String>,
+    no_std: Option<bool>,
 }
 
 impl Config {
@@ -440,7 +453,7 @@ impl Config {
                     }
                 }
             })
-            .unwrap_or_else(|| TomlConfig::default());
+            .unwrap_or_else(TomlConfig::default);
 
         let build = toml.build.clone().unwrap_or_default();
         // set by bootstrap.py
@@ -539,7 +552,7 @@ impl Config {
             config.llvm_ldflags = llvm.ldflags.clone();
             set(&mut config.llvm_use_libcxx, llvm.use_libcxx);
             config.llvm_use_linker = llvm.use_linker.clone();
-            config.llvm_allow_old_toolchain = llvm.allow_old_toolchain.clone();
+            config.llvm_allow_old_toolchain = llvm.allow_old_toolchain;
         }
 
         if let Some(ref rust) = toml.rust {
@@ -566,6 +579,7 @@ impl Config {
             if let Some(true) = rust.incremental {
                 config.incremental = true;
             }
+            set(&mut config.use_lld, rust.use_lld);
             set(&mut config.lld_enabled, rust.lld);
             set(&mut config.lldb_enabled, rust.lldb);
             set(&mut config.llvm_tools_enabled, rust.llvm_tools);
@@ -578,6 +592,7 @@ impl Config {
             set(&mut config.rust_verify_llvm_ir, rust.verify_llvm_ir);
             config.rust_thin_lto_import_instr_limit = rust.thin_lto_import_instr_limit;
             set(&mut config.rust_remap_debuginfo, rust.remap_debuginfo);
+            set(&mut config.control_flow_guard, rust.control_flow_guard);
 
             if let Some(ref backends) = rust.codegen_backends {
                 config.rust_codegen_backends =
@@ -590,7 +605,7 @@ impl Config {
 
         if let Some(ref t) = toml.target {
             for (triple, cfg) in t {
-                let mut target = Target::default();
+                let mut target = Target::from_triple(triple);
 
                 if let Some(ref s) = cfg.llvm_config {
                     target.llvm_config = Some(config.src.join(s));
@@ -601,12 +616,15 @@ impl Config {
                 if let Some(ref s) = cfg.android_ndk {
                     target.ndk = Some(config.src.join(s));
                 }
+                if let Some(s) = cfg.no_std {
+                    target.no_std = s;
+                }
                 target.cc = cfg.cc.clone().map(PathBuf::from);
                 target.cxx = cfg.cxx.clone().map(PathBuf::from);
                 target.ar = cfg.ar.clone().map(PathBuf::from);
                 target.ranlib = cfg.ranlib.clone().map(PathBuf::from);
                 target.linker = cfg.linker.clone().map(PathBuf::from);
-                target.crt_static = cfg.crt_static.clone();
+                target.crt_static = cfg.crt_static;
                 target.musl_root = cfg.musl_root.clone().map(PathBuf::from);
                 target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from);
                 target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from);
diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
index 7cfc5385e2..2a46c563d1 100755
--- a/src/bootstrap/configure.py
+++ b/src/bootstrap/configure.py
@@ -60,10 +60,11 @@ o("lld", "rust.lld", "build lld")
 o("lldb", "rust.lldb", "build lldb")
 o("missing-tools", "dist.missing-tools", "allow failures when building tools")
 o("use-libcxx", "llvm.use-libcxx", "build LLVM with libc++")
+o("control-flow-guard", "rust.control-flow-guard", "Enable Control Flow Guard")
 
-o("cflags", "llvm.cflags", "build LLVM with these extra compiler flags")
-o("cxxflags", "llvm.cxxflags", "build LLVM with these extra compiler flags")
-o("ldflags", "llvm.ldflags", "build LLVM with these extra linker flags")
+v("llvm-cflags", "llvm.cflags", "build LLVM with these extra compiler flags")
+v("llvm-cxxflags", "llvm.cxxflags", "build LLVM with these extra compiler flags")
+v("llvm-ldflags", "llvm.ldflags", "build LLVM with these extra linker flags")
 
 o("llvm-libunwind", "rust.llvm-libunwind", "use LLVM libunwind")
 
@@ -392,11 +393,12 @@ for target in configured_targets:
 
 
 def is_number(value):
-  try:
-    float(value)
-    return True
-  except ValueError:
-    return False
+    try:
+        float(value)
+        return True
+    except ValueError:
+        return False
+
 
 # Here we walk through the constructed configuration we have from the parsed
 # command line arguments. We then apply each piece of configuration by
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 8d13df3ee2..8215211ea1 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -105,6 +105,7 @@ impl Step for Docs {
         t!(fs::create_dir_all(&dst));
         let src = builder.doc_out(host);
         builder.cp_r(&src, &dst);
+        builder.install(&builder.src.join("src/doc/robots.txt"), &dst, 0o644);
 
         let mut cmd = rust_installer(builder);
         cmd.arg("generate")
@@ -233,7 +234,14 @@ fn make_win_dist(
         }
     }
 
-    let target_tools = ["gcc.exe", "ld.exe", "dlltool.exe", "libwinpthread-1.dll"];
+    let compiler = if target_triple == "i686-pc-windows-gnu" {
+        "i686-w64-mingw32-gcc.exe"
+    } else if target_triple == "x86_64-pc-windows-gnu" {
+        "x86_64-w64-mingw32-gcc.exe"
+    } else {
+        "gcc.exe"
+    };
+    let target_tools = [compiler, "ld.exe", "dlltool.exe", "libwinpthread-1.dll"];
     let mut rustc_dlls = vec!["libwinpthread-1.dll"];
     if target_triple.starts_with("i686-") {
         rustc_dlls.push("libgcc_s_dw2-1.dll");
@@ -827,7 +835,7 @@ impl Step for Analysis {
         assert!(builder.config.extended);
         let name = pkgname(builder, "rust-analysis");
 
-        if &compiler.host != builder.config.build {
+        if compiler.host != builder.config.build {
             return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
         }
 
@@ -876,7 +884,7 @@ fn copy_src_dirs(builder: &Builder<'_>, src_dirs: &[&str], exclude_dirs: &[&str]
             Some(path) => path,
             None => return false,
         };
-        if spath.ends_with("~") || spath.ends_with(".pyc") {
+        if spath.ends_with('~') || spath.ends_with(".pyc") {
             return false;
         }
 
@@ -994,8 +1002,6 @@ impl Step for Src {
             "src/tools/rustc-std-workspace-core",
             "src/tools/rustc-std-workspace-alloc",
             "src/tools/rustc-std-workspace-std",
-            "src/librustc",
-            "src/libsyntax",
         ];
 
         copy_src_dirs(builder, &std_src_dirs[..], &[], &dst_src);
diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
index 204056598d..b0d9a5b946 100644
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -560,7 +560,7 @@ impl Step for Rustdoc {
         builder.ensure(Rustc { stage, target });
 
         // Build rustdoc.
-        builder.ensure(tool::Rustdoc { compiler: compiler });
+        builder.ensure(tool::Rustdoc { compiler });
 
         // Symlink compiler docs to the output directory of rustdoc documentation.
         let out_dir = builder.stage_out(compiler, Mode::ToolRustc).join(target).join("doc");
diff --git a/src/bootstrap/flags.rs b/src/bootstrap/flags.rs
index 2101ef27f9..0b2ab6bbbc 100644
--- a/src/bootstrap/flags.rs
+++ b/src/bootstrap/flags.rs
@@ -33,7 +33,7 @@ pub struct Flags {
     pub rustc_error_format: Option<String>,
     pub dry_run: bool,
 
-    // This overrides the deny-warnings configuation option,
+    // This overrides the deny-warnings configuration option,
     // which passes -Dwarnings to the compiler invocations.
     //
     // true => deny, false => warn
@@ -571,7 +571,7 @@ fn split(s: &[String]) -> Vec<String> {
 }
 
 fn parse_deny_warnings(matches: &getopts::Matches) -> Option<bool> {
-    match matches.opt_str("warnings").as_ref().map(|v| v.as_str()) {
+    match matches.opt_str("warnings").as_deref() {
         Some("deny") => Some(true),
         Some("warn") => Some(false),
         Some(value) => {
diff --git a/src/bootstrap/format.rs b/src/bootstrap/format.rs
index 6e5e3fe07e..a4acb14ee4 100644
--- a/src/bootstrap/format.rs
+++ b/src/bootstrap/format.rs
@@ -1,7 +1,7 @@
 //! Runs rustfmt on the repository.
 
 use crate::Build;
-use build_helper::t;
+use build_helper::{output, t};
 use ignore::WalkBuilder;
 use std::path::Path;
 use std::process::Command;
@@ -53,6 +53,17 @@ pub fn format(build: &Build, check: bool) {
     for ignore in rustfmt_config.ignore {
         ignore_fmt.add(&format!("!{}", ignore)).expect(&ignore);
     }
+    let untracked_paths_output = output(
+        Command::new("git").arg("status").arg("--porcelain").arg("--untracked-files=normal"),
+    );
+    let untracked_paths = untracked_paths_output
+        .lines()
+        .filter(|entry| entry.starts_with("??"))
+        .map(|entry| entry.split(" ").nth(1).expect("every git status entry should list a path"));
+    for untracked_path in untracked_paths {
+        eprintln!("skip untracked path {} during rustfmt invocations", untracked_path);
+        ignore_fmt.add(&format!("!{}", untracked_path)).expect(&untracked_path);
+    }
     let ignore_fmt = ignore_fmt.build().unwrap();
 
     let rustfmt_path = build.config.initial_rustfmt.as_ref().unwrap_or_else(|| {
diff --git a/src/bootstrap/install.rs b/src/bootstrap/install.rs
index f8734ebdf4..6549262811 100644
--- a/src/bootstrap/install.rs
+++ b/src/bootstrap/install.rs
@@ -126,9 +126,8 @@ fn add_destdir(path: &Path, destdir: &Option<PathBuf>) -> PathBuf {
         None => return path.to_path_buf(),
     };
     for part in path.components() {
-        match part {
-            Component::Normal(s) => ret.push(s),
-            _ => {}
+        if let Component::Normal(s) = part {
+            ret.push(s)
         }
     }
     ret
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 1fee3fd9ac..a476d25f10 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -103,7 +103,6 @@
 //! More documentation can be found in each respective module below, and you can
 //! also check out the `src/bootstrap/README.md` file for more information.
 
-#![feature(core_intrinsics)]
 #![feature(drain_filter)]
 
 use std::cell::{Cell, RefCell};
@@ -239,9 +238,10 @@ pub struct Build {
     hosts: Vec<Interned<String>>,
     targets: Vec<Interned<String>>,
 
-    // Stage 0 (downloaded) compiler and cargo or their local rust equivalents
+    // Stage 0 (downloaded) compiler, lld and cargo or their local rust equivalents
     initial_rustc: PathBuf,
     initial_cargo: PathBuf,
+    initial_lld: PathBuf,
 
     // Runtime state filled in later on
     // C/C++ compilers and archiver for all targets
@@ -343,9 +343,18 @@ impl Build {
         // we always try to use git for LLVM builds
         let in_tree_llvm_info = channel::GitInfo::new(false, &src.join("src/llvm-project"));
 
+        let initial_sysroot = config.initial_rustc.parent().unwrap().parent().unwrap();
+        let initial_lld = initial_sysroot
+            .join("lib")
+            .join("rustlib")
+            .join(config.build)
+            .join("bin")
+            .join("rust-lld");
+
         let mut build = Build {
             initial_rustc: config.initial_rustc.clone(),
             initial_cargo: config.initial_cargo.clone(),
+            initial_lld,
             local_rebuild: config.local_rebuild,
             fail_fast: config.cmd.fail_fast(),
             doc_tests: config.cmd.doc_tests(),
@@ -444,7 +453,7 @@ impl Build {
             builder.execute_cli();
         } else {
             let builder = builder::Builder::new(&self);
-            let _ = builder.execute_cli();
+            builder.execute_cli();
         }
 
         // Check for postponed failures from `test --no-fail-fast`.
@@ -810,7 +819,7 @@ impl Build {
     }
 
     /// Returns the path to the linker for the given target if it needs to be overridden.
-    fn linker(&self, target: Interned<String>) -> Option<&Path> {
+    fn linker(&self, target: Interned<String>, can_use_lld: bool) -> Option<&Path> {
         if let Some(linker) = self.config.target_config.get(&target).and_then(|c| c.linker.as_ref())
         {
             Some(linker)
@@ -819,6 +828,8 @@ impl Build {
             && !target.contains("msvc")
         {
             Some(self.cc(target))
+        } else if can_use_lld && self.config.use_lld && self.build == target {
+            Some(&self.initial_lld)
         } else {
             None
         }
@@ -839,7 +850,7 @@ impl Build {
             .target_config
             .get(&target)
             .and_then(|t| t.musl_root.as_ref())
-            .or(self.config.musl_root.as_ref())
+            .or_else(|| self.config.musl_root.as_ref())
             .map(|p| &**p)
     }
 
@@ -1026,7 +1037,7 @@ impl Build {
     }
 
     fn llvm_link_tools_dynamically(&self, target: Interned<String>) -> bool {
-        (target.contains("linux-gnu") || target.contains("apple-darwin"))
+        target.contains("linux-gnu") || target.contains("apple-darwin")
     }
 
     /// Returns the `version` string associated with this compiler for Rust
diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs
index 8a26adc7ed..292aa3b1e2 100644
--- a/src/bootstrap/metadata.rs
+++ b/src/bootstrap/metadata.rs
@@ -5,7 +5,6 @@ use std::process::Command;
 
 use build_helper::output;
 use serde::Deserialize;
-use serde_json;
 
 use crate::cache::INTERNER;
 use crate::{Build, Crate};
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index a796685f9d..c22c2a336f 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -15,8 +15,6 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use build_helper::{output, t};
-use cc;
-use cmake;
 
 use crate::builder::{Builder, RunConfig, ShouldRun, Step};
 use crate::cache::Interned;
@@ -205,7 +203,7 @@ impl Step for Llvm {
             cfg.define("LLVM_ENABLE_LIBXML2", "OFF");
         }
 
-        if enabled_llvm_projects.len() > 0 {
+        if !enabled_llvm_projects.is_empty() {
             enabled_llvm_projects.sort();
             enabled_llvm_projects.dedup();
             cfg.define("LLVM_ENABLE_PROJECTS", enabled_llvm_projects.join(";"));
@@ -243,12 +241,8 @@ impl Step for Llvm {
                 cfg.define("LLVM_VERSION_SUFFIX", suffix);
             }
         } else {
-            let mut default_suffix =
-                format!("-rust-{}-{}", channel::CFG_RELEASE_NUM, builder.config.channel,);
-            if let Some(sha) = llvm_info.sha_short() {
-                default_suffix.push_str("-");
-                default_suffix.push_str(sha);
-            }
+            let default_suffix =
+                format!("-rust-{}-{}", channel::CFG_RELEASE_NUM, builder.config.channel);
             cfg.define("LLVM_VERSION_SUFFIX", default_suffix);
         }
 
@@ -580,7 +574,7 @@ impl Step for Sanitizers {
         }
 
         let out_dir = builder.native_dir(self.target).join("sanitizers");
-        let runtimes = supported_sanitizers(&out_dir, self.target);
+        let runtimes = supported_sanitizers(&out_dir, self.target, &builder.config.channel);
         if runtimes.is_empty() {
             return runtimes;
         }
@@ -647,7 +641,11 @@ pub struct SanitizerRuntime {
 }
 
 /// Returns sanitizers available on a given target.
-fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<SanitizerRuntime> {
+fn supported_sanitizers(
+    out_dir: &Path,
+    target: Interned<String>,
+    channel: &str,
+) -> Vec<SanitizerRuntime> {
     let mut result = Vec::new();
     match &*target {
         "x86_64-apple-darwin" => {
@@ -656,7 +654,7 @@ fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<Sanitiz
                     cmake_target: format!("clang_rt.{}_osx_dynamic", s),
                     path: out_dir
                         .join(&format!("build/lib/darwin/libclang_rt.{}_osx_dynamic.dylib", s)),
-                    name: format!("librustc_rt.{}.dylib", s),
+                    name: format!("librustc-{}_rt.{}.dylib", channel, s),
                 });
             }
         }
@@ -665,7 +663,7 @@ fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<Sanitiz
                 result.push(SanitizerRuntime {
                     cmake_target: format!("clang_rt.{}-x86_64", s),
                     path: out_dir.join(&format!("build/lib/linux/libclang_rt.{}-x86_64.a", s)),
-                    name: format!("librustc_rt.{}.a", s),
+                    name: format!("librustc-{}_rt.{}.a", channel, s),
                 });
             }
         }
@@ -674,7 +672,7 @@ fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<Sanitiz
                 result.push(SanitizerRuntime {
                     cmake_target: format!("clang_rt.{}-x86_64", s),
                     path: out_dir.join(&format!("build/lib/fuchsia/libclang_rt.{}-x86_64.a", s)),
-                    name: format!("librustc_rt.{}.a", s),
+                    name: format!("librustc-{}_rt.{}.a", channel, s),
                 });
             }
         }
@@ -683,7 +681,7 @@ fn supported_sanitizers(out_dir: &Path, target: Interned<String>) -> Vec<Sanitiz
                 result.push(SanitizerRuntime {
                     cmake_target: format!("clang_rt.{}-aarch64", s),
                     path: out_dir.join(&format!("build/lib/fuchsia/libclang_rt.{}-aarch64.a", s)),
-                    name: format!("librustc_rt.{}.a", s),
+                    name: format!("librustc-{}_rt.{}.a", channel, s),
                 });
             }
         }
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index 8ff7056e62..530e74da8c 100644
--- a/src/bootstrap/sanity.rs
+++ b/src/bootstrap/sanity.rs
@@ -17,6 +17,7 @@ use std::process::Command;
 
 use build_helper::{output, t};
 
+use crate::config::Target;
 use crate::Build;
 
 struct Finder {
@@ -192,13 +193,9 @@ pub fn check(build: &mut Build) {
             panic!("the iOS target is only supported on macOS");
         }
 
-        if target.contains("-none-") || target.contains("nvptx") {
-            if build.no_std(*target).is_none() {
-                let target = build.config.target_config.entry(target.clone()).or_default();
-
-                target.no_std = true;
-            }
+        build.config.target_config.entry(target.clone()).or_insert(Target::from_triple(target));
 
+        if target.contains("-none-") || target.contains("nvptx") {
             if build.no_std(*target) == Some(false) {
                 panic!("All the *-none-* and nvptx* targets are no-std targets")
             }
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 659a308d5b..f041555c93 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -388,8 +388,10 @@ impl Step for Miri {
             cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
             // Debug things.
             cargo.env("RUST_BACKTRACE", "1");
+            // Overwrite bootstrap's `rustc` wrapper overwriting our flags.
+            cargo.env("RUSTC_DEBUG_ASSERTIONS", "true");
             // Let cargo-miri know where xargo ended up.
-            cargo.env("XARGO", builder.out.join("bin").join("xargo"));
+            cargo.env("XARGO_CHECK", builder.out.join("bin").join("xargo-check"));
 
             let mut cargo = Command::from(cargo);
             if !try_run(builder, &mut cargo) {
@@ -397,7 +399,7 @@ impl Step for Miri {
             }
 
             // # Determine where Miri put its sysroot.
-            // To this end, we run `cargo miri setup --env` and capture the output.
+            // To this end, we run `cargo miri setup --print-sysroot` and capture the output.
             // (We do this separately from the above so that when the setup actually
             // happens we get some output.)
             // We re-use the `cargo` from above.
@@ -596,7 +598,7 @@ impl Step for RustdocTheme {
             .env("RUSTDOC_REAL", builder.rustdoc(self.compiler))
             .env("RUSTDOC_CRATE_VERSION", builder.rust_version())
             .env("RUSTC_BOOTSTRAP", "1");
-        if let Some(linker) = builder.linker(self.compiler.host) {
+        if let Some(linker) = builder.linker(self.compiler.host, true) {
             cmd.env("RUSTC_TARGET_LINKER", linker);
         }
         try_run(builder, &mut cmd);
@@ -662,7 +664,7 @@ impl Step for RustdocJSNotStd {
                 target: self.target,
                 mode: "js-doc-test",
                 suite: "rustdoc-js",
-                path: None,
+                path: "src/test/rustdoc-js",
                 compare_mode: None,
             });
         } else {
@@ -698,7 +700,7 @@ impl Step for RustdocUi {
             target: self.target,
             mode: "ui",
             suite: "rustdoc-ui",
-            path: Some("src/test/rustdoc-ui"),
+            path: "src/test/rustdoc-ui",
             compare_mode: None,
         })
     }
@@ -843,7 +845,7 @@ macro_rules! test_definitions {
                     target: self.target,
                     mode: $mode,
                     suite: $suite,
-                    path: Some($path),
+                    path: $path,
                     compare_mode: $compare_mode,
                 })
             }
@@ -926,7 +928,7 @@ struct Compiletest {
     target: Interned<String>,
     mode: &'static str,
     suite: &'static str,
-    path: Option<&'static str>,
+    path: &'static str,
     compare_mode: Option<&'static str>,
 }
 
@@ -949,7 +951,7 @@ impl Step for Compiletest {
         let suite = self.suite;
 
         // Path for test suite
-        let suite_path = self.path.unwrap_or("");
+        let suite_path = self.path;
 
         // Skip codegen tests if they aren't enabled in configuration.
         if !builder.config.codegen_tests && suite == "codegen" {
@@ -1035,7 +1037,8 @@ impl Step for Compiletest {
         flags.push("-Zunstable-options".to_string());
         flags.push(builder.config.cmd.rustc_args().join(" "));
 
-        if let Some(linker) = builder.linker(target) {
+        // Don't use LLD here since we want to test that rustc finds and uses a linker by itself.
+        if let Some(linker) = builder.linker(target, false) {
             cmd.arg("--linker").arg(linker);
         }
 
@@ -1149,7 +1152,6 @@ impl Step for Compiletest {
             // requires that a C++ compiler was configured which isn't always the case.
             if !builder.config.dry_run && suite == "run-make-fulldeps" {
                 let llvm_components = output(Command::new(&llvm_config).arg("--components"));
-                let llvm_cxxflags = output(Command::new(&llvm_config).arg("--cxxflags"));
                 cmd.arg("--cc")
                     .arg(builder.cc(target))
                     .arg("--cxx")
@@ -1157,9 +1159,7 @@ impl Step for Compiletest {
                     .arg("--cflags")
                     .arg(builder.cflags(target, GitRepo::Rustc).join(" "))
                     .arg("--llvm-components")
-                    .arg(llvm_components.trim())
-                    .arg("--llvm-cxxflags")
-                    .arg(llvm_cxxflags.trim());
+                    .arg(llvm_components.trim());
                 if let Some(ar) = builder.ar(target) {
                     cmd.arg("--ar").arg(ar);
                 }
@@ -1197,8 +1197,6 @@ impl Step for Compiletest {
                 .arg("--cflags")
                 .arg("")
                 .arg("--llvm-components")
-                .arg("")
-                .arg("--llvm-cxxflags")
                 .arg("");
         }
 
@@ -1268,15 +1266,15 @@ impl Step for Compiletest {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-struct DocTest {
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+struct BookTest {
     compiler: Compiler,
-    path: &'static str,
+    path: PathBuf,
     name: &'static str,
     is_ext_doc: bool,
 }
 
-impl Step for DocTest {
+impl Step for BookTest {
     type Output = ();
     const ONLY_HOSTS: bool = true;
 
@@ -1284,12 +1282,59 @@ impl Step for DocTest {
         run.never()
     }
 
-    /// Runs `rustdoc --test` for all documentation in `src/doc`.
+    /// Runs the documentation tests for a book in `src/doc`.
     ///
-    /// This will run all tests in our markdown documentation (e.g., the book)
-    /// located in `src/doc`. The `rustdoc` that's run is the one that sits next to
-    /// `compiler`.
+    /// This uses the `rustdoc` that sits next to `compiler`.
     fn run(self, builder: &Builder<'_>) {
+        // External docs are different from local because:
+        // - Some books need pre-processing by mdbook before being tested.
+        // - They need to save their state to toolstate.
+        // - They are only tested on the "checktools" builders.
+        //
+        // The local docs are tested by default, and we don't want to pay the
+        // cost of building mdbook, so they use `rustdoc --test` directly.
+        // Also, the unstable book is special because SUMMARY.md is generated,
+        // so it is easier to just run `rustdoc` on its files.
+        if self.is_ext_doc {
+            self.run_ext_doc(builder);
+        } else {
+            self.run_local_doc(builder);
+        }
+    }
+}
+
+impl BookTest {
+    /// This runs the equivalent of `mdbook test` (via the rustbook wrapper)
+    /// which in turn runs `rustdoc --test` on each file in the book.
+    fn run_ext_doc(self, builder: &Builder<'_>) {
+        let compiler = self.compiler;
+
+        builder.ensure(compile::Std { compiler, target: compiler.host });
+
+        // mdbook just executes a binary named "rustdoc", so we need to update
+        // PATH so that it points to our rustdoc.
+        let mut rustdoc_path = builder.rustdoc(compiler);
+        rustdoc_path.pop();
+        let old_path = env::var_os("PATH").unwrap_or_default();
+        let new_path = env::join_paths(iter::once(rustdoc_path).chain(env::split_paths(&old_path)))
+            .expect("could not add rustdoc to PATH");
+
+        let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
+        let path = builder.src.join(&self.path);
+        rustbook_cmd.env("PATH", new_path).arg("test").arg(path);
+        builder.add_rust_test_threads(&mut rustbook_cmd);
+        builder.info(&format!("Testing rustbook {}", self.path.display()));
+        let _time = util::timeit(&builder);
+        let toolstate = if try_run(builder, &mut rustbook_cmd) {
+            ToolState::TestPass
+        } else {
+            ToolState::TestFail
+        };
+        builder.save_toolstate(self.name, toolstate);
+    }
+
+    /// This runs `rustdoc --test` on all `.md` files in the path.
+    fn run_local_doc(self, builder: &Builder<'_>) {
         let compiler = self.compiler;
 
         builder.ensure(compile::Std { compiler, target: compiler.host });
@@ -1298,7 +1343,6 @@ impl Step for DocTest {
         // tests for all files that end in `*.md`
         let mut stack = vec![builder.src.join(self.path)];
         let _time = util::timeit(&builder);
-
         let mut files = Vec::new();
         while let Some(p) = stack.pop() {
             if p.is_dir() {
@@ -1310,25 +1354,13 @@ impl Step for DocTest {
                 continue;
             }
 
-            // The nostarch directory in the book is for no starch, and so isn't
-            // guaranteed to builder. We don't care if it doesn't build, so skip it.
-            if p.to_str().map_or(false, |p| p.contains("nostarch")) {
-                continue;
-            }
-
             files.push(p);
         }
 
         files.sort();
 
-        let mut toolstate = ToolState::TestPass;
         for file in files {
-            if !markdown_test(builder, compiler, &file) {
-                toolstate = ToolState::TestFail;
-            }
-        }
-        if self.is_ext_doc {
-            builder.save_toolstate(self.name, toolstate);
+            markdown_test(builder, compiler, &file);
         }
     }
 }
@@ -1357,9 +1389,9 @@ macro_rules! test_book {
                 }
 
                 fn run(self, builder: &Builder<'_>) {
-                    builder.ensure(DocTest {
+                    builder.ensure(BookTest {
                         compiler: self.compiler,
-                        path: $path,
+                        path: PathBuf::from($path),
                         name: $book_name,
                         is_ext_doc: !$default,
                     });
@@ -1429,13 +1461,10 @@ impl Step for ErrorIndex {
 }
 
 fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) -> bool {
-    match fs::read_to_string(markdown) {
-        Ok(contents) => {
-            if !contents.contains("```") {
-                return true;
-            }
+    if let Ok(contents) = fs::read_to_string(markdown) {
+        if !contents.contains("```") {
+            return true;
         }
-        Err(_) => {}
     }
 
     builder.info(&format!("doc tests for: {}", markdown.display()));
@@ -1464,7 +1493,7 @@ impl Step for RustcGuide {
     const ONLY_HOSTS: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("src/doc/rustc-guide")
+        run.path("src/doc/rustc-dev-guide")
     }
 
     fn make_run(run: RunConfig<'_>) {
@@ -1472,14 +1501,14 @@ impl Step for RustcGuide {
     }
 
     fn run(self, builder: &Builder<'_>) {
-        let src = builder.src.join("src/doc/rustc-guide");
+        let src = builder.src.join("src/doc/rustc-dev-guide");
         let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
         let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
             ToolState::TestPass
         } else {
             ToolState::TestFail
         };
-        builder.save_toolstate("rustc-guide", toolstate);
+        builder.save_toolstate("rustc-dev-guide", toolstate);
     }
 }
 
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 7f24768a4f..67e0ed5c58 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -234,7 +234,7 @@ pub fn prepare_tool_cargo(
         cargo.env("RUSTC_EXTERNAL_TOOL", "1");
     }
 
-    let mut features = extra_features.iter().cloned().collect::<Vec<_>>();
+    let mut features = extra_features.to_vec();
     if builder.build.config.cargo_native_static {
         if path.ends_with("cargo")
             || path.ends_with("rls")
diff --git a/src/bootstrap/toolstate.rs b/src/bootstrap/toolstate.rs
index b068c8200a..31ff01d5be 100644
--- a/src/bootstrap/toolstate.rs
+++ b/src/bootstrap/toolstate.rs
@@ -6,7 +6,7 @@ use std::env;
 use std::fmt;
 use std::fs;
 use std::io::{Seek, SeekFrom};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::process::Command;
 use std::time;
 
@@ -24,7 +24,7 @@ const OS: Option<&str> = None;
 
 type ToolstateData = HashMap<Box<str>, ToolState>;
 
-#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
+#[derive(Copy, Clone, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd)]
 #[serde(rename_all = "kebab-case")]
 /// Whether a tool can be compiled, tested or neither
 pub enum ToolState {
@@ -89,7 +89,7 @@ static STABLE_TOOLS: &[(&str, &str)] = &[
 static NIGHTLY_TOOLS: &[(&str, &str)] = &[
     ("miri", "src/tools/miri"),
     ("embedded-book", "src/doc/embedded-book"),
-    ("rustc-guide", "src/doc/rustc-guide"),
+    ("rustc-dev-guide", "src/doc/rustc-dev-guide"),
 ];
 
 fn print_error(tool: &str, submodule: &str) {
@@ -124,7 +124,7 @@ fn check_changed_files(toolstates: &HashMap<Box<str>, ToolState>) {
     let output = t!(String::from_utf8(output.stdout));
 
     for (tool, submodule) in STABLE_TOOLS.iter().chain(NIGHTLY_TOOLS.iter()) {
-        let changed = output.lines().any(|l| l.starts_with("M") && l.ends_with(submodule));
+        let changed = output.lines().any(|l| l.starts_with('M') && l.ends_with(submodule));
         eprintln!("Verifying status of {}...", tool);
         if !changed {
             continue;
@@ -143,10 +143,31 @@ pub struct ToolStateCheck;
 impl Step for ToolStateCheck {
     type Output = ();
 
-    /// Runs the `linkchecker` tool as compiled in `stage` by the `host` compiler.
+    /// Checks tool state status.
     ///
-    /// This tool in `src/tools` will verify the validity of all our links in the
-    /// documentation to ensure we don't have a bunch of dead ones.
+    /// This is intended to be used in the `checktools.sh` script. To use
+    /// this, set `save-toolstates` in `config.toml` so that tool status will
+    /// be saved to a JSON file. Then, run `x.py test --no-fail-fast` for all
+    /// of the tools to populate the JSON file. After that is done, this
+    /// command can be run to check for any status failures, and exits with an
+    /// error if there are any.
+    ///
+    /// This also handles publishing the results to the `history` directory of
+    /// the toolstate repo https://github.com/rust-lang-nursery/rust-toolstate
+    /// if the env var `TOOLSTATE_PUBLISH` is set. Note that there is a
+    /// *separate* step of updating the `latest.json` file and creating GitHub
+    /// issues and comments in `src/ci/publish_toolstate.sh`, which is only
+    /// performed on master. (The shell/python code is intended to be migrated
+    /// here eventually.)
+    ///
+    /// The rules for failure are:
+    /// * If the PR modifies a tool, the status must be test-pass.
+    ///   NOTE: There is intent to change this, see
+    ///   https://github.com/rust-lang/rust/issues/65000.
+    /// * All "stable" tools must be test-pass on the stable or beta branches.
+    /// * During beta promotion week, a PR is not allowed to "regress" a
+    ///   stable tool. That is, the status is not allowed to get worse
+    ///   (test-pass to test-fail or build-fail).
     fn run(self, builder: &Builder<'_>) {
         if builder.config.dry_run {
             return;
@@ -171,6 +192,8 @@ impl Step for ToolStateCheck {
         }
 
         check_changed_files(&toolstates);
+        checkout_toolstate_repo();
+        let old_toolstate = read_old_toolstate();
 
         for (tool, _) in STABLE_TOOLS.iter() {
             let state = toolstates[*tool];
@@ -180,11 +203,24 @@ impl Step for ToolStateCheck {
                     did_error = true;
                     eprintln!("error: Tool `{}` should be test-pass but is {}", tool, state);
                 } else if in_beta_week {
-                    did_error = true;
-                    eprintln!(
-                        "error: Tool `{}` should be test-pass but is {} during beta week.",
-                        tool, state
-                    );
+                    let old_state = old_toolstate
+                        .iter()
+                        .find(|ts| ts.tool == *tool)
+                        .expect("latest.json missing tool")
+                        .state();
+                    if state < old_state {
+                        did_error = true;
+                        eprintln!(
+                            "error: Tool `{}` has regressed from {} to {} during beta week.",
+                            tool, old_state, state
+                        );
+                    } else {
+                        eprintln!(
+                            "warning: Tool `{}` is not test-pass (is `{}`), \
+                            this should be fixed before beta is branched.",
+                            tool, state
+                        );
+                    }
                 }
             }
         }
@@ -247,6 +283,70 @@ impl Builder<'_> {
     }
 }
 
+fn toolstate_repo() -> String {
+    env::var("TOOLSTATE_REPO")
+        .unwrap_or_else(|_| "https://github.com/rust-lang-nursery/rust-toolstate.git".to_string())
+}
+
+/// Directory where the toolstate repo is checked out.
+const TOOLSTATE_DIR: &str = "rust-toolstate";
+
+/// Checks out the toolstate repo into `TOOLSTATE_DIR`.
+fn checkout_toolstate_repo() {
+    if let Ok(token) = env::var("TOOLSTATE_REPO_ACCESS_TOKEN") {
+        prepare_toolstate_config(&token);
+    }
+    if Path::new(TOOLSTATE_DIR).exists() {
+        eprintln!("Cleaning old toolstate directory...");
+        t!(fs::remove_dir_all(TOOLSTATE_DIR));
+    }
+
+    let status = Command::new("git")
+        .arg("clone")
+        .arg("--depth=1")
+        .arg(toolstate_repo())
+        .arg(TOOLSTATE_DIR)
+        .status();
+    let success = match status {
+        Ok(s) => s.success(),
+        Err(_) => false,
+    };
+    if !success {
+        panic!("git clone unsuccessful (status: {:?})", status);
+    }
+}
+
+/// Sets up config and authentication for modifying the toolstate repo.
+fn prepare_toolstate_config(token: &str) {
+    fn git_config(key: &str, value: &str) {
+        let status = Command::new("git").arg("config").arg("--global").arg(key).arg(value).status();
+        let success = match status {
+            Ok(s) => s.success(),
+            Err(_) => false,
+        };
+        if !success {
+            panic!("git config key={} value={} successful (status: {:?})", key, value, status);
+        }
+    }
+
+    // If changing anything here, then please check that src/ci/publish_toolstate.sh is up to date
+    // as well.
+    git_config("user.email", "7378925+rust-toolstate-update@users.noreply.github.com");
+    git_config("user.name", "Rust Toolstate Update");
+    git_config("credential.helper", "store");
+
+    let credential = format!("https://{}:x-oauth-basic@github.com\n", token,);
+    let git_credential_path = PathBuf::from(t!(env::var("HOME"))).join(".git-credentials");
+    t!(fs::write(&git_credential_path, credential));
+}
+
+/// Reads the latest toolstate from the toolstate repo.
+fn read_old_toolstate() -> Vec<RepoState> {
+    let latest_path = Path::new(TOOLSTATE_DIR).join("_data").join("latest.json");
+    let old_toolstate = t!(fs::read(latest_path));
+    t!(serde_json::from_slice(&old_toolstate))
+}
+
 /// This function `commit_toolstate_change` provides functionality for pushing a change
 /// to the `rust-toolstate` repository.
 ///
@@ -274,45 +374,7 @@ impl Builder<'_> {
 ///       * See <https://help.github.com/articles/about-commit-email-addresses/>
 ///           if a private email by GitHub is wanted.
 fn commit_toolstate_change(current_toolstate: &ToolstateData, in_beta_week: bool) {
-    fn git_config(key: &str, value: &str) {
-        let status = Command::new("git").arg("config").arg("--global").arg(key).arg(value).status();
-        let success = match status {
-            Ok(s) => s.success(),
-            Err(_) => false,
-        };
-        if !success {
-            panic!("git config key={} value={} successful (status: {:?})", key, value, status);
-        }
-    }
-
-    // If changing anything here, then please check that src/ci/publish_toolstate.sh is up to date
-    // as well.
-    git_config("user.email", "7378925+rust-toolstate-update@users.noreply.github.com");
-    git_config("user.name", "Rust Toolstate Update");
-    git_config("credential.helper", "store");
-
-    let credential = format!(
-        "https://{}:x-oauth-basic@github.com\n",
-        t!(env::var("TOOLSTATE_REPO_ACCESS_TOKEN")),
-    );
-    let git_credential_path = PathBuf::from(t!(env::var("HOME"))).join(".git-credentials");
-    t!(fs::write(&git_credential_path, credential));
-
-    let status = Command::new("git")
-        .arg("clone")
-        .arg("--depth=1")
-        .arg(t!(env::var("TOOLSTATE_REPO")))
-        .status();
-    let success = match status {
-        Ok(s) => s.success(),
-        Err(_) => false,
-    };
-    if !success {
-        panic!("git clone successful (status: {:?})", status);
-    }
-
-    let old_toolstate = t!(fs::read("rust-toolstate/_data/latest.json"));
-    let old_toolstate: Vec<RepoState> = t!(serde_json::from_slice(&old_toolstate));
+    let old_toolstate = read_old_toolstate();
 
     let message = format!("({} CI update)", OS.expect("linux/windows only"));
     let mut success = false;
@@ -322,7 +384,7 @@ fn commit_toolstate_change(current_toolstate: &ToolstateData, in_beta_week: bool
 
         // `git commit` failing means nothing to commit.
         let status = t!(Command::new("git")
-            .current_dir("rust-toolstate")
+            .current_dir(TOOLSTATE_DIR)
             .arg("commit")
             .arg("-a")
             .arg("-m")
@@ -334,7 +396,7 @@ fn commit_toolstate_change(current_toolstate: &ToolstateData, in_beta_week: bool
         }
 
         let status = t!(Command::new("git")
-            .current_dir("rust-toolstate")
+            .current_dir(TOOLSTATE_DIR)
             .arg("push")
             .arg("origin")
             .arg("master")
@@ -347,14 +409,14 @@ fn commit_toolstate_change(current_toolstate: &ToolstateData, in_beta_week: bool
         eprintln!("Sleeping for 3 seconds before retrying push");
         std::thread::sleep(std::time::Duration::from_secs(3));
         let status = t!(Command::new("git")
-            .current_dir("rust-toolstate")
+            .current_dir(TOOLSTATE_DIR)
             .arg("fetch")
             .arg("origin")
             .arg("master")
             .status());
         assert!(status.success());
         let status = t!(Command::new("git")
-            .current_dir("rust-toolstate")
+            .current_dir(TOOLSTATE_DIR)
             .arg("reset")
             .arg("--hard")
             .arg("origin/master")
@@ -375,19 +437,13 @@ fn change_toolstate(
     let mut regressed = false;
     for repo_state in old_toolstate {
         let tool = &repo_state.tool;
-        let state = if cfg!(target_os = "linux") {
-            &repo_state.linux
-        } else if cfg!(windows) {
-            &repo_state.windows
-        } else {
-            unimplemented!()
-        };
+        let state = repo_state.state();
         let new_state = current_toolstate[tool.as_str()];
 
-        if new_state != *state {
+        if new_state != state {
             eprintln!("The state of `{}` has changed from `{}` to `{}`", tool, state, new_state);
-            if (new_state as u8) < (*state as u8) {
-                if !["rustc-guide", "miri", "embedded-book"].contains(&tool.as_str()) {
+            if new_state < state {
+                if !NIGHTLY_TOOLS.iter().any(|(name, _path)| name == tool) {
                     regressed = true;
                 }
             }
@@ -403,7 +459,9 @@ fn change_toolstate(
 
     let toolstate_serialized = t!(serde_json::to_string(&current_toolstate));
 
-    let history_path = format!("rust-toolstate/history/{}.tsv", OS.expect("linux/windows only"));
+    let history_path = Path::new(TOOLSTATE_DIR)
+        .join("history")
+        .join(format!("{}.tsv", OS.expect("linux/windows only")));
     let mut file = t!(fs::read_to_string(&history_path));
     let end_of_first_line = file.find('\n').unwrap();
     file.insert_str(end_of_first_line, &format!("\n{}\t{}", commit.trim(), toolstate_serialized));
@@ -418,3 +476,15 @@ struct RepoState {
     commit: String,
     datetime: String,
 }
+
+impl RepoState {
+    fn state(&self) -> ToolState {
+        if cfg!(target_os = "linux") {
+            self.linux
+        } else if cfg!(windows) {
+            self.windows
+        } else {
+            unimplemented!()
+        }
+    }
+}
diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
index 7d1efe4610..eac790fe50 100644
--- a/src/bootstrap/util.rs
+++ b/src/bootstrap/util.rs
@@ -98,7 +98,7 @@ impl Drop for TimeIt {
     fn drop(&mut self) {
         let time = self.1.elapsed();
         if !self.0 {
-            println!("\tfinished in {}.{:03}", time.as_secs(), time.subsec_nanos() / 1_000_000);
+            println!("\tfinished in {}.{:03}", time.as_secs(), time.subsec_millis());
         }
     }
 }
diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml
index f8ddf0eb46..a29d6f9ae1 100644
--- a/src/ci/azure-pipelines/try.yml
+++ b/src/ci/azure-pipelines/try.yml
@@ -20,7 +20,7 @@ jobs:
 
 # The macOS and Windows builds here are currently disabled due to them not being
 # overly necessary on `try` builds. We also don't actually have anything that
-# consumes the artifacts currently. Perhaps one day we can reenable, but for now
+# consumes the artifacts currently. Perhaps one day we can re-enable, but for now
 # it helps free up capacity on Azure.
 # - job: macOS
 #   timeoutInMinutes: 600
diff --git a/src/ci/cpu-usage-over-time.py b/src/ci/cpu-usage-over-time.py
index daf21670b3..78ac060368 100644
--- a/src/ci/cpu-usage-over-time.py
+++ b/src/ci/cpu-usage-over-time.py
@@ -148,11 +148,11 @@ else:
     print('unknown platform', sys.platform)
     sys.exit(1)
 
-cur_state = State();
+cur_state = State()
 print("Time,Idle")
 while True:
-    time.sleep(1);
-    next_state = State();
+    time.sleep(1)
+    next_state = State()
     now = datetime.datetime.utcnow().isoformat()
     idle = next_state.idle_since(cur_state)
     print("%s,%s" % (now, idle))
diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile
index 2ae6c58941..5bb5436bec 100644
--- a/src/ci/docker/dist-various-2/Dockerfile
+++ b/src/ci/docker/dist-various-2/Dockerfile
@@ -48,7 +48,7 @@ RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc
 COPY dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/
 # We pass the commit id of the port of LLVM's libunwind to the build script.
 # Any update to the commit id here, should cause the container image to be re-built from this point on.
-RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "53b586346f2c7870e20b170decdc30729d97c42b"
+RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "5125c169b30837208a842f85f7ae44a83533bd0e"
 
 COPY dist-various-2/build-wasi-toolchain.sh /tmp/
 RUN /tmp/build-wasi-toolchain.sh
diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh
index e57fe22713..72325c7b94 100755
--- a/src/ci/docker/x86_64-gnu-tools/checktools.sh
+++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh
@@ -14,7 +14,7 @@ python2.7 "$X_PY" test --no-fail-fast \
     src/doc/rust-by-example \
     src/doc/embedded-book \
     src/doc/edition-guide \
-    src/doc/rustc-guide \
+    src/doc/rustc-dev-guide \
     src/tools/clippy \
     src/tools/rls \
     src/tools/rustfmt \
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh
index 843a2bf2d5..22b9854ad5 100755
--- a/src/ci/scripts/install-msys2-packages.sh
+++ b/src/ci/scripts/install-msys2-packages.sh
@@ -13,6 +13,7 @@ if isWindows; then
     # one way or another. The msys interpreters seem to have weird path conversions
     # baked in which break LLVM's build system one way or another, so let's use the
     # native version which keeps everything as native as possible.
-    cp C:/Python27amd64/python.exe C:/Python27amd64/python2.7.exe
-    ciCommandAddPath "C:\\Python27amd64"
+    python_home="C:/hostedtoolcache/windows/Python/2.7.17/x64"
+    cp "${python_home}/python.exe" "${python_home}/python2.7.exe"
+    ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\2.7.17\\x64"
 fi
diff --git a/src/doc/book/.cargo/config b/src/doc/book/.cargo/config
new file mode 100644
index 0000000000..2de1871303
--- /dev/null
+++ b/src/doc/book/.cargo/config
@@ -0,0 +1,3 @@
+[cargo-new]
+name = "Your Name"
+email = "you@example.com"
diff --git a/src/doc/book/.travis.yml b/src/doc/book/.travis.yml
index d9a907c9fc..5221c0edf7 100644
--- a/src/doc/book/.travis.yml
+++ b/src/doc/book/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: rust
 cache: cargo
 rust:
-  - 1.37.0
+  - 1.41.0
 branches:
   only:
   - master
diff --git a/src/doc/book/2018-edition/src/ch18-02-refutability.md b/src/doc/book/2018-edition/src/ch18-02-refutability.md
index 074f950e65..a3e2bcff76 100644
--- a/src/doc/book/2018-edition/src/ch18-02-refutability.md
+++ b/src/doc/book/2018-edition/src/ch18-02-refutability.md
@@ -7,4 +7,4 @@ version of the book](../ch18-02-refutability.html) instead.
 
 If you have an internet connection, you can [find a copy distributed with
 Rust
-1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch18-02-refuatbility.html).
\ No newline at end of file
+1.30](https://doc.rust-lang.org/1.30.0/book/2018-edition/ch18-02-refutability.html).
\ No newline at end of file
diff --git a/src/doc/book/ADMIN_TASKS.md b/src/doc/book/ADMIN_TASKS.md
new file mode 100644
index 0000000000..ad02693a33
--- /dev/null
+++ b/src/doc/book/ADMIN_TASKS.md
@@ -0,0 +1,109 @@
+# Administrative Tasks
+
+This documentation is for Carol and Steve and anyone else managing the repo to remember how to do
+occasional maintenance tasks.
+
+## Update the `rustc` version
+
+- Change the version number in `.travis.yml`
+- Change the version number in `rust-toolchain`, which should change the version you're using
+  locally with `rustup`
+- Change the version number in `src/title-page.md`
+- Run `./tools/update-rustc.sh` (see its commented code for details on what it does)
+- Inspect the changes (by looking at the files changed according to git) and their effects (by
+  looking at the files in `tmp/book-before` and `tmp/book-after`) and commit them if they look good
+- Grep for `manual-regeneration` and follow the instructions in those places to update output that
+  cannot be generated by a script
+
+## Release a new version of the listings
+
+We now make `.tar` files of complete projects containing every listing available [as GitHub
+Releases](https://github.com/rust-lang/book/releases). To create a new release artifact, for
+example if there have been code changes due to edits or due to updating Rust and `rustfmt`, do the
+following:
+
+- Create a git tag for the release and push it to GitHub, or create a new tag by going to the
+  GitHub UI, [drafting a new release](https://github.com/rust-lang/book/releases/new), and entering
+  a new tag instead of selecting an existing tag
+- Run `cargo run --bin release_listings`, which will generate `tmp/listings.tar.gz`
+- Upload `tmp/listings.tar.gz` in the GitHub UI for the draft release
+- Publish the release
+
+## Add a new listing
+
+To facilitate the scripts that run `rustfmt` on all the listings, update the output when the
+compiler is updated, and produce release artifacts containing full projects for the listings, any
+listing beyond the most trivial should be extracted into a file. To do that:
+
+- Find where the new listing should go in the `listings` directory.
+  - There is one subdirectory for each chapter
+  - Numbered listings should use `listing-[chapter num]-[listing num]` for their directory names.
+  - Listings without a number should start with `no-listing-` followed by a number that indicates
+    its position in the chapter relative to the other listings without numbers in the chapter, then
+    a short description that someone could read to find the code they're looking for.
+  - Listings used only for displaying the output of the code (for example, when we say "if we had
+    written x instead of y, we would get this compiler error:" but we don't actually show code x)
+    should be named with `output-only-` followed by a number that indicates its position in the
+    chapter relative to the other listings used only for output, then a short description that
+    authors or contributors could read to find the code they're looking for.
+  - **Remember to adjust surrounding listing numbers as appropriate!**
+- Create a full Cargo project in that directory, either by using `cargo new` or copying another
+  listing as a starting point.
+- Add the code and any surrounding code needed to create a full working example.
+- If you only want to show part of the code in the file, use anchor comments (`// ANCHOR: some_tag`
+  and `// ANCHOR_END: some_tag`) to mark the parts of the file you want to show.
+- For Rust code, use the `{{#rustdoc_include [fileame:some_tag]}}` directive within the code blocks
+  in the text. The `rustdoc_include` directive gives the code that doesn't get displayed to
+  `rustdoc` for `mdbook test` purposes.
+- For anything else, use the `{{#include [filename:some_tag]}}` directive.
+- If you want to display the output of a command in the text as well, create an `output.txt` file
+  in the listing's directory as follows:
+  - Run the command, like `cargo run` or `cargo test`, and copy all of the output.
+  - Create a new `output.txt` file with the first line `$ [the command you ran]`.
+  - Paste the output you just copied.
+  - Run `./tools/update-rustc.sh`, which should perform some normalization on the compiler output.
+  - Include the output in the text with the `{{#include [filename]}}` directive.
+  - Add and commit output.txt.
+- If you want to display output but for some reason it can't be generated by a script (say, because
+  of user input or external events like making a web request), keep the output inline but make a
+  comment that contains `manual-regeneration` and instructions for manually updating the inline
+  output.
+- If you don't want this example to even be attempted to be formatted by `rustfmt` (for example
+  because the example doesn't parse on purpose), add a `rustfmt-ignore` file in the listing's
+  directory and the reason it's not being formatted as the contents of that file (in case it's a
+  rustfmt bug that might get fixed someday).
+
+## See the effect of some change on the rendered book
+
+To check, say, updating `mdbook` or changing the way files get included:
+
+- Generate a built book before the change you want to test by running `mdbook build -d
+  tmp/book-before`
+- Apply the changes you want to test and run `mdbook build -d tmp/book-after`
+- Run `./tools/megadiff.sh`
+- Files remaining in `tmp/book-before` and `tmp/book-after` have differences you can manually
+  inspect with your favorite diff viewing mechanism
+
+## Produce new markdown files for No Starch
+
+- Run `./tools/nostarch.sh`
+- Spot check the files that script created in the `nostarch` directory
+- Check them into git if you're starting a round of edits
+
+## Produce markdown from docx for diffing
+
+- TODO Carol to document this next time she does it
+
+## Generate Graphviz dot
+
+We're using [Graphviz](http://graphviz.org/) for some of the diagrams in the
+book. The source for those files live in the `dot` directory. To turn a `dot`
+file, for example, `dot/trpl04-01.dot` into an `svg`, run:
+
+```bash
+$ dot dot/trpl04-01.dot -Tsvg > src/img/trpl04-01.svg
+```
+
+In the generated SVG, remove the width and the height attributes from the `svg`
+element and set the `viewBox` attribute to `0.00 0.00 1000.00 1000.00` or other
+values that don't cut off the image.
diff --git a/src/doc/book/Cargo.lock b/src/doc/book/Cargo.lock
index dbf955717c..b3469e3513 100644
--- a/src/doc/book/Cargo.lock
+++ b/src/doc/book/Cargo.lock
@@ -1,144 +1,275 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "adler32"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "aho-corasick"
-version = "0.5.3"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "crc32fast"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "docopt"
-version = "0.6.86"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "kernel32-sys"
-version = "0.2.2"
+name = "filetime"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "0.2.10"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.33"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "memchr"
-version = "0.1.11"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro2"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "regex"
-version = "0.1.80"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.3.9"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rust-book"
 version = "0.0.1"
 dependencies = [
- "docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rustc-serialize"
-version = "0.3.24"
+name = "serde_derive"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "strsim"
-version = "0.5.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "thread-id"
-version = "2.0.0"
+name = "syn"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
+ "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "thread_local"
-version = "0.2.7"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "utf8-ranges"
-version = "0.1.3"
+name = "unicode-xid"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "walkdir"
-version = "0.1.8"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "winapi"
-version = "0.2.8"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
-name = "winapi-build"
-version = "0.1.1"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "xattr"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [metadata]
-"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-"checksum docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)" = "4a7ef30445607f6fc8720f0a0a2c7442284b629cf0d049286860fae23e71c4d9"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum lazy_static 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "236eb37a62591d4a41a89b7763d7de3e06ca02d5ab2815446a8bae5d2f8c2d57"
-"checksum libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "5ba3df4dcb460b9dfbd070d41c94c19209620c191b0340b929ce748a2bcd42d2"
-"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-"checksum strsim 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "67f84c44fbb2f91db7fef94554e6b2ac05909c9c0b0bc23bb98d3a1aebfe7f7c"
-"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
-"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
-"checksum walkdir 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2"
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
+"checksum docopt 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969"
+"checksum filetime 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd7380b54ced79dda72ecc35cc4fbbd1da6bba54afaa37e96fd1c2a308cd469"
+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
+"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum strsim 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"
+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+"checksum xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c"
diff --git a/src/doc/book/Cargo.toml b/src/doc/book/Cargo.toml
index 3254231c04..19b2036b18 100644
--- a/src/doc/book/Cargo.toml
+++ b/src/doc/book/Cargo.toml
@@ -21,6 +21,14 @@ path = "tools/src/bin/lfp.rs"
 name = "link2print"
 path = "tools/src/bin/link2print.rs"
 
+[[bin]]
+name = "release_listings"
+path = "tools/src/bin/release_listings.rs"
+
+[[bin]]
+name = "remove_hidden_lines"
+path = "tools/src/bin/remove_hidden_lines.rs"
+
 [[bin]]
 name = "remove_links"
 path = "tools/src/bin/remove_links.rs"
@@ -30,8 +38,10 @@ name = "remove_markup"
 path = "tools/src/bin/remove_markup.rs"
 
 [dependencies]
-walkdir = "0.1.5"
-docopt = "0.6.82"
-rustc-serialize = "0.3.19"
-regex = "0.1.73"
-lazy_static = "0.2.1"
+walkdir = "2.3.1"
+docopt = "1.1.0"
+serde = "1.0"
+regex = "1.3.3"
+lazy_static = "1.4.0"
+flate2 = "1.0.13"
+tar = "0.4.26"
diff --git a/src/doc/book/README.md b/src/doc/book/README.md
index 7075fa40a3..08d53c8423 100644
--- a/src/doc/book/README.md
+++ b/src/doc/book/README.md
@@ -83,20 +83,6 @@ before we merge any in, but feel free to start!
 [Translations]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3ATranslations
 [mdbook support]: https://github.com/rust-lang-nursery/mdBook/issues/5
 
-## Graphviz dot
-
-We're using [Graphviz](http://graphviz.org/) for some of the diagrams in the
-book. The source for those files live in the `dot` directory. To turn a `dot`
-file, for example, `dot/trpl04-01.dot` into an `svg`, run:
-
-```bash
-$ dot dot/trpl04-01.dot -Tsvg > src/img/trpl04-01.svg
-```
-
-In the generated SVG, remove the width and the height attributes from the `svg`
-element and set the `viewBox` attribute to `0.00 0.00 1000.00 1000.00` or other
-values that don't cut off the image.
-
 ## Spellchecking
 
 To scan source files for spelling errors, you can use the `spellcheck.sh`
diff --git a/src/doc/book/ci/dictionary.txt b/src/doc/book/ci/dictionary.txt
index 98f4b89e36..f2b9c50668 100644
--- a/src/doc/book/ci/dictionary.txt
+++ b/src/doc/book/ci/dictionary.txt
@@ -6,6 +6,7 @@ adaptor
 adaptors
 AddAssign
 Addr
+afdc
 aggregator
 AGraph
 aliasability
@@ -18,6 +19,7 @@ APIs
 app's
 aren
 args
+ArgumentV
 associativity
 async
 atomics
@@ -126,6 +128,7 @@ doccratesio
 DOCTYPE
 doesn
 disambiguating
+DisplayBacktrace
 DivAssign
 DraftPost
 DSTs
@@ -247,6 +250,7 @@ libpanic
 librarys
 libreoffice
 libstd
+libunwind
 lifecycle
 LimitTracker
 linter
@@ -334,6 +338,7 @@ parameterize
 ParseIntError
 PartialEq
 PartialOrd
+pbcopy
 PendingReview
 PendingReviewPost
 PlaceholderType
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.toml
new file mode 100644
index 0000000000..e3091e7da8
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs
new file mode 100644
index 0000000000..b822b89ff3
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs
@@ -0,0 +1,31 @@
+// ANCHOR: all
+// ANCHOR: io
+use std::io;
+// ANCHOR_END: io
+
+// ANCHOR: main
+fn main() {
+    // ANCHOR_END: main
+    // ANCHOR: print
+    println!("Guess the number!");
+
+    println!("Please input your guess.");
+    // ANCHOR_END: print
+
+    // ANCHOR: string
+    let mut guess = String::new();
+    // ANCHOR_END: string
+
+    // ANCHOR: read
+    io::stdin()
+        .read_line(&mut guess)
+        // ANCHOR_END: read
+        // ANCHOR: expect
+        .expect("Failed to read line");
+    // ANCHOR_END: expect
+
+    // ANCHOR: print_guess
+    println!("You guessed: {}", guess);
+    // ANCHOR_END: print_guess
+}
+// ANCHOR: all
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock
new file mode 100644
index 0000000000..26af308db4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/src/main.rs
new file mode 100644
index 0000000000..60fb2a8e5f
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-02/src/main.rs
@@ -0,0 +1,15 @@
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    println!("Please input your guess.");
+
+    let mut guess = String::new();
+
+    io::stdin()
+        .read_line(&mut guess)
+        .expect("Failed to read line");
+
+    println!("You guessed: {}", guess);
+}
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs
new file mode 100644
index 0000000000..d5e3df7f61
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs
@@ -0,0 +1,28 @@
+// ANCHOR: all
+use std::io;
+// ANCHOR: ch07-04
+use rand::Rng;
+
+fn main() {
+    // ANCHOR_END: ch07-04
+    println!("Guess the number!");
+
+    // ANCHOR: ch07-04
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+    // ANCHOR_END: ch07-04
+
+    println!("The secret number is: {}", secret_number);
+
+    println!("Please input your guess.");
+
+    let mut guess = String::new();
+
+    io::stdin()
+        .read_line(&mut guess)
+        .expect("Failed to read line");
+
+    println!("You guessed: {}", guess);
+    // ANCHOR: ch07-04
+}
+// ANCHOR_END: ch07-04
+// ANCHOR_END: all
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt
new file mode 100644
index 0000000000..d3b62774b6
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/output.txt
@@ -0,0 +1,21 @@
+$ cargo build
+   Compiling libc v0.2.51
+   Compiling rand_core v0.4.0
+   Compiling rand_core v0.3.1
+   Compiling rand v0.5.6
+   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
+error[E0308]: mismatched types
+  --> src/main.rs:22:21
+   |
+22 |     match guess.cmp(&secret_number) {
+   |                     ^^^^^^^^^^^^^^ expected struct `std::string::String`, found integer
+   |
+   = note: expected reference `&std::string::String`
+              found reference `&{integer}`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `guessing_game`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs
new file mode 100644
index 0000000000..ac432df3d0
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs
@@ -0,0 +1,32 @@
+// ANCHOR: here
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    // --snip--
+    // ANCHOR_END: here
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    println!("The secret number is: {}", secret_number);
+
+    println!("Please input your guess.");
+
+    let mut guess = String::new();
+
+    io::stdin()
+        .read_line(&mut guess)
+        .expect("Failed to read line");
+    // ANCHOR: here
+
+    println!("You guessed: {}", guess);
+
+    match guess.cmp(&secret_number) {
+        Ordering::Less => println!("Too small!"),
+        Ordering::Greater => println!("Too big!"),
+        Ordering::Equal => println!("You win!"),
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs
new file mode 100644
index 0000000000..e4f4f87d98
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs
@@ -0,0 +1,45 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    println!("The secret number is: {}", secret_number);
+
+    loop {
+        println!("Please input your guess.");
+
+        let mut guess = String::new();
+
+        // ANCHOR: here
+        // --snip--
+
+        io::stdin()
+            .read_line(&mut guess)
+            .expect("Failed to read line");
+
+        // ANCHOR: ch19
+        let guess: u32 = match guess.trim().parse() {
+            Ok(num) => num,
+            Err(_) => continue,
+        };
+        // ANCHOR_END: ch19
+
+        println!("You guessed: {}", guess);
+
+        // --snip--
+        // ANCHOR_END: here
+
+        match guess.cmp(&secret_number) {
+            Ordering::Less => println!("Too small!"),
+            Ordering::Greater => println!("Too big!"),
+            Ordering::Equal => {
+                println!("You win!");
+                break;
+            }
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.lock
new file mode 100644
index 0000000000..890a658000
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs
new file mode 100644
index 0000000000..0d4006e946
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs
@@ -0,0 +1,35 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    loop {
+        println!("Please input your guess.");
+
+        let mut guess = String::new();
+
+        io::stdin()
+            .read_line(&mut guess)
+            .expect("Failed to read line");
+
+        let guess: u32 = match guess.trim().parse() {
+            Ok(num) => num,
+            Err(_) => continue,
+        };
+
+        println!("You guessed: {}", guess);
+
+        match guess.cmp(&secret_number) {
+            Ordering::Less => println!("Too small!"),
+            Ordering::Greater => println!("Too big!"),
+            Ordering::Equal => {
+                println!("You win!");
+                break;
+            }
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml
new file mode 100644
index 0000000000..e3091e7da8
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt
new file mode 100644
index 0000000000..2724c145d3
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
+    Finished dev [unoptimized + debuginfo] target(s) in 1.50s
+     Running `target/debug/guessing_game`
+Hello, world!
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/src/main.rs
new file mode 100644
index 0000000000..e7a11a969c
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.toml
new file mode 100644
index 0000000000..e3091e7da8
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/output.txt b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/output.txt
new file mode 100644
index 0000000000..56fb75b382
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/output.txt
@@ -0,0 +1,12 @@
+$ cargo build
+   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
+warning: unused `std::result::Result` that must be used
+  --> src/main.rs:10:5
+   |
+10 |     io::stdin().read_line(&mut guess);
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(unused_must_use)]` on by default
+   = note: this `Result` may be an `Err` variant, which should be handled
+
+    Finished dev [unoptimized + debuginfo] target(s) in 0.59s
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/src/main.rs
new file mode 100644
index 0000000000..aaf90bd659
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/src/main.rs
@@ -0,0 +1,13 @@
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    println!("Please input your guess.");
+
+    let mut guess = String::new();
+
+    io::stdin().read_line(&mut guess);
+
+    println!("You guessed: {}", guess);
+}
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs
new file mode 100644
index 0000000000..44d8db6b88
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs
@@ -0,0 +1,33 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    println!("The secret number is: {}", secret_number);
+
+    println!("Please input your guess.");
+
+    // ANCHOR: here
+    // --snip--
+
+    let mut guess = String::new();
+
+    io::stdin()
+        .read_line(&mut guess)
+        .expect("Failed to read line");
+
+    let guess: u32 = guess.trim().parse().expect("Please type a number!");
+
+    println!("You guessed: {}", guess);
+
+    match guess.cmp(&secret_number) {
+        Ordering::Less => println!("Too small!"),
+        Ordering::Greater => println!("Too big!"),
+        Ordering::Equal => println!("You win!"),
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs
new file mode 100644
index 0000000000..5b42f65578
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs
@@ -0,0 +1,40 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    // ANCHOR: here
+    // --snip--
+
+    println!("The secret number is: {}", secret_number);
+
+    loop {
+        println!("Please input your guess.");
+
+        // --snip--
+
+        // ANCHOR_END: here
+
+        let mut guess = String::new();
+
+        io::stdin()
+            .read_line(&mut guess)
+            .expect("Failed to read line");
+
+        let guess: u32 = guess.trim().parse().expect("Please type a number!");
+
+        println!("You guessed: {}", guess);
+
+        // ANCHOR: here
+        match guess.cmp(&secret_number) {
+            Ordering::Less => println!("Too small!"),
+            Ordering::Greater => println!("Too big!"),
+            Ordering::Equal => println!("You win!"),
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.lock b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.toml b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs
new file mode 100644
index 0000000000..b32fadbb12
--- /dev/null
+++ b/src/doc/book/listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs
@@ -0,0 +1,38 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    println!("The secret number is: {}", secret_number);
+
+    loop {
+        println!("Please input your guess.");
+
+        let mut guess = String::new();
+
+        io::stdin()
+            .read_line(&mut guess)
+            .expect("Failed to read line");
+
+        let guess: u32 = guess.trim().parse().expect("Please type a number!");
+
+        println!("You guessed: {}", guess);
+
+        // ANCHOR: here
+        // --snip--
+
+        match guess.cmp(&secret_number) {
+            Ordering::Less => println!("Too small!"),
+            Ordering::Greater => println!("Too big!"),
+            Ordering::Equal => {
+                println!("You win!");
+                break;
+            }
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/src/main.rs
new file mode 100644
index 0000000000..b492d384f0
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-01/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let y = 6;
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/output.txt
new file mode 100644
index 0000000000..3eb8d102a5
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling branches v0.1.0 (file:///projects/branches)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.30s
+     Running `target/debug/branches`
+The value of number is: 5
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/src/main.rs
new file mode 100644
index 0000000000..0b8ee95fd0
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-02/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let condition = true;
+    let number = if condition { 5 } else { 6 };
+
+    println!("The value of number is: {}", number);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.lock
new file mode 100644
index 0000000000..9942b362ac
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "loops"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.toml
new file mode 100644
index 0000000000..b5ed848ab4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "loops"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/src/main.rs
new file mode 100644
index 0000000000..651ed68c8e
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-03/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let mut number = 3;
+
+    while number != 0 {
+        println!("{}!", number);
+
+        number -= 1;
+    }
+
+    println!("LIFTOFF!!!");
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.lock
new file mode 100644
index 0000000000..9942b362ac
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "loops"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.toml
new file mode 100644
index 0000000000..b5ed848ab4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "loops"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/output.txt
new file mode 100644
index 0000000000..35c0f804a7
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/output.txt
@@ -0,0 +1,9 @@
+$ cargo run
+   Compiling loops v0.1.0 (file:///projects/loops)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.32s
+     Running `target/debug/loops`
+the value is: 10
+the value is: 20
+the value is: 30
+the value is: 40
+the value is: 50
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/src/main.rs
new file mode 100644
index 0000000000..38fd301e64
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-04/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    let a = [10, 20, 30, 40, 50];
+    let mut index = 0;
+
+    while index < 5 {
+        println!("the value is: {}", a[index]);
+
+        index += 1;
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.lock
new file mode 100644
index 0000000000..9942b362ac
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "loops"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.toml
new file mode 100644
index 0000000000..b5ed848ab4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "loops"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/src/main.rs
new file mode 100644
index 0000000000..6e3cca66ea
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/listing-03-05/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let a = [10, 20, 30, 40, 50];
+
+    for element in a.iter() {
+        println!("the value is: {}", element);
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.lock
new file mode 100644
index 0000000000..2d62cbe7af
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "variables"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.toml
new file mode 100644
index 0000000000..7915d397e2
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "variables"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt
new file mode 100644
index 0000000000..4693ca9da4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt
@@ -0,0 +1,20 @@
+$ cargo run
+   Compiling variables v0.1.0 (file:///projects/variables)
+error[E0384]: cannot assign twice to immutable variable `x`
+ --> src/main.rs:4:5
+  |
+2 |     let x = 5;
+  |         -
+  |         |
+  |         first assignment to `x`
+  |         help: make this binding mutable: `mut x`
+3 |     println!("The value of x is: {}", x);
+4 |     x = 6;
+  |     ^^^^^ cannot assign twice to immutable variable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0384`.
+error: could not compile `variables`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/src/main.rs
new file mode 100644
index 0000000000..a6c7ac071f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let x = 5;
+    println!("The value of x is: {}", x);
+    x = 6;
+    println!("The value of x is: {}", x);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.lock
new file mode 100644
index 0000000000..2d62cbe7af
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "variables"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.toml
new file mode 100644
index 0000000000..7915d397e2
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "variables"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/output.txt
new file mode 100644
index 0000000000..8ed6598ff1
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling variables v0.1.0 (file:///projects/variables)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.30s
+     Running `target/debug/variables`
+The value of x is: 5
+The value of x is: 6
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/src/main.rs
new file mode 100644
index 0000000000..c4e4a1953d
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-02-adding-mut/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let mut x = 5;
+    println!("The value of x is: {}", x);
+    x = 6;
+    println!("The value of x is: {}", x);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.lock
new file mode 100644
index 0000000000..2d62cbe7af
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "variables"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.toml
new file mode 100644
index 0000000000..7915d397e2
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "variables"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt
new file mode 100644
index 0000000000..64ac2bf51d
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling variables v0.1.0 (file:///projects/variables)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.31s
+     Running `target/debug/variables`
+The value of x is: 12
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs
new file mode 100644
index 0000000000..d32518011e
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let x = 5;
+
+    let x = x + 1;
+
+    let x = x * 2;
+
+    println!("The value of x is: {}", x);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.lock
new file mode 100644
index 0000000000..2d62cbe7af
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "variables"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.toml
new file mode 100644
index 0000000000..7915d397e2
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "variables"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/src/main.rs
new file mode 100644
index 0000000000..42589f5489
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let spaces = "   ";
+    let spaces = spaces.len();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.lock
new file mode 100644
index 0000000000..2d62cbe7af
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "variables"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.toml
new file mode 100644
index 0000000000..7915d397e2
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "variables"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt
new file mode 100644
index 0000000000..0f4a7d13a3
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt
@@ -0,0 +1,14 @@
+$ cargo run
+   Compiling variables v0.1.0 (file:///projects/variables)
+error[E0308]: mismatched types
+ --> src/main.rs:3:14
+  |
+3 |     spaces = spaces.len();
+  |              ^^^^^^^^^^^^ expected `&str`, found `usize`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `variables`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/src/main.rs
new file mode 100644
index 0000000000..f52635d0b2
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let mut spaces = "   ";
+    spaces = spaces.len();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.lock
new file mode 100644
index 0000000000..3b40559a79
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "floating-point"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.toml
new file mode 100644
index 0000000000..81e80c2964
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "floating-point"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/src/main.rs
new file mode 100644
index 0000000000..6f4f0fe872
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-06-floating-point/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let x = 2.0; // f64
+
+    let y: f32 = 3.0; // f32
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.lock
new file mode 100644
index 0000000000..94a12b2553
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "numeric-operations"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.toml
new file mode 100644
index 0000000000..00601dde45
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "numeric-operations"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs
new file mode 100644
index 0000000000..0a784bbc21
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs
@@ -0,0 +1,16 @@
+fn main() {
+    // addition
+    let sum = 5 + 10;
+
+    // subtraction
+    let difference = 95.5 - 4.3;
+
+    // multiplication
+    let product = 4 * 30;
+
+    // division
+    let quotient = 56.7 / 32.2;
+
+    // remainder
+    let remainder = 43 % 5;
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.lock
new file mode 100644
index 0000000000..5d5728ebd9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "boolean"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.toml
new file mode 100644
index 0000000000..783df3ddf3
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "boolean"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/src/main.rs
new file mode 100644
index 0000000000..2c56e62f94
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-08-boolean/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let t = true;
+
+    let f: bool = false; // with explicit type annotation
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.lock
new file mode 100644
index 0000000000..bb58446cc7
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "char"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.toml
new file mode 100644
index 0000000000..cfde83b8c6
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "char"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/src/main.rs
new file mode 100644
index 0000000000..4b8d9d930b
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-09-char/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let c = 'z';
+    let z = 'ℤ';
+    let heart_eyed_cat = '😻';
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.lock
new file mode 100644
index 0000000000..f57f0767c9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "tuples"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.toml
new file mode 100644
index 0000000000..8d6c2d577d
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "tuples"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/src/main.rs
new file mode 100644
index 0000000000..b7b51fb2f9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-10-tuples/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let tup: (i32, f64, u8) = (500, 6.4, 1);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.lock
new file mode 100644
index 0000000000..f57f0767c9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "tuples"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.toml
new file mode 100644
index 0000000000..8d6c2d577d
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "tuples"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/src/main.rs
new file mode 100644
index 0000000000..35dcb442ea
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let tup = (500, 6.4, 1);
+
+    let (x, y, z) = tup;
+
+    println!("The value of y is: {}", y);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.lock
new file mode 100644
index 0000000000..f57f0767c9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "tuples"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.toml
new file mode 100644
index 0000000000..8d6c2d577d
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "tuples"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/src/main.rs
new file mode 100644
index 0000000000..1b1e646fd6
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let x: (i32, f64, u8) = (500, 6.4, 1);
+
+    let five_hundred = x.0;
+
+    let six_point_four = x.1;
+
+    let one = x.2;
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.lock
new file mode 100644
index 0000000000..68e3c59678
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "arrays"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.toml
new file mode 100644
index 0000000000..ec97b7d5e7
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "arrays"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/src/main.rs
new file mode 100644
index 0000000000..d475901ce6
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-13-arrays/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let a = [1, 2, 3, 4, 5];
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.lock
new file mode 100644
index 0000000000..68e3c59678
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "arrays"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.toml
new file mode 100644
index 0000000000..ec97b7d5e7
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "arrays"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/src/main.rs
new file mode 100644
index 0000000000..d33e3174f6
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-14-array-indexing/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let a = [1, 2, 3, 4, 5];
+
+    let first = a[0];
+    let second = a[1];
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.lock
new file mode 100644
index 0000000000..68e3c59678
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "arrays"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.toml
new file mode 100644
index 0000000000..ec97b7d5e7
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "arrays"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/output.txt
new file mode 100644
index 0000000000..be3ef310f8
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling arrays v0.1.0 (file:///projects/arrays)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.31s
+     Running `target/debug/arrays`
+thread 'main' panicked at 'index out of bounds: the len is 5 but the index is 10', src/main.rs:5:19
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/src/main.rs
new file mode 100644
index 0000000000..5ce0ed4a5b
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    let a = [1, 2, 3, 4, 5];
+    let index = 10;
+
+    let element = a[index];
+
+    println!("The value of element is: {}", element);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/output.txt
new file mode 100644
index 0000000000..723fad32ad
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling functions v0.1.0 (file:///projects/functions)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.28s
+     Running `target/debug/functions`
+Hello, world!
+Another function.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/src/main.rs
new file mode 100644
index 0000000000..38be8565bf
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-16-functions/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    println!("Hello, world!");
+
+    another_function();
+}
+
+fn another_function() {
+    println!("Another function.");
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/output.txt
new file mode 100644
index 0000000000..546bbc0473
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling functions v0.1.0 (file:///projects/functions)
+    Finished dev [unoptimized + debuginfo] target(s) in 1.21s
+     Running `target/debug/functions`
+The value of x is: 5
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/src/main.rs
new file mode 100644
index 0000000000..029446c044
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    another_function(5);
+}
+
+fn another_function(x: i32) {
+    println!("The value of x is: {}", x);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/output.txt
new file mode 100644
index 0000000000..d651191cd4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling functions v0.1.0 (file:///projects/functions)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.31s
+     Running `target/debug/functions`
+The value of x is: 5
+The value of y is: 6
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/src/main.rs
new file mode 100644
index 0000000000..fe476db0a8
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    another_function(5, 6);
+}
+
+fn another_function(x: i32, y: i32) {
+    println!("The value of x is: {}", x);
+    println!("The value of y is: {}", y);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.lock
new file mode 100644
index 0000000000..89a654d696
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/rustfmt-ignore b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/rustfmt-ignore
new file mode 100644
index 0000000000..06a976dd46
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/rustfmt-ignore
@@ -0,0 +1 @@
+This listing deliberately doesn't parse so rustfmt fails.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/src/main.rs
new file mode 100644
index 0000000000..988f9653ed
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let x = (let y = 6);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/src/main.rs
new file mode 100644
index 0000000000..baa853e187
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    let x = 5;
+
+    let y = {
+        let x = 3;
+        x + 1
+    };
+
+    println!("The value of y is: {}", y);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/output.txt
new file mode 100644
index 0000000000..a457e33996
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling functions v0.1.0 (file:///projects/functions)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.30s
+     Running `target/debug/functions`
+The value of x is: 5
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/src/main.rs
new file mode 100644
index 0000000000..5303b10827
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-21-function-return-values/src/main.rs
@@ -0,0 +1,9 @@
+fn five() -> i32 {
+    5
+}
+
+fn main() {
+    let x = five();
+
+    println!("The value of x is: {}", x);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/src/main.rs
new file mode 100644
index 0000000000..b4c84437a9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let x = plus_one(5);
+
+    println!("The value of x is: {}", x);
+}
+
+fn plus_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.lock
new file mode 100644
index 0000000000..88287d1363
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.toml
new file mode 100644
index 0000000000..291680cf8f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt
new file mode 100644
index 0000000000..1c80331541
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling functions v0.1.0 (file:///projects/functions)
+error[E0308]: mismatched types
+ --> src/main.rs:7:24
+  |
+7 | fn plus_one(x: i32) -> i32 {
+  |    --------            ^^^ expected `i32`, found `()`
+  |    |
+  |    implicitly returns `()` as its body has no tail or `return` expression
+8 |     x + 1;
+  |          - help: consider removing this semicolon
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `functions`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/src/main.rs
new file mode 100644
index 0000000000..c9c4edc190
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let x = plus_one(5);
+
+    println!("The value of x is: {}", x);
+}
+
+fn plus_one(x: i32) -> i32 {
+    x + 1;
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.lock
new file mode 100644
index 0000000000..a289136a62
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "comments"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.toml
new file mode 100644
index 0000000000..c53d87571f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "comments"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/src/main.rs
new file mode 100644
index 0000000000..535f4b993b
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let lucky_number = 7; // I’m feeling lucky today
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.lock
new file mode 100644
index 0000000000..a289136a62
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "comments"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.toml
new file mode 100644
index 0000000000..c53d87571f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "comments"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/src/main.rs
new file mode 100644
index 0000000000..81cd935591
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/src/main.rs
@@ -0,0 +1,4 @@
+fn main() {
+    // I’m feeling lucky today
+    let lucky_number = 7;
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/output.txt
new file mode 100644
index 0000000000..3d8c7dc333
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling branches v0.1.0 (file:///projects/branches)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.31s
+     Running `target/debug/branches`
+condition was true
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/src/main.rs
new file mode 100644
index 0000000000..e64a42adf7
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-26-if-true/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let number = 3;
+
+    if number < 5 {
+        println!("condition was true");
+    } else {
+        println!("condition was false");
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/output.txt
new file mode 100644
index 0000000000..e40da961c9
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling branches v0.1.0 (file:///projects/branches)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.31s
+     Running `target/debug/branches`
+condition was false
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/src/main.rs
new file mode 100644
index 0000000000..f7d76cf558
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-27-if-false/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let number = 7;
+    // ANCHOR_END: here
+
+    if number < 5 {
+        println!("condition was true");
+    } else {
+        println!("condition was false");
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt
new file mode 100644
index 0000000000..b3442affe0
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt
@@ -0,0 +1,14 @@
+$ cargo run
+   Compiling branches v0.1.0 (file:///projects/branches)
+error[E0308]: mismatched types
+ --> src/main.rs:4:8
+  |
+4 |     if number {
+  |        ^^^^^^ expected `bool`, found integer
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `branches`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/src/main.rs
new file mode 100644
index 0000000000..bc4af767b1
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let number = 3;
+
+    if number {
+        println!("number was three");
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/src/main.rs
new file mode 100644
index 0000000000..704650f467
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let number = 3;
+
+    if number != 0 {
+        println!("number was something other than zero");
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/output.txt
new file mode 100644
index 0000000000..b218941ad0
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling branches v0.1.0 (file:///projects/branches)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.31s
+     Running `target/debug/branches`
+number is divisible by 3
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/src/main.rs
new file mode 100644
index 0000000000..d0ef9b2c15
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-30-else-if/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let number = 6;
+
+    if number % 4 == 0 {
+        println!("number is divisible by 4");
+    } else if number % 3 == 0 {
+        println!("number is divisible by 3");
+    } else if number % 2 == 0 {
+        println!("number is divisible by 2");
+    } else {
+        println!("number is not divisible by 4, 3, or 2");
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.lock
new file mode 100644
index 0000000000..4ca0c2dbdb
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "branches"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.toml
new file mode 100644
index 0000000000..8ddf691495
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "branches"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt
new file mode 100644
index 0000000000..f47a2a8067
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling branches v0.1.0 (file:///projects/branches)
+error[E0308]: if and else have incompatible types
+ --> src/main.rs:4:44
+  |
+4 |     let number = if condition { 5 } else { "six" };
+  |                                 -          ^^^^^ expected integer, found `&str`
+  |                                 |
+  |                                 expected because of this
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `branches`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/src/main.rs
new file mode 100644
index 0000000000..440b286f5e
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let condition = true;
+
+    let number = if condition { 5 } else { "six" };
+
+    println!("The value of number is: {}", number);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.lock
new file mode 100644
index 0000000000..9942b362ac
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "loops"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.toml
new file mode 100644
index 0000000000..b5ed848ab4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "loops"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/src/main.rs
new file mode 100644
index 0000000000..f1692e4625
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-32-loop/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    loop {
+        println!("again!");
+    }
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.lock
new file mode 100644
index 0000000000..9942b362ac
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "loops"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.toml
new file mode 100644
index 0000000000..b5ed848ab4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "loops"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/src/main.rs
new file mode 100644
index 0000000000..6ffdab5a4b
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let mut counter = 0;
+
+    let result = loop {
+        counter += 1;
+
+        if counter == 10 {
+            break counter * 2;
+        }
+    };
+
+    println!("The result is {}", result);
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.lock
new file mode 100644
index 0000000000..9942b362ac
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "loops"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.toml
new file mode 100644
index 0000000000..b5ed848ab4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "loops"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/src/main.rs
new file mode 100644
index 0000000000..e7286a84e4
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/no-listing-34-for-range/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    for number in (1..4).rev() {
+        println!("{}!", number);
+    }
+    println!("LIFTOFF!!!");
+}
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.lock b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.lock
new file mode 100644
index 0000000000..b5664bc336
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "no_type_annotations"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.toml b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.toml
new file mode 100644
index 0000000000..964f9e8e23
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "no_type_annotations"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt
new file mode 100644
index 0000000000..5b00236206
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt
@@ -0,0 +1,14 @@
+$ cargo build
+   Compiling no_type_annotations v0.1.0 (file:///projects/no_type_annotations)
+error[E0282]: type annotations needed
+ --> src/main.rs:2:9
+  |
+2 |     let guess = "42".parse().expect("Not a number!");
+  |         ^^^^^ consider giving `guess` a type
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0282`.
+error: could not compile `no_type_annotations`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/src/main.rs b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/src/main.rs
new file mode 100644
index 0000000000..f41c55805f
--- /dev/null
+++ b/src/doc/book/listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    let guess = "42".parse().expect("Not a number!");
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.lock
new file mode 100644
index 0000000000..9e4e62ddf5
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/rustfmt-ignore b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/src/main.rs
new file mode 100644
index 0000000000..148ad84c97
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-01/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    {                      // s is not valid here, it’s not yet declared
+        let s = "hello";   // s is valid from this point forward
+
+        // do stuff with s
+    }                      // this scope is now over, and s is no longer valid
+    // ANCHOR_END: here
+}
\ No newline at end of file
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/src/main.rs
new file mode 100644
index 0000000000..de0f1b3251
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-02/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let x = 5;
+    let y = x;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.lock
new file mode 100644
index 0000000000..9e4e62ddf5
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/rustfmt-ignore b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/src/main.rs
new file mode 100644
index 0000000000..23906b4306
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-03/src/main.rs
@@ -0,0 +1,23 @@
+fn main() {
+    let s = String::from("hello");  // s comes into scope
+
+    takes_ownership(s);             // s's value moves into the function...
+                                    // ... and so is no longer valid here
+
+    let x = 5;                      // x comes into scope
+
+    makes_copy(x);                  // x would move into the function,
+                                    // but i32 is Copy, so it’s okay to still
+                                    // use x afterward
+
+} // Here, x goes out of scope, then s. But because s's value was moved, nothing
+  // special happens.
+
+fn takes_ownership(some_string: String) { // some_string comes into scope
+    println!("{}", some_string);
+} // Here, some_string goes out of scope and `drop` is called. The backing
+  // memory is freed.
+
+fn makes_copy(some_integer: i32) { // some_integer comes into scope
+    println!("{}", some_integer);
+} // Here, some_integer goes out of scope. Nothing special happens.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.lock
new file mode 100644
index 0000000000..9e4e62ddf5
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/rustfmt-ignore b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/src/main.rs
new file mode 100644
index 0000000000..e3e54a8181
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-04/src/main.rs
@@ -0,0 +1,29 @@
+fn main() {
+    let s1 = gives_ownership();         // gives_ownership moves its return
+                                        // value into s1
+
+    let s2 = String::from("hello");     // s2 comes into scope
+
+    let s3 = takes_and_gives_back(s2);  // s2 is moved into
+                                        // takes_and_gives_back, which also
+                                        // moves its return value into s3
+} // Here, s3 goes out of scope and is dropped. s2 goes out of scope but was
+  // moved, so nothing happens. s1 goes out of scope and is dropped.
+
+fn gives_ownership() -> String {             // gives_ownership will move its
+                                             // return value into the function
+                                             // that calls it
+
+    let some_string = String::from("hello"); // some_string comes into scope
+
+    some_string                              // some_string is returned and
+                                             // moves out to the calling
+                                             // function
+}
+
+// takes_and_gives_back will take a String and return one
+fn takes_and_gives_back(a_string: String) -> String { // a_string comes into
+                                                      // scope
+
+    a_string  // a_string is returned and moves out to the calling function
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/src/main.rs
new file mode 100644
index 0000000000..22aee1419e
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-05/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let s1 = String::from("hello");
+
+    let (s2, len) = calculate_length(s1);
+
+    println!("The length of '{}' is {}.", s2, len);
+}
+
+fn calculate_length(s: String) -> (String, usize) {
+    let length = s.len(); // len() returns the length of a String
+
+    (s, length)
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/output.txt b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/output.txt
new file mode 100644
index 0000000000..98f438f614
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling ownership v0.1.0 (file:///projects/ownership)
+error[E0596]: cannot borrow `*some_string` as mutable, as it is behind a `&` reference
+ --> src/main.rs:8:5
+  |
+7 | fn change(some_string: &String) {
+  |                        ------- help: consider changing this to be a mutable reference: `&mut std::string::String`
+8 |     some_string.push_str(", world");
+  |     ^^^^^^^^^^^ `some_string` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
+error: could not compile `ownership`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/src/main.rs
new file mode 100644
index 0000000000..330ffa68ab
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-06/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let s = String::from("hello");
+
+    change(&s);
+}
+
+fn change(some_string: &String) {
+    some_string.push_str(", world");
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.toml
new file mode 100644
index 0000000000..dddcb5a141
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Carol (Nichols || Goulding) <carol.nichols@gmail.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/src/main.rs
new file mode 100644
index 0000000000..3bb3c8580d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-07/src/main.rs
@@ -0,0 +1,21 @@
+// ANCHOR: here
+fn first_word(s: &String) -> usize {
+    // ANCHOR: as_bytes
+    let bytes = s.as_bytes();
+    // ANCHOR_END: as_bytes
+
+    // ANCHOR: iter
+    for (i, &item) in bytes.iter().enumerate() {
+        // ANCHOR_END: iter
+        // ANCHOR: inside_for
+        if item == b' ' {
+            return i;
+        }
+    }
+
+    s.len()
+    // ANCHOR_END: inside_for
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/src/main.rs
new file mode 100644
index 0000000000..b6182fe2b7
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-08/src/main.rs
@@ -0,0 +1,24 @@
+fn first_word(s: &String) -> usize {
+    let bytes = s.as_bytes();
+
+    for (i, &item) in bytes.iter().enumerate() {
+        if item == b' ' {
+            return i;
+        }
+    }
+
+    s.len()
+}
+
+// ANCHOR: here
+fn main() {
+    let mut s = String::from("hello world");
+
+    let word = first_word(&s); // word will get the value 5
+
+    s.clear(); // this empties the String, making it equal to ""
+
+    // word still has the value 5 here, but there's no more string that
+    // we could meaningfully use the value 5 with. word is now totally invalid!
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/src/main.rs
new file mode 100644
index 0000000000..19a9cc74b6
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/listing-04-09/src/main.rs
@@ -0,0 +1,31 @@
+// ANCHOR: here
+fn first_word(s: &str) -> &str {
+    // ANCHOR_END: here
+    let bytes = s.as_bytes();
+
+    for (i, &item) in bytes.iter().enumerate() {
+        if item == b' ' {
+            return &s[0..i];
+        }
+    }
+
+    &s[..]
+}
+
+// ANCHOR: usage
+fn main() {
+    let my_string = String::from("hello world");
+
+    // first_word works on slices of `String`s
+    let word = first_word(&my_string[..]);
+
+    let my_string_literal = "hello world";
+
+    // first_word works on slices of string literals
+    let word = first_word(&my_string_literal[..]);
+
+    // Because string literals *are* string slices already,
+    // this works too, without the slice syntax!
+    let word = first_word(my_string_literal);
+}
+// ANCHOR_END: usage
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/src/main.rs
new file mode 100644
index 0000000000..b68f0f1e78
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("hello");
+
+    s.push_str(", world!"); // push_str() appends a literal to a String
+
+    println!("{}", s); // This will print `hello, world!`
+                       // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.lock
new file mode 100644
index 0000000000..9e4e62ddf5
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/rustfmt-ignore b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/src/main.rs
new file mode 100644
index 0000000000..7e6d46f836
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-02-string-scope/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    {
+        let s = String::from("hello"); // s is valid from this point forward
+
+        // do stuff with s
+    }                                  // this scope is now over, and s is no
+                                       // longer valid
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/src/main.rs
new file mode 100644
index 0000000000..a5817e714b
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-03-string-move/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("hello");
+    let s2 = s1;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt
new file mode 100644
index 0000000000..910332ac13
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt
@@ -0,0 +1,19 @@
+$ cargo run
+   Compiling ownership v0.1.0 (file:///projects/ownership)
+error[E0382]: borrow of moved value: `s1`
+ --> src/main.rs:5:28
+  |
+2 |     let s1 = String::from("hello");
+  |         -- move occurs because `s1` has type `std::string::String`, which does not implement the `Copy` trait
+3 |     let s2 = s1;
+  |              -- value moved here
+4 | 
+5 |     println!("{}, world!", s1);
+  |                            ^^ value borrowed here after move
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `ownership`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/src/main.rs
new file mode 100644
index 0000000000..d0b9f18795
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("hello");
+    let s2 = s1;
+
+    println!("{}, world!", s1);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/src/main.rs
new file mode 100644
index 0000000000..4e61cc1a16
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-05-clone/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("hello");
+    let s2 = s1.clone();
+
+    println!("s1 = {}, s2 = {}", s1, s2);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/src/main.rs
new file mode 100644
index 0000000000..63a1fae248
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-06-copy/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let x = 5;
+    let y = x;
+
+    println!("x = {}, y = {}", x, y);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/src/main.rs
new file mode 100644
index 0000000000..fd32a5fc95
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-07-reference/src/main.rs
@@ -0,0 +1,15 @@
+// ANCHOR: all
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("hello");
+
+    let len = calculate_length(&s1);
+    // ANCHOR_END: here
+
+    println!("The length of '{}' is {}.", s1, len);
+}
+
+fn calculate_length(s: &String) -> usize {
+    s.len()
+}
+// ANCHOR_END: all
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.lock
new file mode 100644
index 0000000000..9e4e62ddf5
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/rustfmt-ignore b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/src/main.rs
new file mode 100644
index 0000000000..6e40b8c300
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/src/main.rs
@@ -0,0 +1,14 @@
+fn main() {
+    let s1 = String::from("hello");
+
+    let len = calculate_length(&s1);
+
+    println!("The length of '{}' is {}.", s1, len);
+}
+
+// ANCHOR: here
+fn calculate_length(s: &String) -> usize { // s is a reference to a String
+    s.len()
+} // Here, s goes out of scope. But because it does not have ownership of what
+  // it refers to, nothing happens.
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/src/main.rs
new file mode 100644
index 0000000000..fdf7f0a6f4
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let mut s = String::from("hello");
+
+    change(&mut s);
+}
+
+fn change(some_string: &mut String) {
+    some_string.push_str(", world");
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt
new file mode 100644
index 0000000000..cb69a714b3
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt
@@ -0,0 +1,19 @@
+$ cargo run
+   Compiling ownership v0.1.0 (file:///projects/ownership)
+error[E0499]: cannot borrow `s` as mutable more than once at a time
+ --> src/main.rs:5:14
+  |
+4 |     let r1 = &mut s;
+  |              ------ first mutable borrow occurs here
+5 |     let r2 = &mut s;
+  |              ^^^^^^ second mutable borrow occurs here
+6 | 
+7 |     println!("{}, {}", r1, r2);
+  |                        -- first borrow later used here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0499`.
+error: could not compile `ownership`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/src/main.rs
new file mode 100644
index 0000000000..ddbf8120f9
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("hello");
+
+    let r1 = &mut s;
+    let r2 = &mut s;
+
+    println!("{}, {}", r1, r2);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/src/main.rs
new file mode 100644
index 0000000000..4b1a5a383d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("hello");
+
+    {
+        let r1 = &mut s;
+    } // r1 goes out of scope here, so we can make a new reference with no problems.
+
+    let r2 = &mut s;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt
new file mode 100644
index 0000000000..cd4168f8ce
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt
@@ -0,0 +1,20 @@
+$ cargo run
+   Compiling ownership v0.1.0 (file:///projects/ownership)
+error[E0502]: cannot borrow `s` as mutable because it is also borrowed as immutable
+ --> src/main.rs:6:14
+  |
+4 |     let r1 = &s; // no problem
+  |              -- immutable borrow occurs here
+5 |     let r2 = &s; // no problem
+6 |     let r3 = &mut s; // BIG PROBLEM
+  |              ^^^^^^ mutable borrow occurs here
+7 | 
+8 |     println!("{}, {}, and {}", r1, r2, r3);
+  |                                -- immutable borrow later used here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0502`.
+error: could not compile `ownership`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/src/main.rs
new file mode 100644
index 0000000000..0da04c010e
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("hello");
+
+    let r1 = &s; // no problem
+    let r2 = &s; // no problem
+    let r3 = &mut s; // BIG PROBLEM
+
+    println!("{}, {}, and {}", r1, r2, r3);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/src/main.rs
new file mode 100644
index 0000000000..3b0a7da659
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("hello");
+
+    let r1 = &s; // no problem
+    let r2 = &s; // no problem
+    println!("{} and {}", r1, r2);
+    // r1 and r2 are no longer used after this point
+
+    let r3 = &mut s; // no problem
+    println!("{}", r3);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt
new file mode 100644
index 0000000000..6381d2a305
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling ownership v0.1.0 (file:///projects/ownership)
+error[E0106]: missing lifetime specifier
+ --> src/main.rs:5:16
+  |
+5 | fn dangle() -> &String {
+  |                ^ help: consider giving it a 'static lifetime: `&'static`
+  |
+  = help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0106`.
+error: could not compile `ownership`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/src/main.rs
new file mode 100644
index 0000000000..b102697812
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-14-dangling-reference/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let reference_to_nothing = dangle();
+}
+
+fn dangle() -> &String {
+    let s = String::from("hello");
+
+    &s
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.lock
new file mode 100644
index 0000000000..9e4e62ddf5
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/rustfmt-ignore b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/src/main.rs
new file mode 100644
index 0000000000..9fbb372a05
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let reference_to_nothing = dangle();
+}
+
+// ANCHOR: here
+fn dangle() -> &String { // dangle returns a reference to a String
+
+    let s = String::from("hello"); // s is a new String
+
+    &s // we return a reference to the String, s
+} // Here, s goes out of scope, and is dropped. Its memory goes away.
+  // Danger!
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/src/main.rs
new file mode 100644
index 0000000000..9c20a3b2d6
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-16-no-dangle/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let string = no_dangle();
+}
+
+// ANCHOR: here
+fn no_dangle() -> String {
+    let s = String::from("hello");
+
+    s
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/src/main.rs
new file mode 100644
index 0000000000..44163af990
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-17-slice/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let s = String::from("hello world");
+
+    let hello = &s[0..5];
+    let world = &s[6..11];
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/src/main.rs
new file mode 100644
index 0000000000..f44a970daa
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-18-first-word-slice/src/main.rs
@@ -0,0 +1,15 @@
+// ANCHOR: here
+fn first_word(s: &String) -> &str {
+    let bytes = s.as_bytes();
+
+    for (i, &item) in bytes.iter().enumerate() {
+        if item == b' ' {
+            return &s[0..i];
+        }
+    }
+
+    &s[..]
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.lock b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.toml b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt
new file mode 100644
index 0000000000..0e95bb8cd6
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt
@@ -0,0 +1,20 @@
+$ cargo run
+   Compiling ownership v0.1.0 (file:///projects/ownership)
+error[E0502]: cannot borrow `s` as mutable because it is also borrowed as immutable
+  --> src/main.rs:18:5
+   |
+16 |     let word = first_word(&s);
+   |                           -- immutable borrow occurs here
+17 | 
+18 |     s.clear(); // error!
+   |     ^^^^^^^^^ mutable borrow occurs here
+19 | 
+20 |     println!("the first word is: {}", word);
+   |                                       ---- immutable borrow later used here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0502`.
+error: could not compile `ownership`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/src/main.rs b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/src/main.rs
new file mode 100644
index 0000000000..99e04018d2
--- /dev/null
+++ b/src/doc/book/listings/ch04-understanding-ownership/no-listing-19-slice-error/src/main.rs
@@ -0,0 +1,23 @@
+fn first_word(s: &String) -> &str {
+    let bytes = s.as_bytes();
+
+    for (i, &item) in bytes.iter().enumerate() {
+        if item == b' ' {
+            return &s[0..i];
+        }
+    }
+
+    &s[..]
+}
+
+// ANCHOR: here
+fn main() {
+    let mut s = String::from("hello world");
+
+    let word = first_word(&s);
+
+    s.clear(); // error!
+
+    println!("the first word is: {}", word);
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/src/main.rs
new file mode 100644
index 0000000000..a7cff6ec21
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-01/src/main.rs
@@ -0,0 +1,10 @@
+// ANCHOR: here
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/src/main.rs
new file mode 100644
index 0000000000..390c8ff19d
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-02/src/main.rs
@@ -0,0 +1,17 @@
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+
+fn main() {
+    // ANCHOR: here
+    let user1 = User {
+        email: String::from("someone@example.com"),
+        username: String::from("someusername123"),
+        active: true,
+        sign_in_count: 1,
+    };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs
new file mode 100644
index 0000000000..c599c9d602
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs
@@ -0,0 +1,19 @@
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+
+fn main() {
+    // ANCHOR: here
+    let mut user1 = User {
+        email: String::from("someone@example.com"),
+        username: String::from("someusername123"),
+        active: true,
+        sign_in_count: 1,
+    };
+
+    user1.email = String::from("anotheremail@example.com");
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs
new file mode 100644
index 0000000000..f934d4c000
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs
@@ -0,0 +1,24 @@
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+
+// ANCHOR: here
+fn build_user(email: String, username: String) -> User {
+    User {
+        email: email,
+        username: username,
+        active: true,
+        sign_in_count: 1,
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let user1 = build_user(
+        String::from("someone@example.com"),
+        String::from("someusername123"),
+    );
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs
new file mode 100644
index 0000000000..1833aa8e4d
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs
@@ -0,0 +1,24 @@
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+
+// ANCHOR: here
+fn build_user(email: String, username: String) -> User {
+    User {
+        email,
+        username,
+        active: true,
+        sign_in_count: 1,
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let user1 = build_user(
+        String::from("someone@example.com"),
+        String::from("someusername123"),
+    );
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/src/main.rs
new file mode 100644
index 0000000000..6c6d83d9be
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-06/src/main.rs
@@ -0,0 +1,24 @@
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+
+fn main() {
+    let user1 = User {
+        email: String::from("someone@example.com"),
+        username: String::from("someusername123"),
+        active: true,
+        sign_in_count: 1,
+    };
+
+    // ANCHOR: here
+    let user2 = User {
+        email: String::from("another@example.com"),
+        username: String::from("anotherusername567"),
+        active: user1.active,
+        sign_in_count: user1.sign_in_count,
+    };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/src/main.rs
new file mode 100644
index 0000000000..17cef457bd
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-07/src/main.rs
@@ -0,0 +1,23 @@
+struct User {
+    username: String,
+    email: String,
+    sign_in_count: u64,
+    active: bool,
+}
+
+fn main() {
+    let user1 = User {
+        email: String::from("someone@example.com"),
+        username: String::from("someusername123"),
+        active: true,
+        sign_in_count: 1,
+    };
+
+    // ANCHOR: here
+    let user2 = User {
+        email: String::from("another@example.com"),
+        username: String::from("anotherusername567"),
+        ..user1
+    };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/output.txt b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/output.txt
new file mode 100644
index 0000000000..88e10d320a
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling structs v0.1.0 (file:///projects/structs)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.42s
+     Running `target/debug/structs`
+The area of the rectangle is 1500 square pixels.
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/src/main.rs
new file mode 100644
index 0000000000..f324529fdc
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-08/src/main.rs
@@ -0,0 +1,17 @@
+// ANCHOR: all
+fn main() {
+    let width1 = 30;
+    let height1 = 50;
+
+    println!(
+        "The area of the rectangle is {} square pixels.",
+        area(width1, height1)
+    );
+}
+
+// ANCHOR: here
+fn area(width: u32, height: u32) -> u32 {
+    // ANCHOR_END: here
+    width * height
+}
+// ANCHOR_END: all
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/src/main.rs
new file mode 100644
index 0000000000..d4b77ba7ad
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-09/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    let rect1 = (30, 50);
+
+    println!(
+        "The area of the rectangle is {} square pixels.",
+        area(rect1)
+    );
+}
+
+fn area(dimensions: (u32, u32)) -> u32 {
+    dimensions.0 * dimensions.1
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/src/main.rs
new file mode 100644
index 0000000000..62ef9acd82
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-10/src/main.rs
@@ -0,0 +1,20 @@
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+
+    println!(
+        "The area of the rectangle is {} square pixels.",
+        area(&rect1)
+    );
+}
+
+fn area(rectangle: &Rectangle) -> u32 {
+    rectangle.width * rectangle.height
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt
new file mode 100644
index 0000000000..1e03d06259
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling structs v0.1.0 (file:///projects/structs)
+error[E0277]: `Rectangle` doesn't implement `std::fmt::Display`
+  --> src/main.rs:12:29
+   |
+12 |     println!("rect1 is {}", rect1);
+   |                             ^^^^^ `Rectangle` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `Rectangle`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+   = note: required by `std::fmt::Display::fmt`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `structs`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/src/main.rs
new file mode 100644
index 0000000000..0ff8dcc8cc
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-11/src/main.rs
@@ -0,0 +1,13 @@
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+
+    println!("rect1 is {}", rect1);
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/output.txt b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/output.txt
new file mode 100644
index 0000000000..3abfb42574
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling structs v0.1.0 (file:///projects/structs)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.48s
+     Running `target/debug/structs`
+rect1 is Rectangle { width: 30, height: 50 }
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/src/main.rs
new file mode 100644
index 0000000000..2ffc4b8e7b
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-12/src/main.rs
@@ -0,0 +1,14 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+
+    println!("rect1 is {:?}", rect1);
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/src/main.rs
new file mode 100644
index 0000000000..e4f45e868c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-13/src/main.rs
@@ -0,0 +1,23 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+impl Rectangle {
+    fn area(&self) -> u32 {
+        self.width * self.height
+    }
+}
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+
+    println!(
+        "The area of the rectangle is {} square pixels.",
+        rect1.area()
+    );
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/src/main.rs
new file mode 100644
index 0000000000..843dab4815
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-14/src/main.rs
@@ -0,0 +1,17 @@
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+    let rect2 = Rectangle {
+        width: 10,
+        height: 40,
+    };
+    let rect3 = Rectangle {
+        width: 60,
+        height: 45,
+    };
+
+    println!("Can rect1 hold rect2? {}", rect1.can_hold(&rect2));
+    println!("Can rect1 hold rect3? {}", rect1.can_hold(&rect3));
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/src/main.rs
new file mode 100644
index 0000000000..e6a32723f1
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-15/src/main.rs
@@ -0,0 +1,35 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+// ANCHOR: here
+impl Rectangle {
+    fn area(&self) -> u32 {
+        self.width * self.height
+    }
+
+    fn can_hold(&self, other: &Rectangle) -> bool {
+        self.width > other.width && self.height > other.height
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+    let rect2 = Rectangle {
+        width: 10,
+        height: 40,
+    };
+    let rect3 = Rectangle {
+        width: 60,
+        height: 45,
+    };
+
+    println!("Can rect1 hold rect2? {}", rect1.can_hold(&rect2));
+    println!("Can rect1 hold rect3? {}", rect1.can_hold(&rect3));
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/src/main.rs
new file mode 100644
index 0000000000..a5d3f772a8
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/listing-05-16/src/main.rs
@@ -0,0 +1,37 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+// ANCHOR: here
+impl Rectangle {
+    fn area(&self) -> u32 {
+        self.width * self.height
+    }
+}
+
+impl Rectangle {
+    fn can_hold(&self, other: &Rectangle) -> bool {
+        self.width > other.width && self.height > other.height
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+    let rect2 = Rectangle {
+        width: 10,
+        height: 40,
+    };
+    let rect3 = Rectangle {
+        width: 60,
+        height: 45,
+    };
+
+    println!("Can rect1 hold rect2? {}", rect1.can_hold(&rect2));
+    println!("Can rect1 hold rect3? {}", rect1.can_hold(&rect3));
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/src/main.rs
new file mode 100644
index 0000000000..4c92c5d778
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    struct Color(i32, i32, i32);
+    struct Point(i32, i32, i32);
+
+    let black = Color(0, 0, 0);
+    let origin = Point(0, 0, 0);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.toml
new file mode 100644
index 0000000000..dec1c4bd58
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/output.txt b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/output.txt
new file mode 100644
index 0000000000..9a75534c3b
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/output.txt
@@ -0,0 +1,20 @@
+$ cargo run
+   Compiling structs v0.1.0 (file:///projects/structs)
+error[E0106]: missing lifetime specifier
+ --> src/main.rs:2:15
+  |
+2 |     username: &str,
+  |               ^ expected lifetime parameter
+
+error[E0106]: missing lifetime specifier
+ --> src/main.rs:3:12
+  |
+3 |     email: &str,
+  |            ^ expected lifetime parameter
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0106`.
+error: could not compile `structs`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/src/main.rs
new file mode 100644
index 0000000000..3cf6ffa4fc
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/src/main.rs
@@ -0,0 +1,15 @@
+struct User {
+    username: &str,
+    email: &str,
+    sign_in_count: u64,
+    active: bool,
+}
+
+fn main() {
+    let user1 = User {
+        email: "someone@example.com",
+        username: "someusername123",
+        active: true,
+        sign_in_count: 1,
+    };
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/src/main.rs
new file mode 100644
index 0000000000..d5b1692a4f
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/src/main.rs
@@ -0,0 +1,20 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+// ANCHOR: here
+impl Rectangle {
+    fn square(size: u32) -> Rectangle {
+        Rectangle {
+            width: size,
+            height: size,
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let sq = Rectangle::square(3);
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt
new file mode 100644
index 0000000000..c891d9342b
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling structs v0.1.0 (file:///projects/structs)
+error[E0277]: `Rectangle` doesn't implement `std::fmt::Debug`
+  --> src/main.rs:12:31
+   |
+12 |     println!("rect1 is {:?}", rect1);
+   |                               ^^^^^ `Rectangle` cannot be formatted using `{:?}`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `Rectangle`
+   = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
+   = note: required by `std::fmt::Debug::fmt`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `structs`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/src/main.rs
new file mode 100644
index 0000000000..019a357ab9
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/src/main.rs
@@ -0,0 +1,13 @@
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+
+    println!("rect1 is {:?}", rect1);
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.lock b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.lock
new file mode 100644
index 0000000000..bede081a0c
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "structs"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.toml b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.toml
new file mode 100644
index 0000000000..431e5c3051
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "structs"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/output.txt b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/output.txt
new file mode 100644
index 0000000000..099ef9eac4
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/output.txt
@@ -0,0 +1,8 @@
+$ cargo run
+   Compiling structs v0.1.0 (file:///projects/structs)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.48s
+     Running `target/debug/structs`
+rect1 is Rectangle {
+    width: 30,
+    height: 50,
+}
diff --git a/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/src/main.rs b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/src/main.rs
new file mode 100644
index 0000000000..84e32aee49
--- /dev/null
+++ b/src/doc/book/listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/src/main.rs
@@ -0,0 +1,14 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+
+    println!("rect1 is {:#?}", rect1);
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/src/main.rs
new file mode 100644
index 0000000000..5b688e0f21
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-01/src/main.rs
@@ -0,0 +1,23 @@
+fn main() {
+    // ANCHOR: here
+    enum IpAddrKind {
+        V4,
+        V6,
+    }
+
+    struct IpAddr {
+        kind: IpAddrKind,
+        address: String,
+    }
+
+    let home = IpAddr {
+        kind: IpAddrKind::V4,
+        address: String::from("127.0.0.1"),
+    };
+
+    let loopback = IpAddr {
+        kind: IpAddrKind::V6,
+        address: String::from("::1"),
+    };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/src/main.rs
new file mode 100644
index 0000000000..3ba749788a
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-02/src/main.rs
@@ -0,0 +1,10 @@
+// ANCHOR: here
+enum Message {
+    Quit,
+    Move { x: i32, y: i32 },
+    Write(String),
+    ChangeColor(i32, i32, i32),
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/src/main.rs
new file mode 100644
index 0000000000..93dce48cb4
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-03/src/main.rs
@@ -0,0 +1,19 @@
+// ANCHOR: here
+enum Coin {
+    Penny,
+    Nickel,
+    Dime,
+    Quarter,
+}
+
+fn value_in_cents(coin: Coin) -> u8 {
+    match coin {
+        Coin::Penny => 1,
+        Coin::Nickel => 5,
+        Coin::Dime => 10,
+        Coin::Quarter => 25,
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/src/main.rs
new file mode 100644
index 0000000000..3ba384fbaa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-04/src/main.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+#[derive(Debug)] // so we can inspect the state in a minute
+enum UsState {
+    Alabama,
+    Alaska,
+    // --snip--
+}
+
+enum Coin {
+    Penny,
+    Nickel,
+    Dime,
+    Quarter(UsState),
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs
new file mode 100644
index 0000000000..c86190aa7f
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs
@@ -0,0 +1,18 @@
+fn main() {
+    // ANCHOR: here
+    fn plus_one(x: Option<i32>) -> Option<i32> {
+        match x {
+            // ANCHOR: first_arm
+            None => None,
+            // ANCHOR_END: first_arm
+            // ANCHOR: second_arm
+            Some(i) => Some(i + 1),
+            // ANCHOR_END: second_arm
+        }
+    }
+
+    let five = Some(5);
+    let six = plus_one(five);
+    let none = plus_one(None);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/src/main.rs
new file mode 100644
index 0000000000..222d54552c
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/listing-06-06/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    let some_u8_value = Some(0u8);
+    match some_u8_value {
+        Some(3) => println!("three"),
+        _ => (),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs
new file mode 100644
index 0000000000..c631e56baf
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs
@@ -0,0 +1,22 @@
+// ANCHOR: def
+enum IpAddrKind {
+    V4,
+    V6,
+}
+// ANCHOR_END: def
+
+fn main() {
+    // ANCHOR: instance
+    let four = IpAddrKind::V4;
+    let six = IpAddrKind::V6;
+    // ANCHOR_END: instance
+
+    // ANCHOR: fn_call
+    route(IpAddrKind::V4);
+    route(IpAddrKind::V6);
+    // ANCHOR_END: fn_call
+}
+
+// ANCHOR: fn
+fn route(ip_kind: IpAddrKind) {}
+// ANCHOR_END: fn
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/src/main.rs
new file mode 100644
index 0000000000..7d59b811ff
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    enum IpAddr {
+        V4(String),
+        V6(String),
+    }
+
+    let home = IpAddr::V4(String::from("127.0.0.1"));
+
+    let loopback = IpAddr::V6(String::from("::1"));
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/src/main.rs
new file mode 100644
index 0000000000..844a14041c
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    enum IpAddr {
+        V4(u8, u8, u8, u8),
+        V6(String),
+    }
+
+    let home = IpAddr::V4(127, 0, 0, 1);
+
+    let loopback = IpAddr::V6(String::from("::1"));
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/src/main.rs
new file mode 100644
index 0000000000..df451be8b6
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/src/main.rs
@@ -0,0 +1,11 @@
+// ANCHOR: here
+struct QuitMessage; // unit struct
+struct MoveMessage {
+    x: i32,
+    y: i32,
+}
+struct WriteMessage(String); // tuple struct
+struct ChangeColorMessage(i32, i32, i32); // tuple struct
+                                          // ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/src/main.rs
new file mode 100644
index 0000000000..66e0b6da11
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/src/main.rs
@@ -0,0 +1,19 @@
+fn main() {
+    enum Message {
+        Quit,
+        Move { x: i32, y: i32 },
+        Write(String),
+        ChangeColor(i32, i32, i32),
+    }
+
+    // ANCHOR: here
+    impl Message {
+        fn call(&self) {
+            // method body would be defined here
+        }
+    }
+
+    let m = Message::Write(String::from("hello"));
+    m.call();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/src/main.rs
new file mode 100644
index 0000000000..9de5791b41
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let some_number = Some(5);
+    let some_string = Some("a string");
+
+    let absent_number: Option<i32> = None;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt
new file mode 100644
index 0000000000..d3092d9fb3
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling enums v0.1.0 (file:///projects/enums)
+error[E0277]: cannot add `std::option::Option<i8>` to `i8`
+ --> src/main.rs:5:17
+  |
+5 |     let sum = x + y;
+  |                 ^ no implementation for `i8 + std::option::Option<i8>`
+  |
+  = help: the trait `std::ops::Add<std::option::Option<i8>>` is not implemented for `i8`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `enums`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/src/main.rs
new file mode 100644
index 0000000000..ec65565d42
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let x: i8 = 5;
+    let y: Option<i8> = Some(5);
+
+    let sum = x + y;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/src/main.rs
new file mode 100644
index 0000000000..3f909dcaf7
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/src/main.rs
@@ -0,0 +1,22 @@
+enum Coin {
+    Penny,
+    Nickel,
+    Dime,
+    Quarter,
+}
+
+// ANCHOR: here
+fn value_in_cents(coin: Coin) -> u8 {
+    match coin {
+        Coin::Penny => {
+            println!("Lucky penny!");
+            1
+        }
+        Coin::Nickel => 5,
+        Coin::Dime => 10,
+        Coin::Quarter => 25,
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/src/main.rs
new file mode 100644
index 0000000000..a4d500c11c
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/src/main.rs
@@ -0,0 +1,31 @@
+#[derive(Debug)]
+enum UsState {
+    Alabama,
+    Alaska,
+    // --snip--
+}
+
+enum Coin {
+    Penny,
+    Nickel,
+    Dime,
+    Quarter(UsState),
+}
+
+// ANCHOR: here
+fn value_in_cents(coin: Coin) -> u8 {
+    match coin {
+        Coin::Penny => 1,
+        Coin::Nickel => 5,
+        Coin::Dime => 10,
+        Coin::Quarter(state) => {
+            println!("State quarter from {:?}!", state);
+            25
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    value_in_cents(Coin::Quarter(UsState::Alaska));
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt
new file mode 100644
index 0000000000..da9e9d9bfe
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling enums v0.1.0 (file:///projects/enums)
+error[E0004]: non-exhaustive patterns: `None` not covered
+ --> src/main.rs:3:15
+  |
+3 |         match x {
+  |               ^ pattern `None` not covered
+  |
+  = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0004`.
+error: could not compile `enums`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/src/main.rs
new file mode 100644
index 0000000000..f1963d0c9d
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    fn plus_one(x: Option<i32>) -> Option<i32> {
+        match x {
+            Some(i) => Some(i + 1),
+        }
+    }
+    // ANCHOR_END: here
+
+    let five = Some(5);
+    let six = plus_one(five);
+    let none = plus_one(None);
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/src/main.rs
new file mode 100644
index 0000000000..6fc8ab058b
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    let some_u8_value = 0u8;
+    match some_u8_value {
+        1 => println!("one"),
+        3 => println!("three"),
+        5 => println!("five"),
+        7 => println!("seven"),
+        _ => (),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/src/main.rs
new file mode 100644
index 0000000000..fb6578cf64
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    let some_u8_value = Some(0u8);
+    // ANCHOR: here
+    if let Some(3) = some_u8_value {
+        println!("three");
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/src/main.rs
new file mode 100644
index 0000000000..12c4c0fec1
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/src/main.rs
@@ -0,0 +1,24 @@
+#[derive(Debug)]
+enum UsState {
+    Alabama,
+    Alaska,
+    // --snip--
+}
+
+enum Coin {
+    Penny,
+    Nickel,
+    Dime,
+    Quarter(UsState),
+}
+
+fn main() {
+    let coin = Coin::Penny;
+    // ANCHOR: here
+    let mut count = 0;
+    match coin {
+        Coin::Quarter(state) => println!("State quarter from {:?}!", state),
+        _ => count += 1,
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.lock b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.lock
new file mode 100644
index 0000000000..f62e8ac453
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "enums"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.toml b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.toml
new file mode 100644
index 0000000000..04988d1ffa
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "enums"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/src/main.rs b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/src/main.rs
new file mode 100644
index 0000000000..ba7eda27b4
--- /dev/null
+++ b/src/doc/book/listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/src/main.rs
@@ -0,0 +1,25 @@
+#[derive(Debug)]
+enum UsState {
+    Alabama,
+    Alaska,
+    // --snip--
+}
+
+enum Coin {
+    Penny,
+    Nickel,
+    Dime,
+    Quarter(UsState),
+}
+
+fn main() {
+    let coin = Coin::Penny;
+    // ANCHOR: here
+    let mut count = 0;
+    if let Coin::Quarter(state) = coin {
+        println!("State quarter from {:?}!", state);
+    } else {
+        count += 1;
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/src/lib.rs
new file mode 100644
index 0000000000..0e40be70d9
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-01/src/lib.rs
@@ -0,0 +1,19 @@
+// ANCHOR: here
+mod front_of_house {
+    mod hosting {
+        fn add_to_waitlist() {}
+
+        fn seat_at_table() {}
+    }
+
+    mod serving {
+        fn take_order() {}
+
+        fn serve_order() {}
+
+        fn take_payment() {}
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/output.txt b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/output.txt
new file mode 100644
index 0000000000..2a494c29ea
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/output.txt
@@ -0,0 +1,20 @@
+$ cargo build
+   Compiling restaurant v0.1.0 (file:///projects/restaurant)
+error[E0603]: module `hosting` is private
+ --> src/lib.rs:9:28
+  |
+9 |     crate::front_of_house::hosting::add_to_waitlist();
+  |                            ^^^^^^^
+
+error[E0603]: module `hosting` is private
+  --> src/lib.rs:12:21
+   |
+12 |     front_of_house::hosting::add_to_waitlist();
+   |                     ^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0603`.
+error: could not compile `restaurant`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/src/lib.rs
new file mode 100644
index 0000000000..0b8a43c6b3
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-03/src/lib.rs
@@ -0,0 +1,13 @@
+mod front_of_house {
+    mod hosting {
+        fn add_to_waitlist() {}
+    }
+}
+
+pub fn eat_at_restaurant() {
+    // Absolute path
+    crate::front_of_house::hosting::add_to_waitlist();
+
+    // Relative path
+    front_of_house::hosting::add_to_waitlist();
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/output.txt b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/output.txt
new file mode 100644
index 0000000000..664c6a4800
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/output.txt
@@ -0,0 +1,20 @@
+$ cargo build
+   Compiling restaurant v0.1.0 (file:///projects/restaurant)
+error[E0603]: function `add_to_waitlist` is private
+ --> src/lib.rs:9:37
+  |
+9 |     crate::front_of_house::hosting::add_to_waitlist();
+  |                                     ^^^^^^^^^^^^^^^
+
+error[E0603]: function `add_to_waitlist` is private
+  --> src/lib.rs:12:30
+   |
+12 |     front_of_house::hosting::add_to_waitlist();
+   |                              ^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0603`.
+error: could not compile `restaurant`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/src/lib.rs
new file mode 100644
index 0000000000..05372dbe5e
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-05/src/lib.rs
@@ -0,0 +1,13 @@
+mod front_of_house {
+    pub mod hosting {
+        fn add_to_waitlist() {}
+    }
+}
+
+pub fn eat_at_restaurant() {
+    // Absolute path
+    crate::front_of_house::hosting::add_to_waitlist();
+
+    // Relative path
+    front_of_house::hosting::add_to_waitlist();
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/src/lib.rs
new file mode 100644
index 0000000000..5a6edf9832
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-07/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+mod front_of_house {
+    pub mod hosting {
+        pub fn add_to_waitlist() {}
+    }
+}
+
+pub fn eat_at_restaurant() {
+    // Absolute path
+    crate::front_of_house::hosting::add_to_waitlist();
+
+    // Relative path
+    front_of_house::hosting::add_to_waitlist();
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/src/lib.rs
new file mode 100644
index 0000000000..a789379ae2
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-08/src/lib.rs
@@ -0,0 +1,14 @@
+// ANCHOR: here
+fn serve_order() {}
+
+mod back_of_house {
+    fn fix_incorrect_order() {
+        cook_order();
+        super::serve_order();
+    }
+
+    fn cook_order() {}
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/src/lib.rs
new file mode 100644
index 0000000000..92c4695d50
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-09/src/lib.rs
@@ -0,0 +1,27 @@
+mod back_of_house {
+    pub struct Breakfast {
+        pub toast: String,
+        seasonal_fruit: String,
+    }
+
+    impl Breakfast {
+        pub fn summer(toast: &str) -> Breakfast {
+            Breakfast {
+                toast: String::from(toast),
+                seasonal_fruit: String::from("peaches"),
+            }
+        }
+    }
+}
+
+pub fn eat_at_restaurant() {
+    // Order a breakfast in the summer with Rye toast
+    let mut meal = back_of_house::Breakfast::summer("Rye");
+    // Change our mind about what bread we'd like
+    meal.toast = String::from("Wheat");
+    println!("I'd like {} toast please", meal.toast);
+
+    // The next line won't compile if we uncomment it; we're not allowed
+    // to see or modify the seasonal fruit that comes with the meal
+    // meal.seasonal_fruit = String::from("blueberries");
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/src/lib.rs
new file mode 100644
index 0000000000..908f1dfb71
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-10/src/lib.rs
@@ -0,0 +1,11 @@
+mod back_of_house {
+    pub enum Appetizer {
+        Soup,
+        Salad,
+    }
+}
+
+pub fn eat_at_restaurant() {
+    let order1 = back_of_house::Appetizer::Soup;
+    let order2 = back_of_house::Appetizer::Salad;
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/src/lib.rs
new file mode 100644
index 0000000000..3a75683757
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-11/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+mod front_of_house {
+    pub mod hosting {
+        pub fn add_to_waitlist() {}
+    }
+}
+
+use crate::front_of_house::hosting;
+
+pub fn eat_at_restaurant() {
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/src/lib.rs
new file mode 100644
index 0000000000..6b0101b7d1
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-12/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+mod front_of_house {
+    pub mod hosting {
+        pub fn add_to_waitlist() {}
+    }
+}
+
+use self::front_of_house::hosting;
+
+pub fn eat_at_restaurant() {
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/src/lib.rs
new file mode 100644
index 0000000000..98414aac91
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-13/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+mod front_of_house {
+    pub mod hosting {
+        pub fn add_to_waitlist() {}
+    }
+}
+
+use crate::front_of_house::hosting::add_to_waitlist;
+
+pub fn eat_at_restaurant() {
+    add_to_waitlist();
+    add_to_waitlist();
+    add_to_waitlist();
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/src/main.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/src/main.rs
new file mode 100644
index 0000000000..4379e7c791
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-14/src/main.rs
@@ -0,0 +1,6 @@
+use std::collections::HashMap;
+
+fn main() {
+    let mut map = HashMap::new();
+    map.insert(1, 2);
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/src/lib.rs
new file mode 100644
index 0000000000..bfac3a07ac
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-15/src/lib.rs
@@ -0,0 +1,18 @@
+// ANCHOR: here
+use std::fmt;
+use std::io;
+
+fn function1() -> fmt::Result {
+    // --snip--
+    // ANCHOR_END: here
+    Ok(())
+    // ANCHOR: here
+}
+
+fn function2() -> io::Result<()> {
+    // --snip--
+    // ANCHOR_END: here
+    Ok(())
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/src/lib.rs
new file mode 100644
index 0000000000..843490b4d0
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-16/src/lib.rs
@@ -0,0 +1,18 @@
+// ANCHOR: here
+use std::fmt::Result;
+use std::io::Result as IoResult;
+
+fn function1() -> Result {
+    // --snip--
+    // ANCHOR_END: here
+    Ok(())
+    // ANCHOR: here
+}
+
+fn function2() -> IoResult<()> {
+    // --snip--
+    // ANCHOR_END: here
+    Ok(())
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/src/lib.rs
new file mode 100644
index 0000000000..e948d7c38e
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-17/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+mod front_of_house {
+    pub mod hosting {
+        pub fn add_to_waitlist() {}
+    }
+}
+
+pub use crate::front_of_house::hosting;
+
+pub fn eat_at_restaurant() {
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.lock
new file mode 100644
index 0000000000..c346748e55
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.toml
new file mode 100644
index 0000000000..ad5ca696d5
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/src/main.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/src/main.rs
new file mode 100644
index 0000000000..61a2023fff
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-18/src/main.rs
@@ -0,0 +1,32 @@
+use rand::Rng;
+// ANCHOR: here
+// --snip--
+use std::{cmp::Ordering, io};
+// --snip--
+// ANCHOR_END: here
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    println!("The secret number is: {}", secret_number);
+
+    println!("Please input your guess.");
+
+    let mut guess = String::new();
+
+    io::stdin()
+        .read_line(&mut guess)
+        .expect("Failed to read line");
+
+    let guess: u32 = guess.trim().parse().expect("Please type a number!");
+
+    println!("You guessed: {}", guess);
+
+    match guess.cmp(&secret_number) {
+        Ordering::Less => println!("Too small!"),
+        Ordering::Greater => println!("Too big!"),
+        Ordering::Equal => println!("You win!"),
+    }
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/src/lib.rs
new file mode 100644
index 0000000000..3fee46c443
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-19/src/lib.rs
@@ -0,0 +1,2 @@
+use std::io;
+use std::io::Write;
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/src/lib.rs
new file mode 100644
index 0000000000..341f40a472
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-20/src/lib.rs
@@ -0,0 +1 @@
+use std::io::{self, Write};
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/front_of_house.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/front_of_house.rs
new file mode 100644
index 0000000000..6875dfdb63
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/front_of_house.rs
@@ -0,0 +1,3 @@
+pub mod hosting {
+    pub fn add_to_waitlist() {}
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/lib.rs
new file mode 100644
index 0000000000..065b1b804c
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/listing-07-21-and-22/src/lib.rs
@@ -0,0 +1,9 @@
+mod front_of_house;
+
+pub use crate::front_of_house::hosting;
+
+pub fn eat_at_restaurant() {
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.lock
new file mode 100644
index 0000000000..2b3d41ad67
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.51"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a606a02debe2813760609f57a64a2ffd27d9fdf5b2f133eaca0b248dd92cdd2"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.51 (registry+https://github.com/rust-lang/crates.io-index)" = "bedcc7a809076656486ffe045abeeac163da1b558e963a31e29fbfbeba916917"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.toml
new file mode 100644
index 0000000000..10932024b4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/src/main.rs b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/src/main.rs
new file mode 100644
index 0000000000..c25b0a52a8
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/src/main.rs
@@ -0,0 +1,31 @@
+use rand::Rng;
+// ANCHOR: here
+// --snip--
+use std::cmp::Ordering;
+use std::io;
+// --snip--
+// ANCHOR_END: here
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    println!("The secret number is: {}", secret_number);
+
+    println!("Please input your guess.");
+
+    let mut guess = String::new();
+
+    io::stdin()
+        .read_line(&mut guess)
+        .expect("Failed to read line");
+
+    println!("You guessed: {}", guess);
+
+    match guess.cmp(&secret_number) {
+        Ordering::Less => println!("Too small!"),
+        Ordering::Greater => println!("Too big!"),
+        Ordering::Equal => println!("You win!"),
+    }
+}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.lock b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.lock
new file mode 100644
index 0000000000..f25ab358f4
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "restaurant"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.toml b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.toml
new file mode 100644
index 0000000000..8bdd0a4188
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "restaurant"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house.rs b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house.rs
new file mode 100644
index 0000000000..d0a8154eaf
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house.rs
@@ -0,0 +1 @@
+pub mod hosting;
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house/hosting.rs b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house/hosting.rs
new file mode 100644
index 0000000000..d65f3afd13
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house/hosting.rs
@@ -0,0 +1 @@
+pub fn add_to_waitlist() {}
diff --git a/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/lib.rs b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/lib.rs
new file mode 100644
index 0000000000..065b1b804c
--- /dev/null
+++ b/src/doc/book/listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/lib.rs
@@ -0,0 +1,9 @@
+mod front_of_house;
+
+pub use crate::front_of_house::hosting;
+
+pub fn eat_at_restaurant() {
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+    hosting::add_to_waitlist();
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-01/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-01/src/main.rs
new file mode 100644
index 0000000000..45e45581e2
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-01/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // ANCHOR: here
+    let v: Vec<i32> = Vec::new();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-02/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-02/src/main.rs
new file mode 100644
index 0000000000..3b10a53e88
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-02/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // ANCHOR: here
+    let v = vec![1, 2, 3];
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-03/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-03/src/main.rs
new file mode 100644
index 0000000000..147223f9ae
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-03/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    let mut v = Vec::new();
+
+    v.push(5);
+    v.push(6);
+    v.push(7);
+    v.push(8);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-04/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-04/src/main.rs
new file mode 100644
index 0000000000..abda2db660
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-04/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    {
+        let v = vec![1, 2, 3, 4];
+
+        // do stuff with v
+    } // <- v goes out of scope and is freed here
+      // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-05/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-05/src/main.rs
new file mode 100644
index 0000000000..9bfa37a4c2
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-05/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    let v = vec![1, 2, 3, 4, 5];
+
+    let third: &i32 = &v[2];
+    println!("The third element is {}", third);
+
+    match v.get(2) {
+        Some(third) => println!("The third element is {}", third),
+        None => println!("There is no third element."),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-06/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-06/src/main.rs
new file mode 100644
index 0000000000..783d9b110f
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-06/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let v = vec![1, 2, 3, 4, 5];
+
+    let does_not_exist = &v[100];
+    let does_not_exist = v.get(100);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-07/output.txt b/src/doc/book/listings/ch08-common-collections/listing-08-07/output.txt
new file mode 100644
index 0000000000..b50110bdba
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-07/output.txt
@@ -0,0 +1,20 @@
+$ cargo run
+   Compiling collections v0.1.0 (file:///projects/collections)
+error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
+ --> src/main.rs:6:5
+  |
+4 |     let first = &v[0];
+  |                  - immutable borrow occurs here
+5 | 
+6 |     v.push(6);
+  |     ^^^^^^^^^ mutable borrow occurs here
+7 | 
+8 |     println!("The first element is: {}", first);
+  |                                          ----- immutable borrow later used here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0502`.
+error: could not compile `collections`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-07/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-07/src/main.rs
new file mode 100644
index 0000000000..1b42274a6d
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-07/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let mut v = vec![1, 2, 3, 4, 5];
+
+    let first = &v[0];
+
+    v.push(6);
+
+    println!("The first element is: {}", first);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-08/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-08/src/main.rs
new file mode 100644
index 0000000000..38b97784be
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-08/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let v = vec![100, 32, 57];
+    for i in &v {
+        println!("{}", i);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-09/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-09/src/main.rs
new file mode 100644
index 0000000000..c62ba21b4f
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-09/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let mut v = vec![100, 32, 57];
+    for i in &mut v {
+        *i += 50;
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-10/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-10/src/main.rs
new file mode 100644
index 0000000000..c2198883b2
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-10/src/main.rs
@@ -0,0 +1,15 @@
+fn main() {
+    // ANCHOR: here
+    enum SpreadsheetCell {
+        Int(i32),
+        Float(f64),
+        Text(String),
+    }
+
+    let row = vec![
+        SpreadsheetCell::Int(3),
+        SpreadsheetCell::Text(String::from("blue")),
+        SpreadsheetCell::Float(10.12),
+    ];
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-11/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-11/src/main.rs
new file mode 100644
index 0000000000..4cf4c81c26
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-11/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::new();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-12/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-12/src/main.rs
new file mode 100644
index 0000000000..d9e5e768ab
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-12/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    let data = "initial contents";
+
+    let s = data.to_string();
+
+    // the method also works on a literal directly:
+    let s = "initial contents".to_string();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-13/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-13/src/main.rs
new file mode 100644
index 0000000000..b81e374536
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-13/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // ANCHOR: here
+    let s = String::from("initial contents");
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-14/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-14/src/main.rs
new file mode 100644
index 0000000000..f701fd578b
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-14/src/main.rs
@@ -0,0 +1,19 @@
+fn main() {
+    // ANCHOR: here
+    let hello = String::from("السلام عليكم");
+    let hello = String::from("Dobrý den");
+    let hello = String::from("Hello");
+    let hello = String::from("שָׁלוֹם");
+    let hello = String::from("नमस्ते");
+    let hello = String::from("こんにちは");
+    let hello = String::from("안녕하세요");
+    let hello = String::from("你好");
+    let hello = String::from("Olá");
+    // ANCHOR: russian
+    let hello = String::from("Здравствуйте");
+    // ANCHOR_END: russian
+    // ANCHOR: spanish
+    let hello = String::from("Hola");
+    // ANCHOR_END: spanish
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-15/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-15/src/main.rs
new file mode 100644
index 0000000000..7dec657d92
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-15/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("foo");
+    s.push_str("bar");
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-16/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-16/src/main.rs
new file mode 100644
index 0000000000..8938dc143b
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-16/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let mut s1 = String::from("foo");
+    let s2 = "bar";
+    s1.push_str(s2);
+    println!("s2 is {}", s2);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-17/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-17/src/main.rs
new file mode 100644
index 0000000000..0a9e8cc0a8
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-17/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let mut s = String::from("lo");
+    s.push('l');
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-18/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-18/src/main.rs
new file mode 100644
index 0000000000..93939a69fb
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-18/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("Hello, ");
+    let s2 = String::from("world!");
+    let s3 = s1 + &s2; // note s1 has been moved here and can no longer be used
+                       // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-19/output.txt b/src/doc/book/listings/ch08-common-collections/listing-08-19/output.txt
new file mode 100644
index 0000000000..c239f71896
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-19/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling collections v0.1.0 (file:///projects/collections)
+error[E0277]: the type `std::string::String` cannot be indexed by `{integer}`
+ --> src/main.rs:3:13
+  |
+3 |     let h = s1[0];
+  |             ^^^^^ `std::string::String` cannot be indexed by `{integer}`
+  |
+  = help: the trait `std::ops::Index<{integer}>` is not implemented for `std::string::String`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `collections`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-19/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-19/src/main.rs
new file mode 100644
index 0000000000..fc08e9ceaa
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-19/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("hello");
+    let h = s1[0];
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-20/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-20/src/main.rs
new file mode 100644
index 0000000000..54c2010911
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-20/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let mut scores = HashMap::new();
+
+    scores.insert(String::from("Blue"), 10);
+    scores.insert(String::from("Yellow"), 50);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-21/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-21/src/main.rs
new file mode 100644
index 0000000000..0ebd20d4e8
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-21/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let teams = vec![String::from("Blue"), String::from("Yellow")];
+    let initial_scores = vec![10, 50];
+
+    let mut scores: HashMap<_, _> =
+        teams.into_iter().zip(initial_scores.into_iter()).collect();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-22/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-22/src/main.rs
new file mode 100644
index 0000000000..2b2a73f94a
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-22/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let field_name = String::from("Favorite color");
+    let field_value = String::from("Blue");
+
+    let mut map = HashMap::new();
+    map.insert(field_name, field_value);
+    // field_name and field_value are invalid at this point, try using them and
+    // see what compiler error you get!
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-23/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-23/src/main.rs
new file mode 100644
index 0000000000..508e33cbbf
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-23/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let mut scores = HashMap::new();
+
+    scores.insert(String::from("Blue"), 10);
+    scores.insert(String::from("Yellow"), 50);
+
+    let team_name = String::from("Blue");
+    let score = scores.get(&team_name);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-24/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-24/src/main.rs
new file mode 100644
index 0000000000..e8684cf2b6
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-24/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let mut scores = HashMap::new();
+
+    scores.insert(String::from("Blue"), 10);
+    scores.insert(String::from("Blue"), 25);
+
+    println!("{:?}", scores);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-25/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-25/src/main.rs
new file mode 100644
index 0000000000..3ad97b57af
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-25/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let mut scores = HashMap::new();
+    scores.insert(String::from("Blue"), 10);
+
+    scores.entry(String::from("Yellow")).or_insert(50);
+    scores.entry(String::from("Blue")).or_insert(50);
+
+    println!("{:?}", scores);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.lock b/src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.toml b/src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-26/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/listing-08-26/src/main.rs b/src/doc/book/listings/ch08-common-collections/listing-08-26/src/main.rs
new file mode 100644
index 0000000000..f3f6aa166d
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/listing-08-26/src/main.rs
@@ -0,0 +1,16 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let text = "hello world wonderful world";
+
+    let mut map = HashMap::new();
+
+    for word in text.split_whitespace() {
+        let count = map.entry(word).or_insert(0);
+        *count += 1;
+    }
+
+    println!("{:?}", map);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.lock b/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.toml b/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/src/main.rs b/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/src/main.rs
new file mode 100644
index 0000000000..4995650d19
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-01-concat-multiple-strings/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("tic");
+    let s2 = String::from("tac");
+    let s3 = String::from("toe");
+
+    let s = s1 + "-" + &s2 + "-" + &s3;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.lock b/src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.toml b/src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-02-format/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-02-format/src/main.rs b/src/doc/book/listings/ch08-common-collections/no-listing-02-format/src/main.rs
new file mode 100644
index 0000000000..4a38e63d23
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-02-format/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    let s1 = String::from("tic");
+    let s2 = String::from("tac");
+    let s3 = String::from("toe");
+
+    let s = format!("{}-{}-{}", s1, s2, s3);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.lock b/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.toml b/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/src/main.rs b/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/src/main.rs
new file mode 100644
index 0000000000..2e7dc02e60
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/src/main.rs
@@ -0,0 +1,14 @@
+fn main() {
+    // ANCHOR: here
+    use std::collections::HashMap;
+
+    let mut scores = HashMap::new();
+
+    scores.insert(String::from("Blue"), 10);
+    scores.insert(String::from("Yellow"), 50);
+
+    for (key, value) in &scores {
+        println!("{}: {}", key, value);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.lock b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.lock
new file mode 100644
index 0000000000..d3daeff7dc
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "collections"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.toml b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.toml
new file mode 100644
index 0000000000..b36871bec4
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "collections"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt
new file mode 100644
index 0000000000..e05d332339
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling collections v0.1.0 (file:///projects/collections)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.43s
+     Running `target/debug/collections`
+thread 'main' panicked at 'byte index 1 is not a char boundary; it is inside 'З' (bytes 0..2) of `Здравствуйте`', src/libcore/str/mod.rs:2069:5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/src/main.rs b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/src/main.rs
new file mode 100644
index 0000000000..9283ff5bde
--- /dev/null
+++ b/src/doc/book/listings/ch08-common-collections/output-only-01-not-char-boundary/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let hello = "Здравствуйте";
+
+    let s = &hello[0..1];
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.lock
new file mode 100644
index 0000000000..4fe030fabf
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "panic"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.toml
new file mode 100644
index 0000000000..310342cd33
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "panic"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-01/output.txt b/src/doc/book/listings/ch09-error-handling/listing-09-01/output.txt
new file mode 100644
index 0000000000..36aef5049e
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-01/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling panic v0.1.0 (file:///projects/panic)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.27s
+     Running `target/debug/panic`
+thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2806:10
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-01/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-01/src/main.rs
new file mode 100644
index 0000000000..70194abd79
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-01/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let v = vec![1, 2, 3];
+
+    v[99];
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-03/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-03/src/main.rs
new file mode 100644
index 0000000000..0dfd10b5e5
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-03/src/main.rs
@@ -0,0 +1,5 @@
+use std::fs::File;
+
+fn main() {
+    let f = File::open("hello.txt");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-04/output.txt b/src/doc/book/listings/ch09-error-handling/listing-09-04/output.txt
new file mode 100644
index 0000000000..acc4f0c741
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-04/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling error-handling v0.1.0 (file:///projects/error-handling)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.73s
+     Running `target/debug/error-handling`
+thread 'main' panicked at 'Problem opening the file: Os { code: 2, kind: NotFound, message: "No such file or directory" }', src/main.rs:8:23
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-04/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-04/src/main.rs
new file mode 100644
index 0000000000..070fc33809
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-04/src/main.rs
@@ -0,0 +1,10 @@
+use std::fs::File;
+
+fn main() {
+    let f = File::open("hello.txt");
+
+    let f = match f {
+        Ok(file) => file,
+        Err(error) => panic!("Problem opening the file: {:?}", error),
+    };
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-05/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-05/src/main.rs
new file mode 100644
index 0000000000..8c4f773b9e
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-05/src/main.rs
@@ -0,0 +1,19 @@
+use std::fs::File;
+use std::io::ErrorKind;
+
+fn main() {
+    let f = File::open("hello.txt");
+
+    let f = match f {
+        Ok(file) => file,
+        Err(error) => match error.kind() {
+            ErrorKind::NotFound => match File::create("hello.txt") {
+                Ok(fc) => fc,
+                Err(e) => panic!("Problem creating the file: {:?}", e),
+            },
+            other_error => {
+                panic!("Problem opening the file: {:?}", other_error)
+            }
+        },
+    };
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-06/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-06/src/main.rs
new file mode 100644
index 0000000000..437d858f44
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-06/src/main.rs
@@ -0,0 +1,25 @@
+// ANCHOR: here
+use std::fs::File;
+use std::io;
+use std::io::Read;
+
+fn read_username_from_file() -> Result<String, io::Error> {
+    let f = File::open("hello.txt");
+
+    let mut f = match f {
+        Ok(file) => file,
+        Err(e) => return Err(e),
+    };
+
+    let mut s = String::new();
+
+    match f.read_to_string(&mut s) {
+        Ok(_) => Ok(s),
+        Err(e) => Err(e),
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let username = read_username_from_file().expect("Unable to get username");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-07/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-07/src/main.rs
new file mode 100644
index 0000000000..b9f6172cb2
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-07/src/main.rs
@@ -0,0 +1,16 @@
+// ANCHOR: here
+use std::fs::File;
+use std::io;
+use std::io::Read;
+
+fn read_username_from_file() -> Result<String, io::Error> {
+    let mut f = File::open("hello.txt")?;
+    let mut s = String::new();
+    f.read_to_string(&mut s)?;
+    Ok(s)
+}
+// ANCHOR_END: here
+
+fn main() {
+    let username = read_username_from_file().expect("Unable to get username");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-08/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-08/src/main.rs
new file mode 100644
index 0000000000..f36e4d0219
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-08/src/main.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+use std::fs::File;
+use std::io;
+use std::io::Read;
+
+fn read_username_from_file() -> Result<String, io::Error> {
+    let mut s = String::new();
+
+    File::open("hello.txt")?.read_to_string(&mut s)?;
+
+    Ok(s)
+}
+// ANCHOR_END: here
+
+fn main() {
+    let username = read_username_from_file().expect("Unable to get username");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-09/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-09/src/main.rs
new file mode 100644
index 0000000000..4597dc2eea
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-09/src/main.rs
@@ -0,0 +1,12 @@
+// ANCHOR: here
+use std::fs;
+use std::io;
+
+fn read_username_from_file() -> Result<String, io::Error> {
+    fs::read_to_string("hello.txt")
+}
+// ANCHOR_END: here
+
+fn main() {
+    let username = read_username_from_file().expect("Unable to get username");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.lock b/src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.lock
new file mode 100644
index 0000000000..c346748e55
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.toml b/src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.toml
new file mode 100644
index 0000000000..ad5ca696d5
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-10/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch09-error-handling/listing-09-10/src/main.rs b/src/doc/book/listings/ch09-error-handling/listing-09-10/src/main.rs
new file mode 100644
index 0000000000..7448979a06
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/listing-09-10/src/main.rs
@@ -0,0 +1,55 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+// ANCHOR: here
+pub struct Guess {
+    value: i32,
+}
+
+impl Guess {
+    pub fn new(value: i32) -> Guess {
+        if value < 1 || value > 100 {
+            panic!("Guess value must be between 1 and 100, got {}.", value);
+        }
+
+        Guess { value }
+    }
+
+    pub fn value(&self) -> i32 {
+        self.value
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    loop {
+        println!("Please input your guess.");
+
+        let mut guess = String::new();
+
+        io::stdin()
+            .read_line(&mut guess)
+            .expect("Failed to read line");
+
+        let guess: i32 = match guess.trim().parse() {
+            Ok(num) => num,
+            Err(_) => continue,
+        };
+
+        let guess = Guess::new(guess);
+
+        match guess.value().cmp(&secret_number) {
+            Ordering::Less => println!("Too small!"),
+            Ordering::Greater => println!("Too big!"),
+            Ordering::Equal => {
+                println!("You win!");
+                break;
+            }
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.lock
new file mode 100644
index 0000000000..4fe030fabf
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "panic"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.toml
new file mode 100644
index 0000000000..310342cd33
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "panic"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/output.txt b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/output.txt
new file mode 100644
index 0000000000..1bc3dc729a
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling panic v0.1.0 (file:///projects/panic)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.25s
+     Running `target/debug/panic`
+thread 'main' panicked at 'crash and burn', src/main.rs:2:5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/src/main.rs
new file mode 100644
index 0000000000..32a4c243da
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-01-panic/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    panic!("crash and burn");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt
new file mode 100644
index 0000000000..18262cbc40
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt
@@ -0,0 +1,19 @@
+$ cargo run
+   Compiling error-handling v0.1.0 (file:///projects/error-handling)
+error[E0308]: mismatched types
+ --> src/main.rs:4:18
+  |
+4 |     let f: u32 = File::open("hello.txt");
+  |            ---   ^^^^^^^^^^^^^^^^^^^^^^^ expected `u32`, found enum `std::result::Result`
+  |            |
+  |            expected due to this
+  |
+  = note: expected type `u32`
+             found enum `std::result::Result<std::fs::File, std::io::Error>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `error-handling`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/src/main.rs
new file mode 100644
index 0000000000..a637f5f957
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/src/main.rs
@@ -0,0 +1,7 @@
+use std::fs::File;
+
+fn main() {
+    // ANCHOR: here
+    let f: u32 = File::open("hello.txt");
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/src/main.rs
new file mode 100644
index 0000000000..c6682cd233
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-03-closures/src/main.rs
@@ -0,0 +1,14 @@
+use std::fs::File;
+use std::io::ErrorKind;
+
+fn main() {
+    let f = File::open("hello.txt").unwrap_or_else(|error| {
+        if error.kind() == ErrorKind::NotFound {
+            File::create("hello.txt").unwrap_or_else(|error| {
+                panic!("Problem creating the file: {:?}", error);
+            })
+        } else {
+            panic!("Problem opening the file: {:?}", error);
+        }
+    });
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/src/main.rs
new file mode 100644
index 0000000000..7b6b13ae76
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-04-unwrap/src/main.rs
@@ -0,0 +1,5 @@
+use std::fs::File;
+
+fn main() {
+    let f = File::open("hello.txt").unwrap();
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/src/main.rs
new file mode 100644
index 0000000000..cab643bc5c
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-05-expect/src/main.rs
@@ -0,0 +1,5 @@
+use std::fs::File;
+
+fn main() {
+    let f = File::open("hello.txt").expect("Failed to open hello.txt");
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt
new file mode 100644
index 0000000000..17a8b2e476
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt
@@ -0,0 +1,20 @@
+$ cargo run
+   Compiling error-handling v0.1.0 (file:///projects/error-handling)
+error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`)
+ --> src/main.rs:4:13
+  |
+3 | / fn main() {
+4 | |     let f = File::open("hello.txt")?;
+  | |             ^^^^^^^^^^^^^^^^^^^^^^^^ cannot use the `?` operator in a function that returns `()`
+5 | | }
+  | |_- this function should return `Result` or `Option` to accept `?`
+  |
+  = help: the trait `std::ops::Try` is not implemented for `()`
+  = note: required by `std::ops::Try::from_error`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `error-handling`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/src/main.rs
new file mode 100644
index 0000000000..8608dc13ff
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-06-question-mark-in-main/src/main.rs
@@ -0,0 +1,5 @@
+use std::fs::File;
+
+fn main() {
+    let f = File::open("hello.txt")?;
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/src/main.rs
new file mode 100644
index 0000000000..7f16b8e995
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-07-main-returning-result/src/main.rs
@@ -0,0 +1,8 @@
+use std::error::Error;
+use std::fs::File;
+
+fn main() -> Result<(), Box<dyn Error>> {
+    let f = File::open("hello.txt")?;
+
+    Ok(())
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.lock
new file mode 100644
index 0000000000..1fa96b7974
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "error-handling"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.toml
new file mode 100644
index 0000000000..2a48daefb8
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "error-handling"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/src/main.rs
new file mode 100644
index 0000000000..e829724c57
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    use std::net::IpAddr;
+
+    let home: IpAddr = "127.0.0.1".parse().unwrap();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.lock b/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.lock
new file mode 100644
index 0000000000..c346748e55
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.lock
@@ -0,0 +1,87 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.53"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.toml b/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.toml
new file mode 100644
index 0000000000..ad5ca696d5
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/src/main.rs b/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/src/main.rs
new file mode 100644
index 0000000000..d89d719aa0
--- /dev/null
+++ b/src/doc/book/listings/ch09-error-handling/no-listing-09-guess-out-of-range/src/main.rs
@@ -0,0 +1,47 @@
+use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
+
+fn main() {
+    println!("Guess the number!");
+
+    let secret_number = rand::thread_rng().gen_range(1, 101);
+
+    // ANCHOR: here
+    loop {
+        // --snip--
+
+        // ANCHOR_END: here
+        println!("Please input your guess.");
+
+        let mut guess = String::new();
+
+        io::stdin()
+            .read_line(&mut guess)
+            .expect("Failed to read line");
+
+        // ANCHOR: here
+        let guess: i32 = match guess.trim().parse() {
+            Ok(num) => num,
+            Err(_) => continue,
+        };
+
+        if guess < 1 || guess > 100 {
+            println!("The secret number will be between 1 and 100.");
+            continue;
+        }
+
+        match guess.cmp(&secret_number) {
+            // --snip--
+            // ANCHOR_END: here
+            Ordering::Less => println!("Too small!"),
+            Ordering::Greater => println!("Too big!"),
+            Ordering::Equal => {
+                println!("You win!");
+                break;
+            }
+        }
+        // ANCHOR: here
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/src/main.rs
new file mode 100644
index 0000000000..d2ba23b4a7
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/src/main.rs
@@ -0,0 +1,18 @@
+// ANCHOR: here
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let mut largest = number_list[0];
+
+    for number in number_list {
+        if number > largest {
+            largest = number;
+        }
+    }
+
+    println!("The largest number is {}", largest);
+    // ANCHOR_END: here
+    assert_eq!(largest, 100);
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/src/main.rs
new file mode 100644
index 0000000000..9138dfcb44
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/src/main.rs
@@ -0,0 +1,25 @@
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let mut largest = number_list[0];
+
+    for number in number_list {
+        if number > largest {
+            largest = number;
+        }
+    }
+
+    println!("The largest number is {}", largest);
+
+    let number_list = vec![102, 34, 6000, 89, 54, 2, 43, 8];
+
+    let mut largest = number_list[0];
+
+    for number in number_list {
+        if number > largest {
+            largest = number;
+        }
+    }
+
+    println!("The largest number is {}", largest);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/src/main.rs
new file mode 100644
index 0000000000..7704ff3382
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/src/main.rs
@@ -0,0 +1,31 @@
+// ANCHOR: here
+fn largest(list: &[i32]) -> i32 {
+    let mut largest = list[0];
+
+    for &item in list {
+        if item > largest {
+            largest = item;
+        }
+    }
+
+    largest
+}
+
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let result = largest(&number_list);
+    println!("The largest number is {}", result);
+    // ANCHOR_END: here
+    assert_eq!(result, 100);
+    // ANCHOR: here
+
+    let number_list = vec![102, 34, 6000, 89, 54, 2, 43, 8];
+
+    let result = largest(&number_list);
+    println!("The largest number is {}", result);
+    // ANCHOR_END: here
+    assert_eq!(result, 6000);
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/src/main.rs
new file mode 100644
index 0000000000..6b483ec976
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/src/main.rs
@@ -0,0 +1,43 @@
+// ANCHOR: here
+fn largest_i32(list: &[i32]) -> i32 {
+    let mut largest = list[0];
+
+    for &item in list {
+        if item > largest {
+            largest = item;
+        }
+    }
+
+    largest
+}
+
+fn largest_char(list: &[char]) -> char {
+    let mut largest = list[0];
+
+    for &item in list {
+        if item > largest {
+            largest = item;
+        }
+    }
+
+    largest
+}
+
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let result = largest_i32(&number_list);
+    println!("The largest number is {}", result);
+    // ANCHOR_END: here
+    assert_eq!(result, 100);
+    // ANCHOR: here
+
+    let char_list = vec!['y', 'm', 'a', 'q'];
+
+    let result = largest_char(&char_list);
+    println!("The largest char is {}", result);
+    // ANCHOR_END: here
+    assert_eq!(result, 'y');
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt
new file mode 100644
index 0000000000..65498128db
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0369]: binary operation `>` cannot be applied to type `T`
+ --> src/main.rs:5:17
+  |
+5 |         if item > largest {
+  |            ---- ^ ------- T
+  |            |
+  |            T
+  |
+  = note: `T` might need a bound for `std::cmp::PartialOrd`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0369`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/src/main.rs
new file mode 100644
index 0000000000..e731157060
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/src/main.rs
@@ -0,0 +1,23 @@
+fn largest<T>(list: &[T]) -> T {
+    let mut largest = list[0];
+
+    for &item in list {
+        if item > largest {
+            largest = item;
+        }
+    }
+
+    largest
+}
+
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let result = largest(&number_list);
+    println!("The largest number is {}", result);
+
+    let char_list = vec!['y', 'm', 'a', 'q'];
+
+    let result = largest(&char_list);
+    println!("The largest char is {}", result);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/src/main.rs
new file mode 100644
index 0000000000..4252593df9
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/src/main.rs
@@ -0,0 +1,9 @@
+struct Point<T> {
+    x: T,
+    y: T,
+}
+
+fn main() {
+    let integer = Point { x: 5, y: 10 };
+    let float = Point { x: 1.0, y: 4.0 };
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt
new file mode 100644
index 0000000000..4a67e1b595
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt
@@ -0,0 +1,14 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0308]: mismatched types
+ --> src/main.rs:7:38
+  |
+7 |     let wont_work = Point { x: 5, y: 4.0 };
+  |                                      ^^^ expected integer, found floating-point number
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/src/main.rs
new file mode 100644
index 0000000000..7883db1a6f
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/src/main.rs
@@ -0,0 +1,8 @@
+struct Point<T> {
+    x: T,
+    y: T,
+}
+
+fn main() {
+    let wont_work = Point { x: 5, y: 4.0 };
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/src/main.rs
new file mode 100644
index 0000000000..615b78cfd7
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/src/main.rs
@@ -0,0 +1,10 @@
+struct Point<T, U> {
+    x: T,
+    y: U,
+}
+
+fn main() {
+    let both_integer = Point { x: 5, y: 10 };
+    let both_float = Point { x: 1.0, y: 4.0 };
+    let integer_and_float = Point { x: 5, y: 4.0 };
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/src/main.rs
new file mode 100644
index 0000000000..288b64eac5
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/src/main.rs
@@ -0,0 +1,16 @@
+struct Point<T> {
+    x: T,
+    y: T,
+}
+
+impl<T> Point<T> {
+    fn x(&self) -> &T {
+        &self.x
+    }
+}
+
+fn main() {
+    let p = Point { x: 5, y: 10 };
+
+    println!("p.x = {}", p.x());
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/src/main.rs
new file mode 100644
index 0000000000..4c5b01bdcd
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/src/main.rs
@@ -0,0 +1,24 @@
+struct Point<T> {
+    x: T,
+    y: T,
+}
+
+impl<T> Point<T> {
+    fn x(&self) -> &T {
+        &self.x
+    }
+}
+
+// ANCHOR: here
+impl Point<f32> {
+    fn distance_from_origin(&self) -> f32 {
+        (self.x.powi(2) + self.y.powi(2)).sqrt()
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let p = Point { x: 5, y: 10 };
+
+    println!("p.x = {}", p.x());
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/src/main.rs
new file mode 100644
index 0000000000..4a08d1a8d6
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/src/main.rs
@@ -0,0 +1,22 @@
+struct Point<T, U> {
+    x: T,
+    y: U,
+}
+
+impl<T, U> Point<T, U> {
+    fn mixup<V, W>(self, other: Point<V, W>) -> Point<T, W> {
+        Point {
+            x: self.x,
+            y: other.y,
+        }
+    }
+}
+
+fn main() {
+    let p1 = Point { x: 5, y: 10.4 };
+    let p2 = Point { x: "Hello", y: 'c' };
+
+    let p3 = p1.mixup(p2);
+
+    println!("p3.x = {}, p3.y = {}", p3.x, p3.y);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/src/lib.rs
new file mode 100644
index 0000000000..cfaedb02f4
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait Summary {
+    fn summarize(&self) -> String;
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/src/lib.rs
new file mode 100644
index 0000000000..c4c83329ef
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/src/lib.rs
@@ -0,0 +1,31 @@
+pub trait Summary {
+    fn summarize(&self) -> String;
+}
+
+// ANCHOR: here
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {
+    fn summarize(&self) -> String {
+        format!("{}, by {} ({})", self.headline, self.author, self.location)
+    }
+}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/src/lib.rs
new file mode 100644
index 0000000000..fb59b84fb1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/src/lib.rs
@@ -0,0 +1,29 @@
+// ANCHOR: here
+pub trait Summary {
+    fn summarize(&self) -> String {
+        String::from("(Read more...)")
+    }
+}
+// ANCHOR_END: here
+
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/src/main.rs
new file mode 100644
index 0000000000..7aa6a3bd22
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/src/main.rs
@@ -0,0 +1,23 @@
+fn largest<T: PartialOrd + Copy>(list: &[T]) -> T {
+    let mut largest = list[0];
+
+    for &item in list {
+        if item > largest {
+            largest = item;
+        }
+    }
+
+    largest
+}
+
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let result = largest(&number_list);
+    println!("The largest number is {}", result);
+
+    let char_list = vec!['y', 'm', 'a', 'q'];
+
+    let result = largest(&char_list);
+    println!("The largest char is {}", result);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/src/lib.rs
new file mode 100644
index 0000000000..669cc5fdc2
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/src/lib.rs
@@ -0,0 +1,22 @@
+use std::fmt::Display;
+
+struct Pair<T> {
+    x: T,
+    y: T,
+}
+
+impl<T> Pair<T> {
+    fn new(x: T, y: T) -> Self {
+        Self { x, y }
+    }
+}
+
+impl<T: Display + PartialOrd> Pair<T> {
+    fn cmp_display(&self) {
+        if self.x >= self.y {
+            println!("The largest member is x = {}", self.x);
+        } else {
+            println!("The largest member is y = {}", self.y);
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt
new file mode 100644
index 0000000000..5f9b71b0bf
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt
@@ -0,0 +1,19 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0597]: `x` does not live long enough
+  --> src/main.rs:7:17
+   |
+7  |             r = &x;
+   |                 ^^ borrowed value does not live long enough
+8  |         }
+   |         - `x` dropped here while still borrowed
+9  | 
+10 |         println!("r: {}", r);
+   |                           - borrow later used here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0597`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/src/main.rs
new file mode 100644
index 0000000000..16adb6a0d6
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/src/main.rs
@@ -0,0 +1,14 @@
+fn main() {
+    // ANCHOR: here
+    {
+        let r;
+
+        {
+            let x = 5;
+            r = &x;
+        }
+
+        println!("r: {}", r);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.lock
new file mode 100644
index 0000000000..6388bb2b53
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/rustfmt-ignore b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/src/main.rs
new file mode 100644
index 0000000000..65dbf375a8
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/src/main.rs
@@ -0,0 +1,14 @@
+fn main() {
+    // ANCHOR: here
+    {
+        let r;                // ---------+-- 'a
+                              //          |
+        {                     //          |
+            let x = 5;        // -+-- 'b  |
+            r = &x;           //  |       |
+        }                     // -+       |
+                              //          |
+        println!("r: {}", r); //          |
+    }                         // ---------+
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.lock
new file mode 100644
index 0000000000..6388bb2b53
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/rustfmt-ignore b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/rustfmt-ignore
new file mode 100644
index 0000000000..9a53c718a8
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/rustfmt-ignore
@@ -0,0 +1,3 @@
+We have some weird comments pointing out borrowing scopes that we don't want to change;
+unfortunately I haven't found a way to skip them with rustfmt that works so for now we're going to
+manually skip those listings. See: https://github.com/rust-lang/rustfmt/issues/4028
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/src/main.rs
new file mode 100644
index 0000000000..94e70f00f8
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    {
+        let x = 5;            // ----------+-- 'b
+                              //           |
+        let r = &x;           // --+-- 'a  |
+                              //   |       |
+        println!("r: {}", r); //   |       |
+                              // --+       |
+    }                         // ----------+
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/src/main.rs
new file mode 100644
index 0000000000..0f076a71db
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let string1 = String::from("abcd");
+    let string2 = "xyz";
+
+    let result = longest(string1.as_str(), string2);
+    println!("The longest string is {}", result);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/output.txt
new file mode 100644
index 0000000000..21fb936145
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0106]: missing lifetime specifier
+ --> src/main.rs:9:33
+  |
+9 | fn longest(x: &str, y: &str) -> &str {
+  |                                 ^ expected lifetime parameter
+  |
+  = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `x` or `y`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0106`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/src/main.rs
new file mode 100644
index 0000000000..6af8c9f0da
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/src/main.rs
@@ -0,0 +1,17 @@
+fn main() {
+    let string1 = String::from("abcd");
+    let string2 = "xyz";
+
+    let result = longest(string1.as_str(), string2);
+    println!("The longest string is {}", result);
+}
+
+// ANCHOR: here
+fn longest(x: &str, y: &str) -> &str {
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/src/main.rs
new file mode 100644
index 0000000000..09c3a0daaa
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/src/main.rs
@@ -0,0 +1,17 @@
+fn main() {
+    let string1 = String::from("abcd");
+    let string2 = "xyz";
+
+    let result = longest(string1.as_str(), string2);
+    println!("The longest string is {}", result);
+}
+
+// ANCHOR: here
+fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/src/main.rs
new file mode 100644
index 0000000000..836ec72959
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/src/main.rs
@@ -0,0 +1,19 @@
+// ANCHOR: here
+fn main() {
+    let string1 = String::from("long string is long");
+
+    {
+        let string2 = String::from("xyz");
+        let result = longest(string1.as_str(), string2.as_str());
+        println!("The longest string is {}", result);
+    }
+}
+// ANCHOR_END: here
+
+fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/output.txt
new file mode 100644
index 0000000000..bcedda0f49
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0597]: `string2` does not live long enough
+ --> src/main.rs:6:44
+  |
+6 |         result = longest(string1.as_str(), string2.as_str());
+  |                                            ^^^^^^^ borrowed value does not live long enough
+7 |     }
+  |     - `string2` dropped here while still borrowed
+8 |     println!("The longest string is {}", result);
+  |                                          ------ borrow later used here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0597`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/src/main.rs
new file mode 100644
index 0000000000..2a6fa5898f
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/src/main.rs
@@ -0,0 +1,19 @@
+// ANCHOR: here
+fn main() {
+    let string1 = String::from("long string is long");
+    let result;
+    {
+        let string2 = String::from("xyz");
+        result = longest(string1.as_str(), string2.as_str());
+    }
+    println!("The longest string is {}", result);
+}
+// ANCHOR_END: here
+
+fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/src/main.rs
new file mode 100644
index 0000000000..2937b194ca
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/src/main.rs
@@ -0,0 +1,11 @@
+struct ImportantExcerpt<'a> {
+    part: &'a str,
+}
+
+fn main() {
+    let novel = String::from("Call me Ishmael. Some years ago...");
+    let first_sentence = novel.split('.').next().expect("Could not find a '.'");
+    let i = ImportantExcerpt {
+        part: first_sentence,
+    };
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.lock
new file mode 100644
index 0000000000..2aa4918e5d
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "ownership"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.toml
new file mode 100644
index 0000000000..686de938f0
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "ownership"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/src/main.rs
new file mode 100644
index 0000000000..431a261d2c
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/src/main.rs
@@ -0,0 +1,29 @@
+// ANCHOR: here
+fn first_word(s: &str) -> &str {
+    let bytes = s.as_bytes();
+
+    for (i, &item) in bytes.iter().enumerate() {
+        if item == b' ' {
+            return &s[0..i];
+        }
+    }
+
+    &s[..]
+}
+// ANCHOR_END: here
+
+fn main() {
+    let my_string = String::from("hello world");
+
+    // first_word works on slices of `String`s
+    let word = first_word(&my_string[..]);
+
+    let my_string_literal = "hello world";
+
+    // first_word works on slices of string literals
+    let word = first_word(&my_string_literal[..]);
+
+    // Because string literals *are* string slices already,
+    // this works too, without the slice syntax!
+    let word = first_word(my_string_literal);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/lib.rs
new file mode 100644
index 0000000000..fa644ca4fb
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/lib.rs
@@ -0,0 +1,29 @@
+pub trait Summary {
+    fn summarize(&self) -> String;
+}
+
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {
+    fn summarize(&self) -> String {
+        format!("{}, by {} ({})", self.headline, self.author, self.location)
+    }
+}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/main.rs
new file mode 100644
index 0000000000..466dc4d59a
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/main.rs
@@ -0,0 +1,16 @@
+use chapter10::{self, Summary, Tweet};
+
+fn main() {
+    // ANCHOR: here
+    let tweet = Tweet {
+        username: String::from("horse_ebooks"),
+        content: String::from(
+            "of course, as you probably already know, people",
+        ),
+        reply: false,
+        retweet: false,
+    };
+
+    println!("1 new tweet: {}", tweet.summarize());
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/lib.rs
new file mode 100644
index 0000000000..b6f93a68f7
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/lib.rs
@@ -0,0 +1,27 @@
+pub trait Summary {
+    fn summarize(&self) -> String {
+        String::from("(Read more...)")
+    }
+}
+
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/main.rs
new file mode 100644
index 0000000000..44c9c64ea1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/main.rs
@@ -0,0 +1,17 @@
+use chapter10::{self, NewsArticle, Summary};
+
+fn main() {
+    // ANCHOR: here
+    let article = NewsArticle {
+        headline: String::from("Penguins win the Stanley Cup Championship!"),
+        location: String::from("Pittsburgh, PA, USA"),
+        author: String::from("Iceburgh"),
+        content: String::from(
+            "The Pittsburgh Penguins once again are the best \
+             hockey team in the NHL.",
+        ),
+    };
+
+    println!("New article available! {}", article.summarize());
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/lib.rs
new file mode 100644
index 0000000000..643906f691
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/lib.rs
@@ -0,0 +1,24 @@
+// ANCHOR: here
+pub trait Summary {
+    fn summarize_author(&self) -> String;
+
+    fn summarize(&self) -> String {
+        format!("(Read more from {}...)", self.summarize_author())
+    }
+}
+// ANCHOR_END: here
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+// ANCHOR: impl
+impl Summary for Tweet {
+    fn summarize_author(&self) -> String {
+        format!("@{}", self.username)
+    }
+}
+// ANCHOR_END: impl
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/main.rs
new file mode 100644
index 0000000000..466dc4d59a
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/main.rs
@@ -0,0 +1,16 @@
+use chapter10::{self, Summary, Tweet};
+
+fn main() {
+    // ANCHOR: here
+    let tweet = Tweet {
+        username: String::from("horse_ebooks"),
+        content: String::from(
+            "of course, as you probably already know, people",
+        ),
+        reply: false,
+        retweet: false,
+    };
+
+    println!("1 new tweet: {}", tweet.summarize());
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/src/lib.rs
new file mode 100644
index 0000000000..95038433e8
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/src/lib.rs
@@ -0,0 +1,35 @@
+pub trait Summary {
+    fn summarize(&self) -> String;
+}
+
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {
+    fn summarize(&self) -> String {
+        format!("{}, by {} ({})", self.headline, self.author, self.location)
+    }
+}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
+
+// ANCHOR: here
+pub fn notify(item: impl Summary) {
+    println!("Breaking news! {}", item.summarize());
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/src/lib.rs
new file mode 100644
index 0000000000..a611fce38e
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/src/lib.rs
@@ -0,0 +1,42 @@
+pub trait Summary {
+    fn summarize(&self) -> String;
+}
+
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {
+    fn summarize(&self) -> String {
+        format!("{}, by {} ({})", self.headline, self.author, self.location)
+    }
+}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
+
+// ANCHOR: here
+fn returns_summarizable() -> impl Summary {
+    Tweet {
+        username: String::from("horse_ebooks"),
+        content: String::from(
+            "of course, as you probably already know, people",
+        ),
+        reply: false,
+        retweet: false,
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/src/lib.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/src/lib.rs
new file mode 100644
index 0000000000..7cd81d4c32
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/src/lib.rs
@@ -0,0 +1,56 @@
+pub trait Summary {
+    fn summarize(&self) -> String;
+}
+
+pub struct NewsArticle {
+    pub headline: String,
+    pub location: String,
+    pub author: String,
+    pub content: String,
+}
+
+impl Summary for NewsArticle {
+    fn summarize(&self) -> String {
+        format!("{}, by {} ({})", self.headline, self.author, self.location)
+    }
+}
+
+pub struct Tweet {
+    pub username: String,
+    pub content: String,
+    pub reply: bool,
+    pub retweet: bool,
+}
+
+impl Summary for Tweet {
+    fn summarize(&self) -> String {
+        format!("{}: {}", self.username, self.content)
+    }
+}
+
+// ANCHOR: here
+fn returns_summarizable(switch: bool) -> impl Summary {
+    if switch {
+        NewsArticle {
+            headline: String::from(
+                "Penguins win the Stanley Cup Championship!",
+            ),
+            location: String::from("Pittsburgh, PA, USA"),
+            author: String::from("Iceburgh"),
+            content: String::from(
+                "The Pittsburgh Penguins once again are the best \
+                 hockey team in the NHL.",
+            ),
+        }
+    } else {
+        Tweet {
+            username: String::from("horse_ebooks"),
+            content: String::from(
+                "of course, as you probably already know, people",
+            ),
+            reply: false,
+            retweet: false,
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/output.txt
new file mode 100644
index 0000000000..ca7023f1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/output.txt
@@ -0,0 +1,29 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0508]: cannot move out of type `[T]`, a non-copy slice
+ --> src/main.rs:2:23
+  |
+2 |     let mut largest = list[0];
+  |                       ^^^^^^^
+  |                       |
+  |                       cannot move out of here
+  |                       move occurs because `list[_]` has type `T`, which does not implement the `Copy` trait
+  |                       help: consider borrowing here: `&list[0]`
+
+error[E0507]: cannot move out of a shared reference
+ --> src/main.rs:4:18
+  |
+4 |     for &item in list {
+  |         -----    ^^^^
+  |         ||
+  |         |data moved here
+  |         |move occurs because `item` has type `T`, which does not implement the `Copy` trait
+  |         help: consider removing the `&`: `item`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0507, E0508.
+For more information about an error, try `rustc --explain E0507`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/src/main.rs
new file mode 100644
index 0000000000..525ce815a0
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/src/main.rs
@@ -0,0 +1,25 @@
+// ANCHOR: here
+fn largest<T: PartialOrd>(list: &[T]) -> T {
+    // ANCHOR_END: here
+    let mut largest = list[0];
+
+    for &item in list {
+        if item > largest {
+            largest = item;
+        }
+    }
+
+    largest
+}
+
+fn main() {
+    let number_list = vec![34, 50, 25, 100, 65];
+
+    let result = largest(&number_list);
+    println!("The largest number is {}", result);
+
+    let char_list = vec!['y', 'm', 'a', 'q'];
+
+    let result = largest(&char_list);
+    println!("The largest char is {}", result);
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/src/main.rs
new file mode 100644
index 0000000000..d144305cb0
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    let string1 = String::from("abcd");
+    let string2 = "efghijklmnopqrstuvwxyz";
+
+    let result = longest(string1.as_str(), string2);
+    println!("The longest string is {}", result);
+}
+
+// ANCHOR: here
+fn longest<'a>(x: &'a str, y: &str) -> &'a str {
+    x
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/output.txt b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/output.txt
new file mode 100644
index 0000000000..cadd5fa32c
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/output.txt
@@ -0,0 +1,17 @@
+$ cargo run
+   Compiling chapter10 v0.1.0 (file:///projects/chapter10)
+error[E0515]: cannot return value referencing local variable `result`
+  --> src/main.rs:11:5
+   |
+11 |     result.as_str()
+   |     ------^^^^^^^^^
+   |     |
+   |     returns a value referencing data owned by the current function
+   |     `result` is borrowed here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0515`.
+error: could not compile `chapter10`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/src/main.rs
new file mode 100644
index 0000000000..aca4be0a78
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/src/main.rs
@@ -0,0 +1,14 @@
+fn main() {
+    let string1 = String::from("abcd");
+    let string2 = "xyz";
+
+    let result = longest(string1.as_str(), string2);
+    println!("The longest string is {}", result);
+}
+
+// ANCHOR: here
+fn longest<'a>(x: &str, y: &str) -> &'a str {
+    let result = String::from("really long string");
+    result.as_str()
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/src/main.rs
new file mode 100644
index 0000000000..32ad530b51
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/src/main.rs
@@ -0,0 +1,28 @@
+struct ImportantExcerpt<'a> {
+    part: &'a str,
+}
+
+// ANCHOR: 1st
+impl<'a> ImportantExcerpt<'a> {
+    fn level(&self) -> i32 {
+        3
+    }
+}
+// ANCHOR_END: 1st
+
+// ANCHOR: 3rd
+impl<'a> ImportantExcerpt<'a> {
+    fn announce_and_return_part(&self, announcement: &str) -> &str {
+        println!("Attention please: {}", announcement);
+        self.part
+    }
+}
+// ANCHOR_END: 3rd
+
+fn main() {
+    let novel = String::from("Call me Ishmael. Some years ago...");
+    let first_sentence = novel.split('.').next().expect("Could not find a '.'");
+    let i = ImportantExcerpt {
+        part: first_sentence,
+    };
+}
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.lock b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.lock
new file mode 100644
index 0000000000..e8007a19be
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "chapter10"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.toml b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.toml
new file mode 100644
index 0000000000..6d5a0ff1d1
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "chapter10"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/src/main.rs b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/src/main.rs
new file mode 100644
index 0000000000..cfafa9a6d3
--- /dev/null
+++ b/src/doc/book/listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/src/main.rs
@@ -0,0 +1,31 @@
+fn main() {
+    let string1 = String::from("abcd");
+    let string2 = "xyz";
+
+    let result = longest_with_an_announcement(
+        string1.as_str(),
+        string2,
+        "Today is someone's birthday!",
+    );
+    println!("The longest string is {}", result);
+}
+
+// ANCHOR: here
+use std::fmt::Display;
+
+fn longest_with_an_announcement<'a, T>(
+    x: &'a str,
+    y: &'a str,
+    ann: T,
+) -> &'a str
+where
+    T: Display,
+{
+    println!("Announcement! {}", ann);
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/output.txt
new file mode 100644
index 0000000000..aa4b0990db
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/output.txt
@@ -0,0 +1,16 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.57s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::it_works ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs
new file mode 100644
index 0000000000..8e678421e9
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs
@@ -0,0 +1,11 @@
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/output.txt
new file mode 100644
index 0000000000..c39456f818
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/output.txt
@@ -0,0 +1,22 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.72s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 2 tests
+test tests::another ... FAILED
+test tests::exploration ... ok
+
+failures:
+
+---- tests::another stdout ----
+thread 'main' panicked at 'Make this test fail', src/lib.rs:10:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::another
+
+test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs
new file mode 100644
index 0000000000..92f315ac85
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs
@@ -0,0 +1,16 @@
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn exploration() {
+        assert_eq!(2 + 2, 4);
+    }
+
+    #[test]
+    fn another() {
+        panic!("Make this test fail");
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.lock
new file mode 100644
index 0000000000..9dcd5439df
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "rectangle"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.toml
new file mode 100644
index 0000000000..32efee50ad
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "rectangle"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/src/lib.rs
new file mode 100644
index 0000000000..aad33554b9
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-05/src/lib.rs
@@ -0,0 +1,15 @@
+// ANCHOR: here
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+impl Rectangle {
+    fn can_hold(&self, other: &Rectangle) -> bool {
+        self.width > other.width && self.height > other.height
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.lock
new file mode 100644
index 0000000000..9dcd5439df
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "rectangle"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.toml
new file mode 100644
index 0000000000..32efee50ad
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "rectangle"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/output.txt
new file mode 100644
index 0000000000..241997c15a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/output.txt
@@ -0,0 +1,16 @@
+$ cargo test
+   Compiling rectangle v0.1.0 (file:///projects/rectangle)
+    Finished test [unoptimized + debuginfo] target(s) in 0.66s
+     Running target/debug/deps/rectangle-6584c4561e48942e
+
+running 1 test
+test tests::larger_can_hold_smaller ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests rectangle
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/src/lib.rs
new file mode 100644
index 0000000000..a02395313d
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-06/src/lib.rs
@@ -0,0 +1,34 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+impl Rectangle {
+    fn can_hold(&self, other: &Rectangle) -> bool {
+        self.width > other.width && self.height > other.height
+    }
+}
+
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn larger_can_hold_smaller() {
+        let larger = Rectangle {
+            width: 8,
+            height: 7,
+        };
+        let smaller = Rectangle {
+            width: 5,
+            height: 1,
+        };
+
+        assert!(larger.can_hold(&smaller));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/output.txt
new file mode 100644
index 0000000000..dc1a5212e7
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/output.txt
@@ -0,0 +1,16 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.58s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::it_adds_two ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/src/lib.rs
new file mode 100644
index 0000000000..534073276d
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-07/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+pub fn add_two(a: i32) -> i32 {
+    a + 2
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_adds_two() {
+        assert_eq!(4, add_two(2));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.toml
new file mode 100644
index 0000000000..922762ab1f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/output.txt
new file mode 100644
index 0000000000..47a50f7e1c
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/output.txt
@@ -0,0 +1,16 @@
+$ cargo test
+   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
+    Finished test [unoptimized + debuginfo] target(s) in 0.58s
+     Running target/debug/deps/guessing_game-57d70c3acb738f4d
+
+running 1 test
+test tests::greater_than_100 ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests guessing_game
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/src/lib.rs
new file mode 100644
index 0000000000..b417302131
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-08/src/lib.rs
@@ -0,0 +1,28 @@
+// ANCHOR: here
+pub struct Guess {
+    value: i32,
+}
+
+impl Guess {
+    pub fn new(value: i32) -> Guess {
+        if value < 1 || value > 100 {
+            panic!("Guess value must be between 1 and 100, got {}.", value);
+        }
+
+        Guess { value }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[should_panic]
+    fn greater_than_100() {
+        Guess::new(200);
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.toml
new file mode 100644
index 0000000000..922762ab1f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/src/lib.rs
new file mode 100644
index 0000000000..ffa543bfb6
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-09/src/lib.rs
@@ -0,0 +1,37 @@
+pub struct Guess {
+    value: i32,
+}
+
+// ANCHOR: here
+// --snip--
+impl Guess {
+    pub fn new(value: i32) -> Guess {
+        if value < 1 {
+            panic!(
+                "Guess value must be greater than or equal to 1, got {}.",
+                value
+            );
+        } else if value > 100 {
+            panic!(
+                "Guess value must be less than or equal to 100, got {}.",
+                value
+            );
+        }
+
+        Guess { value }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[should_panic(expected = "Guess value must be less than or equal to 100")]
+    fn greater_than_100() {
+        Guess::new(200);
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.lock
new file mode 100644
index 0000000000..a6d35e395a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "silly-function"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.toml
new file mode 100644
index 0000000000..4e0f185af4
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "silly-function"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/output.txt
new file mode 100644
index 0000000000..1621d796b0
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/output.txt
@@ -0,0 +1,25 @@
+$ cargo test
+   Compiling silly-function v0.1.0 (file:///projects/silly-function)
+    Finished test [unoptimized + debuginfo] target(s) in 0.58s
+     Running target/debug/deps/silly_function-160869f38cff9166
+
+running 2 tests
+test tests::this_test_will_fail ... FAILED
+test tests::this_test_will_pass ... ok
+
+failures:
+
+---- tests::this_test_will_fail stdout ----
+I got the value 8
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `5`,
+ right: `10`', src/lib.rs:19:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::this_test_will_fail
+
+test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/src/lib.rs
new file mode 100644
index 0000000000..6fd76ce006
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-10/src/lib.rs
@@ -0,0 +1,21 @@
+fn prints_and_returns_10(a: i32) -> i32 {
+    println!("I got the value {}", a);
+    10
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn this_test_will_pass() {
+        let value = prints_and_returns_10(4);
+        assert_eq!(10, value);
+    }
+
+    #[test]
+    fn this_test_will_fail() {
+        let value = prints_and_returns_10(8);
+        assert_eq!(5, value);
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/output.txt
new file mode 100644
index 0000000000..59feae3241
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/output.txt
@@ -0,0 +1,18 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.62s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 3 tests
+test tests::add_three_and_two ... ok
+test tests::add_two_and_two ... ok
+test tests::one_hundred ... ok
+
+test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/src/lib.rs
new file mode 100644
index 0000000000..f56715263e
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-11/src/lib.rs
@@ -0,0 +1,23 @@
+pub fn add_two(a: i32) -> i32 {
+    a + 2
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn add_two_and_two() {
+        assert_eq!(4, add_two(2));
+    }
+
+    #[test]
+    fn add_three_and_two() {
+        assert_eq!(5, add_two(3));
+    }
+
+    #[test]
+    fn one_hundred() {
+        assert_eq!(102, add_two(100));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/src/lib.rs
new file mode 100644
index 0000000000..800b84f53b
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-12/src/lib.rs
@@ -0,0 +1,21 @@
+// ANCHOR: here
+pub fn add_two(a: i32) -> i32 {
+    internal_adder(a, 2)
+}
+
+fn internal_adder(a: i32, b: i32) -> i32 {
+    a + b
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn internal() {
+        assert_eq!(4, internal_adder(2, 2));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/output.txt
new file mode 100644
index 0000000000..e213b9c38d
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/output.txt
@@ -0,0 +1,23 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.73s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::internal ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+     Running target/debug/deps/integration_test-82e7799c1bc62298
+
+running 1 test
+test it_adds_two ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/src/lib.rs
new file mode 100644
index 0000000000..c3961b1f62
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/src/lib.rs
@@ -0,0 +1,17 @@
+pub fn add_two(a: i32) -> i32 {
+    internal_adder(a, 2)
+}
+
+fn internal_adder(a: i32, b: i32) -> i32 {
+    a + b
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn internal() {
+        assert_eq!(4, internal_adder(2, 2));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/tests/integration_test.rs b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/tests/integration_test.rs
new file mode 100644
index 0000000000..e26fa71096
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/listing-11-13/tests/integration_test.rs
@@ -0,0 +1,6 @@
+use adder;
+
+#[test]
+fn it_adds_two() {
+    assert_eq!(4, adder::add_two(2));
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt
new file mode 100644
index 0000000000..0f287fc564
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt
@@ -0,0 +1,16 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.59s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::exploration ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/src/lib.rs
new file mode 100644
index 0000000000..2974d7273d
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/src/lib.rs
@@ -0,0 +1,11 @@
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn exploration() {
+        assert_eq!(2 + 2, 4);
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.lock
new file mode 100644
index 0000000000..9dcd5439df
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "rectangle"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.toml
new file mode 100644
index 0000000000..32efee50ad
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "rectangle"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt
new file mode 100644
index 0000000000..e95f4727e0
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt
@@ -0,0 +1,17 @@
+$ cargo test
+   Compiling rectangle v0.1.0 (file:///projects/rectangle)
+    Finished test [unoptimized + debuginfo] target(s) in 0.66s
+     Running target/debug/deps/rectangle-6584c4561e48942e
+
+running 2 tests
+test tests::larger_can_hold_smaller ... ok
+test tests::smaller_cannot_hold_larger ... ok
+
+test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests rectangle
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/src/lib.rs
new file mode 100644
index 0000000000..338ad09364
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/src/lib.rs
@@ -0,0 +1,51 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+impl Rectangle {
+    fn can_hold(&self, other: &Rectangle) -> bool {
+        self.width > other.width && self.height > other.height
+    }
+}
+
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn larger_can_hold_smaller() {
+        // --snip--
+        // ANCHOR_END: here
+        let larger = Rectangle {
+            width: 8,
+            height: 7,
+        };
+        let smaller = Rectangle {
+            width: 5,
+            height: 1,
+        };
+
+        assert!(larger.can_hold(&smaller));
+        // ANCHOR: here
+    }
+
+    #[test]
+    fn smaller_cannot_hold_larger() {
+        let larger = Rectangle {
+            width: 8,
+            height: 7,
+        };
+        let smaller = Rectangle {
+            width: 5,
+            height: 1,
+        };
+
+        assert!(!smaller.can_hold(&larger));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.lock
new file mode 100644
index 0000000000..9dcd5439df
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "rectangle"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.toml
new file mode 100644
index 0000000000..32efee50ad
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "rectangle"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt
new file mode 100644
index 0000000000..8f050a252d
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt
@@ -0,0 +1,22 @@
+$ cargo test
+   Compiling rectangle v0.1.0 (file:///projects/rectangle)
+    Finished test [unoptimized + debuginfo] target(s) in 0.66s
+     Running target/debug/deps/rectangle-6584c4561e48942e
+
+running 2 tests
+test tests::larger_can_hold_smaller ... FAILED
+test tests::smaller_cannot_hold_larger ... ok
+
+failures:
+
+---- tests::larger_can_hold_smaller stdout ----
+thread 'main' panicked at 'assertion failed: larger.can_hold(&smaller)', src/lib.rs:28:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::larger_can_hold_smaller
+
+test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/src/lib.rs
new file mode 100644
index 0000000000..33a2dd0ac1
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/src/lib.rs
@@ -0,0 +1,49 @@
+#[derive(Debug)]
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+// ANCHOR: here
+// --snip--
+impl Rectangle {
+    fn can_hold(&self, other: &Rectangle) -> bool {
+        self.width < other.width && self.height > other.height
+    }
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn larger_can_hold_smaller() {
+        let larger = Rectangle {
+            width: 8,
+            height: 7,
+        };
+        let smaller = Rectangle {
+            width: 5,
+            height: 1,
+        };
+
+        assert!(larger.can_hold(&smaller));
+    }
+
+    #[test]
+    fn smaller_cannot_hold_larger() {
+        let larger = Rectangle {
+            width: 8,
+            height: 7,
+        };
+        let smaller = Rectangle {
+            width: 5,
+            height: 1,
+        };
+
+        assert!(!smaller.can_hold(&larger));
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt
new file mode 100644
index 0000000000..7fb67743eb
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt
@@ -0,0 +1,23 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.61s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::it_adds_two ... FAILED
+
+failures:
+
+---- tests::it_adds_two stdout ----
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `4`,
+ right: `5`', src/lib.rs:11:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::it_adds_two
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/src/lib.rs
new file mode 100644
index 0000000000..8b4534b4aa
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/src/lib.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+pub fn add_two(a: i32) -> i32 {
+    a + 3
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_adds_two() {
+        assert_eq!(4, add_two(2));
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.lock
new file mode 100644
index 0000000000..9a7ecdd9f2
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "greeter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.toml
new file mode 100644
index 0000000000..c289e837ab
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "greeter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/src/lib.rs
new file mode 100644
index 0000000000..4fcdbbf279
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-05-greeter/src/lib.rs
@@ -0,0 +1,18 @@
+// ANCHOR: here
+pub fn greeting(name: &str) -> String {
+    format!("Hello {}!", name)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn greeting_contains_name() {
+        let result = greeting("Carol");
+        assert!(result.contains("Carol"));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.lock
new file mode 100644
index 0000000000..9a7ecdd9f2
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "greeter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.toml
new file mode 100644
index 0000000000..c289e837ab
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "greeter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt
new file mode 100644
index 0000000000..8f832a7432
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt
@@ -0,0 +1,21 @@
+$ cargo test
+   Compiling greeter v0.1.0 (file:///projects/greeter)
+    Finished test [unoptimized + debuginfo] target(s) in 0.91s
+     Running target/debug/deps/greeter-170b942eb5bf5e3a
+
+running 1 test
+test tests::greeting_contains_name ... FAILED
+
+failures:
+
+---- tests::greeting_contains_name stdout ----
+thread 'main' panicked at 'assertion failed: result.contains("Carol")', src/lib.rs:12:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::greeting_contains_name
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/src/lib.rs
new file mode 100644
index 0000000000..d516534e59
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/src/lib.rs
@@ -0,0 +1,18 @@
+// ANCHOR: here
+pub fn greeting(name: &str) -> String {
+    String::from("Hello!")
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn greeting_contains_name() {
+        let result = greeting("Carol");
+        assert!(result.contains("Carol"));
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.lock
new file mode 100644
index 0000000000..9a7ecdd9f2
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "greeter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.toml
new file mode 100644
index 0000000000..c289e837ab
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "greeter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt
new file mode 100644
index 0000000000..c3a735e4d4
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt
@@ -0,0 +1,21 @@
+$ cargo test
+   Compiling greeter v0.1.0 (file:///projects/greeter)
+    Finished test [unoptimized + debuginfo] target(s) in 0.93s
+     Running target/debug/deps/greeter-170b942eb5bf5e3a
+
+running 1 test
+test tests::greeting_contains_name ... FAILED
+
+failures:
+
+---- tests::greeting_contains_name stdout ----
+thread 'main' panicked at 'Greeting did not contain name, value was `Hello!`', src/lib.rs:12:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::greeting_contains_name
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/src/lib.rs
new file mode 100644
index 0000000000..519c7a4c6f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/src/lib.rs
@@ -0,0 +1,20 @@
+pub fn greeting(name: &str) -> String {
+    String::from("Hello!")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // ANCHOR: here
+    #[test]
+    fn greeting_contains_name() {
+        let result = greeting("Carol");
+        assert!(
+            result.contains("Carol"),
+            "Greeting did not contain name, value was `{}`",
+            result
+        );
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.toml
new file mode 100644
index 0000000000..922762ab1f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt
new file mode 100644
index 0000000000..c9a4fda931
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt
@@ -0,0 +1,19 @@
+$ cargo test
+   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
+    Finished test [unoptimized + debuginfo] target(s) in 0.62s
+     Running target/debug/deps/guessing_game-57d70c3acb738f4d
+
+running 1 test
+test tests::greater_than_100 ... FAILED
+
+failures:
+
+---- tests::greater_than_100 stdout ----
+note: test did not panic as expected
+
+failures:
+    tests::greater_than_100
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/src/lib.rs
new file mode 100644
index 0000000000..269c73cefa
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/src/lib.rs
@@ -0,0 +1,29 @@
+pub struct Guess {
+    value: i32,
+}
+
+// ANCHOR: here
+// --snip--
+impl Guess {
+    pub fn new(value: i32) -> Guess {
+        if value < 1 {
+            panic!("Guess value must be between 1 and 100, got {}.", value);
+        }
+
+        Guess { value }
+    }
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[should_panic]
+    fn greater_than_100() {
+        Guess::new(200);
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.lock
new file mode 100644
index 0000000000..5802b7dc9a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "guessing_game"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.toml
new file mode 100644
index 0000000000..922762ab1f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "guessing_game"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt
new file mode 100644
index 0000000000..f2b8ffc7c3
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt
@@ -0,0 +1,23 @@
+$ cargo test
+   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
+    Finished test [unoptimized + debuginfo] target(s) in 0.66s
+     Running target/debug/deps/guessing_game-57d70c3acb738f4d
+
+running 1 test
+test tests::greater_than_100 ... FAILED
+
+failures:
+
+---- tests::greater_than_100 stdout ----
+thread 'main' panicked at 'Guess value must be greater than or equal to 1, got 200.', src/lib.rs:13:13
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+note: panic did not contain expected string
+      panic message: `"Guess value must be greater than or equal to 1, got 200."`,
+ expected substring: `"Guess value must be less than or equal to 100"`
+
+failures:
+    tests::greater_than_100
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/src/lib.rs
new file mode 100644
index 0000000000..21650040da
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/src/lib.rs
@@ -0,0 +1,34 @@
+pub struct Guess {
+    value: i32,
+}
+
+impl Guess {
+    pub fn new(value: i32) -> Guess {
+        // ANCHOR: here
+        if value < 1 {
+            panic!(
+                "Guess value must be less than or equal to 100, got {}.",
+                value
+            );
+        } else if value > 100 {
+            panic!(
+                "Guess value must be greater than or equal to 1, got {}.",
+                value
+            );
+        }
+        // ANCHOR_END: here
+
+        Guess { value }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[should_panic(expected = "Guess value must be less than or equal to 100")]
+    fn greater_than_100() {
+        Guess::new(200);
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs
new file mode 100644
index 0000000000..6284f4f291
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs
@@ -0,0 +1,11 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() -> Result<(), String> {
+        if 2 + 2 == 4 {
+            Ok(())
+        } else {
+            Err(String::from("two plus two does not equal four"))
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt
new file mode 100644
index 0000000000..8cf7475c5e
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt
@@ -0,0 +1,17 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.60s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 2 tests
+test expensive_test ... ignored
+test it_works ... ok
+
+test result: ok. 1 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/src/lib.rs
new file mode 100644
index 0000000000..9a75301e31
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/src/lib.rs
@@ -0,0 +1,14 @@
+// ANCHOR: here
+#[test]
+fn it_works() {
+    assert_eq!(2 + 2, 4);
+}
+
+#[test]
+#[ignore]
+fn expensive_test() {
+    // code that takes an hour to run
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt
new file mode 100644
index 0000000000..0637a1068f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt
@@ -0,0 +1,29 @@
+$ cargo test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.89s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::internal ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+     Running target/debug/deps/common-7064e1b6d2e271be
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+     Running target/debug/deps/integration_test-82e7799c1bc62298
+
+running 1 test
+test it_adds_two ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/src/lib.rs
new file mode 100644
index 0000000000..c3961b1f62
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/src/lib.rs
@@ -0,0 +1,17 @@
+pub fn add_two(a: i32) -> i32 {
+    internal_adder(a, 2)
+}
+
+fn internal_adder(a: i32, b: i32) -> i32 {
+    a + b
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn internal() {
+        assert_eq!(4, internal_adder(2, 2));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/common.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/common.rs
new file mode 100644
index 0000000000..5fb7a390a6
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/common.rs
@@ -0,0 +1,3 @@
+pub fn setup() {
+    // setup code specific to your library's tests would go here
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/integration_test.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/integration_test.rs
new file mode 100644
index 0000000000..e26fa71096
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/integration_test.rs
@@ -0,0 +1,6 @@
+use adder;
+
+#[test]
+fn it_adds_two() {
+    assert_eq!(4, adder::add_two(2));
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/src/lib.rs
new file mode 100644
index 0000000000..c3961b1f62
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/src/lib.rs
@@ -0,0 +1,17 @@
+pub fn add_two(a: i32) -> i32 {
+    internal_adder(a, 2)
+}
+
+fn internal_adder(a: i32, b: i32) -> i32 {
+    a + b
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn internal() {
+        assert_eq!(4, internal_adder(2, 2));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/common/mod.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/common/mod.rs
new file mode 100644
index 0000000000..5fb7a390a6
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/common/mod.rs
@@ -0,0 +1,3 @@
+pub fn setup() {
+    // setup code specific to your library's tests would go here
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/integration_test.rs b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/integration_test.rs
new file mode 100644
index 0000000000..58b8b7b89b
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/integration_test.rs
@@ -0,0 +1,9 @@
+use adder;
+
+mod common;
+
+#[test]
+fn it_adds_two() {
+    common::setup();
+    assert_eq!(4, adder::add_two(2));
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.lock
new file mode 100644
index 0000000000..a6d35e395a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "silly-function"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.toml
new file mode 100644
index 0000000000..4e0f185af4
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "silly-function"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt
new file mode 100644
index 0000000000..901df6ae63
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt
@@ -0,0 +1,34 @@
+$ cargo test -- --show-output
+   Compiling silly-function v0.1.0 (file:///projects/silly-function)
+    Finished test [unoptimized + debuginfo] target(s) in 0.60s
+     Running target/debug/deps/silly_function-160869f38cff9166
+
+running 2 tests
+test tests::this_test_will_fail ... FAILED
+test tests::this_test_will_pass ... ok
+
+successes:
+
+---- tests::this_test_will_pass stdout ----
+I got the value 4
+
+
+successes:
+    tests::this_test_will_pass
+
+failures:
+
+---- tests::this_test_will_fail stdout ----
+I got the value 8
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `5`,
+ right: `10`', src/lib.rs:19:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::this_test_will_fail
+
+test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/src/lib.rs
new file mode 100644
index 0000000000..43c4c92f9a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-01-show-output/src/lib.rs
@@ -0,0 +1,21 @@
+pub fn prints_and_returns_10(a: i32) -> i32 {
+    println!("I got the value {}", a);
+    10
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn this_test_will_pass() {
+        let value = prints_and_returns_10(4);
+        assert_eq!(10, value);
+    }
+
+    #[test]
+    fn this_test_will_fail() {
+        let value = prints_and_returns_10(8);
+        assert_eq!(5, value);
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt
new file mode 100644
index 0000000000..9284de3d4f
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt
@@ -0,0 +1,10 @@
+$ cargo test one_hundred
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.69s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test tests::one_hundred ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 2 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/src/lib.rs
new file mode 100644
index 0000000000..f56715263e
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-02-single-test/src/lib.rs
@@ -0,0 +1,23 @@
+pub fn add_two(a: i32) -> i32 {
+    a + 2
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn add_two_and_two() {
+        assert_eq!(4, add_two(2));
+    }
+
+    #[test]
+    fn add_three_and_two() {
+        assert_eq!(5, add_two(3));
+    }
+
+    #[test]
+    fn one_hundred() {
+        assert_eq!(102, add_two(100));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt
new file mode 100644
index 0000000000..76c2c170df
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt
@@ -0,0 +1,11 @@
+$ cargo test add
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.61s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 2 tests
+test tests::add_three_and_two ... ok
+test tests::add_two_and_two ... ok
+
+test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/src/lib.rs
new file mode 100644
index 0000000000..f56715263e
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-03-multiple-tests/src/lib.rs
@@ -0,0 +1,23 @@
+pub fn add_two(a: i32) -> i32 {
+    a + 2
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn add_two_and_two() {
+        assert_eq!(4, add_two(2));
+    }
+
+    #[test]
+    fn add_three_and_two() {
+        assert_eq!(5, add_two(3));
+    }
+
+    #[test]
+    fn one_hundred() {
+        assert_eq!(102, add_two(100));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt
new file mode 100644
index 0000000000..6bddfdb820
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt
@@ -0,0 +1,16 @@
+$ cargo test -- --ignored
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.61s
+     Running target/debug/deps/adder-92948b65e88960b4
+
+running 1 test
+test expensive_test ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
+
+   Doc-tests adder
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/src/lib.rs
new file mode 100644
index 0000000000..9a75301e31
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-04-running-ignored/src/lib.rs
@@ -0,0 +1,14 @@
+// ANCHOR: here
+#[test]
+fn it_works() {
+    assert_eq!(2 + 2, 4);
+}
+
+#[test]
+#[ignore]
+fn expensive_test() {
+    // code that takes an hour to run
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.lock b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.toml b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt
new file mode 100644
index 0000000000..dd915c35c1
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt
@@ -0,0 +1,10 @@
+$ cargo test --test integration_test
+   Compiling adder v0.1.0 (file:///projects/adder)
+    Finished test [unoptimized + debuginfo] target(s) in 0.64s
+     Running target/debug/deps/integration_test-82e7799c1bc62298
+
+running 1 test
+test it_adds_two ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/src/lib.rs b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/src/lib.rs
new file mode 100644
index 0000000000..c3961b1f62
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/src/lib.rs
@@ -0,0 +1,17 @@
+pub fn add_two(a: i32) -> i32 {
+    internal_adder(a, 2)
+}
+
+fn internal_adder(a: i32, b: i32) -> i32 {
+    a + b
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn internal() {
+        assert_eq!(4, internal_adder(2, 2));
+    }
+}
diff --git a/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/tests/integration_test.rs b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/tests/integration_test.rs
new file mode 100644
index 0000000000..e26fa71096
--- /dev/null
+++ b/src/doc/book/listings/ch11-writing-automated-tests/output-only-05-single-integration/tests/integration_test.rs
@@ -0,0 +1,6 @@
+use adder;
+
+#[test]
+fn it_adds_two() {
+    assert_eq!(4, adder::add_two(2));
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-01/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-01/output.txt
new file mode 100644
index 0000000000..d0ef998122
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-01/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.61s
+     Running `target/debug/minigrep`
+["target/debug/minigrep"]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-01/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-01/src/main.rs
new file mode 100644
index 0000000000..aa3056de60
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-01/src/main.rs
@@ -0,0 +1,6 @@
+use std::env;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    println!("{:?}", args);
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-02/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-02/output.txt
new file mode 100644
index 0000000000..f759eea008
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-02/output.txt
@@ -0,0 +1,6 @@
+$ cargo run test sample.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep test sample.txt`
+Searching for test
+In file sample.txt
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-02/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-02/src/main.rs
new file mode 100644
index 0000000000..8daf125c67
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-02/src/main.rs
@@ -0,0 +1,11 @@
+use std::env;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let query = &args[1];
+    let filename = &args[2];
+
+    println!("Searching for {}", query);
+    println!("In file {}", filename);
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-03/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-03/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-03/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-03/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-03/src/main.rs
new file mode 100644
index 0000000000..8daf125c67
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-03/src/main.rs
@@ -0,0 +1,11 @@
+use std::env;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let query = &args[1];
+    let filename = &args[2];
+
+    println!("Searching for {}", query);
+    println!("In file {}", filename);
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-04/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-04/output.txt
new file mode 100644
index 0000000000..75e7863ef5
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-04/output.txt
@@ -0,0 +1,17 @@
+$ cargo run the poem.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep the poem.txt`
+Searching for the
+In file poem.txt
+With text:
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-04/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-04/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-04/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-04/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-04/src/main.rs
new file mode 100644
index 0000000000..9a0eade562
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-04/src/main.rs
@@ -0,0 +1,22 @@
+// ANCHOR: here
+use std::env;
+use std::fs;
+
+fn main() {
+    // --snip--
+    // ANCHOR_END: here
+    let args: Vec<String> = env::args().collect();
+
+    let query = &args[1];
+    let filename = &args[2];
+
+    println!("Searching for {}", query);
+    // ANCHOR: here
+    println!("In file {}", filename);
+
+    let contents = fs::read_to_string(filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-05/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-05/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-05/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-05/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-05/src/main.rs
new file mode 100644
index 0000000000..fb8805687e
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-05/src/main.rs
@@ -0,0 +1,29 @@
+use std::env;
+use std::fs;
+
+// ANCHOR: here
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let (query, filename) = parse_config(&args);
+
+    // --snip--
+    // ANCHOR_END: here
+
+    println!("Searching for {}", query);
+    println!("In file {}", filename);
+
+    let contents = fs::read_to_string(filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+    // ANCHOR: here
+}
+
+fn parse_config(args: &[String]) -> (&str, &str) {
+    let query = &args[1];
+    let filename = &args[2];
+
+    (query, filename)
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-06/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-06/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-06/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-06/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-06/src/main.rs
new file mode 100644
index 0000000000..b5d89bc98f
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-06/src/main.rs
@@ -0,0 +1,34 @@
+use std::env;
+use std::fs;
+
+// ANCHOR: here
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = parse_config(&args);
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    let contents = fs::read_to_string(config.filename)
+        .expect("Something went wrong reading the file");
+
+    // --snip--
+    // ANCHOR_END: here
+
+    println!("With text:\n{}", contents);
+    // ANCHOR: here
+}
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+fn parse_config(args: &[String]) -> Config {
+    let query = args[1].clone();
+    let filename = args[2].clone();
+
+    Config { query, filename }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-07/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-07/output.txt
new file mode 100644
index 0000000000..8c8d53aa8b
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-07/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep`
+thread 'main' panicked at 'index out of bounds: the len is 1 but the index is 1', src/main.rs:27:21
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-07/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-07/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-07/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-07/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-07/src/main.rs
new file mode 100644
index 0000000000..36d35ceafb
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-07/src/main.rs
@@ -0,0 +1,40 @@
+use std::env;
+use std::fs;
+
+// ANCHOR: here
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args);
+    // ANCHOR_END: here
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    let contents = fs::read_to_string(config.filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+    // ANCHOR: here
+
+    // --snip--
+}
+
+// --snip--
+
+// ANCHOR_END: here
+struct Config {
+    query: String,
+    filename: String,
+}
+
+// ANCHOR: here
+impl Config {
+    fn new(args: &[String]) -> Config {
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Config { query, filename }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-08/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-08/output.txt
new file mode 100644
index 0000000000..fa5d235eb5
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-08/output.txt
@@ -0,0 +1,6 @@
+$ cargo run
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep`
+thread 'main' panicked at 'not enough arguments', src/main.rs:26:13
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-08/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-08/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-08/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-08/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-08/src/main.rs
new file mode 100644
index 0000000000..dddf10bd44
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-08/src/main.rs
@@ -0,0 +1,38 @@
+use std::env;
+use std::fs;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args);
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    let contents = fs::read_to_string(config.filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+}
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+impl Config {
+    // ANCHOR: here
+    // --snip--
+    fn new(args: &[String]) -> Config {
+        if args.len() < 3 {
+            panic!("not enough arguments");
+        }
+        // --snip--
+        // ANCHOR_END: here
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Config { query, filename }
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-09/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-09/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-09/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-09/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-09/src/main.rs
new file mode 100644
index 0000000000..83f46ee37f
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-09/src/main.rs
@@ -0,0 +1,36 @@
+use std::env;
+use std::fs;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args);
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    let contents = fs::read_to_string(config.filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+}
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+// ANCHOR: here
+impl Config {
+    fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-10/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-10/output.txt
new file mode 100644
index 0000000000..7aad57f52d
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-10/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.48s
+     Running `target/debug/minigrep`
+Problem parsing arguments: not enough arguments
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-10/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-10/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-10/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-10/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-10/src/main.rs
new file mode 100644
index 0000000000..c8aeb1d37e
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-10/src/main.rs
@@ -0,0 +1,42 @@
+use std::env;
+use std::fs;
+// ANCHOR: here
+use std::process;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    // --snip--
+    // ANCHOR_END: here
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    let contents = fs::read_to_string(config.filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+}
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+impl Config {
+    fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-11/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-11/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-11/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-11/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-11/src/main.rs
new file mode 100644
index 0000000000..974b503b72
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-11/src/main.rs
@@ -0,0 +1,50 @@
+use std::env;
+use std::fs;
+use std::process;
+
+// ANCHOR: here
+fn main() {
+    // --snip--
+
+    // ANCHOR_END: here
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    // ANCHOR: here
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    run(config);
+}
+
+fn run(config: Config) {
+    let contents = fs::read_to_string(config.filename)
+        .expect("Something went wrong reading the file");
+
+    println!("With text:\n{}", contents);
+}
+
+// --snip--
+// ANCHOR_END: here
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+impl Config {
+    fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-12/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-12/output.txt
new file mode 100644
index 0000000000..565479d0c8
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-12/output.txt
@@ -0,0 +1,26 @@
+$ cargo run the poem.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+warning: unused `std::result::Result` that must be used
+  --> src/main.rs:19:5
+   |
+19 |     run(config);
+   |     ^^^^^^^^^^^^
+   |
+   = note: `#[warn(unused_must_use)]` on by default
+   = note: this `Result` may be an `Err` variant, which should be handled
+
+    Finished dev [unoptimized + debuginfo] target(s) in 0.71s
+     Running `target/debug/minigrep the poem.txt`
+Searching for the
+In file poem.txt
+With text:
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-12/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-12/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-12/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-12/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-12/src/main.rs
new file mode 100644
index 0000000000..f2e0e6b9f3
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-12/src/main.rs
@@ -0,0 +1,51 @@
+use std::env;
+use std::fs;
+use std::process;
+// ANCHOR: here
+use std::error::Error;
+
+// --snip--
+
+// ANCHOR_END: here
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    run(config);
+}
+
+// ANCHOR: here
+fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    println!("With text:\n{}", contents);
+
+    Ok(())
+}
+// ANCHOR_END: here
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+impl Config {
+    fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-13/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-13/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-13/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-13/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-13/src/lib.rs
new file mode 100644
index 0000000000..5b2850a5df
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-13/src/lib.rs
@@ -0,0 +1,36 @@
+// ANCHOR: here
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        // --snip--
+        // ANCHOR_END: here
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+        // ANCHOR: here
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    // --snip--
+    // ANCHOR_END: here
+    let contents = fs::read_to_string(config.filename)?;
+
+    println!("With text:\n{}", contents);
+
+    Ok(())
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-13/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-13/src/main.rs
new file mode 100644
index 0000000000..b2447dce97
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-13/src/main.rs
@@ -0,0 +1,20 @@
+use std::env;
+use std::process;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    if let Err(e) = run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-14/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-14/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-14/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-14/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-14/src/lib.rs
new file mode 100644
index 0000000000..2ba2fd1961
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-14/src/lib.rs
@@ -0,0 +1,28 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    println!("With text:\n{}", contents);
+
+    Ok(())
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-14/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-14/src/main.rs
new file mode 100644
index 0000000000..5eb4024f5c
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-14/src/main.rs
@@ -0,0 +1,30 @@
+// ANCHOR: here
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    // --snip--
+    // ANCHOR_END: here
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    // ANCHOR: here
+    if let Err(e) = minigrep::run(config) {
+        // --snip--
+        // ANCHOR_END: here
+        println!("Application error: {}", e);
+
+        process::exit(1);
+        // ANCHOR: here
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-15/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-15/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-15/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-15/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-15/src/lib.rs
new file mode 100644
index 0000000000..22ec381783
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-15/src/lib.rs
@@ -0,0 +1,46 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    Ok(())
+}
+
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-15/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-15/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-15/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-16/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-16/output.txt
new file mode 100644
index 0000000000..a7a676ec3d
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-16/output.txt
@@ -0,0 +1,23 @@
+$ cargo test
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished test [unoptimized + debuginfo] target(s) in 0.97s
+     Running target/debug/deps/minigrep-4672b652f7794785
+
+running 1 test
+test tests::one_result ... FAILED
+
+failures:
+
+---- tests::one_result stdout ----
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `["safe, fast, productive."]`,
+ right: `[]`', src/lib.rs:44:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::one_result
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-16/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-16/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-16/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-16/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-16/src/lib.rs
new file mode 100644
index 0000000000..2fc5b4f722
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-16/src/lib.rs
@@ -0,0 +1,50 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    Ok(())
+}
+
+// ANCHOR: here
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    vec![]
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-16/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-16/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-16/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-17/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-17/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-17/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-17/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-17/src/lib.rs
new file mode 100644
index 0000000000..0b094ce28a
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-17/src/lib.rs
@@ -0,0 +1,50 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    Ok(())
+}
+
+// ANCHOR: here
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    for line in contents.lines() {
+        // do something with line
+    }
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-17/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-17/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-17/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-18/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-18/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-18/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-18/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-18/src/lib.rs
new file mode 100644
index 0000000000..c9d1f529da
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-18/src/lib.rs
@@ -0,0 +1,52 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    Ok(())
+}
+
+// ANCHOR: here
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    for line in contents.lines() {
+        if line.contains(query) {
+            // do something with line
+        }
+    }
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-18/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-18/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-18/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-19/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-19/output.txt
new file mode 100644
index 0000000000..fa1490152a
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-19/output.txt
@@ -0,0 +1,22 @@
+$ cargo test
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished test [unoptimized + debuginfo] target(s) in 1.22s
+     Running target/debug/deps/minigrep-4672b652f7794785
+
+running 1 test
+test tests::one_result ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+     Running target/debug/deps/minigrep-caf9dbee196c78b9
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests minigrep
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-19/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-19/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-19/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-19/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-19/src/lib.rs
new file mode 100644
index 0000000000..de8897b8d1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-19/src/lib.rs
@@ -0,0 +1,58 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    Ok(())
+}
+
+// ANCHOR: here
+// ANCHOR: ch13
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+// ANCHOR_END: ch13
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-19/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-19/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-19/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-20/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-20/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-20/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-20/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-20/src/lib.rs
new file mode 100644
index 0000000000..52ba2bd51c
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-20/src/lib.rs
@@ -0,0 +1,78 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    for line in search(&config.query, &contents) {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-20/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-20/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-20/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-21/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-21/output.txt
new file mode 100644
index 0000000000..3d7cf26d1f
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-21/output.txt
@@ -0,0 +1,23 @@
+$ cargo test
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished test [unoptimized + debuginfo] target(s) in 1.33s
+     Running target/debug/deps/minigrep-4672b652f7794785
+
+running 2 tests
+test tests::case_insensitive ... ok
+test tests::case_sensitive ... ok
+
+test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+     Running target/debug/deps/minigrep-caf9dbee196c78b9
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
+   Doc-tests minigrep
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-21/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-21/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-21/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-21/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-21/src/lib.rs
new file mode 100644
index 0000000000..873c8b53d0
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-21/src/lib.rs
@@ -0,0 +1,94 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    for line in search(&config.query, &contents) {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+// ANCHOR: here
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-21/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-21/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-21/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-22/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-22/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-22/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-22/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-22/src/lib.rs
new file mode 100644
index 0000000000..2df82b7e2f
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-22/src/lib.rs
@@ -0,0 +1,103 @@
+use std::error::Error;
+use std::fs;
+
+// ANCHOR: here
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+// ANCHOR_END: here
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+// ANCHOR: there
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+// ANCHOR_END: there
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-22/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-22/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-22/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-23/output.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-23/output.txt
new file mode 100644
index 0000000000..0f0f07f751
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-23/output.txt
@@ -0,0 +1,6 @@
+$ cargo run to poem.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep to poem.txt`
+Are you nobody, too?
+How dreary to be somebody!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-23/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-23/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-23/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-23/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-23/src/lib.rs
new file mode 100644
index 0000000000..e6dc51a0ed
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-23/src/lib.rs
@@ -0,0 +1,112 @@
+// ANCHOR: here
+use std::env;
+// --snip--
+
+// ANCHOR_END: here
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+// ANCHOR: here
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+// ANCHOR_END: here
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-23/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-23/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-23/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-24/poem.txt b/src/doc/book/listings/ch12-an-io-project/listing-12-24/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-24/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs
new file mode 100644
index 0000000000..fe1dccf4ee
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/lib.rs
@@ -0,0 +1,104 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/main.rs b/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/main.rs
new file mode 100644
index 0000000000..9e38553c56
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/listing-12-24/src/main.rs
@@ -0,0 +1,21 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+// ANCHOR: here
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        eprintln!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        eprintln!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/poem.txt b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/src/main.rs b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/src/main.rs
new file mode 100644
index 0000000000..44bcfeab30
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/src/main.rs
@@ -0,0 +1,54 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+use std::process;
+
+// ANCHOR: here
+fn main() {
+    // --snip--
+
+    // ANCHOR_END: here
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    // ANCHOR: here
+    println!("Searching for {}", config.query);
+    println!("In file {}", config.filename);
+
+    if let Err(e) = run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
+// ANCHOR_END: here
+
+fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    println!("With text:\n{}", contents);
+
+    Ok(())
+}
+
+struct Config {
+    query: String,
+    filename: String,
+}
+
+impl Config {
+    fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/output.txt b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/output.txt
new file mode 100644
index 0000000000..91532d0cd5
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/output.txt
@@ -0,0 +1,5 @@
+$ cargo run frog poem.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.38s
+     Running `target/debug/minigrep frog poem.txt`
+How public, like a frog
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/poem.txt b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs
new file mode 100644
index 0000000000..ede4eb49a0
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs
@@ -0,0 +1,60 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+// ANCHOR: here
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    for line in search(&config.query, &contents) {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+// ANCHOR_END: here
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/main.rs b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/output.txt b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/output.txt
new file mode 100644
index 0000000000..eb88d9a9b1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/output.txt
@@ -0,0 +1,5 @@
+$ cargo run needle haystack
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 1.57s
+     Running `target/debug/minigrep needle haystack`
+["target/debug/minigrep", "needle", "haystack"]
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/src/main.rs b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/src/main.rs
new file mode 100644
index 0000000000..aa3056de60
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-01-with-args/src/main.rs
@@ -0,0 +1,6 @@
+use std::env;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+    println!("{:?}", args);
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/output.txt b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/output.txt
new file mode 100644
index 0000000000..b76084b0f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/output.txt
@@ -0,0 +1,16 @@
+$ cargo build
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+error[E0106]: missing lifetime specifier
+  --> src/lib.rs:28:51
+   |
+28 | pub fn search(query: &str, contents: &str) -> Vec<&str> {
+   |                                                   ^ expected lifetime parameter
+   |
+   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `query` or `contents`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0106`.
+error: could not compile `minigrep`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/poem.txt b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/lib.rs
new file mode 100644
index 0000000000..c60405c219
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/lib.rs
@@ -0,0 +1,50 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    Ok(())
+}
+
+// ANCHOR: here
+pub fn search(query: &str, contents: &str) -> Vec<&str> {
+    vec![]
+}
+// ANCHOR_END: here
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/main.rs b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-02-missing-lifetimes/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/output.txt b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/output.txt
new file mode 100644
index 0000000000..c0ab7efd97
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/output.txt
@@ -0,0 +1,7 @@
+$ cargo run body poem.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep body poem.txt`
+I’m nobody! Who are you?
+Are you nobody, too?
+How dreary to be somebody!
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/poem.txt b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/lib.rs
new file mode 100644
index 0000000000..ede4eb49a0
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/lib.rs
@@ -0,0 +1,60 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+// ANCHOR: here
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    for line in search(&config.query, &contents) {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+// ANCHOR_END: here
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/main.rs b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-03-multiple-matches/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.lock b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.toml b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/output.txt b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/output.txt
new file mode 100644
index 0000000000..4cd6c8a0ae
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/output.txt
@@ -0,0 +1,4 @@
+$ cargo run monomorphization poem.txt
+   Compiling minigrep v0.1.0 (file:///projects/minigrep)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
+     Running `target/debug/minigrep monomorphization poem.txt`
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/poem.txt b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/poem.txt
new file mode 100644
index 0000000000..208e35a5ec
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/poem.txt
@@ -0,0 +1,9 @@
+I’m nobody! Who are you?
+Are you nobody, too?
+Then there’s a pair of us - don’t tell!
+They’d banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/lib.rs b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/lib.rs
new file mode 100644
index 0000000000..ede4eb49a0
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/lib.rs
@@ -0,0 +1,60 @@
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        Ok(Config { query, filename })
+    }
+}
+
+// ANCHOR: here
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    for line in search(&config.query, &contents) {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+// ANCHOR_END: here
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn one_result() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+}
diff --git a/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/main.rs b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch12-an-io-project/output-only-04-no-matches/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/poem.txt b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/poem.txt
new file mode 100644
index 0000000000..8707527313
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/poem.txt
@@ -0,0 +1,9 @@
+I'm nobody! Who are you?
+Are you nobody, too?
+Then there's a pair of us - don't tell!
+They'd banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/lib.rs
new file mode 100644
index 0000000000..5397d7f617
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/lib.rs
@@ -0,0 +1,108 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+// ANCHOR: ch13
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+// ANCHOR_END: ch13
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/main.rs
new file mode 100644
index 0000000000..53af83fdbc
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-23-reproduced/src/main.rs
@@ -0,0 +1,19 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        println!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        println!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/poem.txt b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/poem.txt
new file mode 100644
index 0000000000..8707527313
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/poem.txt
@@ -0,0 +1,9 @@
+I'm nobody! Who are you?
+Are you nobody, too?
+Then there's a pair of us - don't tell!
+They'd banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/lib.rs
new file mode 100644
index 0000000000..fe1dccf4ee
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/lib.rs
@@ -0,0 +1,104 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs
new file mode 100644
index 0000000000..ec27e67f99
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs
@@ -0,0 +1,25 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+// ANCHOR: ch13
+fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    let config = Config::new(&args).unwrap_or_else(|err| {
+        eprintln!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    // --snip--
+    // ANCHOR_END: ch13
+
+    if let Err(e) = minigrep::run(config) {
+        eprintln!("Application error: {}", e);
+
+        process::exit(1);
+    }
+    // ANCHOR: ch13
+}
+// ANCHOR_END: ch13
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-01/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-01/src/main.rs
new file mode 100644
index 0000000000..97eace01d7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-01/src/main.rs
@@ -0,0 +1,12 @@
+// ANCHOR: here
+use std::thread;
+use std::time::Duration;
+
+fn simulated_expensive_calculation(intensity: u32) -> u32 {
+    println!("calculating slowly...");
+    thread::sleep(Duration::from_secs(2));
+    intensity
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-02/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-02/src/main.rs
new file mode 100644
index 0000000000..96d06c77d4
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-02/src/main.rs
@@ -0,0 +1,19 @@
+use std::thread;
+use std::time::Duration;
+
+fn simulated_expensive_calculation(intensity: u32) -> u32 {
+    println!("calculating slowly...");
+    thread::sleep(Duration::from_secs(2));
+    intensity
+}
+
+fn generate_workout(intensity: u32, random_number: u32) {}
+
+// ANCHOR: here
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-03/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-03/src/main.rs
new file mode 100644
index 0000000000..d43c9b2116
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-03/src/main.rs
@@ -0,0 +1,39 @@
+use std::thread;
+use std::time::Duration;
+
+fn simulated_expensive_calculation(intensity: u32) -> u32 {
+    println!("calculating slowly...");
+    thread::sleep(Duration::from_secs(2));
+    intensity
+}
+
+// ANCHOR: here
+fn generate_workout(intensity: u32, random_number: u32) {
+    if intensity < 25 {
+        println!(
+            "Today, do {} pushups!",
+            simulated_expensive_calculation(intensity)
+        );
+        println!(
+            "Next, do {} situps!",
+            simulated_expensive_calculation(intensity)
+        );
+    } else {
+        if random_number == 3 {
+            println!("Take a break today! Remember to stay hydrated!");
+        } else {
+            println!(
+                "Today, run for {} minutes!",
+                simulated_expensive_calculation(intensity)
+            );
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-04/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-04/src/main.rs
new file mode 100644
index 0000000000..fabe0fb01d
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-04/src/main.rs
@@ -0,0 +1,32 @@
+use std::thread;
+use std::time::Duration;
+
+fn simulated_expensive_calculation(intensity: u32) -> u32 {
+    println!("calculating slowly...");
+    thread::sleep(Duration::from_secs(2));
+    intensity
+}
+
+// ANCHOR: here
+fn generate_workout(intensity: u32, random_number: u32) {
+    let expensive_result = simulated_expensive_calculation(intensity);
+
+    if intensity < 25 {
+        println!("Today, do {} pushups!", expensive_result);
+        println!("Next, do {} situps!", expensive_result);
+    } else {
+        if random_number == 3 {
+            println!("Take a break today! Remember to stay hydrated!");
+        } else {
+            println!("Today, run for {} minutes!", expensive_result);
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-05/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-05/src/main.rs
new file mode 100644
index 0000000000..6984a27a0e
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-05/src/main.rs
@@ -0,0 +1,33 @@
+use std::thread;
+use std::time::Duration;
+
+fn generate_workout(intensity: u32, random_number: u32) {
+    // ANCHOR: here
+    let expensive_closure = |num| {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+    // ANCHOR_END: here
+
+    if intensity < 25 {
+        println!("Today, do {} pushups!", expensive_closure(intensity));
+        println!("Next, do {} situps!", expensive_closure(intensity));
+    } else {
+        if random_number == 3 {
+            println!("Take a break today! Remember to stay hydrated!");
+        } else {
+            println!(
+                "Today, run for {} minutes!",
+                expensive_closure(intensity)
+            );
+        }
+    }
+}
+
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-06/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-06/src/main.rs
new file mode 100644
index 0000000000..8850e58a76
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-06/src/main.rs
@@ -0,0 +1,33 @@
+use std::thread;
+use std::time::Duration;
+
+// ANCHOR: here
+fn generate_workout(intensity: u32, random_number: u32) {
+    let expensive_closure = |num| {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+
+    if intensity < 25 {
+        println!("Today, do {} pushups!", expensive_closure(intensity));
+        println!("Next, do {} situps!", expensive_closure(intensity));
+    } else {
+        if random_number == 3 {
+            println!("Take a break today! Remember to stay hydrated!");
+        } else {
+            println!(
+                "Today, run for {} minutes!",
+                expensive_closure(intensity)
+            );
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-07/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-07/src/main.rs
new file mode 100644
index 0000000000..b3f4cc2c2a
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-07/src/main.rs
@@ -0,0 +1,33 @@
+use std::thread;
+use std::time::Duration;
+
+fn generate_workout(intensity: u32, random_number: u32) {
+    // ANCHOR: here
+    let expensive_closure = |num: u32| -> u32 {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    };
+    // ANCHOR_END: here
+
+    if intensity < 25 {
+        println!("Today, do {} pushups!", expensive_closure(intensity));
+        println!("Next, do {} situps!", expensive_closure(intensity));
+    } else {
+        if random_number == 3 {
+            println!("Take a break today! Remember to stay hydrated!");
+        } else {
+            println!(
+                "Today, run for {} minutes!",
+                expensive_closure(intensity)
+            );
+        }
+    }
+}
+
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.lock
new file mode 100644
index 0000000000..c190d3a411
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "closure-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.toml
new file mode 100644
index 0000000000..54b904e411
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "closure-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-08/output.txt b/src/doc/book/listings/ch13-functional-features/listing-13-08/output.txt
new file mode 100644
index 0000000000..d859957f21
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-08/output.txt
@@ -0,0 +1,17 @@
+$ cargo run
+   Compiling closure-example v0.1.0 (file:///projects/closure-example)
+error[E0308]: mismatched types
+ --> src/main.rs:5:29
+  |
+5 |     let n = example_closure(5);
+  |                             ^
+  |                             |
+  |                             expected struct `std::string::String`, found integer
+  |                             help: try using a conversion method: `5.to_string()`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `closure-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-08/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-08/src/main.rs
new file mode 100644
index 0000000000..ebb2489bf7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-08/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let example_closure = |x| x;
+
+    let s = example_closure(String::from("hello"));
+    let n = example_closure(5);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.lock
new file mode 100644
index 0000000000..e090432bc9
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cacher"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.toml
new file mode 100644
index 0000000000..54ab6f2173
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cacher"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-09/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-09/src/main.rs
new file mode 100644
index 0000000000..3fd4ed067f
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-09/src/main.rs
@@ -0,0 +1,11 @@
+// ANCHOR: here
+struct Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    calculation: T,
+    value: Option<u32>,
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.lock
new file mode 100644
index 0000000000..e090432bc9
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cacher"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.toml
new file mode 100644
index 0000000000..54ab6f2173
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cacher"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-10/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-10/src/main.rs
new file mode 100644
index 0000000000..4d1034db94
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-10/src/main.rs
@@ -0,0 +1,34 @@
+struct Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    calculation: T,
+    value: Option<u32>,
+}
+
+// ANCHOR: here
+impl<T> Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    fn new(calculation: T) -> Cacher<T> {
+        Cacher {
+            calculation,
+            value: None,
+        }
+    }
+
+    fn value(&mut self, arg: u32) -> u32 {
+        match self.value {
+            Some(v) => v,
+            None => {
+                let v = (self.calculation)(arg);
+                self.value = Some(v);
+                v
+            }
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.lock
new file mode 100644
index 0000000000..75ff09e51b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "workout-app"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.toml
new file mode 100644
index 0000000000..8e64540e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "workout-app"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-11/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-11/src/main.rs
new file mode 100644
index 0000000000..9f378b7935
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-11/src/main.rs
@@ -0,0 +1,64 @@
+use std::thread;
+use std::time::Duration;
+
+struct Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    calculation: T,
+    value: Option<u32>,
+}
+
+impl<T> Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    fn new(calculation: T) -> Cacher<T> {
+        Cacher {
+            calculation,
+            value: None,
+        }
+    }
+
+    fn value(&mut self, arg: u32) -> u32 {
+        match self.value {
+            Some(v) => v,
+            None => {
+                let v = (self.calculation)(arg);
+                self.value = Some(v);
+                v
+            }
+        }
+    }
+}
+
+// ANCHOR: here
+fn generate_workout(intensity: u32, random_number: u32) {
+    let mut expensive_result = Cacher::new(|num| {
+        println!("calculating slowly...");
+        thread::sleep(Duration::from_secs(2));
+        num
+    });
+
+    if intensity < 25 {
+        println!("Today, do {} pushups!", expensive_result.value(intensity));
+        println!("Next, do {} situps!", expensive_result.value(intensity));
+    } else {
+        if random_number == 3 {
+            println!("Take a break today! Remember to stay hydrated!");
+        } else {
+            println!(
+                "Today, run for {} minutes!",
+                expensive_result.value(intensity)
+            );
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let simulated_user_specified_value = 10;
+    let simulated_random_number = 7;
+
+    generate_workout(simulated_user_specified_value, simulated_random_number);
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.lock
new file mode 100644
index 0000000000..a96532addb
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "equal-to-x"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.toml
new file mode 100644
index 0000000000..4fd5d85234
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "equal-to-x"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-12/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-12/src/main.rs
new file mode 100644
index 0000000000..7352b80b23
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-12/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let x = 4;
+
+    let equal_to_x = |z| z == x;
+
+    let y = 4;
+
+    assert!(equal_to_x(y));
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.lock
new file mode 100644
index 0000000000..e91eaa8d4c
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "iterators"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.toml
new file mode 100644
index 0000000000..015f9512f7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "iterators"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-13/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-13/src/main.rs
new file mode 100644
index 0000000000..55a0dd37e9
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-13/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    let v1 = vec![1, 2, 3];
+
+    let v1_iter = v1.iter();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.lock
new file mode 100644
index 0000000000..e91eaa8d4c
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "iterators"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.toml
new file mode 100644
index 0000000000..015f9512f7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "iterators"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-14/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-14/src/main.rs
new file mode 100644
index 0000000000..712aff4085
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-14/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let v1 = vec![1, 2, 3];
+
+    let v1_iter = v1.iter();
+
+    for val in v1_iter {
+        println!("Got: {}", val);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.lock
new file mode 100644
index 0000000000..e91eaa8d4c
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "iterators"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.toml
new file mode 100644
index 0000000000..015f9512f7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "iterators"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-15/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-15/src/lib.rs
new file mode 100644
index 0000000000..afea80d22e
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-15/src/lib.rs
@@ -0,0 +1,18 @@
+#[cfg(test)]
+mod tests {
+    // ANCHOR: here
+    #[test]
+    fn iterator_demonstration() {
+        let v1 = vec![1, 2, 3];
+
+        let mut v1_iter = v1.iter();
+
+        assert_eq!(v1_iter.next(), Some(&1));
+        assert_eq!(v1_iter.next(), Some(&2));
+        assert_eq!(v1_iter.next(), Some(&3));
+        assert_eq!(v1_iter.next(), None);
+    }
+    // ANCHOR_END: here
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.lock
new file mode 100644
index 0000000000..e91eaa8d4c
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "iterators"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.toml
new file mode 100644
index 0000000000..015f9512f7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "iterators"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-16/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-16/src/lib.rs
new file mode 100644
index 0000000000..198b3c834b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-16/src/lib.rs
@@ -0,0 +1,17 @@
+#[cfg(test)]
+mod tests {
+    // ANCHOR: here
+    #[test]
+    fn iterator_sum() {
+        let v1 = vec![1, 2, 3];
+
+        let v1_iter = v1.iter();
+
+        let total: i32 = v1_iter.sum();
+
+        assert_eq!(total, 6);
+    }
+    // ANCHOR_END: here
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.lock
new file mode 100644
index 0000000000..e91eaa8d4c
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "iterators"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.toml
new file mode 100644
index 0000000000..015f9512f7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "iterators"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-17/output.txt b/src/doc/book/listings/ch13-functional-features/listing-13-17/output.txt
new file mode 100644
index 0000000000..ff02254be7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-17/output.txt
@@ -0,0 +1,13 @@
+$ cargo run
+   Compiling iterators v0.1.0 (file:///projects/iterators)
+warning: unused `std::iter::Map` that must be used
+ --> src/main.rs:4:5
+  |
+4 |     v1.iter().map(|x| x + 1);
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = note: `#[warn(unused_must_use)]` on by default
+  = note: iterators are lazy and do nothing unless consumed
+
+    Finished dev [unoptimized + debuginfo] target(s) in 0.47s
+     Running `target/debug/iterators`
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-17/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-17/src/main.rs
new file mode 100644
index 0000000000..62a68be9b3
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-17/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    let v1: Vec<i32> = vec![1, 2, 3];
+
+    v1.iter().map(|x| x + 1);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.lock
new file mode 100644
index 0000000000..e91eaa8d4c
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "iterators"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.toml
new file mode 100644
index 0000000000..015f9512f7
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "iterators"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-18/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-18/src/main.rs
new file mode 100644
index 0000000000..db9025d6fd
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-18/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    let v1: Vec<i32> = vec![1, 2, 3];
+
+    let v2: Vec<_> = v1.iter().map(|x| x + 1).collect();
+
+    assert_eq!(v2, vec![2, 3, 4]);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.lock
new file mode 100644
index 0000000000..0b15e2157a
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "shoe_size"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.toml
new file mode 100644
index 0000000000..d0ecdac67b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shoe_size"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-19/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-19/src/lib.rs
new file mode 100644
index 0000000000..c7ca364c28
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-19/src/lib.rs
@@ -0,0 +1,50 @@
+#[derive(PartialEq, Debug)]
+struct Shoe {
+    size: u32,
+    style: String,
+}
+
+fn shoes_in_my_size(shoes: Vec<Shoe>, shoe_size: u32) -> Vec<Shoe> {
+    shoes.into_iter().filter(|s| s.size == shoe_size).collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn filters_by_size() {
+        let shoes = vec![
+            Shoe {
+                size: 10,
+                style: String::from("sneaker"),
+            },
+            Shoe {
+                size: 13,
+                style: String::from("sandal"),
+            },
+            Shoe {
+                size: 10,
+                style: String::from("boot"),
+            },
+        ];
+
+        let in_my_size = shoes_in_my_size(shoes, 10);
+
+        assert_eq!(
+            in_my_size,
+            vec![
+                Shoe {
+                    size: 10,
+                    style: String::from("sneaker")
+                },
+                Shoe {
+                    size: 10,
+                    style: String::from("boot")
+                },
+            ]
+        );
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.lock
new file mode 100644
index 0000000000..58b70c5b74
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "counter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.toml
new file mode 100644
index 0000000000..4eb29e80c1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "counter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-20/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-20/src/lib.rs
new file mode 100644
index 0000000000..897804c429
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-20/src/lib.rs
@@ -0,0 +1,11 @@
+struct Counter {
+    count: u32,
+}
+
+impl Counter {
+    fn new() -> Counter {
+        Counter { count: 0 }
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.lock
new file mode 100644
index 0000000000..58b70c5b74
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "counter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.toml
new file mode 100644
index 0000000000..4eb29e80c1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "counter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-21/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-21/src/lib.rs
new file mode 100644
index 0000000000..97806be488
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-21/src/lib.rs
@@ -0,0 +1,26 @@
+struct Counter {
+    count: u32,
+}
+
+impl Counter {
+    fn new() -> Counter {
+        Counter { count: 0 }
+    }
+}
+
+// ANCHOR: here
+impl Iterator for Counter {
+    type Item = u32;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.count < 5 {
+            self.count += 1;
+            Some(self.count)
+        } else {
+            None
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.lock
new file mode 100644
index 0000000000..58b70c5b74
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "counter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.toml
new file mode 100644
index 0000000000..4eb29e80c1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "counter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-22/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-22/src/lib.rs
new file mode 100644
index 0000000000..f8faaca070
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-22/src/lib.rs
@@ -0,0 +1,43 @@
+struct Counter {
+    count: u32,
+}
+
+impl Counter {
+    fn new() -> Counter {
+        Counter { count: 0 }
+    }
+}
+
+impl Iterator for Counter {
+    type Item = u32;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.count < 5 {
+            self.count += 1;
+            Some(self.count)
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // ANCHOR: here
+    #[test]
+    fn calling_next_directly() {
+        let mut counter = Counter::new();
+
+        assert_eq!(counter.next(), Some(1));
+        assert_eq!(counter.next(), Some(2));
+        assert_eq!(counter.next(), Some(3));
+        assert_eq!(counter.next(), Some(4));
+        assert_eq!(counter.next(), Some(5));
+        assert_eq!(counter.next(), None);
+    }
+    // ANCHOR_END: here
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.lock
new file mode 100644
index 0000000000..58b70c5b74
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "counter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.toml
new file mode 100644
index 0000000000..4eb29e80c1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "counter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-23/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-23/src/lib.rs
new file mode 100644
index 0000000000..351321ff97
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-23/src/lib.rs
@@ -0,0 +1,53 @@
+struct Counter {
+    count: u32,
+}
+
+impl Counter {
+    fn new() -> Counter {
+        Counter { count: 0 }
+    }
+}
+
+impl Iterator for Counter {
+    type Item = u32;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.count < 5 {
+            self.count += 1;
+            Some(self.count)
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn calling_next_directly() {
+        let mut counter = Counter::new();
+
+        assert_eq!(counter.next(), Some(1));
+        assert_eq!(counter.next(), Some(2));
+        assert_eq!(counter.next(), Some(3));
+        assert_eq!(counter.next(), Some(4));
+        assert_eq!(counter.next(), Some(5));
+        assert_eq!(counter.next(), None);
+    }
+
+    // ANCHOR: here
+    #[test]
+    fn using_other_iterator_trait_methods() {
+        let sum: u32 = Counter::new()
+            .zip(Counter::new().skip(1))
+            .map(|(a, b)| a * b)
+            .filter(|x| x % 3 == 0)
+            .sum();
+        assert_eq!(18, sum);
+    }
+    // ANCHOR_END: here
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-25/poem.txt b/src/doc/book/listings/ch13-functional-features/listing-13-25/poem.txt
new file mode 100644
index 0000000000..8707527313
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-25/poem.txt
@@ -0,0 +1,9 @@
+I'm nobody! Who are you?
+Are you nobody, too?
+Then there's a pair of us - don't tell!
+They'd banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-25/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-25/src/lib.rs
new file mode 100644
index 0000000000..fe1dccf4ee
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-25/src/lib.rs
@@ -0,0 +1,104 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+impl Config {
+    pub fn new(args: &[String]) -> Result<Config, &'static str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-25/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-25/src/main.rs
new file mode 100644
index 0000000000..d09966e416
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-25/src/main.rs
@@ -0,0 +1,23 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+// ANCHOR: here
+fn main() {
+    let config = Config::new(env::args()).unwrap_or_else(|err| {
+        eprintln!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    // --snip--
+    // ANCHOR_END: here
+
+    if let Err(e) = minigrep::run(config) {
+        eprintln!("Application error: {}", e);
+
+        process::exit(1);
+    }
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-26/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-26/poem.txt b/src/doc/book/listings/ch13-functional-features/listing-13-26/poem.txt
new file mode 100644
index 0000000000..8707527313
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-26/poem.txt
@@ -0,0 +1,9 @@
+I'm nobody! Who are you?
+Are you nobody, too?
+Then there's a pair of us - don't tell!
+They'd banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-26/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-26/src/lib.rs
new file mode 100644
index 0000000000..44f0c7ee21
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-26/src/lib.rs
@@ -0,0 +1,107 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+// ANCHOR: here
+impl Config {
+    pub fn new(mut args: std::env::Args) -> Result<Config, &'static str> {
+        // --snip--
+        // ANCHOR_END: here
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        let query = args[1].clone();
+        let filename = args[2].clone();
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-26/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-26/src/main.rs
new file mode 100644
index 0000000000..06aac30e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-26/src/main.rs
@@ -0,0 +1,17 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let config = Config::new(env::args()).unwrap_or_else(|err| {
+        eprintln!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        eprintln!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-27/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-27/poem.txt b/src/doc/book/listings/ch13-functional-features/listing-13-27/poem.txt
new file mode 100644
index 0000000000..8707527313
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-27/poem.txt
@@ -0,0 +1,9 @@
+I'm nobody! Who are you?
+Are you nobody, too?
+Then there's a pair of us - don't tell!
+They'd banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-27/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-27/src/lib.rs
new file mode 100644
index 0000000000..a4c58d9bdd
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-27/src/lib.rs
@@ -0,0 +1,113 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+// ANCHOR: here
+impl Config {
+    pub fn new(mut args: std::env::Args) -> Result<Config, &'static str> {
+        args.next();
+
+        let query = match args.next() {
+            Some(arg) => arg,
+            None => return Err("Didn't get a query string"),
+        };
+
+        let filename = match args.next() {
+            Some(arg) => arg,
+            None => return Err("Didn't get a file name"),
+        };
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+// ANCHOR_END: here
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.contains(query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-27/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-27/src/main.rs
new file mode 100644
index 0000000000..06aac30e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-27/src/main.rs
@@ -0,0 +1,17 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let config = Config::new(env::args()).unwrap_or_else(|err| {
+        eprintln!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        eprintln!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.lock b/src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.lock
new file mode 100644
index 0000000000..88bf82d167
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "minigrep"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.toml b/src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.toml
new file mode 100644
index 0000000000..82606426f1
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-29/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "minigrep"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-29/poem.txt b/src/doc/book/listings/ch13-functional-features/listing-13-29/poem.txt
new file mode 100644
index 0000000000..8707527313
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-29/poem.txt
@@ -0,0 +1,9 @@
+I'm nobody! Who are you?
+Are you nobody, too?
+Then there's a pair of us - don't tell!
+They'd banish us, you know.
+
+How dreary to be somebody!
+How public, like a frog
+To tell your name the livelong day
+To an admiring bog!
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-29/src/lib.rs b/src/doc/book/listings/ch13-functional-features/listing-13-29/src/lib.rs
new file mode 100644
index 0000000000..bc8a77ef6e
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-29/src/lib.rs
@@ -0,0 +1,106 @@
+use std::env;
+use std::error::Error;
+use std::fs;
+
+pub struct Config {
+    pub query: String,
+    pub filename: String,
+    pub case_sensitive: bool,
+}
+
+impl Config {
+    pub fn new(mut args: std::env::Args) -> Result<Config, &'static str> {
+        args.next();
+
+        let query = match args.next() {
+            Some(arg) => arg,
+            None => return Err("Didn't get a query string"),
+        };
+
+        let filename = match args.next() {
+            Some(arg) => arg,
+            None => return Err("Didn't get a file name"),
+        };
+
+        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
+
+        Ok(Config {
+            query,
+            filename,
+            case_sensitive,
+        })
+    }
+}
+
+pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
+    let contents = fs::read_to_string(config.filename)?;
+
+    let results = if config.case_sensitive {
+        search(&config.query, &contents)
+    } else {
+        search_case_insensitive(&config.query, &contents)
+    };
+
+    for line in results {
+        println!("{}", line);
+    }
+
+    Ok(())
+}
+
+// ANCHOR: here
+pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
+    contents
+        .lines()
+        .filter(|line| line.contains(query))
+        .collect()
+}
+// ANCHOR_END: here
+
+pub fn search_case_insensitive<'a>(
+    query: &str,
+    contents: &'a str,
+) -> Vec<&'a str> {
+    let query = query.to_lowercase();
+    let mut results = Vec::new();
+
+    for line in contents.lines() {
+        if line.to_lowercase().contains(&query) {
+            results.push(line);
+        }
+    }
+
+    results
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn case_sensitive() {
+        let query = "duct";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Duct tape.";
+
+        assert_eq!(vec!["safe, fast, productive."], search(query, contents));
+    }
+
+    #[test]
+    fn case_insensitive() {
+        let query = "rUsT";
+        let contents = "\
+Rust:
+safe, fast, productive.
+Pick three.
+Trust me.";
+
+        assert_eq!(
+            vec!["Rust:", "Trust me."],
+            search_case_insensitive(query, contents)
+        );
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/listing-13-29/src/main.rs b/src/doc/book/listings/ch13-functional-features/listing-13-29/src/main.rs
new file mode 100644
index 0000000000..06aac30e73
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/listing-13-29/src/main.rs
@@ -0,0 +1,17 @@
+use std::env;
+use std::process;
+
+use minigrep::Config;
+
+fn main() {
+    let config = Config::new(env::args()).unwrap_or_else(|err| {
+        eprintln!("Problem parsing arguments: {}", err);
+        process::exit(1);
+    });
+
+    if let Err(e) = minigrep::run(config) {
+        eprintln!("Application error: {}", e);
+
+        process::exit(1);
+    }
+}
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.lock b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.lock
new file mode 100644
index 0000000000..e090432bc9
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cacher"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.toml b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.toml
new file mode 100644
index 0000000000..54ab6f2173
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cacher"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt
new file mode 100644
index 0000000000..378a614d4e
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt
@@ -0,0 +1,23 @@
+$ cargo test
+   Compiling cacher v0.1.0 (file:///projects/cacher)
+    Finished test [unoptimized + debuginfo] target(s) in 0.72s
+     Running target/debug/deps/cacher-4116485fb32b3fff
+
+running 1 test
+test tests::call_with_different_values ... FAILED
+
+failures:
+
+---- tests::call_with_different_values stdout ----
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `1`,
+ right: `2`', src/lib.rs:43:9
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::call_with_different_values
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/src/lib.rs b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/src/lib.rs
new file mode 100644
index 0000000000..e7d677d0e3
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-01-failing-cacher-test/src/lib.rs
@@ -0,0 +1,47 @@
+struct Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    calculation: T,
+    value: Option<u32>,
+}
+
+impl<T> Cacher<T>
+where
+    T: Fn(u32) -> u32,
+{
+    fn new(calculation: T) -> Cacher<T> {
+        Cacher {
+            calculation,
+            value: None,
+        }
+    }
+
+    fn value(&mut self, arg: u32) -> u32 {
+        match self.value {
+            Some(v) => v,
+            None => {
+                let v = (self.calculation)(arg);
+                self.value = Some(v);
+                v
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // ANCHOR: here
+    #[test]
+    fn call_with_different_values() {
+        let mut c = Cacher::new(|a| a);
+
+        let v1 = c.value(1);
+        let v2 = c.value(2);
+
+        assert_eq!(v2, 2);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.lock b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.lock
new file mode 100644
index 0000000000..a96532addb
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "equal-to-x"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.toml b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.toml
new file mode 100644
index 0000000000..4fd5d85234
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "equal-to-x"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/output.txt b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/output.txt
new file mode 100644
index 0000000000..a8d9e16d38
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling equal-to-x v0.1.0 (file:///projects/equal-to-x)
+error[E0434]: can't capture dynamic environment in a fn item
+ --> src/main.rs:5:14
+  |
+5 |         z == x
+  |              ^
+  |
+  = help: use the `|| { ... }` closure form instead
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0434`.
+error: could not compile `equal-to-x`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/src/main.rs b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/src/main.rs
new file mode 100644
index 0000000000..1b5d2b930b
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-02-functions-cant-capture/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let x = 4;
+
+    fn equal_to_x(z: i32) -> bool {
+        z == x
+    }
+
+    let y = 4;
+
+    assert!(equal_to_x(y));
+}
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.lock b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.lock
new file mode 100644
index 0000000000..a96532addb
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "equal-to-x"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.toml b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.toml
new file mode 100644
index 0000000000..4fd5d85234
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "equal-to-x"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/output.txt b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/output.txt
new file mode 100644
index 0000000000..43490332ed
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/output.txt
@@ -0,0 +1,22 @@
+$ cargo run
+   Compiling equal-to-x v0.1.0 (file:///projects/equal-to-x)
+error[E0382]: borrow of moved value: `x`
+ --> src/main.rs:6:40
+  |
+2 |     let x = vec![1, 2, 3];
+  |         - move occurs because `x` has type `std::vec::Vec<i32>`, which does not implement the `Copy` trait
+3 | 
+4 |     let equal_to_x = move |z| z == x;
+  |                      --------      - variable moved due to use in closure
+  |                      |
+  |                      value moved into closure here
+5 | 
+6 |     println!("can't use x here: {:?}", x);
+  |                                        ^ value borrowed here after move
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `equal-to-x`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/src/main.rs b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/src/main.rs
new file mode 100644
index 0000000000..19d4776088
--- /dev/null
+++ b/src/doc/book/listings/ch13-functional-features/no-listing-03-move-closures/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let x = vec![1, 2, 3];
+
+    let equal_to_x = move |z| z == x;
+
+    println!("can't use x here: {:?}", x);
+
+    let y = vec![1, 2, 3];
+
+    assert!(equal_to_x(y));
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.lock
new file mode 100644
index 0000000000..b304dd7c75
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "my_crate"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.toml
new file mode 100644
index 0000000000..716953ae12
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "my_crate"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/src/lib.rs
new file mode 100644
index 0000000000..ed7abb7277
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-01/src/lib.rs
@@ -0,0 +1,13 @@
+/// Adds one to the number given.
+///
+/// # Examples
+///
+/// ```
+/// let arg = 5;
+/// let answer = my_crate::add_one(arg);
+///
+/// assert_eq!(6, answer);
+/// ```
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.lock
new file mode 100644
index 0000000000..b304dd7c75
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "my_crate"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.toml
new file mode 100644
index 0000000000..716953ae12
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "my_crate"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/src/lib.rs
new file mode 100644
index 0000000000..64c9c439cc
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-02/src/lib.rs
@@ -0,0 +1,21 @@
+// ANCHOR: here
+//! # My Crate
+//!
+//! `my_crate` is a collection of utilities to make performing certain
+//! calculations more convenient.
+
+/// Adds one to the number given.
+// --snip--
+// ANCHOR_END: here
+///
+/// # Examples
+///
+/// ```
+/// let arg = 5;
+/// let answer = my_crate::add_one(arg);
+///
+/// assert_eq!(6, answer);
+/// ```
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.lock
new file mode 100644
index 0000000000..df19c247b7
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "art"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.toml
new file mode 100644
index 0000000000..a2e9e369bc
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "art"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/src/lib.rs
new file mode 100644
index 0000000000..00a81c5082
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-03/src/lib.rs
@@ -0,0 +1,36 @@
+// ANCHOR: here
+//! # Art
+//!
+//! A library for modeling artistic concepts.
+
+pub mod kinds {
+    /// The primary colors according to the RYB color model.
+    pub enum PrimaryColor {
+        Red,
+        Yellow,
+        Blue,
+    }
+
+    /// The secondary colors according to the RYB color model.
+    pub enum SecondaryColor {
+        Orange,
+        Green,
+        Purple,
+    }
+}
+
+pub mod utils {
+    use crate::kinds::*;
+
+    /// Combines two primary colors in equal amounts to create
+    /// a secondary color.
+    pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
+        // --snip--
+        // ANCHOR_END: here
+        SecondaryColor::Orange
+        // ANCHOR: here
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.lock
new file mode 100644
index 0000000000..df19c247b7
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "art"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml
new file mode 100644
index 0000000000..a2e9e369bc
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "art"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs
new file mode 100644
index 0000000000..b077a9a71a
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/lib.rs
@@ -0,0 +1,29 @@
+//! # Art
+//!
+//! A library for modeling artistic concepts.
+
+pub mod kinds {
+    /// The primary colors according to the RYB color model.
+    pub enum PrimaryColor {
+        Red,
+        Yellow,
+        Blue,
+    }
+
+    /// The secondary colors according to the RYB color model.
+    pub enum SecondaryColor {
+        Orange,
+        Green,
+        Purple,
+    }
+}
+
+pub mod utils {
+    use crate::kinds::*;
+
+    /// Combines two primary colors in equal amounts to create
+    /// a secondary color.
+    pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
+        SecondaryColor::Orange
+    }
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/main.rs
new file mode 100644
index 0000000000..b1a4bf7922
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-04/src/main.rs
@@ -0,0 +1,8 @@
+use art::kinds::PrimaryColor;
+use art::utils::mix;
+
+fn main() {
+    let red = PrimaryColor::Red;
+    let yellow = PrimaryColor::Yellow;
+    mix(red, yellow);
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.lock
new file mode 100644
index 0000000000..df19c247b7
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "art"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml
new file mode 100644
index 0000000000..a2e9e369bc
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "art"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs
new file mode 100644
index 0000000000..c5aa9e7b00
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-05/src/lib.rs
@@ -0,0 +1,41 @@
+// ANCHOR: here
+//! # Art
+//!
+//! A library for modeling artistic concepts.
+
+pub use self::kinds::PrimaryColor;
+pub use self::kinds::SecondaryColor;
+pub use self::utils::mix;
+
+pub mod kinds {
+    // --snip--
+    // ANCHOR_END: here
+    /// The primary colors according to the RYB color model.
+    pub enum PrimaryColor {
+        Red,
+        Yellow,
+        Blue,
+    }
+
+    /// The secondary colors according to the RYB color model.
+    pub enum SecondaryColor {
+        Orange,
+        Green,
+        Purple,
+    }
+    // ANCHOR: here
+}
+
+pub mod utils {
+    // --snip--
+    // ANCHOR_END: here
+    use crate::kinds::*;
+
+    /// Combines two primary colors in equal amounts to create
+    /// a secondary color.
+    pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
+        SecondaryColor::Orange
+    }
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.lock
new file mode 100644
index 0000000000..df19c247b7
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "art"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.toml
new file mode 100644
index 0000000000..a2e9e369bc
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "art"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/lib.rs
new file mode 100644
index 0000000000..daabd006df
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/lib.rs
@@ -0,0 +1,33 @@
+//! # Art
+//!
+//! A library for modeling artistic concepts.
+
+pub use self::kinds::PrimaryColor;
+pub use self::kinds::SecondaryColor;
+pub use self::utils::mix;
+
+pub mod kinds {
+    /// The primary colors according to the RYB color model.
+    pub enum PrimaryColor {
+        Red,
+        Yellow,
+        Blue,
+    }
+
+    /// The secondary colors according to the RYB color model.
+    pub enum SecondaryColor {
+        Orange,
+        Green,
+        Purple,
+    }
+}
+
+pub mod utils {
+    use crate::kinds::*;
+
+    /// Combines two primary colors in equal amounts to create
+    /// a secondary color.
+    pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
+        SecondaryColor::Orange
+    }
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/main.rs
new file mode 100644
index 0000000000..51f3b761db
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-06/src/main.rs
@@ -0,0 +1,13 @@
+// ANCHOR: here
+use art::mix;
+use art::PrimaryColor;
+
+fn main() {
+    // --snip--
+    // ANCHOR_END: here
+    let red = PrimaryColor::Red;
+    let yellow = PrimaryColor::Yellow;
+    mix(red, yellow);
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.lock
new file mode 100644
index 0000000000..77292f6149
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.lock
@@ -0,0 +1,13 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add-one"
+version = "0.1.0"
+
+[[package]]
+name = "adder"
+version = "0.1.0"
+dependencies = [
+ "add-one 0.1.0",
+]
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml
new file mode 100644
index 0000000000..d26e7cfb4d
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "adder",
+    "add-one",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml
new file mode 100644
index 0000000000..8260fb541b
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "add-one"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/src/lib.rs
new file mode 100644
index 0000000000..b0bb869432
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/add-one/src/lib.rs
@@ -0,0 +1,3 @@
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml
new file mode 100644
index 0000000000..e73f1becaf
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+
+add-one = { path = "../add-one" }
diff --git a/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs
new file mode 100644
index 0000000000..7deb7962f4
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs
@@ -0,0 +1,10 @@
+use add_one;
+
+fn main() {
+    let num = 10;
+    println!(
+        "Hello, world! {} plus one is {}!",
+        num,
+        add_one::add_one(num)
+    );
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.lock
new file mode 100644
index 0000000000..d37189b337
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "adder"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml
new file mode 100644
index 0000000000..c5ea8e510b
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+
+members = [
+    "adder",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml
new file mode 100644
index 0000000000..0e3940cf1a
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs
new file mode 100644
index 0000000000..e7a11a969c
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/adder/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.lock
new file mode 100644
index 0000000000..77292f6149
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.lock
@@ -0,0 +1,13 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add-one"
+version = "0.1.0"
+
+[[package]]
+name = "adder"
+version = "0.1.0"
+dependencies = [
+ "add-one 0.1.0",
+]
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml
new file mode 100644
index 0000000000..d26e7cfb4d
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "adder",
+    "add-one",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml
new file mode 100644
index 0000000000..8260fb541b
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "add-one"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/src/lib.rs
new file mode 100644
index 0000000000..b0bb869432
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/src/lib.rs
@@ -0,0 +1,3 @@
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml
new file mode 100644
index 0000000000..e73f1becaf
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+
+add-one = { path = "../add-one" }
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/src/main.rs
new file mode 100644
index 0000000000..e7a11a969c
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.lock
new file mode 100644
index 0000000000..f17f35e860
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.lock
@@ -0,0 +1,94 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add-one"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "adder"
+version = "0.1.0"
+dependencies = [
+ "add-one 0.1.0",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml
new file mode 100644
index 0000000000..d26e7cfb4d
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "adder",
+    "add-one",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/Cargo.toml
new file mode 100644
index 0000000000..5b52051a63
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "add-one"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/src/lib.rs
new file mode 100644
index 0000000000..7b61b40a40
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/src/lib.rs
@@ -0,0 +1,5 @@
+use rand;
+
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml
new file mode 100644
index 0000000000..e73f1becaf
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+
+add-one = { path = "../add-one" }
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/src/main.rs
new file mode 100644
index 0000000000..7deb7962f4
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/adder/src/main.rs
@@ -0,0 +1,10 @@
+use add_one;
+
+fn main() {
+    let num = 10;
+    println!(
+        "Hello, world! {} plus one is {}!",
+        num,
+        add_one::add_one(num)
+    );
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.lock
new file mode 100644
index 0000000000..77292f6149
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.lock
@@ -0,0 +1,13 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add-one"
+version = "0.1.0"
+
+[[package]]
+name = "adder"
+version = "0.1.0"
+dependencies = [
+ "add-one 0.1.0",
+]
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml
new file mode 100644
index 0000000000..d26e7cfb4d
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "adder",
+    "add-one",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/Cargo.toml
new file mode 100644
index 0000000000..8260fb541b
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "add-one"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/src/lib.rs
new file mode 100644
index 0000000000..40ceb12859
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/src/lib.rs
@@ -0,0 +1,13 @@
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        assert_eq!(3, add_one(2));
+    }
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/Cargo.toml
new file mode 100644
index 0000000000..e73f1becaf
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+
+add-one = { path = "../add-one" }
diff --git a/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/src/main.rs
new file mode 100644
index 0000000000..7deb7962f4
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/adder/src/main.rs
@@ -0,0 +1,10 @@
+use add_one;
+
+fn main() {
+    let num = 10;
+    println!(
+        "Hello, world! {} plus one is {}!",
+        num,
+        add_one::add_one(num)
+    );
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml
new file mode 100644
index 0000000000..c5ea8e510b
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/Cargo.toml
@@ -0,0 +1,5 @@
+[workspace]
+
+members = [
+    "adder",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/rustfmt-ignore b/src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/rustfmt-ignore
new file mode 100644
index 0000000000..958e568374
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-01-adder-crate/add/rustfmt-ignore
@@ -0,0 +1,2 @@
+This listing is used for demonstrating how to set up a workspace, but the workspace isn't
+completely set up yet, so rustfmt complains the crate mentioned in Cargo.toml doesn't exist yet.
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.lock
new file mode 100644
index 0000000000..77292f6149
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.lock
@@ -0,0 +1,13 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add-one"
+version = "0.1.0"
+
+[[package]]
+name = "adder"
+version = "0.1.0"
+dependencies = [
+ "add-one 0.1.0",
+]
+
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml
new file mode 100644
index 0000000000..d26e7cfb4d
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "adder",
+    "add-one",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/Cargo.toml
new file mode 100644
index 0000000000..602f686d34
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "add-one"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/src/lib.rs
new file mode 100644
index 0000000000..31e1bb209f
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/add-one/src/lib.rs
@@ -0,0 +1,7 @@
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn it_works() {
+        assert_eq!(2 + 2, 4);
+    }
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/Cargo.toml
new file mode 100644
index 0000000000..e73f1becaf
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+
+add-one = { path = "../add-one" }
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/src/main.rs
new file mode 100644
index 0000000000..e7a11a969c
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-02-add-one/add/adder/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.lock b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.lock
new file mode 100644
index 0000000000..f17f35e860
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.lock
@@ -0,0 +1,94 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "add-one"
+version = "0.1.0"
+dependencies = [
+ "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "adder"
+version = "0.1.0"
+dependencies = [
+ "add-one 0.1.0",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6"
+"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0"
+"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml
new file mode 100644
index 0000000000..d26e7cfb4d
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/Cargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "adder",
+    "add-one",
+]
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/Cargo.toml
new file mode 100644
index 0000000000..5b52051a63
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "add-one"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+rand = "0.5.5"
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/src/lib.rs b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/src/lib.rs
new file mode 100644
index 0000000000..7b61b40a40
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/add-one/src/lib.rs
@@ -0,0 +1,5 @@
+use rand;
+
+pub fn add_one(x: i32) -> i32 {
+    x + 1
+}
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/Cargo.toml b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/Cargo.toml
new file mode 100644
index 0000000000..e73f1becaf
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "adder"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+
+add-one = { path = "../add-one" }
diff --git a/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/src/main.rs b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/src/main.rs
new file mode 100644
index 0000000000..eb4050dc36
--- /dev/null
+++ b/src/doc/book/listings/ch14-more-about-cargo/output-only-03-use-rand/add/adder/src/main.rs
@@ -0,0 +1,11 @@
+use add_one;
+use rand;
+
+fn main() {
+    let num = 10;
+    println!(
+        "Hello, world! {} plus one is {}!",
+        num,
+        add_one::add_one(num)
+    );
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.lock
new file mode 100644
index 0000000000..8c125fc84b
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "box-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.toml
new file mode 100644
index 0000000000..4a0bb9d2f9
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "box-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-01/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-01/src/main.rs
new file mode 100644
index 0000000000..8da1d905d6
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-01/src/main.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let b = Box::new(5);
+    println!("b = {}", b);
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-02/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-02/src/main.rs
new file mode 100644
index 0000000000..84640b9b90
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-02/src/main.rs
@@ -0,0 +1,8 @@
+// ANCHOR: here
+enum List {
+    Cons(i32, List),
+    Nil,
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-03/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/output.txt
new file mode 100644
index 0000000000..f15aaacb9a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/output.txt
@@ -0,0 +1,28 @@
+$ cargo run
+   Compiling cons-list v0.1.0 (file:///projects/cons-list)
+error[E0072]: recursive type `List` has infinite size
+ --> src/main.rs:1:1
+  |
+1 | enum List {
+  | ^^^^^^^^^ recursive type has infinite size
+2 |     Cons(i32, List),
+  |               ---- recursive without indirection
+  |
+  = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to make `List` representable
+
+error[E0391]: cycle detected when processing `List`
+ --> src/main.rs:1:1
+  |
+1 | enum List {
+  | ^^^^^^^^^
+  |
+  = note: ...which again requires processing `List`, completing the cycle
+  = note: cycle used when computing dropck types for `Canonical { max_universe: U0, variables: [], value: ParamEnvAnd { param_env: ParamEnv { caller_bounds: [], reveal: UserFacing, def_id: None }, value: List } }`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0072, E0391.
+For more information about an error, try `rustc --explain E0072`.
+error: could not compile `cons-list`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-03/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/src/main.rs
new file mode 100644
index 0000000000..a96f3d7b18
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-03/src/main.rs
@@ -0,0 +1,12 @@
+enum List {
+    Cons(i32, List),
+    Nil,
+}
+
+// ANCHOR: here
+use crate::List::{Cons, Nil};
+
+fn main() {
+    let list = Cons(1, Cons(2, Cons(3, Nil)));
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-05/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-05/src/main.rs
new file mode 100644
index 0000000000..22f7d8338a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-05/src/main.rs
@@ -0,0 +1,10 @@
+enum List {
+    Cons(i32, Box<List>),
+    Nil,
+}
+
+use crate::List::{Cons, Nil};
+
+fn main() {
+    let list = Cons(1, Box::new(Cons(2, Box::new(Cons(3, Box::new(Nil))))));
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-06/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-06/src/main.rs
new file mode 100644
index 0000000000..174b620cf4
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-06/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let x = 5;
+    let y = &x;
+
+    assert_eq!(5, x);
+    assert_eq!(5, *y);
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-07/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-07/src/main.rs
new file mode 100644
index 0000000000..4933a416ba
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-07/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let x = 5;
+    let y = Box::new(x);
+
+    assert_eq!(5, x);
+    assert_eq!(5, *y);
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-08/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-08/src/main.rs
new file mode 100644
index 0000000000..f485946731
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-08/src/main.rs
@@ -0,0 +1,11 @@
+// ANCHOR: here
+struct MyBox<T>(T);
+
+impl<T> MyBox<T> {
+    fn new(x: T) -> MyBox<T> {
+        MyBox(x)
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-09/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/output.txt
new file mode 100644
index 0000000000..8fbd56124b
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/output.txt
@@ -0,0 +1,14 @@
+$ cargo run
+   Compiling deref-example v0.1.0 (file:///projects/deref-example)
+error[E0614]: type `MyBox<{integer}>` cannot be dereferenced
+  --> src/main.rs:14:19
+   |
+14 |     assert_eq!(5, *y);
+   |                   ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0614`.
+error: could not compile `deref-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-09/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/src/main.rs
new file mode 100644
index 0000000000..d07f2d78a0
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-09/src/main.rs
@@ -0,0 +1,17 @@
+struct MyBox<T>(T);
+
+impl<T> MyBox<T> {
+    fn new(x: T) -> MyBox<T> {
+        MyBox(x)
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    let x = 5;
+    let y = MyBox::new(x);
+
+    assert_eq!(5, x);
+    assert_eq!(5, *y);
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-10/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-10/src/main.rs
new file mode 100644
index 0000000000..a97f97c9b7
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-10/src/main.rs
@@ -0,0 +1,27 @@
+// ANCHOR: here
+use std::ops::Deref;
+
+impl<T> Deref for MyBox<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &self.0
+    }
+}
+// ANCHOR_END: here
+
+struct MyBox<T>(T);
+
+impl<T> MyBox<T> {
+    fn new(x: T) -> MyBox<T> {
+        MyBox(x)
+    }
+}
+
+fn main() {
+    let x = 5;
+    let y = MyBox::new(x);
+
+    assert_eq!(5, x);
+    assert_eq!(5, *y);
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-11/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-11/src/main.rs
new file mode 100644
index 0000000000..b73ad89c25
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-11/src/main.rs
@@ -0,0 +1,7 @@
+// ANCHOR: here
+fn hello(name: &str) {
+    println!("Hello, {}!", name);
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-12/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-12/src/main.rs
new file mode 100644
index 0000000000..6a3e143cc3
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-12/src/main.rs
@@ -0,0 +1,28 @@
+use std::ops::Deref;
+
+impl<T> Deref for MyBox<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &self.0
+    }
+}
+
+struct MyBox<T>(T);
+
+impl<T> MyBox<T> {
+    fn new(x: T) -> MyBox<T> {
+        MyBox(x)
+    }
+}
+
+fn hello(name: &str) {
+    println!("Hello, {}!", name);
+}
+
+// ANCHOR: here
+fn main() {
+    let m = MyBox::new(String::from("Rust"));
+    hello(&m);
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-13/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-13/src/main.rs
new file mode 100644
index 0000000000..ef5361c120
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-13/src/main.rs
@@ -0,0 +1,28 @@
+use std::ops::Deref;
+
+impl<T> Deref for MyBox<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &self.0
+    }
+}
+
+struct MyBox<T>(T);
+
+impl<T> MyBox<T> {
+    fn new(x: T) -> MyBox<T> {
+        MyBox(x)
+    }
+}
+
+fn hello(name: &str) {
+    println!("Hello, {}!", name);
+}
+
+// ANCHOR: here
+fn main() {
+    let m = MyBox::new(String::from("Rust"));
+    hello(&(*m)[..]);
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.lock
new file mode 100644
index 0000000000..eb8a2817ac
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "drop-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.toml
new file mode 100644
index 0000000000..e9ad457cf2
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "drop-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-14/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/output.txt
new file mode 100644
index 0000000000..4e795949a0
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/output.txt
@@ -0,0 +1,7 @@
+$ cargo run
+   Compiling drop-example v0.1.0 (file:///projects/drop-example)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.60s
+     Running `target/debug/drop-example`
+CustomSmartPointers created.
+Dropping CustomSmartPointer with data `other stuff`!
+Dropping CustomSmartPointer with data `my stuff`!
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-14/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/src/main.rs
new file mode 100644
index 0000000000..231612ae62
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-14/src/main.rs
@@ -0,0 +1,19 @@
+struct CustomSmartPointer {
+    data: String,
+}
+
+impl Drop for CustomSmartPointer {
+    fn drop(&mut self) {
+        println!("Dropping CustomSmartPointer with data `{}`!", self.data);
+    }
+}
+
+fn main() {
+    let c = CustomSmartPointer {
+        data: String::from("my stuff"),
+    };
+    let d = CustomSmartPointer {
+        data: String::from("other stuff"),
+    };
+    println!("CustomSmartPointers created.");
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.lock
new file mode 100644
index 0000000000..eb8a2817ac
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "drop-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.toml
new file mode 100644
index 0000000000..e9ad457cf2
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "drop-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-15/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/output.txt
new file mode 100644
index 0000000000..4af05876e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/output.txt
@@ -0,0 +1,14 @@
+$ cargo run
+   Compiling drop-example v0.1.0 (file:///projects/drop-example)
+error[E0040]: explicit use of destructor method
+  --> src/main.rs:16:7
+   |
+16 |     c.drop();
+   |       ^^^^ explicit destructor calls not allowed
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0040`.
+error: could not compile `drop-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-15/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/src/main.rs
new file mode 100644
index 0000000000..ff3b391a91
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-15/src/main.rs
@@ -0,0 +1,20 @@
+struct CustomSmartPointer {
+    data: String,
+}
+
+impl Drop for CustomSmartPointer {
+    fn drop(&mut self) {
+        println!("Dropping CustomSmartPointer with data `{}`!", self.data);
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    let c = CustomSmartPointer {
+        data: String::from("some data"),
+    };
+    println!("CustomSmartPointer created.");
+    c.drop();
+    println!("CustomSmartPointer dropped before the end of main.");
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.lock
new file mode 100644
index 0000000000..eb8a2817ac
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "drop-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.toml
new file mode 100644
index 0000000000..e9ad457cf2
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "drop-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-16/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/output.txt
new file mode 100644
index 0000000000..e960cd89a2
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/output.txt
@@ -0,0 +1,7 @@
+$ cargo run
+   Compiling drop-example v0.1.0 (file:///projects/drop-example)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.73s
+     Running `target/debug/drop-example`
+CustomSmartPointer created.
+Dropping CustomSmartPointer with data `some data`!
+CustomSmartPointer dropped before the end of main.
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-16/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/src/main.rs
new file mode 100644
index 0000000000..f11715c45e
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-16/src/main.rs
@@ -0,0 +1,20 @@
+struct CustomSmartPointer {
+    data: String,
+}
+
+impl Drop for CustomSmartPointer {
+    fn drop(&mut self) {
+        println!("Dropping CustomSmartPointer with data `{}`!", self.data);
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    let c = CustomSmartPointer {
+        data: String::from("some data"),
+    };
+    println!("CustomSmartPointer created.");
+    drop(c);
+    println!("CustomSmartPointer dropped before the end of main.");
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-17/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/output.txt
new file mode 100644
index 0000000000..5966a71ec2
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling cons-list v0.1.0 (file:///projects/cons-list)
+error[E0382]: use of moved value: `a`
+  --> src/main.rs:11:30
+   |
+9  |     let a = Cons(5, Box::new(Cons(10, Box::new(Nil))));
+   |         - move occurs because `a` has type `List`, which does not implement the `Copy` trait
+10 |     let b = Cons(3, Box::new(a));
+   |                              - value moved here
+11 |     let c = Cons(4, Box::new(a));
+   |                              ^ value used here after move
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `cons-list`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-17/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/src/main.rs
new file mode 100644
index 0000000000..47c33e4c46
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-17/src/main.rs
@@ -0,0 +1,12 @@
+enum List {
+    Cons(i32, Box<List>),
+    Nil,
+}
+
+use crate::List::{Cons, Nil};
+
+fn main() {
+    let a = Cons(5, Box::new(Cons(10, Box::new(Nil))));
+    let b = Cons(3, Box::new(a));
+    let c = Cons(4, Box::new(a));
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-18/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-18/src/main.rs
new file mode 100644
index 0000000000..602f7de40d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-18/src/main.rs
@@ -0,0 +1,13 @@
+enum List {
+    Cons(i32, Rc<List>),
+    Nil,
+}
+
+use crate::List::{Cons, Nil};
+use std::rc::Rc;
+
+fn main() {
+    let a = Rc::new(Cons(5, Rc::new(Cons(10, Rc::new(Nil)))));
+    let b = Cons(3, Rc::clone(&a));
+    let c = Cons(4, Rc::clone(&a));
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-19/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/output.txt
new file mode 100644
index 0000000000..6a8cc8efe1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/output.txt
@@ -0,0 +1,8 @@
+$ cargo run
+   Compiling cons-list v0.1.0 (file:///projects/cons-list)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.45s
+     Running `target/debug/cons-list`
+count after creating a = 1
+count after creating b = 2
+count after creating c = 3
+count after c goes out of scope = 2
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-19/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/src/main.rs
new file mode 100644
index 0000000000..1bd7bc533a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-19/src/main.rs
@@ -0,0 +1,21 @@
+enum List {
+    Cons(i32, Rc<List>),
+    Nil,
+}
+
+use crate::List::{Cons, Nil};
+use std::rc::Rc;
+
+// ANCHOR: here
+fn main() {
+    let a = Rc::new(Cons(5, Rc::new(Cons(10, Rc::new(Nil)))));
+    println!("count after creating a = {}", Rc::strong_count(&a));
+    let b = Cons(3, Rc::clone(&a));
+    println!("count after creating b = {}", Rc::strong_count(&a));
+    {
+        let c = Cons(4, Rc::clone(&a));
+        println!("count after creating c = {}", Rc::strong_count(&a));
+    }
+    println!("count after c goes out of scope = {}", Rc::strong_count(&a));
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.lock
new file mode 100644
index 0000000000..4dc2226a57
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "limit-tracker"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.toml
new file mode 100644
index 0000000000..b230a2326b
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "limit-tracker"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-20/src/lib.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-20/src/lib.rs
new file mode 100644
index 0000000000..d3a9003736
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-20/src/lib.rs
@@ -0,0 +1,38 @@
+pub trait Messenger {
+    fn send(&self, msg: &str);
+}
+
+pub struct LimitTracker<'a, T: Messenger> {
+    messenger: &'a T,
+    value: usize,
+    max: usize,
+}
+
+impl<'a, T> LimitTracker<'a, T>
+where
+    T: Messenger,
+{
+    pub fn new(messenger: &T, max: usize) -> LimitTracker<T> {
+        LimitTracker {
+            messenger,
+            value: 0,
+            max,
+        }
+    }
+
+    pub fn set_value(&mut self, value: usize) {
+        self.value = value;
+
+        let percentage_of_max = self.value as f64 / self.max as f64;
+
+        if percentage_of_max >= 1.0 {
+            self.messenger.send("Error: You are over your quota!");
+        } else if percentage_of_max >= 0.9 {
+            self.messenger
+                .send("Urgent warning: You've used up over 90% of your quota!");
+        } else if percentage_of_max >= 0.75 {
+            self.messenger
+                .send("Warning: You've used up over 75% of your quota!");
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.lock
new file mode 100644
index 0000000000..4dc2226a57
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "limit-tracker"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.toml
new file mode 100644
index 0000000000..b230a2326b
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "limit-tracker"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-21/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/output.txt
new file mode 100644
index 0000000000..851b5caf98
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/output.txt
@@ -0,0 +1,16 @@
+$ cargo test
+   Compiling limit-tracker v0.1.0 (file:///projects/limit-tracker)
+error[E0596]: cannot borrow `self.sent_messages` as mutable, as it is behind a `&` reference
+  --> src/lib.rs:58:13
+   |
+57 |         fn send(&self, message: &str) {
+   |                 ----- help: consider changing this to be a mutable reference: `&mut self`
+58 |             self.sent_messages.push(String::from(message));
+   |             ^^^^^^^^^^^^^^^^^^ `self` is a `&` reference, so the data it refers to cannot be borrowed as mutable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
+error: could not compile `limit-tracker`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-21/src/lib.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/src/lib.rs
new file mode 100644
index 0000000000..9e403e3ca8
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-21/src/lib.rs
@@ -0,0 +1,73 @@
+pub trait Messenger {
+    fn send(&self, msg: &str);
+}
+
+pub struct LimitTracker<'a, T: Messenger> {
+    messenger: &'a T,
+    value: usize,
+    max: usize,
+}
+
+impl<'a, T> LimitTracker<'a, T>
+where
+    T: Messenger,
+{
+    pub fn new(messenger: &T, max: usize) -> LimitTracker<T> {
+        LimitTracker {
+            messenger,
+            value: 0,
+            max,
+        }
+    }
+
+    pub fn set_value(&mut self, value: usize) {
+        self.value = value;
+
+        let percentage_of_max = self.value as f64 / self.max as f64;
+
+        if percentage_of_max >= 1.0 {
+            self.messenger.send("Error: You are over your quota!");
+        } else if percentage_of_max >= 0.9 {
+            self.messenger
+                .send("Urgent warning: You've used up over 90% of your quota!");
+        } else if percentage_of_max >= 0.75 {
+            self.messenger
+                .send("Warning: You've used up over 75% of your quota!");
+        }
+    }
+}
+
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    struct MockMessenger {
+        sent_messages: Vec<String>,
+    }
+
+    impl MockMessenger {
+        fn new() -> MockMessenger {
+            MockMessenger {
+                sent_messages: vec![],
+            }
+        }
+    }
+
+    impl Messenger for MockMessenger {
+        fn send(&self, message: &str) {
+            self.sent_messages.push(String::from(message));
+        }
+    }
+
+    #[test]
+    fn it_sends_an_over_75_percent_warning_message() {
+        let mock_messenger = MockMessenger::new();
+        let mut limit_tracker = LimitTracker::new(&mock_messenger, 100);
+
+        limit_tracker.set_value(80);
+
+        assert_eq!(mock_messenger.sent_messages.len(), 1);
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.lock
new file mode 100644
index 0000000000..4dc2226a57
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "limit-tracker"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.toml
new file mode 100644
index 0000000000..b230a2326b
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "limit-tracker"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-22/src/lib.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-22/src/lib.rs
new file mode 100644
index 0000000000..dc259f7fca
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-22/src/lib.rs
@@ -0,0 +1,80 @@
+pub trait Messenger {
+    fn send(&self, msg: &str);
+}
+
+pub struct LimitTracker<'a, T: Messenger> {
+    messenger: &'a T,
+    value: usize,
+    max: usize,
+}
+
+impl<'a, T> LimitTracker<'a, T>
+where
+    T: Messenger,
+{
+    pub fn new(messenger: &T, max: usize) -> LimitTracker<T> {
+        LimitTracker {
+            messenger,
+            value: 0,
+            max,
+        }
+    }
+
+    pub fn set_value(&mut self, value: usize) {
+        self.value = value;
+
+        let percentage_of_max = self.value as f64 / self.max as f64;
+
+        if percentage_of_max >= 1.0 {
+            self.messenger.send("Error: You are over your quota!");
+        } else if percentage_of_max >= 0.9 {
+            self.messenger
+                .send("Urgent warning: You've used up over 90% of your quota!");
+        } else if percentage_of_max >= 0.75 {
+            self.messenger
+                .send("Warning: You've used up over 75% of your quota!");
+        }
+    }
+}
+
+// ANCHOR: here
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::cell::RefCell;
+
+    struct MockMessenger {
+        sent_messages: RefCell<Vec<String>>,
+    }
+
+    impl MockMessenger {
+        fn new() -> MockMessenger {
+            MockMessenger {
+                sent_messages: RefCell::new(vec![]),
+            }
+        }
+    }
+
+    impl Messenger for MockMessenger {
+        fn send(&self, message: &str) {
+            self.sent_messages.borrow_mut().push(String::from(message));
+        }
+    }
+
+    #[test]
+    fn it_sends_an_over_75_percent_warning_message() {
+        // --snip--
+        // ANCHOR_END: here
+        let mock_messenger = MockMessenger::new();
+        let mut limit_tracker = LimitTracker::new(&mock_messenger, 100);
+
+        limit_tracker.set_value(80);
+        // ANCHOR: here
+
+        // ANCHOR: here
+        assert_eq!(mock_messenger.sent_messages.borrow().len(), 1);
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.lock
new file mode 100644
index 0000000000..4dc2226a57
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "limit-tracker"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.toml
new file mode 100644
index 0000000000..b230a2326b
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "limit-tracker"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-23/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/output.txt
new file mode 100644
index 0000000000..9d69d439c7
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/output.txt
@@ -0,0 +1,21 @@
+$ cargo test
+   Compiling limit-tracker v0.1.0 (file:///projects/limit-tracker)
+    Finished test [unoptimized + debuginfo] target(s) in 0.91s
+     Running target/debug/deps/limit_tracker-d1b2637139dca6ca
+
+running 1 test
+test tests::it_sends_an_over_75_percent_warning_message ... FAILED
+
+failures:
+
+---- tests::it_sends_an_over_75_percent_warning_message stdout ----
+thread 'main' panicked at 'already borrowed: BorrowMutError', src/libcore/result.rs:1188:5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
+
+
+failures:
+    tests::it_sends_an_over_75_percent_warning_message
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
+error: test failed, to rerun pass '--lib'
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-23/src/lib.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/src/lib.rs
new file mode 100644
index 0000000000..4e599ddc8c
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-23/src/lib.rs
@@ -0,0 +1,78 @@
+pub trait Messenger {
+    fn send(&self, msg: &str);
+}
+
+pub struct LimitTracker<'a, T: Messenger> {
+    messenger: &'a T,
+    value: usize,
+    max: usize,
+}
+
+impl<'a, T> LimitTracker<'a, T>
+where
+    T: Messenger,
+{
+    pub fn new(messenger: &T, max: usize) -> LimitTracker<T> {
+        LimitTracker {
+            messenger,
+            value: 0,
+            max,
+        }
+    }
+
+    pub fn set_value(&mut self, value: usize) {
+        self.value = value;
+
+        let percentage_of_max = self.value as f64 / self.max as f64;
+
+        if percentage_of_max >= 1.0 {
+            self.messenger.send("Error: You are over your quota!");
+        } else if percentage_of_max >= 0.9 {
+            self.messenger
+                .send("Urgent warning: You've used up over 90% of your quota!");
+        } else if percentage_of_max >= 0.75 {
+            self.messenger
+                .send("Warning: You've used up over 75% of your quota!");
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::cell::RefCell;
+
+    struct MockMessenger {
+        sent_messages: RefCell<Vec<String>>,
+    }
+
+    impl MockMessenger {
+        fn new() -> MockMessenger {
+            MockMessenger {
+                sent_messages: RefCell::new(vec![]),
+            }
+        }
+    }
+
+    // ANCHOR: here
+    impl Messenger for MockMessenger {
+        fn send(&self, message: &str) {
+            let mut one_borrow = self.sent_messages.borrow_mut();
+            let mut two_borrow = self.sent_messages.borrow_mut();
+
+            one_borrow.push(String::from(message));
+            two_borrow.push(String::from(message));
+        }
+    }
+    // ANCHOR_END: here
+
+    #[test]
+    fn it_sends_an_over_75_percent_warning_message() {
+        let mock_messenger = MockMessenger::new();
+        let mut limit_tracker = LimitTracker::new(&mock_messenger, 100);
+
+        limit_tracker.set_value(80);
+
+        assert_eq!(mock_messenger.sent_messages.borrow().len(), 1);
+    }
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-24/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/output.txt
new file mode 100644
index 0000000000..bfe217bf41
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/output.txt
@@ -0,0 +1,7 @@
+$ cargo run
+   Compiling cons-list v0.1.0 (file:///projects/cons-list)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.63s
+     Running `target/debug/cons-list`
+a after = Cons(RefCell { value: 15 }, Nil)
+b after = Cons(RefCell { value: 6 }, Cons(RefCell { value: 15 }, Nil))
+c after = Cons(RefCell { value: 10 }, Cons(RefCell { value: 15 }, Nil))
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-24/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/src/main.rs
new file mode 100644
index 0000000000..ac271fa21f
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-24/src/main.rs
@@ -0,0 +1,24 @@
+#[derive(Debug)]
+enum List {
+    Cons(Rc<RefCell<i32>>, Rc<List>),
+    Nil,
+}
+
+use crate::List::{Cons, Nil};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+fn main() {
+    let value = Rc::new(RefCell::new(5));
+
+    let a = Rc::new(Cons(Rc::clone(&value), Rc::new(Nil)));
+
+    let b = Cons(Rc::new(RefCell::new(6)), Rc::clone(&a));
+    let c = Cons(Rc::new(RefCell::new(10)), Rc::clone(&a));
+
+    *value.borrow_mut() += 10;
+
+    println!("a after = {:?}", a);
+    println!("b after = {:?}", b);
+    println!("c after = {:?}", c);
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-25/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-25/src/main.rs
new file mode 100644
index 0000000000..f36c7fd06d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-25/src/main.rs
@@ -0,0 +1,20 @@
+use crate::List::{Cons, Nil};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug)]
+enum List {
+    Cons(i32, RefCell<Rc<List>>),
+    Nil,
+}
+
+impl List {
+    fn tail(&self) -> Option<&RefCell<Rc<List>>> {
+        match self {
+            Cons(_, item) => Some(item),
+            Nil => None,
+        }
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.lock
new file mode 100644
index 0000000000..a792c49aaf
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "cons-list"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.toml
new file mode 100644
index 0000000000..86c8e956e1
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cons-list"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-26/output.txt b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/output.txt
new file mode 100644
index 0000000000..8b8eb40b60
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/output.txt
@@ -0,0 +1,11 @@
+$ cargo run
+   Compiling cons-list v0.1.0 (file:///projects/cons-list)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.53s
+     Running `target/debug/cons-list`
+a initial rc count = 1
+a next item = Some(RefCell { value: Nil })
+a rc count after b creation = 2
+b initial rc count = 1
+b next item = Some(RefCell { value: Cons(5, RefCell { value: Nil }) })
+b rc count after changing a = 2
+a rc count after changing a = 2
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-26/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/src/main.rs
new file mode 100644
index 0000000000..08963aaa51
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-26/src/main.rs
@@ -0,0 +1,44 @@
+use crate::List::{Cons, Nil};
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug)]
+enum List {
+    Cons(i32, RefCell<Rc<List>>),
+    Nil,
+}
+
+impl List {
+    fn tail(&self) -> Option<&RefCell<Rc<List>>> {
+        match self {
+            Cons(_, item) => Some(item),
+            Nil => None,
+        }
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    let a = Rc::new(Cons(5, RefCell::new(Rc::new(Nil))));
+
+    println!("a initial rc count = {}", Rc::strong_count(&a));
+    println!("a next item = {:?}", a.tail());
+
+    let b = Rc::new(Cons(10, RefCell::new(Rc::clone(&a))));
+
+    println!("a rc count after b creation = {}", Rc::strong_count(&a));
+    println!("b initial rc count = {}", Rc::strong_count(&b));
+    println!("b next item = {:?}", b.tail());
+
+    if let Some(link) = a.tail() {
+        *link.borrow_mut() = Rc::clone(&b);
+    }
+
+    println!("b rc count after changing a = {}", Rc::strong_count(&b));
+    println!("a rc count after changing a = {}", Rc::strong_count(&a));
+
+    // Uncomment the next line to see that we have a cycle;
+    // it will overflow the stack
+    // println!("a next item = {:?}", a.tail());
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.lock
new file mode 100644
index 0000000000..dd1f00a874
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "tree"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.toml
new file mode 100644
index 0000000000..d6774b817a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-27/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "tree"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-27/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-27/src/main.rs
new file mode 100644
index 0000000000..335d154ddb
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-27/src/main.rs
@@ -0,0 +1,24 @@
+// ANCHOR: here
+use std::cell::RefCell;
+use std::rc::Rc;
+
+#[derive(Debug)]
+struct Node {
+    value: i32,
+    children: RefCell<Vec<Rc<Node>>>,
+}
+// ANCHOR_END: here
+
+// ANCHOR: there
+fn main() {
+    let leaf = Rc::new(Node {
+        value: 3,
+        children: RefCell::new(vec![]),
+    });
+
+    let branch = Rc::new(Node {
+        value: 5,
+        children: RefCell::new(vec![Rc::clone(&leaf)]),
+    });
+}
+// ANCHOR_END: there
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.lock
new file mode 100644
index 0000000000..dd1f00a874
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "tree"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.toml
new file mode 100644
index 0000000000..d6774b817a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-28/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "tree"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-28/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-28/src/main.rs
new file mode 100644
index 0000000000..fabd1cbceb
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-28/src/main.rs
@@ -0,0 +1,33 @@
+// ANCHOR: here
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+#[derive(Debug)]
+struct Node {
+    value: i32,
+    parent: RefCell<Weak<Node>>,
+    children: RefCell<Vec<Rc<Node>>>,
+}
+// ANCHOR_END: here
+
+// ANCHOR: there
+fn main() {
+    let leaf = Rc::new(Node {
+        value: 3,
+        parent: RefCell::new(Weak::new()),
+        children: RefCell::new(vec![]),
+    });
+
+    println!("leaf parent = {:?}", leaf.parent.borrow().upgrade());
+
+    let branch = Rc::new(Node {
+        value: 5,
+        parent: RefCell::new(Weak::new()),
+        children: RefCell::new(vec![Rc::clone(&leaf)]),
+    });
+
+    *leaf.parent.borrow_mut() = Rc::downgrade(&branch);
+
+    println!("leaf parent = {:?}", leaf.parent.borrow().upgrade());
+}
+// ANCHOR_END: there
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.lock
new file mode 100644
index 0000000000..dd1f00a874
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "tree"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.toml
new file mode 100644
index 0000000000..d6774b817a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-29/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "tree"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/listing-15-29/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/listing-15-29/src/main.rs
new file mode 100644
index 0000000000..ea13df0eb4
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/listing-15-29/src/main.rs
@@ -0,0 +1,54 @@
+use std::cell::RefCell;
+use std::rc::{Rc, Weak};
+
+#[derive(Debug)]
+struct Node {
+    value: i32,
+    parent: RefCell<Weak<Node>>,
+    children: RefCell<Vec<Rc<Node>>>,
+}
+
+// ANCHOR: here
+fn main() {
+    let leaf = Rc::new(Node {
+        value: 3,
+        parent: RefCell::new(Weak::new()),
+        children: RefCell::new(vec![]),
+    });
+
+    println!(
+        "leaf strong = {}, weak = {}",
+        Rc::strong_count(&leaf),
+        Rc::weak_count(&leaf),
+    );
+
+    {
+        let branch = Rc::new(Node {
+            value: 5,
+            parent: RefCell::new(Weak::new()),
+            children: RefCell::new(vec![Rc::clone(&leaf)]),
+        });
+
+        *leaf.parent.borrow_mut() = Rc::downgrade(&branch);
+
+        println!(
+            "branch strong = {}, weak = {}",
+            Rc::strong_count(&branch),
+            Rc::weak_count(&branch),
+        );
+
+        println!(
+            "leaf strong = {}, weak = {}",
+            Rc::strong_count(&leaf),
+            Rc::weak_count(&leaf),
+        );
+    }
+
+    println!("leaf parent = {:?}", leaf.parent.borrow().upgrade());
+    println!(
+        "leaf strong = {}, weak = {}",
+        Rc::strong_count(&leaf),
+        Rc::weak_count(&leaf),
+    );
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.lock
new file mode 100644
index 0000000000..340f6604a2
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "borrowing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.toml
new file mode 100644
index 0000000000..1558eb615e
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "borrowing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/output.txt b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/output.txt
new file mode 100644
index 0000000000..c8e5592de7
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling borrowing v0.1.0 (file:///projects/borrowing)
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+ --> src/main.rs:3:13
+  |
+2 |     let x = 5;
+  |         - help: consider changing this to be mutable: `mut x`
+3 |     let y = &mut x;
+  |             ^^^^^^ cannot borrow as mutable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0596`.
+error: could not compile `borrowing`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/src/main.rs
new file mode 100644
index 0000000000..8f48d41c15
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/src/main.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let x = 5;
+    let y = &mut x;
+}
diff --git a/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.lock b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.lock
new file mode 100644
index 0000000000..4297c6733d
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "deref-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.toml b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.toml
new file mode 100644
index 0000000000..2a9630fe4a
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "deref-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/output.txt b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/output.txt
new file mode 100644
index 0000000000..4368ee65f6
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/output.txt
@@ -0,0 +1,17 @@
+$ cargo run
+   Compiling deref-example v0.1.0 (file:///projects/deref-example)
+error[E0277]: can't compare `{integer}` with `&{integer}`
+ --> src/main.rs:6:5
+  |
+6 |     assert_eq!(5, y);
+  |     ^^^^^^^^^^^^^^^^^ no implementation for `{integer} == &{integer}`
+  |
+  = help: the trait `std::cmp::PartialEq<&{integer}>` is not implemented for `{integer}`
+  = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `deref-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/src/main.rs b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/src/main.rs
new file mode 100644
index 0000000000..4e20cae0b8
--- /dev/null
+++ b/src/doc/book/listings/ch15-smart-pointers/output-only-01-comparing-to-reference/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let x = 5;
+    let y = &x;
+
+    assert_eq!(5, x);
+    assert_eq!(5, y);
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/src/main.rs
new file mode 100644
index 0000000000..6305a98e3d
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-01/src/main.rs
@@ -0,0 +1,16 @@
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    thread::spawn(|| {
+        for i in 1..10 {
+            println!("hi number {} from the spawned thread!", i);
+            thread::sleep(Duration::from_millis(1));
+        }
+    });
+
+    for i in 1..5 {
+        println!("hi number {} from the main thread!", i);
+        thread::sleep(Duration::from_millis(1));
+    }
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/src/main.rs
new file mode 100644
index 0000000000..e37607f1d6
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-02/src/main.rs
@@ -0,0 +1,18 @@
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let handle = thread::spawn(|| {
+        for i in 1..10 {
+            println!("hi number {} from the spawned thread!", i);
+            thread::sleep(Duration::from_millis(1));
+        }
+    });
+
+    for i in 1..5 {
+        println!("hi number {} from the main thread!", i);
+        thread::sleep(Duration::from_millis(1));
+    }
+
+    handle.join().unwrap();
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/output.txt b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/output.txt
new file mode 100644
index 0000000000..1dd4deeb2e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/output.txt
@@ -0,0 +1,29 @@
+$ cargo run
+   Compiling threads v0.1.0 (file:///projects/threads)
+error[E0373]: closure may outlive the current function, but it borrows `v`, which is owned by the current function
+ --> src/main.rs:6:32
+  |
+6 |     let handle = thread::spawn(|| {
+  |                                ^^ may outlive borrowed value `v`
+7 |         println!("Here's a vector: {:?}", v);
+  |                                           - `v` is borrowed here
+  |
+note: function requires argument type to outlive `'static`
+ --> src/main.rs:6:18
+  |
+6 |       let handle = thread::spawn(|| {
+  |  __________________^
+7 | |         println!("Here's a vector: {:?}", v);
+8 | |     });
+  | |______^
+help: to force the closure to take ownership of `v` (and any other referenced variables), use the `move` keyword
+  |
+6 |     let handle = thread::spawn(move || {
+  |                                ^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0373`.
+error: could not compile `threads`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/src/main.rs
new file mode 100644
index 0000000000..defc876482
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-03/src/main.rs
@@ -0,0 +1,11 @@
+use std::thread;
+
+fn main() {
+    let v = vec![1, 2, 3];
+
+    let handle = thread::spawn(|| {
+        println!("Here's a vector: {:?}", v);
+    });
+
+    handle.join().unwrap();
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/src/main.rs
new file mode 100644
index 0000000000..0bccc5f56f
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-04/src/main.rs
@@ -0,0 +1,13 @@
+use std::thread;
+
+fn main() {
+    let v = vec![1, 2, 3];
+
+    let handle = thread::spawn(|| {
+        println!("Here's a vector: {:?}", v);
+    });
+
+    drop(v); // oh no!
+
+    handle.join().unwrap();
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/src/main.rs
new file mode 100644
index 0000000000..a6547dc4c1
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-05/src/main.rs
@@ -0,0 +1,11 @@
+use std::thread;
+
+fn main() {
+    let v = vec![1, 2, 3];
+
+    let handle = thread::spawn(move || {
+        println!("Here's a vector: {:?}", v);
+    });
+
+    handle.join().unwrap();
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.lock
new file mode 100644
index 0000000000..55d2252da5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "message-passing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.toml
new file mode 100644
index 0000000000..8fd8808ea5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "message-passing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/src/main.rs
new file mode 100644
index 0000000000..d80dac4a0a
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-06/src/main.rs
@@ -0,0 +1,5 @@
+use std::sync::mpsc;
+
+fn main() {
+    let (tx, rx) = mpsc::channel();
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.lock
new file mode 100644
index 0000000000..55d2252da5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "message-passing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.toml
new file mode 100644
index 0000000000..8fd8808ea5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "message-passing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/src/main.rs
new file mode 100644
index 0000000000..7859b64dae
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-07/src/main.rs
@@ -0,0 +1,11 @@
+use std::sync::mpsc;
+use std::thread;
+
+fn main() {
+    let (tx, rx) = mpsc::channel();
+
+    thread::spawn(move || {
+        let val = String::from("hi");
+        tx.send(val).unwrap();
+    });
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.lock
new file mode 100644
index 0000000000..55d2252da5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "message-passing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.toml
new file mode 100644
index 0000000000..8fd8808ea5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "message-passing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/src/main.rs
new file mode 100644
index 0000000000..fbba9167d4
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-08/src/main.rs
@@ -0,0 +1,14 @@
+use std::sync::mpsc;
+use std::thread;
+
+fn main() {
+    let (tx, rx) = mpsc::channel();
+
+    thread::spawn(move || {
+        let val = String::from("hi");
+        tx.send(val).unwrap();
+    });
+
+    let received = rx.recv().unwrap();
+    println!("Got: {}", received);
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.lock
new file mode 100644
index 0000000000..55d2252da5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "message-passing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.toml
new file mode 100644
index 0000000000..8fd8808ea5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "message-passing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/output.txt b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/output.txt
new file mode 100644
index 0000000000..11bfc6fe32
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/output.txt
@@ -0,0 +1,18 @@
+$ cargo run
+   Compiling message-passing v0.1.0 (file:///projects/message-passing)
+error[E0382]: borrow of moved value: `val`
+  --> src/main.rs:10:31
+   |
+8  |         let val = String::from("hi");
+   |             --- move occurs because `val` has type `std::string::String`, which does not implement the `Copy` trait
+9  |         tx.send(val).unwrap();
+   |                 --- value moved here
+10 |         println!("val is {}", val);
+   |                               ^^^ value borrowed here after move
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `message-passing`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/src/main.rs
new file mode 100644
index 0000000000..98a8129ab3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-09/src/main.rs
@@ -0,0 +1,15 @@
+use std::sync::mpsc;
+use std::thread;
+
+fn main() {
+    let (tx, rx) = mpsc::channel();
+
+    thread::spawn(move || {
+        let val = String::from("hi");
+        tx.send(val).unwrap();
+        println!("val is {}", val);
+    });
+
+    let received = rx.recv().unwrap();
+    println!("Got: {}", received);
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.lock
new file mode 100644
index 0000000000..55d2252da5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "message-passing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.toml
new file mode 100644
index 0000000000..8fd8808ea5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "message-passing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/src/main.rs
new file mode 100644
index 0000000000..82b220de45
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-10/src/main.rs
@@ -0,0 +1,25 @@
+use std::sync::mpsc;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let (tx, rx) = mpsc::channel();
+
+    thread::spawn(move || {
+        let vals = vec![
+            String::from("hi"),
+            String::from("from"),
+            String::from("the"),
+            String::from("thread"),
+        ];
+
+        for val in vals {
+            tx.send(val).unwrap();
+            thread::sleep(Duration::from_secs(1));
+        }
+    });
+
+    for received in rx {
+        println!("Got: {}", received);
+    }
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.lock
new file mode 100644
index 0000000000..55d2252da5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "message-passing"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.toml
new file mode 100644
index 0000000000..8fd8808ea5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "message-passing"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/src/main.rs
new file mode 100644
index 0000000000..f0acf4c2d2
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-11/src/main.rs
@@ -0,0 +1,46 @@
+use std::sync::mpsc;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    // ANCHOR: here
+    // --snip--
+
+    let (tx, rx) = mpsc::channel();
+
+    let tx1 = mpsc::Sender::clone(&tx);
+    thread::spawn(move || {
+        let vals = vec![
+            String::from("hi"),
+            String::from("from"),
+            String::from("the"),
+            String::from("thread"),
+        ];
+
+        for val in vals {
+            tx1.send(val).unwrap();
+            thread::sleep(Duration::from_secs(1));
+        }
+    });
+
+    thread::spawn(move || {
+        let vals = vec![
+            String::from("more"),
+            String::from("messages"),
+            String::from("for"),
+            String::from("you"),
+        ];
+
+        for val in vals {
+            tx.send(val).unwrap();
+            thread::sleep(Duration::from_secs(1));
+        }
+    });
+
+    for received in rx {
+        println!("Got: {}", received);
+    }
+
+    // --snip--
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.lock
new file mode 100644
index 0000000000..8e7ba9cf5d
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "shared-state"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.toml
new file mode 100644
index 0000000000..e7c75ac918
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shared-state"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/src/main.rs
new file mode 100644
index 0000000000..0c0d6767ad
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-12/src/main.rs
@@ -0,0 +1,12 @@
+use std::sync::Mutex;
+
+fn main() {
+    let m = Mutex::new(5);
+
+    {
+        let mut num = m.lock().unwrap();
+        *num = 6;
+    }
+
+    println!("m = {:?}", m);
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.lock
new file mode 100644
index 0000000000..8e7ba9cf5d
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "shared-state"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.toml
new file mode 100644
index 0000000000..e7c75ac918
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shared-state"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/output.txt b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/output.txt
new file mode 100644
index 0000000000..7369ec41b5
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/output.txt
@@ -0,0 +1,19 @@
+$ cargo run
+   Compiling shared-state v0.1.0 (file:///projects/shared-state)
+error[E0382]: use of moved value: `counter`
+  --> src/main.rs:9:36
+   |
+5  |     let counter = Mutex::new(0);
+   |         ------- move occurs because `counter` has type `std::sync::Mutex<i32>`, which does not implement the `Copy` trait
+...
+9  |         let handle = thread::spawn(move || {
+   |                                    ^^^^^^^ value moved into closure here, in previous iteration of loop
+10 |             let mut num = counter.lock().unwrap();
+   |                           ------- use occurs due to use in closure
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `shared-state`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/src/main.rs
new file mode 100644
index 0000000000..4e380a59ac
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-13/src/main.rs
@@ -0,0 +1,22 @@
+use std::sync::Mutex;
+use std::thread;
+
+fn main() {
+    let counter = Mutex::new(0);
+    let mut handles = vec![];
+
+    for _ in 0..10 {
+        let handle = thread::spawn(move || {
+            let mut num = counter.lock().unwrap();
+
+            *num += 1;
+        });
+        handles.push(handle);
+    }
+
+    for handle in handles {
+        handle.join().unwrap();
+    }
+
+    println!("Result: {}", *counter.lock().unwrap());
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.lock
new file mode 100644
index 0000000000..8e7ba9cf5d
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "shared-state"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.toml
new file mode 100644
index 0000000000..e7c75ac918
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shared-state"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/output.txt b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/output.txt
new file mode 100644
index 0000000000..200c55e220
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/output.txt
@@ -0,0 +1,17 @@
+$ cargo run
+   Compiling shared-state v0.1.0 (file:///projects/shared-state)
+error[E0277]: `std::rc::Rc<std::sync::Mutex<i32>>` cannot be sent between threads safely
+   --> src/main.rs:11:22
+    |
+11  |         let handle = thread::spawn(move || {
+    |                      ^^^^^^^^^^^^^ `std::rc::Rc<std::sync::Mutex<i32>>` cannot be sent between threads safely
+    |
+    = help: within `[closure@src/main.rs:11:36: 15:10 counter:std::rc::Rc<std::sync::Mutex<i32>>]`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<std::sync::Mutex<i32>>`
+    = note: required because it appears within the type `[closure@src/main.rs:11:36: 15:10 counter:std::rc::Rc<std::sync::Mutex<i32>>]`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `shared-state`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/src/main.rs
new file mode 100644
index 0000000000..d940b1a344
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-14/src/main.rs
@@ -0,0 +1,24 @@
+use std::rc::Rc;
+use std::sync::Mutex;
+use std::thread;
+
+fn main() {
+    let counter = Rc::new(Mutex::new(0));
+    let mut handles = vec![];
+
+    for _ in 0..10 {
+        let counter = Rc::clone(&counter);
+        let handle = thread::spawn(move || {
+            let mut num = counter.lock().unwrap();
+
+            *num += 1;
+        });
+        handles.push(handle);
+    }
+
+    for handle in handles {
+        handle.join().unwrap();
+    }
+
+    println!("Result: {}", *counter.lock().unwrap());
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.lock
new file mode 100644
index 0000000000..8e7ba9cf5d
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "shared-state"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.toml
new file mode 100644
index 0000000000..e7c75ac918
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shared-state"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/src/main.rs
new file mode 100644
index 0000000000..30247dd52f
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/listing-16-15/src/main.rs
@@ -0,0 +1,23 @@
+use std::sync::{Arc, Mutex};
+use std::thread;
+
+fn main() {
+    let counter = Arc::new(Mutex::new(0));
+    let mut handles = vec![];
+
+    for _ in 0..10 {
+        let counter = Arc::clone(&counter);
+        let handle = thread::spawn(move || {
+            let mut num = counter.lock().unwrap();
+
+            *num += 1;
+        });
+        handles.push(handle);
+    }
+
+    for handle in handles {
+        handle.join().unwrap();
+    }
+
+    println!("Result: {}", *counter.lock().unwrap());
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/src/main.rs
new file mode 100644
index 0000000000..6205e57d33
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-01-join-too-early/src/main.rs
@@ -0,0 +1,18 @@
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let handle = thread::spawn(|| {
+        for i in 1..10 {
+            println!("hi number {} from the spawned thread!", i);
+            thread::sleep(Duration::from_millis(1));
+        }
+    });
+
+    handle.join().unwrap();
+
+    for i in 1..5 {
+        println!("hi number {} from the main thread!", i);
+        thread::sleep(Duration::from_millis(1));
+    }
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.lock
new file mode 100644
index 0000000000..8e7ba9cf5d
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "shared-state"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.toml
new file mode 100644
index 0000000000..e7c75ac918
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "shared-state"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/src/main.rs
new file mode 100644
index 0000000000..dbb1397719
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/no-listing-02-no-loop-to-understand-error/src/main.rs
@@ -0,0 +1,27 @@
+use std::sync::Mutex;
+use std::thread;
+
+fn main() {
+    let counter = Mutex::new(0);
+    let mut handles = vec![];
+
+    let handle = thread::spawn(move || {
+        let mut num = counter.lock().unwrap();
+
+        *num += 1;
+    });
+    handles.push(handle);
+
+    let handle2 = thread::spawn(move || {
+        let mut num2 = counter.lock().unwrap();
+
+        *num2 += 1;
+    });
+    handles.push(handle2);
+
+    for handle in handles {
+        handle.join().unwrap();
+    }
+
+    println!("Result: {}", *counter.lock().unwrap());
+}
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.lock b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.lock
new file mode 100644
index 0000000000..8ecc3ae17e
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "threads"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.toml b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.toml
new file mode 100644
index 0000000000..68a31e10b3
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "threads"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt
new file mode 100644
index 0000000000..2d1cb3c8b7
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt
@@ -0,0 +1,22 @@
+$ cargo run
+   Compiling threads v0.1.0 (file:///projects/threads)
+error[E0382]: use of moved value: `v`
+  --> src/main.rs:10:10
+   |
+4  |     let v = vec![1, 2, 3];
+   |         - move occurs because `v` has type `std::vec::Vec<i32>`, which does not implement the `Copy` trait
+5  | 
+6  |     let handle = thread::spawn(move || {
+   |                                ------- value moved into closure here
+7  |         println!("Here's a vector: {:?}", v);
+   |                                           - variable moved due to use in closure
+...
+10 |     drop(v); // oh no!
+   |          ^ value used here after move
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `threads`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/src/main.rs b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/src/main.rs
new file mode 100644
index 0000000000..70f659c5f6
--- /dev/null
+++ b/src/doc/book/listings/ch16-fearless-concurrency/output-only-01-move-drop/src/main.rs
@@ -0,0 +1,13 @@
+use std::thread;
+
+fn main() {
+    let v = vec![1, 2, 3];
+
+    let handle = thread::spawn(move || {
+        println!("Here's a vector: {:?}", v);
+    });
+
+    drop(v); // oh no!
+
+    handle.join().unwrap();
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-01/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-01/Cargo.lock
new file mode 100644
index 0000000000..471d8dfc3c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "averaged-collection"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-01/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-01/Cargo.toml
new file mode 100644
index 0000000000..ab96488d1e
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "averaged-collection"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-01/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-01/src/lib.rs
new file mode 100644
index 0000000000..b5ce2ab642
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-01/src/lib.rs
@@ -0,0 +1,4 @@
+pub struct AveragedCollection {
+    list: Vec<i32>,
+    average: f64,
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-02/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-02/Cargo.lock
new file mode 100644
index 0000000000..471d8dfc3c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "averaged-collection"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-02/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-02/Cargo.toml
new file mode 100644
index 0000000000..ab96488d1e
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "averaged-collection"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-02/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-02/src/lib.rs
new file mode 100644
index 0000000000..bb407ec5fe
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-02/src/lib.rs
@@ -0,0 +1,33 @@
+pub struct AveragedCollection {
+    list: Vec<i32>,
+    average: f64,
+}
+
+// ANCHOR: here
+impl AveragedCollection {
+    pub fn add(&mut self, value: i32) {
+        self.list.push(value);
+        self.update_average();
+    }
+
+    pub fn remove(&mut self) -> Option<i32> {
+        let result = self.list.pop();
+        match result {
+            Some(value) => {
+                self.update_average();
+                Some(value)
+            }
+            None => None,
+        }
+    }
+
+    pub fn average(&self) -> f64 {
+        self.average
+    }
+
+    fn update_average(&mut self) {
+        let total: i32 = self.list.iter().sum();
+        self.average = total as f64 / self.list.len() as f64;
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-03/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-03/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-03/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-03/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-03/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-03/src/lib.rs
new file mode 100644
index 0000000000..3a5cb779c4
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-03/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait Draw {
+    fn draw(&self);
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-04/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-04/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-04/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-04/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-04/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-04/src/lib.rs
new file mode 100644
index 0000000000..0c45e2a624
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-04/src/lib.rs
@@ -0,0 +1,9 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+// ANCHOR: here
+pub struct Screen {
+    pub components: Vec<Box<dyn Draw>>,
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-05/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-05/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-05/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-05/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-05/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-05/src/lib.rs
new file mode 100644
index 0000000000..57ebb5782a
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-05/src/lib.rs
@@ -0,0 +1,17 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+pub struct Screen {
+    pub components: Vec<Box<dyn Draw>>,
+}
+
+// ANCHOR: here
+impl Screen {
+    pub fn run(&self) {
+        for component in self.components.iter() {
+            component.draw();
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-06/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-06/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-06/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-06/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-06/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-06/src/lib.rs
new file mode 100644
index 0000000000..63a8907d36
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-06/src/lib.rs
@@ -0,0 +1,20 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+// ANCHOR: here
+pub struct Screen<T: Draw> {
+    pub components: Vec<T>,
+}
+
+impl<T> Screen<T>
+where
+    T: Draw,
+{
+    pub fn run(&self) {
+        for component in self.components.iter() {
+            component.draw();
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-07/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-07/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-07/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-07/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-07/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-07/src/lib.rs
new file mode 100644
index 0000000000..413dc6ff16
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-07/src/lib.rs
@@ -0,0 +1,31 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+pub struct Screen {
+    pub components: Vec<Box<dyn Draw>>,
+}
+
+impl Screen {
+    pub fn run(&self) {
+        for component in self.components.iter() {
+            component.draw();
+        }
+    }
+}
+
+// ANCHOR: here
+pub struct Button {
+    pub width: u32,
+    pub height: u32,
+    pub label: String,
+}
+
+impl Draw for Button {
+    fn draw(&self) {
+        // code to actually draw a button
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-08/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-08/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-08/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-08/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-08/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-08/src/lib.rs
new file mode 100644
index 0000000000..960fee23da
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-08/src/lib.rs
@@ -0,0 +1,27 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+pub struct Screen {
+    pub components: Vec<Box<dyn Draw>>,
+}
+
+impl Screen {
+    pub fn run(&self) {
+        for component in self.components.iter() {
+            component.draw();
+        }
+    }
+}
+
+pub struct Button {
+    pub width: u32,
+    pub height: u32,
+    pub label: String,
+}
+
+impl Draw for Button {
+    fn draw(&self) {
+        // code to actually draw a button
+    }
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-08/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-08/src/main.rs
new file mode 100644
index 0000000000..9575d407e3
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-08/src/main.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+use gui::Draw;
+
+struct SelectBox {
+    width: u32,
+    height: u32,
+    options: Vec<String>,
+}
+
+impl Draw for SelectBox {
+    fn draw(&self) {
+        // code to actually draw a select box
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-09/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-09/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-09/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-09/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-09/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-09/src/lib.rs
new file mode 100644
index 0000000000..960fee23da
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-09/src/lib.rs
@@ -0,0 +1,27 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+pub struct Screen {
+    pub components: Vec<Box<dyn Draw>>,
+}
+
+impl Screen {
+    pub fn run(&self) {
+        for component in self.components.iter() {
+            component.draw();
+        }
+    }
+}
+
+pub struct Button {
+    pub width: u32,
+    pub height: u32,
+    pub label: String,
+}
+
+impl Draw for Button {
+    fn draw(&self) {
+        // code to actually draw a button
+    }
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-09/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-09/src/main.rs
new file mode 100644
index 0000000000..4eb13f6b73
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-09/src/main.rs
@@ -0,0 +1,40 @@
+use gui::Draw;
+
+struct SelectBox {
+    width: u32,
+    height: u32,
+    options: Vec<String>,
+}
+
+impl Draw for SelectBox {
+    fn draw(&self) {
+        // code to actually draw a select box
+    }
+}
+
+// ANCHOR: here
+use gui::{Button, Screen};
+
+fn main() {
+    let screen = Screen {
+        components: vec![
+            Box::new(SelectBox {
+                width: 75,
+                height: 10,
+                options: vec![
+                    String::from("Yes"),
+                    String::from("Maybe"),
+                    String::from("No"),
+                ],
+            }),
+            Box::new(Button {
+                width: 50,
+                height: 10,
+                label: String::from("OK"),
+            }),
+        ],
+    };
+
+    screen.run();
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-10/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-10/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-10/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-10/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-10/output.txt b/src/doc/book/listings/ch17-oop/listing-17-10/output.txt
new file mode 100644
index 0000000000..b18e1e9b4e
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-10/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling gui v0.1.0 (file:///projects/gui)
+error[E0277]: the trait bound `std::string::String: gui::Draw` is not satisfied
+ --> src/main.rs:5:26
+  |
+5 |         components: vec![Box::new(String::from("Hi"))],
+  |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `gui::Draw` is not implemented for `std::string::String`
+  |
+  = note: required for the cast to the object type `dyn gui::Draw`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `gui`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch17-oop/listing-17-10/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-10/src/lib.rs
new file mode 100644
index 0000000000..960fee23da
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-10/src/lib.rs
@@ -0,0 +1,27 @@
+pub trait Draw {
+    fn draw(&self);
+}
+
+pub struct Screen {
+    pub components: Vec<Box<dyn Draw>>,
+}
+
+impl Screen {
+    pub fn run(&self) {
+        for component in self.components.iter() {
+            component.draw();
+        }
+    }
+}
+
+pub struct Button {
+    pub width: u32,
+    pub height: u32,
+    pub label: String,
+}
+
+impl Draw for Button {
+    fn draw(&self) {
+        // code to actually draw a button
+    }
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-10/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-10/src/main.rs
new file mode 100644
index 0000000000..2ede87ab78
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-10/src/main.rs
@@ -0,0 +1,9 @@
+use gui::Screen;
+
+fn main() {
+    let screen = Screen {
+        components: vec![Box::new(String::from("Hi"))],
+    };
+
+    screen.run();
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-11/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-11/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-11/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-11/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-11/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-11/src/main.rs
new file mode 100644
index 0000000000..d99170a973
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-11/src/main.rs
@@ -0,0 +1,20 @@
+// ANCHOR: all
+use blog::Post;
+
+// ANCHOR: here
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+    // ANCHOR_END: here
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+    // ANCHOR: here
+}
+// ANCHOR_END: here
+// ANCHOR_END: all
diff --git a/src/doc/book/listings/ch17-oop/listing-17-12/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-12/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-12/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-12/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-12/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-12/src/lib.rs
new file mode 100644
index 0000000000..b8156c39de
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-12/src/lib.rs
@@ -0,0 +1,19 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+impl Post {
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+}
+
+trait State {}
+
+struct Draft {}
+
+impl State for Draft {}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-12/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-12/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-12/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-13/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-13/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-13/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-13/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-13/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-13/src/lib.rs
new file mode 100644
index 0000000000..0ae3fa6e81
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-13/src/lib.rs
@@ -0,0 +1,30 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+// ANCHOR: here
+impl Post {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+
+    // ANCHOR: here
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+}
+// ANCHOR_END: here
+
+trait State {}
+
+struct Draft {}
+
+impl State for Draft {}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-13/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-13/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-13/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-14/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-14/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-14/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-14/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-14/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-14/src/lib.rs
new file mode 100644
index 0000000000..0d010f50c5
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-14/src/lib.rs
@@ -0,0 +1,34 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+// ANCHOR: here
+impl Post {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    // ANCHOR: here
+    pub fn content(&self) -> &str {
+        ""
+    }
+}
+// ANCHOR_END: here
+
+trait State {}
+
+struct Draft {}
+
+impl State for Draft {}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-14/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-14/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-14/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-15/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-15/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-15/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-15/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-15/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-15/src/lib.rs
new file mode 100644
index 0000000000..806b4e49db
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-15/src/lib.rs
@@ -0,0 +1,54 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+// ANCHOR: here
+impl Post {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    pub fn content(&self) -> &str {
+        ""
+    }
+
+    // ANCHOR: here
+    pub fn request_review(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.request_review())
+        }
+    }
+}
+
+trait State {
+    fn request_review(self: Box<Self>) -> Box<dyn State>;
+}
+
+struct Draft {}
+
+impl State for Draft {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        Box::new(PendingReview {})
+    }
+}
+
+struct PendingReview {}
+
+impl State for PendingReview {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-15/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-15/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-15/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-16/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-16/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-16/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-16/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-16/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-16/src/lib.rs
new file mode 100644
index 0000000000..92cb298134
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-16/src/lib.rs
@@ -0,0 +1,85 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+// ANCHOR: here
+impl Post {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    pub fn content(&self) -> &str {
+        ""
+    }
+
+    pub fn request_review(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.request_review())
+        }
+    }
+
+    // ANCHOR: here
+    pub fn approve(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.approve())
+        }
+    }
+}
+
+trait State {
+    fn request_review(self: Box<Self>) -> Box<dyn State>;
+    fn approve(self: Box<Self>) -> Box<dyn State>;
+}
+
+struct Draft {}
+
+impl State for Draft {
+    // --snip--
+    // ANCHOR_END: here
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        Box::new(PendingReview {})
+    }
+
+    // ANCHOR: here
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+}
+
+struct PendingReview {}
+
+impl State for PendingReview {
+    // --snip--
+    // ANCHOR_END: here
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    // ANCHOR: here
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        Box::new(Published {})
+    }
+}
+
+struct Published {}
+
+impl State for Published {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-16/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-16/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-16/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-17/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-17/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-17/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-17/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-17/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-17/src/lib.rs
new file mode 100644
index 0000000000..0beee7b8da
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-17/src/lib.rs
@@ -0,0 +1,82 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+// ANCHOR: here
+impl Post {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    // ANCHOR: here
+    pub fn content(&self) -> &str {
+        self.state.as_ref().unwrap().content(self)
+    }
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn request_review(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.request_review())
+        }
+    }
+
+    pub fn approve(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.approve())
+        }
+    }
+    // ANCHOR: here
+}
+// ANCHOR_END: here
+
+trait State {
+    fn request_review(self: Box<Self>) -> Box<dyn State>;
+    fn approve(self: Box<Self>) -> Box<dyn State>;
+}
+
+struct Draft {}
+
+impl State for Draft {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        Box::new(PendingReview {})
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+}
+
+struct PendingReview {}
+
+impl State for PendingReview {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        Box::new(Published {})
+    }
+}
+
+struct Published {}
+
+impl State for Published {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-17/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-17/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-17/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-18/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-18/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-18/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-18/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-18/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-18/src/lib.rs
new file mode 100644
index 0000000000..1bac8a87aa
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-18/src/lib.rs
@@ -0,0 +1,94 @@
+pub struct Post {
+    state: Option<Box<dyn State>>,
+    content: String,
+}
+
+impl Post {
+    pub fn new() -> Post {
+        Post {
+            state: Some(Box::new(Draft {})),
+            content: String::new(),
+        }
+    }
+
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    pub fn content(&self) -> &str {
+        self.state.as_ref().unwrap().content(self)
+    }
+
+    pub fn request_review(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.request_review())
+        }
+    }
+
+    pub fn approve(&mut self) {
+        if let Some(s) = self.state.take() {
+            self.state = Some(s.approve())
+        }
+    }
+}
+
+// ANCHOR: here
+trait State {
+    // --snip--
+    // ANCHOR_END: here
+    fn request_review(self: Box<Self>) -> Box<dyn State>;
+    fn approve(self: Box<Self>) -> Box<dyn State>;
+
+    // ANCHOR: here
+    fn content<'a>(&self, post: &'a Post) -> &'a str {
+        ""
+    }
+}
+
+// --snip--
+// ANCHOR_END: here
+
+struct Draft {}
+
+impl State for Draft {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        Box::new(PendingReview {})
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+}
+
+struct PendingReview {}
+
+impl State for PendingReview {
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        Box::new(Published {})
+    }
+}
+
+// ANCHOR: here
+struct Published {}
+
+impl State for Published {
+    // --snip--
+    // ANCHOR_END: here
+    fn request_review(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    fn approve(self: Box<Self>) -> Box<dyn State> {
+        self
+    }
+
+    // ANCHOR: here
+    fn content<'a>(&self, post: &'a Post) -> &'a str {
+        &post.content
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-18/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-18/src/main.rs
new file mode 100644
index 0000000000..14b4c0824c
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-18/src/main.rs
@@ -0,0 +1,14 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+    assert_eq!("", post.content());
+
+    post.request_review();
+    assert_eq!("", post.content());
+
+    post.approve();
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-19/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-19/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-19/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-19/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-19/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-19/src/lib.rs
new file mode 100644
index 0000000000..bfe034eaf1
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-19/src/lib.rs
@@ -0,0 +1,25 @@
+pub struct Post {
+    content: String,
+}
+
+pub struct DraftPost {
+    content: String,
+}
+
+impl Post {
+    pub fn new() -> DraftPost {
+        DraftPost {
+            content: String::new(),
+        }
+    }
+
+    pub fn content(&self) -> &str {
+        &self.content
+    }
+}
+
+impl DraftPost {
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-20/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-20/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-20/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-20/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-20/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-20/src/lib.rs
new file mode 100644
index 0000000000..3b82ec05dc
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-20/src/lib.rs
@@ -0,0 +1,48 @@
+pub struct Post {
+    content: String,
+}
+
+pub struct DraftPost {
+    content: String,
+}
+
+impl Post {
+    pub fn new() -> DraftPost {
+        DraftPost {
+            content: String::new(),
+        }
+    }
+
+    pub fn content(&self) -> &str {
+        &self.content
+    }
+}
+
+// ANCHOR: here
+impl DraftPost {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    // ANCHOR: here
+    pub fn request_review(self) -> PendingReviewPost {
+        PendingReviewPost {
+            content: self.content,
+        }
+    }
+}
+
+pub struct PendingReviewPost {
+    content: String,
+}
+
+impl PendingReviewPost {
+    pub fn approve(self) -> Post {
+        Post {
+            content: self.content,
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch17-oop/listing-17-21/Cargo.lock b/src/doc/book/listings/ch17-oop/listing-17-21/Cargo.lock
new file mode 100644
index 0000000000..b6f4232c60
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "blog"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/listing-17-21/Cargo.toml b/src/doc/book/listings/ch17-oop/listing-17-21/Cargo.toml
new file mode 100644
index 0000000000..9a395e23ad
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "blog"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/listing-17-21/src/lib.rs b/src/doc/book/listings/ch17-oop/listing-17-21/src/lib.rs
new file mode 100644
index 0000000000..38500a651b
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-21/src/lib.rs
@@ -0,0 +1,43 @@
+pub struct Post {
+    content: String,
+}
+
+pub struct DraftPost {
+    content: String,
+}
+
+impl Post {
+    pub fn new() -> DraftPost {
+        DraftPost {
+            content: String::new(),
+        }
+    }
+
+    pub fn content(&self) -> &str {
+        &self.content
+    }
+}
+
+impl DraftPost {
+    pub fn add_text(&mut self, text: &str) {
+        self.content.push_str(text);
+    }
+
+    pub fn request_review(self) -> PendingReviewPost {
+        PendingReviewPost {
+            content: self.content,
+        }
+    }
+}
+
+pub struct PendingReviewPost {
+    content: String,
+}
+
+impl PendingReviewPost {
+    pub fn approve(self) -> Post {
+        Post {
+            content: self.content,
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch17-oop/listing-17-21/src/main.rs b/src/doc/book/listings/ch17-oop/listing-17-21/src/main.rs
new file mode 100644
index 0000000000..720c55e6aa
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/listing-17-21/src/main.rs
@@ -0,0 +1,13 @@
+use blog::Post;
+
+fn main() {
+    let mut post = Post::new();
+
+    post.add_text("I ate a salad for lunch today");
+
+    let post = post.request_review();
+
+    let post = post.approve();
+
+    assert_eq!("I ate a salad for lunch today", post.content());
+}
diff --git a/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.lock b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.lock
new file mode 100644
index 0000000000..00d7b21826
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "gui"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.toml b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.toml
new file mode 100644
index 0000000000..1f61cd20ec
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "gui"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt
new file mode 100644
index 0000000000..33a492556d
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt
@@ -0,0 +1,16 @@
+$ cargo build
+   Compiling gui v0.1.0 (file:///projects/gui)
+error[E0038]: the trait `std::clone::Clone` cannot be made into an object
+ --> src/lib.rs:2:5
+  |
+2 |     pub components: Vec<Box<dyn Clone>>,
+  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone` cannot be made into an object
+  |
+  = note: the trait cannot require that `Self : Sized`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0038`.
+error: could not compile `gui`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/src/lib.rs b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/src/lib.rs
new file mode 100644
index 0000000000..e6b1a37f0a
--- /dev/null
+++ b/src/doc/book/listings/ch17-oop/no-listing-01-trait-object-of-clone/src/lib.rs
@@ -0,0 +1,3 @@
+pub struct Screen {
+    pub components: Vec<Box<dyn Clone>>,
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/src/main.rs
new file mode 100644
index 0000000000..d28c369f56
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-01/src/main.rs
@@ -0,0 +1,19 @@
+fn main() {
+    let favorite_color: Option<&str> = None;
+    let is_tuesday = false;
+    let age: Result<u8, _> = "34".parse();
+
+    if let Some(color) = favorite_color {
+        println!("Using your favorite color, {}, as the background", color);
+    } else if is_tuesday {
+        println!("Tuesday is green day!");
+    } else if let Ok(age) = age {
+        if age > 30 {
+            println!("Using purple as the background color");
+        } else {
+            println!("Using orange as the background color");
+        }
+    } else {
+        println!("Using blue as the background color");
+    }
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/src/main.rs
new file mode 100644
index 0000000000..5f75a4f2db
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-02/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    let mut stack = Vec::new();
+
+    stack.push(1);
+    stack.push(2);
+    stack.push(3);
+
+    while let Some(top) = stack.pop() {
+        println!("{}", top);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/output.txt b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/output.txt
new file mode 100644
index 0000000000..02fdecbf5c
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/output.txt
@@ -0,0 +1,7 @@
+$ cargo run
+   Compiling patterns v0.1.0 (file:///projects/patterns)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.52s
+     Running `target/debug/patterns`
+a is at index 0
+b is at index 1
+c is at index 2
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/src/main.rs
new file mode 100644
index 0000000000..eb922d62cd
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-03/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    let v = vec!['a', 'b', 'c'];
+
+    for (index, value) in v.iter().enumerate() {
+        println!("{} is at index {}", value, index);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/src/main.rs
new file mode 100644
index 0000000000..27b0c3fbdc
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-04/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // ANCHOR: here
+    let (x, y, z) = (1, 2, 3);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/output.txt b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/output.txt
new file mode 100644
index 0000000000..eae835e37c
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/output.txt
@@ -0,0 +1,17 @@
+$ cargo run
+   Compiling patterns v0.1.0 (file:///projects/patterns)
+error[E0308]: mismatched types
+ --> src/main.rs:2:9
+  |
+2 |     let (x, y) = (1, 2, 3);
+  |         ^^^^^^ expected a tuple with 3 elements, found one with 2 elements
+  |
+  = note: expected tuple `({integer}, {integer}, {integer})`
+             found tuple `(_, _)`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
+error: could not compile `patterns`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/src/main.rs
new file mode 100644
index 0000000000..39f768e29e
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-05/src/main.rs
@@ -0,0 +1,5 @@
+fn main() {
+    // ANCHOR: here
+    let (x, y) = (1, 2, 3);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/src/main.rs
new file mode 100644
index 0000000000..c5d71e6c13
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-06/src/main.rs
@@ -0,0 +1,7 @@
+// ANCHOR: here
+fn foo(x: i32) {
+    // code goes here
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/src/main.rs
new file mode 100644
index 0000000000..4eccb8088c
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-07/src/main.rs
@@ -0,0 +1,8 @@
+fn print_coordinates(&(x, y): &(i32, i32)) {
+    println!("Current location: ({}, {})", x, y);
+}
+
+fn main() {
+    let point = (3, 5);
+    print_coordinates(&point);
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/output.txt b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/output.txt
new file mode 100644
index 0000000000..551250ff87
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/output.txt
@@ -0,0 +1,21 @@
+$ cargo run
+   Compiling patterns v0.1.0 (file:///projects/patterns)
+error[E0005]: refutable pattern in local binding: `None` not covered
+ --> src/main.rs:3:9
+  |
+3 |     let Some(x) = some_option_value;
+  |         ^^^^^^^ pattern `None` not covered
+  |
+  = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+  = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+help: you might want to use `if let` to ignore the variant that isn't matched
+  |
+3 |     if let Some(x) = some_option_value { /* */ }
+  |
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
+error: could not compile `patterns`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/src/main.rs
new file mode 100644
index 0000000000..7baa02a49b
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-08/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let some_option_value: Option<i32> = None;
+    // ANCHOR: here
+    let Some(x) = some_option_value;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/src/main.rs
new file mode 100644
index 0000000000..d6274fc0e1
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-09/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    let some_option_value: Option<i32> = None;
+    // ANCHOR: here
+    if let Some(x) = some_option_value {
+        println!("{}", x);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/output.txt b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/output.txt
new file mode 100644
index 0000000000..8b72e18134
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/output.txt
@@ -0,0 +1,15 @@
+$ cargo run
+   Compiling patterns v0.1.0 (file:///projects/patterns)
+warning: irrefutable if-let pattern
+ --> src/main.rs:2:5
+  |
+2 | /     if let x = 5 {
+3 | |         println!("{}", x);
+4 | |     };
+  | |_____^
+  |
+  = note: `#[warn(irrefutable_let_patterns)]` on by default
+
+    Finished dev [unoptimized + debuginfo] target(s) in 0.39s
+     Running `target/debug/patterns`
+5
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/src/main.rs
new file mode 100644
index 0000000000..cb81772e0c
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-10/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    if let x = 5 {
+        println!("{}", x);
+    };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/src/main.rs
new file mode 100644
index 0000000000..25eaa79ff8
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-11/src/main.rs
@@ -0,0 +1,14 @@
+fn main() {
+    // ANCHOR: here
+    let x = Some(5);
+    let y = 10;
+
+    match x {
+        Some(50) => println!("Got 50"),
+        Some(y) => println!("Matched, y = {:?}", y),
+        _ => println!("Default case, x = {:?}", x),
+    }
+
+    println!("at the end: x = {:?}, y = {:?}", x, y);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/src/main.rs
new file mode 100644
index 0000000000..62f4ccbf1e
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-12/src/main.rs
@@ -0,0 +1,12 @@
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+fn main() {
+    let p = Point { x: 0, y: 7 };
+
+    let Point { x: a, y: b } = p;
+    assert_eq!(0, a);
+    assert_eq!(7, b);
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/src/main.rs
new file mode 100644
index 0000000000..5badc1594f
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-13/src/main.rs
@@ -0,0 +1,12 @@
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+fn main() {
+    let p = Point { x: 0, y: 7 };
+
+    let Point { x, y } = p;
+    assert_eq!(0, x);
+    assert_eq!(7, y);
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/src/main.rs
new file mode 100644
index 0000000000..8d445d9b9d
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-14/src/main.rs
@@ -0,0 +1,16 @@
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+// ANCHOR: here
+fn main() {
+    let p = Point { x: 0, y: 7 };
+
+    match p {
+        Point { x, y: 0 } => println!("On the x axis at {}", x),
+        Point { x: 0, y } => println!("On the y axis at {}", y),
+        Point { x, y } => println!("On neither axis: ({}, {})", x, y),
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/src/main.rs
new file mode 100644
index 0000000000..9b8dac1938
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-15/src/main.rs
@@ -0,0 +1,27 @@
+enum Message {
+    Quit,
+    Move { x: i32, y: i32 },
+    Write(String),
+    ChangeColor(i32, i32, i32),
+}
+
+fn main() {
+    let msg = Message::ChangeColor(0, 160, 255);
+
+    match msg {
+        Message::Quit => {
+            println!("The Quit variant has no data to destructure.")
+        }
+        Message::Move { x, y } => {
+            println!(
+                "Move in the x direction {} and in the y direction {}",
+                x, y
+            );
+        }
+        Message::Write(text) => println!("Text message: {}", text),
+        Message::ChangeColor(r, g, b) => println!(
+            "Change the color to red {}, green {}, and blue {}",
+            r, g, b
+        ),
+    }
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/src/main.rs
new file mode 100644
index 0000000000..ed6a20bf47
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-16/src/main.rs
@@ -0,0 +1,27 @@
+enum Color {
+    Rgb(i32, i32, i32),
+    Hsv(i32, i32, i32),
+}
+
+enum Message {
+    Quit,
+    Move { x: i32, y: i32 },
+    Write(String),
+    ChangeColor(Color),
+}
+
+fn main() {
+    let msg = Message::ChangeColor(Color::Hsv(0, 160, 255));
+
+    match msg {
+        Message::ChangeColor(Color::Rgb(r, g, b)) => println!(
+            "Change the color to red {}, green {}, and blue {}",
+            r, g, b
+        ),
+        Message::ChangeColor(Color::Hsv(h, s, v)) => println!(
+            "Change the color to hue {}, saturation {}, and value {}",
+            h, s, v
+        ),
+        _ => (),
+    }
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/src/main.rs
new file mode 100644
index 0000000000..cf1fbe0721
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-17/src/main.rs
@@ -0,0 +1,7 @@
+fn foo(_: i32, y: i32) {
+    println!("This code only uses the y parameter: {}", y);
+}
+
+fn main() {
+    foo(3, 4);
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/src/main.rs
new file mode 100644
index 0000000000..b776c64c42
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-18/src/main.rs
@@ -0,0 +1,17 @@
+fn main() {
+    // ANCHOR: here
+    let mut setting_value = Some(5);
+    let new_setting_value = Some(10);
+
+    match (setting_value, new_setting_value) {
+        (Some(_), Some(_)) => {
+            println!("Can't overwrite an existing customized value");
+        }
+        _ => {
+            setting_value = new_setting_value;
+        }
+    }
+
+    println!("setting is {:?}", setting_value);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/src/main.rs
new file mode 100644
index 0000000000..59b48c94d8
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-19/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let numbers = (2, 4, 8, 16, 32);
+
+    match numbers {
+        (first, _, third, _, fifth) => {
+            println!("Some numbers: {}, {}, {}", first, third, fifth)
+        }
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/src/main.rs
new file mode 100644
index 0000000000..1ffc46bad3
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-20/src/main.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let _x = 5;
+    let y = 10;
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/src/main.rs
new file mode 100644
index 0000000000..980610503f
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-21/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let s = Some(String::from("Hello!"));
+
+    if let Some(_s) = s {
+        println!("found a string");
+    }
+
+    println!("{:?}", s);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/src/main.rs
new file mode 100644
index 0000000000..e2faa345bc
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-22/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let s = Some(String::from("Hello!"));
+
+    if let Some(_) = s {
+        println!("found a string");
+    }
+
+    println!("{:?}", s);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/src/main.rs
new file mode 100644
index 0000000000..7a9d9bb36f
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-23/src/main.rs
@@ -0,0 +1,15 @@
+fn main() {
+    // ANCHOR: here
+    struct Point {
+        x: i32,
+        y: i32,
+        z: i32,
+    }
+
+    let origin = Point { x: 0, y: 0, z: 0 };
+
+    match origin {
+        Point { x, .. } => println!("x is {}", x),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/src/main.rs
new file mode 100644
index 0000000000..f22dbe8edf
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-24/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let numbers = (2, 4, 8, 16, 32);
+
+    match numbers {
+        (first, .., last) => {
+            println!("Some numbers: {}, {}", first, last);
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.lock
new file mode 100644
index 0000000000..a233623e55
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.lock
@@ -0,0 +1,4 @@
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/output.txt b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/output.txt
new file mode 100644
index 0000000000..3044c4b30c
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/output.txt
@@ -0,0 +1,15 @@
+$ cargo run
+   Compiling patterns v0.1.0 (file:///projects/patterns)
+error: `..` can only be used once per tuple pattern
+ --> src/main.rs:5:22
+  |
+5 |         (.., second, ..) => {
+  |          --          ^^ can only be used once per tuple pattern
+  |          |
+  |          previously used here
+
+error: aborting due to previous error
+
+error: could not compile `patterns`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/rustfmt-ignore b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/rustfmt-ignore
new file mode 100644
index 0000000000..06a976dd46
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/rustfmt-ignore
@@ -0,0 +1 @@
+This listing deliberately doesn't parse so rustfmt fails.
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/src/main.rs
new file mode 100644
index 0000000000..b90884eb9c
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-25/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let numbers = (2, 4, 8, 16, 32);
+
+    match numbers {
+        (.., second, ..) => {
+            println!("Some numbers: {}", second)
+        },
+    }
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/src/main.rs
new file mode 100644
index 0000000000..4ec86cba76
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-26/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let num = Some(4);
+
+    match num {
+        Some(x) if x < 5 => println!("less than five: {}", x),
+        Some(x) => println!("{}", x),
+        None => (),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/src/main.rs
new file mode 100644
index 0000000000..348e367233
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-27/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    let x = Some(5);
+    let y = 10;
+
+    match x {
+        Some(50) => println!("Got 50"),
+        Some(n) if n == y => println!("Matched, n = {}", n),
+        _ => println!("Default case, x = {:?}", x),
+    }
+
+    println!("at the end: x = {:?}, y = {}", x, y);
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/src/main.rs
new file mode 100644
index 0000000000..15804553fa
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-28/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let x = 4;
+    let y = false;
+
+    match x {
+        4 | 5 | 6 if y => println!("yes"),
+        _ => println!("no"),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/src/main.rs
new file mode 100644
index 0000000000..3514deb636
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/listing-18-29/src/main.rs
@@ -0,0 +1,19 @@
+fn main() {
+    // ANCHOR: here
+    enum Message {
+        Hello { id: i32 },
+    }
+
+    let msg = Message::Hello { id: 5 };
+
+    match msg {
+        Message::Hello {
+            id: id_variable @ 3..=7,
+        } => println!("Found an id in range: {}", id_variable),
+        Message::Hello { id: 10..=12 } => {
+            println!("Found an id in another range")
+        }
+        Message::Hello { id } => println!("Found some other id: {}", id),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/src/main.rs
new file mode 100644
index 0000000000..7978e1adeb
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-01-literals/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    let x = 1;
+
+    match x {
+        1 => println!("one"),
+        2 => println!("two"),
+        3 => println!("three"),
+        _ => println!("anything"),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/src/main.rs
new file mode 100644
index 0000000000..e52d815d84
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let x = 1;
+
+    match x {
+        1 | 2 => println!("one or two"),
+        3 => println!("three"),
+        _ => println!("anything"),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/src/main.rs
new file mode 100644
index 0000000000..a3ebe7af06
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-03-ranges/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    let x = 5;
+
+    match x {
+        1..=5 => println!("one through five"),
+        _ => println!("something else"),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/src/main.rs
new file mode 100644
index 0000000000..8cebfef5ed
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/src/main.rs
@@ -0,0 +1,11 @@
+fn main() {
+    // ANCHOR: here
+    let x = 'c';
+
+    match x {
+        'a'..='j' => println!("early ASCII letter"),
+        'k'..='z' => println!("late ASCII letter"),
+        _ => println!("something else"),
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.lock b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.lock
new file mode 100644
index 0000000000..2b4fa29032
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "patterns"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.toml b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.toml
new file mode 100644
index 0000000000..f77be077b9
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "patterns"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/src/main.rs b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/src/main.rs
new file mode 100644
index 0000000000..962d093491
--- /dev/null
+++ b/src/doc/book/listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    struct Point {
+        x: i32,
+        y: i32,
+    }
+
+    // ANCHOR: here
+    let ((feet, inches), Point { x, y }) = ((3, 10), Point { x: 3, y: -10 });
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.lock
new file mode 100644
index 0000000000..58b70c5b74
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "counter"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.toml
new file mode 100644
index 0000000000..4eb29e80c1
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "counter"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/src/lib.rs
new file mode 100644
index 0000000000..b71b54fbce
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-13-21-reproduced/src/lib.rs
@@ -0,0 +1,27 @@
+struct Counter {
+    count: u32,
+}
+
+impl Counter {
+    fn new() -> Counter {
+        Counter { count: 0 }
+    }
+}
+
+// ANCHOR: ch19
+impl Iterator for Counter {
+    type Item = u32;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        // --snip--
+        // ANCHOR_END: ch19
+        if self.count < 5 {
+            self.count += 1;
+            Some(self.count)
+        } else {
+            None
+        }
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-01/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-01/src/main.rs
new file mode 100644
index 0000000000..893f578905
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-01/src/main.rs
@@ -0,0 +1,8 @@
+fn main() {
+    // ANCHOR: here
+    let mut num = 5;
+
+    let r1 = &num as *const i32;
+    let r2 = &mut num as *mut i32;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-02/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-02/src/main.rs
new file mode 100644
index 0000000000..849629a7cc
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-02/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let address = 0x012345usize;
+    let r = address as *const i32;
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-03/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-03/src/main.rs
new file mode 100644
index 0000000000..02a0be6b0e
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-03/src/main.rs
@@ -0,0 +1,13 @@
+fn main() {
+    // ANCHOR: here
+    let mut num = 5;
+
+    let r1 = &num as *const i32;
+    let r2 = &mut num as *mut i32;
+
+    unsafe {
+        println!("r1 is: {}", *r1);
+        println!("r2 is: {}", *r2);
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-04/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-04/src/main.rs
new file mode 100644
index 0000000000..6ac58442db
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-04/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: here
+    let mut v = vec![1, 2, 3, 4, 5, 6];
+
+    let r = &mut v[..];
+
+    let (a, b) = r.split_at_mut(3);
+
+    assert_eq!(a, &mut [1, 2, 3]);
+    assert_eq!(b, &mut [4, 5, 6]);
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-05/output.txt b/src/doc/book/listings/ch19-advanced-features/listing-19-05/output.txt
new file mode 100644
index 0000000000..3df0e2b64c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-05/output.txt
@@ -0,0 +1,21 @@
+$ cargo run
+   Compiling unsafe-example v0.1.0 (file:///projects/unsafe-example)
+error[E0499]: cannot borrow `*slice` as mutable more than once at a time
+ --> src/main.rs:6:30
+  |
+1 | fn split_at_mut(slice: &mut [i32], mid: usize) -> (&mut [i32], &mut [i32]) {
+  |                        - let's call the lifetime of this reference `'1`
+...
+6 |     (&mut slice[..mid], &mut slice[mid..])
+  |     -------------------------^^^^^--------
+  |     |     |                  |
+  |     |     |                  second mutable borrow occurs here
+  |     |     first mutable borrow occurs here
+  |     returning this value requires that `*slice` is borrowed for `'1`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0499`.
+error: could not compile `unsafe-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-05/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-05/src/main.rs
new file mode 100644
index 0000000000..c4b83effaf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-05/src/main.rs
@@ -0,0 +1,14 @@
+// ANCHOR: here
+fn split_at_mut(slice: &mut [i32], mid: usize) -> (&mut [i32], &mut [i32]) {
+    let len = slice.len();
+
+    assert!(mid <= len);
+
+    (&mut slice[..mid], &mut slice[mid..])
+}
+// ANCHOR_END: here
+
+fn main() {
+    let mut vector = vec![1, 2, 3, 4, 5, 6];
+    let (left, right) = split_at_mut(&mut vector, 3);
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-06/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-06/src/main.rs
new file mode 100644
index 0000000000..f25cbf49d9
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-06/src/main.rs
@@ -0,0 +1,22 @@
+// ANCHOR: here
+use std::slice;
+
+fn split_at_mut(slice: &mut [i32], mid: usize) -> (&mut [i32], &mut [i32]) {
+    let len = slice.len();
+    let ptr = slice.as_mut_ptr();
+
+    assert!(mid <= len);
+
+    unsafe {
+        (
+            slice::from_raw_parts_mut(ptr, mid),
+            slice::from_raw_parts_mut(ptr.add(mid), len - mid),
+        )
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let mut vector = vec![1, 2, 3, 4, 5, 6];
+    let (left, right) = split_at_mut(&mut vector, 3);
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-07/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-07/src/main.rs
new file mode 100644
index 0000000000..0ab39ae1d2
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-07/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    use std::slice;
+
+    let address = 0x01234usize;
+    let r = address as *mut i32;
+
+    let slice: &[i32] = unsafe { slice::from_raw_parts_mut(r, 10000) };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-08/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-08/src/main.rs
new file mode 100644
index 0000000000..8b56630c95
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-08/src/main.rs
@@ -0,0 +1,9 @@
+extern "C" {
+    fn abs(input: i32) -> i32;
+}
+
+fn main() {
+    unsafe {
+        println!("Absolute value of -3 according to C: {}", abs(-3));
+    }
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-09/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-09/src/main.rs
new file mode 100644
index 0000000000..82a4b4219f
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-09/src/main.rs
@@ -0,0 +1,5 @@
+static HELLO_WORLD: &str = "Hello, world!";
+
+fn main() {
+    println!("name is: {}", HELLO_WORLD);
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-10/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-10/src/main.rs
new file mode 100644
index 0000000000..e8dab68e0d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-10/src/main.rs
@@ -0,0 +1,15 @@
+static mut COUNTER: u32 = 0;
+
+fn add_to_count(inc: u32) {
+    unsafe {
+        COUNTER += inc;
+    }
+}
+
+fn main() {
+    add_to_count(3);
+
+    unsafe {
+        println!("COUNTER: {}", COUNTER);
+    }
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-11/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-11/src/main.rs
new file mode 100644
index 0000000000..885c1aa1d8
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-11/src/main.rs
@@ -0,0 +1,9 @@
+unsafe trait Foo {
+    // methods go here
+}
+
+unsafe impl Foo for i32 {
+    // method implementations go here
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-12/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-12/src/lib.rs
new file mode 100644
index 0000000000..dbe04620ef
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-12/src/lib.rs
@@ -0,0 +1,5 @@
+pub trait Iterator {
+    type Item;
+
+    fn next(&mut self) -> Option<Self::Item>;
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-13/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-13/src/lib.rs
new file mode 100644
index 0000000000..7c9479c5b5
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-13/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait Iterator<T> {
+    fn next(&mut self) -> Option<T>;
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-14/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-14/src/main.rs
new file mode 100644
index 0000000000..7dea568d92
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-14/src/main.rs
@@ -0,0 +1,25 @@
+use std::ops::Add;
+
+#[derive(Debug, PartialEq)]
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+impl Add for Point {
+    type Output = Point;
+
+    fn add(self, other: Point) -> Point {
+        Point {
+            x: self.x + other.x,
+            y: self.y + other.y,
+        }
+    }
+}
+
+fn main() {
+    assert_eq!(
+        Point { x: 1, y: 0 } + Point { x: 2, y: 3 },
+        Point { x: 3, y: 3 }
+    );
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-15/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-15/src/lib.rs
new file mode 100644
index 0000000000..f38bf475c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-15/src/lib.rs
@@ -0,0 +1,12 @@
+use std::ops::Add;
+
+struct Millimeters(u32);
+struct Meters(u32);
+
+impl Add<Meters> for Millimeters {
+    type Output = Millimeters;
+
+    fn add(self, other: Meters) -> Millimeters {
+        Millimeters(self.0 + (other.0 * 1000))
+    }
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-16/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-16/src/main.rs
new file mode 100644
index 0000000000..d854e287df
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-16/src/main.rs
@@ -0,0 +1,31 @@
+// ANCHOR: here
+trait Pilot {
+    fn fly(&self);
+}
+
+trait Wizard {
+    fn fly(&self);
+}
+
+struct Human;
+
+impl Pilot for Human {
+    fn fly(&self) {
+        println!("This is your captain speaking.");
+    }
+}
+
+impl Wizard for Human {
+    fn fly(&self) {
+        println!("Up!");
+    }
+}
+
+impl Human {
+    fn fly(&self) {
+        println!("*waving arms furiously*");
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-17/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-17/src/main.rs
new file mode 100644
index 0000000000..3df65a7ce2
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-17/src/main.rs
@@ -0,0 +1,34 @@
+trait Pilot {
+    fn fly(&self);
+}
+
+trait Wizard {
+    fn fly(&self);
+}
+
+struct Human;
+
+impl Pilot for Human {
+    fn fly(&self) {
+        println!("This is your captain speaking.");
+    }
+}
+
+impl Wizard for Human {
+    fn fly(&self) {
+        println!("Up!");
+    }
+}
+
+impl Human {
+    fn fly(&self) {
+        println!("*waving arms furiously*");
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    let person = Human;
+    person.fly();
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-18/output.txt b/src/doc/book/listings/ch19-advanced-features/listing-19-18/output.txt
new file mode 100644
index 0000000000..2e9da17d65
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-18/output.txt
@@ -0,0 +1,7 @@
+$ cargo run
+   Compiling traits-example v0.1.0 (file:///projects/traits-example)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.46s
+     Running `target/debug/traits-example`
+This is your captain speaking.
+Up!
+*waving arms furiously*
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-18/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-18/src/main.rs
new file mode 100644
index 0000000000..fa01c09ccc
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-18/src/main.rs
@@ -0,0 +1,36 @@
+trait Pilot {
+    fn fly(&self);
+}
+
+trait Wizard {
+    fn fly(&self);
+}
+
+struct Human;
+
+impl Pilot for Human {
+    fn fly(&self) {
+        println!("This is your captain speaking.");
+    }
+}
+
+impl Wizard for Human {
+    fn fly(&self) {
+        println!("Up!");
+    }
+}
+
+impl Human {
+    fn fly(&self) {
+        println!("*waving arms furiously*");
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    let person = Human;
+    Pilot::fly(&person);
+    Wizard::fly(&person);
+    person.fly();
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-19/output.txt b/src/doc/book/listings/ch19-advanced-features/listing-19-19/output.txt
new file mode 100644
index 0000000000..087e802b1a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-19/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling traits-example v0.1.0 (file:///projects/traits-example)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.54s
+     Running `target/debug/traits-example`
+A baby dog is called a Spot
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-19/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-19/src/main.rs
new file mode 100644
index 0000000000..44affe0ee2
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-19/src/main.rs
@@ -0,0 +1,21 @@
+trait Animal {
+    fn baby_name() -> String;
+}
+
+struct Dog;
+
+impl Dog {
+    fn baby_name() -> String {
+        String::from("Spot")
+    }
+}
+
+impl Animal for Dog {
+    fn baby_name() -> String {
+        String::from("puppy")
+    }
+}
+
+fn main() {
+    println!("A baby dog is called a {}", Dog::baby_name());
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-20/output.txt b/src/doc/book/listings/ch19-advanced-features/listing-19-20/output.txt
new file mode 100644
index 0000000000..46c7dafa0a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-20/output.txt
@@ -0,0 +1,19 @@
+$ cargo run
+   Compiling traits-example v0.1.0 (file:///projects/traits-example)
+error[E0283]: type annotations needed
+  --> src/main.rs:20:43
+   |
+2  |     fn baby_name() -> String;
+   |     ------------------------- required by `Animal::baby_name`
+...
+20 |     println!("A baby dog is called a {}", Animal::baby_name());
+   |                                           ^^^^^^^^^^^^^^^^^ cannot infer type
+   |
+   = note: cannot resolve `_: Animal`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0283`.
+error: could not compile `traits-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-20/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-20/src/main.rs
new file mode 100644
index 0000000000..8e295c9b65
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-20/src/main.rs
@@ -0,0 +1,23 @@
+trait Animal {
+    fn baby_name() -> String;
+}
+
+struct Dog;
+
+impl Dog {
+    fn baby_name() -> String {
+        String::from("Spot")
+    }
+}
+
+impl Animal for Dog {
+    fn baby_name() -> String {
+        String::from("puppy")
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    println!("A baby dog is called a {}", Animal::baby_name());
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-21/output.txt b/src/doc/book/listings/ch19-advanced-features/listing-19-21/output.txt
new file mode 100644
index 0000000000..4d1ee5ab48
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-21/output.txt
@@ -0,0 +1,5 @@
+$ cargo run
+   Compiling traits-example v0.1.0 (file:///projects/traits-example)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.48s
+     Running `target/debug/traits-example`
+A baby dog is called a puppy
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-21/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-21/src/main.rs
new file mode 100644
index 0000000000..b1df728951
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-21/src/main.rs
@@ -0,0 +1,23 @@
+trait Animal {
+    fn baby_name() -> String;
+}
+
+struct Dog;
+
+impl Dog {
+    fn baby_name() -> String {
+        String::from("Spot")
+    }
+}
+
+impl Animal for Dog {
+    fn baby_name() -> String {
+        String::from("puppy")
+    }
+}
+
+// ANCHOR: here
+fn main() {
+    println!("A baby dog is called a {}", <Dog as Animal>::baby_name());
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-22/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-22/src/main.rs
new file mode 100644
index 0000000000..febe58b0c5
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-22/src/main.rs
@@ -0,0 +1,17 @@
+// ANCHOR: here
+use std::fmt;
+
+trait OutlinePrint: fmt::Display {
+    fn outline_print(&self) {
+        let output = self.to_string();
+        let len = output.len();
+        println!("{}", "*".repeat(len + 4));
+        println!("*{}*", " ".repeat(len + 2));
+        println!("* {} *", output);
+        println!("*{}*", " ".repeat(len + 2));
+        println!("{}", "*".repeat(len + 4));
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-23/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-23/src/main.rs
new file mode 100644
index 0000000000..eae46c92f3
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-23/src/main.rs
@@ -0,0 +1,14 @@
+use std::fmt;
+
+struct Wrapper(Vec<String>);
+
+impl fmt::Display for Wrapper {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "[{}]", self.0.join(", "))
+    }
+}
+
+fn main() {
+    let w = Wrapper(vec![String::from("hello"), String::from("world")]);
+    println!("w = {}", w);
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-24/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-24/src/main.rs
new file mode 100644
index 0000000000..d604ae8d6a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-24/src/main.rs
@@ -0,0 +1,16 @@
+fn main() {
+    // ANCHOR: here
+    let f: Box<dyn Fn() + Send + 'static> = Box::new(|| println!("hi"));
+
+    fn takes_long_type(f: Box<dyn Fn() + Send + 'static>) {
+        // --snip--
+    }
+
+    fn returns_long_type() -> Box<dyn Fn() + Send + 'static> {
+        // --snip--
+        // ANCHOR_END: here
+        Box::new(|| ())
+        // ANCHOR: here
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-25/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-25/src/main.rs
new file mode 100644
index 0000000000..af35bed2c9
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-25/src/main.rs
@@ -0,0 +1,18 @@
+fn main() {
+    // ANCHOR: here
+    type Thunk = Box<dyn Fn() + Send + 'static>;
+
+    let f: Thunk = Box::new(|| println!("hi"));
+
+    fn takes_long_type(f: Thunk) {
+        // --snip--
+    }
+
+    fn returns_long_type() -> Thunk {
+        // --snip--
+        // ANCHOR_END: here
+        Box::new(|| ())
+        // ANCHOR: here
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.lock
new file mode 100644
index 0000000000..b2327c755a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.toml
new file mode 100644
index 0000000000..2bed56c367
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-27/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-27/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-27/src/main.rs
new file mode 100644
index 0000000000..91b2cf04bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-27/src/main.rs
@@ -0,0 +1,13 @@
+fn add_one(x: i32) -> i32 {
+    x + 1
+}
+
+fn do_twice(f: fn(i32) -> i32, arg: i32) -> i32 {
+    f(arg) + f(arg)
+}
+
+fn main() {
+    let answer = do_twice(add_one, 5);
+
+    println!("The answer is: {}", answer);
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.lock
new file mode 100644
index 0000000000..b2d9257545
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "macros-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.toml
new file mode 100644
index 0000000000..1829b0fa66
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-28/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "macros-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-28/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-28/src/lib.rs
new file mode 100644
index 0000000000..7c7c4756c8
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-28/src/lib.rs
@@ -0,0 +1,12 @@
+#[macro_export]
+macro_rules! vec {
+    ( $( $x:expr ),* ) => {
+        {
+            let mut temp_vec = Vec::new();
+            $(
+                temp_vec.push($x);
+            )*
+            temp_vec
+        }
+    };
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.lock
new file mode 100644
index 0000000000..39afcf282f
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.toml
new file mode 100644
index 0000000000..5a93a685c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-30/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-30/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-30/src/main.rs
new file mode 100644
index 0000000000..468c30aa48
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-30/src/main.rs
@@ -0,0 +1,9 @@
+use hello_macro::HelloMacro;
+use hello_macro_derive::HelloMacro;
+
+#[derive(HelloMacro)]
+struct Pancakes;
+
+fn main() {
+    Pancakes::hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.lock
new file mode 100644
index 0000000000..39afcf282f
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.toml
new file mode 100644
index 0000000000..5a93a685c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.lock
new file mode 100644
index 0000000000..9a38c8ac26
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.lock
@@ -0,0 +1,46 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro_derive"
+version = "0.1.0"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.toml
new file mode 100644
index 0000000000..168cbae53c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "hello_macro_derive"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0"
+quote = "1.0"
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/src/lib.rs
new file mode 100644
index 0000000000..4bcec44e98
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/src/lib.rs
@@ -0,0 +1,15 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn;
+
+#[proc_macro_derive(HelloMacro)]
+pub fn hello_macro_derive(input: TokenStream) -> TokenStream {
+    // Construct a representation of Rust code as a syntax tree
+    // that we can manipulate
+    let ast = syn::parse(input).unwrap();
+
+    // Build the trait implementation
+    impl_hello_macro(&ast)
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/lib.rs
new file mode 100644
index 0000000000..e74793184b
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait HelloMacro {
+    fn hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/main.rs
new file mode 100644
index 0000000000..10b028b2d4
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-31/hello_macro/src/main.rs
@@ -0,0 +1,13 @@
+use hello_macro::HelloMacro;
+
+struct Pancakes;
+
+impl HelloMacro for Pancakes {
+    fn hello_macro() {
+        println!("Hello, Macro! My name is Pancakes!");
+    }
+}
+
+fn main() {
+    Pancakes::hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.lock
new file mode 100644
index 0000000000..39afcf282f
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.toml
new file mode 100644
index 0000000000..5a93a685c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.lock
new file mode 100644
index 0000000000..9a38c8ac26
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.lock
@@ -0,0 +1,46 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro_derive"
+version = "0.1.0"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.toml
new file mode 100644
index 0000000000..168cbae53c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "hello_macro_derive"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0"
+quote = "1.0"
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/src/lib.rs
new file mode 100644
index 0000000000..591f0c3591
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/src/lib.rs
@@ -0,0 +1,29 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn;
+
+#[proc_macro_derive(HelloMacro)]
+pub fn hello_macro_derive(input: TokenStream) -> TokenStream {
+    // Construct a representation of Rust code as a syntax tree
+    // that we can manipulate
+    let ast = syn::parse(input).unwrap();
+
+    // Build the trait implementation
+    impl_hello_macro(&ast)
+}
+
+// ANCHOR: here
+fn impl_hello_macro(ast: &syn::DeriveInput) -> TokenStream {
+    let name = &ast.ident;
+    let gen = quote! {
+        impl HelloMacro for #name {
+            fn hello_macro() {
+                println!("Hello, Macro! My name is {}!", stringify!(#name));
+            }
+        }
+    };
+    gen.into()
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/lib.rs
new file mode 100644
index 0000000000..e74793184b
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait HelloMacro {
+    fn hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/main.rs b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/main.rs
new file mode 100644
index 0000000000..10b028b2d4
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/listing-19-33/hello_macro/src/main.rs
@@ -0,0 +1,13 @@
+use hello_macro::HelloMacro;
+
+struct Pancakes;
+
+impl HelloMacro for Pancakes {
+    fn hello_macro() {
+        println!("Hello, Macro! My name is Pancakes!");
+    }
+}
+
+fn main() {
+    Pancakes::hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/src/main.rs
new file mode 100644
index 0000000000..21ecdbe5af
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-01-unsafe-fn/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    unsafe fn dangerous() {}
+
+    unsafe {
+        dangerous();
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/output.txt b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/output.txt
new file mode 100644
index 0000000000..e7a028e351
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/output.txt
@@ -0,0 +1,17 @@
+$ cargo run
+   Compiling traits-example v0.1.0 (file:///projects/traits-example)
+error[E0277]: `Point` doesn't implement `std::fmt::Display`
+  --> src/main.rs:20:6
+   |
+20 | impl OutlinePrint for Point {}
+   |      ^^^^^^^^^^^^ `Point` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `Point`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
+error: could not compile `traits-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/src/main.rs
new file mode 100644
index 0000000000..a1e2fe4c46
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/src/main.rs
@@ -0,0 +1,27 @@
+use std::fmt;
+
+trait OutlinePrint: fmt::Display {
+    fn outline_print(&self) {
+        let output = self.to_string();
+        let len = output.len();
+        println!("{}", "*".repeat(len + 4));
+        println!("*{}*", " ".repeat(len + 2));
+        println!("* {} *", output);
+        println!("*{}*", " ".repeat(len + 2));
+        println!("{}", "*".repeat(len + 4));
+    }
+}
+
+// ANCHOR: here
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+impl OutlinePrint for Point {}
+// ANCHOR_END: here
+
+fn main() {
+    let p = Point { x: 1, y: 3 };
+    p.outline_print();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/src/main.rs
new file mode 100644
index 0000000000..c7bbb6a708
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-03-impl-display-for-point/src/main.rs
@@ -0,0 +1,33 @@
+trait OutlinePrint: fmt::Display {
+    fn outline_print(&self) {
+        let output = self.to_string();
+        let len = output.len();
+        println!("{}", "*".repeat(len + 4));
+        println!("*{}*", " ".repeat(len + 2));
+        println!("* {} *", output);
+        println!("*{}*", " ".repeat(len + 2));
+        println!("{}", "*".repeat(len + 4));
+    }
+}
+
+struct Point {
+    x: i32,
+    y: i32,
+}
+
+impl OutlinePrint for Point {}
+
+// ANCHOR: here
+use std::fmt;
+
+impl fmt::Display for Point {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "({}, {})", self.x, self.y)
+    }
+}
+// ANCHOR_END: here
+
+fn main() {
+    let p = Point { x: 1, y: 3 };
+    p.outline_print();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/src/main.rs
new file mode 100644
index 0000000000..d3fe32e2f0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-04-kilometers-alias/src/main.rs
@@ -0,0 +1,12 @@
+fn main() {
+    // ANCHOR: there
+    // ANCHOR: here
+    type Kilometers = i32;
+    // ANCHOR_END: here
+
+    let x: i32 = 5;
+    let y: Kilometers = 5;
+
+    println!("x + y = {}", x + y);
+    // ANCHOR_END: there
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/src/lib.rs
new file mode 100644
index 0000000000..8300dcceee
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-05-write-trait/src/lib.rs
@@ -0,0 +1,10 @@
+use std::fmt;
+use std::io::Error;
+
+pub trait Write {
+    fn write(&mut self, buf: &[u8]) -> Result<usize, Error>;
+    fn flush(&mut self) -> Result<(), Error>;
+
+    fn write_all(&mut self, buf: &[u8]) -> Result<(), Error>;
+    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Error>;
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/src/lib.rs
new file mode 100644
index 0000000000..c53a927e32
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-06-result-alias/src/lib.rs
@@ -0,0 +1,17 @@
+use std::fmt;
+
+// ANCHOR: here
+type Result<T> = std::result::Result<T, std::io::Error>;
+// ANCHOR_END: here
+
+// ANCHOR: there
+pub trait Write {
+    fn write(&mut self, buf: &[u8]) -> Result<usize>;
+    fn flush(&mut self) -> Result<()>;
+
+    fn write_all(&mut self, buf: &[u8]) -> Result<()>;
+    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<()>;
+}
+// ANCHOR_END: there
+
+fn main() {}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.lock
new file mode 100644
index 0000000000..b1977d01ec
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "traits-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.toml
new file mode 100644
index 0000000000..1e3df0242d
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "traits-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/src/lib.rs
new file mode 100644
index 0000000000..236224186e
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-07-never-type/src/lib.rs
@@ -0,0 +1,10 @@
+// ANCHOR: here
+fn bar() -> ! {
+    // --snip--
+    // ANCHOR_END: here
+    panic!();
+    // ANCHOR: here
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/src/main.rs
new file mode 100644
index 0000000000..6d56008add
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-08-match-arms-different-types/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    let guess = "3";
+    // ANCHOR: here
+    let guess = match guess.trim().parse() {
+        Ok(_) => 5,
+        Err(_) => "hello",
+    };
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/src/lib.rs
new file mode 100644
index 0000000000..aa4f937ff0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-09-unwrap-definition/src/lib.rs
@@ -0,0 +1,17 @@
+enum Option<T> {
+    Some(T),
+    None,
+}
+
+use crate::Option::*;
+
+// ANCHOR: here
+impl<T> Option<T> {
+    pub fn unwrap(self) -> T {
+        match self {
+            Some(val) => val,
+            None => panic!("called `Option::unwrap()` on a `None` value"),
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/src/main.rs
new file mode 100644
index 0000000000..e7768913b7
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-10-loop-returns-never/src/main.rs
@@ -0,0 +1,9 @@
+fn main() {
+    // ANCHOR: here
+    print!("forever ");
+
+    loop {
+        print!("and ever ");
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/src/main.rs
new file mode 100644
index 0000000000..075d5110c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-11-cant-create-str/src/main.rs
@@ -0,0 +1,6 @@
+fn main() {
+    // ANCHOR: here
+    let s1: str = "Hello there!";
+    let s2: str = "How's it going?";
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/src/lib.rs
new file mode 100644
index 0000000000..69186ddfb6
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-12-generic-fn-definition/src/lib.rs
@@ -0,0 +1,3 @@
+fn generic<T>(t: T) {
+    // --snip--
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/src/lib.rs
new file mode 100644
index 0000000000..c2d00e2163
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/src/lib.rs
@@ -0,0 +1,3 @@
+fn generic<T: Sized>(t: T) {
+    // --snip--
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.lock
new file mode 100644
index 0000000000..c0c98a79cf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "types-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.toml
new file mode 100644
index 0000000000..9b4ee689bf
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "types-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/src/lib.rs
new file mode 100644
index 0000000000..e4722267ab
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/src/lib.rs
@@ -0,0 +1,3 @@
+fn generic<T: ?Sized>(t: &T) {
+    // --snip--
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.lock
new file mode 100644
index 0000000000..b2327c755a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.toml
new file mode 100644
index 0000000000..2bed56c367
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/src/main.rs
new file mode 100644
index 0000000000..b4fcf7eb85
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-15-map-closure/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    let list_of_numbers = vec![1, 2, 3];
+    let list_of_strings: Vec<String> =
+        list_of_numbers.iter().map(|i| i.to_string()).collect();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.lock
new file mode 100644
index 0000000000..b2327c755a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.toml
new file mode 100644
index 0000000000..2bed56c367
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/src/main.rs
new file mode 100644
index 0000000000..dff20fe71b
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-16-map-function/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    let list_of_numbers = vec![1, 2, 3];
+    let list_of_strings: Vec<String> =
+        list_of_numbers.iter().map(ToString::to_string).collect();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.lock
new file mode 100644
index 0000000000..b2327c755a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.toml
new file mode 100644
index 0000000000..2bed56c367
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/src/main.rs
new file mode 100644
index 0000000000..60fb730057
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-17-map-initializer/src/main.rs
@@ -0,0 +1,10 @@
+fn main() {
+    // ANCHOR: here
+    enum Status {
+        Value(u32),
+        Stop,
+    }
+
+    let list_of_statuses: Vec<Status> = (0u32..20).map(Status::Value).collect();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.lock
new file mode 100644
index 0000000000..b2327c755a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.toml
new file mode 100644
index 0000000000..2bed56c367
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt
new file mode 100644
index 0000000000..2d4be9b0a3
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt
@@ -0,0 +1,30 @@
+$ cargo build
+   Compiling functions-example v0.1.0 (file:///projects/functions-example)
+error[E0277]: the size for values of type `(dyn std::ops::Fn(i32) -> i32 + 'static)` cannot be known at compilation time
+ --> src/lib.rs:1:25
+  |
+1 | fn returns_closure() -> dyn Fn(i32) -> i32 {
+  |                         ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+  |
+  = help: the trait `std::marker::Sized` is not implemented for `(dyn std::ops::Fn(i32) -> i32 + 'static)`
+  = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
+  = note: the return type of a function must have a statically known size
+
+error[E0308]: mismatched types
+ --> src/lib.rs:2:5
+  |
+1 | fn returns_closure() -> dyn Fn(i32) -> i32 {
+  |                         ------------------ expected `(dyn std::ops::Fn(i32) -> i32 + 'static)` because of return type
+2 |     |x| x + 1
+  |     ^^^^^^^^^ expected trait `std::ops::Fn`, found closure
+  |
+  = note: expected trait object `(dyn std::ops::Fn(i32) -> i32 + 'static)`
+                  found closure `[closure@src/lib.rs:2:5: 2:14]`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0277, E0308.
+For more information about an error, try `rustc --explain E0277`.
+error: could not compile `functions-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/src/lib.rs
new file mode 100644
index 0000000000..d699ac34eb
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-18-returns-closure/src/lib.rs
@@ -0,0 +1,3 @@
+fn returns_closure() -> dyn Fn(i32) -> i32 {
+    |x| x + 1
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.lock
new file mode 100644
index 0000000000..b2327c755a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "functions-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.toml
new file mode 100644
index 0000000000..2bed56c367
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "functions-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/src/lib.rs
new file mode 100644
index 0000000000..b114077472
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/src/lib.rs
@@ -0,0 +1,3 @@
+fn returns_closure() -> Box<dyn Fn(i32) -> i32> {
+    Box::new(|x| x + 1)
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.lock
new file mode 100644
index 0000000000..39afcf282f
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.toml
new file mode 100644
index 0000000000..5a93a685c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/src/lib.rs
new file mode 100644
index 0000000000..e74793184b
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait HelloMacro {
+    fn hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.lock
new file mode 100644
index 0000000000..881cd3f6df
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.lock
@@ -0,0 +1,13 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
+[[package]]
+name = "pancakes"
+version = "0.1.0"
+dependencies = [
+ "hello_macro 0.1.0",
+]
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.toml
new file mode 100644
index 0000000000..4b6c267b42
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "pancakes"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+hello_macro = { path = "../hello_macro" }
\ No newline at end of file
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/src/main.rs
new file mode 100644
index 0000000000..10b028b2d4
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/src/main.rs
@@ -0,0 +1,13 @@
+use hello_macro::HelloMacro;
+
+struct Pancakes;
+
+impl HelloMacro for Pancakes {
+    fn hello_macro() {
+        println!("Hello, Macro! My name is Pancakes!");
+    }
+}
+
+fn main() {
+    Pancakes::hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.lock
new file mode 100644
index 0000000000..39afcf282f
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.toml
new file mode 100644
index 0000000000..5a93a685c0
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello_macro"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock
new file mode 100644
index 0000000000..9a38c8ac26
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.lock
@@ -0,0 +1,46 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro_derive"
+version = "0.1.0"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.toml
new file mode 100644
index 0000000000..168cbae53c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "hello_macro_derive"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+syn = "1.0"
+quote = "1.0"
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/src/lib.rs
new file mode 100644
index 0000000000..7a3279d864
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/hello_macro_derive/src/lib.rs
@@ -0,0 +1,27 @@
+extern crate proc_macro;
+
+use proc_macro::TokenStream;
+use quote::quote;
+use syn;
+
+#[proc_macro_derive(HelloMacro)]
+pub fn hello_macro_derive(input: TokenStream) -> TokenStream {
+    // Construct a representation of Rust code as a syntax tree
+    // that we can manipulate
+    let ast = syn::parse(input).unwrap();
+
+    // Build the trait implementation
+    impl_hello_macro(&ast)
+}
+
+fn impl_hello_macro(ast: &syn::DeriveInput) -> TokenStream {
+    let name = &ast.ident;
+    let gen = quote! {
+        impl HelloMacro for #name {
+            fn hello_macro() {
+                println!("Hello, Macro! My name is {}!", stringify!(#name));
+            }
+        }
+    };
+    gen.into()
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/lib.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/lib.rs
new file mode 100644
index 0000000000..e74793184b
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/lib.rs
@@ -0,0 +1,3 @@
+pub trait HelloMacro {
+    fn hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/main.rs
new file mode 100644
index 0000000000..10b028b2d4
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/hello_macro/src/main.rs
@@ -0,0 +1,13 @@
+use hello_macro::HelloMacro;
+
+struct Pancakes;
+
+impl HelloMacro for Pancakes {
+    fn hello_macro() {
+        println!("Hello, Macro! My name is Pancakes!");
+    }
+}
+
+fn main() {
+    Pancakes::hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.lock
new file mode 100644
index 0000000000..dee23ecf96
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.lock
@@ -0,0 +1,58 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello_macro"
+version = "0.1.0"
+
+[[package]]
+name = "hello_macro_derive"
+version = "0.1.0"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pancakes"
+version = "0.1.0"
+dependencies = [
+ "hello_macro 0.1.0",
+ "hello_macro_derive 0.1.0",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.toml
new file mode 100644
index 0000000000..cc0addaa4a
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "pancakes"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
+hello_macro = { path = "../hello_macro" }
+hello_macro_derive = { path = "../hello_macro/hello_macro_derive" }
diff --git a/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/src/main.rs b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/src/main.rs
new file mode 100644
index 0000000000..468c30aa48
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/src/main.rs
@@ -0,0 +1,9 @@
+use hello_macro::HelloMacro;
+use hello_macro_derive::HelloMacro;
+
+#[derive(HelloMacro)]
+struct Pancakes;
+
+fn main() {
+    Pancakes::hello_macro();
+}
diff --git a/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.lock b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.lock
new file mode 100644
index 0000000000..497817bf27
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "unsafe-example"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.toml b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.toml
new file mode 100644
index 0000000000..aabe3bdf5c
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "unsafe-example"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/output.txt b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/output.txt
new file mode 100644
index 0000000000..bfe082a8b9
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/output.txt
@@ -0,0 +1,16 @@
+$ cargo run
+   Compiling unsafe-example v0.1.0 (file:///projects/unsafe-example)
+error[E0133]: call to unsafe function is unsafe and requires unsafe function or block
+ --> src/main.rs:4:5
+  |
+4 |     dangerous();
+  |     ^^^^^^^^^^^ call to unsafe function
+  |
+  = note: consult the function's documentation for information on how to avoid undefined behavior
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0133`.
+error: could not compile `unsafe-example`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/src/main.rs b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/src/main.rs
new file mode 100644
index 0000000000..01305be749
--- /dev/null
+++ b/src/doc/book/listings/ch19-advanced-features/output-only-01-missing-unsafe/src/main.rs
@@ -0,0 +1,7 @@
+fn main() {
+    // ANCHOR: here
+    unsafe fn dangerous() {}
+
+    dangerous();
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-01/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-01/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-01/src/main.rs
new file mode 100644
index 0000000000..d868c3ec16
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-01/src/main.rs
@@ -0,0 +1,11 @@
+use std::net::TcpListener;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        println!("Connection established!");
+    }
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-02/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-02/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-02/src/main.rs
new file mode 100644
index 0000000000..7dfdc2d897
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-02/src/main.rs
@@ -0,0 +1,21 @@
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+
+    stream.read(&mut buffer).unwrap();
+
+    println!("Request: {}", String::from_utf8_lossy(&buffer[..]));
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-03/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-03/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-03/src/main.rs
new file mode 100644
index 0000000000..33f4fb732d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-03/src/main.rs
@@ -0,0 +1,26 @@
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+// ANCHOR: here
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+
+    stream.read(&mut buffer).unwrap();
+
+    let response = "HTTP/1.1 200 OK\r\n\r\n";
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-04/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-04/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-04/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-04/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-04/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-04/src/main.rs
new file mode 100644
index 0000000000..22e5d1da2d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-04/src/main.rs
@@ -0,0 +1,24 @@
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+
+    stream.read(&mut buffer).unwrap();
+
+    let response = "HTTP/1.1 200 OK\r\n\r\n";
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-05/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-05/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-05/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-05/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-05/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-05/src/main.rs
new file mode 100644
index 0000000000..0b3a284a77
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-05/src/main.rs
@@ -0,0 +1,32 @@
+// ANCHOR: here
+use std::fs;
+// --snip--
+
+// ANCHOR_END: here
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+// ANCHOR: here
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let contents = fs::read_to_string("hello.html").unwrap();
+
+    let response = format!("HTTP/1.1 200 OK\r\n\r\n{}", contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-06/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-06/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-06/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-06/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-06/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-06/src/main.rs
new file mode 100644
index 0000000000..dc192d76bd
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-06/src/main.rs
@@ -0,0 +1,36 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+// ANCHOR: here
+// --snip--
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+
+    if buffer.starts_with(get) {
+        let contents = fs::read_to_string("hello.html").unwrap();
+
+        let response = format!("HTTP/1.1 200 OK\r\n\r\n{}", contents);
+
+        stream.write(response.as_bytes()).unwrap();
+        stream.flush().unwrap();
+    } else {
+        // some other request
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-07/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-07/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-07/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-07/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-07/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-07/src/main.rs
new file mode 100644
index 0000000000..9fab0c76be
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-07/src/main.rs
@@ -0,0 +1,41 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+
+    if buffer.starts_with(get) {
+        let contents = fs::read_to_string("hello.html").unwrap();
+
+        let response = format!("HTTP/1.1 200 OK\r\n\r\n{}", contents);
+
+        stream.write(response.as_bytes()).unwrap();
+        stream.flush().unwrap();
+    // ANCHOR: here
+    // --snip--
+    } else {
+        let status_line = "HTTP/1.1 404 NOT FOUND\r\n\r\n";
+        let contents = fs::read_to_string("404.html").unwrap();
+
+        let response = format!("{}{}", status_line, contents);
+
+        stream.write(response.as_bytes()).unwrap();
+        stream.flush().unwrap();
+    }
+    // ANCHOR_END: here
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-08/404.html b/src/doc/book/listings/ch20-web-server/listing-20-08/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-08/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-08/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-08/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-08/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-08/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-08/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-08/src/main.rs
new file mode 100644
index 0000000000..cbcc4c01ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-08/src/main.rs
@@ -0,0 +1,38 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+
+    if buffer.starts_with(get) {
+        let contents = fs::read_to_string("hello.html").unwrap();
+
+        let response = format!("HTTP/1.1 200 OK\r\n\r\n{}", contents);
+
+        stream.write(response.as_bytes()).unwrap();
+        stream.flush().unwrap();
+    } else {
+        let status_line = "HTTP/1.1 404 NOT FOUND\r\n\r\n";
+        let contents = fs::read_to_string("404.html").unwrap();
+
+        let response = format!("{}{}", status_line, contents);
+
+        stream.write(response.as_bytes()).unwrap();
+        stream.flush().unwrap();
+    }
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-09/404.html b/src/doc/book/listings/ch20-web-server/listing-20-09/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-09/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-09/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-09/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-09/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-09/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-09/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-09/src/main.rs
new file mode 100644
index 0000000000..c91bb660df
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-09/src/main.rs
@@ -0,0 +1,42 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+
+// ANCHOR: here
+// --snip--
+
+fn handle_connection(mut stream: TcpStream) {
+    // --snip--
+
+    // ANCHOR_END: here
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+
+    // ANCHOR: here
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-10/404.html b/src/doc/book/listings/ch20-web-server/listing-20-10/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-10/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-10/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-10/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-10/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-10/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-10/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-10/src/main.rs
new file mode 100644
index 0000000000..6ea692fcb3
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-10/src/main.rs
@@ -0,0 +1,53 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+// ANCHOR: here
+use std::thread;
+use std::time::Duration;
+// --snip--
+// ANCHOR_END: here
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        handle_connection(stream);
+    }
+}
+// ANCHOR: here
+
+fn handle_connection(mut stream: TcpStream) {
+    // --snip--
+
+    // ANCHOR_END: here
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    // ANCHOR: here
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    // --snip--
+    // ANCHOR_END: here
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-11/404.html b/src/doc/book/listings/ch20-web-server/listing-20-11/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-11/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-11/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-11/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-11/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-11/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-11/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-11/src/main.rs
new file mode 100644
index 0000000000..7eb3372ba6
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-11/src/main.rs
@@ -0,0 +1,44 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+// ANCHOR: here
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        thread::spawn(|| {
+            handle_connection(stream);
+        });
+    }
+}
+// ANCHOR_END: here
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-12/404.html b/src/doc/book/listings/ch20-web-server/listing-20-12/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-12/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-12/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-12/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-12/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-12/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-12/output.txt b/src/doc/book/listings/ch20-web-server/listing-20-12/output.txt
new file mode 100644
index 0000000000..3a798ef120
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-12/output.txt
@@ -0,0 +1,14 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+error[E0433]: failed to resolve: use of undeclared type or module `ThreadPool`
+  --> src/main.rs:10:16
+   |
+10 |     let pool = ThreadPool::new(4);
+   |                ^^^^^^^^^^ use of undeclared type or module `ThreadPool`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0433`.
+error: could not compile `hello`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-12/src/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-12/src/main.rs
new file mode 100644
index 0000000000..1381e6d6d2
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-12/src/main.rs
@@ -0,0 +1,45 @@
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+// ANCHOR: here
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+// ANCHOR_END: here
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-13/404.html b/src/doc/book/listings/ch20-web-server/listing-20-13/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-13/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-13/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-13/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-13/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-13/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-13/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-13/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-13/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-13/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-13/src/lib.rs
new file mode 100644
index 0000000000..ffa3c6a254
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-13/src/lib.rs
@@ -0,0 +1,30 @@
+pub struct ThreadPool;
+
+// ANCHOR: here
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        ThreadPool
+    }
+
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+    // ANCHOR: here
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-14/404.html b/src/doc/book/listings/ch20-web-server/listing-20-14/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-14/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-14/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-14/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-14/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-14/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-14/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-14/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-14/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-14/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-14/src/lib.rs
new file mode 100644
index 0000000000..509a62e1f9
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-14/src/lib.rs
@@ -0,0 +1,41 @@
+// ANCHOR: here
+use std::thread;
+
+pub struct ThreadPool {
+    threads: Vec<thread::JoinHandle<()>>,
+}
+
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    // ANCHOR: here
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let mut threads = Vec::with_capacity(size);
+
+        for _ in 0..size {
+            // create some threads and store them in the vector
+        }
+
+        ThreadPool { threads }
+    }
+
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+    // ANCHOR: here
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-15/404.html b/src/doc/book/listings/ch20-web-server/listing-20-15/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-15/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-15/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-15/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-15/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-15/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-15/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-15/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-15/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-15/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-15/src/lib.rs
new file mode 100644
index 0000000000..d2ad3ca176
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-15/src/lib.rs
@@ -0,0 +1,55 @@
+// ANCHOR: here
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+}
+
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    // ANCHOR: here
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id));
+        }
+
+        ThreadPool { workers }
+    }
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+    // ANCHOR: here
+}
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+impl Worker {
+    fn new(id: usize) -> Worker {
+        let thread = thread::spawn(|| {});
+
+        Worker { id, thread }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-16/404.html b/src/doc/book/listings/ch20-web-server/listing-20-16/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-16/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-16/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-16/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-16/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-16/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-16/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-16/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-16/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-16/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-16/src/lib.rs
new file mode 100644
index 0000000000..28b374eed3
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-16/src/lib.rs
@@ -0,0 +1,62 @@
+use std::thread;
+// ANCHOR: here
+// --snip--
+use std::sync::mpsc;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+struct Job;
+
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    // ANCHOR: here
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id));
+        }
+
+        ThreadPool { workers, sender }
+    }
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+    // ANCHOR: here
+}
+// ANCHOR_END: here
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+impl Worker {
+    fn new(id: usize) -> Worker {
+        let thread = thread::spawn(|| {});
+
+        Worker { id, thread }
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/404.html b/src/doc/book/listings/ch20-web-server/listing-20-17/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-17/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/output.txt b/src/doc/book/listings/ch20-web-server/listing-20-17/output.txt
new file mode 100644
index 0000000000..f9749e1214
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/output.txt
@@ -0,0 +1,17 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+error[E0382]: use of moved value: `receiver`
+  --> src/lib.rs:27:42
+   |
+22 |         let (sender, receiver) = mpsc::channel();
+   |                      -------- move occurs because `receiver` has type `std::sync::mpsc::Receiver<Job>`, which does not implement the `Copy` trait
+...
+27 |             workers.push(Worker::new(id, receiver));
+   |                                          ^^^^^^^^ value moved here, in previous iteration of loop
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0382`.
+error: could not compile `hello`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-17/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-17/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-17/src/lib.rs
new file mode 100644
index 0000000000..f3ce7d06e6
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-17/src/lib.rs
@@ -0,0 +1,66 @@
+use std::sync::mpsc;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+struct Job;
+
+// ANCHOR: here
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    // ANCHOR: here
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, receiver));
+        }
+
+        ThreadPool { workers, sender }
+    }
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+    // ANCHOR: here
+}
+
+// --snip--
+
+// ANCHOR_END: here
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+// ANCHOR: here
+impl Worker {
+    fn new(id: usize, receiver: mpsc::Receiver<Job>) -> Worker {
+        let thread = thread::spawn(|| {
+            receiver;
+        });
+
+        Worker { id, thread }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-18/404.html b/src/doc/book/listings/ch20-web-server/listing-20-18/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-18/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-18/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-18/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-18/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-18/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-18/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-18/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-18/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-18/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-18/src/lib.rs
new file mode 100644
index 0000000000..d47eef869e
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-18/src/lib.rs
@@ -0,0 +1,78 @@
+use std::sync::mpsc;
+use std::thread;
+// ANCHOR: here
+use std::sync::Arc;
+use std::sync::Mutex;
+// --snip--
+
+// ANCHOR_END: here
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+struct Job;
+
+// ANCHOR: here
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    // ANCHOR: here
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    // --snip--
+    // ANCHOR_END: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+    // ANCHOR: here
+}
+
+// --snip--
+
+// ANCHOR_END: here
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+// ANCHOR: here
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        // --snip--
+        // ANCHOR_END: here
+        let thread = thread::spawn(|| {
+            receiver;
+        });
+
+        Worker { id, thread }
+        // ANCHOR: here
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-19/404.html b/src/doc/book/listings/ch20-web-server/listing-20-19/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-19/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-19/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-19/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-19/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-19/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-19/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-19/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-19/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-19/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-19/src/lib.rs
new file mode 100644
index 0000000000..bf8127b8e5
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-19/src/lib.rs
@@ -0,0 +1,71 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+// ANCHOR: here
+// --snip--
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+    // ANCHOR: here
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+// --snip--
+// ANCHOR_END: here
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(|| {
+            receiver;
+        });
+
+        Worker { id, thread }
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-20/404.html b/src/doc/book/listings/ch20-web-server/listing-20-20/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-20/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-20/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-20/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-20/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-20/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-20/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-20/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-20/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-20/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-20/src/lib.rs
new file mode 100644
index 0000000000..5fdc32e8b0
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-20/src/lib.rs
@@ -0,0 +1,68 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+// ANCHOR: here
+// --snip--
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let job = receiver.lock().unwrap().recv().unwrap();
+
+            println!("Worker {} got a job; executing.", id);
+
+            job();
+        });
+
+        Worker { id, thread }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-21/404.html b/src/doc/book/listings/ch20-web-server/listing-20-21/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-21/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-21/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-21/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-21/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-21/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-21/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-21/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-21/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-21/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-21/src/lib.rs
new file mode 100644
index 0000000000..6bde524885
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-21/src/lib.rs
@@ -0,0 +1,67 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+// ANCHOR: here
+// --snip--
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(move || {
+            while let Ok(job) = receiver.lock().unwrap().recv() {
+                println!("Worker {} got a job; executing.", id);
+
+                job();
+            }
+        });
+
+        Worker { id, thread }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/404.html b/src/doc/book/listings/ch20-web-server/listing-20-22/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-22/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/output.txt b/src/doc/book/listings/ch20-web-server/listing-20-22/output.txt
new file mode 100644
index 0000000000..f5dd1ba13b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/output.txt
@@ -0,0 +1,14 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+error[E0507]: cannot move out of `worker.thread` which is behind a mutable reference
+  --> src/lib.rs:52:13
+   |
+52 |             worker.thread.join().unwrap();
+   |             ^^^^^^^^^^^^^ move occurs because `worker.thread` has type `std::thread::JoinHandle<()>`, which does not implement the `Copy` trait
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0507`.
+error: could not compile `hello`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-22/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-22/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-22/src/lib.rs
new file mode 100644
index 0000000000..824257898c
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-22/src/lib.rs
@@ -0,0 +1,76 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+// ANCHOR: here
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            worker.thread.join().unwrap();
+        }
+    }
+}
+// ANCHOR_END: here
+
+struct Worker {
+    id: usize,
+    thread: thread::JoinHandle<()>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let job = receiver.lock().unwrap().recv().unwrap();
+
+            println!("Worker {} got a job; executing.", id);
+
+            job();
+        });
+
+        Worker { id, thread }
+    }
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-23/404.html b/src/doc/book/listings/ch20-web-server/listing-20-23/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-23/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-23/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-23/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-23/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-23/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-23/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-23/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-23/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-23/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-23/src/lib.rs
new file mode 100644
index 0000000000..6ccaee73f6
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-23/src/lib.rs
@@ -0,0 +1,107 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+// ANCHOR: here
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Message>,
+}
+
+// --snip--
+
+// ANCHOR_END: here
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+enum Message {
+    NewJob(Job),
+    Terminate,
+}
+
+// ANCHOR: here
+impl ThreadPool {
+    // --snip--
+
+    // ANCHOR_END: here
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    // ANCHOR: here
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(Message::NewJob(job)).unwrap();
+    }
+}
+
+// --snip--
+
+// ANCHOR_END: here
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
+    }
+}
+
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+// ANCHOR: here
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let message = receiver.lock().unwrap().recv().unwrap();
+
+            match message {
+                Message::NewJob(job) => {
+                    println!("Worker {} got a job; executing.", id);
+
+                    job();
+                }
+                Message::Terminate => {
+                    println!("Worker {} was told to terminate.", id);
+
+                    break;
+                }
+            }
+        });
+
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-24/404.html b/src/doc/book/listings/ch20-web-server/listing-20-24/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-24/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-24/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-24/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-24/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-24/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-24/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-24/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-24/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-24/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-24/src/lib.rs
new file mode 100644
index 0000000000..747bff2b1f
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-24/src/lib.rs
@@ -0,0 +1,103 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Message>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+enum Message {
+    NewJob(Job),
+    Terminate,
+}
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(Message::NewJob(job)).unwrap();
+    }
+}
+
+// ANCHOR: here
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        println!("Sending terminate message to all workers.");
+
+        for _ in &self.workers {
+            self.sender.send(Message::Terminate).unwrap();
+        }
+
+        println!("Shutting down all workers.");
+
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
+    }
+}
+// ANCHOR_END: here
+
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let message = receiver.lock().unwrap().recv().unwrap();
+
+            match message {
+                Message::NewJob(job) => {
+                    println!("Worker {} got a job; executing.", id);
+
+                    job();
+                }
+                Message::Terminate => {
+                    println!("Worker {} was told to terminate.", id);
+
+                    break;
+                }
+            }
+        });
+
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-25/404.html b/src/doc/book/listings/ch20-web-server/listing-20-25/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-25/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.lock b/src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.toml b/src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-25/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-25/hello.html b/src/doc/book/listings/ch20-web-server/listing-20-25/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-25/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-25/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/listing-20-25/src/bin/main.rs
new file mode 100644
index 0000000000..8d9310eaec
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-25/src/bin/main.rs
@@ -0,0 +1,50 @@
+// ANCHOR: all
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+// ANCHOR: here
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming().take(2) {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+
+    println!("Shutting down.");
+}
+// ANCHOR_END: here
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
+// ANCHOR_END: all
diff --git a/src/doc/book/listings/ch20-web-server/listing-20-25/src/lib.rs b/src/doc/book/listings/ch20-web-server/listing-20-25/src/lib.rs
new file mode 100644
index 0000000000..424eac8e49
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/listing-20-25/src/lib.rs
@@ -0,0 +1,105 @@
+// ANCHOR: here
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Message>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+enum Message {
+    NewJob(Job),
+    Terminate,
+}
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(Message::NewJob(job)).unwrap();
+    }
+}
+
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        println!("Sending terminate message to all workers.");
+
+        for _ in &self.workers {
+            self.sender.send(Message::Terminate).unwrap();
+        }
+
+        println!("Shutting down all workers.");
+
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
+    }
+}
+
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let message = receiver.lock().unwrap().recv().unwrap();
+
+            match message {
+                Message::NewJob(job) => {
+                    println!("Worker {} got a job; executing.", id);
+
+                    job();
+                }
+                Message::Terminate => {
+                    println!("Worker {} was told to terminate.", id);
+
+                    break;
+                }
+            }
+        });
+
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/404.html b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/output.txt b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/output.txt
new file mode 100644
index 0000000000..0161c7b2c7
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/output.txt
@@ -0,0 +1,14 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+error[E0599]: no function or associated item named `new` found for type `hello::ThreadPool` in the current scope
+  --> src/bin/main.rs:11:28
+   |
+11 |     let pool = ThreadPool::new(4);
+   |                            ^^^ function or associated item not found in `hello::ThreadPool`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
+error: could not compile `hello`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/bin/main.rs
new file mode 100644
index 0000000000..d4e0e0c0e0
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/bin/main.rs
@@ -0,0 +1,46 @@
+// ANCHOR: here
+use hello::ThreadPool;
+// ANCHOR_END: here
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/lib.rs
new file mode 100644
index 0000000000..7312e293d8
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/lib.rs
@@ -0,0 +1 @@
+pub struct ThreadPool;
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/404.html b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/output.txt b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/output.txt
new file mode 100644
index 0000000000..c808b8986b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/output.txt
@@ -0,0 +1,14 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+error[E0599]: no method named `execute` found for type `hello::ThreadPool` in the current scope
+  --> src/bin/main.rs:16:14
+   |
+16 |         pool.execute(|| {
+   |              ^^^^^^^ method not found in `hello::ThreadPool`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
+error: could not compile `hello`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/lib.rs
new file mode 100644
index 0000000000..3ff5ad4979
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/lib.rs
@@ -0,0 +1,11 @@
+// ANCHOR: here
+pub struct ThreadPool;
+
+impl ThreadPool {
+    pub fn new(size: usize) -> ThreadPool {
+        ThreadPool
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/404.html b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/output.txt b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/output.txt
new file mode 100644
index 0000000000..dc76c43d6f
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/output.txt
@@ -0,0 +1,3 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.24s
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/lib.rs
new file mode 100644
index 0000000000..44e0ebd724
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-03-define-execute/src/lib.rs
@@ -0,0 +1,20 @@
+pub struct ThreadPool;
+
+// ANCHOR: here
+impl ThreadPool {
+    // --snip--
+    // ANCHOR_END: here
+    pub fn new(size: usize) -> ThreadPool {
+        ThreadPool
+    }
+
+    // ANCHOR: here
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+    }
+}
+// ANCHOR_END: here
+
+fn main() {}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/404.html b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt
new file mode 100644
index 0000000000..91907cf79a
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt
@@ -0,0 +1,27 @@
+$ cargo check
+    Checking hello v0.1.0 (file:///projects/hello)
+error[E0599]: no method named `join` found for type `std::option::Option<std::thread::JoinHandle<()>>` in the current scope
+  --> src/lib.rs:52:27
+   |
+52 |             worker.thread.join().unwrap();
+   |                           ^^^^ method not found in `std::option::Option<std::thread::JoinHandle<()>>`
+
+error[E0308]: mismatched types
+  --> src/lib.rs:72:22
+   |
+72 |         Worker { id, thread }
+   |                      ^^^^^^
+   |                      |
+   |                      expected enum `std::option::Option`, found struct `std::thread::JoinHandle`
+   |                      help: try using a variant of the expected enum: `Some(thread)`
+   |
+   = note: expected enum `std::option::Option<std::thread::JoinHandle<()>>`
+            found struct `std::thread::JoinHandle<_>`
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0308, E0599.
+For more information about an error, try `rustc --explain E0308`.
+error: could not compile `hello`.
+
+To learn more, run the command again with --verbose.
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/lib.rs
new file mode 100644
index 0000000000..1098330b3f
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-04-update-worker-definition/src/lib.rs
@@ -0,0 +1,76 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            worker.thread.join().unwrap();
+        }
+    }
+}
+
+// ANCHOR: here
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+// ANCHOR_END: here
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let job = receiver.lock().unwrap().recv().unwrap();
+
+            println!("Worker {} got a job; executing.", id);
+
+            job();
+        });
+
+        Worker { id, thread }
+    }
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/404.html b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/lib.rs
new file mode 100644
index 0000000000..6bef23a16d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-05-fix-worker-new/src/lib.rs
@@ -0,0 +1,83 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            worker.thread.join().unwrap();
+        }
+    }
+}
+
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+// ANCHOR: here
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        // --snip--
+
+        // ANCHOR_END: here
+        let thread = thread::spawn(move || loop {
+            let job = receiver.lock().unwrap().recv().unwrap();
+
+            println!("Worker {} got a job; executing.", id);
+
+            job();
+        });
+
+        // ANCHOR: here
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}
+// ANCHOR_END: here
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/404.html b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/lib.rs
new file mode 100644
index 0000000000..d5b38a635d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/lib.rs
@@ -0,0 +1,81 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+// ANCHOR: here
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
+    }
+}
+// ANCHOR_END: here
+
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let job = receiver.lock().unwrap().recv().unwrap();
+
+            println!("Worker {} got a job; executing.", id);
+
+            job();
+        });
+
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/404.html b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/404.html
new file mode 100644
index 0000000000..88d8e9152d
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/404.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Oops!</h1>
+    <p>Sorry, I don't know what you're asking for.</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.lock b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.lock
new file mode 100644
index 0000000000..f2d069f462
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.lock
@@ -0,0 +1,6 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "hello"
+version = "0.1.0"
+
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.toml b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.toml
new file mode 100644
index 0000000000..78dfe6ebc4
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "hello"
+version = "0.1.0"
+authors = ["Your Name <you@example.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/hello.html b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/hello.html
new file mode 100644
index 0000000000..fe442d6b9b
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/hello.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Hello!</title>
+  </head>
+  <body>
+    <h1>Hello!</h1>
+    <p>Hi from Rust</p>
+  </body>
+</html>
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/bin/main.rs b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/bin/main.rs
new file mode 100644
index 0000000000..452f6822ff
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/bin/main.rs
@@ -0,0 +1,44 @@
+use hello::ThreadPool;
+use std::fs;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+use std::thread;
+use std::time::Duration;
+
+fn main() {
+    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
+    let pool = ThreadPool::new(4);
+
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+
+        pool.execute(|| {
+            handle_connection(stream);
+        });
+    }
+}
+
+fn handle_connection(mut stream: TcpStream) {
+    let mut buffer = [0; 512];
+    stream.read(&mut buffer).unwrap();
+
+    let get = b"GET / HTTP/1.1\r\n";
+    let sleep = b"GET /sleep HTTP/1.1\r\n";
+
+    let (status_line, filename) = if buffer.starts_with(get) {
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else if buffer.starts_with(sleep) {
+        thread::sleep(Duration::from_secs(5));
+        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
+    } else {
+        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
+    };
+
+    let contents = fs::read_to_string(filename).unwrap();
+
+    let response = format!("{}{}", status_line, contents);
+
+    stream.write(response.as_bytes()).unwrap();
+    stream.flush().unwrap();
+}
diff --git a/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/lib.rs b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/lib.rs
new file mode 100644
index 0000000000..ed1913b293
--- /dev/null
+++ b/src/doc/book/listings/ch20-web-server/no-listing-07-define-message-enum/src/lib.rs
@@ -0,0 +1,88 @@
+use std::sync::mpsc;
+use std::sync::Arc;
+use std::sync::Mutex;
+use std::thread;
+
+pub struct ThreadPool {
+    workers: Vec<Worker>,
+    sender: mpsc::Sender<Job>,
+}
+
+type Job = Box<dyn FnOnce() + Send + 'static>;
+
+// ANCHOR: here
+enum Message {
+    NewJob(Job),
+    Terminate,
+}
+// ANCHOR_END: here
+
+impl ThreadPool {
+    /// Create a new ThreadPool.
+    ///
+    /// The size is the number of threads in the pool.
+    ///
+    /// # Panics
+    ///
+    /// The `new` function will panic if the size is zero.
+    pub fn new(size: usize) -> ThreadPool {
+        assert!(size > 0);
+
+        let (sender, receiver) = mpsc::channel();
+
+        let receiver = Arc::new(Mutex::new(receiver));
+
+        let mut workers = Vec::with_capacity(size);
+
+        for id in 0..size {
+            workers.push(Worker::new(id, Arc::clone(&receiver)));
+        }
+
+        ThreadPool { workers, sender }
+    }
+
+    pub fn execute<F>(&self, f: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let job = Box::new(f);
+
+        self.sender.send(job).unwrap();
+    }
+}
+
+impl Drop for ThreadPool {
+    fn drop(&mut self) {
+        for worker in &mut self.workers {
+            println!("Shutting down worker {}", worker.id);
+
+            if let Some(thread) = worker.thread.take() {
+                thread.join().unwrap();
+            }
+        }
+    }
+}
+
+struct Worker {
+    id: usize,
+    thread: Option<thread::JoinHandle<()>>,
+}
+
+impl Worker {
+    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
+        let thread = thread::spawn(move || loop {
+            let job = receiver.lock().unwrap().recv().unwrap();
+
+            println!("Worker {} got a job; executing.", id);
+
+            job();
+        });
+
+        Worker {
+            id,
+            thread: Some(thread),
+        }
+    }
+}
+
+fn main() {}
diff --git a/src/doc/book/rust-toolchain b/src/doc/book/rust-toolchain
index bf50e910e6..7d47e59980 100644
--- a/src/doc/book/rust-toolchain
+++ b/src/doc/book/rust-toolchain
@@ -1 +1 @@
-1.37.0
+1.41.0
diff --git a/src/doc/book/rustfmt.toml b/src/doc/book/rustfmt.toml
new file mode 100644
index 0000000000..df99c69198
--- /dev/null
+++ b/src/doc/book/rustfmt.toml
@@ -0,0 +1 @@
+max_width = 80
diff --git a/src/doc/book/second-edition/src/ch18-02-refutability.md b/src/doc/book/second-edition/src/ch18-02-refutability.md
index 7449d2f39f..2ef5206afd 100644
--- a/src/doc/book/second-edition/src/ch18-02-refutability.md
+++ b/src/doc/book/second-edition/src/ch18-02-refutability.md
@@ -7,4 +7,4 @@ version of the book](../ch18-02-refutability.html) instead.
 
 If you have an internet connection, you can [find a copy distributed with
 Rust
-1.30](https://doc.rust-lang.org/1.30.0/book/second-edition/ch18-02-refuatbility.html).
\ No newline at end of file
+1.30](https://doc.rust-lang.org/1.30.0/book/second-edition/ch18-02-refutability.html).
\ No newline at end of file
diff --git a/src/doc/book/src/appendix-01-keywords.md b/src/doc/book/src/appendix-01-keywords.md
index ef1c51d571..c19b8a1e2f 100644
--- a/src/doc/book/src/appendix-01-keywords.md
+++ b/src/doc/book/src/appendix-01-keywords.md
@@ -42,7 +42,7 @@ The following keywords currently have the functionality described.
 * `pub` - denote public visibility in struct fields, `impl` blocks, or modules
 * `ref` - bind by reference
 * `return` - return from function
-* `Self` - a type alias for the type implementing a trait
+* `Self` - a type alias for the type we are defining or implementing
 * `self` - method subject or current module
 * `static` - global variable or lifetime lasting the entire program execution
 * `struct` - define a structure
diff --git a/src/doc/book/src/appendix-02-operators.md b/src/doc/book/src/appendix-02-operators.md
index 3bddf322df..e70cc737f5 100644
--- a/src/doc/book/src/appendix-02-operators.md
+++ b/src/doc/book/src/appendix-02-operators.md
@@ -153,6 +153,7 @@ macros and specifying attributes on an item.
 | `$ident` | Macro substitution |
 | `$ident:kind` | Macro capture |
 | `$(…)…` | Macro repetition |
+| `ident!(...)`, `ident!{...}`, `ident![...]` | Macro invocation |
 
 Table B-7 shows symbols that create comments.
 
@@ -180,7 +181,6 @@ Table B-8 shows symbols that appear in the context of using tuples.
 | `(expr, ...)` | Tuple expression |
 | `(type, ...)` | Tuple type |
 | `expr(expr, ...)` | Function call expression; also used to initialize tuple `struct`s and tuple `enum` variants |
-| `ident!(...)`, `ident!{...}`, `ident![...]` | Macro invocation |
 | `expr.0`, `expr.1`, etc. | Tuple indexing |
 
 Table B-9 shows the contexts in which curly braces are used.
diff --git a/src/doc/book/src/appendix-06-translation.md b/src/doc/book/src/appendix-06-translation.md
index 937928bf44..8193f51e60 100644
--- a/src/doc/book/src/appendix-06-translation.md
+++ b/src/doc/book/src/appendix-06-translation.md
@@ -13,8 +13,8 @@ For resources in languages other than English. Most are still in progress; see
 - [Italiano](https://github.com/AgeOfWar/rust-book-it)
 - [Русский](https://github.com/ruRust/rust_book_2ed)
 - [한국어](https://github.com/rinthel/rust-lang-book-ko)
-- [日本語](https://github.com/hazama-yuinyan/book)
-- [Français](https://github.com/quadrifoglio/rust-book-fr)
+- [日本語](https://github.com/rust-lang-ja/book-ja)
+- [Français](https://github.com/Jimskapt/rust-book-fr)
 - [Polski](https://github.com/paytchoo/book-pl)
 - [עברית](https://github.com/idanmel/rust-book-heb)
 - [Cebuano](https://github.com/agentzero1/book)
diff --git a/src/doc/book/src/appendix-07-nightly-rust.md b/src/doc/book/src/appendix-07-nightly-rust.md
index bace82f2e0..ac8609167f 100644
--- a/src/doc/book/src/appendix-07-nightly-rust.md
+++ b/src/doc/book/src/appendix-07-nightly-rust.md
@@ -142,7 +142,7 @@ global or per-project basis. By default, you’ll have stable Rust installed. To
 install nightly, for example:
 
 ```text
-$ rustup install nightly
+$ rustup toolchain install nightly
 ```
 
 You can see all of the *toolchains* (releases of Rust and associated
diff --git a/src/doc/book/src/ch01-03-hello-cargo.md b/src/doc/book/src/ch01-03-hello-cargo.md
index b40be39da5..fe029d9a16 100644
--- a/src/doc/book/src/ch01-03-hello-cargo.md
+++ b/src/doc/book/src/ch01-03-hello-cargo.md
@@ -44,8 +44,11 @@ same name.
 
 Go into the *hello_cargo* directory and list the files. You’ll see that Cargo
 has generated two files and one directory for us: a *Cargo.toml* file and a
-*src* directory with a *main.rs* file inside. It has also initialized a new Git
-repository along with a *.gitignore* file.
+*src* directory with a *main.rs* file inside.
+
+It has also initialized a new Git repository along with a *.gitignore* file.
+Git files won’t be generated if you run `cargo new` within an existing Git
+repository; you can override this behavior by using `cargo new --vcs=git`.
 
 > Note: Git is a common version control system. You can change `cargo new` to
 > use a different version control system or no version control system by using
diff --git a/src/doc/book/src/ch02-00-guessing-game-tutorial.md b/src/doc/book/src/ch02-00-guessing-game-tutorial.md
index 2ecc1520ea..b09dade72f 100644
--- a/src/doc/book/src/ch02-00-guessing-game-tutorial.md
+++ b/src/doc/book/src/ch02-00-guessing-game-tutorial.md
@@ -31,13 +31,7 @@ Look at the generated *Cargo.toml* file:
 <span class="filename">Filename: Cargo.toml</span>
 
 ```toml
-[package]
-name = "guessing_game"
-version = "0.1.0"
-authors = ["Your Name <you@example.com>"]
-edition = "2018"
-
-[dependencies]
+{{#include ../listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/Cargo.toml}}
 ```
 
 If the author information that Cargo obtained from your environment is not
@@ -49,20 +43,14 @@ you. Check out the *src/main.rs* file:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    println!("Hello, world!");
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/src/main.rs}}
 ```
 
 Now let’s compile this “Hello, world!” program and run it in the same step
 using the `cargo run` command:
 
 ```text
-$ cargo run
-   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 1.50 secs
-     Running `target/debug/guessing_game`
-Hello, world!
+{{#include ../listings/ch02-guessing-game-tutorial/no-listing-01-cargo-new/output.txt}}
 ```
 
 The `run` command comes in handy when you need to rapidly iterate on a project,
@@ -81,20 +69,7 @@ allow the player to input a guess. Enter the code in Listing 2-1 into
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use std::io;
-
-fn main() {
-    println!("Guess the number!");
-
-    println!("Please input your guess.");
-
-    let mut guess = String::new();
-
-    io::stdin().read_line(&mut guess)
-        .expect("Failed to read line");
-
-    println!("You guessed: {}", guess);
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:all}}
 ```
 
 <span class="caption">Listing 2-1: Code that gets a guess from the user and
@@ -106,7 +81,7 @@ obtain user input and then print the result as output, we need to bring the
 standard library (which is known as `std`):
 
 ```rust,ignore
-use std::io;
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:io}}
 ```
 
 By default, Rust brings only a few types into the scope of every program in
@@ -121,7 +96,7 @@ As you saw in Chapter 1, the `main` function is the entry point into the
 program:
 
 ```rust,ignore
-fn main() {
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:main}}
 ```
 
 The `fn` syntax declares a new function, the parentheses, `()`, indicate there
@@ -131,9 +106,7 @@ As you also learned in Chapter 1, `println!` is a macro that prints a string to
 the screen:
 
 ```rust,ignore
-println!("Guess the number!");
-
-println!("Please input your guess.");
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:print}}
 ```
 
 This code is printing a prompt stating what the game is and requesting input
@@ -144,7 +117,7 @@ from the user.
 Next, we’ll create a place to store the user input, like this:
 
 ```rust,ignore
-let mut guess = String::new();
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:string}}
 ```
 
 Now the program is getting interesting! There’s a lot going on in this little
@@ -197,8 +170,7 @@ library with `use std::io;` on the first line of the program. Now we’ll call
 the `stdin` function from the `io` module:
 
 ```rust,ignore
-io::stdin().read_line(&mut guess)
-    .expect("Failed to read line");
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:read}}
 ```
 
 If we hadn’t put the `use std::io` line at the beginning of the program, we
@@ -232,12 +204,12 @@ thoroughly.)
 
 ### Handling Potential Failure with the `Result` Type
 
-We’re not quite done with this line of code. Although what we’ve discussed so
-far is a single line of text, it’s only the first part of the single logical
-line of code. The second part is this method:
+We’re still working on this line of code. Although we’re now discussing a third
+line of text, it’s still part of a single logical line of code. The next part
+is this method:
 
 ```rust,ignore
-.expect("Failed to read line");
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:expect}}
 ```
 
 When you call a method with the `.foo()` syntax, it’s often wise to introduce a
@@ -248,8 +220,8 @@ written this code as:
 io::stdin().read_line(&mut guess).expect("Failed to read line");
 ```
 
-However, one long line is difficult to read, so it’s best to divide it: two
-lines for two method calls. Now let’s discuss what this line does.
+However, one long line is difficult to read, so it’s best to divide it. Now
+let’s discuss what this line does.
 
 As mentioned earlier, `read_line` puts what the user types into the string
 we’re passing it, but it also returns a value—in this case, an
@@ -289,15 +261,7 @@ entered into standard input.
 If you don’t call `expect`, the program will compile, but you’ll get a warning:
 
 ```text
-$ cargo build
-   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-warning: unused `std::result::Result` which must be used
-  --> src/main.rs:10:5
-   |
-10 |     io::stdin().read_line(&mut guess);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: #[warn(unused_must_use)] on by default
+{{#include ../listings/ch02-guessing-game-tutorial/no-listing-02-without-expect/output.txt}}
 ```
 
 Rust warns that you haven’t used the `Result` value returned from `read_line`,
@@ -309,11 +273,11 @@ because you just want to crash this program when a problem occurs, you can use
 
 ### Printing Values with `println!` Placeholders
 
-Aside from the closing curly brackets, there’s only one more line to discuss in
+Aside from the closing curly bracket, there’s only one more line to discuss in
 the code added so far, which is the following:
 
 ```rust,ignore
-println!("You guessed: {}", guess);
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs:print_guess}}
 ```
 
 This line prints the string we saved the user’s input in. The set of curly
@@ -336,10 +300,16 @@ This code would print `x = 5 and y = 10`.
 
 Let’s test the first part of the guessing game. Run it using `cargo run`:
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/listing-02-01/
+cargo clean
+cargo run
+input 6 -->
+
 ```text
 $ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 2.53 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 6.44s
      Running `target/debug/guessing_game`
 Guess the number!
 Please input your guess.
@@ -382,8 +352,7 @@ you:
 <span class="filename">Filename: Cargo.toml</span>
 
 ```toml
-[dependencies]
-rand = "0.5.5"
+{{#include ../listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml:9:}}
 ```
 
 In the *Cargo.toml* file, everything that follows a header is part of a section
@@ -401,6 +370,11 @@ version 0.5.5.”
 Now, without changing any of the code, let’s build the project, as shown in
 Listing 2-2.
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/listing-02-02/
+cargo clean
+cargo build -->
+
 ```text
 $ cargo build
     Updating crates.io index
@@ -415,7 +389,7 @@ $ cargo build
    Compiling rand_core v0.2.2
    Compiling rand v0.5.5
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 2.53 s
+    Finished dev [unoptimized + debuginfo] target(s) in 2.53s
 ```
 
 <span class="caption">Listing 2-2: The output from running `cargo build` after
@@ -433,9 +407,9 @@ their open source Rust projects for others to use.
 
 After updating the registry, Cargo checks the `[dependencies]` section and
 downloads any crates you don’t have yet. In this case, although we only listed
-`rand` as a dependency, Cargo also grabbed `libc` and `rand_core`, because `rand`
-depends on those to work. After downloading the crates, Rust compiles them and
-then compiles the project with the dependencies available.
+`rand` as a dependency, Cargo also grabbed `libc` and `rand_core`, because
+`rand` depends on those to work. After downloading the crates, Rust compiles
+them and then compiles the project with the dependencies available.
 
 If you immediately run `cargo build` again without making any changes, you
 won’t get any output aside from the `Finished` line. Cargo knows it has already
@@ -447,10 +421,15 @@ do, it simply exits.
 If you open up the *src/main.rs* file, make a trivial change, and then save it
 and build again, you’ll only see two lines of output:
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/listing-02-02/
+touch src/main.rs
+cargo build -->
+
 ```text
 $ cargo build
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 2.53s
+    Finished dev [unoptimized + debuginfo] target(s) in 2.53 secs
 ```
 
 These lines show Cargo only updates the build with your tiny change to the
@@ -489,6 +468,12 @@ But by default, Cargo will only look for versions greater than `0.5.5` and less
 than `0.6.0`. If the `rand` crate has released two new versions, `0.5.6` and
 `0.6.0`, you would see the following if you ran `cargo update`:
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/listing-02-02/
+cargo update
+assuming there is a new 0.5.x version of rand; otherwise use another update
+as a guide to creating the hypothetical output shown here -->
+
 ```text
 $ cargo update
     Updating crates.io index
@@ -527,25 +512,7 @@ Now that you’ve added the `rand` crate to *Cargo.toml*, let’s start using
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use std::io;
-use rand::Rng;
-
-fn main() {
-    println!("Guess the number!");
-
-    let secret_number = rand::thread_rng().gen_range(1, 101);
-
-    println!("The secret number is: {}", secret_number);
-
-    println!("Please input your guess.");
-
-    let mut guess = String::new();
-
-    io::stdin().read_line(&mut guess)
-        .expect("Failed to read line");
-
-    println!("You guessed: {}", guess);
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs:all}}
 ```
 
 <span class="caption">Listing 2-3: Adding code to generate a random
@@ -580,17 +547,27 @@ program prints the answer as soon as it starts!
 
 Try running the program a few times:
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/listing-02-03/
+cargo run
+4
+cargo run
+5
+-->
+
 ```text
 $ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 2.53 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 2.53s
      Running `target/debug/guessing_game`
 Guess the number!
 The secret number is: 7
 Please input your guess.
 4
 You guessed: 4
+
 $ cargo run
+    Finished dev [unoptimized + debuginfo] target(s) in 0.02s
      Running `target/debug/guessing_game`
 Guess the number!
 The secret number is: 83
@@ -611,22 +588,7 @@ will explain.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::io;
-use std::cmp::Ordering;
-use rand::Rng;
-
-fn main() {
-
-    // ---snip---
-
-    println!("You guessed: {}", guess);
-
-    match guess.cmp(&secret_number) {
-        Ordering::Less => println!("Too small!"),
-        Ordering::Greater => println!("Too big!"),
-        Ordering::Equal => println!("You win!"),
-    }
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 2-4: Handling the possible return values of
@@ -672,19 +634,7 @@ expression ends because it has no need to look at the last arm in this scenario.
 However, the code in Listing 2-4 won’t compile yet. Let’s try it:
 
 ```text
-$ cargo build
-   Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-error[E0308]: mismatched types
-  --> src/main.rs:23:21
-   |
-23 |     match guess.cmp(&secret_number) {
-   |                     ^^^^^^^^^^^^^^ expected struct `std::string::String`, found integer
-   |
-   = note: expected type `&std::string::String`
-   = note:    found type `&{integer}`
-
-error: aborting due to previous error
-Could not compile `guessing_game`.
+{{#include ../listings/ch02-guessing-game-tutorial/listing-02-04/output.txt}}
 ```
 
 The core of the error states that there are *mismatched types*. Rust has a
@@ -705,24 +655,7 @@ do that by adding the following two lines to the `main` function body:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-// --snip--
-
-    let mut guess = String::new();
-
-    io::stdin().read_line(&mut guess)
-        .expect("Failed to read line");
-
-    let guess: u32 = guess.trim().parse()
-        .expect("Please type a number!");
-
-    println!("You guessed: {}", guess);
-
-    match guess.cmp(&secret_number) {
-        Ordering::Less => println!("Too small!"),
-        Ordering::Greater => println!("Too big!"),
-        Ordering::Equal => println!("You win!"),
-    }
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs:here}}
 ```
 
 The two new lines are:
@@ -779,10 +712,16 @@ number that we want from the `Ok` value.
 
 Let’s run the program now!
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/
+cargo run
+  76
+-->
+
 ```text
 $ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.43 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.43s
      Running `target/debug/guessing_game`
 Guess the number!
 The secret number is: 58
@@ -808,22 +747,7 @@ more chances at guessing the number:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-// --snip--
-
-    println!("The secret number is: {}", secret_number);
-
-    loop {
-        println!("Please input your guess.");
-
-        // --snip--
-
-        match guess.cmp(&secret_number) {
-            Ordering::Less => println!("Too small!"),
-            Ordering::Greater => println!("Too big!"),
-            Ordering::Equal => println!("You win!"),
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs:here}}
 ```
 
 As you can see, we’ve moved everything into a loop from the guess input prompt
@@ -839,10 +763,19 @@ Guess to the Secret Number”](#comparing-the-guess-to-the-secret-number)<!--
 ignore -->: if the user enters a non-number answer, the program will crash. The
 user can take advantage of that in order to quit, as shown here:
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/no-listing-04-looping/
+cargo run
+(too small guess)
+(too big guess)
+(correct guess)
+quit
+-->
+
 ```text
 $ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
-    Finished dev [unoptimized + debuginfo] target(s) in 1.50 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 1.50s
      Running `target/debug/guessing_game`
 Guess the number!
 The secret number is: 59
@@ -860,9 +793,8 @@ You guessed: 59
 You win!
 Please input your guess.
 quit
-thread 'main' panicked at 'Please type a number!: ParseIntError { kind: InvalidDigit }', src/libcore/result.rs:785
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-error: Process didn't exit successfully: `target/debug/guess` (exit code: 101)
+thread 'main' panicked at 'Please type a number!: ParseIntError { kind: InvalidDigit }', src/libcore/result.rs:999:5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
 ```
 
 Typing `quit` actually quits the game, but so will any other non-number input.
@@ -876,18 +808,7 @@ Let’s program the game to quit when the user wins by adding a `break` statemen
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-// --snip--
-
-        match guess.cmp(&secret_number) {
-            Ordering::Less => println!("Too small!"),
-            Ordering::Greater => println!("Too big!"),
-            Ordering::Equal => {
-                println!("You win!");
-                break;
-            }
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs:here}}
 ```
 
 Adding the `break` line after `You win!` makes the program exit the loop when
@@ -904,19 +825,7 @@ is converted from a `String` to a `u32`, as shown in Listing 2-5.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-// --snip--
-
-io::stdin().read_line(&mut guess)
-    .expect("Failed to read line");
-
-let guess: u32 = match guess.trim().parse() {
-    Ok(num) => num,
-    Err(_) => continue,
-};
-
-println!("You guessed: {}", guess);
-
-// --snip--
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 2-5: Ignoring a non-number guess and asking for
@@ -946,6 +855,15 @@ program ignores all errors that `parse` might encounter!
 
 Now everything in the program should work as expected. Let’s try it:
 
+<!-- manual-regeneration
+cd listings/ch02-guessing-game-tutorial/listing-02-05/
+cargo run
+(too small guess)
+(too big guess)
+foo
+(correct guess)
+-->
+
 ```text
 $ cargo run
    Compiling guessing_game v0.1.0 (file:///projects/guessing_game)
@@ -976,40 +894,7 @@ secret number. Listing 2-6 shows the final code.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use std::io;
-use std::cmp::Ordering;
-use rand::Rng;
-
-fn main() {
-    println!("Guess the number!");
-
-    let secret_number = rand::thread_rng().gen_range(1, 101);
-
-    loop {
-        println!("Please input your guess.");
-
-        let mut guess = String::new();
-
-        io::stdin().read_line(&mut guess)
-            .expect("Failed to read line");
-
-        let guess: u32 = match guess.trim().parse() {
-            Ok(num) => num,
-            Err(_) => continue,
-        };
-
-        println!("You guessed: {}", guess);
-
-        match guess.cmp(&secret_number) {
-            Ordering::Less => println!("Too small!"),
-            Ordering::Greater => println!("Too big!"),
-            Ordering::Equal => {
-                println!("You win!");
-                break;
-            }
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs}}
 ```
 
 <span class="caption">Listing 2-6: Complete guessing game code</span>
diff --git a/src/doc/book/src/ch03-00-common-programming-concepts.md b/src/doc/book/src/ch03-00-common-programming-concepts.md
index 4b91c2a5cf..801ecc3c34 100644
--- a/src/doc/book/src/ch03-00-common-programming-concepts.md
+++ b/src/doc/book/src/ch03-00-common-programming-concepts.md
@@ -18,4 +18,6 @@ them early will give you a strong core to start from.
 > special meanings, and you’ll be using them to do various tasks in your Rust
 > programs; a few have no current functionality associated with them but have
 > been reserved for functionality that might be added to Rust in the future. You
-> can find a list of the keywords in Appendix A.
+> can find a list of the keywords in [Appendix A][appendix_a].
+
+[appendix_a]: appendix-01-keywords.md
diff --git a/src/doc/book/src/ch03-01-variables-and-mutability.md b/src/doc/book/src/ch03-01-variables-and-mutability.md
index d6a73a092e..05fea9aa2b 100644
--- a/src/doc/book/src/ch03-01-variables-and-mutability.md
+++ b/src/doc/book/src/ch03-01-variables-and-mutability.md
@@ -17,26 +17,14 @@ code with the following code that won’t compile just yet:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = 5;
-    println!("The value of x is: {}", x);
-    x = 6;
-    println!("The value of x is: {}", x);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/src/main.rs}}
 ```
 
 Save and run the program using `cargo run`. You should receive an error
 message, as shown in this output:
 
 ```text
-error[E0384]: cannot assign twice to immutable variable `x`
- --> src/main.rs:4:5
-  |
-2 |     let x = 5;
-  |         - first assignment to `x`
-3 |     println!("The value of x is: {}", x);
-4 |     x = 6;
-  |     ^^^^^ cannot assign twice to immutable variable
+{{#include ../listings/ch03-common-programming-concepts/no-listing-01-variables-are-immutable/output.txt}}
 ```
 
 This example shows how the compiler helps you find errors in your programs.
@@ -72,23 +60,13 @@ For example, let’s change *src/main.rs* to the following:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let mut x = 5;
-    println!("The value of x is: {}", x);
-    x = 6;
-    println!("The value of x is: {}", x);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-02-adding-mut/src/main.rs}}
 ```
 
 When we run the program now, we get this:
 
 ```text
-$ cargo run
-   Compiling variables v0.1.0 (file:///projects/variables)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.30 secs
-     Running `target/debug/variables`
-The value of x is: 5
-The value of x is: 6
+{{#include ../listings/ch03-common-programming-concepts/no-listing-02-adding-mut/output.txt}}
 ```
 
 We’re allowed to change the value that `x` binds to from `5` to `6` when `mut`
@@ -160,15 +138,7 @@ of the `let` keyword as follows:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = 5;
-
-    let x = x + 1;
-
-    let x = x * 2;
-
-    println!("The value of x is: {}", x);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-03-shadowing/src/main.rs}}
 ```
 
 This program first binds `x` to a value of `5`. Then it shadows `x` by
@@ -178,11 +148,7 @@ previous value by `2` to give `x` a final value of `12`. When we run this
 program, it will output the following:
 
 ```text
-$ cargo run
-   Compiling variables v0.1.0 (file:///projects/variables)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running `target/debug/variables`
-The value of x is: 12
+{{#include ../listings/ch03-common-programming-concepts/no-listing-03-shadowing/output.txt}}
 ```
 
 Shadowing is different from marking a variable as `mut`, because we’ll get a
@@ -198,8 +164,7 @@ program asks a user to show how many spaces they want between some text by
 inputting space characters, but we really want to store that input as a number:
 
 ```rust
-let spaces = "   ";
-let spaces = spaces.len();
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-04-shadowing-can-change-types/src/main.rs:here}}
 ```
 
 This construct is allowed because the first `spaces` variable is a string type
@@ -210,21 +175,13 @@ from having to come up with different names, such as `spaces_str` and
 try to use `mut` for this, as shown here, we’ll get a compile-time error:
 
 ```rust,ignore,does_not_compile
-let mut spaces = "   ";
-spaces = spaces.len();
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/src/main.rs:here}}
 ```
 
 The error says we’re not allowed to mutate a variable’s type:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs:3:14
-  |
-3 |     spaces = spaces.len();
-  |              ^^^^^^^^^^^^ expected &str, found usize
-  |
-  = note: expected type `&str`
-             found type `usize`
+{{#include ../listings/ch03-common-programming-concepts/no-listing-05-mut-cant-change-types/output.txt}}
 ```
 
 Now that we’ve explored how variables work, let’s look at more data types they
diff --git a/src/doc/book/src/ch03-02-data-types.md b/src/doc/book/src/ch03-02-data-types.md
index 482e69f73f..5c8b162b80 100644
--- a/src/doc/book/src/ch03-02-data-types.md
+++ b/src/doc/book/src/ch03-02-data-types.md
@@ -21,14 +21,7 @@ error, which means the compiler needs more information from us to know which
 type we want to use:
 
 ```text
-error[E0282]: type annotations needed
- --> src/main.rs:2:9
-  |
-2 |     let guess = "42".parse().expect("Not a number!");
-  |         ^^^^^
-  |         |
-  |         cannot infer type for `_`
-  |         consider giving `guess` a type
+{{#include ../listings/ch03-common-programming-concepts/output-only-01-no-type-annotations/output.txt}}
 ```
 
 You’ll see different type annotations for other data types.
@@ -133,11 +126,7 @@ Here’s an example that shows floating-point numbers in action:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = 2.0; // f64
-
-    let y: f32 = 3.0; // f32
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-06-floating-point/src/main.rs}}
 ```
 
 Floating-point numbers are represented according to the IEEE-754 standard. The
@@ -152,22 +141,7 @@ The following code shows how you’d use each one in a `let` statement:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    // addition
-    let sum = 5 + 10;
-
-    // subtraction
-    let difference = 95.5 - 4.3;
-
-    // multiplication
-    let product = 4 * 30;
-
-    // division
-    let quotient = 56.7 / 32.2;
-
-    // remainder
-    let remainder = 43 % 5;
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-07-numeric-operations/src/main.rs}}
 ```
 
 Each expression in these statements uses a mathematical operator and evaluates
@@ -183,11 +157,7 @@ Rust is specified using `bool`. For example:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let t = true;
-
-    let f: bool = false; // with explicit type annotation
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-08-boolean/src/main.rs}}
 ```
 
 The main way to use Boolean values is through conditionals, such as an `if`
@@ -204,11 +174,7 @@ single quotes, as opposed to string literals, which use double quotes.)
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let c = 'z';
-    let z = 'ℤ';
-    let heart_eyed_cat = '😻';
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-09-char/src/main.rs}}
 ```
 
 Rust’s `char` type is four bytes in size and represents a Unicode Scalar Value,
@@ -240,9 +206,7 @@ type annotations in this example:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let tup: (i32, f64, u8) = (500, 6.4, 1);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-10-tuples/src/main.rs}}
 ```
 
 The variable `tup` binds to the entire tuple, because a tuple is considered a
@@ -252,13 +216,7 @@ use pattern matching to destructure a tuple value, like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let tup = (500, 6.4, 1);
-
-    let (x, y, z) = tup;
-
-    println!("The value of y is: {}", y);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-11-destructuring-tuples/src/main.rs}}
 ```
 
 This program first creates a tuple and binds it to the variable `tup`. It then
@@ -274,15 +232,7 @@ want to access. For example:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x: (i32, f64, u8) = (500, 6.4, 1);
-
-    let five_hundred = x.0;
-
-    let six_point_four = x.1;
-
-    let one = x.2;
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-12-tuple-indexing/src/main.rs}}
 ```
 
 This program creates a tuple, `x`, and then makes new variables for each
@@ -302,9 +252,7 @@ inside square brackets:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let a = [1, 2, 3, 4, 5];
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-13-arrays/src/main.rs}}
 ```
 
 Arrays are useful when you want your data allocated on the stack rather than
@@ -357,12 +305,7 @@ elements of an array using indexing, like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let a = [1, 2, 3, 4, 5];
-
-    let first = a[0];
-    let second = a[1];
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-14-array-indexing/src/main.rs}}
 ```
 
 In this example, the variable named `first` will get the value `1`, because
@@ -378,26 +321,13 @@ compile but exit with an error when it runs:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,panics
-fn main() {
-    let a = [1, 2, 3, 4, 5];
-    let index = 10;
-
-    let element = a[index];
-
-    println!("The value of element is: {}", element);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/src/main.rs}}
 ```
 
 Running this code using `cargo run` produces the following result:
 
 ```text
-$ cargo run
-   Compiling arrays v0.1.0 (file:///projects/arrays)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running `target/debug/arrays`
-thread 'main' panicked at 'index out of bounds: the len is 5 but the index is
- 10', src/main.rs:5:19
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch03-common-programming-concepts/no-listing-15-invalid-array-access/output.txt}}
 ```
 
 The compilation didn’t produce any errors, but the program resulted in a
diff --git a/src/doc/book/src/ch03-03-how-functions-work.md b/src/doc/book/src/ch03-03-how-functions-work.md
index 9500757997..491a69b859 100644
--- a/src/doc/book/src/ch03-03-how-functions-work.md
+++ b/src/doc/book/src/ch03-03-how-functions-work.md
@@ -12,15 +12,7 @@ Here’s a program that contains an example function definition:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    println!("Hello, world!");
-
-    another_function();
-}
-
-fn another_function() {
-    println!("Another function.");
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-16-functions/src/main.rs}}
 ```
 
 Function definitions in Rust start with `fn` and have a set of parentheses
@@ -39,12 +31,7 @@ further. Place the `another_function` example in *src/main.rs* and run it. You
 should see the following output:
 
 ```text
-$ cargo run
-   Compiling functions v0.1.0 (file:///projects/functions)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.28 secs
-     Running `target/debug/functions`
-Hello, world!
-Another function.
+{{#include ../listings/ch03-common-programming-concepts/no-listing-16-functions/output.txt}}
 ```
 
 The lines execute in the order in which they appear in the `main` function.
@@ -67,23 +54,13 @@ look like in Rust:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    another_function(5);
-}
-
-fn another_function(x: i32) {
-    println!("The value of x is: {}", x);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/src/main.rs}}
 ```
 
 Try running this program; you should get the following output:
 
 ```text
-$ cargo run
-   Compiling functions v0.1.0 (file:///projects/functions)
-    Finished dev [unoptimized + debuginfo] target(s) in 1.21 secs
-     Running `target/debug/functions`
-The value of x is: 5
+{{#include ../listings/ch03-common-programming-concepts/no-listing-17-functions-with-parameters/output.txt}}
 ```
 
 The declaration of `another_function` has one parameter named `x`. The type of
@@ -102,14 +79,7 @@ declarations with commas, like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    another_function(5, 6);
-}
-
-fn another_function(x: i32, y: i32) {
-    println!("The value of x is: {}", x);
-    println!("The value of y is: {}", y);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/src/main.rs}}
 ```
 
 This example creates a function with two parameters, both of which are `i32`
@@ -122,12 +92,7 @@ project’s *src/main.rs* file with the preceding example and run it using `carg
 run`:
 
 ```text
-$ cargo run
-   Compiling functions v0.1.0 (file:///projects/functions)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running `target/debug/functions`
-The value of x is: 5
-The value of y is: 6
+{{#include ../listings/ch03-common-programming-concepts/no-listing-18-functions-with-multiple-parameters/output.txt}}
 ```
 
 Because we called the function with `5` as the value for  `x` and `6` is passed
@@ -153,9 +118,7 @@ statement. In Listing 3-1, `let y = 6;` is a statement.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let y = 6;
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/listing-03-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 3-1: A `main` function declaration containing one statement</span>
@@ -169,13 +132,14 @@ to another variable, as the following code tries to do; you’ll get an error:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = (let y = 6);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-19-statements-vs-expressions/src/main.rs}}
 ```
 
 When you run this program, the error you’ll get looks like this:
 
+<!--TODO: not extracting this because the new error message is incorrect; see
+https://github.com/rust-lang/rust/issues/65254 -->
+
 ```text
 $ cargo run
    Compiling functions v0.1.0 (file:///projects/functions)
@@ -205,16 +169,7 @@ new scopes, `{}`, is an expression, for example:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = 5;
-
-    let y = {
-        let x = 3;
-        x + 1
-    };
-
-    println!("The value of y is: {}", y);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-20-blocks-are-expressions/src/main.rs}}
 ```
 
 This expression:
@@ -246,15 +201,7 @@ value:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn five() -> i32 {
-    5
-}
-
-fn main() {
-    let x = five();
-
-    println!("The value of x is: {}", x);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-21-function-return-values/src/main.rs}}
 ```
 
 There are no function calls, macros, or even `let` statements in the `five`
@@ -263,11 +210,7 @@ Rust. Note that the function’s return type is specified too, as `-> i32`. Try
 running this code; the output should look like this:
 
 ```text
-$ cargo run
-   Compiling functions v0.1.0 (file:///projects/functions)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.30 secs
-     Running `target/debug/functions`
-The value of x is: 5
+{{#include ../listings/ch03-common-programming-concepts/no-listing-21-function-return-values/output.txt}}
 ```
 
 The `5` in `five` is the function’s return value, which is why the return type
@@ -289,15 +232,7 @@ Let’s look at another example:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = plus_one(5);
-
-    println!("The value of x is: {}", x);
-}
-
-fn plus_one(x: i32) -> i32 {
-    x + 1
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-22-function-parameter-and-return/src/main.rs}}
 ```
 
 Running this code will print `The value of x is: 6`. But if we place a
@@ -307,32 +242,13 @@ expression to a statement, we’ll get an error.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = plus_one(5);
-
-    println!("The value of x is: {}", x);
-}
-
-fn plus_one(x: i32) -> i32 {
-    x + 1;
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/src/main.rs}}
 ```
 
 Compiling this code produces an error, as follows:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs:7:28
-  |
-7 |   fn plus_one(x: i32) -> i32 {
-  |  ____________________________^
-8 | |     x + 1;
-  | |          - help: consider removing this semicolon
-9 | | }
-  | |_^ expected i32, found ()
-  |
-  = note: expected type `i32`
-             found type `()`
+{{#include ../listings/ch03-common-programming-concepts/no-listing-23-statements-dont-return-values/output.txt}}
 ```
 
 The main error message, “mismatched types,” reveals the core issue with this
diff --git a/src/doc/book/src/ch03-04-comments.md b/src/doc/book/src/ch03-04-comments.md
index d42e38c2a2..6a3f8efd46 100644
--- a/src/doc/book/src/ch03-04-comments.md
+++ b/src/doc/book/src/ch03-04-comments.md
@@ -11,9 +11,9 @@ Here’s a simple comment:
 // hello, world
 ```
 
-In Rust, comments must start with two slashes and continue until the end of the
-line. For comments that extend beyond a single line, you’ll need to include
-`//` on each line, like this:
+In Rust, the idiomatic comment style starts a comment with two slashes, and the
+comment continues until the end of the line. For comments that extend beyond a
+single line, you’ll need to include `//` on each line, like this:
 
 ```rust
 // So we’re doing something complicated here, long enough that we need
@@ -26,9 +26,7 @@ Comments can also be placed at the end of lines containing code:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let lucky_number = 7; // I’m feeling lucky today
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-24-comments-end-of-line/src/main.rs}}
 ```
 
 But you’ll more often see them used in this format, with the comment on a
@@ -37,10 +35,7 @@ separate line above the code it’s annotating:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    // I’m feeling lucky today
-    let lucky_number = 7;
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-25-comments-above-line/src/main.rs}}
 ```
 
 Rust also has another kind of comment, documentation comments, which we’ll
diff --git a/src/doc/book/src/ch03-05-control-flow.md b/src/doc/book/src/ch03-05-control-flow.md
index ac529d926d..8c6ce75140 100644
--- a/src/doc/book/src/ch03-05-control-flow.md
+++ b/src/doc/book/src/ch03-05-control-flow.md
@@ -18,15 +18,7 @@ the `if` expression. In the *src/main.rs* file, input the following:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let number = 3;
-
-    if number < 5 {
-        println!("condition was true");
-    } else {
-        println!("condition was false");
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-26-if-true/src/main.rs}}
 ```
 
 All `if` expressions start with the keyword `if`, which is followed by a
@@ -48,28 +40,20 @@ to the next bit of code.
 Try running this code; you should see the following output:
 
 ```text
-$ cargo run
-   Compiling branches v0.1.0 (file:///projects/branches)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running `target/debug/branches`
-condition was true
+{{#include ../listings/ch03-common-programming-concepts/no-listing-26-if-true/output.txt}}
 ```
 
 Let’s try changing the value of `number` to a value that makes the condition
 `false` to see what happens:
 
 ```rust,ignore
-let number = 7;
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-27-if-false/src/main.rs:here}}
 ```
 
 Run the program again, and look at the output:
 
 ```text
-$ cargo run
-   Compiling branches v0.1.0 (file:///projects/branches)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running `target/debug/branches`
-condition was false
+{{#include ../listings/ch03-common-programming-concepts/no-listing-27-if-false/output.txt}}
 ```
 
 It’s also worth noting that the condition in this code *must* be a `bool`. If
@@ -79,27 +63,14 @@ following code:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let number = 3;
-
-    if number {
-        println!("number was three");
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/src/main.rs}}
 ```
 
 The `if` condition evaluates to a value of `3` this time, and Rust throws an
 error:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs:4:8
-  |
-4 |     if number {
-  |        ^^^^^^ expected bool, found integer
-  |
-  = note: expected type `bool`
-             found type `{integer}`
+{{#include ../listings/ch03-common-programming-concepts/no-listing-28-if-condition-must-be-bool/output.txt}}
 ```
 
 The error indicates that Rust expected a `bool` but got an integer. Unlike
@@ -112,13 +83,7 @@ expression to the following:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let number = 3;
-
-    if number != 0 {
-        println!("number was something other than zero");
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-29-if-not-equal-0/src/main.rs}}
 ```
 
 Running this code will print `number was something other than zero`.
@@ -131,30 +96,14 @@ expression. For example:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let number = 6;
-
-    if number % 4 == 0 {
-        println!("number is divisible by 4");
-    } else if number % 3 == 0 {
-        println!("number is divisible by 3");
-    } else if number % 2 == 0 {
-        println!("number is divisible by 2");
-    } else {
-        println!("number is not divisible by 4, 3, or 2");
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-30-else-if/src/main.rs}}
 ```
 
 This program has four possible paths it can take. After running it, you should
 see the following output:
 
 ```text
-$ cargo run
-   Compiling branches v0.1.0 (file:///projects/branches)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running `target/debug/branches`
-number is divisible by 3
+{{#include ../listings/ch03-common-programming-concepts/no-listing-30-else-if/output.txt}}
 ```
 
 When this program executes, it checks each `if` expression in turn and executes
@@ -176,16 +125,7 @@ statement, as in Listing 3-2.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let condition = true;
-    let number = if condition {
-        5
-    } else {
-        6
-    };
-
-    println!("The value of number is: {}", number);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/listing-03-02/src/main.rs}}
 ```
 
 <span class="caption">Listing 3-2: Assigning the result of an `if` expression
@@ -195,11 +135,7 @@ The `number` variable will be bound to a value based on the outcome of the `if`
 expression. Run this code to see what happens:
 
 ```text
-$ cargo run
-   Compiling branches v0.1.0 (file:///projects/branches)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.30 secs
-     Running `target/debug/branches`
-The value of number is: 5
+{{#include ../listings/ch03-common-programming-concepts/listing-03-02/output.txt}}
 ```
 
 Remember that blocks of code evaluate to the last expression in them, and
@@ -213,17 +149,7 @@ example, we’ll get an error:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let condition = true;
-
-    let number = if condition {
-        5
-    } else {
-        "six"
-    };
-
-    println!("The value of number is: {}", number);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/src/main.rs}}
 ```
 
 When we try to compile this code, we’ll get an error. The `if` and `else` arms
@@ -231,19 +157,7 @@ have value types that are incompatible, and Rust indicates exactly where to
 find the problem in the program:
 
 ```text
-error[E0308]: if and else have incompatible types
- --> src/main.rs:4:18
-  |
-4 |       let number = if condition {
-  |  __________________^
-5 | |         5
-6 | |     } else {
-7 | |         "six"
-8 | |     };
-  | |_____^ expected integer, found &str
-  |
-  = note: expected type `{integer}`
-             found type `&str`
+{{#include ../listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt}}
 ```
 
 The expression in the `if` block evaluates to an integer, and the expression in
@@ -275,11 +189,7 @@ like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    loop {
-        println!("again!");
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-32-loop/src/main.rs}}
 ```
 
 When we run this program, we’ll see `again!` printed over and over continuously
@@ -287,10 +197,16 @@ until we stop the program manually. Most terminals support a keyboard shortcut,
 <span class="keystroke">ctrl-c</span>, to interrupt a program that is stuck in
 a continual loop. Give it a try:
 
+<!-- manual-regeneration
+cd listings/ch03-common-programming-concepts/no-listing-32-loop
+cargo run
+CTRL-C
+-->
+
 ```text
 $ cargo run
    Compiling loops v0.1.0 (file:///projects/loops)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.29 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.29s
      Running `target/debug/loops`
 again!
 again!
@@ -321,19 +237,7 @@ the loop; that value will be returned out of the loop so you can use it, as
 shown here:
 
 ```rust
-fn main() {
-    let mut counter = 0;
-
-    let result = loop {
-        counter += 1;
-
-        if counter == 10 {
-            break counter * 2;
-        }
-    };
-
-    println!("The result is {}", result);
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-33-return-value-from-loop/src/main.rs}}
 ```
 
 Before the loop, we declare a variable named `counter` and initialize it to
@@ -360,17 +264,7 @@ another message and exits.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let mut number = 3;
-
-    while number != 0 {
-        println!("{}!", number);
-
-        number -= 1;
-    }
-
-    println!("LIFTOFF!!!");
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/listing-03-03/src/main.rs}}
 ```
 
 <span class="caption">Listing 3-3: Using a `while` loop to run code while a
@@ -388,16 +282,7 @@ such as an array. For example, let’s look at Listing 3-4.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let a = [10, 20, 30, 40, 50];
-    let mut index = 0;
-
-    while index < 5 {
-        println!("the value is: {}", a[index]);
-
-        index += 1;
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/listing-03-04/src/main.rs}}
 ```
 
 <span class="caption">Listing 3-4: Looping through each element of a collection
@@ -409,15 +294,7 @@ when `index < 5` is no longer true). Running this code will print every element
 in the array:
 
 ```text
-$ cargo run
-   Compiling loops v0.1.0 (file:///projects/loops)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.32 secs
-     Running `target/debug/loops`
-the value is: 10
-the value is: 20
-the value is: 30
-the value is: 40
-the value is: 50
+{{#include ../listings/ch03-common-programming-concepts/listing-03-04/output.txt}}
 ```
 
 All five array values appear in the terminal, as expected. Even though `index`
@@ -435,13 +312,7 @@ for each item in a collection. A `for` loop looks like the code in Listing 3-5.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let a = [10, 20, 30, 40, 50];
-
-    for element in a.iter() {
-        println!("the value is: {}", element);
-    }
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/listing-03-05/src/main.rs}}
 ```
 
 <span class="caption">Listing 3-5: Looping through each element of a collection
@@ -452,10 +323,11 @@ importantly, we’ve now increased the safety of the code and eliminated the
 chance of bugs that might result from going beyond the end of the array or not
 going far enough and missing some items.
 
-For example, in the code in Listing 3-4, if you removed an item from the `a`
-array but forgot to update the condition to `while index < 4`, the code would
-panic. Using the `for` loop, you wouldn’t need to remember to change any other
-code if you changed the number of values in the array.
+For example, in the code in Listing 3-4, if you changed the definition of the
+`a` array to have four elements but forgot to update the condition to `while
+index < 4`, the code would panic. Using the `for` loop, you wouldn’t need to
+remember to change any other code if you changed the number of values in the
+array.
 
 The safety and conciseness of `for` loops make them the most commonly used loop
 construct in Rust. Even in situations in which you want to run some code a
@@ -471,12 +343,7 @@ we’ve not yet talked about, `rev`, to reverse the range:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    for number in (1..4).rev() {
-        println!("{}!", number);
-    }
-    println!("LIFTOFF!!!");
-}
+{{#rustdoc_include ../listings/ch03-common-programming-concepts/no-listing-34-for-range/src/main.rs}}
 ```
 
 This code is a bit nicer, isn’t it?
diff --git a/src/doc/book/src/ch04-01-what-is-ownership.md b/src/doc/book/src/ch04-01-what-is-ownership.md
index cf8fd209b4..001830083c 100644
--- a/src/doc/book/src/ch04-01-what-is-ownership.md
+++ b/src/doc/book/src/ch04-01-what-is-ownership.md
@@ -30,14 +30,14 @@ strings.
 > be described in relation to the stack and the heap later in this chapter, so
 > here is a brief explanation in preparation.
 >
-> Both the stack and the heap are parts of memory that are available to your code
-> to use at runtime, but they are structured in different ways. The stack stores
-> values in the order it gets them and removes the values in the opposite order.
-> This is referred to as *last in, first out*. Think of a stack of plates: when
-> you add more plates, you put them on top of the pile, and when you need a
-> plate, you take one off the top. Adding or removing plates from the middle or
-> bottom wouldn’t work as well! Adding data is called *pushing onto the stack*,
-> and removing data is called *popping off the stack*.
+> Both the stack and the heap are parts of memory that are available to your
+> code to use at runtime, but they are structured in different ways. The stack
+> stores values in the order it gets them and removes the values in the
+> opposite order. This is referred to as *last in, first out*. Think of a stack
+> of plates: when you add more plates, you put them on top of the pile, and
+> when you need a plate, you take one off the top. Adding or removing plates
+> from the middle or bottom wouldn’t work as well! Adding data is called
+> *pushing onto the stack*, and removing data is called *popping off the stack*.
 >
 > All data stored on the stack must have a known, fixed size. Data with an
 > unknown size at compile time or a size that might change must be stored on
@@ -117,11 +117,7 @@ which it’s declared until the end of the current *scope*. Listing 4-1 has
 comments annotating where the variable `s` is valid.
 
 ```rust
-{                      // s is not valid here, it’s not yet declared
-    let s = "hello";   // s is valid from this point forward
-
-    // do stuff with s
-}                      // this scope is now over, and s is no longer valid
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 4-1: A variable and the scope in which it is
@@ -147,7 +143,7 @@ data.
 
 We’ll use `String` as the example here and concentrate on the parts of `String`
 that relate to ownership. These aspects also apply to other complex data types,
-whether they are provided by the standard library or created by you. We’ll 
+whether they are provided by the standard library or created by you. We’ll
 discuss `String` in more depth in Chapter 8.
 
 We’ve already seen string literals, where a string value is hardcoded into our
@@ -174,11 +170,7 @@ Module Tree”][paths-module-tree]<!-- ignore --> in Chapter 7.
 This kind of string *can* be mutated:
 
 ```rust
-let mut s = String::from("hello");
-
-s.push_str(", world!"); // push_str() appends a literal to a String
-
-println!("{}", s); // This will print `hello, world!`
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/src/main.rs:here}}
 ```
 
 So, what’s the difference here? Why can `String` be mutated but literals
@@ -219,12 +211,7 @@ variable that owns it goes out of scope. Here’s a version of our scope example
 from Listing 4-1 using a `String` instead of a string literal:
 
 ```rust
-{
-    let s = String::from("hello"); // s is valid from this point forward
-
-    // do stuff with s
-}                                  // this scope is now over, and s is no
-                                   // longer valid
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-02-string-scope/src/main.rs:here}}
 ```
 
 There is a natural point at which we can return the memory our `String` needs
@@ -249,8 +236,7 @@ Multiple variables can interact with the same data in different ways in Rust.
 Let’s look at an example using an integer in Listing 4-2.
 
 ```rust
-let x = 5;
-let y = x;
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 4-2: Assigning the integer value of variable `x`
@@ -265,8 +251,7 @@ onto the stack.
 Now let’s look at the `String` version:
 
 ```rust
-let s1 = String::from("hello");
-let s2 = s1;
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-03-string-move/src/main.rs:here}}
 ```
 
 This looks very similar to the previous code, so we might assume that the way
@@ -325,27 +310,14 @@ anything when `s1` goes out of scope. Check out what happens when you try to
 use `s1` after `s2` is created; it won’t work:
 
 ```rust,ignore,does_not_compile
-let s1 = String::from("hello");
-let s2 = s1;
-
-println!("{}, world!", s1);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/src/main.rs:here}}
 ```
 
 You’ll get an error like this because Rust prevents you from using the
 invalidated reference:
 
 ```text
-error[E0382]: use of moved value: `s1`
- --> src/main.rs:5:28
-  |
-3 |     let s2 = s1;
-  |         -- value moved here
-4 |
-5 |     println!("{}, world!", s1);
-  |                            ^^ value used here after move
-  |
-  = note: move occurs because `s1` has type `std::string::String`, which does
-  not implement the `Copy` trait
+{{#include ../listings/ch04-understanding-ownership/no-listing-04-cant-use-after-move/output.txt}}
 ```
 
 If you’ve heard the terms *shallow copy* and *deep copy* while working with
@@ -377,10 +349,7 @@ programming languages, you’ve probably seen them before.
 Here’s an example of the `clone` method in action:
 
 ```rust
-let s1 = String::from("hello");
-let s2 = s1.clone();
-
-println!("s1 = {}, s2 = {}", s1, s2);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-05-clone/src/main.rs:here}}
 ```
 
 This works just fine and explicitly produces the behavior shown in Figure 4-3,
@@ -396,10 +365,7 @@ There’s another wrinkle we haven’t talked about yet. This code using integer
 part of which was shown in Listing 4-2, works and is valid:
 
 ```rust
-let x = 5;
-let y = x;
-
-println!("x = {}, y = {}", x, y);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-06-copy/src/main.rs:here}}
 ```
 
 But this code seems to contradict what we just learned: we don’t have a call to
@@ -444,29 +410,7 @@ showing where variables go into and out of scope.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let s = String::from("hello");  // s comes into scope
-
-    takes_ownership(s);             // s's value moves into the function...
-                                    // ... and so is no longer valid here
-
-    let x = 5;                      // x comes into scope
-
-    makes_copy(x);                  // x would move into the function,
-                                    // but i32 is Copy, so it’s okay to still
-                                    // use x afterward
-
-} // Here, x goes out of scope, then s. But because s's value was moved, nothing
-  // special happens.
-
-fn takes_ownership(some_string: String) { // some_string comes into scope
-    println!("{}", some_string);
-} // Here, some_string goes out of scope and `drop` is called. The backing
-  // memory is freed.
-
-fn makes_copy(some_integer: i32) { // some_integer comes into scope
-    println!("{}", some_integer);
-} // Here, some_integer goes out of scope. Nothing special happens.
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-03/src/main.rs}}
 ```
 
 <span class="caption">Listing 4-3: Functions with ownership and scope
@@ -485,35 +429,7 @@ similar annotations to those in Listing 4-3.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let s1 = gives_ownership();         // gives_ownership moves its return
-                                        // value into s1
-
-    let s2 = String::from("hello");     // s2 comes into scope
-
-    let s3 = takes_and_gives_back(s2);  // s2 is moved into
-                                        // takes_and_gives_back, which also
-                                        // moves its return value into s3
-} // Here, s3 goes out of scope and is dropped. s2 goes out of scope but was
-  // moved, so nothing happens. s1 goes out of scope and is dropped.
-
-fn gives_ownership() -> String {             // gives_ownership will move its
-                                             // return value into the function
-                                             // that calls it
-
-    let some_string = String::from("hello"); // some_string comes into scope
-
-    some_string                              // some_string is returned and
-                                             // moves out to the calling
-                                             // function
-}
-
-// takes_and_gives_back will take a String and return one
-fn takes_and_gives_back(a_string: String) -> String { // a_string comes into
-                                                      // scope
-
-    a_string  // a_string is returned and moves out to the calling function
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-04/src/main.rs}}
 ```
 
 <span class="caption">Listing 4-4: Transferring ownership of return
@@ -535,19 +451,7 @@ It’s possible to return multiple values using a tuple, as shown in Listing 4-5
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let s1 = String::from("hello");
-
-    let (s2, len) = calculate_length(s1);
-
-    println!("The length of '{}' is {}.", s2, len);
-}
-
-fn calculate_length(s: String) -> (String, usize) {
-    let length = s.len(); // len() returns the length of a String
-
-    (s, length)
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-05/src/main.rs}}
 ```
 
 <span class="caption">Listing 4-5: Returning ownership of parameters</span>
diff --git a/src/doc/book/src/ch04-02-references-and-borrowing.md b/src/doc/book/src/ch04-02-references-and-borrowing.md
index 985f17f172..5554fc3d37 100644
--- a/src/doc/book/src/ch04-02-references-and-borrowing.md
+++ b/src/doc/book/src/ch04-02-references-and-borrowing.md
@@ -12,17 +12,7 @@ value:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let s1 = String::from("hello");
-
-    let len = calculate_length(&s1);
-
-    println!("The length of '{}' is {}.", s1, len);
-}
-
-fn calculate_length(s: &String) -> usize {
-    s.len()
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-07-reference/src/main.rs:all}}
 ```
 
 First, notice that all the tuple code in the variable declaration and the
@@ -46,12 +36,7 @@ s1`</span>
 Let’s take a closer look at the function call here:
 
 ```rust
-# fn calculate_length(s: &String) -> usize {
-#     s.len()
-# }
-let s1 = String::from("hello");
-
-let len = calculate_length(&s1);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-07-reference/src/main.rs:here}}
 ```
 
 The `&s1` syntax lets us create a reference that *refers* to the value of `s1`
@@ -62,10 +47,7 @@ Likewise, the signature of the function uses `&` to indicate that the type of
 the parameter `s` is a reference. Let’s add some explanatory annotations:
 
 ```rust
-fn calculate_length(s: &String) -> usize { // s is a reference to a String
-    s.len()
-} // Here, s goes out of scope. But because it does not have ownership of what
-  // it refers to, nothing happens.
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-08-reference-with-annotations/src/main.rs:here}}
 ```
 
 The scope in which the variable `s` is valid is the same as any function
@@ -84,15 +66,7 @@ Listing 4-6. Spoiler alert: it doesn’t work!
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let s = String::from("hello");
-
-    change(&s);
-}
-
-fn change(some_string: &String) {
-    some_string.push_str(", world");
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-06/src/main.rs}}
 ```
 
 <span class="caption">Listing 4-6: Attempting to modify a borrowed value</span>
@@ -100,13 +74,7 @@ fn change(some_string: &String) {
 Here’s the error:
 
 ```text
-error[E0596]: cannot borrow immutable borrowed content `*some_string` as mutable
- --> error.rs:8:5
-  |
-7 | fn change(some_string: &String) {
-  |                        ------- use `&mut String` here to make mutable
-8 |     some_string.push_str(", world");
-  |     ^^^^^^^^^^^ cannot borrow as mutable
+{{#include ../listings/ch04-understanding-ownership/listing-04-06/output.txt}}
 ```
 
 Just as variables are immutable by default, so are references. We’re not
@@ -119,15 +87,7 @@ We can fix the error in the code from Listing 4-6 with just a small tweak:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let mut s = String::from("hello");
-
-    change(&mut s);
-}
-
-fn change(some_string: &mut String) {
-    some_string.push_str(", world");
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-09-fixes-listing-04-06/src/main.rs}}
 ```
 
 First, we had to change `s` to be `mut`. Then we had to create a mutable
@@ -141,27 +101,13 @@ fail:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-let mut s = String::from("hello");
-
-let r1 = &mut s;
-let r2 = &mut s;
-
-println!("{}, {}", r1, r2);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/src/main.rs:here}}
 ```
 
 Here’s the error:
 
 ```text
-error[E0499]: cannot borrow `s` as mutable more than once at a time
- --> src/main.rs:5:14
-  |
-4 |     let r1 = &mut s;
-  |              ------ first mutable borrow occurs here
-5 |     let r2 = &mut s;
-  |              ^^^^^^ second mutable borrow occurs here
-6 |
-7 |     println!("{}, {}", r1, r2);
-  |                        -- first borrow later used here
+{{#include ../listings/ch04-understanding-ownership/no-listing-10-multiple-mut-not-allowed/output.txt}}
 ```
 
 This restriction allows for mutation but in a very controlled fashion. It’s
@@ -184,43 +130,20 @@ As always, we can use curly brackets to create a new scope, allowing for
 multiple mutable references, just not *simultaneous* ones:
 
 ```rust
-let mut s = String::from("hello");
-
-{
-    let r1 = &mut s;
-
-} // r1 goes out of scope here, so we can make a new reference with no problems.
-
-let r2 = &mut s;
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/src/main.rs:here}}
 ```
 
 A similar rule exists for combining mutable and immutable references. This code
 results in an error:
 
 ```rust,ignore,does_not_compile
-let mut s = String::from("hello");
-
-let r1 = &s; // no problem
-let r2 = &s; // no problem
-let r3 = &mut s; // BIG PROBLEM
-
-println!("{}, {}, and {}", r1, r2, r3);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/src/main.rs:here}}
 ```
 
 Here’s the error:
 
 ```text
-error[E0502]: cannot borrow `s` as mutable because it is also borrowed as immutable
- --> src/main.rs:6:14
-  |
-4 |     let r1 = &s; // no problem
-  |              -- immutable borrow occurs here
-5 |     let r2 = &s; // no problem
-6 |     let r3 = &mut s; // BIG PROBLEM
-  |              ^^^^^^ mutable borrow occurs here
-7 |
-8 |     println!("{}, {}, and {}", r1, r2, r3);
-  |                                -- immutable borrow later used here
+{{#include ../listings/ch04-understanding-ownership/no-listing-12-immutable-and-mutable-not-allowed/output.txt}}
 ```
 
 Whew! We *also* cannot have a mutable reference while we have an immutable one.
@@ -235,15 +158,7 @@ compile because the last usage of the immutable references occurs before the
 mutable reference is introduced:
 
 ```rust,edition2018
-let mut s = String::from("hello");
-
-let r1 = &s; // no problem
-let r2 = &s; // no problem
-println!("{} and {}", r1, r2);
-// r1 and r2 are no longer used after this point
-
-let r3 = &mut s; // no problem
-println!("{}", r3);
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-13-reference-scope-ends/src/main.rs:here}}
 ```
 
 The scopes of the immutable references `r1` and `r2` end after the `println!`
@@ -271,29 +186,13 @@ compile-time error:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let reference_to_nothing = dangle();
-}
-
-fn dangle() -> &String {
-    let s = String::from("hello");
-
-    &s
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-14-dangling-reference/src/main.rs}}
 ```
 
 Here’s the error:
 
 ```text
-error[E0106]: missing lifetime specifier
- --> main.rs:5:16
-  |
-5 | fn dangle() -> &String {
-  |                ^ expected lifetime parameter
-  |
-  = help: this function's return type contains a borrowed value, but there is
-  no value for it to be borrowed from
-  = help: consider giving it a 'static lifetime
+{{#include ../listings/ch04-understanding-ownership/no-listing-14-dangling-reference/output.txt}}
 ```
 
 This error message refers to a feature we haven’t covered yet: lifetimes. We’ll
@@ -311,13 +210,7 @@ Let’s take a closer look at exactly what’s happening at each stage of our
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn dangle() -> &String { // dangle returns a reference to a String
-
-    let s = String::from("hello"); // s is a new String
-
-    &s // we return a reference to the String, s
-} // Here, s goes out of scope, and is dropped. Its memory goes away.
-  // Danger!
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-15-dangling-reference-annotated/src/main.rs:here}}
 ```
 
 Because `s` is created inside `dangle`, when the code of `dangle` is finished,
@@ -328,11 +221,7 @@ won’t let us do this.
 The solution here is to return the `String` directly:
 
 ```rust
-fn no_dangle() -> String {
-    let s = String::from("hello");
-
-    s
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-16-no-dangle/src/main.rs:here}}
 ```
 
 This works without any problems. Ownership is moved out, and nothing is
diff --git a/src/doc/book/src/ch04-03-slices.md b/src/doc/book/src/ch04-03-slices.md
index 969884cf47..902cf3a9a8 100644
--- a/src/doc/book/src/ch04-03-slices.md
+++ b/src/doc/book/src/ch04-03-slices.md
@@ -23,17 +23,7 @@ end of the word. Let’s try that, as shown in Listing 4-7.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn first_word(s: &String) -> usize {
-    let bytes = s.as_bytes();
-
-    for (i, &item) in bytes.iter().enumerate() {
-        if item == b' ' {
-            return i;
-        }
-    }
-
-    s.len()
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 4-7: The `first_word` function that returns a
@@ -44,13 +34,13 @@ a value is a space, we’ll convert our `String` to an array of bytes using the
 `as_bytes` method:
 
 ```rust,ignore
-let bytes = s.as_bytes();
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-07/src/main.rs:as_bytes}}
 ```
 
 Next, we create an iterator over the array of bytes using the `iter` method:
 
 ```rust,ignore
-for (i, &item) in bytes.iter().enumerate() {
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-07/src/main.rs:iter}}
 ```
 
 We’ll discuss iterators in more detail in Chapter 13. For now, know that `iter`
@@ -71,12 +61,7 @@ using the byte literal syntax. If we find a space, we return the position.
 Otherwise, we return the length of the string by using `s.len()`:
 
 ```rust,ignore
-    if item == b' ' {
-        return i;
-    }
-}
-
-s.len()
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-07/src/main.rs:inside_for}}
 ```
 
 We now have a way to find out the index of the end of the first word in the
@@ -89,28 +74,7 @@ uses the `first_word` function from Listing 4-7.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# fn first_word(s: &String) -> usize {
-#     let bytes = s.as_bytes();
-#
-#     for (i, &item) in bytes.iter().enumerate() {
-#         if item == b' ' {
-#             return i;
-#         }
-#     }
-#
-#     s.len()
-# }
-#
-fn main() {
-    let mut s = String::from("hello world");
-
-    let word = first_word(&s); // word will get the value 5
-
-    s.clear(); // this empties the String, making it equal to ""
-
-    // word still has the value 5 here, but there's no more string that
-    // we could meaningfully use the value 5 with. word is now totally invalid!
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 4-8: Storing the result from calling the
@@ -142,10 +106,7 @@ Luckily, Rust has a solution to this problem: string slices.
 A *string slice* is a reference to part of a `String`, and it looks like this:
 
 ```rust
-let s = String::from("hello world");
-
-let hello = &s[0..5];
-let world = &s[6..11];
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-17-slice/src/main.rs:here}}
 ```
 
 This is similar to taking a reference to the whole `String` but with the extra
@@ -214,17 +175,7 @@ slice. The type that signifies “string slice” is written as `&str`:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn first_word(s: &String) -> &str {
-    let bytes = s.as_bytes();
-
-    for (i, &item) in bytes.iter().enumerate() {
-        if item == b' ' {
-            return &s[0..i];
-        }
-    }
-
-    &s[..]
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-18-first-word-slice/src/main.rs:here}}
 ```
 
 We get the index for the end of the word in the same way as we did in Listing
@@ -255,31 +206,13 @@ compile-time error:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let mut s = String::from("hello world");
-
-    let word = first_word(&s);
-
-    s.clear(); // error!
-
-    println!("the first word is: {}", word);
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/no-listing-19-slice-error/src/main.rs:here}}
 ```
 
 Here’s the compiler error:
 
 ```text
-error[E0502]: cannot borrow `s` as mutable because it is also borrowed as immutable
-  --> src/main.rs:18:5
-   |
-16 |     let word = first_word(&s);
-   |                           -- immutable borrow occurs here
-17 |
-18 |     s.clear(); // error!
-   |     ^^^^^^^^^ mutable borrow occurs here
-19 |
-20 |     println!("the first word is: {}", word);
-   |                                       ---- immutable borrow later used here
+{{#include ../listings/ch04-understanding-ownership/no-listing-19-slice-error/output.txt}}
 ```
 
 Recall from the borrowing rules that if we have an immutable reference to
@@ -315,7 +248,7 @@ instead because it allows us to use the same function on both `&String` values
 and `&str` values.
 
 ```rust,ignore
-fn first_word(s: &str) -> &str {
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 4-9: Improving the `first_word` function by using
@@ -329,32 +262,7 @@ without losing any functionality:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# fn first_word(s: &str) -> &str {
-#     let bytes = s.as_bytes();
-#
-#     for (i, &item) in bytes.iter().enumerate() {
-#         if item == b' ' {
-#             return &s[0..i];
-#         }
-#     }
-#
-#     &s[..]
-# }
-fn main() {
-    let my_string = String::from("hello world");
-
-    // first_word works on slices of `String`s
-    let word = first_word(&my_string[..]);
-
-    let my_string_literal = "hello world";
-
-    // first_word works on slices of string literals
-    let word = first_word(&my_string_literal[..]);
-
-    // Because string literals *are* string slices already,
-    // this works too, without the slice syntax!
-    let word = first_word(my_string_literal);
-}
+{{#rustdoc_include ../listings/ch04-understanding-ownership/listing-04-09/src/main.rs:usage}}
 ```
 
 ### Other Slices
diff --git a/src/doc/book/src/ch05-01-defining-structs.md b/src/doc/book/src/ch05-01-defining-structs.md
index 17fa72a02f..04479e5ced 100644
--- a/src/doc/book/src/ch05-01-defining-structs.md
+++ b/src/doc/book/src/ch05-01-defining-structs.md
@@ -13,12 +13,7 @@ the pieces of data, which we call *fields*. For example, Listing 5-1 shows a
 struct that stores information about a user account.
 
 ```rust
-struct User {
-    username: String,
-    email: String,
-    sign_in_count: u64,
-    active: bool,
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-1: A `User` struct definition</span>
@@ -34,19 +29,7 @@ in that template with particular data to create values of the type. For
 example, we can declare a particular user as shown in Listing 5-2.
 
 ```rust
-# struct User {
-#     username: String,
-#     email: String,
-#     sign_in_count: u64,
-#     active: bool,
-# }
-#
-let user1 = User {
-    email: String::from("someone@example.com"),
-    username: String::from("someusername123"),
-    active: true,
-    sign_in_count: 1,
-};
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-2: Creating an instance of the `User`
@@ -59,21 +42,7 @@ the dot notation and assigning into a particular field. Listing 5-3 shows how
 to change the value in the `email` field of a mutable `User` instance.
 
 ```rust
-# struct User {
-#     username: String,
-#     email: String,
-#     sign_in_count: u64,
-#     active: bool,
-# }
-#
-let mut user1 = User {
-    email: String::from("someone@example.com"),
-    username: String::from("someusername123"),
-    active: true,
-    sign_in_count: 1,
-};
-
-user1.email = String::from("anotheremail@example.com");
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-3: Changing the value in the `email` field of a
@@ -89,21 +58,7 @@ the given email and username. The `active` field gets the value of `true`, and
 the `sign_in_count` gets a value of `1`.
 
 ```rust
-# struct User {
-#     username: String,
-#     email: String,
-#     sign_in_count: u64,
-#     active: bool,
-# }
-#
-fn build_user(email: String, username: String) -> User {
-    User {
-        email: email,
-        username: username,
-        active: true,
-        sign_in_count: 1,
-    }
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-4: A `build_user` function that takes an email
@@ -122,21 +77,7 @@ Listing 5-4, we can use the *field init shorthand* syntax to rewrite
 repetition of `email` and `username`, as shown in Listing 5-5.
 
 ```rust
-# struct User {
-#     username: String,
-#     email: String,
-#     sign_in_count: u64,
-#     active: bool,
-# }
-#
-fn build_user(email: String, username: String) -> User {
-    User {
-        email,
-        username,
-        active: true,
-        sign_in_count: 1,
-    }
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-5: A `build_user` function that uses field init
@@ -159,26 +100,7 @@ the update syntax. We set new values for `email` and `username` but otherwise
 use the same values from `user1` that we created in Listing 5-2.
 
 ```rust
-# struct User {
-#     username: String,
-#     email: String,
-#     sign_in_count: u64,
-#     active: bool,
-# }
-#
-# let user1 = User {
-#     email: String::from("someone@example.com"),
-#     username: String::from("someusername123"),
-#     active: true,
-#     sign_in_count: 1,
-# };
-#
-let user2 = User {
-    email: String::from("another@example.com"),
-    username: String::from("anotherusername567"),
-    active: user1.active,
-    sign_in_count: user1.sign_in_count,
-};
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-6: Creating a new `User` instance using some of
@@ -189,25 +111,7 @@ shown in Listing 5-7. The syntax `..` specifies that the remaining fields not
 explicitly set should have the same value as the fields in the given instance.
 
 ```rust
-# struct User {
-#     username: String,
-#     email: String,
-#     sign_in_count: u64,
-#     active: bool,
-# }
-#
-# let user1 = User {
-#     email: String::from("someone@example.com"),
-#     username: String::from("someusername123"),
-#     active: true,
-#     sign_in_count: 1,
-# };
-#
-let user2 = User {
-    email: String::from("another@example.com"),
-    username: String::from("anotherusername567"),
-    ..user1
-};
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-7: Using struct update syntax to set new
@@ -232,11 +136,7 @@ followed by the types in the tuple. For example, here are definitions and
 usages of two tuple structs named `Color` and `Point`:
 
 ```rust
-struct Color(i32, i32, i32);
-struct Point(i32, i32, i32);
-
-let black = Color(0, 0, 0);
-let origin = Point(0, 0, 0);
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/no-listing-01-tuple-structs/src/main.rs:here}}
 ```
 
 Note that the `black` and `origin` values are different types, because they’re
@@ -271,6 +171,8 @@ itself. We’ll discuss traits in Chapter 10.
 >
 > <span class="filename">Filename: src/main.rs</span>
 >
+> <!-- CAN'T EXTRACT SEE https://github.com/rust-lang/mdBook/issues/1127 -->
+>
 > ```rust,ignore,does_not_compile
 > struct User {
 >     username: &str,
@@ -292,19 +194,35 @@ itself. We’ll discuss traits in Chapter 10.
 > The compiler will complain that it needs lifetime specifiers:
 >
 > ```text
+> $ cargo run
+>    Compiling structs v0.1.0 (file:///projects/structs)
 > error[E0106]: missing lifetime specifier
->  -->
+>  --> src/main.rs:2:15
 >   |
 > 2 |     username: &str,
 >   |               ^ expected lifetime parameter
 >
 > error[E0106]: missing lifetime specifier
->  -->
+>  --> src/main.rs:3:12
 >   |
 > 3 |     email: &str,
 >   |            ^ expected lifetime parameter
+>
+> error: aborting due to 2 previous errors
+>
+> For more information about this error, try `rustc --explain E0106`.
+> error: could not compile `structs`.
+>
+> To learn more, run the command again with --verbose.
 > ```
 >
 > In Chapter 10, we’ll discuss how to fix these errors so you can store
 > references in structs, but for now, we’ll fix errors like these using owned
 > types like `String` instead of references like `&str`.
+
+<!-- manual-regeneration
+for the error above
+after running update-rustc.sh:
+pbcopy < listings/ch05-using-structs-to-structure-related-data/no-listing-02-reference-in-struct/output.txt
+paste above
+add `> ` before every line -->
diff --git a/src/doc/book/src/ch05-02-example-structs.md b/src/doc/book/src/ch05-02-example-structs.md
index 46f88f1b8a..03f69d984e 100644
--- a/src/doc/book/src/ch05-02-example-structs.md
+++ b/src/doc/book/src/ch05-02-example-structs.md
@@ -12,19 +12,7 @@ exactly that in our project’s *src/main.rs*.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let width1 = 30;
-    let height1 = 50;
-
-    println!(
-        "The area of the rectangle is {} square pixels.",
-        area(width1, height1)
-    );
-}
-
-fn area(width: u32, height: u32) -> u32 {
-    width * height
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-08/src/main.rs:all}}
 ```
 
 <span class="caption">Listing 5-8: Calculating the area of a rectangle
@@ -33,7 +21,7 @@ specified by separate width and height variables</span>
 Now, run this program using `cargo run`:
 
 ```text
-The area of the rectangle is 1500 square pixels.
+{{#include ../listings/ch05-using-structs-to-structure-related-data/listing-05-08/output.txt}}
 ```
 
 Even though Listing 5-8 works and figures out the area of the rectangle by
@@ -44,7 +32,7 @@ rectangle.
 The issue with this code is evident in the signature of `area`:
 
 ```rust,ignore
-fn area(width: u32, height: u32) -> u32 {
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-08/src/main.rs:here}}
 ```
 
 The `area` function is supposed to calculate the area of one rectangle, but the
@@ -61,18 +49,7 @@ Listing 5-9 shows another version of our program that uses tuples.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let rect1 = (30, 50);
-
-    println!(
-        "The area of the rectangle is {} square pixels.",
-        area(rect1)
-    );
-}
-
-fn area(dimensions: (u32, u32)) -> u32 {
-    dimensions.0 * dimensions.1
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-09/src/main.rs}}
 ```
 
 <span class="caption">Listing 5-9: Specifying the width and height of the
@@ -100,23 +77,7 @@ parts, as shown in Listing 5-10.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Rectangle {
-    width: u32,
-    height: u32,
-}
-
-fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
-
-    println!(
-        "The area of the rectangle is {} square pixels.",
-        area(&rect1)
-    );
-}
-
-fn area(rectangle: &Rectangle) -> u32 {
-    rectangle.width * rectangle.height
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-10/src/main.rs}}
 ```
 
 <span class="caption">Listing 5-10: Defining a `Rectangle` struct</span>
@@ -150,16 +111,7 @@ work, however.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-struct Rectangle {
-    width: u32,
-    height: u32,
-}
-
-fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
-
-    println!("rect1 is {}", rect1);
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-11/src/main.rs}}
 ```
 
 <span class="caption">Listing 5-11: Attempting to print a `Rectangle`
@@ -168,7 +120,7 @@ instance</span>
 When we compile this code, we get an error with this core message:
 
 ```text
-error[E0277]: `Rectangle` doesn't implement `std::fmt::Display`
+{{#include ../listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt:3}}
 ```
 
 The `println!` macro can do many kinds of formatting, and by default, the curly
@@ -185,8 +137,7 @@ implementation of `Display`.
 If we continue reading the errors, we’ll find this helpful note:
 
 ```text
-= help: the trait `std::fmt::Display` is not implemented for `Rectangle`
-= note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+{{#include ../listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt:9:10}}
 ```
 
 Let’s try it! The `println!` macro call will now look like `println!("rect1 is
@@ -198,14 +149,13 @@ see its value while we’re debugging our code.
 Compile the code with this change. Drat! We still get an error:
 
 ```text
-error[E0277]: `Rectangle` doesn't implement `std::fmt::Debug`
+{{#include ../listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt:3}}
 ```
 
 But again, the compiler gives us a helpful note:
 
 ```text
-= help: the trait `std::fmt::Debug` is not implemented for `Rectangle`
-= note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
+{{#include ../listings/ch05-using-structs-to-structure-related-data/output-only-01-debug/output.txt:9:10}}
 ```
 
 Rust *does* include functionality to print out debugging information, but we
@@ -216,17 +166,7 @@ definition, as shown in Listing 5-12.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-#[derive(Debug)]
-struct Rectangle {
-    width: u32,
-    height: u32,
-}
-
-fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
-
-    println!("rect1 is {:?}", rect1);
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-12/src/main.rs}}
 ```
 
 <span class="caption">Listing 5-12: Adding the annotation to derive the `Debug`
@@ -236,7 +176,7 @@ Now when we run the program, we won’t get any errors, and we’ll see the
 following output:
 
 ```text
-rect1 is Rectangle { width: 30, height: 50 }
+{{#include ../listings/ch05-using-structs-to-structure-related-data/listing-05-12/output.txt}}
 ```
 
 Nice! It’s not the prettiest output, but it shows the values of all the fields
@@ -246,10 +186,7 @@ those cases, we can use `{:#?}` instead of `{:?}` in the `println!` string.
 When we use the `{:#?}` style in the example, the output will look like this:
 
 ```text
-rect1 is Rectangle {
-    width: 30,
-    height: 50
-}
+{{#include ../listings/ch05-using-structs-to-structure-related-data/output-only-02-pretty-debug/output.txt}}
 ```
 
 Rust has provided a number of traits for us to use with the `derive` annotation
diff --git a/src/doc/book/src/ch05-03-method-syntax.md b/src/doc/book/src/ch05-03-method-syntax.md
index d8a338c9b6..f074497ca7 100644
--- a/src/doc/book/src/ch05-03-method-syntax.md
+++ b/src/doc/book/src/ch05-03-method-syntax.md
@@ -17,26 +17,7 @@ in Listing 5-13.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-#[derive(Debug)]
-struct Rectangle {
-    width: u32,
-    height: u32,
-}
-
-impl Rectangle {
-    fn area(&self) -> u32 {
-        self.width * self.height
-    }
-}
-
-fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
-
-    println!(
-        "The area of the rectangle is {} square pixels.",
-        rect1.area()
-    );
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-13/src/main.rs}}
 ```
 
 <span class="caption">Listing 5-13: Defining an `area` method on the
@@ -90,6 +71,7 @@ provide.
 > automatically adds in `&`, `&mut`, or `*` so `object` matches the signature of
 > the method. In other words, the following are the same:
 >
+<!-- CAN'T EXTRACT SEE BUG TODO -->
 > ```rust
 > # #[derive(Debug,Copy,Clone)]
 > # struct Point {
@@ -130,14 +112,7 @@ method.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
-    let rect2 = Rectangle { width: 10, height: 40 };
-    let rect3 = Rectangle { width: 60, height: 45 };
-
-    println!("Can rect1 hold rect2? {}", rect1.can_hold(&rect2));
-    println!("Can rect1 hold rect3? {}", rect1.can_hold(&rect3));
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-14/src/main.rs}}
 ```
 
 <span class="caption">Listing 5-14: Using the as-yet-unwritten `can_hold`
@@ -169,21 +144,7 @@ Listing 5-13, shown in Listing 5-15.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# #[derive(Debug)]
-# struct Rectangle {
-#     width: u32,
-#     height: u32,
-# }
-#
-impl Rectangle {
-    fn area(&self) -> u32 {
-        self.width * self.height
-    }
-
-    fn can_hold(&self, other: &Rectangle) -> bool {
-        self.width > other.width && self.height > other.height
-    }
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-15/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-15: Implementing the `can_hold` method on
@@ -212,17 +173,7 @@ specify the same value twice:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# #[derive(Debug)]
-# struct Rectangle {
-#     width: u32,
-#     height: u32,
-# }
-#
-impl Rectangle {
-    fn square(size: u32) -> Rectangle {
-        Rectangle { width: size, height: size }
-    }
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/no-listing-03-associated-functions/src/main.rs:here}}
 ```
 
 To call this associated function, we use the `::` syntax with the struct name;
@@ -237,23 +188,7 @@ Each struct is allowed to have multiple `impl` blocks. For example, Listing
 in its own `impl` block.
 
 ```rust
-# #[derive(Debug)]
-# struct Rectangle {
-#     width: u32,
-#     height: u32,
-# }
-#
-impl Rectangle {
-    fn area(&self) -> u32 {
-        self.width * self.height
-    }
-}
-
-impl Rectangle {
-    fn can_hold(&self, other: &Rectangle) -> bool {
-        self.width > other.width && self.height > other.height
-    }
-}
+{{#rustdoc_include ../listings/ch05-using-structs-to-structure-related-data/listing-05-16/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 5-16: Rewriting Listing 5-15 using multiple `impl`
diff --git a/src/doc/book/src/ch06-01-defining-an-enum.md b/src/doc/book/src/ch06-01-defining-an-enum.md
index 0d25afbb68..1067af06e2 100644
--- a/src/doc/book/src/ch06-01-defining-an-enum.md
+++ b/src/doc/book/src/ch06-01-defining-an-enum.md
@@ -19,10 +19,7 @@ listing the possible kinds an IP address can be, `V4` and `V6`. These are the
 variants of the enum:
 
 ```rust
-enum IpAddrKind {
-    V4,
-    V6,
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs:def}}
 ```
 
 `IpAddrKind` is now a custom data type that we can use elsewhere in our code.
@@ -32,13 +29,7 @@ enum IpAddrKind {
 We can create instances of each of the two variants of `IpAddrKind` like this:
 
 ```rust
-# enum IpAddrKind {
-#     V4,
-#     V6,
-# }
-#
-let four = IpAddrKind::V4;
-let six = IpAddrKind::V6;
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs:instance}}
 ```
 
 Note that the variants of the enum are namespaced under its identifier, and we
@@ -48,26 +39,13 @@ both values `IpAddrKind::V4` and `IpAddrKind::V6` are of the same type:
 `IpAddrKind`:
 
 ```rust
-# enum IpAddrKind {
-#     V4,
-#     V6,
-# }
-#
-fn route(ip_kind: IpAddrKind) { }
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs:fn}}
 ```
 
 And we can call this function with either variant:
 
 ```rust
-# enum IpAddrKind {
-#     V4,
-#     V6,
-# }
-#
-# fn route(ip_kind: IpAddrKind) { }
-#
-route(IpAddrKind::V4);
-route(IpAddrKind::V6);
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-01-defining-enums/src/main.rs:fn_call}}
 ```
 
 Using enums has even more advantages. Thinking more about our IP address type,
@@ -76,25 +54,7 @@ only know what *kind* it is. Given that you just learned about structs in
 Chapter 5, you might tackle this problem as shown in Listing 6-1.
 
 ```rust
-enum IpAddrKind {
-    V4,
-    V6,
-}
-
-struct IpAddr {
-    kind: IpAddrKind,
-    address: String,
-}
-
-let home = IpAddr {
-    kind: IpAddrKind::V4,
-    address: String::from("127.0.0.1"),
-};
-
-let loopback = IpAddr {
-    kind: IpAddrKind::V6,
-    address: String::from("::1"),
-};
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 6-1: Storing the data and `IpAddrKind` variant of
@@ -115,14 +75,7 @@ variant. This new definition of the `IpAddr` enum says that both `V4` and `V6`
 variants will have associated `String` values:
 
 ```rust
-enum IpAddr {
-    V4(String),
-    V6(String),
-}
-
-let home = IpAddr::V4(String::from("127.0.0.1"));
-
-let loopback = IpAddr::V6(String::from("::1"));
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-02-enum-with-data/src/main.rs:here}}
 ```
 
 We attach data to each variant of the enum directly, so there is no need for an
@@ -136,14 +89,7 @@ still express `V6` addresses as one `String` value, we wouldn’t be able to wit
 a struct. Enums handle this case with ease:
 
 ```rust
-enum IpAddr {
-    V4(u8, u8, u8, u8),
-    V6(String),
-}
-
-let home = IpAddr::V4(127, 0, 0, 1);
-
-let loopback = IpAddr::V6(String::from("::1"));
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-03-variants-with-different-data/src/main.rs:here}}
 ```
 
 We’ve shown several different ways to define data structures to store version
@@ -186,12 +132,7 @@ Let’s look at another example of an enum in Listing 6-2: this one has a wide
 variety of types embedded in its variants.
 
 ```rust
-enum Message {
-    Quit,
-    Move { x: i32, y: i32 },
-    Write(String),
-    ChangeColor(i32, i32, i32),
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 6-2: A `Message` enum whose variants each store
@@ -211,13 +152,7 @@ type. The following structs could hold the same data that the preceding enum
 variants hold:
 
 ```rust
-struct QuitMessage; // unit struct
-struct MoveMessage {
-    x: i32,
-    y: i32,
-}
-struct WriteMessage(String); // tuple struct
-struct ChangeColorMessage(i32, i32, i32); // tuple struct
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-04-structs-similar-to-message-enum/src/main.rs:here}}
 ```
 
 But if we used the different structs, which each have their own type, we
@@ -229,21 +164,7 @@ define methods on structs using `impl`, we’re also able to define methods on
 enums. Here’s a method named `call` that we could define on our `Message` enum:
 
 ```rust
-# enum Message {
-#     Quit,
-#     Move { x: i32, y: i32 },
-#     Write(String),
-#     ChangeColor(i32, i32, i32),
-# }
-#
-impl Message {
-    fn call(&self) {
-        // method body would be defined here
-    }
-}
-
-let m = Message::Write(String::from("hello"));
-m.call();
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-05-methods-on-enums/src/main.rs:here}}
 ```
 
 The body of the method would use `self` to get the value that we called the
@@ -319,10 +240,7 @@ For now, all you need to know is that `<T>` means the `Some` variant of the
 using `Option` values to hold number types and string types:
 
 ```rust
-let some_number = Some(5);
-let some_string = Some("a string");
-
-let absent_number: Option<i32> = None;
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-06-option-examples/src/main.rs:here}}
 ```
 
 If we use `None` rather than `Some`, we need to tell Rust what type of
@@ -340,22 +258,13 @@ definitely a valid value. For example, this code won’t compile because it’s
 trying to add an `i8` to an `Option<i8>`:
 
 ```rust,ignore,does_not_compile
-let x: i8 = 5;
-let y: Option<i8> = Some(5);
-
-let sum = x + y;
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/src/main.rs:here}}
 ```
 
 If we run this code, we get an error message like this:
 
 ```text
-error[E0277]: the trait bound `i8: std::ops::Add<std::option::Option<i8>>` is
-not satisfied
- -->
-  |
-5 |     let sum = x + y;
-  |                 ^ no implementation for `i8 + std::option::Option<i8>`
-  |
+{{#include ../listings/ch06-enums-and-pattern-matching/no-listing-07-cant-use-option-directly/output.txt}}
 ```
 
 Intense! In effect, this error message means that Rust doesn’t understand how
diff --git a/src/doc/book/src/ch06-02-match.md b/src/doc/book/src/ch06-02-match.md
index b00459beb9..f40380867f 100644
--- a/src/doc/book/src/ch06-02-match.md
+++ b/src/doc/book/src/ch06-02-match.md
@@ -20,21 +20,7 @@ similar way as the counting machine, determine which coin it is and return its
 value in cents, as shown here in Listing 6-3.
 
 ```rust
-enum Coin {
-    Penny,
-    Nickel,
-    Dime,
-    Quarter,
-}
-
-fn value_in_cents(coin: Coin) -> u8 {
-    match coin {
-        Coin::Penny => 1,
-        Coin::Nickel => 5,
-        Coin::Dime => 10,
-        Coin::Quarter => 25,
-    }
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 6-3: An enum and a `match` expression that has
@@ -69,24 +55,7 @@ following code would print “Lucky penny!” every time the method was called w
 a `Coin::Penny` but would still return the last value of the block, `1`:
 
 ```rust
-# enum Coin {
-#    Penny,
-#    Nickel,
-#    Dime,
-#    Quarter,
-# }
-#
-fn value_in_cents(coin: Coin) -> u8 {
-    match coin {
-        Coin::Penny => {
-            println!("Lucky penny!");
-            1
-        },
-        Coin::Nickel => 5,
-        Coin::Dime => 10,
-        Coin::Quarter => 25,
-    }
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-08-match-arm-multiple-lines/src/main.rs:here}}
 ```
 
 ### Patterns that Bind to Values
@@ -103,19 +72,7 @@ our `enum` by changing the `Quarter` variant to include a `UsState` value stored
 inside it, which we’ve done here in Listing 6-4.
 
 ```rust
-#[derive(Debug)] // so we can inspect the state in a minute
-enum UsState {
-    Alabama,
-    Alaska,
-    // --snip--
-}
-
-enum Coin {
-    Penny,
-    Nickel,
-    Dime,
-    Quarter(UsState),
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 6-4: A `Coin` enum in which the `Quarter` variant
@@ -132,30 +89,7 @@ pattern that matches values of the variant `Coin::Quarter`. When a
 quarter’s state. Then we can use `state` in the code for that arm, like so:
 
 ```rust
-# #[derive(Debug)]
-# enum UsState {
-#    Alabama,
-#    Alaska,
-# }
-#
-# enum Coin {
-#    Penny,
-#    Nickel,
-#    Dime,
-#    Quarter(UsState),
-# }
-#
-fn value_in_cents(coin: Coin) -> u8 {
-    match coin {
-        Coin::Penny => 1,
-        Coin::Nickel => 5,
-        Coin::Dime => 10,
-        Coin::Quarter(state) => {
-            println!("State quarter from {:?}!", state);
-            25
-        },
-    }
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-09-variable-in-pattern/src/main.rs:here}}
 ```
 
 If we were to call `value_in_cents(Coin::Quarter(UsState::Alaska))`, `coin`
@@ -182,16 +116,7 @@ This function is very easy to write, thanks to `match`, and will look like
 Listing 6-5.
 
 ```rust
-fn plus_one(x: Option<i32>) -> Option<i32> {
-    match x {
-        None => None,
-        Some(i) => Some(i + 1),
-    }
-}
-
-let five = Some(5);
-let six = plus_one(five);
-let none = plus_one(None);
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 6-5: A function that uses a `match` expression on
@@ -202,14 +127,14 @@ Let’s examine the first execution of `plus_one` in more detail. When we call
 value `Some(5)`. We then compare that against each match arm.
 
 ```rust,ignore
-None => None,
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs:first_arm}}
 ```
 
 The `Some(5)` value doesn’t match the pattern `None`, so we continue to the
 next arm.
 
 ```rust,ignore
-Some(i) => Some(i + 1),
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs:second_arm}}
 ```
 
 Does `Some(5)` match `Some(i)`? Why yes it does! We have the same variant. The
@@ -221,7 +146,7 @@ Now let’s consider the second call of `plus_one` in Listing 6-5, where `x` is
 `None`. We enter the `match` and compare to the first arm.
 
 ```rust,ignore
-None => None,
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-05/src/main.rs:first_arm}}
 ```
 
 It matches! There’s no value to add to, so the program stops and returns the
@@ -240,11 +165,7 @@ There’s one other aspect of `match` we need to discuss. Consider this version
 of our `plus_one` function that has a bug and won’t compile:
 
 ```rust,ignore,does_not_compile
-fn plus_one(x: Option<i32>) -> Option<i32> {
-    match x {
-        Some(i) => Some(i + 1),
-    }
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/src/main.rs:here}}
 ```
 
 We didn’t handle the `None` case, so this code will cause a bug. Luckily, it’s
@@ -252,11 +173,7 @@ a bug Rust knows how to catch. If we try to compile this code, we’ll get this
 error:
 
 ```text
-error[E0004]: non-exhaustive patterns: `None` not covered
- -->
-  |
-6 |         match x {
-  |               ^ pattern `None` not covered
+{{#include ../listings/ch06-enums-and-pattern-matching/no-listing-10-non-exhaustive-match/output.txt}}
 ```
 
 Rust knows that we didn’t cover every possible case and even knows which
@@ -275,14 +192,7 @@ care about the values 1, 3, 5, and 7, we don’t want to have to list out 0, 2,
 special pattern `_` instead:
 
 ```rust
-let some_u8_value = 0u8;
-match some_u8_value {
-    1 => println!("one"),
-    3 => println!("three"),
-    5 => println!("five"),
-    7 => println!("seven"),
-    _ => (),
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-11-underscore-placeholder/src/main.rs:here}}
 ```
 
 The `_` pattern will match any value. By putting it after our other arms, the
diff --git a/src/doc/book/src/ch06-03-if-let.md b/src/doc/book/src/ch06-03-if-let.md
index 6583546387..3eb0cc348f 100644
--- a/src/doc/book/src/ch06-03-if-let.md
+++ b/src/doc/book/src/ch06-03-if-let.md
@@ -6,11 +6,7 @@ program in Listing 6-6 that matches on an `Option<u8>` value but only wants to
 execute code if the value is 3.
 
 ```rust
-let some_u8_value = Some(0u8);
-match some_u8_value {
-    Some(3) => println!("three"),
-    _ => (),
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 6-6: A `match` that only cares about executing
@@ -25,10 +21,7 @@ Instead, we could write this in a shorter way using `if let`. The following
 code behaves the same as the `match` in Listing 6-6:
 
 ```rust
-# let some_u8_value = Some(0u8);
-if let Some(3) = some_u8_value {
-    println!("three");
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-12-if-let/src/main.rs:here}}
 ```
 
 The syntax `if let` takes a pattern and an expression separated by an equal
@@ -53,48 +46,13 @@ announcing the state of the quarters, we could do that with a `match`
 expression like this:
 
 ```rust
-# #[derive(Debug)]
-# enum UsState {
-#    Alabama,
-#    Alaska,
-# }
-#
-# enum Coin {
-#    Penny,
-#    Nickel,
-#    Dime,
-#    Quarter(UsState),
-# }
-# let coin = Coin::Penny;
-let mut count = 0;
-match coin {
-    Coin::Quarter(state) => println!("State quarter from {:?}!", state),
-    _ => count += 1,
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-13-count-and-announce-match/src/main.rs:here}}
 ```
 
 Or we could use an `if let` and `else` expression like this:
 
 ```rust
-# #[derive(Debug)]
-# enum UsState {
-#    Alabama,
-#    Alaska,
-# }
-#
-# enum Coin {
-#    Penny,
-#    Nickel,
-#    Dime,
-#    Quarter(UsState),
-# }
-# let coin = Coin::Penny;
-let mut count = 0;
-if let Coin::Quarter(state) = coin {
-    println!("State quarter from {:?}!", state);
-} else {
-    count += 1;
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/no-listing-14-count-and-announce-if-let-else/src/main.rs:here}}
 ```
 
 If you have a situation in which your program has logic that is too verbose to
diff --git a/src/doc/book/src/ch07-01-packages-and-crates.md b/src/doc/book/src/ch07-01-packages-and-crates.md
index 1b7a163af9..2bf2f112d2 100644
--- a/src/doc/book/src/ch07-01-packages-and-crates.md
+++ b/src/doc/book/src/ch07-01-packages-and-crates.md
@@ -4,7 +4,7 @@ The first parts of the module system we’ll cover are packages and crates. A
 crate is a binary or library. The *crate root* is a source file that the Rust
 compiler starts from and makes up the root module of your crate (we’ll explain
 modules in depth in the [“Defining Modules to Control Scope and
-Privacy”][modules]<!-- ignore -->) section. A *package* is one or more crates
+Privacy”][modules]<!-- ignore --> section). A *package* is one or more crates
 that provide a set of functionality. A package contains a *Cargo.toml* file
 that describes how to build those crates.
 
diff --git a/src/doc/book/src/ch07-02-defining-modules-to-control-scope-and-privacy.md b/src/doc/book/src/ch07-02-defining-modules-to-control-scope-and-privacy.md
index d2674f3f19..d46ef9b0c0 100644
--- a/src/doc/book/src/ch07-02-defining-modules-to-control-scope-and-privacy.md
+++ b/src/doc/book/src/ch07-02-defining-modules-to-control-scope-and-privacy.md
@@ -29,22 +29,8 @@ Listing 7-1 into *src/lib.rs* to define some modules and function signatures.
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust,ignore
-mod front_of_house {
-    mod hosting {
-        fn add_to_waitlist() {}
-
-        fn seat_at_table() {}
-    }
-
-    mod serving {
-        fn take_order() {}
-
-        fn serve_order() {}
-
-        fn take_payment() {}
-    }
-}
+```rust
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-01/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-1: A `front_of_house` module containing other
diff --git a/src/doc/book/src/ch07-03-paths-for-referring-to-an-item-in-the-module-tree.md b/src/doc/book/src/ch07-03-paths-for-referring-to-an-item-in-the-module-tree.md
index ad584b72b4..d765a663b9 100644
--- a/src/doc/book/src/ch07-03-paths-for-referring-to-an-item-in-the-module-tree.md
+++ b/src/doc/book/src/ch07-03-paths-for-referring-to-an-item-in-the-module-tree.md
@@ -28,19 +28,7 @@ in a bit.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,does_not_compile
-mod front_of_house {
-    mod hosting {
-        fn add_to_waitlist() {}
-    }
-}
-
-pub fn eat_at_restaurant() {
-    // Absolute path
-    crate::front_of_house::hosting::add_to_waitlist();
-
-    // Relative path
-    front_of_house::hosting::add_to_waitlist();
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-03/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-3: Calling the `add_to_waitlist` function using
@@ -80,19 +68,7 @@ Let’s try to compile Listing 7-3 and find out why it won’t compile yet! The
 error we get is shown in Listing 7-4.
 
 ```text
-$ cargo build
-   Compiling restaurant v0.1.0 (file:///projects/restaurant)
-error[E0603]: module `hosting` is private
- --> src/lib.rs:9:28
-  |
-9 |     crate::front_of_house::hosting::add_to_waitlist();
-  |                            ^^^^^^^
-
-error[E0603]: module `hosting` is private
-  --> src/lib.rs:12:21
-   |
-12 |     front_of_house::hosting::add_to_waitlist();
-   |                     ^^^^^^^
+{{#include ../listings/ch07-managing-growing-projects/listing-07-03/output.txt}}
 ```
 
 <span class="caption">Listing 7-4: Compiler errors from building the code in
@@ -134,19 +110,7 @@ access to the `add_to_waitlist` function in the child module, so we mark the
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,does_not_compile
-mod front_of_house {
-    pub mod hosting {
-        fn add_to_waitlist() {}
-    }
-}
-
-pub fn eat_at_restaurant() {
-    // Absolute path
-    crate::front_of_house::hosting::add_to_waitlist();
-
-    // Relative path
-    front_of_house::hosting::add_to_waitlist();
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-05/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-5: Declaring the `hosting` module as `pub` to
@@ -156,19 +120,7 @@ Unfortunately, the code in Listing 7-5 still results in an error, as shown in
 Listing 7-6.
 
 ```text
-$ cargo build
-   Compiling restaurant v0.1.0 (file:///projects/restaurant)
-error[E0603]: function `add_to_waitlist` is private
- --> src/lib.rs:9:37
-  |
-9 |     crate::front_of_house::hosting::add_to_waitlist();
-  |                                     ^^^^^^^^^^^^^^^
-
-error[E0603]: function `add_to_waitlist` is private
-  --> src/lib.rs:12:30
-   |
-12 |     front_of_house::hosting::add_to_waitlist();
-   |                              ^^^^^^^^^^^^^^^
+{{#include ../listings/ch07-managing-growing-projects/listing-07-05/output.txt}}
 ```
 
 <span class="caption">Listing 7-6: Compiler errors from building the code in
@@ -190,20 +142,7 @@ keyword before its definition, as in Listing 7-7.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod front_of_house {
-    pub mod hosting {
-        pub fn add_to_waitlist() {}
-    }
-}
-
-pub fn eat_at_restaurant() {
-    // Absolute path
-    crate::front_of_house::hosting::add_to_waitlist();
-
-    // Relative path
-    front_of_house::hosting::add_to_waitlist();
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-07/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-7: Adding the `pub` keyword to `mod hosting`
@@ -246,17 +185,7 @@ the path to `serve_order` starting with `super`:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-fn serve_order() {}
-
-mod back_of_house {
-    fn fix_incorrect_order() {
-        cook_order();
-        super::serve_order();
-    }
-
-    fn cook_order() {}
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-08/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-8: Calling a function using a relative path
@@ -287,33 +216,7 @@ or even see which fruit they’ll get.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod back_of_house {
-    pub struct Breakfast {
-        pub toast: String,
-        seasonal_fruit: String,
-    }
-
-    impl Breakfast {
-        pub fn summer(toast: &str) -> Breakfast {
-            Breakfast {
-                toast: String::from(toast),
-                seasonal_fruit: String::from("peaches"),
-            }
-        }
-    }
-}
-
-pub fn eat_at_restaurant() {
-    // Order a breakfast in the summer with Rye toast
-    let mut meal = back_of_house::Breakfast::summer("Rye");
-    // Change our mind about what bread we'd like
-    meal.toast = String::from("Wheat");
-    println!("I'd like {} toast please", meal.toast);
-
-    // The next line won't compile if we uncomment it; we're not allowed
-    // to see or modify the seasonal fruit that comes with the meal
-    // meal.seasonal_fruit = String::from("blueberries");
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-09/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-9: A struct with some public fields and some
@@ -338,17 +241,7 @@ only need the `pub` before the `enum` keyword, as shown in Listing 7-10.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod back_of_house {
-    pub enum Appetizer {
-        Soup,
-        Salad,
-    }
-}
-
-pub fn eat_at_restaurant() {
-    let order1 = back_of_house::Appetizer::Soup;
-    let order2 = back_of_house::Appetizer::Salad;
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-10/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-10: Designating an enum as public makes all its
diff --git a/src/doc/book/src/ch07-04-bringing-paths-into-scope-with-the-use-keyword.md b/src/doc/book/src/ch07-04-bringing-paths-into-scope-with-the-use-keyword.md
index 05af46cbdc..3bb5870b59 100644
--- a/src/doc/book/src/ch07-04-bringing-paths-into-scope-with-the-use-keyword.md
+++ b/src/doc/book/src/ch07-04-bringing-paths-into-scope-with-the-use-keyword.md
@@ -16,20 +16,7 @@ scope of the `eat_at_restaurant` function so we only have to specify
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod front_of_house {
-    pub mod hosting {
-        pub fn add_to_waitlist() {}
-    }
-}
-
-use crate::front_of_house::hosting;
-
-pub fn eat_at_restaurant() {
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-11/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-11: Bringing a module into scope with
@@ -48,20 +35,7 @@ Listing 7-11.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod front_of_house {
-    pub mod hosting {
-        pub fn add_to_waitlist() {}
-    }
-}
-
-use front_of_house::hosting;
-
-pub fn eat_at_restaurant() {
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-12/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-12: Bringing a module into scope with `use` and
@@ -77,20 +51,7 @@ the `add_to_waitlist` function to achieve the same result, as in Listing 7-13.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod front_of_house {
-    pub mod hosting {
-        pub fn add_to_waitlist() {}
-    }
-}
-
-use crate::front_of_house::hosting::add_to_waitlist;
-
-pub fn eat_at_restaurant() {
-    add_to_waitlist();
-    add_to_waitlist();
-    add_to_waitlist();
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-13/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-13: Bringing the `add_to_waitlist` function
@@ -111,12 +72,7 @@ crate.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::collections::HashMap;
-
-fn main() {
-    let mut map = HashMap::new();
-    map.insert(1, 2);
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-14/src/main.rs}}
 ```
 
 <span class="caption">Listing 7-14: Bringing `HashMap` into scope in an
@@ -133,18 +89,7 @@ different parent modules and how to refer to them.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::fmt;
-use std::io;
-
-fn function1() -> fmt::Result {
-    // --snip--
-#     Ok(())
-}
-
-fn function2() -> io::Result<()> {
-    // --snip--
-#     Ok(())
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-15/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-15: Bringing two types with the same name into
@@ -165,18 +110,7 @@ code in Listing 7-15 by renaming one of the two `Result` types using `as`.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::fmt::Result;
-use std::io::Result as IoResult;
-
-fn function1() -> Result {
-    // --snip--
-#     Ok(())
-}
-
-fn function2() -> IoResult<()> {
-    // --snip--
-#     Ok(())
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-16/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-16: Renaming a type when it’s brought into
@@ -202,20 +136,7 @@ changed to `pub use`.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-mod front_of_house {
-    pub mod hosting {
-        pub fn add_to_waitlist() {}
-    }
-}
-
-pub use crate::front_of_house::hosting;
-
-pub fn eat_at_restaurant() {
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-17/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 7-17: Making a name available for any code to use
@@ -250,8 +171,7 @@ added this line to *Cargo.toml*:
 <span class="filename">Filename: Cargo.toml</span>
 
 ```toml
-[dependencies]
-rand = "0.5.5"
+{{#include ../listings/ch02-guessing-game-tutorial/listing-02-02/Cargo.toml:9:}}
 ```
 
 Adding `rand` as a dependency in *Cargo.toml* tells Cargo to download the
@@ -265,10 +185,7 @@ Number”][rand]<!-- ignore --> section in Chapter 2, we brought the `Rng` trait
 into scope and called the `rand::thread_rng` function:
 
 ```rust,ignore
-use rand::Rng;
-fn main() {
-    let secret_number = rand::thread_rng().gen_range(1, 101);
-}
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs:ch07-04}}
 ```
 
 Members of the Rust community have made many packages available at
@@ -298,10 +215,8 @@ Listing 2-4 bring items from `std` into scope:
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-use std::io;
-use std::cmp::Ordering;
-// ---snip---
+```rust,ignore
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/no-listing-01-use-std-unnested/src/main.rs:here}}
 ```
 
 Instead, we can use nested paths to bring the same items into scope in one
@@ -311,9 +226,8 @@ differ, as shown in Listing 7-18.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-use std::{cmp::Ordering, io};
-// ---snip---
+```rust,ignore
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-18/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 7-18: Specifying a nested path to bring multiple
@@ -331,8 +245,7 @@ two `use` statements that share a subpath. For example, Listing 7-19 shows two
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::io;
-use std::io::Write;
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-19/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-19: Two `use` statements where one is a subpath
@@ -345,7 +258,7 @@ the nested path, as shown in Listing 7-20.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::io::{self, Write};
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-20/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-20: Combining the paths in Listing 7-19 into
diff --git a/src/doc/book/src/ch07-05-separating-modules-into-different-files.md b/src/doc/book/src/ch07-05-separating-modules-into-different-files.md
index 6b51859afd..cff0e439cf 100644
--- a/src/doc/book/src/ch07-05-separating-modules-into-different-files.md
+++ b/src/doc/book/src/ch07-05-separating-modules-into-different-files.md
@@ -13,15 +13,7 @@ crates whose crate root file is *src/main.rs*.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-mod front_of_house;
-
-pub use crate::front_of_house::hosting;
-
-pub fn eat_at_restaurant() {
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-    hosting::add_to_waitlist();
-}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-21-and-22/src/lib.rs}}
 ```
 
 <span class="caption">Listing 7-21: Declaring the `front_of_house` module whose
@@ -32,10 +24,8 @@ And *src/front_of_house.rs* gets the definitions from the body of the
 
 <span class="filename">Filename: src/front_of_house.rs</span>
 
-```rust
-pub mod hosting {
-    pub fn add_to_waitlist() {}
-}
+```rust,ignore
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/listing-07-21-and-22/src/front_of_house.rs}}
 ```
 
 <span class="caption">Listing 7-22: Definitions inside the `front_of_house`
@@ -50,7 +40,7 @@ declaration of the `hosting` module:
 <span class="filename">Filename: src/front_of_house.rs</span>
 
 ```
-pub mod hosting;
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house.rs}}
 ```
 
 Then we create a *src/front_of_house* directory and a file
@@ -60,7 +50,7 @@ Then we create a *src/front_of_house* directory and a file
 <span class="filename">Filename: src/front_of_house/hosting.rs</span>
 
 ```
-pub fn add_to_waitlist() {}
+{{#rustdoc_include ../listings/ch07-managing-growing-projects/no-listing-02-extracting-hosting/src/front_of_house/hosting.rs}}
 ```
 
 The module tree remains the same, and the function calls in `eat_at_restaurant`
diff --git a/src/doc/book/src/ch08-01-vectors.md b/src/doc/book/src/ch08-01-vectors.md
index aaf15381fb..2f93e6b6d2 100644
--- a/src/doc/book/src/ch08-01-vectors.md
+++ b/src/doc/book/src/ch08-01-vectors.md
@@ -12,7 +12,7 @@ To create a new, empty vector, we can call the `Vec::new` function, as shown in
 Listing 8-1.
 
 ```rust
-let v: Vec<i32> = Vec::new();
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-1: Creating a new, empty vector to hold values
@@ -32,10 +32,12 @@ store once you insert values, so you rarely need to do this type annotation.
 It’s more common to create a `Vec<T>` that has initial values, and Rust
 provides the `vec!` macro for convenience. The macro will create a new vector
 that holds the values you give it. Listing 8-2 creates a new `Vec<i32>` that
-holds the values `1`, `2`, and `3`.
+holds the values `1`, `2`, and `3`. The integer type is `i32` because that’s
+the default integer type, as we discussed in the [“Data Types”][data-types]<!--
+ignore --> section of Chapter 3.
 
 ```rust
-let v = vec![1, 2, 3];
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-2: Creating a new vector containing
@@ -51,12 +53,7 @@ To create a vector and then add elements to it, we can use the `push` method,
 as shown in Listing 8-3.
 
 ```rust
-let mut v = Vec::new();
-
-v.push(5);
-v.push(6);
-v.push(7);
-v.push(8);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-3: Using the `push` method to add values to a
@@ -73,12 +70,7 @@ Like any other `struct`, a vector is freed when it goes out of scope, as
 annotated in Listing 8-4.
 
 ```rust
-{
-    let v = vec![1, 2, 3, 4];
-
-    // do stuff with v
-
-} // <- v goes out of scope and is freed here
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-4: Showing where the vector and its elements
@@ -100,15 +92,7 @@ Listing 8-5 shows both methods of accessing a value in a vector, either with
 indexing syntax or the `get` method.
 
 ```rust
-let v = vec![1, 2, 3, 4, 5];
-
-let third: &i32 = &v[2];
-println!("The third element is {}", third);
-
-match v.get(2) {
-    Some(third) => println!("The third element is {}", third),
-    None => println!("There is no third element."),
-}
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-5: Using indexing syntax or the `get` method to
@@ -127,10 +111,7 @@ that holds five elements and then tries to access an element at index 100, as
 shown in Listing 8-6.
 
 ```rust,should_panic,panics
-let v = vec![1, 2, 3, 4, 5];
-
-let does_not_exist = &v[100];
-let does_not_exist = v.get(100);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-6: Attempting to access the element at index
@@ -160,13 +141,7 @@ the first element in a vector and try to add an element to the end, which won’
 work.
 
 ```rust,ignore,does_not_compile
-let mut v = vec![1, 2, 3, 4, 5];
-
-let first = &v[0];
-
-v.push(6);
-
-println!("The first element is: {}", first);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-7: Attempting to add an element to a vector
@@ -175,17 +150,7 @@ while holding a reference to an item</span>
 Compiling this code will result in this error:
 
 ```text
-error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
- --> src/main.rs:6:5
-  |
-4 |     let first = &v[0];
-  |                  - immutable borrow occurs here
-5 |
-6 |     v.push(6);
-  |     ^^^^^^^^^ mutable borrow occurs here
-7 |
-8 |     println!("The first element is: {}", first);
-  |                                          ----- immutable borrow later used here
+{{#include ../listings/ch08-common-collections/listing-08-07/output.txt}}
 ```
 
 The code in Listing 8-7 might look like it should work: why should a reference
@@ -197,8 +162,8 @@ other where the vector currently is. In that case, the reference to the first
 element would be pointing to deallocated memory. The borrowing rules prevent
 programs from ending up in that situation.
 
-> Note: For more on the implementation details of the `Vec<T>` type, see “The
-> Rustonomicon” at https://doc.rust-lang.org/stable/nomicon/vec.html.
+> Note: For more on the implementation details of the `Vec<T>` type, see [“The
+> Rustonomicon”][nomicon].
 
 ### Iterating over the Values in a Vector
 
@@ -208,10 +173,7 @@ all of the elements rather than use indices to access one at a time. Listing
 in a vector of `i32` values and print them.
 
 ```rust
-let v = vec![100, 32, 57];
-for i in &v {
-    println!("{}", i);
-}
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-8: Printing each element in a vector by
@@ -222,10 +184,7 @@ in order to make changes to all the elements. The `for` loop in Listing 8-9
 will add `50` to each element.
 
 ```rust
-let mut v = vec![100, 32, 57];
-for i in &mut v {
-    *i += 50;
-}
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-9: Iterating over mutable references to
@@ -253,17 +212,7 @@ that of the enum. Then we can create a vector that holds that enum and so,
 ultimately, holds different types. We’ve demonstrated this in Listing 8-10.
 
 ```rust
-enum SpreadsheetCell {
-    Int(i32),
-    Float(f64),
-    Text(String),
-}
-
-let row = vec![
-    SpreadsheetCell::Int(3),
-    SpreadsheetCell::Text(String::from("blue")),
-    SpreadsheetCell::Float(10.12),
-];
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-10: Defining an `enum` to store values of
@@ -288,4 +237,6 @@ to review the API documentation for all the many useful methods defined on
 method removes and returns the last element. Let’s move on to the next
 collection type: `String`!
 
+[data-types]: ch03-02-data-types.html#data-types
+[nomicon]: ../nomicon/vec.html
 [deref]: ch15-02-deref.html#following-the-pointer-to-the-value-with-the-dereference-operator
diff --git a/src/doc/book/src/ch08-02-strings.md b/src/doc/book/src/ch08-02-strings.md
index f09ebbb98e..bcee93ebd4 100644
--- a/src/doc/book/src/ch08-02-strings.md
+++ b/src/doc/book/src/ch08-02-strings.md
@@ -48,7 +48,7 @@ as well, starting with the `new` function to create a string, shown in Listing
 8-11.
 
 ```rust
-let mut s = String::new();
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-11: Creating a new, empty `String`</span>
@@ -60,12 +60,7 @@ that implements the `Display` trait, as string literals do. Listing 8-12 shows
 two examples.
 
 ```rust
-let data = "initial contents";
-
-let s = data.to_string();
-
-// the method also works on a literal directly:
-let s = "initial contents".to_string();
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-12/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-12: Using the `to_string` method to create a
@@ -78,7 +73,7 @@ literal. The code in Listing 8-13 is equivalent to the code from Listing 8-12
 that uses `to_string`.
 
 ```rust
-let s = String::from("initial contents");
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-13/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-13: Using the `String::from` function to create
@@ -93,17 +88,7 @@ Remember that strings are UTF-8 encoded, so we can include any properly encoded
 data in them, as shown in Listing 8-14.
 
 ```rust
-let hello = String::from("السلام عليكم");
-let hello = String::from("Dobrý den");
-let hello = String::from("Hello");
-let hello = String::from("שָׁלוֹם");
-let hello = String::from("नमस्ते");
-let hello = String::from("こんにちは");
-let hello = String::from("안녕하세요");
-let hello = String::from("你好");
-let hello = String::from("Olá");
-let hello = String::from("Здравствуйте");
-let hello = String::from("Hola");
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-14/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-14: Storing greetings in different languages in
@@ -123,8 +108,7 @@ We can grow a `String` by using the `push_str` method to append a string slice,
 as shown in Listing 8-15.
 
 ```rust
-let mut s = String::from("foo");
-s.push_str("bar");
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-15/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-15: Appending a string slice to a `String`
@@ -136,10 +120,7 @@ parameter. For example, the code in Listing 8-16 shows that it would be
 unfortunate if we weren’t able to use `s2` after appending its contents to `s1`.
 
 ```rust
-let mut s1 = String::from("foo");
-let s2 = "bar";
-s1.push_str(s2);
-println!("s2 is {}", s2);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-16/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-16: Using a string slice after appending its
@@ -153,8 +134,7 @@ The `push` method takes a single character as a parameter and adds it to the
 the `push` method.
 
 ```rust
-let mut s = String::from("lo");
-s.push('l');
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-17/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-17: Adding one character to a `String` value
@@ -168,9 +148,7 @@ Often, you’ll want to combine two existing strings. One way is to use the `+`
 operator, as shown in Listing 8-18.
 
 ```rust
-let s1 = String::from("Hello, ");
-let s2 = String::from("world!");
-let s3 = s1 + &s2; // note s1 has been moved here and can no longer be used
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-18/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-18: Using the `+` operator to combine two
@@ -219,11 +197,7 @@ If we need to concatenate multiple strings, the behavior of the `+` operator
 gets unwieldy:
 
 ```rust
-let s1 = String::from("tic");
-let s2 = String::from("tac");
-let s3 = String::from("toe");
-
-let s = s1 + "-" + &s2 + "-" + &s3;
+{{#rustdoc_include ../listings/ch08-common-collections/no-listing-01-concat-multiple-strings/src/main.rs:here}}
 ```
 
 At this point, `s` will be `tic-tac-toe`. With all of the `+` and `"`
@@ -231,11 +205,7 @@ characters, it’s difficult to see what’s going on. For more complicated stri
 combining, we can use the `format!` macro:
 
 ```rust
-let s1 = String::from("tic");
-let s2 = String::from("tac");
-let s3 = String::from("toe");
-
-let s = format!("{}-{}-{}", s1, s2, s3);
+{{#rustdoc_include ../listings/ch08-common-collections/no-listing-02-format/src/main.rs:here}}
 ```
 
 This code also sets `s` to `tic-tac-toe`. The `format!` macro works in the same
@@ -251,8 +221,7 @@ if you try to access parts of a `String` using indexing syntax in Rust, you’ll
 get an error. Consider the invalid code in Listing 8-19.
 
 ```rust,ignore,does_not_compile
-let s1 = String::from("hello");
-let h = s1[0];
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-19/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-19: Attempting to use indexing syntax with a
@@ -261,13 +230,7 @@ String</span>
 This code will result in the following error:
 
 ```text
-error[E0277]: the trait bound `std::string::String: std::ops::Index<{integer}>` is not satisfied
- -->
-  |
-3 |     let h = s1[0];
-  |             ^^^^^ the type `std::string::String` cannot be indexed by `{integer}`
-  |
-  = help: the trait `std::ops::Index<{integer}>` is not implemented for `std::string::String`
+{{#include ../listings/ch08-common-collections/listing-08-19/output.txt}}
 ```
 
 The error and the note tell the story: Rust strings don’t support indexing. But
@@ -280,7 +243,7 @@ A `String` is a wrapper over a `Vec<u8>`. Let’s look at some of our properly
 encoded UTF-8 example strings from Listing 8-14. First, this one:
 
 ```rust
-let len = String::from("Hola").len();
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-14/src/main.rs:spanish}}
 ```
 
 In this case, `len` will be 4, which means the vector storing the string “Hola”
@@ -289,7 +252,7 @@ what about the following line? (Note that this string begins with the capital
 Cyrillic letter Ze, not the Arabic number 3.)
 
 ```rust
-let len = String::from("Здравствуйте").len();
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-14/src/main.rs:russian}}
 ```
 
 Asked how long the string is, you might say 12. However, Rust’s answer is 24:
@@ -380,7 +343,7 @@ What would happen if we used `&hello[0..1]`? The answer: Rust would panic at
 runtime in the same way as if an invalid index were accessed in a vector:
 
 ```text
-thread 'main' panicked at 'byte index 1 is not a char boundary; it is inside 'З' (bytes 0..2) of `Здравствуйте`', src/libcore/str/mod.rs:2188:4
+{{#include ../listings/ch08-common-collections/output-only-01-not-char-boundary/output.txt}}
 ```
 
 You should use ranges to create string slices with caution, because doing so
diff --git a/src/doc/book/src/ch08-03-hash-maps.md b/src/doc/book/src/ch08-03-hash-maps.md
index f140805d71..5abadbd8a5 100644
--- a/src/doc/book/src/ch08-03-hash-maps.md
+++ b/src/doc/book/src/ch08-03-hash-maps.md
@@ -25,12 +25,7 @@ Blue and Yellow. The Blue team starts with 10 points, and the Yellow team
 starts with 50.
 
 ```rust
-use std::collections::HashMap;
-
-let mut scores = HashMap::new();
-
-scores.insert(String::from("Blue"), 10);
-scores.insert(String::from("Yellow"), 50);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-20/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-20: Creating a new hash map and inserting some
@@ -47,21 +42,19 @@ keys of type `String` and values of type `i32`. Like vectors, hash maps are
 homogeneous: all of the keys must have the same type, and all of the values
 must have the same type.
 
-Another way of constructing a hash map is by using the `collect` method on a
-vector of tuples, where each tuple consists of a key and its value. The
-`collect` method gathers data into a number of collection types, including
-`HashMap`. For example, if we had the team names and initial scores in two
-separate vectors, we could use the `zip` method to create a vector of tuples
-where “Blue” is paired with 10, and so forth. Then we could use the `collect`
-method to turn that vector of tuples into a hash map, as shown in Listing 8-21.
+Another way of constructing a hash map is by using iterators and the `collect`
+method on a vector of tuples, where each tuple consists of a key and its value.
+We’ll be going into more detail about iterators and their associated methods in
+the [”Processing a Series of Items with Iterators” section of Chapter
+13][iterators]<!-- ignore -->. The `collect` method gathers data into a number
+of collection types, including `HashMap`. For example, if we had the team names
+and initial scores in two separate vectors, we could use the `zip` method to
+create a vector of tuples where “Blue” is paired with 10, and so forth. Then we
+could use the `collect` method to turn that vector of tuples into a hash map,
+as shown in Listing 8-21.
 
 ```rust
-use std::collections::HashMap;
-
-let teams  = vec![String::from("Blue"), String::from("Yellow")];
-let initial_scores = vec![10, 50];
-
-let scores: HashMap<_, _> = teams.iter().zip(initial_scores.iter()).collect();
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-21/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-21: Creating a hash map from a list of teams
@@ -71,7 +64,9 @@ The type annotation `HashMap<_, _>` is needed here because it’s possible to
 `collect` into many different data structures and Rust doesn’t know which you
 want unless you specify. For the parameters for the key and value types,
 however, we use underscores, and Rust can infer the types that the hash map
-contains based on the types of the data in the vectors.
+contains based on the types of the data in the vectors. In Listing 8-21, the
+key type will be `String` and the value type will be `i32`, just as the types
+were in Listing 8-20.
 
 ### Hash Maps and Ownership
 
@@ -80,15 +75,7 @@ into the hash map. For owned values like `String`, the values will be moved and
 the hash map will be the owner of those values, as demonstrated in Listing 8-22.
 
 ```rust
-use std::collections::HashMap;
-
-let field_name = String::from("Favorite color");
-let field_value = String::from("Blue");
-
-let mut map = HashMap::new();
-map.insert(field_name, field_value);
-// field_name and field_value are invalid at this point, try using them and
-// see what compiler error you get!
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-22/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-22: Showing that keys and values are owned by
@@ -110,15 +97,7 @@ We can get a value out of the hash map by providing its key to the `get`
 method, as shown in Listing 8-23.
 
 ```rust
-use std::collections::HashMap;
-
-let mut scores = HashMap::new();
-
-scores.insert(String::from("Blue"), 10);
-scores.insert(String::from("Yellow"), 50);
-
-let team_name = String::from("Blue");
-let score = scores.get(&team_name);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-23/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-23: Accessing the score for the Blue team
@@ -134,16 +113,7 @@ We can iterate over each key/value pair in a hash map in a similar manner as we
 do with vectors, using a `for` loop:
 
 ```rust
-use std::collections::HashMap;
-
-let mut scores = HashMap::new();
-
-scores.insert(String::from("Blue"), 10);
-scores.insert(String::from("Yellow"), 50);
-
-for (key, value) in &scores {
-    println!("{}: {}", key, value);
-}
+{{#rustdoc_include ../listings/ch08-common-collections/no-listing-03-iterate-over-hashmap/src/main.rs:here}}
 ```
 
 This code will print each pair in an arbitrary order:
@@ -173,14 +143,7 @@ only contain one key/value pair because we’re inserting the value for the Blue
 team’s key both times.
 
 ```rust
-use std::collections::HashMap;
-
-let mut scores = HashMap::new();
-
-scores.insert(String::from("Blue"), 10);
-scores.insert(String::from("Blue"), 25);
-
-println!("{:?}", scores);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-24/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-24: Replacing a value stored with a particular
@@ -201,15 +164,7 @@ and the same for the Blue team. Using the `entry` API, the code looks like
 Listing 8-25.
 
 ```rust
-use std::collections::HashMap;
-
-let mut scores = HashMap::new();
-scores.insert(String::from("Blue"), 10);
-
-scores.entry(String::from("Yellow")).or_insert(50);
-scores.entry(String::from("Blue")).or_insert(50);
-
-println!("{:?}", scores);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-25/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-25: Using the `entry` method to only insert if
@@ -237,18 +192,7 @@ seen that word. If it’s the first time we’ve seen a word, we’ll first inse
 the value 0.
 
 ```rust
-use std::collections::HashMap;
-
-let text = "hello world wonderful world";
-
-let mut map = HashMap::new();
-
-for word in text.split_whitespace() {
-    let count = map.entry(word).or_insert(0);
-    *count += 1;
-}
-
-println!("{:?}", map);
+{{#rustdoc_include ../listings/ch08-common-collections/listing-08-26/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 8-26: Counting occurrences of words using a hash
@@ -302,5 +246,6 @@ and hash maps have that will be helpful for these exercises!
 We’re getting into more complex programs in which operations can fail, so, it’s
 a perfect time to discuss error handling. We’ll do that next!
 
+[iterators]: ch13-02-iterators.html
 [validating-references-with-lifetimes]:
 ch10-03-lifetime-syntax.html#validating-references-with-lifetimes
diff --git a/src/doc/book/src/ch09-01-unrecoverable-errors-with-panic.md b/src/doc/book/src/ch09-01-unrecoverable-errors-with-panic.md
index 454b78071d..e677281038 100644
--- a/src/doc/book/src/ch09-01-unrecoverable-errors-with-panic.md
+++ b/src/doc/book/src/ch09-01-unrecoverable-errors-with-panic.md
@@ -29,20 +29,13 @@ Let’s try calling `panic!` in a simple program:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic,panics
-fn main() {
-    panic!("crash and burn");
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-01-panic/src/main.rs}}
 ```
 
 When you run the program, you’ll see something like this:
 
 ```text
-$ cargo run
-   Compiling panic v0.1.0 (file:///projects/panic)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.25s
-     Running `target/debug/panic`
-thread 'main' panicked at 'crash and burn', src/main.rs:2:5
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch09-error-handling/no-listing-01-panic/output.txt}}
 ```
 
 The call to `panic!` causes the error message contained in the last two lines.
@@ -69,11 +62,7 @@ element by index in a vector.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic,panics
-fn main() {
-    let v = vec![1, 2, 3];
-
-    v[99];
-}
+{{#rustdoc_include ../listings/ch09-error-handling/listing-09-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 9-1: Attempting to access an element beyond the
@@ -85,25 +74,20 @@ situation, Rust will panic. Using `[]` is supposed to return an element, but if
 you pass an invalid index, there’s no element that Rust could return here that
 would be correct.
 
-Other languages, like C, will attempt to give you exactly what you asked for in
-this situation, even though it isn’t what you want: you’ll get whatever is at
-the location in memory that would correspond to that element in the vector,
-even though the memory doesn’t belong to the vector. This is called a *buffer
-overread* and can lead to security vulnerabilities if an attacker is able to
-manipulate the index in such a way as to read data they shouldn’t be allowed to
-that is stored after the array.
+In C, attempting to read beyond the end of a data structure is undefined
+behavior. You might get whatever is at the location in memory that would
+correspond to that element in the data structure, even though the memory
+doesn’t belong to that structure. This is called a *buffer overread* and can
+lead to security vulnerabilities if an attacker is able to manipulate the index
+in such a way as to read data they shouldn’t be allowed to that is stored after
+the data structure.
 
 To protect your program from this sort of vulnerability, if you try to read an
 element at an index that doesn’t exist, Rust will stop execution and refuse to
 continue. Let’s try it and see:
 
 ```text
-$ cargo run
-   Compiling panic v0.1.0 (file:///projects/panic)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.27s
-     Running `target/debug/panic`
-thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', libcore/slice/mod.rs:2448:10
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch09-error-handling/listing-09-01/output.txt}}
 ```
 
 This error points at a file we didn’t write, *libcore/slice/mod.rs*. That’s the
@@ -123,53 +107,69 @@ library code, or crates that you’re using. Let’s try getting a backtrace by
 setting the `RUST_BACKTRACE` environment variable to any value except 0.
 Listing 9-2 shows output similar to what you’ll see.
 
+<!-- manual-regeneration
+cd listings/ch09-error-handling/listing-09-01
+RUST_BACKTRACE=1 cargo run
+copy the backtrace output below
+check the backtrace number mentioned in the text below the listing
+-->
+
 ```text
 $ RUST_BACKTRACE=1 cargo run
-    Finished dev [unoptimized + debuginfo] target(s) in 0.00s
-     Running `target/debug/panic`
-thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', libcore/slice/mod.rs:2448:10
+thread 'main' panicked at 'index out of bounds: the len is 3 but the index is 99', /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2806:10
 stack backtrace:
-   0: std::sys::unix::backtrace::tracing::imp::unwind_backtrace
-             at libstd/sys/unix/backtrace/tracing/gcc_s.rs:49
-   1: std::sys_common::backtrace::print
-             at libstd/sys_common/backtrace.rs:71
-             at libstd/sys_common/backtrace.rs:59
-   2: std::panicking::default_hook::{{closure}}
-             at libstd/panicking.rs:211
-   3: std::panicking::default_hook
-             at libstd/panicking.rs:227
-   4: <std::panicking::begin_panic::PanicPayload<A> as core::panic::BoxMeUp>::get
-             at libstd/panicking.rs:476
-   5: std::panicking::continue_panic_fmt
-             at libstd/panicking.rs:390
-   6: std::panicking::try::do_call
-             at libstd/panicking.rs:325
-   7: core::ptr::drop_in_place
-             at libcore/panicking.rs:77
-   8: core::ptr::drop_in_place
-             at libcore/panicking.rs:59
-   9: <usize as core::slice::SliceIndex<[T]>>::index
-             at libcore/slice/mod.rs:2448
-  10: core::slice::<impl core::ops::index::Index<I> for [T]>::index
-             at libcore/slice/mod.rs:2316
-  11: <alloc::vec::Vec<T> as core::ops::index::Index<I>>::index
-             at liballoc/vec.rs:1653
-  12: panic::main
+   0: backtrace::backtrace::libunwind::trace
+             at /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.40/src/backtrace/libunwind.rs:88
+   1: backtrace::backtrace::trace_unsynchronized
+             at /Users/runner/.cargo/registry/src/github.com-1ecc6299db9ec823/backtrace-0.3.40/src/backtrace/mod.rs:66
+   2: std::sys_common::backtrace::_print_fmt
+             at src/libstd/sys_common/backtrace.rs:84
+   3: <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt
+             at src/libstd/sys_common/backtrace.rs:61
+   4: core::fmt::ArgumentV1::show_usize
+   5: std::io::Write::write_fmt
+             at src/libstd/io/mod.rs:1426
+   6: std::sys_common::backtrace::_print
+             at src/libstd/sys_common/backtrace.rs:65
+   7: std::sys_common::backtrace::print
+             at src/libstd/sys_common/backtrace.rs:50
+   8: std::panicking::default_hook::{{closure}}
+             at src/libstd/panicking.rs:193
+   9: std::panicking::default_hook
+             at src/libstd/panicking.rs:210
+  10: std::panicking::rust_panic_with_hook
+             at src/libstd/panicking.rs:471
+  11: rust_begin_unwind
+             at src/libstd/panicking.rs:375
+  12: core::panicking::panic_fmt
+             at src/libcore/panicking.rs:84
+  13: core::panicking::panic_bounds_check
+             at src/libcore/panicking.rs:62
+  14: <usize as core::slice::SliceIndex<[T]>>::index
+             at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2806
+  15: core::slice::<impl core::ops::index::Index<I> for [T]>::index
+             at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libcore/slice/mod.rs:2657
+  16: <alloc::vec::Vec<T> as core::ops::index::Index<I>>::index
+             at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/liballoc/vec.rs:1871
+  17: panic::main
              at src/main.rs:4
-  13: std::rt::lang_start::{{closure}}
-             at libstd/rt.rs:74
-  14: std::panicking::try::do_call
-             at libstd/rt.rs:59
-             at libstd/panicking.rs:310
-  15: macho_symbol_search
-             at libpanic_unwind/lib.rs:102
-  16: std::alloc::default_alloc_error_hook
-             at libstd/panicking.rs:289
-             at libstd/panic.rs:392
-             at libstd/rt.rs:58
-  17: std::rt::lang_start
-             at libstd/rt.rs:74
-  18: panic::main
+  18: std::rt::lang_start::{{closure}}
+             at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libstd/rt.rs:67
+  19: std::rt::lang_start_internal::{{closure}}
+             at src/libstd/rt.rs:52
+  20: std::panicking::try::do_call
+             at src/libstd/panicking.rs:292
+  21: __rust_maybe_catch_panic
+             at src/libpanic_unwind/lib.rs:78
+  22: std::panicking::try
+             at src/libstd/panicking.rs:270
+  23: std::panic::catch_unwind
+             at src/libstd/panic.rs:394
+  24: std::rt::lang_start_internal
+             at src/libstd/rt.rs:51
+  25: std::rt::lang_start
+             at /rustc/5e1a799842ba6ed4a57e91f7ab9435947482f7d8/src/libstd/rt.rs:67
+  26: panic::main
 ```
 
 <span class="caption">Listing 9-2: The backtrace generated by a call to
@@ -181,7 +181,7 @@ information, debug symbols must be enabled. Debug symbols are enabled by
 default when using `cargo build` or `cargo run` without the `--release` flag,
 as we have here.
 
-In the output in Listing 9-2, line 12 of the backtrace points to the line in
+In the output in Listing 9-2, line 17 of the backtrace points to the line in
 our project that’s causing the problem: line 4 of *src/main.rs*. If we don’t
 want our program to panic, the location pointed to by the first line mentioning
 a file we wrote is where we should start investigating. In Listing 9-1, where
diff --git a/src/doc/book/src/ch09-02-recoverable-errors-with-result.md b/src/doc/book/src/ch09-02-recoverable-errors-with-result.md
index 8461e2bf03..26f9e5120e 100644
--- a/src/doc/book/src/ch09-02-recoverable-errors-with-result.md
+++ b/src/doc/book/src/ch09-02-recoverable-errors-with-result.md
@@ -34,11 +34,7 @@ fail. In Listing 9-3 we try to open a file.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::fs::File;
-
-fn main() {
-    let f = File::open("hello.txt");
-}
+{{#rustdoc_include ../listings/ch09-error-handling/listing-09-03/src/main.rs}}
 ```
 
 <span class="caption">Listing 9-3: Opening a file</span>
@@ -52,21 +48,13 @@ type of `f` *is*. Let’s try it! We know that the return type of `File::open`
 isn’t of type `u32`, so let’s change the `let f` statement to this:
 
 ```rust,ignore,does_not_compile
-let f: u32 = File::open("hello.txt");
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/src/main.rs:here}}
 ```
 
 Attempting to compile now gives us the following output:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs:4:18
-  |
-4 |     let f: u32 = File::open("hello.txt");
-  |                  ^^^^^^^^^^^^^^^^^^^^^^^ expected u32, found enum
-`std::result::Result`
-  |
-  = note: expected type `u32`
-             found type `std::result::Result<std::fs::File, std::io::Error>`
+{{#include ../listings/ch09-error-handling/no-listing-02-ask-compiler-for-type/output.txt}}
 ```
 
 This tells us the return type of the `File::open` function is a `Result<T, E>`.
@@ -95,18 +83,7 @@ Chapter 6.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-use std::fs::File;
-
-fn main() {
-    let f = File::open("hello.txt");
-
-    let f = match f {
-        Ok(file) => file,
-        Err(error) => {
-            panic!("Problem opening the file: {:?}", error)
-        },
-    };
-}
+{{#rustdoc_include ../listings/ch09-error-handling/listing-09-04/src/main.rs}}
 ```
 
 <span class="caption">Listing 9-4: Using a `match` expression to handle the
@@ -127,8 +104,7 @@ there’s no file named *hello.txt* in our current directory and we run this
 code, we’ll see the following output from the `panic!` macro:
 
 ```text
-thread 'main' panicked at 'Problem opening the file: Error { repr:
-Os { code: 2, message: "No such file or directory" } }', src/main.rs:9:12
+{{#include ../listings/ch09-error-handling/listing-09-04/output.txt}}
 ```
 
 As usual, this output tells us exactly what has gone wrong.
@@ -149,23 +125,7 @@ at Listing 9-5, which adds an inner `match` expression.
 tests to fail lol -->
 
 ```rust,ignore
-use std::fs::File;
-use std::io::ErrorKind;
-
-fn main() {
-    let f = File::open("hello.txt");
-
-    let f = match f {
-        Ok(file) => file,
-        Err(error) => match error.kind() {
-            ErrorKind::NotFound => match File::create("hello.txt") {
-                Ok(fc) => fc,
-                Err(e) => panic!("Problem creating the file: {:?}", e),
-            },
-            other_error => panic!("Problem opening the file: {:?}", other_error),
-        },
-    };
-}
+{{#rustdoc_include ../listings/ch09-error-handling/listing-09-05/src/main.rs}}
 ```
 
 <span class="caption">Listing 9-5: Handling different kinds of errors in
@@ -195,20 +155,7 @@ E>` type has many methods that accept a closure and are implemented using
 more seasoned Rustacean might write this code instead of Listing 9-5:
 
 ```rust,ignore
-use std::fs::File;
-use std::io::ErrorKind;
-
-fn main() {
-    let f = File::open("hello.txt").unwrap_or_else(|error| {
-        if error.kind() == ErrorKind::NotFound {
-            File::create("hello.txt").unwrap_or_else(|error| {
-                panic!("Problem creating the file: {:?}", error);
-            })
-        } else {
-            panic!("Problem opening the file: {:?}", error);
-        }
-    });
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-03-closures/src/main.rs}}
 ```
 
 Although this code has the same behavior as Listing 9-5, it doesn’t contain any
@@ -230,11 +177,7 @@ call the `panic!` macro for us. Here is an example of `unwrap` in action:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-use std::fs::File;
-
-fn main() {
-    let f = File::open("hello.txt").unwrap();
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-04-unwrap/src/main.rs}}
 ```
 
 If we run this code without a *hello.txt* file, we’ll see an error message from
@@ -254,11 +197,7 @@ panic easier. The syntax of `expect` looks like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-use std::fs::File;
-
-fn main() {
-    let f = File::open("hello.txt").expect("Failed to open hello.txt");
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-05-expect/src/main.rs}}
 ```
 
 We use `expect` in the same way as `unwrap`: to return the file handle or call
@@ -292,26 +231,12 @@ to the code that called this function.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-use std::io;
-use std::io::Read;
-use std::fs::File;
-
-fn read_username_from_file() -> Result<String, io::Error> {
-    let f = File::open("hello.txt");
-
-    let mut f = match f {
-        Ok(file) => file,
-        Err(e) => return Err(e),
-    };
+<!-- Deliberately not using rustdoc_include here; the `main` function in the
+file panics. We do want to include it for reader experimentation purposes, but
+don't want to include it for rustdoc testing purposes. -->
 
-    let mut s = String::new();
-
-    match f.read_to_string(&mut s) {
-        Ok(_) => Ok(s),
-        Err(e) => Err(e),
-    }
-}
+```rust
+{{#include ../listings/ch09-error-handling/listing-09-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 9-6: A function that returns errors to the
@@ -372,17 +297,12 @@ same functionality as it had in Listing 9-6, but this implementation uses the
 
 <span class="filename">Filename: src/main.rs</span>
 
+<!-- Deliberately not using rustdoc_include here; the `main` function in the
+file panics. We do want to include it for reader experimentation purposes, but
+don't want to include it for rustdoc testing purposes. -->
+
 ```rust
-use std::io;
-use std::io::Read;
-use std::fs::File;
-
-fn read_username_from_file() -> Result<String, io::Error> {
-    let mut f = File::open("hello.txt")?;
-    let mut s = String::new();
-    f.read_to_string(&mut s)?;
-    Ok(s)
-}
+{{#include ../listings/ch09-error-handling/listing-09-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 9-7: A function that returns errors to the
@@ -420,18 +340,12 @@ method calls immediately after the `?`, as shown in Listing 9-8.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-use std::io;
-use std::io::Read;
-use std::fs::File;
-
-fn read_username_from_file() -> Result<String, io::Error> {
-    let mut s = String::new();
-
-    File::open("hello.txt")?.read_to_string(&mut s)?;
+<!-- Deliberately not using rustdoc_include here; the `main` function in the
+file panics. We do want to include it for reader experimentation purposes, but
+don't want to include it for rustdoc testing purposes. -->
 
-    Ok(s)
-}
+```rust
+{{#include ../listings/ch09-error-handling/listing-09-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 9-8: Chaining method calls after the `?`
@@ -451,13 +365,12 @@ there’s a way to make this even shorter.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-use std::io;
-use std::fs;
+<!-- Deliberately not using rustdoc_include here; the `main` function in the
+file panics. We do want to include it for reader experimentation purposes, but
+don't want to include it for rustdoc testing purposes. -->
 
-fn read_username_from_file() -> Result<String, io::Error> {
-    fs::read_to_string("hello.txt")
-}
+```rust
+{{#include ../listings/ch09-error-handling/listing-09-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 9-9: Using `fs::read_to_string` instead of
@@ -482,26 +395,13 @@ Let’s look at what happens if we use the `?` operator in the `main` function,
 which you’ll recall has a return type of `()`:
 
 ```rust,ignore,does_not_compile
-use std::fs::File;
-
-fn main() {
-    let f = File::open("hello.txt")?;
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-06-question-mark-in-main/src/main.rs}}
 ```
 
 When we compile this code, we get the following error message:
 
 ```text
-error[E0277]: the `?` operator can only be used in a function that returns
-`Result` or `Option` (or another type that implements `std::ops::Try`)
- --> src/main.rs:4:13
-  |
-4 |     let f = File::open("hello.txt")?;
-  |             ^^^^^^^^^^^^^^^^^^^^^^^^ cannot use the `?` operator in a
-  function that returns `()`
-  |
-  = help: the trait `std::ops::Try` is not implemented for `()`
-  = note: required by `std::ops::Try::from_error`
+{{#include ../listings/ch09-error-handling/no-listing-06-question-mark-in-main/output.txt}}
 ```
 
 This error points out that we’re only allowed to use the `?` operator in a
@@ -519,14 +419,7 @@ type must be. One valid return type for main is `()`, and conveniently, another
 valid return type is `Result<T, E>`, as shown here:
 
 ```rust,ignore
-use std::error::Error;
-use std::fs::File;
-
-fn main() -> Result<(), Box<dyn Error>> {
-    let f = File::open("hello.txt")?;
-
-    Ok(())
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-07-main-returning-result/src/main.rs}}
 ```
 
 The `Box<dyn Error>` type is called a trait object, which we’ll talk about in
diff --git a/src/doc/book/src/ch09-03-to-panic-or-not-to-panic.md b/src/doc/book/src/ch09-03-to-panic-or-not-to-panic.md
index a8f6965b1f..e5af81d0eb 100644
--- a/src/doc/book/src/ch09-03-to-panic-or-not-to-panic.md
+++ b/src/doc/book/src/ch09-03-to-panic-or-not-to-panic.md
@@ -48,9 +48,7 @@ have an `Err` variant, it’s perfectly acceptable to call `unwrap`. Here’s an
 example:
 
 ```rust
-use std::net::IpAddr;
-
-let home: IpAddr = "127.0.0.1".parse().unwrap();
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-08-unwrap-that-cant-fail/src/main.rs:here}}
 ```
 
 We’re creating an `IpAddr` instance by parsing a hardcoded string. We can see
@@ -133,22 +131,7 @@ One way to do this would be to parse the guess as an `i32` instead of only a
 number being in range, like so:
 
 ```rust,ignore
-loop {
-    // --snip--
-
-    let guess: i32 = match guess.trim().parse() {
-        Ok(num) => num,
-        Err(_) => continue,
-    };
-
-    if guess < 1 || guess > 100 {
-        println!("The secret number will be between 1 and 100.");
-        continue;
-    }
-
-    match guess.cmp(&secret_number) {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch09-error-handling/no-listing-09-guess-out-of-range/src/main.rs:here}}
 ```
 
 The `if` expression checks whether our value is out of range, tells the user
@@ -169,26 +152,13 @@ confidently use the values they receive. Listing 9-10 shows one way to define a
 `Guess` type that will only create an instance of `Guess` if the `new` function
 receives a value between 1 and 100.
 
+<!-- Deliberately not using rustdoc_include here; the `main` function in the
+file requires the `rand` crate. We do want to include it for reader
+experimentation purposes, but don't want to include it for rustdoc testing
+purposes. -->
+
 ```rust
-pub struct Guess {
-    value: i32,
-}
-
-impl Guess {
-    pub fn new(value: i32) -> Guess {
-        if value < 1 || value > 100 {
-            panic!("Guess value must be between 1 and 100, got {}.", value);
-        }
-
-        Guess {
-            value
-        }
-    }
-
-    pub fn value(&self) -> i32 {
-        self.value
-    }
-}
+{{#include ../listings/ch09-error-handling/listing-09-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 9-10: A `Guess` type that will only continue with
diff --git a/src/doc/book/src/ch10-00-generics.md b/src/doc/book/src/ch10-00-generics.md
index b411210be2..032f4374bc 100644
--- a/src/doc/book/src/ch10-00-generics.md
+++ b/src/doc/book/src/ch10-00-generics.md
@@ -41,20 +41,7 @@ Listing 10-1.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let number_list = vec![34, 50, 25, 100, 65];
-
-    let mut largest = number_list[0];
-
-    for number in number_list {
-        if number > largest {
-            largest = number;
-        }
-    }
-
-    println!("The largest number is {}", largest);
-#  assert_eq!(largest, 100);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-1: Code to find the largest number in a list
@@ -76,31 +63,7 @@ program, as shown in Listing 10-2.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let number_list = vec![34, 50, 25, 100, 65];
-
-    let mut largest = number_list[0];
-
-    for number in number_list {
-        if number > largest {
-            largest = number;
-        }
-    }
-
-    println!("The largest number is {}", largest);
-
-    let number_list = vec![102, 34, 6000, 89, 54, 2, 43, 8];
-
-    let mut largest = number_list[0];
-
-    for number in number_list {
-        if number > largest {
-            largest = number;
-        }
-    }
-
-    println!("The largest number is {}", largest);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-02/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-2: Code to find the largest number in *two*
@@ -122,31 +85,7 @@ number in two different lists.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn largest(list: &[i32]) -> i32 {
-    let mut largest = list[0];
-
-    for &item in list {
-        if item > largest {
-            largest = item;
-        }
-    }
-
-    largest
-}
-
-fn main() {
-    let number_list = vec![34, 50, 25, 100, 65];
-
-    let result = largest(&number_list);
-    println!("The largest number is {}", result);
-#    assert_eq!(result, 100);
-
-    let number_list = vec![102, 34, 6000, 89, 54, 2, 43, 8];
-
-    let result = largest(&number_list);
-    println!("The largest number is {}", result);
-#    assert_eq!(result, 6000);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-3: Abstracted code to find the largest number
diff --git a/src/doc/book/src/ch10-01-syntax.md b/src/doc/book/src/ch10-01-syntax.md
index f69165e269..3d86ebfa16 100644
--- a/src/doc/book/src/ch10-01-syntax.md
+++ b/src/doc/book/src/ch10-01-syntax.md
@@ -18,43 +18,7 @@ both find the largest value in a slice.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn largest_i32(list: &[i32]) -> i32 {
-    let mut largest = list[0];
-
-    for &item in list.iter() {
-        if item > largest {
-            largest = item;
-        }
-    }
-
-    largest
-}
-
-fn largest_char(list: &[char]) -> char {
-    let mut largest = list[0];
-
-    for &item in list.iter() {
-        if item > largest {
-            largest = item;
-        }
-    }
-
-    largest
-}
-
-fn main() {
-    let number_list = vec![34, 50, 25, 100, 65];
-
-    let result = largest_i32(&number_list);
-    println!("The largest number is {}", result);
-#    assert_eq!(result, 100);
-
-    let char_list = vec!['y', 'm', 'a', 'q'];
-
-    let result = largest_char(&char_list);
-    println!("The largest char is {}", result);
-#    assert_eq!(result, 'y');
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-4: Two functions that differ only in their
@@ -95,29 +59,7 @@ compile yet, but we’ll fix it later in this chapter.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn largest<T>(list: &[T]) -> T {
-    let mut largest = list[0];
-
-    for &item in list.iter() {
-        if item > largest {
-            largest = item;
-        }
-    }
-
-    largest
-}
-
-fn main() {
-    let number_list = vec![34, 50, 25, 100, 65];
-
-    let result = largest(&number_list);
-    println!("The largest number is {}", result);
-
-    let char_list = vec!['y', 'm', 'a', 'q'];
-
-    let result = largest(&char_list);
-    println!("The largest char is {}", result);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-5: A definition of the `largest` function that
@@ -126,13 +68,7 @@ uses generic type parameters but doesn’t compile yet</span>
 If we compile this code right now, we’ll get this error:
 
 ```text
-error[E0369]: binary operation `>` cannot be applied to type `T`
- --> src/main.rs:5:12
-  |
-5 |         if item > largest {
-  |            ^^^^^^^^^^^^^^
-  |
-  = note: an implementation of `std::cmp::PartialOrd` might be missing for `T`
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt}}
 ```
 
 The note mentions `std::cmp::PartialOrd`, which is a *trait*. We’ll talk about
@@ -155,15 +91,7 @@ struct to hold `x` and `y` coordinate values of any type.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Point<T> {
-    x: T,
-    y: T,
-}
-
-fn main() {
-    let integer = Point { x: 5, y: 10 };
-    let float = Point { x: 1.0, y: 4.0 };
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-06/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-6: A `Point<T>` struct that holds `x` and `y`
@@ -184,14 +112,7 @@ Listing 10-7, our code won’t compile.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-struct Point<T> {
-    x: T,
-    y: T,
-}
-
-fn main() {
-    let wont_work = Point { x: 5, y: 4.0 };
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-7: The fields `x` and `y` must be the same
@@ -203,15 +124,7 @@ compiler know that the generic type `T` will be an integer for this instance of
 same type as `x`, we’ll get a type mismatch error like this:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs:7:38
-  |
-7 |     let wont_work = Point { x: 5, y: 4.0 };
-  |                                      ^^^ expected integer, found
-floating-point number
-  |
-  = note: expected type `{integer}`
-             found type `{float}`
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-07/output.txt}}
 ```
 
 To define a `Point` struct where `x` and `y` are both generics but could have
@@ -222,16 +135,7 @@ Listing 10-8, we can change the definition of `Point` to be generic over types
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Point<T, U> {
-    x: T,
-    y: U,
-}
-
-fn main() {
-    let both_integer = Point { x: 5, y: 10 };
-    let both_float = Point { x: 1.0, y: 4.0 };
-    let integer_and_float = Point { x: 5, y: 4.0 };
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-08/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-8: A `Point<T, U>` generic over two types so
@@ -294,22 +198,7 @@ struct we defined in Listing 10-6 with a method named `x` implemented on it.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Point<T> {
-    x: T,
-    y: T,
-}
-
-impl<T> Point<T> {
-    fn x(&self) -> &T {
-        &self.x
-    }
-}
-
-fn main() {
-    let p = Point { x: 5, y: 10 };
-
-    println!("p.x = {}", p.x());
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-09/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-9: Implementing a method named `x` on the
@@ -328,17 +217,10 @@ We could, for example, implement methods only on `Point<f32>` instances rather
 than on `Point<T>` instances with any generic type. In Listing 10-10 we use the
 concrete type `f32`, meaning we don’t declare any types after `impl`.
 
+<span class="filename">Filename: src/main.rs</span>
+
 ```rust
-# struct Point<T> {
-#     x: T,
-#     y: T,
-# }
-#
-impl Point<f32> {
-    fn distance_from_origin(&self) -> f32 {
-        (self.x.powi(2) + self.y.powi(2)).sqrt()
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-10: An `impl` block that only applies to a
@@ -361,28 +243,7 @@ value from the passed-in `Point` (of type `W`).
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Point<T, U> {
-    x: T,
-    y: U,
-}
-
-impl<T, U> Point<T, U> {
-    fn mixup<V, W>(self, other: Point<V, W>) -> Point<T, W> {
-        Point {
-            x: self.x,
-            y: other.y,
-        }
-    }
-}
-
-fn main() {
-    let p1 = Point { x: 5, y: 10.4 };
-    let p2 = Point { x: "Hello", y: 'c'};
-
-    let p3 = p1.mixup(p2);
-
-    println!("p3.x = {}, p3.y = {}", p3.x, p3.y);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-11/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-11: A method that uses different generic types
diff --git a/src/doc/book/src/ch10-02-traits.md b/src/doc/book/src/ch10-02-traits.md
index 19e873bbac..0e01361d22 100644
--- a/src/doc/book/src/ch10-02-traits.md
+++ b/src/doc/book/src/ch10-02-traits.md
@@ -30,9 +30,7 @@ need a summary from each type, and we need to request that summary by calling a
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub trait Summary {
-    fn summarize(&self) -> String;
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-12/src/lib.rs}}
 ```
 
 <span class="caption">Listing 10-12: A `Summary` trait that consists of the
@@ -65,35 +63,7 @@ already limited to 280 characters.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub trait Summary {
-#     fn summarize(&self) -> String;
-# }
-#
-pub struct NewsArticle {
-    pub headline: String,
-    pub location: String,
-    pub author: String,
-    pub content: String,
-}
-
-impl Summary for NewsArticle {
-    fn summarize(&self) -> String {
-        format!("{}, by {} ({})", self.headline, self.author, self.location)
-    }
-}
-
-pub struct Tweet {
-    pub username: String,
-    pub content: String,
-    pub reply: bool,
-    pub retweet: bool,
-}
-
-impl Summary for Tweet {
-    fn summarize(&self) -> String {
-        format!("{}: {}", self.username, self.content)
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-13/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 10-13: Implementing the `Summary` trait on the
@@ -112,14 +82,7 @@ After implementing the trait, we can call the methods on instances of
 `NewsArticle` and `Tweet` in the same way we call regular methods, like this:
 
 ```rust,ignore
-let tweet = Tweet {
-    username: String::from("horse_ebooks"),
-    content: String::from("of course, as you probably already know, people"),
-    reply: false,
-    retweet: false,
-};
-
-println!("1 new tweet: {}", tweet.summarize());
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-01-calling-trait-method/src/main.rs:here}}
 ```
 
 This code prints `1 new tweet: horse_ebooks: of course, as you probably already
@@ -168,11 +131,7 @@ in Listing 10-12.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub trait Summary {
-    fn summarize(&self) -> String {
-        String::from("(Read more...)")
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-14/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 10-14: Definition of a `Summary` trait with a
@@ -188,15 +147,7 @@ directly, we’ve provided a default implementation and specified that
 the `summarize` method on an instance of `NewsArticle`, like this:
 
 ```rust,ignore
-let article = NewsArticle {
-    headline: String::from("Penguins win the Stanley Cup Championship!"),
-    location: String::from("Pittsburgh, PA, USA"),
-    author: String::from("Iceburgh"),
-    content: String::from("The Pittsburgh Penguins once again are the best
-    hockey team in the NHL."),
-};
-
-println!("New article available! {}", article.summarize());
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-02-calling-default-impl/src/main.rs:here}}
 ```
 
 This code prints `New article available! (Read more...)`.
@@ -216,24 +167,14 @@ a small part of it. For example, we could define the `Summary` trait to have a
 `summarize_author` method:
 
 ```rust
-pub trait Summary {
-    fn summarize_author(&self) -> String;
-
-    fn summarize(&self) -> String {
-        format!("(Read more from {}...)", self.summarize_author())
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/lib.rs:here}}
 ```
 
 To use this version of `Summary`, we only need to define `summarize_author`
 when we implement the trait on a type:
 
 ```rust,ignore
-impl Summary for Tweet {
-    fn summarize_author(&self) -> String {
-        format!("@{}", self.username)
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/lib.rs:impl}}
 ```
 
 After we define `summarize_author`, we can call `summarize` on instances of the
@@ -243,14 +184,7 @@ definition of `summarize_author` that we’ve provided. Because we’ve implemen
 `summarize` method without requiring us to write any more code.
 
 ```rust,ignore
-let tweet = Tweet {
-    username: String::from("horse_ebooks"),
-    content: String::from("of course, as you probably already know, people"),
-    reply: false,
-    retweet: false,
-};
-
-println!("1 new tweet: {}", tweet.summarize());
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-03-default-impl-calls-other-methods/src/main.rs:here}}
 ```
 
 This code prints `1 new tweet: (Read more from @horse_ebooks...)`.
@@ -270,9 +204,7 @@ implements the `Summary` trait. To do this, we can use the `impl Trait`
 syntax, like this:
 
 ```rust,ignore
-pub fn notify(item: impl Summary) {
-    println!("Breaking news! {}", item.summarize());
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-04-traits-as-parameters/src/lib.rs:here}}
 ```
 
 Instead of a concrete type for the `item` parameter, we specify the `impl`
@@ -373,14 +305,7 @@ We can also use the `impl Trait` syntax in the return position to return a
 value of some type that implements a trait, as shown here:
 
 ```rust,ignore
-fn returns_summarizable() -> impl Summary {
-    Tweet {
-        username: String::from("horse_ebooks"),
-        content: String::from("of course, as you probably already know, people"),
-        reply: false,
-        retweet: false,
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-05-returning-impl-trait/src/lib.rs:here}}
 ```
 
 By using `impl Summary` for the return type, we specify that the
@@ -400,24 +325,7 @@ example, this code that returns either a `NewsArticle` or a `Tweet` with the
 return type specified as `impl Summary` wouldn’t work:
 
 ```rust,ignore,does_not_compile
-fn returns_summarizable(switch: bool) -> impl Summary {
-    if switch {
-        NewsArticle {
-            headline: String::from("Penguins win the Stanley Cup Championship!"),
-            location: String::from("Pittsburgh, PA, USA"),
-            author: String::from("Iceburgh"),
-            content: String::from("The Pittsburgh Penguins once again are the best
-            hockey team in the NHL."),
-        }
-    } else {
-        Tweet {
-            username: String::from("horse_ebooks"),
-            content: String::from("of course, as you probably already know, people"),
-            reply: false,
-            retweet: false,
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-06-impl-trait-returns-one-type/src/lib.rs:here}}
 ```
 
 Returning either a `NewsArticle` or a `Tweet` isn’t allowed due to restrictions
@@ -435,13 +343,7 @@ the `largest` function that uses a generic type parameter! Last time we tried
 to run that code, we received this error:
 
 ```text
-error[E0369]: binary operation `>` cannot be applied to type `T`
- --> src/main.rs:5:12
-  |
-5 |         if item > largest {
-  |            ^^^^^^^^^^^^^^
-  |
-  = note: an implementation of `std::cmp::PartialOrd` might be missing for `T`
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-05/output.txt}}
 ```
 
 In the body of `largest` we wanted to compare two values of type `T` using the
@@ -453,29 +355,13 @@ into scope because it’s in the prelude. Change the signature of `largest` to
 look like this:
 
 ```rust,ignore
-fn largest<T: PartialOrd>(list: &[T]) -> T {
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/src/main.rs:here}}
 ```
 
 This time when we compile the code, we get a different set of errors:
 
 ```text
-error[E0508]: cannot move out of type `[T]`, a non-copy slice
- --> src/main.rs:2:23
-  |
-2 |     let mut largest = list[0];
-  |                       ^^^^^^^
-  |                       |
-  |                       cannot move out of here
-  |                       help: consider using a reference instead: `&list[0]`
-
-error[E0507]: cannot move out of borrowed content
- --> src/main.rs:4:9
-  |
-4 |     for &item in list.iter() {
-  |         ^----
-  |         ||
-  |         |hint: to prevent move, use `ref item` or `ref mut item`
-  |         cannot move out of borrowed content
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-07-fixing-listing-10-05/output.txt}}
 ```
 
 The key line in this error is `cannot move out of type [T], a non-copy slice`.
@@ -498,29 +384,7 @@ values in the slice that we pass into the function implement the `PartialOrd`
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn largest<T: PartialOrd + Copy>(list: &[T]) -> T {
-    let mut largest = list[0];
-
-    for &item in list.iter() {
-        if item > largest {
-            largest = item;
-        }
-    }
-
-    largest
-}
-
-fn main() {
-    let number_list = vec![34, 50, 25, 100, 65];
-
-    let result = largest(&number_list);
-    println!("The largest number is {}", result);
-
-    let char_list = vec!['y', 'm', 'a', 'q'];
-
-    let result = largest(&char_list);
-    println!("The largest char is {}", result);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-15/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-15: A working definition of the `largest`
@@ -550,32 +414,10 @@ traits. For example, the type `Pair<T>` in Listing 10-16 always implements the
 inner type `T` implements the `PartialOrd` trait that enables comparison *and*
 the `Display` trait that enables printing.
 
-```rust
-use std::fmt::Display;
-
-struct Pair<T> {
-    x: T,
-    y: T,
-}
-
-impl<T> Pair<T> {
-    fn new(x: T, y: T) -> Self {
-        Self {
-            x,
-            y,
-        }
-    }
-}
+<span class="filename">Filename: src/lib.rs</span>
 
-impl<T: Display + PartialOrd> Pair<T> {
-    fn cmp_display(&self) {
-        if self.x >= self.y {
-            println!("The largest member is x = {}", self.x);
-        } else {
-            println!("The largest member is y = {}", self.y);
-        }
-    }
-}
+```rust
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-16/src/lib.rs}}
 ```
 
 <span class="caption">Listing 10-16: Conditionally implement methods on a
diff --git a/src/doc/book/src/ch10-03-lifetime-syntax.md b/src/doc/book/src/ch10-03-lifetime-syntax.md
index 383a4ec40e..c00703946e 100644
--- a/src/doc/book/src/ch10-03-lifetime-syntax.md
+++ b/src/doc/book/src/ch10-03-lifetime-syntax.md
@@ -25,16 +25,7 @@ Consider the program in Listing 10-17, which has an outer scope and an inner
 scope.
 
 ```rust,ignore,does_not_compile
-{
-    let r;
-
-    {
-        let x = 5;
-        r = &x;
-    }
-
-    println!("r: {}", r);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-17: An attempt to use a reference whose value
@@ -55,16 +46,7 @@ compile because the value `r` is referring to has gone out of scope before we
 try to use it. Here is the error message:
 
 ```text
-error[E0597]: `x` does not live long enough
-  --> src/main.rs:7:5
-   |
-6  |         r = &x;
-   |              - borrow occurs here
-7  |     }
-   |     ^ `x` dropped here while still borrowed
-...
-10 | }
-   | - borrowed value needs to live until here
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-17/output.txt}}
 ```
 
 The variable `x` doesn’t “live long enough.” The reason is that `x` will be out
@@ -82,16 +64,7 @@ whether all borrows are valid. Listing 10-18 shows the same code as Listing
 10-17 but with annotations showing the lifetimes of the variables.
 
 ```rust,ignore,does_not_compile
-{
-    let r;                // ---------+-- 'a
-                          //          |
-    {                     //          |
-        let x = 5;        // -+-- 'b  |
-        r = &x;           //  |       |
-    }                     // -+       |
-                          //          |
-    println!("r: {}", r); //          |
-}                         // ---------+
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-18/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-18: Annotations of the lifetimes of `r` and
@@ -108,14 +81,7 @@ Listing 10-19 fixes the code so it doesn’t have a dangling reference and
 compiles without any errors.
 
 ```rust
-{
-    let x = 5;            // ----------+-- 'b
-                          //           |
-    let r = &x;           // --+-- 'a  |
-                          //   |       |
-    println!("r: {}", r); //   |       |
-                          // --+       |
-}                         // ----------+
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-19/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-19: A valid reference because the data has a
@@ -139,13 +105,7 @@ longest string is abcd`.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let string1 = String::from("abcd");
-    let string2 = "xyz";
-
-    let result = longest(string1.as_str(), string2);
-    println!("The longest string is {}", result);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-20/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-20: A `main` function that calls the `longest`
@@ -167,13 +127,7 @@ won’t compile.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn longest(x: &str, y: &str) -> &str {
-    if x.len() > y.len() {
-        x
-    } else {
-        y
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-21: An implementation of the `longest`
@@ -183,14 +137,7 @@ compile</span>
 Instead, we get the following error that talks about lifetimes:
 
 ```text
-error[E0106]: missing lifetime specifier
- --> src/main.rs:1:33
-  |
-1 | fn longest(x: &str, y: &str) -> &str {
-  |                                 ^ expected lifetime parameter
-  |
-  = help: this function's return type contains a borrowed value, but the
-signature does not say whether it is borrowed from `x` or `y`
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-21/output.txt}}
 ```
 
 The help text reveals that the return type needs a generic lifetime parameter
@@ -257,13 +204,7 @@ Listing 10-22.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
-    if x.len() > y.len() {
-        x
-    } else {
-        y
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-22/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-22: The `longest` function definition
@@ -310,23 +251,7 @@ a straightforward example.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
-#     if x.len() > y.len() {
-#         x
-#     } else {
-#         y
-#     }
-# }
-#
-fn main() {
-    let string1 = String::from("long string is long");
-
-    {
-        let string2 = String::from("xyz");
-        let result = longest(string1.as_str(), string2.as_str());
-        println!("The longest string is {}", result);
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-23/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-23: Using the `longest` function with
@@ -349,15 +274,7 @@ compile.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let string1 = String::from("long string is long");
-    let result;
-    {
-        let string2 = String::from("xyz");
-        result = longest(string1.as_str(), string2.as_str());
-    }
-    println!("The longest string is {}", result);
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-24: Attempting to use `result` after `string2`
@@ -366,16 +283,7 @@ has gone out of scope</span>
 When we try to compile this code, we’ll get this error:
 
 ```text
-error[E0597]: `string2` does not live long enough
-  --> src/main.rs:15:5
-   |
-14 |         result = longest(string1.as_str(), string2.as_str());
-   |                                            ------- borrow occurs here
-15 |     }
-   |     ^ `string2` dropped here while still borrowed
-16 |     println!("The longest string is {}", result);
-17 | }
-   | - borrowed value needs to live until here
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-24/output.txt}}
 ```
 
 The error shows that for `result` to be valid for the `println!` statement,
@@ -408,9 +316,7 @@ following code will compile:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn longest<'a>(x: &'a str, y: &str) -> &'a str {
-    x
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-08-only-one-reference-with-lifetime/src/main.rs:here}}
 ```
 
 In this example, we’ve specified a lifetime parameter `'a` for the parameter
@@ -427,10 +333,7 @@ this attempted implementation of the `longest` function that won’t compile:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn longest<'a>(x: &str, y: &str) -> &'a str {
-    let result = String::from("really long string");
-    result.as_str()
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/src/main.rs:here}}
 ```
 
 Here, even though we’ve specified a lifetime parameter `'a` for the return
@@ -439,23 +342,7 @@ lifetime is not related to the lifetime of the parameters at all. Here is the
 error message we get:
 
 ```text
-error[E0597]: `result` does not live long enough
- --> src/main.rs:3:5
-  |
-3 |     result.as_str()
-  |     ^^^^^^ does not live long enough
-4 | }
-  | - borrowed value only lives until here
-  |
-note: borrowed value must be valid for the lifetime 'a as defined on the
-function body at 1:1...
- --> src/main.rs:1:1
-  |
-1 | / fn longest<'a>(x: &str, y: &str) -> &'a str {
-2 | |     let result = String::from("really long string");
-3 | |     result.as_str()
-4 | | }
-  | |_^
+{{#include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-09-unrelated-lifetime/output.txt}}
 ```
 
 The problem is that `result` goes out of scope and gets cleaned up at the end
@@ -481,17 +368,7 @@ struct named `ImportantExcerpt` that holds a string slice.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct ImportantExcerpt<'a> {
-    part: &'a str,
-}
-
-fn main() {
-    let novel = String::from("Call me Ishmael. Some years ago...");
-    let first_sentence = novel.split('.')
-        .next()
-        .expect("Could not find a '.'");
-    let i = ImportantExcerpt { part: first_sentence };
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-25/src/main.rs}}
 ```
 
 <span class="caption">Listing 10-25: A struct that holds a reference, so its
@@ -521,17 +398,7 @@ Chapter 4 we had a function in Listing 4-9, which is shown again in Listing
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-fn first_word(s: &str) -> &str {
-    let bytes = s.as_bytes();
-
-    for (i, &item) in bytes.iter().enumerate() {
-        if item == b' ' {
-            return &s[0..i];
-        }
-    }
-
-    &s[..]
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/listing-10-26/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 10-26: A function we defined in Listing 4-9 that
@@ -671,15 +538,7 @@ First, we’ll use a method named `level` whose only parameter is a reference to
 `self` and whose return value is an `i32`, which is not a reference to anything:
 
 ```rust
-# struct ImportantExcerpt<'a> {
-#     part: &'a str,
-# }
-#
-impl<'a> ImportantExcerpt<'a> {
-    fn level(&self) -> i32 {
-        3
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/src/main.rs:1st}}
 ```
 
 The lifetime parameter declaration after `impl` and its use after the type name
@@ -689,16 +548,7 @@ to `self` because of the first elision rule.
 Here is an example where the third lifetime elision rule applies:
 
 ```rust
-# struct ImportantExcerpt<'a> {
-#     part: &'a str,
-# }
-#
-impl<'a> ImportantExcerpt<'a> {
-    fn announce_and_return_part(&self, announcement: &str) -> &str {
-        println!("Attention please: {}", announcement);
-        self.part
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-10-lifetimes-on-methods/src/main.rs:3rd}}
 ```
 
 There are two input lifetimes, so Rust applies the first lifetime elision rule
@@ -734,18 +584,7 @@ Let’s briefly look at the syntax of specifying generic type parameters, trait
 bounds, and lifetimes all in one function!
 
 ```rust
-use std::fmt::Display;
-
-fn longest_with_an_announcement<'a, T>(x: &'a str, y: &'a str, ann: T) -> &'a str
-    where T: Display
-{
-    println!("Announcement! {}", ann);
-    if x.len() > y.len() {
-        x
-    } else {
-        y
-    }
-}
+{{#rustdoc_include ../listings/ch10-generic-types-traits-and-lifetimes/no-listing-11-generics-traits-and-lifetimes/src/main.rs:here}}
 ```
 
 This is the `longest` function from Listing 10-22 that returns the longer of
diff --git a/src/doc/book/src/ch11-01-writing-tests.md b/src/doc/book/src/ch11-01-writing-tests.md
index 42a5391878..a2f62ce4bd 100644
--- a/src/doc/book/src/ch11-01-writing-tests.md
+++ b/src/doc/book/src/ch11-01-writing-tests.md
@@ -47,14 +47,7 @@ Listing 11-1.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-1: The test module and function generated
@@ -75,21 +68,7 @@ The `cargo test` command runs all tests in our project, as shown in Listing
 11-2.
 
 ```text
-$ cargo test
-   Compiling adder v0.1.0 (file:///projects/adder)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.22 secs
-     Running target/debug/deps/adder-ce99bcc2479f4607
-
-running 1 test
-test tests::it_works ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-   Doc-tests adder
-
-running 0 tests
-
-test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-01/output.txt}}
 ```
 
 <span class="caption">Listing 11-2: The output from running the automatically
@@ -129,24 +108,14 @@ so:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn exploration() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/src/lib.rs:here}}
 ```
 
 Then run `cargo test` again. The output now shows `exploration` instead of
 `it_works`:
 
 ```text
-running 1 test
-test tests::exploration ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-01-changing-test-name/output.txt}}
 ```
 
 Let’s add another test, but this time we’ll make a test that fails! Tests fail
@@ -159,19 +128,7 @@ which is to call the `panic!` macro. Enter the new test, `another`, so your
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,panics
-# fn main() {}
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn exploration() {
-        assert_eq!(2 + 2, 4);
-    }
-
-    #[test]
-    fn another() {
-        panic!("Make this test fail");
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-03/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-3: Adding a second test that will fail because
@@ -181,22 +138,7 @@ Run the tests again using `cargo test`. The output should look like Listing
 11-4, which shows that our `exploration` test passed and `another` failed.
 
 ```text
-running 2 tests
-test tests::exploration ... ok
-test tests::another ... FAILED
-
-failures:
-
----- tests::another stdout ----
-thread 'tests::another' panicked at 'Make this test fail', src/lib.rs:10:9
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-
-failures:
-    tests::another
-
-test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
-
-error: test failed
+{{#include ../listings/ch11-writing-automated-tests/listing-11-03/output.txt}}
 ```
 
 <span class="caption">Listing 11-4: Test results when one test passes and one
@@ -236,18 +178,7 @@ method, which are repeated here in Listing 11-5. Let’s put this code in the
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-#[derive(Debug)]
-struct Rectangle {
-    width: u32,
-    height: u32,
-}
-
-impl Rectangle {
-    fn can_hold(&self, other: &Rectangle) -> bool {
-        self.width > other.width && self.height > other.height
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-05/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-5: Using the `Rectangle` struct and its
@@ -262,19 +193,7 @@ has a width of 5 and a height of 1.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn larger_can_hold_smaller() {
-        let larger = Rectangle { width: 8, height: 7 };
-        let smaller = Rectangle { width: 5, height: 1 };
-
-        assert!(larger.can_hold(&smaller));
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-06/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-6: A test for `can_hold` that checks whether a
@@ -295,10 +214,7 @@ passed it the result of calling `larger.can_hold(&smaller)`. This expression
 is supposed to return `true`, so our test should pass. Let’s find out!
 
 ```text
-running 1 test
-test tests::larger_can_hold_smaller ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-06/output.txt}}
 ```
 
 It does pass! Let’s add another test, this time asserting that a smaller
@@ -307,24 +223,7 @@ rectangle cannot hold a larger rectangle:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn larger_can_hold_smaller() {
-        // --snip--
-    }
-
-    #[test]
-    fn smaller_cannot_hold_larger() {
-        let larger = Rectangle { width: 8, height: 7 };
-        let smaller = Rectangle { width: 5, height: 1 };
-
-        assert!(!smaller.can_hold(&larger));
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/src/lib.rs:here}}
 ```
 
 Because the correct result of the `can_hold` function in this case is `false`,
@@ -332,11 +231,7 @@ we need to negate that result before we pass it to the `assert!` macro. As a
 result, our test will pass if `can_hold` returns `false`:
 
 ```text
-running 2 tests
-test tests::smaller_cannot_hold_larger ... ok
-test tests::larger_can_hold_smaller ... ok
-
-test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-02-adding-another-rectangle-test/output.txt}}
 ```
 
 Two tests that pass! Now let’s see what happens to our test results when we
@@ -345,39 +240,13 @@ method by replacing the greater than sign with a less than sign when it
 compares the widths:
 
 ```rust,not_desired_behavior
-# fn main() {}
-# #[derive(Debug)]
-# struct Rectangle {
-#     width: u32,
-#     height: u32,
-# }
-// --snip--
-
-impl Rectangle {
-    fn can_hold(&self, other: &Rectangle) -> bool {
-        self.width < other.width && self.height > other.height
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/src/lib.rs:here}}
 ```
 
 Running the tests now produces the following:
 
 ```text
-running 2 tests
-test tests::smaller_cannot_hold_larger ... ok
-test tests::larger_can_hold_smaller ... FAILED
-
-failures:
-
----- tests::larger_can_hold_smaller stdout ----
-thread 'tests::larger_can_hold_smaller' panicked at 'assertion failed:
-larger.can_hold(&smaller)', src/lib.rs:22:9
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-
-failures:
-    tests::larger_can_hold_smaller
-
-test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-03-introducing-a-bug/output.txt}}
 ```
 
 Our tests caught the bug! Because `larger.width` is 8 and `smaller.width` is
@@ -404,20 +273,7 @@ parameter and returns the result. Then we test this function using the
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-pub fn add_two(a: i32) -> i32 {
-    a + 2
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_adds_two() {
-        assert_eq!(4, add_two(2));
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-07/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-7: Testing the function `add_two` using the
@@ -426,10 +282,7 @@ mod tests {
 Let’s check that it passes!
 
 ```text
-running 1 test
-test tests::it_adds_two ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-07/output.txt}}
 ```
 
 The first argument we gave to the `assert_eq!` macro, `4`, is equal to the
@@ -441,30 +294,13 @@ uses `assert_eq!` fails. Change the implementation of the `add_two` function to
 instead add `3`:
 
 ```rust,not_desired_behavior
-# fn main() {}
-pub fn add_two(a: i32) -> i32 {
-    a + 3
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/src/lib.rs:here}}
 ```
 
 Run the tests again:
 
 ```text
-running 1 test
-test tests::it_adds_two ... FAILED
-
-failures:
-
----- tests::it_adds_two stdout ----
-thread 'tests::it_adds_two' panicked at 'assertion failed: `(left == right)`
-  left: `4`,
- right: `5`', src/lib.rs:11:9
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-
-failures:
-    tests::it_adds_two
-
-test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-04-bug-in-add-two/output.txt}}
 ```
 
 Our test caught the bug! The `it_adds_two` test failed, displaying the message
@@ -523,21 +359,7 @@ want to test that the name we pass into the function appears in the output:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-pub fn greeting(name: &str) -> String {
-    format!("Hello {}!", name)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn greeting_contains_name() {
-        let result = greeting("Carol");
-        assert!(result.contains("Carol"));
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-05-greeter/src/lib.rs:here}}
 ```
 
 The requirements for this program haven’t been agreed upon yet, and we’re
@@ -551,27 +373,13 @@ Let’s introduce a bug into this code by changing `greeting` to not include
 `name` to see what this test failure looks like:
 
 ```rust,not_desired_behavior
-# fn main() {}
-pub fn greeting(name: &str) -> String {
-    String::from("Hello!")
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/src/lib.rs:here}}
 ```
 
 Running this test produces the following:
 
 ```text
-running 1 test
-test tests::greeting_contains_name ... FAILED
-
-failures:
-
----- tests::greeting_contains_name stdout ----
-thread 'tests::greeting_contains_name' panicked at 'assertion failed:
-result.contains("Carol")', src/lib.rs:12:9
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-
-failures:
-    tests::greeting_contains_name
+{{#include ../listings/ch11-writing-automated-tests/no-listing-06-greeter-with-bug/output.txt}}
 ```
 
 This result just indicates that the assertion failed and which line the
@@ -581,23 +389,13 @@ giving it a custom failure message made from a format string with a placeholder
 filled in with the actual value we got from the `greeting` function:
 
 ```rust,ignore
-#[test]
-fn greeting_contains_name() {
-    let result = greeting("Carol");
-    assert!(
-        result.contains("Carol"),
-        "Greeting did not contain name, value was `{}`", result
-    );
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/src/lib.rs:here}}
 ```
 
 Now when we run the test, we’ll get a more informative error message:
 
 ```text
----- tests::greeting_contains_name stdout ----
-thread 'tests::greeting_contains_name' panicked at 'Greeting did not
-contain name, value was `Hello!`', src/lib.rs:12:9
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch11-writing-automated-tests/no-listing-07-custom-failure-message/output.txt}}
 ```
 
 We can see the value we actually got in the test output, which would help us
@@ -623,33 +421,7 @@ happen when we expect them to.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-pub struct Guess {
-    value: i32,
-}
-
-impl Guess {
-    pub fn new(value: i32) -> Guess {
-        if value < 1 || value > 100 {
-            panic!("Guess value must be between 1 and 100, got {}.", value);
-        }
-
-        Guess {
-            value
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    #[should_panic]
-    fn greater_than_100() {
-        Guess::new(200);
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-08/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-8: Testing that a condition will cause a
@@ -660,48 +432,20 @@ before the test function it applies to. Let’s look at the result when this tes
 passes:
 
 ```text
-running 1 test
-test tests::greater_than_100 ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-08/output.txt}}
 ```
 
 Looks good! Now let’s introduce a bug in our code by removing the condition
 that the `new` function will panic if the value is greater than 100:
 
 ```rust,not_desired_behavior
-# fn main() {}
-# pub struct Guess {
-#     value: i32,
-# }
-#
-// --snip--
-
-impl Guess {
-    pub fn new(value: i32) -> Guess {
-        if value < 1  {
-            panic!("Guess value must be between 1 and 100, got {}.", value);
-        }
-
-        Guess {
-            value
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/src/lib.rs:here}}
 ```
 
 When we run the test in Listing 11-8, it will fail:
 
 ```text
-running 1 test
-test tests::greater_than_100 ... FAILED
-
-failures:
-
-failures:
-    tests::greater_than_100
-
-test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-08-guess-with-bug/output.txt}}
 ```
 
 We don’t get a very helpful message in this case, but when we look at the test
@@ -720,39 +464,7 @@ different messages depending on whether the value is too small or too large.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-# pub struct Guess {
-#     value: i32,
-# }
-#
-// --snip--
-
-impl Guess {
-    pub fn new(value: i32) -> Guess {
-        if value < 1 {
-            panic!("Guess value must be greater than or equal to 1, got {}.",
-                   value);
-        } else if value > 100 {
-            panic!("Guess value must be less than or equal to 100, got {}.",
-                   value);
-        }
-
-        Guess {
-            value
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    #[should_panic(expected = "Guess value must be less than or equal to 100")]
-    fn greater_than_100() {
-        Guess::new(200);
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-09/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-9: Testing that a condition will cause a
@@ -773,32 +485,13 @@ fails, let’s again introduce a bug into our code by swapping the bodies of the
 `if value < 1` and the `else if value > 100` blocks:
 
 ```rust,ignore,not_desired_behavior
-if value < 1 {
-    panic!("Guess value must be less than or equal to 100, got {}.", value);
-} else if value > 100 {
-    panic!("Guess value must be greater than or equal to 1, got {}.", value);
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/src/lib.rs:here}}
 ```
 
 This time when we run the `should_panic` test, it will fail:
 
 ```text
-running 1 test
-test tests::greater_than_100 ... FAILED
-
-failures:
-
----- tests::greater_than_100 stdout ----
-thread 'tests::greater_than_100' panicked at 'Guess value must be
-greater than or equal to 1, got 200.', src/lib.rs:11:13
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-note: Panic did not include expected string 'Guess value must be less than or
-equal to 100'
-
-failures:
-    tests::greater_than_100
-
-test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-09-guess-with-panic-msg-bug/output.txt}}
 ```
 
 The failure message indicates that this test did indeed panic as we expected,
@@ -814,17 +507,7 @@ that use `Result<T, E>`! Here’s the test from Listing 11-1, rewritten to use
 `Result<T, E>` and return an `Err` instead of panicking:
 
 ```rust
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() -> Result<(), String> {
-        if 2 + 2 == 4 {
-            Ok(())
-        } else {
-            Err(String::from("two plus two does not equal four"))
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-10-result-in-tests/src/lib.rs}}
 ```
 
 The `it_works` function now has a return type, `Result<(), String>`. In the
diff --git a/src/doc/book/src/ch11-02-running-tests.md b/src/doc/book/src/ch11-02-running-tests.md
index 26293d1902..2a83f57bbd 100644
--- a/src/doc/book/src/ch11-02-running-tests.md
+++ b/src/doc/book/src/ch11-02-running-tests.md
@@ -62,27 +62,7 @@ parameter and returns 10, as well as a test that passes and a test that fails.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,panics
-fn prints_and_returns_10(a: i32) -> i32 {
-    println!("I got the value {}", a);
-    10
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn this_test_will_pass() {
-        let value = prints_and_returns_10(4);
-        assert_eq!(10, value);
-    }
-
-    #[test]
-    fn this_test_will_fail() {
-        let value = prints_and_returns_10(8);
-        assert_eq!(5, value);
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-10/src/lib.rs}}
 ```
 
 <span class="caption">Listing 11-10: Tests for a function that calls
@@ -91,23 +71,7 @@ mod tests {
 When we run these tests with `cargo test`, we’ll see the following output:
 
 ```text
-running 2 tests
-test tests::this_test_will_pass ... ok
-test tests::this_test_will_fail ... FAILED
-
-failures:
-
----- tests::this_test_will_fail stdout ----
-I got the value 8
-thread 'tests::this_test_will_fail' panicked at 'assertion failed: `(left == right)`
-  left: `5`,
- right: `10`', src/lib.rs:19:9
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-
-failures:
-    tests::this_test_will_fail
-
-test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-10/output.txt}}
 ```
 
 Note that nowhere in this output do we see `I got the value 4`, which is what
@@ -126,33 +90,7 @@ When we run the tests in Listing 11-10 again with the `--show-output` flag, we
 see the following output:
 
 ```text
-running 2 tests
-test tests::this_test_will_pass ... ok
-test tests::this_test_will_fail ... FAILED
-
-successes:
-
----- tests::this_test_will_pass stdout ----
-I got the value 4
-
-
-successes:
-    tests::this_test_will_pass
-
-failures:
-
----- tests::this_test_will_fail stdout ----
-I got the value 8
-thread 'tests::this_test_will_fail' panicked at 'assertion failed: `(left == right)`
-  left: `5`,
- right: `10`', src/lib.rs:19:9
-note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
-
-
-failures:
-    tests::this_test_will_fail
-
-test result: FAILED. 1 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/output-only-01-show-output/output.txt}}
 ```
 
 ### Running a Subset of Tests by Name
@@ -168,29 +106,7 @@ To demonstrate how to run a subset of tests, we’ll create three tests for our
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub fn add_two(a: i32) -> i32 {
-    a + 2
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn add_two_and_two() {
-        assert_eq!(4, add_two(2));
-    }
-
-    #[test]
-    fn add_three_and_two() {
-        assert_eq!(5, add_two(3));
-    }
-
-    #[test]
-    fn one_hundred() {
-        assert_eq!(102, add_two(100));
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-11/src/lib.rs}}
 ```
 
 <span class="caption">Listing 11-11: Three tests with three different
@@ -200,12 +116,7 @@ If we run the tests without passing any arguments, as we saw earlier, all the
 tests will run in parallel:
 
 ```text
-running 3 tests
-test tests::add_two_and_two ... ok
-test tests::add_three_and_two ... ok
-test tests::one_hundred ... ok
-
-test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-11/output.txt}}
 ```
 
 #### Running Single Tests
@@ -213,14 +124,7 @@ test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 We can pass the name of any test function to `cargo test` to run only that test:
 
 ```text
-$ cargo test one_hundred
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running target/debug/deps/adder-06a75b4a1f2515e9
-
-running 1 test
-test tests::one_hundred ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 2 filtered out
+{{#include ../listings/ch11-writing-automated-tests/output-only-02-single-test/output.txt}}
 ```
 
 Only the test with the name `one_hundred` ran; the other two tests didn’t match
@@ -237,15 +141,7 @@ will be run. For example, because two of our tests’ names contain `add`, we ca
 run those two by running `cargo test add`:
 
 ```text
-$ cargo test add
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running target/debug/deps/adder-06a75b4a1f2515e9
-
-running 2 tests
-test tests::add_two_and_two ... ok
-test tests::add_three_and_two ... ok
-
-test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
+{{#include ../listings/ch11-writing-automated-tests/output-only-03-multiple-tests/output.txt}}
 ```
 
 This command ran all tests with `add` in the name and filtered out the test
@@ -264,46 +160,21 @@ here:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[test]
-fn it_works() {
-    assert_eq!(2 + 2, 4);
-}
-
-#[test]
-#[ignore]
-fn expensive_test() {
-    // code that takes an hour to run
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/src/lib.rs:here}}
 ```
 
 After `#[test]` we add the `#[ignore]` line to the test we want to exclude. Now
 when we run our tests, `it_works` runs, but `expensive_test` doesn’t:
 
 ```text
-$ cargo test
-   Compiling adder v0.1.0 (file:///projects/adder)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.24 secs
-     Running target/debug/deps/adder-ce99bcc2479f4607
-
-running 2 tests
-test expensive_test ... ignored
-test it_works ... ok
-
-test result: ok. 1 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-11-ignore-a-test/output.txt}}
 ```
 
 The `expensive_test` function is listed as `ignored`. If we want to run only
 the ignored tests, we can use `cargo test -- --ignored`:
 
 ```text
-$ cargo test -- --ignored
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running target/debug/deps/adder-ce99bcc2479f4607
-
-running 1 test
-test expensive_test ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
+{{#include ../listings/ch11-writing-automated-tests/output-only-04-running-ignored/output.txt}}
 ```
 
 By controlling which tests run, you can make sure your `cargo test` results
diff --git a/src/doc/book/src/ch11-03-test-organization.md b/src/doc/book/src/ch11-03-test-organization.md
index 2af6a0e0f5..9ac9497593 100644
--- a/src/doc/book/src/ch11-03-test-organization.md
+++ b/src/doc/book/src/ch11-03-test-organization.md
@@ -38,13 +38,7 @@ this chapter, Cargo generated this code for us:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-01/src/lib.rs:here}}
 ```
 
 This code is the automatically generated test module. The attribute `cfg`
@@ -67,25 +61,7 @@ Consider the code in Listing 11-12 with the private function `internal_adder`.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-
-pub fn add_two(a: i32) -> i32 {
-    internal_adder(a, 2)
-}
-
-fn internal_adder(a: i32, b: i32) -> i32 {
-    a + b
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn internal() {
-        assert_eq!(4, internal_adder(2, 2));
-    }
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-12/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 11-12: Testing a private function</span>
@@ -120,12 +96,7 @@ Let’s create an integration test. With the code in Listing 11-12 still in the
 <span class="filename">Filename: tests/integration_test.rs</span>
 
 ```rust,ignore
-use adder;
-
-#[test]
-fn it_adds_two() {
-    assert_eq!(4, adder::add_two(2));
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/listing-11-13/tests/integration_test.rs}}
 ```
 
 <span class="caption">Listing 11-13: An integration test of a function in the
@@ -140,28 +111,7 @@ We don’t need to annotate any code in *tests/integration_test.rs* with
 in this directory only when we run `cargo test`. Run `cargo test` now:
 
 ```text
-$ cargo test
-   Compiling adder v0.1.0 (file:///projects/adder)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.31 secs
-     Running target/debug/deps/adder-abcabcabc
-
-running 1 test
-test tests::internal ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-     Running target/debug/deps/integration_test-ce99bcc2479f4607
-
-running 1 test
-test it_adds_two ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-   Doc-tests adder
-
-running 0 tests
-
-test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/listing-11-13/output.txt}}
 ```
 
 The three sections of output include the unit tests, the integration test, and
@@ -187,14 +137,7 @@ particular integration test file, use the `--test` argument of `cargo test`
 followed by the name of the file:
 
 ```text
-$ cargo test --test integration_test
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running target/debug/integration_test-952a27e0126bb565
-
-running 1 test
-test it_adds_two ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/output-only-05-single-integration/output.txt}}
 ```
 
 This command runs only the tests in the *tests/integration_test.rs* file.
@@ -224,9 +167,7 @@ multiple test files:
 <span class="filename">Filename: tests/common.rs</span>
 
 ```rust
-pub fn setup() {
-    // setup code specific to your library's tests would go here
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/tests/common.rs}}
 ```
 
 When we run the tests again, we’ll see a new section in the test output for the
@@ -234,29 +175,7 @@ When we run the tests again, we’ll see a new section in the test output for th
 did we call the `setup` function from anywhere:
 
 ```text
-running 1 test
-test tests::internal ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-     Running target/debug/deps/common-b8b07b6f1be2db70
-
-running 0 tests
-
-test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-     Running target/debug/deps/integration_test-d993c68b431d39df
-
-running 1 test
-test it_adds_two ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
-
-   Doc-tests adder
-
-running 0 tests
-
-test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch11-writing-automated-tests/no-listing-12-shared-test-code-problem/output.txt}}
 ```
 
 Having `common` appear in the test results with `running 0 tests` displayed for
@@ -279,15 +198,7 @@ function from the `it_adds_two` test in *tests/integration_test.rs*:
 <span class="filename">Filename: tests/integration_test.rs</span>
 
 ```rust,ignore
-use adder;
-
-mod common;
-
-#[test]
-fn it_adds_two() {
-    common::setup();
-    assert_eq!(4, adder::add_two(2));
-}
+{{#rustdoc_include ../listings/ch11-writing-automated-tests/no-listing-13-fix-shared-test-code-problem/tests/integration_test.rs}}
 ```
 
 Note that the `mod common;` declaration is the same as the module declaration
diff --git a/src/doc/book/src/ch12-01-accepting-command-line-arguments.md b/src/doc/book/src/ch12-01-accepting-command-line-arguments.md
index 5f4f61e88c..f327361f61 100644
--- a/src/doc/book/src/ch12-01-accepting-command-line-arguments.md
+++ b/src/doc/book/src/ch12-01-accepting-command-line-arguments.md
@@ -41,12 +41,7 @@ command line arguments passed to it and then collect the values into a vector.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::env;
-
-fn main() {
-    let args: Vec<String> = env::args().collect();
-    println!("{:?}", args);
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 12-1: Collecting the command line arguments into
@@ -83,13 +78,11 @@ Finally, we print the vector using the debug formatter, `:?`. Let’s try runnin
 the code first with no arguments and then with two arguments:
 
 ```text
-$ cargo run
---snip--
-["target/debug/minigrep"]
+{{#include ../listings/ch12-an-io-project/listing-12-01/output.txt}}
+```
 
-$ cargo run needle haystack
---snip--
-["target/debug/minigrep", "needle", "haystack"]
+```text
+{{#include ../listings/ch12-an-io-project/output-only-01-with-args/output.txt}}
 ```
 
 Notice that the first value in the vector is `"target/debug/minigrep"`, which
@@ -110,17 +103,7 @@ throughout the rest of the program. We do that in Listing 12-2.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-use std::env;
-
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let query = &args[1];
-    let filename = &args[2];
-
-    println!("Searching for {}", query);
-    println!("In file {}", filename);
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-02/src/main.rs}}
 ```
 
 <span class="caption">Listing 12-2: Creating variables to hold the query
@@ -138,12 +121,7 @@ working as we intend. Let’s run this program again with the arguments `test`
 and `sample.txt`:
 
 ```text
-$ cargo run test sample.txt
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep test sample.txt`
-Searching for test
-In file sample.txt
+{{#include ../listings/ch12-an-io-project/listing-12-02/output.txt}}
 ```
 
 Great, the program is working! The values of the arguments we need are being
diff --git a/src/doc/book/src/ch12-02-reading-a-file.md b/src/doc/book/src/ch12-02-reading-a-file.md
index 8c4c92ec8d..0b07e7a705 100644
--- a/src/doc/book/src/ch12-02-reading-a-file.md
+++ b/src/doc/book/src/ch12-02-reading-a-file.md
@@ -11,15 +11,7 @@ Who are you?”
 <span class="filename">Filename: poem.txt</span>
 
 ```text
-I'm nobody! Who are you?
-Are you nobody, too?
-Then there's a pair of us - don't tell!
-They'd banish us, you know.
-
-How dreary to be somebody!
-How public, like a frog
-To tell your name the livelong day
-To an admiring bog!
+{{#include ../listings/ch12-an-io-project/listing-12-03/poem.txt}}
 ```
 
 <span class="caption">Listing 12-3: A poem by Emily Dickinson makes a good test
@@ -31,24 +23,7 @@ shown in Listing 12-4.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-use std::env;
-use std::fs;
-
-fn main() {
-#     let args: Vec<String> = env::args().collect();
-#
-#     let query = &args[1];
-#     let filename = &args[2];
-#
-#     println!("Searching for {}", query);
-    // --snip--
-    println!("In file {}", filename);
-
-    let contents = fs::read_to_string(filename)
-        .expect("Something went wrong reading the file");
-
-    println!("With text:\n{}", contents);
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-4: Reading the contents of the file specified
@@ -70,22 +45,7 @@ we haven’t implemented the searching part yet) and the *poem.txt* file as the
 second argument:
 
 ```text
-$ cargo run the poem.txt
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep the poem.txt`
-Searching for the
-In file poem.txt
-With text:
-I'm nobody! Who are you?
-Are you nobody, too?
-Then there's a pair of us — don't tell!
-They'd banish us, you know.
-
-How dreary to be somebody!
-How public, like a frog
-To tell your name the livelong day
-To an admiring bog!
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-04/output.txt}}
 ```
 
 Great! The code read and then printed the contents of the file. But the code
diff --git a/src/doc/book/src/ch12-03-improving-error-handling-and-modularity.md b/src/doc/book/src/ch12-03-improving-error-handling-and-modularity.md
index d26c590049..cf5bd88e1f 100644
--- a/src/doc/book/src/ch12-03-improving-error-handling-and-modularity.md
+++ b/src/doc/book/src/ch12-03-improving-error-handling-and-modularity.md
@@ -75,20 +75,7 @@ function `parse_config`, which we’ll define in *src/main.rs* for the moment.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let (query, filename) = parse_config(&args);
-
-    // --snip--
-}
-
-fn parse_config(args: &[String]) -> (&str, &str) {
-    let query = &args[1];
-    let filename = &args[2];
-
-    (query, filename)
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-5: Extracting a `parse_config` function from
@@ -133,34 +120,7 @@ Listing 12-6 shows the improvements to the `parse_config` function.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-# use std::env;
-# use std::fs;
-#
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let config = parse_config(&args);
-
-    println!("Searching for {}", config.query);
-    println!("In file {}", config.filename);
-
-    let contents = fs::read_to_string(config.filename)
-        .expect("Something went wrong reading the file");
-
-    // --snip--
-}
-
-struct Config {
-    query: String,
-    filename: String,
-}
-
-fn parse_config(args: &[String]) -> Config {
-    let query = args[1].clone();
-    let filename = args[2].clone();
-
-    Config { query, filename }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-6: Refactoring `parse_config` to return an
@@ -228,31 +188,7 @@ shows the changes we need to make.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,should_panic
-# use std::env;
-#
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let config = Config::new(&args);
-
-    // --snip--
-}
-
-# struct Config {
-#     query: String,
-#     filename: String,
-# }
-#
-// --snip--
-
-impl Config {
-    fn new(args: &[String]) -> Config {
-        let query = args[1].clone();
-        let filename = args[2].clone();
-
-        Config { query, filename }
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-7: Changing `parse_config` into
@@ -271,13 +207,7 @@ panic if the vector contains fewer than three items. Try running the program
 without any arguments; it will look like this:
 
 ```text
-$ cargo run
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep`
-thread 'main' panicked at 'index out of bounds: the len is 1
-but the index is 1', src/main.rs:25:21
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch12-an-io-project/listing-12-07/output.txt}}
 ```
 
 The line `index out of bounds: the len is 1 but the index is 1` is an error
@@ -294,12 +224,7 @@ out of bounds` message.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-// --snip--
-fn new(args: &[String]) -> Config {
-    if args.len() < 3 {
-        panic!("not enough arguments");
-    }
-    // --snip--
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-8: Adding a check for the number of
@@ -317,12 +242,7 @@ With these extra few lines of code in `new`, let’s run the program without any
 arguments again to see what the error looks like now:
 
 ```text
-$ cargo run
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep`
-thread 'main' panicked at 'not enough arguments', src/main.rs:26:13
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch12-an-io-project/listing-12-08/output.txt}}
 ```
 
 This output is better: we now have a reasonable error message. However, we also
@@ -350,18 +270,7 @@ next listing.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-impl Config {
-    fn new(args: &[String]) -> Result<Config, &'static str> {
-        if args.len() < 3 {
-            return Err("not enough arguments");
-        }
-
-        let query = args[1].clone();
-        let filename = args[2].clone();
-
-        Ok(Config { query, filename })
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-9: Returning a `Result` from
@@ -394,17 +303,7 @@ program that the program exited with an error state.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use std::process;
-
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let config = Config::new(&args).unwrap_or_else(|err| {
-        println!("Problem parsing arguments: {}", err);
-        process::exit(1);
-    });
-
-    // --snip--
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-10: Exiting with an error code if creating a
@@ -433,11 +332,7 @@ number that was passed as the exit status code. This is similar to the
 extra output. Let’s try it:
 
 ```text
-$ cargo run
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.48 secs
-     Running `target/debug/minigrep`
-Problem parsing arguments: not enough arguments
+{{#include ../listings/ch12-an-io-project/listing-12-10/output.txt}}
 ```
 
 Great! This output is much friendlier for our users.
@@ -459,23 +354,7 @@ defining the function in *src/main.rs*.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    // --snip--
-
-    println!("Searching for {}", config.query);
-    println!("In file {}", config.filename);
-
-    run(config);
-}
-
-fn run(config: Config) {
-    let contents = fs::read_to_string(config.filename)
-        .expect("Something went wrong reading the file");
-
-    println!("With text:\n{}", contents);
-}
-
-// --snip--
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-11: Extracting a `run` function containing the
@@ -498,17 +377,7 @@ signature and body of `run`.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use std::error::Error;
-
-// --snip--
-
-fn run(config: Config) -> Result<(), Box<dyn Error>> {
-    let contents = fs::read_to_string(config.filename)?;
-
-    println!("With text:\n{}", contents);
-
-    Ok(())
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-12/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-12: Changing the `run` function to return
@@ -543,14 +412,7 @@ it doesn’t return a value we need.
 When you run this code, it will compile but will display a warning:
 
 ```text
-warning: unused `std::result::Result` that must be used
-  --> src/main.rs:17:5
-   |
-17 |     run(config);
-   |     ^^^^^^^^^^^^
-   |
-   = note: #[warn(unused_must_use)] on by default
-   = note: this `Result` may be an `Err` variant, which should be handled
+{{#include ../listings/ch12-an-io-project/listing-12-12/output.txt}}
 ```
 
 Rust tells us that our code ignored the `Result` value and the `Result` value
@@ -566,18 +428,7 @@ with `Config::new` in Listing 12-10, but with a slight difference:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    // --snip--
-
-    println!("Searching for {}", config.query);
-    println!("In file {}", config.filename);
-
-    if let Err(e) = run(config) {
-        println!("Application error: {}", e);
-
-        process::exit(1);
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/no-listing-01-handling-errors-in-main/src/main.rs:here}}
 ```
 
 We use `if let` rather than `unwrap_or_else` to check whether `run` returns an
@@ -611,23 +462,7 @@ compile until we modify *src/main.rs* in Listing 12-14.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-use std::error::Error;
-use std::fs;
-
-pub struct Config {
-    pub query: String,
-    pub filename: String,
-}
-
-impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
-        // --snip--
-    }
-}
-
-pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-13/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-13: Moving `Config` and `run` into
@@ -643,17 +478,7 @@ binary crate in *src/main.rs*, as shown in Listing 12-14.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use std::env;
-use std::process;
-
-use minigrep::Config;
-
-fn main() {
-    // --snip--
-    if let Err(e) = minigrep::run(config) {
-        // --snip--
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-14/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-14: Using the `minigrep` library crate in
diff --git a/src/doc/book/src/ch12-04-testing-the-librarys-functionality.md b/src/doc/book/src/ch12-04-testing-the-librarys-functionality.md
index e8ed858dec..17a0f97dae 100644
--- a/src/doc/book/src/ch12-04-testing-the-librarys-functionality.md
+++ b/src/doc/book/src/ch12-04-testing-the-librarys-functionality.md
@@ -40,29 +40,8 @@ yet.
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust
-# pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-#      vec![]
-# }
-#
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn one_result() {
-        let query = "duct";
-        let contents = "\
-Rust:
-safe, fast, productive.
-Pick three.";
-
-        assert_eq!(
-            vec!["safe, fast, productive."],
-            search(query, contents)
-        );
-    }
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-15/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-15: Creating a failing test for the `search`
@@ -82,9 +61,7 @@ containing the line `"safe, fast, productive."`
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    vec![]
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-16/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-16: Defining just enough of the `search`
@@ -109,15 +86,7 @@ If we forget the lifetime annotations and try to compile this function, we’ll
 get this error:
 
 ```text
-error[E0106]: missing lifetime specifier
- --> src/lib.rs:5:51
-  |
-5 | pub fn search(query: &str, contents: &str) -> Vec<&str> {
-  |                                                   ^ expected lifetime
-parameter
-  |
-  = help: this function's return type contains a borrowed value, but the
-  signature does not say whether it is borrowed from `query` or `contents`
+{{#include ../listings/ch12-an-io-project/output-only-02-missing-lifetimes/output.txt}}
 ```
 
 Rust can’t possibly know which of the two arguments we need, so we need to tell
@@ -134,31 +103,7 @@ References with Lifetimes”][validating-references-with-lifetimes]<!-- ignore
 Now let’s run the test:
 
 ```text
-$ cargo test
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
---warnings--
-    Finished dev [unoptimized + debuginfo] target(s) in 0.43 secs
-     Running target/debug/deps/minigrep-abcabcabc
-
-running 1 test
-test tests::one_result ... FAILED
-
-failures:
-
----- tests::one_result stdout ----
-        thread 'tests::one_result' panicked at 'assertion failed: `(left ==
-right)`
-left: `["safe, fast, productive."]`,
-right: `[]`)', src/lib.rs:48:8
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
-
-
-failures:
-    tests::one_result
-
-test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
-
-error: test failed, to rerun pass '--lib'
+{{#include ../listings/ch12-an-io-project/listing-12-16/output.txt}}
 ```
 
 Great, the test fails, exactly as we expected. Let’s get the test to pass!
@@ -185,11 +130,7 @@ won’t compile yet.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    for line in contents.lines() {
-        // do something with line
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-17/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-17: Iterating through each line in `contents`
@@ -210,13 +151,7 @@ Listing 12-18. Note this still won’t compile yet.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    for line in contents.lines() {
-        if line.contains(query) {
-            // do something with line
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-18/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-18: Adding functionality to see whether the
@@ -232,17 +167,7 @@ shown in Listing 12-19.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    let mut results = Vec::new();
-
-    for line in contents.lines() {
-        if line.contains(query) {
-            results.push(line);
-        }
-    }
-
-    results
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-19/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-19: Storing the lines that match so we can
@@ -252,12 +177,7 @@ Now the `search` function should return only the lines that contain `query`,
 and our test should pass. Let’s run the test:
 
 ```text
-$ cargo test
---snip--
-running 1 test
-test tests::one_result ... ok
-
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch12-an-io-project/listing-12-19/output.txt}}
 ```
 
 Our test passed, so we know it works!
@@ -279,15 +199,7 @@ will print each line returned from `search`:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
-    let contents = fs::read_to_string(config.filename)?;
-
-    for line in search(&config.query, &contents) {
-        println!("{}", line);
-    }
-
-    Ok(())
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/no-listing-02-using-search-in-run/src/lib.rs:here}}
 ```
 
 We’re still using a `for` loop to return each line from `search` and print it.
@@ -296,31 +208,20 @@ Now the entire program should work! Let’s try it out, first with a word that
 should return exactly one line from the Emily Dickinson poem, “frog”:
 
 ```text
-$ cargo run frog poem.txt
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.38 secs
-     Running `target/debug/minigrep frog poem.txt`
-How public, like a frog
+{{#include ../listings/ch12-an-io-project/no-listing-02-using-search-in-run/output.txt}}
 ```
 
 Cool! Now let’s try a word that will match multiple lines, like “body”:
 
 ```text
-$ cargo run body poem.txt
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep body poem.txt`
-I’m nobody! Who are you?
-Are you nobody, too?
-How dreary to be somebody!
+{{#include ../listings/ch12-an-io-project/output-only-03-multiple-matches/output.txt}}
 ```
 
 And finally, let’s make sure that we don’t get any lines when we search for a
 word that isn’t anywhere in the poem, such as “monomorphization”:
 
 ```text
-$ cargo run monomorphization poem.txt
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep monomorphization poem.txt`
+{{#include ../listings/ch12-an-io-project/output-only-04-no-matches/output.txt}}
 ```
 
 Excellent! We’ve built our own mini version of a classic tool and learned a lot
diff --git a/src/doc/book/src/ch12-05-working-with-environment-variables.md b/src/doc/book/src/ch12-05-working-with-environment-variables.md
index ca03efcda7..48b7162728 100644
--- a/src/doc/book/src/ch12-05-working-with-environment-variables.md
+++ b/src/doc/book/src/ch12-05-working-with-environment-variables.md
@@ -19,40 +19,7 @@ tests, as shown in Listing 12-20.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn case_sensitive() {
-        let query = "duct";
-        let contents = "\
-Rust:
-safe, fast, productive.
-Pick three.
-Duct tape.";
-
-        assert_eq!(
-            vec!["safe, fast, productive."],
-            search(query, contents)
-        );
-    }
-
-    #[test]
-    fn case_insensitive() {
-        let query = "rUsT";
-        let contents = "\
-Rust:
-safe, fast, productive.
-Pick three.
-Trust me.";
-
-        assert_eq!(
-            vec!["Rust:", "Trust me."],
-            search_case_insensitive(query, contents)
-        );
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-20/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-20: Adding a new failing test for the
@@ -84,18 +51,7 @@ they’ll be the same case when we check whether the line contains the query.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub fn search_case_insensitive<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    let query = query.to_lowercase();
-    let mut results = Vec::new();
-
-    for line in contents.lines() {
-        if line.to_lowercase().contains(&query) {
-            results.push(line);
-        }
-    }
-
-    results
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-21/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-21: Defining the `search_case_insensitive`
@@ -122,11 +78,7 @@ query is.
 Let’s see if this implementation passes the tests:
 
 ```text
-running 2 tests
-test tests::case_insensitive ... ok
-test tests::case_sensitive ... ok
-
-test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
+{{#include ../listings/ch12-an-io-project/listing-12-21/output.txt}}
 ```
 
 Great! They passed. Now, let’s call the new `search_case_insensitive` function
@@ -137,12 +89,8 @@ this field anywhere yet:
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust
-pub struct Config {
-    pub query: String,
-    pub filename: String,
-    pub case_sensitive: bool,
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-22/src/lib.rs:here}}
 ```
 
 Note that we added the `case_sensitive` field that holds a Boolean. Next, we
@@ -153,40 +101,8 @@ won’t compile yet.
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust
-# use std::error::Error;
-# use std::fs::{self, File};
-# use std::io::prelude::*;
-#
-# pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-#      vec![]
-# }
-#
-# pub fn search_case_insensitive<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-#      vec![]
-# }
-#
-# pub struct Config {
-#     query: String,
-#     filename: String,
-#     case_sensitive: bool,
-# }
-#
-pub fn run(config: Config) -> Result<(), Box<dyn Error>> {
-    let contents = fs::read_to_string(config.filename)?;
-
-    let results = if config.case_sensitive {
-        search(&config.query, &contents)
-    } else {
-        search_case_insensitive(&config.query, &contents)
-    };
-
-    for line in results {
-        println!("{}", line);
-    }
-
-    Ok(())
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-22/src/lib.rs:there}}
 ```
 
 <span class="caption">Listing 12-22: Calling either `search` or
@@ -202,29 +118,7 @@ in Listing 12-23.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::env;
-# struct Config {
-#     query: String,
-#     filename: String,
-#     case_sensitive: bool,
-# }
-
-// --snip--
-
-impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
-        if args.len() < 3 {
-            return Err("not enough arguments");
-        }
-
-        let query = args[1].clone();
-        let filename = args[2].clone();
-
-        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
-
-        Ok(Config { query, filename, case_sensitive })
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-23/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 12-23: Checking for an environment variable named
@@ -254,12 +148,7 @@ variable set and with the query `to`, which should match any line that contains
 the word “to” in all lowercase:
 
 ```text
-$ cargo run to poem.txt
-   Compiling minigrep v0.1.0 (file:///projects/minigrep)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
-     Running `target/debug/minigrep to poem.txt`
-Are you nobody, too?
-How dreary to be somebody!
+{{#include ../listings/ch12-an-io-project/listing-12-23/output.txt}}
 ```
 
 Looks like that still works! Now, let’s run the program with `CASE_INSENSITIVE`
@@ -275,9 +164,15 @@ $ cargo run to poem.txt
 
 We should get lines that contain “to” that might have uppercase letters:
 
+<!-- manual-regeneration
+cd listings/ch12-an-io-project/listing-12-23
+CASE_INSENSITIVE=1 cargo run to poem.txt
+can't extract because of the environment variable
+-->
+
 ```text
 $ CASE_INSENSITIVE=1 cargo run to poem.txt
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
      Running `target/debug/minigrep to poem.txt`
 Are you nobody, too?
 How dreary to be somebody!
diff --git a/src/doc/book/src/ch12-06-writing-to-stderr-instead-of-stdout.md b/src/doc/book/src/ch12-06-writing-to-stderr-instead-of-stdout.md
index 0fc1aa28ed..ab10ab1f52 100644
--- a/src/doc/book/src/ch12-06-writing-to-stderr-instead-of-stdout.md
+++ b/src/doc/book/src/ch12-06-writing-to-stderr-instead-of-stdout.md
@@ -1,13 +1,13 @@
 ## Writing Error Messages to Standard Error Instead of Standard Output
 
 At the moment, we’re writing all of our output to the terminal using the
-`println!` function. Most terminals provide two kinds of output: *standard
+`println!` macro. Most terminals provide two kinds of output: *standard
 output* (`stdout`) for general information and *standard error* (`stderr`)
 for error messages. This distinction enables users to choose to direct the
 successful output of a program to a file but still print error messages to the
 screen.
 
-The `println!` function is only capable of printing to standard output, so we
+The `println!` macro is only capable of printing to standard output, so we
 have to use something else to print to standard error.
 
 ### Checking Where Errors Are Written
@@ -57,20 +57,7 @@ instead.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let config = Config::new(&args).unwrap_or_else(|err| {
-        eprintln!("Problem parsing arguments: {}", err);
-        process::exit(1);
-    });
-
-    if let Err(e) = minigrep::run(config) {
-        eprintln!("Application error: {}", e);
-
-        process::exit(1);
-    }
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-24/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 12-24: Writing error messages to standard error
diff --git a/src/doc/book/src/ch13-01-closures.md b/src/doc/book/src/ch13-01-closures.md
index 56f8ed4586..09485da126 100644
--- a/src/doc/book/src/ch13-01-closures.md
+++ b/src/doc/book/src/ch13-01-closures.md
@@ -30,14 +30,7 @@ we passed in.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::time::Duration;
-
-fn simulated_expensive_calculation(intensity: u32) -> u32 {
-    println!("calculating slowly...");
-    thread::sleep(Duration::from_secs(2));
-    intensity
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-1: A function to stand in for a hypothetical
@@ -62,16 +55,7 @@ function we’ll use.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let simulated_user_specified_value = 10;
-    let simulated_random_number = 7;
-
-    generate_workout(
-        simulated_user_specified_value,
-        simulated_random_number
-    );
-}
-# fn generate_workout(intensity: u32, random_number: u32) {}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-2: A `main` function with hardcoded values to
@@ -92,36 +76,7 @@ changes in this example will be made to this function.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::time::Duration;
-#
-# fn simulated_expensive_calculation(num: u32) -> u32 {
-#     println!("calculating slowly...");
-#     thread::sleep(Duration::from_secs(2));
-#     num
-# }
-#
-fn generate_workout(intensity: u32, random_number: u32) {
-    if intensity < 25 {
-        println!(
-            "Today, do {} pushups!",
-            simulated_expensive_calculation(intensity)
-        );
-        println!(
-            "Next, do {} situps!",
-            simulated_expensive_calculation(intensity)
-        );
-    } else {
-        if random_number == 3 {
-            println!("Take a break today! Remember to stay hydrated!");
-        } else {
-            println!(
-                "Today, run for {} minutes!",
-                simulated_expensive_calculation(intensity)
-            );
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-3: The business logic that prints the workout
@@ -163,39 +118,7 @@ function into a variable, as shown in Listing 13-4.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::time::Duration;
-#
-# fn simulated_expensive_calculation(num: u32) -> u32 {
-#     println!("calculating slowly...");
-#     thread::sleep(Duration::from_secs(2));
-#     num
-# }
-#
-fn generate_workout(intensity: u32, random_number: u32) {
-    let expensive_result =
-        simulated_expensive_calculation(intensity);
-
-    if intensity < 25 {
-        println!(
-            "Today, do {} pushups!",
-            expensive_result
-        );
-        println!(
-            "Next, do {} situps!",
-            expensive_result
-        );
-    } else {
-        if random_number == 3 {
-            println!("Take a break today! Remember to stay hydrated!");
-        } else {
-            println!(
-                "Today, run for {} minutes!",
-                expensive_result
-            );
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-4: Extracting the calls to
@@ -222,15 +145,7 @@ the closure we’re introducing here.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::time::Duration;
-#
-let expensive_closure = |num| {
-    println!("calculating slowly...");
-    thread::sleep(Duration::from_secs(2));
-    num
-};
-# expensive_closure(5);
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-5: Defining a closure and storing it in the
@@ -265,36 +180,7 @@ want to use, as shown in Listing 13-6.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::time::Duration;
-#
-fn generate_workout(intensity: u32, random_number: u32) {
-    let expensive_closure = |num| {
-        println!("calculating slowly...");
-        thread::sleep(Duration::from_secs(2));
-        num
-    };
-
-    if intensity < 25 {
-        println!(
-            "Today, do {} pushups!",
-            expensive_closure(intensity)
-        );
-        println!(
-            "Next, do {} situps!",
-            expensive_closure(intensity)
-        );
-    } else {
-        if random_number == 3 {
-            println!("Take a break today! Remember to stay hydrated!");
-        } else {
-            println!(
-                "Today, run for {} minutes!",
-                expensive_closure(intensity)
-            );
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-6: Calling the `expensive_closure` we’ve
@@ -339,14 +225,7 @@ would look like the definition shown in Listing 13-7.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::time::Duration;
-#
-let expensive_closure = |num: u32| -> u32 {
-    println!("calculating slowly...");
-    thread::sleep(Duration::from_secs(2));
-    num
-};
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-7: Adding optional type annotations of the
@@ -370,7 +249,9 @@ The first line shows a function definition, and the second line shows a fully
 annotated closure definition. The third line removes the type annotations from
 the closure definition, and the fourth line removes the brackets, which are
 optional because the closure body has only one expression. These are all valid
-definitions that will produce the same behavior when they’re called.
+definitions that will produce the same behavior when they’re called. Calling
+the closures is required for `add_one_v3` and `add_one_v4` to be able to
+compile because the types will be inferred from their usage.
 
 Closure definitions will have one concrete type inferred for each of their
 parameters and for their return value. For instance, Listing 13-8 shows the
@@ -383,10 +264,7 @@ first time and a `u32` the second time, we’ll get an error.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-let example_closure = |x| x;
-
-let s = example_closure(String::from("hello"));
-let n = example_closure(5);
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-8: Attempting to call a closure whose types
@@ -395,15 +273,7 @@ are inferred with two different types</span>
 The compiler gives us this error:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs
-  |
-  | let n = example_closure(5);
-  |                         ^ expected struct `std::string::String`, found
-  integer
-  |
-  = note: expected type `std::string::String`
-             found type `{integer}`
+{{#include ../listings/ch13-functional-features/listing-13-08/output.txt}}
 ```
 
 The first time we call `example_closure` with the `String` value, the compiler
@@ -451,12 +321,7 @@ and an optional result value.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Cacher<T>
-    where T: Fn(u32) -> u32
-{
-    calculation: T,
-    value: Option<u32>,
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-9: Defining a `Cacher` struct that holds a
@@ -486,34 +351,7 @@ The logic around the `value` field we’ve just described is defined in Listing
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# struct Cacher<T>
-#     where T: Fn(u32) -> u32
-# {
-#     calculation: T,
-#     value: Option<u32>,
-# }
-#
-impl<T> Cacher<T>
-    where T: Fn(u32) -> u32
-{
-    fn new(calculation: T) -> Cacher<T> {
-        Cacher {
-            calculation,
-            value: None,
-        }
-    }
-
-    fn value(&mut self, arg: u32) -> u32 {
-        match self.value {
-            Some(v) => v,
-            None => {
-                let v = (self.calculation)(arg);
-                self.value = Some(v);
-                v
-            },
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-10: The caching logic of `Cacher`</span>
@@ -544,65 +382,7 @@ Listing 13-11 shows how we can use this `Cacher` struct in the function
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::time::Duration;
-#
-# struct Cacher<T>
-#     where T: Fn(u32) -> u32
-# {
-#     calculation: T,
-#     value: Option<u32>,
-# }
-#
-# impl<T> Cacher<T>
-#     where T: Fn(u32) -> u32
-# {
-#     fn new(calculation: T) -> Cacher<T> {
-#         Cacher {
-#             calculation,
-#             value: None,
-#         }
-#     }
-#
-#     fn value(&mut self, arg: u32) -> u32 {
-#         match self.value {
-#             Some(v) => v,
-#             None => {
-#                 let v = (self.calculation)(arg);
-#                 self.value = Some(v);
-#                 v
-#             },
-#         }
-#     }
-# }
-#
-fn generate_workout(intensity: u32, random_number: u32) {
-    let mut expensive_result = Cacher::new(|num| {
-        println!("calculating slowly...");
-        thread::sleep(Duration::from_secs(2));
-        num
-    });
-
-    if intensity < 25 {
-        println!(
-            "Today, do {} pushups!",
-            expensive_result.value(intensity)
-        );
-        println!(
-            "Next, do {} situps!",
-            expensive_result.value(intensity)
-        );
-    } else {
-        if random_number == 3 {
-            println!("Take a break today! Remember to stay hydrated!");
-        } else {
-            println!(
-                "Today, run for {} minutes!",
-                expensive_result.value(intensity)
-            );
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-11: Using `Cacher` in the `generate_workout`
@@ -634,15 +414,7 @@ same value for the parameter `arg` to the `value` method. That is, this test of
 `Cacher` will fail:
 
 ```rust,ignore,panics
-#[test]
-fn call_with_different_values() {
-    let mut c = Cacher::new(|a| a);
-
-    let v1 = c.value(1);
-    let v2 = c.value(2);
-
-    assert_eq!(v2, 2);
-}
+{{#rustdoc_include ../listings/ch13-functional-features/no-listing-01-failing-cacher-test/src/lib.rs:here}}
 ```
 
 This test creates a new `Cacher` instance with a closure that returns the value
@@ -654,9 +426,7 @@ Run this test with the `Cacher` implementation in Listing 13-9 and Listing
 13-10, and the test will fail on the `assert_eq!` with this message:
 
 ```text
-thread 'call_with_different_values' panicked at 'assertion failed: `(left == right)`
-  left: `1`,
- right: `2`', src/main.rs
+{{#include ../listings/ch13-functional-features/no-listing-01-failing-cacher-test/output.txt}}
 ```
 
 The problem is that the first time we called `c.value` with 1, the `Cacher`
@@ -690,15 +460,7 @@ that uses the `x` variable from the closure’s surrounding environment.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = 4;
-
-    let equal_to_x = |z| z == x;
-
-    let y = 4;
-
-    assert!(equal_to_x(y));
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-12/src/main.rs}}
 ```
 
 <span class="caption">Listing 13-12: Example of a closure that refers to a
@@ -714,26 +476,13 @@ code won’t compile:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = 4;
-
-    fn equal_to_x(z: i32) -> bool { z == x }
-
-    let y = 4;
-
-    assert!(equal_to_x(y));
-}
+{{#rustdoc_include ../listings/ch13-functional-features/no-listing-02-functions-cant-capture/src/main.rs}}
 ```
 
 We get an error:
 
 ```text
-error[E0434]: can't capture dynamic environment in a fn item; use the || { ...
-} closure form instead
- --> src/main.rs
-  |
-4 |     fn equal_to_x(z: i32) -> bool { z == x }
-  |                                          ^
+{{#include ../listings/ch13-functional-features/no-listing-02-functions-cant-capture/output.txt}}
 ```
 
 The compiler even reminds us that this only works with closures!
@@ -780,33 +529,13 @@ yet compile.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = vec![1, 2, 3];
-
-    let equal_to_x = move |z| z == x;
-
-    println!("can't use x here: {:?}", x);
-
-    let y = vec![1, 2, 3];
-
-    assert!(equal_to_x(y));
-}
+{{#rustdoc_include ../listings/ch13-functional-features/no-listing-03-move-closures/src/main.rs}}
 ```
 
 We receive the following error:
 
 ```text
-error[E0382]: use of moved value: `x`
- --> src/main.rs:6:40
-  |
-4 |     let equal_to_x = move |z| z == x;
-  |                      -------- value moved (into closure) here
-5 |
-6 |     println!("can't use x here: {:?}", x);
-  |                                        ^ value used here after move
-  |
-  = note: move occurs because `x` has type `std::vec::Vec<i32>`, which does not
-  implement the `Copy` trait
+{{#include ../listings/ch13-functional-features/no-listing-03-move-closures/output.txt}}
 ```
 
 The `x` value is moved into the closure when the closure is defined, because we
diff --git a/src/doc/book/src/ch13-02-iterators.md b/src/doc/book/src/ch13-02-iterators.md
index 493c3696c5..0b40e88417 100644
--- a/src/doc/book/src/ch13-02-iterators.md
+++ b/src/doc/book/src/ch13-02-iterators.md
@@ -12,9 +12,7 @@ the `iter` method defined on `Vec<T>`. This code by itself doesn’t do anything
 useful.
 
 ```rust
-let v1 = vec![1, 2, 3];
-
-let v1_iter = v1.iter();
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-13/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-13: Creating an iterator</span>
@@ -30,13 +28,7 @@ called using the iterator in `v1_iter`, each element in the iterator is used in
 one iteration of the loop, which prints out each value.
 
 ```rust
-let v1 = vec![1, 2, 3];
-
-let v1_iter = v1.iter();
-
-for val in v1_iter {
-    println!("Got: {}", val);
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-14/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-14: Using an iterator in a `for` loop</span>
@@ -86,17 +78,7 @@ from the vector.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[test]
-fn iterator_demonstration() {
-    let v1 = vec![1, 2, 3];
-
-    let mut v1_iter = v1.iter();
-
-    assert_eq!(v1_iter.next(), Some(&1));
-    assert_eq!(v1_iter.next(), Some(&2));
-    assert_eq!(v1_iter.next(), Some(&3));
-    assert_eq!(v1_iter.next(), None);
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-15/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-15: Calling the `next` method on an
@@ -135,16 +117,7 @@ test illustrating a use of the `sum` method:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[test]
-fn iterator_sum() {
-    let v1 = vec![1, 2, 3];
-
-    let v1_iter = v1.iter();
-
-    let total: i32 = v1_iter.sum();
-
-    assert_eq!(total, 6);
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-16/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-16: Calling the `sum` method to get the total
@@ -169,9 +142,7 @@ incremented by 1. However, this code produces a warning:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,not_desired_behavior
-let v1: Vec<i32> = vec![1, 2, 3];
-
-v1.iter().map(|x| x + 1);
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-17/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-17: Calling the iterator adaptor `map` to
@@ -180,14 +151,7 @@ create a new iterator</span>
 The warning we get is this:
 
 ```text
-warning: unused `std::iter::Map` which must be used: iterator adaptors are lazy
-and do nothing unless consumed
- --> src/main.rs:4:5
-  |
-4 |     v1.iter().map(|x| x + 1);
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: #[warn(unused_must_use)] on by default
+{{#include ../listings/ch13-functional-features/listing-13-17/output.txt}}
 ```
 
 The code in Listing 13-17 doesn’t do anything; the closure we’ve specified
@@ -205,11 +169,7 @@ containing each item from the original vector incremented by 1.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-let v1: Vec<i32> = vec![1, 2, 3];
-
-let v2: Vec<_> = v1.iter().map(|x| x + 1).collect();
-
-assert_eq!(v2, vec![2, 3, 4]);
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-18/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-18: Calling the `map` method to create a new
@@ -237,36 +197,7 @@ instances. It will return only shoes that are the specified size.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[derive(PartialEq, Debug)]
-struct Shoe {
-    size: u32,
-    style: String,
-}
-
-fn shoes_in_my_size(shoes: Vec<Shoe>, shoe_size: u32) -> Vec<Shoe> {
-    shoes.into_iter()
-        .filter(|s| s.size == shoe_size)
-        .collect()
-}
-
-#[test]
-fn filters_by_size() {
-    let shoes = vec![
-        Shoe { size: 10, style: String::from("sneaker") },
-        Shoe { size: 13, style: String::from("sandal") },
-        Shoe { size: 10, style: String::from("boot") },
-    ];
-
-    let in_my_size = shoes_in_my_size(shoes, 10);
-
-    assert_eq!(
-        in_my_size,
-        vec![
-            Shoe { size: 10, style: String::from("sneaker") },
-            Shoe { size: 10, style: String::from("boot") },
-        ]
-    );
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-19/src/lib.rs}}
 ```
 
 <span class="caption">Listing 13-19: Using the `filter` method with a closure
@@ -311,15 +242,7 @@ Listing 13-20 has the definition of the `Counter` struct and an associated
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-struct Counter {
-    count: u32,
-}
-
-impl Counter {
-    fn new() -> Counter {
-        Counter { count: 0 }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-20/src/lib.rs}}
 ```
 
 <span class="caption">Listing 13-20: Defining the `Counter` struct and a `new`
@@ -339,23 +262,7 @@ iterator is used, as shown in Listing 13-21:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# struct Counter {
-#     count: u32,
-# }
-#
-impl Iterator for Counter {
-    type Item = u32;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        self.count += 1;
-
-        if self.count < 6 {
-            Some(self.count)
-        } else {
-            None
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-21/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-21: Implementing the `Iterator` trait on our
@@ -366,9 +273,10 @@ iterator will return `u32` values. Again, don’t worry about associated types
 yet, we’ll cover them in Chapter 19.
 
 We want our iterator to add 1 to the current state, so we initialized `count`
-to 0 so it would return 1 first. If the value of `count` is less than 6, `next`
-will return the current value wrapped in `Some`, but if `count` is 6 or higher,
-our iterator will return `None`.
+to 0 so it would return 1 first. If the value of `count` is less than 5, `next`
+will increment `count` and return the current value wrapped in `Some`. Once
+`count` is 5, our iterator will stop incrementing `count` and always return
+`None`.
 
 #### Using Our `Counter` Iterator’s `next` Method
 
@@ -380,35 +288,7 @@ with the iterator created from a vector in Listing 13-15.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# struct Counter {
-#     count: u32,
-# }
-#
-# impl Iterator for Counter {
-#     type Item = u32;
-#
-#     fn next(&mut self) -> Option<Self::Item> {
-#         self.count += 1;
-#
-#         if self.count < 6 {
-#             Some(self.count)
-#         } else {
-#             None
-#         }
-#     }
-# }
-#
-#[test]
-fn calling_next_directly() {
-    let mut counter = Counter::new();
-
-    assert_eq!(counter.next(), Some(1));
-    assert_eq!(counter.next(), Some(2));
-    assert_eq!(counter.next(), Some(3));
-    assert_eq!(counter.next(), Some(4));
-    assert_eq!(counter.next(), Some(5));
-    assert_eq!(counter.next(), None);
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-22/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-22: Testing the functionality of the `next`
@@ -433,41 +313,7 @@ together, we could do so, as shown in the test in Listing 13-23:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# struct Counter {
-#     count: u32,
-# }
-#
-# impl Counter {
-#     fn new() -> Counter {
-#         Counter { count: 0 }
-#     }
-# }
-#
-# impl Iterator for Counter {
-#     // Our iterator will produce u32s
-#     type Item = u32;
-#
-#     fn next(&mut self) -> Option<Self::Item> {
-#         // increment our count. This is why we started at zero.
-#         self.count += 1;
-#
-#         // check to see if we've finished counting or not.
-#         if self.count < 6 {
-#             Some(self.count)
-#         } else {
-#             None
-#         }
-#     }
-# }
-#
-#[test]
-fn using_other_iterator_trait_methods() {
-    let sum: u32 = Counter::new().zip(Counter::new().skip(1))
-                                 .map(|(a, b)| a * b)
-                                 .filter(|x| x % 3 == 0)
-                                 .sum();
-    assert_eq!(18, sum);
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-23/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-23: Using a variety of `Iterator` trait
diff --git a/src/doc/book/src/ch13-03-improving-our-io-project.md b/src/doc/book/src/ch13-03-improving-our-io-project.md
index e6ee68dc50..0473b2cba8 100644
--- a/src/doc/book/src/ch13-03-improving-our-io-project.md
+++ b/src/doc/book/src/ch13-03-improving-our-io-project.md
@@ -5,7 +5,6 @@ Chapter 12 by using iterators to make places in the code clearer and more
 concise. Let’s look at how iterators can improve our implementation of the
 `Config::new` function and the `search` function.
 
-
 ### Removing a `clone` Using an Iterator
 
 In Listing 12-6, we added code that took a slice of `String` values and created
@@ -17,20 +16,7 @@ Listing 12-23:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-impl Config {
-    pub fn new(args: &[String]) -> Result<Config, &'static str> {
-        if args.len() < 3 {
-            return Err("not enough arguments");
-        }
-
-        let query = args[1].clone();
-        let filename = args[2].clone();
-
-        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
-
-        Ok(Config { query, filename, case_sensitive })
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-12-23-reproduced/src/lib.rs:ch13}}
 ```
 
 <span class="caption">Listing 13-24: Reproduction of the `Config::new` function
@@ -61,16 +47,7 @@ Open your I/O project’s *src/main.rs* file, which should look like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let args: Vec<String> = env::args().collect();
-
-    let config = Config::new(&args).unwrap_or_else(|err| {
-        eprintln!("Problem parsing arguments: {}", err);
-        process::exit(1);
-    });
-
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-12-24-reproduced/src/main.rs:ch13}}
 ```
 
 We’ll change the start of the `main` function that we had in Listing 12-24 to
@@ -80,14 +57,7 @@ well.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let config = Config::new(env::args()).unwrap_or_else(|err| {
-        eprintln!("Problem parsing arguments: {}", err);
-        process::exit(1);
-    });
-
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-25/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 13-25: Passing the return value of `env::args` to
@@ -106,9 +76,7 @@ body.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-impl Config {
-    pub fn new(mut args: std::env::Args) -> Result<Config, &'static str> {
-        // --snip--
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-26/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-26: Updating the signature of `Config::new` to
@@ -131,34 +99,7 @@ Listing 12-23 to use the `next` method:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# fn main() {}
-# use std::env;
-#
-# struct Config {
-#     query: String,
-#     filename: String,
-#     case_sensitive: bool,
-# }
-#
-impl Config {
-    pub fn new(mut args: std::env::Args) -> Result<Config, &'static str> {
-        args.next();
-
-        let query = match args.next() {
-            Some(arg) => arg,
-            None => return Err("Didn't get a query string"),
-        };
-
-        let filename = match args.next() {
-            Some(arg) => arg,
-            None => return Err("Didn't get a file name"),
-        };
-
-        let case_sensitive = env::var("CASE_INSENSITIVE").is_err();
-
-        Ok(Config { query, filename, case_sensitive })
-    }
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-27/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-27: Changing the body of `Config::new` to use
@@ -180,17 +121,7 @@ project, which is reproduced here in Listing 13-28 as it was in Listing 12-19:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    let mut results = Vec::new();
-
-    for line in contents.lines() {
-        if line.contains(query) {
-            results.push(line);
-        }
-    }
-
-    results
-}
+{{#rustdoc_include ../listings/ch12-an-io-project/listing-12-19/src/lib.rs:ch13}}
 ```
 
 <span class="caption">Listing 13-28: The implementation of the `search`
@@ -206,11 +137,7 @@ concurrent access to the `results` vector. Listing 13-29 shows this change:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub fn search<'a>(query: &str, contents: &'a str) -> Vec<&'a str> {
-    contents.lines()
-        .filter(|line| line.contains(query))
-        .collect()
-}
+{{#rustdoc_include ../listings/ch13-functional-features/listing-13-29/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 13-29: Using iterator adaptor methods in the
diff --git a/src/doc/book/src/ch14-01-release-profiles.md b/src/doc/book/src/ch14-01-release-profiles.md
index ab2400511e..24a36aefef 100644
--- a/src/doc/book/src/ch14-01-release-profiles.md
+++ b/src/doc/book/src/ch14-01-release-profiles.md
@@ -12,11 +12,18 @@ and the `release` profile has good defaults for release builds.
 
 These profile names might be familiar from the output of your builds:
 
+<!-- manual-regeneration
+anywhere, run:
+cargo build
+cargo build --release
+and ensure output below is accurate
+-->
+
 ```text
 $ cargo build
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
 $ cargo build --release
-    Finished release [optimized] target(s) in 0.0 secs
+    Finished release [optimized] target(s) in 0.0s
 ```
 
 The `dev` and `release` shown in this build output indicate that the compiler
diff --git a/src/doc/book/src/ch14-02-publishing-to-crates-io.md b/src/doc/book/src/ch14-02-publishing-to-crates-io.md
index f1b10f7c95..4e5c22067c 100644
--- a/src/doc/book/src/ch14-02-publishing-to-crates-io.md
+++ b/src/doc/book/src/ch14-02-publishing-to-crates-io.md
@@ -29,19 +29,7 @@ for an `add_one` function in a crate named `my_crate`:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-/// Adds one to the number given.
-///
-/// # Examples
-///
-/// ```
-/// let arg = 5;
-/// let answer = my_crate::add_one(arg);
-///
-/// assert_eq!(6, answer);
-/// ```
-pub fn add_one(x: i32) -> i32 {
-    x + 1
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-01/src/lib.rs}}
 ```
 
 <span class="caption">Listing 14-1: A documentation comment for a
@@ -96,6 +84,12 @@ that don’t work because the code has changed since the documentation was
 written. If we run `cargo test` with the documentation for the `add_one`
 function from Listing 14-1, we will see a section in the test results like this:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/listing-14-01/
+cargo test
+copy just the doc-tests section below
+-->
+
 ```text
    Doc-tests my_crate
 
@@ -125,13 +119,7 @@ shown in Listing 14-2:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-//! # My Crate
-//!
-//! `my_crate` is a collection of utilities to make performing certain
-//! calculations more convenient.
-
-/// Adds one to the number given.
-// --snip--
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-02/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 14-2: Documentation for the `my_crate` crate as a
@@ -189,37 +177,7 @@ function named `mix`, as shown in Listing 14-3:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-//! # Art
-//!
-//! A library for modeling artistic concepts.
-
-pub mod kinds {
-    /// The primary colors according to the RYB color model.
-    pub enum PrimaryColor {
-        Red,
-        Yellow,
-        Blue,
-    }
-
-    /// The secondary colors according to the RYB color model.
-    pub enum SecondaryColor {
-        Orange,
-        Green,
-        Purple,
-    }
-}
-
-pub mod utils {
-    use crate::kinds::*;
-
-    /// Combines two primary colors in equal amounts to create
-    /// a secondary color.
-    pub fn mix(c1: PrimaryColor, c2: PrimaryColor) -> SecondaryColor {
-        // --snip--
-#         SecondaryColor::Orange
-    }
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-03/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 14-3: An `art` library with items organized into
@@ -245,14 +203,7 @@ currently defined. Listing 14-4 shows an example of a crate that uses the
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use art::kinds::PrimaryColor;
-use art::utils::mix;
-
-fn main() {
-    let red = PrimaryColor::Red;
-    let yellow = PrimaryColor::Yellow;
-    mix(red, yellow);
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-04/src/main.rs}}
 ```
 
 <span class="caption">Listing 14-4: A crate using the `art` crate’s items with
@@ -276,21 +227,7 @@ items at the top level, as shown in Listing 14-5:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-//! # Art
-//!
-//! A library for modeling artistic concepts.
-
-pub use self::kinds::PrimaryColor;
-pub use self::kinds::SecondaryColor;
-pub use self::utils::mix;
-
-pub mod kinds {
-    // --snip--
-}
-
-pub mod utils {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-05/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 14-5: Adding `pub use` statements to re-export
@@ -312,12 +249,7 @@ structure in Listing 14-5, as shown in Listing 14-6:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use art::PrimaryColor;
-use art::mix;
-
-fn main() {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 14-6: A program using the re-exported items from
@@ -380,13 +312,19 @@ name = "guessing_game"
 Even if you’ve chosen a unique name, when you run `cargo publish` to publish
 the crate at this point, you’ll get a warning and then an error:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/listing-14-01/
+cargo publish
+copy just the relevant lines below
+-->
+
 ```text
 $ cargo publish
-    Updating registry `https://github.com/rust-lang/crates.io-index`
-warning: manifest has no description, license, license-file, documentation,
-homepage or repository.
+    Updating crates.io index
+warning: manifest has no description, license, license-file, documentation, homepage or repository.
+See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
 --snip--
-error: api errors: missing or empty metadata fields: description, license.
+error: api errors (status 200 OK): missing or empty metadata fields: description, license. Please see https://doc.rust-lang.org/cargo/reference/manifest.html for how to upload metadata
 ```
 
 The reason is that you’re missing some crucial information: a description and
@@ -461,15 +399,21 @@ no limit to the number of crate versions you can publish.
 
 Run the `cargo publish` command again. It should succeed now:
 
+<!-- manual-regeneration
+go to some valid crate, publish a new version
+cargo publish
+copy just the relevant lines below
+-->
+
 ```text
 $ cargo publish
- Updating registry `https://github.com/rust-lang/crates.io-index`
-Packaging guessing_game v0.1.0 (file:///projects/guessing_game)
-Verifying guessing_game v0.1.0 (file:///projects/guessing_game)
-Compiling guessing_game v0.1.0
+    Updating crates.io index
+   Packaging guessing_game v0.1.0 (file:///projects/guessing_game)
+   Verifying guessing_game v0.1.0 (file:///projects/guessing_game)
+   Compiling guessing_game v0.1.0
 (file:///projects/guessing_game/target/package/guessing_game-0.1.0)
- Finished dev [unoptimized + debuginfo] target(s) in 0.19 secs
-Uploading guessing_game v0.1.0 (file:///projects/guessing_game)
+    Finished dev [unoptimized + debuginfo] target(s) in 0.19s
+   Uploading guessing_game v0.1.0 (file:///projects/guessing_game)
 ```
 
 Congratulations! You’ve now shared your code with the Rust community, and
diff --git a/src/doc/book/src/ch14-03-cargo-workspaces.md b/src/doc/book/src/ch14-03-cargo-workspaces.md
index a662ac219e..6054c734c0 100644
--- a/src/doc/book/src/ch14-03-cargo-workspaces.md
+++ b/src/doc/book/src/ch14-03-cargo-workspaces.md
@@ -33,19 +33,22 @@ by specifying the path to our binary crate; in this case, that path is *adder*:
 <span class="filename">Filename: Cargo.toml</span>
 
 ```toml
-[workspace]
-
-members = [
-    "adder",
-]
+{{#include ../listings/ch14-more-about-cargo/no-listing-01-workspace-with-adder-crate/add/Cargo.toml}}
 ```
 
 Next, we’ll create the `adder` binary crate by running `cargo new` within the
 *add* directory:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/output-only-01-adder-crate/add
+rm -rf adder
+cargo new adder
+copy output below
+-->
+
 ```text
 $ cargo new adder
-     Created binary (application) `adder` project
+     Created binary (application) `adder` package
 ```
 
 At this point, we can build the workspace by running `cargo build`. The files
@@ -81,19 +84,21 @@ Change the top-level *Cargo.toml* to specify the *add-one* path in the
 <span class="filename">Filename: Cargo.toml</span>
 
 ```toml
-[workspace]
-
-members = [
-    "adder",
-    "add-one",
-]
+{{#include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/Cargo.toml}}
 ```
 
 Then generate a new library crate named `add-one`:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/output-only-02-add-one/add
+rm -rf add-one
+cargo new add-one --lib
+copy output below
+-->
+
 ```text
 $ cargo new add-one --lib
-     Created library `add-one` project
+     Created library `add-one` package
 ```
 
 Your *add* directory should now have these directories and files:
@@ -117,9 +122,7 @@ In the *add-one/src/lib.rs* file, let’s add an `add_one` function:
 <span class="filename">Filename: add-one/src/lib.rs</span>
 
 ```rust
-pub fn add_one(x: i32) -> i32 {
-    x + 1
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/add-one/src/lib.rs}}
 ```
 
 Now that we have a library crate in the workspace, we can have the binary crate
@@ -129,9 +132,7 @@ dependency on `add-one` to *adder/Cargo.toml*.
 <span class="filename">Filename: adder/Cargo.toml</span>
 
 ```toml
-[dependencies]
-
-add-one = { path = "../add-one" }
+{{#include ../listings/ch14-more-about-cargo/no-listing-02-workspace-with-two-crates/add/adder/Cargo.toml:7:9}}
 ```
 
 Cargo doesn’t assume that crates in a workspace will depend on each other, so
@@ -145,12 +146,7 @@ function to call the `add_one` function, as in Listing 14-7.
 <span class="filename">Filename: adder/src/main.rs</span>
 
 ```rust,ignore
-use add_one;
-
-fn main() {
-    let num = 10;
-    println!("Hello, world! {} plus one is {}!", num, add_one::add_one(num));
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/listing-14-07/add/adder/src/main.rs}}
 ```
 
 <span class="caption">Listing 14-7: Using the `add-one` library crate from the
@@ -159,20 +155,32 @@ fn main() {
 Let’s build the workspace by running `cargo build` in the top-level *add*
 directory!
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/listing-14-07/add
+cargo build
+copy output below; the output updating script doesn't handle subdirectories in paths properly
+-->
+
 ```text
 $ cargo build
    Compiling add-one v0.1.0 (file:///projects/add/add-one)
    Compiling adder v0.1.0 (file:///projects/add/adder)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.68 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.68s
 ```
 
 To run the binary crate from the *add* directory, we need to specify which
 package in the workspace we want to use by using the `-p` argument and the
 package name with `cargo run`:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/listing-14-07/add
+cargo run -p adder
+copy output below; the output updating script doesn't handle subdirectories in paths properly
+-->
+
 ```text
 $ cargo run -p adder
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.0s
      Running `target/debug/adder`
 Hello, world! 10 plus one is 11!
 ```
@@ -201,23 +209,28 @@ crate:
 <span class="filename">Filename: add-one/Cargo.toml</span>
 
 ```toml
-[dependencies]
-rand = "0.5.5"
+{{#include ../listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add/add-one/Cargo.toml:7:8}}
 ```
 
 We can now add `use rand;` to the *add-one/src/lib.rs* file, and building the
 whole workspace by running `cargo build` in the *add* directory will bring in
 and compile the `rand` crate:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/no-listing-03-workspace-with-external-dependency/add
+cargo build
+copy output below; the output updating script doesn't handle subdirectories in paths properly
+-->
+
 ```text
 $ cargo build
     Updating crates.io index
   Downloaded rand v0.5.5
    --snip--
-   Compiling rand v0.5.5
+   Compiling rand v0.5.6
    Compiling add-one v0.1.0 (file:///projects/add/add-one)
    Compiling adder v0.1.0 (file:///projects/add/adder)
-    Finished dev [unoptimized + debuginfo] target(s) in 10.18 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 10.18s
 ```
 
 The top-level *Cargo.lock* now contains information about the dependency of
@@ -226,14 +239,21 @@ workspace, we can’t use it in other crates in the workspace unless we add
 `rand` to their *Cargo.toml* files as well. For example, if we add `use rand;`
 to the *adder/src/main.rs* file for the `adder` crate, we’ll get an error:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/output-only-03-use-rand/add
+cargo build
+copy output below; the output updating script doesn't handle subdirectories in paths properly
+-->
+
 ```text
 $ cargo build
+  --snip--
    Compiling adder v0.1.0 (file:///projects/add/adder)
-error: use of unstable library feature 'rand': use `rand` from crates.io (see
-issue #27703)
- --> adder/src/main.rs:1:1
+error[E0432]: unresolved import `rand`
+ --> adder/src/main.rs:2:5
   |
-1 | use rand;
+2 | use rand;
+  |     ^^^^ no `rand` external crate
 ```
 
 To fix this, edit the *Cargo.toml* file for the `adder` crate and indicate that
@@ -253,28 +273,22 @@ within the `add_one` crate:
 <span class="filename">Filename: add-one/src/lib.rs</span>
 
 ```rust
-pub fn add_one(x: i32) -> i32 {
-    x + 1
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        assert_eq!(3, add_one(2));
-    }
-}
+{{#rustdoc_include ../listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add/add-one/src/lib.rs}}
 ```
 
 Now run `cargo test` in the top-level *add* directory:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add
+cargo test
+copy output below; the output updating script doesn't handle subdirectories in paths properly
+-->
+
 ```text
 $ cargo test
    Compiling add-one v0.1.0 (file:///projects/add/add-one)
    Compiling adder v0.1.0 (file:///projects/add/adder)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.27 secs
+    Finished test [unoptimized + debuginfo] target(s) in 0.27s
      Running target/debug/deps/add_one-f0253159197f7841
 
 running 1 test
@@ -282,7 +296,7 @@ test tests::it_works ... ok
 
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 
-     Running target/debug/deps/adder-f88af9d2cc175a5e
+     Running target/debug/deps/adder-49979ff40686fa8e
 
 running 0 tests
 
@@ -305,9 +319,15 @@ We can also run tests for one particular crate in a workspace from the
 top-level directory by using the `-p` flag and specifying the name of the crate
 we want to test:
 
+<!-- manual-regeneration
+cd listings/ch14-more-about-cargo/no-listing-04-workspace-with-tests/add
+cargo test -p add-one
+copy output below; the output updating script doesn't handle subdirectories in paths properly
+-->
+
 ```text
 $ cargo test -p add-one
-    Finished dev [unoptimized + debuginfo] target(s) in 0.0 secs
+    Finished test [unoptimized + debuginfo] target(s) in 0.00s
      Running target/debug/deps/add_one-b3235fea9a156f74
 
 running 1 test
diff --git a/src/doc/book/src/ch14-04-installing-binaries.md b/src/doc/book/src/ch14-04-installing-binaries.md
index a654a371ac..6b2f58ba8c 100644
--- a/src/doc/book/src/ch14-04-installing-binaries.md
+++ b/src/doc/book/src/ch14-04-installing-binaries.md
@@ -21,17 +21,24 @@ For example, in Chapter 12 we mentioned that there’s a Rust implementation of
 the `grep` tool called `ripgrep` for searching files. If we want to install
 `ripgrep`, we can run the following:
 
+<!-- manual-regeneration
+cargo install something you don't have, copy relevant output below
+-->
+
 ```text
 $ cargo install ripgrep
-Updating registry `https://github.com/rust-lang/crates.io-index`
- Downloading ripgrep v0.3.2
- --snip--
-   Compiling ripgrep v0.3.2
-    Finished release [optimized + debuginfo] target(s) in 97.91 secs
+    Updating crates.io index
+  Downloaded ripgrep v11.0.2
+  Downloaded 1 crate (243.3 KB) in 0.88s
+  Installing ripgrep v11.0.2
+--snip--
+   Compiling ripgrep v11.0.2
+    Finished release [optimized] target(s) in 3m 10s
   Installing ~/.cargo/bin/rg
+   Installed package `ripgrep v11.0.2` (executable `rg`)
 ```
 
-The last line of the output shows the location and the name of the installed
-binary, which in the case of `ripgrep` is `rg`. As long as the installation
-directory is in your `$PATH`, as mentioned previously, you can then run `rg
---help` and start using a faster, rustier tool for searching files!
+The second-to-last line of the output shows the location and the name of the
+installed binary, which in the case of `ripgrep` is `rg`. As long as the
+installation directory is in your `$PATH`, as mentioned previously, you can
+then run `rg --help` and start using a faster, rustier tool for searching files!
diff --git a/src/doc/book/src/ch15-01-box.md b/src/doc/book/src/ch15-01-box.md
index 2b9a51b306..1605928d9a 100644
--- a/src/doc/book/src/ch15-01-box.md
+++ b/src/doc/book/src/ch15-01-box.md
@@ -38,10 +38,7 @@ Listing 15-1 shows how to use a box to store an `i32` value on the heap:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let b = Box::new(5);
-    println!("b = {}", b);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-1: Storing an `i32` value on the heap using a
@@ -109,10 +106,7 @@ we’ll demonstrate.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-enum List {
-    Cons(i32, List),
-    Nil,
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-2: The first attempt at defining an enum to
@@ -129,11 +123,7 @@ Listing 15-3:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use crate::List::{Cons, Nil};
-
-fn main() {
-    let list = Cons(1, Cons(2, Cons(3, Nil)));
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-3: Using the `List` enum to store the list `1,
@@ -148,16 +138,7 @@ If we try to compile the code in Listing 15-3, we get the error shown in
 Listing 15-4:
 
 ```text
-error[E0072]: recursive type `List` has infinite size
- --> src/main.rs:1:1
-  |
-1 | enum List {
-  | ^^^^^^^^^ recursive type has infinite size
-2 |     Cons(i32, List),
-  |               ----- recursive without indirection
-  |
-  = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to
-  make `List` representable
+{{#include ../listings/ch15-smart-pointers/listing-15-03/output.txt}}
 ```
 
 <span class="caption">Listing 15-4: The error we get when attempting to define
@@ -176,12 +157,7 @@ Recall the `Message` enum we defined in Listing 6-2 when we discussed enum
 definitions in Chapter 6:
 
 ```rust
-enum Message {
-    Quit,
-    Move { x: i32, y: i32 },
-    Write(String),
-    ChangeColor(i32, i32, i32),
-}
+{{#rustdoc_include ../listings/ch06-enums-and-pattern-matching/listing-06-02/src/main.rs:here}}
 ```
 
 To determine how much space to allocate for a `Message` value, Rust goes
@@ -211,9 +187,12 @@ Rust can’t figure out how much space to allocate for recursively defined types
 so the compiler gives the error in Listing 15-4. But the error does include
 this helpful suggestion:
 
+<!-- manual-regeneration
+after doing automatic regeneration, look at listings/ch15-smart-pointers/listing-15-03/output.txt and copy the relevant line
+-->
+
 ```text
-  = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to
-  make `List` representable
+  = help: insert indirection (e.g., a `Box`, `Rc`, or `&`) at some point to make `List` representable
 ```
 
 In this suggestion, “indirection” means that instead of storing a value
@@ -235,19 +214,7 @@ of the `List` in Listing 15-3 to the code in Listing 15-5, which will compile:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-enum List {
-    Cons(i32, Box<List>),
-    Nil,
-}
-
-use crate::List::{Cons, Nil};
-
-fn main() {
-    let list = Cons(1,
-        Box::new(Cons(2,
-            Box::new(Cons(3,
-                Box::new(Nil))))));
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-05/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-5: Definition of `List` that uses `Box<T>` in
diff --git a/src/doc/book/src/ch15-02-deref.md b/src/doc/book/src/ch15-02-deref.md
index e0fae5b1a9..b2f608169a 100644
--- a/src/doc/book/src/ch15-02-deref.md
+++ b/src/doc/book/src/ch15-02-deref.md
@@ -29,13 +29,7 @@ reference to the data:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = 5;
-    let y = &x;
-
-    assert_eq!(5, x);
-    assert_eq!(5, *y);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-06/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-6: Using the dereference operator to follow a
@@ -52,14 +46,7 @@ If we tried to write `assert_eq!(5, y);` instead, we would get this compilation
 error:
 
 ```text
-error[E0277]: can't compare `{integer}` with `&{integer}`
- --> src/main.rs:6:5
-  |
-6 |     assert_eq!(5, y);
-  |     ^^^^^^^^^^^^^^^^^ no implementation for `{integer} == &{integer}`
-  |
-  = help: the trait `std::cmp::PartialEq<&{integer}>` is not implemented for
-  `{integer}`
+{{#include ../listings/ch15-smart-pointers/output-only-01-comparing-to-reference/output.txt}}
 ```
 
 Comparing a number and a reference to a number isn’t allowed because they’re
@@ -74,13 +61,7 @@ reference; the dereference operator will work as shown in Listing 15-7:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = 5;
-    let y = Box::new(x);
-
-    assert_eq!(5, x);
-    assert_eq!(5, *y);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-07/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-7: Using the dereference operator on a
@@ -107,13 +88,7 @@ Listing 15-8 defines a `MyBox<T>` type in the same way. We’ll also define a
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct MyBox<T>(T);
-
-impl<T> MyBox<T> {
-    fn new(x: T) -> MyBox<T> {
-        MyBox(x)
-    }
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-8: Defining a `MyBox<T>` type</span>
@@ -131,13 +106,7 @@ code in Listing 15-9 won’t compile because Rust doesn’t know how to derefere
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = 5;
-    let y = MyBox::new(x);
-
-    assert_eq!(5, x);
-    assert_eq!(5, *y);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-9: Attempting to use `MyBox<T>` in the same
@@ -146,11 +115,7 @@ way we used references and `Box<T>`</span>
 Here’s the resulting compilation error:
 
 ```text
-error[E0614]: type `MyBox<{integer}>` cannot be dereferenced
-  --> src/main.rs:14:19
-   |
-14 |     assert_eq!(5, *y);
-   |                   ^^
+{{#include ../listings/ch15-smart-pointers/listing-15-09/output.txt}}
 ```
 
 Our `MyBox<T>` type can’t be dereferenced because we haven’t implemented that
@@ -168,16 +133,7 @@ contains an implementation of `Deref` to add to the definition of `MyBox`:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::ops::Deref;
-
-# struct MyBox<T>(T);
-impl<T> Deref for MyBox<T> {
-    type Target = T;
-
-    fn deref(&self) -> &T {
-        &self.0
-    }
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-10: Implementing `Deref` on `MyBox<T>`</span>
@@ -226,13 +182,14 @@ Listing 15-9.
 ### Implicit Deref Coercions with Functions and Methods
 
 *Deref coercion* is a convenience that Rust performs on arguments to functions
-and methods. Deref coercion converts a reference to a type that implements
-`Deref` into a reference to a type that `Deref` can convert the original type
-into. Deref coercion happens automatically when we pass a reference to a
-particular type’s value as an argument to a function or method that doesn’t
-match the parameter type in the function or method definition. A sequence of
-calls to the `deref` method converts the type we provided into the type the
-parameter needs.
+and methods. Deref coercion works only on types that implement the `Deref`
+trait. Deref coercion converts such a type into a reference to another type.
+For example, deref coercion can convert `&String` to `&str` because `String`
+implements the `Deref` trait such that it returns `str`. Deref coercion happens
+automatically when we pass a reference to a particular type’s value as an
+argument to a function or method that doesn’t match the parameter type in the
+function or method definition. A sequence of calls to the `deref` method
+converts the type we provided into the type the parameter needs.
 
 Deref coercion was added to Rust so that programmers writing function and
 method calls don’t need to add as many explicit references and dereferences
@@ -247,9 +204,7 @@ parameter:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn hello(name: &str) {
-    println!("Hello, {}!", name);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-11: A `hello` function that has the parameter
@@ -262,32 +217,7 @@ with a reference to a value of type `MyBox<String>`, as shown in Listing 15-12:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::ops::Deref;
-#
-# struct MyBox<T>(T);
-#
-# impl<T> MyBox<T> {
-#     fn new(x: T) -> MyBox<T> {
-#         MyBox(x)
-#     }
-# }
-#
-# impl<T> Deref for MyBox<T> {
-#     type Target = T;
-#
-#     fn deref(&self) -> &T {
-#         &self.0
-#     }
-# }
-#
-# fn hello(name: &str) {
-#     println!("Hello, {}!", name);
-# }
-#
-fn main() {
-    let m = MyBox::new(String::from("Rust"));
-    hello(&m);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-12/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-12: Calling `hello` with a reference to a
@@ -308,32 +238,7 @@ of type `&MyBox<String>`.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::ops::Deref;
-#
-# struct MyBox<T>(T);
-#
-# impl<T> MyBox<T> {
-#     fn new(x: T) -> MyBox<T> {
-#         MyBox(x)
-#     }
-# }
-#
-# impl<T> Deref for MyBox<T> {
-#     type Target = T;
-#
-#     fn deref(&self) -> &T {
-#         &self.0
-#     }
-# }
-#
-# fn hello(name: &str) {
-#     println!("Hello, {}!", name);
-# }
-#
-fn main() {
-    let m = MyBox::new(String::from("Rust"));
-    hello(&(*m)[..]);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-13/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-13: The code we would have to write if Rust
@@ -375,7 +280,8 @@ never coerce to mutable references. Because of the borrowing rules, if you have
 a mutable reference, that mutable reference must be the only reference to that
 data (otherwise, the program wouldn’t compile). Converting one mutable
 reference to one immutable reference will never break the borrowing rules.
-Converting an immutable reference to a mutable reference would require that
-there is only one immutable reference to that data, and the borrowing rules
-don’t guarantee that. Therefore, Rust can’t make the assumption that converting
-an immutable reference to a mutable reference is possible.
+Converting an immutable reference to a mutable reference would require that the
+initial immutable reference is the only immutable reference to that data, but
+the borrowing rules don’t guarantee that. Therefore, Rust can’t make the
+assumption that converting an immutable reference to a mutable reference is
+possible.
diff --git a/src/doc/book/src/ch15-03-drop.md b/src/doc/book/src/ch15-03-drop.md
index 333e4e2c1d..8566f03061 100644
--- a/src/doc/book/src/ch15-03-drop.md
+++ b/src/doc/book/src/ch15-03-drop.md
@@ -30,21 +30,7 @@ function.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct CustomSmartPointer {
-    data: String,
-}
-
-impl Drop for CustomSmartPointer {
-    fn drop(&mut self) {
-        println!("Dropping CustomSmartPointer with data `{}`!", self.data);
-    }
-}
-
-fn main() {
-    let c = CustomSmartPointer { data: String::from("my stuff") };
-    let d = CustomSmartPointer { data: String::from("other stuff") };
-    println!("CustomSmartPointers created.");
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-14/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-14: A `CustomSmartPointer` struct that
@@ -66,9 +52,7 @@ call the `drop` method explicitly.
 When we run this program, we’ll see the following output:
 
 ```text
-CustomSmartPointers created.
-Dropping CustomSmartPointer with data `other stuff`!
-Dropping CustomSmartPointer with data `my stuff`!
+{{#include ../listings/ch15-smart-pointers/listing-15-14/output.txt}}
 ```
 
 Rust automatically called `drop` for us when our instances went out of scope,
@@ -96,12 +80,7 @@ compiler error:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let c = CustomSmartPointer { data: String::from("some data") };
-    println!("CustomSmartPointer created.");
-    c.drop();
-    println!("CustomSmartPointer dropped before the end of main.");
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-15/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-15: Attempting to call the `drop` method from
@@ -110,11 +89,7 @@ the `Drop` trait manually to clean up early</span>
 When we try to compile this code, we’ll get this error:
 
 ```text
-error[E0040]: explicit use of destructor method
-  --> src/main.rs:14:7
-   |
-14 |     c.drop();
-   |       ^^^^ explicit destructor calls not allowed
+{{#include ../listings/ch15-smart-pointers/listing-15-15/output.txt}}
 ```
 
 This error message states that we’re not allowed to explicitly call `drop`. The
@@ -140,22 +115,7 @@ an argument. The function is in the prelude, so we can modify `main` in Listing
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# struct CustomSmartPointer {
-#     data: String,
-# }
-#
-# impl Drop for CustomSmartPointer {
-#     fn drop(&mut self) {
-#         println!("Dropping CustomSmartPointer with data `{}`!", self.data);
-#     }
-# }
-#
-fn main() {
-    let c = CustomSmartPointer { data: String::from("some data") };
-    println!("CustomSmartPointer created.");
-    drop(c);
-    println!("CustomSmartPointer dropped before the end of main.");
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-16/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-16: Calling `std::mem::drop` to explicitly
@@ -164,9 +124,7 @@ drop a value before it goes out of scope</span>
 Running this code will print the following:
 
 ```text
-CustomSmartPointer created.
-Dropping CustomSmartPointer with data `some data`!
-CustomSmartPointer dropped before the end of main.
+{{#include ../listings/ch15-smart-pointers/listing-15-16/output.txt}}
 ```
 
 The text ```Dropping CustomSmartPointer with data `some data`!``` is printed
diff --git a/src/doc/book/src/ch15-04-rc.md b/src/doc/book/src/ch15-04-rc.md
index 7ac901bad3..8990ca0460 100644
--- a/src/doc/book/src/ch15-04-rc.md
+++ b/src/doc/book/src/ch15-04-rc.md
@@ -51,20 +51,7 @@ won’t work, as shown in Listing 15-17:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-enum List {
-    Cons(i32, Box<List>),
-    Nil,
-}
-
-use crate::List::{Cons, Nil};
-
-fn main() {
-    let a = Cons(5,
-        Box::new(Cons(10,
-            Box::new(Nil))));
-    let b = Cons(3, Box::new(a));
-    let c = Cons(4, Box::new(a));
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-17/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-17: Demonstrating we’re not allowed to have
@@ -73,16 +60,7 @@ two lists using `Box<T>` that try to share ownership of a third list</span>
 When we compile this code, we get this error:
 
 ```text
-error[E0382]: use of moved value: `a`
-  --> src/main.rs:13:30
-   |
-12 |     let b = Cons(3, Box::new(a));
-   |                              - value moved here
-13 |     let c = Cons(4, Box::new(a));
-   |                              ^ value used here after move
-   |
-   = note: move occurs because `a` has type `List`, which does not implement
-   the `Copy` trait
+{{#include ../listings/ch15-smart-pointers/listing-15-17/output.txt}}
 ```
 
 The `Cons` variants own the data they hold, so when we create the `b` list, `a`
@@ -110,19 +88,7 @@ it.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-enum List {
-    Cons(i32, Rc<List>),
-    Nil,
-}
-
-use crate::List::{Cons, Nil};
-use std::rc::Rc;
-
-fn main() {
-    let a = Rc::new(Cons(5, Rc::new(Cons(10, Rc::new(Nil)))));
-    let b = Cons(3, Rc::clone(&a));
-    let c = Cons(4, Rc::clone(&a));
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-18/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-18: A definition of `List` that uses
@@ -156,25 +122,7 @@ then we can see how the reference count changes when `c` goes out of scope.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# enum List {
-#     Cons(i32, Rc<List>),
-#     Nil,
-# }
-#
-# use crate::List::{Cons, Nil};
-# use std::rc::Rc;
-#
-fn main() {
-    let a = Rc::new(Cons(5, Rc::new(Cons(10, Rc::new(Nil)))));
-    println!("count after creating a = {}", Rc::strong_count(&a));
-    let b = Cons(3, Rc::clone(&a));
-    println!("count after creating b = {}", Rc::strong_count(&a));
-    {
-        let c = Cons(4, Rc::clone(&a));
-        println!("count after creating c = {}", Rc::strong_count(&a));
-    }
-    println!("count after c goes out of scope = {}", Rc::strong_count(&a));
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-19/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-19: Printing the reference count</span>
@@ -189,10 +137,7 @@ type also has a `weak_count`; we’ll see what `weak_count` is used for in the
 This code prints the following:
 
 ```text
-count after creating a = 1
-count after creating b = 2
-count after creating c = 3
-count after c goes out of scope = 2
+{{#include ../listings/ch15-smart-pointers/listing-15-19/output.txt}}
 ```
 
 We can see that the `Rc<List>` in `a` has an initial reference count of 1; then
diff --git a/src/doc/book/src/ch15-05-interior-mutability.md b/src/doc/book/src/ch15-05-interior-mutability.md
index 34c002b2fa..959d3eb7d8 100644
--- a/src/doc/book/src/ch15-05-interior-mutability.md
+++ b/src/doc/book/src/ch15-05-interior-mutability.md
@@ -76,22 +76,13 @@ A consequence of the borrowing rules is that when you have an immutable value,
 you can’t borrow it mutably. For example, this code won’t compile:
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let x = 5;
-    let y = &mut x;
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/src/main.rs}}
 ```
 
 If you tried to compile this code, you’d get the following error:
 
 ```text
-error[E0596]: cannot borrow immutable local variable `x` as mutable
- --> src/main.rs:3:18
-  |
-2 |     let x = 5;
-  |         - consider changing this to `mut x`
-3 |     let y = &mut x;
-  |                  ^ cannot borrow mutably
+{{#include ../listings/ch15-smart-pointers/no-listing-01-cant-borrow-immutable-as-mutable/output.txt}}
 ```
 
 However, there are situations in which it would be useful for a value to mutate
@@ -134,40 +125,7 @@ called `Messenger`. Listing 15-20 shows the library code:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub trait Messenger {
-    fn send(&self, msg: &str);
-}
-
-pub struct LimitTracker<'a, T: Messenger> {
-    messenger: &'a T,
-    value: usize,
-    max: usize,
-}
-
-impl<'a, T> LimitTracker<'a, T>
-    where T: Messenger {
-    pub fn new(messenger: &T, max: usize) -> LimitTracker<T> {
-        LimitTracker {
-            messenger,
-            value: 0,
-            max,
-        }
-    }
-
-    pub fn set_value(&mut self, value: usize) {
-        self.value = value;
-
-        let percentage_of_max = self.value as f64 / self.max as f64;
-
-        if percentage_of_max >= 1.0 {
-            self.messenger.send("Error: You are over your quota!");
-        } else if percentage_of_max >= 0.9 {
-             self.messenger.send("Urgent warning: You've used up over 90% of your quota!");
-        } else if percentage_of_max >= 0.75 {
-            self.messenger.send("Warning: You've used up over 75% of your quota!");
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-20/src/lib.rs}}
 ```
 
 <span class="caption">Listing 15-20: A library to keep track of how close a
@@ -194,36 +152,7 @@ implement a mock object to do just that, but the borrow checker won’t allow it
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,does_not_compile
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    struct MockMessenger {
-        sent_messages: Vec<String>,
-    }
-
-    impl MockMessenger {
-        fn new() -> MockMessenger {
-            MockMessenger { sent_messages: vec![] }
-        }
-    }
-
-    impl Messenger for MockMessenger {
-        fn send(&self, message: &str) {
-            self.sent_messages.push(String::from(message));
-        }
-    }
-
-    #[test]
-    fn it_sends_an_over_75_percent_warning_message() {
-        let mock_messenger = MockMessenger::new();
-        let mut limit_tracker = LimitTracker::new(&mock_messenger, 100);
-
-        limit_tracker.set_value(80);
-
-        assert_eq!(mock_messenger.sent_messages.len(), 1);
-    }
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-21/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 15-21: An attempt to implement a `MockMessenger`
@@ -250,13 +179,7 @@ of should now have one message in it.
 However, there’s one problem with this test, as shown here:
 
 ```text
-error[E0596]: cannot borrow immutable field `self.sent_messages` as mutable
-  --> src/lib.rs:52:13
-   |
-51 |         fn send(&self, message: &str) {
-   |                 ----- use `&mut self` here to make mutable
-52 |             self.sent_messages.push(String::from(message));
-   |             ^^^^^^^^^^^^^^^^^^ cannot mutably borrow immutable field
+{{#include ../listings/ch15-smart-pointers/listing-15-21/output.txt}}
 ```
 
 We can’t modify the `MockMessenger` to keep track of the messages, because the
@@ -273,73 +196,7 @@ shows what that looks like:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub trait Messenger {
-#     fn send(&self, msg: &str);
-# }
-#
-# pub struct LimitTracker<'a, T: Messenger> {
-#     messenger: &'a T,
-#     value: usize,
-#     max: usize,
-# }
-#
-# impl<'a, T> LimitTracker<'a, T>
-#     where T: Messenger {
-#     pub fn new(messenger: &T, max: usize) -> LimitTracker<T> {
-#         LimitTracker {
-#             messenger,
-#             value: 0,
-#             max,
-#         }
-#     }
-#
-#     pub fn set_value(&mut self, value: usize) {
-#         self.value = value;
-#
-#         let percentage_of_max = self.value as f64 / self.max as f64;
-#
-#         if percentage_of_max >= 1.0 {
-#             self.messenger.send("Error: You are over your quota!");
-#         } else if percentage_of_max >= 0.9 {
-#              self.messenger.send("Urgent warning: You've used up over 90% of your quota!");
-#         } else if percentage_of_max >= 0.75 {
-#             self.messenger.send("Warning: You've used up over 75% of your quota!");
-#         }
-#     }
-# }
-#
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::cell::RefCell;
-
-    struct MockMessenger {
-        sent_messages: RefCell<Vec<String>>,
-    }
-
-    impl MockMessenger {
-        fn new() -> MockMessenger {
-            MockMessenger { sent_messages: RefCell::new(vec![]) }
-        }
-    }
-
-    impl Messenger for MockMessenger {
-        fn send(&self, message: &str) {
-            self.sent_messages.borrow_mut().push(String::from(message));
-        }
-    }
-
-    #[test]
-    fn it_sends_an_over_75_percent_warning_message() {
-        // --snip--
-#         let mock_messenger = MockMessenger::new();
-#         let mut limit_tracker = LimitTracker::new(&mock_messenger, 100);
-#         limit_tracker.set_value(75);
-
-        assert_eq!(mock_messenger.sent_messages.borrow().len(), 1);
-    }
-}
-# fn main() {}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-22/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 15-22: Using `RefCell<T>` to mutate an inner
@@ -388,15 +245,7 @@ at runtime.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,panics
-impl Messenger for MockMessenger {
-    fn send(&self, message: &str) {
-        let mut one_borrow = self.sent_messages.borrow_mut();
-        let mut two_borrow = self.sent_messages.borrow_mut();
-
-        one_borrow.push(String::from(message));
-        two_borrow.push(String::from(message));
-    }
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-23/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 15-23: Creating two mutable references in the
@@ -409,10 +258,7 @@ which isn’t allowed. When we run the tests for our library, the code in Listin
 15-23 will compile without any errors, but the test will fail:
 
 ```text
----- tests::it_sends_an_over_75_percent_warning_message stdout ----
-	thread 'tests::it_sends_an_over_75_percent_warning_message' panicked at
-'already borrowed: BorrowMutError', src/libcore/result.rs:906:4
-note: Run with `RUST_BACKTRACE=1` for a backtrace.
+{{#include ../listings/ch15-smart-pointers/listing-15-23/output.txt}}
 ```
 
 Notice that the code panicked with the message `already borrowed:
@@ -447,30 +293,7 @@ the lists:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-#[derive(Debug)]
-enum List {
-    Cons(Rc<RefCell<i32>>, Rc<List>),
-    Nil,
-}
-
-use crate::List::{Cons, Nil};
-use std::rc::Rc;
-use std::cell::RefCell;
-
-fn main() {
-    let value = Rc::new(RefCell::new(5));
-
-    let a = Rc::new(Cons(Rc::clone(&value), Rc::new(Nil)));
-
-    let b = Cons(Rc::new(RefCell::new(6)), Rc::clone(&a));
-    let c = Cons(Rc::new(RefCell::new(10)), Rc::clone(&a));
-
-    *value.borrow_mut() += 10;
-
-    println!("a after = {:?}", a);
-    println!("b after = {:?}", b);
-    println!("c after = {:?}", c);
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-24/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-24: Using `Rc<RefCell<i32>>` to create a
@@ -498,9 +321,7 @@ When we print `a`, `b`, and `c`, we can see that they all have the modified
 value of 15 rather than 5:
 
 ```text
-a after = Cons(RefCell { value: 15 }, Nil)
-b after = Cons(RefCell { value: 6 }, Cons(RefCell { value: 15 }, Nil))
-c after = Cons(RefCell { value: 10 }, Cons(RefCell { value: 15 }, Nil))
+{{#include ../listings/ch15-smart-pointers/listing-15-24/output.txt}}
 ```
 
 This technique is pretty neat! By using `RefCell<T>`, we have an outwardly
diff --git a/src/doc/book/src/ch15-06-reference-cycles.md b/src/doc/book/src/ch15-06-reference-cycles.md
index 1a919e3a67..a824ec3ea2 100644
--- a/src/doc/book/src/ch15-06-reference-cycles.md
+++ b/src/doc/book/src/ch15-06-reference-cycles.md
@@ -17,29 +17,8 @@ starting with the definition of the `List` enum and a `tail` method in Listing
 
 <span class="filename">Filename: src/main.rs</span>
 
-<!-- Hidden fn main is here to disable the automatic wrapping in fn main that
-doc tests do; the `use List` fails if this listing is put within a main -->
-
 ```rust
-# fn main() {}
-use std::rc::Rc;
-use std::cell::RefCell;
-use crate::List::{Cons, Nil};
-
-#[derive(Debug)]
-enum List {
-    Cons(i32, RefCell<Rc<List>>),
-    Nil,
-}
-
-impl List {
-    fn tail(&self) -> Option<&RefCell<Rc<List>>> {
-        match self {
-            Cons(_, item) => Some(item),
-            Nil => None,
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-25/src/main.rs}}
 ```
 
 <span class="caption">Listing 15-25: A cons list definition that holds a
@@ -61,47 +40,7 @@ reference counts are at various points in this process.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use crate::List::{Cons, Nil};
-# use std::rc::Rc;
-# use std::cell::RefCell;
-# #[derive(Debug)]
-# enum List {
-#     Cons(i32, RefCell<Rc<List>>),
-#     Nil,
-# }
-#
-# impl List {
-#     fn tail(&self) -> Option<&RefCell<Rc<List>>> {
-#         match self {
-#             Cons(_, item) => Some(item),
-#             Nil => None,
-#         }
-#     }
-# }
-#
-fn main() {
-    let a = Rc::new(Cons(5, RefCell::new(Rc::new(Nil))));
-
-    println!("a initial rc count = {}", Rc::strong_count(&a));
-    println!("a next item = {:?}", a.tail());
-
-    let b = Rc::new(Cons(10, RefCell::new(Rc::clone(&a))));
-
-    println!("a rc count after b creation = {}", Rc::strong_count(&a));
-    println!("b initial rc count = {}", Rc::strong_count(&b));
-    println!("b next item = {:?}", b.tail());
-
-    if let Some(link) = a.tail() {
-        *link.borrow_mut() = Rc::clone(&b);
-    }
-
-    println!("b rc count after changing a = {}", Rc::strong_count(&b));
-    println!("a rc count after changing a = {}", Rc::strong_count(&a));
-
-    // Uncomment the next line to see that we have a cycle;
-    // it will overflow the stack
-    // println!("a next item = {:?}", a.tail());
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-26/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-26: Creating a reference cycle of two `List`
@@ -122,13 +61,7 @@ When we run this code, keeping the last `println!` commented out for the
 moment, we’ll get this output:
 
 ```text
-a initial rc count = 1
-a next item = Some(RefCell { value: Nil })
-a rc count after b creation = 2
-b initial rc count = 1
-b next item = Some(RefCell { value: Cons(5, RefCell { value: Nil }) })
-b rc count after changing a = 2
-a rc count after changing a = 2
+{{#include ../listings/ch15-smart-pointers/listing-15-26/output.txt}}
 ```
 
 The reference count of the `Rc<List>` instances in both `a` and `b` are 2
@@ -198,9 +131,9 @@ anything with the value that a `Weak<T>` is pointing to, you must make sure the
 value still exists. Do this by calling the `upgrade` method on a `Weak<T>`
 instance, which will return an `Option<Rc<T>>`. You’ll get a result of `Some`
 if the `Rc<T>` value has not been dropped yet and a result of `None` if the
-`Rc<T>` value has been dropped. Because `upgrade` returns an `Option<T>`, Rust
-will ensure that the `Some` case and the `None` case are handled, and there
-won’t be an invalid pointer.
+`Rc<T>` value has been dropped. Because `upgrade` returns an `Option<Rc<T>>`,
+Rust will ensure that the `Some` case and the `None` case are handled, and
+there won’t be an invalid pointer.
 
 As an example, rather than using a list whose items know only about the next
 item, we’ll create a tree whose items know about their children items *and*
@@ -215,14 +148,7 @@ references to its children `Node` values:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::rc::Rc;
-use std::cell::RefCell;
-
-#[derive(Debug)]
-struct Node {
-    value: i32,
-    children: RefCell<Vec<Rc<Node>>>,
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-27/src/main.rs:here}}
 ```
 
 We want a `Node` to own its children, and we want to share that ownership with
@@ -238,26 +164,7 @@ with the value 5 and `leaf` as one of its children, as shown in Listing 15-27:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::rc::Rc;
-# use std::cell::RefCell;
-#
-# #[derive(Debug)]
-# struct Node {
-#     value: i32,
-#    children: RefCell<Vec<Rc<Node>>>,
-# }
-#
-fn main() {
-    let leaf = Rc::new(Node {
-        value: 3,
-        children: RefCell::new(vec![]),
-    });
-
-    let branch = Rc::new(Node {
-        value: 5,
-        children: RefCell::new(vec![Rc::clone(&leaf)]),
-    });
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-27/src/main.rs:there}}
 ```
 
 <span class="caption">Listing 15-27: Creating a `leaf` node with no children
@@ -291,15 +198,7 @@ like this:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::rc::{Rc, Weak};
-use std::cell::RefCell;
-
-#[derive(Debug)]
-struct Node {
-    value: i32,
-    parent: RefCell<Weak<Node>>,
-    children: RefCell<Vec<Rc<Node>>>,
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-28/src/main.rs:here}}
 ```
 
 A node will be able to refer to its parent node but doesn’t own its parent.
@@ -309,35 +208,7 @@ node will have a way to refer to its parent, `branch`:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::rc::{Rc, Weak};
-# use std::cell::RefCell;
-#
-# #[derive(Debug)]
-# struct Node {
-#     value: i32,
-#     parent: RefCell<Weak<Node>>,
-#     children: RefCell<Vec<Rc<Node>>>,
-# }
-#
-fn main() {
-    let leaf = Rc::new(Node {
-        value: 3,
-        parent: RefCell::new(Weak::new()),
-        children: RefCell::new(vec![]),
-    });
-
-    println!("leaf parent = {:?}", leaf.parent.borrow().upgrade());
-
-    let branch = Rc::new(Node {
-        value: 5,
-        parent: RefCell::new(Weak::new()),
-        children: RefCell::new(vec![Rc::clone(&leaf)]),
-    });
-
-    *leaf.parent.borrow_mut() = Rc::downgrade(&branch);
-
-    println!("leaf parent = {:?}", leaf.parent.borrow().upgrade());
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-28/src/main.rs:there}}
 ```
 
 <span class="caption">Listing 15-28: A `leaf` node with a weak reference to its
@@ -390,58 +261,7 @@ in Listing 15-29:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::rc::{Rc, Weak};
-# use std::cell::RefCell;
-#
-# #[derive(Debug)]
-# struct Node {
-#     value: i32,
-#     parent: RefCell<Weak<Node>>,
-#     children: RefCell<Vec<Rc<Node>>>,
-# }
-#
-fn main() {
-    let leaf = Rc::new(Node {
-        value: 3,
-        parent: RefCell::new(Weak::new()),
-        children: RefCell::new(vec![]),
-    });
-
-    println!(
-        "leaf strong = {}, weak = {}",
-        Rc::strong_count(&leaf),
-        Rc::weak_count(&leaf),
-    );
-
-    {
-        let branch = Rc::new(Node {
-            value: 5,
-            parent: RefCell::new(Weak::new()),
-            children: RefCell::new(vec![Rc::clone(&leaf)]),
-        });
-
-        *leaf.parent.borrow_mut() = Rc::downgrade(&branch);
-
-        println!(
-            "branch strong = {}, weak = {}",
-            Rc::strong_count(&branch),
-            Rc::weak_count(&branch),
-        );
-
-        println!(
-            "leaf strong = {}, weak = {}",
-            Rc::strong_count(&leaf),
-            Rc::weak_count(&leaf),
-        );
-    }
-
-    println!("leaf parent = {:?}", leaf.parent.borrow().upgrade());
-    println!(
-        "leaf strong = {}, weak = {}",
-        Rc::strong_count(&leaf),
-        Rc::weak_count(&leaf),
-    );
-}
+{{#rustdoc_include ../listings/ch15-smart-pointers/listing-15-29/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 15-29: Creating `branch` in an inner scope and
@@ -492,7 +312,7 @@ If this chapter has piqued your interest and you want to implement your own
 smart pointers, check out [“The Rustonomicon”][nomicon] for more useful
 information.
 
-[nomicon]: https://doc.rust-lang.org/stable/nomicon/
-
 Next, we’ll talk about concurrency in Rust. You’ll even learn about a few new
 smart pointers.
+
+[nomicon]: ../nomicon/index.html
diff --git a/src/doc/book/src/ch16-01-threads.md b/src/doc/book/src/ch16-01-threads.md
index 5f6eb41a0b..6cec741d8c 100644
--- a/src/doc/book/src/ch16-01-threads.md
+++ b/src/doc/book/src/ch16-01-threads.md
@@ -71,22 +71,7 @@ thread and other text from a new thread:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::time::Duration;
-
-fn main() {
-    thread::spawn(|| {
-        for i in 1..10 {
-            println!("hi number {} from the spawned thread!", i);
-            thread::sleep(Duration::from_millis(1));
-        }
-    });
-
-    for i in 1..5 {
-        println!("hi number {} from the main thread!", i);
-        thread::sleep(Duration::from_millis(1));
-    }
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-1: Creating a new thread to print one thing
@@ -97,6 +82,10 @@ thread ends, whether or not it has finished running. The output from this
 program might be a little different every time, but it will look similar to the
 following:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 hi number 1 from the main thread!
 hi number 1 from the spawned thread!
@@ -139,24 +128,7 @@ in Listing 16-1 and call `join` to make sure the spawned thread finishes before
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::time::Duration;
-
-fn main() {
-    let handle = thread::spawn(|| {
-        for i in 1..10 {
-            println!("hi number {} from the spawned thread!", i);
-            thread::sleep(Duration::from_millis(1));
-        }
-    });
-
-    for i in 1..5 {
-        println!("hi number {} from the main thread!", i);
-        thread::sleep(Duration::from_millis(1));
-    }
-
-    handle.join().unwrap();
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-02/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-2: Saving a `JoinHandle` from `thread::spawn`
@@ -168,6 +140,10 @@ thread is prevented from performing work or exiting. Because we’ve put the cal
 to `join` after the main thread’s `for` loop, running Listing 16-2 should
 produce output similar to this:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 hi number 1 from the main thread!
 hi number 2 from the main thread!
@@ -193,29 +169,16 @@ But let’s see what happens when we instead move `handle.join()` before the
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::time::Duration;
-
-fn main() {
-    let handle = thread::spawn(|| {
-        for i in 1..10 {
-            println!("hi number {} from the spawned thread!", i);
-            thread::sleep(Duration::from_millis(1));
-        }
-    });
-
-    handle.join().unwrap();
-
-    for i in 1..5 {
-        println!("hi number {} from the main thread!", i);
-        thread::sleep(Duration::from_millis(1));
-    }
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/no-listing-01-join-too-early/src/main.rs}}
 ```
 
 The main thread will wait for the spawned thread to finish and then run its
 `for` loop, so the output won’t be interleaved anymore, as shown here:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 hi number 1 from the spawned thread!
 hi number 2 from the spawned thread!
@@ -255,17 +218,7 @@ thread. However, this won’t yet work, as you’ll see in a moment.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::thread;
-
-fn main() {
-    let v = vec![1, 2, 3];
-
-    let handle = thread::spawn(|| {
-        println!("Here's a vector: {:?}", v);
-    });
-
-    handle.join().unwrap();
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-03/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-3: Attempting to use a vector created by the
@@ -277,20 +230,7 @@ should be able to access `v` inside that new thread. But when we compile this
 example, we get the following error:
 
 ```text
-error[E0373]: closure may outlive the current function, but it borrows `v`,
-which is owned by the current function
- --> src/main.rs:6:32
-  |
-6 |     let handle = thread::spawn(|| {
-  |                                ^^ may outlive borrowed value `v`
-7 |         println!("Here's a vector: {:?}", v);
-  |                                           - `v` is borrowed here
-  |
-help: to force the closure to take ownership of `v` (and any other referenced
-variables), use the `move` keyword
-  |
-6 |     let handle = thread::spawn(move || {
-  |                                ^^^^^^^
+{{#include ../listings/ch16-fearless-concurrency/listing-16-03/output.txt}}
 ```
 
 Rust *infers* how to capture `v`, and because `println!` only needs a reference
@@ -304,19 +244,7 @@ that won’t be valid:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::thread;
-
-fn main() {
-    let v = vec![1, 2, 3];
-
-    let handle = thread::spawn(|| {
-        println!("Here's a vector: {:?}", v);
-    });
-
-    drop(v); // oh no!
-
-    handle.join().unwrap();
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-04/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-4: A thread with a closure that attempts to
@@ -332,9 +260,12 @@ is also invalid. Oh no!
 To fix the compiler error in Listing 16-3, we can use the error message’s
 advice:
 
+<!-- manual-regeneration
+after automatic regeneration, look at listings/ch16-fearless-concurrency/listing-16-03/output.txt and copy the relevant part
+-->
+
 ```text
-help: to force the closure to take ownership of `v` (and any other referenced
-variables), use the `move` keyword
+help: to force the closure to take ownership of `v` (and any other referenced variables), use the `move` keyword
   |
 6 |     let handle = thread::spawn(move || {
   |                                ^^^^^^^
@@ -348,17 +279,7 @@ should borrow the values. The modification to Listing 16-3 shown in Listing
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-
-fn main() {
-    let v = vec![1, 2, 3];
-
-    let handle = thread::spawn(move || {
-        println!("Here's a vector: {:?}", v);
-    });
-
-    handle.join().unwrap();
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-05/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-5: Using the `move` keyword to force a closure
@@ -372,17 +293,7 @@ would move `v` into the closure’s environment, and we could no longer call
 `drop` on it in the main thread. We would get this compiler error instead:
 
 ```text
-error[E0382]: use of moved value: `v`
-  --> src/main.rs:10:10
-   |
-6  |     let handle = thread::spawn(move || {
-   |                                ------- value moved (into closure) here
-...
-10 |     drop(v); // oh no!
-   |          ^ value used here after move
-   |
-   = note: move occurs because `v` has type `std::vec::Vec<i32>`, which does
-   not implement the `Copy` trait
+{{#include ../listings/ch16-fearless-concurrency/output-only-01-move-drop/output.txt}}
 ```
 
 Rust’s ownership rules have saved us again! We got an error from the code in
diff --git a/src/doc/book/src/ch16-02-message-passing.md b/src/doc/book/src/ch16-02-message-passing.md
index 6b5c23f87e..7fdbccc69d 100644
--- a/src/doc/book/src/ch16-02-message-passing.md
+++ b/src/doc/book/src/ch16-02-message-passing.md
@@ -36,11 +36,7 @@ want to send over the channel.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::sync::mpsc;
-
-fn main() {
-    let (tx, rx) = mpsc::channel();
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-06/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-6: Creating a channel and assigning the two
@@ -72,17 +68,7 @@ sending a chat message from one thread to another.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::sync::mpsc;
-
-fn main() {
-    let (tx, rx) = mpsc::channel();
-
-    thread::spawn(move || {
-        let val = String::from("hi");
-        tx.send(val).unwrap();
-    });
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-07/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-7: Moving `tx` to a spawned thread and sending
@@ -107,20 +93,7 @@ end of the river or like getting a chat message.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::sync::mpsc;
-
-fn main() {
-    let (tx, rx) = mpsc::channel();
-
-    thread::spawn(move || {
-        let val = String::from("hi");
-        tx.send(val).unwrap();
-    });
-
-    let received = rx.recv().unwrap();
-    println!("Got: {}", received);
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-08/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-8: Receiving the value “hi” in the main thread
@@ -148,6 +121,10 @@ thread is appropriate.
 When we run the code in Listing 16-8, we’ll see the value printed from the main
 thread:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 Got: hi
 ```
@@ -167,21 +144,7 @@ this code isn’t allowed:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::thread;
-use std::sync::mpsc;
-
-fn main() {
-    let (tx, rx) = mpsc::channel();
-
-    thread::spawn(move || {
-        let val = String::from("hi");
-        tx.send(val).unwrap();
-        println!("val is {}", val);
-    });
-
-    let received = rx.recv().unwrap();
-    println!("Got: {}", received);
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-09/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-9: Attempting to use `val` after we’ve sent it
@@ -195,16 +158,7 @@ unexpected results due to inconsistent or nonexistent data. However, Rust gives
 us an error if we try to compile the code in Listing 16-9:
 
 ```text
-error[E0382]: use of moved value: `val`
-  --> src/main.rs:10:31
-   |
-9  |         tx.send(val).unwrap();
-   |                 --- value moved here
-10 |         println!("val is {}", val);
-   |                               ^^^ value used here after move
-   |
-   = note: move occurs because `val` has type `std::string::String`, which does
-not implement the `Copy` trait
+{{#include ../listings/ch16-fearless-concurrency/listing-16-09/output.txt}}
 ```
 
 Our concurrency mistake has caused a compile time error. The `send` function
@@ -223,31 +177,7 @@ pause for a second between each message.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::thread;
-use std::sync::mpsc;
-use std::time::Duration;
-
-fn main() {
-    let (tx, rx) = mpsc::channel();
-
-    thread::spawn(move || {
-        let vals = vec![
-            String::from("hi"),
-            String::from("from"),
-            String::from("the"),
-            String::from("thread"),
-        ];
-
-        for val in vals {
-            tx.send(val).unwrap();
-            thread::sleep(Duration::from_secs(1));
-        }
-    });
-
-    for received in rx {
-        println!("Got: {}", received);
-    }
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-10/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-10: Sending multiple messages and pausing
@@ -265,6 +195,10 @@ printing it. When the channel is closed, iteration will end.
 When running the code in Listing 16-10, you should see the following output
 with a 1-second pause in between each line:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 Got: hi
 Got: from
@@ -286,50 +220,7 @@ so by cloning the transmitting half of the channel, as shown in Listing 16-11:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# use std::thread;
-# use std::sync::mpsc;
-# use std::time::Duration;
-#
-# fn main() {
-// --snip--
-
-let (tx, rx) = mpsc::channel();
-
-let tx1 = mpsc::Sender::clone(&tx);
-thread::spawn(move || {
-    let vals = vec![
-        String::from("hi"),
-        String::from("from"),
-        String::from("the"),
-        String::from("thread"),
-    ];
-
-    for val in vals {
-        tx1.send(val).unwrap();
-        thread::sleep(Duration::from_secs(1));
-    }
-});
-
-thread::spawn(move || {
-    let vals = vec![
-        String::from("more"),
-        String::from("messages"),
-        String::from("for"),
-        String::from("you"),
-    ];
-
-    for val in vals {
-        tx.send(val).unwrap();
-        thread::sleep(Duration::from_secs(1));
-    }
-});
-
-for received in rx {
-    println!("Got: {}", received);
-}
-
-// --snip--
-# }
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 16-11: Sending multiple messages from multiple
@@ -343,6 +234,10 @@ messages to the receiving end of the channel.
 
 When you run the code, your output should look something like this:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 Got: hi
 Got: more
diff --git a/src/doc/book/src/ch16-03-shared-state.md b/src/doc/book/src/ch16-03-shared-state.md
index c39d302b92..50ce56cc78 100644
--- a/src/doc/book/src/ch16-03-shared-state.md
+++ b/src/doc/book/src/ch16-03-shared-state.md
@@ -54,18 +54,7 @@ single-threaded context, as shown in Listing 16-12:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::sync::Mutex;
-
-fn main() {
-    let m = Mutex::new(5);
-
-    {
-        let mut num = m.lock().unwrap();
-        *num = 6;
-    }
-
-    println!("m = {:?}", m);
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-12/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-12: Exploring the API of `Mutex<T>` in a
@@ -110,28 +99,7 @@ a compiler error, and we’ll use that error to learn more about using
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::sync::Mutex;
-use std::thread;
-
-fn main() {
-    let counter = Mutex::new(0);
-    let mut handles = vec![];
-
-    for _ in 0..10 {
-        let handle = thread::spawn(move || {
-            let mut num = counter.lock().unwrap();
-
-            *num += 1;
-        });
-        handles.push(handle);
-    }
-
-    for handle in handles {
-        handle.join().unwrap();
-    }
-
-    println!("Result: {}", *counter.lock().unwrap());
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-13/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-13: Ten threads each increment a counter
@@ -153,17 +121,7 @@ program.
 We hinted that this example wouldn’t compile. Now let’s find out why!
 
 ```text
-error[E0382]: use of moved value: `counter`
-  --> src/main.rs:9:36
-   |
-9  |         let handle = thread::spawn(move || {
-   |                                    ^^^^^^^ value moved into closure here,
-in previous iteration of loop
-10 |             let mut num = counter.lock().unwrap();
-   |                           ------- use occurs due to use in closure
-   |
-   = note: move occurs because `counter` has type `std::sync::Mutex<i32>`,
-which does not implement the `Copy` trait
+{{#include ../listings/ch16-fearless-concurrency/listing-16-13/output.txt}}
 ```
 
 The error message states that the `counter` value was moved in the previous
@@ -183,30 +141,7 @@ errors, we’ll also switch back to using the `for` loop, and we’ll keep the
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use std::rc::Rc;
-use std::sync::Mutex;
-use std::thread;
-
-fn main() {
-    let counter = Rc::new(Mutex::new(0));
-    let mut handles = vec![];
-
-    for _ in 0..10 {
-        let counter = Rc::clone(&counter);
-        let handle = thread::spawn(move || {
-            let mut num = counter.lock().unwrap();
-
-            *num += 1;
-        });
-        handles.push(handle);
-    }
-
-    for handle in handles {
-        handle.join().unwrap();
-    }
-
-    println!("Result: {}", *counter.lock().unwrap());
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-14/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-14: Attempting to use `Rc<T>` to allow
@@ -216,19 +151,7 @@ Once again, we compile and get... different errors! The compiler is teaching us
 a lot.
 
 ```text
-error[E0277]: `std::rc::Rc<std::sync::Mutex<i32>>` cannot be sent between threads safely
-  --> src/main.rs:11:22
-   |
-11 |         let handle = thread::spawn(move || {
-   |                      ^^^^^^^^^^^^^ `std::rc::Rc<std::sync::Mutex<i32>>`
-cannot be sent between threads safely
-   |
-   = help: within `[closure@src/main.rs:11:36: 14:10
-counter:std::rc::Rc<std::sync::Mutex<i32>>]`, the trait `std::marker::Send`
-is not implemented for `std::rc::Rc<std::sync::Mutex<i32>>`
-   = note: required because it appears within the type
-`[closure@src/main.rs:11:36: 14:10 counter:std::rc::Rc<std::sync::Mutex<i32>>]`
-   = note: required by `std::thread::spawn`
+{{#include ../listings/ch16-fearless-concurrency/listing-16-14/output.txt}}
 ```
 
 Wow, that error message is very wordy! Here’s the important part to focus
@@ -271,29 +194,7 @@ our program by changing the `use` line, the call to `new`, and the call to
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::sync::{Mutex, Arc};
-use std::thread;
-
-fn main() {
-    let counter = Arc::new(Mutex::new(0));
-    let mut handles = vec![];
-
-    for _ in 0..10 {
-        let counter = Arc::clone(&counter);
-        let handle = thread::spawn(move || {
-            let mut num = counter.lock().unwrap();
-
-            *num += 1;
-        });
-        handles.push(handle);
-    }
-
-    for handle in handles {
-        handle.join().unwrap();
-    }
-
-    println!("Result: {}", *counter.lock().unwrap());
-}
+{{#rustdoc_include ../listings/ch16-fearless-concurrency/listing-16-15/src/main.rs}}
 ```
 
 <span class="caption">Listing 16-15: Using an `Arc<T>` to wrap the `Mutex<T>`
@@ -301,6 +202,10 @@ to be able to share ownership across multiple threads</span>
 
 This code will print the following:
 
+<!-- Not extracting output because changes to this output aren't significant;
+the changes are likely to be due to the threads running differently rather than
+changes in the compiler -->
+
 ```text
 Result: 10
 ```
diff --git a/src/doc/book/src/ch16-04-extensible-concurrency-sync-and-send.md b/src/doc/book/src/ch16-04-extensible-concurrency-sync-and-send.md
index ff9830e38c..797f69a991 100644
--- a/src/doc/book/src/ch16-04-extensible-concurrency-sync-and-send.md
+++ b/src/doc/book/src/ch16-04-extensible-concurrency-sync-and-send.md
@@ -55,12 +55,10 @@ useful for enforcing invariants related to concurrency.
 Manually implementing these traits involves implementing unsafe Rust code.
 We’ll talk about using unsafe Rust code in Chapter 19; for now, the important
 information is that building new concurrent types not made up of `Send` and
-`Sync` parts requires careful thought to uphold the safety guarantees.
-[The Rustonomicon] has more information about these guarantees and how to
+`Sync` parts requires careful thought to uphold the safety guarantees. [“The
+Rustonomicon”][nomicon] has more information about these guarantees and how to
 uphold them.
 
-[The Rustonomicon]: https://doc.rust-lang.org/stable/nomicon/
-
 ## Summary
 
 This isn’t the last you’ll see of concurrency in this book: the project in
@@ -88,3 +86,4 @@ relate to those you might be familiar with from object-oriented programming.
 
 [sharing-a-mutext-between-multiple-threads]:
 ch16-03-shared-state.html#sharing-a-mutext-between-multiple-threads
+[nomicon]: ../nomicon/index.html
diff --git a/src/doc/book/src/ch17-01-what-is-oo.md b/src/doc/book/src/ch17-01-what-is-oo.md
index 15eae18e94..e197cbfa84 100644
--- a/src/doc/book/src/ch17-01-what-is-oo.md
+++ b/src/doc/book/src/ch17-01-what-is-oo.md
@@ -47,10 +47,7 @@ cache the calculated average for us. Listing 17-1 has the definition of the
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub struct AveragedCollection {
-    list: Vec<i32>,
-    average: f64,
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-01/src/lib.rs}}
 ```
 
 <span class="caption">Listing 17-1: An `AveragedCollection` struct that
@@ -66,36 +63,7 @@ on the struct, as shown in Listing 17-2:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct AveragedCollection {
-#     list: Vec<i32>,
-#     average: f64,
-# }
-impl AveragedCollection {
-    pub fn add(&mut self, value: i32) {
-        self.list.push(value);
-        self.update_average();
-    }
-
-    pub fn remove(&mut self) -> Option<i32> {
-        let result = self.list.pop();
-        match result {
-            Some(value) => {
-                self.update_average();
-                Some(value)
-            },
-            None => None,
-        }
-    }
-
-    pub fn average(&self) -> f64 {
-        self.average
-    }
-
-    fn update_average(&mut self) {
-        let total: i32 = self.list.iter().sum();
-        self.average = total as f64 / self.list.len() as f64;
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-02/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-2: Implementations of the public methods
diff --git a/src/doc/book/src/ch17-02-trait-objects.md b/src/doc/book/src/ch17-02-trait-objects.md
index d7369bffa1..b4f7e4287e 100644
--- a/src/doc/book/src/ch17-02-trait-objects.md
+++ b/src/doc/book/src/ch17-02-trait-objects.md
@@ -69,9 +69,7 @@ Listing 17-3 shows how to define a trait named `Draw` with one method named
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub trait Draw {
-    fn draw(&self);
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-03/src/lib.rs}}
 ```
 
 <span class="caption">Listing 17-3: Definition of the `Draw` trait</span>
@@ -85,13 +83,7 @@ a `Box` that implements the `Draw` trait.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub trait Draw {
-#     fn draw(&self);
-# }
-#
-pub struct Screen {
-    pub components: Vec<Box<dyn Draw>>,
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-04/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-4: Definition of the `Screen` struct with a
@@ -104,21 +96,7 @@ On the `Screen` struct, we’ll define a method named `run` that will call the
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub trait Draw {
-#     fn draw(&self);
-# }
-#
-# pub struct Screen {
-#     pub components: Vec<Box<dyn Draw>>,
-# }
-#
-impl Screen {
-    pub fn run(&self) {
-        for component in self.components.iter() {
-            component.draw();
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-05/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-5: A `run` method on `Screen` that calls the
@@ -134,22 +112,7 @@ as in Listing 17-6:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub trait Draw {
-#     fn draw(&self);
-# }
-#
-pub struct Screen<T: Draw> {
-    pub components: Vec<T>,
-}
-
-impl<T> Screen<T>
-    where T: Draw {
-    pub fn run(&self) {
-        for component in self.components.iter() {
-            component.draw();
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-06/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-6: An alternate implementation of the `Screen`
@@ -176,21 +139,7 @@ might have fields for `width`, `height`, and `label`, as shown in Listing 17-7:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub trait Draw {
-#     fn draw(&self);
-# }
-#
-pub struct Button {
-    pub width: u32,
-    pub height: u32,
-    pub label: String,
-}
-
-impl Draw for Button {
-    fn draw(&self) {
-        // code to actually draw a button
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-07/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-7: A `Button` struct that implements the
@@ -213,19 +162,7 @@ If someone using our library decides to implement a `SelectBox` struct that has
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use gui::Draw;
-
-struct SelectBox {
-    width: u32,
-    height: u32,
-    options: Vec<String>,
-}
-
-impl Draw for SelectBox {
-    fn draw(&self) {
-        // code to actually draw a select box
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 17-8: Another crate using `gui` and implementing
@@ -240,30 +177,7 @@ components. Listing 17-9 shows this implementation:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use gui::{Screen, Button};
-
-fn main() {
-    let screen = Screen {
-        components: vec![
-            Box::new(SelectBox {
-                width: 75,
-                height: 10,
-                options: vec![
-                    String::from("Yes"),
-                    String::from("Maybe"),
-                    String::from("No")
-                ],
-            }),
-            Box::new(Button {
-                width: 50,
-                height: 10,
-                label: String::from("OK"),
-            }),
-        ],
-    };
-
-    screen.run();
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 17-9: Using trait objects to store values of
@@ -297,17 +211,7 @@ with a `String` as a component:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-use gui::Screen;
-
-fn main() {
-    let screen = Screen {
-        components: vec![
-            Box::new(String::from("Hi")),
-        ],
-    };
-
-    screen.run();
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-10/src/main.rs}}
 ```
 
 <span class="caption">Listing 17-10: Attempting to use a type that doesn’t
@@ -316,14 +220,7 @@ implement the trait object’s trait</span>
 We’ll get this error because `String` doesn’t implement the `Draw` trait:
 
 ```text
-error[E0277]: the trait bound `std::string::String: gui::Draw` is not satisfied
-  --> src/main.rs:7:13
-   |
- 7 |             Box::new(String::from("Hi")),
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait gui::Draw is not
-   implemented for `std::string::String`
-   |
-   = note: required for the cast to the object type `gui::Draw`
+{{#include ../listings/ch17-oop/listing-17-10/output.txt}}
 ```
 
 This error lets us know that either we’re passing something to `Screen` we
@@ -398,22 +295,13 @@ tried to implement the `Screen` struct in Listing 17-4 to hold types that
 implement the `Clone` trait instead of the `Draw` trait, like this:
 
 ```rust,ignore,does_not_compile
-pub struct Screen {
-    pub components: Vec<Box<dyn Clone>>,
-}
+{{#rustdoc_include ../listings/ch17-oop/no-listing-01-trait-object-of-clone/src/lib.rs}}
 ```
 
 We would get this error:
 
 ```text
-error[E0038]: the trait `std::clone::Clone` cannot be made into an object
- --> src/lib.rs:2:5
-  |
-2 |     pub components: Vec<Box<dyn Clone>>,
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::clone::Clone`
-  cannot be made into an object
-  |
-  = note: the trait cannot require that `Self : Sized`
+{{#include ../listings/ch17-oop/no-listing-01-trait-object-of-clone/output.txt}}
 ```
 
 This error means you can’t use this trait as a trait object in this way. If
diff --git a/src/doc/book/src/ch17-03-oo-design-patterns.md b/src/doc/book/src/ch17-03-oo-design-patterns.md
index 4ffb3a0179..8807541346 100644
--- a/src/doc/book/src/ch17-03-oo-design-patterns.md
+++ b/src/doc/book/src/ch17-03-oo-design-patterns.md
@@ -34,21 +34,8 @@ because we haven’t implemented the `blog` crate yet.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust,ignore
-use blog::Post;
-
-fn main() {
-    let mut post = Post::new();
-
-    post.add_text("I ate a salad for lunch today");
-    assert_eq!("", post.content());
-
-    post.request_review();
-    assert_eq!("", post.content());
-
-    post.approve();
-    assert_eq!("I ate a salad for lunch today", post.content());
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch17-oop/listing-17-11/src/main.rs:all}}
 ```
 
 <span class="caption">Listing 17-11: Code that demonstrates the desired
@@ -89,25 +76,7 @@ inside an `Option<T>` in a private field named `state`. You’ll see why the
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub struct Post {
-    state: Option<Box<dyn State>>,
-    content: String,
-}
-
-impl Post {
-    pub fn new() -> Post {
-        Post {
-            state: Some(Box::new(Draft {})),
-            content: String::new(),
-        }
-    }
-}
-
-trait State {}
-
-struct Draft {}
-
-impl State for Draft {}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-12/src/lib.rs}}
 ```
 
 <span class="caption">Listing 17-12: Definition of a `Post` struct and a `new`
@@ -139,16 +108,7 @@ Post` block:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct Post {
-#     content: String,
-# }
-#
-impl Post {
-    // --snip--
-    pub fn add_text(&mut self, text: &str) {
-        self.content.push_str(text);
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-13/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-13: Implementing the `add_text` method to add
@@ -176,16 +136,7 @@ be empty. Listing 17-14 shows this placeholder implementation:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct Post {
-#     content: String,
-# }
-#
-impl Post {
-    // --snip--
-    pub fn content(&self) -> &str {
-        ""
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-14/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-14: Adding a placeholder implementation for
@@ -202,39 +153,7 @@ change its state from `Draft` to `PendingReview`. Listing 17-15 shows this code:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct Post {
-#     state: Option<Box<dyn State>>,
-#     content: String,
-# }
-#
-impl Post {
-    // --snip--
-    pub fn request_review(&mut self) {
-        if let Some(s) = self.state.take() {
-            self.state = Some(s.request_review())
-        }
-    }
-}
-
-trait State {
-    fn request_review(self: Box<Self>) -> Box<dyn State>;
-}
-
-struct Draft {}
-
-impl State for Draft {
-    fn request_review(self: Box<Self>) -> Box<dyn State> {
-        Box::new(PendingReview {})
-    }
-}
-
-struct PendingReview {}
-
-impl State for PendingReview {
-    fn request_review(self: Box<Self>) -> Box<dyn State> {
-        self
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-15/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-15: Implementing `request_review` methods on
@@ -291,62 +210,7 @@ state is approved, as shown in Listing 17-16:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct Post {
-#     state: Option<Box<dyn State>>,
-#     content: String,
-# }
-#
-impl Post {
-    // --snip--
-    pub fn approve(&mut self) {
-        if let Some(s) = self.state.take() {
-            self.state = Some(s.approve())
-        }
-    }
-}
-
-trait State {
-    fn request_review(self: Box<Self>) -> Box<dyn State>;
-    fn approve(self: Box<Self>) -> Box<dyn State>;
-}
-
-struct Draft {}
-
-impl State for Draft {
-#     fn request_review(self: Box<Self>) -> Box<dyn State> {
-#         Box::new(PendingReview {})
-#     }
-#
-    // --snip--
-    fn approve(self: Box<Self>) -> Box<dyn State> {
-        self
-    }
-}
-
-struct PendingReview {}
-
-impl State for PendingReview {
-#     fn request_review(self: Box<Self>) -> Box<dyn State> {
-#         self
-#     }
-#
-    // --snip--
-    fn approve(self: Box<Self>) -> Box<dyn State> {
-        Box::new(Published {})
-    }
-}
-
-struct Published {}
-
-impl State for Published {
-    fn request_review(self: Box<Self>) -> Box<dyn State> {
-        self
-    }
-
-    fn approve(self: Box<Self>) -> Box<dyn State> {
-        self
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-16/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-16: Implementing the `approve` method on
@@ -368,22 +232,8 @@ otherwise, we want to return an empty string slice, as shown in Listing 17-17:
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust
-# trait State {
-#     fn content<'a>(&self, post: &'a Post) -> &'a str;
-# }
-# pub struct Post {
-#     state: Option<Box<dyn State>>,
-#     content: String,
-# }
-#
-impl Post {
-    // --snip--
-    pub fn content(&self) -> &str {
-        self.state.as_ref().unwrap().content(self)
-    }
-    // --snip--
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch17-oop/listing-17-17/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-17: Updating the `content` method on `Post` to
@@ -418,25 +268,7 @@ Listing 17-18:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct Post {
-#     content: String
-# }
-trait State {
-    // --snip--
-    fn content<'a>(&self, post: &'a Post) -> &'a str {
-        ""
-    }
-}
-
-// --snip--
-struct Published {}
-
-impl State for Published {
-    // --snip--
-    fn content<'a>(&self, post: &'a Post) -> &'a str {
-        &post.content
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-18/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-18: Adding the `content` method to the `State`
@@ -528,14 +360,7 @@ Let’s consider the first part of `main` in Listing 17-11:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-# use blog::Post;
-
-fn main() {
-    let mut post = Post::new();
-
-    post.add_text("I ate a salad for lunch today");
-    assert_eq!("", post.content());
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-11/src/main.rs:here}}
 ```
 
 We still enable the creation of new posts in the draft state using `Post::new`
@@ -551,31 +376,7 @@ as well as methods on each:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub struct Post {
-    content: String,
-}
-
-pub struct DraftPost {
-    content: String,
-}
-
-impl Post {
-    pub fn new() -> DraftPost {
-        DraftPost {
-            content: String::new(),
-        }
-    }
-
-    pub fn content(&self) -> &str {
-        &self.content
-    }
-}
-
-impl DraftPost {
-    pub fn add_text(&mut self, text: &str) {
-        self.content.push_str(text);
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-19/src/lib.rs}}
 ```
 
 <span class="caption">Listing 17-19: A `Post` with a `content` method and a
@@ -611,35 +412,7 @@ shown in Listing 17-20:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct Post {
-#     content: String,
-# }
-#
-# pub struct DraftPost {
-#     content: String,
-# }
-#
-impl DraftPost {
-    // --snip--
-
-    pub fn request_review(self) -> PendingReviewPost {
-        PendingReviewPost {
-            content: self.content,
-        }
-    }
-}
-
-pub struct PendingReviewPost {
-    content: String,
-}
-
-impl PendingReviewPost {
-    pub fn approve(self) -> Post {
-        Post {
-            content: self.content,
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-20/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 17-20: A `PendingReviewPost` that gets created by
@@ -669,19 +442,7 @@ The updated code in `main` is shown in Listing 17-21:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore
-use blog::Post;
-
-fn main() {
-    let mut post = Post::new();
-
-    post.add_text("I ate a salad for lunch today");
-
-    let post = post.request_review();
-
-    let post = post.approve();
-
-    assert_eq!("I ate a salad for lunch today", post.content());
-}
+{{#rustdoc_include ../listings/ch17-oop/listing-17-21/src/main.rs}}
 ```
 
 <span class="caption">Listing 17-21: Modifications to `main` to use the new
diff --git a/src/doc/book/src/ch18-01-all-the-places-for-patterns.md b/src/doc/book/src/ch18-01-all-the-places-for-patterns.md
index d838532fba..ec0389a8d2 100644
--- a/src/doc/book/src/ch18-01-all-the-places-for-patterns.md
+++ b/src/doc/book/src/ch18-01-all-the-places-for-patterns.md
@@ -53,25 +53,7 @@ input.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let favorite_color: Option<&str> = None;
-    let is_tuesday = false;
-    let age: Result<u8, _> = "34".parse();
-
-    if let Some(color) = favorite_color {
-        println!("Using your favorite color, {}, as the background", color);
-    } else if is_tuesday {
-        println!("Tuesday is green day!");
-    } else if let Ok(age) = age {
-        if age > 30 {
-            println!("Using purple as the background color");
-        } else {
-            println!("Using orange as the background color");
-        }
-    } else {
-        println!("Using blue as the background color");
-    }
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-1: Mixing `if let`, `else if`, `else if let`,
@@ -108,15 +90,7 @@ Listing 18-2 shows a `while let` loop that uses a vector as a stack and prints
 the values in the vector in the opposite order in which they were pushed.
 
 ```rust
-let mut stack = Vec::new();
-
-stack.push(1);
-stack.push(2);
-stack.push(3);
-
-while let Some(top) = stack.pop() {
-    println!("{}", top);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-2: Using a `while let` loop to print values
@@ -139,11 +113,7 @@ Listing 18-3 demonstrates how to use a pattern in a `for` loop to destructure,
 or break apart, a tuple as part of the `for` loop.
 
 ```rust
-let v = vec!['a', 'b', 'c'];
-
-for (index, value) in v.iter().enumerate() {
-    println!("{} is at index {}", value, index);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-3: Using a pattern in a `for` loop to
@@ -152,9 +122,7 @@ destructure a tuple</span>
 The code in Listing 18-3 will print the following:
 
 ```text
-a is at index 0
-b is at index 1
-c is at index 2
+{{#include ../listings/ch18-patterns-and-matching/listing-18-03/output.txt}}
 ```
 
 We use the `enumerate` method to adapt an iterator to produce a value and that
@@ -193,7 +161,7 @@ To see the pattern matching aspect of `let` more clearly, consider Listing
 18-4, which uses a pattern with `let` to destructure a tuple.
 
 ```rust
-let (x, y, z) = (1, 2, 3);
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-4: Using a pattern to destructure a tuple and
@@ -210,7 +178,7 @@ example, Listing 18-5 shows an attempt to destructure a tuple with three
 elements into two variables, which won’t work.
 
 ```rust,ignore,does_not_compile
-let (x, y) = (1, 2, 3);
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-5: Incorrectly constructing a pattern whose
@@ -219,14 +187,7 @@ variables don’t match the number of elements in the tuple</span>
 Attempting to compile this code results in this type error:
 
 ```text
-error[E0308]: mismatched types
- --> src/main.rs:2:9
-  |
-2 |     let (x, y) = (1, 2, 3);
-  |         ^^^^^^ expected a tuple with 3 elements, found one with 2 elements
-  |
-  = note: expected type `({integer}, {integer}, {integer})`
-             found type `(_, _)`
+{{#include ../listings/ch18-patterns-and-matching/listing-18-05/output.txt}}
 ```
 
 If we wanted to ignore one or more of the values in the tuple, we could use `_`
@@ -243,9 +204,7 @@ declares a function named `foo` that takes one parameter named `x` of type
 `i32`, should by now look familiar.
 
 ```rust
-fn foo(x: i32) {
-    // code goes here
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-6: A function signature uses patterns in the
@@ -258,14 +217,7 @@ as we pass it to a function.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn print_coordinates(&(x, y): &(i32, i32)) {
-    println!("Current location: ({}, {})", x, y);
-}
-
-fn main() {
-    let point = (3, 5);
-    print_coordinates(&point);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-07/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-7: A function with parameters that destructure
diff --git a/src/doc/book/src/ch18-02-refutability.md b/src/doc/book/src/ch18-02-refutability.md
index 36fa17d48b..029547f4ad 100644
--- a/src/doc/book/src/ch18-02-refutability.md
+++ b/src/doc/book/src/ch18-02-refutability.md
@@ -28,7 +28,7 @@ where Rust requires an irrefutable pattern and vice versa. Listing 18-8 shows a
 pattern. As you might expect, this code will not compile.
 
 ```rust,ignore,does_not_compile
-let Some(x) = some_option_value;
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-08/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-8: Attempting to use a refutable pattern with
@@ -41,11 +41,7 @@ do with a `None` value. At compile time, Rust will complain that we’ve tried t
 use a refutable pattern where an irrefutable pattern is required:
 
 ```text
-error[E0005]: refutable pattern in local binding: `None` not covered
- -->
-  |
-3 | let Some(x) = some_option_value;
-  |     ^^^^^^^ pattern `None` not covered
+{{#include ../listings/ch18-patterns-and-matching/listing-18-08/output.txt}}
 ```
 
 Because we didn’t cover (and couldn’t cover!) every valid value with the
@@ -58,10 +54,7 @@ will just skip the code in the curly brackets, giving it a way to continue
 validly. Listing 18-9 shows how to fix the code in Listing 18-8.
 
 ```rust
-# let some_option_value: Option<i32> = None;
-if let Some(x) = some_option_value {
-    println!("{}", x);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-9: Using `if let` and a block with refutable
@@ -72,10 +65,8 @@ cannot use an irrefutable pattern without receiving an error. If we give `if
 let` a pattern that will always match, such as `x`, as shown in Listing 18-10,
 the compiler will give a warning.
 
-```rust,ignore
-if let x = 5 {
-    println!("{}", x);
-};
+```rust
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-10: Attempting to use an irrefutable pattern
@@ -85,15 +76,7 @@ Rust complains that it doesn’t make sense to use `if let` with an irrefutable
 pattern:
 
 ```text
-warning: irrefutable if-let pattern
- --> <anon>:2:5
-  |
-2 | /     if let x = 5 {
-3 | |     println!("{}", x);
-4 | | };
-  | |_^
-  |
-  = note: #[warn(irrefutable_let_patterns)] on by default
+{{#include ../listings/ch18-patterns-and-matching/listing-18-10/output.txt}}
 ```
 
 For this reason, match arms must use refutable patterns, except for the last
diff --git a/src/doc/book/src/ch18-03-pattern-syntax.md b/src/doc/book/src/ch18-03-pattern-syntax.md
index ccbcbd9ad4..d0b281844f 100644
--- a/src/doc/book/src/ch18-03-pattern-syntax.md
+++ b/src/doc/book/src/ch18-03-pattern-syntax.md
@@ -10,14 +10,7 @@ As you saw in Chapter 6, you can match patterns against literals directly. The
 following code gives some examples:
 
 ```rust
-let x = 1;
-
-match x {
-    1 => println!("one"),
-    2 => println!("two"),
-    3 => println!("three"),
-    _ => println!("anything"),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/no-listing-01-literals/src/main.rs:here}}
 ```
 
 This code prints `one` because the value in `x` is 1. This syntax is useful
@@ -40,18 +33,7 @@ running this code or reading further.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = Some(5);
-    let y = 10;
-
-    match x {
-        Some(50) => println!("Got 50"),
-        Some(y) => println!("Matched, y = {:?}", y),
-        _ => println!("Default case, x = {:?}", x),
-    }
-
-    println!("at the end: x = {:?}, y = {:?}", x, y);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-11: A `match` expression with an arm that
@@ -94,13 +76,7 @@ value of `x` matches either of the values in that arm, that arm’s code will
 run:
 
 ```rust
-let x = 1;
-
-match x {
-    1 | 2 => println!("one or two"),
-    3 => println!("three"),
-    _ => println!("anything"),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/no-listing-02-multiple-patterns/src/main.rs:here}}
 ```
 
 This code prints `one or two`.
@@ -112,12 +88,7 @@ following code, when a pattern matches any of the values within the range, that
 arm will execute:
 
 ```rust
-let x = 5;
-
-match x {
-    1..=5 => println!("one through five"),
-    _ => println!("something else"),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/no-listing-03-ranges/src/main.rs:here}}
 ```
 
 If `x` is 1, 2, 3, 4, or 5, the first arm will match. This syntax is more
@@ -133,13 +104,7 @@ which Rust can tell if a range is empty or not are `char` and numeric values.
 Here is an example using ranges of `char` values:
 
 ```rust
-let x = 'c';
-
-match x {
-    'a'..='j' => println!("early ASCII letter"),
-    'k'..='z' => println!("late ASCII letter"),
-    _ => println!("something else"),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/no-listing-04-ranges-of-char/src/main.rs:here}}
 ```
 
 Rust can tell that `c` is within the first pattern’s range and prints `early
@@ -158,18 +123,7 @@ break apart using a pattern with a `let` statement.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-fn main() {
-    let p = Point { x: 0, y: 7 };
-
-    let Point { x: a, y: b } = p;
-    assert_eq!(0, a);
-    assert_eq!(7, b);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-12/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-12: Destructuring a struct’s fields into
@@ -192,18 +146,7 @@ in Listing 18-12, but the variables created in the `let` pattern are `x` and
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-fn main() {
-    let p = Point { x: 0, y: 7 };
-
-    let Point { x, y } = p;
-    assert_eq!(0, x);
-    assert_eq!(7, y);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-13/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-13: Destructuring struct fields using struct
@@ -225,20 +168,7 @@ three cases: points that lie directly on the `x` axis (which is true when `y =
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# struct Point {
-#     x: i32,
-#     y: i32,
-# }
-#
-fn main() {
-    let p = Point { x: 0, y: 7 };
-
-    match p {
-        Point { x, y: 0 } => println!("On the x axis at {}", x),
-        Point { x: 0, y } => println!("On the y axis at {}", y),
-        Point { x, y } => println!("On neither axis: ({}, {})", x, y),
-    }
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-14/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-14: Destructuring and matching literal values
@@ -268,38 +198,7 @@ a `match` with patterns that will destructure each inner value.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-enum Message {
-    Quit,
-    Move { x: i32, y: i32 },
-    Write(String),
-    ChangeColor(i32, i32, i32),
-}
-
-fn main() {
-    let msg = Message::ChangeColor(0, 160, 255);
-
-    match msg {
-        Message::Quit => {
-            println!("The Quit variant has no data to destructure.")
-        }
-        Message::Move { x, y } => {
-            println!(
-                "Move in the x direction {} and in the y direction {}",
-                x,
-                y
-            );
-        }
-        Message::Write(text) => println!("Text message: {}", text),
-        Message::ChangeColor(r, g, b) => {
-            println!(
-                "Change the color to red {}, green {}, and blue {}",
-                r,
-                g,
-                b
-            )
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-15/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-15: Destructuring enum variants that hold
@@ -333,41 +232,7 @@ For example, we can refactor the code in Listing 18-15 to support RGB and HSV
 colors in the `ChangeColor` message, as shown in Listing 18-16.
 
 ```rust
-enum Color {
-   Rgb(i32, i32, i32),
-   Hsv(i32, i32, i32),
-}
-
-enum Message {
-    Quit,
-    Move { x: i32, y: i32 },
-    Write(String),
-    ChangeColor(Color),
-}
-
-fn main() {
-    let msg = Message::ChangeColor(Color::Hsv(0, 160, 255));
-
-    match msg {
-        Message::ChangeColor(Color::Rgb(r, g, b)) => {
-            println!(
-                "Change the color to red {}, green {}, and blue {}",
-                r,
-                g,
-                b
-            )
-        }
-        Message::ChangeColor(Color::Hsv(h, s, v)) => {
-            println!(
-                "Change the color to hue {}, saturation {}, and value {}",
-                h,
-                s,
-                v
-            )
-        }
-        _ => ()
-    }
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-16/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-16: Matching on nested enums</span>
@@ -386,12 +251,7 @@ The following example shows a complicated destructure where we nest structs and
 tuples inside a tuple and destructure all the primitive values out:
 
 ```rust
-# struct Point {
-#     x: i32,
-#     y: i32,
-# }
-#
-let ((feet, inches), Point {x, y}) = ((3, 10), Point { x: 3, y: -10 });
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/no-listing-05-destructuring-structs-and-tuples/src/main.rs:here}}
 ```
 
 This code lets us break complex types into their component parts so we can use
@@ -420,13 +280,7 @@ including function parameters, as shown in Listing 18-17.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn foo(_: i32, y: i32) {
-    println!("This code only uses the y parameter: {}", y);
-}
-
-fn main() {
-    foo(3, 4);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-17/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-17: Using `_` in a function signature</span>
@@ -452,19 +306,7 @@ the user should not be allowed to overwrite an existing customization of a
 setting but can unset the setting and give it a value if it is currently unset.
 
 ```rust
-let mut setting_value = Some(5);
-let new_setting_value = Some(10);
-
-match (setting_value, new_setting_value) {
-    (Some(_), Some(_)) => {
-        println!("Can't overwrite an existing customized value");
-    }
-    _ => {
-        setting_value = new_setting_value;
-    }
-}
-
-println!("setting is {:?}", setting_value);
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-18/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-18: Using an underscore within patterns that
@@ -487,13 +329,7 @@ particular values. Listing 18-19 shows an example of ignoring the second and
 fourth values in a tuple of five items.
 
 ```rust
-let numbers = (2, 4, 8, 16, 32);
-
-match numbers {
-    (first, _, third, _, fifth) => {
-        println!("Some numbers: {}, {}, {}", first, third, fifth)
-    },
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-19/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-19: Ignoring multiple parts of a tuple</span>
@@ -514,10 +350,7 @@ only get a warning about one of them.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let _x = 5;
-    let y = 10;
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-20/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-20: Starting a variable name with an
@@ -532,13 +365,7 @@ variable, whereas `_` doesn’t bind at all. To show a case where this
 distinction matters, Listing 18-21 will provide us with an error.
 
 ```rust,ignore,does_not_compile
-let s = Some(String::from("Hello!"));
-
-if let Some(_s) = s {
-    println!("found a string");
-}
-
-println!("{:?}", s);
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-21/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-21: An unused variable starting with an
@@ -550,13 +377,7 @@ doesn’t ever bind to the value. Listing 18-22 will compile without any errors
 because `s` doesn’t get moved into `_`.
 
 ```rust
-let s = Some(String::from("Hello!"));
-
-if let Some(_) = s {
-    println!("found a string");
-}
-
-println!("{:?}", s);
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-22/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-22: Using an underscore does not bind the
@@ -575,17 +396,7 @@ explicitly matched in the rest of the pattern. In Listing 18-23, we have a
 the values in the `y` and `z` fields.
 
 ```rust
-struct Point {
-    x: i32,
-    y: i32,
-    z: i32,
-}
-
-let origin = Point { x: 0, y: 0, z: 0 };
-
-match origin {
-    Point { x, .. } => println!("x is {}", x),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-23/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-23: Ignoring all fields of a `Point` except
@@ -602,15 +413,7 @@ shows how to use `..` with a tuple.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let numbers = (2, 4, 8, 16, 32);
-
-    match numbers {
-        (first, .., last) => {
-            println!("Some numbers: {}, {}", first, last);
-        },
-    }
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-24/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-24: Matching only the first and last values in
@@ -627,15 +430,7 @@ compile.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    let numbers = (2, 4, 8, 16, 32);
-
-    match numbers {
-        (.., second, ..) => {
-            println!("Some numbers: {}", second)
-        },
-    }
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-25/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-25: An attempt to use `..` in an ambiguous
@@ -644,11 +439,7 @@ way</span>
 When we compile this example, we get this error:
 
 ```text
-error: `..` can only be used once per tuple or tuple struct pattern
- --> src/main.rs:5:22
-  |
-5 |         (.., second, ..) => {
-  |                      ^^
+{{#include ../listings/ch18-patterns-and-matching/listing-18-25/output.txt}}
 ```
 
 It’s impossible for Rust to determine how many values in the tuple to ignore
@@ -671,13 +462,7 @@ The condition can use variables created in the pattern. Listing 18-26 shows a
 guard of `if x < 5`.
 
 ```rust
-let num = Some(4);
-
-match num {
-    Some(x) if x < 5 => println!("less than five: {}", x),
-    Some(x) => println!("{}", x),
-    None => (),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-26/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-26: Adding a match guard to a pattern</span>
@@ -705,18 +490,7 @@ problem.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn main() {
-    let x = Some(5);
-    let y = 10;
-
-    match x {
-        Some(50) => println!("Got 50"),
-        Some(n) if n == y => println!("Matched, n = {}", n),
-        _ => println!("Default case, x = {:?}", x),
-    }
-
-    println!("at the end: x = {:?}, y = {}", x, y);
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-27/src/main.rs}}
 ```
 
 <span class="caption">Listing 18-27: Using a match guard to test for equality
@@ -742,13 +516,7 @@ to `4`, `5`, *and* `6`, even though it might look like `if y` only applies to
 `6`.
 
 ```rust
-let x = 4;
-let y = false;
-
-match x {
-    4 | 5 | 6 if y => println!("yes"),
-    _ => println!("no"),
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-28/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-28: Combining multiple patterns with a match
@@ -789,23 +557,7 @@ name this variable `id`, the same as the field, but for this example we’ll use
 a different name.
 
 ```rust
-enum Message {
-    Hello { id: i32 },
-}
-
-let msg = Message::Hello { id: 5 };
-
-match msg {
-    Message::Hello { id: id_variable @ 3..=7 } => {
-        println!("Found an id in range: {}", id_variable)
-    },
-    Message::Hello { id: 10..=12 } => {
-        println!("Found an id in another range")
-    },
-    Message::Hello { id } => {
-        println!("Found some other id: {}", id)
-    },
-}
+{{#rustdoc_include ../listings/ch18-patterns-and-matching/listing-18-29/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 18-29: Using `@` to bind to a value in a pattern
diff --git a/src/doc/book/src/ch19-01-unsafe-rust.md b/src/doc/book/src/ch19-01-unsafe-rust.md
index c7956e8627..653bf88b75 100644
--- a/src/doc/book/src/ch19-01-unsafe-rust.md
+++ b/src/doc/book/src/ch19-01-unsafe-rust.md
@@ -25,7 +25,7 @@ Rust and how to do it.
 ### Unsafe Superpowers
 
 To switch to unsafe Rust, use the `unsafe` keyword and then start a new block
-that holds the unsafe code. You can take four actions in unsafe Rust, called
+that holds the unsafe code. You can take five actions in unsafe Rust, called
 *unsafe superpowers*, that you can’t in safe Rust. Those superpowers include
 the ability to:
 
@@ -38,7 +38,7 @@ the ability to:
 It’s important to understand that `unsafe` doesn’t turn off the borrow checker
 or disable any other of Rust’s safety checks: if you use a reference in unsafe
 code, it will still be checked. The `unsafe` keyword only gives you access to
-these four features that are then not checked by the compiler for memory
+these five features that are then not checked by the compiler for memory
 safety. You’ll still get some degree of safety inside of an unsafe block.
 
 In addition, `unsafe` does not mean the code inside the block is necessarily
@@ -46,7 +46,7 @@ dangerous or that it will definitely have memory safety problems: the intent is
 that as the programmer, you’ll ensure the code inside an `unsafe` block will
 access memory in a valid way.
 
-People are fallible, and mistakes will happen, but by requiring these four
+People are fallible, and mistakes will happen, but by requiring these five
 unsafe operations to be inside blocks annotated with `unsafe` you’ll know that
 any errors related to memory safety must be within an `unsafe` block. Keep
 `unsafe` blocks small; you’ll be thankful later when you investigate memory
@@ -61,7 +61,7 @@ from leaking out into all the places that you or your users might want to use
 the functionality implemented with `unsafe` code, because using a safe
 abstraction is safe.
 
-Let’s look at each of the four unsafe superpowers in turn. We’ll also look at
+Let’s look at each of the five unsafe superpowers in turn. We’ll also look at
 some abstractions that provide a safe interface to unsafe code.
 
 ### Dereferencing a Raw Pointer
@@ -91,10 +91,7 @@ Listing 19-1 shows how to create an immutable and a mutable raw pointer from
 references.
 
 ```rust
-let mut num = 5;
-
-let r1 = &num as *const i32;
-let r2 = &mut num as *mut i32;
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-01/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-1: Creating raw pointers from references</span>
@@ -117,8 +114,7 @@ is no memory access, or the program might error with a segmentation fault.
 Usually, there is no good reason to write code like this, but it is possible.
 
 ```rust
-let address = 0x012345usize;
-let r = address as *const i32;
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-02/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-2: Creating a raw pointer to an arbitrary
@@ -129,15 +125,7 @@ raw pointers and read the data being pointed to. In Listing 19-3, we use the
 dereference operator `*` on a raw pointer that requires an `unsafe` block.
 
 ```rust,unsafe
-let mut num = 5;
-
-let r1 = &num as *const i32;
-let r2 = &mut num as *mut i32;
-
-unsafe {
-    println!("r1 is: {}", *r1);
-    println!("r2 is: {}", *r2);
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-3: Dereferencing raw pointers within an
@@ -178,22 +166,14 @@ Here is an unsafe function named `dangerous` that doesn’t do anything in its
 body:
 
 ```rust,unsafe
-unsafe fn dangerous() {}
-
-unsafe {
-    dangerous();
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-01-unsafe-fn/src/main.rs:here}}
 ```
 
 We must call the `dangerous` function within a separate `unsafe` block. If we
 try to call `dangerous` without the `unsafe` block, we’ll get an error:
 
 ```text
-error[E0133]: call to unsafe function requires unsafe function or block
- -->
-  |
-4 |     dangerous();
-  |     ^^^^^^^^^^^ call to unsafe function
+{{#include ../listings/ch19-advanced-features/output-only-01-missing-unsafe/output.txt}}
 ```
 
 By inserting the `unsafe` block around our call to `dangerous`, we’re asserting
@@ -216,14 +196,7 @@ slice and makes it two by splitting the slice at the index given as an
 argument. Listing 19-4 shows how to use `split_at_mut`.
 
 ```rust
-let mut v = vec![1, 2, 3, 4, 5, 6];
-
-let r = &mut v[..];
-
-let (a, b) = r.split_at_mut(3);
-
-assert_eq!(a, &mut [1, 2, 3]);
-assert_eq!(b, &mut [4, 5, 6]);
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-04/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-4: Using the safe `split_at_mut`
@@ -235,14 +208,7 @@ implement `split_at_mut` as a function rather than a method and only for slices
 of `i32` values rather than for a generic type `T`.
 
 ```rust,ignore,does_not_compile
-fn split_at_mut(slice: &mut [i32], mid: usize) -> (&mut [i32], &mut [i32]) {
-    let len = slice.len();
-
-    assert!(mid <= len);
-
-    (&mut slice[..mid],
-     &mut slice[mid..])
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-5: An attempted implementation of
@@ -261,15 +227,7 @@ slice.
 When we try to compile the code in Listing 19-5, we’ll get an error.
 
 ```text
-error[E0499]: cannot borrow `*slice` as mutable more than once at a time
- -->
-  |
-6 |     (&mut slice[..mid],
-  |           ----- first mutable borrow occurs here
-7 |      &mut slice[mid..])
-  |           ^^^^^ second mutable borrow occurs here
-8 | }
-  | - first borrow ends here
+{{#include ../listings/ch19-advanced-features/listing-19-05/output.txt}}
 ```
 
 Rust’s borrow checker can’t understand that we’re borrowing different parts of
@@ -282,19 +240,7 @@ Listing 19-6 shows how to use an `unsafe` block, a raw pointer, and some calls
 to unsafe functions to make the implementation of `split_at_mut` work.
 
 ```rust,unsafe
-use std::slice;
-
-fn split_at_mut(slice: &mut [i32], mid: usize) -> (&mut [i32], &mut [i32]) {
-    let len = slice.len();
-    let ptr = slice.as_mut_ptr();
-
-    assert!(mid <= len);
-
-    unsafe {
-        (slice::from_raw_parts_mut(ptr, mid),
-         slice::from_raw_parts_mut(ptr.offset(mid as isize), len - mid))
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-6: Using unsafe code in the implementation of
@@ -310,16 +256,16 @@ mutable slice to `i32` values, `as_mut_ptr` returns a raw pointer with the type
 We keep the assertion that the `mid` index is within the slice. Then we get to
 the unsafe code: the `slice::from_raw_parts_mut` function takes a raw pointer
 and a length, and it creates a slice. We use this function to create a slice
-that starts from `ptr` and is `mid` items long. Then we call the `offset`
+that starts from `ptr` and is `mid` items long. Then we call the `add`
 method on `ptr` with `mid` as an argument to get a raw pointer that starts at
 `mid`, and we create a slice using that pointer and the remaining number of
 items after `mid` as the length.
 
 The function `slice::from_raw_parts_mut` is unsafe because it takes a raw
-pointer and must trust that this pointer is valid. The `offset` method on raw
+pointer and must trust that this pointer is valid. The `add` method on raw
 pointers is also unsafe, because it must trust that the offset location is also
 a valid pointer. Therefore, we had to put an `unsafe` block around our calls to
-`slice::from_raw_parts_mut` and `offset` so we could call them. By looking at
+`slice::from_raw_parts_mut` and `add` so we could call them. By looking at
 the code and by adding the assertion that `mid` must be less than or equal to
 `len`, we can tell that all the raw pointers used within the `unsafe` block
 will be valid pointers to data within the slice. This is an acceptable and
@@ -336,14 +282,7 @@ likely crash when the slice is used. This code takes an arbitrary memory
 location and creates a slice 10,000 items long.
 
 ```rust,unsafe
-use std::slice;
-
-let address = 0x01234usize;
-let r = address as *mut i32;
-
-let slice: &[i32] = unsafe {
-    slice::from_raw_parts_mut(r, 10000)
-};
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-7: Creating a slice from an arbitrary memory
@@ -370,15 +309,7 @@ responsibility falls on the programmer to ensure safety.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,unsafe
-extern "C" {
-    fn abs(input: i32) -> i32;
-}
-
-fn main() {
-    unsafe {
-        println!("Absolute value of -3 according to C: {}", abs(-3));
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-08/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-8: Declaring and calling an `extern` function
@@ -428,11 +359,7 @@ value.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-static HELLO_WORLD: &str = "Hello, world!";
-
-fn main() {
-    println!("name is: {}", HELLO_WORLD);
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-09/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-9: Defining and using an immutable static
@@ -461,21 +388,7 @@ static variable named `COUNTER`.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,unsafe
-static mut COUNTER: u32 = 0;
-
-fn add_to_count(inc: u32) {
-    unsafe {
-        COUNTER += inc;
-    }
-}
-
-fn main() {
-    add_to_count(3);
-
-    unsafe {
-        println!("COUNTER: {}", COUNTER);
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-10/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-10: Reading from or writing to a mutable
@@ -502,13 +415,7 @@ compiler can’t verify. We can declare that a trait is `unsafe` by adding the
 `unsafe` too, as shown in Listing 19-11.
 
 ```rust,unsafe
-unsafe trait Foo {
-    // methods go here
-}
-
-unsafe impl Foo for i32 {
-    // method implementations go here
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-11/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-11: Defining and implementing an unsafe
@@ -528,13 +435,21 @@ can’t verify that our type upholds the guarantees that it can be safely sent
 across threads or accessed from multiple threads; therefore, we need to do
 those checks manually and indicate as such with `unsafe`.
 
+### Accessing Fields of a Union
+
+A `union` is similar to a `struct`, but only one declared field is used in a
+particular instance at one time. Unions are primarily used to interface with
+unions in C code. Accessing union fields is unsafe because Rust can’t guarantee
+the type of the data currently being stored in the union instance. You can
+learn more about unions in [the reference][reference].
+
 ### When to Use Unsafe Code
 
-Using `unsafe` to take one of the four actions (superpowers) just discussed
+Using `unsafe` to take one of the five actions (superpowers) just discussed
 isn’t wrong or even frowned upon. But it is trickier to get `unsafe` code
 correct because the compiler can’t help uphold memory safety. When you have a
 reason to use `unsafe` code, you can do so, and having the explicit `unsafe`
-annotation makes it easier to track down the source of problems if they occur.
+annotation makes it easier to track down the source of problems when they occur.
 
 [dangling-references]:
 ch04-02-references-and-borrowing.html#dangling-references
@@ -543,3 +458,4 @@ ch03-01-variables-and-mutability.html#differences-between-variables-and-constant
 [extensible-concurrency-with-the-sync-and-send-traits]:
 ch16-04-extensible-concurrency-sync-and-send.html#extensible-concurrency-with-the-sync-and-send-traits
 [the-slice-type]: ch04-03-slices.html#the-slice-type
+[reference]: ../reference/items/unions.html
diff --git a/src/doc/book/src/ch19-03-advanced-traits.md b/src/doc/book/src/ch19-03-advanced-traits.md
index c959f231dc..9c334286fd 100644
--- a/src/doc/book/src/ch19-03-advanced-traits.md
+++ b/src/doc/book/src/ch19-03-advanced-traits.md
@@ -28,11 +28,7 @@ Chapter 13, we mentioned that the definition of the `Iterator` trait is as
 shown in Listing 19-12.
 
 ```rust
-pub trait Iterator {
-    type Item;
-
-    fn next(&mut self) -> Option<Self::Item>;
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-12/src/lib.rs}}
 ```
 
 <span class="caption">Listing 19-12: The definition of the `Iterator` trait
@@ -54,20 +50,14 @@ Listing 13-21, we specified that the `Item` type was `u32`:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-impl Iterator for Counter {
-    type Item = u32;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // --snip--
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-13-21-reproduced/src/lib.rs:ch19}}
 ```
 
 This syntax seems comparable to that of generics. So why not just define the
 `Iterator` trait with generics, as shown in Listing 19-13?
 
 ```rust
-pub trait Iterator<T> {
-    fn next(&mut self) -> Option<T>;
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-13/src/lib.rs}}
 ```
 
 <span class="caption">Listing 19-13: A hypothetical definition of the
@@ -111,29 +101,7 @@ struct:
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::ops::Add;
-
-#[derive(Debug, PartialEq)]
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-impl Add for Point {
-    type Output = Point;
-
-    fn add(self, other: Point) -> Point {
-        Point {
-            x: self.x + other.x,
-            y: self.y + other.y,
-        }
-    }
-}
-
-fn main() {
-    assert_eq!(Point { x: 1, y: 0 } + Point { x: 2, y: 3 },
-               Point { x: 3, y: 3 });
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-14/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-14: Implementing the `Add` trait to overload
@@ -176,18 +144,7 @@ implementation of `Add` do the conversion correctly. We can implement `Add` for
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::ops::Add;
-
-struct Millimeters(u32);
-struct Meters(u32);
-
-impl Add<Meters> for Millimeters {
-    type Output = Millimeters;
-
-    fn add(self, other: Meters) -> Millimeters {
-        Millimeters(self.0 + (other.0 * 1000))
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-15/src/lib.rs}}
 ```
 
 <span class="caption">Listing 19-15: Implementing the `Add` trait on
@@ -229,33 +186,7 @@ on it. Each `fly` method does something different.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-trait Pilot {
-    fn fly(&self);
-}
-
-trait Wizard {
-    fn fly(&self);
-}
-
-struct Human;
-
-impl Pilot for Human {
-    fn fly(&self) {
-        println!("This is your captain speaking.");
-    }
-}
-
-impl Wizard for Human {
-    fn fly(&self) {
-        println!("Up!");
-    }
-}
-
-impl Human {
-    fn fly(&self) {
-        println!("*waving arms furiously*");
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-16/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-16: Two traits are defined to have a `fly`
@@ -268,38 +199,7 @@ the method that is directly implemented on the type, as shown in Listing 19-17.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# trait Pilot {
-#     fn fly(&self);
-# }
-#
-# trait Wizard {
-#     fn fly(&self);
-# }
-#
-# struct Human;
-#
-# impl Pilot for Human {
-#     fn fly(&self) {
-#         println!("This is your captain speaking.");
-#     }
-# }
-#
-# impl Wizard for Human {
-#     fn fly(&self) {
-#         println!("Up!");
-#     }
-# }
-#
-# impl Human {
-#     fn fly(&self) {
-#         println!("*waving arms furiously*");
-#     }
-# }
-#
-fn main() {
-    let person = Human;
-    person.fly();
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-17/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-17: Calling `fly` on an instance of
@@ -315,40 +215,7 @@ Listing 19-18 demonstrates this syntax.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# trait Pilot {
-#     fn fly(&self);
-# }
-#
-# trait Wizard {
-#     fn fly(&self);
-# }
-#
-# struct Human;
-#
-# impl Pilot for Human {
-#     fn fly(&self) {
-#         println!("This is your captain speaking.");
-#     }
-# }
-#
-# impl Wizard for Human {
-#     fn fly(&self) {
-#         println!("Up!");
-#     }
-# }
-#
-# impl Human {
-#     fn fly(&self) {
-#         println!("*waving arms furiously*");
-#     }
-# }
-#
-fn main() {
-    let person = Human;
-    Pilot::fly(&person);
-    Wizard::fly(&person);
-    person.fly();
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-18/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-18: Specifying which trait’s `fly` method we
@@ -363,9 +230,7 @@ disambiguate.
 Running this code prints the following:
 
 ```text
-This is your captain speaking.
-Up!
-*waving arms furiously*
+{{#include ../listings/ch19-advanced-features/listing-19-18/output.txt}}
 ```
 
 Because the `fly` method takes a `self` parameter, if we had two *types* that
@@ -382,27 +247,7 @@ associated function `baby_name` defined on `Dog` directly.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-trait Animal {
-    fn baby_name() -> String;
-}
-
-struct Dog;
-
-impl Dog {
-    fn baby_name() -> String {
-        String::from("Spot")
-    }
-}
-
-impl Animal for Dog {
-    fn baby_name() -> String {
-        String::from("puppy")
-    }
-}
-
-fn main() {
-    println!("A baby dog is called a {}", Dog::baby_name());
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-19/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-19: A trait with an associated function and a
@@ -420,7 +265,7 @@ In `main`, we call the `Dog::baby_name` function, which calls the associated
 function defined on `Dog` directly. This code prints the following:
 
 ```text
-A baby dog is called a Spot
+{{#include ../listings/ch19-advanced-features/listing-19-19/output.txt}}
 ```
 
 This output isn’t what we wanted. We want to call the `baby_name` function that
@@ -432,9 +277,7 @@ Listing 19-20, we’ll get a compilation error.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,ignore,does_not_compile
-fn main() {
-    println!("A baby dog is called a {}", Animal::baby_name());
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-20/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-20: Attempting to call the `baby_name`
@@ -446,13 +289,7 @@ thus doesn’t have a `self` parameter, Rust can’t figure out which
 implementation of `Animal::baby_name` we want. We’ll get this compiler error:
 
 ```text
-error[E0283]: type annotations required: cannot resolve `_: Animal`
-  --> src/main.rs:20:43
-   |
-20 |     println!("A baby dog is called a {}", Animal::baby_name());
-   |                                           ^^^^^^^^^^^^^^^^^
-   |
-   = note: required by `Animal::baby_name`
+{{#include ../listings/ch19-advanced-features/listing-19-20/output.txt}}
 ```
 
 To disambiguate and tell Rust that we want to use the implementation of
@@ -462,27 +299,7 @@ demonstrates how to use fully qualified syntax.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# trait Animal {
-#     fn baby_name() -> String;
-# }
-#
-# struct Dog;
-#
-# impl Dog {
-#     fn baby_name() -> String {
-#         String::from("Spot")
-#     }
-# }
-#
-# impl Animal for Dog {
-#     fn baby_name() -> String {
-#         String::from("puppy")
-#     }
-# }
-#
-fn main() {
-    println!("A baby dog is called a {}", <Dog as Animal>::baby_name());
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-21/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-21: Using fully qualified syntax to specify
@@ -495,7 +312,7 @@ implemented on `Dog` by saying that we want to treat the `Dog` type as an
 `Animal` for this function call. This code will now print what we want:
 
 ```text
-A baby dog is called a puppy
+{{#include ../listings/ch19-advanced-features/listing-19-21/output.txt}}
 ```
 
 In general, fully qualified syntax is defined as follows:
@@ -542,19 +359,7 @@ the trait. Listing 19-22 shows an implementation of the `OutlinePrint` trait.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::fmt;
-
-trait OutlinePrint: fmt::Display {
-    fn outline_print(&self) {
-        let output = self.to_string();
-        let len = output.len();
-        println!("{}", "*".repeat(len + 4));
-        println!("*{}*", " ".repeat(len + 2));
-        println!("* {} *", output);
-        println!("*{}*", " ".repeat(len + 2));
-        println!("{}", "*".repeat(len + 4));
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-22/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-22: Implementing the `OutlinePrint` trait that
@@ -572,27 +377,14 @@ doesn’t implement `Display`, such as the `Point` struct:
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-# trait OutlinePrint {}
-struct Point {
-    x: i32,
-    y: i32,
-}
-
-impl OutlinePrint for Point {}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/src/main.rs:here}}
 ```
 
 We get an error saying that `Display` is required but not implemented:
 
 ```text
-error[E0277]: the trait bound `Point: std::fmt::Display` is not satisfied
-  --> src/main.rs:20:6
-   |
-20 | impl OutlinePrint for Point {}
-   |      ^^^^^^^^^^^^ `Point` cannot be formatted with the default formatter;
-try using `:?` instead if you are using a format string
-   |
-   = help: the trait `std::fmt::Display` is not implemented for `Point`
+{{#include ../listings/ch19-advanced-features/no-listing-02-impl-outlineprint-for-point/output.txt}}
 ```
 
 To fix this, we implement `Display` on `Point` and satisfy the constraint that
@@ -601,18 +393,7 @@ To fix this, we implement `Display` on `Point` and satisfy the constraint that
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-# struct Point {
-#     x: i32,
-#     y: i32,
-# }
-#
-use std::fmt;
-
-impl fmt::Display for Point {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "({}, {})", self.x, self.y)
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-03-impl-display-for-point/src/main.rs:here}}
 ```
 
 Then implementing the `OutlinePrint` trait on `Point` will compile
@@ -644,20 +425,7 @@ that holds an instance of `Vec<T>`; then we can implement `Display` on
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-use std::fmt;
-
-struct Wrapper(Vec<String>);
-
-impl fmt::Display for Wrapper {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "[{}]", self.0.join(", "))
-    }
-}
-
-fn main() {
-    let w = Wrapper(vec![String::from("hello"), String::from("world")]);
-    println!("w = {}", w);
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-23/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-23: Creating a `Wrapper` type around
diff --git a/src/doc/book/src/ch19-04-advanced-types.md b/src/doc/book/src/ch19-04-advanced-types.md
index e1e46b1ed1..f20d6b4dae 100644
--- a/src/doc/book/src/ch19-04-advanced-types.md
+++ b/src/doc/book/src/ch19-04-advanced-types.md
@@ -43,7 +43,7 @@ alias* to give an existing type another name. For this we use the `type`
 keyword. For example, we can create the alias `Kilometers` to `i32` like so:
 
 ```rust
-type Kilometers = i32;
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-04-kilometers-alias/src/main.rs:here}}
 ```
 
 Now, the alias `Kilometers` is a *synonym* for `i32`; unlike the `Millimeters`
@@ -52,12 +52,7 @@ new type. Values that have the type `Kilometers` will be treated the same as
 values of type `i32`:
 
 ```rust
-type Kilometers = i32;
-
-let x: i32 = 5;
-let y: Kilometers = 5;
-
-println!("x + y = {}", x + y);
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-04-kilometers-alias/src/main.rs:there}}
 ```
 
 Because `Kilometers` and `i32` are the same type, we can add values of both
@@ -77,16 +72,7 @@ over the code can be tiresome and error prone. Imagine having a project full of
 code like that in Listing 19-24.
 
 ```rust
-let f: Box<dyn Fn() + Send + 'static> = Box::new(|| println!("hi"));
-
-fn takes_long_type(f: Box<dyn Fn() + Send + 'static>) {
-    // --snip--
-}
-
-fn returns_long_type() -> Box<dyn Fn() + Send + 'static> {
-    // --snip--
-#     Box::new(|| ())
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-24/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-24: Using a long type in many places</span>
@@ -96,18 +82,7 @@ Listing 19-25, we’ve introduced an alias named `Thunk` for the verbose type an
 can replace all uses of the type with the shorter alias `Thunk`.
 
 ```rust
-type Thunk = Box<dyn Fn() + Send + 'static>;
-
-let f: Thunk = Box::new(|| println!("hi"));
-
-fn takes_long_type(f: Thunk) {
-    // --snip--
-}
-
-fn returns_long_type() -> Thunk {
-    // --snip--
-#     Box::new(|| ())
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-25/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 19-25: Introducing a type alias `Thunk` to reduce
@@ -127,23 +102,14 @@ possible I/O errors. Many of the functions in `std::io` will be returning
 the `Write` trait:
 
 ```rust
-use std::io::Error;
-use std::fmt;
-
-pub trait Write {
-    fn write(&mut self, buf: &[u8]) -> Result<usize, Error>;
-    fn flush(&mut self) -> Result<(), Error>;
-
-    fn write_all(&mut self, buf: &[u8]) -> Result<(), Error>;
-    fn write_fmt(&mut self, fmt: fmt::Arguments) -> Result<(), Error>;
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-05-write-trait/src/lib.rs}}
 ```
 
 The `Result<..., Error>` is repeated a lot. As such, `std::io` has this type of
 alias declaration:
 
 ```rust
-type Result<T> = std::result::Result<T, std::io::Error>;
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-06-result-alias/src/lib.rs:here}}
 ```
 
 Because this declaration is in the `std::io` module, we can use the fully
@@ -151,14 +117,8 @@ qualified alias `std::io::Result<T>`—that is, a `Result<T, E>` with the `E`
 filled in as `std::io::Error`. The `Write` trait function signatures end up
 looking like this:
 
-```rust,ignore
-pub trait Write {
-    fn write(&mut self, buf: &[u8]) -> Result<usize>;
-    fn flush(&mut self) -> Result<()>;
-
-    fn write_all(&mut self, buf: &[u8]) -> Result<()>;
-    fn write_fmt(&mut self, fmt: Arguments) -> Result<()>;
-}
+```rust
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-06-result-alias/src/lib.rs:there}}
 ```
 
 The type alias helps in two ways: it makes code easier to write *and* it gives
@@ -173,10 +133,8 @@ Rust has a special type named `!` that’s known in type theory lingo as the
 because it stands in the place of the return type when a function will never
 return. Here is an example:
 
-```rust,ignore
-fn bar() -> ! {
-    // --snip--
-}
+```rust
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-07-never-type/src/lib.rs:here}}
 ```
 
 This code is read as “the function `bar` returns never.” Functions that return
@@ -186,15 +144,8 @@ so `bar` can never possibly return.
 But what use is a type you can never create values for? Recall the code from
 Listing 2-5; we’ve reproduced part of it here in Listing 19-26.
 
-```rust
-# let guess = "3";
-# loop {
-let guess: u32 = match guess.trim().parse() {
-    Ok(num) => num,
-    Err(_) => continue,
-};
-# break;
-# }
+```rust,ignore
+{{#rustdoc_include ../listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs:ch19}}
 ```
 
 <span class="caption">Listing 19-26: A `match` with an arm that ends in
@@ -206,10 +157,7 @@ At the time, we skipped over some details in this code. In Chapter 6 in [“The
 for example, the following code doesn’t work:
 
 ```rust,ignore,does_not_compile
-let guess = match guess.trim().parse() {
-    Ok(_) => 5,
-    Err(_) => "hello",
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-08-match-arms-different-types/src/main.rs:here}}
 ```
 
 The type of `guess` in this code would have to be an integer *and* a string,
@@ -233,14 +181,7 @@ function that we call on `Option<T>` values to produce a value or panic? Here
 is its definition:
 
 ```rust,ignore
-impl<T> Option<T> {
-    pub fn unwrap(self) -> T {
-        match self {
-            Some(val) => val,
-            None => panic!("called `Option::unwrap()` on a `None` value"),
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-09-unwrap-definition/src/lib.rs:here}}
 ```
 
 In this code, the same thing happens as in the `match` in Listing 19-26: Rust
@@ -252,11 +193,7 @@ returning a value from `unwrap`, so this code is valid.
 One final expression that has the type `!` is a `loop`:
 
 ```rust,ignore
-print!("forever ");
-
-loop {
-    print!("and ever ");
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-10-loop-returns-never/src/main.rs:here}}
 ```
 
 Here, the loop never ends, so `!` is the value of the expression. However, this
@@ -278,8 +215,7 @@ we can’t create a variable of type `str`, nor can we take an argument of type
 `str`. Consider the following code, which does not work:
 
 ```rust,ignore,does_not_compile
-let s1: str = "Hello there!";
-let s2: str = "How's it going?";
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-11-cant-create-str/src/main.rs:here}}
 ```
 
 Rust needs to know how much memory to allocate for any value of a particular
@@ -321,17 +257,13 @@ In addition, Rust implicitly adds a bound on `Sized` to every generic function.
 That is, a generic function definition like this:
 
 ```rust,ignore
-fn generic<T>(t: T) {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-12-generic-fn-definition/src/lib.rs}}
 ```
 
 is actually treated as though we had written this:
 
 ```rust,ignore
-fn generic<T: Sized>(t: T) {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-13-generic-implicit-sized-bound/src/lib.rs}}
 ```
 
 By default, generic functions will work only on types that have a known size at
@@ -339,9 +271,7 @@ compile time. However, you can use the following special syntax to relax this
 restriction:
 
 ```rust,ignore
-fn generic<T: ?Sized>(t: &T) {
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-14-generic-maybe-sized/src/lib.rs}}
 ```
 
 A trait bound on `?Sized` is the opposite of a trait bound on `Sized`: we would
diff --git a/src/doc/book/src/ch19-05-advanced-functions-and-closures.md b/src/doc/book/src/ch19-05-advanced-functions-and-closures.md
index 2955114afc..ee04e8630f 100644
--- a/src/doc/book/src/ch19-05-advanced-functions-and-closures.md
+++ b/src/doc/book/src/ch19-05-advanced-functions-and-closures.md
@@ -1,6 +1,6 @@
 ## Advanced Functions and Closures
 
-Finally, we’ll explore some advanced features related to functions and
+Next, we’ll explore some advanced features related to functions and
 closures, which include function pointers and returning closures.
 
 ### Function Pointers
@@ -17,19 +17,7 @@ similar to that of closures, as shown in Listing 19-27.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust
-fn add_one(x: i32) -> i32 {
-    x + 1
-}
-
-fn do_twice(f: fn(i32) -> i32, arg: i32) -> i32 {
-    f(arg) + f(arg)
-}
-
-fn main() {
-    let answer = do_twice(add_one, 5);
-
-    println!("The answer is: {}", answer);
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-27/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-27: Using the `fn` type to accept a function
@@ -59,22 +47,14 @@ function, let’s look at a use of `map`. To use the `map` function to turn a
 vector of numbers into a vector of strings, we could use a closure, like this:
 
 ```rust
-let list_of_numbers = vec![1, 2, 3];
-let list_of_strings: Vec<String> = list_of_numbers
-    .iter()
-    .map(|i| i.to_string())
-    .collect();
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-15-map-closure/src/main.rs:here}}
 ```
 
 Or we could name a function as the argument to `map` instead of the closure,
 like this:
 
 ```rust
-let list_of_numbers = vec![1, 2, 3];
-let list_of_strings: Vec<String> = list_of_numbers
-    .iter()
-    .map(ToString::to_string)
-    .collect();
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-16-map-function/src/main.rs:here}}
 ```
 
 Note that we must use the fully qualified syntax that we talked about earlier
@@ -92,15 +72,7 @@ implement the closure traits, which means we can specify the initializer
 functions as arguments for methods that take closures, like so:
 
 ```rust
-enum Status {
-    Value(u32),
-    Stop,
-}
-
-let list_of_statuses: Vec<Status> =
-    (0u32..20)
-    .map(Status::Value)
-    .collect();
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-17-map-initializer/src/main.rs:here}}
 ```
 
 Here we create `Status::Value` instances using each `u32` value in the range
@@ -120,25 +92,13 @@ pointer `fn` as a return type, for example.
 The following code tries to return a closure directly, but it won’t compile:
 
 ```rust,ignore,does_not_compile
-fn returns_closure() -> Fn(i32) -> i32 {
-    |x| x + 1
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-18-returns-closure/src/lib.rs}}
 ```
 
 The compiler error is as follows:
 
 ```text
-error[E0277]: the trait bound `std::ops::Fn(i32) -> i32 + 'static:
-std::marker::Sized` is not satisfied
- -->
-  |
-1 | fn returns_closure() -> Fn(i32) -> i32 {
-  |                         ^^^^^^^^^^^^^^ `std::ops::Fn(i32) -> i32 + 'static`
-  does not have a constant size known at compile-time
-  |
-  = help: the trait `std::marker::Sized` is not implemented for
-  `std::ops::Fn(i32) -> i32 + 'static`
-  = note: the return type of a function must have a statically known size
+{{#include ../listings/ch19-advanced-features/no-listing-18-returns-closure/output.txt}}
 ```
 
 The error references the `Sized` trait again! Rust doesn’t know how much space
@@ -146,9 +106,7 @@ it will need to store the closure. We saw a solution to this problem earlier.
 We can use a trait object:
 
 ```rust
-fn returns_closure() -> Box<dyn Fn(i32) -> i32> {
-    Box::new(|x| x + 1)
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-19-returns-closure-trait-object/src/lib.rs}}
 ```
 
 This code will compile just fine. For more about trait objects, refer to the
diff --git a/src/doc/book/src/ch19-06-macros.md b/src/doc/book/src/ch19-06-macros.md
index fbb2246934..8733ee7f72 100644
--- a/src/doc/book/src/ch19-06-macros.md
+++ b/src/doc/book/src/ch19-06-macros.md
@@ -78,18 +78,7 @@ Listing 19-28 shows a slightly simplified definition of the `vec!` macro.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-#[macro_export]
-macro_rules! vec {
-    ( $( $x:expr ),* ) => {
-        {
-            let mut temp_vec = Vec::new();
-            $(
-                temp_vec.push($x);
-            )*
-            temp_vec
-        }
-    };
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-28/src/lib.rs}}
 ```
 
 <span class="caption">Listing 19-28: A simplified version of the `vec!` macro
@@ -120,7 +109,7 @@ covered in Chapter 18 because macro patterns are matched against Rust code
 structure rather than values. Let’s walk through what the pattern pieces in
 Listing 19-28 mean; for the full macro pattern syntax, see [the reference].
 
-[the reference]: ../reference/macros.html
+[the reference]: ../reference/macros-by-example.html
 
 First, a set of parentheses encompasses the whole pattern. A dollar sign (`$`)
 is next, followed by a set of parentheses that captures values that match the
@@ -143,11 +132,13 @@ macro with `vec![1, 2, 3];`, the code generated that replaces this macro call
 will be the following:
 
 ```rust,ignore
-let mut temp_vec = Vec::new();
-temp_vec.push(1);
-temp_vec.push(2);
-temp_vec.push(3);
-temp_vec
+{
+    let mut temp_vec = Vec::new();
+    temp_vec.push(1);
+    temp_vec.push(2);
+    temp_vec.push(3);
+    temp_vec
+}
 ```
 
 We’ve defined a macro that can take any number of arguments of any type and can
@@ -221,16 +212,8 @@ programmer to write code like Listing 19-30 using our crate.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust,ignore
-use hello_macro::HelloMacro;
-use hello_macro_derive::HelloMacro;
-
-#[derive(HelloMacro)]
-struct Pancakes;
-
-fn main() {
-    Pancakes::hello_macro();
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-30/src/main.rs}}
 ```
 
 <span class="caption">Listing 19-30: The code a user of our crate will be able
@@ -248,28 +231,14 @@ Next, we’ll define the `HelloMacro` trait and its associated function:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub trait HelloMacro {
-    fn hello_macro();
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/hello_macro/src/lib.rs}}
 ```
 
 We have a trait and its function. At this point, our crate user could implement
 the trait to achieve the desired functionality, like so:
 
 ```rust,ignore
-use hello_macro::HelloMacro;
-
-struct Pancakes;
-
-impl HelloMacro for Pancakes {
-    fn hello_macro() {
-        println!("Hello, Macro! My name is Pancakes!");
-    }
-}
-
-fn main() {
-    Pancakes::hello_macro();
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/no-listing-20-impl-hellomacro-for-pancakes/pancakes/src/main.rs}}
 ```
 
 However, they would need to write the implementation block for each type they
@@ -311,12 +280,7 @@ in a moment, so we need to add them as dependencies. Add the following to the
 <span class="filename">Filename: hello_macro_derive/Cargo.toml</span>
 
 ```toml
-[lib]
-proc-macro = true
-
-[dependencies]
-syn = "0.14.4"
-quote = "0.6.3"
+{{#include ../listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/Cargo.toml:7:12}}
 ```
 
 To start defining the procedural macro, place the code in Listing 19-31 into
@@ -325,29 +289,8 @@ won’t compile until we add a definition for the `impl_hello_macro` function.
 
 <span class="filename">Filename: hello_macro_derive/src/lib.rs</span>
 
-<!--
-This usage of `extern crate` is required for the moment with 1.31.0, see:
-https://github.com/rust-lang/rust/issues/54418
-https://github.com/rust-lang/rust/pull/54658
-https://github.com/rust-lang/rust/issues/55599
--->
-
-```rust,ignore
-extern crate proc_macro;
-
-use crate::proc_macro::TokenStream;
-use quote::quote;
-use syn;
-
-#[proc_macro_derive(HelloMacro)]
-pub fn hello_macro_derive(input: TokenStream) -> TokenStream {
-    // Construct a representation of Rust code as a syntax tree
-    // that we can manipulate
-    let ast = syn::parse(input).unwrap();
-
-    // Build the trait implementation
-    impl_hello_macro(&ast)
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-31/hello_macro/hello_macro_derive/src/lib.rs}}
 ```
 
 <span class="caption">Listing 19-31: Code that most procedural macro crates
@@ -417,7 +360,7 @@ with the `ident` (identifier, meaning the name) of `Pancakes`. There are more
 fields on this struct for describing all sorts of Rust code; check the [`syn`
 documentation for `DeriveInput`][syn-docs] for more information.
 
-[syn-docs]: https://docs.rs/syn/0.14.4/syn/struct.DeriveInput.html
+[syn-docs]: https://docs.rs/syn/1.0/syn/struct.DeriveInput.html
 
 Soon we’ll define the `impl_hello_macro` function, which is where we’ll build
 the new Rust code we want to include. But before we do, note that the output
@@ -441,17 +384,7 @@ into a `DeriveInput` instance, let’s generate the code that implements the
 <span class="filename">Filename: hello_macro_derive/src/lib.rs</span>
 
 ```rust,ignore
-fn impl_hello_macro(ast: &syn::DeriveInput) -> TokenStream {
-    let name = &ast.ident;
-    let gen = quote! {
-        impl HelloMacro for #name {
-            fn hello_macro() {
-                println!("Hello, Macro! My name is {}", stringify!(#name));
-            }
-        }
-    };
-    gen.into()
-}
+{{#rustdoc_include ../listings/ch19-advanced-features/listing-19-33/hello_macro/hello_macro_derive/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 19-33: Implementing the `HelloMacro` trait using
@@ -502,9 +435,7 @@ crate’s *Cargo.toml*. If you’re publishing your versions of `hello_macro` an
 dependencies; if not, you can specify them as `path` dependencies as follows:
 
 ```toml
-[dependencies]
-hello_macro = { path = "../hello_macro" }
-hello_macro_derive = { path = "../hello_macro/hello_macro_derive" }
+{{#include ../listings/ch19-advanced-features/no-listing-21-pancakes/pancakes/Cargo.toml:7:9}}
 ```
 
 Put the code in Listing 19-30 into *src/main.rs*, and run `cargo run`: it
diff --git a/src/doc/book/src/ch20-01-single-threaded.md b/src/doc/book/src/ch20-01-single-threaded.md
index a2617c00a0..b46d39f656 100644
--- a/src/doc/book/src/ch20-01-single-threaded.md
+++ b/src/doc/book/src/ch20-01-single-threaded.md
@@ -38,17 +38,7 @@ an incoming stream, it will print `Connection established!`.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,no_run
-use std::net::TcpListener;
-
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
-
-    for stream in listener.incoming() {
-        let stream = stream.unwrap();
-
-        println!("Connection established!");
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-01/src/main.rs}}
 ```
 
 <span class="caption">Listing 20-1: Listening for incoming streams and printing
@@ -140,27 +130,7 @@ look like Listing 20-2.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,no_run
-use std::io::prelude::*;
-use std::net::TcpStream;
-use std::net::TcpListener;
-
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
-
-    for stream in listener.incoming() {
-        let stream = stream.unwrap();
-
-        handle_connection(stream);
-    }
-}
-
-fn handle_connection(mut stream: TcpStream) {
-    let mut buffer = [0; 512];
-
-    stream.read(&mut buffer).unwrap();
-
-    println!("Request: {}", String::from_utf8_lossy(&buffer[..]));
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-02/src/main.rs}}
 ```
 
 <span class="caption">Listing 20-2: Reading from the `TcpStream` and printing
@@ -200,7 +170,7 @@ program’s output in the terminal will now look similar to this:
 ```text
 $ cargo run
    Compiling hello v0.1.0 (file:///projects/hello)
-    Finished dev [unoptimized + debuginfo] target(s) in 0.42 secs
+    Finished dev [unoptimized + debuginfo] target(s) in 0.42s
      Running `target/debug/hello`
 Request: GET / HTTP/1.1
 Host: 127.0.0.1:7878
@@ -295,19 +265,8 @@ Listing 20-3.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-# use std::io::prelude::*;
-# use std::net::TcpStream;
-fn handle_connection(mut stream: TcpStream) {
-    let mut buffer = [0; 512];
-
-    stream.read(&mut buffer).unwrap();
-
-    let response = "HTTP/1.1 200 OK\r\n\r\n";
-
-    stream.write(response.as_bytes()).unwrap();
-    stream.flush().unwrap();
-}
+```rust,no_run
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-03/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-3: Writing a tiny successful HTTP response to
@@ -340,17 +299,7 @@ possibility.
 <span class="filename">Filename: hello.html</span>
 
 ```html
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Hello!</title>
-  </head>
-  <body>
-    <h1>Hello!</h1>
-    <p>Hi from Rust</p>
-  </body>
-</html>
+{{#include ../listings/ch20-web-server/listing-20-04/hello.html}}
 ```
 
 <span class="caption">Listing 20-4: A sample HTML file to return in a
@@ -363,23 +312,8 @@ and send it.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-# use std::io::prelude::*;
-# use std::net::TcpStream;
-use std::fs;
-// --snip--
-
-fn handle_connection(mut stream: TcpStream) {
-    let mut buffer = [0; 512];
-    stream.read(&mut buffer).unwrap();
-
-    let contents = fs::read_to_string("hello.html").unwrap();
-
-    let response = format!("HTTP/1.1 200 OK\r\n\r\n{}", contents);
-
-    stream.write(response.as_bytes()).unwrap();
-    stream.flush().unwrap();
-}
+```rust,no_run
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-05/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-5: Sending the contents of *hello.html* as the
@@ -415,29 +349,8 @@ received against what we know a request for */* looks like and adds `if` and
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-# use std::io::prelude::*;
-# use std::net::TcpStream;
-# use std::fs;
-// --snip--
-
-fn handle_connection(mut stream: TcpStream) {
-    let mut buffer = [0; 512];
-    stream.read(&mut buffer).unwrap();
-
-    let get = b"GET / HTTP/1.1\r\n";
-
-    if buffer.starts_with(get) {
-        let contents = fs::read_to_string("hello.html").unwrap();
-
-        let response = format!("HTTP/1.1 200 OK\r\n\r\n{}", contents);
-
-        stream.write(response.as_bytes()).unwrap();
-        stream.flush().unwrap();
-    } else {
-        // some other request
-    }
-}
+```rust,no_run
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-06/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-6: Matching the request and handling requests
@@ -467,24 +380,8 @@ indicating the response to the end user.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-# use std::io::prelude::*;
-# use std::net::TcpStream;
-# use std::fs;
-# fn handle_connection(mut stream: TcpStream) {
-# if true {
-// --snip--
-
-} else {
-    let status_line = "HTTP/1.1 404 NOT FOUND\r\n\r\n";
-    let contents = fs::read_to_string("404.html").unwrap();
-
-    let response = format!("{}{}", status_line, contents);
-
-    stream.write(response.as_bytes()).unwrap();
-    stream.flush().unwrap();
-}
-# }
+```rust,no_run
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-07/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-7: Responding with status code 404 and an
@@ -499,17 +396,7 @@ any HTML you want or use the example HTML in Listing 20-8.
 <span class="filename">Filename: 404.html</span>
 
 ```html
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Hello!</title>
-  </head>
-  <body>
-    <h1>Oops!</h1>
-    <p>Sorry, I don't know what you're asking for.</p>
-  </body>
-</html>
+{{#include ../listings/ch20-web-server/listing-20-08/404.html}}
 ```
 
 <span class="caption">Listing 20-8: Sample content for the page to send back
@@ -532,32 +419,8 @@ the large `if` and `else` blocks.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-# use std::io::prelude::*;
-# use std::net::TcpStream;
-# use std::fs;
-// --snip--
-
-fn handle_connection(mut stream: TcpStream) {
-#     let mut buffer = [0; 512];
-#     stream.read(&mut buffer).unwrap();
-#
-#     let get = b"GET / HTTP/1.1\r\n";
-    // --snip--
-
-    let (status_line, filename) = if buffer.starts_with(get) {
-        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
-    } else {
-        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
-    };
-
-    let contents = fs::read_to_string(filename).unwrap();
-
-    let response = format!("{}{}", status_line, contents);
-
-    stream.write(response.as_bytes()).unwrap();
-    stream.flush().unwrap();
-}
+```rust,no_run
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-09/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-9: Refactoring the `if` and `else` blocks to
diff --git a/src/doc/book/src/ch20-02-multithreaded.md b/src/doc/book/src/ch20-02-multithreaded.md
index 40d3a172c8..c0731d214c 100644
--- a/src/doc/book/src/ch20-02-multithreaded.md
+++ b/src/doc/book/src/ch20-02-multithreaded.md
@@ -17,33 +17,8 @@ for 5 seconds before responding.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust
-use std::thread;
-use std::time::Duration;
-# use std::io::prelude::*;
-# use std::net::TcpStream;
-# use std::fs::File;
-// --snip--
-
-fn handle_connection(mut stream: TcpStream) {
-#     let mut buffer = [0; 512];
-#     stream.read(&mut buffer).unwrap();
-    // --snip--
-
-    let get = b"GET / HTTP/1.1\r\n";
-    let sleep = b"GET /sleep HTTP/1.1\r\n";
-
-    let (status_line, filename) = if buffer.starts_with(get) {
-        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
-    } else if buffer.starts_with(sleep) {
-        thread::sleep(Duration::from_secs(5));
-        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
-    } else {
-        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
-    };
-
-    // --snip--
-}
+```rust,no_run
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-10/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-10: Simulating a slow request by recognizing
@@ -124,23 +99,7 @@ new thread to handle each stream within the `for` loop.
 <span class="filename">Filename: src/main.rs</span>
 
 ```rust,no_run
-# use std::thread;
-# use std::io::prelude::*;
-# use std::net::TcpListener;
-# use std::net::TcpStream;
-#
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
-
-    for stream in listener.incoming() {
-        let stream = stream.unwrap();
-
-        thread::spawn(|| {
-            handle_connection(stream);
-        });
-    }
-}
-# fn handle_connection(mut stream: TcpStream) {}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-11/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-11: Spawning a new thread for each
@@ -162,31 +121,8 @@ struct we want to use instead of `thread::spawn`.
 
 <span class="filename">Filename: src/main.rs</span>
 
-```rust,no_run
-# use std::thread;
-# use std::io::prelude::*;
-# use std::net::TcpListener;
-# use std::net::TcpStream;
-# struct ThreadPool;
-# impl ThreadPool {
-#    fn new(size: u32) -> ThreadPool { ThreadPool }
-#    fn execute<F>(&self, f: F)
-#        where F: FnOnce() + Send + 'static {}
-# }
-#
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
-    let pool = ThreadPool::new(4);
-
-    for stream in listener.incoming() {
-        let stream = stream.unwrap();
-
-        pool.execute(|| {
-            handle_connection(stream);
-        });
-    }
-}
-# fn handle_connection(mut stream: TcpStream) {}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-12/src/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-12: Our ideal `ThreadPool` interface</span>
@@ -205,16 +141,7 @@ compiler errors from `cargo check` to drive our development. Here is the first
 error we get:
 
 ```text
-$ cargo check
-   Compiling hello v0.1.0 (file:///projects/hello)
-error[E0433]: failed to resolve. Use of undeclared type or module `ThreadPool`
-  --> src\main.rs:10:16
-   |
-10 |     let pool = ThreadPool::new(4);
-   |                ^^^^^^^^^^^^^^^ Use of undeclared type or module
-   `ThreadPool`
-
-error: aborting due to previous error
+{{#include ../listings/ch20-web-server/listing-20-12/output.txt}}
 ```
 
 Great! This error tells us we need a `ThreadPool` type or module, so we’ll
@@ -231,7 +158,7 @@ definition of a `ThreadPool` struct that we can have for now:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub struct ThreadPool;
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/lib.rs}}
 ```
 
 Then create a new directory, *src/bin*, and move the binary crate rooted in
@@ -244,22 +171,14 @@ following code to the top of *src/bin/main.rs*:
 <span class="filename">Filename: src/bin/main.rs</span>
 
 ```rust,ignore
-use hello::ThreadPool;
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-01-define-threadpool-struct/src/bin/main.rs:here}}
 ```
 
 This code still won’t work, but let’s check it again to get the next error that
 we need to address:
 
 ```text
-$ cargo check
-   Compiling hello v0.1.0 (file:///projects/hello)
-error[E0599]: no function or associated item named `new` found for type
-`hello::ThreadPool` in the current scope
- --> src/bin/main.rs:13:16
-   |
-13 |     let pool = ThreadPool::new(4);
-   |                ^^^^^^^^^^^^^^^ function or associated item not found in
-   `hello::ThreadPool`
+{{#include ../listings/ch20-web-server/no-listing-01-define-threadpool-struct/output.txt}}
 ```
 
 This error indicates that next we need to create an associated function named
@@ -271,13 +190,7 @@ characteristics:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-pub struct ThreadPool;
-
-impl ThreadPool {
-    pub fn new(size: usize) -> ThreadPool {
-        ThreadPool
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-02-impl-threadpool-new/src/lib.rs:here}}
 ```
 
 We chose `usize` as the type of the `size` parameter, because we know that a
@@ -289,27 +202,11 @@ ignore --> section of Chapter 3.
 Let’s check the code again:
 
 ```text
-$ cargo check
-   Compiling hello v0.1.0 (file:///projects/hello)
-warning: unused variable: `size`
- --> src/lib.rs:4:16
-  |
-4 |     pub fn new(size: usize) -> ThreadPool {
-  |                ^^^^
-  |
-  = note: #[warn(unused_variables)] on by default
-  = note: to avoid this warning, consider using `_size` instead
-
-error[E0599]: no method named `execute` found for type `hello::ThreadPool` in the current scope
-  --> src/bin/main.rs:18:14
-   |
-18 |         pool.execute(|| {
-   |              ^^^^^^^
+{{#include ../listings/ch20-web-server/no-listing-02-impl-threadpool-new/output.txt}}
 ```
 
-Now we get a warning and an error. Ignoring the warning for a moment, the error
-occurs because we don’t have an `execute` method on `ThreadPool`. Recall from
-the [“Creating a Similar Interface for a Finite Number of
+Now the error occurs because we don’t have an `execute` method on `ThreadPool`.
+Recall from the [“Creating a Similar Interface for a Finite Number of
 Threads”](#creating-a-similar-interface-for-a-finite-number-of-threads)<!--
 ignore --> section that we decided our thread pool should have an interface
 similar to `thread::spawn`. In addition, we’ll implement the `execute` function
@@ -350,17 +247,7 @@ the thread will take to execute. Let’s create an `execute` method on
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct ThreadPool;
-impl ThreadPool {
-    // --snip--
-
-    pub fn execute<F>(&self, f: F)
-        where
-            F: FnOnce() + Send + 'static
-    {
-
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-03-define-execute/src/lib.rs:here}}
 ```
 
 We still use the `()` after `FnOnce` because this `FnOnce` represents a closure
@@ -372,30 +259,13 @@ Again, this is the simplest implementation of the `execute` method: it does
 nothing, but we’re trying only to make our code compile. Let’s check it again:
 
 ```text
-$ cargo check
-   Compiling hello v0.1.0 (file:///projects/hello)
-warning: unused variable: `size`
- --> src/lib.rs:4:16
-  |
-4 |     pub fn new(size: usize) -> ThreadPool {
-  |                ^^^^
-  |
-  = note: #[warn(unused_variables)] on by default
-  = note: to avoid this warning, consider using `_size` instead
-
-warning: unused variable: `f`
- --> src/lib.rs:8:30
-  |
-8 |     pub fn execute<F>(&self, f: F)
-  |                              ^
-  |
-  = note: to avoid this warning, consider using `_f` instead
+{{#include ../listings/ch20-web-server/no-listing-03-define-execute/output.txt}}
 ```
 
-We’re receiving only warnings now, which means it compiles! But note that if
-you try `cargo run` and make a request in the browser, you’ll see the errors in
-the browser that we saw at the beginning of the chapter. Our library isn’t
-actually calling the closure passed to `execute` yet!
+It compiles! But note that if you try `cargo run` and make a request in the
+browser, you’ll see the errors in the browser that we saw at the beginning of
+the chapter. Our library isn’t actually calling the closure passed to `execute`
+yet!
 
 > Note: A saying you might hear about languages with strict compilers, such as
 > Haskell and Rust, is “if the code compiles, it works.” But this saying is not
@@ -406,36 +276,19 @@ actually calling the closure passed to `execute` yet!
 
 #### Validating the Number of Threads in `new`
 
-We’ll continue to get warnings because we aren’t doing anything with the
-parameters to `new` and `execute`. Let’s implement the bodies of these
-functions with the behavior we want. To start, let’s think about `new`. Earlier
-we chose an unsigned type for the `size` parameter, because a pool with a
-negative number of threads makes no sense. However, a pool with zero threads
-also makes no sense, yet zero is a perfectly valid `usize`. We’ll add code to
-check that `size` is greater than zero before we return a `ThreadPool` instance
-and have the program panic if it receives a zero by using the `assert!` macro,
-as shown in Listing 20-13.
+We aren’t doing anything with the parameters to `new` and `execute`. Let’s
+implement the bodies of these functions with the behavior we want. To start,
+let’s think about `new`. Earlier we chose an unsigned type for the `size`
+parameter, because a pool with a negative number of threads makes no sense.
+However, a pool with zero threads also makes no sense, yet zero is a perfectly
+valid `usize`. We’ll add code to check that `size` is greater than zero before
+we return a `ThreadPool` instance and have the program panic if it receives a
+zero by using the `assert!` macro, as shown in Listing 20-13.
 
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# pub struct ThreadPool;
-impl ThreadPool {
-    /// Create a new ThreadPool.
-    ///
-    /// The size is the number of threads in the pool.
-    ///
-    /// # Panics
-    ///
-    /// The `new` function will panic if the size is zero.
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        ThreadPool
-    }
-
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-13/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-13: Implementing `ThreadPool::new` to panic if
@@ -486,30 +339,7 @@ returned a `ThreadPool` instance containing them.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,not_desired_behavior
-use std::thread;
-
-pub struct ThreadPool {
-    threads: Vec<thread::JoinHandle<()>>,
-}
-
-impl ThreadPool {
-    // --snip--
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        let mut threads = Vec::with_capacity(size);
-
-        for _ in 0..size {
-            // create some threads and store them in the vector
-        }
-
-        ThreadPool {
-            threads
-        }
-    }
-
-    // --snip--
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-14/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-14: Creating a vector for `ThreadPool` to hold
@@ -575,45 +405,7 @@ Ready? Here is Listing 20-15 with one way to make the preceding modifications.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::thread;
-
-pub struct ThreadPool {
-    workers: Vec<Worker>,
-}
-
-impl ThreadPool {
-    // --snip--
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        let mut workers = Vec::with_capacity(size);
-
-        for id in 0..size {
-            workers.push(Worker::new(id));
-        }
-
-        ThreadPool {
-            workers
-        }
-    }
-    // --snip--
-}
-
-struct Worker {
-    id: usize,
-    thread: thread::JoinHandle<()>,
-}
-
-impl Worker {
-    fn new(id: usize) -> Worker {
-        let thread = thread::spawn(|| {});
-
-        Worker {
-            id,
-            thread,
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-15/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-15: Modifying `ThreadPool` to hold `Worker`
@@ -668,53 +460,7 @@ the channel.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# use std::thread;
-// --snip--
-use std::sync::mpsc;
-
-pub struct ThreadPool {
-    workers: Vec<Worker>,
-    sender: mpsc::Sender<Job>,
-}
-
-struct Job;
-
-impl ThreadPool {
-    // --snip--
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        let (sender, receiver) = mpsc::channel();
-
-        let mut workers = Vec::with_capacity(size);
-
-        for id in 0..size {
-            workers.push(Worker::new(id));
-        }
-
-        ThreadPool {
-            workers,
-            sender,
-        }
-    }
-    // --snip--
-}
-#
-# struct Worker {
-#     id: usize,
-#     thread: thread::JoinHandle<()>,
-# }
-#
-# impl Worker {
-#     fn new(id: usize) -> Worker {
-#         let thread = thread::spawn(|| {});
-#
-#         Worker {
-#             id,
-#             thread,
-#         }
-#     }
-# }
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-16/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-16: Modifying `ThreadPool` to store the
@@ -731,41 +477,7 @@ the closure. The code in Listing 20-17 won’t quite compile yet.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,does_not_compile
-impl ThreadPool {
-    // --snip--
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        let (sender, receiver) = mpsc::channel();
-
-        let mut workers = Vec::with_capacity(size);
-
-        for id in 0..size {
-            workers.push(Worker::new(id, receiver));
-        }
-
-        ThreadPool {
-            workers,
-            sender,
-        }
-    }
-    // --snip--
-}
-
-// --snip--
-
-impl Worker {
-    fn new(id: usize, receiver: mpsc::Receiver<Job>) -> Worker {
-        let thread = thread::spawn(|| {
-            receiver;
-        });
-
-        Worker {
-            id,
-            thread,
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-17/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-17: Passing the receiving end of the channel
@@ -777,17 +489,7 @@ the channel into `Worker::new`, and then we use it inside the closure.
 When we try to check this code, we get this error:
 
 ```text
-$ cargo check
-   Compiling hello v0.1.0 (file:///projects/hello)
-error[E0382]: use of moved value: `receiver`
-  --> src/lib.rs:27:42
-   |
-27 |             workers.push(Worker::new(id, receiver));
-   |                                          ^^^^^^^^ value moved here in
-   previous iteration of loop
-   |
-   = note: move occurs because `receiver` has type
-   `std::sync::mpsc::Receiver<Job>`, which does not implement the `Copy` trait
+{{#include ../listings/ch20-web-server/listing-20-17/output.txt}}
 ```
 
 The code is trying to pass `receiver` to multiple `Worker` instances. This
@@ -810,60 +512,7 @@ receiver at a time. Listing 20-18 shows the changes we need to make.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# use std::thread;
-# use std::sync::mpsc;
-use std::sync::Arc;
-use std::sync::Mutex;
-// --snip--
-
-# pub struct ThreadPool {
-#     workers: Vec<Worker>,
-#     sender: mpsc::Sender<Job>,
-# }
-# struct Job;
-#
-impl ThreadPool {
-    // --snip--
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        let (sender, receiver) = mpsc::channel();
-
-        let receiver = Arc::new(Mutex::new(receiver));
-
-        let mut workers = Vec::with_capacity(size);
-
-        for id in 0..size {
-            workers.push(Worker::new(id, Arc::clone(&receiver)));
-        }
-
-        ThreadPool {
-            workers,
-            sender,
-        }
-    }
-
-    // --snip--
-}
-
-# struct Worker {
-#     id: usize,
-#     thread: thread::JoinHandle<()>,
-# }
-#
-impl Worker {
-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
-        // --snip--
-#         let thread = thread::spawn(|| {
-#            receiver;
-#         });
-#
-#         Worker {
-#             id,
-#             thread,
-#         }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-18/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-18: Sharing the receiving end of the channel
@@ -887,30 +536,7 @@ at Listing 20-19.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-// --snip--
-# pub struct ThreadPool {
-#     workers: Vec<Worker>,
-#     sender: mpsc::Sender<Job>,
-# }
-# use std::sync::mpsc;
-# struct Worker {}
-
-type Job = Box<dyn FnOnce() + Send + 'static>;
-
-impl ThreadPool {
-    // --snip--
-
-    pub fn execute<F>(&self, f: F)
-        where
-            F: FnOnce() + Send + 'static
-    {
-        let job = Box::new(f);
-
-        self.sender.send(job).unwrap();
-    }
-}
-
-// --snip--
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-19/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-19: Creating a `Job` type alias for a `Box`
@@ -933,27 +559,8 @@ shown in Listing 20-20 to `Worker::new`.
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust,ignore,does_not_compile
-// --snip--
-
-impl Worker {
-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
-        let thread = thread::spawn(move || {
-            loop {
-                let job = receiver.lock().unwrap().recv().unwrap();
-
-                println!("Worker {} got a job; executing.", id);
-
-                job();
-            }
-        });
-
-        Worker {
-            id,
-            thread,
-        }
-    }
-}
+```rust
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-20/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-20: Receiving and executing the jobs in the
@@ -976,39 +583,41 @@ The call to `recv` blocks, so if there is no job yet, the current thread will
 wait until a job becomes available. The `Mutex<T>` ensures that only one
 `Worker` thread at a time is trying to request a job.
 
-
 With the implementation of this trick, our thread pool is in a working state!
 Give it a `cargo run` and make some requests:
 
+<!-- manual-regeneration
+cd listings/ch20-web-server/listing-20-20
+cargo run
+make some requests to 127.0.0.1:7878
+Can't automate because the output depends on making requests
+-->
+
 ```text
 $ cargo run
    Compiling hello v0.1.0 (file:///projects/hello)
-warning: field is never used: `workers`
+warning: field is never read: `workers`
  --> src/lib.rs:7:5
   |
 7 |     workers: Vec<Worker>,
   |     ^^^^^^^^^^^^^^^^^^^^
   |
-  = note: #[warn(dead_code)] on by default
+  = note: `#[warn(dead_code)]` on by default
 
-warning: field is never used: `id`
-  --> src/lib.rs:61:5
+warning: field is never read: `id`
+  --> src/lib.rs:48:5
    |
-61 |     id: usize,
+48 |     id: usize,
    |     ^^^^^^^^^
-   |
-   = note: #[warn(dead_code)] on by default
 
-warning: field is never used: `thread`
-  --> src/lib.rs:62:5
+warning: field is never read: `thread`
+  --> src/lib.rs:49:5
    |
-62 |     thread: thread::JoinHandle<()>,
+49 |     thread: thread::JoinHandle<()>,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: #[warn(dead_code)] on by default
 
-    Finished dev [unoptimized + debuginfo] target(s) in 0.99 secs
-     Running `target/debug/hello`
+    Finished dev [unoptimized + debuginfo] target(s) in 1.40s
+     Running `target/debug/main`
 Worker 0 got a job; executing.
 Worker 2 got a job; executing.
 Worker 1 got a job; executing.
@@ -1038,24 +647,7 @@ why we didn’t write the worker thread code as shown in Listing 20-21.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,not_desired_behavior
-// --snip--
-
-impl Worker {
-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
-        let thread = thread::spawn(move || {
-            while let Ok(job) = receiver.lock().unwrap().recv() {
-                println!("Worker {} got a job; executing.", id);
-
-                job();
-            }
-        });
-
-        Worker {
-            id,
-            thread,
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-21/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-21: An alternative implementation of
@@ -1070,15 +662,15 @@ method returns. At compile time, the borrow checker can then enforce the rule
 that a resource guarded by a `Mutex` cannot be accessed unless we hold the
 lock. But this implementation can also result in the lock being held longer
 than intended if we don’t think carefully about the lifetime of the
-`MutexGuard<T>`. Because the values in the `while` expression remain in scope
-for the duration of the block, the lock remains held for the duration of the
-call to `job()`, meaning other workers cannot receive jobs.
-
-By using `loop` instead and acquiring the lock and a job within the block
-rather than outside it, the `MutexGuard` returned from the `lock` method is
-dropped as soon as the `let job` statement ends. This ensures that the lock is
-held during the call to `recv`, but it is released before the call to
-`job()`, allowing multiple requests to be serviced concurrently.
+`MutexGuard<T>`. Because the values in the `while let` expression remain in
+scope for the duration of the block, the lock remains held for the duration of
+the call to `job()`, meaning other workers cannot receive jobs.
+
+By using `loop` instead and acquiring the lock without assigning to a variable,
+the temporary `MutexGuard` returned from the `lock` method is dropped as soon
+as the `let job` statement ends. This ensures that the lock is held during the
+call to `recv`, but it is released before the call to `job()`, allowing
+multiple requests to be serviced concurrently.
 
 [creating-type-synonyms-with-type-aliases]:
 ch19-04-advanced-types.html#creating-type-synonyms-with-type-aliases
diff --git a/src/doc/book/src/ch20-03-graceful-shutdown-and-cleanup.md b/src/doc/book/src/ch20-03-graceful-shutdown-and-cleanup.md
index 174378b935..13df0492a4 100644
--- a/src/doc/book/src/ch20-03-graceful-shutdown-and-cleanup.md
+++ b/src/doc/book/src/ch20-03-graceful-shutdown-and-cleanup.md
@@ -24,15 +24,7 @@ quite work yet.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore,does_not_compile
-impl Drop for ThreadPool {
-    fn drop(&mut self) {
-        for worker in &mut self.workers {
-            println!("Shutting down worker {}", worker.id);
-
-            worker.thread.join().unwrap();
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-22/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-22: Joining each thread when the thread pool
@@ -48,11 +40,7 @@ into an ungraceful shutdown.
 Here is the error we get when we compile this code:
 
 ```text
-error[E0507]: cannot move out of borrowed content
-  --> src/lib.rs:65:13
-   |
-65 |             worker.thread.join().unwrap();
-   |             ^^^^^^ cannot move out of borrowed content
+{{#include ../listings/ch20-web-server/listing-20-22/output.txt}}
 ```
 
 The error tells us we can’t call `join` because we only have a mutable borrow
@@ -70,37 +58,15 @@ So we know we want to update the definition of `Worker` like this:
 
 <span class="filename">Filename: src/lib.rs</span>
 
-```rust
-# use std::thread;
-struct Worker {
-    id: usize,
-    thread: Option<thread::JoinHandle<()>>,
-}
+```rust,ignore,does_not_compile
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-04-update-worker-definition/src/lib.rs:here}}
 ```
 
 Now let’s lean on the compiler to find the other places that need to change.
 Checking this code, we get two errors:
 
 ```text
-error[E0599]: no method named `join` found for type
-`std::option::Option<std::thread::JoinHandle<()>>` in the current scope
-  --> src/lib.rs:65:27
-   |
-65 |             worker.thread.join().unwrap();
-   |                           ^^^^
-
-error[E0308]: mismatched types
-  --> src/lib.rs:89:13
-   |
-89 |             thread,
-   |             ^^^^^^
-   |             |
-   |             expected enum `std::option::Option`, found struct
-   `std::thread::JoinHandle`
-   |             help: try using a variant of the expected type: `Some(thread)`
-   |
-   = note: expected type `std::option::Option<std::thread::JoinHandle<()>>`
-              found type `std::thread::JoinHandle<_>`
+{{#include ../listings/ch20-web-server/no-listing-04-update-worker-definition/output.txt}}
 ```
 
 Let’s address the second error, which points to the code at the end of
@@ -110,16 +76,7 @@ new `Worker`. Make the following changes to fix this error:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-impl Worker {
-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Job>>>) -> Worker {
-        // --snip--
-
-        Worker {
-            id,
-            thread: Some(thread),
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-05-fix-worker-new/src/lib.rs:here}}
 ```
 
 The first error is in our `Drop` implementation. We mentioned earlier that we
@@ -129,17 +86,7 @@ The following changes will do so:
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-impl Drop for ThreadPool {
-    fn drop(&mut self) {
-        for worker in &mut self.workers {
-            println!("Shutting down worker {}", worker.id);
-
-            if let Some(thread) = worker.thread.take() {
-                thread.join().unwrap();
-            }
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-06-fix-threadpool-drop/src/lib.rs:here}}
 ```
 
 As discussed in Chapter 17, the `take` method on `Option` takes the `Some`
@@ -166,11 +113,7 @@ variants.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-# struct Job;
-enum Message {
-    NewJob(Job),
-    Terminate,
-}
+{{#rustdoc_include ../listings/ch20-web-server/no-listing-07-define-message-enum/src/lib.rs:here}}
 ```
 
 This `Message` enum will either be a `NewJob` variant that holds the `Job` the
@@ -183,57 +126,7 @@ We need to adjust the channel to use values of type `Message` rather than type
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-pub struct ThreadPool {
-    workers: Vec<Worker>,
-    sender: mpsc::Sender<Message>,
-}
-
-// --snip--
-
-impl ThreadPool {
-    // --snip--
-
-    pub fn execute<F>(&self, f: F)
-        where
-            F: FnOnce() + Send + 'static
-    {
-        let job = Box::new(f);
-
-        self.sender.send(Message::NewJob(job)).unwrap();
-    }
-}
-
-// --snip--
-
-impl Worker {
-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) ->
-        Worker {
-
-        let thread = thread::spawn(move ||{
-            loop {
-                let message = receiver.lock().unwrap().recv().unwrap();
-
-                match message {
-                    Message::NewJob(job) => {
-                        println!("Worker {} got a job; executing.", id);
-
-                        job();
-                    },
-                    Message::Terminate => {
-                        println!("Worker {} was told to terminate.", id);
-
-                        break;
-                    },
-                }
-            }
-        });
-
-        Worker {
-            id,
-            thread: Some(thread),
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-23/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-23: Sending and receiving `Message` values and
@@ -255,25 +148,7 @@ changing our `Drop` implementation to look like Listing 20-24.
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust,ignore
-impl Drop for ThreadPool {
-    fn drop(&mut self) {
-        println!("Sending terminate message to all workers.");
-
-        for _ in &mut self.workers {
-            self.sender.send(Message::Terminate).unwrap();
-        }
-
-        println!("Shutting down all workers.");
-
-        for worker in &mut self.workers {
-            println!("Shutting down worker {}", worker.id);
-
-            if let Some(thread) = worker.thread.take() {
-                thread.join().unwrap();
-            }
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-24/src/lib.rs:here}}
 ```
 
 <span class="caption">Listing 20-24: Sending `Message::Terminate` to the
@@ -307,20 +182,7 @@ before gracefully shutting down the server, as shown in Listing 20-25.
 <span class="filename">Filename: src/bin/main.rs</span>
 
 ```rust,ignore
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
-    let pool = ThreadPool::new(4);
-
-    for stream in listener.incoming().take(2) {
-        let stream = stream.unwrap();
-
-        pool.execute(|| {
-            handle_connection(stream);
-        });
-    }
-
-    println!("Shutting down.");
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-25/src/bin/main.rs:here}}
 ```
 
 <span class="caption">Listing 20-25: Shut down the server after serving two
@@ -337,11 +199,22 @@ end of `main`, and the `drop` implementation will run.
 Start the server with `cargo run`, and make three requests. The third request
 should error, and in your terminal you should see output similar to this:
 
+<!-- manual-regeneration
+cd listings/ch20-web-server/listing-20-25
+cargo run
+curl http://127.0.0.1:7878
+curl http://127.0.0.1:7878
+curl http://127.0.0.1:7878
+third request will error because server will have shut down
+copy output below
+Can't automate because the output depends on making requests
+-->
+
 ```text
 $ cargo run
    Compiling hello v0.1.0 (file:///projects/hello)
-    Finished dev [unoptimized + debuginfo] target(s) in 1.0 secs
-     Running `target/debug/hello`
+    Finished dev [unoptimized + debuginfo] target(s) in 1.0s
+     Running `target/debug/main`
 Worker 0 got a job; executing.
 Worker 3 got a job; executing.
 Shutting down.
@@ -383,166 +256,13 @@ Here’s the full code for reference:
 <span class="filename">Filename: src/bin/main.rs</span>
 
 ```rust,ignore
-use hello::ThreadPool;
-
-use std::io::prelude::*;
-use std::net::TcpListener;
-use std::net::TcpStream;
-use std::fs;
-use std::thread;
-use std::time::Duration;
-
-fn main() {
-    let listener = TcpListener::bind("127.0.0.1:7878").unwrap();
-    let pool = ThreadPool::new(4);
-
-    for stream in listener.incoming().take(2) {
-        let stream = stream.unwrap();
-
-        pool.execute(|| {
-            handle_connection(stream);
-        });
-    }
-
-    println!("Shutting down.");
-}
-
-fn handle_connection(mut stream: TcpStream) {
-    let mut buffer = [0; 512];
-    stream.read(&mut buffer).unwrap();
-
-    let get = b"GET / HTTP/1.1\r\n";
-    let sleep = b"GET /sleep HTTP/1.1\r\n";
-
-    let (status_line, filename) = if buffer.starts_with(get) {
-        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
-    } else if buffer.starts_with(sleep) {
-        thread::sleep(Duration::from_secs(5));
-        ("HTTP/1.1 200 OK\r\n\r\n", "hello.html")
-    } else {
-        ("HTTP/1.1 404 NOT FOUND\r\n\r\n", "404.html")
-    };
-
-    let contents = fs::read_to_string(filename).unwrap();
-
-    let response = format!("{}{}", status_line, contents);
-
-    stream.write(response.as_bytes()).unwrap();
-    stream.flush().unwrap();
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-25/src/bin/main.rs:all}}
 ```
 
 <span class="filename">Filename: src/lib.rs</span>
 
 ```rust
-use std::thread;
-use std::sync::mpsc;
-use std::sync::Arc;
-use std::sync::Mutex;
-
-enum Message {
-    NewJob(Job),
-    Terminate,
-}
-
-pub struct ThreadPool {
-    workers: Vec<Worker>,
-    sender: mpsc::Sender<Message>,
-}
-
-type Job = Box<dyn FnOnce() + Send + 'static>;
-
-impl ThreadPool {
-    /// Create a new ThreadPool.
-    ///
-    /// The size is the number of threads in the pool.
-    ///
-    /// # Panics
-    ///
-    /// The `new` function will panic if the size is zero.
-    pub fn new(size: usize) -> ThreadPool {
-        assert!(size > 0);
-
-        let (sender, receiver) = mpsc::channel();
-
-        let receiver = Arc::new(Mutex::new(receiver));
-
-        let mut workers = Vec::with_capacity(size);
-
-        for id in 0..size {
-            workers.push(Worker::new(id, Arc::clone(&receiver)));
-        }
-
-        ThreadPool {
-            workers,
-            sender,
-        }
-    }
-
-    pub fn execute<F>(&self, f: F)
-        where
-            F: FnOnce() + Send + 'static
-    {
-        let job = Box::new(f);
-
-        self.sender.send(Message::NewJob(job)).unwrap();
-    }
-}
-
-impl Drop for ThreadPool {
-    fn drop(&mut self) {
-        println!("Sending terminate message to all workers.");
-
-        for _ in &mut self.workers {
-            self.sender.send(Message::Terminate).unwrap();
-        }
-
-        println!("Shutting down all workers.");
-
-        for worker in &mut self.workers {
-            println!("Shutting down worker {}", worker.id);
-
-            if let Some(thread) = worker.thread.take() {
-                thread.join().unwrap();
-            }
-        }
-    }
-}
-
-struct Worker {
-    id: usize,
-    thread: Option<thread::JoinHandle<()>>,
-}
-
-impl Worker {
-    fn new(id: usize, receiver: Arc<Mutex<mpsc::Receiver<Message>>>) ->
-        Worker {
-
-        let thread = thread::spawn(move ||{
-            loop {
-                let message = receiver.lock().unwrap().recv().unwrap();
-
-                match message {
-                    Message::NewJob(job) => {
-                        println!("Worker {} got a job; executing.", id);
-
-                        job();
-                    },
-                    Message::Terminate => {
-                        println!("Worker {} was told to terminate.", id);
-
-                        break;
-                    },
-                }
-            }
-        });
-
-        Worker {
-            id,
-            thread: Some(thread),
-        }
-    }
-}
+{{#rustdoc_include ../listings/ch20-web-server/listing-20-25/src/lib.rs:here}}
 ```
 
 We could do more here! If you want to continue enhancing this project, here are
diff --git a/src/doc/book/src/title-page.md b/src/doc/book/src/title-page.md
index 5e375d31b4..c1cb567109 100644
--- a/src/doc/book/src/title-page.md
+++ b/src/doc/book/src/title-page.md
@@ -2,7 +2,7 @@
 
 *by Steve Klabnik and Carol Nichols, with contributions from the Rust Community*
 
-This version of the text assumes you’re using Rust 1.37.0 or later with
+This version of the text assumes you’re using Rust 1.41.0 or later with
 `edition="2018"` in *Cargo.toml* of all projects to use Rust 2018 Edition
 idioms. See the [“Installation” section of Chapter 1][install]<!-- ignore -->
 to install or update Rust, and see the new [Appendix E][editions]<!-- ignore
diff --git a/src/doc/book/tools/nostarch.sh b/src/doc/book/tools/nostarch.sh
index 6c4173a01c..d802bf0703 100755
--- a/src/doc/book/tools/nostarch.sh
+++ b/src/doc/book/tools/nostarch.sh
@@ -6,19 +6,22 @@ cargo build --release
 
 mkdir -p tmp
 rm -rf tmp/*.md
+rm -rf tmp/markdown
 
-# Get all the Markdown files in the src dir,
-ls src/${1:-""}*.md | \
-# except for `SUMMARY.md`.
-grep -v SUMMARY.md | \
+# Render the book as Markdown to include all the code listings
+MDBOOK_OUTPUT__MARKDOWN=1 mdbook build -d tmp
+
+# Get all the Markdown files
+ls tmp/markdown/${1:-""}*.md | \
 # Extract just the filename so we can reuse it easily.
 xargs -n 1 basename | \
 # Remove all links followed by `<!-- ignore -->``, then
 # Change all remaining links from Markdown to italicized inline text.
 while IFS= read -r filename; do
-  < "src/$filename" ./target/release/remove_links \
+  < "tmp/markdown/$filename" ./target/release/remove_links \
     | ./target/release/link2print \
-    | ./target/release/remove_markup > "tmp/$filename"
+    | ./target/release/remove_markup \
+    | ./target/release/remove_hidden_lines > "tmp/$filename"
 done
 # Concatenate the files into the `nostarch` dir.
 ./target/release/concat_chapters tmp nostarch
diff --git a/src/doc/book/tools/src/bin/concat_chapters.rs b/src/doc/book/tools/src/bin/concat_chapters.rs
index ed992ec906..71fd86f054 100644
--- a/src/doc/book/tools/src/bin/concat_chapters.rs
+++ b/src/doc/book/tools/src/bin/concat_chapters.rs
@@ -1,13 +1,13 @@
-#[macro_use] extern crate lazy_static;
-
+#[macro_use]
+extern crate lazy_static;
 
+use std::collections::BTreeMap;
 use std::env;
+use std::fs::{create_dir, read_dir, File};
 use std::io;
 use std::io::{Read, Write};
-use std::process::exit;
-use std::fs::{create_dir, read_dir, File};
 use std::path::{Path, PathBuf};
-use std::collections::BTreeMap;
+use std::process::exit;
 
 use regex::Regex;
 
@@ -18,7 +18,8 @@ static PATTERNS: &'static [(&'static str, &'static str)] = &[
 
 lazy_static! {
     static ref MATCHERS: Vec<(Regex, &'static str)> = {
-        PATTERNS.iter()
+        PATTERNS
+            .iter()
             .map(|&(expr, repl)| (Regex::new(expr).unwrap(), repl))
             .collect()
     };
@@ -43,19 +44,24 @@ fn main() {
     }
 }
 
-fn match_files(source_dir: &Path, target_dir: &Path) -> Vec<(PathBuf, PathBuf)> {
+fn match_files(
+    source_dir: &Path,
+    target_dir: &Path,
+) -> Vec<(PathBuf, PathBuf)> {
     read_dir(source_dir)
         .expect("Unable to read source directory")
         .filter_map(|maybe_entry| maybe_entry.ok())
         .filter_map(|entry| {
             let source_filename = entry.file_name();
-            let source_filename = &source_filename.to_string_lossy().into_owned();
+            let source_filename =
+                &source_filename.to_string_lossy().into_owned();
             for &(ref regex, replacement) in MATCHERS.iter() {
                 if regex.is_match(source_filename) {
-                    let target_filename = regex.replace_all(source_filename, replacement);
+                    let target_filename =
+                        regex.replace_all(source_filename, replacement);
                     let source_path = entry.path();
                     let mut target_path = PathBuf::from(&target_dir);
-                    target_path.push(target_filename);
+                    target_path.push(target_filename.to_string());
                     return Some((source_path, target_path));
                 }
             }
@@ -64,7 +70,9 @@ fn match_files(source_dir: &Path, target_dir: &Path) -> Vec<(PathBuf, PathBuf)>
         .collect()
 }
 
-fn group_by_target(matched_files: Vec<(PathBuf, PathBuf)>) -> BTreeMap<PathBuf, Vec<PathBuf>> {
+fn group_by_target(
+    matched_files: Vec<(PathBuf, PathBuf)>,
+) -> BTreeMap<PathBuf, Vec<PathBuf>> {
     let mut grouped: BTreeMap<PathBuf, Vec<PathBuf>> = BTreeMap::new();
     for (source, target) in matched_files {
         if let Some(source_paths) = grouped.get_mut(&target) {
@@ -77,7 +85,10 @@ fn group_by_target(matched_files: Vec<(PathBuf, PathBuf)>) -> BTreeMap<PathBuf,
     grouped
 }
 
-fn concat_files(source_paths: Vec<PathBuf>, target_path: PathBuf) -> io::Result<()> {
+fn concat_files(
+    source_paths: Vec<PathBuf>,
+    target_path: PathBuf,
+) -> io::Result<()> {
     println!("Concatenating into {}:", target_path.to_string_lossy());
     let mut target = File::create(target_path)?;
     target.write_all(b"\n[TOC]\n")?;
diff --git a/src/doc/book/tools/src/bin/convert_quotes.rs b/src/doc/book/tools/src/bin/convert_quotes.rs
index 027d458d9b..e548c5e075 100644
--- a/src/doc/book/tools/src/bin/convert_quotes.rs
+++ b/src/doc/book/tools/src/bin/convert_quotes.rs
@@ -12,7 +12,6 @@ fn main() {
     }
 
     for line in buffer.lines() {
-
         if line.is_empty() {
             is_in_inline_code = false;
         }
@@ -42,29 +41,34 @@ fn main() {
                 }
 
                 // Replace with right/left apostrophe/quote.
-                let char_to_push =
-                    if possible_match == '\'' && !is_in_inline_code && !is_in_html_tag {
-                        if (previous_char != std::char::REPLACEMENT_CHARACTER &&
-                                !previous_char.is_whitespace()) ||
-                            previous_char == '‘'
-                        {
-                            '’'
-                        } else {
-                            '‘'
-                        }
-                    } else if possible_match == '"' && !is_in_inline_code && !is_in_html_tag {
-                        if (previous_char != std::char::REPLACEMENT_CHARACTER &&
-                                !previous_char.is_whitespace()) ||
-                            previous_char == '“'
-                        {
-                            '”'
-                        } else {
-                            '“'
-                        }
+                let char_to_push = if possible_match == '\''
+                    && !is_in_inline_code
+                    && !is_in_html_tag
+                {
+                    if (previous_char != std::char::REPLACEMENT_CHARACTER
+                        && !previous_char.is_whitespace())
+                        || previous_char == '‘'
+                    {
+                        '’'
+                    } else {
+                        '‘'
+                    }
+                } else if possible_match == '"'
+                    && !is_in_inline_code
+                    && !is_in_html_tag
+                {
+                    if (previous_char != std::char::REPLACEMENT_CHARACTER
+                        && !previous_char.is_whitespace())
+                        || previous_char == '“'
+                    {
+                        '”'
                     } else {
-                        // Leave untouched.
-                        possible_match
-                    };
+                        '“'
+                    }
+                } else {
+                    // Leave untouched.
+                    possible_match
+                };
                 modified_line.push(char_to_push);
                 previous_char = char_to_push;
             }
diff --git a/src/doc/book/tools/src/bin/lfp.rs b/src/doc/book/tools/src/bin/lfp.rs
index 32b2ab2975..caab7b26e5 100644
--- a/src/doc/book/tools/src/bin/lfp.rs
+++ b/src/doc/book/tools/src/bin/lfp.rs
@@ -1,30 +1,25 @@
 // We have some long regex literals, so:
 // ignore-tidy-linelength
 
-extern crate docopt;
-extern crate rustc_serialize;
-extern crate walkdir;
-
 use docopt::Docopt;
-use std::{path, fs, io};
+use serde::Deserialize;
 use std::io::BufRead;
+use std::{fs, io, path};
 
-fn main () {
+fn main() {
     let args: Args = Docopt::new(USAGE)
-    .and_then(|d| d.decode())
-    .unwrap_or_else(|e| e.exit());
+        .and_then(|d| d.deserialize())
+        .unwrap_or_else(|e| e.exit());
 
     let src_dir = &path::Path::new(&args.arg_src_dir);
     let found_errs = walkdir::WalkDir::new(src_dir)
         .min_depth(1)
         .into_iter()
-        .map(|entry| {
-            match entry {
-                Ok(entry) => entry,
-                Err(err) => {
-                    eprintln!("{:?}", err);
-                    std::process::exit(911)
-                },
+        .map(|entry| match entry {
+            Ok(entry) => entry,
+            Err(err) => {
+                eprintln!("{:?}", err);
+                std::process::exit(911)
             }
         })
         .map(|entry| {
@@ -33,10 +28,17 @@ fn main () {
                 let err_vec = lint_file(path);
                 for err in &err_vec {
                     match *err {
-                        LintingError::LineOfInterest(line_num, ref line) =>
-                            eprintln!("{}:{}\t{}", path.display(), line_num, line),
-                        LintingError::UnableToOpenFile =>
-                            eprintln!("Unable to open {}.", path.display()),
+                        LintingError::LineOfInterest(line_num, ref line) => {
+                            eprintln!(
+                                "{}:{}\t{}",
+                                path.display(),
+                                line_num,
+                                line
+                            )
+                        }
+                        LintingError::UnableToOpenFile => {
+                            eprintln!("Unable to open {}.", path.display())
+                        }
                     }
                 }
                 !err_vec.is_empty()
@@ -64,7 +66,7 @@ Options:
   -h --help         Show this screen.
 ";
 
-#[derive(Debug, RustcDecodable)]
+#[derive(Debug, Deserialize)]
 struct Args {
     arg_src_dir: String,
 }
@@ -77,7 +79,9 @@ fn lint_file(path: &path::Path) -> Vec<LintingError> {
 }
 
 fn lint_lines<I>(lines: I) -> Vec<LintingError>
-    where I: Iterator<Item=io::Result<String>> {
+where
+    I: Iterator<Item = io::Result<String>>,
+{
     lines
         .enumerate()
         .map(|(line_num, line)| {
@@ -94,16 +98,16 @@ fn lint_lines<I>(lines: I) -> Vec<LintingError>
 }
 
 fn is_file_of_interest(path: &path::Path) -> bool {
-    path.extension()
-        .map_or(false, |ext| ext == "md")
+    path.extension().map_or(false, |ext| ext == "md")
 }
 
 fn is_line_of_interest(line: &str) -> bool {
-    !line.split_whitespace()
-        .filter(|sub_string|
-            sub_string.contains("file://") &&
-            !sub_string.contains("file:///projects/")
-        )
+    !line
+        .split_whitespace()
+        .filter(|sub_string| {
+            sub_string.contains("file://")
+                && !sub_string.contains("file:///projects/")
+        })
         .collect::<Vec<_>>()
         .is_empty()
 }
@@ -111,7 +115,7 @@ fn is_line_of_interest(line: &str) -> bool {
 #[derive(Debug)]
 enum LintingError {
     UnableToOpenFile,
-    LineOfInterest(usize, String)
+    LineOfInterest(usize, String),
 }
 
 #[cfg(test)]
@@ -162,9 +166,7 @@ mod tests {
         "#;
 
         let raw_lines = string.to_string();
-        let lines = raw_lines.lines().map(|line| {
-            Ok(line.to_string())
-        });
+        let lines = raw_lines.lines().map(|line| Ok(line.to_string()));
 
         let result_vec = super::lint_lines(lines);
 
@@ -197,9 +199,7 @@ mod tests {
         "#;
 
         let raw_lines = string.to_string();
-        let lines = raw_lines.lines().map(|line| {
-            Ok(line.to_string())
-        });
+        let lines = raw_lines.lines().map(|line| Ok(line.to_string()));
 
         let result_vec = super::lint_lines(lines);
 
@@ -210,32 +210,41 @@ mod tests {
     fn is_file_of_interest_returns_false_when_the_path_is_a_directory() {
         let uninteresting_fn = "src/img";
 
-        assert!(!super::is_file_of_interest(path::Path::new(uninteresting_fn)));
+        assert!(!super::is_file_of_interest(path::Path::new(
+            uninteresting_fn
+        )));
     }
 
     #[test]
-    fn is_file_of_interest_returns_false_when_the_filename_does_not_have_the_md_extension() {
+    fn is_file_of_interest_returns_false_when_the_filename_does_not_have_the_md_extension(
+    ) {
         let uninteresting_fn = "src/img/foo1.png";
 
-        assert!(!super::is_file_of_interest(path::Path::new(uninteresting_fn)));
+        assert!(!super::is_file_of_interest(path::Path::new(
+            uninteresting_fn
+        )));
     }
 
     #[test]
-    fn is_file_of_interest_returns_true_when_the_filename_has_the_md_extension() {
+    fn is_file_of_interest_returns_true_when_the_filename_has_the_md_extension()
+    {
         let interesting_fn = "src/ch01-00-introduction.md";
 
         assert!(super::is_file_of_interest(path::Path::new(interesting_fn)));
     }
 
     #[test]
-    fn is_line_of_interest_does_not_report_a_line_if_the_line_contains_a_file_url_which_is_directly_followed_by_the_project_path() {
-        let sample_line = "Compiling guessing_game v0.1.0 (file:///projects/guessing_game)";
+    fn is_line_of_interest_does_not_report_a_line_if_the_line_contains_a_file_url_which_is_directly_followed_by_the_project_path(
+    ) {
+        let sample_line =
+            "Compiling guessing_game v0.1.0 (file:///projects/guessing_game)";
 
         assert!(!super::is_line_of_interest(sample_line));
     }
 
     #[test]
-    fn is_line_of_interest_reports_a_line_if_the_line_contains_a_file_url_which_is_not_directly_followed_by_the_project_path() {
+    fn is_line_of_interest_reports_a_line_if_the_line_contains_a_file_url_which_is_not_directly_followed_by_the_project_path(
+    ) {
         let sample_line = "Compiling guessing_game v0.1.0 (file:///home/you/projects/guessing_game)";
 
         assert!(super::is_line_of_interest(sample_line));
diff --git a/src/doc/book/tools/src/bin/link2print.rs b/src/doc/book/tools/src/bin/link2print.rs
index 0d6d2f654a..33d90ec240 100644
--- a/src/doc/book/tools/src/bin/link2print.rs
+++ b/src/doc/book/tools/src/bin/link2print.rs
@@ -1,12 +1,10 @@
 // FIXME: we have some long lines that could be refactored, but it's not a big deal.
 // ignore-tidy-linelength
 
-
-
+use regex::{Captures, Regex};
 use std::collections::HashMap;
 use std::io;
 use std::io::{Read, Write};
-use regex::{Regex, Captures};
 
 fn main() {
     write_md(parse_links(parse_references(read_md())));
@@ -27,27 +25,29 @@ fn write_md(output: String) {
 fn parse_references(buffer: String) -> (String, HashMap<String, String>) {
     let mut ref_map = HashMap::new();
     // FIXME: currently doesn't handle "title" in following line.
-    let re = Regex::new(r###"(?m)\n?^ {0,3}\[([^]]+)\]:[[:blank:]]*(.*)$"###).unwrap();
+    let re = Regex::new(r###"(?m)\n?^ {0,3}\[([^]]+)\]:[[:blank:]]*(.*)$"###)
+        .unwrap();
     let output = re.replace_all(&buffer, |caps: &Captures<'_>| {
-        let key = caps.at(1).unwrap().to_owned().to_uppercase();
-        let val = caps.at(2).unwrap().to_owned();
+        let key = caps.get(1).unwrap().as_str().to_uppercase();
+        let val = caps.get(2).unwrap().as_str().to_string();
         if ref_map.insert(key, val).is_some() {
             panic!("Did not expect markdown page to have duplicate reference");
         }
         "".to_string()
-    });
+    }).to_string();
     (output, ref_map)
 }
 
 fn parse_links((buffer, ref_map): (String, HashMap<String, String>)) -> String {
     // FIXME: check which punctuation is allowed by spec.
-    let re = Regex::new(r###"(?:(?P<pre>(?:```(?:[^`]|`[^`])*`?\n```\n)|(?:[^[]`[^`\n]+[\n]?[^`\n]*`))|(?:\[(?P<name>[^]]+)\](?:(?:\([[:blank:]]*(?P<val>[^")]*[^ ])(?:[[:blank:]]*"[^"]*")?\))|(?:\[(?P<key>[^]]*)\]))?))"###).expect("could not create regex");
-    let error_code = Regex::new(r###"^E\d{4}$"###).expect("could not create regex");
+    let re = Regex::new(r###"(?:(?P<pre>(?:```(?:[^`]|`[^`])*`?\n```\n)|(?:[^\[]`[^`\n]+[\n]?[^`\n]*`))|(?:\[(?P<name>[^]]+)\](?:(?:\([[:blank:]]*(?P<val>[^")]*[^ ])(?:[[:blank:]]*"[^"]*")?\))|(?:\[(?P<key>[^]]*)\]))?))"###).expect("could not create regex");
+    let error_code =
+        Regex::new(r###"^E\d{4}$"###).expect("could not create regex");
     let output = re.replace_all(&buffer, |caps: &Captures<'_>| {
         match caps.name("pre") {
-            Some(pre_section) => format!("{}", pre_section.to_owned()),
+            Some(pre_section) => format!("{}", pre_section.as_str()),
             None => {
-                let name = caps.name("name").expect("could not get name").to_owned();
+                let name = caps.name("name").expect("could not get name").as_str();
                 // Really we should ignore text inside code blocks,
                 // this is a hack to not try to treat `#[derive()]`,
                 // `[profile]`, `[test]`, or `[E\d\d\d\d]` like a link.
@@ -55,21 +55,21 @@ fn parse_links((buffer, ref_map): (String, HashMap<String, String>)) -> String {
                    name.starts_with("profile") ||
                    name.starts_with("test") ||
                    name.starts_with("no_mangle") ||
-                   error_code.is_match(&name) {
-                    return name
+                   error_code.is_match(name) {
+                    return name.to_string()
                 }
 
                 let val = match caps.name("val") {
                     // `[name](link)`
-                    Some(value) => value.to_owned(),
+                    Some(value) => value.as_str().to_string(),
                     None => {
                         match caps.name("key") {
                             Some(key) => {
-                                match key {
+                                match key.as_str() {
                                     // `[name][]`
                                     "" => format!("{}", ref_map.get(&name.to_uppercase()).expect(&format!("could not find url for the link text `{}`", name))),
                                     // `[name][reference]`
-                                    _ => format!("{}", ref_map.get(&key.to_uppercase()).expect(&format!("could not find url for the link text `{}`", key))),
+                                    _ => format!("{}", ref_map.get(&key.as_str().to_uppercase()).expect(&format!("could not find url for the link text `{}`", key.as_str()))),
                                 }
                             }
                             // `[name]` as reference
@@ -81,7 +81,7 @@ fn parse_links((buffer, ref_map): (String, HashMap<String, String>)) -> String {
             }
         }
     });
-    output
+    output.to_string()
 }
 
 #[cfg(test)]
@@ -92,8 +92,12 @@ mod tests {
 
     #[test]
     fn parses_inline_link() {
-        let source = r"This is a [link](http://google.com) that should be expanded".to_string();
-        let target = r"This is a link at *http://google.com* that should be expanded".to_string();
+        let source =
+            r"This is a [link](http://google.com) that should be expanded"
+                .to_string();
+        let target =
+            r"This is a link at *http://google.com* that should be expanded"
+                .to_string();
         assert_eq!(parse(source), target);
     }
 
@@ -167,14 +171,18 @@ more text"
 
     #[test]
     fn ignores_optional_inline_title() {
-        let source = r###"This is a titled [link](http://example.com "My title")."###.to_string();
-        let target = r"This is a titled link at *http://example.com*.".to_string();
+        let source =
+            r###"This is a titled [link](http://example.com "My title")."###
+                .to_string();
+        let target =
+            r"This is a titled link at *http://example.com*.".to_string();
         assert_eq!(parse(source), target);
     }
 
     #[test]
     fn parses_title_with_puctuation() {
-        let source = r###"[link](http://example.com "It's Title")"###.to_string();
+        let source =
+            r###"[link](http://example.com "It's Title")"###.to_string();
         let target = r"link at *http://example.com*".to_string();
         assert_eq!(parse(source), target);
     }
@@ -188,11 +196,11 @@ more text"
     #[test]
     fn parses_name_with_utf8() {
         let source = r###"[user’s forum](the user’s forum)"###.to_string();
-        let target = r###"user’s forum at *the user’s forum*"###.to_string();
+        let target =
+            r###"user’s forum at *the user’s forum*"###.to_string();
         assert_eq!(parse(source), target);
     }
 
-
     #[test]
     fn parses_reference_with_punctuation() {
         let source = r###"[link][the ref-ref]
@@ -248,7 +256,7 @@ authors = ["Your Name <you@example.com>"]
 [dependencies]
 ```
 "###
-            .to_string();
+        .to_string();
         let target = source.clone();
         assert_eq!(parse(source), target);
     }
@@ -284,7 +292,7 @@ Another [link]
 more text
 [link]: http://gohere
 "###
-            .to_string();
+        .to_string();
         let target = r###"```toml
 [package]
 name = "hello_cargo"
@@ -296,7 +304,7 @@ authors = ["Your Name <you@example.com>"]
 Another link at *http://gohere*
 more text
 "###
-            .to_string();
+        .to_string();
         assert_eq!(parse(source), target);
     }
     #[test]
diff --git a/src/doc/book/tools/src/bin/release_listings.rs b/src/doc/book/tools/src/bin/release_listings.rs
new file mode 100644
index 0000000000..56a38e020c
--- /dev/null
+++ b/src/doc/book/tools/src/bin/release_listings.rs
@@ -0,0 +1,159 @@
+#[macro_use]
+extern crate lazy_static;
+
+use regex::Regex;
+use std::error::Error;
+use std::fs;
+use std::fs::File;
+use std::io::prelude::*;
+use std::io::{BufReader, BufWriter};
+use std::path::{Path, PathBuf};
+
+fn main() -> Result<(), Box<dyn Error>> {
+    // Get all listings from the `listings` directory
+    let listings_dir = Path::new("listings");
+
+    // Put the results in the `tmp/listings` directory
+    let out_dir = Path::new("tmp/listings");
+
+    // Clear out any existing content in `tmp/listings`
+    if out_dir.is_dir() {
+        fs::remove_dir_all(out_dir)?;
+    }
+
+    // Create a new, empty `tmp/listings` directory
+    fs::create_dir(out_dir)?;
+
+    // For each chapter in the `listings` directory,
+    for chapter in fs::read_dir(listings_dir)? {
+        let chapter = chapter?;
+        let chapter_path = chapter.path();
+
+        let chapter_name = chapter_path
+            .file_name()
+            .expect("Chapter should've had a name");
+
+        // Create a corresponding chapter dir in `tmp/listings`
+        let output_chapter_path = out_dir.join(chapter_name);
+        fs::create_dir(&output_chapter_path)?;
+
+        // For each listing in the chapter directory,
+        for listing in fs::read_dir(chapter_path)? {
+            let listing = listing?;
+            let listing_path = listing.path();
+
+            let listing_name = listing_path
+                .file_name()
+                .expect("Listing should've had a name");
+
+            // Create a corresponding listing dir in the tmp chapter dir
+            let output_listing_dir = output_chapter_path.join(listing_name);
+            fs::create_dir(&output_listing_dir)?;
+
+            // Copy all the cleaned files in the listing to the tmp directory
+            copy_cleaned_listing_files(listing_path, output_listing_dir)?;
+        }
+    }
+
+    // Create a compressed archive of all the listings
+    let tarfile = File::create("tmp/listings.tar.gz")?;
+    let encoder =
+        flate2::write::GzEncoder::new(tarfile, flate2::Compression::default());
+    let mut archive = tar::Builder::new(encoder);
+    archive.append_dir_all("listings", "tmp/listings")?;
+
+    // Assure whoever is running this that the script exiting successfully, and remind them
+    // where the generated file ends up
+    println!("Release tarball of listings in tmp/listings.tar.gz");
+
+    Ok(())
+}
+
+// Cleaned listings will not contain:
+//
+// - `target` directories
+// - `output.txt` files used to display output in the book
+// - `rustfmt-ignore` files used to signal to update-rustc.sh the listing shouldn't be formatted
+// - anchor comments or snip comments
+// - empty `main` functions in `lib.rs` files used to trick rustdoc
+fn copy_cleaned_listing_files(
+    from: PathBuf,
+    to: PathBuf,
+) -> Result<(), Box<dyn Error>> {
+    for item in fs::read_dir(from)? {
+        let item = item?;
+        let item_path = item.path();
+
+        let item_name =
+            item_path.file_name().expect("Item should've had a name");
+        let output_item = to.join(item_name);
+
+        if item_path.is_dir() {
+            // Don't copy `target` directories
+            if item_name != "target" {
+                fs::create_dir(&output_item)?;
+                copy_cleaned_listing_files(item_path, output_item)?;
+            }
+        } else {
+            // Don't copy output files or files that tell update-rustc.sh not to format
+            if item_name != "output.txt" && item_name != "rustfmt-ignore" {
+                let item_extension = item_path.extension();
+                if item_extension.is_some() && item_extension.unwrap() == "rs" {
+                    copy_cleaned_rust_file(
+                        item_name,
+                        &item_path,
+                        &output_item,
+                    )?;
+                } else {
+                    // Copy any non-Rust files without modification
+                    fs::copy(item_path, output_item)?;
+                }
+            }
+        }
+    }
+
+    Ok(())
+}
+
+lazy_static! {
+    static ref ANCHOR_OR_SNIP_COMMENTS: Regex = Regex::new(
+        r"(?x)
+    //\s*ANCHOR:\s*[\w_-]+      # Remove all anchor comments
+    |
+    //\s*ANCHOR_END:\s*[\w_-]+  # Remove all anchor ending comments
+    |
+    //\s*--snip--               # Remove all snip comments
+    "
+    )
+    .unwrap();
+}
+
+lazy_static! {
+    static ref EMPTY_MAIN: Regex = Regex::new(r"fn main\(\) \{}").unwrap();
+}
+
+// Cleaned Rust files will not contain:
+//
+// - anchor comments or snip comments
+// - empty `main` functions in `lib.rs` files used to trick rustdoc
+fn copy_cleaned_rust_file(
+    item_name: &std::ffi::OsStr,
+    from: &PathBuf,
+    to: &PathBuf,
+) -> Result<(), Box<dyn Error>> {
+    let from_buf = BufReader::new(File::open(from)?);
+    let mut to_buf = BufWriter::new(File::create(to)?);
+
+    for line in from_buf.lines() {
+        let line = line?;
+        if !ANCHOR_OR_SNIP_COMMENTS.is_match(&line) {
+            if item_name != "lib.rs" || !EMPTY_MAIN.is_match(&line) {
+                writeln!(&mut to_buf, "{}", line)?;
+            }
+        }
+    }
+
+    to_buf.flush()?;
+
+    Ok(())
+}
diff --git a/src/doc/book/tools/src/bin/remove_hidden_lines.rs b/src/doc/book/tools/src/bin/remove_hidden_lines.rs
new file mode 100644
index 0000000000..fa3b705210
--- /dev/null
+++ b/src/doc/book/tools/src/bin/remove_hidden_lines.rs
@@ -0,0 +1,83 @@
+use std::io;
+use std::io::prelude::*;
+
+fn main() {
+    write_md(remove_hidden_lines(&read_md()));
+}
+
+fn read_md() -> String {
+    let mut buffer = String::new();
+    match io::stdin().read_to_string(&mut buffer) {
+        Ok(_) => buffer,
+        Err(error) => panic!(error),
+    }
+}
+
+fn write_md(output: String) {
+    write!(io::stdout(), "{}", output).unwrap();
+}
+
+fn remove_hidden_lines(input: &str) -> String {
+    let mut resulting_lines = vec![];
+    let mut within_codeblock = false;
+
+    for line in input.lines() {
+        if line.starts_with("```") {
+            within_codeblock = !within_codeblock;
+        }
+
+        if !within_codeblock || (!line.starts_with("# ") && line != "#") {
+            resulting_lines.push(line)
+        }
+    }
+
+    resulting_lines.join("\n")
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::remove_hidden_lines;
+
+    #[test]
+    fn hidden_line_in_code_block_is_removed() {
+        let input = r#"
+In this listing:
+
+```
+fn main() {
+# secret
+}
+```
+
+you can see that...
+        "#;
+        let output = remove_hidden_lines(input);
+
+        let desired_output = r#"
+In this listing:
+
+```
+fn main() {
+}
+```
+
+you can see that...
+        "#;
+
+        assert_eq!(output, desired_output);
+    }
+
+    #[test]
+    fn headings_arent_removed() {
+        let input = r#"
+# Heading 1
+        "#;
+        let output = remove_hidden_lines(input);
+
+        let desired_output = r#"
+# Heading 1
+        "#;
+
+        assert_eq!(output, desired_output);
+    }
+}
diff --git a/src/doc/book/tools/src/bin/remove_links.rs b/src/doc/book/tools/src/bin/remove_links.rs
index b31d7dc615..a096389b83 100644
--- a/src/doc/book/tools/src/bin/remove_links.rs
+++ b/src/doc/book/tools/src/bin/remove_links.rs
@@ -1,11 +1,11 @@
 extern crate regex;
 
+use regex::{Captures, Regex};
 use std::collections::HashSet;
 use std::io;
 use std::io::{Read, Write};
-use regex::{Regex, Captures};
 
-fn main () {
+fn main() {
     let mut buffer = String::new();
     if let Err(e) = io::stdin().read_to_string(&mut buffer) {
         panic!(e);
@@ -14,23 +14,23 @@ fn main () {
     let mut refs = HashSet::new();
 
     // Capture all links and link references.
-    let regex = r"\[([^\]]+)\](?:(?:\[([^\]]+)\])|(?:\([^\)]+\)))(?i)<!--\signore\s-->";
+    let regex =
+        r"\[([^\]]+)\](?:(?:\[([^\]]+)\])|(?:\([^\)]+\)))(?i)<!--\signore\s-->";
     let link_regex = Regex::new(regex).unwrap();
     let first_pass = link_regex.replace_all(&buffer, |caps: &Captures<'_>| {
-
         // Save the link reference we want to delete.
-        if let Some(reference) = caps.at(2) {
-            refs.insert(reference.to_owned());
+        if let Some(reference) = caps.get(2) {
+            refs.insert(reference.as_str().to_string());
         }
 
         // Put the link title back.
-        caps.at(1).unwrap().to_owned()
+        caps.get(1).unwrap().as_str().to_string()
     });
 
     // Search for the references we need to delete.
     let ref_regex = Regex::new(r"(?m)^\[([^\]]+)\]:\s.*\n").unwrap();
     let out = ref_regex.replace_all(&first_pass, |caps: &Captures<'_>| {
-        let capture = caps.at(1).unwrap().to_owned();
+        let capture = caps.get(1).unwrap().to_owned();
 
         // Check if we've marked this reference for deletion ...
         if refs.contains(capture.as_str()) {
@@ -38,7 +38,7 @@ fn main () {
         }
 
         // ... else we put back everything we captured.
-        caps.at(0).unwrap().to_owned()
+        caps.get(0).unwrap().as_str().to_string()
     });
 
     write!(io::stdout(), "{}", out).unwrap();
diff --git a/src/doc/book/tools/src/bin/remove_markup.rs b/src/doc/book/tools/src/bin/remove_markup.rs
index a4d352d131..8877e038f7 100644
--- a/src/doc/book/tools/src/bin/remove_markup.rs
+++ b/src/doc/book/tools/src/bin/remove_markup.rs
@@ -1,8 +1,8 @@
 extern crate regex;
 
+use regex::{Captures, Regex};
 use std::io;
 use std::io::{Read, Write};
-use regex::{Regex, Captures};
 
 fn main() {
     write_md(remove_markup(read_md()));
@@ -21,25 +21,31 @@ fn write_md(output: String) {
 }
 
 fn remove_markup(input: String) -> String {
-    let filename_regex = Regex::new(r#"\A<span class="filename">(.*)</span>\z"#).unwrap();
+    let filename_regex =
+        Regex::new(r#"\A<span class="filename">(.*)</span>\z"#).unwrap();
     // Captions sometimes take up multiple lines.
-    let caption_start_regex = Regex::new(r#"\A<span class="caption">(.*)\z"#).unwrap();
+    let caption_start_regex =
+        Regex::new(r#"\A<span class="caption">(.*)\z"#).unwrap();
     let caption_end_regex = Regex::new(r#"(.*)</span>\z"#).unwrap();
     let regexen = vec![filename_regex, caption_start_regex, caption_end_regex];
 
-    let lines: Vec<_> = input.lines().flat_map(|line| {
-        // Remove our syntax highlighting and rustdoc markers.
-        if line.starts_with("```") {
-            Some(String::from("```"))
-        // Remove the span around filenames and captions.
-        } else {
-            let result = regexen.iter().fold(line.to_string(), |result, regex| {
-                regex.replace_all(&result, |caps: &Captures<'_>| {
-                    caps.at(1).unwrap().to_owned()
-                })
-            });
-            Some(result)
-        }
-    }).collect();
+    let lines: Vec<_> = input
+        .lines()
+        .flat_map(|line| {
+            // Remove our syntax highlighting and rustdoc markers.
+            if line.starts_with("```") {
+                Some(String::from("```"))
+            // Remove the span around filenames and captions.
+            } else {
+                let result =
+                    regexen.iter().fold(line.to_string(), |result, regex| {
+                        regex.replace_all(&result, |caps: &Captures<'_>| {
+                            caps.get(1).unwrap().as_str().to_string()
+                        }).to_string()
+                    });
+                Some(result)
+            }
+        })
+        .collect();
     lines.join("\n")
 }
diff --git a/src/doc/book/tools/update-rustc.sh b/src/doc/book/tools/update-rustc.sh
new file mode 100755
index 0000000000..201f076ffa
--- /dev/null
+++ b/src/doc/book/tools/update-rustc.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+
+set -eu
+
+# Build the book before making any changes for comparison of the output.
+echo 'Building book into `tmp/book-before` before updating...'
+mdbook build -d tmp/book-before
+
+# Rustfmt all listings
+echo 'Formatting all listings...'
+find -s listings -name Cargo.toml -print0 | while IFS= read -r -d '' f; do
+    dir_to_fmt=$(dirname $f)
+
+    # There are a handful of listings we don't want to rustfmt and skipping doesn't work;
+    # those will have a file in their directory that explains why.
+    if [ ! -f "${dir_to_fmt}/rustfmt-ignore" ]; then
+        cd $dir_to_fmt
+        cargo fmt --all && true
+        cd - > /dev/null
+    fi
+done
+
+# Get listings without anchor comments in tmp by compiling a release listings artifact
+echo 'Generate listings without anchor comments...'
+cargo run --bin release_listings
+
+root_dir=$(pwd)
+
+echo 'Regenerating output...'
+# For any listings where we show the output,
+find -s listings -name output.txt -print0 | while IFS= read -r -d '' f; do
+    build_directory=$(dirname $f)
+    full_build_directory="${root_dir}/${build_directory}"
+    full_output_path="${full_build_directory}/output.txt"
+    tmp_build_directory="tmp/${build_directory}"
+
+    cd $tmp_build_directory
+
+    # Save the previous compile time; we're going to keep it to minimize diff churn
+    compile_time=$(sed -E -ne "s/.*Finished (dev|test) \[unoptimized \+ debuginfo] target\(s\) in ([0-9.]*).*/\2/p" ${full_output_path})
+
+    # Act like this is the first time this listing has been built
+    cargo clean
+
+    # Run the command in the existing output file
+    cargo_command=$(sed -ne "s/$ \(.*\)/\1/p" ${full_output_path})
+
+    # Clear the output file of everything except the command
+    echo "$ ${cargo_command}" > ${full_output_path}
+
+    # Regenerate the output and append to the output file. Turn some warnings
+    # off to reduce output noise, and use one test thread to get consistent
+    # ordering of tests in the output when the command is `cargo test`.
+    RUSTFLAGS="-A unused_variables -A dead_code" RUST_TEST_THREADS=1 $cargo_command >> ${full_output_path} 2>&1 || true
+
+    # Set the project file path to the projects directory plus the crate name instead of a path
+    # to the computer of whoever is running this
+    sed -i '' -E -e "s/(Compiling|Checking) ([^\)]*) v0.1.0 (.*)/\1 \2 v0.1.0 (file:\/\/\/projects\/\2)/" ${full_output_path}
+
+    # Restore the previous compile time, if there is one
+    if [ -n  "${compile_time}" ]; then
+        sed -i '' -E -e "s/Finished (dev|test) \[unoptimized \+ debuginfo] target\(s\) in [0-9.]*/Finished \1 [unoptimized + debuginfo] target(s) in ${compile_time}/" ${full_output_path}
+    fi
+
+    cd - > /dev/null
+done
+
+# Build the book after making all the changes
+echo 'Building book into `tmp/book-after` after updating...'
+mdbook build -d tmp/book-after
+
+# Run the megadiff script that removes all files that are the same, leaving only files to audit
+echo 'Removing tmp files that had no changes from the update...'
+./tools/megadiff.sh
+
+echo 'Done.'
diff --git a/src/doc/edition-guide/src/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.md b/src/doc/edition-guide/src/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.md
index 39812f703c..e3883f3b71 100644
--- a/src/doc/edition-guide/src/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.md
+++ b/src/doc/edition-guide/src/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.md
@@ -14,7 +14,7 @@ correct, all that stuff. Second, once it's satisfied that everything is in
 order, it produces the actual binary code that you end up executing.
 
 It turns out that that second step takes a lot of time. And most of the time,
-it's not neccesary. That is, when you're working on some Rust code, many
+it's not necessary. That is, when you're working on some Rust code, many
 developers will get into a workflow like this:
 
 1. Write some code.
diff --git a/src/doc/embedded-book/ci/install.sh b/src/doc/embedded-book/ci/install.sh
index dd5b2a8df0..08e3d24e51 100644
--- a/src/doc/embedded-book/ci/install.sh
+++ b/src/doc/embedded-book/ci/install.sh
@@ -2,14 +2,14 @@ set -euxo pipefail
 
 main() {
     local tag=$(git ls-remote --tags --refs --exit-code \
-                    https://github.com/rust-lang-nursery/mdbook \
+                    https://github.com/rust-lang/mdbook \
                         | cut -d/ -f3 \
                         | grep -E '^v[0-9\.]+$' \
                         | sort --version-sort \
                         | tail -n1)
 
     curl -LSfs https://japaric.github.io/trust/install.sh | \
-        sh -s -- --git rust-lang-nursery/mdbook --tag $tag
+        sh -s -- --git rust-lang/mdbook --tag $tag
 
     pip install linkchecker --user
 }
diff --git a/src/doc/embedded-book/ci/script.sh b/src/doc/embedded-book/ci/script.sh
index afb41fa550..6d9cad348d 100644
--- a/src/doc/embedded-book/ci/script.sh
+++ b/src/doc/embedded-book/ci/script.sh
@@ -4,15 +4,13 @@ main() {
     mdbook build
     mdbook test
 
-    # FIXME(rust-lang-nursery/mdbook#789) remove `--ignore-url` when that bug is fixed
-    linkchecker --ignore-url "print.html" book
+    linkchecker book
 
     # now check this as a directory of the bookshelf
     rm -rf shelf
     mkdir shelf
     mv book shelf
-    # FIXME(rust-lang-nursery/mdbook#789) remove `--ignore-url` when that bug is fixed
-    linkchecker --ignore-url "print.html" shelf
+    linkchecker shelf
 
     mv shelf/book .
     rmdir shelf
diff --git a/src/doc/embedded-book/src/SUMMARY.md b/src/doc/embedded-book/src/SUMMARY.md
index 8614cee72b..f0f29a0270 100644
--- a/src/doc/embedded-book/src/SUMMARY.md
+++ b/src/doc/embedded-book/src/SUMMARY.md
@@ -46,3 +46,7 @@ more information and coordination
     - [A little Rust with your C](./interoperability/rust-with-c.md)
 - [Unsorted topics](./unsorted/index.md)
   - [Optimizations: The speed size tradeoff](./unsorted/speed-vs-size.md)
+
+---
+
+[Appendix A: Glossary](./appendix/glossary.md)
diff --git a/src/doc/embedded-book/src/appendix/glossary.md b/src/doc/embedded-book/src/appendix/glossary.md
new file mode 100644
index 0000000000..e0e7d4a10a
--- /dev/null
+++ b/src/doc/embedded-book/src/appendix/glossary.md
@@ -0,0 +1,16 @@
+# Appendix A: Glossary
+
+The embedded ecosystem is full of different protocols, hardware components and
+vendor-specific things that use their own terms and abbreviations. This Glossary
+attempts to list them with pointers for understanding them better.
+
+Term         | Meaning
+-------------|--------
+I2C          | Sometimes referred to as `I² C` or Inter-IC. It is a protocol meant for hardware communication within a single integrated circuit. See [i2c.info] for more details
+SPI          | Serial Peripheral Interface
+USART        | Universal synchronous and asynchronous receiver-transmitter
+UART         | Universal asynchronous receiver-transmitter
+FPU          | Floating-point Unit. A 'math processor' running only operations on floating-point numbers
+PAC          | Peripheral Access Crate
+
+[i2c.info]: https://i2c.info/
diff --git a/src/doc/embedded-book/src/interoperability/c-with-rust.md b/src/doc/embedded-book/src/interoperability/c-with-rust.md
index bf88fd03ab..ab06519020 100644
--- a/src/doc/embedded-book/src/interoperability/c-with-rust.md
+++ b/src/doc/embedded-book/src/interoperability/c-with-rust.md
@@ -87,7 +87,7 @@ Rather than manually generating these interfaces, which may be tedious and error
   `--ctypes-prefix=cty` and `Builder.use_core()` to make the generated code `#![no_std]` compatible.
 4. `bindgen` will produce the generated Rust code to the output of the terminal window. This file may be piped to a file in your project, such as `bindings.rs`. You may use this file in your Rust project to interact with C/C++ code compiled and linked as an external library. Tip: don't forget to use the [`cty`](https://crates.io/crates/cty) crate if your types in the generated bindings are prefixed with `cty`.
 
-[bindgen]: https://github.com/rust-lang-nursery/rust-bindgen
+[bindgen]: https://github.com/rust-lang/rust-bindgen
 [bindgen user's manual]: https://rust-lang.github.io/rust-bindgen/
 
 ## Building your C/C++ code
diff --git a/src/doc/embedded-book/src/intro/index.md b/src/doc/embedded-book/src/intro/index.md
index d4304f0050..5ccc3ff54b 100644
--- a/src/doc/embedded-book/src/intro/index.md
+++ b/src/doc/embedded-book/src/intro/index.md
@@ -56,6 +56,7 @@ If you are unfamiliar with anything mentioned above or if you want more informat
 | Topic        | Resource | Description |
 |--------------|----------|-------------|
 | Rust         | [Rust Book](https://doc.rust-lang.org/book/) | If you are not yet comfortable with Rust, we highly suggest reading this book. |
+| Rust, Embedded | [Discovery Book](https://docs.rust-embedded.org/discovery/) | If you have never done any embedded programming, this book might be a better start |
 | Rust, Embedded | [Embedded Rust Bookshelf](https://docs.rust-embedded.org) | Here you can find several other resources provided by Rust's Embedded Working Group. |
 | Rust, Embedded | [Embedonomicon](https://docs.rust-embedded.org/embedonomicon/) | The nitty gritty details when doing embedded programming in Rust. |
 | Rust, Embedded | [embedded FAQ](https://docs.rust-embedded.org/faq.html) | Frequently asked questions about Rust in an embedded context. |
@@ -97,3 +98,22 @@ it should be reported in [the issue tracker] of this book.
 [the issue tracker]: https://github.com/rust-embedded/book/issues/
 
 Pull requests fixing typos and adding new content are very welcome!
+
+## Re-using this material
+
+This book is distributed under the following licenses:
+
+* The code samples and free-standing Cargo projects contained within this book are licensed under the terms of both the [MIT License] and the [Apache License v2.0].
+* The written prose, pictures and diagrams contained within this book are licensed under the terms of the Creative Commons [CC-BY-SA v4.0] license.
+
+[MIT License]: https://opensource.org/licenses/MIT
+[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0
+[CC-BY-SA v4.0]: https://creativecommons.org/licenses/by-sa/4.0/legalcode
+
+TL;DR: If you want to use our text or images in your work, you need to:
+
+* Give the appropriate credit (i.e. mention this book on your slide, and provide a link to the relevant page)
+* Provide a link to the [CC-BY-SA v4.0] licence
+* Indicate if you have changed the material in any way, and make any changes to our material available under the same licence
+
+Also, please do let us know if you find this book useful!
diff --git a/src/doc/embedded-book/src/static-guarantees/design-contracts.md b/src/doc/embedded-book/src/static-guarantees/design-contracts.md
index 6c3af65db9..56fec45bea 100644
--- a/src/doc/embedded-book/src/static-guarantees/design-contracts.md
+++ b/src/doc/embedded-book/src/static-guarantees/design-contracts.md
@@ -239,7 +239,7 @@ let pin_state = pulled_low.bit_is_set();
  * Example 3: Pulled Low input to Output, set high
  */
 let output_pin = pulled_low.into_enabled_output();
-output_pin.set_bit(false);
+output_pin.set_bit(true);
 
 // Can't do this, output pins don't have this interface!
 // output_pin.into_input_pull_down();
diff --git a/src/doc/embedded-book/src/static-guarantees/typestate-programming.md b/src/doc/embedded-book/src/static-guarantees/typestate-programming.md
index 9f21150315..9bd70f40d7 100644
--- a/src/doc/embedded-book/src/static-guarantees/typestate-programming.md
+++ b/src/doc/embedded-book/src/static-guarantees/typestate-programming.md
@@ -6,40 +6,42 @@ The concept of [typestates] describes the encoding of information about the curr
 [Builder Pattern]: https://doc.rust-lang.org/1.0.0/style/ownership/builders.html
 
 ```rust
-#[derive(Debug)]
-struct Foo {
-    inner: u32,
-}
+pub mod foo_module {
+    #[derive(Debug)]
+    pub struct Foo {
+        inner: u32,
+    }
 
-struct FooBuilder {
-    a: u32,
-    b: u32,
-}
+    pub struct FooBuilder {
+        a: u32,
+        b: u32,
+    }
 
-impl FooBuilder {
-    pub fn new(starter: u32) -> Self {
-        Self {
-            a: starter,
-            b: starter,
+    impl FooBuilder {
+        pub fn new(starter: u32) -> Self {
+            Self {
+                a: starter,
+                b: starter,
+            }
         }
-    }
 
-    pub fn double_a(self) -> Self {
-        Self {
-            a: self.a * 2,
-            b: self.b,
+        pub fn double_a(self) -> Self {
+            Self {
+                a: self.a * 2,
+                b: self.b,
+            }
         }
-    }
 
-    pub fn into_foo(self) -> Foo {
-        Foo {
-            inner: self.a + self.b,
+        pub fn into_foo(self) -> Foo {
+            Foo {
+                inner: self.a + self.b,
+            }
         }
     }
 }
 
 fn main() {
-    let x = FooBuilder::new(10)
+    let x = foo_module::FooBuilder::new(10)
         .double_a()
         .into_foo();
 
@@ -60,4 +62,4 @@ Because Rust has a [Strong Type System], there is no easy way to magically creat
 
 [Strong Type System]: https://en.wikipedia.org/wiki/Strong_and_weak_typing
 
-This allows us to represent the states of our system as types, and to include the necessary actions for state transitions into the methods that exchange one type for another. By creating a `FooBuilder`, and exchanging it for a `Foo` object, we have walked through the steps of a basic state machine.
\ No newline at end of file
+This allows us to represent the states of our system as types, and to include the necessary actions for state transitions into the methods that exchange one type for another. By creating a `FooBuilder`, and exchanging it for a `Foo` object, we have walked through the steps of a basic state machine.
diff --git a/src/doc/nomicon/book.toml b/src/doc/nomicon/book.toml
new file mode 100644
index 0000000000..37984f1300
--- /dev/null
+++ b/src/doc/nomicon/book.toml
@@ -0,0 +1,7 @@
+[book]
+author = "The Rust Project Developers"
+title = "The Rustonomicon"
+description = "The Dark Arts of Advanced and Unsafe Rust Programming"
+
+[output.html]
+git-repository-url = "https://github.com/rust-lang/nomicon"
diff --git a/src/doc/nomicon/src/destructors.md b/src/doc/nomicon/src/destructors.md
index ae91096a77..6893759776 100644
--- a/src/doc/nomicon/src/destructors.md
+++ b/src/doc/nomicon/src/destructors.md
@@ -28,7 +28,7 @@ For instance, a custom implementation of `Box` might write `Drop` like this:
 ```rust
 #![feature(ptr_internals, allocator_api)]
 
-use std::alloc::{Alloc, Global, GlobalAlloc, Layout};
+use std::alloc::{AllocRef, Global, GlobalAlloc, Layout};
 use std::mem;
 use std::ptr::{drop_in_place, NonNull, Unique};
 
@@ -55,7 +55,7 @@ However this wouldn't work:
 ```rust
 #![feature(allocator_api, ptr_internals)]
 
-use std::alloc::{Alloc, Global, GlobalAlloc, Layout};
+use std::alloc::{AllocRef, Global, GlobalAlloc, Layout};
 use std::ptr::{drop_in_place, Unique, NonNull};
 use std::mem;
 
@@ -128,7 +128,7 @@ of Self during `drop` is to use an Option:
 ```rust
 #![feature(allocator_api, ptr_internals)]
 
-use std::alloc::{Alloc, GlobalAlloc, Global, Layout};
+use std::alloc::{AllocRef, GlobalAlloc, Global, Layout};
 use std::ptr::{drop_in_place, Unique, NonNull};
 use std::mem;
 
diff --git a/src/doc/nomicon/src/ffi.md b/src/doc/nomicon/src/ffi.md
index d766cf26a6..fdb9ff0a8d 100644
--- a/src/doc/nomicon/src/ffi.md
+++ b/src/doc/nomicon/src/ffi.md
@@ -662,13 +662,13 @@ fairly easy, but requires a few things:
 
 ```rust
 #[no_mangle]
-pub extern fn hello_rust() -> *const u8 {
+pub extern "C" fn hello_rust() -> *const u8 {
     "Hello, world!\0".as_ptr()
 }
 # fn main() {}
 ```
 
-The `extern` makes this function adhere to the C calling convention, as
+The `extern "C"` makes this function adhere to the C calling convention, as
 discussed above in "[Foreign Calling
 Conventions](ffi.html#foreign-calling-conventions)". The `no_mangle`
 attribute turns off Rust's name mangling, so that it is easier to link to.
diff --git a/src/doc/nomicon/src/lifetimes.md b/src/doc/nomicon/src/lifetimes.md
index bc917b14dd..649cd770a2 100644
--- a/src/doc/nomicon/src/lifetimes.md
+++ b/src/doc/nomicon/src/lifetimes.md
@@ -261,6 +261,8 @@ data.push(4);
 // Here, the destructor is run and therefore this'll fail to compile.
 ```
 
+One way to convince the compiler that `x` is no longer valid is by using `drop(x)` before `data.push(4)`.
+
 Furthermore, there might be multiple possible last uses of the borrow, for
 example in each branch of a condition.
 
diff --git a/src/doc/nomicon/src/safe-unsafe-meaning.md b/src/doc/nomicon/src/safe-unsafe-meaning.md
index e231384314..0418f6df9c 100644
--- a/src/doc/nomicon/src/safe-unsafe-meaning.md
+++ b/src/doc/nomicon/src/safe-unsafe-meaning.md
@@ -56,7 +56,7 @@ implementations have generally been rigorously manually checked, so the Safe Rus
 interfaces built on top of these implementations can be assumed to be safe.
 
 The need for all of this separation boils down a single fundamental property
-of Safe Rust:
+of Safe Rust, the *soundness property*:
 
 **No matter what, Safe Rust can't cause Undefined Behavior.**
 
diff --git a/src/doc/nomicon/src/subtyping.md b/src/doc/nomicon/src/subtyping.md
index 9c362a2840..79b6408350 100644
--- a/src/doc/nomicon/src/subtyping.md
+++ b/src/doc/nomicon/src/subtyping.md
@@ -183,10 +183,10 @@ to trying to explain:
 The types with \*'s are the ones we will be focusing on, as they are in
 some sense "fundamental". All the others can be understood by analogy to the others:
 
-* Vec and all other owning pointers and collections follow the same logic as Box
-* Cell and all other interior mutability types follow the same logic as UnsafeCell
-* `*const` follows the logic of `&T`
-* `*mut` follows the logic of `&mut T` (or `UnsafeCell<T>`)
+* `Vec<T>` and all other owning pointers and collections follow the same logic as `Box<T>`
+* `Cell<T>` and all other interior mutability types follow the same logic as `UnsafeCell<T>`
+* `*const T` follows the logic of `&T`
+* `*mut T` follows the logic of `&mut T` (or `UnsafeCell<T>`)
 
 > NOTE: the *only* source of contravariance in the language is the arguments to
 > a function, which is why it really doesn't come up much in practice. Invoking
diff --git a/src/doc/nomicon/src/vec-alloc.md b/src/doc/nomicon/src/vec-alloc.md
index 2889a731dd..694059d51c 100644
--- a/src/doc/nomicon/src/vec-alloc.md
+++ b/src/doc/nomicon/src/vec-alloc.md
@@ -37,7 +37,7 @@ that, we'll need to use the rest of the heap APIs. These basically allow us to
 talk directly to Rust's allocator (jemalloc by default).
 
 We'll also need a way to handle out-of-memory (OOM) conditions. The standard
-library calls `std::alloc::oom()`, which in turn calls the the `oom` langitem,
+library calls `std::alloc::oom()`, which in turn calls the `oom` langitem,
 which aborts the program in a platform-specific manner.
 The reason we abort and don't panic is because unwinding can cause allocations
 to happen, and that seems like a bad thing to do when your allocator just came
diff --git a/src/doc/nomicon/src/vec-final.md b/src/doc/nomicon/src/vec-final.md
index 66c8e8bcba..a858547eb1 100644
--- a/src/doc/nomicon/src/vec-final.md
+++ b/src/doc/nomicon/src/vec-final.md
@@ -9,7 +9,7 @@ use std::ptr::{Unique, NonNull, self};
 use std::mem;
 use std::ops::{Deref, DerefMut};
 use std::marker::PhantomData;
-use std::alloc::{Alloc, GlobalAlloc, Layout, Global, handle_alloc_error};
+use std::alloc::{AllocRef, GlobalAlloc, Layout, Global, handle_alloc_error};
 
 struct RawVec<T> {
     ptr: Unique<T>,
@@ -52,7 +52,7 @@ impl<T> RawVec<T> {
                     mem::align_of::<T>(),
                 ))
             }
-            let ptr = ptr.unwrap();
+            let (ptr, _) = ptr.unwrap();
 
             self.ptr = Unique::new_unchecked(ptr.as_ptr() as *mut _);
             self.cap = new_cap;
diff --git a/src/doc/reference/src/attributes.md b/src/doc/reference/src/attributes.md
index dfffe5ca01..da94428ea4 100644
--- a/src/doc/reference/src/attributes.md
+++ b/src/doc/reference/src/attributes.md
@@ -50,7 +50,7 @@ Attributes may be applied to many things in the language:
 * [Generic lifetime or type parameter][generics] accept outer attributes.
 * Expressions accept outer attributes in limited situations, see [Expression
   Attributes] for details.
-* [Function][functions], [closure]] and [function pointer]
+* [Function][functions], [closure] and [function pointer]
   parameters accept outer attributes. This includes attributes on variadic parameters
   denoted with `...` in function pointers and [external blocks][variadic functions].
 
diff --git a/src/doc/reference/src/behavior-considered-undefined.md b/src/doc/reference/src/behavior-considered-undefined.md
index 960fd37732..f3a27ad63a 100644
--- a/src/doc/reference/src/behavior-considered-undefined.md
+++ b/src/doc/reference/src/behavior-considered-undefined.md
@@ -49,7 +49,7 @@ code.
   * Invalid metadata in a wide reference, `Box<T>`, or raw pointer:
     * `dyn Trait` metadata is invalid if it is not a pointer to a vtable for
       `Trait` that matches the actual dynamic trait the pointer or reference points to.
-    * Slice metadata is invalid if if the length is not a valid `usize`
+    * Slice metadata is invalid if the length is not a valid `usize`
       (i.e., it must not be read from uninitialized memory).
   * Non-UTF-8 byte sequences in a `str`.
   * Invalid values for a type with a custom definition of invalid values.
diff --git a/src/doc/reference/src/const_eval.md b/src/doc/reference/src/const_eval.md
index cec0145a3b..5d6c367e62 100644
--- a/src/doc/reference/src/const_eval.md
+++ b/src/doc/reference/src/const_eval.md
@@ -31,7 +31,7 @@ to be run.
     are implemented, one cannot use both short circuiting operators (`&&` and `||`) and let
     statements within the same constant.
     * [assignment expressions]
-    * [assignment operator expressions]
+    * [compound assignment expressions]
     * [expression statements]
 * [Field] expressions.
 * Index expressions, [array indexing] or [slice] with a `usize`.
@@ -63,7 +63,7 @@ A _const context_ is one of the following:
 [array indexing]:       expressions/array-expr.md#array-and-slice-indexing-expressions
 [array type length expressions]: types/array.md
 [assignment expressions]: expressions/operator-expr.md#assignment-expressions
-[assignment operator expressions]: expressions/operator-expr.md#compound-assignment-expressions
+[compound assignment expressions]: expressions/operator-expr.md#compound-assignment-expressions
 [block expressions]:    expressions/block-expr.md
 [borrow]:               expressions/operator-expr.md#borrow-operators
 [cast]:                 expressions/operator-expr.md#type-cast-expressions
@@ -73,7 +73,7 @@ A _const context_ is one of the following:
 [constants]:            items/constant-items.md
 [dereference operator]: expressions/operator-expr.md#the-dereference-operator
 [destructors]:          destructors.md
-[enum discriminants]:   items/enumerations.md#custom-discriminant-values-for-field-less-enumerations
+[enum discriminants]:   items/enumerations.md#custom-discriminant-values-for-fieldless-enumerations
 [enum variant]:         expressions/enum-variant-expr.md
 [expression statements]: statements.md#expression-statements
 [expressions]:          expressions.md
diff --git a/src/doc/reference/src/expressions/array-expr.md b/src/doc/reference/src/expressions/array-expr.md
index f31fbb8743..4d4f567e1d 100644
--- a/src/doc/reference/src/expressions/array-expr.md
+++ b/src/doc/reference/src/expressions/array-expr.md
@@ -62,7 +62,7 @@ in a _panicked state_ if it fails.
 
 ```rust,should_panic
 // lint is deny by default.
-#![warn(const_err)]
+#![warn(unconditional_panic)]
 
 ([1, 2, 3, 4])[2];        // Evaluates to 3
 
diff --git a/src/doc/reference/src/expressions/block-expr.md b/src/doc/reference/src/expressions/block-expr.md
index 33cb42109a..c35c3d6782 100644
--- a/src/doc/reference/src/expressions/block-expr.md
+++ b/src/doc/reference/src/expressions/block-expr.md
@@ -22,7 +22,7 @@ of the block.
 
 Blocks are written as `{`, then any [inner attributes], then [statements],
 then an optional expression, and finally a `}`. Statements are usually required
-to be followed a semicolon, with two exceptions. Item declaration statements do
+to be followed by a semicolon, with two exceptions. Item declaration statements do
 not need to be followed by a semicolon. Expression statements usually require
 a following semicolon except if its outer expression is a flow control
 expression. Furthermore, extra semicolons between statements are allowed, but
diff --git a/src/doc/reference/src/items/associated-items.md b/src/doc/reference/src/items/associated-items.md
index c1f82f62ec..5434c04951 100644
--- a/src/doc/reference/src/items/associated-items.md
+++ b/src/doc/reference/src/items/associated-items.md
@@ -98,24 +98,28 @@ Associated functions whose first parameter is named `self` are called *methods*
 and may be invoked using the [method call operator], for example, `x.foo()`, as
 well as the usual function call notation.
 
-If the type of the `self` parameter is specified, it is limited to one of the
-following types:
+If the type of the `self` parameter is specified, it is limited to types resolving
+to one generated by the following grammar (where `'lt` denotes some arbitrary
+lifetime):
 
-- `Self`
-- `&Self`
-- `&mut Self`
-- [`Box<Self>`]
-- [`Rc<Self>`]
-- [`Arc<Self>`]
-- [`Pin<P>`] where `P` is one of the above types except `Self`.
+```text
+P = &'lt S | &'lt mut S | Box<S> | Rc<S> | Arc<S> | Pin<P>
+S = Self | P
+```
 
-The `Self` term can be replaced with the type being implemented.
+The `Self` terminal in this grammar denotes a type resolving to the implementing type.
+This can also include the contextual type alias `Self`, other type aliases,
+or associated type projections resolving to the implementing type.
 
 ```rust
 # use std::rc::Rc;
 # use std::sync::Arc;
 # use std::pin::Pin;
+// Examples of methods implemented on struct `Example`.
 struct Example;
+type Alias = Example;
+trait Trait { type Output; }
+impl Trait for Example { type Output = Example; }
 impl Example {
     fn by_value(self: Self) {}
     fn by_ref(self: &Self) {}
@@ -126,6 +130,8 @@ impl Example {
     fn by_pin(self: Pin<&Self>) {}
     fn explicit_type(self: Arc<Example>) {}
     fn with_lifetime<'a>(self: &'a Self) {}
+    fn nested<'a>(self: &mut &'a Arc<Rc<Box<Alias>>>) {}
+    fn via_projection(self: <Example as Trait>::Output) {}
 }
 ```
 
@@ -360,4 +366,4 @@ fn main() {
 [function item]: ../types/function-item.md
 [method call operator]: ../expressions/method-call-expr.md
 [path]: ../paths.md
-[regular function parameters]: functions.md#attributes-on-function-parameters 
+[regular function parameters]: functions.md#attributes-on-function-parameters
diff --git a/src/doc/reference/src/items/enumerations.md b/src/doc/reference/src/items/enumerations.md
index 25dfecb656..7e47955083 100644
--- a/src/doc/reference/src/items/enumerations.md
+++ b/src/doc/reference/src/items/enumerations.md
@@ -61,7 +61,7 @@ integer associated to it that is used to determine which variant it holds. An
 opaque reference to this discriminant can be obtained with the
 [`mem::discriminant`] function.
 
-## Custom Discriminant Values for Field-Less Enumerations
+## Custom Discriminant Values for Fieldless Enumerations
 
 If there is no data attached to *any* of the variants of an enumeration,
 then the discriminant can be directly chosen and accessed.
diff --git a/src/doc/reference/src/items/traits.md b/src/doc/reference/src/items/traits.md
index 5427dbe652..1a65c9239b 100644
--- a/src/doc/reference/src/items/traits.md
+++ b/src/doc/reference/src/items/traits.md
@@ -95,6 +95,98 @@ Object safe traits can be the base trait of a [trait object]. A trait is
 * It must not have any associated constants.
 * All supertraits must also be object safe.
 
+When there isn't a `Self: Sized` bound on a method, the type of a method
+receiver must be one of the following types:
+
+* `&Self`
+* `&mut Self`
+* [`Box<Self>`]
+* [`Rc<Self>`]
+* [`Arc<Self>`]
+* [`Pin<P>`] where `P` is one of the types above
+
+```rust
+# use std::rc::Rc;
+# use std::sync::Arc;
+# use std::pin::Pin;
+// Examples of object safe methods.
+trait TraitMethods {
+    fn by_ref(self: &Self) {}
+    fn by_ref_mut(self: &mut Self) {}
+    fn by_box(self: Box<Self>) {}
+    fn by_rc(self: Rc<Self>) {}
+    fn by_arc(self: Arc<Self>) {}
+    fn by_pin(self: Pin<&Self>) {}
+    fn with_lifetime<'a>(self: &'a Self) {}
+    fn nested_pin(self: Pin<Arc<Self>>) {}
+}
+# struct S;
+# impl TraitMethods for S {}
+# let t: Box<dyn TraitMethods> = Box::new(S);
+```
+
+```rust,compile_fail
+// This trait is object-safe, but these methods cannot be dispatched on a trait object.
+trait NonDispatchable {
+    // Non-methods cannot be dispatched.
+    fn foo() where Self: Sized {}
+    // Self type isn't known until runtime.
+    fn returns(&self) -> Self where Self: Sized;
+    // `other` may be a different concrete type of the receiver.
+    fn param(&self, other: Self) where Self: Sized {}
+    // Generics are not compatible with vtables.
+    fn typed<T>(&self, x: T) where Self: Sized {}
+}
+
+struct S;
+impl NonDispatchable for S {
+    fn returns(&self) -> Self where Self: Sized { S }
+}
+let obj: Box<dyn NonDispatchable> = Box::new(S);
+obj.returns(); // ERROR: cannot call with Self return
+obj.param(S);  // ERROR: cannot call with Self parameter
+obj.typed(1);  // ERROR: cannot call with generic type
+```
+
+```rust,compile_fail
+# use std::rc::Rc;
+// Examples of non-object safe traits.
+trait NotObjectSafe {
+    const CONST: i32 = 1;  // ERROR: cannot have associated const
+
+    fn foo() {}  // ERROR: associated function without Sized
+    fn returns(&self) -> Self; // ERROR: Self in return type
+    fn typed<T>(&self, x: T) {} // ERROR: has generic type parameters
+    fn nested(self: Rc<Box<Self>>) {} // ERROR: nested receiver not yet supported
+}
+
+struct S;
+impl NotObjectSafe for S {
+    fn returns(&self) -> Self { S }
+}
+let obj: Box<dyn NotObjectSafe> = Box::new(S); // ERROR
+```
+
+```rust,compile_fail
+// Self: Sized traits are not object-safe.
+trait TraitWithSize where Self: Sized {}
+
+struct S;
+impl TraitWithSize for S {}
+let obj: Box<dyn TraitWithSize> = Box::new(S); // ERROR
+```
+
+```rust,compile_fail
+// Not object safe if `Self` is a type argument.
+trait Super<A> {}
+trait WithSelf: Super<Self> where Self: Sized {}
+
+struct S;
+impl<A> Super<A> for S {}
+impl WithSelf for S {}
+let obj: Box<dyn WithSelf> = Box::new(S); // ERROR: cannot use `Self` type parameter
+```
+
 ## Supertraits
 
 **Supertraits** are traits that are required to be implemented for a type to
@@ -268,3 +360,7 @@ fn main() {
 [trait implementation]: implementations.md#trait-implementations
 [`Send`]: ../special-types-and-traits.md#send
 [`Sync`]: ../special-types-and-traits.md#sync
+[`Arc<Self>`]: ../special-types-and-traits.md#arct
+[`Box<Self>`]: ../special-types-and-traits.md#boxt
+[`Pin<P>`]: ../special-types-and-traits.md#pinp
+[`Rc<Self>`]: ../special-types-and-traits.md#rct
diff --git a/src/doc/reference/src/items/use-declarations.md b/src/doc/reference/src/items/use-declarations.md
index 92bd780843..6de253a190 100644
--- a/src/doc/reference/src/items/use-declarations.md
+++ b/src/doc/reference/src/items/use-declarations.md
@@ -103,7 +103,7 @@ mod foo {
     }
 
     use crate::foo::example::iter; // good: foo is at crate root
-//  use example::iter;      // bad: relative paths are not allowed without `self`
+//  use example::iter;      // bad in 2015 edition: relative paths are not allowed without `self`; good in 2018 edition
     use self::baz::foobaz;  // good: self refers to module 'foo'
     use crate::foo::bar::foobar;   // good: foo is at crate root
 
diff --git a/src/doc/reference/src/macro-ambiguity.md b/src/doc/reference/src/macro-ambiguity.md
index f1dbb42850..531fbef0b6 100644
--- a/src/doc/reference/src/macro-ambiguity.md
+++ b/src/doc/reference/src/macro-ambiguity.md
@@ -373,5 +373,5 @@ why particular matchers are legal and others are not.
  * `($($e:expr)*)` : illegal, because expr NTs are not in FOLLOW(expr NT).
 
 [Macros by Example]: macros-by-example.md
-[RFC 550]: https://github.com/rust-lang/rfcs/blob/master/text/0550-macro-future-proofing.html
+[RFC 550]: https://github.com/rust-lang/rfcs/blob/master/text/0550-macro-future-proofing.md
 [tracking issue]: https://github.com/rust-lang/rust/issues/56575
diff --git a/src/doc/reference/src/paths.md b/src/doc/reference/src/paths.md
index af739d7082..cdf8cc41ab 100644
--- a/src/doc/reference/src/paths.md
+++ b/src/doc/reference/src/paths.md
@@ -175,7 +175,8 @@ mod a {
 }
 mod b {
     pub fn foo() {
-        ::a::foo(); // call a's foo function
+        ::a::foo(); // call `a`'s foo function
+        // In Rust 2018, `::a` would be interpreted as the crate `a`.
     }
 }
 # fn main() {}
diff --git a/src/doc/reference/src/tokens.md b/src/doc/reference/src/tokens.md
index e4338f06fd..3fda6cab7a 100644
--- a/src/doc/reference/src/tokens.md
+++ b/src/doc/reference/src/tokens.md
@@ -579,7 +579,7 @@ usages and meanings are defined in the linked pages.
 | `=>`   | FatArrow    | [Match arms][match], [Macros]
 | `#`    | Pound       | [Attributes]
 | `$`    | Dollar      | [Macros]
-| `?`    | Question    | [Question mark operator][question], [Questionably sized][sized]
+| `?`    | Question    | [Question mark operator][question], [Questionably sized][sized], [Macro Kleene Matcher][macros]
 
 ## Delimiters
 
diff --git a/src/doc/reference/src/type-layout.md b/src/doc/reference/src/type-layout.md
index f6c9ca77eb..51ba859ef5 100644
--- a/src/doc/reference/src/type-layout.md
+++ b/src/doc/reference/src/type-layout.md
@@ -197,6 +197,19 @@ Here is this algorithm described in pseudocode.
 
 <!-- ignore: pseudocode -->
 ```rust,ignore
+/// Returns the amount of padding needed after `offset` to ensure that the
+/// following address will be aligned to `alignment`.
+fn padding_needed_for(offset: usize, alignment: usize) -> usize {
+    let misalignment = offset % alignment;
+    if misalignment > 0 {
+        // round up to next multiple of `alignment`
+        alignment - misalignment
+    } else {
+        // already a multiple of `alignment`
+        0
+    }
+}
+
 struct.alignment = struct.fields().map(|field| field.alignment).max();
 
 let current_offset = 0;
@@ -205,16 +218,24 @@ for field in struct.fields_in_declaration_order() {
     // Increase the current offset so that it's a multiple of the alignment
     // of this field. For the first field, this will always be zero.
     // The skipped bytes are called padding bytes.
-    current_offset += field.alignment % current_offset;
+    current_offset += padding_needed_for(current_offset, field.alignment);
 
     struct[field].offset = current_offset;
 
     current_offset += field.size;
 }
 
-struct.size = current_offset + current_offset % struct.alignment;
+struct.size = current_offset + padding_needed_for(current_offset, struct.alignment);
 ```
 
+<div class="warning">
+
+Warning: This pseudocode uses a naive algorithm that ignores overflow issues for
+the sake of clarity. To perform memory layout computations in actual code, use
+[`Layout`].
+
+</div>
+
 > Note: This algorithm can produce zero-sized structs. This differs from
 > C where structs without data still have a size of one byte.
 
@@ -354,7 +375,7 @@ used with any other representation.
 [`size_of`]: ../std/mem/fn.size_of.html
 [`Sized`]: ../std/marker/trait.Sized.html
 [dynamically sized types]: dynamically-sized-types.md
-[C-like enumerations]:  items/enumerations.md#custom-discriminant-values-for-field-less-enumerations
+[C-like enumerations]:  items/enumerations.md#custom-discriminant-values-for-fieldless-enumerations
 [zero-variant enumerations]: items/enumerations.md#zero-variant-enums
 [undefined behavior]: behavior-considered-undefined.md
 [27060]: https://github.com/rust-lang/rust/issues/27060
@@ -363,3 +384,4 @@ used with any other representation.
 [`C`]: #the-c-representation
 [primitive representations]: #primitive-representations
 [`transparent`]: #the-transparent-representation
+[`Layout`]: ../std/alloc/struct.Layout.html
diff --git a/src/doc/reference/src/types/pointer.md b/src/doc/reference/src/types/pointer.md
index 8ed3fa8b90..de97815d20 100644
--- a/src/doc/reference/src/types/pointer.md
+++ b/src/doc/reference/src/types/pointer.md
@@ -3,12 +3,14 @@
 All pointers in Rust are explicit first-class values. They can be moved or
 copied, stored into data structs, and returned from functions.
 
-## Shared references (`&`)
+## References (`&` and `&mut`)
 
 > **<sup>Syntax</sup>**\
 > _ReferenceType_ :\
 > &nbsp;&nbsp; `&` [_Lifetime_]<sup>?</sup> `mut`<sup>?</sup> [_TypeNoBounds_]
 
+### Shared references (`&`)
+
 These point to memory _owned by some other value_. When a shared reference to
 a value is created it prevents direct mutation of the value. [Interior
 mutability] provides an exception for this in certain circumstances. As the
@@ -19,7 +21,7 @@ only copying the pointer itself, that is, pointers are `Copy`. Releasing a
 reference has no effect on the value it points to, but referencing of a
 [temporary value] will keep it alive during the scope of the reference itself.
 
-## Mutable references (`&mut`)
+### Mutable references (`&mut`)
 
 These also point to memory owned by some other value. A mutable reference type
 is written `&mut type` or `&'a mut type`. A mutable reference (that hasn't been
diff --git a/src/doc/reference/src/types/trait-object.md b/src/doc/reference/src/types/trait-object.md
index d514e4a2d6..7e37e41ccf 100644
--- a/src/doc/reference/src/types/trait-object.md
+++ b/src/doc/reference/src/types/trait-object.md
@@ -97,7 +97,7 @@ need to be expressed as part of the trait object. This lifetime is written as
 inferred with a sensible choice.
 
 [_TraitBound_]: ../trait-bounds.md
-[_TypeParamBounds_]: ../types.md#type-expressions
+[_TypeParamBounds_]: ../trait-bounds.md
 [auto traits]: ../special-types-and-traits.md#auto-traits
 [defaults]: ../lifetime-elision.md#default-trait-object-lifetimes
 [dynamically sized types]: ../dynamically-sized-types.md
diff --git a/src/doc/robots.txt b/src/doc/robots.txt
index 61ee12739f..d119cc4647 100644
--- a/src/doc/robots.txt
+++ b/src/doc/robots.txt
@@ -1,4 +1,3 @@
-# NB: This file is not automatically deployed. After changes, it needs to be uploaded manually to doc.rust-lang.org
 User-agent: *
 Disallow: /0.3/
 Disallow: /0.4/
diff --git a/src/doc/rust-by-example/src/conversion/from_into.md b/src/doc/rust-by-example/src/conversion/from_into.md
index 9be8bc24ad..266d10f285 100644
--- a/src/doc/rust-by-example/src/conversion/from_into.md
+++ b/src/doc/rust-by-example/src/conversion/from_into.md
@@ -43,8 +43,8 @@ fn main() {
 ## `Into`
 
 The [`Into`] trait is simply the reciprocal of the `From` trait. That is, if you
-have implemented the `From` trait for your type you get the `Into`
-implementation for free.
+have implemented the `From` trait for your type, `Into` will call it when
+necessary.
 
 Using the `Into` trait will typically require specification of the type to
 convert into as the compiler is unable to determine this most of the time.
diff --git a/src/doc/rust-by-example/src/error/multiple_error_types/reenter_question_mark.md b/src/doc/rust-by-example/src/error/multiple_error_types/reenter_question_mark.md
index bf93e8a42d..a94c0f8e5e 100644
--- a/src/doc/rust-by-example/src/error/multiple_error_types/reenter_question_mark.md
+++ b/src/doc/rust-by-example/src/error/multiple_error_types/reenter_question_mark.md
@@ -26,8 +26,8 @@ Here, we rewrite the previous example using `?`. As a result, the
 use std::error;
 use std::fmt;
 
-// Change the alias to `Box<error::Error>`.
-type Result<T> = std::result::Result<T, Box<error::Error>>;
+// Change the alias to `Box<dyn error::Error>`.
+type Result<T> = std::result::Result<T, Box<dyn error::Error>>;
 
 #[derive(Debug)]
 struct EmptyVec;
diff --git a/src/doc/rust-by-example/src/flow_control/for.md b/src/doc/rust-by-example/src/flow_control/for.md
index 591b86637c..99e6458493 100644
--- a/src/doc/rust-by-example/src/flow_control/for.md
+++ b/src/doc/rust-by-example/src/flow_control/for.md
@@ -49,14 +49,13 @@ fn main() {
 ## for and iterators
 
 The `for in` construct is able to interact with an `Iterator` in several ways.
-As discussed in with the [Iterator][iter] trait, if not specified, the `for`
-loop will apply the `into_iter` function on the collection provided to convert
-the collection into an iterator. This is not the only means to convert a
-collection into an iterator however, the other functions available include
-`iter` and `iter_mut`.
-
-These 3 functions will return different views of the data within your
-collection.
+As discussed in the section on the [Iterator][iter] trait, by default the `for`
+loop will apply the `into_iter` function to the collection. However, this is
+not the only means of converting collections into iterators.
+
+`into_iter`, `iter` and `iter_mut` all handle the conversion of a collection
+into an iterator in different ways, by providing different views on the data
+within.
 
 * `iter` - This borrows each element of the collection through each iteration.
   Thus leaving the collection untouched and available for reuse after the loop.
diff --git a/src/doc/rust-by-example/src/flow_control/if_let.md b/src/doc/rust-by-example/src/flow_control/if_let.md
index 22bdde8d1b..3742b6f683 100644
--- a/src/doc/rust-by-example/src/flow_control/if_let.md
+++ b/src/doc/rust-by-example/src/flow_control/if_let.md
@@ -99,13 +99,13 @@ fn main() {
 }
 ```
 
-Another benefit: `if let` allows to match enum non-parameterized variants, even if the enum doesn't `#[derive(PartialEq)]`, neither we implement `PartialEq` for it. In such case, classic `if Foo::Bar==a` fails, because instances of such enum are not comparable for equality. However, `if let` works.
+Another benefit is that `if let` allows us to match non-parameterized enum variants. This is true even in cases where the enum doesn't implement or derive `PartialEq`. In such cases `if Foo::Bar == a` would fail to compile, because instances of the enum cannot be equated, however `if let` will continue to work.
 
 Would you like a challenge? Fix the following example to use `if let`:
 
 ```rust,editable,ignore,mdbook-runnable
-// This enum purposely doesn't #[derive(PartialEq)],
-// neither we implement PartialEq for it. That's why comparing Foo::Bar==a fails below.
+// This enum purposely neither implements nor derives PartialEq.
+// That is why comparing Foo::Bar == a fails below.
 enum Foo {Bar}
 
 fn main() {
diff --git a/src/doc/rust-by-example/src/mod/visibility.md b/src/doc/rust-by-example/src/mod/visibility.md
index 84840e43de..173122c72a 100644
--- a/src/doc/rust-by-example/src/mod/visibility.md
+++ b/src/doc/rust-by-example/src/mod/visibility.md
@@ -101,7 +101,7 @@ fn main() {
     // pub(crate) items can be called from anywhere in the same crate
     my_mod::public_function_in_crate();
 
-    // pub(in path) items can only be called from within the mode specified
+    // pub(in path) items can only be called from within the module specified
     // Error! function `public_function_in_my_mod` is private
     //my_mod::nested::public_function_in_my_mod();
     // TODO ^ Try uncommenting this line
diff --git a/src/doc/rustc-guide/.editorconfig b/src/doc/rustc-dev-guide/.editorconfig
similarity index 100%
rename from src/doc/rustc-guide/.editorconfig
rename to src/doc/rustc-dev-guide/.editorconfig
diff --git a/src/doc/rustc-guide/.travis.yml b/src/doc/rustc-dev-guide/.travis.yml
similarity index 89%
rename from src/doc/rustc-guide/.travis.yml
rename to src/doc/rustc-dev-guide/.travis.yml
index 6ee759d4cc..e88ae40b2a 100644
--- a/src/doc/rustc-guide/.travis.yml
+++ b/src/doc/rustc-dev-guide/.travis.yml
@@ -10,7 +10,8 @@ before_install:
 - MAX_LINE_LENGTH=100 bash ci/check_line_lengths.sh src/**/*.md
 install:
 - source ~/.cargo/env || true
-- bash -x ci/install.sh
+- cargo install mdbook --version 0.3.4
+- cargo install mdbook-linkcheck --version 0.5.0
 script:
 - mdbook build
 notifications:
@@ -24,5 +25,6 @@ deploy:
   skip-cleanup: true
   github-token: $GITHUB_TOKEN
   local-dir: book/html
+  fqdn: rustc-dev-guide.rust-lang.org
   on:
     branch: master
diff --git a/src/doc/rustc-dev-guide/CNAME b/src/doc/rustc-dev-guide/CNAME
new file mode 100644
index 0000000000..a59cd86cd4
--- /dev/null
+++ b/src/doc/rustc-dev-guide/CNAME
@@ -0,0 +1 @@
+rustc-dev-guide.rust-lang.org
diff --git a/src/doc/rustc-guide/CODE_OF_CONDUCT.md b/src/doc/rustc-dev-guide/CODE_OF_CONDUCT.md
similarity index 100%
rename from src/doc/rustc-guide/CODE_OF_CONDUCT.md
rename to src/doc/rustc-dev-guide/CODE_OF_CONDUCT.md
diff --git a/src/doc/rustc-guide/LICENSE-APACHE b/src/doc/rustc-dev-guide/LICENSE-APACHE
similarity index 100%
rename from src/doc/rustc-guide/LICENSE-APACHE
rename to src/doc/rustc-dev-guide/LICENSE-APACHE
diff --git a/src/doc/rustc-guide/LICENSE-MIT b/src/doc/rustc-dev-guide/LICENSE-MIT
similarity index 100%
rename from src/doc/rustc-guide/LICENSE-MIT
rename to src/doc/rustc-dev-guide/LICENSE-MIT
diff --git a/src/doc/rustc-dev-guide/README.md b/src/doc/rustc-dev-guide/README.md
new file mode 100644
index 0000000000..0989718623
--- /dev/null
+++ b/src/doc/rustc-dev-guide/README.md
@@ -0,0 +1,85 @@
+![Travis CI badge](https://api.travis-ci.com/rust-lang/rustc-dev-guide.svg?branch=master)
+
+
+This is a collaborative effort to build a guide that explains how rustc
+works. The aim of the guide is to help new contributors get oriented
+to rustc, as well as to help more experienced folks in figuring out
+some new part of the compiler that they haven't worked on before.
+
+[You can read the latest version of the guide here.](https://rustc-dev-guide.rust-lang.org/)
+
+You may also find the rustdocs [for the compiler itself][rustdocs] useful.
+
+[rustdocs]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
+
+### Contributing to the guide
+
+The guide is useful today, but it has a lot of work still go.
+
+If you'd like to help improve the guide, we'd love to have you! You can find
+plenty of issues on the [issue
+tracker](https://github.com/rust-lang/rustc-dev-guide/issues). Just post a
+comment on the issue you would like to work on to make sure that we don't
+accidentally duplicate work. If you think something is missing, please open an
+issue about it!
+
+**In general, if you don't know how the compiler works, that is not a
+problem!** In that case, what we will do is to schedule a bit of time
+for you to talk with someone who **does** know the code, or who wants
+to pair with you and figure it out.  Then you can work on writing up
+what you learned.
+
+In general, when writing about a particular part of the compiler's code, we
+recommend that you link to the relevant parts of the [rustc
+rustdocs][rustdocs].
+
+To help prevent accidentally introducing broken links, we use the
+`mdbook-linkcheck`. If installed on your machine `mdbook` will automatically
+invoke this link checker, otherwise it will emit a warning saying it couldn't
+be found.
+
+```bash
+> cargo install mdbook-linkcheck
+```
+
+You will need `mdbook` version `>= 0.3.5` and `mdbook-linkcheck` version `>= 0.5`.
+`linkcheck` will be run automatically when you run `mdbook build`.
+
+## How to fix toolstate failures
+
+1. You will get a ping from the toolstate commit. e.g. https://github.com/rust-lang-nursery/rust-toolstate/commit/8ffa0e4c30ac9ba8546b7046e5c4ccc2b96ebdd4
+
+2. The commit contains a link to the PR that caused the breakage. e.g. https://github.com/rust-lang/rust/pull/64321
+
+3. If you go to that PR's thread, there is a post from bors with a link to the CI status: https://github.com/rust-lang/rust/pull/64321#issuecomment-529763807
+
+4. Follow the check-azure link to get to the Azure website for that build: https://dev.azure.com/rust-lang/e71b0ddf-dd27-435a-873c-e30f86eea377/_build/results?buildId=7780
+
+5. There will be approximately 1 billion different jobs for the build. They are for different configurations and platforms. The rustc-dev-guide build only runs on the Linux x86_64-gnu-tools job. So click on that job in the list, which is about 60% down in the list.
+
+6. Click the Run build step in the job to get the console log for the step.
+
+7. Click on the log and Ctrl-f to get a search box in the log
+
+8. Search for rustc-dev-guide. This gets you to the place where the links are checked. It is usually ~11K lines into the log
+
+9. Look at the links in the log near that point in the log
+
+10. Fix those links in the rustc-dev-guide (by making a PR in the rustc-dev-guide repo)
+
+11. Make a PR on the rust-lang/rust repo to update the rustc-dev-guide git submodule in src/docs/rustc-dev-guide.
+To make a PR, the following steps are useful.
+
+```bash
+# Assuming you already cloned the rust-lang/rust repo and you're in the correct directory
+git submodule update --remote src/doc/rustc-dev-guide
+git add -u
+git commit -m "Update rustc-dev-guide"
+# Note that you can use -i, which is short for --incremental, in the following command
+./x.py test --incremental --stage 1 src/doc/rustc-dev-guide # This is optional and should succeed anyway
+# Open a PR in rust-lang/rust
+```
+
+12. Wait for PR to merge
+
+Voilà!
diff --git a/src/doc/rustc-dev-guide/book.toml b/src/doc/rustc-dev-guide/book.toml
new file mode 100644
index 0000000000..3d90479cb2
--- /dev/null
+++ b/src/doc/rustc-dev-guide/book.toml
@@ -0,0 +1,20 @@
+[book]
+title = "Guide to Rustc Development"
+author = "Rustc developers"
+description = "A guide to developing rustc"
+
+[build]
+create-missing = false
+
+[output.html]
+git-repository-url = "https://github.com/rust-lang/rustc-dev-guide"
+
+[output.html.fold]
+enable = true
+level = 1
+
+[output.linkcheck]
+follow-web-links = true
+exclude = [ "crates\\.io", "gcc\\.godbolt\\.org", "youtube\\.com", "youtu\\.be", "dl\\.acm\\.org", "cs\\.bgu\\.ac\\.il" ]
+cache-timeout = 172800
+warning-policy = "error"
diff --git a/src/doc/rustc-guide/ci/check_line_lengths.sh b/src/doc/rustc-dev-guide/ci/check_line_lengths.sh
similarity index 100%
rename from src/doc/rustc-guide/ci/check_line_lengths.sh
rename to src/doc/rustc-dev-guide/ci/check_line_lengths.sh
diff --git a/src/doc/rustc-guide/src/SUMMARY.md b/src/doc/rustc-dev-guide/src/SUMMARY.md
similarity index 96%
rename from src/doc/rustc-guide/src/SUMMARY.md
rename to src/doc/rustc-dev-guide/src/SUMMARY.md
index 125e20cf6f..ae1ea0b2e0 100644
--- a/src/doc/rustc-guide/src/SUMMARY.md
+++ b/src/doc/rustc-dev-guide/src/SUMMARY.md
@@ -30,6 +30,7 @@
         - [`LintStore`](./diagnostics/lintstore.md)
         - [Diagnostic Codes](./diagnostics/diagnostic-codes.md)
     - [ICE-breaker teams](ice-breaker/about.md)
+        - ["Cleanup Crew" ICE-breakers](ice-breaker/cleanup-crew.md)
         - [LLVM ICE-breakers](ice-breaker/llvm.md)
 - [Part 2: How rustc works](./part-2-intro.md)
     - [High-level overview of the compiler source](./high-level-overview.md)
@@ -42,6 +43,7 @@
         - [Debugging and Testing](./incrcomp-debugging.md)
         - [Profiling Queries](./queries/profiling.md)
         - [Salsa](./salsa.md)
+    - [Memory Management in Rustc](./memory.md)
     - [Lexing and Parsing](./the-parser.md)
     - [`#[test]` Implementation](./test-implementation.md)
     - [Panic Implementation](./panic-implementation.md)
@@ -52,6 +54,8 @@
         - [Debugging](./hir-debugging.md)
     - [Closure expansion](./closure.md)
     - [The `ty` module: representing types](./ty.md)
+        - [Generics and substitutions](./generics.md)
+        - [`TypeFolder` and `TypeFoldable`](./ty-fold.md)
     - [Generic arguments](./generic_arguments.md)
     - [Type inference](./type-inference.md)
     - [Trait solving (old-style)](./traits/resolution.md)
diff --git a/src/doc/rustc-guide/src/about-this-guide.md b/src/doc/rustc-dev-guide/src/about-this-guide.md
similarity index 95%
rename from src/doc/rustc-guide/src/about-this-guide.md
rename to src/doc/rustc-dev-guide/src/about-this-guide.md
index 48ea4dce63..0519099b31 100644
--- a/src/doc/rustc-guide/src/about-this-guide.md
+++ b/src/doc/rustc-dev-guide/src/about-this-guide.md
@@ -25,7 +25,7 @@ You might also find the following sites useful:
 - [compiler-team] -- the home-base for the rust compiler team, with description
   of the team procedures, active working groups, and the team calendar.
 
-[GitHub repository]: https://github.com/rust-lang/rustc-guide/
+[GitHub repository]: https://github.com/rust-lang/rustc-dev-guide/
 [Rustc API docs]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
 [Forge]: https://forge.rust-lang.org/
 [compiler-team]: https://github.com/rust-lang/compiler-team/
diff --git a/src/doc/rustc-guide/src/appendix/background.md b/src/doc/rustc-dev-guide/src/appendix/background.md
similarity index 100%
rename from src/doc/rustc-guide/src/appendix/background.md
rename to src/doc/rustc-dev-guide/src/appendix/background.md
diff --git a/src/doc/rustc-guide/src/appendix/bibliography.md b/src/doc/rustc-dev-guide/src/appendix/bibliography.md
similarity index 100%
rename from src/doc/rustc-guide/src/appendix/bibliography.md
rename to src/doc/rustc-dev-guide/src/appendix/bibliography.md
diff --git a/src/doc/rustc-guide/src/appendix/code-index.md b/src/doc/rustc-dev-guide/src/appendix/code-index.md
similarity index 86%
rename from src/doc/rustc-guide/src/appendix/code-index.md
rename to src/doc/rustc-dev-guide/src/appendix/code-index.md
index 39e16c1cba..0321da195d 100644
--- a/src/doc/rustc-guide/src/appendix/code-index.md
+++ b/src/doc/rustc-dev-guide/src/appendix/code-index.md
@@ -8,16 +8,16 @@ Item            |  Kind    | Short description           | Chapter            |
 ----------------|----------|-----------------------------|--------------------|-------------------
 `BodyId` | struct | One of four types of HIR node identifiers | [Identifiers in the HIR] | [src/librustc_hir/hir.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.BodyId.html)
 `Compiler` | struct | Represents a compiler session and can be used to drive a compilation. | [The Rustc Driver and Interface] | [src/librustc_interface/interface.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_interface/interface/struct.Compiler.html)
-`ast::Crate` | struct | A syntax-level representation of a parsed crate | [The parser] | [src/libsyntax/ast.rs](https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast/struct.Crate.html)
+`ast::Crate` | struct | A syntax-level representation of a parsed crate | [The parser] | [src/librustc_ast/ast.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/ast/struct.Crate.html)
 `rustc_hir::Crate` | struct | A more abstract, compiler-friendly form of a crate's AST | [The Hir] | [src/librustc_hir/hir.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.Crate.html)
 `DefId` | struct | One of four types of HIR node identifiers | [Identifiers in the HIR] | [src/librustc_hir/def_id.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/def_id/struct.DefId.html)
 `DiagnosticBuilder` | struct | A struct for building up compiler diagnostics, such as errors or lints | [Emitting Diagnostics] | [src/librustc_errors/diagnostic_builder.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_errors/struct.DiagnosticBuilder.html)
 `DocContext` | struct | A state container used by rustdoc when crawling through a crate to gather its documentation | [Rustdoc] | [src/librustdoc/core.rs](https://github.com/rust-lang/rust/blob/master/src/librustdoc/core.rs)
 `HirId` | struct | One of four types of HIR node identifiers | [Identifiers in the HIR] | [src/librustc_hir/hir_id.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir_id/struct.HirId.html)
-`NodeId` | struct | One of four types of HIR node identifiers. Being phased out | [Identifiers in the HIR] | [src/libsyntax/ast.rs](https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast/struct.NodeId.html)
-`P` | struct | An owned immutable smart pointer. By contrast, `&T` is not owned, and `Box<T>` is not immutable. | None | [src/syntax/ptr.rs](https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ptr/struct.P.html)
+`NodeId` | struct | One of four types of HIR node identifiers. Being phased out | [Identifiers in the HIR] | [src/librustc_ast/ast.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/node_id/struct.NodeId.html)
+`P` | struct | An owned immutable smart pointer. By contrast, `&T` is not owned, and `Box<T>` is not immutable. | None | [src/librustc_ast/ptr.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/ptr/struct.P.html)
 `ParamEnv` | struct | Information about generic parameters or `Self`, useful for working with associated or generic items | [Parameter Environment] | [src/librustc/ty/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.ParamEnv.html)
-`ParseSess` | struct | This struct contains information about a parsing session | [The parser] | [src/libsyntax/parse/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/syntax/sess/struct.ParseSess.html)
+`ParseSess` | struct | This struct contains information about a parsing session | [The parser] | [src/librustc_session/parse/parse.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/parse/struct.ParseSess.html)
 `Query` | struct | Represents the result of query to the `Compiler` interface and allows stealing, borrowing, and returning the results of compiler passes. | [The Rustc Driver and Interface] | [src/librustc_interface/queries.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_interface/queries/struct.Query.html)
 `Rib` | struct | Represents a single scope of names | [Name resolution] | [src/librustc_resolve/lib.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_resolve/late/struct.Rib.html)
 `Session` | struct | The data associated with a compilation session | [The parser], [The Rustc Driver and Interface] | [src/librustc/session/mod.html](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/struct.Session.html)
@@ -25,7 +25,7 @@ Item            |  Kind    | Short description           | Chapter            |
 `SourceMap` | struct | Maps AST nodes to their source code. It is composed of `SourceFile`s. Was previously called CodeMap | [The parser] | [src/librustc_span/source_map.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/source_map/struct.SourceMap.html)
 `Span` | struct  | A location in the user's source code, used for error reporting primarily | [Emitting Diagnostics] | [src/librustc_span/span_encoding.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/struct.Span.html)
 `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)
-`syntax::token_stream::TokenStream` | struct | An abstract sequence of tokens, organized into `TokenTree`s | [The parser], [Macro expansion] | [src/libsyntax/tokenstream.rs](https://doc.rust-lang.org/nightly/nightly-rustc/syntax/tokenstream/struct.TokenStream.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/ty/trait_def.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/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/ty/sty.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TraitRef.html)
 `Ty<'tcx>` | struct | This is the internal representation of a type used for type checking | [Type checking] | [src/librustc/ty/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/type.Ty.html)
diff --git a/src/doc/rustc-dev-guide/src/appendix/compiler-lecture.md b/src/doc/rustc-dev-guide/src/appendix/compiler-lecture.md
new file mode 100644
index 0000000000..bbeb52aa3a
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/appendix/compiler-lecture.md
@@ -0,0 +1,27 @@
+# Compiler Lecture Series
+
+These are videos where various experts explain different parts of the compiler:
+
+- [Tom Tromey discusses debugging support in rustc](https://www.youtube.com/watch?v=elBxMRSNYr4)
+- [How Salsa Works (2019.01)](https://www.youtube.com/watch?v=_muY4HjSqVw)
+- [Salsa In More Depth (2019.01)](https://www.youtube.com/watch?v=i_IhACacPRY)
+- [RLS 2.0, Salsa, and Name Resolution](https://www.youtube.com/watch?v=Xr-rBqLr-G4)
+- [Cranelift](https://www.youtube.com/watch?v=9OIA7DTFQWU)
+- [Rust analyzer guide](https://www.youtube.com/watch?v=ANKBNiSWyfc)
+- [Rust analyzer syntax trees](https://www.youtube.com/watch?v=DGAuLWdCCAI)
+- [rust-analyzer type-checker overview by flodiebold](https://www.youtube.com/watch?v=Lmp3P9WNL8o)
+- [oli-obk on miri and constant evaluation](https://www.youtube.com/watch?v=5Pm2C1YXrvM)
+- [Polonius-rustc walkthrough](https://www.youtube.com/watch?v=i5KdU0ieb_A)
+- [rustc-chalk integration overview](https://www.youtube.com/watch?v=MBWtbDifPeU)
+- [Coherence in Chalk by Sunjay Varma - Bay Area Rust Meetup](https://www.youtube.com/watch?v=rZqS4bLPL24)
+- [How the chalk-engine crate works](https://www.youtube.com/watch?v=Ny2928cGDoM)
+- [How the chalk-engine crate works 2](https://www.youtube.com/watch?v=hmV66tB79LM)
+- [RFC #2229 Disjoint Field Capture plan](https://www.youtube.com/watch?v=UTXOptVMuIc)
+- [closures and upvar capture](https://www.youtube.com/watch?v=fMopdkn5-Xw)
+- [blitzerr closure upvar tys](https://www.youtube.com/watch?v=pLmVhSB-z4s)
+- [Convert Closure Upvar Representation to Tuples with blitzerr](https://www.youtube.com/watch?v=2QCuNtISoYc)
+- [async-await implementation plans](https://www.youtube.com/watch?v=xe2_whJWBC0)
+- [async-await region inferencer](https://www.youtube.com/watch?v=hlOxfkUDLPQ)
+- [Universes and Lifetimes](https://www.youtube.com/watch?v=iV1Z0xYXkck)
+- [Representing types in rustc](https://www.youtube.com/watch?v=c01TsOsr3-c)
+- [Polonius WG: Initialization and move tracking](https://www.youtube.com/watch?v=ilv9V-328HI)
diff --git a/src/doc/rustc-dev-guide/src/appendix/glossary.md b/src/doc/rustc-dev-guide/src/appendix/glossary.md
new file mode 100644
index 0000000000..f5274a8fc6
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/appendix/glossary.md
@@ -0,0 +1,88 @@
+# Appendix C: Glossary
+
+The compiler uses a number of...idiosyncratic abbreviations and things. This
+glossary attempts to list them and give you a few pointers for understanding
+them better.
+
+Term                    | Meaning
+------------------------|--------
+arena/arena allocation  |  an _arena_ is a large memory buffer from which other memory allocations are made. This style of allocation is called _area allocation_. See [this chapter](../memory.md) for more info.
+AST                     |  the abstract syntax tree produced by the `rustc_ast` crate; reflects user syntax very closely.
+binder                  |  a "binder" is a place where a variable or type is declared; for example, the `<T>` is a binder for the generic type parameter `T` in `fn foo<T>(..)`, and \|`a`\|` ...` is a binder for the parameter `a`. See [the background chapter for more](./background.html#free-vs-bound)
+bound variable          |  a "bound variable" is one that is declared within an expression/term. For example, the variable `a` is bound within the closure expression \|`a`\|` a * 2`. See [the background chapter for more](./background.html#free-vs-bound)
+codegen                 |  the code to translate MIR into LLVM IR.
+codegen unit            |  when we produce LLVM IR, we group the Rust code into a number of codegen units (sometimes abbreviated as CGUs). Each of these units is processed by LLVM independently from one another, enabling parallelism. They are also the unit of incremental re-use.
+completeness            |  completeness is a technical term in type theory. Completeness means that every type-safe program also type-checks. Having both soundness and completeness is very hard, and usually soundness is more important. (see "soundness").
+control-flow graph      |  a representation of the control-flow of a program; see [the background chapter for more](./background.html#cfg)
+CTFE                    |  Compile-Time Function Evaluation. This is the ability of the compiler to evaluate `const fn`s at compile time. This is part of the compiler's constant evaluation system. ([see more](../const-eval.html))
+cx                      |  we tend to use "cx" as an abbreviation for context. See also `tcx`, `infcx`, etc.
+DAG                     |  a directed acyclic graph is used during compilation to keep track of dependencies between queries. ([see more](../queries/incremental-compilation.html))
+data-flow analysis      |  a static analysis that figures out what properties are true at each point in the control-flow of a program; see [the background chapter for more](./background.html#dataflow)
+DefId                   |  an index identifying a definition (see `librustc/hir/def_id.rs`). Uniquely identifies a `DefPath`.
+Double pointer          |  a pointer with additional metadata. See "fat pointer" for more.
+drop glue               |  (internal) compiler-generated instructions that handle calling the destructors (`Drop`) for data types.
+DST                     |  Dynamically-Sized Type. A type for which the compiler cannot statically know the size in memory (e.g. `str` or `[u8]`). Such types don't implement `Sized` and cannot be allocated on the stack. They can only occur as the last field in a struct. They can only be used behind a pointer (e.g. `&str` or `&[u8]`).
+early-bound lifetime    |  a lifetime region that is substituted at its definition site. Bound in an item's `Generics` and substituted using a `Substs`. Contrast with **late-bound lifetime**. ([see more](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.RegionKind.html#bound-regions))
+empty type              |  see "uninhabited type".
+Fat pointer             |  a two word value carrying the address of some value, along with some further information necessary to put the value to use. Rust includes two kinds of "fat pointers": references to slices, and trait objects. A reference to a slice carries the starting address of the slice and its length. A trait object carries a value's address and a pointer to the trait's implementation appropriate to that value. "Fat pointers" are also known as "wide pointers", and "double pointers".
+free variable           |  a "free variable" is one that is not bound within an expression or term; see [the background chapter for more](./background.html#free-vs-bound)
+generics                |  the set of generic type parameters defined on a type or item
+HIR                     |  the High-level IR, created by lowering and desugaring the AST ([see more](../hir.html))
+HirId                   |  identifies a particular node in the HIR by combining a def-id with an "intra-definition offset".
+HIR Map                 |  The HIR map, accessible via tcx.hir, allows you to quickly navigate the HIR and convert between various forms of identifiers.
+ICE                     |  internal compiler error. When the compiler crashes.
+ICH                     |  incremental compilation hash. ICHs are used as fingerprints for things such as HIR and crate metadata, to check if changes have been made. This is useful in incremental compilation to see if part of a crate has changed and should be recompiled.
+inference variable      |  when doing type or region inference, an "inference variable" is a kind of special type/region that represents what you are trying to infer. Think of X in algebra. For example, if we are trying to infer the type of a variable in a program, we create an inference variable to represent that unknown type.
+infcx                   |  the inference context (see `librustc/infer`)
+intern                  |  interning refers to storing certain frequently-used constant data, such as strings, and then referring to the data by an identifier (e.g. a `Symbol`) rather than the data itself, to reduce memory usage and number of allocations. See [this chapter](../memory.md) for more info.
+IR                      |  Intermediate Representation. A general term in compilers. During compilation, the code is transformed from raw source (ASCII text) to various IRs. In Rust, these are primarily HIR, MIR, and LLVM IR. Each IR is well-suited for some set of computations. For example, MIR is well-suited for the borrow checker, and LLVM IR is well-suited for codegen because LLVM accepts it.
+IRLO                    |  `IRLO` or `irlo` is sometimes used as an abbreviation for [internals.rust-lang.org](https://internals.rust-lang.org).
+item                    |  a kind of "definition" in the language, such as a static, const, use statement, module, struct, etc. Concretely, this corresponds to the `Item` type.
+lang item               |  items that represent concepts intrinsic to the language itself, such as special built-in traits like `Sync` and `Send`; or traits representing operations such as `Add`; or functions that are called by the compiler. ([see more](https://doc.rust-lang.org/1.9.0/book/lang-items.html))
+late-bound lifetime     |  a lifetime region that is substituted at its call site. Bound in a HRTB and substituted by specific functions in the compiler, such as `liberate_late_bound_regions`. Contrast with **early-bound lifetime**. ([see more](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.RegionKind.html#bound-regions))
+local crate             |  the crate currently being compiled.
+LTO                     |  Link-Time Optimizations. A set of optimizations offered by LLVM that occur just before the final binary is linked. These include optimizations like removing functions that are never used in the final program, for example. _ThinLTO_ is a variant of LTO that aims to be a bit more scalable and efficient, but possibly sacrifices some optimizations. You may also read issues in the Rust repo about "FatLTO", which is the loving nickname given to non-Thin LTO. LLVM documentation: [here][lto] and [here][thinlto]
+[LLVM]                  |  (actually not an acronym :P) an open-source compiler backend. It accepts LLVM IR and outputs native binaries. Various languages (e.g. Rust) can then implement a compiler front-end that output LLVM IR and use LLVM to compile to all the platforms LLVM supports.
+memoize                 |  memoization is the process of storing the results of (pure) computations (such as pure function calls) to avoid having to repeat them in the future. This is typically a trade-off between execution speed and memory usage.
+MIR                     |  the Mid-level IR that is created after type-checking for use by borrowck and codegen ([see more](../mir/index.html))
+miri                    |  an interpreter for MIR used for constant evaluation ([see more](../miri.html))
+monomorphize            |  Monomorphization is 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               |  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)
+newtype                 |  a "newtype" is 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                     | [non-lexical lifetimes](../borrow_check/region_inference.html), an extension to Rust's borrowing system to make it be based on the control-flow graph.
+node-id or NodeId       |  an index identifying a particular node in the AST or HIR; gradually being phased out and replaced with `HirId`.
+obligation              |  something that must be proven by the trait system ([see more](../traits/resolution.html))
+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.
+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)
+promoted constants      |  constants extracted from a function and lifted to static scope; see [this section](../mir/index.html#promoted) for more details.
+provider                |  the function that executes a query ([see more](../query.html))
+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)
+query                   |  perhaps some sub-computation during compilation ([see more](../query.html))
+region                  |  another term for "lifetime" often used in the literature and in the borrow checker.
+rib                     |  a data structure in the name resolver that keeps track of a single scope for names. ([see more](../name-resolution.html))
+sess                    |  the compiler session, which stores global data used throughout compilation
+side tables             |  because the AST and HIR are immutable once created, we often carry extra information about them in the form of hashtables, indexed by the id of a particular node.
+sigil                   |  like a keyword but composed entirely of non-alphanumeric tokens. For example, `&` is a sigil for references.
+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.
+soundness               |  soundness is a technical term in type theory. Roughly, if a type system is sound, then if a program type-checks, it is type-safe; i.e. I can never (in safe rust) force a value into a variable of the wrong type. (see "completeness").
+span                    |  a location in the user's source code, used for error reporting primarily. These are like a file-name/line-number/column tuple on steroids: they carry a start/end point, and also track macro expansions and compiler desugaring. All while being packed into a few bytes (really, it's an index into a table). See the Span datatype for more.
+substs                  |  the substitutions for a given generic type or item (e.g. the `i32`, `u32` in `HashMap<i32, u32>`)
+tcx                     |  the "typing context", main data structure of the compiler ([see more](../ty.html))
+'tcx                    |  the lifetime of the allocation arena ([see more](../ty.html))
+trait reference         |  the name of a trait along with a suitable set of input type/lifetimes ([see more](../traits/goals-and-clauses.html#trait-ref))
+token                   |  the smallest unit of parsing. Tokens are produced after lexing ([see more](../the-parser.html)).
+[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.
+trans                   |  the code to translate MIR into LLVM IR. Renamed to codegen.
+trait reference         |  a trait and values for its type parameters ([see more](../ty.html)).
+ty                      |  the internal representation of a type ([see more](../ty.html)).
+UFCS                    |  Universal Function Call Syntax. An unambiguous syntax for calling a method ([see more](../type-checking.html)).
+uninhabited type        |  a type which has _no_ values. This is not the same as a ZST, which has exactly 1 value. An example of an uninhabited type is `enum Foo {}`, which has no variants, and so, can never be created. The compiler can treat code that deals with uninhabited types as dead code, since there is no such value to be manipulated. `!` (the never type) is an uninhabited type. Uninhabited types are also called "empty types".
+upvar                   |  a variable captured by a closure from outside the closure.
+variance                |  variance determines how changes to a generic type/lifetime parameter affect subtyping; for example, if `T` is a subtype of `U`, then `Vec<T>` is a subtype `Vec<U>` because `Vec` is *covariant* in its generic parameter. See [the background chapter](./background.html#variance) for a more general explanation. See the [variance chapter](../variance.html) for an explanation of how type checking handles variance.
+Wide pointer            |  a pointer with additional metadata. See "fat pointer" for more.
+ZST                     |  Zero-Sized Type. A type whose values have size 0 bytes. Since `2^0 = 1`, such types can have exactly one value. For example, `()` (unit) is a ZST. `struct Foo;` is also a ZST. The compiler can do some nice optimizations around ZSTs.
+
+[LLVM]: https://llvm.org/
+[lto]: https://llvm.org/docs/LinkTimeOptimization.html
+[thinlto]: https://clang.llvm.org/docs/ThinLTO.html
+[TLS]: https://llvm.org/docs/LangRef.html#thread-local-storage-models
diff --git a/src/doc/rustc-guide/src/appendix/humorust.md b/src/doc/rustc-dev-guide/src/appendix/humorust.md
similarity index 80%
rename from src/doc/rustc-guide/src/appendix/humorust.md
rename to src/doc/rustc-dev-guide/src/appendix/humorust.md
index ef926c1c69..8bd9c48a6c 100644
--- a/src/doc/rustc-guide/src/appendix/humorust.md
+++ b/src/doc/rustc-dev-guide/src/appendix/humorust.md
@@ -10,3 +10,4 @@ enlightening?
 - [Rust Koans](https://users.rust-lang.org/t/rust-koans/2408/4)
 - [`break rust;`](https://play.rust-lang.org/?version=stable&mode=debug&edition=2018&gist=0ab2bd6a9d722e0f05a95e2a5dcf89cc)
 - [The Nomicon Intro](https://doc.rust-lang.org/stable/nomicon/)
+- [`rustc-ty` renaming punfest](https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/rustc-ty.20naming.20bikeshed.20.2F.20punfest.20(was.3A.20design.20meeting.202.2E.2E.2E )
diff --git a/src/doc/rustc-guide/src/appendix/stupid-stats.md b/src/doc/rustc-dev-guide/src/appendix/stupid-stats.md
similarity index 98%
rename from src/doc/rustc-guide/src/appendix/stupid-stats.md
rename to src/doc/rustc-dev-guide/src/appendix/stupid-stats.md
index 6ed7d1cbd9..ea9b6e0f06 100644
--- a/src/doc/rustc-guide/src/appendix/stupid-stats.md
+++ b/src/doc/rustc-dev-guide/src/appendix/stupid-stats.md
@@ -61,7 +61,7 @@ Macros and syntax extensions are expanded, and `cfg` attributes will cause some
 code to disappear. The resulting AST won't have any macros or macro uses left
 in.
 
-The code for these first two phases is in [libsyntax](https://github.com/rust-lang/rust/tree/master/src/libsyntax).
+The code for these first two phases is in [librustc_ast](https://github.com/rust-lang/rust/tree/master/src/librustc_ast).
 
 After this phase, the compiler allocates ids to each node in the AST
 (technically not every node, but most of them). If we are writing out
@@ -356,7 +356,7 @@ struct StupidVisitor {
 
 The `StupidVisitor` struct just keeps track of the number of `println!`s it has
 seen and the count for each number of arguments. It implements
-`syntax::visit::Visitor` to walk the AST. Mostly we just use the default
+`rustc_ast::visit::Visitor` to walk the AST. Mostly we just use the default
 methods, these walk the AST taking no action. We override `visit_item` and
 `visit_mac` to implement custom behaviour when we walk into items (items include
 functions, modules, traits, structs, and so forth, we're only interested in
diff --git a/src/doc/rustc-guide/src/borrow_check.md b/src/doc/rustc-dev-guide/src/borrow_check.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check.md
rename to src/doc/rustc-dev-guide/src/borrow_check.md
diff --git a/src/doc/rustc-guide/src/borrow_check/moves_and_initialization.md b/src/doc/rustc-dev-guide/src/borrow_check/moves_and_initialization.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/moves_and_initialization.md
rename to src/doc/rustc-dev-guide/src/borrow_check/moves_and_initialization.md
diff --git a/src/doc/rustc-guide/src/borrow_check/moves_and_initialization/move_paths.md b/src/doc/rustc-dev-guide/src/borrow_check/moves_and_initialization/move_paths.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/moves_and_initialization/move_paths.md
rename to src/doc/rustc-dev-guide/src/borrow_check/moves_and_initialization/move_paths.md
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference.md
similarity index 98%
rename from src/doc/rustc-guide/src/borrow_check/region_inference.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference.md
index 84d30bdb47..d0da861db1 100644
--- a/src/doc/rustc-guide/src/borrow_check/region_inference.md
+++ b/src/doc/rustc-dev-guide/src/borrow_check/region_inference.md
@@ -86,7 +86,7 @@ use sparse bitsets).
 
 The kinds of region elements are as follows:
 
-- Each **location** in the MIR control-flow graph: a location is just
+- Each **[`location`]** in the MIR control-flow graph: a location is just
   the pair of a basic block and an index. This identifies the point
   **on entry** to the statement with that index (or the terminator, if
   the index is equal to `statements.len()`).
@@ -219,6 +219,7 @@ Here are some of the fields of the struct:
 
 [`constraints`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/region_infer/struct.RegionInferenceContext.html#structfield.constraints
 [`liveness_constraints`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/region_infer/struct.RegionInferenceContext.html#structfield.liveness_constraints
+[`location`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/mir/struct.Location.html
 [`universal_regions`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/region_infer/struct.RegionInferenceContext.html#structfield.universal_regions
 [`universal_region_relations`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/region_infer/struct.RegionInferenceContext.html#structfield.universal_region_relations
 [`type_tests`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/region_infer/struct.RegionInferenceContext.html#structfield.type_tests
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference/closure_constraints.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/closure_constraints.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/region_inference/closure_constraints.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference/closure_constraints.md
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference/constraint_propagation.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/constraint_propagation.md
similarity index 97%
rename from src/doc/rustc-guide/src/borrow_check/region_inference/constraint_propagation.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference/constraint_propagation.md
index ee86ae1483..6d190ae1ae 100644
--- a/src/doc/rustc-guide/src/borrow_check/region_inference/constraint_propagation.md
+++ b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/constraint_propagation.md
@@ -100,7 +100,7 @@ much faster, as described shortly.
 
 In the code, the set of outlives constraints is given to the region
 inference context on creation in a parameter of type
-[`ConstraintSet`]. The constraint set is basically just a list of `'a:
+[`OutlivesConstraintSet`]. The constraint set is basically just a list of `'a:
 'b` constraints.
 
 ### The outlives constraint graph and SCCs
@@ -112,7 +112,7 @@ induces an edge `'a -> 'b`. This conversion happens in the
 [`RegionInferenceContext::new`] function that creates the inference
 context.
 
-[`ConstraintSet`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/constraints/struct.OutlivesConstraintSet.html
+[`OutlivesConstraintSet`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/constraints/struct.OutlivesConstraintSet.html
 [graph-fn]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/constraints/struct.OutlivesConstraintSet.html#method.graph
 [`RegionInferenceContext::new`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/borrow_check/region_infer/struct.RegionInferenceContext.html#method.new
 
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference/error_reporting.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/error_reporting.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/region_inference/error_reporting.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference/error_reporting.md
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference/lifetime_parameters.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/lifetime_parameters.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/region_inference/lifetime_parameters.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference/lifetime_parameters.md
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference/member_constraints.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/member_constraints.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/region_inference/member_constraints.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference/member_constraints.md
diff --git a/src/doc/rustc-guide/src/borrow_check/region_inference/placeholders_and_universes.md b/src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/region_inference/placeholders_and_universes.md
rename to src/doc/rustc-dev-guide/src/borrow_check/region_inference/placeholders_and_universes.md
diff --git a/src/doc/rustc-guide/src/borrow_check/two_phase_borrows.md b/src/doc/rustc-dev-guide/src/borrow_check/two_phase_borrows.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/two_phase_borrows.md
rename to src/doc/rustc-dev-guide/src/borrow_check/two_phase_borrows.md
diff --git a/src/doc/rustc-guide/src/borrow_check/type_check.md b/src/doc/rustc-dev-guide/src/borrow_check/type_check.md
similarity index 100%
rename from src/doc/rustc-guide/src/borrow_check/type_check.md
rename to src/doc/rustc-dev-guide/src/borrow_check/type_check.md
diff --git a/src/doc/rustc-guide/src/bug-fix-procedure.md b/src/doc/rustc-dev-guide/src/bug-fix-procedure.md
similarity index 99%
rename from src/doc/rustc-guide/src/bug-fix-procedure.md
rename to src/doc/rustc-dev-guide/src/bug-fix-procedure.md
index 0f6d6c973b..90d8fb48b6 100644
--- a/src/doc/rustc-guide/src/bug-fix-procedure.md
+++ b/src/doc/rustc-dev-guide/src/bug-fix-procedure.md
@@ -65,7 +65,7 @@ described in more detail below):
 1. Once the change has been in the wild for at least one cycle, we can
    **stabilize the change**, converting those warnings into errors.
 
-Finally, for changes to libsyntax that will affect plugins, the general policy
+Finally, for changes to `librustc_ast` that will affect plugins, the general policy
 is to batch these changes. That is discussed below in more detail.
 
 ### Tracking issue
diff --git a/src/doc/rustc-guide/src/building/bootstrapping.md b/src/doc/rustc-dev-guide/src/building/bootstrapping.md
similarity index 100%
rename from src/doc/rustc-guide/src/building/bootstrapping.md
rename to src/doc/rustc-dev-guide/src/building/bootstrapping.md
diff --git a/src/doc/rustc-guide/src/building/build-install-distribution-artifacts.md b/src/doc/rustc-dev-guide/src/building/build-install-distribution-artifacts.md
similarity index 100%
rename from src/doc/rustc-guide/src/building/build-install-distribution-artifacts.md
rename to src/doc/rustc-dev-guide/src/building/build-install-distribution-artifacts.md
diff --git a/src/doc/rustc-guide/src/building/compiler-documenting.md b/src/doc/rustc-dev-guide/src/building/compiler-documenting.md
similarity index 100%
rename from src/doc/rustc-guide/src/building/compiler-documenting.md
rename to src/doc/rustc-dev-guide/src/building/compiler-documenting.md
diff --git a/src/doc/rustc-guide/src/building/ctags.md b/src/doc/rustc-dev-guide/src/building/ctags.md
similarity index 100%
rename from src/doc/rustc-guide/src/building/ctags.md
rename to src/doc/rustc-dev-guide/src/building/ctags.md
diff --git a/src/doc/rustc-guide/src/building/how-to-build-and-run.md b/src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md
similarity index 100%
rename from src/doc/rustc-guide/src/building/how-to-build-and-run.md
rename to src/doc/rustc-dev-guide/src/building/how-to-build-and-run.md
diff --git a/src/doc/rustc-guide/src/building/suggested.md b/src/doc/rustc-dev-guide/src/building/suggested.md
similarity index 100%
rename from src/doc/rustc-guide/src/building/suggested.md
rename to src/doc/rustc-dev-guide/src/building/suggested.md
diff --git a/src/doc/rustc-guide/src/closure.md b/src/doc/rustc-dev-guide/src/closure.md
similarity index 100%
rename from src/doc/rustc-guide/src/closure.md
rename to src/doc/rustc-dev-guide/src/closure.md
diff --git a/src/doc/rustc-guide/src/codegen.md b/src/doc/rustc-dev-guide/src/codegen.md
similarity index 100%
rename from src/doc/rustc-guide/src/codegen.md
rename to src/doc/rustc-dev-guide/src/codegen.md
diff --git a/src/doc/rustc-guide/src/codegen/backend-agnostic.md b/src/doc/rustc-dev-guide/src/codegen/backend-agnostic.md
similarity index 98%
rename from src/doc/rustc-guide/src/codegen/backend-agnostic.md
rename to src/doc/rustc-dev-guide/src/codegen/backend-agnostic.md
index 3bf1bde83c..0c501a2cc3 100644
--- a/src/doc/rustc-guide/src/codegen/backend-agnostic.md
+++ b/src/doc/rustc-dev-guide/src/codegen/backend-agnostic.md
@@ -89,7 +89,7 @@ parameters, that correspond to the following:
 Although there are already many lifetime parameters in the code, making it
 generic uncovered situations where the borrow-checker was passing only due to
 the special nature of the LLVM objects manipulated (they are extern pointers).
-For instance, a additional lifetime parameter had to be added to
+For instance, an additional lifetime parameter had to be added to
 `LocalAnalyser` in `analyse.rs`, leading to the definition:
 
 ```rust,ignore
@@ -179,7 +179,7 @@ addding another backend, the traits definition might be changed in order to
 offer more flexibility.
 
 However, the current separation between backend-agnostic and LLVM-specific code
-has allows the reuse of a significant part of the old `rustc_codegen_llvm`.
+has allowed the reuse of a significant part of the old `rustc_codegen_llvm`.
 Here is the new LOC breakdown between backend-agnostic (BA) and LLVM for the
 most important elements:
 
diff --git a/src/doc/rustc-guide/src/codegen/debugging.md b/src/doc/rustc-dev-guide/src/codegen/debugging.md
similarity index 98%
rename from src/doc/rustc-guide/src/codegen/debugging.md
rename to src/doc/rustc-dev-guide/src/codegen/debugging.md
index 4eab306068..0da29bfb9e 100644
--- a/src/doc/rustc-guide/src/codegen/debugging.md
+++ b/src/doc/rustc-dev-guide/src/codegen/debugging.md
@@ -123,6 +123,8 @@ tutorial above):
 - The `-Ztime-llvm-passes` option measures the time of each LLVM pass
 - The `-Zverify-llvm-ir` option will verify the LLVM IR for correctness
 - The `-Zno-parallel-llvm` will disable parallel compilation of distinct compilation units
+- The `-Zllvm-time-trace` option will output a Chrome profiler compatible JSON file
+  which contains details and timings for LLVM passes.
 
 ### Filing LLVM bug reports
 
diff --git a/src/doc/rustc-guide/src/codegen/updating-llvm.md b/src/doc/rustc-dev-guide/src/codegen/updating-llvm.md
similarity index 100%
rename from src/doc/rustc-guide/src/codegen/updating-llvm.md
rename to src/doc/rustc-dev-guide/src/codegen/updating-llvm.md
diff --git a/src/doc/rustc-guide/src/compiler-debugging.md b/src/doc/rustc-dev-guide/src/compiler-debugging.md
similarity index 100%
rename from src/doc/rustc-guide/src/compiler-debugging.md
rename to src/doc/rustc-dev-guide/src/compiler-debugging.md
diff --git a/src/doc/rustc-guide/src/compiler-team.md b/src/doc/rustc-dev-guide/src/compiler-team.md
similarity index 100%
rename from src/doc/rustc-guide/src/compiler-team.md
rename to src/doc/rustc-dev-guide/src/compiler-team.md
diff --git a/src/doc/rustc-guide/src/compiletest.md b/src/doc/rustc-dev-guide/src/compiletest.md
similarity index 100%
rename from src/doc/rustc-guide/src/compiletest.md
rename to src/doc/rustc-dev-guide/src/compiletest.md
diff --git a/src/doc/rustc-guide/src/const-eval.md b/src/doc/rustc-dev-guide/src/const-eval.md
similarity index 100%
rename from src/doc/rustc-guide/src/const-eval.md
rename to src/doc/rustc-dev-guide/src/const-eval.md
diff --git a/src/doc/rustc-guide/src/conventions.md b/src/doc/rustc-dev-guide/src/conventions.md
similarity index 99%
rename from src/doc/rustc-guide/src/conventions.md
rename to src/doc/rustc-dev-guide/src/conventions.md
index 7f7bf32e21..303eedd4ee 100644
--- a/src/doc/rustc-guide/src/conventions.md
+++ b/src/doc/rustc-dev-guide/src/conventions.md
@@ -12,7 +12,7 @@ at the moment, however, it follows a rather more *chaotic* style.  We
 do have some mandatory formatting conventions, which are automatically
 enforced by a script we affectionately call the "tidy" script.  The
 tidy script runs automatically when you do `./x.py test` and can be run
-in isolation with `./x.py test src/tools/tidy`.
+in isolation with `./x.py test tidy`.
 
 [fmt]: https://github.com/rust-lang-nursery/fmt-rfcs
 
diff --git a/src/doc/rustc-guide/src/crates-io.md b/src/doc/rustc-dev-guide/src/crates-io.md
similarity index 100%
rename from src/doc/rustc-guide/src/crates-io.md
rename to src/doc/rustc-dev-guide/src/crates-io.md
diff --git a/src/doc/rustc-guide/src/debugging-support-in-rustc.md b/src/doc/rustc-dev-guide/src/debugging-support-in-rustc.md
similarity index 98%
rename from src/doc/rustc-guide/src/debugging-support-in-rustc.md
rename to src/doc/rustc-dev-guide/src/debugging-support-in-rustc.md
index 3d08cc8253..a11edba785 100644
--- a/src/doc/rustc-guide/src/debugging-support-in-rustc.md
+++ b/src/doc/rustc-dev-guide/src/debugging-support-in-rustc.md
@@ -77,13 +77,13 @@ the trait object.
 **TODO**: Figure out if the following should be mentioned in the GDB-Rust document rather than
 this guide page so there is no duplication. This is regarding the following comments:
 
-[This comment by Tom](https://github.com/rust-lang/rustc-guide/pull/316#discussion_r284027340)
+[This comment by Tom](https://github.com/rust-lang/rustc-dev-guide/pull/316#discussion_r284027340)
 > gdb's Rust extensions and limitations are documented in the gdb manual:
 https://sourceware.org/gdb/onlinedocs/gdb/Rust.html -- however, this neglects to mention that
 gdb convenience variables and registers follow the gdb $ convention, and that the Rust parser
 implements the gdb @ extension.
 
-[This question by Aman](https://github.com/rust-lang/rustc-guide/pull/316#discussion_r285401353)
+[This question by Aman](https://github.com/rust-lang/rustc-dev-guide/pull/316#discussion_r285401353)
 > @tromey do you think we should mention this part in the GDB-Rust document rather than this
 document so there is no duplication etc.?
 
@@ -276,7 +276,7 @@ set the breakpoints and what happens when you step it.
 * New demangler in LLVM or LLDB.
 
 **TODO**: Check the location of the demangler source.
-[Question on Github](https://github.com/rust-lang/rustc-guide/pull/316#discussion_r283062536).
+[Question on Github](https://github.com/rust-lang/rustc-dev-guide/pull/316#discussion_r283062536).
 
 #### Reuse Rust compiler for expressions
 
diff --git a/src/doc/rustc-guide/src/diagnostics.md b/src/doc/rustc-dev-guide/src/diagnostics.md
similarity index 97%
rename from src/doc/rustc-guide/src/diagnostics.md
rename to src/doc/rustc-dev-guide/src/diagnostics.md
index 0bf869ccdd..c112f3471d 100644
--- a/src/doc/rustc-guide/src/diagnostics.md
+++ b/src/doc/rustc-dev-guide/src/diagnostics.md
@@ -31,7 +31,7 @@ usually have names like `span_err` or `struct_span_err` or `span_warn`, etc...
 There are lots of them; they emit different types of "errors", such as
 warnings, errors, fatal errors, suggestions, etc.
 
-[parsesses]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/sess/struct.ParseSess.html
+[parsesses]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/parse/struct.ParseSess.html
 [session]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/struct.Session.html
 
 In general, there are two classes of such methods: ones that emit an error
@@ -315,19 +315,19 @@ processed. [`Session`][sessbl] and [`ParseSess`][parsebl] both have
 system automatically takes care of handling buffered lints later.
 
 [sessbl]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/struct.Session.html#method.buffer_lint
-[parsebl]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/sess/struct.ParseSess.html#method.buffer_lint
+[parsebl]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/parse/struct.ParseSess.html#method.buffer_lint
 
 Thus, to define a lint that runs early in the compilation, one defines a lint
 like normal but invokes the lint with `buffer_lint`.
 
 #### Linting even earlier in the compiler
 
-The parser (`libsyntax`) is interesting in that it cannot have dependencies on
+The parser (`librustc_ast`) is interesting in that it cannot have dependencies on
 any of the other `librustc*` crates. In particular, it cannot depend on
 `librustc::lint` or `librustc_lint`, where all of the compiler linting
 infrastructure is defined. That's troublesome!
 
-To solve this, `libsyntax` defines its own buffered lint type, which
+To solve this, `librustc_ast` defines its own buffered lint type, which
 `ParseSess::buffer_lint` uses. After macro expansion, these buffered lints are
 then dumped into the `Session::buffered_lints` used by the rest of the compiler.
 
@@ -358,7 +358,7 @@ the structured JSON and see the "human" output (well, _sans_ colors)
 without having to compile everything twice.
 
 The "human" readable and the json format emitter can be found under
-librustc_errors, both were moved from the libsyntax crate to the
+librustc_errors, both were moved from the `librustc_ast` crate to the
 [librustc_errors crate](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_errors/index.html).
 
 The JSON emitter defines [its own `Diagnostic`
diff --git a/src/doc/rustc-guide/src/diagnostics/diagnostic-codes.md b/src/doc/rustc-dev-guide/src/diagnostics/diagnostic-codes.md
similarity index 98%
rename from src/doc/rustc-guide/src/diagnostics/diagnostic-codes.md
rename to src/doc/rustc-dev-guide/src/diagnostics/diagnostic-codes.md
index 22d9b12c37..0e923c5e1b 100644
--- a/src/doc/rustc-guide/src/diagnostics/diagnostic-codes.md
+++ b/src/doc/rustc-dev-guide/src/diagnostics/diagnostic-codes.md
@@ -12,7 +12,7 @@ code. This is a bit tricky since the codes are defined in various crates. To do
 it, run this obscure command:
 
 ```
-./x.py test --stage 0 src/tools/tidy
+./x.py test --stage 0 tidy
 ```
 
 This will invoke the tidy script, which generally checks that your code obeys
diff --git a/src/doc/rustc-guide/src/diagnostics/lintstore.md b/src/doc/rustc-dev-guide/src/diagnostics/lintstore.md
similarity index 100%
rename from src/doc/rustc-guide/src/diagnostics/lintstore.md
rename to src/doc/rustc-dev-guide/src/diagnostics/lintstore.md
diff --git a/src/doc/rustc-guide/src/generic_arguments.md b/src/doc/rustc-dev-guide/src/generic_arguments.md
similarity index 100%
rename from src/doc/rustc-guide/src/generic_arguments.md
rename to src/doc/rustc-dev-guide/src/generic_arguments.md
diff --git a/src/doc/rustc-dev-guide/src/generics.md b/src/doc/rustc-dev-guide/src/generics.md
new file mode 100644
index 0000000000..310b9cda69
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/generics.md
@@ -0,0 +1,144 @@
+# Generics and substitutions
+
+Given a generic type `MyType<A, B, …>`, we may want to swap out the generics `A, B, …` for some
+other types (possibly other generics or concrete types). We do this a lot while doing type
+inference, type checking, and trait solving. Conceptually, during these routines, we may find out
+that one type is equal to another type and want to swap one out for the other and then swap that out
+for another type and so on until we eventually get some concrete types (or an error).
+
+In rustc this is done using the `SubstsRef` that we mentioned above (“substs” = “substitutions”).
+Conceptually, you can think of `SubstsRef` of a list of types that are to be substituted for the
+generic type parameters of the ADT.
+
+`SubstsRef` is a type alias of `List<GenericArg<'tcx>>` (see [`List` rustdocs][list]).
+[`GenericArg`] is essentially a space-efficient wrapper around [`GenericArgKind`], which is an enum
+indicating what kind of generic the type parameter is (type, lifetime, or const).  Thus, `SubstsRef`
+is conceptually like a `&'tcx [GenericArgKind<'tcx>]` slice (but it is actually a `List`).
+
+[list]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.List.html
+[`GenericArg`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/struct.GenericArg.html
+[`GenericArgKind`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/enum.GenericArgKind.html
+
+So why do we use this `List` type instead of making it really a slice? It has the length "inline",
+so `&List` is only 32 bits. As a consequence, it cannot be "subsliced" (that only works if the
+length is out of line).
+
+This also implies that you can check two `List`s for equality via `==` (which would be not be
+possible for ordinary slices). This is precisely because they never represent a "sub-list", only the
+complete `List`, which has been hashed and interned.
+
+So pulling it all together, let’s go back to our example above:
+
+```rust,ignore
+struct MyStruct<T>
+```
+
+- There would be an `AdtDef` (and corresponding `DefId`) for `MyStruct`.
+- There would be a `TyKind::Param` (and corresponding `DefId`) for `T` (more later).
+- There would be a `SubstsRef` containing the list `[GenericArgKind::Type(Ty(T))]`
+    - The `Ty(T)` here is my shorthand for entire other `ty::Ty` that has `TyKind::Param`, which we
+      mentioned in the previous point.
+- This is one `TyKind::Adt` containing the `AdtDef` of `MyStruct` with the `SubstsRef` above.
+
+Finally, we will quickly mention the
+[`Generics`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.Generics.html) type. It
+is used to give information about the type parameters of a type.
+
+### Unsubstituted Generics
+
+So above, recall that in our example the `MyStruct` struct had a generic type `T`. When we are (for
+example) type checking functions that use `MyStruct`, we will need to be able to refer to this type
+`T` without actually knowing what it is. In general, this is true inside all generic definitions: we
+need to be able to work with unknown types. This is done via `TyKind::Param` (which we mentioned in
+the example above).
+
+Each `TyKind::Param` contains two things: the name and the index. In general, the index fully
+defines the parameter and is used by most of the code. The name is included for debug print-outs.
+There are two reasons for this. First, the index is convenient, it allows you to include into the
+list of generic arguments when substituting. Second, the index is more robust. For example, you
+could in principle have two distinct type parameters that use the same name, e.g. `impl<A> Foo<A> {
+fn bar<A>() { .. } }`, although the rules against shadowing make this difficult (but those language
+rules could change in the future).
+
+The index of the type parameter is an integer indicating its order in the list of the type
+parameters. Moreover, we consider the list to include all of the type parameters from outer scopes.
+Consider the following example:
+
+```rust,ignore
+struct Foo<A, B> {
+  // A would have index 0
+  // B would have index 1
+
+  .. // some fields
+}
+impl<X, Y> Foo<X, Y> {
+  fn method<Z>() {
+    // inside here, X, Y and Z are all in scope
+    // X has index 0
+    // Y has index 1
+    // Z has index 2
+  }
+}
+```
+
+When we are working inside the generic definition, we will use `TyKind::Param` just like any other
+`TyKind`; it is just a type after all. However, if we want to use the generic type somewhere, then
+we will need to do substitutions.
+
+For example suppose that the `Foo<A, B>` type from the previous example has a field that is a
+`Vec<A>`. Observe that `Vec` is also a generic type. We want to tell the compiler that the type
+parameter of `Vec` should be replaced with the `A` type parameter of `Foo<A, B>`. We do that with
+substitutions:
+
+```rust,ignore
+struct Foo<A, B> { // Adt(Foo, &[Param(0), Param(1)])
+  x: Vec<A>, // Adt(Vec, &[Param(0)])
+  ..
+}
+
+fn bar(foo: Foo<u32, f32>) { // Adt(Foo, &[u32, f32])
+  let y = foo.x; // Vec<Param(0)> => Vec<u32>
+}
+```
+
+This example has a few different substitutions:
+
+- In the definition of `Foo`, in the type of the field `x`, we replace `Vec`'s type parameter with
+  `Param(0)`, the first parameter of `Foo<A, B>`, so that the type of `x` is `Vec<A>`.
+- In the function `bar`, we specify that we want a `Foo<u32, f32>`. This means that we will
+  substitute `Param(0)` and `Param(1)` with `u32` and `f32`.
+- In the body of `bar`, we access `foo.x`, which has type `Vec<Param(0)>`, but `Param(0)` has been
+  substituted for `u32`, so `foo.x` has type `Vec<u32>`.
+
+Let’s look a bit more closely at that last substitution to see why we use indexes. If we want to
+find the type of `foo.x`, we can get generic type of `x`, which is `Vec<Param(0)>`. Now we can take
+the index `0` and use it to find the right type substitution: looking at `Foo`'s `SubstsRef`, we
+have the list `[u32, f32]` , since we want to replace index `0`, we take the 0-th index of this
+list, which is `u32`. Voila!
+
+You may have a couple of followup questions…
+
+ **`type_of`** How do we get the “generic type of `x`"? You can get the type of pretty much anything
+ with the   `tcx.type_of(def_id)` query. In this case, we would pass the `DefId` of the field `x`.
+ The `type_of` query always returns the definition with the generics that are in scope of the
+ definition. For example, `tcx.type_of(def_id_of_my_struct)` would return the “self-view” of
+ `MyStruct`: `Adt(Foo, &[Param(0), Param(1)])`.
+
+**`subst`** How do we actually do the substitutions? There is a function for that too! You use
+[`subst`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/trait.Subst.html) to
+replace a `SubstRef` with another list of types.
+
+[Here is an example of actually using `subst` in the compiler][substex].  The exact details are not
+too important, but in this piece of code, we happen to be converting from the `rustc_hir::Ty` to
+a real `ty::Ty`. You can see that we first get some substitutions (`substs`).  Then we call
+`type_of` to get a type and call `ty.subst(substs)` to get a new version of `ty` with
+the substitutions made.
+
+[substex]: https://github.com/rust-lang/rust/blob/597f432489f12a3f33419daa039ccef11a12c4fd/src/librustc_typeck/astconv.rs#L942-L953
+
+**Note on indices:** It is possible for the indices in `Param` to not match with what we expect. For
+example, the index could be out of bounds or it could be the index of a lifetime when we were
+expecting a type. These sorts of errors would be caught earlier in the compiler when translating
+from a `rustc_hir::Ty` to a `ty::Ty`. If they occur later, that is a compiler bug.
+
+
diff --git a/src/doc/rustc-guide/src/high-level-overview.md b/src/doc/rustc-dev-guide/src/high-level-overview.md
similarity index 97%
rename from src/doc/rustc-guide/src/high-level-overview.md
rename to src/doc/rustc-dev-guide/src/high-level-overview.md
index e4b9ff3720..76f4bc9553 100644
--- a/src/doc/rustc-guide/src/high-level-overview.md
+++ b/src/doc/rustc-dev-guide/src/high-level-overview.md
@@ -7,7 +7,7 @@ there live many crates. These crates contain the sources for the
 standard library and the compiler.  This document, of course, focuses
 on the latter.
 
-Rustc consists of a number of crates, including `syntax`,
+Rustc consists of a number of crates, including `rustc_ast`,
 `rustc`, `rustc_target`, `rustc_codegen`, `rustc_driver`, and
 many more. The source for each crate can be found in a directory
 like `src/libXXX`, where `XXX` is the crate name.
@@ -33,7 +33,7 @@ rustc_codegen  rustc_borrowck   ...  rustc_metadata
                     rustc
                        |
                        v
-                    syntax
+                   rustc_ast
                     /    \
                   /       \
            rustc_span  rustc_builtin_macros
@@ -92,7 +92,7 @@ take:
 1. **Parsing input**
     - this processes the `.rs` files and produces the AST
       ("abstract syntax tree")
-    - the AST is defined in `src/libsyntax/ast.rs`. It is intended to match the lexical
+    - the AST is defined in `src/librustc_ast/ast.rs`. It is intended to match the lexical
       syntax of the Rust language quite closely.
 2. **Name resolution, macro expansion, and configuration**
     - once parsing is complete, we process the AST recursively, resolving
diff --git a/src/doc/rustc-guide/src/hir-debugging.md b/src/doc/rustc-dev-guide/src/hir-debugging.md
similarity index 100%
rename from src/doc/rustc-guide/src/hir-debugging.md
rename to src/doc/rustc-dev-guide/src/hir-debugging.md
diff --git a/src/doc/rustc-guide/src/hir.md b/src/doc/rustc-dev-guide/src/hir.md
similarity index 98%
rename from src/doc/rustc-guide/src/hir.md
rename to src/doc/rustc-dev-guide/src/hir.md
index 60a3c3b8bb..2c3e44a72b 100644
--- a/src/doc/rustc-guide/src/hir.md
+++ b/src/doc/rustc-dev-guide/src/hir.md
@@ -100,7 +100,7 @@ sorts of identifiers in active use:
 [`DefId`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/def_id/struct.DefId.html
 [`HirId`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir_id/struct.HirId.html
 [`BodyId`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.BodyId.html
-[`NodeId`]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast/struct.NodeId.html
+[`NodeId`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/node_id/struct.NodeId.html
 
 We also have an internal map to go from `DefId` to what’s called "Def path". "Def path" is like a
 module path but a bit more rich. For example, it may be `crate::foo::MyStruct` that identifies
diff --git a/src/doc/rustc-guide/src/ice-breaker/about.md b/src/doc/rustc-dev-guide/src/ice-breaker/about.md
similarity index 94%
rename from src/doc/rustc-guide/src/ice-breaker/about.md
rename to src/doc/rustc-dev-guide/src/ice-breaker/about.md
index 7869bdbce9..e71001e5bd 100644
--- a/src/doc/rustc-guide/src/ice-breaker/about.md
+++ b/src/doc/rustc-dev-guide/src/ice-breaker/about.md
@@ -49,6 +49,7 @@ cargo run add-person $your_user_name
 Example PRs:
 
 * [Example of adding yourself to the LLVM ICE-breakers.](https://github.com/rust-lang/team/pull/140)
+* [Example of adding yourself to the Cleanup Crew ICE-breakers.](https://github.com/rust-lang/team/pull/221)
 
 ## Tagging an issue for an ICE-breaker group
 
@@ -58,6 +59,7 @@ team. For example:
 
 ```text
 @rustbot ping icebreakers-llvm
+@rustbot ping icebreakers-cleanup-crew
 ```
 
 **Note though that this should only be done by compiler team members
diff --git a/src/doc/rustc-dev-guide/src/ice-breaker/cleanup-crew.md b/src/doc/rustc-dev-guide/src/ice-breaker/cleanup-crew.md
new file mode 100644
index 0000000000..436b51fd18
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/ice-breaker/cleanup-crew.md
@@ -0,0 +1,114 @@
+# Cleanup Crew
+
+**Github Label:** [ICEBreaker-Cleanup-Crew]
+
+[ICEBreaker-Cleanup-Crew]: https://github.com/rust-lang/rust/labels/ICEBreaker-Cleanup-Crew
+
+The "Cleanup Crew" are focused on improving bug reports. Specifically,
+the goal is to try to ensure that every bug report has all the
+information that will be needed for someone to fix it:
+
+* a minimal, standalone example that shows the problem
+* links to duplicates or related bugs
+* if the bug is a regression (something that used to work, but no longer does),
+  then a bisection to the PR or nightly that caused the regression
+
+This kind of cleanup is invaluable in getting bugs fixed. Better
+still, it can be done by anybody who knows Rust, without any
+particularly deep knowledge of the compiler.
+
+Let's look a bit at the workflow for doing "cleanup crew" actions.
+
+## Finding a minimal, standalone example
+
+Here the ultimate goal is to produce an example that reproduces the same
+problem but without relying on any external crates. Such a test ought to contain
+as little code as possible, as well. This will make it much easier to isolate the problem.
+
+However, even if the "ultimate minimal test" cannot be achieved, it's
+still useful to post incremental minimizations. For example, if you
+can eliminate some of the external dependencies, that is helpful, and
+so forth. 
+
+It's particularly useful to reduce to an example that works
+in the [Rust playground](https://play.rust-lang.org/), rather than
+requiring people to checkout a cargo build.
+
+There are many resources for how to produce minimized test cases. Here
+are a few:
+
+* The [rust-reduce](https://github.com/jethrogb/rust-reduce) tool can try to reduce
+  code automatically.
+  * The [C-reduce](https://embed.cs.utah.edu/creduce/) tool also works
+    on Rust code, though it requires that you start from a single
+    file. (XXX link to some post explaining how to do it?)
+* pnkfelix's [Rust Bug Minimization Patterns] blog post
+  * This post focuses on "heavy bore" techniques, where you are
+    starting with a large, complex cargo project that you wish to
+    narrow down to something standalone.
+
+[Rust Bug Minimization Patterns]: http://blog.pnkfx.org/blog/2019/11/18/rust-bug-minimization-patterns/
+
+## Links to duplicate or related bugs
+
+If you are on the "Cleanup Crew", you will sometimes see multiple bug
+reports that seem very similar. You can link one to the other just by
+mentioning the other bug number in a Github comment. Sometimes it is
+useful to close duplicate bugs. But if you do so, you should always
+copy any test case from the bug you are closing to the other bug that
+remains open, as sometimes duplicate-looking bugs will expose
+different facets of the same problem.
+
+## Bisecting regressions
+
+For regressions (something that used to work, but no longer does), it
+is super useful if we can figure out precisely when the code stopped
+working.  The gold standard is to be able to identify the precise
+**PR** that broke the code, so we can ping the author, but even
+narrowing it down to a nightly build is helpful, especially as that
+then gives us a range of PRs. (One other challenge is that we
+sometimes land "rollup" PRs, which combine multiple PRs into one.)
+
+### cargo-bisect-rustc
+
+To help in figuring out the cause of a regression we have a tool
+called [cargo-bisect-rustc]. It will automatically download and test
+various builds of rustc. For recent regressions, it is even able to
+use the builds from our CI to track down the regression to a specific
+PR; for older regressions, it will simply identify a nightly.
+
+To learn to use [cargo-bisect-rustc], check out [this blog
+post][learn], which gives a quick introduction to how it works. You
+can also ask questions at the Zulip stream
+[`#t-compiler/cargo-bisect-rustc`][zcbr], or help in improving the tool.
+
+[cargo-bisect-rustc]: https://github.com/rust-lang/cargo-bisect-rustc/
+[learn]: https://blog.rust-lang.org/inside-rust/2019/12/18/bisecting-rust-compiler.html
+[zcbr]: https://rust-lang.zulipchat.com/#narrow/stream/217417-t-compiler.2Fcargo-bisect-rustc
+
+### identifying the range of PRs in a nightly
+
+If the regression occurred more than 90 days ago, then
+cargo-bisect-rustc will not able to identify the particular PR that
+caused the regression, just the nightly build. In that case, we can
+identify the set of PRs that this corresponds to by using the git
+history. 
+
+The command `rustc +nightly -vV` will cause rustc to output a number
+of useful bits of version info, including the `commit-hash`. Given the
+commit-hash of two nightly versions, you can find all of PRs that have
+landed in between by taking the following steps:
+
+1. Go to an update checkout of the [rust-lang/rust] repository
+2. Execute the command `git log --author=bors --format=oneline SHA1..SHA2`
+  * This will list out all of the commits by bors, which is our merge bot
+  * Each commit corresponds to one PR, and information about the PR should be in the description
+3. Copy and paste that information into the bug report
+
+Often, just eye-balling the PR descriptions (which are included in the
+commit messages) will give you a good idea which one likely caused the
+problem. But if you're unsure feel free to just ping the compiler team
+(`@rust-lang/compiler`) or else to ping the authors of the PR
+themselves.
+
+[rust-lang/rust]: https://github.com/rust-lang/rust/
diff --git a/src/doc/rustc-guide/src/ice-breaker/llvm.md b/src/doc/rustc-dev-guide/src/ice-breaker/llvm.md
similarity index 93%
rename from src/doc/rustc-guide/src/ice-breaker/llvm.md
rename to src/doc/rustc-dev-guide/src/ice-breaker/llvm.md
index e0c90fdafc..8a8ef411b4 100644
--- a/src/doc/rustc-guide/src/ice-breaker/llvm.md
+++ b/src/doc/rustc-dev-guide/src/ice-breaker/llvm.md
@@ -16,7 +16,7 @@ the result of an LLVM upgrade. The goal here is:
 ## Helpful tips and options
 
 The ["Debugging LLVM"][d] section of the
-rustc-guide gives a step-by-step process for how to help debug bugs
+rustc-dev-guide gives a step-by-step process for how to help debug bugs
 caused by LLVM. In particular, it discusses how to emit LLVM IR, run
 the LLVM IR optimization pipeliness, and so forth. You may also find
 it useful to look at the various codegen options listed under `-Chelp`
diff --git a/src/doc/rustc-guide/src/img/rustc_stages.svg b/src/doc/rustc-dev-guide/src/img/rustc_stages.svg
similarity index 100%
rename from src/doc/rustc-guide/src/img/rustc_stages.svg
rename to src/doc/rustc-dev-guide/src/img/rustc_stages.svg
diff --git a/src/doc/rustc-guide/src/implementing_new_features.md b/src/doc/rustc-dev-guide/src/implementing_new_features.md
similarity index 95%
rename from src/doc/rustc-guide/src/implementing_new_features.md
rename to src/doc/rustc-dev-guide/src/implementing_new_features.md
index ff9a709e6f..780950c71c 100644
--- a/src/doc/rustc-guide/src/implementing_new_features.md
+++ b/src/doc/rustc-dev-guide/src/implementing_new_features.md
@@ -106,8 +106,8 @@ for stabilization in a checklist, e.g.,
 
 - [ ] Implement the RFC. (CC @rust-lang/compiler -- can anyone write
       up mentoring instructions?)
-- [ ] Adjust the documentation. ([See instructions on rustc-guide.](https://rust-lang.github.io/rustc-guide/stabilization_guide.html#documentation-prs))
-- [ ] Stabilize the feature. ([See instructions on rustc-guide.](https://rust-lang.github.io/rustc-guide/stabilization_guide.html#stabilization-pr))
+- [ ] Adjust the documentation. ([See instructions on rustc-dev-guide.](https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#documentation-prs))
+- [ ] Stabilize the feature. ([See instructions on rustc-dev-guide.](https://rustc-dev-guide.rust-lang.org/stabilization_guide.html#stabilization-pr))
 ```
 
 <a name="stability-in-code"></a>
@@ -129,7 +129,7 @@ a new unstable feature:
    in the active `declare_features` block:
 
    ```rust,ignore
-   // description of feature
+   /// description of feature
    (active, $feature_name, "$current_nightly_version", Some($tracking_issue_number), $edition)
    ```
 
@@ -175,7 +175,7 @@ a new unstable feature:
 8. Get your PR reviewed and land it. You have now successfully
    implemented a feature in Rust!
 
-[`GatedSpans`]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/sess/struct.GatedSpans.html
+[`GatedSpans`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/parse/struct.GatedSpans.html
 [`rustc_ast_passes::feature_gate::check_crate`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast_passes/feature_gate/fn.check_crate.html
 [value the stability of Rust]: https://github.com/rust-lang/rfcs/blob/master/text/1122-language-semver.md
 [stability in code]: #stability-in-code
diff --git a/src/doc/rustc-guide/src/incrcomp-debugging.md b/src/doc/rustc-dev-guide/src/incrcomp-debugging.md
similarity index 100%
rename from src/doc/rustc-guide/src/incrcomp-debugging.md
rename to src/doc/rustc-dev-guide/src/incrcomp-debugging.md
diff --git a/src/doc/rustc-guide/src/lowering.md b/src/doc/rustc-dev-guide/src/lowering.md
similarity index 100%
rename from src/doc/rustc-guide/src/lowering.md
rename to src/doc/rustc-dev-guide/src/lowering.md
diff --git a/src/doc/rustc-guide/src/macro-expansion.md b/src/doc/rustc-dev-guide/src/macro-expansion.md
similarity index 96%
rename from src/doc/rustc-guide/src/macro-expansion.md
rename to src/doc/rustc-dev-guide/src/macro-expansion.md
index 9280fa9bc4..db58733ad1 100644
--- a/src/doc/rustc-guide/src/macro-expansion.md
+++ b/src/doc/rustc-dev-guide/src/macro-expansion.md
@@ -1,6 +1,6 @@
 # Macro expansion
 
-> `libsyntax`, `librustc_expand`, and `librustc_builtin_macros` are all undergoing
+> `librustc_ast`, `librustc_expand`, and `librustc_builtin_macros` are all undergoing
 > refactoring, so some of the links in this chapter may be broken.
 
 Macro expansion happens during parsing. `rustc` has two parsers, in fact: the
@@ -69,14 +69,13 @@ defined in [`src/librustc_expand/mbe/macro_parser.rs`][code_mp].
 The interface of the macro parser is as follows (this is slightly simplified):
 
 ```rust,ignore
-fn parse(
-    sess: ParserSession,
-    tts: TokenStream,
-    ms: &[TokenTree]
+fn parse_tt(
+    parser: &mut Cow<Parser>, 
+    ms: &[TokenTree],
 ) -> NamedParseResult
 ```
 
-In this interface:
+We use these items in macro parser:
 
 - `sess` is a "parsing session", which keeps track of some metadata. Most
   notably, this is used to keep track of errors that are generated so they can
@@ -211,7 +210,7 @@ TODO: maybe something about macros 2.0?
 [code_dir]: https://github.com/rust-lang/rust/tree/master/src/librustc_expand/mbe
 [code_mp]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/mbe/macro_parser
 [code_mr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/mbe/macro_rules
-[code_parse_int]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/mbe/macro_parser/fn.parse.html
+[code_parse_int]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_expand/mbe/macro_parser/fn.parse_tt.html
 [parsing]: ./the-parser.html
 
 
@@ -228,7 +227,7 @@ just have a zulip discussion where you tell us (WG-learning) everything you
 know about macros/expansion/hygiene. We were thinking this could be less formal
 (and less work for you) than compiler lecture series lecture... thoughts?
 
-mark-i-m: The goal is to fill out that long-standing gap in the rustc-guide
+mark-i-m: The goal is to fill out that long-standing gap in the rustc-dev-guide
 
 Vadim Petrochenkov: Ok, I'm at UTC+03:00 and generally available in the
 evenings (or weekends).
@@ -362,24 +361,24 @@ be accessed from any Ident without any context) librustc_span/lib.rs - some
 secondary methods like macro backtrace using primary methods from hygiene.rs
 librustc_builtin_macros - implementations of built-in macros (including macro attributes
 and derives) and some other early code generation facilities like injection of
-standard library imports or generation of test harness.  libsyntax/config.rs -
+standard library imports or generation of test harness.  librustc_ast/config.rs -
 implementation of cfg/cfg_attr (they treated specially from other macros),
-should probably be moved into libsyntax/ext.  libsyntax/tokenstream.rs +
-libsyntax/parse/token.rs - structures for compiler-side tokens, token trees,
-and token streams.  libsyntax/ext - various expansion-related stuff
-libsyntax/ext/base.rs - basic structures used by expansion
-libsyntax/ext/expand.rs - some expansion structures and the bulk of expansion
+should probably be moved into librustc_ast/ext.  librustc_ast/tokenstream.rs +
+librustc_ast/parse/token.rs - structures for compiler-side tokens, token trees,
+and token streams.  librustc_ast/ext - various expansion-related stuff
+librustc_ast/ext/base.rs - basic structures used by expansion
+librustc_ast/ext/expand.rs - some expansion structures and the bulk of expansion
 infrastructure code - collecting macro invocations, calling into resolve for
 them, calling their expanding functions, and integrating the results back into
-AST libsyntax/ext/placeholder.rs - the part of expand.rs responsible for
+AST librustc_ast/ext/placeholder.rs - the part of expand.rs responsible for
 "integrating the results back into AST" basicallly, "placeholder" is a
 temporary AST node replaced with macro expansion result nodes
-libsyntax/ext/builer.rs - helper functions for building AST for built-in macros
+librustc_ast/ext/builer.rs - helper functions for building AST for built-in macros
 in librustc_builtin_macros (and user-defined syntactic plugins previously), can probably
-be moved into librustc_builtin_macros these days libsyntax/ext/proc_macro.rs +
-libsyntax/ext/proc_macro_server.rs - interfaces between the compiler and the
+be moved into librustc_builtin_macros these days librustc_ast/ext/proc_macro.rs +
+librustc_ast/ext/proc_macro_server.rs - interfaces between the compiler and the
 stable proc_macro library, converting tokens and token streams between the two
-representations and sending them through C ABI libsyntax/ext/tt -
+representations and sending them through C ABI librustc_ast/ext/tt -
 implementation of macro_rules, turns macro_rules DSL into something with
 signature Fn(TokenStream) -> TokenStream that can eat and produce tokens,
 @mark-i-m knows more about this librustc_resolve/macros.rs - resolving macro
@@ -409,8 +408,8 @@ piece of AST, etc), this is an enum that lists them
 ProcMacro/TTMacroExpander/AttrProcMacro/MultiItemModifier - traits representing
 the expander signatures (TODO: change and rename the signatures into something
 more consistent) trait Resolver - a trait used to break crate dependencies (so
-resolver services can be used in libsyntax, despite librustc_resolve and pretty
-much everything else depending on libsyntax) ExtCtxt/ExpansionData - various
+resolver services can be used in librustc_ast, despite librustc_resolve and pretty
+much everything else depending on librustc_ast) ExtCtxt/ExpansionData - various
 intermediate data kept and used by expansion infra in the process of its work
 AstFragment - a piece of AST that can be produced by a macro (may include
 multiple homogeneous AST nodes, like e.g. a list of items) Annotatable - a
@@ -629,7 +628,7 @@ Vadim Petrochenkov: A thread for offline questions-answers would be good too.
     A thread for offline questions-answers would be good too.
 
 I don't mind using this thread, since it already has a lot of info in it. We
-also plan to summarize the info from this thread into the rustc-guide.
+also plan to summarize the info from this thread into the rustc-dev-guide.
 
     Sure, why not.
 
@@ -649,7 +648,7 @@ eager expansion...
 Santiago Pastorino: sorry but I couldn't follow that much today, will read it
 when I have some time later
 
-Santiago Pastorino: btw https://github.com/rust-lang/rustc-guide/issues/398
+Santiago Pastorino: btw https://github.com/rust-lang/rustc-dev-guide/issues/398
 
 mark-i-m: @Vadim Petrochenkov Would 7pm UTC on August 21 work for a followup?
 
diff --git a/src/doc/rustc-dev-guide/src/memory.md b/src/doc/rustc-dev-guide/src/memory.md
new file mode 100644
index 0000000000..bfec4fe198
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/memory.md
@@ -0,0 +1,88 @@
+# Memory Management in Rustc
+
+Rustc tries to be pretty careful how it manages memory. The compiler allocates
+_a lot_ of data structures throughout compilation, and if we are not careful,
+it will take a lot of time and space to do so.
+
+One of the main way the compiler manages this is using arenas and interning.
+
+## Arenas and  Interning
+
+We create a LOT of data structures during compilation. For performance reasons,
+we allocate them from a global memory pool; they are each allocated once from a
+long-lived *arena*. This is called _arena allocation_. This system reduces
+allocations/deallocations of memory. It also allows for easy comparison of
+types for equality: for each interned type `X`, we implemented [`PartialEq for
+X`][peqimpl], so we can just compare pointers. The [`CtxtInterners`] type
+contains a bunch of maps of interned types and the arena itself.
+
+[peqimpl]: https://github.com/rust-lang/rust/blob/3ee936378662bd2e74be951d6a7011a95a6bd84d/src/librustc/ty/mod.rs#L528-L534
+[`CtxtInterners`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.CtxtInterners.html#structfield.arena
+
+### Example: `ty::TyS`
+
+Taking the example of [`ty::TyS`] which represents a type in the compiler (you
+can read more [here](./ty.md)).  Each time we want to construct a type, the
+compiler doesn’t naively allocate from the buffer.  Instead, we check if that
+type was already constructed. If it was, we just get the same pointer we had
+before, otherwise we make a fresh pointer. With this schema if we want to know
+if two types are the same, all we need to do is compare the pointers which is
+efficient. `TyS` is carefully setup so you never construct them on the stack.
+You always allocate them from this arena and you always intern them so they are
+unique.
+
+At the beginning of the compilation we make a buffer and each time we need to allocate a type we use
+some of this memory buffer. If we run out of space we get another one. The lifetime of that buffer
+is `'tcx`. Our types are tied to that lifetime, so when compilation finishes all the memory related
+to that buffer is freed and our `'tcx` references would be invalid.
+
+In addition to types, there are a number of other arena-allocated data structures that you can
+allocate, and which are found in this module. Here are a few examples:
+
+- [`Substs`][subst], allocated with `mk_substs` – this will intern a slice of types, often used to
+  specify the values to be substituted for generics (e.g. `HashMap<i32, u32>` would be represented
+  as a slice `&'tcx [tcx.types.i32, tcx.types.u32]`).
+- [`TraitRef`], typically passed by value – a **trait reference** consists of a reference to a trait
+  along with its various type parameters (including `Self`), like `i32: Display` (here, the def-id
+  would reference the `Display` trait, and the substs would contain `i32`). Note that `def-id` is
+  defined and discussed in depth in the `AdtDef and DefId` section.
+- [`Predicate`] defines something the trait system has to prove (see `traits` module).
+
+[subst]: ./generic_arguments.html#subst
+[`TraitRef`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TraitRef.html
+[`Predicate`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.Predicate.html
+
+[`ty::TyS`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyS.html
+
+## The tcx and how it uses lifetimes
+
+The `tcx` ("typing context") is the central data structure in the compiler. It is the context that
+you use to perform all manner of queries. The struct `TyCtxt` defines a reference to this shared
+context:
+
+```rust,ignore
+tcx: TyCtxt<'tcx>
+//          ----
+//          |
+//          arena lifetime
+```
+
+As you can see, the `TyCtxt` type takes a lifetime parameter. When you see a reference with a
+lifetime like `'tcx`, you know that it refers to arena-allocated data (or data that lives as long as
+the arenas, anyhow).
+
+### A Note On Lifetimes
+
+The Rust compiler is a fairly large program containing lots of big data
+structures (e.g. the AST, HIR, and the type system) and as such, arenas and
+references are heavily relied upon to minimize unnecessary memory use. This
+manifests itself in the way people can plug into the compiler (i.e. the
+[driver](./rustc-driver.md)), preferring a "push"-style API (callbacks) instead
+of the more Rust-ic "pull" style (think the `Iterator` trait).
+
+Thread-local storage and interning are used a lot through the compiler to reduce
+duplication while also preventing a lot of the ergonomic issues due to many
+pervasive lifetimes. The [`rustc::ty::tls`][tls] module is used to access these
+thread-locals, although you should rarely need to touch it.
+
+[tls]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/tls/index.html
diff --git a/src/doc/rustc-guide/src/method-lookup.md b/src/doc/rustc-dev-guide/src/method-lookup.md
similarity index 100%
rename from src/doc/rustc-guide/src/method-lookup.md
rename to src/doc/rustc-dev-guide/src/method-lookup.md
diff --git a/src/doc/rustc-guide/src/mir/construction.md b/src/doc/rustc-dev-guide/src/mir/construction.md
similarity index 100%
rename from src/doc/rustc-guide/src/mir/construction.md
rename to src/doc/rustc-dev-guide/src/mir/construction.md
diff --git a/src/doc/rustc-guide/src/mir/debugging.md b/src/doc/rustc-dev-guide/src/mir/debugging.md
similarity index 100%
rename from src/doc/rustc-guide/src/mir/debugging.md
rename to src/doc/rustc-dev-guide/src/mir/debugging.md
diff --git a/src/doc/rustc-guide/src/mir/index.md b/src/doc/rustc-dev-guide/src/mir/index.md
similarity index 87%
rename from src/doc/rustc-guide/src/mir/index.md
rename to src/doc/rustc-dev-guide/src/mir/index.md
index c02b86e9a1..dbc2a316f0 100644
--- a/src/doc/rustc-guide/src/mir/index.md
+++ b/src/doc/rustc-dev-guide/src/mir/index.md
@@ -84,11 +84,7 @@ with a bunch of variable declarations. They look like this:
 
 ```mir
 let mut _0: ();                      // return place
-scope 1 {
-    let mut _1: std::vec::Vec<i32>;  // "vec" in scope 1 at src/main.rs:2:9: 2:16
-}
-scope 2 {
-}
+let mut _1: std::vec::Vec<i32>;      // in scope 0 at src/main.rs:2:9: 2:16
 let mut _2: ();
 let mut _3: &mut std::vec::Vec<i32>;
 let mut _4: ();
@@ -97,11 +93,27 @@ let mut _5: &mut std::vec::Vec<i32>;
 
 You can see that variables in MIR don't have names, they have indices,
 like `_0` or `_1`.  We also intermingle the user's variables (e.g.,
-`_1`) with temporary values (e.g., `_2` or `_3`). You can tell the
-difference between user-defined variables have a comment that gives
-you their original name (`// "vec" in scope 1...`). The "scope" blocks
-(e.g., `scope 1 { .. }`) describe the lexical structure of the source
-program (which names were in scope when).
+`_1`) with temporary values (e.g., `_2` or `_3`). You can tell apart
+user-defined variables because they have debuginfo associated to them (see below).
+
+**User variable debuginfo.** Below the variable declarations, we find the only
+hint that `_1` represents a user variable:
+```mir
+scope 1 {
+    debug vec => _1;                 // in scope 1 at src/main.rs:2:9: 2:16
+}
+```
+Each `debug <Name> => <Place>;` annotation describes a named user variable,
+and where (i.e. the place) a debugger can find the data of that variable.
+Here the mapping is trivial, but optimizations may complicate the place,
+or lead to multiple user variables sharing the same place.
+Additionally, closure captures are described using the same system, and so
+they're complicated even without optimizations, e.g.: `debug x => (*((*_1).0: &T));`.
+
+The "scope" blocks (e.g., `scope 1 { .. }`) describe the lexical structure of
+the source program (which names were in scope when), so any part of the program
+annotated with `// in scope 0` would be missing `vec`, if you were stepping
+through the code in a debugger, for example.
 
 **Basic blocks.** Reading further, we see our first **basic block** (naturally
 it may look slightly different when you view it, and I am ignoring some of the
diff --git a/src/doc/rustc-guide/src/mir/mir_detailed.dot b/src/doc/rustc-dev-guide/src/mir/mir_detailed.dot
similarity index 100%
rename from src/doc/rustc-guide/src/mir/mir_detailed.dot
rename to src/doc/rustc-dev-guide/src/mir/mir_detailed.dot
diff --git a/src/doc/rustc-guide/src/mir/mir_detailed.svg b/src/doc/rustc-dev-guide/src/mir/mir_detailed.svg
similarity index 100%
rename from src/doc/rustc-guide/src/mir/mir_detailed.svg
rename to src/doc/rustc-dev-guide/src/mir/mir_detailed.svg
diff --git a/src/doc/rustc-guide/src/mir/mir_overview.dot b/src/doc/rustc-dev-guide/src/mir/mir_overview.dot
similarity index 100%
rename from src/doc/rustc-guide/src/mir/mir_overview.dot
rename to src/doc/rustc-dev-guide/src/mir/mir_overview.dot
diff --git a/src/doc/rustc-guide/src/mir/mir_overview.svg b/src/doc/rustc-dev-guide/src/mir/mir_overview.svg
similarity index 100%
rename from src/doc/rustc-guide/src/mir/mir_overview.svg
rename to src/doc/rustc-dev-guide/src/mir/mir_overview.svg
diff --git a/src/doc/rustc-guide/src/mir/optimizations.md b/src/doc/rustc-dev-guide/src/mir/optimizations.md
similarity index 84%
rename from src/doc/rustc-guide/src/mir/optimizations.md
rename to src/doc/rustc-dev-guide/src/mir/optimizations.md
index f3fdd52f31..03dc219536 100644
--- a/src/doc/rustc-guide/src/mir/optimizations.md
+++ b/src/doc/rustc-dev-guide/src/mir/optimizations.md
@@ -8,8 +8,8 @@ to do, so compilation is faster. Note that since MIR is generic (not
 effective; we can optimize the generic version, so all of the monomorphizations
 are cheaper!
 
-[mir]: https://rust-lang.github.io/rustc-guide/mir/index.html
-[monomorph]: https://rust-lang.github.io/rustc-guide/appendix/glossary.html?highlight=monomorphize#appendix-c-glossary
+[mir]: https://rustc-dev-guide.rust-lang.org/mir/index.html
+[monomorph]: https://rustc-dev-guide.rust-lang.org/appendix/glossary.html?highlight=monomorphize#appendix-c-glossary
 
 MIR optimizations run after borrow checking. We run a series of optimization
 passes over the MIR to improve it. Some passes are required to run on all code,
@@ -22,9 +22,9 @@ run and that some validation has occurred. Then, it [steals][steal] the MIR
 optimizes it, and returns the improved MIR.
 
 [optmir]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir/transform/fn.optimized_mir.html
-[query]: https://rust-lang.github.io/rustc-guide/query.html
-[defid]: https://rust-lang.github.io/rustc-guide/appendix/glossary.html?highlight=DefId#appendix-c-glossary
-[steal]: https://rust-lang.github.io/rustc-guide/mir/passes.html?highlight=steal#stealing
+[query]: https://rustc-dev-guide.rust-lang.org/query.html
+[defid]: https://rustc-dev-guide.rust-lang.org/appendix/glossary.html?highlight=DefId#appendix-c-glossary
+[steal]: https://rustc-dev-guide.rust-lang.org/mir/passes.html?highlight=steal#stealing
 
 ## Defining optimization passes
 
diff --git a/src/doc/rustc-guide/src/mir/passes.md b/src/doc/rustc-dev-guide/src/mir/passes.md
similarity index 100%
rename from src/doc/rustc-guide/src/mir/passes.md
rename to src/doc/rustc-dev-guide/src/mir/passes.md
diff --git a/src/doc/rustc-guide/src/mir/visitor.md b/src/doc/rustc-dev-guide/src/mir/visitor.md
similarity index 100%
rename from src/doc/rustc-guide/src/mir/visitor.md
rename to src/doc/rustc-dev-guide/src/mir/visitor.md
diff --git a/src/doc/rustc-guide/src/miri.md b/src/doc/rustc-dev-guide/src/miri.md
similarity index 100%
rename from src/doc/rustc-guide/src/miri.md
rename to src/doc/rustc-dev-guide/src/miri.md
diff --git a/src/doc/rustc-guide/src/name-resolution.md b/src/doc/rustc-dev-guide/src/name-resolution.md
similarity index 86%
rename from src/doc/rustc-guide/src/name-resolution.md
rename to src/doc/rustc-dev-guide/src/name-resolution.md
index 3117217e5e..6dfbd91a86 100644
--- a/src/doc/rustc-guide/src/name-resolution.md
+++ b/src/doc/rustc-dev-guide/src/name-resolution.md
@@ -1,9 +1,26 @@
 # Name resolution
 
-The name resolution is a two-phase process. In the first phase, which runs
+## Basics
+
+In our programs we can refer to variables, types, functions, etc, by giving them
+a name. These names are not always unique. For example, take this valid Rust
+program:
+
+```rust
+type x = u32;
+let x: x = 1;
+let y: x = 2;
+```
+
+How do we know on line 3 whether `x` is a type (u32) or a value (1)? These
+conflicts are resolved during name resolution. In this specific case, name
+resolution defines that type names and variable names live in separate
+namespaces and therefore can co-exist.
+
+The name resolution in Rust is a two-phase process. In the first phase, which runs
 during macro expansion, we build a tree of modules and resolve imports. Macro
 expansion and name resolution communicate with each other via the `Resolver`
-trait, defined in `libsyntax`.
+trait, defined in `librustc_ast`.
 
 The input to the second phase is the syntax tree, produced by parsing input
 files and expanding macros. This phase produces links from all the names in the
@@ -20,7 +37,7 @@ The name resolution lives in the `librustc_resolve` crate, with the meat in
 
 ## Namespaces
 
-Different kind of symbols live in different namespaces ‒ eg. types don't
+Different kind of symbols live in different namespaces ‒ e.g. types don't
 clash with variables. This usually doesn't happen, because variables start with
 lower-case letter while types with upper case one, but this is only a
 convention. This is legal Rust code that'll compile (with warnings):
@@ -82,7 +99,7 @@ fn do_something<T: Default>(val: T) { // <- New rib in both types and values (1)
 
 Because the rules for different namespaces are a bit different, each namespace
 has its own independent rib stack that is constructed in parallel to the others.
-In addition, there's also a rib stack for local labels (eg. names of loops or
+In addition, there's also a rib stack for local labels (e.g. names of loops or
 blocks), which isn't a full namespace in its own right.
 
 ## Overall strategy
@@ -112,7 +129,7 @@ Still, it probably provides useful first guidepost to what happens in there.
   following stages of compilation?
 * Who calls it and how it is actually used.
 * Is it a pass and then the result is only used, or can it be computed
-  incrementally (eg. for RLS)?
+  incrementally (e.g. for RLS)?
 * The overall strategy description is a bit vague.
 * Where does the name `Rib` come from?
 * Does this thing have its own tests, or is it tested only as part of some e2e
diff --git a/src/doc/rustc-guide/src/opaque-types-type-alias-impl-trait.md b/src/doc/rustc-dev-guide/src/opaque-types-type-alias-impl-trait.md
similarity index 100%
rename from src/doc/rustc-guide/src/opaque-types-type-alias-impl-trait.md
rename to src/doc/rustc-dev-guide/src/opaque-types-type-alias-impl-trait.md
diff --git a/src/doc/rustc-guide/src/panic-implementation.md b/src/doc/rustc-dev-guide/src/panic-implementation.md
similarity index 100%
rename from src/doc/rustc-guide/src/panic-implementation.md
rename to src/doc/rustc-dev-guide/src/panic-implementation.md
diff --git a/src/doc/rustc-guide/src/param_env.md b/src/doc/rustc-dev-guide/src/param_env.md
similarity index 100%
rename from src/doc/rustc-guide/src/param_env.md
rename to src/doc/rustc-dev-guide/src/param_env.md
diff --git a/src/doc/rustc-guide/src/part-1-intro.md b/src/doc/rustc-dev-guide/src/part-1-intro.md
similarity index 78%
rename from src/doc/rustc-guide/src/part-1-intro.md
rename to src/doc/rustc-dev-guide/src/part-1-intro.md
index 65cb1ae482..7597c71285 100644
--- a/src/doc/rustc-guide/src/part-1-intro.md
+++ b/src/doc/rustc-dev-guide/src/part-1-intro.md
@@ -1,6 +1,6 @@
 # Part 1: Building, debugging, and contributing to Rustc
 
-This section of the rustc-guide contains knowledge that should be useful to you
+This section of the rustc-dev-guide contains knowledge that should be useful to you
 regardless of what part of the compiler you are working on. This includes both
 technical info and tips (e.g. how to compile and debug the compiler) and info
 about processes in the Rust project (e.g. stabilization and info about the
diff --git a/src/doc/rustc-guide/src/part-2-intro.md b/src/doc/rustc-dev-guide/src/part-2-intro.md
similarity index 85%
rename from src/doc/rustc-guide/src/part-2-intro.md
rename to src/doc/rustc-dev-guide/src/part-2-intro.md
index 6dd26f44cc..1a47f21e53 100644
--- a/src/doc/rustc-guide/src/part-2-intro.md
+++ b/src/doc/rustc-dev-guide/src/part-2-intro.md
@@ -7,6 +7,6 @@ compilation works.
 This section should be friendly to both readers interested in the end-to-end
 process of compilation _and_ readers interested in learning about a specific
 system they wish to contribute to. If anything is unclear, feel free to file
-an issue on the [rustc-guide repo](https://github.com/rust-lang/rustc-guide)
+an issue on the [rustc-dev-guide repo](https://github.com/rust-lang/rustc-dev-guide)
 or contact the compiler team, as detailed in [this chapter from Part
 1](./compiler-team.md).
diff --git a/src/doc/rustc-guide/src/profile-guided-optimization.md b/src/doc/rustc-dev-guide/src/profile-guided-optimization.md
similarity index 100%
rename from src/doc/rustc-guide/src/profile-guided-optimization.md
rename to src/doc/rustc-dev-guide/src/profile-guided-optimization.md
diff --git a/src/doc/rustc-guide/src/profiling.md b/src/doc/rustc-dev-guide/src/profiling.md
similarity index 100%
rename from src/doc/rustc-guide/src/profiling.md
rename to src/doc/rustc-dev-guide/src/profiling.md
diff --git a/src/doc/rustc-guide/src/profiling/with_perf.md b/src/doc/rustc-dev-guide/src/profiling/with_perf.md
similarity index 100%
rename from src/doc/rustc-guide/src/profiling/with_perf.md
rename to src/doc/rustc-dev-guide/src/profiling/with_perf.md
diff --git a/src/doc/rustc-guide/src/queries/example-0.counts.txt b/src/doc/rustc-dev-guide/src/queries/example-0.counts.txt
similarity index 100%
rename from src/doc/rustc-guide/src/queries/example-0.counts.txt
rename to src/doc/rustc-dev-guide/src/queries/example-0.counts.txt
diff --git a/src/doc/rustc-guide/src/queries/example-0.html b/src/doc/rustc-dev-guide/src/queries/example-0.html
similarity index 100%
rename from src/doc/rustc-guide/src/queries/example-0.html
rename to src/doc/rustc-dev-guide/src/queries/example-0.html
diff --git a/src/doc/rustc-guide/src/queries/example-0.png b/src/doc/rustc-dev-guide/src/queries/example-0.png
similarity index 100%
rename from src/doc/rustc-guide/src/queries/example-0.png
rename to src/doc/rustc-dev-guide/src/queries/example-0.png
diff --git a/src/doc/rustc-guide/src/queries/incremental-compilation-in-detail.md b/src/doc/rustc-dev-guide/src/queries/incremental-compilation-in-detail.md
similarity index 100%
rename from src/doc/rustc-guide/src/queries/incremental-compilation-in-detail.md
rename to src/doc/rustc-dev-guide/src/queries/incremental-compilation-in-detail.md
diff --git a/src/doc/rustc-guide/src/queries/incremental-compilation.md b/src/doc/rustc-dev-guide/src/queries/incremental-compilation.md
similarity index 100%
rename from src/doc/rustc-guide/src/queries/incremental-compilation.md
rename to src/doc/rustc-dev-guide/src/queries/incremental-compilation.md
diff --git a/src/doc/rustc-guide/src/queries/profiling.md b/src/doc/rustc-dev-guide/src/queries/profiling.md
similarity index 100%
rename from src/doc/rustc-guide/src/queries/profiling.md
rename to src/doc/rustc-dev-guide/src/queries/profiling.md
diff --git a/src/doc/rustc-guide/src/queries/query-evaluation-model-in-detail.md b/src/doc/rustc-dev-guide/src/queries/query-evaluation-model-in-detail.md
similarity index 99%
rename from src/doc/rustc-guide/src/queries/query-evaluation-model-in-detail.md
rename to src/doc/rustc-dev-guide/src/queries/query-evaluation-model-in-detail.md
index a1fbed2e54..83c1275509 100644
--- a/src/doc/rustc-guide/src/queries/query-evaluation-model-in-detail.md
+++ b/src/doc/rustc-dev-guide/src/queries/query-evaluation-model-in-detail.md
@@ -115,7 +115,7 @@ The `type_check_crate` query provider would look something like the following:
 
 ```rust,ignore
 fn type_check_crate_provider(tcx, _key: ()) {
-    let list_of_items = tcx.hir_map.list_of_items();
+    let list_of_hir_items = tcx.hir_map.list_of_items();
 
     for item_def_id in list_of_hir_items {
         tcx.type_check_item(item_def_id);
diff --git a/src/doc/rustc-guide/src/query.md b/src/doc/rustc-dev-guide/src/query.md
similarity index 82%
rename from src/doc/rustc-guide/src/query.md
rename to src/doc/rustc-dev-guide/src/query.md
index f5961f6ba7..9ae6baa9e6 100644
--- a/src/doc/rustc-guide/src/query.md
+++ b/src/doc/rustc-dev-guide/src/query.md
@@ -1,7 +1,7 @@
 # Queries: demand-driven compilation
 
 As described in [the high-level overview of the compiler][hl], the
-Rust compiler is current transitioning from a traditional "pass-based"
+Rust compiler is currently transitioning from a traditional "pass-based"
 setup to a "demand-driven" system. **The Compiler Query System is the
 key to our new demand-driven organization.** The idea is pretty
 simple. You have various queries that compute things about the input
@@ -76,8 +76,8 @@ dependencies of the local crate). Note that what determines the crate
 that a query is targeting is not the *kind* of query, but the *key*.
 For example, when you invoke `tcx.type_of(def_id)`, that could be a
 local query or an external query, depending on what crate the `def_id`
-is referring to (see the `self::keys::Key` trait for more information
-on how that works).
+is referring to (see the [`self::keys::Key`][Key] trait for more
+information on how that works).
 
 Providers always have the same signature:
 
@@ -96,8 +96,10 @@ They return the result of the query.
 ####  How providers are setup
 
 When the tcx is created, it is given the providers by its creator using
-the `Providers` struct. This struct is generated by the macros here, but it
-is basically a big list of function pointers:
+the [`Providers`][providers_struct] struct. This struct is generated by
+the macros here, but it is basically a big list of function pointers:
+
+[providers_struct]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/query/struct.Providers.html
 
 ```rust,ignore
 struct Providers {
@@ -110,11 +112,13 @@ At present, we have one copy of the struct for local crates, and one
 for external crates, though the plan is that we may eventually have
 one per crate.
 
-These `Provider` structs are ultimately created and populated by
+These `Providers` structs are ultimately created and populated by
 `librustc_driver`, but it does this by distributing the work
 throughout the other `rustc_*` crates. This is done by invoking
-various `provide` functions. These functions tend to look something
-like this:
+various [`provide`][provide_fn] functions. These functions tend to look
+something like this:
+
+[provide_fn]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/hir/fn.provide.html
 
 ```rust,ignore
 pub fn provide(providers: &mut Providers) {
@@ -147,13 +151,16 @@ fn fubar<'tcx>(tcx: TyCtxt<'tcx>, key: DefId) -> Fubar<'tcx> { ... }
 
 N.B. Most of the `rustc_*` crates only provide **local
 providers**. Almost all **extern providers** wind up going through the
-[`rustc_metadata` crate][rustc_metadata], which loads the information from the
-crate metadata. But in some cases there are crates that provide queries for
-*both* local and external crates, in which case they define both a
-`provide` and a `provide_extern` function that `rustc_driver` can
-invoke.
+[`rustc_metadata` crate][rustc_metadata], which loads the information
+from the crate metadata. But in some cases there are crates that
+provide queries for *both* local and external crates, in which case
+they define both a [`provide`][ext_provide] and a
+[`provide_extern`][ext_provide_extern] function that `rustc_driver`
+can invoke.
 
 [rustc_metadata]: https://github.com/rust-lang/rust/tree/master/src/librustc_metadata
+[ext_provide]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_codegen_llvm/attributes/fn.provide.html
+[ext_provide_extern]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_codegen_llvm/attributes/fn.provide_extern.html
 
 ### Adding a new kind of query
 
@@ -205,7 +212,7 @@ Let's go over them one by one:
   (`ty::queries::type_of`) that will be generated to represent
   this query.
 - **Query key type:** the type of the argument to this query.
-  This type must implement the `ty::query::keys::Key` trait, which
+  This type must implement the [`ty::query::keys::Key`][Key] trait, which
   defines (for example) how to map it to a crate, and so forth.
 - **Result type of query:** the type produced by this query. This type
   should (a) not use `RefCell` or other interior mutability and (b) be
@@ -218,6 +225,8 @@ Let's go over them one by one:
 - **Query modifiers:** various flags and options that customize how the
   query is processed.
 
+[Key]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/query/keys/trait.Key.html
+
 So, to add a query:
 
 - Add an entry to `rustc_queries!` using the format above.
@@ -229,7 +238,7 @@ So, to add a query:
 For each kind, the `rustc_queries` macro will generate a "query struct"
 named after the query. This struct is a kind of a place-holder
 describing the query. Each such struct implements the
-`self::config::QueryConfig` trait, which has associated types for the
+[`self::config::QueryConfig`][QueryConfig] trait, which has associated types for the
 key/value of that particular query. Basically the code generated looks something
 like this:
 
@@ -247,13 +256,16 @@ impl<'tcx> QueryConfig for type_of<'tcx> {
 ```
 
 There is an additional trait that you may wish to implement called
-`self::config::QueryDescription`. This trait is used during cycle
-errors to give a "human readable" name for the query, so that we can
-summarize what was happening when the cycle occurred. Implementing
-this trait is optional if the query key is `DefId`, but if you *don't*
-implement it, you get a pretty generic error ("processing `foo`...").
+[`self::config::QueryDescription`][QueryDescription]. This trait is
+used during cycle errors to give a "human readable" name for the query,
+so that we can summarize what was happening when the cycle occurred.
+Implementing this trait is optional if the query key is `DefId`, but
+if you *don't* implement it, you get a pretty generic error ("processing `foo`...").
 You can put new impls into the `config` module. They look something like this:
 
+[QueryConfig]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/query/trait.QueryConfig.html
+[QueryDescription]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/query/config/trait.QueryDescription.html
+
 ```rust,ignore
 impl<'tcx> QueryDescription for queries::type_of<'tcx> {
     fn describe(tcx: TyCtxt, key: DefId) -> String {
diff --git a/src/doc/rustc-guide/src/rustc-driver.md b/src/doc/rustc-dev-guide/src/rustc-driver.md
similarity index 80%
rename from src/doc/rustc-guide/src/rustc-driver.md
rename to src/doc/rustc-dev-guide/src/rustc-driver.md
index 50c7b2731a..e240ea58b2 100644
--- a/src/doc/rustc-guide/src/rustc-driver.md
+++ b/src/doc/rustc-dev-guide/src/rustc-driver.md
@@ -32,19 +32,6 @@ replaces this functionality.
 > **Warning:** By its very nature, the internal compiler APIs are always going
 > to be unstable. That said, we do try not to break things unnecessarily.
 
-## A Note On Lifetimes
-
-The Rust compiler is a fairly large program containing lots of big data
-structures (e.g. the AST, HIR, and the type system) and as such, arenas and
-references are heavily relied upon to minimize unnecessary memory use. This
-manifests itself in the way people can plug into the compiler, preferring a
-"push"-style API (callbacks) instead of the more Rust-ic "pull" style (think
-the `Iterator` trait).
-
-Thread-local storage and interning are used a lot through the compiler to reduce
-duplication while also preventing a lot of the ergonomic issues due to many
-pervasive lifetimes. The `rustc::ty::tls` module is used to access these
-thread-locals, although you should rarely need to touch it.
 
 [cb]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/trait.Callbacks.html
 [rd_rc]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_driver/fn.run_compiler.html
diff --git a/src/doc/rustc-guide/src/rustdoc.md b/src/doc/rustc-dev-guide/src/rustdoc.md
similarity index 100%
rename from src/doc/rustc-guide/src/rustdoc.md
rename to src/doc/rustc-dev-guide/src/rustdoc.md
diff --git a/src/doc/rustc-guide/src/salsa.md b/src/doc/rustc-dev-guide/src/salsa.md
similarity index 100%
rename from src/doc/rustc-guide/src/salsa.md
rename to src/doc/rustc-dev-guide/src/salsa.md
diff --git a/src/doc/rustc-dev-guide/src/sanitizers.md b/src/doc/rustc-dev-guide/src/sanitizers.md
new file mode 100644
index 0000000000..5e1f396f51
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/sanitizers.md
@@ -0,0 +1,74 @@
+# Sanitizers Support
+
+The rustc compiler contains support for following sanitizers:
+
+* [AddressSanitizer][clang-asan] a faster memory error detector. Can
+  detect out-of-bounds access to heap, stack, and globals, use after free, use
+  after return, double free, invalid free, memory leaks.
+* [LeakSanitizer][clang-lsan] a run-time memory leak detector.
+* [MemorySanitizer][clang-msan] a detector of uninitialized reads.
+* [ThreadSanitizer][clang-tsan] a fast data race detector.
+
+## How to use the sanitizers?
+
+To enable a sanitizer compile with `-Zsanitizer=...` option, where value is one
+of `address`, `leak`, `memory` or `thread`. For more details how to use
+sanitizers please refer to [the unstable book](https://doc.rust-lang.org/unstable-book/).
+
+## How are sanitizers implemented in rustc?
+
+The implementation of sanitizers relies almost entirely on LLVM. The rustc is
+an integration point for LLVM compile time instrumentation passes and runtime
+libraries. Highlight of the most important aspects of the implementation:
+
+*  The sanitizer runtime libraries are part of the [compiler-rt] project, and
+   [will be built on supported targets][sanitizer-build] when enabled in `config.toml`:
+
+   ```toml
+   [build]
+   sanitizers = true
+   ```
+
+   The runtimes are [placed into target libdir][sanitizer-copy].
+
+*  During LLVM code generation, the functions intended for instrumentation are
+   [marked][sanitizer-attribute] with appropriate LLVM attribute:
+   `SanitizeAddress`, `SanitizeMemory`, or `SanitizeThread`. By default all
+   functions are instrumented, but this behaviour can be changed with
+   `#[no_sanitize(...)]`.
+
+*  The decision whether to perform instrumentation or not is possible only at a
+   function granularity. In the cases were those decision differ between
+   functions it might be necessary to inhibit inlining, both at [MIR
+   level][inline-mir] and [LLVM level][inline-llvm].
+
+*  The LLVM IR generated by rustc is instrumented by [dedicated LLVM
+   passes][sanitizer-pass], different for each sanitizer. Instrumentation
+   passes are invoked after optimization passes.
+
+*  When producing an executable, the sanitizer specific runtime library is
+   [linked in][sanitizer-link]. The libraries are searched for in target libdir
+   relative to default system root, so that this process is not affected
+   by sysroot overrides used for example by cargo `-Zbuild-std` functionality.
+
+[compiler-rt]: https://github.com/llvm/llvm-project/tree/master/compiler-rt
+[sanitizer-build]: https://github.com/rust-lang/rust/blob/a29424a2265411dda7d7446516ac5fd7499e2b55/src/bootstrap/native.rs#L566-L624
+[sanitizer-copy]: https://github.com/rust-lang/rust/blob/a29424a2265411dda7d7446516ac5fd7499e2b55/src/bootstrap/compile.rs#L270-L304
+[sanitizer-attribute]: https://github.com/rust-lang/rust/blob/a29424a2265411dda7d7446516ac5fd7499e2b55/src/librustc_codegen_llvm/attributes.rs#L49-L72
+[inline-mir]: https://github.com/rust-lang/rust/blob/a29424a2265411dda7d7446516ac5fd7499e2b55/src/librustc_mir/transform/inline.rs#L232-L252
+[inline-llvm]: https://github.com/rust-lang/llvm-project/blob/9330ec5a4c1df5fc1fa62f993ed6a04da68cb040/llvm/include/llvm/IR/Attributes.td#L225-L241
+[sanitizer-pass]: https://github.com/rust-lang/rust/blob/a29424a2265411dda7d7446516ac5fd7499e2b55/src/librustc_codegen_llvm/back/write.rs#L454-L475
+[sanitizer-link]: https://github.com/rust-lang/rust/blob/a29424a2265411dda7d7446516ac5fd7499e2b55/src/librustc_codegen_ssa/back/link.rs#L748-L787
+
+## Additional Information
+
+* [Sanitizers project page](https://github.com/google/sanitizers/wiki/)
+* [AddressSanitizer in Clang][clang-asan]
+* [LeakSanitizer in Clang][clang-lsan]
+* [MemorySanitizer in Clang][clang-msan]
+* [ThreadSanitizer in Clang][clang-tsan]
+
+[clang-asan]: https://clang.llvm.org/docs/AddressSanitizer.html
+[clang-lsan]: https://clang.llvm.org/docs/LeakSanitizer.html
+[clang-msan]: https://clang.llvm.org/docs/MemorySanitizer.html
+[clang-tsan]: https://clang.llvm.org/docs/ThreadSanitizer.html
diff --git a/src/doc/rustc-guide/src/stability.md b/src/doc/rustc-dev-guide/src/stability.md
similarity index 100%
rename from src/doc/rustc-guide/src/stability.md
rename to src/doc/rustc-dev-guide/src/stability.md
diff --git a/src/doc/rustc-guide/src/stabilization_guide.md b/src/doc/rustc-dev-guide/src/stabilization_guide.md
similarity index 100%
rename from src/doc/rustc-guide/src/stabilization_guide.md
rename to src/doc/rustc-dev-guide/src/stabilization_guide.md
diff --git a/src/doc/rustc-guide/src/test-implementation.md b/src/doc/rustc-dev-guide/src/test-implementation.md
similarity index 90%
rename from src/doc/rustc-guide/src/test-implementation.md
rename to src/doc/rustc-dev-guide/src/test-implementation.md
index 59cc7c5bdd..e5bcedf136 100644
--- a/src/doc/rustc-guide/src/test-implementation.md
+++ b/src/doc/rustc-dev-guide/src/test-implementation.md
@@ -31,14 +31,14 @@ How does any sort of `main` function invoke these tests if they're not visible?
 What exactly is `rustc --test` doing?
 
 `#[test]` is implemented as a syntactic transformation inside the compiler's
-[`libsyntax` crate][libsyntax]. Essentially, it's a fancy macro, that
+[`librustc_ast` crate][librustc_ast]. Essentially, it's a fancy macro, that
 rewrites the crate in 3 steps:
 
 #### Step 1: Re-Exporting
 
 As mentioned earlier, tests can exist inside private modules, so we need a
 way of exposing them to the main function, without breaking any existing
-code. To that end, `libsyntax` will create local modules called
+code. To that end, `librustc_ast` will create local modules called
 `__test_reexports` that recursively reexport tests. This expansion translates
 the above example into:
 
@@ -78,7 +78,7 @@ hygiene.
 
 #### Step 2: Harness Generation
 Now that our tests are accessible from the root of our crate, we need to do
-something with them. `libsyntax` generates a module like so:
+something with them. `librustc_ast` generates a module like so:
 
 ```rust,ignore
 #[main]
@@ -115,7 +115,7 @@ fn foo() {
 This means our tests are more than just simple functions, they have
 configuration information as well. `test` encodes this configuration data
 into a struct called [`TestDesc`][TestDesc]. For each test function in a
-crate, `libsyntax` will parse its attributes and generate a `TestDesc`
+crate, `librustc_ast` will parse its attributes and generate a `TestDesc`
 instance. It then combines the `TestDesc` and test function into the
 predictably named `TestDescAndFn` struct, that `test_main_static` operates
 on. For a given test, the generated `TestDescAndFn` instance looks like so:
@@ -146,7 +146,7 @@ $ rustc my_mod.rs -Z unpretty=hir
 
 [test]: https://doc.rust-lang.org/test/index.html
 [TestDesc]: https://doc.rust-lang.org/test/struct.TestDesc.html
-[Symbol]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast/struct.Ident.html
-[Ident]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast/struct.Ident.html
+[Symbol]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/ast/struct.Ident.html
+[Ident]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/ast/struct.Ident.html
 [eRFC]: https://github.com/rust-lang/rfcs/blob/master/text/2318-custom-test-frameworks.md
-[libsyntax]: https://github.com/rust-lang/rust/tree/master/src/libsyntax
+[librustc_ast]: https://github.com/rust-lang/rust/tree/master/src/librustc_ast
diff --git a/src/doc/rustc-guide/src/tests/adding.md b/src/doc/rustc-dev-guide/src/tests/adding.md
similarity index 95%
rename from src/doc/rustc-guide/src/tests/adding.md
rename to src/doc/rustc-dev-guide/src/tests/adding.md
index 8492cbbcc9..dadd8e2c15 100644
--- a/src/doc/rustc-guide/src/tests/adding.md
+++ b/src/doc/rustc-dev-guide/src/tests/adding.md
@@ -150,7 +150,7 @@ source.
   compares against `.fixed` (they must match). Finally, the fixed
   source is compiled, and this compilation is required to succeed.
   The `.fixed` file can also be generated automatically with the
-  `--bless` option, discussed [below](#bless).
+  `--bless` option, described in [this section][bless].
 * `min-gdb-version` specifies the minimum gdb version required for
   this test; see also `ignore-gdb-version`
 * `min-lldb-version` specifies the minimum lldb version required for
@@ -185,6 +185,7 @@ source.
   have a gate test.
 
 [`header.rs`]: https://github.com/rust-lang/rust/tree/master/src/tools/compiletest/src/header.rs
+[bless]: ./running.md#editing-and-updating-the-reference-files
 
 <a name="error_annotations"></a>
 
@@ -284,22 +285,6 @@ you can even run the resulting program. Just add one of the following
 - `// run-pass` – compilation should succeed and we should run the
   resulting binary
 
-<a name="bless"></a>
-
-### Editing and updating the reference files
-
-If you have changed the compiler's output intentionally, or you are
-making a new test, you can pass `--bless` to the test subcommand. E.g.
-if some tests in `src/test/ui` are failing, you can run
-
-```text
-./x.py test --stage 1 src/test/ui --bless
-```
-
-to automatically adjust the `.stderr`, `.stdout` or `.fixed` files of
-all tests. Of course you can also target just specific tests with the
-`--test-args your_test_name` flag, just like when running the tests.
-
 ### Normalization
 
 The normalization applied is aimed at eliminating output difference
diff --git a/src/doc/rustc-guide/src/tests/intro.md b/src/doc/rustc-dev-guide/src/tests/intro.md
similarity index 95%
rename from src/doc/rustc-guide/src/tests/intro.md
rename to src/doc/rustc-dev-guide/src/tests/intro.md
index 4572d23ca9..6a528ae457 100644
--- a/src/doc/rustc-guide/src/tests/intro.md
+++ b/src/doc/rustc-dev-guide/src/tests/intro.md
@@ -61,7 +61,20 @@ including:
   There is more information in the
   [section on coding conventions](../conventions.html#formatting).
 
-  Example: `./x.py test src/tools/tidy`
+  Example: `./x.py test tidy`
+
+- **Formatting** – Rustfmt is integrated with the build system to enforce
+  uniform style across the compiler. In the CI, we check that the formatting
+  is correct. The formatting check is also automatically run by the Tidy tool
+  mentioned above.
+
+  Example: `./x.py fmt --check` checks formatting an exits with an error if
+  formatting is needed.
+
+  Example: `./x.py fmt` runs rustfmt on the codebase.
+
+  Example: `./x.py test tidy --bless` does formatting before doing
+  other tidy checks.
 
 - **Unit tests** – The Rust standard library and many of the Rust packages
   include typical Rust `#[test]` unittests.  Under the hood, `x.py` will run
diff --git a/src/doc/rustc-guide/src/tests/running.md b/src/doc/rustc-dev-guide/src/tests/running.md
similarity index 89%
rename from src/doc/rustc-guide/src/tests/running.md
rename to src/doc/rustc-dev-guide/src/tests/running.md
index 4a86d2cce8..f5c9bdb721 100644
--- a/src/doc/rustc-guide/src/tests/running.md
+++ b/src/doc/rustc-dev-guide/src/tests/running.md
@@ -63,7 +63,7 @@ Likewise, you can test a single file by passing its path:
 ### Run only the tidy script
 
 ```bash
-./x.py test src/tools/tidy
+./x.py test tidy
 ```
 
 ### Run tests on the standard library
@@ -72,10 +72,10 @@ Likewise, you can test a single file by passing its path:
 ./x.py test src/libstd
 ```
 
-### Run tests on the standard library and run the tidy script
+### Run the tidy script and tests on the standard library
 
 ```bash
-./x.py test src/libstd src/tools/tidy
+./x.py test tidy src/libstd
 ```
 
 ### Run tests on the standard library using a stage 1 compiler
@@ -108,6 +108,20 @@ Under the hood, the test runner invokes the standard rust test runner
 filtering for tests that include "issue-1234" in the name. (Thus
 `--test-args` is a good way to run a collection of related tests.)
 
+## Editing and updating the reference files
+
+If you have changed the compiler's output intentionally, or you are
+making a new test, you can pass `--bless` to the test subcommand. E.g.
+if some tests in `src/test/ui` are failing, you can run
+
+```text
+./x.py test --stage 1 src/test/ui --bless
+```
+
+to automatically adjust the `.stderr`, `.stdout` or `.fixed` files of
+all tests. Of course you can also target just specific tests with the
+`--test-args your_test_name` flag, just like when running the tests.
+
 ## Passing `--pass $mode`
 
 Pass UI tests now have three modes, `check-pass`, `build-pass` and
diff --git a/src/doc/rustc-guide/src/the-parser.md b/src/doc/rustc-dev-guide/src/the-parser.md
similarity index 86%
rename from src/doc/rustc-guide/src/the-parser.md
rename to src/doc/rustc-dev-guide/src/the-parser.md
index 3584d73e44..8b8ef77cd7 100644
--- a/src/doc/rustc-guide/src/the-parser.md
+++ b/src/doc/rustc-dev-guide/src/the-parser.md
@@ -18,7 +18,7 @@ form which is easier for the compiler to work with, usually called an [*Abstract
 Syntax Tree*][ast] (AST). An AST mirrors the structure of a Rust program in memory,
 using a `Span` to link a particular AST node back to its source text.
 
-The AST is defined in [`libsyntax`][libsyntax], along with some definitions for
+The AST is defined in [`librustc_ast`][librustc_ast], along with some definitions for
 tokens and token streams, data structures/traits for mutating ASTs, and shared
 definitions for other AST-related parts of the compiler (like the lexer and
 macro-expansion).
@@ -46,18 +46,18 @@ Code for lexical analysis is split between two crates:
   constituting tokens. Although it is popular to implement lexers as generated
   finite state machines, the lexer in `rustc_lexer` is hand-written.
 
-- [`StringReader`] from [libsyntax] integrates `rustc_lexer` with `rustc`
+- [`StringReader`] from [`librustc_ast`][librustc_ast] integrates `rustc_lexer` with `rustc`
   specific data structures. Specifically, it adds `Span` information to tokens
   returned by `rustc_lexer` and interns identifiers.
 
-[libsyntax]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/index.html
+[librustc_ast]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/index.html
 [rustc_errors]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_errors/index.html
 [ast]: https://en.wikipedia.org/wiki/Abstract_syntax_tree
 [`SourceMap`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/source_map/struct.SourceMap.html
-[ast module]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/ast/index.html
+[ast module]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/ast/index.html
 [librustc_parse]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/index.html
 [parser]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/parser/index.html
-[`Parser`]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/parse/parser/struct.Parser.html
+[`Parser`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/parse/parser/struct.Parser.html
 [`StringReader`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/lexer/struct.StringReader.html
-[visit module]: https://doc.rust-lang.org/nightly/nightly-rustc/syntax/visit/index.html
+[visit module]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/visit/index.html
 [sourcefile]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/struct.SourceFile.html
diff --git a/src/doc/rustc-guide/src/traits/associated-types.md b/src/doc/rustc-dev-guide/src/traits/associated-types.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/associated-types.md
rename to src/doc/rustc-dev-guide/src/traits/associated-types.md
diff --git a/src/doc/rustc-guide/src/traits/bibliography.md b/src/doc/rustc-dev-guide/src/traits/bibliography.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/bibliography.md
rename to src/doc/rustc-dev-guide/src/traits/bibliography.md
diff --git a/src/doc/rustc-guide/src/traits/caching.md b/src/doc/rustc-dev-guide/src/traits/caching.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/caching.md
rename to src/doc/rustc-dev-guide/src/traits/caching.md
diff --git a/src/doc/rustc-guide/src/traits/canonical-queries.md b/src/doc/rustc-dev-guide/src/traits/canonical-queries.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/canonical-queries.md
rename to src/doc/rustc-dev-guide/src/traits/canonical-queries.md
diff --git a/src/doc/rustc-guide/src/traits/canonicalization.md b/src/doc/rustc-dev-guide/src/traits/canonicalization.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/canonicalization.md
rename to src/doc/rustc-dev-guide/src/traits/canonicalization.md
diff --git a/src/doc/rustc-guide/src/traits/chalk-overview.md b/src/doc/rustc-dev-guide/src/traits/chalk-overview.md
similarity index 99%
rename from src/doc/rustc-guide/src/traits/chalk-overview.md
rename to src/doc/rustc-dev-guide/src/traits/chalk-overview.md
index a33cbcc63a..88ae7b5a23 100644
--- a/src/doc/rustc-guide/src/traits/chalk-overview.md
+++ b/src/doc/rustc-dev-guide/src/traits/chalk-overview.md
@@ -226,7 +226,7 @@ Likewise, lowering tests use the [`lowering_success!` and
 
 [ast]: https://en.wikipedia.org/wiki/Abstract_syntax_tree
 [chalk]: https://github.com/rust-lang/chalk
-[rustc-issues]: https://github.com/rust-lang/rustc-guide/issues
+[rustc-issues]: https://github.com/rust-lang/rustc-dev-guide/issues
 [universal quantification]: https://en.wikipedia.org/wiki/Universal_quantification
 
 [`ProgramClause`]: https://rust-lang.github.io/chalk/chalk_ir/enum.ProgramClause.html
diff --git a/src/doc/rustc-guide/src/traits/goals-and-clauses.md b/src/doc/rustc-dev-guide/src/traits/goals-and-clauses.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/goals-and-clauses.md
rename to src/doc/rustc-dev-guide/src/traits/goals-and-clauses.md
diff --git a/src/doc/rustc-guide/src/traits/hrtb.md b/src/doc/rustc-dev-guide/src/traits/hrtb.md
similarity index 97%
rename from src/doc/rustc-guide/src/traits/hrtb.md
rename to src/doc/rustc-dev-guide/src/traits/hrtb.md
index 8b3a9f649b..f41d43ffd3 100644
--- a/src/doc/rustc-guide/src/traits/hrtb.md
+++ b/src/doc/rustc-dev-guide/src/traits/hrtb.md
@@ -40,8 +40,8 @@ subtyping, we recommend you read the paper). There are a few parts:
 2. Match the impl against the [placeholder] obligation.
 3. Check for _placeholder leaks_.
 
+[hrsubtype]: ./hrtb.md
 [placeholder]: ../appendix/glossary.html#appendix-c-glossary
-[hrsubtype]: https://github.com/rust-lang/rust/tree/master/src/librustc/infer/higher_ranked/README.md
 [paper by SPJ]: http://research.microsoft.com/en-us/um/people/simonpj/papers/higher-rank/
 
 So let's work through our example.
diff --git a/src/doc/rustc-guide/src/traits/implied-bounds.md b/src/doc/rustc-dev-guide/src/traits/implied-bounds.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/implied-bounds.md
rename to src/doc/rustc-dev-guide/src/traits/implied-bounds.md
diff --git a/src/doc/rustc-guide/src/traits/index.md b/src/doc/rustc-dev-guide/src/traits/index.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/index.md
rename to src/doc/rustc-dev-guide/src/traits/index.md
diff --git a/src/doc/rustc-dev-guide/src/traits/lowering-module.md b/src/doc/rustc-dev-guide/src/traits/lowering-module.md
new file mode 100644
index 0000000000..3c5bd7be5d
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/traits/lowering-module.md
@@ -0,0 +1,56 @@
+# 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]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_traits/lowering/
+
+## The `program_clauses_for` query
+
+The main entry point is the `program_clauses_for` [query], which –
+given a `DefId` – produces a set of Chalk program clauses. The
+query is invoked on a `DefId` that identifies something like a trait,
+an impl, or an associated item definition. It then produces and
+returns a vector of program clauses.
+
+[query]: ../query.html
+
+## Unit tests
+
+**Note: We've removed the Chalk unit tests in [rust-lang/rust#69247].
+They will come back once we're ready to integrate next Chalk into rustc.**
+
+Here's a good example test. At the time of
+this writing, it looked like this:
+
+```rust,ignore
+#![feature(rustc_attrs)]
+
+trait Foo { }
+
+#[rustc_dump_program_clauses] //~ ERROR program clause dump
+impl<T: 'static> Foo for T where T: Iterator<Item = i32> { }
+
+fn main() {
+    println!("hello");
+}
+```
+
+The `#[rustc_dump_program_clauses]` annotation can be attached to
+anything with a `DefId` (It requires the `rustc_attrs` feature). The
+compiler will then invoke the `program_clauses_for` query on that
+item, and emit compiler errors that dump the clauses produced. These
+errors just exist for unit-testing. The stderr will be:
+
+```text
+error: program clause dump
+  --> $DIR/lower_impl.rs:5:1
+   |
+LL | #[rustc_dump_program_clauses]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: forall<T> { Implemented(T: Foo) :- ProjectionEq(<T as std::iter::Iterator>::Item == i32), TypeOutlives(T: 'static), Implemented(T: std::iter::Iterator), Implemented(T: std::marker::Sized). }
+```
+
+[rust-lang/rust#69247]: https://github.com/rust-lang/rust/pull/69247
diff --git a/src/doc/rustc-guide/src/traits/lowering-rules.md b/src/doc/rustc-dev-guide/src/traits/lowering-rules.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/lowering-rules.md
rename to src/doc/rustc-dev-guide/src/traits/lowering-rules.md
diff --git a/src/doc/rustc-guide/src/traits/lowering-to-logic.md b/src/doc/rustc-dev-guide/src/traits/lowering-to-logic.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/lowering-to-logic.md
rename to src/doc/rustc-dev-guide/src/traits/lowering-to-logic.md
diff --git a/src/doc/rustc-guide/src/traits/regions.md b/src/doc/rustc-dev-guide/src/traits/regions.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/regions.md
rename to src/doc/rustc-dev-guide/src/traits/regions.md
diff --git a/src/doc/rustc-guide/src/traits/resolution.md b/src/doc/rustc-dev-guide/src/traits/resolution.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/resolution.md
rename to src/doc/rustc-dev-guide/src/traits/resolution.md
diff --git a/src/doc/rustc-guide/src/traits/slg.md b/src/doc/rustc-dev-guide/src/traits/slg.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/slg.md
rename to src/doc/rustc-dev-guide/src/traits/slg.md
diff --git a/src/doc/rustc-guide/src/traits/specialization.md b/src/doc/rustc-dev-guide/src/traits/specialization.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/specialization.md
rename to src/doc/rustc-dev-guide/src/traits/specialization.md
diff --git a/src/doc/rustc-guide/src/traits/wf.md b/src/doc/rustc-dev-guide/src/traits/wf.md
similarity index 100%
rename from src/doc/rustc-guide/src/traits/wf.md
rename to src/doc/rustc-dev-guide/src/traits/wf.md
diff --git a/src/doc/rustc-dev-guide/src/ty-fold.md b/src/doc/rustc-dev-guide/src/ty-fold.md
new file mode 100644
index 0000000000..e144767dcb
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/ty-fold.md
@@ -0,0 +1,105 @@
+# `TypeFoldable` and `TypeFolder`
+
+How is this `subst` query actually implemented? As you can imagine, we might want to do
+substitutions on a lot of different things. For example, we might want to do a substitution directly
+on a type like we did with `Vec` above. But we might also have a more complex type with other types
+nested inside that also need substitutions.
+
+The answer is a couple of traits:
+[`TypeFoldable`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/fold/trait.TypeFoldable.html)
+and
+[`TypeFolder`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/fold/trait.TypeFolder.html).
+
+- `TypeFoldable` is implemented by types that embed type information. It allows you to recursively
+  process the contents of the `TypeFoldable` and do stuff to them.
+- `TypeFolder` defines what you want to do with the types you encounter while processing the
+  `TypeFoldable`.
+
+For example, the `TypeFolder` trait has a method
+[`fold_ty`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/fold/trait.TypeFolder.html#method.fold_ty)
+that takes a type as input a type and returns a new type as a result. `TypeFoldable` invokes the
+`TypeFolder` `fold_foo` methods on itself, giving the `TypeFolder` access to its contents (the
+types, regions, etc that are contained within).
+
+You can think of it with this analogy to the iterator combinators we have come to love in rust:
+
+```rust,ignore
+vec.iter().map(|e1| foo(e2)).collect()
+//             ^^^^^^^^^^^^ analogous to `TypeFolder`
+//         ^^^ analogous to `TypeFoldable`
+```
+
+So to reiterate:
+
+- `TypeFolder`  is a trait that defines a “map” operation.
+- `TypeFoldable`  is a trait that is implemented by things that embed types.
+
+In the case of `subst`, we can see that it is implemented as a `TypeFolder`:
+[`SubstFolder`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/struct.SubstFolder.html).
+Looking at its implementation, we see where the actual substitutions are happening.
+
+However, you might also notice that the implementation calls this `super_fold_with` method. What is
+that? It is a method of `TypeFoldable`. Consider the following `TypeFoldable` type `MyFoldable`:
+
+```rust,ignore
+struct MyFoldable<'tcx> {
+  def_id: DefId,
+  ty: Ty<'tcx>,
+}
+```
+
+The `TypeFolder` can call `super_fold_with` on `MyFoldable` if it just wants to replace some of the
+fields of `MyFoldable` with new values. If it instead wants to replace the whole `MyFoldable` with a
+different one, it would call `fold_with` instead (a different method on `TypeFoldable`).
+
+In almost all cases, we don’t want to replace the whole struct; we only want to replace `ty::Ty`s in
+the struct, so usually we call `super_fold_with`. A typical implementation that `MyFoldable` could
+have might do something like this:
+
+```rust,ignore
+my_foldable: MyFoldable<'tcx>
+my_foldable.subst(..., subst)
+
+impl TypeFoldable for MyFoldable {
+  fn super_fold_with(&self, folder: &mut impl TypeFolder<'tcx>) -> MyFoldable {
+    MyFoldable {
+      def_id: self.def_id.fold_with(folder),
+      ty: self.ty.fold_with(folder),
+    }
+  }
+
+  fn super_visit_with(..) { }
+}
+```
+
+Notice that here, we implement `super_fold_with` to go over the fields of `MyFoldable` and call
+`fold_with` on *them*. That is, a folder may replace  `def_id` and `ty`, but not the whole
+`MyFoldable` struct.
+
+Here is another example to put things together: suppose we have a type like `Vec<Vec<X>>`. The
+`ty::Ty` would look like: `Adt(Vec, &[Adt(Vec, &[Param(X)])])`. If we want to do `subst(X => u32)`,
+then we would first look at the overall type. We would see that there are no substitutions to be
+made at the outer level, so we would descend one level and look at `Adt(Vec, &[Param(X)])`. There
+are still no substitutions to be made here, so we would descend again. Now we are looking at
+`Param(X)`, which can be substituted, so we replace it with `u32`. We can’t descend any more, so we
+are done, and  the overall result is `Adt(Vec, &[Adt(Vec, &[u32])])`.
+
+One last thing to mention: often when folding over a `TypeFoldable`, we don’t want to change most
+things. We only want to do something when we reach a type. That means there may be a lot of
+`TypeFoldable` types whose implementations basically just forward to their fields’ `TypeFoldable`
+implementations. Such implementations of `TypeFoldable` tend to be pretty tedious to write by hand.
+For this reason, there is a `derive` macro that allows you to `#![derive(TypeFoldable)]`. It is
+defined
+[here](https://github.com/rust-lang/rust/blob/master/src/librustc_macros/src/type_foldable.rs).
+
+**`subst`** In the case of substitutions the [actual
+folder](https://github.com/rust-lang/rust/blob/04e69e4f4234beb4f12cc76dcc53e2cc4247a9be/src/librustc/ty/subst.rs#L467-L482)
+is going to be doing the indexing we’ve already mentioned. There we define a `Folder` and call
+`fold_with` on the `TypeFoldable` to process yourself.  Then
+[fold_ty](https://github.com/rust-lang/rust/blob/04e69e4f4234beb4f12cc76dcc53e2cc4247a9be/src/librustc/ty/subst.rs#L545-L573)
+the method that process each type it looks for a `ty::Param` and for those it replaces it for
+something from the list of substitutions, otherwise recursively process the type.  To replace it,
+calls
+[ty_for_param](https://github.com/rust-lang/rust/blob/04e69e4f4234beb4f12cc76dcc53e2cc4247a9be/src/librustc/ty/subst.rs#L589-L624)
+and all that does is index into the list of substitutions with the index of the `Param`.
+
diff --git a/src/doc/rustc-dev-guide/src/ty.md b/src/doc/rustc-dev-guide/src/ty.md
new file mode 100644
index 0000000000..bb2c24b13b
--- /dev/null
+++ b/src/doc/rustc-dev-guide/src/ty.md
@@ -0,0 +1,331 @@
+---
+tags: rustc, ty
+---
+
+# The `ty` module: representing types
+
+The `ty` module defines how the Rust compiler represents types internally. It also defines the
+*typing context* (`tcx` or `TyCtxt`), which is the central data structure in the compiler.
+
+## `ty::Ty`
+
+When we talk about how rustc represents types,  we usually refer to a type called `Ty` . There are
+quite a few modules and types for `Ty` in the compiler ([Ty documentation][ty]).
+
+[ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/index.html
+
+The specific `Ty` we are referring to is [`rustc::ty::Ty`][ty_ty] (and not
+[`rustc_hir::Ty`][hir_ty]). The distinction is important, so we will discuss it first before going
+into the details of `ty::Ty`.
+
+[ty_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/type.Ty.html
+[hir_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.Ty.html
+
+## `rustc_hir::Ty` vs `ty::Ty`
+
+The HIR in rustc can be thought of as the high-level intermediate representation. It is more or less
+the AST (see [this chapter](hir.md)) as it represents the
+syntax that the user wrote, and is obtained after parsing and some *desugaring*. It has a
+representation of types, but in reality it reflects more of what the user wrote, that is, what they
+wrote so as to represent that type.
+
+In contrast, `ty::Ty` represents the semantics of a type, that is, the *meaning* of what the user
+wrote. For example, `rustc_hir::Ty` would record the fact that a user used the name `u32` twice
+in their program, but the `ty::Ty` would record the fact that both usages refer to the same type.
+
+**Example: `fn foo(x: u32) → u32 { }`** In this function we see that `u32` appears twice. We know
+that that is the same type, i.e. the function takes an argument and returns an argument of the same
+type, but from the point of view of the HIR there would be two distinct type instances because these
+are occurring in two different places in the program. That is, they have two
+different [`Span`s][span] (locations).
+
+[span]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/struct.Span.html
+
+**Example: `fn foo(x: &u32) -> &u32)`** In addition, HIR might have information left out. This type
+`&u32` is incomplete, since in the full rust type there is actually a lifetime, but we didn’t need
+to write those lifetimes. There are also some elision rules that insert information. The result may
+look like  `fn foo<'a>(x: &'a u32) -> &'a u32)`.
+
+In the HIR level, these things are not spelled out and you can say the picture is rather incomplete.
+However, at the `ty::Ty` level, these details are added and it is complete. Moreover, we will have
+exactly one `ty::Ty` for a given type, like `u32`, and that `ty::Ty` is used for all `u32`s in the
+whole program, not a specific usage, unlike `rustc_hir::Ty`.
+
+Here is a summary:
+
+| [`rustc_hir::Ty`][hir_ty] | [`ty::Ty`][ty_ty] |
+| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Describe the *syntax* of a type: what the user wrote (with some desugaring).  | Describe the *semantics* of a type: the meaning of what the user wrote. |
+| Each `rustc_hir::Ty` has its own spans corresponding to the appropriate place in the program. | Doesn’t correspond to a single place in the user’s program. |
+| `rustc_hir::Ty` has generics and lifetimes; however, some of those lifetimes are special markers like [`LifetimeName::Implicit`][implicit]. | `ty::Ty` has the full type, including generics and lifetimes, even if the user left them out |
+| `fn foo(x: u32) → u32 { }` - Two `rustc_hir::Ty` representing each usage of `u32`. Each has its own `Span`s, etc.- `rustc_hir::Ty` doesn’t tell us that both are the same type | `fn foo(x: u32) → u32 { }` - One `ty::Ty` for all instances of `u32` throughout the program.- `ty::Ty` tells us that both usages of `u32` mean the same type. |
+| `fn foo(x: &u32) -> &u32)`- Two `rustc_hir::Ty` again.- Lifetimes for the references show up in the `rustc_hir::Ty`s using a special marker, [`LifetimeName::Implicit`][implicit]. | `fn foo(x: &u32) -> &u32)`- A single `ty::Ty`.- The `ty::Ty` has the hidden lifetime param |
+
+[implicit]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/enum.LifetimeName.html#variant.Implicit
+
+**Order** HIR is built directly from the AST, so it happens before any `ty::Ty` is produced. After
+HIR is built, some basic type inference and type checking is done. During the type inference, we
+figure out what the `ty::Ty` of everything is and we also check if the type of something is
+ambiguous. The `ty::Ty` then, is used for type checking while making sure everything has the
+expected type. The [`astconv` module][astconv], is where the code responsible for converting a
+`rustc_hir::Ty` into a `ty::Ty` is located. This occurs during the type-checking phase,
+but also in other parts of the compiler that want to ask questions like "what argument types does
+this function expect"?.
+
+[astconv]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_typeck/astconv/index.html
+
+**How semantics drive the two instances of `Ty`** You can think of HIR as the perspective
+of the type information that assumes the least. We assume two things are distinct until they are
+proven to be the same thing. In other words, we know less about them, so we should assume less about
+them.
+
+They are syntactically two strings: `"u32"` at line N column 20 and `"u32"` at line N column 35. We
+don’t know that they are the same yet. So, in the HIR we treat them as if they are different. Later,
+we determine that they semantically are the same type and that’s the `ty::Ty` we use.
+
+Consider another example: `fn foo<T>(x: T) -> u32` and suppose that someone invokes `foo::<u32>(0)`.
+This means that `T` and `u32` (in this invocation) actually turns out to be the same type, so we
+would eventually end up with the same `ty::Ty` in the end, but we have distinct `rustc_hir::Ty`.
+(This is a bit over-simplified, though, since during type checking, we would check the function
+generically and would still have a `T` distinct from `u32`. Later, when doing code generation,
+we would always be handling "monomorphized" (fully substituted) versions of each function,
+and hence we would know what `T` represents (and specifically that it is `u32`).
+
+Here is one more example:
+
+```rust
+mod a {
+    type X = u32;
+    pub fn foo(x: X) -> i32 { 22 }
+}
+mod b {
+    type X = i32;
+    pub fn foo(x: X) -> i32 { x }
+}
+```
+
+Here the type `X` will vary depending on context, clearly. If you look at the `rustc_hir::Ty`,
+you will get back that `X` is an alias in both cases (though it will be mapped via name resolution
+to distinct aliases). But if you look at the `ty::Ty` signature, it will be either `fn(u32) -> u32`
+or `fn(i32) -> i32` (with type aliases fully expanded).
+
+## `ty::Ty` implementation
+
+[`rustc::ty::Ty`][ty_ty] is actually a type alias to [`&TyS`][tys] (more about that later). `TyS`
+(Type Structure) is where the main functionality is located. You can ignore `TyS` struct in general;
+you will basically never access it explicitly. We always pass it by reference using the `Ty` alias.
+The only exception is to define inherent methods on types. In particular, `TyS` has a [`kind`][kind]
+field of type [`TyKind`][tykind], which represents the key type information. `TyKind` is a big enum
+which represents different kinds of types (e.g. primitives, references, abstract data types,
+generics, lifetimes, etc). `TyS` also has 2 more fields, `flags` and `outer_exclusive_binder`. They
+are convenient hacks for efficiency and summarize information about the type that we may want to
+know, but they don’t come into the picture as much here. Finally, `ty::TyS`s
+are [interned](./memory.md), so that the `ty::Ty` can be a thin pointer-like
+type. This allows us to do cheap comparisons for equality, along with the other
+benefits of interning.
+
+[tys]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyS.html
+[kind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyS.html#structfield.kind
+[tykind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html
+
+## Allocating and working with types
+
+To allocate a new type, you can use the various `mk_` methods defined on the `tcx`. These have names
+that correspond mostly to the various kinds of types. For example:
+
+```rust,ignore
+let array_ty = tcx.mk_array(elem_ty, len * 2);
+```
+
+These methods all return a `Ty<'tcx>` – note that the lifetime you get back is the lifetime of the
+arena that this `tcx` has access to. Types are always canonicalized and interned (so we never
+allocate exactly the same type twice).
+
+> NB. Because types are interned, it is possible to compare them for equality efficiently using `==`
+> – however, this is almost never what you want to do unless you happen to be hashing and looking
+> for duplicates. This is because often in Rust there are multiple ways to represent the same type,
+> particularly once inference is involved. If you are going to be testing for type equality, you
+> probably need to start looking into the inference code to do it right.
+
+You can also find various common types in the `tcx` itself by accessing `tcx.types.bool`,
+`tcx.types.char`, etc (see [`CommonTypes`] for more).
+
+[`CommonTypes`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/context/struct.CommonTypes.html
+
+## `ty::TyKind` Variants
+
+Note: `TyKind` is **NOT** the functional programming concept of *Kind*.
+
+Whenever working with a `Ty` in the compiler, it is common to match on the kind of type:
+
+```rust,ignore
+fn foo(x: Ty<'tcx>) {
+  match x.kind {
+    ...
+  }
+}
+```
+
+The `kind` field is of type `TyKind<'tcx>`, which is an enum defining all of the different kinds of
+types in the compiler.
+
+> N.B. inspecting the `kind` field on types during type inference can be risky, as there may be
+> inference variables and other things to consider, or sometimes types are not yet known and will
+> become known later.
+
+There are a lot of related types, and we’ll cover them in time (e.g regions/lifetimes,
+“substitutions”, etc).
+
+There are a bunch of variants on the `TyKind` enum, which you can see by looking at the rustdocs.
+Here is a sampling:
+
+[**Algebraic Data Types (ADTs)**]() An [*algebraic Data Type*][wikiadt] is a  `struct`, `enum` or
+`union`.  Under the hood, `struct`, `enum` and `union` are actually implemented the same way: they
+are both [`ty::TyKind::Adt`][kindadt].  It’s basically a user defined type. We will talk more about
+these later.
+
+[**Foreign**][kindforeign] Corresponds to `extern type T`.
+
+[**Str**][kindstr] Is the type str. When the user writes `&str`, `Str` is the how we represent the
+`str` part of that type.
+
+[**Slice**][kindslice] Corresponds to `[T]`.
+
+[**Array**][kindarray] Corresponds to `[T; n]`.
+
+[**RawPtr**][kindrawptr] Corresponds to `*mut T` or `*const T`
+
+[**Ref**][kindref] `Ref` stands for safe references, `&'a mut T` or `&'a T`. `Ref` has some
+associated parts, like `Ty<'tcx>` which is the type that the reference references, `Region<'tcx>` is
+the lifetime or region of the reference and `Mutability` if the reference is mutable or not.
+
+[**Param**][kindparam] Represents a type parameter (e.g. the `T` in `Vec<T>`).
+
+[**Error**][kinderr] Represents a type error somewhere so that we can print better diagnostics. We
+will discuss this more later.
+
+[**And Many More**...][kindvars]
+
+[wikiadt]: https://en.wikipedia.org/wiki/Algebraic_data_type
+[kindadt]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Adt
+[kindforeign]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Foreign
+[kindstr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Str
+[kindslice]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Slice
+[kindarray]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Array
+[kindrawptr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.RawPtr
+[kindref]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Ref
+[kindparam]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Param
+[kinderr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Error
+[kindvars]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variants
+
+## Import conventions
+
+Although there is no hard and fast rule, the `ty` module tends to be used like so:
+
+```rust,ignore
+use ty::{self, Ty, TyCtxt};
+```
+
+In particular, since they are so common, the `Ty` and `TyCtxt` types are imported directly. Other
+types are often referenced with an explicit `ty::` prefix (e.g. `ty::TraitRef<'tcx>`). But some
+modules choose to import a larger or smaller set of names explicitly.
+
+## ADTs Representation
+
+Let's consider the example of a type like `MyStruct<u32>`, where `MyStruct` is defined like so:
+
+```rust,ignore
+struct MyStruct<T> { x: u32, y: T }
+```
+
+The type `MyStruct<u32>` would be an instance of `TyKind::Adt`:
+
+```rust,ignore
+Adt(&'tcx AdtDef, SubstsRef<'tcx>)
+//  ------------  ---------------
+//  (1)            (2)
+//
+// (1) represents the `MyStruct` part
+// (2) represents the `<u32>`, or "substitutions" / generic arguments
+```
+
+There are two parts:
+
+- The [`AdtDef`][adtdef] references the struct/enum/union but without the values for its type
+  parameters. In our example, this is the `MyStruct` part *without* the argument `u32`.
+    - Note that in the HIR, structs, enums and unions are represented differently, but in `ty::Ty`,
+      they are all represented using `TyKind::Adt`.
+- The [`SubstsRef`][substsref] is an interned list of values that are to be substituted for the
+  generic parameters.  In our example of `MyStruct<u32>`, we would end up with a list like `[u32]`.
+  We’ll dig more into generics and substitutions in a little bit.
+
+[adtdef]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.AdtDef.html
+[substsref]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/type.SubstsRef.html
+
+**`AdtDef` and `DefId`**
+
+For every type defined in the source code, there is a unique `DefId` (see [this
+chapter](hir.md#identifiers-in-the-hir)). This includes ADTs and generics. In the `MyStruct<T>`
+definition we gave above, there are two `DefId`s: one for `MyStruct` and one for `T`.  Notice that
+the code above does not generate a new `DefId` for `u32` because it is not defined in that code (it
+is only referenced).
+
+`AdtDef` is more or less a wrapper around `DefId` with lots of useful helper methods. There is
+essentially a one-to-one relationship between `AdtDef` and `DefId`. You can get the `AdtDef` for a
+`DefId` with the [`tcx.adt_def(def_id)` query][adtdefq].  The `AdtDef`s are all interned (as you can
+see `'tcx` lifetime on it).
+
+[adtdefq]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyCtxt.html#method.adt_def
+
+
+## Type errors
+
+There is a `TyKind::Error` that is produced when the user makes a type error. The idea is that
+we would propagate this type and suppress other errors that come up due to it so as not to overwhelm
+the user with cascading compiler error messages.
+
+There is an **important invariant** for `TyKind::Error`. You should **never** return the 'error
+type' unless you **know** that an error has already been reported to the user. This is usually
+because (a) you just reported it right there or (b) you are propagating an existing Error type (in
+which case the error should've been reported when that error type was produced).
+
+It's important to maintain this invariant because the whole point of the `Error` type is to suppress
+other errors -- i.e., we don't report them. If we were to produce an `Error` type without actually
+emitting an error to the user, then this could cause later errors to be suppressed, and the
+compilation might inadvertently succeed!
+
+Sometimes there is a third case. You believe that an error has been reported, but you believe it
+would've been reported earlier in the compilation, not locally. In that case, you can invoke
+[`delay_span_bug`] This will make a note that you expect compilation to yield an error -- if however
+compilation should succeed, then it will trigger a compiler bug report.
+
+[`delay_span_bug`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/struct.Session.html#method.delay_span_bug
+
+## Question: Why not substitute “inside” the `AdtDef`?
+
+Recall that we represent a generic struct with `(AdtDef, substs)`. So why bother with this scheme?
+
+Well, the alternate way we could have choosen to represent types would be to always create a new,
+fully-substituted form of the `AdtDef` where all the types are already substituted. This seems like
+less of a hassle. However, the `(AdtDef, substs)` scheme has some advantages over this.
+
+First, `(AdtDef, substs)` scheme has an efficiency win:
+
+```rust,ignore
+struct MyStruct<T> {
+  ... 100s of fields ...
+}
+
+// Want to do: MyStruct<A> ==> MyStruct<B>
+```
+
+in an example like this, we can subst from `MyStruct<A>` to `MyStruct<B>` (and so on) very cheaply,
+by just replacing the one reference to `A` with `B`. But if we eagerly substituted all the fields,
+that could be a lot more work because we might have to go through all of the fields in the `AdtDef`
+and update all of their types.
+
+A bit more deeply, this corresponds to structs in Rust being [*nominal* types][nominal] — which
+means that they are defined by their *name* (and that their contents are then indexed from the
+definition of that name, and not carried along “within” the type itself).
+
+[nominal]: https://en.wikipedia.org/wiki/Nominal_type_system
diff --git a/src/doc/rustc-guide/src/type-checking.md b/src/doc/rustc-dev-guide/src/type-checking.md
similarity index 100%
rename from src/doc/rustc-guide/src/type-checking.md
rename to src/doc/rustc-dev-guide/src/type-checking.md
diff --git a/src/doc/rustc-guide/src/type-inference.md b/src/doc/rustc-dev-guide/src/type-inference.md
similarity index 97%
rename from src/doc/rustc-guide/src/type-inference.md
rename to src/doc/rustc-dev-guide/src/type-inference.md
index d4734525f7..dca93dbdf3 100644
--- a/src/doc/rustc-guide/src/type-inference.md
+++ b/src/doc/rustc-dev-guide/src/type-inference.md
@@ -43,17 +43,12 @@ tcx.infer_ctxt().enter(|infcx| {
 })
 ```
 
-Each inference context creates a short-lived type arena to store the
-fresh types and things that it will create, as described in the
-[chapter on the `ty` module][ty-ch]. This arena is created by the `enter`
-function and disposed of after it returns.
-
-[ty-ch]: ty.html
-
 Within the closure, `infcx` has the type `InferCtxt<'cx, 'tcx>` for some
 fresh `'cx`, while `'tcx` is the same as outside the inference context.
 (Again, see the [`ty` chapter][ty-ch] for more details on this setup.)
 
+[ty-ch]: ty.html
+
 The `tcx.infer_ctxt` method actually returns a builder, which means
 there are some kinds of configuration you can do before the `infcx` is
 created. See `InferCtxtBuilder` for more information.
diff --git a/src/doc/rustc-guide/src/variance.md b/src/doc/rustc-dev-guide/src/variance.md
similarity index 100%
rename from src/doc/rustc-guide/src/variance.md
rename to src/doc/rustc-dev-guide/src/variance.md
diff --git a/src/doc/rustc-guide/src/walkthrough.md b/src/doc/rustc-dev-guide/src/walkthrough.md
similarity index 100%
rename from src/doc/rustc-guide/src/walkthrough.md
rename to src/doc/rustc-dev-guide/src/walkthrough.md
diff --git a/src/doc/rustc-guide/triagebot.toml b/src/doc/rustc-dev-guide/triagebot.toml
similarity index 100%
rename from src/doc/rustc-guide/triagebot.toml
rename to src/doc/rustc-dev-guide/triagebot.toml
diff --git a/src/doc/rustc-guide/README.md b/src/doc/rustc-guide/README.md
deleted file mode 100644
index 12d46b4e52..0000000000
--- a/src/doc/rustc-guide/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-![Travis CI badge](https://api.travis-ci.com/rust-lang/rustc-guide.svg?branch=master)
-
-
-This is a collaborative effort to build a guide that explains how rustc
-works. The aim of the guide is to help new contributors get oriented
-to rustc, as well as to help more experienced folks in figuring out
-some new part of the compiler that they haven't worked on before.
-
-[You can read the latest version of the guide here.](https://rust-lang.github.io/rustc-guide/)
-
-You may also find the rustdocs [for the compiler itself][rustdocs] useful.
-
-[rustdocs]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/
-
-### Contributing to the guide
-
-The guide is useful today, but it has a lot of work still go.
-
-If you'd like to help improve the guide, we'd love to have you! You can find
-plenty of issues on the [issue
-tracker](https://github.com/rust-lang/rustc-guide/issues). Just post a
-comment on the issue you would like to work on to make sure that we don't
-accidentally duplicate work. If you think something is missing, please open an
-issue about it!
-
-**In general, if you don't know how the compiler works, that is not a
-problem!** In that case, what we will do is to schedule a bit of time
-for you to talk with someone who **does** know the code, or who wants
-to pair with you and figure it out.  Then you can work on writing up
-what you learned.
-
-In general, when writing about a particular part of the compiler's code, we
-recommend that you link to the relevant parts of the [rustc
-rustdocs][rustdocs].
-
-To help prevent accidentally introducing broken links, we use the
-`mdbook-linkcheck`. If installed on your machine `mdbook` will automatically
-invoke this link checker, otherwise it will emit a warning saying it couldn't
-be found.
-
-```bash
-> cargo install mdbook-linkcheck
-```
-
-You will need `mdbook` version `>= 0.2`. `linkcheck` will be run automatically
-when you run `mdbook build`.
-
-## How to fix toolstate failures
-
-1. You will get a ping from the toolstate commit. e.g. https://github.com/rust-lang-nursery/rust-toolstate/commit/8ffa0e4c30ac9ba8546b7046e5c4ccc2b96ebdd4
-
-2. The commit contains a link to the PR that caused the breakage. e.g. https://github.com/rust-lang/rust/pull/64321
-
-3. If you go to that PR's thread, there is a post from bors with a link to the CI status: https://github.com/rust-lang/rust/pull/64321#issuecomment-529763807
-
-4. Follow the check-azure link to get to the Azure website for that build: https://dev.azure.com/rust-lang/e71b0ddf-dd27-435a-873c-e30f86eea377/_build/results?buildId=7780
-
-5. There will be approximately 1 billion different jobs for the build. They are for different configurations and platforms. The rustc-guide build only runs on the Linux x86_64-gnu-tools job. So click on that job in the list, which is about 60% down in the list.
-
-6. Click the Run build step in the job to get the console log for the step.
-
-7. Click on the log and Ctrl-f to get a search box in the log
-
-8. Search for rustc-guide. This gets you to the place where the links are checked. It is usually ~11K lines into the log
-
-9. Look at the links in the log near that point in the log
-
-10. Fix those links in the rustc-guide (by making a PR in the rustc-guide repo)
-
-11. Make a PR on the rust-lang/rust repo to update the rustc-guide git submodule in src/docs/rustc-guide.
-To make a PR, the following steps are useful.
-
-```bash
-# Assuming you already cloned the rust-lang/rust repo and you're in the correct directory
-git submodule update --remote src/doc/rustc-guide
-git add -u
-git commit -m "Update rustc-guide"
-# Note that you can use -i, which is short for --incremental, in the following command
-./x.py test --incremental --stage 1 src/doc/rustc-guide # This is optional and should succeed anyway
-# Open a PR in rust-lang/rust
-```
-
-12. Wait for PR to merge
-
-Voila!
diff --git a/src/doc/rustc-guide/book.toml b/src/doc/rustc-guide/book.toml
deleted file mode 100644
index 3a5b1fd6dc..0000000000
--- a/src/doc/rustc-guide/book.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-[book]
-title = "Guide to Rustc Development"
-author = "Rustc developers"
-description = "A guide to developing rustc"
-
-[build]
-create-missing = false
-
-[output.html]
-git-repository-url = "https://github.com/rust-lang/rustc-guide"
-
-[output.html.fold]
-enable = true
-level = 1
-
-[output.linkcheck]
-follow-web-links = true
-exclude = [ "crates\\.io", "gcc\\.godbolt\\.org", "youtube\\.com", "youtu\\.be", "dl\\.acm\\.org", "cs\\.bgu\\.ac\\.il" ]
-cache-timeout = 172800
-warning-policy = "error"
diff --git a/src/doc/rustc-guide/ci/install.sh b/src/doc/rustc-guide/ci/install.sh
deleted file mode 100755
index 5cb2f41fca..0000000000
--- a/src/doc/rustc-guide/ci/install.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-function cargo_install() {
-  local name=$1
-  local version=$2
-
-  if command -v $name >/dev/null 2>&1; then
-    local installed_version=`$name --version | sed -E 's/[a-zA-Z_-]+ v?//g'`
-    if [ "$installed_version" == "$version" ]; then
-        echo "$name $version is already installed at $(command -v $name)"
-    else
-        echo "Forcing install $name $version"
-        cargo install $name --version $version --force
-    fi
-  else
-    echo "Installing $name $version"
-    cargo install $name --version $version
-  fi
-}
-
-cargo_install mdbook 0.3.4
-cargo_install mdbook-linkcheck 0.5.0
diff --git a/src/doc/rustc-guide/src/appendix/compiler-lecture.md b/src/doc/rustc-guide/src/appendix/compiler-lecture.md
deleted file mode 100644
index 3912bab767..0000000000
--- a/src/doc/rustc-guide/src/appendix/compiler-lecture.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# Compiler Lecture Series
-
-These are videos where various experts explain different parts of the compiler:
-
-- Tom Tromey discusses debugging support in rustc
-    - Video: https://www.youtube.com/watch?v=elBxMRSNYr4
-- How Salsa Works (2019.01)
-    - Video: https://www.youtube.com/watch?v=_muY4HjSqVw
-- Salsa In More Depth (2019.01)
-    - Video: https://www.youtube.com/watch?v=i_IhACacPRY
-- RLS 2.0, Salsa, and Name Resolution
-    - Video: https://www.youtube.com/watch?v=Xr-rBqLr-G4
-- Cranelift
-    - Video: https://www.youtube.com/watch?v=9OIA7DTFQWU
-- Rust analyzer guide
-    - Video: https://www.youtube.com/watch?v=ANKBNiSWyfc
--  Rust analyzer syntax trees
-    - Video: https://www.youtube.com/watch?v=DGAuLWdCCAI
--  rust-analyzer type-checker overview by flodiebold
-    - Video: https://www.youtube.com/watch?v=Lmp3P9WNL8o
--  oli-obk on miri and constant evaluation
-    - Video: https://www.youtube.com/watch?v=5Pm2C1YXrvM
--  Polonius-rustc walkthrough
-    - Video: https://www.youtube.com/watch?v=i5KdU0ieb_A
--  rustc-chalk integration overview
-    - Video: https://www.youtube.com/watch?v=MBWtbDifPeU
--  Coherence in Chalk by Sunjay Varma - Bay Area Rust Meetup
-    - assigned to @juanbono
-    - Video: https://www.youtube.com/watch?v=rZqS4bLPL24
--  How the chalk-engine crate works
-    - Video: https://www.youtube.com/watch?v=Ny2928cGDoM
--  How the chalk-engine crate works 2
-    - Video: https://www.youtube.com/watch?v=hmV66tB79LM
--  RFC #2229 Disjoint Field Capture plan
-    - Video: https://www.youtube.com/watch?v=UTXOptVMuIc
--  closures and upvar capture
-    - Video: https://www.youtube.com/watch?v=fMopdkn5-Xw
--  blitzerr closure upvar tys
-    - Video: https://www.youtube.com/watch?v=pLmVhSB-z4s
--  Convert Closure Upvar Representation to Tuples with blitzerr
-    - Video: https://www.youtube.com/watch?v=2QCuNtISoYc
--  async-await implementation plans
-    - Video: https://www.youtube.com/watch?v=xe2_whJWBC0
--  async-await region inferencer
-    - Video: https://www.youtube.com/watch?v=hlOxfkUDLPQ
--  Universes and Lifetimes
-    - Video: https://www.youtube.com/watch?v=iV1Z0xYXkck
--  Representing types in rustc
-    - Video: https://www.youtube.com/watch?v=c01TsOsr3-c
--  Polonius WG: Initialization and move tracking
-    - Video: https://www.youtube.com/watch?v=ilv9V-328HI
diff --git a/src/doc/rustc-guide/src/appendix/glossary.md b/src/doc/rustc-guide/src/appendix/glossary.md
deleted file mode 100644
index a773e35215..0000000000
--- a/src/doc/rustc-guide/src/appendix/glossary.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Appendix C: Glossary
-
-The compiler uses a number of...idiosyncratic abbreviations and things. This
-glossary attempts to list them and give you a few pointers for understanding
-them better.
-
-Term                    | Meaning
-------------------------|--------
-AST                     |  the abstract syntax tree produced by the syntax crate; reflects user syntax very closely.
-binder                  |  a "binder" is a place where a variable or type is declared; for example, the `<T>` is a binder for the generic type parameter `T` in `fn foo<T>(..)`, and \|`a`\|` ...` is a binder for the parameter `a`. See [the background chapter for more](./background.html#free-vs-bound)
-bound variable          |  a "bound variable" is one that is declared within an expression/term. For example, the variable `a` is bound within the closure expression \|`a`\|` a * 2`. See [the background chapter for more](./background.html#free-vs-bound)
-codegen                 |  the code to translate MIR into LLVM IR.
-codegen unit            |  when we produce LLVM IR, we group the Rust code into a number of codegen units (sometimes abbreviated as CGUs). Each of these units is processed by LLVM independently from one another, enabling parallelism. They are also the unit of incremental re-use.
-completeness            |  completeness is a technical term in type theory. Completeness means that every type-safe program also type-checks. Having both soundness and completeness is very hard, and usually soundness is more important. (see "soundness").
-control-flow graph      |  a representation of the control-flow of a program; see [the background chapter for more](./background.html#cfg)
-CTFE                    |  Compile-Time Function Evaluation. This is the ability of the compiler to evaluate `const fn`s at compile time. This is part of the compiler's constant evaluation system. ([see more](../const-eval.html))
-cx                      |  we tend to use "cx" as an abbreviation for context. See also `tcx`, `infcx`, etc.
-DAG                     |  a directed acyclic graph is used during compilation to keep track of dependencies between queries. ([see more](../queries/incremental-compilation.html))
-data-flow analysis      |  a static analysis that figures out what properties are true at each point in the control-flow of a program; see [the background chapter for more](./background.html#dataflow)
-DefId                   |  an index identifying a definition (see `librustc/hir/def_id.rs`). Uniquely identifies a `DefPath`.
-Double pointer          |  a pointer with additional metadata. See "fat pointer" for more.
-drop glue               |  (internal) compiler-generated instructions that handle calling the destructors (`Drop`) for data types.
-DST                     |  Dynamically-Sized Type. A type for which the compiler cannot statically know the size in memory (e.g. `str` or `[u8]`). Such types don't implement `Sized` and cannot be allocated on the stack. They can only occur as the last field in a struct. They can only be used behind a pointer (e.g. `&str` or `&[u8]`).
-early-bound lifetime    |  a lifetime region that is substituted at its definition site. Bound in an item's `Generics` and substituted using a `Substs`. Contrast with **late-bound lifetime**. ([see more](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.RegionKind.html#bound-regions))
-empty type              |  see "uninhabited type".
-Fat pointer             |  a two word value carrying the address of some value, along with some further information necessary to put the value to use. Rust includes two kinds of "fat pointers": references to slices, and trait objects. A reference to a slice carries the starting address of the slice and its length. A trait object carries a value's address and a pointer to the trait's implementation appropriate to that value. "Fat pointers" are also known as "wide pointers", and "double pointers".
-free variable           |  a "free variable" is one that is not bound within an expression or term; see [the background chapter for more](./background.html#free-vs-bound)
-generics                |  the set of generic type parameters defined on a type or item
-HIR                     |  the High-level IR, created by lowering and desugaring the AST ([see more](../hir.html))
-HirId                   |  identifies a particular node in the HIR by combining a def-id with an "intra-definition offset".
-HIR Map                 |  The HIR map, accessible via tcx.hir, allows you to quickly navigate the HIR and convert between various forms of identifiers.
-ICE                     |  internal compiler error. When the compiler crashes.
-ICH                     |  incremental compilation hash. ICHs are used as fingerprints for things such as HIR and crate metadata, to check if changes have been made. This is useful in incremental compilation to see if part of a crate has changed and should be recompiled.
-inference variable      |  when doing type or region inference, an "inference variable" is a kind of special type/region that represents what you are trying to infer. Think of X in algebra. For example, if we are trying to infer the type of a variable in a program, we create an inference variable to represent that unknown type.
-infcx                   |  the inference context (see `librustc/infer`)
-intern                  |  interning refers to storing certain frequently-used constant data, such as strings, and then referring to the data by an identifier (e.g. a `Symbol`) rather than the data itself, to reduce memory usage.
-IR                      |  Intermediate Representation. A general term in compilers. During compilation, the code is transformed from raw source (ASCII text) to various IRs. In Rust, these are primarily HIR, MIR, and LLVM IR. Each IR is well-suited for some set of computations. For example, MIR is well-suited for the borrow checker, and LLVM IR is well-suited for codegen because LLVM accepts it.
-IRLO                    |  `IRLO` or `irlo` is sometimes used as an abbreviation for [internals.rust-lang.org](https://internals.rust-lang.org).
-item                    |  a kind of "definition" in the language, such as a static, const, use statement, module, struct, etc. Concretely, this corresponds to the `Item` type.
-lang item               |  items that represent concepts intrinsic to the language itself, such as special built-in traits like `Sync` and `Send`; or traits representing operations such as `Add`; or functions that are called by the compiler. ([see more](https://doc.rust-lang.org/1.9.0/book/lang-items.html))
-late-bound lifetime     |  a lifetime region that is substituted at its call site. Bound in a HRTB and substituted by specific functions in the compiler, such as `liberate_late_bound_regions`. Contrast with **early-bound lifetime**. ([see more](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.RegionKind.html#bound-regions))
-local crate             |  the crate currently being compiled.
-LTO                     |  Link-Time Optimizations. A set of optimizations offered by LLVM that occur just before the final binary is linked. These include optimizations like removing functions that are never used in the final program, for example. _ThinLTO_ is a variant of LTO that aims to be a bit more scalable and efficient, but possibly sacrifices some optimizations. You may also read issues in the Rust repo about "FatLTO", which is the loving nickname given to non-Thin LTO. LLVM documentation: [here][lto] and [here][thinlto]
-[LLVM]                  |  (actually not an acronym :P) an open-source compiler backend. It accepts LLVM IR and outputs native binaries. Various languages (e.g. Rust) can then implement a compiler front-end that output LLVM IR and use LLVM to compile to all the platforms LLVM supports.
-memoize                 |  memoization is the process of storing the results of (pure) computations (such as pure function calls) to avoid having to repeat them in the future. This is typically a trade-off between execution speed and memory usage.
-MIR                     |  the Mid-level IR that is created after type-checking for use by borrowck and codegen ([see more](../mir/index.html))
-miri                    |  an interpreter for MIR used for constant evaluation ([see more](../miri.html))
-monomorphize            |  Monomorphization is 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               |  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)
-newtype                 |  a "newtype" is 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                     | [non-lexical lifetimes](../borrow_check/region_inference.html), an extension to Rust's borrowing system to make it be based on the control-flow graph.
-node-id or NodeId       |  an index identifying a particular node in the AST or HIR; gradually being phased out and replaced with `HirId`.
-obligation              |  something that must be proven by the trait system ([see more](../traits/resolution.html))
-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.
-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)
-promoted constants      |  constants extracted from a function and lifted to static scope; see [this section](../mir/index.html#promoted) for more details.
-provider                |  the function that executes a query ([see more](../query.html))
-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)
-query                   |  perhaps some sub-computation during compilation ([see more](../query.html))
-region                  |  another term for "lifetime" often used in the literature and in the borrow checker.
-rib                     |  a data structure in the name resolver that keeps track of a single scope for names. ([see more](../name-resolution.html))
-sess                    |  the compiler session, which stores global data used throughout compilation
-side tables             |  because the AST and HIR are immutable once created, we often carry extra information about them in the form of hashtables, indexed by the id of a particular node.
-sigil                   |  like a keyword but composed entirely of non-alphanumeric tokens. For example, `&` is a sigil for references.
-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.
-soundness               |  soundness is a technical term in type theory. Roughly, if a type system is sound, then if a program type-checks, it is type-safe; i.e. I can never (in safe rust) force a value into a variable of the wrong type. (see "completeness").
-span                    |  a location in the user's source code, used for error reporting primarily. These are like a file-name/line-number/column tuple on steroids: they carry a start/end point, and also track macro expansions and compiler desugaring. All while being packed into a few bytes (really, it's an index into a table). See the Span datatype for more.
-substs                  |  the substitutions for a given generic type or item (e.g. the `i32`, `u32` in `HashMap<i32, u32>`)
-tcx                     |  the "typing context", main data structure of the compiler ([see more](../ty.html))
-'tcx                    |  the lifetime of the allocation arena ([see more](../ty.html))
-trait reference         |  the name of a trait along with a suitable set of input type/lifetimes ([see more](../traits/goals-and-clauses.html#trait-ref))
-token                   |  the smallest unit of parsing. Tokens are produced after lexing ([see more](../the-parser.html)).
-[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.
-trans                   |  the code to translate MIR into LLVM IR. Renamed to codegen.
-trait reference         |  a trait and values for its type parameters ([see more](../ty.html)).
-ty                      |  the internal representation of a type ([see more](../ty.html)).
-UFCS                    |  Universal Function Call Syntax. An unambiguous syntax for calling a method ([see more](../type-checking.html)).
-uninhabited type        |  a type which has _no_ values. This is not the same as a ZST, which has exactly 1 value. An example of an uninhabited type is `enum Foo {}`, which has no variants, and so, can never be created. The compiler can treat code that deals with uninhabited types as dead code, since there is no such value to be manipulated. `!` (the never type) is an uninhabited type. Uninhabited types are also called "empty types".
-upvar                   |  a variable captured by a closure from outside the closure.
-variance                |  variance determines how changes to a generic type/lifetime parameter affect subtyping; for example, if `T` is a subtype of `U`, then `Vec<T>` is a subtype `Vec<U>` because `Vec` is *covariant* in its generic parameter. See [the background chapter](./background.html#variance) for a more general explanation. See the [variance chapter](../variance.html) for an explanation of how type checking handles variance.
-Wide pointer            |  a pointer with additional metadata. See "fat pointer" for more.
-ZST                     |  Zero-Sized Type. A type whose values have size 0 bytes. Since `2^0 = 1`, such types can have exactly one value. For example, `()` (unit) is a ZST. `struct Foo;` is also a ZST. The compiler can do some nice optimizations around ZSTs.
-
-[LLVM]: https://llvm.org/
-[lto]: https://llvm.org/docs/LinkTimeOptimization.html
-[thinlto]: https://clang.llvm.org/docs/ThinLTO.html
-[TLS]: https://llvm.org/docs/LangRef.html#thread-local-storage-models
diff --git a/src/doc/rustc-guide/src/sanitizers.md b/src/doc/rustc-guide/src/sanitizers.md
deleted file mode 100644
index 6205433e59..0000000000
--- a/src/doc/rustc-guide/src/sanitizers.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Sanitizers Support
-
-The rustc compiler contains basic support for following sanitizers:
-
-* [AddressSanitizer][clang-asan] a faster memory error detector. Can
-  detect out-of-bounds access to heap, stack, and globals, use after free, use
-  after return, double free, invalid free, memory leaks.
-* [LeakSanitizer][clang-lsan] a run-time memory leak detector.
-* [MemorySanitizer][clang-msan] a detector of uninitialized reads.
-* [ThreadSanitizer][clang-tsan] a fast data race detector.
-
-## How to use the sanitizers?
-
-To enable a sanitizer compile with `-Zsanitizer=...` option, where value is one
-of `address`, `leak`, `memory` or `thread`. For more details how to use
-sanitizers please refer to [the unstable book](https://doc.rust-lang.org/unstable-book/).
-
-## How are sanitizers implemented in rustc?
-
-The implementation of sanitizers relies entirely on LLVM. It consists of
-compile time instrumentation passes and runtime libraries. The role rustc plays
-in the implementation is limited to the execution of the following steps:
-
-1. The sanitizer runtime libraries are part of the [compiler-rt] project, and
-   [will be built as an LLVM subproject][sanitizer-build] when enabled in
-   `config.toml`:
-
-   ```toml
-   [build]
-   sanitizers = true
-   ```
-
-   The runtimes are [placed into target libdir][sanitizer-copy].
-
-2. During LLVM code generation, the functions intended for instrumentation are
-   [marked][sanitizer-attribute] with `SanitizeAddress`, `SanitizeMemory`, or
-   `SanitizeThread` attribute. Currently those attributes are applied in
-   indiscriminate manner. but in principle they could be used to perform
-   instrumentation selectively.
-
-3. The LLVM IR generated by rustc is instrumented by [dedicated LLVM
-   passes][sanitizer-pass], different for each sanitizer. Instrumentation
-   passes are invoked after optimization passes.
-
-4. When producing an executable, the sanitizer specific runtime library is
-   [linked in][sanitizer-link]. The libraries are searched for in target libdir
-   relative to default system root, so that this process is not affected
-   by sysroot overrides used for example by cargo `-Zbuild-std` functionality.
-
-[compiler-rt]: https://github.com/llvm/llvm-project/tree/master/compiler-rt
-[sanitizer-build]: https://github.com/rust-lang/rust/blob/87c3eedffba64830b67e54e75dd479f9fd83cc7d/src/bootstrap/native.rs#L220-L225
-[sanitizer-copy]: https://github.com/rust-lang/rust/blob/87c3eedffba64830b67e54e75dd479f9fd83cc7d/src/bootstrap/compile.rs#L269-L321
-[sanitizer-attribute]: https://github.com/rust-lang/rust/blob/1.38.0/src/librustc_codegen_llvm/declare.rs#L53-L66
-[sanitizer-pass]: https://github.com/rust-lang/rust/blob/1.38.0/src/librustc_codegen_ssa/back/write.rs#L406-L420
-[sanitizer-link]: https://github.com/rust-lang/rust/blob/87c3eedffba64830b67e54e75dd479f9fd83cc7d/src/librustc_codegen_ssa/back/link.rs#L729-L770
-
-## Additional Information
-
-* [Sanitizers project page](https://github.com/google/sanitizers/wiki/)
-* [AddressSanitizer in Clang][clang-asan]
-* [LeakSanitizer in Clang][clang-lsan]
-* [MemorySanitizer in Clang][clang-msan]
-* [ThreadSanitizer in Clang][clang-tsan]
-
-[clang-asan]: https://clang.llvm.org/docs/AddressSanitizer.html
-[clang-lsan]: https://clang.llvm.org/docs/LeakSanitizer.html
-[clang-msan]: https://clang.llvm.org/docs/MemorySanitizer.html
-[clang-tsan]: https://clang.llvm.org/docs/ThreadSanitizer.html
diff --git a/src/doc/rustc-guide/src/traits/lowering-module.md b/src/doc/rustc-guide/src/traits/lowering-module.md
deleted file mode 100644
index 3f1515ef8a..0000000000
--- a/src/doc/rustc-guide/src/traits/lowering-module.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_traits/lowering/
-
-## The `program_clauses_for` query
-
-The main entry point is the `program_clauses_for` [query], which –
-given a def-id – produces a set of Chalk program clauses. These
-queries are tested using a
-[dedicated unit-testing mechanism, described below](#unit-tests).  The
-query is invoked on a `DefId` that identifies something like a trait,
-an impl, or an associated item definition. It then produces and
-returns a vector of program clauses.
-
-[query]: ../query.html
-
-<a name="unit-tests"></a>
-
-## Unit tests
-
-Unit tests are located in [`src/test/ui/chalkify`][chalkify]. A good
-example test is [the `lower_impl` test][lower_impl]. At the time of
-this writing, it looked like this:
-
-```rust,ignore
-#![feature(rustc_attrs)]
-
-trait Foo { }
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-impl<T: 'static> Foo for T where T: Iterator<Item = i32> { }
-
-fn main() {
-    println!("hello");
-}
-```
-
-The `#[rustc_dump_program_clauses]` annotation can be attached to
-anything with a def-id.  (It requires the `rustc_attrs` feature.) The
-compiler will then invoke the `program_clauses_for` query on that
-item, and emit compiler errors that dump the clauses produced. These
-errors just exist for unit-testing, as we can then leverage the
-standard [ui test] mechanisms to check them. In this case, there is a
-`//~ ERROR program clause dump` annotation which is always the same for
-`#[rustc_dump_program_clauses]`, but [the stderr file] contains
-the full details:
-
-```text
-error: program clause dump
-  --> $DIR/lower_impl.rs:5:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<T> { Implemented(T: Foo) :- ProjectionEq(<T as std::iter::Iterator>::Item == i32), TypeOutlives(T: 'static), Implemented(T: std::iter::Iterator), Implemented(T: std::marker::Sized). }
-```
-
-[chalkify]: https://github.com/rust-lang/rust/tree/master/src/test/ui/chalkify
-[lower_impl]: https://github.com/rust-lang/rust/tree/master/src/test/ui/chalkify/lower_impl.rs
-[the stderr file]: https://github.com/rust-lang/rust/tree/master/src/test/ui/chalkify/lower_impl.stderr
-[ui test]: ../tests/adding.html#guide-to-the-ui-tests
diff --git a/src/doc/rustc-guide/src/ty.md b/src/doc/rustc-guide/src/ty.md
deleted file mode 100644
index b665dadf17..0000000000
--- a/src/doc/rustc-guide/src/ty.md
+++ /dev/null
@@ -1,636 +0,0 @@
----
-tags: rustc, ty
----
-
-# The `ty` module: representing types
-
-The `ty` module defines how the Rust compiler represents types internally. It also defines the
-*typing context* (`tcx` or `TyCtxt`), which is the central data structure in the compiler.
-
-## `ty::Ty`
-
-When we talk about how rustc represents types,  we usually refer to a type called `Ty` . There are
-quite a few modules and types for `Ty` in the compiler ([Ty documentation][ty]).
-
-[ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/index.html
-
-The specific `Ty` we are referring to is [`rustc::ty::Ty`][ty_ty] (and not
-[`rustc_hir::Ty`][hir_ty]). The distinction is important, so we will discuss it first before going
-into the details of `ty::Ty`.
-
-[ty_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/type.Ty.html
-[hir_ty]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.Ty.html
-
-## `rustc_hir::Ty` vs `ty::Ty`
-
-The HIR in rustc can be thought of as the high-level intermediate representation. It is more or less
-the AST (see [this chapter](hir.md)) as it represents the
-syntax that the user wrote, and is obtained after parsing and some *desugaring*. It has a
-representation of types, but in reality it reflects more of what the user wrote, that is, what they
-wrote so as to represent that type.
-
-In contrast, `ty::Ty` represents the semantics of a type, that is, the *meaning* of what the user
-wrote. For example, `rustc_hir::Ty` would record the fact that a user used the name `u32` twice
-in their program, but the `ty::Ty` would record the fact that both usages refer to the same type.
-
-**Example: `fn foo(x: u32) → u32 { }`** In this function we see that `u32` appears twice. We know
-that that is the same type, i.e. the function takes an argument and returns an argument of the same
-type, but from the point of view of the HIR there would be two distinct type instances because these
-are occurring in two different places in the program. That is, they have two
-different [`Span`s][span] (locations).
-
-[span]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_span/struct.Span.html
-
-**Example: `fn foo(x: &u32) -> &u32)`** In addition, HIR might have information left out. This type
-`&u32` is incomplete, since in the full rust type there is actually a lifetime, but we didn’t need
-to write those lifetimes. There are also some elision rules that insert information. The result may
-look like  `fn foo<'a>(x: &'a u32) -> &'a u32)`.
-
-In the HIR level, these things are not spelled out and you can say the picture is rather incomplete.
-However, at the `ty::Ty` level, these details are added and it is complete. Moreover, we will have
-exactly one `ty::Ty` for a given type, like `u32`, and that `ty::Ty` is used for all `u32`s in the
-whole program, not a specific usage, unlike `rustc_hir::Ty`.
-
-Here is a summary:
-
-| [`rustc_hir::Ty`][hir_ty] | [`ty::Ty`][ty_ty] |
-| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Describe the *syntax* of a type: what the user wrote (with some desugaring).  | Describe the *semantics* of a type: the meaning of what the user wrote. |
-| Each `rustc_hir::Ty` has its own spans corresponding to the appropriate place in the program. | Doesn’t correspond to a single place in the user’s program. |
-| `rustc_hir::Ty` has generics and lifetimes; however, some of those lifetimes are special markers like [`LifetimeName::Implicit`][implicit]. | `ty::Ty` has the full type, including generics and lifetimes, even if the user left them out |
-| `fn foo(x: u32) → u32 { }` - Two `rustc_hir::Ty` representing each usage of `u32`. Each has its own `Span`s, etc.- `rustc_hir::Ty` doesn’t tell us that both are the same type | `fn foo(x: u32) → u32 { }` - One `ty::Ty` for all instances of `u32` throughout the program.- `ty::Ty` tells us that both usages of `u32` mean the same type. |
-| `fn foo(x: &u32) -> &u32)`- Two `rustc_hir::Ty` again.- Lifetimes for the references show up in the `rustc_hir::Ty`s using a special marker, [`LifetimeName::Implicit`][implicit]. | `fn foo(x: &u32) -> &u32)`- A single `ty::Ty`.- The `ty::Ty` has the hidden lifetime param |
-
-[implicit]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/enum.LifetimeName.html#variant.Implicit
-
-**Order** HIR is built directly from the AST, so it happens before any `ty::Ty` is produced. After
-HIR is built, some basic type inference and type checking is done. During the type inference, we
-figure out what the `ty::Ty` of everything is and we also check if the type of something is
-ambiguous. The `ty::Ty` then, is used for type checking while making sure everything has the
-expected type. The [`astconv` module][astconv], is where the code responsible for converting a
-`rustc_hir::Ty` into a `ty::Ty` is located. This occurs during the type-checking phase,
-but also in other parts of the compiler that want to ask questions like "what argument types does
-this function expect"?.
-
-[astconv]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_typeck/astconv/index.html
-
-**How semantics drive the two instances of `Ty`** You can think of HIR as the perspective
-of the type information that assumes the least. We assume two things are distinct until they are
-proven to be the same thing. In other words, we know less about them, so we should assume less about
-them.
-
-They are syntactically two strings: `"u32"` at line N column 20 and `"u32"` at line N column 35. We
-don’t know that they are the same yet. So, in the HIR we treat them as if they are different. Later,
-we determine that they semantically are the same type and that’s the `ty::Ty` we use.
-
-Consider another example: `fn foo<T>(x: T) -> u32` and suppose that someone invokes `foo::<u32>(0)`.
-This means that `T` and `u32` (in this invocation) actually turns out to be the same type, so we
-would eventually end up with the same `ty::Ty` in the end, but we have distinct `rustc_hir::Ty`.
-(This is a bit over-simplified, though, since during type checking, we would check the function
-generically and would still have a `T` distinct from `u32`. Later, when doing code generation,
-we would always be handling "monomorphized" (fully substituted) versions of each function,
-and hence we would know what `T` represents (and specifically that it is `u32`).
-
-Here is one more example:
-
-```rust
-mod a {
-    type X = u32;
-    pub fn foo(x: X) -> i32 { 22 }
-}
-mod b {
-    type X = i32;
-    pub fn foo(x: X) -> i32 { x }
-}
-```
-
-Here the type `X` will vary depending on context, clearly. If you look at the `rustc_hir::Ty`,
-you will get back that `X` is an alias in both cases (though it will be mapped via name resolution
-to distinct aliases). But if you look at the `ty::Ty` signature, it will be either `fn(u32) -> u32`
-or `fn(i32) -> i32` (with type aliases fully expanded).
-
-## `ty::Ty` implementation
-
-[`rustc::ty::Ty`][ty_ty] is actually a type alias to [`&TyS`][tys] (more about that later). `TyS`
-(Type Structure) is where the main functionality is located. You can ignore `TyS` struct in general;
-you will basically never access it explicitly. We always pass it by reference using the `Ty` alias.
-The only exception is to define inherent methods on types. In particular, `TyS` has a [`kind`][kind]
-field of type [`TyKind`][tykind], which represents the key type information. `TyKind` is a big enum
-which represents different kinds of types (e.g. primitives, references, abstract data types,
-generics, lifetimes, etc). `TyS` also has 2 more fields, `flags` and `outer_exclusive_binder`. They
-are convenient hacks for efficiency and summarize information about the type that we may want to
-know, but they don’t come into the picture as much here.
-
-[tys]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyS.html
-[kind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyS.html#structfield.kind
-[tykind]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html
-
-Note: `TyKind` is **NOT** the functional programming concept of *Kind*.
-
-Whenever working with a `Ty` in the compiler, it is common to match on the kind of type:
-
-```rust,ignore
-fn foo(x: Ty<'tcx>) {
-  match x.kind {
-    ...
-  }
-}
-```
-
-The `kind` field is of type `TyKind<'tcx>`, which is an enum defining all of the different kinds of
-types in the compiler.
-
-> N.B. inspecting the `kind` field on types during type inference can be risky, as there may be
-> inference variables and other things to consider, or sometimes types are not yet known and will
-> become known later.
-
-There are a lot of related types, and we’ll cover them in time (e.g regions/lifetimes,
-“substitutions”, etc).
-
-## `ty::TyKind` Variants
-
-There are a bunch of variants on the `TyKind` enum, which you can see by looking at the rustdocs.
-Here is a sampling:
-
-[**Algebraic Data Types (ADTs)**]() An [*algebraic Data Type*][wikiadt] is a  `struct`, `enum` or
-`union`.  Under the hood, `struct`, `enum` and `union` are actually implemented the same way: they
-are both [`ty::TyKind::Adt`][kindadt].  It’s basically a user defined type. We will talk more about
-these later.
-
-[**Foreign**][kindforeign] Corresponds to `extern type T`.
-
-[**Str**][kindstr] Is the type str. When the user writes `&str`, `Str` is the how we represent the
-`str` part of that type.
-
-[**Slice**][kindslice] Corresponds to `[T]`.
-
-[**Array**][kindarray] Corresponds to `[T; n]`.
-
-[**RawPtr**][kindrawptr] Corresponds to `*mut T` or `*const T`
-
-[**Ref**][kindref] `Ref` stands for safe references, `&'a mut T` or `&'a T`. `Ref` has some
-associated parts, like `Ty<'tcx>` which is the type that the reference references, `Region<'tcx>` is
-the lifetime or region of the reference and `Mutability` if the reference is mutable or not.
-
-[**Param**][kindparam] Represents a type parameter (e.g. the `T` in `Vec<T>`).
-
-[**Error**][kinderr] Represents a type error somewhere so that we can print better diagnostics. We
-will discuss this more later.
-
-[**And Many More**...][kindvars]
-
-[wikiadt]: https://en.wikipedia.org/wiki/Algebraic_data_type
-[kindadt]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Adt
-[kindforeign]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Foreign
-[kindstr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Str
-[kindslice]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Slice
-[kindarray]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Array
-[kindrawptr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.RawPtr
-[kindref]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Ref
-[kindparam]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Param
-[kinderr]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variant.Error
-[kindvars]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.TyKind.html#variants
-
-## Interning
-
-We create a LOT of types during compilation. For performance reasons, we allocate them from a global
-memory pool, they are each allocated once from a long-lived *arena*. This is called _arena
-allocation_. This system reduces allocations/deallocations of memory. It also allows for easy
-comparison of types for equality: we implemented [`PartialEq for TyS`][peqimpl], so we can just
-compare pointers. The [`CtxtInterners`] type contains a bunch of maps of interned types and the
-arena itself.
-
-[peqimpl]: https://github.com/rust-lang/rust/blob/3ee936378662bd2e74be951d6a7011a95a6bd84d/src/librustc/ty/mod.rs#L528-L534
-[`CtxtInterners`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.CtxtInterners.html#structfield.arena
-
-Each time we want to construct a type, the compiler doesn’t naively allocate from the buffer.
-Instead, we check if that type was already constructed. If it was, we just get the same pointer we
-had before, otherwise we make a fresh pointer. With this schema if we want to know if two types are
-the same, all we need to do is compare the pointers which is efficient. `TyS` which represents types
-is carefully setup so you never construct them on the stack. You always allocate them from this
-arena and you always intern them so they are unique.
-
-At the beginning of the compilation we make a buffer and each time we need to allocate a type we use
-some of this memory buffer. If we run out of space we get another one. The lifetime of that buffer
-is `'tcx`. Our types are tied to that lifetime, so when compilation finishes all the memory related
-to that buffer is freed and our `'tcx` references would be invalid.
-
-
-## The tcx and how it uses lifetimes
-
-The `tcx` ("typing context") is the central data structure in the compiler. It is the context that
-you use to perform all manner of queries. The struct `TyCtxt` defines a reference to this shared
-context:
-
-```rust,ignore
-tcx: TyCtxt<'tcx>
-//          ----
-//          |
-//          arena lifetime
-```
-
-As you can see, the `TyCtxt` type takes a lifetime parameter. When you see a reference with a
-lifetime like `'tcx`, you know that it refers to arena-allocated data (or data that lives as long as
-the arenas, anyhow).
-
-## Allocating and working with types
-
-To allocate a new type, you can use the various `mk_` methods defined on the `tcx`. These have names
-that correspond mostly to the various kinds of types. For example:
-
-```rust,ignore
-let array_ty = tcx.mk_array(elem_ty, len * 2);
-```
-
-These methods all return a `Ty<'tcx>` – note that the lifetime you get back is the lifetime of the
-arena that this `tcx` has access to. Types are always canonicalized and interned (so we never
-allocate exactly the same type twice).
-
-> NB. Because types are interned, it is possible to compare them for equality efficiently using `==`
-> – however, this is almost never what you want to do unless you happen to be hashing and looking
-> for duplicates. This is because often in Rust there are multiple ways to represent the same type,
-> particularly once inference is involved. If you are going to be testing for type equality, you
-> probably need to start looking into the inference code to do it right.
-
-You can also find various common types in the `tcx` itself by accessing `tcx.types.bool`,
-`tcx.types.char`, etc (see [`CommonTypes`] for more).
-
-[`CommonTypes`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/context/struct.CommonTypes.html
-
-## Beyond types: other kinds of arena-allocated data structures
-
-In addition to types, there are a number of other arena-allocated data structures that you can
-allocate, and which are found in this module. Here are a few examples:
-
-- [`Substs`][subst], allocated with `mk_substs` – this will intern a slice of types, often used to
-  specify the values to be substituted for generics (e.g. `HashMap<i32, u32>` would be represented
-  as a slice `&'tcx [tcx.types.i32, tcx.types.u32]`).
-- [`TraitRef`], typically passed by value – a **trait reference** consists of a reference to a trait
-  along with its various type parameters (including `Self`), like `i32: Display` (here, the def-id
-  would reference the `Display` trait, and the substs would contain `i32`). Note that `def-id` is
-  defined and discussed in depth in the `AdtDef and DefId` section.
-- [`Predicate`] defines something the trait system has to prove (see `traits` module).
-
-[subst]: ./generic_arguments.html#subst
-[`TraitRef`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TraitRef.html
-[`Predicate`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/enum.Predicate.html
-
-## Import conventions
-
-Although there is no hard and fast rule, the `ty` module tends to be used like so:
-
-```rust,ignore
-use ty::{self, Ty, TyCtxt};
-```
-
-In particular, since they are so common, the `Ty` and `TyCtxt` types are imported directly. Other
-types are often referenced with an explicit `ty::` prefix (e.g. `ty::TraitRef<'tcx>`). But some
-modules choose to import a larger or smaller set of names explicitly.
-
-## ADTs Representation
-
-Let's consider the example of a type like `MyStruct<u32>`, where `MyStruct` is defined like so:
-
-```rust,ignore
-struct MyStruct<T> { x: u32, y: T }
-```
-
-The type `MyStruct<u32>` would be an instance of `TyKind::Adt`:
-
-```rust,ignore
-Adt(&'tcx AdtDef, SubstsRef<'tcx>)
-//  ------------  ---------------
-//  (1)            (2)
-//
-// (1) represents the `MyStruct` part
-// (2) represents the `<u32>`, or "substitutions" / generic arguments
-```
-
-There are two parts:
-
-- The [`AdtDef`][adtdef] references the struct/enum/union but without the values for its type
-  parameters. In our example, this is the `MyStruct` part *without* the argument `u32`.
-    - Note that in the HIR, structs, enums and unions are represented differently, but in `ty::Ty`,
-      they are all represented using `TyKind::Adt`.
-- The [`SubstsRef`][substsref] is an interned list of values that are to be substituted for the
-  generic parameters.  In our example of `MyStruct<u32>`, we would end up with a list like `[u32]`.
-  We’ll dig more into generics and substitutions in a little bit.
-
-[adtdef]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.AdtDef.html
-[substsref]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/type.SubstsRef.html
-
-**`AdtDef` and `DefId`**
-
-For every type defined in the source code, there is a unique `DefId` (see [this
-chapter](hir.md#identifiers-in-the-hir)). This includes ADTs and generics. In the `MyStruct<T>`
-definition we gave above, there are two `DefId`s: one for `MyStruct` and one for `T`.  Notice that
-the code above does not generate a new `DefId` for `u32` because it is not defined in that code (it
-is only referenced).
-
-`AdtDef` is more or less a wrapper around `DefId` with lots of useful helper methods. There is
-essentially a one-to-one relationship between `AdtDef` and `DefId`. You can get the `AdtDef` for a
-`DefId` with the [`tcx.adt_def(def_id)` query][adtdefq].  The `AdtDef`s are all interned (as you can
-see `'tcx` lifetime on it).
-
-[adtdefq]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.TyCtxt.html#method.adt_def
-
-
-### Generics and substitutions
-
-Given a generic type `MyType<A, B, …>`, we may want to swap out the generics `A, B, …` for some
-other types (possibly other generics or concrete types). We do this a lot while doing type
-inference, type checking, and trait solving. Conceptually, during these routines, we may find out
-that one type is equal to another type and want to swap one out for the other and then swap that out
-for another type and so on until we eventually get some concrete types (or an error).
-
-In rustc this is done using the `SubstsRef` that we mentioned above (“substs” = “substitutions”).
-Conceptually, you can think of `SubstsRef` of a list of types that are to be substituted for the
-generic type parameters of the ADT.
-
-`SubstsRef` is a type alias of `List<GenericArg<'tcx>>` (see [`List` rustdocs][list]).
-[`GenericArg`] is essentially a space-efficient wrapper around [`GenericArgKind`], which is an enum
-indicating what kind of generic the type parameter is (type, lifetime, or const).  Thus, `SubstsRef`
-is conceptually like a `&'tcx [GenericArgKind<'tcx>]` slice (but it is actually a `List`).
-
-[list]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.List.html
-[`GenericArg`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/struct.GenericArg.html
-[`GenericArgKind`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/enum.GenericArgKind.html
-
-So why do we use this `List` type instead of making it really a slice? It has the length "inline",
-so `&List` is only 32 bits. As a consequence, it cannot be "subsliced" (that only works if the
-length is out of line).
-
-This also implies that you can check two `List`s for equality via `==` (which would be not be
-possible for ordinary slices). This is precisely because they never represent a "sub-list", only the
-complete `List`, which has been hashed and interned.
-
-So pulling it all together, let’s go back to our example above:
-
-```rust,ignore
-struct MyStruct<T>
-```
-
-- There would be an `AdtDef` (and corresponding `DefId`) for `MyStruct`.
-- There would be a `TyKind::Param` (and corresponding `DefId`) for `T` (more later).
-- There would be a `SubstsRef` containing the list `[GenericArgKind::Type(Ty(T))]`
-    - The `Ty(T)` here is my shorthand for entire other `ty::Ty` that has `TyKind::Param`, which we
-      mentioned in the previous point.
-- This is one `TyKind::Adt` containing the `AdtDef` of `MyStruct` with the `SubstsRef` above.
-
-Finally, we will quickly mention the
-[`Generics`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/struct.Generics.html) type. It
-is used to give information about the type parameters of a type.
-
-### Unsubstituted Generics
-
-So above, recall that in our example the `MyStruct` struct had a generic type `T`. When we are (for
-example) type checking functions that use `MyStruct`, we will need to be able to refer to this type
-`T` without actually knowing what it is. In general, this is true inside all generic definitions: we
-need to be able to work with unknown types. This is done via `TyKind::Param` (which we mentioned in
-the example above).
-
-Each `TyKind::Param` contains two things: the name and the index. In general, the index fully
-defines the parameter and is used by most of the code. The name is included for debug print-outs.
-There are two reasons for this. First, the index is convenient, it allows you to include into the
-list of generic arguments when substituting. Second, the index is more robust. For example, you
-could in principle have two distinct type parameters that use the same name, e.g. `impl<A> Foo<A> {
-fn bar<A>() { .. } }`, although the rules against shadowing make this difficult (but those language
-rules could change in the future).
-
-The index of the type parameter is an integer indicating its order in the list of the type
-parameters. Moreover, we consider the list to include all of the type parameters from outer scopes.
-Consider the following example:
-
-```rust,ignore
-struct Foo<A, B> {
-  // A would have index 0
-  // B would have index 1
-
-  .. // some fields
-}
-impl<X, Y> Foo<X, Y> {
-  fn method<Z>() {
-    // inside here, X, Y and Z are all in scope
-    // X has index 0
-    // Y has index 1
-    // Z has index 2
-  }
-}
-```
-
-When we are working inside the generic definition, we will use `TyKind::Param` just like any other
-`TyKind`; it is just a type after all. However, if we want to use the generic type somewhere, then
-we will need to do substitutions.
-
-For example suppose that the `Foo<A, B>` type from the previous example has a field that is a
-`Vec<A>`. Observe that `Vec` is also a generic type. We want to tell the compiler that the type
-parameter of `Vec` should be replaced with the `A` type parameter of `Foo<A, B>`. We do that with
-substitutions:
-
-```rust,ignore
-struct Foo<A, B> { // Adt(Foo, &[Param(0), Param(1)])
-  x: Vec<A>, // Adt(Vec, &[Param(0)])
-  ..
-}
-
-fn bar(foo: Foo<u32, f32>) { // Adt(Foo, &[u32, f32])
-  let y = foo.x; // Vec<Param(0)> => Vec<u32>
-}
-```
-
-This example has a few different substitutions:
-
-- In the definition of `Foo`, in the type of the field `x`, we replace `Vec`'s type parameter with
-  `Param(0)`, the first parameter of `Foo<A, B>`, so that the type of `x` is `Vec<A>`.
-- In the function `bar`, we specify that we want a `Foo<u32, f32>`. This means that we will
-  substitute `Param(0)` and `Param(1)` with `u32` and `f32`.
-- In the body of `bar`, we access `foo.x`, which has type `Vec<Param(0)>`, but `Param(0)` has been
-  substituted for `u32`, so `foo.x` has type `Vec<u32>`.
-
-Let’s look a bit more closely at that last substitution to see why we use indexes. If we want to
-find the type of `foo.x`, we can get generic type of `x`, which is `Vec<Param(0)>`. Now we can take
-the index `0` and use it to find the right type substitution: looking at `Foo`'s `SubstsRef`, we
-have the list `[u32, f32]` , since we want to replace index `0`, we take the 0-th index of this
-list, which is `u32`. Voila!
-
-You may have a couple of followup questions…
-
- **`type_of`** How do we get the “generic type of `x`"? You can get the type of pretty much anything
- with the   `tcx.type_of(def_id)` query. In this case, we would pass the `DefId` of the field `x`.
- The `type_of` query always returns the definition with the generics that are in scope of the
- definition. For example, `tcx.type_of(def_id_of_my_struct)` would return the “self-view” of
- `MyStruct`: `Adt(Foo, &[Param(0), Param(1)])`.
-
-**`subst`** How do we actually do the substitutions? There is a function for that too! You use
-[`subst`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/trait.Subst.html) to
-replace a `SubstRef` with another list of types.
-
-[Here is an example of actually using `subst` in the compiler][substex].  The exact details are not
-too important, but in this piece of code, we happen to be converting from the `rustc_hir::Ty` to
-a real `ty::Ty`. You can see that we first get some substitutions (`substs`).  Then we call
-`type_of` to get a type and call `ty.subst(substs)` to get a new version of `ty` with
-the substitutions made.
-
-[substex]: https://github.com/rust-lang/rust/blob/597f432489f12a3f33419daa039ccef11a12c4fd/src/librustc_typeck/astconv.rs#L942-L953
-
-**Note on indices:** It is possible for the indices in `Param` to not match with what we expect. For
-example, the index could be out of bounds or it could be the index of a lifetime when we were
-expecting a type. These sorts of errors would be caught earlier in the compiler when translating
-from a `rustc_hir::Ty` to a `ty::Ty`. If they occur later, that is a compiler bug.
-
-### `TypeFoldable` and `TypeFolder`
-
-How is this `subst` query actually implemented? As you can imagine, we might want to do
-substitutions on a lot of different things. For example, we might want to do a substitution directly
-on a type like we did with `Vec` above. But we might also have a more complex type with other types
-nested inside that also need substitutions.
-
-The answer is a couple of traits:
-[`TypeFoldable`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/fold/trait.TypeFoldable.html)
-and
-[`TypeFolder`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/fold/trait.TypeFolder.html).
-
-- `TypeFoldable` is implemented by types that embed type information. It allows you to recursively
-  process the contents of the `TypeFoldable` and do stuff to them.
-- `TypeFolder` defines what you want to do with the types you encounter while processing the
-  `TypeFoldable`.
-
-For example, the `TypeFolder` trait has a method
-[`fold_ty`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/fold/trait.TypeFolder.html#method.fold_ty)
-that takes a type as input a type and returns a new type as a result. `TypeFoldable` invokes the
-`TypeFolder` `fold_foo` methods on itself, giving the `TypeFolder` access to its contents (the
-types, regions, etc that are contained within).
-
-You can think of it with this analogy to the iterator combinators we have come to love in rust:
-
-```rust,ignore
-vec.iter().map(|e1| foo(e2)).collect()
-//             ^^^^^^^^^^^^ analogous to `TypeFolder`
-//         ^^^ analogous to `Typefoldable`
-```
-
-So to reiterate:
-
-- `TypeFolder`  is a trait that defines a “map” operation.
-- `TypeFoldable`  is a trait that is implemented by things that embed types.
-
-In the case of `subst`, we can see that it is implemented as a `TypeFolder`:
-[`SubstFolder`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/ty/subst/struct.SubstFolder.html).
-Looking at its implementation, we see where the actual substitutions are happening.
-
-However, you might also notice that the implementation calls this `super_fold_with` method. What is
-that? It is a method of `TypeFoldable`. Consider the following `TypeFoldable` type `MyFoldable`:
-
-```rust,ignore
-struct MyFoldable<'tcx> {
-  def_id: DefId,
-  ty: Ty<'tcx>,
-}
-```
-
-The `TypeFolder` can call `super_fold_with` on `MyFoldable` if it just wants to replace some of the
-fields of `MyFoldable` with new values. If it instead wants to replace the whole `MyFoldable` with a
-different one, it would call `fold_with` instead (a different method on `TypeFoldable`).
-
-In almost all cases, we don’t want to replace the whole struct; we only want to replace `ty::Ty`s in
-the struct, so usually we call `super_fold_with`. A typical implementation that `MyFoldable` could
-have might do something like this:
-
-```rust,ignore
-my_foldable: MyFoldable<'tcx>
-my_foldable.subst(..., subst)
-
-impl TypeFoldable for MyFoldable {
-  fn super_fold_with(&self, folder: &mut impl TypeFolder<'tcx>) -> MyFoldable {
-    MyFoldable {
-      def_id: self.def_id.fold_with(folder),
-      ty: self.ty.fold_with(folder),
-    }
-  }
-
-  fn super_visit_with(..) { }
-}
-```
-
-Notice that here, we implement `super_fold_with` to go over the fields of `MyFoldable` and call
-`fold_with` on *them*. That is, a folder may replace  `def_id` and `ty`, but not the whole
-`MyFoldable` struct.
-
-Here is another example to put things together: suppose we have a type like `Vec<Vec<X>>`. The
-`ty::Ty` would look like: `Adt(Vec, &[Adt(Vec, &[Param(X)])])`. If we want to do `subst(X => u32)`,
-then we would first look at the overall type. We would see that there are no substitutions to be
-made at the outer level, so we would descend one level and look at `Adt(Vec, &[Param(X)])`. There
-are still no substitutions to be made here, so we would descend again. Now we are looking at
-`Param(X)`, which can be substituted, so we replace it with `u32`. We can’t descend any more, so we
-are done, and  the overall result is `Adt(Vec, &[Adt(Vec, &[u32])])`.
-
-One last thing to mention: often when folding over a `TypeFoldable`, we don’t want to change most
-things. We only want to do something when we reach a type. That means there may be a lot of
-`TypeFoldable` types whose implementations basically just forward to their fields’ `TypeFoldable`
-implementations. Such implementations of `TypeFoldable` tend to be pretty tedious to write by hand.
-For this reason, there is a `derive` macro that allows you to `#![derive(TypeFoldable)]`. It is
-defined
-[here](https://github.com/rust-lang/rust/blob/master/src/librustc_macros/src/type_foldable.rs).
-
-**`subst`** In the case of substitutions the [actual
-folder](https://github.com/rust-lang/rust/blob/04e69e4f4234beb4f12cc76dcc53e2cc4247a9be/src/librustc/ty/subst.rs#L467-L482)
-is going to be doing the indexing we’ve already mentioned. There we define a `Folder` and call
-`fold_with` on the `TypeFoldable` to process yourself.  Then
-[fold_ty](https://github.com/rust-lang/rust/blob/04e69e4f4234beb4f12cc76dcc53e2cc4247a9be/src/librustc/ty/subst.rs#L545-L573)
-the method that process each type it looks for a `ty::Param` and for those it replaces it for
-something from the list of substitutions, otherwise recursively process the type.  To replace it,
-calls
-[ty_for_param](https://github.com/rust-lang/rust/blob/04e69e4f4234beb4f12cc76dcc53e2cc4247a9be/src/librustc/ty/subst.rs#L589-L624)
-and all that does is index into the list of substitutions with the index of the `Param`.
-
-## Type errors
-
-There is a `TyKind::Error` that is produced when the user makes a type error. The idea is that
-we would propagate this type and suppress other errors that come up due to it so as not to overwhelm
-the user with cascading compiler error messages.
-
-There is an **important invariant** for `TyKind::Error`. You should **never** return the 'error
-type' unless you **know** that an error has already been reported to the user. This is usually
-because (a) you just reported it right there or (b) you are propagating an existing Error type (in
-which case the error should've been reported when that error type was produced).
-
-It's important to maintain this invariant because the whole point of the `Error` type is to suppress
-other errors -- i.e., we don't report them. If we were to produce an `Error` type without actually
-emitting an error to the user, then this could cause later errors to be suppressed, and the
-compilation might inadvertently succeed!
-
-Sometimes there is a third case. You believe that an error has been reported, but you believe it
-would've been reported earlier in the compilation, not locally. In that case, you can invoke
-[`delay_span_bug`] This will make a note that you expect compilation to yield an error -- if however
-compilation should succeed, then it will trigger a compiler bug report.
-
-[`delay_span_bug`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_session/struct.Session.html#method.delay_span_bug
-
-## Question: Why not substitute “inside” the `AdtDef`?
-
-Recall that we represent a generic struct with `(AdtDef, substs)`. So why bother with this scheme?
-
-Well, the alternate way we could have choosen to represent types would be to always create a new,
-fully-substituted form of the `AdtDef` where all the types are already substituted. This seems like
-less of a hassle. However, the `(AdtDef, substs)` scheme has some advantages over this.
-
-First, `(AdtDef, substs)` scheme has an efficiency win:
-
-```rust,ignore
-struct MyStruct<T> {
-  ... 100s of fields ...
-}
-
-// Want to do: MyStruct<A> ==> MyStruct<B>
-```
-
-in an example like this, we can subst from `MyStruct<A>` to `MyStruct<B>` (and so on) very cheaply,
-by just replacing the one reference to `A` with `B`. But if we eagerly substituted all the fields,
-that could be a lot more work because we might have to go through all of the fields in the `AdtDef`
-and update all of their types.
-
-A bit more deeply, this corresponds to structs in Rust being [*nominal* types][nominal] — which
-means that they are defined by their *name* (and that their contents are then indexed from the
-definition of that name, and not carried along “within” the type itself).
-
-[nominal]: https://en.wikipedia.org/wiki/Nominal_type_system
diff --git a/src/doc/rustc-ux-guidelines.md b/src/doc/rustc-ux-guidelines.md
index dfd8e9db3c..b626923bcb 100644
--- 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/rustc/src/command-line-arguments.md b/src/doc/rustc/src/command-line-arguments.md
index 577d03d103..7a7838d965 100644
--- a/src/doc/rustc/src/command-line-arguments.md
+++ b/src/doc/rustc/src/command-line-arguments.md
@@ -146,6 +146,7 @@ The valid types of print values are:
 - `crate-name` — The name of the crate.
 - `file-names` — The names of the files created by the `link` emit kind.
 - `sysroot` — Path to the sysroot.
+- `target-libdir` - Path to the target libdir.
 - `cfg` — List of cfg values. See [conditional compilation] for more
   information about cfg values.
 - `target-list` — List of known targets. The target may be selected with the
@@ -215,21 +216,29 @@ This controls which [target](targets/index.md) to produce.
 
 This flag will set which lints should be set to the [warn level](lints/levels.md#warn).
 
+_Note:_ The order of these lint level arguments is taken into account, see [lint level via compiler flag](lints/levels.md#via-compiler-flag) for more information.
+
 <a id="option-a-allow"></a>
 ## `-A`: set lint allowed
 
 This flag will set which lints should be set to the [allow level](lints/levels.md#allow).
 
+_Note:_ The order of these lint level arguments is taken into account, see [lint level via compiler flag](lints/levels.md#via-compiler-flag) for more information.
+
 <a id="option-d-deny"></a>
 ## `-D`: set lint denied
 
 This flag will set which lints should be set to the [deny level](lints/levels.md#deny).
 
+_Note:_ The order of these lint level arguments is taken into account, see [lint level via compiler flag](lints/levels.md#via-compiler-flag) for more information.
+
 <a id="option-f-forbid"></a>
 ## `-F`: set lint forbidden
 
 This flag will set which lints should be set to the [forbid level](lints/levels.md#forbid).
 
+_Note:_ The order of these lint level arguments is taken into account, see [lint level via compiler flag](lints/levels.md#via-compiler-flag) for more information.
+
 <a id="option-z-unstable"></a>
 ## `-Z`: set unstable options
 
diff --git a/src/doc/rustc/src/lints/levels.md b/src/doc/rustc/src/lints/levels.md
index 2944e86566..3cfe2f698f 100644
--- a/src/doc/rustc/src/lints/levels.md
+++ b/src/doc/rustc/src/lints/levels.md
@@ -164,6 +164,18 @@ And of course, you can mix these four flags together:
 $ rustc lib.rs --crate-type=lib -D missing-docs -A unused-variables
 ```
 
+The order of these command line arguments is taken into account. The following allows the `unused-variables` lint, because it is the last argument for that lint:
+
+```bash
+$ rustc lib.rs --crate-type=lib -D unused-variables -A unused-variables
+```
+
+You can make use of this behavior by overriding the level of one specific lint out of a group of lints. The following example denies all the lints in the `unused` group, but explicitly allows the `unused-variables` lint in that group:
+
+```bash
+$ rustc lib.rs --crate-type=lib -D unused -A unused-variables
+```
+
 ### Via an attribute
 
 You can also modify the lint level with a crate-wide attribute:
diff --git a/src/doc/rustdoc/book.toml b/src/doc/rustdoc/book.toml
new file mode 100644
index 0000000000..ba30c10766
--- /dev/null
+++ b/src/doc/rustdoc/book.toml
@@ -0,0 +1,4 @@
+[book]
+authors = ["The Rust Project Developers"]
+src = "src"
+title = "The rustdoc book"
diff --git a/src/doc/rustdoc/src/the-doc-attribute.md b/src/doc/rustdoc/src/the-doc-attribute.md
index 80ac405eb2..ef143c8727 100644
--- a/src/doc/rustdoc/src/the-doc-attribute.md
+++ b/src/doc/rustdoc/src/the-doc-attribute.md
@@ -39,7 +39,7 @@ crate level, and ones that are useful at the item level.
 
 ## At the crate level
 
-These options control how the docs look at a macro level.
+These options control how the docs look at a crate level.
 
 ### `html_favicon_url`
 
diff --git a/src/doc/rustdoc/src/unstable-features.md b/src/doc/rustdoc/src/unstable-features.md
index a48526d39f..f704fe8e09 100644
--- a/src/doc/rustdoc/src/unstable-features.md
+++ b/src/doc/rustdoc/src/unstable-features.md
@@ -138,27 +138,6 @@ Book][unstable-doc-cfg] and [its tracking issue][issue-doc-cfg].
 [unstable-doc-cfg]: ../unstable-book/language-features/doc-cfg.html
 [issue-doc-cfg]: https://github.com/rust-lang/rust/issues/43781
 
-### Adding your trait to the "Important Traits" dialog
-
-Rustdoc keeps a list of a few traits that are believed to be "fundamental" to a given type when
-implemented on it. These traits are intended to be the primary interface for their types, and are
-often the only thing available to be documented on their types. For this reason, Rustdoc will track
-when a given type implements one of these traits and call special attention to it when a function
-returns one of these types. This is the "Important Traits" dialog, visible as a circle-i button next
-to the function, which, when clicked, shows the dialog.
-
-In the standard library, the traits that qualify for inclusion are `Iterator`, `io::Read`, and
-`io::Write`. However, rather than being implemented as a hard-coded list, these traits have a
-special marker attribute on them: `#[doc(spotlight)]`. This means that you could apply this
-attribute to your own trait to include it in the "Important Traits" dialog in documentation.
-
-The `#[doc(spotlight)]` attribute currently requires the `#![feature(doc_spotlight)]` feature gate.
-For more information, see [its chapter in the Unstable Book][unstable-spotlight] and [its tracking
-issue][issue-spotlight].
-
-[unstable-spotlight]: ../unstable-book/language-features/doc-spotlight.html
-[issue-spotlight]: https://github.com/rust-lang/rust/issues/45040
-
 ### Exclude certain dependencies from documentation
 
 The standard library uses several dependencies which, in turn, use several types and traits from the
@@ -453,7 +432,7 @@ override `ignore`.
 
 ### `--runtool`, `--runtool-arg`: program to run tests with; args to pass to it
 
-Using thses options looks like this:
+Using these options looks like this:
 
 ```bash
 $ rustdoc src/lib.rs -Z unstable-options --runtool runner --runtool-arg --do-thing --runtool-arg --do-other-thing
diff --git a/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md b/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
new file mode 100644
index 0000000000..f871df4625
--- /dev/null
+++ b/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
@@ -0,0 +1,34 @@
+# `control_flow_guard`
+
+The tracking issue for this feature is: [#68793](https://github.com/rust-lang/rust/issues/68793).
+
+------------------------
+
+The `-Zcontrol_flow_guard=checks` compiler flag enables the Windows [Control Flow Guard][cfguard-docs] platform security feature. When enabled, the compiler outputs a list of valid indirect call targets, and inserts runtime checks on all indirect jump instructions to ensure that the destination is in the list of valid call targets.
+
+[cfguard-docs]: https://docs.microsoft.com/en-us/windows/win32/secbp/control-flow-guard
+
+For testing purposes, the `-Zcontrol_flow_guard=nochecks` compiler flag can be used to emit only the list of valid call targets, but not the runtime checks.
+
+It is strongly recommended to also enable Control Flow Guard checks in all linked libraries, including the standard library. 
+
+To enable Control Flow Guard in the standard library, you can use the [cargo `-Zbuild-std` functionality][build-std] to recompile the standard library with the same configuration options as the main program. 
+
+[build-std]: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#build-std
+
+For example:
+```cmd
+rustup toolchain install --force nightly
+rustup component add rust-src
+SET RUSTFLAGS=-Zcontrol_flow_guard=checks
+cargo +nightly build -Z build-std --target x86_64-pc-windows-msvc
+```
+
+```PowerShell
+rustup toolchain install --force nightly
+rustup component add rust-src
+$Env:RUSTFLAGS = "-Zcontrol_flow_guard=checks"
+cargo +nightly build -Z build-std --target x86_64-pc-windows-msvc
+```
+
+Alternatively, if you are building the standard library from source, you can set `control-flow-guard = true` in the config.toml file.
diff --git a/src/doc/unstable-book/src/compiler-flags/sanitizer.md b/src/doc/unstable-book/src/compiler-flags/sanitizer.md
index cbb90bd3bb..414ac7e63a 100644
--- a/src/doc/unstable-book/src/compiler-flags/sanitizer.md
+++ b/src/doc/unstable-book/src/compiler-flags/sanitizer.md
@@ -93,10 +93,84 @@ Shadow byte legend (one shadow byte represents 8 application bytes):
 ==10029==ABORTING
 ```
 
+Use of a stack object after its scope has already ended:
+
+```shell
+$ cat b.rs
+static mut P: *mut usize = std::ptr::null_mut();
+
+fn main() {
+    unsafe {
+        {
+            let mut x = 0;
+            P = &mut x;
+        }
+        std::ptr::write_volatile(P, 123);
+    }
+}
+$ rustc -Zsanitizer=address b.rs
+$./b
+=================================================================
+==424427==ERROR: AddressSanitizer: stack-use-after-scope on address 0x7fff67be6be0 at pc 0x5647a3ea4658 bp 0x7fff67be6b90 sp 0x7fff67be6b88
+WRITE of size 8 at 0x7fff67be6be0 thread T0
+    #0 0x5647a3ea4657 in core::ptr::write_volatile::h4b04601757d0376d (/tmp/b+0xb8657)
+    #1 0x5647a3ea4432 in b::main::h5574a756e615c9cf (/tmp/b+0xb8432)
+    #2 0x5647a3ea480b in std::rt::lang_start::_$u7b$$u7b$closure$u7d$$u7d$::hd57e7ee01866077e (/tmp/b+0xb880b)
+    #3 0x5647a3eab412 in std::panicking::try::do_call::he0421ca82dd11ba3 (.llvm.8083791802951296215) (/tmp/b+0xbf412)
+    #4 0x5647a3eacb26 in __rust_maybe_catch_panic (/tmp/b+0xc0b26)
+    #5 0x5647a3ea5b66 in std::rt::lang_start_internal::h19bc96b28f670a64 (/tmp/b+0xb9b66)
+    #6 0x5647a3ea4788 in std::rt::lang_start::h642d10b4b6965fb8 (/tmp/b+0xb8788)
+    #7 0x5647a3ea449a in main (/tmp/b+0xb849a)
+    #8 0x7fd1d18b3bba in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x26bba)
+    #9 0x5647a3df7299 in _start (/tmp/b+0xb299)
+
+Address 0x7fff67be6be0 is located in stack of thread T0 at offset 32 in frame
+    #0 0x5647a3ea433f in b::main::h5574a756e615c9cf (/tmp/b+0xb833f)
+
+  This frame has 1 object(s):
+    [32, 40) 'x' <== Memory access at offset 32 is inside this variable
+HINT: this may be a false positive if your program uses some custom stack unwind mechanism, swapcontext or vfork
+      (longjmp and C++ exceptions *are* supported)
+SUMMARY: AddressSanitizer: stack-use-after-scope (/tmp/b+0xb8657) in core::ptr::write_volatile::h4b04601757d0376d
+Shadow bytes around the buggy address:
+  0x10006cf74d20: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74d30: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74d40: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74d50: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74d60: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+=>0x10006cf74d70: 00 00 00 00 00 00 00 00 f1 f1 f1 f1[f8]f3 f3 f3
+  0x10006cf74d80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74d90: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74da0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74db0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
+  0x10006cf74dc0: f1 f1 f1 f1 00 f3 f3 f3 00 00 00 00 00 00 00 00
+Shadow byte legend (one shadow byte represents 8 application bytes):
+  Addressable:           00
+  Partially addressable: 01 02 03 04 05 06 07
+  Heap left redzone:       fa
+  Freed heap region:       fd
+  Stack left redzone:      f1
+  Stack mid redzone:       f2
+  Stack right redzone:     f3
+  Stack after return:      f5
+  Stack use after scope:   f8
+  Global redzone:          f9
+  Global init order:       f6
+  Poisoned by user:        f7
+  Container overflow:      fc
+  Array cookie:            ac
+  Intra object redzone:    bb
+  ASan internal:           fe
+  Left alloca redzone:     ca
+  Right alloca redzone:    cb
+  Shadow gap:              cc
+==424427==ABORTING
+```
+
 ## MemorySanitizer
 
 Use of uninitialized memory. Note that we are using `-Zbuild-std` to instrument
-standard library, and passing `-msan-track-origins=2` to the LLVM to track
+the standard library, and passing `-Zsanitizer-track-origins` to track the
 origins of uninitialized memory:
 
 ```shell
@@ -111,7 +185,15 @@ fn main() {
     }
 }
 
-$ env RUSTFLAGS="-Zsanitizer=memory -Cllvm-args=-msan-track-origins=2" cargo -Zbuild-std run --target x86_64-unknown-linux-gnu
+$ export \
+  CC=clang \
+  CXX=clang++ \
+  CFLAGS='-fsanitize=memory -fsanitize-memory-track-origins' \
+  CXXFLAGS='-fsanitize=memory -fsanitize-memory-track-origins' \
+  RUSTFLAGS='-Zsanitizer=memory -Zsanitizer-memory-track-origins' \
+  RUSTDOCFLAGS='-Zsanitizer=memory -Zsanitizer-memory-track-origins'
+$ cargo clean
+$ cargo -Zbuild-std run --target x86_64-unknown-linux-gnu
 ==9416==WARNING: MemorySanitizer: use-of-uninitialized-value
     #0 0x560c04f7488a in core::fmt::num::imp::fmt_u64::haa293b0b098501ca $RUST/build/x86_64-unknown-linux-gnu/stage1/lib/rustlib/src/rust/src/libcore/fmt/num.rs:202:16
 ...
diff --git a/src/doc/unstable-book/src/compiler-flags/self-profile-events.md b/src/doc/unstable-book/src/compiler-flags/self-profile-events.md
new file mode 100644
index 0000000000..3ce18743be
--- /dev/null
+++ b/src/doc/unstable-book/src/compiler-flags/self-profile-events.md
@@ -0,0 +1,74 @@
+# `self-profile-events`
+
+---------------------
+
+The `-Zself-profile-events` compiler flag controls what events are recorded by the self-profiler when it is enabled via the `-Zself-profile` flag.
+
+This flag takes a comma delimited list of event types to record.
+
+For example:
+
+```console
+$ rustc -Zself-profile -Zself-profile-events=default,args
+```
+
+## Event types
+
+- `query-provider`
+  - Traces each query used internally by the compiler.
+
+- `generic-activity`
+  - Traces other parts of the compiler not covered by the query system.
+
+- `query-cache-hit`
+  - Adds tracing information that records when the in-memory query cache is "hit" and does not need to re-execute a query which has been cached.
+  - Disabled by default because this significantly increases the trace file size.
+
+- `query-blocked`
+  - Tracks time that a query tries to run but is blocked waiting on another thread executing the same query to finish executing.
+  - Query blocking only occurs when the compiler is built with parallel mode support.
+
+- `incr-cache-load`
+  - Tracks time that is spent loading and deserializing query results from the incremental compilation on-disk cache.
+
+- `query-keys`
+  - Adds a serialized representation of each query's query key to the tracing data.
+  - Disabled by default because this significantly increases the trace file size.
+
+- `function-args`
+  - Adds additional tracing data to some `generic-activity` events.
+  - Disabled by default for parity with `query-keys`.
+
+- `llvm`
+  - Adds tracing information about LLVM passes and codegeneration.
+  - Disabled by default because this only works when `-Znew-llvm-pass-manager` is enabled.
+
+## Event synonyms
+
+- `none`
+  - Disables all events.
+  Equivalent to the self-profiler being disabled.
+
+- `default`
+  - The default set of events which stikes a balance between providing detailed tracing data and adding additional overhead to the compilation.
+
+- `args`
+  - Equivalent to `query-keys` and `function-args`.
+
+- `all`
+  - Enables all events.
+
+## Examples
+
+Enable the profiler and capture the default set of events (both invocations are equivalent):
+
+```console
+$ rustc -Zself-profile
+$ rustc -Zself-profile -Zself-profile-events=default
+```
+
+Enable the profiler and capture the default events and their arguments:
+
+```console
+$ rustc -Zself-profile -Zself-profile-events=default,args
+```
diff --git a/src/doc/unstable-book/src/compiler-flags/self-profile.md b/src/doc/unstable-book/src/compiler-flags/self-profile.md
new file mode 100644
index 0000000000..6de1c774f7
--- /dev/null
+++ b/src/doc/unstable-book/src/compiler-flags/self-profile.md
@@ -0,0 +1,47 @@
+# `self-profile`
+
+--------------------
+
+The `-Zself-profile` compiler flag enables rustc's internal profiler.
+When enabled, the compiler will output three binary files in the specified directory (or the current working directory if no directory is specified).
+These files can be analyzed by using the tools in the [`measureme`] repository.
+
+To control the data recorded in the trace files, use the `-Zself-profile-events` flag.
+
+For example:
+
+First, run a compilation session and provide the `-Zself-profile` flag:
+
+```console
+$ rustc --crate-name foo -Zself-profile`
+```
+
+This will generate three files in the working directory such as:
+
+- `foo-1234.events`
+- `foo-1234.string_data`
+- `foo-1234.string_index`
+
+Where `foo` is the name of the crate and `1234` is the process id of the rustc process.
+
+To get a summary of where the compiler is spending its time:
+
+```console
+$ ../measureme/target/release/summarize summarize foo-1234
+```
+
+To generate a flamegraph of the same data:
+
+```console
+$ ../measureme/target/release/inferno foo-1234
+```
+
+To dump the event data in a Chromium-profiler compatible format:
+
+```console
+$ ../measureme/target/release/crox foo-1234
+```
+
+For more information, consult the [`measureme`] documentation.
+
+[`measureme`]: https://github.com/rust-lang/measureme.git
diff --git a/src/doc/unstable-book/src/language-features/const-eval-limit.md b/src/doc/unstable-book/src/language-features/const-eval-limit.md
new file mode 100644
index 0000000000..df68e83bca
--- /dev/null
+++ b/src/doc/unstable-book/src/language-features/const-eval-limit.md
@@ -0,0 +1,7 @@
+# `const_eval_limit`
+
+The tracking issue for this feature is: [#67217]
+
+[#67217]: https://github.com/rust-lang/rust/issues/67217
+
+The `const_eval_limit` allows someone to limit the evaluation steps the CTFE undertakes to evaluate a `const fn`.
diff --git a/src/doc/unstable-book/src/language-features/const-in-array-repeat-expressions.md b/src/doc/unstable-book/src/language-features/const-in-array-repeat-expressions.md
index 09d1b19b4c..940916944b 100644
--- a/src/doc/unstable-book/src/language-features/const-in-array-repeat-expressions.md
+++ b/src/doc/unstable-book/src/language-features/const-in-array-repeat-expressions.md
@@ -2,7 +2,7 @@
 
 The tracking issue for this feature is: [#49147]
 
-[#44109]: https://github.com/rust-lang/rust/issues/49147
+[#49147]: https://github.com/rust-lang/rust/issues/49147
 
 ------------------------
 
diff --git a/src/doc/unstable-book/src/language-features/doc-spotlight.md b/src/doc/unstable-book/src/language-features/doc-spotlight.md
deleted file mode 100644
index 8117755fef..0000000000
--- a/src/doc/unstable-book/src/language-features/doc-spotlight.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# `doc_spotlight`
-
-The tracking issue for this feature is: [#45040]
-
-The `doc_spotlight` feature allows the use of the `spotlight` parameter to the `#[doc]` attribute,
-to "spotlight" a specific trait on the return values of functions. Adding a `#[doc(spotlight)]`
-attribute to a trait definition will make rustdoc print extra information for functions which return
-a type that implements that trait. This attribute is applied to the `Iterator`, `io::Read`, and
-`io::Write` traits in the standard library.
-
-You can do this on your own traits, like this:
-
-```
-#![feature(doc_spotlight)]
-
-#[doc(spotlight)]
-pub trait MyTrait {}
-
-pub struct MyStruct;
-impl MyTrait for MyStruct {}
-
-/// The docs for this function will have an extra line about `MyStruct` implementing `MyTrait`,
-/// without having to write that yourself!
-pub fn my_fn() -> MyStruct { MyStruct }
-```
-
-This feature was originally implemented in PR [#45039].
-
-[#45040]: https://github.com/rust-lang/rust/issues/45040
-[#45039]: https://github.com/rust-lang/rust/pull/45039
diff --git a/src/doc/unstable-book/src/language-features/generators.md b/src/doc/unstable-book/src/language-features/generators.md
index 97cf58e57e..8bc62418b3 100644
--- a/src/doc/unstable-book/src/language-features/generators.md
+++ b/src/doc/unstable-book/src/language-features/generators.md
@@ -37,11 +37,11 @@ fn main() {
         return "foo"
     };
 
-    match Pin::new(&mut generator).resume() {
+    match Pin::new(&mut generator).resume(()) {
         GeneratorState::Yielded(1) => {}
         _ => panic!("unexpected value from resume"),
     }
-    match Pin::new(&mut generator).resume() {
+    match Pin::new(&mut generator).resume(()) {
         GeneratorState::Complete("foo") => {}
         _ => panic!("unexpected value from resume"),
     }
@@ -71,9 +71,9 @@ fn main() {
     };
 
     println!("1");
-    Pin::new(&mut generator).resume();
+    Pin::new(&mut generator).resume(());
     println!("3");
-    Pin::new(&mut generator).resume();
+    Pin::new(&mut generator).resume(());
     println!("5");
 }
 ```
@@ -92,10 +92,10 @@ The `Generator` trait in `std::ops` currently looks like:
 # use std::ops::GeneratorState;
 # use std::pin::Pin;
 
-pub trait Generator {
+pub trait Generator<R = ()> {
     type Yield;
     type Return;
-    fn resume(self: Pin<&mut Self>) -> GeneratorState<Self::Yield, Self::Return>;
+    fn resume(self: Pin<&mut Self>, resume: R) -> GeneratorState<Self::Yield, Self::Return>;
 }
 ```
 
@@ -152,10 +152,6 @@ closure-like semantics. Namely:
 * Whenever a generator is dropped it will drop all captured environment
   variables.
 
-Note that unlike closures, generators at this time cannot take any arguments.
-That is, generators must always look like `|| { ... }`. This restriction may be
-lifted at a future date, the design is ongoing!
-
 ### Generators as state machines
 
 In the compiler, generators are currently compiled as state machines. Each
@@ -179,8 +175,8 @@ fn main() {
         return ret
     };
 
-    Pin::new(&mut generator).resume();
-    Pin::new(&mut generator).resume();
+    Pin::new(&mut generator).resume(());
+    Pin::new(&mut generator).resume(());
 }
 ```
 
@@ -205,7 +201,7 @@ fn main() {
             type Yield = i32;
             type Return = &'static str;
 
-            fn resume(mut self: Pin<&mut Self>) -> GeneratorState<i32, &'static str> {
+            fn resume(mut self: Pin<&mut Self>, resume: ()) -> GeneratorState<i32, &'static str> {
                 use std::mem;
                 match mem::replace(&mut *self, __Generator::Done) {
                     __Generator::Start(s) => {
@@ -228,8 +224,8 @@ fn main() {
         __Generator::Start(ret)
     };
 
-    Pin::new(&mut generator).resume();
-    Pin::new(&mut generator).resume();
+    Pin::new(&mut generator).resume(());
+    Pin::new(&mut generator).resume(());
 }
 ```
 
diff --git a/src/doc/unstable-book/src/language-features/impl-trait-in-bindings.md b/src/doc/unstable-book/src/language-features/impl-trait-in-bindings.md
index 896465cf64..5c6aa912c1 100644
--- a/src/doc/unstable-book/src/language-features/impl-trait-in-bindings.md
+++ b/src/doc/unstable-book/src/language-features/impl-trait-in-bindings.md
@@ -1,8 +1,8 @@
 # `impl_trait_in_bindings`
 
-The tracking issue for this feature is: [#34511]
+The tracking issue for this feature is: [#63065]
 
-[#34511]: https://github.com/rust-lang/rust/issues/34511
+[#63065]: https://github.com/rust-lang/rust/issues/63065
 
 ------------------------
 
diff --git a/src/doc/unstable-book/src/language-features/link-cfg.md b/src/doc/unstable-book/src/language-features/link-cfg.md
new file mode 100644
index 0000000000..ee0fd5bf86
--- /dev/null
+++ b/src/doc/unstable-book/src/language-features/link-cfg.md
@@ -0,0 +1,5 @@
+# `link_cfg`
+
+This feature is internal to the Rust compiler and is not intended for general use.
+
+------------------------
diff --git a/src/doc/unstable-book/src/language-features/marker-trait-attr.md b/src/doc/unstable-book/src/language-features/marker-trait-attr.md
index dedc7d3015..be350cd616 100644
--- a/src/doc/unstable-book/src/language-features/marker-trait-attr.md
+++ b/src/doc/unstable-book/src/language-features/marker-trait-attr.md
@@ -21,7 +21,7 @@ when they'd need to do the same thing for every type anyway).
 
 impl<T: Copy> CheapToClone for T {}
 
-// These could potentally overlap with the blanket implementation above,
+// These could potentially overlap with the blanket implementation above,
 // so are only allowed because CheapToClone is a marker trait.
 impl<T: CheapToClone, U: CheapToClone> CheapToClone for (T, U) {}
 impl<T: CheapToClone> CheapToClone for std::ops::Range<T> {}
diff --git a/src/doc/unstable-book/src/language-features/no-sanitize.md b/src/doc/unstable-book/src/language-features/no-sanitize.md
new file mode 100644
index 0000000000..28c683934d
--- /dev/null
+++ b/src/doc/unstable-book/src/language-features/no-sanitize.md
@@ -0,0 +1,29 @@
+# `no_sanitize`
+
+The tracking issue for this feature is: [#39699]
+
+[#39699]: https://github.com/rust-lang/rust/issues/39699
+
+------------------------
+
+The `no_sanitize` attribute can be used to selectively disable sanitizer
+instrumentation in an annotated function. This might be useful to: avoid
+instrumentation overhead in a performance critical function, or avoid
+instrumenting code that contains constructs unsupported by given sanitizer.
+
+The precise effect of this annotation depends on particular sanitizer in use.
+For example, with `no_sanitize(thread)`, the thread sanitizer will no longer
+instrument non-atomic store / load operations, but it will instrument atomic
+operations to avoid reporting false positives and provide meaning full stack
+traces.
+
+## Examples
+
+``` rust
+#![feature(no_sanitize)]
+
+#[no_sanitize(address)]
+fn foo() {
+  // ...
+}
+```
diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md
index 495cdee62c..47ac986c22 100644
--- 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
@@ -42,7 +42,7 @@ that warns about any item named `lintme`.
 #![feature(plugin_registrar)]
 #![feature(box_syntax, rustc_private)]
 
-extern crate syntax;
+extern crate rustc_ast;
 
 // Load rustc as a plugin to get macros
 #[macro_use]
@@ -52,7 +52,7 @@ extern crate rustc_driver;
 use rustc::lint::{EarlyContext, LintContext, LintPass, EarlyLintPass,
                   EarlyLintPassObject, LintArray};
 use rustc_driver::plugin::Registry;
-use syntax::ast;
+use rustc_ast::ast;
 
 declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
 
diff --git a/src/doc/unstable-book/src/language-features/trait-alias.md b/src/doc/unstable-book/src/language-features/trait-alias.md
index 4f2db04016..f1be053ddc 100644
--- a/src/doc/unstable-book/src/language-features/trait-alias.md
+++ b/src/doc/unstable-book/src/language-features/trait-alias.md
@@ -2,7 +2,7 @@
 
 The tracking issue for this feature is: [#41517]
 
-[#41417]: https://github.com/rust-lang/rust/issues/41517
+[#41517]: https://github.com/rust-lang/rust/issues/41517
 
 ------------------------
 
diff --git a/src/doc/unstable-book/src/language-features/transparent-unions.md b/src/doc/unstable-book/src/language-features/transparent-unions.md
index b731c9ea6d..9b39b89716 100644
--- a/src/doc/unstable-book/src/language-features/transparent-unions.md
+++ b/src/doc/unstable-book/src/language-features/transparent-unions.md
@@ -2,7 +2,7 @@
 
 The tracking issue for this feature is [#60405]
 
-[60405]: https://github.com/rust-lang/rust/issues/60405
+[#60405]: https://github.com/rust-lang/rust/issues/60405
 
 ----
 
diff --git a/src/doc/unstable-book/src/library-features/allocator-api.md b/src/doc/unstable-book/src/library-features/allocator-api.md
index e3969ace7e..9f045ce08a 100644
--- a/src/doc/unstable-book/src/library-features/allocator-api.md
+++ b/src/doc/unstable-book/src/library-features/allocator-api.md
@@ -9,7 +9,7 @@ The tracking issue for this feature is [#32838]
 Sometimes you want the memory for one collection to use a different
 allocator than the memory for another collection. In this case,
 replacing the global allocator is not a workable option. Instead,
-you need to pass in an instance of an `Alloc` to each collection
+you need to pass in an instance of an `AllocRef` to each collection
 for which you want a custom allocator.
 
 TBD
diff --git a/src/doc/unstable-book/src/library-features/read-initializer.md b/src/doc/unstable-book/src/library-features/read-initializer.md
deleted file mode 100644
index 898fe58eee..0000000000
--- a/src/doc/unstable-book/src/library-features/read-initializer.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# `read_initializer`
-
-The tracking issue for this feature is: [#42788]
-
-[#0]: https://github.com/rust-lang/rust/issues/42788
-
-------------------------
diff --git a/src/doc/unstable-book/src/library-features/tidy-test-never-used-anywhere-else.md b/src/doc/unstable-book/src/library-features/tidy-test-never-used-anywhere-else.md
new file mode 100644
index 0000000000..c194d79a19
--- /dev/null
+++ b/src/doc/unstable-book/src/library-features/tidy-test-never-used-anywhere-else.md
@@ -0,0 +1,5 @@
+# `tidy_test_never_used_anywhere_else`
+
+This feature is internal to the Rust compiler and is not intended for general use.
+
+------------------------
diff --git a/src/etc/debugger_pretty_printers_common.py b/src/etc/debugger_pretty_printers_common.py
index 385ce8efab..b3f8f50636 100644
--- a/src/etc/debugger_pretty_printers_common.py
+++ b/src/etc/debugger_pretty_printers_common.py
@@ -212,7 +212,6 @@ class Type(object):
         # REGULAR STRUCT
         return TYPE_KIND_REGULAR_STRUCT
 
-
     def __classify_union(self):
         assert self.get_dwarf_type_kind() == DWARF_TYPE_CODE_UNION
 
@@ -233,7 +232,6 @@ class Type(object):
         else:
             return TYPE_KIND_REGULAR_UNION
 
-
     def __conforms_to_field_layout(self, expected_fields):
         actual_fields = self.get_fields()
         actual_field_count = len(actual_fields)
@@ -363,6 +361,7 @@ def extract_tail_head_ptr_and_cap_from_std_vecdeque(vec_val):
     assert data_ptr.type.get_dwarf_type_kind() == DWARF_TYPE_CODE_PTR
     return (tail, head, data_ptr, capacity)
 
+
 def extract_length_and_ptr_from_slice(slice_val):
     assert (slice_val.type.get_type_kind() == TYPE_KIND_SLICE or
             slice_val.type.get_type_kind() == TYPE_KIND_STR_SLICE)
@@ -376,8 +375,10 @@ def extract_length_and_ptr_from_slice(slice_val):
     assert data_ptr.type.get_dwarf_type_kind() == DWARF_TYPE_CODE_PTR
     return (length, data_ptr)
 
+
 UNQUALIFIED_TYPE_MARKERS = frozenset(["(", "[", "&", "*"])
 
+
 def extract_type_name(qualified_type_name):
     """Extracts the type name from a fully qualified path"""
     if qualified_type_name[0] in UNQUALIFIED_TYPE_MARKERS:
@@ -393,6 +394,7 @@ def extract_type_name(qualified_type_name):
     else:
         return qualified_type_name[index + 2:]
 
+
 try:
     compat_str = unicode  # Python 2
 except NameError:
diff --git a/src/etc/dec2flt_table.py b/src/etc/dec2flt_table.py
index 85395d2ecd..4979882ffe 100755
--- a/src/etc/dec2flt_table.py
+++ b/src/etc/dec2flt_table.py
@@ -14,7 +14,6 @@ is used because (u64, i16) has a ton of padding which would make the table
 even larger, and it's already uncomfortably large (6 KiB).
 """
 from __future__ import print_function
-import sys
 from math import ceil, log
 from fractions import Fraction
 from collections import namedtuple
@@ -82,6 +81,7 @@ def error(f, e, z):
     ulp_err = abs_err / Fraction(2) ** z.exp
     return float(ulp_err)
 
+
 HEADER = """
 //! Tables of approximations of powers of ten.
 //! DO NOT MODIFY: Generated by `src/etc/dec2flt_table.py`
diff --git a/src/etc/gdb_rust_pretty_printing.py b/src/etc/gdb_rust_pretty_printing.py
index 5da01b96fa..0914c22eb1 100755
--- a/src/etc/gdb_rust_pretty_printing.py
+++ b/src/etc/gdb_rust_pretty_printing.py
@@ -9,7 +9,7 @@ import debugger_pretty_printers_common as rustpp
 if sys.version_info[0] >= 3:
     xrange = range
 
-rust_enabled = 'set language rust' in gdb.execute('complete set language ru', to_string = True)
+rust_enabled = 'set language rust' in gdb.execute('complete set language ru', to_string=True)
 
 # The btree pretty-printers fail in a confusing way unless
 # https://sourceware.org/bugzilla/show_bug.cgi?id=21763 is fixed.
@@ -21,9 +21,10 @@ if _match:
     if int(_match.group(1)) > 8 or (int(_match.group(1)) == 8 and int(_match.group(2)) >= 1):
         gdb_81 = True
 
-#===============================================================================
+# ===============================================================================
 # GDB Pretty Printing Module for Rust
-#===============================================================================
+# ===============================================================================
+
 
 class GdbType(rustpp.Type):
 
@@ -133,39 +134,39 @@ def rust_pretty_printer_lookup_function(gdb_val):
 
     if type_kind == rustpp.TYPE_KIND_REGULAR_STRUCT:
         return RustStructPrinter(val,
-                                 omit_first_field = False,
-                                 omit_type_name = False,
-                                 is_tuple_like = False)
+                                 omit_first_field=False,
+                                 omit_type_name=False,
+                                 is_tuple_like=False)
 
     if type_kind == rustpp.TYPE_KIND_STRUCT_VARIANT:
         return RustStructPrinter(val,
-                                 omit_first_field = True,
-                                 omit_type_name = False,
-                                 is_tuple_like = False)
+                                 omit_first_field=True,
+                                 omit_type_name=False,
+                                 is_tuple_like=False)
 
     if type_kind == rustpp.TYPE_KIND_STR_SLICE:
         return RustStringSlicePrinter(val)
 
     if type_kind == rustpp.TYPE_KIND_TUPLE:
         return RustStructPrinter(val,
-                                 omit_first_field = False,
-                                 omit_type_name = True,
-                                 is_tuple_like = True)
+                                 omit_first_field=False,
+                                 omit_type_name=True,
+                                 is_tuple_like=True)
 
     if type_kind == rustpp.TYPE_KIND_TUPLE_STRUCT:
         return RustStructPrinter(val,
-                                 omit_first_field = False,
-                                 omit_type_name = False,
-                                 is_tuple_like = True)
+                                 omit_first_field=False,
+                                 omit_type_name=False,
+                                 is_tuple_like=True)
 
     if type_kind == rustpp.TYPE_KIND_CSTYLE_VARIANT:
         return RustCStyleVariantPrinter(val.get_child_at_index(0))
 
     if type_kind == rustpp.TYPE_KIND_TUPLE_VARIANT:
         return RustStructPrinter(val,
-                                 omit_first_field = True,
-                                 omit_type_name = False,
-                                 is_tuple_like = True)
+                                 omit_first_field=True,
+                                 omit_type_name=False,
+                                 is_tuple_like=True)
 
     if type_kind == rustpp.TYPE_KIND_SINGLETON_ENUM:
         variant = get_field_at_index(gdb_val, 0)
@@ -189,9 +190,9 @@ def rust_pretty_printer_lookup_function(gdb_val):
     return None
 
 
-#=------------------------------------------------------------------------------
+# =------------------------------------------------------------------------------
 # Pretty Printer Classes
-#=------------------------------------------------------------------------------
+# =------------------------------------------------------------------------------
 class RustEmptyPrinter(object):
     def __init__(self, val):
         self.__val = val
@@ -355,6 +356,7 @@ def children_of_node(boxed_node, height, want_values):
             else:
                 yield keys[i]['value']['value']
 
+
 class RustStdBTreeSetPrinter(object):
     def __init__(self, val):
         self.__val = val
@@ -429,6 +431,7 @@ class RustOsStringPrinter(object):
     def display_hint(self):
         return "string"
 
+
 class RustCStyleVariantPrinter(object):
     def __init__(self, val):
         assert val.type.get_dwarf_type_kind() == rustpp.DWARF_TYPE_CODE_ENUM
diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py
index afa6bbdae4..c42f942c63 100755
--- a/src/etc/generate-deriving-span-tests.py
+++ b/src/etc/generate-deriving-span-tests.py
@@ -8,7 +8,8 @@ derives have spans that point to the fields, rather than the
 sample usage: src/etc/generate-deriving-span-tests.py
 """
 
-import os, stat
+import os
+import stat
 
 TEST_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '../test/ui/derives/'))
@@ -56,6 +57,7 @@ struct Struct(
 
 ENUM_TUPLE, ENUM_STRUCT, STRUCT_FIELDS, STRUCT_TUPLE = range(4)
 
+
 def create_test_case(type, trait, super_traits, error_count):
     string = [ENUM_STRING, ENUM_STRUCT_VARIANT_STRING, STRUCT_STRING, STRUCT_TUPLE_STRING][type]
     all_traits = ','.join([trait] + super_traits)
@@ -63,8 +65,9 @@ def create_test_case(type, trait, super_traits, error_count):
     error_deriving = '#[derive(%s)]' % super_traits if super_traits else ''
 
     errors = '\n'.join('//~%s ERROR' % ('^' * n) for n in range(error_count))
-    code = string.format(traits = all_traits, errors = errors)
-    return TEMPLATE.format(error_deriving=error_deriving, code = code)
+    code = string.format(traits=all_traits, errors=errors)
+    return TEMPLATE.format(error_deriving=error_deriving, code=code)
+
 
 def write_file(name, string):
     test_file = os.path.join(TEST_DIR, 'derives-span-%s.rs' % name)
@@ -86,10 +89,10 @@ ALL = STRUCT | ENUM
 
 traits = {
     'Default': (STRUCT, [], 1),
-    'FromPrimitive': (0, [], 0), # only works for C-like enums
+    'FromPrimitive': (0, [], 0),  # only works for C-like enums
 
-    'Decodable': (0, [], 0), # FIXME: quoting gives horrible spans
-    'Encodable': (0, [], 0), # FIXME: quoting gives horrible spans
+    'Decodable': (0, [], 0),  # FIXME: quoting gives horrible spans
+    'Encodable': (0, [], 0),  # FIXME: quoting gives horrible spans
 }
 
 for (trait, supers, errs) in [('Clone', [], 1),
diff --git a/src/etc/generate-keyword-tests.py b/src/etc/generate-keyword-tests.py
index bc046a8f42..77c3d2758c 100755
--- a/src/etc/generate-keyword-tests.py
+++ b/src/etc/generate-keyword-tests.py
@@ -11,7 +11,6 @@ sample usage: src/etc/generate-keyword-tests.py as break
 
 import sys
 import os
-import datetime
 import stat
 
 
diff --git a/src/etc/htmldocck.py b/src/etc/htmldocck.py
index e8be2b9b53..7789b24b62 100644
--- a/src/etc/htmldocck.py
+++ b/src/etc/htmldocck.py
@@ -131,6 +131,7 @@ try:
 except NameError:
     unichr = chr
 
+
 class CustomHTMLParser(HTMLParser):
     """simplified HTML parser.
 
@@ -169,21 +170,25 @@ class CustomHTMLParser(HTMLParser):
         HTMLParser.close(self)
         return self.__builder.close()
 
+
 Command = namedtuple('Command', 'negated cmd args lineno context')
 
+
 class FailedCheck(Exception):
     pass
 
+
 class InvalidCheck(Exception):
     pass
 
+
 def concat_multi_lines(f):
     """returns a generator out of the file object, which
     - removes `\\` then `\n` then a shared prefix with the previous line then
       optional whitespace;
     - keeps a line number (starting from 0) of the first line being
       concatenated."""
-    lastline = None # set to the last line when the last line has a backslash
+    lastline = None  # set to the last line when the last line has a backslash
     firstlineno = None
     catenated = ''
     for lineno, line in enumerate(f):
@@ -208,6 +213,7 @@ def concat_multi_lines(f):
     if lastline is not None:
         print_err(lineno, line, 'Trailing backslash at the end of the file')
 
+
 LINE_PATTERN = re.compile(r'''
     (?<=(?<!\S)@)(?P<negated>!?)
     (?P<cmd>[A-Za-z]+(?:-[A-Za-z]+)*)
@@ -252,7 +258,7 @@ def flatten(node):
 
 def normalize_xpath(path):
     if path.startswith('//'):
-        return '.' + path # avoid warnings
+        return '.' + path  # avoid warnings
     elif path.startswith('.//'):
         return path
     else:
@@ -316,7 +322,7 @@ class CachedFiles(object):
 
 def check_string(data, pat, regexp):
     if not pat:
-        return True # special case a presence testing
+        return True  # special case a presence testing
     elif regexp:
         return re.search(pat, data, flags=re.UNICODE) is not None
     else:
@@ -353,7 +359,7 @@ def check_tree_text(tree, path, pat, regexp):
                 ret = check_string(value, pat, regexp)
                 if ret:
                     break
-    except Exception as e:
+    except Exception:
         print('Failed to get path "{}"'.format(path))
         raise
     return ret
@@ -363,6 +369,7 @@ def get_tree_count(tree, path):
     path = normalize_xpath(path)
     return len(tree.findall(path))
 
+
 def stderr(*args):
     if sys.version_info.major < 3:
         file = codecs.getwriter('utf-8')(sys.stderr)
@@ -371,6 +378,7 @@ def stderr(*args):
 
     print(*args, file=file)
 
+
 def print_err(lineno, context, err, message=None):
     global ERR_COUNT
     ERR_COUNT += 1
@@ -381,31 +389,33 @@ def print_err(lineno, context, err, message=None):
     if context:
         stderr("\t{}".format(context))
 
+
 ERR_COUNT = 0
 
+
 def check_command(c, cache):
     try:
         cerr = ""
-        if c.cmd == 'has' or c.cmd == 'matches': # string test
+        if c.cmd == 'has' or c.cmd == 'matches':  # string test
             regexp = (c.cmd == 'matches')
-            if len(c.args) == 1 and not regexp: # @has <path> = file existence
+            if len(c.args) == 1 and not regexp:  # @has <path> = file existence
                 try:
                     cache.get_file(c.args[0])
                     ret = True
                 except FailedCheck as err:
                     cerr = str(err)
                     ret = False
-            elif len(c.args) == 2: # @has/matches <path> <pat> = string test
+            elif len(c.args) == 2:  # @has/matches <path> <pat> = string test
                 cerr = "`PATTERN` did not match"
                 ret = check_string(cache.get_file(c.args[0]), c.args[1], regexp)
-            elif len(c.args) == 3: # @has/matches <path> <pat> <match> = XML tree test
+            elif len(c.args) == 3:  # @has/matches <path> <pat> <match> = XML tree test
                 cerr = "`XPATH PATTERN` did not match"
                 tree = cache.get_tree(c.args[0])
                 pat, sep, attr = c.args[1].partition('/@')
-                if sep: # attribute
+                if sep:  # attribute
                     tree = cache.get_tree(c.args[0])
                     ret = check_tree_attr(tree, pat, attr, c.args[2], regexp)
-                else: # normalized text
+                else:  # normalized text
                     pat = c.args[1]
                     if pat.endswith('/text()'):
                         pat = pat[:-7]
@@ -413,16 +423,16 @@ def check_command(c, cache):
             else:
                 raise InvalidCheck('Invalid number of @{} arguments'.format(c.cmd))
 
-        elif c.cmd == 'count': # count test
-            if len(c.args) == 3: # @count <path> <pat> <count> = count test
+        elif c.cmd == 'count':  # count test
+            if len(c.args) == 3:  # @count <path> <pat> <count> = count test
                 expected = int(c.args[2])
                 found = get_tree_count(cache.get_tree(c.args[0]), c.args[1])
                 cerr = "Expected {} occurrences but found {}".format(expected, found)
                 ret = expected == found
             else:
                 raise InvalidCheck('Invalid number of @{} arguments'.format(c.cmd))
-        elif c.cmd == 'has-dir': # has-dir test
-            if len(c.args) == 1: # @has-dir <path> = has-dir test
+        elif c.cmd == 'has-dir':  # has-dir test
+            if len(c.args) == 1:  # @has-dir <path> = has-dir test
                 try:
                     cache.get_dir(c.args[0])
                     ret = True
@@ -448,11 +458,13 @@ def check_command(c, cache):
     except InvalidCheck as err:
         print_err(c.lineno, c.context, str(err))
 
+
 def check(target, commands):
     cache = CachedFiles(target)
     for c in commands:
         check_command(c, cache)
 
+
 if __name__ == '__main__':
     if len(sys.argv) != 3:
         stderr('Usage: {} <doc dir> <template>'.format(sys.argv[0]))
diff --git a/src/etc/installer/gfx/rust-logo.png b/src/etc/installer/gfx/rust-logo.png
index 2c3de3000879b36b1dc4751ea5db0fa8fce4b5aa..99ee7507fa2fb0d121ca340682204ca92a1b781e 100644
GIT binary patch
literal 3909
zcmZ`+c{~$<`=0xjqg>@EN69rt!^)5&$$ceq<tn*yGb0TlS4dRmD0f!5h1n?OHjG@`
zM2?Z=$YQpi@9)3wAKyRT&-1*``*}X^=l$<}(yT2_`M4#x0RRA>*$pFG0DuX0QfD|>
zPLxS(!-ErG^)s+A002H_^UyrmPI{SpH*75cfLH|pAQ1ro9G*ytYXCq55CGWl004Af
z0sx{RuRCn6o(y!XZ`m84;K0DZVE-T*g&rRsog5v*jg9rA`%gG-baZlTY;1IN0*9L%
z8Nm$?4-E}XjpL>#CK(I{z+l?(#4HeQYiS1n>I)=pkIIA~(b*`1hc)L&$jNd5lb5-v
zkx*Rc!xIkR2sg7Z=2&LtVPO&ulU>g{Icm$y$iO~&cI(ZLq_>xO^$Uzy*+`6pzj}Ln
zfpx6jJgPaX#UIHp2TX)g%FGK@?-u6>mVLBqGX$3139v9TwLu=gWqe0KGG{l3)nF6r
zP9o(|I2Ehz4@DV1{I);GH%YH#S~FISDMb+@SDbIPNo813FVI@OURcil)Mt4}tw(!j
zQ3Mx^&mp$MW3I`Xp-B^<Qu6O8EM!YfmhNd{NvZ#Jw%fVa{XPB~=%{>`Yr<UmenzP+
zBkqX^V=yN=!hM!F=+QM@97&9`;kaHt@0sxt1O6>zCaG7a8|t^V#@5$#{Wc}z+O9z6
zJEtoz`46#d?yMVK+s0b%$`o?9hALGZxy_a)Ec#&0e|IQ|+TxMWl;9Tmi_xFOUn+9w
z8i#P1fw-OCn3OClbvelWgMrFO-bLq$d~$8!Jdbbe8M$|}d)*ug6R$kr7v5i2ay;L+
z<IzuZsmiBIx9<>X^+|&97y4{&@npS&CwT6xYmL2${|o0J^|n`yu8G42{%*!2_Z-U#
z`wK7pEvhb>|Dya0EDt%vzQzz7{&vNpnnPXkLm6trvK2TrbIaAXM~{sUz>+d9Ig3Z7
zBbp<Sc^m#}$Ntuwi<AUe;ak^<j898`j5^uL{yK7mo^F6vBsyc{aRZ{>a7|y(OWyk$
z<MlC0rxq)`mBmS`35(CA=nG$x;w0SBcsVn!<;uqJANsNP!WPlBVd)T3#(Rf9S=-0z
z@6hf{c0(V1a66q$%uurmaI@o>eQgb;sZNM;H!e4cP)B*9VB?UqOJe#rX9$0KGy}A{
z>kDEQ9;xIel;97h^|r^xk@F1dLTJ%Y0cE)98MFk?sOiT*Ge3bX_xTVzTbdKmt{*Dg
z<*djdbBnBu`y~DtVOmu(g#3yKRhcjPe<|xkN_B|(8ihGXg*+9AsJg<jr%ElsNhm;@
ztwWJJXJbTRer>(c{-B%2r0t~bHE9E~N*$8o5ZnIHU(CeFh>eQRGm^(<EeAXO_+HSJ
z?1M-`Z&cJc?Wh(3|LO9x>0KyuAK`ma6~0OI2}E{OwpyPZxiDw&h#S+-F0+>BvA6Cc
zX(jCBEZ$gtv)F$h&fV6N80CilSN<hJVex4KMx>fAQiUUNDt`B~o!LLbwEdfm2XC=Y
zo|lSU`dpds_f~@PJxX?(9h`F0gG}CR{W7MWo$F^MgL<a?#A}`0xY62s0E5nxSbF`U
z^m<}+V8QIrDC)H2S{Xm11C@$O$(BfghEpZsc@*c=Q!f4J=H7T6SS(q!y|DM7B+pV(
zPZ<VZbt@w+P~zvt@%)TW=MEl4%>iK31E$Il+H>QksmN&0yK$?Vr!^)nLulGtl}R$2
z8`LIM$?zcui)b<6g`{GBC~N2PgT23U=bSj(Omw1Bw<?x!u3X6Th#)?~*nZvg>|&k=
ze$;As^8LZlHcH#yJsET?wJQD7RHs{smi7#Dtep~^u#kk?7oU4>$NVDw$7+P2;AF6d
zTB?=PiZ%Dje7mBE;kS(|3Joycx-<UFRB~ZT>k5Pyn7_c&T{iEed1KRf7p1bG&pW0n
zbT57GIHye*2L0zrof{FqSfwOxpg^oSRR2?wIr=k@2zfv37Ja{q(Fk4nqjqtZ*|(bw
zCVM@YHv<{Qb)53>MS+sxis(1FAIncafNc*d8dmfpOkV~8+@H5S1@l`k`%5T%I#0a-
zho`WtAEOS=Oc5*0NxO0h(%mA8fpTH>O@v08W}K1S>yGDA9KMyB&W$s+6|_j_*TI*}
z)Pjft3t;DekOtuNjfTg_WIgMHuz-scYO4})wfxk0yj^J!Tc-4MsyiS)@poa3xZzUj
zjD55eDL;lJ%QuHF%8*vxdEEA7r9R27K1&xzObU7dEL9YJx*|ru9QC~k8^7y7nrjyP
zR+i!EK$^fhbmn5o$LJ@liO)fOUP9TKN+W%>N9;?EF`cKQIy<Fc1U3tw2xPD8I_SmX
ze*FUsI9$pj2S(N-TBL^k_z+gl=AIZhe{X45{<^C8W$^>CoWbe9ERpan93c`U%SBP~
za#8Q+X-p&Rh^@s<eYjxAX?gh}_3OLh(P396z54TQ`YjqSq<?L^dVr^2_B6Ka@W3-W
zQA6*lgfT6Mj!`ntr8*6~BzPN^lESWb+V2Fs;S|wx=*^ICodxM*6W)JU^olLTAJg$$
ze<+W>&xvvS?;>MdqU)FI$3fhjbh40AB4W_G6gxXNe7s2UJ6E~M2Qq;g!sQ%dJo!OE
z0n~{)nhE!Lgr>YXrTCNumvz+j*>+ZO3E}Fk=D{&}83Hpd9zV{`$t-?R>+XJUl2neT
z?Kp-V$C0Q8aiZij`pRwvtc#|iBWnxSyKN*ld^)TkIC3~LyxeKMyR40+>*fL9wzk^D
zv776SQuoW#Tj>d&4H>!vbsJY}A|#KE)D4wc3)CB{Sz(g`GzR2Sp$dcVboF)>esXWZ
zct-`)Hv*lreUF{KL%u(9$mCr@t`yDNhxB>>88vUgxs2?^d0R9n{gQWCFJL=XC_~&8
z2&pWb-22=|(WJSs!|)`(rHkvMXLV_=w3_P`I`Ue_CT7mFxf|hOx+Z%NdCzZ(<Ll-8
zg!0_+U;6SrqX7l6Dl|mPR(|qsZEuvne1_K1cn7joL?7+!wfbgB?c1hrzijUN-Y}YQ
z3qRp~QK&)HQ+)gnQXJ7J^XTImXyIJpQ7kq0`fHaxhMFG&LeuCdvh@YpD=VV(TV>Su
zLQOzv#L)gji=J%UvC6^yq`bgQ%0xJN$hPzTH3D&(lP0#{_eG(lZ-x}`zTygYq!}JM
z+>@QAJ=mOev>h7A4j)R&{^&}e&ypCoi6K+&1J}+(QSX>)fk}@*8`Zr~jz24585ksl
zmSEfx(&)}h$CDVKtC*E|2VVLNsb50M=E45w&G8W=iR+wGO`bED9SU4hY)K2;693H)
zw}yg25hax_c>+^v5rcT=duCx27JKyVbmLevo!Jf1+6N`uB@a%~+cyRc(du}Tw2{Nj
z4<mCm5(ub+*#|=fM+rpmR|zi18<I7~RP#($rDbBhF;z$p!~Hq*R_i6%=%h1|5Abp{
zacvCu-Kc3f+8J$(#$$^k3v5*nm*ZNIMIL1V<D15+1bY|pigLy~>C9rulmd*o$Rjzs
zw1vyPPyV*B!9%gHnXL7kPn}m56=;fAF&fh5u&)y|aQU@&7SskM$3QOpft*(H&Ol@$
z<=wYDbCQdYvUw383}u()%w$J3_X*DROE+gZg=AB>eYs;#BrKb@Ks?n8e3pSo$xaed
zcCueSdoJCXGsKkI3w&6vN4uA_vh=iT;4zXvK`f`5kMYvu<J+_^|Nc=@Ju4hY(n87v
zgHko&D~~+0Q=uN7m$9qrp@YtR{<c&S1rvm7#y}NrcR!Ux)+UqYdP$-I^N`kG{TE}<
z=82}dU?@2C)VrheTrZr$SPDxmL2w|=GpS9lAVuzW^$qhf=hjuMG<p865=$cyvD8>L
zNVTR4q^yb=&6bPWhk(--X!Fu^PCx>G+MEs3D>N9o_L#y{Pbcw;8vE5M@>mygVAZ69
za5DLw(PwoMq+kx`=%lyV>|N!XmDp|dGL9b8FQmHCi`1{$6Yxxejbk1KEqm&ylFiCT
zuf0Z~m7g)=PVA^0syY0w<T*A$3?@2#`Aqy=S&N$@g;LBsshU)-tSx(SQOHO9PneLP
z)sM9*LfO%^7oiDM-r0r24O3r<Y>tQD2Pp9}1lPd+SnV6}J$h~;gU&IB$B>R|G~CCm
zskB&kO2ei0KhMy=+D2)=DLf6uyR_s@-d8dR<qO-vI)~Y>dPhH_CQ`=XpZYMLmmlU%
zbdj=!qn}CR*c}WXhEBXE6>iUmI`W!u*B+%nH-X7#ww*yG#xk<Wh*4?0DrYEc%|#ol
zz*2Q!rQ7SX%gRLZ_A)ils><sRSNjn7c-$aN?_-6&goFJ%ykOQNZw1#Lo$gXWi#|+t
zP!Eyd%pCmN!`x<?{JE%Ad{3Qce$~qc%}8(ZCH5}}qm20MrqdTuPKXXaCzdPB2{+ri
zb5z<#7@IYLYsdMK5ppBxv{B^jKK*THzFu)SeX`-8s$i<=8`OKsi6@kQWVqeTcKPJ_
zND-~p@|1_rc*ymCK!2(us5;<$>H1UK6dnbgaeQi@5xq8$DlElqev4f0ACmwVbb7@^
z81qGK0qqO?q+|Tbi>zN!sst0`!x^thd~V+*;5-+?cfG<=6-~-Xs+9QYF|-gpo#T>O
z?XJK)FRX*Fw~KhTy_t!i9Nl&n_I`MvI1!a{7CSvFvUec#NS=B}`UxHURaf}Q6Xev?
z2O@j9WcqI|280a1|6Ge8)QvYGvTL})t*A(rn6B5Z;&k|%uW@z7z=CGxKtyeFte)gH
zS3=+tkSz($ME#U`&j@hHMtlWNT-0L3bPxjJ&wl@u+UitT+zzEDw+H=&g$Ro`Z27?h
z&Dx7*v&^R(k_k5)CVYHQ$poWo(qojpyn6p$JLM(JF)w(Qa+>UZy({j#n=R~jixleF
zn^=NnryT21_58%yjoXbIZk-#VbKz6BQNFoXTPHU%x_9KudK3ma_tKC5CG~MH2i0^9
ziT0qb7CqP8Pj6+TFNQgz;m&aiN-@jP%co~3&zeb2NRy$L2VYrFCo~NXr?|)Sg9B!y
z)Dpk;kIhoXD~K%04U2<#67mu>^~tDGFEk#T@R#|%;-rP<e}bWWxbf|9Z_jWa-FuIG
zP5__*)BvggHB{8q?SUX&pt`R56(t~07YMA+=S==DLtwD?eczb>ZCLpJLFYel)6Ce?
KsKL-9>Hh%dF3!mS

literal 5844
zcmX9i2RNJG*D)(piIQ41OVy@D6+vmyD5bU4ioI1ALWmWsswEUftE%=49W+w2s`j2i
zjWkG95Cs4HzVCgW`@Hv_bMHC#-gE9*N%zc*IN1f+0RRA}iLs$20KfpJH$FC2I%HYc
z$rb<r=b0GlKX^X9IY-QJ?9O0u$rU?49;c=+-NXDwS-Oqsjox{8#wb-J<3}TIjlIjJ
zMZoEP>FOp;Van{5LwaR7$uM7x;auBRcz$oM%`usYPWb;ncie#PDQ)4DN)Sby>%t0w
z0MSY0ZIb9IWniF`3!Cp0bzF#uI@niR-e1BBNCBdO9Vfqj{UTrnv7R(jS|x}Hz;C;8
zy6=po9qHiG3&jrsfLIAfH4^aH?-2<A$lo66E<7R1qs*PnN<|T2VF%PlH;xse-VVvW
zh~5zSb)o>(g(>el2rpgf((Zz+ibY)vb@O1<vxpm<<r(xxhoF{<k)nvFnR$2M^EpCt
zyntj|bOf^C4IJ-!FfT_55_U1S>xvq{Nu2-yiJ<D(2>BI6<iWrFd5Ht-!<E)lY;kjR
zm+gG$)ub==ZVY(wIHe;{wz2slFazF^wKKlI9`<}LVleQ5DJy_0rN0<CWk4wo-~066
z@!ob_1bpnWm@wvoo@TGD)s(R4p7ev{kNj*h$2b7{z=5>^gu<d=61KE+EzK0oQ@CFh
zTVcg&nQE0ZFyq_D;KHMwJ3eU;Epef>kxp+DzHfQPpESt?IGZ5IXn&uw99*tIRSVsL
z+U`|x$pCVg(;F|Xdl0hgQ@xI8_J)8qNXnO+<Q+>~c=!RveHst84V0pmgzmuPeIrlC
zah?Ev?u-Q6`+CsilMG7dyia=G<b-xn_=il!Hofb);K|<Mnn>j_-r-zyYp+AJJ1Tm5
zd^Z^8ZcQ;O^&?1V${sG(uS-#lW~DF+N4bih63?P`a$jH~TgPFW9J1{^&ufV8D3h9s
z=V|^Kg1^UonX??2Z;^Zw)Nei=jnJrds1th#aRom6IiEHSyV__Rq&>Z&BHs=M|0@vc
z)v^9NUtKI&@_Js?w-Fg#5)ve}?#a;Xo4~g;_UqQ8^!036Hn}C$sVg6K<d290Q@xQq
ze!KIesrpv}Vy!{iCypue8yNfZnT-_P$U{o@{LRzc?Ki6SdsQrI<Li<dHS%?=(QY#0
z4?xuNFIU1@^!GipGXI7;w_`&6oP51>#?GmdR6Mr`GpFk~pmL^G>1bCKXs~L?n%aW{
zFY~qZZ}mu1f)09{{VRwAg)2K__8KK;SpqNSuu8F1bn&$sF`R#4r)>R;C1>-ZYqY`E
zD?tc}2lu(Mn#Z3QKAmD4s^-RHuitj<(^#pF`u31E(fW6HEyCI&31eBItaM^_hoN24
za?Ce-P!zcCX%gC@?eigMjuG0*SGmt+n$`pH9xlhnL<goM8Yo{NJz@H8qvBvm_W0XI
z_I|q%Wv-`TkiytE!}EUS@Ln{_{h~c9YD88=g!~sUT1c8>ev9ozV9eAwaeO3ISvx#y
z6rofkq!PdWWSAK0io|b*ZNWHO#+qOpeS3$Fyi5tV6KF(oT9<B#^HN>{ZcLDH945nh
zHl?-*#l95P<O^oICoGT`Den2v^ddjF-i3R2H0IXJvM}%xTV@$k`+G0Z#~tE%Ek8$N
zEW|fK7Umai0how&v3^-<tLl^YX&rlL{ZYxra6ukvJ$Vsidd{~b`)dgtF{e%!2EDJB
zmI-b24vJGznh}2;r;TPUyq`8=uJwu3Zqm?KmTId+*|Gh*hpWfNd-;I{!RHVA)_lO=
zNSIrLlk@L(^OggDqvuy`7EWSWZ7FOwlm{@Pv57d>ojt?@n#h8m<95)&qmY(@8;gZl
zwn$ucZ6(d*m}E46N~two@N_Xk`p*!}x*k;~+JC=*QaJvy)MPAvxv^ivc}bE(iMjjZ
z=7>{shrwJPM|8<Tdb;qmgILpQ%UH06zQnV>J>~X!mY$m%6Rcko7A7Y5{OW4=$@7eL
zcMEu=sD9LiW|!eAiaZ3rtq_5ZdQZP}rMWvpvy62LYeqGNos88EjS%pRw5o#(N|~}f
zHBpUv3?s_Z7WQU{dj9FhAM@7U3#jL@++6?GJQ7*nDst0(cJ>h)f)pl3O<{+uaz~@z
zI53L>A-L`&D7mHzj!b7R#KSJ*g64j|RQf--nZkMdniSLp{s^SGI1r*p<}E<pxI|?Z
zy)gBBv0GzLHu}mXT=y+`1(-RR-ZP?85M_h(OHjWSN#HJ1C(9OEixha^bbgdU!b|i4
zZt^^w-Gp3cuxLe`NPI6>T6dYs`w9<BZ|dO_{T7w>oXN(I<--eRQLTEbh<Ix*e=*z{
zWco$9Ko-9Y{CRla()5>Y_9+X;@I_r+gxa_<83>sl+K{i@9_F(3=NgJjZ|$=Gv>P|S
zcWv3jR9J?-nUh+s*Bww7uXm}}x`GoOu^K|yYVo3yTc`gr=Lr;8RY>^pxgc6Z>hG0@
ze|9FrTvPB&xPdF=?bUTV;dV^D(c|Sc-;39zX0<?U=k%+6rbuCrb-Gl)o2OQlUYp>h
z*`~O%`G4qV#-^}{R-?F!jT+pS2F7_tss8Cv)$3uR3pH6Dh<*LWi-17D=0s%d->vI^
zV4P6{W6xB4`*%*)1sRc8hfhD|?hOZ6whtrTmSRh<%f(Ta?v$-V7a-<8(+=+nLuA<e
zGKGUh)&vDyCIVZW6ityePjHAzYVNq90`#;h=f^JsrFqg(NJFkXzQpmH@di)m_4E}m
ze{;gl+~CqcJOdAr?5*0?RPCU<V?w?hI<|pHhNgT^#@C}X{~VSzoA239OelV~S9vFL
zml=41N5i=?5NWmHp1dDL+z?P&(o<aIj;ucZ*~$LxGXXT+&rjJ-s@cb;w{pKJ94Gs{
ztgzjSn1dL8JFBs8I`9OXcy>&h8uZb;YpG{rpCcn5H$3nih-E1+{1EX1TccBHMm}}%
zd6C(!RbS%#ZOnkPV>)N0NQzqf0gq@{)lJQ<(JBX|N$=G>gkVPQ)5T8vVR1CiFv+KI
z3{p7SXKdAp9QllxD{Fgrk8B|9l{!9g#|t(^YA<PRH^fl{SPI>g#HbFCV0U1jBRu4%
zyosZUU}!Bep3iUNRfa^3?p#`do4GtSZ!mqM5b=O=6?k{EsgH0>i_?Xw^Pe84BC+oW
zy_zUCB#)ca&|viQi@3{_D+<R}3K2gFUw`#9lc2^yN=wW)fTw+PTEM98N}-#l>NkTO
zIDR$Z9$%gf5&QMmr(Q%771+tCNHr26*;-JHyi>kOxN#Dv?%R+LNN2z_ZeAAN1Nq~K
zf=h9_OT$e#CIzc;srFz!-05oR#HL~yo%}B`_K`*}#hDwO<$}g!4N+m0pFV_!4I*{l
zD{|kZ^BI`!<l;?<5y|EfC2yx^)wg}#yvsU+)6Mn#8Top0cz_!Gv+^@#IlJqCTOjo(
zi*C3RTm7g}>bB%Vk!B{lRfD60SHD9~Z(tt1VuyeTu|4OeBrn-0#asy{qM%xy`g0GF
zqQvQB6KU#92Y1Hz$@!4h2QdW-r)i5#NeiKB{c1LKUZ0=0xN4>1LpcGNb$dYU8S`Nd
zh_g;xh_+zLHXe8l1h-L${)f`(9Nx#92;vryQE(jKNw7(?4oT$)3HN#nS)+HR2=aK5
zmPXru%dCsMQ$7cncH1q`w$_8;)_ySHmk5@@C9d`nxNHZmm+hSmZt;quQIfb*bUdt<
zfk%Ark1rZx^XL}N#+c=$kQ|?HKzK)qqY3$d$nX!gL#&|ydRwbks0Tg&4n&rlC^}{V
z<Zu9!i?*Ys#sxwHmL;U-$l#&vl^mTX5zmx*0jV4ZhgmST2A^WQd>b{w)+11->wcEC
z0N_s@MHg`*7gFs-@Z$jj%D8dHTot1rxHSau!62#m#dexlb^lwyOFK#u#+nOI3$VU3
z<NvBER0LYV4j4{>4DIFI0Mt?}%tZk%gyr1`F>4Tgi1A^i4+n;;?x(BJJH!$uK-=(y
zB?CY#W4)rM_3pS1z?6yaOS3?0QY8-{$Bbfkm_q4S!CfaNaNf>tH?H9DOViy8=$PcD
zEz}hHR7IRm{lzy7*J4}Rv`lOZ8Z<xM4_Y_V8j|J@Ag|Scic*+dR`UInydpWq`)6<C
z5{%%OMQ10o?daX)@zdU*KZ--FQ>;cUbKqxc+s+tex$ira0A7Fpj>uH-7rDoG9Wly&
zN$TwCs!PW|xY77N>(gXHF7%p7LkuW=*Zz$aRT9<u3a_--)DQv!o>ui;ygSSWkx-PN
zfxhKT4Lg^c<fbLtI_bTy^+N;j8~U?8Gcw%pjwalkU46Lcxh2K1OTW7eD}(g=@v5kH
zKWSXySGvv^Z5%yt;tl3hIy`T+<m9HvF=|C$^a8xnGk#)fe#vZ(?=@a>b$iq3#Zk`*
z&5pScdIprItQyAJKY+;f5V;M310hQ;;MGrryzMEkT1qMDr3o1n3N-s{a(m<j>Q*0F
zddm{$AaqW}2t0s#FS_;eO4liTJt0pP`T72{zQ#pvyIdn>2V(pt;CuM_u!7jO+Xj7|
zLx#F>!K@SgI`NM!(z(-Cmc;mFe~+^oxD!G*Gj-V9v@O4``zsrwAroeuVel}`&dCn_
z!DDV^ag=<domM~)<6PVVv)JmY@s!q8KKHv}u~*5c0|%AVONR}VX&;rE-%Q_GMM3}*
z{dR^%CLH-C6J{x4oC^?~QHMq(w%GO{0~^@CS4YqfYy)-Iu}O}=KFq?=CrAF%@28?A
zc~JHYj>uC;9wZe;$NM#@C+imCu>&7B-*8@EdS3k&6iyh}W8LEQX=WA9@GE8YBxE~d
zOdN<#G&)nq2{Y@u^!6TMsmc%PWK{jr<Zq$$gzEQDfcgO4pQB>GF`Fr2Jvs2VcV%qM
zhQqEhpxR4!OX~kg7MYTRIHH=VDL_48>}4oe&KYO*k7=4&?B5CzJym_#assFdLcxD@
zTB;NlVsl@U7COG_CVES7uep%AEqU#w%0Ed_QLj0oyq?9}tPrZsA0c$}f}Wg5UQe&3
zgv;D|HzwAaZp!vvM2o#jnvi8c2JL!Uc#kPW{3RrsDyyL6@5Ed4Icf?x%Uo4KjqvSV
zYmnu$PaFA%#7p}2mJF67@ukMNOH`B}FIA@TZ}({WNRF5x;SHUb&s#k*=mKv6t5q|5
z)yeaQJ6TA&lBnIk@2wV9n~#@VI`v9=U<RzT^X3c8xL&(-?@ORMcs!KZU>Vyv;4Vl~
ztg!*X4J$XHiVwXpB`OIo7e?-?o{K)q_r1*iGF@HOH1E8#n!Wv^k@H2Ko_UIHWDy#l
ztu+O!tG?ssqJvYi^R}wr)q_{p?nN+XET2xb4(Q;5cs?AE+m}%BA_C%dQ%itMOh%%b
z;V1WZR%xd1MHCA%bwb%7xS$wvMOT)yz8PZtxy-kYmhpaxWPmTUz4+G4e7f7Dpi<eZ
z3&WVP58hb?gtUBqdxKxtfH^SWEYev>TssZ{$0=EPkNsG<*p;9SN1Br(9B8H4&Q))>
znX!iNtcay2_BM<`Bv2gmY5?~{ml#zc<V&F3Pf;^6l-a<+tAVn$d!CTHEnxX2-2W_c
zfvKQF$cPN(v&Zz?aJ~EOV(YJw$E)y~&TWCi>5ibJLc^%`?xfNiH=`?#5Or3Z7eTJ&
zD*-9@z<aFyN19IVlc?{zXTyE}{;N}Ai+VPss{}_!xkBp)C1s>Is(eRT8fi34UX7Y2
zcK|nXLCB)=7C98mnAPV+TI}L4OWS#RFY#BYy>p~c96of@bW))~?+`|i&lUkkrNe2X
zilTJ5SKYs=GRM}3cS;AIJ|e(#Tp{f%_uXm!+{l4!`Wq2_0vrvFr+hMeOIYRK38%(9
zrmumH<W~kfi-`{4eCKcH;ULMH(KQz8E==D;Vb>3mqktv{RJ+-xnB{g^-@8_sV^tez
z=&9@e3(lM51~IS-j<n$QeO%iS`I9dkU-J~Eof+>D%MC~BUP$+R5?9lT#y9^Ja;|sr
zFAr<drwg>O`=8umf6|kOp(6IS2d;C(EJHFd%FVF<8jeI#EmNSnhE2%-u<r~OqcS7B
zN5O(qnwqPNkCa<m@_i{UlOB&wJ=9E;%?{v27D_{nM52;+CuJSV8`p!}u!h7`dTjyO
z#Eh_w!?@ku<s5h7@Z!KN$RG1W!kQ*Vt(E!D=`aQrbJKXoTb*vqMXWg%mz1;sCne8V
z^Rt6KIT1XcuY0<;bHk@JmyfofXY?b4+x8zPpG|>4mhTWfi66t(Z`0AV0$XwC@Qx>w
zBb`k^hd&$L&t~`&^=b3v#1iAa_5^XNPA3Fhhk0zu@7J2sn9K5Z+QUY+EkF+##npj%
zU~RT#&5}Jc5%;?r-MB%|Oi1wx#XkgZtnUO4esn2m*{j4o=PKf+x!zYY_)z&)wL0J0
zoVEJZ0>nzl{XY%%Tr~bB+)VuQ)HW2Cmgfnj-`<lLRCNlnUh`;9SGY$<^xERYWm@dt
zWCm$!2{Qz~lX0V)r_#aFSx#=vX;EW<X@2%BMMc!%vz#@|b}MAEbKhB0>8p{eWs*9x
z+U%26L~7FzvuK7G@0Z1g?8VH_L~r!u{jOp#%KvO<o#^)UGehq}(5P$-Uh>YsuV`qr
zjbNbSg|{(AeSQpkeLWdytqc!yy0MWhGhbbE*6f*i;uIj?k(B2lwYyW3Gf?Q}6rgMf
zc2ROXlx=N+JL*&K_f>Ev^e}FuLH9>Zb`JcS>!j&M*mJp3W-qAm4^<fkK_oLY4RK!%
zM61OV7SdBBL!CEZ-0GTWWPzkk7TxxtS+wSKB-eK6n0O7c?NI_(@ybr=_1OSDL!WF(
z2}8ss99Q#$3Y%Uw$a}mz&OEq*DA-U30?qh8J~>=Mo?dgCKd}xP>MRX1kQjfqNS??x
zVq5Krx1UL?DT^3LFsy8TS8T`cBTdzaJQC5<7oLsZq0!WC35wuEWj{F_OMAykpgkzH
z+3_Q+SNG<ViUKjaFgoa4u920DfHYMq5M?#~iXIwt*$k9lrj|@t&4N=_w`OWl_LsP6
zvl`uQUyjt}-|uxXBT^~z?MVQ2S+^-<?$*i<hiigj?*6}*M}xO-$s<^@Uzw2aTL;b*
zp~i-Z1;(nl8d=&J36YHnf=T$IZ<D*fTWmd*oX$Z_i=U@$D@4+32r@YpF@m@nU)zms
zf{;wdQ=6do=48JniWn93vtAAb!PU6k)7C}M-I9DH5{uH;Cxh$`nG56T68!JaB?`*3
zJG4{>ewV*!7<Q;fURjhZ?}^tFMmxsJ27uODUbT~IEhF4pA9LGaMqTW16AI@;)STtz
z<*0{?l8-jIX)MSir<R-fgBVG_wa5<sun{y~@*HV8$xq7!n^ybO3rwR1T9{g0tA@pj
zum168m^Cki97{3FFY!w8E4~n5Ipz5k7Ih-HYz61>m+$xhnMr!I(=Mn{dc?n#=c}m0
zl$tX!oY&c#-u^59`*MZuf_?eEwdx>BHW;I~E|eL7e&f*wQnQhy9-pIp-0{PwKg9i5
zP`?2iddTSN6=L`0fli(IeiGhXnj-b+FEHu|-<$g7cg96-pO}m*c!05s?MB!n63-P1
zBbE!P^Ww1aY!VLx0c-KT{YSvgb*>V6V5-eH7fYt&7W@vn_oZmaW@ZE)E%4uD8*2Mp
z``E}lpB}l}^FpBxJ-X<0)Ol@v!_y<H7fOH28F&(Ak8ku-ixl-J$5rHn3lnJ(kATQM
Q_^+aDa?8xH`lbu=e-rnYoB#j-

diff --git a/src/etc/lldb_batchmode.py b/src/etc/lldb_batchmode.py
index 7c2e91474c..d9c4bc5562 100644
--- a/src/etc/lldb_batchmode.py
+++ b/src/etc/lldb_batchmode.py
@@ -157,6 +157,7 @@ def start_watchdog():
 # ~main
 ####################################################################################################
 
+
 if len(sys.argv) != 3:
     print("usage: python lldb_batchmode.py target-path script-path")
     sys.exit(1)
diff --git a/src/etc/lldb_rust_formatters.py b/src/etc/lldb_rust_formatters.py
index fdc1c4fa0c..0c4021b36f 100644
--- a/src/etc/lldb_rust_formatters.py
+++ b/src/etc/lldb_rust_formatters.py
@@ -1,10 +1,10 @@
 import lldb
-import re
 import debugger_pretty_printers_common as rustpp
 
-#===============================================================================
+# ===============================================================================
 # LLDB Pretty Printing Module for Rust
-#===============================================================================
+# ===============================================================================
+
 
 class LldbType(rustpp.Type):
 
@@ -84,16 +84,16 @@ def print_val(lldb_val, internal_dict):
         type_kind == rustpp.TYPE_KIND_EMPTY):
         return print_struct_val(val,
                                 internal_dict,
-                                omit_first_field = False,
-                                omit_type_name = False,
-                                is_tuple_like = False)
+                                omit_first_field=False,
+                                omit_type_name=False,
+                                is_tuple_like=False)
 
     if type_kind == rustpp.TYPE_KIND_STRUCT_VARIANT:
         return print_struct_val(val,
                                 internal_dict,
-                                omit_first_field = True,
-                                omit_type_name = False,
-                                is_tuple_like = False)
+                                omit_first_field=True,
+                                omit_type_name=False,
+                                is_tuple_like=False)
 
     if type_kind == rustpp.TYPE_KIND_SLICE:
         return print_vec_slice_val(val, internal_dict)
@@ -110,16 +110,16 @@ def print_val(lldb_val, internal_dict):
     if type_kind == rustpp.TYPE_KIND_TUPLE:
         return print_struct_val(val,
                                 internal_dict,
-                                omit_first_field = False,
-                                omit_type_name = True,
-                                is_tuple_like = True)
+                                omit_first_field=False,
+                                omit_type_name=True,
+                                is_tuple_like=True)
 
     if type_kind == rustpp.TYPE_KIND_TUPLE_STRUCT:
         return print_struct_val(val,
                                 internal_dict,
-                                omit_first_field = False,
-                                omit_type_name = False,
-                                is_tuple_like = True)
+                                omit_first_field=False,
+                                omit_type_name=False,
+                                is_tuple_like=True)
 
     if type_kind == rustpp.TYPE_KIND_CSTYLE_VARIANT:
         return val.type.get_unqualified_type_name()
@@ -127,9 +127,9 @@ def print_val(lldb_val, internal_dict):
     if type_kind == rustpp.TYPE_KIND_TUPLE_VARIANT:
         return print_struct_val(val,
                                 internal_dict,
-                                omit_first_field = True,
-                                omit_type_name = False,
-                                is_tuple_like = True)
+                                omit_first_field=True,
+                                omit_type_name=False,
+                                is_tuple_like=True)
 
     if type_kind == rustpp.TYPE_KIND_SINGLETON_ENUM:
         return print_val(lldb_val.GetChildAtIndex(0), internal_dict)
@@ -157,9 +157,9 @@ def print_val(lldb_val, internal_dict):
     return lldb_val.GetValue()
 
 
-#=--------------------------------------------------------------------------------------------------
+# =---------------------------------------------------------------------------------------
 # Type-Specialized Printing Functions
-#=--------------------------------------------------------------------------------------------------
+# =---------------------------------------------------------------------------------------
 
 def print_struct_val(val, internal_dict, omit_first_field, omit_type_name, is_tuple_like):
     """
@@ -212,6 +212,7 @@ def print_struct_val(val, internal_dict, omit_first_field, omit_type_name, is_tu
     return template % {"type_name": type_name,
                        "body": body}
 
+
 def print_pointer_val(val, internal_dict):
     """Prints a pointer value with Rust syntax"""
     assert val.type.get_dwarf_type_kind() == rustpp.DWARF_TYPE_CODE_PTR
@@ -253,18 +254,21 @@ def print_std_vec_val(val, internal_dict):
                                               length,
                                               internal_dict)
 
+
 def print_str_slice_val(val, internal_dict):
     (length, data_ptr) = rustpp.extract_length_and_ptr_from_slice(val)
     return read_utf8_string(data_ptr, length)
 
+
 def print_std_string_val(val, internal_dict):
     vec = val.get_child_at_index(0)
     (length, data_ptr, cap) = rustpp.extract_length_ptr_and_cap_from_std_vec(vec)
     return read_utf8_string(data_ptr, length)
 
-#=--------------------------------------------------------------------------------------------------
+# =-----------------------------------------------------------------------
 # Helper Functions
-#=--------------------------------------------------------------------------------------------------
+# =-----------------------------------------------------------------------
+
 
 def print_array_of_values(array_name, data_ptr_val, length, internal_dict):
     """Prints a contiguous memory range, interpreting it as values of the
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
index 0c0dc928b9..9f82b2c6fa 100644
--- a/src/liballoc/alloc.rs
+++ b/src/liballoc/alloc.rs
@@ -31,14 +31,14 @@ extern "Rust" {
 
 /// The global memory allocator.
 ///
-/// This type implements the [`Alloc`] trait by forwarding calls
+/// This type implements the [`AllocRef`] trait by forwarding calls
 /// to the allocator registered with the `#[global_allocator]` attribute
 /// if there is one, or the `std` crate’s default.
 ///
 /// Note: while this type is unstable, the functionality it provides can be
 /// accessed through the [free functions in `alloc`](index.html#functions).
 ///
-/// [`Alloc`]: trait.Alloc.html
+/// [`AllocRef`]: trait.AllocRef.html
 #[unstable(feature = "allocator_api", issue = "32838")]
 #[derive(Copy, Clone, Default, Debug)]
 pub struct Global;
@@ -50,14 +50,14 @@ pub struct Global;
 /// if there is one, or the `std` crate’s default.
 ///
 /// This function is expected to be deprecated in favor of the `alloc` method
-/// of the [`Global`] type when it and the [`Alloc`] trait become stable.
+/// of the [`Global`] type when it and the [`AllocRef`] trait become stable.
 ///
 /// # Safety
 ///
 /// See [`GlobalAlloc::alloc`].
 ///
 /// [`Global`]: struct.Global.html
-/// [`Alloc`]: trait.Alloc.html
+/// [`AllocRef`]: trait.AllocRef.html
 /// [`GlobalAlloc::alloc`]: trait.GlobalAlloc.html#tymethod.alloc
 ///
 /// # Examples
@@ -88,14 +88,14 @@ pub unsafe fn alloc(layout: Layout) -> *mut u8 {
 /// if there is one, or the `std` crate’s default.
 ///
 /// This function is expected to be deprecated in favor of the `dealloc` method
-/// of the [`Global`] type when it and the [`Alloc`] trait become stable.
+/// of the [`Global`] type when it and the [`AllocRef`] trait become stable.
 ///
 /// # Safety
 ///
 /// See [`GlobalAlloc::dealloc`].
 ///
 /// [`Global`]: struct.Global.html
-/// [`Alloc`]: trait.Alloc.html
+/// [`AllocRef`]: trait.AllocRef.html
 /// [`GlobalAlloc::dealloc`]: trait.GlobalAlloc.html#tymethod.dealloc
 #[stable(feature = "global_alloc", since = "1.28.0")]
 #[inline]
@@ -110,14 +110,14 @@ pub unsafe fn dealloc(ptr: *mut u8, layout: Layout) {
 /// if there is one, or the `std` crate’s default.
 ///
 /// This function is expected to be deprecated in favor of the `realloc` method
-/// of the [`Global`] type when it and the [`Alloc`] trait become stable.
+/// of the [`Global`] type when it and the [`AllocRef`] trait become stable.
 ///
 /// # Safety
 ///
 /// See [`GlobalAlloc::realloc`].
 ///
 /// [`Global`]: struct.Global.html
-/// [`Alloc`]: trait.Alloc.html
+/// [`AllocRef`]: trait.AllocRef.html
 /// [`GlobalAlloc::realloc`]: trait.GlobalAlloc.html#method.realloc
 #[stable(feature = "global_alloc", since = "1.28.0")]
 #[inline]
@@ -132,14 +132,14 @@ pub unsafe fn realloc(ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8
 /// if there is one, or the `std` crate’s default.
 ///
 /// This function is expected to be deprecated in favor of the `alloc_zeroed` method
-/// of the [`Global`] type when it and the [`Alloc`] trait become stable.
+/// of the [`Global`] type when it and the [`AllocRef`] trait become stable.
 ///
 /// # Safety
 ///
 /// See [`GlobalAlloc::alloc_zeroed`].
 ///
 /// [`Global`]: struct.Global.html
-/// [`Alloc`]: trait.Alloc.html
+/// [`AllocRef`]: trait.AllocRef.html
 /// [`GlobalAlloc::alloc_zeroed`]: trait.GlobalAlloc.html#method.alloc_zeroed
 ///
 /// # Examples
@@ -163,15 +163,21 @@ pub unsafe fn alloc_zeroed(layout: Layout) -> *mut u8 {
 }
 
 #[unstable(feature = "allocator_api", issue = "32838")]
-unsafe impl Alloc for Global {
+unsafe impl AllocRef for Global {
     #[inline]
-    unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
-        NonNull::new(alloc(layout)).ok_or(AllocErr)
+    fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
+        if layout.size() == 0 {
+            Ok((layout.dangling(), 0))
+        } else {
+            unsafe { NonNull::new(alloc(layout)).ok_or(AllocErr).map(|p| (p, layout.size())) }
+        }
     }
 
     #[inline]
     unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout) {
-        dealloc(ptr.as_ptr(), layout)
+        if layout.size() != 0 {
+            dealloc(ptr.as_ptr(), layout)
+        }
     }
 
     #[inline]
@@ -180,13 +186,29 @@ unsafe impl Alloc for Global {
         ptr: NonNull<u8>,
         layout: Layout,
         new_size: usize,
-    ) -> Result<NonNull<u8>, AllocErr> {
-        NonNull::new(realloc(ptr.as_ptr(), layout, new_size)).ok_or(AllocErr)
+    ) -> Result<(NonNull<u8>, usize), AllocErr> {
+        match (layout.size(), new_size) {
+            (0, 0) => Ok((layout.dangling(), 0)),
+            (0, _) => self.alloc(Layout::from_size_align_unchecked(new_size, layout.align())),
+            (_, 0) => {
+                self.dealloc(ptr, layout);
+                Ok((layout.dangling(), 0))
+            }
+            (_, _) => NonNull::new(realloc(ptr.as_ptr(), layout, new_size))
+                .ok_or(AllocErr)
+                .map(|p| (p, new_size)),
+        }
     }
 
     #[inline]
-    unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
-        NonNull::new(alloc_zeroed(layout)).ok_or(AllocErr)
+    fn alloc_zeroed(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
+        if layout.size() == 0 {
+            Ok((layout.dangling(), 0))
+        } else {
+            unsafe {
+                NonNull::new(alloc_zeroed(layout)).ok_or(AllocErr).map(|p| (p, layout.size()))
+            }
+        }
     }
 }
 
@@ -200,21 +222,27 @@ unsafe fn exchange_malloc(size: usize, align: usize) -> *mut u8 {
         align as *mut u8
     } else {
         let layout = Layout::from_size_align_unchecked(size, align);
-        let ptr = alloc(layout);
-        if !ptr.is_null() { ptr } else { handle_alloc_error(layout) }
+        match Global.alloc(layout) {
+            Ok((ptr, _)) => ptr.as_ptr(),
+            Err(_) => handle_alloc_error(layout),
+        }
     }
 }
 
 #[cfg_attr(not(test), lang = "box_free")]
 #[inline]
+// This signature has to be the same as `Box`, otherwise an ICE will happen.
+// When an additional parameter to `Box` is added (like `A: AllocRef`), this has to be added here as
+// well.
+// For example if `Box` is changed to  `struct Box<T: ?Sized, A: AllocRef>(Unique<T>, A)`,
+// this function has to be changed to `fn box_free<T: ?Sized, A: AllocRef>(Unique<T>, A)` as well.
 pub(crate) unsafe fn box_free<T: ?Sized>(ptr: Unique<T>) {
-    let ptr = ptr.as_ptr();
-    let size = size_of_val(&*ptr);
-    let align = min_align_of_val(&*ptr);
+    let size = size_of_val(ptr.as_ref());
+    let align = min_align_of_val(ptr.as_ref());
     // We do not allocate for Box<T> when T is ZST, so deallocation is also not necessary.
     if size != 0 {
         let layout = Layout::from_size_align_unchecked(size, align);
-        dealloc(ptr as *mut u8, layout);
+        Global.dealloc(ptr.cast().into(), layout);
     }
 }
 
diff --git a/src/liballoc/alloc/tests.rs b/src/liballoc/alloc/tests.rs
index c902971638..55944398e1 100644
--- a/src/liballoc/alloc/tests.rs
+++ b/src/liballoc/alloc/tests.rs
@@ -8,7 +8,7 @@ use test::Bencher;
 fn allocate_zeroed() {
     unsafe {
         let layout = Layout::from_size_align(1024, 1).unwrap();
-        let ptr =
+        let (ptr, _) =
             Global.alloc_zeroed(layout.clone()).unwrap_or_else(|_| handle_alloc_error(layout));
 
         let mut i = ptr.cast::<u8>().as_ptr();
diff --git a/src/liballoc/benches/btree/map.rs b/src/liballoc/benches/btree/map.rs
index ea69769279..83cdebf0e3 100644
--- a/src/liballoc/benches/btree/map.rs
+++ b/src/liballoc/benches/btree/map.rs
@@ -1,5 +1,6 @@
 use std::collections::BTreeMap;
 use std::iter::Iterator;
+use std::ops::Bound::{Excluded, Unbounded};
 use std::vec::Vec;
 
 use rand::{seq::SliceRandom, thread_rng, Rng};
@@ -200,3 +201,58 @@ pub fn first_and_last_100(b: &mut Bencher) {
 pub fn first_and_last_10k(b: &mut Bencher) {
     bench_first_and_last(b, 10_000);
 }
+
+#[bench]
+pub fn range_excluded_excluded(b: &mut Bencher) {
+    let size = 144;
+    let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
+    b.iter(|| {
+        for first in 0..size {
+            for last in first + 1..size {
+                black_box(map.range((Excluded(first), Excluded(last))));
+            }
+        }
+    });
+}
+
+#[bench]
+pub fn range_excluded_unbounded(b: &mut Bencher) {
+    let size = 144;
+    let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
+    b.iter(|| {
+        for first in 0..size {
+            black_box(map.range((Excluded(first), Unbounded)));
+        }
+    });
+}
+
+#[bench]
+pub fn range_included_included(b: &mut Bencher) {
+    let size = 144;
+    let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
+    b.iter(|| {
+        for first in 0..size {
+            for last in first..size {
+                black_box(map.range(first..=last));
+            }
+        }
+    });
+}
+
+#[bench]
+pub fn range_included_unbounded(b: &mut Bencher) {
+    let size = 144;
+    let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
+    b.iter(|| {
+        for first in 0..size {
+            black_box(map.range(first..));
+        }
+    });
+}
+
+#[bench]
+pub fn range_unbounded_unbounded(b: &mut Bencher) {
+    let size = 144;
+    let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
+    b.iter(|| map.range(..));
+}
diff --git a/src/liballoc/benches/btree/set.rs b/src/liballoc/benches/btree/set.rs
index d7c1d95a45..d9e75ab7fa 100644
--- a/src/liballoc/benches/btree/set.rs
+++ b/src/liballoc/benches/btree/set.rs
@@ -50,43 +50,112 @@ macro_rules! set_bench {
     };
 }
 
-const BUILD_SET_SIZE: usize = 100;
+#[bench]
+pub fn clone_100(b: &mut Bencher) {
+    let src = pos(100);
+    b.iter(|| src.clone())
+}
 
 #[bench]
-pub fn build_and_clear(b: &mut Bencher) {
-    b.iter(|| pos(BUILD_SET_SIZE).clear())
+pub fn clone_100_and_clear(b: &mut Bencher) {
+    let src = pos(100);
+    b.iter(|| src.clone().clear())
 }
 
 #[bench]
-pub fn build_and_drop(b: &mut Bencher) {
-    b.iter(|| pos(BUILD_SET_SIZE))
+pub fn clone_100_and_into_iter(b: &mut Bencher) {
+    let src = pos(100);
+    b.iter(|| src.clone().into_iter().count())
 }
 
 #[bench]
-pub fn build_and_into_iter(b: &mut Bencher) {
-    b.iter(|| pos(BUILD_SET_SIZE).into_iter().count())
+pub fn clone_100_and_pop_all(b: &mut Bencher) {
+    let src = pos(100);
+    b.iter(|| {
+        let mut set = src.clone();
+        while set.pop_first().is_some() {}
+        set
+    });
 }
 
 #[bench]
-pub fn build_and_pop_all(b: &mut Bencher) {
+pub fn clone_100_and_remove_all(b: &mut Bencher) {
+    let src = pos(100);
     b.iter(|| {
-        let mut s = pos(BUILD_SET_SIZE);
-        while s.pop_first().is_some() {}
-        s
+        let mut set = src.clone();
+        while let Some(elt) = set.iter().copied().next() {
+            set.remove(&elt);
+        }
+        set
     });
 }
 
 #[bench]
-pub fn build_and_remove_all(b: &mut Bencher) {
+pub fn clone_100_and_remove_half(b: &mut Bencher) {
+    let src = pos(100);
     b.iter(|| {
-        let mut s = pos(BUILD_SET_SIZE);
-        while let Some(elt) = s.iter().copied().next() {
-            s.remove(&elt);
+        let mut set = src.clone();
+        for i in (2..=100 as i32).step_by(2) {
+            set.remove(&i);
         }
-        s
+        assert_eq!(set.len(), 100 / 2);
+        set
+    })
+}
+
+#[bench]
+pub fn clone_10k(b: &mut Bencher) {
+    let src = pos(10_000);
+    b.iter(|| src.clone())
+}
+
+#[bench]
+pub fn clone_10k_and_clear(b: &mut Bencher) {
+    let src = pos(10_000);
+    b.iter(|| src.clone().clear())
+}
+
+#[bench]
+pub fn clone_10k_and_into_iter(b: &mut Bencher) {
+    let src = pos(10_000);
+    b.iter(|| src.clone().into_iter().count())
+}
+
+#[bench]
+pub fn clone_10k_and_pop_all(b: &mut Bencher) {
+    let src = pos(10_000);
+    b.iter(|| {
+        let mut set = src.clone();
+        while set.pop_first().is_some() {}
+        set
+    });
+}
+
+#[bench]
+pub fn clone_10k_and_remove_all(b: &mut Bencher) {
+    let src = pos(10_000);
+    b.iter(|| {
+        let mut set = src.clone();
+        while let Some(elt) = set.iter().copied().next() {
+            set.remove(&elt);
+        }
+        set
     });
 }
 
+#[bench]
+pub fn clone_10k_and_remove_half(b: &mut Bencher) {
+    let src = pos(10_000);
+    b.iter(|| {
+        let mut set = src.clone();
+        for i in (2..=10_000 as i32).step_by(2) {
+            set.remove(&i);
+        }
+        assert_eq!(set.len(), 10_000 / 2);
+        set
+    })
+}
+
 set_bench! {intersection_100_neg_vs_100_pos, intersection, count, [neg(100), pos(100)]}
 set_bench! {intersection_100_neg_vs_10k_pos, intersection, count, [neg(100), pos(10_000)]}
 set_bench! {intersection_100_pos_vs_100_neg, intersection, count, [pos(100), neg(100)]}
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs
index 87a4924f9b..9a7d0d9aeb 100644
--- a/src/liballoc/boxed.rs
+++ b/src/liballoc/boxed.rs
@@ -2,7 +2,8 @@
 //!
 //! [`Box<T>`], casually referred to as a 'box', provides the simplest form of
 //! heap allocation in Rust. Boxes provide ownership for this allocation, and
-//! drop their contents when they go out of scope.
+//! drop their contents when they go out of scope. Boxes also ensure that they
+//! never allocate more than `isize::MAX` bytes.
 //!
 //! # Examples
 //!
@@ -145,7 +146,7 @@ use core::ptr::{self, NonNull, Unique};
 use core::slice;
 use core::task::{Context, Poll};
 
-use crate::alloc::{self, Alloc, Global};
+use crate::alloc::{self, AllocRef, Global};
 use crate::raw_vec::RawVec;
 use crate::str::from_boxed_utf8_unchecked;
 use crate::vec::Vec;
@@ -195,12 +196,14 @@ impl<T> Box<T> {
     #[unstable(feature = "new_uninit", issue = "63291")]
     pub fn new_uninit() -> Box<mem::MaybeUninit<T>> {
         let layout = alloc::Layout::new::<mem::MaybeUninit<T>>();
-        if layout.size() == 0 {
-            return Box(NonNull::dangling().into());
+        unsafe {
+            let ptr = if layout.size() == 0 {
+                NonNull::dangling()
+            } else {
+                Global.alloc(layout).unwrap_or_else(|_| alloc::handle_alloc_error(layout)).0.cast()
+            };
+            Box::from_raw(ptr.as_ptr())
         }
-        let ptr =
-            unsafe { Global.alloc(layout).unwrap_or_else(|_| alloc::handle_alloc_error(layout)) };
-        Box(ptr.cast().into())
     }
 
     /// Constructs a new `Box` with uninitialized contents, with the memory
@@ -263,15 +266,14 @@ impl<T> Box<[T]> {
     #[unstable(feature = "new_uninit", issue = "63291")]
     pub fn new_uninit_slice(len: usize) -> Box<[mem::MaybeUninit<T>]> {
         let layout = alloc::Layout::array::<mem::MaybeUninit<T>>(len).unwrap();
-        let ptr = if layout.size() == 0 {
-            NonNull::dangling()
-        } else {
-            unsafe {
-                Global.alloc(layout).unwrap_or_else(|_| alloc::handle_alloc_error(layout)).cast()
-            }
-        };
-        let slice = unsafe { slice::from_raw_parts_mut(ptr.as_ptr(), len) };
-        Box(Unique::from(slice))
+        unsafe {
+            let ptr = if layout.size() == 0 {
+                NonNull::dangling()
+            } else {
+                Global.alloc(layout).unwrap_or_else(|_| alloc::handle_alloc_error(layout)).0.cast()
+            };
+            Box::from_raw(slice::from_raw_parts_mut(ptr.as_ptr(), len))
+        }
     }
 }
 
@@ -307,7 +309,7 @@ impl<T> Box<mem::MaybeUninit<T>> {
     #[unstable(feature = "new_uninit", issue = "63291")]
     #[inline]
     pub unsafe fn assume_init(self) -> Box<T> {
-        Box(Box::into_unique(self).cast())
+        Box::from_raw(Box::into_raw(self) as *mut T)
     }
 }
 
@@ -345,7 +347,7 @@ impl<T> Box<[mem::MaybeUninit<T>]> {
     #[unstable(feature = "new_uninit", issue = "63291")]
     #[inline]
     pub unsafe fn assume_init(self) -> Box<[T]> {
-        Box(Unique::new_unchecked(Box::into_raw(self) as _))
+        Box::from_raw(Box::into_raw(self) as *mut [T])
     }
 }
 
@@ -823,7 +825,7 @@ impl From<Box<str>> for Box<[u8]> {
     }
 }
 
-#[unstable(feature = "boxed_slice_try_from", issue = "none")]
+#[stable(feature = "boxed_slice_try_from", since = "1.43.0")]
 impl<T, const N: usize> TryFrom<Box<[T]>> for Box<[T; N]>
 where
     [T; N]: LengthAtMost32,
@@ -1103,6 +1105,7 @@ impl<T: ?Sized> AsMut<T> for Box<T> {
 #[stable(feature = "pin", since = "1.33.0")]
 impl<T: ?Sized> Unpin for Box<T> {}
 
+#[cfg(bootstrap)]
 #[unstable(feature = "generator_trait", issue = "43122")]
 impl<G: ?Sized + Generator + Unpin> Generator for Box<G> {
     type Yield = G::Yield;
@@ -1113,6 +1116,7 @@ impl<G: ?Sized + Generator + Unpin> Generator for Box<G> {
     }
 }
 
+#[cfg(bootstrap)]
 #[unstable(feature = "generator_trait", issue = "43122")]
 impl<G: ?Sized + Generator> Generator for Pin<Box<G>> {
     type Yield = G::Yield;
@@ -1123,6 +1127,28 @@ impl<G: ?Sized + Generator> Generator for Pin<Box<G>> {
     }
 }
 
+#[cfg(not(bootstrap))]
+#[unstable(feature = "generator_trait", issue = "43122")]
+impl<G: ?Sized + Generator<R> + Unpin, R> Generator<R> for Box<G> {
+    type Yield = G::Yield;
+    type Return = G::Return;
+
+    fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState<Self::Yield, Self::Return> {
+        G::resume(Pin::new(&mut *self), arg)
+    }
+}
+
+#[cfg(not(bootstrap))]
+#[unstable(feature = "generator_trait", issue = "43122")]
+impl<G: ?Sized + Generator<R>, R> Generator<R> for Pin<Box<G>> {
+    type Yield = G::Yield;
+    type Return = G::Return;
+
+    fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState<Self::Yield, Self::Return> {
+        G::resume((*self).as_mut(), arg)
+    }
+}
+
 #[stable(feature = "futures_api", since = "1.36.0")]
 impl<F: ?Sized + Future + Unpin> Future for Box<F> {
     type Output = F::Output;
diff --git a/src/liballoc/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs
index c527b378f7..9908a30497 100644
--- a/src/liballoc/collections/binary_heap.rs
+++ b/src/liballoc/collections/binary_heap.rs
@@ -147,7 +147,7 @@
 
 use core::fmt;
 use core::iter::{FromIterator, FusedIterator, TrustedLen};
-use core::mem::{size_of, swap, ManuallyDrop};
+use core::mem::{self, size_of, swap, ManuallyDrop};
 use core::ops::{Deref, DerefMut};
 use core::ptr;
 
@@ -536,7 +536,7 @@ impl<T: Ord> BinaryHeap<T> {
             while child < end {
                 let right = child + 1;
                 // compare with the greater of the two children
-                if right < end && !(hole.get(child) > hole.get(right)) {
+                if right < end && hole.get(child) <= hole.get(right) {
                     child = right;
                 }
                 // if we are already in order, stop.
@@ -568,7 +568,7 @@ impl<T: Ord> BinaryHeap<T> {
             while child < end {
                 let right = child + 1;
                 // compare with the greater of the two children
-                if right < end && !(hole.get(child) > hole.get(right)) {
+                if right < end && hole.get(child) <= hole.get(right) {
                     child = right;
                 }
                 hole.move_to(child);
@@ -1239,7 +1239,19 @@ pub struct DrainSorted<'a, T: Ord> {
 impl<'a, T: Ord> Drop for DrainSorted<'a, T> {
     /// Removes heap elements in heap order.
     fn drop(&mut self) {
-        while let Some(_) = self.inner.pop() {}
+        struct DropGuard<'r, 'a, T: Ord>(&'r mut DrainSorted<'a, T>);
+
+        impl<'r, 'a, T: Ord> Drop for DropGuard<'r, 'a, T> {
+            fn drop(&mut self) {
+                while let Some(_) = self.0.inner.pop() {}
+            }
+        }
+
+        while let Some(item) = self.inner.pop() {
+            let guard = DropGuard(self);
+            drop(item);
+            mem::forget(guard);
+        }
     }
 }
 
diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs
index e70f881bc3..9da324ba2d 100644
--- a/src/liballoc/collections/btree/map.rs
+++ b/src/liballoc/collections/btree/map.rs
@@ -6,10 +6,11 @@ use core::iter::{FromIterator, FusedIterator, Peekable};
 use core::marker::PhantomData;
 use core::ops::Bound::{Excluded, Included, Unbounded};
 use core::ops::{Index, RangeBounds};
-use core::{fmt, intrinsics, mem, ptr};
+use core::{fmt, mem, ptr};
 
 use super::node::{self, marker, ForceResult::*, Handle, InsertResult::*, NodeRef};
 use super::search::{self, SearchResult::*};
+use super::unwrap_unchecked;
 
 use Entry::*;
 use UnderflowResult::*;
@@ -207,6 +208,59 @@ impl<K: Clone, V: Clone> Clone for BTreeMap<K, V> {
             clone_subtree(self.root.as_ref())
         }
     }
+
+    fn clone_from(&mut self, other: &Self) {
+        BTreeClone::clone_from(self, other);
+    }
+}
+
+trait BTreeClone {
+    fn clone_from(&mut self, other: &Self);
+}
+
+impl<K: Clone, V: Clone> BTreeClone for BTreeMap<K, V> {
+    default fn clone_from(&mut self, other: &Self) {
+        *self = other.clone();
+    }
+}
+
+impl<K: Clone + Ord, V: Clone> BTreeClone for BTreeMap<K, V> {
+    fn clone_from(&mut self, other: &Self) {
+        // This truncates `self` to `other.len()` by calling `split_off` on
+        // the first key after `other.len()` elements if it exists.
+        let split_off_key = if self.len() > other.len() {
+            let diff = self.len() - other.len();
+            if diff <= other.len() {
+                self.iter().nth_back(diff - 1).map(|pair| (*pair.0).clone())
+            } else {
+                self.iter().nth(other.len()).map(|pair| (*pair.0).clone())
+            }
+        } else {
+            None
+        };
+        if let Some(key) = split_off_key {
+            self.split_off(&key);
+        }
+
+        let mut siter = self.range_mut(..);
+        let mut oiter = other.iter();
+        // After truncation, `self` is at most as long as `other` so this loop
+        // replaces every key-value pair in `self`. Since `oiter` is in sorted
+        // order and the structure of the `BTreeMap` stays the same,
+        // the BTree invariants are maintained at the end of the loop.
+        while !siter.is_empty() {
+            if let Some((ok, ov)) = oiter.next() {
+                // SAFETY: This is safe because `siter` is nonempty.
+                let (sk, sv) = unsafe { siter.next_unchecked() };
+                sk.clone_from(ok);
+                sv.clone_from(ov);
+            } else {
+                break;
+            }
+        }
+        // If `other` is longer than `self`, the remaining elements are inserted.
+        self.extend(oiter.map(|(k, v)| ((*k).clone(), (*v).clone())));
+    }
 }
 
 impl<K, Q: ?Sized> super::Recover<Q> for BTreeMap<K, ()>
@@ -591,7 +645,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
         T: Ord,
         K: Borrow<T>,
     {
-        let front = first_leaf_edge(self.root.as_ref());
+        let front = self.root.as_ref().first_leaf_edge();
         front.right_kv().ok().map(Handle::into_kv)
     }
 
@@ -620,13 +674,15 @@ impl<K: Ord, V> BTreeMap<K, V> {
         T: Ord,
         K: Borrow<T>,
     {
-        match self.length {
-            0 => None,
-            _ => Some(OccupiedEntry {
-                handle: self.root.as_mut().first_kv(),
+        let front = self.root.as_mut().first_leaf_edge();
+        if let Ok(kv) = front.right_kv() {
+            Some(OccupiedEntry {
+                handle: kv.forget_node_type(),
                 length: &mut self.length,
                 _marker: PhantomData,
-            }),
+            })
+        } else {
+            None
         }
     }
 
@@ -652,7 +708,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
         T: Ord,
         K: Borrow<T>,
     {
-        let back = last_leaf_edge(self.root.as_ref());
+        let back = self.root.as_ref().last_leaf_edge();
         back.left_kv().ok().map(Handle::into_kv)
     }
 
@@ -681,13 +737,15 @@ impl<K: Ord, V> BTreeMap<K, V> {
         T: Ord,
         K: Borrow<T>,
     {
-        match self.length {
-            0 => None,
-            _ => Some(OccupiedEntry {
-                handle: self.root.as_mut().last_kv(),
+        let back = self.root.as_mut().last_leaf_edge();
+        if let Ok(kv) = back.left_kv() {
+            Some(OccupiedEntry {
+                handle: kv.forget_node_type(),
                 length: &mut self.length,
                 _marker: PhantomData,
-            }),
+            })
+        } else {
+            None
         }
     }
 
@@ -806,13 +864,42 @@ impl<K: Ord, V> BTreeMap<K, V> {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<V>
+    where
+        K: Borrow<Q>,
+        Q: Ord,
+    {
+        self.remove_entry(key).map(|(_, v)| v)
+    }
+
+    /// Removes a key from the map, returning the stored key and value if the key
+    /// was previously in the map.
+    ///
+    /// The key may be any borrowed form of the map's key type, but the ordering
+    /// on the borrowed form *must* match the ordering on the key type.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// #![feature(btreemap_remove_entry)]
+    /// use std::collections::BTreeMap;
+    ///
+    /// let mut map = BTreeMap::new();
+    /// map.insert(1, "a");
+    /// assert_eq!(map.remove_entry(&1), Some((1, "a")));
+    /// assert_eq!(map.remove_entry(&1), None);
+    /// ```
+    #[unstable(feature = "btreemap_remove_entry", issue = "66714")]
+    pub fn remove_entry<Q: ?Sized>(&mut self, key: &Q) -> Option<(K, V)>
     where
         K: Borrow<Q>,
         Q: Ord,
     {
         match search::search_tree(self.root.as_mut(), key) {
             Found(handle) => Some(
-                OccupiedEntry { handle, length: &mut self.length, _marker: PhantomData }.remove(),
+                OccupiedEntry { handle, length: &mut self.length, _marker: PhantomData }
+                    .remove_entry(),
             ),
             GoDown(_) => None,
         }
@@ -990,7 +1077,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
 
     fn from_sorted_iter<I: Iterator<Item = (K, V)>>(&mut self, iter: I) {
         self.ensure_root_is_owned();
-        let mut cur_node = last_leaf_edge(self.root.as_mut()).into_node();
+        let mut cur_node = self.root.as_mut().last_leaf_edge().into_node();
         // Iterate through all key-value pairs, pushing them into nodes at the right level.
         for (key, value) in iter {
             // Try to push key-value pair into the current leaf node.
@@ -1030,7 +1117,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
                 open_node.push(key, value, right_tree);
 
                 // Go down to the right-most leaf again.
-                cur_node = last_leaf_edge(open_node.forget_type()).into_node();
+                cur_node = open_node.forget_type().last_leaf_edge().into_node();
             }
 
             self.length += 1;
@@ -1328,7 +1415,8 @@ impl<'a, K: 'a, V: 'a> Iterator for IterMut<'a, K, V> {
             None
         } else {
             self.length -= 1;
-            unsafe { Some(self.range.next_unchecked()) }
+            let (k, v) = unsafe { self.range.next_unchecked() };
+            Some((k, v)) // coerce k from `&mut K` to `&K`
         }
     }
 
@@ -1348,7 +1436,8 @@ impl<'a, K: 'a, V: 'a> DoubleEndedIterator for IterMut<'a, K, V> {
             None
         } else {
             self.length -= 1;
-            unsafe { Some(self.range.next_back_unchecked()) }
+            let (k, v) = unsafe { self.range.next_back_unchecked() };
+            Some((k, v)) // coerce k from `&mut K` to `&K`
         }
     }
 }
@@ -1374,25 +1463,46 @@ impl<K, V> IntoIterator for BTreeMap<K, V> {
         let len = self.length;
         mem::forget(self);
 
-        IntoIter { front: first_leaf_edge(root1), back: last_leaf_edge(root2), length: len }
+        IntoIter { front: root1.first_leaf_edge(), back: root2.last_leaf_edge(), length: len }
     }
 }
 
 #[stable(feature = "btree_drop", since = "1.7.0")]
 impl<K, V> Drop for IntoIter<K, V> {
     fn drop(&mut self) {
-        self.for_each(drop);
+        struct DropGuard<'a, K, V>(&'a mut IntoIter<K, V>);
+
+        impl<'a, K, V> Drop for DropGuard<'a, K, V> {
+            fn drop(&mut self) {
+                // Continue the same loop we perform below. This only runs when unwinding, so we
+                // don't have to care about panics this time (they'll abort).
+                while let Some(_) = self.0.next() {}
+
+                // No need to avoid the shared root, because the tree was definitely not empty.
+                unsafe {
+                    let mut node = ptr::read(&self.0.front).into_node().forget_type();
+                    while let Some(parent) = node.deallocate_and_ascend() {
+                        node = parent.into_node().forget_type();
+                    }
+                }
+            }
+        }
+
+        while let Some(pair) = self.next() {
+            let guard = DropGuard(self);
+            drop(pair);
+            mem::forget(guard);
+        }
+
         unsafe {
-            let leaf_node = ptr::read(&self.front).into_node();
-            if leaf_node.is_shared_root() {
+            let mut node = ptr::read(&self.front).into_node().forget_type();
+            if node.is_shared_root() {
                 return;
             }
-
-            if let Some(first_parent) = leaf_node.deallocate_and_ascend() {
-                let mut cur_node = first_parent.into_node();
-                while let Some(parent) = cur_node.deallocate_and_ascend() {
-                    cur_node = parent.into_node()
-                }
+            // Most of the nodes have been deallocated while traversing
+            // but one pile from a leaf up to the root is left standing.
+            while let Some(parent) = node.deallocate_and_ascend() {
+                node = parent.into_node().forget_type();
             }
         }
     }
@@ -1404,37 +1514,10 @@ impl<K, V> Iterator for IntoIter<K, V> {
 
     fn next(&mut self) -> Option<(K, V)> {
         if self.length == 0 {
-            return None;
+            None
         } else {
             self.length -= 1;
-        }
-
-        let handle = unsafe { ptr::read(&self.front) };
-
-        let mut cur_handle = match handle.right_kv() {
-            Ok(kv) => {
-                let k = unsafe { ptr::read(kv.reborrow().into_kv().0) };
-                let v = unsafe { ptr::read(kv.reborrow().into_kv().1) };
-                self.front = kv.right_edge();
-                return Some((k, v));
-            }
-            Err(last_edge) => unsafe {
-                unwrap_unchecked(last_edge.into_node().deallocate_and_ascend())
-            },
-        };
-
-        loop {
-            match cur_handle.right_kv() {
-                Ok(kv) => {
-                    let k = unsafe { ptr::read(kv.reborrow().into_kv().0) };
-                    let v = unsafe { ptr::read(kv.reborrow().into_kv().1) };
-                    self.front = first_leaf_edge(kv.right_edge().descend());
-                    return Some((k, v));
-                }
-                Err(last_edge) => unsafe {
-                    cur_handle = unwrap_unchecked(last_edge.into_node().deallocate_and_ascend());
-                },
-            }
+            Some(unsafe { self.front.next_unchecked() })
         }
     }
 
@@ -1447,37 +1530,10 @@ impl<K, V> Iterator for IntoIter<K, V> {
 impl<K, V> DoubleEndedIterator for IntoIter<K, V> {
     fn next_back(&mut self) -> Option<(K, V)> {
         if self.length == 0 {
-            return None;
+            None
         } else {
             self.length -= 1;
-        }
-
-        let handle = unsafe { ptr::read(&self.back) };
-
-        let mut cur_handle = match handle.left_kv() {
-            Ok(kv) => {
-                let k = unsafe { ptr::read(kv.reborrow().into_kv().0) };
-                let v = unsafe { ptr::read(kv.reborrow().into_kv().1) };
-                self.back = kv.left_edge();
-                return Some((k, v));
-            }
-            Err(last_edge) => unsafe {
-                unwrap_unchecked(last_edge.into_node().deallocate_and_ascend())
-            },
-        };
-
-        loop {
-            match cur_handle.left_kv() {
-                Ok(kv) => {
-                    let k = unsafe { ptr::read(kv.reborrow().into_kv().0) };
-                    let v = unsafe { ptr::read(kv.reborrow().into_kv().1) };
-                    self.back = last_leaf_edge(kv.left_edge().descend());
-                    return Some((k, v));
-                }
-                Err(last_edge) => unsafe {
-                    cur_handle = unwrap_unchecked(last_edge.into_node().deallocate_and_ascend());
-                },
-            }
+            Some(unsafe { self.back.next_back_unchecked() })
         }
     }
 }
@@ -1579,7 +1635,7 @@ impl<'a, K, V> Iterator for Range<'a, K, V> {
     type Item = (&'a K, &'a V);
 
     fn next(&mut self) -> Option<(&'a K, &'a V)> {
-        if self.front == self.back { None } else { unsafe { Some(self.next_unchecked()) } }
+        if self.is_empty() { None } else { unsafe { Some(self.next_unchecked()) } }
     }
 
     fn last(mut self) -> Option<(&'a K, &'a V)> {
@@ -1622,73 +1678,25 @@ impl<K, V> ExactSizeIterator for ValuesMut<'_, K, V> {
 impl<K, V> FusedIterator for ValuesMut<'_, K, V> {}
 
 impl<'a, K, V> Range<'a, K, V> {
-    unsafe fn next_unchecked(&mut self) -> (&'a K, &'a V) {
-        let handle = self.front;
-
-        let mut cur_handle = match handle.right_kv() {
-            Ok(kv) => {
-                let ret = kv.into_kv();
-                self.front = kv.right_edge();
-                return ret;
-            }
-            Err(last_edge) => {
-                let next_level = last_edge.into_node().ascend().ok();
-                unwrap_unchecked(next_level)
-            }
-        };
+    fn is_empty(&self) -> bool {
+        self.front == self.back
+    }
 
-        loop {
-            match cur_handle.right_kv() {
-                Ok(kv) => {
-                    let ret = kv.into_kv();
-                    self.front = first_leaf_edge(kv.right_edge().descend());
-                    return ret;
-                }
-                Err(last_edge) => {
-                    let next_level = last_edge.into_node().ascend().ok();
-                    cur_handle = unwrap_unchecked(next_level);
-                }
-            }
-        }
+    unsafe fn next_unchecked(&mut self) -> (&'a K, &'a V) {
+        self.front.next_unchecked()
     }
 }
 
 #[stable(feature = "btree_range", since = "1.17.0")]
 impl<'a, K, V> DoubleEndedIterator for Range<'a, K, V> {
     fn next_back(&mut self) -> Option<(&'a K, &'a V)> {
-        if self.front == self.back { None } else { unsafe { Some(self.next_back_unchecked()) } }
+        if self.is_empty() { None } else { Some(unsafe { self.next_back_unchecked() }) }
     }
 }
 
 impl<'a, K, V> Range<'a, K, V> {
     unsafe fn next_back_unchecked(&mut self) -> (&'a K, &'a V) {
-        let handle = self.back;
-
-        let mut cur_handle = match handle.left_kv() {
-            Ok(kv) => {
-                let ret = kv.into_kv();
-                self.back = kv.left_edge();
-                return ret;
-            }
-            Err(last_edge) => {
-                let next_level = last_edge.into_node().ascend().ok();
-                unwrap_unchecked(next_level)
-            }
-        };
-
-        loop {
-            match cur_handle.left_kv() {
-                Ok(kv) => {
-                    let ret = kv.into_kv();
-                    self.back = last_leaf_edge(kv.left_edge().descend());
-                    return ret;
-                }
-                Err(last_edge) => {
-                    let next_level = last_edge.into_node().ascend().ok();
-                    cur_handle = unwrap_unchecked(next_level);
-                }
-            }
-        }
+        self.back.next_back_unchecked()
     }
 }
 
@@ -1707,7 +1715,12 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
     type Item = (&'a K, &'a mut V);
 
     fn next(&mut self) -> Option<(&'a K, &'a mut V)> {
-        if self.front == self.back { None } else { unsafe { Some(self.next_unchecked()) } }
+        if self.is_empty() {
+            None
+        } else {
+            let (k, v) = unsafe { self.next_unchecked() };
+            Some((k, v)) // coerce k from `&mut K` to `&K`
+        }
     }
 
     fn last(mut self) -> Option<(&'a K, &'a mut V)> {
@@ -1716,45 +1729,24 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
 }
 
 impl<'a, K, V> RangeMut<'a, K, V> {
-    unsafe fn next_unchecked(&mut self) -> (&'a K, &'a mut V) {
-        let handle = ptr::read(&self.front);
-
-        let mut cur_handle = match handle.right_kv() {
-            Ok(kv) => {
-                self.front = ptr::read(&kv).right_edge();
-                // Doing the descend invalidates the references returned by `into_kv_mut`,
-                // so we have to do this last.
-                let (k, v) = kv.into_kv_mut();
-                return (k, v); // coerce k from `&mut K` to `&K`
-            }
-            Err(last_edge) => {
-                let next_level = last_edge.into_node().ascend().ok();
-                unwrap_unchecked(next_level)
-            }
-        };
+    fn is_empty(&self) -> bool {
+        self.front == self.back
+    }
 
-        loop {
-            match cur_handle.right_kv() {
-                Ok(kv) => {
-                    self.front = first_leaf_edge(ptr::read(&kv).right_edge().descend());
-                    // Doing the descend invalidates the references returned by `into_kv_mut`,
-                    // so we have to do this last.
-                    let (k, v) = kv.into_kv_mut();
-                    return (k, v); // coerce k from `&mut K` to `&K`
-                }
-                Err(last_edge) => {
-                    let next_level = last_edge.into_node().ascend().ok();
-                    cur_handle = unwrap_unchecked(next_level);
-                }
-            }
-        }
+    unsafe fn next_unchecked(&mut self) -> (&'a mut K, &'a mut V) {
+        self.front.next_unchecked()
     }
 }
 
 #[stable(feature = "btree_range", since = "1.17.0")]
 impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> {
     fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> {
-        if self.front == self.back { None } else { unsafe { Some(self.next_back_unchecked()) } }
+        if self.is_empty() {
+            None
+        } else {
+            let (k, v) = unsafe { self.next_back_unchecked() };
+            Some((k, v)) // coerce k from `&mut K` to `&K`
+        }
     }
 }
 
@@ -1762,38 +1754,8 @@ impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> {
 impl<K, V> FusedIterator for RangeMut<'_, K, V> {}
 
 impl<'a, K, V> RangeMut<'a, K, V> {
-    unsafe fn next_back_unchecked(&mut self) -> (&'a K, &'a mut V) {
-        let handle = ptr::read(&self.back);
-
-        let mut cur_handle = match handle.left_kv() {
-            Ok(kv) => {
-                self.back = ptr::read(&kv).left_edge();
-                // Doing the descend invalidates the references returned by `into_kv_mut`,
-                // so we have to do this last.
-                let (k, v) = kv.into_kv_mut();
-                return (k, v); // coerce k from `&mut K` to `&K`
-            }
-            Err(last_edge) => {
-                let next_level = last_edge.into_node().ascend().ok();
-                unwrap_unchecked(next_level)
-            }
-        };
-
-        loop {
-            match cur_handle.left_kv() {
-                Ok(kv) => {
-                    self.back = last_leaf_edge(ptr::read(&kv).left_edge().descend());
-                    // Doing the descend invalidates the references returned by `into_kv_mut`,
-                    // so we have to do this last.
-                    let (k, v) = kv.into_kv_mut();
-                    return (k, v); // coerce k from `&mut K` to `&K`
-                }
-                Err(last_edge) => {
-                    let next_level = last_edge.into_node().ascend().ok();
-                    cur_handle = unwrap_unchecked(next_level);
-                }
-            }
-        }
+    unsafe fn next_back_unchecked(&mut self) -> (&'a mut K, &'a mut V) {
+        self.back.next_back_unchecked()
     }
 }
 
@@ -1892,32 +1854,6 @@ where
     }
 }
 
-fn first_leaf_edge<BorrowType, K, V>(
-    mut node: NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
-) -> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
-    loop {
-        match node.force() {
-            Leaf(leaf) => return leaf.first_edge(),
-            Internal(internal) => {
-                node = internal.first_edge().descend();
-            }
-        }
-    }
-}
-
-fn last_leaf_edge<BorrowType, K, V>(
-    mut node: NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
-) -> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
-    loop {
-        match node.force() {
-            Leaf(leaf) => return leaf.last_edge(),
-            Internal(internal) => {
-                node = internal.last_edge().descend();
-            }
-        }
-    }
-}
-
 fn range_search<BorrowType, K, V, Q: ?Sized, R: RangeBounds<Q>>(
     root1: NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
     root2: NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
@@ -1949,60 +1885,51 @@ where
     let mut max_node = root2;
     let mut min_found = false;
     let mut max_found = false;
-    let mut diverged = false;
 
     loop {
-        let min_edge = match (min_found, range.start_bound()) {
-            (false, Included(key)) => match search::search_linear(&min_node, key) {
-                (i, true) => {
+        let front = match (min_found, range.start_bound()) {
+            (false, Included(key)) => match search::search_node(min_node, key) {
+                Found(kv) => {
                     min_found = true;
-                    i
+                    kv.left_edge()
                 }
-                (i, false) => i,
+                GoDown(edge) => edge,
             },
-            (false, Excluded(key)) => match search::search_linear(&min_node, key) {
-                (i, true) => {
+            (false, Excluded(key)) => match search::search_node(min_node, key) {
+                Found(kv) => {
                     min_found = true;
-                    i + 1
+                    kv.right_edge()
                 }
-                (i, false) => i,
+                GoDown(edge) => edge,
             },
-            (_, Unbounded) => 0,
-            (true, Included(_)) => min_node.len(),
-            (true, Excluded(_)) => 0,
+            (true, Included(_)) => min_node.last_edge(),
+            (true, Excluded(_)) => min_node.first_edge(),
+            (_, Unbounded) => min_node.first_edge(),
         };
 
-        let max_edge = match (max_found, range.end_bound()) {
-            (false, Included(key)) => match search::search_linear(&max_node, key) {
-                (i, true) => {
+        let back = match (max_found, range.end_bound()) {
+            (false, Included(key)) => match search::search_node(max_node, key) {
+                Found(kv) => {
                     max_found = true;
-                    i + 1
+                    kv.right_edge()
                 }
-                (i, false) => i,
+                GoDown(edge) => edge,
             },
-            (false, Excluded(key)) => match search::search_linear(&max_node, key) {
-                (i, true) => {
+            (false, Excluded(key)) => match search::search_node(max_node, key) {
+                Found(kv) => {
                     max_found = true;
-                    i
+                    kv.left_edge()
                 }
-                (i, false) => i,
+                GoDown(edge) => edge,
             },
-            (_, Unbounded) => max_node.len(),
-            (true, Included(_)) => 0,
-            (true, Excluded(_)) => max_node.len(),
+            (true, Included(_)) => max_node.first_edge(),
+            (true, Excluded(_)) => max_node.last_edge(),
+            (_, Unbounded) => max_node.last_edge(),
         };
 
-        if !diverged {
-            if max_edge < min_edge {
-                panic!("Ord is ill-defined in BTreeMap range")
-            }
-            if min_edge != max_edge {
-                diverged = true;
-            }
+        if front.partial_cmp(&back) == Some(Ordering::Greater) {
+            panic!("Ord is ill-defined in BTreeMap range");
         }
-
-        let front = Handle::new_edge(min_node, min_edge);
-        let back = Handle::new_edge(max_node, max_edge);
         match (front.force(), back.force()) {
             (Leaf(f), Leaf(b)) => {
                 return (f, b);
@@ -2016,17 +1943,6 @@ where
     }
 }
 
-#[inline(always)]
-unsafe fn unwrap_unchecked<T>(val: Option<T>) -> T {
-    val.unwrap_or_else(|| {
-        if cfg!(debug_assertions) {
-            panic!("'unchecked' unwrap on None in BTreeMap");
-        } else {
-            intrinsics::unreachable();
-        }
-    })
-}
-
 impl<K, V> BTreeMap<K, V> {
     /// Gets an iterator over the entries of the map, sorted by key.
     ///
@@ -2053,8 +1969,8 @@ impl<K, V> BTreeMap<K, V> {
     pub fn iter(&self) -> Iter<'_, K, V> {
         Iter {
             range: Range {
-                front: first_leaf_edge(self.root.as_ref()),
-                back: last_leaf_edge(self.root.as_ref()),
+                front: self.root.as_ref().first_leaf_edge(),
+                back: self.root.as_ref().last_leaf_edge(),
             },
             length: self.length,
         }
@@ -2087,8 +2003,8 @@ impl<K, V> BTreeMap<K, V> {
         let root2 = unsafe { ptr::read(&root1) };
         IterMut {
             range: RangeMut {
-                front: first_leaf_edge(root1),
-                back: last_leaf_edge(root2),
+                front: root1.first_leaf_edge(),
+                back: root2.last_leaf_edge(),
                 _marker: PhantomData,
             },
             length: self.length,
@@ -2591,7 +2507,7 @@ impl<'a, K: Ord, V> OccupiedEntry<'a, K, V> {
                 let key_loc = internal.kv_mut().0 as *mut K;
                 let val_loc = internal.kv_mut().1 as *mut V;
 
-                let to_remove = first_leaf_edge(internal.right_edge().descend()).right_kv().ok();
+                let to_remove = internal.right_edge().descend().first_leaf_edge().right_kv().ok();
                 let to_remove = unsafe { unwrap_unchecked(to_remove) };
 
                 let (hole, key, val) = to_remove.remove();
diff --git a/src/liballoc/collections/btree/mod.rs b/src/liballoc/collections/btree/mod.rs
index f73a24d099..fb5825ee21 100644
--- a/src/liballoc/collections/btree/mod.rs
+++ b/src/liballoc/collections/btree/mod.rs
@@ -1,4 +1,5 @@
 pub mod map;
+mod navigate;
 mod node;
 mod search;
 pub mod set;
@@ -11,3 +12,14 @@ trait Recover<Q: ?Sized> {
     fn take(&mut self, key: &Q) -> Option<Self::Key>;
     fn replace(&mut self, key: Self::Key) -> Option<Self::Key>;
 }
+
+#[inline(always)]
+pub unsafe fn unwrap_unchecked<T>(val: Option<T>) -> T {
+    val.unwrap_or_else(|| {
+        if cfg!(debug_assertions) {
+            panic!("'unchecked' unwrap on None in BTreeMap");
+        } else {
+            core::intrinsics::unreachable();
+        }
+    })
+}
diff --git a/src/liballoc/collections/btree/navigate.rs b/src/liballoc/collections/btree/navigate.rs
new file mode 100644
index 0000000000..5e8dcf247a
--- /dev/null
+++ b/src/liballoc/collections/btree/navigate.rs
@@ -0,0 +1,243 @@
+use core::ptr;
+
+use super::node::{marker, ForceResult::*, Handle, NodeRef};
+use super::unwrap_unchecked;
+
+impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
+    /// Given a leaf edge handle, returns [`Result::Ok`] with a handle to the neighboring KV
+    /// on the right side, which is either in the same leaf node or in an ancestor node.
+    /// If the leaf edge is the last one in the tree, returns [`Result::Err`] with the root node.
+    pub fn next_kv(
+        self,
+    ) -> Result<
+        Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, marker::KV>,
+        NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
+    > {
+        let mut edge = self.forget_node_type();
+        loop {
+            edge = match edge.right_kv() {
+                Ok(internal_kv) => return Ok(internal_kv),
+                Err(last_edge) => match last_edge.into_node().ascend() {
+                    Ok(parent_edge) => parent_edge.forget_node_type(),
+                    Err(root) => return Err(root.forget_type()),
+                },
+            }
+        }
+    }
+
+    /// Given a leaf edge handle, returns [`Result::Ok`] with a handle to the neighboring KV
+    /// on the left side, which is either in the same leaf node or in an ancestor node.
+    /// If the leaf edge is the first one in the tree, returns [`Result::Err`] with the root node.
+    pub fn next_back_kv(
+        self,
+    ) -> Result<
+        Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, marker::KV>,
+        NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
+    > {
+        let mut edge = self.forget_node_type();
+        loop {
+            edge = match edge.left_kv() {
+                Ok(internal_kv) => return Ok(internal_kv),
+                Err(last_edge) => match last_edge.into_node().ascend() {
+                    Ok(parent_edge) => parent_edge.forget_node_type(),
+                    Err(root) => return Err(root.forget_type()),
+                },
+            }
+        }
+    }
+}
+
+macro_rules! def_next_kv_uncheched_dealloc {
+    { unsafe fn $name:ident : $adjacent_kv:ident } => {
+        /// Given a leaf edge handle into an owned tree, returns a handle to the next KV,
+        /// while deallocating any node left behind.
+        /// Unsafe for two reasons:
+        /// - The caller must ensure that the leaf edge is not the last one in the tree.
+        /// - The node pointed at by the given handle, and its ancestors, may be deallocated,
+        ///   while the reference to those nodes in the surviving ancestors is left dangling;
+        ///   thus using the returned handle to navigate further is dangerous.
+        unsafe fn $name <K, V>(
+            leaf_edge: Handle<NodeRef<marker::Owned, K, V, marker::Leaf>, marker::Edge>,
+        ) -> Handle<NodeRef<marker::Owned, K, V, marker::LeafOrInternal>, marker::KV> {
+            let mut edge = leaf_edge.forget_node_type();
+            loop {
+                edge = match edge.$adjacent_kv() {
+                    Ok(internal_kv) => return internal_kv,
+                    Err(last_edge) => {
+                        let parent_edge = last_edge.into_node().deallocate_and_ascend();
+                        unwrap_unchecked(parent_edge).forget_node_type()
+                    }
+                }
+            }
+        }
+    };
+}
+
+def_next_kv_uncheched_dealloc! {unsafe fn next_kv_unchecked_dealloc: right_kv}
+def_next_kv_uncheched_dealloc! {unsafe fn next_back_kv_unchecked_dealloc: left_kv}
+
+/// This replaces the value behind the `v` unique reference by calling the
+/// relevant function.
+///
+/// Safety: The change closure must not panic.
+#[inline]
+unsafe fn replace<T, R>(v: &mut T, change: impl FnOnce(T) -> (T, R)) -> R {
+    let value = ptr::read(v);
+    let (new_value, ret) = change(value);
+    ptr::write(v, new_value);
+    ret
+}
+
+impl<'a, K, V> Handle<NodeRef<marker::Immut<'a>, K, V, marker::Leaf>, marker::Edge> {
+    /// Moves the leaf edge handle to the next leaf edge and returns references to the
+    /// key and value in between.
+    /// Unsafe because the caller must ensure that the leaf edge is not the last one in the tree.
+    pub unsafe fn next_unchecked(&mut self) -> (&'a K, &'a V) {
+        replace(self, |leaf_edge| {
+            let kv = leaf_edge.next_kv();
+            let kv = unwrap_unchecked(kv.ok());
+            (kv.next_leaf_edge(), kv.into_kv())
+        })
+    }
+
+    /// Moves the leaf edge handle to the previous leaf edge and returns references to the
+    /// key and value in between.
+    /// Unsafe because the caller must ensure that the leaf edge is not the first one in the tree.
+    pub unsafe fn next_back_unchecked(&mut self) -> (&'a K, &'a V) {
+        replace(self, |leaf_edge| {
+            let kv = leaf_edge.next_back_kv();
+            let kv = unwrap_unchecked(kv.ok());
+            (kv.next_back_leaf_edge(), kv.into_kv())
+        })
+    }
+}
+
+impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge> {
+    /// Moves the leaf edge handle to the next leaf edge and returns references to the
+    /// key and value in between.
+    /// Unsafe for two reasons:
+    /// - The caller must ensure that the leaf edge is not the last one in the tree.
+    /// - Using the updated handle may well invalidate the returned references.
+    pub unsafe fn next_unchecked(&mut self) -> (&'a mut K, &'a mut V) {
+        let kv = replace(self, |leaf_edge| {
+            let kv = leaf_edge.next_kv();
+            let kv = unwrap_unchecked(kv.ok());
+            (ptr::read(&kv).next_leaf_edge(), kv)
+        });
+        // Doing the descend (and perhaps another move) invalidates the references
+        // returned by `into_kv_mut`, so we have to do this last.
+        kv.into_kv_mut()
+    }
+
+    /// Moves the leaf edge handle to the previous leaf and returns references to the
+    /// key and value in between.
+    /// Unsafe for two reasons:
+    /// - The caller must ensure that the leaf edge is not the first one in the tree.
+    /// - Using the updated handle may well invalidate the returned references.
+    pub unsafe fn next_back_unchecked(&mut self) -> (&'a mut K, &'a mut V) {
+        let kv = replace(self, |leaf_edge| {
+            let kv = leaf_edge.next_back_kv();
+            let kv = unwrap_unchecked(kv.ok());
+            (ptr::read(&kv).next_back_leaf_edge(), kv)
+        });
+        // Doing the descend (and perhaps another move) invalidates the references
+        // returned by `into_kv_mut`, so we have to do this last.
+        kv.into_kv_mut()
+    }
+}
+
+impl<K, V> Handle<NodeRef<marker::Owned, K, V, marker::Leaf>, marker::Edge> {
+    /// Moves the leaf edge handle to the next leaf edge and returns the key and value
+    /// in between, while deallocating any node left behind.
+    /// Unsafe for three reasons:
+    /// - The caller must ensure that the leaf edge is not the last one in the tree
+    ///   and is not a handle previously resulting from counterpart `next_back_unchecked`.
+    /// - If the leaf edge is the last edge of a node, that node and possibly ancestors
+    ///   will be deallocated, while the reference to those nodes in the surviving ancestor
+    ///   is left dangling; thus further use of the leaf edge handle is dangerous.
+    ///   It is, however, safe to call this method again on the updated handle.
+    ///   if the two preconditions above hold.
+    /// - Using the updated handle may well invalidate the returned references.
+    pub unsafe fn next_unchecked(&mut self) -> (K, V) {
+        replace(self, |leaf_edge| {
+            let kv = next_kv_unchecked_dealloc(leaf_edge);
+            let k = ptr::read(kv.reborrow().into_kv().0);
+            let v = ptr::read(kv.reborrow().into_kv().1);
+            (kv.next_leaf_edge(), (k, v))
+        })
+    }
+
+    /// Moves the leaf edge handle to the previous leaf edge and returns the key
+    /// and value in between, while deallocating any node left behind.
+    /// Unsafe for three reasons:
+    /// - The caller must ensure that the leaf edge is not the first one in the tree
+    ///   and is not a handle previously resulting from counterpart `next_unchecked`.
+    /// - If the lead edge is the first edge of a node, that node and possibly ancestors
+    ///   will be deallocated, while the reference to those nodes in the surviving ancestor
+    ///   is left dangling; thus further use of the leaf edge handle is dangerous.
+    ///   It is, however, safe to call this method again on the updated handle.
+    ///   if the two preconditions above hold.
+    /// - Using the updated handle may well invalidate the returned references.
+    pub unsafe fn next_back_unchecked(&mut self) -> (K, V) {
+        replace(self, |leaf_edge| {
+            let kv = next_back_kv_unchecked_dealloc(leaf_edge);
+            let k = ptr::read(kv.reborrow().into_kv().0);
+            let v = ptr::read(kv.reborrow().into_kv().1);
+            (kv.next_back_leaf_edge(), (k, v))
+        })
+    }
+}
+
+impl<BorrowType, K, V> NodeRef<BorrowType, K, V, marker::LeafOrInternal> {
+    /// Returns the leftmost leaf edge in or underneath a node - in other words, the edge
+    /// you need first when navigating forward (or last when navigating backward).
+    #[inline]
+    pub fn first_leaf_edge(self) -> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
+        let mut node = self;
+        loop {
+            match node.force() {
+                Leaf(leaf) => return leaf.first_edge(),
+                Internal(internal) => node = internal.first_edge().descend(),
+            }
+        }
+    }
+
+    /// Returns the rightmost leaf edge in or underneath a node - in other words, the edge
+    /// you need last when navigating forward (or first when navigating backward).
+    #[inline]
+    pub fn last_leaf_edge(self) -> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
+        let mut node = self;
+        loop {
+            match node.force() {
+                Leaf(leaf) => return leaf.last_edge(),
+                Internal(internal) => node = internal.last_edge().descend(),
+            }
+        }
+    }
+}
+
+impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, marker::KV> {
+    /// Returns the leaf edge closest to a KV for forward navigation.
+    pub fn next_leaf_edge(self) -> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
+        match self.force() {
+            Leaf(leaf_kv) => leaf_kv.right_edge(),
+            Internal(internal_kv) => {
+                let next_internal_edge = internal_kv.right_edge();
+                next_internal_edge.descend().first_leaf_edge()
+            }
+        }
+    }
+
+    /// Returns the leaf edge closest to a KV for backward navigation.
+    pub fn next_back_leaf_edge(
+        self,
+    ) -> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
+        match self.force() {
+            Leaf(leaf_kv) => leaf_kv.left_edge(),
+            Internal(internal_kv) => {
+                let next_internal_edge = internal_kv.left_edge();
+                next_internal_edge.descend().last_leaf_edge()
+            }
+        }
+    }
+}
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs
index d9cdebb4f7..1132ffdaf8 100644
--- a/src/liballoc/collections/btree/node.rs
+++ b/src/liballoc/collections/btree/node.rs
@@ -31,12 +31,13 @@
 // - A node of length `n` has `n` keys, `n` values, and (in an internal node) `n + 1` edges.
 //   This implies that even an empty internal node has at least one edge.
 
+use core::cmp::Ordering;
 use core::marker::PhantomData;
 use core::mem::{self, MaybeUninit};
 use core::ptr::{self, NonNull, Unique};
 use core::slice;
 
-use crate::alloc::{Alloc, Global, Layout};
+use crate::alloc::{AllocRef, Global, Layout};
 use crate::boxed::Box;
 
 const B: usize = 6;
@@ -152,10 +153,15 @@ impl<K, V> InternalNode<K, V> {
     }
 }
 
-/// An owned pointer to a node. This basically is either `Box<LeafNode<K, V>>` or
-/// `Box<InternalNode<K, V>>`. However, it contains no information as to which of the two types
-/// of nodes is actually behind the box, and, partially due to this lack of information, has no
-/// destructor.
+/// A managed, non-null pointer to a node. This is either an owned pointer to
+/// `LeafNode<K, V>`, an owned pointer to `InternalNode<K, V>`, or a (not owned)
+/// pointer to `NodeHeader<(), ()` (more specifically, the pointer to EMPTY_ROOT_NODE).
+/// All of these types have a `NodeHeader<K, V>` prefix, meaning that they have at
+/// least the same size as `NodeHeader<K, V>` and store the same kinds of data at the same
+/// offsets; and they have a pointer alignment at least as large as `NodeHeader<K, V>`'s.
+/// However, `BoxedNode` contains no information as to which of the three types
+/// of nodes it actually contains, and, partially due to this lack of information,
+/// has no destructor.
 struct BoxedNode<K, V> {
     ptr: Unique<LeafNode<K, V>>,
 }
@@ -166,9 +172,7 @@ impl<K, V> BoxedNode<K, V> {
     }
 
     fn from_internal(node: Box<InternalNode<K, V>>) -> Self {
-        unsafe {
-            BoxedNode { ptr: Unique::new_unchecked(Box::into_raw(node) as *mut LeafNode<K, V>) }
-        }
+        BoxedNode { ptr: Box::into_unique(node).cast() }
     }
 
     unsafe fn from_ptr(ptr: NonNull<LeafNode<K, V>>) -> Self {
@@ -180,10 +184,11 @@ impl<K, V> BoxedNode<K, V> {
     }
 }
 
-/// An owned tree. Note that despite being owned, this does not have a destructor,
-/// and must be cleaned up manually.
+/// Either an owned tree or a shared, empty tree.  Note that this does not have a destructor,
+/// and must be cleaned up manually if it is an owned tree.
 pub struct Root<K, V> {
     node: BoxedNode<K, V>,
+    /// The number of levels below the root node.
     height: usize,
 }
 
@@ -191,21 +196,21 @@ unsafe impl<K: Sync, V: Sync> Sync for Root<K, V> {}
 unsafe impl<K: Send, V: Send> Send for Root<K, V> {}
 
 impl<K, V> Root<K, V> {
+    /// Whether the instance of `Root` wraps a shared, empty root node. If not,
+    /// the entire tree is uniquely owned by the owner of the `Root` instance.
     pub fn is_shared_root(&self) -> bool {
         self.as_ref().is_shared_root()
     }
 
+    /// Returns a shared tree, wrapping a shared root node that is eternally empty.
     pub fn shared_empty_root() -> Self {
         Root {
-            node: unsafe {
-                BoxedNode::from_ptr(NonNull::new_unchecked(
-                    &EMPTY_ROOT_NODE as *const _ as *const LeafNode<K, V> as *mut _,
-                ))
-            },
+            node: unsafe { BoxedNode::from_ptr(NonNull::from(&EMPTY_ROOT_NODE).cast()) },
             height: 0,
         }
     }
 
+    /// Returns a new owned tree, with its own root node that is initially empty.
     pub fn new_leaf() -> Self {
         Root { node: BoxedNode::from_leaf(Box::new(unsafe { LeafNode::new() })), height: 0 }
     }
@@ -263,10 +268,10 @@ impl<K, V> Root<K, V> {
 
     /// Removes the root node, using its first child as the new root. This cannot be called when
     /// the tree consists only of a leaf node. As it is intended only to be called when the root
-    /// has only one edge, no cleanup is done on any of the other children are elements of the root.
+    /// has only one edge, no cleanup is done on any of the other children of the root.
     /// This decreases the height by 1 and is the opposite of `push_level`.
     pub fn pop_level(&mut self) {
-        debug_assert!(self.height > 0);
+        assert!(self.height > 0);
 
         let top = self.node.ptr;
 
@@ -305,10 +310,11 @@ impl<K, V> Root<K, V> {
 ///   `NodeRef` could be pointing to either type of node.
 ///   Note that in case of a leaf node, this might still be the shared root!
 ///   Only turn this into a `LeafNode` reference if you know it is not the shared root!
-///   Shared references must be dereferencable *for the entire size of their pointee*,
+///   Shared references must be dereferenceable *for the entire size of their pointee*,
 ///   so '&LeafNode` or `&InternalNode` pointing to the shared root is undefined behavior.
 ///   Turning this into a `NodeHeader` reference is always safe.
 pub struct NodeRef<BorrowType, K, V, Type> {
+    /// The number of levels below the node.
     height: usize,
     node: NonNull<LeafNode<K, V>>,
     // `root` is null unless the borrow type is `Mut`
@@ -344,6 +350,9 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
 impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
     /// Finds the length of the node. This is the number of keys or values. In an
     /// internal node, the number of edges is `len() + 1`.
+    /// For any node, the number of possible edge handles is also `len() + 1`.
+    /// Note that, despite being safe, calling this function can have the side effect
+    /// of invalidating mutable references that unsafe code has created.
     pub fn len(&self) -> usize {
         self.as_header().len as usize
     }
@@ -369,7 +378,8 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
     /// If the node is a leaf, this function simply opens up its data.
     /// If the node is an internal node, so not a leaf, it does have all the data a leaf has
     /// (header, keys and values), and this function exposes that.
-    /// See `NodeRef` on why the node may not be a shared root.
+    /// Unsafe because the node must not be the shared root. For more information,
+    /// see the `NodeRef` comments.
     unsafe fn as_leaf(&self) -> &LeafNode<K, V> {
         debug_assert!(!self.is_shared_root());
         self.node.as_ref()
@@ -385,14 +395,14 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
     }
 
     /// Borrows a view into the keys stored in the node.
-    /// The caller must ensure that the node is not the shared root.
+    /// Unsafe because the caller must ensure that the node is not the shared root.
     pub unsafe fn keys(&self) -> &[K] {
         self.reborrow().into_key_slice()
     }
 
     /// Borrows a view into the values stored in the node.
-    /// The caller must ensure that the node is not the shared root.
-    fn vals(&self) -> &[V] {
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn vals(&self) -> &[V] {
         self.reborrow().into_val_slice()
     }
 
@@ -424,53 +434,48 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
     }
 
     pub fn first_edge(self) -> Handle<Self, marker::Edge> {
-        Handle::new_edge(self, 0)
+        unsafe { Handle::new_edge(self, 0) }
     }
 
     pub fn last_edge(self) -> Handle<Self, marker::Edge> {
         let len = self.len();
-        Handle::new_edge(self, len)
+        unsafe { Handle::new_edge(self, len) }
     }
 
     /// Note that `self` must be nonempty.
     pub fn first_kv(self) -> Handle<Self, marker::KV> {
-        debug_assert!(self.len() > 0);
-        Handle::new_kv(self, 0)
+        let len = self.len();
+        assert!(len > 0);
+        unsafe { Handle::new_kv(self, 0) }
     }
 
     /// Note that `self` must be nonempty.
     pub fn last_kv(self) -> Handle<Self, marker::KV> {
         let len = self.len();
-        debug_assert!(len > 0);
-        Handle::new_kv(self, len - 1)
-    }
-}
-
-impl<K, V> NodeRef<marker::Owned, K, V, marker::Leaf> {
-    /// Similar to `ascend`, gets a reference to a node's parent node, but also
-    /// deallocate the current node in the process. This is unsafe because the
-    /// current node will still be accessible despite being deallocated.
-    pub unsafe fn deallocate_and_ascend(
-        self,
-    ) -> Option<Handle<NodeRef<marker::Owned, K, V, marker::Internal>, marker::Edge>> {
-        debug_assert!(!self.is_shared_root());
-        let node = self.node;
-        let ret = self.ascend().ok();
-        Global.dealloc(node.cast(), Layout::new::<LeafNode<K, V>>());
-        ret
+        assert!(len > 0);
+        unsafe { Handle::new_kv(self, len - 1) }
     }
 }
 
-impl<K, V> NodeRef<marker::Owned, K, V, marker::Internal> {
+impl<K, V> NodeRef<marker::Owned, K, V, marker::LeafOrInternal> {
     /// Similar to `ascend`, gets a reference to a node's parent node, but also
     /// deallocate the current node in the process. This is unsafe because the
     /// current node will still be accessible despite being deallocated.
     pub unsafe fn deallocate_and_ascend(
         self,
     ) -> Option<Handle<NodeRef<marker::Owned, K, V, marker::Internal>, marker::Edge>> {
+        assert!(!self.is_shared_root());
+        let height = self.height;
         let node = self.node;
         let ret = self.ascend().ok();
-        Global.dealloc(node.cast(), Layout::new::<InternalNode<K, V>>());
+        Global.dealloc(
+            node.cast(),
+            if height > 0 {
+                Layout::new::<InternalNode<K, V>>()
+            } else {
+                Layout::new::<LeafNode<K, V>>()
+            },
+        );
         ret
     }
 }
@@ -508,36 +513,36 @@ impl<'a, K, V, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
         self.node.as_ptr()
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn keys_mut(&mut self) -> &mut [K] {
-        unsafe { self.reborrow_mut().into_key_slice_mut() }
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn keys_mut(&mut self) -> &mut [K] {
+        self.reborrow_mut().into_key_slice_mut()
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn vals_mut(&mut self) -> &mut [V] {
-        unsafe { self.reborrow_mut().into_val_slice_mut() }
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn vals_mut(&mut self) -> &mut [V] {
+        self.reborrow_mut().into_val_slice_mut()
     }
 }
 
 impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Immut<'a>, K, V, Type> {
-    /// The caller must ensure that the node is not the shared root.
+    /// Unsafe because the caller must ensure that the node is not the shared root.
     unsafe fn into_key_slice(self) -> &'a [K] {
         debug_assert!(!self.is_shared_root());
         // We cannot be the shared root, so `as_leaf` is okay.
         slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().keys), self.len())
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn into_val_slice(self) -> &'a [V] {
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn into_val_slice(self) -> &'a [V] {
         debug_assert!(!self.is_shared_root());
         // We cannot be the shared root, so `as_leaf` is okay.
-        unsafe { slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().vals), self.len()) }
+        slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().vals), self.len())
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn into_slices(self) -> (&'a [K], &'a [V]) {
-        let k = unsafe { ptr::read(&self) };
-        (unsafe { k.into_key_slice() }, self.into_val_slice())
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn into_slices(self) -> (&'a [K], &'a [V]) {
+        let k = ptr::read(&self);
+        (k.into_key_slice(), self.into_val_slice())
     }
 }
 
@@ -548,54 +553,45 @@ impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
         unsafe { &mut *(self.root as *mut Root<K, V>) }
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn into_key_slice_mut(mut self) -> &'a mut [K] {
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn into_key_slice_mut(mut self) -> &'a mut [K] {
         debug_assert!(!self.is_shared_root());
         // We cannot be the shared root, so `as_leaf_mut` is okay.
-        unsafe {
-            slice::from_raw_parts_mut(
-                MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).keys),
-                self.len(),
-            )
-        }
+        slice::from_raw_parts_mut(
+            MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).keys),
+            self.len(),
+        )
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn into_val_slice_mut(mut self) -> &'a mut [V] {
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn into_val_slice_mut(mut self) -> &'a mut [V] {
         debug_assert!(!self.is_shared_root());
-        unsafe {
-            slice::from_raw_parts_mut(
-                MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).vals),
-                self.len(),
-            )
-        }
+        slice::from_raw_parts_mut(
+            MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).vals),
+            self.len(),
+        )
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn into_slices_mut(mut self) -> (&'a mut [K], &'a mut [V]) {
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn into_slices_mut(mut self) -> (&'a mut [K], &'a mut [V]) {
         debug_assert!(!self.is_shared_root());
         // We cannot use the getters here, because calling the second one
         // invalidates the reference returned by the first.
         // More precisely, it is the call to `len` that is the culprit,
         // because that creates a shared reference to the header, which *can*
         // overlap with the keys (and even the values, for ZST keys).
-        unsafe {
-            let len = self.len();
-            let leaf = self.as_leaf_mut();
-            let keys =
-                slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).keys), len);
-            let vals =
-                slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).vals), len);
-            (keys, vals)
-        }
+        let len = self.len();
+        let leaf = self.as_leaf_mut();
+        let keys = slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).keys), len);
+        let vals = slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).vals), len);
+        (keys, vals)
     }
 }
 
 impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Leaf> {
     /// Adds a key/value pair the end of the node.
     pub fn push(&mut self, key: K, val: V) {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(self.len() < CAPACITY);
+        assert!(self.len() < CAPACITY);
         debug_assert!(!self.is_shared_root());
 
         let idx = self.len();
@@ -610,8 +606,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Leaf> {
 
     /// Adds a key/value pair to the beginning of the node.
     pub fn push_front(&mut self, key: K, val: V) {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(self.len() < CAPACITY);
+        assert!(self.len() < CAPACITY);
         debug_assert!(!self.is_shared_root());
 
         unsafe {
@@ -627,9 +622,8 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
     /// Adds a key/value pair and an edge to go to the right of that pair to
     /// the end of the node.
     pub fn push(&mut self, key: K, val: V, edge: Root<K, V>) {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(edge.height == self.height - 1);
-        debug_assert!(self.len() < CAPACITY);
+        assert!(edge.height == self.height - 1);
+        assert!(self.len() < CAPACITY);
         debug_assert!(!self.is_shared_root());
 
         let idx = self.len();
@@ -645,23 +639,25 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
         }
     }
 
-    fn correct_childrens_parent_links(&mut self, first: usize, after_last: usize) {
+    // Unsafe because 'first' and 'after_last' must be in range
+    unsafe fn correct_childrens_parent_links(&mut self, first: usize, after_last: usize) {
+        debug_assert!(first <= self.len());
+        debug_assert!(after_last <= self.len() + 1);
         for i in first..after_last {
-            Handle::new_edge(unsafe { self.reborrow_mut() }, i).correct_parent_link();
+            Handle::new_edge(self.reborrow_mut(), i).correct_parent_link();
         }
     }
 
     fn correct_all_childrens_parent_links(&mut self) {
         let len = self.len();
-        self.correct_childrens_parent_links(0, len + 1);
+        unsafe { self.correct_childrens_parent_links(0, len + 1) };
     }
 
     /// Adds a key/value pair and an edge to go to the left of that pair to
     /// the beginning of the node.
     pub fn push_front(&mut self, key: K, val: V, edge: Root<K, V>) {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(edge.height == self.height - 1);
-        debug_assert!(self.len() < CAPACITY);
+        assert!(edge.height == self.height - 1);
+        assert!(self.len() < CAPACITY);
         debug_assert!(!self.is_shared_root());
 
         unsafe {
@@ -687,8 +683,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
     /// Removes a key/value pair from the end of this node. If this is an internal node,
     /// also removes the edge that was to the right of that pair.
     pub fn pop(&mut self) -> (K, V, Option<Root<K, V>>) {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(self.len() > 0);
+        assert!(self.len() > 0);
 
         let idx = self.len() - 1;
 
@@ -714,8 +709,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
     /// Removes a key/value pair from the beginning of this node. If this is an internal node,
     /// also removes the edge that was to the left of that pair.
     pub fn pop_front(&mut self) -> (K, V, Option<Root<K, V>>) {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(self.len() > 0);
+        assert!(self.len() > 0);
 
         let old_len = self.len();
 
@@ -750,8 +744,8 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
         }
     }
 
-    /// The caller must ensure that the node is not the shared root.
-    fn into_kv_pointers_mut(mut self) -> (*mut K, *mut V) {
+    /// Unsafe because the caller must ensure that the node is not the shared root.
+    unsafe fn into_kv_pointers_mut(mut self) -> (*mut K, *mut V) {
         (self.keys_mut().as_mut_ptr(), self.vals_mut().as_mut_ptr())
     }
 }
@@ -813,20 +807,20 @@ impl<Node, Type> Handle<Node, Type> {
 }
 
 impl<BorrowType, K, V, NodeType> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV> {
-    /// Creates a new handle to a key/value pair in `node`. `idx` must be less than `node.len()`.
-    pub fn new_kv(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self {
-        // Necessary for correctness, but in a private module
+    /// Creates a new handle to a key/value pair in `node`.
+    /// Unsafe because the caller must ensure that `idx < node.len()`.
+    pub unsafe fn new_kv(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self {
         debug_assert!(idx < node.len());
 
         Handle { node, idx, _marker: PhantomData }
     }
 
     pub fn left_edge(self) -> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> {
-        Handle::new_edge(self.node, self.idx)
+        unsafe { Handle::new_edge(self.node, self.idx) }
     }
 
     pub fn right_edge(self) -> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> {
-        Handle::new_edge(self.node, self.idx + 1)
+        unsafe { Handle::new_edge(self.node, self.idx + 1) }
     }
 }
 
@@ -838,6 +832,14 @@ impl<BorrowType, K, V, NodeType, HandleType> PartialEq
     }
 }
 
+impl<BorrowType, K, V, NodeType, HandleType> PartialOrd
+    for Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType>
+{
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        if self.node.node == other.node.node { Some(self.idx.cmp(&other.idx)) } else { None }
+    }
+}
+
 impl<BorrowType, K, V, NodeType, HandleType>
     Handle<NodeRef<BorrowType, K, V, NodeType>, HandleType>
 {
@@ -868,21 +870,28 @@ impl<'a, K, V, NodeType, HandleType> Handle<NodeRef<marker::Mut<'a>, K, V, NodeT
 }
 
 impl<BorrowType, K, V, NodeType> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> {
-    /// Creates a new handle to an edge in `node`. `idx` must be less than or equal to
-    /// `node.len()`.
-    pub fn new_edge(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self {
-        // Necessary for correctness, but in a private module
+    /// Creates a new handle to an edge in `node`.
+    /// Unsafe because the caller must ensure that `idx <= node.len()`.
+    pub unsafe fn new_edge(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self {
         debug_assert!(idx <= node.len());
 
         Handle { node, idx, _marker: PhantomData }
     }
 
     pub fn left_kv(self) -> Result<Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV>, Self> {
-        if self.idx > 0 { Ok(Handle::new_kv(self.node, self.idx - 1)) } else { Err(self) }
+        if self.idx > 0 {
+            Ok(unsafe { Handle::new_kv(self.node, self.idx - 1) })
+        } else {
+            Err(self)
+        }
     }
 
     pub fn right_kv(self) -> Result<Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV>, Self> {
-        if self.idx < self.node.len() { Ok(Handle::new_kv(self.node, self.idx)) } else { Err(self) }
+        if self.idx < self.node.len() {
+            Ok(unsafe { Handle::new_kv(self.node, self.idx) })
+        } else {
+            Err(self)
+        }
     }
 }
 
@@ -914,9 +923,10 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge
     pub fn insert(mut self, key: K, val: V) -> (InsertResult<'a, K, V, marker::Leaf>, *mut V) {
         if self.node.len() < CAPACITY {
             let ptr = self.insert_fit(key, val);
-            (InsertResult::Fit(Handle::new_kv(self.node, self.idx)), ptr)
+            let kv = unsafe { Handle::new_kv(self.node, self.idx) };
+            (InsertResult::Fit(kv), ptr)
         } else {
-            let middle = Handle::new_kv(self.node, B);
+            let middle = unsafe { Handle::new_kv(self.node, B) };
             let (mut left, k, v, mut right) = middle.split();
             let ptr = if self.idx <= B {
                 unsafe { Handle::new_edge(left.reborrow_mut(), self.idx).insert_fit(key, val) }
@@ -991,14 +1001,14 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
         val: V,
         edge: Root<K, V>,
     ) -> InsertResult<'a, K, V, marker::Internal> {
-        // Necessary for correctness, but this is an internal module
-        debug_assert!(edge.height == self.node.height - 1);
+        assert!(edge.height == self.node.height - 1);
 
         if self.node.len() < CAPACITY {
             self.insert_fit(key, val, edge);
-            InsertResult::Fit(Handle::new_kv(self.node, self.idx))
+            let kv = unsafe { Handle::new_kv(self.node, self.idx) };
+            InsertResult::Fit(kv)
         } else {
-            let middle = Handle::new_kv(self.node, B);
+            let middle = unsafe { Handle::new_kv(self.node, B) };
             let (mut left, k, v, mut right) = middle.split();
             if self.idx <= B {
                 unsafe {
@@ -1037,15 +1047,19 @@ impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::Internal>, marke
 
 impl<'a, K: 'a, V: 'a, NodeType> Handle<NodeRef<marker::Immut<'a>, K, V, NodeType>, marker::KV> {
     pub fn into_kv(self) -> (&'a K, &'a V) {
-        let (keys, vals) = self.node.into_slices();
-        unsafe { (keys.get_unchecked(self.idx), vals.get_unchecked(self.idx)) }
+        unsafe {
+            let (keys, vals) = self.node.into_slices();
+            (keys.get_unchecked(self.idx), vals.get_unchecked(self.idx))
+        }
     }
 }
 
 impl<'a, K: 'a, V: 'a, NodeType> Handle<NodeRef<marker::Mut<'a>, K, V, NodeType>, marker::KV> {
     pub fn into_kv_mut(self) -> (&'a mut K, &'a mut V) {
-        let (keys, vals) = self.node.into_slices_mut();
-        unsafe { (keys.get_unchecked_mut(self.idx), vals.get_unchecked_mut(self.idx)) }
+        unsafe {
+            let (keys, vals) = self.node.into_slices_mut();
+            (keys.get_unchecked_mut(self.idx), vals.get_unchecked_mut(self.idx))
+        }
     }
 }
 
@@ -1067,7 +1081,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::KV>
     /// - All the key/value pairs to the right of this handle are put into a newly
     ///   allocated node.
     pub fn split(mut self) -> (NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, K, V, Root<K, V>) {
-        debug_assert!(!self.node.is_shared_root());
+        assert!(!self.node.is_shared_root());
         unsafe {
             let mut new_node = Box::new(LeafNode::new());
 
@@ -1099,7 +1113,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::KV>
     pub fn remove(
         mut self,
     ) -> (Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge>, K, V) {
-        debug_assert!(!self.node.is_shared_root());
+        assert!(!self.node.is_shared_root());
         unsafe {
             let k = slice_remove(self.node.keys_mut(), self.idx);
             let v = slice_remove(self.node.vals_mut(), self.idx);
@@ -1182,7 +1196,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
         let right_len = right_node.len();
 
         // necessary for correctness, but in a private module
-        debug_assert!(left_len + right_len + 1 <= CAPACITY);
+        assert!(left_len + right_len < CAPACITY);
 
         unsafe {
             ptr::write(
@@ -1281,8 +1295,8 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
             let right_len = right_node.len();
 
             // Make sure that we may steal safely.
-            debug_assert!(right_len + count <= CAPACITY);
-            debug_assert!(left_len >= count);
+            assert!(right_len + count <= CAPACITY);
+            assert!(left_len >= count);
 
             let new_left_len = left_len - count;
 
@@ -1338,8 +1352,8 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
             let right_len = right_node.len();
 
             // Make sure that we may steal safely.
-            debug_assert!(left_len + count <= CAPACITY);
-            debug_assert!(right_len >= count);
+            assert!(left_len + count <= CAPACITY);
+            assert!(right_len >= count);
 
             let new_right_len = right_len - count;
 
@@ -1412,6 +1426,30 @@ unsafe fn move_edges<K, V>(
     dest.correct_childrens_parent_links(dest_offset, dest_offset + count);
 }
 
+impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::Edge> {
+    pub fn forget_node_type(
+        self,
+    ) -> Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, marker::Edge> {
+        unsafe { Handle::new_edge(self.node.forget_type(), self.idx) }
+    }
+}
+
+impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::Internal>, marker::Edge> {
+    pub fn forget_node_type(
+        self,
+    ) -> Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, marker::Edge> {
+        unsafe { Handle::new_edge(self.node.forget_type(), self.idx) }
+    }
+}
+
+impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::Leaf>, marker::KV> {
+    pub fn forget_node_type(
+        self,
+    ) -> Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, marker::KV> {
+        unsafe { Handle::new_kv(self.node.forget_type(), self.idx) }
+    }
+}
+
 impl<BorrowType, K, V, HandleType>
     Handle<NodeRef<BorrowType, K, V, marker::LeafOrInternal>, HandleType>
 {
@@ -1447,24 +1485,26 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal>, ma
             let right_new_len = left_node.len() - left_new_len;
             let mut right_node = right.reborrow_mut();
 
-            debug_assert!(right_node.len() == 0);
-            debug_assert!(left_node.height == right_node.height);
+            assert!(right_node.len() == 0);
+            assert!(left_node.height == right_node.height);
 
-            let left_kv = left_node.reborrow_mut().into_kv_pointers_mut();
-            let right_kv = right_node.reborrow_mut().into_kv_pointers_mut();
+            if right_new_len > 0 {
+                let left_kv = left_node.reborrow_mut().into_kv_pointers_mut();
+                let right_kv = right_node.reborrow_mut().into_kv_pointers_mut();
 
-            move_kv(left_kv, left_new_len, right_kv, 0, right_new_len);
+                move_kv(left_kv, left_new_len, right_kv, 0, right_new_len);
 
-            (*left_node.reborrow_mut().as_leaf_mut()).len = left_new_len as u16;
-            (*right_node.reborrow_mut().as_leaf_mut()).len = right_new_len as u16;
+                (*left_node.reborrow_mut().as_leaf_mut()).len = left_new_len as u16;
+                (*right_node.reborrow_mut().as_leaf_mut()).len = right_new_len as u16;
 
-            match (left_node.force(), right_node.force()) {
-                (ForceResult::Internal(left), ForceResult::Internal(right)) => {
-                    move_edges(left, left_new_len + 1, right, 1, right_new_len);
-                }
-                (ForceResult::Leaf(_), ForceResult::Leaf(_)) => {}
-                _ => {
-                    unreachable!();
+                match (left_node.force(), right_node.force()) {
+                    (ForceResult::Internal(left), ForceResult::Internal(right)) => {
+                        move_edges(left, left_new_len + 1, right, 1, right_new_len);
+                    }
+                    (ForceResult::Leaf(_), ForceResult::Leaf(_)) => {}
+                    _ => {
+                        unreachable!();
+                    }
                 }
             }
         }
diff --git a/src/liballoc/collections/btree/search.rs b/src/liballoc/collections/btree/search.rs
index 579624cdd2..2ba5cebbde 100644
--- a/src/liballoc/collections/btree/search.rs
+++ b/src/liballoc/collections/btree/search.rs
@@ -10,6 +10,10 @@ pub enum SearchResult<BorrowType, K, V, FoundType, GoDownType> {
     GoDown(Handle<NodeRef<BorrowType, K, V, GoDownType>, marker::Edge>),
 }
 
+/// Looks up a given key in a (sub)tree headed by the given node, recursively.
+/// Returns a `Found` with the handle of the matching KV, if any. Otherwise,
+/// returns a `GoDown` with the handle of the possible leaf edge where the key
+/// belongs.
 pub fn search_tree<BorrowType, K, V, Q: ?Sized>(
     mut node: NodeRef<BorrowType, K, V, marker::LeafOrInternal>,
     key: &Q,
@@ -32,6 +36,10 @@ where
     }
 }
 
+/// Looks up a given key in a given node, without recursion.
+/// Returns a `Found` with the handle of the matching KV, if any. Otherwise,
+/// returns a `GoDown` with the handle of the edge where the key might be found.
+/// If the node is a leaf, a `GoDown` edge is not an actual edge but a possible edge.
 pub fn search_node<BorrowType, K, V, Type, Q: ?Sized>(
     node: NodeRef<BorrowType, K, V, Type>,
     key: &Q,
@@ -41,8 +49,8 @@ where
     K: Borrow<Q>,
 {
     match search_linear(&node, key) {
-        (idx, true) => Found(Handle::new_kv(node, idx)),
-        (idx, false) => SearchResult::GoDown(Handle::new_edge(node, idx)),
+        (idx, true) => Found(unsafe { Handle::new_kv(node, idx) }),
+        (idx, false) => SearchResult::GoDown(unsafe { Handle::new_edge(node, idx) }),
     }
 }
 
@@ -50,8 +58,8 @@ where
 /// or could exist, and whether it exists in the node itself. If it doesn't
 /// exist in the node itself, it may exist in the subtree with that index
 /// (if the node has subtrees). If the key doesn't exist in node or subtree,
-/// the returned index is the position or subtree to insert at.
-pub fn search_linear<BorrowType, K, V, Type, Q: ?Sized>(
+/// the returned index is the position or subtree where the key belongs.
+fn search_linear<BorrowType, K, V, Type, Q: ?Sized>(
     node: &NodeRef<BorrowType, K, V, Type>,
     key: &Q,
 ) -> (usize, bool)
diff --git a/src/liballoc/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs
index f548742681..b100ce754c 100644
--- a/src/liballoc/collections/btree/set.rs
+++ b/src/liballoc/collections/btree/set.rs
@@ -56,12 +56,23 @@ use crate::collections::btree_map::{self, BTreeMap, Keys};
 ///     println!("{}", book);
 /// }
 /// ```
-#[derive(Clone, Hash, PartialEq, Eq, Ord, PartialOrd)]
+#[derive(Hash, PartialEq, Eq, Ord, PartialOrd)]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct BTreeSet<T> {
     map: BTreeMap<T, ()>,
 }
 
+#[stable(feature = "rust1", since = "1.0.0")]
+impl<T: Clone> Clone for BTreeSet<T> {
+    fn clone(&self) -> Self {
+        BTreeSet { map: self.map.clone() }
+    }
+
+    fn clone_from(&mut self, other: &Self) {
+        self.map.clone_from(&other.map);
+    }
+}
+
 /// An iterator over the items of a `BTreeSet`.
 ///
 /// This `struct` is created by the [`iter`] method on [`BTreeSet`].
diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs
index b88ca8a0fb..73ae267dda 100644
--- a/src/liballoc/collections/linked_list.rs
+++ b/src/liballoc/collections/linked_list.rs
@@ -841,10 +841,10 @@ impl<T> LinkedList<T> {
     /// d.push_front(2);
     /// d.push_front(3);
     ///
-    /// let mut splitted = d.split_off(2);
+    /// let mut split = d.split_off(2);
     ///
-    /// assert_eq!(splitted.pop_front(), Some(1));
-    /// assert_eq!(splitted.pop_front(), None);
+    /// assert_eq!(split.pop_front(), Some(1));
+    /// assert_eq!(split.pop_front(), None);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn split_off(&mut self, at: usize) -> LinkedList<T> {
@@ -878,6 +878,52 @@ impl<T> LinkedList<T> {
         unsafe { self.split_off_after_node(split_node, at) }
     }
 
+    /// Removes the element at the given index and returns it.
+    ///
+    /// This operation should compute in O(n) time.
+    ///
+    /// # Panics
+    /// Panics if at >= len
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// #![feature(linked_list_remove)]
+    /// use std::collections::LinkedList;
+    ///
+    /// let mut d = LinkedList::new();
+    ///
+    /// d.push_front(1);
+    /// d.push_front(2);
+    /// d.push_front(3);
+    ///
+    /// assert_eq!(d.remove(1), 2);
+    /// assert_eq!(d.remove(0), 3);
+    /// assert_eq!(d.remove(0), 1);
+    /// ```
+    #[unstable(feature = "linked_list_remove", issue = "69210")]
+    pub fn remove(&mut self, at: usize) -> T {
+        let len = self.len();
+        assert!(at < len, "Cannot remove at an index outside of the list bounds");
+
+        // Below, we iterate towards the node at the given index, either from
+        // the start or the end, depending on which would be faster.
+        let offset_from_end = len - at - 1;
+        if at <= offset_from_end {
+            let mut cursor = self.cursor_front_mut();
+            for _ in 0..at {
+                cursor.move_next();
+            }
+            cursor.remove_current().unwrap()
+        } else {
+            let mut cursor = self.cursor_back_mut();
+            for _ in 0..offset_from_end {
+                cursor.move_prev();
+            }
+            cursor.remove_current().unwrap()
+        }
+    }
+
     /// Creates an iterator which uses a closure to determine if an element should be removed.
     ///
     /// If the closure returns true, then the element is removed and yielded.
@@ -913,7 +959,7 @@ impl<T> LinkedList<T> {
         let it = self.head;
         let old_len = self.len;
 
-        DrainFilter { list: self, it: it, pred: filter, idx: 0, old_len: old_len }
+        DrainFilter { list: self, it, pred: filter, idx: 0, old_len }
     }
 }
 
@@ -1565,7 +1611,24 @@ where
     F: FnMut(&mut T) -> bool,
 {
     fn drop(&mut self) {
-        self.for_each(drop);
+        struct DropGuard<'r, 'a, T, F>(&'r mut DrainFilter<'a, T, F>)
+        where
+            F: FnMut(&mut T) -> bool;
+
+        impl<'r, 'a, T, F> Drop for DropGuard<'r, 'a, T, F>
+        where
+            F: FnMut(&mut T) -> bool,
+        {
+            fn drop(&mut self) {
+                self.0.for_each(drop);
+            }
+        }
+
+        while let Some(item) = self.next() {
+            let guard = DropGuard(self);
+            drop(item);
+            mem::forget(guard);
+        }
     }
 }
 
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs
index 2cc450bb68..9d56f17700 100644
--- a/src/liballoc/collections/vec_deque.rs
+++ b/src/liballoc/collections/vec_deque.rs
@@ -22,6 +22,11 @@ use crate::collections::TryReserveError;
 use crate::raw_vec::RawVec;
 use crate::vec::Vec;
 
+#[stable(feature = "drain", since = "1.6.0")]
+pub use self::drain::Drain;
+
+mod drain;
+
 #[cfg(test)]
 mod tests;
 
@@ -866,6 +871,18 @@ impl<T> VecDeque<T> {
     /// ```
     #[stable(feature = "deque_extras", since = "1.16.0")]
     pub fn truncate(&mut self, len: usize) {
+        /// Runs the destructor for all items in the slice when it gets dropped (normally or
+        /// during unwinding).
+        struct Dropper<'a, T>(&'a mut [T]);
+
+        impl<'a, T> Drop for Dropper<'a, T> {
+            fn drop(&mut self) {
+                unsafe {
+                    ptr::drop_in_place(self.0);
+                }
+            }
+        }
+
         // Safe because:
         //
         // * Any slice passed to `drop_in_place` is valid; the second case has
@@ -888,8 +905,11 @@ impl<T> VecDeque<T> {
                 let drop_back = back as *mut _;
                 let drop_front = front.get_unchecked_mut(len..) as *mut _;
                 self.head = self.wrap_sub(self.head, num_dropped);
+
+                // Make sure the second half is dropped even when a destructor
+                // in the first one panics.
+                let _back_dropper = Dropper(&mut *drop_back);
                 ptr::drop_in_place(drop_front);
-                ptr::drop_in_place(drop_back);
             }
         }
     }
@@ -2112,7 +2132,7 @@ impl<T> VecDeque<T> {
     // Safety: the following two methods require that the rotation amount
     // be less than half the length of the deque.
     //
-    // `wrap_copy` requres that `min(x, cap() - x) + copy_len <= cap()`,
+    // `wrap_copy` requires that `min(x, cap() - x) + copy_len <= cap()`,
     // but than `min` is never more than half the capacity, regardless of x,
     // so it's sound to call here because we're calling with something
     // less than half the length, which is never above half the capacity.
@@ -2526,113 +2546,6 @@ impl<T> ExactSizeIterator for IntoIter<T> {
 #[stable(feature = "fused", since = "1.26.0")]
 impl<T> FusedIterator for IntoIter<T> {}
 
-/// A draining iterator over the elements of a `VecDeque`.
-///
-/// This `struct` is created by the [`drain`] method on [`VecDeque`]. See its
-/// documentation for more.
-///
-/// [`drain`]: struct.VecDeque.html#method.drain
-/// [`VecDeque`]: struct.VecDeque.html
-#[stable(feature = "drain", since = "1.6.0")]
-pub struct Drain<'a, T: 'a> {
-    after_tail: usize,
-    after_head: usize,
-    iter: Iter<'a, T>,
-    deque: NonNull<VecDeque<T>>,
-}
-
-#[stable(feature = "collection_debug", since = "1.17.0")]
-impl<T: fmt::Debug> fmt::Debug for Drain<'_, T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_tuple("Drain")
-            .field(&self.after_tail)
-            .field(&self.after_head)
-            .field(&self.iter)
-            .finish()
-    }
-}
-
-#[stable(feature = "drain", since = "1.6.0")]
-unsafe impl<T: Sync> Sync for Drain<'_, T> {}
-#[stable(feature = "drain", since = "1.6.0")]
-unsafe impl<T: Send> Send for Drain<'_, T> {}
-
-#[stable(feature = "drain", since = "1.6.0")]
-impl<T> Drop for Drain<'_, T> {
-    fn drop(&mut self) {
-        self.for_each(drop);
-
-        let source_deque = unsafe { self.deque.as_mut() };
-
-        // T = source_deque_tail; H = source_deque_head; t = drain_tail; h = drain_head
-        //
-        //        T   t   h   H
-        // [. . . o o x x o o . . .]
-        //
-        let orig_tail = source_deque.tail;
-        let drain_tail = source_deque.head;
-        let drain_head = self.after_tail;
-        let orig_head = self.after_head;
-
-        let tail_len = count(orig_tail, drain_tail, source_deque.cap());
-        let head_len = count(drain_head, orig_head, source_deque.cap());
-
-        // Restore the original head value
-        source_deque.head = orig_head;
-
-        match (tail_len, head_len) {
-            (0, 0) => {
-                source_deque.head = 0;
-                source_deque.tail = 0;
-            }
-            (0, _) => {
-                source_deque.tail = drain_head;
-            }
-            (_, 0) => {
-                source_deque.head = drain_tail;
-            }
-            _ => unsafe {
-                if tail_len <= head_len {
-                    source_deque.tail = source_deque.wrap_sub(drain_head, tail_len);
-                    source_deque.wrap_copy(source_deque.tail, orig_tail, tail_len);
-                } else {
-                    source_deque.head = source_deque.wrap_add(drain_tail, head_len);
-                    source_deque.wrap_copy(drain_tail, drain_head, head_len);
-                }
-            },
-        }
-    }
-}
-
-#[stable(feature = "drain", since = "1.6.0")]
-impl<T> Iterator for Drain<'_, T> {
-    type Item = T;
-
-    #[inline]
-    fn next(&mut self) -> Option<T> {
-        self.iter.next().map(|elt| unsafe { ptr::read(elt) })
-    }
-
-    #[inline]
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        self.iter.size_hint()
-    }
-}
-
-#[stable(feature = "drain", since = "1.6.0")]
-impl<T> DoubleEndedIterator for Drain<'_, T> {
-    #[inline]
-    fn next_back(&mut self) -> Option<T> {
-        self.iter.next_back().map(|elt| unsafe { ptr::read(elt) })
-    }
-}
-
-#[stable(feature = "drain", since = "1.6.0")]
-impl<T> ExactSizeIterator for Drain<'_, T> {}
-
-#[stable(feature = "fused", since = "1.26.0")]
-impl<T> FusedIterator for Drain<'_, T> {}
-
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<A: PartialEq> PartialEq for VecDeque<A> {
     fn eq(&self, other: &VecDeque<A>) -> bool {
diff --git a/src/liballoc/collections/vec_deque/drain.rs b/src/liballoc/collections/vec_deque/drain.rs
new file mode 100644
index 0000000000..1ae94de75a
--- /dev/null
+++ b/src/liballoc/collections/vec_deque/drain.rs
@@ -0,0 +1,126 @@
+use core::iter::FusedIterator;
+use core::ptr::{self, NonNull};
+use core::{fmt, mem};
+
+use super::{count, Iter, VecDeque};
+
+/// A draining iterator over the elements of a `VecDeque`.
+///
+/// This `struct` is created by the [`drain`] method on [`VecDeque`]. See its
+/// documentation for more.
+///
+/// [`drain`]: struct.VecDeque.html#method.drain
+/// [`VecDeque`]: struct.VecDeque.html
+#[stable(feature = "drain", since = "1.6.0")]
+pub struct Drain<'a, T: 'a> {
+    pub(crate) after_tail: usize,
+    pub(crate) after_head: usize,
+    pub(crate) iter: Iter<'a, T>,
+    pub(crate) deque: NonNull<VecDeque<T>>,
+}
+
+#[stable(feature = "collection_debug", since = "1.17.0")]
+impl<T: fmt::Debug> fmt::Debug for Drain<'_, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_tuple("Drain")
+            .field(&self.after_tail)
+            .field(&self.after_head)
+            .field(&self.iter)
+            .finish()
+    }
+}
+
+#[stable(feature = "drain", since = "1.6.0")]
+unsafe impl<T: Sync> Sync for Drain<'_, T> {}
+#[stable(feature = "drain", since = "1.6.0")]
+unsafe impl<T: Send> Send for Drain<'_, T> {}
+
+#[stable(feature = "drain", since = "1.6.0")]
+impl<T> Drop for Drain<'_, T> {
+    fn drop(&mut self) {
+        struct DropGuard<'r, 'a, T>(&'r mut Drain<'a, T>);
+
+        impl<'r, 'a, T> Drop for DropGuard<'r, 'a, T> {
+            fn drop(&mut self) {
+                self.0.for_each(drop);
+
+                let source_deque = unsafe { self.0.deque.as_mut() };
+
+                // T = source_deque_tail; H = source_deque_head; t = drain_tail; h = drain_head
+                //
+                //        T   t   h   H
+                // [. . . o o x x o o . . .]
+                //
+                let orig_tail = source_deque.tail;
+                let drain_tail = source_deque.head;
+                let drain_head = self.0.after_tail;
+                let orig_head = self.0.after_head;
+
+                let tail_len = count(orig_tail, drain_tail, source_deque.cap());
+                let head_len = count(drain_head, orig_head, source_deque.cap());
+
+                // Restore the original head value
+                source_deque.head = orig_head;
+
+                match (tail_len, head_len) {
+                    (0, 0) => {
+                        source_deque.head = 0;
+                        source_deque.tail = 0;
+                    }
+                    (0, _) => {
+                        source_deque.tail = drain_head;
+                    }
+                    (_, 0) => {
+                        source_deque.head = drain_tail;
+                    }
+                    _ => unsafe {
+                        if tail_len <= head_len {
+                            source_deque.tail = source_deque.wrap_sub(drain_head, tail_len);
+                            source_deque.wrap_copy(source_deque.tail, orig_tail, tail_len);
+                        } else {
+                            source_deque.head = source_deque.wrap_add(drain_tail, head_len);
+                            source_deque.wrap_copy(drain_tail, drain_head, head_len);
+                        }
+                    },
+                }
+            }
+        }
+
+        while let Some(item) = self.next() {
+            let guard = DropGuard(self);
+            drop(item);
+            mem::forget(guard);
+        }
+
+        DropGuard(self);
+    }
+}
+
+#[stable(feature = "drain", since = "1.6.0")]
+impl<T> Iterator for Drain<'_, T> {
+    type Item = T;
+
+    #[inline]
+    fn next(&mut self) -> Option<T> {
+        self.iter.next().map(|elt| unsafe { ptr::read(elt) })
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        self.iter.size_hint()
+    }
+}
+
+#[stable(feature = "drain", since = "1.6.0")]
+impl<T> DoubleEndedIterator for Drain<'_, T> {
+    #[inline]
+    fn next_back(&mut self) -> Option<T> {
+        self.iter.next_back().map(|elt| unsafe { ptr::read(elt) })
+    }
+}
+
+#[stable(feature = "drain", since = "1.6.0")]
+impl<T> ExactSizeIterator for Drain<'_, T> {}
+
+#[stable(feature = "fused", since = "1.26.0")]
+impl<T> FusedIterator for Drain<'_, T> {}
diff --git a/src/liballoc/fmt.rs b/src/liballoc/fmt.rs
index e6162e0f57..13ef2f063f 100644
--- a/src/liballoc/fmt.rs
+++ b/src/liballoc/fmt.rs
@@ -247,6 +247,21 @@
 //! Hello, `     123` has 3 right-aligned characters
 //! ```
 //!
+//! ## Localization
+//!
+//! In some programming languages, the behavior of string formatting functions
+//! depends on the operating system's locale setting. The format functions
+//! provided by Rust's standard library do not have any concept of locale, and
+//! will produce the same results on all systems regardless of user
+//! configuration.
+//!
+//! For example, the following code will always print `1.5` even if the system
+//! locale uses a decimal separator other than a dot.
+//!
+//! ```
+//! println!("The value is {}", 1.5);
+//! ```
+//!
 //! # Escaping
 //!
 //! The literal characters `{` and `}` may be included in a string by preceding
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 38c6fa91cc..ffa4176cc7 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -60,6 +60,7 @@
 #![stable(feature = "alloc", since = "1.36.0")]
 #![doc(
     html_root_url = "https://doc.rust-lang.org/nightly/",
+    html_playground_url = "https://play.rust-lang.org/",
     issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",
     test(no_crate_inject, attr(allow(unused_variables), deny(warnings)))
 )]
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs
index 86aed612ef..b31fec7f03 100644
--- a/src/liballoc/raw_vec.rs
+++ b/src/liballoc/raw_vec.rs
@@ -7,7 +7,7 @@ use core::ops::Drop;
 use core::ptr::{self, NonNull, Unique};
 use core::slice;
 
-use crate::alloc::{handle_alloc_error, Alloc, AllocErr, Global, Layout};
+use crate::alloc::{handle_alloc_error, AllocErr, AllocRef, Global, Layout};
 use crate::boxed::Box;
 use crate::collections::TryReserveError::{self, *};
 
@@ -42,13 +42,13 @@ mod tests;
 /// field. This allows zero-sized types to not be special-cased by consumers of
 /// this type.
 #[allow(missing_debug_implementations)]
-pub struct RawVec<T, A: Alloc = Global> {
+pub struct RawVec<T, A: AllocRef = Global> {
     ptr: Unique<T>,
     cap: usize,
     a: A,
 }
 
-impl<T, A: Alloc> RawVec<T, A> {
+impl<T, A: AllocRef> RawVec<T, A> {
     /// Like `new`, but parameterized over the choice of allocator for
     /// the returned `RawVec`.
     pub const fn new_in(a: A) -> Self {
@@ -72,28 +72,29 @@ impl<T, A: Alloc> RawVec<T, A> {
         RawVec::allocate_in(capacity, true, a)
     }
 
-    fn allocate_in(capacity: usize, zeroed: bool, mut a: A) -> Self {
-        unsafe {
-            let elem_size = mem::size_of::<T>();
+    fn allocate_in(mut capacity: usize, zeroed: bool, mut a: A) -> Self {
+        let elem_size = mem::size_of::<T>();
 
-            let alloc_size = capacity.checked_mul(elem_size).unwrap_or_else(|| capacity_overflow());
-            alloc_guard(alloc_size).unwrap_or_else(|_| capacity_overflow());
+        let alloc_size = capacity.checked_mul(elem_size).unwrap_or_else(|| capacity_overflow());
+        alloc_guard(alloc_size).unwrap_or_else(|_| capacity_overflow());
 
-            // Handles ZSTs and `capacity == 0` alike.
-            let ptr = if alloc_size == 0 {
-                NonNull::<T>::dangling()
-            } else {
-                let align = mem::align_of::<T>();
-                let layout = Layout::from_size_align(alloc_size, align).unwrap();
-                let result = if zeroed { a.alloc_zeroed(layout) } else { a.alloc(layout) };
-                match result {
-                    Ok(ptr) => ptr.cast(),
-                    Err(_) => handle_alloc_error(layout),
+        // Handles ZSTs and `capacity == 0` alike.
+        let ptr = if alloc_size == 0 {
+            NonNull::<T>::dangling()
+        } else {
+            let align = mem::align_of::<T>();
+            let layout = Layout::from_size_align(alloc_size, align).unwrap();
+            let result = if zeroed { a.alloc_zeroed(layout) } else { a.alloc(layout) };
+            match result {
+                Ok((ptr, size)) => {
+                    capacity = size / elem_size;
+                    ptr.cast()
                 }
-            };
+                Err(_) => handle_alloc_error(layout),
+            }
+        };
 
-            RawVec { ptr: ptr.into(), cap: capacity, a }
-        }
+        RawVec { ptr: ptr.into(), cap: capacity, a }
     }
 }
 
@@ -147,7 +148,7 @@ impl<T> RawVec<T, Global> {
     }
 }
 
-impl<T, A: Alloc> RawVec<T, A> {
+impl<T, A: AllocRef> RawVec<T, A> {
     /// Reconstitutes a `RawVec` from a pointer, capacity, and allocator.
     ///
     /// # Undefined Behavior
@@ -182,7 +183,7 @@ impl<T> RawVec<T, Global> {
     }
 }
 
-impl<T, A: Alloc> RawVec<T, A> {
+impl<T, A: AllocRef> RawVec<T, A> {
     /// Gets a raw pointer to the start of the allocation. Note that this is
     /// `Unique::empty()` if `capacity == 0` or `T` is zero-sized. In the former case, you must
     /// be careful.
@@ -280,7 +281,7 @@ impl<T, A: Alloc> RawVec<T, A> {
             // 0, getting to here necessarily means the `RawVec` is overfull.
             assert!(elem_size != 0, "capacity overflow");
 
-            let (new_cap, uniq) = match self.current_layout() {
+            let (ptr, new_cap) = match self.current_layout() {
                 Some(cur) => {
                     // Since we guarantee that we never allocate more than
                     // `isize::MAX` bytes, `elem_size * self.cap <= isize::MAX` as
@@ -297,7 +298,7 @@ impl<T, A: Alloc> RawVec<T, A> {
                     alloc_guard(new_size).unwrap_or_else(|_| capacity_overflow());
                     let ptr_res = self.a.realloc(NonNull::from(self.ptr).cast(), cur, new_size);
                     match ptr_res {
-                        Ok(ptr) => (new_cap, ptr.cast().into()),
+                        Ok((ptr, new_size)) => (ptr, new_size / elem_size),
                         Err(_) => handle_alloc_error(Layout::from_size_align_unchecked(
                             new_size,
                             cur.align(),
@@ -308,13 +309,14 @@ impl<T, A: Alloc> RawVec<T, A> {
                     // Skip to 4 because tiny `Vec`'s are dumb; but not if that
                     // would cause overflow.
                     let new_cap = if elem_size > (!0) / 8 { 1 } else { 4 };
-                    match self.a.alloc_array::<T>(new_cap) {
-                        Ok(ptr) => (new_cap, ptr.into()),
-                        Err(_) => handle_alloc_error(Layout::array::<T>(new_cap).unwrap()),
+                    let layout = Layout::array::<T>(new_cap).unwrap();
+                    match self.a.alloc(layout) {
+                        Ok((ptr, new_size)) => (ptr, new_size / elem_size),
+                        Err(_) => handle_alloc_error(layout),
                     }
                 }
             };
-            self.ptr = uniq;
+            self.ptr = ptr.cast().into();
             self.cap = new_cap;
         }
     }
@@ -597,7 +599,7 @@ impl<T, A: Alloc> RawVec<T, A> {
                 let align = mem::align_of::<T>();
                 let old_layout = Layout::from_size_align_unchecked(old_size, align);
                 match self.a.realloc(NonNull::from(self.ptr).cast(), old_layout, new_size) {
-                    Ok(p) => self.ptr = p.cast().into(),
+                    Ok((ptr, _)) => self.ptr = ptr.cast().into(),
                     Err(_) => {
                         handle_alloc_error(Layout::from_size_align_unchecked(new_size, align))
                     }
@@ -622,7 +624,7 @@ enum ReserveStrategy {
 
 use ReserveStrategy::*;
 
-impl<T, A: Alloc> RawVec<T, A> {
+impl<T, A: AllocRef> RawVec<T, A> {
     fn reserve_internal(
         &mut self,
         used_capacity: usize,
@@ -630,6 +632,8 @@ impl<T, A: Alloc> RawVec<T, A> {
         fallibility: Fallibility,
         strategy: ReserveStrategy,
     ) -> Result<(), TryReserveError> {
+        let elem_size = mem::size_of::<T>();
+
         unsafe {
             // NOTE: we don't early branch on ZSTs here because we want this
             // to actually catch "asking for more than usize::MAX" in that case.
@@ -661,7 +665,7 @@ impl<T, A: Alloc> RawVec<T, A> {
                 None => self.a.alloc(new_layout),
             };
 
-            let ptr = match (res, fallibility) {
+            let (ptr, new_cap) = match (res, fallibility) {
                 (Err(AllocErr), Infallible) => handle_alloc_error(new_layout),
                 (Err(AllocErr), Fallible) => {
                     return Err(TryReserveError::AllocError {
@@ -669,7 +673,7 @@ impl<T, A: Alloc> RawVec<T, A> {
                         non_exhaustive: (),
                     });
                 }
-                (Ok(ptr), _) => ptr,
+                (Ok((ptr, new_size)), _) => (ptr, new_size / elem_size),
             };
 
             self.ptr = ptr.cast().into();
@@ -700,7 +704,7 @@ impl<T> RawVec<T, Global> {
     }
 }
 
-impl<T, A: Alloc> RawVec<T, A> {
+impl<T, A: AllocRef> RawVec<T, A> {
     /// Frees the memory owned by the `RawVec` *without* trying to drop its contents.
     pub unsafe fn dealloc_buffer(&mut self) {
         let elem_size = mem::size_of::<T>();
@@ -712,7 +716,7 @@ impl<T, A: Alloc> RawVec<T, A> {
     }
 }
 
-unsafe impl<#[may_dangle] T, A: Alloc> Drop for RawVec<T, A> {
+unsafe impl<#[may_dangle] T, A: AllocRef> Drop for RawVec<T, A> {
     /// Frees the memory owned by the `RawVec` *without* trying to drop its contents.
     fn drop(&mut self) {
         unsafe {
diff --git a/src/liballoc/raw_vec/tests.rs b/src/liballoc/raw_vec/tests.rs
index b214cef301..21a8a76d0a 100644
--- a/src/liballoc/raw_vec/tests.rs
+++ b/src/liballoc/raw_vec/tests.rs
@@ -19,8 +19,8 @@ fn allocator_param() {
     struct BoundedAlloc {
         fuel: usize,
     }
-    unsafe impl Alloc for BoundedAlloc {
-        unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
+    unsafe impl AllocRef for BoundedAlloc {
+        fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
             let size = layout.size();
             if size > self.fuel {
                 return Err(AllocErr);
diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs
index b176e0f6e2..9c286298aa 100644
--- a/src/liballoc/rc.rs
+++ b/src/liballoc/rc.rs
@@ -252,7 +252,7 @@ use core::ptr::{self, NonNull};
 use core::slice::{self, from_raw_parts_mut};
 use core::usize;
 
-use crate::alloc::{box_free, handle_alloc_error, Alloc, Global, Layout};
+use crate::alloc::{box_free, handle_alloc_error, AllocRef, Global, Layout};
 use crate::string::String;
 use crate::vec::Vec;
 
@@ -923,7 +923,7 @@ impl<T: ?Sized> Rc<T> {
         let layout = Layout::new::<RcBox<()>>().extend(value_layout).unwrap().0.pad_to_align();
 
         // Allocate for the layout.
-        let mem = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
+        let (mem, _) = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
 
         // Initialize the RcBox
         let inner = mem_to_rcbox(mem.as_ptr());
@@ -1453,7 +1453,7 @@ impl<T> From<Vec<T>> for Rc<[T]> {
     }
 }
 
-#[unstable(feature = "boxed_slice_try_from", issue = "none")]
+#[stable(feature = "boxed_slice_try_from", since = "1.43.0")]
 impl<T, const N: usize> TryFrom<Rc<[T]>> for Rc<[T; N]>
 where
     [T; N]: LengthAtMost32,
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 96f871d889..c95f79472f 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -319,7 +319,7 @@ pub struct String {
 /// assert_eq!(vec![0, 159], value.unwrap_err().into_bytes());
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
-#[derive(Debug)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct FromUtf8Error {
     bytes: Vec<u8>,
     error: Utf8Error,
@@ -407,7 +407,7 @@ impl String {
     ///
     /// assert_eq!(s.capacity(), cap);
     ///
-    /// // ...but this may make the vector reallocate
+    /// // ...but this may make the string reallocate
     /// s.push('a');
     /// ```
     #[inline]
@@ -2106,18 +2106,11 @@ impl ops::DerefMut for String {
     }
 }
 
-/// An error when parsing a `String`.
+/// A type alias for [`Infallible`].
 ///
-/// This `enum` is slightly awkward: it will never actually exist. This error is
-/// part of the type signature of the implementation of [`FromStr`] on
-/// [`String`]. The return type of [`from_str`], requires that an error be
-/// defined, but, given that a [`String`] can always be made into a new
-/// [`String`] without error, this type will never actually be returned. As
-/// such, it is only here to satisfy said signature, and is useless otherwise.
+/// This alias exists for backwards compatibility, and may be eventually deprecated.
 ///
-/// [`FromStr`]: ../../std/str/trait.FromStr.html
-/// [`String`]: struct.String.html
-/// [`from_str`]: ../../std/str/trait.FromStr.html#tymethod.from_str
+/// [`Infallible`]: ../../core/convert/enum.Infallible.html
 #[stable(feature = "str_parse_error", since = "1.5.0")]
 pub type ParseError = core::convert::Infallible;
 
@@ -2125,7 +2118,7 @@ pub type ParseError = core::convert::Infallible;
 impl FromStr for String {
     type Err = core::convert::Infallible;
     #[inline]
-    fn from_str(s: &str) -> Result<String, ParseError> {
+    fn from_str(s: &str) -> Result<String, Self::Err> {
         Ok(String::from(s))
     }
 }
@@ -2208,6 +2201,14 @@ impl AsRef<str> for String {
     }
 }
 
+#[stable(feature = "string_as_mut", since = "1.43.0")]
+impl AsMut<str> for String {
+    #[inline]
+    fn as_mut(&mut self) -> &mut str {
+        self
+    }
+}
+
 #[stable(feature = "rust1", since = "1.0.0")]
 impl AsRef<[u8]> for String {
     #[inline]
diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs
index 4aa0190b14..4a0cf2984e 100644
--- a/src/liballoc/sync.rs
+++ b/src/liballoc/sync.rs
@@ -25,7 +25,7 @@ use core::sync::atomic;
 use core::sync::atomic::Ordering::{Acquire, Relaxed, Release, SeqCst};
 use core::{isize, usize};
 
-use crate::alloc::{box_free, handle_alloc_error, Alloc, Global, Layout};
+use crate::alloc::{box_free, handle_alloc_error, AllocRef, Global, Layout};
 use crate::boxed::Box;
 use crate::rc::is_dangling;
 use crate::string::String;
@@ -784,7 +784,7 @@ impl<T: ?Sized> Arc<T> {
         // reference (see #54908).
         let layout = Layout::new::<ArcInner<()>>().extend(value_layout).unwrap().0.pad_to_align();
 
-        let mem = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
+        let (mem, _) = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
 
         // Initialize the ArcInner
         let inner = mem_to_arcinner(mem.as_ptr());
@@ -2002,7 +2002,7 @@ impl<T> From<Vec<T>> for Arc<[T]> {
     }
 }
 
-#[unstable(feature = "boxed_slice_try_from", issue = "none")]
+#[stable(feature = "boxed_slice_try_from", since = "1.43.0")]
 impl<T, const N: usize> TryFrom<Arc<[T]>> for Arc<[T; N]>
 where
     [T; N]: LengthAtMost32,
diff --git a/src/liballoc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs
index f49ca71392..be5516f54f 100644
--- a/src/liballoc/tests/binary_heap.rs
+++ b/src/liballoc/tests/binary_heap.rs
@@ -1,6 +1,8 @@
 use std::collections::binary_heap::{Drain, PeekMut};
 use std::collections::BinaryHeap;
 use std::iter::TrustedLen;
+use std::panic::{catch_unwind, AssertUnwindSafe};
+use std::sync::atomic::{AtomicU32, Ordering};
 
 #[test]
 fn test_iterator() {
@@ -275,6 +277,37 @@ fn test_drain_sorted() {
     assert!(q.is_empty());
 }
 
+#[test]
+fn test_drain_sorted_leak() {
+    static DROPS: AtomicU32 = AtomicU32::new(0);
+
+    #[derive(Clone, PartialEq, Eq, PartialOrd, Ord)]
+    struct D(u32, bool);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            DROPS.fetch_add(1, Ordering::SeqCst);
+
+            if self.1 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let mut q = BinaryHeap::from(vec![
+        D(0, false),
+        D(1, false),
+        D(2, false),
+        D(3, true),
+        D(4, false),
+        D(5, false),
+    ]);
+
+    catch_unwind(AssertUnwindSafe(|| drop(q.drain_sorted()))).ok();
+
+    assert_eq!(DROPS.load(Ordering::SeqCst), 6);
+}
+
 #[test]
 fn test_extend_ref() {
     let mut a = BinaryHeap::new();
diff --git a/src/liballoc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs
index f5be72c39b..d05eec1934 100644
--- a/src/liballoc/tests/btree/map.rs
+++ b/src/liballoc/tests/btree/map.rs
@@ -5,7 +5,9 @@ use std::fmt::Debug;
 use std::iter::FromIterator;
 use std::ops::Bound::{self, Excluded, Included, Unbounded};
 use std::ops::RangeBounds;
+use std::panic::catch_unwind;
 use std::rc::Rc;
+use std::sync::atomic::{AtomicU32, Ordering};
 
 use super::DeterministicRng;
 
@@ -15,7 +17,7 @@ fn test_basic_large() {
     #[cfg(not(miri))] // Miri is too slow
     let size = 10000;
     #[cfg(miri)]
-    let size = 200;
+    let size = 144; // to obtain height 3 tree (having edges to both kinds of nodes)
     assert_eq!(map.len(), 0);
 
     for i in 0..size {
@@ -23,6 +25,11 @@ fn test_basic_large() {
         assert_eq!(map.len(), i + 1);
     }
 
+    assert_eq!(map.first_key_value(), Some((&0, &0)));
+    assert_eq!(map.last_key_value(), Some((&(size - 1), &(10 * (size - 1)))));
+    assert_eq!(map.first_entry().unwrap().key(), &0);
+    assert_eq!(map.last_entry().unwrap().key(), &(size - 1));
+
     for i in 0..size {
         assert_eq!(map.get(&i).unwrap(), &(i * 10));
     }
@@ -376,8 +383,8 @@ fn test_range_small() {
 }
 
 #[test]
-fn test_range_depth_2() {
-    // Assuming that node.CAPACITY is 11, having 12 pairs implies a depth 2 tree
+fn test_range_height_2() {
+    // Assuming that node.CAPACITY is 11, having 12 pairs implies a height 2 tree
     // with 2 leaves. Depending on details we don't want or need to rely upon,
     // the single key at the root will be 6 or 7.
 
@@ -519,7 +526,7 @@ fn test_range_1000() {
     #[cfg(not(miri))] // Miri is too slow
     let size = 1000;
     #[cfg(miri)]
-    let size = 200;
+    let size = 144; // to obtain height 3 tree (having edges to both kinds of nodes)
     let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
 
     fn test(map: &BTreeMap<u32, u32>, size: u32, min: Bound<&u32>, max: Bound<&u32>) {
@@ -556,14 +563,15 @@ fn test_range_borrowed_key() {
 
 #[test]
 fn test_range() {
-    #[cfg(not(miri))] // Miri is too slow
     let size = 200;
+    #[cfg(not(miri))] // Miri is too slow
+    let step = 1;
     #[cfg(miri)]
-    let size = 30;
+    let step = 66;
     let map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
 
-    for i in 0..size {
-        for j in i..size {
+    for i in (0..size).step_by(step) {
+        for j in (i..size).step_by(step) {
             let mut kvs = map.range((Included(&i), Included(&j))).map(|(&k, &v)| (k, v));
             let mut pairs = (i..=j).map(|i| (i, i));
 
@@ -578,14 +586,15 @@ fn test_range() {
 
 #[test]
 fn test_range_mut() {
-    #[cfg(not(miri))] // Miri is too slow
     let size = 200;
+    #[cfg(not(miri))] // Miri is too slow
+    let step = 1;
     #[cfg(miri)]
-    let size = 30;
+    let step = 66;
     let mut map: BTreeMap<_, _> = (0..size).map(|i| (i, i)).collect();
 
-    for i in 0..size {
-        for j in i..size {
+    for i in (0..size).step_by(step) {
+        for j in (i..size).step_by(step) {
             let mut kvs = map.range_mut((Included(&i), Included(&j))).map(|(&k, &mut v)| (k, v));
             let mut pairs = (i..=j).map(|i| (i, i));
 
@@ -753,10 +762,7 @@ fn test_bad_zst() {
 #[test]
 fn test_clone() {
     let mut map = BTreeMap::new();
-    #[cfg(not(miri))] // Miri is too slow
-    let size = 100;
-    #[cfg(miri)]
-    let size = 30;
+    let size = 12; // to obtain height 2 tree (having edges to leaf nodes)
     assert_eq!(map.len(), 0);
 
     for i in 0..size {
@@ -783,6 +789,38 @@ fn test_clone() {
         assert_eq!(map.len(), size / 2 - i - 1);
         assert_eq!(map, map.clone());
     }
+
+    // Full 2-level and minimal 3-level tree (sizes 143, 144 -- the only ones we clone for).
+    for i in 1..=144 {
+        assert_eq!(map.insert(i, i), None);
+        assert_eq!(map.len(), i);
+        if i >= 143 {
+            assert_eq!(map, map.clone());
+        }
+    }
+}
+
+#[test]
+fn test_clone_from() {
+    let mut map1 = BTreeMap::new();
+    let max_size = 12; // to obtain height 2 tree (having edges to leaf nodes)
+
+    // Range to max_size inclusive, because i is the size of map1 being tested.
+    for i in 0..=max_size {
+        let mut map2 = BTreeMap::new();
+        for j in 0..i {
+            let mut map1_copy = map2.clone();
+            map1_copy.clone_from(&map1); // small cloned from large
+            assert_eq!(map1_copy, map1);
+            let mut map2_copy = map1.clone();
+            map2_copy.clone_from(&map2); // large cloned from small
+            assert_eq!(map2_copy, map2);
+            map2.insert(100 * j + 1, 2 * j + 1);
+        }
+        map2.clone_from(&map1); // same length
+        assert_eq!(map2, map1);
+        map1.insert(i, 10 * i);
+    }
 }
 
 #[test]
@@ -931,6 +969,7 @@ create_append_test!(test_append_145, 145);
 // Tests for several randomly chosen sizes.
 create_append_test!(test_append_170, 170);
 create_append_test!(test_append_181, 181);
+#[cfg(not(miri))] // Miri is too slow
 create_append_test!(test_append_239, 239);
 #[cfg(not(miri))] // Miri is too slow
 create_append_test!(test_append_1700, 1700);
@@ -980,3 +1019,53 @@ fn test_split_off_large_random_sorted() {
     assert!(map.into_iter().eq(data.clone().into_iter().filter(|x| x.0 < key)));
     assert!(right.into_iter().eq(data.into_iter().filter(|x| x.0 >= key)));
 }
+
+#[test]
+fn test_into_iter_drop_leak_1() {
+    static DROPS: AtomicU32 = AtomicU32::new(0);
+
+    struct D;
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            if DROPS.fetch_add(1, Ordering::SeqCst) == 3 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let mut map = BTreeMap::new();
+    map.insert("a", D);
+    map.insert("b", D);
+    map.insert("c", D);
+    map.insert("d", D);
+    map.insert("e", D);
+
+    catch_unwind(move || drop(map.into_iter())).ok();
+
+    assert_eq!(DROPS.load(Ordering::SeqCst), 5);
+}
+
+#[test]
+fn test_into_iter_drop_leak_2() {
+    let size = 12; // to obtain tree with 2 levels (having edges to leaf nodes)
+    static DROPS: AtomicU32 = AtomicU32::new(0);
+    static PANIC_POINT: AtomicU32 = AtomicU32::new(0);
+
+    struct D;
+    impl Drop for D {
+        fn drop(&mut self) {
+            if DROPS.fetch_add(1, Ordering::SeqCst) == PANIC_POINT.load(Ordering::SeqCst) {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    for panic_point in vec![0, 1, size - 2, size - 1] {
+        DROPS.store(0, Ordering::SeqCst);
+        PANIC_POINT.store(panic_point, Ordering::SeqCst);
+        let map: BTreeMap<_, _> = (0..size).map(|i| (i, D)).collect();
+        catch_unwind(move || drop(map.into_iter())).ok();
+        assert_eq!(DROPS.load(Ordering::SeqCst), size);
+    }
+}
diff --git a/src/liballoc/tests/btree/set.rs b/src/liballoc/tests/btree/set.rs
index 265ef758cc..1a2b62d026 100644
--- a/src/liballoc/tests/btree/set.rs
+++ b/src/liballoc/tests/btree/set.rs
@@ -487,21 +487,26 @@ fn test_first_last() {
     a.insert(2);
     assert_eq!(a.first(), Some(&1));
     assert_eq!(a.last(), Some(&2));
-    a.insert(3);
+    for i in 3..=12 {
+        a.insert(i);
+    }
     assert_eq!(a.first(), Some(&1));
-    assert_eq!(a.last(), Some(&3));
-
-    assert_eq!(a.len(), 3);
+    assert_eq!(a.last(), Some(&12));
     assert_eq!(a.pop_first(), Some(1));
-    assert_eq!(a.len(), 2);
-    assert_eq!(a.pop_last(), Some(3));
-    assert_eq!(a.len(), 1);
+    assert_eq!(a.pop_last(), Some(12));
     assert_eq!(a.pop_first(), Some(2));
-    assert_eq!(a.len(), 0);
-    assert_eq!(a.pop_last(), None);
-    assert_eq!(a.len(), 0);
+    assert_eq!(a.pop_last(), Some(11));
+    assert_eq!(a.pop_first(), Some(3));
+    assert_eq!(a.pop_last(), Some(10));
+    assert_eq!(a.pop_first(), Some(4));
+    assert_eq!(a.pop_first(), Some(5));
+    assert_eq!(a.pop_first(), Some(6));
+    assert_eq!(a.pop_first(), Some(7));
+    assert_eq!(a.pop_first(), Some(8));
+    assert_eq!(a.clone().pop_last(), Some(9));
+    assert_eq!(a.pop_first(), Some(9));
     assert_eq!(a.pop_first(), None);
-    assert_eq!(a.len(), 0);
+    assert_eq!(a.pop_last(), None);
 }
 
 fn rand_data(len: usize) -> Vec<u32> {
diff --git a/src/liballoc/tests/heap.rs b/src/liballoc/tests/heap.rs
index 43cd718782..d159126f42 100644
--- a/src/liballoc/tests/heap.rs
+++ b/src/liballoc/tests/heap.rs
@@ -1,4 +1,4 @@
-use std::alloc::{Alloc, Global, Layout, System};
+use std::alloc::{AllocRef, Global, Layout, System};
 
 /// Issue #45955 and #62251.
 #[test]
@@ -11,7 +11,7 @@ fn std_heap_overaligned_request() {
     check_overalign_requests(Global)
 }
 
-fn check_overalign_requests<T: Alloc>(mut allocator: T) {
+fn check_overalign_requests<T: AllocRef>(mut allocator: T) {
     for &align in &[4, 8, 16, 32] {
         // less than and bigger than `MIN_ALIGN`
         for &size in &[align / 2, align - 1] {
@@ -20,7 +20,7 @@ fn check_overalign_requests<T: Alloc>(mut allocator: T) {
             unsafe {
                 let pointers: Vec<_> = (0..iterations)
                     .map(|_| {
-                        allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap()
+                        allocator.alloc(Layout::from_size_align(size, align).unwrap()).unwrap().0
                     })
                     .collect();
                 for &ptr in &pointers {
diff --git a/src/liballoc/tests/lib.rs b/src/liballoc/tests/lib.rs
index c1ae67a1a3..ea75f8903c 100644
--- a/src/liballoc/tests/lib.rs
+++ b/src/liballoc/tests/lib.rs
@@ -12,6 +12,7 @@
 #![feature(binary_heap_into_iter_sorted)]
 #![feature(binary_heap_drain_sorted)]
 #![feature(vec_remove_item)]
+#![feature(split_inclusive)]
 
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};
diff --git a/src/liballoc/tests/linked_list.rs b/src/liballoc/tests/linked_list.rs
index b7736515b2..afcb9e03fd 100644
--- a/src/liballoc/tests/linked_list.rs
+++ b/src/liballoc/tests/linked_list.rs
@@ -1,5 +1,5 @@
 use std::collections::LinkedList;
-use std::panic::catch_unwind;
+use std::panic::{catch_unwind, AssertUnwindSafe};
 
 #[test]
 fn test_basic() {
@@ -531,6 +531,74 @@ fn drain_filter_complex() {
     }
 }
 
+#[test]
+fn drain_filter_drop_panic_leak() {
+    static mut DROPS: i32 = 0;
+
+    struct D(bool);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            unsafe {
+                DROPS += 1;
+            }
+
+            if self.0 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let mut q = LinkedList::new();
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_front(D(false));
+    q.push_front(D(true));
+    q.push_front(D(false));
+
+    catch_unwind(AssertUnwindSafe(|| drop(q.drain_filter(|_| true)))).ok();
+
+    assert_eq!(unsafe { DROPS }, 8);
+    assert!(q.is_empty());
+}
+
+#[test]
+fn drain_filter_pred_panic_leak() {
+    static mut DROPS: i32 = 0;
+
+    #[derive(Debug)]
+    struct D(u32);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            unsafe {
+                DROPS += 1;
+            }
+        }
+    }
+
+    let mut q = LinkedList::new();
+    q.push_back(D(3));
+    q.push_back(D(4));
+    q.push_back(D(5));
+    q.push_back(D(6));
+    q.push_back(D(7));
+    q.push_front(D(2));
+    q.push_front(D(1));
+    q.push_front(D(0));
+
+    catch_unwind(AssertUnwindSafe(|| {
+        drop(q.drain_filter(|item| if item.0 >= 2 { panic!() } else { true }))
+    }))
+    .ok();
+
+    assert_eq!(unsafe { DROPS }, 2); // 0 and 1
+    assert_eq!(q.len(), 6);
+}
+
 #[test]
 fn test_drop() {
     static mut DROPS: i32 = 0;
diff --git a/src/liballoc/tests/slice.rs b/src/liballoc/tests/slice.rs
index 51ddb5e7a4..8e49e6d8eb 100644
--- a/src/liballoc/tests/slice.rs
+++ b/src/liballoc/tests/slice.rs
@@ -851,6 +851,86 @@ fn test_splitator() {
     assert_eq!(xs.split(|x| *x == 5).collect::<Vec<&[i32]>>(), splits);
 }
 
+#[test]
+fn test_splitator_inclusive() {
+    let xs = &[1, 2, 3, 4, 5];
+
+    let splits: &[&[_]] = &[&[1, 2], &[3, 4], &[5]];
+    assert_eq!(xs.split_inclusive(|x| *x % 2 == 0).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1], &[2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive(|x| *x == 1).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive(|x| *x == 5).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive(|x| *x == 10).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1], &[2], &[3], &[4], &[5]];
+    assert_eq!(xs.split_inclusive(|_| true).collect::<Vec<&[i32]>>(), splits);
+
+    let xs: &[i32] = &[];
+    let splits: &[&[i32]] = &[&[]];
+    assert_eq!(xs.split_inclusive(|x| *x == 5).collect::<Vec<&[i32]>>(), splits);
+}
+
+#[test]
+fn test_splitator_inclusive_reverse() {
+    let xs = &[1, 2, 3, 4, 5];
+
+    let splits: &[&[_]] = &[&[5], &[3, 4], &[1, 2]];
+    assert_eq!(xs.split_inclusive(|x| *x % 2 == 0).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[2, 3, 4, 5], &[1]];
+    assert_eq!(xs.split_inclusive(|x| *x == 1).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive(|x| *x == 5).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive(|x| *x == 10).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[5], &[4], &[3], &[2], &[1]];
+    assert_eq!(xs.split_inclusive(|_| true).rev().collect::<Vec<_>>(), splits);
+
+    let xs: &[i32] = &[];
+    let splits: &[&[i32]] = &[&[]];
+    assert_eq!(xs.split_inclusive(|x| *x == 5).rev().collect::<Vec<_>>(), splits);
+}
+
+#[test]
+fn test_splitator_mut_inclusive() {
+    let xs = &mut [1, 2, 3, 4, 5];
+
+    let splits: &[&[_]] = &[&[1, 2], &[3, 4], &[5]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x % 2 == 0).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1], &[2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 1).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 5).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 10).collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1], &[2], &[3], &[4], &[5]];
+    assert_eq!(xs.split_inclusive_mut(|_| true).collect::<Vec<_>>(), splits);
+
+    let xs: &mut [i32] = &mut [];
+    let splits: &[&[i32]] = &[&[]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 5).collect::<Vec<_>>(), splits);
+}
+
+#[test]
+fn test_splitator_mut_inclusive_reverse() {
+    let xs = &mut [1, 2, 3, 4, 5];
+
+    let splits: &[&[_]] = &[&[5], &[3, 4], &[1, 2]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x % 2 == 0).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[2, 3, 4, 5], &[1]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 1).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 5).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[1, 2, 3, 4, 5]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 10).rev().collect::<Vec<_>>(), splits);
+    let splits: &[&[_]] = &[&[5], &[4], &[3], &[2], &[1]];
+    assert_eq!(xs.split_inclusive_mut(|_| true).rev().collect::<Vec<_>>(), splits);
+
+    let xs: &mut [i32] = &mut [];
+    let splits: &[&[i32]] = &[&[]];
+    assert_eq!(xs.split_inclusive_mut(|x| *x == 5).rev().collect::<Vec<_>>(), splits);
+}
+
 #[test]
 fn test_splitnator() {
     let xs = &[1, 2, 3, 4, 5];
@@ -1653,9 +1733,9 @@ fn panic_safe() {
     let moduli = &[5, 20, 50];
 
     #[cfg(miri)]
-    let lens = 1..13;
+    let lens = 1..10;
     #[cfg(miri)]
-    let moduli = &[10];
+    let moduli = &[5];
 
     for len in lens {
         for &modulus in moduli {
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs
index d3c7261569..b703df6f3c 100644
--- a/src/liballoc/tests/str.rs
+++ b/src/liballoc/tests/str.rs
@@ -1247,6 +1247,49 @@ fn test_split_char_iterator_no_trailing() {
     assert_eq!(split, ["", "Märy häd ä little lämb", "Little lämb"]);
 }
 
+#[test]
+fn test_split_char_iterator_inclusive() {
+    let data = "\nMäry häd ä little lämb\nLittle lämb\n";
+
+    let split: Vec<&str> = data.split_inclusive('\n').collect();
+    assert_eq!(split, ["\n", "Märy häd ä little lämb\n", "Little lämb\n"]);
+
+    let uppercase_separated = "SheePSharKTurtlECaT";
+    let mut first_char = true;
+    let split: Vec<&str> = uppercase_separated
+        .split_inclusive(|c: char| {
+            let split = !first_char && c.is_uppercase();
+            first_char = split;
+            split
+        })
+        .collect();
+    assert_eq!(split, ["SheeP", "SharK", "TurtlE", "CaT"]);
+}
+
+#[test]
+fn test_split_char_iterator_inclusive_rev() {
+    let data = "\nMäry häd ä little lämb\nLittle lämb\n";
+
+    let split: Vec<&str> = data.split_inclusive('\n').rev().collect();
+    assert_eq!(split, ["Little lämb\n", "Märy häd ä little lämb\n", "\n"]);
+
+    // Note that the predicate is stateful and thus dependent
+    // on the iteration order.
+    // (A different predicate is needed for reverse iterator vs normal iterator.)
+    // Not sure if anything can be done though.
+    let uppercase_separated = "SheePSharKTurtlECaT";
+    let mut term_char = true;
+    let split: Vec<&str> = uppercase_separated
+        .split_inclusive(|c: char| {
+            let split = term_char && c.is_uppercase();
+            term_char = c.is_uppercase();
+            split
+        })
+        .rev()
+        .collect();
+    assert_eq!(split, ["CaT", "TurtlE", "SharK", "SheeP"]);
+}
+
 #[test]
 fn test_rsplit() {
     let data = "\nMäry häd ä little lämb\nLittle lämb\n";
diff --git a/src/liballoc/tests/string.rs b/src/liballoc/tests/string.rs
index dd44495845..08859b2b24 100644
--- a/src/liballoc/tests/string.rs
+++ b/src/liballoc/tests/string.rs
@@ -50,7 +50,11 @@ fn test_from_utf8() {
 
     let xs = b"hello\xFF".to_vec();
     let err = String::from_utf8(xs).unwrap_err();
+    assert_eq!(err.as_bytes(), b"hello\xff");
+    let err_clone = err.clone();
+    assert_eq!(err, err_clone);
     assert_eq!(err.into_bytes(), b"hello\xff".to_vec());
+    assert_eq!(err_clone.utf8_error().valid_up_to(), 5);
 }
 
 #[test]
diff --git a/src/liballoc/tests/vec.rs b/src/liballoc/tests/vec.rs
index 2a9bfefc71..9c4ac52aca 100644
--- a/src/liballoc/tests/vec.rs
+++ b/src/liballoc/tests/vec.rs
@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 use std::collections::TryReserveError::*;
 use std::mem::size_of;
+use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::vec::{Drain, IntoIter};
 use std::{isize, usize};
 
@@ -585,6 +586,44 @@ fn test_drain_inclusive_out_of_bounds() {
     v.drain(5..=5);
 }
 
+#[test]
+fn test_drain_leak() {
+    static mut DROPS: i32 = 0;
+
+    #[derive(Debug, PartialEq)]
+    struct D(u32, bool);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            unsafe {
+                DROPS += 1;
+            }
+
+            if self.1 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let mut v = vec![
+        D(0, false),
+        D(1, false),
+        D(2, false),
+        D(3, false),
+        D(4, true),
+        D(5, false),
+        D(6, false),
+    ];
+
+    catch_unwind(AssertUnwindSafe(|| {
+        v.drain(2..=5);
+    }))
+    .ok();
+
+    assert_eq!(unsafe { DROPS }, 4);
+    assert_eq!(v, vec![D(0, false), D(1, false), D(6, false),]);
+}
+
 #[test]
 fn test_splice() {
     let mut v = vec![1, 2, 3, 4, 5];
@@ -726,6 +765,31 @@ fn test_into_iter_clone() {
     assert_eq!(it.next(), None);
 }
 
+#[test]
+fn test_into_iter_leak() {
+    static mut DROPS: i32 = 0;
+
+    struct D(bool);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            unsafe {
+                DROPS += 1;
+            }
+
+            if self.0 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let v = vec![D(false), D(true), D(false)];
+
+    catch_unwind(move || drop(v.into_iter())).ok();
+
+    assert_eq!(unsafe { DROPS }, 3);
+}
+
 #[test]
 fn test_cow_from() {
     let borrowed: &[_] = &["borrowed", "(slice)"];
diff --git a/src/liballoc/tests/vec_deque.rs b/src/liballoc/tests/vec_deque.rs
index 1ab3694a3c..101dd67d97 100644
--- a/src/liballoc/tests/vec_deque.rs
+++ b/src/liballoc/tests/vec_deque.rs
@@ -2,7 +2,7 @@ use std::collections::TryReserveError::*;
 use std::collections::{vec_deque::Drain, VecDeque};
 use std::fmt::Debug;
 use std::mem::size_of;
-use std::panic::catch_unwind;
+use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::{isize, usize};
 
 use crate::hash;
@@ -1573,3 +1573,75 @@ fn test_try_rfold_moves_iter() {
     assert_eq!(iter.try_rfold(0_i8, |acc, &x| acc.checked_add(x)), None);
     assert_eq!(iter.next_back(), Some(&70));
 }
+
+#[test]
+fn truncate_leak() {
+    static mut DROPS: i32 = 0;
+
+    struct D(bool);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            unsafe {
+                DROPS += 1;
+            }
+
+            if self.0 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let mut q = VecDeque::new();
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_back(D(false));
+    q.push_front(D(true));
+    q.push_front(D(false));
+    q.push_front(D(false));
+
+    catch_unwind(AssertUnwindSafe(|| q.truncate(1))).ok();
+
+    assert_eq!(unsafe { DROPS }, 7);
+}
+
+#[test]
+fn test_drain_leak() {
+    static mut DROPS: i32 = 0;
+
+    #[derive(Debug, PartialEq)]
+    struct D(u32, bool);
+
+    impl Drop for D {
+        fn drop(&mut self) {
+            unsafe {
+                DROPS += 1;
+            }
+
+            if self.1 {
+                panic!("panic in `drop`");
+            }
+        }
+    }
+
+    let mut v = VecDeque::new();
+    v.push_back(D(4, false));
+    v.push_back(D(5, false));
+    v.push_back(D(6, false));
+    v.push_front(D(3, false));
+    v.push_front(D(2, true));
+    v.push_front(D(1, false));
+    v.push_front(D(0, false));
+
+    catch_unwind(AssertUnwindSafe(|| {
+        v.drain(1..=4);
+    }))
+    .ok();
+
+    assert_eq!(unsafe { DROPS }, 4);
+    assert_eq!(v.len(), 3);
+    drop(v);
+    assert_eq!(unsafe { DROPS }, 7);
+}
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index e9cbf62784..f661b83042 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -4,6 +4,8 @@
 //! Vectors have `O(1)` indexing, amortized `O(1)` push (to the end) and
 //! `O(1)` pop (from the end).
 //!
+//! Vectors ensure they never allocate more than `isize::MAX` bytes.
+//!
 //! # Examples
 //!
 //! You can explicitly create a [`Vec<T>`] with [`new`]:
@@ -176,7 +178,7 @@ use crate::raw_vec::RawVec;
 /// ```
 ///
 /// In Rust, it's more common to pass slices as arguments rather than vectors
-/// when you just want to provide a read access. The same goes for [`String`] and
+/// when you just want to provide read access. The same goes for [`String`] and
 /// [`&str`].
 ///
 /// # Capacity and reallocation
@@ -315,7 +317,7 @@ impl<T> Vec<T> {
     /// let mut vec: Vec<i32> = Vec::new();
     /// ```
     #[inline]
-    #[rustc_const_stable(feature = "const_vec_new", since = "1.32.0")]
+    #[rustc_const_stable(feature = "const_vec_new", since = "1.39.0")]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub const fn new() -> Vec<T> {
         Vec { buf: RawVec::NEW, len: 0 }
@@ -402,7 +404,10 @@ impl<T> Vec<T> {
     ///
     /// * `ptr` needs to have been previously allocated via [`String`]/`Vec<T>`
     ///   (at least, it's highly likely to be incorrect if it wasn't).
-    /// * `ptr`'s `T` needs to have the same size and alignment as it was allocated with.
+    /// * `T` needs to have the same size and alignment as what `ptr` was allocated with.
+    ///   (`T` having a less strict alignment is not sufficient, the alignment really
+    ///   needs to be equal to satsify the [`dealloc`] requirement that memory must be
+    ///   allocated and deallocated with the same layout.)
     /// * `length` needs to be less than or equal to `capacity`.
     /// * `capacity` needs to be the capacity that the pointer was allocated with.
     ///
@@ -421,6 +426,7 @@ impl<T> Vec<T> {
     /// function.
     ///
     /// [`String`]: ../../std/string/struct.String.html
+    /// [`dealloc`]: ../../alloc/alloc/trait.GlobalAlloc.html#tymethod.dealloc
     ///
     /// # Examples
     ///
@@ -1470,8 +1476,9 @@ impl<T: Clone> Vec<T> {
     /// difference, with each additional slot filled with `value`.
     /// If `new_len` is less than `len`, the `Vec` is simply truncated.
     ///
-    /// This method requires [`Clone`] to be able clone the passed value. If
-    /// you need more flexibility (or want to rely on [`Default`] instead of
+    /// This method requires `T` to implement [`Clone`],
+    /// in order to be able to clone the passed value.
+    /// If you need more flexibility (or want to rely on [`Default`] instead of
     /// [`Clone`]), use [`resize_with`].
     ///
     /// # Examples
@@ -1652,7 +1659,7 @@ struct SetLenOnDrop<'a> {
 impl<'a> SetLenOnDrop<'a> {
     #[inline]
     fn new(len: &'a mut usize) -> Self {
-        SetLenOnDrop { local_len: *len, len: len }
+        SetLenOnDrop { local_len: *len, len }
     }
 
     #[inline]
@@ -2620,7 +2627,9 @@ impl<T: Clone> Clone for IntoIter<T> {
 unsafe impl<#[may_dangle] T> Drop for IntoIter<T> {
     fn drop(&mut self) {
         // destroy the remaining elements
-        for _x in self.by_ref() {}
+        unsafe {
+            ptr::drop_in_place(self.as_mut_slice());
+        }
 
         // RawVec handles deallocation
         let _ = unsafe { RawVec::from_raw_parts(self.buf.as_ptr(), self.cap) };
@@ -2700,23 +2709,42 @@ impl<T> DoubleEndedIterator for Drain<'_, T> {
 #[stable(feature = "drain", since = "1.6.0")]
 impl<T> Drop for Drain<'_, T> {
     fn drop(&mut self) {
-        // exhaust self first
-        self.for_each(drop);
+        /// Continues dropping the remaining elements in the `Drain`, then moves back the
+        /// un-`Drain`ed elements to restore the original `Vec`.
+        struct DropGuard<'r, 'a, T>(&'r mut Drain<'a, T>);
 
-        if self.tail_len > 0 {
-            unsafe {
-                let source_vec = self.vec.as_mut();
-                // memmove back untouched tail, update to new length
-                let start = source_vec.len();
-                let tail = self.tail_start;
-                if tail != start {
-                    let src = source_vec.as_ptr().add(tail);
-                    let dst = source_vec.as_mut_ptr().add(start);
-                    ptr::copy(src, dst, self.tail_len);
+        impl<'r, 'a, T> Drop for DropGuard<'r, 'a, T> {
+            fn drop(&mut self) {
+                // Continue the same loop we have below. If the loop already finished, this does
+                // nothing.
+                self.0.for_each(drop);
+
+                if self.0.tail_len > 0 {
+                    unsafe {
+                        let source_vec = self.0.vec.as_mut();
+                        // memmove back untouched tail, update to new length
+                        let start = source_vec.len();
+                        let tail = self.0.tail_start;
+                        if tail != start {
+                            let src = source_vec.as_ptr().add(tail);
+                            let dst = source_vec.as_mut_ptr().add(start);
+                            ptr::copy(src, dst, self.0.tail_len);
+                        }
+                        source_vec.set_len(start + self.0.tail_len);
+                    }
                 }
-                source_vec.set_len(start + self.tail_len);
             }
         }
+
+        // exhaust self first
+        while let Some(item) = self.next() {
+            let guard = DropGuard(self);
+            drop(item);
+            mem::forget(guard);
+        }
+
+        // Drop a `DropGuard` to move back the non-drained tail of `self`.
+        DropGuard(self);
     }
 }
 
@@ -2866,7 +2894,7 @@ where
     /// The filter test predicate.
     pred: F,
     /// A flag that indicates a panic has occurred in the filter test prodicate.
-    /// This is used as a hint in the drop implmentation to prevent consumption
+    /// This is used as a hint in the drop implementation to prevent consumption
     /// of the remainder of the `DrainFilter`. Any unprocessed items will be
     /// backshifted in the `vec`, but no further items will be dropped or
     /// tested by the filter predicate.
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index 2050f64512..d2a513451c 100644
--- a/src/libcore/alloc.rs
+++ b/src/libcore/alloc.rs
@@ -11,12 +11,6 @@ use crate::num::NonZeroUsize;
 use crate::ptr::{self, NonNull};
 use crate::usize;
 
-/// Represents the combination of a starting address and
-/// a total capacity of the returned block.
-#[unstable(feature = "allocator_api", issue = "32838")]
-#[derive(Debug)]
-pub struct Excess(pub NonNull<u8>, pub usize);
-
 const fn size_align<T>() -> (usize, usize) {
     (mem::size_of::<T>(), mem::align_of::<T>())
 }
@@ -31,7 +25,7 @@ const fn size_align<T>() -> (usize, usize) {
 ///
 /// (Note however that layouts are *not* required to have positive
 /// size, even though many allocators require that all memory
-/// requests have positive size. A caller to the `Alloc::alloc`
+/// requests have positive size. A caller to the `AllocRef::alloc`
 /// method must either ensure that conditions like this are met, or
 /// use specific allocators with looser requirements.)
 #[stable(feature = "alloc_layout", since = "1.28.0")]
@@ -146,6 +140,18 @@ impl Layout {
         unsafe { Layout::from_size_align_unchecked(size, align) }
     }
 
+    /// Creates a `NonNull` that is dangling, but well-aligned for this Layout.
+    ///
+    /// Note that the pointer value may potentially represent a valid pointer,
+    /// which means this must not be used as a "not yet initialized"
+    /// sentinel value. Types that lazily allocate must track initialization by
+    /// some other means.
+    #[unstable(feature = "alloc_layout_extra", issue = "55724")]
+    pub const fn dangling(&self) -> NonNull<u8> {
+        // align is non-zero and a power of two
+        unsafe { NonNull::new_unchecked(self.align() as *mut u8) }
+    }
+
     /// Creates a layout describing the record that can hold a value
     /// of the same layout as `self`, but that also is aligned to
     /// alignment `align` (measured in bytes).
@@ -241,13 +247,11 @@ impl Layout {
     #[unstable(feature = "alloc_layout_extra", issue = "55724")]
     #[inline]
     pub fn repeat(&self, n: usize) -> Result<(Self, usize), LayoutErr> {
-        // Warning, removing the checked_add here led to segfaults in #67174. Further
-        // analysis in #69225 seems to indicate that this is an LTO-related
-        // miscompilation, so #67174 might be able to be reapplied in the future.
-        let padded_size = self
-            .size()
-            .checked_add(self.padding_needed_for(self.align()))
-            .ok_or(LayoutErr { private: () })?;
+        // This cannot overflow. Quoting from the invariant of Layout:
+        // > `size`, when rounded up to the nearest multiple of `align`,
+        // > must not overflow (i.e., the rounded value must be less than
+        // > `usize::MAX`)
+        let padded_size = self.size() + self.padding_needed_for(self.align());
         let alloc_size = padded_size.checked_mul(n).ok_or(LayoutErr { private: () })?;
 
         unsafe {
@@ -366,8 +370,8 @@ impl fmt::Display for AllocErr {
 /// [`shrink_in_place`] were unable to reuse the given memory block for
 /// a requested layout.
 ///
-/// [`grow_in_place`]: ./trait.Alloc.html#method.grow_in_place
-/// [`shrink_in_place`]: ./trait.Alloc.html#method.shrink_in_place
+/// [`grow_in_place`]: ./trait.AllocRef.html#method.grow_in_place
+/// [`shrink_in_place`]: ./trait.AllocRef.html#method.shrink_in_place
 #[unstable(feature = "allocator_api", issue = "32838")]
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub struct CannotReallocInPlace;
@@ -582,42 +586,31 @@ pub unsafe trait GlobalAlloc {
     }
 }
 
-/// An implementation of `Alloc` can allocate, reallocate, and
+/// An implementation of `AllocRef` can allocate, reallocate, and
 /// deallocate arbitrary blocks of data described via `Layout`.
 ///
+/// `AllocRef` is designed to be implemented on ZSTs, references, or
+/// smart pointers because having an allocator like `MyAlloc([u8; N])`
+/// cannot be moved, without updating the pointers to the allocated
+/// memory.
+///
 /// Some of the methods require that a memory block be *currently
 /// allocated* via an allocator. This means that:
 ///
 /// * the starting address for that memory block was previously
 ///   returned by a previous call to an allocation method (`alloc`,
-///   `alloc_zeroed`, `alloc_excess`, `alloc_one`, `alloc_array`) or
-///   reallocation method (`realloc`, `realloc_excess`, or
-///   `realloc_array`), and
+///   `alloc_zeroed`) or reallocation method (`realloc`), and
 ///
 /// * the memory block has not been subsequently deallocated, where
 ///   blocks are deallocated either by being passed to a deallocation
-///   method (`dealloc`, `dealloc_one`, `dealloc_array`) or by being
-///   passed to a reallocation method (see above) that returns `Ok`.
-///
-/// A note regarding zero-sized types and zero-sized layouts: many
-/// methods in the `Alloc` trait state that allocation requests
-/// must be non-zero size, or else undefined behavior can result.
-///
-/// * However, some higher-level allocation methods (`alloc_one`,
-///   `alloc_array`) are well-defined on zero-sized types and can
-///   optionally support them: it is left up to the implementor
-///   whether to return `Err`, or to return `Ok` with some pointer.
-///
-/// * If an `Alloc` implementation chooses to return `Ok` in this
-///   case (i.e., the pointer denotes a zero-sized inaccessible block)
-///   then that returned pointer must be considered "currently
-///   allocated". On such an allocator, *all* methods that take
-///   currently-allocated pointers as inputs must accept these
-///   zero-sized pointers, *without* causing undefined behavior.
+///   method (`dealloc`) or by being passed to a reallocation method
+///  (see above) that returns `Ok`.
 ///
-/// * In other words, if a zero-sized pointer can flow out of an
-///   allocator, then that allocator must likewise accept that pointer
-///   flowing back into its deallocation and reallocation methods.
+/// Unlike [`GlobalAlloc`], zero-sized allocations are allowed in
+/// `AllocRef`. If an underlying allocator does not support this (like
+/// jemalloc) or return a null pointer (such as `libc::malloc`), this case
+/// must be caught. In this case [`Layout::dangling()`] can be used to
+/// create a dangling, but aligned `NonNull<u8>`.
 ///
 /// Some of the methods require that a layout *fit* a memory block.
 /// What it means for a layout to "fit" a memory block means (or
@@ -628,11 +621,9 @@ pub unsafe trait GlobalAlloc {
 ///
 /// 2. The block's size must fall in the range `[use_min, use_max]`, where:
 ///
-///    * `use_min` is `self.usable_size(layout).0`, and
+///    * `use_min` is `layout.size()`, and
 ///
-///    * `use_max` is the capacity that was (or would have been)
-///      returned when (if) the block was allocated via a call to
-///      `alloc_excess` or `realloc_excess`.
+///    * `use_max` is the capacity that was returned.
 ///
 /// Note that:
 ///
@@ -646,15 +637,24 @@ pub unsafe trait GlobalAlloc {
 ///    currently allocated via an allocator `a`, then it is legal to
 ///    use that layout to deallocate it, i.e., `a.dealloc(ptr, k);`.
 ///
+///  * if an allocator does not support overallocating, it is fine to
+///    simply return `layout.size()` as the allocated size.
+///
+/// [`GlobalAlloc`]: self::GlobalAlloc
+/// [`Layout::dangling()`]: self::Layout::dangling
+///
 /// # Safety
 ///
-/// The `Alloc` trait is an `unsafe` trait for a number of reasons, and
+/// The `AllocRef` trait is an `unsafe` trait for a number of reasons, and
 /// implementors must ensure that they adhere to these contracts:
 ///
 /// * Pointers returned from allocation functions must point to valid memory and
-///   retain their validity until at least the instance of `Alloc` is dropped
+///   retain their validity until at least one instance of `AllocRef` is dropped
 ///   itself.
 ///
+/// * Cloning or moving the allocator must not invalidate pointers returned
+///   from this allocator. Cloning must return a reference to the same allocator.
+///
 /// * `Layout` queries and calculations in general must be correct. Callers of
 ///   this trait are allowed to rely on the contracts defined on each method,
 ///   and implementors must ensure such contracts remain true.
@@ -662,17 +662,10 @@ pub unsafe trait GlobalAlloc {
 /// Note that this list may get tweaked over time as clarifications are made in
 /// the future.
 #[unstable(feature = "allocator_api", issue = "32838")]
-pub unsafe trait Alloc {
-    // (Note: some existing allocators have unspecified but well-defined
-    // behavior in response to a zero size allocation request ;
-    // e.g., in C, `malloc` of 0 will either return a null pointer or a
-    // unique pointer, but will not have arbitrary undefined
-    // behavior.
-    // However in jemalloc for example,
-    // `mallocx(0)` is documented as undefined behavior.)
-
-    /// Returns a pointer meeting the size and alignment guarantees of
-    /// `layout`.
+pub unsafe trait AllocRef {
+    /// On success, returns a pointer meeting the size and alignment
+    /// guarantees of `layout` and the actual size of the allocated block,
+    /// which must be greater than or equal to `layout.size()`.
     ///
     /// If this method returns an `Ok(addr)`, then the `addr` returned
     /// will be non-null address pointing to a block of storage
@@ -683,15 +676,6 @@ pub unsafe trait Alloc {
     /// behavior, e.g., to ensure initialization to particular sets of
     /// bit patterns.)
     ///
-    /// # Safety
-    ///
-    /// This function is unsafe because undefined behavior can result
-    /// if the caller does not ensure that `layout` has non-zero size.
-    ///
-    /// (Extension subtraits might provide more specific bounds on
-    /// behavior, e.g., guarantee a sentinel address or a null pointer
-    /// in response to a zero-size allocation request.)
-    ///
     /// # Errors
     ///
     /// Returning `Err` indicates that either memory is exhausted or
@@ -709,7 +693,7 @@ pub unsafe trait Alloc {
     /// rather than directly invoking `panic!` or similar.
     ///
     /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr>;
+    fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr>;
 
     /// Deallocate the memory referenced by `ptr`.
     ///
@@ -728,48 +712,38 @@ pub unsafe trait Alloc {
     ///   to allocate that block of memory.
     unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout);
 
-    // == ALLOCATOR-SPECIFIC QUANTITIES AND LIMITS ==
-    // usable_size
-
-    /// Returns bounds on the guaranteed usable size of a successful
-    /// allocation created with the specified `layout`.
-    ///
-    /// In particular, if one has a memory block allocated via a given
-    /// allocator `a` and layout `k` where `a.usable_size(k)` returns
-    /// `(l, u)`, then one can pass that block to `a.dealloc()` with a
-    /// layout in the size range [l, u].
-    ///
-    /// (All implementors of `usable_size` must ensure that
-    /// `l <= k.size() <= u`)
-    ///
-    /// Both the lower- and upper-bounds (`l` and `u` respectively)
-    /// are provided, because an allocator based on size classes could
-    /// misbehave if one attempts to deallocate a block without
-    /// providing a correct value for its size (i.e., one within the
-    /// range `[l, u]`).
-    ///
-    /// Clients who wish to make use of excess capacity are encouraged
-    /// to use the `alloc_excess` and `realloc_excess` instead, as
-    /// this method is constrained to report conservative values that
-    /// serve as valid bounds for *all possible* allocation method
-    /// calls.
-    ///
-    /// However, for clients that do not wish to track the capacity
-    /// returned by `alloc_excess` locally, this method is likely to
-    /// produce useful results.
-    #[inline]
-    fn usable_size(&self, layout: &Layout) -> (usize, usize) {
-        (layout.size(), layout.size())
+    /// Behaves like `alloc`, but also ensures that the contents
+    /// are set to zero before being returned.
+    ///
+    /// # Errors
+    ///
+    /// Returning `Err` indicates that either memory is exhausted or
+    /// `layout` does not meet allocator's size or alignment
+    /// constraints, just as in `alloc`.
+    ///
+    /// Clients wishing to abort computation in response to an
+    /// allocation error are encouraged to call the [`handle_alloc_error`] function,
+    /// rather than directly invoking `panic!` or similar.
+    ///
+    /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
+    fn alloc_zeroed(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
+        let size = layout.size();
+        let result = self.alloc(layout);
+        if let Ok((p, _)) = result {
+            unsafe { ptr::write_bytes(p.as_ptr(), 0, size) }
+        }
+        result
     }
 
     // == METHODS FOR MEMORY REUSE ==
-    // realloc. alloc_excess, realloc_excess
+    // realloc, realloc_zeroed, grow_in_place, grow_in_place_zeroed, shrink_in_place
 
     /// Returns a pointer suitable for holding data described by
     /// a new layout with `layout`’s alignment and a size given
-    /// by `new_size`. To
-    /// accomplish this, this may extend or shrink the allocation
-    /// referenced by `ptr` to fit the new layout.
+    /// by `new_size` and the actual size of the allocated block.
+    /// The latter is greater than or equal to `layout.size()`.
+    /// To accomplish this, the allocator may extend or shrink
+    /// the allocation referenced by `ptr` to fit the new layout.
     ///
     /// If this returns `Ok`, then ownership of the memory block
     /// referenced by `ptr` has been transferred to this
@@ -792,8 +766,6 @@ pub unsafe trait Alloc {
     /// * `layout` must *fit* the `ptr` (see above). (The `new_size`
     ///   argument need not fit it.)
     ///
-    /// * `new_size` must be greater than zero.
-    ///
     /// * `new_size`, when rounded up to the nearest multiple of `layout.align()`,
     ///   must not overflow (i.e., the rounded value must be less than `usize::MAX`).
     ///
@@ -824,108 +796,84 @@ pub unsafe trait Alloc {
         ptr: NonNull<u8>,
         layout: Layout,
         new_size: usize,
-    ) -> Result<NonNull<u8>, AllocErr> {
+    ) -> Result<(NonNull<u8>, usize), AllocErr> {
         let old_size = layout.size();
 
-        if new_size >= old_size {
-            if let Ok(()) = self.grow_in_place(ptr, layout, new_size) {
-                return Ok(ptr);
+        if new_size > old_size {
+            if let Ok(size) = self.grow_in_place(ptr, layout, new_size) {
+                return Ok((ptr, size));
             }
         } else if new_size < old_size {
-            if let Ok(()) = self.shrink_in_place(ptr, layout, new_size) {
-                return Ok(ptr);
+            if let Ok(size) = self.shrink_in_place(ptr, layout, new_size) {
+                return Ok((ptr, size));
             }
+        } else {
+            return Ok((ptr, new_size));
         }
 
         // otherwise, fall back on alloc + copy + dealloc.
         let new_layout = Layout::from_size_align_unchecked(new_size, layout.align());
         let result = self.alloc(new_layout);
-        if let Ok(new_ptr) = result {
+        if let Ok((new_ptr, _)) = result {
             ptr::copy_nonoverlapping(ptr.as_ptr(), new_ptr.as_ptr(), cmp::min(old_size, new_size));
             self.dealloc(ptr, layout);
         }
         result
     }
 
-    /// Behaves like `alloc`, but also ensures that the contents
+    /// Behaves like `realloc`, but also ensures that the new contents
     /// are set to zero before being returned.
     ///
     /// # Safety
     ///
-    /// This function is unsafe for the same reasons that `alloc` is.
-    ///
-    /// # Errors
-    ///
-    /// Returning `Err` indicates that either memory is exhausted or
-    /// `layout` does not meet allocator's size or alignment
-    /// constraints, just as in `alloc`.
-    ///
-    /// Clients wishing to abort computation in response to an
-    /// allocation error are encouraged to call the [`handle_alloc_error`] function,
-    /// rather than directly invoking `panic!` or similar.
-    ///
-    /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
-        let size = layout.size();
-        let p = self.alloc(layout);
-        if let Ok(p) = p {
-            ptr::write_bytes(p.as_ptr(), 0, size);
-        }
-        p
-    }
-
-    /// Behaves like `alloc`, but also returns the whole size of
-    /// the returned block. For some `layout` inputs, like arrays, this
-    /// may include extra storage usable for additional data.
-    ///
-    /// # Safety
-    ///
-    /// This function is unsafe for the same reasons that `alloc` is.
-    ///
-    /// # Errors
-    ///
-    /// Returning `Err` indicates that either memory is exhausted or
-    /// `layout` does not meet allocator's size or alignment
-    /// constraints, just as in `alloc`.
-    ///
-    /// Clients wishing to abort computation in response to an
-    /// allocation error are encouraged to call the [`handle_alloc_error`] function,
-    /// rather than directly invoking `panic!` or similar.
-    ///
-    /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    unsafe fn alloc_excess(&mut self, layout: Layout) -> Result<Excess, AllocErr> {
-        let usable_size = self.usable_size(&layout);
-        self.alloc(layout).map(|p| Excess(p, usable_size.1))
-    }
-
-    /// Behaves like `realloc`, but also returns the whole size of
-    /// the returned block. For some `layout` inputs, like arrays, this
-    /// may include extra storage usable for additional data.
-    ///
-    /// # Safety
-    ///
     /// This function is unsafe for the same reasons that `realloc` is.
     ///
     /// # Errors
     ///
-    /// Returning `Err` indicates that either memory is exhausted or
-    /// `layout` does not meet allocator's size or alignment
-    /// constraints, just as in `realloc`.
+    /// Returns `Err` only if the new layout
+    /// does not meet the allocator's size
+    /// and alignment constraints of the allocator, or if reallocation
+    /// otherwise fails.
+    ///
+    /// Implementations are encouraged to return `Err` on memory
+    /// exhaustion rather than panicking or aborting, but this is not
+    /// a strict requirement. (Specifically: it is *legal* to
+    /// implement this trait atop an underlying native allocation
+    /// library that aborts on memory exhaustion.)
     ///
     /// Clients wishing to abort computation in response to a
     /// reallocation error are encouraged to call the [`handle_alloc_error`] function,
     /// rather than directly invoking `panic!` or similar.
     ///
     /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    unsafe fn realloc_excess(
+    unsafe fn realloc_zeroed(
         &mut self,
         ptr: NonNull<u8>,
         layout: Layout,
         new_size: usize,
-    ) -> Result<Excess, AllocErr> {
+    ) -> Result<(NonNull<u8>, usize), AllocErr> {
+        let old_size = layout.size();
+
+        if new_size > old_size {
+            if let Ok(size) = self.grow_in_place_zeroed(ptr, layout, new_size) {
+                return Ok((ptr, size));
+            }
+        } else if new_size < old_size {
+            if let Ok(size) = self.shrink_in_place(ptr, layout, new_size) {
+                return Ok((ptr, size));
+            }
+        } else {
+            return Ok((ptr, new_size));
+        }
+
+        // otherwise, fall back on alloc + copy + dealloc.
         let new_layout = Layout::from_size_align_unchecked(new_size, layout.align());
-        let usable_size = self.usable_size(&new_layout);
-        self.realloc(ptr, layout, new_size).map(|p| Excess(p, usable_size.1))
+        let result = self.alloc_zeroed(new_layout);
+        if let Ok((new_ptr, _)) = result {
+            ptr::copy_nonoverlapping(ptr.as_ptr(), new_ptr.as_ptr(), cmp::min(old_size, new_size));
+            self.dealloc(ptr, layout);
+        }
+        result
     }
 
     /// Attempts to extend the allocation referenced by `ptr` to fit `new_size`.
@@ -933,9 +881,10 @@ pub unsafe trait Alloc {
     /// If this returns `Ok`, then the allocator has asserted that the
     /// memory block referenced by `ptr` now fits `new_size`, and thus can
     /// be used to carry data of a layout of that size and same alignment as
-    /// `layout`. (The allocator is allowed to
-    /// expend effort to accomplish this, such as extending the memory block to
-    /// include successor blocks, or virtual memory tricks.)
+    /// `layout`. The returned value is the new size of the allocated block.
+    /// (The allocator is allowed to expend effort to accomplish this, such
+    /// as extending the memory block to include successor blocks, or virtual
+    /// memory tricks.)
     ///
     /// Regardless of what this method returns, ownership of the
     /// memory block referenced by `ptr` has not been transferred, and
@@ -963,18 +912,45 @@ pub unsafe trait Alloc {
     /// function; clients are expected either to be able to recover from
     /// `grow_in_place` failures without aborting, or to fall back on
     /// another reallocation method before resorting to an abort.
+    #[inline]
     unsafe fn grow_in_place(
         &mut self,
         ptr: NonNull<u8>,
         layout: Layout,
         new_size: usize,
-    ) -> Result<(), CannotReallocInPlace> {
-        let _ = ptr; // this default implementation doesn't care about the actual address.
-        debug_assert!(new_size >= layout.size());
-        let (_l, u) = self.usable_size(&layout);
-        // _l <= layout.size()                       [guaranteed by usable_size()]
-        //       layout.size() <= new_layout.size()  [required by this method]
-        if new_size <= u { Ok(()) } else { Err(CannotReallocInPlace) }
+    ) -> Result<usize, CannotReallocInPlace> {
+        let _ = ptr;
+        let _ = layout;
+        let _ = new_size;
+        Err(CannotReallocInPlace)
+    }
+
+    /// Behaves like `grow_in_place`, but also ensures that the new
+    /// contents are set to zero before being returned.
+    ///
+    /// # Safety
+    ///
+    /// This function is unsafe for the same reasons that `grow_in_place` is.
+    ///
+    /// # Errors
+    ///
+    /// Returns `Err(CannotReallocInPlace)` when the allocator is
+    /// unable to assert that the memory block referenced by `ptr`
+    /// could fit `layout`.
+    ///
+    /// Note that one cannot pass `CannotReallocInPlace` to the `handle_alloc_error`
+    /// function; clients are expected either to be able to recover from
+    /// `grow_in_place` failures without aborting, or to fall back on
+    /// another reallocation method before resorting to an abort.
+    unsafe fn grow_in_place_zeroed(
+        &mut self,
+        ptr: NonNull<u8>,
+        layout: Layout,
+        new_size: usize,
+    ) -> Result<usize, CannotReallocInPlace> {
+        let size = self.grow_in_place(ptr, layout, new_size)?;
+        ptr.as_ptr().add(layout.size()).write_bytes(0, new_size - layout.size());
+        Ok(size)
     }
 
     /// Attempts to shrink the allocation referenced by `ptr` to fit `new_size`.
@@ -982,7 +958,8 @@ pub unsafe trait Alloc {
     /// If this returns `Ok`, then the allocator has asserted that the
     /// memory block referenced by `ptr` now fits `new_size`, and
     /// thus can only be used to carry data of that smaller
-    /// layout. (The allocator is allowed to take advantage of this,
+    /// layout. The returned value is the new size the allocated block.
+    /// (The allocator is allowed to take advantage of this,
     /// carving off portions of the block for reuse elsewhere.) The
     /// truncated contents of the block within the smaller layout are
     /// unaltered, and ownership of block has not been transferred.
@@ -1003,8 +980,7 @@ pub unsafe trait Alloc {
     /// * `layout` must *fit* the `ptr` (see above); note the
     ///   `new_size` argument need not fit it,
     ///
-    /// * `new_size` must not be greater than `layout.size()`
-    ///   (and must be greater than zero),
+    /// * `new_size` must not be greater than `layout.size()`,
     ///
     /// # Errors
     ///
@@ -1016,208 +992,16 @@ pub unsafe trait Alloc {
     /// function; clients are expected either to be able to recover from
     /// `shrink_in_place` failures without aborting, or to fall back
     /// on another reallocation method before resorting to an abort.
+    #[inline]
     unsafe fn shrink_in_place(
         &mut self,
         ptr: NonNull<u8>,
         layout: Layout,
         new_size: usize,
-    ) -> Result<(), CannotReallocInPlace> {
-        let _ = ptr; // this default implementation doesn't care about the actual address.
-        debug_assert!(new_size <= layout.size());
-        let (l, _u) = self.usable_size(&layout);
-        //                      layout.size() <= _u  [guaranteed by usable_size()]
-        // new_layout.size() <= layout.size()        [required by this method]
-        if l <= new_size { Ok(()) } else { Err(CannotReallocInPlace) }
-    }
-
-    // == COMMON USAGE PATTERNS ==
-    // alloc_one, dealloc_one, alloc_array, realloc_array. dealloc_array
-
-    /// Allocates a block suitable for holding an instance of `T`.
-    ///
-    /// Captures a common usage pattern for allocators.
-    ///
-    /// The returned block is suitable for passing to the
-    /// `realloc`/`dealloc` methods of this allocator.
-    ///
-    /// Note to implementors: If this returns `Ok(ptr)`, then `ptr`
-    /// must be considered "currently allocated" and must be
-    /// acceptable input to methods such as `realloc` or `dealloc`,
-    /// *even if* `T` is a zero-sized type. In other words, if your
-    /// `Alloc` implementation overrides this method in a manner
-    /// that can return a zero-sized `ptr`, then all reallocation and
-    /// deallocation methods need to be similarly overridden to accept
-    /// such values as input.
-    ///
-    /// # Errors
-    ///
-    /// Returning `Err` indicates that either memory is exhausted or
-    /// `T` does not meet allocator's size or alignment constraints.
-    ///
-    /// For zero-sized `T`, may return either of `Ok` or `Err`, but
-    /// will *not* yield undefined behavior.
-    ///
-    /// Clients wishing to abort computation in response to an
-    /// allocation error are encouraged to call the [`handle_alloc_error`] function,
-    /// rather than directly invoking `panic!` or similar.
-    ///
-    /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    fn alloc_one<T>(&mut self) -> Result<NonNull<T>, AllocErr>
-    where
-        Self: Sized,
-    {
-        let k = Layout::new::<T>();
-        if k.size() > 0 { unsafe { self.alloc(k).map(|p| p.cast()) } } else { Err(AllocErr) }
-    }
-
-    /// Deallocates a block suitable for holding an instance of `T`.
-    ///
-    /// The given block must have been produced by this allocator,
-    /// and must be suitable for storing a `T` (in terms of alignment
-    /// as well as minimum and maximum size); otherwise yields
-    /// undefined behavior.
-    ///
-    /// Captures a common usage pattern for allocators.
-    ///
-    /// # Safety
-    ///
-    /// This function is unsafe because undefined behavior can result
-    /// if the caller does not ensure both:
-    ///
-    /// * `ptr` must denote a block of memory currently allocated via this allocator
-    ///
-    /// * the layout of `T` must *fit* that block of memory.
-    unsafe fn dealloc_one<T>(&mut self, ptr: NonNull<T>)
-    where
-        Self: Sized,
-    {
-        let k = Layout::new::<T>();
-        if k.size() > 0 {
-            self.dealloc(ptr.cast(), k);
-        }
-    }
-
-    /// Allocates a block suitable for holding `n` instances of `T`.
-    ///
-    /// Captures a common usage pattern for allocators.
-    ///
-    /// The returned block is suitable for passing to the
-    /// `realloc`/`dealloc` methods of this allocator.
-    ///
-    /// Note to implementors: If this returns `Ok(ptr)`, then `ptr`
-    /// must be considered "currently allocated" and must be
-    /// acceptable input to methods such as `realloc` or `dealloc`,
-    /// *even if* `T` is a zero-sized type. In other words, if your
-    /// `Alloc` implementation overrides this method in a manner
-    /// that can return a zero-sized `ptr`, then all reallocation and
-    /// deallocation methods need to be similarly overridden to accept
-    /// such values as input.
-    ///
-    /// # Errors
-    ///
-    /// Returning `Err` indicates that either memory is exhausted or
-    /// `[T; n]` does not meet allocator's size or alignment
-    /// constraints.
-    ///
-    /// For zero-sized `T` or `n == 0`, may return either of `Ok` or
-    /// `Err`, but will *not* yield undefined behavior.
-    ///
-    /// Always returns `Err` on arithmetic overflow.
-    ///
-    /// Clients wishing to abort computation in response to an
-    /// allocation error are encouraged to call the [`handle_alloc_error`] function,
-    /// rather than directly invoking `panic!` or similar.
-    ///
-    /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    fn alloc_array<T>(&mut self, n: usize) -> Result<NonNull<T>, AllocErr>
-    where
-        Self: Sized,
-    {
-        match Layout::array::<T>(n) {
-            Ok(layout) if layout.size() > 0 => unsafe { self.alloc(layout).map(|p| p.cast()) },
-            _ => Err(AllocErr),
-        }
-    }
-
-    /// Reallocates a block previously suitable for holding `n_old`
-    /// instances of `T`, returning a block suitable for holding
-    /// `n_new` instances of `T`.
-    ///
-    /// Captures a common usage pattern for allocators.
-    ///
-    /// The returned block is suitable for passing to the
-    /// `realloc`/`dealloc` methods of this allocator.
-    ///
-    /// # Safety
-    ///
-    /// This function is unsafe because undefined behavior can result
-    /// if the caller does not ensure all of the following:
-    ///
-    /// * `ptr` must be currently allocated via this allocator,
-    ///
-    /// * the layout of `[T; n_old]` must *fit* that block of memory.
-    ///
-    /// # Errors
-    ///
-    /// Returning `Err` indicates that either memory is exhausted or
-    /// `[T; n_new]` does not meet allocator's size or alignment
-    /// constraints.
-    ///
-    /// For zero-sized `T` or `n_new == 0`, may return either of `Ok` or
-    /// `Err`, but will *not* yield undefined behavior.
-    ///
-    /// Always returns `Err` on arithmetic overflow.
-    ///
-    /// Clients wishing to abort computation in response to a
-    /// reallocation error are encouraged to call the [`handle_alloc_error`] function,
-    /// rather than directly invoking `panic!` or similar.
-    ///
-    /// [`handle_alloc_error`]: ../../alloc/alloc/fn.handle_alloc_error.html
-    unsafe fn realloc_array<T>(
-        &mut self,
-        ptr: NonNull<T>,
-        n_old: usize,
-        n_new: usize,
-    ) -> Result<NonNull<T>, AllocErr>
-    where
-        Self: Sized,
-    {
-        match (Layout::array::<T>(n_old), Layout::array::<T>(n_new)) {
-            (Ok(k_old), Ok(k_new)) if k_old.size() > 0 && k_new.size() > 0 => {
-                debug_assert!(k_old.align() == k_new.align());
-                self.realloc(ptr.cast(), k_old, k_new.size()).map(NonNull::cast)
-            }
-            _ => Err(AllocErr),
-        }
-    }
-
-    /// Deallocates a block suitable for holding `n` instances of `T`.
-    ///
-    /// Captures a common usage pattern for allocators.
-    ///
-    /// # Safety
-    ///
-    /// This function is unsafe because undefined behavior can result
-    /// if the caller does not ensure both:
-    ///
-    /// * `ptr` must denote a block of memory currently allocated via this allocator
-    ///
-    /// * the layout of `[T; n]` must *fit* that block of memory.
-    ///
-    /// # Errors
-    ///
-    /// Returning `Err` indicates that either `[T; n]` or the given
-    /// memory block does not meet allocator's size or alignment
-    /// constraints.
-    ///
-    /// Always returns `Err` on arithmetic overflow.
-    unsafe fn dealloc_array<T>(&mut self, ptr: NonNull<T>, n: usize) -> Result<(), AllocErr>
-    where
-        Self: Sized,
-    {
-        match Layout::array::<T>(n) {
-            Ok(k) if k.size() > 0 => Ok(self.dealloc(ptr.cast(), k)),
-            _ => Err(AllocErr),
-        }
+    ) -> Result<usize, CannotReallocInPlace> {
+        let _ = ptr;
+        let _ = layout;
+        let _ = new_size;
+        Err(CannotReallocInPlace)
     }
 }
diff --git a/src/libcore/any.rs b/src/libcore/any.rs
index af02e84d3f..97ef513cbc 100644
--- a/src/libcore/any.rs
+++ b/src/libcore/any.rs
@@ -194,7 +194,9 @@ impl dyn Any {
     #[inline]
     pub fn downcast_ref<T: Any>(&self) -> Option<&T> {
         if self.is::<T>() {
-            // SAFETY: just checked whether we are pointing to the correct type
+            // SAFETY: just checked whether we are pointing to the correct type, and we can rely on
+            // that check for memory safety because we have implemented Any for all types; no other
+            // impls can exist as they would conflict with our impl.
             unsafe { Some(&*(self as *const dyn Any as *const T)) }
         } else {
             None
@@ -228,7 +230,9 @@ impl dyn Any {
     #[inline]
     pub fn downcast_mut<T: Any>(&mut self) -> Option<&mut T> {
         if self.is::<T>() {
-            // SAFETY: just checked whether we are pointing to the correct type
+            // SAFETY: just checked whether we are pointing to the correct type, and we can rely on
+            // that check for memory safety because we have implemented Any for all types; no other
+            // impls can exist as they would conflict with our impl.
             unsafe { Some(&mut *(self as *mut dyn Any as *mut T)) }
         } else {
             None
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs
index e7eecf7540..9ebb317641 100644
--- a/src/libcore/cell.rs
+++ b/src/libcore/cell.rs
@@ -1245,6 +1245,38 @@ impl<'b, T: ?Sized> Ref<'b, T> {
         let borrow = orig.borrow.clone();
         (Ref { value: a, borrow }, Ref { value: b, borrow: orig.borrow })
     }
+
+    /// Convert into a reference to the underlying data.
+    ///
+    /// The underlying `RefCell` can never be mutably borrowed from again and will always appear
+    /// already immutably borrowed. It is not a good idea to leak more than a constant number of
+    /// references. The `RefCell` can be immutably borrowed again if only a smaller number of leaks
+    /// have occurred in total.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `Ref::leak(...)`. A method would interfere with methods of the
+    /// same name on the contents of a `RefCell` used through `Deref`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// #![feature(cell_leak)]
+    /// use std::cell::{RefCell, Ref};
+    /// let cell = RefCell::new(0);
+    ///
+    /// let value = Ref::leak(cell.borrow());
+    /// assert_eq!(*value, 0);
+    ///
+    /// assert!(cell.try_borrow().is_ok());
+    /// assert!(cell.try_borrow_mut().is_err());
+    /// ```
+    #[unstable(feature = "cell_leak", issue = "69099")]
+    pub fn leak(orig: Ref<'b, T>) -> &'b T {
+        // By forgetting this Ref we ensure that the borrow counter in the RefCell never goes back
+        // to UNUSED again. No further mutable references can be created from the original cell.
+        mem::forget(orig.borrow);
+        orig.value
+    }
 }
 
 #[unstable(feature = "coerce_unsized", issue = "27732")]
@@ -1330,6 +1362,37 @@ impl<'b, T: ?Sized> RefMut<'b, T> {
         let borrow = orig.borrow.clone();
         (RefMut { value: a, borrow }, RefMut { value: b, borrow: orig.borrow })
     }
+
+    /// Convert into a mutable reference to the underlying data.
+    ///
+    /// The underlying `RefCell` can not be borrowed from again and will always appear already
+    /// mutably borrowed, making the returned reference the only to the interior.
+    ///
+    /// This is an associated function that needs to be used as
+    /// `RefMut::leak(...)`. A method would interfere with methods of the
+    /// same name on the contents of a `RefCell` used through `Deref`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// #![feature(cell_leak)]
+    /// use std::cell::{RefCell, RefMut};
+    /// let cell = RefCell::new(0);
+    ///
+    /// let value = RefMut::leak(cell.borrow_mut());
+    /// assert_eq!(*value, 0);
+    /// *value = 1;
+    ///
+    /// assert!(cell.try_borrow_mut().is_err());
+    /// ```
+    #[unstable(feature = "cell_leak", issue = "69099")]
+    pub fn leak(orig: RefMut<'b, T>) -> &'b mut T {
+        // By forgetting this BorrowRefMut we ensure that the borrow counter in the RefCell never
+        // goes back to UNUSED again. No further references can be created from the original cell,
+        // making the current borrow the only reference for the remaining lifetime.
+        mem::forget(orig.borrow);
+        orig.value
+    }
 }
 
 struct BorrowRefMut<'b> {
@@ -1475,6 +1538,7 @@ impl<T: ?Sized + fmt::Display> fmt::Display for RefMut<'_, T> {
 #[lang = "unsafe_cell"]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[repr(transparent)]
+#[cfg_attr(not(bootstrap), repr(no_niche))] // rust-lang/rust#68303.
 pub struct UnsafeCell<T: ?Sized> {
     value: T,
 }
diff --git a/src/libcore/char/methods.rs b/src/libcore/char/methods.rs
index c341bb552a..302400744e 100644
--- a/src/libcore/char/methods.rs
+++ b/src/libcore/char/methods.rs
@@ -1072,9 +1072,13 @@ impl char {
     /// assert!(!esc.is_ascii_alphabetic());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_alphabetic(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_alphabetic()
+    pub const fn is_ascii_alphabetic(&self) -> bool {
+        match *self {
+            'A'..='Z' | 'a'..='z' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII uppercase character:
@@ -1104,9 +1108,13 @@ impl char {
     /// assert!(!esc.is_ascii_uppercase());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_uppercase(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_uppercase()
+    pub const fn is_ascii_uppercase(&self) -> bool {
+        match *self {
+            'A'..='Z' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII lowercase character:
@@ -1136,9 +1144,13 @@ impl char {
     /// assert!(!esc.is_ascii_lowercase());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_lowercase(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_lowercase()
+    pub const fn is_ascii_lowercase(&self) -> bool {
+        match *self {
+            'a'..='z' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII alphanumeric character:
@@ -1171,9 +1183,13 @@ impl char {
     /// assert!(!esc.is_ascii_alphanumeric());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_alphanumeric(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_alphanumeric()
+    pub const fn is_ascii_alphanumeric(&self) -> bool {
+        match *self {
+            '0'..='9' | 'A'..='Z' | 'a'..='z' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII decimal digit:
@@ -1203,9 +1219,13 @@ impl char {
     /// assert!(!esc.is_ascii_digit());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_digit(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_digit()
+    pub const fn is_ascii_digit(&self) -> bool {
+        match *self {
+            '0'..='9' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII hexadecimal digit:
@@ -1238,9 +1258,13 @@ impl char {
     /// assert!(!esc.is_ascii_hexdigit());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_hexdigit(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_hexdigit()
+    pub const fn is_ascii_hexdigit(&self) -> bool {
+        match *self {
+            '0'..='9' | 'A'..='F' | 'a'..='f' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII punctuation character:
@@ -1274,9 +1298,13 @@ impl char {
     /// assert!(!esc.is_ascii_punctuation());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_punctuation(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_punctuation()
+    pub const fn is_ascii_punctuation(&self) -> bool {
+        match *self {
+            '!'..='/' | ':'..='@' | '['..='`' | '{'..='~' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII graphic character:
@@ -1306,9 +1334,13 @@ impl char {
     /// assert!(!esc.is_ascii_graphic());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_graphic(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_graphic()
+    pub const fn is_ascii_graphic(&self) -> bool {
+        match *self {
+            '!'..='~' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII whitespace character:
@@ -1355,9 +1387,13 @@ impl char {
     /// assert!(!esc.is_ascii_whitespace());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_whitespace(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_whitespace()
+    pub const fn is_ascii_whitespace(&self) -> bool {
+        match *self {
+            '\t' | '\n' | '\x0C' | '\r' | ' ' => true,
+            _ => false,
+        }
     }
 
     /// Checks if the value is an ASCII control character:
@@ -1389,8 +1425,12 @@ impl char {
     /// assert!(esc.is_ascii_control());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_control(&self) -> bool {
-        self.is_ascii() && (*self as u8).is_ascii_control()
+    pub const fn is_ascii_control(&self) -> bool {
+        match *self {
+            '\0'..='\x1F' | '\x7F' => true,
+            _ => false,
+        }
     }
 }
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs
index 3ea4baa57b..604be7d5f6 100644
--- a/src/libcore/cmp.rs
+++ b/src/libcore/cmp.rs
@@ -35,7 +35,7 @@ use self::Ordering::*;
 ///
 /// This trait allows for partial equality, for types that do not have a full
 /// equivalence relation. For example, in floating point numbers `NaN != NaN`,
-/// so floating point types implement `PartialEq` but not `Eq`.
+/// so floating point types implement `PartialEq` but not [`Eq`].
 ///
 /// Formally, the equality must be (for all `a`, `b` and `c`):
 ///
@@ -55,12 +55,12 @@ use self::Ordering::*;
 ///
 /// ## How can I implement `PartialEq`?
 ///
-/// PartialEq only requires the `eq` method to be implemented; `ne` is defined
-/// in terms of it by default. Any manual implementation of `ne` *must* respect
-/// the rule that `eq` is a strict inverse of `ne`; that is, `!(a == b)` if and
+/// `PartialEq` only requires the [`eq`] method to be implemented; [`ne`] is defined
+/// in terms of it by default. Any manual implementation of [`ne`] *must* respect
+/// the rule that [`eq`] is a strict inverse of [`ne`]; that is, `!(a == b)` if and
 /// only if `a != b`.
 ///
-/// Implementations of `PartialEq`, `PartialOrd`, and `Ord` *must* agree with
+/// Implementations of `PartialEq`, [`PartialOrd`], and [`Ord`] *must* agree with
 /// each other. It's easy to accidentally make them disagree by deriving some
 /// of the traits and manually implementing others.
 ///
@@ -190,6 +190,9 @@ use self::Ordering::*;
 /// assert_eq!(x == y, false);
 /// assert_eq!(x.eq(&y), false);
 /// ```
+///
+/// [`eq`]: PartialEq::eq
+/// [`ne`]: PartialEq::ne
 #[lang = "eq"]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(alias = "==")]
@@ -233,7 +236,7 @@ pub macro PartialEq($item:item) {
 /// - transitive: `a == b` and `b == c` implies `a == c`.
 ///
 /// This property cannot be checked by the compiler, and therefore `Eq` implies
-/// `PartialEq`, and has no extra methods.
+/// [`PartialEq`], and has no extra methods.
 ///
 /// ## Derivable
 ///
@@ -358,6 +361,7 @@ impl Ordering {
     /// assert!(data == b);
     /// ```
     #[inline]
+    #[must_use]
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn reverse(self) -> Ordering {
         match self {
@@ -370,6 +374,7 @@ impl Ordering {
     /// Chains two orderings.
     ///
     /// Returns `self` when it's not `Equal`. Otherwise returns `other`.
+    ///
     /// # Examples
     ///
     /// ```
@@ -394,6 +399,7 @@ impl Ordering {
     /// assert_eq!(result, Ordering::Less);
     /// ```
     #[inline]
+    #[must_use]
     #[stable(feature = "ordering_chaining", since = "1.17.0")]
     pub fn then(self, other: Ordering) -> Ordering {
         match self {
@@ -431,6 +437,7 @@ impl Ordering {
     /// assert_eq!(result, Ordering::Less);
     /// ```
     #[inline]
+    #[must_use]
     #[stable(feature = "ordering_chaining", since = "1.17.0")]
     pub fn then_with<F: FnOnce() -> Ordering>(self, f: F) -> Ordering {
         match self {
@@ -442,10 +449,12 @@ impl Ordering {
 
 /// A helper struct for reverse ordering.
 ///
-/// This struct is a helper to be used with functions like `Vec::sort_by_key` and
+/// This struct is a helper to be used with functions like [`Vec::sort_by_key`] and
 /// can be used to reverse order a part of a key.
 ///
-/// Example usage:
+/// [`Vec::sort_by_key`]: ../../std/vec/struct.Vec.html#method.sort_by_key
+///
+/// # Examples
 ///
 /// ```
 /// use std::cmp::Reverse;
@@ -506,12 +515,12 @@ impl<T: Ord> Ord for Reverse<T> {
 ///
 /// ## How can I implement `Ord`?
 ///
-/// `Ord` requires that the type also be `PartialOrd` and `Eq` (which requires `PartialEq`).
+/// `Ord` requires that the type also be [`PartialOrd`] and [`Eq`] (which requires [`PartialEq`]).
 ///
-/// Then you must define an implementation for `cmp()`. You may find it useful to use
-/// `cmp()` on your type's fields.
+/// Then you must define an implementation for [`cmp`]. You may find it useful to use
+/// [`cmp`] on your type's fields.
 ///
-/// Implementations of `PartialEq`, `PartialOrd`, and `Ord` *must*
+/// Implementations of [`PartialEq`], [`PartialOrd`], and `Ord` *must*
 /// agree with each other. That is, `a.cmp(b) == Ordering::Equal` if
 /// and only if `a == b` and `Some(a.cmp(b)) == a.partial_cmp(b)` for
 /// all `a` and `b`. It's easy to accidentally make them disagree by
@@ -548,13 +557,15 @@ impl<T: Ord> Ord for Reverse<T> {
 ///     }
 /// }
 /// ```
+///
+/// [`cmp`]: Ord::cmp
 #[doc(alias = "<")]
 #[doc(alias = ">")]
 #[doc(alias = "<=")]
 #[doc(alias = ">=")]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait Ord: Eq + PartialOrd<Self> {
-    /// This method returns an `Ordering` between `self` and `other`.
+    /// This method returns an [`Ordering`] between `self` and `other`.
     ///
     /// By convention, `self.cmp(&other)` returns the ordering matching the expression
     /// `self <operator> other` if true.
@@ -568,6 +579,7 @@ pub trait Ord: Eq + PartialOrd<Self> {
     /// assert_eq!(10.cmp(&5), Ordering::Greater);
     /// assert_eq!(5.cmp(&5), Ordering::Equal);
     /// ```
+    #[must_use]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn cmp(&self, other: &Self) -> Ordering;
 
@@ -583,6 +595,7 @@ pub trait Ord: Eq + PartialOrd<Self> {
     /// ```
     #[stable(feature = "ord_max_min", since = "1.21.0")]
     #[inline]
+    #[must_use]
     fn max(self, other: Self) -> Self
     where
         Self: Sized,
@@ -602,6 +615,7 @@ pub trait Ord: Eq + PartialOrd<Self> {
     /// ```
     #[stable(feature = "ord_max_min", since = "1.21.0")]
     #[inline]
+    #[must_use]
     fn min(self, other: Self) -> Self
     where
         Self: Sized,
@@ -627,6 +641,7 @@ pub trait Ord: Eq + PartialOrd<Self> {
     /// assert!(0.clamp(-2, 1) == 0);
     /// assert!(2.clamp(-2, 1) == 1);
     /// ```
+    #[must_use]
     #[unstable(feature = "clamp", issue = "44095")]
     fn clamp(self, min: Self, max: Self) -> Self
     where
@@ -689,20 +704,20 @@ impl PartialOrd for Ordering {
 ///
 /// ## How can I implement `PartialOrd`?
 ///
-/// `PartialOrd` only requires implementation of the `partial_cmp` method, with the others
+/// `PartialOrd` only requires implementation of the [`partial_cmp`] method, with the others
 /// generated from default implementations.
 ///
 /// However it remains possible to implement the others separately for types which do not have a
 /// total order. For example, for floating point numbers, `NaN < 0 == false` and `NaN >= 0 ==
 /// false` (cf. IEEE 754-2008 section 5.11).
 ///
-/// `PartialOrd` requires your type to be `PartialEq`.
+/// `PartialOrd` requires your type to be [`PartialEq`].
 ///
-/// Implementations of `PartialEq`, `PartialOrd`, and `Ord` *must* agree with each other. It's
+/// Implementations of [`PartialEq`], `PartialOrd`, and [`Ord`] *must* agree with each other. It's
 /// easy to accidentally make them disagree by deriving some of the traits and manually
 /// implementing others.
 ///
-/// If your type is `Ord`, you can implement `partial_cmp()` by using `cmp()`:
+/// If your type is [`Ord`], you can implement [`partial_cmp`] by using [`cmp`]:
 ///
 /// ```
 /// use std::cmp::Ordering;
@@ -733,7 +748,7 @@ impl PartialOrd for Ordering {
 /// }
 /// ```
 ///
-/// You may also find it useful to use `partial_cmp()` on your type's fields. Here
+/// You may also find it useful to use [`partial_cmp`] on your type's fields. Here
 /// is an example of `Person` types who have a floating-point `height` field that
 /// is the only field to be used for sorting:
 ///
@@ -768,6 +783,9 @@ impl PartialOrd for Ordering {
 /// assert_eq!(x < y, true);
 /// assert_eq!(x.lt(&y), true);
 /// ```
+///
+/// [`partial_cmp`]: PartialOrd::partial_cmp
+/// [`cmp`]: Ord::cmp
 #[lang = "partial_ord"]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(alias = ">")]
@@ -893,7 +911,7 @@ pub macro PartialOrd($item:item) {
 ///
 /// Returns the first argument if the comparison determines them to be equal.
 ///
-/// Internally uses an alias to `Ord::min`.
+/// Internally uses an alias to [`Ord::min`].
 ///
 /// # Examples
 ///
@@ -904,6 +922,7 @@ pub macro PartialOrd($item:item) {
 /// assert_eq!(2, cmp::min(2, 2));
 /// ```
 #[inline]
+#[must_use]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn min<T: Ord>(v1: T, v2: T) -> T {
     v1.min(v2)
@@ -924,6 +943,7 @@ pub fn min<T: Ord>(v1: T, v2: T) -> T {
 /// assert_eq!(cmp::min_by(-2, 2, |x: &i32, y: &i32| x.abs().cmp(&y.abs())), -2);
 /// ```
 #[inline]
+#[must_use]
 #[unstable(feature = "cmp_min_max_by", issue = "64460")]
 pub fn min_by<T, F: FnOnce(&T, &T) -> Ordering>(v1: T, v2: T, compare: F) -> T {
     match compare(&v1, &v2) {
@@ -947,6 +967,7 @@ pub fn min_by<T, F: FnOnce(&T, &T) -> Ordering>(v1: T, v2: T, compare: F) -> T {
 /// assert_eq!(cmp::min_by_key(-2, 2, |x: &i32| x.abs()), -2);
 /// ```
 #[inline]
+#[must_use]
 #[unstable(feature = "cmp_min_max_by", issue = "64460")]
 pub fn min_by_key<T, F: FnMut(&T) -> K, K: Ord>(v1: T, v2: T, mut f: F) -> T {
     min_by(v1, v2, |v1, v2| f(v1).cmp(&f(v2)))
@@ -956,7 +977,7 @@ pub fn min_by_key<T, F: FnMut(&T) -> K, K: Ord>(v1: T, v2: T, mut f: F) -> T {
 ///
 /// Returns the second argument if the comparison determines them to be equal.
 ///
-/// Internally uses an alias to `Ord::max`.
+/// Internally uses an alias to [`Ord::max`].
 ///
 /// # Examples
 ///
@@ -967,6 +988,7 @@ pub fn min_by_key<T, F: FnMut(&T) -> K, K: Ord>(v1: T, v2: T, mut f: F) -> T {
 /// assert_eq!(2, cmp::max(2, 2));
 /// ```
 #[inline]
+#[must_use]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub fn max<T: Ord>(v1: T, v2: T) -> T {
     v1.max(v2)
@@ -987,6 +1009,7 @@ pub fn max<T: Ord>(v1: T, v2: T) -> T {
 /// assert_eq!(cmp::max_by(-2, 2, |x: &i32, y: &i32| x.abs().cmp(&y.abs())), 2);
 /// ```
 #[inline]
+#[must_use]
 #[unstable(feature = "cmp_min_max_by", issue = "64460")]
 pub fn max_by<T, F: FnOnce(&T, &T) -> Ordering>(v1: T, v2: T, compare: F) -> T {
     match compare(&v1, &v2) {
@@ -1010,6 +1033,7 @@ pub fn max_by<T, F: FnOnce(&T, &T) -> Ordering>(v1: T, v2: T, compare: F) -> T {
 /// assert_eq!(cmp::max_by_key(-2, 2, |x: &i32| x.abs()), 2);
 /// ```
 #[inline]
+#[must_use]
 #[unstable(feature = "cmp_min_max_by", issue = "64460")]
 pub fn max_by_key<T, F: FnMut(&T) -> K, K: Ord>(v1: T, v2: T, mut f: F) -> T {
     max_by(v1, v2, |v1, v2| f(v1).cmp(&f(v2)))
diff --git a/src/libcore/convert/mod.rs b/src/libcore/convert/mod.rs
index 959fd63df5..47ab8715cf 100644
--- a/src/libcore/convert/mod.rs
+++ b/src/libcore/convert/mod.rs
@@ -229,7 +229,7 @@ pub trait AsMut<T: ?Sized> {
 ///
 /// # Implementing [`Into`] for conversions to external types in old versions of Rust
 ///
-/// Prior to Rust 1.40, if the destination type was not part of the current crate
+/// Prior to Rust 1.41, if the destination type was not part of the current crate
 /// then you couldn't implement [`From`] directly.
 /// For example, take this code:
 ///
diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs
index 284e94926d..5ef673009b 100644
--- a/src/libcore/fmt/float.rs
+++ b/src/libcore/fmt/float.rs
@@ -29,7 +29,6 @@ where
             *num,
             sign,
             precision,
-            false,
             buf.get_mut(),
             parts.get_mut(),
         );
@@ -59,7 +58,6 @@ where
             *num,
             sign,
             precision,
-            false,
             buf.get_mut(),
             parts.get_mut(),
         );
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 900ef63f1d..d2cebf593a 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -238,16 +238,8 @@ pub struct Formatter<'a> {
 // NB. Argument is essentially an optimized partially applied formatting function,
 // equivalent to `exists T.(&T, fn(&T, &mut Formatter<'_>) -> Result`.
 
-struct Void {
-    _priv: (),
-    /// Erases all oibits, because `Void` erases the type of the object that
-    /// will be used to produce formatted output. Since we do not know what
-    /// oibits the real types have (and they can have any or none), we need to
-    /// take the most conservative approach and forbid all oibits.
-    ///
-    /// It was added after #45197 showed that one could share a `!Sync`
-    /// object across threads by passing it into `format_args!`.
-    _oibit_remover: PhantomData<*mut dyn Fn()>,
+extern "C" {
+    type Opaque;
 }
 
 /// This struct represents the generic "argument" which is taken by the Xprintf
@@ -259,16 +251,33 @@ struct Void {
 #[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]
 #[doc(hidden)]
 pub struct ArgumentV1<'a> {
-    value: &'a Void,
-    formatter: fn(&Void, &mut Formatter<'_>) -> Result,
+    value: &'a Opaque,
+    formatter: fn(&Opaque, &mut Formatter<'_>) -> Result,
 }
 
-impl<'a> ArgumentV1<'a> {
-    #[inline(never)]
-    fn show_usize(x: &usize, f: &mut Formatter<'_>) -> Result {
-        Display::fmt(x, f)
-    }
+// This guarantees a single stable value for the function pointer associated with
+// indices/counts in the formatting infrastructure.
+//
+// Note that a function defined as such would not be correct as functions are
+// always tagged unnamed_addr with the current lowering to LLVM IR, so their
+// address is not considered important to LLVM and as such the as_usize cast
+// could have been miscompiled. In practice, we never call as_usize on non-usize
+// containing data (as a matter of static generation of the formatting
+// arguments), so this is merely an additional check.
+//
+// We primarily want to ensure that the function pointer at `USIZE_MARKER` has
+// an address corresponding *only* to functions that also take `&usize` as their
+// first argument. The read_volatile here ensures that we can safely ready out a
+// usize from the passed reference and that this address does not point at a
+// non-usize taking function.
+#[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]
+static USIZE_MARKER: fn(&usize, &mut Formatter<'_>) -> Result = |ptr, _| {
+    // SAFETY: ptr is a reference
+    let _v: usize = unsafe { crate::ptr::read_volatile(ptr) };
+    loop {}
+};
 
+impl<'a> ArgumentV1<'a> {
     #[doc(hidden)]
     #[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]
     pub fn new<'b, T>(x: &'b T, f: fn(&T, &mut Formatter<'_>) -> Result) -> ArgumentV1<'b> {
@@ -278,11 +287,13 @@ impl<'a> ArgumentV1<'a> {
     #[doc(hidden)]
     #[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]
     pub fn from_usize(x: &usize) -> ArgumentV1<'_> {
-        ArgumentV1::new(x, ArgumentV1::show_usize)
+        ArgumentV1::new(x, USIZE_MARKER)
     }
 
     fn as_usize(&self) -> Option<usize> {
-        if self.formatter as usize == ArgumentV1::show_usize as usize {
+        if self.formatter as usize == USIZE_MARKER as usize {
+            // SAFETY: The `formatter` field is only set to USIZE_MARKER if
+            // the value is a usize, so this is safe
             Some(unsafe { *(self.value as *const _ as *const usize) })
         } else {
             None
@@ -1080,18 +1091,7 @@ fn run(fmt: &mut Formatter<'_>, arg: &rt::v1::Argument, args: &[ArgumentV1<'_>])
     fmt.precision = getcount(args, &arg.format.precision);
 
     // Extract the correct argument
-    let value = {
-        #[cfg(bootstrap)]
-        {
-            match arg.position {
-                rt::v1::Position::At(i) => args[i],
-            }
-        }
-        #[cfg(not(bootstrap))]
-        {
-            args[arg.position]
-        }
-    };
+    let value = args[arg.position];
 
     // Then actually do some printing
     (value.formatter)(value.value, fmt)
@@ -1367,11 +1367,11 @@ impl<'a> Formatter<'a> {
             let mut align = old_align;
             if self.sign_aware_zero_pad() {
                 // a sign always goes first
-                let sign = unsafe { str::from_utf8_unchecked(formatted.sign) };
+                let sign = formatted.sign;
                 self.buf.write_str(sign)?;
 
                 // remove the sign from the formatted parts
-                formatted.sign = b"";
+                formatted.sign = "";
                 width = width.saturating_sub(sign.len());
                 align = rt::v1::Alignment::Right;
                 self.fill = '0';
@@ -1403,7 +1403,7 @@ impl<'a> Formatter<'a> {
         }
 
         if !formatted.sign.is_empty() {
-            write_bytes(self.buf, formatted.sign)?;
+            self.buf.write_str(formatted.sign)?;
         }
         for part in formatted.parts {
             match *part {
diff --git a/src/libcore/fmt/num.rs b/src/libcore/fmt/num.rs
index d562639a65..5dfd3a8ecd 100644
--- a/src/libcore/fmt/num.rs
+++ b/src/libcore/fmt/num.rs
@@ -4,6 +4,7 @@
 
 use crate::fmt;
 use crate::mem::MaybeUninit;
+use crate::num::flt2dec;
 use crate::ops::{Div, Rem, Sub};
 use crate::ptr;
 use crate::slice;
@@ -256,6 +257,161 @@ macro_rules! impl_Display {
     };
 }
 
+macro_rules! impl_Exp {
+    ($($t:ident),* as $u:ident via $conv_fn:ident named $name:ident) => {
+        fn $name(
+            mut n: $u,
+            is_nonnegative: bool,
+            upper: bool,
+            f: &mut fmt::Formatter<'_>
+        ) -> fmt::Result {
+            let (mut n, mut exponent, trailing_zeros, added_precision) = {
+                let mut exponent = 0;
+                // count and remove trailing decimal zeroes
+                while n % 10 == 0 && n >= 10 {
+                    n /= 10;
+                    exponent += 1;
+                }
+                let trailing_zeros = exponent;
+
+                let (added_precision, subtracted_precision) = match f.precision() {
+                    Some(fmt_prec) => {
+                        // number of decimal digits minus 1
+                        let mut tmp = n;
+                        let mut prec = 0;
+                        while tmp >= 10 {
+                            tmp /= 10;
+                            prec += 1;
+                        }
+                        (fmt_prec.saturating_sub(prec), prec.saturating_sub(fmt_prec))
+                    }
+                    None => (0,0)
+                };
+                for _ in 1..subtracted_precision {
+                    n/=10;
+                    exponent += 1;
+                }
+                if subtracted_precision != 0 {
+                    let rem = n % 10;
+                    n /= 10;
+                    exponent += 1;
+                    // round up last digit
+                    if rem >= 5 {
+                        n += 1;
+                    }
+                }
+                (n, exponent, trailing_zeros, added_precision)
+            };
+
+            // 39 digits (worst case u128) + . = 40
+            let mut buf = [MaybeUninit::<u8>::uninit(); 40];
+            let mut curr = buf.len() as isize; //index for buf
+            let buf_ptr = MaybeUninit::first_ptr_mut(&mut buf);
+            let lut_ptr = DEC_DIGITS_LUT.as_ptr();
+
+            // decode 2 chars at a time
+            while n >= 100 {
+                let d1 = ((n % 100) as isize) << 1;
+                curr -= 2;
+                unsafe {
+                    ptr::copy_nonoverlapping(lut_ptr.offset(d1), buf_ptr.offset(curr), 2);
+                }
+                n /= 100;
+                exponent += 2;
+            }
+            // n is <= 99, so at most 2 chars long
+            let mut n = n as isize; // possibly reduce 64bit math
+            // decode second-to-last character
+            if n >= 10 {
+                curr -= 1;
+                unsafe {
+                    *buf_ptr.offset(curr) = (n as u8 % 10_u8) + b'0';
+                }
+                n /= 10;
+                exponent += 1;
+            }
+            // add decimal point iff >1 mantissa digit will be printed
+            if exponent != trailing_zeros || added_precision != 0 {
+                curr -= 1;
+                unsafe {
+                    *buf_ptr.offset(curr) = b'.';
+                }
+            }
+
+            let buf_slice = unsafe {
+                // decode last character
+                curr -= 1;
+                *buf_ptr.offset(curr) = (n as u8) + b'0';
+
+                let len = buf.len() - curr as usize;
+                slice::from_raw_parts(buf_ptr.offset(curr), len)
+            };
+
+            // stores 'e' (or 'E') and the up to 2-digit exponent
+            let mut exp_buf = [MaybeUninit::<u8>::uninit(); 3];
+            let exp_ptr = MaybeUninit::first_ptr_mut(&mut exp_buf);
+            let exp_slice = unsafe {
+                *exp_ptr.offset(0) = if upper {b'E'} else {b'e'};
+                let len = if exponent < 10 {
+                    *exp_ptr.offset(1) = (exponent as u8) + b'0';
+                    2
+                } else {
+                    let off = exponent << 1;
+                    ptr::copy_nonoverlapping(lut_ptr.offset(off), exp_ptr.offset(1), 2);
+                    3
+                };
+                slice::from_raw_parts(exp_ptr, len)
+            };
+
+            let parts = &[
+                flt2dec::Part::Copy(buf_slice),
+                flt2dec::Part::Zero(added_precision),
+                flt2dec::Part::Copy(exp_slice)
+            ];
+            let sign = if !is_nonnegative {
+                "-"
+            } else if f.sign_plus() {
+                "+"
+            } else {
+                ""
+            };
+            let formatted = flt2dec::Formatted{sign, parts};
+            f.pad_formatted_parts(&formatted)
+        }
+
+        $(
+            #[stable(feature = "integer_exp_format", since = "1.42.0")]
+            impl fmt::LowerExp for $t {
+                #[allow(unused_comparisons)]
+                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    let is_nonnegative = *self >= 0;
+                    let n = if is_nonnegative {
+                        self.$conv_fn()
+                    } else {
+                        // convert the negative num to positive by summing 1 to it's 2 complement
+                        (!self.$conv_fn()).wrapping_add(1)
+                    };
+                    $name(n, is_nonnegative, false, f)
+                }
+            })*
+        $(
+            #[stable(feature = "integer_exp_format", since = "1.42.0")]
+            impl fmt::UpperExp for $t {
+                #[allow(unused_comparisons)]
+                fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                    let is_nonnegative = *self >= 0;
+                    let n = if is_nonnegative {
+                        self.$conv_fn()
+                    } else {
+                        // convert the negative num to positive by summing 1 to it's 2 complement
+                        (!self.$conv_fn()).wrapping_add(1)
+                    };
+                    $name(n, is_nonnegative, true, f)
+                }
+            })*
+    };
+}
+
 // Include wasm32 in here since it doesn't reflect the native pointer size, and
 // often cares strongly about getting a smaller code size.
 #[cfg(any(target_pointer_width = "64", target_arch = "wasm32"))]
@@ -265,6 +421,10 @@ mod imp {
         i8, u8, i16, u16, i32, u32, i64, u64, usize, isize
             as u64 via to_u64 named fmt_u64
     );
+    impl_Exp!(
+        i8, u8, i16, u16, i32, u32, i64, u64, usize, isize
+            as u64 via to_u64 named exp_u64
+    );
 }
 
 #[cfg(not(any(target_pointer_width = "64", target_arch = "wasm32")))]
@@ -272,6 +432,9 @@ mod imp {
     use super::*;
     impl_Display!(i8, u8, i16, u16, i32, u32, isize, usize as u32 via to_u32 named fmt_u32);
     impl_Display!(i64, u64 as u64 via to_u64 named fmt_u64);
+    impl_Exp!(i8, u8, i16, u16, i32, u32, isize, usize as u32 via to_u32 named exp_u32);
+    impl_Exp!(i64, u64 as u64 via to_u64 named exp_u64);
 }
 
 impl_Display!(i128, u128 as u128 via to_u128 named fmt_u128);
+impl_Exp!(i128, u128 as u128 via to_u128 named exp_u128);
diff --git a/src/libcore/fmt/rt/v1.rs b/src/libcore/fmt/rt/v1.rs
index fd81f93242..f6460470bf 100644
--- a/src/libcore/fmt/rt/v1.rs
+++ b/src/libcore/fmt/rt/v1.rs
@@ -7,9 +7,6 @@
 
 #[derive(Copy, Clone)]
 pub struct Argument {
-    #[cfg(bootstrap)]
-    pub position: Position,
-    #[cfg(not(bootstrap))]
     pub position: usize,
     pub format: FormatSpec,
 }
@@ -42,9 +39,3 @@ pub enum Count {
     Param(usize),
     Implied,
 }
-
-#[cfg(bootstrap)]
-#[derive(Copy, Clone)]
-pub enum Position {
-    At(usize),
-}
diff --git a/src/libcore/future/future.rs b/src/libcore/future/future.rs
index f14ed38b9b..00a171e6b5 100644
--- a/src/libcore/future/future.rs
+++ b/src/libcore/future/future.rs
@@ -24,7 +24,6 @@ use crate::task::{Context, Poll};
 /// `.await` the value.
 ///
 /// [`Waker`]: ../task/struct.Waker.html
-#[doc(spotlight)]
 #[must_use = "futures do nothing unless you `.await` or poll them"]
 #[stable(feature = "futures_api", since = "1.36.0")]
 #[lang = "future_trait"]
diff --git a/src/libcore/hash/sip.rs b/src/libcore/hash/sip.rs
index 7ebe01e26d..aa50e7cdf5 100644
--- a/src/libcore/hash/sip.rs
+++ b/src/libcore/hash/sip.rs
@@ -121,7 +121,9 @@ macro_rules! load_int_le {
     }};
 }
 
-/// Loads an u64 using up to 7 bytes of a byte slice.
+/// Loads a u64 using up to 7 bytes of a byte slice. It looks clumsy but the
+/// `copy_nonoverlapping` calls that occur (via `load_int_le!`) all have fixed
+/// sizes and avoid calling `memcpy`, which is good for speed.
 ///
 /// Unsafe because: unchecked indexing at start..start+len
 #[inline]
@@ -302,7 +304,7 @@ impl<S: Sip> super::Hasher for Hasher<S> {
 
         if self.ntail != 0 {
             needed = 8 - self.ntail;
-            self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << 8 * self.ntail;
+            self.tail |= unsafe { u8to64_le(msg, 0, cmp::min(length, needed)) } << (8 * self.ntail);
             if length < needed {
                 self.ntail += length;
                 return;
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index 416c73f50b..a889eff75c 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -68,6 +68,7 @@ extern "rust-intrinsic" {
     // memory, which is not valid for either `&` or `&mut`.
 
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -77,6 +78,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -86,6 +88,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_acq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -97,6 +100,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_rel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -108,6 +112,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_acqrel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -117,6 +122,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_relaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -128,6 +134,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -139,6 +146,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_failacq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -150,6 +158,7 @@ extern "rust-intrinsic" {
     /// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
     pub fn atomic_cxchg_acq_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -162,6 +171,7 @@ extern "rust-intrinsic" {
     pub fn atomic_cxchg_acqrel_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
 
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -171,6 +181,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -180,6 +191,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_acq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -191,6 +203,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_rel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -202,6 +215,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_acqrel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -211,6 +225,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_relaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -222,6 +237,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -233,6 +249,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_failacq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -244,6 +261,7 @@ extern "rust-intrinsic" {
     /// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
     pub fn atomic_cxchgweak_acq_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
     /// Stores a value if the current value is the same as the `old` value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -256,6 +274,7 @@ extern "rust-intrinsic" {
     pub fn atomic_cxchgweak_acqrel_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
 
     /// Loads the current value of the pointer.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `load` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -263,6 +282,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::load`](../../std/sync/atomic/struct.AtomicBool.html#method.load).
     pub fn atomic_load<T>(src: *const T) -> T;
     /// Loads the current value of the pointer.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `load` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -270,6 +290,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::load`](../../std/sync/atomic/struct.AtomicBool.html#method.load).
     pub fn atomic_load_acq<T>(src: *const T) -> T;
     /// Loads the current value of the pointer.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `load` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -279,6 +300,7 @@ extern "rust-intrinsic" {
     pub fn atomic_load_unordered<T>(src: *const T) -> T;
 
     /// Stores the value at the specified memory location.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `store` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -286,6 +308,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::store`](../../std/sync/atomic/struct.AtomicBool.html#method.store).
     pub fn atomic_store<T>(dst: *mut T, val: T);
     /// Stores the value at the specified memory location.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `store` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -293,6 +316,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::store`](../../std/sync/atomic/struct.AtomicBool.html#method.store).
     pub fn atomic_store_rel<T>(dst: *mut T, val: T);
     /// Stores the value at the specified memory location.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `store` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -302,6 +326,7 @@ extern "rust-intrinsic" {
     pub fn atomic_store_unordered<T>(dst: *mut T, val: T);
 
     /// Stores the value at the specified memory location, returning the old value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `swap` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -309,6 +334,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::swap`](../../std/sync/atomic/struct.AtomicBool.html#method.swap).
     pub fn atomic_xchg<T>(dst: *mut T, src: T) -> T;
     /// Stores the value at the specified memory location, returning the old value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `swap` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -316,6 +342,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::swap`](../../std/sync/atomic/struct.AtomicBool.html#method.swap).
     pub fn atomic_xchg_acq<T>(dst: *mut T, src: T) -> T;
     /// Stores the value at the specified memory location, returning the old value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `swap` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -323,6 +350,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::swap`](../../std/sync/atomic/struct.AtomicBool.html#method.swap).
     pub fn atomic_xchg_rel<T>(dst: *mut T, src: T) -> T;
     /// Stores the value at the specified memory location, returning the old value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `swap` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -330,6 +358,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::swap`](../../std/sync/atomic/struct.AtomicBool.html#method.swap).
     pub fn atomic_xchg_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Stores the value at the specified memory location, returning the old value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `swap` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -338,6 +367,7 @@ extern "rust-intrinsic" {
     pub fn atomic_xchg_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// Adds to the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_add` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -345,6 +375,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_add`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_add).
     pub fn atomic_xadd<T>(dst: *mut T, src: T) -> T;
     /// Adds to the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_add` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -352,6 +383,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_add`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_add).
     pub fn atomic_xadd_acq<T>(dst: *mut T, src: T) -> T;
     /// Adds to the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_add` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -359,6 +391,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_add`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_add).
     pub fn atomic_xadd_rel<T>(dst: *mut T, src: T) -> T;
     /// Adds to the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_add` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -366,6 +399,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_add`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_add).
     pub fn atomic_xadd_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Adds to the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_add` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -374,6 +408,7 @@ extern "rust-intrinsic" {
     pub fn atomic_xadd_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// Subtract from the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_sub` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -381,6 +416,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_sub`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_sub).
     pub fn atomic_xsub<T>(dst: *mut T, src: T) -> T;
     /// Subtract from the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_sub` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -388,6 +424,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_sub`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_sub).
     pub fn atomic_xsub_acq<T>(dst: *mut T, src: T) -> T;
     /// Subtract from the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_sub` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -395,6 +432,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_sub`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_sub).
     pub fn atomic_xsub_rel<T>(dst: *mut T, src: T) -> T;
     /// Subtract from the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_sub` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -402,6 +440,7 @@ extern "rust-intrinsic" {
     /// [`AtomicIsize::fetch_sub`](../../std/sync/atomic/struct.AtomicIsize.html#method.fetch_sub).
     pub fn atomic_xsub_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Subtract from the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_sub` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -410,6 +449,7 @@ extern "rust-intrinsic" {
     pub fn atomic_xsub_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// Bitwise and with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_and` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -417,6 +457,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_and`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_and).
     pub fn atomic_and<T>(dst: *mut T, src: T) -> T;
     /// Bitwise and with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_and` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -424,6 +465,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_and`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_and).
     pub fn atomic_and_acq<T>(dst: *mut T, src: T) -> T;
     /// Bitwise and with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_and` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -431,6 +473,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_and`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_and).
     pub fn atomic_and_rel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise and with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_and` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -438,6 +481,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_and`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_and).
     pub fn atomic_and_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise and with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_and` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -446,6 +490,7 @@ extern "rust-intrinsic" {
     pub fn atomic_and_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// Bitwise nand with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic::AtomicBool` type via the `fetch_nand` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -453,6 +498,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_nand`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_nand).
     pub fn atomic_nand<T>(dst: *mut T, src: T) -> T;
     /// Bitwise nand with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic::AtomicBool` type via the `fetch_nand` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -460,6 +506,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_nand`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_nand).
     pub fn atomic_nand_acq<T>(dst: *mut T, src: T) -> T;
     /// Bitwise nand with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic::AtomicBool` type via the `fetch_nand` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -467,6 +514,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_nand`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_nand).
     pub fn atomic_nand_rel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise nand with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic::AtomicBool` type via the `fetch_nand` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -474,6 +522,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_nand`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_nand).
     pub fn atomic_nand_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise nand with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic::AtomicBool` type via the `fetch_nand` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -482,6 +531,7 @@ extern "rust-intrinsic" {
     pub fn atomic_nand_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// Bitwise or with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_or` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -489,6 +539,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_or`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_or).
     pub fn atomic_or<T>(dst: *mut T, src: T) -> T;
     /// Bitwise or with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_or` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -496,6 +547,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_or`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_or).
     pub fn atomic_or_acq<T>(dst: *mut T, src: T) -> T;
     /// Bitwise or with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_or` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -503,6 +555,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_or`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_or).
     pub fn atomic_or_rel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise or with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_or` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -510,6 +563,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_or`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_or).
     pub fn atomic_or_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise or with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_or` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -518,6 +572,7 @@ extern "rust-intrinsic" {
     pub fn atomic_or_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// Bitwise xor with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_xor` method by passing
     /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
@@ -525,6 +580,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_xor`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_xor).
     pub fn atomic_xor<T>(dst: *mut T, src: T) -> T;
     /// Bitwise xor with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_xor` method by passing
     /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
@@ -532,6 +588,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_xor`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_xor).
     pub fn atomic_xor_acq<T>(dst: *mut T, src: T) -> T;
     /// Bitwise xor with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_xor` method by passing
     /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html)
@@ -539,6 +596,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_xor`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_xor).
     pub fn atomic_xor_rel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise xor with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_xor` method by passing
     /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html)
@@ -546,6 +604,7 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_xor`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_xor).
     pub fn atomic_xor_acqrel<T>(dst: *mut T, src: T) -> T;
     /// Bitwise xor with the current value, returning the previous value.
+    ///
     /// The stabilized version of this intrinsic is available on the
     /// `std::sync::atomic` types via the `fetch_xor` method by passing
     /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
@@ -553,28 +612,168 @@ extern "rust-intrinsic" {
     /// [`AtomicBool::fetch_xor`](../../std/sync/atomic/struct.AtomicBool.html#method.fetch_xor).
     pub fn atomic_xor_relaxed<T>(dst: *mut T, src: T) -> T;
 
+    /// Maximum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_max` method by passing
+    /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html#variant.SeqCst)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_max`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_max).
     pub fn atomic_max<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_max` method by passing
+    /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html#variant.Acquire)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_max`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_max).
     pub fn atomic_max_acq<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_max` method by passing
+    /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html#variant.Release)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_max`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_max).
     pub fn atomic_max_rel<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_max` method by passing
+    /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html#variant.AcqRel)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_max`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_max).
     pub fn atomic_max_acqrel<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_max` method by passing
+    /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html#variant.Relaxed)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_max`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_max).
     pub fn atomic_max_relaxed<T>(dst: *mut T, src: T) -> T;
 
+    /// Minimum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_min` method by passing
+    /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html#variant.SeqCst)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_min`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_min).
     pub fn atomic_min<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_min` method by passing
+    /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html#variant.Acquire)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_min`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_min).
     pub fn atomic_min_acq<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_min` method by passing
+    /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html#variant.Release)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_min`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_min).
     pub fn atomic_min_rel<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_min` method by passing
+    /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html#variant.AcqRel)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_min`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_min).
     pub fn atomic_min_acqrel<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using a signed comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` signed integer types via the `fetch_min` method by passing
+    /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html#variant.Relaxed)
+    /// as the `order`. For example,
+    /// [`AtomicI32::fetch_min`](../../std/sync/atomic/struct.AtomicI32.html#method.fetch_min).
     pub fn atomic_min_relaxed<T>(dst: *mut T, src: T) -> T;
 
+    /// Minimum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_min` method by passing
+    /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html#variant.SeqCst)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_min`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_min).
     pub fn atomic_umin<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_min` method by passing
+    /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html#variant.Acquire)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_min`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_min).
     pub fn atomic_umin_acq<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_min` method by passing
+    /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html#variant.Release)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_min`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_min).
     pub fn atomic_umin_rel<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_min` method by passing
+    /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html#variant.AcqRel)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_min`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_min).
     pub fn atomic_umin_acqrel<T>(dst: *mut T, src: T) -> T;
+    /// Minimum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_min` method by passing
+    /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html#variant.Relaxed)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_min`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_min).
     pub fn atomic_umin_relaxed<T>(dst: *mut T, src: T) -> T;
 
+    /// Maximum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_max` method by passing
+    /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html#variant.SeqCst)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_max`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_max).
     pub fn atomic_umax<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_max` method by passing
+    /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html#variant.Acquire)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_max`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_max).
     pub fn atomic_umax_acq<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_max` method by passing
+    /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html#variant.Release)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_max`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_max).
     pub fn atomic_umax_rel<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_max` method by passing
+    /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html#variant.AcqRel)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_max`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_max).
     pub fn atomic_umax_acqrel<T>(dst: *mut T, src: T) -> T;
+    /// Maximum with the current value using an unsigned comparison.
+    ///
+    /// The stabilized version of this intrinsic is available on the
+    /// `std::sync::atomic` unsigned integer types via the `fetch_max` method by passing
+    /// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html#variant.Relaxed)
+    /// as the `order`. For example,
+    /// [`AtomicU32::fetch_max`](../../std/sync/atomic/struct.AtomicU32.html#method.fetch_max).
     pub fn atomic_umax_relaxed<T>(dst: *mut T, src: T) -> T;
 
     /// The `prefetch` intrinsic is a hint to the code generator to insert a prefetch instruction
@@ -613,9 +812,37 @@ extern "rust-intrinsic" {
 
 extern "rust-intrinsic" {
 
+    /// An atomic fence.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::fence`](../../std/sync/atomic/fn.fence.html)
+    /// by passing
+    /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html#variant.SeqCst)
+    /// as the `order`.
     pub fn atomic_fence();
+    /// An atomic fence.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::fence`](../../std/sync/atomic/fn.fence.html)
+    /// by passing
+    /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html#variant.Acquire)
+    /// as the `order`.
     pub fn atomic_fence_acq();
+    /// An atomic fence.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::fence`](../../std/sync/atomic/fn.fence.html)
+    /// by passing
+    /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html#variant.Release)
+    /// as the `order`.
     pub fn atomic_fence_rel();
+    /// An atomic fence.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::fence`](../../std/sync/atomic/fn.fence.html)
+    /// by passing
+    /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html#variant.AcqRel)
+    /// as the `order`.
     pub fn atomic_fence_acqrel();
 
     /// A compiler-only memory barrier.
@@ -624,9 +851,51 @@ extern "rust-intrinsic" {
     /// compiler, but no instructions will be emitted for it. This is
     /// appropriate for operations on the same thread that may be preempted,
     /// such as when interacting with signal handlers.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::compiler_fence`](../../std/sync/atomic/fn.compiler_fence.html)
+    /// by passing
+    /// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html#variant.SeqCst)
+    /// as the `order`.
     pub fn atomic_singlethreadfence();
+    /// A compiler-only memory barrier.
+    ///
+    /// Memory accesses will never be reordered across this barrier by the
+    /// compiler, but no instructions will be emitted for it. This is
+    /// appropriate for operations on the same thread that may be preempted,
+    /// such as when interacting with signal handlers.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::compiler_fence`](../../std/sync/atomic/fn.compiler_fence.html)
+    /// by passing
+    /// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html#variant.Acquire)
+    /// as the `order`.
     pub fn atomic_singlethreadfence_acq();
+    /// A compiler-only memory barrier.
+    ///
+    /// Memory accesses will never be reordered across this barrier by the
+    /// compiler, but no instructions will be emitted for it. This is
+    /// appropriate for operations on the same thread that may be preempted,
+    /// such as when interacting with signal handlers.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::compiler_fence`](../../std/sync/atomic/fn.compiler_fence.html)
+    /// by passing
+    /// [`Ordering::Release`](../../std/sync/atomic/enum.Ordering.html#variant.Release)
+    /// as the `order`.
     pub fn atomic_singlethreadfence_rel();
+    /// A compiler-only memory barrier.
+    ///
+    /// Memory accesses will never be reordered across this barrier by the
+    /// compiler, but no instructions will be emitted for it. This is
+    /// appropriate for operations on the same thread that may be preempted,
+    /// such as when interacting with signal handlers.
+    ///
+    /// The stabilized version of this intrinsic is available in
+    /// [`std::sync::atomic::compiler_fence`](../../std/sync/atomic/fn.compiler_fence.html)
+    /// by passing
+    /// [`Ordering::AcqRel`](../../std/sync/atomic/enum.Ordering.html#variant.AcqRel)
+    /// as the `order`.
     pub fn atomic_singlethreadfence_acqrel();
 
     /// Magic intrinsic that derives its meaning from attributes
@@ -693,8 +962,15 @@ extern "rust-intrinsic" {
     /// Moves a value to an uninitialized memory location.
     ///
     /// Drop glue is not run on the destination.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::ptr::write`](../../std/ptr/fn.write.html).
     pub fn move_val_init<T>(dst: *mut T, src: T);
 
+    /// The minimum alignment of a type.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::mem::align_of`](../../std/mem/fn.align_of.html).
     #[rustc_const_stable(feature = "const_min_align_of", since = "1.40.0")]
     pub fn min_align_of<T>() -> usize;
     #[rustc_const_unstable(feature = "const_pref_align_of", issue = "none")]
@@ -705,15 +981,25 @@ extern "rust-intrinsic" {
     /// The stabilized version of this intrinsic is
     /// [`std::mem::size_of_val`](../../std/mem/fn.size_of_val.html).
     pub fn size_of_val<T: ?Sized>(_: &T) -> usize;
+    /// The minimum alignment of the type of the value that `val` points to.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::mem::min_align_of_val`](../../std/mem/fn.min_align_of_val.html).
     pub fn min_align_of_val<T: ?Sized>(_: &T) -> usize;
 
     /// Gets a static string slice containing the name of a type.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::any::type_name`](../../std/any/fn.type_name.html)
     #[rustc_const_unstable(feature = "const_type_name", issue = "none")]
     pub fn type_name<T: ?Sized>() -> &'static str;
 
     /// Gets an identifier which is globally unique to the specified type. This
     /// function will return the same value for a type regardless of whichever
     /// crate it is invoked in.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::any::TypeId::of`](../../std/any/struct.TypeId.html#method.of)
     #[rustc_const_unstable(feature = "const_type_id", issue = "none")]
     pub fn type_id<T: ?Sized + 'static>() -> u64;
 
@@ -731,6 +1017,9 @@ extern "rust-intrinsic" {
     /// which is unsafe unless `T` is `Copy`. Also, even if T is
     /// `Copy`, an all-zero value may not correspond to any legitimate
     /// state for the type in question.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::mem::zeroed`](../../std/mem/fn.zeroed.html).
     #[unstable(
         feature = "core_intrinsics",
         reason = "intrinsics are unlikely to ever be stabilized, instead \
@@ -748,6 +1037,9 @@ extern "rust-intrinsic" {
     /// state, which means it may claim either dropped or
     /// undropped. In the general case one must use `ptr::write` to
     /// initialize memory previous set to the result of `uninit`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::mem::MaybeUninit`](../../std/mem/union.MaybeUninit.html).
     #[unstable(
         feature = "core_intrinsics",
         reason = "intrinsics are unlikely to ever be stabilized, instead \
@@ -881,7 +1173,8 @@ extern "rust-intrinsic" {
     /// // clone the vector as we will reuse them later
     /// let v_clone = v_orig.clone();
     ///
-    /// // Using transmute: this is Undefined Behavior, and a bad idea.
+    /// // Using transmute: this relies on the unspecified data layout of `Vec`, which is a
+    /// // bad idea and could cause Undefined Behavior.
     /// // However, it is no-copy.
     /// let v_transmuted = unsafe {
     ///     std::mem::transmute::<Vec<&i32>, Vec<Option<&i32>>>(v_clone)
@@ -897,13 +1190,14 @@ extern "rust-intrinsic" {
     ///
     /// let v_clone = v_orig.clone();
     ///
-    /// // The no-copy, unsafe way, still using transmute, but not UB.
-    /// // This is equivalent to the original, but safer, and reuses the
-    /// // same `Vec` internals. Therefore, the new inner type must have the
-    /// // exact same size, and the same alignment, as the old type.
+    /// // The no-copy, unsafe way, still using transmute, but not relying on the data layout.
+    /// // Like the first approach, this reuses the `Vec` internals.
+    /// // Therefore, the new inner type must have the
+    /// // exact same size, *and the same alignment*, as the old type.
     /// // The same caveats exist for this method as transmute, for
     /// // the original inner type (`&i32`) to the converted inner type
-    /// // (`Option<&i32>`), so read the nomicon pages linked above.
+    /// // (`Option<&i32>`), so read the nomicon pages linked above and also
+    /// // consult the [`from_raw_parts`] documentation.
     /// let v_from_raw = unsafe {
     // FIXME Update this when vec_into_raw_parts is stabilized
     ///     // Ensure the original vector is not dropped.
@@ -914,6 +1208,8 @@ extern "rust-intrinsic" {
     /// };
     /// ```
     ///
+    /// [`from_raw_parts`]: ../../std/vec/struct.Vec.html#method.from_raw_parts
+    ///
     /// Implementing `split_at_mut`:
     ///
     /// ```
@@ -993,6 +1289,9 @@ extern "rust-intrinsic" {
     /// byte past the end of an allocated object. If either pointer is out of
     /// bounds or arithmetic overflow occurs then any further use of the
     /// returned value will result in undefined behavior.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::pointer::offset`](../../std/primitive.pointer.html#method.offset).
     pub fn offset<T>(dst: *const T, offset: isize) -> *const T;
 
     /// Calculates the offset from a pointer, potentially wrapping.
@@ -1006,6 +1305,9 @@ extern "rust-intrinsic" {
     /// resulting pointer to point into or one byte past the end of an allocated
     /// object, and it wraps with two's complement arithmetic. The resulting
     /// value is not necessarily valid to be used to actually access memory.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::pointer::wrapping_offset`](../../std/primitive.pointer.html#method.wrapping_offset).
     pub fn arith_offset<T>(dst: *const T, offset: isize) -> *const T;
 
     /// Equivalent to the appropriate `llvm.memcpy.p0i8.0i8.*` intrinsic, with
@@ -1031,10 +1333,12 @@ extern "rust-intrinsic" {
     pub fn volatile_set_memory<T>(dst: *mut T, val: u8, count: usize);
 
     /// Performs a volatile load from the `src` pointer.
+    ///
     /// The stabilized version of this intrinsic is
     /// [`std::ptr::read_volatile`](../../std/ptr/fn.read_volatile.html).
     pub fn volatile_load<T>(src: *const T) -> T;
     /// Performs a volatile store to the `dst` pointer.
+    ///
     /// The stabilized version of this intrinsic is
     /// [`std::ptr::write_volatile`](../../std/ptr/fn.write_volatile.html).
     pub fn volatile_store<T>(dst: *mut T, val: T);
@@ -1047,92 +1351,200 @@ extern "rust-intrinsic" {
     pub fn unaligned_volatile_store<T>(dst: *mut T, val: T);
 
     /// Returns the square root of an `f32`
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::sqrt`](../../std/primitive.f32.html#method.sqrt)
     pub fn sqrtf32(x: f32) -> f32;
     /// Returns the square root of an `f64`
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::sqrt`](../../std/primitive.f64.html#method.sqrt)
     pub fn sqrtf64(x: f64) -> f64;
 
     /// Raises an `f32` to an integer power.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::powi`](../../std/primitive.f32.html#method.powi)
     pub fn powif32(a: f32, x: i32) -> f32;
     /// Raises an `f64` to an integer power.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::powi`](../../std/primitive.f64.html#method.powi)
     pub fn powif64(a: f64, x: i32) -> f64;
 
     /// Returns the sine of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::sin`](../../std/primitive.f32.html#method.sin)
     pub fn sinf32(x: f32) -> f32;
     /// Returns the sine of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::sin`](../../std/primitive.f64.html#method.sin)
     pub fn sinf64(x: f64) -> f64;
 
     /// Returns the cosine of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::cos`](../../std/primitive.f32.html#method.cos)
     pub fn cosf32(x: f32) -> f32;
     /// Returns the cosine of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::cos`](../../std/primitive.f64.html#method.cos)
     pub fn cosf64(x: f64) -> f64;
 
     /// Raises an `f32` to an `f32` power.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::powf`](../../std/primitive.f32.html#method.powf)
     pub fn powf32(a: f32, x: f32) -> f32;
     /// Raises an `f64` to an `f64` power.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::powf`](../../std/primitive.f64.html#method.powf)
     pub fn powf64(a: f64, x: f64) -> f64;
 
     /// Returns the exponential of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::exp`](../../std/primitive.f32.html#method.exp)
     pub fn expf32(x: f32) -> f32;
     /// Returns the exponential of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::exp`](../../std/primitive.f64.html#method.exp)
     pub fn expf64(x: f64) -> f64;
 
     /// Returns 2 raised to the power of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::exp2`](../../std/primitive.f32.html#method.exp2)
     pub fn exp2f32(x: f32) -> f32;
     /// Returns 2 raised to the power of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::exp2`](../../std/primitive.f64.html#method.exp2)
     pub fn exp2f64(x: f64) -> f64;
 
     /// Returns the natural logarithm of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::ln`](../../std/primitive.f32.html#method.ln)
     pub fn logf32(x: f32) -> f32;
     /// Returns the natural logarithm of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::ln`](../../std/primitive.f64.html#method.ln)
     pub fn logf64(x: f64) -> f64;
 
     /// Returns the base 10 logarithm of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::log10`](../../std/primitive.f32.html#method.log10)
     pub fn log10f32(x: f32) -> f32;
     /// Returns the base 10 logarithm of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::log10`](../../std/primitive.f64.html#method.log10)
     pub fn log10f64(x: f64) -> f64;
 
     /// Returns the base 2 logarithm of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::log2`](../../std/primitive.f32.html#method.log2)
     pub fn log2f32(x: f32) -> f32;
     /// Returns the base 2 logarithm of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::log2`](../../std/primitive.f64.html#method.log2)
     pub fn log2f64(x: f64) -> f64;
 
     /// Returns `a * b + c` for `f32` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::mul_add`](../../std/primitive.f32.html#method.mul_add)
     pub fn fmaf32(a: f32, b: f32, c: f32) -> f32;
     /// Returns `a * b + c` for `f64` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::mul_add`](../../std/primitive.f64.html#method.mul_add)
     pub fn fmaf64(a: f64, b: f64, c: f64) -> f64;
 
     /// Returns the absolute value of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::abs`](../../std/primitive.f32.html#method.abs)
     pub fn fabsf32(x: f32) -> f32;
     /// Returns the absolute value of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::abs`](../../std/primitive.f64.html#method.abs)
     pub fn fabsf64(x: f64) -> f64;
 
     /// Returns the minimum of two `f32` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::min`](../../std/primitive.f32.html#method.min)
     pub fn minnumf32(x: f32, y: f32) -> f32;
     /// Returns the minimum of two `f64` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::min`](../../std/primitive.f64.html#method.min)
     pub fn minnumf64(x: f64, y: f64) -> f64;
     /// Returns the maximum of two `f32` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::max`](../../std/primitive.f32.html#method.max)
     pub fn maxnumf32(x: f32, y: f32) -> f32;
     /// Returns the maximum of two `f64` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::max`](../../std/primitive.f64.html#method.max)
     pub fn maxnumf64(x: f64, y: f64) -> f64;
 
     /// Copies the sign from `y` to `x` for `f32` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::copysign`](../../std/primitive.f32.html#method.copysign)
     pub fn copysignf32(x: f32, y: f32) -> f32;
     /// Copies the sign from `y` to `x` for `f64` values.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::copysign`](../../std/primitive.f64.html#method.copysign)
     pub fn copysignf64(x: f64, y: f64) -> f64;
 
     /// Returns the largest integer less than or equal to an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::floor`](../../std/primitive.f32.html#method.floor)
     pub fn floorf32(x: f32) -> f32;
     /// Returns the largest integer less than or equal to an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::floor`](../../std/primitive.f64.html#method.floor)
     pub fn floorf64(x: f64) -> f64;
 
     /// Returns the smallest integer greater than or equal to an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::ceil`](../../std/primitive.f32.html#method.ceil)
     pub fn ceilf32(x: f32) -> f32;
     /// Returns the smallest integer greater than or equal to an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::ceil`](../../std/primitive.f64.html#method.ceil)
     pub fn ceilf64(x: f64) -> f64;
 
     /// Returns the integer part of an `f32`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::trunc`](../../std/primitive.f32.html#method.trunc)
     pub fn truncf32(x: f32) -> f32;
     /// Returns the integer part of an `f64`.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::trunc`](../../std/primitive.f64.html#method.trunc)
     pub fn truncf64(x: f64) -> f64;
 
     /// Returns the nearest integer to an `f32`. May raise an inexact floating-point exception
@@ -1148,8 +1560,14 @@ extern "rust-intrinsic" {
     pub fn nearbyintf64(x: f64) -> f64;
 
     /// Returns the nearest integer to an `f32`. Rounds half-way cases away from zero.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f32::round`](../../std/primitive.f32.html#method.round)
     pub fn roundf32(x: f32) -> f32;
     /// Returns the nearest integer to an `f64`. Rounds half-way cases away from zero.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::f64::round`](../../std/primitive.f64.html#method.round)
     pub fn roundf64(x: f64) -> f64;
 
     /// Float addition that allows optimizations based on algebraic rules.
@@ -1173,15 +1591,24 @@ extern "rust-intrinsic" {
     pub fn frem_fast<T>(a: T, b: T) -> T;
 
     /// Convert with LLVM’s fptoui/fptosi, which may return undef for values out of range
-    /// https://github.com/rust-lang/rust/issues/10184
+    /// (<https://github.com/rust-lang/rust/issues/10184>)
+    /// This is under stabilization at <https://github.com/rust-lang/rust/issues/67058>
     pub fn float_to_int_approx_unchecked<Float, Int>(value: Float) -> Int;
 
     /// Returns the number of bits set in an integer type `T`
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `count_ones` method. For example,
+    /// [`std::u32::count_ones`](../../std/primitive.u32.html#method.count_ones)
     #[rustc_const_stable(feature = "const_ctpop", since = "1.40.0")]
     pub fn ctpop<T>(x: T) -> T;
 
     /// Returns the number of leading unset bits (zeroes) in an integer type `T`.
     ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `leading_zeros` method. For example,
+    /// [`std::u32::leading_zeros`](../../std/primitive.u32.html#method.leading_zeros)
+    ///
     /// # Examples
     ///
     /// ```
@@ -1227,6 +1654,10 @@ extern "rust-intrinsic" {
 
     /// Returns the number of trailing unset bits (zeroes) in an integer type `T`.
     ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `trailing_zeros` method. For example,
+    /// [`std::u32::trailing_zeros`](../../std/primitive.u32.html#method.trailing_zeros)
+    ///
     /// # Examples
     ///
     /// ```
@@ -1271,14 +1702,23 @@ extern "rust-intrinsic" {
     pub fn cttz_nonzero<T>(x: T) -> T;
 
     /// Reverses the bytes in an integer type `T`.
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `swap_bytes` method. For example,
+    /// [`std::u32::swap_bytes`](../../std/primitive.u32.html#method.swap_bytes)
     #[rustc_const_stable(feature = "const_bswap", since = "1.40.0")]
     pub fn bswap<T>(x: T) -> T;
 
     /// Reverses the bits in an integer type `T`.
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `reverse_bits` method. For example,
+    /// [`std::u32::reverse_bits`](../../std/primitive.u32.html#method.reverse_bits)
     #[rustc_const_stable(feature = "const_bitreverse", since = "1.40.0")]
     pub fn bitreverse<T>(x: T) -> T;
 
     /// Performs checked integer addition.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `overflowing_add` method. For example,
     /// [`std::u32::overflowing_add`](../../std/primitive.u32.html#method.overflowing_add)
@@ -1286,6 +1726,7 @@ extern "rust-intrinsic" {
     pub fn add_with_overflow<T>(x: T, y: T) -> (T, bool);
 
     /// Performs checked integer subtraction
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `overflowing_sub` method. For example,
     /// [`std::u32::overflowing_sub`](../../std/primitive.u32.html#method.overflowing_sub)
@@ -1293,6 +1734,7 @@ extern "rust-intrinsic" {
     pub fn sub_with_overflow<T>(x: T, y: T) -> (T, bool);
 
     /// Performs checked integer multiplication
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `overflowing_mul` method. For example,
     /// [`std::u32::overflowing_mul`](../../std/primitive.u32.html#method.overflowing_mul)
@@ -1305,33 +1747,55 @@ extern "rust-intrinsic" {
 
     /// Performs an unchecked division, resulting in undefined behavior
     /// where y = 0 or x = `T::min_value()` and y = -1
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `checked_div` method. For example,
+    /// [`std::u32::checked_div`](../../std/primitive.u32.html#method.checked_div)
+    #[rustc_const_unstable(feature = "const_int_unchecked_arith", issue = "none")]
     pub fn unchecked_div<T>(x: T, y: T) -> T;
     /// Returns the remainder of an unchecked division, resulting in
     /// undefined behavior where y = 0 or x = `T::min_value()` and y = -1
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `checked_rem` method. For example,
+    /// [`std::u32::checked_rem`](../../std/primitive.u32.html#method.checked_rem)
+    #[rustc_const_unstable(feature = "const_int_unchecked_arith", issue = "none")]
     pub fn unchecked_rem<T>(x: T, y: T) -> T;
 
     /// Performs an unchecked left shift, resulting in undefined behavior when
     /// y < 0 or y >= N, where N is the width of T in bits.
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `checked_shl` method. For example,
+    /// [`std::u32::checked_shl`](../../std/primitive.u32.html#method.checked_shl)
     #[rustc_const_stable(feature = "const_int_unchecked", since = "1.40.0")]
     pub fn unchecked_shl<T>(x: T, y: T) -> T;
     /// Performs an unchecked right shift, resulting in undefined behavior when
     /// y < 0 or y >= N, where N is the width of T in bits.
+    ///
+    /// The stabilized versions of this intrinsic are available on the integer
+    /// primitives via the `checked_shr` method. For example,
+    /// [`std::u32::checked_shr`](../../std/primitive.u32.html#method.checked_shr)
     #[rustc_const_stable(feature = "const_int_unchecked", since = "1.40.0")]
     pub fn unchecked_shr<T>(x: T, y: T) -> T;
 
     /// Returns the result of an unchecked addition, resulting in
     /// undefined behavior when `x + y > T::max_value()` or `x + y < T::min_value()`.
+    #[rustc_const_unstable(feature = "const_int_unchecked_arith", issue = "none")]
     pub fn unchecked_add<T>(x: T, y: T) -> T;
 
     /// Returns the result of an unchecked subtraction, resulting in
     /// undefined behavior when `x - y > T::max_value()` or `x - y < T::min_value()`.
+    #[rustc_const_unstable(feature = "const_int_unchecked_arith", issue = "none")]
     pub fn unchecked_sub<T>(x: T, y: T) -> T;
 
     /// Returns the result of an unchecked multiplication, resulting in
     /// undefined behavior when `x * y > T::max_value()` or `x * y < T::min_value()`.
+    #[rustc_const_unstable(feature = "const_int_unchecked_arith", issue = "none")]
     pub fn unchecked_mul<T>(x: T, y: T) -> T;
 
     /// Performs rotate left.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `rotate_left` method. For example,
     /// [`std::u32::rotate_left`](../../std/primitive.u32.html#method.rotate_left)
@@ -1339,6 +1803,7 @@ extern "rust-intrinsic" {
     pub fn rotate_left<T>(x: T, y: T) -> T;
 
     /// Performs rotate right.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `rotate_right` method. For example,
     /// [`std::u32::rotate_right`](../../std/primitive.u32.html#method.rotate_right)
@@ -1346,31 +1811,36 @@ extern "rust-intrinsic" {
     pub fn rotate_right<T>(x: T, y: T) -> T;
 
     /// Returns (a + b) mod 2<sup>N</sup>, where N is the width of T in bits.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
-    /// primitives via the `wrapping_add` method. For example,
-    /// [`std::u32::wrapping_add`](../../std/primitive.u32.html#method.wrapping_add)
+    /// primitives via the `checked_add` method. For example,
+    /// [`std::u32::checked_add`](../../std/primitive.u32.html#method.checked_add)
     #[rustc_const_stable(feature = "const_int_wrapping", since = "1.40.0")]
     pub fn wrapping_add<T>(a: T, b: T) -> T;
     /// Returns (a - b) mod 2<sup>N</sup>, where N is the width of T in bits.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
-    /// primitives via the `wrapping_sub` method. For example,
-    /// [`std::u32::wrapping_sub`](../../std/primitive.u32.html#method.wrapping_sub)
+    /// primitives via the `checked_sub` method. For example,
+    /// [`std::u32::checked_sub`](../../std/primitive.u32.html#method.checked_sub)
     #[rustc_const_stable(feature = "const_int_wrapping", since = "1.40.0")]
     pub fn wrapping_sub<T>(a: T, b: T) -> T;
     /// Returns (a * b) mod 2<sup>N</sup>, where N is the width of T in bits.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
-    /// primitives via the `wrapping_mul` method. For example,
-    /// [`std::u32::wrapping_mul`](../../std/primitive.u32.html#method.wrapping_mul)
+    /// primitives via the `checked_mul` method. For example,
+    /// [`std::u32::checked_mul`](../../std/primitive.u32.html#method.checked_mul)
     #[rustc_const_stable(feature = "const_int_wrapping", since = "1.40.0")]
     pub fn wrapping_mul<T>(a: T, b: T) -> T;
 
     /// Computes `a + b`, while saturating at numeric bounds.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `saturating_add` method. For example,
     /// [`std::u32::saturating_add`](../../std/primitive.u32.html#method.saturating_add)
     #[rustc_const_stable(feature = "const_int_saturating", since = "1.40.0")]
     pub fn saturating_add<T>(a: T, b: T) -> T;
     /// Computes `a - b`, while saturating at numeric bounds.
+    ///
     /// The stabilized versions of this intrinsic are available on the integer
     /// primitives via the `saturating_sub` method. For example,
     /// [`std::u32::saturating_sub`](../../std/primitive.u32.html#method.saturating_sub)
@@ -1379,6 +1849,9 @@ extern "rust-intrinsic" {
 
     /// Returns the value of the discriminant for the variant in 'v',
     /// cast to a `u64`; if `T` has no discriminant, returns 0.
+    ///
+    /// The stabilized version of this intrinsic is
+    /// [`std::mem::discriminant`](../../std/mem/fn.discriminant.html)
     pub fn discriminant_value<T>(v: &T) -> u64;
 
     /// Rust's "try catch" construct which invokes the function pointer `f` with
@@ -1418,13 +1891,15 @@ pub(crate) fn is_aligned_and_not_null<T>(ptr: *const T) -> bool {
 }
 
 /// Checks whether the regions of memory starting at `src` and `dst` of size
-/// `count * size_of::<T>()` overlap.
-fn overlaps<T>(src: *const T, dst: *const T, count: usize) -> bool {
+/// `count * size_of::<T>()` do *not* overlap.
+pub(crate) fn is_nonoverlapping<T>(src: *const T, dst: *const T, count: usize) -> bool {
     let src_usize = src as usize;
     let dst_usize = dst as usize;
     let size = mem::size_of::<T>().checked_mul(count).unwrap();
     let diff = if src_usize > dst_usize { src_usize - dst_usize } else { dst_usize - src_usize };
-    size > diff
+    // If the absolute distance between the ptrs is at least as big as the size of the buffer,
+    // they do not overlap.
+    diff >= size
 }
 
 /// Copies `count * size_of::<T>()` bytes from `src` to `dst`. The source
@@ -1510,6 +1985,7 @@ fn overlaps<T>(src: *const T, dst: *const T, count: usize) -> bool {
 /// ```
 ///
 /// [`Vec::append`]: ../../std/vec/struct.Vec.html#method.append
+#[doc(alias = "memcpy")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[inline]
 pub unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize) {
@@ -1519,7 +1995,7 @@ pub unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize) {
 
     debug_assert!(is_aligned_and_not_null(src), "attempt to copy from unaligned or null pointer");
     debug_assert!(is_aligned_and_not_null(dst), "attempt to copy to unaligned or null pointer");
-    debug_assert!(!overlaps(src, dst, count), "attempt to copy to overlapping memory");
+    debug_assert!(is_nonoverlapping(src, dst, count), "attempt to copy to overlapping memory");
     copy_nonoverlapping(src, dst, count)
 }
 
@@ -1574,6 +2050,7 @@ pub unsafe fn copy_nonoverlapping<T>(src: *const T, dst: *mut T, count: usize) {
 ///     dst
 /// }
 /// ```
+#[doc(alias = "memmove")]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[inline]
 pub unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
diff --git a/src/libcore/iter/adapters/mod.rs b/src/libcore/iter/adapters/mod.rs
index 5787b9174e..02dc9b8f82 100644
--- a/src/libcore/iter/adapters/mod.rs
+++ b/src/libcore/iter/adapters/mod.rs
@@ -1752,6 +1752,95 @@ where
     }
 }
 
+/// An iterator that only accepts elements while `predicate` returns `Some(_)`.
+///
+/// This `struct` is created by the [`map_while`] method on [`Iterator`]. See its
+/// documentation for more.
+///
+/// [`map_while`]: trait.Iterator.html#method.map_while
+/// [`Iterator`]: trait.Iterator.html
+#[must_use = "iterators are lazy and do nothing unless consumed"]
+#[unstable(feature = "iter_map_while", reason = "recently added", issue = "68537")]
+#[derive(Clone)]
+pub struct MapWhile<I, P> {
+    iter: I,
+    finished: bool,
+    predicate: P,
+}
+
+impl<I, P> MapWhile<I, P> {
+    pub(super) fn new(iter: I, predicate: P) -> MapWhile<I, P> {
+        MapWhile { iter, finished: false, predicate }
+    }
+}
+
+#[unstable(feature = "iter_map_while", reason = "recently added", issue = "68537")]
+impl<I: fmt::Debug, P> fmt::Debug for MapWhile<I, P> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("MapWhile").field("iter", &self.iter).field("flag", &self.finished).finish()
+    }
+}
+
+#[unstable(feature = "iter_map_while", reason = "recently added", issue = "68537")]
+impl<B, I: Iterator, P> Iterator for MapWhile<I, P>
+where
+    P: FnMut(I::Item) -> Option<B>,
+{
+    type Item = B;
+
+    #[inline]
+    fn next(&mut self) -> Option<B> {
+        if self.finished {
+            None
+        } else {
+            let x = self.iter.next()?;
+            let ret = (self.predicate)(x);
+            self.finished = ret.is_none();
+            ret
+        }
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        if self.finished {
+            (0, Some(0))
+        } else {
+            let (_, upper) = self.iter.size_hint();
+            (0, upper) // can't know a lower bound, due to the predicate
+        }
+    }
+
+    #[inline]
+    fn try_fold<Acc, Fold, R>(&mut self, init: Acc, fold: Fold) -> R
+    where
+        Self: Sized,
+        Fold: FnMut(Acc, Self::Item) -> R,
+        R: Try<Ok = Acc>,
+    {
+        fn check<'a, B, T, Acc, R: Try<Ok = Acc>>(
+            flag: &'a mut bool,
+            p: &'a mut impl FnMut(T) -> Option<B>,
+            mut fold: impl FnMut(Acc, B) -> R + 'a,
+        ) -> impl FnMut(Acc, T) -> LoopState<Acc, R> + 'a {
+            move |acc, x| match p(x) {
+                Some(item) => LoopState::from_try(fold(acc, item)),
+                None => {
+                    *flag = true;
+                    LoopState::Break(Try::from_ok(acc))
+                }
+            }
+        }
+
+        if self.finished {
+            Try::from_ok(init)
+        } else {
+            let flag = &mut self.finished;
+            let p = &mut self.predicate;
+            self.iter.try_fold(init, check(flag, p, fold)).into_try()
+        }
+    }
+}
+
 #[stable(feature = "fused", since = "1.26.0")]
 impl<I, P> FusedIterator for TakeWhile<I, P>
 where
@@ -1801,17 +1890,13 @@ where
     #[inline]
     fn nth(&mut self, n: usize) -> Option<I::Item> {
         // Can't just add n + self.n due to overflow.
-        if self.n == 0 {
-            self.iter.nth(n)
-        } else {
+        if self.n > 0 {
             let to_skip = self.n;
             self.n = 0;
             // nth(n) skips n+1
-            if self.iter.nth(to_skip - 1).is_none() {
-                return None;
-            }
-            self.iter.nth(n)
+            self.iter.nth(to_skip - 1)?;
         }
+        self.iter.nth(n)
     }
 
     #[inline]
@@ -1827,17 +1912,11 @@ where
 
     #[inline]
     fn last(mut self) -> Option<I::Item> {
-        if self.n == 0 {
-            self.iter.last()
-        } else {
-            let next = self.next();
-            if next.is_some() {
-                // recurse. n should be 0.
-                self.last().or(next)
-            } else {
-                None
-            }
+        if self.n > 0 {
+            // nth(n) skips n+1
+            self.iter.nth(self.n - 1)?;
         }
+        self.iter.last()
     }
 
     #[inline]
diff --git a/src/libcore/iter/mod.rs b/src/libcore/iter/mod.rs
index 0d5af3986f..080b70c636 100644
--- a/src/libcore/iter/mod.rs
+++ b/src/libcore/iter/mod.rs
@@ -43,7 +43,7 @@
 //! are elements, and once they've all been exhausted, will return `None` to
 //! indicate that iteration is finished. Individual iterators may choose to
 //! resume iteration, and so calling [`next`] again may or may not eventually
-//! start returning `Some(Item)` again at some point.
+//! start returning `Some(Item)` again at some point (for example, see [`TryIter`]).
 //!
 //! [`Iterator`]'s full definition includes a number of other methods as well,
 //! but they are default methods, built on top of [`next`], and so you get
@@ -56,6 +56,7 @@
 //! [`Iterator`]: trait.Iterator.html
 //! [`next`]: trait.Iterator.html#tymethod.next
 //! [`Option`]: ../../std/option/enum.Option.html
+//! [`TryIter`]: ../../std/sync/mpsc/struct.TryIter.html
 //!
 //! # The three forms of iteration
 //!
@@ -327,7 +328,7 @@ pub use self::sources::{empty, Empty};
 pub use self::sources::{from_fn, FromFn};
 #[stable(feature = "iter_once", since = "1.2.0")]
 pub use self::sources::{once, Once};
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 pub use self::sources::{once_with, OnceWith};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::sources::{repeat, Repeat};
@@ -351,6 +352,8 @@ pub use self::adapters::Cloned;
 pub use self::adapters::Copied;
 #[stable(feature = "iterator_flatten", since = "1.29.0")]
 pub use self::adapters::Flatten;
+#[unstable(feature = "iter_map_while", reason = "recently added", issue = "68537")]
+pub use self::adapters::MapWhile;
 #[stable(feature = "iterator_step_by", since = "1.28.0")]
 pub use self::adapters::StepBy;
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs
index eac3c107d2..28fbd00f36 100644
--- a/src/libcore/iter/range.rs
+++ b/src/libcore/iter/range.rs
@@ -341,16 +341,15 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
 
     #[inline]
     fn next(&mut self) -> Option<A> {
-        self.compute_is_empty();
-        if self.is_empty.unwrap_or_default() {
+        if self.is_empty() {
             return None;
         }
         let is_iterating = self.start < self.end;
-        self.is_empty = Some(!is_iterating);
         Some(if is_iterating {
             let n = self.start.add_one();
             mem::replace(&mut self.start, n)
         } else {
+            self.exhausted = true;
             self.start.clone()
         })
     }
@@ -369,8 +368,7 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
 
     #[inline]
     fn nth(&mut self, n: usize) -> Option<A> {
-        self.compute_is_empty();
-        if self.is_empty.unwrap_or_default() {
+        if self.is_empty() {
             return None;
         }
 
@@ -379,19 +377,20 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
 
             match plus_n.partial_cmp(&self.end) {
                 Some(Less) => {
-                    self.is_empty = Some(false);
                     self.start = plus_n.add_one();
                     return Some(plus_n);
                 }
                 Some(Equal) => {
-                    self.is_empty = Some(true);
+                    self.start = plus_n.clone();
+                    self.exhausted = true;
                     return Some(plus_n);
                 }
                 _ => {}
             }
         }
 
-        self.is_empty = Some(true);
+        self.start = self.end.clone();
+        self.exhausted = true;
         None
     }
 
@@ -402,8 +401,6 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
         F: FnMut(B, Self::Item) -> R,
         R: Try<Ok = B>,
     {
-        self.compute_is_empty();
-
         if self.is_empty() {
             return Try::from_ok(init);
         }
@@ -416,7 +413,7 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
             accum = f(accum, n)?;
         }
 
-        self.is_empty = Some(true);
+        self.exhausted = true;
 
         if self.start == self.end {
             accum = f(accum, self.start.clone())?;
@@ -445,24 +442,22 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
 impl<A: Step> DoubleEndedIterator for ops::RangeInclusive<A> {
     #[inline]
     fn next_back(&mut self) -> Option<A> {
-        self.compute_is_empty();
-        if self.is_empty.unwrap_or_default() {
+        if self.is_empty() {
             return None;
         }
         let is_iterating = self.start < self.end;
-        self.is_empty = Some(!is_iterating);
         Some(if is_iterating {
             let n = self.end.sub_one();
             mem::replace(&mut self.end, n)
         } else {
+            self.exhausted = true;
             self.end.clone()
         })
     }
 
     #[inline]
     fn nth_back(&mut self, n: usize) -> Option<A> {
-        self.compute_is_empty();
-        if self.is_empty.unwrap_or_default() {
+        if self.is_empty() {
             return None;
         }
 
@@ -471,19 +466,20 @@ impl<A: Step> DoubleEndedIterator for ops::RangeInclusive<A> {
 
             match minus_n.partial_cmp(&self.start) {
                 Some(Greater) => {
-                    self.is_empty = Some(false);
                     self.end = minus_n.sub_one();
                     return Some(minus_n);
                 }
                 Some(Equal) => {
-                    self.is_empty = Some(true);
+                    self.end = minus_n.clone();
+                    self.exhausted = true;
                     return Some(minus_n);
                 }
                 _ => {}
             }
         }
 
-        self.is_empty = Some(true);
+        self.end = self.start.clone();
+        self.exhausted = true;
         None
     }
 
@@ -494,8 +490,6 @@ impl<A: Step> DoubleEndedIterator for ops::RangeInclusive<A> {
         F: FnMut(B, Self::Item) -> R,
         R: Try<Ok = B>,
     {
-        self.compute_is_empty();
-
         if self.is_empty() {
             return Try::from_ok(init);
         }
@@ -508,7 +502,7 @@ impl<A: Step> DoubleEndedIterator for ops::RangeInclusive<A> {
             accum = f(accum, n)?;
         }
 
-        self.is_empty = Some(true);
+        self.exhausted = true;
 
         if self.start == self.end {
             accum = f(accum, self.start.clone())?;
diff --git a/src/libcore/iter/sources.rs b/src/libcore/iter/sources.rs
index 25dfc573e4..a1d4e1b31e 100644
--- a/src/libcore/iter/sources.rs
+++ b/src/libcore/iter/sources.rs
@@ -398,13 +398,13 @@ pub fn once<T>(value: T) -> Once<T> {
 /// See its documentation for more.
 ///
 /// [`once_with`]: fn.once_with.html
-#[derive(Copy, Clone, Debug)]
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[derive(Clone, Debug)]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 pub struct OnceWith<F> {
     gen: Option<F>,
 }
 
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 impl<A, F: FnOnce() -> A> Iterator for OnceWith<F> {
     type Item = A;
 
@@ -420,24 +420,24 @@ impl<A, F: FnOnce() -> A> Iterator for OnceWith<F> {
     }
 }
 
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 impl<A, F: FnOnce() -> A> DoubleEndedIterator for OnceWith<F> {
     fn next_back(&mut self) -> Option<A> {
         self.next()
     }
 }
 
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 impl<A, F: FnOnce() -> A> ExactSizeIterator for OnceWith<F> {
     fn len(&self) -> usize {
         self.gen.iter().len()
     }
 }
 
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 impl<A, F: FnOnce() -> A> FusedIterator for OnceWith<F> {}
 
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 unsafe impl<A, F: FnOnce() -> A> TrustedLen for OnceWith<F> {}
 
 /// Creates an iterator that lazily generates a value exactly once by invoking
@@ -458,8 +458,6 @@ unsafe impl<A, F: FnOnce() -> A> TrustedLen for OnceWith<F> {}
 /// Basic usage:
 ///
 /// ```
-/// #![feature(iter_once_with)]
-///
 /// use std::iter;
 ///
 /// // one is the loneliest number
@@ -476,8 +474,6 @@ unsafe impl<A, F: FnOnce() -> A> TrustedLen for OnceWith<F> {}
 /// `.foorc`:
 ///
 /// ```no_run
-/// #![feature(iter_once_with)]
-///
 /// use std::iter;
 /// use std::fs;
 /// use std::path::PathBuf;
@@ -500,7 +496,7 @@ unsafe impl<A, F: FnOnce() -> A> TrustedLen for OnceWith<F> {}
 /// }
 /// ```
 #[inline]
-#[unstable(feature = "iter_once_with", issue = "57581")]
+#[stable(feature = "iter_once_with", since = "1.43.0")]
 pub fn once_with<A, F: FnOnce() -> A>(gen: F) -> OnceWith<F> {
     OnceWith { gen: Some(gen) }
 }
diff --git a/src/libcore/iter/traits/exact_size.rs b/src/libcore/iter/traits/exact_size.rs
index 4a7db348b1..ad87d09588 100644
--- a/src/libcore/iter/traits/exact_size.rs
+++ b/src/libcore/iter/traits/exact_size.rs
@@ -69,8 +69,10 @@
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
 pub trait ExactSizeIterator: Iterator {
-    /// Returns the exact number of times the iterator will iterate.
+    /// Returns the exact length of the iterator.
     ///
+    /// The implementation ensures that the iterator will return exactly `len()`
+    /// more times a `Some(T)` value, before returning `None`.
     /// This method has a default implementation, so you usually should not
     /// implement it directly. However, if you can provide a more efficient
     /// implementation, you can do so. See the [trait-level] docs for an
diff --git a/src/libcore/iter/traits/iterator.rs b/src/libcore/iter/traits/iterator.rs
index 21a569867b..e2ebef9c6c 100644
--- a/src/libcore/iter/traits/iterator.rs
+++ b/src/libcore/iter/traits/iterator.rs
@@ -1,4 +1,6 @@
 // ignore-tidy-filelength
+// This file almost exclusively consists of the definition of `Iterator`. We
+// can't split that into multiple files.
 
 use crate::cmp::{self, Ordering};
 use crate::ops::{Add, Try};
@@ -7,7 +9,9 @@ use super::super::LoopState;
 use super::super::{Chain, Cloned, Copied, Cycle, Enumerate, Filter, FilterMap, Fuse};
 use super::super::{FlatMap, Flatten};
 use super::super::{FromIterator, Product, Sum, Zip};
-use super::super::{Inspect, Map, Peekable, Rev, Scan, Skip, SkipWhile, StepBy, Take, TakeWhile};
+use super::super::{
+    Inspect, Map, MapWhile, Peekable, Rev, Scan, Skip, SkipWhile, StepBy, Take, TakeWhile,
+};
 
 fn _assert_is_object_safe(_: &dyn Iterator<Item = ()>) {}
 
@@ -88,7 +92,6 @@ fn _assert_is_object_safe(_: &dyn Iterator<Item = ()>) {}
     label = "`{Self}` is not an iterator",
     message = "`{Self}` is not an iterator"
 )]
-#[doc(spotlight)]
 #[must_use = "iterators are lazy and do nothing unless consumed"]
 pub trait Iterator {
     /// The type of the elements being iterated over.
@@ -715,6 +718,8 @@ pub trait Iterator {
     /// ```
     ///
     /// of these layers.
+    ///
+    /// Note that `iter.filter(f).next()` is equivalent to `iter.find(f)`.
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn filter<P>(self, predicate: P) -> Filter<Self, P>
@@ -1026,6 +1031,102 @@ pub trait Iterator {
         TakeWhile::new(self, predicate)
     }
 
+    /// Creates an iterator that both yields elements based on a predicate and maps.
+    ///
+    /// `map_while()` takes a closure as an argument. It will call this
+    /// closure on each element of the iterator, and yield elements
+    /// while it returns [`Some(_)`][`Some`].
+    ///
+    /// After [`None`] is returned, `map_while()`'s job is over, and the
+    /// rest of the elements are ignored.
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```
+    /// #![feature(iter_map_while)]
+    /// let a = [-1i32, 4, 0, 1];
+    ///
+    /// let mut iter = a.iter().map_while(|x| 16i32.checked_div(*x));
+    ///
+    /// assert_eq!(iter.next(), Some(-16));
+    /// assert_eq!(iter.next(), Some(4));
+    /// assert_eq!(iter.next(), None);
+    /// ```
+    ///
+    /// Here's the same example, but with [`take_while`] and [`map`]:
+    ///
+    /// [`take_while`]: #method.take_while
+    /// [`map`]: #method.map
+    ///
+    /// ```
+    /// let a = [-1i32, 4, 0, 1];
+    ///
+    /// let mut iter = a.iter()
+    ///                 .map(|x| 16i32.checked_div(*x))
+    ///                 .take_while(|x| x.is_some())
+    ///                 .map(|x| x.unwrap());
+    ///
+    /// assert_eq!(iter.next(), Some(-16));
+    /// assert_eq!(iter.next(), Some(4));
+    /// assert_eq!(iter.next(), None);
+    /// ```
+    ///
+    /// Stopping after an initial [`None`]:
+    ///
+    /// ```
+    /// #![feature(iter_map_while)]
+    /// use std::convert::TryFrom;
+    ///
+    /// let a = [0, -1, 1, -2];
+    ///
+    /// let mut iter = a.iter().map_while(|x| u32::try_from(*x).ok());
+    ///
+    /// assert_eq!(iter.next(), Some(0u32));
+    ///
+    /// // We have more elements that are fit in u32, but since we already
+    /// // got a None, map_while() isn't used any more
+    /// assert_eq!(iter.next(), None);
+    /// ```
+    ///
+    /// Because `map_while()` needs to look at the value in order to see if it
+    /// should be included or not, consuming iterators will see that it is
+    /// removed:
+    ///
+    /// ```
+    /// #![feature(iter_map_while)]
+    /// use std::convert::TryFrom;
+    ///
+    /// let a = [1, 2, -3, 4];
+    /// let mut iter = a.iter();
+    ///
+    /// let result: Vec<u32> = iter.by_ref()
+    ///                            .map_while(|n| u32::try_from(*n).ok())
+    ///                            .collect();
+    ///
+    /// assert_eq!(result, &[1, 2]);
+    ///
+    /// let result: Vec<i32> = iter.cloned().collect();
+    ///
+    /// assert_eq!(result, &[4]);
+    /// ```
+    ///
+    /// The `-3` is no longer there, because it was consumed in order to see if
+    /// the iteration should stop, but wasn't placed back into the iterator.
+    ///
+    /// [`Some`]: ../../std/option/enum.Option.html#variant.Some
+    /// [`None`]: ../../std/option/enum.Option.html#variant.None
+    #[inline]
+    #[unstable(feature = "iter_map_while", reason = "recently added", issue = "68537")]
+    fn map_while<B, P>(self, predicate: P) -> MapWhile<Self, P>
+    where
+        Self: Sized,
+        P: FnMut(Self::Item) -> Option<B>,
+    {
+        MapWhile::new(self, predicate)
+    }
+
     /// Creates an iterator that skips the first `n` elements.
     ///
     /// After they have been consumed, the rest of the elements are yielded.
@@ -2052,6 +2153,8 @@ pub trait Iterator {
     /// // we can still use `iter`, as there are more elements.
     /// assert_eq!(iter.next(), Some(&3));
     /// ```
+    ///
+    /// Note that `iter.find(f)` is equivalent to `iter.filter(f).next()`.
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
     fn find<P>(&mut self, predicate: P) -> Option<Self::Item>
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index f77b4d7461..81a3c419db 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -70,8 +70,17 @@
 #![feature(bound_cloned)]
 #![feature(cfg_target_has_atomic)]
 #![feature(concat_idents)]
+#![feature(const_ascii_ctype_on_intrinsics)]
 #![feature(const_alloc_layout)]
 #![feature(const_if_match)]
+#![feature(const_loop)]
+#![feature(const_checked_int_methods)]
+#![feature(const_euclidean_int_methods)]
+#![feature(const_overflowing_int_methods)]
+#![feature(const_saturating_int_methods)]
+#![feature(const_int_unchecked_arith)]
+#![feature(const_int_pow)]
+#![feature(constctlz)]
 #![feature(const_panic)]
 #![feature(const_fn_union)]
 #![feature(const_generics)]
@@ -81,13 +90,11 @@
 #![feature(custom_inner_attributes)]
 #![feature(decl_macro)]
 #![feature(doc_cfg)]
-#![feature(doc_spotlight)]
 #![feature(extern_types)]
 #![feature(fundamental)]
 #![feature(intrinsics)]
 #![feature(try_find)]
 #![feature(is_sorted)]
-#![feature(iter_once_with)]
 #![feature(lang_items)]
 #![feature(link_llvm_intrinsics)]
 #![feature(never_type)]
@@ -133,7 +140,7 @@
 #![feature(associated_type_bounds)]
 #![feature(const_type_id)]
 #![feature(const_caller_location)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
+#![cfg_attr(not(bootstrap), feature(no_niche))] // rust-lang/rust#68303
 
 #[prelude_import]
 #[allow(unused)]
@@ -150,10 +157,6 @@ mod internal_macros;
 #[macro_use]
 mod int_macros;
 
-#[path = "num/uint_macros.rs"]
-#[macro_use]
-mod uint_macros;
-
 #[path = "num/i128.rs"]
 pub mod i128;
 #[path = "num/i16.rs"]
@@ -258,6 +261,9 @@ mod bool;
 mod tuple;
 mod unit;
 
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub mod primitive;
+
 // Pull in the `core_arch` crate directly into libcore. The contents of
 // `core_arch` are in a different repository: rust-lang/stdarch.
 //
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index b4b595f330..2800f11cc0 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -727,6 +727,10 @@ unsafe impl<T: ?Sized> Freeze for &mut T {}
 /// [`Pin<P>`]: ../pin/struct.Pin.html
 /// [`pin module`]: ../../std/pin/index.html
 #[stable(feature = "pin", since = "1.33.0")]
+#[rustc_on_unimplemented(
+    on(_Self = "std::future::Future", note = "consider using `Box::pin`",),
+    message = "`{Self}` cannot be unpinned"
+)]
 #[lang = "unpin"]
 pub auto trait Unpin {}
 
diff --git a/src/libcore/mem/manually_drop.rs b/src/libcore/mem/manually_drop.rs
index 4c3b81ea5e..9e5c2b10d0 100644
--- a/src/libcore/mem/manually_drop.rs
+++ b/src/libcore/mem/manually_drop.rs
@@ -93,7 +93,7 @@ impl<T> ManuallyDrop<T> {
     /// Instead of using [`ManuallyDrop::drop`] to manually drop the value,
     /// you can use this method to take the value and use it however desired.
     ///
-    /// Whenever possible, it is preferrable to use [`into_inner`][`ManuallyDrop::into_inner`]
+    /// Whenever possible, it is preferable to use [`into_inner`][`ManuallyDrop::into_inner`]
     /// instead, which prevents duplicating the content of the `ManuallyDrop<T>`.
     ///
     /// # Safety
diff --git a/src/libcore/mem/maybe_uninit.rs b/src/libcore/mem/maybe_uninit.rs
index 5fb3c651b6..58aaac21ad 100644
--- a/src/libcore/mem/maybe_uninit.rs
+++ b/src/libcore/mem/maybe_uninit.rs
@@ -669,7 +669,7 @@ impl<T> MaybeUninit<T> {
     /// // Now we can use `buf` as a normal slice:
     /// buf.sort_unstable();
     /// assert!(
-    ///     buf.chunks(2).all(|chunk| chunk[0] <= chunk[1]),
+    ///     buf.windows(2).all(|pair| pair[0] <= pair[1]),
     ///     "buffer is sorted",
     /// );
     /// ```
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs
index 9eb151cf52..90144d11dc 100644
--- a/src/libcore/mem/mod.rs
+++ b/src/libcore/mem/mod.rs
@@ -91,7 +91,7 @@ pub use crate::intrinsics::transmute;
 /// Using `ManuallyDrop` here has two advantages:
 ///
 /// * We do not "touch" `v` after disassembling it. For some types, operations
-///   such as passing ownership (to a funcion like `mem::forget`) requires them to actually
+///   such as passing ownership (to a function like `mem::forget`) requires them to actually
 ///   be fully owned right now; that is a promise we do not want to make here as we are
 ///   in the process of transferring ownership to the new `String` we are building.
 /// * In case of an unexpected panic, `ManuallyDrop` is not dropped, but if the panic
@@ -109,8 +109,9 @@ pub use crate::intrinsics::transmute;
 /// [ub]: ../../reference/behavior-considered-undefined.html
 /// [`ManuallyDrop`]: struct.ManuallyDrop.html
 #[inline]
+#[rustc_const_unstable(feature = "const_forget", issue = "69616")]
 #[stable(feature = "rust1", since = "1.0.0")]
-pub fn forget<T>(t: T) {
+pub const fn forget<T>(t: T) {
     ManuallyDrop::new(t);
 }
 
diff --git a/src/libcore/num/dec2flt/rawfp.rs b/src/libcore/num/dec2flt/rawfp.rs
index a127c6c3fa..0ab15b23e5 100644
--- a/src/libcore/num/dec2flt/rawfp.rs
+++ b/src/libcore/num/dec2flt/rawfp.rs
@@ -129,15 +129,15 @@ macro_rules! other_constants {
     ($type: ident) => {
         const EXPLICIT_SIG_BITS: u8 = Self::SIG_BITS - 1;
         const MAX_EXP: i16 = (1 << (Self::EXP_BITS - 1)) - 1;
-        const MIN_EXP: i16 = -Self::MAX_EXP + 1;
-        const MAX_EXP_INT: i16 = Self::MAX_EXP - (Self::SIG_BITS as i16 - 1);
+        const MIN_EXP: i16 = -<Self as RawFloat>::MAX_EXP + 1;
+        const MAX_EXP_INT: i16 = <Self as RawFloat>::MAX_EXP - (Self::SIG_BITS as i16 - 1);
         const MAX_ENCODED_EXP: i16 = (1 << Self::EXP_BITS) - 1;
-        const MIN_EXP_INT: i16 = Self::MIN_EXP - (Self::SIG_BITS as i16 - 1);
+        const MIN_EXP_INT: i16 = <Self as RawFloat>::MIN_EXP - (Self::SIG_BITS as i16 - 1);
         const MAX_SIG: u64 = (1 << Self::SIG_BITS) - 1;
         const MIN_SIG: u64 = 1 << (Self::SIG_BITS - 1);
 
-        const INFINITY: Self = $crate::$type::INFINITY;
-        const NAN: Self = $crate::$type::NAN;
+        const INFINITY: Self = $type::INFINITY;
+        const NAN: Self = $type::NAN;
         const ZERO: Self = 0.0;
     };
 }
diff --git a/src/libcore/num/f32.rs b/src/libcore/num/f32.rs
index 505484c2a4..3fdc2bae33 100644
--- a/src/libcore/num/f32.rs
+++ b/src/libcore/num/f32.rs
@@ -4,6 +4,9 @@
 //! *[See also the `f32` primitive type](../../std/primitive.f32.html).*
 //!
 //! Mathematically significant numbers are provided in the `consts` sub-module.
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
@@ -14,57 +17,71 @@ use crate::mem;
 use crate::num::FpCategory;
 
 /// The radix or base of the internal representation of `f32`.
+/// Use [`f32::RADIX`](../../std/primitive.f32.html#associatedconstant.RADIX) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const RADIX: u32 = 2;
+pub const RADIX: u32 = f32::RADIX;
 
 /// Number of significant digits in base 2.
+/// Use [`f32::MANTISSA_DIGITS`](../../std/primitive.f32.html#associatedconstant.MANTISSA_DIGITS) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MANTISSA_DIGITS: u32 = 24;
+pub const MANTISSA_DIGITS: u32 = f32::MANTISSA_DIGITS;
 /// Approximate number of significant digits in base 10.
+/// Use [`f32::DIGITS`](../../std/primitive.f32.html#associatedconstant.DIGITS) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const DIGITS: u32 = 6;
+pub const DIGITS: u32 = f32::DIGITS;
 
 /// [Machine epsilon] value for `f32`.
+/// Use [`f32::EPSILON`](../../std/primitive.f32.html#associatedconstant.EPSILON) instead.
 ///
 /// This is the difference between `1.0` and the next larger representable number.
 ///
 /// [Machine epsilon]: https://en.wikipedia.org/wiki/Machine_epsilon
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const EPSILON: f32 = 1.1920929e-7_f32;
+pub const EPSILON: f32 = f32::EPSILON;
 
 /// Smallest finite `f32` value.
+/// Use [`f32::MIN`](../../std/primitive.f32.html#associatedconstant.MIN) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN: f32 = -3.40282347e+38_f32;
+pub const MIN: f32 = f32::MIN;
 /// Smallest positive normal `f32` value.
+/// Use [`f32::MIN_POSITIVE`](../../std/primitive.f32.html#associatedconstant.MIN_POSITIVE) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN_POSITIVE: f32 = 1.17549435e-38_f32;
+pub const MIN_POSITIVE: f32 = f32::MIN_POSITIVE;
 /// Largest finite `f32` value.
+/// Use [`f32::MAX`](../../std/primitive.f32.html#associatedconstant.MAX) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MAX: f32 = 3.40282347e+38_f32;
+pub const MAX: f32 = f32::MAX;
 
 /// One greater than the minimum possible normal power of 2 exponent.
+/// Use [`f32::MIN_EXP`](../../std/primitive.f32.html#associatedconstant.MIN_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN_EXP: i32 = -125;
+pub const MIN_EXP: i32 = f32::MIN_EXP;
 /// Maximum possible power of 2 exponent.
+/// Use [`f32::MAX_EXP`](../../std/primitive.f32.html#associatedconstant.MAX_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MAX_EXP: i32 = 128;
+pub const MAX_EXP: i32 = f32::MAX_EXP;
 
 /// Minimum possible normal power of 10 exponent.
+/// Use [`f32::MIN_10_EXP`](../../std/primitive.f32.html#associatedconstant.MIN_10_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN_10_EXP: i32 = -37;
+pub const MIN_10_EXP: i32 = f32::MIN_10_EXP;
 /// Maximum possible power of 10 exponent.
+/// Use [`f32::MAX_10_EXP`](../../std/primitive.f32.html#associatedconstant.MAX_10_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MAX_10_EXP: i32 = 38;
+pub const MAX_10_EXP: i32 = f32::MAX_10_EXP;
 
 /// Not a Number (NaN).
+/// Use [`f32::NAN`](../../std/primitive.f32.html#associatedconstant.NAN) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const NAN: f32 = 0.0_f32 / 0.0_f32;
+pub const NAN: f32 = f32::NAN;
 /// Infinity (∞).
+/// Use [`f32::INFINITY`](../../std/primitive.f32.html#associatedconstant.INFINITY) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const INFINITY: f32 = 1.0_f32 / 0.0_f32;
+pub const INFINITY: f32 = f32::INFINITY;
 /// Negative infinity (−∞).
+/// Use [`f32::NEG_INFINITY`](../../std/primitive.f32.html#associatedconstant.NEG_INFINITY) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const NEG_INFINITY: f32 = -1.0_f32 / 0.0_f32;
+pub const NEG_INFINITY: f32 = f32::NEG_INFINITY;
 
 /// Basic mathematical constants.
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -130,7 +147,7 @@ pub mod consts {
     pub const LOG2_E: f32 = 1.44269504088896340735992468100189214_f32;
 
     /// log<sub>2</sub>(10)
-    #[unstable(feature = "extra_log_consts", issue = "50540")]
+    #[stable(feature = "extra_log_consts", since = "1.43.0")]
     pub const LOG2_10: f32 = 3.32192809488736234787031942948939018_f32;
 
     /// log<sub>10</sub>(e)
@@ -138,7 +155,7 @@ pub mod consts {
     pub const LOG10_E: f32 = 0.434294481903251827651128918916605082_f32;
 
     /// log<sub>10</sub>(2)
-    #[unstable(feature = "extra_log_consts", issue = "50540")]
+    #[stable(feature = "extra_log_consts", since = "1.43.0")]
     pub const LOG10_2: f32 = 0.301029995663981195213738894724493027_f32;
 
     /// ln(2)
@@ -153,11 +170,63 @@ pub mod consts {
 #[lang = "f32"]
 #[cfg(not(test))]
 impl f32 {
+    /// The radix or base of the internal representation of `f32`.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const RADIX: u32 = 2;
+
+    /// Number of significant digits in base 2.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MANTISSA_DIGITS: u32 = 24;
+
+    /// Approximate number of significant digits in base 10.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const DIGITS: u32 = 6;
+
+    /// [Machine epsilon] value for `f32`.
+    ///
+    /// This is the difference between `1.0` and the next larger representable number.
+    ///
+    /// [Machine epsilon]: https://en.wikipedia.org/wiki/Machine_epsilon
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const EPSILON: f32 = 1.19209290e-07_f32;
+
+    /// Smallest finite `f32` value.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN: f32 = -3.40282347e+38_f32;
+    /// Smallest positive normal `f32` value.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN_POSITIVE: f32 = 1.17549435e-38_f32;
+    /// Largest finite `f32` value.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MAX: f32 = 3.40282347e+38_f32;
+
+    /// One greater than the minimum possible normal power of 2 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN_EXP: i32 = -125;
+    /// Maximum possible power of 2 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MAX_EXP: i32 = 128;
+
+    /// Minimum possible normal power of 10 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN_10_EXP: i32 = -37;
+    /// Maximum possible power of 10 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MAX_10_EXP: i32 = 38;
+
+    /// Not a Number (NaN).
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const NAN: f32 = 0.0_f32 / 0.0_f32;
+    /// Infinity (∞).
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const INFINITY: f32 = 1.0_f32 / 0.0_f32;
+    /// Negative infinity (-∞).
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const NEG_INFINITY: f32 = -1.0_f32 / 0.0_f32;
+
     /// Returns `true` if this value is `NaN`.
     ///
     /// ```
-    /// use std::f32;
-    ///
     /// let nan = f32::NAN;
     /// let f = 7.0_f32;
     ///
@@ -182,8 +251,6 @@ impl f32 {
     /// `false` otherwise.
     ///
     /// ```
-    /// use std::f32;
-    ///
     /// let f = 7.0f32;
     /// let inf = f32::INFINITY;
     /// let neg_inf = f32::NEG_INFINITY;
@@ -204,8 +271,6 @@ impl f32 {
     /// Returns `true` if this number is neither infinite nor `NaN`.
     ///
     /// ```
-    /// use std::f32;
-    ///
     /// let f = 7.0f32;
     /// let inf = f32::INFINITY;
     /// let neg_inf = f32::NEG_INFINITY;
@@ -229,8 +294,6 @@ impl f32 {
     /// [subnormal], or `NaN`.
     ///
     /// ```
-    /// use std::f32;
-    ///
     /// let min = f32::MIN_POSITIVE; // 1.17549435e-38f32
     /// let max = f32::MAX;
     /// let lower_than_min = 1.0e-40_f32;
@@ -258,7 +321,6 @@ impl f32 {
     ///
     /// ```
     /// use std::num::FpCategory;
-    /// use std::f32;
     ///
     /// let num = 12.4_f32;
     /// let inf = f32::INFINITY;
@@ -318,8 +380,6 @@ impl f32 {
     /// Takes the reciprocal (inverse) of a number, `1/x`.
     ///
     /// ```
-    /// use std::f32;
-    ///
     /// let x = 2.0_f32;
     /// let abs_difference = (x.recip() - (1.0 / x)).abs();
     ///
@@ -334,7 +394,7 @@ impl f32 {
     /// Converts radians to degrees.
     ///
     /// ```
-    /// use std::f32::{self, consts};
+    /// use std::f32::consts;
     ///
     /// let angle = consts::PI;
     ///
@@ -353,7 +413,7 @@ impl f32 {
     /// Converts degrees to radians.
     ///
     /// ```
-    /// use std::f32::{self, consts};
+    /// use std::f32::consts;
     ///
     /// let angle = 180.0f32;
     ///
diff --git a/src/libcore/num/f64.rs b/src/libcore/num/f64.rs
index 8f3af42d25..129df937c0 100644
--- a/src/libcore/num/f64.rs
+++ b/src/libcore/num/f64.rs
@@ -4,6 +4,9 @@
 //! *[See also the `f64` primitive type](../../std/primitive.f64.html).*
 //!
 //! Mathematically significant numbers are provided in the `consts` sub-module.
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
@@ -14,57 +17,71 @@ use crate::mem;
 use crate::num::FpCategory;
 
 /// The radix or base of the internal representation of `f64`.
+/// Use [`f64::RADIX`](../../std/primitive.f64.html#associatedconstant.RADIX) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const RADIX: u32 = 2;
+pub const RADIX: u32 = f64::RADIX;
 
 /// Number of significant digits in base 2.
+/// Use [`f64::MANTISSA_DIGITS`](../../std/primitive.f64.html#associatedconstant.MANTISSA_DIGITS) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MANTISSA_DIGITS: u32 = 53;
+pub const MANTISSA_DIGITS: u32 = f64::MANTISSA_DIGITS;
 /// Approximate number of significant digits in base 10.
+/// Use [`f64::DIGITS`](../../std/primitive.f64.html#associatedconstant.DIGITS) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const DIGITS: u32 = 15;
+pub const DIGITS: u32 = f64::DIGITS;
 
 /// [Machine epsilon] value for `f64`.
+/// Use [`f64::EPSILON`](../../std/primitive.f64.html#associatedconstant.EPSILON) instead.
 ///
 /// This is the difference between `1.0` and the next larger representable number.
 ///
 /// [Machine epsilon]: https://en.wikipedia.org/wiki/Machine_epsilon
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const EPSILON: f64 = 2.2204460492503131e-16_f64;
+pub const EPSILON: f64 = f64::EPSILON;
 
 /// Smallest finite `f64` value.
+/// Use [`f64::MIN`](../../std/primitive.f64.html#associatedconstant.MIN) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN: f64 = -1.7976931348623157e+308_f64;
+pub const MIN: f64 = f64::MIN;
 /// Smallest positive normal `f64` value.
+/// Use [`f64::MIN_POSITIVE`](../../std/primitive.f64.html#associatedconstant.MIN_POSITIVE) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN_POSITIVE: f64 = 2.2250738585072014e-308_f64;
+pub const MIN_POSITIVE: f64 = f64::MIN_POSITIVE;
 /// Largest finite `f64` value.
+/// Use [`f64::MAX`](../../std/primitive.f64.html#associatedconstant.MAX) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MAX: f64 = 1.7976931348623157e+308_f64;
+pub const MAX: f64 = f64::MAX;
 
 /// One greater than the minimum possible normal power of 2 exponent.
+/// Use [`f64::MIN_EXP`](../../std/primitive.f64.html#associatedconstant.MIN_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN_EXP: i32 = -1021;
+pub const MIN_EXP: i32 = f64::MIN_EXP;
 /// Maximum possible power of 2 exponent.
+/// Use [`f64::MAX_EXP`](../../std/primitive.f64.html#associatedconstant.MAX_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MAX_EXP: i32 = 1024;
+pub const MAX_EXP: i32 = f64::MAX_EXP;
 
 /// Minimum possible normal power of 10 exponent.
+/// Use [`f64::MIN_10_EXP`](../../std/primitive.f64.html#associatedconstant.MIN_10_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MIN_10_EXP: i32 = -307;
+pub const MIN_10_EXP: i32 = f64::MIN_10_EXP;
 /// Maximum possible power of 10 exponent.
+/// Use [`f64::MAX_10_EXP`](../../std/primitive.f64.html#associatedconstant.MAX_10_EXP) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const MAX_10_EXP: i32 = 308;
+pub const MAX_10_EXP: i32 = f64::MAX_10_EXP;
 
 /// Not a Number (NaN).
+/// Use [`f64::NAN`](../../std/primitive.f64.html#associatedconstant.NAN) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const NAN: f64 = 0.0_f64 / 0.0_f64;
+pub const NAN: f64 = f64::NAN;
 /// Infinity (∞).
+/// Use [`f64::INFINITY`](../../std/primitive.f64.html#associatedconstant.INFINITY) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const INFINITY: f64 = 1.0_f64 / 0.0_f64;
+pub const INFINITY: f64 = f64::INFINITY;
 /// Negative infinity (−∞).
+/// Use [`f64::NEG_INFINITY`](../../std/primitive.f64.html#associatedconstant.NEG_INFINITY) instead.
 #[stable(feature = "rust1", since = "1.0.0")]
-pub const NEG_INFINITY: f64 = -1.0_f64 / 0.0_f64;
+pub const NEG_INFINITY: f64 = f64::NEG_INFINITY;
 
 /// Basic mathematical constants.
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -126,7 +143,7 @@ pub mod consts {
     pub const E: f64 = 2.71828182845904523536028747135266250_f64;
 
     /// log<sub>2</sub>(10)
-    #[unstable(feature = "extra_log_consts", issue = "50540")]
+    #[stable(feature = "extra_log_consts", since = "1.43.0")]
     pub const LOG2_10: f64 = 3.32192809488736234787031942948939018_f64;
 
     /// log<sub>2</sub>(e)
@@ -134,7 +151,7 @@ pub mod consts {
     pub const LOG2_E: f64 = 1.44269504088896340735992468100189214_f64;
 
     /// log<sub>10</sub>(2)
-    #[unstable(feature = "extra_log_consts", issue = "50540")]
+    #[stable(feature = "extra_log_consts", since = "1.43.0")]
     pub const LOG10_2: f64 = 0.301029995663981195213738894724493027_f64;
 
     /// log<sub>10</sub>(e)
@@ -153,11 +170,62 @@ pub mod consts {
 #[lang = "f64"]
 #[cfg(not(test))]
 impl f64 {
+    /// The radix or base of the internal representation of `f64`.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const RADIX: u32 = 2;
+
+    /// Number of significant digits in base 2.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MANTISSA_DIGITS: u32 = 53;
+    /// Approximate number of significant digits in base 10.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const DIGITS: u32 = 15;
+
+    /// [Machine epsilon] value for `f64`.
+    ///
+    /// This is the difference between `1.0` and the next larger representable number.
+    ///
+    /// [Machine epsilon]: https://en.wikipedia.org/wiki/Machine_epsilon
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const EPSILON: f64 = 2.2204460492503131e-16_f64;
+
+    /// Smallest finite `f64` value.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN: f64 = -1.7976931348623157e+308_f64;
+    /// Smallest positive normal `f64` value.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN_POSITIVE: f64 = 2.2250738585072014e-308_f64;
+    /// Largest finite `f64` value.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MAX: f64 = 1.7976931348623157e+308_f64;
+
+    /// One greater than the minimum possible normal power of 2 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN_EXP: i32 = -1021;
+    /// Maximum possible power of 2 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MAX_EXP: i32 = 1024;
+
+    /// Minimum possible normal power of 10 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MIN_10_EXP: i32 = -307;
+    /// Maximum possible power of 10 exponent.
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const MAX_10_EXP: i32 = 308;
+
+    /// Not a Number (NaN).
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const NAN: f64 = 0.0_f64 / 0.0_f64;
+    /// Infinity (∞).
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const INFINITY: f64 = 1.0_f64 / 0.0_f64;
+    /// Negative infinity (-∞).
+    #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+    pub const NEG_INFINITY: f64 = -1.0_f64 / 0.0_f64;
+
     /// Returns `true` if this value is `NaN`.
     ///
     /// ```
-    /// use std::f64;
-    ///
     /// let nan = f64::NAN;
     /// let f = 7.0_f64;
     ///
@@ -182,8 +250,6 @@ impl f64 {
     /// `false` otherwise.
     ///
     /// ```
-    /// use std::f64;
-    ///
     /// let f = 7.0f64;
     /// let inf = f64::INFINITY;
     /// let neg_inf = f64::NEG_INFINITY;
@@ -204,8 +270,6 @@ impl f64 {
     /// Returns `true` if this number is neither infinite nor `NaN`.
     ///
     /// ```
-    /// use std::f64;
-    ///
     /// let f = 7.0f64;
     /// let inf: f64 = f64::INFINITY;
     /// let neg_inf: f64 = f64::NEG_INFINITY;
@@ -229,8 +293,6 @@ impl f64 {
     /// [subnormal], or `NaN`.
     ///
     /// ```
-    /// use std::f64;
-    ///
     /// let min = f64::MIN_POSITIVE; // 2.2250738585072014e-308f64
     /// let max = f64::MAX;
     /// let lower_than_min = 1.0e-308_f64;
@@ -258,7 +320,6 @@ impl f64 {
     ///
     /// ```
     /// use std::num::FpCategory;
-    /// use std::f64;
     ///
     /// let num = 12.4_f64;
     /// let inf = f64::INFINITY;
diff --git a/src/libcore/num/flt2dec/mod.rs b/src/libcore/num/flt2dec/mod.rs
index 9e760c13c0..f5cd26a185 100644
--- a/src/libcore/num/flt2dec/mod.rs
+++ b/src/libcore/num/flt2dec/mod.rs
@@ -237,7 +237,7 @@ impl<'a> Part<'a> {
 #[derive(Clone)]
 pub struct Formatted<'a> {
     /// A byte slice representing a sign, either `""`, `"-"` or `"+"`.
-    pub sign: &'static [u8],
+    pub sign: &'static str,
     /// Formatted parts to be rendered after a sign and optional zero padding.
     pub parts: &'a [Part<'a>],
 }
@@ -259,7 +259,7 @@ impl<'a> Formatted<'a> {
         if out.len() < self.sign.len() {
             return None;
         }
-        out[..self.sign.len()].copy_from_slice(self.sign);
+        out[..self.sign.len()].copy_from_slice(self.sign.as_bytes());
 
         let mut written = self.sign.len();
         for part in self.parts {
@@ -402,38 +402,38 @@ pub enum Sign {
 }
 
 /// Returns the static byte string corresponding to the sign to be formatted.
-/// It can be either `b""`, `b"+"` or `b"-"`.
-fn determine_sign(sign: Sign, decoded: &FullDecoded, negative: bool) -> &'static [u8] {
+/// It can be either `""`, `"+"` or `"-"`.
+fn determine_sign(sign: Sign, decoded: &FullDecoded, negative: bool) -> &'static str {
     match (*decoded, sign) {
-        (FullDecoded::Nan, _) => b"",
-        (FullDecoded::Zero, Sign::Minus) => b"",
+        (FullDecoded::Nan, _) => "",
+        (FullDecoded::Zero, Sign::Minus) => "",
         (FullDecoded::Zero, Sign::MinusRaw) => {
             if negative {
-                b"-"
+                "-"
             } else {
-                b""
+                ""
             }
         }
-        (FullDecoded::Zero, Sign::MinusPlus) => b"+",
+        (FullDecoded::Zero, Sign::MinusPlus) => "+",
         (FullDecoded::Zero, Sign::MinusPlusRaw) => {
             if negative {
-                b"-"
+                "-"
             } else {
-                b"+"
+                "+"
             }
         }
         (_, Sign::Minus) | (_, Sign::MinusRaw) => {
             if negative {
-                b"-"
+                "-"
             } else {
-                b""
+                ""
             }
         }
         (_, Sign::MinusPlus) | (_, Sign::MinusPlusRaw) => {
             if negative {
-                b"-"
+                "-"
             } else {
-                b"+"
+                "+"
             }
         }
     }
@@ -462,7 +462,6 @@ pub fn to_shortest_str<'a, T, F>(
     v: T,
     sign: Sign,
     frac_digits: usize,
-    _upper: bool,
     buf: &'a mut [u8],
     parts: &'a mut [Part<'a>],
 ) -> Formatted<'a>
@@ -679,7 +678,6 @@ pub fn to_exact_fixed_str<'a, T, F>(
     v: T,
     sign: Sign,
     frac_digits: usize,
-    _upper: bool,
     buf: &'a mut [u8],
     parts: &'a mut [Part<'a>],
 ) -> Formatted<'a>
diff --git a/src/libcore/num/i128.rs b/src/libcore/num/i128.rs
index 564ed598a8..08cb795946 100644
--- a/src/libcore/num/i128.rs
+++ b/src/libcore/num/i128.rs
@@ -1,6 +1,9 @@
 //! The 128-bit signed integer type.
 //!
 //! *[See also the `i128` primitive type](../../std/primitive.i128.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "i128", since = "1.26.0")]
 
diff --git a/src/libcore/num/i16.rs b/src/libcore/num/i16.rs
index 44d6aaef25..288eaceba5 100644
--- a/src/libcore/num/i16.rs
+++ b/src/libcore/num/i16.rs
@@ -1,6 +1,9 @@
 //! The 16-bit signed integer type.
 //!
 //! *[See also the `i16` primitive type](../../std/primitive.i16.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
diff --git a/src/libcore/num/i32.rs b/src/libcore/num/i32.rs
index 90a5f89195..0e1a2ec56c 100644
--- a/src/libcore/num/i32.rs
+++ b/src/libcore/num/i32.rs
@@ -1,6 +1,9 @@
 //! The 32-bit signed integer type.
 //!
 //! *[See also the `i32` primitive type](../../std/primitive.i32.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
diff --git a/src/libcore/num/i64.rs b/src/libcore/num/i64.rs
index 04a8a9d757..27f7092710 100644
--- a/src/libcore/num/i64.rs
+++ b/src/libcore/num/i64.rs
@@ -1,6 +1,9 @@
 //! The 64-bit signed integer type.
 //!
 //! *[See also the `i64` primitive type](../../std/primitive.i64.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
diff --git a/src/libcore/num/i8.rs b/src/libcore/num/i8.rs
index 5a52a967cf..e84b421e1a 100644
--- a/src/libcore/num/i8.rs
+++ b/src/libcore/num/i8.rs
@@ -1,6 +1,9 @@
 //! The 8-bit signed integer type.
 //!
 //! *[See also the `i8` primitive type](../../std/primitive.i8.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
diff --git a/src/libcore/num/int_macros.rs b/src/libcore/num/int_macros.rs
index 5c59fe25f6..b68a09e113 100644
--- a/src/libcore/num/int_macros.rs
+++ b/src/libcore/num/int_macros.rs
@@ -1,13 +1,27 @@
 #![doc(hidden)]
 
+macro_rules! doc_comment {
+    ($x:expr, $($tt:tt)*) => {
+        #[doc = $x]
+        $($tt)*
+    };
+}
+
 macro_rules! int_module {
     ($T:ident) => (int_module!($T, #[stable(feature = "rust1", since = "1.0.0")]););
     ($T:ident, #[$attr:meta]) => (
-        /// The smallest value that can be represented by this integer type.
-        #[$attr]
-        pub const MIN: $T = $T::min_value();
-        /// The largest value that can be represented by this integer type.
-        #[$attr]
-        pub const MAX: $T = $T::max_value();
+        doc_comment! {
+            concat!("The smallest value that can be represented by this integer type.
+Use [`", stringify!($T), "::MIN", "`](../../std/primitive.", stringify!($T), ".html#associatedconstant.MIN) instead."),
+            #[$attr]
+            pub const MIN: $T = $T::min_value();
+        }
+
+        doc_comment! {
+            concat!("The largest value that can be represented by this integer type.
+Use [`", stringify!($T), "::MAX", "`](../../std/primitive.", stringify!($T), ".html#associatedconstant.MAX) instead."),
+            #[$attr]
+            pub const MAX: $T = $T::max_value();
+        }
     )
 }
diff --git a/src/libcore/num/isize.rs b/src/libcore/num/isize.rs
index 143f8b3b27..0dcfa4a2bd 100644
--- a/src/libcore/num/isize.rs
+++ b/src/libcore/num/isize.rs
@@ -1,6 +1,9 @@
 //! The pointer-sized signed integer type.
 //!
 //! *[See also the `isize` primitive type](../../std/primitive.isize.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 91848abd68..889ce2f211 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -8,9 +8,18 @@ use crate::convert::Infallible;
 use crate::fmt;
 use crate::intrinsics;
 use crate::mem;
-use crate::ops;
 use crate::str::FromStr;
 
+// Used because the `?` operator is not allowed in a const context.
+macro_rules! try_opt {
+    ($e:expr) => {
+        match $e {
+            Some(x) => x,
+            None => return None,
+        }
+    };
+}
+
 macro_rules! impl_nonzero_fmt {
     ( #[$stability: meta] ( $( $Trait: ident ),+ ) for $Ty: ident ) => {
         $(
@@ -69,8 +78,9 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
 
                 /// Creates a non-zero if the given value is not zero.
                 #[$stability]
+                #[rustc_const_unstable(feature = "const_nonzero_int_methods", issue = "53718")]
                 #[inline]
-                pub fn new(n: $Int) -> Option<Self> {
+                pub const fn new(n: $Int) -> Option<Self> {
                     if n != 0 {
                         // SAFETY: we just checked that there's no `0`
                         Some(unsafe { Self(n) })
@@ -91,8 +101,12 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
 
             #[stable(feature = "from_nonzero", since = "1.31.0")]
             impl From<$Ty> for $Int {
-                fn from(nonzero: $Ty) -> Self {
-                    nonzero.0
+                doc_comment! {
+                    concat!(
+"Converts a `", stringify!($Ty), "` into an `", stringify!($Int), "`"),
+                    fn from(nonzero: $Ty) -> Self {
+                        nonzero.0
+                    }
                 }
             }
 
@@ -245,43 +259,33 @@ macro_rules! int_impl {
      $reversed:expr, $le_bytes:expr, $be_bytes:expr,
      $to_xe_bytes_doc:expr, $from_xe_bytes_doc:expr) => {
         doc_comment! {
-            concat!("Returns the smallest value that can be represented by this integer type.
+            concat!("The smallest value that can be represented by this integer type.
 
 # Examples
 
 Basic usage:
 
 ```
-", $Feature, "assert_eq!(", stringify!($SelfT), "::min_value(), ", stringify!($Min), ");",
+", $Feature, "assert_eq!(", stringify!($SelfT), "::MIN, ", stringify!($Min), ");",
 $EndFeature, "
 ```"),
-            #[stable(feature = "rust1", since = "1.0.0")]
-            #[inline(always)]
-            #[rustc_promotable]
-            #[rustc_const_stable(feature = "const_min_value", since = "1.32.0")]
-            pub const fn min_value() -> Self {
-                !0 ^ ((!0 as $UnsignedT) >> 1) as Self
-            }
+            #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+            pub const MIN: Self = !0 ^ ((!0 as $UnsignedT) >> 1) as Self;
         }
 
         doc_comment! {
-            concat!("Returns the largest value that can be represented by this integer type.
+            concat!("The largest value that can be represented by this integer type.
 
 # Examples
 
 Basic usage:
 
 ```
-", $Feature, "assert_eq!(", stringify!($SelfT), "::max_value(), ", stringify!($Max), ");",
+", $Feature, "assert_eq!(", stringify!($SelfT), "::MAX, ", stringify!($Max), ");",
 $EndFeature, "
 ```"),
-            #[stable(feature = "rust1", since = "1.0.0")]
-            #[inline(always)]
-            #[rustc_promotable]
-            #[rustc_const_stable(feature = "const_max_value", since = "1.32.0")]
-            pub const fn max_value() -> Self {
-                !Self::min_value()
-            }
+            #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+            pub const MAX: Self = !Self::MIN;
         }
 
         doc_comment! {
@@ -341,7 +345,7 @@ $EndFeature, "
 Basic usage:
 
 ```
-", $Feature, "assert_eq!(", stringify!($SelfT), "::max_value().count_zeros(), 1);", $EndFeature, "
+", $Feature, "assert_eq!(", stringify!($SelfT), "::MAX.count_zeros(), 1);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
             #[rustc_const_stable(feature = "const_int_methods", since = "1.32.0")]
@@ -678,15 +682,16 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!((", stringify!($SelfT),
-"::max_value() - 2).checked_add(1), Some(", stringify!($SelfT), "::max_value() - 1));
-assert_eq!((", stringify!($SelfT), "::max_value() - 2).checked_add(3), None);",
+"::MAX - 2).checked_add(1), Some(", stringify!($SelfT), "::MAX - 1));
+assert_eq!((", stringify!($SelfT), "::MAX - 2).checked_add(3), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_add(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_add(self, rhs: Self) -> Option<Self> {
                 let (a, b) = self.overflowing_add(rhs);
                 if b {None} else {Some(a)}
             }
@@ -702,15 +707,16 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!((", stringify!($SelfT),
-"::min_value() + 2).checked_sub(1), Some(", stringify!($SelfT), "::min_value() + 1));
-assert_eq!((", stringify!($SelfT), "::min_value() + 2).checked_sub(3), None);",
+"::MIN + 2).checked_sub(1), Some(", stringify!($SelfT), "::MIN + 1));
+assert_eq!((", stringify!($SelfT), "::MIN + 2).checked_sub(3), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_sub(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_sub(self, rhs: Self) -> Option<Self> {
                 let (a, b) = self.overflowing_sub(rhs);
                 if b {None} else {Some(a)}
             }
@@ -726,15 +732,16 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(", stringify!($SelfT),
-"::max_value().checked_mul(1), Some(", stringify!($SelfT), "::max_value()));
-assert_eq!(", stringify!($SelfT), "::max_value().checked_mul(2), None);",
+"::MAX.checked_mul(1), Some(", stringify!($SelfT), "::MAX));
+assert_eq!(", stringify!($SelfT), "::MAX.checked_mul(2), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_mul(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_mul(self, rhs: Self) -> Option<Self> {
                 let (a, b) = self.overflowing_mul(rhs);
                 if b {None} else {Some(a)}
             }
@@ -750,16 +757,17 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!((", stringify!($SelfT),
-"::min_value() + 1).checked_div(-1), Some(", stringify!($Max), "));
-assert_eq!(", stringify!($SelfT), "::min_value().checked_div(-1), None);
+"::MIN + 1).checked_div(-1), Some(", stringify!($Max), "));
+assert_eq!(", stringify!($SelfT), "::MIN.checked_div(-1), None);
 assert_eq!((1", stringify!($SelfT), ").checked_div(0), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_div(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_div(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 || (self == Self::min_value() && rhs == -1) {
                     None
                 } else {
@@ -779,15 +787,16 @@ Basic usage:
 
 ```
 assert_eq!((", stringify!($SelfT),
-"::min_value() + 1).checked_div_euclid(-1), Some(", stringify!($Max), "));
-assert_eq!(", stringify!($SelfT), "::min_value().checked_div_euclid(-1), None);
+"::MIN + 1).checked_div_euclid(-1), Some(", stringify!($Max), "));
+assert_eq!(", stringify!($SelfT), "::MIN.checked_div_euclid(-1), None);
 assert_eq!((1", stringify!($SelfT), ").checked_div_euclid(0), None);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_div_euclid(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_div_euclid(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 || (self == Self::min_value() && rhs == -1) {
                     None
                 } else {
@@ -805,18 +814,18 @@ assert_eq!((1", stringify!($SelfT), ").checked_div_euclid(0), None);
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".checked_rem(2), Some(1));
 assert_eq!(5", stringify!($SelfT), ".checked_rem(0), None);
 assert_eq!(", stringify!($SelfT), "::MIN.checked_rem(-1), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_rem(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_rem(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 || (self == Self::min_value() && rhs == -1) {
                     None
                 } else {
@@ -835,17 +844,16 @@ if `rhs == 0` or the division results in overflow.
 Basic usage:
 
 ```
-use std::", stringify!($SelfT), ";
-
 assert_eq!(5", stringify!($SelfT), ".checked_rem_euclid(2), Some(1));
 assert_eq!(5", stringify!($SelfT), ".checked_rem_euclid(0), None);
 assert_eq!(", stringify!($SelfT), "::MIN.checked_rem_euclid(-1), None);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_rem_euclid(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_rem_euclid(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 || (self == Self::min_value() && rhs == -1) {
                     None
                 } else {
@@ -862,15 +870,15 @@ assert_eq!(", stringify!($SelfT), "::MIN.checked_rem_euclid(-1), None);
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".checked_neg(), Some(-5));
 assert_eq!(", stringify!($SelfT), "::MIN.checked_neg(), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[inline]
-            pub fn checked_neg(self) -> Option<Self> {
+            pub const fn checked_neg(self) -> Option<Self> {
                 let (a, b) = self.overflowing_neg();
                 if b {None} else {Some(a)}
             }
@@ -890,10 +898,11 @@ assert_eq!(0x1", stringify!($SelfT), ".checked_shl(129), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_shl(self, rhs: u32) -> Option<Self> {
+            pub const fn checked_shl(self, rhs: u32) -> Option<Self> {
                 let (a, b) = self.overflowing_shl(rhs);
                 if b {None} else {Some(a)}
             }
@@ -913,10 +922,11 @@ assert_eq!(0x10", stringify!($SelfT), ".checked_shr(128), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_shr(self, rhs: u32) -> Option<Self> {
+            pub const fn checked_shr(self, rhs: u32) -> Option<Self> {
                 let (a, b) = self.overflowing_shr(rhs);
                 if b {None} else {Some(a)}
             }
@@ -931,15 +941,15 @@ $EndFeature, "
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!((-5", stringify!($SelfT), ").checked_abs(), Some(5));
 assert_eq!(", stringify!($SelfT), "::MIN.checked_abs(), None);",
 $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_abs", since = "1.13.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[inline]
-            pub fn checked_abs(self) -> Option<Self> {
+            pub const fn checked_abs(self) -> Option<Self> {
                 if self.is_negative() {
                     self.checked_neg()
                 } else {
@@ -958,31 +968,32 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(8", stringify!($SelfT), ".checked_pow(2), Some(64));
-assert_eq!(", stringify!($SelfT), "::max_value().checked_pow(2), None);",
+assert_eq!(", stringify!($SelfT), "::MAX.checked_pow(2), None);",
 $EndFeature, "
 ```"),
 
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_pow(self, mut exp: u32) -> Option<Self> {
+            pub const fn checked_pow(self, mut exp: u32) -> Option<Self> {
                 let mut base = self;
                 let mut acc: Self = 1;
 
                 while exp > 1 {
                     if (exp & 1) == 1 {
-                        acc = acc.checked_mul(base)?;
+                        acc = try_opt!(acc.checked_mul(base));
                     }
                     exp /= 2;
-                    base = base.checked_mul(base)?;
+                    base = try_opt!(base.checked_mul(base));
                 }
 
                 // Deal with the final bit of the exponent separately, since
                 // squaring the base afterwards is not necessary and may cause a
                 // needless overflow.
                 if exp == 1 {
-                    acc = acc.checked_mul(base)?;
+                    acc = try_opt!(acc.checked_mul(base));
                 }
 
                 Some(acc)
@@ -999,10 +1010,10 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".saturating_add(1), 101);
-assert_eq!(", stringify!($SelfT), "::max_value().saturating_add(100), ", stringify!($SelfT),
-"::max_value());
-assert_eq!(", stringify!($SelfT), "::min_value().saturating_add(-1), ", stringify!($SelfT),
-"::min_value());",
+assert_eq!(", stringify!($SelfT), "::MAX.saturating_add(100), ", stringify!($SelfT),
+"::MAX);
+assert_eq!(", stringify!($SelfT), "::MIN.saturating_add(-1), ", stringify!($SelfT),
+"::MIN);",
 $EndFeature, "
 ```"),
 
@@ -1026,10 +1037,10 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".saturating_sub(127), -27);
-assert_eq!(", stringify!($SelfT), "::min_value().saturating_sub(100), ", stringify!($SelfT),
-"::min_value());
-assert_eq!(", stringify!($SelfT), "::max_value().saturating_sub(-1), ", stringify!($SelfT),
-"::max_value());",
+assert_eq!(", stringify!($SelfT), "::MIN.saturating_sub(100), ", stringify!($SelfT),
+"::MIN);
+assert_eq!(", stringify!($SelfT), "::MAX.saturating_sub(-1), ", stringify!($SelfT),
+"::MAX);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
@@ -1054,16 +1065,17 @@ Basic usage:
 ", $Feature, "#![feature(saturating_neg)]
 assert_eq!(100", stringify!($SelfT), ".saturating_neg(), -100);
 assert_eq!((-100", stringify!($SelfT), ").saturating_neg(), 100);
-assert_eq!(", stringify!($SelfT), "::min_value().saturating_neg(), ", stringify!($SelfT),
-"::max_value());
-assert_eq!(", stringify!($SelfT), "::max_value().saturating_neg(), ", stringify!($SelfT),
-"::min_value() + 1);",
+assert_eq!(", stringify!($SelfT), "::MIN.saturating_neg(), ", stringify!($SelfT),
+"::MAX);
+assert_eq!(", stringify!($SelfT), "::MAX.saturating_neg(), ", stringify!($SelfT),
+"::MIN + 1);",
 $EndFeature, "
 ```"),
 
             #[unstable(feature = "saturating_neg", issue = "59983")]
+            #[rustc_const_unstable(feature = "const_saturating_int_methods", issue = "53718")]
             #[inline]
-            pub fn saturating_neg(self) -> Self {
+            pub const fn saturating_neg(self) -> Self {
                 intrinsics::saturating_sub(0, self)
             }
         }
@@ -1080,16 +1092,17 @@ Basic usage:
 ", $Feature, "#![feature(saturating_neg)]
 assert_eq!(100", stringify!($SelfT), ".saturating_abs(), 100);
 assert_eq!((-100", stringify!($SelfT), ").saturating_abs(), 100);
-assert_eq!(", stringify!($SelfT), "::min_value().saturating_abs(), ", stringify!($SelfT),
-"::max_value());
-assert_eq!((", stringify!($SelfT), "::min_value() + 1).saturating_abs(), ", stringify!($SelfT),
-"::max_value());",
+assert_eq!(", stringify!($SelfT), "::MIN.saturating_abs(), ", stringify!($SelfT),
+"::MAX);
+assert_eq!((", stringify!($SelfT), "::MIN + 1).saturating_abs(), ", stringify!($SelfT),
+"::MAX);",
 $EndFeature, "
 ```"),
 
             #[unstable(feature = "saturating_neg", issue = "59983")]
+            #[rustc_const_unstable(feature = "const_saturating_int_methods", issue = "53718")]
             #[inline]
-            pub fn saturating_abs(self) -> Self {
+            pub const fn saturating_abs(self) -> Self {
                 if self.is_negative() {
                     self.saturating_neg()
                 } else {
@@ -1107,25 +1120,26 @@ numeric bounds instead of overflowing.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(10", stringify!($SelfT), ".saturating_mul(12), 120);
 assert_eq!(", stringify!($SelfT), "::MAX.saturating_mul(10), ", stringify!($SelfT), "::MAX);
 assert_eq!(", stringify!($SelfT), "::MIN.saturating_mul(10), ", stringify!($SelfT), "::MIN);",
 $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_saturating_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn saturating_mul(self, rhs: Self) -> Self {
-                self.checked_mul(rhs).unwrap_or_else(|| {
-                    if (self < 0) == (rhs < 0) {
+            pub const fn saturating_mul(self, rhs: Self) -> Self {
+                match self.checked_mul(rhs) {
+                    Some(x) => x,
+                    None => if (self < 0) == (rhs < 0) {
                         Self::max_value()
                     } else {
                         Self::min_value()
                     }
-                })
+                }
             }
         }
 
@@ -1138,18 +1152,18 @@ saturating at the numeric bounds instead of overflowing.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!((-4", stringify!($SelfT), ").saturating_pow(3), -64);
 assert_eq!(", stringify!($SelfT), "::MIN.saturating_pow(2), ", stringify!($SelfT), "::MAX);
 assert_eq!(", stringify!($SelfT), "::MIN.saturating_pow(3), ", stringify!($SelfT), "::MIN);",
 $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn saturating_pow(self, exp: u32) -> Self {
+            pub const fn saturating_pow(self, exp: u32) -> Self {
                 match self.checked_pow(exp) {
                     Some(x) => x,
                     None if self < 0 && exp % 2 == 1 => Self::min_value(),
@@ -1168,8 +1182,8 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".wrapping_add(27), 127);
-assert_eq!(", stringify!($SelfT), "::max_value().wrapping_add(2), ", stringify!($SelfT),
-"::min_value() + 1);",
+assert_eq!(", stringify!($SelfT), "::MAX.wrapping_add(2), ", stringify!($SelfT),
+"::MIN + 1);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
@@ -1192,8 +1206,8 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(0", stringify!($SelfT), ".wrapping_sub(127), -127);
-assert_eq!((-2", stringify!($SelfT), ").wrapping_sub(", stringify!($SelfT), "::max_value()), ",
-stringify!($SelfT), "::max_value());",
+assert_eq!((-2", stringify!($SelfT), ").wrapping_sub(", stringify!($SelfT), "::MAX), ",
+stringify!($SelfT), "::MAX);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
@@ -1251,10 +1265,11 @@ assert_eq!((-128i8).wrapping_div(-1), -128);",
 $EndFeature, "
 ```"),
             #[stable(feature = "num_wrapping", since = "1.2.0")]
+            #[rustc_const_unstable(feature = "const_wrapping_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_div(self, rhs: Self) -> Self {
+            pub const fn wrapping_div(self, rhs: Self) -> Self {
                 self.overflowing_div(rhs).0
             }
         }
@@ -1280,10 +1295,11 @@ assert_eq!(100", stringify!($SelfT), ".wrapping_div_euclid(10), 10);
 assert_eq!((-128i8).wrapping_div_euclid(-1), -128);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_div_euclid(self, rhs: Self) -> Self {
+            pub const fn wrapping_div_euclid(self, rhs: Self) -> Self {
                 self.overflowing_div_euclid(rhs).0
             }
         }
@@ -1310,10 +1326,11 @@ assert_eq!((-128i8).wrapping_rem(-1), 0);",
 $EndFeature, "
 ```"),
             #[stable(feature = "num_wrapping", since = "1.2.0")]
+            #[rustc_const_unstable(feature = "const_wrapping_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_rem(self, rhs: Self) -> Self {
+            pub const fn wrapping_rem(self, rhs: Self) -> Self {
                 self.overflowing_rem(rhs).0
             }
         }
@@ -1338,10 +1355,11 @@ assert_eq!(100", stringify!($SelfT), ".wrapping_rem_euclid(10), 0);
 assert_eq!((-128i8).wrapping_rem_euclid(-1), 0);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_rem_euclid(self, rhs: Self) -> Self {
+            pub const fn wrapping_rem_euclid(self, rhs: Self) -> Self {
                 self.overflowing_rem_euclid(rhs).0
             }
         }
@@ -1360,8 +1378,8 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".wrapping_neg(), -100);
-assert_eq!(", stringify!($SelfT), "::min_value().wrapping_neg(), ", stringify!($SelfT),
-"::min_value());",
+assert_eq!(", stringify!($SelfT), "::MIN.wrapping_neg(), ", stringify!($SelfT),
+"::MIN);",
 $EndFeature, "
 ```"),
             #[stable(feature = "num_wrapping", since = "1.2.0")]
@@ -1451,8 +1469,8 @@ Basic usage:
 ```
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".wrapping_abs(), 100);
 assert_eq!((-100", stringify!($SelfT), ").wrapping_abs(), 100);
-assert_eq!(", stringify!($SelfT), "::min_value().wrapping_abs(), ", stringify!($SelfT),
-"::min_value());
+assert_eq!(", stringify!($SelfT), "::MIN.wrapping_abs(), ", stringify!($SelfT),
+"::MIN);
 assert_eq!((-128i8).wrapping_abs() as u8, 128);",
 $EndFeature, "
 ```"),
@@ -1485,10 +1503,11 @@ assert_eq!(3i8.wrapping_pow(6), -39);",
 $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_pow(self, mut exp: u32) -> Self {
+            pub const fn wrapping_pow(self, mut exp: u32) -> Self {
                 let mut base = self;
                 let mut acc: Self = 1;
 
@@ -1522,8 +1541,7 @@ occur. If an overflow would have occurred then the wrapped value is returned.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".overflowing_add(2), (7, false));
 assert_eq!(", stringify!($SelfT), "::MAX.overflowing_add(1), (", stringify!($SelfT),
 "::MIN, true));", $EndFeature, "
@@ -1550,8 +1568,7 @@ would occur. If an overflow would have occurred then the wrapped value is return
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".overflowing_sub(2), (3, false));
 assert_eq!(", stringify!($SelfT), "::MIN.overflowing_sub(1), (", stringify!($SelfT),
 "::MAX, true));", $EndFeature, "
@@ -1608,8 +1625,7 @@ This function will panic if `rhs` is 0.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".overflowing_div(2), (2, false));
 assert_eq!(", stringify!($SelfT), "::MIN.overflowing_div(-1), (", stringify!($SelfT),
 "::MIN, true));",
@@ -1617,9 +1633,10 @@ $EndFeature, "
 ```"),
             #[inline]
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_overflowing_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_div(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_div(self, rhs: Self) -> (Self, bool) {
                 if self == Self::min_value() && rhs == -1 {
                     (self, true)
                 } else {
@@ -1643,17 +1660,16 @@ This function will panic if `rhs` is 0.
 Basic usage:
 
 ```
-use std::", stringify!($SelfT), ";
-
 assert_eq!(5", stringify!($SelfT), ".overflowing_div_euclid(2), (2, false));
 assert_eq!(", stringify!($SelfT), "::MIN.overflowing_div_euclid(-1), (", stringify!($SelfT),
 "::MIN, true));
 ```"),
             #[inline]
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_div_euclid(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_div_euclid(self, rhs: Self) -> (Self, bool) {
                 if self == Self::min_value() && rhs == -1 {
                     (self, true)
                 } else {
@@ -1677,17 +1693,17 @@ This function will panic if `rhs` is 0.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".overflowing_rem(2), (1, false));
 assert_eq!(", stringify!($SelfT), "::MIN.overflowing_rem(-1), (0, true));",
 $EndFeature, "
 ```"),
             #[inline]
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_overflowing_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_rem(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_rem(self, rhs: Self) -> (Self, bool) {
                 if self == Self::min_value() && rhs == -1 {
                     (0, true)
                 } else {
@@ -1712,16 +1728,15 @@ This function will panic if `rhs` is 0.
 Basic usage:
 
 ```
-use std::", stringify!($SelfT), ";
-
 assert_eq!(5", stringify!($SelfT), ".overflowing_rem_euclid(2), (1, false));
 assert_eq!(", stringify!($SelfT), "::MIN.overflowing_rem_euclid(-1), (0, true));
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn overflowing_rem_euclid(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_rem_euclid(self, rhs: Self) -> (Self, bool) {
                 if self == Self::min_value() && rhs == -1 {
                     (0, true)
                 } else {
@@ -1743,8 +1758,6 @@ minimum value will be returned again and `true` will be returned for an overflow
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
 assert_eq!(2", stringify!($SelfT), ".overflowing_neg(), (-2, false));
 assert_eq!(", stringify!($SelfT), "::MIN.overflowing_neg(), (", stringify!($SelfT),
 "::MIN, true));", $EndFeature, "
@@ -1830,8 +1843,8 @@ Basic usage:
 ```
 ", $Feature, "assert_eq!(10", stringify!($SelfT), ".overflowing_abs(), (10, false));
 assert_eq!((-10", stringify!($SelfT), ").overflowing_abs(), (10, false));
-assert_eq!((", stringify!($SelfT), "::min_value()).overflowing_abs(), (", stringify!($SelfT),
-"::min_value(), true));",
+assert_eq!((", stringify!($SelfT), "::MIN).overflowing_abs(), (", stringify!($SelfT),
+"::MIN, true));",
 $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_abs", since = "1.13.0")]
@@ -1858,10 +1871,11 @@ assert_eq!(3i8.overflowing_pow(5), (-13, true));",
 $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn overflowing_pow(self, mut exp: u32) -> (Self, bool) {
+            pub const fn overflowing_pow(self, mut exp: u32) -> (Self, bool) {
                 let mut base = self;
                 let mut acc: Self = 1;
                 let mut overflown = false;
@@ -1907,11 +1921,12 @@ assert_eq!(x.pow(5), 32);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
             #[rustc_inherit_overflow_checks]
-            pub fn pow(self, mut exp: u32) -> Self {
+            pub const fn pow(self, mut exp: u32) -> Self {
                 let mut base = self;
                 let mut acc = 1;
 
@@ -1963,11 +1978,12 @@ assert_eq!((-a).div_euclid(b), -2); // -7 >= 4 * -2
 assert_eq!((-a).div_euclid(-b), 2); // -7 >= -4 * 2
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
             #[rustc_inherit_overflow_checks]
-            pub fn div_euclid(self, rhs: Self) -> Self {
+            pub const fn div_euclid(self, rhs: Self) -> Self {
                 let q = self / rhs;
                 if self % rhs < 0 {
                     return if rhs > 0 { q - 1 } else { q + 1 }
@@ -2002,11 +2018,12 @@ assert_eq!(a.rem_euclid(-b), 3);
 assert_eq!((-a).rem_euclid(-b), 1);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
             #[rustc_inherit_overflow_checks]
-            pub fn rem_euclid(self, rhs: Self) -> Self {
+            pub const fn rem_euclid(self, rhs: Self) -> Self {
                 let r = self % rhs;
                 if r < 0 {
                     if rhs < 0 {
@@ -2025,10 +2042,10 @@ assert_eq!((-a).rem_euclid(-b), 1);
 
 # Overflow behavior
 
-The absolute value of `", stringify!($SelfT), "::min_value()` cannot be represented as an
+The absolute value of `", stringify!($SelfT), "::MIN` cannot be represented as an
 `", stringify!($SelfT), "`, and attempting to calculate it will cause an overflow. This means that
 code in debug mode will trigger a panic on this case and optimized code will return `",
-stringify!($SelfT), "::min_value()` without a panic.
+stringify!($SelfT), "::MIN` without a panic.
 
 # Examples
 
@@ -2309,6 +2326,38 @@ fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT),
                 unsafe { mem::transmute(bytes) }
             }
         }
+
+        doc_comment! {
+            concat!("**This method is soft-deprecated.**
+
+Although using it won’t cause compilation warning,
+new code should use [`", stringify!($SelfT), "::MIN", "`](#associatedconstant.MIN) instead.
+
+Returns the smallest value that can be represented by this integer type."),
+            #[stable(feature = "rust1", since = "1.0.0")]
+            #[inline(always)]
+            #[rustc_promotable]
+            #[rustc_const_stable(feature = "const_min_value", since = "1.32.0")]
+            pub const fn min_value() -> Self {
+                Self::MIN
+            }
+        }
+
+        doc_comment! {
+            concat!("**This method is soft-deprecated.**
+
+Although using it won’t cause compilation warning,
+new code should use [`", stringify!($SelfT), "::MAX", "`](#associatedconstant.MAX) instead.
+
+Returns the largest value that can be represented by this integer type."),
+            #[stable(feature = "rust1", since = "1.0.0")]
+            #[inline(always)]
+            #[rustc_promotable]
+            #[rustc_const_stable(feature = "const_max_value", since = "1.32.0")]
+            pub const fn max_value() -> Self {
+                Self::MAX
+            }
+        }
     }
 }
 
@@ -2384,38 +2433,32 @@ macro_rules! uint_impl {
         $reversed:expr, $le_bytes:expr, $be_bytes:expr,
         $to_xe_bytes_doc:expr, $from_xe_bytes_doc:expr) => {
         doc_comment! {
-            concat!("Returns the smallest value that can be represented by this integer type.
+            concat!("The smallest value that can be represented by this integer type.
 
 # Examples
 
 Basic usage:
 
 ```
-", $Feature, "assert_eq!(", stringify!($SelfT), "::min_value(), 0);", $EndFeature, "
+", $Feature, "assert_eq!(", stringify!($SelfT), "::MIN, 0);", $EndFeature, "
 ```"),
-            #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_promotable]
-            #[inline(always)]
-            #[rustc_const_stable(feature = "const_min_value", since = "1.32.0")]
-            pub const fn min_value() -> Self { 0 }
+            #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+            pub const MIN: Self = 0;
         }
 
         doc_comment! {
-            concat!("Returns the largest value that can be represented by this integer type.
+            concat!("The largest value that can be represented by this integer type.
 
 # Examples
 
 Basic usage:
 
 ```
-", $Feature, "assert_eq!(", stringify!($SelfT), "::max_value(), ",
-stringify!($MaxV), ");", $EndFeature, "
+", $Feature, "assert_eq!(", stringify!($SelfT), "::MAX, ", stringify!($MaxV), ");",
+$EndFeature, "
 ```"),
-            #[stable(feature = "rust1", since = "1.0.0")]
-            #[rustc_promotable]
-            #[inline(always)]
-            #[rustc_const_stable(feature = "const_max_value", since = "1.32.0")]
-            pub const fn max_value() -> Self { !0 }
+            #[stable(feature = "assoc_int_consts", since = "1.43.0")]
+            pub const MAX: Self = !0;
         }
 
         doc_comment! {
@@ -2476,7 +2519,7 @@ assert_eq!(n.count_ones(), 3);", $EndFeature, "
 Basic usage:
 
 ```
-", $Feature, "assert_eq!(", stringify!($SelfT), "::max_value().count_zeros(), 0);", $EndFeature, "
+", $Feature, "assert_eq!(", stringify!($SelfT), "::MAX.count_zeros(), 0);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
             #[rustc_const_stable(feature = "const_math", since = "1.32.0")]
@@ -2494,7 +2537,7 @@ Basic usage:
 Basic usage:
 
 ```
-", $Feature, "let n = ", stringify!($SelfT), "::max_value() >> 2;
+", $Feature, "let n = ", stringify!($SelfT), "::MAX >> 2;
 
 assert_eq!(n.leading_zeros(), 2);", $EndFeature, "
 ```"),
@@ -2536,7 +2579,7 @@ Basic usage:
 
 ```
 ", $Feature, "#![feature(leading_trailing_ones)]
-let n = !(", stringify!($SelfT), "::max_value() >> 2);
+let n = !(", stringify!($SelfT), "::MAX >> 2);
 
 assert_eq!(n.leading_ones(), 2);", $EndFeature, "
 ```"),
@@ -2810,15 +2853,16 @@ if overflow occurred.
 Basic usage:
 
 ```
-", $Feature, "assert_eq!((", stringify!($SelfT), "::max_value() - 2).checked_add(1), ",
-"Some(", stringify!($SelfT), "::max_value() - 1));
-assert_eq!((", stringify!($SelfT), "::max_value() - 2).checked_add(3), None);", $EndFeature, "
+", $Feature, "assert_eq!((", stringify!($SelfT), "::MAX - 2).checked_add(1), ",
+"Some(", stringify!($SelfT), "::MAX - 1));
+assert_eq!((", stringify!($SelfT), "::MAX - 2).checked_add(3), None);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_add(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_add(self, rhs: Self) -> Option<Self> {
                 let (a, b) = self.overflowing_add(rhs);
                 if b {None} else {Some(a)}
             }
@@ -2837,10 +2881,11 @@ Basic usage:
 assert_eq!(0", stringify!($SelfT), ".checked_sub(1), None);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_sub(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_sub(self, rhs: Self) -> Option<Self> {
                 let (a, b) = self.overflowing_sub(rhs);
                 if b {None} else {Some(a)}
             }
@@ -2856,13 +2901,14 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(5", stringify!($SelfT), ".checked_mul(1), Some(5));
-assert_eq!(", stringify!($SelfT), "::max_value().checked_mul(2), None);", $EndFeature, "
+assert_eq!(", stringify!($SelfT), "::MAX.checked_mul(2), None);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_mul(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_mul(self, rhs: Self) -> Option<Self> {
                 let (a, b) = self.overflowing_mul(rhs);
                 if b {None} else {Some(a)}
             }
@@ -2881,10 +2927,11 @@ Basic usage:
 assert_eq!(1", stringify!($SelfT), ".checked_div(0), None);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_div(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_div(self, rhs: Self) -> Option<Self> {
                 match rhs {
                     0 => None,
                     // SAFETY: div by zero has been checked above and unsigned types have no other
@@ -2907,10 +2954,11 @@ assert_eq!(128", stringify!($SelfT), ".checked_div_euclid(2), Some(64));
 assert_eq!(1", stringify!($SelfT), ".checked_div_euclid(0), None);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_div_euclid(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_div_euclid(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 {
                     None
                 } else {
@@ -2933,10 +2981,11 @@ Basic usage:
 assert_eq!(5", stringify!($SelfT), ".checked_rem(0), None);", $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_rem(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_rem(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 {
                     None
                 } else {
@@ -2960,10 +3009,11 @@ assert_eq!(5", stringify!($SelfT), ".checked_rem_euclid(2), Some(1));
 assert_eq!(5", stringify!($SelfT), ".checked_rem_euclid(0), None);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_rem_euclid(self, rhs: Self) -> Option<Self> {
+            pub const fn checked_rem_euclid(self, rhs: Self) -> Option<Self> {
                 if rhs == 0 {
                     None
                 } else {
@@ -2987,8 +3037,9 @@ Basic usage:
 assert_eq!(1", stringify!($SelfT), ".checked_neg(), None);", $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[inline]
-            pub fn checked_neg(self) -> Option<Self> {
+            pub const fn checked_neg(self) -> Option<Self> {
                 let (a, b) = self.overflowing_neg();
                 if b {None} else {Some(a)}
             }
@@ -3007,10 +3058,11 @@ Basic usage:
 assert_eq!(0x10", stringify!($SelfT), ".checked_shl(129), None);", $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_shl(self, rhs: u32) -> Option<Self> {
+            pub const fn checked_shl(self, rhs: u32) -> Option<Self> {
                 let (a, b) = self.overflowing_shl(rhs);
                 if b {None} else {Some(a)}
             }
@@ -3029,10 +3081,11 @@ Basic usage:
 assert_eq!(0x10", stringify!($SelfT), ".checked_shr(129), None);", $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_checked_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_shr(self, rhs: u32) -> Option<Self> {
+            pub const fn checked_shr(self, rhs: u32) -> Option<Self> {
                 let (a, b) = self.overflowing_shr(rhs);
                 if b {None} else {Some(a)}
             }
@@ -3048,29 +3101,30 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(2", stringify!($SelfT), ".checked_pow(5), Some(32));
-assert_eq!(", stringify!($SelfT), "::max_value().checked_pow(2), None);", $EndFeature, "
+assert_eq!(", stringify!($SelfT), "::MAX.checked_pow(2), None);", $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn checked_pow(self, mut exp: u32) -> Option<Self> {
+            pub const fn checked_pow(self, mut exp: u32) -> Option<Self> {
                 let mut base = self;
                 let mut acc: Self = 1;
 
                 while exp > 1 {
                     if (exp & 1) == 1 {
-                        acc = acc.checked_mul(base)?;
+                        acc = try_opt!(acc.checked_mul(base));
                     }
                     exp /= 2;
-                    base = base.checked_mul(base)?;
+                    base = try_opt!(base.checked_mul(base));
                 }
 
                 // Deal with the final bit of the exponent separately, since
                 // squaring the base afterwards is not necessary and may cause a
                 // needless overflow.
                 if exp == 1 {
-                    acc = acc.checked_mul(base)?;
+                    acc = try_opt!(acc.checked_mul(base));
                 }
 
                 Some(acc)
@@ -3131,18 +3185,21 @@ saturating at the numeric bounds instead of overflowing.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(2", stringify!($SelfT), ".saturating_mul(10), 20);
 assert_eq!((", stringify!($SelfT), "::MAX).saturating_mul(10), ", stringify!($SelfT),
 "::MAX);", $EndFeature, "
 ```"),
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_saturating_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn saturating_mul(self, rhs: Self) -> Self {
-                self.checked_mul(rhs).unwrap_or(Self::max_value())
+            pub const fn saturating_mul(self, rhs: Self) -> Self {
+                match self.checked_mul(rhs) {
+                    Some(x) => x,
+                    None => Self::max_value(),
+                }
             }
         }
 
@@ -3155,17 +3212,17 @@ saturating at the numeric bounds instead of overflowing.
 Basic usage:
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(4", stringify!($SelfT), ".saturating_pow(3), 64);
 assert_eq!(", stringify!($SelfT), "::MAX.saturating_pow(2), ", stringify!($SelfT), "::MAX);",
 $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn saturating_pow(self, exp: u32) -> Self {
+            pub const fn saturating_pow(self, exp: u32) -> Self {
                 match self.checked_pow(exp) {
                     Some(x) => x,
                     None => Self::max_value(),
@@ -3183,7 +3240,7 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(200", stringify!($SelfT), ".wrapping_add(55), 255);
-assert_eq!(200", stringify!($SelfT), ".wrapping_add(", stringify!($SelfT), "::max_value()), 199);",
+assert_eq!(200", stringify!($SelfT), ".wrapping_add(", stringify!($SelfT), "::MAX), 199);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
@@ -3206,7 +3263,7 @@ Basic usage:
 
 ```
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".wrapping_sub(100), 0);
-assert_eq!(100", stringify!($SelfT), ".wrapping_sub(", stringify!($SelfT), "::max_value()), 101);",
+assert_eq!(100", stringify!($SelfT), ".wrapping_sub(", stringify!($SelfT), "::MAX), 101);",
 $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
@@ -3257,10 +3314,11 @@ Basic usage:
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".wrapping_div(10), 10);", $EndFeature, "
 ```"),
             #[stable(feature = "num_wrapping", since = "1.2.0")]
+            #[rustc_const_unstable(feature = "const_wrapping_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_div(self, rhs: Self) -> Self {
+            pub const fn wrapping_div(self, rhs: Self) -> Self {
                 self / rhs
             }
         }
@@ -3283,10 +3341,11 @@ Basic usage:
 assert_eq!(100", stringify!($SelfT), ".wrapping_div_euclid(10), 10);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_div_euclid(self, rhs: Self) -> Self {
+            pub const fn wrapping_div_euclid(self, rhs: Self) -> Self {
                 self / rhs
             }
         }
@@ -3307,10 +3366,11 @@ Basic usage:
 ", $Feature, "assert_eq!(100", stringify!($SelfT), ".wrapping_rem(10), 0);", $EndFeature, "
 ```"),
             #[stable(feature = "num_wrapping", since = "1.2.0")]
+            #[rustc_const_unstable(feature = "const_wrapping_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_rem(self, rhs: Self) -> Self {
+            pub const fn wrapping_rem(self, rhs: Self) -> Self {
                 self % rhs
             }
         }
@@ -3334,10 +3394,11 @@ Basic usage:
 assert_eq!(100", stringify!($SelfT), ".wrapping_rem_euclid(10), 0);
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_rem_euclid(self, rhs: Self) -> Self {
+            pub const fn wrapping_rem_euclid(self, rhs: Self) -> Self {
                 self % rhs
             }
         }
@@ -3451,10 +3512,11 @@ Basic usage:
 assert_eq!(3u8.wrapping_pow(6), 217);", $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn wrapping_pow(self, mut exp: u32) -> Self {
+            pub const fn wrapping_pow(self, mut exp: u32) -> Self {
                 let mut base = self;
                 let mut acc: Self = 1;
 
@@ -3489,8 +3551,7 @@ have occurred then the wrapped value is returned.
 Basic usage
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".overflowing_add(2), (7, false));
 assert_eq!(", stringify!($SelfT), "::MAX.overflowing_add(1), (0, true));", $EndFeature, "
 ```"),
@@ -3517,8 +3578,7 @@ have occurred then the wrapped value is returned.
 Basic usage
 
 ```
-", $Feature, "use std::", stringify!($SelfT), ";
-
+", $Feature, "
 assert_eq!(5", stringify!($SelfT), ".overflowing_sub(2), (3, false));
 assert_eq!(0", stringify!($SelfT), ".overflowing_sub(1), (", stringify!($SelfT), "::MAX, true));",
 $EndFeature, "
@@ -3582,9 +3642,10 @@ Basic usage
 ```"),
             #[inline]
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_overflowing_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_div(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_div(self, rhs: Self) -> (Self, bool) {
                 (self / rhs, false)
             }
         }
@@ -3613,9 +3674,10 @@ assert_eq!(5", stringify!($SelfT), ".overflowing_div_euclid(2), (2, false));
 ```"),
             #[inline]
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_div_euclid(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_div_euclid(self, rhs: Self) -> (Self, bool) {
                 (self / rhs, false)
             }
         }
@@ -3641,9 +3703,10 @@ Basic usage
 ```"),
             #[inline]
             #[stable(feature = "wrapping", since = "1.7.0")]
+            #[rustc_const_unstable(feature = "const_overflowing_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_rem(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_rem(self, rhs: Self) -> (Self, bool) {
                 (self % rhs, false)
             }
         }
@@ -3672,9 +3735,10 @@ assert_eq!(5", stringify!($SelfT), ".overflowing_rem_euclid(2), (1, false));
 ```"),
             #[inline]
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
-            pub fn overflowing_rem_euclid(self, rhs: Self) -> (Self, bool) {
+            pub const fn overflowing_rem_euclid(self, rhs: Self) -> (Self, bool) {
                 (self % rhs, false)
             }
         }
@@ -3773,10 +3837,11 @@ Basic usage:
 assert_eq!(3u8.overflowing_pow(6), (217, true));", $EndFeature, "
 ```"),
             #[stable(feature = "no_panic_pow", since = "1.34.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
-            pub fn overflowing_pow(self, mut exp: u32) -> (Self, bool) {
+            pub const fn overflowing_pow(self, mut exp: u32) -> (Self, bool) {
                 let mut base = self;
                 let mut acc: Self = 1;
                 let mut overflown = false;
@@ -3819,11 +3884,12 @@ Basic usage:
 ", $Feature, "assert_eq!(2", stringify!($SelfT), ".pow(5), 32);", $EndFeature, "
 ```"),
         #[stable(feature = "rust1", since = "1.0.0")]
+        #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
         #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
         #[inline]
         #[rustc_inherit_overflow_checks]
-        pub fn pow(self, mut exp: u32) -> Self {
+        pub const fn pow(self, mut exp: u32) -> Self {
             let mut base = self;
             let mut acc = 1;
 
@@ -3865,11 +3931,12 @@ Basic usage:
 assert_eq!(7", stringify!($SelfT), ".div_euclid(4), 1); // or any other integer type
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
             #[rustc_inherit_overflow_checks]
-            pub fn div_euclid(self, rhs: Self) -> Self {
+            pub const fn div_euclid(self, rhs: Self) -> Self {
                 self / rhs
             }
         }
@@ -3894,11 +3961,12 @@ Basic usage:
 assert_eq!(7", stringify!($SelfT), ".rem_euclid(4), 3); // or any other integer type
 ```"),
             #[stable(feature = "euclidean_division", since = "1.38.0")]
+            #[rustc_const_unstable(feature = "const_euclidean_int_methods", issue = "53718")]
             #[must_use = "this returns the result of the operation, \
                           without modifying the original"]
             #[inline]
             #[rustc_inherit_overflow_checks]
-            pub fn rem_euclid(self, rhs: Self) -> Self {
+            pub const fn rem_euclid(self, rhs: Self) -> Self {
                 self % rhs
             }
         }
@@ -3932,7 +4000,8 @@ assert!(!10", stringify!($SelfT), ".is_power_of_two());", $EndFeature, "
         // overflow cases it instead ends up returning the maximum value
         // of the type, and can return 0 for 0.
         #[inline]
-        fn one_less_than_next_power_of_two(self) -> Self {
+        #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
+        const fn one_less_than_next_power_of_two(self) -> Self {
             if self <= 1 { return 0; }
 
             let p = self - 1;
@@ -3960,10 +4029,11 @@ Basic usage:
 assert_eq!(3", stringify!($SelfT), ".next_power_of_two(), 4);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
             #[inline]
-            pub fn next_power_of_two(self) -> Self {
-                // Call the trait to get overflow checks
-                ops::Add::add(self.one_less_than_next_power_of_two(), 1)
+            #[rustc_inherit_overflow_checks]
+            pub const fn next_power_of_two(self) -> Self {
+                self.one_less_than_next_power_of_two() + 1
             }
         }
 
@@ -3980,12 +4050,13 @@ Basic usage:
 ", $Feature, "assert_eq!(2", stringify!($SelfT),
 ".checked_next_power_of_two(), Some(2));
 assert_eq!(3", stringify!($SelfT), ".checked_next_power_of_two(), Some(4));
-assert_eq!(", stringify!($SelfT), "::max_value().checked_next_power_of_two(), None);",
+assert_eq!(", stringify!($SelfT), "::MAX.checked_next_power_of_two(), None);",
 $EndFeature, "
 ```"),
             #[inline]
             #[stable(feature = "rust1", since = "1.0.0")]
-            pub fn checked_next_power_of_two(self) -> Option<Self> {
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
+            pub const fn checked_next_power_of_two(self) -> Option<Self> {
                 self.one_less_than_next_power_of_two().checked_add(1)
             }
         }
@@ -4004,12 +4075,13 @@ Basic usage:
 ", $Feature, "
 assert_eq!(2", stringify!($SelfT), ".wrapping_next_power_of_two(), 2);
 assert_eq!(3", stringify!($SelfT), ".wrapping_next_power_of_two(), 4);
-assert_eq!(", stringify!($SelfT), "::max_value().wrapping_next_power_of_two(), 0);",
+assert_eq!(", stringify!($SelfT), "::MAX.wrapping_next_power_of_two(), 0);",
 $EndFeature, "
 ```"),
             #[unstable(feature = "wrapping_next_power_of_two", issue = "32463",
                        reason = "needs decision on wrapping behaviour")]
-            pub fn wrapping_next_power_of_two(self) -> Self {
+            #[rustc_const_unstable(feature = "const_int_pow", issue = "53718")]
+            pub const fn wrapping_next_power_of_two(self) -> Self {
                 self.one_less_than_next_power_of_two().wrapping_add(1)
             }
         }
@@ -4199,6 +4271,34 @@ fn read_ne_", stringify!($SelfT), "(input: &mut &[u8]) -> ", stringify!($SelfT),
                 unsafe { mem::transmute(bytes) }
             }
         }
+
+        doc_comment! {
+            concat!("**This method is soft-deprecated.**
+
+Although using it won’t cause compilation warning,
+new code should use [`", stringify!($SelfT), "::MIN", "`](#associatedconstant.MIN) instead.
+
+Returns the smallest value that can be represented by this integer type."),
+            #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_promotable]
+            #[inline(always)]
+            #[rustc_const_stable(feature = "const_max_value", since = "1.32.0")]
+            pub const fn min_value() -> Self { Self::MIN }
+        }
+
+        doc_comment! {
+            concat!("**This method is soft-deprecated.**
+
+Although using it won’t cause compilation warning,
+new code should use [`", stringify!($SelfT), "::MAX", "`](#associatedconstant.MAX) instead.
+
+Returns the largest value that can be represented by this integer type."),
+            #[stable(feature = "rust1", since = "1.0.0")]
+            #[rustc_promotable]
+            #[inline(always)]
+            #[rustc_const_stable(feature = "const_max_value", since = "1.32.0")]
+            pub const fn max_value() -> Self { Self::MAX }
+        }
     }
 }
 
@@ -4219,8 +4319,9 @@ impl u8 {
     /// assert!(!non_ascii.is_ascii());
     /// ```
     #[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
+    #[rustc_const_stable(feature = "const_ascii_methods_on_intrinsics", since = "1.43.0")]
     #[inline]
-    pub fn is_ascii(&self) -> bool {
+    pub const fn is_ascii(&self) -> bool {
         *self & 128 == 0
     }
 
@@ -4367,8 +4468,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_alphabetic());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_alphabetic(&self) -> bool {
+    pub const fn is_ascii_alphabetic(&self) -> bool {
         matches!(*self, b'A'..=b'Z' | b'a'..=b'z')
     }
 
@@ -4399,8 +4501,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_uppercase());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_uppercase(&self) -> bool {
+    pub const fn is_ascii_uppercase(&self) -> bool {
         matches!(*self, b'A'..=b'Z')
     }
 
@@ -4431,8 +4534,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_lowercase());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_lowercase(&self) -> bool {
+    pub const fn is_ascii_lowercase(&self) -> bool {
         matches!(*self, b'a'..=b'z')
     }
 
@@ -4466,8 +4570,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_alphanumeric());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_alphanumeric(&self) -> bool {
+    pub const fn is_ascii_alphanumeric(&self) -> bool {
         matches!(*self, b'0'..=b'9' | b'A'..=b'Z' | b'a'..=b'z')
     }
 
@@ -4498,8 +4603,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_digit());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_digit(&self) -> bool {
+    pub const fn is_ascii_digit(&self) -> bool {
         matches!(*self, b'0'..=b'9')
     }
 
@@ -4533,8 +4639,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_hexdigit());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_hexdigit(&self) -> bool {
+    pub const fn is_ascii_hexdigit(&self) -> bool {
         matches!(*self, b'0'..=b'9' | b'A'..=b'F' | b'a'..=b'f')
     }
 
@@ -4569,8 +4676,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_punctuation());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_punctuation(&self) -> bool {
+    pub const fn is_ascii_punctuation(&self) -> bool {
         matches!(*self, b'!'..=b'/' | b':'..=b'@' | b'['..=b'`' | b'{'..=b'~')
     }
 
@@ -4601,8 +4709,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_graphic());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_graphic(&self) -> bool {
+    pub const fn is_ascii_graphic(&self) -> bool {
         matches!(*self, b'!'..=b'~')
     }
 
@@ -4650,8 +4759,9 @@ impl u8 {
     /// assert!(!esc.is_ascii_whitespace());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_whitespace(&self) -> bool {
+    pub const fn is_ascii_whitespace(&self) -> bool {
         matches!(*self, b'\t' | b'\n' | b'\x0C' | b'\r' | b' ')
     }
 
@@ -4684,8 +4794,9 @@ impl u8 {
     /// assert!(esc.is_ascii_control());
     /// ```
     #[stable(feature = "ascii_ctype_on_intrinsics", since = "1.24.0")]
+    #[rustc_const_unstable(feature = "const_ascii_ctype_on_intrinsics", issue = "68983")]
     #[inline]
-    pub fn is_ascii_control(&self) -> bool {
+    pub const fn is_ascii_control(&self) -> bool {
         matches!(*self, b'\0'..=b'\x1F' | b'\x7F')
     }
 }
@@ -4760,7 +4871,6 @@ impl usize {
 ///
 /// ```
 /// use std::num::FpCategory;
-/// use std::f32;
 ///
 /// let num = 12.4_f32;
 /// let inf = f32::INFINITY;
diff --git a/src/libcore/num/u128.rs b/src/libcore/num/u128.rs
index 7d1aa664de..dd45ff1415 100644
--- a/src/libcore/num/u128.rs
+++ b/src/libcore/num/u128.rs
@@ -1,6 +1,9 @@
 //! The 128-bit unsigned integer type.
 //!
 //! *[See also the `u128` primitive type](../../std/primitive.u128.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "i128", since = "1.26.0")]
-uint_module! { u128, #[stable(feature = "i128", since="1.26.0")] }
+int_module! { u128, #[stable(feature = "i128", since="1.26.0")] }
diff --git a/src/libcore/num/u16.rs b/src/libcore/num/u16.rs
index 34f80abaec..738071643b 100644
--- a/src/libcore/num/u16.rs
+++ b/src/libcore/num/u16.rs
@@ -1,7 +1,10 @@
 //! The 16-bit unsigned integer type.
 //!
 //! *[See also the `u16` primitive type](../../std/primitive.u16.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-uint_module! { u16 }
+int_module! { u16 }
diff --git a/src/libcore/num/u32.rs b/src/libcore/num/u32.rs
index 5fd486f546..9800c90997 100644
--- a/src/libcore/num/u32.rs
+++ b/src/libcore/num/u32.rs
@@ -1,7 +1,10 @@
 //! The 32-bit unsigned integer type.
 //!
 //! *[See also the `u32` primitive type](../../std/primitive.u32.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-uint_module! { u32 }
+int_module! { u32 }
diff --git a/src/libcore/num/u64.rs b/src/libcore/num/u64.rs
index 044d238aea..fb686c396f 100644
--- a/src/libcore/num/u64.rs
+++ b/src/libcore/num/u64.rs
@@ -1,7 +1,10 @@
 //! The 64-bit unsigned integer type.
 //!
 //! *[See also the `u64` primitive type](../../std/primitive.u64.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-uint_module! { u64 }
+int_module! { u64 }
diff --git a/src/libcore/num/u8.rs b/src/libcore/num/u8.rs
index 6747e6a0f6..c03cbdda25 100644
--- a/src/libcore/num/u8.rs
+++ b/src/libcore/num/u8.rs
@@ -1,7 +1,10 @@
 //! The 8-bit unsigned integer type.
 //!
 //! *[See also the `u8` primitive type](../../std/primitive.u8.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-uint_module! { u8 }
+int_module! { u8 }
diff --git a/src/libcore/num/uint_macros.rs b/src/libcore/num/uint_macros.rs
deleted file mode 100644
index a94b541ddb..0000000000
--- a/src/libcore/num/uint_macros.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![doc(hidden)]
-
-macro_rules! uint_module {
-    ($T:ident) => (uint_module!($T, #[stable(feature = "rust1", since = "1.0.0")]););
-    ($T:ident, #[$attr:meta]) => (
-        /// The smallest value that can be represented by this integer type.
-        #[$attr]
-        pub const MIN: $T = $T::min_value();
-        /// The largest value that can be represented by this integer type.
-        #[$attr]
-        pub const MAX: $T = $T::max_value();
-    )
-}
diff --git a/src/libcore/num/usize.rs b/src/libcore/num/usize.rs
index e3a5239d90..a893041615 100644
--- a/src/libcore/num/usize.rs
+++ b/src/libcore/num/usize.rs
@@ -1,7 +1,10 @@
 //! The pointer-sized unsigned integer type.
 //!
 //! *[See also the `usize` primitive type](../../std/primitive.usize.html).*
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
-uint_module! { usize }
+int_module! { usize }
diff --git a/src/libcore/ops/generator.rs b/src/libcore/ops/generator.rs
index 5401fff860..4e43561996 100644
--- a/src/libcore/ops/generator.rs
+++ b/src/libcore/ops/generator.rs
@@ -50,11 +50,11 @@ pub enum GeneratorState<Y, R> {
 ///         return "foo"
 ///     };
 ///
-///     match Pin::new(&mut generator).resume() {
+///     match Pin::new(&mut generator).resume(()) {
 ///         GeneratorState::Yielded(1) => {}
 ///         _ => panic!("unexpected return from resume"),
 ///     }
-///     match Pin::new(&mut generator).resume() {
+///     match Pin::new(&mut generator).resume(()) {
 ///         GeneratorState::Complete("foo") => {}
 ///         _ => panic!("unexpected return from resume"),
 ///     }
@@ -67,7 +67,7 @@ pub enum GeneratorState<Y, R> {
 #[lang = "generator"]
 #[unstable(feature = "generator_trait", issue = "43122")]
 #[fundamental]
-pub trait Generator {
+pub trait Generator<#[cfg(not(bootstrap))] R = ()> {
     /// The type of value this generator yields.
     ///
     /// This associated type corresponds to the `yield` expression and the
@@ -110,9 +110,13 @@ pub trait Generator {
     /// been returned previously. While generator literals in the language are
     /// guaranteed to panic on resuming after `Complete`, this is not guaranteed
     /// for all implementations of the `Generator` trait.
-    fn resume(self: Pin<&mut Self>) -> GeneratorState<Self::Yield, Self::Return>;
+    fn resume(
+        self: Pin<&mut Self>,
+        #[cfg(not(bootstrap))] arg: R,
+    ) -> GeneratorState<Self::Yield, Self::Return>;
 }
 
+#[cfg(bootstrap)]
 #[unstable(feature = "generator_trait", issue = "43122")]
 impl<G: ?Sized + Generator> Generator for Pin<&mut G> {
     type Yield = G::Yield;
@@ -123,6 +127,7 @@ impl<G: ?Sized + Generator> Generator for Pin<&mut G> {
     }
 }
 
+#[cfg(bootstrap)]
 #[unstable(feature = "generator_trait", issue = "43122")]
 impl<G: ?Sized + Generator + Unpin> Generator for &mut G {
     type Yield = G::Yield;
@@ -132,3 +137,25 @@ impl<G: ?Sized + Generator + Unpin> Generator for &mut G {
         G::resume(Pin::new(&mut *self))
     }
 }
+
+#[cfg(not(bootstrap))]
+#[unstable(feature = "generator_trait", issue = "43122")]
+impl<G: ?Sized + Generator<R>, R> Generator<R> for Pin<&mut G> {
+    type Yield = G::Yield;
+    type Return = G::Return;
+
+    fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState<Self::Yield, Self::Return> {
+        G::resume((*self).as_mut(), arg)
+    }
+}
+
+#[cfg(not(bootstrap))]
+#[unstable(feature = "generator_trait", issue = "43122")]
+impl<G: ?Sized + Generator<R> + Unpin, R> Generator<R> for &mut G {
+    type Yield = G::Yield;
+    type Return = G::Return;
+
+    fn resume(mut self: Pin<&mut Self>, arg: R) -> GeneratorState<Self::Yield, Self::Return> {
+        G::resume(Pin::new(&mut *self), arg)
+    }
+}
diff --git a/src/libcore/ops/range.rs b/src/libcore/ops/range.rs
index d38b351656..8ffad82b69 100644
--- a/src/libcore/ops/range.rs
+++ b/src/libcore/ops/range.rs
@@ -340,41 +340,21 @@ pub struct RangeInclusive<Idx> {
     // support that mode.
     pub(crate) start: Idx,
     pub(crate) end: Idx,
-    pub(crate) is_empty: Option<bool>,
-    // This field is:
-    //  - `None` when next() or next_back() was never called
-    //  - `Some(false)` when `start <= end` assuming no overflow
-    //  - `Some(true)` otherwise
-    // The field cannot be a simple `bool` because the `..=` constructor can
-    // accept non-PartialOrd types, also we want the constructor to be const.
-}
-
-trait RangeInclusiveEquality: Sized {
-    fn canonicalized_is_empty(range: &RangeInclusive<Self>) -> bool;
-}
-
-impl<T> RangeInclusiveEquality for T {
-    #[inline]
-    default fn canonicalized_is_empty(range: &RangeInclusive<Self>) -> bool {
-        range.is_empty.unwrap_or_default()
-    }
-}
 
-impl<T: PartialOrd> RangeInclusiveEquality for T {
-    #[inline]
-    fn canonicalized_is_empty(range: &RangeInclusive<Self>) -> bool {
-        range.is_empty()
-    }
+    // This field is:
+    //  - `false` upon construction
+    //  - `false` when iteration has yielded an element and the iterator is not exhausted
+    //  - `true` when iteration has been used to exhaust the iterator
+    //
+    // This is required to support PartialEq and Hash without a PartialOrd bound or specialization.
+    pub(crate) exhausted: bool,
 }
 
 #[stable(feature = "inclusive_range", since = "1.26.0")]
 impl<Idx: PartialEq> PartialEq for RangeInclusive<Idx> {
     #[inline]
     fn eq(&self, other: &Self) -> bool {
-        self.start == other.start
-            && self.end == other.end
-            && RangeInclusiveEquality::canonicalized_is_empty(self)
-                == RangeInclusiveEquality::canonicalized_is_empty(other)
+        self.start == other.start && self.end == other.end && self.exhausted == other.exhausted
     }
 }
 
@@ -386,7 +366,7 @@ impl<Idx: Hash> Hash for RangeInclusive<Idx> {
     fn hash<H: Hasher>(&self, state: &mut H) {
         self.start.hash(state);
         self.end.hash(state);
-        RangeInclusiveEquality::canonicalized_is_empty(self).hash(state);
+        self.exhausted.hash(state);
     }
 }
 
@@ -405,7 +385,7 @@ impl<Idx> RangeInclusive<Idx> {
     #[rustc_promotable]
     #[rustc_const_stable(feature = "const_range_new", since = "1.32.0")]
     pub const fn new(start: Idx, end: Idx) -> Self {
-        Self { start, end, is_empty: None }
+        Self { start, end, exhausted: false }
     }
 
     /// Returns the lower bound of the range (inclusive).
@@ -481,6 +461,9 @@ impl<Idx: fmt::Debug> fmt::Debug for RangeInclusive<Idx> {
         self.start.fmt(fmt)?;
         write!(fmt, "..=")?;
         self.end.fmt(fmt)?;
+        if self.exhausted {
+            write!(fmt, " (exhausted)")?;
+        }
         Ok(())
     }
 }
@@ -552,15 +535,7 @@ impl<Idx: PartialOrd<Idx>> RangeInclusive<Idx> {
     #[unstable(feature = "range_is_empty", reason = "recently added", issue = "48111")]
     #[inline]
     pub fn is_empty(&self) -> bool {
-        self.is_empty.unwrap_or_else(|| !(self.start <= self.end))
-    }
-
-    // If this range's `is_empty` is field is unknown (`None`), update it to be a concrete value.
-    #[inline]
-    pub(crate) fn compute_is_empty(&mut self) {
-        if self.is_empty.is_none() {
-            self.is_empty = Some(!(self.start <= self.end));
-        }
+        self.exhausted || !(self.start <= self.end)
     }
 }
 
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index cb4247d987..9b32442371 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -317,7 +317,7 @@ impl<T> Option<T> {
     // Getting to contained values
     /////////////////////////////////////////////////////////////////////////
 
-    /// Unwraps an option, yielding the content of a [`Some`].
+    /// Returns the contained [`Some`] value, consuming the `self` value.
     ///
     /// # Panics
     ///
@@ -331,12 +331,12 @@ impl<T> Option<T> {
     ///
     /// ```
     /// let x = Some("value");
-    /// assert_eq!(x.expect("the world is ending"), "value");
+    /// assert_eq!(x.expect("fruits are healthy"), "value");
     /// ```
     ///
     /// ```{.should_panic}
     /// let x: Option<&str> = None;
-    /// x.expect("the world is ending"); // panics with `the world is ending`
+    /// x.expect("fruits are healthy"); // panics with `fruits are healthy`
     /// ```
     #[inline]
     #[track_caller]
@@ -348,17 +348,22 @@ impl<T> Option<T> {
         }
     }
 
-    /// Moves the value `v` out of the `Option<T>` if it is [`Some(v)`].
+    /// Returns the contained [`Some`] value, consuming the `self` value.
     ///
-    /// In general, because this function may panic, its use is discouraged.
+    /// Because this function may panic, its use is generally discouraged.
     /// Instead, prefer to use pattern matching and handle the [`None`]
-    /// case explicitly.
+    /// case explicitly, or call [`unwrap_or`], [`unwrap_or_else`], or
+    /// [`unwrap_or_default`].
+    ///
+    /// [`unwrap_or`]: #method.unwrap_or
+    /// [`unwrap_or_else`]: #method.unwrap_or_else
+    /// [`unwrap_or_default`]: #method.unwrap_or_default
     ///
     /// # Panics
     ///
     /// Panics if the self value equals [`None`].
     ///
-    /// [`Some(v)`]: #variant.Some
+    /// [`Some`]: #variant.Some
     /// [`None`]: #variant.None
     ///
     /// # Examples
@@ -382,12 +387,13 @@ impl<T> Option<T> {
         }
     }
 
-    /// Returns the contained value or a default.
+    /// Returns the contained [`Some`] value or a provided default.
     ///
     /// Arguments passed to `unwrap_or` are eagerly evaluated; if you are passing
     /// the result of a function call, it is recommended to use [`unwrap_or_else`],
     /// which is lazily evaluated.
     ///
+    /// [`Some`]: #variant.Some
     /// [`unwrap_or_else`]: #method.unwrap_or_else
     ///
     /// # Examples
@@ -405,7 +411,7 @@ impl<T> Option<T> {
         }
     }
 
-    /// Returns the contained value or computes it from a closure.
+    /// Returns the contained [`Some`] value or computes it from a closure.
     ///
     /// # Examples
     ///
@@ -455,6 +461,12 @@ impl<T> Option<T> {
     /// Applies a function to the contained value (if any),
     /// or returns the provided default (if not).
     ///
+    /// Arguments passed to `map_or` are eagerly evaluated; if you are passing
+    /// the result of a function call, it is recommended to use [`map_or_else`],
+    /// which is lazily evaluated.
+    ///
+    /// [`map_or_else`]: #method.map_or_else
+    ///
     /// # Examples
     ///
     /// ```
@@ -980,7 +992,7 @@ impl<T: Clone> Option<&mut T> {
 }
 
 impl<T: fmt::Debug> Option<T> {
-    /// Unwraps an option, expecting [`None`] and returning nothing.
+    /// Consumes `self` while expecting [`None`] and returning nothing.
     ///
     /// # Panics
     ///
@@ -1023,7 +1035,7 @@ impl<T: fmt::Debug> Option<T> {
         }
     }
 
-    /// Unwraps an option, expecting [`None`] and returning nothing.
+    /// Consumes `self` while expecting [`None`] and returning nothing.
     ///
     /// # Panics
     ///
@@ -1068,7 +1080,7 @@ impl<T: fmt::Debug> Option<T> {
 }
 
 impl<T: Default> Option<T> {
-    /// Returns the contained value or a default
+    /// Returns the contained [`Some`] value or a default
     ///
     /// Consumes the `self` argument then, if [`Some`], returns the contained
     /// value, otherwise if [`None`], returns the [default value] for that
diff --git a/src/libcore/pin.rs b/src/libcore/pin.rs
index 676d2c784a..774ecd997c 100644
--- a/src/libcore/pin.rs
+++ b/src/libcore/pin.rs
@@ -312,7 +312,7 @@
 //!
 //! ## Examples
 //!
-//! For a type like [`Vec<T>`], both possibilites (structural pinning or not) make sense.
+//! For a type like [`Vec<T>`], both possibilities (structural pinning or not) make sense.
 //! A [`Vec<T>`] with structural pinning could have `get_pin`/`get_pin_mut` methods to get
 //! pinned references to elements. However, it could *not* allow calling
 //! [`pop`][Vec::pop] on a pinned [`Vec<T>`] because that would move the (structurally pinned)
@@ -539,7 +539,7 @@ impl<P: Deref> Pin<P> {
     /// ```
     /// A value, once pinned, must remain pinned forever (unless its type implements `Unpin`).
     ///
-    /// Similarily, calling `Pin::new_unchecked` on an `Rc<T>` is unsafe because there could be
+    /// Similarly, calling `Pin::new_unchecked` on an `Rc<T>` is unsafe because there could be
     /// aliases to the same data that are not subject to the pinning restrictions:
     /// ```
     /// use std::rc::Rc;
diff --git a/src/libcore/primitive.rs b/src/libcore/primitive.rs
new file mode 100644
index 0000000000..e20b2c5c93
--- /dev/null
+++ b/src/libcore/primitive.rs
@@ -0,0 +1,67 @@
+//! This module reexports the primitive types to allow usage that is not
+//! possibly shadowed by other declared types.
+//!
+//! This is normally only useful in macro generated code.
+//!
+//! An example of this is when generating a new struct and an impl for it:
+//!
+//! ```rust,compile_fail
+//! pub struct bool;
+//!
+//! impl QueryId for bool {
+//!     const SOME_PROPERTY: bool = true;
+//! }
+//!
+//! # trait QueryId { const SOME_PROPERTY: core::primitive::bool; }
+//! ```
+//!
+//! Note that the `SOME_PROPERTY` associated constant would not compile, as its
+//! type `bool` refers to the struct, rather than to the primitive bool type.
+//!
+//! A correct implementation could look like:
+//!
+//! ```rust
+//! # #[allow(non_camel_case_types)]
+//! pub struct bool;
+//!
+//! impl QueryId for bool {
+//!     const SOME_PROPERTY: core::primitive::bool = true;
+//! }
+//!
+//! # trait QueryId { const SOME_PROPERTY: core::primitive::bool; }
+//! ```
+
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use bool;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use char;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use f32;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use f64;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use i128;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use i16;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use i32;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use i64;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use i8;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use isize;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use str;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use u128;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use u16;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use u32;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use u64;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use u8;
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use usize;
diff --git a/src/libcore/ptr/const_ptr.rs b/src/libcore/ptr/const_ptr.rs
index fc3c02e1f0..a540016854 100644
--- a/src/libcore/ptr/const_ptr.rs
+++ b/src/libcore/ptr/const_ptr.rs
@@ -53,7 +53,7 @@ impl<T: ?Sized> *const T {
     /// all of the following is true:
     /// - it is properly aligned
     /// - it must point to an initialized instance of T; in particular, the pointer must be
-    ///   "dereferencable" in the sense defined [here].
+    ///   "dereferenceable" in the sense defined [here].
     ///
     /// This applies even if the result of this method is unused!
     /// (The part about being initialized is not yet fully decided, but until
@@ -183,7 +183,7 @@ impl<T: ?Sized> *const T {
     /// within the same allocated object: [`offset`] is immediate Undefined Behavior when
     /// crossing object boundaries; `wrapping_offset` produces a pointer but still leads
     /// to Undefined Behavior if that pointer is dereferenced. [`offset`] can be optimized
-    /// better and is thus preferrable in performance-sensitive code.
+    /// better and is thus preferable in performance-sensitive code.
     ///
     /// If you need to cross object boundaries, cast the pointer to an integer and
     /// do the arithmetic there.
@@ -480,7 +480,7 @@ impl<T: ?Sized> *const T {
     /// within the same allocated object: [`add`] is immediate Undefined Behavior when
     /// crossing object boundaries; `wrapping_add` produces a pointer but still leads
     /// to Undefined Behavior if that pointer is dereferenced. [`add`] can be optimized
-    /// better and is thus preferrable in performance-sensitive code.
+    /// better and is thus preferable in performance-sensitive code.
     ///
     /// If you need to cross object boundaries, cast the pointer to an integer and
     /// do the arithmetic there.
@@ -535,7 +535,7 @@ impl<T: ?Sized> *const T {
     /// within the same allocated object: [`sub`] is immediate Undefined Behavior when
     /// crossing object boundaries; `wrapping_sub` produces a pointer but still leads
     /// to Undefined Behavior if that pointer is dereferenced. [`sub`] can be optimized
-    /// better and is thus preferrable in performance-sensitive code.
+    /// better and is thus preferable in performance-sensitive code.
     ///
     /// If you need to cross object boundaries, cast the pointer to an integer and
     /// do the arithmetic there.
diff --git a/src/libcore/ptr/mod.rs b/src/libcore/ptr/mod.rs
index 9727e4face..72c46f58fc 100644
--- a/src/libcore/ptr/mod.rs
+++ b/src/libcore/ptr/mod.rs
@@ -19,7 +19,7 @@
 //! * All pointers (except for the null pointer) are valid for all operations of
 //!   [size zero][zst].
 //! * For a pointer to be valid, it is necessary, but not always sufficient, that the pointer
-//!   be *dereferencable*: the memory range of the given size starting at the pointer must all be
+//!   be *dereferenceable*: the memory range of the given size starting at the pointer must all be
 //!   within the bounds of a single allocated object. Note that in Rust,
 //!   every (stack-allocated) variable is considered a separate allocated object.
 //! * All accesses performed by functions in this module are *non-atomic* in the sense
@@ -72,7 +72,7 @@
 use crate::cmp::Ordering;
 use crate::fmt;
 use crate::hash;
-use crate::intrinsics;
+use crate::intrinsics::{self, is_aligned_and_not_null, is_nonoverlapping};
 use crate::mem::{self, MaybeUninit};
 
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -119,10 +119,13 @@ mod mut_ptr;
 ///
 /// Behavior is undefined if any of the following conditions are violated:
 ///
-/// * `to_drop` must be [valid] for reads.
+/// * `to_drop` must be [valid] for both reads and writes.
 ///
 /// * `to_drop` must be properly aligned.
 ///
+/// * The value `to_drop` points to must be valid for dropping, which may mean it must uphold
+///   additional invariants - this is type-dependent.
+///
 /// Additionally, if `T` is not [`Copy`], using the pointed-to value after
 /// calling `drop_in_place` can cause undefined behavior. Note that `*to_drop =
 /// foo` counts as a use because it will cause the value to be dropped
@@ -289,7 +292,7 @@ pub const fn slice_from_raw_parts_mut<T>(data: *mut T, len: usize) -> *mut [T] {
 ///
 /// Behavior is undefined if any of the following conditions are violated:
 ///
-/// * Both `x` and `y` must be [valid] for reads and writes.
+/// * Both `x` and `y` must be [valid] for both reads and writes.
 ///
 /// * Both `x` and `y` must be properly aligned.
 ///
@@ -355,7 +358,7 @@ pub unsafe fn swap<T>(x: *mut T, y: *mut T) {
 ///
 /// Behavior is undefined if any of the following conditions are violated:
 ///
-/// * Both `x` and `y` must be [valid] for reads and writes of `count *
+/// * Both `x` and `y` must be [valid] for both reads and writes of `count *
 ///   size_of::<T>()` bytes.
 ///
 /// * Both `x` and `y` must be properly aligned.
@@ -389,6 +392,10 @@ pub unsafe fn swap<T>(x: *mut T, y: *mut T) {
 #[inline]
 #[stable(feature = "swap_nonoverlapping", since = "1.27.0")]
 pub unsafe fn swap_nonoverlapping<T>(x: *mut T, y: *mut T, count: usize) {
+    debug_assert!(is_aligned_and_not_null(x), "attempt to swap unaligned or null pointer");
+    debug_assert!(is_aligned_and_not_null(y), "attempt to swap unaligned or null pointer");
+    debug_assert!(is_nonoverlapping(x, y, count), "attempt to swap overlapping memory");
+
     let x = x as *mut u8;
     let y = y as *mut u8;
     let len = mem::size_of::<T>() * count;
@@ -471,10 +478,12 @@ unsafe fn swap_nonoverlapping_bytes(x: *mut u8, y: *mut u8, len: usize) {
 ///
 /// Behavior is undefined if any of the following conditions are violated:
 ///
-/// * `dst` must be [valid] for writes.
+/// * `dst` must be [valid] for both reads and writes.
 ///
 /// * `dst` must be properly aligned.
 ///
+/// * `dst` must point to a properly initialized value of type `T`.
+///
 /// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
 ///
 /// [valid]: ../ptr/index.html#safety
@@ -514,6 +523,8 @@ pub unsafe fn replace<T>(dst: *mut T, mut src: T) -> T {
 /// * `src` must be properly aligned. Use [`read_unaligned`] if this is not the
 ///   case.
 ///
+/// * `src` must point to a properly initialized value of type `T`.
+///
 /// Note that even if `T` has size `0`, the pointer must be non-NULL and properly aligned.
 ///
 /// # Examples
@@ -612,6 +623,7 @@ pub unsafe fn replace<T>(dst: *mut T, mut src: T) -> T {
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub unsafe fn read<T>(src: *const T) -> T {
+    // `copy_nonoverlapping` takes care of debug_assert.
     let mut tmp = MaybeUninit::<T>::uninit();
     copy_nonoverlapping(src, tmp.as_mut_ptr(), 1);
     tmp.assume_init()
@@ -628,6 +640,8 @@ pub unsafe fn read<T>(src: *const T) -> T {
 ///
 /// * `src` must be [valid] for reads.
 ///
+/// * `src` must point to a properly initialized value of type `T`.
+///
 /// Like [`read`], `read_unaligned` creates a bitwise copy of `T`, regardless of
 /// whether `T` is [`Copy`]. If `T` is not [`Copy`], using both the returned
 /// value and the value at `*src` can [violate memory safety][read-ownership].
@@ -703,6 +717,7 @@ pub unsafe fn read<T>(src: *const T) -> T {
 #[inline]
 #[stable(feature = "ptr_unaligned", since = "1.17.0")]
 pub unsafe fn read_unaligned<T>(src: *const T) -> T {
+    // `copy_nonoverlapping` takes care of debug_assert.
     let mut tmp = MaybeUninit::<T>::uninit();
     copy_nonoverlapping(src as *const u8, tmp.as_mut_ptr() as *mut u8, mem::size_of::<T>());
     tmp.assume_init()
@@ -795,6 +810,9 @@ pub unsafe fn read_unaligned<T>(src: *const T) -> T {
 #[inline]
 #[stable(feature = "rust1", since = "1.0.0")]
 pub unsafe fn write<T>(dst: *mut T, src: T) {
+    // FIXME: the debug assertion here causes codegen test failures on some architectures.
+    // See <https://github.com/rust-lang/rust/pull/69208#issuecomment-591326757>.
+    // debug_assert!(is_aligned_and_not_null(dst), "attempt to write to unaligned or null pointer");
     intrinsics::move_val_init(&mut *dst, src)
 }
 
@@ -887,6 +905,7 @@ pub unsafe fn write<T>(dst: *mut T, src: T) {
 #[inline]
 #[stable(feature = "ptr_unaligned", since = "1.17.0")]
 pub unsafe fn write_unaligned<T>(dst: *mut T, src: T) {
+    // `copy_nonoverlapping` takes care of debug_assert.
     copy_nonoverlapping(&src as *const T as *const u8, dst as *mut u8, mem::size_of::<T>());
     mem::forget(src);
 }
@@ -922,6 +941,8 @@ pub unsafe fn write_unaligned<T>(dst: *mut T, src: T) {
 ///
 /// * `src` must be properly aligned.
 ///
+/// * `src` must point to a properly initialized value of type `T`.
+///
 /// Like [`read`], `read_volatile` creates a bitwise copy of `T`, regardless of
 /// whether `T` is [`Copy`]. If `T` is not [`Copy`], using both the returned
 /// value and the value at `*src` can [violate memory safety][read-ownership].
@@ -956,6 +977,7 @@ pub unsafe fn write_unaligned<T>(dst: *mut T, src: T) {
 #[inline]
 #[stable(feature = "volatile", since = "1.9.0")]
 pub unsafe fn read_volatile<T>(src: *const T) -> T {
+    debug_assert!(is_aligned_and_not_null(src), "attempt to read from unaligned or null pointer");
     intrinsics::volatile_load(src)
 }
 
@@ -1024,6 +1046,7 @@ pub unsafe fn read_volatile<T>(src: *const T) -> T {
 #[inline]
 #[stable(feature = "volatile", since = "1.9.0")]
 pub unsafe fn write_volatile<T>(dst: *mut T, src: T) {
+    debug_assert!(is_aligned_and_not_null(dst), "attempt to write to unaligned or null pointer");
     intrinsics::volatile_store(dst, src);
 }
 
@@ -1081,9 +1104,8 @@ pub(crate) unsafe fn align_offset<T: Sized>(p: *const T, a: usize) -> usize {
                 // uses e.g., subtraction `mod n`. It is entirely fine to do them `mod
                 // usize::max_value()` instead, because we take the result `mod n` at the end
                 // anyway.
-                inverse = inverse.wrapping_mul(2usize.wrapping_sub(x.wrapping_mul(inverse)))
-                    & (going_mod - 1);
-                if going_mod > m {
+                inverse = inverse.wrapping_mul(2usize.wrapping_sub(x.wrapping_mul(inverse)));
+                if going_mod >= m {
                     return inverse & (m - 1);
                 }
                 going_mod = going_mod.wrapping_mul(going_mod);
@@ -1115,26 +1137,33 @@ pub(crate) unsafe fn align_offset<T: Sized>(p: *const T, a: usize) -> usize {
     let gcdpow = intrinsics::cttz_nonzero(stride).min(intrinsics::cttz_nonzero(a));
     let gcd = 1usize << gcdpow;
 
-    if p as usize & (gcd - 1) == 0 {
+    if p as usize & (gcd.wrapping_sub(1)) == 0 {
         // This branch solves for the following linear congruence equation:
         //
-        // $$ p + so ≡ 0 mod a $$
+        // ` p + so = 0 mod a `
         //
-        // $p$ here is the pointer value, $s$ – stride of `T`, $o$ offset in `T`s, and $a$ – the
+        // `p` here is the pointer value, `s` - stride of `T`, `o` offset in `T`s, and `a` - the
         // requested alignment.
         //
-        // g = gcd(a, s)
-        // o = (a - (p mod a))/g * ((s/g)⁻¹ mod a)
+        // With `g = gcd(a, s)`, and the above asserting that `p` is also divisible by `g`, we can
+        // denote `a' = a/g`, `s' = s/g`, `p' = p/g`, then this becomes equivalent to:
+        //
+        // ` p' + s'o = 0 mod a' `
+        // ` o = (a' - (p' mod a')) * (s'^-1 mod a') `
         //
-        // The first term is “the relative alignment of p to a”, the second term is “how does
-        // incrementing p by s bytes change the relative alignment of p”. Division by `g` is
-        // necessary to make this equation well formed if $a$ and $s$ are not co-prime.
+        // The first term is "the relative alignment of `p` to `a`" (divided by the `g`), the second
+        // term is "how does incrementing `p` by `s` bytes change the relative alignment of `p`" (again
+        // divided by `g`).
+        // Division by `g` is necessary to make the inverse well formed if `a` and `s` are not
+        // co-prime.
         //
-        // Furthermore, the result produced by this solution is not “minimal”, so it is necessary
-        // to take the result $o mod lcm(s, a)$. We can replace $lcm(s, a)$ with just a $a / g$.
-        let j = a.wrapping_sub(pmoda) >> gcdpow;
-        let k = smoda >> gcdpow;
-        return intrinsics::unchecked_rem(j.wrapping_mul(mod_inv(k, a)), a >> gcdpow);
+        // Furthermore, the result produced by this solution is not "minimal", so it is necessary
+        // to take the result `o mod lcm(s, a)`. We can replace `lcm(s, a)` with just a `a'`.
+        let a2 = a >> gcdpow;
+        let a2minus1 = a2.wrapping_sub(1);
+        let s2 = smoda >> gcdpow;
+        let minusp2 = a2.wrapping_sub(pmoda >> gcdpow);
+        return (minusp2.wrapping_mul(mod_inv(s2, a2))) & a2minus1;
     }
 
     // Cannot be aligned at all.
diff --git a/src/libcore/ptr/mut_ptr.rs b/src/libcore/ptr/mut_ptr.rs
index 4bc0a3e9fa..01d830ca18 100644
--- a/src/libcore/ptr/mut_ptr.rs
+++ b/src/libcore/ptr/mut_ptr.rs
@@ -49,7 +49,7 @@ impl<T: ?Sized> *mut T {
     /// memory.
     ///
     /// When calling this method, you have to ensure that if the pointer is
-    /// non-NULL, then it is properly aligned, dereferencable (for the whole
+    /// non-NULL, then it is properly aligned, dereferenceable (for the whole
     /// size of `T`) and points to an initialized instance of `T`. This applies
     /// even if the result of this method is unused!
     /// (The part about being initialized is not yet fully decided, but until
@@ -176,7 +176,7 @@ impl<T: ?Sized> *mut T {
     /// within the same allocated object: [`offset`] is immediate Undefined Behavior when
     /// crossing object boundaries; `wrapping_offset` produces a pointer but still leads
     /// to Undefined Behavior if that pointer is dereferenced. [`offset`] can be optimized
-    /// better and is thus preferrable in performance-sensitive code.
+    /// better and is thus preferable in performance-sensitive code.
     ///
     /// If you need to cross object boundaries, cast the pointer to an integer and
     /// do the arithmetic there.
@@ -224,7 +224,7 @@ impl<T: ?Sized> *mut T {
     /// all of the following is true:
     /// - it is properly aligned
     /// - it must point to an initialized instance of T; in particular, the pointer must be
-    ///   "dereferencable" in the sense defined [here].
+    ///   "dereferenceable" in the sense defined [here].
     ///
     /// This applies even if the result of this method is unused!
     /// (The part about being initialized is not yet fully decided, but until
@@ -526,7 +526,7 @@ impl<T: ?Sized> *mut T {
     /// within the same allocated object: [`add`] is immediate Undefined Behavior when
     /// crossing object boundaries; `wrapping_add` produces a pointer but still leads
     /// to Undefined Behavior if that pointer is dereferenced. [`add`] can be optimized
-    /// better and is thus preferrable in performance-sensitive code.
+    /// better and is thus preferable in performance-sensitive code.
     ///
     /// If you need to cross object boundaries, cast the pointer to an integer and
     /// do the arithmetic there.
@@ -581,7 +581,7 @@ impl<T: ?Sized> *mut T {
     /// within the same allocated object: [`sub`] is immediate Undefined Behavior when
     /// crossing object boundaries; `wrapping_sub` produces a pointer but still leads
     /// to Undefined Behavior if that pointer is dereferenced. [`sub`] can be optimized
-    /// better and is thus preferrable in performance-sensitive code.
+    /// better and is thus preferable in performance-sensitive code.
     ///
     /// If you need to cross object boundaries, cast the pointer to an integer and
     /// do the arithmetic there.
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index bc70dbd62e..0bc29e1bc6 100644
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -524,6 +524,12 @@ impl<T, E> Result<T, E> {
     /// Applies a function to the contained value (if any),
     /// or returns the provided default (if not).
     ///
+    /// Arguments passed to `map_or` are eagerly evaluated; if you are passing
+    /// the result of a function call, it is recommended to use [`map_or_else`],
+    /// which is lazily evaluated.
+    ///
+    /// [`map_or_else`]: #method.map_or_else
+    ///
     /// # Examples
     ///
     /// ```
@@ -792,8 +798,7 @@ impl<T, E> Result<T, E> {
         }
     }
 
-    /// Unwraps a result, yielding the content of an [`Ok`].
-    /// Else, it returns `optb`.
+    /// Returns the contained [`Ok`] value or a provided default.
     ///
     /// Arguments passed to `unwrap_or` are eagerly evaluated; if you are passing
     /// the result of a function call, it is recommended to use [`unwrap_or_else`],
@@ -808,27 +813,25 @@ impl<T, E> Result<T, E> {
     /// Basic usage:
     ///
     /// ```
-    /// let optb = 2;
+    /// let default = 2;
     /// let x: Result<u32, &str> = Ok(9);
-    /// assert_eq!(x.unwrap_or(optb), 9);
+    /// assert_eq!(x.unwrap_or(default), 9);
     ///
     /// let x: Result<u32, &str> = Err("error");
-    /// assert_eq!(x.unwrap_or(optb), optb);
+    /// assert_eq!(x.unwrap_or(default), default);
     /// ```
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
-    pub fn unwrap_or(self, optb: T) -> T {
+    pub fn unwrap_or(self, default: T) -> T {
         match self {
             Ok(t) => t,
-            Err(_) => optb,
+            Err(_) => default,
         }
     }
 
-    /// Unwraps a result, yielding the content of an [`Ok`].
-    /// If the value is an [`Err`] then it calls `op` with its value.
+    /// Returns the contained [`Ok`] value or computes it from a closure.
     ///
     /// [`Ok`]: enum.Result.html#variant.Ok
-    /// [`Err`]: enum.Result.html#variant.Err
     ///
     /// # Examples
     ///
@@ -931,7 +934,44 @@ impl<T: Clone, E> Result<&mut T, E> {
 }
 
 impl<T, E: fmt::Debug> Result<T, E> {
-    /// Unwraps a result, yielding the content of an [`Ok`].
+    /// Returns the contained [`Ok`] value, consuming the `self` value.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the value is an [`Err`], with a panic message including the
+    /// passed message, and the content of the [`Err`].
+    ///
+    /// [`Ok`]: enum.Result.html#variant.Ok
+    /// [`Err`]: enum.Result.html#variant.Err
+    ///
+    /// # Examples
+    ///
+    /// Basic usage:
+    ///
+    /// ```{.should_panic}
+    /// let x: Result<u32, &str> = Err("emergency failure");
+    /// x.expect("Testing expect"); // panics with `Testing expect: emergency failure`
+    /// ```
+    #[inline]
+    #[track_caller]
+    #[stable(feature = "result_expect", since = "1.4.0")]
+    pub fn expect(self, msg: &str) -> T {
+        match self {
+            Ok(t) => t,
+            Err(e) => unwrap_failed(msg, &e),
+        }
+    }
+
+    /// Returns the contained [`Ok`] value, consuming the `self` value.
+    ///
+    /// Because this function may panic, its use is generally discouraged.
+    /// Instead, prefer to use pattern matching and handle the [`Err`]
+    /// case explicitly, or call [`unwrap_or`], [`unwrap_or_else`], or
+    /// [`unwrap_or_default`].
+    ///
+    /// [`unwrap_or`]: #method.unwrap_or
+    /// [`unwrap_or_else`]: #method.unwrap_or_else
+    /// [`unwrap_or_default`]: #method.unwrap_or_default
     ///
     /// # Panics
     ///
@@ -963,13 +1003,15 @@ impl<T, E: fmt::Debug> Result<T, E> {
             Err(e) => unwrap_failed("called `Result::unwrap()` on an `Err` value", &e),
         }
     }
+}
 
-    /// Unwraps a result, yielding the content of an [`Ok`].
+impl<T: fmt::Debug, E> Result<T, E> {
+    /// Returns the contained [`Err`] value, consuming the `self` value.
     ///
     /// # Panics
     ///
-    /// Panics if the value is an [`Err`], with a panic message including the
-    /// passed message, and the content of the [`Err`].
+    /// Panics if the value is an [`Ok`], with a panic message including the
+    /// passed message, and the content of the [`Ok`].
     ///
     /// [`Ok`]: enum.Result.html#variant.Ok
     /// [`Err`]: enum.Result.html#variant.Err
@@ -979,22 +1021,20 @@ impl<T, E: fmt::Debug> Result<T, E> {
     /// Basic usage:
     ///
     /// ```{.should_panic}
-    /// let x: Result<u32, &str> = Err("emergency failure");
-    /// x.expect("Testing expect"); // panics with `Testing expect: emergency failure`
+    /// let x: Result<u32, &str> = Ok(10);
+    /// x.expect_err("Testing expect_err"); // panics with `Testing expect_err: 10`
     /// ```
     #[inline]
     #[track_caller]
-    #[stable(feature = "result_expect", since = "1.4.0")]
-    pub fn expect(self, msg: &str) -> T {
+    #[stable(feature = "result_expect_err", since = "1.17.0")]
+    pub fn expect_err(self, msg: &str) -> E {
         match self {
-            Ok(t) => t,
-            Err(e) => unwrap_failed(msg, &e),
+            Ok(t) => unwrap_failed(msg, &t),
+            Err(e) => e,
         }
     }
-}
 
-impl<T: fmt::Debug, E> Result<T, E> {
-    /// Unwraps a result, yielding the content of an [`Err`].
+    /// Returns the contained [`Err`] value, consuming the `self` value.
     ///
     /// # Panics
     ///
@@ -1025,38 +1065,10 @@ impl<T: fmt::Debug, E> Result<T, E> {
             Err(e) => e,
         }
     }
-
-    /// Unwraps a result, yielding the content of an [`Err`].
-    ///
-    /// # Panics
-    ///
-    /// Panics if the value is an [`Ok`], with a panic message including the
-    /// passed message, and the content of the [`Ok`].
-    ///
-    /// [`Ok`]: enum.Result.html#variant.Ok
-    /// [`Err`]: enum.Result.html#variant.Err
-    ///
-    /// # Examples
-    ///
-    /// Basic usage:
-    ///
-    /// ```{.should_panic}
-    /// let x: Result<u32, &str> = Ok(10);
-    /// x.expect_err("Testing expect_err"); // panics with `Testing expect_err: 10`
-    /// ```
-    #[inline]
-    #[track_caller]
-    #[stable(feature = "result_expect_err", since = "1.17.0")]
-    pub fn expect_err(self, msg: &str) -> E {
-        match self {
-            Ok(t) => unwrap_failed(msg, &t),
-            Err(e) => e,
-        }
-    }
 }
 
 impl<T: Default, E> Result<T, E> {
-    /// Returns the contained value or a default
+    /// Returns the contained [`Ok`] value or a default
     ///
     /// Consumes the `self` argument then, if [`Ok`], returns the contained
     /// value, otherwise if [`Err`], returns the default value for that
@@ -1095,7 +1107,7 @@ impl<T: Default, E> Result<T, E> {
 
 #[unstable(feature = "unwrap_infallible", reason = "newly added", issue = "61695")]
 impl<T, E: Into<!>> Result<T, E> {
-    /// Unwraps a result that can never be an [`Err`], yielding the content of the [`Ok`].
+    /// Returns the contained [`Ok`] value, but never panics.
     ///
     /// Unlike [`unwrap`], this method is known to never panic on the
     /// result types it is implemented for. Therefore, it can be used
diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs
index 9b4d201573..0e12e6360d 100644
--- a/src/libcore/slice/mod.rs
+++ b/src/libcore/slice/mod.rs
@@ -103,7 +103,7 @@ impl<T> [T] {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn first(&self) -> Option<&T> {
-        self.get(0)
+        if let [first, ..] = self { Some(first) } else { None }
     }
 
     /// Returns a mutable pointer to the first element of the slice, or `None` if it is empty.
@@ -121,7 +121,7 @@ impl<T> [T] {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn first_mut(&mut self) -> Option<&mut T> {
-        self.get_mut(0)
+        if let [first, ..] = self { Some(first) } else { None }
     }
 
     /// Returns the first and all the rest of the elements of the slice, or `None` if it is empty.
@@ -139,7 +139,7 @@ impl<T> [T] {
     #[stable(feature = "slice_splits", since = "1.5.0")]
     #[inline]
     pub fn split_first(&self) -> Option<(&T, &[T])> {
-        if self.is_empty() { None } else { Some((&self[0], &self[1..])) }
+        if let [first, tail @ ..] = self { Some((first, tail)) } else { None }
     }
 
     /// Returns the first and all the rest of the elements of the slice, or `None` if it is empty.
@@ -159,12 +159,7 @@ impl<T> [T] {
     #[stable(feature = "slice_splits", since = "1.5.0")]
     #[inline]
     pub fn split_first_mut(&mut self) -> Option<(&mut T, &mut [T])> {
-        if self.is_empty() {
-            None
-        } else {
-            let split = self.split_at_mut(1);
-            Some((&mut split.0[0], split.1))
-        }
+        if let [first, tail @ ..] = self { Some((first, tail)) } else { None }
     }
 
     /// Returns the last and all the rest of the elements of the slice, or `None` if it is empty.
@@ -182,8 +177,7 @@ impl<T> [T] {
     #[stable(feature = "slice_splits", since = "1.5.0")]
     #[inline]
     pub fn split_last(&self) -> Option<(&T, &[T])> {
-        let len = self.len();
-        if len == 0 { None } else { Some((&self[len - 1], &self[..(len - 1)])) }
+        if let [init @ .., last] = self { Some((last, init)) } else { None }
     }
 
     /// Returns the last and all the rest of the elements of the slice, or `None` if it is empty.
@@ -203,13 +197,7 @@ impl<T> [T] {
     #[stable(feature = "slice_splits", since = "1.5.0")]
     #[inline]
     pub fn split_last_mut(&mut self) -> Option<(&mut T, &mut [T])> {
-        let len = self.len();
-        if len == 0 {
-            None
-        } else {
-            let split = self.split_at_mut(len - 1);
-            Some((&mut split.1[0], split.0))
-        }
+        if let [init @ .., last] = self { Some((last, init)) } else { None }
     }
 
     /// Returns the last element of the slice, or `None` if it is empty.
@@ -226,8 +214,7 @@ impl<T> [T] {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn last(&self) -> Option<&T> {
-        let last_idx = self.len().checked_sub(1)?;
-        self.get(last_idx)
+        if let [.., last] = self { Some(last) } else { None }
     }
 
     /// Returns a mutable pointer to the last item in the slice.
@@ -245,8 +232,7 @@ impl<T> [T] {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn last_mut(&mut self) -> Option<&mut T> {
-        let last_idx = self.len().checked_sub(1)?;
-        self.get_mut(last_idx)
+        if let [.., last] = self { Some(last) } else { None }
     }
 
     /// Returns a reference to an element or subslice depending on the type of
@@ -1155,6 +1141,69 @@ impl<T> [T] {
         SplitMut { v: self, pred, finished: false }
     }
 
+    /// Returns an iterator over subslices separated by elements that match
+    /// `pred`. The matched element is contained in the end of the previous
+    /// subslice as a terminator.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// #![feature(split_inclusive)]
+    /// let slice = [10, 40, 33, 20];
+    /// let mut iter = slice.split_inclusive(|num| num % 3 == 0);
+    ///
+    /// assert_eq!(iter.next().unwrap(), &[10, 40, 33]);
+    /// assert_eq!(iter.next().unwrap(), &[20]);
+    /// assert!(iter.next().is_none());
+    /// ```
+    ///
+    /// If the last element of the slice is matched,
+    /// that element will be considered the terminator of the preceding slice.
+    /// That slice will be the last item returned by the iterator.
+    ///
+    /// ```
+    /// #![feature(split_inclusive)]
+    /// let slice = [3, 10, 40, 33];
+    /// let mut iter = slice.split_inclusive(|num| num % 3 == 0);
+    ///
+    /// assert_eq!(iter.next().unwrap(), &[3]);
+    /// assert_eq!(iter.next().unwrap(), &[10, 40, 33]);
+    /// assert!(iter.next().is_none());
+    /// ```
+    #[unstable(feature = "split_inclusive", issue = "none")]
+    #[inline]
+    pub fn split_inclusive<F>(&self, pred: F) -> SplitInclusive<'_, T, F>
+    where
+        F: FnMut(&T) -> bool,
+    {
+        SplitInclusive { v: self, pred, finished: false }
+    }
+
+    /// Returns an iterator over mutable subslices separated by elements that
+    /// match `pred`. The matched element is contained in the previous
+    /// subslice as a terminator.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// #![feature(split_inclusive)]
+    /// let mut v = [10, 40, 30, 20, 60, 50];
+    ///
+    /// for group in v.split_inclusive_mut(|num| *num % 3 == 0) {
+    ///     let terminator_idx = group.len()-1;
+    ///     group[terminator_idx] = 1;
+    /// }
+    /// assert_eq!(v, [10, 40, 1, 20, 1, 1]);
+    /// ```
+    #[unstable(feature = "split_inclusive", issue = "none")]
+    #[inline]
+    pub fn split_inclusive_mut<F>(&mut self, pred: F) -> SplitInclusiveMut<'_, T, F>
+    where
+        F: FnMut(&T) -> bool,
+    {
+        SplitInclusiveMut { v: self, pred, finished: false }
+    }
+
     /// Returns an iterator over subslices separated by elements that match
     /// `pred`, starting at the end of the slice and working backwards.
     /// The matched element is not contained in the subslices.
@@ -2508,11 +2557,13 @@ impl<T> [T] {
             let (left, rest) = self.split_at_mut(offset);
             // now `rest` is definitely aligned, so `from_raw_parts_mut` below is okay
             let (us_len, ts_len) = rest.align_to_offsets::<U>();
+            let rest_len = rest.len();
             let mut_ptr = rest.as_mut_ptr();
+            // We can't use `rest` again after this, that would invalidate its alias `mut_ptr`!
             (
                 left,
                 from_raw_parts_mut(mut_ptr as *mut U, us_len),
-                from_raw_parts_mut(mut_ptr.add(rest.len() - ts_len), ts_len),
+                from_raw_parts_mut(mut_ptr.add(rest_len - ts_len), ts_len),
             )
         }
     }
@@ -3675,7 +3726,106 @@ where
 #[stable(feature = "fused", since = "1.26.0")]
 impl<T, P> FusedIterator for Split<'_, T, P> where P: FnMut(&T) -> bool {}
 
-/// An iterator over the subslices of the vector which are separated
+/// An iterator over subslices separated by elements that match a predicate
+/// function. Unlike `Split`, it contains the matched part as a terminator
+/// of the subslice.
+///
+/// This struct is created by the [`split_inclusive`] method on [slices].
+///
+/// [`split_inclusive`]: ../../std/primitive.slice.html#method.split_inclusive
+/// [slices]: ../../std/primitive.slice.html
+#[unstable(feature = "split_inclusive", issue = "none")]
+pub struct SplitInclusive<'a, T: 'a, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    v: &'a [T],
+    pred: P,
+    finished: bool,
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<T: fmt::Debug, P> fmt::Debug for SplitInclusive<'_, T, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SplitInclusive")
+            .field("v", &self.v)
+            .field("finished", &self.finished)
+            .finish()
+    }
+}
+
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<T, P> Clone for SplitInclusive<'_, T, P>
+where
+    P: Clone + FnMut(&T) -> bool,
+{
+    fn clone(&self) -> Self {
+        SplitInclusive { v: self.v, pred: self.pred.clone(), finished: self.finished }
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, T, P> Iterator for SplitInclusive<'a, T, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    type Item = &'a [T];
+
+    #[inline]
+    fn next(&mut self) -> Option<&'a [T]> {
+        if self.finished {
+            return None;
+        }
+
+        let idx =
+            self.v.iter().position(|x| (self.pred)(x)).map(|idx| idx + 1).unwrap_or(self.v.len());
+        if idx == self.v.len() {
+            self.finished = true;
+        }
+        let ret = Some(&self.v[..idx]);
+        self.v = &self.v[idx..];
+        ret
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        if self.finished { (0, Some(0)) } else { (1, Some(self.v.len() + 1)) }
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, T, P> DoubleEndedIterator for SplitInclusive<'a, T, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    #[inline]
+    fn next_back(&mut self) -> Option<&'a [T]> {
+        if self.finished {
+            return None;
+        }
+
+        // The last index of self.v is already checked and found to match
+        // by the last iteration, so we start searching a new match
+        // one index to the left.
+        let remainder = if self.v.is_empty() { &[] } else { &self.v[..(self.v.len() - 1)] };
+        let idx = remainder.iter().rposition(|x| (self.pred)(x)).map(|idx| idx + 1).unwrap_or(0);
+        if idx == 0 {
+            self.finished = true;
+        }
+        let ret = Some(&self.v[idx..]);
+        self.v = &self.v[..idx];
+        ret
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<T, P> FusedIterator for SplitInclusive<'_, T, P> where P: FnMut(&T) -> bool {}
+
+/// An iterator over the mutable subslices of the vector which are separated
 /// by elements that match `pred`.
 ///
 /// This struct is created by the [`split_mut`] method on [slices].
@@ -3789,6 +3939,114 @@ where
 #[stable(feature = "fused", since = "1.26.0")]
 impl<T, P> FusedIterator for SplitMut<'_, T, P> where P: FnMut(&T) -> bool {}
 
+/// An iterator over the mutable subslices of the vector which are separated
+/// by elements that match `pred`. Unlike `SplitMut`, it contains the matched
+/// parts in the ends of the subslices.
+///
+/// This struct is created by the [`split_inclusive_mut`] method on [slices].
+///
+/// [`split_inclusive_mut`]: ../../std/primitive.slice.html#method.split_inclusive_mut
+/// [slices]: ../../std/primitive.slice.html
+#[unstable(feature = "split_inclusive", issue = "none")]
+pub struct SplitInclusiveMut<'a, T: 'a, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    v: &'a mut [T],
+    pred: P,
+    finished: bool,
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<T: fmt::Debug, P> fmt::Debug for SplitInclusiveMut<'_, T, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SplitInclusiveMut")
+            .field("v", &self.v)
+            .field("finished", &self.finished)
+            .finish()
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, T, P> Iterator for SplitInclusiveMut<'a, T, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    type Item = &'a mut [T];
+
+    #[inline]
+    fn next(&mut self) -> Option<&'a mut [T]> {
+        if self.finished {
+            return None;
+        }
+
+        let idx_opt = {
+            // work around borrowck limitations
+            let pred = &mut self.pred;
+            self.v.iter().position(|x| (*pred)(x))
+        };
+        let idx = idx_opt.map(|idx| idx + 1).unwrap_or(self.v.len());
+        if idx == self.v.len() {
+            self.finished = true;
+        }
+        let tmp = mem::replace(&mut self.v, &mut []);
+        let (head, tail) = tmp.split_at_mut(idx);
+        self.v = tail;
+        Some(head)
+    }
+
+    #[inline]
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        if self.finished {
+            (0, Some(0))
+        } else {
+            // if the predicate doesn't match anything, we yield one slice
+            // if it matches every element, we yield len+1 empty slices.
+            (1, Some(self.v.len() + 1))
+        }
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, T, P> DoubleEndedIterator for SplitInclusiveMut<'a, T, P>
+where
+    P: FnMut(&T) -> bool,
+{
+    #[inline]
+    fn next_back(&mut self) -> Option<&'a mut [T]> {
+        if self.finished {
+            return None;
+        }
+
+        let idx_opt = if self.v.is_empty() {
+            None
+        } else {
+            // work around borrowck limitations
+            let pred = &mut self.pred;
+
+            // The last index of self.v is already checked and found to match
+            // by the last iteration, so we start searching a new match
+            // one index to the left.
+            let remainder = &self.v[..(self.v.len() - 1)];
+            remainder.iter().rposition(|x| (*pred)(x))
+        };
+        let idx = idx_opt.map(|idx| idx + 1).unwrap_or(0);
+        if idx == 0 {
+            self.finished = true;
+        }
+        let tmp = mem::replace(&mut self.v, &mut []);
+        let (head, tail) = tmp.split_at_mut(idx);
+        self.v = head;
+        Some(tail)
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<T, P> FusedIterator for SplitInclusiveMut<'_, T, P> where P: FnMut(&T) -> bool {}
+
 /// An iterator over subslices separated by elements that match a predicate
 /// function, starting from the end of the slice.
 ///
@@ -5584,21 +5842,18 @@ where
 
 #[doc(hidden)]
 // intermediate trait for specialization of slice's PartialOrd
-trait SlicePartialOrd<B> {
-    fn partial_compare(&self, other: &[B]) -> Option<Ordering>;
+trait SlicePartialOrd: Sized {
+    fn partial_compare(left: &[Self], right: &[Self]) -> Option<Ordering>;
 }
 
-impl<A> SlicePartialOrd<A> for [A]
-where
-    A: PartialOrd,
-{
-    default fn partial_compare(&self, other: &[A]) -> Option<Ordering> {
-        let l = cmp::min(self.len(), other.len());
+impl<A: PartialOrd> SlicePartialOrd for A {
+    default fn partial_compare(left: &[A], right: &[A]) -> Option<Ordering> {
+        let l = cmp::min(left.len(), right.len());
 
         // Slice to the loop iteration range to enable bound check
         // elimination in the compiler
-        let lhs = &self[..l];
-        let rhs = &other[..l];
+        let lhs = &left[..l];
+        let rhs = &right[..l];
 
         for i in 0..l {
             match lhs[i].partial_cmp(&rhs[i]) {
@@ -5607,36 +5862,61 @@ where
             }
         }
 
-        self.len().partial_cmp(&other.len())
+        left.len().partial_cmp(&right.len())
     }
 }
 
-impl<A> SlicePartialOrd<A> for [A]
+// This is the impl that we would like to have. Unfortunately it's not sound.
+// See `partial_ord_slice.rs`.
+/*
+impl<A> SlicePartialOrd for A
 where
     A: Ord,
 {
-    default fn partial_compare(&self, other: &[A]) -> Option<Ordering> {
-        Some(SliceOrd::compare(self, other))
+    default fn partial_compare(left: &[A], right: &[A]) -> Option<Ordering> {
+        Some(SliceOrd::compare(left, right))
     }
 }
+*/
+
+impl<A: AlwaysApplicableOrd> SlicePartialOrd for A {
+    fn partial_compare(left: &[A], right: &[A]) -> Option<Ordering> {
+        Some(SliceOrd::compare(left, right))
+    }
+}
+
+trait AlwaysApplicableOrd: SliceOrd + Ord {}
+
+macro_rules! always_applicable_ord {
+    ($([$($p:tt)*] $t:ty,)*) => {
+        $(impl<$($p)*> AlwaysApplicableOrd for $t {})*
+    }
+}
+
+always_applicable_ord! {
+    [] u8, [] u16, [] u32, [] u64, [] u128, [] usize,
+    [] i8, [] i16, [] i32, [] i64, [] i128, [] isize,
+    [] bool, [] char,
+    [T: ?Sized] *const T, [T: ?Sized] *mut T,
+    [T: AlwaysApplicableOrd] &T,
+    [T: AlwaysApplicableOrd] &mut T,
+    [T: AlwaysApplicableOrd] Option<T>,
+}
 
 #[doc(hidden)]
 // intermediate trait for specialization of slice's Ord
-trait SliceOrd<B> {
-    fn compare(&self, other: &[B]) -> Ordering;
+trait SliceOrd: Sized {
+    fn compare(left: &[Self], right: &[Self]) -> Ordering;
 }
 
-impl<A> SliceOrd<A> for [A]
-where
-    A: Ord,
-{
-    default fn compare(&self, other: &[A]) -> Ordering {
-        let l = cmp::min(self.len(), other.len());
+impl<A: Ord> SliceOrd for A {
+    default fn compare(left: &[Self], right: &[Self]) -> Ordering {
+        let l = cmp::min(left.len(), right.len());
 
         // Slice to the loop iteration range to enable bound check
         // elimination in the compiler
-        let lhs = &self[..l];
-        let rhs = &other[..l];
+        let lhs = &left[..l];
+        let rhs = &right[..l];
 
         for i in 0..l {
             match lhs[i].cmp(&rhs[i]) {
@@ -5645,19 +5925,19 @@ where
             }
         }
 
-        self.len().cmp(&other.len())
+        left.len().cmp(&right.len())
     }
 }
 
 // memcmp compares a sequence of unsigned bytes lexicographically.
 // this matches the order we want for [u8], but no others (not even [i8]).
-impl SliceOrd<u8> for [u8] {
+impl SliceOrd for u8 {
     #[inline]
-    fn compare(&self, other: &[u8]) -> Ordering {
+    fn compare(left: &[Self], right: &[Self]) -> Ordering {
         let order =
-            unsafe { memcmp(self.as_ptr(), other.as_ptr(), cmp::min(self.len(), other.len())) };
+            unsafe { memcmp(left.as_ptr(), right.as_ptr(), cmp::min(left.len(), right.len())) };
         if order == 0 {
-            self.len().cmp(&other.len())
+            left.len().cmp(&right.len())
         } else if order < 0 {
             Less
         } else {
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 5a7cddd404..6ad0e68a88 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -2,7 +2,9 @@
 
 //! String manipulation.
 //!
-//! For more details, see the `std::str` module.
+//! For more details, see the [`std::str`] module.
+//!
+//! [`std::str`]: ../../std/str/index.html
 
 #![stable(feature = "rust1", since = "1.0.0")]
 
@@ -12,7 +14,7 @@ use self::pattern::{DoubleEndedSearcher, ReverseSearcher, SearchStep, Searcher};
 use crate::char;
 use crate::fmt::{self, Write};
 use crate::iter::{Chain, FlatMap, Flatten};
-use crate::iter::{Cloned, Filter, FusedIterator, Map, TrustedLen, TrustedRandomAccess};
+use crate::iter::{Copied, Filter, FusedIterator, Map, TrustedLen, TrustedRandomAccess};
 use crate::mem;
 use crate::ops::Try;
 use crate::option;
@@ -750,7 +752,7 @@ impl<'a> CharIndices<'a> {
 /// [`str`]: ../../std/primitive.str.html
 #[stable(feature = "rust1", since = "1.0.0")]
 #[derive(Clone, Debug)]
-pub struct Bytes<'a>(Cloned<slice::Iter<'a, u8>>);
+pub struct Bytes<'a>(Copied<slice::Iter<'a, u8>>);
 
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Iterator for Bytes<'_> {
@@ -1132,6 +1134,26 @@ impl<'a, P: Pattern<'a>> SplitInternal<'a, P> {
         }
     }
 
+    #[inline]
+    fn next_inclusive(&mut self) -> Option<&'a str> {
+        if self.finished {
+            return None;
+        }
+
+        let haystack = self.matcher.haystack();
+        match self.matcher.next_match() {
+            // SAFETY: `Searcher` guarantees that `b` lies on unicode boundary,
+            // and self.start is either the start of the original string,
+            // or `b` was assigned to it, so it also lies on unicode boundary.
+            Some((_, b)) => unsafe {
+                let elt = haystack.get_unchecked(self.start..b);
+                self.start = b;
+                Some(elt)
+            },
+            None => self.get_end(),
+        }
+    }
+
     #[inline]
     fn next_back(&mut self) -> Option<&'a str>
     where
@@ -1168,6 +1190,49 @@ impl<'a, P: Pattern<'a>> SplitInternal<'a, P> {
             },
         }
     }
+
+    #[inline]
+    fn next_back_inclusive(&mut self) -> Option<&'a str>
+    where
+        P::Searcher: ReverseSearcher<'a>,
+    {
+        if self.finished {
+            return None;
+        }
+
+        if !self.allow_trailing_empty {
+            self.allow_trailing_empty = true;
+            match self.next_back_inclusive() {
+                Some(elt) if !elt.is_empty() => return Some(elt),
+                _ => {
+                    if self.finished {
+                        return None;
+                    }
+                }
+            }
+        }
+
+        let haystack = self.matcher.haystack();
+        match self.matcher.next_match_back() {
+            // SAFETY: `Searcher` guarantees that `b` lies on unicode boundary,
+            // and self.end is either the end of the original string,
+            // or `b` was assigned to it, so it also lies on unicode boundary.
+            Some((_, b)) => unsafe {
+                let elt = haystack.get_unchecked(b..self.end);
+                self.end = b;
+                Some(elt)
+            },
+            // SAFETY: self.start is either the start of the original string,
+            // or start of a substring that represents the part of the string that hasn't
+            // iterated yet. Either way, it is guaranteed to lie on unicode boundary.
+            // self.end is either the end of the original string,
+            // or `b` was assigned to it, so it also lies on unicode boundary.
+            None => unsafe {
+                self.finished = true;
+                Some(haystack.get_unchecked(self.start..self.end))
+            },
+        }
+    }
 }
 
 generate_pattern_iterators! {
@@ -1499,7 +1564,7 @@ fn contains_nonascii(x: usize) -> bool {
 
 /// Walks through `v` checking that it's a valid UTF-8 sequence,
 /// returning `Ok(())` in that case, or, if it is invalid, `Err(err)`.
-#[inline]
+#[inline(always)]
 fn run_utf8_validation(v: &[u8]) -> Result<(), Utf8Error> {
     let mut index = 0;
     let len = v.len();
@@ -2423,7 +2488,7 @@ impl str {
     /// Callers of this function are responsible that these preconditions are
     /// satisfied:
     ///
-    /// * The starting index must come before the ending index;
+    /// * The starting index must not exceed the ending index;
     /// * Indexes must be within bounds of the original slice;
     /// * Indexes must lie on UTF-8 sequence boundaries.
     ///
@@ -2455,7 +2520,7 @@ impl str {
     /// Callers of this function are responsible that these preconditions are
     /// satisfied:
     ///
-    /// * The starting index must come before the ending index;
+    /// * The starting index must not exceed the ending index;
     /// * Indexes must be within bounds of the original slice;
     /// * Indexes must lie on UTF-8 sequence boundaries.
     ///
@@ -2500,7 +2565,7 @@ impl str {
     /// Callers of this function are responsible that three preconditions are
     /// satisfied:
     ///
-    /// * `begin` must come before `end`.
+    /// * `begin` must not exceed `end`.
     /// * `begin` and `end` must be byte positions within the string slice.
     /// * `begin` and `end` must lie on UTF-8 sequence boundaries.
     ///
@@ -2549,7 +2614,7 @@ impl str {
     /// Callers of this function are responsible that three preconditions are
     /// satisfied:
     ///
-    /// * `begin` must come before `end`.
+    /// * `begin` must not exceed `end`.
     /// * `begin` and `end` must be byte positions within the string slice.
     /// * `begin` and `end` must lie on UTF-8 sequence boundaries.
     #[stable(feature = "str_slice_mut", since = "1.5.0")]
@@ -2658,7 +2723,8 @@ impl str {
     ///
     /// It's important to remember that [`char`] represents a Unicode Scalar
     /// Value, and may not match your idea of what a 'character' is. Iteration
-    /// over grapheme clusters may be what you actually want.
+    /// over grapheme clusters may be what you actually want. This functionality
+    /// is not provided by Rust's standard library, check crates.io instead.
     ///
     /// # Examples
     ///
@@ -2778,7 +2844,7 @@ impl str {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
     pub fn bytes(&self) -> Bytes<'_> {
-        Bytes(self.as_bytes().iter().cloned())
+        Bytes(self.as_bytes().iter().copied())
     }
 
     /// Splits a string slice by whitespace.
@@ -3212,6 +3278,42 @@ impl str {
         })
     }
 
+    /// An iterator over substrings of this string slice, separated by
+    /// characters matched by a pattern. Differs from the iterator produced by
+    /// `split` in that `split_inclusive` leaves the matched part as the
+    /// terminator of the substring.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// #![feature(split_inclusive)]
+    /// let v: Vec<&str> = "Mary had a little lamb\nlittle lamb\nlittle lamb."
+    ///     .split_inclusive('\n').collect();
+    /// assert_eq!(v, ["Mary had a little lamb\n", "little lamb\n", "little lamb."]);
+    /// ```
+    ///
+    /// If the last element of the string is matched,
+    /// that element will be considered the terminator of the preceding substring.
+    /// That substring will be the last item returned by the iterator.
+    ///
+    /// ```
+    /// #![feature(split_inclusive)]
+    /// let v: Vec<&str> = "Mary had a little lamb\nlittle lamb\nlittle lamb.\n"
+    ///     .split_inclusive('\n').collect();
+    /// assert_eq!(v, ["Mary had a little lamb\n", "little lamb\n", "little lamb.\n"]);
+    /// ```
+    #[unstable(feature = "split_inclusive", issue = "none")]
+    #[inline]
+    pub fn split_inclusive<'a, P: Pattern<'a>>(&'a self, pat: P) -> SplitInclusive<'a, P> {
+        SplitInclusive(SplitInternal {
+            start: 0,
+            end: self.len(),
+            matcher: pat.into_searcher(self),
+            allow_trailing_empty: false,
+            finished: false,
+        })
+    }
+
     /// An iterator over substrings of the given string slice, separated by
     /// characters matched by a pattern and yielded in reverse order.
     ///
@@ -3895,7 +3997,7 @@ impl str {
             debug_assert_eq!(
                 start, 0,
                 "The first search step from Searcher \
-                must include the first character"
+                 must include the first character"
             );
             // SAFETY: `Searcher` is known to return valid indices.
             unsafe { Some(self.get_unchecked(len..)) }
@@ -3934,7 +4036,7 @@ impl str {
                 end,
                 self.len(),
                 "The first search step from ReverseSearcher \
-                must include the last character"
+                 must include the last character"
             );
             // SAFETY: `Searcher` is known to return valid indices.
             unsafe { Some(self.get_unchecked(..start)) }
@@ -4405,6 +4507,19 @@ pub struct SplitAsciiWhitespace<'a> {
     inner: Map<Filter<SliceSplit<'a, u8, IsAsciiWhitespace>, BytesIsNotEmpty>, UnsafeBytesToStr>,
 }
 
+/// An iterator over the substrings of a string,
+/// terminated by a substring matching to a predicate function
+/// Unlike `Split`, it contains the matched part as a terminator
+/// of the subslice.
+///
+/// This struct is created by the [`split_inclusive`] method on [`str`].
+/// See its documentation for more.
+///
+/// [`split_inclusive`]: ../../std/primitive.str.html#method.split_inclusive
+/// [`str`]: ../../std/primitive.str.html
+#[unstable(feature = "split_inclusive", issue = "none")]
+pub struct SplitInclusive<'a, P: Pattern<'a>>(SplitInternal<'a, P>);
+
 impl_fn_for_zst! {
     #[derive(Clone)]
     struct IsWhitespace impl Fn = |c: char| -> bool {
@@ -4495,6 +4610,44 @@ impl<'a> DoubleEndedIterator for SplitAsciiWhitespace<'a> {
 #[stable(feature = "split_ascii_whitespace", since = "1.34.0")]
 impl FusedIterator for SplitAsciiWhitespace<'_> {}
 
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, P: Pattern<'a>> Iterator for SplitInclusive<'a, P> {
+    type Item = &'a str;
+
+    #[inline]
+    fn next(&mut self) -> Option<&'a str> {
+        self.0.next_inclusive()
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, P: Pattern<'a, Searcher: fmt::Debug>> fmt::Debug for SplitInclusive<'a, P> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("SplitInclusive").field("0", &self.0).finish()
+    }
+}
+
+// FIXME(#26925) Remove in favor of `#[derive(Clone)]`
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, P: Pattern<'a, Searcher: Clone>> Clone for SplitInclusive<'a, P> {
+    fn clone(&self) -> Self {
+        SplitInclusive(self.0.clone())
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, P: Pattern<'a, Searcher: ReverseSearcher<'a>>> DoubleEndedIterator
+    for SplitInclusive<'a, P>
+{
+    #[inline]
+    fn next_back(&mut self) -> Option<&'a str> {
+        self.0.next_back_inclusive()
+    }
+}
+
+#[unstable(feature = "split_inclusive", issue = "none")]
+impl<'a, P: Pattern<'a>> FusedIterator for SplitInclusive<'a, P> {}
+
 /// An iterator of [`u16`] over the string encoded as UTF-16.
 ///
 /// [`u16`]: ../../std/primitive.u16.html
diff --git a/src/libcore/str/pattern.rs b/src/libcore/str/pattern.rs
index ef64d8b0fd..6c826e5dcd 100644
--- a/src/libcore/str/pattern.rs
+++ b/src/libcore/str/pattern.rs
@@ -1050,7 +1050,7 @@ impl TwoWaySearcher {
         // &v[..period]. If it is, we use "Algorithm CP1". Otherwise we use
         // "Algorithm CP2", which is optimized for when the period of the needle
         // is large.
-        if &needle[..crit_pos] == &needle[period..period + crit_pos] {
+        if needle[..crit_pos] == needle[period..period + crit_pos] {
             // short period case -- the period is exact
             // compute a separate critical factorization for the reversed needle
             // x = u' v' where |v'| < period(x).
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 9d449bb991..3ba15968f8 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -2444,7 +2444,7 @@ unsafe fn atomic_min<T>(dst: *mut T, val: T, order: Ordering) -> T {
     }
 }
 
-/// returns the max value (signed comparison)
+/// returns the max value (unsigned comparison)
 #[inline]
 #[cfg(target_has_atomic = "8")]
 unsafe fn atomic_umax<T>(dst: *mut T, val: T, order: Ordering) -> T {
@@ -2457,7 +2457,7 @@ unsafe fn atomic_umax<T>(dst: *mut T, val: T, order: Ordering) -> T {
     }
 }
 
-/// returns the min value (signed comparison)
+/// returns the min value (unsigned comparison)
 #[inline]
 #[cfg(target_has_atomic = "8")]
 unsafe fn atomic_umin<T>(dst: *mut T, val: T, order: Ordering) -> T {
diff --git a/src/libcore/tests/alloc.rs b/src/libcore/tests/alloc.rs
index 63537ba23d..c8592e40a6 100644
--- a/src/libcore/tests/alloc.rs
+++ b/src/libcore/tests/alloc.rs
@@ -1,10 +1,13 @@
 use core::alloc::Layout;
+use core::ptr::NonNull;
 
 #[test]
 fn const_unchecked_layout() {
     const SIZE: usize = 0x2000;
     const ALIGN: usize = 0x1000;
     const LAYOUT: Layout = unsafe { Layout::from_size_align_unchecked(SIZE, ALIGN) };
+    const DANGLING: NonNull<u8> = LAYOUT.dangling();
     assert_eq!(LAYOUT.size(), SIZE);
     assert_eq!(LAYOUT.align(), ALIGN);
+    assert_eq!(Some(DANGLING), NonNull::new(ALIGN as *mut u8));
 }
diff --git a/src/libcore/tests/fmt/num.rs b/src/libcore/tests/fmt/num.rs
index 10fcf8b76c..a50c2b46a9 100644
--- a/src/libcore/tests/fmt/num.rs
+++ b/src/libcore/tests/fmt/num.rs
@@ -38,6 +38,16 @@ fn test_format_int() {
     assert_eq!(format!("{:o}", 1i16), "1");
     assert_eq!(format!("{:o}", 1i32), "1");
     assert_eq!(format!("{:o}", 1i64), "1");
+    assert_eq!(format!("{:e}", 1isize), "1e0");
+    assert_eq!(format!("{:e}", 1i8), "1e0");
+    assert_eq!(format!("{:e}", 1i16), "1e0");
+    assert_eq!(format!("{:e}", 1i32), "1e0");
+    assert_eq!(format!("{:e}", 1i64), "1e0");
+    assert_eq!(format!("{:E}", 1isize), "1E0");
+    assert_eq!(format!("{:E}", 1i8), "1E0");
+    assert_eq!(format!("{:E}", 1i16), "1E0");
+    assert_eq!(format!("{:E}", 1i32), "1E0");
+    assert_eq!(format!("{:E}", 1i64), "1E0");
 
     assert_eq!(format!("{}", 1usize), "1");
     assert_eq!(format!("{}", 1u8), "1");
@@ -69,6 +79,14 @@ fn test_format_int() {
     assert_eq!(format!("{:o}", 1u16), "1");
     assert_eq!(format!("{:o}", 1u32), "1");
     assert_eq!(format!("{:o}", 1u64), "1");
+    assert_eq!(format!("{:e}", 1u8), "1e0");
+    assert_eq!(format!("{:e}", 1u16), "1e0");
+    assert_eq!(format!("{:e}", 1u32), "1e0");
+    assert_eq!(format!("{:e}", 1u64), "1e0");
+    assert_eq!(format!("{:E}", 1u8), "1E0");
+    assert_eq!(format!("{:E}", 1u16), "1E0");
+    assert_eq!(format!("{:E}", 1u32), "1E0");
+    assert_eq!(format!("{:E}", 1u64), "1E0");
 
     // Test a larger number
     assert_eq!(format!("{:b}", 55), "110111");
@@ -76,6 +94,64 @@ fn test_format_int() {
     assert_eq!(format!("{}", 55), "55");
     assert_eq!(format!("{:x}", 55), "37");
     assert_eq!(format!("{:X}", 55), "37");
+    assert_eq!(format!("{:e}", 55), "5.5e1");
+    assert_eq!(format!("{:E}", 55), "5.5E1");
+    assert_eq!(format!("{:e}", 10000000000u64), "1e10");
+    assert_eq!(format!("{:E}", 10000000000u64), "1E10");
+    assert_eq!(format!("{:e}", 10000000001u64), "1.0000000001e10");
+    assert_eq!(format!("{:E}", 10000000001u64), "1.0000000001E10");
+}
+
+#[test]
+fn test_format_int_exp_limits() {
+    use core::{i128, i16, i32, i64, i8, u128, u16, u32, u64, u8};
+    assert_eq!(format!("{:e}", i8::MIN), "-1.28e2");
+    assert_eq!(format!("{:e}", i8::MAX), "1.27e2");
+    assert_eq!(format!("{:e}", i16::MIN), "-3.2768e4");
+    assert_eq!(format!("{:e}", i16::MAX), "3.2767e4");
+    assert_eq!(format!("{:e}", i32::MIN), "-2.147483648e9");
+    assert_eq!(format!("{:e}", i32::MAX), "2.147483647e9");
+    assert_eq!(format!("{:e}", i64::MIN), "-9.223372036854775808e18");
+    assert_eq!(format!("{:e}", i64::MAX), "9.223372036854775807e18");
+    assert_eq!(format!("{:e}", i128::MIN), "-1.70141183460469231731687303715884105728e38");
+    assert_eq!(format!("{:e}", i128::MAX), "1.70141183460469231731687303715884105727e38");
+
+    assert_eq!(format!("{:e}", u8::MAX), "2.55e2");
+    assert_eq!(format!("{:e}", u16::MAX), "6.5535e4");
+    assert_eq!(format!("{:e}", u32::MAX), "4.294967295e9");
+    assert_eq!(format!("{:e}", u64::MAX), "1.8446744073709551615e19");
+    assert_eq!(format!("{:e}", u128::MAX), "3.40282366920938463463374607431768211455e38");
+}
+
+#[test]
+fn test_format_int_exp_precision() {
+    use core::{i128, i16, i32, i64, i8};
+
+    //test that float and integer match
+    let big_int: u32 = 314_159_265;
+    assert_eq!(format!("{:.1e}", big_int), format!("{:.1e}", f64::from(big_int)));
+
+    //test adding precision
+    assert_eq!(format!("{:.10e}", i8::MIN), "-1.2800000000e2");
+    assert_eq!(format!("{:.10e}", i16::MIN), "-3.2768000000e4");
+    assert_eq!(format!("{:.10e}", i32::MIN), "-2.1474836480e9");
+    assert_eq!(format!("{:.20e}", i64::MIN), "-9.22337203685477580800e18");
+    assert_eq!(format!("{:.40e}", i128::MIN), "-1.7014118346046923173168730371588410572800e38");
+
+    //test rounding
+    assert_eq!(format!("{:.1e}", i8::MIN), "-1.3e2");
+    assert_eq!(format!("{:.1e}", i16::MIN), "-3.3e4");
+    assert_eq!(format!("{:.1e}", i32::MIN), "-2.1e9");
+    assert_eq!(format!("{:.1e}", i64::MIN), "-9.2e18");
+    assert_eq!(format!("{:.1e}", i128::MIN), "-1.7e38");
+
+    //test huge precision
+    assert_eq!(format!("{:.1000e}", 1), format!("1.{}e0", "0".repeat(1000)));
+    //test zero precision
+    assert_eq!(format!("{:.0e}", 1), format!("1e0",));
+
+    //test padding with precision (and sign)
+    assert_eq!(format!("{:+10.3e}", 1), "  +1.000e0");
 }
 
 #[test]
@@ -86,6 +162,8 @@ fn test_format_int_zero() {
     assert_eq!(format!("{:o}", 0), "0");
     assert_eq!(format!("{:x}", 0), "0");
     assert_eq!(format!("{:X}", 0), "0");
+    assert_eq!(format!("{:e}", 0), "0e0");
+    assert_eq!(format!("{:E}", 0), "0E0");
 
     assert_eq!(format!("{}", 0u32), "0");
     assert_eq!(format!("{:?}", 0u32), "0");
@@ -93,6 +171,8 @@ fn test_format_int_zero() {
     assert_eq!(format!("{:o}", 0u32), "0");
     assert_eq!(format!("{:x}", 0u32), "0");
     assert_eq!(format!("{:X}", 0u32), "0");
+    assert_eq!(format!("{:e}", 0u32), "0e0");
+    assert_eq!(format!("{:E}", 0u32), "0E0");
 }
 
 #[test]
diff --git a/src/libcore/tests/hash/sip.rs b/src/libcore/tests/hash/sip.rs
index 0f09554991..5c0e114e93 100644
--- a/src/libcore/tests/hash/sip.rs
+++ b/src/libcore/tests/hash/sip.rs
@@ -238,7 +238,7 @@ fn test_siphash_2_4() {
 #[cfg(target_pointer_width = "32")]
 fn test_hash_usize() {
     let val = 0xdeadbeef_deadbeef_u64;
-    assert!(hash(&(val as u64)) != hash(&(val as usize)));
+    assert_ne!(hash(&(val as u64)), hash(&(val as usize)));
     assert_eq!(hash(&(val as u32)), hash(&(val as usize)));
 }
 
@@ -247,7 +247,7 @@ fn test_hash_usize() {
 fn test_hash_usize() {
     let val = 0xdeadbeef_deadbeef_u64;
     assert_eq!(hash(&(val as u64)), hash(&(val as usize)));
-    assert!(hash(&(val as u32)) != hash(&(val as usize)));
+    assert_ne!(hash(&(val as u32)), hash(&(val as usize)));
 }
 
 #[test]
@@ -262,14 +262,14 @@ fn test_hash_idempotent() {
 fn test_hash_no_bytes_dropped_64() {
     let val = 0xdeadbeef_deadbeef_u64;
 
-    assert!(hash(&val) != hash(&zero_byte(val, 0)));
-    assert!(hash(&val) != hash(&zero_byte(val, 1)));
-    assert!(hash(&val) != hash(&zero_byte(val, 2)));
-    assert!(hash(&val) != hash(&zero_byte(val, 3)));
-    assert!(hash(&val) != hash(&zero_byte(val, 4)));
-    assert!(hash(&val) != hash(&zero_byte(val, 5)));
-    assert!(hash(&val) != hash(&zero_byte(val, 6)));
-    assert!(hash(&val) != hash(&zero_byte(val, 7)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 0)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 1)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 2)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 3)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 4)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 5)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 6)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 7)));
 
     fn zero_byte(val: u64, byte: usize) -> u64 {
         assert!(byte < 8);
@@ -281,10 +281,10 @@ fn test_hash_no_bytes_dropped_64() {
 fn test_hash_no_bytes_dropped_32() {
     let val = 0xdeadbeef_u32;
 
-    assert!(hash(&val) != hash(&zero_byte(val, 0)));
-    assert!(hash(&val) != hash(&zero_byte(val, 1)));
-    assert!(hash(&val) != hash(&zero_byte(val, 2)));
-    assert!(hash(&val) != hash(&zero_byte(val, 3)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 0)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 1)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 2)));
+    assert_ne!(hash(&val), hash(&zero_byte(val, 3)));
 
     fn zero_byte(val: u32, byte: usize) -> u32 {
         assert!(byte < 4);
@@ -298,15 +298,17 @@ fn test_hash_no_concat_alias() {
     let t = ("aabb", "");
     let u = ("a", "abb");
 
-    assert!(s != t && t != u);
-    assert!(hash(&s) != hash(&t) && hash(&s) != hash(&u));
+    assert_ne!(s, t);
+    assert_ne!(t, u);
+    assert_ne!(hash(&s), hash(&t));
+    assert_ne!(hash(&s), hash(&u));
 
     let u = [1, 0, 0, 0];
     let v = (&u[..1], &u[1..3], &u[3..]);
     let w = (&u[..], &u[4..4], &u[4..4]);
 
-    assert!(v != w);
-    assert!(hash(&v) != hash(&w));
+    assert_ne!(v, w);
+    assert_ne!(hash(&v), hash(&w));
 }
 
 #[test]
diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs
index 8b8dc94153..5b41ef3506 100644
--- a/src/libcore/tests/iter.rs
+++ b/src/libcore/tests/iter.rs
@@ -1477,6 +1477,7 @@ fn test_iterator_size_hint() {
     assert_eq!(c.clone().take(5).size_hint(), (5, Some(5)));
     assert_eq!(c.clone().skip(5).size_hint().1, None);
     assert_eq!(c.clone().take_while(|_| false).size_hint(), (0, None));
+    assert_eq!(c.clone().map_while(|_| None::<()>).size_hint(), (0, None));
     assert_eq!(c.clone().skip_while(|_| false).size_hint(), (0, None));
     assert_eq!(c.clone().enumerate().size_hint(), (usize::MAX, None));
     assert_eq!(c.clone().chain(vi.clone().cloned()).size_hint(), (usize::MAX, None));
@@ -1491,6 +1492,7 @@ fn test_iterator_size_hint() {
     assert_eq!(vi.clone().skip(3).size_hint(), (7, Some(7)));
     assert_eq!(vi.clone().skip(12).size_hint(), (0, Some(0)));
     assert_eq!(vi.clone().take_while(|_| false).size_hint(), (0, Some(10)));
+    assert_eq!(vi.clone().map_while(|_| None::<()>).size_hint(), (0, Some(10)));
     assert_eq!(vi.clone().skip_while(|_| false).size_hint(), (0, Some(10)));
     assert_eq!(vi.clone().enumerate().size_hint(), (10, Some(10)));
     assert_eq!(vi.clone().chain(v2).size_hint(), (13, Some(13)));
@@ -1954,11 +1956,19 @@ fn test_range_inclusive_exhaustion() {
     assert_eq!(r.next(), None);
     assert_eq!(r.next(), None);
 
+    assert_eq!(*r.start(), 10);
+    assert_eq!(*r.end(), 10);
+    assert_ne!(r, 10..=10);
+
     let mut r = 10..=10;
     assert_eq!(r.next_back(), Some(10));
     assert!(r.is_empty());
     assert_eq!(r.next_back(), None);
 
+    assert_eq!(*r.start(), 10);
+    assert_eq!(*r.end(), 10);
+    assert_ne!(r, 10..=10);
+
     let mut r = 10..=12;
     assert_eq!(r.next(), Some(10));
     assert_eq!(r.next(), Some(11));
@@ -2076,6 +2086,9 @@ fn test_range_inclusive_nth() {
     assert_eq!((10..=15).nth(5), Some(15));
     assert_eq!((10..=15).nth(6), None);
 
+    let mut exhausted_via_next = 10_u8..=20;
+    while exhausted_via_next.next().is_some() {}
+
     let mut r = 10_u8..=20;
     assert_eq!(r.nth(2), Some(12));
     assert_eq!(r, 13..=20);
@@ -2085,6 +2098,7 @@ fn test_range_inclusive_nth() {
     assert_eq!(ExactSizeIterator::is_empty(&r), false);
     assert_eq!(r.nth(10), None);
     assert_eq!(r.is_empty(), true);
+    assert_eq!(r, exhausted_via_next);
     assert_eq!(ExactSizeIterator::is_empty(&r), true);
 }
 
@@ -2096,6 +2110,9 @@ fn test_range_inclusive_nth_back() {
     assert_eq!((10..=15).nth_back(6), None);
     assert_eq!((-120..=80_i8).nth_back(200), Some(-120));
 
+    let mut exhausted_via_next_back = 10_u8..=20;
+    while exhausted_via_next_back.next_back().is_some() {}
+
     let mut r = 10_u8..=20;
     assert_eq!(r.nth_back(2), Some(18));
     assert_eq!(r, 10..=17);
@@ -2105,6 +2122,7 @@ fn test_range_inclusive_nth_back() {
     assert_eq!(ExactSizeIterator::is_empty(&r), false);
     assert_eq!(r.nth_back(10), None);
     assert_eq!(r.is_empty(), true);
+    assert_eq!(r, exhausted_via_next_back);
     assert_eq!(ExactSizeIterator::is_empty(&r), true);
 }
 
diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs
index 567c840b01..71a061af28 100644
--- a/src/libcore/tests/lib.rs
+++ b/src/libcore/tests/lib.rs
@@ -1,3 +1,4 @@
+#![feature(alloc_layout_extra)]
 #![feature(bool_to_option)]
 #![feature(bound_cloned)]
 #![feature(box_syntax)]
@@ -13,12 +14,10 @@
 #![feature(hashmap_internals)]
 #![feature(try_find)]
 #![feature(is_sorted)]
-#![feature(iter_once_with)]
 #![feature(pattern)]
 #![feature(range_is_empty)]
 #![feature(raw)]
 #![feature(saturating_neg)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(sort_internals)]
 #![feature(slice_partition_at_index)]
 #![feature(specialization)]
@@ -36,6 +35,7 @@
 #![feature(iter_is_partitioned)]
 #![feature(iter_order_by)]
 #![feature(cmp_min_max_by)]
+#![feature(iter_map_while)]
 #![feature(const_slice_from_raw_parts)]
 #![feature(const_raw_ptr_deref)]
 #![feature(never_type)]
diff --git a/src/libcore/tests/num/flt2dec/mod.rs b/src/libcore/tests/num/flt2dec/mod.rs
index f693504824..e945d9c4a5 100644
--- a/src/libcore/tests/num/flt2dec/mod.rs
+++ b/src/libcore/tests/num/flt2dec/mod.rs
@@ -500,94 +500,91 @@ where
 {
     use core::num::flt2dec::Sign::*;
 
-    fn to_string<T, F>(f: &mut F, v: T, sign: Sign, frac_digits: usize, upper: bool) -> String
+    fn to_string<T, F>(f: &mut F, v: T, sign: Sign, frac_digits: usize) -> String
     where
         T: DecodableFloat,
         F: FnMut(&Decoded, &mut [u8]) -> (usize, i16),
     {
         to_string_with_parts(|buf, parts| {
-            to_shortest_str(|d, b| f(d, b), v, sign, frac_digits, upper, buf, parts)
+            to_shortest_str(|d, b| f(d, b), v, sign, frac_digits, buf, parts)
         })
     }
 
     let f = &mut f_;
 
-    assert_eq!(to_string(f, 0.0, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 0.0, MinusRaw, 0, false), "0");
-    assert_eq!(to_string(f, 0.0, MinusPlus, 0, false), "+0");
-    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 0, false), "+0");
-    assert_eq!(to_string(f, -0.0, Minus, 0, false), "0");
-    assert_eq!(to_string(f, -0.0, MinusRaw, 0, false), "-0");
-    assert_eq!(to_string(f, -0.0, MinusPlus, 0, false), "+0");
-    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 0, false), "-0");
-    assert_eq!(to_string(f, 0.0, Minus, 1, true), "0.0");
-    assert_eq!(to_string(f, 0.0, MinusRaw, 1, true), "0.0");
-    assert_eq!(to_string(f, 0.0, MinusPlus, 1, true), "+0.0");
-    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 1, true), "+0.0");
-    assert_eq!(to_string(f, -0.0, Minus, 8, true), "0.00000000");
-    assert_eq!(to_string(f, -0.0, MinusRaw, 8, true), "-0.00000000");
-    assert_eq!(to_string(f, -0.0, MinusPlus, 8, true), "+0.00000000");
-    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 8, true), "-0.00000000");
-
-    assert_eq!(to_string(f, 1.0 / 0.0, Minus, 0, false), "inf");
-    assert_eq!(to_string(f, 1.0 / 0.0, MinusRaw, 0, true), "inf");
-    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlus, 0, false), "+inf");
-    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlusRaw, 0, true), "+inf");
-    assert_eq!(to_string(f, 0.0 / 0.0, Minus, 0, false), "NaN");
-    assert_eq!(to_string(f, 0.0 / 0.0, MinusRaw, 1, true), "NaN");
-    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlus, 8, false), "NaN");
-    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlusRaw, 64, true), "NaN");
-    assert_eq!(to_string(f, -1.0 / 0.0, Minus, 0, false), "-inf");
-    assert_eq!(to_string(f, -1.0 / 0.0, MinusRaw, 1, true), "-inf");
-    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlus, 8, false), "-inf");
-    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlusRaw, 64, true), "-inf");
-
-    assert_eq!(to_string(f, 3.14, Minus, 0, false), "3.14");
-    assert_eq!(to_string(f, 3.14, MinusRaw, 0, false), "3.14");
-    assert_eq!(to_string(f, 3.14, MinusPlus, 0, false), "+3.14");
-    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 0, false), "+3.14");
-    assert_eq!(to_string(f, -3.14, Minus, 0, false), "-3.14");
-    assert_eq!(to_string(f, -3.14, MinusRaw, 0, false), "-3.14");
-    assert_eq!(to_string(f, -3.14, MinusPlus, 0, false), "-3.14");
-    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 0, false), "-3.14");
-    assert_eq!(to_string(f, 3.14, Minus, 1, true), "3.14");
-    assert_eq!(to_string(f, 3.14, MinusRaw, 2, true), "3.14");
-    assert_eq!(to_string(f, 3.14, MinusPlus, 3, true), "+3.140");
-    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 4, true), "+3.1400");
-    assert_eq!(to_string(f, -3.14, Minus, 8, true), "-3.14000000");
-    assert_eq!(to_string(f, -3.14, MinusRaw, 8, true), "-3.14000000");
-    assert_eq!(to_string(f, -3.14, MinusPlus, 8, true), "-3.14000000");
-    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 8, true), "-3.14000000");
-
-    assert_eq!(to_string(f, 7.5e-11, Minus, 0, false), "0.000000000075");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 3, false), "0.000000000075");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 12, false), "0.000000000075");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 13, false), "0.0000000000750");
-
-    assert_eq!(to_string(f, 1.9971e20, Minus, 0, false), "199710000000000000000");
-    assert_eq!(to_string(f, 1.9971e20, Minus, 1, false), "199710000000000000000.0");
-    assert_eq!(to_string(f, 1.9971e20, Minus, 8, false), "199710000000000000000.00000000");
-
-    assert_eq!(to_string(f, f32::MAX, Minus, 0, false), format!("34028235{:0>31}", ""));
-    assert_eq!(to_string(f, f32::MAX, Minus, 1, false), format!("34028235{:0>31}.0", ""));
-    assert_eq!(to_string(f, f32::MAX, Minus, 8, false), format!("34028235{:0>31}.00000000", ""));
+    assert_eq!(to_string(f, 0.0, Minus, 0), "0");
+    assert_eq!(to_string(f, 0.0, MinusRaw, 0), "0");
+    assert_eq!(to_string(f, 0.0, MinusPlus, 0), "+0");
+    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 0), "+0");
+    assert_eq!(to_string(f, -0.0, Minus, 0), "0");
+    assert_eq!(to_string(f, -0.0, MinusRaw, 0), "-0");
+    assert_eq!(to_string(f, -0.0, MinusPlus, 0), "+0");
+    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 0), "-0");
+    assert_eq!(to_string(f, 0.0, Minus, 1), "0.0");
+    assert_eq!(to_string(f, 0.0, MinusRaw, 1), "0.0");
+    assert_eq!(to_string(f, 0.0, MinusPlus, 1), "+0.0");
+    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 1), "+0.0");
+    assert_eq!(to_string(f, -0.0, Minus, 8), "0.00000000");
+    assert_eq!(to_string(f, -0.0, MinusRaw, 8), "-0.00000000");
+    assert_eq!(to_string(f, -0.0, MinusPlus, 8), "+0.00000000");
+    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 8), "-0.00000000");
+
+    assert_eq!(to_string(f, 1.0 / 0.0, Minus, 0), "inf");
+    assert_eq!(to_string(f, 1.0 / 0.0, MinusRaw, 0), "inf");
+    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlus, 0), "+inf");
+    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlusRaw, 0), "+inf");
+    assert_eq!(to_string(f, 0.0 / 0.0, Minus, 0), "NaN");
+    assert_eq!(to_string(f, 0.0 / 0.0, MinusRaw, 1), "NaN");
+    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlus, 8), "NaN");
+    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlusRaw, 64), "NaN");
+    assert_eq!(to_string(f, -1.0 / 0.0, Minus, 0), "-inf");
+    assert_eq!(to_string(f, -1.0 / 0.0, MinusRaw, 1), "-inf");
+    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlus, 8), "-inf");
+    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlusRaw, 64), "-inf");
+
+    assert_eq!(to_string(f, 3.14, Minus, 0), "3.14");
+    assert_eq!(to_string(f, 3.14, MinusRaw, 0), "3.14");
+    assert_eq!(to_string(f, 3.14, MinusPlus, 0), "+3.14");
+    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 0), "+3.14");
+    assert_eq!(to_string(f, -3.14, Minus, 0), "-3.14");
+    assert_eq!(to_string(f, -3.14, MinusRaw, 0), "-3.14");
+    assert_eq!(to_string(f, -3.14, MinusPlus, 0), "-3.14");
+    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 0), "-3.14");
+    assert_eq!(to_string(f, 3.14, Minus, 1), "3.14");
+    assert_eq!(to_string(f, 3.14, MinusRaw, 2), "3.14");
+    assert_eq!(to_string(f, 3.14, MinusPlus, 3), "+3.140");
+    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 4), "+3.1400");
+    assert_eq!(to_string(f, -3.14, Minus, 8), "-3.14000000");
+    assert_eq!(to_string(f, -3.14, MinusRaw, 8), "-3.14000000");
+    assert_eq!(to_string(f, -3.14, MinusPlus, 8), "-3.14000000");
+    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 8), "-3.14000000");
+
+    assert_eq!(to_string(f, 7.5e-11, Minus, 0), "0.000000000075");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 3), "0.000000000075");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 12), "0.000000000075");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 13), "0.0000000000750");
+
+    assert_eq!(to_string(f, 1.9971e20, Minus, 0), "199710000000000000000");
+    assert_eq!(to_string(f, 1.9971e20, Minus, 1), "199710000000000000000.0");
+    assert_eq!(to_string(f, 1.9971e20, Minus, 8), "199710000000000000000.00000000");
+
+    assert_eq!(to_string(f, f32::MAX, Minus, 0), format!("34028235{:0>31}", ""));
+    assert_eq!(to_string(f, f32::MAX, Minus, 1), format!("34028235{:0>31}.0", ""));
+    assert_eq!(to_string(f, f32::MAX, Minus, 8), format!("34028235{:0>31}.00000000", ""));
 
     let minf32 = ldexp_f32(1.0, -149);
-    assert_eq!(to_string(f, minf32, Minus, 0, false), format!("0.{:0>44}1", ""));
-    assert_eq!(to_string(f, minf32, Minus, 45, false), format!("0.{:0>44}1", ""));
-    assert_eq!(to_string(f, minf32, Minus, 46, false), format!("0.{:0>44}10", ""));
+    assert_eq!(to_string(f, minf32, Minus, 0), format!("0.{:0>44}1", ""));
+    assert_eq!(to_string(f, minf32, Minus, 45), format!("0.{:0>44}1", ""));
+    assert_eq!(to_string(f, minf32, Minus, 46), format!("0.{:0>44}10", ""));
 
-    assert_eq!(to_string(f, f64::MAX, Minus, 0, false), format!("17976931348623157{:0>292}", ""));
-    assert_eq!(to_string(f, f64::MAX, Minus, 1, false), format!("17976931348623157{:0>292}.0", ""));
-    assert_eq!(
-        to_string(f, f64::MAX, Minus, 8, false),
-        format!("17976931348623157{:0>292}.00000000", "")
-    );
+    assert_eq!(to_string(f, f64::MAX, Minus, 0), format!("17976931348623157{:0>292}", ""));
+    assert_eq!(to_string(f, f64::MAX, Minus, 1), format!("17976931348623157{:0>292}.0", ""));
+    assert_eq!(to_string(f, f64::MAX, Minus, 8), format!("17976931348623157{:0>292}.00000000", ""));
 
     let minf64 = ldexp_f64(1.0, -1074);
-    assert_eq!(to_string(f, minf64, Minus, 0, false), format!("0.{:0>323}5", ""));
-    assert_eq!(to_string(f, minf64, Minus, 324, false), format!("0.{:0>323}5", ""));
-    assert_eq!(to_string(f, minf64, Minus, 325, false), format!("0.{:0>323}50", ""));
+    assert_eq!(to_string(f, minf64, Minus, 0), format!("0.{:0>323}5", ""));
+    assert_eq!(to_string(f, minf64, Minus, 324), format!("0.{:0>323}5", ""));
+    assert_eq!(to_string(f, minf64, Minus, 325), format!("0.{:0>323}50", ""));
 
     if cfg!(miri) {
         // Miri is too slow
@@ -595,7 +592,7 @@ where
     }
 
     // very large output
-    assert_eq!(to_string(f, 1.1, Minus, 80000, false), format!("1.1{:0>79999}", ""));
+    assert_eq!(to_string(f, 1.1, Minus, 80000), format!("1.1{:0>79999}", ""));
 }
 
 pub fn to_shortest_exp_str_test<F>(mut f_: F)
@@ -996,166 +993,157 @@ where
 {
     use core::num::flt2dec::Sign::*;
 
-    fn to_string<T, F>(f: &mut F, v: T, sign: Sign, frac_digits: usize, upper: bool) -> String
+    fn to_string<T, F>(f: &mut F, v: T, sign: Sign, frac_digits: usize) -> String
     where
         T: DecodableFloat,
         F: FnMut(&Decoded, &mut [u8], i16) -> (usize, i16),
     {
         to_string_with_parts(|buf, parts| {
-            to_exact_fixed_str(|d, b, l| f(d, b, l), v, sign, frac_digits, upper, buf, parts)
+            to_exact_fixed_str(|d, b, l| f(d, b, l), v, sign, frac_digits, buf, parts)
         })
     }
 
     let f = &mut f_;
 
-    assert_eq!(to_string(f, 0.0, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 0.0, MinusRaw, 0, false), "0");
-    assert_eq!(to_string(f, 0.0, MinusPlus, 0, false), "+0");
-    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 0, false), "+0");
-    assert_eq!(to_string(f, -0.0, Minus, 0, false), "0");
-    assert_eq!(to_string(f, -0.0, MinusRaw, 0, false), "-0");
-    assert_eq!(to_string(f, -0.0, MinusPlus, 0, false), "+0");
-    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 0, false), "-0");
-    assert_eq!(to_string(f, 0.0, Minus, 1, true), "0.0");
-    assert_eq!(to_string(f, 0.0, MinusRaw, 1, true), "0.0");
-    assert_eq!(to_string(f, 0.0, MinusPlus, 1, true), "+0.0");
-    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 1, true), "+0.0");
-    assert_eq!(to_string(f, -0.0, Minus, 8, true), "0.00000000");
-    assert_eq!(to_string(f, -0.0, MinusRaw, 8, true), "-0.00000000");
-    assert_eq!(to_string(f, -0.0, MinusPlus, 8, true), "+0.00000000");
-    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 8, true), "-0.00000000");
-
-    assert_eq!(to_string(f, 1.0 / 0.0, Minus, 0, false), "inf");
-    assert_eq!(to_string(f, 1.0 / 0.0, MinusRaw, 1, true), "inf");
-    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlus, 8, false), "+inf");
-    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlusRaw, 64, true), "+inf");
-    assert_eq!(to_string(f, 0.0 / 0.0, Minus, 0, false), "NaN");
-    assert_eq!(to_string(f, 0.0 / 0.0, MinusRaw, 1, true), "NaN");
-    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlus, 8, false), "NaN");
-    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlusRaw, 64, true), "NaN");
-    assert_eq!(to_string(f, -1.0 / 0.0, Minus, 0, false), "-inf");
-    assert_eq!(to_string(f, -1.0 / 0.0, MinusRaw, 1, true), "-inf");
-    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlus, 8, false), "-inf");
-    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlusRaw, 64, true), "-inf");
-
-    assert_eq!(to_string(f, 3.14, Minus, 0, false), "3");
-    assert_eq!(to_string(f, 3.14, MinusRaw, 0, false), "3");
-    assert_eq!(to_string(f, 3.14, MinusPlus, 0, false), "+3");
-    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 0, false), "+3");
-    assert_eq!(to_string(f, -3.14, Minus, 0, false), "-3");
-    assert_eq!(to_string(f, -3.14, MinusRaw, 0, false), "-3");
-    assert_eq!(to_string(f, -3.14, MinusPlus, 0, false), "-3");
-    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 0, false), "-3");
-    assert_eq!(to_string(f, 3.14, Minus, 1, true), "3.1");
-    assert_eq!(to_string(f, 3.14, MinusRaw, 2, true), "3.14");
-    assert_eq!(to_string(f, 3.14, MinusPlus, 3, true), "+3.140");
-    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 4, true), "+3.1400");
-    assert_eq!(to_string(f, -3.14, Minus, 8, true), "-3.14000000");
-    assert_eq!(to_string(f, -3.14, MinusRaw, 8, true), "-3.14000000");
-    assert_eq!(to_string(f, -3.14, MinusPlus, 8, true), "-3.14000000");
-    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 8, true), "-3.14000000");
-
-    assert_eq!(to_string(f, 0.195, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 0.195, MinusRaw, 0, false), "0");
-    assert_eq!(to_string(f, 0.195, MinusPlus, 0, false), "+0");
-    assert_eq!(to_string(f, 0.195, MinusPlusRaw, 0, false), "+0");
-    assert_eq!(to_string(f, -0.195, Minus, 0, false), "-0");
-    assert_eq!(to_string(f, -0.195, MinusRaw, 0, false), "-0");
-    assert_eq!(to_string(f, -0.195, MinusPlus, 0, false), "-0");
-    assert_eq!(to_string(f, -0.195, MinusPlusRaw, 0, false), "-0");
-    assert_eq!(to_string(f, 0.195, Minus, 1, true), "0.2");
-    assert_eq!(to_string(f, 0.195, MinusRaw, 2, true), "0.20");
-    assert_eq!(to_string(f, 0.195, MinusPlus, 3, true), "+0.195");
-    assert_eq!(to_string(f, 0.195, MinusPlusRaw, 4, true), "+0.1950");
-    assert_eq!(to_string(f, -0.195, Minus, 5, true), "-0.19500");
-    assert_eq!(to_string(f, -0.195, MinusRaw, 6, true), "-0.195000");
-    assert_eq!(to_string(f, -0.195, MinusPlus, 7, true), "-0.1950000");
-    assert_eq!(to_string(f, -0.195, MinusPlusRaw, 8, true), "-0.19500000");
-
-    assert_eq!(to_string(f, 999.5, Minus, 0, false), "1000");
-    assert_eq!(to_string(f, 999.5, Minus, 1, false), "999.5");
-    assert_eq!(to_string(f, 999.5, Minus, 2, false), "999.50");
-    assert_eq!(to_string(f, 999.5, Minus, 3, false), "999.500");
-    assert_eq!(to_string(f, 999.5, Minus, 30, false), "999.500000000000000000000000000000");
-
-    assert_eq!(to_string(f, 0.5, Minus, 0, false), "1");
-    assert_eq!(to_string(f, 0.5, Minus, 1, false), "0.5");
-    assert_eq!(to_string(f, 0.5, Minus, 2, false), "0.50");
-    assert_eq!(to_string(f, 0.5, Minus, 3, false), "0.500");
-
-    assert_eq!(to_string(f, 0.95, Minus, 0, false), "1");
-    assert_eq!(to_string(f, 0.95, Minus, 1, false), "0.9"); // because it really is less than 0.95
-    assert_eq!(to_string(f, 0.95, Minus, 2, false), "0.95");
-    assert_eq!(to_string(f, 0.95, Minus, 3, false), "0.950");
-    assert_eq!(to_string(f, 0.95, Minus, 10, false), "0.9500000000");
-    assert_eq!(to_string(f, 0.95, Minus, 30, false), "0.949999999999999955591079014994");
-
-    assert_eq!(to_string(f, 0.095, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 0.095, Minus, 1, false), "0.1");
-    assert_eq!(to_string(f, 0.095, Minus, 2, false), "0.10");
-    assert_eq!(to_string(f, 0.095, Minus, 3, false), "0.095");
-    assert_eq!(to_string(f, 0.095, Minus, 4, false), "0.0950");
-    assert_eq!(to_string(f, 0.095, Minus, 10, false), "0.0950000000");
-    assert_eq!(to_string(f, 0.095, Minus, 30, false), "0.095000000000000001110223024625");
-
-    assert_eq!(to_string(f, 0.0095, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 0.0095, Minus, 1, false), "0.0");
-    assert_eq!(to_string(f, 0.0095, Minus, 2, false), "0.01");
-    assert_eq!(to_string(f, 0.0095, Minus, 3, false), "0.009"); // really is less than 0.0095
-    assert_eq!(to_string(f, 0.0095, Minus, 4, false), "0.0095");
-    assert_eq!(to_string(f, 0.0095, Minus, 5, false), "0.00950");
-    assert_eq!(to_string(f, 0.0095, Minus, 10, false), "0.0095000000");
-    assert_eq!(to_string(f, 0.0095, Minus, 30, false), "0.009499999999999999764077607267");
-
-    assert_eq!(to_string(f, 7.5e-11, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 3, false), "0.000");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 10, false), "0.0000000001");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 11, false), "0.00000000007"); // ditto
-    assert_eq!(to_string(f, 7.5e-11, Minus, 12, false), "0.000000000075");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 13, false), "0.0000000000750");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 20, false), "0.00000000007500000000");
-    assert_eq!(to_string(f, 7.5e-11, Minus, 30, false), "0.000000000074999999999999999501");
-
-    assert_eq!(to_string(f, 1.0e25, Minus, 0, false), "10000000000000000905969664");
-    assert_eq!(to_string(f, 1.0e25, Minus, 1, false), "10000000000000000905969664.0");
-    assert_eq!(to_string(f, 1.0e25, Minus, 3, false), "10000000000000000905969664.000");
-
-    assert_eq!(to_string(f, 1.0e-6, Minus, 0, false), "0");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 3, false), "0.000");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 6, false), "0.000001");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 9, false), "0.000001000");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 12, false), "0.000001000000");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 22, false), "0.0000010000000000000000");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 23, false), "0.00000099999999999999995");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 24, false), "0.000000999999999999999955");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 25, false), "0.0000009999999999999999547");
-    assert_eq!(to_string(f, 1.0e-6, Minus, 35, false), "0.00000099999999999999995474811182589");
+    assert_eq!(to_string(f, 0.0, Minus, 0), "0");
+    assert_eq!(to_string(f, 0.0, MinusRaw, 0), "0");
+    assert_eq!(to_string(f, 0.0, MinusPlus, 0), "+0");
+    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 0), "+0");
+    assert_eq!(to_string(f, -0.0, Minus, 0), "0");
+    assert_eq!(to_string(f, -0.0, MinusRaw, 0), "-0");
+    assert_eq!(to_string(f, -0.0, MinusPlus, 0), "+0");
+    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 0), "-0");
+    assert_eq!(to_string(f, 0.0, Minus, 1), "0.0");
+    assert_eq!(to_string(f, 0.0, MinusRaw, 1), "0.0");
+    assert_eq!(to_string(f, 0.0, MinusPlus, 1), "+0.0");
+    assert_eq!(to_string(f, 0.0, MinusPlusRaw, 1), "+0.0");
+    assert_eq!(to_string(f, -0.0, Minus, 8), "0.00000000");
+    assert_eq!(to_string(f, -0.0, MinusRaw, 8), "-0.00000000");
+    assert_eq!(to_string(f, -0.0, MinusPlus, 8), "+0.00000000");
+    assert_eq!(to_string(f, -0.0, MinusPlusRaw, 8), "-0.00000000");
+
+    assert_eq!(to_string(f, 1.0 / 0.0, Minus, 0), "inf");
+    assert_eq!(to_string(f, 1.0 / 0.0, MinusRaw, 1), "inf");
+    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlus, 8), "+inf");
+    assert_eq!(to_string(f, 1.0 / 0.0, MinusPlusRaw, 64), "+inf");
+    assert_eq!(to_string(f, 0.0 / 0.0, Minus, 0), "NaN");
+    assert_eq!(to_string(f, 0.0 / 0.0, MinusRaw, 1), "NaN");
+    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlus, 8), "NaN");
+    assert_eq!(to_string(f, 0.0 / 0.0, MinusPlusRaw, 64), "NaN");
+    assert_eq!(to_string(f, -1.0 / 0.0, Minus, 0), "-inf");
+    assert_eq!(to_string(f, -1.0 / 0.0, MinusRaw, 1), "-inf");
+    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlus, 8), "-inf");
+    assert_eq!(to_string(f, -1.0 / 0.0, MinusPlusRaw, 64), "-inf");
+
+    assert_eq!(to_string(f, 3.14, Minus, 0), "3");
+    assert_eq!(to_string(f, 3.14, MinusRaw, 0), "3");
+    assert_eq!(to_string(f, 3.14, MinusPlus, 0), "+3");
+    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 0), "+3");
+    assert_eq!(to_string(f, -3.14, Minus, 0), "-3");
+    assert_eq!(to_string(f, -3.14, MinusRaw, 0), "-3");
+    assert_eq!(to_string(f, -3.14, MinusPlus, 0), "-3");
+    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 0), "-3");
+    assert_eq!(to_string(f, 3.14, Minus, 1), "3.1");
+    assert_eq!(to_string(f, 3.14, MinusRaw, 2), "3.14");
+    assert_eq!(to_string(f, 3.14, MinusPlus, 3), "+3.140");
+    assert_eq!(to_string(f, 3.14, MinusPlusRaw, 4), "+3.1400");
+    assert_eq!(to_string(f, -3.14, Minus, 8), "-3.14000000");
+    assert_eq!(to_string(f, -3.14, MinusRaw, 8), "-3.14000000");
+    assert_eq!(to_string(f, -3.14, MinusPlus, 8), "-3.14000000");
+    assert_eq!(to_string(f, -3.14, MinusPlusRaw, 8), "-3.14000000");
+
+    assert_eq!(to_string(f, 0.195, Minus, 0), "0");
+    assert_eq!(to_string(f, 0.195, MinusRaw, 0), "0");
+    assert_eq!(to_string(f, 0.195, MinusPlus, 0), "+0");
+    assert_eq!(to_string(f, 0.195, MinusPlusRaw, 0), "+0");
+    assert_eq!(to_string(f, -0.195, Minus, 0), "-0");
+    assert_eq!(to_string(f, -0.195, MinusRaw, 0), "-0");
+    assert_eq!(to_string(f, -0.195, MinusPlus, 0), "-0");
+    assert_eq!(to_string(f, -0.195, MinusPlusRaw, 0), "-0");
+    assert_eq!(to_string(f, 0.195, Minus, 1), "0.2");
+    assert_eq!(to_string(f, 0.195, MinusRaw, 2), "0.20");
+    assert_eq!(to_string(f, 0.195, MinusPlus, 3), "+0.195");
+    assert_eq!(to_string(f, 0.195, MinusPlusRaw, 4), "+0.1950");
+    assert_eq!(to_string(f, -0.195, Minus, 5), "-0.19500");
+    assert_eq!(to_string(f, -0.195, MinusRaw, 6), "-0.195000");
+    assert_eq!(to_string(f, -0.195, MinusPlus, 7), "-0.1950000");
+    assert_eq!(to_string(f, -0.195, MinusPlusRaw, 8), "-0.19500000");
+
+    assert_eq!(to_string(f, 999.5, Minus, 0), "1000");
+    assert_eq!(to_string(f, 999.5, Minus, 1), "999.5");
+    assert_eq!(to_string(f, 999.5, Minus, 2), "999.50");
+    assert_eq!(to_string(f, 999.5, Minus, 3), "999.500");
+    assert_eq!(to_string(f, 999.5, Minus, 30), "999.500000000000000000000000000000");
+
+    assert_eq!(to_string(f, 0.5, Minus, 0), "1");
+    assert_eq!(to_string(f, 0.5, Minus, 1), "0.5");
+    assert_eq!(to_string(f, 0.5, Minus, 2), "0.50");
+    assert_eq!(to_string(f, 0.5, Minus, 3), "0.500");
+
+    assert_eq!(to_string(f, 0.95, Minus, 0), "1");
+    assert_eq!(to_string(f, 0.95, Minus, 1), "0.9"); // because it really is less than 0.95
+    assert_eq!(to_string(f, 0.95, Minus, 2), "0.95");
+    assert_eq!(to_string(f, 0.95, Minus, 3), "0.950");
+    assert_eq!(to_string(f, 0.95, Minus, 10), "0.9500000000");
+    assert_eq!(to_string(f, 0.95, Minus, 30), "0.949999999999999955591079014994");
+
+    assert_eq!(to_string(f, 0.095, Minus, 0), "0");
+    assert_eq!(to_string(f, 0.095, Minus, 1), "0.1");
+    assert_eq!(to_string(f, 0.095, Minus, 2), "0.10");
+    assert_eq!(to_string(f, 0.095, Minus, 3), "0.095");
+    assert_eq!(to_string(f, 0.095, Minus, 4), "0.0950");
+    assert_eq!(to_string(f, 0.095, Minus, 10), "0.0950000000");
+    assert_eq!(to_string(f, 0.095, Minus, 30), "0.095000000000000001110223024625");
+
+    assert_eq!(to_string(f, 0.0095, Minus, 0), "0");
+    assert_eq!(to_string(f, 0.0095, Minus, 1), "0.0");
+    assert_eq!(to_string(f, 0.0095, Minus, 2), "0.01");
+    assert_eq!(to_string(f, 0.0095, Minus, 3), "0.009"); // really is less than 0.0095
+    assert_eq!(to_string(f, 0.0095, Minus, 4), "0.0095");
+    assert_eq!(to_string(f, 0.0095, Minus, 5), "0.00950");
+    assert_eq!(to_string(f, 0.0095, Minus, 10), "0.0095000000");
+    assert_eq!(to_string(f, 0.0095, Minus, 30), "0.009499999999999999764077607267");
+
+    assert_eq!(to_string(f, 7.5e-11, Minus, 0), "0");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 3), "0.000");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 10), "0.0000000001");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 11), "0.00000000007"); // ditto
+    assert_eq!(to_string(f, 7.5e-11, Minus, 12), "0.000000000075");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 13), "0.0000000000750");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 20), "0.00000000007500000000");
+    assert_eq!(to_string(f, 7.5e-11, Minus, 30), "0.000000000074999999999999999501");
+
+    assert_eq!(to_string(f, 1.0e25, Minus, 0), "10000000000000000905969664");
+    assert_eq!(to_string(f, 1.0e25, Minus, 1), "10000000000000000905969664.0");
+    assert_eq!(to_string(f, 1.0e25, Minus, 3), "10000000000000000905969664.000");
+
+    assert_eq!(to_string(f, 1.0e-6, Minus, 0), "0");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 3), "0.000");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 6), "0.000001");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 9), "0.000001000");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 12), "0.000001000000");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 22), "0.0000010000000000000000");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 23), "0.00000099999999999999995");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 24), "0.000000999999999999999955");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 25), "0.0000009999999999999999547");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 35), "0.00000099999999999999995474811182589");
+    assert_eq!(to_string(f, 1.0e-6, Minus, 45), "0.000000999999999999999954748111825886258685614");
     assert_eq!(
-        to_string(f, 1.0e-6, Minus, 45, false),
-        "0.000000999999999999999954748111825886258685614"
-    );
-    assert_eq!(
-        to_string(f, 1.0e-6, Minus, 55, false),
+        to_string(f, 1.0e-6, Minus, 55),
         "0.0000009999999999999999547481118258862586856139387236908"
     );
     assert_eq!(
-        to_string(f, 1.0e-6, Minus, 65, false),
+        to_string(f, 1.0e-6, Minus, 65),
         "0.00000099999999999999995474811182588625868561393872369080781936646"
     );
     assert_eq!(
-        to_string(f, 1.0e-6, Minus, 75, false),
+        to_string(f, 1.0e-6, Minus, 75),
         "0.000000999999999999999954748111825886258685613938723690807819366455078125000"
     );
 
-    assert_eq!(to_string(f, f32::MAX, Minus, 0, false), "340282346638528859811704183484516925440");
-    assert_eq!(
-        to_string(f, f32::MAX, Minus, 1, false),
-        "340282346638528859811704183484516925440.0"
-    );
-    assert_eq!(
-        to_string(f, f32::MAX, Minus, 2, false),
-        "340282346638528859811704183484516925440.00"
-    );
+    assert_eq!(to_string(f, f32::MAX, Minus, 0), "340282346638528859811704183484516925440");
+    assert_eq!(to_string(f, f32::MAX, Minus, 1), "340282346638528859811704183484516925440.0");
+    assert_eq!(to_string(f, f32::MAX, Minus, 2), "340282346638528859811704183484516925440.00");
 
     if cfg!(miri) {
         // Miri is too slow
@@ -1163,24 +1151,24 @@ where
     }
 
     let minf32 = ldexp_f32(1.0, -149);
-    assert_eq!(to_string(f, minf32, Minus, 0, false), "0");
-    assert_eq!(to_string(f, minf32, Minus, 1, false), "0.0");
-    assert_eq!(to_string(f, minf32, Minus, 2, false), "0.00");
-    assert_eq!(to_string(f, minf32, Minus, 4, false), "0.0000");
-    assert_eq!(to_string(f, minf32, Minus, 8, false), "0.00000000");
-    assert_eq!(to_string(f, minf32, Minus, 16, false), "0.0000000000000000");
-    assert_eq!(to_string(f, minf32, Minus, 32, false), "0.00000000000000000000000000000000");
+    assert_eq!(to_string(f, minf32, Minus, 0), "0");
+    assert_eq!(to_string(f, minf32, Minus, 1), "0.0");
+    assert_eq!(to_string(f, minf32, Minus, 2), "0.00");
+    assert_eq!(to_string(f, minf32, Minus, 4), "0.0000");
+    assert_eq!(to_string(f, minf32, Minus, 8), "0.00000000");
+    assert_eq!(to_string(f, minf32, Minus, 16), "0.0000000000000000");
+    assert_eq!(to_string(f, minf32, Minus, 32), "0.00000000000000000000000000000000");
     assert_eq!(
-        to_string(f, minf32, Minus, 64, false),
+        to_string(f, minf32, Minus, 64),
         "0.0000000000000000000000000000000000000000000014012984643248170709"
     );
     assert_eq!(
-        to_string(f, minf32, Minus, 128, false),
+        to_string(f, minf32, Minus, 128),
         "0.0000000000000000000000000000000000000000000014012984643248170709\
                   2372958328991613128026194187651577175706828388979108268586060149"
     );
     assert_eq!(
-        to_string(f, minf32, Minus, 256, false),
+        to_string(f, minf32, Minus, 256),
         "0.0000000000000000000000000000000000000000000014012984643248170709\
                   2372958328991613128026194187651577175706828388979108268586060148\
                   6638188362121582031250000000000000000000000000000000000000000000\
@@ -1188,7 +1176,7 @@ where
     );
 
     assert_eq!(
-        to_string(f, f64::MAX, Minus, 0, false),
+        to_string(f, f64::MAX, Minus, 0),
         "1797693134862315708145274237317043567980705675258449965989174768\
                 0315726078002853876058955863276687817154045895351438246423432132\
                 6889464182768467546703537516986049910576551282076245490090389328\
@@ -1196,7 +1184,7 @@ where
                 26204144723168738177180919299881250404026184124858368"
     );
     assert_eq!(
-        to_string(f, f64::MAX, Minus, 10, false),
+        to_string(f, f64::MAX, Minus, 10),
         "1797693134862315708145274237317043567980705675258449965989174768\
                 0315726078002853876058955863276687817154045895351438246423432132\
                 6889464182768467546703537516986049910576551282076245490090389328\
@@ -1205,16 +1193,16 @@ where
     );
 
     let minf64 = ldexp_f64(1.0, -1074);
-    assert_eq!(to_string(f, minf64, Minus, 0, false), "0");
-    assert_eq!(to_string(f, minf64, Minus, 1, false), "0.0");
-    assert_eq!(to_string(f, minf64, Minus, 10, false), "0.0000000000");
+    assert_eq!(to_string(f, minf64, Minus, 0), "0");
+    assert_eq!(to_string(f, minf64, Minus, 1), "0.0");
+    assert_eq!(to_string(f, minf64, Minus, 10), "0.0000000000");
     assert_eq!(
-        to_string(f, minf64, Minus, 100, false),
+        to_string(f, minf64, Minus, 100),
         "0.0000000000000000000000000000000000000000000000000000000000000000\
                   000000000000000000000000000000000000"
     );
     assert_eq!(
-        to_string(f, minf64, Minus, 1000, false),
+        to_string(f, minf64, Minus, 1000),
         "0.0000000000000000000000000000000000000000000000000000000000000000\
                   0000000000000000000000000000000000000000000000000000000000000000\
                   0000000000000000000000000000000000000000000000000000000000000000\
@@ -1234,15 +1222,15 @@ where
     );
 
     // very large output
-    assert_eq!(to_string(f, 0.0, Minus, 80000, false), format!("0.{:0>80000}", ""));
-    assert_eq!(to_string(f, 1.0e1, Minus, 80000, false), format!("10.{:0>80000}", ""));
-    assert_eq!(to_string(f, 1.0e0, Minus, 80000, false), format!("1.{:0>80000}", ""));
+    assert_eq!(to_string(f, 0.0, Minus, 80000), format!("0.{:0>80000}", ""));
+    assert_eq!(to_string(f, 1.0e1, Minus, 80000), format!("10.{:0>80000}", ""));
+    assert_eq!(to_string(f, 1.0e0, Minus, 80000), format!("1.{:0>80000}", ""));
     assert_eq!(
-        to_string(f, 1.0e-1, Minus, 80000, false),
+        to_string(f, 1.0e-1, Minus, 80000),
         format!("0.1000000000000000055511151231257827021181583404541015625{:0>79945}", "")
     );
     assert_eq!(
-        to_string(f, 1.0e-20, Minus, 80000, false),
+        to_string(f, 1.0e-20, Minus, 80000),
         format!(
             "0.0000000000000000000099999999999999994515327145420957165172950370\
                           2787392447107715776066783064379706047475337982177734375{:0>79881}",
diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs
index cc274b4aec..dbab433e33 100644
--- a/src/libcore/tests/slice.rs
+++ b/src/libcore/tests/slice.rs
@@ -1570,6 +1570,18 @@ fn test_align_to_empty_mid() {
     }
 }
 
+#[test]
+fn test_align_to_mut_aliasing() {
+    let mut val = [1u8, 2, 3, 4, 5];
+    // `align_to_mut` used to create `mid` in a way that there was some intermediate
+    // incorrect aliasing, invalidating the resulting `mid` slice.
+    let (begin, mid, end) = unsafe { val.align_to_mut::<[u8; 2]>() };
+    assert!(begin.len() == 0);
+    assert!(end.len() == 1);
+    mid[0] = mid[1];
+    assert_eq!(val, [3, 4, 3, 4, 5])
+}
+
 #[test]
 fn test_slice_partition_dedup_by() {
     let mut slice: [i32; 9] = [1, -1, 2, 3, 1, -5, 5, -2, 2];
diff --git a/src/libcore/tests/time.rs b/src/libcore/tests/time.rs
index 273f1258bb..c1fbdf7df7 100644
--- a/src/libcore/tests/time.rs
+++ b/src/libcore/tests/time.rs
@@ -11,6 +11,12 @@ fn creation() {
     assert_eq!(Duration::from_millis(4000), Duration::new(4, 0));
 }
 
+#[test]
+#[should_panic]
+fn new_overflow() {
+    let _ = Duration::new(::core::u64::MAX, 1_000_000_000);
+}
+
 #[test]
 fn secs() {
     assert_eq!(Duration::new(0, 0).as_secs(), 0);
diff --git a/src/libfmt_macros/lib.rs b/src/libfmt_macros/lib.rs
index 9ca7eee999..e138503b50 100644
--- a/src/libfmt_macros/lib.rs
+++ b/src/libfmt_macros/lib.rs
@@ -176,7 +176,7 @@ pub struct Parser<'a> {
     skips: Vec<usize>,
     /// Span of the last opening brace seen, used for error reporting
     last_opening_brace: Option<InnerSpan>,
-    /// Wether the source string is comes from `println!` as opposed to `format!` or `print!`
+    /// Whether the source string is comes from `println!` as opposed to `format!` or `print!`
     append_newline: bool,
 }
 
diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs
index d04f5c1d4e..a53e0012ca 100644
--- a/src/libgraphviz/lib.rs
+++ b/src/libgraphviz/lib.rs
@@ -597,6 +597,8 @@ pub enum RenderOption {
     NoNodeLabels,
     NoEdgeStyles,
     NoNodeStyles,
+
+    Monospace,
 }
 
 /// Returns vec holding all the default render options.
@@ -626,6 +628,14 @@ where
     W: Write,
 {
     writeln!(w, "digraph {} {{", g.graph_id().as_slice())?;
+
+    // Global graph properties
+    if options.contains(&RenderOption::Monospace) {
+        writeln!(w, r#"    graph[fontname="monospace"];"#)?;
+        writeln!(w, r#"    node[fontname="monospace"];"#)?;
+        writeln!(w, r#"    edge[fontname="monospace"];"#)?;
+    }
+
     for n in g.nodes().iter() {
         write!(w, "    ")?;
         let id = g.node_id(n);
diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs
index d9dca2c0f4..6f507e85e7 100644
--- a/src/libpanic_unwind/seh.rs
+++ b/src/libpanic_unwind/seh.rs
@@ -282,12 +282,7 @@ pub unsafe fn panic(data: Box<dyn Any + Send>) -> u32 {
     //
     // In any case, we basically need to do something like this until we can
     // express more operations in statics (and we may never be able to).
-    if !cfg!(bootstrap) {
-        atomic_store(
-            &mut THROW_INFO.pmfnUnwind as *mut _ as *mut u32,
-            ptr!(exception_cleanup) as u32,
-        );
-    }
+    atomic_store(&mut THROW_INFO.pmfnUnwind as *mut _ as *mut u32, ptr!(exception_cleanup) as u32);
     atomic_store(
         &mut THROW_INFO.pCatchableTypeArray as *mut _ as *mut u32,
         ptr!(&CATCHABLE_TYPE_ARRAY as *const _) as u32,
@@ -300,12 +295,10 @@ pub unsafe fn panic(data: Box<dyn Any + Send>) -> u32 {
         &mut CATCHABLE_TYPE.pType as *mut _ as *mut u32,
         ptr!(&TYPE_DESCRIPTOR as *const _) as u32,
     );
-    if !cfg!(bootstrap) {
-        atomic_store(
-            &mut CATCHABLE_TYPE.copyFunction as *mut _ as *mut u32,
-            ptr!(exception_copy) as u32,
-        );
-    }
+    atomic_store(
+        &mut CATCHABLE_TYPE.copyFunction as *mut _ as *mut u32,
+        ptr!(exception_copy) as u32,
+    );
 
     extern "system" {
         #[unwind(allowed)]
diff --git a/src/libproc_macro/bridge/client.rs b/src/libproc_macro/bridge/client.rs
index dd948025c9..088db92253 100644
--- a/src/libproc_macro/bridge/client.rs
+++ b/src/libproc_macro/bridge/client.rs
@@ -15,7 +15,7 @@ macro_rules! define_handles {
         }
 
         impl HandleCounters {
-            // FIXME(eddyb) use a reference to the `static COUNTERS`, intead of
+            // FIXME(eddyb) use a reference to the `static COUNTERS`, instead of
             // a wrapper `fn` pointer, once `const fn` can reference `static`s.
             extern "C" fn get() -> &'static Self {
                 static COUNTERS: HandleCounters = HandleCounters {
@@ -334,7 +334,7 @@ impl Bridge<'_> {
 #[repr(C)]
 #[derive(Copy, Clone)]
 pub struct Client<F> {
-    // FIXME(eddyb) use a reference to the `static COUNTERS`, intead of
+    // FIXME(eddyb) use a reference to the `static COUNTERS`, instead of
     // a wrapper `fn` pointer, once `const fn` can reference `static`s.
     pub(super) get_handle_counters: extern "C" fn() -> &'static HandleCounters,
     pub(super) run: extern "C" fn(Bridge<'_>, F) -> Buffer<u8>,
diff --git a/src/libproc_macro/diagnostic.rs b/src/libproc_macro/diagnostic.rs
index fdf252e533..7495468a05 100644
--- a/src/libproc_macro/diagnostic.rs
+++ b/src/libproc_macro/diagnostic.rs
@@ -55,13 +55,15 @@ pub struct Diagnostic {
 }
 
 macro_rules! diagnostic_child_methods {
-    ($spanned:ident, $regular:ident, $level:expr) => (
+    ($spanned:ident, $regular:ident, $level:expr) => {
         /// Adds a new child diagnostic message to `self` with the level
         /// identified by this method's name with the given `spans` and
         /// `message`.
         #[unstable(feature = "proc_macro_diagnostic", issue = "54140")]
         pub fn $spanned<S, T>(mut self, spans: S, message: T) -> Diagnostic
-            where S: MultiSpan, T: Into<String>
+        where
+            S: MultiSpan,
+            T: Into<String>,
         {
             self.children.push(Diagnostic::spanned(spans, $level, message));
             self
@@ -74,7 +76,7 @@ macro_rules! diagnostic_child_methods {
             self.children.push(Diagnostic::new($level, message));
             self
         }
-    )
+    };
 }
 
 /// Iterator over the children diagnostics of a `Diagnostic`.
@@ -96,7 +98,7 @@ impl Diagnostic {
     /// Creates a new diagnostic with the given `level` and `message`.
     #[unstable(feature = "proc_macro_diagnostic", issue = "54140")]
     pub fn new<T: Into<String>>(level: Level, message: T) -> Diagnostic {
-        Diagnostic { level: level, message: message.into(), spans: vec![], children: vec![] }
+        Diagnostic { level, message: message.into(), spans: vec![], children: vec![] }
     }
 
     /// Creates a new diagnostic with the given `level` and `message` pointing to
@@ -107,12 +109,7 @@ impl Diagnostic {
         S: MultiSpan,
         T: Into<String>,
     {
-        Diagnostic {
-            level: level,
-            message: message.into(),
-            spans: spans.into_spans(),
-            children: vec![],
-        }
+        Diagnostic { level, message: message.into(), spans: spans.into_spans(), children: vec![] }
     }
 
     diagnostic_child_methods!(span_error, error, Level::Error);
diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml
index b65635be54..481d691b8e 100644
--- a/src/librustc/Cargo.toml
+++ b/src/librustc/Cargo.toml
@@ -12,15 +12,14 @@ doctest = false
 [dependencies]
 arena = { path = "../libarena" }
 bitflags = "1.2.1"
-fmt_macros = { path = "../libfmt_macros" }
-graphviz = { path = "../libgraphviz" }
 jobserver = "0.1"
 scoped-tls = "1.0"
 log = { version = "0.4", features = ["release_max_level_info", "std"] }
 rustc-rayon = "0.3.0"
 rustc-rayon-core = "0.3.0"
-polonius-engine = "0.11.0"
+polonius-engine = "0.12.0"
 rustc_apfloat = { path = "../librustc_apfloat" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_feature = { path = "../librustc_feature" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_target = { path = "../librustc_target" }
@@ -29,12 +28,11 @@ 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 backtrace = "0.3.40"
 parking_lot = "0.9"
 byteorder = { version = "1.3" }
-chalk-engine = { version = "0.9.0", default-features=false }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 measureme = "0.7.1"
 rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc/arena.rs b/src/librustc/arena.rs
index 15e92d8d84..0384a9f781 100644
--- a/src/librustc/arena.rs
+++ b/src/librustc/arena.rs
@@ -35,7 +35,8 @@ macro_rules! arena_types {
                 rustc::mir::Promoted,
                 rustc::mir::BodyAndCache<$tcx>
             >,
-            [] tables: rustc::ty::TypeckTables<$tcx>,
+            [decode] tables: rustc::ty::TypeckTables<$tcx>,
+            [decode] borrowck_result: rustc::mir::BorrowCheckResult<$tcx>,
             [] const_allocs: rustc::mir::interpret::Allocation,
             [] vtable_method: Option<(
                 rustc_hir::def_id::DefId,
@@ -47,22 +48,23 @@ macro_rules! arena_types {
             [] item_local_set: rustc_hir::ItemLocalSet,
             [decode] mir_const_qualif: rustc_index::bit_set::BitSet<rustc::mir::Local>,
             [] trait_impls_of: rustc::ty::trait_def::TraitImpls,
+            [] associated_items: rustc::ty::AssociatedItems,
             [] dropck_outlives:
                 rustc::infer::canonical::Canonical<'tcx,
                     rustc::infer::canonical::QueryResponse<'tcx,
-                        rustc::traits::query::dropck_outlives::DropckOutlivesResult<'tcx>
+                        rustc::traits::query::DropckOutlivesResult<'tcx>
                     >
                 >,
             [] normalize_projection_ty:
                 rustc::infer::canonical::Canonical<'tcx,
                     rustc::infer::canonical::QueryResponse<'tcx,
-                        rustc::traits::query::normalize::NormalizationResult<'tcx>
+                        rustc::traits::query::NormalizationResult<'tcx>
                     >
                 >,
             [] implied_outlives_bounds:
                 rustc::infer::canonical::Canonical<'tcx,
                     rustc::infer::canonical::QueryResponse<'tcx,
-                        Vec<rustc::traits::query::outlives_bounds::OutlivesBound<'tcx>>
+                        Vec<rustc::traits::query::OutlivesBound<'tcx>>
                     >
                 >,
             [] type_op_subtype:
@@ -127,9 +129,9 @@ macro_rules! arena_types {
             [] tys: rustc::ty::TyS<$tcx>,
 
             // HIR types
-            [few] hir_forest: rustc::hir::map::Forest<$tcx>,
+            [few] hir_krate: rustc_hir::Crate<$tcx>,
             [] arm: rustc_hir::Arm<$tcx>,
-            [] attribute: syntax::ast::Attribute,
+            [] attribute: rustc_ast::ast::Attribute,
             [] block: rustc_hir::Block<$tcx>,
             [] bare_fn_ty: rustc_hir::BareFnTy<$tcx>,
             [few] global_asm: rustc_hir::GlobalAsm,
@@ -216,6 +218,7 @@ arena_types!(declare_arena, [], 'tcx);
 
 arena_types!(impl_arena_allocatable, [], 'tcx);
 
+#[marker]
 pub trait ArenaAllocatable {}
 
 impl<T: Copy> ArenaAllocatable for T {}
@@ -247,7 +250,7 @@ impl<'tcx> Arena<'tcx> {
 
     #[inline]
     pub fn alloc_slice<T: Copy>(&self, value: &[T]) -> &mut [T] {
-        if value.len() == 0 {
+        if value.is_empty() {
             return &mut [];
         }
         self.dropless.alloc_slice(value)
diff --git a/src/librustc/benches/lib.rs b/src/librustc/benches/lib.rs
index de82b262e4..237751bcbd 100644
--- a/src/librustc/benches/lib.rs
+++ b/src/librustc/benches/lib.rs
@@ -1,4 +1,3 @@
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(test)]
 
 extern crate test;
diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs
index 9df8e28254..156f412e09 100644
--- a/src/librustc/dep_graph/dep_node.rs
+++ b/src/librustc/dep_graph/dep_node.rs
@@ -35,7 +35,7 @@
 //! "infer" some properties for each kind of `DepNode`:
 //!
 //! * Whether a `DepNode` of a given kind has any parameters at all. Some
-//!   `DepNode`s, like `Krate`, represent global concepts with only one value.
+//!   `DepNode`s, like `AllLocalTraitImpls`, represent global concepts with only one value.
 //! * Whether it is possible, in principle, to reconstruct a query key from a
 //!   given `DepNode`. Many `DepKind`s only require a single `DefId` parameter,
 //!   in which case it is possible to map the node's fingerprint back to the
@@ -76,10 +76,6 @@ macro_rules! erase {
     ($x:tt) => {{}};
 }
 
-macro_rules! replace {
-    ($x:tt with $($y:tt)*) => ($($y)*)
-}
-
 macro_rules! is_anon_attr {
     (anon) => {
         true
@@ -99,19 +95,18 @@ macro_rules! is_eval_always_attr {
 }
 
 macro_rules! contains_anon_attr {
-    ($($attr:ident),*) => ({$(is_anon_attr!($attr) | )* false});
+    ($($attr:ident $(($($attr_args:tt)*))* ),*) => ({$(is_anon_attr!($attr) | )* false});
 }
 
 macro_rules! contains_eval_always_attr {
-    ($($attr:ident),*) => ({$(is_eval_always_attr!($attr) | )* false});
+    ($($attr:ident $(($($attr_args:tt)*))* ),*) => ({$(is_eval_always_attr!($attr) | )* false});
 }
 
 macro_rules! define_dep_nodes {
     (<$tcx:tt>
     $(
-        [$($attr:ident),* ]
+        [$($attrs:tt)*]
         $variant:ident $(( $tuple_arg_ty:ty $(,)? ))*
-                       $({ $($struct_arg_name:ident : $struct_arg_ty:ty),* })*
       ,)*
     ) => (
         #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
@@ -126,7 +121,7 @@ macro_rules! define_dep_nodes {
                 match *self {
                     $(
                         DepKind :: $variant => {
-                            if contains_anon_attr!($($attr),*) {
+                            if contains_anon_attr!($($attrs)*) {
                                 return false;
                             }
 
@@ -136,13 +131,6 @@ macro_rules! define_dep_nodes {
                                     ::CAN_RECONSTRUCT_QUERY_KEY;
                             })*
 
-                            // struct args
-                            $({
-
-                                return <( $($struct_arg_ty,)* ) as DepNodeParams>
-                                    ::CAN_RECONSTRUCT_QUERY_KEY;
-                            })*
-
                             true
                         }
                     )*
@@ -152,7 +140,7 @@ macro_rules! define_dep_nodes {
             pub fn is_anon(&self) -> bool {
                 match *self {
                     $(
-                        DepKind :: $variant => { contains_anon_attr!($($attr),*) }
+                        DepKind :: $variant => { contains_anon_attr!($($attrs)*) }
                     )*
                 }
             }
@@ -160,7 +148,7 @@ macro_rules! define_dep_nodes {
             pub fn is_eval_always(&self) -> bool {
                 match *self {
                     $(
-                        DepKind :: $variant => { contains_eval_always_attr!($($attr), *) }
+                        DepKind :: $variant => { contains_eval_always_attr!($($attrs)*) }
                     )*
                 }
             }
@@ -176,12 +164,6 @@ macro_rules! define_dep_nodes {
                                 return true;
                             })*
 
-                            // struct args
-                            $({
-                                $(erase!($struct_arg_name);)*
-                                return true;
-                            })*
-
                             false
                         }
                     )*
@@ -189,11 +171,43 @@ macro_rules! define_dep_nodes {
             }
         }
 
-        pub enum DepConstructor<$tcx> {
+        pub struct DepConstructor;
+
+        impl DepConstructor {
             $(
-                $variant $(( $tuple_arg_ty ))*
-                         $({ $($struct_arg_name : $struct_arg_ty),* })*
-            ),*
+                #[inline(always)]
+                #[allow(unreachable_code, non_snake_case)]
+                pub fn $variant<'tcx>(_tcx: TyCtxt<'tcx>, $(arg: $tuple_arg_ty)*) -> DepNode {
+                    // tuple args
+                    $({
+                        erase!($tuple_arg_ty);
+                        let hash = DepNodeParams::to_fingerprint(&arg, _tcx);
+                        let dep_node = DepNode {
+                            kind: DepKind::$variant,
+                            hash
+                        };
+
+                        #[cfg(debug_assertions)]
+                        {
+                            if !dep_node.kind.can_reconstruct_query_key() &&
+                            (_tcx.sess.opts.debugging_opts.incremental_info ||
+                                _tcx.sess.opts.debugging_opts.query_dep_graph)
+                            {
+                                _tcx.dep_graph.register_dep_node_debug_str(dep_node, || {
+                                    arg.to_debug_str(_tcx)
+                                });
+                            }
+                        }
+
+                        return dep_node;
+                    })*
+
+                    DepNode {
+                        kind: DepKind::$variant,
+                        hash: Fingerprint::ZERO,
+                    }
+                }
+            )*
         }
 
         #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash,
@@ -204,75 +218,6 @@ macro_rules! define_dep_nodes {
         }
 
         impl DepNode {
-            #[allow(unreachable_code, non_snake_case)]
-            pub fn new<'tcx>(tcx: TyCtxt<'tcx>,
-                                       dep: DepConstructor<'tcx>)
-                                       -> DepNode
-            {
-                match dep {
-                    $(
-                        DepConstructor :: $variant $(( replace!(($tuple_arg_ty) with arg) ))*
-                                                   $({ $($struct_arg_name),* })*
-                            =>
-                        {
-                            // tuple args
-                            $({
-                                erase!($tuple_arg_ty);
-                                let hash = DepNodeParams::to_fingerprint(&arg, tcx);
-                                let dep_node = DepNode {
-                                    kind: DepKind::$variant,
-                                    hash
-                                };
-
-                                #[cfg(debug_assertions)]
-                                {
-                                    if !dep_node.kind.can_reconstruct_query_key() &&
-                                    (tcx.sess.opts.debugging_opts.incremental_info ||
-                                        tcx.sess.opts.debugging_opts.query_dep_graph)
-                                    {
-                                        tcx.dep_graph.register_dep_node_debug_str(dep_node, || {
-                                            arg.to_debug_str(tcx)
-                                        });
-                                    }
-                                }
-
-                                return dep_node;
-                            })*
-
-                            // struct args
-                            $({
-                                let tupled_args = ( $($struct_arg_name,)* );
-                                let hash = DepNodeParams::to_fingerprint(&tupled_args,
-                                                                         tcx);
-                                let dep_node = DepNode {
-                                    kind: DepKind::$variant,
-                                    hash
-                                };
-
-                                #[cfg(debug_assertions)]
-                                {
-                                    if !dep_node.kind.can_reconstruct_query_key() &&
-                                    (tcx.sess.opts.debugging_opts.incremental_info ||
-                                        tcx.sess.opts.debugging_opts.query_dep_graph)
-                                    {
-                                        tcx.dep_graph.register_dep_node_debug_str(dep_node, || {
-                                            tupled_args.to_debug_str(tcx)
-                                        });
-                                    }
-                                }
-
-                                return dep_node;
-                            })*
-
-                            DepNode {
-                                kind: DepKind::$variant,
-                                hash: Fingerprint::ZERO,
-                            }
-                        }
-                    )*
-                }
-            }
-
             /// Construct a DepNode from the given DepKind and DefPathHash. This
             /// method will assert that the given DepKind actually requires a
             /// single DefId/DefPathHash parameter.
@@ -400,19 +345,6 @@ rustc_dep_node_append!([define_dep_nodes!][ <'tcx>
     // We use this for most things when incr. comp. is turned off.
     [] Null,
 
-    // Represents the `Krate` as a whole (the `hir::Krate` value) (as
-    // distinct from the krate module). This is basically a hash of
-    // the entire krate, so if you read from `Krate` (e.g., by calling
-    // `tcx.hir().krate()`), we will have to assume that any change
-    // means that you need to be recompiled. This is because the
-    // `Krate` value gives you access to all other items. To avoid
-    // this fate, do not call `tcx.hir().krate()`; instead, prefer
-    // wrappers like `tcx.visit_all_items_in_krate()`.  If there is no
-    // suitable wrapper, you can use `tcx.dep_graph.ignore()` to gain
-    // access to the krate, but you must remember to add suitable
-    // edges yourself for the individual items that you read.
-    [eval_always] Krate,
-
     // Represents the body of a function or method. The def-id is that of the
     // function/method.
     [eval_always] HirBody(DefId),
@@ -428,33 +360,9 @@ rustc_dep_node_append!([define_dep_nodes!][ <'tcx>
     [anon] TraitSelect,
 
     [] CompileCodegenUnit(Symbol),
-
-    [eval_always] Analysis(CrateNum),
 ]);
 
-pub trait RecoverKey<'tcx>: Sized {
-    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self>;
-}
-
-impl RecoverKey<'tcx> for CrateNum {
-    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
-        dep_node.extract_def_id(tcx).map(|id| id.krate)
-    }
-}
-
-impl RecoverKey<'tcx> for DefId {
-    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
-        dep_node.extract_def_id(tcx)
-    }
-}
-
-impl RecoverKey<'tcx> for DefIndex {
-    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
-        dep_node.extract_def_id(tcx).map(|id| id.index)
-    }
-}
-
-trait DepNodeParams<'tcx>: fmt::Debug {
+pub(crate) trait DepNodeParams<'tcx>: fmt::Debug + Sized {
     const CAN_RECONSTRUCT_QUERY_KEY: bool;
 
     /// This method turns the parameters of a DepNodeConstructor into an opaque
@@ -468,6 +376,14 @@ trait DepNodeParams<'tcx>: fmt::Debug {
     fn to_debug_str(&self, _: TyCtxt<'tcx>) -> String {
         format!("{:?}", self)
     }
+
+    /// This method tries to recover the query key from the given `DepNode`,
+    /// something which is needed when forcing `DepNode`s during red-green
+    /// evaluation. The query system will only call this method if
+    /// `CAN_RECONSTRUCT_QUERY_KEY` is `true`.
+    /// It is always valid to return `None` here, in which case incremental
+    /// compilation will treat the query as having changed instead of forcing it.
+    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self>;
 }
 
 impl<'tcx, T> DepNodeParams<'tcx> for T
@@ -488,6 +404,10 @@ where
     default fn to_debug_str(&self, _: TyCtxt<'tcx>) -> String {
         format!("{:?}", *self)
     }
+
+    default fn recover(_: TyCtxt<'tcx>, _: &DepNode) -> Option<Self> {
+        None
+    }
 }
 
 impl<'tcx> DepNodeParams<'tcx> for DefId {
@@ -500,6 +420,10 @@ impl<'tcx> DepNodeParams<'tcx> for DefId {
     fn to_debug_str(&self, tcx: TyCtxt<'tcx>) -> String {
         tcx.def_path_str(*self)
     }
+
+    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
+        dep_node.extract_def_id(tcx)
+    }
 }
 
 impl<'tcx> DepNodeParams<'tcx> for DefIndex {
@@ -512,6 +436,10 @@ impl<'tcx> DepNodeParams<'tcx> for DefIndex {
     fn to_debug_str(&self, tcx: TyCtxt<'tcx>) -> String {
         tcx.def_path_str(DefId::local(*self))
     }
+
+    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
+        dep_node.extract_def_id(tcx).map(|id| id.index)
+    }
 }
 
 impl<'tcx> DepNodeParams<'tcx> for CrateNum {
@@ -525,6 +453,10 @@ impl<'tcx> DepNodeParams<'tcx> for CrateNum {
     fn to_debug_str(&self, tcx: TyCtxt<'tcx>) -> String {
         tcx.crate_name(*self).to_string()
     }
+
+    fn recover(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> Option<Self> {
+        dep_node.extract_def_id(tcx).map(|id| id.krate)
+    }
 }
 
 impl<'tcx> DepNodeParams<'tcx> for (DefId, DefId) {
diff --git a/src/librustc/dep_graph/graph.rs b/src/librustc/dep_graph/graph.rs
index 8d1efc7bc0..d5cde70341 100644
--- a/src/librustc/dep_graph/graph.rs
+++ b/src/librustc/dep_graph/graph.rs
@@ -6,6 +6,7 @@ use rustc_data_structures::sharded::{self, Sharded};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::{AtomicU32, AtomicU64, Lock, Lrc, Ordering};
 use rustc_errors::Diagnostic;
+use rustc_hir::def_id::DefId;
 use rustc_index::vec::{Idx, IndexVec};
 use smallvec::SmallVec;
 use std::collections::hash_map::Entry;
@@ -523,7 +524,7 @@ impl DepGraph {
             edge_list_indices.push((start, end));
         }
 
-        debug_assert!(edge_list_data.len() <= ::std::u32::MAX as usize);
+        debug_assert!(edge_list_data.len() <= u32::MAX as usize);
         debug_assert_eq!(edge_list_data.len(), total_edge_count);
 
         SerializedDepGraph { nodes, fingerprints, edge_list_indices, edge_list_data }
@@ -677,18 +678,33 @@ impl DepGraph {
                     } else {
                         match dep_dep_node.kind {
                             DepKind::Hir | DepKind::HirBody | DepKind::CrateMetadata => {
-                                if dep_dep_node.extract_def_id(tcx).is_none() {
+                                if let Some(def_id) = dep_dep_node.extract_def_id(tcx) {
+                                    if def_id_corresponds_to_hir_dep_node(tcx, def_id) {
+                                        // The `DefPath` has corresponding node,
+                                        // and that node should have been marked
+                                        // either red or green in `data.colors`.
+                                        bug!(
+                                            "DepNode {:?} should have been \
+                                             pre-marked as red or green but wasn't.",
+                                            dep_dep_node
+                                        );
+                                    } else {
+                                        // This `DefPath` does not have a
+                                        // corresponding `DepNode` (e.g. a
+                                        // struct field), and the ` DefPath`
+                                        // collided with the `DefPath` of a
+                                        // proper item that existed in the
+                                        // previous compilation session.
+                                        //
+                                        // Since the given `DefPath` does not
+                                        // denote the item that previously
+                                        // existed, we just fail to mark green.
+                                        return None;
+                                    }
+                                } else {
                                     // If the node does not exist anymore, we
                                     // just fail to mark green.
                                     return None;
-                                } else {
-                                    // If the node does exist, it should have
-                                    // been pre-allocated.
-                                    bug!(
-                                        "DepNode {:?} should have been \
-                                          pre-allocated but wasn't.",
-                                        dep_dep_node
-                                    )
                                 }
                             }
                             _ => {
@@ -793,7 +809,7 @@ impl DepGraph {
             dep_node
         );
 
-        if unlikely!(diagnostics.len() > 0) {
+        if unlikely!(!diagnostics.is_empty()) {
             self.emit_diagnostics(tcx, data, dep_node_index, prev_dep_node_index, diagnostics);
         }
 
@@ -899,6 +915,11 @@ impl DepGraph {
     }
 }
 
+fn def_id_corresponds_to_hir_dep_node(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+    let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
+    def_id.index == hir_id.owner
+}
+
 /// A "work product" is an intermediate result that we save into the
 /// incremental directory for later re-use. The primary example are
 /// the object files that we save for each partition at code
@@ -1101,6 +1122,7 @@ impl CurrentDepGraph {
 }
 
 impl DepGraphData {
+    #[inline(never)]
     fn read_index(&self, source: DepNodeIndex) {
         ty::tls::with_context_opt(|icx| {
             let icx = if let Some(icx) = icx { icx } else { return };
diff --git a/src/librustc/dep_graph/mod.rs b/src/librustc/dep_graph/mod.rs
index eb377d20f5..1fbd90743f 100644
--- a/src/librustc/dep_graph/mod.rs
+++ b/src/librustc/dep_graph/mod.rs
@@ -6,7 +6,8 @@ mod query;
 mod safe;
 mod serialized;
 
-pub use self::dep_node::{label_strs, DepConstructor, DepKind, DepNode, RecoverKey, WorkProductId};
+pub(crate) use self::dep_node::DepNodeParams;
+pub use self::dep_node::{label_strs, DepConstructor, DepKind, DepNode, WorkProductId};
 pub use self::graph::WorkProductFileKind;
 pub use self::graph::{hash_result, DepGraph, DepNodeColor, DepNodeIndex, TaskDeps, WorkProduct};
 pub use self::prev::PreviousDepGraph;
diff --git a/src/librustc/dep_graph/safe.rs b/src/librustc/dep_graph/safe.rs
index 23aef0c429..74e32867cd 100644
--- a/src/librustc/dep_graph/safe.rs
+++ b/src/librustc/dep_graph/safe.rs
@@ -2,9 +2,9 @@
 
 use crate::ty::TyCtxt;
 
+use rustc_ast::ast::NodeId;
 use rustc_hir::def_id::DefId;
 use rustc_hir::BodyId;
-use syntax::ast::NodeId;
 
 /// The `DepGraphSafe` trait is used to specify what kinds of values
 /// are safe to "leak" into a task. The idea is that this should be
diff --git a/src/librustc/hir/check_attr.rs b/src/librustc/hir/check_attr.rs
deleted file mode 100644
index 03fa426460..0000000000
--- a/src/librustc/hir/check_attr.rs
+++ /dev/null
@@ -1,587 +0,0 @@
-//! This module implements some validity checks for attributes.
-//! In particular it verifies that `#[inline]` and `#[repr]` attributes are
-//! attached to items that actually support them and if there are
-//! conflicts between multiple such attributes attached to the same
-//! item.
-
-use crate::hir::map::Map;
-use crate::ty::query::Providers;
-use crate::ty::TyCtxt;
-
-use rustc_errors::struct_span_err;
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
-use rustc_hir::DUMMY_HIR_ID;
-use rustc_hir::{self, HirId, Item, ItemKind, TraitItem, TraitItemKind};
-use rustc_session::lint::builtin::{CONFLICTING_REPR_HINTS, UNUSED_ATTRIBUTES};
-use rustc_span::symbol::sym;
-use rustc_span::Span;
-use syntax::ast::Attribute;
-use syntax::attr;
-
-use std::fmt::{self, Display};
-
-#[derive(Copy, Clone, PartialEq)]
-pub(crate) enum MethodKind {
-    Trait { body: bool },
-    Inherent,
-}
-
-#[derive(Copy, Clone, PartialEq)]
-pub(crate) enum Target {
-    ExternCrate,
-    Use,
-    Static,
-    Const,
-    Fn,
-    Closure,
-    Mod,
-    ForeignMod,
-    GlobalAsm,
-    TyAlias,
-    OpaqueTy,
-    Enum,
-    Struct,
-    Union,
-    Trait,
-    TraitAlias,
-    Impl,
-    Expression,
-    Statement,
-    AssocConst,
-    Method(MethodKind),
-    AssocTy,
-    ForeignFn,
-    ForeignStatic,
-    ForeignTy,
-}
-
-impl Display for Target {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match *self {
-                Target::ExternCrate => "extern crate",
-                Target::Use => "use",
-                Target::Static => "static item",
-                Target::Const => "constant item",
-                Target::Fn => "function",
-                Target::Closure => "closure",
-                Target::Mod => "module",
-                Target::ForeignMod => "foreign module",
-                Target::GlobalAsm => "global asm",
-                Target::TyAlias => "type alias",
-                Target::OpaqueTy => "opaque type",
-                Target::Enum => "enum",
-                Target::Struct => "struct",
-                Target::Union => "union",
-                Target::Trait => "trait",
-                Target::TraitAlias => "trait alias",
-                Target::Impl => "item",
-                Target::Expression => "expression",
-                Target::Statement => "statement",
-                Target::AssocConst => "associated const",
-                Target::Method(_) => "method",
-                Target::AssocTy => "associated type",
-                Target::ForeignFn => "foreign function",
-                Target::ForeignStatic => "foreign static item",
-                Target::ForeignTy => "foreign type",
-            }
-        )
-    }
-}
-
-impl Target {
-    pub(crate) fn from_item(item: &Item<'_>) -> Target {
-        match item.kind {
-            ItemKind::ExternCrate(..) => Target::ExternCrate,
-            ItemKind::Use(..) => Target::Use,
-            ItemKind::Static(..) => Target::Static,
-            ItemKind::Const(..) => Target::Const,
-            ItemKind::Fn(..) => Target::Fn,
-            ItemKind::Mod(..) => Target::Mod,
-            ItemKind::ForeignMod(..) => Target::ForeignMod,
-            ItemKind::GlobalAsm(..) => Target::GlobalAsm,
-            ItemKind::TyAlias(..) => Target::TyAlias,
-            ItemKind::OpaqueTy(..) => Target::OpaqueTy,
-            ItemKind::Enum(..) => Target::Enum,
-            ItemKind::Struct(..) => Target::Struct,
-            ItemKind::Union(..) => Target::Union,
-            ItemKind::Trait(..) => Target::Trait,
-            ItemKind::TraitAlias(..) => Target::TraitAlias,
-            ItemKind::Impl { .. } => Target::Impl,
-        }
-    }
-
-    fn from_trait_item(trait_item: &TraitItem<'_>) -> Target {
-        match trait_item.kind {
-            TraitItemKind::Const(..) => Target::AssocConst,
-            TraitItemKind::Method(_, hir::TraitMethod::Required(_)) => {
-                Target::Method(MethodKind::Trait { body: false })
-            }
-            TraitItemKind::Method(_, hir::TraitMethod::Provided(_)) => {
-                Target::Method(MethodKind::Trait { body: true })
-            }
-            TraitItemKind::Type(..) => Target::AssocTy,
-        }
-    }
-
-    fn from_foreign_item(foreign_item: &hir::ForeignItem<'_>) -> Target {
-        match foreign_item.kind {
-            hir::ForeignItemKind::Fn(..) => Target::ForeignFn,
-            hir::ForeignItemKind::Static(..) => Target::ForeignStatic,
-            hir::ForeignItemKind::Type => Target::ForeignTy,
-        }
-    }
-
-    fn from_impl_item<'tcx>(tcx: TyCtxt<'tcx>, impl_item: &hir::ImplItem<'_>) -> Target {
-        match impl_item.kind {
-            hir::ImplItemKind::Const(..) => Target::AssocConst,
-            hir::ImplItemKind::Method(..) => {
-                let parent_hir_id = tcx.hir().get_parent_item(impl_item.hir_id);
-                let containing_item = tcx.hir().expect_item(parent_hir_id);
-                let containing_impl_is_for_trait = match &containing_item.kind {
-                    hir::ItemKind::Impl { ref of_trait, .. } => of_trait.is_some(),
-                    _ => bug!("parent of an ImplItem must be an Impl"),
-                };
-                if containing_impl_is_for_trait {
-                    Target::Method(MethodKind::Trait { body: true })
-                } else {
-                    Target::Method(MethodKind::Inherent)
-                }
-            }
-            hir::ImplItemKind::TyAlias(..) | hir::ImplItemKind::OpaqueTy(..) => Target::AssocTy,
-        }
-    }
-}
-
-struct CheckAttrVisitor<'tcx> {
-    tcx: TyCtxt<'tcx>,
-}
-
-impl CheckAttrVisitor<'tcx> {
-    /// Checks any attribute.
-    fn check_attributes(
-        &self,
-        hir_id: HirId,
-        attrs: &'hir [Attribute],
-        span: &Span,
-        target: Target,
-        item: Option<&Item<'_>>,
-    ) {
-        let mut is_valid = true;
-        for attr in attrs {
-            is_valid &= if attr.check_name(sym::inline) {
-                self.check_inline(hir_id, attr, span, target)
-            } else if attr.check_name(sym::non_exhaustive) {
-                self.check_non_exhaustive(attr, span, target)
-            } else if attr.check_name(sym::marker) {
-                self.check_marker(attr, span, target)
-            } else if attr.check_name(sym::target_feature) {
-                self.check_target_feature(attr, span, target)
-            } else if attr.check_name(sym::track_caller) {
-                self.check_track_caller(&attr.span, attrs, span, target)
-            } else {
-                true
-            };
-        }
-
-        if !is_valid {
-            return;
-        }
-
-        if target == Target::Fn {
-            self.tcx.codegen_fn_attrs(self.tcx.hir().local_def_id(hir_id));
-        }
-
-        self.check_repr(attrs, span, target, item, hir_id);
-        self.check_used(attrs, target);
-    }
-
-    /// Checks if an `#[inline]` is applied to a function or a closure. Returns `true` if valid.
-    fn check_inline(&self, hir_id: HirId, attr: &Attribute, span: &Span, target: Target) -> bool {
-        match target {
-            Target::Fn
-            | Target::Closure
-            | Target::Method(MethodKind::Trait { body: true })
-            | Target::Method(MethodKind::Inherent) => true,
-            Target::Method(MethodKind::Trait { body: false }) | Target::ForeignFn => {
-                self.tcx
-                    .struct_span_lint_hir(
-                        UNUSED_ATTRIBUTES,
-                        hir_id,
-                        attr.span,
-                        "`#[inline]` is ignored on function prototypes",
-                    )
-                    .emit();
-                true
-            }
-            // FIXME(#65833): We permit associated consts to have an `#[inline]` attribute with
-            // just a lint, because we previously erroneously allowed it and some crates used it
-            // accidentally, to to be compatible with crates depending on them, we can't throw an
-            // error here.
-            Target::AssocConst => {
-                self.tcx
-                    .struct_span_lint_hir(
-                        UNUSED_ATTRIBUTES,
-                        hir_id,
-                        attr.span,
-                        "`#[inline]` is ignored on constants",
-                    )
-                    .warn(
-                        "this was previously accepted by the compiler but is \
-                       being phased out; it will become a hard error in \
-                       a future release!",
-                    )
-                    .note(
-                        "for more information, see issue #65833 \
-                       <https://github.com/rust-lang/rust/issues/65833>",
-                    )
-                    .emit();
-                true
-            }
-            _ => {
-                struct_span_err!(
-                    self.tcx.sess,
-                    attr.span,
-                    E0518,
-                    "attribute should be applied to function or closure",
-                )
-                .span_label(*span, "not a function or closure")
-                .emit();
-                false
-            }
-        }
-    }
-
-    /// Checks if a `#[track_caller]` is applied to a non-naked function. Returns `true` if valid.
-    fn check_track_caller(
-        &self,
-        attr_span: &Span,
-        attrs: &'hir [Attribute],
-        span: &Span,
-        target: Target,
-    ) -> bool {
-        match target {
-            Target::Fn if attr::contains_name(attrs, sym::naked) => {
-                struct_span_err!(
-                    self.tcx.sess,
-                    *attr_span,
-                    E0736,
-                    "cannot use `#[track_caller]` with `#[naked]`",
-                )
-                .emit();
-                false
-            }
-            Target::Fn | Target::Method(MethodKind::Inherent) => true,
-            Target::Method(_) => {
-                struct_span_err!(
-                    self.tcx.sess,
-                    *attr_span,
-                    E0738,
-                    "`#[track_caller]` may not be used on trait methods",
-                )
-                .emit();
-                false
-            }
-            _ => {
-                struct_span_err!(
-                    self.tcx.sess,
-                    *attr_span,
-                    E0739,
-                    "attribute should be applied to function"
-                )
-                .span_label(*span, "not a function")
-                .emit();
-                false
-            }
-        }
-    }
-
-    /// Checks if the `#[non_exhaustive]` attribute on an `item` is valid. Returns `true` if valid.
-    fn check_non_exhaustive(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
-        match target {
-            Target::Struct | Target::Enum => true,
-            _ => {
-                struct_span_err!(
-                    self.tcx.sess,
-                    attr.span,
-                    E0701,
-                    "attribute can only be applied to a struct or enum"
-                )
-                .span_label(*span, "not a struct or enum")
-                .emit();
-                false
-            }
-        }
-    }
-
-    /// Checks if the `#[marker]` attribute on an `item` is valid. Returns `true` if valid.
-    fn check_marker(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
-        match target {
-            Target::Trait => true,
-            _ => {
-                self.tcx
-                    .sess
-                    .struct_span_err(attr.span, "attribute can only be applied to a trait")
-                    .span_label(*span, "not a trait")
-                    .emit();
-                false
-            }
-        }
-    }
-
-    /// Checks if the `#[target_feature]` attribute on `item` is valid. Returns `true` if valid.
-    fn check_target_feature(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
-        match target {
-            Target::Fn
-            | Target::Method(MethodKind::Trait { body: true })
-            | Target::Method(MethodKind::Inherent) => true,
-            _ => {
-                self.tcx
-                    .sess
-                    .struct_span_err(attr.span, "attribute should be applied to a function")
-                    .span_label(*span, "not a function")
-                    .emit();
-                false
-            }
-        }
-    }
-
-    /// Checks if the `#[repr]` attributes on `item` are valid.
-    fn check_repr(
-        &self,
-        attrs: &'hir [Attribute],
-        span: &Span,
-        target: Target,
-        item: Option<&Item<'_>>,
-        hir_id: HirId,
-    ) {
-        // Extract the names of all repr hints, e.g., [foo, bar, align] for:
-        // ```
-        // #[repr(foo)]
-        // #[repr(bar, align(8))]
-        // ```
-        let hints: Vec<_> = attrs
-            .iter()
-            .filter(|attr| attr.check_name(sym::repr))
-            .filter_map(|attr| attr.meta_item_list())
-            .flatten()
-            .collect();
-
-        let mut int_reprs = 0;
-        let mut is_c = false;
-        let mut is_simd = false;
-        let mut is_transparent = false;
-
-        for hint in &hints {
-            let (article, allowed_targets) = match hint.name_or_empty() {
-                name @ sym::C | name @ sym::align => {
-                    is_c |= name == sym::C;
-                    match target {
-                        Target::Struct | Target::Union | Target::Enum => continue,
-                        _ => ("a", "struct, enum, or union"),
-                    }
-                }
-                sym::packed => {
-                    if target != Target::Struct && target != Target::Union {
-                        ("a", "struct or union")
-                    } else {
-                        continue;
-                    }
-                }
-                sym::simd => {
-                    is_simd = true;
-                    if target != Target::Struct { ("a", "struct") } else { continue }
-                }
-                sym::transparent => {
-                    is_transparent = true;
-                    match target {
-                        Target::Struct | Target::Union | Target::Enum => continue,
-                        _ => ("a", "struct, enum, or union"),
-                    }
-                }
-                sym::i8
-                | sym::u8
-                | sym::i16
-                | sym::u16
-                | sym::i32
-                | sym::u32
-                | sym::i64
-                | sym::u64
-                | sym::isize
-                | sym::usize => {
-                    int_reprs += 1;
-                    if target != Target::Enum { ("an", "enum") } else { continue }
-                }
-                _ => continue,
-            };
-            self.emit_repr_error(
-                hint.span(),
-                *span,
-                &format!("attribute should be applied to {}", allowed_targets),
-                &format!("not {} {}", article, allowed_targets),
-            )
-        }
-
-        // Just point at all repr hints if there are any incompatibilities.
-        // This is not ideal, but tracking precisely which ones are at fault is a huge hassle.
-        let hint_spans = hints.iter().map(|hint| hint.span());
-
-        // Error on repr(transparent, <anything else>).
-        if is_transparent && hints.len() > 1 {
-            let hint_spans: Vec<_> = hint_spans.clone().collect();
-            struct_span_err!(
-                self.tcx.sess,
-                hint_spans,
-                E0692,
-                "transparent {} cannot have other repr hints",
-                target
-            )
-            .emit();
-        }
-        // Warn on repr(u8, u16), repr(C, simd), and c-like-enum-repr(C, u8)
-        if (int_reprs > 1)
-            || (is_simd && is_c)
-            || (int_reprs == 1 && is_c && item.map_or(false, |item| is_c_like_enum(item)))
-        {
-            self.tcx
-                .struct_span_lint_hir(
-                    CONFLICTING_REPR_HINTS,
-                    hir_id,
-                    hint_spans.collect::<Vec<Span>>(),
-                    "conflicting representation hints",
-                )
-                .code(rustc_errors::error_code!(E0566))
-                .emit();
-        }
-    }
-
-    fn emit_repr_error(
-        &self,
-        hint_span: Span,
-        label_span: Span,
-        hint_message: &str,
-        label_message: &str,
-    ) {
-        struct_span_err!(self.tcx.sess, hint_span, E0517, "{}", hint_message)
-            .span_label(label_span, label_message)
-            .emit();
-    }
-
-    fn check_stmt_attributes(&self, stmt: &hir::Stmt<'_>) {
-        // When checking statements ignore expressions, they will be checked later
-        if let hir::StmtKind::Local(ref l) = stmt.kind {
-            for attr in l.attrs.iter() {
-                if attr.check_name(sym::inline) {
-                    self.check_inline(DUMMY_HIR_ID, attr, &stmt.span, Target::Statement);
-                }
-                if attr.check_name(sym::repr) {
-                    self.emit_repr_error(
-                        attr.span,
-                        stmt.span,
-                        "attribute should not be applied to a statement",
-                        "not a struct, enum, or union",
-                    );
-                }
-            }
-        }
-    }
-
-    fn check_expr_attributes(&self, expr: &hir::Expr<'_>) {
-        let target = match expr.kind {
-            hir::ExprKind::Closure(..) => Target::Closure,
-            _ => Target::Expression,
-        };
-        for attr in expr.attrs.iter() {
-            if attr.check_name(sym::inline) {
-                self.check_inline(DUMMY_HIR_ID, attr, &expr.span, target);
-            }
-            if attr.check_name(sym::repr) {
-                self.emit_repr_error(
-                    attr.span,
-                    expr.span,
-                    "attribute should not be applied to an expression",
-                    "not defining a struct, enum, or union",
-                );
-            }
-        }
-    }
-
-    fn check_used(&self, attrs: &'hir [Attribute], target: Target) {
-        for attr in attrs {
-            if attr.check_name(sym::used) && target != Target::Static {
-                self.tcx
-                    .sess
-                    .span_err(attr.span, "attribute must be applied to a `static` variable");
-            }
-        }
-    }
-}
-
-impl Visitor<'tcx> for CheckAttrVisitor<'tcx> {
-    type Map = Map<'tcx>;
-
-    fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, Self::Map> {
-        NestedVisitorMap::OnlyBodies(&self.tcx.hir())
-    }
-
-    fn visit_item(&mut self, item: &'tcx Item<'tcx>) {
-        let target = Target::from_item(item);
-        self.check_attributes(item.hir_id, item.attrs, &item.span, target, Some(item));
-        intravisit::walk_item(self, item)
-    }
-
-    fn visit_trait_item(&mut self, trait_item: &'tcx TraitItem<'tcx>) {
-        let target = Target::from_trait_item(trait_item);
-        self.check_attributes(trait_item.hir_id, &trait_item.attrs, &trait_item.span, target, None);
-        intravisit::walk_trait_item(self, trait_item)
-    }
-
-    fn visit_foreign_item(&mut self, f_item: &'tcx hir::ForeignItem<'tcx>) {
-        let target = Target::from_foreign_item(f_item);
-        self.check_attributes(f_item.hir_id, &f_item.attrs, &f_item.span, target, None);
-        intravisit::walk_foreign_item(self, f_item)
-    }
-
-    fn visit_impl_item(&mut self, impl_item: &'tcx hir::ImplItem<'tcx>) {
-        let target = Target::from_impl_item(self.tcx, impl_item);
-        self.check_attributes(impl_item.hir_id, &impl_item.attrs, &impl_item.span, target, None);
-        intravisit::walk_impl_item(self, impl_item)
-    }
-
-    fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
-        self.check_stmt_attributes(stmt);
-        intravisit::walk_stmt(self, stmt)
-    }
-
-    fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
-        self.check_expr_attributes(expr);
-        intravisit::walk_expr(self, expr)
-    }
-}
-
-fn is_c_like_enum(item: &Item<'_>) -> bool {
-    if let ItemKind::Enum(ref def, _) = item.kind {
-        for variant in def.variants {
-            match variant.data {
-                hir::VariantData::Unit(..) => { /* continue */ }
-                _ => return false,
-            }
-        }
-        true
-    } else {
-        false
-    }
-}
-
-fn check_mod_attrs(tcx: TyCtxt<'_>, module_def_id: DefId) {
-    tcx.hir()
-        .visit_item_likes_in_module(module_def_id, &mut CheckAttrVisitor { tcx }.as_deep_visitor());
-}
-
-pub(crate) fn provide(providers: &mut Providers<'_>) {
-    *providers = Providers { check_mod_attrs, ..*providers };
-}
diff --git a/src/librustc/hir/exports.rs b/src/librustc/hir/exports.rs
index db020e39e8..4c144a54d6 100644
--- a/src/librustc/hir/exports.rs
+++ b/src/librustc/hir/exports.rs
@@ -1,10 +1,10 @@
 use crate::ty;
 
+use rustc_ast::ast;
 use rustc_hir::def::Res;
 use rustc_hir::def_id::DefIdMap;
 use rustc_macros::HashStable;
 use rustc_span::Span;
-use syntax::ast;
 
 use std::fmt::Debug;
 
diff --git a/src/librustc/hir/map/blocks.rs b/src/librustc/hir/map/blocks.rs
index 016fc939a7..618f9a018d 100644
--- a/src/librustc/hir/map/blocks.rs
+++ b/src/librustc/hir/map/blocks.rs
@@ -12,11 +12,11 @@
 //! for the `Code` associated with a particular NodeId.
 
 use crate::hir::map::Map;
+use rustc_ast::ast::{Attribute, Ident};
 use rustc_hir as hir;
 use rustc_hir::intravisit::FnKind;
 use rustc_hir::{Expr, FnDecl, Node};
 use rustc_span::Span;
-use syntax::ast::{Attribute, Ident};
 
 /// An FnLikeNode is a Node that is like a fn, in that it has a decl
 /// and a body (as well as a NodeId, a span, etc).
diff --git a/src/librustc/hir/map/collector.rs b/src/librustc/hir/map/collector.rs
index b6be4bb001..ebd335ab35 100644
--- a/src/librustc/hir/map/collector.rs
+++ b/src/librustc/hir/map/collector.rs
@@ -3,6 +3,7 @@ use crate::hir::map::definitions::{self, DefPathHash};
 use crate::hir::map::{Entry, HirEntryMap, Map};
 use crate::ich::StableHashingContext;
 use crate::middle::cstore::CrateStore;
+use rustc_ast::ast::NodeId;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
@@ -16,7 +17,6 @@ use rustc_index::vec::IndexVec;
 use rustc_session::{CrateDisambiguator, Session};
 use rustc_span::source_map::SourceMap;
 use rustc_span::{Span, Symbol, DUMMY_SP};
-use syntax::ast::NodeId;
 
 use std::iter::repeat;
 
@@ -140,6 +140,7 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> {
                 trait_impls: _,
                 body_ids: _,
                 modules: _,
+                proc_macros: _,
             } = *krate;
 
             alloc_hir_dep_nodes(
@@ -223,12 +224,9 @@ impl<'a, 'hir> NodeCollector<'a, 'hir> {
             (commandline_args_hash, crate_disambiguator.to_fingerprint()),
         );
 
-        let (_, crate_hash) = input_dep_node_and_hash(
-            self.dep_graph,
-            &mut self.hcx,
-            DepNode::new_no_params(DepKind::Krate),
-            crate_hash_input,
-        );
+        let mut stable_hasher = StableHasher::new();
+        crate_hash_input.hash_stable(&mut self.hcx, &mut stable_hasher);
+        let crate_hash: Fingerprint = stable_hasher.finish();
 
         let svh = Svh::new(crate_hash.to_smaller_hash());
         (self.map, svh)
diff --git a/src/librustc/hir/map/definitions.rs b/src/librustc/hir/map/definitions.rs
index ac2d7a9a8d..e1b5ec041d 100644
--- a/src/librustc/hir/map/definitions.rs
+++ b/src/librustc/hir/map/definitions.rs
@@ -4,18 +4,18 @@
 //! There are also some rather random cases (like const initializer
 //! expressions) that are mostly just leftovers.
 
+use rustc_ast::ast;
+use rustc_ast::node_id::NodeMap;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::StableHasher;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, DefIndex, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_index::vec::IndexVec;
-use rustc_session::node_id::NodeMap;
 use rustc_session::CrateDisambiguator;
 use rustc_span::hygiene::ExpnId;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast;
 
 use std::borrow::Borrow;
 use std::fmt::Write;
@@ -192,7 +192,7 @@ impl DefPath {
             }
         }
         data.reverse();
-        DefPath { data: data, krate: krate }
+        DefPath { data, krate }
     }
 
     /// Returns a string representation of the `DefPath` without
diff --git a/src/librustc/hir/map/hir_id_validator.rs b/src/librustc/hir/map/hir_id_validator.rs
index ca95f87a09..a4f9193c0e 100644
--- a/src/librustc/hir/map/hir_id_validator.rs
+++ b/src/librustc/hir/map/hir_id_validator.rs
@@ -12,7 +12,7 @@ pub fn check_crate(hir_map: &Map<'_>, sess: &rustc_session::Session) {
 
     let errors = Lock::new(Vec::new());
 
-    par_iter(&hir_map.krate().modules).for_each(|(module_id, _)| {
+    par_iter(&hir_map.krate.modules).for_each(|(module_id, _)| {
         let local_def_id = hir_map.local_def_id(*module_id);
         hir_map.visit_item_likes_in_module(
             local_def_id,
diff --git a/src/librustc/hir/map/mod.rs b/src/librustc/hir/map/mod.rs
index b5ca63a34d..0f129904b4 100644
--- a/src/librustc/hir/map/mod.rs
+++ b/src/librustc/hir/map/mod.rs
@@ -6,6 +6,7 @@ pub use self::definitions::{
 use crate::dep_graph::{DepGraph, DepKind, DepNode, DepNodeIndex};
 use crate::middle::cstore::CrateStoreDyn;
 use crate::ty::query::Providers;
+use rustc_ast::ast::{self, Name, NodeId};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::svh::Svh;
 use rustc_hir::def::{DefKind, Res};
@@ -20,7 +21,6 @@ use rustc_span::source_map::Spanned;
 use rustc_span::symbol::kw;
 use rustc_span::Span;
 use rustc_target::spec::abi::Abi;
-use syntax::ast::{self, Name, NodeId};
 
 pub mod blocks;
 mod collector;
@@ -129,30 +129,6 @@ impl<'hir> Entry<'hir> {
     }
 }
 
-/// Stores a crate and any number of inlined items from other crates.
-pub struct Forest<'hir> {
-    krate: Crate<'hir>,
-    pub dep_graph: DepGraph,
-}
-
-impl Forest<'hir> {
-    pub fn new(krate: Crate<'hir>, dep_graph: &DepGraph) -> Forest<'hir> {
-        Forest { krate, dep_graph: dep_graph.clone() }
-    }
-
-    pub fn krate(&self) -> &Crate<'hir> {
-        self.dep_graph.read(DepNode::new_no_params(DepKind::Krate));
-        &self.krate
-    }
-
-    /// This is used internally in the dependency tracking system.
-    /// Use the `krate` method to ensure your dependency on the
-    /// crate is tracked.
-    pub fn untracked_krate(&self) -> &Crate<'hir> {
-        &self.krate
-    }
-}
-
 /// This type is effectively a `HashMap<HirId, Entry<'hir>>`,
 /// but it is implemented as 2 layers of arrays.
 /// - first we have `A = IndexVec<DefIndex, B>` mapping `DefIndex`s to an inner value
@@ -162,11 +138,8 @@ pub(super) type HirEntryMap<'hir> = IndexVec<DefIndex, IndexVec<ItemLocalId, Opt
 /// Represents a mapping from `NodeId`s to AST elements and their parent `NodeId`s.
 #[derive(Clone)]
 pub struct Map<'hir> {
-    /// The backing storage for all the AST nodes.
-    pub forest: &'hir Forest<'hir>,
+    krate: &'hir Crate<'hir>,
 
-    /// Same as the dep_graph in forest, just available with one fewer
-    /// deref. This is a gratuitous micro-optimization.
     pub dep_graph: DepGraph,
 
     /// The SVH of the local crate.
@@ -180,17 +153,13 @@ pub struct Map<'hir> {
     hir_to_node_id: FxHashMap<HirId, NodeId>,
 }
 
-struct ParentHirIterator<'map, 'hir> {
+/// An iterator that walks up the ancestor tree of a given `HirId`.
+/// Constructed using `tcx.hir().parent_iter(hir_id)`.
+pub struct ParentHirIterator<'map, 'hir> {
     current_id: HirId,
     map: &'map Map<'hir>,
 }
 
-impl<'map, 'hir> ParentHirIterator<'map, 'hir> {
-    fn new(current_id: HirId, map: &'map Map<'hir>) -> Self {
-        Self { current_id, map }
-    }
-}
-
 impl<'hir> Iterator for ParentHirIterator<'_, 'hir> {
     type Item = (HirId, Node<'hir>);
 
@@ -217,6 +186,13 @@ impl<'hir> Iterator for ParentHirIterator<'_, 'hir> {
 }
 
 impl<'hir> Map<'hir> {
+    /// This is used internally in the dependency tracking system.
+    /// Use the `krate` method to ensure your dependency on the
+    /// crate is tracked.
+    pub fn untracked_krate(&self) -> &Crate<'hir> {
+        &self.krate
+    }
+
     #[inline]
     fn lookup(&self, id: HirId) -> Option<&Entry<'hir>> {
         let local_map = self.map.get(id.owner)?;
@@ -362,9 +338,8 @@ impl<'hir> Map<'hir> {
             Node::Variant(_) => DefKind::Variant,
             Node::Ctor(variant_data) => {
                 // FIXME(eddyb) is this even possible, if we have a `Node::Ctor`?
-                if variant_data.ctor_hir_id().is_none() {
-                    return None;
-                }
+                variant_data.ctor_hir_id()?;
+
                 let ctor_of = match self.find(self.get_parent_node(hir_id)) {
                     Some(Node::Item(..)) => def::CtorOf::Struct,
                     Some(Node::Variant(..)) => def::CtorOf::Variant,
@@ -401,40 +376,36 @@ impl<'hir> Map<'hir> {
         self.lookup(id).cloned()
     }
 
-    pub fn krate(&self) -> &'hir Crate<'hir> {
-        self.forest.krate()
-    }
-
     pub fn item(&self, id: HirId) -> &'hir Item<'hir> {
         self.read(id);
 
-        // N.B., intentionally bypass `self.forest.krate()` so that we
+        // N.B., intentionally bypass `self.krate()` so that we
         // do not trigger a read of the whole krate here
-        self.forest.krate.item(id)
+        self.krate.item(id)
     }
 
     pub fn trait_item(&self, id: TraitItemId) -> &'hir TraitItem<'hir> {
         self.read(id.hir_id);
 
-        // N.B., intentionally bypass `self.forest.krate()` so that we
+        // N.B., intentionally bypass `self.krate()` so that we
         // do not trigger a read of the whole krate here
-        self.forest.krate.trait_item(id)
+        self.krate.trait_item(id)
     }
 
     pub fn impl_item(&self, id: ImplItemId) -> &'hir ImplItem<'hir> {
         self.read(id.hir_id);
 
-        // N.B., intentionally bypass `self.forest.krate()` so that we
+        // N.B., intentionally bypass `self.krate()` so that we
         // do not trigger a read of the whole krate here
-        self.forest.krate.impl_item(id)
+        self.krate.impl_item(id)
     }
 
     pub fn body(&self, id: BodyId) -> &'hir Body<'hir> {
         self.read(id.hir_id);
 
-        // N.B., intentionally bypass `self.forest.krate()` so that we
+        // N.B., intentionally bypass `self.krate()` so that we
         // do not trigger a read of the whole krate here
-        self.forest.krate.body(id)
+        self.krate.body(id)
     }
 
     pub fn fn_decl_by_hir_id(&self, hir_id: HirId) -> Option<&'hir FnDecl<'hir>> {
@@ -530,9 +501,9 @@ impl<'hir> Map<'hir> {
     pub fn trait_impls(&self, trait_did: DefId) -> &'hir [HirId] {
         self.dep_graph.read(DepNode::new_no_params(DepKind::AllLocalTraitImpls));
 
-        // N.B., intentionally bypass `self.forest.krate()` so that we
+        // N.B., intentionally bypass `self.krate()` so that we
         // do not trigger a read of the whole krate here
-        self.forest.krate.trait_impls.get(&trait_did).map_or(&[], |xs| &xs[..])
+        self.krate.trait_impls.get(&trait_did).map_or(&[], |xs| &xs[..])
     }
 
     /// Gets the attributes on the crate. This is preferable to
@@ -542,7 +513,7 @@ impl<'hir> Map<'hir> {
         let def_path_hash = self.definitions.def_path_hash(CRATE_DEF_INDEX);
 
         self.dep_graph.read(def_path_hash.to_dep_node(DepKind::Hir));
-        &self.forest.krate.attrs
+        &self.krate.attrs
     }
 
     pub fn get_module(&self, module: DefId) -> (&'hir Mod<'hir>, Span, HirId) {
@@ -550,7 +521,7 @@ impl<'hir> Map<'hir> {
         self.read(hir_id);
         match self.find_entry(hir_id).unwrap().node {
             Node::Item(&Item { span, kind: ItemKind::Mod(ref m), .. }) => (m, span, hir_id),
-            Node::Crate => (&self.forest.krate.module, self.forest.krate.span, hir_id),
+            Node::Crate => (&self.krate.module, self.krate.span, hir_id),
             node => panic!("not a module: {:?}", node),
         }
     }
@@ -567,7 +538,7 @@ impl<'hir> Map<'hir> {
         // in the expect_* calls the loops below
         self.read(hir_id);
 
-        let module = &self.forest.krate.modules[&hir_id];
+        let module = &self.krate.modules[&hir_id];
 
         for id in &module.items {
             visitor.visit_item(self.expect_item(*id));
@@ -642,6 +613,12 @@ impl<'hir> Map<'hir> {
         self.find_entry(hir_id).and_then(|x| x.parent_node()).unwrap_or(hir_id)
     }
 
+    /// Returns an iterator for the nodes in the ancestor tree of the `current_id`
+    /// until the crate root is reached. Prefer this over your own loop using `get_parent_node`.
+    pub fn parent_iter(&self, current_id: HirId) -> ParentHirIterator<'_, 'hir> {
+        ParentHirIterator { current_id, map: self }
+    }
+
     /// Checks if the node is an argument. An argument is a local variable whose
     /// immediate parent is an item or a closure.
     pub fn is_argument(&self, id: HirId) -> bool {
@@ -676,7 +653,7 @@ impl<'hir> Map<'hir> {
         }
     }
 
-    /// Wether `hir_id` corresponds to a `mod` or a crate.
+    /// Whether `hir_id` corresponds to a `mod` or a crate.
     pub fn is_hir_id_module(&self, hir_id: HirId) -> bool {
         match self.lookup(hir_id) {
             Some(Entry { node: Node::Item(Item { kind: ItemKind::Mod(_), .. }), .. })
@@ -708,7 +685,7 @@ impl<'hir> Map<'hir> {
     /// }
     /// ```
     pub fn get_return_block(&self, id: HirId) -> Option<HirId> {
-        let mut iter = ParentHirIterator::new(id, &self).peekable();
+        let mut iter = self.parent_iter(id).peekable();
         let mut ignore_tail = false;
         if let Some(entry) = self.find_entry(id) {
             if let Node::Expr(Expr { kind: ExprKind::Ret(_), .. }) = entry.node {
@@ -755,7 +732,7 @@ impl<'hir> Map<'hir> {
     /// in the HIR which is recorded by the map and is an item, either an item
     /// in a module, trait, or impl.
     pub fn get_parent_item(&self, hir_id: HirId) -> HirId {
-        for (hir_id, node) in ParentHirIterator::new(hir_id, &self) {
+        for (hir_id, node) in self.parent_iter(hir_id) {
             match node {
                 Node::Crate
                 | Node::Item(_)
@@ -768,16 +745,10 @@ impl<'hir> Map<'hir> {
         hir_id
     }
 
-    /// Returns the `DefId` of `id`'s nearest module parent, or `id` itself if no
-    /// module parent is in this map.
-    pub fn get_module_parent(&self, id: HirId) -> DefId {
-        self.local_def_id(self.get_module_parent_node(id))
-    }
-
     /// Returns the `HirId` of `id`'s nearest module parent, or `id` itself if no
     /// module parent is in this map.
-    pub fn get_module_parent_node(&self, hir_id: HirId) -> HirId {
-        for (hir_id, node) in ParentHirIterator::new(hir_id, &self) {
+    pub(super) fn get_module_parent_node(&self, hir_id: HirId) -> HirId {
+        for (hir_id, node) in self.parent_iter(hir_id) {
             if let Node::Item(&Item { kind: ItemKind::Mod(_), .. }) = node {
                 return hir_id;
             }
@@ -791,7 +762,7 @@ impl<'hir> Map<'hir> {
     /// Used by error reporting when there's a type error in a match arm caused by the `match`
     /// expression needing to be unit.
     pub fn get_match_if_cause(&self, hir_id: HirId) -> Option<&'hir Expr<'hir>> {
-        for (_, node) in ParentHirIterator::new(hir_id, &self) {
+        for (_, node) in self.parent_iter(hir_id) {
             match node {
                 Node::Item(_) | Node::ForeignItem(_) | Node::TraitItem(_) | Node::ImplItem(_) => {
                     break;
@@ -812,7 +783,7 @@ impl<'hir> Map<'hir> {
 
     /// Returns the nearest enclosing scope. A scope is roughly an item or block.
     pub fn get_enclosing_scope(&self, hir_id: HirId) -> Option<HirId> {
-        for (hir_id, node) in ParentHirIterator::new(hir_id, &self) {
+        for (hir_id, node) in self.parent_iter(hir_id) {
             if match node {
                 Node::Item(i) => match i.kind {
                     ItemKind::Fn(..)
@@ -984,7 +955,7 @@ impl<'hir> Map<'hir> {
             // Unit/tuple structs/variants take the attributes straight from
             // the struct/variant definition.
             Some(Node::Ctor(..)) => return self.attrs(self.get_parent_item(id)),
-            Some(Node::Crate) => Some(&self.forest.krate.attrs[..]),
+            Some(Node::Crate) => Some(&self.krate.attrs[..]),
             _ => None,
         };
         attrs.unwrap_or(&[])
@@ -1063,7 +1034,7 @@ impl<'hir> Map<'hir> {
             Some(Node::Visibility(v)) => bug!("unexpected Visibility {:?}", v),
             Some(Node::Local(local)) => local.span,
             Some(Node::MacroDef(macro_def)) => macro_def.span,
-            Some(Node::Crate) => self.forest.krate.span,
+            Some(Node::Crate) => self.krate.span,
             None => bug!("hir::map::Map::span: id not in map: {:?}", hir_id),
         }
     }
@@ -1231,7 +1202,8 @@ impl Named for ImplItem<'_> {
 pub fn map_crate<'hir>(
     sess: &rustc_session::Session,
     cstore: &CrateStoreDyn,
-    forest: &'hir Forest<'hir>,
+    krate: &'hir Crate<'hir>,
+    dep_graph: DepGraph,
     definitions: Definitions,
 ) -> Map<'hir> {
     let _prof_timer = sess.prof.generic_activity("build_hir_map");
@@ -1244,31 +1216,18 @@ pub fn map_crate<'hir>(
         .collect();
 
     let (map, crate_hash) = {
-        let hcx = crate::ich::StableHashingContext::new(sess, &forest.krate, &definitions, cstore);
-
-        let mut collector = NodeCollector::root(
-            sess,
-            &forest.krate,
-            &forest.dep_graph,
-            &definitions,
-            &hir_to_node_id,
-            hcx,
-        );
-        intravisit::walk_crate(&mut collector, &forest.krate);
+        let hcx = crate::ich::StableHashingContext::new(sess, krate, &definitions, cstore);
+
+        let mut collector =
+            NodeCollector::root(sess, krate, &dep_graph, &definitions, &hir_to_node_id, hcx);
+        intravisit::walk_crate(&mut collector, krate);
 
         let crate_disambiguator = sess.local_crate_disambiguator();
         let cmdline_args = sess.opts.dep_tracking_hash();
         collector.finalize_and_compute_crate_hash(crate_disambiguator, cstore, cmdline_args)
     };
 
-    let map = Map {
-        forest,
-        dep_graph: forest.dep_graph.clone(),
-        crate_hash,
-        map,
-        hir_to_node_id,
-        definitions,
-    };
+    let map = Map { krate, dep_graph, crate_hash, map, hir_to_node_id, definitions };
 
     sess.time("validate_HIR_map", || {
         hir_id_validator::check_crate(&map, sess);
diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs
index 97c14dd7e0..1aa3b27bd1 100644
--- a/src/librustc/hir/mod.rs
+++ b/src/librustc/hir/mod.rs
@@ -2,15 +2,61 @@
 //!
 //! [rustc guide]: https://rust-lang.github.io/rustc-guide/hir.html
 
-pub mod check_attr;
 pub mod exports;
 pub mod map;
-pub mod upvars;
 
 use crate::ty::query::Providers;
+use crate::ty::TyCtxt;
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+use rustc_hir::print;
+use rustc_hir::Crate;
+use rustc_hir::HirId;
+use std::ops::Deref;
+
+/// A wrapper type which allows you to access HIR.
+#[derive(Clone)]
+pub struct Hir<'tcx> {
+    tcx: TyCtxt<'tcx>,
+    map: &'tcx map::Map<'tcx>,
+}
+
+impl<'tcx> Hir<'tcx> {
+    pub fn krate(&self) -> &'tcx Crate<'tcx> {
+        self.tcx.hir_crate(LOCAL_CRATE)
+    }
+}
+
+impl<'tcx> Deref for Hir<'tcx> {
+    type Target = &'tcx map::Map<'tcx>;
+
+    #[inline(always)]
+    fn deref(&self) -> &Self::Target {
+        &self.map
+    }
+}
+
+impl<'hir> print::PpAnn for Hir<'hir> {
+    fn nested(&self, state: &mut print::State<'_>, nested: print::Nested) {
+        self.map.nested(state, nested)
+    }
+}
+
+impl<'tcx> TyCtxt<'tcx> {
+    #[inline(always)]
+    pub fn hir(self) -> Hir<'tcx> {
+        Hir { tcx: self, map: &self.hir_map }
+    }
+
+    pub fn parent_module(self, id: HirId) -> DefId {
+        self.parent_module_from_def_id(DefId::local(id.owner))
+    }
+}
 
 pub fn provide(providers: &mut Providers<'_>) {
-    check_attr::provide(providers);
+    providers.parent_module_from_def_id = |tcx, id| {
+        let hir = tcx.hir();
+        hir.local_def_id(hir.get_module_parent_node(hir.as_local_hir_id(id).unwrap()))
+    };
+    providers.hir_crate = |tcx, _| tcx.hir_map.untracked_krate();
     map::provide(providers);
-    upvars::provide(providers);
 }
diff --git a/src/librustc/ich/hcx.rs b/src/librustc/ich/hcx.rs
index aade4c3f74..f28e26ef2c 100644
--- a/src/librustc/ich/hcx.rs
+++ b/src/librustc/ich/hcx.rs
@@ -5,6 +5,7 @@ use crate::middle::cstore::CrateStore;
 use crate::session::Session;
 use crate::ty::{fast_reject, TyCtxt};
 
+use rustc_ast::ast;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 use rustc_data_structures::sync::Lrc;
@@ -13,14 +14,13 @@ use rustc_hir::def_id::{DefId, DefIndex};
 use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::Symbol;
 use rustc_span::{BytePos, SourceFile};
-use syntax::ast;
 
 use smallvec::SmallVec;
 use std::cmp::Ord;
 
 fn compute_ignored_attr_names() -> FxHashSet<Symbol> {
-    debug_assert!(ich::IGNORED_ATTRIBUTES.len() > 0);
-    ich::IGNORED_ATTRIBUTES.iter().map(|&s| s).collect()
+    debug_assert!(!ich::IGNORED_ATTRIBUTES.is_empty());
+    ich::IGNORED_ATTRIBUTES.iter().copied().collect()
 }
 
 /// This is the context state available during incr. comp. hashing. It contains
@@ -149,7 +149,7 @@ impl<'a> StableHashingContext<'a> {
     #[inline]
     pub fn source_map(&mut self) -> &mut CachingSourceMapView<'a> {
         match self.caching_source_map {
-            Some(ref mut cm) => cm,
+            Some(ref mut sm) => sm,
             ref mut none => {
                 *none = Some(CachingSourceMapView::new(self.raw_source_map));
                 none.as_mut().unwrap()
@@ -220,27 +220,8 @@ impl<'a> ToStableHashKey<StableHashingContext<'a>> for hir::HirId {
 }
 
 impl<'a> HashStable<StableHashingContext<'a>> for ast::NodeId {
-    fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
-        match hcx.node_id_hashing_mode {
-            NodeIdHashingMode::Ignore => {
-                // Don't do anything.
-            }
-            NodeIdHashingMode::HashDefPath => {
-                hcx.definitions.node_to_hir_id(*self).hash_stable(hcx, hasher);
-            }
-        }
-    }
-}
-
-impl<'a> ToStableHashKey<StableHashingContext<'a>> for ast::NodeId {
-    type KeyType = (DefPathHash, hir::ItemLocalId);
-
-    #[inline]
-    fn to_stable_hash_key(
-        &self,
-        hcx: &StableHashingContext<'a>,
-    ) -> (DefPathHash, hir::ItemLocalId) {
-        hcx.definitions.node_to_hir_id(*self).to_stable_hash_key(hcx)
+    fn hash_stable(&self, _: &mut StableHashingContext<'a>, _: &mut StableHasher) {
+        panic!("Node IDs should not appear in incremental state");
     }
 }
 
@@ -249,6 +230,12 @@ impl<'a> rustc_span::HashStableContext for StableHashingContext<'a> {
         self.hash_spans
     }
 
+    #[inline]
+    fn hash_def_id(&mut self, def_id: DefId, hasher: &mut StableHasher) {
+        let hcx = self;
+        hcx.def_path_hash(def_id).hash_stable(hcx, hasher);
+    }
+
     fn byte_pos_to_line_and_col(
         &mut self,
         byte: BytePos,
diff --git a/src/librustc/ich/impls_hir.rs b/src/librustc/ich/impls_hir.rs
index 8961f7cd4b..eadc9ddeee 100644
--- a/src/librustc/ich/impls_hir.rs
+++ b/src/librustc/ich/impls_hir.rs
@@ -3,20 +3,14 @@
 
 use crate::hir::map::DefPathHash;
 use crate::ich::{Fingerprint, NodeIdHashingMode, StableHashingContext};
+use rustc_attr as attr;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, CRATE_DEF_INDEX};
 use smallvec::SmallVec;
 use std::mem;
-use syntax::attr;
 
 impl<'ctx> rustc_hir::HashStableContext for StableHashingContext<'ctx> {
-    #[inline]
-    fn hash_def_id(&mut self, def_id: DefId, hasher: &mut StableHasher) {
-        let hcx = self;
-        hcx.def_path_hash(def_id).hash_stable(hcx, hasher);
-    }
-
     #[inline]
     fn hash_hir_id(&mut self, hir_id: hir::HirId, hasher: &mut StableHasher) {
         let hcx = self;
@@ -40,40 +34,14 @@ impl<'ctx> rustc_hir::HashStableContext for StableHashingContext<'ctx> {
         }
     }
 
-    // The following implementations of HashStable for `ItemId`, `TraitItemId`, and
-    // `ImplItemId` deserve special attention. Normally we do not hash `NodeId`s within
-    // the HIR, since they just signify a HIR nodes own path. But `ItemId` et al
-    // are used when another item in the HIR is *referenced* and we certainly
-    // want to pick up on a reference changing its target, so we hash the NodeIds
-    // in "DefPath Mode".
-
-    fn hash_item_id(&mut self, id: hir::ItemId, hasher: &mut StableHasher) {
+    fn hash_reference_to_item(&mut self, id: hir::HirId, hasher: &mut StableHasher) {
         let hcx = self;
-        let hir::ItemId { id } = id;
 
         hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| {
             id.hash_stable(hcx, hasher);
         })
     }
 
-    fn hash_impl_item_id(&mut self, id: hir::ImplItemId, hasher: &mut StableHasher) {
-        let hcx = self;
-        let hir::ImplItemId { hir_id } = id;
-
-        hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| {
-            hir_id.hash_stable(hcx, hasher);
-        })
-    }
-
-    fn hash_trait_item_id(&mut self, id: hir::TraitItemId, hasher: &mut StableHasher) {
-        let hcx = self;
-        let hir::TraitItemId { hir_id } = id;
-
-        hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| {
-            hir_id.hash_stable(hcx, hasher);
-        })
-    }
-
     fn hash_hir_mod(&mut self, module: &hir::Mod<'_>, hasher: &mut StableHasher) {
         let hcx = self;
         let hir::Mod { inner: ref inner_span, ref item_ids } = *module;
@@ -283,12 +251,6 @@ impl<'a> ToStableHashKey<StableHashingContext<'a>> for hir::def_id::DefIndex {
     }
 }
 
-impl<'a> HashStable<StableHashingContext<'a>> for crate::middle::lang_items::LangItem {
-    fn hash_stable(&self, _: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
-        ::std::hash::Hash::hash(self, hasher);
-    }
-}
-
 impl<'a> HashStable<StableHashingContext<'a>> for hir::TraitCandidate {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
         hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| {
@@ -308,7 +270,6 @@ impl<'a> ToStableHashKey<StableHashingContext<'a>> for hir::TraitCandidate {
 
         let import_keys = import_ids
             .iter()
-            .map(|node_id| hcx.node_to_hir_id(*node_id))
             .map(|hir_id| (hcx.local_def_path_hash(hir_id.owner), hir_id.local_id))
             .collect();
         (hcx.def_path_hash(*def_id), import_keys)
diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
index e1733794b8..daff8a0f18 100644
--- a/src/librustc/ich/impls_syntax.rs
+++ b/src/librustc/ich/impls_syntax.rs
@@ -1,27 +1,20 @@
 //! 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;
 
+use rustc_ast::ast;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc_span::SourceFile;
-use syntax::ast;
 
 use smallvec::SmallVec;
 
 impl<'ctx> rustc_target::HashStableContext for StableHashingContext<'ctx> {}
 
-impl<'a> HashStable<StableHashingContext<'a>> for ast::Lifetime {
-    fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
-        self.id.hash_stable(hcx, hasher);
-        self.ident.hash_stable(hcx, hasher);
-    }
-}
-
 impl<'a> HashStable<StableHashingContext<'a>> for [ast::Attribute] {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
-        if self.len() == 0 {
+        if self.is_empty() {
             self.len().hash_stable(hcx, hasher);
             return;
         }
@@ -42,7 +35,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for [ast::Attribute] {
     }
 }
 
-impl<'ctx> syntax::HashStableContext for StableHashingContext<'ctx> {
+impl<'ctx> rustc_ast::HashStableContext for StableHashingContext<'ctx> {
     fn hash_attr(&mut self, attr: &ast::Attribute, hasher: &mut StableHasher) {
         // Make sure that these have been filtered out.
         debug_assert!(!attr.ident().map_or(false, |ident| self.is_ignored_attr(ident.name)));
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index 6af0cee948..844250f51a 100644
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -63,9 +63,12 @@ impl<'a> HashStable<StableHashingContext<'a>> for ty::RegionKind {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
         mem::discriminant(self).hash_stable(hcx, hasher);
         match *self {
-            ty::ReErased | ty::ReStatic | ty::ReEmpty => {
+            ty::ReErased | ty::ReStatic => {
                 // No variant fields to hash for these ...
             }
+            ty::ReEmpty(universe) => {
+                universe.hash_stable(hcx, hasher);
+            }
             ty::ReLateBound(db, ty::BrAnon(i)) => {
                 db.hash_stable(hcx, hasher);
                 i.hash_stable(hcx, hasher);
diff --git a/src/librustc/infer/canonical.rs b/src/librustc/infer/canonical.rs
new file mode 100644
index 0000000000..76d0d57e23
--- /dev/null
+++ b/src/librustc/infer/canonical.rs
@@ -0,0 +1,357 @@
+//! **Canonicalization** is the key to constructing a query in the
+//! middle of type inference. Ordinarily, it is not possible to store
+//! types from type inference in query keys, because they contain
+//! references to inference variables whose lifetimes are too short
+//! and so forth. Canonicalizing a value T1 using `canonicalize_query`
+//! produces two things:
+//!
+//! - a value T2 where each unbound inference variable has been
+//!   replaced with a **canonical variable**;
+//! - a map M (of type `CanonicalVarValues`) from those canonical
+//!   variables back to the original.
+//!
+//! We can then do queries using T2. These will give back constraints
+//! on the canonical variables which can be translated, using the map
+//! M, into constraints in our source context. This process of
+//! translating the results back is done by the
+//! `instantiate_query_result` method.
+//!
+//! For a more detailed look at what is happening here, check
+//! out the [chapter in the rustc guide][c].
+//!
+//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
+
+use crate::infer::MemberConstraint;
+use crate::ty::subst::GenericArg;
+use crate::ty::{self, BoundVar, List, Region, TyCtxt};
+use rustc_index::vec::IndexVec;
+use rustc_macros::HashStable;
+use rustc_serialize::UseSpecializedDecodable;
+use smallvec::SmallVec;
+use std::ops::Index;
+
+/// A "canonicalized" type `V` is one where all free inference
+/// variables have been rewritten to "canonical vars". These are
+/// numbered starting from 0 in order of first appearance.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable)]
+#[derive(HashStable, TypeFoldable, Lift)]
+pub struct Canonical<'tcx, V> {
+    pub max_universe: ty::UniverseIndex,
+    pub variables: CanonicalVarInfos<'tcx>,
+    pub value: V,
+}
+
+pub type CanonicalVarInfos<'tcx> = &'tcx List<CanonicalVarInfo>;
+
+impl<'tcx> UseSpecializedDecodable for CanonicalVarInfos<'tcx> {}
+
+/// A set of values corresponding to the canonical variables from some
+/// `Canonical`. You can give these values to
+/// `canonical_value.substitute` to substitute them into the canonical
+/// value at the right places.
+///
+/// When you canonicalize a value `V`, you get back one of these
+/// vectors with the original values that were replaced by canonical
+/// variables. You will need to supply it later to instantiate the
+/// canonicalized query response.
+#[derive(Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable)]
+#[derive(HashStable, TypeFoldable, Lift)]
+pub struct CanonicalVarValues<'tcx> {
+    pub var_values: IndexVec<BoundVar, GenericArg<'tcx>>,
+}
+
+/// When we canonicalize a value to form a query, we wind up replacing
+/// various parts of it with canonical variables. This struct stores
+/// those replaced bits to remember for when we process the query
+/// result.
+#[derive(Clone, Debug)]
+pub struct OriginalQueryValues<'tcx> {
+    /// Map from the universes that appear in the query to the
+    /// universes in the caller context. For the time being, we only
+    /// ever put ROOT values into the query, so this map is very
+    /// simple.
+    pub universe_map: SmallVec<[ty::UniverseIndex; 4]>,
+
+    /// This is equivalent to `CanonicalVarValues`, but using a
+    /// `SmallVec` yields a significant performance win.
+    pub var_values: SmallVec<[GenericArg<'tcx>; 8]>,
+}
+
+impl Default for OriginalQueryValues<'tcx> {
+    fn default() -> Self {
+        let mut universe_map = SmallVec::default();
+        universe_map.push(ty::UniverseIndex::ROOT);
+
+        Self { universe_map, var_values: SmallVec::default() }
+    }
+}
+
+/// Information about a canonical variable that is included with the
+/// canonical value. This is sufficient information for code to create
+/// a copy of the canonical value in some other inference context,
+/// with fresh inference variables replacing the canonical values.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable, HashStable)]
+pub struct CanonicalVarInfo {
+    pub kind: CanonicalVarKind,
+}
+
+impl CanonicalVarInfo {
+    pub fn universe(&self) -> ty::UniverseIndex {
+        self.kind.universe()
+    }
+
+    pub fn is_existential(&self) -> bool {
+        match self.kind {
+            CanonicalVarKind::Ty(_) => true,
+            CanonicalVarKind::PlaceholderTy(_) => false,
+            CanonicalVarKind::Region(_) => true,
+            CanonicalVarKind::PlaceholderRegion(..) => false,
+            CanonicalVarKind::Const(_) => true,
+            CanonicalVarKind::PlaceholderConst(_) => false,
+        }
+    }
+}
+
+/// Describes the "kind" of the canonical variable. This is a "kind"
+/// in the type-theory sense of the term -- i.e., a "meta" type system
+/// that analyzes type-like values.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable, HashStable)]
+pub enum CanonicalVarKind {
+    /// Some kind of type inference variable.
+    Ty(CanonicalTyVarKind),
+
+    /// A "placeholder" that represents "any type".
+    PlaceholderTy(ty::PlaceholderType),
+
+    /// Region variable `'?R`.
+    Region(ty::UniverseIndex),
+
+    /// A "placeholder" that represents "any region". Created when you
+    /// are solving a goal like `for<'a> T: Foo<'a>` to represent the
+    /// bound region `'a`.
+    PlaceholderRegion(ty::PlaceholderRegion),
+
+    /// Some kind of const inference variable.
+    Const(ty::UniverseIndex),
+
+    /// A "placeholder" that represents "any const".
+    PlaceholderConst(ty::PlaceholderConst),
+}
+
+impl CanonicalVarKind {
+    pub fn universe(self) -> ty::UniverseIndex {
+        match self {
+            CanonicalVarKind::Ty(kind) => match kind {
+                CanonicalTyVarKind::General(ui) => ui,
+                CanonicalTyVarKind::Float | CanonicalTyVarKind::Int => ty::UniverseIndex::ROOT,
+            },
+
+            CanonicalVarKind::PlaceholderTy(placeholder) => placeholder.universe,
+            CanonicalVarKind::Region(ui) => ui,
+            CanonicalVarKind::PlaceholderRegion(placeholder) => placeholder.universe,
+            CanonicalVarKind::Const(ui) => ui,
+            CanonicalVarKind::PlaceholderConst(placeholder) => placeholder.universe,
+        }
+    }
+}
+
+/// Rust actually has more than one category of type variables;
+/// notably, the type variables we create for literals (e.g., 22 or
+/// 22.) can only be instantiated with integral/float types (e.g.,
+/// usize or f32). In order to faithfully reproduce a type, we need to
+/// know what set of types a given type variable can be unified with.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable, HashStable)]
+pub enum CanonicalTyVarKind {
+    /// General type variable `?T` that can be unified with arbitrary types.
+    General(ty::UniverseIndex),
+
+    /// Integral type variable `?I` (that can only be unified with integral types).
+    Int,
+
+    /// Floating-point type variable `?F` (that can only be unified with float types).
+    Float,
+}
+
+/// After we execute a query with a canonicalized key, we get back a
+/// `Canonical<QueryResponse<..>>`. You can use
+/// `instantiate_query_result` to access the data in this result.
+#[derive(Clone, Debug, HashStable, TypeFoldable, Lift)]
+pub struct QueryResponse<'tcx, R> {
+    pub var_values: CanonicalVarValues<'tcx>,
+    pub region_constraints: QueryRegionConstraints<'tcx>,
+    pub certainty: Certainty,
+    pub value: R,
+}
+
+#[derive(Clone, Debug, Default, HashStable, TypeFoldable, Lift)]
+pub struct QueryRegionConstraints<'tcx> {
+    pub outlives: Vec<QueryOutlivesConstraint<'tcx>>,
+    pub member_constraints: Vec<MemberConstraint<'tcx>>,
+}
+
+impl QueryRegionConstraints<'_> {
+    /// Represents an empty (trivially true) set of region
+    /// constraints.
+    pub fn is_empty(&self) -> bool {
+        self.outlives.is_empty() && self.member_constraints.is_empty()
+    }
+}
+
+pub type Canonicalized<'tcx, V> = Canonical<'tcx, V>;
+
+pub type CanonicalizedQueryResponse<'tcx, T> = &'tcx Canonical<'tcx, QueryResponse<'tcx, T>>;
+
+/// Indicates whether or not we were able to prove the query to be
+/// true.
+#[derive(Copy, Clone, Debug, HashStable)]
+pub enum Certainty {
+    /// The query is known to be true, presuming that you apply the
+    /// given `var_values` and the region-constraints are satisfied.
+    Proven,
+
+    /// The query is not known to be true, but also not known to be
+    /// false. The `var_values` represent *either* values that must
+    /// hold in order for the query to be true, or helpful tips that
+    /// *might* make it true. Currently rustc's trait solver cannot
+    /// distinguish the two (e.g., due to our preference for where
+    /// clauses over impls).
+    ///
+    /// After some unifiations and things have been done, it makes
+    /// sense to try and prove again -- of course, at that point, the
+    /// canonical form will be different, making this a distinct
+    /// query.
+    Ambiguous,
+}
+
+impl Certainty {
+    pub fn is_proven(&self) -> bool {
+        match self {
+            Certainty::Proven => true,
+            Certainty::Ambiguous => false,
+        }
+    }
+
+    pub fn is_ambiguous(&self) -> bool {
+        !self.is_proven()
+    }
+}
+
+impl<'tcx, R> QueryResponse<'tcx, R> {
+    pub fn is_proven(&self) -> bool {
+        self.certainty.is_proven()
+    }
+
+    pub fn is_ambiguous(&self) -> bool {
+        !self.is_proven()
+    }
+}
+
+impl<'tcx, R> Canonical<'tcx, QueryResponse<'tcx, R>> {
+    pub fn is_proven(&self) -> bool {
+        self.value.is_proven()
+    }
+
+    pub fn is_ambiguous(&self) -> bool {
+        !self.is_proven()
+    }
+}
+
+impl<'tcx, V> Canonical<'tcx, V> {
+    /// Allows you to map the `value` of a canonical while keeping the
+    /// same set of bound variables.
+    ///
+    /// **WARNING:** This function is very easy to mis-use, hence the
+    /// name!  In particular, the new value `W` must use all **the
+    /// same type/region variables** in **precisely the same order**
+    /// as the original! (The ordering is defined by the
+    /// `TypeFoldable` implementation of the type in question.)
+    ///
+    /// An example of a **correct** use of this:
+    ///
+    /// ```rust,ignore (not real code)
+    /// let a: Canonical<'_, T> = ...;
+    /// let b: Canonical<'_, (T,)> = a.unchecked_map(|v| (v, ));
+    /// ```
+    ///
+    /// An example of an **incorrect** use of this:
+    ///
+    /// ```rust,ignore (not real code)
+    /// let a: Canonical<'tcx, T> = ...;
+    /// let ty: Ty<'tcx> = ...;
+    /// let b: Canonical<'tcx, (T, Ty<'tcx>)> = a.unchecked_map(|v| (v, ty));
+    /// ```
+    pub fn unchecked_map<W>(self, map_op: impl FnOnce(V) -> W) -> Canonical<'tcx, W> {
+        let Canonical { max_universe, variables, value } = self;
+        Canonical { max_universe, variables, value: map_op(value) }
+    }
+}
+
+pub type QueryOutlivesConstraint<'tcx> =
+    ty::Binder<ty::OutlivesPredicate<GenericArg<'tcx>, Region<'tcx>>>;
+
+CloneTypeFoldableAndLiftImpls! {
+    crate::infer::canonical::Certainty,
+    crate::infer::canonical::CanonicalVarInfo,
+    crate::infer::canonical::CanonicalVarKind,
+}
+
+CloneTypeFoldableImpls! {
+    for <'tcx> {
+        crate::infer::canonical::CanonicalVarInfos<'tcx>,
+    }
+}
+
+impl<'tcx> CanonicalVarValues<'tcx> {
+    pub fn len(&self) -> usize {
+        self.var_values.len()
+    }
+
+    /// Makes an identity substitution from this one: each bound var
+    /// is matched to the same bound var, preserving the original kinds.
+    /// For example, if we have:
+    /// `self.var_values == [Type(u32), Lifetime('a), Type(u64)]`
+    /// we'll return a substitution `subst` with:
+    /// `subst.var_values == [Type(^0), Lifetime(^1), Type(^2)]`.
+    pub fn make_identity(&self, tcx: TyCtxt<'tcx>) -> Self {
+        use crate::ty::subst::GenericArgKind;
+
+        CanonicalVarValues {
+            var_values: self
+                .var_values
+                .iter()
+                .zip(0..)
+                .map(|(kind, i)| match kind.unpack() {
+                    GenericArgKind::Type(..) => {
+                        tcx.mk_ty(ty::Bound(ty::INNERMOST, ty::BoundVar::from_u32(i).into())).into()
+                    }
+                    GenericArgKind::Lifetime(..) => tcx
+                        .mk_region(ty::ReLateBound(ty::INNERMOST, ty::BoundRegion::BrAnon(i)))
+                        .into(),
+                    GenericArgKind::Const(ct) => tcx
+                        .mk_const(ty::Const {
+                            ty: ct.ty,
+                            val: ty::ConstKind::Bound(ty::INNERMOST, ty::BoundVar::from_u32(i)),
+                        })
+                        .into(),
+                })
+                .collect(),
+        }
+    }
+}
+
+impl<'a, 'tcx> IntoIterator for &'a CanonicalVarValues<'tcx> {
+    type Item = GenericArg<'tcx>;
+    type IntoIter = ::std::iter::Cloned<::std::slice::Iter<'a, GenericArg<'tcx>>>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.var_values.iter().cloned()
+    }
+}
+
+impl<'tcx> Index<BoundVar> for CanonicalVarValues<'tcx> {
+    type Output = GenericArg<'tcx>;
+
+    fn index(&self, value: BoundVar) -> &GenericArg<'tcx> {
+        &self.var_values[value]
+    }
+}
diff --git a/src/librustc/infer/canonical/mod.rs b/src/librustc/infer/canonical/mod.rs
deleted file mode 100644
index a588d3d028..0000000000
--- a/src/librustc/infer/canonical/mod.rs
+++ /dev/null
@@ -1,493 +0,0 @@
-//! **Canonicalization** is the key to constructing a query in the
-//! middle of type inference. Ordinarily, it is not possible to store
-//! types from type inference in query keys, because they contain
-//! references to inference variables whose lifetimes are too short
-//! and so forth. Canonicalizing a value T1 using `canonicalize_query`
-//! produces two things:
-//!
-//! - a value T2 where each unbound inference variable has been
-//!   replaced with a **canonical variable**;
-//! - a map M (of type `CanonicalVarValues`) from those canonical
-//!   variables back to the original.
-//!
-//! We can then do queries using T2. These will give back constraints
-//! on the canonical variables which can be translated, using the map
-//! M, into constraints in our source context. This process of
-//! translating the results back is done by the
-//! `instantiate_query_result` method.
-//!
-//! For a more detailed look at what is happening here, check
-//! out the [chapter in the rustc guide][c].
-//!
-//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
-
-use crate::infer::region_constraints::MemberConstraint;
-use crate::infer::{ConstVariableOrigin, ConstVariableOriginKind};
-use crate::infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin, TypeVariableOriginKind};
-use crate::ty::fold::TypeFoldable;
-use crate::ty::subst::GenericArg;
-use crate::ty::{self, BoundVar, List, Region, TyCtxt};
-use rustc_index::vec::IndexVec;
-use rustc_macros::HashStable;
-use rustc_serialize::UseSpecializedDecodable;
-use rustc_span::source_map::Span;
-use smallvec::SmallVec;
-use std::ops::Index;
-
-mod canonicalizer;
-
-pub mod query_response;
-
-mod substitute;
-
-/// A "canonicalized" type `V` is one where all free inference
-/// variables have been rewritten to "canonical vars". These are
-/// numbered starting from 0 in order of first appearance.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable)]
-#[derive(HashStable, TypeFoldable, Lift)]
-pub struct Canonical<'tcx, V> {
-    pub max_universe: ty::UniverseIndex,
-    pub variables: CanonicalVarInfos<'tcx>,
-    pub value: V,
-}
-
-pub type CanonicalVarInfos<'tcx> = &'tcx List<CanonicalVarInfo>;
-
-impl<'tcx> UseSpecializedDecodable for CanonicalVarInfos<'tcx> {}
-
-/// A set of values corresponding to the canonical variables from some
-/// `Canonical`. You can give these values to
-/// `canonical_value.substitute` to substitute them into the canonical
-/// value at the right places.
-///
-/// When you canonicalize a value `V`, you get back one of these
-/// vectors with the original values that were replaced by canonical
-/// variables. You will need to supply it later to instantiate the
-/// canonicalized query response.
-#[derive(Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable)]
-#[derive(HashStable, TypeFoldable, Lift)]
-pub struct CanonicalVarValues<'tcx> {
-    pub var_values: IndexVec<BoundVar, GenericArg<'tcx>>,
-}
-
-/// When we canonicalize a value to form a query, we wind up replacing
-/// various parts of it with canonical variables. This struct stores
-/// those replaced bits to remember for when we process the query
-/// result.
-#[derive(Clone, Debug)]
-pub struct OriginalQueryValues<'tcx> {
-    /// Map from the universes that appear in the query to the
-    /// universes in the caller context. For the time being, we only
-    /// ever put ROOT values into the query, so this map is very
-    /// simple.
-    pub universe_map: SmallVec<[ty::UniverseIndex; 4]>,
-
-    /// This is equivalent to `CanonicalVarValues`, but using a
-    /// `SmallVec` yields a significant performance win.
-    pub var_values: SmallVec<[GenericArg<'tcx>; 8]>,
-}
-
-impl Default for OriginalQueryValues<'tcx> {
-    fn default() -> Self {
-        let mut universe_map = SmallVec::default();
-        universe_map.push(ty::UniverseIndex::ROOT);
-
-        Self { universe_map, var_values: SmallVec::default() }
-    }
-}
-
-/// Information about a canonical variable that is included with the
-/// canonical value. This is sufficient information for code to create
-/// a copy of the canonical value in some other inference context,
-/// with fresh inference variables replacing the canonical values.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable, HashStable)]
-pub struct CanonicalVarInfo {
-    pub kind: CanonicalVarKind,
-}
-
-impl CanonicalVarInfo {
-    pub fn universe(&self) -> ty::UniverseIndex {
-        self.kind.universe()
-    }
-
-    pub fn is_existential(&self) -> bool {
-        match self.kind {
-            CanonicalVarKind::Ty(_) => true,
-            CanonicalVarKind::PlaceholderTy(_) => false,
-            CanonicalVarKind::Region(_) => true,
-            CanonicalVarKind::PlaceholderRegion(..) => false,
-            CanonicalVarKind::Const(_) => true,
-            CanonicalVarKind::PlaceholderConst(_) => false,
-        }
-    }
-}
-
-/// Describes the "kind" of the canonical variable. This is a "kind"
-/// in the type-theory sense of the term -- i.e., a "meta" type system
-/// that analyzes type-like values.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable, HashStable)]
-pub enum CanonicalVarKind {
-    /// Some kind of type inference variable.
-    Ty(CanonicalTyVarKind),
-
-    /// A "placeholder" that represents "any type".
-    PlaceholderTy(ty::PlaceholderType),
-
-    /// Region variable `'?R`.
-    Region(ty::UniverseIndex),
-
-    /// A "placeholder" that represents "any region". Created when you
-    /// are solving a goal like `for<'a> T: Foo<'a>` to represent the
-    /// bound region `'a`.
-    PlaceholderRegion(ty::PlaceholderRegion),
-
-    /// Some kind of const inference variable.
-    Const(ty::UniverseIndex),
-
-    /// A "placeholder" that represents "any const".
-    PlaceholderConst(ty::PlaceholderConst),
-}
-
-impl CanonicalVarKind {
-    pub fn universe(self) -> ty::UniverseIndex {
-        match self {
-            CanonicalVarKind::Ty(kind) => match kind {
-                CanonicalTyVarKind::General(ui) => ui,
-                CanonicalTyVarKind::Float | CanonicalTyVarKind::Int => ty::UniverseIndex::ROOT,
-            },
-
-            CanonicalVarKind::PlaceholderTy(placeholder) => placeholder.universe,
-            CanonicalVarKind::Region(ui) => ui,
-            CanonicalVarKind::PlaceholderRegion(placeholder) => placeholder.universe,
-            CanonicalVarKind::Const(ui) => ui,
-            CanonicalVarKind::PlaceholderConst(placeholder) => placeholder.universe,
-        }
-    }
-}
-
-/// Rust actually has more than one category of type variables;
-/// notably, the type variables we create for literals (e.g., 22 or
-/// 22.) can only be instantiated with integral/float types (e.g.,
-/// usize or f32). In order to faithfully reproduce a type, we need to
-/// know what set of types a given type variable can be unified with.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, RustcDecodable, RustcEncodable, HashStable)]
-pub enum CanonicalTyVarKind {
-    /// General type variable `?T` that can be unified with arbitrary types.
-    General(ty::UniverseIndex),
-
-    /// Integral type variable `?I` (that can only be unified with integral types).
-    Int,
-
-    /// Floating-point type variable `?F` (that can only be unified with float types).
-    Float,
-}
-
-/// After we execute a query with a canonicalized key, we get back a
-/// `Canonical<QueryResponse<..>>`. You can use
-/// `instantiate_query_result` to access the data in this result.
-#[derive(Clone, Debug, HashStable, TypeFoldable, Lift)]
-pub struct QueryResponse<'tcx, R> {
-    pub var_values: CanonicalVarValues<'tcx>,
-    pub region_constraints: QueryRegionConstraints<'tcx>,
-    pub certainty: Certainty,
-    pub value: R,
-}
-
-#[derive(Clone, Debug, Default, HashStable, TypeFoldable, Lift)]
-pub struct QueryRegionConstraints<'tcx> {
-    pub outlives: Vec<QueryOutlivesConstraint<'tcx>>,
-    pub member_constraints: Vec<MemberConstraint<'tcx>>,
-}
-
-impl QueryRegionConstraints<'_> {
-    /// Represents an empty (trivially true) set of region
-    /// constraints.
-    pub fn is_empty(&self) -> bool {
-        self.outlives.is_empty() && self.member_constraints.is_empty()
-    }
-}
-
-pub type Canonicalized<'tcx, V> = Canonical<'tcx, V>;
-
-pub type CanonicalizedQueryResponse<'tcx, T> = &'tcx Canonical<'tcx, QueryResponse<'tcx, T>>;
-
-/// Indicates whether or not we were able to prove the query to be
-/// true.
-#[derive(Copy, Clone, Debug, HashStable)]
-pub enum Certainty {
-    /// The query is known to be true, presuming that you apply the
-    /// given `var_values` and the region-constraints are satisfied.
-    Proven,
-
-    /// The query is not known to be true, but also not known to be
-    /// false. The `var_values` represent *either* values that must
-    /// hold in order for the query to be true, or helpful tips that
-    /// *might* make it true. Currently rustc's trait solver cannot
-    /// distinguish the two (e.g., due to our preference for where
-    /// clauses over impls).
-    ///
-    /// After some unifiations and things have been done, it makes
-    /// sense to try and prove again -- of course, at that point, the
-    /// canonical form will be different, making this a distinct
-    /// query.
-    Ambiguous,
-}
-
-impl Certainty {
-    pub fn is_proven(&self) -> bool {
-        match self {
-            Certainty::Proven => true,
-            Certainty::Ambiguous => false,
-        }
-    }
-
-    pub fn is_ambiguous(&self) -> bool {
-        !self.is_proven()
-    }
-}
-
-impl<'tcx, R> QueryResponse<'tcx, R> {
-    pub fn is_proven(&self) -> bool {
-        self.certainty.is_proven()
-    }
-
-    pub fn is_ambiguous(&self) -> bool {
-        !self.is_proven()
-    }
-}
-
-impl<'tcx, R> Canonical<'tcx, QueryResponse<'tcx, R>> {
-    pub fn is_proven(&self) -> bool {
-        self.value.is_proven()
-    }
-
-    pub fn is_ambiguous(&self) -> bool {
-        !self.is_proven()
-    }
-}
-
-impl<'tcx, V> Canonical<'tcx, V> {
-    /// Allows you to map the `value` of a canonical while keeping the
-    /// same set of bound variables.
-    ///
-    /// **WARNING:** This function is very easy to mis-use, hence the
-    /// name!  In particular, the new value `W` must use all **the
-    /// same type/region variables** in **precisely the same order**
-    /// as the original! (The ordering is defined by the
-    /// `TypeFoldable` implementation of the type in question.)
-    ///
-    /// An example of a **correct** use of this:
-    ///
-    /// ```rust,ignore (not real code)
-    /// let a: Canonical<'_, T> = ...;
-    /// let b: Canonical<'_, (T,)> = a.unchecked_map(|v| (v, ));
-    /// ```
-    ///
-    /// An example of an **incorrect** use of this:
-    ///
-    /// ```rust,ignore (not real code)
-    /// let a: Canonical<'tcx, T> = ...;
-    /// let ty: Ty<'tcx> = ...;
-    /// let b: Canonical<'tcx, (T, Ty<'tcx>)> = a.unchecked_map(|v| (v, ty));
-    /// ```
-    pub fn unchecked_map<W>(self, map_op: impl FnOnce(V) -> W) -> Canonical<'tcx, W> {
-        let Canonical { max_universe, variables, value } = self;
-        Canonical { max_universe, variables, value: map_op(value) }
-    }
-}
-
-pub type QueryOutlivesConstraint<'tcx> =
-    ty::Binder<ty::OutlivesPredicate<GenericArg<'tcx>, Region<'tcx>>>;
-
-impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
-    /// Creates a substitution S for the canonical value with fresh
-    /// inference variables and applies it to the canonical value.
-    /// Returns both the instantiated result *and* the substitution S.
-    ///
-    /// This is only meant to be invoked as part of constructing an
-    /// inference context at the start of a query (see
-    /// `InferCtxtBuilder::enter_with_canonical`). It basically
-    /// brings the canonical value "into scope" within your new infcx.
-    ///
-    /// At the end of processing, the substitution S (once
-    /// canonicalized) then represents the values that you computed
-    /// for each of the canonical inputs to your query.
-
-    pub fn instantiate_canonical_with_fresh_inference_vars<T>(
-        &self,
-        span: Span,
-        canonical: &Canonical<'tcx, T>,
-    ) -> (T, CanonicalVarValues<'tcx>)
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        // For each universe that is referred to in the incoming
-        // query, create a universe in our local inference context. In
-        // practice, as of this writing, all queries have no universes
-        // in them, so this code has no effect, but it is looking
-        // forward to the day when we *do* want to carry universes
-        // through into queries.
-        let universes: IndexVec<ty::UniverseIndex, _> = std::iter::once(ty::UniverseIndex::ROOT)
-            .chain((0..canonical.max_universe.as_u32()).map(|_| self.create_next_universe()))
-            .collect();
-
-        let canonical_inference_vars =
-            self.instantiate_canonical_vars(span, canonical.variables, |ui| universes[ui]);
-        let result = canonical.substitute(self.tcx, &canonical_inference_vars);
-        (result, canonical_inference_vars)
-    }
-
-    /// Given the "infos" about the canonical variables from some
-    /// canonical, creates fresh variables with the same
-    /// characteristics (see `instantiate_canonical_var` for
-    /// details). You can then use `substitute` to instantiate the
-    /// canonical variable with these inference variables.
-    fn instantiate_canonical_vars(
-        &self,
-        span: Span,
-        variables: &List<CanonicalVarInfo>,
-        universe_map: impl Fn(ty::UniverseIndex) -> ty::UniverseIndex,
-    ) -> CanonicalVarValues<'tcx> {
-        let var_values: IndexVec<BoundVar, GenericArg<'tcx>> = variables
-            .iter()
-            .map(|info| self.instantiate_canonical_var(span, *info, &universe_map))
-            .collect();
-
-        CanonicalVarValues { var_values }
-    }
-
-    /// Given the "info" about a canonical variable, creates a fresh
-    /// variable for it. If this is an existentially quantified
-    /// variable, then you'll get a new inference variable; if it is a
-    /// universally quantified variable, you get a placeholder.
-    fn instantiate_canonical_var(
-        &self,
-        span: Span,
-        cv_info: CanonicalVarInfo,
-        universe_map: impl Fn(ty::UniverseIndex) -> ty::UniverseIndex,
-    ) -> GenericArg<'tcx> {
-        match cv_info.kind {
-            CanonicalVarKind::Ty(ty_kind) => {
-                let ty = match ty_kind {
-                    CanonicalTyVarKind::General(ui) => self.next_ty_var_in_universe(
-                        TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span },
-                        universe_map(ui),
-                    ),
-
-                    CanonicalTyVarKind::Int => self.next_int_var(),
-
-                    CanonicalTyVarKind::Float => self.next_float_var(),
-                };
-                ty.into()
-            }
-
-            CanonicalVarKind::PlaceholderTy(ty::PlaceholderType { universe, name }) => {
-                let universe_mapped = universe_map(universe);
-                let placeholder_mapped = ty::PlaceholderType { universe: universe_mapped, name };
-                self.tcx.mk_ty(ty::Placeholder(placeholder_mapped)).into()
-            }
-
-            CanonicalVarKind::Region(ui) => self
-                .next_region_var_in_universe(
-                    RegionVariableOrigin::MiscVariable(span),
-                    universe_map(ui),
-                )
-                .into(),
-
-            CanonicalVarKind::PlaceholderRegion(ty::PlaceholderRegion { universe, name }) => {
-                let universe_mapped = universe_map(universe);
-                let placeholder_mapped = ty::PlaceholderRegion { universe: universe_mapped, name };
-                self.tcx.mk_region(ty::RePlaceholder(placeholder_mapped)).into()
-            }
-
-            CanonicalVarKind::Const(ui) => self
-                .next_const_var_in_universe(
-                    self.next_ty_var_in_universe(
-                        TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span },
-                        universe_map(ui),
-                    ),
-                    ConstVariableOrigin { kind: ConstVariableOriginKind::MiscVariable, span },
-                    universe_map(ui),
-                )
-                .into(),
-
-            CanonicalVarKind::PlaceholderConst(ty::PlaceholderConst { universe, name }) => {
-                let universe_mapped = universe_map(universe);
-                let placeholder_mapped = ty::PlaceholderConst { universe: universe_mapped, name };
-                self.tcx
-                    .mk_const(ty::Const {
-                        val: ty::ConstKind::Placeholder(placeholder_mapped),
-                        ty: self.tcx.types.err, // FIXME(const_generics)
-                    })
-                    .into()
-            }
-        }
-    }
-}
-
-CloneTypeFoldableAndLiftImpls! {
-    crate::infer::canonical::Certainty,
-    crate::infer::canonical::CanonicalVarInfo,
-    crate::infer::canonical::CanonicalVarKind,
-}
-
-CloneTypeFoldableImpls! {
-    for <'tcx> {
-        crate::infer::canonical::CanonicalVarInfos<'tcx>,
-    }
-}
-
-impl<'tcx> CanonicalVarValues<'tcx> {
-    pub fn len(&self) -> usize {
-        self.var_values.len()
-    }
-
-    /// Makes an identity substitution from this one: each bound var
-    /// is matched to the same bound var, preserving the original kinds.
-    /// For example, if we have:
-    /// `self.var_values == [Type(u32), Lifetime('a), Type(u64)]`
-    /// we'll return a substitution `subst` with:
-    /// `subst.var_values == [Type(^0), Lifetime(^1), Type(^2)]`.
-    pub fn make_identity(&self, tcx: TyCtxt<'tcx>) -> Self {
-        use crate::ty::subst::GenericArgKind;
-
-        CanonicalVarValues {
-            var_values: self
-                .var_values
-                .iter()
-                .zip(0..)
-                .map(|(kind, i)| match kind.unpack() {
-                    GenericArgKind::Type(..) => {
-                        tcx.mk_ty(ty::Bound(ty::INNERMOST, ty::BoundVar::from_u32(i).into())).into()
-                    }
-                    GenericArgKind::Lifetime(..) => tcx
-                        .mk_region(ty::ReLateBound(ty::INNERMOST, ty::BoundRegion::BrAnon(i)))
-                        .into(),
-                    GenericArgKind::Const(ct) => tcx
-                        .mk_const(ty::Const {
-                            ty: ct.ty,
-                            val: ty::ConstKind::Bound(ty::INNERMOST, ty::BoundVar::from_u32(i)),
-                        })
-                        .into(),
-                })
-                .collect(),
-        }
-    }
-}
-
-impl<'a, 'tcx> IntoIterator for &'a CanonicalVarValues<'tcx> {
-    type Item = GenericArg<'tcx>;
-    type IntoIter = ::std::iter::Cloned<::std::slice::Iter<'a, GenericArg<'tcx>>>;
-
-    fn into_iter(self) -> Self::IntoIter {
-        self.var_values.iter().cloned()
-    }
-}
-
-impl<'tcx> Index<BoundVar> for CanonicalVarValues<'tcx> {
-    type Output = GenericArg<'tcx>;
-
-    fn index(&self, value: BoundVar) -> &GenericArg<'tcx> {
-        &self.var_values[value]
-    }
-}
diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs
deleted file mode 100644
index 58566bdcc3..0000000000
--- a/src/librustc/infer/error_reporting/mod.rs
+++ /dev/null
@@ -1,2070 +0,0 @@
-//! Error Reporting Code for the inference engine
-//!
-//! Because of the way inference, and in particular region inference,
-//! works, it often happens that errors are not detected until far after
-//! the relevant line of code has been type-checked. Therefore, there is
-//! an elaborate system to track why a particular constraint in the
-//! inference graph arose so that we can explain to the user what gave
-//! rise to a particular error.
-//!
-//! The basis of the system are the "origin" types. An "origin" is the
-//! reason that a constraint or inference variable arose. There are
-//! different "origin" enums for different kinds of constraints/variables
-//! (e.g., `TypeOrigin`, `RegionVariableOrigin`). An origin always has
-//! a span, but also more information so that we can generate a meaningful
-//! error message.
-//!
-//! Having a catalog of all the different reasons an error can arise is
-//! also useful for other reasons, like cross-referencing FAQs etc, though
-//! we are not really taking advantage of this yet.
-//!
-//! # Region Inference
-//!
-//! Region inference is particularly tricky because it always succeeds "in
-//! the moment" and simply registers a constraint. Then, at the end, we
-//! can compute the full graph and report errors, so we need to be able to
-//! store and later report what gave rise to the conflicting constraints.
-//!
-//! # Subtype Trace
-//!
-//! Determining whether `T1 <: T2` often involves a number of subtypes and
-//! subconstraints along the way. A "TypeTrace" is an extended version
-//! of an origin that traces the types and other values that were being
-//! compared. It is not necessarily comprehensive (in fact, at the time of
-//! this writing it only tracks the root values being compared) but I'd
-//! like to extend it to include significant "waypoints". For example, if
-//! you are comparing `(T1, T2) <: (T3, T4)`, and the problem is that `T2
-//! <: T4` fails, I'd like the trace to include enough information to say
-//! "in the 2nd element of the tuple". Similarly, failures when comparing
-//! arguments or return types in fn types should be able to cite the
-//! specific position, etc.
-//!
-//! # Reality vs plan
-//!
-//! Of course, there is still a LOT of code in typeck that has yet to be
-//! ported to this system, and which relies on string concatenation at the
-//! time of error detection.
-
-use super::lexical_region_resolve::RegionResolutionError;
-use super::region_constraints::GenericKind;
-use super::{InferCtxt, RegionVariableOrigin, SubregionOrigin, TypeTrace, ValuePairs};
-
-use crate::hir::map;
-use crate::infer::opaque_types;
-use crate::infer::{self, SuppressRegionErrors};
-use crate::middle::region;
-use crate::traits::error_reporting::report_object_safety_error;
-use crate::traits::object_safety_violations;
-use crate::traits::{
-    IfExpressionCause, MatchExpressionArmCause, ObligationCause, ObligationCauseCode,
-};
-use crate::ty::error::TypeError;
-use crate::ty::{
-    self,
-    subst::{Subst, SubstsRef},
-    Region, Ty, TyCtxt, TypeFoldable,
-};
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_errors::{pluralize, struct_span_err};
-use rustc_errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_hir::Node;
-use rustc_span::{DesugaringKind, Pos, Span};
-use rustc_target::spec::abi;
-use std::{cmp, fmt};
-
-mod note;
-
-mod need_type_info;
-pub use need_type_info::TypeAnnotationNeeded;
-
-pub mod nice_region_error;
-
-pub(super) fn note_and_explain_region(
-    tcx: TyCtxt<'tcx>,
-    region_scope_tree: &region::ScopeTree,
-    err: &mut DiagnosticBuilder<'_>,
-    prefix: &str,
-    region: ty::Region<'tcx>,
-    suffix: &str,
-) {
-    let (description, span) = match *region {
-        ty::ReScope(scope) => {
-            let new_string;
-            let unknown_scope =
-                || format!("{}unknown scope: {:?}{}.  Please report a bug.", prefix, scope, suffix);
-            let span = scope.span(tcx, region_scope_tree);
-            let tag = match tcx.hir().find(scope.hir_id(region_scope_tree)) {
-                Some(Node::Block(_)) => "block",
-                Some(Node::Expr(expr)) => match expr.kind {
-                    hir::ExprKind::Call(..) => "call",
-                    hir::ExprKind::MethodCall(..) => "method call",
-                    hir::ExprKind::Match(.., hir::MatchSource::IfLetDesugar { .. }) => "if let",
-                    hir::ExprKind::Match(.., hir::MatchSource::WhileLetDesugar) => "while let",
-                    hir::ExprKind::Match(.., hir::MatchSource::ForLoopDesugar) => "for",
-                    hir::ExprKind::Match(..) => "match",
-                    _ => "expression",
-                },
-                Some(Node::Stmt(_)) => "statement",
-                Some(Node::Item(it)) => item_scope_tag(&it),
-                Some(Node::TraitItem(it)) => trait_item_scope_tag(&it),
-                Some(Node::ImplItem(it)) => impl_item_scope_tag(&it),
-                Some(_) | None => {
-                    err.span_note(span, &unknown_scope());
-                    return;
-                }
-            };
-            let scope_decorated_tag = match scope.data {
-                region::ScopeData::Node => tag,
-                region::ScopeData::CallSite => "scope of call-site for function",
-                region::ScopeData::Arguments => "scope of function body",
-                region::ScopeData::Destruction => {
-                    new_string = format!("destruction scope surrounding {}", tag);
-                    &new_string[..]
-                }
-                region::ScopeData::Remainder(first_statement_index) => {
-                    new_string = format!(
-                        "block suffix following statement {}",
-                        first_statement_index.index()
-                    );
-                    &new_string[..]
-                }
-            };
-            explain_span(tcx, scope_decorated_tag, span)
-        }
-
-        ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReStatic => {
-            msg_span_from_free_region(tcx, region)
-        }
-
-        ty::ReEmpty => ("the empty lifetime".to_owned(), None),
-
-        ty::RePlaceholder(_) => (format!("any other region"), None),
-
-        // FIXME(#13998) RePlaceholder should probably print like
-        // ReFree rather than dumping Debug output on the user.
-        //
-        // We shouldn't really be having unification failures with ReVar
-        // and ReLateBound though.
-        ty::ReVar(_) | ty::ReLateBound(..) | ty::ReErased => {
-            (format!("lifetime {:?}", region), None)
-        }
-
-        // We shouldn't encounter an error message with ReClosureBound.
-        ty::ReClosureBound(..) => {
-            bug!("encountered unexpected ReClosureBound: {:?}", region,);
-        }
-    };
-
-    emit_msg_span(err, prefix, description, span, suffix);
-}
-
-pub(super) fn note_and_explain_free_region(
-    tcx: TyCtxt<'tcx>,
-    err: &mut DiagnosticBuilder<'_>,
-    prefix: &str,
-    region: ty::Region<'tcx>,
-    suffix: &str,
-) {
-    let (description, span) = msg_span_from_free_region(tcx, region);
-
-    emit_msg_span(err, prefix, description, span, suffix);
-}
-
-fn msg_span_from_free_region(
-    tcx: TyCtxt<'tcx>,
-    region: ty::Region<'tcx>,
-) -> (String, Option<Span>) {
-    match *region {
-        ty::ReEarlyBound(_) | ty::ReFree(_) => {
-            msg_span_from_early_bound_and_free_regions(tcx, region)
-        }
-        ty::ReStatic => ("the static lifetime".to_owned(), None),
-        ty::ReEmpty => ("an empty lifetime".to_owned(), None),
-        _ => bug!("{:?}", region),
-    }
-}
-
-fn msg_span_from_early_bound_and_free_regions(
-    tcx: TyCtxt<'tcx>,
-    region: ty::Region<'tcx>,
-) -> (String, Option<Span>) {
-    let cm = tcx.sess.source_map();
-
-    let scope = region.free_region_binding_scope(tcx);
-    let node = tcx.hir().as_local_hir_id(scope).unwrap_or(hir::DUMMY_HIR_ID);
-    let tag = match tcx.hir().find(node) {
-        Some(Node::Block(_)) | Some(Node::Expr(_)) => "body",
-        Some(Node::Item(it)) => item_scope_tag(&it),
-        Some(Node::TraitItem(it)) => trait_item_scope_tag(&it),
-        Some(Node::ImplItem(it)) => impl_item_scope_tag(&it),
-        _ => unreachable!(),
-    };
-    let (prefix, span) = match *region {
-        ty::ReEarlyBound(ref br) => {
-            let mut sp = cm.def_span(tcx.hir().span(node));
-            if let Some(param) =
-                tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(br.name))
-            {
-                sp = param.span;
-            }
-            (format!("the lifetime `{}` as defined on", br.name), sp)
-        }
-        ty::ReFree(ty::FreeRegion { bound_region: ty::BoundRegion::BrNamed(_, name), .. }) => {
-            let mut sp = cm.def_span(tcx.hir().span(node));
-            if let Some(param) =
-                tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(name))
-            {
-                sp = param.span;
-            }
-            (format!("the lifetime `{}` as defined on", name), sp)
-        }
-        ty::ReFree(ref fr) => match fr.bound_region {
-            ty::BrAnon(idx) => {
-                (format!("the anonymous lifetime #{} defined on", idx + 1), tcx.hir().span(node))
-            }
-            _ => (
-                format!("the lifetime `{}` as defined on", region),
-                cm.def_span(tcx.hir().span(node)),
-            ),
-        },
-        _ => bug!(),
-    };
-    let (msg, opt_span) = explain_span(tcx, tag, span);
-    (format!("{} {}", prefix, msg), opt_span)
-}
-
-fn emit_msg_span(
-    err: &mut DiagnosticBuilder<'_>,
-    prefix: &str,
-    description: String,
-    span: Option<Span>,
-    suffix: &str,
-) {
-    let message = format!("{}{}{}", prefix, description, suffix);
-
-    if let Some(span) = span {
-        err.span_note(span, &message);
-    } else {
-        err.note(&message);
-    }
-}
-
-fn item_scope_tag(item: &hir::Item<'_>) -> &'static str {
-    match item.kind {
-        hir::ItemKind::Impl { .. } => "impl",
-        hir::ItemKind::Struct(..) => "struct",
-        hir::ItemKind::Union(..) => "union",
-        hir::ItemKind::Enum(..) => "enum",
-        hir::ItemKind::Trait(..) => "trait",
-        hir::ItemKind::Fn(..) => "function body",
-        _ => "item",
-    }
-}
-
-fn trait_item_scope_tag(item: &hir::TraitItem<'_>) -> &'static str {
-    match item.kind {
-        hir::TraitItemKind::Method(..) => "method body",
-        hir::TraitItemKind::Const(..) | hir::TraitItemKind::Type(..) => "associated item",
-    }
-}
-
-fn impl_item_scope_tag(item: &hir::ImplItem<'_>) -> &'static str {
-    match item.kind {
-        hir::ImplItemKind::Method(..) => "method body",
-        hir::ImplItemKind::Const(..)
-        | hir::ImplItemKind::OpaqueTy(..)
-        | hir::ImplItemKind::TyAlias(..) => "associated item",
-    }
-}
-
-fn explain_span(tcx: TyCtxt<'tcx>, heading: &str, span: Span) -> (String, Option<Span>) {
-    let lo = tcx.sess.source_map().lookup_char_pos(span.lo());
-    (format!("the {} at {}:{}", heading, lo.line, lo.col.to_usize() + 1), Some(span))
-}
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    pub fn report_region_errors(
-        &self,
-        region_scope_tree: &region::ScopeTree,
-        errors: &Vec<RegionResolutionError<'tcx>>,
-        suppress: SuppressRegionErrors,
-    ) {
-        debug!(
-            "report_region_errors(): {} errors to start, suppress = {:?}",
-            errors.len(),
-            suppress
-        );
-
-        if suppress.suppressed() {
-            return;
-        }
-
-        // try to pre-process the errors, which will group some of them
-        // together into a `ProcessedErrors` group:
-        let errors = self.process_errors(errors);
-
-        debug!("report_region_errors: {} errors after preprocessing", errors.len());
-
-        for error in errors {
-            debug!("report_region_errors: error = {:?}", error);
-
-            if !self.try_report_nice_region_error(&error) {
-                match error.clone() {
-                    // These errors could indicate all manner of different
-                    // problems with many different solutions. Rather
-                    // than generate a "one size fits all" error, what we
-                    // attempt to do is go through a number of specific
-                    // scenarios and try to find the best way to present
-                    // the error. If all of these fails, we fall back to a rather
-                    // general bit of code that displays the error information
-                    RegionResolutionError::ConcreteFailure(origin, sub, sup) => {
-                        if sub.is_placeholder() || sup.is_placeholder() {
-                            self.report_placeholder_failure(region_scope_tree, origin, sub, sup)
-                                .emit();
-                        } else {
-                            self.report_concrete_failure(region_scope_tree, origin, sub, sup)
-                                .emit();
-                        }
-                    }
-
-                    RegionResolutionError::GenericBoundFailure(origin, param_ty, sub) => {
-                        self.report_generic_bound_failure(
-                            region_scope_tree,
-                            origin.span(),
-                            Some(origin),
-                            param_ty,
-                            sub,
-                        );
-                    }
-
-                    RegionResolutionError::SubSupConflict(
-                        _,
-                        var_origin,
-                        sub_origin,
-                        sub_r,
-                        sup_origin,
-                        sup_r,
-                    ) => {
-                        if sub_r.is_placeholder() {
-                            self.report_placeholder_failure(
-                                region_scope_tree,
-                                sub_origin,
-                                sub_r,
-                                sup_r,
-                            )
-                            .emit();
-                        } else if sup_r.is_placeholder() {
-                            self.report_placeholder_failure(
-                                region_scope_tree,
-                                sup_origin,
-                                sub_r,
-                                sup_r,
-                            )
-                            .emit();
-                        } else {
-                            self.report_sub_sup_conflict(
-                                region_scope_tree,
-                                var_origin,
-                                sub_origin,
-                                sub_r,
-                                sup_origin,
-                                sup_r,
-                            );
-                        }
-                    }
-
-                    RegionResolutionError::MemberConstraintFailure {
-                        opaque_type_def_id,
-                        hidden_ty,
-                        member_region,
-                        span: _,
-                        choice_regions: _,
-                    } => {
-                        let hidden_ty = self.resolve_vars_if_possible(&hidden_ty);
-                        opaque_types::unexpected_hidden_region_diagnostic(
-                            self.tcx,
-                            Some(region_scope_tree),
-                            opaque_type_def_id,
-                            hidden_ty,
-                            member_region,
-                        )
-                        .emit();
-                    }
-                }
-            }
-        }
-    }
-
-    // This method goes through all the errors and try to group certain types
-    // of error together, for the purpose of suggesting explicit lifetime
-    // parameters to the user. This is done so that we can have a more
-    // complete view of what lifetimes should be the same.
-    // If the return value is an empty vector, it means that processing
-    // failed (so the return value of this method should not be used).
-    //
-    // The method also attempts to weed out messages that seem like
-    // duplicates that will be unhelpful to the end-user. But
-    // obviously it never weeds out ALL errors.
-    fn process_errors(
-        &self,
-        errors: &Vec<RegionResolutionError<'tcx>>,
-    ) -> Vec<RegionResolutionError<'tcx>> {
-        debug!("process_errors()");
-
-        // We want to avoid reporting generic-bound failures if we can
-        // avoid it: these have a very high rate of being unhelpful in
-        // practice. This is because they are basically secondary
-        // checks that test the state of the region graph after the
-        // rest of inference is done, and the other kinds of errors
-        // indicate that the region constraint graph is internally
-        // inconsistent, so these test results are likely to be
-        // meaningless.
-        //
-        // Therefore, we filter them out of the list unless they are
-        // the only thing in the list.
-
-        let is_bound_failure = |e: &RegionResolutionError<'tcx>| match *e {
-            RegionResolutionError::GenericBoundFailure(..) => true,
-            RegionResolutionError::ConcreteFailure(..)
-            | RegionResolutionError::SubSupConflict(..)
-            | RegionResolutionError::MemberConstraintFailure { .. } => false,
-        };
-
-        let mut errors = if errors.iter().all(|e| is_bound_failure(e)) {
-            errors.clone()
-        } else {
-            errors.iter().filter(|&e| !is_bound_failure(e)).cloned().collect()
-        };
-
-        // sort the errors by span, for better error message stability.
-        errors.sort_by_key(|u| match *u {
-            RegionResolutionError::ConcreteFailure(ref sro, _, _) => sro.span(),
-            RegionResolutionError::GenericBoundFailure(ref sro, _, _) => sro.span(),
-            RegionResolutionError::SubSupConflict(_, ref rvo, _, _, _, _) => rvo.span(),
-            RegionResolutionError::MemberConstraintFailure { span, .. } => span,
-        });
-        errors
-    }
-
-    /// Adds a note if the types come from similarly named crates
-    fn check_and_note_conflicting_crates(
-        &self,
-        err: &mut DiagnosticBuilder<'_>,
-        terr: &TypeError<'tcx>,
-    ) {
-        use hir::def_id::CrateNum;
-        use map::DisambiguatedDefPathData;
-        use ty::print::Printer;
-        use ty::subst::GenericArg;
-
-        struct AbsolutePathPrinter<'tcx> {
-            tcx: TyCtxt<'tcx>,
-        }
-
-        struct NonTrivialPath;
-
-        impl<'tcx> Printer<'tcx> for AbsolutePathPrinter<'tcx> {
-            type Error = NonTrivialPath;
-
-            type Path = Vec<String>;
-            type Region = !;
-            type Type = !;
-            type DynExistential = !;
-            type Const = !;
-
-            fn tcx<'a>(&'a self) -> TyCtxt<'tcx> {
-                self.tcx
-            }
-
-            fn print_region(self, _region: ty::Region<'_>) -> Result<Self::Region, Self::Error> {
-                Err(NonTrivialPath)
-            }
-
-            fn print_type(self, _ty: Ty<'tcx>) -> Result<Self::Type, Self::Error> {
-                Err(NonTrivialPath)
-            }
-
-            fn print_dyn_existential(
-                self,
-                _predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
-            ) -> Result<Self::DynExistential, Self::Error> {
-                Err(NonTrivialPath)
-            }
-
-            fn print_const(self, _ct: &'tcx ty::Const<'tcx>) -> Result<Self::Const, Self::Error> {
-                Err(NonTrivialPath)
-            }
-
-            fn path_crate(self, cnum: CrateNum) -> Result<Self::Path, Self::Error> {
-                Ok(vec![self.tcx.original_crate_name(cnum).to_string()])
-            }
-            fn path_qualified(
-                self,
-                _self_ty: Ty<'tcx>,
-                _trait_ref: Option<ty::TraitRef<'tcx>>,
-            ) -> Result<Self::Path, Self::Error> {
-                Err(NonTrivialPath)
-            }
-
-            fn path_append_impl(
-                self,
-                _print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
-                _disambiguated_data: &DisambiguatedDefPathData,
-                _self_ty: Ty<'tcx>,
-                _trait_ref: Option<ty::TraitRef<'tcx>>,
-            ) -> Result<Self::Path, Self::Error> {
-                Err(NonTrivialPath)
-            }
-            fn path_append(
-                self,
-                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
-                disambiguated_data: &DisambiguatedDefPathData,
-            ) -> Result<Self::Path, Self::Error> {
-                let mut path = print_prefix(self)?;
-                path.push(disambiguated_data.data.as_symbol().to_string());
-                Ok(path)
-            }
-            fn path_generic_args(
-                self,
-                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
-                _args: &[GenericArg<'tcx>],
-            ) -> Result<Self::Path, Self::Error> {
-                print_prefix(self)
-            }
-        }
-
-        let report_path_match = |err: &mut DiagnosticBuilder<'_>, did1: DefId, did2: DefId| {
-            // Only external crates, if either is from a local
-            // module we could have false positives
-            if !(did1.is_local() || did2.is_local()) && did1.krate != did2.krate {
-                let abs_path =
-                    |def_id| AbsolutePathPrinter { tcx: self.tcx }.print_def_path(def_id, &[]);
-
-                // We compare strings because DefPath can be different
-                // for imported and non-imported crates
-                let same_path = || -> Result<_, NonTrivialPath> {
-                    Ok(self.tcx.def_path_str(did1) == self.tcx.def_path_str(did2)
-                        || abs_path(did1)? == abs_path(did2)?)
-                };
-                if same_path().unwrap_or(false) {
-                    let crate_name = self.tcx.crate_name(did1.krate);
-                    err.note(&format!(
-                        "perhaps two different versions of crate `{}` are being used?",
-                        crate_name
-                    ));
-                }
-            }
-        };
-        match *terr {
-            TypeError::Sorts(ref exp_found) => {
-                // if they are both "path types", there's a chance of ambiguity
-                // due to different versions of the same crate
-                if let (&ty::Adt(exp_adt, _), &ty::Adt(found_adt, _)) =
-                    (&exp_found.expected.kind, &exp_found.found.kind)
-                {
-                    report_path_match(err, exp_adt.did, found_adt.did);
-                }
-            }
-            TypeError::Traits(ref exp_found) => {
-                report_path_match(err, exp_found.expected, exp_found.found);
-            }
-            _ => (), // FIXME(#22750) handle traits and stuff
-        }
-    }
-
-    fn note_error_origin(
-        &self,
-        err: &mut DiagnosticBuilder<'tcx>,
-        cause: &ObligationCause<'tcx>,
-        exp_found: Option<ty::error::ExpectedFound<Ty<'tcx>>>,
-    ) {
-        match cause.code {
-            ObligationCauseCode::Pattern { origin_expr: true, span: Some(span), root_ty } => {
-                let ty = self.resolve_vars_if_possible(&root_ty);
-                if ty.is_suggestable() {
-                    // don't show type `_`
-                    err.span_label(span, format!("this expression has type `{}`", ty));
-                }
-                if let Some(ty::error::ExpectedFound { found, .. }) = exp_found {
-                    if ty.is_box() && ty.boxed_ty() == found {
-                        if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
-                            err.span_suggestion(
-                                span,
-                                "consider dereferencing the boxed value",
-                                format!("*{}", snippet),
-                                Applicability::MachineApplicable,
-                            );
-                        }
-                    }
-                }
-            }
-            ObligationCauseCode::Pattern { origin_expr: false, span: Some(span), .. } => {
-                err.span_label(span, "expected due to this");
-            }
-            ObligationCauseCode::MatchExpressionArm(box MatchExpressionArmCause {
-                source,
-                ref prior_arms,
-                last_ty,
-                scrut_hir_id,
-                ..
-            }) => match source {
-                hir::MatchSource::IfLetDesugar { .. } => {
-                    let msg = "`if let` arms have incompatible types";
-                    err.span_label(cause.span, msg);
-                }
-                hir::MatchSource::TryDesugar => {
-                    if let Some(ty::error::ExpectedFound { expected, .. }) = exp_found {
-                        let scrut_expr = self.tcx.hir().expect_expr(scrut_hir_id);
-                        let scrut_ty = if let hir::ExprKind::Call(_, args) = &scrut_expr.kind {
-                            let arg_expr = args.first().expect("try desugaring call w/out arg");
-                            self.in_progress_tables
-                                .and_then(|tables| tables.borrow().expr_ty_opt(arg_expr))
-                        } else {
-                            bug!("try desugaring w/out call expr as scrutinee");
-                        };
-
-                        match scrut_ty {
-                            Some(ty) if expected == ty => {
-                                let source_map = self.tcx.sess.source_map();
-                                err.span_suggestion(
-                                    source_map.end_point(cause.span),
-                                    "try removing this `?`",
-                                    "".to_string(),
-                                    Applicability::MachineApplicable,
-                                );
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-                _ => {
-                    // `last_ty` can be `!`, `expected` will have better info when present.
-                    let t = self.resolve_vars_if_possible(&match exp_found {
-                        Some(ty::error::ExpectedFound { expected, .. }) => expected,
-                        _ => last_ty,
-                    });
-                    let msg = "`match` arms have incompatible types";
-                    err.span_label(cause.span, msg);
-                    if prior_arms.len() <= 4 {
-                        for sp in prior_arms {
-                            err.span_label(*sp, format!("this is found to be of type `{}`", t));
-                        }
-                    } else if let Some(sp) = prior_arms.last() {
-                        err.span_label(
-                            *sp,
-                            format!("this and all prior arms are found to be of type `{}`", t),
-                        );
-                    }
-                }
-            },
-            ObligationCauseCode::IfExpression(box IfExpressionCause { then, outer, semicolon }) => {
-                err.span_label(then, "expected because of this");
-                outer.map(|sp| err.span_label(sp, "`if` and `else` have incompatible types"));
-                if let Some(sp) = semicolon {
-                    err.span_suggestion_short(
-                        sp,
-                        "consider removing this semicolon",
-                        String::new(),
-                        Applicability::MachineApplicable,
-                    );
-                }
-            }
-            _ => (),
-        }
-    }
-
-    /// Given that `other_ty` is the same as a type argument for `name` in `sub`, populate `value`
-    /// highlighting `name` and every type argument that isn't at `pos` (which is `other_ty`), and
-    /// populate `other_value` with `other_ty`.
-    ///
-    /// ```text
-    /// Foo<Bar<Qux>>
-    /// ^^^^--------^ this is highlighted
-    /// |   |
-    /// |   this type argument is exactly the same as the other type, not highlighted
-    /// this is highlighted
-    /// Bar<Qux>
-    /// -------- this type is the same as a type argument in the other type, not highlighted
-    /// ```
-    fn highlight_outer(
-        &self,
-        value: &mut DiagnosticStyledString,
-        other_value: &mut DiagnosticStyledString,
-        name: String,
-        sub: ty::subst::SubstsRef<'tcx>,
-        pos: usize,
-        other_ty: Ty<'tcx>,
-    ) {
-        // `value` and `other_value` hold two incomplete type representation for display.
-        // `name` is the path of both types being compared. `sub`
-        value.push_highlighted(name);
-        let len = sub.len();
-        if len > 0 {
-            value.push_highlighted("<");
-        }
-
-        // Output the lifetimes for the first type
-        let lifetimes = sub
-            .regions()
-            .map(|lifetime| {
-                let s = lifetime.to_string();
-                if s.is_empty() { "'_".to_string() } else { s }
-            })
-            .collect::<Vec<_>>()
-            .join(", ");
-        if !lifetimes.is_empty() {
-            if sub.regions().count() < len {
-                value.push_normal(lifetimes + &", ");
-            } else {
-                value.push_normal(lifetimes);
-            }
-        }
-
-        // Highlight all the type arguments that aren't at `pos` and compare the type argument at
-        // `pos` and `other_ty`.
-        for (i, type_arg) in sub.types().enumerate() {
-            if i == pos {
-                let values = self.cmp(type_arg, other_ty);
-                value.0.extend((values.0).0);
-                other_value.0.extend((values.1).0);
-            } else {
-                value.push_highlighted(type_arg.to_string());
-            }
-
-            if len > 0 && i != len - 1 {
-                value.push_normal(", ");
-            }
-        }
-        if len > 0 {
-            value.push_highlighted(">");
-        }
-    }
-
-    /// If `other_ty` is the same as a type argument present in `sub`, highlight `path` in `t1_out`,
-    /// as that is the difference to the other type.
-    ///
-    /// For the following code:
-    ///
-    /// ```norun
-    /// let x: Foo<Bar<Qux>> = foo::<Bar<Qux>>();
-    /// ```
-    ///
-    /// The type error output will behave in the following way:
-    ///
-    /// ```text
-    /// Foo<Bar<Qux>>
-    /// ^^^^--------^ this is highlighted
-    /// |   |
-    /// |   this type argument is exactly the same as the other type, not highlighted
-    /// this is highlighted
-    /// Bar<Qux>
-    /// -------- this type is the same as a type argument in the other type, not highlighted
-    /// ```
-    fn cmp_type_arg(
-        &self,
-        mut t1_out: &mut DiagnosticStyledString,
-        mut t2_out: &mut DiagnosticStyledString,
-        path: String,
-        sub: ty::subst::SubstsRef<'tcx>,
-        other_path: String,
-        other_ty: Ty<'tcx>,
-    ) -> Option<()> {
-        for (i, ta) in sub.types().enumerate() {
-            if ta == other_ty {
-                self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);
-                return Some(());
-            }
-            if let &ty::Adt(def, _) = &ta.kind {
-                let path_ = self.tcx.def_path_str(def.did.clone());
-                if path_ == other_path {
-                    self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);
-                    return Some(());
-                }
-            }
-        }
-        None
-    }
-
-    /// Adds a `,` to the type representation only if it is appropriate.
-    fn push_comma(
-        &self,
-        value: &mut DiagnosticStyledString,
-        other_value: &mut DiagnosticStyledString,
-        len: usize,
-        pos: usize,
-    ) {
-        if len > 0 && pos != len - 1 {
-            value.push_normal(", ");
-            other_value.push_normal(", ");
-        }
-    }
-
-    /// For generic types with parameters with defaults, remove the parameters corresponding to
-    /// the defaults. This repeats a lot of the logic found in `ty::print::pretty`.
-    fn strip_generic_default_params(
-        &self,
-        def_id: DefId,
-        substs: ty::subst::SubstsRef<'tcx>,
-    ) -> SubstsRef<'tcx> {
-        let generics = self.tcx.generics_of(def_id);
-        let mut num_supplied_defaults = 0;
-        let mut type_params = generics
-            .params
-            .iter()
-            .rev()
-            .filter_map(|param| match param.kind {
-                ty::GenericParamDefKind::Lifetime => None,
-                ty::GenericParamDefKind::Type { has_default, .. } => {
-                    Some((param.def_id, has_default))
-                }
-                ty::GenericParamDefKind::Const => None, // FIXME(const_generics:defaults)
-            })
-            .peekable();
-        let has_default = {
-            let has_default = type_params.peek().map(|(_, has_default)| has_default);
-            *has_default.unwrap_or(&false)
-        };
-        if has_default {
-            let types = substs.types().rev();
-            for ((def_id, has_default), actual) in type_params.zip(types) {
-                if !has_default {
-                    break;
-                }
-                if self.tcx.type_of(def_id).subst(self.tcx, substs) != actual {
-                    break;
-                }
-                num_supplied_defaults += 1;
-            }
-        }
-        let len = generics.params.len();
-        let mut generics = generics.clone();
-        generics.params.truncate(len - num_supplied_defaults);
-        substs.truncate_to(self.tcx, &generics)
-    }
-
-    /// Given two `fn` signatures highlight only sub-parts that are different.
-    fn cmp_fn_sig(
-        &self,
-        sig1: &ty::PolyFnSig<'tcx>,
-        sig2: &ty::PolyFnSig<'tcx>,
-    ) -> (DiagnosticStyledString, DiagnosticStyledString) {
-        let get_lifetimes = |sig| {
-            use rustc_hir::def::Namespace;
-            let mut s = String::new();
-            let (_, (sig, reg)) = ty::print::FmtPrinter::new(self.tcx, &mut s, Namespace::TypeNS)
-                .name_all_regions(sig)
-                .unwrap();
-            let lts: Vec<String> = reg.into_iter().map(|(_, kind)| kind.to_string()).collect();
-            (if lts.is_empty() { String::new() } else { format!("for<{}> ", lts.join(", ")) }, sig)
-        };
-
-        let (lt1, sig1) = get_lifetimes(sig1);
-        let (lt2, sig2) = get_lifetimes(sig2);
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        let mut values = (
-            DiagnosticStyledString::normal("".to_string()),
-            DiagnosticStyledString::normal("".to_string()),
-        );
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        // ^^^^^^
-        values.0.push(sig1.unsafety.prefix_str(), sig1.unsafety != sig2.unsafety);
-        values.1.push(sig2.unsafety.prefix_str(), sig1.unsafety != sig2.unsafety);
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        //        ^^^^^^^^^^
-        if sig1.abi != abi::Abi::Rust {
-            values.0.push(format!("extern {} ", sig1.abi), sig1.abi != sig2.abi);
-        }
-        if sig2.abi != abi::Abi::Rust {
-            values.1.push(format!("extern {} ", sig2.abi), sig1.abi != sig2.abi);
-        }
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        //                   ^^^^^^^^
-        let lifetime_diff = lt1 != lt2;
-        values.0.push(lt1, lifetime_diff);
-        values.1.push(lt2, lifetime_diff);
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        //                           ^^^
-        values.0.push_normal("fn(");
-        values.1.push_normal("fn(");
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        //                              ^^^^^
-        let len1 = sig1.inputs().len();
-        let len2 = sig2.inputs().len();
-        if len1 == len2 {
-            for (i, (l, r)) in sig1.inputs().iter().zip(sig2.inputs().iter()).enumerate() {
-                let (x1, x2) = self.cmp(l, r);
-                (values.0).0.extend(x1.0);
-                (values.1).0.extend(x2.0);
-                self.push_comma(&mut values.0, &mut values.1, len1, i);
-            }
-        } else {
-            for (i, l) in sig1.inputs().iter().enumerate() {
-                values.0.push_highlighted(l.to_string());
-                if i != len1 - 1 {
-                    values.0.push_highlighted(", ");
-                }
-            }
-            for (i, r) in sig2.inputs().iter().enumerate() {
-                values.1.push_highlighted(r.to_string());
-                if i != len2 - 1 {
-                    values.1.push_highlighted(", ");
-                }
-            }
-        }
-
-        if sig1.c_variadic {
-            if len1 > 0 {
-                values.0.push_normal(", ");
-            }
-            values.0.push("...", !sig2.c_variadic);
-        }
-        if sig2.c_variadic {
-            if len2 > 0 {
-                values.1.push_normal(", ");
-            }
-            values.1.push("...", !sig1.c_variadic);
-        }
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        //                                   ^
-        values.0.push_normal(")");
-        values.1.push_normal(")");
-
-        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
-        //                                     ^^^^^^^^
-        let output1 = sig1.output();
-        let output2 = sig2.output();
-        let (x1, x2) = self.cmp(output1, output2);
-        if !output1.is_unit() {
-            values.0.push_normal(" -> ");
-            (values.0).0.extend(x1.0);
-        }
-        if !output2.is_unit() {
-            values.1.push_normal(" -> ");
-            (values.1).0.extend(x2.0);
-        }
-        values
-    }
-
-    /// Compares two given types, eliding parts that are the same between them and highlighting
-    /// relevant differences, and return two representation of those types for highlighted printing.
-    fn cmp(&self, t1: Ty<'tcx>, t2: Ty<'tcx>) -> (DiagnosticStyledString, DiagnosticStyledString) {
-        debug!("cmp(t1={}, t1.kind={:?}, t2={}, t2.kind={:?})", t1, t1.kind, t2, t2.kind);
-
-        // helper functions
-        fn equals<'tcx>(a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
-            match (&a.kind, &b.kind) {
-                (a, b) if *a == *b => true,
-                (&ty::Int(_), &ty::Infer(ty::InferTy::IntVar(_)))
-                | (&ty::Infer(ty::InferTy::IntVar(_)), &ty::Int(_))
-                | (&ty::Infer(ty::InferTy::IntVar(_)), &ty::Infer(ty::InferTy::IntVar(_)))
-                | (&ty::Float(_), &ty::Infer(ty::InferTy::FloatVar(_)))
-                | (&ty::Infer(ty::InferTy::FloatVar(_)), &ty::Float(_))
-                | (&ty::Infer(ty::InferTy::FloatVar(_)), &ty::Infer(ty::InferTy::FloatVar(_))) => {
-                    true
-                }
-                _ => false,
-            }
-        }
-
-        fn push_ty_ref<'tcx>(
-            r: &ty::Region<'tcx>,
-            ty: Ty<'tcx>,
-            mutbl: hir::Mutability,
-            s: &mut DiagnosticStyledString,
-        ) {
-            let mut r = r.to_string();
-            if r == "'_" {
-                r.clear();
-            } else {
-                r.push(' ');
-            }
-            s.push_highlighted(format!("&{}{}", r, mutbl.prefix_str()));
-            s.push_normal(ty.to_string());
-        }
-
-        // process starts here
-        match (&t1.kind, &t2.kind) {
-            (&ty::Adt(def1, sub1), &ty::Adt(def2, sub2)) => {
-                let sub_no_defaults_1 = self.strip_generic_default_params(def1.did, sub1);
-                let sub_no_defaults_2 = self.strip_generic_default_params(def2.did, sub2);
-                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
-                let path1 = self.tcx.def_path_str(def1.did.clone());
-                let path2 = self.tcx.def_path_str(def2.did.clone());
-                if def1.did == def2.did {
-                    // Easy case. Replace same types with `_` to shorten the output and highlight
-                    // the differing ones.
-                    //     let x: Foo<Bar, Qux> = y::<Foo<Quz, Qux>>();
-                    //     Foo<Bar, _>
-                    //     Foo<Quz, _>
-                    //         ---  ^ type argument elided
-                    //         |
-                    //         highlighted in output
-                    values.0.push_normal(path1);
-                    values.1.push_normal(path2);
-
-                    // Avoid printing out default generic parameters that are common to both
-                    // types.
-                    let len1 = sub_no_defaults_1.len();
-                    let len2 = sub_no_defaults_2.len();
-                    let common_len = cmp::min(len1, len2);
-                    let remainder1: Vec<_> = sub1.types().skip(common_len).collect();
-                    let remainder2: Vec<_> = sub2.types().skip(common_len).collect();
-                    let common_default_params = remainder1
-                        .iter()
-                        .rev()
-                        .zip(remainder2.iter().rev())
-                        .filter(|(a, b)| a == b)
-                        .count();
-                    let len = sub1.len() - common_default_params;
-                    let consts_offset = len - sub1.consts().count();
-
-                    // Only draw `<...>` if there're lifetime/type arguments.
-                    if len > 0 {
-                        values.0.push_normal("<");
-                        values.1.push_normal("<");
-                    }
-
-                    fn lifetime_display(lifetime: Region<'_>) -> String {
-                        let s = lifetime.to_string();
-                        if s.is_empty() { "'_".to_string() } else { s }
-                    }
-                    // At one point we'd like to elide all lifetimes here, they are irrelevant for
-                    // all diagnostics that use this output
-                    //
-                    //     Foo<'x, '_, Bar>
-                    //     Foo<'y, '_, Qux>
-                    //         ^^  ^^  --- type arguments are not elided
-                    //         |   |
-                    //         |   elided as they were the same
-                    //         not elided, they were different, but irrelevant
-                    let lifetimes = sub1.regions().zip(sub2.regions());
-                    for (i, lifetimes) in lifetimes.enumerate() {
-                        let l1 = lifetime_display(lifetimes.0);
-                        let l2 = lifetime_display(lifetimes.1);
-                        if lifetimes.0 == lifetimes.1 {
-                            values.0.push_normal("'_");
-                            values.1.push_normal("'_");
-                        } else {
-                            values.0.push_highlighted(l1);
-                            values.1.push_highlighted(l2);
-                        }
-                        self.push_comma(&mut values.0, &mut values.1, len, i);
-                    }
-
-                    // We're comparing two types with the same path, so we compare the type
-                    // arguments for both. If they are the same, do not highlight and elide from the
-                    // output.
-                    //     Foo<_, Bar>
-                    //     Foo<_, Qux>
-                    //         ^ elided type as this type argument was the same in both sides
-                    let type_arguments = sub1.types().zip(sub2.types());
-                    let regions_len = sub1.regions().count();
-                    let num_display_types = consts_offset - regions_len;
-                    for (i, (ta1, ta2)) in type_arguments.take(num_display_types).enumerate() {
-                        let i = i + regions_len;
-                        if ta1 == ta2 {
-                            values.0.push_normal("_");
-                            values.1.push_normal("_");
-                        } else {
-                            let (x1, x2) = self.cmp(ta1, ta2);
-                            (values.0).0.extend(x1.0);
-                            (values.1).0.extend(x2.0);
-                        }
-                        self.push_comma(&mut values.0, &mut values.1, len, i);
-                    }
-
-                    // Do the same for const arguments, if they are equal, do not highlight and
-                    // elide them from the output.
-                    let const_arguments = sub1.consts().zip(sub2.consts());
-                    for (i, (ca1, ca2)) in const_arguments.enumerate() {
-                        let i = i + consts_offset;
-                        if ca1 == ca2 {
-                            values.0.push_normal("_");
-                            values.1.push_normal("_");
-                        } else {
-                            values.0.push_highlighted(ca1.to_string());
-                            values.1.push_highlighted(ca2.to_string());
-                        }
-                        self.push_comma(&mut values.0, &mut values.1, len, i);
-                    }
-
-                    // Close the type argument bracket.
-                    // Only draw `<...>` if there're lifetime/type arguments.
-                    if len > 0 {
-                        values.0.push_normal(">");
-                        values.1.push_normal(">");
-                    }
-                    values
-                } else {
-                    // Check for case:
-                    //     let x: Foo<Bar<Qux> = foo::<Bar<Qux>>();
-                    //     Foo<Bar<Qux>
-                    //         ------- this type argument is exactly the same as the other type
-                    //     Bar<Qux>
-                    if self
-                        .cmp_type_arg(
-                            &mut values.0,
-                            &mut values.1,
-                            path1.clone(),
-                            sub_no_defaults_1,
-                            path2.clone(),
-                            &t2,
-                        )
-                        .is_some()
-                    {
-                        return values;
-                    }
-                    // Check for case:
-                    //     let x: Bar<Qux> = y:<Foo<Bar<Qux>>>();
-                    //     Bar<Qux>
-                    //     Foo<Bar<Qux>>
-                    //         ------- this type argument is exactly the same as the other type
-                    if self
-                        .cmp_type_arg(
-                            &mut values.1,
-                            &mut values.0,
-                            path2,
-                            sub_no_defaults_2,
-                            path1,
-                            &t1,
-                        )
-                        .is_some()
-                    {
-                        return values;
-                    }
-
-                    // We can't find anything in common, highlight relevant part of type path.
-                    //     let x: foo::bar::Baz<Qux> = y:<foo::bar::Bar<Zar>>();
-                    //     foo::bar::Baz<Qux>
-                    //     foo::bar::Bar<Zar>
-                    //               -------- this part of the path is different
-
-                    let t1_str = t1.to_string();
-                    let t2_str = t2.to_string();
-                    let min_len = t1_str.len().min(t2_str.len());
-
-                    const SEPARATOR: &str = "::";
-                    let separator_len = SEPARATOR.len();
-                    let split_idx: usize = t1_str
-                        .split(SEPARATOR)
-                        .zip(t2_str.split(SEPARATOR))
-                        .take_while(|(mod1_str, mod2_str)| mod1_str == mod2_str)
-                        .map(|(mod_str, _)| mod_str.len() + separator_len)
-                        .sum();
-
-                    debug!(
-                        "cmp: separator_len={}, split_idx={}, min_len={}",
-                        separator_len, split_idx, min_len
-                    );
-
-                    if split_idx >= min_len {
-                        // paths are identical, highlight everything
-                        (
-                            DiagnosticStyledString::highlighted(t1_str),
-                            DiagnosticStyledString::highlighted(t2_str),
-                        )
-                    } else {
-                        let (common, uniq1) = t1_str.split_at(split_idx);
-                        let (_, uniq2) = t2_str.split_at(split_idx);
-                        debug!("cmp: common={}, uniq1={}, uniq2={}", common, uniq1, uniq2);
-
-                        values.0.push_normal(common);
-                        values.0.push_highlighted(uniq1);
-                        values.1.push_normal(common);
-                        values.1.push_highlighted(uniq2);
-
-                        values
-                    }
-                }
-            }
-
-            // When finding T != &T, highlight only the borrow
-            (&ty::Ref(r1, ref_ty1, mutbl1), _) if equals(&ref_ty1, &t2) => {
-                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
-                push_ty_ref(&r1, ref_ty1, mutbl1, &mut values.0);
-                values.1.push_normal(t2.to_string());
-                values
-            }
-            (_, &ty::Ref(r2, ref_ty2, mutbl2)) if equals(&t1, &ref_ty2) => {
-                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
-                values.0.push_normal(t1.to_string());
-                push_ty_ref(&r2, ref_ty2, mutbl2, &mut values.1);
-                values
-            }
-
-            // When encountering &T != &mut T, highlight only the borrow
-            (&ty::Ref(r1, ref_ty1, mutbl1), &ty::Ref(r2, ref_ty2, mutbl2))
-                if equals(&ref_ty1, &ref_ty2) =>
-            {
-                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
-                push_ty_ref(&r1, ref_ty1, mutbl1, &mut values.0);
-                push_ty_ref(&r2, ref_ty2, mutbl2, &mut values.1);
-                values
-            }
-
-            // When encountering tuples of the same size, highlight only the differing types
-            (&ty::Tuple(substs1), &ty::Tuple(substs2)) if substs1.len() == substs2.len() => {
-                let mut values =
-                    (DiagnosticStyledString::normal("("), DiagnosticStyledString::normal("("));
-                let len = substs1.len();
-                for (i, (left, right)) in substs1.types().zip(substs2.types()).enumerate() {
-                    let (x1, x2) = self.cmp(left, right);
-                    (values.0).0.extend(x1.0);
-                    (values.1).0.extend(x2.0);
-                    self.push_comma(&mut values.0, &mut values.1, len, i);
-                }
-                if len == 1 {
-                    // Keep the output for single element tuples as `(ty,)`.
-                    values.0.push_normal(",");
-                    values.1.push_normal(",");
-                }
-                values.0.push_normal(")");
-                values.1.push_normal(")");
-                values
-            }
-
-            (ty::FnDef(did1, substs1), ty::FnDef(did2, substs2)) => {
-                let sig1 = self.tcx.fn_sig(*did1).subst(self.tcx, substs1);
-                let sig2 = self.tcx.fn_sig(*did2).subst(self.tcx, substs2);
-                let mut values = self.cmp_fn_sig(&sig1, &sig2);
-                let path1 = format!(" {{{}}}", self.tcx.def_path_str_with_substs(*did1, substs1));
-                let path2 = format!(" {{{}}}", self.tcx.def_path_str_with_substs(*did2, substs2));
-                let same_path = path1 == path2;
-                values.0.push(path1, !same_path);
-                values.1.push(path2, !same_path);
-                values
-            }
-
-            (ty::FnDef(did1, substs1), ty::FnPtr(sig2)) => {
-                let sig1 = self.tcx.fn_sig(*did1).subst(self.tcx, substs1);
-                let mut values = self.cmp_fn_sig(&sig1, sig2);
-                values.0.push_normal(format!(
-                    " {{{}}}",
-                    self.tcx.def_path_str_with_substs(*did1, substs1)
-                ));
-                values
-            }
-
-            (ty::FnPtr(sig1), ty::FnDef(did2, substs2)) => {
-                let sig2 = self.tcx.fn_sig(*did2).subst(self.tcx, substs2);
-                let mut values = self.cmp_fn_sig(sig1, &sig2);
-                values.1.push_normal(format!(
-                    " {{{}}}",
-                    self.tcx.def_path_str_with_substs(*did2, substs2)
-                ));
-                values
-            }
-
-            (ty::FnPtr(sig1), ty::FnPtr(sig2)) => self.cmp_fn_sig(sig1, sig2),
-
-            _ => {
-                if t1 == t2 {
-                    // The two types are the same, elide and don't highlight.
-                    (DiagnosticStyledString::normal("_"), DiagnosticStyledString::normal("_"))
-                } else {
-                    // We couldn't find anything in common, highlight everything.
-                    (
-                        DiagnosticStyledString::highlighted(t1.to_string()),
-                        DiagnosticStyledString::highlighted(t2.to_string()),
-                    )
-                }
-            }
-        }
-    }
-
-    pub fn note_type_err(
-        &self,
-        diag: &mut DiagnosticBuilder<'tcx>,
-        cause: &ObligationCause<'tcx>,
-        secondary_span: Option<(Span, String)>,
-        mut values: Option<ValuePairs<'tcx>>,
-        terr: &TypeError<'tcx>,
-    ) {
-        let span = cause.span(self.tcx);
-
-        // For some types of errors, expected-found does not make
-        // sense, so just ignore the values we were given.
-        match terr {
-            TypeError::CyclicTy(_) => {
-                values = None;
-            }
-            _ => {}
-        }
-
-        struct OpaqueTypesVisitor<'tcx> {
-            types: FxHashMap<TyCategory, FxHashSet<Span>>,
-            expected: FxHashMap<TyCategory, FxHashSet<Span>>,
-            found: FxHashMap<TyCategory, FxHashSet<Span>>,
-            ignore_span: Span,
-            tcx: TyCtxt<'tcx>,
-        }
-
-        impl<'tcx> OpaqueTypesVisitor<'tcx> {
-            fn visit_expected_found(
-                tcx: TyCtxt<'tcx>,
-                expected: Ty<'tcx>,
-                found: Ty<'tcx>,
-                ignore_span: Span,
-            ) -> Self {
-                let mut types_visitor = OpaqueTypesVisitor {
-                    types: Default::default(),
-                    expected: Default::default(),
-                    found: Default::default(),
-                    ignore_span,
-                    tcx,
-                };
-                // The visitor puts all the relevant encountered types in `self.types`, but in
-                // here we want to visit two separate types with no relation to each other, so we
-                // move the results from `types` to `expected` or `found` as appropriate.
-                expected.visit_with(&mut types_visitor);
-                std::mem::swap(&mut types_visitor.expected, &mut types_visitor.types);
-                found.visit_with(&mut types_visitor);
-                std::mem::swap(&mut types_visitor.found, &mut types_visitor.types);
-                types_visitor
-            }
-
-            fn report(&self, err: &mut DiagnosticBuilder<'_>) {
-                self.add_labels_for_types(err, "expected", &self.expected);
-                self.add_labels_for_types(err, "found", &self.found);
-            }
-
-            fn add_labels_for_types(
-                &self,
-                err: &mut DiagnosticBuilder<'_>,
-                target: &str,
-                types: &FxHashMap<TyCategory, FxHashSet<Span>>,
-            ) {
-                for (key, values) in types.iter() {
-                    let count = values.len();
-                    let kind = key.descr();
-                    for sp in values {
-                        err.span_label(
-                            *sp,
-                            format!(
-                                "{}{}{} {}{}",
-                                if sp.is_desugaring(DesugaringKind::Async) {
-                                    "the `Output` of this `async fn`'s "
-                                } else if count == 1 {
-                                    "the "
-                                } else {
-                                    ""
-                                },
-                                if count > 1 { "one of the " } else { "" },
-                                target,
-                                kind,
-                                pluralize!(count),
-                            ),
-                        );
-                    }
-                }
-            }
-        }
-
-        impl<'tcx> ty::fold::TypeVisitor<'tcx> for OpaqueTypesVisitor<'tcx> {
-            fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {
-                if let Some((kind, def_id)) = TyCategory::from_ty(t) {
-                    let span = self.tcx.def_span(def_id);
-                    // Avoid cluttering the output when the "found" and error span overlap:
-                    //
-                    // error[E0308]: mismatched types
-                    //   --> $DIR/issue-20862.rs:2:5
-                    //    |
-                    // LL |     |y| x + y
-                    //    |     ^^^^^^^^^
-                    //    |     |
-                    //    |     the found closure
-                    //    |     expected `()`, found closure
-                    //    |
-                    //    = note: expected unit type `()`
-                    //                 found closure `[closure@$DIR/issue-20862.rs:2:5: 2:14 x:_]`
-                    if !self.ignore_span.overlaps(span) {
-                        self.types.entry(kind).or_default().insert(span);
-                    }
-                }
-                t.super_visit_with(self)
-            }
-        }
-
-        debug!("note_type_err(diag={:?})", diag);
-        let (expected_found, exp_found, is_simple_error) = match values {
-            None => (None, None, false),
-            Some(values) => {
-                let (is_simple_error, exp_found) = match values {
-                    ValuePairs::Types(exp_found) => {
-                        let is_simple_err =
-                            exp_found.expected.is_simple_text() && exp_found.found.is_simple_text();
-                        OpaqueTypesVisitor::visit_expected_found(
-                            self.tcx,
-                            exp_found.expected,
-                            exp_found.found,
-                            span,
-                        )
-                        .report(diag);
-
-                        (is_simple_err, Some(exp_found))
-                    }
-                    _ => (false, None),
-                };
-                let vals = match self.values_str(&values) {
-                    Some((expected, found)) => Some((expected, found)),
-                    None => {
-                        // Derived error. Cancel the emitter.
-                        diag.cancel();
-                        return;
-                    }
-                };
-                (vals, exp_found, is_simple_error)
-            }
-        };
-
-        // Ignore msg for object safe coercion
-        // since E0038 message will be printed
-        match terr {
-            TypeError::ObjectUnsafeCoercion(_) => {}
-            _ => {
-                diag.span_label(span, terr.to_string());
-                if let Some((sp, msg)) = secondary_span {
-                    diag.span_label(sp, msg);
-                }
-            }
-        };
-        if let Some((expected, found)) = expected_found {
-            let expected_label = exp_found.map_or("type".into(), |ef| ef.expected.prefix_string());
-            let found_label = exp_found.map_or("type".into(), |ef| ef.found.prefix_string());
-            match (&terr, expected == found) {
-                (TypeError::Sorts(values), extra) => {
-                    let sort_string = |ty: Ty<'tcx>| match (extra, &ty.kind) {
-                        (true, ty::Opaque(def_id, _)) => format!(
-                            " (opaque type at {})",
-                            self.tcx
-                                .sess
-                                .source_map()
-                                .mk_substr_filename(self.tcx.def_span(*def_id)),
-                        ),
-                        (true, _) => format!(" ({})", ty.sort_string(self.tcx)),
-                        (false, _) => "".to_string(),
-                    };
-                    if !(values.expected.is_simple_text() && values.found.is_simple_text())
-                        || (exp_found.map_or(false, |ef| {
-                            // This happens when the type error is a subset of the expectation,
-                            // like when you have two references but one is `usize` and the other
-                            // is `f32`. In those cases we still want to show the `note`. If the
-                            // value from `ef` is `Infer(_)`, then we ignore it.
-                            if !ef.expected.is_ty_infer() {
-                                ef.expected != values.expected
-                            } else if !ef.found.is_ty_infer() {
-                                ef.found != values.found
-                            } else {
-                                false
-                            }
-                        }))
-                    {
-                        diag.note_expected_found_extra(
-                            &expected_label,
-                            expected,
-                            &found_label,
-                            found,
-                            &sort_string(values.expected),
-                            &sort_string(values.found),
-                        );
-                    }
-                }
-                (TypeError::ObjectUnsafeCoercion(_), _) => {
-                    diag.note_unsuccessfull_coercion(found, expected);
-                }
-                (_, _) => {
-                    debug!(
-                        "note_type_err: exp_found={:?}, expected={:?} found={:?}",
-                        exp_found, expected, found
-                    );
-                    if !is_simple_error || terr.must_include_note() {
-                        diag.note_expected_found(&expected_label, expected, &found_label, found);
-                    }
-                }
-            }
-        }
-        if let Some(exp_found) = exp_found {
-            self.suggest_as_ref_where_appropriate(span, &exp_found, diag);
-        }
-
-        // In some (most?) cases cause.body_id points to actual body, but in some cases
-        // it's a actual definition. According to the comments (e.g. in
-        // librustc_typeck/check/compare_method.rs:compare_predicate_entailment) the latter
-        // is relied upon by some other code. This might (or might not) need cleanup.
-        let body_owner_def_id =
-            self.tcx.hir().opt_local_def_id(cause.body_id).unwrap_or_else(|| {
-                self.tcx.hir().body_owner_def_id(hir::BodyId { hir_id: cause.body_id })
-            });
-        self.check_and_note_conflicting_crates(diag, terr);
-        self.tcx.note_and_explain_type_err(diag, terr, span, body_owner_def_id);
-
-        // It reads better to have the error origin as the final
-        // thing.
-        self.note_error_origin(diag, &cause, exp_found);
-    }
-
-    /// When encountering a case where `.as_ref()` on a `Result` or `Option` would be appropriate,
-    /// suggests it.
-    fn suggest_as_ref_where_appropriate(
-        &self,
-        span: Span,
-        exp_found: &ty::error::ExpectedFound<Ty<'tcx>>,
-        diag: &mut DiagnosticBuilder<'tcx>,
-    ) {
-        match (&exp_found.expected.kind, &exp_found.found.kind) {
-            (ty::Adt(exp_def, exp_substs), ty::Ref(_, found_ty, _)) => {
-                if let ty::Adt(found_def, found_substs) = found_ty.kind {
-                    let path_str = format!("{:?}", exp_def);
-                    if exp_def == &found_def {
-                        let opt_msg = "you can convert from `&Option<T>` to `Option<&T>` using \
-                                       `.as_ref()`";
-                        let result_msg = "you can convert from `&Result<T, E>` to \
-                                          `Result<&T, &E>` using `.as_ref()`";
-                        let have_as_ref = &[
-                            ("std::option::Option", opt_msg),
-                            ("core::option::Option", opt_msg),
-                            ("std::result::Result", result_msg),
-                            ("core::result::Result", result_msg),
-                        ];
-                        if let Some(msg) = have_as_ref
-                            .iter()
-                            .filter_map(
-                                |(path, msg)| if &path_str == path { Some(msg) } else { None },
-                            )
-                            .next()
-                        {
-                            let mut show_suggestion = true;
-                            for (exp_ty, found_ty) in exp_substs.types().zip(found_substs.types()) {
-                                match exp_ty.kind {
-                                    ty::Ref(_, exp_ty, _) => {
-                                        match (&exp_ty.kind, &found_ty.kind) {
-                                            (_, ty::Param(_))
-                                            | (_, ty::Infer(_))
-                                            | (ty::Param(_), _)
-                                            | (ty::Infer(_), _) => {}
-                                            _ if ty::TyS::same_type(exp_ty, found_ty) => {}
-                                            _ => show_suggestion = false,
-                                        };
-                                    }
-                                    ty::Param(_) | ty::Infer(_) => {}
-                                    _ => show_suggestion = false,
-                                }
-                            }
-                            if let (Ok(snippet), true) =
-                                (self.tcx.sess.source_map().span_to_snippet(span), show_suggestion)
-                            {
-                                diag.span_suggestion(
-                                    span,
-                                    msg,
-                                    format!("{}.as_ref()", snippet),
-                                    Applicability::MachineApplicable,
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn report_and_explain_type_error(
-        &self,
-        trace: TypeTrace<'tcx>,
-        terr: &TypeError<'tcx>,
-    ) -> DiagnosticBuilder<'tcx> {
-        debug!("report_and_explain_type_error(trace={:?}, terr={:?})", trace, terr);
-
-        let span = trace.cause.span(self.tcx);
-        let failure_code = trace.cause.as_failure_code(terr);
-        let mut diag = match failure_code {
-            FailureCode::Error0038(did) => {
-                let violations = object_safety_violations(self.tcx, did);
-                report_object_safety_error(self.tcx, span, did, violations)
-            }
-            FailureCode::Error0317(failure_str) => {
-                struct_span_err!(self.tcx.sess, span, E0317, "{}", failure_str)
-            }
-            FailureCode::Error0580(failure_str) => {
-                struct_span_err!(self.tcx.sess, span, E0580, "{}", failure_str)
-            }
-            FailureCode::Error0308(failure_str) => {
-                struct_span_err!(self.tcx.sess, span, E0308, "{}", failure_str)
-            }
-            FailureCode::Error0644(failure_str) => {
-                struct_span_err!(self.tcx.sess, span, E0644, "{}", failure_str)
-            }
-        };
-        self.note_type_err(&mut diag, &trace.cause, None, Some(trace.values), terr);
-        diag
-    }
-
-    fn values_str(
-        &self,
-        values: &ValuePairs<'tcx>,
-    ) -> Option<(DiagnosticStyledString, DiagnosticStyledString)> {
-        match *values {
-            infer::Types(ref exp_found) => self.expected_found_str_ty(exp_found),
-            infer::Regions(ref exp_found) => self.expected_found_str(exp_found),
-            infer::Consts(ref exp_found) => self.expected_found_str(exp_found),
-            infer::TraitRefs(ref exp_found) => {
-                let pretty_exp_found = ty::error::ExpectedFound {
-                    expected: exp_found.expected.print_only_trait_path(),
-                    found: exp_found.found.print_only_trait_path(),
-                };
-                self.expected_found_str(&pretty_exp_found)
-            }
-            infer::PolyTraitRefs(ref exp_found) => {
-                let pretty_exp_found = ty::error::ExpectedFound {
-                    expected: exp_found.expected.print_only_trait_path(),
-                    found: exp_found.found.print_only_trait_path(),
-                };
-                self.expected_found_str(&pretty_exp_found)
-            }
-        }
-    }
-
-    fn expected_found_str_ty(
-        &self,
-        exp_found: &ty::error::ExpectedFound<Ty<'tcx>>,
-    ) -> Option<(DiagnosticStyledString, DiagnosticStyledString)> {
-        let exp_found = self.resolve_vars_if_possible(exp_found);
-        if exp_found.references_error() {
-            return None;
-        }
-
-        Some(self.cmp(exp_found.expected, exp_found.found))
-    }
-
-    /// Returns a string of the form "expected `{}`, found `{}`".
-    fn expected_found_str<T: fmt::Display + TypeFoldable<'tcx>>(
-        &self,
-        exp_found: &ty::error::ExpectedFound<T>,
-    ) -> Option<(DiagnosticStyledString, DiagnosticStyledString)> {
-        let exp_found = self.resolve_vars_if_possible(exp_found);
-        if exp_found.references_error() {
-            return None;
-        }
-
-        Some((
-            DiagnosticStyledString::highlighted(exp_found.expected.to_string()),
-            DiagnosticStyledString::highlighted(exp_found.found.to_string()),
-        ))
-    }
-
-    pub fn report_generic_bound_failure(
-        &self,
-        region_scope_tree: &region::ScopeTree,
-        span: Span,
-        origin: Option<SubregionOrigin<'tcx>>,
-        bound_kind: GenericKind<'tcx>,
-        sub: Region<'tcx>,
-    ) {
-        self.construct_generic_bound_failure(region_scope_tree, span, origin, bound_kind, sub)
-            .emit()
-    }
-
-    pub fn construct_generic_bound_failure(
-        &self,
-        region_scope_tree: &region::ScopeTree,
-        span: Span,
-        origin: Option<SubregionOrigin<'tcx>>,
-        bound_kind: GenericKind<'tcx>,
-        sub: Region<'tcx>,
-    ) -> DiagnosticBuilder<'a> {
-        // Attempt to obtain the span of the parameter so we can
-        // suggest adding an explicit lifetime bound to it.
-        let type_param_span = match (self.in_progress_tables, bound_kind) {
-            (Some(ref table), GenericKind::Param(ref param)) => {
-                let table = table.borrow();
-                table.local_id_root.and_then(|did| {
-                    let generics = self.tcx.generics_of(did);
-                    // Account for the case where `did` corresponds to `Self`, which doesn't have
-                    // the expected type argument.
-                    if !(generics.has_self && param.index == 0) {
-                        let type_param = generics.type_param(param, self.tcx);
-                        let hir = &self.tcx.hir();
-                        hir.as_local_hir_id(type_param.def_id).map(|id| {
-                            // Get the `hir::Param` to verify whether it already has any bounds.
-                            // We do this to avoid suggesting code that ends up as `T: 'a'b`,
-                            // instead we suggest `T: 'a + 'b` in that case.
-                            let mut has_bounds = false;
-                            if let Node::GenericParam(param) = hir.get(id) {
-                                has_bounds = !param.bounds.is_empty();
-                            }
-                            let sp = hir.span(id);
-                            // `sp` only covers `T`, change it so that it covers
-                            // `T:` when appropriate
-                            let is_impl_trait = bound_kind.to_string().starts_with("impl ");
-                            let sp = if has_bounds && !is_impl_trait {
-                                sp.to(self
-                                    .tcx
-                                    .sess
-                                    .source_map()
-                                    .next_point(self.tcx.sess.source_map().next_point(sp)))
-                            } else {
-                                sp
-                            };
-                            (sp, has_bounds, is_impl_trait)
-                        })
-                    } else {
-                        None
-                    }
-                })
-            }
-            _ => None,
-        };
-
-        let labeled_user_string = match bound_kind {
-            GenericKind::Param(ref p) => format!("the parameter type `{}`", p),
-            GenericKind::Projection(ref p) => format!("the associated type `{}`", p),
-        };
-
-        if let Some(SubregionOrigin::CompareImplMethodObligation {
-            span,
-            item_name,
-            impl_item_def_id,
-            trait_item_def_id,
-        }) = origin
-        {
-            return self.report_extra_impl_obligation(
-                span,
-                item_name,
-                impl_item_def_id,
-                trait_item_def_id,
-                &format!("`{}: {}`", bound_kind, sub),
-            );
-        }
-
-        fn binding_suggestion<'tcx, S: fmt::Display>(
-            err: &mut DiagnosticBuilder<'tcx>,
-            type_param_span: Option<(Span, bool, bool)>,
-            bound_kind: GenericKind<'tcx>,
-            sub: S,
-        ) {
-            let consider = format!(
-                "consider adding an explicit lifetime bound {}",
-                if type_param_span.map(|(_, _, is_impl_trait)| is_impl_trait).unwrap_or(false) {
-                    format!(" `{}` to `{}`...", sub, bound_kind)
-                } else {
-                    format!("`{}: {}`...", bound_kind, sub)
-                },
-            );
-            if let Some((sp, has_lifetimes, is_impl_trait)) = type_param_span {
-                let suggestion = if is_impl_trait {
-                    format!("{} + {}", bound_kind, sub)
-                } else {
-                    let tail = if has_lifetimes { " + " } else { "" };
-                    format!("{}: {}{}", bound_kind, sub, tail)
-                };
-                err.span_suggestion_short(
-                    sp,
-                    &consider,
-                    suggestion,
-                    Applicability::MaybeIncorrect, // Issue #41966
-                );
-            } else {
-                err.help(&consider);
-            }
-        }
-
-        let mut err = match *sub {
-            ty::ReEarlyBound(ty::EarlyBoundRegion { name, .. })
-            | ty::ReFree(ty::FreeRegion { bound_region: ty::BrNamed(_, name), .. }) => {
-                // Does the required lifetime have a nice name we can print?
-                let mut err = struct_span_err!(
-                    self.tcx.sess,
-                    span,
-                    E0309,
-                    "{} may not live long enough",
-                    labeled_user_string
-                );
-                // Explicitely use the name instead of `sub`'s `Display` impl. The `Display` impl
-                // for the bound is not suitable for suggestions when `-Zverbose` is set because it
-                // uses `Debug` output, so we handle it specially here so that suggestions are
-                // always correct.
-                binding_suggestion(&mut err, type_param_span, bound_kind, name);
-                err
-            }
-
-            ty::ReStatic => {
-                // Does the required lifetime have a nice name we can print?
-                let mut err = struct_span_err!(
-                    self.tcx.sess,
-                    span,
-                    E0310,
-                    "{} may not live long enough",
-                    labeled_user_string
-                );
-                binding_suggestion(&mut err, type_param_span, bound_kind, "'static");
-                err
-            }
-
-            _ => {
-                // If not, be less specific.
-                let mut err = struct_span_err!(
-                    self.tcx.sess,
-                    span,
-                    E0311,
-                    "{} may not live long enough",
-                    labeled_user_string
-                );
-                err.help(&format!(
-                    "consider adding an explicit lifetime bound for `{}`",
-                    bound_kind
-                ));
-                note_and_explain_region(
-                    self.tcx,
-                    region_scope_tree,
-                    &mut err,
-                    &format!("{} must be valid for ", labeled_user_string),
-                    sub,
-                    "...",
-                );
-                err
-            }
-        };
-
-        if let Some(origin) = origin {
-            self.note_region_origin(&mut err, &origin);
-        }
-        err
-    }
-
-    fn report_sub_sup_conflict(
-        &self,
-        region_scope_tree: &region::ScopeTree,
-        var_origin: RegionVariableOrigin,
-        sub_origin: SubregionOrigin<'tcx>,
-        sub_region: Region<'tcx>,
-        sup_origin: SubregionOrigin<'tcx>,
-        sup_region: Region<'tcx>,
-    ) {
-        let mut err = self.report_inference_failure(var_origin);
-
-        note_and_explain_region(
-            self.tcx,
-            region_scope_tree,
-            &mut err,
-            "first, the lifetime cannot outlive ",
-            sup_region,
-            "...",
-        );
-
-        match (&sup_origin, &sub_origin) {
-            (&infer::Subtype(ref sup_trace), &infer::Subtype(ref sub_trace)) => {
-                debug!("report_sub_sup_conflict: var_origin={:?}", var_origin);
-                debug!("report_sub_sup_conflict: sub_region={:?}", sub_region);
-                debug!("report_sub_sup_conflict: sub_origin={:?}", sub_origin);
-                debug!("report_sub_sup_conflict: sup_region={:?}", sup_region);
-                debug!("report_sub_sup_conflict: sup_origin={:?}", sup_origin);
-                debug!("report_sub_sup_conflict: sup_trace={:?}", sup_trace);
-                debug!("report_sub_sup_conflict: sub_trace={:?}", sub_trace);
-                debug!("report_sub_sup_conflict: sup_trace.values={:?}", sup_trace.values);
-                debug!("report_sub_sup_conflict: sub_trace.values={:?}", sub_trace.values);
-
-                if let (Some((sup_expected, sup_found)), Some((sub_expected, sub_found))) =
-                    (self.values_str(&sup_trace.values), self.values_str(&sub_trace.values))
-                {
-                    if sub_expected == sup_expected && sub_found == sup_found {
-                        note_and_explain_region(
-                            self.tcx,
-                            region_scope_tree,
-                            &mut err,
-                            "...but the lifetime must also be valid for ",
-                            sub_region,
-                            "...",
-                        );
-                        err.span_note(
-                            sup_trace.cause.span,
-                            &format!("...so that the {}", sup_trace.cause.as_requirement_str()),
-                        );
-
-                        err.note_expected_found(&"", sup_expected, &"", sup_found);
-                        err.emit();
-                        return;
-                    }
-                }
-            }
-            _ => {}
-        }
-
-        self.note_region_origin(&mut err, &sup_origin);
-
-        note_and_explain_region(
-            self.tcx,
-            region_scope_tree,
-            &mut err,
-            "but, the lifetime must be valid for ",
-            sub_region,
-            "...",
-        );
-
-        self.note_region_origin(&mut err, &sub_origin);
-        err.emit();
-    }
-}
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    fn report_inference_failure(
-        &self,
-        var_origin: RegionVariableOrigin,
-    ) -> DiagnosticBuilder<'tcx> {
-        let br_string = |br: ty::BoundRegion| {
-            let mut s = match br {
-                ty::BrNamed(_, name) => name.to_string(),
-                _ => String::new(),
-            };
-            if !s.is_empty() {
-                s.push_str(" ");
-            }
-            s
-        };
-        let var_description = match var_origin {
-            infer::MiscVariable(_) => String::new(),
-            infer::PatternRegion(_) => " for pattern".to_string(),
-            infer::AddrOfRegion(_) => " for borrow expression".to_string(),
-            infer::Autoref(_) => " for autoref".to_string(),
-            infer::Coercion(_) => " for automatic coercion".to_string(),
-            infer::LateBoundRegion(_, br, infer::FnCall) => {
-                format!(" for lifetime parameter {}in function call", br_string(br))
-            }
-            infer::LateBoundRegion(_, br, infer::HigherRankedType) => {
-                format!(" for lifetime parameter {}in generic type", br_string(br))
-            }
-            infer::LateBoundRegion(_, br, infer::AssocTypeProjection(def_id)) => format!(
-                " for lifetime parameter {}in trait containing associated type `{}`",
-                br_string(br),
-                self.tcx.associated_item(def_id).ident
-            ),
-            infer::EarlyBoundRegion(_, name) => format!(" for lifetime parameter `{}`", name),
-            infer::BoundRegionInCoherence(name) => {
-                format!(" for lifetime parameter `{}` in coherence check", name)
-            }
-            infer::UpvarRegion(ref upvar_id, _) => {
-                let var_name = self.tcx.hir().name(upvar_id.var_path.hir_id);
-                format!(" for capture of `{}` by closure", var_name)
-            }
-            infer::NLL(..) => bug!("NLL variable found in lexical phase"),
-        };
-
-        struct_span_err!(
-            self.tcx.sess,
-            var_origin.span(),
-            E0495,
-            "cannot infer an appropriate lifetime{} \
-             due to conflicting requirements",
-            var_description
-        )
-    }
-}
-
-enum FailureCode {
-    Error0038(DefId),
-    Error0317(&'static str),
-    Error0580(&'static str),
-    Error0308(&'static str),
-    Error0644(&'static str),
-}
-
-impl<'tcx> ObligationCause<'tcx> {
-    fn as_failure_code(&self, terr: &TypeError<'tcx>) -> FailureCode {
-        use self::FailureCode::*;
-        use crate::traits::ObligationCauseCode::*;
-        match self.code {
-            CompareImplMethodObligation { .. } => Error0308("method not compatible with trait"),
-            CompareImplTypeObligation { .. } => Error0308("type not compatible with trait"),
-            MatchExpressionArm(box MatchExpressionArmCause { source, .. }) => {
-                Error0308(match source {
-                    hir::MatchSource::IfLetDesugar { .. } => {
-                        "`if let` arms have incompatible types"
-                    }
-                    hir::MatchSource::TryDesugar => {
-                        "try expression alternatives have incompatible types"
-                    }
-                    _ => "`match` arms have incompatible types",
-                })
-            }
-            IfExpression { .. } => Error0308("`if` and `else` have incompatible types"),
-            IfExpressionWithNoElse => Error0317("`if` may be missing an `else` clause"),
-            MainFunctionType => Error0580("`main` function has wrong type"),
-            StartFunctionType => Error0308("`#[start]` function has wrong type"),
-            IntrinsicType => Error0308("intrinsic has wrong type"),
-            MethodReceiver => Error0308("mismatched `self` parameter type"),
-
-            // In the case where we have no more specific thing to
-            // say, also take a look at the error code, maybe we can
-            // tailor to that.
-            _ => match terr {
-                TypeError::CyclicTy(ty) if ty.is_closure() || ty.is_generator() => {
-                    Error0644("closure/generator type that references itself")
-                }
-                TypeError::IntrinsicCast => {
-                    Error0308("cannot coerce intrinsics to function pointers")
-                }
-                TypeError::ObjectUnsafeCoercion(did) => Error0038(*did),
-                _ => Error0308("mismatched types"),
-            },
-        }
-    }
-
-    fn as_requirement_str(&self) -> &'static str {
-        use crate::traits::ObligationCauseCode::*;
-        match self.code {
-            CompareImplMethodObligation { .. } => "method type is compatible with trait",
-            CompareImplTypeObligation { .. } => "associated type is compatible with trait",
-            ExprAssignable => "expression is assignable",
-            MatchExpressionArm(box MatchExpressionArmCause { source, .. }) => match source {
-                hir::MatchSource::IfLetDesugar { .. } => "`if let` arms have compatible types",
-                _ => "`match` arms have compatible types",
-            },
-            IfExpression { .. } => "`if` and `else` have incompatible types",
-            IfExpressionWithNoElse => "`if` missing an `else` returns `()`",
-            MainFunctionType => "`main` function has the correct type",
-            StartFunctionType => "`#[start]` function has the correct type",
-            IntrinsicType => "intrinsic has the correct type",
-            MethodReceiver => "method receiver has the correct type",
-            _ => "types are compatible",
-        }
-    }
-}
-
-/// This is a bare signal of what kind of type we're dealing with. `ty::TyKind` tracks
-/// extra information about each type, but we only care about the category.
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
-crate enum TyCategory {
-    Closure,
-    Opaque,
-    Generator,
-    Foreign,
-}
-
-impl TyCategory {
-    fn descr(&self) -> &'static str {
-        match self {
-            Self::Closure => "closure",
-            Self::Opaque => "opaque type",
-            Self::Generator => "generator",
-            Self::Foreign => "foreign type",
-        }
-    }
-
-    pub fn from_ty(ty: Ty<'_>) -> Option<(Self, DefId)> {
-        match ty.kind {
-            ty::Closure(def_id, _) => Some((Self::Closure, def_id)),
-            ty::Opaque(def_id, _) => Some((Self::Opaque, def_id)),
-            ty::Generator(def_id, ..) => Some((Self::Generator, def_id)),
-            ty::Foreign(def_id) => Some((Self::Foreign, def_id)),
-            _ => None,
-        }
-    }
-}
diff --git a/src/librustc/infer/error_reporting/nice_region_error/mod.rs b/src/librustc/infer/error_reporting/nice_region_error/mod.rs
deleted file mode 100644
index 8749d6cd34..0000000000
--- a/src/librustc/infer/error_reporting/nice_region_error/mod.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use crate::infer::lexical_region_resolve::RegionResolutionError;
-use crate::infer::lexical_region_resolve::RegionResolutionError::*;
-use crate::infer::InferCtxt;
-use crate::ty::{self, TyCtxt};
-use crate::util::common::ErrorReported;
-use rustc_errors::DiagnosticBuilder;
-use rustc_span::source_map::Span;
-
-mod different_lifetimes;
-mod find_anon_type;
-mod named_anon_conflict;
-mod outlives_closure;
-mod placeholder_error;
-mod static_impl_trait;
-mod trait_impl_difference;
-mod util;
-
-impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
-    pub fn try_report_nice_region_error(&self, error: &RegionResolutionError<'tcx>) -> bool {
-        match *error {
-            ConcreteFailure(..) | SubSupConflict(..) => {}
-            _ => return false, // inapplicable
-        }
-
-        if let Some(tables) = self.in_progress_tables {
-            let tables = tables.borrow();
-            NiceRegionError::new(self, error.clone(), Some(&tables)).try_report().is_some()
-        } else {
-            NiceRegionError::new(self, error.clone(), None).try_report().is_some()
-        }
-    }
-}
-
-pub struct NiceRegionError<'cx, 'tcx> {
-    infcx: &'cx InferCtxt<'cx, 'tcx>,
-    error: Option<RegionResolutionError<'tcx>>,
-    regions: Option<(Span, ty::Region<'tcx>, ty::Region<'tcx>)>,
-    tables: Option<&'cx ty::TypeckTables<'tcx>>,
-}
-
-impl<'cx, 'tcx> NiceRegionError<'cx, 'tcx> {
-    pub fn new(
-        infcx: &'cx InferCtxt<'cx, 'tcx>,
-        error: RegionResolutionError<'tcx>,
-        tables: Option<&'cx ty::TypeckTables<'tcx>>,
-    ) -> Self {
-        Self { infcx, error: Some(error), regions: None, tables }
-    }
-
-    pub fn new_from_span(
-        infcx: &'cx InferCtxt<'cx, 'tcx>,
-        span: Span,
-        sub: ty::Region<'tcx>,
-        sup: ty::Region<'tcx>,
-        tables: Option<&'cx ty::TypeckTables<'tcx>>,
-    ) -> Self {
-        Self { infcx, error: None, regions: Some((span, sub, sup)), tables }
-    }
-
-    fn tcx(&self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    pub fn try_report_from_nll(&self) -> Option<DiagnosticBuilder<'cx>> {
-        // Due to the improved diagnostics returned by the MIR borrow checker, only a subset of
-        // the nice region errors are required when running under the MIR borrow checker.
-        self.try_report_named_anon_conflict().or_else(|| self.try_report_placeholder_conflict())
-    }
-
-    pub fn try_report(&self) -> Option<ErrorReported> {
-        self.try_report_from_nll()
-            .map(|mut diag| {
-                diag.emit();
-                ErrorReported
-            })
-            .or_else(|| self.try_report_anon_anon_conflict())
-            .or_else(|| self.try_report_outlives_closure())
-            .or_else(|| self.try_report_static_impl_trait())
-            .or_else(|| self.try_report_impl_not_conforming_to_trait())
-    }
-
-    pub fn regions(&self) -> (Span, ty::Region<'tcx>, ty::Region<'tcx>) {
-        match (&self.error, self.regions) {
-            (Some(ConcreteFailure(origin, sub, sup)), None) => (origin.span(), sub, sup),
-            (Some(SubSupConflict(_, _, origin, sub, _, sup)), None) => (origin.span(), sub, sup),
-            (None, Some((span, sub, sup))) => (span, sub, sup),
-            (Some(_), Some(_)) => panic!("incorrectly built NiceRegionError"),
-            _ => panic!("trying to report on an incorrect lifetime failure"),
-        }
-    }
-}
diff --git a/src/librustc/infer/error_reporting/nice_region_error/util.rs b/src/librustc/infer/error_reporting/nice_region_error/util.rs
deleted file mode 100644
index 52ccb1454e..0000000000
--- a/src/librustc/infer/error_reporting/nice_region_error/util.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-//! Helper functions corresponding to lifetime errors due to
-//! anonymous regions.
-
-use crate::infer::error_reporting::nice_region_error::NiceRegionError;
-use crate::ty::{self, DefIdTree, Region, Ty};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_span::Span;
-
-// The struct contains the information about the anonymous region
-// we are searching for.
-#[derive(Debug)]
-pub(super) struct AnonymousParamInfo<'tcx> {
-    // the parameter corresponding to the anonymous region
-    pub param: &'tcx hir::Param<'tcx>,
-    // the type corresponding to the anonymopus region parameter
-    pub param_ty: Ty<'tcx>,
-    // the ty::BoundRegion corresponding to the anonymous region
-    pub bound_region: ty::BoundRegion,
-    // param_ty_span contains span of parameter type
-    pub param_ty_span: Span,
-    // corresponds to id the argument is the first parameter
-    // in the declaration
-    pub is_first: bool,
-}
-
-impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
-    // This method walks the Type of the function body parameters using
-    // `fold_regions()` function and returns the
-    // &hir::Param of the function parameter corresponding to the anonymous
-    // region and the Ty corresponding to the named region.
-    // Currently only the case where the function declaration consists of
-    // one named region and one anonymous region is handled.
-    // Consider the example `fn foo<'a>(x: &'a i32, y: &i32) -> &'a i32`
-    // Here, we would return the hir::Param for y, we return the type &'a
-    // i32, which is the type of y but with the anonymous region replaced
-    // with 'a, the corresponding bound region and is_first which is true if
-    // the hir::Param is the first parameter in the function declaration.
-    pub(super) fn find_param_with_region(
-        &self,
-        anon_region: Region<'tcx>,
-        replace_region: Region<'tcx>,
-    ) -> Option<AnonymousParamInfo<'_>> {
-        let (id, bound_region) = match *anon_region {
-            ty::ReFree(ref free_region) => (free_region.scope, free_region.bound_region),
-            ty::ReEarlyBound(ebr) => (
-                self.tcx().parent(ebr.def_id).unwrap(),
-                ty::BoundRegion::BrNamed(ebr.def_id, ebr.name),
-            ),
-            _ => return None, // not a free region
-        };
-
-        let hir = &self.tcx().hir();
-        if let Some(hir_id) = hir.as_local_hir_id(id) {
-            if let Some(body_id) = hir.maybe_body_owned_by(hir_id) {
-                let body = hir.body(body_id);
-                let owner_id = hir.body_owner(body_id);
-                let fn_decl = hir.fn_decl_by_hir_id(owner_id).unwrap();
-                if let Some(tables) = self.tables {
-                    body.params
-                        .iter()
-                        .enumerate()
-                        .filter_map(|(index, param)| {
-                            // May return None; sometimes the tables are not yet populated.
-                            let ty_hir_id = fn_decl.inputs[index].hir_id;
-                            let param_ty_span = hir.span(ty_hir_id);
-                            let ty = tables.node_type_opt(param.hir_id)?;
-                            let mut found_anon_region = false;
-                            let new_param_ty = self.tcx().fold_regions(&ty, &mut false, |r, _| {
-                                if *r == *anon_region {
-                                    found_anon_region = true;
-                                    replace_region
-                                } else {
-                                    r
-                                }
-                            });
-                            if found_anon_region {
-                                let is_first = index == 0;
-                                Some(AnonymousParamInfo {
-                                    param: param,
-                                    param_ty: new_param_ty,
-                                    param_ty_span: param_ty_span,
-                                    bound_region: bound_region,
-                                    is_first: is_first,
-                                })
-                            } else {
-                                None
-                            }
-                        })
-                        .next()
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        } else {
-            None
-        }
-    }
-
-    // Here, we check for the case where the anonymous region
-    // is in the return type.
-    // FIXME(#42703) - Need to handle certain cases here.
-    pub(super) fn is_return_type_anon(
-        &self,
-        scope_def_id: DefId,
-        br: ty::BoundRegion,
-        decl: &hir::FnDecl<'_>,
-    ) -> Option<Span> {
-        let ret_ty = self.tcx().type_of(scope_def_id);
-        if let ty::FnDef(_, _) = ret_ty.kind {
-            let sig = ret_ty.fn_sig(self.tcx());
-            let late_bound_regions =
-                self.tcx().collect_referenced_late_bound_regions(&sig.output());
-            if late_bound_regions.iter().any(|r| *r == br) {
-                return Some(decl.output.span());
-            }
-        }
-        None
-    }
-
-    // Here we check for the case where anonymous region
-    // corresponds to self and if yes, we display E0312.
-    // FIXME(#42700) - Need to format self properly to
-    // enable E0621 for it.
-    pub(super) fn is_self_anon(&self, is_first: bool, scope_def_id: DefId) -> bool {
-        is_first
-            && self.tcx().opt_associated_item(scope_def_id).map(|i| i.method_has_self_argument)
-                == Some(true)
-    }
-}
diff --git a/src/librustc/infer/higher_ranked/mod.rs b/src/librustc/infer/higher_ranked/mod.rs
deleted file mode 100644
index bbca482343..0000000000
--- a/src/librustc/infer/higher_ranked/mod.rs
+++ /dev/null
@@ -1,138 +0,0 @@
-//! Helper routines for higher-ranked things. See the `doc` module at
-//! the end of the file for details.
-
-use super::combine::CombineFields;
-use super::{HigherRankedType, InferCtxt, PlaceholderMap};
-
-use crate::infer::CombinedSnapshot;
-use crate::ty::relate::{Relate, RelateResult, TypeRelation};
-use crate::ty::{self, Binder, TypeFoldable};
-
-impl<'a, 'tcx> CombineFields<'a, 'tcx> {
-    pub fn higher_ranked_sub<T>(
-        &mut self,
-        a: &Binder<T>,
-        b: &Binder<T>,
-        a_is_expected: bool,
-    ) -> RelateResult<'tcx, Binder<T>>
-    where
-        T: Relate<'tcx>,
-    {
-        debug!("higher_ranked_sub(a={:?}, b={:?})", a, b);
-
-        // Rather than checking the subtype relationship between `a` and `b`
-        // as-is, we need to do some extra work here in order to make sure
-        // that function subtyping works correctly with respect to regions
-        //
-        // Note: this is a subtle algorithm.  For a full explanation,
-        // please see the large comment at the end of the file in the (inlined) module
-        // `doc`.
-
-        let span = self.trace.cause.span;
-
-        return self.infcx.commit_if_ok(|snapshot| {
-            // First, we instantiate each bound region in the supertype with a
-            // fresh placeholder region.
-            let (b_prime, placeholder_map) = self.infcx.replace_bound_vars_with_placeholders(b);
-
-            // Next, we instantiate each bound region in the subtype
-            // with a fresh region variable. These region variables --
-            // but no other pre-existing region variables -- can name
-            // the placeholders.
-            let (a_prime, _) =
-                self.infcx.replace_bound_vars_with_fresh_vars(span, HigherRankedType, a);
-
-            debug!("a_prime={:?}", a_prime);
-            debug!("b_prime={:?}", b_prime);
-
-            // Compare types now that bound regions have been replaced.
-            let result = self.sub(a_is_expected).relate(&a_prime, &b_prime)?;
-
-            self.infcx.leak_check(!a_is_expected, &placeholder_map, snapshot)?;
-
-            debug!("higher_ranked_sub: OK result={:?}", result);
-
-            Ok(ty::Binder::bind(result))
-        });
-    }
-}
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    /// Replaces all regions (resp. types) bound by `binder` with placeholder
-    /// regions (resp. types) and return a map indicating which bound-region
-    /// placeholder region. This is the first step of checking subtyping
-    /// when higher-ranked things are involved.
-    ///
-    /// **Important:** you must call this function from within a snapshot.
-    /// Moreover, before committing the snapshot, you must eventually call
-    /// either `plug_leaks` or `pop_placeholders` to remove the placeholder
-    /// regions. If you rollback the snapshot (or are using a probe), then
-    /// the pop occurs as part of the rollback, so an explicit call is not
-    /// needed (but is also permitted).
-    ///
-    /// For more information about how placeholders and HRTBs work, see
-    /// the [rustc guide].
-    ///
-    /// [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/hrtb.html
-    pub fn replace_bound_vars_with_placeholders<T>(
-        &self,
-        binder: &ty::Binder<T>,
-    ) -> (T, PlaceholderMap<'tcx>)
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        let next_universe = self.create_next_universe();
-
-        let fld_r = |br| {
-            self.tcx.mk_region(ty::RePlaceholder(ty::PlaceholderRegion {
-                universe: next_universe,
-                name: br,
-            }))
-        };
-
-        let fld_t = |bound_ty: ty::BoundTy| {
-            self.tcx.mk_ty(ty::Placeholder(ty::PlaceholderType {
-                universe: next_universe,
-                name: bound_ty.var,
-            }))
-        };
-
-        let fld_c = |bound_var: ty::BoundVar, ty| {
-            self.tcx.mk_const(ty::Const {
-                val: ty::ConstKind::Placeholder(ty::PlaceholderConst {
-                    universe: next_universe,
-                    name: bound_var,
-                }),
-                ty,
-            })
-        };
-
-        let (result, map) = self.tcx.replace_bound_vars(binder, fld_r, fld_t, fld_c);
-
-        debug!(
-            "replace_bound_vars_with_placeholders(\
-             next_universe={:?}, \
-             binder={:?}, \
-             result={:?}, \
-             map={:?})",
-            next_universe, binder, result, map,
-        );
-
-        (result, map)
-    }
-
-    /// See `infer::region_constraints::RegionConstraintCollector::leak_check`.
-    pub fn leak_check(
-        &self,
-        overly_polymorphic: bool,
-        placeholder_map: &PlaceholderMap<'tcx>,
-        snapshot: &CombinedSnapshot<'_, 'tcx>,
-    ) -> RelateResult<'tcx, ()> {
-        self.borrow_region_constraints().leak_check(
-            self.tcx,
-            overly_polymorphic,
-            placeholder_map,
-            snapshot,
-        )
-    }
-}
diff --git a/src/librustc/infer/lexical_region_resolve/mod.rs b/src/librustc/infer/lexical_region_resolve/mod.rs
deleted file mode 100644
index 4b1f8a5be1..0000000000
--- a/src/librustc/infer/lexical_region_resolve/mod.rs
+++ /dev/null
@@ -1,940 +0,0 @@
-//! Lexical region resolution.
-
-use crate::infer::region_constraints::Constraint;
-use crate::infer::region_constraints::GenericKind;
-use crate::infer::region_constraints::MemberConstraint;
-use crate::infer::region_constraints::RegionConstraintData;
-use crate::infer::region_constraints::VarInfos;
-use crate::infer::region_constraints::VerifyBound;
-use crate::infer::RegionVariableOrigin;
-use crate::infer::SubregionOrigin;
-use crate::middle::free_region::RegionRelations;
-use crate::ty::fold::TypeFoldable;
-use crate::ty::{self, Ty, TyCtxt};
-use crate::ty::{ReEarlyBound, ReEmpty, ReErased, ReFree, ReStatic};
-use crate::ty::{ReLateBound, RePlaceholder, ReScope, ReVar};
-use crate::ty::{Region, RegionVid};
-use rustc_data_structures::fx::FxHashSet;
-use rustc_data_structures::graph::implementation::{
-    Direction, Graph, NodeIndex, INCOMING, OUTGOING,
-};
-use rustc_hir::def_id::DefId;
-use rustc_index::vec::{Idx, IndexVec};
-use rustc_span::Span;
-use std::fmt;
-
-mod graphviz;
-
-/// This function performs lexical region resolution given a complete
-/// set of constraints and variable origins. It performs a fixed-point
-/// iteration to find region values which satisfy all constraints,
-/// assuming such values can be found. It returns the final values of
-/// all the variables as well as a set of errors that must be reported.
-pub fn resolve<'tcx>(
-    region_rels: &RegionRelations<'_, 'tcx>,
-    var_infos: VarInfos,
-    data: RegionConstraintData<'tcx>,
-) -> (LexicalRegionResolutions<'tcx>, Vec<RegionResolutionError<'tcx>>) {
-    debug!("RegionConstraintData: resolve_regions()");
-    let mut errors = vec![];
-    let mut resolver = LexicalResolver { region_rels, var_infos, data };
-    let values = resolver.infer_variable_values(&mut errors);
-    (values, errors)
-}
-
-/// Contains the result of lexical region resolution. Offers methods
-/// to lookup up the final value of a region variable.
-pub struct LexicalRegionResolutions<'tcx> {
-    values: IndexVec<RegionVid, VarValue<'tcx>>,
-    error_region: ty::Region<'tcx>,
-}
-
-#[derive(Copy, Clone, Debug)]
-enum VarValue<'tcx> {
-    Value(Region<'tcx>),
-    ErrorValue,
-}
-
-#[derive(Clone, Debug)]
-pub enum RegionResolutionError<'tcx> {
-    /// `ConcreteFailure(o, a, b)`:
-    ///
-    /// `o` requires that `a <= b`, but this does not hold
-    ConcreteFailure(SubregionOrigin<'tcx>, Region<'tcx>, Region<'tcx>),
-
-    /// `GenericBoundFailure(p, s, a)
-    ///
-    /// The parameter/associated-type `p` must be known to outlive the lifetime
-    /// `a` (but none of the known bounds are sufficient).
-    GenericBoundFailure(SubregionOrigin<'tcx>, GenericKind<'tcx>, Region<'tcx>),
-
-    /// `SubSupConflict(v, v_origin, sub_origin, sub_r, sup_origin, sup_r)`:
-    ///
-    /// Could not infer a value for `v` (which has origin `v_origin`)
-    /// because `sub_r <= v` (due to `sub_origin`) but `v <= sup_r` (due to `sup_origin`) and
-    /// `sub_r <= sup_r` does not hold.
-    SubSupConflict(
-        RegionVid,
-        RegionVariableOrigin,
-        SubregionOrigin<'tcx>,
-        Region<'tcx>,
-        SubregionOrigin<'tcx>,
-        Region<'tcx>,
-    ),
-
-    /// Indicates a failure of a `MemberConstraint`. These arise during
-    /// impl trait processing explicitly -- basically, the impl trait's hidden type
-    /// included some region that it was not supposed to.
-    MemberConstraintFailure {
-        span: Span,
-        opaque_type_def_id: DefId,
-        hidden_ty: Ty<'tcx>,
-        member_region: Region<'tcx>,
-        choice_regions: Vec<Region<'tcx>>,
-    },
-}
-
-struct RegionAndOrigin<'tcx> {
-    region: Region<'tcx>,
-    origin: SubregionOrigin<'tcx>,
-}
-
-type RegionGraph<'tcx> = Graph<(), Constraint<'tcx>>;
-
-struct LexicalResolver<'cx, 'tcx> {
-    region_rels: &'cx RegionRelations<'cx, 'tcx>,
-    var_infos: VarInfos,
-    data: RegionConstraintData<'tcx>,
-}
-
-impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
-    fn tcx(&self) -> TyCtxt<'tcx> {
-        self.region_rels.tcx
-    }
-
-    fn infer_variable_values(
-        &mut self,
-        errors: &mut Vec<RegionResolutionError<'tcx>>,
-    ) -> LexicalRegionResolutions<'tcx> {
-        let mut var_data = self.construct_var_data(self.tcx());
-
-        // Dorky hack to cause `dump_constraints` to only get called
-        // if debug mode is enabled:
-        debug!(
-            "----() End constraint listing (context={:?}) {:?}---",
-            self.region_rels.context,
-            self.dump_constraints(self.region_rels)
-        );
-        graphviz::maybe_print_constraints_for(&self.data, self.region_rels);
-
-        let graph = self.construct_graph();
-        self.expand_givens(&graph);
-        loop {
-            self.expansion(&mut var_data);
-            if !self.enforce_member_constraints(&graph, &mut var_data) {
-                break;
-            }
-        }
-        self.collect_errors(&mut var_data, errors);
-        self.collect_var_errors(&var_data, &graph, errors);
-        var_data
-    }
-
-    fn num_vars(&self) -> usize {
-        self.var_infos.len()
-    }
-
-    /// Initially, the value for all variables is set to `'empty`, the
-    /// empty region. The `expansion` phase will grow this larger.
-    fn construct_var_data(&self, tcx: TyCtxt<'tcx>) -> LexicalRegionResolutions<'tcx> {
-        LexicalRegionResolutions {
-            error_region: tcx.lifetimes.re_static,
-            values: IndexVec::from_elem_n(VarValue::Value(tcx.lifetimes.re_empty), self.num_vars()),
-        }
-    }
-
-    fn dump_constraints(&self, free_regions: &RegionRelations<'_, 'tcx>) {
-        debug!("----() Start constraint listing (context={:?}) ()----", free_regions.context);
-        for (idx, (constraint, _)) in self.data.constraints.iter().enumerate() {
-            debug!("Constraint {} => {:?}", idx, constraint);
-        }
-    }
-
-    fn expand_givens(&mut self, graph: &RegionGraph<'_>) {
-        // Givens are a kind of horrible hack to account for
-        // constraints like 'c <= '0 that are known to hold due to
-        // closure signatures (see the comment above on the `givens`
-        // field). They should go away. But until they do, the role
-        // of this fn is to account for the transitive nature:
-        //
-        //     Given 'c <= '0
-        //     and   '0 <= '1
-        //     then  'c <= '1
-
-        let seeds: Vec<_> = self.data.givens.iter().cloned().collect();
-        for (r, vid) in seeds {
-            // While all things transitively reachable in the graph
-            // from the variable (`'0` in the example above).
-            let seed_index = NodeIndex(vid.index() as usize);
-            for succ_index in graph.depth_traverse(seed_index, OUTGOING) {
-                let succ_index = succ_index.0;
-
-                // The first N nodes correspond to the region
-                // variables. Other nodes correspond to constant
-                // regions.
-                if succ_index < self.num_vars() {
-                    let succ_vid = RegionVid::new(succ_index);
-
-                    // Add `'c <= '1`.
-                    self.data.givens.insert((r, succ_vid));
-                }
-            }
-        }
-    }
-
-    /// Enforce all member constraints and return true if anything
-    /// changed. See `enforce_member_constraint` for more details.
-    fn enforce_member_constraints(
-        &self,
-        graph: &RegionGraph<'tcx>,
-        var_values: &mut LexicalRegionResolutions<'tcx>,
-    ) -> bool {
-        // Note: we don't use the `any` combinator because we don't
-        // want to stop at the first constraint that makes a change.
-        let mut any_changed = false;
-        for member_constraint in &self.data.member_constraints {
-            any_changed |= self.enforce_member_constraint(graph, member_constraint, var_values);
-        }
-        any_changed
-    }
-
-    /// Enforce a constraint like
-    ///
-    /// ```
-    /// 'r member of ['c...]
-    /// ```
-    ///
-    /// We look for all choice regions from the list `'c...` that:
-    ///
-    /// (a) are greater than the current value of `'r` (which is a lower bound)
-    ///
-    /// and
-    ///
-    /// (b) are compatible with the upper bounds of `'r` that we can
-    /// find by traversing the graph.
-    ///
-    /// From that list, we look for a *minimal* option `'c_min`. If we
-    /// find one, then we can enforce that `'r: 'c_min`.
-    fn enforce_member_constraint(
-        &self,
-        graph: &RegionGraph<'tcx>,
-        member_constraint: &MemberConstraint<'tcx>,
-        var_values: &mut LexicalRegionResolutions<'tcx>,
-    ) -> bool {
-        debug!("enforce_member_constraint(member_constraint={:#?})", member_constraint);
-
-        // The constraint is some inference variable (`vid`) which
-        // must be equal to one of the options.
-        let member_vid = match member_constraint.member_region {
-            ty::ReVar(vid) => *vid,
-            _ => return false,
-        };
-
-        // The current value of `vid` is a lower bound LB -- i.e., we
-        // know that `LB <= vid` must be true.
-        let member_lower_bound: ty::Region<'tcx> = match var_values.value(member_vid) {
-            VarValue::ErrorValue => return false,
-            VarValue::Value(r) => r,
-        };
-
-        // Find all the "upper bounds" -- that is, each region `b` such that
-        // `r0 <= b` must hold.
-        let (member_upper_bounds, _) =
-            self.collect_concrete_regions(graph, member_vid, OUTGOING, None);
-
-        // Get an iterator over the *available choice* -- that is,
-        // each choice region `c` where `lb <= c` and `c <= ub` for all the
-        // upper bounds `ub`.
-        debug!("enforce_member_constraint: upper_bounds={:#?}", member_upper_bounds);
-        let mut options = member_constraint.choice_regions.iter().filter(|option| {
-            self.sub_concrete_regions(member_lower_bound, option)
-                && member_upper_bounds
-                    .iter()
-                    .all(|upper_bound| self.sub_concrete_regions(option, upper_bound.region))
-        });
-
-        // If there is more than one option, we only make a choice if
-        // there is a single *least* choice -- i.e., some available
-        // region that is `<=` all the others.
-        let mut least_choice: ty::Region<'tcx> = match options.next() {
-            Some(&r) => r,
-            None => return false,
-        };
-        debug!("enforce_member_constraint: least_choice={:?}", least_choice);
-        for &option in options {
-            debug!("enforce_member_constraint: option={:?}", option);
-            if !self.sub_concrete_regions(least_choice, option) {
-                if self.sub_concrete_regions(option, least_choice) {
-                    debug!("enforce_member_constraint: new least choice");
-                    least_choice = option;
-                } else {
-                    debug!("enforce_member_constraint: no least choice");
-                    return false;
-                }
-            }
-        }
-
-        debug!("enforce_member_constraint: final least choice = {:?}", least_choice);
-        if least_choice != member_lower_bound {
-            *var_values.value_mut(member_vid) = VarValue::Value(least_choice);
-            true
-        } else {
-            false
-        }
-    }
-
-    fn expansion(&self, var_values: &mut LexicalRegionResolutions<'tcx>) {
-        let mut constraints = IndexVec::from_elem_n(Vec::new(), var_values.values.len());
-        let mut changes = Vec::new();
-        for constraint in self.data.constraints.keys() {
-            let (a_vid, a_region, b_vid, b_data) = match *constraint {
-                Constraint::RegSubVar(a_region, b_vid) => {
-                    let b_data = var_values.value_mut(b_vid);
-                    (None, a_region, b_vid, b_data)
-                }
-                Constraint::VarSubVar(a_vid, b_vid) => match *var_values.value(a_vid) {
-                    VarValue::ErrorValue => continue,
-                    VarValue::Value(a_region) => {
-                        let b_data = var_values.value_mut(b_vid);
-                        (Some(a_vid), a_region, b_vid, b_data)
-                    }
-                },
-                Constraint::RegSubReg(..) | Constraint::VarSubReg(..) => {
-                    // These constraints are checked after expansion
-                    // is done, in `collect_errors`.
-                    continue;
-                }
-            };
-            if self.expand_node(a_region, b_vid, b_data) {
-                changes.push(b_vid);
-            }
-            if let Some(a_vid) = a_vid {
-                match *b_data {
-                    VarValue::Value(ReStatic) | VarValue::ErrorValue => (),
-                    _ => {
-                        constraints[a_vid].push((a_vid, b_vid));
-                        constraints[b_vid].push((a_vid, b_vid));
-                    }
-                }
-            }
-        }
-
-        while let Some(vid) = changes.pop() {
-            constraints[vid].retain(|&(a_vid, b_vid)| {
-                let a_region = match *var_values.value(a_vid) {
-                    VarValue::ErrorValue => return false,
-                    VarValue::Value(a_region) => a_region,
-                };
-                let b_data = var_values.value_mut(b_vid);
-                if self.expand_node(a_region, b_vid, b_data) {
-                    changes.push(b_vid);
-                }
-                match *b_data {
-                    VarValue::Value(ReStatic) | VarValue::ErrorValue => false,
-                    _ => true,
-                }
-            });
-        }
-    }
-
-    fn expand_node(
-        &self,
-        a_region: Region<'tcx>,
-        b_vid: RegionVid,
-        b_data: &mut VarValue<'tcx>,
-    ) -> bool {
-        debug!("expand_node({:?}, {:?} == {:?})", a_region, b_vid, b_data);
-
-        match *a_region {
-            // Check if this relationship is implied by a given.
-            ty::ReEarlyBound(_) | ty::ReFree(_) => {
-                if self.data.givens.contains(&(a_region, b_vid)) {
-                    debug!("given");
-                    return false;
-                }
-            }
-
-            _ => {}
-        }
-
-        match *b_data {
-            VarValue::Value(cur_region) => {
-                // Identical scopes can show up quite often, if the fixed point
-                // iteration converges slowly. Skip them. This is purely an
-                // optimization.
-                if let (ReScope(a_scope), ReScope(cur_scope)) = (a_region, cur_region) {
-                    if a_scope == cur_scope {
-                        return false;
-                    }
-                }
-
-                // This is a specialized version of the `lub_concrete_regions`
-                // check below for a common case, here purely as an
-                // optimization.
-                if let ReEmpty = a_region {
-                    return false;
-                }
-
-                let mut lub = self.lub_concrete_regions(a_region, cur_region);
-                if lub == cur_region {
-                    return false;
-                }
-
-                // Watch out for `'b: !1` relationships, where the
-                // universe of `'b` can't name the placeholder `!1`. In
-                // that case, we have to grow `'b` to be `'static` for the
-                // relationship to hold. This is obviously a kind of sub-optimal
-                // choice -- in the future, when we incorporate a knowledge
-                // of the parameter environment, we might be able to find a
-                // tighter bound than `'static`.
-                //
-                // (This might e.g. arise from being asked to prove `for<'a> { 'b: 'a }`.)
-                let b_universe = self.var_infos[b_vid].universe;
-                if let ty::RePlaceholder(p) = lub {
-                    if b_universe.cannot_name(p.universe) {
-                        lub = self.tcx().lifetimes.re_static;
-                    }
-                }
-
-                debug!("Expanding value of {:?} from {:?} to {:?}", b_vid, cur_region, lub);
-
-                *b_data = VarValue::Value(lub);
-                return true;
-            }
-
-            VarValue::ErrorValue => {
-                return false;
-            }
-        }
-    }
-
-    /// True if `a <= b`, but not defined over inference variables.
-    fn sub_concrete_regions(&self, a: Region<'tcx>, b: Region<'tcx>) -> bool {
-        self.lub_concrete_regions(a, b) == b
-    }
-
-    /// Returns the smallest region `c` such that `a <= c` and `b <= c`.
-    fn lub_concrete_regions(&self, a: Region<'tcx>, b: Region<'tcx>) -> Region<'tcx> {
-        match (a, b) {
-            (&ty::ReClosureBound(..), _)
-            | (_, &ty::ReClosureBound(..))
-            | (&ReLateBound(..), _)
-            | (_, &ReLateBound(..))
-            | (&ReErased, _)
-            | (_, &ReErased) => {
-                bug!("cannot relate region: LUB({:?}, {:?})", a, b);
-            }
-
-            (r @ &ReStatic, _) | (_, r @ &ReStatic) => {
-                r // nothing lives longer than static
-            }
-
-            (&ReEmpty, r) | (r, &ReEmpty) => {
-                r // everything lives longer than empty
-            }
-
-            (&ReVar(v_id), _) | (_, &ReVar(v_id)) => {
-                span_bug!(
-                    self.var_infos[v_id].origin.span(),
-                    "lub_concrete_regions invoked with non-concrete \
-                     regions: {:?}, {:?}",
-                    a,
-                    b
-                );
-            }
-
-            (&ReEarlyBound(_), &ReScope(s_id))
-            | (&ReScope(s_id), &ReEarlyBound(_))
-            | (&ReFree(_), &ReScope(s_id))
-            | (&ReScope(s_id), &ReFree(_)) => {
-                // A "free" region can be interpreted as "some region
-                // at least as big as fr.scope".  So, we can
-                // reasonably compare free regions and scopes:
-                let fr_scope = match (a, b) {
-                    (&ReEarlyBound(ref br), _) | (_, &ReEarlyBound(ref br)) => {
-                        self.region_rels.region_scope_tree.early_free_scope(self.tcx(), br)
-                    }
-                    (&ReFree(ref fr), _) | (_, &ReFree(ref fr)) => {
-                        self.region_rels.region_scope_tree.free_scope(self.tcx(), fr)
-                    }
-                    _ => bug!(),
-                };
-                let r_id =
-                    self.region_rels.region_scope_tree.nearest_common_ancestor(fr_scope, s_id);
-                if r_id == fr_scope {
-                    // if the free region's scope `fr.scope` is bigger than
-                    // the scope region `s_id`, then the LUB is the free
-                    // region itself:
-                    match (a, b) {
-                        (_, &ReScope(_)) => return a,
-                        (&ReScope(_), _) => return b,
-                        _ => bug!(),
-                    }
-                }
-
-                // otherwise, we don't know what the free region is,
-                // so we must conservatively say the LUB is static:
-                self.tcx().lifetimes.re_static
-            }
-
-            (&ReScope(a_id), &ReScope(b_id)) => {
-                // The region corresponding to an outer block is a
-                // subtype of the region corresponding to an inner
-                // block.
-                let lub = self.region_rels.region_scope_tree.nearest_common_ancestor(a_id, b_id);
-                self.tcx().mk_region(ReScope(lub))
-            }
-
-            (&ReEarlyBound(_), &ReEarlyBound(_))
-            | (&ReFree(_), &ReEarlyBound(_))
-            | (&ReEarlyBound(_), &ReFree(_))
-            | (&ReFree(_), &ReFree(_)) => self.region_rels.lub_free_regions(a, b),
-
-            // For these types, we cannot define any additional
-            // relationship:
-            (&RePlaceholder(..), _) | (_, &RePlaceholder(..)) => {
-                if a == b {
-                    a
-                } else {
-                    self.tcx().lifetimes.re_static
-                }
-            }
-        }
-    }
-
-    /// After expansion is complete, go and check upper bounds (i.e.,
-    /// cases where the region cannot grow larger than a fixed point)
-    /// and check that they are satisfied.
-    fn collect_errors(
-        &self,
-        var_data: &mut LexicalRegionResolutions<'tcx>,
-        errors: &mut Vec<RegionResolutionError<'tcx>>,
-    ) {
-        for (constraint, origin) in &self.data.constraints {
-            debug!("collect_errors: constraint={:?} origin={:?}", constraint, origin);
-            match *constraint {
-                Constraint::RegSubVar(..) | Constraint::VarSubVar(..) => {
-                    // Expansion will ensure that these constraints hold. Ignore.
-                }
-
-                Constraint::RegSubReg(sub, sup) => {
-                    if self.region_rels.is_subregion_of(sub, sup) {
-                        continue;
-                    }
-
-                    debug!(
-                        "collect_errors: region error at {:?}: \
-                         cannot verify that {:?} <= {:?}",
-                        origin, sub, sup
-                    );
-
-                    errors.push(RegionResolutionError::ConcreteFailure(
-                        (*origin).clone(),
-                        sub,
-                        sup,
-                    ));
-                }
-
-                Constraint::VarSubReg(a_vid, b_region) => {
-                    let a_data = var_data.value_mut(a_vid);
-                    debug!("contraction: {:?} == {:?}, {:?}", a_vid, a_data, b_region);
-
-                    let a_region = match *a_data {
-                        VarValue::ErrorValue => continue,
-                        VarValue::Value(a_region) => a_region,
-                    };
-
-                    // Do not report these errors immediately:
-                    // instead, set the variable value to error and
-                    // collect them later.
-                    if !self.region_rels.is_subregion_of(a_region, b_region) {
-                        debug!(
-                            "collect_errors: region error at {:?}: \
-                             cannot verify that {:?}={:?} <= {:?}",
-                            origin, a_vid, a_region, b_region
-                        );
-                        *a_data = VarValue::ErrorValue;
-                    }
-                }
-            }
-        }
-
-        // Check that all member constraints are satisfied.
-        for member_constraint in &self.data.member_constraints {
-            let member_region = var_data.normalize(self.tcx(), member_constraint.member_region);
-            let choice_regions = member_constraint
-                .choice_regions
-                .iter()
-                .map(|&choice_region| var_data.normalize(self.tcx(), choice_region));
-            if !choice_regions.clone().any(|choice_region| member_region == choice_region) {
-                let span = self.tcx().def_span(member_constraint.opaque_type_def_id);
-                errors.push(RegionResolutionError::MemberConstraintFailure {
-                    span,
-                    opaque_type_def_id: member_constraint.opaque_type_def_id,
-                    hidden_ty: member_constraint.hidden_ty,
-                    member_region,
-                    choice_regions: choice_regions.collect(),
-                });
-            }
-        }
-
-        for verify in &self.data.verifys {
-            debug!("collect_errors: verify={:?}", verify);
-            let sub = var_data.normalize(self.tcx(), verify.region);
-
-            // This was an inference variable which didn't get
-            // constrained, therefore it can be assume to hold.
-            if let ty::ReEmpty = *sub {
-                continue;
-            }
-
-            let verify_kind_ty = verify.kind.to_ty(self.tcx());
-            if self.bound_is_met(&verify.bound, var_data, verify_kind_ty, sub) {
-                continue;
-            }
-
-            debug!(
-                "collect_errors: region error at {:?}: \
-                 cannot verify that {:?} <= {:?}",
-                verify.origin, verify.region, verify.bound
-            );
-
-            errors.push(RegionResolutionError::GenericBoundFailure(
-                verify.origin.clone(),
-                verify.kind,
-                sub,
-            ));
-        }
-    }
-
-    /// Go over the variables that were declared to be error variables
-    /// and create a `RegionResolutionError` for each of them.
-    fn collect_var_errors(
-        &self,
-        var_data: &LexicalRegionResolutions<'tcx>,
-        graph: &RegionGraph<'tcx>,
-        errors: &mut Vec<RegionResolutionError<'tcx>>,
-    ) {
-        debug!("collect_var_errors");
-
-        // This is the best way that I have found to suppress
-        // duplicate and related errors. Basically we keep a set of
-        // flags for every node. Whenever an error occurs, we will
-        // walk some portion of the graph looking to find pairs of
-        // conflicting regions to report to the user. As we walk, we
-        // trip the flags from false to true, and if we find that
-        // we've already reported an error involving any particular
-        // node we just stop and don't report the current error.  The
-        // idea is to report errors that derive from independent
-        // regions of the graph, but not those that derive from
-        // overlapping locations.
-        let mut dup_vec = IndexVec::from_elem_n(None, self.num_vars());
-
-        for (node_vid, value) in var_data.values.iter_enumerated() {
-            match *value {
-                VarValue::Value(_) => { /* Inference successful */ }
-                VarValue::ErrorValue => {
-                    // Inference impossible: this value contains
-                    // inconsistent constraints.
-                    //
-                    // I think that in this case we should report an
-                    // error now -- unlike the case above, we can't
-                    // wait to see whether the user needs the result
-                    // of this variable. The reason is that the mere
-                    // existence of this variable implies that the
-                    // region graph is inconsistent, whether or not it
-                    // is used.
-                    //
-                    // For example, we may have created a region
-                    // variable that is the GLB of two other regions
-                    // which do not have a GLB. Even if that variable
-                    // is not used, it implies that those two regions
-                    // *should* have a GLB.
-                    //
-                    // At least I think this is true. It may be that
-                    // the mere existence of a conflict in a region
-                    // variable that is not used is not a problem, so
-                    // if this rule starts to create problems we'll
-                    // have to revisit this portion of the code and
-                    // think hard about it. =) -- nikomatsakis
-                    self.collect_error_for_expanding_node(graph, &mut dup_vec, node_vid, errors);
-                }
-            }
-        }
-    }
-
-    fn construct_graph(&self) -> RegionGraph<'tcx> {
-        let num_vars = self.num_vars();
-
-        let mut graph = Graph::new();
-
-        for _ in 0..num_vars {
-            graph.add_node(());
-        }
-
-        // Issue #30438: two distinct dummy nodes, one for incoming
-        // edges (dummy_source) and another for outgoing edges
-        // (dummy_sink). In `dummy -> a -> b -> dummy`, using one
-        // dummy node leads one to think (erroneously) there exists a
-        // path from `b` to `a`. Two dummy nodes sidesteps the issue.
-        let dummy_source = graph.add_node(());
-        let dummy_sink = graph.add_node(());
-
-        for (constraint, _) in &self.data.constraints {
-            match *constraint {
-                Constraint::VarSubVar(a_id, b_id) => {
-                    graph.add_edge(
-                        NodeIndex(a_id.index() as usize),
-                        NodeIndex(b_id.index() as usize),
-                        *constraint,
-                    );
-                }
-                Constraint::RegSubVar(_, b_id) => {
-                    graph.add_edge(dummy_source, NodeIndex(b_id.index() as usize), *constraint);
-                }
-                Constraint::VarSubReg(a_id, _) => {
-                    graph.add_edge(NodeIndex(a_id.index() as usize), dummy_sink, *constraint);
-                }
-                Constraint::RegSubReg(..) => {
-                    // this would be an edge from `dummy_source` to
-                    // `dummy_sink`; just ignore it.
-                }
-            }
-        }
-
-        return graph;
-    }
-
-    fn collect_error_for_expanding_node(
-        &self,
-        graph: &RegionGraph<'tcx>,
-        dup_vec: &mut IndexVec<RegionVid, Option<RegionVid>>,
-        node_idx: RegionVid,
-        errors: &mut Vec<RegionResolutionError<'tcx>>,
-    ) {
-        // Errors in expanding nodes result from a lower-bound that is
-        // not contained by an upper-bound.
-        let (mut lower_bounds, lower_dup) =
-            self.collect_concrete_regions(graph, node_idx, INCOMING, Some(dup_vec));
-        let (mut upper_bounds, upper_dup) =
-            self.collect_concrete_regions(graph, node_idx, OUTGOING, Some(dup_vec));
-
-        if lower_dup || upper_dup {
-            return;
-        }
-
-        // We place free regions first because we are special casing
-        // SubSupConflict(ReFree, ReFree) when reporting error, and so
-        // the user will more likely get a specific suggestion.
-        fn region_order_key(x: &RegionAndOrigin<'_>) -> u8 {
-            match *x.region {
-                ReEarlyBound(_) => 0,
-                ReFree(_) => 1,
-                _ => 2,
-            }
-        }
-        lower_bounds.sort_by_key(region_order_key);
-        upper_bounds.sort_by_key(region_order_key);
-
-        let node_universe = self.var_infos[node_idx].universe;
-
-        for lower_bound in &lower_bounds {
-            let effective_lower_bound = if let ty::RePlaceholder(p) = lower_bound.region {
-                if node_universe.cannot_name(p.universe) {
-                    self.tcx().lifetimes.re_static
-                } else {
-                    lower_bound.region
-                }
-            } else {
-                lower_bound.region
-            };
-
-            for upper_bound in &upper_bounds {
-                if !self.region_rels.is_subregion_of(effective_lower_bound, upper_bound.region) {
-                    let origin = self.var_infos[node_idx].origin;
-                    debug!(
-                        "region inference error at {:?} for {:?}: SubSupConflict sub: {:?} \
-                         sup: {:?}",
-                        origin, node_idx, lower_bound.region, upper_bound.region
-                    );
-                    errors.push(RegionResolutionError::SubSupConflict(
-                        node_idx,
-                        origin,
-                        lower_bound.origin.clone(),
-                        lower_bound.region,
-                        upper_bound.origin.clone(),
-                        upper_bound.region,
-                    ));
-                    return;
-                }
-            }
-        }
-
-        // Errors in earlier passes can yield error variables without
-        // resolution errors here; delay ICE in favor of those errors.
-        self.tcx().sess.delay_span_bug(
-            self.var_infos[node_idx].origin.span(),
-            &format!(
-                "collect_error_for_expanding_node() could not find \
-                 error for var {:?} in universe {:?}, lower_bounds={:#?}, \
-                 upper_bounds={:#?}",
-                node_idx, node_universe, lower_bounds, upper_bounds
-            ),
-        );
-    }
-
-    fn collect_concrete_regions(
-        &self,
-        graph: &RegionGraph<'tcx>,
-        orig_node_idx: RegionVid,
-        dir: Direction,
-        mut dup_vec: Option<&mut IndexVec<RegionVid, Option<RegionVid>>>,
-    ) -> (Vec<RegionAndOrigin<'tcx>>, bool) {
-        struct WalkState<'tcx> {
-            set: FxHashSet<RegionVid>,
-            stack: Vec<RegionVid>,
-            result: Vec<RegionAndOrigin<'tcx>>,
-            dup_found: bool,
-        }
-        let mut state = WalkState {
-            set: Default::default(),
-            stack: vec![orig_node_idx],
-            result: Vec::new(),
-            dup_found: false,
-        };
-        state.set.insert(orig_node_idx);
-
-        // to start off the process, walk the source node in the
-        // direction specified
-        process_edges(&self.data, &mut state, graph, orig_node_idx, dir);
-
-        while !state.stack.is_empty() {
-            let node_idx = state.stack.pop().unwrap();
-
-            // check whether we've visited this node on some previous walk
-            if let Some(dup_vec) = &mut dup_vec {
-                if dup_vec[node_idx].is_none() {
-                    dup_vec[node_idx] = Some(orig_node_idx);
-                } else if dup_vec[node_idx] != Some(orig_node_idx) {
-                    state.dup_found = true;
-                }
-
-                debug!(
-                    "collect_concrete_regions(orig_node_idx={:?}, node_idx={:?})",
-                    orig_node_idx, node_idx
-                );
-            }
-
-            process_edges(&self.data, &mut state, graph, node_idx, dir);
-        }
-
-        let WalkState { result, dup_found, .. } = state;
-        return (result, dup_found);
-
-        fn process_edges<'tcx>(
-            this: &RegionConstraintData<'tcx>,
-            state: &mut WalkState<'tcx>,
-            graph: &RegionGraph<'tcx>,
-            source_vid: RegionVid,
-            dir: Direction,
-        ) {
-            debug!("process_edges(source_vid={:?}, dir={:?})", source_vid, dir);
-
-            let source_node_index = NodeIndex(source_vid.index() as usize);
-            for (_, edge) in graph.adjacent_edges(source_node_index, dir) {
-                match edge.data {
-                    Constraint::VarSubVar(from_vid, to_vid) => {
-                        let opp_vid = if from_vid == source_vid { to_vid } else { from_vid };
-                        if state.set.insert(opp_vid) {
-                            state.stack.push(opp_vid);
-                        }
-                    }
-
-                    Constraint::RegSubVar(region, _) | Constraint::VarSubReg(_, region) => {
-                        state.result.push(RegionAndOrigin {
-                            region,
-                            origin: this.constraints.get(&edge.data).unwrap().clone(),
-                        });
-                    }
-
-                    Constraint::RegSubReg(..) => panic!(
-                        "cannot reach reg-sub-reg edge in region inference \
-                         post-processing"
-                    ),
-                }
-            }
-        }
-    }
-
-    fn bound_is_met(
-        &self,
-        bound: &VerifyBound<'tcx>,
-        var_values: &LexicalRegionResolutions<'tcx>,
-        generic_ty: Ty<'tcx>,
-        min: ty::Region<'tcx>,
-    ) -> bool {
-        match bound {
-            VerifyBound::IfEq(k, b) => {
-                (var_values.normalize(self.region_rels.tcx, *k) == generic_ty)
-                    && self.bound_is_met(b, var_values, generic_ty, min)
-            }
-
-            VerifyBound::OutlivedBy(r) => {
-                self.region_rels.is_subregion_of(min, var_values.normalize(self.tcx(), r))
-            }
-
-            VerifyBound::AnyBound(bs) => {
-                bs.iter().any(|b| self.bound_is_met(b, var_values, generic_ty, min))
-            }
-
-            VerifyBound::AllBounds(bs) => {
-                bs.iter().all(|b| self.bound_is_met(b, var_values, generic_ty, min))
-            }
-        }
-    }
-}
-
-impl<'tcx> fmt::Debug for RegionAndOrigin<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "RegionAndOrigin({:?},{:?})", self.region, self.origin)
-    }
-}
-
-impl<'tcx> LexicalRegionResolutions<'tcx> {
-    fn normalize<T>(&self, tcx: TyCtxt<'tcx>, value: T) -> T
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        tcx.fold_regions(&value, &mut false, |r, _db| match r {
-            ty::ReVar(rid) => self.resolve_var(*rid),
-            _ => r,
-        })
-    }
-
-    fn value(&self, rid: RegionVid) -> &VarValue<'tcx> {
-        &self.values[rid]
-    }
-
-    fn value_mut(&mut self, rid: RegionVid) -> &mut VarValue<'tcx> {
-        &mut self.values[rid]
-    }
-
-    pub fn resolve_var(&self, rid: RegionVid) -> ty::Region<'tcx> {
-        let result = match self.values[rid] {
-            VarValue::Value(r) => r,
-            VarValue::ErrorValue => self.error_region,
-        };
-        debug!("resolve_var({:?}) = {:?}", rid, result);
-        result
-    }
-}
diff --git a/src/librustc/infer/mod.rs b/src/librustc/infer/mod.rs
index f67669e367..497d3811f2 100644
--- a/src/librustc/infer/mod.rs
+++ b/src/librustc/infer/mod.rs
@@ -1,1746 +1,32 @@
-//! See the Book for more information.
-
-pub use self::freshen::TypeFreshener;
-pub use self::LateBoundRegionConversionTime::*;
-pub use self::RegionVariableOrigin::*;
-pub use self::SubregionOrigin::*;
-pub use self::ValuePairs::*;
-pub use crate::ty::IntVarValue;
-
-use crate::infer::canonical::{Canonical, CanonicalVarValues};
-use crate::infer::unify_key::{ConstVarValue, ConstVariableValue};
-use crate::middle::free_region::RegionRelations;
-use crate::middle::lang_items;
-use crate::middle::region;
-use crate::session::config::BorrowckMode;
-use crate::traits::{self, ObligationCause, PredicateObligations, TraitEngine};
-use crate::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
-use crate::ty::fold::{TypeFoldable, TypeFolder};
-use crate::ty::relate::RelateResult;
-use crate::ty::subst::{GenericArg, InternalSubsts, SubstsRef};
-use crate::ty::{self, GenericParamDefKind, InferConst, Ty, TyCtxt};
-use crate::ty::{ConstVid, FloatVid, IntVid, TyVid};
+pub mod canonical;
+pub mod unify_key;
 
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use crate::ty::Region;
+use crate::ty::Ty;
 use rustc_data_structures::sync::Lrc;
-use rustc_data_structures::unify as ut;
-use rustc_errors::DiagnosticBuilder;
-use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
-use rustc_span::symbol::Symbol;
 use rustc_span::Span;
-use std::cell::{Cell, Ref, RefCell, RefMut};
-use std::collections::BTreeMap;
-use std::fmt;
-use syntax::ast;
-
-use self::combine::CombineFields;
-use self::lexical_region_resolve::LexicalRegionResolutions;
-use self::outlives::env::OutlivesEnvironment;
-use self::region_constraints::{GenericKind, RegionConstraintData, VarInfos, VerifyBound};
-use self::region_constraints::{RegionConstraintCollector, RegionSnapshot};
-use self::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use self::unify_key::{ConstVariableOrigin, ConstVariableOriginKind, ToType};
-
-pub mod at;
-pub mod canonical;
-mod combine;
-mod equate;
-pub mod error_reporting;
-mod freshen;
-mod fudge;
-mod glb;
-mod higher_ranked;
-pub mod lattice;
-mod lexical_region_resolve;
-mod lub;
-pub mod nll_relate;
-pub mod opaque_types;
-pub mod outlives;
-pub mod region_constraints;
-pub mod resolve;
-mod sub;
-pub mod type_variable;
-pub mod unify_key;
-
-#[must_use]
-#[derive(Debug)]
-pub struct InferOk<'tcx, T> {
-    pub value: T,
-    pub obligations: PredicateObligations<'tcx>,
-}
-pub type InferResult<'tcx, T> = Result<InferOk<'tcx, T>, TypeError<'tcx>>;
-
-pub type Bound<T> = Option<T>;
-pub type UnitResult<'tcx> = RelateResult<'tcx, ()>; // "unify result"
-pub type FixupResult<'tcx, T> = Result<T, FixupError<'tcx>>; // "fixup result"
-
-/// A flag that is used to suppress region errors. This is normally
-/// false, but sometimes -- when we are doing region checks that the
-/// NLL borrow checker will also do -- it might be set to true.
-#[derive(Copy, Clone, Default, Debug)]
-pub struct SuppressRegionErrors {
-    suppressed: bool,
-}
-
-impl SuppressRegionErrors {
-    pub fn suppressed(self) -> bool {
-        self.suppressed
-    }
-
-    /// Indicates that the MIR borrowck will repeat these region
-    /// checks, so we should ignore errors if NLL is (unconditionally)
-    /// enabled.
-    pub fn when_nll_is_enabled(tcx: TyCtxt<'_>) -> Self {
-        // FIXME(Centril): Once we actually remove `::Migrate` also make
-        // this always `true` and then proceed to eliminate the dead code.
-        match tcx.borrowck_mode() {
-            // If we're on Migrate mode, report AST region errors
-            BorrowckMode::Migrate => SuppressRegionErrors { suppressed: false },
-
-            // If we're on MIR, don't report AST region errors as they should be reported by NLL
-            BorrowckMode::Mir => SuppressRegionErrors { suppressed: true },
-        }
-    }
-}
-
-pub struct InferCtxt<'a, 'tcx> {
-    pub tcx: TyCtxt<'tcx>,
-
-    /// During type-checking/inference of a body, `in_progress_tables`
-    /// contains a reference to the tables being built up, which are
-    /// used for reading closure kinds/signatures as they are inferred,
-    /// and for error reporting logic to read arbitrary node types.
-    pub in_progress_tables: Option<&'a RefCell<ty::TypeckTables<'tcx>>>,
-
-    /// Cache for projections. This cache is snapshotted along with the
-    /// infcx.
-    ///
-    /// Public so that `traits::project` can use it.
-    pub projection_cache: RefCell<traits::ProjectionCache<'tcx>>,
-
-    /// We instantiate `UnificationTable` with `bounds<Ty>` because the
-    /// types that might instantiate a general type variable have an
-    /// order, represented by its upper and lower bounds.
-    pub type_variables: RefCell<type_variable::TypeVariableTable<'tcx>>,
-
-    /// Map from const parameter variable to the kind of const it represents.
-    const_unification_table: RefCell<ut::UnificationTable<ut::InPlace<ty::ConstVid<'tcx>>>>,
-
-    /// Map from integral variable to the kind of integer it represents.
-    int_unification_table: RefCell<ut::UnificationTable<ut::InPlace<ty::IntVid>>>,
-
-    /// Map from floating variable to the kind of float it represents
-    float_unification_table: RefCell<ut::UnificationTable<ut::InPlace<ty::FloatVid>>>,
-
-    /// Tracks the set of region variables and the constraints between
-    /// them.  This is initially `Some(_)` but when
-    /// `resolve_regions_and_report_errors` is invoked, this gets set
-    /// to `None` -- further attempts to perform unification etc may
-    /// fail if new region constraints would've been added.
-    region_constraints: RefCell<Option<RegionConstraintCollector<'tcx>>>,
-
-    /// Once region inference is done, the values for each variable.
-    lexical_region_resolutions: RefCell<Option<LexicalRegionResolutions<'tcx>>>,
-
-    /// Caches the results of trait selection. This cache is used
-    /// for things that have to do with the parameters in scope.
-    pub selection_cache: traits::SelectionCache<'tcx>,
-
-    /// Caches the results of trait evaluation.
-    pub evaluation_cache: traits::EvaluationCache<'tcx>,
-
-    /// the set of predicates on which errors have been reported, to
-    /// avoid reporting the same error twice.
-    pub reported_trait_errors: RefCell<FxHashMap<Span, Vec<ty::Predicate<'tcx>>>>,
-
-    pub reported_closure_mismatch: RefCell<FxHashSet<(Span, Option<Span>)>>,
-
-    /// When an error occurs, we want to avoid reporting "derived"
-    /// errors that are due to this original failure. Normally, we
-    /// handle this with the `err_count_on_creation` count, which
-    /// basically just tracks how many errors were reported when we
-    /// started type-checking a fn and checks to see if any new errors
-    /// have been reported since then. Not great, but it works.
-    ///
-    /// However, when errors originated in other passes -- notably
-    /// resolve -- this heuristic breaks down. Therefore, we have this
-    /// auxiliary flag that one can set whenever one creates a
-    /// type-error that is due to an error in a prior pass.
-    ///
-    /// Don't read this flag directly, call `is_tainted_by_errors()`
-    /// and `set_tainted_by_errors()`.
-    tainted_by_errors_flag: Cell<bool>,
 
-    /// Track how many errors were reported when this infcx is created.
-    /// If the number of errors increases, that's also a sign (line
-    /// `tained_by_errors`) to avoid reporting certain kinds of errors.
-    // FIXME(matthewjasper) Merge into `tainted_by_errors_flag`
-    err_count_on_creation: usize,
-
-    /// This flag is true while there is an active snapshot.
-    in_snapshot: Cell<bool>,
-
-    /// A set of constraints that regionck must validate. Each
-    /// constraint has the form `T:'a`, meaning "some type `T` must
-    /// outlive the lifetime 'a". These constraints derive from
-    /// instantiated type parameters. So if you had a struct defined
-    /// like
-    ///
-    ///     struct Foo<T:'static> { ... }
-    ///
-    /// then in some expression `let x = Foo { ... }` it will
-    /// instantiate the type parameter `T` with a fresh type `$0`. At
-    /// the same time, it will record a region obligation of
-    /// `$0:'static`. This will get checked later by regionck. (We
-    /// can't generally check these things right away because we have
-    /// to wait until types are resolved.)
-    ///
-    /// These are stored in a map keyed to the id of the innermost
-    /// enclosing fn body / static initializer expression. This is
-    /// because the location where the obligation was incurred can be
-    /// relevant with respect to which sublifetime assumptions are in
-    /// place. The reason that we store under the fn-id, and not
-    /// something more fine-grained, is so that it is easier for
-    /// regionck to be sure that it has found *all* the region
-    /// obligations (otherwise, it's easy to fail to walk to a
-    /// particular node-id).
-    ///
-    /// Before running `resolve_regions_and_report_errors`, the creator
-    /// of the inference context is expected to invoke
-    /// `process_region_obligations` (defined in `self::region_obligations`)
-    /// for each body-id in this map, which will process the
-    /// obligations within. This is expected to be done 'late enough'
-    /// that all type inference variables have been bound and so forth.
-    pub region_obligations: RefCell<Vec<(hir::HirId, RegionObligation<'tcx>)>>,
-
-    /// What is the innermost universe we have created? Starts out as
-    /// `UniverseIndex::root()` but grows from there as we enter
-    /// universal quantifiers.
-    ///
-    /// N.B., at present, we exclude the universal quantifiers on the
-    /// item we are type-checking, and just consider those names as
-    /// part of the root universe. So this would only get incremented
-    /// when we enter into a higher-ranked (`for<..>`) type or trait
-    /// bound.
-    universe: Cell<ty::UniverseIndex>,
-}
-
-/// A map returned by `replace_bound_vars_with_placeholders()`
-/// indicating the placeholder region that each late-bound region was
-/// replaced with.
-pub type PlaceholderMap<'tcx> = BTreeMap<ty::BoundRegion, ty::Region<'tcx>>;
-
-/// See the `error_reporting` module for more details.
-#[derive(Clone, Debug, PartialEq, Eq, TypeFoldable)]
-pub enum ValuePairs<'tcx> {
-    Types(ExpectedFound<Ty<'tcx>>),
-    Regions(ExpectedFound<ty::Region<'tcx>>),
-    Consts(ExpectedFound<&'tcx ty::Const<'tcx>>),
-    TraitRefs(ExpectedFound<ty::TraitRef<'tcx>>),
-    PolyTraitRefs(ExpectedFound<ty::PolyTraitRef<'tcx>>),
-}
-
-/// The trace designates the path through inference that we took to
-/// encounter an error or subtyping constraint.
+/// Requires that `region` must be equal to one of the regions in `choice_regions`.
+/// We often denote this using the syntax:
 ///
-/// See the `error_reporting` module for more details.
-#[derive(Clone)]
-pub struct TypeTrace<'tcx> {
-    cause: ObligationCause<'tcx>,
-    values: ValuePairs<'tcx>,
-}
-
-/// The origin of a `r1 <= r2` constraint.
-///
-/// See `error_reporting` module for more details
-#[derive(Clone, Debug)]
-pub enum SubregionOrigin<'tcx> {
-    /// Arose from a subtyping relation
-    Subtype(Box<TypeTrace<'tcx>>),
-
-    /// Stack-allocated closures cannot outlive innermost loop
-    /// or function so as to ensure we only require finite stack
-    InfStackClosure(Span),
-
-    /// Invocation of closure must be within its lifetime
-    InvokeClosure(Span),
-
-    /// Dereference of reference must be within its lifetime
-    DerefPointer(Span),
-
-    /// Closure bound must not outlive captured variables
-    ClosureCapture(Span, hir::HirId),
-
-    /// Index into slice must be within its lifetime
-    IndexSlice(Span),
-
-    /// When casting `&'a T` to an `&'b Trait` object,
-    /// relating `'a` to `'b`
-    RelateObjectBound(Span),
-
-    /// Some type parameter was instantiated with the given type,
-    /// and that type must outlive some region.
-    RelateParamBound(Span, Ty<'tcx>),
-
-    /// The given region parameter was instantiated with a region
-    /// that must outlive some other region.
-    RelateRegionParamBound(Span),
-
-    /// A bound placed on type parameters that states that must outlive
-    /// the moment of their instantiation.
-    RelateDefaultParamBound(Span, Ty<'tcx>),
-
-    /// Creating a pointer `b` to contents of another reference
-    Reborrow(Span),
-
-    /// Creating a pointer `b` to contents of an upvar
-    ReborrowUpvar(Span, ty::UpvarId),
-
-    /// Data with type `Ty<'tcx>` was borrowed
-    DataBorrowed(Ty<'tcx>, Span),
-
-    /// (&'a &'b T) where a >= b
-    ReferenceOutlivesReferent(Ty<'tcx>, Span),
-
-    /// Type or region parameters must be in scope.
-    ParameterInScope(ParameterOrigin, Span),
-
-    /// The type T of an expression E must outlive the lifetime for E.
-    ExprTypeIsNotInScope(Ty<'tcx>, Span),
-
-    /// A `ref b` whose region does not enclose the decl site
-    BindingTypeIsNotValidAtDecl(Span),
-
-    /// Regions appearing in a method receiver must outlive method call
-    CallRcvr(Span),
-
-    /// Regions appearing in a function argument must outlive func call
-    CallArg(Span),
-
-    /// Region in return type of invoked fn must enclose call
-    CallReturn(Span),
-
-    /// Operands must be in scope
-    Operand(Span),
-
-    /// Region resulting from a `&` expr must enclose the `&` expr
-    AddrOf(Span),
-
-    /// An auto-borrow that does not enclose the expr where it occurs
-    AutoBorrow(Span),
-
-    /// Region constraint arriving from destructor safety
-    SafeDestructor(Span),
-
-    /// Comparing the signature and requirements of an impl method against
-    /// the containing trait.
-    CompareImplMethodObligation {
-        span: Span,
-        item_name: ast::Name,
-        impl_item_def_id: DefId,
-        trait_item_def_id: DefId,
-    },
-}
-
-// `SubregionOrigin` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(target_arch = "x86_64")]
-static_assert_size!(SubregionOrigin<'_>, 32);
-
-/// Places that type/region parameters can appear.
-#[derive(Clone, Copy, Debug)]
-pub enum ParameterOrigin {
-    Path,               // foo::bar
-    MethodCall,         // foo.bar() <-- parameters on impl providing bar()
-    OverloadedOperator, // a + b when overloaded
-    OverloadedDeref,    // *a when overloaded
-}
-
-/// Times when we replace late-bound regions with variables:
-#[derive(Clone, Copy, Debug)]
-pub enum LateBoundRegionConversionTime {
-    /// when a fn is called
-    FnCall,
-
-    /// when two higher-ranked types are compared
-    HigherRankedType,
-
-    /// when projecting an associated type
-    AssocTypeProjection(DefId),
-}
-
-/// Reasons to create a region inference variable
-///
-/// See `error_reporting` module for more details
-#[derive(Copy, Clone, Debug)]
-pub enum RegionVariableOrigin {
-    /// Region variables created for ill-categorized reasons,
-    /// mostly indicates places in need of refactoring
-    MiscVariable(Span),
-
-    /// Regions created by a `&P` or `[...]` pattern
-    PatternRegion(Span),
-
-    /// Regions created by `&` operator
-    AddrOfRegion(Span),
-
-    /// Regions created as part of an autoref of a method receiver
-    Autoref(Span),
-
-    /// Regions created as part of an automatic coercion
-    Coercion(Span),
-
-    /// Region variables created as the values for early-bound regions
-    EarlyBoundRegion(Span, Symbol),
-
-    /// Region variables created for bound regions
-    /// in a function or method that is called
-    LateBoundRegion(Span, ty::BoundRegion, LateBoundRegionConversionTime),
-
-    UpvarRegion(ty::UpvarId, Span),
-
-    BoundRegionInCoherence(ast::Name),
-
-    /// This origin is used for the inference variables that we create
-    /// during NLL region processing.
-    NLL(NLLRegionVariableOrigin),
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum NLLRegionVariableOrigin {
-    /// During NLL region processing, we create variables for free
-    /// regions that we encounter in the function signature and
-    /// elsewhere. This origin indices we've got one of those.
-    FreeRegion,
-
-    /// "Universal" instantiation of a higher-ranked region (e.g.,
-    /// from a `for<'a> T` binder). Meant to represent "any region".
-    Placeholder(ty::PlaceholderRegion),
-
-    Existential {
-        /// If this is true, then this variable was created to represent a lifetime
-        /// bound in a `for` binder. For example, it might have been created to
-        /// represent the lifetime `'a` in a type like `for<'a> fn(&'a u32)`.
-        /// Such variables are created when we are trying to figure out if there
-        /// is any valid instantiation of `'a` that could fit into some scenario.
-        ///
-        /// This is used to inform error reporting: in the case that we are trying to
-        /// determine whether there is any valid instantiation of a `'a` variable that meets
-        /// some constraint C, we want to blame the "source" of that `for` type,
-        /// rather than blaming the source of the constraint C.
-        from_forall: bool,
-    },
-}
-
-impl NLLRegionVariableOrigin {
-    pub fn is_universal(self) -> bool {
-        match self {
-            NLLRegionVariableOrigin::FreeRegion => true,
-            NLLRegionVariableOrigin::Placeholder(..) => true,
-            NLLRegionVariableOrigin::Existential { .. } => false,
-        }
-    }
-
-    pub fn is_existential(self) -> bool {
-        !self.is_universal()
-    }
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FixupError<'tcx> {
-    UnresolvedIntTy(IntVid),
-    UnresolvedFloatTy(FloatVid),
-    UnresolvedTy(TyVid),
-    UnresolvedConst(ConstVid<'tcx>),
-}
-
-/// See the `region_obligations` field for more information.
-#[derive(Clone)]
-pub struct RegionObligation<'tcx> {
-    pub sub_region: ty::Region<'tcx>,
-    pub sup_type: Ty<'tcx>,
-    pub origin: SubregionOrigin<'tcx>,
-}
-
-impl<'tcx> fmt::Display for FixupError<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use self::FixupError::*;
-
-        match *self {
-            UnresolvedIntTy(_) => write!(
-                f,
-                "cannot determine the type of this integer; \
-                 add a suffix to specify the type explicitly"
-            ),
-            UnresolvedFloatTy(_) => write!(
-                f,
-                "cannot determine the type of this number; \
-                 add a suffix to specify the type explicitly"
-            ),
-            UnresolvedTy(_) => write!(f, "unconstrained type"),
-            UnresolvedConst(_) => write!(f, "unconstrained const value"),
-        }
-    }
-}
-
-/// Helper type of a temporary returned by `tcx.infer_ctxt()`.
-/// Necessary because we can't write the following bound:
-/// `F: for<'b, 'tcx> where 'tcx FnOnce(InferCtxt<'b, 'tcx>)`.
-pub struct InferCtxtBuilder<'tcx> {
-    global_tcx: TyCtxt<'tcx>,
-    fresh_tables: Option<RefCell<ty::TypeckTables<'tcx>>>,
-}
-
-impl TyCtxt<'tcx> {
-    pub fn infer_ctxt(self) -> InferCtxtBuilder<'tcx> {
-        InferCtxtBuilder { global_tcx: self, fresh_tables: None }
-    }
-}
-
-impl<'tcx> InferCtxtBuilder<'tcx> {
-    /// Used only by `rustc_typeck` during body type-checking/inference,
-    /// will initialize `in_progress_tables` with fresh `TypeckTables`.
-    pub fn with_fresh_in_progress_tables(mut self, table_owner: DefId) -> Self {
-        self.fresh_tables = Some(RefCell::new(ty::TypeckTables::empty(Some(table_owner))));
-        self
-    }
-
-    /// Given a canonical value `C` as a starting point, create an
-    /// inference context that contains each of the bound values
-    /// within instantiated as a fresh variable. The `f` closure is
-    /// invoked with the new infcx, along with the instantiated value
-    /// `V` and a substitution `S`. This substitution `S` maps from
-    /// the bound values in `C` to their instantiated values in `V`
-    /// (in other words, `S(C) = V`).
-    pub fn enter_with_canonical<T, R>(
-        &mut self,
-        span: Span,
-        canonical: &Canonical<'tcx, T>,
-        f: impl for<'a> FnOnce(InferCtxt<'a, 'tcx>, T, CanonicalVarValues<'tcx>) -> R,
-    ) -> R
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        self.enter(|infcx| {
-            let (value, subst) =
-                infcx.instantiate_canonical_with_fresh_inference_vars(span, canonical);
-            f(infcx, value, subst)
-        })
-    }
-
-    pub fn enter<R>(&mut self, f: impl for<'a> FnOnce(InferCtxt<'a, 'tcx>) -> R) -> R {
-        let InferCtxtBuilder { global_tcx, ref fresh_tables } = *self;
-        let in_progress_tables = fresh_tables.as_ref();
-        global_tcx.enter_local(|tcx| {
-            f(InferCtxt {
-                tcx,
-                in_progress_tables,
-                projection_cache: Default::default(),
-                type_variables: RefCell::new(type_variable::TypeVariableTable::new()),
-                const_unification_table: RefCell::new(ut::UnificationTable::new()),
-                int_unification_table: RefCell::new(ut::UnificationTable::new()),
-                float_unification_table: RefCell::new(ut::UnificationTable::new()),
-                region_constraints: RefCell::new(Some(RegionConstraintCollector::new())),
-                lexical_region_resolutions: RefCell::new(None),
-                selection_cache: Default::default(),
-                evaluation_cache: Default::default(),
-                reported_trait_errors: Default::default(),
-                reported_closure_mismatch: Default::default(),
-                tainted_by_errors_flag: Cell::new(false),
-                err_count_on_creation: tcx.sess.err_count(),
-                in_snapshot: Cell::new(false),
-                region_obligations: RefCell::new(vec![]),
-                universe: Cell::new(ty::UniverseIndex::ROOT),
-            })
-        })
-    }
-}
-
-impl<T> ExpectedFound<T> {
-    pub fn new(a_is_expected: bool, a: T, b: T) -> Self {
-        if a_is_expected {
-            ExpectedFound { expected: a, found: b }
-        } else {
-            ExpectedFound { expected: b, found: a }
-        }
-    }
-}
-
-impl<'tcx, T> InferOk<'tcx, T> {
-    pub fn unit(self) -> InferOk<'tcx, ()> {
-        InferOk { value: (), obligations: self.obligations }
-    }
-
-    /// Extracts `value`, registering any obligations into `fulfill_cx`.
-    pub fn into_value_registering_obligations(
-        self,
-        infcx: &InferCtxt<'_, 'tcx>,
-        fulfill_cx: &mut dyn TraitEngine<'tcx>,
-    ) -> T {
-        let InferOk { value, obligations } = self;
-        for obligation in obligations {
-            fulfill_cx.register_predicate_obligation(infcx, obligation);
-        }
-        value
-    }
-}
-
-impl<'tcx> InferOk<'tcx, ()> {
-    pub fn into_obligations(self) -> PredicateObligations<'tcx> {
-        self.obligations
-    }
-}
-
-#[must_use = "once you start a snapshot, you should always consume it"]
-pub struct CombinedSnapshot<'a, 'tcx> {
-    projection_cache_snapshot: traits::ProjectionCacheSnapshot,
-    type_snapshot: type_variable::Snapshot<'tcx>,
-    const_snapshot: ut::Snapshot<ut::InPlace<ty::ConstVid<'tcx>>>,
-    int_snapshot: ut::Snapshot<ut::InPlace<ty::IntVid>>,
-    float_snapshot: ut::Snapshot<ut::InPlace<ty::FloatVid>>,
-    region_constraints_snapshot: RegionSnapshot,
-    region_obligations_snapshot: usize,
-    universe: ty::UniverseIndex,
-    was_in_snapshot: bool,
-    _in_progress_tables: Option<Ref<'a, ty::TypeckTables<'tcx>>>,
-}
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    pub fn is_in_snapshot(&self) -> bool {
-        self.in_snapshot.get()
-    }
-
-    pub fn freshen<T: TypeFoldable<'tcx>>(&self, t: T) -> T {
-        t.fold_with(&mut self.freshener())
-    }
-
-    pub fn type_var_diverges(&'a self, ty: Ty<'_>) -> bool {
-        match ty.kind {
-            ty::Infer(ty::TyVar(vid)) => self.type_variables.borrow().var_diverges(vid),
-            _ => false,
-        }
-    }
-
-    pub fn freshener<'b>(&'b self) -> TypeFreshener<'b, 'tcx> {
-        freshen::TypeFreshener::new(self)
-    }
+/// ```
+/// R0 member of [O1..On]
+/// ```
+#[derive(Debug, Clone, HashStable, TypeFoldable, Lift)]
+pub struct MemberConstraint<'tcx> {
+    /// The `DefId` of the opaque type causing this constraint: used for error reporting.
+    pub opaque_type_def_id: DefId,
 
-    pub fn type_is_unconstrained_numeric(&'a self, ty: Ty<'_>) -> UnconstrainedNumeric {
-        use crate::ty::error::UnconstrainedNumeric::Neither;
-        use crate::ty::error::UnconstrainedNumeric::{UnconstrainedFloat, UnconstrainedInt};
-        match ty.kind {
-            ty::Infer(ty::IntVar(vid)) => {
-                if self.int_unification_table.borrow_mut().probe_value(vid).is_some() {
-                    Neither
-                } else {
-                    UnconstrainedInt
-                }
-            }
-            ty::Infer(ty::FloatVar(vid)) => {
-                if self.float_unification_table.borrow_mut().probe_value(vid).is_some() {
-                    Neither
-                } else {
-                    UnconstrainedFloat
-                }
-            }
-            _ => Neither,
-        }
-    }
+    /// The span where the hidden type was instantiated.
+    pub definition_span: Span,
 
-    pub fn unsolved_variables(&self) -> Vec<Ty<'tcx>> {
-        let mut type_variables = self.type_variables.borrow_mut();
-        let mut int_unification_table = self.int_unification_table.borrow_mut();
-        let mut float_unification_table = self.float_unification_table.borrow_mut();
-        // FIXME(const_generics): should there be an equivalent function for const variables?
+    /// The hidden type in which `member_region` appears: used for error reporting.
+    pub hidden_ty: Ty<'tcx>,
 
-        type_variables
-            .unsolved_variables()
-            .into_iter()
-            .map(|t| self.tcx.mk_ty_var(t))
-            .chain(
-                (0..int_unification_table.len())
-                    .map(|i| ty::IntVid { index: i as u32 })
-                    .filter(|&vid| int_unification_table.probe_value(vid).is_none())
-                    .map(|v| self.tcx.mk_int_var(v)),
-            )
-            .chain(
-                (0..float_unification_table.len())
-                    .map(|i| ty::FloatVid { index: i as u32 })
-                    .filter(|&vid| float_unification_table.probe_value(vid).is_none())
-                    .map(|v| self.tcx.mk_float_var(v)),
-            )
-            .collect()
-    }
-
-    fn combine_fields(
-        &'a self,
-        trace: TypeTrace<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-    ) -> CombineFields<'a, 'tcx> {
-        CombineFields {
-            infcx: self,
-            trace,
-            cause: None,
-            param_env,
-            obligations: PredicateObligations::new(),
-        }
-    }
-
-    /// Clear the "currently in a snapshot" flag, invoke the closure,
-    /// then restore the flag to its original value. This flag is a
-    /// debugging measure designed to detect cases where we start a
-    /// snapshot, create type variables, and register obligations
-    /// which may involve those type variables in the fulfillment cx,
-    /// potentially leaving "dangling type variables" behind.
-    /// In such cases, an assertion will fail when attempting to
-    /// register obligations, within a snapshot. Very useful, much
-    /// better than grovelling through megabytes of `RUSTC_LOG` output.
-    ///
-    /// HOWEVER, in some cases the flag is unhelpful. In particular, we
-    /// sometimes create a "mini-fulfilment-cx" in which we enroll
-    /// obligations. As long as this fulfillment cx is fully drained
-    /// before we return, this is not a problem, as there won't be any
-    /// escaping obligations in the main cx. In those cases, you can
-    /// use this function.
-    pub fn save_and_restore_in_snapshot_flag<F, R>(&self, func: F) -> R
-    where
-        F: FnOnce(&Self) -> R,
-    {
-        let flag = self.in_snapshot.get();
-        self.in_snapshot.set(false);
-        let result = func(self);
-        self.in_snapshot.set(flag);
-        result
-    }
-
-    fn start_snapshot(&self) -> CombinedSnapshot<'a, 'tcx> {
-        debug!("start_snapshot()");
-
-        let in_snapshot = self.in_snapshot.get();
-        self.in_snapshot.set(true);
-
-        CombinedSnapshot {
-            projection_cache_snapshot: self.projection_cache.borrow_mut().snapshot(),
-            type_snapshot: self.type_variables.borrow_mut().snapshot(),
-            const_snapshot: self.const_unification_table.borrow_mut().snapshot(),
-            int_snapshot: self.int_unification_table.borrow_mut().snapshot(),
-            float_snapshot: self.float_unification_table.borrow_mut().snapshot(),
-            region_constraints_snapshot: self.borrow_region_constraints().start_snapshot(),
-            region_obligations_snapshot: self.region_obligations.borrow().len(),
-            universe: self.universe(),
-            was_in_snapshot: in_snapshot,
-            // Borrow tables "in progress" (i.e., during typeck)
-            // to ban writes from within a snapshot to them.
-            _in_progress_tables: self.in_progress_tables.map(|tables| tables.borrow()),
-        }
-    }
-
-    fn rollback_to(&self, cause: &str, snapshot: CombinedSnapshot<'a, 'tcx>) {
-        debug!("rollback_to(cause={})", cause);
-        let CombinedSnapshot {
-            projection_cache_snapshot,
-            type_snapshot,
-            const_snapshot,
-            int_snapshot,
-            float_snapshot,
-            region_constraints_snapshot,
-            region_obligations_snapshot,
-            universe,
-            was_in_snapshot,
-            _in_progress_tables,
-        } = snapshot;
-
-        self.in_snapshot.set(was_in_snapshot);
-        self.universe.set(universe);
-
-        self.projection_cache.borrow_mut().rollback_to(projection_cache_snapshot);
-        self.type_variables.borrow_mut().rollback_to(type_snapshot);
-        self.const_unification_table.borrow_mut().rollback_to(const_snapshot);
-        self.int_unification_table.borrow_mut().rollback_to(int_snapshot);
-        self.float_unification_table.borrow_mut().rollback_to(float_snapshot);
-        self.region_obligations.borrow_mut().truncate(region_obligations_snapshot);
-        self.borrow_region_constraints().rollback_to(region_constraints_snapshot);
-    }
-
-    fn commit_from(&self, snapshot: CombinedSnapshot<'a, 'tcx>) {
-        debug!("commit_from()");
-        let CombinedSnapshot {
-            projection_cache_snapshot,
-            type_snapshot,
-            const_snapshot,
-            int_snapshot,
-            float_snapshot,
-            region_constraints_snapshot,
-            region_obligations_snapshot: _,
-            universe: _,
-            was_in_snapshot,
-            _in_progress_tables,
-        } = snapshot;
-
-        self.in_snapshot.set(was_in_snapshot);
-
-        self.projection_cache.borrow_mut().commit(projection_cache_snapshot);
-        self.type_variables.borrow_mut().commit(type_snapshot);
-        self.const_unification_table.borrow_mut().commit(const_snapshot);
-        self.int_unification_table.borrow_mut().commit(int_snapshot);
-        self.float_unification_table.borrow_mut().commit(float_snapshot);
-        self.borrow_region_constraints().commit(region_constraints_snapshot);
-    }
-
-    /// Executes `f` and commit the bindings.
-    pub fn commit_unconditionally<R, F>(&self, f: F) -> R
-    where
-        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> R,
-    {
-        debug!("commit_unconditionally()");
-        let snapshot = self.start_snapshot();
-        let r = f(&snapshot);
-        self.commit_from(snapshot);
-        r
-    }
-
-    /// Execute `f` and commit the bindings if closure `f` returns `Ok(_)`.
-    pub fn commit_if_ok<T, E, F>(&self, f: F) -> Result<T, E>
-    where
-        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> Result<T, E>,
-    {
-        debug!("commit_if_ok()");
-        let snapshot = self.start_snapshot();
-        let r = f(&snapshot);
-        debug!("commit_if_ok() -- r.is_ok() = {}", r.is_ok());
-        match r {
-            Ok(_) => {
-                self.commit_from(snapshot);
-            }
-            Err(_) => {
-                self.rollback_to("commit_if_ok -- error", snapshot);
-            }
-        }
-        r
-    }
-
-    /// Execute `f` then unroll any bindings it creates.
-    pub fn probe<R, F>(&self, f: F) -> R
-    where
-        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> R,
-    {
-        debug!("probe()");
-        let snapshot = self.start_snapshot();
-        let r = f(&snapshot);
-        self.rollback_to("probe", snapshot);
-        r
-    }
-
-    /// Scan the constraints produced since `snapshot` began and returns:
-    ///
-    /// - `None` -- if none of them involve "region outlives" constraints
-    /// - `Some(true)` -- if there are `'a: 'b` constraints where `'a` or `'b` is a placeholder
-    /// - `Some(false)` -- if there are `'a: 'b` constraints but none involve placeholders
-    pub fn region_constraints_added_in_snapshot(
-        &self,
-        snapshot: &CombinedSnapshot<'a, 'tcx>,
-    ) -> Option<bool> {
-        self.borrow_region_constraints()
-            .region_constraints_added_in_snapshot(&snapshot.region_constraints_snapshot)
-    }
-
-    pub fn add_given(&self, sub: ty::Region<'tcx>, sup: ty::RegionVid) {
-        self.borrow_region_constraints().add_given(sub, sup);
-    }
-
-    pub fn can_sub<T>(&self, param_env: ty::ParamEnv<'tcx>, a: T, b: T) -> UnitResult<'tcx>
-    where
-        T: at::ToTrace<'tcx>,
-    {
-        let origin = &ObligationCause::dummy();
-        self.probe(|_| {
-            self.at(origin, param_env).sub(a, b).map(|InferOk { obligations: _, .. }| {
-                // Ignore obligations, since we are unrolling
-                // everything anyway.
-            })
-        })
-    }
-
-    pub fn can_eq<T>(&self, param_env: ty::ParamEnv<'tcx>, a: T, b: T) -> UnitResult<'tcx>
-    where
-        T: at::ToTrace<'tcx>,
-    {
-        let origin = &ObligationCause::dummy();
-        self.probe(|_| {
-            self.at(origin, param_env).eq(a, b).map(|InferOk { obligations: _, .. }| {
-                // Ignore obligations, since we are unrolling
-                // everything anyway.
-            })
-        })
-    }
-
-    pub fn sub_regions(
-        &self,
-        origin: SubregionOrigin<'tcx>,
-        a: ty::Region<'tcx>,
-        b: ty::Region<'tcx>,
-    ) {
-        debug!("sub_regions({:?} <: {:?})", a, b);
-        self.borrow_region_constraints().make_subregion(origin, a, b);
-    }
-
-    /// Require that the region `r` be equal to one of the regions in
-    /// the set `regions`.
-    pub fn member_constraint(
-        &self,
-        opaque_type_def_id: DefId,
-        definition_span: Span,
-        hidden_ty: Ty<'tcx>,
-        region: ty::Region<'tcx>,
-        in_regions: &Lrc<Vec<ty::Region<'tcx>>>,
-    ) {
-        debug!("member_constraint({:?} <: {:?})", region, in_regions);
-        self.borrow_region_constraints().member_constraint(
-            opaque_type_def_id,
-            definition_span,
-            hidden_ty,
-            region,
-            in_regions,
-        );
-    }
-
-    pub fn subtype_predicate(
-        &self,
-        cause: &ObligationCause<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-        predicate: &ty::PolySubtypePredicate<'tcx>,
-    ) -> Option<InferResult<'tcx, ()>> {
-        // Subtle: it's ok to skip the binder here and resolve because
-        // `shallow_resolve` just ignores anything that is not a type
-        // variable, and because type variable's can't (at present, at
-        // least) capture any of the things bound by this binder.
-        //
-        // NOTE(nmatsakis): really, there is no *particular* reason to do this
-        // `shallow_resolve` here except as a micro-optimization.
-        // Naturally I could not resist.
-        let two_unbound_type_vars = {
-            let a = self.shallow_resolve(predicate.skip_binder().a);
-            let b = self.shallow_resolve(predicate.skip_binder().b);
-            a.is_ty_var() && b.is_ty_var()
-        };
-
-        if two_unbound_type_vars {
-            // Two unbound type variables? Can't make progress.
-            return None;
-        }
-
-        Some(self.commit_if_ok(|snapshot| {
-            let (ty::SubtypePredicate { a_is_expected, a, b }, placeholder_map) =
-                self.replace_bound_vars_with_placeholders(predicate);
-
-            let ok = self.at(cause, param_env).sub_exp(a_is_expected, a, b)?;
-
-            self.leak_check(false, &placeholder_map, snapshot)?;
-
-            Ok(ok.unit())
-        }))
-    }
-
-    pub fn region_outlives_predicate(
-        &self,
-        cause: &traits::ObligationCause<'tcx>,
-        predicate: &ty::PolyRegionOutlivesPredicate<'tcx>,
-    ) -> UnitResult<'tcx> {
-        self.commit_if_ok(|snapshot| {
-            let (ty::OutlivesPredicate(r_a, r_b), placeholder_map) =
-                self.replace_bound_vars_with_placeholders(predicate);
-            let origin = SubregionOrigin::from_obligation_cause(cause, || {
-                RelateRegionParamBound(cause.span)
-            });
-            self.sub_regions(origin, r_b, r_a); // `b : a` ==> `a <= b`
-            self.leak_check(false, &placeholder_map, snapshot)?;
-            Ok(())
-        })
-    }
-
-    pub fn next_ty_var_id(&self, diverging: bool, origin: TypeVariableOrigin) -> TyVid {
-        self.type_variables.borrow_mut().new_var(self.universe(), diverging, origin)
-    }
-
-    pub fn next_ty_var(&self, origin: TypeVariableOrigin) -> Ty<'tcx> {
-        self.tcx.mk_ty_var(self.next_ty_var_id(false, origin))
-    }
-
-    pub fn next_ty_var_in_universe(
-        &self,
-        origin: TypeVariableOrigin,
-        universe: ty::UniverseIndex,
-    ) -> Ty<'tcx> {
-        let vid = self.type_variables.borrow_mut().new_var(universe, false, origin);
-        self.tcx.mk_ty_var(vid)
-    }
-
-    pub fn next_diverging_ty_var(&self, origin: TypeVariableOrigin) -> Ty<'tcx> {
-        self.tcx.mk_ty_var(self.next_ty_var_id(true, origin))
-    }
-
-    pub fn next_const_var(
-        &self,
-        ty: Ty<'tcx>,
-        origin: ConstVariableOrigin,
-    ) -> &'tcx ty::Const<'tcx> {
-        self.tcx.mk_const_var(self.next_const_var_id(origin), ty)
-    }
-
-    pub fn next_const_var_in_universe(
-        &self,
-        ty: Ty<'tcx>,
-        origin: ConstVariableOrigin,
-        universe: ty::UniverseIndex,
-    ) -> &'tcx ty::Const<'tcx> {
-        let vid = self
-            .const_unification_table
-            .borrow_mut()
-            .new_key(ConstVarValue { origin, val: ConstVariableValue::Unknown { universe } });
-        self.tcx.mk_const_var(vid, ty)
-    }
-
-    pub fn next_const_var_id(&self, origin: ConstVariableOrigin) -> ConstVid<'tcx> {
-        self.const_unification_table.borrow_mut().new_key(ConstVarValue {
-            origin,
-            val: ConstVariableValue::Unknown { universe: self.universe() },
-        })
-    }
-
-    fn next_int_var_id(&self) -> IntVid {
-        self.int_unification_table.borrow_mut().new_key(None)
-    }
-
-    pub fn next_int_var(&self) -> Ty<'tcx> {
-        self.tcx.mk_int_var(self.next_int_var_id())
-    }
-
-    fn next_float_var_id(&self) -> FloatVid {
-        self.float_unification_table.borrow_mut().new_key(None)
-    }
-
-    pub fn next_float_var(&self) -> Ty<'tcx> {
-        self.tcx.mk_float_var(self.next_float_var_id())
-    }
-
-    /// Creates a fresh region variable with the next available index.
-    /// The variable will be created in the maximum universe created
-    /// thus far, allowing it to name any region created thus far.
-    pub fn next_region_var(&self, origin: RegionVariableOrigin) -> ty::Region<'tcx> {
-        self.next_region_var_in_universe(origin, self.universe())
-    }
-
-    /// Creates a fresh region variable with the next available index
-    /// in the given universe; typically, you can use
-    /// `next_region_var` and just use the maximal universe.
-    pub fn next_region_var_in_universe(
-        &self,
-        origin: RegionVariableOrigin,
-        universe: ty::UniverseIndex,
-    ) -> ty::Region<'tcx> {
-        let region_var = self.borrow_region_constraints().new_region_var(universe, origin);
-        self.tcx.mk_region(ty::ReVar(region_var))
-    }
-
-    /// Return the universe that the region `r` was created in.  For
-    /// most regions (e.g., `'static`, named regions from the user,
-    /// etc) this is the root universe U0. For inference variables or
-    /// placeholders, however, it will return the universe which which
-    /// they are associated.
-    fn universe_of_region(&self, r: ty::Region<'tcx>) -> ty::UniverseIndex {
-        self.borrow_region_constraints().universe(r)
-    }
-
-    /// Number of region variables created so far.
-    pub fn num_region_vars(&self) -> usize {
-        self.borrow_region_constraints().num_region_vars()
-    }
-
-    /// Just a convenient wrapper of `next_region_var` for using during NLL.
-    pub fn next_nll_region_var(&self, origin: NLLRegionVariableOrigin) -> ty::Region<'tcx> {
-        self.next_region_var(RegionVariableOrigin::NLL(origin))
-    }
-
-    /// Just a convenient wrapper of `next_region_var` for using during NLL.
-    pub fn next_nll_region_var_in_universe(
-        &self,
-        origin: NLLRegionVariableOrigin,
-        universe: ty::UniverseIndex,
-    ) -> ty::Region<'tcx> {
-        self.next_region_var_in_universe(RegionVariableOrigin::NLL(origin), universe)
-    }
-
-    pub fn var_for_def(&self, span: Span, param: &ty::GenericParamDef) -> GenericArg<'tcx> {
-        match param.kind {
-            GenericParamDefKind::Lifetime => {
-                // Create a region inference variable for the given
-                // region parameter definition.
-                self.next_region_var(EarlyBoundRegion(span, param.name)).into()
-            }
-            GenericParamDefKind::Type { .. } => {
-                // Create a type inference variable for the given
-                // type parameter definition. The substitutions are
-                // for actual parameters that may be referred to by
-                // the default of this type parameter, if it exists.
-                // e.g., `struct Foo<A, B, C = (A, B)>(...);` when
-                // used in a path such as `Foo::<T, U>::new()` will
-                // use an inference variable for `C` with `[T, U]`
-                // as the substitutions for the default, `(T, U)`.
-                let ty_var_id = self.type_variables.borrow_mut().new_var(
-                    self.universe(),
-                    false,
-                    TypeVariableOrigin {
-                        kind: TypeVariableOriginKind::TypeParameterDefinition(
-                            param.name,
-                            Some(param.def_id),
-                        ),
-                        span,
-                    },
-                );
-
-                self.tcx.mk_ty_var(ty_var_id).into()
-            }
-            GenericParamDefKind::Const { .. } => {
-                let origin = ConstVariableOrigin {
-                    kind: ConstVariableOriginKind::ConstParameterDefinition(param.name),
-                    span,
-                };
-                let const_var_id =
-                    self.const_unification_table.borrow_mut().new_key(ConstVarValue {
-                        origin,
-                        val: ConstVariableValue::Unknown { universe: self.universe() },
-                    });
-                self.tcx.mk_const_var(const_var_id, self.tcx.type_of(param.def_id)).into()
-            }
-        }
-    }
-
-    /// Given a set of generics defined on a type or impl, returns a substitution mapping each
-    /// type/region parameter to a fresh inference variable.
-    pub fn fresh_substs_for_item(&self, span: Span, def_id: DefId) -> SubstsRef<'tcx> {
-        InternalSubsts::for_item(self.tcx, def_id, |param, _| self.var_for_def(span, param))
-    }
-
-    /// Returns `true` if errors have been reported since this infcx was
-    /// created. This is sometimes used as a heuristic to skip
-    /// reporting errors that often occur as a result of earlier
-    /// errors, but where it's hard to be 100% sure (e.g., unresolved
-    /// inference variables, regionck errors).
-    pub fn is_tainted_by_errors(&self) -> bool {
-        debug!(
-            "is_tainted_by_errors(err_count={}, err_count_on_creation={}, \
-             tainted_by_errors_flag={})",
-            self.tcx.sess.err_count(),
-            self.err_count_on_creation,
-            self.tainted_by_errors_flag.get()
-        );
-
-        if self.tcx.sess.err_count() > self.err_count_on_creation {
-            return true; // errors reported since this infcx was made
-        }
-        self.tainted_by_errors_flag.get()
-    }
-
-    /// Set the "tainted by errors" flag to true. We call this when we
-    /// observe an error from a prior pass.
-    pub fn set_tainted_by_errors(&self) {
-        debug!("set_tainted_by_errors()");
-        self.tainted_by_errors_flag.set(true)
-    }
-
-    /// Process the region constraints and report any errors that
-    /// result. After this, no more unification operations should be
-    /// done -- or the compiler will panic -- but it is legal to use
-    /// `resolve_vars_if_possible` as well as `fully_resolve`.
-    pub fn resolve_regions_and_report_errors(
-        &self,
-        region_context: DefId,
-        region_map: &region::ScopeTree,
-        outlives_env: &OutlivesEnvironment<'tcx>,
-        suppress: SuppressRegionErrors,
-    ) {
-        assert!(
-            self.is_tainted_by_errors() || self.region_obligations.borrow().is_empty(),
-            "region_obligations not empty: {:#?}",
-            self.region_obligations.borrow()
-        );
-
-        let region_rels = &RegionRelations::new(
-            self.tcx,
-            region_context,
-            region_map,
-            outlives_env.free_region_map(),
-        );
-        let (var_infos, data) = self
-            .region_constraints
-            .borrow_mut()
-            .take()
-            .expect("regions already resolved")
-            .into_infos_and_data();
-        let (lexical_region_resolutions, errors) =
-            lexical_region_resolve::resolve(region_rels, var_infos, data);
-
-        let old_value = self.lexical_region_resolutions.replace(Some(lexical_region_resolutions));
-        assert!(old_value.is_none());
-
-        if !self.is_tainted_by_errors() {
-            // As a heuristic, just skip reporting region errors
-            // altogether if other errors have been reported while
-            // this infcx was in use.  This is totally hokey but
-            // otherwise we have a hard time separating legit region
-            // errors from silly ones.
-            self.report_region_errors(region_map, &errors, suppress);
-        }
-    }
-
-    /// Obtains (and clears) the current set of region
-    /// constraints. The inference context is still usable: further
-    /// unifications will simply add new constraints.
-    ///
-    /// This method is not meant to be used with normal lexical region
-    /// resolution. Rather, it is used in the NLL mode as a kind of
-    /// interim hack: basically we run normal type-check and generate
-    /// region constraints as normal, but then we take them and
-    /// translate them into the form that the NLL solver
-    /// understands. See the NLL module for mode details.
-    pub fn take_and_reset_region_constraints(&self) -> RegionConstraintData<'tcx> {
-        assert!(
-            self.region_obligations.borrow().is_empty(),
-            "region_obligations not empty: {:#?}",
-            self.region_obligations.borrow()
-        );
-
-        self.borrow_region_constraints().take_and_reset_data()
-    }
-
-    /// Gives temporary access to the region constraint data.
-    #[allow(non_camel_case_types)] // bug with impl trait
-    pub fn with_region_constraints<R>(
-        &self,
-        op: impl FnOnce(&RegionConstraintData<'tcx>) -> R,
-    ) -> R {
-        let region_constraints = self.borrow_region_constraints();
-        op(region_constraints.data())
-    }
-
-    /// Takes ownership of the list of variable regions. This implies
-    /// that all the region constraints have already been taken, and
-    /// hence that `resolve_regions_and_report_errors` can never be
-    /// called. This is used only during NLL processing to "hand off" ownership
-    /// of the set of region variables into the NLL region context.
-    pub fn take_region_var_origins(&self) -> VarInfos {
-        let (var_infos, data) = self
-            .region_constraints
-            .borrow_mut()
-            .take()
-            .expect("regions already resolved")
-            .into_infos_and_data();
-        assert!(data.is_empty());
-        var_infos
-    }
-
-    pub fn ty_to_string(&self, t: Ty<'tcx>) -> String {
-        self.resolve_vars_if_possible(&t).to_string()
-    }
-
-    pub fn tys_to_string(&self, ts: &[Ty<'tcx>]) -> String {
-        let tstrs: Vec<String> = ts.iter().map(|t| self.ty_to_string(*t)).collect();
-        format!("({})", tstrs.join(", "))
-    }
-
-    pub fn trait_ref_to_string(&self, t: &ty::TraitRef<'tcx>) -> String {
-        self.resolve_vars_if_possible(t).print_only_trait_path().to_string()
-    }
-
-    /// If `TyVar(vid)` resolves to a type, return that type. Else, return the
-    /// universe index of `TyVar(vid)`.
-    pub fn probe_ty_var(&self, vid: TyVid) -> Result<Ty<'tcx>, ty::UniverseIndex> {
-        use self::type_variable::TypeVariableValue;
-
-        match self.type_variables.borrow_mut().probe(vid) {
-            TypeVariableValue::Known { value } => Ok(value),
-            TypeVariableValue::Unknown { universe } => Err(universe),
-        }
-    }
-
-    /// Resolve any type variables found in `value` -- but only one
-    /// level.  So, if the variable `?X` is bound to some type
-    /// `Foo<?Y>`, then this would return `Foo<?Y>` (but `?Y` may
-    /// itself be bound to a type).
-    ///
-    /// Useful when you only need to inspect the outermost level of
-    /// the type and don't care about nested types (or perhaps you
-    /// will be resolving them as well, e.g. in a loop).
-    pub fn shallow_resolve<T>(&self, value: T) -> T
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        let mut r = ShallowResolver::new(self);
-        value.fold_with(&mut r)
-    }
-
-    pub fn root_var(&self, var: ty::TyVid) -> ty::TyVid {
-        self.type_variables.borrow_mut().root_var(var)
-    }
-
-    /// Where possible, replaces type/const variables in
-    /// `value` with their final value. Note that region variables
-    /// are unaffected. If a type/const variable has not been unified, it
-    /// is left as is. This is an idempotent operation that does
-    /// not affect inference state in any way and so you can do it
-    /// at will.
-    pub fn resolve_vars_if_possible<T>(&self, value: &T) -> T
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        if !value.needs_infer() {
-            return value.clone(); // Avoid duplicated subst-folding.
-        }
-        let mut r = resolve::OpportunisticVarResolver::new(self);
-        value.fold_with(&mut r)
-    }
-
-    /// Returns the first unresolved variable contained in `T`. In the
-    /// process of visiting `T`, this will resolve (where possible)
-    /// type variables in `T`, but it never constructs the final,
-    /// resolved type, so it's more efficient than
-    /// `resolve_vars_if_possible()`.
-    pub fn unresolved_type_vars<T>(&self, value: &T) -> Option<(Ty<'tcx>, Option<Span>)>
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        let mut r = resolve::UnresolvedTypeFinder::new(self);
-        value.visit_with(&mut r);
-        r.first_unresolved
-    }
-
-    pub fn probe_const_var(
-        &self,
-        vid: ty::ConstVid<'tcx>,
-    ) -> Result<&'tcx ty::Const<'tcx>, ty::UniverseIndex> {
-        match self.const_unification_table.borrow_mut().probe_value(vid).val {
-            ConstVariableValue::Known { value } => Ok(value),
-            ConstVariableValue::Unknown { universe } => Err(universe),
-        }
-    }
-
-    pub fn fully_resolve<T: TypeFoldable<'tcx>>(&self, value: &T) -> FixupResult<'tcx, T> {
-        /*!
-         * Attempts to resolve all type/region/const variables in
-         * `value`. Region inference must have been run already (e.g.,
-         * by calling `resolve_regions_and_report_errors`). If some
-         * variable was never unified, an `Err` results.
-         *
-         * This method is idempotent, but it not typically not invoked
-         * except during the writeback phase.
-         */
-
-        resolve::fully_resolve(self, value)
-    }
-
-    // [Note-Type-error-reporting]
-    // An invariant is that anytime the expected or actual type is Error (the special
-    // error type, meaning that an error occurred when typechecking this expression),
-    // this is a derived error. The error cascaded from another error (that was already
-    // reported), so it's not useful to display it to the user.
-    // The following methods implement this logic.
-    // They check if either the actual or expected type is Error, and don't print the error
-    // in this case. The typechecker should only ever report type errors involving mismatched
-    // types using one of these methods, and should not call span_err directly for such
-    // errors.
-
-    pub fn type_error_struct_with_diag<M>(
-        &self,
-        sp: Span,
-        mk_diag: M,
-        actual_ty: Ty<'tcx>,
-    ) -> DiagnosticBuilder<'tcx>
-    where
-        M: FnOnce(String) -> DiagnosticBuilder<'tcx>,
-    {
-        let actual_ty = self.resolve_vars_if_possible(&actual_ty);
-        debug!("type_error_struct_with_diag({:?}, {:?})", sp, actual_ty);
-
-        // Don't report an error if actual type is `Error`.
-        if actual_ty.references_error() {
-            return self.tcx.sess.diagnostic().struct_dummy();
-        }
-
-        mk_diag(self.ty_to_string(actual_ty))
-    }
-
-    pub fn report_mismatched_types(
-        &self,
-        cause: &ObligationCause<'tcx>,
-        expected: Ty<'tcx>,
-        actual: Ty<'tcx>,
-        err: TypeError<'tcx>,
-    ) -> DiagnosticBuilder<'tcx> {
-        let trace = TypeTrace::types(cause, true, expected, actual);
-        self.report_and_explain_type_error(trace, &err)
-    }
-
-    pub fn replace_bound_vars_with_fresh_vars<T>(
-        &self,
-        span: Span,
-        lbrct: LateBoundRegionConversionTime,
-        value: &ty::Binder<T>,
-    ) -> (T, BTreeMap<ty::BoundRegion, ty::Region<'tcx>>)
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        let fld_r = |br| self.next_region_var(LateBoundRegion(span, br, lbrct));
-        let fld_t = |_| {
-            self.next_ty_var(TypeVariableOrigin {
-                kind: TypeVariableOriginKind::MiscVariable,
-                span,
-            })
-        };
-        let fld_c = |_, ty| {
-            self.next_const_var(
-                ty,
-                ConstVariableOrigin { kind: ConstVariableOriginKind::MiscVariable, span },
-            )
-        };
-        self.tcx.replace_bound_vars(value, fld_r, fld_t, fld_c)
-    }
-
-    /// See the [`region_constraints::verify_generic_bound`] method.
-    pub fn verify_generic_bound(
-        &self,
-        origin: SubregionOrigin<'tcx>,
-        kind: GenericKind<'tcx>,
-        a: ty::Region<'tcx>,
-        bound: VerifyBound<'tcx>,
-    ) {
-        debug!("verify_generic_bound({:?}, {:?} <: {:?})", kind, a, bound);
-
-        self.borrow_region_constraints().verify_generic_bound(origin, kind, a, bound);
-    }
-
-    pub fn type_is_copy_modulo_regions(
-        &self,
-        param_env: ty::ParamEnv<'tcx>,
-        ty: Ty<'tcx>,
-        span: Span,
-    ) -> bool {
-        let ty = self.resolve_vars_if_possible(&ty);
-
-        // Even if the type may have no inference variables, during
-        // type-checking closure types are in local tables only.
-        if !self.in_progress_tables.is_some() || !ty.has_closure_types() {
-            if !(param_env, ty).has_local_value() {
-                return ty.is_copy_modulo_regions(self.tcx, param_env, span);
-            }
-        }
-
-        let copy_def_id = self.tcx.require_lang_item(lang_items::CopyTraitLangItem, None);
-
-        // This can get called from typeck (by euv), and `moves_by_default`
-        // rightly refuses to work with inference variables, but
-        // moves_by_default has a cache, which we want to use in other
-        // cases.
-        traits::type_known_to_meet_bound_modulo_regions(self, param_env, ty, copy_def_id, span)
-    }
-
-    /// Obtains the latest type of the given closure; this may be a
-    /// closure in the current function, in which case its
-    /// `ClosureKind` may not yet be known.
-    pub fn closure_kind(
-        &self,
-        closure_def_id: DefId,
-        closure_substs: SubstsRef<'tcx>,
-    ) -> Option<ty::ClosureKind> {
-        let closure_kind_ty = closure_substs.as_closure().kind_ty(closure_def_id, self.tcx);
-        let closure_kind_ty = self.shallow_resolve(closure_kind_ty);
-        closure_kind_ty.to_opt_closure_kind()
-    }
-
-    /// Obtains the signature of a closure. For closures, unlike
-    /// `tcx.fn_sig(def_id)`, this method will work during the
-    /// type-checking of the enclosing function and return the closure
-    /// signature in its partially inferred state.
-    pub fn closure_sig(&self, def_id: DefId, substs: SubstsRef<'tcx>) -> ty::PolyFnSig<'tcx> {
-        let closure_sig_ty = substs.as_closure().sig_ty(def_id, self.tcx);
-        let closure_sig_ty = self.shallow_resolve(closure_sig_ty);
-        closure_sig_ty.fn_sig(self.tcx)
-    }
-
-    /// Normalizes associated types in `value`, potentially returning
-    /// new obligations that must further be processed.
-    pub fn partially_normalize_associated_types_in<T>(
-        &self,
-        span: Span,
-        body_id: hir::HirId,
-        param_env: ty::ParamEnv<'tcx>,
-        value: &T,
-    ) -> InferOk<'tcx, T>
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        debug!("partially_normalize_associated_types_in(value={:?})", value);
-        let mut selcx = traits::SelectionContext::new(self);
-        let cause = ObligationCause::misc(span, body_id);
-        let traits::Normalized { value, obligations } =
-            traits::normalize(&mut selcx, param_env, cause, value);
-        debug!(
-            "partially_normalize_associated_types_in: result={:?} predicates={:?}",
-            value, obligations
-        );
-        InferOk { value, obligations }
-    }
-
-    pub fn borrow_region_constraints(&self) -> RefMut<'_, RegionConstraintCollector<'tcx>> {
-        RefMut::map(self.region_constraints.borrow_mut(), |c| {
-            c.as_mut().expect("region constraints already solved")
-        })
-    }
-
-    /// Clears the selection, evaluation, and projection caches. This is useful when
-    /// repeatedly attempting to select an `Obligation` while changing only
-    /// its `ParamEnv`, since `FulfillmentContext` doesn't use probing.
-    pub fn clear_caches(&self) {
-        self.selection_cache.clear();
-        self.evaluation_cache.clear();
-        self.projection_cache.borrow_mut().clear();
-    }
-
-    fn universe(&self) -> ty::UniverseIndex {
-        self.universe.get()
-    }
-
-    /// Creates and return a fresh universe that extends all previous
-    /// universes. Updates `self.universe` to that new universe.
-    pub fn create_next_universe(&self) -> ty::UniverseIndex {
-        let u = self.universe.get().next_universe();
-        self.universe.set(u);
-        u
-    }
-}
-
-pub struct ShallowResolver<'a, 'tcx> {
-    infcx: &'a InferCtxt<'a, 'tcx>,
-}
-
-impl<'a, 'tcx> ShallowResolver<'a, 'tcx> {
-    #[inline(always)]
-    pub fn new(infcx: &'a InferCtxt<'a, 'tcx>) -> Self {
-        ShallowResolver { infcx }
-    }
-
-    /// If `typ` is a type variable of some kind, resolve it one level
-    /// (but do not resolve types found in the result). If `typ` is
-    /// not a type variable, just return it unmodified.
-    pub fn shallow_resolve(&mut self, typ: Ty<'tcx>) -> Ty<'tcx> {
-        match typ.kind {
-            ty::Infer(ty::TyVar(v)) => {
-                // Not entirely obvious: if `typ` is a type variable,
-                // it can be resolved to an int/float variable, which
-                // can then be recursively resolved, hence the
-                // recursion. Note though that we prevent type
-                // variables from unifying to other type variables
-                // directly (though they may be embedded
-                // structurally), and we prevent cycles in any case,
-                // so this recursion should always be of very limited
-                // depth.
-                self.infcx
-                    .type_variables
-                    .borrow_mut()
-                    .probe(v)
-                    .known()
-                    .map(|t| self.fold_ty(t))
-                    .unwrap_or(typ)
-            }
-
-            ty::Infer(ty::IntVar(v)) => self
-                .infcx
-                .int_unification_table
-                .borrow_mut()
-                .probe_value(v)
-                .map(|v| v.to_type(self.infcx.tcx))
-                .unwrap_or(typ),
-
-            ty::Infer(ty::FloatVar(v)) => self
-                .infcx
-                .float_unification_table
-                .borrow_mut()
-                .probe_value(v)
-                .map(|v| v.to_type(self.infcx.tcx))
-                .unwrap_or(typ),
-
-            _ => typ,
-        }
-    }
-
-    // `resolver.shallow_resolve_changed(ty)` is equivalent to
-    // `resolver.shallow_resolve(ty) != ty`, but more efficient. It's always
-    // inlined, despite being large, because it has only two call sites that
-    // are extremely hot.
-    #[inline(always)]
-    pub fn shallow_resolve_changed(&self, infer: ty::InferTy) -> bool {
-        match infer {
-            ty::TyVar(v) => {
-                use self::type_variable::TypeVariableValue;
-
-                // If `inlined_probe` returns a `Known` value its `kind` never
-                // matches `infer`.
-                match self.infcx.type_variables.borrow_mut().inlined_probe(v) {
-                    TypeVariableValue::Unknown { .. } => false,
-                    TypeVariableValue::Known { .. } => true,
-                }
-            }
-
-            ty::IntVar(v) => {
-                // If inlined_probe_value returns a value it's always a
-                // `ty::Int(_)` or `ty::UInt(_)`, which nevers matches a
-                // `ty::Infer(_)`.
-                self.infcx.int_unification_table.borrow_mut().inlined_probe_value(v).is_some()
-            }
-
-            ty::FloatVar(v) => {
-                // If inlined_probe_value returns a value it's always a
-                // `ty::Float(_)`, which nevers matches a `ty::Infer(_)`.
-                //
-                // Not `inlined_probe_value(v)` because this call site is colder.
-                self.infcx.float_unification_table.borrow_mut().probe_value(v).is_some()
-            }
-
-            _ => unreachable!(),
-        }
-    }
-}
-
-impl<'a, 'tcx> TypeFolder<'tcx> for ShallowResolver<'a, 'tcx> {
-    fn tcx<'b>(&'b self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
-        self.shallow_resolve(ty)
-    }
-
-    fn fold_const(&mut self, ct: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
-        if let ty::Const { val: ty::ConstKind::Infer(InferConst::Var(vid)), .. } = ct {
-            self.infcx
-                .const_unification_table
-                .borrow_mut()
-                .probe_value(*vid)
-                .val
-                .known()
-                .unwrap_or(ct)
-        } else {
-            ct
-        }
-    }
-}
-
-impl<'tcx> TypeTrace<'tcx> {
-    pub fn span(&self) -> Span {
-        self.cause.span
-    }
-
-    pub fn types(
-        cause: &ObligationCause<'tcx>,
-        a_is_expected: bool,
-        a: Ty<'tcx>,
-        b: Ty<'tcx>,
-    ) -> TypeTrace<'tcx> {
-        TypeTrace { cause: cause.clone(), values: Types(ExpectedFound::new(a_is_expected, a, b)) }
-    }
-
-    pub fn dummy(tcx: TyCtxt<'tcx>) -> TypeTrace<'tcx> {
-        TypeTrace {
-            cause: ObligationCause::dummy(),
-            values: Types(ExpectedFound { expected: tcx.types.err, found: tcx.types.err }),
-        }
-    }
-}
-
-impl<'tcx> fmt::Debug for TypeTrace<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "TypeTrace({:?})", self.cause)
-    }
-}
-
-impl<'tcx> SubregionOrigin<'tcx> {
-    pub fn span(&self) -> Span {
-        match *self {
-            Subtype(ref a) => a.span(),
-            InfStackClosure(a) => a,
-            InvokeClosure(a) => a,
-            DerefPointer(a) => a,
-            ClosureCapture(a, _) => a,
-            IndexSlice(a) => a,
-            RelateObjectBound(a) => a,
-            RelateParamBound(a, _) => a,
-            RelateRegionParamBound(a) => a,
-            RelateDefaultParamBound(a, _) => a,
-            Reborrow(a) => a,
-            ReborrowUpvar(a, _) => a,
-            DataBorrowed(_, a) => a,
-            ReferenceOutlivesReferent(_, a) => a,
-            ParameterInScope(_, a) => a,
-            ExprTypeIsNotInScope(_, a) => a,
-            BindingTypeIsNotValidAtDecl(a) => a,
-            CallRcvr(a) => a,
-            CallArg(a) => a,
-            CallReturn(a) => a,
-            Operand(a) => a,
-            AddrOf(a) => a,
-            AutoBorrow(a) => a,
-            SafeDestructor(a) => a,
-            CompareImplMethodObligation { span, .. } => span,
-        }
-    }
-
-    pub fn from_obligation_cause<F>(cause: &traits::ObligationCause<'tcx>, default: F) -> Self
-    where
-        F: FnOnce() -> Self,
-    {
-        match cause.code {
-            traits::ObligationCauseCode::ReferenceOutlivesReferent(ref_type) => {
-                SubregionOrigin::ReferenceOutlivesReferent(ref_type, cause.span)
-            }
-
-            traits::ObligationCauseCode::CompareImplMethodObligation {
-                item_name,
-                impl_item_def_id,
-                trait_item_def_id,
-            } => SubregionOrigin::CompareImplMethodObligation {
-                span: cause.span,
-                item_name,
-                impl_item_def_id,
-                trait_item_def_id,
-            },
-
-            _ => default(),
-        }
-    }
-}
-
-impl RegionVariableOrigin {
-    pub fn span(&self) -> Span {
-        match *self {
-            MiscVariable(a) => a,
-            PatternRegion(a) => a,
-            AddrOfRegion(a) => a,
-            Autoref(a) => a,
-            Coercion(a) => a,
-            EarlyBoundRegion(a, ..) => a,
-            LateBoundRegion(a, ..) => a,
-            BoundRegionInCoherence(_) => rustc_span::DUMMY_SP,
-            UpvarRegion(_, a) => a,
-            NLL(..) => bug!("NLL variable used with `span`"),
-        }
-    }
-}
+    /// The region `R0`.
+    pub member_region: Region<'tcx>,
 
-impl<'tcx> fmt::Debug for RegionObligation<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "RegionObligation(sub_region={:?}, sup_type={:?})",
-            self.sub_region, self.sup_type
-        )
-    }
+    /// The options `O1..On`.
+    pub choice_regions: Lrc<Vec<Region<'tcx>>>,
 }
diff --git a/src/librustc/infer/nll_relate/mod.rs b/src/librustc/infer/nll_relate/mod.rs
deleted file mode 100644
index 6b53871b9e..0000000000
--- a/src/librustc/infer/nll_relate/mod.rs
+++ /dev/null
@@ -1,996 +0,0 @@
-//! This code is kind of an alternate way of doing subtyping,
-//! supertyping, and type equating, distinct from the `combine.rs`
-//! code but very similar in its effect and design. Eventually the two
-//! ought to be merged. This code is intended for use in NLL and chalk.
-//!
-//! Here are the key differences:
-//!
-//! - This code may choose to bypass some checks (e.g., the occurs check)
-//!   in the case where we know that there are no unbound type inference
-//!   variables. This is the case for NLL, because at NLL time types are fully
-//!   inferred up-to regions.
-//! - This code uses "universes" to handle higher-ranked regions and
-//!   not the leak-check. This is "more correct" than what rustc does
-//!   and we are generally migrating in this direction, but NLL had to
-//!   get there first.
-//!
-//! Also, this code assumes that there are no bound types at all, not even
-//! free ones. This is ok because:
-//! - we are not relating anything quantified over some type variable
-//! - we will have instantiated all the bound type vars already (the one
-//!   thing we relate in chalk are basically domain goals and their
-//!   constituents)
-
-use crate::infer::InferCtxt;
-use crate::infer::{ConstVarValue, ConstVariableValue};
-use crate::traits::DomainGoal;
-use crate::ty::error::TypeError;
-use crate::ty::fold::{TypeFoldable, TypeVisitor};
-use crate::ty::relate::{self, Relate, RelateResult, TypeRelation};
-use crate::ty::subst::GenericArg;
-use crate::ty::{self, InferConst, Ty, TyCtxt};
-use rustc_data_structures::fx::FxHashMap;
-use std::fmt::Debug;
-
-#[derive(PartialEq)]
-pub enum NormalizationStrategy {
-    Lazy,
-    Eager,
-}
-
-pub struct TypeRelating<'me, 'tcx, D>
-where
-    D: TypeRelatingDelegate<'tcx>,
-{
-    infcx: &'me InferCtxt<'me, 'tcx>,
-
-    /// Callback to use when we deduce an outlives relationship
-    delegate: D,
-
-    /// How are we relating `a` and `b`?
-    ///
-    /// - Covariant means `a <: b`.
-    /// - Contravariant means `b <: a`.
-    /// - Invariant means `a == b.
-    /// - Bivariant means that it doesn't matter.
-    ambient_variance: ty::Variance,
-
-    /// When we pass through a set of binders (e.g., when looking into
-    /// a `fn` type), we push a new bound region scope onto here. This
-    /// will contain the instantiated region for each region in those
-    /// binders. When we then encounter a `ReLateBound(d, br)`, we can
-    /// use the De Bruijn index `d` to find the right scope, and then
-    /// bound region name `br` to find the specific instantiation from
-    /// within that scope. See `replace_bound_region`.
-    ///
-    /// This field stores the instantiations for late-bound regions in
-    /// the `a` type.
-    a_scopes: Vec<BoundRegionScope<'tcx>>,
-
-    /// Same as `a_scopes`, but for the `b` type.
-    b_scopes: Vec<BoundRegionScope<'tcx>>,
-}
-
-pub trait TypeRelatingDelegate<'tcx> {
-    /// Push a constraint `sup: sub` -- this constraint must be
-    /// satisfied for the two types to be related. `sub` and `sup` may
-    /// be regions from the type or new variables created through the
-    /// delegate.
-    fn push_outlives(&mut self, sup: ty::Region<'tcx>, sub: ty::Region<'tcx>);
-
-    /// Push a domain goal that will need to be proved for the two types to
-    /// be related. Used for lazy normalization.
-    fn push_domain_goal(&mut self, domain_goal: DomainGoal<'tcx>);
-
-    /// Creates a new universe index. Used when instantiating placeholders.
-    fn create_next_universe(&mut self) -> ty::UniverseIndex;
-
-    /// Creates a new region variable representing a higher-ranked
-    /// region that is instantiated existentially. This creates an
-    /// inference variable, typically.
-    ///
-    /// So e.g., if you have `for<'a> fn(..) <: for<'b> fn(..)`, then
-    /// we will invoke this method to instantiate `'a` with an
-    /// inference variable (though `'b` would be instantiated first,
-    /// as a placeholder).
-    fn next_existential_region_var(&mut self, was_placeholder: bool) -> ty::Region<'tcx>;
-
-    /// Creates a new region variable representing a
-    /// higher-ranked region that is instantiated universally.
-    /// This creates a new region placeholder, typically.
-    ///
-    /// So e.g., if you have `for<'a> fn(..) <: for<'b> fn(..)`, then
-    /// we will invoke this method to instantiate `'b` with a
-    /// placeholder region.
-    fn next_placeholder_region(&mut self, placeholder: ty::PlaceholderRegion) -> ty::Region<'tcx>;
-
-    /// Creates a new existential region in the given universe. This
-    /// is used when handling subtyping and type variables -- if we
-    /// have that `?X <: Foo<'a>`, for example, we would instantiate
-    /// `?X` with a type like `Foo<'?0>` where `'?0` is a fresh
-    /// existential variable created by this function. We would then
-    /// relate `Foo<'?0>` with `Foo<'a>` (and probably add an outlives
-    /// relation stating that `'?0: 'a`).
-    fn generalize_existential(&mut self, universe: ty::UniverseIndex) -> ty::Region<'tcx>;
-
-    /// Define the normalization strategy to use, eager or lazy.
-    fn normalization() -> NormalizationStrategy;
-
-    /// Enables some optimizations if we do not expect inference variables
-    /// in the RHS of the relation.
-    fn forbid_inference_vars() -> bool;
-}
-
-#[derive(Clone, Debug)]
-struct ScopesAndKind<'tcx> {
-    scopes: Vec<BoundRegionScope<'tcx>>,
-    kind: GenericArg<'tcx>,
-}
-
-#[derive(Clone, Debug, Default)]
-struct BoundRegionScope<'tcx> {
-    map: FxHashMap<ty::BoundRegion, ty::Region<'tcx>>,
-}
-
-#[derive(Copy, Clone)]
-struct UniversallyQuantified(bool);
-
-impl<'me, 'tcx, D> TypeRelating<'me, 'tcx, D>
-where
-    D: TypeRelatingDelegate<'tcx>,
-{
-    pub fn new(
-        infcx: &'me InferCtxt<'me, 'tcx>,
-        delegate: D,
-        ambient_variance: ty::Variance,
-    ) -> Self {
-        Self { infcx, delegate, ambient_variance, a_scopes: vec![], b_scopes: vec![] }
-    }
-
-    fn ambient_covariance(&self) -> bool {
-        match self.ambient_variance {
-            ty::Variance::Covariant | ty::Variance::Invariant => true,
-            ty::Variance::Contravariant | ty::Variance::Bivariant => false,
-        }
-    }
-
-    fn ambient_contravariance(&self) -> bool {
-        match self.ambient_variance {
-            ty::Variance::Contravariant | ty::Variance::Invariant => true,
-            ty::Variance::Covariant | ty::Variance::Bivariant => false,
-        }
-    }
-
-    fn create_scope(
-        &mut self,
-        value: &ty::Binder<impl TypeFoldable<'tcx>>,
-        universally_quantified: UniversallyQuantified,
-    ) -> BoundRegionScope<'tcx> {
-        let mut scope = BoundRegionScope::default();
-
-        // Create a callback that creates (via the delegate) either an
-        // existential or placeholder region as needed.
-        let mut next_region = {
-            let delegate = &mut self.delegate;
-            let mut lazy_universe = None;
-            move |br: ty::BoundRegion| {
-                if universally_quantified.0 {
-                    // The first time this closure is called, create a
-                    // new universe for the placeholders we will make
-                    // from here out.
-                    let universe = lazy_universe.unwrap_or_else(|| {
-                        let universe = delegate.create_next_universe();
-                        lazy_universe = Some(universe);
-                        universe
-                    });
-
-                    let placeholder = ty::PlaceholderRegion { universe, name: br };
-                    delegate.next_placeholder_region(placeholder)
-                } else {
-                    delegate.next_existential_region_var(true)
-                }
-            }
-        };
-
-        value.skip_binder().visit_with(&mut ScopeInstantiator {
-            next_region: &mut next_region,
-            target_index: ty::INNERMOST,
-            bound_region_scope: &mut scope,
-        });
-
-        scope
-    }
-
-    /// When we encounter binders during the type traversal, we record
-    /// the value to substitute for each of the things contained in
-    /// that binder. (This will be either a universal placeholder or
-    /// an existential inference variable.) Given the De Bruijn index
-    /// `debruijn` (and name `br`) of some binder we have now
-    /// encountered, this routine finds the value that we instantiated
-    /// the region with; to do so, it indexes backwards into the list
-    /// of ambient scopes `scopes`.
-    fn lookup_bound_region(
-        debruijn: ty::DebruijnIndex,
-        br: &ty::BoundRegion,
-        first_free_index: ty::DebruijnIndex,
-        scopes: &[BoundRegionScope<'tcx>],
-    ) -> ty::Region<'tcx> {
-        // The debruijn index is a "reverse index" into the
-        // scopes listing. So when we have INNERMOST (0), we
-        // want the *last* scope pushed, and so forth.
-        let debruijn_index = debruijn.index() - first_free_index.index();
-        let scope = &scopes[scopes.len() - debruijn_index - 1];
-
-        // Find this bound region in that scope to map to a
-        // particular region.
-        scope.map[br]
-    }
-
-    /// If `r` is a bound region, find the scope in which it is bound
-    /// (from `scopes`) and return the value that we instantiated it
-    /// with. Otherwise just return `r`.
-    fn replace_bound_region(
-        &self,
-        r: ty::Region<'tcx>,
-        first_free_index: ty::DebruijnIndex,
-        scopes: &[BoundRegionScope<'tcx>],
-    ) -> ty::Region<'tcx> {
-        debug!("replace_bound_regions(scopes={:?})", scopes);
-        if let ty::ReLateBound(debruijn, br) = r {
-            Self::lookup_bound_region(*debruijn, br, first_free_index, scopes)
-        } else {
-            r
-        }
-    }
-
-    /// Push a new outlives requirement into our output set of
-    /// constraints.
-    fn push_outlives(&mut self, sup: ty::Region<'tcx>, sub: ty::Region<'tcx>) {
-        debug!("push_outlives({:?}: {:?})", sup, sub);
-
-        self.delegate.push_outlives(sup, sub);
-    }
-
-    /// Relate a projection type and some value type lazily. This will always
-    /// succeed, but we push an additional `ProjectionEq` goal depending
-    /// on the value type:
-    /// - if the value type is any type `T` which is not a projection, we push
-    ///   `ProjectionEq(projection = T)`.
-    /// - if the value type is another projection `other_projection`, we create
-    ///   a new inference variable `?U` and push the two goals
-    ///   `ProjectionEq(projection = ?U)`, `ProjectionEq(other_projection = ?U)`.
-    fn relate_projection_ty(
-        &mut self,
-        projection_ty: ty::ProjectionTy<'tcx>,
-        value_ty: Ty<'tcx>,
-    ) -> Ty<'tcx> {
-        use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-        use crate::traits::WhereClause;
-        use rustc_span::DUMMY_SP;
-
-        match value_ty.kind {
-            ty::Projection(other_projection_ty) => {
-                let var = self.infcx.next_ty_var(TypeVariableOrigin {
-                    kind: TypeVariableOriginKind::MiscVariable,
-                    span: DUMMY_SP,
-                });
-                self.relate_projection_ty(projection_ty, var);
-                self.relate_projection_ty(other_projection_ty, var);
-                var
-            }
-
-            _ => {
-                let projection = ty::ProjectionPredicate { projection_ty, ty: value_ty };
-                self.delegate
-                    .push_domain_goal(DomainGoal::Holds(WhereClause::ProjectionEq(projection)));
-                value_ty
-            }
-        }
-    }
-
-    /// Relate a type inference variable with a value type. This works
-    /// by creating a "generalization" G of the value where all the
-    /// lifetimes are replaced with fresh inference values. This
-    /// genearlization G becomes the value of the inference variable,
-    /// and is then related in turn to the value. So e.g. if you had
-    /// `vid = ?0` and `value = &'a u32`, we might first instantiate
-    /// `?0` to a type like `&'0 u32` where `'0` is a fresh variable,
-    /// and then relate `&'0 u32` with `&'a u32` (resulting in
-    /// relations between `'0` and `'a`).
-    ///
-    /// The variable `pair` can be either a `(vid, ty)` or `(ty, vid)`
-    /// -- in other words, it is always a (unresolved) inference
-    /// variable `vid` and a type `ty` that are being related, but the
-    /// vid may appear either as the "a" type or the "b" type,
-    /// depending on where it appears in the tuple. The trait
-    /// `VidValuePair` lets us work with the vid/type while preserving
-    /// the "sidedness" when necessary -- the sidedness is relevant in
-    /// particular for the variance and set of in-scope things.
-    fn relate_ty_var<PAIR: VidValuePair<'tcx>>(
-        &mut self,
-        pair: PAIR,
-    ) -> RelateResult<'tcx, Ty<'tcx>> {
-        debug!("relate_ty_var({:?})", pair);
-
-        let vid = pair.vid();
-        let value_ty = pair.value_ty();
-
-        // FIXME(invariance) -- this logic assumes invariance, but that is wrong.
-        // This only presently applies to chalk integration, as NLL
-        // doesn't permit type variables to appear on both sides (and
-        // doesn't use lazy norm).
-        match value_ty.kind {
-            ty::Infer(ty::TyVar(value_vid)) => {
-                // Two type variables: just equate them.
-                self.infcx.type_variables.borrow_mut().equate(vid, value_vid);
-                return Ok(value_ty);
-            }
-
-            ty::Projection(projection_ty) if D::normalization() == NormalizationStrategy::Lazy => {
-                return Ok(self.relate_projection_ty(projection_ty, self.infcx.tcx.mk_ty_var(vid)));
-            }
-
-            _ => (),
-        }
-
-        let generalized_ty = self.generalize_value(value_ty, vid)?;
-        debug!("relate_ty_var: generalized_ty = {:?}", generalized_ty);
-
-        if D::forbid_inference_vars() {
-            // In NLL, we don't have type inference variables
-            // floating around, so we can do this rather imprecise
-            // variant of the occurs-check.
-            assert!(!generalized_ty.has_infer_types());
-        }
-
-        self.infcx.type_variables.borrow_mut().instantiate(vid, generalized_ty);
-
-        // The generalized values we extract from `canonical_var_values` have
-        // been fully instantiated and hence the set of scopes we have
-        // doesn't matter -- just to be sure, put an empty vector
-        // in there.
-        let old_a_scopes = ::std::mem::take(pair.vid_scopes(self));
-
-        // Relate the generalized kind to the original one.
-        let result = pair.relate_generalized_ty(self, generalized_ty);
-
-        // Restore the old scopes now.
-        *pair.vid_scopes(self) = old_a_scopes;
-
-        debug!("relate_ty_var: complete, result = {:?}", result);
-        result
-    }
-
-    fn generalize_value<T: Relate<'tcx>>(
-        &mut self,
-        value: T,
-        for_vid: ty::TyVid,
-    ) -> RelateResult<'tcx, T> {
-        let universe = self.infcx.probe_ty_var(for_vid).unwrap_err();
-
-        let mut generalizer = TypeGeneralizer {
-            infcx: self.infcx,
-            delegate: &mut self.delegate,
-            first_free_index: ty::INNERMOST,
-            ambient_variance: self.ambient_variance,
-            for_vid_sub_root: self.infcx.type_variables.borrow_mut().sub_root_var(for_vid),
-            universe,
-        };
-
-        generalizer.relate(&value, &value)
-    }
-}
-
-/// When we instantiate a inference variable with a value in
-/// `relate_ty_var`, we always have the pair of a `TyVid` and a `Ty`,
-/// but the ordering may vary (depending on whether the inference
-/// variable was found on the `a` or `b` sides). Therefore, this trait
-/// allows us to factor out common code, while preserving the order
-/// when needed.
-trait VidValuePair<'tcx>: Debug {
-    /// Extract the inference variable (which could be either the
-    /// first or second part of the tuple).
-    fn vid(&self) -> ty::TyVid;
-
-    /// Extract the value it is being related to (which will be the
-    /// opposite part of the tuple from the vid).
-    fn value_ty(&self) -> Ty<'tcx>;
-
-    /// Extract the scopes that apply to whichever side of the tuple
-    /// the vid was found on.  See the comment where this is called
-    /// for more details on why we want them.
-    fn vid_scopes<D: TypeRelatingDelegate<'tcx>>(
-        &self,
-        relate: &'r mut TypeRelating<'_, 'tcx, D>,
-    ) -> &'r mut Vec<BoundRegionScope<'tcx>>;
-
-    /// Given a generalized type G that should replace the vid, relate
-    /// G to the value, putting G on whichever side the vid would have
-    /// appeared.
-    fn relate_generalized_ty<D>(
-        &self,
-        relate: &mut TypeRelating<'_, 'tcx, D>,
-        generalized_ty: Ty<'tcx>,
-    ) -> RelateResult<'tcx, Ty<'tcx>>
-    where
-        D: TypeRelatingDelegate<'tcx>;
-}
-
-impl VidValuePair<'tcx> for (ty::TyVid, Ty<'tcx>) {
-    fn vid(&self) -> ty::TyVid {
-        self.0
-    }
-
-    fn value_ty(&self) -> Ty<'tcx> {
-        self.1
-    }
-
-    fn vid_scopes<D>(
-        &self,
-        relate: &'r mut TypeRelating<'_, 'tcx, D>,
-    ) -> &'r mut Vec<BoundRegionScope<'tcx>>
-    where
-        D: TypeRelatingDelegate<'tcx>,
-    {
-        &mut relate.a_scopes
-    }
-
-    fn relate_generalized_ty<D>(
-        &self,
-        relate: &mut TypeRelating<'_, 'tcx, D>,
-        generalized_ty: Ty<'tcx>,
-    ) -> RelateResult<'tcx, Ty<'tcx>>
-    where
-        D: TypeRelatingDelegate<'tcx>,
-    {
-        relate.relate(&generalized_ty, &self.value_ty())
-    }
-}
-
-// In this case, the "vid" is the "b" type.
-impl VidValuePair<'tcx> for (Ty<'tcx>, ty::TyVid) {
-    fn vid(&self) -> ty::TyVid {
-        self.1
-    }
-
-    fn value_ty(&self) -> Ty<'tcx> {
-        self.0
-    }
-
-    fn vid_scopes<D>(
-        &self,
-        relate: &'r mut TypeRelating<'_, 'tcx, D>,
-    ) -> &'r mut Vec<BoundRegionScope<'tcx>>
-    where
-        D: TypeRelatingDelegate<'tcx>,
-    {
-        &mut relate.b_scopes
-    }
-
-    fn relate_generalized_ty<D>(
-        &self,
-        relate: &mut TypeRelating<'_, 'tcx, D>,
-        generalized_ty: Ty<'tcx>,
-    ) -> RelateResult<'tcx, Ty<'tcx>>
-    where
-        D: TypeRelatingDelegate<'tcx>,
-    {
-        relate.relate(&self.value_ty(), &generalized_ty)
-    }
-}
-
-impl<D> TypeRelation<'tcx> for TypeRelating<'me, 'tcx, D>
-where
-    D: TypeRelatingDelegate<'tcx>,
-{
-    fn tcx(&self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    // FIXME(oli-obk): not sure how to get the correct ParamEnv
-    fn param_env(&self) -> ty::ParamEnv<'tcx> {
-        ty::ParamEnv::empty()
-    }
-
-    fn tag(&self) -> &'static str {
-        "nll::subtype"
-    }
-
-    fn a_is_expected(&self) -> bool {
-        true
-    }
-
-    fn relate_with_variance<T: Relate<'tcx>>(
-        &mut self,
-        variance: ty::Variance,
-        a: &T,
-        b: &T,
-    ) -> RelateResult<'tcx, T> {
-        debug!("relate_with_variance(variance={:?}, a={:?}, b={:?})", variance, a, b);
-
-        let old_ambient_variance = self.ambient_variance;
-        self.ambient_variance = self.ambient_variance.xform(variance);
-
-        debug!("relate_with_variance: ambient_variance = {:?}", self.ambient_variance);
-
-        let r = self.relate(a, b)?;
-
-        self.ambient_variance = old_ambient_variance;
-
-        debug!("relate_with_variance: r={:?}", r);
-
-        Ok(r)
-    }
-
-    fn tys(&mut self, a: Ty<'tcx>, mut b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
-        let a = self.infcx.shallow_resolve(a);
-
-        if !D::forbid_inference_vars() {
-            b = self.infcx.shallow_resolve(b);
-        }
-
-        match (&a.kind, &b.kind) {
-            (_, &ty::Infer(ty::TyVar(vid))) => {
-                if D::forbid_inference_vars() {
-                    // Forbid inference variables in the RHS.
-                    bug!("unexpected inference var {:?}", b)
-                } else {
-                    self.relate_ty_var((a, vid))
-                }
-            }
-
-            (&ty::Infer(ty::TyVar(vid)), _) => self.relate_ty_var((vid, b)),
-
-            (&ty::Projection(projection_ty), _)
-                if D::normalization() == NormalizationStrategy::Lazy =>
-            {
-                Ok(self.relate_projection_ty(projection_ty, b))
-            }
-
-            (_, &ty::Projection(projection_ty))
-                if D::normalization() == NormalizationStrategy::Lazy =>
-            {
-                Ok(self.relate_projection_ty(projection_ty, a))
-            }
-
-            _ => {
-                debug!("tys(a={:?}, b={:?}, variance={:?})", a, b, self.ambient_variance);
-
-                // Will also handle unification of `IntVar` and `FloatVar`.
-                self.infcx.super_combine_tys(self, a, b)
-            }
-        }
-    }
-
-    fn regions(
-        &mut self,
-        a: ty::Region<'tcx>,
-        b: ty::Region<'tcx>,
-    ) -> RelateResult<'tcx, ty::Region<'tcx>> {
-        debug!("regions(a={:?}, b={:?}, variance={:?})", a, b, self.ambient_variance);
-
-        let v_a = self.replace_bound_region(a, ty::INNERMOST, &self.a_scopes);
-        let v_b = self.replace_bound_region(b, ty::INNERMOST, &self.b_scopes);
-
-        debug!("regions: v_a = {:?}", v_a);
-        debug!("regions: v_b = {:?}", v_b);
-
-        if self.ambient_covariance() {
-            // Covariance: a <= b. Hence, `b: a`.
-            self.push_outlives(v_b, v_a);
-        }
-
-        if self.ambient_contravariance() {
-            // Contravariant: b <= a. Hence, `a: b`.
-            self.push_outlives(v_a, v_b);
-        }
-
-        Ok(a)
-    }
-
-    fn consts(
-        &mut self,
-        a: &'tcx ty::Const<'tcx>,
-        mut b: &'tcx ty::Const<'tcx>,
-    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
-        let a = self.infcx.shallow_resolve(a);
-
-        if !D::forbid_inference_vars() {
-            b = self.infcx.shallow_resolve(b);
-        }
-
-        match b.val {
-            ty::ConstKind::Infer(InferConst::Var(_)) if D::forbid_inference_vars() => {
-                // Forbid inference variables in the RHS.
-                bug!("unexpected inference var {:?}", b)
-            }
-            // FIXME(invariance): see the related FIXME above.
-            _ => self.infcx.super_combine_consts(self, a, b),
-        }
-    }
-
-    fn binders<T>(
-        &mut self,
-        a: &ty::Binder<T>,
-        b: &ty::Binder<T>,
-    ) -> RelateResult<'tcx, ty::Binder<T>>
-    where
-        T: Relate<'tcx>,
-    {
-        // We want that
-        //
-        // ```
-        // for<'a> fn(&'a u32) -> &'a u32 <:
-        //   fn(&'b u32) -> &'b u32
-        // ```
-        //
-        // but not
-        //
-        // ```
-        // fn(&'a u32) -> &'a u32 <:
-        //   for<'b> fn(&'b u32) -> &'b u32
-        // ```
-        //
-        // We therefore proceed as follows:
-        //
-        // - Instantiate binders on `b` universally, yielding a universe U1.
-        // - Instantiate binders on `a` existentially in U1.
-
-        debug!("binders({:?}: {:?}, ambient_variance={:?})", a, b, self.ambient_variance);
-
-        if self.ambient_covariance() {
-            // Covariance, so we want `for<..> A <: for<..> B` --
-            // therefore we compare any instantiation of A (i.e., A
-            // instantiated with existentials) against every
-            // instantiation of B (i.e., B instantiated with
-            // universals).
-
-            let b_scope = self.create_scope(b, UniversallyQuantified(true));
-            let a_scope = self.create_scope(a, UniversallyQuantified(false));
-
-            debug!("binders: a_scope = {:?} (existential)", a_scope);
-            debug!("binders: b_scope = {:?} (universal)", b_scope);
-
-            self.b_scopes.push(b_scope);
-            self.a_scopes.push(a_scope);
-
-            // Reset the ambient variance to covariant. This is needed
-            // to correctly handle cases like
-            //
-            //     for<'a> fn(&'a u32, &'a u3) == for<'b, 'c> fn(&'b u32, &'c u32)
-            //
-            // Somewhat surprisingly, these two types are actually
-            // **equal**, even though the one on the right looks more
-            // polymorphic. The reason is due to subtyping. To see it,
-            // consider that each function can call the other:
-            //
-            // - The left function can call the right with `'b` and
-            //   `'c` both equal to `'a`
-            //
-            // - The right function can call the left with `'a` set to
-            //   `{P}`, where P is the point in the CFG where the call
-            //   itself occurs. Note that `'b` and `'c` must both
-            //   include P. At the point, the call works because of
-            //   subtyping (i.e., `&'b u32 <: &{P} u32`).
-            let variance = ::std::mem::replace(&mut self.ambient_variance, ty::Variance::Covariant);
-
-            self.relate(a.skip_binder(), b.skip_binder())?;
-
-            self.ambient_variance = variance;
-
-            self.b_scopes.pop().unwrap();
-            self.a_scopes.pop().unwrap();
-        }
-
-        if self.ambient_contravariance() {
-            // Contravariance, so we want `for<..> A :> for<..> B`
-            // -- therefore we compare every instantiation of A (i.e.,
-            // A instantiated with universals) against any
-            // instantiation of B (i.e., B instantiated with
-            // existentials). Opposite of above.
-
-            let a_scope = self.create_scope(a, UniversallyQuantified(true));
-            let b_scope = self.create_scope(b, UniversallyQuantified(false));
-
-            debug!("binders: a_scope = {:?} (universal)", a_scope);
-            debug!("binders: b_scope = {:?} (existential)", b_scope);
-
-            self.a_scopes.push(a_scope);
-            self.b_scopes.push(b_scope);
-
-            // Reset ambient variance to contravariance. See the
-            // covariant case above for an explanation.
-            let variance =
-                ::std::mem::replace(&mut self.ambient_variance, ty::Variance::Contravariant);
-
-            self.relate(a.skip_binder(), b.skip_binder())?;
-
-            self.ambient_variance = variance;
-
-            self.b_scopes.pop().unwrap();
-            self.a_scopes.pop().unwrap();
-        }
-
-        Ok(a.clone())
-    }
-}
-
-/// When we encounter a binder like `for<..> fn(..)`, we actually have
-/// to walk the `fn` value to find all the values bound by the `for`
-/// (these are not explicitly present in the ty representation right
-/// now). This visitor handles that: it descends the type, tracking
-/// binder depth, and finds late-bound regions targeting the
-/// `for<..`>.  For each of those, it creates an entry in
-/// `bound_region_scope`.
-struct ScopeInstantiator<'me, 'tcx> {
-    next_region: &'me mut dyn FnMut(ty::BoundRegion) -> ty::Region<'tcx>,
-    // The debruijn index of the scope we are instantiating.
-    target_index: ty::DebruijnIndex,
-    bound_region_scope: &'me mut BoundRegionScope<'tcx>,
-}
-
-impl<'me, 'tcx> TypeVisitor<'tcx> for ScopeInstantiator<'me, 'tcx> {
-    fn visit_binder<T: TypeFoldable<'tcx>>(&mut self, t: &ty::Binder<T>) -> bool {
-        self.target_index.shift_in(1);
-        t.super_visit_with(self);
-        self.target_index.shift_out(1);
-
-        false
-    }
-
-    fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool {
-        let ScopeInstantiator { bound_region_scope, next_region, .. } = self;
-
-        match r {
-            ty::ReLateBound(debruijn, br) if *debruijn == self.target_index => {
-                bound_region_scope.map.entry(*br).or_insert_with(|| next_region(*br));
-            }
-
-            _ => {}
-        }
-
-        false
-    }
-}
-
-/// The "type generalize" is used when handling inference variables.
-///
-/// The basic strategy for handling a constraint like `?A <: B` is to
-/// apply a "generalization strategy" to the type `B` -- this replaces
-/// all the lifetimes in the type `B` with fresh inference
-/// variables. (You can read more about the strategy in this [blog
-/// post].)
-///
-/// As an example, if we had `?A <: &'x u32`, we would generalize `&'x
-/// u32` to `&'0 u32` where `'0` is a fresh variable. This becomes the
-/// value of `A`. Finally, we relate `&'0 u32 <: &'x u32`, which
-/// establishes `'0: 'x` as a constraint.
-///
-/// As a side-effect of this generalization procedure, we also replace
-/// all the bound regions that we have traversed with concrete values,
-/// so that the resulting generalized type is independent from the
-/// scopes.
-///
-/// [blog post]: https://is.gd/0hKvIr
-struct TypeGeneralizer<'me, 'tcx, D>
-where
-    D: TypeRelatingDelegate<'tcx>,
-{
-    infcx: &'me InferCtxt<'me, 'tcx>,
-
-    delegate: &'me mut D,
-
-    /// After we generalize this type, we are going to relative it to
-    /// some other type. What will be the variance at this point?
-    ambient_variance: ty::Variance,
-
-    first_free_index: ty::DebruijnIndex,
-
-    /// The vid of the type variable that is in the process of being
-    /// instantiated. If we find this within the value we are folding,
-    /// that means we would have created a cyclic value.
-    for_vid_sub_root: ty::TyVid,
-
-    /// The universe of the type variable that is in the process of being
-    /// instantiated. If we find anything that this universe cannot name,
-    /// we reject the relation.
-    universe: ty::UniverseIndex,
-}
-
-impl<D> TypeRelation<'tcx> for TypeGeneralizer<'me, 'tcx, D>
-where
-    D: TypeRelatingDelegate<'tcx>,
-{
-    fn tcx(&self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    // FIXME(oli-obk): not sure how to get the correct ParamEnv
-    fn param_env(&self) -> ty::ParamEnv<'tcx> {
-        ty::ParamEnv::empty()
-    }
-
-    fn tag(&self) -> &'static str {
-        "nll::generalizer"
-    }
-
-    fn a_is_expected(&self) -> bool {
-        true
-    }
-
-    fn relate_with_variance<T: Relate<'tcx>>(
-        &mut self,
-        variance: ty::Variance,
-        a: &T,
-        b: &T,
-    ) -> RelateResult<'tcx, T> {
-        debug!(
-            "TypeGeneralizer::relate_with_variance(variance={:?}, a={:?}, b={:?})",
-            variance, a, b
-        );
-
-        let old_ambient_variance = self.ambient_variance;
-        self.ambient_variance = self.ambient_variance.xform(variance);
-
-        debug!(
-            "TypeGeneralizer::relate_with_variance: ambient_variance = {:?}",
-            self.ambient_variance
-        );
-
-        let r = self.relate(a, b)?;
-
-        self.ambient_variance = old_ambient_variance;
-
-        debug!("TypeGeneralizer::relate_with_variance: r={:?}", r);
-
-        Ok(r)
-    }
-
-    fn tys(&mut self, a: Ty<'tcx>, _: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
-        use crate::infer::type_variable::TypeVariableValue;
-
-        debug!("TypeGeneralizer::tys(a={:?})", a);
-
-        match a.kind {
-            ty::Infer(ty::TyVar(_)) | ty::Infer(ty::IntVar(_)) | ty::Infer(ty::FloatVar(_))
-                if D::forbid_inference_vars() =>
-            {
-                bug!("unexpected inference variable encountered in NLL generalization: {:?}", a);
-            }
-
-            ty::Infer(ty::TyVar(vid)) => {
-                let mut variables = self.infcx.type_variables.borrow_mut();
-                let vid = variables.root_var(vid);
-                let sub_vid = variables.sub_root_var(vid);
-                if sub_vid == self.for_vid_sub_root {
-                    // If sub-roots are equal, then `for_vid` and
-                    // `vid` are related via subtyping.
-                    debug!("TypeGeneralizer::tys: occurs check failed");
-                    return Err(TypeError::Mismatch);
-                } else {
-                    match variables.probe(vid) {
-                        TypeVariableValue::Known { value: u } => {
-                            drop(variables);
-                            self.relate(&u, &u)
-                        }
-                        TypeVariableValue::Unknown { universe: _universe } => {
-                            if self.ambient_variance == ty::Bivariant {
-                                // FIXME: we may need a WF predicate (related to #54105).
-                            }
-
-                            let origin = *variables.var_origin(vid);
-
-                            // Replacing with a new variable in the universe `self.universe`,
-                            // it will be unified later with the original type variable in
-                            // the universe `_universe`.
-                            let new_var_id = variables.new_var(self.universe, false, origin);
-
-                            let u = self.tcx().mk_ty_var(new_var_id);
-                            debug!("generalize: replacing original vid={:?} with new={:?}", vid, u);
-                            return Ok(u);
-                        }
-                    }
-                }
-            }
-
-            ty::Infer(ty::IntVar(_)) | ty::Infer(ty::FloatVar(_)) => {
-                // No matter what mode we are in,
-                // integer/floating-point types must be equal to be
-                // relatable.
-                Ok(a)
-            }
-
-            ty::Placeholder(placeholder) => {
-                if self.universe.cannot_name(placeholder.universe) {
-                    debug!(
-                        "TypeGeneralizer::tys: root universe {:?} cannot name\
-                         placeholder in universe {:?}",
-                        self.universe, placeholder.universe
-                    );
-                    Err(TypeError::Mismatch)
-                } else {
-                    Ok(a)
-                }
-            }
-
-            _ => relate::super_relate_tys(self, a, a),
-        }
-    }
-
-    fn regions(
-        &mut self,
-        a: ty::Region<'tcx>,
-        _: ty::Region<'tcx>,
-    ) -> RelateResult<'tcx, ty::Region<'tcx>> {
-        debug!("TypeGeneralizer::regions(a={:?})", a);
-
-        if let ty::ReLateBound(debruijn, _) = a {
-            if *debruijn < self.first_free_index {
-                return Ok(a);
-            }
-        }
-
-        // For now, we just always create a fresh region variable to
-        // replace all the regions in the source type. In the main
-        // type checker, we special case the case where the ambient
-        // variance is `Invariant` and try to avoid creating a fresh
-        // region variable, but since this comes up so much less in
-        // NLL (only when users use `_` etc) it is much less
-        // important.
-        //
-        // As an aside, since these new variables are created in
-        // `self.universe` universe, this also serves to enforce the
-        // universe scoping rules.
-        //
-        // FIXME(#54105) -- if the ambient variance is bivariant,
-        // though, we may however need to check well-formedness or
-        // risk a problem like #41677 again.
-
-        let replacement_region_vid = self.delegate.generalize_existential(self.universe);
-
-        Ok(replacement_region_vid)
-    }
-
-    fn consts(
-        &mut self,
-        a: &'tcx ty::Const<'tcx>,
-        _: &'tcx ty::Const<'tcx>,
-    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
-        match a.val {
-            ty::ConstKind::Infer(InferConst::Var(_)) if D::forbid_inference_vars() => {
-                bug!("unexpected inference variable encountered in NLL generalization: {:?}", a);
-            }
-            ty::ConstKind::Infer(InferConst::Var(vid)) => {
-                let mut variable_table = self.infcx.const_unification_table.borrow_mut();
-                let var_value = variable_table.probe_value(vid);
-                match var_value.val.known() {
-                    Some(u) => self.relate(&u, &u),
-                    None => {
-                        let new_var_id = variable_table.new_key(ConstVarValue {
-                            origin: var_value.origin,
-                            val: ConstVariableValue::Unknown { universe: self.universe },
-                        });
-                        Ok(self.tcx().mk_const_var(new_var_id, a.ty))
-                    }
-                }
-            }
-            _ => relate::super_relate_consts(self, a, a),
-        }
-    }
-
-    fn binders<T>(
-        &mut self,
-        a: &ty::Binder<T>,
-        _: &ty::Binder<T>,
-    ) -> RelateResult<'tcx, ty::Binder<T>>
-    where
-        T: Relate<'tcx>,
-    {
-        debug!("TypeGeneralizer::binders(a={:?})", a);
-
-        self.first_free_index.shift_in(1);
-        let result = self.relate(a.skip_binder(), a.skip_binder())?;
-        self.first_free_index.shift_out(1);
-        Ok(ty::Binder::bind(result))
-    }
-}
diff --git a/src/librustc/infer/opaque_types/mod.rs b/src/librustc/infer/opaque_types/mod.rs
deleted file mode 100644
index fe3a5d149f..0000000000
--- a/src/librustc/infer/opaque_types/mod.rs
+++ /dev/null
@@ -1,1289 +0,0 @@
-use crate::infer::error_reporting::{note_and_explain_free_region, note_and_explain_region};
-use crate::infer::{self, InferCtxt, InferOk, TypeVariableOrigin, TypeVariableOriginKind};
-use crate::middle::region;
-use crate::traits::{self, PredicateObligation};
-use crate::ty::fold::{BottomUpFolder, TypeFoldable, TypeFolder, TypeVisitor};
-use crate::ty::free_region_map::FreeRegionRelations;
-use crate::ty::subst::{GenericArg, GenericArgKind, InternalSubsts, SubstsRef};
-use crate::ty::{self, GenericParamDefKind, Ty, TyCtxt};
-use rustc::session::config::nightly_options;
-use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::sync::Lrc;
-use rustc_errors::{struct_span_err, DiagnosticBuilder};
-use rustc_hir as hir;
-use rustc_hir::def_id::{DefId, DefIdMap};
-use rustc_hir::Node;
-use rustc_span::Span;
-
-pub type OpaqueTypeMap<'tcx> = DefIdMap<OpaqueTypeDecl<'tcx>>;
-
-/// Information about the opaque types whose values we
-/// are inferring in this function (these are the `impl Trait` that
-/// appear in the return type).
-#[derive(Copy, Clone, Debug)]
-pub struct OpaqueTypeDecl<'tcx> {
-    /// The opaque type (`ty::Opaque`) for this declaration.
-    pub opaque_type: Ty<'tcx>,
-
-    /// The substitutions that we apply to the opaque type that this
-    /// `impl Trait` desugars to. e.g., if:
-    ///
-    ///     fn foo<'a, 'b, T>() -> impl Trait<'a>
-    ///
-    /// winds up desugared to:
-    ///
-    ///     type Foo<'x, X> = impl Trait<'x>
-    ///     fn foo<'a, 'b, T>() -> Foo<'a, T>
-    ///
-    /// then `substs` would be `['a, T]`.
-    pub substs: SubstsRef<'tcx>,
-
-    /// The span of this particular definition of the opaque type.  So
-    /// for example:
-    ///
-    /// ```
-    /// type Foo = impl Baz;
-    /// fn bar() -> Foo {
-    ///             ^^^ This is the span we are looking for!
-    /// ```
-    ///
-    /// In cases where the fn returns `(impl Trait, impl Trait)` or
-    /// other such combinations, the result is currently
-    /// over-approximated, but better than nothing.
-    pub definition_span: Span,
-
-    /// The type variable that represents the value of the opaque type
-    /// that we require. In other words, after we compile this function,
-    /// we will be created a constraint like:
-    ///
-    ///     Foo<'a, T> = ?C
-    ///
-    /// where `?C` is the value of this type variable. =) It may
-    /// naturally refer to the type and lifetime parameters in scope
-    /// in this function, though ultimately it should only reference
-    /// those that are arguments to `Foo` in the constraint above. (In
-    /// other words, `?C` should not include `'b`, even though it's a
-    /// lifetime parameter on `foo`.)
-    pub concrete_ty: Ty<'tcx>,
-
-    /// Returns `true` if the `impl Trait` bounds include region bounds.
-    /// For example, this would be true for:
-    ///
-    ///     fn foo<'a, 'b, 'c>() -> impl Trait<'c> + 'a + 'b
-    ///
-    /// but false for:
-    ///
-    ///     fn foo<'c>() -> impl Trait<'c>
-    ///
-    /// unless `Trait` was declared like:
-    ///
-    ///     trait Trait<'c>: 'c
-    ///
-    /// in which case it would be true.
-    ///
-    /// This is used during regionck to decide whether we need to
-    /// impose any additional constraints to ensure that region
-    /// variables in `concrete_ty` wind up being constrained to
-    /// something from `substs` (or, at minimum, things that outlive
-    /// the fn body). (Ultimately, writeback is responsible for this
-    /// check.)
-    pub has_required_region_bounds: bool,
-
-    /// The origin of the opaque type.
-    pub origin: hir::OpaqueTyOrigin,
-}
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    /// Replaces all opaque types in `value` with fresh inference variables
-    /// and creates appropriate obligations. For example, given the input:
-    ///
-    ///     impl Iterator<Item = impl Debug>
-    ///
-    /// this method would create two type variables, `?0` and `?1`. It would
-    /// return the type `?0` but also the obligations:
-    ///
-    ///     ?0: Iterator<Item = ?1>
-    ///     ?1: Debug
-    ///
-    /// Moreover, it returns a `OpaqueTypeMap` that would map `?0` to
-    /// info about the `impl Iterator<..>` type and `?1` to info about
-    /// the `impl Debug` type.
-    ///
-    /// # Parameters
-    ///
-    /// - `parent_def_id` -- the `DefId` of the function in which the opaque type
-    ///   is defined
-    /// - `body_id` -- the body-id with which the resulting obligations should
-    ///   be associated
-    /// - `param_env` -- the in-scope parameter environment to be used for
-    ///   obligations
-    /// - `value` -- the value within which we are instantiating opaque types
-    /// - `value_span` -- the span where the value came from, used in error reporting
-    pub fn instantiate_opaque_types<T: TypeFoldable<'tcx>>(
-        &self,
-        parent_def_id: DefId,
-        body_id: hir::HirId,
-        param_env: ty::ParamEnv<'tcx>,
-        value: &T,
-        value_span: Span,
-    ) -> InferOk<'tcx, (T, OpaqueTypeMap<'tcx>)> {
-        debug!(
-            "instantiate_opaque_types(value={:?}, parent_def_id={:?}, body_id={:?}, \
-             param_env={:?}, value_span={:?})",
-            value, parent_def_id, body_id, param_env, value_span,
-        );
-        let mut instantiator = Instantiator {
-            infcx: self,
-            parent_def_id,
-            body_id,
-            param_env,
-            value_span,
-            opaque_types: Default::default(),
-            obligations: vec![],
-        };
-        let value = instantiator.instantiate_opaque_types_in_map(value);
-        InferOk { value: (value, instantiator.opaque_types), obligations: instantiator.obligations }
-    }
-
-    /// Given the map `opaque_types` containing the opaque
-    /// `impl Trait` types whose underlying, hidden types are being
-    /// inferred, this method adds constraints to the regions
-    /// appearing in those underlying hidden types to ensure that they
-    /// at least do not refer to random scopes within the current
-    /// function. These constraints are not (quite) sufficient to
-    /// guarantee that the regions are actually legal values; that
-    /// final condition is imposed after region inference is done.
-    ///
-    /// # The Problem
-    ///
-    /// Let's work through an example to explain how it works. Assume
-    /// the current function is as follows:
-    ///
-    /// ```text
-    /// fn foo<'a, 'b>(..) -> (impl Bar<'a>, impl Bar<'b>)
-    /// ```
-    ///
-    /// Here, we have two `impl Trait` types whose values are being
-    /// inferred (the `impl Bar<'a>` and the `impl
-    /// Bar<'b>`). Conceptually, this is sugar for a setup where we
-    /// define underlying opaque types (`Foo1`, `Foo2`) and then, in
-    /// the return type of `foo`, we *reference* those definitions:
-    ///
-    /// ```text
-    /// type Foo1<'x> = impl Bar<'x>;
-    /// type Foo2<'x> = impl Bar<'x>;
-    /// fn foo<'a, 'b>(..) -> (Foo1<'a>, Foo2<'b>) { .. }
-    ///                    //  ^^^^ ^^
-    ///                    //  |    |
-    ///                    //  |    substs
-    ///                    //  def_id
-    /// ```
-    ///
-    /// As indicating in the comments above, each of those references
-    /// is (in the compiler) basically a substitution (`substs`)
-    /// applied to the type of a suitable `def_id` (which identifies
-    /// `Foo1` or `Foo2`).
-    ///
-    /// Now, at this point in compilation, what we have done is to
-    /// replace each of the references (`Foo1<'a>`, `Foo2<'b>`) with
-    /// fresh inference variables C1 and C2. We wish to use the values
-    /// of these variables to infer the underlying types of `Foo1` and
-    /// `Foo2`. That is, this gives rise to higher-order (pattern) unification
-    /// constraints like:
-    ///
-    /// ```text
-    /// for<'a> (Foo1<'a> = C1)
-    /// for<'b> (Foo1<'b> = C2)
-    /// ```
-    ///
-    /// For these equation to be satisfiable, the types `C1` and `C2`
-    /// can only refer to a limited set of regions. For example, `C1`
-    /// can only refer to `'static` and `'a`, and `C2` can only refer
-    /// to `'static` and `'b`. The job of this function is to impose that
-    /// constraint.
-    ///
-    /// Up to this point, C1 and C2 are basically just random type
-    /// inference variables, and hence they may contain arbitrary
-    /// regions. In fact, it is fairly likely that they do! Consider
-    /// this possible definition of `foo`:
-    ///
-    /// ```text
-    /// fn foo<'a, 'b>(x: &'a i32, y: &'b i32) -> (impl Bar<'a>, impl Bar<'b>) {
-    ///         (&*x, &*y)
-    ///     }
-    /// ```
-    ///
-    /// Here, the values for the concrete types of the two impl
-    /// traits will include inference variables:
-    ///
-    /// ```text
-    /// &'0 i32
-    /// &'1 i32
-    /// ```
-    ///
-    /// Ordinarily, the subtyping rules would ensure that these are
-    /// sufficiently large. But since `impl Bar<'a>` isn't a specific
-    /// type per se, we don't get such constraints by default. This
-    /// is where this function comes into play. It adds extra
-    /// constraints to ensure that all the regions which appear in the
-    /// inferred type are regions that could validly appear.
-    ///
-    /// This is actually a bit of a tricky constraint in general. We
-    /// want to say that each variable (e.g., `'0`) can only take on
-    /// values that were supplied as arguments to the opaque type
-    /// (e.g., `'a` for `Foo1<'a>`) or `'static`, which is always in
-    /// scope. We don't have a constraint quite of this kind in the current
-    /// region checker.
-    ///
-    /// # The Solution
-    ///
-    /// We generally prefer to make `<=` constraints, since they
-    /// integrate best into the region solver. To do that, we find the
-    /// "minimum" of all the arguments that appear in the substs: that
-    /// is, some region which is less than all the others. In the case
-    /// of `Foo1<'a>`, that would be `'a` (it's the only choice, after
-    /// all). Then we apply that as a least bound to the variables
-    /// (e.g., `'a <= '0`).
-    ///
-    /// In some cases, there is no minimum. Consider this example:
-    ///
-    /// ```text
-    /// fn baz<'a, 'b>() -> impl Trait<'a, 'b> { ... }
-    /// ```
-    ///
-    /// Here we would report a more complex "in constraint", like `'r
-    /// in ['a, 'b, 'static]` (where `'r` is some regon appearing in
-    /// the hidden type).
-    ///
-    /// # Constrain regions, not the hidden concrete type
-    ///
-    /// Note that generating constraints on each region `Rc` is *not*
-    /// the same as generating an outlives constraint on `Tc` iself.
-    /// For example, if we had a function like this:
-    ///
-    /// ```rust
-    /// fn foo<'a, T>(x: &'a u32, y: T) -> impl Foo<'a> {
-    ///   (x, y)
-    /// }
-    ///
-    /// // Equivalent to:
-    /// type FooReturn<'a, T> = impl Foo<'a>;
-    /// fn foo<'a, T>(..) -> FooReturn<'a, T> { .. }
-    /// ```
-    ///
-    /// then the hidden type `Tc` would be `(&'0 u32, T)` (where `'0`
-    /// is an inference variable). If we generated a constraint that
-    /// `Tc: 'a`, then this would incorrectly require that `T: 'a` --
-    /// but this is not necessary, because the opaque type we
-    /// create will be allowed to reference `T`. So we only generate a
-    /// constraint that `'0: 'a`.
-    ///
-    /// # The `free_region_relations` parameter
-    ///
-    /// The `free_region_relations` argument is used to find the
-    /// "minimum" of the regions supplied to a given opaque type.
-    /// It must be a relation that can answer whether `'a <= 'b`,
-    /// where `'a` and `'b` are regions that appear in the "substs"
-    /// for the opaque type references (the `<'a>` in `Foo1<'a>`).
-    ///
-    /// Note that we do not impose the constraints based on the
-    /// generic regions from the `Foo1` definition (e.g., `'x`). This
-    /// is because the constraints we are imposing here is basically
-    /// the concern of the one generating the constraining type C1,
-    /// which is the current function. It also means that we can
-    /// take "implied bounds" into account in some cases:
-    ///
-    /// ```text
-    /// trait SomeTrait<'a, 'b> { }
-    /// fn foo<'a, 'b>(_: &'a &'b u32) -> impl SomeTrait<'a, 'b> { .. }
-    /// ```
-    ///
-    /// Here, the fact that `'b: 'a` is known only because of the
-    /// implied bounds from the `&'a &'b u32` parameter, and is not
-    /// "inherent" to the opaque type definition.
-    ///
-    /// # Parameters
-    ///
-    /// - `opaque_types` -- the map produced by `instantiate_opaque_types`
-    /// - `free_region_relations` -- something that can be used to relate
-    ///   the free regions (`'a`) that appear in the impl trait.
-    pub fn constrain_opaque_types<FRR: FreeRegionRelations<'tcx>>(
-        &self,
-        opaque_types: &OpaqueTypeMap<'tcx>,
-        free_region_relations: &FRR,
-    ) {
-        debug!("constrain_opaque_types()");
-
-        for (&def_id, opaque_defn) in opaque_types {
-            self.constrain_opaque_type(def_id, opaque_defn, free_region_relations);
-        }
-    }
-
-    /// See `constrain_opaque_types` for documentation.
-    pub fn constrain_opaque_type<FRR: FreeRegionRelations<'tcx>>(
-        &self,
-        def_id: DefId,
-        opaque_defn: &OpaqueTypeDecl<'tcx>,
-        free_region_relations: &FRR,
-    ) {
-        debug!("constrain_opaque_type()");
-        debug!("constrain_opaque_type: def_id={:?}", def_id);
-        debug!("constrain_opaque_type: opaque_defn={:#?}", opaque_defn);
-
-        let tcx = self.tcx;
-
-        let concrete_ty = self.resolve_vars_if_possible(&opaque_defn.concrete_ty);
-
-        debug!("constrain_opaque_type: concrete_ty={:?}", concrete_ty);
-
-        let opaque_type_generics = tcx.generics_of(def_id);
-
-        let span = tcx.def_span(def_id);
-
-        // If there are required region bounds, we can use them.
-        if opaque_defn.has_required_region_bounds {
-            let predicates_of = tcx.predicates_of(def_id);
-            debug!("constrain_opaque_type: predicates: {:#?}", predicates_of,);
-            let bounds = predicates_of.instantiate(tcx, opaque_defn.substs);
-            debug!("constrain_opaque_type: bounds={:#?}", bounds);
-            let opaque_type = tcx.mk_opaque(def_id, opaque_defn.substs);
-
-            let required_region_bounds =
-                required_region_bounds(tcx, opaque_type, bounds.predicates);
-            debug_assert!(!required_region_bounds.is_empty());
-
-            for required_region in required_region_bounds {
-                concrete_ty.visit_with(&mut ConstrainOpaqueTypeRegionVisitor {
-                    tcx: self.tcx,
-                    op: |r| self.sub_regions(infer::CallReturn(span), required_region, r),
-                });
-            }
-            return;
-        }
-
-        // There were no `required_region_bounds`,
-        // so we have to search for a `least_region`.
-        // Go through all the regions used as arguments to the
-        // opaque type. These are the parameters to the opaque
-        // type; so in our example above, `substs` would contain
-        // `['a]` for the first impl trait and `'b` for the
-        // second.
-        let mut least_region = None;
-        for param in &opaque_type_generics.params {
-            match param.kind {
-                GenericParamDefKind::Lifetime => {}
-                _ => continue,
-            }
-
-            // Get the value supplied for this region from the substs.
-            let subst_arg = opaque_defn.substs.region_at(param.index as usize);
-
-            // Compute the least upper bound of it with the other regions.
-            debug!("constrain_opaque_types: least_region={:?}", least_region);
-            debug!("constrain_opaque_types: subst_arg={:?}", subst_arg);
-            match least_region {
-                None => least_region = Some(subst_arg),
-                Some(lr) => {
-                    if free_region_relations.sub_free_regions(lr, subst_arg) {
-                        // keep the current least region
-                    } else if free_region_relations.sub_free_regions(subst_arg, lr) {
-                        // switch to `subst_arg`
-                        least_region = Some(subst_arg);
-                    } else {
-                        // There are two regions (`lr` and
-                        // `subst_arg`) which are not relatable. We
-                        // can't find a best choice. Therefore,
-                        // instead of creating a single bound like
-                        // `'r: 'a` (which is our preferred choice),
-                        // we will create a "in bound" like `'r in
-                        // ['a, 'b, 'c]`, where `'a..'c` are the
-                        // regions that appear in the impl trait.
-                        return self.generate_member_constraint(
-                            concrete_ty,
-                            opaque_type_generics,
-                            opaque_defn,
-                            def_id,
-                            lr,
-                            subst_arg,
-                        );
-                    }
-                }
-            }
-        }
-
-        let least_region = least_region.unwrap_or(tcx.lifetimes.re_static);
-        debug!("constrain_opaque_types: least_region={:?}", least_region);
-
-        concrete_ty.visit_with(&mut ConstrainOpaqueTypeRegionVisitor {
-            tcx: self.tcx,
-            op: |r| self.sub_regions(infer::CallReturn(span), least_region, r),
-        });
-    }
-
-    /// As a fallback, we sometimes generate an "in constraint". For
-    /// a case like `impl Foo<'a, 'b>`, where `'a` and `'b` cannot be
-    /// related, we would generate a constraint `'r in ['a, 'b,
-    /// 'static]` for each region `'r` that appears in the hidden type
-    /// (i.e., it must be equal to `'a`, `'b`, or `'static`).
-    ///
-    /// `conflict1` and `conflict2` are the two region bounds that we
-    /// detected which were unrelated. They are used for diagnostics.
-    fn generate_member_constraint(
-        &self,
-        concrete_ty: Ty<'tcx>,
-        opaque_type_generics: &ty::Generics,
-        opaque_defn: &OpaqueTypeDecl<'tcx>,
-        opaque_type_def_id: DefId,
-        conflict1: ty::Region<'tcx>,
-        conflict2: ty::Region<'tcx>,
-    ) {
-        // For now, enforce a feature gate outside of async functions.
-        if self.member_constraint_feature_gate(
-            opaque_defn,
-            opaque_type_def_id,
-            conflict1,
-            conflict2,
-        ) {
-            return;
-        }
-
-        // Create the set of choice regions: each region in the hidden
-        // type can be equal to any of the region parameters of the
-        // opaque type definition.
-        let choice_regions: Lrc<Vec<ty::Region<'tcx>>> = Lrc::new(
-            opaque_type_generics
-                .params
-                .iter()
-                .filter(|param| match param.kind {
-                    GenericParamDefKind::Lifetime => true,
-                    GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => false,
-                })
-                .map(|param| opaque_defn.substs.region_at(param.index as usize))
-                .chain(std::iter::once(self.tcx.lifetimes.re_static))
-                .collect(),
-        );
-
-        concrete_ty.visit_with(&mut ConstrainOpaqueTypeRegionVisitor {
-            tcx: self.tcx,
-            op: |r| {
-                self.member_constraint(
-                    opaque_type_def_id,
-                    opaque_defn.definition_span,
-                    concrete_ty,
-                    r,
-                    &choice_regions,
-                )
-            },
-        });
-    }
-
-    /// Member constraints are presently feature-gated except for
-    /// async-await. We expect to lift this once we've had a bit more
-    /// time.
-    fn member_constraint_feature_gate(
-        &self,
-        opaque_defn: &OpaqueTypeDecl<'tcx>,
-        opaque_type_def_id: DefId,
-        conflict1: ty::Region<'tcx>,
-        conflict2: ty::Region<'tcx>,
-    ) -> bool {
-        // If we have `#![feature(member_constraints)]`, no problems.
-        if self.tcx.features().member_constraints {
-            return false;
-        }
-
-        let span = self.tcx.def_span(opaque_type_def_id);
-
-        // Without a feature-gate, we only generate member-constraints for async-await.
-        let context_name = match opaque_defn.origin {
-            // No feature-gate required for `async fn`.
-            hir::OpaqueTyOrigin::AsyncFn => return false,
-
-            // Otherwise, generate the label we'll use in the error message.
-            hir::OpaqueTyOrigin::TypeAlias => "impl Trait",
-            hir::OpaqueTyOrigin::FnReturn => "impl Trait",
-        };
-        let msg = format!("ambiguous lifetime bound in `{}`", context_name);
-        let mut err = self.tcx.sess.struct_span_err(span, &msg);
-
-        let conflict1_name = conflict1.to_string();
-        let conflict2_name = conflict2.to_string();
-        let label_owned;
-        let label = match (&*conflict1_name, &*conflict2_name) {
-            ("'_", "'_") => "the elided lifetimes here do not outlive one another",
-            _ => {
-                label_owned = format!(
-                    "neither `{}` nor `{}` outlives the other",
-                    conflict1_name, conflict2_name,
-                );
-                &label_owned
-            }
-        };
-        err.span_label(span, label);
-
-        if nightly_options::is_nightly_build() {
-            err.help("add #![feature(member_constraints)] to the crate attributes to enable");
-        }
-
-        err.emit();
-        true
-    }
-
-    /// Given the fully resolved, instantiated type for an opaque
-    /// type, i.e., the value of an inference variable like C1 or C2
-    /// (*), computes the "definition type" for an opaque type
-    /// definition -- that is, the inferred value of `Foo1<'x>` or
-    /// `Foo2<'x>` that we would conceptually use in its definition:
-    ///
-    ///     type Foo1<'x> = impl Bar<'x> = AAA; <-- this type AAA
-    ///     type Foo2<'x> = impl Bar<'x> = BBB; <-- or this type BBB
-    ///     fn foo<'a, 'b>(..) -> (Foo1<'a>, Foo2<'b>) { .. }
-    ///
-    /// Note that these values are defined in terms of a distinct set of
-    /// generic parameters (`'x` instead of `'a`) from C1 or C2. The main
-    /// purpose of this function is to do that translation.
-    ///
-    /// (*) C1 and C2 were introduced in the comments on
-    /// `constrain_opaque_types`. Read that comment for more context.
-    ///
-    /// # Parameters
-    ///
-    /// - `def_id`, the `impl Trait` type
-    /// - `opaque_defn`, the opaque definition created in `instantiate_opaque_types`
-    /// - `instantiated_ty`, the inferred type C1 -- fully resolved, lifted version of
-    ///   `opaque_defn.concrete_ty`
-    pub fn infer_opaque_definition_from_instantiation(
-        &self,
-        def_id: DefId,
-        opaque_defn: &OpaqueTypeDecl<'tcx>,
-        instantiated_ty: Ty<'tcx>,
-        span: Span,
-    ) -> Ty<'tcx> {
-        debug!(
-            "infer_opaque_definition_from_instantiation(def_id={:?}, instantiated_ty={:?})",
-            def_id, instantiated_ty
-        );
-
-        // Use substs to build up a reverse map from regions to their
-        // identity mappings. This is necessary because of `impl
-        // Trait` lifetimes are computed by replacing existing
-        // lifetimes with 'static and remapping only those used in the
-        // `impl Trait` return type, resulting in the parameters
-        // shifting.
-        let id_substs = InternalSubsts::identity_for_item(self.tcx, def_id);
-        let map: FxHashMap<GenericArg<'tcx>, GenericArg<'tcx>> = opaque_defn
-            .substs
-            .iter()
-            .enumerate()
-            .map(|(index, subst)| (*subst, id_substs[index]))
-            .collect();
-
-        // Convert the type from the function into a type valid outside
-        // the function, by replacing invalid regions with 'static,
-        // after producing an error for each of them.
-        let definition_ty = instantiated_ty.fold_with(&mut ReverseMapper::new(
-            self.tcx,
-            self.is_tainted_by_errors(),
-            def_id,
-            map,
-            instantiated_ty,
-            span,
-        ));
-        debug!("infer_opaque_definition_from_instantiation: definition_ty={:?}", definition_ty);
-
-        definition_ty
-    }
-}
-
-pub fn unexpected_hidden_region_diagnostic(
-    tcx: TyCtxt<'tcx>,
-    region_scope_tree: Option<&region::ScopeTree>,
-    opaque_type_def_id: DefId,
-    hidden_ty: Ty<'tcx>,
-    hidden_region: ty::Region<'tcx>,
-) -> DiagnosticBuilder<'tcx> {
-    let span = tcx.def_span(opaque_type_def_id);
-    let mut err = struct_span_err!(
-        tcx.sess,
-        span,
-        E0700,
-        "hidden type for `impl Trait` captures lifetime that does not appear in bounds",
-    );
-
-    // Explain the region we are capturing.
-    if let ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReStatic | ty::ReEmpty = hidden_region {
-        // Assuming regionck succeeded (*), we ought to always be
-        // capturing *some* region from the fn header, and hence it
-        // ought to be free. So under normal circumstances, we will go
-        // down this path which gives a decent human readable
-        // explanation.
-        //
-        // (*) if not, the `tainted_by_errors` flag would be set to
-        // true in any case, so we wouldn't be here at all.
-        note_and_explain_free_region(
-            tcx,
-            &mut err,
-            &format!("hidden type `{}` captures ", hidden_ty),
-            hidden_region,
-            "",
-        );
-    } else {
-        // Ugh. This is a painful case: the hidden region is not one
-        // that we can easily summarize or explain. This can happen
-        // in a case like
-        // `src/test/ui/multiple-lifetimes/ordinary-bounds-unsuited.rs`:
-        //
-        // ```
-        // fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b> {
-        //   if condition() { a } else { b }
-        // }
-        // ```
-        //
-        // Here the captured lifetime is the intersection of `'a` and
-        // `'b`, which we can't quite express.
-
-        if let Some(region_scope_tree) = region_scope_tree {
-            // If the `region_scope_tree` is available, this is being
-            // invoked from the "region inferencer error". We can at
-            // least report a really cryptic error for now.
-            note_and_explain_region(
-                tcx,
-                region_scope_tree,
-                &mut err,
-                &format!("hidden type `{}` captures ", hidden_ty),
-                hidden_region,
-                "",
-            );
-        } else {
-            // If the `region_scope_tree` is *unavailable*, this is
-            // being invoked by the code that comes *after* region
-            // inferencing. This is a bug, as the region inferencer
-            // ought to have noticed the failed constraint and invoked
-            // error reporting, which in turn should have prevented us
-            // from getting trying to infer the hidden type
-            // completely.
-            tcx.sess.delay_span_bug(
-                span,
-                &format!(
-                    "hidden type captures unexpected lifetime `{:?}` \
-                     but no region inference failure",
-                    hidden_region,
-                ),
-            );
-        }
-    }
-
-    err
-}
-
-// Visitor that requires that (almost) all regions in the type visited outlive
-// `least_region`. We cannot use `push_outlives_components` because regions in
-// closure signatures are not included in their outlives components. We need to
-// ensure all regions outlive the given bound so that we don't end up with,
-// say, `ReScope` appearing in a return type and causing ICEs when other
-// functions end up with region constraints involving regions from other
-// functions.
-//
-// We also cannot use `for_each_free_region` because for closures it includes
-// the regions parameters from the enclosing item.
-//
-// We ignore any type parameters because impl trait values are assumed to
-// capture all the in-scope type parameters.
-struct ConstrainOpaqueTypeRegionVisitor<'tcx, OP>
-where
-    OP: FnMut(ty::Region<'tcx>),
-{
-    tcx: TyCtxt<'tcx>,
-    op: OP,
-}
-
-impl<'tcx, OP> TypeVisitor<'tcx> for ConstrainOpaqueTypeRegionVisitor<'tcx, OP>
-where
-    OP: FnMut(ty::Region<'tcx>),
-{
-    fn visit_binder<T: TypeFoldable<'tcx>>(&mut self, t: &ty::Binder<T>) -> bool {
-        t.skip_binder().visit_with(self);
-        false // keep visiting
-    }
-
-    fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool {
-        match *r {
-            // ignore bound regions, keep visiting
-            ty::ReLateBound(_, _) => false,
-            _ => {
-                (self.op)(r);
-                false
-            }
-        }
-    }
-
-    fn visit_ty(&mut self, ty: Ty<'tcx>) -> bool {
-        // We're only interested in types involving regions
-        if !ty.flags.intersects(ty::TypeFlags::HAS_FREE_REGIONS) {
-            return false; // keep visiting
-        }
-
-        match ty.kind {
-            ty::Closure(def_id, ref substs) => {
-                // Skip lifetime parameters of the enclosing item(s)
-
-                for upvar_ty in substs.as_closure().upvar_tys(def_id, self.tcx) {
-                    upvar_ty.visit_with(self);
-                }
-
-                substs.as_closure().sig_ty(def_id, self.tcx).visit_with(self);
-            }
-
-            ty::Generator(def_id, ref substs, _) => {
-                // Skip lifetime parameters of the enclosing item(s)
-                // Also skip the witness type, because that has no free regions.
-
-                for upvar_ty in substs.as_generator().upvar_tys(def_id, self.tcx) {
-                    upvar_ty.visit_with(self);
-                }
-
-                substs.as_generator().return_ty(def_id, self.tcx).visit_with(self);
-                substs.as_generator().yield_ty(def_id, self.tcx).visit_with(self);
-            }
-            _ => {
-                ty.super_visit_with(self);
-            }
-        }
-
-        false
-    }
-}
-
-struct ReverseMapper<'tcx> {
-    tcx: TyCtxt<'tcx>,
-
-    /// If errors have already been reported in this fn, we suppress
-    /// our own errors because they are sometimes derivative.
-    tainted_by_errors: bool,
-
-    opaque_type_def_id: DefId,
-    map: FxHashMap<GenericArg<'tcx>, GenericArg<'tcx>>,
-    map_missing_regions_to_empty: bool,
-
-    /// initially `Some`, set to `None` once error has been reported
-    hidden_ty: Option<Ty<'tcx>>,
-
-    /// Span of function being checked.
-    span: Span,
-}
-
-impl ReverseMapper<'tcx> {
-    fn new(
-        tcx: TyCtxt<'tcx>,
-        tainted_by_errors: bool,
-        opaque_type_def_id: DefId,
-        map: FxHashMap<GenericArg<'tcx>, GenericArg<'tcx>>,
-        hidden_ty: Ty<'tcx>,
-        span: Span,
-    ) -> Self {
-        Self {
-            tcx,
-            tainted_by_errors,
-            opaque_type_def_id,
-            map,
-            map_missing_regions_to_empty: false,
-            hidden_ty: Some(hidden_ty),
-            span,
-        }
-    }
-
-    fn fold_kind_mapping_missing_regions_to_empty(
-        &mut self,
-        kind: GenericArg<'tcx>,
-    ) -> GenericArg<'tcx> {
-        assert!(!self.map_missing_regions_to_empty);
-        self.map_missing_regions_to_empty = true;
-        let kind = kind.fold_with(self);
-        self.map_missing_regions_to_empty = false;
-        kind
-    }
-
-    fn fold_kind_normally(&mut self, kind: GenericArg<'tcx>) -> GenericArg<'tcx> {
-        assert!(!self.map_missing_regions_to_empty);
-        kind.fold_with(self)
-    }
-}
-
-impl TypeFolder<'tcx> for ReverseMapper<'tcx> {
-    fn tcx(&self) -> TyCtxt<'tcx> {
-        self.tcx
-    }
-
-    fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
-        match r {
-            // ignore bound regions that appear in the type (e.g., this
-            // would ignore `'r` in a type like `for<'r> fn(&'r u32)`.
-            ty::ReLateBound(..) |
-
-            // ignore `'static`, as that can appear anywhere
-            ty::ReStatic => return r,
-
-            _ => { }
-        }
-
-        let generics = self.tcx().generics_of(self.opaque_type_def_id);
-        match self.map.get(&r.into()).map(|k| k.unpack()) {
-            Some(GenericArgKind::Lifetime(r1)) => r1,
-            Some(u) => panic!("region mapped to unexpected kind: {:?}", u),
-            None if generics.parent.is_some() => {
-                if !self.map_missing_regions_to_empty && !self.tainted_by_errors {
-                    if let Some(hidden_ty) = self.hidden_ty.take() {
-                        unexpected_hidden_region_diagnostic(
-                            self.tcx,
-                            None,
-                            self.opaque_type_def_id,
-                            hidden_ty,
-                            r,
-                        )
-                        .emit();
-                    }
-                }
-                self.tcx.lifetimes.re_empty
-            }
-            None => {
-                self.tcx
-                    .sess
-                    .struct_span_err(self.span, "non-defining opaque type use in defining scope")
-                    .span_label(
-                        self.span,
-                        format!(
-                            "lifetime `{}` is part of concrete type but not used in \
-                                 parameter list of the `impl Trait` type alias",
-                            r
-                        ),
-                    )
-                    .emit();
-
-                self.tcx().mk_region(ty::ReStatic)
-            }
-        }
-    }
-
-    fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
-        match ty.kind {
-            ty::Closure(def_id, substs) => {
-                // I am a horrible monster and I pray for death. When
-                // we encounter a closure here, it is always a closure
-                // from within the function that we are currently
-                // type-checking -- one that is now being encapsulated
-                // in an opaque type. Ideally, we would
-                // go through the types/lifetimes that it references
-                // and treat them just like we would any other type,
-                // which means we would error out if we find any
-                // reference to a type/region that is not in the
-                // "reverse map".
-                //
-                // **However,** in the case of closures, there is a
-                // somewhat subtle (read: hacky) consideration. The
-                // problem is that our closure types currently include
-                // all the lifetime parameters declared on the
-                // enclosing function, even if they are unused by the
-                // closure itself. We can't readily filter them out,
-                // so here we replace those values with `'empty`. This
-                // can't really make a difference to the rest of the
-                // compiler; those regions are ignored for the
-                // outlives relation, and hence don't affect trait
-                // selection or auto traits, and they are erased
-                // during codegen.
-
-                let generics = self.tcx.generics_of(def_id);
-                let substs = self.tcx.mk_substs(substs.iter().enumerate().map(|(index, &kind)| {
-                    if index < generics.parent_count {
-                        // Accommodate missing regions in the parent kinds...
-                        self.fold_kind_mapping_missing_regions_to_empty(kind)
-                    } else {
-                        // ...but not elsewhere.
-                        self.fold_kind_normally(kind)
-                    }
-                }));
-
-                self.tcx.mk_closure(def_id, substs)
-            }
-
-            ty::Generator(def_id, substs, movability) => {
-                let generics = self.tcx.generics_of(def_id);
-                let substs = self.tcx.mk_substs(substs.iter().enumerate().map(|(index, &kind)| {
-                    if index < generics.parent_count {
-                        // Accommodate missing regions in the parent kinds...
-                        self.fold_kind_mapping_missing_regions_to_empty(kind)
-                    } else {
-                        // ...but not elsewhere.
-                        self.fold_kind_normally(kind)
-                    }
-                }));
-
-                self.tcx.mk_generator(def_id, substs, movability)
-            }
-
-            ty::Param(..) => {
-                // Look it up in the substitution list.
-                match self.map.get(&ty.into()).map(|k| k.unpack()) {
-                    // Found it in the substitution list; replace with the parameter from the
-                    // opaque type.
-                    Some(GenericArgKind::Type(t1)) => t1,
-                    Some(u) => panic!("type mapped to unexpected kind: {:?}", u),
-                    None => {
-                        self.tcx
-                            .sess
-                            .struct_span_err(
-                                self.span,
-                                &format!(
-                                    "type parameter `{}` is part of concrete type but not \
-                                          used in parameter list for the `impl Trait` type alias",
-                                    ty
-                                ),
-                            )
-                            .emit();
-
-                        self.tcx().types.err
-                    }
-                }
-            }
-
-            _ => ty.super_fold_with(self),
-        }
-    }
-
-    fn fold_const(&mut self, ct: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
-        trace!("checking const {:?}", ct);
-        // Find a const parameter
-        match ct.val {
-            ty::ConstKind::Param(..) => {
-                // Look it up in the substitution list.
-                match self.map.get(&ct.into()).map(|k| k.unpack()) {
-                    // Found it in the substitution list, replace with the parameter from the
-                    // opaque type.
-                    Some(GenericArgKind::Const(c1)) => c1,
-                    Some(u) => panic!("const mapped to unexpected kind: {:?}", u),
-                    None => {
-                        self.tcx
-                            .sess
-                            .struct_span_err(
-                                self.span,
-                                &format!(
-                                    "const parameter `{}` is part of concrete type but not \
-                                          used in parameter list for the `impl Trait` type alias",
-                                    ct
-                                ),
-                            )
-                            .emit();
-
-                        self.tcx().consts.err
-                    }
-                }
-            }
-
-            _ => ct,
-        }
-    }
-}
-
-struct Instantiator<'a, 'tcx> {
-    infcx: &'a InferCtxt<'a, 'tcx>,
-    parent_def_id: DefId,
-    body_id: hir::HirId,
-    param_env: ty::ParamEnv<'tcx>,
-    value_span: Span,
-    opaque_types: OpaqueTypeMap<'tcx>,
-    obligations: Vec<PredicateObligation<'tcx>>,
-}
-
-impl<'a, 'tcx> Instantiator<'a, 'tcx> {
-    fn instantiate_opaque_types_in_map<T: TypeFoldable<'tcx>>(&mut self, value: &T) -> T {
-        debug!("instantiate_opaque_types_in_map(value={:?})", value);
-        let tcx = self.infcx.tcx;
-        value.fold_with(&mut BottomUpFolder {
-            tcx,
-            ty_op: |ty| {
-                if ty.references_error() {
-                    return tcx.types.err;
-                } else if let ty::Opaque(def_id, substs) = ty.kind {
-                    // Check that this is `impl Trait` type is
-                    // declared by `parent_def_id` -- i.e., one whose
-                    // value we are inferring.  At present, this is
-                    // always true during the first phase of
-                    // type-check, but not always true later on during
-                    // NLL. Once we support named opaque types more fully,
-                    // this same scenario will be able to arise during all phases.
-                    //
-                    // Here is an example using type alias `impl Trait`
-                    // that indicates the distinction we are checking for:
-                    //
-                    // ```rust
-                    // mod a {
-                    //   pub type Foo = impl Iterator;
-                    //   pub fn make_foo() -> Foo { .. }
-                    // }
-                    //
-                    // mod b {
-                    //   fn foo() -> a::Foo { a::make_foo() }
-                    // }
-                    // ```
-                    //
-                    // Here, the return type of `foo` references a
-                    // `Opaque` indeed, but not one whose value is
-                    // presently being inferred. You can get into a
-                    // similar situation with closure return types
-                    // today:
-                    //
-                    // ```rust
-                    // fn foo() -> impl Iterator { .. }
-                    // fn bar() {
-                    //     let x = || foo(); // returns the Opaque assoc with `foo`
-                    // }
-                    // ```
-                    if let Some(opaque_hir_id) = tcx.hir().as_local_hir_id(def_id) {
-                        let parent_def_id = self.parent_def_id;
-                        let def_scope_default = || {
-                            let opaque_parent_hir_id = tcx.hir().get_parent_item(opaque_hir_id);
-                            parent_def_id == tcx.hir().local_def_id(opaque_parent_hir_id)
-                        };
-                        let (in_definition_scope, origin) = match tcx.hir().find(opaque_hir_id) {
-                            Some(Node::Item(item)) => match item.kind {
-                                // Anonymous `impl Trait`
-                                hir::ItemKind::OpaqueTy(hir::OpaqueTy {
-                                    impl_trait_fn: Some(parent),
-                                    origin,
-                                    ..
-                                }) => (parent == self.parent_def_id, origin),
-                                // Named `type Foo = impl Bar;`
-                                hir::ItemKind::OpaqueTy(hir::OpaqueTy {
-                                    impl_trait_fn: None,
-                                    origin,
-                                    ..
-                                }) => (
-                                    may_define_opaque_type(tcx, self.parent_def_id, opaque_hir_id),
-                                    origin,
-                                ),
-                                _ => (def_scope_default(), hir::OpaqueTyOrigin::TypeAlias),
-                            },
-                            Some(Node::ImplItem(item)) => match item.kind {
-                                hir::ImplItemKind::OpaqueTy(_) => (
-                                    may_define_opaque_type(tcx, self.parent_def_id, opaque_hir_id),
-                                    hir::OpaqueTyOrigin::TypeAlias,
-                                ),
-                                _ => (def_scope_default(), hir::OpaqueTyOrigin::TypeAlias),
-                            },
-                            _ => bug!(
-                                "expected (impl) item, found {}",
-                                tcx.hir().node_to_string(opaque_hir_id),
-                            ),
-                        };
-                        if in_definition_scope {
-                            return self.fold_opaque_ty(ty, def_id, substs, origin);
-                        }
-
-                        debug!(
-                            "instantiate_opaque_types_in_map: \
-                             encountered opaque outside its definition scope \
-                             def_id={:?}",
-                            def_id,
-                        );
-                    }
-                }
-
-                ty
-            },
-            lt_op: |lt| lt,
-            ct_op: |ct| ct,
-        })
-    }
-
-    fn fold_opaque_ty(
-        &mut self,
-        ty: Ty<'tcx>,
-        def_id: DefId,
-        substs: SubstsRef<'tcx>,
-        origin: hir::OpaqueTyOrigin,
-    ) -> Ty<'tcx> {
-        let infcx = self.infcx;
-        let tcx = infcx.tcx;
-
-        debug!("instantiate_opaque_types: Opaque(def_id={:?}, substs={:?})", def_id, substs);
-
-        // Use the same type variable if the exact same opaque type appears more
-        // than once in the return type (e.g., if it's passed to a type alias).
-        if let Some(opaque_defn) = self.opaque_types.get(&def_id) {
-            debug!("instantiate_opaque_types: returning concrete ty {:?}", opaque_defn.concrete_ty);
-            return opaque_defn.concrete_ty;
-        }
-        let span = tcx.def_span(def_id);
-        debug!("fold_opaque_ty {:?} {:?}", self.value_span, span);
-        let ty_var = infcx
-            .next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::TypeInference, span });
-
-        let predicates_of = tcx.predicates_of(def_id);
-        debug!("instantiate_opaque_types: predicates={:#?}", predicates_of,);
-        let bounds = predicates_of.instantiate(tcx, substs);
-
-        let param_env = tcx.param_env(def_id);
-        let InferOk { value: bounds, obligations } =
-            infcx.partially_normalize_associated_types_in(span, self.body_id, param_env, &bounds);
-        self.obligations.extend(obligations);
-
-        debug!("instantiate_opaque_types: bounds={:?}", bounds);
-
-        let required_region_bounds = required_region_bounds(tcx, ty, bounds.predicates.clone());
-        debug!("instantiate_opaque_types: required_region_bounds={:?}", required_region_bounds);
-
-        // Make sure that we are in fact defining the *entire* type
-        // (e.g., `type Foo<T: Bound> = impl Bar;` needs to be
-        // defined by a function like `fn foo<T: Bound>() -> Foo<T>`).
-        debug!("instantiate_opaque_types: param_env={:#?}", self.param_env,);
-        debug!("instantiate_opaque_types: generics={:#?}", tcx.generics_of(def_id),);
-
-        // Ideally, we'd get the span where *this specific `ty` came
-        // from*, but right now we just use the span from the overall
-        // value being folded. In simple cases like `-> impl Foo`,
-        // these are the same span, but not in cases like `-> (impl
-        // Foo, impl Bar)`.
-        let definition_span = self.value_span;
-
-        self.opaque_types.insert(
-            def_id,
-            OpaqueTypeDecl {
-                opaque_type: ty,
-                substs,
-                definition_span,
-                concrete_ty: ty_var,
-                has_required_region_bounds: !required_region_bounds.is_empty(),
-                origin,
-            },
-        );
-        debug!("instantiate_opaque_types: ty_var={:?}", ty_var);
-
-        for predicate in &bounds.predicates {
-            if let ty::Predicate::Projection(projection) = &predicate {
-                if projection.skip_binder().ty.references_error() {
-                    // No point on adding these obligations since there's a type error involved.
-                    return ty_var;
-                }
-            }
-        }
-
-        self.obligations.reserve(bounds.predicates.len());
-        for predicate in bounds.predicates {
-            // Change the predicate to refer to the type variable,
-            // which will be the concrete type instead of the opaque type.
-            // This also instantiates nested instances of `impl Trait`.
-            let predicate = self.instantiate_opaque_types_in_map(&predicate);
-
-            let cause = traits::ObligationCause::new(span, self.body_id, traits::SizedReturnType);
-
-            // Require that the predicate holds for the concrete type.
-            debug!("instantiate_opaque_types: predicate={:?}", predicate);
-            self.obligations.push(traits::Obligation::new(cause, self.param_env, predicate));
-        }
-
-        ty_var
-    }
-}
-
-/// Returns `true` if `opaque_hir_id` is a sibling or a child of a sibling of `def_id`.
-///
-/// Example:
-/// ```rust
-/// pub mod foo {
-///     pub mod bar {
-///         pub trait Bar { .. }
-///
-///         pub type Baz = impl Bar;
-///
-///         fn f1() -> Baz { .. }
-///     }
-///
-///     fn f2() -> bar::Baz { .. }
-/// }
-/// ```
-///
-/// Here, `def_id` is the `DefId` of the defining use of the opaque type (e.g., `f1` or `f2`),
-/// and `opaque_hir_id` is the `HirId` of the definition of the opaque type `Baz`.
-/// For the above example, this function returns `true` for `f1` and `false` for `f2`.
-pub fn may_define_opaque_type(tcx: TyCtxt<'_>, def_id: DefId, opaque_hir_id: hir::HirId) -> bool {
-    let mut hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
-
-    // Named opaque types can be defined by any siblings or children of siblings.
-    let scope = tcx.hir().get_defining_scope(opaque_hir_id);
-    // We walk up the node tree until we hit the root or the scope of the opaque type.
-    while hir_id != scope && hir_id != hir::CRATE_HIR_ID {
-        hir_id = tcx.hir().get_parent_item(hir_id);
-    }
-    // Syntactically, we are allowed to define the concrete type if:
-    let res = hir_id == scope;
-    trace!(
-        "may_define_opaque_type(def={:?}, opaque_node={:?}) = {}",
-        tcx.hir().find(hir_id),
-        tcx.hir().get(opaque_hir_id),
-        res
-    );
-    res
-}
-
-/// Given a set of predicates that apply to an object type, returns
-/// the region bounds that the (erased) `Self` type must
-/// outlive. Precisely *because* the `Self` type is erased, the
-/// parameter `erased_self_ty` must be supplied to indicate what type
-/// has been used to represent `Self` in the predicates
-/// themselves. This should really be a unique type; `FreshTy(0)` is a
-/// popular choice.
-///
-/// N.B., in some cases, particularly around higher-ranked bounds,
-/// this function returns a kind of conservative approximation.
-/// That is, all regions returned by this function are definitely
-/// required, but there may be other region bounds that are not
-/// returned, as well as requirements like `for<'a> T: 'a`.
-///
-/// Requires that trait definitions have been processed so that we can
-/// elaborate predicates and walk supertraits.
-//
-// FIXME: callers may only have a `&[Predicate]`, not a `Vec`, so that's
-// what this code should accept.
-crate fn required_region_bounds(
-    tcx: TyCtxt<'tcx>,
-    erased_self_ty: Ty<'tcx>,
-    predicates: Vec<ty::Predicate<'tcx>>,
-) -> Vec<ty::Region<'tcx>> {
-    debug!(
-        "required_region_bounds(erased_self_ty={:?}, predicates={:?})",
-        erased_self_ty, predicates
-    );
-
-    assert!(!erased_self_ty.has_escaping_bound_vars());
-
-    traits::elaborate_predicates(tcx, predicates)
-        .filter_map(|predicate| {
-            match predicate {
-                ty::Predicate::Projection(..)
-                | ty::Predicate::Trait(..)
-                | ty::Predicate::Subtype(..)
-                | ty::Predicate::WellFormed(..)
-                | ty::Predicate::ObjectSafe(..)
-                | ty::Predicate::ClosureKind(..)
-                | ty::Predicate::RegionOutlives(..)
-                | ty::Predicate::ConstEvaluatable(..) => None,
-                ty::Predicate::TypeOutlives(predicate) => {
-                    // Search for a bound of the form `erased_self_ty
-                    // : 'a`, but be wary of something like `for<'a>
-                    // erased_self_ty : 'a` (we interpret a
-                    // higher-ranked bound like that as 'static,
-                    // though at present the code in `fulfill.rs`
-                    // considers such bounds to be unsatisfiable, so
-                    // it's kind of a moot point since you could never
-                    // construct such an object, but this seems
-                    // correct even if that code changes).
-                    let ty::OutlivesPredicate(ref t, ref r) = predicate.skip_binder();
-                    if t == &erased_self_ty && !r.has_escaping_bound_vars() {
-                        Some(*r)
-                    } else {
-                        None
-                    }
-                }
-            }
-        })
-        .collect()
-}
diff --git a/src/librustc/infer/region_constraints/mod.rs b/src/librustc/infer/region_constraints/mod.rs
deleted file mode 100644
index 27ed3c7813..0000000000
--- a/src/librustc/infer/region_constraints/mod.rs
+++ /dev/null
@@ -1,938 +0,0 @@
-//! See `README.md`.
-
-use self::CombineMapType::*;
-use self::UndoLog::*;
-
-use super::unify_key;
-use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin};
-
-use crate::ty::ReStatic;
-use crate::ty::{self, Ty, TyCtxt};
-use crate::ty::{ReLateBound, ReVar};
-use crate::ty::{Region, RegionVid};
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_data_structures::sync::Lrc;
-use rustc_data_structures::unify as ut;
-use rustc_hir::def_id::DefId;
-use rustc_index::vec::IndexVec;
-use rustc_span::Span;
-
-use std::collections::BTreeMap;
-use std::ops::Range;
-use std::{cmp, fmt, mem};
-
-mod leak_check;
-
-#[derive(Default)]
-pub struct RegionConstraintCollector<'tcx> {
-    /// For each `RegionVid`, the corresponding `RegionVariableOrigin`.
-    var_infos: IndexVec<RegionVid, RegionVariableInfo>,
-
-    data: RegionConstraintData<'tcx>,
-
-    /// For a given pair of regions (R1, R2), maps to a region R3 that
-    /// is designated as their LUB (edges R1 <= R3 and R2 <= R3
-    /// exist). This prevents us from making many such regions.
-    lubs: CombineMap<'tcx>,
-
-    /// For a given pair of regions (R1, R2), maps to a region R3 that
-    /// is designated as their GLB (edges R3 <= R1 and R3 <= R2
-    /// exist). This prevents us from making many such regions.
-    glbs: CombineMap<'tcx>,
-
-    /// The undo log records actions that might later be undone.
-    ///
-    /// Note: `num_open_snapshots` is used to track if we are actively
-    /// snapshotting. When the `start_snapshot()` method is called, we
-    /// increment `num_open_snapshots` to indicate that we are now actively
-    /// snapshotting. The reason for this is that otherwise we end up adding
-    /// entries for things like the lower bound on a variable and so forth,
-    /// which can never be rolled back.
-    undo_log: Vec<UndoLog<'tcx>>,
-
-    /// The number of open snapshots, i.e., those that haven't been committed or
-    /// rolled back.
-    num_open_snapshots: usize,
-
-    /// When we add a R1 == R2 constriant, we currently add (a) edges
-    /// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this
-    /// table. You can then call `opportunistic_resolve_var` early
-    /// which will map R1 and R2 to some common region (i.e., either
-    /// R1 or R2). This is important when dropck and other such code
-    /// is iterating to a fixed point, because otherwise we sometimes
-    /// would wind up with a fresh stream of region variables that
-    /// have been equated but appear distinct.
-    unification_table: ut::UnificationTable<ut::InPlace<ty::RegionVid>>,
-
-    /// a flag set to true when we perform any unifications; this is used
-    /// to micro-optimize `take_and_reset_data`
-    any_unifications: bool,
-}
-
-pub type VarInfos = IndexVec<RegionVid, RegionVariableInfo>;
-
-/// The full set of region constraints gathered up by the collector.
-/// Describes constraints between the region variables and other
-/// regions, as well as other conditions that must be verified, or
-/// assumptions that can be made.
-#[derive(Debug, Default, Clone)]
-pub struct RegionConstraintData<'tcx> {
-    /// Constraints of the form `A <= B`, where either `A` or `B` can
-    /// be a region variable (or neither, as it happens).
-    pub constraints: BTreeMap<Constraint<'tcx>, SubregionOrigin<'tcx>>,
-
-    /// Constraints of the form `R0 member of [R1, ..., Rn]`, meaning that
-    /// `R0` must be equal to one of the regions `R1..Rn`. These occur
-    /// with `impl Trait` quite frequently.
-    pub member_constraints: Vec<MemberConstraint<'tcx>>,
-
-    /// A "verify" is something that we need to verify after inference
-    /// is done, but which does not directly affect inference in any
-    /// way.
-    ///
-    /// An example is a `A <= B` where neither `A` nor `B` are
-    /// inference variables.
-    pub verifys: Vec<Verify<'tcx>>,
-
-    /// A "given" is a relationship that is known to hold. In
-    /// particular, we often know from closure fn signatures that a
-    /// particular free region must be a subregion of a region
-    /// variable:
-    ///
-    ///    foo.iter().filter(<'a> |x: &'a &'b T| ...)
-    ///
-    /// In situations like this, `'b` is in fact a region variable
-    /// introduced by the call to `iter()`, and `'a` is a bound region
-    /// on the closure (as indicated by the `<'a>` prefix). If we are
-    /// naive, we wind up inferring that `'b` must be `'static`,
-    /// because we require that it be greater than `'a` and we do not
-    /// know what `'a` is precisely.
-    ///
-    /// This hashmap is used to avoid that naive scenario. Basically
-    /// we record the fact that `'a <= 'b` is implied by the fn
-    /// signature, and then ignore the constraint when solving
-    /// equations. This is a bit of a hack but seems to work.
-    pub givens: FxHashSet<(Region<'tcx>, ty::RegionVid)>,
-}
-
-/// Represents a constraint that influences the inference process.
-#[derive(Clone, Copy, PartialEq, Eq, Debug, PartialOrd, Ord)]
-pub enum Constraint<'tcx> {
-    /// A region variable is a subregion of another.
-    VarSubVar(RegionVid, RegionVid),
-
-    /// A concrete region is a subregion of region variable.
-    RegSubVar(Region<'tcx>, RegionVid),
-
-    /// A region variable is a subregion of a concrete region. This does not
-    /// directly affect inference, but instead is checked after
-    /// inference is complete.
-    VarSubReg(RegionVid, Region<'tcx>),
-
-    /// A constraint where neither side is a variable. This does not
-    /// directly affect inference, but instead is checked after
-    /// inference is complete.
-    RegSubReg(Region<'tcx>, Region<'tcx>),
-}
-
-impl Constraint<'_> {
-    pub fn involves_placeholders(&self) -> bool {
-        match self {
-            Constraint::VarSubVar(_, _) => false,
-            Constraint::VarSubReg(_, r) | Constraint::RegSubVar(r, _) => r.is_placeholder(),
-            Constraint::RegSubReg(r, s) => r.is_placeholder() || s.is_placeholder(),
-        }
-    }
-}
-
-/// Requires that `region` must be equal to one of the regions in `choice_regions`.
-/// We often denote this using the syntax:
-///
-/// ```
-/// R0 member of [O1..On]
-/// ```
-#[derive(Debug, Clone, HashStable, TypeFoldable, Lift)]
-pub struct MemberConstraint<'tcx> {
-    /// The `DefId` of the opaque type causing this constraint: used for error reporting.
-    pub opaque_type_def_id: DefId,
-
-    /// The span where the hidden type was instantiated.
-    pub definition_span: Span,
-
-    /// The hidden type in which `member_region` appears: used for error reporting.
-    pub hidden_ty: Ty<'tcx>,
-
-    /// The region `R0`.
-    pub member_region: Region<'tcx>,
-
-    /// The options `O1..On`.
-    pub choice_regions: Lrc<Vec<Region<'tcx>>>,
-}
-
-/// `VerifyGenericBound(T, _, R, RS)`: the parameter type `T` (or
-/// associated type) must outlive the region `R`. `T` is known to
-/// outlive `RS`. Therefore, verify that `R <= RS[i]` for some
-/// `i`. Inference variables may be involved (but this verification
-/// step doesn't influence inference).
-#[derive(Debug, Clone)]
-pub struct Verify<'tcx> {
-    pub kind: GenericKind<'tcx>,
-    pub origin: SubregionOrigin<'tcx>,
-    pub region: Region<'tcx>,
-    pub bound: VerifyBound<'tcx>,
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Hash, TypeFoldable)]
-pub enum GenericKind<'tcx> {
-    Param(ty::ParamTy),
-    Projection(ty::ProjectionTy<'tcx>),
-}
-
-/// Describes the things that some `GenericKind` value `G` is known to
-/// outlive. Each variant of `VerifyBound` can be thought of as a
-/// function:
-///
-///     fn(min: Region) -> bool { .. }
-///
-/// where `true` means that the region `min` meets that `G: min`.
-/// (False means nothing.)
-///
-/// So, for example, if we have the type `T` and we have in scope that
-/// `T: 'a` and `T: 'b`, then the verify bound might be:
-///
-///     fn(min: Region) -> bool {
-///        ('a: min) || ('b: min)
-///     }
-///
-/// This is described with a `AnyRegion('a, 'b)` node.
-#[derive(Debug, Clone)]
-pub enum VerifyBound<'tcx> {
-    /// Given a kind K and a bound B, expands to a function like the
-    /// following, where `G` is the generic for which this verify
-    /// bound was created:
-    ///
-    /// ```rust
-    /// fn(min) -> bool {
-    ///     if G == K {
-    ///         B(min)
-    ///     } else {
-    ///         false
-    ///     }
-    /// }
-    /// ```
-    ///
-    /// In other words, if the generic `G` that we are checking is
-    /// equal to `K`, then check the associated verify bound
-    /// (otherwise, false).
-    ///
-    /// This is used when we have something in the environment that
-    /// may or may not be relevant, depending on the region inference
-    /// results. For example, we may have `where <T as
-    /// Trait<'a>>::Item: 'b` in our where-clauses. If we are
-    /// generating the verify-bound for `<T as Trait<'0>>::Item`, then
-    /// this where-clause is only relevant if `'0` winds up inferred
-    /// to `'a`.
-    ///
-    /// So we would compile to a verify-bound like
-    ///
-    /// ```
-    /// IfEq(<T as Trait<'a>>::Item, AnyRegion('a))
-    /// ```
-    ///
-    /// meaning, if the subject G is equal to `<T as Trait<'a>>::Item`
-    /// (after inference), and `'a: min`, then `G: min`.
-    IfEq(Ty<'tcx>, Box<VerifyBound<'tcx>>),
-
-    /// Given a region `R`, expands to the function:
-    ///
-    /// ```
-    /// fn(min) -> bool {
-    ///     R: min
-    /// }
-    /// ```
-    ///
-    /// This is used when we can establish that `G: R` -- therefore,
-    /// if `R: min`, then by transitivity `G: min`.
-    OutlivedBy(Region<'tcx>),
-
-    /// Given a set of bounds `B`, expands to the function:
-    ///
-    /// ```rust
-    /// fn(min) -> bool {
-    ///     exists (b in B) { b(min) }
-    /// }
-    /// ```
-    ///
-    /// In other words, if we meet some bound in `B`, that suffices.
-    /// This is used when all the bounds in `B` are known to apply to `G`.
-    AnyBound(Vec<VerifyBound<'tcx>>),
-
-    /// Given a set of bounds `B`, expands to the function:
-    ///
-    /// ```rust
-    /// fn(min) -> bool {
-    ///     forall (b in B) { b(min) }
-    /// }
-    /// ```
-    ///
-    /// In other words, if we meet *all* bounds in `B`, that suffices.
-    /// This is used when *some* bound in `B` is known to suffice, but
-    /// we don't know which.
-    AllBounds(Vec<VerifyBound<'tcx>>),
-}
-
-#[derive(Copy, Clone, PartialEq, Eq, Hash)]
-struct TwoRegions<'tcx> {
-    a: Region<'tcx>,
-    b: Region<'tcx>,
-}
-
-#[derive(Copy, Clone, PartialEq)]
-enum UndoLog<'tcx> {
-    /// We added `RegionVid`.
-    AddVar(RegionVid),
-
-    /// We added the given `constraint`.
-    AddConstraint(Constraint<'tcx>),
-
-    /// We added the given `verify`.
-    AddVerify(usize),
-
-    /// We added the given `given`.
-    AddGiven(Region<'tcx>, ty::RegionVid),
-
-    /// We added a GLB/LUB "combination variable".
-    AddCombination(CombineMapType, TwoRegions<'tcx>),
-
-    /// During skolemization, we sometimes purge entries from the undo
-    /// log in a kind of minisnapshot (unlike other snapshots, this
-    /// purging actually takes place *on success*). In that case, we
-    /// replace the corresponding entry with `Noop` so as to avoid the
-    /// need to do a bunch of swapping. (We can't use `swap_remove` as
-    /// the order of the vector is important.)
-    Purged,
-}
-
-#[derive(Copy, Clone, PartialEq)]
-enum CombineMapType {
-    Lub,
-    Glb,
-}
-
-type CombineMap<'tcx> = FxHashMap<TwoRegions<'tcx>, RegionVid>;
-
-#[derive(Debug, Clone, Copy)]
-pub struct RegionVariableInfo {
-    pub origin: RegionVariableOrigin,
-    pub universe: ty::UniverseIndex,
-}
-
-pub struct RegionSnapshot {
-    length: usize,
-    region_snapshot: ut::Snapshot<ut::InPlace<ty::RegionVid>>,
-    any_unifications: bool,
-}
-
-/// When working with placeholder regions, we often wish to find all of
-/// the regions that are either reachable from a placeholder region, or
-/// which can reach a placeholder region, or both. We call such regions
-/// *tainted* regions. This struct allows you to decide what set of
-/// tainted regions you want.
-#[derive(Debug)]
-pub struct TaintDirections {
-    incoming: bool,
-    outgoing: bool,
-}
-
-impl TaintDirections {
-    pub fn incoming() -> Self {
-        TaintDirections { incoming: true, outgoing: false }
-    }
-
-    pub fn outgoing() -> Self {
-        TaintDirections { incoming: false, outgoing: true }
-    }
-
-    pub fn both() -> Self {
-        TaintDirections { incoming: true, outgoing: true }
-    }
-}
-
-pub struct ConstraintInfo {}
-
-impl<'tcx> RegionConstraintCollector<'tcx> {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn num_region_vars(&self) -> usize {
-        self.var_infos.len()
-    }
-
-    pub fn region_constraint_data(&self) -> &RegionConstraintData<'tcx> {
-        &self.data
-    }
-
-    /// Once all the constraints have been gathered, extract out the final data.
-    ///
-    /// Not legal during a snapshot.
-    pub fn into_infos_and_data(self) -> (VarInfos, RegionConstraintData<'tcx>) {
-        assert!(!self.in_snapshot());
-        (self.var_infos, self.data)
-    }
-
-    /// Takes (and clears) the current set of constraints. Note that
-    /// the set of variables remains intact, but all relationships
-    /// between them are reset. This is used during NLL checking to
-    /// grab the set of constraints that arose from a particular
-    /// operation.
-    ///
-    /// We don't want to leak relationships between variables between
-    /// points because just because (say) `r1 == r2` was true at some
-    /// point P in the graph doesn't imply that it will be true at
-    /// some other point Q, in NLL.
-    ///
-    /// Not legal during a snapshot.
-    pub fn take_and_reset_data(&mut self) -> RegionConstraintData<'tcx> {
-        assert!(!self.in_snapshot());
-
-        // If you add a new field to `RegionConstraintCollector`, you
-        // should think carefully about whether it needs to be cleared
-        // or updated in some way.
-        let RegionConstraintCollector {
-            var_infos: _,
-            data,
-            lubs,
-            glbs,
-            undo_log: _,
-            num_open_snapshots: _,
-            unification_table,
-            any_unifications,
-        } = self;
-
-        // Clear the tables of (lubs, glbs), so that we will create
-        // fresh regions if we do a LUB operation. As it happens,
-        // LUB/GLB are not performed by the MIR type-checker, which is
-        // the one that uses this method, but it's good to be correct.
-        lubs.clear();
-        glbs.clear();
-
-        // Clear all unifications and recreate the variables a "now
-        // un-unified" state. Note that when we unify `a` and `b`, we
-        // also insert `a <= b` and a `b <= a` edges, so the
-        // `RegionConstraintData` contains the relationship here.
-        if *any_unifications {
-            unification_table.reset_unifications(|vid| unify_key::RegionVidKey { min_vid: vid });
-            *any_unifications = false;
-        }
-
-        mem::take(data)
-    }
-
-    pub fn data(&self) -> &RegionConstraintData<'tcx> {
-        &self.data
-    }
-
-    fn in_snapshot(&self) -> bool {
-        self.num_open_snapshots > 0
-    }
-
-    pub fn start_snapshot(&mut self) -> RegionSnapshot {
-        let length = self.undo_log.len();
-        debug!("RegionConstraintCollector: start_snapshot({})", length);
-        self.num_open_snapshots += 1;
-        RegionSnapshot {
-            length,
-            region_snapshot: self.unification_table.snapshot(),
-            any_unifications: self.any_unifications,
-        }
-    }
-
-    fn assert_open_snapshot(&self, snapshot: &RegionSnapshot) {
-        assert!(self.undo_log.len() >= snapshot.length);
-        assert!(self.num_open_snapshots > 0);
-    }
-
-    pub fn commit(&mut self, snapshot: RegionSnapshot) {
-        debug!("RegionConstraintCollector: commit({})", snapshot.length);
-        self.assert_open_snapshot(&snapshot);
-
-        if self.num_open_snapshots == 1 {
-            // The root snapshot. It's safe to clear the undo log because
-            // there's no snapshot further out that we might need to roll back
-            // to.
-            assert!(snapshot.length == 0);
-            self.undo_log.clear();
-        }
-
-        self.num_open_snapshots -= 1;
-
-        self.unification_table.commit(snapshot.region_snapshot);
-    }
-
-    pub fn rollback_to(&mut self, snapshot: RegionSnapshot) {
-        debug!("RegionConstraintCollector: rollback_to({:?})", snapshot);
-        self.assert_open_snapshot(&snapshot);
-
-        while self.undo_log.len() > snapshot.length {
-            let undo_entry = self.undo_log.pop().unwrap();
-            self.rollback_undo_entry(undo_entry);
-        }
-
-        self.num_open_snapshots -= 1;
-
-        self.unification_table.rollback_to(snapshot.region_snapshot);
-        self.any_unifications = snapshot.any_unifications;
-    }
-
-    fn rollback_undo_entry(&mut self, undo_entry: UndoLog<'tcx>) {
-        match undo_entry {
-            Purged => {
-                // nothing to do here
-            }
-            AddVar(vid) => {
-                self.var_infos.pop().unwrap();
-                assert_eq!(self.var_infos.len(), vid.index() as usize);
-            }
-            AddConstraint(ref constraint) => {
-                self.data.constraints.remove(constraint);
-            }
-            AddVerify(index) => {
-                self.data.verifys.pop();
-                assert_eq!(self.data.verifys.len(), index);
-            }
-            AddGiven(sub, sup) => {
-                self.data.givens.remove(&(sub, sup));
-            }
-            AddCombination(Glb, ref regions) => {
-                self.glbs.remove(regions);
-            }
-            AddCombination(Lub, ref regions) => {
-                self.lubs.remove(regions);
-            }
-        }
-    }
-
-    pub fn new_region_var(
-        &mut self,
-        universe: ty::UniverseIndex,
-        origin: RegionVariableOrigin,
-    ) -> RegionVid {
-        let vid = self.var_infos.push(RegionVariableInfo { origin, universe });
-
-        let u_vid = self.unification_table.new_key(unify_key::RegionVidKey { min_vid: vid });
-        assert_eq!(vid, u_vid);
-        if self.in_snapshot() {
-            self.undo_log.push(AddVar(vid));
-        }
-        debug!("created new region variable {:?} in {:?} with origin {:?}", vid, universe, origin);
-        return vid;
-    }
-
-    /// Returns the universe for the given variable.
-    pub fn var_universe(&self, vid: RegionVid) -> ty::UniverseIndex {
-        self.var_infos[vid].universe
-    }
-
-    /// Returns the origin for the given variable.
-    pub fn var_origin(&self, vid: RegionVid) -> RegionVariableOrigin {
-        self.var_infos[vid].origin
-    }
-
-    /// Removes all the edges to/from the placeholder regions that are
-    /// in `skols`. This is used after a higher-ranked operation
-    /// completes to remove all trace of the placeholder regions
-    /// created in that time.
-    pub fn pop_placeholders(&mut self, placeholders: &FxHashSet<ty::Region<'tcx>>) {
-        debug!("pop_placeholders(placeholders={:?})", placeholders);
-
-        assert!(self.in_snapshot());
-
-        let constraints_to_kill: Vec<usize> = self
-            .undo_log
-            .iter()
-            .enumerate()
-            .rev()
-            .filter(|&(_, undo_entry)| kill_constraint(placeholders, undo_entry))
-            .map(|(index, _)| index)
-            .collect();
-
-        for index in constraints_to_kill {
-            let undo_entry = mem::replace(&mut self.undo_log[index], Purged);
-            self.rollback_undo_entry(undo_entry);
-        }
-
-        return;
-
-        fn kill_constraint<'tcx>(
-            placeholders: &FxHashSet<ty::Region<'tcx>>,
-            undo_entry: &UndoLog<'tcx>,
-        ) -> bool {
-            match undo_entry {
-                &AddConstraint(Constraint::VarSubVar(..)) => false,
-                &AddConstraint(Constraint::RegSubVar(a, _)) => placeholders.contains(&a),
-                &AddConstraint(Constraint::VarSubReg(_, b)) => placeholders.contains(&b),
-                &AddConstraint(Constraint::RegSubReg(a, b)) => {
-                    placeholders.contains(&a) || placeholders.contains(&b)
-                }
-                &AddGiven(..) => false,
-                &AddVerify(_) => false,
-                &AddCombination(_, ref two_regions) => {
-                    placeholders.contains(&two_regions.a) || placeholders.contains(&two_regions.b)
-                }
-                &AddVar(..) | &Purged => false,
-            }
-        }
-    }
-
-    fn add_constraint(&mut self, constraint: Constraint<'tcx>, origin: SubregionOrigin<'tcx>) {
-        // cannot add constraints once regions are resolved
-        debug!("RegionConstraintCollector: add_constraint({:?})", constraint);
-
-        // never overwrite an existing (constraint, origin) - only insert one if it isn't
-        // present in the map yet. This prevents origins from outside the snapshot being
-        // replaced with "less informative" origins e.g., during calls to `can_eq`
-        let in_snapshot = self.in_snapshot();
-        let undo_log = &mut self.undo_log;
-        self.data.constraints.entry(constraint).or_insert_with(|| {
-            if in_snapshot {
-                undo_log.push(AddConstraint(constraint));
-            }
-            origin
-        });
-    }
-
-    fn add_verify(&mut self, verify: Verify<'tcx>) {
-        // cannot add verifys once regions are resolved
-        debug!("RegionConstraintCollector: add_verify({:?})", verify);
-
-        // skip no-op cases known to be satisfied
-        if let VerifyBound::AllBounds(ref bs) = verify.bound {
-            if bs.len() == 0 {
-                return;
-            }
-        }
-
-        let index = self.data.verifys.len();
-        self.data.verifys.push(verify);
-        if self.in_snapshot() {
-            self.undo_log.push(AddVerify(index));
-        }
-    }
-
-    pub fn add_given(&mut self, sub: Region<'tcx>, sup: ty::RegionVid) {
-        // cannot add givens once regions are resolved
-        if self.data.givens.insert((sub, sup)) {
-            debug!("add_given({:?} <= {:?})", sub, sup);
-
-            if self.in_snapshot() {
-                self.undo_log.push(AddGiven(sub, sup));
-            }
-        }
-    }
-
-    pub fn make_eqregion(
-        &mut self,
-        origin: SubregionOrigin<'tcx>,
-        sub: Region<'tcx>,
-        sup: Region<'tcx>,
-    ) {
-        if sub != sup {
-            // Eventually, it would be nice to add direct support for
-            // equating regions.
-            self.make_subregion(origin.clone(), sub, sup);
-            self.make_subregion(origin, sup, sub);
-
-            if let (ty::ReVar(sub), ty::ReVar(sup)) = (*sub, *sup) {
-                debug!("make_eqregion: uniying {:?} with {:?}", sub, sup);
-                self.unification_table.union(sub, sup);
-                self.any_unifications = true;
-            }
-        }
-    }
-
-    pub fn member_constraint(
-        &mut self,
-        opaque_type_def_id: DefId,
-        definition_span: Span,
-        hidden_ty: Ty<'tcx>,
-        member_region: ty::Region<'tcx>,
-        choice_regions: &Lrc<Vec<ty::Region<'tcx>>>,
-    ) {
-        debug!("member_constraint({:?} in {:#?})", member_region, choice_regions);
-
-        if choice_regions.iter().any(|&r| r == member_region) {
-            return;
-        }
-
-        self.data.member_constraints.push(MemberConstraint {
-            opaque_type_def_id,
-            definition_span,
-            hidden_ty,
-            member_region,
-            choice_regions: choice_regions.clone(),
-        });
-    }
-
-    pub fn make_subregion(
-        &mut self,
-        origin: SubregionOrigin<'tcx>,
-        sub: Region<'tcx>,
-        sup: Region<'tcx>,
-    ) {
-        // cannot add constraints once regions are resolved
-        debug!(
-            "RegionConstraintCollector: make_subregion({:?}, {:?}) due to {:?}",
-            sub, sup, origin
-        );
-
-        match (sub, sup) {
-            (&ReLateBound(..), _) | (_, &ReLateBound(..)) => {
-                span_bug!(origin.span(), "cannot relate bound region: {:?} <= {:?}", sub, sup);
-            }
-            (_, &ReStatic) => {
-                // all regions are subregions of static, so we can ignore this
-            }
-            (&ReVar(sub_id), &ReVar(sup_id)) => {
-                self.add_constraint(Constraint::VarSubVar(sub_id, sup_id), origin);
-            }
-            (_, &ReVar(sup_id)) => {
-                self.add_constraint(Constraint::RegSubVar(sub, sup_id), origin);
-            }
-            (&ReVar(sub_id), _) => {
-                self.add_constraint(Constraint::VarSubReg(sub_id, sup), origin);
-            }
-            _ => {
-                self.add_constraint(Constraint::RegSubReg(sub, sup), origin);
-            }
-        }
-    }
-
-    /// See [`Verify::VerifyGenericBound`].
-    pub fn verify_generic_bound(
-        &mut self,
-        origin: SubregionOrigin<'tcx>,
-        kind: GenericKind<'tcx>,
-        sub: Region<'tcx>,
-        bound: VerifyBound<'tcx>,
-    ) {
-        self.add_verify(Verify { kind, origin, region: sub, bound });
-    }
-
-    pub fn lub_regions(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        origin: SubregionOrigin<'tcx>,
-        a: Region<'tcx>,
-        b: Region<'tcx>,
-    ) -> Region<'tcx> {
-        // cannot add constraints once regions are resolved
-        debug!("RegionConstraintCollector: lub_regions({:?}, {:?})", a, b);
-        match (a, b) {
-            (r @ &ReStatic, _) | (_, r @ &ReStatic) => {
-                r // nothing lives longer than static
-            }
-
-            _ if a == b => {
-                a // LUB(a,a) = a
-            }
-
-            _ => self.combine_vars(tcx, Lub, a, b, origin),
-        }
-    }
-
-    pub fn glb_regions(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        origin: SubregionOrigin<'tcx>,
-        a: Region<'tcx>,
-        b: Region<'tcx>,
-    ) -> Region<'tcx> {
-        // cannot add constraints once regions are resolved
-        debug!("RegionConstraintCollector: glb_regions({:?}, {:?})", a, b);
-        match (a, b) {
-            (&ReStatic, r) | (r, &ReStatic) => {
-                r // static lives longer than everything else
-            }
-
-            _ if a == b => {
-                a // GLB(a,a) = a
-            }
-
-            _ => self.combine_vars(tcx, Glb, a, b, origin),
-        }
-    }
-
-    pub fn opportunistic_resolve_var(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        rid: RegionVid,
-    ) -> ty::Region<'tcx> {
-        let vid = self.unification_table.probe_value(rid).min_vid;
-        tcx.mk_region(ty::ReVar(vid))
-    }
-
-    fn combine_map(&mut self, t: CombineMapType) -> &mut CombineMap<'tcx> {
-        match t {
-            Glb => &mut self.glbs,
-            Lub => &mut self.lubs,
-        }
-    }
-
-    fn combine_vars(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        t: CombineMapType,
-        a: Region<'tcx>,
-        b: Region<'tcx>,
-        origin: SubregionOrigin<'tcx>,
-    ) -> Region<'tcx> {
-        let vars = TwoRegions { a: a, b: b };
-        if let Some(&c) = self.combine_map(t).get(&vars) {
-            return tcx.mk_region(ReVar(c));
-        }
-        let a_universe = self.universe(a);
-        let b_universe = self.universe(b);
-        let c_universe = cmp::max(a_universe, b_universe);
-        let c = self.new_region_var(c_universe, MiscVariable(origin.span()));
-        self.combine_map(t).insert(vars, c);
-        if self.in_snapshot() {
-            self.undo_log.push(AddCombination(t, vars));
-        }
-        let new_r = tcx.mk_region(ReVar(c));
-        for &old_r in &[a, b] {
-            match t {
-                Glb => self.make_subregion(origin.clone(), new_r, old_r),
-                Lub => self.make_subregion(origin.clone(), old_r, new_r),
-            }
-        }
-        debug!("combine_vars() c={:?}", c);
-        new_r
-    }
-
-    pub fn universe(&self, region: Region<'tcx>) -> ty::UniverseIndex {
-        match *region {
-            ty::ReScope(..)
-            | ty::ReStatic
-            | ty::ReEmpty
-            | ty::ReErased
-            | ty::ReFree(..)
-            | ty::ReEarlyBound(..) => ty::UniverseIndex::ROOT,
-            ty::RePlaceholder(placeholder) => placeholder.universe,
-            ty::ReClosureBound(vid) | ty::ReVar(vid) => self.var_universe(vid),
-            ty::ReLateBound(..) => bug!("universe(): encountered bound region {:?}", region),
-        }
-    }
-
-    pub fn vars_since_snapshot(
-        &self,
-        mark: &RegionSnapshot,
-    ) -> (Range<RegionVid>, Vec<RegionVariableOrigin>) {
-        let range = self.unification_table.vars_since_snapshot(&mark.region_snapshot);
-        (
-            range.clone(),
-            (range.start.index()..range.end.index())
-                .map(|index| self.var_infos[ty::RegionVid::from(index)].origin)
-                .collect(),
-        )
-    }
-
-    /// See [`RegionInference::region_constraints_added_in_snapshot`].
-    pub fn region_constraints_added_in_snapshot(&self, mark: &RegionSnapshot) -> Option<bool> {
-        self.undo_log[mark.length..]
-            .iter()
-            .map(|&elt| match elt {
-                AddConstraint(constraint) => Some(constraint.involves_placeholders()),
-                _ => None,
-            })
-            .max()
-            .unwrap_or(None)
-    }
-}
-
-impl fmt::Debug for RegionSnapshot {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "RegionSnapshot(length={})", self.length)
-    }
-}
-
-impl<'tcx> fmt::Debug for GenericKind<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match *self {
-            GenericKind::Param(ref p) => write!(f, "{:?}", p),
-            GenericKind::Projection(ref p) => write!(f, "{:?}", p),
-        }
-    }
-}
-
-impl<'tcx> fmt::Display for GenericKind<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match *self {
-            GenericKind::Param(ref p) => write!(f, "{}", p),
-            GenericKind::Projection(ref p) => write!(f, "{}", p),
-        }
-    }
-}
-
-impl<'tcx> GenericKind<'tcx> {
-    pub fn to_ty(&self, tcx: TyCtxt<'tcx>) -> Ty<'tcx> {
-        match *self {
-            GenericKind::Param(ref p) => p.to_ty(tcx),
-            GenericKind::Projection(ref p) => tcx.mk_projection(p.item_def_id, p.substs),
-        }
-    }
-}
-
-impl<'tcx> VerifyBound<'tcx> {
-    pub fn must_hold(&self) -> bool {
-        match self {
-            VerifyBound::IfEq(..) => false,
-            VerifyBound::OutlivedBy(ty::ReStatic) => true,
-            VerifyBound::OutlivedBy(_) => false,
-            VerifyBound::AnyBound(bs) => bs.iter().any(|b| b.must_hold()),
-            VerifyBound::AllBounds(bs) => bs.iter().all(|b| b.must_hold()),
-        }
-    }
-
-    pub fn cannot_hold(&self) -> bool {
-        match self {
-            VerifyBound::IfEq(_, b) => b.cannot_hold(),
-            VerifyBound::OutlivedBy(ty::ReEmpty) => true,
-            VerifyBound::OutlivedBy(_) => false,
-            VerifyBound::AnyBound(bs) => bs.iter().all(|b| b.cannot_hold()),
-            VerifyBound::AllBounds(bs) => bs.iter().any(|b| b.cannot_hold()),
-        }
-    }
-
-    pub fn or(self, vb: VerifyBound<'tcx>) -> VerifyBound<'tcx> {
-        if self.must_hold() || vb.cannot_hold() {
-            self
-        } else if self.cannot_hold() || vb.must_hold() {
-            vb
-        } else {
-            VerifyBound::AnyBound(vec![self, vb])
-        }
-    }
-
-    pub fn and(self, vb: VerifyBound<'tcx>) -> VerifyBound<'tcx> {
-        if self.must_hold() && vb.must_hold() {
-            self
-        } else if self.cannot_hold() && vb.cannot_hold() {
-            self
-        } else {
-            VerifyBound::AllBounds(vec![self, vb])
-        }
-    }
-}
-
-impl<'tcx> RegionConstraintData<'tcx> {
-    /// Returns `true` if this region constraint data contains no constraints, and `false`
-    /// otherwise.
-    pub fn is_empty(&self) -> bool {
-        let RegionConstraintData { constraints, member_constraints, verifys, givens } = self;
-        constraints.is_empty()
-            && member_constraints.is_empty()
-            && verifys.is_empty()
-            && givens.is_empty()
-    }
-}
diff --git a/src/librustc/infer/unify_key.rs b/src/librustc/infer/unify_key.rs
index c5ec0ba73e..e205453a48 100644
--- a/src/librustc/infer/unify_key.rs
+++ b/src/librustc/infer/unify_key.rs
@@ -4,7 +4,6 @@ use rustc_data_structures::unify::{EqUnifyValue, NoError, UnificationTable, Unif
 use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
 
-use std::cell::RefMut;
 use std::cmp;
 use std::marker::PhantomData;
 
@@ -12,6 +11,21 @@ pub trait ToType {
     fn to_type<'tcx>(&self, tcx: TyCtxt<'tcx>) -> Ty<'tcx>;
 }
 
+/// Raw `TyVid` are used as the unification key for `sub_relations`;
+/// they carry no values.
+impl UnifyKey for ty::TyVid {
+    type Value = ();
+    fn index(&self) -> u32 {
+        self.index
+    }
+    fn from_index(i: u32) -> ty::TyVid {
+        ty::TyVid { index: i }
+    }
+    fn tag() -> &'static str {
+        "TyVid"
+    }
+}
+
 impl UnifyKey for ty::IntVid {
     type Value = Option<IntVarValue>;
     fn index(&self) -> u32 {
@@ -199,7 +213,7 @@ impl<'tcx> UnifyValue for ConstVarValue<'tcx> {
 impl<'tcx> EqUnifyValue for &'tcx ty::Const<'tcx> {}
 
 pub fn replace_if_possible(
-    mut table: RefMut<'_, UnificationTable<InPlace<ty::ConstVid<'tcx>>>>,
+    table: &mut UnificationTable<InPlace<ty::ConstVid<'tcx>>>,
     c: &'tcx ty::Const<'tcx>,
 ) -> &'tcx ty::Const<'tcx> {
     if let ty::Const { val: ty::ConstKind::Infer(InferConst::Var(vid)), .. } = c {
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 69ca406369..055d70effc 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -13,10 +13,6 @@
 //!   defined in the `ty` module. This includes the **type context**
 //!   (or `tcx`), which is the central context during most of
 //!   compilation, containing the interners and other things.
-//! - **Traits.** Trait resolution is implemented in the `traits` module.
-//! - **Type inference.** The type inference code can be found in the `infer` module;
-//!   this code handles low-level equality and subtyping operations. The
-//!   type check pass in the compiler is found in the `librustc_typeck` crate.
 //!
 //! For more information about how rustc works, see the [rustc guide].
 //!
@@ -27,7 +23,6 @@
 //! This API is completely unstable and subject to change.
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-#![feature(arbitrary_self_types)]
 #![feature(bool_to_option)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
@@ -36,28 +31,22 @@
 #![feature(drain_filter)]
 #![feature(never_type)]
 #![feature(exhaustive_patterns)]
-#![feature(overlapping_marker_traits)]
+#![feature(marker_trait_attr)]
 #![feature(extern_types)]
 #![feature(nll)]
-#![feature(optin_builtin_traits)]
 #![feature(option_expect_none)]
 #![feature(range_is_empty)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(specialization)]
-#![feature(unboxed_closures)]
-#![feature(thread_local)]
-#![feature(trace_macros)]
 #![feature(trusted_len)]
 #![feature(vec_remove_item)]
 #![feature(stmt_expr_attributes)]
-#![feature(integer_atomics)]
 #![feature(test)]
 #![feature(in_band_lifetimes)]
 #![feature(crate_visibility_modifier)]
-#![feature(log_syntax)]
 #![feature(associated_type_bounds)]
 #![feature(rustc_attrs)]
 #![feature(hash_raw_entry)]
+#![feature(int_error_matching)]
 #![recursion_limit = "512"]
 
 #[macro_use]
diff --git a/src/librustc/lint.rs b/src/librustc/lint.rs
index 2ed6cd5283..004835b230 100644
--- a/src/librustc/lint.rs
+++ b/src/librustc/lint.rs
@@ -174,132 +174,164 @@ impl<'a> HashStable<StableHashingContext<'a>> for LintLevelMap {
     }
 }
 
-pub fn struct_lint_level<'a>(
-    sess: &'a Session,
+pub struct LintDiagnosticBuilder<'a>(DiagnosticBuilder<'a>);
+
+impl<'a> LintDiagnosticBuilder<'a> {
+    /// Return the inner DiagnosticBuilder, first setting the primary message to `msg`.
+    pub fn build(mut self, msg: &str) -> DiagnosticBuilder<'a> {
+        self.0.set_primary_message(msg);
+        self.0
+    }
+
+    /// Create a LintDiagnosticBuilder from some existing DiagnosticBuilder.
+    pub fn new(err: DiagnosticBuilder<'a>) -> LintDiagnosticBuilder<'a> {
+        LintDiagnosticBuilder(err)
+    }
+}
+
+pub fn struct_lint_level<'s, 'd>(
+    sess: &'s Session,
     lint: &'static Lint,
     level: Level,
     src: LintSource,
     span: Option<MultiSpan>,
-    msg: &str,
-) -> DiagnosticBuilder<'a> {
-    let mut err = match (level, span) {
-        (Level::Allow, _) => return sess.diagnostic().struct_dummy(),
-        (Level::Warn, Some(span)) => sess.struct_span_warn(span, msg),
-        (Level::Warn, None) => sess.struct_warn(msg),
-        (Level::Deny, Some(span)) | (Level::Forbid, Some(span)) => sess.struct_span_err(span, msg),
-        (Level::Deny, None) | (Level::Forbid, None) => sess.struct_err(msg),
-    };
+    decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>) + 'd,
+) {
+    // Avoid codegen bloat from monomorphization by immediately doing dyn dispatch of `decorate` to
+    // the "real" work.
+    fn struct_lint_level_impl(
+        sess: &'s Session,
+        lint: &'static Lint,
+        level: Level,
+        src: LintSource,
+        span: Option<MultiSpan>,
+        decorate: Box<dyn for<'b> FnOnce(LintDiagnosticBuilder<'b>) + 'd>,
+    ) {
+        let mut err = match (level, span) {
+            (Level::Allow, _) => {
+                return;
+            }
+            (Level::Warn, Some(span)) => sess.struct_span_warn(span, ""),
+            (Level::Warn, None) => sess.struct_warn(""),
+            (Level::Deny, Some(span)) | (Level::Forbid, Some(span)) => {
+                sess.struct_span_err(span, "")
+            }
+            (Level::Deny, None) | (Level::Forbid, None) => sess.struct_err(""),
+        };
 
-    // Check for future incompatibility lints and issue a stronger warning.
-    let lint_id = LintId::of(lint);
-    let future_incompatible = lint.future_incompatible;
-
-    // If this code originates in a foreign macro, aka something that this crate
-    // did not itself author, then it's likely that there's nothing this crate
-    // can do about it. We probably want to skip the lint entirely.
-    if err.span.primary_spans().iter().any(|s| in_external_macro(sess, *s)) {
-        // Any suggestions made here are likely to be incorrect, so anything we
-        // emit shouldn't be automatically fixed by rustfix.
-        err.allow_suggestions(false);
-
-        // If this is a future incompatible lint it'll become a hard error, so
-        // we have to emit *something*. Also allow lints to whitelist themselves
-        // on a case-by-case basis for emission in a foreign macro.
-        if future_incompatible.is_none() && !lint.report_in_external_macro {
-            err.cancel();
-            // Don't continue further, since we don't want to have
-            // `diag_span_note_once` called for a diagnostic that isn't emitted.
-            return err;
+        // Check for future incompatibility lints and issue a stronger warning.
+        let lint_id = LintId::of(lint);
+        let future_incompatible = lint.future_incompatible;
+
+        // If this code originates in a foreign macro, aka something that this crate
+        // did not itself author, then it's likely that there's nothing this crate
+        // can do about it. We probably want to skip the lint entirely.
+        if err.span.primary_spans().iter().any(|s| in_external_macro(sess, *s)) {
+            // Any suggestions made here are likely to be incorrect, so anything we
+            // emit shouldn't be automatically fixed by rustfix.
+            err.allow_suggestions(false);
+
+            // If this is a future incompatible lint it'll become a hard error, so
+            // we have to emit *something*. Also allow lints to whitelist themselves
+            // on a case-by-case basis for emission in a foreign macro.
+            if future_incompatible.is_none() && !lint.report_in_external_macro {
+                err.cancel();
+                // Don't continue further, since we don't want to have
+                // `diag_span_note_once` called for a diagnostic that isn't emitted.
+                return;
+            }
         }
-    }
 
-    let name = lint.name_lower();
-    match src {
-        LintSource::Default => {
-            sess.diag_note_once(
-                &mut err,
-                DiagnosticMessageId::from(lint),
-                &format!("`#[{}({})]` on by default", level.as_str(), name),
-            );
-        }
-        LintSource::CommandLine(lint_flag_val) => {
-            let flag = match level {
-                Level::Warn => "-W",
-                Level::Deny => "-D",
-                Level::Forbid => "-F",
-                Level::Allow => panic!(),
-            };
-            let hyphen_case_lint_name = name.replace("_", "-");
-            if lint_flag_val.as_str() == name {
+        let name = lint.name_lower();
+        match src {
+            LintSource::Default => {
                 sess.diag_note_once(
                     &mut err,
                     DiagnosticMessageId::from(lint),
-                    &format!(
-                        "requested on the command line with `{} {}`",
-                        flag, hyphen_case_lint_name
-                    ),
-                );
-            } else {
-                let hyphen_case_flag_val = lint_flag_val.as_str().replace("_", "-");
-                sess.diag_note_once(
-                    &mut err,
-                    DiagnosticMessageId::from(lint),
-                    &format!(
-                        "`{} {}` implied by `{} {}`",
-                        flag, hyphen_case_lint_name, flag, hyphen_case_flag_val
-                    ),
+                    &format!("`#[{}({})]` on by default", level.as_str(), name),
                 );
             }
-        }
-        LintSource::Node(lint_attr_name, src, reason) => {
-            if let Some(rationale) = reason {
-                err.note(&rationale.as_str());
+            LintSource::CommandLine(lint_flag_val) => {
+                let flag = match level {
+                    Level::Warn => "-W",
+                    Level::Deny => "-D",
+                    Level::Forbid => "-F",
+                    Level::Allow => panic!(),
+                };
+                let hyphen_case_lint_name = name.replace("_", "-");
+                if lint_flag_val.as_str() == name {
+                    sess.diag_note_once(
+                        &mut err,
+                        DiagnosticMessageId::from(lint),
+                        &format!(
+                            "requested on the command line with `{} {}`",
+                            flag, hyphen_case_lint_name
+                        ),
+                    );
+                } else {
+                    let hyphen_case_flag_val = lint_flag_val.as_str().replace("_", "-");
+                    sess.diag_note_once(
+                        &mut err,
+                        DiagnosticMessageId::from(lint),
+                        &format!(
+                            "`{} {}` implied by `{} {}`",
+                            flag, hyphen_case_lint_name, flag, hyphen_case_flag_val
+                        ),
+                    );
+                }
             }
-            sess.diag_span_note_once(
-                &mut err,
-                DiagnosticMessageId::from(lint),
-                src,
-                "lint level defined here",
-            );
-            if lint_attr_name.as_str() != name {
-                let level_str = level.as_str();
-                sess.diag_note_once(
+            LintSource::Node(lint_attr_name, src, reason) => {
+                if let Some(rationale) = reason {
+                    err.note(&rationale.as_str());
+                }
+                sess.diag_span_note_once(
                     &mut err,
                     DiagnosticMessageId::from(lint),
-                    &format!(
-                        "`#[{}({})]` implied by `#[{}({})]`",
-                        level_str, name, level_str, lint_attr_name
-                    ),
+                    src,
+                    "the lint level is defined here",
                 );
+                if lint_attr_name.as_str() != name {
+                    let level_str = level.as_str();
+                    sess.diag_note_once(
+                        &mut err,
+                        DiagnosticMessageId::from(lint),
+                        &format!(
+                            "`#[{}({})]` implied by `#[{}({})]`",
+                            level_str, name, level_str, lint_attr_name
+                        ),
+                    );
+                }
             }
         }
-    }
 
-    err.code(DiagnosticId::Lint(name));
-
-    if let Some(future_incompatible) = future_incompatible {
-        const STANDARD_MESSAGE: &str = "this was previously accepted by the compiler but is being phased out; \
-             it will become a hard error";
-
-        let explanation = if lint_id == LintId::of(builtin::UNSTABLE_NAME_COLLISIONS) {
-            "once this method is added to the standard library, \
-             the ambiguity may cause an error or change in behavior!"
-                .to_owned()
-        } else if lint_id == LintId::of(builtin::MUTABLE_BORROW_RESERVATION_CONFLICT) {
-            "this borrowing pattern was not meant to be accepted, \
-             and may become a hard error in the future"
-                .to_owned()
-        } else if let Some(edition) = future_incompatible.edition {
-            format!("{} in the {} edition!", STANDARD_MESSAGE, edition)
-        } else {
-            format!("{} in a future release!", STANDARD_MESSAGE)
-        };
-        let citation = format!("for more information, see {}", future_incompatible.reference);
-        err.warn(&explanation);
-        err.note(&citation);
-    }
+        err.code(DiagnosticId::Lint(name));
+
+        if let Some(future_incompatible) = future_incompatible {
+            const STANDARD_MESSAGE: &str = "this was previously accepted by the compiler but is being phased out; \
+                 it will become a hard error";
+
+            let explanation = if lint_id == LintId::of(builtin::UNSTABLE_NAME_COLLISIONS) {
+                "once this method is added to the standard library, \
+                 the ambiguity may cause an error or change in behavior!"
+                    .to_owned()
+            } else if lint_id == LintId::of(builtin::MUTABLE_BORROW_RESERVATION_CONFLICT) {
+                "this borrowing pattern was not meant to be accepted, \
+                 and may become a hard error in the future"
+                    .to_owned()
+            } else if let Some(edition) = future_incompatible.edition {
+                format!("{} in the {} edition!", STANDARD_MESSAGE, edition)
+            } else {
+                format!("{} in a future release!", STANDARD_MESSAGE)
+            };
+            let citation = format!("for more information, see {}", future_incompatible.reference);
+            err.warn(&explanation);
+            err.note(&citation);
+        }
 
-    return err;
+        // Finally, run `decorate`. This function is also responsible for emitting the diagnostic.
+        decorate(LintDiagnosticBuilder::new(err));
+    }
+    struct_lint_level_impl(sess, lint, level, src, span, Box::new(decorate))
 }
 
 /// Returns whether `span` originates in a foreign crate's external macro.
diff --git a/src/librustc/macros.rs b/src/librustc/macros.rs
index 2bda0c0bef..88ddd96eec 100644
--- a/src/librustc/macros.rs
+++ b/src/librustc/macros.rs
@@ -1,40 +1,3 @@
-macro_rules! enum_from_u32 {
-    ($(#[$attr:meta])* pub enum $name:ident {
-        $($variant:ident = $e:expr,)*
-    }) => {
-        $(#[$attr])*
-        pub enum $name {
-            $($variant = $e),*
-        }
-
-        impl $name {
-            pub fn from_u32(u: u32) -> Option<$name> {
-                $(if u == $name::$variant as u32 {
-                    return Some($name::$variant)
-                })*
-                None
-            }
-        }
-    };
-    ($(#[$attr:meta])* pub enum $name:ident {
-        $($variant:ident,)*
-    }) => {
-        $(#[$attr])*
-        pub enum $name {
-            $($variant,)*
-        }
-
-        impl $name {
-            pub fn from_u32(u: u32) -> Option<$name> {
-                $(if u == $name::$variant as u32 {
-                    return Some($name::$variant)
-                })*
-                None
-            }
-        }
-    }
-}
-
 #[macro_export]
 macro_rules! bug {
     () => ( bug!("impossible case reached") );
diff --git a/src/librustc/middle/codegen_fn_attrs.rs b/src/librustc/middle/codegen_fn_attrs.rs
index 3b109f2fea..61b25cc486 100644
--- a/src/librustc/middle/codegen_fn_attrs.rs
+++ b/src/librustc/middle/codegen_fn_attrs.rs
@@ -1,6 +1,6 @@
 use crate::mir::mono::Linkage;
+use rustc_attr::{InlineAttr, OptimizeAttr};
 use rustc_span::symbol::Symbol;
-use syntax::attr::{InlineAttr, OptimizeAttr};
 
 #[derive(Clone, RustcEncodable, RustcDecodable, HashStable)]
 pub struct CodegenFnAttrs {
@@ -58,9 +58,6 @@ bitflags! {
         /// "weird symbol" for the standard library in that it has slightly
         /// different linkage, visibility, and reachability rules.
         const RUSTC_STD_INTERNAL_SYMBOL = 1 << 6;
-        /// `#[no_debug]`: an indicator that no debugging information should be
-        /// generated for this function by LLVM.
-        const NO_DEBUG                  = 1 << 7;
         /// `#[thread_local]`: indicates a static is actually a thread local
         /// piece of memory
         const THREAD_LOCAL              = 1 << 8;
@@ -72,6 +69,14 @@ bitflags! {
         const FFI_RETURNS_TWICE         = 1 << 10;
         /// `#[track_caller]`: allow access to the caller location
         const TRACK_CALLER              = 1 << 11;
+        /// `#[no_sanitize(address)]`: disables address sanitizer instrumentation
+        const NO_SANITIZE_ADDRESS = 1 << 12;
+        /// `#[no_sanitize(memory)]`: disables memory sanitizer instrumentation
+        const NO_SANITIZE_MEMORY  = 1 << 13;
+        /// `#[no_sanitize(thread)]`: disables thread sanitizer instrumentation
+        const NO_SANITIZE_THREAD  = 1 << 14;
+        /// All `#[no_sanitize(...)]` attributes.
+        const NO_SANITIZE_ANY = Self::NO_SANITIZE_ADDRESS.bits | Self::NO_SANITIZE_MEMORY.bits | Self::NO_SANITIZE_THREAD.bits;
     }
 }
 
diff --git a/src/librustc/middle/cstore.rs b/src/librustc/middle/cstore.rs
index 0e7ff3a339..42d56c6546 100644
--- a/src/librustc/middle/cstore.rs
+++ b/src/librustc/middle/cstore.rs
@@ -8,6 +8,8 @@ use crate::session::search_paths::PathKind;
 use crate::session::CrateDisambiguator;
 use crate::ty::TyCtxt;
 
+use rustc_ast::ast;
+use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::{self, MetadataRef};
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
@@ -17,8 +19,6 @@ use rustc_span::Span;
 use rustc_target::spec::Target;
 use std::any::Any;
 use std::path::{Path, PathBuf};
-use syntax::ast;
-use syntax::expand::allocator::AllocatorKind;
 
 pub use self::NativeLibraryKind::*;
 pub use rustc_session::utils::NativeLibraryKind;
@@ -53,9 +53,6 @@ impl CrateSource {
     HashStable
 )]
 pub enum DepKind {
-    /// A dependency that is only used for its macros, none of which are visible from other crates.
-    /// These are included in the metadata only as placeholders and are ignored when decoding.
-    UnexportedMacrosOnly,
     /// A dependency that is only used for its macros.
     MacrosOnly,
     /// A dependency that is always injected into the dependency list and so
@@ -69,7 +66,7 @@ pub enum DepKind {
 impl DepKind {
     pub fn macros_only(self) -> bool {
         match self {
-            DepKind::UnexportedMacrosOnly | DepKind::MacrosOnly => true,
+            DepKind::MacrosOnly => true,
             DepKind::Implicit | DepKind::Explicit => false,
         }
     }
diff --git a/src/librustc/middle/free_region.rs b/src/librustc/middle/free_region.rs
index 355f949b87..62ccd94674 100644
--- a/src/librustc/middle/free_region.rs
+++ b/src/librustc/middle/free_region.rs
@@ -4,8 +4,8 @@
 //! and use that to decide when one free region outlives another, and so forth.
 
 use crate::middle::region;
-use crate::ty::free_region_map::{FreeRegionMap, FreeRegionRelations};
-use crate::ty::{self, Region, TyCtxt};
+use crate::ty::free_region_map::FreeRegionMap;
+use crate::ty::{Region, TyCtxt};
 use rustc_hir::def_id::DefId;
 
 /// Combines a `region::ScopeTree` (which governs relationships between
@@ -38,62 +38,6 @@ impl<'a, 'tcx> RegionRelations<'a, 'tcx> {
         Self { tcx, context, region_scope_tree, free_regions }
     }
 
-    /// Determines whether one region is a subregion of another. This is intended to run *after
-    /// inference* and sadly the logic is somewhat duplicated with the code in infer.rs.
-    pub fn is_subregion_of(
-        &self,
-        sub_region: ty::Region<'tcx>,
-        super_region: ty::Region<'tcx>,
-    ) -> bool {
-        let result = sub_region == super_region || {
-            match (sub_region, super_region) {
-                (ty::ReEmpty, _) | (_, ty::ReStatic) => true,
-
-                (ty::ReScope(sub_scope), ty::ReScope(super_scope)) => {
-                    self.region_scope_tree.is_subscope_of(*sub_scope, *super_scope)
-                }
-
-                (ty::ReScope(sub_scope), ty::ReEarlyBound(ref br)) => {
-                    let fr_scope = self.region_scope_tree.early_free_scope(self.tcx, br);
-                    self.region_scope_tree.is_subscope_of(*sub_scope, fr_scope)
-                }
-
-                (ty::ReScope(sub_scope), ty::ReFree(fr)) => {
-                    let fr_scope = self.region_scope_tree.free_scope(self.tcx, fr);
-                    self.region_scope_tree.is_subscope_of(*sub_scope, fr_scope)
-                }
-
-                (ty::ReEarlyBound(_), ty::ReEarlyBound(_))
-                | (ty::ReFree(_), ty::ReEarlyBound(_))
-                | (ty::ReEarlyBound(_), ty::ReFree(_))
-                | (ty::ReFree(_), ty::ReFree(_)) => {
-                    self.free_regions.sub_free_regions(sub_region, super_region)
-                }
-
-                _ => false,
-            }
-        };
-        let result = result || self.is_static(super_region);
-        debug!(
-            "is_subregion_of(sub_region={:?}, super_region={:?}) = {:?}",
-            sub_region, super_region, result
-        );
-        result
-    }
-
-    /// Determines whether this free region is required to be `'static`.
-    fn is_static(&self, super_region: ty::Region<'tcx>) -> bool {
-        debug!("is_static(super_region={:?})", super_region);
-        match *super_region {
-            ty::ReStatic => true,
-            ty::ReEarlyBound(_) | ty::ReFree(_) => {
-                let re_static = self.tcx.mk_region(ty::ReStatic);
-                self.free_regions.sub_free_regions(&re_static, &super_region)
-            }
-            _ => false,
-        }
-    }
-
     pub fn lub_free_regions(&self, r_a: Region<'tcx>, r_b: Region<'tcx>) -> Region<'tcx> {
         self.free_regions.lub_free_regions(self.tcx, r_a, r_b)
     }
diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs
index 27b769742a..c8e284be6f 100644
--- a/src/librustc/middle/lang_items.rs
+++ b/src/librustc/middle/lang_items.rs
@@ -9,401 +9,14 @@
 
 pub use self::LangItem::*;
 
-use crate::hir::check_attr::Target;
-use crate::middle::cstore::ExternCrate;
-use crate::middle::weak_lang_items;
 use crate::ty::{self, TyCtxt};
 
-use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::struct_span_err;
-use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
-use rustc_hir::itemlikevisit::ItemLikeVisitor;
-use rustc_macros::HashStable;
-use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast;
+use rustc_target::spec::PanicStrategy;
 
-// The actual lang items defined come at the end of this file in one handy table.
-// So you probably just want to nip down to the end.
-macro_rules! language_item_table {
-    (
-        $( $variant:ident, $name:expr, $method:ident, $target:path; )*
-    ) => {
-
-enum_from_u32! {
-    /// A representation of all the valid language items in Rust.
-    #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable)]
-    pub enum LangItem {
-        $($variant,)*
-    }
-}
-
-impl LangItem {
-    /// Returns the `name` in `#[lang = "$name"]`.
-    /// For example, `LangItem::EqTraitLangItem`,
-    /// that is `#[lang = "eq"]` would result in `"eq"`.
-    fn name(self) -> &'static str {
-        match self {
-            $( $variant => $name, )*
-        }
-    }
-}
-
-#[derive(HashStable)]
-pub struct LanguageItems {
-    /// Mappings from lang items to their possibly found `DefId`s.
-    /// The index corresponds to the order in `LangItem`.
-    pub items: Vec<Option<DefId>>,
-    /// Lang items that were not found during collection.
-    pub missing: Vec<LangItem>,
-}
-
-impl LanguageItems {
-    /// Construct an empty collection of lang items and no missing ones.
-    pub fn new() -> Self {
-        fn init_none(_: LangItem) -> Option<DefId> { None }
-
-        Self {
-            items: vec![$(init_none($variant)),*],
-            missing: Vec::new(),
-        }
-    }
-
-    /// Returns the mappings to the possibly found `DefId`s for each lang item.
-    pub fn items(&self) -> &[Option<DefId>] {
-        &*self.items
-    }
-
-    /// Requires that a given `LangItem` was bound and returns the corresponding `DefId`.
-    /// If it wasn't bound, e.g. due to a missing `#[lang = "<it.name()>"]`,
-    /// returns an error message as a string.
-    pub fn require(&self, it: LangItem) -> Result<DefId, String> {
-        self.items[it as usize].ok_or_else(|| format!("requires `{}` lang_item", it.name()))
-    }
-
-    /// Returns the kind of closure that `id`, which is one of the `Fn*` traits, corresponds to.
-    /// If `id` is not one of the `Fn*` traits, `None` is returned.
-    pub fn fn_trait_kind(&self, id: DefId) -> Option<ty::ClosureKind> {
-        match Some(id) {
-            x if x == self.fn_trait() => Some(ty::ClosureKind::Fn),
-            x if x == self.fn_mut_trait() => Some(ty::ClosureKind::FnMut),
-            x if x == self.fn_once_trait() => Some(ty::ClosureKind::FnOnce),
-            _ => None
-        }
-    }
-
-    $(
-        /// Returns the corresponding `DefId` for the lang item
-        #[doc = $name]
-        /// if it exists.
-        #[allow(dead_code)]
-        pub fn $method(&self) -> Option<DefId> {
-            self.items[$variant as usize]
-        }
-    )*
-}
-
-struct LanguageItemCollector<'tcx> {
-    items: LanguageItems,
-    tcx: TyCtxt<'tcx>,
-    /// A mapping from the name of the lang item to its order and the form it must be of.
-    item_refs: FxHashMap<&'static str, (usize, Target)>,
-}
-
-impl ItemLikeVisitor<'v> for LanguageItemCollector<'tcx> {
-    fn visit_item(&mut self, item: &hir::Item<'_>) {
-        if let Some((value, span)) = extract(&item.attrs) {
-            let actual_target = Target::from_item(item);
-            match self.item_refs.get(&*value.as_str()).cloned() {
-                // Known lang item with attribute on correct target.
-                Some((item_index, expected_target)) if actual_target == expected_target => {
-                    let def_id = self.tcx.hir().local_def_id(item.hir_id);
-                    self.collect_item(item_index, def_id);
-                },
-                // Known lang item with attribute on incorrect target.
-                Some((_, expected_target)) => {
-                    struct_span_err!(
-                        self.tcx.sess, span, E0718,
-                        "`{}` language item must be applied to a {}",
-                        value, expected_target,
-                    ).span_label(
-                        span,
-                        format!(
-                            "attribute should be applied to a {}, not a {}",
-                            expected_target, actual_target,
-                        ),
-                    ).emit();
-                },
-                // Unknown lang item.
-                _ => {
-                    struct_span_err!(
-                        self.tcx.sess, span, E0522,
-                        "definition of an unknown language item: `{}`",
-                        value
-                    ).span_label(
-                        span,
-                        format!("definition of unknown language item `{}`", value)
-                    ).emit();
-                },
-            }
-        }
-    }
-
-    fn visit_trait_item(&mut self, _trait_item: &hir::TraitItem<'_>) {
-        // At present, lang items are always items, not trait items.
-    }
-
-    fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {
-        // At present, lang items are always items, not impl items.
-    }
-}
-
-impl LanguageItemCollector<'tcx> {
-    fn new(tcx: TyCtxt<'tcx>) -> LanguageItemCollector<'tcx> {
-        let mut item_refs = FxHashMap::default();
-
-        $( item_refs.insert($name, ($variant as usize, $target)); )*
-
-        LanguageItemCollector {
-            tcx,
-            items: LanguageItems::new(),
-            item_refs,
-        }
-    }
-
-    fn collect_item(&mut self, item_index: usize, item_def_id: DefId) {
-        // Check for duplicates.
-        if let Some(original_def_id) = self.items.items[item_index] {
-            if original_def_id != item_def_id {
-                let name = LangItem::from_u32(item_index as u32).unwrap().name();
-                let mut err = match self.tcx.hir().span_if_local(item_def_id) {
-                    Some(span) => struct_span_err!(
-                        self.tcx.sess,
-                        span,
-                        E0152,
-                        "found duplicate lang item `{}`",
-                        name
-                    ),
-                    None => {
-                        match self.tcx.extern_crate(item_def_id) {
-                            Some(ExternCrate {dependency_of, ..}) => {
-                                self.tcx.sess.struct_err(&format!(
-                                "duplicate lang item in crate `{}` (which `{}` depends on): `{}`.",
-                                self.tcx.crate_name(item_def_id.krate),
-                                self.tcx.crate_name(*dependency_of),
-                                name))
-                            },
-                            _ => {
-                                self.tcx.sess.struct_err(&format!(
-                                "duplicate lang item in crate `{}`: `{}`.",
-                                self.tcx.crate_name(item_def_id.krate),
-                                name))
-                            }
-                        }
-                    },
-                };
-                if let Some(span) = self.tcx.hir().span_if_local(original_def_id) {
-                    err.span_note(span, "first defined here");
-                } else {
-                    match self.tcx.extern_crate(original_def_id) {
-                        Some(ExternCrate {dependency_of, ..}) => {
-                            err.note(&format!(
-                            "first defined in crate `{}` (which `{}` depends on)",
-                                      self.tcx.crate_name(original_def_id.krate),
-                                      self.tcx.crate_name(*dependency_of)));
-                        },
-                        _ => {
-                            err.note(&format!("first defined in crate `{}`.",
-                                      self.tcx.crate_name(original_def_id.krate)));
-                        }
-                    }
-                }
-                err.emit();
-            }
-        }
-
-        // Matched.
-        self.items.items[item_index] = Some(item_def_id);
-    }
-}
-
-/// Extracts the first `lang = "$name"` out of a list of attributes.
-/// The attributes `#[panic_handler]` and `#[alloc_error_handler]`
-/// are also extracted out when found.
-pub fn extract(attrs: &[ast::Attribute]) -> Option<(Symbol, Span)> {
-    attrs.iter().find_map(|attr| Some(match attr {
-        _ if attr.check_name(sym::lang) => (attr.value_str()?, attr.span),
-        _ if attr.check_name(sym::panic_handler) => (sym::panic_impl, attr.span),
-        _ if attr.check_name(sym::alloc_error_handler) => (sym::oom, attr.span),
-        _ => return None,
-    }))
-}
-
-/// Traverses and collects all the lang items in all crates.
-pub fn collect<'tcx>(tcx: TyCtxt<'tcx>) -> LanguageItems {
-    // Initialize the collector.
-    let mut collector = LanguageItemCollector::new(tcx);
-
-    // Collect lang items in other crates.
-    for &cnum in tcx.crates().iter() {
-        for &(def_id, item_index) in tcx.defined_lang_items(cnum).iter() {
-            collector.collect_item(item_index, def_id);
-        }
-    }
-
-    // Collect lang items in this crate.
-    tcx.hir().krate().visit_all_item_likes(&mut collector);
-
-    // Extract out the found lang items.
-    let LanguageItemCollector { mut items, .. } = collector;
-
-    // Find all required but not-yet-defined lang items.
-    weak_lang_items::check_crate(tcx, &mut items);
-
-    items
-}
-
-// End of the macro
-    }
-}
-
-language_item_table! {
-//  Variant name,                Name,                 Method name,             Target;
-    BoolImplItem,                "bool",               bool_impl,               Target::Impl;
-    CharImplItem,                "char",               char_impl,               Target::Impl;
-    StrImplItem,                 "str",                str_impl,                Target::Impl;
-    SliceImplItem,               "slice",              slice_impl,              Target::Impl;
-    SliceU8ImplItem,             "slice_u8",           slice_u8_impl,           Target::Impl;
-    StrAllocImplItem,            "str_alloc",          str_alloc_impl,          Target::Impl;
-    SliceAllocImplItem,          "slice_alloc",        slice_alloc_impl,        Target::Impl;
-    SliceU8AllocImplItem,        "slice_u8_alloc",     slice_u8_alloc_impl,     Target::Impl;
-    ConstPtrImplItem,            "const_ptr",          const_ptr_impl,          Target::Impl;
-    MutPtrImplItem,              "mut_ptr",            mut_ptr_impl,            Target::Impl;
-    I8ImplItem,                  "i8",                 i8_impl,                 Target::Impl;
-    I16ImplItem,                 "i16",                i16_impl,                Target::Impl;
-    I32ImplItem,                 "i32",                i32_impl,                Target::Impl;
-    I64ImplItem,                 "i64",                i64_impl,                Target::Impl;
-    I128ImplItem,                "i128",               i128_impl,               Target::Impl;
-    IsizeImplItem,               "isize",              isize_impl,              Target::Impl;
-    U8ImplItem,                  "u8",                 u8_impl,                 Target::Impl;
-    U16ImplItem,                 "u16",                u16_impl,                Target::Impl;
-    U32ImplItem,                 "u32",                u32_impl,                Target::Impl;
-    U64ImplItem,                 "u64",                u64_impl,                Target::Impl;
-    U128ImplItem,                "u128",               u128_impl,               Target::Impl;
-    UsizeImplItem,               "usize",              usize_impl,              Target::Impl;
-    F32ImplItem,                 "f32",                f32_impl,                Target::Impl;
-    F64ImplItem,                 "f64",                f64_impl,                Target::Impl;
-    F32RuntimeImplItem,          "f32_runtime",        f32_runtime_impl,        Target::Impl;
-    F64RuntimeImplItem,          "f64_runtime",        f64_runtime_impl,        Target::Impl;
-
-    SizedTraitLangItem,          "sized",              sized_trait,             Target::Trait;
-    UnsizeTraitLangItem,         "unsize",             unsize_trait,            Target::Trait;
-    // trait injected by #[derive(PartialEq)], (i.e. "Partial EQ").
-    StructuralPeqTraitLangItem,  "structural_peq",     structural_peq_trait,    Target::Trait;
-    // trait injected by #[derive(Eq)], (i.e. "Total EQ"; no, I will not apologize).
-    StructuralTeqTraitLangItem,  "structural_teq",     structural_teq_trait,    Target::Trait;
-    CopyTraitLangItem,           "copy",               copy_trait,              Target::Trait;
-    CloneTraitLangItem,          "clone",              clone_trait,             Target::Trait;
-    SyncTraitLangItem,           "sync",               sync_trait,              Target::Trait;
-    FreezeTraitLangItem,         "freeze",             freeze_trait,            Target::Trait;
-
-    DropTraitLangItem,           "drop",               drop_trait,              Target::Trait;
-
-    CoerceUnsizedTraitLangItem,  "coerce_unsized",     coerce_unsized_trait,    Target::Trait;
-    DispatchFromDynTraitLangItem,"dispatch_from_dyn",  dispatch_from_dyn_trait, Target::Trait;
-
-    AddTraitLangItem,            "add",                add_trait,               Target::Trait;
-    SubTraitLangItem,            "sub",                sub_trait,               Target::Trait;
-    MulTraitLangItem,            "mul",                mul_trait,               Target::Trait;
-    DivTraitLangItem,            "div",                div_trait,               Target::Trait;
-    RemTraitLangItem,            "rem",                rem_trait,               Target::Trait;
-    NegTraitLangItem,            "neg",                neg_trait,               Target::Trait;
-    NotTraitLangItem,            "not",                not_trait,               Target::Trait;
-    BitXorTraitLangItem,         "bitxor",             bitxor_trait,            Target::Trait;
-    BitAndTraitLangItem,         "bitand",             bitand_trait,            Target::Trait;
-    BitOrTraitLangItem,          "bitor",              bitor_trait,             Target::Trait;
-    ShlTraitLangItem,            "shl",                shl_trait,               Target::Trait;
-    ShrTraitLangItem,            "shr",                shr_trait,               Target::Trait;
-    AddAssignTraitLangItem,      "add_assign",         add_assign_trait,        Target::Trait;
-    SubAssignTraitLangItem,      "sub_assign",         sub_assign_trait,        Target::Trait;
-    MulAssignTraitLangItem,      "mul_assign",         mul_assign_trait,        Target::Trait;
-    DivAssignTraitLangItem,      "div_assign",         div_assign_trait,        Target::Trait;
-    RemAssignTraitLangItem,      "rem_assign",         rem_assign_trait,        Target::Trait;
-    BitXorAssignTraitLangItem,   "bitxor_assign",      bitxor_assign_trait,     Target::Trait;
-    BitAndAssignTraitLangItem,   "bitand_assign",      bitand_assign_trait,     Target::Trait;
-    BitOrAssignTraitLangItem,    "bitor_assign",       bitor_assign_trait,      Target::Trait;
-    ShlAssignTraitLangItem,      "shl_assign",         shl_assign_trait,        Target::Trait;
-    ShrAssignTraitLangItem,      "shr_assign",         shr_assign_trait,        Target::Trait;
-    IndexTraitLangItem,          "index",              index_trait,             Target::Trait;
-    IndexMutTraitLangItem,       "index_mut",          index_mut_trait,         Target::Trait;
-
-    UnsafeCellTypeLangItem,      "unsafe_cell",        unsafe_cell_type,        Target::Struct;
-    VaListTypeLangItem,          "va_list",            va_list,                 Target::Struct;
-
-    DerefTraitLangItem,          "deref",              deref_trait,             Target::Trait;
-    DerefMutTraitLangItem,       "deref_mut",          deref_mut_trait,         Target::Trait;
-    ReceiverTraitLangItem,       "receiver",           receiver_trait,          Target::Trait;
-
-    FnTraitLangItem,             "fn",                 fn_trait,                Target::Trait;
-    FnMutTraitLangItem,          "fn_mut",             fn_mut_trait,            Target::Trait;
-    FnOnceTraitLangItem,         "fn_once",            fn_once_trait,           Target::Trait;
-
-    FutureTraitLangItem,         "future_trait",       future_trait,            Target::Trait;
-    GeneratorStateLangItem,      "generator_state",    gen_state,               Target::Enum;
-    GeneratorTraitLangItem,      "generator",          gen_trait,               Target::Trait;
-    UnpinTraitLangItem,          "unpin",              unpin_trait,             Target::Trait;
-    PinTypeLangItem,             "pin",                pin_type,                Target::Struct;
-
-    // Don't be fooled by the naming here: this lang item denotes `PartialEq`, not `Eq`.
-    EqTraitLangItem,             "eq",                 eq_trait,                Target::Trait;
-    PartialOrdTraitLangItem,     "partial_ord",        partial_ord_trait,       Target::Trait;
-
-    // A number of panic-related lang items. The `panic` item corresponds to
-    // divide-by-zero and various panic cases with `match`. The
-    // `panic_bounds_check` item is for indexing arrays.
-    //
-    // The `begin_unwind` lang item has a predefined symbol name and is sort of
-    // a "weak lang item" in the sense that a crate is not required to have it
-    // defined to use it, but a final product is required to define it
-    // somewhere. Additionally, there are restrictions on crates that use a weak
-    // lang item, but do not have it defined.
-    PanicFnLangItem,             "panic",              panic_fn,                Target::Fn;
-    PanicBoundsCheckFnLangItem,  "panic_bounds_check", panic_bounds_check_fn,   Target::Fn;
-    PanicInfoLangItem,           "panic_info",         panic_info,              Target::Struct;
-    PanicLocationLangItem,       "panic_location",     panic_location,          Target::Struct;
-    PanicImplLangItem,           "panic_impl",         panic_impl,              Target::Fn;
-    // Libstd panic entry point. Necessary for const eval to be able to catch it
-    BeginPanicFnLangItem,        "begin_panic",        begin_panic_fn,          Target::Fn;
-
-    ExchangeMallocFnLangItem,    "exchange_malloc",    exchange_malloc_fn,      Target::Fn;
-    BoxFreeFnLangItem,           "box_free",           box_free_fn,             Target::Fn;
-    DropInPlaceFnLangItem,       "drop_in_place",      drop_in_place_fn,        Target::Fn;
-    OomLangItem,                 "oom",                oom,                     Target::Fn;
-    AllocLayoutLangItem,         "alloc_layout",       alloc_layout,            Target::Struct;
-
-    StartFnLangItem,             "start",              start_fn,                Target::Fn;
-
-    EhPersonalityLangItem,       "eh_personality",     eh_personality,          Target::Fn;
-    EhUnwindResumeLangItem,      "eh_unwind_resume",   eh_unwind_resume,        Target::Fn;
-    EhCatchTypeinfoLangItem,     "eh_catch_typeinfo",  eh_catch_typeinfo,       Target::Static;
-
-    OwnedBoxLangItem,            "owned_box",          owned_box,               Target::Struct;
-
-    PhantomDataItem,             "phantom_data",       phantom_data,            Target::Struct;
-
-    ManuallyDropItem,            "manually_drop",      manually_drop,           Target::Struct;
-
-    MaybeUninitLangItem,         "maybe_uninit",       maybe_uninit,            Target::Union;
-
-    // Align offset for stride != 1; must not panic.
-    AlignOffsetLangItem,         "align_offset",       align_offset_fn,         Target::Fn;
-
-    TerminationTraitLangItem,    "termination",        termination,             Target::Trait;
-
-    Arc,                         "arc",                arc,                     Target::Struct;
-    Rc,                          "rc",                 rc,                      Target::Struct;
-}
+pub use rustc_hir::weak_lang_items::link_name;
+pub use rustc_hir::{LangItem, LanguageItems};
 
 impl<'tcx> TyCtxt<'tcx> {
     /// Returns the `DefId` for a given `LangItem`.
@@ -417,4 +30,36 @@ impl<'tcx> TyCtxt<'tcx> {
             }
         })
     }
+
+    pub fn fn_trait_kind_from_lang_item(&self, id: DefId) -> Option<ty::ClosureKind> {
+        let items = self.lang_items();
+        match Some(id) {
+            x if x == items.fn_trait() => Some(ty::ClosureKind::Fn),
+            x if x == items.fn_mut_trait() => Some(ty::ClosureKind::FnMut),
+            x if x == items.fn_once_trait() => Some(ty::ClosureKind::FnOnce),
+            _ => None,
+        }
+    }
+
+    pub fn is_weak_lang_item(&self, item_def_id: DefId) -> bool {
+        self.lang_items().is_weak_lang_item(item_def_id)
+    }
+}
+
+/// Returns `true` if the specified `lang_item` doesn't actually need to be
+/// present for this compilation.
+///
+/// Not all lang items are always required for each compilation, particularly in
+/// the case of panic=abort. In these situations some lang items are injected by
+/// crates and don't actually need to be defined in libstd.
+pub fn whitelisted(tcx: TyCtxt<'_>, lang_item: LangItem) -> bool {
+    // If we're not compiling with unwinding, we won't actually need these
+    // symbols. Other panic runtimes ensure that the relevant symbols are
+    // available to link things together, but they're never exercised.
+    if tcx.sess.panic_strategy() != PanicStrategy::Unwind {
+        return lang_item == LangItem::EhPersonalityLangItem
+            || lang_item == LangItem::EhUnwindResumeLangItem;
+    }
+
+    false
 }
diff --git a/src/librustc/middle/limits.rs b/src/librustc/middle/limits.rs
new file mode 100644
index 0000000000..22e4f5ea22
--- /dev/null
+++ b/src/librustc/middle/limits.rs
@@ -0,0 +1,66 @@
+//! Registering limits, recursion_limit, type_length_limit and const_eval_limit
+//!
+//! There are various parts of the compiler that must impose arbitrary limits
+//! on how deeply they recurse to prevent stack overflow. Users can override
+//! this via an attribute on the crate like `#![recursion_limit="22"]`. This pass
+//! just peeks and looks for that attribute.
+
+use crate::session::Session;
+use core::num::IntErrorKind;
+use rustc::bug;
+use rustc_ast::ast;
+use rustc_span::symbol::{sym, Symbol};
+
+use rustc_data_structures::sync::Once;
+
+pub fn update_limits(sess: &Session, krate: &ast::Crate) {
+    update_limit(sess, krate, &sess.recursion_limit, sym::recursion_limit, 128);
+    update_limit(sess, krate, &sess.type_length_limit, sym::type_length_limit, 1048576);
+    update_limit(sess, krate, &sess.const_eval_limit, sym::const_eval_limit, 1_000_000);
+}
+
+fn update_limit(
+    sess: &Session,
+    krate: &ast::Crate,
+    limit: &Once<usize>,
+    name: Symbol,
+    default: usize,
+) {
+    for attr in &krate.attrs {
+        if !attr.check_name(name) {
+            continue;
+        }
+
+        if let Some(s) = attr.value_str() {
+            match s.as_str().parse() {
+                Ok(n) => {
+                    limit.set(n);
+                    return;
+                }
+                Err(e) => {
+                    let mut err =
+                        sess.struct_span_err(attr.span, "`limit` must be a non-negative integer");
+
+                    let value_span = attr
+                        .meta()
+                        .and_then(|meta| meta.name_value_literal().cloned())
+                        .map(|lit| lit.span)
+                        .unwrap_or(attr.span);
+
+                    let error_str = match e.kind() {
+                        IntErrorKind::Overflow => "`limit` is too large",
+                        IntErrorKind::Empty => "`limit` must be a non-negative integer",
+                        IntErrorKind::InvalidDigit => "not a valid integer",
+                        IntErrorKind::Underflow => bug!("`limit` should never underflow"),
+                        IntErrorKind::Zero => bug!("zero is a valid `limit`"),
+                        kind => bug!("unimplemented IntErrorKind variant: {:?}", kind),
+                    };
+
+                    err.span_label(value_span, error_str);
+                    err.emit();
+                }
+            }
+        }
+    }
+    limit.set(default);
+}
diff --git a/src/librustc/middle/mod.rs b/src/librustc/middle/mod.rs
index c2959766c5..464488964a 100644
--- a/src/librustc/middle/mod.rs
+++ b/src/librustc/middle/mod.rs
@@ -28,9 +28,8 @@ pub mod lib_features {
         }
     }
 }
+pub mod limits;
 pub mod privacy;
-pub mod recursion_limit;
 pub mod region;
 pub mod resolve_lifetime;
 pub mod stability;
-pub mod weak_lang_items;
diff --git a/src/librustc/middle/recursion_limit.rs b/src/librustc/middle/recursion_limit.rs
deleted file mode 100644
index b33cde8e2a..0000000000
--- a/src/librustc/middle/recursion_limit.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Recursion limit.
-//
-// There are various parts of the compiler that must impose arbitrary limits
-// on how deeply they recurse to prevent stack overflow. Users can override
-// this via an attribute on the crate like `#![recursion_limit="22"]`. This pass
-// just peeks and looks for that attribute.
-
-use crate::session::Session;
-use rustc_span::symbol::{sym, Symbol};
-use syntax::ast;
-
-use rustc_data_structures::sync::Once;
-
-pub fn update_limits(sess: &Session, krate: &ast::Crate) {
-    update_limit(krate, &sess.recursion_limit, sym::recursion_limit, 128);
-    update_limit(krate, &sess.type_length_limit, sym::type_length_limit, 1048576);
-}
-
-fn update_limit(krate: &ast::Crate, limit: &Once<usize>, name: Symbol, default: usize) {
-    for attr in &krate.attrs {
-        if !attr.check_name(name) {
-            continue;
-        }
-
-        if let Some(s) = attr.value_str() {
-            if let Some(n) = s.as_str().parse().ok() {
-                limit.set(n);
-                return;
-            }
-        }
-    }
-    limit.set(default);
-}
diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs
index 9e9c8bd846..1d043f5dcd 100644
--- a/src/librustc/middle/region.rs
+++ b/src/librustc/middle/region.rs
@@ -635,7 +635,7 @@ impl<'tcx> ScopeTree {
     /// Used to sanity check visit_expr call count when
     /// calculating generator interiors.
     pub fn body_expr_count(&self, body_id: hir::BodyId) -> Option<usize> {
-        self.body_expr_count.get(&body_id).map(|r| *r)
+        self.body_expr_count.get(&body_id).copied()
     }
 }
 
diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs
index 1176ffc79d..9d3df9623b 100644
--- a/src/librustc/middle/stability.rs
+++ b/src/librustc/middle/stability.rs
@@ -5,6 +5,8 @@ pub use self::StabilityLevel::*;
 
 use crate::session::{DiagnosticMessageId, Session};
 use crate::ty::{self, TyCtxt};
+use rustc_ast::ast::CRATE_NODE_ID;
+use rustc_attr::{self as attr, ConstStability, Deprecation, RustcDeprecation, Stability};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{Applicability, DiagnosticBuilder};
 use rustc_feature::GateIssue;
@@ -12,12 +14,11 @@ use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc_hir::{self, HirId};
-use rustc_session::lint::{self, BuiltinLintDiagnostics, Lint, LintBuffer};
+use rustc_session::lint::builtin::{DEPRECATED, DEPRECATED_IN_FUTURE, SOFT_UNSTABLE};
+use rustc_session::lint::{BuiltinLintDiagnostics, Lint, LintBuffer};
+use rustc_session::parse::feature_err_issue;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{MultiSpan, Span};
-use syntax::ast::CRATE_NODE_ID;
-use syntax::attr::{self, ConstStability, Deprecation, RustcDeprecation, Stability};
-use syntax::sess::feature_err_issue;
 
 use std::num::NonZeroU32;
 
@@ -97,7 +98,7 @@ pub fn report_unstable(
     issue: Option<NonZeroU32>,
     is_soft: bool,
     span: Span,
-    soft_handler: impl FnOnce(&'static lint::Lint, Span, &str),
+    soft_handler: impl FnOnce(&'static Lint, Span, &str),
 ) {
     let msg = match reason {
         Some(r) => format!("use of unstable library feature '{}': {}", feature, r),
@@ -105,10 +106,10 @@ pub fn report_unstable(
     };
 
     let msp: MultiSpan = span.into();
-    let cm = &sess.parse_sess.source_map();
+    let sm = &sess.parse_sess.source_map();
     let span_key = msp.primary_span().and_then(|sp: Span| {
         if !sp.is_dummy() {
-            let file = cm.lookup_char_pos(sp.lo()).file;
+            let file = sm.lookup_char_pos(sp.lo()).file;
             if file.name.is_macros() { None } else { Some(span) }
         } else {
             None
@@ -119,7 +120,7 @@ pub fn report_unstable(
     let fresh = sess.one_time_diagnostics.borrow_mut().insert(error_id);
     if fresh {
         if is_soft {
-            soft_handler(lint::builtin::SOFT_UNSTABLE, span, &msg)
+            soft_handler(SOFT_UNSTABLE, span, &msg)
         } else {
             feature_err_issue(&sess.parse_sess, feature, span, GateIssue::Library(issue), &msg)
                 .emit();
@@ -175,19 +176,19 @@ fn deprecation_message_common(message: String, reason: Option<Symbol>) -> String
 
 pub fn deprecation_message(depr: &Deprecation, path: &str) -> (String, &'static Lint) {
     let message = format!("use of deprecated item '{}'", path);
-    (deprecation_message_common(message, depr.note), lint::builtin::DEPRECATED)
+    (deprecation_message_common(message, depr.note), DEPRECATED)
 }
 
 pub fn rustc_deprecation_message(depr: &RustcDeprecation, path: &str) -> (String, &'static Lint) {
     let (message, lint) = if deprecation_in_effect(&depr.since.as_str()) {
-        (format!("use of deprecated item '{}'", path), lint::builtin::DEPRECATED)
+        (format!("use of deprecated item '{}'", path), DEPRECATED)
     } else {
         (
             format!(
                 "use of item '{}' that will be deprecated in future version {}",
                 path, depr.since
             ),
-            lint::builtin::DEPRECATED_IN_FUTURE,
+            DEPRECATED_IN_FUTURE,
         )
     };
     (deprecation_message_common(message, Some(depr.reason)), lint)
@@ -221,11 +222,13 @@ fn late_report_deprecation(
         return;
     }
 
-    let mut diag = tcx.struct_span_lint_hir(lint, hir_id, span, message);
-    if let hir::Node::Expr(_) = tcx.hir().get(hir_id) {
-        deprecation_suggestion(&mut diag, suggestion, span);
-    }
-    diag.emit();
+    tcx.struct_span_lint_hir(lint, hir_id, span, |lint| {
+        let mut diag = lint.build(message);
+        if let hir::Node::Expr(_) = tcx.hir().get(hir_id) {
+            deprecation_suggestion(&mut diag, suggestion, span);
+        }
+        diag.emit()
+    });
     if hir_id == hir::DUMMY_HIR_ID {
         span_bug!(span, "emitted a {} lint with dummy HIR id: {:?}", lint.name, def_id);
     }
@@ -386,8 +389,11 @@ impl<'tcx> TyCtxt<'tcx> {
     /// Additionally, this function will also check if the item is deprecated. If so, and `id` is
     /// not `None`, a deprecated lint attached to `id` will be emitted.
     pub fn check_stability(self, def_id: DefId, id: Option<HirId>, span: Span) {
-        let soft_handler =
-            |lint, span, msg: &_| self.lint_hir(lint, id.unwrap_or(hir::CRATE_HIR_ID), span, msg);
+        let soft_handler = |lint, span, msg: &_| {
+            self.struct_span_lint_hir(lint, id.unwrap_or(hir::CRATE_HIR_ID), span, |lint| {
+                lint.build(msg).emit()
+            })
+        };
         match self.eval_stability(def_id, id, span) {
             EvalResult::Allow => {}
             EvalResult::Deny { feature, reason, issue, is_soft } => {
diff --git a/src/librustc/middle/weak_lang_items.rs b/src/librustc/middle/weak_lang_items.rs
deleted file mode 100644
index 5571f8f231..0000000000
--- a/src/librustc/middle/weak_lang_items.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-//! Validity checking for weak lang items
-
-use crate::middle::lang_items;
-use crate::session::config;
-
-use crate::hir::map::Map;
-use crate::ty::TyCtxt;
-use rustc_data_structures::fx::FxHashSet;
-use rustc_errors::struct_span_err;
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
-use rustc_span::symbol::{sym, Symbol};
-use rustc_span::Span;
-use rustc_target::spec::PanicStrategy;
-use syntax::ast;
-
-macro_rules! weak_lang_items {
-    ($($name:ident, $item:ident, $sym:ident;)*) => (
-
-struct Context<'a, 'tcx> {
-    tcx: TyCtxt<'tcx>,
-    items: &'a mut lang_items::LanguageItems,
-}
-
-/// Checks the crate for usage of weak lang items, returning a vector of all the
-/// language items required by this crate, but not defined yet.
-pub fn check_crate<'tcx>(tcx: TyCtxt<'tcx>,
-                             items: &mut lang_items::LanguageItems) {
-    // These are never called by user code, they're generated by the compiler.
-    // They will never implicitly be added to the `missing` array unless we do
-    // so here.
-    if items.eh_personality().is_none() {
-        items.missing.push(lang_items::EhPersonalityLangItem);
-    }
-    if tcx.sess.target.target.options.custom_unwind_resume &
-       items.eh_unwind_resume().is_none() {
-        items.missing.push(lang_items::EhUnwindResumeLangItem);
-    }
-
-    {
-        let mut cx = Context { tcx, items };
-        tcx.hir().krate().visit_all_item_likes(&mut cx.as_deep_visitor());
-    }
-    verify(tcx, items);
-}
-
-pub fn link_name(attrs: &[ast::Attribute]) -> Option<Symbol> {
-    lang_items::extract(attrs).and_then(|(name, _)| {
-        $(if name == sym::$name {
-            Some(sym::$sym)
-        } else)* {
-            None
-        }
-    })
-}
-
-/// Returns `true` if the specified `lang_item` doesn't actually need to be
-/// present for this compilation.
-///
-/// Not all lang items are always required for each compilation, particularly in
-/// the case of panic=abort. In these situations some lang items are injected by
-/// crates and don't actually need to be defined in libstd.
-pub fn whitelisted(tcx: TyCtxt<'_>, lang_item: lang_items::LangItem) -> bool {
-    // If we're not compiling with unwinding, we won't actually need these
-    // symbols. Other panic runtimes ensure that the relevant symbols are
-    // available to link things together, but they're never exercised.
-    if tcx.sess.panic_strategy() != PanicStrategy::Unwind {
-        return lang_item == lang_items::EhPersonalityLangItem ||
-            lang_item == lang_items::EhUnwindResumeLangItem
-    }
-
-    false
-}
-
-fn verify<'tcx>(tcx: TyCtxt<'tcx>,
-                    items: &lang_items::LanguageItems) {
-    // We only need to check for the presence of weak lang items if we're
-    // emitting something that's not an rlib.
-    let needs_check = tcx.sess.crate_types.borrow().iter().any(|kind| {
-        match *kind {
-            config::CrateType::Dylib |
-            config::CrateType::ProcMacro |
-            config::CrateType::Cdylib |
-            config::CrateType::Executable |
-            config::CrateType::Staticlib => true,
-            config::CrateType::Rlib => false,
-        }
-    });
-    if !needs_check {
-        return
-    }
-
-    let mut missing = FxHashSet::default();
-    for &cnum in tcx.crates().iter() {
-        for &item in tcx.missing_lang_items(cnum).iter() {
-            missing.insert(item);
-        }
-    }
-
-    $(
-        if missing.contains(&lang_items::$item) &&
-           !whitelisted(tcx, lang_items::$item) &&
-           items.$name().is_none() {
-            if lang_items::$item == lang_items::PanicImplLangItem {
-                tcx.sess.err(&format!("`#[panic_handler]` function required, \
-                                       but not found"));
-            } else if lang_items::$item == lang_items::OomLangItem {
-                tcx.sess.err(&format!("`#[alloc_error_handler]` function required, \
-                                       but not found"));
-            } else {
-                tcx.sess.err(&format!("language item required, but not found: `{}`",
-                                      stringify!($name)));
-            }
-        }
-    )*
-}
-
-impl<'a, 'tcx> Context<'a, 'tcx> {
-    fn register(&mut self, name: Symbol, span: Span) {
-        $(if name == sym::$name {
-            if self.items.$name().is_none() {
-                self.items.missing.push(lang_items::$item);
-            }
-        } else)* {
-            struct_span_err!(
-                self.tcx.sess, span, E0264,
-                "unknown external lang item: `{}`",
-                name
-            )
-            .emit();
-        }
-    }
-}
-
-impl<'a, 'tcx, 'v> Visitor<'v> for Context<'a, 'tcx> {
-    type Map = Map<'v>;
-
-    fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, Map<'v>> {
-        NestedVisitorMap::None
-    }
-
-    fn visit_foreign_item(&mut self, i: &hir::ForeignItem<'_>) {
-        if let Some((lang_item, _)) = lang_items::extract(&i.attrs) {
-            self.register(lang_item, i.span);
-        }
-        intravisit::walk_foreign_item(self, i)
-    }
-}
-
-impl<'tcx> TyCtxt<'tcx> {
-    pub fn is_weak_lang_item(&self, item_def_id: DefId) -> bool {
-        let lang_items = self.lang_items();
-        let did = Some(item_def_id);
-
-        $(lang_items.$name() == did)||*
-    }
-}
-
-) }
-
-weak_lang_items! {
-    panic_impl,         PanicImplLangItem,          rust_begin_unwind;
-    eh_personality,     EhPersonalityLangItem,      rust_eh_personality;
-    eh_unwind_resume,   EhUnwindResumeLangItem,     rust_eh_unwind_resume;
-    oom,                OomLangItem,                rust_oom;
-}
diff --git a/src/librustc/mir/interpret/allocation.rs b/src/librustc/mir/interpret/allocation.rs
index a06b23367e..546ba586d3 100644
--- a/src/librustc/mir/interpret/allocation.rs
+++ b/src/librustc/mir/interpret/allocation.rs
@@ -6,12 +6,12 @@ use super::{
 
 use crate::ty::layout::{Align, Size};
 
+use rustc_ast::ast::Mutability;
 use rustc_data_structures::sorted_map::SortedMap;
 use rustc_target::abi::HasDataLayout;
 use std::borrow::Cow;
 use std::iter;
 use std::ops::{Deref, DerefMut, Range};
-use syntax::ast::Mutability;
 
 // NOTE: When adding new fields, make sure to adjust the `Snapshot` impl in
 // `src/librustc_mir/interpret/snapshot.rs`.
@@ -472,7 +472,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
         val: ScalarMaybeUndef<Tag>,
     ) -> InterpResult<'tcx> {
         let ptr_size = cx.data_layout().pointer_size;
-        self.write_scalar(cx, ptr.into(), val, ptr_size)
+        self.write_scalar(cx, ptr, val, ptr_size)
     }
 }
 
@@ -598,7 +598,7 @@ impl AllocationDefinedness {
     pub fn all_bytes_undef(&self) -> bool {
         // The `ranges` are run-length encoded and of alternating definedness.
         // So if `ranges.len() > 1` then the second block is a range of defined.
-        self.initial == false && self.ranges.len() == 1
+        !self.initial && self.ranges.len() == 1
     }
 }
 
@@ -610,7 +610,7 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
         // a naive undef mask copying algorithm would repeatedly have to read the undef mask from
         // the source and write it to the destination. Even if we optimized the memory accesses,
         // we'd be doing all of this `repeat` times.
-        // Therefor we precompute a compressed version of the undef mask of the source value and
+        // Therefore we precompute a compressed version of the undef mask of the source value and
         // then write it back `repeat` times without computing any more information from the source.
 
         // A precomputed cache for ranges of defined/undefined bits
@@ -818,9 +818,9 @@ impl UndefMask {
             // First set all bits except the first `bita`,
             // then unset the last `64 - bitb` bits.
             let range = if bitb == 0 {
-                u64::max_value() << bita
+                u64::MAX << bita
             } else {
-                (u64::max_value() << bita) & (u64::max_value() >> (64 - bitb))
+                (u64::MAX << bita) & (u64::MAX >> (64 - bitb))
             };
             if new_state {
                 self.blocks[blocka] |= range;
@@ -832,21 +832,21 @@ impl UndefMask {
         // across block boundaries
         if new_state {
             // Set `bita..64` to `1`.
-            self.blocks[blocka] |= u64::max_value() << bita;
+            self.blocks[blocka] |= u64::MAX << bita;
             // Set `0..bitb` to `1`.
             if bitb != 0 {
-                self.blocks[blockb] |= u64::max_value() >> (64 - bitb);
+                self.blocks[blockb] |= u64::MAX >> (64 - bitb);
             }
             // Fill in all the other blocks (much faster than one bit at a time).
             for block in (blocka + 1)..blockb {
-                self.blocks[block] = u64::max_value();
+                self.blocks[block] = u64::MAX;
             }
         } else {
             // Set `bita..64` to `0`.
-            self.blocks[blocka] &= !(u64::max_value() << bita);
+            self.blocks[blocka] &= !(u64::MAX << bita);
             // Set `0..bitb` to `0`.
             if bitb != 0 {
-                self.blocks[blockb] &= !(u64::max_value() >> (64 - bitb));
+                self.blocks[blockb] &= !(u64::MAX >> (64 - bitb));
             }
             // Fill in all the other blocks (much faster than one bit at a time).
             for block in (blocka + 1)..blockb {
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index 349dbd74ad..b46095927b 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -2,16 +2,15 @@ use super::{CheckInAllocMsg, Pointer, RawConst, ScalarMaybeUndef};
 
 use crate::hir::map::definitions::DefPathData;
 use crate::mir;
+use crate::mir::interpret::ConstValue;
 use crate::ty::layout::{Align, LayoutError, Size};
 use crate::ty::query::TyCtxtAt;
 use crate::ty::{self, layout, Ty};
 
 use backtrace::Backtrace;
-use hir::GeneratorKind;
 use rustc_errors::{struct_span_err, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_macros::HashStable;
-use rustc_span::symbol::Symbol;
 use rustc_span::{Pos, Span};
 use rustc_target::spec::abi::Abi;
 use std::{any::Any, env, fmt};
@@ -42,7 +41,7 @@ CloneTypeFoldableImpls! {
 }
 
 pub type ConstEvalRawResult<'tcx> = Result<RawConst<'tcx>, ErrorHandled>;
-pub type ConstEvalResult<'tcx> = Result<&'tcx ty::Const<'tcx>, ErrorHandled>;
+pub type ConstEvalResult<'tcx> = Result<ConstValue<'tcx>, ErrorHandled>;
 
 #[derive(Debug)]
 pub struct ConstEvalErr<'tcx> {
@@ -83,18 +82,15 @@ impl<'tcx> ConstEvalErr<'tcx> {
         &self,
         tcx: TyCtxtAt<'tcx>,
         message: &str,
-    ) -> Result<DiagnosticBuilder<'tcx>, ErrorHandled> {
-        self.struct_generic(tcx, message, None)
+        emit: impl FnOnce(DiagnosticBuilder<'_>),
+    ) -> Result<(), ErrorHandled> {
+        self.struct_generic(tcx, message, emit, None)
     }
 
     pub fn report_as_error(&self, tcx: TyCtxtAt<'tcx>, message: &str) -> ErrorHandled {
-        let err = self.struct_error(tcx, message);
-        match err {
-            Ok(mut err) => {
-                err.emit();
-                ErrorHandled::Reported
-            }
-            Err(err) => err,
+        match self.struct_error(tcx, message, |mut e| e.emit()) {
+            Ok(_) => ErrorHandled::Reported,
+            Err(x) => x,
         }
     }
 
@@ -105,9 +101,11 @@ impl<'tcx> ConstEvalErr<'tcx> {
         lint_root: hir::HirId,
         span: Option<Span>,
     ) -> ErrorHandled {
-        let lint = self.struct_generic(tcx, message, Some(lint_root));
-        match lint {
-            Ok(mut lint) => {
+        match self.struct_generic(
+            tcx,
+            message,
+            |mut lint: DiagnosticBuilder<'_>| {
+                // Apply the span.
                 if let Some(span) = span {
                     let primary_spans = lint.span.primary_spans().to_vec();
                     // point at the actual error as the primary span
@@ -121,59 +119,95 @@ impl<'tcx> ConstEvalErr<'tcx> {
                     }
                 }
                 lint.emit();
-                ErrorHandled::Reported
-            }
+            },
+            Some(lint_root),
+        ) {
+            Ok(_) => ErrorHandled::Reported,
             Err(err) => err,
         }
     }
 
+    /// Create a diagnostic for this const eval error.
+    ///
+    /// Sets the message passed in via `message` and adds span labels with detailed error
+    /// information before handing control back to `emit` to do any final processing.
+    /// It's the caller's responsibility to call emit(), stash(), etc. within the `emit`
+    /// function to dispose of the diagnostic properly.
+    ///
+    /// If `lint_root.is_some()` report it as a lint, else report it as a hard error.
+    /// (Except that for some errors, we ignore all that -- see `must_error` below.)
     fn struct_generic(
         &self,
         tcx: TyCtxtAt<'tcx>,
         message: &str,
+        emit: impl FnOnce(DiagnosticBuilder<'_>),
         lint_root: Option<hir::HirId>,
-    ) -> Result<DiagnosticBuilder<'tcx>, ErrorHandled> {
+    ) -> Result<(), ErrorHandled> {
         let must_error = match self.error {
-            InterpError::MachineStop(_) => bug!("CTFE does not stop"),
             err_inval!(Layout(LayoutError::Unknown(_))) | err_inval!(TooGeneric) => {
                 return Err(ErrorHandled::TooGeneric);
             }
             err_inval!(TypeckError) => return Err(ErrorHandled::Reported),
+            // We must *always* hard error on these, even if the caller wants just a lint.
             err_inval!(Layout(LayoutError::SizeOverflow(_))) => true,
             _ => false,
         };
         trace!("reporting const eval failure at {:?}", self.span);
-        let mut err = if let (Some(lint_root), false) = (lint_root, must_error) {
-            let hir_id = self
-                .stacktrace
-                .iter()
-                .rev()
-                .filter_map(|frame| frame.lint_root)
-                .next()
-                .unwrap_or(lint_root);
-            tcx.struct_span_lint_hir(
-                rustc_session::lint::builtin::CONST_ERR,
-                hir_id,
-                tcx.span,
-                message,
-            )
-        } else if must_error {
-            struct_error(tcx, &self.error.to_string())
-        } else {
-            struct_error(tcx, message)
+
+        let err_msg = match &self.error {
+            InterpError::MachineStop(msg) => {
+                // A custom error (`ConstEvalErrKind` in `librustc_mir/interp/const_eval/error.rs`).
+                // Should be turned into a string by now.
+                msg.downcast_ref::<String>().expect("invalid MachineStop payload").clone()
+            }
+            err => err.to_string(),
         };
-        if !must_error {
-            err.span_label(self.span, self.error.to_string());
-        }
-        // Skip the last, which is just the environment of the constant.  The stacktrace
-        // is sometimes empty because we create "fake" eval contexts in CTFE to do work
-        // on constant values.
-        if self.stacktrace.len() > 0 {
-            for frame_info in &self.stacktrace[..self.stacktrace.len() - 1] {
-                err.span_label(frame_info.call_site, frame_info.to_string());
+
+        let finish = |mut err: DiagnosticBuilder<'_>, span_msg: Option<String>| {
+            if let Some(span_msg) = span_msg {
+                err.span_label(self.span, span_msg);
+            }
+            // Add spans for the stacktrace.
+            // Skip the last, which is just the environment of the constant.  The stacktrace
+            // is sometimes empty because we create "fake" eval contexts in CTFE to do work
+            // on constant values.
+            if !self.stacktrace.is_empty() {
+                for frame_info in &self.stacktrace[..self.stacktrace.len() - 1] {
+                    err.span_label(frame_info.call_site, frame_info.to_string());
+                }
+            }
+            // Let the caller finish the job.
+            emit(err)
+        };
+
+        if must_error {
+            // The `message` makes little sense here, this is a more serious error than the
+            // caller thinks anyway.
+            // See <https://github.com/rust-lang/rust/pull/63152>.
+            finish(struct_error(tcx, &err_msg), None);
+        } else {
+            // Regular case.
+            if let Some(lint_root) = lint_root {
+                // Report as lint.
+                let hir_id = self
+                    .stacktrace
+                    .iter()
+                    .rev()
+                    .filter_map(|frame| frame.lint_root)
+                    .next()
+                    .unwrap_or(lint_root);
+                tcx.struct_span_lint_hir(
+                    rustc_session::lint::builtin::CONST_ERR,
+                    hir_id,
+                    tcx.span,
+                    |lint| finish(lint.build(message), Some(err_msg)),
+                );
+            } else {
+                // Report as hard error.
+                finish(struct_error(tcx, message), Some(err_msg));
             }
         }
-        Ok(err)
+        Ok(())
     }
 }
 
@@ -211,7 +245,7 @@ fn print_backtrace(backtrace: &mut Backtrace) {
     eprintln!("\n\nAn error occurred in miri:\n{:?}", backtrace);
 }
 
-impl From<ErrorHandled> for InterpErrorInfo<'tcx> {
+impl From<ErrorHandled> for InterpErrorInfo<'_> {
     fn from(err: ErrorHandled) -> Self {
         match err {
             ErrorHandled::Reported => err_inval!(ReferencedConstant),
@@ -242,63 +276,6 @@ impl<'tcx> From<InterpError<'tcx>> for InterpErrorInfo<'tcx> {
     }
 }
 
-#[derive(Clone, RustcEncodable, RustcDecodable, HashStable, PartialEq)]
-pub enum PanicInfo<O> {
-    Panic { msg: Symbol, line: u32, col: u32, file: Symbol },
-    BoundsCheck { len: O, index: O },
-    Overflow(mir::BinOp),
-    OverflowNeg,
-    DivisionByZero,
-    RemainderByZero,
-    ResumedAfterReturn(GeneratorKind),
-    ResumedAfterPanic(GeneratorKind),
-}
-
-/// Type for MIR `Assert` terminator error messages.
-pub type AssertMessage<'tcx> = PanicInfo<mir::Operand<'tcx>>;
-
-impl<O> PanicInfo<O> {
-    /// Getting a description does not require `O` to be printable, and does not
-    /// require allocation.
-    /// The caller is expected to handle `Panic` and `BoundsCheck` separately.
-    pub fn description(&self) -> &'static str {
-        use PanicInfo::*;
-        match self {
-            Overflow(mir::BinOp::Add) => "attempt to add with overflow",
-            Overflow(mir::BinOp::Sub) => "attempt to subtract with overflow",
-            Overflow(mir::BinOp::Mul) => "attempt to multiply with overflow",
-            Overflow(mir::BinOp::Div) => "attempt to divide with overflow",
-            Overflow(mir::BinOp::Rem) => "attempt to calculate the remainder with overflow",
-            OverflowNeg => "attempt to negate with overflow",
-            Overflow(mir::BinOp::Shr) => "attempt to shift right with overflow",
-            Overflow(mir::BinOp::Shl) => "attempt to shift left with overflow",
-            Overflow(op) => bug!("{:?} cannot overflow", op),
-            DivisionByZero => "attempt to divide by zero",
-            RemainderByZero => "attempt to calculate the remainder with a divisor of zero",
-            ResumedAfterReturn(GeneratorKind::Gen) => "generator resumed after completion",
-            ResumedAfterReturn(GeneratorKind::Async(_)) => "`async fn` resumed after completion",
-            ResumedAfterPanic(GeneratorKind::Gen) => "generator resumed after panicking",
-            ResumedAfterPanic(GeneratorKind::Async(_)) => "`async fn` resumed after panicking",
-            Panic { .. } | BoundsCheck { .. } => bug!("Unexpected PanicInfo"),
-        }
-    }
-}
-
-impl<O: fmt::Debug> fmt::Debug for PanicInfo<O> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use PanicInfo::*;
-        match self {
-            Panic { ref msg, line, col, ref file } => {
-                write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col)
-            }
-            BoundsCheck { ref len, ref index } => {
-                write!(f, "index out of bounds: the len is {:?} but the index is {:?}", len, index)
-            }
-            _ => write!(f, "{}", self.description()),
-        }
-    }
-}
-
 /// Error information for when the program we executed turned out not to actually be a valid
 /// program. This cannot happen in stand-alone Miri, but it can happen during CTFE/ConstProp
 /// where we work on generic code or execution does not have all information available.
@@ -314,7 +291,7 @@ pub enum InvalidProgramInfo<'tcx> {
     Layout(layout::LayoutError<'tcx>),
 }
 
-impl fmt::Debug for InvalidProgramInfo<'tcx> {
+impl fmt::Debug for InvalidProgramInfo<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use InvalidProgramInfo::*;
         match self {
@@ -344,6 +321,8 @@ pub enum UndefinedBehaviorInfo {
     RemainderByZero,
     /// Overflowing inbounds pointer arithmetic.
     PointerArithOverflow,
+    /// Invalid metadata in a wide pointer (using `str` to avoid allocations).
+    InvalidMeta(&'static str),
 }
 
 impl fmt::Debug for UndefinedBehaviorInfo {
@@ -361,6 +340,7 @@ impl fmt::Debug for UndefinedBehaviorInfo {
             DivisionByZero => write!(f, "dividing by zero"),
             RemainderByZero => write!(f, "calculating the remainder with a divisor of zero"),
             PointerArithOverflow => write!(f, "overflowing in-bounds pointer arithmetic"),
+            InvalidMeta(msg) => write!(f, "invalid metadata in wide pointer: {}", msg),
         }
     }
 }
@@ -377,8 +357,8 @@ pub enum UnsupportedOpInfo<'tcx> {
     Unsupported(String),
 
     /// When const-prop encounters a situation it does not support, it raises this error.
-    /// This must not allocate for performance reasons.
-    ConstPropUnsupported(&'tcx str),
+    /// This must not allocate for performance reasons (hence `str`, not `String`).
+    ConstPropUnsupported(&'static str),
 
     // -- Everything below is not categorized yet --
     FunctionAbiMismatch(Abi, Abi),
@@ -599,8 +579,6 @@ impl fmt::Debug for ResourceExhaustionInfo {
 }
 
 pub enum InterpError<'tcx> {
-    /// The program panicked.
-    Panic(PanicInfo<u64>),
     /// The program caused undefined behavior.
     UndefinedBehavior(UndefinedBehaviorInfo),
     /// The program did something the interpreter does not support (some of these *might* be UB
@@ -633,8 +611,23 @@ impl fmt::Debug for InterpError<'_> {
             InvalidProgram(ref msg) => write!(f, "{:?}", msg),
             UndefinedBehavior(ref msg) => write!(f, "{:?}", msg),
             ResourceExhaustion(ref msg) => write!(f, "{:?}", msg),
-            Panic(ref msg) => write!(f, "{:?}", msg),
-            MachineStop(_) => write!(f, "machine caused execution to stop"),
+            MachineStop(_) => bug!("unhandled MachineStop"),
+        }
+    }
+}
+
+impl InterpError<'_> {
+    /// Some errors allocate to be created as they contain free-form strings.
+    /// And sometimes we want to be sure that did not happen as it is a
+    /// waste of resources.
+    pub fn allocates(&self) -> bool {
+        match self {
+            InterpError::MachineStop(_)
+            | InterpError::Unsupported(UnsupportedOpInfo::Unsupported(_))
+            | InterpError::Unsupported(UnsupportedOpInfo::ValidationFailure(_))
+            | InterpError::UndefinedBehavior(UndefinedBehaviorInfo::Ub(_))
+            | InterpError::UndefinedBehavior(UndefinedBehaviorInfo::UbExperimental(_)) => true,
+            _ => false,
         }
     }
 }
diff --git a/src/librustc/mir/interpret/mod.rs b/src/librustc/mir/interpret/mod.rs
index 108d3ef557..64c07b431d 100644
--- a/src/librustc/mir/interpret/mod.rs
+++ b/src/librustc/mir/interpret/mod.rs
@@ -37,15 +37,6 @@ macro_rules! err_ub_format {
     ($($tt:tt)*) => { err_ub!(Ub(format!($($tt)*))) };
 }
 
-#[macro_export]
-macro_rules! err_panic {
-    ($($tt:tt)*) => {
-        $crate::mir::interpret::InterpError::Panic(
-            $crate::mir::interpret::PanicInfo::$($tt)*
-        )
-    };
-}
-
 #[macro_export]
 macro_rules! err_exhaust {
     ($($tt:tt)*) => {
@@ -80,11 +71,6 @@ macro_rules! throw_ub_format {
     ($($tt:tt)*) => { throw_ub!(Ub(format!($($tt)*))) };
 }
 
-#[macro_export]
-macro_rules! throw_panic {
-    ($($tt:tt)*) => { return Err(err_panic!($($tt)*).into()) };
-}
-
 #[macro_export]
 macro_rules! throw_exhaust {
     ($($tt:tt)*) => { return Err(err_exhaust!($($tt)*).into()) };
@@ -104,9 +90,9 @@ mod queries;
 mod value;
 
 pub use self::error::{
-    struct_error, AssertMessage, ConstEvalErr, ConstEvalRawResult, ConstEvalResult, ErrorHandled,
-    FrameInfo, InterpError, InterpErrorInfo, InterpResult, InvalidProgramInfo, PanicInfo,
-    ResourceExhaustionInfo, UndefinedBehaviorInfo, UnsupportedOpInfo,
+    struct_error, ConstEvalErr, ConstEvalRawResult, ConstEvalResult, ErrorHandled, FrameInfo,
+    InterpError, InterpErrorInfo, InterpResult, InvalidProgramInfo, ResourceExhaustionInfo,
+    UndefinedBehaviorInfo, UnsupportedOpInfo,
 };
 
 pub use self::value::{get_slice_bytes, ConstValue, RawConst, Scalar, ScalarMaybeUndef};
@@ -121,6 +107,7 @@ use crate::ty::layout::{self, Size};
 use crate::ty::subst::GenericArgKind;
 use crate::ty::{self, Instance, Ty, TyCtxt};
 use byteorder::{BigEndian, LittleEndian, ReadBytesExt, WriteBytesExt};
+use rustc_ast::ast::LitKind;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::{HashMapExt, Lock};
 use rustc_data_structures::tiny_list::TinyList;
@@ -131,7 +118,6 @@ use std::fmt;
 use std::io;
 use std::num::NonZeroU32;
 use std::sync::atomic::{AtomicU32, Ordering};
-use syntax::ast::LitKind;
 
 /// Uniquely identifies one of the following:
 /// - A constant
diff --git a/src/librustc/mir/interpret/pointer.rs b/src/librustc/mir/interpret/pointer.rs
index a4974fb541..cc3c50b789 100644
--- a/src/librustc/mir/interpret/pointer.rs
+++ b/src/librustc/mir/interpret/pointer.rs
@@ -78,9 +78,9 @@ pub trait PointerArithmetic: layout::HasDataLayout {
     fn overflowing_signed_offset(&self, val: u64, i: i128) -> (u64, bool) {
         // FIXME: is it possible to over/underflow here?
         if i < 0 {
-            // Trickery to ensure that `i64::min_value()` works fine: compute `n = -i`.
+            // Trickery to ensure that `i64::MIN` works fine: compute `n = -i`.
             // This formula only works for true negative values; it overflows for zero!
-            let n = u64::max_value() - (i as u64) + 1;
+            let n = u64::MAX - (i as u64) + 1;
             let res = val.overflowing_sub(n);
             self.truncate_to_ptr(res)
         } else {
diff --git a/src/librustc/mir/interpret/queries.rs b/src/librustc/mir/interpret/queries.rs
index ed57f81e78..46bf1d9695 100644
--- a/src/librustc/mir/interpret/queries.rs
+++ b/src/librustc/mir/interpret/queries.rs
@@ -13,13 +13,13 @@ impl<'tcx> TyCtxt<'tcx> {
     pub fn const_eval_poly(self, def_id: DefId) -> ConstEvalResult<'tcx> {
         // In some situations def_id will have substitutions within scope, but they aren't allowed
         // to be used. So we can't use `Instance::mono`, instead we feed unresolved substitutions
-        // into `const_eval` which will return `ErrorHandled::ToGeneric` if any og them are
+        // into `const_eval` which will return `ErrorHandled::ToGeneric` if any of them are
         // encountered.
         let substs = InternalSubsts::identity_for_item(self, def_id);
         let instance = ty::Instance::new(def_id, substs);
         let cid = GlobalId { instance, promoted: None };
         let param_env = self.param_env(def_id).with_reveal_all();
-        self.const_eval_validated(param_env.and(cid))
+        self.const_eval_global_id(param_env, cid, None)
     }
 
     /// Resolves and evaluates a constant.
@@ -41,11 +41,8 @@ impl<'tcx> TyCtxt<'tcx> {
     ) -> ConstEvalResult<'tcx> {
         let instance = ty::Instance::resolve(self, param_env, def_id, substs);
         if let Some(instance) = instance {
-            if let Some(promoted) = promoted {
-                self.const_eval_promoted(param_env, instance, promoted)
-            } else {
-                self.const_eval_instance(param_env, instance, span)
-            }
+            let cid = GlobalId { instance, promoted };
+            self.const_eval_global_id(param_env, cid, span)
         } else {
             Err(ErrorHandled::TooGeneric)
         }
@@ -57,22 +54,23 @@ impl<'tcx> TyCtxt<'tcx> {
         instance: ty::Instance<'tcx>,
         span: Option<Span>,
     ) -> ConstEvalResult<'tcx> {
-        let cid = GlobalId { instance, promoted: None };
-        if let Some(span) = span {
-            self.at(span).const_eval_validated(param_env.and(cid))
-        } else {
-            self.const_eval_validated(param_env.and(cid))
-        }
+        self.const_eval_global_id(param_env, GlobalId { instance, promoted: None }, span)
     }
 
-    /// Evaluate a promoted constant.
-    pub fn const_eval_promoted(
+    /// Evaluate a constant.
+    pub fn const_eval_global_id(
         self,
         param_env: ty::ParamEnv<'tcx>,
-        instance: ty::Instance<'tcx>,
-        promoted: mir::Promoted,
+        cid: GlobalId<'tcx>,
+        span: Option<Span>,
     ) -> ConstEvalResult<'tcx> {
-        let cid = GlobalId { instance, promoted: Some(promoted) };
-        self.const_eval_validated(param_env.and(cid))
+        // Const-eval shouldn't depend on lifetimes at all, so we can erase them, which should
+        // improve caching of queries.
+        let inputs = self.erase_regions(&param_env.and(cid));
+        if let Some(span) = span {
+            self.at(span).const_eval_validated(inputs)
+        } else {
+            self.const_eval_validated(inputs)
+        }
     }
 }
diff --git a/src/librustc/mir/interpret/value.rs b/src/librustc/mir/interpret/value.rs
index 2be36ad418..9dc0b24cd2 100644
--- a/src/librustc/mir/interpret/value.rs
+++ b/src/librustc/mir/interpret/value.rs
@@ -7,7 +7,7 @@ use std::fmt;
 
 use crate::ty::{
     layout::{HasDataLayout, Size},
-    Ty,
+    ParamEnv, Ty, TyCtxt,
 };
 
 use super::{sign_extend, truncate, AllocId, Allocation, InterpResult, Pointer, PointerArithmetic};
@@ -66,6 +66,32 @@ impl<'tcx> ConstValue<'tcx> {
             ConstValue::Scalar(val) => Some(val),
         }
     }
+
+    pub fn try_to_bits(&self, size: Size) -> Option<u128> {
+        self.try_to_scalar()?.to_bits(size).ok()
+    }
+
+    pub fn try_to_bits_for_ty(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        param_env: ParamEnv<'tcx>,
+        ty: Ty<'tcx>,
+    ) -> Option<u128> {
+        let size = tcx.layout_of(param_env.with_reveal_all().and(ty)).ok()?.size;
+        self.try_to_bits(size)
+    }
+
+    pub fn from_bool(b: bool) -> Self {
+        ConstValue::Scalar(Scalar::from_bool(b))
+    }
+
+    pub fn from_u64(i: u64) -> Self {
+        ConstValue::Scalar(Scalar::from_u64(i))
+    }
+
+    pub fn from_machine_usize(i: u64, cx: &impl HasDataLayout) -> Self {
+        ConstValue::Scalar(Scalar::from_machine_usize(i, cx))
+    }
 }
 
 /// A `Scalar` represents an immediate, primitive value existing outside of a
@@ -144,6 +170,10 @@ impl<Tag> From<Double> for Scalar<Tag> {
 }
 
 impl Scalar<()> {
+    /// Make sure the `data` fits in `size`.
+    /// This is guaranteed by all constructors here, but since the enum variants are public,
+    /// it could still be violated (even though no code outside this file should
+    /// construct `Scalar`s).
     #[inline(always)]
     fn check_data(data: u128, size: u8) {
         debug_assert_eq!(
@@ -287,6 +317,11 @@ impl<'tcx, Tag> Scalar<Tag> {
         Scalar::Raw { data: i as u128, size: 8 }
     }
 
+    #[inline]
+    pub fn from_machine_usize(i: u64, cx: &impl HasDataLayout) -> Self {
+        Self::from_uint(i, cx.data_layout().pointer_size)
+    }
+
     #[inline]
     pub fn try_from_int(i: impl Into<i128>, size: Size) -> Option<Self> {
         let i = i.into();
@@ -306,6 +341,11 @@ impl<'tcx, Tag> Scalar<Tag> {
             .unwrap_or_else(|| bug!("Signed value {:#x} does not fit in {} bits", i, size.bits()))
     }
 
+    #[inline]
+    pub fn from_machine_isize(i: i64, cx: &impl HasDataLayout) -> Self {
+        Self::from_int(i, cx.data_layout().pointer_size)
+    }
+
     #[inline]
     pub fn from_f32(f: Single) -> Self {
         // We trust apfloat to give us properly truncated data.
@@ -328,10 +368,10 @@ impl<'tcx, Tag> Scalar<Tag> {
         target_size: Size,
         cx: &impl HasDataLayout,
     ) -> Result<u128, Pointer<Tag>> {
+        assert_ne!(target_size.bytes(), 0, "you should never look at the bits of a ZST");
         match self {
             Scalar::Raw { data, size } => {
                 assert_eq!(target_size.bytes(), size as u64);
-                assert_ne!(size, 0, "you should never look at the bits of a ZST");
                 Scalar::check_data(data, size);
                 Ok(data)
             }
@@ -342,19 +382,15 @@ impl<'tcx, Tag> Scalar<Tag> {
         }
     }
 
-    #[inline(always)]
-    pub fn check_raw(data: u128, size: u8, target_size: Size) {
-        assert_eq!(target_size.bytes(), size as u64);
-        assert_ne!(size, 0, "you should never look at the bits of a ZST");
-        Scalar::check_data(data, size);
-    }
-
-    /// Do not call this method!  Use either `assert_bits` or `force_bits`.
+    /// This method is intentionally private!
+    /// It is just a helper for other methods in this file.
     #[inline]
-    pub fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> {
+    fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> {
+        assert_ne!(target_size.bytes(), 0, "you should never look at the bits of a ZST");
         match self {
             Scalar::Raw { data, size } => {
-                Self::check_raw(data, size, target_size);
+                assert_eq!(target_size.bytes(), size as u64);
+                Scalar::check_data(data, size);
                 Ok(data)
             }
             Scalar::Ptr(_) => throw_unsup!(ReadPointerAsBytes),
@@ -366,22 +402,14 @@ impl<'tcx, Tag> Scalar<Tag> {
         self.to_bits(target_size).expect("expected Raw bits but got a Pointer")
     }
 
-    /// Do not call this method!  Use either `assert_ptr` or `force_ptr`.
-    /// This method is intentionally private, do not make it public.
     #[inline]
-    fn to_ptr(self) -> InterpResult<'tcx, Pointer<Tag>> {
+    pub fn assert_ptr(self) -> Pointer<Tag> {
         match self {
-            Scalar::Raw { data: 0, .. } => throw_unsup!(InvalidNullPointerUsage),
-            Scalar::Raw { .. } => throw_unsup!(ReadBytesAsPointer),
-            Scalar::Ptr(p) => Ok(p),
+            Scalar::Ptr(p) => p,
+            Scalar::Raw { .. } => bug!("expected a Pointer but got Raw bits"),
         }
     }
 
-    #[inline(always)]
-    pub fn assert_ptr(self) -> Pointer<Tag> {
-        self.to_ptr().expect("expected a Pointer but got Raw bits")
-    }
-
     /// Do not call this method!  Dispatch based on the type instead.
     #[inline]
     pub fn is_bits(self) -> bool {
@@ -559,12 +587,6 @@ impl<'tcx, Tag> ScalarMaybeUndef<Tag> {
         }
     }
 
-    /// Do not call this method!  Use either `assert_bits` or `force_bits`.
-    #[inline(always)]
-    pub fn to_bits(self, target_size: Size) -> InterpResult<'tcx, u128> {
-        self.not_undef()?.to_bits(target_size)
-    }
-
     #[inline(always)]
     pub fn to_bool(self) -> InterpResult<'tcx, bool> {
         self.not_undef()?.to_bool()
@@ -590,6 +612,11 @@ impl<'tcx, Tag> ScalarMaybeUndef<Tag> {
         self.not_undef()?.to_u8()
     }
 
+    #[inline(always)]
+    pub fn to_u16(self) -> InterpResult<'tcx, u16> {
+        self.not_undef()?.to_u16()
+    }
+
     #[inline(always)]
     pub fn to_u32(self) -> InterpResult<'tcx, u32> {
         self.not_undef()?.to_u32()
@@ -610,6 +637,11 @@ impl<'tcx, Tag> ScalarMaybeUndef<Tag> {
         self.not_undef()?.to_i8()
     }
 
+    #[inline(always)]
+    pub fn to_i16(self) -> InterpResult<'tcx, i16> {
+        self.not_undef()?.to_i16()
+    }
+
     #[inline(always)]
     pub fn to_i32(self) -> InterpResult<'tcx, i32> {
         self.not_undef()?.to_i32()
diff --git a/src/librustc/mir/mod.rs b/src/librustc/mir/mod.rs
index c9a89aae86..b2413f5a2c 100644
--- a/src/librustc/mir/mod.rs
+++ b/src/librustc/mir/mod.rs
@@ -2,7 +2,7 @@
 //!
 //! [rustc guide]: https://rust-lang.github.io/rustc-guide/mir/index.html
 
-use crate::mir::interpret::{GlobalAlloc, PanicInfo, Scalar};
+use crate::mir::interpret::{GlobalAlloc, Scalar};
 use crate::mir::visit::MirVisitable;
 use crate::ty::adjustment::PointerCast;
 use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
@@ -18,6 +18,8 @@ use rustc_hir::def_id::DefId;
 use rustc_hir::{self, GeneratorKind};
 
 use polonius_engine::Atom;
+pub use rustc_ast::ast::Mutability;
+use rustc_ast::ast::Name;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::graph::dominators::Dominators;
 use rustc_data_structures::graph::{self, GraphSuccessors};
@@ -32,11 +34,8 @@ use std::fmt::{self, Debug, Display, Formatter, Write};
 use std::ops::Index;
 use std::slice;
 use std::{iter, mem, option, u32};
-pub use syntax::ast::Mutability;
-use syntax::ast::Name;
 
 pub use self::cache::{BodyAndCache, ReadOnlyBodyAndCache};
-pub use self::interpret::AssertMessage;
 pub use self::query::*;
 pub use crate::read_only;
 
@@ -190,7 +189,7 @@ impl<'tcx> Body<'tcx> {
     ) -> Self {
         // We need `arg_count` locals, and one for the return place.
         assert!(
-            local_decls.len() >= arg_count + 1,
+            local_decls.len() > arg_count,
             "expected at least {} locals, got {}",
             arg_count + 1,
             local_decls.len()
@@ -1120,6 +1119,8 @@ pub enum TerminatorKind<'tcx> {
         value: Operand<'tcx>,
         /// Where to resume to.
         resume: BasicBlock,
+        /// The place to store the resume argument in.
+        resume_arg: Place<'tcx>,
         /// Cleanup to be done if the generator is dropped at this suspend point.
         drop: Option<BasicBlock>,
     },
@@ -1152,6 +1153,21 @@ pub enum TerminatorKind<'tcx> {
     },
 }
 
+/// Information about an assertion failure.
+#[derive(Clone, RustcEncodable, RustcDecodable, HashStable, PartialEq)]
+pub enum AssertKind<O> {
+    BoundsCheck { len: O, index: O },
+    Overflow(BinOp),
+    OverflowNeg,
+    DivisionByZero,
+    RemainderByZero,
+    ResumedAfterReturn(GeneratorKind),
+    ResumedAfterPanic(GeneratorKind),
+}
+
+/// Type for MIR `Assert` terminator error messages.
+pub type AssertMessage<'tcx> = AssertKind<Operand<'tcx>>;
+
 pub type Successors<'a> =
     iter::Chain<option::IntoIter<&'a BasicBlock>, slice::Iter<'a, BasicBlock>>;
 pub type SuccessorsMut<'a> =
@@ -1182,7 +1198,7 @@ impl<'tcx> TerminatorKind<'tcx> {
         t: BasicBlock,
         f: BasicBlock,
     ) -> TerminatorKind<'tcx> {
-        static BOOL_SWITCH_FALSE: &'static [u128] = &[0];
+        static BOOL_SWITCH_FALSE: &[u128] = &[0];
         TerminatorKind::SwitchInt {
             discr: cond,
             switch_ty: tcx.types.bool,
@@ -1381,6 +1397,45 @@ impl<'tcx> BasicBlockData<'tcx> {
     }
 }
 
+impl<O> AssertKind<O> {
+    /// Getting a description does not require `O` to be printable, and does not
+    /// require allocation.
+    /// The caller is expected to handle `BoundsCheck` separately.
+    pub fn description(&self) -> &'static str {
+        use AssertKind::*;
+        match self {
+            Overflow(BinOp::Add) => "attempt to add with overflow",
+            Overflow(BinOp::Sub) => "attempt to subtract with overflow",
+            Overflow(BinOp::Mul) => "attempt to multiply with overflow",
+            Overflow(BinOp::Div) => "attempt to divide with overflow",
+            Overflow(BinOp::Rem) => "attempt to calculate the remainder with overflow",
+            OverflowNeg => "attempt to negate with overflow",
+            Overflow(BinOp::Shr) => "attempt to shift right with overflow",
+            Overflow(BinOp::Shl) => "attempt to shift left with overflow",
+            Overflow(op) => bug!("{:?} cannot overflow", op),
+            DivisionByZero => "attempt to divide by zero",
+            RemainderByZero => "attempt to calculate the remainder with a divisor of zero",
+            ResumedAfterReturn(GeneratorKind::Gen) => "generator resumed after completion",
+            ResumedAfterReturn(GeneratorKind::Async(_)) => "`async fn` resumed after completion",
+            ResumedAfterPanic(GeneratorKind::Gen) => "generator resumed after panicking",
+            ResumedAfterPanic(GeneratorKind::Async(_)) => "`async fn` resumed after panicking",
+            BoundsCheck { .. } => bug!("Unexpected AssertKind"),
+        }
+    }
+}
+
+impl<O: fmt::Debug> fmt::Debug for AssertKind<O> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use AssertKind::*;
+        match self {
+            BoundsCheck { ref len, ref index } => {
+                write!(f, "index out of bounds: the len is {:?} but the index is {:?}", len, index)
+            }
+            _ => write!(f, "{}", self.description()),
+        }
+    }
+}
+
 impl<'tcx> Debug for TerminatorKind<'tcx> {
     fn fmt(&self, fmt: &mut Formatter<'_>) -> fmt::Result {
         self.fmt_head(fmt)?;
@@ -1391,7 +1446,7 @@ impl<'tcx> Debug for TerminatorKind<'tcx> {
         match successor_count {
             0 => Ok(()),
 
-            1 => write!(fmt, " -> {:?}", self.successors().nth(0).unwrap()),
+            1 => write!(fmt, " -> {:?}", self.successors().next().unwrap()),
 
             _ => {
                 write!(fmt, " -> [")?;
@@ -1413,21 +1468,21 @@ impl<'tcx> TerminatorKind<'tcx> {
     /// successors, which may be rendered differently between the text and the graphviz format.
     pub fn fmt_head<W: Write>(&self, fmt: &mut W) -> fmt::Result {
         use self::TerminatorKind::*;
-        match *self {
+        match self {
             Goto { .. } => write!(fmt, "goto"),
-            SwitchInt { discr: ref place, .. } => write!(fmt, "switchInt({:?})", place),
+            SwitchInt { discr, .. } => write!(fmt, "switchInt({:?})", discr),
             Return => write!(fmt, "return"),
             GeneratorDrop => write!(fmt, "generator_drop"),
             Resume => write!(fmt, "resume"),
             Abort => write!(fmt, "abort"),
-            Yield { ref value, .. } => write!(fmt, "_1 = suspend({:?})", value),
+            Yield { value, resume_arg, .. } => write!(fmt, "{:?} = yield({:?})", resume_arg, value),
             Unreachable => write!(fmt, "unreachable"),
-            Drop { ref location, .. } => write!(fmt, "drop({:?})", location),
-            DropAndReplace { ref location, ref value, .. } => {
+            Drop { location, .. } => write!(fmt, "drop({:?})", location),
+            DropAndReplace { location, value, .. } => {
                 write!(fmt, "replace({:?} <- {:?})", location, value)
             }
-            Call { ref func, ref args, ref destination, .. } => {
-                if let Some((ref destination, _)) = *destination {
+            Call { func, args, destination, .. } => {
+                if let Some((destination, _)) = destination {
                     write!(fmt, "{:?} = ", destination)?;
                 }
                 write!(fmt, "{:?}(", func)?;
@@ -1439,7 +1494,7 @@ impl<'tcx> TerminatorKind<'tcx> {
                 }
                 write!(fmt, ")")
             }
-            Assert { ref cond, expected, ref msg, .. } => {
+            Assert { cond, expected, msg, .. } => {
                 write!(fmt, "assert(")?;
                 if !expected {
                     write!(fmt, "!")?;
@@ -1464,7 +1519,7 @@ impl<'tcx> TerminatorKind<'tcx> {
                 values
                     .iter()
                     .map(|&u| {
-                        ty::Const::from_scalar(tcx, Scalar::from_uint(u, size).into(), switch_ty)
+                        ty::Const::from_scalar(tcx, Scalar::from_uint(u, size), switch_ty)
                             .to_string()
                             .into()
                     })
@@ -1772,9 +1827,9 @@ rustc_index::newtype_index! {
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct PlaceRef<'a, 'tcx> {
-    pub local: &'a Local,
-    pub projection: &'a [PlaceElem<'tcx>],
+pub struct PlaceRef<'tcx> {
+    pub local: Local,
+    pub projection: &'tcx [PlaceElem<'tcx>],
 }
 
 impl<'tcx> Place<'tcx> {
@@ -1797,8 +1852,8 @@ impl<'tcx> Place<'tcx> {
     // FIXME: can we safely swap the semantics of `fn base_local` below in here instead?
     pub fn local_or_deref_local(&self) -> Option<Local> {
         match self.as_ref() {
-            PlaceRef { local, projection: &[] }
-            | PlaceRef { local, projection: &[ProjectionElem::Deref] } => Some(*local),
+            PlaceRef { local, projection: [] }
+            | PlaceRef { local, projection: [ProjectionElem::Deref] } => Some(local),
             _ => None,
         }
     }
@@ -1809,8 +1864,8 @@ impl<'tcx> Place<'tcx> {
         self.as_ref().as_local()
     }
 
-    pub fn as_ref(&self) -> PlaceRef<'_, 'tcx> {
-        PlaceRef { local: &self.local, projection: &self.projection }
+    pub fn as_ref(&self) -> PlaceRef<'tcx> {
+        PlaceRef { local: self.local, projection: &self.projection }
     }
 }
 
@@ -1820,15 +1875,15 @@ impl From<Local> for Place<'_> {
     }
 }
 
-impl<'a, 'tcx> PlaceRef<'a, 'tcx> {
+impl<'tcx> PlaceRef<'tcx> {
     /// Finds the innermost `Local` from this `Place`, *if* it is either a local itself or
     /// a single deref of a local.
     //
     // FIXME: can we safely swap the semantics of `fn base_local` below in here instead?
     pub fn local_or_deref_local(&self) -> Option<Local> {
-        match self {
+        match *self {
             PlaceRef { local, projection: [] }
-            | PlaceRef { local, projection: [ProjectionElem::Deref] } => Some(**local),
+            | PlaceRef { local, projection: [ProjectionElem::Deref] } => Some(local),
             _ => None,
         }
     }
@@ -1836,8 +1891,8 @@ impl<'a, 'tcx> PlaceRef<'a, 'tcx> {
     /// If this place represents a local variable like `_X` with no
     /// projections, return `Some(_X)`.
     pub fn as_local(&self) -> Option<Local> {
-        match self {
-            PlaceRef { local, projection: [] } => Some(**local),
+        match *self {
+            PlaceRef { local, projection: [] } => Some(local),
             _ => None,
         }
     }
@@ -1991,6 +2046,15 @@ impl<'tcx> Operand<'tcx> {
             Operand::Move(place) => Operand::Copy(place),
         }
     }
+
+    /// Returns the `Place` that is the target of this `Operand`, or `None` if this `Operand` is a
+    /// constant.
+    pub fn place(&self) -> Option<&Place<'tcx>> {
+        match self {
+            Operand::Copy(place) | Operand::Move(place) => Some(place),
+            Operand::Constant(_) => None,
+        }
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -2155,7 +2219,7 @@ impl<'tcx> Debug for Rvalue<'tcx> {
                 });
                 let region = if print_region {
                     let mut region = region.to_string();
-                    if region.len() > 0 {
+                    if !region.is_empty() {
                         region.push(' ');
                     }
                     region
@@ -2645,9 +2709,12 @@ impl<'tcx> TypeFoldable<'tcx> for Terminator<'tcx> {
                 target,
                 unwind,
             },
-            Yield { ref value, resume, drop } => {
-                Yield { value: value.fold_with(folder), resume: resume, drop: drop }
-            }
+            Yield { ref value, resume, ref resume_arg, drop } => Yield {
+                value: value.fold_with(folder),
+                resume,
+                resume_arg: resume_arg.fold_with(folder),
+                drop,
+            },
             Call { ref func, ref args, ref destination, cleanup, from_hir_call } => {
                 let dest =
                     destination.as_ref().map(|&(ref loc, dest)| (loc.fold_with(folder), dest));
@@ -2661,13 +2728,12 @@ impl<'tcx> TypeFoldable<'tcx> for Terminator<'tcx> {
                 }
             }
             Assert { ref cond, expected, ref msg, target, cleanup } => {
-                use PanicInfo::*;
+                use AssertKind::*;
                 let msg = match msg {
                     BoundsCheck { ref len, ref index } => {
                         BoundsCheck { len: len.fold_with(folder), index: index.fold_with(folder) }
                     }
-                    Panic { .. }
-                    | Overflow(_)
+                    Overflow(_)
                     | OverflowNeg
                     | DivisionByZero
                     | RemainderByZero
@@ -2711,13 +2777,12 @@ impl<'tcx> TypeFoldable<'tcx> for Terminator<'tcx> {
             }
             Assert { ref cond, ref msg, .. } => {
                 if cond.visit_with(visitor) {
-                    use PanicInfo::*;
+                    use AssertKind::*;
                     match msg {
                         BoundsCheck { ref len, ref index } => {
                             len.visit_with(visitor) || index.visit_with(visitor)
                         }
-                        Panic { .. }
-                        | Overflow(_)
+                        Overflow(_)
                         | OverflowNeg
                         | DivisionByZero
                         | RemainderByZero
diff --git a/src/librustc/mir/mono.rs b/src/librustc/mir/mono.rs
index d197326646..4f8efc1607 100644
--- a/src/librustc/mir/mono.rs
+++ b/src/librustc/mir/mono.rs
@@ -3,6 +3,7 @@ use crate::ich::{Fingerprint, NodeIdHashingMode, StableHashingContext};
 use crate::session::config::OptLevel;
 use crate::ty::print::obsolete::DefPathBasedNames;
 use crate::ty::{subst::InternalSubsts, Instance, InstanceDef, SymbolName, TyCtxt};
+use rustc_attr::InlineAttr;
 use rustc_data_structures::base_n;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
@@ -12,7 +13,6 @@ use rustc_span::source_map::Span;
 use rustc_span::symbol::Symbol;
 use std::fmt;
 use std::hash::Hash;
-use syntax::attr::InlineAttr;
 
 /// Describes how a monomorphization will be instantiated in object files.
 #[derive(PartialEq)]
@@ -258,7 +258,7 @@ pub enum Visibility {
 
 impl<'tcx> CodegenUnit<'tcx> {
     pub fn new(name: Symbol) -> CodegenUnit<'tcx> {
-        CodegenUnit { name: name, items: Default::default(), size_estimate: None }
+        CodegenUnit { name, items: Default::default(), size_estimate: None }
     }
 
     pub fn name(&self) -> Symbol {
@@ -362,7 +362,7 @@ impl<'tcx> CodegenUnit<'tcx> {
     }
 
     pub fn codegen_dep_node(&self, tcx: TyCtxt<'tcx>) -> DepNode {
-        DepNode::new(tcx, DepConstructor::CompileCodegenUnit(self.name()))
+        DepConstructor::CompileCodegenUnit(tcx, self.name())
     }
 }
 
diff --git a/src/librustc/mir/query.rs b/src/librustc/mir/query.rs
index 34f58ab89b..824cdfe55b 100644
--- a/src/librustc/mir/query.rs
+++ b/src/librustc/mir/query.rs
@@ -1,8 +1,10 @@
 //! Values computed by queries that use MIR.
 
 use crate::ty::{self, Ty};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::Lrc;
 use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
 use rustc_index::bit_set::BitMatrix;
 use rustc_index::vec::IndexVec;
 use rustc_span::{Span, Symbol};
@@ -59,8 +61,12 @@ pub struct GeneratorLayout<'tcx> {
     pub storage_conflicts: BitMatrix<GeneratorSavedLocal, GeneratorSavedLocal>,
 }
 
-#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
+#[derive(Debug, RustcEncodable, RustcDecodable, HashStable)]
 pub struct BorrowCheckResult<'tcx> {
+    /// All the opaque types that are restricted to concrete types
+    /// by this function. Unlike the value in `TypeckTables`, this has
+    /// unerased regions.
+    pub concrete_opaque_types: FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>>,
     pub closure_requirements: Option<ClosureRegionRequirements<'tcx>>,
     pub used_mut_upvars: SmallVec<[Field; 8]>,
 }
diff --git a/src/librustc/mir/tcx.rs b/src/librustc/mir/tcx.rs
index e2aac562cc..13996a74ac 100644
--- a/src/librustc/mir/tcx.rs
+++ b/src/librustc/mir/tcx.rs
@@ -114,7 +114,7 @@ impl<'tcx> PlaceTy<'tcx> {
 
 impl<'tcx> Place<'tcx> {
     pub fn ty_from<D>(
-        local: &Local,
+        local: Local,
         projection: &[PlaceElem<'tcx>],
         local_decls: &D,
         tcx: TyCtxt<'tcx>,
@@ -124,7 +124,7 @@ impl<'tcx> Place<'tcx> {
     {
         projection
             .iter()
-            .fold(PlaceTy::from_ty(local_decls.local_decls()[*local].ty), |place_ty, elem| {
+            .fold(PlaceTy::from_ty(local_decls.local_decls()[local].ty), |place_ty, elem| {
                 place_ty.projection_ty(tcx, elem)
             })
     }
@@ -133,7 +133,7 @@ impl<'tcx> Place<'tcx> {
     where
         D: HasLocalDecls<'tcx>,
     {
-        Place::ty_from(&self.local, &self.projection, local_decls, tcx)
+        Place::ty_from(self.local, &self.projection, local_decls, tcx)
     }
 }
 
@@ -156,7 +156,7 @@ impl<'tcx> Rvalue<'tcx> {
             }
             Rvalue::AddressOf(mutability, ref place) => {
                 let place_ty = place.ty(local_decls, tcx).ty;
-                tcx.mk_ptr(ty::TypeAndMut { ty: place_ty, mutbl: mutability.into() })
+                tcx.mk_ptr(ty::TypeAndMut { ty: place_ty, mutbl: mutability })
             }
             Rvalue::Len(..) => tcx.types.usize,
             Rvalue::Cast(.., ty) => ty,
diff --git a/src/librustc/mir/traversal.rs b/src/librustc/mir/traversal.rs
index a89811ed43..ed8129b1e0 100644
--- a/src/librustc/mir/traversal.rs
+++ b/src/librustc/mir/traversal.rs
@@ -4,7 +4,7 @@ use super::*;
 
 /// Preorder traversal of a graph.
 ///
-/// Preorder traversal is when each node is visited before an of it's
+/// Preorder traversal is when each node is visited before any of its
 /// successors
 ///
 /// ```text
@@ -82,7 +82,7 @@ impl<'a, 'tcx> Iterator for Preorder<'a, 'tcx> {
 
 /// Postorder traversal of a graph.
 ///
-/// Postorder traversal is when each node is visited after all of it's
+/// Postorder traversal is when each node is visited after all of its
 /// successors, except when the successor is only reachable by a back-edge
 ///
 ///
diff --git a/src/librustc/mir/visit.rs b/src/librustc/mir/visit.rs
index 4c5db1b07d..2aca6f684f 100644
--- a/src/librustc/mir/visit.rs
+++ b/src/librustc/mir/visit.rs
@@ -516,9 +516,15 @@ macro_rules! make_mir_visitor {
                     TerminatorKind::Yield {
                         value,
                         resume: _,
+                        resume_arg,
                         drop: _,
                     } => {
                         self.visit_operand(value, source_location);
+                        self.visit_place(
+                            resume_arg,
+                            PlaceContext::MutatingUse(MutatingUseContext::Store),
+                            source_location,
+                        );
                     }
 
                 }
@@ -527,13 +533,13 @@ macro_rules! make_mir_visitor {
             fn super_assert_message(&mut self,
                                     msg: & $($mutability)? AssertMessage<'tcx>,
                                     location: Location) {
-                use crate::mir::interpret::PanicInfo::*;
+                use crate::mir::AssertKind::*;
                 match msg {
                     BoundsCheck { len, index } => {
                         self.visit_operand(len, location);
                         self.visit_operand(index, location);
                     }
-                    Panic { .. } | Overflow(_) | OverflowNeg | DivisionByZero | RemainderByZero |
+                    Overflow(_) | OverflowNeg | DivisionByZero | RemainderByZero |
                     ResumedAfterReturn(_) | ResumedAfterPanic(_) => {
                         // Nothing to visit
                     }
@@ -882,7 +888,7 @@ macro_rules! visit_place_fns {
     () => (
         fn visit_projection(
             &mut self,
-            local: &Local,
+            local: Local,
             projection: &[PlaceElem<'tcx>],
             context: PlaceContext,
             location: Location,
@@ -892,7 +898,7 @@ macro_rules! visit_place_fns {
 
         fn visit_projection_elem(
             &mut self,
-            local: &Local,
+            local: Local,
             proj_base: &[PlaceElem<'tcx>],
             elem: &PlaceElem<'tcx>,
             context: PlaceContext,
@@ -919,7 +925,7 @@ macro_rules! visit_place_fns {
 
             self.visit_place_base(&place.local, context, location);
 
-            self.visit_projection(&place.local,
+            self.visit_projection(place.local,
                                   &place.projection,
                                   context,
                                   location);
@@ -927,7 +933,7 @@ macro_rules! visit_place_fns {
 
         fn super_projection(
             &mut self,
-            local: &Local,
+            local: Local,
             projection: &[PlaceElem<'tcx>],
             context: PlaceContext,
             location: Location,
@@ -941,7 +947,7 @@ macro_rules! visit_place_fns {
 
         fn super_projection_elem(
             &mut self,
-            _local: &Local,
+            _local: Local,
             _proj_base: &[PlaceElem<'tcx>],
             elem: &PlaceElem<'tcx>,
             _context: PlaceContext,
diff --git a/src/librustc/query/mod.rs b/src/librustc/query/mod.rs
index 37d5e23535..11e9acf3a3 100644
--- a/src/librustc/query/mod.rs
+++ b/src/librustc/query/mod.rs
@@ -1,4 +1,4 @@
-use crate::dep_graph::{DepKind, DepNode, RecoverKey, SerializedDepNodeIndex};
+use crate::dep_graph::SerializedDepNodeIndex;
 use crate::mir;
 use crate::mir::interpret::{GlobalId, LitToConstInput};
 use crate::traits;
@@ -18,7 +18,7 @@ use std::borrow::Cow;
 
 fn describe_as_module(def_id: DefId, tcx: TyCtxt<'_>) -> String {
     if def_id.is_top_level_module() {
-        format!("top-level module")
+        "top-level module".to_string()
     } else {
         format!("module `{}`", tcx.def_path_str(def_id))
     }
@@ -43,11 +43,28 @@ rustc_queries! {
     }
 
     Other {
+        // Represents crate as a whole (as distinct from the top-level crate module).
+        // If you call `hir_crate` (e.g., indirectly by calling `tcx.hir().krate()`),
+        // we will have to assume that any change means that you need to be recompiled.
+        // This is because the `hir_crate` query gives you access to all other items.
+        // To avoid this fate, do not call `tcx.hir().krate()`; instead,
+        // prefer wrappers like `tcx.visit_all_items_in_krate()`.
+        query hir_crate(key: CrateNum) -> &'tcx Crate<'tcx> {
+            eval_always
+            no_hash
+            desc { "get the crate HIR" }
+        }
+
         /// Records the type of every item.
         query type_of(key: DefId) -> Ty<'tcx> {
             cache_on_disk_if { key.is_local() }
         }
 
+        query analysis(key: CrateNum) -> Result<(), ErrorReported> {
+            eval_always
+            desc { "running analysis passes on this crate" }
+        }
+
         /// Maps from the `DefId` of an item (trait/struct/enum/fn) to its
         /// associated generics.
         query generics_of(key: DefId) -> &'tcx ty::Generics {
@@ -86,6 +103,10 @@ rustc_queries! {
             eval_always
             desc { "computing the lint levels for items in this crate" }
         }
+
+        query parent_module_from_def_id(_: DefId) -> DefId {
+            eval_always
+        }
     }
 
     Codegen {
@@ -113,7 +134,9 @@ rustc_queries! {
 
         /// Fetch the MIR for a given `DefId` right after it's built - this includes
         /// unreachable code.
-        query mir_built(_: DefId) -> &'tcx Steal<mir::BodyAndCache<'tcx>> {}
+        query mir_built(_: DefId) -> &'tcx Steal<mir::BodyAndCache<'tcx>> {
+            desc { "building MIR for" }
+        }
 
         /// Fetch the MIR for a given `DefId` up till the point where it is
         /// ready for const evaluation.
@@ -177,7 +200,6 @@ rustc_queries! {
             // queries). Making it anonymous avoids hashing the result, which
             // may save a bit of time.
             anon
-            no_force
             desc { "erasing regions from `{:?}`", ty }
         }
 
@@ -186,7 +208,6 @@ rustc_queries! {
         }
 
         query program_clauses_for_env(_: traits::Environment<'tcx>) -> Clauses<'tcx> {
-            no_force
             desc { "generating chalk-style clauses for environment" }
         }
 
@@ -229,7 +250,6 @@ rustc_queries! {
         /// To avoid cycles within the predicates of a single item we compute
         /// per-type-parameter predicates for resolving `T::AssocTy`.
         query type_param_predicates(key: (DefId, DefId)) -> ty::GenericPredicates<'tcx> {
-            no_force
             desc { |tcx| "computing the bounds for type parameter `{}`", {
                 let id = tcx.hir().as_local_hir_id(key.1).unwrap();
                 tcx.hir().ty_param_name(id)
@@ -265,6 +285,14 @@ rustc_queries! {
             desc { |tcx| "checking if item is const fn: `{}`", tcx.def_path_str(key) }
         }
 
+        /// Returns `true` if this is a const `impl`. **Do not call this function manually.**
+        ///
+        /// This query caches the base data for the `is_const_impl` helper function, which also
+        /// takes into account stability attributes (e.g., `#[rustc_const_unstable]`).
+        query is_const_impl_raw(key: DefId) -> bool {
+            desc { |tcx| "checking if item is const impl: `{}`", tcx.def_path_str(key) }
+        }
+
         query asyncness(key: DefId) -> hir::IsAsync {
             desc { |tcx| "checking if the function is async: `{}`", tcx.def_path_str(key) }
         }
@@ -286,6 +314,9 @@ rustc_queries! {
         /// Returns `Some(mutability)` if the node pointed to by `def_id` is a static item.
         query static_mutability(_: DefId) -> Option<hir::Mutability> {}
 
+        /// Returns `Some(generator_kind)` if the node pointed to by `def_id` is a generator.
+        query generator_kind(_: DefId) -> Option<hir::GeneratorKind> {}
+
         /// Gets a map with the variance of every item; use `item_variance` instead.
         query crate_variances(_: CrateNum) -> &'tcx ty::CrateVariancesMap<'tcx> {
             desc { "computing the variances for items in this crate" }
@@ -310,6 +341,11 @@ rustc_queries! {
         /// Maps from a trait item to the trait item "descriptor".
         query associated_item(_: DefId) -> ty::AssocItem {}
 
+        /// Collects the associated items defined on a trait or impl.
+        query associated_items(key: DefId) -> &'tcx ty::AssociatedItems {
+            desc { |tcx| "collecting associated items of {}", tcx.def_path_str(key) }
+        }
+
         query impl_trait_ref(_: DefId) -> Option<ty::TraitRef<'tcx>> {}
         query impl_polarity(_: DefId) -> ty::ImplPolarity {}
 
@@ -328,6 +364,7 @@ rustc_queries! {
     TypeChecking {
         /// The result of unsafety-checking this `DefId`.
         query unsafety_check_result(key: DefId) -> mir::UnsafetyCheckResult {
+            desc { |tcx| "unsafety-checking `{}`", tcx.def_path_str(key) }
             cache_on_disk_if { key.is_local() }
         }
 
@@ -397,14 +434,8 @@ rustc_queries! {
         }
 
         query typeck_tables_of(key: DefId) -> &'tcx ty::TypeckTables<'tcx> {
+            desc { |tcx| "type-checking `{}`", tcx.def_path_str(key) }
             cache_on_disk_if { key.is_local() }
-            load_cached(tcx, id) {
-                let typeck_tables: Option<ty::TypeckTables<'tcx>> = tcx
-                    .queries.on_disk_cache
-                    .try_load_query_result(tcx, id);
-
-                typeck_tables.map(|tables| &*tcx.arena.alloc(tables))
-            }
         }
         query diagnostic_only_typeck_tables_of(key: DefId) -> &'tcx ty::TypeckTables<'tcx> {
             cache_on_disk_if { key.is_local() }
@@ -435,8 +466,13 @@ rustc_queries! {
     BorrowChecking {
         /// Borrow-checks the function body. If this is a closure, returns
         /// additional requirements that the closure's creator must verify.
-        query mir_borrowck(key: DefId) -> mir::BorrowCheckResult<'tcx> {
-            cache_on_disk_if(tcx, _) { key.is_local() && tcx.is_closure(key) }
+        query mir_borrowck(key: DefId) -> &'tcx mir::BorrowCheckResult<'tcx> {
+            desc { |tcx| "borrow-checking `{}`", tcx.def_path_str(key) }
+            cache_on_disk_if(tcx, opt_result) {
+                key.is_local()
+                    && (tcx.is_closure(key)
+                        || opt_result.map_or(false, |r| !r.concrete_opaque_types.is_empty()))
+            }
         }
     }
 
@@ -469,7 +505,6 @@ rustc_queries! {
         /// form to be used outside of const eval.
         query const_eval_raw(key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>)
             -> ConstEvalRawResult<'tcx> {
-            no_force
             desc { |tcx|
                 "const-evaluating `{}`",
                 tcx.def_path_str(key.value.instance.def.def_id())
@@ -483,10 +518,9 @@ rustc_queries! {
         /// returns a proper constant that is usable by the rest of the compiler.
         ///
         /// **Do not use this** directly, use one of the following wrappers: `tcx.const_eval_poly`,
-        /// `tcx.const_eval_resolve`, `tcx.const_eval_instance`, or `tcx.const_eval_promoted`.
+        /// `tcx.const_eval_resolve`, `tcx.const_eval_instance`, or `tcx.const_eval_global_id`.
         query const_eval_validated(key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>)
             -> ConstEvalResult<'tcx> {
-            no_force
             desc { |tcx|
                 "const-evaluating + checking `{}`",
                 tcx.def_path_str(key.value.instance.def.def_id())
@@ -500,8 +534,7 @@ rustc_queries! {
         /// Extracts a field of a (variant of a) const.
         query const_field(
             key: ty::ParamEnvAnd<'tcx, (&'tcx ty::Const<'tcx>, mir::Field)>
-        ) -> &'tcx ty::Const<'tcx> {
-            no_force
+        ) -> ConstValue<'tcx> {
             desc { "extract field of const" }
         }
 
@@ -510,19 +543,16 @@ rustc_queries! {
         query destructure_const(
             key: ty::ParamEnvAnd<'tcx, &'tcx ty::Const<'tcx>>
         ) -> mir::DestructuredConst<'tcx> {
-            no_force
             desc { "destructure constant" }
         }
 
-        query const_caller_location(key: (rustc_span::Symbol, u32, u32)) -> &'tcx ty::Const<'tcx> {
-            no_force
+        query const_caller_location(key: (rustc_span::Symbol, u32, u32)) -> ConstValue<'tcx> {
             desc { "get a &core::panic::Location referring to a span" }
         }
 
         query lit_to_const(
             key: LitToConstInput<'tcx>
         ) -> Result<&'tcx ty::Const<'tcx>, LitToConstError> {
-            no_force
             desc { "converting literal to const" }
         }
     }
@@ -553,7 +583,6 @@ rustc_queries! {
         query region_scope_tree(_: DefId) -> &'tcx region::ScopeTree {}
 
         query mir_shims(key: ty::InstanceDef<'tcx>) -> &'tcx mir::BodyAndCache<'tcx> {
-            no_force
             desc { |tcx| "generating MIR shim for `{}`", tcx.def_path_str(key.def_id()) }
         }
 
@@ -561,7 +590,6 @@ rustc_queries! {
         /// given instance from the local crate. In particular, it will also
         /// look up the correct symbol name of instances from upstream crates.
         query symbol_name(key: ty::Instance<'tcx>) -> ty::SymbolName {
-            no_force
             desc { "computing the symbol for `{}`", key }
             cache_on_disk_if { true }
         }
@@ -608,7 +636,6 @@ rustc_queries! {
     Other {
         query vtable_methods(key: ty::PolyTraitRef<'tcx>)
                             -> &'tcx [Option<(DefId, SubstsRef<'tcx>)>] {
-            no_force
             desc { |tcx| "finding all methods for trait {}", tcx.def_path_str(key.def_id()) }
         }
     }
@@ -616,8 +643,7 @@ rustc_queries! {
     Codegen {
         query codegen_fulfill_obligation(
             key: (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>)
-        ) -> Vtable<'tcx, ()> {
-            no_force
+        ) -> Option<Vtable<'tcx, ()>> {
             cache_on_disk_if { true }
             desc { |tcx|
                 "checking if `{}` fulfills its obligations",
@@ -630,10 +656,11 @@ rustc_queries! {
         query trait_impls_of(key: DefId) -> &'tcx ty::trait_def::TraitImpls {
             desc { |tcx| "trait impls of `{}`", tcx.def_path_str(key) }
         }
-        query specialization_graph_of(_: DefId) -> &'tcx specialization_graph::Graph {
+        query specialization_graph_of(key: DefId) -> &'tcx specialization_graph::Graph {
+            desc { |tcx| "building specialization graph of trait `{}`", tcx.def_path_str(key) }
             cache_on_disk_if { true }
         }
-        query is_object_safe(key: DefId) -> bool {
+        query object_safety_violations(key: DefId) -> Vec<traits::ObjectSafetyViolation> {
             desc { |tcx| "determine object safety of trait `{}`", tcx.def_path_str(key) }
         }
 
@@ -648,33 +675,31 @@ rustc_queries! {
         /// Trait selection queries. These are best used by invoking `ty.is_copy_modulo_regions()`,
         /// `ty.is_copy()`, etc, since that will prune the environment where possible.
         query is_copy_raw(env: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
-            no_force
             desc { "computing whether `{}` is `Copy`", env.value }
         }
+        /// Query backing `TyS::is_sized`.
         query is_sized_raw(env: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
-            no_force
             desc { "computing whether `{}` is `Sized`", env.value }
         }
+        /// Query backing `TyS::is_freeze`.
         query is_freeze_raw(env: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
-            no_force
             desc { "computing whether `{}` is freeze", env.value }
         }
-
-        // The cycle error here should be reported as an error by `check_representable`.
-        // We consider the type as not needing drop in the meanwhile to avoid
-        // further errors (done in impl Value for NeedsDrop).
-        // Use `cycle_delay_bug` to delay the cycle error here to be emitted later
-        // in case we accidentally otherwise don't emit an error.
-        query needs_drop_raw(env: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> NeedsDrop {
-            cycle_delay_bug
-            no_force
+        /// Query backing `TyS::needs_drop`.
+        query needs_drop_raw(env: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
             desc { "computing whether `{}` needs drop", env.value }
         }
 
+        /// A list of types where the ADT requires drop if and only if any of
+        /// those types require drop. If the ADT is known to always need drop
+        /// then `Err(AlwaysRequiresDrop)` is returned.
+        query adt_drop_tys(_: DefId) -> Result<&'tcx ty::List<Ty<'tcx>>, AlwaysRequiresDrop> {
+            cache_on_disk_if { true }
+        }
+
         query layout_raw(
             env: ty::ParamEnvAnd<'tcx, Ty<'tcx>>
         ) -> Result<&'tcx ty::layout::LayoutDetails, ty::layout::LayoutError<'tcx>> {
-            no_force
             desc { "computing layout of `{}`", env.value }
         }
     }
@@ -730,7 +755,6 @@ rustc_queries! {
 
     TypeChecking {
         query specializes(_: (DefId, DefId)) -> bool {
-            no_force
             desc { "computing whether impls specialize one another" }
         }
         query in_scope_traits_map(_: DefIndex)
@@ -815,7 +839,6 @@ rustc_queries! {
         ///       (like `Clone::clone` for example).
         query upstream_drop_glue_for(substs: SubstsRef<'tcx>) -> Option<CrateNum> {
             desc { "available upstream drop-glue for `{:?}`", substs }
-            no_force
         }
     }
 
@@ -860,7 +883,6 @@ rustc_queries! {
     TypeChecking {
         query implementations_of_trait(_: (CrateNum, DefId))
             -> &'tcx [DefId] {
-            no_force
             desc { "looking up implementations of a trait in a crate" }
         }
         query all_trait_implementations(_: CrateNum)
@@ -1027,7 +1049,6 @@ rustc_queries! {
         }
         query is_codegened_item(_: DefId) -> bool {}
         query codegen_unit(_: Symbol) -> Arc<CodegenUnit<'tcx>> {
-            no_force
             desc { "codegen_unit" }
         }
         query backend_optimization_level(_: CrateNum) -> OptLevel {
@@ -1050,7 +1071,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, NormalizationResult<'tcx>>>,
             NoSolution,
         > {
-            no_force
             desc { "normalizing `{:?}`", goal }
         }
 
@@ -1058,7 +1078,6 @@ rustc_queries! {
         query normalize_ty_after_erasing_regions(
             goal: ParamEnvAnd<'tcx, Ty<'tcx>>
         ) -> Ty<'tcx> {
-            no_force
             desc { "normalizing `{:?}`", goal }
         }
 
@@ -1068,7 +1087,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, Vec<OutlivesBound<'tcx>>>>,
             NoSolution,
         > {
-            no_force
             desc { "computing implied outlives bounds for `{:?}`", goal }
         }
 
@@ -1079,7 +1097,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, DropckOutlivesResult<'tcx>>>,
             NoSolution,
         > {
-            no_force
             desc { "computing dropck types for `{:?}`", goal }
         }
 
@@ -1088,20 +1105,9 @@ rustc_queries! {
         query evaluate_obligation(
             goal: CanonicalPredicateGoal<'tcx>
         ) -> Result<traits::EvaluationResult, traits::OverflowError> {
-            no_force
             desc { "evaluating trait selection obligation `{}`", goal.value.value }
         }
 
-        query evaluate_goal(
-            goal: traits::ChalkCanonicalGoal<'tcx>
-        ) -> Result<
-            &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
-            NoSolution
-        > {
-            no_force
-            desc { "evaluating trait selection obligation `{}`", goal.value.goal }
-        }
-
         /// Do not call this query directly: part of the `Eq` type-op
         query type_op_ascribe_user_type(
             goal: CanonicalTypeOpAscribeUserTypeGoal<'tcx>
@@ -1109,7 +1115,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
             NoSolution,
         > {
-            no_force
             desc { "evaluating `type_op_ascribe_user_type` `{:?}`", goal }
         }
 
@@ -1120,7 +1125,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
             NoSolution,
         > {
-            no_force
             desc { "evaluating `type_op_eq` `{:?}`", goal }
         }
 
@@ -1131,7 +1135,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
             NoSolution,
         > {
-            no_force
             desc { "evaluating `type_op_subtype` `{:?}`", goal }
         }
 
@@ -1142,7 +1145,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ()>>,
             NoSolution,
         > {
-            no_force
             desc { "evaluating `type_op_prove_predicate` `{:?}`", goal }
         }
 
@@ -1153,7 +1155,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, Ty<'tcx>>>,
             NoSolution,
         > {
-            no_force
             desc { "normalizing `{:?}`", goal }
         }
 
@@ -1164,7 +1165,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ty::Predicate<'tcx>>>,
             NoSolution,
         > {
-            no_force
             desc { "normalizing `{:?}`", goal }
         }
 
@@ -1175,7 +1175,6 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ty::PolyFnSig<'tcx>>>,
             NoSolution,
         > {
-            no_force
             desc { "normalizing `{:?}`", goal }
         }
 
@@ -1186,12 +1185,10 @@ rustc_queries! {
             &'tcx Canonical<'tcx, canonical::QueryResponse<'tcx, ty::FnSig<'tcx>>>,
             NoSolution,
         > {
-            no_force
             desc { "normalizing `{:?}`", goal }
         }
 
         query substitute_normalize_and_test_predicates(key: (DefId, SubstsRef<'tcx>)) -> bool {
-            no_force
             desc { |tcx|
                 "testing substituted normalized predicates:`{}`",
                 tcx.def_path_str(key.0)
@@ -1201,7 +1198,6 @@ rustc_queries! {
         query method_autoderef_steps(
             goal: CanonicalTyGoal<'tcx>
         ) -> MethodAutoderefStepsResult<'tcx> {
-            no_force
             desc { "computing autoderef types for `{:?}`", goal }
         }
     }
@@ -1215,7 +1211,6 @@ rustc_queries! {
         // Get an estimate of the size of an InstanceDef based on its MIR for CGU partitioning.
         query instance_def_size_estimate(def: ty::InstanceDef<'tcx>)
             -> usize {
-            no_force
             desc { |tcx| "estimating size for `{}`", tcx.def_path_str(def.def_id()) }
         }
 
diff --git a/src/librustc/traits/chalk_fulfill.rs b/src/librustc/traits/chalk_fulfill.rs
deleted file mode 100644
index a765e55d99..0000000000
--- a/src/librustc/traits/chalk_fulfill.rs
+++ /dev/null
@@ -1,159 +0,0 @@
-use crate::infer::canonical::{Canonical, OriginalQueryValues};
-use crate::infer::InferCtxt;
-use crate::traits::query::NoSolution;
-use crate::traits::{
-    Environment, FulfillmentError, FulfillmentErrorCode, InEnvironment, ObligationCause,
-    PredicateObligation, SelectionError, TraitEngine,
-};
-use crate::ty::{self, Ty};
-use rustc_data_structures::fx::FxHashSet;
-
-pub type CanonicalGoal<'tcx> = Canonical<'tcx, InEnvironment<'tcx, ty::Predicate<'tcx>>>;
-
-pub struct FulfillmentContext<'tcx> {
-    obligations: FxHashSet<InEnvironment<'tcx, PredicateObligation<'tcx>>>,
-}
-
-impl FulfillmentContext<'tcx> {
-    crate fn new() -> Self {
-        FulfillmentContext { obligations: FxHashSet::default() }
-    }
-}
-
-fn in_environment(
-    infcx: &InferCtxt<'_, 'tcx>,
-    obligation: PredicateObligation<'tcx>,
-) -> InEnvironment<'tcx, PredicateObligation<'tcx>> {
-    assert!(!infcx.is_in_snapshot());
-    let obligation = infcx.resolve_vars_if_possible(&obligation);
-
-    let environment = match obligation.param_env.def_id {
-        Some(def_id) => infcx.tcx.environment(def_id),
-        None if obligation.param_env.caller_bounds.is_empty() => {
-            Environment { clauses: ty::List::empty() }
-        }
-        _ => bug!("non-empty `ParamEnv` with no def-id"),
-    };
-
-    InEnvironment { environment, goal: obligation }
-}
-
-impl TraitEngine<'tcx> for FulfillmentContext<'tcx> {
-    fn normalize_projection_type(
-        &mut self,
-        infcx: &InferCtxt<'_, 'tcx>,
-        _param_env: ty::ParamEnv<'tcx>,
-        projection_ty: ty::ProjectionTy<'tcx>,
-        _cause: ObligationCause<'tcx>,
-    ) -> Ty<'tcx> {
-        infcx.tcx.mk_ty(ty::Projection(projection_ty))
-    }
-
-    fn register_predicate_obligation(
-        &mut self,
-        infcx: &InferCtxt<'_, 'tcx>,
-        obligation: PredicateObligation<'tcx>,
-    ) {
-        self.obligations.insert(in_environment(infcx, obligation));
-    }
-
-    fn select_all_or_error(
-        &mut self,
-        infcx: &InferCtxt<'_, 'tcx>,
-    ) -> Result<(), Vec<FulfillmentError<'tcx>>> {
-        self.select_where_possible(infcx)?;
-
-        if self.obligations.is_empty() {
-            Ok(())
-        } else {
-            let errors = self
-                .obligations
-                .iter()
-                .map(|obligation| FulfillmentError {
-                    obligation: obligation.goal.clone(),
-                    code: FulfillmentErrorCode::CodeAmbiguity,
-                    points_at_arg_span: false,
-                })
-                .collect();
-            Err(errors)
-        }
-    }
-
-    fn select_where_possible(
-        &mut self,
-        infcx: &InferCtxt<'_, 'tcx>,
-    ) -> Result<(), Vec<FulfillmentError<'tcx>>> {
-        let mut errors = Vec::new();
-        let mut next_round = FxHashSet::default();
-        let mut making_progress;
-
-        loop {
-            making_progress = false;
-
-            // We iterate over all obligations, and record if we are able
-            // to unambiguously prove at least one obligation.
-            for obligation in self.obligations.drain() {
-                let mut orig_values = OriginalQueryValues::default();
-                let canonical_goal = infcx.canonicalize_query(
-                    &InEnvironment {
-                        environment: obligation.environment,
-                        goal: obligation.goal.predicate,
-                    },
-                    &mut orig_values,
-                );
-
-                match infcx.tcx.evaluate_goal(canonical_goal) {
-                    Ok(response) => {
-                        if response.is_proven() {
-                            making_progress = true;
-
-                            match infcx.instantiate_query_response_and_region_obligations(
-                                &obligation.goal.cause,
-                                obligation.goal.param_env,
-                                &orig_values,
-                                &response,
-                            ) {
-                                Ok(infer_ok) => next_round.extend(
-                                    infer_ok
-                                        .obligations
-                                        .into_iter()
-                                        .map(|obligation| in_environment(infcx, obligation)),
-                                ),
-
-                                Err(_err) => errors.push(FulfillmentError {
-                                    obligation: obligation.goal,
-                                    code: FulfillmentErrorCode::CodeSelectionError(
-                                        SelectionError::Unimplemented,
-                                    ),
-                                    points_at_arg_span: false,
-                                }),
-                            }
-                        } else {
-                            // Ambiguous: retry at next round.
-                            next_round.insert(obligation);
-                        }
-                    }
-
-                    Err(NoSolution) => errors.push(FulfillmentError {
-                        obligation: obligation.goal,
-                        code: FulfillmentErrorCode::CodeSelectionError(
-                            SelectionError::Unimplemented,
-                        ),
-                        points_at_arg_span: false,
-                    }),
-                }
-            }
-            next_round = std::mem::replace(&mut self.obligations, next_round);
-
-            if !making_progress {
-                break;
-            }
-        }
-
-        if errors.is_empty() { Ok(()) } else { Err(errors) }
-    }
-
-    fn pending_obligations(&self) -> Vec<PredicateObligation<'tcx>> {
-        self.obligations.iter().map(|obligation| obligation.goal.clone()).collect()
-    }
-}
diff --git a/src/librustc/traits/codegen/mod.rs b/src/librustc/traits/codegen/mod.rs
deleted file mode 100644
index 8a264a79fb..0000000000
--- a/src/librustc/traits/codegen/mod.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-// This file contains various trait resolution methods used by codegen.
-// They all assume regions can be erased and monomorphic types.  It
-// seems likely that they should eventually be merged into more
-// general routines.
-
-use crate::infer::InferCtxt;
-use crate::traits::{
-    FulfillmentContext, Obligation, ObligationCause, SelectionContext, TraitEngine, Vtable,
-};
-use crate::ty::fold::TypeFoldable;
-use crate::ty::{self, TyCtxt};
-
-/// Attempts to resolve an obligation to a vtable. The result is
-/// a shallow vtable resolution, meaning that we do not
-/// (necessarily) resolve all nested obligations on the impl. Note
-/// that type check should guarantee to us that all nested
-/// obligations *could be* resolved if we wanted to.
-/// Assumes that this is run after the entire crate has been successfully type-checked.
-pub fn codegen_fulfill_obligation<'tcx>(
-    ty: TyCtxt<'tcx>,
-    (param_env, trait_ref): (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>),
-) -> Vtable<'tcx, ()> {
-    // Remove any references to regions; this helps improve caching.
-    let trait_ref = ty.erase_regions(&trait_ref);
-
-    debug!(
-        "codegen_fulfill_obligation(trait_ref={:?}, def_id={:?})",
-        (param_env, trait_ref),
-        trait_ref.def_id()
-    );
-
-    // Do the initial selection for the obligation. This yields the
-    // shallow result we are looking for -- that is, what specific impl.
-    ty.infer_ctxt().enter(|infcx| {
-        let mut selcx = SelectionContext::new(&infcx);
-
-        let obligation_cause = ObligationCause::dummy();
-        let obligation =
-            Obligation::new(obligation_cause, param_env, trait_ref.to_poly_trait_predicate());
-
-        let selection = match selcx.select(&obligation) {
-            Ok(Some(selection)) => selection,
-            Ok(None) => {
-                // Ambiguity can happen when monomorphizing during trans
-                // expands to some humongo type that never occurred
-                // statically -- this humongo type can then overflow,
-                // leading to an ambiguous result. So report this as an
-                // overflow bug, since I believe this is the only case
-                // where ambiguity can result.
-                bug!(
-                    "Encountered ambiguity selecting `{:?}` during codegen, \
-                      presuming due to overflow",
-                    trait_ref
-                )
-            }
-            Err(e) => {
-                bug!("Encountered error `{:?}` selecting `{:?}` during codegen", e, trait_ref)
-            }
-        };
-
-        debug!("fulfill_obligation: selection={:?}", selection);
-
-        // Currently, we use a fulfillment context to completely resolve
-        // all nested obligations. This is because they can inform the
-        // inference of the impl's type parameters.
-        let mut fulfill_cx = FulfillmentContext::new();
-        let vtable = selection.map(|predicate| {
-            debug!("fulfill_obligation: register_predicate_obligation {:?}", predicate);
-            fulfill_cx.register_predicate_obligation(&infcx, predicate);
-        });
-        let vtable = infcx.drain_fulfillment_cx_or_panic(&mut fulfill_cx, &vtable);
-
-        info!("Cache miss: {:?} => {:?}", trait_ref, vtable);
-        vtable
-    })
-}
-
-// # Global Cache
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    /// Finishes processes any obligations that remain in the
-    /// fulfillment context, and then returns the result with all type
-    /// variables removed and regions erased. Because this is intended
-    /// for use after type-check has completed, if any errors occur,
-    /// it will panic. It is used during normalization and other cases
-    /// where processing the obligations in `fulfill_cx` may cause
-    /// type inference variables that appear in `result` to be
-    /// unified, and hence we need to process those obligations to get
-    /// the complete picture of the type.
-    fn drain_fulfillment_cx_or_panic<T>(
-        &self,
-        fulfill_cx: &mut FulfillmentContext<'tcx>,
-        result: &T,
-    ) -> T
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        debug!("drain_fulfillment_cx_or_panic()");
-
-        // In principle, we only need to do this so long as `result`
-        // contains unbound type parameters. It could be a slight
-        // optimization to stop iterating early.
-        if let Err(errors) = fulfill_cx.select_all_or_error(self) {
-            bug!("Encountered errors `{:?}` resolving bounds after type-checking", errors);
-        }
-
-        let result = self.resolve_vars_if_possible(result);
-        self.tcx.erase_regions(&result)
-    }
-}
diff --git a/src/librustc/traits/error_reporting/mod.rs b/src/librustc/traits/error_reporting/mod.rs
deleted file mode 100644
index 28084c9d4a..0000000000
--- a/src/librustc/traits/error_reporting/mod.rs
+++ /dev/null
@@ -1,1427 +0,0 @@
-pub mod on_unimplemented;
-pub mod suggestions;
-
-use super::{
-    ConstEvalFailure, EvaluationResult, FulfillmentError, FulfillmentErrorCode,
-    MismatchedProjectionTypes, ObjectSafetyViolation, Obligation, ObligationCause,
-    ObligationCauseCode, OnUnimplementedDirective, OnUnimplementedNote,
-    OutputTypeParameterMismatch, Overflow, PredicateObligation, SelectionContext, SelectionError,
-    TraitNotObjectSafe,
-};
-
-use crate::infer::error_reporting::{TyCategory, TypeAnnotationNeeded as ErrorCode};
-use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use crate::infer::{self, InferCtxt};
-use crate::mir::interpret::ErrorHandled;
-use crate::session::DiagnosticMessageId;
-use crate::traits::object_safety_violations;
-use crate::ty::error::ExpectedFound;
-use crate::ty::fast_reject;
-use crate::ty::fold::TypeFolder;
-use crate::ty::SubtypePredicate;
-use crate::ty::{
-    self, AdtKind, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness,
-};
-
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
-use rustc_hir as hir;
-use rustc_hir::def_id::{DefId, LOCAL_CRATE};
-use rustc_span::source_map::SourceMap;
-use rustc_span::{ExpnKind, Span, DUMMY_SP};
-use std::fmt;
-use syntax::ast;
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    pub fn report_fulfillment_errors(
-        &self,
-        errors: &[FulfillmentError<'tcx>],
-        body_id: Option<hir::BodyId>,
-        fallback_has_occurred: bool,
-    ) {
-        #[derive(Debug)]
-        struct ErrorDescriptor<'tcx> {
-            predicate: ty::Predicate<'tcx>,
-            index: Option<usize>, // None if this is an old error
-        }
-
-        let mut error_map: FxHashMap<_, Vec<_>> = self
-            .reported_trait_errors
-            .borrow()
-            .iter()
-            .map(|(&span, predicates)| {
-                (
-                    span,
-                    predicates
-                        .iter()
-                        .map(|&predicate| ErrorDescriptor { predicate, index: None })
-                        .collect(),
-                )
-            })
-            .collect();
-
-        for (index, error) in errors.iter().enumerate() {
-            // We want to ignore desugarings here: spans are equivalent even
-            // if one is the result of a desugaring and the other is not.
-            let mut span = error.obligation.cause.span;
-            let expn_data = span.ctxt().outer_expn_data();
-            if let ExpnKind::Desugaring(_) = expn_data.kind {
-                span = expn_data.call_site;
-            }
-
-            error_map.entry(span).or_default().push(ErrorDescriptor {
-                predicate: error.obligation.predicate,
-                index: Some(index),
-            });
-
-            self.reported_trait_errors
-                .borrow_mut()
-                .entry(span)
-                .or_default()
-                .push(error.obligation.predicate.clone());
-        }
-
-        // We do this in 2 passes because we want to display errors in order, though
-        // maybe it *is* better to sort errors by span or something.
-        let mut is_suppressed = vec![false; errors.len()];
-        for (_, error_set) in error_map.iter() {
-            // We want to suppress "duplicate" errors with the same span.
-            for error in error_set {
-                if let Some(index) = error.index {
-                    // Suppress errors that are either:
-                    // 1) strictly implied by another error.
-                    // 2) implied by an error with a smaller index.
-                    for error2 in error_set {
-                        if error2.index.map_or(false, |index2| is_suppressed[index2]) {
-                            // Avoid errors being suppressed by already-suppressed
-                            // errors, to prevent all errors from being suppressed
-                            // at once.
-                            continue;
-                        }
-
-                        if self.error_implies(&error2.predicate, &error.predicate)
-                            && !(error2.index >= error.index
-                                && self.error_implies(&error.predicate, &error2.predicate))
-                        {
-                            info!("skipping {:?} (implied by {:?})", error, error2);
-                            is_suppressed[index] = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        for (error, suppressed) in errors.iter().zip(is_suppressed) {
-            if !suppressed {
-                self.report_fulfillment_error(error, body_id, fallback_has_occurred);
-            }
-        }
-    }
-
-    // returns if `cond` not occurring implies that `error` does not occur - i.e., that
-    // `error` occurring implies that `cond` occurs.
-    fn error_implies(&self, cond: &ty::Predicate<'tcx>, error: &ty::Predicate<'tcx>) -> bool {
-        if cond == error {
-            return true;
-        }
-
-        let (cond, error) = match (cond, error) {
-            (&ty::Predicate::Trait(..), &ty::Predicate::Trait(ref error, _)) => (cond, error),
-            _ => {
-                // FIXME: make this work in other cases too.
-                return false;
-            }
-        };
-
-        for implication in super::elaborate_predicates(self.tcx, vec![*cond]) {
-            if let ty::Predicate::Trait(implication, _) = implication {
-                let error = error.to_poly_trait_ref();
-                let implication = implication.to_poly_trait_ref();
-                // FIXME: I'm just not taking associated types at all here.
-                // Eventually I'll need to implement param-env-aware
-                // `Γ₁ ⊦ φ₁ => Γ₂ ⊦ φ₂` logic.
-                let param_env = ty::ParamEnv::empty();
-                if self.can_sub(param_env, error, implication).is_ok() {
-                    debug!("error_implies: {:?} -> {:?} -> {:?}", cond, error, implication);
-                    return true;
-                }
-            }
-        }
-
-        false
-    }
-
-    fn report_fulfillment_error(
-        &self,
-        error: &FulfillmentError<'tcx>,
-        body_id: Option<hir::BodyId>,
-        fallback_has_occurred: bool,
-    ) {
-        debug!("report_fulfillment_error({:?})", error);
-        match error.code {
-            FulfillmentErrorCode::CodeSelectionError(ref selection_error) => {
-                self.report_selection_error(
-                    &error.obligation,
-                    selection_error,
-                    fallback_has_occurred,
-                    error.points_at_arg_span,
-                );
-            }
-            FulfillmentErrorCode::CodeProjectionError(ref e) => {
-                self.report_projection_error(&error.obligation, e);
-            }
-            FulfillmentErrorCode::CodeAmbiguity => {
-                self.maybe_report_ambiguity(&error.obligation, body_id);
-            }
-            FulfillmentErrorCode::CodeSubtypeError(ref expected_found, ref err) => {
-                self.report_mismatched_types(
-                    &error.obligation.cause,
-                    expected_found.expected,
-                    expected_found.found,
-                    err.clone(),
-                )
-                .emit();
-            }
-        }
-    }
-
-    fn report_projection_error(
-        &self,
-        obligation: &PredicateObligation<'tcx>,
-        error: &MismatchedProjectionTypes<'tcx>,
-    ) {
-        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
-
-        if predicate.references_error() {
-            return;
-        }
-
-        self.probe(|_| {
-            let err_buf;
-            let mut err = &error.err;
-            let mut values = None;
-
-            // try to find the mismatched types to report the error with.
-            //
-            // this can fail if the problem was higher-ranked, in which
-            // cause I have no idea for a good error message.
-            if let ty::Predicate::Projection(ref data) = predicate {
-                let mut selcx = SelectionContext::new(self);
-                let (data, _) = self.replace_bound_vars_with_fresh_vars(
-                    obligation.cause.span,
-                    infer::LateBoundRegionConversionTime::HigherRankedType,
-                    data,
-                );
-                let mut obligations = vec![];
-                let normalized_ty = super::normalize_projection_type(
-                    &mut selcx,
-                    obligation.param_env,
-                    data.projection_ty,
-                    obligation.cause.clone(),
-                    0,
-                    &mut obligations,
-                );
-
-                debug!(
-                    "report_projection_error obligation.cause={:?} obligation.param_env={:?}",
-                    obligation.cause, obligation.param_env
-                );
-
-                debug!(
-                    "report_projection_error normalized_ty={:?} data.ty={:?}",
-                    normalized_ty, data.ty
-                );
-
-                let is_normalized_ty_expected = match &obligation.cause.code {
-                    ObligationCauseCode::ItemObligation(_)
-                    | ObligationCauseCode::BindingObligation(_, _)
-                    | ObligationCauseCode::ObjectCastObligation(_) => false,
-                    _ => true,
-                };
-
-                if let Err(error) = self.at(&obligation.cause, obligation.param_env).eq_exp(
-                    is_normalized_ty_expected,
-                    normalized_ty,
-                    data.ty,
-                ) {
-                    values = Some(infer::ValuePairs::Types(ExpectedFound::new(
-                        is_normalized_ty_expected,
-                        normalized_ty,
-                        data.ty,
-                    )));
-
-                    err_buf = error;
-                    err = &err_buf;
-                }
-            }
-
-            let msg = format!("type mismatch resolving `{}`", predicate);
-            let error_id = (DiagnosticMessageId::ErrorId(271), Some(obligation.cause.span), msg);
-            let fresh = self.tcx.sess.one_time_diagnostics.borrow_mut().insert(error_id);
-            if fresh {
-                let mut diag = struct_span_err!(
-                    self.tcx.sess,
-                    obligation.cause.span,
-                    E0271,
-                    "type mismatch resolving `{}`",
-                    predicate
-                );
-                self.note_type_err(&mut diag, &obligation.cause, None, values, err);
-                self.note_obligation_cause(&mut diag, obligation);
-                diag.emit();
-            }
-        });
-    }
-
-    fn fuzzy_match_tys(&self, a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
-        /// returns the fuzzy category of a given type, or None
-        /// if the type can be equated to any type.
-        fn type_category(t: Ty<'_>) -> Option<u32> {
-            match t.kind {
-                ty::Bool => Some(0),
-                ty::Char => Some(1),
-                ty::Str => Some(2),
-                ty::Int(..) | ty::Uint(..) | ty::Infer(ty::IntVar(..)) => Some(3),
-                ty::Float(..) | ty::Infer(ty::FloatVar(..)) => Some(4),
-                ty::Ref(..) | ty::RawPtr(..) => Some(5),
-                ty::Array(..) | ty::Slice(..) => Some(6),
-                ty::FnDef(..) | ty::FnPtr(..) => Some(7),
-                ty::Dynamic(..) => Some(8),
-                ty::Closure(..) => Some(9),
-                ty::Tuple(..) => Some(10),
-                ty::Projection(..) => Some(11),
-                ty::Param(..) => Some(12),
-                ty::Opaque(..) => Some(13),
-                ty::Never => Some(14),
-                ty::Adt(adt, ..) => match adt.adt_kind() {
-                    AdtKind::Struct => Some(15),
-                    AdtKind::Union => Some(16),
-                    AdtKind::Enum => Some(17),
-                },
-                ty::Generator(..) => Some(18),
-                ty::Foreign(..) => Some(19),
-                ty::GeneratorWitness(..) => Some(20),
-                ty::Placeholder(..) | ty::Bound(..) | ty::Infer(..) | ty::Error => None,
-                ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
-            }
-        }
-
-        match (type_category(a), type_category(b)) {
-            (Some(cat_a), Some(cat_b)) => match (&a.kind, &b.kind) {
-                (&ty::Adt(def_a, _), &ty::Adt(def_b, _)) => def_a == def_b,
-                _ => cat_a == cat_b,
-            },
-            // infer and error can be equated to all types
-            _ => true,
-        }
-    }
-
-    fn describe_generator(&self, body_id: hir::BodyId) -> Option<&'static str> {
-        self.tcx.hir().body(body_id).generator_kind.map(|gen_kind| match gen_kind {
-            hir::GeneratorKind::Gen => "a generator",
-            hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Block) => "an async block",
-            hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Fn) => "an async function",
-            hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Closure) => "an async closure",
-        })
-    }
-
-    fn find_similar_impl_candidates(
-        &self,
-        trait_ref: ty::PolyTraitRef<'tcx>,
-    ) -> Vec<ty::TraitRef<'tcx>> {
-        let simp = fast_reject::simplify_type(self.tcx, trait_ref.skip_binder().self_ty(), true);
-        let all_impls = self.tcx.all_impls(trait_ref.def_id());
-
-        match simp {
-            Some(simp) => all_impls
-                .iter()
-                .filter_map(|&def_id| {
-                    let imp = self.tcx.impl_trait_ref(def_id).unwrap();
-                    let imp_simp = fast_reject::simplify_type(self.tcx, imp.self_ty(), true);
-                    if let Some(imp_simp) = imp_simp {
-                        if simp != imp_simp {
-                            return None;
-                        }
-                    }
-
-                    Some(imp)
-                })
-                .collect(),
-            None => {
-                all_impls.iter().map(|&def_id| self.tcx.impl_trait_ref(def_id).unwrap()).collect()
-            }
-        }
-    }
-
-    fn report_similar_impl_candidates(
-        &self,
-        impl_candidates: Vec<ty::TraitRef<'tcx>>,
-        err: &mut DiagnosticBuilder<'_>,
-    ) {
-        if impl_candidates.is_empty() {
-            return;
-        }
-
-        let len = impl_candidates.len();
-        let end = if impl_candidates.len() <= 5 { impl_candidates.len() } else { 4 };
-
-        let normalize = |candidate| {
-            self.tcx.infer_ctxt().enter(|ref infcx| {
-                let normalized = infcx
-                    .at(&ObligationCause::dummy(), ty::ParamEnv::empty())
-                    .normalize(candidate)
-                    .ok();
-                match normalized {
-                    Some(normalized) => format!("\n  {:?}", normalized.value),
-                    None => format!("\n  {:?}", candidate),
-                }
-            })
-        };
-
-        // Sort impl candidates so that ordering is consistent for UI tests.
-        let mut normalized_impl_candidates =
-            impl_candidates.iter().map(normalize).collect::<Vec<String>>();
-
-        // Sort before taking the `..end` range,
-        // because the ordering of `impl_candidates` may not be deterministic:
-        // https://github.com/rust-lang/rust/pull/57475#issuecomment-455519507
-        normalized_impl_candidates.sort();
-
-        err.help(&format!(
-            "the following implementations were found:{}{}",
-            normalized_impl_candidates[..end].join(""),
-            if len > 5 { format!("\nand {} others", len - 4) } else { String::new() }
-        ));
-    }
-
-    /// Reports that an overflow has occurred and halts compilation. We
-    /// halt compilation unconditionally because it is important that
-    /// overflows never be masked -- they basically represent computations
-    /// whose result could not be truly determined and thus we can't say
-    /// if the program type checks or not -- and they are unusual
-    /// occurrences in any case.
-    pub fn report_overflow_error<T>(
-        &self,
-        obligation: &Obligation<'tcx, T>,
-        suggest_increasing_limit: bool,
-    ) -> !
-    where
-        T: fmt::Display + TypeFoldable<'tcx>,
-    {
-        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
-        let mut err = struct_span_err!(
-            self.tcx.sess,
-            obligation.cause.span,
-            E0275,
-            "overflow evaluating the requirement `{}`",
-            predicate
-        );
-
-        if suggest_increasing_limit {
-            self.suggest_new_overflow_limit(&mut err);
-        }
-
-        self.note_obligation_cause_code(
-            &mut err,
-            &obligation.predicate,
-            &obligation.cause.code,
-            &mut vec![],
-        );
-
-        err.emit();
-        self.tcx.sess.abort_if_errors();
-        bug!();
-    }
-
-    /// Reports that a cycle was detected which led to overflow and halts
-    /// compilation. This is equivalent to `report_overflow_error` except
-    /// that we can give a more helpful error message (and, in particular,
-    /// we do not suggest increasing the overflow limit, which is not
-    /// going to help).
-    pub fn report_overflow_error_cycle(&self, cycle: &[PredicateObligation<'tcx>]) -> ! {
-        let cycle = self.resolve_vars_if_possible(&cycle.to_owned());
-        assert!(cycle.len() > 0);
-
-        debug!("report_overflow_error_cycle: cycle={:?}", cycle);
-
-        self.report_overflow_error(&cycle[0], false);
-    }
-
-    pub fn report_extra_impl_obligation(
-        &self,
-        error_span: Span,
-        item_name: ast::Name,
-        _impl_item_def_id: DefId,
-        trait_item_def_id: DefId,
-        requirement: &dyn fmt::Display,
-    ) -> DiagnosticBuilder<'tcx> {
-        let msg = "impl has stricter requirements than trait";
-        let sp = self.tcx.sess.source_map().def_span(error_span);
-
-        let mut err = struct_span_err!(self.tcx.sess, sp, E0276, "{}", msg);
-
-        if let Some(trait_item_span) = self.tcx.hir().span_if_local(trait_item_def_id) {
-            let span = self.tcx.sess.source_map().def_span(trait_item_span);
-            err.span_label(span, format!("definition of `{}` from trait", item_name));
-        }
-
-        err.span_label(sp, format!("impl has extra requirement {}", requirement));
-
-        err
-    }
-
-    /// Gets the parent trait chain start
-    fn get_parent_trait_ref(
-        &self,
-        code: &ObligationCauseCode<'tcx>,
-    ) -> Option<(String, Option<Span>)> {
-        match code {
-            &ObligationCauseCode::BuiltinDerivedObligation(ref data) => {
-                let parent_trait_ref = self.resolve_vars_if_possible(&data.parent_trait_ref);
-                match self.get_parent_trait_ref(&data.parent_code) {
-                    Some(t) => Some(t),
-                    None => {
-                        let ty = parent_trait_ref.skip_binder().self_ty();
-                        let span =
-                            TyCategory::from_ty(ty).map(|(_, def_id)| self.tcx.def_span(def_id));
-                        Some((ty.to_string(), span))
-                    }
-                }
-            }
-            _ => None,
-        }
-    }
-
-    pub fn report_selection_error(
-        &self,
-        obligation: &PredicateObligation<'tcx>,
-        error: &SelectionError<'tcx>,
-        fallback_has_occurred: bool,
-        points_at_arg: bool,
-    ) {
-        let tcx = self.tcx;
-        let span = obligation.cause.span;
-
-        let mut err = match *error {
-            SelectionError::Unimplemented => {
-                if let ObligationCauseCode::CompareImplMethodObligation {
-                    item_name,
-                    impl_item_def_id,
-                    trait_item_def_id,
-                }
-                | ObligationCauseCode::CompareImplTypeObligation {
-                    item_name,
-                    impl_item_def_id,
-                    trait_item_def_id,
-                } = obligation.cause.code
-                {
-                    self.report_extra_impl_obligation(
-                        span,
-                        item_name,
-                        impl_item_def_id,
-                        trait_item_def_id,
-                        &format!("`{}`", obligation.predicate),
-                    )
-                    .emit();
-                    return;
-                }
-                match obligation.predicate {
-                    ty::Predicate::Trait(ref trait_predicate, _) => {
-                        let trait_predicate = self.resolve_vars_if_possible(trait_predicate);
-
-                        if self.tcx.sess.has_errors() && trait_predicate.references_error() {
-                            return;
-                        }
-                        let trait_ref = trait_predicate.to_poly_trait_ref();
-                        let (post_message, pre_message, type_def) = self
-                            .get_parent_trait_ref(&obligation.cause.code)
-                            .map(|(t, s)| {
-                                (
-                                    format!(" in `{}`", t),
-                                    format!("within `{}`, ", t),
-                                    s.map(|s| (format!("within this `{}`", t), s)),
-                                )
-                            })
-                            .unwrap_or_default();
-
-                        let OnUnimplementedNote { message, label, note, enclosing_scope } =
-                            self.on_unimplemented_note(trait_ref, obligation);
-                        let have_alt_message = message.is_some() || label.is_some();
-                        let is_try = self
-                            .tcx
-                            .sess
-                            .source_map()
-                            .span_to_snippet(span)
-                            .map(|s| &s == "?")
-                            .unwrap_or(false);
-                        let is_from = format!("{}", trait_ref.print_only_trait_path())
-                            .starts_with("std::convert::From<");
-                        let (message, note) = if is_try && is_from {
-                            (
-                                Some(format!(
-                                    "`?` couldn't convert the error to `{}`",
-                                    trait_ref.self_ty(),
-                                )),
-                                Some(
-                                    "the question mark operation (`?`) implicitly performs a \
-                                     conversion on the error value using the `From` trait"
-                                        .to_owned(),
-                                ),
-                            )
-                        } else {
-                            (message, note)
-                        };
-
-                        let mut err = struct_span_err!(
-                            self.tcx.sess,
-                            span,
-                            E0277,
-                            "{}",
-                            message.unwrap_or_else(|| format!(
-                                "the trait bound `{}` is not satisfied{}",
-                                trait_ref.without_const().to_predicate(),
-                                post_message,
-                            ))
-                        );
-
-                        let explanation =
-                            if obligation.cause.code == ObligationCauseCode::MainFunctionType {
-                                "consider using `()`, or a `Result`".to_owned()
-                            } else {
-                                format!(
-                                    "{}the trait `{}` is not implemented for `{}`",
-                                    pre_message,
-                                    trait_ref.print_only_trait_path(),
-                                    trait_ref.self_ty(),
-                                )
-                            };
-
-                        if self.suggest_add_reference_to_arg(
-                            &obligation,
-                            &mut err,
-                            &trait_ref,
-                            points_at_arg,
-                            have_alt_message,
-                        ) {
-                            self.note_obligation_cause(&mut err, obligation);
-                            err.emit();
-                            return;
-                        }
-                        if let Some(ref s) = label {
-                            // If it has a custom `#[rustc_on_unimplemented]`
-                            // error message, let's display it as the label!
-                            err.span_label(span, s.as_str());
-                            err.help(&explanation);
-                        } else {
-                            err.span_label(span, explanation);
-                        }
-                        if let Some((msg, span)) = type_def {
-                            err.span_label(span, &msg);
-                        }
-                        if let Some(ref s) = note {
-                            // If it has a custom `#[rustc_on_unimplemented]` note, let's display it
-                            err.note(s.as_str());
-                        }
-                        if let Some(ref s) = enclosing_scope {
-                            let enclosing_scope_span = tcx.def_span(
-                                tcx.hir()
-                                    .opt_local_def_id(obligation.cause.body_id)
-                                    .unwrap_or_else(|| {
-                                        tcx.hir().body_owner_def_id(hir::BodyId {
-                                            hir_id: obligation.cause.body_id,
-                                        })
-                                    }),
-                            );
-
-                            err.span_label(enclosing_scope_span, s.as_str());
-                        }
-
-                        self.suggest_borrow_on_unsized_slice(&obligation.cause.code, &mut err);
-                        self.suggest_fn_call(&obligation, &mut err, &trait_ref, points_at_arg);
-                        self.suggest_remove_reference(&obligation, &mut err, &trait_ref);
-                        self.suggest_semicolon_removal(&obligation, &mut err, span, &trait_ref);
-                        self.note_version_mismatch(&mut err, &trait_ref);
-                        if self.suggest_impl_trait(&mut err, span, &obligation, &trait_ref) {
-                            err.emit();
-                            return;
-                        }
-
-                        // Try to report a help message
-                        if !trait_ref.has_infer_types()
-                            && self.predicate_can_apply(obligation.param_env, trait_ref)
-                        {
-                            // If a where-clause may be useful, remind the
-                            // user that they can add it.
-                            //
-                            // don't display an on-unimplemented note, as
-                            // these notes will often be of the form
-                            //     "the type `T` can't be frobnicated"
-                            // which is somewhat confusing.
-                            self.suggest_restricting_param_bound(
-                                &mut err,
-                                &trait_ref,
-                                obligation.cause.body_id,
-                            );
-                        } else {
-                            if !have_alt_message {
-                                // Can't show anything else useful, try to find similar impls.
-                                let impl_candidates = self.find_similar_impl_candidates(trait_ref);
-                                self.report_similar_impl_candidates(impl_candidates, &mut err);
-                            }
-                            self.suggest_change_mut(
-                                &obligation,
-                                &mut err,
-                                &trait_ref,
-                                points_at_arg,
-                            );
-                        }
-
-                        // If this error is due to `!: Trait` not implemented but `(): Trait` is
-                        // implemented, and fallback has occurred, then it could be due to a
-                        // variable that used to fallback to `()` now falling back to `!`. Issue a
-                        // note informing about the change in behaviour.
-                        if trait_predicate.skip_binder().self_ty().is_never()
-                            && fallback_has_occurred
-                        {
-                            let predicate = trait_predicate.map_bound(|mut trait_pred| {
-                                trait_pred.trait_ref.substs = self.tcx.mk_substs_trait(
-                                    self.tcx.mk_unit(),
-                                    &trait_pred.trait_ref.substs[1..],
-                                );
-                                trait_pred
-                            });
-                            let unit_obligation = Obligation {
-                                predicate: ty::Predicate::Trait(
-                                    predicate,
-                                    ast::Constness::NotConst,
-                                ),
-                                ..obligation.clone()
-                            };
-                            if self.predicate_may_hold(&unit_obligation) {
-                                err.note(
-                                    "the trait is implemented for `()`. \
-                                         Possibly this error has been caused by changes to \
-                                         Rust's type-inference algorithm \
-                                         (see: https://github.com/rust-lang/rust/issues/48950 \
-                                         for more info). Consider whether you meant to use the \
-                                         type `()` here instead.",
-                                );
-                            }
-                        }
-
-                        err
-                    }
-
-                    ty::Predicate::Subtype(ref predicate) => {
-                        // Errors for Subtype predicates show up as
-                        // `FulfillmentErrorCode::CodeSubtypeError`,
-                        // not selection error.
-                        span_bug!(span, "subtype requirement gave wrong error: `{:?}`", predicate)
-                    }
-
-                    ty::Predicate::RegionOutlives(ref predicate) => {
-                        let predicate = self.resolve_vars_if_possible(predicate);
-                        let err = self
-                            .region_outlives_predicate(&obligation.cause, &predicate)
-                            .err()
-                            .unwrap();
-                        struct_span_err!(
-                            self.tcx.sess,
-                            span,
-                            E0279,
-                            "the requirement `{}` is not satisfied (`{}`)",
-                            predicate,
-                            err,
-                        )
-                    }
-
-                    ty::Predicate::Projection(..) | ty::Predicate::TypeOutlives(..) => {
-                        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
-                        struct_span_err!(
-                            self.tcx.sess,
-                            span,
-                            E0280,
-                            "the requirement `{}` is not satisfied",
-                            predicate
-                        )
-                    }
-
-                    ty::Predicate::ObjectSafe(trait_def_id) => {
-                        let violations = object_safety_violations(self.tcx, trait_def_id);
-                        report_object_safety_error(self.tcx, span, trait_def_id, violations)
-                    }
-
-                    ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
-                        let found_kind = self.closure_kind(closure_def_id, closure_substs).unwrap();
-                        let closure_span = self
-                            .tcx
-                            .sess
-                            .source_map()
-                            .def_span(self.tcx.hir().span_if_local(closure_def_id).unwrap());
-                        let hir_id = self.tcx.hir().as_local_hir_id(closure_def_id).unwrap();
-                        let mut err = struct_span_err!(
-                            self.tcx.sess,
-                            closure_span,
-                            E0525,
-                            "expected a closure that implements the `{}` trait, \
-                             but this closure only implements `{}`",
-                            kind,
-                            found_kind
-                        );
-
-                        err.span_label(
-                            closure_span,
-                            format!("this closure implements `{}`, not `{}`", found_kind, kind),
-                        );
-                        err.span_label(
-                            obligation.cause.span,
-                            format!("the requirement to implement `{}` derives from here", kind),
-                        );
-
-                        // Additional context information explaining why the closure only implements
-                        // a particular trait.
-                        if let Some(tables) = self.in_progress_tables {
-                            let tables = tables.borrow();
-                            match (found_kind, tables.closure_kind_origins().get(hir_id)) {
-                                (ty::ClosureKind::FnOnce, Some((span, name))) => {
-                                    err.span_label(
-                                        *span,
-                                        format!(
-                                            "closure is `FnOnce` because it moves the \
-                                         variable `{}` out of its environment",
-                                            name
-                                        ),
-                                    );
-                                }
-                                (ty::ClosureKind::FnMut, Some((span, name))) => {
-                                    err.span_label(
-                                        *span,
-                                        format!(
-                                            "closure is `FnMut` because it mutates the \
-                                         variable `{}` here",
-                                            name
-                                        ),
-                                    );
-                                }
-                                _ => {}
-                            }
-                        }
-
-                        err.emit();
-                        return;
-                    }
-
-                    ty::Predicate::WellFormed(ty) => {
-                        if !self.tcx.sess.opts.debugging_opts.chalk {
-                            // WF predicates cannot themselves make
-                            // errors. They can only block due to
-                            // ambiguity; otherwise, they always
-                            // degenerate into other obligations
-                            // (which may fail).
-                            span_bug!(span, "WF predicate not satisfied for {:?}", ty);
-                        } else {
-                            // FIXME: we'll need a better message which takes into account
-                            // which bounds actually failed to hold.
-                            self.tcx.sess.struct_span_err(
-                                span,
-                                &format!("the type `{}` is not well-formed (chalk)", ty),
-                            )
-                        }
-                    }
-
-                    ty::Predicate::ConstEvaluatable(..) => {
-                        // Errors for `ConstEvaluatable` predicates show up as
-                        // `SelectionError::ConstEvalFailure`,
-                        // not `Unimplemented`.
-                        span_bug!(
-                            span,
-                            "const-evaluatable requirement gave wrong error: `{:?}`",
-                            obligation
-                        )
-                    }
-                }
-            }
-
-            OutputTypeParameterMismatch(ref found_trait_ref, ref expected_trait_ref, _) => {
-                let found_trait_ref = self.resolve_vars_if_possible(&*found_trait_ref);
-                let expected_trait_ref = self.resolve_vars_if_possible(&*expected_trait_ref);
-
-                if expected_trait_ref.self_ty().references_error() {
-                    return;
-                }
-
-                let found_trait_ty = found_trait_ref.self_ty();
-
-                let found_did = match found_trait_ty.kind {
-                    ty::Closure(did, _) | ty::Foreign(did) | ty::FnDef(did, _) => Some(did),
-                    ty::Adt(def, _) => Some(def.did),
-                    _ => None,
-                };
-
-                let found_span = found_did
-                    .and_then(|did| self.tcx.hir().span_if_local(did))
-                    .map(|sp| self.tcx.sess.source_map().def_span(sp)); // the sp could be an fn def
-
-                if self.reported_closure_mismatch.borrow().contains(&(span, found_span)) {
-                    // We check closures twice, with obligations flowing in different directions,
-                    // but we want to complain about them only once.
-                    return;
-                }
-
-                self.reported_closure_mismatch.borrow_mut().insert((span, found_span));
-
-                let found = match found_trait_ref.skip_binder().substs.type_at(1).kind {
-                    ty::Tuple(ref tys) => vec![ArgKind::empty(); tys.len()],
-                    _ => vec![ArgKind::empty()],
-                };
-
-                let expected_ty = expected_trait_ref.skip_binder().substs.type_at(1);
-                let expected = match expected_ty.kind {
-                    ty::Tuple(ref tys) => tys
-                        .iter()
-                        .map(|t| ArgKind::from_expected_ty(t.expect_ty(), Some(span)))
-                        .collect(),
-                    _ => vec![ArgKind::Arg("_".to_owned(), expected_ty.to_string())],
-                };
-
-                if found.len() == expected.len() {
-                    self.report_closure_arg_mismatch(
-                        span,
-                        found_span,
-                        found_trait_ref,
-                        expected_trait_ref,
-                    )
-                } else {
-                    let (closure_span, found) = found_did
-                        .and_then(|did| self.tcx.hir().get_if_local(did))
-                        .map(|node| {
-                            let (found_span, found) = self.get_fn_like_arguments(node);
-                            (Some(found_span), found)
-                        })
-                        .unwrap_or((found_span, found));
-
-                    self.report_arg_count_mismatch(
-                        span,
-                        closure_span,
-                        expected,
-                        found,
-                        found_trait_ty.is_closure(),
-                    )
-                }
-            }
-
-            TraitNotObjectSafe(did) => {
-                let violations = object_safety_violations(self.tcx, did);
-                report_object_safety_error(self.tcx, span, did, violations)
-            }
-
-            ConstEvalFailure(ErrorHandled::TooGeneric) => {
-                // In this instance, we have a const expression containing an unevaluated
-                // generic parameter. We have no idea whether this expression is valid or
-                // not (e.g. it might result in an error), but we don't want to just assume
-                // that it's okay, because that might result in post-monomorphisation time
-                // errors. The onus is really on the caller to provide values that it can
-                // prove are well-formed.
-                let mut err = self
-                    .tcx
-                    .sess
-                    .struct_span_err(span, "constant expression depends on a generic parameter");
-                // FIXME(const_generics): we should suggest to the user how they can resolve this
-                // issue. However, this is currently not actually possible
-                // (see https://github.com/rust-lang/rust/issues/66962#issuecomment-575907083).
-                err.note("this may fail depending on what value the parameter takes");
-                err
-            }
-
-            // Already reported in the query.
-            ConstEvalFailure(ErrorHandled::Reported) => {
-                self.tcx
-                    .sess
-                    .delay_span_bug(span, &format!("constant in type had an ignored error"));
-                return;
-            }
-
-            Overflow => {
-                bug!("overflow should be handled before the `report_selection_error` path");
-            }
-        };
-
-        self.note_obligation_cause(&mut err, obligation);
-        self.point_at_returns_when_relevant(&mut err, &obligation);
-
-        err.emit();
-    }
-
-    /// If the `Self` type of the unsatisfied trait `trait_ref` implements a trait
-    /// with the same path as `trait_ref`, a help message about
-    /// a probable version mismatch is added to `err`
-    fn note_version_mismatch(
-        &self,
-        err: &mut DiagnosticBuilder<'_>,
-        trait_ref: &ty::PolyTraitRef<'tcx>,
-    ) {
-        let get_trait_impl = |trait_def_id| {
-            let mut trait_impl = None;
-            self.tcx.for_each_relevant_impl(trait_def_id, trait_ref.self_ty(), |impl_def_id| {
-                if trait_impl.is_none() {
-                    trait_impl = Some(impl_def_id);
-                }
-            });
-            trait_impl
-        };
-        let required_trait_path = self.tcx.def_path_str(trait_ref.def_id());
-        let all_traits = self.tcx.all_traits(LOCAL_CRATE);
-        let traits_with_same_path: std::collections::BTreeSet<_> = all_traits
-            .iter()
-            .filter(|trait_def_id| **trait_def_id != trait_ref.def_id())
-            .filter(|trait_def_id| self.tcx.def_path_str(**trait_def_id) == required_trait_path)
-            .collect();
-        for trait_with_same_path in traits_with_same_path {
-            if let Some(impl_def_id) = get_trait_impl(*trait_with_same_path) {
-                let impl_span = self.tcx.def_span(impl_def_id);
-                err.span_help(impl_span, "trait impl with same name found");
-                let trait_crate = self.tcx.crate_name(trait_with_same_path.krate);
-                let crate_msg = format!(
-                    "perhaps two different versions of crate `{}` are being used?",
-                    trait_crate
-                );
-                err.note(&crate_msg);
-            }
-        }
-    }
-
-    fn mk_obligation_for_def_id(
-        &self,
-        def_id: DefId,
-        output_ty: Ty<'tcx>,
-        cause: ObligationCause<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-    ) -> PredicateObligation<'tcx> {
-        let new_trait_ref =
-            ty::TraitRef { def_id, substs: self.tcx.mk_substs_trait(output_ty, &[]) };
-        Obligation::new(cause, param_env, new_trait_ref.without_const().to_predicate())
-    }
-}
-
-pub fn recursive_type_with_infinite_size_error(
-    tcx: TyCtxt<'tcx>,
-    type_def_id: DefId,
-) -> DiagnosticBuilder<'tcx> {
-    assert!(type_def_id.is_local());
-    let span = tcx.hir().span_if_local(type_def_id).unwrap();
-    let span = tcx.sess.source_map().def_span(span);
-    let mut err = struct_span_err!(
-        tcx.sess,
-        span,
-        E0072,
-        "recursive type `{}` has infinite size",
-        tcx.def_path_str(type_def_id)
-    );
-    err.span_label(span, "recursive type has infinite size");
-    err.help(&format!(
-        "insert indirection (e.g., a `Box`, `Rc`, or `&`) \
-                           at some point to make `{}` representable",
-        tcx.def_path_str(type_def_id)
-    ));
-    err
-}
-
-pub fn report_object_safety_error(
-    tcx: TyCtxt<'tcx>,
-    span: Span,
-    trait_def_id: DefId,
-    violations: Vec<ObjectSafetyViolation>,
-) -> DiagnosticBuilder<'tcx> {
-    let trait_str = tcx.def_path_str(trait_def_id);
-    let span = tcx.sess.source_map().def_span(span);
-    let mut err = struct_span_err!(
-        tcx.sess,
-        span,
-        E0038,
-        "the trait `{}` cannot be made into an object",
-        trait_str
-    );
-    err.span_label(span, format!("the trait `{}` cannot be made into an object", trait_str));
-
-    let mut reported_violations = FxHashSet::default();
-    for violation in violations {
-        if reported_violations.insert(violation.clone()) {
-            match violation.span() {
-                Some(span) => err.span_label(span, violation.error_msg()),
-                None => err.note(&violation.error_msg()),
-            };
-        }
-    }
-
-    if tcx.sess.trait_methods_not_found.borrow().contains(&span) {
-        // Avoid emitting error caused by non-existing method (#58734)
-        err.cancel();
-    }
-
-    err
-}
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    fn maybe_report_ambiguity(
-        &self,
-        obligation: &PredicateObligation<'tcx>,
-        body_id: Option<hir::BodyId>,
-    ) {
-        // Unable to successfully determine, probably means
-        // insufficient type information, but could mean
-        // ambiguous impls. The latter *ought* to be a
-        // coherence violation, so we don't report it here.
-
-        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
-        let span = obligation.cause.span;
-
-        debug!(
-            "maybe_report_ambiguity(predicate={:?}, obligation={:?} body_id={:?}, code={:?})",
-            predicate, obligation, body_id, obligation.cause.code,
-        );
-
-        // Ambiguity errors are often caused as fallout from earlier
-        // errors. So just ignore them if this infcx is tainted.
-        if self.is_tainted_by_errors() {
-            return;
-        }
-
-        let mut err = match predicate {
-            ty::Predicate::Trait(ref data, _) => {
-                let trait_ref = data.to_poly_trait_ref();
-                let self_ty = trait_ref.self_ty();
-                debug!("self_ty {:?} {:?} trait_ref {:?}", self_ty, self_ty.kind, trait_ref);
-
-                if predicate.references_error() {
-                    return;
-                }
-                // Typically, this ambiguity should only happen if
-                // there are unresolved type inference variables
-                // (otherwise it would suggest a coherence
-                // failure). But given #21974 that is not necessarily
-                // the case -- we can have multiple where clauses that
-                // are only distinguished by a region, which results
-                // in an ambiguity even when all types are fully
-                // known, since we don't dispatch based on region
-                // relationships.
-
-                // This is kind of a hack: it frequently happens that some earlier
-                // error prevents types from being fully inferred, and then we get
-                // a bunch of uninteresting errors saying something like "<generic
-                // #0> doesn't implement Sized".  It may even be true that we
-                // could just skip over all checks where the self-ty is an
-                // inference variable, but I was afraid that there might be an
-                // inference variable created, registered as an obligation, and
-                // then never forced by writeback, and hence by skipping here we'd
-                // be ignoring the fact that we don't KNOW the type works
-                // out. Though even that would probably be harmless, given that
-                // we're only talking about builtin traits, which are known to be
-                // inhabited. We used to check for `self.tcx.sess.has_errors()` to
-                // avoid inundating the user with unnecessary errors, but we now
-                // check upstream for type errors and dont add the obligations to
-                // begin with in those cases.
-                if self
-                    .tcx
-                    .lang_items()
-                    .sized_trait()
-                    .map_or(false, |sized_id| sized_id == trait_ref.def_id())
-                {
-                    self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0282).emit();
-                    return;
-                }
-                let mut err = self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0283);
-                err.note(&format!("cannot resolve `{}`", predicate));
-                if let ObligationCauseCode::ItemObligation(def_id) = obligation.cause.code {
-                    self.suggest_fully_qualified_path(&mut err, def_id, span, trait_ref.def_id());
-                } else if let (
-                    Ok(ref snippet),
-                    ObligationCauseCode::BindingObligation(ref def_id, _),
-                ) =
-                    (self.tcx.sess.source_map().span_to_snippet(span), &obligation.cause.code)
-                {
-                    let generics = self.tcx.generics_of(*def_id);
-                    if !generics.params.is_empty() && !snippet.ends_with('>') {
-                        // FIXME: To avoid spurious suggestions in functions where type arguments
-                        // where already supplied, we check the snippet to make sure it doesn't
-                        // end with a turbofish. Ideally we would have access to a `PathSegment`
-                        // instead. Otherwise we would produce the following output:
-                        //
-                        // error[E0283]: type annotations needed
-                        //   --> $DIR/issue-54954.rs:3:24
-                        //    |
-                        // LL | const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
-                        //    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^
-                        //    |                        |
-                        //    |                        cannot infer type
-                        //    |                        help: consider specifying the type argument
-                        //    |                        in the function call:
-                        //    |                        `Tt::const_val::<[i8; 123]>::<T>`
-                        // ...
-                        // LL |     const fn const_val<T: Sized>() -> usize {
-                        //    |              --------- - required by this bound in `Tt::const_val`
-                        //    |
-                        //    = note: cannot resolve `_: Tt`
-
-                        err.span_suggestion(
-                            span,
-                            &format!(
-                                "consider specifying the type argument{} in the function call",
-                                if generics.params.len() > 1 { "s" } else { "" },
-                            ),
-                            format!(
-                                "{}::<{}>",
-                                snippet,
-                                generics
-                                    .params
-                                    .iter()
-                                    .map(|p| p.name.to_string())
-                                    .collect::<Vec<String>>()
-                                    .join(", ")
-                            ),
-                            Applicability::HasPlaceholders,
-                        );
-                    }
-                }
-                err
-            }
-
-            ty::Predicate::WellFormed(ty) => {
-                // Same hacky approach as above to avoid deluging user
-                // with error messages.
-                if ty.references_error() || self.tcx.sess.has_errors() {
-                    return;
-                }
-                self.need_type_info_err(body_id, span, ty, ErrorCode::E0282)
-            }
-
-            ty::Predicate::Subtype(ref data) => {
-                if data.references_error() || self.tcx.sess.has_errors() {
-                    // no need to overload user in such cases
-                    return;
-                }
-                let &SubtypePredicate { a_is_expected: _, a, b } = data.skip_binder();
-                // both must be type variables, or the other would've been instantiated
-                assert!(a.is_ty_var() && b.is_ty_var());
-                self.need_type_info_err(body_id, span, a, ErrorCode::E0282)
-            }
-            ty::Predicate::Projection(ref data) => {
-                let trait_ref = data.to_poly_trait_ref(self.tcx);
-                let self_ty = trait_ref.self_ty();
-                if predicate.references_error() {
-                    return;
-                }
-                let mut err = self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0284);
-                err.note(&format!("cannot resolve `{}`", predicate));
-                err
-            }
-
-            _ => {
-                if self.tcx.sess.has_errors() {
-                    return;
-                }
-                let mut err = struct_span_err!(
-                    self.tcx.sess,
-                    span,
-                    E0284,
-                    "type annotations needed: cannot resolve `{}`",
-                    predicate,
-                );
-                err.span_label(span, &format!("cannot resolve `{}`", predicate));
-                err
-            }
-        };
-        self.note_obligation_cause(&mut err, obligation);
-        err.emit();
-    }
-
-    /// Returns `true` if the trait predicate may apply for *some* assignment
-    /// to the type parameters.
-    fn predicate_can_apply(
-        &self,
-        param_env: ty::ParamEnv<'tcx>,
-        pred: ty::PolyTraitRef<'tcx>,
-    ) -> bool {
-        struct ParamToVarFolder<'a, 'tcx> {
-            infcx: &'a InferCtxt<'a, 'tcx>,
-            var_map: FxHashMap<Ty<'tcx>, Ty<'tcx>>,
-        }
-
-        impl<'a, 'tcx> TypeFolder<'tcx> for ParamToVarFolder<'a, 'tcx> {
-            fn tcx<'b>(&'b self) -> TyCtxt<'tcx> {
-                self.infcx.tcx
-            }
-
-            fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
-                if let ty::Param(ty::ParamTy { name, .. }) = ty.kind {
-                    let infcx = self.infcx;
-                    self.var_map.entry(ty).or_insert_with(|| {
-                        infcx.next_ty_var(TypeVariableOrigin {
-                            kind: TypeVariableOriginKind::TypeParameterDefinition(name, None),
-                            span: DUMMY_SP,
-                        })
-                    })
-                } else {
-                    ty.super_fold_with(self)
-                }
-            }
-        }
-
-        self.probe(|_| {
-            let mut selcx = SelectionContext::new(self);
-
-            let cleaned_pred =
-                pred.fold_with(&mut ParamToVarFolder { infcx: self, var_map: Default::default() });
-
-            let cleaned_pred = super::project::normalize(
-                &mut selcx,
-                param_env,
-                ObligationCause::dummy(),
-                &cleaned_pred,
-            )
-            .value;
-
-            let obligation = Obligation::new(
-                ObligationCause::dummy(),
-                param_env,
-                cleaned_pred.without_const().to_predicate(),
-            );
-
-            self.predicate_may_hold(&obligation)
-        })
-    }
-
-    fn note_obligation_cause(
-        &self,
-        err: &mut DiagnosticBuilder<'_>,
-        obligation: &PredicateObligation<'tcx>,
-    ) {
-        // First, attempt to add note to this error with an async-await-specific
-        // message, and fall back to regular note otherwise.
-        if !self.maybe_note_obligation_cause_for_async_await(err, obligation) {
-            self.note_obligation_cause_code(
-                err,
-                &obligation.predicate,
-                &obligation.cause.code,
-                &mut vec![],
-            );
-        }
-    }
-
-    fn is_recursive_obligation(
-        &self,
-        obligated_types: &mut Vec<&ty::TyS<'tcx>>,
-        cause_code: &ObligationCauseCode<'tcx>,
-    ) -> bool {
-        if let ObligationCauseCode::BuiltinDerivedObligation(ref data) = cause_code {
-            let parent_trait_ref = self.resolve_vars_if_possible(&data.parent_trait_ref);
-
-            if obligated_types.iter().any(|ot| ot == &parent_trait_ref.skip_binder().self_ty()) {
-                return true;
-            }
-        }
-        false
-    }
-}
-
-/// Summarizes information
-#[derive(Clone)]
-pub enum ArgKind {
-    /// An argument of non-tuple type. Parameters are (name, ty)
-    Arg(String, String),
-
-    /// An argument of tuple type. For a "found" argument, the span is
-    /// the locationo in the source of the pattern. For a "expected"
-    /// argument, it will be None. The vector is a list of (name, ty)
-    /// strings for the components of the tuple.
-    Tuple(Option<Span>, Vec<(String, String)>),
-}
-
-impl ArgKind {
-    fn empty() -> ArgKind {
-        ArgKind::Arg("_".to_owned(), "_".to_owned())
-    }
-
-    /// Creates an `ArgKind` from the expected type of an
-    /// argument. It has no name (`_`) and an optional source span.
-    pub fn from_expected_ty(t: Ty<'_>, span: Option<Span>) -> ArgKind {
-        match t.kind {
-            ty::Tuple(ref tys) => ArgKind::Tuple(
-                span,
-                tys.iter().map(|ty| ("_".to_owned(), ty.to_string())).collect::<Vec<_>>(),
-            ),
-            _ => ArgKind::Arg("_".to_owned(), t.to_string()),
-        }
-    }
-}
-
-/// Suggest restricting a type param with a new bound.
-pub fn suggest_constraining_type_param(
-    generics: &hir::Generics<'_>,
-    err: &mut DiagnosticBuilder<'_>,
-    param_name: &str,
-    constraint: &str,
-    source_map: &SourceMap,
-    span: Span,
-) -> bool {
-    let restrict_msg = "consider further restricting this bound";
-    if let Some(param) =
-        generics.params.iter().filter(|p| p.name.ident().as_str() == param_name).next()
-    {
-        if param_name.starts_with("impl ") {
-            // `impl Trait` in argument:
-            // `fn foo(x: impl Trait) {}` → `fn foo(t: impl Trait + Trait2) {}`
-            err.span_suggestion(
-                param.span,
-                restrict_msg,
-                // `impl CurrentTrait + MissingTrait`
-                format!("{} + {}", param_name, constraint),
-                Applicability::MachineApplicable,
-            );
-        } else if generics.where_clause.predicates.is_empty() && param.bounds.is_empty() {
-            // If there are no bounds whatsoever, suggest adding a constraint
-            // to the type parameter:
-            // `fn foo<T>(t: T) {}` → `fn foo<T: Trait>(t: T) {}`
-            err.span_suggestion(
-                param.span,
-                "consider restricting this bound",
-                format!("{}: {}", param_name, constraint),
-                Applicability::MachineApplicable,
-            );
-        } else if !generics.where_clause.predicates.is_empty() {
-            // There is a `where` clause, so suggest expanding it:
-            // `fn foo<T>(t: T) where T: Debug {}` →
-            // `fn foo<T>(t: T) where T: Debug, T: Trait {}`
-            err.span_suggestion(
-                generics.where_clause.span().unwrap().shrink_to_hi(),
-                &format!("consider further restricting type parameter `{}`", param_name),
-                format!(", {}: {}", param_name, constraint),
-                Applicability::MachineApplicable,
-            );
-        } else {
-            // If there is no `where` clause lean towards constraining to the
-            // type parameter:
-            // `fn foo<X: Bar, T>(t: T, x: X) {}` → `fn foo<T: Trait>(t: T) {}`
-            // `fn foo<T: Bar>(t: T) {}` → `fn foo<T: Bar + Trait>(t: T) {}`
-            let sp = param.span.with_hi(span.hi());
-            let span = source_map.span_through_char(sp, ':');
-            if sp != param.span && sp != span {
-                // Only suggest if we have high certainty that the span
-                // covers the colon in `foo<T: Trait>`.
-                err.span_suggestion(
-                    span,
-                    restrict_msg,
-                    format!("{}: {} + ", param_name, constraint),
-                    Applicability::MachineApplicable,
-                );
-            } else {
-                err.span_label(
-                    param.span,
-                    &format!("consider adding a `where {}: {}` bound", param_name, constraint),
-                );
-            }
-        }
-        return true;
-    }
-    false
-}
diff --git a/src/librustc/traits/error_reporting/on_unimplemented.rs b/src/librustc/traits/error_reporting/on_unimplemented.rs
deleted file mode 100644
index 2ba12baaf6..0000000000
--- a/src/librustc/traits/error_reporting/on_unimplemented.rs
+++ /dev/null
@@ -1,213 +0,0 @@
-use super::{
-    ObligationCauseCode, OnUnimplementedDirective, OnUnimplementedNote, PredicateObligation,
-};
-use crate::infer::InferCtxt;
-use crate::ty::subst::Subst;
-use crate::ty::{self, GenericParamDefKind};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_span::symbol::sym;
-
-impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
-    fn impl_similar_to(
-        &self,
-        trait_ref: ty::PolyTraitRef<'tcx>,
-        obligation: &PredicateObligation<'tcx>,
-    ) -> Option<DefId> {
-        let tcx = self.tcx;
-        let param_env = obligation.param_env;
-        let trait_ref = tcx.erase_late_bound_regions(&trait_ref);
-        let trait_self_ty = trait_ref.self_ty();
-
-        let mut self_match_impls = vec![];
-        let mut fuzzy_match_impls = vec![];
-
-        self.tcx.for_each_relevant_impl(trait_ref.def_id, trait_self_ty, |def_id| {
-            let impl_substs = self.fresh_substs_for_item(obligation.cause.span, def_id);
-            let impl_trait_ref = tcx.impl_trait_ref(def_id).unwrap().subst(tcx, impl_substs);
-
-            let impl_self_ty = impl_trait_ref.self_ty();
-
-            if let Ok(..) = self.can_eq(param_env, trait_self_ty, impl_self_ty) {
-                self_match_impls.push(def_id);
-
-                if trait_ref
-                    .substs
-                    .types()
-                    .skip(1)
-                    .zip(impl_trait_ref.substs.types().skip(1))
-                    .all(|(u, v)| self.fuzzy_match_tys(u, v))
-                {
-                    fuzzy_match_impls.push(def_id);
-                }
-            }
-        });
-
-        let impl_def_id = if self_match_impls.len() == 1 {
-            self_match_impls[0]
-        } else if fuzzy_match_impls.len() == 1 {
-            fuzzy_match_impls[0]
-        } else {
-            return None;
-        };
-
-        tcx.has_attr(impl_def_id, sym::rustc_on_unimplemented).then_some(impl_def_id)
-    }
-
-    /// Used to set on_unimplemented's `ItemContext`
-    /// to be the enclosing (async) block/function/closure
-    fn describe_enclosure(&self, hir_id: hir::HirId) -> Option<&'static str> {
-        let hir = &self.tcx.hir();
-        let node = hir.find(hir_id)?;
-        match &node {
-            hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, _, body_id), .. }) => {
-                self.describe_generator(*body_id).or_else(|| {
-                    Some(if let hir::FnHeader { asyncness: hir::IsAsync::Async, .. } = sig.header {
-                        "an async function"
-                    } else {
-                        "a function"
-                    })
-                })
-            }
-            hir::Node::TraitItem(hir::TraitItem {
-                kind: hir::TraitItemKind::Method(_, hir::TraitMethod::Provided(body_id)),
-                ..
-            }) => self.describe_generator(*body_id).or_else(|| Some("a trait method")),
-            hir::Node::ImplItem(hir::ImplItem {
-                kind: hir::ImplItemKind::Method(sig, body_id),
-                ..
-            }) => self.describe_generator(*body_id).or_else(|| {
-                Some(if let hir::FnHeader { asyncness: hir::IsAsync::Async, .. } = sig.header {
-                    "an async method"
-                } else {
-                    "a method"
-                })
-            }),
-            hir::Node::Expr(hir::Expr {
-                kind: hir::ExprKind::Closure(_is_move, _, body_id, _, gen_movability),
-                ..
-            }) => self.describe_generator(*body_id).or_else(|| {
-                Some(if gen_movability.is_some() { "an async closure" } else { "a closure" })
-            }),
-            hir::Node::Expr(hir::Expr { .. }) => {
-                let parent_hid = hir.get_parent_node(hir_id);
-                if parent_hid != hir_id {
-                    return self.describe_enclosure(parent_hid);
-                } else {
-                    None
-                }
-            }
-            _ => None,
-        }
-    }
-
-    crate fn on_unimplemented_note(
-        &self,
-        trait_ref: ty::PolyTraitRef<'tcx>,
-        obligation: &PredicateObligation<'tcx>,
-    ) -> OnUnimplementedNote {
-        let def_id =
-            self.impl_similar_to(trait_ref, obligation).unwrap_or_else(|| trait_ref.def_id());
-        let trait_ref = *trait_ref.skip_binder();
-
-        let mut flags = vec![];
-        flags.push((
-            sym::item_context,
-            self.describe_enclosure(obligation.cause.body_id).map(|s| s.to_owned()),
-        ));
-
-        match obligation.cause.code {
-            ObligationCauseCode::BuiltinDerivedObligation(..)
-            | ObligationCauseCode::ImplDerivedObligation(..) => {}
-            _ => {
-                // this is a "direct", user-specified, rather than derived,
-                // obligation.
-                flags.push((sym::direct, None));
-            }
-        }
-
-        if let ObligationCauseCode::ItemObligation(item) = obligation.cause.code {
-            // FIXME: maybe also have some way of handling methods
-            // from other traits? That would require name resolution,
-            // which we might want to be some sort of hygienic.
-            //
-            // Currently I'm leaving it for what I need for `try`.
-            if self.tcx.trait_of_item(item) == Some(trait_ref.def_id) {
-                let method = self.tcx.item_name(item);
-                flags.push((sym::from_method, None));
-                flags.push((sym::from_method, Some(method.to_string())));
-            }
-        }
-        if let Some((t, _)) = self.get_parent_trait_ref(&obligation.cause.code) {
-            flags.push((sym::parent_trait, Some(t)));
-        }
-
-        if let Some(k) = obligation.cause.span.desugaring_kind() {
-            flags.push((sym::from_desugaring, None));
-            flags.push((sym::from_desugaring, Some(format!("{:?}", k))));
-        }
-        let generics = self.tcx.generics_of(def_id);
-        let self_ty = trait_ref.self_ty();
-        // This is also included through the generics list as `Self`,
-        // but the parser won't allow you to use it
-        flags.push((sym::_Self, Some(self_ty.to_string())));
-        if let Some(def) = self_ty.ty_adt_def() {
-            // We also want to be able to select self's original
-            // signature with no type arguments resolved
-            flags.push((sym::_Self, Some(self.tcx.type_of(def.did).to_string())));
-        }
-
-        for param in generics.params.iter() {
-            let value = match param.kind {
-                GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => {
-                    trait_ref.substs[param.index as usize].to_string()
-                }
-                GenericParamDefKind::Lifetime => continue,
-            };
-            let name = param.name;
-            flags.push((name, Some(value)));
-        }
-
-        if let Some(true) = self_ty.ty_adt_def().map(|def| def.did.is_local()) {
-            flags.push((sym::crate_local, None));
-        }
-
-        // Allow targeting all integers using `{integral}`, even if the exact type was resolved
-        if self_ty.is_integral() {
-            flags.push((sym::_Self, Some("{integral}".to_owned())));
-        }
-
-        if let ty::Array(aty, len) = self_ty.kind {
-            flags.push((sym::_Self, Some("[]".to_owned())));
-            flags.push((sym::_Self, Some(format!("[{}]", aty))));
-            if let Some(def) = aty.ty_adt_def() {
-                // We also want to be able to select the array's type's original
-                // signature with no type arguments resolved
-                flags.push((
-                    sym::_Self,
-                    Some(format!("[{}]", self.tcx.type_of(def.did).to_string())),
-                ));
-                let tcx = self.tcx;
-                if let Some(len) = len.try_eval_usize(tcx, ty::ParamEnv::empty()) {
-                    flags.push((
-                        sym::_Self,
-                        Some(format!("[{}; {}]", self.tcx.type_of(def.did).to_string(), len)),
-                    ));
-                } else {
-                    flags.push((
-                        sym::_Self,
-                        Some(format!("[{}; _]", self.tcx.type_of(def.did).to_string())),
-                    ));
-                }
-            }
-        }
-
-        if let Ok(Some(command)) =
-            OnUnimplementedDirective::of_item(self.tcx, trait_ref.def_id, def_id)
-        {
-            command.evaluate(self.tcx, trait_ref, &flags[..])
-        } else {
-            OnUnimplementedNote::default()
-        }
-    }
-}
diff --git a/src/librustc/traits/misc.rs b/src/librustc/traits/misc.rs
deleted file mode 100644
index 08c3a77bf3..0000000000
--- a/src/librustc/traits/misc.rs
+++ /dev/null
@@ -1,202 +0,0 @@
-//! Miscellaneous type-system utilities that are too small to deserve their own modules.
-
-use crate::middle::lang_items;
-use crate::traits::{self, ObligationCause};
-use crate::ty::util::NeedsDrop;
-use crate::ty::{self, Ty, TyCtxt, TypeFoldable};
-
-use rustc_hir as hir;
-use rustc_span::DUMMY_SP;
-
-#[derive(Clone)]
-pub enum CopyImplementationError<'tcx> {
-    InfrigingFields(Vec<&'tcx ty::FieldDef>),
-    NotAnAdt,
-    HasDestructor,
-}
-
-pub fn can_type_implement_copy(
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    self_type: Ty<'tcx>,
-) -> Result<(), CopyImplementationError<'tcx>> {
-    // FIXME: (@jroesch) float this code up
-    tcx.infer_ctxt().enter(|infcx| {
-        let (adt, substs) = match self_type.kind {
-            // These types used to have a builtin impl.
-            // Now libcore provides that impl.
-            ty::Uint(_)
-            | ty::Int(_)
-            | ty::Bool
-            | ty::Float(_)
-            | ty::Char
-            | ty::RawPtr(..)
-            | ty::Never
-            | ty::Ref(_, _, hir::Mutability::Not) => return Ok(()),
-
-            ty::Adt(adt, substs) => (adt, substs),
-
-            _ => return Err(CopyImplementationError::NotAnAdt),
-        };
-
-        let mut infringing = Vec::new();
-        for variant in &adt.variants {
-            for field in &variant.fields {
-                let ty = field.ty(tcx, substs);
-                if ty.references_error() {
-                    continue;
-                }
-                let span = tcx.def_span(field.did);
-                let cause = ObligationCause { span, ..ObligationCause::dummy() };
-                let ctx = traits::FulfillmentContext::new();
-                match traits::fully_normalize(&infcx, ctx, cause, param_env, &ty) {
-                    Ok(ty) => {
-                        if !infcx.type_is_copy_modulo_regions(param_env, ty, span) {
-                            infringing.push(field);
-                        }
-                    }
-                    Err(errors) => {
-                        infcx.report_fulfillment_errors(&errors, None, false);
-                    }
-                };
-            }
-        }
-        if !infringing.is_empty() {
-            return Err(CopyImplementationError::InfrigingFields(infringing));
-        }
-        if adt.has_dtor(tcx) {
-            return Err(CopyImplementationError::HasDestructor);
-        }
-
-        Ok(())
-    })
-}
-
-fn is_copy_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
-    is_item_raw(tcx, query, lang_items::CopyTraitLangItem)
-}
-
-fn is_sized_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
-    is_item_raw(tcx, query, lang_items::SizedTraitLangItem)
-}
-
-fn is_freeze_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
-    is_item_raw(tcx, query, lang_items::FreezeTraitLangItem)
-}
-
-fn is_item_raw<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>,
-    item: lang_items::LangItem,
-) -> bool {
-    let (param_env, ty) = query.into_parts();
-    let trait_def_id = tcx.require_lang_item(item, None);
-    tcx.infer_ctxt().enter(|infcx| {
-        traits::type_known_to_meet_bound_modulo_regions(
-            &infcx,
-            param_env,
-            ty,
-            trait_def_id,
-            DUMMY_SP,
-        )
-    })
-}
-
-fn needs_drop_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> NeedsDrop {
-    let (param_env, ty) = query.into_parts();
-
-    let needs_drop = |ty: Ty<'tcx>| -> bool { tcx.needs_drop_raw(param_env.and(ty)).0 };
-
-    assert!(!ty.needs_infer());
-
-    NeedsDrop(match ty.kind {
-        // Fast-path for primitive types
-        ty::Infer(ty::FreshIntTy(_))
-        | ty::Infer(ty::FreshFloatTy(_))
-        | ty::Bool
-        | ty::Int(_)
-        | ty::Uint(_)
-        | ty::Float(_)
-        | ty::Never
-        | ty::FnDef(..)
-        | ty::FnPtr(_)
-        | ty::Char
-        | ty::GeneratorWitness(..)
-        | ty::RawPtr(_)
-        | ty::Ref(..)
-        | ty::Str => false,
-
-        // Foreign types can never have destructors
-        ty::Foreign(..) => false,
-
-        // `ManuallyDrop` doesn't have a destructor regardless of field types.
-        ty::Adt(def, _) if Some(def.did) == tcx.lang_items().manually_drop() => false,
-
-        // Issue #22536: We first query `is_copy_modulo_regions`.  It sees a
-        // normalized version of the type, and therefore will definitely
-        // know whether the type implements Copy (and thus needs no
-        // cleanup/drop/zeroing) ...
-        _ if ty.is_copy_modulo_regions(tcx, param_env, DUMMY_SP) => false,
-
-        // ... (issue #22536 continued) but as an optimization, still use
-        // prior logic of asking for the structural "may drop".
-
-        // FIXME(#22815): Note that this is a conservative heuristic;
-        // it may report that the type "may drop" when actual type does
-        // not actually have a destructor associated with it. But since
-        // the type absolutely did not have the `Copy` bound attached
-        // (see above), it is sound to treat it as having a destructor.
-
-        // User destructors are the only way to have concrete drop types.
-        ty::Adt(def, _) if def.has_dtor(tcx) => true,
-
-        // Can refer to a type which may drop.
-        // FIXME(eddyb) check this against a ParamEnv.
-        ty::Dynamic(..)
-        | ty::Projection(..)
-        | ty::Param(_)
-        | ty::Bound(..)
-        | ty::Placeholder(..)
-        | ty::Opaque(..)
-        | ty::Infer(_)
-        | ty::Error => true,
-
-        ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
-
-        // Zero-length arrays never contain anything to drop.
-        ty::Array(_, len) if len.try_eval_usize(tcx, param_env) == Some(0) => false,
-
-        // Structural recursion.
-        ty::Array(ty, _) | ty::Slice(ty) => needs_drop(ty),
-
-        ty::Closure(def_id, ref substs) => {
-            substs.as_closure().upvar_tys(def_id, tcx).any(needs_drop)
-        }
-
-        // Pessimistically assume that all generators will require destructors
-        // as we don't know if a destructor is a noop or not until after the MIR
-        // state transformation pass
-        ty::Generator(..) => true,
-
-        ty::Tuple(..) => ty.tuple_fields().any(needs_drop),
-
-        // unions don't have destructors because of the child types,
-        // only if they manually implement `Drop` (handled above).
-        ty::Adt(def, _) if def.is_union() => false,
-
-        ty::Adt(def, substs) => def
-            .variants
-            .iter()
-            .any(|variant| variant.fields.iter().any(|field| needs_drop(field.ty(tcx, substs)))),
-    })
-}
-
-pub fn provide(providers: &mut ty::query::Providers<'_>) {
-    *providers = ty::query::Providers {
-        is_copy_raw,
-        is_sized_raw,
-        is_freeze_raw,
-        needs_drop_raw,
-        ..*providers
-    };
-}
diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs
index daaba95cf6..4e02a1744f 100644
--- a/src/librustc/traits/mod.rs
+++ b/src/librustc/traits/mod.rs
@@ -2,143 +2,74 @@
 //!
 //! [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/resolution.html
 
-#[allow(dead_code)]
-pub mod auto_trait;
-mod chalk_fulfill;
-pub mod codegen;
-mod coherence;
-mod engine;
-pub mod error_reporting;
-mod fulfill;
-pub mod misc;
-mod object_safety;
-mod on_unimplemented;
-mod project;
 pub mod query;
-mod select;
-mod specialize;
+pub mod select;
+pub mod specialization_graph;
 mod structural_impls;
-mod structural_match;
-mod util;
-pub mod wf;
 
-use crate::infer::outlives::env::OutlivesEnvironment;
-use crate::infer::{InferCtxt, SuppressRegionErrors};
-use crate::middle::region;
 use crate::mir::interpret::ErrorHandled;
-use crate::ty::error::{ExpectedFound, TypeError};
-use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
-use crate::ty::subst::{InternalSubsts, SubstsRef};
-use crate::ty::{self, AdtKind, GenericParamDefKind, List, ToPredicate, Ty, TyCtxt, WithConstness};
-use crate::util::common::ErrorReported;
-use chalk_engine;
+use crate::ty::subst::SubstsRef;
+use crate::ty::{self, AdtKind, List, Ty, TyCtxt};
+
+use rustc_ast::ast;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
-use rustc_macros::HashStable;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast;
+use smallvec::SmallVec;
 
+use std::borrow::Cow;
 use std::fmt::Debug;
 use std::rc::Rc;
 
-pub use self::FulfillmentErrorCode::*;
-pub use self::ObligationCauseCode::*;
-pub use self::SelectionError::*;
-pub use self::Vtable::*;
+pub use self::select::{EvaluationCache, EvaluationResult, OverflowError, SelectionCache};
 
-pub use self::coherence::{add_placeholder_note, orphan_check, overlapping_impls};
-pub use self::coherence::{OrphanCheckErr, OverlapResult};
-pub use self::engine::{TraitEngine, TraitEngineExt};
-pub use self::fulfill::{FulfillmentContext, PendingPredicateObligation};
-pub use self::object_safety::astconv_object_safety_violations;
-pub use self::object_safety::is_vtable_safe_method;
-pub use self::object_safety::object_safety_violations;
-pub use self::object_safety::MethodViolationCode;
-pub use self::object_safety::ObjectSafetyViolation;
-pub use self::on_unimplemented::{OnUnimplementedDirective, OnUnimplementedNote};
-pub use self::project::MismatchedProjectionTypes;
-pub use self::project::{normalize, normalize_projection_type, poly_project_and_unify_type};
-pub use self::project::{Normalized, ProjectionCache, ProjectionCacheSnapshot, Reveal};
-pub use self::select::{EvaluationCache, SelectionCache, SelectionContext};
-pub use self::select::{EvaluationResult, IntercrateAmbiguityCause, OverflowError};
-pub use self::specialize::find_associated_item;
-pub use self::specialize::specialization_graph::FutureCompatOverlapError;
-pub use self::specialize::specialization_graph::FutureCompatOverlapErrorKind;
-pub use self::specialize::{specialization_graph, translate_substs, OverlapError};
-pub use self::structural_match::search_for_structural_match_violation;
-pub use self::structural_match::type_marked_structural;
-pub use self::structural_match::NonStructuralMatchTy;
-pub use self::util::{elaborate_predicates, elaborate_trait_ref, elaborate_trait_refs};
-pub use self::util::{expand_trait_aliases, TraitAliasExpander};
-pub use self::util::{
-    get_vtable_index_of_object_method, impl_is_default, impl_item_is_final,
-    predicate_for_trait_def, upcast_choices,
-};
-pub use self::util::{
-    supertrait_def_ids, supertraits, transitive_bounds, SupertraitDefIds, Supertraits,
-};
-
-pub use self::chalk_fulfill::{
-    CanonicalGoal as ChalkCanonicalGoal, FulfillmentContext as ChalkFulfillmentContext,
-};
-
-pub use self::FulfillmentErrorCode::*;
 pub use self::ObligationCauseCode::*;
 pub use self::SelectionError::*;
 pub use self::Vtable::*;
 
-/// Whether to enable bug compatibility with issue #43355.
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum IntercrateMode {
-    Issue43355,
-    Fixed,
-}
-
-/// The mode that trait queries run in.
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum TraitQueryMode {
-    // Standard/un-canonicalized queries get accurate
-    // spans etc. passed in and hence can do reasonable
-    // error reporting on their own.
-    Standard,
-    // Canonicalized queries get dummy spans and hence
-    // must generally propagate errors to
-    // pre-canonicalization callsites.
-    Canonical,
-}
-
-/// An `Obligation` represents some trait reference (e.g., `int: Eq`) for
-/// which the vtable must be found. The process of finding a vtable is
-/// called "resolving" the `Obligation`. This process consists of
-/// either identifying an `impl` (e.g., `impl Eq for int`) that
-/// provides the required vtable, or else finding a bound that is in
-/// scope. The eventual result is usually a `Selection` (defined below).
-#[derive(Clone, PartialEq, Eq, Hash)]
-pub struct Obligation<'tcx, T> {
-    /// The reason we have to prove this thing.
-    pub cause: ObligationCause<'tcx>,
-
-    /// The environment in which we should prove this thing.
-    pub param_env: ty::ParamEnv<'tcx>,
-
-    /// The thing we are trying to prove.
-    pub predicate: T,
-
-    /// If we started proving this as a result of trying to prove
-    /// something else, track the total depth to ensure termination.
-    /// If this goes over a certain threshold, we abort compilation --
-    /// in such cases, we can not say whether or not the predicate
-    /// holds for certain. Stupid halting problem; such a drag.
-    pub recursion_depth: usize,
+/// Depending on the stage of compilation, we want projection to be
+/// more or less conservative.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, HashStable)]
+pub enum Reveal {
+    /// At type-checking time, we refuse to project any associated
+    /// type that is marked `default`. Non-`default` ("final") types
+    /// are always projected. This is necessary in general for
+    /// soundness of specialization. However, we *could* allow
+    /// projections in fully-monomorphic cases. We choose not to,
+    /// because we prefer for `default type` to force the type
+    /// definition to be treated abstractly by any consumers of the
+    /// impl. Concretely, that means that the following example will
+    /// fail to compile:
+    ///
+    /// ```
+    /// trait Assoc {
+    ///     type Output;
+    /// }
+    ///
+    /// impl<T> Assoc for T {
+    ///     default type Output = bool;
+    /// }
+    ///
+    /// fn main() {
+    ///     let <() as Assoc>::Output = true;
+    /// }
+    /// ```
+    UserFacing,
+
+    /// At codegen time, all monomorphic projections will succeed.
+    /// Also, `impl Trait` is normalized to the concrete type,
+    /// which has to be already collected by type-checking.
+    ///
+    /// NOTE: as `impl Trait`'s concrete type should *never*
+    /// be observable directly by the user, `Reveal::All`
+    /// should not be used by checks which may expose
+    /// type equality or type contents to the user.
+    /// There are some exceptions, e.g., around OIBITS and
+    /// transmute-checking, which expose some details, but
+    /// not the whole concrete type of the `impl Trait`.
+    All,
 }
 
-pub type PredicateObligation<'tcx> = Obligation<'tcx, ty::Predicate<'tcx>>;
-pub type TraitObligation<'tcx> = Obligation<'tcx, ty::PolyTraitPredicate<'tcx>>;
-
-// `PredicateObligation` is used a lot. Make sure it doesn't unintentionally get bigger.
-#[cfg(target_arch = "x86_64")]
-static_assert_size!(PredicateObligation<'_>, 112);
-
 /// The reason why we incurred this obligation; used for error reporting.
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct ObligationCause<'tcx> {
@@ -155,8 +86,25 @@ pub struct ObligationCause<'tcx> {
     pub code: ObligationCauseCode<'tcx>,
 }
 
-impl ObligationCause<'_> {
-    pub fn span(&self, tcx: TyCtxt<'_>) -> Span {
+impl<'tcx> ObligationCause<'tcx> {
+    #[inline]
+    pub fn new(
+        span: Span,
+        body_id: hir::HirId,
+        code: ObligationCauseCode<'tcx>,
+    ) -> ObligationCause<'tcx> {
+        ObligationCause { span, body_id, code }
+    }
+
+    pub fn misc(span: Span, body_id: hir::HirId) -> ObligationCause<'tcx> {
+        ObligationCause { span, body_id, code: MiscObligation }
+    }
+
+    pub fn dummy() -> ObligationCause<'tcx> {
+        ObligationCause { span: DUMMY_SP, body_id: hir::CRATE_HIR_ID, code: MiscObligation }
+    }
+
+    pub fn span(&self, tcx: TyCtxt<'tcx>) -> Span {
         match self.code {
             ObligationCauseCode::CompareImplMethodObligation { .. }
             | ObligationCauseCode::MainFunctionType
@@ -311,6 +259,17 @@ pub enum ObligationCauseCode<'tcx> {
     AssocTypeBound(Box<AssocTypeBoundData>),
 }
 
+impl ObligationCauseCode<'_> {
+    // Return the base obligation, ignoring derived obligations.
+    pub fn peel_derives(&self) -> &Self {
+        let mut base_cause = self;
+        while let BuiltinDerivedObligation(cause) | ImplDerivedObligation(cause) = base_cause {
+            base_cause = &cause.parent_code;
+        }
+        base_cause
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct AssocTypeBoundData {
     pub impl_span: Option<Span>,
@@ -344,16 +303,12 @@ pub struct DerivedObligationCause<'tcx> {
     /// current obligation. Note that only trait obligations lead to
     /// derived obligations, so we just store the trait reference here
     /// directly.
-    parent_trait_ref: ty::PolyTraitRef<'tcx>,
+    pub parent_trait_ref: ty::PolyTraitRef<'tcx>,
 
     /// The parent trait had this cause.
-    parent_code: Rc<ObligationCauseCode<'tcx>>,
+    pub parent_code: Rc<ObligationCauseCode<'tcx>>,
 }
 
-pub type Obligations<'tcx, O> = Vec<Obligation<'tcx, O>>;
-pub type PredicateObligations<'tcx> = Vec<PredicateObligation<'tcx>>;
-pub type TraitObligations<'tcx> = Vec<TraitObligation<'tcx>>;
-
 /// The following types:
 /// * `WhereClause`,
 /// * `WellFormed`,
@@ -510,8 +465,6 @@ pub struct InEnvironment<'tcx, G> {
     pub goal: G,
 }
 
-pub type Selection<'tcx> = Vtable<'tcx, PredicateObligation<'tcx>>;
-
 #[derive(Clone, Debug, TypeFoldable)]
 pub enum SelectionError<'tcx> {
     Unimplemented,
@@ -525,23 +478,6 @@ pub enum SelectionError<'tcx> {
     Overflow,
 }
 
-pub struct FulfillmentError<'tcx> {
-    pub obligation: PredicateObligation<'tcx>,
-    pub code: FulfillmentErrorCode<'tcx>,
-    /// Diagnostics only: we opportunistically change the `code.span` when we encounter an
-    /// obligation error caused by a call argument. When this is the case, we also signal that in
-    /// this field to ensure accuracy of suggestions.
-    pub points_at_arg_span: bool,
-}
-
-#[derive(Clone)]
-pub enum FulfillmentErrorCode<'tcx> {
-    CodeSelectionError(SelectionError<'tcx>),
-    CodeProjectionError(MismatchedProjectionTypes<'tcx>),
-    CodeSubtypeError(ExpectedFound<Ty<'tcx>>, TypeError<'tcx>), // always comes from a SubtypePredicate
-    CodeAmbiguity,
-}
-
 /// When performing resolution, it is typically the case that there
 /// can be one of three outcomes:
 ///
@@ -626,6 +562,81 @@ pub enum Vtable<'tcx, N> {
     VtableTraitAlias(VtableTraitAliasData<'tcx, N>),
 }
 
+impl<'tcx, N> Vtable<'tcx, N> {
+    pub fn nested_obligations(self) -> Vec<N> {
+        match self {
+            VtableImpl(i) => i.nested,
+            VtableParam(n) => n,
+            VtableBuiltin(i) => i.nested,
+            VtableAutoImpl(d) => d.nested,
+            VtableClosure(c) => c.nested,
+            VtableGenerator(c) => c.nested,
+            VtableObject(d) => d.nested,
+            VtableFnPointer(d) => d.nested,
+            VtableTraitAlias(d) => d.nested,
+        }
+    }
+
+    pub fn borrow_nested_obligations(&self) -> &[N] {
+        match &self {
+            VtableImpl(i) => &i.nested[..],
+            VtableParam(n) => &n[..],
+            VtableBuiltin(i) => &i.nested[..],
+            VtableAutoImpl(d) => &d.nested[..],
+            VtableClosure(c) => &c.nested[..],
+            VtableGenerator(c) => &c.nested[..],
+            VtableObject(d) => &d.nested[..],
+            VtableFnPointer(d) => &d.nested[..],
+            VtableTraitAlias(d) => &d.nested[..],
+        }
+    }
+
+    pub fn map<M, F>(self, f: F) -> Vtable<'tcx, M>
+    where
+        F: FnMut(N) -> M,
+    {
+        match self {
+            VtableImpl(i) => VtableImpl(VtableImplData {
+                impl_def_id: i.impl_def_id,
+                substs: i.substs,
+                nested: i.nested.into_iter().map(f).collect(),
+            }),
+            VtableParam(n) => VtableParam(n.into_iter().map(f).collect()),
+            VtableBuiltin(i) => {
+                VtableBuiltin(VtableBuiltinData { nested: i.nested.into_iter().map(f).collect() })
+            }
+            VtableObject(o) => VtableObject(VtableObjectData {
+                upcast_trait_ref: o.upcast_trait_ref,
+                vtable_base: o.vtable_base,
+                nested: o.nested.into_iter().map(f).collect(),
+            }),
+            VtableAutoImpl(d) => VtableAutoImpl(VtableAutoImplData {
+                trait_def_id: d.trait_def_id,
+                nested: d.nested.into_iter().map(f).collect(),
+            }),
+            VtableClosure(c) => VtableClosure(VtableClosureData {
+                closure_def_id: c.closure_def_id,
+                substs: c.substs,
+                nested: c.nested.into_iter().map(f).collect(),
+            }),
+            VtableGenerator(c) => VtableGenerator(VtableGeneratorData {
+                generator_def_id: c.generator_def_id,
+                substs: c.substs,
+                nested: c.nested.into_iter().map(f).collect(),
+            }),
+            VtableFnPointer(p) => VtableFnPointer(VtableFnPointerData {
+                fn_ty: p.fn_ty,
+                nested: p.nested.into_iter().map(f).collect(),
+            }),
+            VtableTraitAlias(d) => VtableTraitAlias(VtableTraitAliasData {
+                alias_def_id: d.alias_def_id,
+                substs: d.substs,
+                nested: d.nested.into_iter().map(f).collect(),
+            }),
+        }
+    }
+}
+
 /// Identifies a particular impl in the source, along with a set of
 /// substitutions from the impl's type/lifetime parameters. The
 /// `nested` vector corresponds to the nested obligations attached to
@@ -700,608 +711,131 @@ pub struct VtableTraitAliasData<'tcx, N> {
     pub nested: Vec<N>,
 }
 
-/// Creates predicate obligations from the generic bounds.
-pub fn predicates_for_generics<'tcx>(
-    cause: ObligationCause<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    generic_bounds: &ty::InstantiatedPredicates<'tcx>,
-) -> PredicateObligations<'tcx> {
-    util::predicates_for_generics(cause, 0, param_env, generic_bounds)
-}
+#[derive(Clone, Debug, PartialEq, Eq, Hash, HashStable)]
+pub enum ObjectSafetyViolation {
+    /// `Self: Sized` declared on the trait.
+    SizedSelf(SmallVec<[Span; 1]>),
 
-/// Determines whether the type `ty` is known to meet `bound` and
-/// returns true if so. Returns false if `ty` either does not meet
-/// `bound` or is not known to meet bound (note that this is
-/// conservative towards *no impl*, which is the opposite of the
-/// `evaluate` methods).
-pub fn type_known_to_meet_bound_modulo_regions<'a, 'tcx>(
-    infcx: &InferCtxt<'a, 'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    ty: Ty<'tcx>,
-    def_id: DefId,
-    span: Span,
-) -> bool {
-    debug!(
-        "type_known_to_meet_bound_modulo_regions(ty={:?}, bound={:?})",
-        ty,
-        infcx.tcx.def_path_str(def_id)
-    );
-
-    let trait_ref = ty::TraitRef { def_id, substs: infcx.tcx.mk_substs_trait(ty, &[]) };
-    let obligation = Obligation {
-        param_env,
-        cause: ObligationCause::misc(span, hir::DUMMY_HIR_ID),
-        recursion_depth: 0,
-        predicate: trait_ref.without_const().to_predicate(),
-    };
-
-    let result = infcx.predicate_must_hold_modulo_regions(&obligation);
-    debug!(
-        "type_known_to_meet_ty={:?} bound={} => {:?}",
-        ty,
-        infcx.tcx.def_path_str(def_id),
-        result
-    );
-
-    if result && (ty.has_infer_types() || ty.has_closure_types()) {
-        // Because of inference "guessing", selection can sometimes claim
-        // to succeed while the success requires a guess. To ensure
-        // this function's result remains infallible, we must confirm
-        // that guess. While imperfect, I believe this is sound.
-
-        // The handling of regions in this area of the code is terrible,
-        // see issue #29149. We should be able to improve on this with
-        // NLL.
-        let mut fulfill_cx = FulfillmentContext::new_ignoring_regions();
-
-        // We can use a dummy node-id here because we won't pay any mind
-        // to region obligations that arise (there shouldn't really be any
-        // anyhow).
-        let cause = ObligationCause::misc(span, hir::DUMMY_HIR_ID);
-
-        fulfill_cx.register_bound(infcx, param_env, ty, def_id, cause);
-
-        // Note: we only assume something is `Copy` if we can
-        // *definitively* show that it implements `Copy`. Otherwise,
-        // assume it is move; linear is always ok.
-        match fulfill_cx.select_all_or_error(infcx) {
-            Ok(()) => {
-                debug!(
-                    "type_known_to_meet_bound_modulo_regions: ty={:?} bound={} success",
-                    ty,
-                    infcx.tcx.def_path_str(def_id)
-                );
-                true
-            }
-            Err(e) => {
-                debug!(
-                    "type_known_to_meet_bound_modulo_regions: ty={:?} bound={} errors={:?}",
-                    ty,
-                    infcx.tcx.def_path_str(def_id),
-                    e
-                );
-                false
-            }
-        }
-    } else {
-        result
-    }
+    /// Supertrait reference references `Self` an in illegal location
+    /// (e.g., `trait Foo : Bar<Self>`).
+    SupertraitSelf(SmallVec<[Span; 1]>),
+
+    /// Method has something illegal.
+    Method(ast::Name, MethodViolationCode, Span),
+
+    /// Associated const.
+    AssocConst(ast::Name, Span),
 }
 
-fn do_normalize_predicates<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    region_context: DefId,
-    cause: ObligationCause<'tcx>,
-    elaborated_env: ty::ParamEnv<'tcx>,
-    predicates: Vec<ty::Predicate<'tcx>>,
-) -> Result<Vec<ty::Predicate<'tcx>>, ErrorReported> {
-    debug!(
-        "do_normalize_predicates(predicates={:?}, region_context={:?}, cause={:?})",
-        predicates, region_context, cause,
-    );
-    let span = cause.span;
-    tcx.infer_ctxt().enter(|infcx| {
-        // FIXME. We should really... do something with these region
-        // obligations. But this call just continues the older
-        // behavior (i.e., doesn't cause any new bugs), and it would
-        // take some further refactoring to actually solve them. In
-        // particular, we would have to handle implied bounds
-        // properly, and that code is currently largely confined to
-        // regionck (though I made some efforts to extract it
-        // out). -nmatsakis
-        //
-        // @arielby: In any case, these obligations are checked
-        // by wfcheck anyway, so I'm not sure we have to check
-        // them here too, and we will remove this function when
-        // we move over to lazy normalization *anyway*.
-        let fulfill_cx = FulfillmentContext::new_ignoring_regions();
-        let predicates =
-            match fully_normalize(&infcx, fulfill_cx, cause, elaborated_env, &predicates) {
-                Ok(predicates) => predicates,
-                Err(errors) => {
-                    infcx.report_fulfillment_errors(&errors, None, false);
-                    return Err(ErrorReported);
+impl ObjectSafetyViolation {
+    pub fn error_msg(&self) -> Cow<'static, str> {
+        match *self {
+            ObjectSafetyViolation::SizedSelf(_) => "it requires `Self: Sized`".into(),
+            ObjectSafetyViolation::SupertraitSelf(ref spans) => {
+                if spans.iter().any(|sp| *sp != DUMMY_SP) {
+                    "it uses `Self` as a type parameter in this".into()
+                } else {
+                    "it cannot use `Self` as a type parameter in a supertrait or `where`-clause"
+                        .into()
                 }
-            };
-
-        debug!("do_normalize_predictes: normalized predicates = {:?}", predicates);
-
-        let region_scope_tree = region::ScopeTree::default();
-
-        // We can use the `elaborated_env` here; the region code only
-        // cares about declarations like `'a: 'b`.
-        let outlives_env = OutlivesEnvironment::new(elaborated_env);
-
-        infcx.resolve_regions_and_report_errors(
-            region_context,
-            &region_scope_tree,
-            &outlives_env,
-            SuppressRegionErrors::default(),
-        );
-
-        let predicates = match infcx.fully_resolve(&predicates) {
-            Ok(predicates) => predicates,
-            Err(fixup_err) => {
-                // If we encounter a fixup error, it means that some type
-                // variable wound up unconstrained. I actually don't know
-                // if this can happen, and I certainly don't expect it to
-                // happen often, but if it did happen it probably
-                // represents a legitimate failure due to some kind of
-                // unconstrained variable, and it seems better not to ICE,
-                // all things considered.
-                tcx.sess.span_err(span, &fixup_err.to_string());
-                return Err(ErrorReported);
             }
-        };
-        if predicates.has_local_value() {
-            // FIXME: shouldn't we, you know, actually report an error here? or an ICE?
-            Err(ErrorReported)
-        } else {
-            Ok(predicates)
-        }
-    })
-}
-
-// FIXME: this is gonna need to be removed ...
-/// Normalizes the parameter environment, reporting errors if they occur.
-pub fn normalize_param_env_or_error<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    region_context: DefId,
-    unnormalized_env: ty::ParamEnv<'tcx>,
-    cause: ObligationCause<'tcx>,
-) -> ty::ParamEnv<'tcx> {
-    // I'm not wild about reporting errors here; I'd prefer to
-    // have the errors get reported at a defined place (e.g.,
-    // during typeck). Instead I have all parameter
-    // environments, in effect, going through this function
-    // and hence potentially reporting errors. This ensures of
-    // course that we never forget to normalize (the
-    // alternative seemed like it would involve a lot of
-    // manual invocations of this fn -- and then we'd have to
-    // deal with the errors at each of those sites).
-    //
-    // In any case, in practice, typeck constructs all the
-    // parameter environments once for every fn as it goes,
-    // and errors will get reported then; so after typeck we
-    // can be sure that no errors should occur.
-
-    debug!(
-        "normalize_param_env_or_error(region_context={:?}, unnormalized_env={:?}, cause={:?})",
-        region_context, unnormalized_env, cause
-    );
-
-    let mut predicates: Vec<_> =
-        util::elaborate_predicates(tcx, unnormalized_env.caller_bounds.to_vec()).collect();
-
-    debug!("normalize_param_env_or_error: elaborated-predicates={:?}", predicates);
-
-    let elaborated_env = ty::ParamEnv::new(
-        tcx.intern_predicates(&predicates),
-        unnormalized_env.reveal,
-        unnormalized_env.def_id,
-    );
-
-    // HACK: we are trying to normalize the param-env inside *itself*. The problem is that
-    // normalization expects its param-env to be already normalized, which means we have
-    // a circularity.
-    //
-    // The way we handle this is by normalizing the param-env inside an unnormalized version
-    // of the param-env, which means that if the param-env contains unnormalized projections,
-    // we'll have some normalization failures. This is unfortunate.
-    //
-    // Lazy normalization would basically handle this by treating just the
-    // normalizing-a-trait-ref-requires-itself cycles as evaluation failures.
-    //
-    // Inferred outlives bounds can create a lot of `TypeOutlives` predicates for associated
-    // types, so to make the situation less bad, we normalize all the predicates *but*
-    // the `TypeOutlives` predicates first inside the unnormalized parameter environment, and
-    // then we normalize the `TypeOutlives` bounds inside the normalized parameter environment.
-    //
-    // This works fairly well because trait matching  does not actually care about param-env
-    // TypeOutlives predicates - these are normally used by regionck.
-    let outlives_predicates: Vec<_> = predicates
-        .drain_filter(|predicate| match predicate {
-            ty::Predicate::TypeOutlives(..) => true,
-            _ => false,
-        })
-        .collect();
-
-    debug!(
-        "normalize_param_env_or_error: predicates=(non-outlives={:?}, outlives={:?})",
-        predicates, outlives_predicates
-    );
-    let non_outlives_predicates = match do_normalize_predicates(
-        tcx,
-        region_context,
-        cause.clone(),
-        elaborated_env,
-        predicates,
-    ) {
-        Ok(predicates) => predicates,
-        // An unnormalized env is better than nothing.
-        Err(ErrorReported) => {
-            debug!("normalize_param_env_or_error: errored resolving non-outlives predicates");
-            return elaborated_env;
-        }
-    };
-
-    debug!("normalize_param_env_or_error: non-outlives predicates={:?}", non_outlives_predicates);
-
-    // Not sure whether it is better to include the unnormalized TypeOutlives predicates
-    // here. I believe they should not matter, because we are ignoring TypeOutlives param-env
-    // predicates here anyway. Keeping them here anyway because it seems safer.
-    let outlives_env: Vec<_> =
-        non_outlives_predicates.iter().chain(&outlives_predicates).cloned().collect();
-    let outlives_env =
-        ty::ParamEnv::new(tcx.intern_predicates(&outlives_env), unnormalized_env.reveal, None);
-    let outlives_predicates = match do_normalize_predicates(
-        tcx,
-        region_context,
-        cause,
-        outlives_env,
-        outlives_predicates,
-    ) {
-        Ok(predicates) => predicates,
-        // An unnormalized env is better than nothing.
-        Err(ErrorReported) => {
-            debug!("normalize_param_env_or_error: errored resolving outlives predicates");
-            return elaborated_env;
+            ObjectSafetyViolation::Method(name, MethodViolationCode::StaticMethod(_), _) => {
+                format!("associated function `{}` has no `self` parameter", name).into()
+            }
+            ObjectSafetyViolation::Method(
+                name,
+                MethodViolationCode::ReferencesSelfInput(_),
+                DUMMY_SP,
+            ) => format!("method `{}` references the `Self` type in its parameters", name).into(),
+            ObjectSafetyViolation::Method(name, MethodViolationCode::ReferencesSelfInput(_), _) => {
+                format!("method `{}` references the `Self` type in this parameter", name).into()
+            }
+            ObjectSafetyViolation::Method(name, MethodViolationCode::ReferencesSelfOutput, _) => {
+                format!("method `{}` references the `Self` type in its return type", name).into()
+            }
+            ObjectSafetyViolation::Method(
+                name,
+                MethodViolationCode::WhereClauseReferencesSelf,
+                _,
+            ) => {
+                format!("method `{}` references the `Self` type in its `where` clause", name).into()
+            }
+            ObjectSafetyViolation::Method(name, MethodViolationCode::Generic, _) => {
+                format!("method `{}` has generic type parameters", name).into()
+            }
+            ObjectSafetyViolation::Method(name, MethodViolationCode::UndispatchableReceiver, _) => {
+                format!("method `{}`'s `self` parameter cannot be dispatched on", name).into()
+            }
+            ObjectSafetyViolation::AssocConst(name, DUMMY_SP) => {
+                format!("it contains associated `const` `{}`", name).into()
+            }
+            ObjectSafetyViolation::AssocConst(..) => "it contains this associated `const`".into(),
         }
-    };
-    debug!("normalize_param_env_or_error: outlives predicates={:?}", outlives_predicates);
-
-    let mut predicates = non_outlives_predicates;
-    predicates.extend(outlives_predicates);
-    debug!("normalize_param_env_or_error: final predicates={:?}", predicates);
-    ty::ParamEnv::new(
-        tcx.intern_predicates(&predicates),
-        unnormalized_env.reveal,
-        unnormalized_env.def_id,
-    )
-}
-
-pub fn fully_normalize<'a, 'tcx, T>(
-    infcx: &InferCtxt<'a, 'tcx>,
-    mut fulfill_cx: FulfillmentContext<'tcx>,
-    cause: ObligationCause<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    value: &T,
-) -> Result<T, Vec<FulfillmentError<'tcx>>>
-where
-    T: TypeFoldable<'tcx>,
-{
-    debug!("fully_normalize_with_fulfillcx(value={:?})", value);
-    let selcx = &mut SelectionContext::new(infcx);
-    let Normalized { value: normalized_value, obligations } =
-        project::normalize(selcx, param_env, cause, value);
-    debug!(
-        "fully_normalize: normalized_value={:?} obligations={:?}",
-        normalized_value, obligations
-    );
-    for obligation in obligations {
-        fulfill_cx.register_predicate_obligation(selcx.infcx(), obligation);
     }
 
-    debug!("fully_normalize: select_all_or_error start");
-    fulfill_cx.select_all_or_error(infcx)?;
-    debug!("fully_normalize: select_all_or_error complete");
-    let resolved_value = infcx.resolve_vars_if_possible(&normalized_value);
-    debug!("fully_normalize: resolved_value={:?}", resolved_value);
-    Ok(resolved_value)
-}
-
-/// Normalizes the predicates and checks whether they hold in an empty
-/// environment. If this returns false, then either normalize
-/// encountered an error or one of the predicates did not hold. Used
-/// when creating vtables to check for unsatisfiable methods.
-pub fn normalize_and_test_predicates<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    predicates: Vec<ty::Predicate<'tcx>>,
-) -> bool {
-    debug!("normalize_and_test_predicates(predicates={:?})", predicates);
-
-    let result = tcx.infer_ctxt().enter(|infcx| {
-        let param_env = ty::ParamEnv::reveal_all();
-        let mut selcx = SelectionContext::new(&infcx);
-        let mut fulfill_cx = FulfillmentContext::new();
-        let cause = ObligationCause::dummy();
-        let Normalized { value: predicates, obligations } =
-            normalize(&mut selcx, param_env, cause.clone(), &predicates);
-        for obligation in obligations {
-            fulfill_cx.register_predicate_obligation(&infcx, obligation);
-        }
-        for predicate in predicates {
-            let obligation = Obligation::new(cause.clone(), param_env, predicate);
-            fulfill_cx.register_predicate_obligation(&infcx, obligation);
-        }
-
-        fulfill_cx.select_all_or_error(&infcx).is_ok()
-    });
-    debug!("normalize_and_test_predicates(predicates={:?}) = {:?}", predicates, result);
-    result
-}
-
-fn substitute_normalize_and_test_predicates<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    key: (DefId, SubstsRef<'tcx>),
-) -> bool {
-    debug!("substitute_normalize_and_test_predicates(key={:?})", key);
-
-    let predicates = tcx.predicates_of(key.0).instantiate(tcx, key.1).predicates;
-    let result = normalize_and_test_predicates(tcx, predicates);
-
-    debug!("substitute_normalize_and_test_predicates(key={:?}) = {:?}", key, result);
-    result
-}
-
-/// Given a trait `trait_ref`, iterates the vtable entries
-/// that come from `trait_ref`, including its supertraits.
-#[inline] // FIXME(#35870): avoid closures being unexported due to `impl Trait`.
-fn vtable_methods<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_ref: ty::PolyTraitRef<'tcx>,
-) -> &'tcx [Option<(DefId, SubstsRef<'tcx>)>] {
-    debug!("vtable_methods({:?})", trait_ref);
-
-    tcx.arena.alloc_from_iter(supertraits(tcx, trait_ref).flat_map(move |trait_ref| {
-        let trait_methods = tcx
-            .associated_items(trait_ref.def_id())
-            .filter(|item| item.kind == ty::AssocKind::Method);
-
-        // Now list each method's DefId and InternalSubsts (for within its trait).
-        // If the method can never be called from this object, produce None.
-        trait_methods.map(move |trait_method| {
-            debug!("vtable_methods: trait_method={:?}", trait_method);
-            let def_id = trait_method.def_id;
-
-            // Some methods cannot be called on an object; skip those.
-            if !is_vtable_safe_method(tcx, trait_ref.def_id(), &trait_method) {
-                debug!("vtable_methods: not vtable safe");
+    pub fn solution(&self) -> Option<(String, Option<(String, Span)>)> {
+        Some(match *self {
+            ObjectSafetyViolation::SizedSelf(_) | ObjectSafetyViolation::SupertraitSelf(_) => {
                 return None;
             }
-
-            // The method may have some early-bound lifetimes; add regions for those.
-            let substs = trait_ref.map_bound(|trait_ref| {
-                InternalSubsts::for_item(tcx, def_id, |param, _| match param.kind {
-                    GenericParamDefKind::Lifetime => tcx.lifetimes.re_erased.into(),
-                    GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => {
-                        trait_ref.substs[param.index as usize]
-                    }
-                })
-            });
-
-            // The trait type may have higher-ranked lifetimes in it;
-            // erase them if they appear, so that we get the type
-            // at some particular call site.
-            let substs =
-                tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), &substs);
-
-            // It's possible that the method relies on where-clauses that
-            // do not hold for this particular set of type parameters.
-            // Note that this method could then never be called, so we
-            // do not want to try and codegen it, in that case (see #23435).
-            let predicates = tcx.predicates_of(def_id).instantiate_own(tcx, substs);
-            if !normalize_and_test_predicates(tcx, predicates.predicates) {
-                debug!("vtable_methods: predicates do not hold");
-                return None;
+            ObjectSafetyViolation::Method(name, MethodViolationCode::StaticMethod(sugg), _) => (
+                format!(
+                    "consider turning `{}` into a method by giving it a `&self` argument or \
+                     constraining it so it does not apply to trait objects",
+                    name
+                ),
+                sugg.map(|(sugg, sp)| (sugg.to_string(), sp)),
+            ),
+            ObjectSafetyViolation::Method(
+                name,
+                MethodViolationCode::UndispatchableReceiver,
+                span,
+            ) => (
+                format!("consider changing method `{}`'s `self` parameter to be `&self`", name),
+                Some(("&Self".to_string(), span)),
+            ),
+            ObjectSafetyViolation::AssocConst(name, _)
+            | ObjectSafetyViolation::Method(name, ..) => {
+                (format!("consider moving `{}` to another trait", name), None)
             }
-
-            Some((def_id, substs))
         })
-    }))
-}
-
-impl<'tcx, O> Obligation<'tcx, O> {
-    pub fn new(
-        cause: ObligationCause<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-        predicate: O,
-    ) -> Obligation<'tcx, O> {
-        Obligation { cause, param_env, recursion_depth: 0, predicate }
-    }
-
-    fn with_depth(
-        cause: ObligationCause<'tcx>,
-        recursion_depth: usize,
-        param_env: ty::ParamEnv<'tcx>,
-        predicate: O,
-    ) -> Obligation<'tcx, O> {
-        Obligation { cause, param_env, recursion_depth, predicate }
-    }
-
-    pub fn misc(
-        span: Span,
-        body_id: hir::HirId,
-        param_env: ty::ParamEnv<'tcx>,
-        trait_ref: O,
-    ) -> Obligation<'tcx, O> {
-        Obligation::new(ObligationCause::misc(span, body_id), param_env, trait_ref)
-    }
-
-    pub fn with<P>(&self, value: P) -> Obligation<'tcx, P> {
-        Obligation {
-            cause: self.cause.clone(),
-            param_env: self.param_env,
-            recursion_depth: self.recursion_depth,
-            predicate: value,
-        }
-    }
-}
-
-impl<'tcx> ObligationCause<'tcx> {
-    #[inline]
-    pub fn new(
-        span: Span,
-        body_id: hir::HirId,
-        code: ObligationCauseCode<'tcx>,
-    ) -> ObligationCause<'tcx> {
-        ObligationCause { span, body_id, code }
-    }
-
-    pub fn misc(span: Span, body_id: hir::HirId) -> ObligationCause<'tcx> {
-        ObligationCause { span, body_id, code: MiscObligation }
-    }
-
-    pub fn dummy() -> ObligationCause<'tcx> {
-        ObligationCause { span: DUMMY_SP, body_id: hir::CRATE_HIR_ID, code: MiscObligation }
-    }
-}
-
-impl ObligationCauseCode<'_> {
-    // Return the base obligation, ignoring derived obligations.
-    pub fn peel_derives(&self) -> &Self {
-        let mut base_cause = self;
-        while let BuiltinDerivedObligation(cause) | ImplDerivedObligation(cause) = base_cause {
-            base_cause = &cause.parent_code;
-        }
-        base_cause
-    }
-}
-
-impl<'tcx, N> Vtable<'tcx, N> {
-    pub fn nested_obligations(self) -> Vec<N> {
-        match self {
-            VtableImpl(i) => i.nested,
-            VtableParam(n) => n,
-            VtableBuiltin(i) => i.nested,
-            VtableAutoImpl(d) => d.nested,
-            VtableClosure(c) => c.nested,
-            VtableGenerator(c) => c.nested,
-            VtableObject(d) => d.nested,
-            VtableFnPointer(d) => d.nested,
-            VtableTraitAlias(d) => d.nested,
-        }
     }
 
-    pub fn map<M, F>(self, f: F) -> Vtable<'tcx, M>
-    where
-        F: FnMut(N) -> M,
-    {
+    pub fn spans(&self) -> SmallVec<[Span; 1]> {
+        // When `span` comes from a separate crate, it'll be `DUMMY_SP`. Treat it as `None` so
+        // diagnostics use a `note` instead of a `span_label`.
         match self {
-            VtableImpl(i) => VtableImpl(VtableImplData {
-                impl_def_id: i.impl_def_id,
-                substs: i.substs,
-                nested: i.nested.into_iter().map(f).collect(),
-            }),
-            VtableParam(n) => VtableParam(n.into_iter().map(f).collect()),
-            VtableBuiltin(i) => {
-                VtableBuiltin(VtableBuiltinData { nested: i.nested.into_iter().map(f).collect() })
+            ObjectSafetyViolation::SupertraitSelf(spans)
+            | ObjectSafetyViolation::SizedSelf(spans) => spans.clone(),
+            ObjectSafetyViolation::AssocConst(_, span)
+            | ObjectSafetyViolation::Method(_, _, span)
+                if *span != DUMMY_SP =>
+            {
+                smallvec![*span]
             }
-            VtableObject(o) => VtableObject(VtableObjectData {
-                upcast_trait_ref: o.upcast_trait_ref,
-                vtable_base: o.vtable_base,
-                nested: o.nested.into_iter().map(f).collect(),
-            }),
-            VtableAutoImpl(d) => VtableAutoImpl(VtableAutoImplData {
-                trait_def_id: d.trait_def_id,
-                nested: d.nested.into_iter().map(f).collect(),
-            }),
-            VtableClosure(c) => VtableClosure(VtableClosureData {
-                closure_def_id: c.closure_def_id,
-                substs: c.substs,
-                nested: c.nested.into_iter().map(f).collect(),
-            }),
-            VtableGenerator(c) => VtableGenerator(VtableGeneratorData {
-                generator_def_id: c.generator_def_id,
-                substs: c.substs,
-                nested: c.nested.into_iter().map(f).collect(),
-            }),
-            VtableFnPointer(p) => VtableFnPointer(VtableFnPointerData {
-                fn_ty: p.fn_ty,
-                nested: p.nested.into_iter().map(f).collect(),
-            }),
-            VtableTraitAlias(d) => VtableTraitAlias(VtableTraitAliasData {
-                alias_def_id: d.alias_def_id,
-                substs: d.substs,
-                nested: d.nested.into_iter().map(f).collect(),
-            }),
+            _ => smallvec![],
         }
     }
 }
 
-impl<'tcx> FulfillmentError<'tcx> {
-    fn new(
-        obligation: PredicateObligation<'tcx>,
-        code: FulfillmentErrorCode<'tcx>,
-    ) -> FulfillmentError<'tcx> {
-        FulfillmentError { obligation: obligation, code: code, points_at_arg_span: false }
-    }
-}
-
-impl<'tcx> TraitObligation<'tcx> {
-    fn self_ty(&self) -> ty::Binder<Ty<'tcx>> {
-        self.predicate.map_bound(|p| p.self_ty())
-    }
-}
-
-pub fn provide(providers: &mut ty::query::Providers<'_>) {
-    misc::provide(providers);
-    *providers = ty::query::Providers {
-        is_object_safe: object_safety::is_object_safe_provider,
-        specialization_graph_of: specialize::specialization_graph_provider,
-        specializes: specialize::specializes,
-        codegen_fulfill_obligation: codegen::codegen_fulfill_obligation,
-        vtable_methods,
-        substitute_normalize_and_test_predicates,
-        ..*providers
-    };
-}
+/// Reasons a method might not be object-safe.
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, HashStable)]
+pub enum MethodViolationCode {
+    /// e.g., `fn foo()`
+    StaticMethod(Option<(&'static str, Span)>),
 
-pub trait ExClauseFold<'tcx>
-where
-    Self: chalk_engine::context::Context + Clone,
-{
-    fn fold_ex_clause_with<F: TypeFolder<'tcx>>(
-        ex_clause: &chalk_engine::ExClause<Self>,
-        folder: &mut F,
-    ) -> chalk_engine::ExClause<Self>;
-
-    fn visit_ex_clause_with<V: TypeVisitor<'tcx>>(
-        ex_clause: &chalk_engine::ExClause<Self>,
-        visitor: &mut V,
-    ) -> bool;
-}
+    /// e.g., `fn foo(&self, x: Self)`
+    ReferencesSelfInput(usize),
 
-pub trait ChalkContextLift<'tcx>
-where
-    Self: chalk_engine::context::Context + Clone,
-{
-    type LiftedExClause: Debug + 'tcx;
-    type LiftedDelayedLiteral: Debug + 'tcx;
-    type LiftedLiteral: Debug + 'tcx;
+    /// e.g., `fn foo(&self) -> Self`
+    ReferencesSelfOutput,
 
-    fn lift_ex_clause_to_tcx(
-        ex_clause: &chalk_engine::ExClause<Self>,
-        tcx: TyCtxt<'tcx>,
-    ) -> Option<Self::LiftedExClause>;
+    /// e.g., `fn foo(&self) where Self: Clone`
+    WhereClauseReferencesSelf,
 
-    fn lift_delayed_literal_to_tcx(
-        ex_clause: &chalk_engine::DelayedLiteral<Self>,
-        tcx: TyCtxt<'tcx>,
-    ) -> Option<Self::LiftedDelayedLiteral>;
+    /// e.g., `fn foo<A>()`
+    Generic,
 
-    fn lift_literal_to_tcx(
-        ex_clause: &chalk_engine::Literal<Self>,
-        tcx: TyCtxt<'tcx>,
-    ) -> Option<Self::LiftedLiteral>;
+    /// the method's receiver (`self` argument) can't be dispatched on
+    UndispatchableReceiver,
 }
diff --git a/src/librustc/traits/object_safety.rs b/src/librustc/traits/object_safety.rs
deleted file mode 100644
index 15f81bb3f4..0000000000
--- a/src/librustc/traits/object_safety.rs
+++ /dev/null
@@ -1,730 +0,0 @@
-//! "Object safety" refers to the ability for a trait to be converted
-//! to an object. In general, traits may only be converted to an
-//! object if all of their methods meet certain criteria. In particular,
-//! they must:
-//!
-//!   - have a suitable receiver from which we can extract a vtable and coerce to a "thin" version
-//!     that doesn't contain the vtable;
-//!   - not reference the erased type `Self` except for in this receiver;
-//!   - not have generic type parameters.
-
-use super::elaborate_predicates;
-
-use crate::traits::{self, Obligation, ObligationCause};
-use crate::ty::subst::{InternalSubsts, Subst};
-use crate::ty::{self, Predicate, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_session::lint::builtin::WHERE_CLAUSES_OBJECT_SAFETY;
-use rustc_span::symbol::Symbol;
-use rustc_span::{Span, DUMMY_SP};
-use syntax::ast;
-
-use std::borrow::Cow;
-use std::iter::{self};
-
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum ObjectSafetyViolation {
-    /// `Self: Sized` declared on the trait.
-    SizedSelf,
-
-    /// Supertrait reference references `Self` an in illegal location
-    /// (e.g., `trait Foo : Bar<Self>`).
-    SupertraitSelf,
-
-    /// Method has something illegal.
-    Method(ast::Name, MethodViolationCode, Span),
-
-    /// Associated const.
-    AssocConst(ast::Name, Span),
-}
-
-impl ObjectSafetyViolation {
-    pub fn error_msg(&self) -> Cow<'static, str> {
-        match *self {
-            ObjectSafetyViolation::SizedSelf => {
-                "the trait cannot require that `Self : Sized`".into()
-            }
-            ObjectSafetyViolation::SupertraitSelf => {
-                "the trait cannot use `Self` as a type parameter \
-                 in the supertraits or where-clauses"
-                    .into()
-            }
-            ObjectSafetyViolation::Method(name, MethodViolationCode::StaticMethod, _) => {
-                format!("associated function `{}` has no `self` parameter", name).into()
-            }
-            ObjectSafetyViolation::Method(name, MethodViolationCode::ReferencesSelf, _) => format!(
-                "method `{}` references the `Self` type in its parameters or return type",
-                name,
-            )
-            .into(),
-            ObjectSafetyViolation::Method(
-                name,
-                MethodViolationCode::WhereClauseReferencesSelf,
-                _,
-            ) => format!("method `{}` references the `Self` type in where clauses", name).into(),
-            ObjectSafetyViolation::Method(name, MethodViolationCode::Generic, _) => {
-                format!("method `{}` has generic type parameters", name).into()
-            }
-            ObjectSafetyViolation::Method(name, MethodViolationCode::UndispatchableReceiver, _) => {
-                format!("method `{}`'s `self` parameter cannot be dispatched on", name).into()
-            }
-            ObjectSafetyViolation::AssocConst(name, _) => {
-                format!("the trait cannot contain associated consts like `{}`", name).into()
-            }
-        }
-    }
-
-    pub fn span(&self) -> Option<Span> {
-        // When `span` comes from a separate crate, it'll be `DUMMY_SP`. Treat it as `None` so
-        // diagnostics use a `note` instead of a `span_label`.
-        match *self {
-            ObjectSafetyViolation::AssocConst(_, span)
-            | ObjectSafetyViolation::Method(_, _, span)
-                if span != DUMMY_SP =>
-            {
-                Some(span)
-            }
-            _ => None,
-        }
-    }
-}
-
-/// Reasons a method might not be object-safe.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum MethodViolationCode {
-    /// e.g., `fn foo()`
-    StaticMethod,
-
-    /// e.g., `fn foo(&self, x: Self)` or `fn foo(&self) -> Self`
-    ReferencesSelf,
-
-    /// e.g., `fn foo(&self) where Self: Clone`
-    WhereClauseReferencesSelf,
-
-    /// e.g., `fn foo<A>()`
-    Generic,
-
-    /// the method's receiver (`self` argument) can't be dispatched on
-    UndispatchableReceiver,
-}
-
-/// Returns the object safety violations that affect
-/// astconv -- currently, `Self` in supertraits. This is needed
-/// because `object_safety_violations` can't be used during
-/// type collection.
-pub fn astconv_object_safety_violations(
-    tcx: TyCtxt<'_>,
-    trait_def_id: DefId,
-) -> Vec<ObjectSafetyViolation> {
-    debug_assert!(tcx.generics_of(trait_def_id).has_self);
-    let violations = traits::supertrait_def_ids(tcx, trait_def_id)
-        .filter(|&def_id| predicates_reference_self(tcx, def_id, true))
-        .map(|_| ObjectSafetyViolation::SupertraitSelf)
-        .collect();
-
-    debug!("astconv_object_safety_violations(trait_def_id={:?}) = {:?}", trait_def_id, violations);
-
-    violations
-}
-
-pub fn object_safety_violations(
-    tcx: TyCtxt<'_>,
-    trait_def_id: DefId,
-) -> Vec<ObjectSafetyViolation> {
-    debug_assert!(tcx.generics_of(trait_def_id).has_self);
-    debug!("object_safety_violations: {:?}", trait_def_id);
-
-    traits::supertrait_def_ids(tcx, trait_def_id)
-        .flat_map(|def_id| object_safety_violations_for_trait(tcx, def_id))
-        .collect()
-}
-
-/// We say a method is *vtable safe* if it can be invoked on a trait
-/// object. Note that object-safe traits can have some
-/// non-vtable-safe methods, so long as they require `Self: Sized` or
-/// otherwise ensure that they cannot be used when `Self = Trait`.
-pub fn is_vtable_safe_method(tcx: TyCtxt<'_>, trait_def_id: DefId, method: &ty::AssocItem) -> bool {
-    debug_assert!(tcx.generics_of(trait_def_id).has_self);
-    debug!("is_vtable_safe_method({:?}, {:?})", trait_def_id, method);
-    // Any method that has a `Self: Sized` bound cannot be called.
-    if generics_require_sized_self(tcx, method.def_id) {
-        return false;
-    }
-
-    match virtual_call_violation_for_method(tcx, trait_def_id, method) {
-        None | Some(MethodViolationCode::WhereClauseReferencesSelf) => true,
-        Some(_) => false,
-    }
-}
-
-fn object_safety_violations_for_trait(
-    tcx: TyCtxt<'_>,
-    trait_def_id: DefId,
-) -> Vec<ObjectSafetyViolation> {
-    // Check methods for violations.
-    let mut violations: Vec<_> = tcx
-        .associated_items(trait_def_id)
-        .filter(|item| item.kind == ty::AssocKind::Method)
-        .filter_map(|item| {
-            object_safety_violation_for_method(tcx, trait_def_id, &item)
-                .map(|code| ObjectSafetyViolation::Method(item.ident.name, code, item.ident.span))
-        })
-        .filter(|violation| {
-            if let ObjectSafetyViolation::Method(
-                _,
-                MethodViolationCode::WhereClauseReferencesSelf,
-                span,
-            ) = violation
-            {
-                // Using `CRATE_NODE_ID` is wrong, but it's hard to get a more precise id.
-                // It's also hard to get a use site span, so we use the method definition span.
-                tcx.struct_span_lint_hir(
-                    WHERE_CLAUSES_OBJECT_SAFETY,
-                    hir::CRATE_HIR_ID,
-                    *span,
-                    &format!(
-                        "the trait `{}` cannot be made into an object",
-                        tcx.def_path_str(trait_def_id)
-                    ),
-                )
-                .note(&violation.error_msg())
-                .emit();
-                false
-            } else {
-                true
-            }
-        })
-        .collect();
-
-    // Check the trait itself.
-    if trait_has_sized_self(tcx, trait_def_id) {
-        violations.push(ObjectSafetyViolation::SizedSelf);
-    }
-    if predicates_reference_self(tcx, trait_def_id, false) {
-        violations.push(ObjectSafetyViolation::SupertraitSelf);
-    }
-
-    violations.extend(
-        tcx.associated_items(trait_def_id)
-            .filter(|item| item.kind == ty::AssocKind::Const)
-            .map(|item| ObjectSafetyViolation::AssocConst(item.ident.name, item.ident.span)),
-    );
-
-    debug!(
-        "object_safety_violations_for_trait(trait_def_id={:?}) = {:?}",
-        trait_def_id, violations
-    );
-
-    violations
-}
-
-fn predicates_reference_self(tcx: TyCtxt<'_>, trait_def_id: DefId, supertraits_only: bool) -> bool {
-    let trait_ref = ty::Binder::dummy(ty::TraitRef::identity(tcx, trait_def_id));
-    let predicates = if supertraits_only {
-        tcx.super_predicates_of(trait_def_id)
-    } else {
-        tcx.predicates_of(trait_def_id)
-    };
-    let self_ty = tcx.types.self_param;
-    let has_self_ty = |t: Ty<'_>| t.walk().any(|t| t == self_ty);
-    predicates
-        .predicates
-        .iter()
-        .map(|(predicate, _)| predicate.subst_supertrait(tcx, &trait_ref))
-        .any(|predicate| {
-            match predicate {
-                ty::Predicate::Trait(ref data, _) => {
-                    // In the case of a trait predicate, we can skip the "self" type.
-                    data.skip_binder().input_types().skip(1).any(has_self_ty)
-                }
-                ty::Predicate::Projection(ref data) => {
-                    // And similarly for projections. This should be redundant with
-                    // the previous check because any projection should have a
-                    // matching `Trait` predicate with the same inputs, but we do
-                    // the check to be safe.
-                    //
-                    // Note that we *do* allow projection *outputs* to contain
-                    // `self` (i.e., `trait Foo: Bar<Output=Self::Result> { type Result; }`),
-                    // we just require the user to specify *both* outputs
-                    // in the object type (i.e., `dyn Foo<Output=(), Result=()>`).
-                    //
-                    // This is ALT2 in issue #56288, see that for discussion of the
-                    // possible alternatives.
-                    data.skip_binder()
-                        .projection_ty
-                        .trait_ref(tcx)
-                        .input_types()
-                        .skip(1)
-                        .any(has_self_ty)
-                }
-                ty::Predicate::WellFormed(..)
-                | ty::Predicate::ObjectSafe(..)
-                | ty::Predicate::TypeOutlives(..)
-                | ty::Predicate::RegionOutlives(..)
-                | ty::Predicate::ClosureKind(..)
-                | ty::Predicate::Subtype(..)
-                | ty::Predicate::ConstEvaluatable(..) => false,
-            }
-        })
-}
-
-fn trait_has_sized_self(tcx: TyCtxt<'_>, trait_def_id: DefId) -> bool {
-    generics_require_sized_self(tcx, trait_def_id)
-}
-
-fn generics_require_sized_self(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
-    let sized_def_id = match tcx.lang_items().sized_trait() {
-        Some(def_id) => def_id,
-        None => {
-            return false; /* No Sized trait, can't require it! */
-        }
-    };
-
-    // Search for a predicate like `Self : Sized` amongst the trait bounds.
-    let predicates = tcx.predicates_of(def_id);
-    let predicates = predicates.instantiate_identity(tcx).predicates;
-    elaborate_predicates(tcx, predicates).any(|predicate| match predicate {
-        ty::Predicate::Trait(ref trait_pred, _) => {
-            trait_pred.def_id() == sized_def_id && trait_pred.skip_binder().self_ty().is_param(0)
-        }
-        ty::Predicate::Projection(..)
-        | ty::Predicate::Subtype(..)
-        | ty::Predicate::RegionOutlives(..)
-        | ty::Predicate::WellFormed(..)
-        | ty::Predicate::ObjectSafe(..)
-        | ty::Predicate::ClosureKind(..)
-        | ty::Predicate::TypeOutlives(..)
-        | ty::Predicate::ConstEvaluatable(..) => false,
-    })
-}
-
-/// Returns `Some(_)` if this method makes the containing trait not object safe.
-fn object_safety_violation_for_method(
-    tcx: TyCtxt<'_>,
-    trait_def_id: DefId,
-    method: &ty::AssocItem,
-) -> Option<MethodViolationCode> {
-    debug!("object_safety_violation_for_method({:?}, {:?})", trait_def_id, method);
-    // Any method that has a `Self : Sized` requisite is otherwise
-    // exempt from the regulations.
-    if generics_require_sized_self(tcx, method.def_id) {
-        return None;
-    }
-
-    virtual_call_violation_for_method(tcx, trait_def_id, method)
-}
-
-/// Returns `Some(_)` if this method cannot be called on a trait
-/// object; this does not necessarily imply that the enclosing trait
-/// is not object safe, because the method might have a where clause
-/// `Self:Sized`.
-fn virtual_call_violation_for_method<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    method: &ty::AssocItem,
-) -> Option<MethodViolationCode> {
-    // The method's first parameter must be named `self`
-    if !method.method_has_self_argument {
-        return Some(MethodViolationCode::StaticMethod);
-    }
-
-    let sig = tcx.fn_sig(method.def_id);
-
-    for input_ty in &sig.skip_binder().inputs()[1..] {
-        if contains_illegal_self_type_reference(tcx, trait_def_id, input_ty) {
-            return Some(MethodViolationCode::ReferencesSelf);
-        }
-    }
-    if contains_illegal_self_type_reference(tcx, trait_def_id, sig.output().skip_binder()) {
-        return Some(MethodViolationCode::ReferencesSelf);
-    }
-
-    // We can't monomorphize things like `fn foo<A>(...)`.
-    let own_counts = tcx.generics_of(method.def_id).own_counts();
-    if own_counts.types + own_counts.consts != 0 {
-        return Some(MethodViolationCode::Generic);
-    }
-
-    if tcx
-        .predicates_of(method.def_id)
-        .predicates
-        .iter()
-        // A trait object can't claim to live more than the concrete type,
-        // so outlives predicates will always hold.
-        .cloned()
-        .filter(|(p, _)| p.to_opt_type_outlives().is_none())
-        .collect::<Vec<_>>()
-        // Do a shallow visit so that `contains_illegal_self_type_reference`
-        // may apply it's custom visiting.
-        .visit_tys_shallow(|t| contains_illegal_self_type_reference(tcx, trait_def_id, t))
-    {
-        return Some(MethodViolationCode::WhereClauseReferencesSelf);
-    }
-
-    let receiver_ty =
-        tcx.liberate_late_bound_regions(method.def_id, &sig.map_bound(|sig| sig.inputs()[0]));
-
-    // Until `unsized_locals` is fully implemented, `self: Self` can't be dispatched on.
-    // However, this is already considered object-safe. We allow it as a special case here.
-    // FIXME(mikeyhew) get rid of this `if` statement once `receiver_is_dispatchable` allows
-    // `Receiver: Unsize<Receiver[Self => dyn Trait]>`.
-    if receiver_ty != tcx.types.self_param {
-        if !receiver_is_dispatchable(tcx, method, receiver_ty) {
-            return Some(MethodViolationCode::UndispatchableReceiver);
-        } else {
-            // Do sanity check to make sure the receiver actually has the layout of a pointer.
-
-            use crate::ty::layout::Abi;
-
-            let param_env = tcx.param_env(method.def_id);
-
-            let abi_of_ty = |ty: Ty<'tcx>| -> &Abi {
-                match tcx.layout_of(param_env.and(ty)) {
-                    Ok(layout) => &layout.abi,
-                    Err(err) => bug!("error: {}\n while computing layout for type {:?}", err, ty),
-                }
-            };
-
-            // e.g., `Rc<()>`
-            let unit_receiver_ty =
-                receiver_for_self_ty(tcx, receiver_ty, tcx.mk_unit(), method.def_id);
-
-            match abi_of_ty(unit_receiver_ty) {
-                &Abi::Scalar(..) => (),
-                abi => {
-                    tcx.sess.delay_span_bug(
-                        tcx.def_span(method.def_id),
-                        &format!(
-                            "receiver when `Self = ()` should have a Scalar ABI; found {:?}",
-                            abi
-                        ),
-                    );
-                }
-            }
-
-            let trait_object_ty =
-                object_ty_for_trait(tcx, trait_def_id, tcx.mk_region(ty::ReStatic));
-
-            // e.g., `Rc<dyn Trait>`
-            let trait_object_receiver =
-                receiver_for_self_ty(tcx, receiver_ty, trait_object_ty, method.def_id);
-
-            match abi_of_ty(trait_object_receiver) {
-                &Abi::ScalarPair(..) => (),
-                abi => {
-                    tcx.sess.delay_span_bug(
-                        tcx.def_span(method.def_id),
-                        &format!(
-                            "receiver when `Self = {}` should have a ScalarPair ABI; \
-                                 found {:?}",
-                            trait_object_ty, abi
-                        ),
-                    );
-                }
-            }
-        }
-    }
-
-    None
-}
-
-/// Performs a type substitution to produce the version of `receiver_ty` when `Self = self_ty`.
-/// For example, for `receiver_ty = Rc<Self>` and `self_ty = Foo`, returns `Rc<Foo>`.
-fn receiver_for_self_ty<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    receiver_ty: Ty<'tcx>,
-    self_ty: Ty<'tcx>,
-    method_def_id: DefId,
-) -> Ty<'tcx> {
-    debug!("receiver_for_self_ty({:?}, {:?}, {:?})", receiver_ty, self_ty, method_def_id);
-    let substs = InternalSubsts::for_item(tcx, method_def_id, |param, _| {
-        if param.index == 0 { self_ty.into() } else { tcx.mk_param_from_def(param) }
-    });
-
-    let result = receiver_ty.subst(tcx, substs);
-    debug!(
-        "receiver_for_self_ty({:?}, {:?}, {:?}) = {:?}",
-        receiver_ty, self_ty, method_def_id, result
-    );
-    result
-}
-
-/// Creates the object type for the current trait. For example,
-/// if the current trait is `Deref`, then this will be
-/// `dyn Deref<Target = Self::Target> + 'static`.
-fn object_ty_for_trait<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    lifetime: ty::Region<'tcx>,
-) -> Ty<'tcx> {
-    debug!("object_ty_for_trait: trait_def_id={:?}", trait_def_id);
-
-    let trait_ref = ty::TraitRef::identity(tcx, trait_def_id);
-
-    let trait_predicate =
-        ty::ExistentialPredicate::Trait(ty::ExistentialTraitRef::erase_self_ty(tcx, trait_ref));
-
-    let mut associated_types = traits::supertraits(tcx, ty::Binder::dummy(trait_ref))
-        .flat_map(|super_trait_ref| {
-            tcx.associated_items(super_trait_ref.def_id()).map(move |item| (super_trait_ref, item))
-        })
-        .filter(|(_, item)| item.kind == ty::AssocKind::Type)
-        .collect::<Vec<_>>();
-
-    // existential predicates need to be in a specific order
-    associated_types.sort_by_cached_key(|(_, item)| tcx.def_path_hash(item.def_id));
-
-    let projection_predicates = associated_types.into_iter().map(|(super_trait_ref, item)| {
-        // We *can* get bound lifetimes here in cases like
-        // `trait MyTrait: for<'s> OtherTrait<&'s T, Output=bool>`.
-        //
-        // binder moved to (*)...
-        let super_trait_ref = super_trait_ref.skip_binder();
-        ty::ExistentialPredicate::Projection(ty::ExistentialProjection {
-            ty: tcx.mk_projection(item.def_id, super_trait_ref.substs),
-            item_def_id: item.def_id,
-            substs: super_trait_ref.substs,
-        })
-    });
-
-    let existential_predicates =
-        tcx.mk_existential_predicates(iter::once(trait_predicate).chain(projection_predicates));
-
-    let object_ty = tcx.mk_dynamic(
-        // (*) ... binder re-introduced here
-        ty::Binder::bind(existential_predicates),
-        lifetime,
-    );
-
-    debug!("object_ty_for_trait: object_ty=`{}`", object_ty);
-
-    object_ty
-}
-
-/// Checks the method's receiver (the `self` argument) can be dispatched on when `Self` is a
-/// trait object. We require that `DispatchableFromDyn` be implemented for the receiver type
-/// in the following way:
-/// - let `Receiver` be the type of the `self` argument, i.e `Self`, `&Self`, `Rc<Self>`,
-/// - require the following bound:
-///
-///   ```
-///   Receiver[Self => T]: DispatchFromDyn<Receiver[Self => dyn Trait]>
-///   ```
-///
-///   where `Foo[X => Y]` means "the same type as `Foo`, but with `X` replaced with `Y`"
-///   (substitution notation).
-///
-/// Some examples of receiver types and their required obligation:
-/// - `&'a mut self` requires `&'a mut Self: DispatchFromDyn<&'a mut dyn Trait>`,
-/// - `self: Rc<Self>` requires `Rc<Self>: DispatchFromDyn<Rc<dyn Trait>>`,
-/// - `self: Pin<Box<Self>>` requires `Pin<Box<Self>>: DispatchFromDyn<Pin<Box<dyn Trait>>>`.
-///
-/// The only case where the receiver is not dispatchable, but is still a valid receiver
-/// type (just not object-safe), is when there is more than one level of pointer indirection.
-/// E.g., `self: &&Self`, `self: &Rc<Self>`, `self: Box<Box<Self>>`. In these cases, there
-/// is no way, or at least no inexpensive way, to coerce the receiver from the version where
-/// `Self = dyn Trait` to the version where `Self = T`, where `T` is the unknown erased type
-/// contained by the trait object, because the object that needs to be coerced is behind
-/// a pointer.
-///
-/// In practice, we cannot use `dyn Trait` explicitly in the obligation because it would result
-/// in a new check that `Trait` is object safe, creating a cycle (until object_safe_for_dispatch
-/// is stabilized, see tracking issue https://github.com/rust-lang/rust/issues/43561).
-/// Instead, we fudge a little by introducing a new type parameter `U` such that
-/// `Self: Unsize<U>` and `U: Trait + ?Sized`, and use `U` in place of `dyn Trait`.
-/// Written as a chalk-style query:
-///
-///     forall (U: Trait + ?Sized) {
-///         if (Self: Unsize<U>) {
-///             Receiver: DispatchFromDyn<Receiver[Self => U]>
-///         }
-///     }
-///
-/// for `self: &'a mut Self`, this means `&'a mut Self: DispatchFromDyn<&'a mut U>`
-/// for `self: Rc<Self>`, this means `Rc<Self>: DispatchFromDyn<Rc<U>>`
-/// for `self: Pin<Box<Self>>`, this means `Pin<Box<Self>>: DispatchFromDyn<Pin<Box<U>>>`
-//
-// FIXME(mikeyhew) when unsized receivers are implemented as part of unsized rvalues, add this
-// fallback query: `Receiver: Unsize<Receiver[Self => U]>` to support receivers like
-// `self: Wrapper<Self>`.
-#[allow(dead_code)]
-fn receiver_is_dispatchable<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    method: &ty::AssocItem,
-    receiver_ty: Ty<'tcx>,
-) -> bool {
-    debug!("receiver_is_dispatchable: method = {:?}, receiver_ty = {:?}", method, receiver_ty);
-
-    let traits = (tcx.lang_items().unsize_trait(), tcx.lang_items().dispatch_from_dyn_trait());
-    let (unsize_did, dispatch_from_dyn_did) = if let (Some(u), Some(cu)) = traits {
-        (u, cu)
-    } else {
-        debug!("receiver_is_dispatchable: Missing Unsize or DispatchFromDyn traits");
-        return false;
-    };
-
-    // the type `U` in the query
-    // use a bogus type parameter to mimick a forall(U) query using u32::MAX for now.
-    // FIXME(mikeyhew) this is a total hack. Once object_safe_for_dispatch is stabilized, we can
-    // replace this with `dyn Trait`
-    let unsized_self_ty: Ty<'tcx> =
-        tcx.mk_ty_param(::std::u32::MAX, Symbol::intern("RustaceansAreAwesome"));
-
-    // `Receiver[Self => U]`
-    let unsized_receiver_ty =
-        receiver_for_self_ty(tcx, receiver_ty, unsized_self_ty, method.def_id);
-
-    // create a modified param env, with `Self: Unsize<U>` and `U: Trait` added to caller bounds
-    // `U: ?Sized` is already implied here
-    let param_env = {
-        let mut param_env = tcx.param_env(method.def_id);
-
-        // Self: Unsize<U>
-        let unsize_predicate = ty::TraitRef {
-            def_id: unsize_did,
-            substs: tcx.mk_substs_trait(tcx.types.self_param, &[unsized_self_ty.into()]),
-        }
-        .without_const()
-        .to_predicate();
-
-        // U: Trait<Arg1, ..., ArgN>
-        let trait_predicate = {
-            let substs =
-                InternalSubsts::for_item(tcx, method.container.assert_trait(), |param, _| {
-                    if param.index == 0 {
-                        unsized_self_ty.into()
-                    } else {
-                        tcx.mk_param_from_def(param)
-                    }
-                });
-
-            ty::TraitRef { def_id: unsize_did, substs }.without_const().to_predicate()
-        };
-
-        let caller_bounds: Vec<Predicate<'tcx>> = param_env
-            .caller_bounds
-            .iter()
-            .cloned()
-            .chain(iter::once(unsize_predicate))
-            .chain(iter::once(trait_predicate))
-            .collect();
-
-        param_env.caller_bounds = tcx.intern_predicates(&caller_bounds);
-
-        param_env
-    };
-
-    // Receiver: DispatchFromDyn<Receiver[Self => U]>
-    let obligation = {
-        let predicate = ty::TraitRef {
-            def_id: dispatch_from_dyn_did,
-            substs: tcx.mk_substs_trait(receiver_ty, &[unsized_receiver_ty.into()]),
-        }
-        .without_const()
-        .to_predicate();
-
-        Obligation::new(ObligationCause::dummy(), param_env, predicate)
-    };
-
-    tcx.infer_ctxt().enter(|ref infcx| {
-        // the receiver is dispatchable iff the obligation holds
-        infcx.predicate_must_hold_modulo_regions(&obligation)
-    })
-}
-
-fn contains_illegal_self_type_reference<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    ty: Ty<'tcx>,
-) -> bool {
-    // This is somewhat subtle. In general, we want to forbid
-    // references to `Self` in the argument and return types,
-    // since the value of `Self` is erased. However, there is one
-    // exception: it is ok to reference `Self` in order to access
-    // an associated type of the current trait, since we retain
-    // the value of those associated types in the object type
-    // itself.
-    //
-    // ```rust
-    // trait SuperTrait {
-    //     type X;
-    // }
-    //
-    // trait Trait : SuperTrait {
-    //     type Y;
-    //     fn foo(&self, x: Self) // bad
-    //     fn foo(&self) -> Self // bad
-    //     fn foo(&self) -> Option<Self> // bad
-    //     fn foo(&self) -> Self::Y // OK, desugars to next example
-    //     fn foo(&self) -> <Self as Trait>::Y // OK
-    //     fn foo(&self) -> Self::X // OK, desugars to next example
-    //     fn foo(&self) -> <Self as SuperTrait>::X // OK
-    // }
-    // ```
-    //
-    // However, it is not as simple as allowing `Self` in a projected
-    // type, because there are illegal ways to use `Self` as well:
-    //
-    // ```rust
-    // trait Trait : SuperTrait {
-    //     ...
-    //     fn foo(&self) -> <Self as SomeOtherTrait>::X;
-    // }
-    // ```
-    //
-    // Here we will not have the type of `X` recorded in the
-    // object type, and we cannot resolve `Self as SomeOtherTrait`
-    // without knowing what `Self` is.
-
-    let mut supertraits: Option<Vec<ty::PolyTraitRef<'tcx>>> = None;
-    let mut error = false;
-    let self_ty = tcx.types.self_param;
-    ty.maybe_walk(|ty| {
-        match ty.kind {
-            ty::Param(_) => {
-                if ty == self_ty {
-                    error = true;
-                }
-
-                false // no contained types to walk
-            }
-
-            ty::Projection(ref data) => {
-                // This is a projected type `<Foo as SomeTrait>::X`.
-
-                // Compute supertraits of current trait lazily.
-                if supertraits.is_none() {
-                    let trait_ref = ty::Binder::bind(ty::TraitRef::identity(tcx, trait_def_id));
-                    supertraits = Some(traits::supertraits(tcx, trait_ref).collect());
-                }
-
-                // Determine whether the trait reference `Foo as
-                // SomeTrait` is in fact a supertrait of the
-                // current trait. In that case, this type is
-                // legal, because the type `X` will be specified
-                // in the object type.  Note that we can just use
-                // direct equality here because all of these types
-                // are part of the formal parameter listing, and
-                // hence there should be no inference variables.
-                let projection_trait_ref = ty::Binder::bind(data.trait_ref(tcx));
-                let is_supertrait_of_current_trait =
-                    supertraits.as_ref().unwrap().contains(&projection_trait_ref);
-
-                if is_supertrait_of_current_trait {
-                    false // do not walk contained types, do not report error, do collect $200
-                } else {
-                    true // DO walk contained types, POSSIBLY reporting an error
-                }
-            }
-
-            _ => true, // walk contained types, if any
-        }
-    });
-
-    error
-}
-
-pub(super) fn is_object_safe_provider(tcx: TyCtxt<'_>, trait_def_id: DefId) -> bool {
-    object_safety_violations(tcx, trait_def_id).is_empty()
-}
diff --git a/src/librustc/traits/on_unimplemented.rs b/src/librustc/traits/on_unimplemented.rs
deleted file mode 100644
index 669ec5ccc9..0000000000
--- a/src/librustc/traits/on_unimplemented.rs
+++ /dev/null
@@ -1,385 +0,0 @@
-use fmt_macros::{Parser, Piece, Position};
-
-use crate::ty::{self, GenericParamDefKind, TyCtxt};
-use crate::util::common::ErrorReported;
-
-use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::struct_span_err;
-use rustc_hir::def_id::DefId;
-use rustc_span::symbol::{kw, sym, Symbol};
-use rustc_span::Span;
-use syntax::ast::{MetaItem, NestedMetaItem};
-use syntax::attr;
-
-#[derive(Clone, Debug)]
-pub struct OnUnimplementedFormatString(Symbol);
-
-#[derive(Debug)]
-pub struct OnUnimplementedDirective {
-    pub condition: Option<MetaItem>,
-    pub subcommands: Vec<OnUnimplementedDirective>,
-    pub message: Option<OnUnimplementedFormatString>,
-    pub label: Option<OnUnimplementedFormatString>,
-    pub note: Option<OnUnimplementedFormatString>,
-    pub enclosing_scope: Option<OnUnimplementedFormatString>,
-}
-
-#[derive(Default)]
-pub struct OnUnimplementedNote {
-    pub message: Option<String>,
-    pub label: Option<String>,
-    pub note: Option<String>,
-    pub enclosing_scope: Option<String>,
-}
-
-fn parse_error(
-    tcx: TyCtxt<'_>,
-    span: Span,
-    message: &str,
-    label: &str,
-    note: Option<&str>,
-) -> ErrorReported {
-    let mut diag = struct_span_err!(tcx.sess, span, E0232, "{}", message);
-    diag.span_label(span, label);
-    if let Some(note) = note {
-        diag.note(note);
-    }
-    diag.emit();
-    ErrorReported
-}
-
-impl<'tcx> OnUnimplementedDirective {
-    fn parse(
-        tcx: TyCtxt<'tcx>,
-        trait_def_id: DefId,
-        items: &[NestedMetaItem],
-        span: Span,
-        is_root: bool,
-    ) -> Result<Self, ErrorReported> {
-        let mut errored = false;
-        let mut item_iter = items.iter();
-
-        let condition = if is_root {
-            None
-        } else {
-            let cond = item_iter
-                .next()
-                .ok_or_else(|| {
-                    parse_error(
-                        tcx,
-                        span,
-                        "empty `on`-clause in `#[rustc_on_unimplemented]`",
-                        "empty on-clause here",
-                        None,
-                    )
-                })?
-                .meta_item()
-                .ok_or_else(|| {
-                    parse_error(
-                        tcx,
-                        span,
-                        "invalid `on`-clause in `#[rustc_on_unimplemented]`",
-                        "invalid on-clause here",
-                        None,
-                    )
-                })?;
-            attr::eval_condition(cond, &tcx.sess.parse_sess, &mut |_| true);
-            Some(cond.clone())
-        };
-
-        let mut message = None;
-        let mut label = None;
-        let mut note = None;
-        let mut enclosing_scope = None;
-        let mut subcommands = vec![];
-
-        let parse_value = |value_str| {
-            OnUnimplementedFormatString::try_parse(tcx, trait_def_id, value_str, span).map(Some)
-        };
-
-        for item in item_iter {
-            if item.check_name(sym::message) && message.is_none() {
-                if let Some(message_) = item.value_str() {
-                    message = parse_value(message_)?;
-                    continue;
-                }
-            } else if item.check_name(sym::label) && label.is_none() {
-                if let Some(label_) = item.value_str() {
-                    label = parse_value(label_)?;
-                    continue;
-                }
-            } else if item.check_name(sym::note) && note.is_none() {
-                if let Some(note_) = item.value_str() {
-                    note = parse_value(note_)?;
-                    continue;
-                }
-            } else if item.check_name(sym::enclosing_scope) && enclosing_scope.is_none() {
-                if let Some(enclosing_scope_) = item.value_str() {
-                    enclosing_scope = parse_value(enclosing_scope_)?;
-                    continue;
-                }
-            } else if item.check_name(sym::on)
-                && is_root
-                && message.is_none()
-                && label.is_none()
-                && note.is_none()
-            {
-                if let Some(items) = item.meta_item_list() {
-                    if let Ok(subcommand) =
-                        Self::parse(tcx, trait_def_id, &items, item.span(), false)
-                    {
-                        subcommands.push(subcommand);
-                    } else {
-                        errored = true;
-                    }
-                    continue;
-                }
-            }
-
-            // nothing found
-            parse_error(
-                tcx,
-                item.span(),
-                "this attribute must have a valid value",
-                "expected value here",
-                Some(r#"eg `#[rustc_on_unimplemented(message="foo")]`"#),
-            );
-        }
-
-        if errored {
-            Err(ErrorReported)
-        } else {
-            Ok(OnUnimplementedDirective {
-                condition,
-                subcommands,
-                message,
-                label,
-                note,
-                enclosing_scope,
-            })
-        }
-    }
-
-    pub fn of_item(
-        tcx: TyCtxt<'tcx>,
-        trait_def_id: DefId,
-        impl_def_id: DefId,
-    ) -> Result<Option<Self>, ErrorReported> {
-        let attrs = tcx.get_attrs(impl_def_id);
-
-        let attr = if let Some(item) = attr::find_by_name(&attrs, sym::rustc_on_unimplemented) {
-            item
-        } else {
-            return Ok(None);
-        };
-
-        let result = if let Some(items) = attr.meta_item_list() {
-            Self::parse(tcx, trait_def_id, &items, attr.span, true).map(Some)
-        } else if let Some(value) = attr.value_str() {
-            Ok(Some(OnUnimplementedDirective {
-                condition: None,
-                message: None,
-                subcommands: vec![],
-                label: Some(OnUnimplementedFormatString::try_parse(
-                    tcx,
-                    trait_def_id,
-                    value,
-                    attr.span,
-                )?),
-                note: None,
-                enclosing_scope: None,
-            }))
-        } else {
-            return Err(ErrorReported);
-        };
-        debug!("of_item({:?}/{:?}) = {:?}", trait_def_id, impl_def_id, result);
-        result
-    }
-
-    pub fn evaluate(
-        &self,
-        tcx: TyCtxt<'tcx>,
-        trait_ref: ty::TraitRef<'tcx>,
-        options: &[(Symbol, Option<String>)],
-    ) -> OnUnimplementedNote {
-        let mut message = None;
-        let mut label = None;
-        let mut note = None;
-        let mut enclosing_scope = None;
-        info!("evaluate({:?}, trait_ref={:?}, options={:?})", self, trait_ref, options);
-
-        for command in self.subcommands.iter().chain(Some(self)).rev() {
-            if let Some(ref condition) = command.condition {
-                if !attr::eval_condition(condition, &tcx.sess.parse_sess, &mut |c| {
-                    c.ident().map_or(false, |ident| {
-                        options.contains(&(ident.name, c.value_str().map(|s| s.to_string())))
-                    })
-                }) {
-                    debug!("evaluate: skipping {:?} due to condition", command);
-                    continue;
-                }
-            }
-            debug!("evaluate: {:?} succeeded", command);
-            if let Some(ref message_) = command.message {
-                message = Some(message_.clone());
-            }
-
-            if let Some(ref label_) = command.label {
-                label = Some(label_.clone());
-            }
-
-            if let Some(ref note_) = command.note {
-                note = Some(note_.clone());
-            }
-
-            if let Some(ref enclosing_scope_) = command.enclosing_scope {
-                enclosing_scope = Some(enclosing_scope_.clone());
-            }
-        }
-
-        let options: FxHashMap<Symbol, String> = options
-            .into_iter()
-            .filter_map(|(k, v)| v.as_ref().map(|v| (*k, v.to_owned())))
-            .collect();
-        OnUnimplementedNote {
-            label: label.map(|l| l.format(tcx, trait_ref, &options)),
-            message: message.map(|m| m.format(tcx, trait_ref, &options)),
-            note: note.map(|n| n.format(tcx, trait_ref, &options)),
-            enclosing_scope: enclosing_scope.map(|e_s| e_s.format(tcx, trait_ref, &options)),
-        }
-    }
-}
-
-impl<'tcx> OnUnimplementedFormatString {
-    fn try_parse(
-        tcx: TyCtxt<'tcx>,
-        trait_def_id: DefId,
-        from: Symbol,
-        err_sp: Span,
-    ) -> Result<Self, ErrorReported> {
-        let result = OnUnimplementedFormatString(from);
-        result.verify(tcx, trait_def_id, err_sp)?;
-        Ok(result)
-    }
-
-    fn verify(
-        &self,
-        tcx: TyCtxt<'tcx>,
-        trait_def_id: DefId,
-        span: Span,
-    ) -> Result<(), ErrorReported> {
-        let name = tcx.item_name(trait_def_id);
-        let generics = tcx.generics_of(trait_def_id);
-        let s = self.0.as_str();
-        let parser = Parser::new(&s, None, vec![], false);
-        let mut result = Ok(());
-        for token in parser {
-            match token {
-                Piece::String(_) => (), // Normal string, no need to check it
-                Piece::NextArgument(a) => match a.position {
-                    // `{Self}` is allowed
-                    Position::ArgumentNamed(s) if s == kw::SelfUpper => (),
-                    // `{ThisTraitsName}` is allowed
-                    Position::ArgumentNamed(s) if s == name => (),
-                    // `{from_method}` is allowed
-                    Position::ArgumentNamed(s) if s == sym::from_method => (),
-                    // `{from_desugaring}` is allowed
-                    Position::ArgumentNamed(s) if s == sym::from_desugaring => (),
-                    // `{ItemContext}` is allowed
-                    Position::ArgumentNamed(s) if s == sym::item_context => (),
-                    // So is `{A}` if A is a type parameter
-                    Position::ArgumentNamed(s) => {
-                        match generics.params.iter().find(|param| param.name == s) {
-                            Some(_) => (),
-                            None => {
-                                struct_span_err!(
-                                    tcx.sess,
-                                    span,
-                                    E0230,
-                                    "there is no parameter `{}` on trait `{}`",
-                                    s,
-                                    name
-                                )
-                                .emit();
-                                result = Err(ErrorReported);
-                            }
-                        }
-                    }
-                    // `{:1}` and `{}` are not to be used
-                    Position::ArgumentIs(_) | Position::ArgumentImplicitlyIs(_) => {
-                        struct_span_err!(
-                            tcx.sess,
-                            span,
-                            E0231,
-                            "only named substitution parameters are allowed"
-                        )
-                        .emit();
-                        result = Err(ErrorReported);
-                    }
-                },
-            }
-        }
-
-        result
-    }
-
-    pub fn format(
-        &self,
-        tcx: TyCtxt<'tcx>,
-        trait_ref: ty::TraitRef<'tcx>,
-        options: &FxHashMap<Symbol, String>,
-    ) -> String {
-        let name = tcx.item_name(trait_ref.def_id);
-        let trait_str = tcx.def_path_str(trait_ref.def_id);
-        let generics = tcx.generics_of(trait_ref.def_id);
-        let generic_map = generics
-            .params
-            .iter()
-            .filter_map(|param| {
-                let value = match param.kind {
-                    GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => {
-                        trait_ref.substs[param.index as usize].to_string()
-                    }
-                    GenericParamDefKind::Lifetime => return None,
-                };
-                let name = param.name;
-                Some((name, value))
-            })
-            .collect::<FxHashMap<Symbol, String>>();
-        let empty_string = String::new();
-
-        let s = self.0.as_str();
-        let parser = Parser::new(&s, None, vec![], false);
-        let item_context = (options.get(&sym::item_context)).unwrap_or(&empty_string);
-        parser
-            .map(|p| match p {
-                Piece::String(s) => s,
-                Piece::NextArgument(a) => match a.position {
-                    Position::ArgumentNamed(s) => match generic_map.get(&s) {
-                        Some(val) => val,
-                        None if s == name => &trait_str,
-                        None => {
-                            if let Some(val) = options.get(&s) {
-                                val
-                            } else if s == sym::from_desugaring || s == sym::from_method {
-                                // don't break messages using these two arguments incorrectly
-                                &empty_string
-                            } else if s == sym::item_context {
-                                &item_context
-                            } else {
-                                bug!(
-                                    "broken on_unimplemented {:?} for {:?}: \
-                                      no argument matching {:?}",
-                                    self.0,
-                                    trait_ref,
-                                    s
-                                )
-                            }
-                        }
-                    },
-                    _ => bug!("broken on_unimplemented {:?} - bad format arg", self.0),
-                },
-            })
-            .collect()
-    }
-}
diff --git a/src/librustc/traits/query.rs b/src/librustc/traits/query.rs
new file mode 100644
index 0000000000..c905518262
--- /dev/null
+++ b/src/librustc/traits/query.rs
@@ -0,0 +1,332 @@
+//! Experimental types for the trait query interface. The methods
+//! defined in this module are all based on **canonicalization**,
+//! which makes a canonical query by replacing unbound inference
+//! variables and regions, so that results can be reused more broadly.
+//! The providers for the queries defined here can be found in
+//! `librustc_traits`.
+
+use crate::ich::StableHashingContext;
+use crate::infer::canonical::{Canonical, QueryResponse};
+use crate::ty::error::TypeError;
+use crate::ty::subst::GenericArg;
+use crate::ty::{self, Ty, TyCtxt};
+
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_data_structures::sync::Lrc;
+use rustc_errors::struct_span_err;
+use rustc_span::source_map::Span;
+use std::iter::FromIterator;
+use std::mem;
+
+pub mod type_op {
+    use crate::ty::fold::TypeFoldable;
+    use crate::ty::subst::UserSubsts;
+    use crate::ty::{Predicate, Ty};
+    use rustc_hir::def_id::DefId;
+    use std::fmt;
+
+    #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
+    pub struct AscribeUserType<'tcx> {
+        pub mir_ty: Ty<'tcx>,
+        pub def_id: DefId,
+        pub user_substs: UserSubsts<'tcx>,
+    }
+
+    impl<'tcx> AscribeUserType<'tcx> {
+        pub fn new(mir_ty: Ty<'tcx>, def_id: DefId, user_substs: UserSubsts<'tcx>) -> Self {
+            Self { mir_ty, def_id, user_substs }
+        }
+    }
+
+    #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
+    pub struct Eq<'tcx> {
+        pub a: Ty<'tcx>,
+        pub b: Ty<'tcx>,
+    }
+
+    impl<'tcx> Eq<'tcx> {
+        pub fn new(a: Ty<'tcx>, b: Ty<'tcx>) -> Self {
+            Self { a, b }
+        }
+    }
+
+    #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
+    pub struct Subtype<'tcx> {
+        pub sub: Ty<'tcx>,
+        pub sup: Ty<'tcx>,
+    }
+
+    impl<'tcx> Subtype<'tcx> {
+        pub fn new(sub: Ty<'tcx>, sup: Ty<'tcx>) -> Self {
+            Self { sub, sup }
+        }
+    }
+
+    #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
+    pub struct ProvePredicate<'tcx> {
+        pub predicate: Predicate<'tcx>,
+    }
+
+    impl<'tcx> ProvePredicate<'tcx> {
+        pub fn new(predicate: Predicate<'tcx>) -> Self {
+            ProvePredicate { predicate }
+        }
+    }
+
+    #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
+    pub struct Normalize<T> {
+        pub value: T,
+    }
+
+    impl<'tcx, T> Normalize<T>
+    where
+        T: fmt::Debug + TypeFoldable<'tcx>,
+    {
+        pub fn new(value: T) -> Self {
+            Self { value }
+        }
+    }
+}
+
+pub type CanonicalProjectionGoal<'tcx> =
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, ty::ProjectionTy<'tcx>>>;
+
+pub type CanonicalTyGoal<'tcx> = Canonical<'tcx, ty::ParamEnvAnd<'tcx, Ty<'tcx>>>;
+
+pub type CanonicalPredicateGoal<'tcx> = Canonical<'tcx, ty::ParamEnvAnd<'tcx, ty::Predicate<'tcx>>>;
+
+pub type CanonicalTypeOpAscribeUserTypeGoal<'tcx> =
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::AscribeUserType<'tcx>>>;
+
+pub type CanonicalTypeOpEqGoal<'tcx> = Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::Eq<'tcx>>>;
+
+pub type CanonicalTypeOpSubtypeGoal<'tcx> =
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::Subtype<'tcx>>>;
+
+pub type CanonicalTypeOpProvePredicateGoal<'tcx> =
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::ProvePredicate<'tcx>>>;
+
+pub type CanonicalTypeOpNormalizeGoal<'tcx, T> =
+    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::Normalize<T>>>;
+
+#[derive(Clone, Debug, HashStable)]
+pub struct NoSolution;
+
+pub type Fallible<T> = Result<T, NoSolution>;
+
+impl<'tcx> From<TypeError<'tcx>> for NoSolution {
+    fn from(_: TypeError<'tcx>) -> NoSolution {
+        NoSolution
+    }
+}
+
+#[derive(Clone, Debug, Default, HashStable, TypeFoldable, Lift)]
+pub struct DropckOutlivesResult<'tcx> {
+    pub kinds: Vec<GenericArg<'tcx>>,
+    pub overflows: Vec<Ty<'tcx>>,
+}
+
+impl<'tcx> DropckOutlivesResult<'tcx> {
+    pub fn report_overflows(&self, tcx: TyCtxt<'tcx>, span: Span, ty: Ty<'tcx>) {
+        if let Some(overflow_ty) = self.overflows.iter().next() {
+            let mut err = struct_span_err!(
+                tcx.sess,
+                span,
+                E0320,
+                "overflow while adding drop-check rules for {}",
+                ty,
+            );
+            err.note(&format!("overflowed on {}", overflow_ty));
+            err.emit();
+        }
+    }
+
+    pub fn into_kinds_reporting_overflows(
+        self,
+        tcx: TyCtxt<'tcx>,
+        span: Span,
+        ty: Ty<'tcx>,
+    ) -> Vec<GenericArg<'tcx>> {
+        self.report_overflows(tcx, span, ty);
+        let DropckOutlivesResult { kinds, overflows: _ } = self;
+        kinds
+    }
+}
+
+/// A set of constraints that need to be satisfied in order for
+/// a type to be valid for destruction.
+#[derive(Clone, Debug, HashStable)]
+pub struct DtorckConstraint<'tcx> {
+    /// Types that are required to be alive in order for this
+    /// type to be valid for destruction.
+    pub outlives: Vec<ty::subst::GenericArg<'tcx>>,
+
+    /// Types that could not be resolved: projections and params.
+    pub dtorck_types: Vec<Ty<'tcx>>,
+
+    /// If, during the computation of the dtorck constraint, we
+    /// overflow, that gets recorded here. The caller is expected to
+    /// report an error.
+    pub overflows: Vec<Ty<'tcx>>,
+}
+
+impl<'tcx> DtorckConstraint<'tcx> {
+    pub fn empty() -> DtorckConstraint<'tcx> {
+        DtorckConstraint { outlives: vec![], dtorck_types: vec![], overflows: vec![] }
+    }
+}
+
+impl<'tcx> FromIterator<DtorckConstraint<'tcx>> for DtorckConstraint<'tcx> {
+    fn from_iter<I: IntoIterator<Item = DtorckConstraint<'tcx>>>(iter: I) -> Self {
+        let mut result = Self::empty();
+
+        for DtorckConstraint { outlives, dtorck_types, overflows } in iter {
+            result.outlives.extend(outlives);
+            result.dtorck_types.extend(dtorck_types);
+            result.overflows.extend(overflows);
+        }
+
+        result
+    }
+}
+
+/// This returns true if the type `ty` is "trivial" for
+/// dropck-outlives -- that is, if it doesn't require any types to
+/// outlive. This is similar but not *quite* the same as the
+/// `needs_drop` test in the compiler already -- that is, for every
+/// type T for which this function return true, needs-drop would
+/// return `false`. But the reverse does not hold: in particular,
+/// `needs_drop` returns false for `PhantomData`, but it is not
+/// trivial for dropck-outlives.
+///
+/// Note also that `needs_drop` requires a "global" type (i.e., one
+/// with erased regions), but this function does not.
+pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
+    match ty.kind {
+        // None of these types have a destructor and hence they do not
+        // require anything in particular to outlive the dtor's
+        // execution.
+        ty::Infer(ty::FreshIntTy(_))
+        | ty::Infer(ty::FreshFloatTy(_))
+        | ty::Bool
+        | ty::Int(_)
+        | ty::Uint(_)
+        | ty::Float(_)
+        | ty::Never
+        | ty::FnDef(..)
+        | ty::FnPtr(_)
+        | ty::Char
+        | ty::GeneratorWitness(..)
+        | ty::RawPtr(_)
+        | ty::Ref(..)
+        | ty::Str
+        | ty::Foreign(..)
+        | ty::Error => true,
+
+        // [T; N] and [T] have same properties as T.
+        ty::Array(ty, _) | ty::Slice(ty) => trivial_dropck_outlives(tcx, ty),
+
+        // (T1..Tn) and closures have same properties as T1..Tn --
+        // check if *any* of those are trivial.
+        ty::Tuple(ref tys) => tys.iter().all(|t| trivial_dropck_outlives(tcx, t.expect_ty())),
+        ty::Closure(def_id, ref substs) => {
+            substs.as_closure().upvar_tys(def_id, tcx).all(|t| trivial_dropck_outlives(tcx, t))
+        }
+
+        ty::Adt(def, _) => {
+            if Some(def.did) == tcx.lang_items().manually_drop() {
+                // `ManuallyDrop` never has a dtor.
+                true
+            } else {
+                // Other types might. Moreover, PhantomData doesn't
+                // have a dtor, but it is considered to own its
+                // content, so it is non-trivial. Unions can have `impl Drop`,
+                // and hence are non-trivial as well.
+                false
+            }
+        }
+
+        // The following *might* require a destructor: needs deeper inspection.
+        ty::Dynamic(..)
+        | ty::Projection(..)
+        | ty::Param(_)
+        | ty::Opaque(..)
+        | ty::Placeholder(..)
+        | ty::Infer(_)
+        | ty::Bound(..)
+        | ty::Generator(..) => false,
+
+        ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
+    }
+}
+
+#[derive(Debug, HashStable)]
+pub struct CandidateStep<'tcx> {
+    pub self_ty: Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>,
+    pub autoderefs: usize,
+    /// `true` if the type results from a dereference of a raw pointer.
+    /// when assembling candidates, we include these steps, but not when
+    /// picking methods. This so that if we have `foo: *const Foo` and `Foo` has methods
+    /// `fn by_raw_ptr(self: *const Self)` and `fn by_ref(&self)`, then
+    /// `foo.by_raw_ptr()` will work and `foo.by_ref()` won't.
+    pub from_unsafe_deref: bool,
+    pub unsize: bool,
+}
+
+#[derive(Clone, Debug, HashStable)]
+pub struct MethodAutoderefStepsResult<'tcx> {
+    /// The valid autoderef steps that could be find.
+    pub steps: Lrc<Vec<CandidateStep<'tcx>>>,
+    /// If Some(T), a type autoderef reported an error on.
+    pub opt_bad_ty: Option<Lrc<MethodAutoderefBadTy<'tcx>>>,
+    /// If `true`, `steps` has been truncated due to reaching the
+    /// recursion limit.
+    pub reached_recursion_limit: bool,
+}
+
+#[derive(Debug, HashStable)]
+pub struct MethodAutoderefBadTy<'tcx> {
+    pub reached_raw_pointer: bool,
+    pub ty: Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>,
+}
+
+/// Result from the `normalize_projection_ty` query.
+#[derive(Clone, Debug, HashStable, TypeFoldable, Lift)]
+pub struct NormalizationResult<'tcx> {
+    /// Result of normalization.
+    pub normalized_ty: Ty<'tcx>,
+}
+
+/// Outlives bounds are relationships between generic parameters,
+/// whether they both be regions (`'a: 'b`) or whether types are
+/// involved (`T: 'a`). These relationships can be extracted from the
+/// full set of predicates we understand or also from types (in which
+/// case they are called implied bounds). They are fed to the
+/// `OutlivesEnv` which in turn is supplied to the region checker and
+/// other parts of the inference system.
+#[derive(Clone, Debug, TypeFoldable, Lift)]
+pub enum OutlivesBound<'tcx> {
+    RegionSubRegion(ty::Region<'tcx>, ty::Region<'tcx>),
+    RegionSubParam(ty::Region<'tcx>, ty::ParamTy),
+    RegionSubProjection(ty::Region<'tcx>, ty::ProjectionTy<'tcx>),
+}
+
+impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for OutlivesBound<'tcx> {
+    fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
+        mem::discriminant(self).hash_stable(hcx, hasher);
+        match *self {
+            OutlivesBound::RegionSubRegion(ref a, ref b) => {
+                a.hash_stable(hcx, hasher);
+                b.hash_stable(hcx, hasher);
+            }
+            OutlivesBound::RegionSubParam(ref a, ref b) => {
+                a.hash_stable(hcx, hasher);
+                b.hash_stable(hcx, hasher);
+            }
+            OutlivesBound::RegionSubProjection(ref a, ref b) => {
+                a.hash_stable(hcx, hasher);
+                b.hash_stable(hcx, hasher);
+            }
+        }
+    }
+}
diff --git a/src/librustc/traits/query/dropck_outlives.rs b/src/librustc/traits/query/dropck_outlives.rs
deleted file mode 100644
index 2e5ef5adcd..0000000000
--- a/src/librustc/traits/query/dropck_outlives.rs
+++ /dev/null
@@ -1,206 +0,0 @@
-use crate::infer::at::At;
-use crate::infer::canonical::OriginalQueryValues;
-use crate::infer::InferOk;
-use crate::ty::subst::GenericArg;
-use crate::ty::{self, Ty, TyCtxt};
-use rustc_span::source_map::Span;
-use std::iter::FromIterator;
-
-impl<'cx, 'tcx> At<'cx, 'tcx> {
-    /// Given a type `ty` of some value being dropped, computes a set
-    /// of "kinds" (types, regions) that must be outlive the execution
-    /// of the destructor. These basically correspond to data that the
-    /// destructor might access. This is used during regionck to
-    /// impose "outlives" constraints on any lifetimes referenced
-    /// within.
-    ///
-    /// The rules here are given by the "dropck" RFCs, notably [#1238]
-    /// and [#1327]. This is a fixed-point computation, where we
-    /// explore all the data that will be dropped (transitively) when
-    /// a value of type `ty` is dropped. For each type T that will be
-    /// dropped and which has a destructor, we must assume that all
-    /// the types/regions of T are live during the destructor, unless
-    /// they are marked with a special attribute (`#[may_dangle]`).
-    ///
-    /// [#1238]: https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md
-    /// [#1327]: https://github.com/rust-lang/rfcs/blob/master/text/1327-dropck-param-eyepatch.md
-    pub fn dropck_outlives(&self, ty: Ty<'tcx>) -> InferOk<'tcx, Vec<GenericArg<'tcx>>> {
-        debug!("dropck_outlives(ty={:?}, param_env={:?})", ty, self.param_env,);
-
-        // Quick check: there are a number of cases that we know do not require
-        // any destructor.
-        let tcx = self.infcx.tcx;
-        if trivial_dropck_outlives(tcx, ty) {
-            return InferOk { value: vec![], obligations: vec![] };
-        }
-
-        let mut orig_values = OriginalQueryValues::default();
-        let c_ty = self.infcx.canonicalize_query(&self.param_env.and(ty), &mut orig_values);
-        let span = self.cause.span;
-        debug!("c_ty = {:?}", c_ty);
-        if let Ok(result) = &tcx.dropck_outlives(c_ty) {
-            if result.is_proven() {
-                if let Ok(InferOk { value, obligations }) =
-                    self.infcx.instantiate_query_response_and_region_obligations(
-                        self.cause,
-                        self.param_env,
-                        &orig_values,
-                        result,
-                    )
-                {
-                    let ty = self.infcx.resolve_vars_if_possible(&ty);
-                    let kinds = value.into_kinds_reporting_overflows(tcx, span, ty);
-                    return InferOk { value: kinds, obligations };
-                }
-            }
-        }
-
-        // Errors and ambiuity in dropck occur in two cases:
-        // - unresolved inference variables at the end of typeck
-        // - non well-formed types where projections cannot be resolved
-        // Either of these should have created an error before.
-        tcx.sess.delay_span_bug(span, "dtorck encountered internal error");
-
-        InferOk { value: vec![], obligations: vec![] }
-    }
-}
-
-#[derive(Clone, Debug, Default, HashStable, TypeFoldable, Lift)]
-pub struct DropckOutlivesResult<'tcx> {
-    pub kinds: Vec<GenericArg<'tcx>>,
-    pub overflows: Vec<Ty<'tcx>>,
-}
-
-impl<'tcx> DropckOutlivesResult<'tcx> {
-    pub fn report_overflows(&self, tcx: TyCtxt<'tcx>, span: Span, ty: Ty<'tcx>) {
-        if let Some(overflow_ty) = self.overflows.iter().next() {
-            rustc_errors::struct_span_err!(
-                tcx.sess,
-                span,
-                E0320,
-                "overflow while adding drop-check rules for {}",
-                ty,
-            )
-            .note(&format!("overflowed on {}", overflow_ty))
-            .emit();
-        }
-    }
-
-    pub fn into_kinds_reporting_overflows(
-        self,
-        tcx: TyCtxt<'tcx>,
-        span: Span,
-        ty: Ty<'tcx>,
-    ) -> Vec<GenericArg<'tcx>> {
-        self.report_overflows(tcx, span, ty);
-        let DropckOutlivesResult { kinds, overflows: _ } = self;
-        kinds
-    }
-}
-
-/// A set of constraints that need to be satisfied in order for
-/// a type to be valid for destruction.
-#[derive(Clone, Debug, HashStable)]
-pub struct DtorckConstraint<'tcx> {
-    /// Types that are required to be alive in order for this
-    /// type to be valid for destruction.
-    pub outlives: Vec<ty::subst::GenericArg<'tcx>>,
-
-    /// Types that could not be resolved: projections and params.
-    pub dtorck_types: Vec<Ty<'tcx>>,
-
-    /// If, during the computation of the dtorck constraint, we
-    /// overflow, that gets recorded here. The caller is expected to
-    /// report an error.
-    pub overflows: Vec<Ty<'tcx>>,
-}
-
-impl<'tcx> DtorckConstraint<'tcx> {
-    pub fn empty() -> DtorckConstraint<'tcx> {
-        DtorckConstraint { outlives: vec![], dtorck_types: vec![], overflows: vec![] }
-    }
-}
-
-impl<'tcx> FromIterator<DtorckConstraint<'tcx>> for DtorckConstraint<'tcx> {
-    fn from_iter<I: IntoIterator<Item = DtorckConstraint<'tcx>>>(iter: I) -> Self {
-        let mut result = Self::empty();
-
-        for DtorckConstraint { outlives, dtorck_types, overflows } in iter {
-            result.outlives.extend(outlives);
-            result.dtorck_types.extend(dtorck_types);
-            result.overflows.extend(overflows);
-        }
-
-        result
-    }
-}
-
-/// This returns true if the type `ty` is "trivial" for
-/// dropck-outlives -- that is, if it doesn't require any types to
-/// outlive. This is similar but not *quite* the same as the
-/// `needs_drop` test in the compiler already -- that is, for every
-/// type T for which this function return true, needs-drop would
-/// return `false`. But the reverse does not hold: in particular,
-/// `needs_drop` returns false for `PhantomData`, but it is not
-/// trivial for dropck-outlives.
-///
-/// Note also that `needs_drop` requires a "global" type (i.e., one
-/// with erased regions), but this function does not.
-pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
-    match ty.kind {
-        // None of these types have a destructor and hence they do not
-        // require anything in particular to outlive the dtor's
-        // execution.
-        ty::Infer(ty::FreshIntTy(_))
-        | ty::Infer(ty::FreshFloatTy(_))
-        | ty::Bool
-        | ty::Int(_)
-        | ty::Uint(_)
-        | ty::Float(_)
-        | ty::Never
-        | ty::FnDef(..)
-        | ty::FnPtr(_)
-        | ty::Char
-        | ty::GeneratorWitness(..)
-        | ty::RawPtr(_)
-        | ty::Ref(..)
-        | ty::Str
-        | ty::Foreign(..)
-        | ty::Error => true,
-
-        // [T; N] and [T] have same properties as T.
-        ty::Array(ty, _) | ty::Slice(ty) => trivial_dropck_outlives(tcx, ty),
-
-        // (T1..Tn) and closures have same properties as T1..Tn --
-        // check if *any* of those are trivial.
-        ty::Tuple(ref tys) => tys.iter().all(|t| trivial_dropck_outlives(tcx, t.expect_ty())),
-        ty::Closure(def_id, ref substs) => {
-            substs.as_closure().upvar_tys(def_id, tcx).all(|t| trivial_dropck_outlives(tcx, t))
-        }
-
-        ty::Adt(def, _) => {
-            if Some(def.did) == tcx.lang_items().manually_drop() {
-                // `ManuallyDrop` never has a dtor.
-                true
-            } else {
-                // Other types might. Moreover, PhantomData doesn't
-                // have a dtor, but it is considered to own its
-                // content, so it is non-trivial. Unions can have `impl Drop`,
-                // and hence are non-trivial as well.
-                false
-            }
-        }
-
-        // The following *might* require a destructor: needs deeper inspection.
-        ty::Dynamic(..)
-        | ty::Projection(..)
-        | ty::Param(_)
-        | ty::Opaque(..)
-        | ty::Placeholder(..)
-        | ty::Infer(_)
-        | ty::Bound(..)
-        | ty::Generator(..) => false,
-
-        ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
-    }
-}
diff --git a/src/librustc/traits/query/method_autoderef.rs b/src/librustc/traits/query/method_autoderef.rs
deleted file mode 100644
index 4ef775750e..0000000000
--- a/src/librustc/traits/query/method_autoderef.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use crate::infer::canonical::{Canonical, QueryResponse};
-use crate::ty::Ty;
-use rustc_data_structures::sync::Lrc;
-
-#[derive(Debug, HashStable)]
-pub struct CandidateStep<'tcx> {
-    pub self_ty: Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>,
-    pub autoderefs: usize,
-    /// `true` if the type results from a dereference of a raw pointer.
-    /// when assembling candidates, we include these steps, but not when
-    /// picking methods. This so that if we have `foo: *const Foo` and `Foo` has methods
-    /// `fn by_raw_ptr(self: *const Self)` and `fn by_ref(&self)`, then
-    /// `foo.by_raw_ptr()` will work and `foo.by_ref()` won't.
-    pub from_unsafe_deref: bool,
-    pub unsize: bool,
-}
-
-#[derive(Clone, Debug, HashStable)]
-pub struct MethodAutoderefStepsResult<'tcx> {
-    /// The valid autoderef steps that could be find.
-    pub steps: Lrc<Vec<CandidateStep<'tcx>>>,
-    /// If Some(T), a type autoderef reported an error on.
-    pub opt_bad_ty: Option<Lrc<MethodAutoderefBadTy<'tcx>>>,
-    /// If `true`, `steps` has been truncated due to reaching the
-    /// recursion limit.
-    pub reached_recursion_limit: bool,
-}
-
-#[derive(Debug, HashStable)]
-pub struct MethodAutoderefBadTy<'tcx> {
-    pub reached_raw_pointer: bool,
-    pub ty: Canonical<'tcx, QueryResponse<'tcx, Ty<'tcx>>>,
-}
diff --git a/src/librustc/traits/query/mod.rs b/src/librustc/traits/query/mod.rs
deleted file mode 100644
index 440268aab8..0000000000
--- a/src/librustc/traits/query/mod.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-//! Experimental types for the trait query interface. The methods
-//! defined in this module are all based on **canonicalization**,
-//! which makes a canonical query by replacing unbound inference
-//! variables and regions, so that results can be reused more broadly.
-//! The providers for the queries defined here can be found in
-//! `librustc_traits`.
-
-use crate::infer::canonical::Canonical;
-use crate::ty::error::TypeError;
-use crate::ty::{self, Ty};
-
-pub mod dropck_outlives;
-pub mod evaluate_obligation;
-pub mod method_autoderef;
-pub mod normalize;
-pub mod outlives_bounds;
-pub mod type_op;
-
-pub type CanonicalProjectionGoal<'tcx> =
-    Canonical<'tcx, ty::ParamEnvAnd<'tcx, ty::ProjectionTy<'tcx>>>;
-
-pub type CanonicalTyGoal<'tcx> = Canonical<'tcx, ty::ParamEnvAnd<'tcx, Ty<'tcx>>>;
-
-pub type CanonicalPredicateGoal<'tcx> = Canonical<'tcx, ty::ParamEnvAnd<'tcx, ty::Predicate<'tcx>>>;
-
-pub type CanonicalTypeOpAscribeUserTypeGoal<'tcx> =
-    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::ascribe_user_type::AscribeUserType<'tcx>>>;
-
-pub type CanonicalTypeOpEqGoal<'tcx> =
-    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::eq::Eq<'tcx>>>;
-
-pub type CanonicalTypeOpSubtypeGoal<'tcx> =
-    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::subtype::Subtype<'tcx>>>;
-
-pub type CanonicalTypeOpProvePredicateGoal<'tcx> =
-    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::prove_predicate::ProvePredicate<'tcx>>>;
-
-pub type CanonicalTypeOpNormalizeGoal<'tcx, T> =
-    Canonical<'tcx, ty::ParamEnvAnd<'tcx, type_op::normalize::Normalize<T>>>;
-
-#[derive(Clone, Debug, HashStable)]
-pub struct NoSolution;
-
-pub type Fallible<T> = Result<T, NoSolution>;
-
-impl<'tcx> From<TypeError<'tcx>> for NoSolution {
-    fn from(_: TypeError<'tcx>) -> NoSolution {
-        NoSolution
-    }
-}
diff --git a/src/librustc/traits/query/normalize.rs b/src/librustc/traits/query/normalize.rs
deleted file mode 100644
index 8f23f98a2a..0000000000
--- a/src/librustc/traits/query/normalize.rs
+++ /dev/null
@@ -1,190 +0,0 @@
-//! Code for the 'normalization' query. This consists of a wrapper
-//! which folds deeply, invoking the underlying
-//! `normalize_projection_ty` query when it encounters projections.
-
-use crate::infer::at::At;
-use crate::infer::canonical::OriginalQueryValues;
-use crate::infer::{InferCtxt, InferOk};
-use crate::traits::project::Normalized;
-use crate::traits::{Obligation, ObligationCause, PredicateObligation, Reveal};
-use crate::ty::fold::{TypeFoldable, TypeFolder};
-use crate::ty::subst::Subst;
-use crate::ty::{self, Ty, TyCtxt};
-
-use super::NoSolution;
-
-impl<'cx, 'tcx> At<'cx, 'tcx> {
-    /// Normalize `value` in the context of the inference context,
-    /// yielding a resulting type, or an error if `value` cannot be
-    /// normalized. If you don't care about regions, you should prefer
-    /// `normalize_erasing_regions`, which is more efficient.
-    ///
-    /// If the normalization succeeds and is unambiguous, returns back
-    /// the normalized value along with various outlives relations (in
-    /// the form of obligations that must be discharged).
-    ///
-    /// N.B., this will *eventually* be the main means of
-    /// normalizing, but for now should be used only when we actually
-    /// know that normalization will succeed, since error reporting
-    /// and other details are still "under development".
-    pub fn normalize<T>(&self, value: &T) -> Result<Normalized<'tcx, T>, NoSolution>
-    where
-        T: TypeFoldable<'tcx>,
-    {
-        debug!(
-            "normalize::<{}>(value={:?}, param_env={:?})",
-            ::std::any::type_name::<T>(),
-            value,
-            self.param_env,
-        );
-        if !value.has_projections() {
-            return Ok(Normalized { value: value.clone(), obligations: vec![] });
-        }
-
-        let mut normalizer = QueryNormalizer {
-            infcx: self.infcx,
-            cause: self.cause,
-            param_env: self.param_env,
-            obligations: vec![],
-            error: false,
-            anon_depth: 0,
-        };
-
-        let value1 = value.fold_with(&mut normalizer);
-        if normalizer.error {
-            Err(NoSolution)
-        } else {
-            Ok(Normalized { value: value1, obligations: normalizer.obligations })
-        }
-    }
-}
-
-/// Result from the `normalize_projection_ty` query.
-#[derive(Clone, Debug, HashStable, TypeFoldable, Lift)]
-pub struct NormalizationResult<'tcx> {
-    /// Result of normalization.
-    pub normalized_ty: Ty<'tcx>,
-}
-
-struct QueryNormalizer<'cx, 'tcx> {
-    infcx: &'cx InferCtxt<'cx, 'tcx>,
-    cause: &'cx ObligationCause<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    obligations: Vec<PredicateObligation<'tcx>>,
-    error: bool,
-    anon_depth: usize,
-}
-
-impl<'cx, 'tcx> TypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
-    fn tcx<'c>(&'c self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
-        let ty = ty.super_fold_with(self);
-        match ty.kind {
-            ty::Opaque(def_id, substs) if !substs.has_escaping_bound_vars() => {
-                // (*)
-                // Only normalize `impl Trait` after type-checking, usually in codegen.
-                match self.param_env.reveal {
-                    Reveal::UserFacing => ty,
-
-                    Reveal::All => {
-                        let recursion_limit = *self.tcx().sess.recursion_limit.get();
-                        if self.anon_depth >= recursion_limit {
-                            let obligation = Obligation::with_depth(
-                                self.cause.clone(),
-                                recursion_limit,
-                                self.param_env,
-                                ty,
-                            );
-                            self.infcx.report_overflow_error(&obligation, true);
-                        }
-
-                        let generic_ty = self.tcx().type_of(def_id);
-                        let concrete_ty = generic_ty.subst(self.tcx(), substs);
-                        self.anon_depth += 1;
-                        if concrete_ty == ty {
-                            bug!(
-                                "infinite recursion generic_ty: {:#?}, substs: {:#?}, \
-                                 concrete_ty: {:#?}, ty: {:#?}",
-                                generic_ty,
-                                substs,
-                                concrete_ty,
-                                ty
-                            );
-                        }
-                        let folded_ty = self.fold_ty(concrete_ty);
-                        self.anon_depth -= 1;
-                        folded_ty
-                    }
-                }
-            }
-
-            ty::Projection(ref data) if !data.has_escaping_bound_vars() => {
-                // (*)
-                // (*) This is kind of hacky -- we need to be able to
-                // handle normalization within binders because
-                // otherwise we wind up a need to normalize when doing
-                // trait matching (since you can have a trait
-                // obligation like `for<'a> T::B : Fn(&'a int)`), but
-                // we can't normalize with bound regions in scope. So
-                // far now we just ignore binders but only normalize
-                // if all bound regions are gone (and then we still
-                // have to renormalize whenever we instantiate a
-                // binder). It would be better to normalize in a
-                // binding-aware fashion.
-
-                let tcx = self.infcx.tcx;
-
-                let mut orig_values = OriginalQueryValues::default();
-                // HACK(matthewjasper) `'static` is special-cased in selection,
-                // so we cannot canonicalize it.
-                let c_data = self
-                    .infcx
-                    .canonicalize_hr_query_hack(&self.param_env.and(*data), &mut orig_values);
-                debug!("QueryNormalizer: c_data = {:#?}", c_data);
-                debug!("QueryNormalizer: orig_values = {:#?}", orig_values);
-                match tcx.normalize_projection_ty(c_data) {
-                    Ok(result) => {
-                        // We don't expect ambiguity.
-                        if result.is_ambiguous() {
-                            self.error = true;
-                            return ty;
-                        }
-
-                        match self.infcx.instantiate_query_response_and_region_obligations(
-                            self.cause,
-                            self.param_env,
-                            &orig_values,
-                            &result,
-                        ) {
-                            Ok(InferOk { value: result, obligations }) => {
-                                debug!("QueryNormalizer: result = {:#?}", result);
-                                debug!("QueryNormalizer: obligations = {:#?}", obligations);
-                                self.obligations.extend(obligations);
-                                return result.normalized_ty;
-                            }
-
-                            Err(_) => {
-                                self.error = true;
-                                return ty;
-                            }
-                        }
-                    }
-
-                    Err(NoSolution) => {
-                        self.error = true;
-                        ty
-                    }
-                }
-            }
-
-            _ => ty,
-        }
-    }
-
-    fn fold_const(&mut self, constant: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
-        constant.eval(self.infcx.tcx, self.param_env)
-    }
-}
diff --git a/src/librustc/traits/query/outlives_bounds.rs b/src/librustc/traits/query/outlives_bounds.rs
deleted file mode 100644
index 07e57e847b..0000000000
--- a/src/librustc/traits/query/outlives_bounds.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use crate::infer::canonical::OriginalQueryValues;
-use crate::infer::InferCtxt;
-use crate::traits::query::NoSolution;
-use crate::traits::{FulfillmentContext, ObligationCause, TraitEngine, TraitEngineExt};
-use crate::ty::{self, Ty};
-use rustc_hir as hir;
-use rustc_span::source_map::Span;
-
-use crate::ich::StableHashingContext;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
-use std::mem;
-
-/// Outlives bounds are relationships between generic parameters,
-/// whether they both be regions (`'a: 'b`) or whether types are
-/// involved (`T: 'a`). These relationships can be extracted from the
-/// full set of predicates we understand or also from types (in which
-/// case they are called implied bounds). They are fed to the
-/// `OutlivesEnv` which in turn is supplied to the region checker and
-/// other parts of the inference system.
-#[derive(Clone, Debug, TypeFoldable, Lift)]
-pub enum OutlivesBound<'tcx> {
-    RegionSubRegion(ty::Region<'tcx>, ty::Region<'tcx>),
-    RegionSubParam(ty::Region<'tcx>, ty::ParamTy),
-    RegionSubProjection(ty::Region<'tcx>, ty::ProjectionTy<'tcx>),
-}
-
-impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for OutlivesBound<'tcx> {
-    fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
-        mem::discriminant(self).hash_stable(hcx, hasher);
-        match *self {
-            OutlivesBound::RegionSubRegion(ref a, ref b) => {
-                a.hash_stable(hcx, hasher);
-                b.hash_stable(hcx, hasher);
-            }
-            OutlivesBound::RegionSubParam(ref a, ref b) => {
-                a.hash_stable(hcx, hasher);
-                b.hash_stable(hcx, hasher);
-            }
-            OutlivesBound::RegionSubProjection(ref a, ref b) => {
-                a.hash_stable(hcx, hasher);
-                b.hash_stable(hcx, hasher);
-            }
-        }
-    }
-}
-
-impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
-    /// Implied bounds are region relationships that we deduce
-    /// automatically. The idea is that (e.g.) a caller must check that a
-    /// function's argument types are well-formed immediately before
-    /// calling that fn, and hence the *callee* can assume that its
-    /// argument types are well-formed. This may imply certain relationships
-    /// between generic parameters. For example:
-    ///
-    ///     fn foo<'a,T>(x: &'a T)
-    ///
-    /// can only be called with a `'a` and `T` such that `&'a T` is WF.
-    /// For `&'a T` to be WF, `T: 'a` must hold. So we can assume `T: 'a`.
-    ///
-    /// # Parameters
-    ///
-    /// - `param_env`, the where-clauses in scope
-    /// - `body_id`, the body-id to use when normalizing assoc types.
-    ///   Note that this may cause outlives obligations to be injected
-    ///   into the inference context with this body-id.
-    /// - `ty`, the type that we are supposed to assume is WF.
-    /// - `span`, a span to use when normalizing, hopefully not important,
-    ///   might be useful if a `bug!` occurs.
-    pub fn implied_outlives_bounds(
-        &self,
-        param_env: ty::ParamEnv<'tcx>,
-        body_id: hir::HirId,
-        ty: Ty<'tcx>,
-        span: Span,
-    ) -> Vec<OutlivesBound<'tcx>> {
-        debug!("implied_outlives_bounds(ty = {:?})", ty);
-
-        let mut orig_values = OriginalQueryValues::default();
-        let key = self.canonicalize_query(&param_env.and(ty), &mut orig_values);
-        let result = match self.tcx.implied_outlives_bounds(key) {
-            Ok(r) => r,
-            Err(NoSolution) => {
-                self.tcx.sess.delay_span_bug(
-                    span,
-                    "implied_outlives_bounds failed to solve all obligations",
-                );
-                return vec![];
-            }
-        };
-        assert!(result.value.is_proven());
-
-        let result = self.instantiate_query_response_and_region_obligations(
-            &ObligationCause::misc(span, body_id),
-            param_env,
-            &orig_values,
-            &result,
-        );
-        debug!("implied_outlives_bounds for {:?}: {:#?}", ty, result);
-        let result = match result {
-            Ok(v) => v,
-            Err(_) => {
-                self.tcx.sess.delay_span_bug(span, "implied_outlives_bounds failed to instantiate");
-                return vec![];
-            }
-        };
-
-        // Instantiation may have produced new inference variables and constraints on those
-        // variables. Process these constraints.
-        let mut fulfill_cx = FulfillmentContext::new();
-        fulfill_cx.register_predicate_obligations(self, result.obligations);
-        if fulfill_cx.select_all_or_error(self).is_err() {
-            self.tcx.sess.delay_span_bug(
-                span,
-                "implied_outlives_bounds failed to solve obligations from instantiation",
-            );
-        }
-
-        result.value
-    }
-}
-
-pub fn explicit_outlives_bounds<'tcx>(
-    param_env: ty::ParamEnv<'tcx>,
-) -> impl Iterator<Item = OutlivesBound<'tcx>> + 'tcx {
-    debug!("explicit_outlives_bounds()");
-    param_env.caller_bounds.into_iter().filter_map(move |predicate| match predicate {
-        ty::Predicate::Projection(..)
-        | ty::Predicate::Trait(..)
-        | ty::Predicate::Subtype(..)
-        | ty::Predicate::WellFormed(..)
-        | ty::Predicate::ObjectSafe(..)
-        | ty::Predicate::ClosureKind(..)
-        | ty::Predicate::TypeOutlives(..)
-        | ty::Predicate::ConstEvaluatable(..) => None,
-        ty::Predicate::RegionOutlives(ref data) => data
-            .no_bound_vars()
-            .map(|ty::OutlivesPredicate(r_a, r_b)| OutlivesBound::RegionSubRegion(r_b, r_a)),
-    })
-}
diff --git a/src/librustc/traits/query/type_op/ascribe_user_type.rs b/src/librustc/traits/query/type_op/ascribe_user_type.rs
deleted file mode 100644
index 46b656eb94..0000000000
--- a/src/librustc/traits/query/type_op/ascribe_user_type.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
-use crate::traits::query::Fallible;
-use crate::ty::subst::UserSubsts;
-use crate::ty::{ParamEnvAnd, Ty, TyCtxt};
-use rustc_hir::def_id::DefId;
-
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
-pub struct AscribeUserType<'tcx> {
-    pub mir_ty: Ty<'tcx>,
-    pub def_id: DefId,
-    pub user_substs: UserSubsts<'tcx>,
-}
-
-impl<'tcx> AscribeUserType<'tcx> {
-    pub fn new(mir_ty: Ty<'tcx>, def_id: DefId, user_substs: UserSubsts<'tcx>) -> Self {
-        Self { mir_ty, def_id, user_substs }
-    }
-}
-
-impl<'tcx> super::QueryTypeOp<'tcx> for AscribeUserType<'tcx> {
-    type QueryResponse = ();
-
-    fn try_fast_path(
-        _tcx: TyCtxt<'tcx>,
-        _key: &ParamEnvAnd<'tcx, Self>,
-    ) -> Option<Self::QueryResponse> {
-        None
-    }
-
-    fn perform_query(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, ()>> {
-        tcx.type_op_ascribe_user_type(canonicalized)
-    }
-}
diff --git a/src/librustc/traits/query/type_op/eq.rs b/src/librustc/traits/query/type_op/eq.rs
deleted file mode 100644
index 267722362c..0000000000
--- a/src/librustc/traits/query/type_op/eq.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
-use crate::traits::query::Fallible;
-use crate::ty::{ParamEnvAnd, Ty, TyCtxt};
-
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
-pub struct Eq<'tcx> {
-    pub a: Ty<'tcx>,
-    pub b: Ty<'tcx>,
-}
-
-impl<'tcx> Eq<'tcx> {
-    pub fn new(a: Ty<'tcx>, b: Ty<'tcx>) -> Self {
-        Self { a, b }
-    }
-}
-
-impl<'tcx> super::QueryTypeOp<'tcx> for Eq<'tcx> {
-    type QueryResponse = ();
-
-    fn try_fast_path(
-        _tcx: TyCtxt<'tcx>,
-        key: &ParamEnvAnd<'tcx, Eq<'tcx>>,
-    ) -> Option<Self::QueryResponse> {
-        if key.value.a == key.value.b { Some(()) } else { None }
-    }
-
-    fn perform_query(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, ()>> {
-        tcx.type_op_eq(canonicalized)
-    }
-}
diff --git a/src/librustc/traits/query/type_op/mod.rs b/src/librustc/traits/query/type_op/mod.rs
deleted file mode 100644
index adf63e4d60..0000000000
--- a/src/librustc/traits/query/type_op/mod.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-use crate::infer::canonical::{
-    Canonicalized, CanonicalizedQueryResponse, OriginalQueryValues, QueryRegionConstraints,
-};
-use crate::infer::{InferCtxt, InferOk};
-use crate::traits::query::Fallible;
-use crate::traits::ObligationCause;
-use crate::ty::fold::TypeFoldable;
-use crate::ty::{ParamEnvAnd, TyCtxt};
-use std::fmt;
-use std::rc::Rc;
-
-pub mod ascribe_user_type;
-pub mod custom;
-pub mod eq;
-pub mod implied_outlives_bounds;
-pub mod normalize;
-pub mod outlives;
-pub mod prove_predicate;
-use self::prove_predicate::ProvePredicate;
-pub mod subtype;
-
-/// "Type ops" are used in NLL to perform some particular action and
-/// extract out the resulting region constraints (or an error if it
-/// cannot be completed).
-pub trait TypeOp<'tcx>: Sized + fmt::Debug {
-    type Output;
-
-    /// Processes the operation and all resulting obligations,
-    /// returning the final result along with any region constraints
-    /// (they will be given over to the NLL region solver).
-    fn fully_perform(
-        self,
-        infcx: &InferCtxt<'_, 'tcx>,
-    ) -> Fallible<(Self::Output, Option<Rc<QueryRegionConstraints<'tcx>>>)>;
-}
-
-/// "Query type ops" are type ops that are implemented using a
-/// [canonical query][c]. The `Self` type here contains the kernel of
-/// information needed to do the operation -- `TypeOp` is actually
-/// implemented for `ParamEnvAnd<Self>`, since we always need to bring
-/// along a parameter environment as well. For query type-ops, we will
-/// first canonicalize the key and then invoke the query on the tcx,
-/// which produces the resulting query region constraints.
-///
-/// [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
-pub trait QueryTypeOp<'tcx>: fmt::Debug + Sized + TypeFoldable<'tcx> + 'tcx {
-    type QueryResponse: TypeFoldable<'tcx>;
-
-    /// Give query the option for a simple fast path that never
-    /// actually hits the tcx cache lookup etc. Return `Some(r)` with
-    /// a final result or `None` to do the full path.
-    fn try_fast_path(
-        tcx: TyCtxt<'tcx>,
-        key: &ParamEnvAnd<'tcx, Self>,
-    ) -> Option<Self::QueryResponse>;
-
-    /// Performs the actual query with the canonicalized key -- the
-    /// real work happens here. This method is not given an `infcx`
-    /// because it shouldn't need one -- and if it had access to one,
-    /// it might do things like invoke `sub_regions`, which would be
-    /// bad, because it would create subregion relationships that are
-    /// not captured in the return value.
-    fn perform_query(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self::QueryResponse>>;
-
-    fn fully_perform_into(
-        query_key: ParamEnvAnd<'tcx, Self>,
-        infcx: &InferCtxt<'_, 'tcx>,
-        output_query_region_constraints: &mut QueryRegionConstraints<'tcx>,
-    ) -> Fallible<Self::QueryResponse> {
-        if let Some(result) = QueryTypeOp::try_fast_path(infcx.tcx, &query_key) {
-            return Ok(result);
-        }
-
-        // FIXME(#33684) -- We need to use
-        // `canonicalize_hr_query_hack` here because of things
-        // like the subtype query, which go awry around
-        // `'static` otherwise.
-        let mut canonical_var_values = OriginalQueryValues::default();
-        let canonical_self =
-            infcx.canonicalize_hr_query_hack(&query_key, &mut canonical_var_values);
-        let canonical_result = Self::perform_query(infcx.tcx, canonical_self)?;
-
-        let param_env = query_key.param_env;
-
-        let InferOk { value, obligations } = infcx
-            .instantiate_nll_query_response_and_region_obligations(
-                &ObligationCause::dummy(),
-                param_env,
-                &canonical_var_values,
-                canonical_result,
-                output_query_region_constraints,
-            )?;
-
-        // Typically, instantiating NLL query results does not
-        // create obligations. However, in some cases there
-        // are unresolved type variables, and unify them *can*
-        // create obligations. In that case, we have to go
-        // fulfill them. We do this via a (recursive) query.
-        for obligation in obligations {
-            let () = ProvePredicate::fully_perform_into(
-                obligation.param_env.and(ProvePredicate::new(obligation.predicate)),
-                infcx,
-                output_query_region_constraints,
-            )?;
-        }
-
-        Ok(value)
-    }
-}
-
-impl<'tcx, Q> TypeOp<'tcx> for ParamEnvAnd<'tcx, Q>
-where
-    Q: QueryTypeOp<'tcx>,
-{
-    type Output = Q::QueryResponse;
-
-    fn fully_perform(
-        self,
-        infcx: &InferCtxt<'_, 'tcx>,
-    ) -> Fallible<(Self::Output, Option<Rc<QueryRegionConstraints<'tcx>>>)> {
-        let mut region_constraints = QueryRegionConstraints::default();
-        let r = Q::fully_perform_into(self, infcx, &mut region_constraints)?;
-
-        // Promote the final query-region-constraints into a
-        // (optional) ref-counted vector:
-        let opt_qrc =
-            if region_constraints.is_empty() { None } else { Some(Rc::new(region_constraints)) };
-
-        Ok((r, opt_qrc))
-    }
-}
diff --git a/src/librustc/traits/query/type_op/normalize.rs b/src/librustc/traits/query/type_op/normalize.rs
deleted file mode 100644
index 8a028eecd5..0000000000
--- a/src/librustc/traits/query/type_op/normalize.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
-use crate::traits::query::Fallible;
-use crate::ty::fold::TypeFoldable;
-use crate::ty::{self, Lift, ParamEnvAnd, Ty, TyCtxt};
-use std::fmt;
-
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
-pub struct Normalize<T> {
-    pub value: T,
-}
-
-impl<'tcx, T> Normalize<T>
-where
-    T: fmt::Debug + TypeFoldable<'tcx>,
-{
-    pub fn new(value: T) -> Self {
-        Self { value }
-    }
-}
-
-impl<'tcx, T> super::QueryTypeOp<'tcx> for Normalize<T>
-where
-    T: Normalizable<'tcx> + 'tcx,
-{
-    type QueryResponse = T;
-
-    fn try_fast_path(_tcx: TyCtxt<'tcx>, key: &ParamEnvAnd<'tcx, Self>) -> Option<T> {
-        if !key.value.value.has_projections() { Some(key.value.value) } else { None }
-    }
-
-    fn perform_query(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self::QueryResponse>> {
-        T::type_op_method(tcx, canonicalized)
-    }
-}
-
-pub trait Normalizable<'tcx>: fmt::Debug + TypeFoldable<'tcx> + Lift<'tcx> + Copy {
-    fn type_op_method(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>>;
-}
-
-impl Normalizable<'tcx> for Ty<'tcx> {
-    fn type_op_method(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
-        tcx.type_op_normalize_ty(canonicalized)
-    }
-}
-
-impl Normalizable<'tcx> for ty::Predicate<'tcx> {
-    fn type_op_method(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
-        tcx.type_op_normalize_predicate(canonicalized)
-    }
-}
-
-impl Normalizable<'tcx> for ty::PolyFnSig<'tcx> {
-    fn type_op_method(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
-        tcx.type_op_normalize_poly_fn_sig(canonicalized)
-    }
-}
-
-impl Normalizable<'tcx> for ty::FnSig<'tcx> {
-    fn type_op_method(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
-        tcx.type_op_normalize_fn_sig(canonicalized)
-    }
-}
diff --git a/src/librustc/traits/query/type_op/subtype.rs b/src/librustc/traits/query/type_op/subtype.rs
deleted file mode 100644
index c70508a20a..0000000000
--- a/src/librustc/traits/query/type_op/subtype.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
-use crate::traits::query::Fallible;
-use crate::ty::{ParamEnvAnd, Ty, TyCtxt};
-
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
-pub struct Subtype<'tcx> {
-    pub sub: Ty<'tcx>,
-    pub sup: Ty<'tcx>,
-}
-
-impl<'tcx> Subtype<'tcx> {
-    pub fn new(sub: Ty<'tcx>, sup: Ty<'tcx>) -> Self {
-        Self { sub, sup }
-    }
-}
-
-impl<'tcx> super::QueryTypeOp<'tcx> for Subtype<'tcx> {
-    type QueryResponse = ();
-
-    fn try_fast_path(_tcx: TyCtxt<'tcx>, key: &ParamEnvAnd<'tcx, Self>) -> Option<()> {
-        if key.value.sub == key.value.sup { Some(()) } else { None }
-    }
-
-    fn perform_query(
-        tcx: TyCtxt<'tcx>,
-        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
-    ) -> Fallible<CanonicalizedQueryResponse<'tcx, ()>> {
-        tcx.type_op_subtype(canonicalized)
-    }
-}
diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs
index ba0a270638..ac3d0049c0 100644
--- a/src/librustc/traits/select.rs
+++ b/src/librustc/traits/select.rs
@@ -1,189 +1,21 @@
-// ignore-tidy-filelength
-
 //! Candidate selection. See the [rustc guide] for more information on how this works.
 //!
 //! [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/resolution.html#selection
 
 use self::EvaluationResult::*;
-use self::SelectionCandidate::*;
 
-use super::coherence::{self, Conflict};
-use super::project;
-use super::project::{normalize_with_depth, Normalized, ProjectionCacheKey};
-use super::util;
-use super::util::{closure_trait_ref_and_return_type, predicate_for_trait_def};
-use super::wf;
-use super::DerivedObligationCause;
-use super::Selection;
-use super::SelectionResult;
-use super::TraitNotObjectSafe;
-use super::{BuiltinDerivedObligation, ImplDerivedObligation, ObligationCauseCode};
-use super::{IntercrateMode, TraitQueryMode};
-use super::{ObjectCastObligation, Obligation};
-use super::{ObligationCause, PredicateObligation, TraitObligation};
-use super::{OutputTypeParameterMismatch, Overflow, SelectionError, Unimplemented};
-use super::{
-    VtableAutoImpl, VtableBuiltin, VtableClosure, VtableFnPointer, VtableGenerator, VtableImpl,
-    VtableObject, VtableParam, VtableTraitAlias,
-};
-use super::{
-    VtableAutoImplData, VtableBuiltinData, VtableClosureData, VtableFnPointerData,
-    VtableGeneratorData, VtableImplData, VtableObjectData, VtableTraitAliasData,
-};
+use super::{SelectionError, SelectionResult};
 
-use crate::dep_graph::{DepKind, DepNodeIndex};
-use crate::infer::{CombinedSnapshot, InferCtxt, InferOk, PlaceholderMap, TypeFreshener};
-use crate::middle::lang_items;
-use crate::ty::fast_reject;
-use crate::ty::relate::TypeRelation;
-use crate::ty::subst::{Subst, SubstsRef};
-use crate::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
-use rustc_hir::def_id::DefId;
+use crate::dep_graph::DepNodeIndex;
+use crate::ty::{self, TyCtxt};
 
-use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::Lock;
-use rustc_hir as hir;
-use rustc_index::bit_set::GrowableBitSet;
-use rustc_span::symbol::sym;
-use rustc_target::spec::abi::Abi;
-use std::cell::{Cell, RefCell};
-use std::cmp;
-use std::fmt::{self, Display};
-use std::iter;
-use std::rc::Rc;
-use syntax::{ast, attr};
-
-pub struct SelectionContext<'cx, 'tcx> {
-    infcx: &'cx InferCtxt<'cx, 'tcx>,
-
-    /// Freshener used specifically for entries on the obligation
-    /// stack. This ensures that all entries on the stack at one time
-    /// will have the same set of placeholder entries, which is
-    /// important for checking for trait bounds that recursively
-    /// require themselves.
-    freshener: TypeFreshener<'cx, 'tcx>,
-
-    /// If `true`, indicates that the evaluation should be conservative
-    /// and consider the possibility of types outside this crate.
-    /// This comes up primarily when resolving ambiguity. Imagine
-    /// there is some trait reference `$0: Bar` where `$0` is an
-    /// inference variable. If `intercrate` is true, then we can never
-    /// say for sure that this reference is not implemented, even if
-    /// there are *no impls at all for `Bar`*, because `$0` could be
-    /// bound to some type that in a downstream crate that implements
-    /// `Bar`. This is the suitable mode for coherence. Elsewhere,
-    /// though, we set this to false, because we are only interested
-    /// in types that the user could actually have written --- in
-    /// other words, we consider `$0: Bar` to be unimplemented if
-    /// there is no type that the user could *actually name* that
-    /// would satisfy it. This avoids crippling inference, basically.
-    intercrate: Option<IntercrateMode>,
-
-    intercrate_ambiguity_causes: Option<Vec<IntercrateAmbiguityCause>>,
-
-    /// Controls whether or not to filter out negative impls when selecting.
-    /// This is used in librustdoc to distinguish between the lack of an impl
-    /// and a negative impl
-    allow_negative_impls: bool,
-
-    /// The mode that trait queries run in, which informs our error handling
-    /// policy. In essence, canonicalized queries need their errors propagated
-    /// rather than immediately reported because we do not have accurate spans.
-    query_mode: TraitQueryMode,
-}
-
-#[derive(Clone, Debug)]
-pub enum IntercrateAmbiguityCause {
-    DownstreamCrate { trait_desc: String, self_desc: Option<String> },
-    UpstreamCrateUpdate { trait_desc: String, self_desc: Option<String> },
-    ReservationImpl { message: String },
-}
-
-impl IntercrateAmbiguityCause {
-    /// Emits notes when the overlap is caused by complex intercrate ambiguities.
-    /// See #23980 for details.
-    pub fn add_intercrate_ambiguity_hint(&self, err: &mut rustc_errors::DiagnosticBuilder<'_>) {
-        err.note(&self.intercrate_ambiguity_hint());
-    }
-
-    pub fn intercrate_ambiguity_hint(&self) -> String {
-        match self {
-            &IntercrateAmbiguityCause::DownstreamCrate { ref trait_desc, ref self_desc } => {
-                let self_desc = if let &Some(ref ty) = self_desc {
-                    format!(" for type `{}`", ty)
-                } else {
-                    String::new()
-                };
-                format!("downstream crates may implement trait `{}`{}", trait_desc, self_desc)
-            }
-            &IntercrateAmbiguityCause::UpstreamCrateUpdate { ref trait_desc, ref self_desc } => {
-                let self_desc = if let &Some(ref ty) = self_desc {
-                    format!(" for type `{}`", ty)
-                } else {
-                    String::new()
-                };
-                format!(
-                    "upstream crates may add a new impl of trait `{}`{} \
-                     in future versions",
-                    trait_desc, self_desc
-                )
-            }
-            &IntercrateAmbiguityCause::ReservationImpl { ref message } => message.clone(),
-        }
-    }
-}
-
-// A stack that walks back up the stack frame.
-struct TraitObligationStack<'prev, 'tcx> {
-    obligation: &'prev TraitObligation<'tcx>,
-
-    /// The trait ref from `obligation` but "freshened" with the
-    /// selection-context's freshener. Used to check for recursion.
-    fresh_trait_ref: ty::PolyTraitRef<'tcx>,
-
-    /// Starts out equal to `depth` -- if, during evaluation, we
-    /// encounter a cycle, then we will set this flag to the minimum
-    /// depth of that cycle for all participants in the cycle. These
-    /// participants will then forego caching their results. This is
-    /// not the most efficient solution, but it addresses #60010. The
-    /// problem we are trying to prevent:
-    ///
-    /// - If you have `A: AutoTrait` requires `B: AutoTrait` and `C: NonAutoTrait`
-    /// - `B: AutoTrait` requires `A: AutoTrait` (coinductive cycle, ok)
-    /// - `C: NonAutoTrait` requires `A: AutoTrait` (non-coinductive cycle, not ok)
-    ///
-    /// you don't want to cache that `B: AutoTrait` or `A: AutoTrait`
-    /// is `EvaluatedToOk`; this is because they were only considered
-    /// ok on the premise that if `A: AutoTrait` held, but we indeed
-    /// encountered a problem (later on) with `A: AutoTrait. So we
-    /// currently set a flag on the stack node for `B: AutoTrait` (as
-    /// well as the second instance of `A: AutoTrait`) to suppress
-    /// caching.
-    ///
-    /// This is a simple, targeted fix. A more-performant fix requires
-    /// deeper changes, but would permit more caching: we could
-    /// basically defer caching until we have fully evaluated the
-    /// tree, and then cache the entire tree at once. In any case, the
-    /// performance impact here shouldn't be so horrible: every time
-    /// this is hit, we do cache at least one trait, so we only
-    /// evaluate each member of a cycle up to N times, where N is the
-    /// length of the cycle. This means the performance impact is
-    /// bounded and we shouldn't have any terrible worst-cases.
-    reached_depth: Cell<usize>,
-
-    previous: TraitObligationStackList<'prev, 'tcx>,
-
-    /// The number of parent frames plus one (thus, the topmost frame has depth 1).
-    depth: usize,
-
-    /// The depth-first number of this node in the search graph -- a
-    /// pre-order index. Basically, a freshly incremented counter.
-    dfn: usize,
-}
+use rustc_hir::def_id::DefId;
 
 #[derive(Clone, Default)]
 pub struct SelectionCache<'tcx> {
-    hashmap: Lock<
+    pub hashmap: Lock<
         FxHashMap<
             ty::ParamEnvAnd<'tcx, ty::TraitRef<'tcx>>,
             WithDepNode<SelectionResult<'tcx, SelectionCandidate<'tcx>>>,
@@ -191,6 +23,13 @@ pub struct SelectionCache<'tcx> {
     >,
 }
 
+impl<'tcx> SelectionCache<'tcx> {
+    /// Actually frees the underlying memory in contrast to what stdlib containers do on `clear`
+    pub fn clear(&self) {
+        *self.hashmap.borrow_mut() = Default::default();
+    }
+}
+
 /// The selection process begins by considering all impls, where
 /// clauses, and so forth that might resolve an obligation. Sometimes
 /// we'll be able to say definitively that (e.g.) an impl does not
@@ -264,7 +103,7 @@ pub struct SelectionCache<'tcx> {
 /// are visible both as projection bounds and as where-clauses from the
 /// parameter environment.
 #[derive(PartialEq, Eq, Debug, Clone, TypeFoldable)]
-enum SelectionCandidate<'tcx> {
+pub enum SelectionCandidate<'tcx> {
     BuiltinCandidate {
         /// `false` if there are no *further* obligations.
         has_nested: bool,
@@ -298,58 +137,6 @@ enum SelectionCandidate<'tcx> {
     BuiltinUnsizeCandidate,
 }
 
-impl<'a, 'tcx> ty::Lift<'tcx> for SelectionCandidate<'a> {
-    type Lifted = SelectionCandidate<'tcx>;
-    fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted> {
-        Some(match *self {
-            BuiltinCandidate { has_nested } => BuiltinCandidate { has_nested },
-            ImplCandidate(def_id) => ImplCandidate(def_id),
-            AutoImplCandidate(def_id) => AutoImplCandidate(def_id),
-            ProjectionCandidate => ProjectionCandidate,
-            ClosureCandidate => ClosureCandidate,
-            GeneratorCandidate => GeneratorCandidate,
-            FnPointerCandidate => FnPointerCandidate,
-            TraitAliasCandidate(def_id) => TraitAliasCandidate(def_id),
-            ObjectCandidate => ObjectCandidate,
-            BuiltinObjectCandidate => BuiltinObjectCandidate,
-            BuiltinUnsizeCandidate => BuiltinUnsizeCandidate,
-
-            ParamCandidate(ref trait_ref) => {
-                return tcx.lift(trait_ref).map(ParamCandidate);
-            }
-        })
-    }
-}
-
-struct SelectionCandidateSet<'tcx> {
-    // A list of candidates that definitely apply to the current
-    // obligation (meaning: types unify).
-    vec: Vec<SelectionCandidate<'tcx>>,
-
-    // If `true`, then there were candidates that might or might
-    // not have applied, but we couldn't tell. This occurs when some
-    // of the input types are type variables, in which case there are
-    // various "builtin" rules that might or might not trigger.
-    ambiguous: bool,
-}
-
-#[derive(PartialEq, Eq, Debug, Clone)]
-struct EvaluatedCandidate<'tcx> {
-    candidate: SelectionCandidate<'tcx>,
-    evaluation: EvaluationResult,
-}
-
-/// When does the builtin impl for `T: Trait` apply?
-enum BuiltinImplConditions<'tcx> {
-    /// The impl is conditional on `T1, T2, ...: Trait`.
-    Where(ty::Binder<Vec<Ty<'tcx>>>),
-    /// There is no built-in impl. There may be some other
-    /// candidate (a where-clause or user-defined impl).
-    None,
-    /// It is unknown whether there is an impl.
-    Ambiguous,
-}
-
 /// The result of trait evaluation. The order is important
 /// here as the evaluation of a list is the maximum of the
 /// evaluations.
@@ -452,7 +239,7 @@ impl EvaluationResult {
         }
     }
 
-    fn is_stack_dependent(self) -> bool {
+    pub fn is_stack_dependent(self) -> bool {
         match self {
             EvaluatedToUnknown | EvaluatedToRecur => true,
 
@@ -473,3367 +260,11 @@ impl<'tcx> From<OverflowError> for SelectionError<'tcx> {
 
 #[derive(Clone, Default)]
 pub struct EvaluationCache<'tcx> {
-    hashmap: Lock<
+    pub hashmap: Lock<
         FxHashMap<ty::ParamEnvAnd<'tcx, ty::PolyTraitRef<'tcx>>, WithDepNode<EvaluationResult>>,
     >,
 }
 
-impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
-    pub fn new(infcx: &'cx InferCtxt<'cx, 'tcx>) -> SelectionContext<'cx, 'tcx> {
-        SelectionContext {
-            infcx,
-            freshener: infcx.freshener(),
-            intercrate: None,
-            intercrate_ambiguity_causes: None,
-            allow_negative_impls: false,
-            query_mode: TraitQueryMode::Standard,
-        }
-    }
-
-    pub fn intercrate(
-        infcx: &'cx InferCtxt<'cx, 'tcx>,
-        mode: IntercrateMode,
-    ) -> SelectionContext<'cx, 'tcx> {
-        debug!("intercrate({:?})", mode);
-        SelectionContext {
-            infcx,
-            freshener: infcx.freshener(),
-            intercrate: Some(mode),
-            intercrate_ambiguity_causes: None,
-            allow_negative_impls: false,
-            query_mode: TraitQueryMode::Standard,
-        }
-    }
-
-    pub fn with_negative(
-        infcx: &'cx InferCtxt<'cx, 'tcx>,
-        allow_negative_impls: bool,
-    ) -> SelectionContext<'cx, 'tcx> {
-        debug!("with_negative({:?})", allow_negative_impls);
-        SelectionContext {
-            infcx,
-            freshener: infcx.freshener(),
-            intercrate: None,
-            intercrate_ambiguity_causes: None,
-            allow_negative_impls,
-            query_mode: TraitQueryMode::Standard,
-        }
-    }
-
-    pub fn with_query_mode(
-        infcx: &'cx InferCtxt<'cx, 'tcx>,
-        query_mode: TraitQueryMode,
-    ) -> SelectionContext<'cx, 'tcx> {
-        debug!("with_query_mode({:?})", query_mode);
-        SelectionContext {
-            infcx,
-            freshener: infcx.freshener(),
-            intercrate: None,
-            intercrate_ambiguity_causes: None,
-            allow_negative_impls: false,
-            query_mode,
-        }
-    }
-
-    /// Enables tracking of intercrate ambiguity causes. These are
-    /// used in coherence to give improved diagnostics. We don't do
-    /// this until we detect a coherence error because it can lead to
-    /// false overflow results (#47139) and because it costs
-    /// computation time.
-    pub fn enable_tracking_intercrate_ambiguity_causes(&mut self) {
-        assert!(self.intercrate.is_some());
-        assert!(self.intercrate_ambiguity_causes.is_none());
-        self.intercrate_ambiguity_causes = Some(vec![]);
-        debug!("selcx: enable_tracking_intercrate_ambiguity_causes");
-    }
-
-    /// Gets the intercrate ambiguity causes collected since tracking
-    /// was enabled and disables tracking at the same time. If
-    /// tracking is not enabled, just returns an empty vector.
-    pub fn take_intercrate_ambiguity_causes(&mut self) -> Vec<IntercrateAmbiguityCause> {
-        assert!(self.intercrate.is_some());
-        self.intercrate_ambiguity_causes.take().unwrap_or(vec![])
-    }
-
-    pub fn infcx(&self) -> &'cx InferCtxt<'cx, 'tcx> {
-        self.infcx
-    }
-
-    pub fn tcx(&self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    pub fn closure_typer(&self) -> &'cx InferCtxt<'cx, 'tcx> {
-        self.infcx
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Selection
-    //
-    // The selection phase tries to identify *how* an obligation will
-    // be resolved. For example, it will identify which impl or
-    // parameter bound is to be used. The process can be inconclusive
-    // if the self type in the obligation is not fully inferred. Selection
-    // can result in an error in one of two ways:
-    //
-    // 1. If no applicable impl or parameter bound can be found.
-    // 2. If the output type parameters in the obligation do not match
-    //    those specified by the impl/bound. For example, if the obligation
-    //    is `Vec<Foo>: Iterable<Bar>`, but the impl specifies
-    //    `impl<T> Iterable<T> for Vec<T>`, than an error would result.
-
-    /// Attempts to satisfy the obligation. If successful, this will affect the surrounding
-    /// type environment by performing unification.
-    pub fn select(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> SelectionResult<'tcx, Selection<'tcx>> {
-        debug!("select({:?})", obligation);
-        debug_assert!(!obligation.predicate.has_escaping_bound_vars());
-
-        let pec = &ProvisionalEvaluationCache::default();
-        let stack = self.push_stack(TraitObligationStackList::empty(pec), obligation);
-
-        let candidate = match self.candidate_from_obligation(&stack) {
-            Err(SelectionError::Overflow) => {
-                // In standard mode, overflow must have been caught and reported
-                // earlier.
-                assert!(self.query_mode == TraitQueryMode::Canonical);
-                return Err(SelectionError::Overflow);
-            }
-            Err(e) => {
-                return Err(e);
-            }
-            Ok(None) => {
-                return Ok(None);
-            }
-            Ok(Some(candidate)) => candidate,
-        };
-
-        match self.confirm_candidate(obligation, candidate) {
-            Err(SelectionError::Overflow) => {
-                assert!(self.query_mode == TraitQueryMode::Canonical);
-                Err(SelectionError::Overflow)
-            }
-            Err(e) => Err(e),
-            Ok(candidate) => Ok(Some(candidate)),
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // EVALUATION
-    //
-    // Tests whether an obligation can be selected or whether an impl
-    // can be applied to particular types. It skips the "confirmation"
-    // step and hence completely ignores output type parameters.
-    //
-    // The result is "true" if the obligation *may* hold and "false" if
-    // we can be sure it does not.
-
-    /// Evaluates whether the obligation `obligation` can be satisfied (by any means).
-    pub fn predicate_may_hold_fatal(&mut self, obligation: &PredicateObligation<'tcx>) -> bool {
-        debug!("predicate_may_hold_fatal({:?})", obligation);
-
-        // This fatal query is a stopgap that should only be used in standard mode,
-        // where we do not expect overflow to be propagated.
-        assert!(self.query_mode == TraitQueryMode::Standard);
-
-        self.evaluate_root_obligation(obligation)
-            .expect("Overflow should be caught earlier in standard query mode")
-            .may_apply()
-    }
-
-    /// Evaluates whether the obligation `obligation` can be satisfied
-    /// and returns an `EvaluationResult`. This is meant for the
-    /// *initial* call.
-    pub fn evaluate_root_obligation(
-        &mut self,
-        obligation: &PredicateObligation<'tcx>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        self.evaluation_probe(|this| {
-            this.evaluate_predicate_recursively(
-                TraitObligationStackList::empty(&ProvisionalEvaluationCache::default()),
-                obligation.clone(),
-            )
-        })
-    }
-
-    fn evaluation_probe(
-        &mut self,
-        op: impl FnOnce(&mut Self) -> Result<EvaluationResult, OverflowError>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        self.infcx.probe(|snapshot| -> Result<EvaluationResult, OverflowError> {
-            let result = op(self)?;
-            match self.infcx.region_constraints_added_in_snapshot(snapshot) {
-                None => Ok(result),
-                Some(_) => Ok(result.max(EvaluatedToOkModuloRegions)),
-            }
-        })
-    }
-
-    /// Evaluates the predicates in `predicates` recursively. Note that
-    /// this applies projections in the predicates, and therefore
-    /// is run within an inference probe.
-    fn evaluate_predicates_recursively<'o, I>(
-        &mut self,
-        stack: TraitObligationStackList<'o, 'tcx>,
-        predicates: I,
-    ) -> Result<EvaluationResult, OverflowError>
-    where
-        I: IntoIterator<Item = PredicateObligation<'tcx>>,
-    {
-        let mut result = EvaluatedToOk;
-        for obligation in predicates {
-            let eval = self.evaluate_predicate_recursively(stack, obligation.clone())?;
-            debug!("evaluate_predicate_recursively({:?}) = {:?}", obligation, eval);
-            if let EvaluatedToErr = eval {
-                // fast-path - EvaluatedToErr is the top of the lattice,
-                // so we don't need to look on the other predicates.
-                return Ok(EvaluatedToErr);
-            } else {
-                result = cmp::max(result, eval);
-            }
-        }
-        Ok(result)
-    }
-
-    fn evaluate_predicate_recursively<'o>(
-        &mut self,
-        previous_stack: TraitObligationStackList<'o, 'tcx>,
-        obligation: PredicateObligation<'tcx>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        debug!(
-            "evaluate_predicate_recursively(previous_stack={:?}, obligation={:?})",
-            previous_stack.head(),
-            obligation
-        );
-
-        // `previous_stack` stores a `TraitObligatiom`, while `obligation` is
-        // a `PredicateObligation`. These are distinct types, so we can't
-        // use any `Option` combinator method that would force them to be
-        // the same.
-        match previous_stack.head() {
-            Some(h) => self.check_recursion_limit(&obligation, h.obligation)?,
-            None => self.check_recursion_limit(&obligation, &obligation)?,
-        }
-
-        match obligation.predicate {
-            ty::Predicate::Trait(ref t, _) => {
-                debug_assert!(!t.has_escaping_bound_vars());
-                let obligation = obligation.with(t.clone());
-                self.evaluate_trait_predicate_recursively(previous_stack, obligation)
-            }
-
-            ty::Predicate::Subtype(ref p) => {
-                // Does this code ever run?
-                match self.infcx.subtype_predicate(&obligation.cause, obligation.param_env, p) {
-                    Some(Ok(InferOk { mut obligations, .. })) => {
-                        self.add_depth(obligations.iter_mut(), obligation.recursion_depth);
-                        self.evaluate_predicates_recursively(
-                            previous_stack,
-                            obligations.into_iter(),
-                        )
-                    }
-                    Some(Err(_)) => Ok(EvaluatedToErr),
-                    None => Ok(EvaluatedToAmbig),
-                }
-            }
-
-            ty::Predicate::WellFormed(ty) => match wf::obligations(
-                self.infcx,
-                obligation.param_env,
-                obligation.cause.body_id,
-                ty,
-                obligation.cause.span,
-            ) {
-                Some(mut obligations) => {
-                    self.add_depth(obligations.iter_mut(), obligation.recursion_depth);
-                    self.evaluate_predicates_recursively(previous_stack, obligations.into_iter())
-                }
-                None => Ok(EvaluatedToAmbig),
-            },
-
-            ty::Predicate::TypeOutlives(..) | ty::Predicate::RegionOutlives(..) => {
-                // We do not consider region relationships when evaluating trait matches.
-                Ok(EvaluatedToOkModuloRegions)
-            }
-
-            ty::Predicate::ObjectSafe(trait_def_id) => {
-                if self.tcx().is_object_safe(trait_def_id) {
-                    Ok(EvaluatedToOk)
-                } else {
-                    Ok(EvaluatedToErr)
-                }
-            }
-
-            ty::Predicate::Projection(ref data) => {
-                let project_obligation = obligation.with(data.clone());
-                match project::poly_project_and_unify_type(self, &project_obligation) {
-                    Ok(Some(mut subobligations)) => {
-                        self.add_depth(subobligations.iter_mut(), obligation.recursion_depth);
-                        let result = self.evaluate_predicates_recursively(
-                            previous_stack,
-                            subobligations.into_iter(),
-                        );
-                        if let Some(key) =
-                            ProjectionCacheKey::from_poly_projection_predicate(self, data)
-                        {
-                            self.infcx.projection_cache.borrow_mut().complete(key);
-                        }
-                        result
-                    }
-                    Ok(None) => Ok(EvaluatedToAmbig),
-                    Err(_) => Ok(EvaluatedToErr),
-                }
-            }
-
-            ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
-                match self.infcx.closure_kind(closure_def_id, closure_substs) {
-                    Some(closure_kind) => {
-                        if closure_kind.extends(kind) {
-                            Ok(EvaluatedToOk)
-                        } else {
-                            Ok(EvaluatedToErr)
-                        }
-                    }
-                    None => Ok(EvaluatedToAmbig),
-                }
-            }
-
-            ty::Predicate::ConstEvaluatable(def_id, substs) => {
-                if !(obligation.param_env, substs).has_local_value() {
-                    match self.tcx().const_eval_resolve(
-                        obligation.param_env,
-                        def_id,
-                        substs,
-                        None,
-                        None,
-                    ) {
-                        Ok(_) => Ok(EvaluatedToOk),
-                        Err(_) => Ok(EvaluatedToErr),
-                    }
-                } else {
-                    // Inference variables still left in param_env or substs.
-                    Ok(EvaluatedToAmbig)
-                }
-            }
-        }
-    }
-
-    fn evaluate_trait_predicate_recursively<'o>(
-        &mut self,
-        previous_stack: TraitObligationStackList<'o, 'tcx>,
-        mut obligation: TraitObligation<'tcx>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        debug!("evaluate_trait_predicate_recursively({:?})", obligation);
-
-        if self.intercrate.is_none()
-            && obligation.is_global()
-            && obligation.param_env.caller_bounds.iter().all(|bound| bound.needs_subst())
-        {
-            // If a param env has no global bounds, global obligations do not
-            // depend on its particular value in order to work, so we can clear
-            // out the param env and get better caching.
-            debug!("evaluate_trait_predicate_recursively({:?}) - in global", obligation);
-            obligation.param_env = obligation.param_env.without_caller_bounds();
-        }
-
-        let stack = self.push_stack(previous_stack, &obligation);
-        let fresh_trait_ref = stack.fresh_trait_ref;
-        if let Some(result) = self.check_evaluation_cache(obligation.param_env, fresh_trait_ref) {
-            debug!("CACHE HIT: EVAL({:?})={:?}", fresh_trait_ref, result);
-            return Ok(result);
-        }
-
-        if let Some(result) = stack.cache().get_provisional(fresh_trait_ref) {
-            debug!("PROVISIONAL CACHE HIT: EVAL({:?})={:?}", fresh_trait_ref, result);
-            stack.update_reached_depth(stack.cache().current_reached_depth());
-            return Ok(result);
-        }
-
-        // Check if this is a match for something already on the
-        // stack. If so, we don't want to insert the result into the
-        // main cache (it is cycle dependent) nor the provisional
-        // cache (which is meant for things that have completed but
-        // for a "backedge" -- this result *is* the backedge).
-        if let Some(cycle_result) = self.check_evaluation_cycle(&stack) {
-            return Ok(cycle_result);
-        }
-
-        let (result, dep_node) = self.in_task(|this| this.evaluate_stack(&stack));
-        let result = result?;
-
-        if !result.must_apply_modulo_regions() {
-            stack.cache().on_failure(stack.dfn);
-        }
-
-        let reached_depth = stack.reached_depth.get();
-        if reached_depth >= stack.depth {
-            debug!("CACHE MISS: EVAL({:?})={:?}", fresh_trait_ref, result);
-            self.insert_evaluation_cache(obligation.param_env, fresh_trait_ref, dep_node, result);
-
-            stack.cache().on_completion(stack.depth, |fresh_trait_ref, provisional_result| {
-                self.insert_evaluation_cache(
-                    obligation.param_env,
-                    fresh_trait_ref,
-                    dep_node,
-                    provisional_result.max(result),
-                );
-            });
-        } else {
-            debug!("PROVISIONAL: {:?}={:?}", fresh_trait_ref, result);
-            debug!(
-                "evaluate_trait_predicate_recursively: caching provisionally because {:?} \
-                 is a cycle participant (at depth {}, reached depth {})",
-                fresh_trait_ref, stack.depth, reached_depth,
-            );
-
-            stack.cache().insert_provisional(stack.dfn, reached_depth, fresh_trait_ref, result);
-        }
-
-        Ok(result)
-    }
-
-    /// If there is any previous entry on the stack that precisely
-    /// matches this obligation, then we can assume that the
-    /// obligation is satisfied for now (still all other conditions
-    /// must be met of course). One obvious case this comes up is
-    /// marker traits like `Send`. Think of a linked list:
-    ///
-    ///    struct List<T> { data: T, next: Option<Box<List<T>>> }
-    ///
-    /// `Box<List<T>>` will be `Send` if `T` is `Send` and
-    /// `Option<Box<List<T>>>` is `Send`, and in turn
-    /// `Option<Box<List<T>>>` is `Send` if `Box<List<T>>` is
-    /// `Send`.
-    ///
-    /// Note that we do this comparison using the `fresh_trait_ref`
-    /// fields. Because these have all been freshened using
-    /// `self.freshener`, we can be sure that (a) this will not
-    /// affect the inferencer state and (b) that if we see two
-    /// fresh regions with the same index, they refer to the same
-    /// unbound type variable.
-    fn check_evaluation_cycle(
-        &mut self,
-        stack: &TraitObligationStack<'_, 'tcx>,
-    ) -> Option<EvaluationResult> {
-        if let Some(cycle_depth) = stack
-            .iter()
-            .skip(1) // Skip top-most frame.
-            .find(|prev| {
-                stack.obligation.param_env == prev.obligation.param_env
-                    && stack.fresh_trait_ref == prev.fresh_trait_ref
-            })
-            .map(|stack| stack.depth)
-        {
-            debug!(
-                "evaluate_stack({:?}) --> recursive at depth {}",
-                stack.fresh_trait_ref, cycle_depth,
-            );
-
-            // If we have a stack like `A B C D E A`, where the top of
-            // the stack is the final `A`, then this will iterate over
-            // `A, E, D, C, B` -- i.e., all the participants apart
-            // from the cycle head. We mark them as participating in a
-            // cycle. This suppresses caching for those nodes. See
-            // `in_cycle` field for more details.
-            stack.update_reached_depth(cycle_depth);
-
-            // Subtle: when checking for a coinductive cycle, we do
-            // not compare using the "freshened trait refs" (which
-            // have erased regions) but rather the fully explicit
-            // trait refs. This is important because it's only a cycle
-            // if the regions match exactly.
-            let cycle = stack.iter().skip(1).take_while(|s| s.depth >= cycle_depth);
-            let cycle = cycle.map(|stack| {
-                ty::Predicate::Trait(stack.obligation.predicate, ast::Constness::NotConst)
-            });
-            if self.coinductive_match(cycle) {
-                debug!("evaluate_stack({:?}) --> recursive, coinductive", stack.fresh_trait_ref);
-                Some(EvaluatedToOk)
-            } else {
-                debug!("evaluate_stack({:?}) --> recursive, inductive", stack.fresh_trait_ref);
-                Some(EvaluatedToRecur)
-            }
-        } else {
-            None
-        }
-    }
-
-    fn evaluate_stack<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        // In intercrate mode, whenever any of the types are unbound,
-        // there can always be an impl. Even if there are no impls in
-        // this crate, perhaps the type would be unified with
-        // something from another crate that does provide an impl.
-        //
-        // In intra mode, we must still be conservative. The reason is
-        // that we want to avoid cycles. Imagine an impl like:
-        //
-        //     impl<T:Eq> Eq for Vec<T>
-        //
-        // and a trait reference like `$0 : Eq` where `$0` is an
-        // unbound variable. When we evaluate this trait-reference, we
-        // will unify `$0` with `Vec<$1>` (for some fresh variable
-        // `$1`), on the condition that `$1 : Eq`. We will then wind
-        // up with many candidates (since that are other `Eq` impls
-        // that apply) and try to winnow things down. This results in
-        // a recursive evaluation that `$1 : Eq` -- as you can
-        // imagine, this is just where we started. To avoid that, we
-        // check for unbound variables and return an ambiguous (hence possible)
-        // match if we've seen this trait before.
-        //
-        // This suffices to allow chains like `FnMut` implemented in
-        // terms of `Fn` etc, but we could probably make this more
-        // precise still.
-        let unbound_input_types =
-            stack.fresh_trait_ref.skip_binder().input_types().any(|ty| ty.is_fresh());
-        // This check was an imperfect workaround for a bug in the old
-        // intercrate mode; it should be removed when that goes away.
-        if unbound_input_types && self.intercrate == Some(IntercrateMode::Issue43355) {
-            debug!(
-                "evaluate_stack({:?}) --> unbound argument, intercrate -->  ambiguous",
-                stack.fresh_trait_ref
-            );
-            // Heuristics: show the diagnostics when there are no candidates in crate.
-            if self.intercrate_ambiguity_causes.is_some() {
-                debug!("evaluate_stack: intercrate_ambiguity_causes is some");
-                if let Ok(candidate_set) = self.assemble_candidates(stack) {
-                    if !candidate_set.ambiguous && candidate_set.vec.is_empty() {
-                        let trait_ref = stack.obligation.predicate.skip_binder().trait_ref;
-                        let self_ty = trait_ref.self_ty();
-                        let cause = IntercrateAmbiguityCause::DownstreamCrate {
-                            trait_desc: trait_ref.print_only_trait_path().to_string(),
-                            self_desc: if self_ty.has_concrete_skeleton() {
-                                Some(self_ty.to_string())
-                            } else {
-                                None
-                            },
-                        };
-                        debug!("evaluate_stack: pushing cause = {:?}", cause);
-                        self.intercrate_ambiguity_causes.as_mut().unwrap().push(cause);
-                    }
-                }
-            }
-            return Ok(EvaluatedToAmbig);
-        }
-        if unbound_input_types
-            && stack.iter().skip(1).any(|prev| {
-                stack.obligation.param_env == prev.obligation.param_env
-                    && self.match_fresh_trait_refs(
-                        &stack.fresh_trait_ref,
-                        &prev.fresh_trait_ref,
-                        prev.obligation.param_env,
-                    )
-            })
-        {
-            debug!(
-                "evaluate_stack({:?}) --> unbound argument, recursive --> giving up",
-                stack.fresh_trait_ref
-            );
-            return Ok(EvaluatedToUnknown);
-        }
-
-        match self.candidate_from_obligation(stack) {
-            Ok(Some(c)) => self.evaluate_candidate(stack, &c),
-            Ok(None) => Ok(EvaluatedToAmbig),
-            Err(Overflow) => Err(OverflowError),
-            Err(..) => Ok(EvaluatedToErr),
-        }
-    }
-
-    /// For defaulted traits, we use a co-inductive strategy to solve, so
-    /// that recursion is ok. This routine returns `true` if the top of the
-    /// stack (`cycle[0]`):
-    ///
-    /// - is a defaulted trait,
-    /// - it also appears in the backtrace at some position `X`,
-    /// - all the predicates at positions `X..` between `X` and the top are
-    ///   also defaulted traits.
-    pub fn coinductive_match<I>(&mut self, cycle: I) -> bool
-    where
-        I: Iterator<Item = ty::Predicate<'tcx>>,
-    {
-        let mut cycle = cycle;
-        cycle.all(|predicate| self.coinductive_predicate(predicate))
-    }
-
-    fn coinductive_predicate(&self, predicate: ty::Predicate<'tcx>) -> bool {
-        let result = match predicate {
-            ty::Predicate::Trait(ref data, _) => self.tcx().trait_is_auto(data.def_id()),
-            _ => false,
-        };
-        debug!("coinductive_predicate({:?}) = {:?}", predicate, result);
-        result
-    }
-
-    /// Further evaluates `candidate` to decide whether all type parameters match and whether nested
-    /// obligations are met. Returns whether `candidate` remains viable after this further
-    /// scrutiny.
-    fn evaluate_candidate<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-        candidate: &SelectionCandidate<'tcx>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        debug!(
-            "evaluate_candidate: depth={} candidate={:?}",
-            stack.obligation.recursion_depth, candidate
-        );
-        let result = self.evaluation_probe(|this| {
-            let candidate = (*candidate).clone();
-            match this.confirm_candidate(stack.obligation, candidate) {
-                Ok(selection) => this.evaluate_predicates_recursively(
-                    stack.list(),
-                    selection.nested_obligations().into_iter(),
-                ),
-                Err(..) => Ok(EvaluatedToErr),
-            }
-        })?;
-        debug!(
-            "evaluate_candidate: depth={} result={:?}",
-            stack.obligation.recursion_depth, result
-        );
-        Ok(result)
-    }
-
-    fn check_evaluation_cache(
-        &self,
-        param_env: ty::ParamEnv<'tcx>,
-        trait_ref: ty::PolyTraitRef<'tcx>,
-    ) -> Option<EvaluationResult> {
-        let tcx = self.tcx();
-        if self.can_use_global_caches(param_env) {
-            let cache = tcx.evaluation_cache.hashmap.borrow();
-            if let Some(cached) = cache.get(&param_env.and(trait_ref)) {
-                return Some(cached.get(tcx));
-            }
-        }
-        self.infcx
-            .evaluation_cache
-            .hashmap
-            .borrow()
-            .get(&param_env.and(trait_ref))
-            .map(|v| v.get(tcx))
-    }
-
-    fn insert_evaluation_cache(
-        &mut self,
-        param_env: ty::ParamEnv<'tcx>,
-        trait_ref: ty::PolyTraitRef<'tcx>,
-        dep_node: DepNodeIndex,
-        result: EvaluationResult,
-    ) {
-        // Avoid caching results that depend on more than just the trait-ref
-        // - the stack can create recursion.
-        if result.is_stack_dependent() {
-            return;
-        }
-
-        if self.can_use_global_caches(param_env) {
-            if !trait_ref.has_local_value() {
-                debug!(
-                    "insert_evaluation_cache(trait_ref={:?}, candidate={:?}) global",
-                    trait_ref, result,
-                );
-                // This may overwrite the cache with the same value
-                // FIXME: Due to #50507 this overwrites the different values
-                // This should be changed to use HashMapExt::insert_same
-                // when that is fixed
-                self.tcx()
-                    .evaluation_cache
-                    .hashmap
-                    .borrow_mut()
-                    .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, result));
-                return;
-            }
-        }
-
-        debug!("insert_evaluation_cache(trait_ref={:?}, candidate={:?})", trait_ref, result,);
-        self.infcx
-            .evaluation_cache
-            .hashmap
-            .borrow_mut()
-            .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, result));
-    }
-
-    /// For various reasons, it's possible for a subobligation
-    /// to have a *lower* recursion_depth than the obligation used to create it.
-    /// Projection sub-obligations may be returned from the projection cache,
-    /// which results in obligations with an 'old' `recursion_depth`.
-    /// Additionally, methods like `wf::obligations` and
-    /// `InferCtxt.subtype_predicate` produce subobligations without
-    /// taking in a 'parent' depth, causing the generated subobligations
-    /// to have a `recursion_depth` of `0`.
-    ///
-    /// To ensure that obligation_depth never decreasees, we force all subobligations
-    /// to have at least the depth of the original obligation.
-    fn add_depth<T: 'cx, I: Iterator<Item = &'cx mut Obligation<'tcx, T>>>(
-        &self,
-        it: I,
-        min_depth: usize,
-    ) {
-        it.for_each(|o| o.recursion_depth = cmp::max(min_depth, o.recursion_depth) + 1);
-    }
-
-    /// Checks that the recursion limit has not been exceeded.
-    ///
-    /// The weird return type of this function allows it to be used with the `try` (`?`)
-    /// operator within certain functions.
-    fn check_recursion_limit<T: Display + TypeFoldable<'tcx>, V: Display + TypeFoldable<'tcx>>(
-        &self,
-        obligation: &Obligation<'tcx, T>,
-        error_obligation: &Obligation<'tcx, V>,
-    ) -> Result<(), OverflowError> {
-        let recursion_limit = *self.infcx.tcx.sess.recursion_limit.get();
-        if obligation.recursion_depth >= recursion_limit {
-            match self.query_mode {
-                TraitQueryMode::Standard => {
-                    self.infcx().report_overflow_error(error_obligation, true);
-                }
-                TraitQueryMode::Canonical => {
-                    return Err(OverflowError);
-                }
-            }
-        }
-        Ok(())
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // CANDIDATE ASSEMBLY
-    //
-    // The selection process begins by examining all in-scope impls,
-    // caller obligations, and so forth and assembling a list of
-    // candidates. See the [rustc guide] for more details.
-    //
-    // [rustc guide]:
-    // https://rust-lang.github.io/rustc-guide/traits/resolution.html#candidate-assembly
-
-    fn candidate_from_obligation<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-    ) -> SelectionResult<'tcx, SelectionCandidate<'tcx>> {
-        // Watch out for overflow. This intentionally bypasses (and does
-        // not update) the cache.
-        self.check_recursion_limit(&stack.obligation, &stack.obligation)?;
-
-        // Check the cache. Note that we freshen the trait-ref
-        // separately rather than using `stack.fresh_trait_ref` --
-        // this is because we want the unbound variables to be
-        // replaced with fresh types starting from index 0.
-        let cache_fresh_trait_pred = self.infcx.freshen(stack.obligation.predicate.clone());
-        debug!(
-            "candidate_from_obligation(cache_fresh_trait_pred={:?}, obligation={:?})",
-            cache_fresh_trait_pred, stack
-        );
-        debug_assert!(!stack.obligation.predicate.has_escaping_bound_vars());
-
-        if let Some(c) =
-            self.check_candidate_cache(stack.obligation.param_env, &cache_fresh_trait_pred)
-        {
-            debug!("CACHE HIT: SELECT({:?})={:?}", cache_fresh_trait_pred, c);
-            return c;
-        }
-
-        // If no match, compute result and insert into cache.
-        //
-        // FIXME(nikomatsakis) -- this cache is not taking into
-        // account cycles that may have occurred in forming the
-        // candidate. I don't know of any specific problems that
-        // result but it seems awfully suspicious.
-        let (candidate, dep_node) =
-            self.in_task(|this| this.candidate_from_obligation_no_cache(stack));
-
-        debug!("CACHE MISS: SELECT({:?})={:?}", cache_fresh_trait_pred, candidate);
-        self.insert_candidate_cache(
-            stack.obligation.param_env,
-            cache_fresh_trait_pred,
-            dep_node,
-            candidate.clone(),
-        );
-        candidate
-    }
-
-    fn in_task<OP, R>(&mut self, op: OP) -> (R, DepNodeIndex)
-    where
-        OP: FnOnce(&mut Self) -> R,
-    {
-        let (result, dep_node) =
-            self.tcx().dep_graph.with_anon_task(DepKind::TraitSelect, || op(self));
-        self.tcx().dep_graph.read_index(dep_node);
-        (result, dep_node)
-    }
-
-    // Treat negative impls as unimplemented, and reservation impls as ambiguity.
-    fn filter_negative_and_reservation_impls(
-        &mut self,
-        candidate: SelectionCandidate<'tcx>,
-    ) -> SelectionResult<'tcx, SelectionCandidate<'tcx>> {
-        if let ImplCandidate(def_id) = candidate {
-            let tcx = self.tcx();
-            match tcx.impl_polarity(def_id) {
-                ty::ImplPolarity::Negative if !self.allow_negative_impls => {
-                    return Err(Unimplemented);
-                }
-                ty::ImplPolarity::Reservation => {
-                    if let Some(intercrate_ambiguity_clauses) =
-                        &mut self.intercrate_ambiguity_causes
-                    {
-                        let attrs = tcx.get_attrs(def_id);
-                        let attr = attr::find_by_name(&attrs, sym::rustc_reservation_impl);
-                        let value = attr.and_then(|a| a.value_str());
-                        if let Some(value) = value {
-                            debug!(
-                                "filter_negative_and_reservation_impls: \
-                                    reservation impl ambiguity on {:?}",
-                                def_id
-                            );
-                            intercrate_ambiguity_clauses.push(
-                                IntercrateAmbiguityCause::ReservationImpl {
-                                    message: value.to_string(),
-                                },
-                            );
-                        }
-                    }
-                    return Ok(None);
-                }
-                _ => {}
-            };
-        }
-        Ok(Some(candidate))
-    }
-
-    fn candidate_from_obligation_no_cache<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-    ) -> SelectionResult<'tcx, SelectionCandidate<'tcx>> {
-        if stack.obligation.predicate.references_error() {
-            // If we encounter a `Error`, we generally prefer the
-            // most "optimistic" result in response -- that is, the
-            // one least likely to report downstream errors. But
-            // because this routine is shared by coherence and by
-            // trait selection, there isn't an obvious "right" choice
-            // here in that respect, so we opt to just return
-            // ambiguity and let the upstream clients sort it out.
-            return Ok(None);
-        }
-
-        if let Some(conflict) = self.is_knowable(stack) {
-            debug!("coherence stage: not knowable");
-            if self.intercrate_ambiguity_causes.is_some() {
-                debug!("evaluate_stack: intercrate_ambiguity_causes is some");
-                // Heuristics: show the diagnostics when there are no candidates in crate.
-                if let Ok(candidate_set) = self.assemble_candidates(stack) {
-                    let mut no_candidates_apply = true;
-                    {
-                        let evaluated_candidates =
-                            candidate_set.vec.iter().map(|c| self.evaluate_candidate(stack, &c));
-
-                        for ec in evaluated_candidates {
-                            match ec {
-                                Ok(c) => {
-                                    if c.may_apply() {
-                                        no_candidates_apply = false;
-                                        break;
-                                    }
-                                }
-                                Err(e) => return Err(e.into()),
-                            }
-                        }
-                    }
-
-                    if !candidate_set.ambiguous && no_candidates_apply {
-                        let trait_ref = stack.obligation.predicate.skip_binder().trait_ref;
-                        let self_ty = trait_ref.self_ty();
-                        let trait_desc = trait_ref.print_only_trait_path().to_string();
-                        let self_desc = if self_ty.has_concrete_skeleton() {
-                            Some(self_ty.to_string())
-                        } else {
-                            None
-                        };
-                        let cause = if let Conflict::Upstream = conflict {
-                            IntercrateAmbiguityCause::UpstreamCrateUpdate { trait_desc, self_desc }
-                        } else {
-                            IntercrateAmbiguityCause::DownstreamCrate { trait_desc, self_desc }
-                        };
-                        debug!("evaluate_stack: pushing cause = {:?}", cause);
-                        self.intercrate_ambiguity_causes.as_mut().unwrap().push(cause);
-                    }
-                }
-            }
-            return Ok(None);
-        }
-
-        let candidate_set = self.assemble_candidates(stack)?;
-
-        if candidate_set.ambiguous {
-            debug!("candidate set contains ambig");
-            return Ok(None);
-        }
-
-        let mut candidates = candidate_set.vec;
-
-        debug!("assembled {} candidates for {:?}: {:?}", candidates.len(), stack, candidates);
-
-        // At this point, we know that each of the entries in the
-        // candidate set is *individually* applicable. Now we have to
-        // figure out if they contain mutual incompatibilities. This
-        // frequently arises if we have an unconstrained input type --
-        // for example, we are looking for `$0: Eq` where `$0` is some
-        // unconstrained type variable. In that case, we'll get a
-        // candidate which assumes $0 == int, one that assumes `$0 ==
-        // usize`, etc. This spells an ambiguity.
-
-        // If there is more than one candidate, first winnow them down
-        // by considering extra conditions (nested obligations and so
-        // forth). We don't winnow if there is exactly one
-        // candidate. This is a relatively minor distinction but it
-        // can lead to better inference and error-reporting. An
-        // example would be if there was an impl:
-        //
-        //     impl<T:Clone> Vec<T> { fn push_clone(...) { ... } }
-        //
-        // and we were to see some code `foo.push_clone()` where `boo`
-        // is a `Vec<Bar>` and `Bar` does not implement `Clone`.  If
-        // we were to winnow, we'd wind up with zero candidates.
-        // Instead, we select the right impl now but report "`Bar` does
-        // not implement `Clone`".
-        if candidates.len() == 1 {
-            return self.filter_negative_and_reservation_impls(candidates.pop().unwrap());
-        }
-
-        // Winnow, but record the exact outcome of evaluation, which
-        // is needed for specialization. Propagate overflow if it occurs.
-        let mut candidates = candidates
-            .into_iter()
-            .map(|c| match self.evaluate_candidate(stack, &c) {
-                Ok(eval) if eval.may_apply() => {
-                    Ok(Some(EvaluatedCandidate { candidate: c, evaluation: eval }))
-                }
-                Ok(_) => Ok(None),
-                Err(OverflowError) => Err(Overflow),
-            })
-            .flat_map(Result::transpose)
-            .collect::<Result<Vec<_>, _>>()?;
-
-        debug!("winnowed to {} candidates for {:?}: {:?}", candidates.len(), stack, candidates);
-
-        let needs_infer = stack.obligation.predicate.needs_infer();
-
-        // If there are STILL multiple candidates, we can further
-        // reduce the list by dropping duplicates -- including
-        // resolving specializations.
-        if candidates.len() > 1 {
-            let mut i = 0;
-            while i < candidates.len() {
-                let is_dup = (0..candidates.len()).filter(|&j| i != j).any(|j| {
-                    self.candidate_should_be_dropped_in_favor_of(
-                        &candidates[i],
-                        &candidates[j],
-                        needs_infer,
-                    )
-                });
-                if is_dup {
-                    debug!("Dropping candidate #{}/{}: {:?}", i, candidates.len(), candidates[i]);
-                    candidates.swap_remove(i);
-                } else {
-                    debug!("Retaining candidate #{}/{}: {:?}", i, candidates.len(), candidates[i]);
-                    i += 1;
-
-                    // If there are *STILL* multiple candidates, give up
-                    // and report ambiguity.
-                    if i > 1 {
-                        debug!("multiple matches, ambig");
-                        return Ok(None);
-                    }
-                }
-            }
-        }
-
-        // If there are *NO* candidates, then there are no impls --
-        // that we know of, anyway. Note that in the case where there
-        // are unbound type variables within the obligation, it might
-        // be the case that you could still satisfy the obligation
-        // from another crate by instantiating the type variables with
-        // a type from another crate that does have an impl. This case
-        // is checked for in `evaluate_stack` (and hence users
-        // who might care about this case, like coherence, should use
-        // that function).
-        if candidates.is_empty() {
-            return Err(Unimplemented);
-        }
-
-        // Just one candidate left.
-        self.filter_negative_and_reservation_impls(candidates.pop().unwrap().candidate)
-    }
-
-    fn is_knowable<'o>(&mut self, stack: &TraitObligationStack<'o, 'tcx>) -> Option<Conflict> {
-        debug!("is_knowable(intercrate={:?})", self.intercrate);
-
-        if !self.intercrate.is_some() {
-            return None;
-        }
-
-        let obligation = &stack.obligation;
-        let predicate = self.infcx().resolve_vars_if_possible(&obligation.predicate);
-
-        // Okay to skip binder because of the nature of the
-        // trait-ref-is-knowable check, which does not care about
-        // bound regions.
-        let trait_ref = predicate.skip_binder().trait_ref;
-
-        let result = coherence::trait_ref_is_knowable(self.tcx(), trait_ref);
-        if let (
-            Some(Conflict::Downstream { used_to_be_broken: true }),
-            Some(IntercrateMode::Issue43355),
-        ) = (result, self.intercrate)
-        {
-            debug!("is_knowable: IGNORING conflict to be bug-compatible with #43355");
-            None
-        } else {
-            result
-        }
-    }
-
-    /// Returns `true` if the global caches can be used.
-    /// Do note that if the type itself is not in the
-    /// global tcx, the local caches will be used.
-    fn can_use_global_caches(&self, param_env: ty::ParamEnv<'tcx>) -> bool {
-        // If there are any e.g. inference variables in the `ParamEnv`, then we
-        // always use a cache local to this particular scope. Otherwise, we
-        // switch to a global cache.
-        if param_env.has_local_value() {
-            return false;
-        }
-
-        // Avoid using the master cache during coherence and just rely
-        // on the local cache. This effectively disables caching
-        // during coherence. It is really just a simplification to
-        // avoid us having to fear that coherence results "pollute"
-        // the master cache. Since coherence executes pretty quickly,
-        // it's not worth going to more trouble to increase the
-        // hit-rate, I don't think.
-        if self.intercrate.is_some() {
-            return false;
-        }
-
-        // Otherwise, we can use the global cache.
-        true
-    }
-
-    fn check_candidate_cache(
-        &mut self,
-        param_env: ty::ParamEnv<'tcx>,
-        cache_fresh_trait_pred: &ty::PolyTraitPredicate<'tcx>,
-    ) -> Option<SelectionResult<'tcx, SelectionCandidate<'tcx>>> {
-        let tcx = self.tcx();
-        let trait_ref = &cache_fresh_trait_pred.skip_binder().trait_ref;
-        if self.can_use_global_caches(param_env) {
-            let cache = tcx.selection_cache.hashmap.borrow();
-            if let Some(cached) = cache.get(&param_env.and(*trait_ref)) {
-                return Some(cached.get(tcx));
-            }
-        }
-        self.infcx
-            .selection_cache
-            .hashmap
-            .borrow()
-            .get(&param_env.and(*trait_ref))
-            .map(|v| v.get(tcx))
-    }
-
-    /// Determines whether can we safely cache the result
-    /// of selecting an obligation. This is almost always `true`,
-    /// except when dealing with certain `ParamCandidate`s.
-    ///
-    /// Ordinarily, a `ParamCandidate` will contain no inference variables,
-    /// since it was usually produced directly from a `DefId`. However,
-    /// certain cases (currently only librustdoc's blanket impl finder),
-    /// a `ParamEnv` may be explicitly constructed with inference types.
-    /// When this is the case, we do *not* want to cache the resulting selection
-    /// candidate. This is due to the fact that it might not always be possible
-    /// to equate the obligation's trait ref and the candidate's trait ref,
-    /// if more constraints end up getting added to an inference variable.
-    ///
-    /// Because of this, we always want to re-run the full selection
-    /// process for our obligation the next time we see it, since
-    /// we might end up picking a different `SelectionCandidate` (or none at all).
-    fn can_cache_candidate(
-        &self,
-        result: &SelectionResult<'tcx, SelectionCandidate<'tcx>>,
-    ) -> bool {
-        match result {
-            Ok(Some(SelectionCandidate::ParamCandidate(trait_ref))) => {
-                !trait_ref.skip_binder().input_types().any(|t| t.walk().any(|t_| t_.is_ty_infer()))
-            }
-            _ => true,
-        }
-    }
-
-    fn insert_candidate_cache(
-        &mut self,
-        param_env: ty::ParamEnv<'tcx>,
-        cache_fresh_trait_pred: ty::PolyTraitPredicate<'tcx>,
-        dep_node: DepNodeIndex,
-        candidate: SelectionResult<'tcx, SelectionCandidate<'tcx>>,
-    ) {
-        let tcx = self.tcx();
-        let trait_ref = cache_fresh_trait_pred.skip_binder().trait_ref;
-
-        if !self.can_cache_candidate(&candidate) {
-            debug!(
-                "insert_candidate_cache(trait_ref={:?}, candidate={:?} -\
-                    candidate is not cacheable",
-                trait_ref, candidate
-            );
-            return;
-        }
-
-        if self.can_use_global_caches(param_env) {
-            if let Err(Overflow) = candidate {
-                // Don't cache overflow globally; we only produce this in certain modes.
-            } else if !trait_ref.has_local_value() {
-                if !candidate.has_local_value() {
-                    debug!(
-                        "insert_candidate_cache(trait_ref={:?}, candidate={:?}) global",
-                        trait_ref, candidate,
-                    );
-                    // This may overwrite the cache with the same value.
-                    tcx.selection_cache
-                        .hashmap
-                        .borrow_mut()
-                        .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, candidate));
-                    return;
-                }
-            }
-        }
-
-        debug!(
-            "insert_candidate_cache(trait_ref={:?}, candidate={:?}) local",
-            trait_ref, candidate,
-        );
-        self.infcx
-            .selection_cache
-            .hashmap
-            .borrow_mut()
-            .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, candidate));
-    }
-
-    fn assemble_candidates<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-    ) -> Result<SelectionCandidateSet<'tcx>, SelectionError<'tcx>> {
-        let TraitObligationStack { obligation, .. } = *stack;
-        let ref obligation = Obligation {
-            param_env: obligation.param_env,
-            cause: obligation.cause.clone(),
-            recursion_depth: obligation.recursion_depth,
-            predicate: self.infcx().resolve_vars_if_possible(&obligation.predicate),
-        };
-
-        if obligation.predicate.skip_binder().self_ty().is_ty_var() {
-            // Self is a type variable (e.g., `_: AsRef<str>`).
-            //
-            // This is somewhat problematic, as the current scheme can't really
-            // handle it turning to be a projection. This does end up as truly
-            // ambiguous in most cases anyway.
-            //
-            // Take the fast path out - this also improves
-            // performance by preventing assemble_candidates_from_impls from
-            // matching every impl for this trait.
-            return Ok(SelectionCandidateSet { vec: vec![], ambiguous: true });
-        }
-
-        let mut candidates = SelectionCandidateSet { vec: Vec::new(), ambiguous: false };
-
-        self.assemble_candidates_for_trait_alias(obligation, &mut candidates)?;
-
-        // Other bounds. Consider both in-scope bounds from fn decl
-        // and applicable impls. There is a certain set of precedence rules here.
-        let def_id = obligation.predicate.def_id();
-        let lang_items = self.tcx().lang_items();
-
-        if lang_items.copy_trait() == Some(def_id) {
-            debug!("obligation self ty is {:?}", obligation.predicate.skip_binder().self_ty());
-
-            // User-defined copy impls are permitted, but only for
-            // structs and enums.
-            self.assemble_candidates_from_impls(obligation, &mut candidates)?;
-
-            // For other types, we'll use the builtin rules.
-            let copy_conditions = self.copy_clone_conditions(obligation);
-            self.assemble_builtin_bound_candidates(copy_conditions, &mut candidates)?;
-        } else if lang_items.sized_trait() == Some(def_id) {
-            // Sized is never implementable by end-users, it is
-            // always automatically computed.
-            let sized_conditions = self.sized_conditions(obligation);
-            self.assemble_builtin_bound_candidates(sized_conditions, &mut candidates)?;
-        } else if lang_items.unsize_trait() == Some(def_id) {
-            self.assemble_candidates_for_unsizing(obligation, &mut candidates);
-        } else {
-            if lang_items.clone_trait() == Some(def_id) {
-                // Same builtin conditions as `Copy`, i.e., every type which has builtin support
-                // for `Copy` also has builtin support for `Clone`, and tuples/arrays of `Clone`
-                // types have builtin support for `Clone`.
-                let clone_conditions = self.copy_clone_conditions(obligation);
-                self.assemble_builtin_bound_candidates(clone_conditions, &mut candidates)?;
-            }
-
-            self.assemble_generator_candidates(obligation, &mut candidates)?;
-            self.assemble_closure_candidates(obligation, &mut candidates)?;
-            self.assemble_fn_pointer_candidates(obligation, &mut candidates)?;
-            self.assemble_candidates_from_impls(obligation, &mut candidates)?;
-            self.assemble_candidates_from_object_ty(obligation, &mut candidates);
-        }
-
-        self.assemble_candidates_from_projected_tys(obligation, &mut candidates);
-        self.assemble_candidates_from_caller_bounds(stack, &mut candidates)?;
-        // Auto implementations have lower priority, so we only
-        // consider triggering a default if there is no other impl that can apply.
-        if candidates.vec.is_empty() {
-            self.assemble_candidates_from_auto_impls(obligation, &mut candidates)?;
-        }
-        debug!("candidate list size: {}", candidates.vec.len());
-        Ok(candidates)
-    }
-
-    fn assemble_candidates_from_projected_tys(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) {
-        debug!("assemble_candidates_for_projected_tys({:?})", obligation);
-
-        // Before we go into the whole placeholder thing, just
-        // quickly check if the self-type is a projection at all.
-        match obligation.predicate.skip_binder().trait_ref.self_ty().kind {
-            ty::Projection(_) | ty::Opaque(..) => {}
-            ty::Infer(ty::TyVar(_)) => {
-                span_bug!(
-                    obligation.cause.span,
-                    "Self=_ should have been handled by assemble_candidates"
-                );
-            }
-            _ => return,
-        }
-
-        let result = self.infcx.probe(|snapshot| {
-            self.match_projection_obligation_against_definition_bounds(obligation, snapshot)
-        });
-
-        if result {
-            candidates.vec.push(ProjectionCandidate);
-        }
-    }
-
-    fn match_projection_obligation_against_definition_bounds(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        snapshot: &CombinedSnapshot<'_, 'tcx>,
-    ) -> bool {
-        let poly_trait_predicate = self.infcx().resolve_vars_if_possible(&obligation.predicate);
-        let (placeholder_trait_predicate, placeholder_map) =
-            self.infcx().replace_bound_vars_with_placeholders(&poly_trait_predicate);
-        debug!(
-            "match_projection_obligation_against_definition_bounds: \
-             placeholder_trait_predicate={:?}",
-            placeholder_trait_predicate,
-        );
-
-        let (def_id, substs) = match placeholder_trait_predicate.trait_ref.self_ty().kind {
-            ty::Projection(ref data) => (data.trait_ref(self.tcx()).def_id, data.substs),
-            ty::Opaque(def_id, substs) => (def_id, substs),
-            _ => {
-                span_bug!(
-                    obligation.cause.span,
-                    "match_projection_obligation_against_definition_bounds() called \
-                     but self-ty is not a projection: {:?}",
-                    placeholder_trait_predicate.trait_ref.self_ty()
-                );
-            }
-        };
-        debug!(
-            "match_projection_obligation_against_definition_bounds: \
-             def_id={:?}, substs={:?}",
-            def_id, substs
-        );
-
-        let predicates_of = self.tcx().predicates_of(def_id);
-        let bounds = predicates_of.instantiate(self.tcx(), substs);
-        debug!(
-            "match_projection_obligation_against_definition_bounds: \
-             bounds={:?}",
-            bounds
-        );
-
-        let elaborated_predicates = util::elaborate_predicates(self.tcx(), bounds.predicates);
-        let matching_bound = elaborated_predicates.filter_to_traits().find(|bound| {
-            self.infcx.probe(|_| {
-                self.match_projection(
-                    obligation,
-                    bound.clone(),
-                    placeholder_trait_predicate.trait_ref.clone(),
-                    &placeholder_map,
-                    snapshot,
-                )
-            })
-        });
-
-        debug!(
-            "match_projection_obligation_against_definition_bounds: \
-             matching_bound={:?}",
-            matching_bound
-        );
-        match matching_bound {
-            None => false,
-            Some(bound) => {
-                // Repeat the successful match, if any, this time outside of a probe.
-                let result = self.match_projection(
-                    obligation,
-                    bound,
-                    placeholder_trait_predicate.trait_ref.clone(),
-                    &placeholder_map,
-                    snapshot,
-                );
-
-                assert!(result);
-                true
-            }
-        }
-    }
-
-    fn match_projection(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        trait_bound: ty::PolyTraitRef<'tcx>,
-        placeholder_trait_ref: ty::TraitRef<'tcx>,
-        placeholder_map: &PlaceholderMap<'tcx>,
-        snapshot: &CombinedSnapshot<'_, 'tcx>,
-    ) -> bool {
-        debug_assert!(!placeholder_trait_ref.has_escaping_bound_vars());
-        self.infcx
-            .at(&obligation.cause, obligation.param_env)
-            .sup(ty::Binder::dummy(placeholder_trait_ref), trait_bound)
-            .is_ok()
-            && self.infcx.leak_check(false, placeholder_map, snapshot).is_ok()
-    }
-
-    /// Given an obligation like `<SomeTrait for T>`, searches the obligations that the caller
-    /// supplied to find out whether it is listed among them.
-    ///
-    /// Never affects the inference environment.
-    fn assemble_candidates_from_caller_bounds<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        debug!("assemble_candidates_from_caller_bounds({:?})", stack.obligation);
-
-        let all_bounds = stack
-            .obligation
-            .param_env
-            .caller_bounds
-            .iter()
-            .filter_map(|o| o.to_opt_poly_trait_ref());
-
-        // Micro-optimization: filter out predicates relating to different traits.
-        let matching_bounds =
-            all_bounds.filter(|p| p.def_id() == stack.obligation.predicate.def_id());
-
-        // Keep only those bounds which may apply, and propagate overflow if it occurs.
-        let mut param_candidates = vec![];
-        for bound in matching_bounds {
-            let wc = self.evaluate_where_clause(stack, bound.clone())?;
-            if wc.may_apply() {
-                param_candidates.push(ParamCandidate(bound));
-            }
-        }
-
-        candidates.vec.extend(param_candidates);
-
-        Ok(())
-    }
-
-    fn evaluate_where_clause<'o>(
-        &mut self,
-        stack: &TraitObligationStack<'o, 'tcx>,
-        where_clause_trait_ref: ty::PolyTraitRef<'tcx>,
-    ) -> Result<EvaluationResult, OverflowError> {
-        self.evaluation_probe(|this| {
-            match this.match_where_clause_trait_ref(stack.obligation, where_clause_trait_ref) {
-                Ok(obligations) => {
-                    this.evaluate_predicates_recursively(stack.list(), obligations.into_iter())
-                }
-                Err(()) => Ok(EvaluatedToErr),
-            }
-        })
-    }
-
-    fn assemble_generator_candidates(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        if self.tcx().lang_items().gen_trait() != Some(obligation.predicate.def_id()) {
-            return Ok(());
-        }
-
-        // Okay to skip binder because the substs on generator types never
-        // touch bound regions, they just capture the in-scope
-        // type/region parameters.
-        let self_ty = *obligation.self_ty().skip_binder();
-        match self_ty.kind {
-            ty::Generator(..) => {
-                debug!(
-                    "assemble_generator_candidates: self_ty={:?} obligation={:?}",
-                    self_ty, obligation
-                );
-
-                candidates.vec.push(GeneratorCandidate);
-            }
-            ty::Infer(ty::TyVar(_)) => {
-                debug!("assemble_generator_candidates: ambiguous self-type");
-                candidates.ambiguous = true;
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-
-    /// Checks for the artificial impl that the compiler will create for an obligation like `X :
-    /// FnMut<..>` where `X` is a closure type.
-    ///
-    /// Note: the type parameters on a closure candidate are modeled as *output* type
-    /// parameters and hence do not affect whether this trait is a match or not. They will be
-    /// unified during the confirmation step.
-    fn assemble_closure_candidates(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        let kind = match self.tcx().lang_items().fn_trait_kind(obligation.predicate.def_id()) {
-            Some(k) => k,
-            None => {
-                return Ok(());
-            }
-        };
-
-        // Okay to skip binder because the substs on closure types never
-        // touch bound regions, they just capture the in-scope
-        // type/region parameters
-        match obligation.self_ty().skip_binder().kind {
-            ty::Closure(closure_def_id, closure_substs) => {
-                debug!("assemble_unboxed_candidates: kind={:?} obligation={:?}", kind, obligation);
-                match self.infcx.closure_kind(closure_def_id, closure_substs) {
-                    Some(closure_kind) => {
-                        debug!("assemble_unboxed_candidates: closure_kind = {:?}", closure_kind);
-                        if closure_kind.extends(kind) {
-                            candidates.vec.push(ClosureCandidate);
-                        }
-                    }
-                    None => {
-                        debug!("assemble_unboxed_candidates: closure_kind not yet known");
-                        candidates.vec.push(ClosureCandidate);
-                    }
-                }
-            }
-            ty::Infer(ty::TyVar(_)) => {
-                debug!("assemble_unboxed_closure_candidates: ambiguous self-type");
-                candidates.ambiguous = true;
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-
-    /// Implements one of the `Fn()` family for a fn pointer.
-    fn assemble_fn_pointer_candidates(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        // We provide impl of all fn traits for fn pointers.
-        if self.tcx().lang_items().fn_trait_kind(obligation.predicate.def_id()).is_none() {
-            return Ok(());
-        }
-
-        // Okay to skip binder because what we are inspecting doesn't involve bound regions.
-        let self_ty = *obligation.self_ty().skip_binder();
-        match self_ty.kind {
-            ty::Infer(ty::TyVar(_)) => {
-                debug!("assemble_fn_pointer_candidates: ambiguous self-type");
-                candidates.ambiguous = true; // Could wind up being a fn() type.
-            }
-            // Provide an impl, but only for suitable `fn` pointers.
-            ty::FnDef(..) | ty::FnPtr(_) => {
-                if let ty::FnSig {
-                    unsafety: hir::Unsafety::Normal,
-                    abi: Abi::Rust,
-                    c_variadic: false,
-                    ..
-                } = self_ty.fn_sig(self.tcx()).skip_binder()
-                {
-                    candidates.vec.push(FnPointerCandidate);
-                }
-            }
-            _ => {}
-        }
-
-        Ok(())
-    }
-
-    /// Searches for impls that might apply to `obligation`.
-    fn assemble_candidates_from_impls(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        debug!("assemble_candidates_from_impls(obligation={:?})", obligation);
-
-        self.tcx().for_each_relevant_impl(
-            obligation.predicate.def_id(),
-            obligation.predicate.skip_binder().trait_ref.self_ty(),
-            |impl_def_id| {
-                self.infcx.probe(|snapshot| {
-                    if let Ok(_substs) = self.match_impl(impl_def_id, obligation, snapshot) {
-                        candidates.vec.push(ImplCandidate(impl_def_id));
-                    }
-                });
-            },
-        );
-
-        Ok(())
-    }
-
-    fn assemble_candidates_from_auto_impls(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        // Okay to skip binder here because the tests we do below do not involve bound regions.
-        let self_ty = *obligation.self_ty().skip_binder();
-        debug!("assemble_candidates_from_auto_impls(self_ty={:?})", self_ty);
-
-        let def_id = obligation.predicate.def_id();
-
-        if self.tcx().trait_is_auto(def_id) {
-            match self_ty.kind {
-                ty::Dynamic(..) => {
-                    // For object types, we don't know what the closed
-                    // over types are. This means we conservatively
-                    // say nothing; a candidate may be added by
-                    // `assemble_candidates_from_object_ty`.
-                }
-                ty::Foreign(..) => {
-                    // Since the contents of foreign types is unknown,
-                    // we don't add any `..` impl. Default traits could
-                    // still be provided by a manual implementation for
-                    // this trait and type.
-                }
-                ty::Param(..) | ty::Projection(..) => {
-                    // In these cases, we don't know what the actual
-                    // type is.  Therefore, we cannot break it down
-                    // into its constituent types. So we don't
-                    // consider the `..` impl but instead just add no
-                    // candidates: this means that typeck will only
-                    // succeed if there is another reason to believe
-                    // that this obligation holds. That could be a
-                    // where-clause or, in the case of an object type,
-                    // it could be that the object type lists the
-                    // trait (e.g., `Foo+Send : Send`). See
-                    // `compile-fail/typeck-default-trait-impl-send-param.rs`
-                    // for an example of a test case that exercises
-                    // this path.
-                }
-                ty::Infer(ty::TyVar(_)) => {
-                    // The auto impl might apply; we don't know.
-                    candidates.ambiguous = true;
-                }
-                ty::Generator(_, _, movability)
-                    if self.tcx().lang_items().unpin_trait() == Some(def_id) =>
-                {
-                    match movability {
-                        hir::Movability::Static => {
-                            // Immovable generators are never `Unpin`, so
-                            // suppress the normal auto-impl candidate for it.
-                        }
-                        hir::Movability::Movable => {
-                            // Movable generators are always `Unpin`, so add an
-                            // unconditional builtin candidate.
-                            candidates.vec.push(BuiltinCandidate { has_nested: false });
-                        }
-                    }
-                }
-
-                _ => candidates.vec.push(AutoImplCandidate(def_id)),
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Searches for impls that might apply to `obligation`.
-    fn assemble_candidates_from_object_ty(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) {
-        debug!(
-            "assemble_candidates_from_object_ty(self_ty={:?})",
-            obligation.self_ty().skip_binder()
-        );
-
-        self.infcx.probe(|_snapshot| {
-            // The code below doesn't care about regions, and the
-            // self-ty here doesn't escape this probe, so just erase
-            // any LBR.
-            let self_ty = self.tcx().erase_late_bound_regions(&obligation.self_ty());
-            let poly_trait_ref = match self_ty.kind {
-                ty::Dynamic(ref data, ..) => {
-                    if data.auto_traits().any(|did| did == obligation.predicate.def_id()) {
-                        debug!(
-                            "assemble_candidates_from_object_ty: matched builtin bound, \
-                             pushing candidate"
-                        );
-                        candidates.vec.push(BuiltinObjectCandidate);
-                        return;
-                    }
-
-                    if let Some(principal) = data.principal() {
-                        if !self.infcx.tcx.features().object_safe_for_dispatch {
-                            principal.with_self_ty(self.tcx(), self_ty)
-                        } else if self.tcx().is_object_safe(principal.def_id()) {
-                            principal.with_self_ty(self.tcx(), self_ty)
-                        } else {
-                            return;
-                        }
-                    } else {
-                        // Only auto trait bounds exist.
-                        return;
-                    }
-                }
-                ty::Infer(ty::TyVar(_)) => {
-                    debug!("assemble_candidates_from_object_ty: ambiguous");
-                    candidates.ambiguous = true; // could wind up being an object type
-                    return;
-                }
-                _ => return,
-            };
-
-            debug!("assemble_candidates_from_object_ty: poly_trait_ref={:?}", poly_trait_ref);
-
-            // Count only those upcast versions that match the trait-ref
-            // we are looking for. Specifically, do not only check for the
-            // correct trait, but also the correct type parameters.
-            // For example, we may be trying to upcast `Foo` to `Bar<i32>`,
-            // but `Foo` is declared as `trait Foo: Bar<u32>`.
-            let upcast_trait_refs = util::supertraits(self.tcx(), poly_trait_ref)
-                .filter(|upcast_trait_ref| {
-                    self.infcx
-                        .probe(|_| self.match_poly_trait_ref(obligation, *upcast_trait_ref).is_ok())
-                })
-                .count();
-
-            if upcast_trait_refs > 1 {
-                // Can be upcast in many ways; need more type information.
-                candidates.ambiguous = true;
-            } else if upcast_trait_refs == 1 {
-                candidates.vec.push(ObjectCandidate);
-            }
-        })
-    }
-
-    /// Searches for unsizing that might apply to `obligation`.
-    fn assemble_candidates_for_unsizing(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) {
-        // We currently never consider higher-ranked obligations e.g.
-        // `for<'a> &'a T: Unsize<Trait+'a>` to be implemented. This is not
-        // because they are a priori invalid, and we could potentially add support
-        // for them later, it's just that there isn't really a strong need for it.
-        // A `T: Unsize<U>` obligation is always used as part of a `T: CoerceUnsize<U>`
-        // impl, and those are generally applied to concrete types.
-        //
-        // That said, one might try to write a fn with a where clause like
-        //     for<'a> Foo<'a, T>: Unsize<Foo<'a, Trait>>
-        // where the `'a` is kind of orthogonal to the relevant part of the `Unsize`.
-        // Still, you'd be more likely to write that where clause as
-        //     T: Trait
-        // so it seems ok if we (conservatively) fail to accept that `Unsize`
-        // obligation above. Should be possible to extend this in the future.
-        let source = match obligation.self_ty().no_bound_vars() {
-            Some(t) => t,
-            None => {
-                // Don't add any candidates if there are bound regions.
-                return;
-            }
-        };
-        let target = obligation.predicate.skip_binder().trait_ref.substs.type_at(1);
-
-        debug!("assemble_candidates_for_unsizing(source={:?}, target={:?})", source, target);
-
-        let may_apply = match (&source.kind, &target.kind) {
-            // Trait+Kx+'a -> Trait+Ky+'b (upcasts).
-            (&ty::Dynamic(ref data_a, ..), &ty::Dynamic(ref data_b, ..)) => {
-                // Upcasts permit two things:
-                //
-                // 1. Dropping auto traits, e.g., `Foo + Send` to `Foo`
-                // 2. Tightening the region bound, e.g., `Foo + 'a` to `Foo + 'b` if `'a: 'b`
-                //
-                // Note that neither of these changes requires any
-                // change at runtime. Eventually this will be
-                // generalized.
-                //
-                // We always upcast when we can because of reason
-                // #2 (region bounds).
-                data_a.principal_def_id() == data_b.principal_def_id()
-                    && data_b
-                        .auto_traits()
-                        // All of a's auto traits need to be in b's auto traits.
-                        .all(|b| data_a.auto_traits().any(|a| a == b))
-            }
-
-            // `T` -> `Trait`
-            (_, &ty::Dynamic(..)) => true,
-
-            // Ambiguous handling is below `T` -> `Trait`, because inference
-            // variables can still implement `Unsize<Trait>` and nested
-            // obligations will have the final say (likely deferred).
-            (&ty::Infer(ty::TyVar(_)), _) | (_, &ty::Infer(ty::TyVar(_))) => {
-                debug!("assemble_candidates_for_unsizing: ambiguous");
-                candidates.ambiguous = true;
-                false
-            }
-
-            // `[T; n]` -> `[T]`
-            (&ty::Array(..), &ty::Slice(_)) => true,
-
-            // `Struct<T>` -> `Struct<U>`
-            (&ty::Adt(def_id_a, _), &ty::Adt(def_id_b, _)) if def_id_a.is_struct() => {
-                def_id_a == def_id_b
-            }
-
-            // `(.., T)` -> `(.., U)`
-            (&ty::Tuple(tys_a), &ty::Tuple(tys_b)) => tys_a.len() == tys_b.len(),
-
-            _ => false,
-        };
-
-        if may_apply {
-            candidates.vec.push(BuiltinUnsizeCandidate);
-        }
-    }
-
-    fn assemble_candidates_for_trait_alias(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        // Okay to skip binder here because the tests we do below do not involve bound regions.
-        let self_ty = *obligation.self_ty().skip_binder();
-        debug!("assemble_candidates_for_trait_alias(self_ty={:?})", self_ty);
-
-        let def_id = obligation.predicate.def_id();
-
-        if self.tcx().is_trait_alias(def_id) {
-            candidates.vec.push(TraitAliasCandidate(def_id));
-        }
-
-        Ok(())
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // WINNOW
-    //
-    // Winnowing is the process of attempting to resolve ambiguity by
-    // probing further. During the winnowing process, we unify all
-    // type variables and then we also attempt to evaluate recursive
-    // bounds to see if they are satisfied.
-
-    /// Returns `true` if `victim` should be dropped in favor of
-    /// `other`. Generally speaking we will drop duplicate
-    /// candidates and prefer where-clause candidates.
-    ///
-    /// See the comment for "SelectionCandidate" for more details.
-    fn candidate_should_be_dropped_in_favor_of(
-        &mut self,
-        victim: &EvaluatedCandidate<'tcx>,
-        other: &EvaluatedCandidate<'tcx>,
-        needs_infer: bool,
-    ) -> bool {
-        if victim.candidate == other.candidate {
-            return true;
-        }
-
-        // Check if a bound would previously have been removed when normalizing
-        // the param_env so that it can be given the lowest priority. See
-        // #50825 for the motivation for this.
-        let is_global =
-            |cand: &ty::PolyTraitRef<'_>| cand.is_global() && !cand.has_late_bound_regions();
-
-        match other.candidate {
-            // Prefer `BuiltinCandidate { has_nested: false }` to anything else.
-            // This is a fix for #53123 and prevents winnowing from accidentally extending the
-            // lifetime of a variable.
-            BuiltinCandidate { has_nested: false } => true,
-            ParamCandidate(ref cand) => match victim.candidate {
-                AutoImplCandidate(..) => {
-                    bug!(
-                        "default implementations shouldn't be recorded \
-                         when there are other valid candidates"
-                    );
-                }
-                // Prefer `BuiltinCandidate { has_nested: false }` to anything else.
-                // This is a fix for #53123 and prevents winnowing from accidentally extending the
-                // lifetime of a variable.
-                BuiltinCandidate { has_nested: false } => false,
-                ImplCandidate(..)
-                | ClosureCandidate
-                | GeneratorCandidate
-                | FnPointerCandidate
-                | BuiltinObjectCandidate
-                | BuiltinUnsizeCandidate
-                | BuiltinCandidate { .. }
-                | TraitAliasCandidate(..) => {
-                    // Global bounds from the where clause should be ignored
-                    // here (see issue #50825). Otherwise, we have a where
-                    // clause so don't go around looking for impls.
-                    !is_global(cand)
-                }
-                ObjectCandidate | ProjectionCandidate => {
-                    // Arbitrarily give param candidates priority
-                    // over projection and object candidates.
-                    !is_global(cand)
-                }
-                ParamCandidate(..) => false,
-            },
-            ObjectCandidate | ProjectionCandidate => match victim.candidate {
-                AutoImplCandidate(..) => {
-                    bug!(
-                        "default implementations shouldn't be recorded \
-                         when there are other valid candidates"
-                    );
-                }
-                // Prefer `BuiltinCandidate { has_nested: false }` to anything else.
-                // This is a fix for #53123 and prevents winnowing from accidentally extending the
-                // lifetime of a variable.
-                BuiltinCandidate { has_nested: false } => false,
-                ImplCandidate(..)
-                | ClosureCandidate
-                | GeneratorCandidate
-                | FnPointerCandidate
-                | BuiltinObjectCandidate
-                | BuiltinUnsizeCandidate
-                | BuiltinCandidate { .. }
-                | TraitAliasCandidate(..) => true,
-                ObjectCandidate | ProjectionCandidate => {
-                    // Arbitrarily give param candidates priority
-                    // over projection and object candidates.
-                    true
-                }
-                ParamCandidate(ref cand) => is_global(cand),
-            },
-            ImplCandidate(other_def) => {
-                // See if we can toss out `victim` based on specialization.
-                // This requires us to know *for sure* that the `other` impl applies
-                // i.e., `EvaluatedToOk`.
-                if other.evaluation.must_apply_modulo_regions() {
-                    match victim.candidate {
-                        ImplCandidate(victim_def) => {
-                            let tcx = self.tcx();
-                            if tcx.specializes((other_def, victim_def)) {
-                                return true;
-                            }
-                            return match tcx.impls_are_allowed_to_overlap(other_def, victim_def) {
-                                Some(ty::ImplOverlapKind::Permitted { marker: true }) => {
-                                    // Subtle: If the predicate we are evaluating has inference
-                                    // variables, do *not* allow discarding candidates due to
-                                    // marker trait impls.
-                                    //
-                                    // Without this restriction, we could end up accidentally
-                                    // constrainting inference variables based on an arbitrarily
-                                    // chosen trait impl.
-                                    //
-                                    // Imagine we have the following code:
-                                    //
-                                    // ```rust
-                                    // #[marker] trait MyTrait {}
-                                    // impl MyTrait for u8 {}
-                                    // impl MyTrait for bool {}
-                                    // ```
-                                    //
-                                    // And we are evaluating the predicate `<_#0t as MyTrait>`.
-                                    //
-                                    // During selection, we will end up with one candidate for each
-                                    // impl of `MyTrait`. If we were to discard one impl in favor
-                                    // of the other, we would be left with one candidate, causing
-                                    // us to "successfully" select the predicate, unifying
-                                    // _#0t with (for example) `u8`.
-                                    //
-                                    // However, we have no reason to believe that this unification
-                                    // is correct - we've essentially just picked an arbitrary
-                                    // *possibility* for _#0t, and required that this be the *only*
-                                    // possibility.
-                                    //
-                                    // Eventually, we will either:
-                                    // 1) Unify all inference variables in the predicate through
-                                    // some other means (e.g. type-checking of a function). We will
-                                    // then be in a position to drop marker trait candidates
-                                    // without constraining inference variables (since there are
-                                    // none left to constrin)
-                                    // 2) Be left with some unconstrained inference variables. We
-                                    // will then correctly report an inference error, since the
-                                    // existence of multiple marker trait impls tells us nothing
-                                    // about which one should actually apply.
-                                    !needs_infer
-                                }
-                                Some(_) => true,
-                                None => false,
-                            };
-                        }
-                        ParamCandidate(ref cand) => {
-                            // Prefer the impl to a global where clause candidate.
-                            return is_global(cand);
-                        }
-                        _ => (),
-                    }
-                }
-
-                false
-            }
-            ClosureCandidate
-            | GeneratorCandidate
-            | FnPointerCandidate
-            | BuiltinObjectCandidate
-            | BuiltinUnsizeCandidate
-            | BuiltinCandidate { has_nested: true } => {
-                match victim.candidate {
-                    ParamCandidate(ref cand) => {
-                        // Prefer these to a global where-clause bound
-                        // (see issue #50825).
-                        is_global(cand) && other.evaluation.must_apply_modulo_regions()
-                    }
-                    _ => false,
-                }
-            }
-            _ => false,
-        }
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // BUILTIN BOUNDS
-    //
-    // These cover the traits that are built-in to the language
-    // itself: `Copy`, `Clone` and `Sized`.
-
-    fn assemble_builtin_bound_candidates(
-        &mut self,
-        conditions: BuiltinImplConditions<'tcx>,
-        candidates: &mut SelectionCandidateSet<'tcx>,
-    ) -> Result<(), SelectionError<'tcx>> {
-        match conditions {
-            BuiltinImplConditions::Where(nested) => {
-                debug!("builtin_bound: nested={:?}", nested);
-                candidates
-                    .vec
-                    .push(BuiltinCandidate { has_nested: nested.skip_binder().len() > 0 });
-            }
-            BuiltinImplConditions::None => {}
-            BuiltinImplConditions::Ambiguous => {
-                debug!("assemble_builtin_bound_candidates: ambiguous builtin");
-                candidates.ambiguous = true;
-            }
-        }
-
-        Ok(())
-    }
-
-    fn sized_conditions(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> BuiltinImplConditions<'tcx> {
-        use self::BuiltinImplConditions::{Ambiguous, None, Where};
-
-        // NOTE: binder moved to (*)
-        let self_ty = self.infcx.shallow_resolve(obligation.predicate.skip_binder().self_ty());
-
-        match self_ty.kind {
-            ty::Infer(ty::IntVar(_))
-            | ty::Infer(ty::FloatVar(_))
-            | ty::Uint(_)
-            | ty::Int(_)
-            | ty::Bool
-            | ty::Float(_)
-            | ty::FnDef(..)
-            | ty::FnPtr(_)
-            | ty::RawPtr(..)
-            | ty::Char
-            | ty::Ref(..)
-            | ty::Generator(..)
-            | ty::GeneratorWitness(..)
-            | ty::Array(..)
-            | ty::Closure(..)
-            | ty::Never
-            | ty::Error => {
-                // safe for everything
-                Where(ty::Binder::dummy(Vec::new()))
-            }
-
-            ty::Str | ty::Slice(_) | ty::Dynamic(..) | ty::Foreign(..) => None,
-
-            ty::Tuple(tys) => {
-                Where(ty::Binder::bind(tys.last().into_iter().map(|k| k.expect_ty()).collect()))
-            }
-
-            ty::Adt(def, substs) => {
-                let sized_crit = def.sized_constraint(self.tcx());
-                // (*) binder moved here
-                Where(ty::Binder::bind(
-                    sized_crit.iter().map(|ty| ty.subst(self.tcx(), substs)).collect(),
-                ))
-            }
-
-            ty::Projection(_) | ty::Param(_) | ty::Opaque(..) => None,
-            ty::Infer(ty::TyVar(_)) => Ambiguous,
-
-            ty::UnnormalizedProjection(..)
-            | ty::Placeholder(..)
-            | ty::Bound(..)
-            | ty::Infer(ty::FreshTy(_))
-            | ty::Infer(ty::FreshIntTy(_))
-            | ty::Infer(ty::FreshFloatTy(_)) => {
-                bug!("asked to assemble builtin bounds of unexpected type: {:?}", self_ty);
-            }
-        }
-    }
-
-    fn copy_clone_conditions(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> BuiltinImplConditions<'tcx> {
-        // NOTE: binder moved to (*)
-        let self_ty = self.infcx.shallow_resolve(obligation.predicate.skip_binder().self_ty());
-
-        use self::BuiltinImplConditions::{Ambiguous, None, Where};
-
-        match self_ty.kind {
-            ty::Infer(ty::IntVar(_))
-            | ty::Infer(ty::FloatVar(_))
-            | ty::FnDef(..)
-            | ty::FnPtr(_)
-            | ty::Error => Where(ty::Binder::dummy(Vec::new())),
-
-            ty::Uint(_)
-            | ty::Int(_)
-            | ty::Bool
-            | ty::Float(_)
-            | ty::Char
-            | ty::RawPtr(..)
-            | ty::Never
-            | ty::Ref(_, _, hir::Mutability::Not) => {
-                // Implementations provided in libcore
-                None
-            }
-
-            ty::Dynamic(..)
-            | ty::Str
-            | ty::Slice(..)
-            | ty::Generator(..)
-            | ty::GeneratorWitness(..)
-            | ty::Foreign(..)
-            | ty::Ref(_, _, hir::Mutability::Mut) => None,
-
-            ty::Array(element_ty, _) => {
-                // (*) binder moved here
-                Where(ty::Binder::bind(vec![element_ty]))
-            }
-
-            ty::Tuple(tys) => {
-                // (*) binder moved here
-                Where(ty::Binder::bind(tys.iter().map(|k| k.expect_ty()).collect()))
-            }
-
-            ty::Closure(def_id, substs) => {
-                // (*) binder moved here
-                Where(ty::Binder::bind(substs.as_closure().upvar_tys(def_id, self.tcx()).collect()))
-            }
-
-            ty::Adt(..) | ty::Projection(..) | ty::Param(..) | ty::Opaque(..) => {
-                // Fallback to whatever user-defined impls exist in this case.
-                None
-            }
-
-            ty::Infer(ty::TyVar(_)) => {
-                // Unbound type variable. Might or might not have
-                // applicable impls and so forth, depending on what
-                // those type variables wind up being bound to.
-                Ambiguous
-            }
-
-            ty::UnnormalizedProjection(..)
-            | ty::Placeholder(..)
-            | ty::Bound(..)
-            | ty::Infer(ty::FreshTy(_))
-            | ty::Infer(ty::FreshIntTy(_))
-            | ty::Infer(ty::FreshFloatTy(_)) => {
-                bug!("asked to assemble builtin bounds of unexpected type: {:?}", self_ty);
-            }
-        }
-    }
-
-    /// For default impls, we need to break apart a type into its
-    /// "constituent types" -- meaning, the types that it contains.
-    ///
-    /// Here are some (simple) examples:
-    ///
-    /// ```
-    /// (i32, u32) -> [i32, u32]
-    /// Foo where struct Foo { x: i32, y: u32 } -> [i32, u32]
-    /// Bar<i32> where struct Bar<T> { x: T, y: u32 } -> [i32, u32]
-    /// Zed<i32> where enum Zed { A(T), B(u32) } -> [i32, u32]
-    /// ```
-    fn constituent_types_for_ty(&self, t: Ty<'tcx>) -> Vec<Ty<'tcx>> {
-        match t.kind {
-            ty::Uint(_)
-            | ty::Int(_)
-            | ty::Bool
-            | ty::Float(_)
-            | ty::FnDef(..)
-            | ty::FnPtr(_)
-            | ty::Str
-            | ty::Error
-            | ty::Infer(ty::IntVar(_))
-            | ty::Infer(ty::FloatVar(_))
-            | ty::Never
-            | ty::Char => Vec::new(),
-
-            ty::UnnormalizedProjection(..)
-            | ty::Placeholder(..)
-            | ty::Dynamic(..)
-            | ty::Param(..)
-            | ty::Foreign(..)
-            | ty::Projection(..)
-            | ty::Bound(..)
-            | ty::Infer(ty::TyVar(_))
-            | ty::Infer(ty::FreshTy(_))
-            | ty::Infer(ty::FreshIntTy(_))
-            | ty::Infer(ty::FreshFloatTy(_)) => {
-                bug!("asked to assemble constituent types of unexpected type: {:?}", t);
-            }
-
-            ty::RawPtr(ty::TypeAndMut { ty: element_ty, .. }) | ty::Ref(_, element_ty, _) => {
-                vec![element_ty]
-            }
-
-            ty::Array(element_ty, _) | ty::Slice(element_ty) => vec![element_ty],
-
-            ty::Tuple(ref tys) => {
-                // (T1, ..., Tn) -- meets any bound that all of T1...Tn meet
-                tys.iter().map(|k| k.expect_ty()).collect()
-            }
-
-            ty::Closure(def_id, ref substs) => {
-                substs.as_closure().upvar_tys(def_id, self.tcx()).collect()
-            }
-
-            ty::Generator(def_id, ref substs, _) => {
-                let witness = substs.as_generator().witness(def_id, self.tcx());
-                substs
-                    .as_generator()
-                    .upvar_tys(def_id, self.tcx())
-                    .chain(iter::once(witness))
-                    .collect()
-            }
-
-            ty::GeneratorWitness(types) => {
-                // This is sound because no regions in the witness can refer to
-                // the binder outside the witness. So we'll effectivly reuse
-                // the implicit binder around the witness.
-                types.skip_binder().to_vec()
-            }
-
-            // For `PhantomData<T>`, we pass `T`.
-            ty::Adt(def, substs) if def.is_phantom_data() => substs.types().collect(),
-
-            ty::Adt(def, substs) => def.all_fields().map(|f| f.ty(self.tcx(), substs)).collect(),
-
-            ty::Opaque(def_id, substs) => {
-                // We can resolve the `impl Trait` to its concrete type,
-                // which enforces a DAG between the functions requiring
-                // the auto trait bounds in question.
-                vec![self.tcx().type_of(def_id).subst(self.tcx(), substs)]
-            }
-        }
-    }
-
-    fn collect_predicates_for_types(
-        &mut self,
-        param_env: ty::ParamEnv<'tcx>,
-        cause: ObligationCause<'tcx>,
-        recursion_depth: usize,
-        trait_def_id: DefId,
-        types: ty::Binder<Vec<Ty<'tcx>>>,
-    ) -> Vec<PredicateObligation<'tcx>> {
-        // Because the types were potentially derived from
-        // higher-ranked obligations they may reference late-bound
-        // regions. For example, `for<'a> Foo<&'a int> : Copy` would
-        // yield a type like `for<'a> &'a int`. In general, we
-        // maintain the invariant that we never manipulate bound
-        // regions, so we have to process these bound regions somehow.
-        //
-        // The strategy is to:
-        //
-        // 1. Instantiate those regions to placeholder regions (e.g.,
-        //    `for<'a> &'a int` becomes `&0 int`.
-        // 2. Produce something like `&'0 int : Copy`
-        // 3. Re-bind the regions back to `for<'a> &'a int : Copy`
-
-        types
-            .skip_binder()
-            .into_iter()
-            .flat_map(|ty| {
-                // binder moved -\
-                let ty: ty::Binder<Ty<'tcx>> = ty::Binder::bind(ty); // <----/
-
-                self.infcx.commit_unconditionally(|_| {
-                    let (skol_ty, _) = self.infcx.replace_bound_vars_with_placeholders(&ty);
-                    let Normalized { value: normalized_ty, mut obligations } =
-                        project::normalize_with_depth(
-                            self,
-                            param_env,
-                            cause.clone(),
-                            recursion_depth,
-                            &skol_ty,
-                        );
-                    let skol_obligation = predicate_for_trait_def(
-                        self.tcx(),
-                        param_env,
-                        cause.clone(),
-                        trait_def_id,
-                        recursion_depth,
-                        normalized_ty,
-                        &[],
-                    );
-                    obligations.push(skol_obligation);
-                    obligations
-                })
-            })
-            .collect()
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // CONFIRMATION
-    //
-    // Confirmation unifies the output type parameters of the trait
-    // with the values found in the obligation, possibly yielding a
-    // type error.  See the [rustc guide] for more details.
-    //
-    // [rustc guide]:
-    // https://rust-lang.github.io/rustc-guide/traits/resolution.html#confirmation
-
-    fn confirm_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        candidate: SelectionCandidate<'tcx>,
-    ) -> Result<Selection<'tcx>, SelectionError<'tcx>> {
-        debug!("confirm_candidate({:?}, {:?})", obligation, candidate);
-
-        match candidate {
-            BuiltinCandidate { has_nested } => {
-                let data = self.confirm_builtin_candidate(obligation, has_nested);
-                Ok(VtableBuiltin(data))
-            }
-
-            ParamCandidate(param) => {
-                let obligations = self.confirm_param_candidate(obligation, param);
-                Ok(VtableParam(obligations))
-            }
-
-            ImplCandidate(impl_def_id) => {
-                Ok(VtableImpl(self.confirm_impl_candidate(obligation, impl_def_id)))
-            }
-
-            AutoImplCandidate(trait_def_id) => {
-                let data = self.confirm_auto_impl_candidate(obligation, trait_def_id);
-                Ok(VtableAutoImpl(data))
-            }
-
-            ProjectionCandidate => {
-                self.confirm_projection_candidate(obligation);
-                Ok(VtableParam(Vec::new()))
-            }
-
-            ClosureCandidate => {
-                let vtable_closure = self.confirm_closure_candidate(obligation)?;
-                Ok(VtableClosure(vtable_closure))
-            }
-
-            GeneratorCandidate => {
-                let vtable_generator = self.confirm_generator_candidate(obligation)?;
-                Ok(VtableGenerator(vtable_generator))
-            }
-
-            FnPointerCandidate => {
-                let data = self.confirm_fn_pointer_candidate(obligation)?;
-                Ok(VtableFnPointer(data))
-            }
-
-            TraitAliasCandidate(alias_def_id) => {
-                let data = self.confirm_trait_alias_candidate(obligation, alias_def_id);
-                Ok(VtableTraitAlias(data))
-            }
-
-            ObjectCandidate => {
-                let data = self.confirm_object_candidate(obligation);
-                Ok(VtableObject(data))
-            }
-
-            BuiltinObjectCandidate => {
-                // This indicates something like `Trait + Send: Send`. In this case, we know that
-                // this holds because that's what the object type is telling us, and there's really
-                // no additional obligations to prove and no types in particular to unify, etc.
-                Ok(VtableParam(Vec::new()))
-            }
-
-            BuiltinUnsizeCandidate => {
-                let data = self.confirm_builtin_unsize_candidate(obligation)?;
-                Ok(VtableBuiltin(data))
-            }
-        }
-    }
-
-    fn confirm_projection_candidate(&mut self, obligation: &TraitObligation<'tcx>) {
-        self.infcx.commit_unconditionally(|snapshot| {
-            let result =
-                self.match_projection_obligation_against_definition_bounds(obligation, snapshot);
-            assert!(result);
-        })
-    }
-
-    fn confirm_param_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        param: ty::PolyTraitRef<'tcx>,
-    ) -> Vec<PredicateObligation<'tcx>> {
-        debug!("confirm_param_candidate({:?},{:?})", obligation, param);
-
-        // During evaluation, we already checked that this
-        // where-clause trait-ref could be unified with the obligation
-        // trait-ref. Repeat that unification now without any
-        // transactional boundary; it should not fail.
-        match self.match_where_clause_trait_ref(obligation, param.clone()) {
-            Ok(obligations) => obligations,
-            Err(()) => {
-                bug!(
-                    "Where clause `{:?}` was applicable to `{:?}` but now is not",
-                    param,
-                    obligation
-                );
-            }
-        }
-    }
-
-    fn confirm_builtin_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        has_nested: bool,
-    ) -> VtableBuiltinData<PredicateObligation<'tcx>> {
-        debug!("confirm_builtin_candidate({:?}, {:?})", obligation, has_nested);
-
-        let lang_items = self.tcx().lang_items();
-        let obligations = if has_nested {
-            let trait_def = obligation.predicate.def_id();
-            let conditions = if Some(trait_def) == lang_items.sized_trait() {
-                self.sized_conditions(obligation)
-            } else if Some(trait_def) == lang_items.copy_trait() {
-                self.copy_clone_conditions(obligation)
-            } else if Some(trait_def) == lang_items.clone_trait() {
-                self.copy_clone_conditions(obligation)
-            } else {
-                bug!("unexpected builtin trait {:?}", trait_def)
-            };
-            let nested = match conditions {
-                BuiltinImplConditions::Where(nested) => nested,
-                _ => bug!("obligation {:?} had matched a builtin impl but now doesn't", obligation),
-            };
-
-            let cause = obligation.derived_cause(BuiltinDerivedObligation);
-            self.collect_predicates_for_types(
-                obligation.param_env,
-                cause,
-                obligation.recursion_depth + 1,
-                trait_def,
-                nested,
-            )
-        } else {
-            vec![]
-        };
-
-        debug!("confirm_builtin_candidate: obligations={:?}", obligations);
-
-        VtableBuiltinData { nested: obligations }
-    }
-
-    /// This handles the case where a `auto trait Foo` impl is being used.
-    /// The idea is that the impl applies to `X : Foo` if the following conditions are met:
-    ///
-    /// 1. For each constituent type `Y` in `X`, `Y : Foo` holds
-    /// 2. For each where-clause `C` declared on `Foo`, `[Self => X] C` holds.
-    fn confirm_auto_impl_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        trait_def_id: DefId,
-    ) -> VtableAutoImplData<PredicateObligation<'tcx>> {
-        debug!("confirm_auto_impl_candidate({:?}, {:?})", obligation, trait_def_id);
-
-        let types = obligation.predicate.map_bound(|inner| {
-            let self_ty = self.infcx.shallow_resolve(inner.self_ty());
-            self.constituent_types_for_ty(self_ty)
-        });
-        self.vtable_auto_impl(obligation, trait_def_id, types)
-    }
-
-    /// See `confirm_auto_impl_candidate`.
-    fn vtable_auto_impl(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        trait_def_id: DefId,
-        nested: ty::Binder<Vec<Ty<'tcx>>>,
-    ) -> VtableAutoImplData<PredicateObligation<'tcx>> {
-        debug!("vtable_auto_impl: nested={:?}", nested);
-
-        let cause = obligation.derived_cause(BuiltinDerivedObligation);
-        let mut obligations = self.collect_predicates_for_types(
-            obligation.param_env,
-            cause,
-            obligation.recursion_depth + 1,
-            trait_def_id,
-            nested,
-        );
-
-        let trait_obligations: Vec<PredicateObligation<'_>> =
-            self.infcx.commit_unconditionally(|_| {
-                let poly_trait_ref = obligation.predicate.to_poly_trait_ref();
-                let (trait_ref, _) =
-                    self.infcx.replace_bound_vars_with_placeholders(&poly_trait_ref);
-                let cause = obligation.derived_cause(ImplDerivedObligation);
-                self.impl_or_trait_obligations(
-                    cause,
-                    obligation.recursion_depth + 1,
-                    obligation.param_env,
-                    trait_def_id,
-                    &trait_ref.substs,
-                )
-            });
-
-        // Adds the predicates from the trait.  Note that this contains a `Self: Trait`
-        // predicate as usual.  It won't have any effect since auto traits are coinductive.
-        obligations.extend(trait_obligations);
-
-        debug!("vtable_auto_impl: obligations={:?}", obligations);
-
-        VtableAutoImplData { trait_def_id, nested: obligations }
-    }
-
-    fn confirm_impl_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        impl_def_id: DefId,
-    ) -> VtableImplData<'tcx, PredicateObligation<'tcx>> {
-        debug!("confirm_impl_candidate({:?},{:?})", obligation, impl_def_id);
-
-        // First, create the substitutions by matching the impl again,
-        // this time not in a probe.
-        self.infcx.commit_unconditionally(|snapshot| {
-            let substs = self.rematch_impl(impl_def_id, obligation, snapshot);
-            debug!("confirm_impl_candidate: substs={:?}", substs);
-            let cause = obligation.derived_cause(ImplDerivedObligation);
-            self.vtable_impl(
-                impl_def_id,
-                substs,
-                cause,
-                obligation.recursion_depth + 1,
-                obligation.param_env,
-            )
-        })
-    }
-
-    fn vtable_impl(
-        &mut self,
-        impl_def_id: DefId,
-        mut substs: Normalized<'tcx, SubstsRef<'tcx>>,
-        cause: ObligationCause<'tcx>,
-        recursion_depth: usize,
-        param_env: ty::ParamEnv<'tcx>,
-    ) -> VtableImplData<'tcx, PredicateObligation<'tcx>> {
-        debug!(
-            "vtable_impl(impl_def_id={:?}, substs={:?}, recursion_depth={})",
-            impl_def_id, substs, recursion_depth,
-        );
-
-        let mut impl_obligations = self.impl_or_trait_obligations(
-            cause,
-            recursion_depth,
-            param_env,
-            impl_def_id,
-            &substs.value,
-        );
-
-        debug!(
-            "vtable_impl: impl_def_id={:?} impl_obligations={:?}",
-            impl_def_id, impl_obligations
-        );
-
-        // Because of RFC447, the impl-trait-ref and obligations
-        // are sufficient to determine the impl substs, without
-        // relying on projections in the impl-trait-ref.
-        //
-        // e.g., `impl<U: Tr, V: Iterator<Item=U>> Foo<<U as Tr>::T> for V`
-        impl_obligations.append(&mut substs.obligations);
-
-        VtableImplData { impl_def_id, substs: substs.value, nested: impl_obligations }
-    }
-
-    fn confirm_object_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> VtableObjectData<'tcx, PredicateObligation<'tcx>> {
-        debug!("confirm_object_candidate({:?})", obligation);
-
-        // FIXME(nmatsakis) skipping binder here seems wrong -- we should
-        // probably flatten the binder from the obligation and the binder
-        // from the object. Have to try to make a broken test case that
-        // results.
-        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
-        let poly_trait_ref = match self_ty.kind {
-            ty::Dynamic(ref data, ..) => data
-                .principal()
-                .unwrap_or_else(|| {
-                    span_bug!(obligation.cause.span, "object candidate with no principal")
-                })
-                .with_self_ty(self.tcx(), self_ty),
-            _ => span_bug!(obligation.cause.span, "object candidate with non-object"),
-        };
-
-        let mut upcast_trait_ref = None;
-        let mut nested = vec![];
-        let vtable_base;
-
-        {
-            let tcx = self.tcx();
-
-            // We want to find the first supertrait in the list of
-            // supertraits that we can unify with, and do that
-            // unification. We know that there is exactly one in the list
-            // where we can unify, because otherwise select would have
-            // reported an ambiguity. (When we do find a match, also
-            // record it for later.)
-            let nonmatching = util::supertraits(tcx, poly_trait_ref).take_while(|&t| {
-                match self.infcx.commit_if_ok(|_| self.match_poly_trait_ref(obligation, t)) {
-                    Ok(obligations) => {
-                        upcast_trait_ref = Some(t);
-                        nested.extend(obligations);
-                        false
-                    }
-                    Err(_) => true,
-                }
-            });
-
-            // Additionally, for each of the non-matching predicates that
-            // we pass over, we sum up the set of number of vtable
-            // entries, so that we can compute the offset for the selected
-            // trait.
-            vtable_base = nonmatching.map(|t| super::util::count_own_vtable_entries(tcx, t)).sum();
-        }
-
-        VtableObjectData { upcast_trait_ref: upcast_trait_ref.unwrap(), vtable_base, nested }
-    }
-
-    fn confirm_fn_pointer_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> Result<VtableFnPointerData<'tcx, PredicateObligation<'tcx>>, SelectionError<'tcx>> {
-        debug!("confirm_fn_pointer_candidate({:?})", obligation);
-
-        // Okay to skip binder; it is reintroduced below.
-        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
-        let sig = self_ty.fn_sig(self.tcx());
-        let trait_ref = closure_trait_ref_and_return_type(
-            self.tcx(),
-            obligation.predicate.def_id(),
-            self_ty,
-            sig,
-            util::TupleArgumentsFlag::Yes,
-        )
-        .map_bound(|(trait_ref, _)| trait_ref);
-
-        let Normalized { value: trait_ref, obligations } = project::normalize_with_depth(
-            self,
-            obligation.param_env,
-            obligation.cause.clone(),
-            obligation.recursion_depth + 1,
-            &trait_ref,
-        );
-
-        self.confirm_poly_trait_refs(
-            obligation.cause.clone(),
-            obligation.param_env,
-            obligation.predicate.to_poly_trait_ref(),
-            trait_ref,
-        )?;
-        Ok(VtableFnPointerData { fn_ty: self_ty, nested: obligations })
-    }
-
-    fn confirm_trait_alias_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        alias_def_id: DefId,
-    ) -> VtableTraitAliasData<'tcx, PredicateObligation<'tcx>> {
-        debug!("confirm_trait_alias_candidate({:?}, {:?})", obligation, alias_def_id);
-
-        self.infcx.commit_unconditionally(|_| {
-            let (predicate, _) =
-                self.infcx().replace_bound_vars_with_placeholders(&obligation.predicate);
-            let trait_ref = predicate.trait_ref;
-            let trait_def_id = trait_ref.def_id;
-            let substs = trait_ref.substs;
-
-            let trait_obligations = self.impl_or_trait_obligations(
-                obligation.cause.clone(),
-                obligation.recursion_depth,
-                obligation.param_env,
-                trait_def_id,
-                &substs,
-            );
-
-            debug!(
-                "confirm_trait_alias_candidate: trait_def_id={:?} trait_obligations={:?}",
-                trait_def_id, trait_obligations
-            );
-
-            VtableTraitAliasData { alias_def_id, substs: substs, nested: trait_obligations }
-        })
-    }
-
-    fn confirm_generator_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> Result<VtableGeneratorData<'tcx, PredicateObligation<'tcx>>, SelectionError<'tcx>> {
-        // Okay to skip binder because the substs on generator types never
-        // touch bound regions, they just capture the in-scope
-        // type/region parameters.
-        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
-        let (generator_def_id, substs) = match self_ty.kind {
-            ty::Generator(id, substs, _) => (id, substs),
-            _ => bug!("closure candidate for non-closure {:?}", obligation),
-        };
-
-        debug!("confirm_generator_candidate({:?},{:?},{:?})", obligation, generator_def_id, substs);
-
-        let trait_ref = self.generator_trait_ref_unnormalized(obligation, generator_def_id, substs);
-        let Normalized { value: trait_ref, mut obligations } = normalize_with_depth(
-            self,
-            obligation.param_env,
-            obligation.cause.clone(),
-            obligation.recursion_depth + 1,
-            &trait_ref,
-        );
-
-        debug!(
-            "confirm_generator_candidate(generator_def_id={:?}, \
-             trait_ref={:?}, obligations={:?})",
-            generator_def_id, trait_ref, obligations
-        );
-
-        obligations.extend(self.confirm_poly_trait_refs(
-            obligation.cause.clone(),
-            obligation.param_env,
-            obligation.predicate.to_poly_trait_ref(),
-            trait_ref,
-        )?);
-
-        Ok(VtableGeneratorData { generator_def_id, substs, nested: obligations })
-    }
-
-    fn confirm_closure_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> Result<VtableClosureData<'tcx, PredicateObligation<'tcx>>, SelectionError<'tcx>> {
-        debug!("confirm_closure_candidate({:?})", obligation);
-
-        let kind = self
-            .tcx()
-            .lang_items()
-            .fn_trait_kind(obligation.predicate.def_id())
-            .unwrap_or_else(|| bug!("closure candidate for non-fn trait {:?}", obligation));
-
-        // Okay to skip binder because the substs on closure types never
-        // touch bound regions, they just capture the in-scope
-        // type/region parameters.
-        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
-        let (closure_def_id, substs) = match self_ty.kind {
-            ty::Closure(id, substs) => (id, substs),
-            _ => bug!("closure candidate for non-closure {:?}", obligation),
-        };
-
-        let trait_ref = self.closure_trait_ref_unnormalized(obligation, closure_def_id, substs);
-        let Normalized { value: trait_ref, mut obligations } = normalize_with_depth(
-            self,
-            obligation.param_env,
-            obligation.cause.clone(),
-            obligation.recursion_depth + 1,
-            &trait_ref,
-        );
-
-        debug!(
-            "confirm_closure_candidate(closure_def_id={:?}, trait_ref={:?}, obligations={:?})",
-            closure_def_id, trait_ref, obligations
-        );
-
-        obligations.extend(self.confirm_poly_trait_refs(
-            obligation.cause.clone(),
-            obligation.param_env,
-            obligation.predicate.to_poly_trait_ref(),
-            trait_ref,
-        )?);
-
-        // FIXME: Chalk
-
-        if !self.tcx().sess.opts.debugging_opts.chalk {
-            obligations.push(Obligation::new(
-                obligation.cause.clone(),
-                obligation.param_env,
-                ty::Predicate::ClosureKind(closure_def_id, substs, kind),
-            ));
-        }
-
-        Ok(VtableClosureData { closure_def_id, substs: substs, nested: obligations })
-    }
-
-    /// In the case of closure types and fn pointers,
-    /// we currently treat the input type parameters on the trait as
-    /// outputs. This means that when we have a match we have only
-    /// considered the self type, so we have to go back and make sure
-    /// to relate the argument types too. This is kind of wrong, but
-    /// since we control the full set of impls, also not that wrong,
-    /// and it DOES yield better error messages (since we don't report
-    /// errors as if there is no applicable impl, but rather report
-    /// errors are about mismatched argument types.
-    ///
-    /// Here is an example. Imagine we have a closure expression
-    /// and we desugared it so that the type of the expression is
-    /// `Closure`, and `Closure` expects an int as argument. Then it
-    /// is "as if" the compiler generated this impl:
-    ///
-    ///     impl Fn(int) for Closure { ... }
-    ///
-    /// Now imagine our obligation is `Fn(usize) for Closure`. So far
-    /// we have matched the self type `Closure`. At this point we'll
-    /// compare the `int` to `usize` and generate an error.
-    ///
-    /// Note that this checking occurs *after* the impl has selected,
-    /// because these output type parameters should not affect the
-    /// selection of the impl. Therefore, if there is a mismatch, we
-    /// report an error to the user.
-    fn confirm_poly_trait_refs(
-        &mut self,
-        obligation_cause: ObligationCause<'tcx>,
-        obligation_param_env: ty::ParamEnv<'tcx>,
-        obligation_trait_ref: ty::PolyTraitRef<'tcx>,
-        expected_trait_ref: ty::PolyTraitRef<'tcx>,
-    ) -> Result<Vec<PredicateObligation<'tcx>>, SelectionError<'tcx>> {
-        self.infcx
-            .at(&obligation_cause, obligation_param_env)
-            .sup(obligation_trait_ref, expected_trait_ref)
-            .map(|InferOk { obligations, .. }| obligations)
-            .map_err(|e| OutputTypeParameterMismatch(expected_trait_ref, obligation_trait_ref, e))
-    }
-
-    fn confirm_builtin_unsize_candidate(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-    ) -> Result<VtableBuiltinData<PredicateObligation<'tcx>>, SelectionError<'tcx>> {
-        let tcx = self.tcx();
-
-        // `assemble_candidates_for_unsizing` should ensure there are no late-bound
-        // regions here. See the comment there for more details.
-        let source = self.infcx.shallow_resolve(obligation.self_ty().no_bound_vars().unwrap());
-        let target = obligation.predicate.skip_binder().trait_ref.substs.type_at(1);
-        let target = self.infcx.shallow_resolve(target);
-
-        debug!("confirm_builtin_unsize_candidate(source={:?}, target={:?})", source, target);
-
-        let mut nested = vec![];
-        match (&source.kind, &target.kind) {
-            // Trait+Kx+'a -> Trait+Ky+'b (upcasts).
-            (&ty::Dynamic(ref data_a, r_a), &ty::Dynamic(ref data_b, r_b)) => {
-                // See `assemble_candidates_for_unsizing` for more info.
-                let existential_predicates = data_a.map_bound(|data_a| {
-                    let iter = data_a
-                        .principal()
-                        .map(|x| ty::ExistentialPredicate::Trait(x))
-                        .into_iter()
-                        .chain(
-                            data_a
-                                .projection_bounds()
-                                .map(|x| ty::ExistentialPredicate::Projection(x)),
-                        )
-                        .chain(data_b.auto_traits().map(ty::ExistentialPredicate::AutoTrait));
-                    tcx.mk_existential_predicates(iter)
-                });
-                let source_trait = tcx.mk_dynamic(existential_predicates, r_b);
-
-                // Require that the traits involved in this upcast are **equal**;
-                // only the **lifetime bound** is changed.
-                //
-                // FIXME: This condition is arguably too strong -- it would
-                // suffice for the source trait to be a *subtype* of the target
-                // trait. In particular, changing from something like
-                // `for<'a, 'b> Foo<'a, 'b>` to `for<'a> Foo<'a, 'a>` should be
-                // permitted. And, indeed, in the in commit
-                // 904a0bde93f0348f69914ee90b1f8b6e4e0d7cbc, this
-                // condition was loosened. However, when the leak check was
-                // added back, using subtype here actually guides the coercion
-                // code in such a way that it accepts `old-lub-glb-object.rs`.
-                // This is probably a good thing, but I've modified this to `.eq`
-                // because I want to continue rejecting that test (as we have
-                // done for quite some time) before we are firmly comfortable
-                // with what our behavior should be there. -nikomatsakis
-                let InferOk { obligations, .. } = self
-                    .infcx
-                    .at(&obligation.cause, obligation.param_env)
-                    .eq(target, source_trait) // FIXME -- see below
-                    .map_err(|_| Unimplemented)?;
-                nested.extend(obligations);
-
-                // Register one obligation for 'a: 'b.
-                let cause = ObligationCause::new(
-                    obligation.cause.span,
-                    obligation.cause.body_id,
-                    ObjectCastObligation(target),
-                );
-                let outlives = ty::OutlivesPredicate(r_a, r_b);
-                nested.push(Obligation::with_depth(
-                    cause,
-                    obligation.recursion_depth + 1,
-                    obligation.param_env,
-                    ty::Binder::bind(outlives).to_predicate(),
-                ));
-            }
-
-            // `T` -> `Trait`
-            (_, &ty::Dynamic(ref data, r)) => {
-                let mut object_dids = data.auto_traits().chain(data.principal_def_id());
-                if let Some(did) = object_dids.find(|did| !tcx.is_object_safe(*did)) {
-                    return Err(TraitNotObjectSafe(did));
-                }
-
-                let cause = ObligationCause::new(
-                    obligation.cause.span,
-                    obligation.cause.body_id,
-                    ObjectCastObligation(target),
-                );
-
-                let predicate_to_obligation = |predicate| {
-                    Obligation::with_depth(
-                        cause.clone(),
-                        obligation.recursion_depth + 1,
-                        obligation.param_env,
-                        predicate,
-                    )
-                };
-
-                // Create obligations:
-                //  - Casting `T` to `Trait`
-                //  - For all the various builtin bounds attached to the object cast. (In other
-                //  words, if the object type is `Foo + Send`, this would create an obligation for
-                //  the `Send` check.)
-                //  - Projection predicates
-                nested.extend(
-                    data.iter().map(|predicate| {
-                        predicate_to_obligation(predicate.with_self_ty(tcx, source))
-                    }),
-                );
-
-                // We can only make objects from sized types.
-                let tr = ty::TraitRef::new(
-                    tcx.require_lang_item(lang_items::SizedTraitLangItem, None),
-                    tcx.mk_substs_trait(source, &[]),
-                );
-                nested.push(predicate_to_obligation(tr.without_const().to_predicate()));
-
-                // If the type is `Foo + 'a`, ensure that the type
-                // being cast to `Foo + 'a` outlives `'a`:
-                let outlives = ty::OutlivesPredicate(source, r);
-                nested.push(predicate_to_obligation(ty::Binder::dummy(outlives).to_predicate()));
-            }
-
-            // `[T; n]` -> `[T]`
-            (&ty::Array(a, _), &ty::Slice(b)) => {
-                let InferOk { obligations, .. } = self
-                    .infcx
-                    .at(&obligation.cause, obligation.param_env)
-                    .eq(b, a)
-                    .map_err(|_| Unimplemented)?;
-                nested.extend(obligations);
-            }
-
-            // `Struct<T>` -> `Struct<U>`
-            (&ty::Adt(def, substs_a), &ty::Adt(_, substs_b)) => {
-                let fields =
-                    def.all_fields().map(|field| tcx.type_of(field.did)).collect::<Vec<_>>();
-
-                // The last field of the structure has to exist and contain type parameters.
-                let field = if let Some(&field) = fields.last() {
-                    field
-                } else {
-                    return Err(Unimplemented);
-                };
-                let mut ty_params = GrowableBitSet::new_empty();
-                let mut found = false;
-                for ty in field.walk() {
-                    if let ty::Param(p) = ty.kind {
-                        ty_params.insert(p.index as usize);
-                        found = true;
-                    }
-                }
-                if !found {
-                    return Err(Unimplemented);
-                }
-
-                // Replace type parameters used in unsizing with
-                // Error and ensure they do not affect any other fields.
-                // This could be checked after type collection for any struct
-                // with a potentially unsized trailing field.
-                let params = substs_a
-                    .iter()
-                    .enumerate()
-                    .map(|(i, &k)| if ty_params.contains(i) { tcx.types.err.into() } else { k });
-                let substs = tcx.mk_substs(params);
-                for &ty in fields.split_last().unwrap().1 {
-                    if ty.subst(tcx, substs).references_error() {
-                        return Err(Unimplemented);
-                    }
-                }
-
-                // Extract `Field<T>` and `Field<U>` from `Struct<T>` and `Struct<U>`.
-                let inner_source = field.subst(tcx, substs_a);
-                let inner_target = field.subst(tcx, substs_b);
-
-                // Check that the source struct with the target's
-                // unsized parameters is equal to the target.
-                let params = substs_a.iter().enumerate().map(|(i, &k)| {
-                    if ty_params.contains(i) { substs_b.type_at(i).into() } else { k }
-                });
-                let new_struct = tcx.mk_adt(def, tcx.mk_substs(params));
-                let InferOk { obligations, .. } = self
-                    .infcx
-                    .at(&obligation.cause, obligation.param_env)
-                    .eq(target, new_struct)
-                    .map_err(|_| Unimplemented)?;
-                nested.extend(obligations);
-
-                // Construct the nested `Field<T>: Unsize<Field<U>>` predicate.
-                nested.push(predicate_for_trait_def(
-                    tcx,
-                    obligation.param_env,
-                    obligation.cause.clone(),
-                    obligation.predicate.def_id(),
-                    obligation.recursion_depth + 1,
-                    inner_source,
-                    &[inner_target.into()],
-                ));
-            }
-
-            // `(.., T)` -> `(.., U)`
-            (&ty::Tuple(tys_a), &ty::Tuple(tys_b)) => {
-                assert_eq!(tys_a.len(), tys_b.len());
-
-                // The last field of the tuple has to exist.
-                let (&a_last, a_mid) = if let Some(x) = tys_a.split_last() {
-                    x
-                } else {
-                    return Err(Unimplemented);
-                };
-                let &b_last = tys_b.last().unwrap();
-
-                // Check that the source tuple with the target's
-                // last element is equal to the target.
-                let new_tuple = tcx.mk_tup(
-                    a_mid.iter().map(|k| k.expect_ty()).chain(iter::once(b_last.expect_ty())),
-                );
-                let InferOk { obligations, .. } = self
-                    .infcx
-                    .at(&obligation.cause, obligation.param_env)
-                    .eq(target, new_tuple)
-                    .map_err(|_| Unimplemented)?;
-                nested.extend(obligations);
-
-                // Construct the nested `T: Unsize<U>` predicate.
-                nested.push(predicate_for_trait_def(
-                    tcx,
-                    obligation.param_env,
-                    obligation.cause.clone(),
-                    obligation.predicate.def_id(),
-                    obligation.recursion_depth + 1,
-                    a_last.expect_ty(),
-                    &[b_last.into()],
-                ));
-            }
-
-            _ => bug!(),
-        };
-
-        Ok(VtableBuiltinData { nested })
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Matching
-    //
-    // Matching is a common path used for both evaluation and
-    // confirmation.  It basically unifies types that appear in impls
-    // and traits. This does affect the surrounding environment;
-    // therefore, when used during evaluation, match routines must be
-    // run inside of a `probe()` so that their side-effects are
-    // contained.
-
-    fn rematch_impl(
-        &mut self,
-        impl_def_id: DefId,
-        obligation: &TraitObligation<'tcx>,
-        snapshot: &CombinedSnapshot<'_, 'tcx>,
-    ) -> Normalized<'tcx, SubstsRef<'tcx>> {
-        match self.match_impl(impl_def_id, obligation, snapshot) {
-            Ok(substs) => substs,
-            Err(()) => {
-                bug!(
-                    "Impl {:?} was matchable against {:?} but now is not",
-                    impl_def_id,
-                    obligation
-                );
-            }
-        }
-    }
-
-    fn match_impl(
-        &mut self,
-        impl_def_id: DefId,
-        obligation: &TraitObligation<'tcx>,
-        snapshot: &CombinedSnapshot<'_, 'tcx>,
-    ) -> Result<Normalized<'tcx, SubstsRef<'tcx>>, ()> {
-        let impl_trait_ref = self.tcx().impl_trait_ref(impl_def_id).unwrap();
-
-        // Before we create the substitutions and everything, first
-        // consider a "quick reject". This avoids creating more types
-        // and so forth that we need to.
-        if self.fast_reject_trait_refs(obligation, &impl_trait_ref) {
-            return Err(());
-        }
-
-        let (skol_obligation, placeholder_map) =
-            self.infcx().replace_bound_vars_with_placeholders(&obligation.predicate);
-        let skol_obligation_trait_ref = skol_obligation.trait_ref;
-
-        let impl_substs = self.infcx.fresh_substs_for_item(obligation.cause.span, impl_def_id);
-
-        let impl_trait_ref = impl_trait_ref.subst(self.tcx(), impl_substs);
-
-        let Normalized { value: impl_trait_ref, obligations: mut nested_obligations } =
-            project::normalize_with_depth(
-                self,
-                obligation.param_env,
-                obligation.cause.clone(),
-                obligation.recursion_depth + 1,
-                &impl_trait_ref,
-            );
-
-        debug!(
-            "match_impl(impl_def_id={:?}, obligation={:?}, \
-             impl_trait_ref={:?}, skol_obligation_trait_ref={:?})",
-            impl_def_id, obligation, impl_trait_ref, skol_obligation_trait_ref
-        );
-
-        let InferOk { obligations, .. } = self
-            .infcx
-            .at(&obligation.cause, obligation.param_env)
-            .eq(skol_obligation_trait_ref, impl_trait_ref)
-            .map_err(|e| debug!("match_impl: failed eq_trait_refs due to `{}`", e))?;
-        nested_obligations.extend(obligations);
-
-        if let Err(e) = self.infcx.leak_check(false, &placeholder_map, snapshot) {
-            debug!("match_impl: failed leak check due to `{}`", e);
-            return Err(());
-        }
-
-        if self.intercrate.is_none()
-            && self.tcx().impl_polarity(impl_def_id) == ty::ImplPolarity::Reservation
-        {
-            debug!("match_impl: reservation impls only apply in intercrate mode");
-            return Err(());
-        }
-
-        debug!("match_impl: success impl_substs={:?}", impl_substs);
-        Ok(Normalized { value: impl_substs, obligations: nested_obligations })
-    }
-
-    fn fast_reject_trait_refs(
-        &mut self,
-        obligation: &TraitObligation<'_>,
-        impl_trait_ref: &ty::TraitRef<'_>,
-    ) -> bool {
-        // We can avoid creating type variables and doing the full
-        // substitution if we find that any of the input types, when
-        // simplified, do not match.
-
-        obligation.predicate.skip_binder().input_types().zip(impl_trait_ref.input_types()).any(
-            |(obligation_ty, impl_ty)| {
-                let simplified_obligation_ty =
-                    fast_reject::simplify_type(self.tcx(), obligation_ty, true);
-                let simplified_impl_ty = fast_reject::simplify_type(self.tcx(), impl_ty, false);
-
-                simplified_obligation_ty.is_some()
-                    && simplified_impl_ty.is_some()
-                    && simplified_obligation_ty != simplified_impl_ty
-            },
-        )
-    }
-
-    /// Normalize `where_clause_trait_ref` and try to match it against
-    /// `obligation`. If successful, return any predicates that
-    /// result from the normalization. Normalization is necessary
-    /// because where-clauses are stored in the parameter environment
-    /// unnormalized.
-    fn match_where_clause_trait_ref(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        where_clause_trait_ref: ty::PolyTraitRef<'tcx>,
-    ) -> Result<Vec<PredicateObligation<'tcx>>, ()> {
-        self.match_poly_trait_ref(obligation, where_clause_trait_ref)
-    }
-
-    /// Returns `Ok` if `poly_trait_ref` being true implies that the
-    /// obligation is satisfied.
-    fn match_poly_trait_ref(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        poly_trait_ref: ty::PolyTraitRef<'tcx>,
-    ) -> Result<Vec<PredicateObligation<'tcx>>, ()> {
-        debug!(
-            "match_poly_trait_ref: obligation={:?} poly_trait_ref={:?}",
-            obligation, poly_trait_ref
-        );
-
-        self.infcx
-            .at(&obligation.cause, obligation.param_env)
-            .sup(obligation.predicate.to_poly_trait_ref(), poly_trait_ref)
-            .map(|InferOk { obligations, .. }| obligations)
-            .map_err(|_| ())
-    }
-
-    ///////////////////////////////////////////////////////////////////////////
-    // Miscellany
-
-    fn match_fresh_trait_refs(
-        &self,
-        previous: &ty::PolyTraitRef<'tcx>,
-        current: &ty::PolyTraitRef<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-    ) -> bool {
-        let mut matcher = ty::_match::Match::new(self.tcx(), param_env);
-        matcher.relate(previous, current).is_ok()
-    }
-
-    fn push_stack<'o>(
-        &mut self,
-        previous_stack: TraitObligationStackList<'o, 'tcx>,
-        obligation: &'o TraitObligation<'tcx>,
-    ) -> TraitObligationStack<'o, 'tcx> {
-        let fresh_trait_ref =
-            obligation.predicate.to_poly_trait_ref().fold_with(&mut self.freshener);
-
-        let dfn = previous_stack.cache.next_dfn();
-        let depth = previous_stack.depth() + 1;
-        TraitObligationStack {
-            obligation,
-            fresh_trait_ref,
-            reached_depth: Cell::new(depth),
-            previous: previous_stack,
-            dfn,
-            depth,
-        }
-    }
-
-    fn closure_trait_ref_unnormalized(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        closure_def_id: DefId,
-        substs: SubstsRef<'tcx>,
-    ) -> ty::PolyTraitRef<'tcx> {
-        debug!(
-            "closure_trait_ref_unnormalized(obligation={:?}, closure_def_id={:?}, substs={:?})",
-            obligation, closure_def_id, substs,
-        );
-        let closure_type = self.infcx.closure_sig(closure_def_id, substs);
-
-        debug!("closure_trait_ref_unnormalized: closure_type = {:?}", closure_type);
-
-        // (1) Feels icky to skip the binder here, but OTOH we know
-        // that the self-type is an unboxed closure type and hence is
-        // in fact unparameterized (or at least does not reference any
-        // regions bound in the obligation). Still probably some
-        // refactoring could make this nicer.
-        closure_trait_ref_and_return_type(
-            self.tcx(),
-            obligation.predicate.def_id(),
-            obligation.predicate.skip_binder().self_ty(), // (1)
-            closure_type,
-            util::TupleArgumentsFlag::No,
-        )
-        .map_bound(|(trait_ref, _)| trait_ref)
-    }
-
-    fn generator_trait_ref_unnormalized(
-        &mut self,
-        obligation: &TraitObligation<'tcx>,
-        closure_def_id: DefId,
-        substs: SubstsRef<'tcx>,
-    ) -> ty::PolyTraitRef<'tcx> {
-        let gen_sig = substs.as_generator().poly_sig(closure_def_id, self.tcx());
-
-        // (1) Feels icky to skip the binder here, but OTOH we know
-        // that the self-type is an generator type and hence is
-        // in fact unparameterized (or at least does not reference any
-        // regions bound in the obligation). Still probably some
-        // refactoring could make this nicer.
-
-        super::util::generator_trait_ref_and_outputs(
-            self.tcx(),
-            obligation.predicate.def_id(),
-            obligation.predicate.skip_binder().self_ty(), // (1)
-            gen_sig,
-        )
-        .map_bound(|(trait_ref, ..)| trait_ref)
-    }
-
-    /// Returns the obligations that are implied by instantiating an
-    /// impl or trait. The obligations are substituted and fully
-    /// normalized. This is used when confirming an impl or default
-    /// impl.
-    fn impl_or_trait_obligations(
-        &mut self,
-        cause: ObligationCause<'tcx>,
-        recursion_depth: usize,
-        param_env: ty::ParamEnv<'tcx>,
-        def_id: DefId,           // of impl or trait
-        substs: SubstsRef<'tcx>, // for impl or trait
-    ) -> Vec<PredicateObligation<'tcx>> {
-        debug!("impl_or_trait_obligations(def_id={:?})", def_id);
-        let tcx = self.tcx();
-
-        // To allow for one-pass evaluation of the nested obligation,
-        // each predicate must be preceded by the obligations required
-        // to normalize it.
-        // for example, if we have:
-        //    impl<U: Iterator<Item: Copy>, V: Iterator<Item = U>> Foo for V
-        // the impl will have the following predicates:
-        //    <V as Iterator>::Item = U,
-        //    U: Iterator, U: Sized,
-        //    V: Iterator, V: Sized,
-        //    <U as Iterator>::Item: Copy
-        // When we substitute, say, `V => IntoIter<u32>, U => $0`, the last
-        // obligation will normalize to `<$0 as Iterator>::Item = $1` and
-        // `$1: Copy`, so we must ensure the obligations are emitted in
-        // that order.
-        let predicates = tcx.predicates_of(def_id);
-        assert_eq!(predicates.parent, None);
-        let mut predicates: Vec<_> = predicates
-            .predicates
-            .iter()
-            .flat_map(|(predicate, _)| {
-                let predicate = normalize_with_depth(
-                    self,
-                    param_env,
-                    cause.clone(),
-                    recursion_depth,
-                    &predicate.subst(tcx, substs),
-                );
-                predicate.obligations.into_iter().chain(Some(Obligation {
-                    cause: cause.clone(),
-                    recursion_depth,
-                    param_env,
-                    predicate: predicate.value,
-                }))
-            })
-            .collect();
-
-        // We are performing deduplication here to avoid exponential blowups
-        // (#38528) from happening, but the real cause of the duplication is
-        // unknown. What we know is that the deduplication avoids exponential
-        // amount of predicates being propagated when processing deeply nested
-        // types.
-        //
-        // This code is hot enough that it's worth avoiding the allocation
-        // required for the FxHashSet when possible. Special-casing lengths 0,
-        // 1 and 2 covers roughly 75-80% of the cases.
-        if predicates.len() <= 1 {
-            // No possibility of duplicates.
-        } else if predicates.len() == 2 {
-            // Only two elements. Drop the second if they are equal.
-            if predicates[0] == predicates[1] {
-                predicates.truncate(1);
-            }
-        } else {
-            // Three or more elements. Use a general deduplication process.
-            let mut seen = FxHashSet::default();
-            predicates.retain(|i| seen.insert(i.clone()));
-        }
-
-        predicates
-    }
-}
-
-impl<'tcx> TraitObligation<'tcx> {
-    #[allow(unused_comparisons)]
-    pub fn derived_cause(
-        &self,
-        variant: fn(DerivedObligationCause<'tcx>) -> ObligationCauseCode<'tcx>,
-    ) -> ObligationCause<'tcx> {
-        /*!
-         * Creates a cause for obligations that are derived from
-         * `obligation` by a recursive search (e.g., for a builtin
-         * bound, or eventually a `auto trait Foo`). If `obligation`
-         * is itself a derived obligation, this is just a clone, but
-         * otherwise we create a "derived obligation" cause so as to
-         * keep track of the original root obligation for error
-         * reporting.
-         */
-
-        let obligation = self;
-
-        // NOTE(flaper87): As of now, it keeps track of the whole error
-        // chain. Ideally, we should have a way to configure this either
-        // by using -Z verbose or just a CLI argument.
-        let derived_cause = DerivedObligationCause {
-            parent_trait_ref: obligation.predicate.to_poly_trait_ref(),
-            parent_code: Rc::new(obligation.cause.code.clone()),
-        };
-        let derived_code = variant(derived_cause);
-        ObligationCause::new(obligation.cause.span, obligation.cause.body_id, derived_code)
-    }
-}
-
-impl<'tcx> SelectionCache<'tcx> {
-    /// Actually frees the underlying memory in contrast to what stdlib containers do on `clear`
-    pub fn clear(&self) {
-        *self.hashmap.borrow_mut() = Default::default();
-    }
-}
-
 impl<'tcx> EvaluationCache<'tcx> {
     /// Actually frees the underlying memory in contrast to what stdlib containers do on `clear`
     pub fn clear(&self) {
@@ -3841,292 +272,6 @@ impl<'tcx> EvaluationCache<'tcx> {
     }
 }
 
-impl<'o, 'tcx> TraitObligationStack<'o, 'tcx> {
-    fn list(&'o self) -> TraitObligationStackList<'o, 'tcx> {
-        TraitObligationStackList::with(self)
-    }
-
-    fn cache(&self) -> &'o ProvisionalEvaluationCache<'tcx> {
-        self.previous.cache
-    }
-
-    fn iter(&'o self) -> TraitObligationStackList<'o, 'tcx> {
-        self.list()
-    }
-
-    /// Indicates that attempting to evaluate this stack entry
-    /// required accessing something from the stack at depth `reached_depth`.
-    fn update_reached_depth(&self, reached_depth: usize) {
-        assert!(
-            self.depth > reached_depth,
-            "invoked `update_reached_depth` with something under this stack: \
-             self.depth={} reached_depth={}",
-            self.depth,
-            reached_depth,
-        );
-        debug!("update_reached_depth(reached_depth={})", reached_depth);
-        let mut p = self;
-        while reached_depth < p.depth {
-            debug!("update_reached_depth: marking {:?} as cycle participant", p.fresh_trait_ref);
-            p.reached_depth.set(p.reached_depth.get().min(reached_depth));
-            p = p.previous.head.unwrap();
-        }
-    }
-}
-
-/// The "provisional evaluation cache" is used to store intermediate cache results
-/// when solving auto traits. Auto traits are unusual in that they can support
-/// cycles. So, for example, a "proof tree" like this would be ok:
-///
-/// - `Foo<T>: Send` :-
-///   - `Bar<T>: Send` :-
-///     - `Foo<T>: Send` -- cycle, but ok
-///   - `Baz<T>: Send`
-///
-/// Here, to prove `Foo<T>: Send`, we have to prove `Bar<T>: Send` and
-/// `Baz<T>: Send`. Proving `Bar<T>: Send` in turn required `Foo<T>: Send`.
-/// For non-auto traits, this cycle would be an error, but for auto traits (because
-/// they are coinductive) it is considered ok.
-///
-/// However, there is a complication: at the point where we have
-/// "proven" `Bar<T>: Send`, we have in fact only proven it
-/// *provisionally*. In particular, we proved that `Bar<T>: Send`
-/// *under the assumption* that `Foo<T>: Send`. But what if we later
-/// find out this assumption is wrong?  Specifically, we could
-/// encounter some kind of error proving `Baz<T>: Send`. In that case,
-/// `Bar<T>: Send` didn't turn out to be true.
-///
-/// In Issue #60010, we found a bug in rustc where it would cache
-/// these intermediate results. This was fixed in #60444 by disabling
-/// *all* caching for things involved in a cycle -- in our example,
-/// that would mean we don't cache that `Bar<T>: Send`.  But this led
-/// to large slowdowns.
-///
-/// Specifically, imagine this scenario, where proving `Baz<T>: Send`
-/// first requires proving `Bar<T>: Send` (which is true:
-///
-/// - `Foo<T>: Send` :-
-///   - `Bar<T>: Send` :-
-///     - `Foo<T>: Send` -- cycle, but ok
-///   - `Baz<T>: Send`
-///     - `Bar<T>: Send` -- would be nice for this to be a cache hit!
-///     - `*const T: Send` -- but what if we later encounter an error?
-///
-/// The *provisional evaluation cache* resolves this issue. It stores
-/// cache results that we've proven but which were involved in a cycle
-/// in some way. We track the minimal stack depth (i.e., the
-/// farthest from the top of the stack) that we are dependent on.
-/// The idea is that the cache results within are all valid -- so long as
-/// none of the nodes in between the current node and the node at that minimum
-/// depth result in an error (in which case the cached results are just thrown away).
-///
-/// During evaluation, we consult this provisional cache and rely on
-/// it. Accessing a cached value is considered equivalent to accessing
-/// a result at `reached_depth`, so it marks the *current* solution as
-/// provisional as well. If an error is encountered, we toss out any
-/// provisional results added from the subtree that encountered the
-/// error.  When we pop the node at `reached_depth` from the stack, we
-/// can commit all the things that remain in the provisional cache.
-struct ProvisionalEvaluationCache<'tcx> {
-    /// next "depth first number" to issue -- just a counter
-    dfn: Cell<usize>,
-
-    /// Stores the "coldest" depth (bottom of stack) reached by any of
-    /// the evaluation entries. The idea here is that all things in the provisional
-    /// cache are always dependent on *something* that is colder in the stack:
-    /// therefore, if we add a new entry that is dependent on something *colder still*,
-    /// we have to modify the depth for all entries at once.
-    ///
-    /// Example:
-    ///
-    /// Imagine we have a stack `A B C D E` (with `E` being the top of
-    /// the stack).  We cache something with depth 2, which means that
-    /// it was dependent on C.  Then we pop E but go on and process a
-    /// new node F: A B C D F.  Now F adds something to the cache with
-    /// depth 1, meaning it is dependent on B.  Our original cache
-    /// entry is also dependent on B, because there is a path from E
-    /// to C and then from C to F and from F to B.
-    reached_depth: Cell<usize>,
-
-    /// Map from cache key to the provisionally evaluated thing.
-    /// The cache entries contain the result but also the DFN in which they
-    /// were added. The DFN is used to clear out values on failure.
-    ///
-    /// Imagine we have a stack like:
-    ///
-    /// - `A B C` and we add a cache for the result of C (DFN 2)
-    /// - Then we have a stack `A B D` where `D` has DFN 3
-    /// - We try to solve D by evaluating E: `A B D E` (DFN 4)
-    /// - `E` generates various cache entries which have cyclic dependices on `B`
-    ///   - `A B D E F` and so forth
-    ///   - the DFN of `F` for example would be 5
-    /// - then we determine that `E` is in error -- we will then clear
-    ///   all cache values whose DFN is >= 4 -- in this case, that
-    ///   means the cached value for `F`.
-    map: RefCell<FxHashMap<ty::PolyTraitRef<'tcx>, ProvisionalEvaluation>>,
-}
-
-/// A cache value for the provisional cache: contains the depth-first
-/// number (DFN) and result.
-#[derive(Copy, Clone, Debug)]
-struct ProvisionalEvaluation {
-    from_dfn: usize,
-    result: EvaluationResult,
-}
-
-impl<'tcx> Default for ProvisionalEvaluationCache<'tcx> {
-    fn default() -> Self {
-        Self {
-            dfn: Cell::new(0),
-            reached_depth: Cell::new(std::usize::MAX),
-            map: Default::default(),
-        }
-    }
-}
-
-impl<'tcx> ProvisionalEvaluationCache<'tcx> {
-    /// Get the next DFN in sequence (basically a counter).
-    fn next_dfn(&self) -> usize {
-        let result = self.dfn.get();
-        self.dfn.set(result + 1);
-        result
-    }
-
-    /// Check the provisional cache for any result for
-    /// `fresh_trait_ref`. If there is a hit, then you must consider
-    /// it an access to the stack slots at depth
-    /// `self.current_reached_depth()` and above.
-    fn get_provisional(&self, fresh_trait_ref: ty::PolyTraitRef<'tcx>) -> Option<EvaluationResult> {
-        debug!(
-            "get_provisional(fresh_trait_ref={:?}) = {:#?} with reached-depth {}",
-            fresh_trait_ref,
-            self.map.borrow().get(&fresh_trait_ref),
-            self.reached_depth.get(),
-        );
-        Some(self.map.borrow().get(&fresh_trait_ref)?.result)
-    }
-
-    /// Current value of the `reached_depth` counter -- all the
-    /// provisional cache entries are dependent on the item at this
-    /// depth.
-    fn current_reached_depth(&self) -> usize {
-        self.reached_depth.get()
-    }
-
-    /// Insert a provisional result into the cache. The result came
-    /// from the node with the given DFN. It accessed a minimum depth
-    /// of `reached_depth` to compute. It evaluated `fresh_trait_ref`
-    /// and resulted in `result`.
-    fn insert_provisional(
-        &self,
-        from_dfn: usize,
-        reached_depth: usize,
-        fresh_trait_ref: ty::PolyTraitRef<'tcx>,
-        result: EvaluationResult,
-    ) {
-        debug!(
-            "insert_provisional(from_dfn={}, reached_depth={}, fresh_trait_ref={:?}, result={:?})",
-            from_dfn, reached_depth, fresh_trait_ref, result,
-        );
-        let r_d = self.reached_depth.get();
-        self.reached_depth.set(r_d.min(reached_depth));
-
-        debug!("insert_provisional: reached_depth={:?}", self.reached_depth.get());
-
-        self.map.borrow_mut().insert(fresh_trait_ref, ProvisionalEvaluation { from_dfn, result });
-    }
-
-    /// Invoked when the node with dfn `dfn` does not get a successful
-    /// result.  This will clear out any provisional cache entries
-    /// that were added since `dfn` was created. This is because the
-    /// provisional entries are things which must assume that the
-    /// things on the stack at the time of their creation succeeded --
-    /// since the failing node is presently at the top of the stack,
-    /// these provisional entries must either depend on it or some
-    /// ancestor of it.
-    fn on_failure(&self, dfn: usize) {
-        debug!("on_failure(dfn={:?})", dfn,);
-        self.map.borrow_mut().retain(|key, eval| {
-            if !eval.from_dfn >= dfn {
-                debug!("on_failure: removing {:?}", key);
-                false
-            } else {
-                true
-            }
-        });
-    }
-
-    /// Invoked when the node at depth `depth` completed without
-    /// depending on anything higher in the stack (if that completion
-    /// was a failure, then `on_failure` should have been invoked
-    /// already). The callback `op` will be invoked for each
-    /// provisional entry that we can now confirm.
-    fn on_completion(
-        &self,
-        depth: usize,
-        mut op: impl FnMut(ty::PolyTraitRef<'tcx>, EvaluationResult),
-    ) {
-        debug!("on_completion(depth={}, reached_depth={})", depth, self.reached_depth.get(),);
-
-        if self.reached_depth.get() < depth {
-            debug!("on_completion: did not yet reach depth to complete");
-            return;
-        }
-
-        for (fresh_trait_ref, eval) in self.map.borrow_mut().drain() {
-            debug!("on_completion: fresh_trait_ref={:?} eval={:?}", fresh_trait_ref, eval,);
-
-            op(fresh_trait_ref, eval.result);
-        }
-
-        self.reached_depth.set(std::usize::MAX);
-    }
-}
-
-#[derive(Copy, Clone)]
-struct TraitObligationStackList<'o, 'tcx> {
-    cache: &'o ProvisionalEvaluationCache<'tcx>,
-    head: Option<&'o TraitObligationStack<'o, 'tcx>>,
-}
-
-impl<'o, 'tcx> TraitObligationStackList<'o, 'tcx> {
-    fn empty(cache: &'o ProvisionalEvaluationCache<'tcx>) -> TraitObligationStackList<'o, 'tcx> {
-        TraitObligationStackList { cache, head: None }
-    }
-
-    fn with(r: &'o TraitObligationStack<'o, 'tcx>) -> TraitObligationStackList<'o, 'tcx> {
-        TraitObligationStackList { cache: r.cache(), head: Some(r) }
-    }
-
-    fn head(&self) -> Option<&'o TraitObligationStack<'o, 'tcx>> {
-        self.head
-    }
-
-    fn depth(&self) -> usize {
-        if let Some(head) = self.head { head.depth } else { 0 }
-    }
-}
-
-impl<'o, 'tcx> Iterator for TraitObligationStackList<'o, 'tcx> {
-    type Item = &'o TraitObligationStack<'o, 'tcx>;
-
-    fn next(&mut self) -> Option<&'o TraitObligationStack<'o, 'tcx>> {
-        match self.head {
-            Some(o) => {
-                *self = o.previous;
-                Some(o)
-            }
-            None => None,
-        }
-    }
-}
-
-impl<'o, 'tcx> fmt::Debug for TraitObligationStack<'o, 'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "TraitObligationStack({:?})", self.obligation)
-    }
-}
-
 #[derive(Clone, Eq, PartialEq)]
 pub struct WithDepNode<T> {
     dep_node: DepNodeIndex,
diff --git a/src/librustc/traits/specialization_graph.rs b/src/librustc/traits/specialization_graph.rs
new file mode 100644
index 0000000000..d481e578fc
--- /dev/null
+++ b/src/librustc/traits/specialization_graph.rs
@@ -0,0 +1,202 @@
+use crate::ich::{self, StableHashingContext};
+use crate::ty::fast_reject::SimplifiedType;
+use crate::ty::{self, TyCtxt};
+use rustc_ast::ast::Ident;
+use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_hir::def_id::{DefId, DefIdMap};
+
+/// A per-trait graph of impls in specialization order. At the moment, this
+/// graph forms a tree rooted with the trait itself, with all other nodes
+/// representing impls, and parent-child relationships representing
+/// specializations.
+///
+/// The graph provides two key services:
+///
+/// - Construction. This implicitly checks for overlapping impls (i.e., impls
+///   that overlap but where neither specializes the other -- an artifact of the
+///   simple "chain" rule.
+///
+/// - Parent extraction. In particular, the graph can give you the *immediate*
+///   parents of a given specializing impl, which is needed for extracting
+///   default items amongst other things. In the simple "chain" rule, every impl
+///   has at most one parent.
+#[derive(RustcEncodable, RustcDecodable, HashStable)]
+pub struct Graph {
+    // All impls have a parent; the "root" impls have as their parent the `def_id`
+    // of the trait.
+    pub parent: DefIdMap<DefId>,
+
+    // The "root" impls are found by looking up the trait's def_id.
+    pub children: DefIdMap<Children>,
+}
+
+impl Graph {
+    pub fn new() -> Graph {
+        Graph { parent: Default::default(), children: Default::default() }
+    }
+
+    /// The parent of a given impl, which is the `DefId` of the trait when the
+    /// impl is a "specialization root".
+    pub fn parent(&self, child: DefId) -> DefId {
+        *self.parent.get(&child).unwrap_or_else(|| panic!("Failed to get parent for {:?}", child))
+    }
+}
+
+/// Children of a given impl, grouped into blanket/non-blanket varieties as is
+/// done in `TraitDef`.
+#[derive(Default, RustcEncodable, RustcDecodable)]
+pub struct Children {
+    // Impls of a trait (or specializations of a given impl). To allow for
+    // quicker lookup, the impls are indexed by a simplified version of their
+    // `Self` type: impls with a simplifiable `Self` are stored in
+    // `nonblanket_impls` keyed by it, while all other impls are stored in
+    // `blanket_impls`.
+    //
+    // A similar division is used within `TraitDef`, but the lists there collect
+    // together *all* the impls for a trait, and are populated prior to building
+    // the specialization graph.
+    /// Impls of the trait.
+    pub nonblanket_impls: FxHashMap<SimplifiedType, Vec<DefId>>,
+
+    /// Blanket impls associated with the trait.
+    pub blanket_impls: Vec<DefId>,
+}
+
+/// A node in the specialization graph is either an impl or a trait
+/// definition; either can serve as a source of item definitions.
+/// There is always exactly one trait definition node: the root.
+#[derive(Debug, Copy, Clone)]
+pub enum Node {
+    Impl(DefId),
+    Trait(DefId),
+}
+
+impl<'tcx> Node {
+    pub fn is_from_trait(&self) -> bool {
+        match *self {
+            Node::Trait(..) => true,
+            _ => false,
+        }
+    }
+
+    /// Iterate over the items defined directly by the given (impl or trait) node.
+    pub fn items(&self, tcx: TyCtxt<'tcx>) -> impl 'tcx + Iterator<Item = &'tcx ty::AssocItem> {
+        tcx.associated_items(self.def_id()).in_definition_order()
+    }
+
+    /// Finds an associated item defined in this node.
+    ///
+    /// If this returns `None`, the item can potentially still be found in
+    /// parents of this node.
+    pub fn item(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        trait_item_name: Ident,
+        trait_item_kind: ty::AssocKind,
+        trait_def_id: DefId,
+    ) -> Option<ty::AssocItem> {
+        use crate::ty::AssocKind::*;
+
+        tcx.associated_items(self.def_id())
+            .filter_by_name_unhygienic(trait_item_name.name)
+            .find(move |impl_item| {
+                match (trait_item_kind, impl_item.kind) {
+                | (Const, Const)
+                | (Method, Method)
+                | (Type, Type)
+                | (Type, OpaqueTy)  // assoc. types can be made opaque in impls
+                => tcx.hygienic_eq(impl_item.ident, trait_item_name, trait_def_id),
+
+                | (Const, _)
+                | (Method, _)
+                | (Type, _)
+                | (OpaqueTy, _)
+                => false,
+            }
+            })
+            .copied()
+    }
+
+    pub fn def_id(&self) -> DefId {
+        match *self {
+            Node::Impl(did) => did,
+            Node::Trait(did) => did,
+        }
+    }
+}
+
+#[derive(Copy, Clone)]
+pub struct Ancestors<'tcx> {
+    trait_def_id: DefId,
+    specialization_graph: &'tcx Graph,
+    current_source: Option<Node>,
+}
+
+impl Iterator for Ancestors<'_> {
+    type Item = Node;
+    fn next(&mut self) -> Option<Node> {
+        let cur = self.current_source.take();
+        if let Some(Node::Impl(cur_impl)) = cur {
+            let parent = self.specialization_graph.parent(cur_impl);
+
+            self.current_source = if parent == self.trait_def_id {
+                Some(Node::Trait(parent))
+            } else {
+                Some(Node::Impl(parent))
+            };
+        }
+        cur
+    }
+}
+
+pub struct NodeItem<T> {
+    pub node: Node,
+    pub item: T,
+}
+
+impl<T> NodeItem<T> {
+    pub fn map<U, F: FnOnce(T) -> U>(self, f: F) -> NodeItem<U> {
+        NodeItem { node: self.node, item: f(self.item) }
+    }
+}
+
+impl<'tcx> Ancestors<'tcx> {
+    /// Finds the bottom-most (ie. most specialized) definition of an associated
+    /// item.
+    pub fn leaf_def(
+        mut self,
+        tcx: TyCtxt<'tcx>,
+        trait_item_name: Ident,
+        trait_item_kind: ty::AssocKind,
+    ) -> Option<NodeItem<ty::AssocItem>> {
+        let trait_def_id = self.trait_def_id;
+        self.find_map(|node| {
+            node.item(tcx, trait_item_name, trait_item_kind, trait_def_id)
+                .map(|item| NodeItem { node, item })
+        })
+    }
+}
+
+/// Walk up the specialization ancestors of a given impl, starting with that
+/// impl itself.
+pub fn ancestors(
+    tcx: TyCtxt<'tcx>,
+    trait_def_id: DefId,
+    start_from_impl: DefId,
+) -> Ancestors<'tcx> {
+    let specialization_graph = tcx.specialization_graph_of(trait_def_id);
+    Ancestors {
+        trait_def_id,
+        specialization_graph,
+        current_source: Some(Node::Impl(start_from_impl)),
+    }
+}
+
+impl<'a> HashStable<StableHashingContext<'a>> for Children {
+    fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
+        let Children { ref nonblanket_impls, ref blanket_impls } = *self;
+
+        ich::hash_stable_trait_impls(hcx, hasher, blanket_impls, nonblanket_impls);
+    }
+}
diff --git a/src/librustc/traits/specialize/mod.rs b/src/librustc/traits/specialize/mod.rs
deleted file mode 100644
index e559ea391c..0000000000
--- a/src/librustc/traits/specialize/mod.rs
+++ /dev/null
@@ -1,462 +0,0 @@
-//! Logic and data structures related to impl specialization, explained in
-//! greater detail below.
-//!
-//! At the moment, this implementation support only the simple "chain" rule:
-//! If any two impls overlap, one must be a strict subset of the other.
-//!
-//! See the [rustc guide] for a bit more detail on how specialization
-//! fits together with the rest of the trait machinery.
-//!
-//! [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/specialization.html
-
-pub mod specialization_graph;
-
-use crate::infer::{InferCtxt, InferOk};
-use crate::traits::select::IntercrateAmbiguityCause;
-use crate::traits::{self, coherence, FutureCompatOverlapErrorKind, ObligationCause, TraitEngine};
-use crate::ty::subst::{InternalSubsts, Subst, SubstsRef};
-use crate::ty::{self, TyCtxt, TypeFoldable};
-use rustc_data_structures::fx::FxHashSet;
-use rustc_errors::struct_span_err;
-use rustc_hir::def_id::DefId;
-use rustc_session::lint::builtin::ORDER_DEPENDENT_TRAIT_OBJECTS;
-use rustc_span::DUMMY_SP;
-
-use super::util::impl_trait_ref_and_oblig;
-use super::{FulfillmentContext, SelectionContext};
-
-/// Information pertinent to an overlapping impl error.
-#[derive(Debug)]
-pub struct OverlapError {
-    pub with_impl: DefId,
-    pub trait_desc: String,
-    pub self_desc: Option<String>,
-    pub intercrate_ambiguity_causes: Vec<IntercrateAmbiguityCause>,
-    pub involves_placeholder: bool,
-}
-
-/// Given a subst for the requested impl, translate it to a subst
-/// appropriate for the actual item definition (whether it be in that impl,
-/// a parent impl, or the trait).
-///
-/// When we have selected one impl, but are actually using item definitions from
-/// a parent impl providing a default, we need a way to translate between the
-/// type parameters of the two impls. Here the `source_impl` is the one we've
-/// selected, and `source_substs` is a substitution of its generics.
-/// And `target_node` is the impl/trait we're actually going to get the
-/// definition from. The resulting substitution will map from `target_node`'s
-/// generics to `source_impl`'s generics as instantiated by `source_subst`.
-///
-/// For example, consider the following scenario:
-///
-/// ```rust
-/// trait Foo { ... }
-/// impl<T, U> Foo for (T, U) { ... }  // target impl
-/// impl<V> Foo for (V, V) { ... }     // source impl
-/// ```
-///
-/// Suppose we have selected "source impl" with `V` instantiated with `u32`.
-/// This function will produce a substitution with `T` and `U` both mapping to `u32`.
-///
-/// where-clauses add some trickiness here, because they can be used to "define"
-/// an argument indirectly:
-///
-/// ```rust
-/// impl<'a, I, T: 'a> Iterator for Cloned<I>
-///    where I: Iterator<Item = &'a T>, T: Clone
-/// ```
-///
-/// In a case like this, the substitution for `T` is determined indirectly,
-/// through associated type projection. We deal with such cases by using
-/// *fulfillment* to relate the two impls, requiring that all projections are
-/// resolved.
-pub fn translate_substs<'a, 'tcx>(
-    infcx: &InferCtxt<'a, 'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    source_impl: DefId,
-    source_substs: SubstsRef<'tcx>,
-    target_node: specialization_graph::Node,
-) -> SubstsRef<'tcx> {
-    debug!(
-        "translate_substs({:?}, {:?}, {:?}, {:?})",
-        param_env, source_impl, source_substs, target_node
-    );
-    let source_trait_ref =
-        infcx.tcx.impl_trait_ref(source_impl).unwrap().subst(infcx.tcx, &source_substs);
-
-    // translate the Self and Param parts of the substitution, since those
-    // vary across impls
-    let target_substs = match target_node {
-        specialization_graph::Node::Impl(target_impl) => {
-            // no need to translate if we're targeting the impl we started with
-            if source_impl == target_impl {
-                return source_substs;
-            }
-
-            fulfill_implication(infcx, param_env, source_trait_ref, target_impl).unwrap_or_else(
-                |_| {
-                    bug!(
-                        "When translating substitutions for specialization, the expected \
-                          specialization failed to hold"
-                    )
-                },
-            )
-        }
-        specialization_graph::Node::Trait(..) => source_trait_ref.substs,
-    };
-
-    // directly inherent the method generics, since those do not vary across impls
-    source_substs.rebase_onto(infcx.tcx, source_impl, target_substs)
-}
-
-/// Given a selected impl described by `impl_data`, returns the
-/// definition and substitutions for the method with the name `name`
-/// the kind `kind`, and trait method substitutions `substs`, in
-/// that impl, a less specialized impl, or the trait default,
-/// whichever applies.
-pub fn find_associated_item<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    item: &ty::AssocItem,
-    substs: SubstsRef<'tcx>,
-    impl_data: &super::VtableImplData<'tcx, ()>,
-) -> (DefId, SubstsRef<'tcx>) {
-    debug!("find_associated_item({:?}, {:?}, {:?}, {:?})", param_env, item, substs, impl_data);
-    assert!(!substs.needs_infer());
-
-    let trait_def_id = tcx.trait_id_of_impl(impl_data.impl_def_id).unwrap();
-    let trait_def = tcx.trait_def(trait_def_id);
-
-    let ancestors = trait_def.ancestors(tcx, impl_data.impl_def_id);
-    match ancestors.leaf_def(tcx, item.ident, item.kind) {
-        Some(node_item) => {
-            let substs = tcx.infer_ctxt().enter(|infcx| {
-                let param_env = param_env.with_reveal_all();
-                let substs = substs.rebase_onto(tcx, trait_def_id, impl_data.substs);
-                let substs = translate_substs(
-                    &infcx,
-                    param_env,
-                    impl_data.impl_def_id,
-                    substs,
-                    node_item.node,
-                );
-                infcx.tcx.erase_regions(&substs)
-            });
-            (node_item.item.def_id, substs)
-        }
-        None => bug!("{:?} not found in {:?}", item, impl_data.impl_def_id),
-    }
-}
-
-/// Is `impl1` a specialization of `impl2`?
-///
-/// Specialization is determined by the sets of types to which the impls apply;
-/// `impl1` specializes `impl2` if it applies to a subset of the types `impl2` applies
-/// to.
-pub(super) fn specializes(tcx: TyCtxt<'_>, (impl1_def_id, impl2_def_id): (DefId, DefId)) -> bool {
-    debug!("specializes({:?}, {:?})", impl1_def_id, impl2_def_id);
-
-    // The feature gate should prevent introducing new specializations, but not
-    // taking advantage of upstream ones.
-    if !tcx.features().specialization && (impl1_def_id.is_local() || impl2_def_id.is_local()) {
-        return false;
-    }
-
-    // We determine whether there's a subset relationship by:
-    //
-    // - skolemizing impl1,
-    // - assuming the where clauses for impl1,
-    // - instantiating impl2 with fresh inference variables,
-    // - unifying,
-    // - attempting to prove the where clauses for impl2
-    //
-    // The last three steps are encapsulated in `fulfill_implication`.
-    //
-    // See RFC 1210 for more details and justification.
-
-    // Currently we do not allow e.g., a negative impl to specialize a positive one
-    if tcx.impl_polarity(impl1_def_id) != tcx.impl_polarity(impl2_def_id) {
-        return false;
-    }
-
-    // create a parameter environment corresponding to a (placeholder) instantiation of impl1
-    let penv = tcx.param_env(impl1_def_id);
-    let impl1_trait_ref = tcx.impl_trait_ref(impl1_def_id).unwrap();
-
-    // Create a infcx, taking the predicates of impl1 as assumptions:
-    tcx.infer_ctxt().enter(|infcx| {
-        // Normalize the trait reference. The WF rules ought to ensure
-        // that this always succeeds.
-        let impl1_trait_ref = match traits::fully_normalize(
-            &infcx,
-            FulfillmentContext::new(),
-            ObligationCause::dummy(),
-            penv,
-            &impl1_trait_ref,
-        ) {
-            Ok(impl1_trait_ref) => impl1_trait_ref,
-            Err(err) => {
-                bug!("failed to fully normalize {:?}: {:?}", impl1_trait_ref, err);
-            }
-        };
-
-        // Attempt to prove that impl2 applies, given all of the above.
-        fulfill_implication(&infcx, penv, impl1_trait_ref, impl2_def_id).is_ok()
-    })
-}
-
-/// Attempt to fulfill all obligations of `target_impl` after unification with
-/// `source_trait_ref`. If successful, returns a substitution for *all* the
-/// generics of `target_impl`, including both those needed to unify with
-/// `source_trait_ref` and those whose identity is determined via a where
-/// clause in the impl.
-fn fulfill_implication<'a, 'tcx>(
-    infcx: &InferCtxt<'a, 'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    source_trait_ref: ty::TraitRef<'tcx>,
-    target_impl: DefId,
-) -> Result<SubstsRef<'tcx>, ()> {
-    debug!(
-        "fulfill_implication({:?}, trait_ref={:?} |- {:?} applies)",
-        param_env, source_trait_ref, target_impl
-    );
-
-    let selcx = &mut SelectionContext::new(&infcx);
-    let target_substs = infcx.fresh_substs_for_item(DUMMY_SP, target_impl);
-    let (target_trait_ref, mut obligations) =
-        impl_trait_ref_and_oblig(selcx, param_env, target_impl, target_substs);
-    debug!(
-        "fulfill_implication: target_trait_ref={:?}, obligations={:?}",
-        target_trait_ref, obligations
-    );
-
-    // do the impls unify? If not, no specialization.
-    match infcx.at(&ObligationCause::dummy(), param_env).eq(source_trait_ref, target_trait_ref) {
-        Ok(InferOk { obligations: o, .. }) => {
-            obligations.extend(o);
-        }
-        Err(_) => {
-            debug!(
-                "fulfill_implication: {:?} does not unify with {:?}",
-                source_trait_ref, target_trait_ref
-            );
-            return Err(());
-        }
-    }
-
-    // attempt to prove all of the predicates for impl2 given those for impl1
-    // (which are packed up in penv)
-
-    infcx.save_and_restore_in_snapshot_flag(|infcx| {
-        // If we came from `translate_substs`, we already know that the
-        // predicates for our impl hold (after all, we know that a more
-        // specialized impl holds, so our impl must hold too), and
-        // we only want to process the projections to determine the
-        // the types in our substs using RFC 447, so we can safely
-        // ignore region obligations, which allows us to avoid threading
-        // a node-id to assign them with.
-        //
-        // If we came from specialization graph construction, then
-        // we already make a mockery out of the region system, so
-        // why not ignore them a bit earlier?
-        let mut fulfill_cx = FulfillmentContext::new_ignoring_regions();
-        for oblig in obligations.into_iter() {
-            fulfill_cx.register_predicate_obligation(&infcx, oblig);
-        }
-        match fulfill_cx.select_all_or_error(infcx) {
-            Err(errors) => {
-                // no dice!
-                debug!(
-                    "fulfill_implication: for impls on {:?} and {:?}, \
-                        could not fulfill: {:?} given {:?}",
-                    source_trait_ref, target_trait_ref, errors, param_env.caller_bounds
-                );
-                Err(())
-            }
-
-            Ok(()) => {
-                debug!(
-                    "fulfill_implication: an impl for {:?} specializes {:?}",
-                    source_trait_ref, target_trait_ref
-                );
-
-                // Now resolve the *substitution* we built for the target earlier, replacing
-                // the inference variables inside with whatever we got from fulfillment.
-                Ok(infcx.resolve_vars_if_possible(&target_substs))
-            }
-        }
-    })
-}
-
-// Query provider for `specialization_graph_of`.
-pub(super) fn specialization_graph_provider(
-    tcx: TyCtxt<'_>,
-    trait_id: DefId,
-) -> &specialization_graph::Graph {
-    let mut sg = specialization_graph::Graph::new();
-
-    let mut trait_impls = tcx.all_impls(trait_id);
-
-    // The coherence checking implementation seems to rely on impls being
-    // iterated over (roughly) in definition order, so we are sorting by
-    // negated `CrateNum` (so remote definitions are visited first) and then
-    // by a flattened version of the `DefIndex`.
-    trait_impls
-        .sort_unstable_by_key(|def_id| (-(def_id.krate.as_u32() as i64), def_id.index.index()));
-
-    for impl_def_id in trait_impls {
-        if impl_def_id.is_local() {
-            // This is where impl overlap checking happens:
-            let insert_result = sg.insert(tcx, impl_def_id);
-            // Report error if there was one.
-            let (overlap, used_to_be_allowed) = match insert_result {
-                Err(overlap) => (Some(overlap), None),
-                Ok(Some(overlap)) => (Some(overlap.error), Some(overlap.kind)),
-                Ok(None) => (None, None),
-            };
-
-            if let Some(overlap) = overlap {
-                let msg = format!(
-                    "conflicting implementations of trait `{}`{}:{}",
-                    overlap.trait_desc,
-                    overlap
-                        .self_desc
-                        .clone()
-                        .map_or(String::new(), |ty| { format!(" for type `{}`", ty) }),
-                    match used_to_be_allowed {
-                        Some(FutureCompatOverlapErrorKind::Issue33140) => " (E0119)",
-                        _ => "",
-                    }
-                );
-                let impl_span =
-                    tcx.sess.source_map().def_span(tcx.span_of_impl(impl_def_id).unwrap());
-                let mut err = match used_to_be_allowed {
-                    Some(FutureCompatOverlapErrorKind::Issue43355) | None => {
-                        struct_span_err!(tcx.sess, impl_span, E0119, "{}", msg)
-                    }
-                    Some(kind) => {
-                        let lint = match kind {
-                            FutureCompatOverlapErrorKind::Issue43355 => {
-                                unreachable!("converted to hard error above")
-                            }
-                            FutureCompatOverlapErrorKind::Issue33140 => {
-                                ORDER_DEPENDENT_TRAIT_OBJECTS
-                            }
-                        };
-                        tcx.struct_span_lint_hir(
-                            lint,
-                            tcx.hir().as_local_hir_id(impl_def_id).unwrap(),
-                            impl_span,
-                            &msg,
-                        )
-                    }
-                };
-
-                match tcx.span_of_impl(overlap.with_impl) {
-                    Ok(span) => {
-                        err.span_label(
-                            tcx.sess.source_map().def_span(span),
-                            "first implementation here".to_string(),
-                        );
-                        err.span_label(
-                            impl_span,
-                            format!(
-                                "conflicting implementation{}",
-                                overlap
-                                    .self_desc
-                                    .map_or(String::new(), |ty| format!(" for `{}`", ty))
-                            ),
-                        );
-                    }
-                    Err(cname) => {
-                        let msg = match to_pretty_impl_header(tcx, overlap.with_impl) {
-                            Some(s) => {
-                                format!("conflicting implementation in crate `{}`:\n- {}", cname, s)
-                            }
-                            None => format!("conflicting implementation in crate `{}`", cname),
-                        };
-                        err.note(&msg);
-                    }
-                }
-
-                for cause in &overlap.intercrate_ambiguity_causes {
-                    cause.add_intercrate_ambiguity_hint(&mut err);
-                }
-
-                if overlap.involves_placeholder {
-                    coherence::add_placeholder_note(&mut err);
-                }
-
-                err.emit();
-            }
-        } else {
-            let parent = tcx.impl_parent(impl_def_id).unwrap_or(trait_id);
-            sg.record_impl_from_cstore(tcx, parent, impl_def_id)
-        }
-    }
-
-    tcx.arena.alloc(sg)
-}
-
-/// Recovers the "impl X for Y" signature from `impl_def_id` and returns it as a
-/// string.
-fn to_pretty_impl_header(tcx: TyCtxt<'_>, impl_def_id: DefId) -> Option<String> {
-    use std::fmt::Write;
-
-    let trait_ref = if let Some(tr) = tcx.impl_trait_ref(impl_def_id) {
-        tr
-    } else {
-        return None;
-    };
-
-    let mut w = "impl".to_owned();
-
-    let substs = InternalSubsts::identity_for_item(tcx, impl_def_id);
-
-    // FIXME: Currently only handles ?Sized.
-    //        Needs to support ?Move and ?DynSized when they are implemented.
-    let mut types_without_default_bounds = FxHashSet::default();
-    let sized_trait = tcx.lang_items().sized_trait();
-
-    if !substs.is_noop() {
-        types_without_default_bounds.extend(substs.types());
-        w.push('<');
-        w.push_str(
-            &substs
-                .iter()
-                .map(|k| k.to_string())
-                .filter(|k| k != "'_")
-                .collect::<Vec<_>>()
-                .join(", "),
-        );
-        w.push('>');
-    }
-
-    write!(w, " {} for {}", trait_ref.print_only_trait_path(), tcx.type_of(impl_def_id)).unwrap();
-
-    // The predicates will contain default bounds like `T: Sized`. We need to
-    // remove these bounds, and add `T: ?Sized` to any untouched type parameters.
-    let predicates = tcx.predicates_of(impl_def_id).predicates;
-    let mut pretty_predicates =
-        Vec::with_capacity(predicates.len() + types_without_default_bounds.len());
-
-    for (p, _) in predicates {
-        if let Some(poly_trait_ref) = p.to_opt_poly_trait_ref() {
-            if Some(poly_trait_ref.def_id()) == sized_trait {
-                types_without_default_bounds.remove(poly_trait_ref.self_ty());
-                continue;
-            }
-        }
-        pretty_predicates.push(p.to_string());
-    }
-
-    pretty_predicates
-        .extend(types_without_default_bounds.iter().map(|ty| format!("{}: ?Sized", ty)));
-
-    if !pretty_predicates.is_empty() {
-        write!(w, "\n  where {}", pretty_predicates.join(", ")).unwrap();
-    }
-
-    w.push(';');
-    Some(w)
-}
diff --git a/src/librustc/traits/specialize/specialization_graph.rs b/src/librustc/traits/specialize/specialization_graph.rs
deleted file mode 100644
index 9509b6220e..0000000000
--- a/src/librustc/traits/specialize/specialization_graph.rs
+++ /dev/null
@@ -1,527 +0,0 @@
-use super::OverlapError;
-
-use crate::ich::{self, StableHashingContext};
-use crate::traits;
-use crate::ty::fast_reject::{self, SimplifiedType};
-use crate::ty::{self, TyCtxt, TypeFoldable};
-use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
-use rustc_hir::def_id::{DefId, DefIdMap};
-use syntax::ast::Ident;
-
-/// A per-trait graph of impls in specialization order. At the moment, this
-/// graph forms a tree rooted with the trait itself, with all other nodes
-/// representing impls, and parent-child relationships representing
-/// specializations.
-///
-/// The graph provides two key services:
-///
-/// - Construction. This implicitly checks for overlapping impls (i.e., impls
-///   that overlap but where neither specializes the other -- an artifact of the
-///   simple "chain" rule.
-///
-/// - Parent extraction. In particular, the graph can give you the *immediate*
-///   parents of a given specializing impl, which is needed for extracting
-///   default items amongst other things. In the simple "chain" rule, every impl
-///   has at most one parent.
-#[derive(RustcEncodable, RustcDecodable, HashStable)]
-pub struct Graph {
-    // All impls have a parent; the "root" impls have as their parent the `def_id`
-    // of the trait.
-    parent: DefIdMap<DefId>,
-
-    // The "root" impls are found by looking up the trait's def_id.
-    children: DefIdMap<Children>,
-}
-
-/// Children of a given impl, grouped into blanket/non-blanket varieties as is
-/// done in `TraitDef`.
-#[derive(Default, RustcEncodable, RustcDecodable)]
-struct Children {
-    // Impls of a trait (or specializations of a given impl). To allow for
-    // quicker lookup, the impls are indexed by a simplified version of their
-    // `Self` type: impls with a simplifiable `Self` are stored in
-    // `nonblanket_impls` keyed by it, while all other impls are stored in
-    // `blanket_impls`.
-    //
-    // A similar division is used within `TraitDef`, but the lists there collect
-    // together *all* the impls for a trait, and are populated prior to building
-    // the specialization graph.
-    /// Impls of the trait.
-    nonblanket_impls: FxHashMap<fast_reject::SimplifiedType, Vec<DefId>>,
-
-    /// Blanket impls associated with the trait.
-    blanket_impls: Vec<DefId>,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FutureCompatOverlapErrorKind {
-    Issue43355,
-    Issue33140,
-}
-
-#[derive(Debug)]
-pub struct FutureCompatOverlapError {
-    pub error: OverlapError,
-    pub kind: FutureCompatOverlapErrorKind,
-}
-
-/// The result of attempting to insert an impl into a group of children.
-enum Inserted {
-    /// The impl was inserted as a new child in this group of children.
-    BecameNewSibling(Option<FutureCompatOverlapError>),
-
-    /// The impl should replace existing impls [X1, ..], because the impl specializes X1, X2, etc.
-    ReplaceChildren(Vec<DefId>),
-
-    /// The impl is a specialization of an existing child.
-    ShouldRecurseOn(DefId),
-}
-
-impl<'tcx> Children {
-    /// Insert an impl into this set of children without comparing to any existing impls.
-    fn insert_blindly(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId) {
-        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
-        if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) {
-            debug!("insert_blindly: impl_def_id={:?} st={:?}", impl_def_id, st);
-            self.nonblanket_impls.entry(st).or_default().push(impl_def_id)
-        } else {
-            debug!("insert_blindly: impl_def_id={:?} st=None", impl_def_id);
-            self.blanket_impls.push(impl_def_id)
-        }
-    }
-
-    /// Removes an impl from this set of children. Used when replacing
-    /// an impl with a parent. The impl must be present in the list of
-    /// children already.
-    fn remove_existing(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId) {
-        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
-        let vec: &mut Vec<DefId>;
-        if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) {
-            debug!("remove_existing: impl_def_id={:?} st={:?}", impl_def_id, st);
-            vec = self.nonblanket_impls.get_mut(&st).unwrap();
-        } else {
-            debug!("remove_existing: impl_def_id={:?} st=None", impl_def_id);
-            vec = &mut self.blanket_impls;
-        }
-
-        let index = vec.iter().position(|d| *d == impl_def_id).unwrap();
-        vec.remove(index);
-    }
-
-    /// Attempt to insert an impl into this set of children, while comparing for
-    /// specialization relationships.
-    fn insert(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        impl_def_id: DefId,
-        simplified_self: Option<SimplifiedType>,
-    ) -> Result<Inserted, OverlapError> {
-        let mut last_lint = None;
-        let mut replace_children = Vec::new();
-
-        debug!("insert(impl_def_id={:?}, simplified_self={:?})", impl_def_id, simplified_self,);
-
-        let possible_siblings = match simplified_self {
-            Some(st) => PotentialSiblings::Filtered(self.filtered(st)),
-            None => PotentialSiblings::Unfiltered(self.iter()),
-        };
-
-        for possible_sibling in possible_siblings {
-            debug!(
-                "insert: impl_def_id={:?}, simplified_self={:?}, possible_sibling={:?}",
-                impl_def_id, simplified_self, possible_sibling,
-            );
-
-            let overlap_error = |overlap: traits::coherence::OverlapResult<'_>| {
-                // Found overlap, but no specialization; error out.
-                let trait_ref = overlap.impl_header.trait_ref.unwrap();
-                let self_ty = trait_ref.self_ty();
-                OverlapError {
-                    with_impl: possible_sibling,
-                    trait_desc: trait_ref.print_only_trait_path().to_string(),
-                    // Only report the `Self` type if it has at least
-                    // some outer concrete shell; otherwise, it's
-                    // not adding much information.
-                    self_desc: if self_ty.has_concrete_skeleton() {
-                        Some(self_ty.to_string())
-                    } else {
-                        None
-                    },
-                    intercrate_ambiguity_causes: overlap.intercrate_ambiguity_causes,
-                    involves_placeholder: overlap.involves_placeholder,
-                }
-            };
-
-            let (le, ge) = traits::overlapping_impls(
-                tcx,
-                possible_sibling,
-                impl_def_id,
-                traits::IntercrateMode::Issue43355,
-                |overlap| {
-                    if let Some(overlap_kind) =
-                        tcx.impls_are_allowed_to_overlap(impl_def_id, possible_sibling)
-                    {
-                        match overlap_kind {
-                            ty::ImplOverlapKind::Permitted { marker: _ } => {}
-                            ty::ImplOverlapKind::Issue33140 => {
-                                last_lint = Some(FutureCompatOverlapError {
-                                    error: overlap_error(overlap),
-                                    kind: FutureCompatOverlapErrorKind::Issue33140,
-                                });
-                            }
-                        }
-
-                        return Ok((false, false));
-                    }
-
-                    let le = tcx.specializes((impl_def_id, possible_sibling));
-                    let ge = tcx.specializes((possible_sibling, impl_def_id));
-
-                    if le == ge { Err(overlap_error(overlap)) } else { Ok((le, ge)) }
-                },
-                || Ok((false, false)),
-            )?;
-
-            if le && !ge {
-                debug!(
-                    "descending as child of TraitRef {:?}",
-                    tcx.impl_trait_ref(possible_sibling).unwrap()
-                );
-
-                // The impl specializes `possible_sibling`.
-                return Ok(Inserted::ShouldRecurseOn(possible_sibling));
-            } else if ge && !le {
-                debug!(
-                    "placing as parent of TraitRef {:?}",
-                    tcx.impl_trait_ref(possible_sibling).unwrap()
-                );
-
-                replace_children.push(possible_sibling);
-            } else {
-                if let None = tcx.impls_are_allowed_to_overlap(impl_def_id, possible_sibling) {
-                    // do future-compat checks for overlap. Have issue #33140
-                    // errors overwrite issue #43355 errors when both are present.
-
-                    traits::overlapping_impls(
-                        tcx,
-                        possible_sibling,
-                        impl_def_id,
-                        traits::IntercrateMode::Fixed,
-                        |overlap| {
-                            last_lint = Some(FutureCompatOverlapError {
-                                error: overlap_error(overlap),
-                                kind: FutureCompatOverlapErrorKind::Issue43355,
-                            });
-                        },
-                        || (),
-                    );
-                }
-
-                // no overlap (error bailed already via ?)
-            }
-        }
-
-        if !replace_children.is_empty() {
-            return Ok(Inserted::ReplaceChildren(replace_children));
-        }
-
-        // No overlap with any potential siblings, so add as a new sibling.
-        debug!("placing as new sibling");
-        self.insert_blindly(tcx, impl_def_id);
-        Ok(Inserted::BecameNewSibling(last_lint))
-    }
-
-    fn iter(&mut self) -> impl Iterator<Item = DefId> + '_ {
-        let nonblanket = self.nonblanket_impls.iter_mut().flat_map(|(_, v)| v.iter());
-        self.blanket_impls.iter().chain(nonblanket).cloned()
-    }
-
-    fn filtered(&mut self, st: SimplifiedType) -> impl Iterator<Item = DefId> + '_ {
-        let nonblanket = self.nonblanket_impls.entry(st).or_default().iter();
-        self.blanket_impls.iter().chain(nonblanket).cloned()
-    }
-}
-
-// A custom iterator used by Children::insert
-enum PotentialSiblings<I, J>
-where
-    I: Iterator<Item = DefId>,
-    J: Iterator<Item = DefId>,
-{
-    Unfiltered(I),
-    Filtered(J),
-}
-
-impl<I, J> Iterator for PotentialSiblings<I, J>
-where
-    I: Iterator<Item = DefId>,
-    J: Iterator<Item = DefId>,
-{
-    type Item = DefId;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        match *self {
-            PotentialSiblings::Unfiltered(ref mut iter) => iter.next(),
-            PotentialSiblings::Filtered(ref mut iter) => iter.next(),
-        }
-    }
-}
-
-impl<'tcx> Graph {
-    pub fn new() -> Graph {
-        Graph { parent: Default::default(), children: Default::default() }
-    }
-
-    /// Insert a local impl into the specialization graph. If an existing impl
-    /// conflicts with it (has overlap, but neither specializes the other),
-    /// information about the area of overlap is returned in the `Err`.
-    pub fn insert(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        impl_def_id: DefId,
-    ) -> Result<Option<FutureCompatOverlapError>, OverlapError> {
-        assert!(impl_def_id.is_local());
-
-        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
-        let trait_def_id = trait_ref.def_id;
-
-        debug!(
-            "insert({:?}): inserting TraitRef {:?} into specialization graph",
-            impl_def_id, trait_ref
-        );
-
-        // If the reference itself contains an earlier error (e.g., due to a
-        // resolution failure), then we just insert the impl at the top level of
-        // the graph and claim that there's no overlap (in order to suppress
-        // bogus errors).
-        if trait_ref.references_error() {
-            debug!(
-                "insert: inserting dummy node for erroneous TraitRef {:?}, \
-                    impl_def_id={:?}, trait_def_id={:?}",
-                trait_ref, impl_def_id, trait_def_id
-            );
-
-            self.parent.insert(impl_def_id, trait_def_id);
-            self.children.entry(trait_def_id).or_default().insert_blindly(tcx, impl_def_id);
-            return Ok(None);
-        }
-
-        let mut parent = trait_def_id;
-        let mut last_lint = None;
-        let simplified = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false);
-
-        // Descend the specialization tree, where `parent` is the current parent node.
-        loop {
-            use self::Inserted::*;
-
-            let insert_result =
-                self.children.entry(parent).or_default().insert(tcx, impl_def_id, simplified)?;
-
-            match insert_result {
-                BecameNewSibling(opt_lint) => {
-                    last_lint = opt_lint;
-                    break;
-                }
-                ReplaceChildren(grand_children_to_be) => {
-                    // We currently have
-                    //
-                    //     P
-                    //     |
-                    //     G
-                    //
-                    // and we are inserting the impl N. We want to make it:
-                    //
-                    //     P
-                    //     |
-                    //     N
-                    //     |
-                    //     G
-
-                    // Adjust P's list of children: remove G and then add N.
-                    {
-                        let siblings = self.children.get_mut(&parent).unwrap();
-                        for &grand_child_to_be in &grand_children_to_be {
-                            siblings.remove_existing(tcx, grand_child_to_be);
-                        }
-                        siblings.insert_blindly(tcx, impl_def_id);
-                    }
-
-                    // Set G's parent to N and N's parent to P.
-                    for &grand_child_to_be in &grand_children_to_be {
-                        self.parent.insert(grand_child_to_be, impl_def_id);
-                    }
-                    self.parent.insert(impl_def_id, parent);
-
-                    // Add G as N's child.
-                    for &grand_child_to_be in &grand_children_to_be {
-                        self.children
-                            .entry(impl_def_id)
-                            .or_default()
-                            .insert_blindly(tcx, grand_child_to_be);
-                    }
-                    break;
-                }
-                ShouldRecurseOn(new_parent) => {
-                    parent = new_parent;
-                }
-            }
-        }
-
-        self.parent.insert(impl_def_id, parent);
-        Ok(last_lint)
-    }
-
-    /// Insert cached metadata mapping from a child impl back to its parent.
-    pub fn record_impl_from_cstore(&mut self, tcx: TyCtxt<'tcx>, parent: DefId, child: DefId) {
-        if self.parent.insert(child, parent).is_some() {
-            bug!(
-                "When recording an impl from the crate store, information about its parent \
-                  was already present."
-            );
-        }
-
-        self.children.entry(parent).or_default().insert_blindly(tcx, child);
-    }
-
-    /// The parent of a given impl, which is the `DefId` of the trait when the
-    /// impl is a "specialization root".
-    pub fn parent(&self, child: DefId) -> DefId {
-        *self.parent.get(&child).unwrap_or_else(|| panic!("Failed to get parent for {:?}", child))
-    }
-}
-
-/// A node in the specialization graph is either an impl or a trait
-/// definition; either can serve as a source of item definitions.
-/// There is always exactly one trait definition node: the root.
-#[derive(Debug, Copy, Clone)]
-pub enum Node {
-    Impl(DefId),
-    Trait(DefId),
-}
-
-impl<'tcx> Node {
-    pub fn is_from_trait(&self) -> bool {
-        match *self {
-            Node::Trait(..) => true,
-            _ => false,
-        }
-    }
-
-    /// Iterate over the items defined directly by the given (impl or trait) node.
-    pub fn items(&self, tcx: TyCtxt<'tcx>) -> ty::AssocItemsIterator<'tcx> {
-        tcx.associated_items(self.def_id())
-    }
-
-    /// Finds an associated item defined in this node.
-    ///
-    /// If this returns `None`, the item can potentially still be found in
-    /// parents of this node.
-    pub fn item(
-        &self,
-        tcx: TyCtxt<'tcx>,
-        trait_item_name: Ident,
-        trait_item_kind: ty::AssocKind,
-        trait_def_id: DefId,
-    ) -> Option<ty::AssocItem> {
-        use crate::ty::AssocKind::*;
-
-        tcx.associated_items(self.def_id()).find(move |impl_item| {
-            match (trait_item_kind, impl_item.kind) {
-                | (Const, Const)
-                | (Method, Method)
-                | (Type, Type)
-                | (Type, OpaqueTy)  // assoc. types can be made opaque in impls
-                => tcx.hygienic_eq(impl_item.ident, trait_item_name, trait_def_id),
-
-                | (Const, _)
-                | (Method, _)
-                | (Type, _)
-                | (OpaqueTy, _)
-                => false,
-            }
-        })
-    }
-
-    pub fn def_id(&self) -> DefId {
-        match *self {
-            Node::Impl(did) => did,
-            Node::Trait(did) => did,
-        }
-    }
-}
-
-#[derive(Copy, Clone)]
-pub struct Ancestors<'tcx> {
-    trait_def_id: DefId,
-    specialization_graph: &'tcx Graph,
-    current_source: Option<Node>,
-}
-
-impl Iterator for Ancestors<'_> {
-    type Item = Node;
-    fn next(&mut self) -> Option<Node> {
-        let cur = self.current_source.take();
-        if let Some(Node::Impl(cur_impl)) = cur {
-            let parent = self.specialization_graph.parent(cur_impl);
-
-            self.current_source = if parent == self.trait_def_id {
-                Some(Node::Trait(parent))
-            } else {
-                Some(Node::Impl(parent))
-            };
-        }
-        cur
-    }
-}
-
-pub struct NodeItem<T> {
-    pub node: Node,
-    pub item: T,
-}
-
-impl<T> NodeItem<T> {
-    pub fn map<U, F: FnOnce(T) -> U>(self, f: F) -> NodeItem<U> {
-        NodeItem { node: self.node, item: f(self.item) }
-    }
-}
-
-impl<'tcx> Ancestors<'tcx> {
-    /// Finds the bottom-most (ie. most specialized) definition of an associated
-    /// item.
-    pub fn leaf_def(
-        mut self,
-        tcx: TyCtxt<'tcx>,
-        trait_item_name: Ident,
-        trait_item_kind: ty::AssocKind,
-    ) -> Option<NodeItem<ty::AssocItem>> {
-        let trait_def_id = self.trait_def_id;
-        self.find_map(|node| {
-            node.item(tcx, trait_item_name, trait_item_kind, trait_def_id)
-                .map(|item| NodeItem { node, item })
-        })
-    }
-}
-
-/// Walk up the specialization ancestors of a given impl, starting with that
-/// impl itself.
-pub fn ancestors(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    start_from_impl: DefId,
-) -> Ancestors<'tcx> {
-    let specialization_graph = tcx.specialization_graph_of(trait_def_id);
-    Ancestors {
-        trait_def_id,
-        specialization_graph,
-        current_source: Some(Node::Impl(start_from_impl)),
-    }
-}
-
-impl<'a> HashStable<StableHashingContext<'a>> for Children {
-    fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
-        let Children { ref nonblanket_impls, ref blanket_impls } = *self;
-
-        ich::hash_stable_trait_impls(hcx, hasher, blanket_impls, nonblanket_impls);
-    }
-}
diff --git a/src/librustc/traits/structural_impls.rs b/src/librustc/traits/structural_impls.rs
index 58204a460d..a5efea9e5f 100644
--- a/src/librustc/traits/structural_impls.rs
+++ b/src/librustc/traits/structural_impls.rs
@@ -1,8 +1,6 @@
 use crate::traits;
-use crate::traits::project::Normalized;
 use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
 use crate::ty::{self, Lift, Ty, TyCtxt};
-use chalk_engine;
 use rustc_span::symbol::Symbol;
 use smallvec::SmallVec;
 
@@ -12,26 +10,6 @@ use std::rc::Rc;
 
 // Structural impls for the structs in `traits`.
 
-impl<'tcx, T: fmt::Debug> fmt::Debug for Normalized<'tcx, T> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Normalized({:?}, {:?})", self.value, self.obligations)
-    }
-}
-
-impl<'tcx, O: fmt::Debug> fmt::Debug for traits::Obligation<'tcx, O> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if ty::tls::with(|tcx| tcx.sess.verbose()) {
-            write!(
-                f,
-                "Obligation(predicate={:?}, cause={:?}, param_env={:?}, depth={})",
-                self.predicate, self.cause, self.param_env, self.recursion_depth
-            )
-        } else {
-            write!(f, "Obligation(predicate={:?}, depth={})", self.predicate, self.recursion_depth)
-        }
-    }
-}
-
 impl<'tcx, N: fmt::Debug> fmt::Debug for traits::Vtable<'tcx, N> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
@@ -128,31 +106,6 @@ impl<'tcx, N: fmt::Debug> fmt::Debug for traits::VtableTraitAliasData<'tcx, N> {
     }
 }
 
-impl<'tcx> fmt::Debug for traits::FulfillmentError<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "FulfillmentError({:?},{:?})", self.obligation, self.code)
-    }
-}
-
-impl<'tcx> fmt::Debug for traits::FulfillmentErrorCode<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match *self {
-            super::CodeSelectionError(ref e) => write!(f, "{:?}", e),
-            super::CodeProjectionError(ref e) => write!(f, "{:?}", e),
-            super::CodeSubtypeError(ref a, ref b) => {
-                write!(f, "CodeSubtypeError({:?}, {:?})", a, b)
-            }
-            super::CodeAmbiguity => write!(f, "Ambiguity"),
-        }
-    }
-}
-
-impl<'tcx> fmt::Debug for traits::MismatchedProjectionTypes<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "MismatchedProjectionTypes({:?})", self.err)
-    }
-}
-
 impl<'tcx> fmt::Display for traits::WhereClause<'tcx> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         use crate::traits::WhereClause::*;
@@ -281,7 +234,7 @@ impl BoundNamesCollector {
             start = false;
             write!(fmt, "{}", r)?;
         }
-        for (_, t) in &self.types {
+        for t in self.types.values() {
             if !start {
                 write!(fmt, ", ")?;
             }
@@ -462,9 +415,9 @@ impl<'a, 'tcx> Lift<'tcx> for traits::ObligationCauseCode<'a> {
             super::ReferenceOutlivesReferent(ty) => {
                 tcx.lift(&ty).map(super::ReferenceOutlivesReferent)
             }
-            super::ObjectTypeBound(ty, r) => tcx
-                .lift(&ty)
-                .and_then(|ty| tcx.lift(&r).and_then(|r| Some(super::ObjectTypeBound(ty, r)))),
+            super::ObjectTypeBound(ty, r) => {
+                tcx.lift(&ty).and_then(|ty| tcx.lift(&r).map(|r| super::ObjectTypeBound(ty, r)))
+            }
             super::ObjectCastObligation(ty) => tcx.lift(&ty).map(super::ObjectCastObligation),
             super::Coercion { source, target } => {
                 Some(super::Coercion { source: tcx.lift(&source)?, target: tcx.lift(&target)? })
@@ -579,9 +532,9 @@ impl<'a, 'tcx> Lift<'tcx> for traits::Vtable<'a, ()> {
                 nested,
             }) => tcx.lift(&substs).map(|substs| {
                 traits::VtableGenerator(traits::VtableGeneratorData {
-                    generator_def_id: generator_def_id,
-                    substs: substs,
-                    nested: nested,
+                    generator_def_id,
+                    substs,
+                    nested,
                 })
             }),
             traits::VtableClosure(traits::VtableClosureData { closure_def_id, substs, nested }) => {
@@ -642,60 +595,9 @@ impl<'a, 'tcx, G: Lift<'tcx>> Lift<'tcx> for traits::InEnvironment<'a, G> {
     }
 }
 
-impl<'tcx, C> Lift<'tcx> for chalk_engine::ExClause<C>
-where
-    C: chalk_engine::context::Context + Clone,
-    C: traits::ChalkContextLift<'tcx>,
-{
-    type Lifted = C::LiftedExClause;
-
-    fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted> {
-        <C as traits::ChalkContextLift>::lift_ex_clause_to_tcx(self, tcx)
-    }
-}
-
-impl<'tcx, C> Lift<'tcx> for chalk_engine::DelayedLiteral<C>
-where
-    C: chalk_engine::context::Context + Clone,
-    C: traits::ChalkContextLift<'tcx>,
-{
-    type Lifted = C::LiftedDelayedLiteral;
-
-    fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted> {
-        <C as traits::ChalkContextLift>::lift_delayed_literal_to_tcx(self, tcx)
-    }
-}
-
-impl<'tcx, C> Lift<'tcx> for chalk_engine::Literal<C>
-where
-    C: chalk_engine::context::Context + Clone,
-    C: traits::ChalkContextLift<'tcx>,
-{
-    type Lifted = C::LiftedLiteral;
-
-    fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted> {
-        <C as traits::ChalkContextLift>::lift_literal_to_tcx(self, tcx)
-    }
-}
-
 ///////////////////////////////////////////////////////////////////////////
 // TypeFoldable implementations.
 
-impl<'tcx, O: TypeFoldable<'tcx>> TypeFoldable<'tcx> for traits::Obligation<'tcx, O> {
-    fn super_fold_with<F: TypeFolder<'tcx>>(&self, folder: &mut F) -> Self {
-        traits::Obligation {
-            cause: self.cause.clone(),
-            recursion_depth: self.recursion_depth,
-            predicate: self.predicate.fold_with(folder),
-            param_env: self.param_env.fold_with(folder),
-        }
-    }
-
-    fn super_visit_with<V: TypeVisitor<'tcx>>(&self, visitor: &mut V) -> bool {
-        self.predicate.visit_with(visitor)
-    }
-}
-
 CloneTypeFoldableAndLiftImpls! {
     traits::QuantifierKind,
 }
@@ -736,39 +638,3 @@ impl<'tcx> TypeFoldable<'tcx> for traits::Clauses<'tcx> {
         self.iter().any(|t| t.visit_with(visitor))
     }
 }
-
-impl<'tcx, C> TypeFoldable<'tcx> for chalk_engine::ExClause<C>
-where
-    C: traits::ExClauseFold<'tcx>,
-    C::Substitution: Clone,
-    C::RegionConstraint: Clone,
-{
-    fn super_fold_with<F: TypeFolder<'tcx>>(&self, folder: &mut F) -> Self {
-        <C as traits::ExClauseFold>::fold_ex_clause_with(self, folder)
-    }
-
-    fn super_visit_with<V: TypeVisitor<'tcx>>(&self, visitor: &mut V) -> bool {
-        <C as traits::ExClauseFold>::visit_ex_clause_with(self, visitor)
-    }
-}
-
-EnumTypeFoldableImpl! {
-    impl<'tcx, C> TypeFoldable<'tcx> for chalk_engine::DelayedLiteral<C> {
-        (chalk_engine::DelayedLiteral::CannotProve)(a),
-        (chalk_engine::DelayedLiteral::Negative)(a),
-        (chalk_engine::DelayedLiteral::Positive)(a, b),
-    } where
-        C: chalk_engine::context::Context<CanonicalConstrainedSubst: TypeFoldable<'tcx>> + Clone,
-}
-
-EnumTypeFoldableImpl! {
-    impl<'tcx, C> TypeFoldable<'tcx> for chalk_engine::Literal<C> {
-        (chalk_engine::Literal::Negative)(a),
-        (chalk_engine::Literal::Positive)(a),
-    } where
-        C: chalk_engine::context::Context<GoalInEnvironment: Clone + TypeFoldable<'tcx>> + Clone,
-}
-
-CloneTypeFoldableAndLiftImpls! {
-    chalk_engine::TableIndex,
-}
diff --git a/src/librustc/traits/util.rs b/src/librustc/traits/util.rs
deleted file mode 100644
index ae1a5e3efa..0000000000
--- a/src/librustc/traits/util.rs
+++ /dev/null
@@ -1,672 +0,0 @@
-use rustc_errors::DiagnosticBuilder;
-use rustc_span::Span;
-use smallvec::SmallVec;
-
-use crate::ty::outlives::Component;
-use crate::ty::subst::{GenericArg, Subst, SubstsRef};
-use crate::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, WithConstness};
-use rustc_data_structures::fx::FxHashSet;
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-
-use super::{Normalized, Obligation, ObligationCause, PredicateObligation, SelectionContext};
-
-fn anonymize_predicate<'tcx>(tcx: TyCtxt<'tcx>, pred: &ty::Predicate<'tcx>) -> ty::Predicate<'tcx> {
-    match *pred {
-        ty::Predicate::Trait(ref data, constness) => {
-            ty::Predicate::Trait(tcx.anonymize_late_bound_regions(data), constness)
-        }
-
-        ty::Predicate::RegionOutlives(ref data) => {
-            ty::Predicate::RegionOutlives(tcx.anonymize_late_bound_regions(data))
-        }
-
-        ty::Predicate::TypeOutlives(ref data) => {
-            ty::Predicate::TypeOutlives(tcx.anonymize_late_bound_regions(data))
-        }
-
-        ty::Predicate::Projection(ref data) => {
-            ty::Predicate::Projection(tcx.anonymize_late_bound_regions(data))
-        }
-
-        ty::Predicate::WellFormed(data) => ty::Predicate::WellFormed(data),
-
-        ty::Predicate::ObjectSafe(data) => ty::Predicate::ObjectSafe(data),
-
-        ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
-            ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind)
-        }
-
-        ty::Predicate::Subtype(ref data) => {
-            ty::Predicate::Subtype(tcx.anonymize_late_bound_regions(data))
-        }
-
-        ty::Predicate::ConstEvaluatable(def_id, substs) => {
-            ty::Predicate::ConstEvaluatable(def_id, substs)
-        }
-    }
-}
-
-struct PredicateSet<'tcx> {
-    tcx: TyCtxt<'tcx>,
-    set: FxHashSet<ty::Predicate<'tcx>>,
-}
-
-impl PredicateSet<'tcx> {
-    fn new(tcx: TyCtxt<'tcx>) -> Self {
-        Self { tcx: tcx, set: Default::default() }
-    }
-
-    fn insert(&mut self, pred: &ty::Predicate<'tcx>) -> bool {
-        // We have to be careful here because we want
-        //
-        //    for<'a> Foo<&'a int>
-        //
-        // and
-        //
-        //    for<'b> Foo<&'b int>
-        //
-        // to be considered equivalent. So normalize all late-bound
-        // regions before we throw things into the underlying set.
-        self.set.insert(anonymize_predicate(self.tcx, pred))
-    }
-}
-
-impl<T: AsRef<ty::Predicate<'tcx>>> Extend<T> for PredicateSet<'tcx> {
-    fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
-        for pred in iter {
-            self.insert(pred.as_ref());
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// `Elaboration` iterator
-///////////////////////////////////////////////////////////////////////////
-
-/// "Elaboration" is the process of identifying all the predicates that
-/// are implied by a source predicate. Currently, this basically means
-/// walking the "supertraits" and other similar assumptions. For example,
-/// if we know that `T: Ord`, the elaborator would deduce that `T: PartialOrd`
-/// holds as well. Similarly, if we have `trait Foo: 'static`, and we know that
-/// `T: Foo`, then we know that `T: 'static`.
-pub struct Elaborator<'tcx> {
-    stack: Vec<ty::Predicate<'tcx>>,
-    visited: PredicateSet<'tcx>,
-}
-
-pub fn elaborate_trait_ref<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_ref: ty::PolyTraitRef<'tcx>,
-) -> Elaborator<'tcx> {
-    elaborate_predicates(tcx, vec![trait_ref.without_const().to_predicate()])
-}
-
-pub fn elaborate_trait_refs<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_refs: impl Iterator<Item = ty::PolyTraitRef<'tcx>>,
-) -> Elaborator<'tcx> {
-    let predicates = trait_refs.map(|trait_ref| trait_ref.without_const().to_predicate()).collect();
-    elaborate_predicates(tcx, predicates)
-}
-
-pub fn elaborate_predicates<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    mut predicates: Vec<ty::Predicate<'tcx>>,
-) -> Elaborator<'tcx> {
-    let mut visited = PredicateSet::new(tcx);
-    predicates.retain(|pred| visited.insert(pred));
-    Elaborator { stack: predicates, visited }
-}
-
-impl Elaborator<'tcx> {
-    pub fn filter_to_traits(self) -> FilterToTraits<Self> {
-        FilterToTraits::new(self)
-    }
-
-    fn elaborate(&mut self, predicate: &ty::Predicate<'tcx>) {
-        let tcx = self.visited.tcx;
-        match *predicate {
-            ty::Predicate::Trait(ref data, _) => {
-                // Get predicates declared on the trait.
-                let predicates = tcx.super_predicates_of(data.def_id());
-
-                let predicates = predicates
-                    .predicates
-                    .iter()
-                    .map(|(pred, _)| pred.subst_supertrait(tcx, &data.to_poly_trait_ref()));
-                debug!("super_predicates: data={:?} predicates={:?}", data, predicates.clone());
-
-                // Only keep those bounds that we haven't already seen.
-                // This is necessary to prevent infinite recursion in some
-                // cases. One common case is when people define
-                // `trait Sized: Sized { }` rather than `trait Sized { }`.
-                let visited = &mut self.visited;
-                let predicates = predicates.filter(|pred| visited.insert(pred));
-
-                self.stack.extend(predicates);
-            }
-            ty::Predicate::WellFormed(..) => {
-                // Currently, we do not elaborate WF predicates,
-                // although we easily could.
-            }
-            ty::Predicate::ObjectSafe(..) => {
-                // Currently, we do not elaborate object-safe
-                // predicates.
-            }
-            ty::Predicate::Subtype(..) => {
-                // Currently, we do not "elaborate" predicates like `X <: Y`,
-                // though conceivably we might.
-            }
-            ty::Predicate::Projection(..) => {
-                // Nothing to elaborate in a projection predicate.
-            }
-            ty::Predicate::ClosureKind(..) => {
-                // Nothing to elaborate when waiting for a closure's kind to be inferred.
-            }
-            ty::Predicate::ConstEvaluatable(..) => {
-                // Currently, we do not elaborate const-evaluatable
-                // predicates.
-            }
-            ty::Predicate::RegionOutlives(..) => {
-                // Nothing to elaborate from `'a: 'b`.
-            }
-            ty::Predicate::TypeOutlives(ref data) => {
-                // We know that `T: 'a` for some type `T`. We can
-                // often elaborate this. For example, if we know that
-                // `[U]: 'a`, that implies that `U: 'a`. Similarly, if
-                // we know `&'a U: 'b`, then we know that `'a: 'b` and
-                // `U: 'b`.
-                //
-                // We can basically ignore bound regions here. So for
-                // example `for<'c> Foo<'a,'c>: 'b` can be elaborated to
-                // `'a: 'b`.
-
-                // Ignore `for<'a> T: 'a` -- we might in the future
-                // consider this as evidence that `T: 'static`, but
-                // I'm a bit wary of such constructions and so for now
-                // I want to be conservative. --nmatsakis
-                let ty_max = data.skip_binder().0;
-                let r_min = data.skip_binder().1;
-                if r_min.is_late_bound() {
-                    return;
-                }
-
-                let visited = &mut self.visited;
-                let mut components = smallvec![];
-                tcx.push_outlives_components(ty_max, &mut components);
-                self.stack.extend(
-                    components
-                        .into_iter()
-                        .filter_map(|component| match component {
-                            Component::Region(r) => {
-                                if r.is_late_bound() {
-                                    None
-                                } else {
-                                    Some(ty::Predicate::RegionOutlives(ty::Binder::dummy(
-                                        ty::OutlivesPredicate(r, r_min),
-                                    )))
-                                }
-                            }
-
-                            Component::Param(p) => {
-                                let ty = tcx.mk_ty_param(p.index, p.name);
-                                Some(ty::Predicate::TypeOutlives(ty::Binder::dummy(
-                                    ty::OutlivesPredicate(ty, r_min),
-                                )))
-                            }
-
-                            Component::UnresolvedInferenceVariable(_) => None,
-
-                            Component::Projection(_) | Component::EscapingProjection(_) => {
-                                // We can probably do more here. This
-                                // corresponds to a case like `<T as
-                                // Foo<'a>>::U: 'b`.
-                                None
-                            }
-                        })
-                        .filter(|p| visited.insert(p)),
-                );
-            }
-        }
-    }
-}
-
-impl Iterator for Elaborator<'tcx> {
-    type Item = ty::Predicate<'tcx>;
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.stack.len(), None)
-    }
-
-    fn next(&mut self) -> Option<ty::Predicate<'tcx>> {
-        // Extract next item from top-most stack frame, if any.
-        if let Some(pred) = self.stack.pop() {
-            self.elaborate(&pred);
-            Some(pred)
-        } else {
-            None
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Supertrait iterator
-///////////////////////////////////////////////////////////////////////////
-
-pub type Supertraits<'tcx> = FilterToTraits<Elaborator<'tcx>>;
-
-pub fn supertraits<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_ref: ty::PolyTraitRef<'tcx>,
-) -> Supertraits<'tcx> {
-    elaborate_trait_ref(tcx, trait_ref).filter_to_traits()
-}
-
-pub fn transitive_bounds<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    bounds: impl Iterator<Item = ty::PolyTraitRef<'tcx>>,
-) -> Supertraits<'tcx> {
-    elaborate_trait_refs(tcx, bounds).filter_to_traits()
-}
-
-///////////////////////////////////////////////////////////////////////////
-// `TraitAliasExpander` iterator
-///////////////////////////////////////////////////////////////////////////
-
-/// "Trait alias expansion" is the process of expanding a sequence of trait
-/// references into another sequence by transitively following all trait
-/// aliases. e.g. If you have bounds like `Foo + Send`, a trait alias
-/// `trait Foo = Bar + Sync;`, and another trait alias
-/// `trait Bar = Read + Write`, then the bounds would expand to
-/// `Read + Write + Sync + Send`.
-/// Expansion is done via a DFS (depth-first search), and the `visited` field
-/// is used to avoid cycles.
-pub struct TraitAliasExpander<'tcx> {
-    tcx: TyCtxt<'tcx>,
-    stack: Vec<TraitAliasExpansionInfo<'tcx>>,
-}
-
-/// Stores information about the expansion of a trait via a path of zero or more trait aliases.
-#[derive(Debug, Clone)]
-pub struct TraitAliasExpansionInfo<'tcx> {
-    pub path: SmallVec<[(ty::PolyTraitRef<'tcx>, Span); 4]>,
-}
-
-impl<'tcx> TraitAliasExpansionInfo<'tcx> {
-    fn new(trait_ref: ty::PolyTraitRef<'tcx>, span: Span) -> Self {
-        Self { path: smallvec![(trait_ref, span)] }
-    }
-
-    /// Adds diagnostic labels to `diag` for the expansion path of a trait through all intermediate
-    /// trait aliases.
-    pub fn label_with_exp_info(
-        &self,
-        diag: &mut DiagnosticBuilder<'_>,
-        top_label: &str,
-        use_desc: &str,
-    ) {
-        diag.span_label(self.top().1, top_label);
-        if self.path.len() > 1 {
-            for (_, sp) in self.path.iter().rev().skip(1).take(self.path.len() - 2) {
-                diag.span_label(*sp, format!("referenced here ({})", use_desc));
-            }
-        }
-        diag.span_label(
-            self.bottom().1,
-            format!("trait alias used in trait object type ({})", use_desc),
-        );
-    }
-
-    pub fn trait_ref(&self) -> &ty::PolyTraitRef<'tcx> {
-        &self.top().0
-    }
-
-    pub fn top(&self) -> &(ty::PolyTraitRef<'tcx>, Span) {
-        self.path.last().unwrap()
-    }
-
-    pub fn bottom(&self) -> &(ty::PolyTraitRef<'tcx>, Span) {
-        self.path.first().unwrap()
-    }
-
-    fn clone_and_push(&self, trait_ref: ty::PolyTraitRef<'tcx>, span: Span) -> Self {
-        let mut path = self.path.clone();
-        path.push((trait_ref, span));
-
-        Self { path }
-    }
-}
-
-pub fn expand_trait_aliases<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_refs: impl IntoIterator<Item = (ty::PolyTraitRef<'tcx>, Span)>,
-) -> TraitAliasExpander<'tcx> {
-    let items: Vec<_> = trait_refs
-        .into_iter()
-        .map(|(trait_ref, span)| TraitAliasExpansionInfo::new(trait_ref, span))
-        .collect();
-    TraitAliasExpander { tcx, stack: items }
-}
-
-impl<'tcx> TraitAliasExpander<'tcx> {
-    /// If `item` is a trait alias and its predicate has not yet been visited, then expands `item`
-    /// to the definition, pushes the resulting expansion onto `self.stack`, and returns `false`.
-    /// Otherwise, immediately returns `true` if `item` is a regular trait, or `false` if it is a
-    /// trait alias.
-    /// The return value indicates whether `item` should be yielded to the user.
-    fn expand(&mut self, item: &TraitAliasExpansionInfo<'tcx>) -> bool {
-        let tcx = self.tcx;
-        let trait_ref = item.trait_ref();
-        let pred = trait_ref.without_const().to_predicate();
-
-        debug!("expand_trait_aliases: trait_ref={:?}", trait_ref);
-
-        // Don't recurse if this bound is not a trait alias.
-        let is_alias = tcx.is_trait_alias(trait_ref.def_id());
-        if !is_alias {
-            return true;
-        }
-
-        // Don't recurse if this trait alias is already on the stack for the DFS search.
-        let anon_pred = anonymize_predicate(tcx, &pred);
-        if item.path.iter().rev().skip(1).any(|(tr, _)| {
-            anonymize_predicate(tcx, &tr.without_const().to_predicate()) == anon_pred
-        }) {
-            return false;
-        }
-
-        // Get components of trait alias.
-        let predicates = tcx.super_predicates_of(trait_ref.def_id());
-
-        let items = predicates.predicates.iter().rev().filter_map(|(pred, span)| {
-            pred.subst_supertrait(tcx, &trait_ref)
-                .to_opt_poly_trait_ref()
-                .map(|trait_ref| item.clone_and_push(trait_ref, *span))
-        });
-        debug!("expand_trait_aliases: items={:?}", items.clone());
-
-        self.stack.extend(items);
-
-        false
-    }
-}
-
-impl<'tcx> Iterator for TraitAliasExpander<'tcx> {
-    type Item = TraitAliasExpansionInfo<'tcx>;
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.stack.len(), None)
-    }
-
-    fn next(&mut self) -> Option<TraitAliasExpansionInfo<'tcx>> {
-        while let Some(item) = self.stack.pop() {
-            if self.expand(&item) {
-                return Some(item);
-            }
-        }
-        None
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Iterator over def-IDs of supertraits
-///////////////////////////////////////////////////////////////////////////
-
-pub struct SupertraitDefIds<'tcx> {
-    tcx: TyCtxt<'tcx>,
-    stack: Vec<DefId>,
-    visited: FxHashSet<DefId>,
-}
-
-pub fn supertrait_def_ids(tcx: TyCtxt<'_>, trait_def_id: DefId) -> SupertraitDefIds<'_> {
-    SupertraitDefIds {
-        tcx,
-        stack: vec![trait_def_id],
-        visited: Some(trait_def_id).into_iter().collect(),
-    }
-}
-
-impl Iterator for SupertraitDefIds<'tcx> {
-    type Item = DefId;
-
-    fn next(&mut self) -> Option<DefId> {
-        let def_id = self.stack.pop()?;
-        let predicates = self.tcx.super_predicates_of(def_id);
-        let visited = &mut self.visited;
-        self.stack.extend(
-            predicates
-                .predicates
-                .iter()
-                .filter_map(|(pred, _)| pred.to_opt_poly_trait_ref())
-                .map(|trait_ref| trait_ref.def_id())
-                .filter(|&super_def_id| visited.insert(super_def_id)),
-        );
-        Some(def_id)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Other
-///////////////////////////////////////////////////////////////////////////
-
-/// A filter around an iterator of predicates that makes it yield up
-/// just trait references.
-pub struct FilterToTraits<I> {
-    base_iterator: I,
-}
-
-impl<I> FilterToTraits<I> {
-    fn new(base: I) -> FilterToTraits<I> {
-        FilterToTraits { base_iterator: base }
-    }
-}
-
-impl<'tcx, I: Iterator<Item = ty::Predicate<'tcx>>> Iterator for FilterToTraits<I> {
-    type Item = ty::PolyTraitRef<'tcx>;
-
-    fn next(&mut self) -> Option<ty::PolyTraitRef<'tcx>> {
-        while let Some(pred) = self.base_iterator.next() {
-            if let ty::Predicate::Trait(data, _) = pred {
-                return Some(data.to_poly_trait_ref());
-            }
-        }
-        None
-    }
-
-    fn size_hint(&self) -> (usize, Option<usize>) {
-        let (_, upper) = self.base_iterator.size_hint();
-        (0, upper)
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Other
-///////////////////////////////////////////////////////////////////////////
-
-/// Instantiate all bound parameters of the impl with the given substs,
-/// returning the resulting trait ref and all obligations that arise.
-/// The obligations are closed under normalization.
-pub fn impl_trait_ref_and_oblig<'a, 'tcx>(
-    selcx: &mut SelectionContext<'a, 'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    impl_def_id: DefId,
-    impl_substs: SubstsRef<'tcx>,
-) -> (ty::TraitRef<'tcx>, Vec<PredicateObligation<'tcx>>) {
-    let impl_trait_ref = selcx.tcx().impl_trait_ref(impl_def_id).unwrap();
-    let impl_trait_ref = impl_trait_ref.subst(selcx.tcx(), impl_substs);
-    let Normalized { value: impl_trait_ref, obligations: normalization_obligations1 } =
-        super::normalize(selcx, param_env, ObligationCause::dummy(), &impl_trait_ref);
-
-    let predicates = selcx.tcx().predicates_of(impl_def_id);
-    let predicates = predicates.instantiate(selcx.tcx(), impl_substs);
-    let Normalized { value: predicates, obligations: normalization_obligations2 } =
-        super::normalize(selcx, param_env, ObligationCause::dummy(), &predicates);
-    let impl_obligations =
-        predicates_for_generics(ObligationCause::dummy(), 0, param_env, &predicates);
-
-    let impl_obligations: Vec<_> = impl_obligations
-        .into_iter()
-        .chain(normalization_obligations1)
-        .chain(normalization_obligations2)
-        .collect();
-
-    (impl_trait_ref, impl_obligations)
-}
-
-/// See [`super::obligations_for_generics`].
-pub fn predicates_for_generics<'tcx>(
-    cause: ObligationCause<'tcx>,
-    recursion_depth: usize,
-    param_env: ty::ParamEnv<'tcx>,
-    generic_bounds: &ty::InstantiatedPredicates<'tcx>,
-) -> Vec<PredicateObligation<'tcx>> {
-    debug!("predicates_for_generics(generic_bounds={:?})", generic_bounds);
-
-    generic_bounds
-        .predicates
-        .iter()
-        .map(|&predicate| Obligation {
-            cause: cause.clone(),
-            recursion_depth,
-            param_env,
-            predicate,
-        })
-        .collect()
-}
-
-pub fn predicate_for_trait_ref<'tcx>(
-    cause: ObligationCause<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    trait_ref: ty::TraitRef<'tcx>,
-    recursion_depth: usize,
-) -> PredicateObligation<'tcx> {
-    Obligation {
-        cause,
-        param_env,
-        recursion_depth,
-        predicate: trait_ref.without_const().to_predicate(),
-    }
-}
-
-pub fn predicate_for_trait_def(
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    cause: ObligationCause<'tcx>,
-    trait_def_id: DefId,
-    recursion_depth: usize,
-    self_ty: Ty<'tcx>,
-    params: &[GenericArg<'tcx>],
-) -> PredicateObligation<'tcx> {
-    let trait_ref =
-        ty::TraitRef { def_id: trait_def_id, substs: tcx.mk_substs_trait(self_ty, params) };
-    predicate_for_trait_ref(cause, param_env, trait_ref, recursion_depth)
-}
-
-/// Casts a trait reference into a reference to one of its super
-/// traits; returns `None` if `target_trait_def_id` is not a
-/// supertrait.
-pub fn upcast_choices(
-    tcx: TyCtxt<'tcx>,
-    source_trait_ref: ty::PolyTraitRef<'tcx>,
-    target_trait_def_id: DefId,
-) -> Vec<ty::PolyTraitRef<'tcx>> {
-    if source_trait_ref.def_id() == target_trait_def_id {
-        return vec![source_trait_ref]; // Shortcut the most common case.
-    }
-
-    supertraits(tcx, source_trait_ref).filter(|r| r.def_id() == target_trait_def_id).collect()
-}
-
-/// Given a trait `trait_ref`, returns the number of vtable entries
-/// that come from `trait_ref`, excluding its supertraits. Used in
-/// computing the vtable base for an upcast trait of a trait object.
-pub fn count_own_vtable_entries(tcx: TyCtxt<'tcx>, trait_ref: ty::PolyTraitRef<'tcx>) -> usize {
-    let mut entries = 0;
-    // Count number of methods and add them to the total offset.
-    // Skip over associated types and constants.
-    for trait_item in tcx.associated_items(trait_ref.def_id()) {
-        if trait_item.kind == ty::AssocKind::Method {
-            entries += 1;
-        }
-    }
-    entries
-}
-
-/// Given an upcast trait object described by `object`, returns the
-/// index of the method `method_def_id` (which should be part of
-/// `object.upcast_trait_ref`) within the vtable for `object`.
-pub fn get_vtable_index_of_object_method<N>(
-    tcx: TyCtxt<'tcx>,
-    object: &super::VtableObjectData<'tcx, N>,
-    method_def_id: DefId,
-) -> usize {
-    // Count number of methods preceding the one we are selecting and
-    // add them to the total offset.
-    // Skip over associated types and constants.
-    let mut entries = object.vtable_base;
-    for trait_item in tcx.associated_items(object.upcast_trait_ref.def_id()) {
-        if trait_item.def_id == method_def_id {
-            // The item with the ID we were given really ought to be a method.
-            assert_eq!(trait_item.kind, ty::AssocKind::Method);
-            return entries;
-        }
-        if trait_item.kind == ty::AssocKind::Method {
-            entries += 1;
-        }
-    }
-
-    bug!("get_vtable_index_of_object_method: {:?} was not found", method_def_id);
-}
-
-pub fn closure_trait_ref_and_return_type(
-    tcx: TyCtxt<'tcx>,
-    fn_trait_def_id: DefId,
-    self_ty: Ty<'tcx>,
-    sig: ty::PolyFnSig<'tcx>,
-    tuple_arguments: TupleArgumentsFlag,
-) -> ty::Binder<(ty::TraitRef<'tcx>, Ty<'tcx>)> {
-    let arguments_tuple = match tuple_arguments {
-        TupleArgumentsFlag::No => sig.skip_binder().inputs()[0],
-        TupleArgumentsFlag::Yes => tcx.intern_tup(sig.skip_binder().inputs()),
-    };
-    let trait_ref = ty::TraitRef {
-        def_id: fn_trait_def_id,
-        substs: tcx.mk_substs_trait(self_ty, &[arguments_tuple.into()]),
-    };
-    ty::Binder::bind((trait_ref, sig.skip_binder().output()))
-}
-
-pub fn generator_trait_ref_and_outputs(
-    tcx: TyCtxt<'tcx>,
-    fn_trait_def_id: DefId,
-    self_ty: Ty<'tcx>,
-    sig: ty::PolyGenSig<'tcx>,
-) -> ty::Binder<(ty::TraitRef<'tcx>, Ty<'tcx>, Ty<'tcx>)> {
-    let trait_ref =
-        ty::TraitRef { def_id: fn_trait_def_id, substs: tcx.mk_substs_trait(self_ty, &[]) };
-    ty::Binder::bind((trait_ref, sig.skip_binder().yield_ty, sig.skip_binder().return_ty))
-}
-
-pub fn impl_is_default(tcx: TyCtxt<'_>, node_item_def_id: DefId) -> bool {
-    match tcx.hir().as_local_hir_id(node_item_def_id) {
-        Some(hir_id) => {
-            let item = tcx.hir().expect_item(hir_id);
-            if let hir::ItemKind::Impl { defaultness, .. } = item.kind {
-                defaultness.is_default()
-            } else {
-                false
-            }
-        }
-        None => tcx.impl_defaultness(node_item_def_id).is_default(),
-    }
-}
-
-pub fn impl_item_is_final(tcx: TyCtxt<'_>, assoc_item: &ty::AssocItem) -> bool {
-    assoc_item.defaultness.is_final() && !impl_is_default(tcx, assoc_item.container.id())
-}
-
-pub enum TupleArgumentsFlag {
-    Yes,
-    No,
-}
diff --git a/src/librustc/ty/adjustment.rs b/src/librustc/ty/adjustment.rs
index db034d1618..851bffc206 100644
--- a/src/librustc/ty/adjustment.rs
+++ b/src/librustc/ty/adjustment.rs
@@ -122,6 +122,7 @@ impl<'tcx> OverloadedDeref<'tcx> {
         };
         let method_def_id = tcx
             .associated_items(trait_def_id.unwrap())
+            .in_definition_order()
             .find(|m| m.kind == ty::AssocKind::Method)
             .unwrap()
             .def_id;
diff --git a/src/librustc/ty/cast.rs b/src/librustc/ty/cast.rs
index 5ba3f80b82..31c106cb23 100644
--- a/src/librustc/ty/cast.rs
+++ b/src/librustc/ty/cast.rs
@@ -3,8 +3,8 @@
 
 use crate::ty::{self, Ty};
 
+use rustc_ast::ast;
 use rustc_macros::HashStable;
-use syntax::ast;
 
 /// Types that are represented as ints.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
diff --git a/src/librustc/ty/codec.rs b/src/librustc/ty/codec.rs
index df1602b2ac..c305999a64 100644
--- a/src/librustc/ty/codec.rs
+++ b/src/librustc/ty/codec.rs
@@ -301,6 +301,7 @@ where
 macro_rules! __impl_decoder_methods {
     ($($name:ident -> $ty:ty;)*) => {
         $(
+            #[inline]
             fn $name(&mut self) -> Result<$ty, Self::Error> {
                 self.opaque.$name()
             }
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 355df86046..48ef81c1d5 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -2,10 +2,10 @@
 
 use crate::arena::Arena;
 use crate::dep_graph::DepGraph;
-use crate::dep_graph::{self, DepConstructor, DepNode};
+use crate::dep_graph::{self, DepConstructor};
 use crate::hir::exports::Export;
 use crate::hir::map as hir_map;
-use crate::hir::map::DefPathHash;
+use crate::hir::map::{DefPathData, DefPathHash};
 use crate::ich::{NodeIdHashingMode, StableHashingContext};
 use crate::infer::canonical::{Canonical, CanonicalVarInfo, CanonicalVarInfos};
 use crate::lint::{struct_lint_level, LintSource};
@@ -41,32 +41,34 @@ use crate::ty::{ExistentialPredicate, InferTy, ParamTy, PolyFnSig, Predicate, Pr
 use crate::ty::{InferConst, ParamConst};
 use crate::ty::{List, TyKind, TyS};
 use crate::util::common::ErrorReported;
-use rustc_data_structures::sync;
-use rustc_hir as hir;
-use rustc_hir::def::{DefKind, Res};
-use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet, DefIndex, LOCAL_CRATE};
-use rustc_hir::{HirId, Node, TraitCandidate};
-use rustc_hir::{ItemKind, ItemLocalId, ItemLocalMap, ItemLocalSet};
-use rustc_session::config::CrateType;
-use rustc_session::config::{BorrowckMode, OutputFilenames};
-use rustc_session::Session;
-
+use rustc::lint::LintDiagnosticBuilder;
+use rustc_ast::ast;
+use rustc_ast::expand::allocator::AllocatorKind;
+use rustc_ast::node_id::NodeMap;
+use rustc_attr as attr;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::profiling::SelfProfilerRef;
 use rustc_data_structures::sharded::{IntoPointer, ShardedHashMap};
 use rustc_data_structures::stable_hasher::{
     hash_stable_hashmap, HashStable, StableHasher, StableVec,
 };
-use rustc_data_structures::sync::{Lock, Lrc, WorkerLocal};
-use rustc_errors::DiagnosticBuilder;
+use rustc_data_structures::sync::{self, Lock, Lrc, WorkerLocal};
+use rustc_hir as hir;
+use rustc_hir::def::{DefKind, Res};
+use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet, DefIndex, LOCAL_CRATE};
+use rustc_hir::{HirId, Node, TraitCandidate};
+use rustc_hir::{ItemKind, ItemLocalId, ItemLocalMap, ItemLocalSet};
 use rustc_index::vec::{Idx, IndexVec};
 use rustc_macros::HashStable;
+use rustc_session::config::CrateType;
+use rustc_session::config::{BorrowckMode, OutputFilenames};
 use rustc_session::lint::{Level, Lint};
-use rustc_session::node_id::NodeMap;
+use rustc_session::Session;
 use rustc_span::source_map::MultiSpan;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use rustc_target::spec::abi;
+
 use smallvec::SmallVec;
 use std::any::Any;
 use std::borrow::Borrow;
@@ -78,9 +80,6 @@ use std::iter;
 use std::mem;
 use std::ops::{Bound, Deref};
 use std::sync::Arc;
-use syntax::ast;
-use syntax::attr;
-use syntax::expand::allocator::AllocatorKind;
 
 type InternedSet<'tcx, T> = ShardedHashMap<Interned<'tcx, T>, ()>;
 
@@ -174,8 +173,13 @@ pub struct CommonTypes<'tcx> {
 }
 
 pub struct CommonLifetimes<'tcx> {
-    pub re_empty: Region<'tcx>,
+    /// `ReEmpty` in the root universe.
+    pub re_root_empty: Region<'tcx>,
+
+    /// `ReStatic`
     pub re_static: Region<'tcx>,
+
+    /// Erased region, used after type-checking
     pub re_erased: Region<'tcx>,
 }
 
@@ -205,7 +209,7 @@ fn validate_hir_id_for_typeck_tables(
             ty::tls::with(|tcx| {
                 bug!(
                     "node {} with HirId::owner {:?} cannot be placed in \
-                        TypeckTables with local_id_root {:?}",
+                     TypeckTables with local_id_root {:?}",
                     tcx.hir().node_to_string(hir_id),
                     DefId::local(hir_id.owner),
                     local_id_root
@@ -877,7 +881,7 @@ impl<'tcx> CommonLifetimes<'tcx> {
         let mk = |r| interners.region.intern(r, |r| Interned(interners.arena.alloc(r))).0;
 
         CommonLifetimes {
-            re_empty: mk(RegionKind::ReEmpty),
+            re_root_empty: mk(RegionKind::ReEmpty(ty::UniverseIndex::ROOT)),
             re_static: mk(RegionKind::ReStatic),
             re_erased: mk(RegionKind::ReErased),
         }
@@ -967,7 +971,8 @@ pub struct GlobalCtxt<'tcx> {
     /// Export map produced by name resolution.
     export_map: FxHashMap<DefId, Vec<Export<hir::HirId>>>,
 
-    hir_map: hir_map::Map<'tcx>,
+    /// This should usually be accessed with the `tcx.hir()` method.
+    pub(crate) hir_map: hir_map::Map<'tcx>,
 
     /// A map from `DefPathHash` -> `DefId`. Includes `DefId`s from the local crate
     /// as well as all upstream crates. Only populated in incremental mode.
@@ -1020,11 +1025,6 @@ pub struct GlobalCtxt<'tcx> {
 }
 
 impl<'tcx> TyCtxt<'tcx> {
-    #[inline(always)]
-    pub fn hir(self) -> &'tcx hir_map::Map<'tcx> {
-        &self.hir_map
-    }
-
     pub fn alloc_steal_mir(self, mir: BodyAndCache<'tcx>) -> &'tcx Steal<BodyAndCache<'tcx>> {
         self.arena.alloc(Steal::new(mir))
     }
@@ -1161,6 +1161,10 @@ impl<'tcx> TyCtxt<'tcx> {
         for (k, v) in resolutions.trait_map {
             let hir_id = hir.node_to_hir_id(k);
             let map = trait_map.entry(hir_id.owner).or_default();
+            let v = v
+                .into_iter()
+                .map(|tc| tc.map_import_ids(|id| hir.definitions().node_to_hir_id(id)))
+                .collect();
             map.insert(hir_id.local_id, StableVec::new(v));
         }
 
@@ -1329,7 +1333,7 @@ impl<'tcx> TyCtxt<'tcx> {
 
     #[inline(always)]
     pub fn create_stable_hashing_context(self) -> StableHashingContext<'tcx> {
-        let krate = self.gcx.hir_map.forest.untracked_krate();
+        let krate = self.gcx.hir_map.untracked_krate();
 
         StableHashingContext::new(self.sess, krate, self.hir().definitions(), &*self.cstore)
     }
@@ -1343,7 +1347,7 @@ impl<'tcx> TyCtxt<'tcx> {
         // We cannot use the query versions of crates() and crate_hash(), since
         // those would need the DepNodes that we are allocating here.
         for cnum in self.cstore.crates_untracked() {
-            let dep_node = DepNode::new(self, DepConstructor::CrateMetadata(cnum));
+            let dep_node = DepConstructor::CrateMetadata(self, cnum);
             let crate_hash = self.cstore.crate_hash_untracked(cnum);
             self.dep_graph.with_task(
                 dep_node,
@@ -1508,6 +1512,24 @@ impl<'tcx> TyCtxt<'tcx> {
                 .subst(*self, self.mk_substs([self.lifetimes.re_static.into()].iter())),
         )
     }
+
+    /// Returns a displayable description and article for the given `def_id` (e.g. `("a", "struct")`).
+    pub fn article_and_description(&self, def_id: DefId) -> (&'static str, &'static str) {
+        match self.def_key(def_id).disambiguated_data.data {
+            DefPathData::TypeNs(..) | DefPathData::ValueNs(..) | DefPathData::MacroNs(..) => {
+                let kind = self.def_kind(def_id).unwrap();
+                (kind.article(), kind.descr(def_id))
+            }
+            DefPathData::ClosureExpr => match self.generator_kind(def_id) {
+                None => ("a", "closure"),
+                Some(rustc_hir::GeneratorKind::Async(..)) => ("an", "async closure"),
+                Some(rustc_hir::GeneratorKind::Gen) => ("a", "generator"),
+            },
+            DefPathData::LifetimeNs(..) => ("a", "lifetime"),
+            DefPathData::Impl => ("an", "implementation"),
+            _ => bug!("article_and_description called on def_id {:?}", def_id),
+        }
+    }
 }
 
 impl<'tcx> GlobalCtxt<'tcx> {
@@ -1522,7 +1544,7 @@ impl<'tcx> GlobalCtxt<'tcx> {
         ty::tls::with_related_context(tcx, |icx| {
             let new_icx = ty::tls::ImplicitCtxt {
                 tcx,
-                query: icx.query.clone(),
+                query: icx.query,
                 diagnostics: icx.diagnostics,
                 layout_depth: icx.layout_depth,
                 task_deps: icx.task_deps,
@@ -1608,7 +1630,7 @@ pub mod tls {
 
     use crate::dep_graph::TaskDeps;
     use crate::ty::query;
-    use rustc_data_structures::sync::{self, Lock, Lrc};
+    use rustc_data_structures::sync::{self, Lock};
     use rustc_data_structures::thin_vec::ThinVec;
     use rustc_data_structures::OnDrop;
     use rustc_errors::Diagnostic;
@@ -1633,7 +1655,7 @@ pub mod tls {
 
         /// The current query job, if any. This is updated by `JobOwner::start` in
         /// `ty::query::plumbing` when executing a query.
-        pub query: Option<Lrc<query::QueryJob<'tcx>>>,
+        pub query: Option<query::QueryJobId>,
 
         /// Where to store diagnostics for the current query job, if any.
         /// This is updated by `JobOwner::start` in `ty::query::plumbing` when executing a query.
@@ -1684,6 +1706,7 @@ pub mod tls {
 
     /// Gets the pointer to the current `ImplicitCtxt`.
     #[cfg(not(parallel_compiler))]
+    #[inline]
     fn get_tlv() -> usize {
         TLV.with(|tlv| tlv.get())
     }
@@ -1697,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.
@@ -2233,22 +2256,22 @@ impl<'tcx> TyCtxt<'tcx> {
 
     #[inline]
     pub fn mk_mut_ref(self, r: Region<'tcx>, ty: Ty<'tcx>) -> Ty<'tcx> {
-        self.mk_ref(r, TypeAndMut { ty: ty, mutbl: hir::Mutability::Mut })
+        self.mk_ref(r, TypeAndMut { ty, mutbl: hir::Mutability::Mut })
     }
 
     #[inline]
     pub fn mk_imm_ref(self, r: Region<'tcx>, ty: Ty<'tcx>) -> Ty<'tcx> {
-        self.mk_ref(r, TypeAndMut { ty: ty, mutbl: hir::Mutability::Not })
+        self.mk_ref(r, TypeAndMut { ty, mutbl: hir::Mutability::Not })
     }
 
     #[inline]
     pub fn mk_mut_ptr(self, ty: Ty<'tcx>) -> Ty<'tcx> {
-        self.mk_ptr(TypeAndMut { ty: ty, mutbl: hir::Mutability::Mut })
+        self.mk_ptr(TypeAndMut { ty, mutbl: hir::Mutability::Mut })
     }
 
     #[inline]
     pub fn mk_imm_ptr(self, ty: Ty<'tcx>) -> Ty<'tcx> {
-        self.mk_ptr(TypeAndMut { ty: ty, mutbl: hir::Mutability::Not })
+        self.mk_ptr(TypeAndMut { ty, mutbl: hir::Mutability::Not })
     }
 
     #[inline]
@@ -2268,13 +2291,13 @@ impl<'tcx> TyCtxt<'tcx> {
 
     #[inline]
     pub fn intern_tup(self, ts: &[Ty<'tcx>]) -> Ty<'tcx> {
-        let kinds: Vec<_> = ts.into_iter().map(|&t| GenericArg::from(t)).collect();
+        let kinds: Vec<_> = ts.iter().map(|&t| GenericArg::from(t)).collect();
         self.mk_ty(Tuple(self.intern_substs(&kinds)))
     }
 
     pub fn mk_tup<I: InternAs<[Ty<'tcx>], Ty<'tcx>>>(self, iter: I) -> I::Output {
         iter.intern_with(|ts| {
-            let kinds: Vec<_> = ts.into_iter().map(|&t| GenericArg::from(t)).collect();
+            let kinds: Vec<_> = ts.iter().map(|&t| GenericArg::from(t)).collect();
             self.mk_ty(Tuple(self.intern_substs(&kinds)))
         })
     }
@@ -2370,7 +2393,7 @@ impl<'tcx> TyCtxt<'tcx> {
 
     #[inline]
     pub fn mk_ty_param(self, index: u32, name: Symbol) -> Ty<'tcx> {
-        self.mk_ty(Param(ParamTy { index, name: name }))
+        self.mk_ty(Param(ParamTy { index, name }))
     }
 
     #[inline]
@@ -2450,7 +2473,7 @@ impl<'tcx> TyCtxt<'tcx> {
         // FIXME consider asking the input slice to be sorted to avoid
         // re-interning permutations, in which case that would be asserted
         // here.
-        if preds.len() == 0 {
+        if preds.is_empty() {
             // The macro-generated method below asserts we don't intern an empty slice.
             List::empty()
         } else {
@@ -2459,31 +2482,31 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     pub fn intern_type_list(self, ts: &[Ty<'tcx>]) -> &'tcx List<Ty<'tcx>> {
-        if ts.len() == 0 { List::empty() } else { self._intern_type_list(ts) }
+        if ts.is_empty() { List::empty() } else { self._intern_type_list(ts) }
     }
 
     pub fn intern_substs(self, ts: &[GenericArg<'tcx>]) -> &'tcx List<GenericArg<'tcx>> {
-        if ts.len() == 0 { List::empty() } else { self._intern_substs(ts) }
+        if ts.is_empty() { List::empty() } else { self._intern_substs(ts) }
     }
 
     pub fn intern_projs(self, ps: &[ProjectionKind]) -> &'tcx List<ProjectionKind> {
-        if ps.len() == 0 { List::empty() } else { self._intern_projs(ps) }
+        if ps.is_empty() { List::empty() } else { self._intern_projs(ps) }
     }
 
     pub fn intern_place_elems(self, ts: &[PlaceElem<'tcx>]) -> &'tcx List<PlaceElem<'tcx>> {
-        if ts.len() == 0 { List::empty() } else { self._intern_place_elems(ts) }
+        if ts.is_empty() { List::empty() } else { self._intern_place_elems(ts) }
     }
 
     pub fn intern_canonical_var_infos(self, ts: &[CanonicalVarInfo]) -> CanonicalVarInfos<'tcx> {
-        if ts.len() == 0 { List::empty() } else { self._intern_canonical_var_infos(ts) }
+        if ts.is_empty() { List::empty() } else { self._intern_canonical_var_infos(ts) }
     }
 
     pub fn intern_clauses(self, ts: &[Clause<'tcx>]) -> Clauses<'tcx> {
-        if ts.len() == 0 { List::empty() } else { self._intern_clauses(ts) }
+        if ts.is_empty() { List::empty() } else { self._intern_clauses(ts) }
     }
 
     pub fn intern_goals(self, ts: &[Goal<'tcx>]) -> Goals<'tcx> {
-        if ts.len() == 0 { List::empty() } else { self._intern_goals(ts) }
+        if ts.is_empty() { List::empty() } else { self._intern_goals(ts) }
     }
 
     pub fn mk_fn_sig<I>(
@@ -2551,16 +2574,6 @@ impl<'tcx> TyCtxt<'tcx> {
         iter.intern_with(|xs| self.intern_goals(xs))
     }
 
-    pub fn lint_hir(
-        self,
-        lint: &'static Lint,
-        hir_id: HirId,
-        span: impl Into<MultiSpan>,
-        msg: &str,
-    ) {
-        self.struct_span_lint_hir(lint, hir_id, span.into(), msg).emit()
-    }
-
     /// Walks upwards from `id` to find a node which might change lint levels with attributes.
     /// It stops at `bound` and just returns it if reached.
     pub fn maybe_lint_level_root_bounded(self, mut id: HirId, bound: HirId) -> HirId {
@@ -2604,20 +2617,20 @@ impl<'tcx> TyCtxt<'tcx> {
         lint: &'static Lint,
         hir_id: HirId,
         span: impl Into<MultiSpan>,
-        msg: &str,
-    ) -> DiagnosticBuilder<'tcx> {
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    ) {
         let (level, src) = self.lint_level_at_node(lint, hir_id);
-        struct_lint_level(self.sess, lint, level, src, Some(span.into()), msg)
+        struct_lint_level(self.sess, lint, level, src, Some(span.into()), decorate);
     }
 
     pub fn struct_lint_node(
         self,
         lint: &'static Lint,
         id: HirId,
-        msg: &str,
-    ) -> DiagnosticBuilder<'tcx> {
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    ) {
         let (level, src) = self.lint_level_at_node(lint, id);
-        struct_lint_level(self.sess, lint, level, src, None, msg)
+        struct_lint_level(self.sess, lint, level, src, None, decorate);
     }
 
     pub fn in_scope_traits(self, id: HirId) -> Option<&'tcx StableVec<TraitCandidate>> {
@@ -2726,10 +2739,6 @@ pub fn provide(providers: &mut ty::query::Providers<'_>) {
         assert_eq!(id, LOCAL_CRATE);
         tcx.crate_name
     };
-    providers.get_lang_items = |tcx, id| {
-        assert_eq!(id, LOCAL_CRATE);
-        tcx.arena.alloc(middle::lang_items::collect(tcx))
-    };
     providers.maybe_unused_trait_import = |tcx, id| tcx.maybe_unused_trait_imports.contains(&id);
     providers.maybe_unused_extern_crates = |tcx, cnum| {
         assert_eq!(cnum, LOCAL_CRATE);
diff --git a/src/librustc/ty/error.rs b/src/librustc/ty/error.rs
index 217ca0ca3f..d0bc0d5fab 100644
--- a/src/librustc/ty/error.rs
+++ b/src/librustc/ty/error.rs
@@ -1,10 +1,10 @@
 use crate::ty::{self, BoundRegion, Region, Ty, TyCtxt};
+use rustc_ast::ast;
 use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_span::Span;
 use rustc_target::spec::abi;
-use syntax::ast;
 
 use std::borrow::Cow;
 use std::fmt;
@@ -15,6 +15,16 @@ pub struct ExpectedFound<T> {
     pub found: T,
 }
 
+impl<T> ExpectedFound<T> {
+    pub fn new(a_is_expected: bool, a: T, b: T) -> Self {
+        if a_is_expected {
+            ExpectedFound { expected: a, found: b }
+        } else {
+            ExpectedFound { expected: b, found: a }
+        }
+    }
+}
+
 // Data structures used in type unification
 #[derive(Clone, Debug, TypeFoldable)]
 pub enum TypeError<'tcx> {
@@ -331,7 +341,7 @@ impl<'tcx> TyCtxt<'tcx> {
                     db.note("distinct uses of `impl Trait` result in different opaque types");
                     let e_str = values.expected.to_string();
                     let f_str = values.found.to_string();
-                    if &e_str == &f_str && &e_str == "impl std::future::Future" {
+                    if e_str == f_str && &e_str == "impl std::future::Future" {
                         // FIXME: use non-string based check.
                         db.help(
                             "if both `Future`s have the same `Output` type, consider \
@@ -473,8 +483,9 @@ impl Trait for X {
                 if ty.is_closure() || ty.is_generator() {
                     db.note(
                         "closures cannot capture themselves or take themselves as argument;\n\
-                             this error may be the result of a recent compiler bug-fix,\n\
-                             see https://github.com/rust-lang/rust/issues/46062 for more details",
+                         this error may be the result of a recent compiler bug-fix,\n\
+                         see issue #46062 <https://github.com/rust-lang/rust/issues/46062>\n\
+                         for more information",
                     );
                 }
             }
diff --git a/src/librustc/ty/fast_reject.rs b/src/librustc/ty/fast_reject.rs
index 5aa8bd9df2..2a937d6581 100644
--- a/src/librustc/ty/fast_reject.rs
+++ b/src/librustc/ty/fast_reject.rs
@@ -1,11 +1,11 @@
 use crate::ich::StableHashingContext;
 use crate::ty::{self, Ty, TyCtxt};
+use rustc_ast::ast;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir::def_id::DefId;
 use std::fmt::Debug;
 use std::hash::Hash;
 use std::mem;
-use syntax::ast;
 
 use self::SimplifiedTypeGen::*;
 
diff --git a/src/librustc/ty/flags.rs b/src/librustc/ty/flags.rs
index 4a4280ba7d..5243e1fbf5 100644
--- a/src/librustc/ty/flags.rs
+++ b/src/librustc/ty/flags.rs
@@ -80,13 +80,10 @@ impl FlagComputation {
             &ty::Error => self.add_flags(TypeFlags::HAS_TY_ERR),
 
             &ty::Param(_) => {
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
-                self.add_flags(TypeFlags::HAS_PARAMS);
+                self.add_flags(TypeFlags::HAS_TY_PARAM);
             }
 
             &ty::Generator(_, ref substs, _) => {
-                self.add_flags(TypeFlags::HAS_TY_CLOSURE);
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
                 self.add_substs(substs);
             }
 
@@ -97,8 +94,6 @@ impl FlagComputation {
             }
 
             &ty::Closure(_, ref substs) => {
-                self.add_flags(TypeFlags::HAS_TY_CLOSURE);
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
                 self.add_substs(substs);
             }
 
@@ -107,12 +102,10 @@ impl FlagComputation {
             }
 
             &ty::Placeholder(..) => {
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
                 self.add_flags(TypeFlags::HAS_TY_PLACEHOLDER);
             }
 
             &ty::Infer(infer) => {
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES); // it might, right?
                 self.add_flags(TypeFlags::HAS_TY_INFER);
                 match infer {
                     ty::FreshTy(_) | ty::FreshIntTy(_) | ty::FreshFloatTy(_) => {}
@@ -128,17 +121,17 @@ impl FlagComputation {
             }
 
             &ty::Projection(ref data) => {
-                self.add_flags(TypeFlags::HAS_PROJECTION);
+                self.add_flags(TypeFlags::HAS_TY_PROJECTION);
                 self.add_projection_ty(data);
             }
 
             &ty::UnnormalizedProjection(ref data) => {
-                self.add_flags(TypeFlags::HAS_PROJECTION);
+                self.add_flags(TypeFlags::HAS_TY_PROJECTION);
                 self.add_projection_ty(data);
             }
 
             &ty::Opaque(_, substs) => {
-                self.add_flags(TypeFlags::HAS_PROJECTION);
+                self.add_flags(TypeFlags::HAS_TY_OPAQUE);
                 self.add_substs(substs);
             }
 
@@ -221,10 +214,10 @@ impl FlagComputation {
         match c.val {
             ty::ConstKind::Unevaluated(_, substs, _) => {
                 self.add_substs(substs);
-                self.add_flags(TypeFlags::HAS_PROJECTION);
+                self.add_flags(TypeFlags::HAS_CT_PROJECTION);
             }
             ty::ConstKind::Infer(infer) => {
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES | TypeFlags::HAS_CT_INFER);
+                self.add_flags(TypeFlags::HAS_CT_INFER);
                 match infer {
                     InferConst::Fresh(_) => {}
                     InferConst::Var(_) => self.add_flags(TypeFlags::KEEP_IN_LOCAL_TCX),
@@ -232,11 +225,9 @@ impl FlagComputation {
             }
             ty::ConstKind::Bound(debruijn, _) => self.add_binder(debruijn),
             ty::ConstKind::Param(_) => {
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
-                self.add_flags(TypeFlags::HAS_PARAMS);
+                self.add_flags(TypeFlags::HAS_CT_PARAM);
             }
             ty::ConstKind::Placeholder(_) => {
-                self.add_flags(TypeFlags::HAS_FREE_LOCAL_NAMES);
                 self.add_flags(TypeFlags::HAS_CT_PLACEHOLDER);
             }
             ty::ConstKind::Value(_) => {}
diff --git a/src/librustc/ty/fold.rs b/src/librustc/ty/fold.rs
index 0dddca98c6..4adca6c7d9 100644
--- a/src/librustc/ty/fold.rs
+++ b/src/librustc/ty/fold.rs
@@ -32,6 +32,7 @@
 //! looking for, and does not need to visit anything else.
 
 use crate::ty::{self, flags::FlagComputation, Binder, Ty, TyCtxt, TypeFlags};
+use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 
 use rustc_data_structures::fx::FxHashSet;
@@ -77,15 +78,21 @@ pub trait TypeFoldable<'tcx>: fmt::Debug + Clone {
     fn has_projections(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_PROJECTION)
     }
+    fn has_opaque_types(&self) -> bool {
+        self.has_type_flags(TypeFlags::HAS_TY_OPAQUE)
+    }
     fn references_error(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_TY_ERR)
     }
     fn has_param_types(&self) -> bool {
-        self.has_type_flags(TypeFlags::HAS_PARAMS)
+        self.has_type_flags(TypeFlags::HAS_TY_PARAM | TypeFlags::HAS_CT_PARAM)
     }
     fn has_infer_types(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_TY_INFER)
     }
+    fn has_infer_types_or_consts(&self) -> bool {
+        self.has_type_flags(TypeFlags::HAS_TY_INFER | TypeFlags::HAS_CT_INFER)
+    }
     fn has_infer_consts(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_CT_INFER)
     }
@@ -93,9 +100,7 @@ pub trait TypeFoldable<'tcx>: fmt::Debug + Clone {
         self.has_type_flags(TypeFlags::KEEP_IN_LOCAL_TCX)
     }
     fn needs_infer(&self) -> bool {
-        self.has_type_flags(
-            TypeFlags::HAS_TY_INFER | TypeFlags::HAS_RE_INFER | TypeFlags::HAS_CT_INFER,
-        )
+        self.has_type_flags(TypeFlags::NEEDS_INFER)
     }
     fn has_placeholders(&self) -> bool {
         self.has_type_flags(
@@ -110,15 +115,16 @@ pub trait TypeFoldable<'tcx>: fmt::Debug + Clone {
     fn has_re_placeholders(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_RE_PLACEHOLDER)
     }
-    fn has_closure_types(&self) -> bool {
-        self.has_type_flags(TypeFlags::HAS_TY_CLOSURE)
-    }
     /// "Free" regions in this context means that it has any region
     /// that is not (a) erased or (b) late-bound.
     fn has_free_regions(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_FREE_REGIONS)
     }
 
+    fn has_erased_regions(&self) -> bool {
+        self.has_type_flags(TypeFlags::HAS_RE_ERASED)
+    }
+
     /// True if there are any un-erased free regions.
     fn has_erasable_regions(&self) -> bool {
         self.has_type_flags(TypeFlags::HAS_FREE_REGIONS)
@@ -150,7 +156,7 @@ pub trait TypeFoldable<'tcx>: fmt::Debug + Clone {
     }
 }
 
-impl TypeFoldable<'tcx> for syntax::ast::Constness {
+impl TypeFoldable<'tcx> for hir::Constness {
     fn super_fold_with<F: TypeFolder<'tcx>>(&self, _: &mut F) -> Self {
         *self
     }
diff --git a/src/librustc/ty/free_region_map.rs b/src/librustc/ty/free_region_map.rs
index 42f506606e..2ab12a4acb 100644
--- a/src/librustc/ty/free_region_map.rs
+++ b/src/librustc/ty/free_region_map.rs
@@ -23,11 +23,61 @@ impl<'tcx> FreeRegionMap<'tcx> {
     // (with the exception that `'static: 'x` is not notable)
     pub fn relate_regions(&mut self, sub: Region<'tcx>, sup: Region<'tcx>) {
         debug!("relate_regions(sub={:?}, sup={:?})", sub, sup);
-        if is_free_or_static(sub) && is_free(sup) {
+        if self.is_free_or_static(sub) && self.is_free(sup) {
             self.relation.add(sub, sup)
         }
     }
 
+    /// Tests whether `r_a <= r_b`.
+    ///
+    /// Both regions must meet `is_free_or_static`.
+    ///
+    /// Subtle: one tricky case that this code gets correct is as
+    /// follows. If we know that `r_b: 'static`, then this function
+    /// will return true, even though we don't know anything that
+    /// directly relates `r_a` and `r_b`.
+    ///
+    /// Also available through the `FreeRegionRelations` trait below.
+    pub fn sub_free_regions(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        r_a: Region<'tcx>,
+        r_b: Region<'tcx>,
+    ) -> bool {
+        assert!(self.is_free_or_static(r_a) && self.is_free_or_static(r_b));
+        let re_static = tcx.lifetimes.re_static;
+        if self.check_relation(re_static, r_b) {
+            // `'a <= 'static` is always true, and not stored in the
+            // relation explicitly, so check if `'b` is `'static` (or
+            // equivalent to it)
+            true
+        } else {
+            self.check_relation(r_a, r_b)
+        }
+    }
+
+    /// Check whether `r_a <= r_b` is found in the relation.
+    fn check_relation(&self, r_a: Region<'tcx>, r_b: Region<'tcx>) -> bool {
+        r_a == r_b || self.relation.contains(&r_a, &r_b)
+    }
+
+    /// True for free regions other than `'static`.
+    pub fn is_free(&self, r: Region<'_>) -> bool {
+        match *r {
+            ty::ReEarlyBound(_) | ty::ReFree(_) => true,
+            _ => false,
+        }
+    }
+
+    /// True if `r` is a free region or static of the sort that this
+    /// free region map can be used with.
+    pub fn is_free_or_static(&self, r: Region<'_>) -> bool {
+        match *r {
+            ty::ReStatic => true,
+            _ => self.is_free(r),
+        }
+    }
+
     /// Computes the least-upper-bound of two free regions. In some
     /// cases, this is more conservative than necessary, in order to
     /// avoid making arbitrary choices. See
@@ -39,13 +89,13 @@ impl<'tcx> FreeRegionMap<'tcx> {
         r_b: Region<'tcx>,
     ) -> Region<'tcx> {
         debug!("lub_free_regions(r_a={:?}, r_b={:?})", r_a, r_b);
-        assert!(is_free(r_a));
-        assert!(is_free(r_b));
+        assert!(self.is_free(r_a));
+        assert!(self.is_free(r_b));
         let result = if r_a == r_b {
             r_a
         } else {
             match self.relation.postdom_upper_bound(&r_a, &r_b) {
-                None => tcx.mk_region(ty::ReStatic),
+                None => tcx.lifetimes.re_static,
                 Some(r) => *r,
             }
         };
@@ -60,31 +110,18 @@ impl<'tcx> FreeRegionMap<'tcx> {
 pub trait FreeRegionRelations<'tcx> {
     /// Tests whether `r_a <= r_b`. Both must be free regions or
     /// `'static`.
-    fn sub_free_regions(&self, shorter: ty::Region<'tcx>, longer: ty::Region<'tcx>) -> bool;
+    fn sub_free_regions(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        shorter: ty::Region<'tcx>,
+        longer: ty::Region<'tcx>,
+    ) -> bool;
 }
 
 impl<'tcx> FreeRegionRelations<'tcx> for FreeRegionMap<'tcx> {
-    fn sub_free_regions(&self, r_a: Region<'tcx>, r_b: Region<'tcx>) -> bool {
-        assert!(is_free_or_static(r_a) && is_free_or_static(r_b));
-        if let ty::ReStatic = r_b {
-            true // `'a <= 'static` is just always true, and not stored in the relation explicitly
-        } else {
-            r_a == r_b || self.relation.contains(&r_a, &r_b)
-        }
-    }
-}
-
-fn is_free(r: Region<'_>) -> bool {
-    match *r {
-        ty::ReEarlyBound(_) | ty::ReFree(_) => true,
-        _ => false,
-    }
-}
-
-fn is_free_or_static(r: Region<'_>) -> bool {
-    match *r {
-        ty::ReStatic => true,
-        _ => is_free(r),
+    fn sub_free_regions(&self, tcx: TyCtxt<'tcx>, r_a: Region<'tcx>, r_b: Region<'tcx>) -> bool {
+        // invoke the "inherent method"
+        self.sub_free_regions(tcx, r_a, r_b)
     }
 }
 
diff --git a/src/librustc/ty/instance.rs b/src/librustc/ty/instance.rs
index 51a18f8eae..445df76cd3 100644
--- a/src/librustc/ty/instance.rs
+++ b/src/librustc/ty/instance.rs
@@ -1,12 +1,11 @@
 use crate::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use crate::middle::lang_items::DropInPlaceFnLangItem;
-use crate::traits;
 use crate::ty::print::{FmtPrinter, Printer};
 use crate::ty::{self, SubstsRef, Ty, TyCtxt, TypeFoldable};
+use rustc_data_structures::AtomicRef;
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_macros::HashStable;
-use rustc_target::spec::abi::Abi;
 
 use std::fmt;
 
@@ -54,7 +53,10 @@ pub enum InstanceDef<'tcx> {
         call_once: DefId,
     },
 
-    /// `drop_in_place::<T>; None` for empty drop glue.
+    /// `core::ptr::drop_in_place::<T>`.
+    /// The `DefId` is for `core::ptr::drop_in_place`.
+    /// The `Option<Ty<'tcx>>` is either `Some(T)`, or `None` for empty drop
+    /// glue.
     DropGlue(DefId, Option<Ty<'tcx>>),
 
     ///`<T as Clone>::clone` shim.
@@ -113,9 +115,7 @@ impl<'tcx> Instance<'tcx> {
         }
 
         // If this a non-generic instance, it cannot be a shared monomorphization.
-        if self.substs.non_erasable_generics().next().is_none() {
-            return None;
-        }
+        self.substs.non_erasable_generics().next()?;
 
         match self.def {
             InstanceDef::Item(def_id) => tcx
@@ -177,11 +177,25 @@ impl<'tcx> InstanceDef<'tcx> {
         if self.requires_inline(tcx) {
             return true;
         }
-        if let ty::InstanceDef::DropGlue(..) = *self {
-            // Drop glue wants to be instantiated at every codegen
+        if let ty::InstanceDef::DropGlue(.., Some(ty)) = *self {
+            // Drop glue generally wants to be instantiated at every codegen
             // unit, but without an #[inline] hint. We should make this
             // available to normal end-users.
-            return true;
+            if tcx.sess.opts.incremental.is_none() {
+                return true;
+            }
+            // When compiling with incremental, we can generate a *lot* of
+            // codegen units. Including drop glue into all of them has a
+            // considerable compile time cost.
+            //
+            // We include enums without destructors to allow, say, optimizing
+            // drops of `Option::None` before LTO. We also respect the intent of
+            // `#[inline]` on `Drop::drop` implementations.
+            return ty.ty_adt_def().map_or(true, |adt_def| {
+                adt_def.destructor(tcx).map_or(adt_def.is_enum(), |dtor| {
+                    tcx.codegen_fn_attrs(dtor.did).requests_inline()
+                })
+            });
         }
         tcx.codegen_fn_attrs(self.def_id()).requests_inline()
     }
@@ -227,7 +241,7 @@ impl<'tcx> Instance<'tcx> {
             def_id,
             substs
         );
-        Instance { def: InstanceDef::Item(def_id), substs: substs }
+        Instance { def: InstanceDef::Item(def_id), substs }
     }
 
     pub fn mono(tcx: TyCtxt<'tcx>, def_id: DefId) -> Instance<'tcx> {
@@ -263,45 +277,7 @@ impl<'tcx> Instance<'tcx> {
         def_id: DefId,
         substs: SubstsRef<'tcx>,
     ) -> Option<Instance<'tcx>> {
-        debug!("resolve(def_id={:?}, substs={:?})", def_id, substs);
-        let result = if let Some(trait_def_id) = tcx.trait_of_item(def_id) {
-            debug!(" => associated item, attempting to find impl in param_env {:#?}", param_env);
-            let item = tcx.associated_item(def_id);
-            resolve_associated_item(tcx, &item, param_env, trait_def_id, substs)
-        } else {
-            let ty = tcx.type_of(def_id);
-            let item_type = tcx.subst_and_normalize_erasing_regions(substs, param_env, &ty);
-
-            let def = match item_type.kind {
-                ty::FnDef(..)
-                    if {
-                        let f = item_type.fn_sig(tcx);
-                        f.abi() == Abi::RustIntrinsic || f.abi() == Abi::PlatformIntrinsic
-                    } =>
-                {
-                    debug!(" => intrinsic");
-                    ty::InstanceDef::Intrinsic(def_id)
-                }
-                _ => {
-                    if Some(def_id) == tcx.lang_items().drop_in_place_fn() {
-                        let ty = substs.type_at(0);
-                        if ty.needs_drop(tcx, ty::ParamEnv::reveal_all()) {
-                            debug!(" => nontrivial drop glue");
-                            ty::InstanceDef::DropGlue(def_id, Some(ty))
-                        } else {
-                            debug!(" => trivial drop glue");
-                            ty::InstanceDef::DropGlue(def_id, None)
-                        }
-                    } else {
-                        debug!(" => free item");
-                        ty::InstanceDef::Item(def_id)
-                    }
-                }
-            };
-            Some(Instance { def: def, substs: substs })
-        };
-        debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result);
-        result
+        (*RESOLVE_INSTANCE)(tcx, param_env, def_id, substs)
     }
 
     pub fn resolve_for_fn_ptr(
@@ -336,7 +312,7 @@ impl<'tcx> Instance<'tcx> {
     ) -> Option<Instance<'tcx>> {
         debug!("resolve(def_id={:?}, substs={:?})", def_id, substs);
         let fn_sig = tcx.fn_sig(def_id);
-        let is_vtable_shim = fn_sig.inputs().skip_binder().len() > 0
+        let is_vtable_shim = !fn_sig.inputs().skip_binder().is_empty()
             && fn_sig.input(0).skip_binder().is_param(0)
             && tcx.generics_of(def_id).has_self;
         if is_vtable_shim {
@@ -376,6 +352,7 @@ impl<'tcx> Instance<'tcx> {
         let fn_once = tcx.lang_items().fn_once_trait().unwrap();
         let call_once = tcx
             .associated_items(fn_once)
+            .in_definition_order()
             .find(|it| it.kind == ty::AssocKind::Method)
             .unwrap()
             .def_id;
@@ -397,88 +374,6 @@ impl<'tcx> Instance<'tcx> {
     }
 }
 
-fn resolve_associated_item<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_item: &ty::AssocItem,
-    param_env: ty::ParamEnv<'tcx>,
-    trait_id: DefId,
-    rcvr_substs: SubstsRef<'tcx>,
-) -> Option<Instance<'tcx>> {
-    let def_id = trait_item.def_id;
-    debug!(
-        "resolve_associated_item(trait_item={:?}, \
-            param_env={:?}, \
-            trait_id={:?}, \
-            rcvr_substs={:?})",
-        def_id, param_env, trait_id, rcvr_substs
-    );
-
-    let trait_ref = ty::TraitRef::from_method(tcx, trait_id, rcvr_substs);
-    let vtbl = tcx.codegen_fulfill_obligation((param_env, ty::Binder::bind(trait_ref)));
-
-    // Now that we know which impl is being used, we can dispatch to
-    // the actual function:
-    match vtbl {
-        traits::VtableImpl(impl_data) => {
-            let (def_id, substs) =
-                traits::find_associated_item(tcx, param_env, trait_item, rcvr_substs, &impl_data);
-
-            let resolved_item = tcx.associated_item(def_id);
-
-            // Since this is a trait item, we need to see if the item is either a trait default item
-            // or a specialization because we can't resolve those unless we can `Reveal::All`.
-            // NOTE: This should be kept in sync with the similar code in
-            // `rustc::traits::project::assemble_candidates_from_impls()`.
-            let eligible = if !resolved_item.defaultness.is_default() {
-                true
-            } else if param_env.reveal == traits::Reveal::All {
-                !trait_ref.needs_subst()
-            } else {
-                false
-            };
-
-            if !eligible {
-                return None;
-            }
-
-            let substs = tcx.erase_regions(&substs);
-            Some(ty::Instance::new(def_id, substs))
-        }
-        traits::VtableGenerator(generator_data) => Some(Instance {
-            def: ty::InstanceDef::Item(generator_data.generator_def_id),
-            substs: generator_data.substs,
-        }),
-        traits::VtableClosure(closure_data) => {
-            let trait_closure_kind = tcx.lang_items().fn_trait_kind(trait_id).unwrap();
-            Some(Instance::resolve_closure(
-                tcx,
-                closure_data.closure_def_id,
-                closure_data.substs,
-                trait_closure_kind,
-            ))
-        }
-        traits::VtableFnPointer(ref data) => Some(Instance {
-            def: ty::InstanceDef::FnPtrShim(trait_item.def_id, data.fn_ty),
-            substs: rcvr_substs,
-        }),
-        traits::VtableObject(ref data) => {
-            let index = traits::get_vtable_index_of_object_method(tcx, data, def_id);
-            Some(Instance { def: ty::InstanceDef::Virtual(def_id, index), substs: rcvr_substs })
-        }
-        traits::VtableBuiltin(..) => {
-            if tcx.lang_items().clone_trait().is_some() {
-                Some(Instance {
-                    def: ty::InstanceDef::CloneShim(def_id, trait_ref.self_ty()),
-                    substs: rcvr_substs,
-                })
-            } else {
-                None
-            }
-        }
-        traits::VtableAutoImpl(..) | traits::VtableParam(..) | traits::VtableTraitAlias(..) => None,
-    }
-}
-
 fn needs_fn_once_adapter_shim(
     actual_closure_kind: ty::ClosureKind,
     trait_closure_kind: ty::ClosureKind,
@@ -511,3 +406,21 @@ fn needs_fn_once_adapter_shim(
         (ty::ClosureKind::FnMut, _) | (ty::ClosureKind::FnOnce, _) => Err(()),
     }
 }
+
+fn resolve_instance_default(
+    _tcx: TyCtxt<'tcx>,
+    _param_env: ty::ParamEnv<'tcx>,
+    _def_id: DefId,
+    _substs: SubstsRef<'tcx>,
+) -> Option<Instance<'tcx>> {
+    unimplemented!()
+}
+
+pub static RESOLVE_INSTANCE: AtomicRef<
+    for<'tcx> fn(
+        TyCtxt<'tcx>,
+        ty::ParamEnv<'tcx>,
+        DefId,
+        SubstsRef<'tcx>,
+    ) -> Option<Instance<'tcx>>,
+> = AtomicRef::new(&(resolve_instance_default as _));
diff --git a/src/librustc/ty/layout.rs b/src/librustc/ty/layout.rs
index acaa4eec94..e257b48f11 100644
--- a/src/librustc/ty/layout.rs
+++ b/src/librustc/ty/layout.rs
@@ -1,13 +1,12 @@
 use crate::session::{self, DataTypeKind};
 use crate::ty::{self, subst::SubstsRef, ReprOptions, Ty, TyCtxt, TypeFoldable};
 
+use rustc_ast::ast::{self, Ident, IntTy, UintTy};
+use rustc_attr as attr;
 use rustc_span::DUMMY_SP;
-use syntax::ast::{self, Ident, IntTy, UintTy};
-use syntax::attr;
 
 use std::cmp;
 use std::fmt;
-use std::i128;
 use std::iter;
 use std::mem;
 use std::ops::Bound;
@@ -356,12 +355,14 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
             debug!("univariant offset: {:?} field: {:#?}", offset, field);
             offsets[i as usize] = offset;
 
-            if let Some(mut niche) = field.largest_niche.clone() {
-                let available = niche.available(dl);
-                if available > largest_niche_available {
-                    largest_niche_available = available;
-                    niche.offset += offset;
-                    largest_niche = Some(niche);
+            if !repr.hide_niche() {
+                if let Some(mut niche) = field.largest_niche.clone() {
+                    let available = niche.available(dl);
+                    if available > largest_niche_available {
+                        largest_niche_available = available;
+                        niche.offset += offset;
+                        largest_niche = Some(niche);
+                    }
                 }
             }
 
@@ -500,7 +501,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
         let univariant = |fields: &[TyLayout<'_>], repr: &ReprOptions, kind| {
             Ok(tcx.intern_layout(self.univariant_uninterned(ty, fields, repr, kind)?))
         };
-        debug_assert!(!ty.has_infer_types());
+        debug_assert!(!ty.has_infer_types_or_consts());
 
         Ok(match ty.kind {
             // Basic scalars.
@@ -796,7 +797,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
                     // (Typechecking will reject discriminant-sizing attrs.)
 
                     let v = present_first.unwrap();
-                    let kind = if def.is_enum() || variants[v].len() == 0 {
+                    let kind = if def.is_enum() || variants[v].is_empty() {
                         StructKind::AlwaysSized
                     } else {
                         let param_env = tcx.param_env(def.did);
@@ -838,7 +839,11 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
                             }
 
                             // Update `largest_niche` if we have introduced a larger niche.
-                            let niche = Niche::from_scalar(dl, Size::ZERO, scalar.clone());
+                            let niche = if def.repr.hide_niche() {
+                                None
+                            } else {
+                                Niche::from_scalar(dl, Size::ZERO, scalar.clone())
+                            };
                             if let Some(niche) = niche {
                                 match &st.largest_niche {
                                     Some(largest_niche) => {
@@ -863,6 +868,11 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
                     return Ok(tcx.intern_layout(st));
                 }
 
+                // At this point, we have handled all unions and
+                // structs. (We have also handled univariant enums
+                // that allow representation optimization.)
+                assert!(def.is_enum());
+
                 // The current code for niche-filling relies on variant indices
                 // instead of actual discriminants, so dataful enums with
                 // explicit discriminants (RFC #2363) would misbehave.
@@ -990,7 +1000,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
                     }
                 }
 
-                let (mut min, mut max) = (i128::max_value(), i128::min_value());
+                let (mut min, mut max) = (i128::MAX, i128::MIN);
                 let discr_type = def.repr.discr_type();
                 let bits = Integer::from_attr(self, discr_type).size().bits();
                 for (i, discr) in def.discriminants(tcx) {
@@ -1010,7 +1020,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
                     }
                 }
                 // We might have no inhabited variants, so pretend there's at least one.
-                if (min, max) == (i128::max_value(), i128::min_value()) {
+                if (min, max) == (i128::MAX, i128::MIN) {
                     min = 0;
                     max = 0;
                 }
@@ -1371,10 +1381,8 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
 
         // Write down the order of our locals that will be promoted to the prefix.
         {
-            let mut idx = 0u32;
-            for local in ineligible_locals.iter() {
-                assignments[local] = Ineligible(Some(idx));
-                idx += 1;
+            for (idx, local) in ineligible_locals.iter().enumerate() {
+                assignments[local] = Ineligible(Some(idx as u32));
             }
         }
         debug!("generator saved local assignments: {:?}", assignments);
@@ -1741,7 +1749,7 @@ impl<'tcx> SizeSkeleton<'tcx> {
         tcx: TyCtxt<'tcx>,
         param_env: ty::ParamEnv<'tcx>,
     ) -> Result<SizeSkeleton<'tcx>, LayoutError<'tcx>> {
-        debug_assert!(!ty.has_infer_types());
+        debug_assert!(!ty.has_infer_types_or_consts());
 
         // First try computing a static layout.
         let err = match tcx.layout_of(param_env.and(ty)) {
@@ -2350,8 +2358,9 @@ impl<'tcx> ty::Instance<'tcx> {
                     ]);
                     let ret_ty = tcx.mk_adt(state_adt_ref, state_substs);
 
-                    tcx.mk_fn_sig(iter::once(env_ty),
-                        ret_ty,
+                    tcx.mk_fn_sig(
+                        [env_ty, sig.resume_ty].iter(),
+                        &ret_ty,
                         false,
                         hir::Unsafety::Normal,
                         rustc_target::spec::abi::Abi::Rust
@@ -2529,12 +2538,15 @@ where
         };
 
         let target = &cx.tcx().sess.target.target;
+        let target_env_gnu_like = matches!(&target.target_env[..], "gnu" | "musl");
         let win_x64_gnu =
             target.target_os == "windows" && target.arch == "x86_64" && target.target_env == "gnu";
-        let linux_s390x =
-            target.target_os == "linux" && target.arch == "s390x" && target.target_env == "gnu";
-        let linux_sparc64 =
-            target.target_os == "linux" && target.arch == "sparc64" && target.target_env == "gnu";
+        let linux_s390x_gnu_like =
+            target.target_os == "linux" && target.arch == "s390x" && target_env_gnu_like;
+        let linux_sparc64_gnu_like =
+            target.target_os == "linux" && target.arch == "sparc64" && target_env_gnu_like;
+        let linux_powerpc_gnu_like =
+            target.target_os == "linux" && target.arch == "powerpc" && target_env_gnu_like;
         let rust_abi = match sig.abi {
             RustIntrinsic | PlatformIntrinsic | Rust | RustCall => true,
             _ => false,
@@ -2567,7 +2579,7 @@ where
                 if let Some(kind) = pointee.safe {
                     attrs.pointee_align = Some(pointee.align);
 
-                    // `Box` (`UniqueBorrowed`) are not necessarily dereferencable
+                    // `Box` (`UniqueBorrowed`) are not necessarily dereferenceable
                     // for the entire duration of the function as they can be deallocated
                     // any time. Set their valid size to 0.
                     attrs.pointee_size = match kind {
@@ -2605,9 +2617,14 @@ where
             if arg.layout.is_zst() {
                 // For some forsaken reason, x86_64-pc-windows-gnu
                 // doesn't ignore zero-sized struct arguments.
-                // The same is true for s390x-unknown-linux-gnu
-                // and sparc64-unknown-linux-gnu.
-                if is_return || rust_abi || (!win_x64_gnu && !linux_s390x && !linux_sparc64) {
+                // The same is true for {s390x,sparc64,powerpc}-unknown-linux-{gnu,musl}.
+                if is_return
+                    || rust_abi
+                    || (!win_x64_gnu
+                        && !linux_s390x_gnu_like
+                        && !linux_sparc64_gnu_like
+                        && !linux_powerpc_gnu_like)
+                {
                     arg.mode = PassMode::Ignore;
                 }
             }
@@ -2650,6 +2667,7 @@ where
                 .map(|(i, ty)| arg_of(ty, Some(i)))
                 .collect(),
             c_variadic: sig.c_variadic,
+            fixed_count: inputs.len(),
             conv,
         };
         fn_abi.adjust_for_abi(cx, sig.abi);
diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs
index 4889f751f6..7df235b3cc 100644
--- a/src/librustc/ty/mod.rs
+++ b/src/librustc/ty/mod.rs
@@ -26,24 +26,27 @@ use crate::ty::layout::VariantIdx;
 use crate::ty::subst::{InternalSubsts, Subst, SubstsRef};
 use crate::ty::util::{Discr, IntTypeExt};
 use crate::ty::walk::TypeWalker;
+use rustc_ast::ast::{self, Ident, Name};
+use rustc_ast::node_id::{NodeId, NodeMap, NodeSet};
+use rustc_attr as attr;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::fx::FxIndexMap;
+use rustc_data_structures::sorted_map::SortedIndexMultiMap;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::sync::{self, par_iter, Lrc, ParallelIterator};
 use rustc_hir as hir;
-use rustc_hir::def::{CtorKind, CtorOf, DefKind, Res};
+use rustc_hir::def::{CtorKind, CtorOf, DefKind, Namespace, Res};
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LocalDefId, CRATE_DEF_INDEX, LOCAL_CRATE};
-use rustc_hir::{GlobMap, Node, TraitMap};
+use rustc_hir::{Constness, GlobMap, Node, TraitMap};
 use rustc_index::vec::{Idx, IndexVec};
 use rustc_macros::HashStable;
 use rustc_serialize::{self, Encodable, Encoder};
-use rustc_session::node_id::{NodeMap, NodeSet};
 use rustc_span::hygiene::ExpnId;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 use rustc_target::abi::Align;
-use smallvec;
+
 use std::cell::RefCell;
 use std::cmp::{self, Ordering};
 use std::fmt;
@@ -52,8 +55,6 @@ use std::ops::Deref;
 use std::ops::Range;
 use std::slice;
 use std::{mem, ptr};
-use syntax::ast::{self, Constness, Ident, Name, NodeId};
-use syntax::attr;
 
 pub use self::sty::BoundRegion::*;
 pub use self::sty::InferTy::*;
@@ -83,6 +84,7 @@ pub use self::context::{
     CtxtInterners, GeneratorInteriorTypeCause, GlobalCtxt, Lift, TypeckTables,
 };
 
+pub use self::instance::RESOLVE_INSTANCE;
 pub use self::instance::{Instance, InstanceDef};
 
 pub use self::trait_def::TraitDef;
@@ -126,7 +128,7 @@ pub struct ResolverOutputs {
     pub definitions: hir_map::Definitions,
     pub cstore: Box<CrateStoreDyn>,
     pub extern_crate_map: NodeMap<CrateNum>,
-    pub trait_map: TraitMap,
+    pub trait_map: TraitMap<NodeId>,
     pub maybe_unused_trait_imports: NodeSet,
     pub maybe_unused_extern_crates: Vec<(NodeId, Span)>,
     pub export_map: ExportMap<NodeId>,
@@ -215,6 +217,13 @@ impl AssocKind {
             ty::AssocKind::Const => "associated constant",
         }
     }
+
+    pub fn namespace(&self) -> Namespace {
+        match *self {
+            ty::AssocKind::OpaqueTy | ty::AssocKind::Type => Namespace::TypeNS,
+            ty::AssocKind::Const | ty::AssocKind::Method => Namespace::ValueNS,
+        }
+    }
 }
 
 impl AssocItem {
@@ -256,6 +265,81 @@ impl AssocItem {
     }
 }
 
+/// A list of `ty::AssocItem`s in definition order that allows for efficient lookup by name.
+///
+/// When doing lookup by name, we try to postpone hygienic comparison for as long as possible since
+/// it is relatively expensive. Instead, items are indexed by `Symbol` and hygienic comparison is
+/// done only on items with the same name.
+#[derive(Debug, Clone, PartialEq, HashStable)]
+pub struct AssociatedItems {
+    items: SortedIndexMultiMap<u32, Symbol, ty::AssocItem>,
+}
+
+impl AssociatedItems {
+    /// Constructs an `AssociatedItems` map from a series of `ty::AssocItem`s in definition order.
+    pub fn new(items_in_def_order: impl IntoIterator<Item = ty::AssocItem>) -> Self {
+        let items = items_in_def_order.into_iter().map(|item| (item.ident.name, item)).collect();
+        AssociatedItems { items }
+    }
+
+    /// Returns a slice of associated items in the order they were defined.
+    ///
+    /// New code should avoid relying on definition order. If you need a particular associated item
+    /// for a known trait, make that trait a lang item instead of indexing this array.
+    pub fn in_definition_order(&self) -> impl '_ + Iterator<Item = &ty::AssocItem> {
+        self.items.iter().map(|(_, v)| v)
+    }
+
+    /// Returns an iterator over all associated items with the given name, ignoring hygiene.
+    pub fn filter_by_name_unhygienic(
+        &self,
+        name: Symbol,
+    ) -> impl '_ + Iterator<Item = &ty::AssocItem> {
+        self.items.get_by_key(&name)
+    }
+
+    /// Returns an iterator over all associated items with the given name.
+    ///
+    /// Multiple items may have the same name if they are in different `Namespace`s. For example,
+    /// an associated type can have the same name as a method. Use one of the `find_by_name_and_*`
+    /// methods below if you know which item you are looking for.
+    pub fn filter_by_name(
+        &'a self,
+        tcx: TyCtxt<'a>,
+        ident: Ident,
+        parent_def_id: DefId,
+    ) -> impl 'a + Iterator<Item = &'a ty::AssocItem> {
+        self.filter_by_name_unhygienic(ident.name)
+            .filter(move |item| tcx.hygienic_eq(ident, item.ident, parent_def_id))
+    }
+
+    /// Returns the associated item with the given name and `AssocKind`, if one exists.
+    pub fn find_by_name_and_kind(
+        &self,
+        tcx: TyCtxt<'_>,
+        ident: Ident,
+        kind: AssocKind,
+        parent_def_id: DefId,
+    ) -> Option<&ty::AssocItem> {
+        self.filter_by_name_unhygienic(ident.name)
+            .filter(|item| item.kind == kind)
+            .find(|item| tcx.hygienic_eq(ident, item.ident, parent_def_id))
+    }
+
+    /// Returns the associated item with the given name in the given `Namespace`, if one exists.
+    pub fn find_by_name_and_namespace(
+        &self,
+        tcx: TyCtxt<'_>,
+        ident: Ident,
+        ns: Namespace,
+        parent_def_id: DefId,
+    ) -> Option<&ty::AssocItem> {
+        self.filter_by_name_unhygienic(ident.name)
+            .filter(|item| item.kind.namespace() == ns)
+            .find(|item| tcx.hygienic_eq(ident, item.ident, parent_def_id))
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Copy, RustcEncodable, RustcDecodable, HashStable)]
 pub enum Visibility {
     /// Visible everywhere (including in other crates).
@@ -286,7 +370,7 @@ pub trait DefIdTree: Copy {
 
 impl<'tcx> DefIdTree for TyCtxt<'tcx> {
     fn parent(self, id: DefId) -> Option<DefId> {
-        self.def_key(id).parent.map(|index| DefId { index: index, ..id })
+        self.def_key(id).parent.map(|index| DefId { index, ..id })
     }
 }
 
@@ -301,9 +385,7 @@ impl Visibility {
                 Res::Err => Visibility::Public,
                 def => Visibility::Restricted(def.def_id()),
             },
-            hir::VisibilityKind::Inherited => {
-                Visibility::Restricted(tcx.hir().get_module_parent(id))
-            }
+            hir::VisibilityKind::Inherited => Visibility::Restricted(tcx.parent_module(id)),
         }
     }
 
@@ -433,72 +515,110 @@ pub struct CReaderCacheKey {
     pub pos: usize,
 }
 
-// Flags that we track on types. These flags are propagated upwards
-// through the type during type construction, so that we can quickly
-// check whether the type has various kinds of types in it without
-// recursing over the type itself.
 bitflags! {
+    /// Flags that we track on types. These flags are propagated upwards
+    /// through the type during type construction, so that we can quickly check
+    /// whether the type has various kinds of types in it without recursing
+    /// over the type itself.
     pub struct TypeFlags: u32 {
-        const HAS_PARAMS         = 1 << 0;
-        const HAS_TY_INFER       = 1 << 1;
-        const HAS_RE_INFER       = 1 << 2;
-        const HAS_RE_PLACEHOLDER = 1 << 3;
-
-        /// Does this have any `ReEarlyBound` regions? Used to
-        /// determine whether substitition is required, since those
-        /// represent regions that are bound in a `ty::Generics` and
-        /// hence may be substituted.
-        const HAS_RE_EARLY_BOUND = 1 << 4;
-
-        /// Does this have any region that "appears free" in the type?
-        /// Basically anything but `ReLateBound` and `ReErased`.
-        const HAS_FREE_REGIONS   = 1 << 5;
-
-        /// Is an error type reachable?
-        const HAS_TY_ERR         = 1 << 6;
-        const HAS_PROJECTION     = 1 << 7;
-
-        // FIXME: Rename this to the actual property since it's used for generators too
-        const HAS_TY_CLOSURE     = 1 << 8;
+        // Does this have parameters? Used to determine whether substitution is
+        // required.
+        /// Does this have [Param]?
+        const HAS_TY_PARAM              = 1 << 0;
+        /// Does this have [ReEarlyBound]?
+        const HAS_RE_PARAM              = 1 << 1;
+        /// Does this have [ConstKind::Param]?
+        const HAS_CT_PARAM              = 1 << 2;
+
+        const NEEDS_SUBST               = TypeFlags::HAS_TY_PARAM.bits
+                                        | TypeFlags::HAS_RE_PARAM.bits
+                                        | TypeFlags::HAS_CT_PARAM.bits;
+
+        /// Does this have [Infer]?
+        const HAS_TY_INFER              = 1 << 3;
+        /// Does this have [ReVar]?
+        const HAS_RE_INFER              = 1 << 4;
+        /// Does this have [ConstKind::Infer]?
+        const HAS_CT_INFER              = 1 << 5;
+
+        /// Does this have inference variables? Used to determine whether
+        /// inference is required.
+        const NEEDS_INFER               = TypeFlags::HAS_TY_INFER.bits
+                                        | TypeFlags::HAS_RE_INFER.bits
+                                        | TypeFlags::HAS_CT_INFER.bits;
+
+        /// Does this have [Placeholder]?
+        const HAS_TY_PLACEHOLDER        = 1 << 6;
+        /// Does this have [RePlaceholder]?
+        const HAS_RE_PLACEHOLDER        = 1 << 7;
+        /// Does this have [ConstKind::Placeholder]?
+        const HAS_CT_PLACEHOLDER        = 1 << 8;
+
+        /// `true` if there are "names" of regions and so forth
+        /// that are local to a particular fn/inferctxt
+        const HAS_FREE_LOCAL_REGIONS    = 1 << 9;
 
         /// `true` if there are "names" of types and regions and so forth
         /// that are local to a particular fn
-        const HAS_FREE_LOCAL_NAMES = 1 << 9;
+        const HAS_FREE_LOCAL_NAMES      = TypeFlags::HAS_TY_PARAM.bits
+                                        | TypeFlags::HAS_CT_PARAM.bits
+                                        | TypeFlags::HAS_TY_INFER.bits
+                                        | TypeFlags::HAS_CT_INFER.bits
+                                        | TypeFlags::HAS_TY_PLACEHOLDER.bits
+                                        | TypeFlags::HAS_CT_PLACEHOLDER.bits
+                                        | TypeFlags::HAS_FREE_LOCAL_REGIONS.bits;
+
+        /// Does this have [Projection] or [UnnormalizedProjection]?
+        const HAS_TY_PROJECTION         = 1 << 10;
+        /// Does this have [Opaque]?
+        const HAS_TY_OPAQUE             = 1 << 11;
+        /// Does this have [ConstKind::Unevaluated]?
+        const HAS_CT_PROJECTION         = 1 << 12;
+
+        /// Could this type be normalized further?
+        const HAS_PROJECTION            = TypeFlags::HAS_TY_PROJECTION.bits
+                                        | TypeFlags::HAS_TY_OPAQUE.bits
+                                        | TypeFlags::HAS_CT_PROJECTION.bits;
 
         /// Present if the type belongs in a local type context.
-        /// Only set for Infer other than Fresh.
-        const KEEP_IN_LOCAL_TCX  = 1 << 10;
+        /// Set for placeholders and inference variables that are not "Fresh".
+        const KEEP_IN_LOCAL_TCX         = 1 << 13;
 
-        /// Does this have any `ReLateBound` regions? Used to check
-        /// if a global bound is safe to evaluate.
-        const HAS_RE_LATE_BOUND  = 1 << 11;
+        /// Is an error type reachable?
+        const HAS_TY_ERR                = 1 << 14;
 
-        const HAS_TY_PLACEHOLDER = 1 << 12;
+        /// Does this have any region that "appears free" in the type?
+        /// Basically anything but [ReLateBound] and [ReErased].
+        const HAS_FREE_REGIONS          = 1 << 15;
 
-        const HAS_CT_INFER       = 1 << 13;
-        const HAS_CT_PLACEHOLDER = 1 << 14;
+        /// Does this have any [ReLateBound] regions? Used to check
+        /// if a global bound is safe to evaluate.
+        const HAS_RE_LATE_BOUND         = 1 << 16;
 
-        const NEEDS_SUBST        = TypeFlags::HAS_PARAMS.bits |
-                                   TypeFlags::HAS_RE_EARLY_BOUND.bits;
+        /// Does this have any [ReErased] regions?
+        const HAS_RE_ERASED             = 1 << 17;
 
         /// Flags representing the nominal content of a type,
         /// computed by FlagsComputation. If you add a new nominal
         /// flag, it should be added here too.
-        const NOMINAL_FLAGS     = TypeFlags::HAS_PARAMS.bits |
-                                  TypeFlags::HAS_TY_INFER.bits |
-                                  TypeFlags::HAS_RE_INFER.bits |
-                                  TypeFlags::HAS_RE_PLACEHOLDER.bits |
-                                  TypeFlags::HAS_RE_EARLY_BOUND.bits |
-                                  TypeFlags::HAS_FREE_REGIONS.bits |
-                                  TypeFlags::HAS_TY_ERR.bits |
-                                  TypeFlags::HAS_PROJECTION.bits |
-                                  TypeFlags::HAS_TY_CLOSURE.bits |
-                                  TypeFlags::HAS_FREE_LOCAL_NAMES.bits |
-                                  TypeFlags::KEEP_IN_LOCAL_TCX.bits |
-                                  TypeFlags::HAS_RE_LATE_BOUND.bits |
-                                  TypeFlags::HAS_TY_PLACEHOLDER.bits |
-                                  TypeFlags::HAS_CT_INFER.bits |
-                                  TypeFlags::HAS_CT_PLACEHOLDER.bits;
+        const NOMINAL_FLAGS             = TypeFlags::HAS_TY_PARAM.bits
+                                        | TypeFlags::HAS_RE_PARAM.bits
+                                        | TypeFlags::HAS_CT_PARAM.bits
+                                        | TypeFlags::HAS_TY_INFER.bits
+                                        | TypeFlags::HAS_RE_INFER.bits
+                                        | TypeFlags::HAS_CT_INFER.bits
+                                        | TypeFlags::HAS_TY_PLACEHOLDER.bits
+                                        | TypeFlags::HAS_RE_PLACEHOLDER.bits
+                                        | TypeFlags::HAS_CT_PLACEHOLDER.bits
+                                        | TypeFlags::HAS_FREE_LOCAL_REGIONS.bits
+                                        | TypeFlags::HAS_TY_PROJECTION.bits
+                                        | TypeFlags::HAS_TY_OPAQUE.bits
+                                        | TypeFlags::HAS_CT_PROJECTION.bits
+                                        | TypeFlags::KEEP_IN_LOCAL_TCX.bits
+                                        | TypeFlags::HAS_TY_ERR.bits
+                                        | TypeFlags::HAS_FREE_REGIONS.bits
+                                        | TypeFlags::HAS_RE_LATE_BOUND.bits
+                                        | TypeFlags::HAS_RE_ERASED.bits;
     }
 }
 
@@ -607,7 +727,7 @@ impl<T: Copy> List<T> {
     fn from_arena<'tcx>(arena: &'tcx Arena<'tcx>, slice: &[T]) -> &'tcx List<T> {
         assert!(!mem::needs_drop::<T>());
         assert!(mem::size_of::<T>() != 0);
-        assert!(slice.len() != 0);
+        assert!(!slice.is_empty());
 
         // Align up the size of the len (usize) field
         let align = mem::align_of::<T>();
@@ -840,7 +960,17 @@ pub enum GenericParamDefKind {
     Const,
 }
 
-#[derive(Clone, RustcEncodable, RustcDecodable, HashStable)]
+impl GenericParamDefKind {
+    pub fn descr(&self) -> &'static str {
+        match self {
+            GenericParamDefKind::Lifetime => "lifetime",
+            GenericParamDefKind::Type { .. } => "type",
+            GenericParamDefKind::Const => "constant",
+        }
+    }
+}
+
+#[derive(Clone, Debug, RustcEncodable, RustcDecodable, HashStable)]
 pub struct GenericParamDef {
     pub name: Symbol,
     pub def_id: DefId,
@@ -1014,6 +1144,7 @@ impl<'tcx> GenericPredicates<'tcx> {
     ) -> InstantiatedPredicates<'tcx> {
         InstantiatedPredicates {
             predicates: self.predicates.iter().map(|(p, _)| p.subst(tcx, substs)).collect(),
+            spans: self.predicates.iter().map(|(_, sp)| *sp).collect(),
         }
     }
 
@@ -1027,6 +1158,7 @@ impl<'tcx> GenericPredicates<'tcx> {
             tcx.predicates_of(def_id).instantiate_into(tcx, instantiated, substs);
         }
         instantiated.predicates.extend(self.predicates.iter().map(|(p, _)| p.subst(tcx, substs)));
+        instantiated.spans.extend(self.predicates.iter().map(|(_, sp)| *sp));
     }
 
     pub fn instantiate_identity(&self, tcx: TyCtxt<'tcx>) -> InstantiatedPredicates<'tcx> {
@@ -1043,7 +1175,8 @@ impl<'tcx> GenericPredicates<'tcx> {
         if let Some(def_id) = self.parent {
             tcx.predicates_of(def_id).instantiate_identity_into(tcx, instantiated);
         }
-        instantiated.predicates.extend(self.predicates.iter().map(|&(p, _)| p))
+        instantiated.predicates.extend(self.predicates.iter().map(|(p, _)| p));
+        instantiated.spans.extend(self.predicates.iter().map(|(_, s)| s));
     }
 
     pub fn instantiate_supertrait(
@@ -1058,6 +1191,7 @@ impl<'tcx> GenericPredicates<'tcx> {
                 .iter()
                 .map(|(pred, _)| pred.subst_supertrait(tcx, poly_trait_ref))
                 .collect(),
+            spans: self.predicates.iter().map(|(_, sp)| *sp).collect(),
         }
     }
 }
@@ -1343,7 +1477,7 @@ pub trait ToPredicate<'tcx> {
 impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<TraitRef<'tcx>> {
     fn to_predicate(&self) -> Predicate<'tcx> {
         ty::Predicate::Trait(
-            ty::Binder::dummy(ty::TraitPredicate { trait_ref: self.value.clone() }),
+            ty::Binder::dummy(ty::TraitPredicate { trait_ref: self.value }),
             self.constness,
         )
     }
@@ -1352,7 +1486,7 @@ impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<TraitRef<'tcx>> {
 impl<'tcx> ToPredicate<'tcx> for ConstnessAnd<&TraitRef<'tcx>> {
     fn to_predicate(&self) -> Predicate<'tcx> {
         ty::Predicate::Trait(
-            ty::Binder::dummy(ty::TraitPredicate { trait_ref: self.value.clone() }),
+            ty::Binder::dummy(ty::TraitPredicate { trait_ref: *self.value }),
             self.constness,
         )
     }
@@ -1510,11 +1644,12 @@ impl<'tcx> Predicate<'tcx> {
 #[derive(Clone, Debug, TypeFoldable)]
 pub struct InstantiatedPredicates<'tcx> {
     pub predicates: Vec<Predicate<'tcx>>,
+    pub spans: Vec<Span>,
 }
 
 impl<'tcx> InstantiatedPredicates<'tcx> {
     pub fn empty() -> InstantiatedPredicates<'tcx> {
-        InstantiatedPredicates { predicates: vec![] }
+        InstantiatedPredicates { predicates: vec![], spans: vec![] }
     }
 
     pub fn is_empty(&self) -> bool {
@@ -1712,10 +1847,10 @@ impl<'tcx> ParamEnv<'tcx> {
             Reveal::UserFacing => ParamEnvAnd { param_env: self, value },
 
             Reveal::All => {
-                if value.has_placeholders() || value.needs_infer() || value.has_param_types() {
-                    ParamEnvAnd { param_env: self, value }
-                } else {
+                if value.is_global() {
                     ParamEnvAnd { param_env: self.without_caller_bounds(), value }
+                } else {
+                    ParamEnvAnd { param_env: self, value }
                 }
             }
         }
@@ -1791,19 +1926,22 @@ bitflags! {
         const IS_STRUCT           = 1 << 2;
         /// Indicates whether the ADT is a struct and has a constructor.
         const HAS_CTOR            = 1 << 3;
-        /// Indicates whether the type is a `PhantomData`.
+        /// Indicates whether the type is `PhantomData`.
         const IS_PHANTOM_DATA     = 1 << 4;
         /// Indicates whether the type has a `#[fundamental]` attribute.
         const IS_FUNDAMENTAL      = 1 << 5;
-        /// Indicates whether the type is a `Box`.
+        /// Indicates whether the type is `Box`.
         const IS_BOX              = 1 << 6;
+        /// Indicates whether the type is `ManuallyDrop`.
+        const IS_MANUALLY_DROP    = 1 << 7;
+        // FIXME(matthewjasper) replace these with diagnostic items
         /// Indicates whether the type is an `Arc`.
-        const IS_ARC              = 1 << 7;
+        const IS_ARC              = 1 << 8;
         /// Indicates whether the type is an `Rc`.
-        const IS_RC               = 1 << 8;
+        const IS_RC               = 1 << 9;
         /// Indicates whether the variant list of this ADT is `#[non_exhaustive]`.
         /// (i.e., this flag is never set unless this ADT is an enum).
-        const IS_VARIANT_LIST_NON_EXHAUSTIVE = 1 << 9;
+        const IS_VARIANT_LIST_NON_EXHAUSTIVE = 1 << 10;
     }
 }
 
@@ -2036,7 +2174,8 @@ bitflags! {
         const IS_TRANSPARENT     = 1 << 2;
         // Internal only for now. If true, don't reorder fields.
         const IS_LINEAR          = 1 << 3;
-
+        // If true, don't expose any niche to type's context.
+        const HIDE_NICHE         = 1 << 4;
         // Any of these flags being set prevent field reordering optimisation.
         const IS_UNOPTIMISABLE   = ReprFlags::IS_C.bits |
                                    ReprFlags::IS_SIMD.bits |
@@ -2073,6 +2212,7 @@ impl ReprOptions {
                         ReprFlags::empty()
                     }
                     attr::ReprTransparent => ReprFlags::IS_TRANSPARENT,
+                    attr::ReprNoNiche => ReprFlags::HIDE_NICHE,
                     attr::ReprSimd => ReprFlags::IS_SIMD,
                     attr::ReprInt(i) => {
                         size = Some(i);
@@ -2090,7 +2230,7 @@ impl ReprOptions {
         if !tcx.consider_optimizing(|| format!("Reorder fields of {:?}", tcx.def_path_str(did))) {
             flags.insert(ReprFlags::IS_LINEAR);
         }
-        ReprOptions { int: size, align: max_align, pack: min_pack, flags: flags }
+        ReprOptions { int: size, align: max_align, pack: min_pack, flags }
     }
 
     #[inline]
@@ -2113,6 +2253,10 @@ impl ReprOptions {
     pub fn linear(&self) -> bool {
         self.flags.contains(ReprFlags::IS_LINEAR)
     }
+    #[inline]
+    pub fn hide_niche(&self) -> bool {
+        self.flags.contains(ReprFlags::HIDE_NICHE)
+    }
 
     pub fn discr_type(&self) -> attr::IntType {
         self.int.unwrap_or(attr::SignedInt(ast::IntTy::Isize))
@@ -2179,6 +2323,9 @@ impl<'tcx> AdtDef {
         if Some(did) == tcx.lang_items().owned_box() {
             flags |= AdtFlags::IS_BOX;
         }
+        if Some(did) == tcx.lang_items().manually_drop() {
+            flags |= AdtFlags::IS_MANUALLY_DROP;
+        }
         if Some(did) == tcx.lang_items().arc() {
             flags |= AdtFlags::IS_ARC;
         }
@@ -2279,6 +2426,12 @@ impl<'tcx> AdtDef {
         self.flags.contains(AdtFlags::IS_BOX)
     }
 
+    /// Returns `true` if this is `ManuallyDrop<T>`.
+    #[inline]
+    pub fn is_manually_drop(&self) -> bool {
+        self.flags.contains(AdtFlags::IS_MANUALLY_DROP)
+    }
+
     /// Returns `true` if this type has a destructor.
     pub fn has_dtor(&self, tcx: TyCtxt<'tcx>) -> bool {
         self.destructor(tcx).is_some()
@@ -2357,10 +2510,10 @@ impl<'tcx> AdtDef {
         let repr_type = self.repr.discr_type();
         match tcx.const_eval_poly(expr_did) {
             Ok(val) => {
-                // FIXME: Find the right type and use it instead of `val.ty` here
-                if let Some(b) = val.try_eval_bits(tcx, param_env, val.ty) {
+                let ty = repr_type.to_ty(tcx);
+                if let Some(b) = val.try_to_bits_for_ty(tcx, param_env, ty) {
                     trace!("discriminants: {} ({:?})", b, repr_type);
-                    Some(Discr { val: b, ty: val.ty })
+                    Some(Discr { val: b, ty })
                 } else {
                     info!("invalid enum discriminant: {:#?}", val);
                     crate::mir::interpret::struct_error(
@@ -2641,9 +2794,7 @@ impl<'tcx> ::std::ops::Deref for Attributes<'tcx> {
 pub enum ImplOverlapKind {
     /// These impls are always allowed to overlap.
     Permitted {
-        /// Whether or not the impl is permitted due to the trait being
-        /// a marker trait (a trait with #[marker], or a trait with
-        /// no associated items and #![feature(overlapping_marker_traits)] enabled)
+        /// Whether or not the impl is permitted due to the trait being a `#[marker]` trait
         marker: bool,
     },
     /// These impls are allowed to overlap, but that raises
@@ -2702,14 +2853,14 @@ impl<'tcx> TyCtxt<'tcx> {
             .for_each(|&body_id| f(self.hir().body_owner_def_id(body_id)));
     }
 
-    pub fn provided_trait_methods(self, id: DefId) -> Vec<AssocItem> {
+    pub fn provided_trait_methods(self, id: DefId) -> impl 'tcx + Iterator<Item = &'tcx AssocItem> {
         self.associated_items(id)
+            .in_definition_order()
             .filter(|item| item.kind == AssocKind::Method && item.defaultness.has_value())
-            .collect()
     }
 
     pub fn trait_relevant_for_never(self, did: DefId) -> bool {
-        self.associated_items(did).any(|item| item.relevant_for_never())
+        self.associated_items(did).in_definition_order().any(|item| item.relevant_for_never())
     }
 
     pub fn opt_item_name(self, def_id: DefId) -> Option<Ident> {
@@ -2740,19 +2891,6 @@ impl<'tcx> TyCtxt<'tcx> {
         variant.fields.iter().position(|field| self.hygienic_eq(ident, field.ident, variant.def_id))
     }
 
-    pub fn associated_items(self, def_id: DefId) -> AssocItemsIterator<'tcx> {
-        // Ideally, we would use `-> impl Iterator` here, but it falls
-        // afoul of the conservative "capture [restrictions]" we put
-        // in place, so we use a hand-written iterator.
-        //
-        // [restrictions]: https://github.com/rust-lang/rust/issues/34511#issuecomment-373423999
-        AssocItemsIterator {
-            tcx: self,
-            def_ids: self.associated_item_def_ids(def_id),
-            next_index: 0,
-        }
-    }
-
     /// Returns `true` if the impls are the same polarity and the trait either
     /// has no items or is annotated #[marker] and prevents item overrides.
     pub fn impls_are_allowed_to_overlap(
@@ -2790,15 +2928,7 @@ impl<'tcx> TyCtxt<'tcx> {
             | (ImplPolarity::Negative, ImplPolarity::Negative) => {}
         };
 
-        let is_marker_overlap = if self.features().overlapping_marker_traits {
-            let trait1_is_empty = self.impl_trait_ref(def_id1).map_or(false, |trait_ref| {
-                self.associated_item_def_ids(trait_ref.def_id).is_empty()
-            });
-            let trait2_is_empty = self.impl_trait_ref(def_id2).map_or(false, |trait_ref| {
-                self.associated_item_def_ids(trait_ref.def_id).is_empty()
-            });
-            trait1_is_empty && trait2_is_empty
-        } else {
+        let is_marker_overlap = {
             let is_marker_impl = |def_id: DefId| -> bool {
                 let trait_ref = self.impl_trait_ref(def_id);
                 trait_ref.map_or(false, |tr| self.trait_def(tr.def_id).is_marker)
@@ -2986,26 +3116,13 @@ impl<'tcx> TyCtxt<'tcx> {
             Some(actual_expansion) => {
                 self.hir().definitions().parent_module_of_macro_def(actual_expansion)
             }
-            None => self.hir().get_module_parent(block),
+            None => self.parent_module(block),
         };
         (ident, scope)
     }
-}
-
-#[derive(Clone)]
-pub struct AssocItemsIterator<'tcx> {
-    tcx: TyCtxt<'tcx>,
-    def_ids: &'tcx [DefId],
-    next_index: usize,
-}
-
-impl Iterator for AssocItemsIterator<'_> {
-    type Item = AssocItem;
 
-    fn next(&mut self) -> Option<AssocItem> {
-        let def_id = self.def_ids.get(self.next_index)?;
-        self.next_index += 1;
-        Some(self.tcx.associated_item(*def_id))
+    pub fn is_object_safe(self, key: DefId) -> bool {
+        self.object_safety_violations(key).is_empty()
     }
 }
 
diff --git a/src/librustc/ty/normalize_erasing_regions.rs b/src/librustc/ty/normalize_erasing_regions.rs
index dc64482907..cbaabd8e1f 100644
--- a/src/librustc/ty/normalize_erasing_regions.rs
+++ b/src/librustc/ty/normalize_erasing_regions.rs
@@ -34,10 +34,7 @@ impl<'tcx> TyCtxt<'tcx> {
         if !value.has_projections() {
             value
         } else {
-            value.fold_with(&mut NormalizeAfterErasingRegionsFolder {
-                tcx: self,
-                param_env: param_env,
-            })
+            value.fold_with(&mut NormalizeAfterErasingRegionsFolder { tcx: self, param_env })
         }
     }
 
diff --git a/src/librustc/ty/print/mod.rs b/src/librustc/ty/print/mod.rs
index 3ade966191..8d784833bd 100644
--- a/src/librustc/ty/print/mod.rs
+++ b/src/librustc/ty/print/mod.rs
@@ -97,7 +97,7 @@ pub trait Printer<'tcx>: Sized {
         args: &[GenericArg<'tcx>],
     ) -> Result<Self::Path, Self::Error>;
 
-    // Defaults (should not be overriden):
+    // Defaults (should not be overridden):
 
     fn default_print_def_path(
         self,
diff --git a/src/librustc/ty/print/pretty.rs b/src/librustc/ty/print/pretty.rs
index db539f9195..05dcc9e85a 100644
--- a/src/librustc/ty/print/pretty.rs
+++ b/src/librustc/ty/print/pretty.rs
@@ -11,10 +11,10 @@ use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 
 use rustc_apfloat::ieee::{Double, Single};
 use rustc_apfloat::Float;
+use rustc_ast::ast;
+use rustc_attr::{SignedInt, UnsignedInt};
 use rustc_span::symbol::{kw, Symbol};
 use rustc_target::spec::abi::Abi;
-use syntax::ast;
-use syntax::attr::{SignedInt, UnsignedInt};
 
 use std::cell::Cell;
 use std::collections::BTreeMap;
@@ -64,8 +64,7 @@ thread_local! {
 /// calling the same query.
 pub fn with_no_queries<F: FnOnce() -> R, R>(f: F) -> R {
     NO_QUERIES.with(|no_queries| {
-        let old = no_queries.get();
-        no_queries.set(true);
+        let old = no_queries.replace(true);
         let result = f();
         no_queries.set(old);
         result
@@ -78,8 +77,7 @@ pub fn with_no_queries<F: FnOnce() -> R, R>(f: F) -> R {
 /// so this variable disables that check.
 pub fn with_forced_impl_filename_line<F: FnOnce() -> R, R>(f: F) -> R {
     FORCE_IMPL_FILENAME_LINE.with(|force| {
-        let old = force.get();
-        force.set(true);
+        let old = force.replace(true);
         let result = f();
         force.set(old);
         result
@@ -89,8 +87,7 @@ pub fn with_forced_impl_filename_line<F: FnOnce() -> R, R>(f: F) -> R {
 /// Adds the `crate::` prefix to paths where appropriate.
 pub fn with_crate_prefix<F: FnOnce() -> R, R>(f: F) -> R {
     SHOULD_PREFIX_WITH_CRATE.with(|flag| {
-        let old = flag.get();
-        flag.set(true);
+        let old = flag.replace(true);
         let result = f();
         flag.set(old);
         result
@@ -139,7 +136,7 @@ impl RegionHighlightMode {
     pub fn highlighting_region(&mut self, region: ty::Region<'_>, number: usize) {
         let num_slots = self.highlight_regions.len();
         let first_avail_slot =
-            self.highlight_regions.iter_mut().filter(|s| s.is_none()).next().unwrap_or_else(|| {
+            self.highlight_regions.iter_mut().find(|s| s.is_none()).unwrap_or_else(|| {
                 bug!("can only highlight {} placeholders at a time", num_slots,)
             });
         *first_avail_slot = Some((*region, number));
@@ -224,7 +221,7 @@ pub trait PrettyPrinter<'tcx>:
     /// This is typically the case for all non-`'_` regions.
     fn region_should_not_be_omitted(&self, region: ty::Region<'_>) -> bool;
 
-    // Defaults (should not be overriden):
+    // Defaults (should not be overridden):
 
     /// If possible, this returns a global path resolving to `def_id` that is visible
     /// from at least one local module, and returns `true`. If the crate defining `def_id` is
@@ -239,7 +236,7 @@ pub trait PrettyPrinter<'tcx>:
     /// post-process it into the valid and visible version that
     /// accounts for re-exports.
     ///
-    /// This method should only be callled by itself or
+    /// This method should only be called by itself or
     /// `try_print_visible_def_path`.
     ///
     /// `callers` is a chain of visible_parent's leading to `def_id`,
@@ -688,7 +685,7 @@ pub trait PrettyPrinter<'tcx>:
                 if self.tcx().sess.verbose() {
                     p!(write("{:?}", sz));
                 } else if let ty::ConstKind::Unevaluated(..) = sz.val {
-                    // do not try to evalute unevaluated constants. If we are const evaluating an
+                    // do not try to evaluate unevaluated constants. If we are const evaluating an
                     // array length anon const, rustc will (with debug assertions) print the
                     // constant's path. Which will end up here again.
                     p!(write("_"));
@@ -724,7 +721,7 @@ pub trait PrettyPrinter<'tcx>:
             let mut resugared = false;
 
             // Special-case `Fn(...) -> ...` and resugar it.
-            let fn_trait_kind = self.tcx().lang_items().fn_trait_kind(principal.def_id);
+            let fn_trait_kind = self.tcx().fn_trait_kind_from_lang_item(principal.def_id);
             if !self.tcx().sess.verbose() && fn_trait_kind.is_some() {
                 if let ty::Tuple(ref args) = principal.substs.type_at(0).kind {
                     let mut projections = predicates.projection_bounds();
@@ -923,7 +920,7 @@ pub trait PrettyPrinter<'tcx>:
             }
             (ConstValue::Scalar(Scalar::Raw { data, .. }), ty::Uint(ui)) => {
                 let bit_size = Integer::from_attr(&self.tcx(), UnsignedInt(*ui)).size();
-                let max = truncate(u128::max_value(), bit_size);
+                let max = truncate(u128::MAX, bit_size);
 
                 let ui_str = ui.name_str();
                 if data == max {
@@ -1382,7 +1379,7 @@ impl<F: fmt::Write> PrettyPrinter<'tcx> for FmtPrinter<'_, 'tcx, F> {
 
             ty::ReVar(_) | ty::ReScope(_) | ty::ReErased => false,
 
-            ty::ReStatic | ty::ReEmpty | ty::ReClosureBound(_) => true,
+            ty::ReStatic | ty::ReEmpty(_) | ty::ReClosureBound(_) => true,
         }
     }
 }
@@ -1464,10 +1461,14 @@ impl<F: fmt::Write> FmtPrinter<'_, '_, F> {
                 p!(write("'static"));
                 return Ok(self);
             }
-            ty::ReEmpty => {
+            ty::ReEmpty(ty::UniverseIndex::ROOT) => {
                 p!(write("'<empty>"));
                 return Ok(self);
             }
+            ty::ReEmpty(ui) => {
+                p!(write("'<empty:{:?}>", ui));
+                return Ok(self);
+            }
 
             // The user should never encounter these in unsubstituted form.
             ty::ReClosureBound(vid) => {
@@ -1814,7 +1815,7 @@ define_print_and_forward_display! {
     ty::Predicate<'tcx> {
         match *self {
             ty::Predicate::Trait(ref data, constness) => {
-                if let ast::Constness::Const = constness {
+                if let hir::Constness::Const = constness {
                     p!(write("const "));
                 }
                 p!(print(data))
diff --git a/src/librustc/ty/query/caches.rs b/src/librustc/ty/query/caches.rs
new file mode 100644
index 0000000000..efc2804bd4
--- /dev/null
+++ b/src/librustc/ty/query/caches.rs
@@ -0,0 +1,112 @@
+use crate::dep_graph::DepNodeIndex;
+use crate::ty::query::config::QueryAccessors;
+use crate::ty::query::plumbing::{QueryLookup, QueryState, QueryStateShard};
+use crate::ty::TyCtxt;
+
+use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::sharded::Sharded;
+use std::default::Default;
+use std::hash::Hash;
+
+pub(crate) trait CacheSelector<K, V> {
+    type Cache: QueryCache<K, V>;
+}
+
+pub(crate) trait QueryCache<K, V>: Default {
+    type Sharded: Default;
+
+    /// Checks if the query is already computed and in the cache.
+    /// It returns the shard index and a lock guard to the shard,
+    /// which will be used if the query is not in the cache and we need
+    /// to compute it.
+    fn lookup<'tcx, R, GetCache, OnHit, OnMiss, Q>(
+        &self,
+        state: &'tcx QueryState<'tcx, Q>,
+        get_cache: GetCache,
+        key: K,
+        // `on_hit` can be called while holding a lock to the query state shard.
+        on_hit: OnHit,
+        on_miss: OnMiss,
+    ) -> R
+    where
+        Q: QueryAccessors<'tcx>,
+        GetCache: for<'a> Fn(&'a mut QueryStateShard<'tcx, Q>) -> &'a mut Self::Sharded,
+        OnHit: FnOnce(&V, DepNodeIndex) -> R,
+        OnMiss: FnOnce(K, QueryLookup<'tcx, Q>) -> R;
+
+    fn complete(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        lock_sharded_storage: &mut Self::Sharded,
+        key: K,
+        value: V,
+        index: DepNodeIndex,
+    );
+
+    fn iter<R, L>(
+        &self,
+        shards: &Sharded<L>,
+        get_shard: impl Fn(&mut L) -> &mut Self::Sharded,
+        f: impl for<'a> FnOnce(Box<dyn Iterator<Item = (&'a K, &'a V, DepNodeIndex)> + 'a>) -> R,
+    ) -> R;
+}
+
+pub struct DefaultCacheSelector;
+
+impl<K: Eq + Hash, V: Clone> CacheSelector<K, V> for DefaultCacheSelector {
+    type Cache = DefaultCache;
+}
+
+#[derive(Default)]
+pub struct DefaultCache;
+
+impl<K: Eq + Hash, V: Clone> QueryCache<K, V> for DefaultCache {
+    type Sharded = FxHashMap<K, (V, DepNodeIndex)>;
+
+    #[inline(always)]
+    fn lookup<'tcx, R, GetCache, OnHit, OnMiss, Q>(
+        &self,
+        state: &'tcx QueryState<'tcx, Q>,
+        get_cache: GetCache,
+        key: K,
+        on_hit: OnHit,
+        on_miss: OnMiss,
+    ) -> R
+    where
+        Q: QueryAccessors<'tcx>,
+        GetCache: for<'a> Fn(&'a mut QueryStateShard<'tcx, Q>) -> &'a mut Self::Sharded,
+        OnHit: FnOnce(&V, DepNodeIndex) -> R,
+        OnMiss: FnOnce(K, QueryLookup<'tcx, Q>) -> R,
+    {
+        let mut lookup = state.get_lookup(&key);
+        let lock = &mut *lookup.lock;
+
+        let result = get_cache(lock).raw_entry().from_key_hashed_nocheck(lookup.key_hash, &key);
+
+        if let Some((_, value)) = result { on_hit(&value.0, value.1) } else { on_miss(key, lookup) }
+    }
+
+    #[inline]
+    fn complete(
+        &self,
+        _: TyCtxt<'tcx>,
+        lock_sharded_storage: &mut Self::Sharded,
+        key: K,
+        value: V,
+        index: DepNodeIndex,
+    ) {
+        lock_sharded_storage.insert(key, (value, index));
+    }
+
+    fn iter<R, L>(
+        &self,
+        shards: &Sharded<L>,
+        get_shard: impl Fn(&mut L) -> &mut Self::Sharded,
+        f: impl for<'a> FnOnce(Box<dyn Iterator<Item = (&'a K, &'a V, DepNodeIndex)> + 'a>) -> R,
+    ) -> R {
+        let mut shards = shards.lock_shards();
+        let mut shards: Vec<_> = shards.iter_mut().map(|shard| get_shard(shard)).collect();
+        let results = shards.iter_mut().flat_map(|shard| shard.iter()).map(|(k, v)| (k, &v.0, v.1));
+        f(Box::new(results))
+    }
+}
diff --git a/src/librustc/ty/query/config.rs b/src/librustc/ty/query/config.rs
index dbb6a1080e..178c2362de 100644
--- a/src/librustc/ty/query/config.rs
+++ b/src/librustc/ty/query/config.rs
@@ -1,15 +1,14 @@
 use crate::dep_graph::SerializedDepNodeIndex;
 use crate::dep_graph::{DepKind, DepNode};
+use crate::ty::query::caches::QueryCache;
 use crate::ty::query::plumbing::CycleError;
-use crate::ty::query::queries;
-use crate::ty::query::{Query, QueryCache};
+use crate::ty::query::{Query, QueryState};
 use crate::ty::TyCtxt;
 use rustc_data_structures::profiling::ProfileCategory;
-use rustc_hir::def_id::{CrateNum, DefId};
+use rustc_hir::def_id::DefId;
 
 use crate::ich::StableHashingContext;
 use rustc_data_structures::fingerprint::Fingerprint;
-use rustc_data_structures::sharded::Sharded;
 use std::borrow::Cow;
 use std::fmt::Debug;
 use std::hash::Hash;
@@ -30,10 +29,12 @@ pub(crate) trait QueryAccessors<'tcx>: QueryConfig<'tcx> {
     const ANON: bool;
     const EVAL_ALWAYS: bool;
 
+    type Cache: QueryCache<Self::Key, Self::Value>;
+
     fn query(key: Self::Key) -> Query<'tcx>;
 
     // Don't use this method to access query results, instead use the methods on TyCtxt
-    fn query_cache<'a>(tcx: TyCtxt<'tcx>) -> &'a Sharded<QueryCache<'tcx, Self>>;
+    fn query_state<'a>(tcx: TyCtxt<'tcx>) -> &'a QueryState<'tcx, Self>;
 
     fn to_dep_node(tcx: TyCtxt<'tcx>, key: &Self::Key) -> DepNode;
 
@@ -61,7 +62,10 @@ pub(crate) trait QueryDescription<'tcx>: QueryAccessors<'tcx> {
     }
 }
 
-impl<'tcx, M: QueryAccessors<'tcx, Key = DefId>> QueryDescription<'tcx> for M {
+impl<'tcx, M: QueryAccessors<'tcx, Key = DefId>> QueryDescription<'tcx> for M
+where
+    <M as QueryAccessors<'tcx>>::Cache: QueryCache<DefId, <M as QueryConfig<'tcx>>::Value>,
+{
     default fn describe(tcx: TyCtxt<'_>, def_id: DefId) -> Cow<'static, str> {
         if !tcx.sess.verbose() {
             format!("processing `{}`", tcx.def_path_str(def_id)).into()
@@ -82,9 +86,3 @@ impl<'tcx, M: QueryAccessors<'tcx, Key = DefId>> QueryDescription<'tcx> for M {
         bug!("QueryDescription::load_from_disk() called for an unsupported query.")
     }
 }
-
-impl<'tcx> QueryDescription<'tcx> for queries::analysis<'tcx> {
-    fn describe(_tcx: TyCtxt<'_>, _: CrateNum) -> Cow<'static, str> {
-        "running analysis passes on this crate".into()
-    }
-}
diff --git a/src/librustc/ty/query/job.rs b/src/librustc/ty/query/job.rs
index dd8274dcf2..4e88fc5463 100644
--- a/src/librustc/ty/query/job.rs
+++ b/src/librustc/ty/query/job.rs
@@ -1,13 +1,15 @@
+use crate::dep_graph::DepKind;
 use crate::ty::context::TyCtxt;
 use crate::ty::query::plumbing::CycleError;
 use crate::ty::query::Query;
 use crate::ty::tls;
 
-use rustc_data_structures::sync::Lrc;
+use rustc_data_structures::fx::FxHashMap;
 use rustc_span::Span;
 
-#[cfg(not(parallel_compiler))]
-use std::ptr;
+use std::convert::TryFrom;
+use std::marker::PhantomData;
+use std::num::NonZeroU32;
 
 #[cfg(parallel_compiler)]
 use {
@@ -15,6 +17,7 @@ use {
     rustc_data_structures::fx::FxHashSet,
     rustc_data_structures::stable_hasher::{HashStable, StableHasher},
     rustc_data_structures::sync::Lock,
+    rustc_data_structures::sync::Lrc,
     rustc_data_structures::{jobserver, OnDrop},
     rustc_rayon_core as rayon_core,
     rustc_span::DUMMY_SP,
@@ -30,61 +33,130 @@ pub struct QueryInfo<'tcx> {
     pub query: Query<'tcx>,
 }
 
-/// Representss an object representing an active query job.
-pub struct QueryJob<'tcx> {
+type QueryMap<'tcx> = FxHashMap<QueryJobId, QueryJobInfo<'tcx>>;
+
+/// A value uniquely identifiying an active query job within a shard in the query cache.
+#[derive(Copy, Clone, Eq, PartialEq, Hash)]
+pub struct QueryShardJobId(pub NonZeroU32);
+
+/// A value uniquely identifiying an active query job.
+#[derive(Copy, Clone, Eq, PartialEq, Hash)]
+pub struct QueryJobId {
+    /// Which job within a shard is this
+    pub job: QueryShardJobId,
+
+    /// In which shard is this job
+    pub shard: u16,
+
+    /// What kind of query this job is
+    pub kind: DepKind,
+}
+
+impl QueryJobId {
+    pub fn new(job: QueryShardJobId, shard: usize, kind: DepKind) -> Self {
+        QueryJobId { job, shard: u16::try_from(shard).unwrap(), kind }
+    }
+
+    fn query<'tcx>(self, map: &QueryMap<'tcx>) -> Query<'tcx> {
+        map.get(&self).unwrap().info.query.clone()
+    }
+
+    #[cfg(parallel_compiler)]
+    fn span(self, map: &QueryMap<'_>) -> Span {
+        map.get(&self).unwrap().job.span
+    }
+
+    #[cfg(parallel_compiler)]
+    fn parent(self, map: &QueryMap<'_>) -> Option<QueryJobId> {
+        map.get(&self).unwrap().job.parent
+    }
+
+    #[cfg(parallel_compiler)]
+    fn latch<'a, 'tcx>(self, map: &'a QueryMap<'tcx>) -> Option<&'a QueryLatch<'tcx>> {
+        map.get(&self).unwrap().job.latch.as_ref()
+    }
+}
+
+pub struct QueryJobInfo<'tcx> {
     pub info: QueryInfo<'tcx>,
+    pub job: QueryJob<'tcx>,
+}
+
+/// Represents an active query job.
+#[derive(Clone)]
+pub struct QueryJob<'tcx> {
+    pub id: QueryShardJobId,
+
+    /// The span corresponding to the reason for which this query was required.
+    pub span: Span,
 
     /// The parent query job which created this job and is implicitly waiting on it.
-    pub parent: Option<Lrc<QueryJob<'tcx>>>,
+    pub parent: Option<QueryJobId>,
 
     /// The latch that is used to wait on this job.
     #[cfg(parallel_compiler)]
-    latch: QueryLatch<'tcx>,
+    latch: Option<QueryLatch<'tcx>>,
+
+    dummy: PhantomData<QueryLatch<'tcx>>,
 }
 
 impl<'tcx> QueryJob<'tcx> {
     /// Creates a new query job.
-    pub fn new(info: QueryInfo<'tcx>, parent: Option<Lrc<QueryJob<'tcx>>>) -> Self {
+    pub fn new(id: QueryShardJobId, span: Span, parent: Option<QueryJobId>) -> Self {
         QueryJob {
-            info,
+            id,
+            span,
             parent,
             #[cfg(parallel_compiler)]
-            latch: QueryLatch::new(),
+            latch: None,
+            dummy: PhantomData,
         }
     }
 
-    /// Awaits for the query job to complete.
     #[cfg(parallel_compiler)]
-    pub(super) fn r#await(&self, tcx: TyCtxt<'tcx>, span: Span) -> Result<(), CycleError<'tcx>> {
-        tls::with_related_context(tcx, move |icx| {
-            let waiter = Lrc::new(QueryWaiter {
-                query: icx.query.clone(),
-                span,
-                cycle: Lock::new(None),
-                condvar: Condvar::new(),
-            });
-            self.latch.r#await(&waiter);
-            // FIXME: Get rid of this lock. We have ownership of the QueryWaiter
-            // although another thread may still have a Lrc reference so we cannot
-            // use Lrc::get_mut
-            let mut cycle = waiter.cycle.lock();
-            match cycle.take() {
-                None => Ok(()),
-                Some(cycle) => Err(cycle),
-            }
-        })
+    pub(super) fn latch(&mut self, _id: QueryJobId) -> QueryLatch<'tcx> {
+        if self.latch.is_none() {
+            self.latch = Some(QueryLatch::new());
+        }
+        self.latch.as_ref().unwrap().clone()
     }
 
     #[cfg(not(parallel_compiler))]
+    pub(super) fn latch(&mut self, id: QueryJobId) -> QueryLatch<'tcx> {
+        QueryLatch { id, dummy: PhantomData }
+    }
+
+    /// Signals to waiters that the query is complete.
+    ///
+    /// This does nothing for single threaded rustc,
+    /// as there are no concurrent jobs which could be waiting on us
+    pub fn signal_complete(self) {
+        #[cfg(parallel_compiler)]
+        self.latch.map(|latch| latch.set());
+    }
+}
+
+#[cfg(not(parallel_compiler))]
+#[derive(Clone)]
+pub(super) struct QueryLatch<'tcx> {
+    id: QueryJobId,
+    dummy: PhantomData<&'tcx ()>,
+}
+
+#[cfg(not(parallel_compiler))]
+impl<'tcx> QueryLatch<'tcx> {
     pub(super) fn find_cycle_in_stack(&self, tcx: TyCtxt<'tcx>, span: Span) -> CycleError<'tcx> {
+        let query_map = tcx.queries.try_collect_active_jobs().unwrap();
+
         // Get the current executing query (waiter) and find the waitee amongst its parents
-        let mut current_job = tls::with_related_context(tcx, |icx| icx.query.clone());
+        let mut current_job = tls::with_related_context(tcx, |icx| icx.query);
         let mut cycle = Vec::new();
 
         while let Some(job) = current_job {
-            cycle.push(job.info.clone());
+            let info = query_map.get(&job).unwrap();
+            cycle.push(info.info.clone());
 
-            if ptr::eq(&*job, self) {
+            if job == self.id {
                 cycle.reverse();
 
                 // This is the end of the cycle
@@ -93,35 +165,24 @@ impl<'tcx> QueryJob<'tcx> {
                 // Replace it with the span which caused the cycle to form
                 cycle[0].span = span;
                 // Find out why the cycle itself was used
-                let usage =
-                    job.parent.as_ref().map(|parent| (job.info.span, parent.info.query.clone()));
+                let usage = info
+                    .job
+                    .parent
+                    .as_ref()
+                    .map(|parent| (info.info.span, parent.query(&query_map)));
                 return CycleError { usage, cycle };
             }
 
-            current_job = job.parent.clone();
+            current_job = info.job.parent;
         }
 
         panic!("did not find a cycle")
     }
-
-    /// Signals to waiters that the query is complete.
-    ///
-    /// This does nothing for single threaded rustc,
-    /// as there are no concurrent jobs which could be waiting on us
-    pub fn signal_complete(&self) {
-        #[cfg(parallel_compiler)]
-        self.latch.set();
-    }
-
-    #[cfg(parallel_compiler)]
-    fn as_ptr(&self) -> *const QueryJob<'tcx> {
-        self as *const _
-    }
 }
 
 #[cfg(parallel_compiler)]
 struct QueryWaiter<'tcx> {
-    query: Option<Lrc<QueryJob<'tcx>>>,
+    query: Option<QueryJobId>,
     condvar: Condvar,
     span: Span,
     cycle: Lock<Option<CycleError<'tcx>>>,
@@ -142,18 +203,43 @@ struct QueryLatchInfo<'tcx> {
 }
 
 #[cfg(parallel_compiler)]
-struct QueryLatch<'tcx> {
-    info: Mutex<QueryLatchInfo<'tcx>>,
+#[derive(Clone)]
+pub(super) struct QueryLatch<'tcx> {
+    info: Lrc<Mutex<QueryLatchInfo<'tcx>>>,
 }
 
 #[cfg(parallel_compiler)]
 impl<'tcx> QueryLatch<'tcx> {
     fn new() -> Self {
-        QueryLatch { info: Mutex::new(QueryLatchInfo { complete: false, waiters: Vec::new() }) }
+        QueryLatch {
+            info: Lrc::new(Mutex::new(QueryLatchInfo { complete: false, waiters: Vec::new() })),
+        }
+    }
+
+    /// Awaits for the query job to complete.
+    #[cfg(parallel_compiler)]
+    pub(super) fn wait_on(&self, tcx: TyCtxt<'tcx>, span: Span) -> Result<(), CycleError<'tcx>> {
+        tls::with_related_context(tcx, move |icx| {
+            let waiter = Lrc::new(QueryWaiter {
+                query: icx.query,
+                span,
+                cycle: Lock::new(None),
+                condvar: Condvar::new(),
+            });
+            self.wait_on_inner(&waiter);
+            // FIXME: Get rid of this lock. We have ownership of the QueryWaiter
+            // although another thread may still have a Lrc reference so we cannot
+            // use Lrc::get_mut
+            let mut cycle = waiter.cycle.lock();
+            match cycle.take() {
+                None => Ok(()),
+                Some(cycle) => Err(cycle),
+            }
+        })
     }
 
     /// Awaits the caller on this latch by blocking the current thread.
-    fn r#await(&self, waiter: &Lrc<QueryWaiter<'tcx>>) {
+    fn wait_on_inner(&self, waiter: &Lrc<QueryWaiter<'tcx>>) {
         let mut info = self.info.lock();
         if !info.complete {
             // We push the waiter on to the `waiters` list. It can be accessed inside
@@ -197,7 +283,7 @@ impl<'tcx> QueryLatch<'tcx> {
 
 /// A resumable waiter of a query. The usize is the index into waiters in the query's latch
 #[cfg(parallel_compiler)]
-type Waiter<'tcx> = (Lrc<QueryJob<'tcx>>, usize);
+type Waiter = (QueryJobId, usize);
 
 /// Visits all the non-resumable and resumable waiters of a query.
 /// Only waiters in a query are visited.
@@ -209,26 +295,33 @@ type Waiter<'tcx> = (Lrc<QueryJob<'tcx>>, usize);
 /// required information to resume the waiter.
 /// If all `visit` calls returns None, this function also returns None.
 #[cfg(parallel_compiler)]
-fn visit_waiters<'tcx, F>(query: Lrc<QueryJob<'tcx>>, mut visit: F) -> Option<Option<Waiter<'tcx>>>
+fn visit_waiters<'tcx, F>(
+    query_map: &QueryMap<'tcx>,
+    query: QueryJobId,
+    mut visit: F,
+) -> Option<Option<Waiter>>
 where
-    F: FnMut(Span, Lrc<QueryJob<'tcx>>) -> Option<Option<Waiter<'tcx>>>,
+    F: FnMut(Span, QueryJobId) -> Option<Option<Waiter>>,
 {
     // Visit the parent query which is a non-resumable waiter since it's on the same stack
-    if let Some(ref parent) = query.parent {
-        if let Some(cycle) = visit(query.info.span, parent.clone()) {
+    if let Some(parent) = query.parent(query_map) {
+        if let Some(cycle) = visit(query.span(query_map), parent) {
             return Some(cycle);
         }
     }
 
     // Visit the explicit waiters which use condvars and are resumable
-    for (i, waiter) in query.latch.info.lock().waiters.iter().enumerate() {
-        if let Some(ref waiter_query) = waiter.query {
-            if visit(waiter.span, waiter_query.clone()).is_some() {
-                // Return a value which indicates that this waiter can be resumed
-                return Some(Some((query.clone(), i)));
+    if let Some(latch) = query.latch(query_map) {
+        for (i, waiter) in latch.info.lock().waiters.iter().enumerate() {
+            if let Some(waiter_query) = waiter.query {
+                if visit(waiter.span, waiter_query).is_some() {
+                    // Return a value which indicates that this waiter can be resumed
+                    return Some(Some((query, i)));
+                }
             }
         }
     }
+
     None
 }
 
@@ -238,13 +331,14 @@ where
 /// the cycle.
 #[cfg(parallel_compiler)]
 fn cycle_check<'tcx>(
-    query: Lrc<QueryJob<'tcx>>,
+    query_map: &QueryMap<'tcx>,
+    query: QueryJobId,
     span: Span,
-    stack: &mut Vec<(Span, Lrc<QueryJob<'tcx>>)>,
-    visited: &mut FxHashSet<*const QueryJob<'tcx>>,
-) -> Option<Option<Waiter<'tcx>>> {
-    if !visited.insert(query.as_ptr()) {
-        return if let Some(p) = stack.iter().position(|q| q.1.as_ptr() == query.as_ptr()) {
+    stack: &mut Vec<(Span, QueryJobId)>,
+    visited: &mut FxHashSet<QueryJobId>,
+) -> Option<Option<Waiter>> {
+    if !visited.insert(query) {
+        return if let Some(p) = stack.iter().position(|q| q.1 == query) {
             // We detected a query cycle, fix up the initial span and return Some
 
             // Remove previous stack entries
@@ -258,10 +352,12 @@ fn cycle_check<'tcx>(
     }
 
     // Query marked as visited is added it to the stack
-    stack.push((span, query.clone()));
+    stack.push((span, query));
 
     // Visit all the waiters
-    let r = visit_waiters(query, |span, successor| cycle_check(successor, span, stack, visited));
+    let r = visit_waiters(query_map, query, |span, successor| {
+        cycle_check(query_map, successor, span, stack, visited)
+    });
 
     // Remove the entry in our stack if we didn't find a cycle
     if r.is_none() {
@@ -276,26 +372,30 @@ fn cycle_check<'tcx>(
 /// This is achieved with a depth first search.
 #[cfg(parallel_compiler)]
 fn connected_to_root<'tcx>(
-    query: Lrc<QueryJob<'tcx>>,
-    visited: &mut FxHashSet<*const QueryJob<'tcx>>,
+    query_map: &QueryMap<'tcx>,
+    query: QueryJobId,
+    visited: &mut FxHashSet<QueryJobId>,
 ) -> bool {
     // We already visited this or we're deliberately ignoring it
-    if !visited.insert(query.as_ptr()) {
+    if !visited.insert(query) {
         return false;
     }
 
     // This query is connected to the root (it has no query parent), return true
-    if query.parent.is_none() {
+    if query.parent(query_map).is_none() {
         return true;
     }
 
-    visit_waiters(query, |_, successor| connected_to_root(successor, visited).then_some(None))
-        .is_some()
+    visit_waiters(query_map, query, |_, successor| {
+        connected_to_root(query_map, successor, visited).then_some(None)
+    })
+    .is_some()
 }
 
 // Deterministically pick an query from a list
 #[cfg(parallel_compiler)]
-fn pick_query<'a, 'tcx, T, F: Fn(&T) -> (Span, Lrc<QueryJob<'tcx>>)>(
+fn pick_query<'a, 'tcx, T, F: Fn(&T) -> (Span, QueryJobId)>(
+    query_map: &QueryMap<'tcx>,
     tcx: TyCtxt<'tcx>,
     queries: &'a [T],
     f: F,
@@ -308,7 +408,7 @@ fn pick_query<'a, 'tcx, T, F: Fn(&T) -> (Span, Lrc<QueryJob<'tcx>>)>(
         .min_by_key(|v| {
             let (span, query) = f(v);
             let mut stable_hasher = StableHasher::new();
-            query.info.query.hash_stable(&mut hcx, &mut stable_hasher);
+            query.query(query_map).hash_stable(&mut hcx, &mut stable_hasher);
             // Prefer entry points which have valid spans for nicer error messages
             // We add an integer to the tuple ensuring that entry points
             // with valid spans are picked first
@@ -325,14 +425,17 @@ fn pick_query<'a, 'tcx, T, F: Fn(&T) -> (Span, Lrc<QueryJob<'tcx>>)>(
 /// the function returns false.
 #[cfg(parallel_compiler)]
 fn remove_cycle<'tcx>(
-    jobs: &mut Vec<Lrc<QueryJob<'tcx>>>,
+    query_map: &QueryMap<'tcx>,
+    jobs: &mut Vec<QueryJobId>,
     wakelist: &mut Vec<Lrc<QueryWaiter<'tcx>>>,
     tcx: TyCtxt<'tcx>,
 ) -> bool {
     let mut visited = FxHashSet::default();
     let mut stack = Vec::new();
     // Look for a cycle starting with the last query in `jobs`
-    if let Some(waiter) = cycle_check(jobs.pop().unwrap(), DUMMY_SP, &mut stack, &mut visited) {
+    if let Some(waiter) =
+        cycle_check(query_map, jobs.pop().unwrap(), DUMMY_SP, &mut stack, &mut visited)
+    {
         // The stack is a vector of pairs of spans and queries; reverse it so that
         // the earlier entries require later entries
         let (mut spans, queries): (Vec<_>, Vec<_>) = stack.into_iter().rev().unzip();
@@ -345,27 +448,25 @@ fn remove_cycle<'tcx>(
 
         // Remove the queries in our cycle from the list of jobs to look at
         for r in &stack {
-            if let Some(pos) = jobs.iter().position(|j| j.as_ptr() == r.1.as_ptr()) {
-                jobs.remove(pos);
-            }
+            jobs.remove_item(&r.1);
         }
 
         // Find the queries in the cycle which are
         // connected to queries outside the cycle
         let entry_points = stack
             .iter()
-            .filter_map(|(span, query)| {
-                if query.parent.is_none() {
+            .filter_map(|&(span, query)| {
+                if query.parent(query_map).is_none() {
                     // This query is connected to the root (it has no query parent)
-                    Some((*span, query.clone(), None))
+                    Some((span, query, None))
                 } else {
                     let mut waiters = Vec::new();
                     // Find all the direct waiters who lead to the root
-                    visit_waiters(query.clone(), |span, waiter| {
+                    visit_waiters(query_map, query, |span, waiter| {
                         // Mark all the other queries in the cycle as already visited
-                        let mut visited = FxHashSet::from_iter(stack.iter().map(|q| q.1.as_ptr()));
+                        let mut visited = FxHashSet::from_iter(stack.iter().map(|q| q.1));
 
-                        if connected_to_root(waiter.clone(), &mut visited) {
+                        if connected_to_root(query_map, waiter, &mut visited) {
                             waiters.push((span, waiter));
                         }
 
@@ -375,31 +476,30 @@ fn remove_cycle<'tcx>(
                         None
                     } else {
                         // Deterministically pick one of the waiters to show to the user
-                        let waiter = pick_query(tcx, &waiters, |s| s.clone()).clone();
-                        Some((*span, query.clone(), Some(waiter)))
+                        let waiter = *pick_query(query_map, tcx, &waiters, |s| *s);
+                        Some((span, query, Some(waiter)))
                     }
                 }
             })
-            .collect::<Vec<(Span, Lrc<QueryJob<'tcx>>, Option<(Span, Lrc<QueryJob<'tcx>>)>)>>();
+            .collect::<Vec<(Span, QueryJobId, Option<(Span, QueryJobId)>)>>();
 
         // Deterministically pick an entry point
-        let (_, entry_point, usage) = pick_query(tcx, &entry_points, |e| (e.0, e.1.clone()));
+        let (_, entry_point, usage) = pick_query(query_map, tcx, &entry_points, |e| (e.0, e.1));
 
         // Shift the stack so that our entry point is first
-        let entry_point_pos =
-            stack.iter().position(|(_, query)| query.as_ptr() == entry_point.as_ptr());
+        let entry_point_pos = stack.iter().position(|(_, query)| query == entry_point);
         if let Some(pos) = entry_point_pos {
             stack.rotate_left(pos);
         }
 
-        let usage = usage.as_ref().map(|(span, query)| (*span, query.info.query.clone()));
+        let usage = usage.as_ref().map(|(span, query)| (*span, query.query(query_map)));
 
         // Create the cycle error
         let error = CycleError {
             usage,
             cycle: stack
                 .iter()
-                .map(|&(s, ref q)| QueryInfo { span: s, query: q.info.query.clone() })
+                .map(|&(s, ref q)| QueryInfo { span: s, query: q.query(query_map) })
                 .collect(),
         };
 
@@ -408,7 +508,7 @@ fn remove_cycle<'tcx>(
         let (waitee_query, waiter_idx) = waiter.unwrap();
 
         // Extract the waiter we want to resume
-        let waiter = waitee_query.latch.extract_waiter(waiter_idx);
+        let waiter = waitee_query.latch(query_map).unwrap().extract_waiter(waiter_idx);
 
         // Set the cycle error so it will be picked up when resumed
         *waiter.cycle.lock() = Some(error);
@@ -435,11 +535,11 @@ pub unsafe fn handle_deadlock() {
     let rustc_span_globals =
         rustc_span::GLOBALS.with(|rustc_span_globals| rustc_span_globals as *const _);
     let rustc_span_globals = &*rustc_span_globals;
-    let syntax_globals = syntax::GLOBALS.with(|syntax_globals| syntax_globals as *const _);
+    let syntax_globals = rustc_ast::attr::GLOBALS.with(|syntax_globals| syntax_globals as *const _);
     let syntax_globals = &*syntax_globals;
     thread::spawn(move || {
         tls::GCX_PTR.set(gcx_ptr, || {
-            syntax::GLOBALS.set(syntax_globals, || {
+            rustc_ast::attr::GLOBALS.set(syntax_globals, || {
                 rustc_span::GLOBALS
                     .set(rustc_span_globals, || tls::with_global(|tcx| deadlock(tcx, &registry)))
             });
@@ -460,12 +560,13 @@ fn deadlock(tcx: TyCtxt<'_>, registry: &rayon_core::Registry) {
     });
 
     let mut wakelist = Vec::new();
-    let mut jobs: Vec<_> = tcx.queries.collect_active_jobs();
+    let query_map = tcx.queries.try_collect_active_jobs().unwrap();
+    let mut jobs: Vec<QueryJobId> = query_map.keys().cloned().collect();
 
     let mut found_cycle = false;
 
     while jobs.len() > 0 {
-        if remove_cycle(&mut jobs, &mut wakelist, tcx) {
+        if remove_cycle(&query_map, &mut jobs, &mut wakelist, tcx) {
             found_cycle = true;
         }
     }
diff --git a/src/librustc/ty/query/keys.rs b/src/librustc/ty/query/keys.rs
index c1c88e96f9..09fb307a1c 100644
--- a/src/librustc/ty/query/keys.rs
+++ b/src/librustc/ty/query/keys.rs
@@ -4,6 +4,7 @@ use crate::infer::canonical::Canonical;
 use crate::mir;
 use crate::traits;
 use crate::ty::fast_reject::SimplifiedType;
+use crate::ty::query::caches::DefaultCacheSelector;
 use crate::ty::subst::SubstsRef;
 use crate::ty::{self, Ty, TyCtxt};
 use rustc_hir::def_id::{CrateNum, DefId, DefIndex, LOCAL_CRATE};
@@ -12,7 +13,9 @@ use rustc_span::{Span, DUMMY_SP};
 
 /// The `Key` trait controls what types can legally be used as the key
 /// for a query.
-pub(super) trait Key {
+pub trait Key {
+    type CacheSelector;
+
     /// Given an instance of this key, what crate is it referring to?
     /// This is used to find the provider.
     fn query_crate(&self) -> CrateNum;
@@ -23,6 +26,8 @@ pub(super) trait Key {
 }
 
 impl<'tcx> Key for ty::InstanceDef<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -33,6 +38,8 @@ impl<'tcx> Key for ty::InstanceDef<'tcx> {
 }
 
 impl<'tcx> Key for ty::Instance<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -43,6 +50,8 @@ impl<'tcx> Key for ty::Instance<'tcx> {
 }
 
 impl<'tcx> Key for mir::interpret::GlobalId<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.instance.query_crate()
     }
@@ -53,6 +62,8 @@ impl<'tcx> Key for mir::interpret::GlobalId<'tcx> {
 }
 
 impl<'tcx> Key for mir::interpret::LitToConstInput<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -63,6 +74,8 @@ impl<'tcx> Key for mir::interpret::LitToConstInput<'tcx> {
 }
 
 impl Key for CrateNum {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         *self
     }
@@ -72,6 +85,8 @@ impl Key for CrateNum {
 }
 
 impl Key for DefIndex {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -81,6 +96,8 @@ impl Key for DefIndex {
 }
 
 impl Key for DefId {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.krate
     }
@@ -90,6 +107,8 @@ impl Key for DefId {
 }
 
 impl Key for (DefId, DefId) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.0.krate
     }
@@ -99,6 +118,8 @@ impl Key for (DefId, DefId) {
 }
 
 impl Key for (CrateNum, DefId) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.0
     }
@@ -108,6 +129,8 @@ impl Key for (CrateNum, DefId) {
 }
 
 impl Key for (DefId, SimplifiedType) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.0.krate
     }
@@ -117,6 +140,8 @@ impl Key for (DefId, SimplifiedType) {
 }
 
 impl<'tcx> Key for SubstsRef<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -126,6 +151,8 @@ impl<'tcx> Key for SubstsRef<'tcx> {
 }
 
 impl<'tcx> Key for (DefId, SubstsRef<'tcx>) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.0.krate
     }
@@ -135,6 +162,8 @@ impl<'tcx> Key for (DefId, SubstsRef<'tcx>) {
 }
 
 impl<'tcx> Key for (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.1.def_id().krate
     }
@@ -144,6 +173,8 @@ impl<'tcx> Key for (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>) {
 }
 
 impl<'tcx> Key for (&'tcx ty::Const<'tcx>, mir::Field) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -153,6 +184,8 @@ impl<'tcx> Key for (&'tcx ty::Const<'tcx>, mir::Field) {
 }
 
 impl<'tcx> Key for ty::PolyTraitRef<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.def_id().krate
     }
@@ -162,6 +195,8 @@ impl<'tcx> Key for ty::PolyTraitRef<'tcx> {
 }
 
 impl<'tcx> Key for &'tcx ty::Const<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -171,6 +206,8 @@ impl<'tcx> Key for &'tcx ty::Const<'tcx> {
 }
 
 impl<'tcx> Key for Ty<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -180,6 +217,8 @@ impl<'tcx> Key for Ty<'tcx> {
 }
 
 impl<'tcx> Key for ty::ParamEnv<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -189,6 +228,8 @@ impl<'tcx> Key for ty::ParamEnv<'tcx> {
 }
 
 impl<'tcx, T: Key> Key for ty::ParamEnvAnd<'tcx, T> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         self.value.query_crate()
     }
@@ -198,6 +239,8 @@ impl<'tcx, T: Key> Key for ty::ParamEnvAnd<'tcx, T> {
 }
 
 impl<'tcx> Key for traits::Environment<'tcx> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -207,6 +250,8 @@ impl<'tcx> Key for traits::Environment<'tcx> {
 }
 
 impl Key for Symbol {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -218,6 +263,8 @@ impl Key for Symbol {
 /// Canonical query goals correspond to abstract trait operations that
 /// are not tied to any crate in particular.
 impl<'tcx, T> Key for Canonical<'tcx, T> {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
@@ -228,6 +275,8 @@ impl<'tcx, T> Key for Canonical<'tcx, T> {
 }
 
 impl Key for (Symbol, u32, u32) {
+    type CacheSelector = DefaultCacheSelector;
+
     fn query_crate(&self) -> CrateNum {
         LOCAL_CRATE
     }
diff --git a/src/librustc/ty/query/mod.rs b/src/librustc/ty/query/mod.rs
index 0f09a08b19..8adb828fbe 100644
--- a/src/librustc/ty/query/mod.rs
+++ b/src/librustc/ty/query/mod.rs
@@ -1,4 +1,4 @@
-use crate::dep_graph::{self, DepNode};
+use crate::dep_graph::{self, DepConstructor, DepNode, DepNodeParams};
 use crate::hir::exports::Export;
 use crate::infer::canonical::{self, Canonical};
 use crate::lint::LintLevelMap;
@@ -14,26 +14,26 @@ use crate::middle::resolve_lifetime::{ObjectLifetimeDefault, Region, ResolveLife
 use crate::middle::stability::{self, DeprecationEntry};
 use crate::mir;
 use crate::mir::interpret::GlobalId;
-use crate::mir::interpret::{ConstEvalRawResult, ConstEvalResult};
+use crate::mir::interpret::{ConstEvalRawResult, ConstEvalResult, ConstValue};
 use crate::mir::interpret::{LitToConstError, LitToConstInput};
 use crate::mir::mono::CodegenUnit;
 use crate::session::config::{EntryFnType, OptLevel, OutputFilenames, SymbolManglingVersion};
 use crate::session::CrateDisambiguator;
-use crate::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint};
-use crate::traits::query::method_autoderef::MethodAutoderefStepsResult;
-use crate::traits::query::normalize::NormalizationResult;
-use crate::traits::query::outlives_bounds::OutlivesBound;
 use crate::traits::query::{
     CanonicalPredicateGoal, CanonicalProjectionGoal, CanonicalTyGoal,
     CanonicalTypeOpAscribeUserTypeGoal, CanonicalTypeOpEqGoal, CanonicalTypeOpNormalizeGoal,
     CanonicalTypeOpProvePredicateGoal, CanonicalTypeOpSubtypeGoal, NoSolution,
 };
+use crate::traits::query::{
+    DropckOutlivesResult, DtorckConstraint, MethodAutoderefStepsResult, NormalizationResult,
+    OutlivesBound,
+};
 use crate::traits::specialization_graph;
 use crate::traits::Clauses;
 use crate::traits::{self, Vtable};
 use crate::ty::steal::Steal;
 use crate::ty::subst::SubstsRef;
-use crate::ty::util::NeedsDrop;
+use crate::ty::util::AlwaysRequiresDrop;
 use crate::ty::{self, AdtSizedConstraint, CrateInherentImpls, ParamEnvAnd, Ty, TyCtxt};
 use crate::util::common::ErrorReported;
 use rustc_data_structures::fingerprint::Fingerprint;
@@ -45,28 +45,32 @@ use rustc_data_structures::sync::Lrc;
 use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, DefIdSet, DefIndex};
-use rustc_hir::{HirIdSet, ItemLocalId, TraitCandidate};
+use rustc_hir::{Crate, HirIdSet, ItemLocalId, TraitCandidate};
 use rustc_index::vec::IndexVec;
 use rustc_target::spec::PanicStrategy;
 
+use rustc_ast::ast;
+use rustc_attr as attr;
 use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
-use std::any::type_name;
 use std::borrow::Cow;
+use std::convert::TryFrom;
 use std::ops::Deref;
 use std::sync::Arc;
-use syntax::ast;
-use syntax::attr;
 
 #[macro_use]
 mod plumbing;
+pub use self::plumbing::CycleError;
 use self::plumbing::*;
-pub use self::plumbing::{force_from_dep_node, CycleError};
+
+mod stats;
+pub use self::stats::print_stats;
 
 mod job;
 #[cfg(parallel_compiler)]
 pub use self::job::handle_deadlock;
-pub use self::job::{QueryInfo, QueryJob};
+use self::job::QueryJobInfo;
+pub use self::job::{QueryInfo, QueryJob, QueryJobId};
 
 mod keys;
 use self::keys::Key;
@@ -74,6 +78,9 @@ use self::keys::Key;
 mod values;
 use self::values::Value;
 
+mod caches;
+use self::caches::CacheSelector;
+
 mod config;
 use self::config::QueryAccessors;
 pub use self::config::QueryConfig;
@@ -97,9 +104,105 @@ pub use self::profiling_support::{IntoSelfProfilingString, QueryKeyStringBuilder
 // Queries marked with `fatal_cycle` do not need the latter implementation,
 // as they will raise an fatal error on query cycles instead.
 
-rustc_query_append! { [define_queries!][ <'tcx>
-    Other {
-        /// Runs analysis passes on the crate.
-        [eval_always] fn analysis: Analysis(CrateNum) -> Result<(), ErrorReported>,
-    },
-]}
+rustc_query_append! { [define_queries!][<'tcx>] }
+
+/// The red/green evaluation system will try to mark a specific DepNode in the
+/// dependency graph as green by recursively trying to mark the dependencies of
+/// that `DepNode` as green. While doing so, it will sometimes encounter a `DepNode`
+/// where we don't know if it is red or green and we therefore actually have
+/// to recompute its value in order to find out. Since the only piece of
+/// information that we have at that point is the `DepNode` we are trying to
+/// re-evaluate, we need some way to re-run a query from just that. This is what
+/// `force_from_dep_node()` implements.
+///
+/// In the general case, a `DepNode` consists of a `DepKind` and an opaque
+/// GUID/fingerprint that will uniquely identify the node. This GUID/fingerprint
+/// is usually constructed by computing a stable hash of the query-key that the
+/// `DepNode` corresponds to. Consequently, it is not in general possible to go
+/// back from hash to query-key (since hash functions are not reversible). For
+/// this reason `force_from_dep_node()` is expected to fail from time to time
+/// because we just cannot find out, from the `DepNode` alone, what the
+/// corresponding query-key is and therefore cannot re-run the query.
+///
+/// The system deals with this case letting `try_mark_green` fail which forces
+/// the root query to be re-evaluated.
+///
+/// Now, if `force_from_dep_node()` would always fail, it would be pretty useless.
+/// Fortunately, we can use some contextual information that will allow us to
+/// reconstruct query-keys for certain kinds of `DepNode`s. In particular, we
+/// enforce by construction that the GUID/fingerprint of certain `DepNode`s is a
+/// valid `DefPathHash`. Since we also always build a huge table that maps every
+/// `DefPathHash` in the current codebase to the corresponding `DefId`, we have
+/// everything we need to re-run the query.
+///
+/// Take the `mir_validated` query as an example. Like many other queries, it
+/// just has a single parameter: the `DefId` of the item it will compute the
+/// validated MIR for. Now, when we call `force_from_dep_node()` on a `DepNode`
+/// with kind `MirValidated`, we know that the GUID/fingerprint of the `DepNode`
+/// is actually a `DefPathHash`, and can therefore just look up the corresponding
+/// `DefId` in `tcx.def_path_hash_to_def_id`.
+///
+/// When you implement a new query, it will likely have a corresponding new
+/// `DepKind`, and you'll have to support it here in `force_from_dep_node()`. As
+/// a rule of thumb, if your query takes a `DefId` or `DefIndex` as sole parameter,
+/// then `force_from_dep_node()` should not fail for it. Otherwise, you can just
+/// add it to the "We don't have enough information to reconstruct..." group in
+/// the match below.
+pub fn force_from_dep_node<'tcx>(tcx: TyCtxt<'tcx>, dep_node: &DepNode) -> bool {
+    use crate::dep_graph::DepKind;
+
+    // We must avoid ever having to call `force_from_dep_node()` for a
+    // `DepNode::codegen_unit`:
+    // Since we cannot reconstruct the query key of a `DepNode::codegen_unit`, we
+    // would always end up having to evaluate the first caller of the
+    // `codegen_unit` query that *is* reconstructible. This might very well be
+    // the `compile_codegen_unit` query, thus re-codegenning the whole CGU just
+    // to re-trigger calling the `codegen_unit` query with the right key. At
+    // that point we would already have re-done all the work we are trying to
+    // avoid doing in the first place.
+    // The solution is simple: Just explicitly call the `codegen_unit` query for
+    // each CGU, right after partitioning. This way `try_mark_green` will always
+    // hit the cache instead of having to go through `force_from_dep_node`.
+    // This assertion makes sure, we actually keep applying the solution above.
+    debug_assert!(
+        dep_node.kind != DepKind::codegen_unit,
+        "calling force_from_dep_node() on DepKind::codegen_unit"
+    );
+
+    if !dep_node.kind.can_reconstruct_query_key() {
+        return false;
+    }
+
+    rustc_dep_node_force!([dep_node, tcx]
+        // These are inputs that are expected to be pre-allocated and that
+        // should therefore always be red or green already.
+        DepKind::AllLocalTraitImpls |
+        DepKind::CrateMetadata |
+        DepKind::HirBody |
+        DepKind::Hir |
+
+        // These are anonymous nodes.
+        DepKind::TraitSelect |
+
+        // We don't have enough information to reconstruct the query key of
+        // these.
+        DepKind::CompileCodegenUnit => {
+            bug!("force_from_dep_node: encountered {:?}", dep_node)
+        }
+    );
+
+    false
+}
+
+impl DepNode {
+    /// Check whether the query invocation corresponding to the given
+    /// DepNode is eligible for on-disk-caching. If so, this is method
+    /// will execute the query corresponding to the given DepNode.
+    /// Also, as a sanity check, it expects that the corresponding query
+    /// invocation has been marked as green already.
+    pub fn try_load_from_on_disk_cache<'tcx>(&self, tcx: TyCtxt<'tcx>) {
+        use crate::dep_graph::DepKind;
+
+        rustc_dep_node_try_load_from_on_disk_cache!(self, tcx)
+    }
+}
diff --git a/src/librustc/ty/query/on_disk_cache.rs b/src/librustc/ty/query/on_disk_cache.rs
index a81fe33831..9c1db7c5f2 100644
--- a/src/librustc/ty/query/on_disk_cache.rs
+++ b/src/librustc/ty/query/on_disk_cache.rs
@@ -7,6 +7,7 @@ use crate::session::{CrateDisambiguator, Session};
 use crate::ty::codec::{self as ty_codec, TyDecoder, TyEncoder};
 use crate::ty::context::TyCtxt;
 use crate::ty::{self, Ty};
+use rustc_ast::ast::Ident;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::{HashMapExt, Lock, Lrc, Once};
 use rustc_data_structures::thin_vec::ThinVec;
@@ -22,7 +23,6 @@ use rustc_span::hygiene::{ExpnId, SyntaxContext};
 use rustc_span::source_map::{SourceMap, StableSourceFileId};
 use rustc_span::{BytePos, SourceFile, Span, DUMMY_SP};
 use std::mem;
-use syntax::ast::{Ident, NodeId};
 
 const TAG_FILE_FOOTER: u128 = 0xC0FFEE_C0FFEE_C0FFEE_C0FFEE_C0FFEE;
 
@@ -92,7 +92,7 @@ struct AbsoluteBytePos(u32);
 
 impl AbsoluteBytePos {
     fn new(pos: usize) -> AbsoluteBytePos {
-        debug_assert!(pos <= ::std::u32::MAX as usize);
+        debug_assert!(pos <= u32::MAX as usize);
         AbsoluteBytePos(pos as u32)
     }
 
@@ -425,7 +425,7 @@ impl<'sess> OnDiskCache<'sess> {
 
 //- DECODING -------------------------------------------------------------------
 
-/// A decoder that can read fro the incr. comp. cache. It is similar to the one
+/// A decoder that can read from the incr. comp. cache. It is similar to the one
 /// we use for crate metadata decoding in that it can rebase spans and eventually
 /// will also handle things that contain `Ty` instances.
 struct CacheDecoder<'a, 'tcx> {
@@ -680,16 +680,6 @@ impl<'a, 'tcx> SpecializedDecoder<hir::HirId> for CacheDecoder<'a, 'tcx> {
     }
 }
 
-// `NodeId`s are not stable across compilation sessions, so we store them in their
-// `HirId` representation. This allows use to map them to the current `NodeId`.
-impl<'a, 'tcx> SpecializedDecoder<NodeId> for CacheDecoder<'a, 'tcx> {
-    #[inline]
-    fn specialized_decode(&mut self) -> Result<NodeId, Self::Error> {
-        let hir_id = hir::HirId::decode(self)?;
-        Ok(self.tcx().hir().hir_to_node_id(hir_id))
-    }
-}
-
 impl<'a, 'tcx> SpecializedDecoder<Fingerprint> for CacheDecoder<'a, 'tcx> {
     fn specialized_decode(&mut self) -> Result<Fingerprint, Self::Error> {
         Fingerprint::decode_opaque(&mut self.opaque)
@@ -928,19 +918,6 @@ where
     }
 }
 
-// `NodeId`s are not stable across compilation sessions, so we store them in their
-// `HirId` representation. This allows use to map them to the current `NodeId`.
-impl<'a, 'tcx, E> SpecializedEncoder<NodeId> for CacheEncoder<'a, 'tcx, E>
-where
-    E: 'a + TyEncoder,
-{
-    #[inline]
-    fn specialized_encode(&mut self, node_id: &NodeId) -> Result<(), Self::Error> {
-        let hir_id = self.tcx.hir().node_to_hir_id(*node_id);
-        hir_id.encode(self)
-    }
-}
-
 impl<'a, 'tcx> SpecializedEncoder<Fingerprint> for CacheEncoder<'a, 'tcx, opaque::Encoder> {
     fn specialized_encode(&mut self, f: &Fingerprint) -> Result<(), Self::Error> {
         f.encode_opaque(&mut self.encoder)
@@ -966,6 +943,7 @@ where
 
 macro_rules! encoder_methods {
     ($($name:ident($ty:ty);)*) => {
+        #[inline]
         $(fn $name(&mut self, value: $ty) -> Result<(), Self::Error> {
             self.encoder.$name(value)
         })*
@@ -1019,7 +997,7 @@ impl SpecializedEncoder<IntEncodedWithFixedSize> for opaque::Encoder {
     fn specialized_encode(&mut self, x: &IntEncodedWithFixedSize) -> Result<(), Self::Error> {
         let start_pos = self.position();
         for i in 0..IntEncodedWithFixedSize::ENCODED_SIZE {
-            ((x.0 >> i * 8) as u8).encode(self)?;
+            ((x.0 >> (i * 8)) as u8).encode(self)?;
         }
         let end_pos = self.position();
         assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
@@ -1053,23 +1031,27 @@ where
     Q: super::config::QueryDescription<'tcx, Value: Encodable>,
     E: 'a + TyEncoder,
 {
-    let desc = &format!("encode_query_results_for_{}", ::std::any::type_name::<Q>());
-    let _timer = tcx.sess.prof.extra_verbose_generic_activity(desc);
+    let _timer = tcx
+        .sess
+        .prof
+        .extra_verbose_generic_activity("encode_query_results_for", ::std::any::type_name::<Q>());
 
-    let shards = Q::query_cache(tcx).lock_shards();
-    assert!(shards.iter().all(|shard| shard.active.is_empty()));
-    for (key, entry) in shards.iter().flat_map(|shard| shard.results.iter()) {
-        if Q::cache_on_disk(tcx, key.clone(), Some(&entry.value)) {
-            let dep_node = SerializedDepNodeIndex::new(entry.index.index());
+    let state = Q::query_state(tcx);
+    assert!(state.all_inactive());
 
-            // Record position of the cache entry.
-            query_result_index.push((dep_node, AbsoluteBytePos::new(encoder.position())));
+    state.iter_results(|results| {
+        for (key, value, dep_node) in results {
+            if Q::cache_on_disk(tcx, key.clone(), Some(&value)) {
+                let dep_node = SerializedDepNodeIndex::new(dep_node.index());
 
-            // Encode the type check tables with the `SerializedDepNodeIndex`
-            // as tag.
-            encoder.encode_tagged(dep_node, &entry.value)?;
-        }
-    }
+                // Record position of the cache entry.
+                query_result_index.push((dep_node, AbsoluteBytePos::new(encoder.position())));
 
-    Ok(())
+                // Encode the type check tables with the `SerializedDepNodeIndex`
+                // as tag.
+                encoder.encode_tagged(dep_node, &value)?;
+            }
+        }
+        Ok(())
+    })
 }
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
index 117a38c655..acf67f52dc 100644
--- a/src/librustc/ty/query/plumbing.rs
+++ b/src/librustc/ty/query/plumbing.rs
@@ -2,9 +2,10 @@
 //! generate the actual methods on tcx which find and execute the provider,
 //! manage the caches, and so forth.
 
-use crate::dep_graph::{DepKind, DepNode, DepNodeIndex, SerializedDepNodeIndex};
-use crate::ty::query::config::{QueryConfig, QueryDescription};
-use crate::ty::query::job::{QueryInfo, QueryJob};
+use crate::dep_graph::{DepNode, DepNodeIndex, SerializedDepNodeIndex};
+use crate::ty::query::caches::QueryCache;
+use crate::ty::query::config::{QueryAccessors, QueryDescription};
+use crate::ty::query::job::{QueryInfo, QueryJob, QueryJobId, QueryShardJobId};
 use crate::ty::query::Query;
 use crate::ty::tls;
 use crate::ty::{self, TyCtxt};
@@ -12,10 +13,8 @@ use crate::ty::{self, TyCtxt};
 #[cfg(not(parallel_compiler))]
 use rustc_data_structures::cold_path;
 use rustc_data_structures::fx::{FxHashMap, FxHasher};
-#[cfg(parallel_compiler)]
-use rustc_data_structures::profiling::TimingGuard;
 use rustc_data_structures::sharded::Sharded;
-use rustc_data_structures::sync::{Lock, Lrc};
+use rustc_data_structures::sync::{Lock, LockGuard};
 use rustc_data_structures::thin_vec::ThinVec;
 use rustc_errors::{struct_span_err, Diagnostic, DiagnosticBuilder, FatalError, Handler, Level};
 use rustc_span::source_map::DUMMY_SP;
@@ -23,160 +22,193 @@ use rustc_span::Span;
 use std::collections::hash_map::Entry;
 use std::hash::{Hash, Hasher};
 use std::mem;
+use std::num::NonZeroU32;
 use std::ptr;
+#[cfg(debug_assertions)]
+use std::sync::atomic::{AtomicUsize, Ordering};
 
-pub struct QueryCache<'tcx, D: QueryConfig<'tcx> + ?Sized> {
-    pub(super) results: FxHashMap<D::Key, QueryValue<D::Value>>,
+pub(crate) struct QueryStateShard<'tcx, D: QueryAccessors<'tcx> + ?Sized> {
+    pub(super) cache: <<D as QueryAccessors<'tcx>>::Cache as QueryCache<D::Key, D::Value>>::Sharded,
     pub(super) active: FxHashMap<D::Key, QueryResult<'tcx>>,
-    #[cfg(debug_assertions)]
-    pub(super) cache_hits: usize,
+
+    /// Used to generate unique ids for active jobs.
+    pub(super) jobs: u32,
+}
+
+impl<'tcx, Q: QueryAccessors<'tcx>> QueryStateShard<'tcx, Q> {
+    fn get_cache(
+        &mut self,
+    ) -> &mut <<Q as QueryAccessors<'tcx>>::Cache as QueryCache<Q::Key, Q::Value>>::Sharded {
+        &mut self.cache
+    }
 }
 
-pub(super) struct QueryValue<T> {
-    pub(super) value: T,
-    pub(super) index: DepNodeIndex,
+impl<'tcx, Q: QueryAccessors<'tcx>> Default for QueryStateShard<'tcx, Q> {
+    fn default() -> QueryStateShard<'tcx, Q> {
+        QueryStateShard { cache: Default::default(), active: Default::default(), jobs: 0 }
+    }
+}
+
+pub(crate) struct QueryState<'tcx, D: QueryAccessors<'tcx> + ?Sized> {
+    pub(super) cache: D::Cache,
+    pub(super) shards: Sharded<QueryStateShard<'tcx, D>>,
+    #[cfg(debug_assertions)]
+    pub(super) cache_hits: AtomicUsize,
 }
 
-impl<T> QueryValue<T> {
-    pub(super) fn new(value: T, dep_node_index: DepNodeIndex) -> QueryValue<T> {
-        QueryValue { value, index: dep_node_index }
+impl<'tcx, Q: QueryAccessors<'tcx>> QueryState<'tcx, Q> {
+    pub(super) fn get_lookup<K: Hash>(&'tcx self, key: &K) -> QueryLookup<'tcx, Q> {
+        // We compute the key's hash once and then use it for both the
+        // shard lookup and the hashmap lookup. This relies on the fact
+        // that both of them use `FxHasher`.
+        let mut hasher = FxHasher::default();
+        key.hash(&mut hasher);
+        let key_hash = hasher.finish();
+
+        let shard = self.shards.get_shard_index_by_hash(key_hash);
+        let lock = self.shards.get_shard_by_index(shard).lock();
+        QueryLookup { key_hash, shard, lock }
     }
 }
 
 /// Indicates the state of a query for a given key in a query map.
 pub(super) enum QueryResult<'tcx> {
     /// An already executing query. The query job can be used to await for its completion.
-    Started(Lrc<QueryJob<'tcx>>),
+    Started(QueryJob<'tcx>),
 
-    /// The query panicked. Queries trying to wait on this will raise a fatal error or
+    /// The query panicked. Queries trying to wait on this will raise a fatal error which will
     /// silently panic.
     Poisoned,
 }
 
-impl<'tcx, M: QueryConfig<'tcx>> Default for QueryCache<'tcx, M> {
-    fn default() -> QueryCache<'tcx, M> {
-        QueryCache {
-            results: FxHashMap::default(),
-            active: FxHashMap::default(),
+impl<'tcx, M: QueryAccessors<'tcx>> QueryState<'tcx, M> {
+    pub fn iter_results<R>(
+        &self,
+        f: impl for<'a> FnOnce(
+            Box<dyn Iterator<Item = (&'a M::Key, &'a M::Value, DepNodeIndex)> + 'a>,
+        ) -> R,
+    ) -> R {
+        self.cache.iter(&self.shards, |shard| &mut shard.cache, f)
+    }
+    pub fn all_inactive(&self) -> bool {
+        let shards = self.shards.lock_shards();
+        shards.iter().all(|shard| shard.active.is_empty())
+    }
+}
+
+impl<'tcx, M: QueryAccessors<'tcx>> Default for QueryState<'tcx, M> {
+    fn default() -> QueryState<'tcx, M> {
+        QueryState {
+            cache: M::Cache::default(),
+            shards: Default::default(),
             #[cfg(debug_assertions)]
-            cache_hits: 0,
+            cache_hits: AtomicUsize::new(0),
         }
     }
 }
 
+/// Values used when checking a query cache which can be reused on a cache-miss to execute the query.
+pub(crate) struct QueryLookup<'tcx, Q: QueryAccessors<'tcx>> {
+    pub(super) key_hash: u64,
+    pub(super) shard: usize,
+    pub(super) lock: LockGuard<'tcx, QueryStateShard<'tcx, Q>>,
+}
+
 /// A type representing the responsibility to execute the job in the `job` field.
 /// This will poison the relevant query if dropped.
-pub(super) struct JobOwner<'a, 'tcx, Q: QueryDescription<'tcx>> {
-    cache: &'a Sharded<QueryCache<'tcx, Q>>,
+pub(super) struct JobOwner<'tcx, Q: QueryDescription<'tcx>> {
+    tcx: TyCtxt<'tcx>,
     key: Q::Key,
-    job: Lrc<QueryJob<'tcx>>,
+    id: QueryJobId,
 }
 
-impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> {
+impl<'tcx, Q: QueryDescription<'tcx>> JobOwner<'tcx, Q> {
     /// Either gets a `JobOwner` corresponding the query, allowing us to
     /// start executing the query, or returns with the result of the query.
-    /// If the query is executing elsewhere, this will wait for it.
+    /// This function assumes that `try_get_cached` is already called and returned `lookup`.
+    /// If the query is executing elsewhere, this will wait for it and return the result.
     /// If the query panicked, this will silently panic.
     ///
     /// This function is inlined because that results in a noticeable speed-up
     /// for some compile-time benchmarks.
     #[inline(always)]
-    pub(super) fn try_get(tcx: TyCtxt<'tcx>, span: Span, key: &Q::Key) -> TryGetJob<'a, 'tcx, Q> {
-        // Handling the `query_blocked_prof_timer` is a bit weird because of the
-        // control flow in this function: Blocking is implemented by
-        // awaiting a running job and, once that is done, entering the loop below
-        // again from the top. In that second iteration we will hit the
-        // cache which provides us with the information we need for
-        // finishing the "query-blocked" event.
-        //
-        // We thus allocate `query_blocked_prof_timer` outside the loop,
-        // initialize it during the first iteration and finish it during the
-        // second iteration.
-        #[cfg(parallel_compiler)]
-        let mut query_blocked_prof_timer: Option<TimingGuard<'_>> = None;
-
-        let cache = Q::query_cache(tcx);
-        loop {
-            // We compute the key's hash once and then use it for both the
-            // shard lookup and the hashmap lookup. This relies on the fact
-            // that both of them use `FxHasher`.
-            let mut state = FxHasher::default();
-            key.hash(&mut state);
-            let key_hash = state.finish();
-
-            let mut lock = cache.get_shard_by_hash(key_hash).lock();
-            if let Some((_, value)) =
-                lock.results.raw_entry().from_key_hashed_nocheck(key_hash, key)
-            {
-                if unlikely!(tcx.prof.enabled()) {
-                    tcx.prof.query_cache_hit(value.index.into());
+    pub(super) fn try_start(
+        tcx: TyCtxt<'tcx>,
+        span: Span,
+        key: &Q::Key,
+        mut lookup: QueryLookup<'tcx, Q>,
+    ) -> TryGetJob<'tcx, Q> {
+        let lock = &mut *lookup.lock;
+
+        let (latch, mut _query_blocked_prof_timer) = match lock.active.entry((*key).clone()) {
+            Entry::Occupied(mut entry) => {
+                match entry.get_mut() {
+                    QueryResult::Started(job) => {
+                        // For parallel queries, we'll block and wait until the query running
+                        // in another thread has completed. Record how long we wait in the
+                        // self-profiler.
+                        let _query_blocked_prof_timer = if cfg!(parallel_compiler) {
+                            Some(tcx.prof.query_blocked())
+                        } else {
+                            None
+                        };
 
-                    #[cfg(parallel_compiler)]
-                    {
-                        if let Some(prof_timer) = query_blocked_prof_timer.take() {
-                            prof_timer.finish_with_query_invocation_id(value.index.into());
-                        }
+                        // Create the id of the job we're waiting for
+                        let id = QueryJobId::new(job.id, lookup.shard, Q::dep_kind());
+
+                        (job.latch(id), _query_blocked_prof_timer)
                     }
+                    QueryResult::Poisoned => FatalError.raise(),
                 }
+            }
+            Entry::Vacant(entry) => {
+                // No job entry for this query. Return a new one to be started later.
 
-                let result = (value.value.clone(), value.index);
-                #[cfg(debug_assertions)]
-                {
-                    lock.cache_hits += 1;
-                }
-                return TryGetJob::JobCompleted(result);
+                // Generate an id unique within this shard.
+                let id = lock.jobs.checked_add(1).unwrap();
+                lock.jobs = id;
+                let id = QueryShardJobId(NonZeroU32::new(id).unwrap());
+
+                let global_id = QueryJobId::new(id, lookup.shard, Q::dep_kind());
+
+                let job = tls::with_related_context(tcx, |icx| QueryJob::new(id, span, icx.query));
+
+                entry.insert(QueryResult::Started(job));
+
+                let owner = JobOwner { tcx, id: global_id, key: (*key).clone() };
+                return TryGetJob::NotYetStarted(owner);
             }
+        };
+        mem::drop(lookup.lock);
 
-            let job = match lock.active.entry((*key).clone()) {
-                Entry::Occupied(entry) => {
-                    match *entry.get() {
-                        QueryResult::Started(ref job) => {
-                            // For parallel queries, we'll block and wait until the query running
-                            // in another thread has completed. Record how long we wait in the
-                            // self-profiler.
-                            #[cfg(parallel_compiler)]
-                            {
-                                query_blocked_prof_timer = Some(tcx.prof.query_blocked());
-                            }
-
-                            job.clone()
-                        }
-                        QueryResult::Poisoned => FatalError.raise(),
-                    }
-                }
-                Entry::Vacant(entry) => {
-                    // No job entry for this query. Return a new one to be started later.
-                    return tls::with_related_context(tcx, |icx| {
-                        // Create the `parent` variable before `info`. This allows LLVM
-                        // to elide the move of `info`
-                        let parent = icx.query.clone();
-                        let info = QueryInfo { span, query: Q::query(key.clone()) };
-                        let job = Lrc::new(QueryJob::new(info, parent));
-                        let owner = JobOwner { cache, job: job.clone(), key: (*key).clone() };
-                        entry.insert(QueryResult::Started(job));
-                        TryGetJob::NotYetStarted(owner)
-                    });
-                }
-            };
-            mem::drop(lock);
+        // If we are single-threaded we know that we have cycle error,
+        // so we just return the error.
+        #[cfg(not(parallel_compiler))]
+        return TryGetJob::Cycle(cold_path(|| {
+            Q::handle_cycle_error(tcx, latch.find_cycle_in_stack(tcx, span))
+        }));
 
-            // If we are single-threaded we know that we have cycle error,
-            // so we just return the error.
-            #[cfg(not(parallel_compiler))]
-            return TryGetJob::Cycle(cold_path(|| {
-                Q::handle_cycle_error(tcx, job.find_cycle_in_stack(tcx, span))
-            }));
+        // With parallel queries we might just have to wait on some other
+        // thread.
+        #[cfg(parallel_compiler)]
+        {
+            let result = latch.wait_on(tcx, span);
 
-            // With parallel queries we might just have to wait on some other
-            // thread.
-            #[cfg(parallel_compiler)]
-            {
-                let result = job.r#await(tcx, span);
+            if let Err(cycle) = result {
+                return TryGetJob::Cycle(Q::handle_cycle_error(tcx, cycle));
+            }
 
-                if let Err(cycle) = result {
-                    return TryGetJob::Cycle(Q::handle_cycle_error(tcx, cycle));
-                }
+            let cached = tcx.try_get_cached::<Q, _, _, _>(
+                (*key).clone(),
+                |value, index| (value.clone(), index),
+                |_, _| panic!("value must be in cache after waiting"),
+            );
+
+            if let Some(prof_timer) = _query_blocked_prof_timer.take() {
+                prof_timer.finish_with_query_invocation_id(cached.1.into());
             }
+
+            return TryGetJob::JobCompleted(cached);
         }
     }
 
@@ -186,18 +218,22 @@ impl<'a, 'tcx, Q: QueryDescription<'tcx>> JobOwner<'a, 'tcx, Q> {
     pub(super) fn complete(self, result: &Q::Value, dep_node_index: DepNodeIndex) {
         // We can move out of `self` here because we `mem::forget` it below
         let key = unsafe { ptr::read(&self.key) };
-        let job = unsafe { ptr::read(&self.job) };
-        let cache = self.cache;
+        let tcx = self.tcx;
 
         // Forget ourself so our destructor won't poison the query
         mem::forget(self);
 
-        let value = QueryValue::new(result.clone(), dep_node_index);
-        {
-            let mut lock = cache.get_shard_by_value(&key).lock();
-            lock.active.remove(&key);
-            lock.results.insert(key, value);
-        }
+        let job = {
+            let state = Q::query_state(tcx);
+            let result = result.clone();
+            let mut lock = state.shards.get_shard_by_value(&key).lock();
+            let job = match lock.active.remove(&key).unwrap() {
+                QueryResult::Started(job) => job,
+                QueryResult::Poisoned => panic!(),
+            };
+            state.cache.complete(tcx, &mut lock.cache, key, result, dep_node_index);
+            job
+        };
 
         job.signal_complete();
     }
@@ -213,16 +249,25 @@ where
     (result, diagnostics.into_inner())
 }
 
-impl<'a, 'tcx, Q: QueryDescription<'tcx>> Drop for JobOwner<'a, 'tcx, Q> {
+impl<'tcx, Q: QueryDescription<'tcx>> Drop for JobOwner<'tcx, Q> {
     #[inline(never)]
     #[cold]
     fn drop(&mut self) {
         // Poison the query so jobs waiting on it panic.
-        let shard = self.cache.get_shard_by_value(&self.key);
-        shard.lock().active.insert(self.key.clone(), QueryResult::Poisoned);
+        let state = Q::query_state(self.tcx);
+        let shard = state.shards.get_shard_by_value(&self.key);
+        let job = {
+            let mut shard = shard.lock();
+            let job = match shard.active.remove(&self.key).unwrap() {
+                QueryResult::Started(job) => job,
+                QueryResult::Poisoned => panic!(),
+            };
+            shard.active.insert(self.key.clone(), QueryResult::Poisoned);
+            job
+        };
         // Also signal the completion of the job, so waiters
         // will continue execution.
-        self.job.signal_complete();
+        job.signal_complete();
     }
 }
 
@@ -233,14 +278,15 @@ pub struct CycleError<'tcx> {
     pub(super) cycle: Vec<QueryInfo<'tcx>>,
 }
 
-/// The result of `try_get_lock`.
-pub(super) enum TryGetJob<'a, 'tcx, D: QueryDescription<'tcx>> {
+/// The result of `try_start`.
+pub(super) enum TryGetJob<'tcx, D: QueryDescription<'tcx>> {
     /// The query is not yet started. Contains a guard to the cache eventually used to start it.
-    NotYetStarted(JobOwner<'a, 'tcx, D>),
+    NotYetStarted(JobOwner<'tcx, D>),
 
     /// The query was already completed.
     /// Returns the result of the query and its dep-node index
     /// if it succeeded or a cycle error if it failed.
+    #[cfg(parallel_compiler)]
     JobCompleted((D::Value, DepNodeIndex)),
 
     /// Trying to execute the query resulted in a cycle.
@@ -254,7 +300,7 @@ impl<'tcx> TyCtxt<'tcx> {
     #[inline(always)]
     pub(super) fn start_query<F, R>(
         self,
-        job: Lrc<QueryJob<'tcx>>,
+        token: QueryJobId,
         diagnostics: Option<&Lock<ThinVec<Diagnostic>>>,
         compute: F,
     ) -> R
@@ -268,7 +314,7 @@ impl<'tcx> TyCtxt<'tcx> {
             // Update the `ImplicitCtxt` to point to our new query job.
             let new_icx = tls::ImplicitCtxt {
                 tcx: self,
-                query: Some(job),
+                query: Some(token),
                 diagnostics,
                 layout_depth: current_icx.layout_depth,
                 task_deps: current_icx.task_deps,
@@ -335,23 +381,31 @@ impl<'tcx> TyCtxt<'tcx> {
         // state if it was responsible for triggering the panic.
         tls::with_context_opt(|icx| {
             if let Some(icx) = icx {
-                let mut current_query = icx.query.clone();
+                let query_map = icx.tcx.queries.try_collect_active_jobs();
+
+                let mut current_query = icx.query;
                 let mut i = 0;
 
                 while let Some(query) = current_query {
+                    let query_info =
+                        if let Some(info) = query_map.as_ref().and_then(|map| map.get(&query)) {
+                            info
+                        } else {
+                            break;
+                        };
                     let mut diag = Diagnostic::new(
                         Level::FailureNote,
                         &format!(
                             "#{} [{}] {}",
                             i,
-                            query.info.query.name(),
-                            query.info.query.describe(icx.tcx)
+                            query_info.info.query.name(),
+                            query_info.info.query.describe(icx.tcx)
                         ),
                     );
-                    diag.span = icx.tcx.sess.source_map().def_span(query.info.span).into();
+                    diag.span = icx.tcx.sess.source_map().def_span(query_info.info.span).into();
                     handler.force_print_diagnostic(diag);
 
-                    current_query = query.parent.clone();
+                    current_query = query_info.job.parent;
                     i += 1;
                 }
             }
@@ -360,13 +414,72 @@ impl<'tcx> TyCtxt<'tcx> {
         eprintln!("end of query stack");
     }
 
+    /// Checks if the query is already computed and in the cache.
+    /// It returns the shard index and a lock guard to the shard,
+    /// which will be used if the query is not in the cache and we need
+    /// to compute it.
+    #[inline(always)]
+    fn try_get_cached<Q, R, OnHit, OnMiss>(
+        self,
+        key: Q::Key,
+        // `on_hit` can be called while holding a lock to the query cache
+        on_hit: OnHit,
+        on_miss: OnMiss,
+    ) -> R
+    where
+        Q: QueryDescription<'tcx> + 'tcx,
+        OnHit: FnOnce(&Q::Value, DepNodeIndex) -> R,
+        OnMiss: FnOnce(Q::Key, QueryLookup<'tcx, Q>) -> R,
+    {
+        let state = Q::query_state(self);
+
+        state.cache.lookup(
+            state,
+            QueryStateShard::<Q>::get_cache,
+            key,
+            |value, index| {
+                if unlikely!(self.prof.enabled()) {
+                    self.prof.query_cache_hit(index.into());
+                }
+                #[cfg(debug_assertions)]
+                {
+                    state.cache_hits.fetch_add(1, Ordering::Relaxed);
+                }
+                on_hit(value, index)
+            },
+            on_miss,
+        )
+    }
+
     #[inline(never)]
-    pub(super) fn get_query<Q: QueryDescription<'tcx>>(self, span: Span, key: Q::Key) -> Q::Value {
+    pub(super) fn get_query<Q: QueryDescription<'tcx> + 'tcx>(
+        self,
+        span: Span,
+        key: Q::Key,
+    ) -> Q::Value {
         debug!("ty::query::get_query<{}>(key={:?}, span={:?})", Q::NAME, key, span);
 
-        let job = match JobOwner::try_get(self, span, &key) {
+        self.try_get_cached::<Q, _, _, _>(
+            key,
+            |value, index| {
+                self.dep_graph.read_index(index);
+                value.clone()
+            },
+            |key, lookup| self.try_execute_query::<Q>(span, key, lookup),
+        )
+    }
+
+    #[inline(always)]
+    pub(super) fn try_execute_query<Q: QueryDescription<'tcx>>(
+        self,
+        span: Span,
+        key: Q::Key,
+        lookup: QueryLookup<'tcx, Q>,
+    ) -> Q::Value {
+        let job = match JobOwner::try_start(self, span, &key, lookup) {
             TryGetJob::NotYetStarted(job) => job,
             TryGetJob::Cycle(result) => return result,
+            #[cfg(parallel_compiler)]
             TryGetJob::JobCompleted((v, index)) => {
                 self.dep_graph.read_index(index);
                 return v;
@@ -384,7 +497,7 @@ impl<'tcx> TyCtxt<'tcx> {
             let prof_timer = self.prof.query_provider();
 
             let ((result, dep_node_index), diagnostics) = with_diagnostics(|diagnostics| {
-                self.start_query(job.job.clone(), diagnostics, |tcx| {
+                self.start_query(job.id, diagnostics, |tcx| {
                     tcx.dep_graph.with_anon_task(Q::dep_kind(), || Q::compute(tcx, key))
                 })
             });
@@ -410,7 +523,7 @@ impl<'tcx> TyCtxt<'tcx> {
             // The diagnostics for this query will be
             // promoted to the current session during
             // `try_mark_green()`, so we can ignore them here.
-            let loaded = self.start_query(job.job.clone(), None, |tcx| {
+            let loaded = self.start_query(job.id, None, |tcx| {
                 let marked = tcx.dep_graph.try_mark_green_and_read(tcx, &dep_node);
                 marked.map(|(prev_dep_node_index, dep_node_index)| {
                     (
@@ -524,7 +637,7 @@ impl<'tcx> TyCtxt<'tcx> {
     fn force_query_with_job<Q: QueryDescription<'tcx>>(
         self,
         key: Q::Key,
-        job: JobOwner<'_, 'tcx, Q>,
+        job: JobOwner<'tcx, Q>,
         dep_node: DepNode,
     ) -> (Q::Value, DepNodeIndex) {
         // If the following assertion triggers, it can have two reasons:
@@ -544,7 +657,7 @@ impl<'tcx> TyCtxt<'tcx> {
         let prof_timer = self.prof.query_provider();
 
         let ((result, dep_node_index), diagnostics) = with_diagnostics(|diagnostics| {
-            self.start_query(job.job.clone(), diagnostics, |tcx| {
+            self.start_query(job.id, diagnostics, |tcx| {
                 if Q::EVAL_ALWAYS {
                     tcx.dep_graph.with_eval_always_task(
                         dep_node,
@@ -579,7 +692,7 @@ impl<'tcx> TyCtxt<'tcx> {
     /// side-effects -- e.g., in order to report errors for erroneous programs.
     ///
     /// Note: The optimization is only available during incr. comp.
-    pub(super) fn ensure_query<Q: QueryDescription<'tcx>>(self, key: Q::Key) -> () {
+    pub(super) fn ensure_query<Q: QueryDescription<'tcx> + 'tcx>(self, key: Q::Key) -> () {
         if Q::EVAL_ALWAYS {
             let _ = self.get_query::<Q>(DUMMY_SP, key);
             return;
@@ -607,14 +720,30 @@ impl<'tcx> TyCtxt<'tcx> {
     }
 
     #[allow(dead_code)]
-    fn force_query<Q: QueryDescription<'tcx>>(self, key: Q::Key, span: Span, dep_node: DepNode) {
+    pub(super) fn force_query<Q: QueryDescription<'tcx> + 'tcx>(
+        self,
+        key: Q::Key,
+        span: Span,
+        dep_node: DepNode,
+    ) {
         // We may be concurrently trying both execute and force a query.
         // Ensure that only one of them runs the query.
-        let job = match JobOwner::try_get(self, span, &key) {
-            TryGetJob::NotYetStarted(job) => job,
-            TryGetJob::Cycle(_) | TryGetJob::JobCompleted(_) => return,
-        };
-        self.force_query_with_job::<Q>(key, job, dep_node);
+
+        self.try_get_cached::<Q, _, _, _>(
+            key,
+            |_, _| {
+                // Cache hit, do nothing
+            },
+            |key, lookup| {
+                let job = match JobOwner::try_start(self, span, &key, lookup) {
+                    TryGetJob::NotYetStarted(job) => job,
+                    TryGetJob::Cycle(_) => return,
+                    #[cfg(parallel_compiler)]
+                    TryGetJob::JobCompleted(_) => return,
+                };
+                self.force_query_with_job::<Q>(key, job, dep_node);
+            },
+        );
     }
 }
 
@@ -623,17 +752,17 @@ macro_rules! handle_cycle_error {
         $tcx.report_cycle($error).emit();
         Value::from_cycle_error($tcx)
     }};
-    ([fatal_cycle$(, $modifiers:ident)*][$tcx:expr, $error:expr]) => {{
+    ([fatal_cycle $($rest:tt)*][$tcx:expr, $error:expr]) => {{
         $tcx.report_cycle($error).emit();
         $tcx.sess.abort_if_errors();
         unreachable!()
     }};
-    ([cycle_delay_bug$(, $modifiers:ident)*][$tcx:expr, $error:expr]) => {{
+    ([cycle_delay_bug $($rest:tt)*][$tcx:expr, $error:expr]) => {{
         $tcx.report_cycle($error).delay_as_bug();
         Value::from_cycle_error($tcx)
     }};
-    ([$other:ident$(, $modifiers:ident)*][$($args:tt)*]) => {
-        handle_cycle_error!([$($modifiers),*][$($args)*])
+    ([$other:ident $(($($other_args:tt)*))* $(, $($modifiers:tt)*)*][$($args:tt)*]) => {
+        handle_cycle_error!([$($($modifiers)*)*][$($args)*])
     };
 }
 
@@ -641,11 +770,11 @@ macro_rules! is_anon {
     ([]) => {{
         false
     }};
-    ([anon$(, $modifiers:ident)*]) => {{
+    ([anon $($rest:tt)*]) => {{
         true
     }};
-    ([$other:ident$(, $modifiers:ident)*]) => {
-        is_anon!([$($modifiers),*])
+    ([$other:ident $(($($other_args:tt)*))* $(, $($modifiers:tt)*)*]) => {
+        is_anon!([$($($modifiers)*)*])
     };
 }
 
@@ -653,11 +782,23 @@ macro_rules! is_eval_always {
     ([]) => {{
         false
     }};
-    ([eval_always$(, $modifiers:ident)*]) => {{
+    ([eval_always $($rest:tt)*]) => {{
         true
     }};
-    ([$other:ident$(, $modifiers:ident)*]) => {
-        is_eval_always!([$($modifiers),*])
+    ([$other:ident $(($($other_args:tt)*))* $(, $($modifiers:tt)*)*]) => {
+        is_eval_always!([$($($modifiers)*)*])
+    };
+}
+
+macro_rules! query_storage {
+    ([][$K:ty, $V:ty]) => {
+        <<$K as Key>::CacheSelector as CacheSelector<$K, $V>>::Cache
+    };
+    ([storage($ty:ty) $($rest:tt)*][$K:ty, $V:ty]) => {
+        $ty
+    };
+    ([$other:ident $(($($other_args:tt)*))* $(, $($modifiers:tt)*)*][$($args:tt)*]) => {
+        query_storage!([$($($modifiers)*)*][$($args)*])
     };
 }
 
@@ -665,11 +806,11 @@ macro_rules! hash_result {
     ([][$hcx:expr, $result:expr]) => {{
         dep_graph::hash_result($hcx, &$result)
     }};
-    ([no_hash$(, $modifiers:ident)*][$hcx:expr, $result:expr]) => {{
+    ([no_hash $($rest:tt)*][$hcx:expr, $result:expr]) => {{
         None
     }};
-    ([$other:ident$(, $modifiers:ident)*][$($args:tt)*]) => {
-        hash_result!([$($modifiers),*][$($args)*])
+    ([$other:ident $(($($other_args:tt)*))* $(, $($modifiers:tt)*)*][$($args:tt)*]) => {
+        hash_result!([$($($modifiers)*)*][$($args)*])
     };
 }
 
@@ -689,7 +830,6 @@ macro_rules! define_queries_inner {
         [$($modifiers:tt)*] fn $name:ident: $node:ident($K:ty) -> $V:ty,)*) => {
 
         use std::mem;
-        use rustc_data_structures::sharded::Sharded;
         use crate::{
             rustc_data_structures::stable_hasher::HashStable,
             rustc_data_structures::stable_hasher::StableHasher,
@@ -716,120 +856,38 @@ macro_rules! define_queries_inner {
                 }
             }
 
-            #[cfg(parallel_compiler)]
-            pub fn collect_active_jobs(&self) -> Vec<Lrc<QueryJob<$tcx>>> {
-                let mut jobs = Vec::new();
+            pub fn try_collect_active_jobs(
+                &self
+            ) -> Option<FxHashMap<QueryJobId, QueryJobInfo<'tcx>>> {
+                let mut jobs = FxHashMap::default();
 
-                // We use try_lock_shards here since we are only called from the
-                // deadlock handler, and this shouldn't be locked.
                 $(
-                    let shards = self.$name.try_lock_shards().unwrap();
-                    jobs.extend(shards.iter().flat_map(|shard| shard.active.values().filter_map(|v|
+                    // We use try_lock_shards here since we are called from the
+                    // deadlock handler, and this shouldn't be locked.
+                    let shards = self.$name.shards.try_lock_shards()?;
+                    let shards = shards.iter().enumerate();
+                    jobs.extend(shards.flat_map(|(shard_id, shard)| {
+                        shard.active.iter().filter_map(move |(k, v)| {
                         if let QueryResult::Started(ref job) = *v {
-                            Some(job.clone())
+                                let id = QueryJobId {
+                                    job: job.id,
+                                    shard:  u16::try_from(shard_id).unwrap(),
+                                    kind:
+                                        <queries::$name<'tcx> as QueryAccessors<'tcx>>::dep_kind(),
+                                };
+                                let info = QueryInfo {
+                                    span: job.span,
+                                    query: queries::$name::query(k.clone())
+                                };
+                                Some((id, QueryJobInfo { info,  job: job.clone() }))
                         } else {
                             None
                         }
-                    )));
+                        })
+                    }));
                 )*
 
-                jobs
-            }
-
-            pub fn print_stats(&self) {
-                let mut queries = Vec::new();
-
-                #[derive(Clone)]
-                struct QueryStats {
-                    name: &'static str,
-                    cache_hits: usize,
-                    key_size: usize,
-                    key_type: &'static str,
-                    value_size: usize,
-                    value_type: &'static str,
-                    entry_count: usize,
-                }
-
-                fn stats<'tcx, Q: QueryConfig<'tcx>>(
-                    name: &'static str,
-                    map: &Sharded<QueryCache<'tcx, Q>>,
-                ) -> QueryStats {
-                    let map = map.lock_shards();
-                    QueryStats {
-                        name,
-                        #[cfg(debug_assertions)]
-                        cache_hits: map.iter().map(|shard| shard.cache_hits).sum(),
-                        #[cfg(not(debug_assertions))]
-                        cache_hits: 0,
-                        key_size: mem::size_of::<Q::Key>(),
-                        key_type: type_name::<Q::Key>(),
-                        value_size: mem::size_of::<Q::Value>(),
-                        value_type: type_name::<Q::Value>(),
-                        entry_count: map.iter().map(|shard| shard.results.len()).sum(),
-                    }
-                }
-
-                $(
-                    queries.push(stats::<queries::$name<'_>>(
-                        stringify!($name),
-                        &self.$name,
-                    ));
-                )*
-
-                if cfg!(debug_assertions) {
-                    let hits: usize = queries.iter().map(|s| s.cache_hits).sum();
-                    let results: usize = queries.iter().map(|s| s.entry_count).sum();
-                    println!("\nQuery cache hit rate: {}", hits as f64 / (hits + results) as f64);
-                }
-
-                let mut query_key_sizes = queries.clone();
-                query_key_sizes.sort_by_key(|q| q.key_size);
-                println!("\nLarge query keys:");
-                for q in query_key_sizes.iter().rev()
-                                        .filter(|q| q.key_size > 8) {
-                    println!(
-                        "   {} - {} x {} - {}",
-                        q.name,
-                        q.key_size,
-                        q.entry_count,
-                        q.key_type
-                    );
-                }
-
-                let mut query_value_sizes = queries.clone();
-                query_value_sizes.sort_by_key(|q| q.value_size);
-                println!("\nLarge query values:");
-                for q in query_value_sizes.iter().rev()
-                                          .filter(|q| q.value_size > 8) {
-                    println!(
-                        "   {} - {} x {} - {}",
-                        q.name,
-                        q.value_size,
-                        q.entry_count,
-                        q.value_type
-                    );
-                }
-
-                if cfg!(debug_assertions) {
-                    let mut query_cache_hits = queries.clone();
-                    query_cache_hits.sort_by_key(|q| q.cache_hits);
-                    println!("\nQuery cache hits:");
-                    for q in query_cache_hits.iter().rev() {
-                        println!(
-                            "   {} - {} ({}%)",
-                            q.name,
-                            q.cache_hits,
-                            q.cache_hits as f64 / (q.cache_hits + q.entry_count) as f64
-                        );
-                    }
-                }
-
-                let mut query_value_count = queries.clone();
-                query_value_count.sort_by_key(|q| q.entry_count);
-                println!("\nQuery value count:");
-                for q in query_value_count.iter().rev() {
-                    println!("   {} - {}", q.name, q.entry_count);
-                }
+                Some(jobs)
             }
         }
 
@@ -906,7 +964,6 @@ macro_rules! define_queries_inner {
         $(impl<$tcx> QueryConfig<$tcx> for queries::$name<$tcx> {
             type Key = $K;
             type Value = $V;
-
             const NAME: &'static str = stringify!($name);
             const CATEGORY: ProfileCategory = $category;
         }
@@ -915,22 +972,22 @@ macro_rules! define_queries_inner {
             const ANON: bool = is_anon!([$($modifiers)*]);
             const EVAL_ALWAYS: bool = is_eval_always!([$($modifiers)*]);
 
+            type Cache = query_storage!([$($modifiers)*][$K, $V]);
+
             #[inline(always)]
             fn query(key: Self::Key) -> Query<'tcx> {
                 Query::$name(key)
             }
 
             #[inline(always)]
-            fn query_cache<'a>(tcx: TyCtxt<$tcx>) -> &'a Sharded<QueryCache<$tcx, Self>> {
+            fn query_state<'a>(tcx: TyCtxt<$tcx>) -> &'a QueryState<$tcx, Self> {
                 &tcx.queries.$name
             }
 
             #[allow(unused)]
             #[inline(always)]
             fn to_dep_node(tcx: TyCtxt<$tcx>, key: &Self::Key) -> DepNode {
-                use crate::dep_graph::DepConstructor::*;
-
-                DepNode::new(tcx, $node(*key))
+                DepConstructor::$node(tcx, *key)
             }
 
             #[inline(always)]
@@ -996,7 +1053,7 @@ macro_rules! define_queries_inner {
 
         impl TyCtxt<$tcx> {
             /// Returns a transparent wrapper for `TyCtxt`, which ensures queries
-            /// are executed instead of just returing their results.
+            /// are executed instead of just returning their results.
             #[inline(always)]
             pub fn ensure(self) -> TyCtxtEnsure<$tcx> {
                 TyCtxtEnsure {
@@ -1082,7 +1139,7 @@ macro_rules! define_queries_struct {
             providers: IndexVec<CrateNum, Providers<$tcx>>,
             fallback_extern_providers: Box<Providers<$tcx>>,
 
-            $($(#[$attr])*  $name: Sharded<QueryCache<$tcx, queries::$name<$tcx>>>,)*
+            $($(#[$attr])*  $name: QueryState<$tcx, queries::$name<$tcx>>,)*
         }
     };
 }
@@ -1105,106 +1162,3 @@ macro_rules! define_provider_struct {
         }
     };
 }
-
-/// The red/green evaluation system will try to mark a specific DepNode in the
-/// dependency graph as green by recursively trying to mark the dependencies of
-/// that `DepNode` as green. While doing so, it will sometimes encounter a `DepNode`
-/// where we don't know if it is red or green and we therefore actually have
-/// to recompute its value in order to find out. Since the only piece of
-/// information that we have at that point is the `DepNode` we are trying to
-/// re-evaluate, we need some way to re-run a query from just that. This is what
-/// `force_from_dep_node()` implements.
-///
-/// In the general case, a `DepNode` consists of a `DepKind` and an opaque
-/// GUID/fingerprint that will uniquely identify the node. This GUID/fingerprint
-/// is usually constructed by computing a stable hash of the query-key that the
-/// `DepNode` corresponds to. Consequently, it is not in general possible to go
-/// back from hash to query-key (since hash functions are not reversible). For
-/// this reason `force_from_dep_node()` is expected to fail from time to time
-/// because we just cannot find out, from the `DepNode` alone, what the
-/// corresponding query-key is and therefore cannot re-run the query.
-///
-/// The system deals with this case letting `try_mark_green` fail which forces
-/// the root query to be re-evaluated.
-///
-/// Now, if `force_from_dep_node()` would always fail, it would be pretty useless.
-/// Fortunately, we can use some contextual information that will allow us to
-/// reconstruct query-keys for certain kinds of `DepNode`s. In particular, we
-/// enforce by construction that the GUID/fingerprint of certain `DepNode`s is a
-/// valid `DefPathHash`. Since we also always build a huge table that maps every
-/// `DefPathHash` in the current codebase to the corresponding `DefId`, we have
-/// everything we need to re-run the query.
-///
-/// Take the `mir_validated` query as an example. Like many other queries, it
-/// just has a single parameter: the `DefId` of the item it will compute the
-/// validated MIR for. Now, when we call `force_from_dep_node()` on a `DepNode`
-/// with kind `MirValidated`, we know that the GUID/fingerprint of the `DepNode`
-/// is actually a `DefPathHash`, and can therefore just look up the corresponding
-/// `DefId` in `tcx.def_path_hash_to_def_id`.
-///
-/// When you implement a new query, it will likely have a corresponding new
-/// `DepKind`, and you'll have to support it here in `force_from_dep_node()`. As
-/// a rule of thumb, if your query takes a `DefId` or `DefIndex` as sole parameter,
-/// then `force_from_dep_node()` should not fail for it. Otherwise, you can just
-/// add it to the "We don't have enough information to reconstruct..." group in
-/// the match below.
-pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
-    use crate::dep_graph::RecoverKey;
-
-    // We must avoid ever having to call `force_from_dep_node()` for a
-    // `DepNode::codegen_unit`:
-    // Since we cannot reconstruct the query key of a `DepNode::codegen_unit`, we
-    // would always end up having to evaluate the first caller of the
-    // `codegen_unit` query that *is* reconstructible. This might very well be
-    // the `compile_codegen_unit` query, thus re-codegenning the whole CGU just
-    // to re-trigger calling the `codegen_unit` query with the right key. At
-    // that point we would already have re-done all the work we are trying to
-    // avoid doing in the first place.
-    // The solution is simple: Just explicitly call the `codegen_unit` query for
-    // each CGU, right after partitioning. This way `try_mark_green` will always
-    // hit the cache instead of having to go through `force_from_dep_node`.
-    // This assertion makes sure, we actually keep applying the solution above.
-    debug_assert!(
-        dep_node.kind != DepKind::codegen_unit,
-        "calling force_from_dep_node() on DepKind::codegen_unit"
-    );
-
-    if !dep_node.kind.can_reconstruct_query_key() {
-        return false;
-    }
-
-    rustc_dep_node_force!([dep_node, tcx]
-        // These are inputs that are expected to be pre-allocated and that
-        // should therefore always be red or green already.
-        DepKind::AllLocalTraitImpls |
-        DepKind::Krate |
-        DepKind::CrateMetadata |
-        DepKind::HirBody |
-        DepKind::Hir |
-
-        // These are anonymous nodes.
-        DepKind::TraitSelect |
-
-        // We don't have enough information to reconstruct the query key of
-        // these.
-        DepKind::CompileCodegenUnit => {
-            bug!("force_from_dep_node: encountered {:?}", dep_node)
-        }
-
-        DepKind::Analysis => {
-            let def_id = if let Some(def_id) = dep_node.extract_def_id(tcx) {
-                def_id
-            } else {
-                // Return from the whole function.
-                return false
-            };
-            tcx.force_query::<crate::ty::query::queries::analysis<'_>>(
-                def_id.krate,
-                DUMMY_SP,
-                *dep_node
-            );
-        }
-    );
-
-    true
-}
diff --git a/src/librustc/ty/query/profiling_support.rs b/src/librustc/ty/query/profiling_support.rs
index 79b32ba83a..99ada34d59 100644
--- a/src/librustc/ty/query/profiling_support.rs
+++ b/src/librustc/ty/query/profiling_support.rs
@@ -1,11 +1,10 @@
 use crate::hir::map::definitions::DefPathData;
 use crate::ty::context::TyCtxt;
-use crate::ty::query::config::QueryConfig;
-use crate::ty::query::plumbing::QueryCache;
+use crate::ty::query::config::QueryAccessors;
+use crate::ty::query::plumbing::QueryState;
 use measureme::{StringComponent, StringId};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::profiling::SelfProfiler;
-use rustc_data_structures::sharded::Sharded;
 use rustc_hir::def_id::{CrateNum, DefId, DefIndex, CRATE_DEF_INDEX, LOCAL_CRATE};
 use std::fmt::Debug;
 use std::io::Write;
@@ -161,10 +160,10 @@ where
 pub(super) fn alloc_self_profile_query_strings_for_query_cache<'tcx, Q>(
     tcx: TyCtxt<'tcx>,
     query_name: &'static str,
-    query_cache: &Sharded<QueryCache<'tcx, Q>>,
+    query_state: &QueryState<'tcx, Q>,
     string_cache: &mut QueryKeyStringCache,
 ) where
-    Q: QueryConfig<'tcx>,
+    Q: QueryAccessors<'tcx>,
 {
     tcx.prof.with_profiler(|profiler| {
         let event_id_builder = profiler.event_id_builder();
@@ -181,20 +180,8 @@ pub(super) fn alloc_self_profile_query_strings_for_query_cache<'tcx, Q>(
             // need to invoke queries itself, we cannot keep the query caches
             // locked while doing so. Instead we copy out the
             // `(query_key, dep_node_index)` pairs and release the lock again.
-            let query_keys_and_indices = {
-                let shards = query_cache.lock_shards();
-                let len = shards.iter().map(|shard| shard.results.len()).sum();
-
-                let mut query_keys_and_indices = Vec::with_capacity(len);
-
-                for shard in &shards {
-                    query_keys_and_indices.extend(
-                        shard.results.iter().map(|(q_key, q_val)| (q_key.clone(), q_val.index)),
-                    );
-                }
-
-                query_keys_and_indices
-            };
+            let query_keys_and_indices: Vec<_> = query_state
+                .iter_results(|results| results.map(|(k, _, i)| (k.clone(), i)).collect());
 
             // Now actually allocate the strings. If allocating the strings
             // generates new entries in the query cache, we'll miss them but
@@ -218,18 +205,14 @@ pub(super) fn alloc_self_profile_query_strings_for_query_cache<'tcx, Q>(
             let query_name = profiler.get_or_alloc_cached_string(query_name);
             let event_id = event_id_builder.from_label(query_name).to_string_id();
 
-            let shards = query_cache.lock_shards();
+            query_state.iter_results(|results| {
+                let query_invocation_ids: Vec<_> = results.map(|v| v.2.into()).collect();
 
-            for shard in shards.iter() {
-                let query_invocation_ids = shard
-                    .results
-                    .values()
-                    .map(|v| v.index)
-                    .map(|dep_node_index| dep_node_index.into());
-
-                profiler
-                    .bulk_map_query_invocation_id_to_single_string(query_invocation_ids, event_id);
-            }
+                profiler.bulk_map_query_invocation_id_to_single_string(
+                    query_invocation_ids.into_iter(),
+                    event_id,
+                );
+            });
         }
     });
 }
diff --git a/src/librustc/ty/query/stats.rs b/src/librustc/ty/query/stats.rs
new file mode 100644
index 0000000000..d257320d4e
--- /dev/null
+++ b/src/librustc/ty/query/stats.rs
@@ -0,0 +1,139 @@
+use crate::ty::query::config::QueryAccessors;
+use crate::ty::query::plumbing::QueryState;
+use crate::ty::query::queries;
+use crate::ty::TyCtxt;
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+
+use std::any::type_name;
+use std::mem;
+#[cfg(debug_assertions)]
+use std::sync::atomic::Ordering;
+
+trait KeyStats {
+    fn key_stats(&self, stats: &mut QueryStats);
+}
+
+impl<T> KeyStats for T {
+    default fn key_stats(&self, _: &mut QueryStats) {}
+}
+
+impl KeyStats for DefId {
+    fn key_stats(&self, stats: &mut QueryStats) {
+        if self.krate == LOCAL_CRATE {
+            stats.local_def_id_keys = Some(stats.local_def_id_keys.unwrap_or(0) + 1);
+        }
+    }
+}
+
+#[derive(Clone)]
+struct QueryStats {
+    name: &'static str,
+    cache_hits: usize,
+    key_size: usize,
+    key_type: &'static str,
+    value_size: usize,
+    value_type: &'static str,
+    entry_count: usize,
+    local_def_id_keys: Option<usize>,
+}
+
+fn stats<'tcx, Q: QueryAccessors<'tcx>>(
+    name: &'static str,
+    map: &QueryState<'tcx, Q>,
+) -> QueryStats {
+    let mut stats = QueryStats {
+        name,
+        #[cfg(debug_assertions)]
+        cache_hits: map.cache_hits.load(Ordering::Relaxed),
+        #[cfg(not(debug_assertions))]
+        cache_hits: 0,
+        key_size: mem::size_of::<Q::Key>(),
+        key_type: type_name::<Q::Key>(),
+        value_size: mem::size_of::<Q::Value>(),
+        value_type: type_name::<Q::Value>(),
+        entry_count: map.iter_results(|results| results.count()),
+        local_def_id_keys: None,
+    };
+    map.iter_results(|results| {
+        for (key, _, _) in results {
+            key.key_stats(&mut stats)
+        }
+    });
+    stats
+}
+
+pub fn print_stats(tcx: TyCtxt<'_>) {
+    let queries = query_stats(tcx);
+
+    if cfg!(debug_assertions) {
+        let hits: usize = queries.iter().map(|s| s.cache_hits).sum();
+        let results: usize = queries.iter().map(|s| s.entry_count).sum();
+        println!("\nQuery cache hit rate: {}", hits as f64 / (hits + results) as f64);
+    }
+
+    let mut query_key_sizes = queries.clone();
+    query_key_sizes.sort_by_key(|q| q.key_size);
+    println!("\nLarge query keys:");
+    for q in query_key_sizes.iter().rev().filter(|q| q.key_size > 8) {
+        println!("   {} - {} x {} - {}", q.name, q.key_size, q.entry_count, q.key_type);
+    }
+
+    let mut query_value_sizes = queries.clone();
+    query_value_sizes.sort_by_key(|q| q.value_size);
+    println!("\nLarge query values:");
+    for q in query_value_sizes.iter().rev().filter(|q| q.value_size > 8) {
+        println!("   {} - {} x {} - {}", q.name, q.value_size, q.entry_count, q.value_type);
+    }
+
+    if cfg!(debug_assertions) {
+        let mut query_cache_hits = queries.clone();
+        query_cache_hits.sort_by_key(|q| q.cache_hits);
+        println!("\nQuery cache hits:");
+        for q in query_cache_hits.iter().rev() {
+            println!(
+                "   {} - {} ({}%)",
+                q.name,
+                q.cache_hits,
+                q.cache_hits as f64 / (q.cache_hits + q.entry_count) as f64
+            );
+        }
+    }
+
+    let mut query_value_count = queries.clone();
+    query_value_count.sort_by_key(|q| q.entry_count);
+    println!("\nQuery value count:");
+    for q in query_value_count.iter().rev() {
+        println!("   {} - {}", q.name, q.entry_count);
+    }
+
+    let mut def_id_density: Vec<_> =
+        queries.iter().filter(|q| q.local_def_id_keys.is_some()).collect();
+    def_id_density.sort_by_key(|q| q.local_def_id_keys.unwrap());
+    println!("\nLocal DefId density:");
+    let total = tcx.hir().definitions().def_index_count() as f64;
+    for q in def_id_density.iter().rev() {
+        let local = q.local_def_id_keys.unwrap();
+        println!("   {} - {} = ({}%)", q.name, local, (local as f64 * 100.0) / total);
+    }
+}
+
+macro_rules! print_stats {
+    (<$tcx:tt> $($category:tt {
+        $($(#[$attr:meta])* [$($modifiers:tt)*] fn $name:ident: $node:ident($K:ty) -> $V:ty,)*
+    },)*) => {
+        fn query_stats(tcx: TyCtxt<'_>) -> Vec<QueryStats> {
+            let mut queries = Vec::new();
+
+            $($(
+                queries.push(stats::<queries::$name<'_>>(
+                    stringify!($name),
+                    &tcx.queries.$name,
+                ));
+            )*)*
+
+            queries
+        }
+    }
+}
+
+rustc_query_append! { [print_stats!][<'tcx>] }
diff --git a/src/librustc/ty/query/values.rs b/src/librustc/ty/query/values.rs
index 900a91fe5c..b01d15c29b 100644
--- a/src/librustc/ty/query/values.rs
+++ b/src/librustc/ty/query/values.rs
@@ -1,4 +1,3 @@
-use crate::ty::util::NeedsDrop;
 use crate::ty::{self, AdtSizedConstraint, Ty, TyCtxt};
 
 use rustc_span::symbol::Symbol;
@@ -26,12 +25,6 @@ impl<'tcx> Value<'tcx> for ty::SymbolName {
     }
 }
 
-impl<'tcx> Value<'tcx> for NeedsDrop {
-    fn from_cycle_error(_: TyCtxt<'tcx>) -> Self {
-        NeedsDrop(false)
-    }
-}
-
 impl<'tcx> Value<'tcx> for AdtSizedConstraint<'tcx> {
     fn from_cycle_error(tcx: TyCtxt<'tcx>) -> Self {
         AdtSizedConstraint(tcx.intern_type_list(&[tcx.types.err]))
diff --git a/src/librustc/ty/relate.rs b/src/librustc/ty/relate.rs
index 3b9df72266..fb4184a9fb 100644
--- a/src/librustc/ty/relate.rs
+++ b/src/librustc/ty/relate.rs
@@ -72,7 +72,7 @@ pub trait TypeRelation<'tcx>: Sized {
         b: &T,
     ) -> RelateResult<'tcx, T>;
 
-    // Overrideable relations. You shouldn't typically call these
+    // Overridable relations. You shouldn't typically call these
     // directly, instead call `relate()`, which in turn calls
     // these. This is both more uniform but also allows us to add
     // additional hooks for other types in the future if needed
@@ -287,7 +287,7 @@ impl<'tcx> Relate<'tcx> for ty::TraitRef<'tcx> {
             Err(TypeError::Traits(expected_found(relation, &a.def_id, &b.def_id)))
         } else {
             let substs = relate_substs(relation, None, a.substs, b.substs)?;
-            Ok(ty::TraitRef { def_id: a.def_id, substs: substs })
+            Ok(ty::TraitRef { def_id: a.def_id, substs })
         }
     }
 }
@@ -303,7 +303,7 @@ impl<'tcx> Relate<'tcx> for ty::ExistentialTraitRef<'tcx> {
             Err(TypeError::Traits(expected_found(relation, &a.def_id, &b.def_id)))
         } else {
             let substs = relate_substs(relation, None, a.substs, b.substs)?;
-            Ok(ty::ExistentialTraitRef { def_id: a.def_id, substs: substs })
+            Ok(ty::ExistentialTraitRef { def_id: a.def_id, substs })
         }
     }
 }
diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
index c1ae4d9fe1..e2fa031391 100644
--- a/src/librustc/ty/structural_impls.rs
+++ b/src/librustc/ty/structural_impls.rs
@@ -7,6 +7,7 @@ use crate::mir::ProjectionKind;
 use crate::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
 use crate::ty::print::{FmtPrinter, Printer};
 use crate::ty::{self, InferConst, Lift, Ty, TyCtxt};
+use rustc_hir as hir;
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::CRATE_DEF_INDEX;
 use rustc_index::vec::{Idx, IndexVec};
@@ -15,18 +16,6 @@ use smallvec::SmallVec;
 use std::fmt;
 use std::rc::Rc;
 use std::sync::Arc;
-use syntax::ast;
-
-impl fmt::Debug for ty::GenericParamDef {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let type_name = match self.kind {
-            ty::GenericParamDefKind::Lifetime => "Lifetime",
-            ty::GenericParamDefKind::Type { .. } => "Type",
-            ty::GenericParamDefKind::Const => "Const",
-        };
-        write!(f, "{}({}, {:?}, {})", type_name, self.name, self.def_id, self.index)
-    }
-}
 
 impl fmt::Debug for ty::TraitDef {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -108,7 +97,7 @@ impl fmt::Debug for ty::RegionKind {
 
             ty::RePlaceholder(placeholder) => write!(f, "RePlaceholder({:?})", placeholder),
 
-            ty::ReEmpty => write!(f, "ReEmpty"),
+            ty::ReEmpty(ui) => write!(f, "ReEmpty({:?})", ui),
 
             ty::ReErased => write!(f, "ReErased"),
         }
@@ -236,7 +225,7 @@ impl fmt::Debug for ty::Predicate<'tcx> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
             ty::Predicate::Trait(ref a, constness) => {
-                if let ast::Constness::Const = constness {
+                if let hir::Constness::Const = constness {
                     write!(f, "const ")?;
                 }
                 a.fmt(f)
@@ -271,8 +260,8 @@ CloneTypeFoldableAndLiftImpls! {
     u64,
     String,
     crate::middle::region::Scope,
-    ::syntax::ast::FloatTy,
-    ::syntax::ast::NodeId,
+    ::rustc_ast::ast::FloatTy,
+    ::rustc_ast::ast::NodeId,
     ::rustc_span::symbol::Symbol,
     ::rustc_hir::def::Res,
     ::rustc_hir::def_id::DefId,
@@ -598,8 +587,8 @@ impl<'a, 'tcx> Lift<'tcx> for ty::adjustment::AutoBorrow<'a> {
 impl<'a, 'tcx> Lift<'tcx> for ty::GenSig<'a> {
     type Lifted = ty::GenSig<'tcx>;
     fn lift_to_tcx(&self, tcx: TyCtxt<'tcx>) -> Option<Self::Lifted> {
-        tcx.lift(&(self.yield_ty, self.return_ty))
-            .map(|(yield_ty, return_ty)| ty::GenSig { yield_ty, return_ty })
+        tcx.lift(&(self.resume_ty, self.yield_ty, self.return_ty))
+            .map(|(resume_ty, yield_ty, return_ty)| ty::GenSig { resume_ty, yield_ty, return_ty })
     }
 }
 
diff --git a/src/librustc/ty/sty.rs b/src/librustc/ty/sty.rs
index dffe86d946..649381db7c 100644
--- a/src/librustc/ty/sty.rs
+++ b/src/librustc/ty/sty.rs
@@ -17,6 +17,7 @@ use crate::ty::{
 };
 use crate::ty::{List, ParamEnv, ParamEnvAnd, TyS};
 use polonius_engine::Atom;
+use rustc_ast::ast::{self, Ident};
 use rustc_data_structures::captures::Captures;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
@@ -29,7 +30,6 @@ use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::marker::PhantomData;
 use std::ops::Range;
-use syntax::ast::{self, Ident};
 
 #[derive(
     Clone,
@@ -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,
@@ -346,9 +346,17 @@ static_assert_size!(TyKind<'_>, 24);
 /// ## Generators
 ///
 /// Generators are handled similarly in `GeneratorSubsts`.  The set of
-/// type parameters is similar, but the role of CK and CS are
-/// different. CK represents the "yield type" and CS represents the
-/// "return type" of the generator.
+/// type parameters is similar, but `CK` and `CS` are replaced by the
+/// following type parameters:
+///
+/// * `GS`: The generator's "resume type", which is the type of the
+///   argument passed to `resume`, and the type of `yield` expressions
+///   inside the generator.
+/// * `GY`: The "yield type", which is the type of values passed to
+///   `yield` inside the generator.
+/// * `GR`: The "return type", which is the type of value returned upon
+///   completion of the generator.
+/// * `GW`: The "generator witness".
 #[derive(Copy, Clone, Debug, TypeFoldable)]
 pub struct ClosureSubsts<'tcx> {
     /// Lifetime and type parameters from the enclosing function,
@@ -442,6 +450,7 @@ pub struct GeneratorSubsts<'tcx> {
 }
 
 struct SplitGeneratorSubsts<'tcx> {
+    resume_ty: Ty<'tcx>,
     yield_ty: Ty<'tcx>,
     return_ty: Ty<'tcx>,
     witness: Ty<'tcx>,
@@ -453,10 +462,11 @@ impl<'tcx> GeneratorSubsts<'tcx> {
         let generics = tcx.generics_of(def_id);
         let parent_len = generics.parent_count;
         SplitGeneratorSubsts {
-            yield_ty: self.substs.type_at(parent_len),
-            return_ty: self.substs.type_at(parent_len + 1),
-            witness: self.substs.type_at(parent_len + 2),
-            upvar_kinds: &self.substs[parent_len + 3..],
+            resume_ty: self.substs.type_at(parent_len),
+            yield_ty: self.substs.type_at(parent_len + 1),
+            return_ty: self.substs.type_at(parent_len + 2),
+            witness: self.substs.type_at(parent_len + 3),
+            upvar_kinds: &self.substs[parent_len + 4..],
         }
     }
 
@@ -485,6 +495,11 @@ impl<'tcx> GeneratorSubsts<'tcx> {
         })
     }
 
+    /// Returns the type representing the resume type of the generator.
+    pub fn resume_ty(self, def_id: DefId, tcx: TyCtxt<'_>) -> Ty<'tcx> {
+        self.split(def_id, tcx).resume_ty
+    }
+
     /// Returns the type representing the yield type of the generator.
     pub fn yield_ty(self, def_id: DefId, tcx: TyCtxt<'_>) -> Ty<'tcx> {
         self.split(def_id, tcx).yield_ty
@@ -505,10 +520,14 @@ impl<'tcx> GeneratorSubsts<'tcx> {
         ty::Binder::dummy(self.sig(def_id, tcx))
     }
 
-    /// Returns the "generator signature", which consists of its yield
+    /// Returns the "generator signature", which consists of its resume, yield
     /// and return types.
     pub fn sig(self, def_id: DefId, tcx: TyCtxt<'_>) -> GenSig<'tcx> {
-        ty::GenSig { yield_ty: self.yield_ty(def_id, tcx), return_ty: self.return_ty(def_id, tcx) }
+        ty::GenSig {
+            resume_ty: self.resume_ty(def_id, tcx),
+            yield_ty: self.yield_ty(def_id, tcx),
+            return_ty: self.return_ty(def_id, tcx),
+        }
     }
 }
 
@@ -1047,10 +1066,7 @@ impl<'tcx> ProjectionTy<'tcx> {
     ) -> ProjectionTy<'tcx> {
         let item_def_id = tcx
             .associated_items(trait_ref.def_id)
-            .find(|item| {
-                item.kind == ty::AssocKind::Type
-                    && tcx.hygienic_eq(item_name, item.ident, trait_ref.def_id)
-            })
+            .find_by_name_and_kind(tcx, item_name, ty::AssocKind::Type, trait_ref.def_id)
             .unwrap()
             .def_id;
 
@@ -1072,6 +1088,7 @@ impl<'tcx> ProjectionTy<'tcx> {
 
 #[derive(Clone, Debug, TypeFoldable)]
 pub struct GenSig<'tcx> {
+    pub resume_ty: Ty<'tcx>,
     pub yield_ty: Ty<'tcx>,
     pub return_ty: Ty<'tcx>,
 }
@@ -1079,6 +1096,9 @@ pub struct GenSig<'tcx> {
 pub type PolyGenSig<'tcx> = Binder<GenSig<'tcx>>;
 
 impl<'tcx> PolyGenSig<'tcx> {
+    pub fn resume_ty(&self) -> ty::Binder<Ty<'tcx>> {
+        self.map_bound_ref(|sig| sig.resume_ty)
+    }
     pub fn yield_ty(&self) -> ty::Binder<Ty<'tcx>> {
         self.map_bound_ref(|sig| sig.yield_ty)
     }
@@ -1173,7 +1193,7 @@ pub struct ParamTy {
 
 impl<'tcx> ParamTy {
     pub fn new(index: u32, name: Symbol) -> ParamTy {
-        ParamTy { index, name: name }
+        ParamTy { index, name }
     }
 
     pub fn for_self() -> ParamTy {
@@ -1269,11 +1289,67 @@ rustc_index::newtype_index! {
 
 pub type Region<'tcx> = &'tcx RegionKind;
 
-/// Representation of regions.
+/// Representation of (lexical) regions. Note that the NLL checker
+/// uses a distinct representation of regions. For this reason, it
+/// internally replaces all the regions with inference variables --
+/// the index of the variable is then used to index into internal NLL
+/// data structures. See `rustc_mir::borrow_check` module for more
+/// information.
+///
+/// ## The Region lattice within a given function
+///
+/// In general, the (lexical, and hence deprecated) region lattice
+/// looks like
+///
+/// ```
+/// static ----------+-----...------+       (greatest)
+/// |                |              |
+/// early-bound and  |              |
+/// free regions     |              |
+/// |                |              |
+/// scope regions    |              |
+/// |                |              |
+/// empty(root)   placeholder(U1)   |
+/// |            /                  |
+/// |           /         placeholder(Un)
+/// empty(U1) --         /
+/// |                   /
+/// ...                /
+/// |                 /
+/// empty(Un) --------                      (smallest)
+/// ```
 ///
-/// Unlike types, most region variants are "fictitious", not concrete,
-/// regions. Among these, `ReStatic`, `ReEmpty` and `ReScope` are the only
-/// ones representing concrete regions.
+/// Early-bound/free regions are the named lifetimes in scope from the
+/// function declaration. They have relationships to one another
+/// determined based on the declared relationships from the
+/// function. They all collectively outlive the scope regions. (See
+/// `RegionRelations` type, and particularly
+/// `crate::infer::outlives::free_region_map::FreeRegionMap`.)
+///
+/// The scope regions are related to one another based on the AST
+/// structure. (See `RegionRelations` type, and particularly the
+/// `rustc::middle::region::ScopeTree`.)
+///
+/// Note that inference variables and bound regions are not included
+/// in this diagram. In the case of inference variables, they should
+/// be inferred to some other region from the diagram.  In the case of
+/// bound regions, they are excluded because they don't make sense to
+/// include -- the diagram indicates the relationship between free
+/// regions.
+///
+/// ## Inference variables
+///
+/// During region inference, we sometimes create inference variables,
+/// represented as `ReVar`. These will be inferred by the code in
+/// `infer::lexical_region_resolve` to some free region from the
+/// lattice above (the minimal region that meets the
+/// constraints).
+///
+/// During NLL checking, where regions are defined differently, we
+/// also use `ReVar` -- in that case, the index is used to index into
+/// the NLL region checker's data structures. The variable may in fact
+/// represent either a free region or an inference variable, in that
+/// case.
 ///
 /// ## Bound Regions
 ///
@@ -1356,14 +1432,13 @@ pub enum RegionKind {
     /// Should not exist after typeck.
     RePlaceholder(ty::PlaceholderRegion),
 
-    /// Empty lifetime is for data that is never accessed.
-    /// Bottom in the region lattice. We treat ReEmpty somewhat
-    /// specially; at least right now, we do not generate instances of
-    /// it during the GLB computations, but rather
-    /// generate an error instead. This is to improve error messages.
-    /// The only way to get an instance of ReEmpty is to have a region
-    /// variable with no constraints.
-    ReEmpty,
+    /// Empty lifetime is for data that is never accessed.  We tag the
+    /// empty lifetime with a universe -- the idea is that we don't
+    /// want `exists<'a> { forall<'b> { 'b: 'a } }` to be satisfiable.
+    /// Therefore, the `'empty` in a universe `U` is less than all
+    /// regions visible from `U`, but not less than regions not visible
+    /// from `U`.
+    ReEmpty(ty::UniverseIndex),
 
     /// Erased region, used by trait selection, in MIR and during codegen.
     ReErased,
@@ -1612,7 +1687,7 @@ impl RegionKind {
             RegionKind::ReStatic => true,
             RegionKind::ReVar(..) => false,
             RegionKind::RePlaceholder(placeholder) => placeholder.name.is_named(),
-            RegionKind::ReEmpty => false,
+            RegionKind::ReEmpty(_) => false,
             RegionKind::ReErased => false,
             RegionKind::ReClosureBound(..) => false,
         }
@@ -1668,45 +1743,42 @@ impl RegionKind {
         }
     }
 
-    pub fn keep_in_local_tcx(&self) -> bool {
-        if let ty::ReVar(..) = self { true } else { false }
-    }
-
     pub fn type_flags(&self) -> TypeFlags {
         let mut flags = TypeFlags::empty();
 
-        if self.keep_in_local_tcx() {
-            flags = flags | TypeFlags::KEEP_IN_LOCAL_TCX;
-        }
-
         match *self {
             ty::ReVar(..) => {
                 flags = flags | TypeFlags::HAS_FREE_REGIONS;
+                flags = flags | TypeFlags::HAS_FREE_LOCAL_REGIONS;
                 flags = flags | TypeFlags::HAS_RE_INFER;
+                flags = flags | TypeFlags::KEEP_IN_LOCAL_TCX;
             }
             ty::RePlaceholder(..) => {
                 flags = flags | TypeFlags::HAS_FREE_REGIONS;
+                flags = flags | TypeFlags::HAS_FREE_LOCAL_REGIONS;
                 flags = flags | TypeFlags::HAS_RE_PLACEHOLDER;
             }
-            ty::ReLateBound(..) => {
-                flags = flags | TypeFlags::HAS_RE_LATE_BOUND;
-            }
             ty::ReEarlyBound(..) => {
                 flags = flags | TypeFlags::HAS_FREE_REGIONS;
-                flags = flags | TypeFlags::HAS_RE_EARLY_BOUND;
+                flags = flags | TypeFlags::HAS_FREE_LOCAL_REGIONS;
+                flags = flags | TypeFlags::HAS_RE_PARAM;
             }
-            ty::ReEmpty | ty::ReStatic | ty::ReFree { .. } | ty::ReScope { .. } => {
+            ty::ReFree { .. } | ty::ReScope { .. } => {
+                flags = flags | TypeFlags::HAS_FREE_REGIONS;
+                flags = flags | TypeFlags::HAS_FREE_LOCAL_REGIONS;
+            }
+            ty::ReEmpty(_) | ty::ReStatic => {
                 flags = flags | TypeFlags::HAS_FREE_REGIONS;
             }
-            ty::ReErased => {}
             ty::ReClosureBound(..) => {
                 flags = flags | TypeFlags::HAS_FREE_REGIONS;
             }
-        }
-
-        match *self {
-            ty::ReStatic | ty::ReEmpty | ty::ReErased | ty::ReLateBound(..) => (),
-            _ => flags = flags | TypeFlags::HAS_FREE_LOCAL_NAMES,
+            ty::ReLateBound(..) => {
+                flags = flags | TypeFlags::HAS_RE_LATE_BOUND;
+            }
+            ty::ReErased => {
+                flags = flags | TypeFlags::HAS_RE_ERASED;
+            }
         }
 
         debug!("type_flags({:?}) = {:?}", self, flags);
@@ -2336,9 +2408,14 @@ pub struct Const<'tcx> {
 static_assert_size!(Const<'_>, 48);
 
 impl<'tcx> Const<'tcx> {
+    #[inline]
+    pub fn from_value(tcx: TyCtxt<'tcx>, val: ConstValue<'tcx>, ty: Ty<'tcx>) -> &'tcx Self {
+        tcx.mk_const(Self { val: ConstKind::Value(val), ty })
+    }
+
     #[inline]
     pub fn from_scalar(tcx: TyCtxt<'tcx>, val: Scalar, ty: Ty<'tcx>) -> &'tcx Self {
-        tcx.mk_const(Self { val: ConstKind::Value(ConstValue::Scalar(val)), ty })
+        Self::from_value(tcx, ConstValue::Scalar(val), ty)
     }
 
     #[inline]
@@ -2392,7 +2469,9 @@ impl<'tcx> Const<'tcx> {
 
             // try to resolve e.g. associated constants to their definition on an impl, and then
             // evaluate the const.
-            tcx.const_eval_resolve(param_env, did, substs, promoted, None).ok()
+            tcx.const_eval_resolve(param_env, did, substs, promoted, None)
+                .ok()
+                .map(|val| Const::from_value(tcx, val, self.ty))
         };
 
         match self.val {
@@ -2400,8 +2479,8 @@ impl<'tcx> Const<'tcx> {
                 // HACK(eddyb) when substs contain e.g. inference variables,
                 // attempt using identity substs instead, that will succeed
                 // when the expression doesn't depend on any parameters.
-                // FIXME(eddyb) make `const_eval` a canonical query instead,
-                // that would properly handle inference variables in `substs`.
+                // FIXME(eddyb, skinny121) pass `InferCtxt` into here when it's available, so that
+                // we can call `infcx.const_eval_resolve` which handles inference variables.
                 if substs.has_local_value() {
                     let identity_substs = InternalSubsts::identity_for_item(tcx, did);
                     // The `ParamEnv` needs to match the `identity_substs`.
@@ -2492,7 +2571,7 @@ impl<'tcx> ConstKind<'tcx> {
 
     #[inline]
     pub fn try_to_bits(&self, size: ty::layout::Size) -> Option<u128> {
-        self.try_to_scalar()?.to_bits(size).ok()
+        if let ConstKind::Value(val) = self { val.try_to_bits(size) } else { None }
     }
 }
 
diff --git a/src/librustc/ty/util.rs b/src/librustc/ty/util.rs
index 8d22ac9dbb..fcebedb260 100644
--- a/src/librustc/ty/util.rs
+++ b/src/librustc/ty/util.rs
@@ -10,6 +10,8 @@ use crate::ty::TyKind::*;
 use crate::ty::{self, DefIdTree, GenericParamDefKind, Ty, TyCtxt, TypeFoldable};
 use crate::util::common::ErrorReported;
 use rustc_apfloat::Float as _;
+use rustc_ast::ast;
+use rustc_attr::{self as attr, SignedInt, UnsignedInt};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_hir as hir;
@@ -17,9 +19,9 @@ use rustc_hir::def::DefKind;
 use rustc_hir::def_id::DefId;
 use rustc_macros::HashStable;
 use rustc_span::Span;
+use rustc_target::abi::TargetDataLayout;
+use smallvec::SmallVec;
 use std::{cmp, fmt};
-use syntax::ast;
-use syntax::attr::{self, SignedInt, UnsignedInt};
 
 #[derive(Copy, Clone, Debug)]
 pub struct Discr<'tcx> {
@@ -48,11 +50,11 @@ fn signed_min(size: Size) -> i128 {
 }
 
 fn signed_max(size: Size) -> i128 {
-    i128::max_value() >> (128 - size.bits())
+    i128::MAX >> (128 - size.bits())
 }
 
 fn unsigned_max(size: Size) -> u128 {
-    u128::max_value() >> (128 - size.bits())
+    u128::MAX >> (128 - size.bits())
 }
 
 fn int_size_and_signed<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> (Size, bool) {
@@ -75,7 +77,7 @@ impl<'tcx> Discr<'tcx> {
             let min = signed_min(size);
             let max = signed_max(size);
             let val = sign_extend(self.val, size) as i128;
-            assert!(n < (i128::max_value() as u128));
+            assert!(n < (i128::MAX as u128));
             let n = n as i128;
             let oflo = val > max - n;
             let val = if oflo { min + (n - (max - val) - 1) } else { val + n };
@@ -355,7 +357,7 @@ impl<'tcx> TyCtxt<'tcx> {
         let mut dtor_did = None;
         let ty = self.type_of(adt_did);
         self.for_each_relevant_impl(drop_trait, ty, |impl_did| {
-            if let Some(item) = self.associated_items(impl_did).next() {
+            if let Some(item) = self.associated_items(impl_did).in_definition_order().next() {
                 if validate(self, impl_did).is_ok() {
                     dtor_did = Some(item.def_id);
                 }
@@ -613,7 +615,7 @@ impl<'tcx> TyCtxt<'tcx> {
             fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
                 if let ty::Opaque(def_id, substs) = t.kind {
                     self.expand_opaque_ty(def_id, substs).unwrap_or(t)
-                } else if t.has_projections() {
+                } else if t.has_opaque_types() {
                     t.super_fold_with(self)
                 } else {
                     t
@@ -695,7 +697,7 @@ impl<'tcx> ty::TyS<'tcx> {
     /// strange rules like `<T as Foo<'static>>::Bar: Sized` that
     /// actually carry lifetime requirements.
     pub fn is_sized(&'tcx self, tcx_at: TyCtxtAt<'tcx>, param_env: ty::ParamEnv<'tcx>) -> bool {
-        tcx_at.is_sized_raw(param_env.and(self))
+        self.is_trivially_sized(tcx_at.tcx) || tcx_at.is_sized_raw(param_env.and(self))
     }
 
     /// Checks whether values of this type `T` implement the `Freeze`
@@ -711,7 +713,43 @@ impl<'tcx> ty::TyS<'tcx> {
         param_env: ty::ParamEnv<'tcx>,
         span: Span,
     ) -> bool {
-        tcx.at(span).is_freeze_raw(param_env.and(self))
+        self.is_trivially_freeze() || tcx.at(span).is_freeze_raw(param_env.and(self))
+    }
+
+    /// Fast path helper for testing if a type is `Freeze`.
+    ///
+    /// Returning true means the type is known to be `Freeze`. Returning
+    /// `false` means nothing -- could be `Freeze`, might not be.
+    fn is_trivially_freeze(&self) -> bool {
+        match self.kind {
+            ty::Int(_)
+            | ty::Uint(_)
+            | ty::Float(_)
+            | ty::Bool
+            | ty::Char
+            | ty::Str
+            | ty::Never
+            | ty::Ref(..)
+            | ty::RawPtr(_)
+            | ty::FnDef(..)
+            | ty::Error
+            | ty::FnPtr(_) => true,
+            ty::Tuple(_) => self.tuple_fields().all(Self::is_trivially_freeze),
+            ty::Slice(elem_ty) | ty::Array(elem_ty, _) => elem_ty.is_trivially_freeze(),
+            ty::Adt(..)
+            | ty::Bound(..)
+            | ty::Closure(..)
+            | ty::Dynamic(..)
+            | ty::Foreign(_)
+            | ty::Generator(..)
+            | ty::GeneratorWitness(_)
+            | ty::Infer(_)
+            | ty::Opaque(..)
+            | ty::Param(_)
+            | ty::Placeholder(_)
+            | ty::Projection(_)
+            | ty::UnnormalizedProjection(_) => false,
+        }
     }
 
     /// If `ty.needs_drop(...)` returns `true`, then `ty` is definitely
@@ -724,7 +762,23 @@ impl<'tcx> ty::TyS<'tcx> {
     /// Note that this method is used to check eligible types in unions.
     #[inline]
     pub fn needs_drop(&'tcx self, tcx: TyCtxt<'tcx>, param_env: ty::ParamEnv<'tcx>) -> bool {
-        tcx.needs_drop_raw(param_env.and(self)).0
+        // Avoid querying in simple cases.
+        match needs_drop_components(self, &tcx.data_layout) {
+            Err(AlwaysRequiresDrop) => true,
+            Ok(components) => {
+                let query_ty = match *components {
+                    [] => return false,
+                    // If we've got a single component, call the query with that
+                    // to increase the chance that we hit the query cache.
+                    [component_ty] => component_ty,
+                    _ => self,
+                };
+                // This doesn't depend on regions, so try to minimize distinct
+                // query keys used.
+                let erased = tcx.normalize_erasing_regions(param_env, query_ty);
+                tcx.needs_drop_raw(param_env.and(erased))
+            }
+        }
     }
 
     pub fn same_type(a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
@@ -923,9 +977,6 @@ impl<'tcx> ty::TyS<'tcx> {
     }
 }
 
-#[derive(Clone, HashStable)]
-pub struct NeedsDrop(pub bool);
-
 pub enum ExplicitSelf<'tcx> {
     ByValue,
     ByReference(ty::Region<'tcx>, hir::Mutability),
@@ -974,3 +1025,72 @@ impl<'tcx> ExplicitSelf<'tcx> {
         }
     }
 }
+
+/// Returns a list of types such that the given type needs drop if and only if
+/// *any* of the returned types need drop. Returns `Err(AlwaysRequiresDrop)` if
+/// this type always needs drop.
+pub fn needs_drop_components(
+    ty: Ty<'tcx>,
+    target_layout: &TargetDataLayout,
+) -> Result<SmallVec<[Ty<'tcx>; 2]>, AlwaysRequiresDrop> {
+    match ty.kind {
+        ty::Infer(ty::FreshIntTy(_))
+        | ty::Infer(ty::FreshFloatTy(_))
+        | ty::Bool
+        | ty::Int(_)
+        | ty::Uint(_)
+        | ty::Float(_)
+        | ty::Never
+        | ty::FnDef(..)
+        | ty::FnPtr(_)
+        | ty::Char
+        | ty::GeneratorWitness(..)
+        | ty::RawPtr(_)
+        | ty::Ref(..)
+        | ty::Str => Ok(SmallVec::new()),
+
+        // Foreign types can never have destructors.
+        ty::Foreign(..) => Ok(SmallVec::new()),
+
+        // Pessimistically assume that all generators will require destructors
+        // as we don't know if a destructor is a noop or not until after the MIR
+        // state transformation pass.
+        ty::Generator(..) | ty::Dynamic(..) | ty::Error => Err(AlwaysRequiresDrop),
+
+        ty::Slice(ty) => needs_drop_components(ty, target_layout),
+        ty::Array(elem_ty, size) => {
+            match needs_drop_components(elem_ty, target_layout) {
+                Ok(v) if v.is_empty() => Ok(v),
+                res => match size.val.try_to_bits(target_layout.pointer_size) {
+                    // Arrays of size zero don't need drop, even if their element
+                    // type does.
+                    Some(0) => Ok(SmallVec::new()),
+                    Some(_) => res,
+                    // We don't know which of the cases above we are in, so
+                    // return the whole type and let the caller decide what to
+                    // do.
+                    None => Ok(smallvec![ty]),
+                },
+            }
+        }
+        // If any field needs drop, then the whole tuple does.
+        ty::Tuple(..) => ty.tuple_fields().try_fold(SmallVec::new(), move |mut acc, elem| {
+            acc.extend(needs_drop_components(elem, target_layout)?);
+            Ok(acc)
+        }),
+
+        // These require checking for `Copy` bounds or `Adt` destructors.
+        ty::Adt(..)
+        | ty::Projection(..)
+        | ty::UnnormalizedProjection(..)
+        | ty::Param(_)
+        | ty::Bound(..)
+        | ty::Placeholder(..)
+        | ty::Opaque(..)
+        | ty::Infer(_)
+        | ty::Closure(..) => Ok(smallvec![ty]),
+    }
+}
+
+#[derive(Copy, Clone, Debug, HashStable, RustcEncodable, RustcDecodable)]
+pub struct AlwaysRequiresDrop;
diff --git a/src/librustc_ast/Cargo.toml b/src/librustc_ast/Cargo.toml
new file mode 100644
index 0000000000..867bcf7923
--- /dev/null
+++ b/src/librustc_ast/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ast"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+name = "rustc_ast"
+path = "lib.rs"
+doctest = false
+
+[dependencies]
+rustc_serialize = { path = "../libserialize", package = "serialize" }
+log = "0.4"
+scoped-tls = "1.0"
+rustc_span = { path = "../librustc_span" }
+rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_index = { path = "../librustc_index" }
+rustc_lexer = { path = "../librustc_lexer" }
+rustc_macros = { path = "../librustc_macros" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_ast/README.md b/src/librustc_ast/README.md
new file mode 100644
index 0000000000..d62e5a5ece
--- /dev/null
+++ b/src/librustc_ast/README.md
@@ -0,0 +1,9 @@
+The `rustc_ast` crate contains those things concerned purely with syntax
+– that is, the AST ("abstract syntax tree"), parser, pretty-printer,
+lexer, macro expander, and utilities for traversing ASTs.
+
+For more information about how these things work in rustc, see the
+rustc guide:
+
+- [Parsing](https://rust-lang.github.io/rustc-guide/the-parser.html)
+- [Macro Expansion](https://rust-lang.github.io/rustc-guide/macro-expansion.html)
diff --git a/src/libsyntax/ast.rs b/src/librustc_ast/ast.rs
similarity index 92%
rename from src/libsyntax/ast.rs
rename to src/librustc_ast/ast.rs
index 5c64cc440c..88a96dc6c6 100644
--- a/src/libsyntax/ast.rs
+++ b/src/librustc_ast/ast.rs
@@ -34,10 +34,11 @@ use rustc_data_structures::thin_vec::ThinVec;
 use rustc_index::vec::Idx;
 use rustc_macros::HashStable_Generic;
 use rustc_serialize::{self, Decoder, Encoder};
-use rustc_span::source_map::{dummy_spanned, respan, Spanned};
+use rustc_span::source_map::{respan, Spanned};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 
+use std::convert::TryFrom;
 use std::fmt;
 use std::iter;
 
@@ -243,7 +244,7 @@ pub struct ParenthesizedArgs {
     pub inputs: Vec<P<Ty>>,
 
     /// `C`
-    pub output: FunctionRetTy,
+    pub output: FnRetTy,
 }
 
 impl ParenthesizedArgs {
@@ -256,15 +257,7 @@ impl ParenthesizedArgs {
     }
 }
 
-pub use rustc_session::node_id::NodeId;
-
-/// `NodeId` used to represent the root of the crate.
-pub const CRATE_NODE_ID: NodeId = NodeId::from_u32_const(0);
-
-/// When parsing and doing expansions, we initially give all AST nodes this AST
-/// node value. Then later, in the renumber pass, we renumber them to have
-/// small, positive ids.
-pub const DUMMY_NODE_ID: NodeId = NodeId::MAX;
+pub use crate::node_id::{NodeId, CRATE_NODE_ID, DUMMY_NODE_ID};
 
 /// A modifier on a bound, e.g., `?Sized` or `?const Trait`.
 ///
@@ -432,13 +425,18 @@ pub struct WhereEqPredicate {
     pub rhs_ty: P<Ty>,
 }
 
-pub use rustc_session::parse::CrateConfig;
-
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct Crate {
     pub module: Mod,
     pub attrs: Vec<Attribute>,
     pub span: Span,
+    /// The order of items in the HIR is unrelated to the order of
+    /// items in the AST. However, we generate proc macro harnesses
+    /// based on the AST order, and later refer to these harnesses
+    /// from the HIR. This field keeps track of the order in which
+    /// we generated proc macros harnesses, so that we can map
+    /// HIR proc macros items back to their harness items.
+    pub proc_macros: Vec<NodeId>,
 }
 
 /// Possible values inside of compile-time attribute lists.
@@ -916,6 +914,8 @@ pub enum StmtKind {
     Expr(P<Expr>),
     /// Expr with a trailing semi-colon.
     Semi(P<Expr>),
+    /// Just a trailing semi-colon.
+    Empty,
     /// Macro.
     Mac(P<(Mac, MacStmtStyle, AttrVec)>),
 }
@@ -1078,7 +1078,7 @@ impl Expr {
 
             // If binary operator is `Add` and both `lhs` and `rhs` are trait bounds,
             // then type of result is trait object.
-            // Othewise we don't assume the result type.
+            // Otherwise we don't assume the result type.
             ExprKind::Binary(binop, lhs, rhs) if binop.node == BinOpKind::Add => {
                 if let (Some(lhs), Some(rhs)) = (lhs.to_bound(), rhs.to_bound()) {
                     TyKind::TraitObject(vec![lhs, rhs], TraitObjectSyntax::None)
@@ -1208,14 +1208,14 @@ pub enum ExprKind {
     /// A closure (e.g., `move |a, b, c| a + b + c`).
     ///
     /// The final span is the span of the argument block `|...|`.
-    Closure(CaptureBy, IsAsync, Movability, P<FnDecl>, P<Expr>, Span),
+    Closure(CaptureBy, Async, Movability, P<FnDecl>, P<Expr>, Span),
     /// A block (`'label: { ... }`).
     Block(P<Block>, Option<Label>),
     /// An async block (`async move { ... }`).
     ///
     /// The `NodeId` is the `NodeId` for the closure that results from
     /// desugaring an async block, just like the NodeId field in the
-    /// `IsAsync` enum. This is necessary in order to create a def for the
+    /// `Async::Yes` variant. This is necessary in order to create a def for the
     /// closure which can be used as a parent of any child defs. Defs
     /// created during lowering cannot be made the parent of any other
     /// preexisting defs.
@@ -1427,7 +1427,7 @@ pub enum MacDelimiter {
 }
 
 impl MacDelimiter {
-    crate fn to_token(self) -> DelimToken {
+    pub fn to_token(self) -> DelimToken {
         match self {
             MacDelimiter::Parenthesis => DelimToken::Paren,
             MacDelimiter::Bracket => DelimToken::Bracket,
@@ -1490,7 +1490,7 @@ pub struct StrLit {
 }
 
 impl StrLit {
-    crate fn as_lit(&self) -> Lit {
+    pub fn as_lit(&self) -> Lit {
         let token_kind = match self.style {
             StrStyle::Cooked => token::Str,
             StrStyle::Raw(n) => token::StrRaw(n),
@@ -1615,46 +1615,6 @@ pub struct FnSig {
     pub decl: P<FnDecl>,
 }
 
-/// Represents associated items.
-/// These include items in `impl` and `trait` definitions.
-#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
-pub struct AssocItem {
-    pub attrs: Vec<Attribute>,
-    pub id: NodeId,
-    pub span: Span,
-    pub vis: Visibility,
-    pub ident: Ident,
-
-    pub defaultness: Defaultness,
-    pub generics: Generics,
-    pub kind: AssocItemKind,
-    /// See `Item::tokens` for what this is.
-    pub tokens: Option<TokenStream>,
-}
-
-/// Represents various kinds of content within an `impl`.
-///
-/// The term "provided" in the variants below refers to the item having a default
-/// definition / body. Meanwhile, a "required" item lacks a definition / body.
-/// In an implementation, all items must be provided.
-/// The `Option`s below denote the bodies, where `Some(_)`
-/// means "provided" and conversely `None` means "required".
-#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
-pub enum AssocItemKind {
-    /// An associated constant, `const $ident: $ty $def?;` where `def ::= "=" $expr? ;`.
-    /// If `def` is parsed, then the associated constant is provided, and otherwise required.
-    Const(P<Ty>, Option<P<Expr>>),
-
-    /// An associated function.
-    Fn(FnSig, Option<P<Block>>),
-
-    /// An associated type.
-    TyAlias(GenericBounds, Option<P<Ty>>),
-
-    /// A macro expanding to an associated item.
-    Macro(Mac),
-}
-
 #[derive(
     Clone,
     Copy,
@@ -1873,7 +1833,7 @@ pub struct Ty {
 
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct BareFnTy {
-    pub unsafety: Unsafety,
+    pub unsafety: Unsafe,
     pub ext: Extern,
     pub generic_params: Vec<GenericParam>,
     pub decl: P<FnDecl>,
@@ -2086,7 +2046,7 @@ impl Param {
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct FnDecl {
     pub inputs: Vec<Param>,
-    pub output: FunctionRetTy,
+    pub output: FnRetTy,
 }
 
 impl FnDecl {
@@ -2111,77 +2071,45 @@ pub enum IsAuto {
     No,
 }
 
-#[derive(
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Hash,
-    RustcEncodable,
-    RustcDecodable,
-    Debug,
-    HashStable_Generic
-)]
-pub enum Unsafety {
-    Unsafe,
-    Normal,
-}
-
-impl Unsafety {
-    pub fn prefix_str(&self) -> &'static str {
-        match self {
-            Unsafety::Unsafe => "unsafe ",
-            Unsafety::Normal => "",
-        }
-    }
-}
-
-impl fmt::Display for Unsafety {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Display::fmt(
-            match *self {
-                Unsafety::Normal => "normal",
-                Unsafety::Unsafe => "unsafe",
-            },
-            f,
-        )
-    }
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, RustcEncodable, RustcDecodable, Debug)]
+#[derive(HashStable_Generic)]
+pub enum Unsafe {
+    Yes(Span),
+    No,
 }
 
 #[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug)]
-pub enum IsAsync {
-    Async { closure_id: NodeId, return_impl_trait_id: NodeId },
-    NotAsync,
+pub enum Async {
+    Yes { span: Span, closure_id: NodeId, return_impl_trait_id: NodeId },
+    No,
 }
 
-impl IsAsync {
+impl Async {
     pub fn is_async(self) -> bool {
-        if let IsAsync::Async { .. } = self { true } else { false }
+        if let Async::Yes { .. } = self { true } else { false }
     }
 
-    /// In ths case this is an `async` return, the `NodeId` for the generated `impl Trait` item.
+    /// In this case this is an `async` return, the `NodeId` for the generated `impl Trait` item.
     pub fn opt_return_id(self) -> Option<NodeId> {
         match self {
-            IsAsync::Async { return_impl_trait_id, .. } => Some(return_impl_trait_id),
-            IsAsync::NotAsync => None,
+            Async::Yes { return_impl_trait_id, .. } => Some(return_impl_trait_id),
+            Async::No => None,
         }
     }
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, Debug)]
 #[derive(HashStable_Generic)]
-pub enum Constness {
-    Const,
-    NotConst,
+pub enum Const {
+    Yes(Span),
+    No,
 }
 
 /// Item defaultness.
 /// For details see the [RFC #2532](https://github.com/rust-lang/rfcs/pull/2532).
 #[derive(Copy, Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
 pub enum Defaultness {
-    Default,
+    Default(Span),
     Final,
 }
 
@@ -2203,8 +2131,7 @@ impl fmt::Debug for ImplPolarity {
 }
 
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
-pub enum FunctionRetTy {
-    // FIXME(Centril): Rename to `FnRetTy` and in HIR also.
+pub enum FnRetTy {
     /// Returns type is not specified.
     ///
     /// Functions default to `()` and closures default to inference.
@@ -2214,11 +2141,11 @@ pub enum FunctionRetTy {
     Ty(P<Ty>),
 }
 
-impl FunctionRetTy {
+impl FnRetTy {
     pub fn span(&self) -> Span {
         match *self {
-            FunctionRetTy::Default(span) => span,
-            FunctionRetTy::Ty(ref ty) => ty.span,
+            FnRetTy::Default(span) => span,
+            FnRetTy::Ty(ref ty) => ty.span,
         }
     }
 }
@@ -2243,7 +2170,7 @@ pub struct Mod {
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct ForeignMod {
     pub abi: Option<StrLit>,
-    pub items: Vec<ForeignItem>,
+    pub items: Vec<P<ForeignItem>>,
 }
 
 /// Global inline assembly.
@@ -2487,15 +2414,15 @@ impl VariantData {
     }
 }
 
-/// An item.
-///
-/// The name might be a dummy name in case of anonymous items.
+/// An item definition.
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct Item<K = ItemKind> {
     pub attrs: Vec<Attribute>,
     pub id: NodeId,
     pub span: Span,
     pub vis: Visibility,
+    /// The name of the item.
+    /// It might be a dummy name in case of anonymous items.
     pub ident: Ident,
 
     pub kind: K,
@@ -2517,6 +2444,13 @@ impl Item {
     }
 }
 
+impl<K: Into<ItemKind>> Item<K> {
+    pub fn into_item(self) -> Item {
+        let Item { attrs, id, span, vis, ident, kind, tokens } = self;
+        Item { attrs, id, span, vis, ident, kind: kind.into(), tokens }
+    }
+}
+
 /// `extern` qualifier on a function item or function type.
 #[derive(Clone, Copy, RustcEncodable, RustcDecodable, Debug)]
 pub enum Extern {
@@ -2537,18 +2471,29 @@ impl Extern {
 /// included in this struct (e.g., `async unsafe fn` or `const extern "C" fn`).
 #[derive(Clone, Copy, RustcEncodable, RustcDecodable, Debug)]
 pub struct FnHeader {
-    pub unsafety: Unsafety,
-    pub asyncness: Spanned<IsAsync>,
-    pub constness: Spanned<Constness>,
+    pub unsafety: Unsafe,
+    pub asyncness: Async,
+    pub constness: Const,
     pub ext: Extern,
 }
 
+impl FnHeader {
+    /// Does this function header have any qualifiers or is it empty?
+    pub fn has_qualifiers(&self) -> bool {
+        let Self { unsafety, asyncness, constness, ext } = self;
+        matches!(unsafety, Unsafe::Yes(_))
+            || asyncness.is_async()
+            || matches!(constness, Const::Yes(_))
+            || !matches!(ext, Extern::None)
+    }
+}
+
 impl Default for FnHeader {
     fn default() -> FnHeader {
         FnHeader {
-            unsafety: Unsafety::Normal,
-            asyncness: dummy_spanned(IsAsync::NotAsync),
-            constness: dummy_spanned(Constness::NotConst),
+            unsafety: Unsafe::No,
+            asyncness: Async::No,
+            constness: Const::No,
             ext: Extern::None,
         }
     }
@@ -2567,15 +2512,15 @@ pub enum ItemKind {
     /// A static item (`static`).
     ///
     /// E.g., `static FOO: i32 = 42;` or `static FOO: &'static str = "bar";`.
-    Static(P<Ty>, Mutability, P<Expr>),
+    Static(P<Ty>, Mutability, Option<P<Expr>>),
     /// A constant item (`const`).
     ///
     /// E.g., `const FOO: i32 = 42;`.
-    Const(P<Ty>, P<Expr>),
+    Const(Defaultness, P<Ty>, Option<P<Expr>>),
     /// A function declaration (`fn`).
     ///
     /// E.g., `fn foo(bar: usize) -> usize { .. }`.
-    Fn(FnSig, Generics, P<Block>),
+    Fn(Defaultness, FnSig, Generics, Option<P<Block>>),
     /// A module declaration (`mod`).
     ///
     /// E.g., `mod foo;` or `mod foo { .. }`.
@@ -2589,7 +2534,7 @@ pub enum ItemKind {
     /// A type alias (`type`).
     ///
     /// E.g., `type Foo = Bar<u8>;`.
-    TyAlias(P<Ty>, Generics),
+    TyAlias(Defaultness, Generics, GenericBounds, Option<P<Ty>>),
     /// An enum definition (`enum`).
     ///
     /// E.g., `enum Foo<A, B> { C<A>, D<B> }`.
@@ -2605,7 +2550,7 @@ pub enum ItemKind {
     /// A trait declaration (`trait`).
     ///
     /// E.g., `trait Foo { .. }`, `trait Foo<T> { .. }` or `auto trait Foo {}`.
-    Trait(IsAuto, Unsafety, Generics, GenericBounds, Vec<AssocItem>),
+    Trait(IsAuto, Unsafe, Generics, GenericBounds, Vec<P<AssocItem>>),
     /// Trait alias
     ///
     /// E.g., `trait Foo = Bar + Quux;`.
@@ -2614,17 +2559,17 @@ pub enum ItemKind {
     ///
     /// E.g., `impl<A> Foo<A> { .. }` or `impl<A> Trait for Foo<A> { .. }`.
     Impl {
-        unsafety: Unsafety,
+        unsafety: Unsafe,
         polarity: ImplPolarity,
         defaultness: Defaultness,
-        constness: Constness,
+        constness: Const,
         generics: Generics,
 
         /// The trait being implemented, if any.
         of_trait: Option<TraitRef>,
 
         self_ty: P<Ty>,
-        items: Vec<AssocItem>,
+        items: Vec<P<AssocItem>>,
     },
     /// A macro invocation.
     ///
@@ -2636,30 +2581,41 @@ pub enum ItemKind {
 }
 
 impl ItemKind {
-    pub fn descriptive_variant(&self) -> &str {
-        match *self {
+    pub fn article(&self) -> &str {
+        use ItemKind::*;
+        match self {
+            Use(..) | Static(..) | Const(..) | Fn(..) | Mod(..) | GlobalAsm(..) | TyAlias(..)
+            | Struct(..) | Union(..) | Trait(..) | TraitAlias(..) | MacroDef(..) => "a",
+            ExternCrate(..) | ForeignMod(..) | Mac(..) | Enum(..) | Impl { .. } => "an",
+        }
+    }
+
+    pub fn descr(&self) -> &str {
+        match self {
             ItemKind::ExternCrate(..) => "extern crate",
-            ItemKind::Use(..) => "use",
+            ItemKind::Use(..) => "`use` import",
             ItemKind::Static(..) => "static item",
             ItemKind::Const(..) => "constant item",
             ItemKind::Fn(..) => "function",
             ItemKind::Mod(..) => "module",
-            ItemKind::ForeignMod(..) => "foreign module",
-            ItemKind::GlobalAsm(..) => "global asm",
+            ItemKind::ForeignMod(..) => "extern block",
+            ItemKind::GlobalAsm(..) => "global asm item",
             ItemKind::TyAlias(..) => "type alias",
             ItemKind::Enum(..) => "enum",
             ItemKind::Struct(..) => "struct",
             ItemKind::Union(..) => "union",
             ItemKind::Trait(..) => "trait",
             ItemKind::TraitAlias(..) => "trait alias",
-            ItemKind::Mac(..) | ItemKind::MacroDef(..) | ItemKind::Impl { .. } => "item",
+            ItemKind::Mac(..) => "item macro invocation",
+            ItemKind::MacroDef(..) => "macro definition",
+            ItemKind::Impl { .. } => "implementation",
         }
     }
 
     pub fn generics(&self) -> Option<&Generics> {
         match self {
-            Self::Fn(_, generics, _)
-            | Self::TyAlias(_, generics)
+            Self::Fn(_, _, generics, _)
+            | Self::TyAlias(_, generics, ..)
             | Self::Enum(_, generics)
             | Self::Struct(_, generics)
             | Self::Union(_, generics)
@@ -2671,28 +2627,100 @@ impl ItemKind {
     }
 }
 
-pub type ForeignItem = Item<ForeignItemKind>;
+/// Represents associated items.
+/// These include items in `impl` and `trait` definitions.
+pub type AssocItem = Item<AssocItemKind>;
+
+/// Represents associated item kinds.
+///
+/// The term "provided" in the variants below refers to the item having a default
+/// definition / body. Meanwhile, a "required" item lacks a definition / body.
+/// In an implementation, all items must be provided.
+/// The `Option`s below denote the bodies, where `Some(_)`
+/// means "provided" and conversely `None` means "required".
+#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
+pub enum AssocItemKind {
+    /// An associated constant, `const $ident: $ty $def?;` where `def ::= "=" $expr? ;`.
+    /// If `def` is parsed, then the constant is provided, and otherwise required.
+    Const(Defaultness, P<Ty>, Option<P<Expr>>),
+    /// An associated function.
+    Fn(Defaultness, FnSig, Generics, Option<P<Block>>),
+    /// An associated type.
+    TyAlias(Defaultness, Generics, GenericBounds, Option<P<Ty>>),
+    /// A macro expanding to associated items.
+    Macro(Mac),
+}
+
+impl AssocItemKind {
+    pub fn defaultness(&self) -> Defaultness {
+        match *self {
+            Self::Const(def, ..) | Self::Fn(def, ..) | Self::TyAlias(def, ..) => def,
+            Self::Macro(..) => Defaultness::Final,
+        }
+    }
+}
+
+impl From<AssocItemKind> for ItemKind {
+    fn from(assoc_item_kind: AssocItemKind) -> ItemKind {
+        match assoc_item_kind {
+            AssocItemKind::Const(a, b, c) => ItemKind::Const(a, b, c),
+            AssocItemKind::Fn(a, b, c, d) => ItemKind::Fn(a, b, c, d),
+            AssocItemKind::TyAlias(a, b, c, d) => ItemKind::TyAlias(a, b, c, d),
+            AssocItemKind::Macro(a) => ItemKind::Mac(a),
+        }
+    }
+}
 
-/// An item within an `extern` block.
+impl TryFrom<ItemKind> for AssocItemKind {
+    type Error = ItemKind;
+
+    fn try_from(item_kind: ItemKind) -> Result<AssocItemKind, ItemKind> {
+        Ok(match item_kind {
+            ItemKind::Const(a, b, c) => AssocItemKind::Const(a, b, c),
+            ItemKind::Fn(a, b, c, d) => AssocItemKind::Fn(a, b, c, d),
+            ItemKind::TyAlias(a, b, c, d) => AssocItemKind::TyAlias(a, b, c, d),
+            ItemKind::Mac(a) => AssocItemKind::Macro(a),
+            _ => return Err(item_kind),
+        })
+    }
+}
+
+/// An item in `extern` block.
 #[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub enum ForeignItemKind {
+    /// A foreign static item (`static FOO: u8`).
+    Static(P<Ty>, Mutability, Option<P<Expr>>),
     /// A foreign function.
-    Fn(P<FnDecl>, Generics),
-    /// A foreign static item (`static ext: u8`).
-    Static(P<Ty>, Mutability),
+    Fn(Defaultness, FnSig, Generics, Option<P<Block>>),
     /// A foreign type.
-    Ty,
-    /// A macro invocation.
+    TyAlias(Defaultness, Generics, GenericBounds, Option<P<Ty>>),
+    /// A macro expanding to foreign items.
     Macro(Mac),
 }
 
-impl ForeignItemKind {
-    pub fn descriptive_variant(&self) -> &str {
-        match *self {
-            ForeignItemKind::Fn(..) => "foreign function",
-            ForeignItemKind::Static(..) => "foreign static item",
-            ForeignItemKind::Ty => "foreign type",
-            ForeignItemKind::Macro(..) => "macro in foreign module",
+impl From<ForeignItemKind> for ItemKind {
+    fn from(foreign_item_kind: ForeignItemKind) -> ItemKind {
+        match foreign_item_kind {
+            ForeignItemKind::Static(a, b, c) => ItemKind::Static(a, b, c),
+            ForeignItemKind::Fn(a, b, c, d) => ItemKind::Fn(a, b, c, d),
+            ForeignItemKind::TyAlias(a, b, c, d) => ItemKind::TyAlias(a, b, c, d),
+            ForeignItemKind::Macro(a) => ItemKind::Mac(a),
         }
     }
 }
+
+impl TryFrom<ItemKind> for ForeignItemKind {
+    type Error = ItemKind;
+
+    fn try_from(item_kind: ItemKind) -> Result<ForeignItemKind, ItemKind> {
+        Ok(match item_kind {
+            ItemKind::Static(a, b, c) => ForeignItemKind::Static(a, b, c),
+            ItemKind::Fn(a, b, c, d) => ForeignItemKind::Fn(a, b, c, d),
+            ItemKind::TyAlias(a, b, c, d) => ForeignItemKind::TyAlias(a, b, c, d),
+            ItemKind::Mac(a) => ForeignItemKind::Macro(a),
+            _ => return Err(item_kind),
+        })
+    }
+}
+
+pub type ForeignItem = Item<ForeignItemKind>;
diff --git a/src/libsyntax/ast/tests.rs b/src/librustc_ast/ast/tests.rs
similarity index 100%
rename from src/libsyntax/ast/tests.rs
rename to src/librustc_ast/ast/tests.rs
diff --git a/src/librustc_ast/attr/mod.rs b/src/librustc_ast/attr/mod.rs
new file mode 100644
index 0000000000..52a59e82ae
--- /dev/null
+++ b/src/librustc_ast/attr/mod.rs
@@ -0,0 +1,729 @@
+//! Functions dealing with attributes and meta items.
+
+use crate::ast;
+use crate::ast::{AttrId, AttrItem, AttrKind, AttrStyle, AttrVec, Attribute};
+use crate::ast::{Expr, GenericParam, Item, Lit, LitKind, Local, Stmt, StmtKind};
+use crate::ast::{Ident, Name, Path, PathSegment};
+use crate::ast::{MacArgs, MacDelimiter, MetaItem, MetaItemKind, NestedMetaItem};
+use crate::mut_visit::visit_clobber;
+use crate::ptr::P;
+use crate::token::{self, Token};
+use crate::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndJoint};
+
+use rustc_data_structures::sync::Lock;
+use rustc_index::bit_set::GrowableBitSet;
+use rustc_span::edition::{Edition, DEFAULT_EDITION};
+use rustc_span::source_map::{BytePos, Spanned};
+use rustc_span::symbol::{sym, Symbol};
+use rustc_span::Span;
+
+use log::debug;
+use std::iter;
+use std::ops::DerefMut;
+
+pub struct Globals {
+    used_attrs: Lock<GrowableBitSet<AttrId>>,
+    known_attrs: Lock<GrowableBitSet<AttrId>>,
+    rustc_span_globals: rustc_span::Globals,
+}
+
+impl Globals {
+    fn new(edition: Edition) -> Globals {
+        Globals {
+            // We have no idea how many attributes there will be, so just
+            // initiate the vectors with 0 bits. We'll grow them as necessary.
+            used_attrs: Lock::new(GrowableBitSet::new_empty()),
+            known_attrs: Lock::new(GrowableBitSet::new_empty()),
+            rustc_span_globals: rustc_span::Globals::new(edition),
+        }
+    }
+}
+
+pub fn with_globals<R>(edition: Edition, f: impl FnOnce() -> R) -> R {
+    let globals = Globals::new(edition);
+    GLOBALS.set(&globals, || rustc_span::GLOBALS.set(&globals.rustc_span_globals, f))
+}
+
+pub fn with_default_globals<R>(f: impl FnOnce() -> R) -> R {
+    with_globals(DEFAULT_EDITION, f)
+}
+
+scoped_tls::scoped_thread_local!(pub static GLOBALS: Globals);
+
+pub fn mark_used(attr: &Attribute) {
+    debug!("marking {:?} as used", attr);
+    GLOBALS.with(|globals| {
+        globals.used_attrs.lock().insert(attr.id);
+    });
+}
+
+pub fn is_used(attr: &Attribute) -> bool {
+    GLOBALS.with(|globals| globals.used_attrs.lock().contains(attr.id))
+}
+
+pub fn mark_known(attr: &Attribute) {
+    debug!("marking {:?} as known", attr);
+    GLOBALS.with(|globals| {
+        globals.known_attrs.lock().insert(attr.id);
+    });
+}
+
+pub fn is_known(attr: &Attribute) -> bool {
+    GLOBALS.with(|globals| globals.known_attrs.lock().contains(attr.id))
+}
+
+pub fn is_known_lint_tool(m_item: Ident) -> bool {
+    [sym::clippy, sym::rustc].contains(&m_item.name)
+}
+
+impl NestedMetaItem {
+    /// Returns the `MetaItem` if `self` is a `NestedMetaItem::MetaItem`.
+    pub fn meta_item(&self) -> Option<&MetaItem> {
+        match *self {
+            NestedMetaItem::MetaItem(ref item) => Some(item),
+            _ => None,
+        }
+    }
+
+    /// Returns the `Lit` if `self` is a `NestedMetaItem::Literal`s.
+    pub fn literal(&self) -> Option<&Lit> {
+        match *self {
+            NestedMetaItem::Literal(ref lit) => Some(lit),
+            _ => None,
+        }
+    }
+
+    /// Returns `true` if this list item is a MetaItem with a name of `name`.
+    pub fn check_name(&self, name: Symbol) -> bool {
+        self.meta_item().map_or(false, |meta_item| meta_item.check_name(name))
+    }
+
+    /// For a single-segment meta item, returns its name; otherwise, returns `None`.
+    pub fn ident(&self) -> Option<Ident> {
+        self.meta_item().and_then(|meta_item| meta_item.ident())
+    }
+    pub fn name_or_empty(&self) -> Symbol {
+        self.ident().unwrap_or(Ident::invalid()).name
+    }
+
+    /// Gets the string value if `self` is a `MetaItem` and the `MetaItem` is a
+    /// `MetaItemKind::NameValue` variant containing a string, otherwise `None`.
+    pub fn value_str(&self) -> Option<Symbol> {
+        self.meta_item().and_then(|meta_item| meta_item.value_str())
+    }
+
+    /// Returns a name and single literal value tuple of the `MetaItem`.
+    pub fn name_value_literal(&self) -> Option<(Name, &Lit)> {
+        self.meta_item().and_then(|meta_item| {
+            meta_item.meta_item_list().and_then(|meta_item_list| {
+                if meta_item_list.len() == 1 {
+                    if let Some(ident) = meta_item.ident() {
+                        if let Some(lit) = meta_item_list[0].literal() {
+                            return Some((ident.name, lit));
+                        }
+                    }
+                }
+                None
+            })
+        })
+    }
+
+    /// Gets a list of inner meta items from a list `MetaItem` type.
+    pub fn meta_item_list(&self) -> Option<&[NestedMetaItem]> {
+        self.meta_item().and_then(|meta_item| meta_item.meta_item_list())
+    }
+
+    /// Returns `true` if the variant is `MetaItem`.
+    pub fn is_meta_item(&self) -> bool {
+        self.meta_item().is_some()
+    }
+
+    /// Returns `true` if the variant is `Literal`.
+    pub fn is_literal(&self) -> bool {
+        self.literal().is_some()
+    }
+
+    /// Returns `true` if `self` is a `MetaItem` and the meta item is a word.
+    pub fn is_word(&self) -> bool {
+        self.meta_item().map_or(false, |meta_item| meta_item.is_word())
+    }
+
+    /// Returns `true` if `self` is a `MetaItem` and the meta item is a `ValueString`.
+    pub fn is_value_str(&self) -> bool {
+        self.value_str().is_some()
+    }
+
+    /// Returns `true` if `self` is a `MetaItem` and the meta item is a list.
+    pub fn is_meta_item_list(&self) -> bool {
+        self.meta_item_list().is_some()
+    }
+}
+
+impl Attribute {
+    pub fn has_name(&self, name: Symbol) -> bool {
+        match self.kind {
+            AttrKind::Normal(ref item) => item.path == name,
+            AttrKind::DocComment(_) => false,
+        }
+    }
+
+    /// Returns `true` if the attribute's path matches the argument. If it matches, then the
+    /// attribute is marked as used.
+    pub fn check_name(&self, name: Symbol) -> bool {
+        let matches = self.has_name(name);
+        if matches {
+            mark_used(self);
+        }
+        matches
+    }
+
+    /// For a single-segment attribute, returns its name; otherwise, returns `None`.
+    pub fn ident(&self) -> Option<Ident> {
+        match self.kind {
+            AttrKind::Normal(ref item) => {
+                if item.path.segments.len() == 1 {
+                    Some(item.path.segments[0].ident)
+                } else {
+                    None
+                }
+            }
+            AttrKind::DocComment(_) => None,
+        }
+    }
+    pub fn name_or_empty(&self) -> Symbol {
+        self.ident().unwrap_or(Ident::invalid()).name
+    }
+
+    pub fn value_str(&self) -> Option<Symbol> {
+        match self.kind {
+            AttrKind::Normal(ref item) => item.meta(self.span).and_then(|meta| meta.value_str()),
+            AttrKind::DocComment(..) => None,
+        }
+    }
+
+    pub fn meta_item_list(&self) -> Option<Vec<NestedMetaItem>> {
+        match self.kind {
+            AttrKind::Normal(ref item) => match item.meta(self.span) {
+                Some(MetaItem { kind: MetaItemKind::List(list), .. }) => Some(list),
+                _ => None,
+            },
+            AttrKind::DocComment(_) => None,
+        }
+    }
+
+    pub fn is_word(&self) -> bool {
+        if let AttrKind::Normal(item) = &self.kind {
+            matches!(item.args, MacArgs::Empty)
+        } else {
+            false
+        }
+    }
+
+    pub fn is_meta_item_list(&self) -> bool {
+        self.meta_item_list().is_some()
+    }
+
+    /// Indicates if the attribute is a `ValueString`.
+    pub fn is_value_str(&self) -> bool {
+        self.value_str().is_some()
+    }
+}
+
+impl MetaItem {
+    /// For a single-segment meta item, returns its name; otherwise, returns `None`.
+    pub fn ident(&self) -> Option<Ident> {
+        if self.path.segments.len() == 1 { Some(self.path.segments[0].ident) } else { None }
+    }
+    pub fn name_or_empty(&self) -> Symbol {
+        self.ident().unwrap_or(Ident::invalid()).name
+    }
+
+    // Example:
+    //     #[attribute(name = "value")]
+    //                 ^^^^^^^^^^^^^^
+    pub fn name_value_literal(&self) -> Option<&Lit> {
+        match &self.kind {
+            MetaItemKind::NameValue(v) => Some(v),
+            _ => None,
+        }
+    }
+
+    pub fn value_str(&self) -> Option<Symbol> {
+        match self.kind {
+            MetaItemKind::NameValue(ref v) => match v.kind {
+                LitKind::Str(ref s, _) => Some(*s),
+                _ => None,
+            },
+            _ => None,
+        }
+    }
+
+    pub fn meta_item_list(&self) -> Option<&[NestedMetaItem]> {
+        match self.kind {
+            MetaItemKind::List(ref l) => Some(&l[..]),
+            _ => None,
+        }
+    }
+
+    pub fn is_word(&self) -> bool {
+        match self.kind {
+            MetaItemKind::Word => true,
+            _ => false,
+        }
+    }
+
+    pub fn check_name(&self, name: Symbol) -> bool {
+        self.path == name
+    }
+
+    pub fn is_value_str(&self) -> bool {
+        self.value_str().is_some()
+    }
+
+    pub fn is_meta_item_list(&self) -> bool {
+        self.meta_item_list().is_some()
+    }
+}
+
+impl AttrItem {
+    pub fn span(&self) -> Span {
+        self.args.span().map_or(self.path.span, |args_span| self.path.span.to(args_span))
+    }
+
+    pub fn meta(&self, span: Span) -> Option<MetaItem> {
+        Some(MetaItem {
+            path: self.path.clone(),
+            kind: MetaItemKind::from_mac_args(&self.args)?,
+            span,
+        })
+    }
+}
+
+impl Attribute {
+    pub fn is_doc_comment(&self) -> bool {
+        match self.kind {
+            AttrKind::Normal(_) => false,
+            AttrKind::DocComment(_) => true,
+        }
+    }
+
+    pub fn doc_str(&self) -> Option<Symbol> {
+        match self.kind {
+            AttrKind::DocComment(symbol) => Some(symbol),
+            AttrKind::Normal(ref item) if item.path == sym::doc => {
+                item.meta(self.span).and_then(|meta| meta.value_str())
+            }
+            _ => None,
+        }
+    }
+
+    pub fn get_normal_item(&self) -> &AttrItem {
+        match self.kind {
+            AttrKind::Normal(ref item) => item,
+            AttrKind::DocComment(_) => panic!("unexpected doc comment"),
+        }
+    }
+
+    pub fn unwrap_normal_item(self) -> AttrItem {
+        match self.kind {
+            AttrKind::Normal(item) => item,
+            AttrKind::DocComment(_) => panic!("unexpected doc comment"),
+        }
+    }
+
+    /// Extracts the MetaItem from inside this Attribute.
+    pub fn meta(&self) -> Option<MetaItem> {
+        match self.kind {
+            AttrKind::Normal(ref item) => item.meta(self.span),
+            AttrKind::DocComment(..) => None,
+        }
+    }
+}
+
+/* Constructors */
+
+pub fn mk_name_value_item_str(ident: Ident, str: Symbol, str_span: Span) -> MetaItem {
+    let lit_kind = LitKind::Str(str, ast::StrStyle::Cooked);
+    mk_name_value_item(ident, lit_kind, str_span)
+}
+
+pub fn mk_name_value_item(ident: Ident, lit_kind: LitKind, lit_span: Span) -> MetaItem {
+    let lit = Lit::from_lit_kind(lit_kind, lit_span);
+    let span = ident.span.to(lit_span);
+    MetaItem { path: Path::from_ident(ident), span, kind: MetaItemKind::NameValue(lit) }
+}
+
+pub fn mk_list_item(ident: Ident, items: Vec<NestedMetaItem>) -> MetaItem {
+    MetaItem { path: Path::from_ident(ident), span: ident.span, kind: MetaItemKind::List(items) }
+}
+
+pub fn mk_word_item(ident: Ident) -> MetaItem {
+    MetaItem { path: Path::from_ident(ident), span: ident.span, kind: MetaItemKind::Word }
+}
+
+pub fn mk_nested_word_item(ident: Ident) -> NestedMetaItem {
+    NestedMetaItem::MetaItem(mk_word_item(ident))
+}
+
+crate fn mk_attr_id() -> AttrId {
+    use std::sync::atomic::AtomicUsize;
+    use std::sync::atomic::Ordering;
+
+    static NEXT_ATTR_ID: AtomicUsize = AtomicUsize::new(0);
+
+    let id = NEXT_ATTR_ID.fetch_add(1, Ordering::SeqCst);
+    assert!(id != ::std::usize::MAX);
+    AttrId(id)
+}
+
+pub fn mk_attr(style: AttrStyle, path: Path, args: MacArgs, span: Span) -> Attribute {
+    mk_attr_from_item(style, AttrItem { path, args }, span)
+}
+
+pub fn mk_attr_from_item(style: AttrStyle, item: AttrItem, span: Span) -> Attribute {
+    Attribute { kind: AttrKind::Normal(item), id: mk_attr_id(), style, span }
+}
+
+/// Returns an inner attribute with the given value and span.
+pub fn mk_attr_inner(item: MetaItem) -> Attribute {
+    mk_attr(AttrStyle::Inner, item.path, item.kind.mac_args(item.span), item.span)
+}
+
+/// Returns an outer attribute with the given value and span.
+pub fn mk_attr_outer(item: MetaItem) -> Attribute {
+    mk_attr(AttrStyle::Outer, item.path, item.kind.mac_args(item.span), item.span)
+}
+
+pub fn mk_doc_comment(style: AttrStyle, comment: Symbol, span: Span) -> Attribute {
+    Attribute { kind: AttrKind::DocComment(comment), id: mk_attr_id(), style, span }
+}
+
+pub fn list_contains_name(items: &[NestedMetaItem], name: Symbol) -> bool {
+    items.iter().any(|item| item.check_name(name))
+}
+
+pub fn contains_name(attrs: &[Attribute], name: Symbol) -> bool {
+    attrs.iter().any(|item| item.check_name(name))
+}
+
+pub fn find_by_name(attrs: &[Attribute], name: Symbol) -> Option<&Attribute> {
+    attrs.iter().find(|attr| attr.check_name(name))
+}
+
+pub fn filter_by_name(attrs: &[Attribute], name: Symbol) -> impl Iterator<Item = &Attribute> {
+    attrs.iter().filter(move |attr| attr.check_name(name))
+}
+
+pub fn first_attr_value_str_by_name(attrs: &[Attribute], name: Symbol) -> Option<Symbol> {
+    attrs.iter().find(|at| at.check_name(name)).and_then(|at| at.value_str())
+}
+
+impl MetaItem {
+    fn token_trees_and_joints(&self) -> Vec<TreeAndJoint> {
+        let mut idents = vec![];
+        let mut last_pos = BytePos(0 as u32);
+        for (i, segment) in self.path.segments.iter().enumerate() {
+            let is_first = i == 0;
+            if !is_first {
+                let mod_sep_span =
+                    Span::new(last_pos, segment.ident.span.lo(), segment.ident.span.ctxt());
+                idents.push(TokenTree::token(token::ModSep, mod_sep_span).into());
+            }
+            idents.push(TokenTree::Token(Token::from_ast_ident(segment.ident)).into());
+            last_pos = segment.ident.span.hi();
+        }
+        idents.extend(self.kind.token_trees_and_joints(self.span));
+        idents
+    }
+
+    fn from_tokens<I>(tokens: &mut iter::Peekable<I>) -> Option<MetaItem>
+    where
+        I: Iterator<Item = TokenTree>,
+    {
+        // FIXME: Share code with `parse_path`.
+        let path = match tokens.next().map(TokenTree::uninterpolate) {
+            Some(TokenTree::Token(Token { kind: kind @ token::Ident(..), span }))
+            | Some(TokenTree::Token(Token { kind: kind @ token::ModSep, span })) => 'arm: {
+                let mut segments = if let token::Ident(name, _) = kind {
+                    if let Some(TokenTree::Token(Token { kind: token::ModSep, .. })) = tokens.peek()
+                    {
+                        tokens.next();
+                        vec![PathSegment::from_ident(Ident::new(name, span))]
+                    } else {
+                        break 'arm Path::from_ident(Ident::new(name, span));
+                    }
+                } else {
+                    vec![PathSegment::path_root(span)]
+                };
+                loop {
+                    if let Some(TokenTree::Token(Token { kind: token::Ident(name, _), span })) =
+                        tokens.next().map(TokenTree::uninterpolate)
+                    {
+                        segments.push(PathSegment::from_ident(Ident::new(name, span)));
+                    } else {
+                        return None;
+                    }
+                    if let Some(TokenTree::Token(Token { kind: token::ModSep, .. })) = tokens.peek()
+                    {
+                        tokens.next();
+                    } else {
+                        break;
+                    }
+                }
+                let span = span.with_hi(segments.last().unwrap().ident.span.hi());
+                Path { span, segments }
+            }
+            Some(TokenTree::Token(Token { kind: token::Interpolated(nt), .. })) => match *nt {
+                token::Nonterminal::NtMeta(ref item) => return item.meta(item.path.span),
+                token::Nonterminal::NtPath(ref path) => path.clone(),
+                _ => return None,
+            },
+            _ => return None,
+        };
+        let list_closing_paren_pos = tokens.peek().map(|tt| tt.span().hi());
+        let kind = MetaItemKind::from_tokens(tokens)?;
+        let hi = match kind {
+            MetaItemKind::NameValue(ref lit) => lit.span.hi(),
+            MetaItemKind::List(..) => list_closing_paren_pos.unwrap_or(path.span.hi()),
+            _ => path.span.hi(),
+        };
+        let span = path.span.with_hi(hi);
+        Some(MetaItem { path, kind, span })
+    }
+}
+
+impl MetaItemKind {
+    pub fn mac_args(&self, span: Span) -> MacArgs {
+        match self {
+            MetaItemKind::Word => MacArgs::Empty,
+            MetaItemKind::NameValue(lit) => MacArgs::Eq(span, lit.token_tree().into()),
+            MetaItemKind::List(list) => {
+                let mut tts = Vec::new();
+                for (i, item) in list.iter().enumerate() {
+                    if i > 0 {
+                        tts.push(TokenTree::token(token::Comma, span).into());
+                    }
+                    tts.extend(item.token_trees_and_joints())
+                }
+                MacArgs::Delimited(
+                    DelimSpan::from_single(span),
+                    MacDelimiter::Parenthesis,
+                    TokenStream::new(tts),
+                )
+            }
+        }
+    }
+
+    fn token_trees_and_joints(&self, span: Span) -> Vec<TreeAndJoint> {
+        match *self {
+            MetaItemKind::Word => vec![],
+            MetaItemKind::NameValue(ref lit) => {
+                vec![TokenTree::token(token::Eq, span).into(), lit.token_tree().into()]
+            }
+            MetaItemKind::List(ref list) => {
+                let mut tokens = Vec::new();
+                for (i, item) in list.iter().enumerate() {
+                    if i > 0 {
+                        tokens.push(TokenTree::token(token::Comma, span).into());
+                    }
+                    tokens.extend(item.token_trees_and_joints())
+                }
+                vec![
+                    TokenTree::Delimited(
+                        DelimSpan::from_single(span),
+                        token::Paren,
+                        TokenStream::new(tokens),
+                    )
+                    .into(),
+                ]
+            }
+        }
+    }
+
+    fn list_from_tokens(tokens: TokenStream) -> Option<MetaItemKind> {
+        let mut tokens = tokens.into_trees().peekable();
+        let mut result = Vec::new();
+        while let Some(..) = tokens.peek() {
+            let item = NestedMetaItem::from_tokens(&mut tokens)?;
+            result.push(item);
+            match tokens.next() {
+                None | Some(TokenTree::Token(Token { kind: token::Comma, .. })) => {}
+                _ => return None,
+            }
+        }
+        Some(MetaItemKind::List(result))
+    }
+
+    fn name_value_from_tokens(
+        tokens: &mut impl Iterator<Item = TokenTree>,
+    ) -> Option<MetaItemKind> {
+        match tokens.next() {
+            Some(TokenTree::Token(token)) => {
+                Lit::from_token(&token).ok().map(MetaItemKind::NameValue)
+            }
+            _ => None,
+        }
+    }
+
+    fn from_mac_args(args: &MacArgs) -> Option<MetaItemKind> {
+        match args {
+            MacArgs::Delimited(_, MacDelimiter::Parenthesis, tokens) => {
+                MetaItemKind::list_from_tokens(tokens.clone())
+            }
+            MacArgs::Delimited(..) => None,
+            MacArgs::Eq(_, tokens) => {
+                assert!(tokens.len() == 1);
+                MetaItemKind::name_value_from_tokens(&mut tokens.trees())
+            }
+            MacArgs::Empty => Some(MetaItemKind::Word),
+        }
+    }
+
+    fn from_tokens(
+        tokens: &mut iter::Peekable<impl Iterator<Item = TokenTree>>,
+    ) -> Option<MetaItemKind> {
+        match tokens.peek() {
+            Some(TokenTree::Delimited(_, token::Paren, inner_tokens)) => {
+                let inner_tokens = inner_tokens.clone();
+                tokens.next();
+                MetaItemKind::list_from_tokens(inner_tokens)
+            }
+            Some(TokenTree::Delimited(..)) => None,
+            Some(TokenTree::Token(Token { kind: token::Eq, .. })) => {
+                tokens.next();
+                MetaItemKind::name_value_from_tokens(tokens)
+            }
+            _ => Some(MetaItemKind::Word),
+        }
+    }
+}
+
+impl NestedMetaItem {
+    pub fn span(&self) -> Span {
+        match *self {
+            NestedMetaItem::MetaItem(ref item) => item.span,
+            NestedMetaItem::Literal(ref lit) => lit.span,
+        }
+    }
+
+    fn token_trees_and_joints(&self) -> Vec<TreeAndJoint> {
+        match *self {
+            NestedMetaItem::MetaItem(ref item) => item.token_trees_and_joints(),
+            NestedMetaItem::Literal(ref lit) => vec![lit.token_tree().into()],
+        }
+    }
+
+    fn from_tokens<I>(tokens: &mut iter::Peekable<I>) -> Option<NestedMetaItem>
+    where
+        I: Iterator<Item = TokenTree>,
+    {
+        if let Some(TokenTree::Token(token)) = tokens.peek() {
+            if let Ok(lit) = Lit::from_token(token) {
+                tokens.next();
+                return Some(NestedMetaItem::Literal(lit));
+            }
+        }
+
+        MetaItem::from_tokens(tokens).map(NestedMetaItem::MetaItem)
+    }
+}
+
+pub trait HasAttrs: Sized {
+    fn attrs(&self) -> &[Attribute];
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>));
+}
+
+impl<T: HasAttrs> HasAttrs for Spanned<T> {
+    fn attrs(&self) -> &[Attribute] {
+        self.node.attrs()
+    }
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+        self.node.visit_attrs(f);
+    }
+}
+
+impl HasAttrs for Vec<Attribute> {
+    fn attrs(&self) -> &[Attribute] {
+        self
+    }
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+        f(self)
+    }
+}
+
+impl HasAttrs for AttrVec {
+    fn attrs(&self) -> &[Attribute] {
+        self
+    }
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+        visit_clobber(self, |this| {
+            let mut vec = this.into();
+            f(&mut vec);
+            vec.into()
+        });
+    }
+}
+
+impl<T: HasAttrs + 'static> HasAttrs for P<T> {
+    fn attrs(&self) -> &[Attribute] {
+        (**self).attrs()
+    }
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+        (**self).visit_attrs(f);
+    }
+}
+
+impl HasAttrs for StmtKind {
+    fn attrs(&self) -> &[Attribute] {
+        match *self {
+            StmtKind::Local(ref local) => local.attrs(),
+            StmtKind::Expr(ref expr) | StmtKind::Semi(ref expr) => expr.attrs(),
+            StmtKind::Empty | StmtKind::Item(..) => &[],
+            StmtKind::Mac(ref mac) => {
+                let (_, _, ref attrs) = **mac;
+                attrs.attrs()
+            }
+        }
+    }
+
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+        match self {
+            StmtKind::Local(local) => local.visit_attrs(f),
+            StmtKind::Expr(expr) | StmtKind::Semi(expr) => expr.visit_attrs(f),
+            StmtKind::Empty | StmtKind::Item(..) => {}
+            StmtKind::Mac(mac) => {
+                let (_mac, _style, attrs) = mac.deref_mut();
+                attrs.visit_attrs(f);
+            }
+        }
+    }
+}
+
+impl HasAttrs for Stmt {
+    fn attrs(&self) -> &[ast::Attribute] {
+        self.kind.attrs()
+    }
+
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+        self.kind.visit_attrs(f);
+    }
+}
+
+macro_rules! derive_has_attrs {
+    ($($ty:path),*) => { $(
+        impl HasAttrs for $ty {
+            fn attrs(&self) -> &[Attribute] {
+                &self.attrs
+            }
+
+            fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
+                self.attrs.visit_attrs(f);
+            }
+        }
+    )* }
+}
+
+derive_has_attrs! {
+    Item, Expr, Local, ast::AssocItem, ast::ForeignItem, ast::StructField, ast::Arm,
+    ast::Field, ast::FieldPat, ast::Variant, ast::Param, GenericParam
+}
diff --git a/src/libsyntax/build.rs b/src/librustc_ast/build.rs
similarity index 100%
rename from src/libsyntax/build.rs
rename to src/librustc_ast/build.rs
diff --git a/src/libsyntax/entry.rs b/src/librustc_ast/entry.rs
similarity index 100%
rename from src/libsyntax/entry.rs
rename to src/librustc_ast/entry.rs
diff --git a/src/libsyntax/expand/allocator.rs b/src/librustc_ast/expand/allocator.rs
similarity index 100%
rename from src/libsyntax/expand/allocator.rs
rename to src/librustc_ast/expand/allocator.rs
diff --git a/src/libsyntax/expand/mod.rs b/src/librustc_ast/expand/mod.rs
similarity index 100%
rename from src/libsyntax/expand/mod.rs
rename to src/librustc_ast/expand/mod.rs
diff --git a/src/librustc_ast/lib.rs b/src/librustc_ast/lib.rs
new file mode 100644
index 0000000000..adb96356aa
--- /dev/null
+++ b/src/librustc_ast/lib.rs
@@ -0,0 +1,63 @@
+//! The Rust parser and macro expander.
+//!
+//! # Note
+//!
+//! This API is completely unstable and subject to change.
+
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
+#![feature(bool_to_option)]
+#![feature(box_syntax)]
+#![feature(const_fn)] // For the `transmute` in `P::new`
+#![feature(const_transmute)]
+#![feature(crate_visibility_modifier)]
+#![feature(label_break_value)]
+#![feature(nll)]
+#![feature(try_trait)]
+#![feature(unicode_internals)]
+#![recursion_limit = "256"]
+
+#[macro_export]
+macro_rules! unwrap_or {
+    ($opt:expr, $default:expr) => {
+        match $opt {
+            Some(x) => x,
+            None => $default,
+        }
+    };
+}
+
+pub mod util {
+    pub mod classify;
+    pub mod comments;
+    pub mod lev_distance;
+    pub mod literal;
+    pub mod map_in_place;
+    pub mod parser;
+}
+
+pub mod ast;
+pub mod attr;
+pub use attr::{with_default_globals, with_globals, GLOBALS};
+pub mod entry;
+pub mod expand;
+pub mod mut_visit;
+pub mod node_id;
+pub mod ptr;
+pub mod token;
+pub mod tokenstream;
+pub mod visit;
+
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+
+/// Requirements for a `StableHashingContext` to be used in this crate.
+/// This is a hack to allow using the `HashStable_Generic` derive macro
+/// instead of implementing everything in librustc.
+pub trait HashStableContext: rustc_span::HashStableContext {
+    fn hash_attr(&mut self, _: &ast::Attribute, hasher: &mut StableHasher);
+}
+
+impl<AstCtx: crate::HashStableContext> HashStable<AstCtx> for ast::Attribute {
+    fn hash_stable(&self, hcx: &mut AstCtx, hasher: &mut StableHasher) {
+        hcx.hash_attr(self, hasher)
+    }
+}
diff --git a/src/libsyntax/mut_visit.rs b/src/librustc_ast/mut_visit.rs
similarity index 94%
rename from src/libsyntax/mut_visit.rs
rename to src/librustc_ast/mut_visit.rs
index 4a460c5d7b..dedc74eea9 100644
--- a/src/libsyntax/mut_visit.rs
+++ b/src/librustc_ast/mut_visit.rs
@@ -82,7 +82,7 @@ pub trait MutVisitor: Sized {
         noop_visit_use_tree(use_tree, self);
     }
 
-    fn flat_map_foreign_item(&mut self, ni: ForeignItem) -> SmallVec<[ForeignItem; 1]> {
+    fn flat_map_foreign_item(&mut self, ni: P<ForeignItem>) -> SmallVec<[P<ForeignItem>; 1]> {
         noop_flat_map_foreign_item(ni, self)
     }
 
@@ -102,11 +102,11 @@ pub trait MutVisitor: Sized {
         noop_visit_item_kind(i, self);
     }
 
-    fn flat_map_trait_item(&mut self, i: AssocItem) -> SmallVec<[AssocItem; 1]> {
+    fn flat_map_trait_item(&mut self, i: P<AssocItem>) -> SmallVec<[P<AssocItem>; 1]> {
         noop_flat_map_assoc_item(i, self)
     }
 
-    fn flat_map_impl_item(&mut self, i: AssocItem) -> SmallVec<[AssocItem; 1]> {
+    fn flat_map_impl_item(&mut self, i: P<AssocItem>) -> SmallVec<[P<AssocItem>; 1]> {
         noop_flat_map_assoc_item(i, self)
     }
 
@@ -114,7 +114,7 @@ pub trait MutVisitor: Sized {
         noop_visit_fn_decl(d, self);
     }
 
-    fn visit_asyncness(&mut self, a: &mut IsAsync) {
+    fn visit_asyncness(&mut self, a: &mut Async) {
         noop_visit_asyncness(a, self);
     }
 
@@ -704,36 +704,24 @@ pub fn noop_visit_interpolated<T: MutVisitor>(nt: &mut token::Nonterminal, vis:
         token::NtIdent(ident, _is_raw) => vis.visit_ident(ident),
         token::NtLifetime(ident) => vis.visit_ident(ident),
         token::NtLiteral(expr) => vis.visit_expr(expr),
-        token::NtMeta(AttrItem { path, args }) => {
+        token::NtMeta(item) => {
+            let AttrItem { path, args } = item.deref_mut();
             vis.visit_path(path);
             visit_mac_args(args, vis);
         }
         token::NtPath(path) => vis.visit_path(path),
         token::NtTT(tt) => vis.visit_tt(tt),
-        token::NtImplItem(item) => visit_clobber(item, |item| {
-            // See reasoning above.
-            vis.flat_map_impl_item(item).expect_one("expected visitor to produce exactly one item")
-        }),
-        token::NtTraitItem(item) => visit_clobber(item, |item| {
-            // See reasoning above.
-            vis.flat_map_trait_item(item).expect_one("expected visitor to produce exactly one item")
-        }),
         token::NtVis(visib) => vis.visit_vis(visib),
-        token::NtForeignItem(item) => visit_clobber(item, |item| {
-            // See reasoning above.
-            vis.flat_map_foreign_item(item)
-                .expect_one("expected visitor to produce exactly one item")
-        }),
     }
 }
 
-pub fn noop_visit_asyncness<T: MutVisitor>(asyncness: &mut IsAsync, vis: &mut T) {
+pub fn noop_visit_asyncness<T: MutVisitor>(asyncness: &mut Async, vis: &mut T) {
     match asyncness {
-        IsAsync::Async { closure_id, return_impl_trait_id } => {
+        Async::Yes { span: _, closure_id, return_impl_trait_id } => {
             vis.visit_id(closure_id);
             vis.visit_id(return_impl_trait_id);
         }
-        IsAsync::NotAsync => {}
+        Async::No => {}
     }
 }
 
@@ -743,10 +731,10 @@ pub fn noop_visit_fn_decl<T: MutVisitor>(decl: &mut P<FnDecl>, vis: &mut T) {
     noop_visit_fn_ret_ty(output, vis);
 }
 
-pub fn noop_visit_fn_ret_ty<T: MutVisitor>(fn_ret_ty: &mut FunctionRetTy, vis: &mut T) {
+pub fn noop_visit_fn_ret_ty<T: MutVisitor>(fn_ret_ty: &mut FnRetTy, vis: &mut T) {
     match fn_ret_ty {
-        FunctionRetTy::Default(span) => vis.visit_span(span),
-        FunctionRetTy::Ty(ty) => vis.visit_ty(ty),
+        FnRetTy::Default(span) => vis.visit_span(span),
+        FnRetTy::Ty(ty) => vis.visit_ty(ty),
     }
 }
 
@@ -889,25 +877,22 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
     match kind {
         ItemKind::ExternCrate(_orig_name) => {}
         ItemKind::Use(use_tree) => vis.visit_use_tree(use_tree),
-        ItemKind::Static(ty, _mut, expr) => {
-            vis.visit_ty(ty);
-            vis.visit_expr(expr);
-        }
-        ItemKind::Const(ty, expr) => {
+        ItemKind::Static(ty, _, expr) | ItemKind::Const(_, ty, expr) => {
             vis.visit_ty(ty);
-            vis.visit_expr(expr);
+            visit_opt(expr, |expr| vis.visit_expr(expr));
         }
-        ItemKind::Fn(sig, generics, body) => {
+        ItemKind::Fn(_, sig, generics, body) => {
             visit_fn_sig(sig, vis);
             vis.visit_generics(generics);
-            vis.visit_block(body);
+            visit_opt(body, |body| vis.visit_block(body));
         }
         ItemKind::Mod(m) => vis.visit_mod(m),
         ItemKind::ForeignMod(nm) => vis.visit_foreign_mod(nm),
         ItemKind::GlobalAsm(_ga) => {}
-        ItemKind::TyAlias(ty, generics) => {
-            vis.visit_ty(ty);
+        ItemKind::TyAlias(_, generics, bounds, ty) => {
             vis.visit_generics(generics);
+            visit_bounds(bounds, vis);
+            visit_opt(ty, |ty| vis.visit_ty(ty));
         }
         ItemKind::Enum(EnumDef { variants }, generics) => {
             variants.flat_map_in_place(|variant| vis.flat_map_variant(variant));
@@ -947,39 +932,38 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
 }
 
 pub fn noop_flat_map_assoc_item<T: MutVisitor>(
-    mut item: AssocItem,
+    mut item: P<AssocItem>,
     visitor: &mut T,
-) -> SmallVec<[AssocItem; 1]> {
-    let AssocItem { id, ident, vis, defaultness: _, attrs, generics, kind, span, tokens: _ } =
-        &mut item;
+) -> SmallVec<[P<AssocItem>; 1]> {
+    let Item { id, ident, vis, attrs, kind, span, tokens: _ } = item.deref_mut();
     visitor.visit_id(id);
     visitor.visit_ident(ident);
     visitor.visit_vis(vis);
     visit_attrs(attrs, visitor);
-    visitor.visit_generics(generics);
     match kind {
-        AssocItemKind::Const(ty, expr) => {
+        AssocItemKind::Const(_, ty, expr) => {
             visitor.visit_ty(ty);
             visit_opt(expr, |expr| visitor.visit_expr(expr));
         }
-        AssocItemKind::Fn(sig, body) => {
+        AssocItemKind::Fn(_, sig, generics, body) => {
+            visitor.visit_generics(generics);
             visit_fn_sig(sig, visitor);
             visit_opt(body, |body| visitor.visit_block(body));
         }
-        AssocItemKind::TyAlias(bounds, ty) => {
+        AssocItemKind::TyAlias(_, generics, bounds, ty) => {
+            visitor.visit_generics(generics);
             visit_bounds(bounds, visitor);
             visit_opt(ty, |ty| visitor.visit_ty(ty));
         }
         AssocItemKind::Macro(mac) => visitor.visit_mac(mac),
     }
     visitor.visit_span(span);
-
     smallvec![item]
 }
 
 pub fn noop_visit_fn_header<T: MutVisitor>(header: &mut FnHeader, vis: &mut T) {
     let FnHeader { unsafety: _, asyncness, constness: _, ext: _ } = header;
-    vis.visit_asyncness(&mut asyncness.node);
+    vis.visit_asyncness(asyncness);
 }
 
 pub fn noop_visit_mod<T: MutVisitor>(Mod { inner, items, inline: _ }: &mut Mod, vis: &mut T) {
@@ -988,7 +972,7 @@ pub fn noop_visit_mod<T: MutVisitor>(Mod { inner, items, inline: _ }: &mut Mod,
 }
 
 pub fn noop_visit_crate<T: MutVisitor>(krate: &mut Crate, vis: &mut T) {
-    visit_clobber(krate, |Crate { module, attrs, span }| {
+    visit_clobber(krate, |Crate { module, attrs, span, proc_macros }| {
         let item = P(Item {
             ident: Ident::invalid(),
             attrs,
@@ -1003,11 +987,11 @@ pub fn noop_visit_crate<T: MutVisitor>(krate: &mut Crate, vis: &mut T) {
         let len = items.len();
         if len == 0 {
             let module = Mod { inner: span, items: vec![], inline: true };
-            Crate { module, attrs: vec![], span }
+            Crate { module, attrs: vec![], span, proc_macros }
         } else if len == 1 {
             let Item { attrs, span, kind, .. } = items.into_iter().next().unwrap().into_inner();
             match kind {
-                ItemKind::Mod(module) => Crate { module, attrs, span },
+                ItemKind::Mod(module) => Crate { module, attrs, span, proc_macros },
                 _ => panic!("visitor converted a module to not a module"),
             }
         } else {
@@ -1036,25 +1020,32 @@ pub fn noop_flat_map_item<T: MutVisitor>(
 }
 
 pub fn noop_flat_map_foreign_item<T: MutVisitor>(
-    mut item: ForeignItem,
+    mut item: P<ForeignItem>,
     visitor: &mut T,
-) -> SmallVec<[ForeignItem; 1]> {
-    let ForeignItem { ident, attrs, id, kind, vis, span, tokens: _ } = &mut item;
+) -> SmallVec<[P<ForeignItem>; 1]> {
+    let Item { ident, attrs, id, kind, vis, span, tokens: _ } = item.deref_mut();
+    visitor.visit_id(id);
     visitor.visit_ident(ident);
+    visitor.visit_vis(vis);
     visit_attrs(attrs, visitor);
     match kind {
-        ForeignItemKind::Fn(fdec, generics) => {
-            visitor.visit_fn_decl(fdec);
+        ForeignItemKind::Static(ty, _, expr) => {
+            visitor.visit_ty(ty);
+            visit_opt(expr, |expr| visitor.visit_expr(expr));
+        }
+        ForeignItemKind::Fn(_, sig, generics, body) => {
+            visitor.visit_generics(generics);
+            visit_fn_sig(sig, visitor);
+            visit_opt(body, |body| visitor.visit_block(body));
+        }
+        ForeignItemKind::TyAlias(_, generics, bounds, ty) => {
             visitor.visit_generics(generics);
+            visit_bounds(bounds, visitor);
+            visit_opt(ty, |ty| visitor.visit_ty(ty));
         }
-        ForeignItemKind::Static(t, _m) => visitor.visit_ty(t),
-        ForeignItemKind::Ty => {}
         ForeignItemKind::Macro(mac) => visitor.visit_mac(mac),
     }
-    visitor.visit_id(id);
     visitor.visit_span(span);
-    visitor.visit_vis(vis);
-
     smallvec![item]
 }
 
@@ -1283,6 +1274,7 @@ pub fn noop_flat_map_stmt_kind<T: MutVisitor>(
         StmtKind::Item(item) => vis.flat_map_item(item).into_iter().map(StmtKind::Item).collect(),
         StmtKind::Expr(expr) => vis.filter_map_expr(expr).into_iter().map(StmtKind::Expr).collect(),
         StmtKind::Semi(expr) => vis.filter_map_expr(expr).into_iter().map(StmtKind::Semi).collect(),
+        StmtKind::Empty => smallvec![StmtKind::Empty],
         StmtKind::Mac(mut mac) => {
             let (mac_, _semi, attrs) = mac.deref_mut();
             vis.visit_mac(mac_);
diff --git a/src/librustc_ast/node_id.rs b/src/librustc_ast/node_id.rs
new file mode 100644
index 0000000000..58d2334a7b
--- /dev/null
+++ b/src/librustc_ast/node_id.rs
@@ -0,0 +1,48 @@
+use rustc_serialize::{Decoder, Encoder};
+use rustc_span::ExpnId;
+use std::fmt;
+
+rustc_index::newtype_index! {
+    pub struct NodeId {
+        ENCODABLE = custom
+        DEBUG_FORMAT = "NodeId({})"
+    }
+}
+
+rustc_data_structures::define_id_collections!(NodeMap, NodeSet, NodeId);
+
+/// `NodeId` used to represent the root of the crate.
+pub const CRATE_NODE_ID: NodeId = NodeId::from_u32_const(0);
+
+/// When parsing and doing expansions, we initially give all AST nodes this AST
+/// node value. Then later, in the renumber pass, we renumber them to have
+/// small, positive ids.
+pub const DUMMY_NODE_ID: NodeId = NodeId::MAX;
+
+impl NodeId {
+    pub fn placeholder_from_expn_id(expn_id: ExpnId) -> Self {
+        NodeId::from_u32(expn_id.as_u32())
+    }
+
+    pub fn placeholder_to_expn_id(self) -> ExpnId {
+        ExpnId::from_u32(self.as_u32())
+    }
+}
+
+impl fmt::Display for NodeId {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&self.as_u32(), f)
+    }
+}
+
+impl rustc_serialize::UseSpecializedEncodable for NodeId {
+    fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
+        s.emit_u32(self.as_u32())
+    }
+}
+
+impl rustc_serialize::UseSpecializedDecodable for NodeId {
+    fn default_decode<D: Decoder>(d: &mut D) -> Result<NodeId, D::Error> {
+        d.read_u32().map(NodeId::from_u32)
+    }
+}
diff --git a/src/libsyntax/ptr.rs b/src/librustc_ast/ptr.rs
similarity index 100%
rename from src/libsyntax/ptr.rs
rename to src/librustc_ast/ptr.rs
diff --git a/src/libsyntax/token.rs b/src/librustc_ast/token.rs
similarity index 78%
rename from src/libsyntax/token.rs
rename to src/librustc_ast/token.rs
index 14279561cb..92382c7e30 100644
--- a/src/libsyntax/token.rs
+++ b/src/librustc_ast/token.rs
@@ -14,8 +14,8 @@ use rustc_macros::HashStable_Generic;
 use rustc_span::symbol::kw;
 use rustc_span::symbol::Symbol;
 use rustc_span::{self, Span, DUMMY_SP};
-use std::fmt;
-use std::mem;
+use std::borrow::Cow;
+use std::{fmt, mem};
 
 #[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
 #[derive(HashStable_Generic)]
@@ -147,36 +147,30 @@ impl Lit {
 
 pub fn ident_can_begin_expr(name: ast::Name, span: Span, is_raw: bool) -> bool {
     let ident_token = Token::new(Ident(name, is_raw), span);
-    token_can_begin_expr(&ident_token)
-}
 
-pub fn token_can_begin_expr(ident_token: &Token) -> bool {
     !ident_token.is_reserved_ident()
         || ident_token.is_path_segment_keyword()
-        || match ident_token.kind {
-            TokenKind::Ident(ident, _) => [
-                kw::Async,
-                kw::Do,
-                kw::Box,
-                kw::Break,
-                kw::Continue,
-                kw::False,
-                kw::For,
-                kw::If,
-                kw::Let,
-                kw::Loop,
-                kw::Match,
-                kw::Move,
-                kw::Return,
-                kw::True,
-                kw::Unsafe,
-                kw::While,
-                kw::Yield,
-                kw::Static,
-            ]
-            .contains(&ident),
-            _ => false,
-        }
+        || [
+            kw::Async,
+            kw::Do,
+            kw::Box,
+            kw::Break,
+            kw::Continue,
+            kw::False,
+            kw::For,
+            kw::If,
+            kw::Let,
+            kw::Loop,
+            kw::Match,
+            kw::Move,
+            kw::Return,
+            kw::True,
+            kw::Unsafe,
+            kw::While,
+            kw::Yield,
+            kw::Static,
+        ]
+        .contains(&name)
 }
 
 fn ident_can_begin_type(name: ast::Name, span: Span, is_raw: bool) -> bool {
@@ -231,8 +225,15 @@ pub enum TokenKind {
     /* Literals */
     Literal(Lit),
 
-    /* Name components */
+    /// Identifier token.
+    /// Do not forget about `NtIdent` when you want to match on identifiers.
+    /// It's recommended to use `Token::(ident,uninterpolate,uninterpolated_span)` to
+    /// treat regular and interpolated identifiers in the same way.
     Ident(ast::Name, /* is_raw */ bool),
+    /// Lifetime identifier token.
+    /// Do not forget about `NtLifetime` when you want to match on lifetime identifiers.
+    /// It's recommended to use `Token::(lifetime,uninterpolate,uninterpolated_span)` to
+    /// treat regular and interpolated lifetime identifiers in the same way.
     Lifetime(ast::Name),
 
     Interpolated(Lrc<Nonterminal>),
@@ -270,6 +271,39 @@ impl TokenKind {
         Literal(Lit::new(kind, symbol, suffix))
     }
 
+    // An approximation to proc-macro-style single-character operators used by rustc parser.
+    // If the operator token can be broken into two tokens, the first of which is single-character,
+    // then this function performs that operation, otherwise it returns `None`.
+    pub fn break_two_token_op(&self) -> Option<(TokenKind, TokenKind)> {
+        Some(match *self {
+            Le => (Lt, Eq),
+            EqEq => (Eq, Eq),
+            Ne => (Not, Eq),
+            Ge => (Gt, Eq),
+            AndAnd => (BinOp(And), BinOp(And)),
+            OrOr => (BinOp(Or), BinOp(Or)),
+            BinOp(Shl) => (Lt, Lt),
+            BinOp(Shr) => (Gt, Gt),
+            BinOpEq(Plus) => (BinOp(Plus), Eq),
+            BinOpEq(Minus) => (BinOp(Minus), Eq),
+            BinOpEq(Star) => (BinOp(Star), Eq),
+            BinOpEq(Slash) => (BinOp(Slash), Eq),
+            BinOpEq(Percent) => (BinOp(Percent), Eq),
+            BinOpEq(Caret) => (BinOp(Caret), Eq),
+            BinOpEq(And) => (BinOp(And), Eq),
+            BinOpEq(Or) => (BinOp(Or), Eq),
+            BinOpEq(Shl) => (Lt, Le),
+            BinOpEq(Shr) => (Gt, Ge),
+            DotDot => (Dot, Dot),
+            DotDotDot => (Dot, DotDot),
+            ModSep => (Colon, Colon),
+            RArrow => (BinOp(Minus), Gt),
+            LArrow => (Lt, BinOp(Minus)),
+            FatArrow => (Eq, Gt),
+            _ => return None,
+        })
+    }
+
     /// Returns tokens that are likely to be typed accidentally instead of the current token.
     /// Enables better error recovery when the wrong token is found.
     pub fn similar_tokens(&self) -> Option<Vec<TokenKind>> {
@@ -301,6 +335,19 @@ impl Token {
         mem::replace(self, Token::dummy())
     }
 
+    /// For interpolated tokens, returns a span of the fragment to which the interpolated
+    /// token refers. For all other tokens this is just a regular span.
+    /// It is particularly important to use this for identifiers and lifetimes
+    /// for which spans affect name resolution and edition checks.
+    /// Note that keywords are also identifiers, so they should use this
+    /// if they keep spans or perform edition checks.
+    pub fn uninterpolated_span(&self) -> Span {
+        match &self.kind {
+            Interpolated(nt) => nt.span(),
+            _ => self.span,
+        }
+    }
+
     pub fn is_op(&self) -> bool {
         match self.kind {
             OpenDelim(..) | CloseDelim(..) | Literal(..) | DocComment(..) | Ident(..)
@@ -318,7 +365,7 @@ impl Token {
 
     /// Returns `true` if the token can appear at the start of an expression.
     pub fn can_begin_expr(&self) -> bool {
-        match self.kind {
+        match self.uninterpolate().kind {
             Ident(name, is_raw)              =>
                 ident_can_begin_expr(name, self.span, is_raw), // value name or keyword
             OpenDelim(..)                     | // tuple, array or block
@@ -337,11 +384,9 @@ impl Token {
             Pound                             => true, // expression attributes
             Interpolated(ref nt) => match **nt {
                 NtLiteral(..) |
-                NtIdent(..)   |
                 NtExpr(..)    |
                 NtBlock(..)   |
-                NtPath(..)    |
-                NtLifetime(..) => true,
+                NtPath(..) => true,
                 _ => false,
             },
             _ => false,
@@ -350,7 +395,7 @@ impl Token {
 
     /// Returns `true` if the token can appear at the start of a type.
     pub fn can_begin_type(&self) -> bool {
-        match self.kind {
+        match self.uninterpolate().kind {
             Ident(name, is_raw)        =>
                 ident_can_begin_type(name, self.span, is_raw), // type name or keyword
             OpenDelim(Paren)            | // tuple
@@ -364,7 +409,7 @@ impl Token {
             Lt | BinOp(Shl)             | // associated path
             ModSep                      => true, // global path
             Interpolated(ref nt) => match **nt {
-                NtIdent(..) | NtTy(..) | NtPath(..) | NtLifetime(..) => true,
+                NtTy(..) | NtPath(..) => true,
                 _ => false,
             },
             _ => false,
@@ -379,7 +424,7 @@ impl Token {
                 NtExpr(..) | NtBlock(..) | NtLiteral(..) => true,
                 _ => false,
             },
-            _ => self.can_begin_literal_or_bool(),
+            _ => self.can_begin_literal_maybe_minus(),
         }
     }
 
@@ -402,38 +447,60 @@ impl Token {
 
     /// Returns `true` if the token is any literal, a minus (which can prefix a literal,
     /// for example a '-42', or one of the boolean idents).
-    pub fn can_begin_literal_or_bool(&self) -> bool {
-        match self.kind {
+    ///
+    /// In other words, would this token be a valid start of `parse_literal_maybe_minus`?
+    ///
+    /// Keep this in sync with and `Lit::from_token`, excluding unary negation.
+    pub fn can_begin_literal_maybe_minus(&self) -> bool {
+        match self.uninterpolate().kind {
             Literal(..) | BinOp(Minus) => true,
             Ident(name, false) if name.is_bool_lit() => true,
-            Interpolated(ref nt) => match **nt {
-                NtLiteral(..) => true,
+            Interpolated(ref nt) => match &**nt {
+                NtLiteral(_) => true,
+                NtExpr(e) => match &e.kind {
+                    ast::ExprKind::Lit(_) => true,
+                    ast::ExprKind::Unary(ast::UnOp::Neg, e) => {
+                        matches!(&e.kind, ast::ExprKind::Lit(_))
+                    }
+                    _ => false,
+                },
                 _ => false,
             },
             _ => false,
         }
     }
 
+    // A convenience function for matching on identifiers during parsing.
+    // Turns interpolated identifier (`$i: ident`) or lifetime (`$l: lifetime`) token
+    // into the regular identifier or lifetime token it refers to,
+    // otherwise returns the original token.
+    pub fn uninterpolate(&self) -> Cow<'_, Token> {
+        match &self.kind {
+            Interpolated(nt) => match **nt {
+                NtIdent(ident, is_raw) => {
+                    Cow::Owned(Token::new(Ident(ident.name, is_raw), ident.span))
+                }
+                NtLifetime(ident) => Cow::Owned(Token::new(Lifetime(ident.name), ident.span)),
+                _ => Cow::Borrowed(self),
+            },
+            _ => Cow::Borrowed(self),
+        }
+    }
+
     /// Returns an identifier if this token is an identifier.
     pub fn ident(&self) -> Option<(ast::Ident, /* is_raw */ bool)> {
-        match self.kind {
-            Ident(name, is_raw) => Some((ast::Ident::new(name, self.span), is_raw)),
-            Interpolated(ref nt) => match **nt {
-                NtIdent(ident, is_raw) => Some((ident, is_raw)),
-                _ => None,
-            },
+        let token = self.uninterpolate();
+        match token.kind {
+            Ident(name, is_raw) => Some((ast::Ident::new(name, token.span), is_raw)),
             _ => None,
         }
     }
 
     /// Returns a lifetime identifier if this token is a lifetime.
     pub fn lifetime(&self) -> Option<ast::Ident> {
-        match self.kind {
-            Lifetime(name) => Some(ast::Ident::new(name, self.span)),
-            Interpolated(ref nt) => match **nt {
-                NtLifetime(ident) => Some(ident),
-                _ => None,
-            },
+        let token = self.uninterpolate();
+        match token.kind {
+            Lifetime(name) => Some(ast::Ident::new(name, token.span)),
             _ => None,
         }
     }
@@ -530,7 +597,7 @@ impl Token {
     }
 
     /// Returns `true` if the token is a non-raw identifier for which `pred` holds.
-    fn is_non_raw_ident_where(&self, pred: impl FnOnce(ast::Ident) -> bool) -> bool {
+    pub fn is_non_raw_ident_where(&self, pred: impl FnOnce(ast::Ident) -> bool) -> bool {
         match self.ident() {
             Some((id, false)) => pred(id),
             _ => false,
@@ -673,16 +740,32 @@ pub enum Nonterminal {
     NtLifetime(ast::Ident),
     NtLiteral(P<ast::Expr>),
     /// Stuff inside brackets for attributes
-    NtMeta(ast::AttrItem),
+    NtMeta(P<ast::AttrItem>),
     NtPath(ast::Path),
     NtVis(ast::Visibility),
     NtTT(TokenTree),
-    // Used only for passing items to proc macro attributes (they are not
-    // strictly necessary for that, `Annotatable` can be converted into
-    // tokens directly, but doing that naively regresses pretty-printing).
-    NtTraitItem(ast::AssocItem),
-    NtImplItem(ast::AssocItem),
-    NtForeignItem(ast::ForeignItem),
+}
+
+// `Nonterminal` is used a lot. Make sure it doesn't unintentionally get bigger.
+#[cfg(target_arch = "x86_64")]
+rustc_data_structures::static_assert_size!(Nonterminal, 40);
+
+impl Nonterminal {
+    fn span(&self) -> Span {
+        match self {
+            NtItem(item) => item.span,
+            NtBlock(block) => block.span,
+            NtStmt(stmt) => stmt.span,
+            NtPat(pat) => pat.span,
+            NtExpr(expr) | NtLiteral(expr) => expr.span,
+            NtTy(ty) => ty.span,
+            NtIdent(ident, _) | NtLifetime(ident) => ident.span,
+            NtMeta(attr_item) => attr_item.span(),
+            NtPath(path) => path.span,
+            NtVis(vis) => vis.span,
+            NtTT(tt) => tt.span(),
+        }
+    }
 }
 
 impl PartialEq for Nonterminal {
@@ -716,9 +799,6 @@ impl fmt::Debug for Nonterminal {
             NtMeta(..) => f.pad("NtMeta(..)"),
             NtPath(..) => f.pad("NtPath(..)"),
             NtTT(..) => f.pad("NtTT(..)"),
-            NtImplItem(..) => f.pad("NtImplItem(..)"),
-            NtTraitItem(..) => f.pad("NtTraitItem(..)"),
-            NtForeignItem(..) => f.pad("NtForeignItem(..)"),
             NtVis(..) => f.pad("NtVis(..)"),
             NtLifetime(..) => f.pad("NtLifetime(..)"),
         }
diff --git a/src/libsyntax/tokenstream.rs b/src/librustc_ast/tokenstream.rs
similarity index 98%
rename from src/libsyntax/tokenstream.rs
rename to src/librustc_ast/tokenstream.rs
index 03e8fff247..916a5ff6f4 100644
--- a/src/libsyntax/tokenstream.rs
+++ b/src/librustc_ast/tokenstream.rs
@@ -116,6 +116,13 @@ impl TokenTree {
     pub fn close_tt(span: DelimSpan, delim: DelimToken) -> TokenTree {
         TokenTree::token(token::CloseDelim(delim), span.close)
     }
+
+    pub fn uninterpolate(self) -> TokenTree {
+        match self {
+            TokenTree::Token(token) => TokenTree::Token(token.uninterpolate().into_owned()),
+            tt => tt,
+        }
+    }
 }
 
 impl<CTX> HashStable<CTX> for TokenStream
diff --git a/src/libsyntax/util/classify.rs b/src/librustc_ast/util/classify.rs
similarity index 100%
rename from src/libsyntax/util/classify.rs
rename to src/librustc_ast/util/classify.rs
diff --git a/src/libsyntax/util/comments.rs b/src/librustc_ast/util/comments.rs
similarity index 97%
rename from src/libsyntax/util/comments.rs
rename to src/librustc_ast/util/comments.rs
index c385b498ce..0e42ae11fa 100644
--- a/src/libsyntax/util/comments.rs
+++ b/src/librustc_ast/util/comments.rs
@@ -1,14 +1,11 @@
 pub use CommentStyle::*;
 
 use crate::ast;
-use crate::sess::ParseSess;
-
 use rustc_span::source_map::SourceMap;
 use rustc_span::{BytePos, CharPos, FileName, Pos};
 
-use std::usize;
-
 use log::debug;
+use std::usize;
 
 #[cfg(test)]
 mod tests;
@@ -191,9 +188,9 @@ fn split_block_comment_into_lines(text: &str, col: CharPos) -> Vec<String> {
 
 // it appears this function is called only from pprust... that's
 // probably not a good thing.
-crate fn gather_comments(sess: &ParseSess, path: FileName, src: String) -> Vec<Comment> {
-    let cm = SourceMap::new(sess.source_map().path_mapping().clone());
-    let source_file = cm.new_source_file(path, src);
+pub fn gather_comments(sm: &SourceMap, path: FileName, src: String) -> Vec<Comment> {
+    let sm = SourceMap::new(sm.path_mapping().clone());
+    let source_file = sm.new_source_file(path, src);
     let text = (*source_file.src.as_ref().unwrap()).clone();
 
     let text: &str = text.as_str();
diff --git a/src/libsyntax/util/comments/tests.rs b/src/librustc_ast/util/comments/tests.rs
similarity index 100%
rename from src/libsyntax/util/comments/tests.rs
rename to src/librustc_ast/util/comments/tests.rs
diff --git a/src/libsyntax/util/lev_distance.rs b/src/librustc_ast/util/lev_distance.rs
similarity index 100%
rename from src/libsyntax/util/lev_distance.rs
rename to src/librustc_ast/util/lev_distance.rs
diff --git a/src/libsyntax/util/lev_distance/tests.rs b/src/librustc_ast/util/lev_distance/tests.rs
similarity index 100%
rename from src/libsyntax/util/lev_distance/tests.rs
rename to src/librustc_ast/util/lev_distance/tests.rs
diff --git a/src/libsyntax/util/literal.rs b/src/librustc_ast/util/literal.rs
similarity index 98%
rename from src/libsyntax/util/literal.rs
rename to src/librustc_ast/util/literal.rs
index dd06c25b4d..1b17f343a6 100644
--- a/src/libsyntax/util/literal.rs
+++ b/src/librustc_ast/util/literal.rs
@@ -188,8 +188,10 @@ impl Lit {
     }
 
     /// Converts arbitrary token into an AST literal.
+    ///
+    /// Keep this in sync with `Token::can_begin_literal_or_bool` excluding unary negation.
     pub fn from_token(token: &Token) -> Result<Lit, LitError> {
-        let lit = match token.kind {
+        let lit = match token.uninterpolate().kind {
             token::Ident(name, false) if name.is_bool_lit() => {
                 token::Lit::new(token::Bool, name, None)
             }
diff --git a/src/libsyntax/util/map_in_place.rs b/src/librustc_ast/util/map_in_place.rs
similarity index 100%
rename from src/libsyntax/util/map_in_place.rs
rename to src/librustc_ast/util/map_in_place.rs
diff --git a/src/libsyntax/util/parser.rs b/src/librustc_ast/util/parser.rs
similarity index 99%
rename from src/libsyntax/util/parser.rs
rename to src/librustc_ast/util/parser.rs
index a0ed89a9ca..b98cc96b3c 100644
--- a/src/libsyntax/util/parser.rs
+++ b/src/librustc_ast/util/parser.rs
@@ -367,7 +367,7 @@ pub fn prec_let_scrutinee_needs_par() -> usize {
 ///
 /// Conversely, suppose that we have `(let _ = a) OP b` and `order` is that of `OP`.
 /// Can we print this as `let _ = a OP b`?
-crate fn needs_par_as_let_scrutinee(order: i8) -> bool {
+pub fn needs_par_as_let_scrutinee(order: i8) -> bool {
     order <= prec_let_scrutinee_needs_par() as i8
 }
 
diff --git a/src/libsyntax/visit.rs b/src/librustc_ast/visit.rs
similarity index 87%
rename from src/libsyntax/visit.rs
rename to src/librustc_ast/visit.rs
index 946a0d29cd..1436c84b9c 100644
--- a/src/libsyntax/visit.rs
+++ b/src/librustc_ast/visit.rs
@@ -19,24 +19,47 @@ use crate::tokenstream::{TokenStream, TokenTree};
 
 use rustc_span::Span;
 
+#[derive(Copy, Clone, PartialEq)]
+pub enum AssocCtxt {
+    Trait,
+    Impl,
+}
+
+#[derive(Copy, Clone, PartialEq)]
+pub enum FnCtxt {
+    Free,
+    Foreign,
+    Assoc(AssocCtxt),
+}
+
 #[derive(Copy, Clone)]
 pub enum FnKind<'a> {
-    /// E.g., `fn foo()` or `extern "Abi" fn foo()`.
-    ItemFn(Ident, &'a FnHeader, &'a Visibility, &'a Block),
-
-    /// E.g., `fn foo(&self)`.
-    Method(Ident, &'a FnSig, &'a Visibility, &'a Block),
+    /// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
+    Fn(FnCtxt, Ident, &'a FnSig, &'a Visibility, Option<&'a Block>),
 
     /// E.g., `|x, y| body`.
-    Closure(&'a Expr),
+    Closure(&'a FnDecl, &'a Expr),
 }
 
 impl<'a> FnKind<'a> {
     pub fn header(&self) -> Option<&'a FnHeader> {
         match *self {
-            FnKind::ItemFn(_, header, _, _) => Some(header),
-            FnKind::Method(_, sig, _, _) => Some(&sig.header),
-            FnKind::Closure(_) => None,
+            FnKind::Fn(_, _, sig, _, _) => Some(&sig.header),
+            FnKind::Closure(_, _) => None,
+        }
+    }
+
+    pub fn decl(&self) -> &'a FnDecl {
+        match self {
+            FnKind::Fn(_, _, sig, _, _) => &sig.decl,
+            FnKind::Closure(decl, _) => decl,
+        }
+    }
+
+    pub fn ctxt(&self) -> Option<FnCtxt> {
+        match self {
+            FnKind::Fn(ctxt, ..) => Some(*ctxt),
+            FnKind::Closure(..) => None,
         }
     }
 }
@@ -106,17 +129,11 @@ pub trait Visitor<'ast>: Sized {
     fn visit_where_predicate(&mut self, p: &'ast WherePredicate) {
         walk_where_predicate(self, p)
     }
-    fn visit_fn(&mut self, fk: FnKind<'ast>, fd: &'ast FnDecl, s: Span, _: NodeId) {
-        walk_fn(self, fk, fd, s)
+    fn visit_fn(&mut self, fk: FnKind<'ast>, s: Span, _: NodeId) {
+        walk_fn(self, fk, s)
     }
-    fn visit_trait_item(&mut self, i: &'ast AssocItem) {
-        walk_trait_item(self, i)
-    }
-    fn visit_impl_item(&mut self, i: &'ast AssocItem) {
-        walk_impl_item(self, i)
-    }
-    fn visit_assoc_item(&mut self, i: &'ast AssocItem) {
-        walk_assoc_item(self, i)
+    fn visit_assoc_item(&mut self, i: &'ast AssocItem, ctxt: AssocCtxt) {
+        walk_assoc_item(self, i, ctxt)
     }
     fn visit_trait_ref(&mut self, t: &'ast TraitRef) {
         walk_trait_ref(self, t)
@@ -198,7 +215,7 @@ pub trait Visitor<'ast>: Sized {
     fn visit_vis(&mut self, vis: &'ast Visibility) {
         walk_vis(self, vis)
     }
-    fn visit_fn_ret_ty(&mut self, ret_ty: &'ast FunctionRetTy) {
+    fn visit_fn_ret_ty(&mut self, ret_ty: &'ast FnRetTy) {
         walk_fn_ret_ty(self, ret_ty)
     }
     fn visit_fn_header(&mut self, _header: &'ast FnHeader) {
@@ -281,28 +298,24 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
             }
         }
         ItemKind::Use(ref use_tree) => visitor.visit_use_tree(use_tree, item.id, false),
-        ItemKind::Static(ref typ, _, ref expr) | ItemKind::Const(ref typ, ref expr) => {
+        ItemKind::Static(ref typ, _, ref expr) | ItemKind::Const(_, ref typ, ref expr) => {
             visitor.visit_ty(typ);
-            visitor.visit_expr(expr);
+            walk_list!(visitor, visit_expr, expr);
         }
-        ItemKind::Fn(ref sig, ref generics, ref body) => {
+        ItemKind::Fn(_, ref sig, ref generics, ref body) => {
             visitor.visit_generics(generics);
-            visitor.visit_fn_header(&sig.header);
-            visitor.visit_fn(
-                FnKind::ItemFn(item.ident, &sig.header, &item.vis, body),
-                &sig.decl,
-                item.span,
-                item.id,
-            )
+            let kind = FnKind::Fn(FnCtxt::Free, item.ident, sig, &item.vis, body.as_deref());
+            visitor.visit_fn(kind, item.span, item.id)
         }
         ItemKind::Mod(ref module) => visitor.visit_mod(module, item.span, &item.attrs, item.id),
         ItemKind::ForeignMod(ref foreign_module) => {
             walk_list!(visitor, visit_foreign_item, &foreign_module.items);
         }
         ItemKind::GlobalAsm(ref ga) => visitor.visit_global_asm(ga),
-        ItemKind::TyAlias(ref typ, ref generics) => {
-            visitor.visit_ty(typ);
-            visitor.visit_generics(generics)
+        ItemKind::TyAlias(_, ref generics, ref bounds, ref ty) => {
+            visitor.visit_generics(generics);
+            walk_list!(visitor, visit_param_bound, bounds);
+            walk_list!(visitor, visit_ty, ty);
         }
         ItemKind::Enum(ref enum_definition, ref generics) => {
             visitor.visit_generics(generics);
@@ -321,17 +334,17 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
             visitor.visit_generics(generics);
             walk_list!(visitor, visit_trait_ref, of_trait);
             visitor.visit_ty(self_ty);
-            walk_list!(visitor, visit_impl_item, items);
+            walk_list!(visitor, visit_assoc_item, items, AssocCtxt::Impl);
         }
         ItemKind::Struct(ref struct_definition, ref generics)
         | ItemKind::Union(ref struct_definition, ref generics) => {
             visitor.visit_generics(generics);
             visitor.visit_variant_data(struct_definition);
         }
-        ItemKind::Trait(.., ref generics, ref bounds, ref methods) => {
+        ItemKind::Trait(.., ref generics, ref bounds, ref items) => {
             visitor.visit_generics(generics);
             walk_list!(visitor, visit_param_bound, bounds);
-            walk_list!(visitor, visit_trait_item, methods);
+            walk_list!(visitor, visit_assoc_item, items, AssocCtxt::Trait);
         }
         ItemKind::TraitAlias(ref generics, ref bounds) => {
             visitor.visit_generics(generics);
@@ -512,21 +525,30 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {
     }
 }
 
-pub fn walk_foreign_item<'a, V: Visitor<'a>>(visitor: &mut V, foreign_item: &'a ForeignItem) {
-    visitor.visit_vis(&foreign_item.vis);
-    visitor.visit_ident(foreign_item.ident);
-
-    match foreign_item.kind {
-        ForeignItemKind::Fn(ref function_declaration, ref generics) => {
-            walk_fn_decl(visitor, function_declaration);
-            visitor.visit_generics(generics)
+pub fn walk_foreign_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a ForeignItem) {
+    let Item { id, span, ident, ref vis, ref attrs, ref kind, tokens: _ } = *item;
+    visitor.visit_vis(vis);
+    visitor.visit_ident(ident);
+    walk_list!(visitor, visit_attribute, attrs);
+    match kind {
+        ForeignItemKind::Static(ty, _, expr) => {
+            visitor.visit_ty(ty);
+            walk_list!(visitor, visit_expr, expr);
+        }
+        ForeignItemKind::Fn(_, sig, generics, body) => {
+            visitor.visit_generics(generics);
+            let kind = FnKind::Fn(FnCtxt::Foreign, ident, sig, vis, body.as_deref());
+            visitor.visit_fn(kind, span, id);
+        }
+        ForeignItemKind::TyAlias(_, generics, bounds, ty) => {
+            visitor.visit_generics(generics);
+            walk_list!(visitor, visit_param_bound, bounds);
+            walk_list!(visitor, visit_ty, ty);
+        }
+        ForeignItemKind::Macro(mac) => {
+            visitor.visit_mac(mac);
         }
-        ForeignItemKind::Static(ref typ, _) => visitor.visit_ty(typ),
-        ForeignItemKind::Ty => (),
-        ForeignItemKind::Macro(ref mac) => visitor.visit_mac(mac),
     }
-
-    walk_list!(visitor, visit_attribute, &foreign_item.attrs);
 }
 
 pub fn walk_global_asm<'a, V: Visitor<'a>>(_: &mut V, _: &'a GlobalAsm) {
@@ -581,8 +603,8 @@ pub fn walk_where_predicate<'a, V: Visitor<'a>>(visitor: &mut V, predicate: &'a
     }
 }
 
-pub fn walk_fn_ret_ty<'a, V: Visitor<'a>>(visitor: &mut V, ret_ty: &'a FunctionRetTy) {
-    if let FunctionRetTy::Ty(ref output_ty) = *ret_ty {
+pub fn walk_fn_ret_ty<'a, V: Visitor<'a>>(visitor: &mut V, ret_ty: &'a FnRetTy) {
+    if let FnRetTy::Ty(ref output_ty) = *ret_ty {
         visitor.visit_ty(output_ty)
     }
 }
@@ -594,63 +616,41 @@ pub fn walk_fn_decl<'a, V: Visitor<'a>>(visitor: &mut V, function_declaration: &
     visitor.visit_fn_ret_ty(&function_declaration.output);
 }
 
-pub fn walk_fn<'a, V>(visitor: &mut V, kind: FnKind<'a>, declaration: &'a FnDecl, _span: Span)
-where
-    V: Visitor<'a>,
-{
+pub fn walk_fn<'a, V: Visitor<'a>>(visitor: &mut V, kind: FnKind<'a>, _span: Span) {
     match kind {
-        FnKind::ItemFn(_, header, _, body) => {
-            visitor.visit_fn_header(header);
-            walk_fn_decl(visitor, declaration);
-            visitor.visit_block(body);
-        }
-        FnKind::Method(_, sig, _, body) => {
+        FnKind::Fn(_, _, sig, _, body) => {
             visitor.visit_fn_header(&sig.header);
-            walk_fn_decl(visitor, declaration);
-            visitor.visit_block(body);
+            walk_fn_decl(visitor, &sig.decl);
+            walk_list!(visitor, visit_block, body);
         }
-        FnKind::Closure(body) => {
-            walk_fn_decl(visitor, declaration);
+        FnKind::Closure(decl, body) => {
+            walk_fn_decl(visitor, decl);
             visitor.visit_expr(body);
         }
     }
 }
 
-pub fn walk_impl_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem) {
-    visitor.visit_assoc_item(item);
-}
-
-pub fn walk_trait_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem) {
-    visitor.visit_assoc_item(item);
-}
-
-pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem) {
-    visitor.visit_vis(&item.vis);
-    visitor.visit_ident(item.ident);
-    walk_list!(visitor, visit_attribute, &item.attrs);
-    visitor.visit_generics(&item.generics);
-    match item.kind {
-        AssocItemKind::Const(ref ty, ref expr) => {
+pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem, ctxt: AssocCtxt) {
+    let Item { id, span, ident, ref vis, ref attrs, ref kind, tokens: _ } = *item;
+    visitor.visit_vis(vis);
+    visitor.visit_ident(ident);
+    walk_list!(visitor, visit_attribute, attrs);
+    match kind {
+        AssocItemKind::Const(_, ty, expr) => {
             visitor.visit_ty(ty);
             walk_list!(visitor, visit_expr, expr);
         }
-        AssocItemKind::Fn(ref sig, None) => {
-            visitor.visit_fn_header(&sig.header);
-            walk_fn_decl(visitor, &sig.decl);
-        }
-        AssocItemKind::Fn(ref sig, Some(ref body)) => {
-            visitor.visit_fn(
-                FnKind::Method(item.ident, sig, &item.vis, body),
-                &sig.decl,
-                item.span,
-                item.id,
-            );
+        AssocItemKind::Fn(_, sig, generics, body) => {
+            visitor.visit_generics(generics);
+            let kind = FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, vis, body.as_deref());
+            visitor.visit_fn(kind, span, id);
         }
-        AssocItemKind::TyAlias(ref bounds, ref ty) => {
+        AssocItemKind::TyAlias(_, generics, bounds, ty) => {
+            visitor.visit_generics(generics);
             walk_list!(visitor, visit_param_bound, bounds);
             walk_list!(visitor, visit_ty, ty);
         }
-        AssocItemKind::Macro(ref mac) => {
+        AssocItemKind::Macro(mac) => {
             visitor.visit_mac(mac);
         }
     }
@@ -677,9 +677,8 @@ pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {
     match statement.kind {
         StmtKind::Local(ref local) => visitor.visit_local(local),
         StmtKind::Item(ref item) => visitor.visit_item(item),
-        StmtKind::Expr(ref expression) | StmtKind::Semi(ref expression) => {
-            visitor.visit_expr(expression)
-        }
+        StmtKind::Expr(ref expr) | StmtKind::Semi(ref expr) => visitor.visit_expr(expr),
+        StmtKind::Empty => {}
         StmtKind::Mac(ref mac) => {
             let (ref mac, _, ref attrs) = **mac;
             visitor.visit_mac(mac);
@@ -765,8 +764,9 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
             visitor.visit_expr(subexpression);
             walk_list!(visitor, visit_arm, arms);
         }
-        ExprKind::Closure(_, _, _, ref function_declaration, ref body, _decl_span) => visitor
-            .visit_fn(FnKind::Closure(body), function_declaration, expression.span, expression.id),
+        ExprKind::Closure(_, _, _, ref decl, ref body, _decl_span) => {
+            visitor.visit_fn(FnKind::Closure(decl, body), expression.span, expression.id)
+        }
         ExprKind::Block(ref block, ref opt_label) => {
             walk_list!(visitor, visit_label, opt_label);
             visitor.visit_block(block);
diff --git a/src/librustc_ast_lowering/Cargo.toml b/src/librustc_ast_lowering/Cargo.toml
index 4b786d6245..23dc80faca 100644
--- a/src/librustc_ast_lowering/Cargo.toml
+++ b/src/librustc_ast_lowering/Cargo.toml
@@ -12,6 +12,7 @@ doctest = false
 [dependencies]
 log = { version = "0.4", features = ["release_max_level_info", "std"] }
 rustc = { path = "../librustc" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_target = { path = "../librustc_target" }
 rustc_data_structures = { path = "../librustc_data_structures" }
@@ -19,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" }
+rustc_ast = { path = "../librustc_ast" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_ast_lowering/expr.rs b/src/librustc_ast_lowering/expr.rs
index 5dc855e935..7038387caa 100644
--- a/src/librustc_ast_lowering/expr.rs
+++ b/src/librustc_ast_lowering/expr.rs
@@ -1,15 +1,15 @@
 use super::{ImplTraitContext, LoweringContext, ParamMode, ParenthesizedGenericArgs};
 
 use rustc::bug;
+use rustc_ast::ast::*;
+use rustc_ast::attr;
+use rustc_ast::ptr::P as AstP;
 use rustc_data_structures::thin_vec::ThinVec;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def::Res;
 use rustc_span::source_map::{respan, DesugaringKind, Span, Spanned};
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast::*;
-use syntax::attr;
-use syntax::ptr::P as AstP;
 
 impl<'hir> LoweringContext<'_, 'hir> {
     fn lower_exprs(&mut self, exprs: &[AstP<Expr>]) -> &'hir [hir::Expr<'hir>] {
@@ -106,7 +106,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 ref body,
                 fn_decl_span,
             ) => {
-                if let IsAsync::Async { closure_id, .. } = asyncness {
+                if let Async::Yes { closure_id, .. } = asyncness {
                     self.lower_expr_async_closure(
                         capture_clause,
                         closure_id,
@@ -480,8 +480,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
         body: impl FnOnce(&mut Self) -> hir::Expr<'hir>,
     ) -> hir::ExprKind<'hir> {
         let output = match ret_ty {
-            Some(ty) => FunctionRetTy::Ty(ty),
-            None => FunctionRetTy::Default(span),
+            Some(ty) => FnRetTy::Ty(ty),
+            None => FnRetTy::Default(span),
         };
         let ast_decl = FnDecl { inputs: vec![], output };
         let decl = self.lower_fn_decl(&ast_decl, None, /* impl trait allowed */ false, None);
@@ -688,12 +688,12 @@ impl<'hir> LoweringContext<'_, 'hir> {
     ) -> Option<hir::Movability> {
         match generator_kind {
             Some(hir::GeneratorKind::Gen) => {
-                if !decl.inputs.is_empty() {
+                if decl.inputs.len() > 1 {
                     struct_span_err!(
                         self.sess,
                         fn_decl_span,
                         E0628,
-                        "generators cannot have explicit parameters"
+                        "too many parameters for a generator (expected 0 or 1 parameters)"
                     )
                     .emit();
                 }
@@ -721,7 +721,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         fn_decl_span: Span,
     ) -> hir::ExprKind<'hir> {
         let outer_decl =
-            FnDecl { inputs: decl.inputs.clone(), output: FunctionRetTy::Default(fn_decl_span) };
+            FnDecl { inputs: decl.inputs.clone(), output: FnRetTy::Default(fn_decl_span) };
         // We need to lower the declaration outside the new scope, because we
         // have to conserve the state of being inside a loop condition for the
         // closure argument types.
@@ -747,7 +747,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             // `|x: u8| future_from_generator(|| -> X { ... })`.
             let body_id = this.lower_fn_body(&outer_decl, |this| {
                 let async_ret_ty =
-                    if let FunctionRetTy::Ty(ty) = &decl.output { Some(ty.clone()) } else { None };
+                    if let FnRetTy::Ty(ty) = &decl.output { Some(ty.clone()) } else { None };
                 let async_body = this.make_async_expr(
                     capture_clause,
                     closure_id,
@@ -783,7 +783,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         e2: Option<&Expr>,
         lims: RangeLimits,
     ) -> hir::ExprKind<'hir> {
-        use syntax::ast::RangeLimits::*;
+        use rustc_ast::ast::RangeLimits::*;
 
         let path = match (e1, e2, lims) {
             (None, None, HalfOpen) => sym::RangeFull,
@@ -831,8 +831,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 .last()
                 .cloned()
                 .map(|id| Ok(self.lower_node_id(id)))
-                .unwrap_or(Err(hir::LoopIdError::OutsideLoopScope))
-                .into(),
+                .unwrap_or(Err(hir::LoopIdError::OutsideLoopScope)),
         };
         hir::Destination { label: destination.map(|(_, label)| label), target_id }
     }
@@ -841,7 +840,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         if self.is_in_loop_condition && opt_label.is_none() {
             hir::Destination {
                 label: None,
-                target_id: Err(hir::LoopIdError::UnlabeledCfInWhileCondition).into(),
+                target_id: Err(hir::LoopIdError::UnlabeledCfInWhileCondition),
             }
         } else {
             self.lower_loop_destination(opt_label.map(|label| (id, label)))
@@ -912,7 +911,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 .collect(),
             asm: asm.asm,
             asm_str_style: asm.asm_str_style,
-            clobbers: asm.clobbers.clone().into(),
+            clobbers: asm.clobbers.clone(),
             volatile: asm.volatile,
             alignstack: asm.alignstack,
             dialect: asm.dialect,
@@ -1180,7 +1179,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             let from_err_expr =
                 self.wrap_in_try_constructor(sym::from_error, unstable_span, from_expr, try_span);
             let thin_attrs = ThinVec::from(attrs);
-            let catch_scope = self.catch_scopes.last().map(|x| *x);
+            let catch_scope = self.catch_scopes.last().copied();
             let ret_expr = if let Some(catch_node) = catch_scope {
                 let target_id = Ok(self.lower_node_id(catch_node));
                 self.arena.alloc(self.expr(
diff --git a/src/librustc_ast_lowering/item.rs b/src/librustc_ast_lowering/item.rs
index 2025d0c1c8..46aad99f13 100644
--- a/src/librustc_ast_lowering/item.rs
+++ b/src/librustc_ast_lowering/item.rs
@@ -3,18 +3,18 @@ use super::{ImplTraitContext, ImplTraitPosition, ImplTraitTypeIdVisitor};
 
 use rustc::arena::Arena;
 use rustc::bug;
+use rustc_ast::ast::*;
+use rustc_ast::attr;
+use rustc_ast::node_id::NodeMap;
+use rustc_ast::visit::{self, AssocCtxt, Visitor};
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::DefId;
-use rustc_session::node_id::NodeMap;
 use rustc_span::source_map::{respan, DesugaringKind};
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
 use rustc_target::spec::abi;
-use syntax::ast::*;
-use syntax::attr;
-use syntax::visit::{self, Visitor};
 
 use log::debug;
 use smallvec::{smallvec, SmallVec};
@@ -66,13 +66,7 @@ impl<'a> Visitor<'a> for ItemLowerer<'a, '_, '_> {
         if let Some(hir_id) = item_hir_id {
             self.lctx.with_parent_item_lifetime_defs(hir_id, |this| {
                 let this = &mut ItemLowerer { lctx: this };
-                if let ItemKind::Impl { constness, ref of_trait, .. } = item.kind {
-                    if constness == Constness::Const {
-                        this.lctx
-                            .diagnostic()
-                            .span_err(item.span, "const trait impls are not yet implemented");
-                    }
-
+                if let ItemKind::Impl { ref of_trait, .. } = item.kind {
                     this.with_trait_impl_ref(of_trait, |this| visit::walk_item(this, item));
                 } else {
                     visit::walk_item(this, item);
@@ -81,25 +75,23 @@ impl<'a> Visitor<'a> for ItemLowerer<'a, '_, '_> {
         }
     }
 
-    fn visit_trait_item(&mut self, item: &'a AssocItem) {
-        self.lctx.with_hir_id_owner(item.id, |lctx| {
-            let hir_item = lctx.lower_trait_item(item);
-            let id = hir::TraitItemId { hir_id: hir_item.hir_id };
-            lctx.trait_items.insert(id, hir_item);
-            lctx.modules.get_mut(&lctx.current_module).unwrap().trait_items.insert(id);
+    fn visit_assoc_item(&mut self, item: &'a AssocItem, ctxt: AssocCtxt) {
+        self.lctx.with_hir_id_owner(item.id, |lctx| match ctxt {
+            AssocCtxt::Trait => {
+                let hir_item = lctx.lower_trait_item(item);
+                let id = hir::TraitItemId { hir_id: hir_item.hir_id };
+                lctx.trait_items.insert(id, hir_item);
+                lctx.modules.get_mut(&lctx.current_module).unwrap().trait_items.insert(id);
+            }
+            AssocCtxt::Impl => {
+                let hir_item = lctx.lower_impl_item(item);
+                let id = hir::ImplItemId { hir_id: hir_item.hir_id };
+                lctx.impl_items.insert(id, hir_item);
+                lctx.modules.get_mut(&lctx.current_module).unwrap().impl_items.insert(id);
+            }
         });
 
-        visit::walk_trait_item(self, item);
-    }
-
-    fn visit_impl_item(&mut self, item: &'a AssocItem) {
-        self.lctx.with_hir_id_owner(item.id, |lctx| {
-            let hir_item = lctx.lower_impl_item(item);
-            let id = hir::ImplItemId { hir_id: hir_item.hir_id };
-            lctx.impl_items.insert(id, hir_item);
-            lctx.modules.get_mut(&lctx.current_module).unwrap().impl_items.insert(id);
-        });
-        visit::walk_impl_item(self, item);
+        visit::walk_assoc_item(self, item, ctxt);
     }
 }
 
@@ -181,7 +173,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 }
                 ids
             }
-            ItemKind::Const(ref ty, ..) => {
+            ItemKind::Const(_, ref ty, ..) => {
                 let mut ids = smallvec![i.id];
                 if self.sess.features_untracked().impl_trait_in_bindings {
                     let mut visitor = ImplTraitTypeIdVisitor { ids: &mut ids };
@@ -269,28 +261,14 @@ impl<'hir> LoweringContext<'_, 'hir> {
                 self.lower_use_tree(use_tree, &prefix, id, vis, ident, attrs)
             }
             ItemKind::Static(ref t, m, ref e) => {
-                let ty = self.lower_ty(
-                    t,
-                    if self.sess.features_untracked().impl_trait_in_bindings {
-                        ImplTraitContext::OpaqueTy(None)
-                    } else {
-                        ImplTraitContext::Disallowed(ImplTraitPosition::Binding)
-                    },
-                );
-                hir::ItemKind::Static(ty, m, self.lower_const_body(span, Some(e)))
+                let (ty, body_id) = self.lower_const_item(t, span, e.as_deref());
+                hir::ItemKind::Static(ty, m, body_id)
             }
-            ItemKind::Const(ref t, ref e) => {
-                let ty = self.lower_ty(
-                    t,
-                    if self.sess.features_untracked().impl_trait_in_bindings {
-                        ImplTraitContext::OpaqueTy(None)
-                    } else {
-                        ImplTraitContext::Disallowed(ImplTraitPosition::Binding)
-                    },
-                );
-                hir::ItemKind::Const(ty, self.lower_const_body(span, Some(e)))
+            ItemKind::Const(_, ref t, ref e) => {
+                let (ty, body_id) = self.lower_const_item(t, span, e.as_deref());
+                hir::ItemKind::Const(ty, body_id)
             }
-            ItemKind::Fn(FnSig { ref decl, header }, ref generics, ref body) => {
+            ItemKind::Fn(_, FnSig { ref decl, header }, ref generics, ref body) => {
                 let fn_def_id = self.resolver.definitions().local_def_id(id);
                 self.with_new_scopes(|this| {
                     this.current_item = Some(ident.span);
@@ -299,20 +277,17 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     // `impl Future<Output = T>` here because lower_body
                     // only cares about the input argument patterns in the function
                     // declaration (decl), not the return types.
+                    let asyncness = header.asyncness;
                     let body_id =
-                        this.lower_maybe_async_body(span, &decl, header.asyncness.node, Some(body));
+                        this.lower_maybe_async_body(span, &decl, asyncness, body.as_deref());
 
                     let (generics, decl) = this.add_in_band_defs(
                         generics,
                         fn_def_id,
                         AnonymousLifetimeMode::PassThrough,
                         |this, idty| {
-                            this.lower_fn_decl(
-                                &decl,
-                                Some((fn_def_id, idty)),
-                                true,
-                                header.asyncness.node.opt_return_id(),
-                            )
+                            let ret_id = asyncness.opt_return_id();
+                            this.lower_fn_decl(&decl, Some((fn_def_id, idty)), true, ret_id)
                         },
                     );
                     let sig = hir::FnSig { decl, header: this.lower_fn_header(header) };
@@ -322,22 +297,28 @@ impl<'hir> LoweringContext<'_, 'hir> {
             ItemKind::Mod(ref m) => hir::ItemKind::Mod(self.lower_mod(m)),
             ItemKind::ForeignMod(ref nm) => hir::ItemKind::ForeignMod(self.lower_foreign_mod(nm)),
             ItemKind::GlobalAsm(ref ga) => hir::ItemKind::GlobalAsm(self.lower_global_asm(ga)),
-            ItemKind::TyAlias(ref ty, ref generics) => match ty.kind.opaque_top_hack() {
+            ItemKind::TyAlias(_, ref gen, _, Some(ref ty)) => match ty.kind.opaque_top_hack() {
                 None => {
                     let ty = self.lower_ty(ty, ImplTraitContext::disallowed());
-                    let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
+                    let generics = self.lower_generics(gen, ImplTraitContext::disallowed());
                     hir::ItemKind::TyAlias(ty, generics)
                 }
                 Some(bounds) => {
+                    let ctx = || ImplTraitContext::OpaqueTy(None, hir::OpaqueTyOrigin::Misc);
                     let ty = hir::OpaqueTy {
-                        generics: self.lower_generics(generics, ImplTraitContext::OpaqueTy(None)),
-                        bounds: self.lower_param_bounds(bounds, ImplTraitContext::OpaqueTy(None)),
+                        generics: self.lower_generics(gen, ctx()),
+                        bounds: self.lower_param_bounds(bounds, ctx()),
                         impl_trait_fn: None,
                         origin: hir::OpaqueTyOrigin::TypeAlias,
                     };
                     hir::ItemKind::OpaqueTy(ty)
                 }
             },
+            ItemKind::TyAlias(_, ref generics, _, None) => {
+                let ty = self.arena.alloc(self.ty(span, hir::TyKind::Err));
+                let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
+                hir::ItemKind::TyAlias(ty, generics)
+            }
             ItemKind::Enum(ref enum_definition, ref generics) => hir::ItemKind::Enum(
                 hir::EnumDef {
                     variants: self.arena.alloc_from_iter(
@@ -418,10 +399,10 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     });
 
                 hir::ItemKind::Impl {
-                    unsafety,
+                    unsafety: self.lower_unsafety(unsafety),
                     polarity,
                     defaultness: self.lower_defaultness(defaultness, true /* [1] */),
-                    constness,
+                    constness: self.lower_constness(constness),
                     generics,
                     of_trait: trait_ref,
                     self_ty: lowered_ty,
@@ -435,7 +416,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     .alloc_from_iter(items.iter().map(|item| self.lower_trait_item_ref(item)));
                 hir::ItemKind::Trait(
                     is_auto,
-                    unsafety,
+                    self.lower_unsafety(unsafety),
                     self.lower_generics(generics, ImplTraitContext::disallowed()),
                     bounds,
                     items,
@@ -454,6 +435,21 @@ impl<'hir> LoweringContext<'_, 'hir> {
         //     not cause an assertion failure inside the `lower_defaultness` function.
     }
 
+    fn lower_const_item(
+        &mut self,
+        ty: &Ty,
+        span: Span,
+        body: Option<&Expr>,
+    ) -> (&'hir hir::Ty<'hir>, hir::BodyId) {
+        let itctx = if self.sess.features_untracked().impl_trait_in_bindings {
+            ImplTraitContext::OpaqueTy(None, hir::OpaqueTyOrigin::Misc)
+        } else {
+            ImplTraitContext::Disallowed(ImplTraitPosition::Binding)
+        };
+        let ty = self.lower_ty(ty, itctx);
+        (ty, self.lower_const_body(span, body))
+    }
+
     fn lower_use_tree(
         &mut self,
         tree: &UseTree,
@@ -658,7 +654,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
             ident: i.ident,
             attrs: self.lower_attrs(&i.attrs),
             kind: match i.kind {
-                ForeignItemKind::Fn(ref fdec, ref generics) => {
+                ForeignItemKind::Fn(_, ref sig, ref generics, _) => {
+                    let fdec = &sig.decl;
                     let (generics, (fn_dec, fn_args)) = self.add_in_band_defs(
                         generics,
                         def_id,
@@ -674,11 +671,11 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
                     hir::ForeignItemKind::Fn(fn_dec, fn_args, generics)
                 }
-                ForeignItemKind::Static(ref t, m) => {
+                ForeignItemKind::Static(ref t, m, _) => {
                     let ty = self.lower_ty(t, ImplTraitContext::disallowed());
                     hir::ForeignItemKind::Static(ty, m)
                 }
-                ForeignItemKind::Ty => hir::ForeignItemKind::Type,
+                ForeignItemKind::TyAlias(..) => hir::ForeignItemKind::Type,
                 ForeignItemKind::Macro(_) => panic!("macro shouldn't exist here"),
             },
             vis: self.lower_visibility(&i.vis, None),
@@ -755,32 +752,26 @@ impl<'hir> LoweringContext<'_, 'hir> {
         let trait_item_def_id = self.resolver.definitions().local_def_id(i.id);
 
         let (generics, kind) = match i.kind {
-            AssocItemKind::Const(ref ty, ref default) => {
-                let generics = self.lower_generics(&i.generics, ImplTraitContext::disallowed());
+            AssocItemKind::Const(_, ref ty, ref default) => {
                 let ty = self.lower_ty(ty, ImplTraitContext::disallowed());
-                (
-                    generics,
-                    hir::TraitItemKind::Const(
-                        ty,
-                        default.as_ref().map(|x| self.lower_const_body(i.span, Some(x))),
-                    ),
-                )
+                let body = default.as_ref().map(|x| self.lower_const_body(i.span, Some(x)));
+                (hir::Generics::empty(), hir::TraitItemKind::Const(ty, body))
             }
-            AssocItemKind::Fn(ref sig, None) => {
+            AssocItemKind::Fn(_, ref sig, ref generics, None) => {
                 let names = self.lower_fn_params_to_names(&sig.decl);
                 let (generics, sig) =
-                    self.lower_method_sig(&i.generics, sig, trait_item_def_id, false, None);
+                    self.lower_method_sig(generics, sig, trait_item_def_id, false, None);
                 (generics, hir::TraitItemKind::Method(sig, hir::TraitMethod::Required(names)))
             }
-            AssocItemKind::Fn(ref sig, Some(ref body)) => {
+            AssocItemKind::Fn(_, ref sig, ref generics, Some(ref body)) => {
                 let body_id = self.lower_fn_body_block(i.span, &sig.decl, Some(body));
                 let (generics, sig) =
-                    self.lower_method_sig(&i.generics, sig, trait_item_def_id, false, None);
+                    self.lower_method_sig(generics, sig, trait_item_def_id, false, None);
                 (generics, hir::TraitItemKind::Method(sig, hir::TraitMethod::Provided(body_id)))
             }
-            AssocItemKind::TyAlias(ref bounds, ref default) => {
+            AssocItemKind::TyAlias(_, ref generics, ref bounds, ref default) => {
                 let ty = default.as_ref().map(|x| self.lower_ty(x, ImplTraitContext::disallowed()));
-                let generics = self.lower_generics(&i.generics, ImplTraitContext::disallowed());
+                let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
                 let kind = hir::TraitItemKind::Type(
                     self.lower_param_bounds(bounds, ImplTraitContext::disallowed()),
                     ty,
@@ -802,21 +793,19 @@ impl<'hir> LoweringContext<'_, 'hir> {
     }
 
     fn lower_trait_item_ref(&mut self, i: &AssocItem) -> hir::TraitItemRef {
-        let (kind, has_default) = match i.kind {
-            AssocItemKind::Const(_, ref default) => (hir::AssocItemKind::Const, default.is_some()),
-            AssocItemKind::TyAlias(_, ref default) => (hir::AssocItemKind::Type, default.is_some()),
-            AssocItemKind::Fn(ref sig, ref default) => {
+        let (kind, has_default) = match &i.kind {
+            AssocItemKind::Const(_, _, default) => (hir::AssocItemKind::Const, default.is_some()),
+            AssocItemKind::TyAlias(_, _, _, default) => {
+                (hir::AssocItemKind::Type, default.is_some())
+            }
+            AssocItemKind::Fn(_, sig, _, default) => {
                 (hir::AssocItemKind::Method { has_self: sig.decl.has_self() }, default.is_some())
             }
             AssocItemKind::Macro(..) => unimplemented!(),
         };
-        hir::TraitItemRef {
-            id: hir::TraitItemId { hir_id: self.lower_node_id(i.id) },
-            ident: i.ident,
-            span: i.span,
-            defaultness: self.lower_defaultness(Defaultness::Default, has_default),
-            kind,
-        }
+        let id = hir::TraitItemId { hir_id: self.lower_node_id(i.id) };
+        let defaultness = hir::Defaultness::Default { has_value: has_default };
+        hir::TraitItemRef { id, ident: i.ident, span: i.span, defaultness, kind }
     }
 
     /// Construct `ExprKind::Err` for the given `span`.
@@ -827,36 +816,32 @@ impl<'hir> LoweringContext<'_, 'hir> {
     fn lower_impl_item(&mut self, i: &AssocItem) -> hir::ImplItem<'hir> {
         let impl_item_def_id = self.resolver.definitions().local_def_id(i.id);
 
-        let (generics, kind) = match i.kind {
-            AssocItemKind::Const(ref ty, ref expr) => {
-                let generics = self.lower_generics(&i.generics, ImplTraitContext::disallowed());
+        let (generics, kind) = match &i.kind {
+            AssocItemKind::Const(_, ty, expr) => {
                 let ty = self.lower_ty(ty, ImplTraitContext::disallowed());
                 (
-                    generics,
+                    hir::Generics::empty(),
                     hir::ImplItemKind::Const(ty, self.lower_const_body(i.span, expr.as_deref())),
                 )
             }
-            AssocItemKind::Fn(ref sig, ref body) => {
+            AssocItemKind::Fn(_, sig, generics, body) => {
                 self.current_item = Some(i.span);
-                let body_id = self.lower_maybe_async_body(
-                    i.span,
-                    &sig.decl,
-                    sig.header.asyncness.node,
-                    body.as_deref(),
-                );
+                let asyncness = sig.header.asyncness;
+                let body_id =
+                    self.lower_maybe_async_body(i.span, &sig.decl, asyncness, body.as_deref());
                 let impl_trait_return_allow = !self.is_in_trait_impl;
                 let (generics, sig) = self.lower_method_sig(
-                    &i.generics,
+                    generics,
                     sig,
                     impl_item_def_id,
                     impl_trait_return_allow,
-                    sig.header.asyncness.node.opt_return_id(),
+                    asyncness.opt_return_id(),
                 );
 
                 (generics, hir::ImplItemKind::Method(sig, body_id))
             }
-            AssocItemKind::TyAlias(_, ref ty) => {
-                let generics = self.lower_generics(&i.generics, ImplTraitContext::disallowed());
+            AssocItemKind::TyAlias(_, generics, _, ty) => {
+                let generics = self.lower_generics(generics, ImplTraitContext::disallowed());
                 let kind = match ty {
                     None => {
                         let ty = self.arena.alloc(self.ty(i.span, hir::TyKind::Err));
@@ -884,7 +869,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
             attrs: self.lower_attrs(&i.attrs),
             generics,
             vis: self.lower_visibility(&i.vis, None),
-            defaultness: self.lower_defaultness(i.defaultness, true /* [1] */),
+            defaultness: self.lower_defaultness(i.kind.defaultness(), true /* [1] */),
             kind,
             span: i.span,
         }
@@ -898,16 +883,16 @@ impl<'hir> LoweringContext<'_, 'hir> {
             ident: i.ident,
             span: i.span,
             vis: self.lower_visibility(&i.vis, Some(i.id)),
-            defaultness: self.lower_defaultness(i.defaultness, true /* [1] */),
+            defaultness: self.lower_defaultness(i.kind.defaultness(), true /* [1] */),
             kind: match &i.kind {
                 AssocItemKind::Const(..) => hir::AssocItemKind::Const,
-                AssocItemKind::TyAlias(_, ty) => {
+                AssocItemKind::TyAlias(.., ty) => {
                     match ty.as_deref().and_then(|ty| ty.kind.opaque_top_hack()) {
                         None => hir::AssocItemKind::Type,
                         Some(_) => hir::AssocItemKind::OpaqueTy,
                     }
                 }
-                AssocItemKind::Fn(sig, _) => {
+                AssocItemKind::Fn(_, sig, ..) => {
                     hir::AssocItemKind::Method { has_self: sig.decl.has_self() }
                 }
                 AssocItemKind::Macro(..) => unimplemented!(),
@@ -951,7 +936,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
     fn lower_defaultness(&self, d: Defaultness, has_value: bool) -> hir::Defaultness {
         match d {
-            Defaultness::Default => hir::Defaultness::Default { has_value: has_value },
+            Defaultness::Default(_) => hir::Defaultness::Default { has_value },
             Defaultness::Final => {
                 assert!(has_value);
                 hir::Defaultness::Final
@@ -1035,12 +1020,12 @@ impl<'hir> LoweringContext<'_, 'hir> {
         &mut self,
         span: Span,
         decl: &FnDecl,
-        asyncness: IsAsync,
+        asyncness: Async,
         body: Option<&Block>,
     ) -> hir::BodyId {
         let closure_id = match asyncness {
-            IsAsync::Async { closure_id, .. } => closure_id,
-            IsAsync::NotAsync => return self.lower_fn_body_block(span, decl, body),
+            Async::Yes { closure_id, .. } => closure_id,
+            Async::No => return self.lower_fn_body_block(span, decl, body),
         };
 
         self.lower_body(|this| {
@@ -1249,9 +1234,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
 
     fn lower_fn_header(&mut self, h: FnHeader) -> hir::FnHeader {
         hir::FnHeader {
-            unsafety: h.unsafety,
-            asyncness: self.lower_asyncness(h.asyncness.node),
-            constness: h.constness.node,
+            unsafety: self.lower_unsafety(h.unsafety),
+            asyncness: self.lower_asyncness(h.asyncness),
+            constness: self.lower_constness(h.constness),
             abi: self.lower_extern(h.ext),
         }
     }
@@ -1278,10 +1263,24 @@ impl<'hir> LoweringContext<'_, 'hir> {
             .emit();
     }
 
-    fn lower_asyncness(&mut self, a: IsAsync) -> hir::IsAsync {
+    fn lower_asyncness(&mut self, a: Async) -> hir::IsAsync {
         match a {
-            IsAsync::Async { .. } => hir::IsAsync::Async,
-            IsAsync::NotAsync => hir::IsAsync::NotAsync,
+            Async::Yes { .. } => hir::IsAsync::Async,
+            Async::No => hir::IsAsync::NotAsync,
+        }
+    }
+
+    fn lower_constness(&mut self, c: Const) -> hir::Constness {
+        match c {
+            Const::Yes(_) => hir::Constness::Const,
+            Const::No => hir::Constness::NotConst,
+        }
+    }
+
+    pub(super) fn lower_unsafety(&mut self, u: Unsafe) -> hir::Unsafety {
+        match u {
+            Unsafe::Yes(_) => hir::Unsafety::Unsafe,
+            Unsafe::No => hir::Unsafety::Normal,
         }
     }
 
diff --git a/src/librustc_ast_lowering/lib.rs b/src/librustc_ast_lowering/lib.rs
index 284ede3b4f..dd9526ccee 100644
--- a/src/librustc_ast_lowering/lib.rs
+++ b/src/librustc_ast_lowering/lib.rs
@@ -32,12 +32,22 @@
 
 #![feature(array_value_iter)]
 #![feature(crate_visibility_modifier)]
+#![recursion_limit = "256"]
 
 use rustc::arena::Arena;
 use rustc::dep_graph::DepGraph;
 use rustc::hir::map::definitions::{DefKey, DefPathData, Definitions};
 use rustc::hir::map::Map;
 use rustc::{bug, span_bug};
+use rustc_ast::ast;
+use rustc_ast::ast::*;
+use rustc_ast::attr;
+use rustc_ast::node_id::NodeMap;
+use rustc_ast::token::{self, Nonterminal, Token};
+use rustc_ast::tokenstream::{TokenStream, TokenTree};
+use rustc_ast::visit::{self, AssocCtxt, Visitor};
+use rustc_ast::walk_list;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::Lrc;
@@ -49,22 +59,13 @@ use rustc_hir::intravisit;
 use rustc_hir::{ConstArg, GenericArg, ParamName};
 use rustc_index::vec::IndexVec;
 use rustc_session::config::nightly_options;
-use rustc_session::lint::{builtin, BuiltinLintDiagnostics, LintBuffer};
-use rustc_session::node_id::NodeMap;
+use rustc_session::lint::{builtin::BARE_TRAIT_OBJECTS, BuiltinLintDiagnostics, LintBuffer};
+use rustc_session::parse::ParseSess;
 use rustc_session::Session;
 use rustc_span::hygiene::ExpnId;
 use rustc_span::source_map::{respan, DesugaringKind, ExpnData, ExpnKind};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast;
-use syntax::ast::*;
-use syntax::attr;
-use syntax::print::pprust;
-use syntax::sess::ParseSess;
-use syntax::token::{self, Nonterminal, Token};
-use syntax::tokenstream::{TokenStream, TokenTree};
-use syntax::visit::{self, Visitor};
-use syntax::walk_list;
 
 use log::{debug, trace};
 use smallvec::{smallvec, SmallVec};
@@ -221,7 +222,7 @@ enum ImplTraitContext<'b, 'a> {
     /// We optionally store a `DefId` for the parent item here so we can look up necessary
     /// information later. It is `None` when no information about the context should be stored
     /// (e.g., for consts and statics).
-    OpaqueTy(Option<DefId> /* fn def-ID */),
+    OpaqueTy(Option<DefId> /* fn def-ID */, hir::OpaqueTyOrigin),
 
     /// `impl Trait` is not accepted in this position.
     Disallowed(ImplTraitPosition),
@@ -247,7 +248,7 @@ impl<'a> ImplTraitContext<'_, 'a> {
         use self::ImplTraitContext::*;
         match self {
             Universal(params) => Universal(params),
-            OpaqueTy(fn_def_id) => OpaqueTy(*fn_def_id),
+            OpaqueTy(fn_def_id, origin) => OpaqueTy(*fn_def_id, *origin),
             Disallowed(pos) => Disallowed(*pos),
         }
     }
@@ -461,7 +462,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                     ItemKind::Struct(_, ref generics)
                     | ItemKind::Union(_, ref generics)
                     | ItemKind::Enum(_, ref generics)
-                    | ItemKind::TyAlias(_, ref generics)
+                    | ItemKind::TyAlias(_, ref generics, ..)
                     | ItemKind::Trait(_, _, ref generics, ..) => {
                         let def_id = self.lctx.resolver.definitions().local_def_id(item.id);
                         let count = generics
@@ -485,25 +486,14 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 });
             }
 
-            fn visit_trait_item(&mut self, item: &'tcx AssocItem) {
+            fn visit_assoc_item(&mut self, item: &'tcx AssocItem, ctxt: AssocCtxt) {
                 self.lctx.allocate_hir_id_counter(item.id);
-
-                match item.kind {
-                    AssocItemKind::Fn(_, None) => {
-                        // Ignore patterns in trait methods without bodies
-                        self.with_hir_id_owner(None, |this| visit::walk_trait_item(this, item));
-                    }
-                    _ => self.with_hir_id_owner(Some(item.id), |this| {
-                        visit::walk_trait_item(this, item);
-                    }),
-                }
-            }
-
-            fn visit_impl_item(&mut self, item: &'tcx AssocItem) {
-                self.lctx.allocate_hir_id_counter(item.id);
-                self.with_hir_id_owner(Some(item.id), |this| {
-                    visit::walk_impl_item(this, item);
-                });
+                let owner = match (&item.kind, ctxt) {
+                    // Ignore patterns in trait methods without bodies.
+                    (AssocItemKind::Fn(_, _, _, None), AssocCtxt::Trait) => None,
+                    _ => Some(item.id),
+                };
+                self.with_hir_id_owner(owner, |this| visit::walk_assoc_item(this, item, ctxt));
             }
 
             fn visit_foreign_item(&mut self, i: &'tcx ForeignItem) {
@@ -540,6 +530,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         let module = self.lower_mod(&c.module);
         let attrs = self.lower_attrs(&c.attrs);
         let body_ids = body_ids(&self.bodies);
+        let proc_macros = c.proc_macros.iter().map(|id| self.node_id_to_hir_id[*id]).collect();
 
         self.resolver.definitions().init_node_id_to_hir_id_mapping(self.node_id_to_hir_id);
 
@@ -556,6 +547,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             body_ids,
             trait_impls: self.trait_impls,
             modules: self.modules,
+            proc_macros,
         }
     }
 
@@ -1020,7 +1012,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                     // so desugar to
                     //
                     //     fn foo() -> impl Iterator<Item = impl Debug>
-                    ImplTraitContext::OpaqueTy(_) => (true, itctx),
+                    ImplTraitContext::OpaqueTy(..) => (true, itctx),
 
                     // We are in the argument position, but within a dyn type:
                     //
@@ -1029,7 +1021,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                     // so desugar to
                     //
                     //     fn foo(x: dyn Iterator<Item = impl Debug>)
-                    ImplTraitContext::Universal(_) if self.is_in_dyn_type => (true, itctx),
+                    ImplTraitContext::Universal(..) if self.is_in_dyn_type => (true, itctx),
 
                     // In `type Foo = dyn Iterator<Item: Debug>` we desugar to
                     // `type Foo = dyn Iterator<Item = impl Debug>` but we have to override the
@@ -1038,7 +1030,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                     //
                     // FIXME: this is only needed until `impl Trait` is allowed in type aliases.
                     ImplTraitContext::Disallowed(_) if self.is_in_dyn_type => {
-                        (true, ImplTraitContext::OpaqueTy(None))
+                        (true, ImplTraitContext::OpaqueTy(None, hir::OpaqueTyOrigin::Misc))
                     }
 
                     // We are in the parameter position, but not within a dyn type:
@@ -1104,7 +1096,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         match arg {
             ast::GenericArg::Lifetime(lt) => GenericArg::Lifetime(self.lower_lifetime(&lt)),
             ast::GenericArg::Type(ty) => {
-                // We parse const arguments as path types as we cannot distiguish them durring
+                // We parse const arguments as path types as we cannot distinguish them during
                 // parsing. We try to resolve that ambiguity by attempting resolution in both the
                 // type and value namespaces. If we resolved the path in the value namespace, we
                 // transform it into a generic const argument.
@@ -1206,7 +1198,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                             &NodeMap::default(),
                             ImplTraitContext::disallowed(),
                         ),
-                        unsafety: f.unsafety,
+                        unsafety: this.lower_unsafety(f.unsafety),
                         abi: this.lower_extern(f.ext),
                         decl: this.lower_fn_decl(&f.decl, None, false, None),
                         param_names: this.lower_fn_params_to_names(&f.decl),
@@ -1279,8 +1271,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             TyKind::ImplTrait(def_node_id, ref bounds) => {
                 let span = t.span;
                 match itctx {
-                    ImplTraitContext::OpaqueTy(fn_def_id) => {
-                        self.lower_opaque_impl_trait(span, fn_def_id, def_node_id, |this| {
+                    ImplTraitContext::OpaqueTy(fn_def_id, origin) => {
+                        self.lower_opaque_impl_trait(span, fn_def_id, origin, def_node_id, |this| {
                             this.lower_param_bounds(bounds, itctx)
                         })
                     }
@@ -1359,6 +1351,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         &mut self,
         span: Span,
         fn_def_id: Option<DefId>,
+        origin: hir::OpaqueTyOrigin,
         opaque_ty_node_id: NodeId,
         lower_bounds: impl FnOnce(&mut Self) -> hir::GenericBounds<'hir>,
     ) -> hir::TyKind<'hir> {
@@ -1400,7 +1393,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 },
                 bounds: hir_bounds,
                 impl_trait_fn: fn_def_id,
-                origin: hir::OpaqueTyOrigin::FnReturn,
+                origin,
             };
 
             trace!("lower_opaque_impl_trait: {:#?}", opaque_ty_def_index);
@@ -1632,7 +1625,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             self.lower_ty(
                 t,
                 if self.sess.features_untracked().impl_trait_in_bindings {
-                    ImplTraitContext::OpaqueTy(Some(parent_def_id))
+                    ImplTraitContext::OpaqueTy(Some(parent_def_id), hir::OpaqueTyOrigin::Misc)
                 } else {
                     ImplTraitContext::Disallowed(ImplTraitPosition::Binding)
                 },
@@ -1732,15 +1725,16 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             )
         } else {
             match decl.output {
-                FunctionRetTy::Ty(ref ty) => match in_band_ty_params {
-                    Some((def_id, _)) if impl_trait_return_allow => hir::FunctionRetTy::Return(
-                        self.lower_ty(ty, ImplTraitContext::OpaqueTy(Some(def_id))),
-                    ),
-                    _ => hir::FunctionRetTy::Return(
-                        self.lower_ty(ty, ImplTraitContext::disallowed()),
-                    ),
-                },
-                FunctionRetTy::Default(span) => hir::FunctionRetTy::DefaultReturn(span),
+                FnRetTy::Ty(ref ty) => {
+                    let context = match in_band_ty_params {
+                        Some((def_id, _)) if impl_trait_return_allow => {
+                            ImplTraitContext::OpaqueTy(Some(def_id), hir::OpaqueTyOrigin::FnReturn)
+                        }
+                        _ => ImplTraitContext::disallowed(),
+                    };
+                    hir::FnRetTy::Return(self.lower_ty(ty, context))
+                }
+                FnRetTy::Default(span) => hir::FnRetTy::DefaultReturn(span),
             }
         };
 
@@ -1787,10 +1781,10 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
     // `elided_lt_replacement`: replacement for elided lifetimes in the return type
     fn lower_async_fn_ret_ty(
         &mut self,
-        output: &FunctionRetTy,
+        output: &FnRetTy,
         fn_def_id: DefId,
         opaque_ty_node_id: NodeId,
-    ) -> hir::FunctionRetTy<'hir> {
+    ) -> hir::FnRetTy<'hir> {
         debug!(
             "lower_async_fn_ret_ty(\
              output={:?}, \
@@ -1955,20 +1949,27 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         // only the lifetime parameters that we must supply.
         let opaque_ty_ref = hir::TyKind::Def(hir::ItemId { id: opaque_ty_id }, generic_args);
         let opaque_ty = self.ty(opaque_ty_span, opaque_ty_ref);
-        hir::FunctionRetTy::Return(self.arena.alloc(opaque_ty))
+        hir::FnRetTy::Return(self.arena.alloc(opaque_ty))
     }
 
     /// Transforms `-> T` into `Future<Output = T>`
     fn lower_async_fn_output_type_to_future_bound(
         &mut self,
-        output: &FunctionRetTy,
+        output: &FnRetTy,
         fn_def_id: DefId,
         span: Span,
     ) -> hir::GenericBound<'hir> {
         // Compute the `T` in `Future<Output = T>` from the return type.
         let output_ty = match output {
-            FunctionRetTy::Ty(ty) => self.lower_ty(ty, ImplTraitContext::OpaqueTy(Some(fn_def_id))),
-            FunctionRetTy::Default(ret_ty_span) => self.arena.alloc(self.ty_tup(*ret_ty_span, &[])),
+            FnRetTy::Ty(ty) => {
+                // Not `OpaqueTyOrigin::AsyncFn`: that's only used for the
+                // `impl Future` opaque type that `async fn` implicitly
+                // generates.
+                let context =
+                    ImplTraitContext::OpaqueTy(Some(fn_def_id), hir::OpaqueTyOrigin::FnReturn);
+                self.lower_ty(ty, context)
+            }
+            FnRetTy::Default(ret_ty_span) => self.arena.alloc(self.ty_tup(*ret_ty_span, &[])),
         };
 
         // "<Output = T>"
@@ -2112,9 +2113,12 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 }
 
                 let kind = hir::GenericParamKind::Type {
-                    default: default
-                        .as_ref()
-                        .map(|x| self.lower_ty(x, ImplTraitContext::OpaqueTy(None))),
+                    default: default.as_ref().map(|x| {
+                        self.lower_ty(
+                            x,
+                            ImplTraitContext::OpaqueTy(None, hir::OpaqueTyOrigin::Misc),
+                        )
+                    }),
                     synthetic: param
                         .attrs
                         .iter()
@@ -2277,6 +2281,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             }
             StmtKind::Expr(ref e) => hir::StmtKind::Expr(self.lower_expr(e)),
             StmtKind::Semi(ref e) => hir::StmtKind::Semi(self.lower_expr(e)),
+            StmtKind::Empty => return smallvec![],
             StmtKind::Mac(..) => panic!("shouldn't exist here"),
         };
         smallvec![hir::Stmt { hir_id: self.lower_node_id(s.id), kind, span: s.span }]
@@ -2621,7 +2626,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             .unwrap_or(true);
         if !is_macro_callsite {
             self.resolver.lint_buffer().buffer_lint_with_diagnostic(
-                builtin::BARE_TRAIT_OBJECTS,
+                BARE_TRAIT_OBJECTS,
                 id,
                 span,
                 "trait objects without an explicit `dyn` are deprecated",
diff --git a/src/librustc_ast_lowering/pat.rs b/src/librustc_ast_lowering/pat.rs
index b42b12c4dd..d6f4ba1529 100644
--- a/src/librustc_ast_lowering/pat.rs
+++ b/src/librustc_ast_lowering/pat.rs
@@ -1,10 +1,10 @@
 use super::{ImplTraitContext, LoweringContext, ParamMode};
 
+use rustc_ast::ast::*;
+use rustc_ast::ptr::P;
 use rustc_hir as hir;
 use rustc_hir::def::Res;
 use rustc_span::{source_map::Spanned, Span};
-use syntax::ast::*;
-use syntax::ptr::P;
 
 impl<'a, 'hir> LoweringContext<'a, 'hir> {
     crate fn lower_pat(&mut self, p: &Pat) -> &'hir hir::Pat<'hir> {
diff --git a/src/librustc_ast_lowering/path.rs b/src/librustc_ast_lowering/path.rs
index e5f7df6dbf..80d7e3d0d4 100644
--- a/src/librustc_ast_lowering/path.rs
+++ b/src/librustc_ast_lowering/path.rs
@@ -3,6 +3,7 @@ use super::{GenericArgsCtor, ParenthesizedGenericArgs};
 
 use rustc::lint::builtin::ELIDED_LIFETIMES_IN_PATHS;
 use rustc::span_bug;
+use rustc_ast::ast::{self, *};
 use rustc_errors::{struct_span_err, Applicability};
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, PartialRes, Res};
@@ -10,7 +11,6 @@ use rustc_hir::def_id::DefId;
 use rustc_hir::GenericArg;
 use rustc_session::lint::BuiltinLintDiagnostics;
 use rustc_span::Span;
-use syntax::ast::{self, *};
 
 use log::debug;
 use smallvec::smallvec;
@@ -229,7 +229,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                         err.span_label(data.span, "only `Fn` traits may use parentheses");
                         if let Ok(snippet) = self.sess.source_map().span_to_snippet(data.span) {
                             // Do not suggest going from `Trait()` to `Trait<>`
-                            if data.inputs.len() > 0 {
+                            if !data.inputs.is_empty() {
                                 if let Some(split) = snippet.find('(') {
                                     let trait_name = &snippet[0..split];
                                     let args = &snippet[split + 1..snippet.len() - 1];
@@ -397,8 +397,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                 inputs.iter().map(|ty| this.lower_ty_direct(ty, ImplTraitContext::disallowed())),
             );
             let output_ty = match output {
-                FunctionRetTy::Ty(ty) => this.lower_ty(&ty, ImplTraitContext::disallowed()),
-                FunctionRetTy::Default(_) => this.arena.alloc(this.ty_tup(span, &[])),
+                FnRetTy::Ty(ty) => this.lower_ty(&ty, ImplTraitContext::disallowed()),
+                FnRetTy::Default(_) => this.arena.alloc(this.ty_tup(span, &[])),
             };
             let args = smallvec![GenericArg::Type(this.ty_tup(span, inputs))];
             let binding = this.output_ty_binding(output_ty.span, output_ty);
diff --git a/src/librustc_ast_passes/Cargo.toml b/src/librustc_ast_passes/Cargo.toml
index 25b1acebd2..5d096e4965 100644
--- a/src/librustc_ast_passes/Cargo.toml
+++ b/src/librustc_ast_passes/Cargo.toml
@@ -10,10 +10,12 @@ path = "lib.rs"
 
 [dependencies]
 log = "0.4"
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_feature = { path = "../librustc_feature" }
 rustc_parse = { path = "../librustc_parse" }
 rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_ast_passes/ast_validation.rs b/src/librustc_ast_passes/ast_validation.rs
index 152086bfce..69d5610e01 100644
--- a/src/librustc_ast_passes/ast_validation.rs
+++ b/src/librustc_ast_passes/ast_validation.rs
@@ -6,22 +6,30 @@
 // This pass is supposed to perform only simple checks not requiring name resolution
 // or type checking or some other kind of complex analysis.
 
+use rustc_ast::ast::*;
+use rustc_ast::attr;
+use rustc_ast::expand::is_proc_macro_attr;
+use rustc_ast::visit::{self, AssocCtxt, FnCtxt, FnKind, Visitor};
+use rustc_ast::walk_list;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::{struct_span_err, Applicability, FatalError};
+use rustc_errors::{error_code, struct_span_err, Applicability};
 use rustc_parse::validate_attr;
 use rustc_session::lint::builtin::PATTERNS_IN_FNS_WITHOUT_BODY;
 use rustc_session::lint::LintBuffer;
 use rustc_session::Session;
-use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
 use std::mem;
-use syntax::ast::*;
-use syntax::attr;
-use syntax::expand::is_proc_macro_attr;
-use syntax::print::pprust;
-use syntax::visit::{self, Visitor};
-use syntax::walk_list;
+
+const MORE_EXTERN: &str =
+    "for more information, visit https://doc.rust-lang.org/std/keyword.extern.html";
+
+/// Is `self` allowed semantically as the first parameter in an `FnDecl`?
+enum SelfSemantic {
+    Yes,
+    No,
+}
 
 /// A syntactic context that disallows certain kinds of bounds (e.g., `?Trait` or `?const Trait`).
 #[derive(Clone, Copy)]
@@ -43,6 +51,13 @@ impl BoundContext {
 
 struct AstValidator<'a> {
     session: &'a Session,
+
+    /// The span of the `extern` in an `extern { ... }` block, if any.
+    extern_mod: Option<&'a Item>,
+
+    /// Are we inside a trait impl?
+    in_trait_impl: bool,
+
     has_proc_macro_decls: bool,
 
     /// Used to ban nested `impl Trait`, e.g., `impl Into<impl Debug>`.
@@ -68,6 +83,12 @@ struct AstValidator<'a> {
 }
 
 impl<'a> AstValidator<'a> {
+    fn with_in_trait_impl(&mut self, is_in: bool, f: impl FnOnce(&mut Self)) {
+        let old = mem::replace(&mut self.in_trait_impl, is_in);
+        f(self);
+        self.in_trait_impl = old;
+    }
+
     fn with_banned_impl_trait(&mut self, f: impl FnOnce(&mut Self)) {
         let old = mem::replace(&mut self.is_impl_trait_banned, true);
         f(self);
@@ -203,27 +224,30 @@ impl<'a> AstValidator<'a> {
         }
     }
 
-    fn check_trait_fn_not_async(&self, span: Span, asyncness: IsAsync) {
-        if asyncness.is_async() {
-            struct_span_err!(self.session, span, E0706, "trait fns cannot be declared `async`")
-                .note("`async` trait functions are not currently supported")
-                .note(
-                    "consider using the `async-trait` crate: \
-                       https://crates.io/crates/async-trait",
-                )
-                .emit();
+    fn check_trait_fn_not_async(&self, fn_span: Span, asyncness: Async) {
+        if let Async::Yes { span, .. } = asyncness {
+            struct_span_err!(
+                self.session,
+                fn_span,
+                E0706,
+                "functions in traits cannot be declared `async`"
+            )
+            .span_label(span, "`async` because of this")
+            .note("`async` trait functions are not currently supported")
+            .note("consider using the `async-trait` crate: https://crates.io/crates/async-trait")
+            .emit();
         }
     }
 
-    fn check_trait_fn_not_const(&self, constness: Spanned<Constness>) {
-        if constness.node == Constness::Const {
+    fn check_trait_fn_not_const(&self, constness: Const) {
+        if let Const::Yes(span) = constness {
             struct_span_err!(
                 self.session,
-                constness.span,
+                span,
                 E0379,
-                "trait fns cannot be declared const"
+                "functions in traits cannot be declared const"
             )
-            .span_label(constness.span, "trait fns cannot be const")
+            .span_label(span, "functions in traits cannot be const")
             .emit();
         }
     }
@@ -302,7 +326,13 @@ impl<'a> AstValidator<'a> {
         }
     }
 
-    fn check_fn_decl(&self, fn_decl: &FnDecl) {
+    fn check_fn_decl(&self, fn_decl: &FnDecl, self_semantic: SelfSemantic) {
+        self.check_decl_cvaradic_pos(fn_decl);
+        self.check_decl_attrs(fn_decl);
+        self.check_decl_self_param(fn_decl, self_semantic);
+    }
+
+    fn check_decl_cvaradic_pos(&self, fn_decl: &FnDecl) {
         match &*fn_decl.inputs {
             [Param { ty, span, .. }] => {
                 if let TyKind::CVarArgs = ty.kind {
@@ -324,14 +354,16 @@ impl<'a> AstValidator<'a> {
             }
             _ => {}
         }
+    }
 
+    fn check_decl_attrs(&self, fn_decl: &FnDecl) {
         fn_decl
             .inputs
             .iter()
             .flat_map(|i| i.attrs.as_ref())
             .filter(|attr| {
                 let arr = [sym::allow, sym::cfg, sym::cfg_attr, sym::deny, sym::forbid, sym::warn];
-                !arr.contains(&attr.name_or_empty()) && attr::is_builtin_attr(attr)
+                !arr.contains(&attr.name_or_empty()) && rustc_attr::is_builtin_attr(attr)
             })
             .for_each(|attr| {
                 if attr.is_doc_comment() {
@@ -352,21 +384,34 @@ impl<'a> AstValidator<'a> {
             });
     }
 
+    fn check_decl_self_param(&self, fn_decl: &FnDecl, self_semantic: SelfSemantic) {
+        if let (SelfSemantic::No, [param, ..]) = (self_semantic, &*fn_decl.inputs) {
+            if param.is_self() {
+                self.err_handler()
+                    .struct_span_err(
+                        param.span,
+                        "`self` parameter is only allowed in associated functions",
+                    )
+                    .span_label(param.span, "not semantically valid as function parameter")
+                    .note("associated functions are those in `impl` or `trait` definitions")
+                    .emit();
+            }
+        }
+    }
+
     fn check_defaultness(&self, span: Span, defaultness: Defaultness) {
-        if let Defaultness::Default = defaultness {
+        if let Defaultness::Default(def_span) = defaultness {
+            let span = self.session.source_map().def_span(span);
             self.err_handler()
                 .struct_span_err(span, "`default` is only allowed on items in `impl` definitions")
+                .span_label(def_span, "`default` because of this")
                 .emit();
         }
     }
 
-    fn check_impl_item_provided<T>(&self, sp: Span, body: &Option<T>, ctx: &str, sugg: &str) {
-        if body.is_some() {
-            return;
-        }
-
+    fn error_item_without_body(&self, sp: Span, ctx: &str, msg: &str, sugg: &str) {
         self.err_handler()
-            .struct_span_err(sp, &format!("associated {} in `impl` without body", ctx))
+            .struct_span_err(sp, msg)
             .span_suggestion(
                 self.session.source_map().end_point(sp),
                 &format!("provide a definition for the {}", ctx),
@@ -376,19 +421,137 @@ impl<'a> AstValidator<'a> {
             .emit();
     }
 
-    fn check_impl_assoc_type_no_bounds(&self, bounds: &[GenericBound]) {
+    fn check_impl_item_provided<T>(&self, sp: Span, body: &Option<T>, ctx: &str, sugg: &str) {
+        if body.is_none() {
+            let msg = format!("associated {} in `impl` without body", ctx);
+            self.error_item_without_body(sp, ctx, &msg, sugg);
+        }
+    }
+
+    fn check_type_no_bounds(&self, bounds: &[GenericBound], ctx: &str) {
         let span = match bounds {
             [] => return,
             [b0] => b0.span(),
             [b0, .., bl] => b0.span().to(bl.span()),
         };
         self.err_handler()
-            .struct_span_err(span, "bounds on associated `type`s in `impl`s have no effect")
+            .struct_span_err(span, &format!("bounds on `type`s in {} have no effect", ctx))
             .emit();
     }
 
-    fn check_c_varadic_type(&self, decl: &FnDecl) {
-        for Param { ty, span, .. } in &decl.inputs {
+    fn check_foreign_ty_genericless(&self, generics: &Generics) {
+        let cannot_have = |span, descr, remove_descr| {
+            self.err_handler()
+                .struct_span_err(
+                    span,
+                    &format!("`type`s inside `extern` blocks cannot have {}", descr),
+                )
+                .span_suggestion(
+                    span,
+                    &format!("remove the {}", remove_descr),
+                    String::new(),
+                    Applicability::MaybeIncorrect,
+                )
+                .span_label(self.current_extern_span(), "`extern` block begins here")
+                .note(MORE_EXTERN)
+                .emit();
+        };
+
+        if !generics.params.is_empty() {
+            cannot_have(generics.span, "generic parameters", "generic parameters");
+        }
+
+        if !generics.where_clause.predicates.is_empty() {
+            cannot_have(generics.where_clause.span, "`where` clauses", "`where` clause");
+        }
+    }
+
+    fn check_foreign_kind_bodyless(&self, ident: Ident, kind: &str, body: Option<Span>) {
+        let body = match body {
+            None => return,
+            Some(body) => body,
+        };
+        self.err_handler()
+            .struct_span_err(ident.span, &format!("incorrect `{}` inside `extern` block", kind))
+            .span_label(ident.span, "cannot have a body")
+            .span_label(body, "the invalid body")
+            .span_label(
+                self.current_extern_span(),
+                format!(
+                    "`extern` blocks define existing foreign {0}s and {0}s \
+                    inside of them cannot have a body",
+                    kind
+                ),
+            )
+            .note(MORE_EXTERN)
+            .emit();
+    }
+
+    /// An `fn` in `extern { ... }` cannot have a body `{ ... }`.
+    fn check_foreign_fn_bodyless(&self, ident: Ident, body: Option<&Block>) {
+        let body = match body {
+            None => return,
+            Some(body) => body,
+        };
+        self.err_handler()
+            .struct_span_err(ident.span, "incorrect function inside `extern` block")
+            .span_label(ident.span, "cannot have a body")
+            .span_suggestion(
+                body.span,
+                "remove the invalid body",
+                ";".to_string(),
+                Applicability::MaybeIncorrect,
+            )
+            .help(
+                "you might have meant to write a function accessible through FFI, \
+                which can be done by writing `extern fn` outside of the `extern` block",
+            )
+            .span_label(
+                self.current_extern_span(),
+                "`extern` blocks define existing foreign functions and functions \
+                inside of them cannot have a body",
+            )
+            .note(MORE_EXTERN)
+            .emit();
+    }
+
+    fn current_extern_span(&self) -> Span {
+        self.session.source_map().def_span(self.extern_mod.unwrap().span)
+    }
+
+    /// An `fn` in `extern { ... }` cannot have qualfiers, e.g. `async fn`.
+    fn check_foreign_fn_headerless(&self, ident: Ident, span: Span, header: FnHeader) {
+        if header.has_qualifiers() {
+            self.err_handler()
+                .struct_span_err(ident.span, "functions in `extern` blocks cannot have qualifiers")
+                .span_label(self.current_extern_span(), "in this `extern` block")
+                .span_suggestion(
+                    span.until(ident.span.shrink_to_lo()),
+                    "remove the qualifiers",
+                    "fn ".to_string(),
+                    Applicability::MaybeIncorrect,
+                )
+                .emit();
+        }
+    }
+
+    /// Reject C-varadic type unless the function is foreign,
+    /// or free and `unsafe extern "C"` semantically.
+    fn check_c_varadic_type(&self, fk: FnKind<'a>) {
+        match (fk.ctxt(), fk.header()) {
+            (Some(FnCtxt::Foreign), _) => return,
+            (Some(FnCtxt::Free), Some(header)) => match header.ext {
+                Extern::Explicit(StrLit { symbol_unescaped: sym::C, .. }) | Extern::Implicit
+                    if matches!(header.unsafety, Unsafe::Yes(_)) =>
+                {
+                    return;
+                }
+                _ => {}
+            },
+            _ => {}
+        };
+
+        for Param { ty, span, .. } in &fk.decl().inputs {
             if let TyKind::CVarArgs = ty.kind {
                 self.err_handler()
                     .struct_span_err(
@@ -399,25 +562,49 @@ impl<'a> AstValidator<'a> {
             }
         }
     }
-}
 
-enum GenericPosition {
-    Param,
-    Arg,
+    /// We currently do not permit const generics in `const fn`,
+    /// as this is tantamount to allowing compile-time dependent typing.
+    ///
+    /// FIXME(const_generics): Is this really true / necessary? Discuss with @varkor.
+    /// At any rate, the restriction feels too syntactic. Consider moving it to e.g. typeck.
+    fn check_const_fn_const_generic(&self, span: Span, sig: &FnSig, generics: &Generics) {
+        if let Const::Yes(const_span) = sig.header.constness {
+            // Look for const generics and error if we find any.
+            for param in &generics.params {
+                if let GenericParamKind::Const { .. } = param.kind {
+                    self.err_handler()
+                        .struct_span_err(
+                            span,
+                            "const parameters are not permitted in const functions",
+                        )
+                        .span_label(const_span, "`const` because of this")
+                        .emit();
+                }
+            }
+        }
+    }
+
+    fn check_item_named(&self, ident: Ident, kind: &str) {
+        if ident.name != kw::Underscore {
+            return;
+        }
+        self.err_handler()
+            .struct_span_err(ident.span, &format!("`{}` items in this context need a name", kind))
+            .span_label(ident.span, format!("`_` is not a valid name for this `{}` item", kind))
+            .emit();
+    }
 }
 
-fn validate_generics_order<'a>(
+fn validate_generic_param_order<'a>(
     sess: &Session,
     handler: &rustc_errors::Handler,
     generics: impl Iterator<Item = (ParamKindOrd, Option<&'a [GenericBound]>, Span, Option<String>)>,
-    pos: GenericPosition,
     span: Span,
 ) {
     let mut max_param: Option<ParamKindOrd> = None;
     let mut out_of_order = FxHashMap::default();
     let mut param_idents = vec![];
-    let mut found_type = false;
-    let mut found_const = false;
 
     for (kind, bounds, span, ident) in generics {
         if let Some(ident) = ident {
@@ -431,11 +618,6 @@ fn validate_generics_order<'a>(
             }
             Some(_) | None => *max_param = Some(kind),
         };
-        match kind {
-            ParamKindOrd::Type => found_type = true,
-            ParamKindOrd::Const => found_const = true,
-            _ => {}
-        }
     }
 
     let mut ordered_params = "<".to_string();
@@ -458,42 +640,26 @@ fn validate_generics_order<'a>(
     }
     ordered_params += ">";
 
-    let pos_str = match pos {
-        GenericPosition::Param => "parameter",
-        GenericPosition::Arg => "argument",
-    };
-
     for (param_ord, (max_param, spans)) in &out_of_order {
-        let mut err = handler.struct_span_err(
-            spans.clone(),
-            &format!(
-                "{} {pos}s must be declared prior to {} {pos}s",
-                param_ord,
-                max_param,
-                pos = pos_str,
-            ),
-        );
-        if let GenericPosition::Param = pos {
-            err.span_suggestion(
-                span,
+        let mut err =
+            handler.struct_span_err(
+                spans.clone(),
                 &format!(
-                    "reorder the {}s: lifetimes, then types{}",
-                    pos_str,
-                    if sess.features_untracked().const_generics { ", then consts" } else { "" },
+                    "{} parameters must be declared prior to {} parameters",
+                    param_ord, max_param,
                 ),
-                ordered_params.clone(),
-                Applicability::MachineApplicable,
             );
-        }
+        err.span_suggestion(
+            span,
+            &format!(
+                "reorder the parameters: lifetimes, then types{}",
+                if sess.features_untracked().const_generics { ", then consts" } else { "" },
+            ),
+            ordered_params.clone(),
+            Applicability::MachineApplicable,
+        );
         err.emit();
     }
-
-    // FIXME(const_generics): we shouldn't have to abort here at all, but we currently get ICEs
-    // if we don't. Const parameters and type parameters can currently conflict if they
-    // are out-of-order.
-    if !out_of_order.is_empty() && found_type && found_const {
-        FatalError.raise();
-    }
 }
 
 impl<'a> Visitor<'a> for AstValidator<'a> {
@@ -503,9 +669,6 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
 
     fn visit_expr(&mut self, expr: &'a Expr) {
         match &expr.kind {
-            ExprKind::Closure(_, _, _, fn_decl, _, _) => {
-                self.check_fn_decl(fn_decl);
-            }
             ExprKind::InlineAsm(..) if !self.session.target.target.options.allow_asm => {
                 struct_span_err!(
                     self.session,
@@ -524,7 +687,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
     fn visit_ty(&mut self, ty: &'a Ty) {
         match ty.kind {
             TyKind::BareFn(ref bfty) => {
-                self.check_fn_decl(&bfty.decl);
+                self.check_fn_decl(&bfty.decl, SelfSemantic::No);
                 Self::check_decl_no_pat(&bfty.decl, |span, _| {
                     struct_span_err!(
                         self.session,
@@ -618,31 +781,33 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 generics: _,
                 of_trait: Some(_),
                 ref self_ty,
-                ref items,
+                items: _,
             } => {
-                self.invalid_visibility(&item.vis, None);
-                if let TyKind::Err = self_ty.kind {
-                    self.err_handler()
-                        .struct_span_err(item.span, "`impl Trait for .. {}` is an obsolete syntax")
-                        .help("use `auto trait Trait {}` instead")
+                self.with_in_trait_impl(true, |this| {
+                    this.invalid_visibility(&item.vis, None);
+                    if let TyKind::Err = self_ty.kind {
+                        this.err_handler()
+                            .struct_span_err(
+                                item.span,
+                                "`impl Trait for .. {}` is an obsolete syntax",
+                            )
+                            .help("use `auto trait Trait {}` instead")
+                            .emit();
+                    }
+                    if let (Unsafe::Yes(span), ImplPolarity::Negative) = (unsafety, polarity) {
+                        struct_span_err!(
+                            this.session,
+                            item.span,
+                            E0198,
+                            "negative impls cannot be unsafe"
+                        )
+                        .span_label(span, "unsafe because of this")
                         .emit();
-                }
-                if unsafety == Unsafety::Unsafe && polarity == ImplPolarity::Negative {
-                    struct_span_err!(
-                        self.session,
-                        item.span,
-                        E0198,
-                        "negative impls cannot be unsafe"
-                    )
-                    .emit();
-                }
-                for impl_item in items {
-                    self.invalid_visibility(&impl_item.vis, None);
-                    if let AssocItemKind::Fn(ref sig, _) = impl_item.kind {
-                        self.check_trait_fn_not_const(sig.header.constness);
-                        self.check_trait_fn_not_async(impl_item.span, sig.header.asyncness.node);
                     }
-                }
+
+                    visit::walk_item(this, item);
+                });
+                return; // Avoid visiting again.
             }
             ItemKind::Impl {
                 unsafety,
@@ -658,65 +823,53 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                     &item.vis,
                     Some("place qualifiers on individual impl items instead"),
                 );
-                if unsafety == Unsafety::Unsafe {
+                if let Unsafe::Yes(span) = unsafety {
                     struct_span_err!(
                         self.session,
                         item.span,
                         E0197,
                         "inherent impls cannot be unsafe"
                     )
+                    .span_label(span, "unsafe because of this")
                     .emit();
                 }
                 if polarity == ImplPolarity::Negative {
                     self.err_handler().span_err(item.span, "inherent impls cannot be negative");
                 }
-                if defaultness == Defaultness::Default {
+                if let Defaultness::Default(def_span) = defaultness {
+                    let span = self.session.source_map().def_span(item.span);
                     self.err_handler()
-                        .struct_span_err(item.span, "inherent impls cannot be default")
-                        .note("only trait implementations may be annotated with default")
+                        .struct_span_err(span, "inherent impls cannot be `default`")
+                        .span_label(def_span, "`default` because of this")
+                        .note("only trait implementations may be annotated with `default`")
                         .emit();
                 }
-                if constness == Constness::Const {
+                if let Const::Yes(span) = constness {
                     self.err_handler()
                         .struct_span_err(item.span, "inherent impls cannot be `const`")
+                        .span_label(span, "`const` because of this")
                         .note("only trait implementations may be annotated with `const`")
                         .emit();
                 }
             }
-            ItemKind::Fn(ref sig, ref generics, _) => {
-                self.visit_fn_header(&sig.header);
-                self.check_fn_decl(&sig.decl);
-                // We currently do not permit const generics in `const fn`, as
-                // this is tantamount to allowing compile-time dependent typing.
-                if sig.header.constness.node == Constness::Const {
-                    // Look for const generics and error if we find any.
-                    for param in &generics.params {
-                        match param.kind {
-                            GenericParamKind::Const { .. } => {
-                                self.err_handler()
-                                    .struct_span_err(
-                                        item.span,
-                                        "const parameters are not permitted in `const fn`",
-                                    )
-                                    .emit();
-                            }
-                            _ => {}
-                        }
-                    }
-                }
-                // Reject C-varadic type unless the function is `unsafe extern "C"` semantically.
-                match sig.header.ext {
-                    Extern::Explicit(StrLit { symbol_unescaped: sym::C, .. })
-                    | Extern::Implicit
-                        if sig.header.unsafety == Unsafety::Unsafe => {}
-                    _ => self.check_c_varadic_type(&sig.decl),
+            ItemKind::Fn(def, ref sig, ref generics, ref body) => {
+                self.check_defaultness(item.span, def);
+                self.check_const_fn_const_generic(item.span, sig, generics);
+
+                if body.is_none() {
+                    let msg = "free function without a body";
+                    self.error_item_without_body(item.span, "function", msg, " { <body> }");
                 }
             }
-            ItemKind::ForeignMod(..) => {
+            ItemKind::ForeignMod(_) => {
+                let old_item = mem::replace(&mut self.extern_mod, Some(item));
                 self.invalid_visibility(
                     &item.vis,
                     Some("place qualifiers on individual foreign items instead"),
                 );
+                visit::walk_item(self, item);
+                self.extern_mod = old_item;
+                return; // Avoid visiting again.
             }
             ItemKind::Enum(ref def, _) => {
                 for variant in &def.variants {
@@ -767,7 +920,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 self.with_bound_context(BoundContext::TraitBounds, |this| {
                     walk_list!(this, visit_param_bound, bounds);
                 });
-                walk_list!(self, visit_trait_item, trait_items);
+                walk_list!(self, visit_assoc_item, trait_items, AssocCtxt::Trait);
                 walk_list!(self, visit_attribute, &item.attrs);
                 return;
             }
@@ -784,6 +937,23 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                     self.err_handler().span_err(item.span, "unions cannot have zero fields");
                 }
             }
+            ItemKind::Const(def, .., None) => {
+                self.check_defaultness(item.span, def);
+                let msg = "free constant item without body";
+                self.error_item_without_body(item.span, "constant", msg, " = <expr>;");
+            }
+            ItemKind::Static(.., None) => {
+                let msg = "free static item without body";
+                self.error_item_without_body(item.span, "static", msg, " = <expr>;");
+            }
+            ItemKind::TyAlias(def, _, ref bounds, ref body) => {
+                self.check_defaultness(item.span, def);
+                if body.is_none() {
+                    let msg = "free type alias without body";
+                    self.error_item_without_body(item.span, "type", msg, " = <type>;");
+                }
+                self.check_type_no_bounds(bounds, "this context");
+            }
             _ => {}
         }
 
@@ -791,21 +961,22 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
     }
 
     fn visit_foreign_item(&mut self, fi: &'a ForeignItem) {
-        match fi.kind {
-            ForeignItemKind::Fn(ref decl, _) => {
-                self.check_fn_decl(decl);
-                Self::check_decl_no_pat(decl, |span, _| {
-                    struct_span_err!(
-                        self.session,
-                        span,
-                        E0130,
-                        "patterns aren't allowed in foreign function declarations"
-                    )
-                    .span_label(span, "pattern not allowed in foreign function")
-                    .emit();
-                });
+        match &fi.kind {
+            ForeignItemKind::Fn(def, sig, _, body) => {
+                self.check_defaultness(fi.span, *def);
+                self.check_foreign_fn_bodyless(fi.ident, body.as_deref());
+                self.check_foreign_fn_headerless(fi.ident, fi.span, sig.header);
             }
-            ForeignItemKind::Static(..) | ForeignItemKind::Ty | ForeignItemKind::Macro(..) => {}
+            ForeignItemKind::TyAlias(def, generics, bounds, body) => {
+                self.check_defaultness(fi.span, *def);
+                self.check_foreign_kind_bodyless(fi.ident, "type", body.as_ref().map(|b| b.span));
+                self.check_type_no_bounds(bounds, "`extern` blocks");
+                self.check_foreign_ty_genericless(generics);
+            }
+            ForeignItemKind::Static(_, _, body) => {
+                self.check_foreign_kind_bodyless(fi.ident, "static", body.as_ref().map(|b| b.span));
+            }
+            ForeignItemKind::Macro(..) => {}
         }
 
         visit::walk_foreign_item(self, fi)
@@ -816,24 +987,6 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
         match *generic_args {
             GenericArgs::AngleBracketed(ref data) => {
                 walk_list!(self, visit_generic_arg, &data.args);
-                validate_generics_order(
-                    self.session,
-                    self.err_handler(),
-                    data.args.iter().map(|arg| {
-                        (
-                            match arg {
-                                GenericArg::Lifetime(..) => ParamKindOrd::Lifetime,
-                                GenericArg::Type(..) => ParamKindOrd::Type,
-                                GenericArg::Const(..) => ParamKindOrd::Const,
-                            },
-                            None,
-                            arg.span(),
-                            None,
-                        )
-                    }),
-                    GenericPosition::Arg,
-                    generic_args.span(),
-                );
 
                 // Type bindings such as `Item = impl Debug` in `Iterator<Item = Debug>`
                 // are allowed to contain nested `impl Trait`.
@@ -847,7 +1000,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
             }
             GenericArgs::Parenthesized(ref data) => {
                 walk_list!(self, visit_ty, &data.inputs);
-                if let FunctionRetTy::Ty(ty) = &data.output {
+                if let FnRetTy::Ty(ty) = &data.output {
                     // `-> Foo` syntax is essentially an associated type binding,
                     // so it is also allowed to contain nested `impl Trait`.
                     self.with_impl_trait(None, |this| this.visit_ty(ty));
@@ -870,7 +1023,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
             }
         }
 
-        validate_generics_order(
+        validate_generic_param_order(
             self.session,
             self.err_handler(),
             generics.params.iter().map(|param| {
@@ -885,7 +1038,6 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 };
                 (kind, Some(&*param.bounds), param.ident.span, ident)
             }),
-            GenericPosition::Param,
             generics.span,
         );
 
@@ -898,7 +1050,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                     )
                     .span_label(predicate.span, "not supported")
                     .note(
-                        "for more information, see https://github.com/rust-lang/rust/issues/20041",
+                        "see issue #20041 <https://github.com/rust-lang/rust/issues/20041> \
+                         for more information",
                     )
                     .emit();
             }
@@ -982,68 +1135,102 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
         })
     }
 
-    fn visit_impl_item(&mut self, ii: &'a AssocItem) {
-        match &ii.kind {
-            AssocItemKind::Const(_, body) => {
-                self.check_impl_item_provided(ii.span, body, "constant", " = <expr>;");
-            }
-            AssocItemKind::Fn(sig, body) => {
-                self.check_impl_item_provided(ii.span, body, "function", " { <body> }");
-                self.check_fn_decl(&sig.decl);
-            }
-            AssocItemKind::TyAlias(bounds, body) => {
-                self.check_impl_item_provided(ii.span, body, "type", " = <type>;");
-                self.check_impl_assoc_type_no_bounds(bounds);
-            }
-            _ => {}
+    fn visit_fn(&mut self, fk: FnKind<'a>, span: Span, id: NodeId) {
+        // Only associated `fn`s can have `self` parameters.
+        let self_semantic = match fk.ctxt() {
+            Some(FnCtxt::Assoc(_)) => SelfSemantic::Yes,
+            _ => SelfSemantic::No,
+        };
+        self.check_fn_decl(fk.decl(), self_semantic);
+
+        self.check_c_varadic_type(fk);
+
+        // Functions cannot both be `const async`
+        if let Some(FnHeader {
+            constness: Const::Yes(cspan),
+            asyncness: Async::Yes { span: aspan, .. },
+            ..
+        }) = fk.header()
+        {
+            self.err_handler()
+                .struct_span_err(span, "functions cannot be both `const` and `async`")
+                .span_label(*cspan, "`const` because of this")
+                .span_label(*aspan, "`async` because of this")
+                .emit();
         }
-        visit::walk_impl_item(self, ii);
-    }
 
-    fn visit_trait_item(&mut self, ti: &'a AssocItem) {
-        self.invalid_visibility(&ti.vis, None);
-        self.check_defaultness(ti.span, ti.defaultness);
-
-        if let AssocItemKind::Fn(sig, block) = &ti.kind {
-            self.check_fn_decl(&sig.decl);
-            self.check_trait_fn_not_async(ti.span, sig.header.asyncness.node);
-            self.check_trait_fn_not_const(sig.header.constness);
-            if block.is_none() {
-                Self::check_decl_no_pat(&sig.decl, |span, mut_ident| {
-                    if mut_ident {
-                        self.lint_buffer.buffer_lint(
-                            PATTERNS_IN_FNS_WITHOUT_BODY,
-                            ti.id,
-                            span,
-                            "patterns aren't allowed in methods without bodies",
-                        );
-                    } else {
-                        struct_span_err!(
-                            self.session,
-                            span,
-                            E0642,
-                            "patterns aren't allowed in methods without bodies"
-                        )
+        // Functions without bodies cannot have patterns.
+        if let FnKind::Fn(ctxt, _, sig, _, None) = fk {
+            Self::check_decl_no_pat(&sig.decl, |span, mut_ident| {
+                let (code, msg, label) = match ctxt {
+                    FnCtxt::Foreign => (
+                        error_code!(E0130),
+                        "patterns aren't allowed in foreign function declarations",
+                        "pattern not allowed in foreign function",
+                    ),
+                    _ => (
+                        error_code!(E0642),
+                        "patterns aren't allowed in functions without bodies",
+                        "pattern not allowed in function without body",
+                    ),
+                };
+                if mut_ident && matches!(ctxt, FnCtxt::Assoc(_)) {
+                    self.lint_buffer.buffer_lint(PATTERNS_IN_FNS_WITHOUT_BODY, id, span, msg);
+                } else {
+                    self.err_handler()
+                        .struct_span_err(span, msg)
+                        .span_label(span, label)
+                        .code(code)
                         .emit();
-                    }
-                });
-            }
+                }
+            });
         }
 
-        visit::walk_trait_item(self, ti);
+        visit::walk_fn(self, fk, span);
     }
 
-    fn visit_assoc_item(&mut self, item: &'a AssocItem) {
-        if let AssocItemKind::Fn(sig, _) = &item.kind {
-            self.check_c_varadic_type(&sig.decl);
+    fn visit_assoc_item(&mut self, item: &'a AssocItem, ctxt: AssocCtxt) {
+        if ctxt == AssocCtxt::Trait || !self.in_trait_impl {
+            self.check_defaultness(item.span, item.kind.defaultness());
+        }
+
+        if ctxt == AssocCtxt::Impl {
+            match &item.kind {
+                AssocItemKind::Const(_, _, body) => {
+                    self.check_impl_item_provided(item.span, body, "constant", " = <expr>;");
+                }
+                AssocItemKind::Fn(_, _, _, body) => {
+                    self.check_impl_item_provided(item.span, body, "function", " { <body> }");
+                }
+                AssocItemKind::TyAlias(_, _, bounds, body) => {
+                    self.check_impl_item_provided(item.span, body, "type", " = <type>;");
+                    self.check_type_no_bounds(bounds, "`impl`s");
+                }
+                _ => {}
+            }
         }
-        visit::walk_assoc_item(self, item);
+
+        if ctxt == AssocCtxt::Trait || self.in_trait_impl {
+            self.invalid_visibility(&item.vis, None);
+            if let AssocItemKind::Fn(_, sig, _, _) = &item.kind {
+                self.check_trait_fn_not_const(sig.header.constness);
+                self.check_trait_fn_not_async(item.span, sig.header.asyncness);
+            }
+        }
+
+        if let AssocItemKind::Const(..) = item.kind {
+            self.check_item_named(item.ident, "const");
+        }
+
+        self.with_in_trait_impl(false, |this| visit::walk_assoc_item(this, item, ctxt));
     }
 }
 
 pub fn check_crate(session: &Session, krate: &Crate, lints: &mut LintBuffer) -> bool {
     let mut validator = AstValidator {
         session,
+        extern_mod: None,
+        in_trait_impl: false,
         has_proc_macro_decls: false,
         outer_impl_trait: None,
         bound_context: None,
diff --git a/src/librustc_ast_passes/feature_gate.rs b/src/librustc_ast_passes/feature_gate.rs
index 953127429d..a4ab54f8b4 100644
--- a/src/librustc_ast_passes/feature_gate.rs
+++ b/src/librustc_ast_passes/feature_gate.rs
@@ -1,14 +1,14 @@
+use rustc_ast::ast::{self, AssocTyConstraint, AssocTyConstraintKind, NodeId};
+use rustc_ast::ast::{GenericParam, GenericParamKind, PatKind, RangeEnd, VariantData};
+use rustc_ast::attr;
+use rustc_ast::visit::{self, AssocCtxt, FnCtxt, FnKind, Visitor};
 use rustc_errors::{struct_span_err, Handler};
 use rustc_feature::{AttributeGate, BUILTIN_ATTRIBUTE_MAP};
 use rustc_feature::{Features, GateIssue, UnstableFeatures};
+use rustc_session::parse::{feature_err, feature_err_issue, ParseSess};
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast::{self, AssocTyConstraint, AssocTyConstraintKind, NodeId};
-use syntax::ast::{GenericParam, GenericParamKind, PatKind, RangeEnd, VariantData};
-use syntax::attr;
-use syntax::sess::{feature_err, feature_err_issue, ParseSess};
-use syntax::visit::{self, FnKind, Visitor};
 
 use log::debug;
 
@@ -245,7 +245,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                     include => external_doc
                     cfg => doc_cfg
                     masked => doc_masked
-                    spotlight => doc_spotlight
                     alias => doc_alias
                     keyword => doc_keyword
                 );
@@ -349,7 +348,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                     );
                 }
 
-                if let ast::Defaultness::Default = defaultness {
+                if let ast::Defaultness::Default(_) = defaultness {
                     gate_feature_post!(&self, specialization, i.span, "specialization is unstable");
                 }
             }
@@ -372,7 +371,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                 gate_feature_post!(&self, decl_macro, i.span, msg);
             }
 
-            ast::ItemKind::TyAlias(ref ty, ..) => self.check_impl_trait(&ty),
+            ast::ItemKind::TyAlias(_, _, _, Some(ref ty)) => self.check_impl_trait(&ty),
 
             _ => {}
         }
@@ -397,7 +396,7 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
                     );
                 }
             }
-            ast::ForeignItemKind::Ty => {
+            ast::ForeignItemKind::TyAlias(..) => {
                 gate_feature_post!(&self, extern_types, i.span, "extern types are experimental");
             }
             ast::ForeignItemKind::Macro(..) => {}
@@ -419,8 +418,8 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
         visit::walk_ty(self, ty)
     }
 
-    fn visit_fn_ret_ty(&mut self, ret_ty: &'a ast::FunctionRetTy) {
-        if let ast::FunctionRetTy::Ty(ref output_ty) = *ret_ty {
+    fn visit_fn_ret_ty(&mut self, ret_ty: &'a ast::FnRetTy) {
+        if let ast::FnRetTy::Ty(ref output_ty) = *ret_ty {
             if let ast::TyKind::Never = output_ty.kind {
                 // Do nothing.
             } else {
@@ -492,25 +491,28 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
         visit::walk_pat(self, pattern)
     }
 
-    fn visit_fn(
-        &mut self,
-        fn_kind: FnKind<'a>,
-        fn_decl: &'a ast::FnDecl,
-        span: Span,
-        _node_id: NodeId,
-    ) {
+    fn visit_fn(&mut self, fn_kind: FnKind<'a>, span: Span, _: NodeId) {
         if let Some(header) = fn_kind.header() {
-            // Stability of const fn methods are covered in
-            // `visit_trait_item` and `visit_impl_item` below; this is
-            // because default methods don't pass through this point.
+            // Stability of const fn methods are covered in `visit_assoc_item` below.
             self.check_extern(header.ext);
+
+            if let (ast::Const::Yes(_), ast::Extern::Implicit)
+            | (ast::Const::Yes(_), ast::Extern::Explicit(_)) = (header.constness, header.ext)
+            {
+                gate_feature_post!(
+                    &self,
+                    const_extern_fn,
+                    span,
+                    "`const extern fn` definitions are unstable"
+                );
+            }
         }
 
-        if fn_decl.c_variadic() {
+        if fn_kind.ctxt() != Some(FnCtxt::Foreign) && fn_kind.decl().c_variadic() {
             gate_feature_post!(&self, c_variadic, span, "C-variadic functions are unstable");
         }
 
-        visit::walk_fn(self, fn_kind, fn_decl, span)
+        visit::walk_fn(self, fn_kind, span)
     }
 
     fn visit_generic_param(&mut self, param: &'a GenericParam) {
@@ -539,56 +541,34 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
         visit::walk_assoc_ty_constraint(self, constraint)
     }
 
-    fn visit_trait_item(&mut self, ti: &'a ast::AssocItem) {
-        match ti.kind {
-            ast::AssocItemKind::Fn(ref sig, ref block) => {
-                if block.is_none() {
-                    self.check_extern(sig.header.ext);
-                }
-                if sig.header.constness.node == ast::Constness::Const {
-                    gate_feature_post!(&self, const_fn, ti.span, "const fn is unstable");
+    fn visit_assoc_item(&mut self, i: &'a ast::AssocItem, ctxt: AssocCtxt) {
+        if let ast::Defaultness::Default(_) = i.kind.defaultness() {
+            gate_feature_post!(&self, specialization, i.span, "specialization is unstable");
+        }
+
+        match i.kind {
+            ast::AssocItemKind::Fn(_, ref sig, _, _) => {
+                if let (ast::Const::Yes(_), AssocCtxt::Trait) = (sig.header.constness, ctxt) {
+                    gate_feature_post!(&self, const_fn, i.span, "const fn is unstable");
                 }
             }
-            ast::AssocItemKind::TyAlias(_, ref default) => {
-                if let Some(_) = default {
+            ast::AssocItemKind::TyAlias(_, ref generics, _, ref ty) => {
+                if let (Some(_), AssocCtxt::Trait) = (ty, ctxt) {
                     gate_feature_post!(
                         &self,
                         associated_type_defaults,
-                        ti.span,
+                        i.span,
                         "associated type defaults are unstable"
                     );
                 }
-            }
-            _ => {}
-        }
-        visit::walk_trait_item(self, ti)
-    }
-
-    fn visit_assoc_item(&mut self, ii: &'a ast::AssocItem) {
-        if ii.defaultness == ast::Defaultness::Default {
-            gate_feature_post!(&self, specialization, ii.span, "specialization is unstable");
-        }
-
-        match ii.kind {
-            ast::AssocItemKind::Fn(ref sig, _) => {
-                if sig.decl.c_variadic() {
-                    gate_feature_post!(
-                        &self,
-                        c_variadic,
-                        ii.span,
-                        "C-variadic functions are unstable"
-                    );
-                }
-            }
-            ast::AssocItemKind::TyAlias(_, ref ty) => {
                 if let Some(ty) = ty {
                     self.check_impl_trait(ty);
                 }
-                self.check_gat(&ii.generics, ii.span);
+                self.check_gat(generics, i.span);
             }
             _ => {}
         }
-        visit::walk_assoc_item(self, ii)
+        visit::walk_assoc_item(self, i, ctxt)
     }
 
     fn visit_vis(&mut self, vis: &'a ast::Visibility) {
@@ -625,7 +605,6 @@ pub fn check_crate(
     gate_all!(async_closure, "async closures are unstable");
     gate_all!(generators, "yield syntax is experimental");
     gate_all!(or_patterns, "or-patterns syntax is experimental");
-    gate_all!(const_extern_fn, "`const extern fn` definitions are unstable");
     gate_all!(raw_ref_op, "raw address of syntax is experimental");
     gate_all!(const_trait_bound_opt_out, "`?const` on trait bounds is experimental");
     gate_all!(const_trait_impl, "const trait impls are experimental");
diff --git a/src/librustc_ast_passes/lib.rs b/src/librustc_ast_passes/lib.rs
index 5de45f4e1f..520a7ac3e5 100644
--- a/src/librustc_ast_passes/lib.rs
+++ b/src/librustc_ast_passes/lib.rs
@@ -1,9 +1,10 @@
 //! The `rustc_ast_passes` crate contains passes which validate the AST in `syntax`
 //! parsed by `rustc_parse` and then lowered, after the passes in this crate,
 //! by `rustc_ast_lowering`.
-
-#![cfg_attr(bootstrap, feature(slice_patterns))]
+//!
+//! The crate also contains other misc AST visitors, e.g. `node_count` and `show_span`.
 
 pub mod ast_validation;
 pub mod feature_gate;
+pub mod node_count;
 pub mod show_span;
diff --git a/src/libsyntax/util/node_count.rs b/src/librustc_ast_passes/node_count.rs
similarity index 93%
rename from src/libsyntax/util/node_count.rs
rename to src/librustc_ast_passes/node_count.rs
index 39f978ce98..16bcec8360 100644
--- a/src/libsyntax/util/node_count.rs
+++ b/src/librustc_ast_passes/node_count.rs
@@ -1,7 +1,7 @@
 // Simply gives a rought count of the number of nodes in an AST.
 
-use crate::ast::*;
-use crate::visit::*;
+use rustc_ast::ast::*;
+use rustc_ast::visit::*;
 use rustc_span::Span;
 
 pub struct NodeCounter {
@@ -67,13 +67,13 @@ impl<'ast> Visitor<'ast> for NodeCounter {
         self.count += 1;
         walk_generics(self, g)
     }
-    fn visit_fn(&mut self, fk: FnKind<'_>, fd: &FnDecl, s: Span, _: NodeId) {
+    fn visit_fn(&mut self, fk: FnKind<'_>, s: Span, _: NodeId) {
         self.count += 1;
-        walk_fn(self, fk, fd, s)
+        walk_fn(self, fk, s)
     }
-    fn visit_assoc_item(&mut self, ti: &AssocItem) {
+    fn visit_assoc_item(&mut self, ti: &AssocItem, ctxt: AssocCtxt) {
         self.count += 1;
-        walk_assoc_item(self, ti)
+        walk_assoc_item(self, ti, ctxt);
     }
     fn visit_trait_ref(&mut self, t: &TraitRef) {
         self.count += 1;
diff --git a/src/librustc_ast_passes/show_span.rs b/src/librustc_ast_passes/show_span.rs
index 4596e8ff53..73a66ba566 100644
--- a/src/librustc_ast_passes/show_span.rs
+++ b/src/librustc_ast_passes/show_span.rs
@@ -5,9 +5,9 @@
 
 use std::str::FromStr;
 
-use syntax::ast;
-use syntax::visit;
-use syntax::visit::Visitor;
+use rustc_ast::ast;
+use rustc_ast::visit;
+use rustc_ast::visit::Visitor;
 
 enum Mode {
     Expression,
diff --git a/src/librustc_ast_pretty/Cargo.toml b/src/librustc_ast_pretty/Cargo.toml
new file mode 100644
index 0000000000..82be095db8
--- /dev/null
+++ b/src/librustc_ast_pretty/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_ast_pretty"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+name = "rustc_ast_pretty"
+path = "lib.rs"
+doctest = false
+
+[dependencies]
+log = "0.4"
+rustc_span = { path = "../librustc_span" }
+rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_ast = { path = "../librustc_ast" }
diff --git a/src/libsyntax/print/helpers.rs b/src/librustc_ast_pretty/helpers.rs
similarity index 95%
rename from src/libsyntax/print/helpers.rs
rename to src/librustc_ast_pretty/helpers.rs
index 88942cb7fd..dce856df9c 100644
--- a/src/libsyntax/print/helpers.rs
+++ b/src/librustc_ast_pretty/helpers.rs
@@ -1,4 +1,4 @@
-use crate::print::pp::Printer;
+use crate::pp::Printer;
 use std::borrow::Cow;
 
 impl Printer {
diff --git a/src/librustc_ast_pretty/lib.rs b/src/librustc_ast_pretty/lib.rs
new file mode 100644
index 0000000000..bde5f4bb03
--- /dev/null
+++ b/src/librustc_ast_pretty/lib.rs
@@ -0,0 +1,7 @@
+#![feature(bool_to_option)]
+#![feature(crate_visibility_modifier)]
+#![recursion_limit = "256"]
+
+mod helpers;
+pub mod pp;
+pub mod pprust;
diff --git a/src/libsyntax/print/pp.rs b/src/librustc_ast_pretty/pp.rs
similarity index 100%
rename from src/libsyntax/print/pp.rs
rename to src/librustc_ast_pretty/pp.rs
diff --git a/src/libsyntax/print/pprust.rs b/src/librustc_ast_pretty/pprust.rs
similarity index 89%
rename from src/libsyntax/print/pprust.rs
rename to src/librustc_ast_pretty/pprust.rs
index d6f18fda8b..b11dda8af7 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/librustc_ast_pretty/pprust.rs
@@ -1,19 +1,18 @@
-use crate::ast::{self, BlockCheckMode, PatKind, RangeEnd, RangeSyntax};
-use crate::ast::{Attribute, GenericArg, MacArgs};
-use crate::ast::{GenericBound, SelfKind, TraitBoundModifier};
-use crate::attr;
-use crate::print::pp::Breaks::{Consistent, Inconsistent};
-use crate::print::pp::{self, Breaks};
-use crate::ptr::P;
-use crate::sess::ParseSess;
-use crate::token::{self, BinOpToken, DelimToken, Nonterminal, Token, TokenKind};
-use crate::tokenstream::{self, TokenStream, TokenTree};
-use crate::util::classify;
-use crate::util::comments;
-use crate::util::parser::{self, AssocOp, Fixity};
-
-use rustc_span::source_map::{dummy_spanned, SourceMap, Spanned};
-use rustc_span::symbol::{kw, sym};
+use crate::pp::Breaks::{Consistent, Inconsistent};
+use crate::pp::{self, Breaks};
+
+use rustc_ast::ast::{self, BlockCheckMode, PatKind, RangeEnd, RangeSyntax};
+use rustc_ast::ast::{Attribute, GenericArg, MacArgs};
+use rustc_ast::ast::{GenericBound, SelfKind, TraitBoundModifier};
+use rustc_ast::attr;
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, BinOpToken, DelimToken, Nonterminal, Token, TokenKind};
+use rustc_ast::tokenstream::{self, TokenStream, TokenTree};
+use rustc_ast::util::parser::{self, AssocOp, Fixity};
+use rustc_ast::util::{classify, comments};
+use rustc_span::edition::Edition;
+use rustc_span::source_map::{SourceMap, Spanned};
+use rustc_span::symbol::{kw, sym, IdentPrinter};
 use rustc_span::{BytePos, FileName, Span};
 
 use std::borrow::Cow;
@@ -48,20 +47,15 @@ pub struct NoAnn;
 impl PpAnn for NoAnn {}
 
 pub struct Comments<'a> {
-    cm: &'a SourceMap,
+    sm: &'a SourceMap,
     comments: Vec<comments::Comment>,
     current: usize,
 }
 
 impl<'a> Comments<'a> {
-    pub fn new(
-        cm: &'a SourceMap,
-        sess: &ParseSess,
-        filename: FileName,
-        input: String,
-    ) -> Comments<'a> {
-        let comments = comments::gather_comments(sess, filename, input);
-        Comments { cm, comments, current: 0 }
+    pub fn new(sm: &'a SourceMap, filename: FileName, input: String) -> Comments<'a> {
+        let comments = comments::gather_comments(sm, filename, input);
+        Comments { sm, comments, current: 0 }
     }
 
     pub fn next(&self) -> Option<comments::Comment> {
@@ -77,8 +71,8 @@ impl<'a> Comments<'a> {
             if cmnt.style != comments::Trailing {
                 return None;
             }
-            let span_line = self.cm.lookup_char_pos(span.hi());
-            let comment_line = self.cm.lookup_char_pos(cmnt.pos);
+            let span_line = self.sm.lookup_char_pos(span.hi());
+            let comment_line = self.sm.lookup_char_pos(cmnt.pos);
             let next = next_pos.unwrap_or_else(|| cmnt.pos + BytePos(1));
             if span.hi() < cmnt.pos && cmnt.pos < next && span_line.line == comment_line.line {
                 return Some(cmnt);
@@ -101,22 +95,23 @@ crate const INDENT_UNIT: usize = 4;
 /// Requires you to pass an input filename and reader so that
 /// it can scan the input text for comments to copy forward.
 pub fn print_crate<'a>(
-    cm: &'a SourceMap,
-    sess: &ParseSess,
+    sm: &'a SourceMap,
     krate: &ast::Crate,
     filename: FileName,
     input: String,
     ann: &'a dyn PpAnn,
     is_expanded: bool,
+    edition: Edition,
+    has_injected_crate: bool,
 ) -> String {
     let mut s = State {
         s: pp::mk_printer(),
-        comments: Some(Comments::new(cm, sess, filename, input)),
+        comments: Some(Comments::new(sm, filename, input)),
         ann,
         is_expanded,
     };
 
-    if is_expanded && sess.injected_crate_name.try_get().is_some() {
+    if is_expanded && has_injected_crate {
         // We need to print `#![no_std]` (and its feature gate) so that
         // compiling pretty-printed source won't inject libstd again.
         // However, we don't want these attributes in the AST because
@@ -130,7 +125,7 @@ pub fn print_crate<'a>(
 
         // Currently, in Rust 2018 we don't have `extern crate std;` at the crate
         // root, so this is not needed, and actually breaks things.
-        if sess.edition == rustc_span::edition::Edition::Edition2015 {
+        if edition == Edition::Edition2015 {
             // `#![no_std]`
             let no_std_meta = attr::mk_word_item(ast::Ident::with_dummy_span(sym::no_std));
             let fake_attr = attr::mk_attr_inner(no_std_meta);
@@ -144,10 +139,7 @@ pub fn print_crate<'a>(
     s.s.eof()
 }
 
-pub fn to_string<F>(f: F) -> String
-where
-    F: FnOnce(&mut State<'_>),
-{
+pub fn to_string(f: impl FnOnce(&mut State<'_>)) -> String {
     let mut printer =
         State { s: pp::mk_printer(), comments: None, ann: &NoAnn, is_expanded: false };
     f(&mut printer);
@@ -204,40 +196,6 @@ pub fn literal_to_string(lit: token::Lit) -> String {
     out
 }
 
-/// Print an ident from AST, `$crate` is converted into its respective crate name.
-pub fn ast_ident_to_string(ident: ast::Ident, is_raw: bool) -> String {
-    ident_to_string(ident.name, is_raw, Some(ident.span))
-}
-
-// AST pretty-printer is used as a fallback for turning AST structures into token streams for
-// proc macros. Additionally, proc macros may stringify their input and expect it survive the
-// stringification (especially true for proc macro derives written between Rust 1.15 and 1.30).
-// So we need to somehow pretty-print `$crate` in a way preserving at least some of its
-// hygiene data, most importantly name of the crate it refers to.
-// As a result we print `$crate` as `crate` if it refers to the local crate
-// and as `::other_crate_name` if it refers to some other crate.
-// Note, that this is only done if the ident token is printed from inside of AST pretty-pringing,
-// but not otherwise. Pretty-printing is the only way for proc macros to discover token contents,
-// so we should not perform this lossy conversion if the top level call to the pretty-printer was
-// done for a token stream or a single token.
-fn ident_to_string(name: ast::Name, is_raw: bool, convert_dollar_crate: Option<Span>) -> String {
-    if is_raw {
-        format!("r#{}", name)
-    } else {
-        if name == kw::DollarCrate {
-            if let Some(span) = convert_dollar_crate {
-                let converted = span.ctxt().dollar_crate_name();
-                return if converted.is_path_segment_keyword() {
-                    converted.to_string()
-                } else {
-                    format!("::{}", converted)
-                };
-            }
-        }
-        name.to_string()
-    }
-}
-
 /// Print the token kind precisely, without converting `$crate` into its respective crate name.
 pub fn token_kind_to_string(tok: &TokenKind) -> String {
     token_kind_to_string_ext(tok, None)
@@ -288,7 +246,7 @@ fn token_kind_to_string_ext(tok: &TokenKind, convert_dollar_crate: Option<Span>)
         token::Literal(lit) => literal_to_string(lit),
 
         /* Name components */
-        token::Ident(s, is_raw) => ident_to_string(s, is_raw, convert_dollar_crate),
+        token::Ident(s, is_raw) => IdentPrinter::new(s, is_raw, convert_dollar_crate).to_string(),
         token::Lifetime(s) => s.to_string(),
 
         /* Other */
@@ -323,14 +281,11 @@ pub fn nonterminal_to_string(nt: &Nonterminal) -> String {
         token::NtBlock(ref e) => block_to_string(e),
         token::NtStmt(ref e) => stmt_to_string(e),
         token::NtPat(ref e) => pat_to_string(e),
-        token::NtIdent(e, is_raw) => ast_ident_to_string(e, is_raw),
+        token::NtIdent(e, is_raw) => IdentPrinter::for_ast_ident(e, is_raw).to_string(),
         token::NtLifetime(e) => e.to_string(),
         token::NtLiteral(ref e) => expr_to_string(e),
         token::NtTT(ref tree) => tt_to_string(tree.clone()),
-        // FIXME(Centril): merge these variants.
-        token::NtImplItem(ref e) | token::NtTraitItem(ref e) => assoc_item_to_string(e),
         token::NtVis(ref e) => vis_to_string(e),
-        token::NtForeignItem(ref e) => foreign_item_to_string(e),
     }
 }
 
@@ -366,10 +321,6 @@ pub fn item_to_string(i: &ast::Item) -> String {
     to_string(|s| s.print_item(i))
 }
 
-fn assoc_item_to_string(i: &ast::AssocItem) -> String {
-    to_string(|s| s.print_assoc_item(i))
-}
-
 pub fn generic_params_to_string(generic_params: &[ast::GenericParam]) -> String {
     to_string(|s| s.print_generic_params(generic_params))
 }
@@ -412,10 +363,6 @@ pub fn param_to_string(arg: &ast::Param) -> String {
     to_string(|s| s.print_param(arg, false))
 }
 
-fn foreign_item_to_string(arg: &ast::ForeignItem) -> String {
-    to_string(|s| s.print_foreign_item(arg))
-}
-
 fn visibility_qualified(vis: &ast::Visibility, s: &str) -> String {
     format!("{}{}", to_string(|s| s.print_visibility(vis)), s)
 }
@@ -530,8 +477,8 @@ pub trait PrintState<'a>: std::ops::Deref<Target = pp::Printer> + std::ops::Dere
                 self.hardbreak();
             }
         }
-        if let Some(cm) = self.comments() {
-            cm.current += 1;
+        if let Some(cmnts) = self.comments() {
+            cmnts.current += 1;
         }
     }
 
@@ -827,7 +774,7 @@ impl<'a> PrintState<'a> for State<'a> {
     }
 
     fn print_ident(&mut self, ident: ast::Ident) {
-        self.s.word(ast_ident_to_string(ident, ident.is_raw_guess()));
+        self.s.word(IdentPrinter::for_ast_ident(ident, ident.is_raw_guess()).to_string());
         self.ann.post(self, AnnNode::Ident(&ident))
     }
 
@@ -844,7 +791,7 @@ impl<'a> PrintState<'a> for State<'a> {
                     s.print_generic_arg(generic_arg)
                 });
 
-                let mut comma = data.args.len() != 0;
+                let mut comma = !data.args.is_empty();
 
                 for constraint in data.constraints.iter() {
                     if comma {
@@ -920,7 +867,7 @@ impl<'a> State<'a> {
         }
     }
 
-    crate fn print_foreign_mod(&mut self, nmod: &ast::ForeignMod, attrs: &[ast::Attribute]) {
+    crate fn print_foreign_mod(&mut self, nmod: &ast::ForeignMod, attrs: &[Attribute]) {
         self.print_inner_attributes(attrs);
         for item in &nmod.items {
             self.print_foreign_item(item);
@@ -1024,86 +971,88 @@ impl<'a> State<'a> {
     }
 
     crate fn print_foreign_item(&mut self, item: &ast::ForeignItem) {
+        let ast::Item { id, span, ident, ref attrs, ref kind, ref vis, tokens: _ } = *item;
+        self.ann.pre(self, AnnNode::SubItem(id));
         self.hardbreak_if_not_bol();
-        self.maybe_print_comment(item.span.lo());
-        self.print_outer_attributes(&item.attrs);
-        match item.kind {
-            ast::ForeignItemKind::Fn(ref decl, ref generics) => {
-                self.head("");
-                self.print_fn(
-                    decl,
-                    ast::FnHeader::default(),
-                    Some(item.ident),
-                    generics,
-                    &item.vis,
-                );
-                self.end(); // end head-ibox
-                self.s.word(";");
-                self.end(); // end the outer fn box
+        self.maybe_print_comment(span.lo());
+        self.print_outer_attributes(attrs);
+        match kind {
+            ast::ForeignItemKind::Fn(def, sig, gen, body) => {
+                self.print_fn_full(sig, ident, gen, vis, *def, body.as_deref(), attrs);
             }
-            ast::ForeignItemKind::Static(ref t, m) => {
-                self.head(visibility_qualified(&item.vis, "static"));
-                if m == ast::Mutability::Mut {
-                    self.word_space("mut");
-                }
-                self.print_ident(item.ident);
-                self.word_space(":");
-                self.print_type(t);
-                self.s.word(";");
-                self.end(); // end the head-ibox
-                self.end(); // end the outer cbox
+            ast::ForeignItemKind::Static(ty, mutbl, body) => {
+                let def = ast::Defaultness::Final;
+                self.print_item_const(ident, Some(*mutbl), ty, body.as_deref(), vis, def);
             }
-            ast::ForeignItemKind::Ty => {
-                self.head(visibility_qualified(&item.vis, "type"));
-                self.print_ident(item.ident);
-                self.s.word(";");
-                self.end(); // end the head-ibox
-                self.end(); // end the outer cbox
+            ast::ForeignItemKind::TyAlias(def, generics, bounds, ty) => {
+                self.print_associated_type(ident, generics, bounds, ty.as_deref(), vis, *def);
             }
-            ast::ForeignItemKind::Macro(ref m) => {
+            ast::ForeignItemKind::Macro(m) => {
                 self.print_mac(m);
                 if m.args.need_semicolon() {
                     self.s.word(";");
                 }
             }
         }
+        self.ann.post(self, AnnNode::SubItem(id))
     }
 
-    fn print_associated_const(
+    fn print_item_const(
         &mut self,
         ident: ast::Ident,
+        mutbl: Option<ast::Mutability>,
         ty: &ast::Ty,
-        default: Option<&ast::Expr>,
+        body: Option<&ast::Expr>,
         vis: &ast::Visibility,
+        defaultness: ast::Defaultness,
     ) {
-        self.s.word(visibility_qualified(vis, ""));
-        self.word_space("const");
+        self.head("");
+        self.print_visibility(vis);
+        self.print_defaultness(defaultness);
+        let leading = match mutbl {
+            None => "const",
+            Some(ast::Mutability::Not) => "static",
+            Some(ast::Mutability::Mut) => "static mut",
+        };
+        self.word_space(leading);
         self.print_ident(ident);
         self.word_space(":");
         self.print_type(ty);
-        if let Some(expr) = default {
-            self.s.space();
+        self.s.space();
+        self.end(); // end the head-ibox
+        if let Some(body) = body {
             self.word_space("=");
-            self.print_expr(expr);
+            self.print_expr(body);
         }
-        self.s.word(";")
+        self.s.word(";");
+        self.end(); // end the outer cbox
     }
 
     fn print_associated_type(
         &mut self,
         ident: ast::Ident,
+        generics: &ast::Generics,
         bounds: &ast::GenericBounds,
         ty: Option<&ast::Ty>,
+        vis: &ast::Visibility,
+        defaultness: ast::Defaultness,
     ) {
+        self.head("");
+        self.print_visibility(vis);
+        self.print_defaultness(defaultness);
         self.word_space("type");
         self.print_ident(ident);
+        self.print_generic_params(&generics.params);
         self.print_type_bounds(":", bounds);
+        self.print_where_clause(&generics.where_clause);
         if let Some(ty) = ty {
             self.s.space();
             self.word_space("=");
             self.print_type(ty);
         }
-        self.s.word(";")
+        self.s.word(";");
+        self.end(); // end inner head-block
+        self.end(); // end outer head-block
     }
 
     /// Pretty-prints an item.
@@ -1133,40 +1082,16 @@ impl<'a> State<'a> {
                 self.end(); // end inner head-block
                 self.end(); // end outer head-block
             }
-            ast::ItemKind::Static(ref ty, m, ref expr) => {
-                self.head(visibility_qualified(&item.vis, "static"));
-                if m == ast::Mutability::Mut {
-                    self.word_space("mut");
-                }
-                self.print_ident(item.ident);
-                self.word_space(":");
-                self.print_type(ty);
-                self.s.space();
-                self.end(); // end the head-ibox
-
-                self.word_space("=");
-                self.print_expr(expr);
-                self.s.word(";");
-                self.end(); // end the outer cbox
+            ast::ItemKind::Static(ref ty, mutbl, ref body) => {
+                let def = ast::Defaultness::Final;
+                self.print_item_const(item.ident, Some(mutbl), ty, body.as_deref(), &item.vis, def);
             }
-            ast::ItemKind::Const(ref ty, ref expr) => {
-                self.head(visibility_qualified(&item.vis, "const"));
-                self.print_ident(item.ident);
-                self.word_space(":");
-                self.print_type(ty);
-                self.s.space();
-                self.end(); // end the head-ibox
-
-                self.word_space("=");
-                self.print_expr(expr);
-                self.s.word(";");
-                self.end(); // end the outer cbox
+            ast::ItemKind::Const(def, ref ty, ref body) => {
+                self.print_item_const(item.ident, None, ty, body.as_deref(), &item.vis, def);
             }
-            ast::ItemKind::Fn(ref sig, ref param_names, ref body) => {
-                self.head("");
-                self.print_fn(&sig.decl, sig.header, Some(item.ident), param_names, &item.vis);
-                self.s.word(" ");
-                self.print_block_with_attrs(body, &item.attrs);
+            ast::ItemKind::Fn(def, ref sig, ref gen, ref body) => {
+                let body = body.as_deref();
+                self.print_fn_full(sig, item.ident, gen, &item.vis, def, body, &item.attrs);
             }
             ast::ItemKind::Mod(ref _mod) => {
                 self.head(visibility_qualified(&item.vis, "mod"));
@@ -1198,18 +1123,9 @@ impl<'a> State<'a> {
                 self.s.word(ga.asm.to_string());
                 self.end();
             }
-            ast::ItemKind::TyAlias(ref ty, ref generics) => {
-                self.head(visibility_qualified(&item.vis, "type"));
-                self.print_ident(item.ident);
-                self.print_generic_params(&generics.params);
-                self.end(); // end the inner ibox
-
-                self.print_where_clause(&generics.where_clause);
-                self.s.space();
-                self.word_space("=");
-                self.print_type(ty);
-                self.s.word(";");
-                self.end(); // end the outer ibox
+            ast::ItemKind::TyAlias(def, ref generics, ref bounds, ref ty) => {
+                let ty = ty.as_deref();
+                self.print_associated_type(item.ident, generics, bounds, ty, &item.vis, def);
             }
             ast::ItemKind::Enum(ref enum_definition, ref params) => {
                 self.print_enum_def(enum_definition, params, item.ident, item.span, &item.vis);
@@ -1287,6 +1203,7 @@ impl<'a> State<'a> {
                 self.print_where_clause(&generics.where_clause);
                 self.s.word(" ");
                 self.bopen();
+                self.print_inner_attributes(&item.attrs);
                 for trait_item in trait_items {
                     self.print_assoc_item(trait_item);
                 }
@@ -1409,7 +1326,7 @@ impl<'a> State<'a> {
     }
 
     crate fn print_defaultness(&mut self, defaultness: ast::Defaultness) {
-        if let ast::Defaultness::Default = defaultness {
+        if let ast::Defaultness::Default(_) = defaultness {
             self.word_nbsp("default");
         }
     }
@@ -1481,38 +1398,29 @@ impl<'a> State<'a> {
     }
 
     crate fn print_assoc_item(&mut self, item: &ast::AssocItem) {
-        self.ann.pre(self, AnnNode::SubItem(item.id));
+        let ast::Item { id, span, ident, ref attrs, ref kind, ref vis, tokens: _ } = *item;
+        self.ann.pre(self, AnnNode::SubItem(id));
         self.hardbreak_if_not_bol();
-        self.maybe_print_comment(item.span.lo());
-        self.print_outer_attributes(&item.attrs);
-        self.print_defaultness(item.defaultness);
-        match &item.kind {
-            ast::AssocItemKind::Const(ty, expr) => {
-                self.print_associated_const(item.ident, ty, expr.as_deref(), &item.vis);
+        self.maybe_print_comment(span.lo());
+        self.print_outer_attributes(attrs);
+        match kind {
+            ast::AssocItemKind::Fn(def, sig, gen, body) => {
+                self.print_fn_full(sig, ident, gen, vis, *def, body.as_deref(), attrs);
             }
-            ast::AssocItemKind::Fn(sig, body) => {
-                if body.is_some() {
-                    self.head("");
-                }
-                self.print_fn(&sig.decl, sig.header, Some(item.ident), &item.generics, &item.vis);
-                if let Some(body) = body {
-                    self.nbsp();
-                    self.print_block_with_attrs(body, &item.attrs);
-                } else {
-                    self.s.word(";");
-                }
+            ast::AssocItemKind::Const(def, ty, body) => {
+                self.print_item_const(ident, None, ty, body.as_deref(), vis, *def);
             }
-            ast::AssocItemKind::TyAlias(bounds, ty) => {
-                self.print_associated_type(item.ident, bounds, ty.as_deref());
+            ast::AssocItemKind::TyAlias(def, generics, bounds, ty) => {
+                self.print_associated_type(ident, generics, bounds, ty.as_deref(), vis, *def);
             }
-            ast::AssocItemKind::Macro(mac) => {
-                self.print_mac(mac);
-                if mac.args.need_semicolon() {
+            ast::AssocItemKind::Macro(m) => {
+                self.print_mac(m);
+                if m.args.need_semicolon() {
                     self.s.word(";");
                 }
             }
         }
-        self.ann.post(self, AnnNode::SubItem(item.id))
+        self.ann.post(self, AnnNode::SubItem(id))
     }
 
     crate fn print_stmt(&mut self, st: &ast::Stmt) {
@@ -1544,19 +1452,13 @@ impl<'a> State<'a> {
                 }
             }
             ast::StmtKind::Semi(ref expr) => {
-                match expr.kind {
-                    // Filter out empty `Tup` exprs created for the `redundant_semicolon`
-                    // lint, as they shouldn't be visible and interact poorly
-                    // with proc macros.
-                    ast::ExprKind::Tup(ref exprs) if exprs.is_empty() && expr.attrs.is_empty() => {
-                        ()
-                    }
-                    _ => {
-                        self.space_if_not_bol();
-                        self.print_expr_outer_attr_style(expr, false);
-                        self.s.word(";");
-                    }
-                }
+                self.space_if_not_bol();
+                self.print_expr_outer_attr_style(expr, false);
+                self.s.word(";");
+            }
+            ast::StmtKind::Empty => {
+                self.space_if_not_bol();
+                self.s.word(";");
             }
             ast::StmtKind::Mac(ref mac) => {
                 let (ref mac, style, ref attrs) = **mac;
@@ -1757,6 +1659,7 @@ impl<'a> State<'a> {
             Consistent,
             &fields[..],
             |s, field| {
+                s.print_outer_attributes(&field.attrs);
                 s.ibox(INDENT_UNIT);
                 if !field.is_shorthand {
                     s.print_ident(field.ident);
@@ -2419,16 +2322,38 @@ impl<'a> State<'a> {
         }
     }
 
+    fn print_fn_full(
+        &mut self,
+        sig: &ast::FnSig,
+        name: ast::Ident,
+        generics: &ast::Generics,
+        vis: &ast::Visibility,
+        defaultness: ast::Defaultness,
+        body: Option<&ast::Block>,
+        attrs: &[ast::Attribute],
+    ) {
+        if body.is_some() {
+            self.head("");
+        }
+        self.print_visibility(vis);
+        self.print_defaultness(defaultness);
+        self.print_fn(&sig.decl, sig.header, Some(name), generics);
+        if let Some(body) = body {
+            self.nbsp();
+            self.print_block_with_attrs(body, attrs);
+        } else {
+            self.s.word(";");
+        }
+    }
+
     crate fn print_fn(
         &mut self,
         decl: &ast::FnDecl,
         header: ast::FnHeader,
         name: Option<ast::Ident>,
         generics: &ast::Generics,
-        vis: &ast::Visibility,
     ) {
-        self.print_fn_header_info(header, vis);
-
+        self.print_fn_header_info(header);
         if let Some(name) = name {
             self.nbsp();
             self.print_ident(name);
@@ -2453,7 +2378,7 @@ impl<'a> State<'a> {
         }
     }
 
-    crate fn print_asyncness(&mut self, asyncness: ast::IsAsync) {
+    crate fn print_asyncness(&mut self, asyncness: ast::Async) {
         if asyncness.is_async() {
             self.word_nbsp("async");
         }
@@ -2676,8 +2601,8 @@ impl<'a> State<'a> {
         self.end();
     }
 
-    crate fn print_fn_ret_ty(&mut self, fn_ret_ty: &ast::FunctionRetTy) {
-        if let ast::FunctionRetTy::Ty(ty) = fn_ret_ty {
+    crate fn print_fn_ret_ty(&mut self, fn_ret_ty: &ast::FnRetTy) {
+        if let ast::FnRetTy::Ty(ty) = fn_ret_ty {
             self.space_if_not_bol();
             self.ibox(INDENT_UNIT);
             self.word_space("->");
@@ -2690,7 +2615,7 @@ impl<'a> State<'a> {
     crate fn print_ty_fn(
         &mut self,
         ext: ast::Extern,
-        unsafety: ast::Unsafety,
+        unsafety: ast::Unsafe,
         decl: &ast::FnDecl,
         name: Option<ast::Ident>,
         generic_params: &[ast::GenericParam],
@@ -2705,13 +2630,8 @@ impl<'a> State<'a> {
             where_clause: ast::WhereClause { predicates: Vec::new(), span: rustc_span::DUMMY_SP },
             span: rustc_span::DUMMY_SP,
         };
-        self.print_fn(
-            decl,
-            ast::FnHeader { unsafety, ext, ..ast::FnHeader::default() },
-            name,
-            &generics,
-            &dummy_spanned(ast::VisibilityKind::Inherited),
-        );
+        let header = ast::FnHeader { unsafety, ext, ..ast::FnHeader::default() };
+        self.print_fn(decl, header, name, &generics);
         self.end();
     }
 
@@ -2738,15 +2658,9 @@ impl<'a> State<'a> {
         }
     }
 
-    crate fn print_fn_header_info(&mut self, header: ast::FnHeader, vis: &ast::Visibility) {
-        self.s.word(visibility_qualified(vis, ""));
-
-        match header.constness.node {
-            ast::Constness::NotConst => {}
-            ast::Constness::Const => self.word_nbsp("const"),
-        }
-
-        self.print_asyncness(header.asyncness.node);
+    crate fn print_fn_header_info(&mut self, header: ast::FnHeader) {
+        self.print_constness(header.constness);
+        self.print_asyncness(header.asyncness);
         self.print_unsafety(header.unsafety);
 
         match header.ext {
@@ -2764,17 +2678,17 @@ impl<'a> State<'a> {
         self.s.word("fn")
     }
 
-    crate fn print_unsafety(&mut self, s: ast::Unsafety) {
+    crate fn print_unsafety(&mut self, s: ast::Unsafe) {
         match s {
-            ast::Unsafety::Normal => {}
-            ast::Unsafety::Unsafe => self.word_nbsp("unsafe"),
+            ast::Unsafe::No => {}
+            ast::Unsafe::Yes(_) => self.word_nbsp("unsafe"),
         }
     }
 
-    crate fn print_constness(&mut self, s: ast::Constness) {
+    crate fn print_constness(&mut self, s: ast::Const) {
         match s {
-            ast::Constness::Const => self.word_nbsp("const"),
-            ast::Constness::NotConst => {}
+            ast::Const::No => {}
+            ast::Const::Yes(_) => self.word_nbsp("const"),
         }
     }
 
diff --git a/src/libsyntax/print/pprust/tests.rs b/src/librustc_ast_pretty/pprust/tests.rs
similarity index 75%
rename from src/libsyntax/print/pprust/tests.rs
rename to src/librustc_ast_pretty/pprust/tests.rs
index 3091e31558..455f2e3da3 100644
--- a/src/libsyntax/print/pprust/tests.rs
+++ b/src/librustc_ast_pretty/pprust/tests.rs
@@ -1,9 +1,9 @@
 use super::*;
 
-use crate::ast;
-use crate::with_default_globals;
+use rustc_ast::ast;
+use rustc_ast::with_default_globals;
 use rustc_span;
-use rustc_span::source_map::{dummy_spanned, respan};
+use rustc_span::source_map::respan;
 
 fn fun_to_string(
     decl: &ast::FnDecl,
@@ -13,13 +13,7 @@ fn fun_to_string(
 ) -> String {
     to_string(|s| {
         s.head("");
-        s.print_fn(
-            decl,
-            header,
-            Some(name),
-            generics,
-            &dummy_spanned(ast::VisibilityKind::Inherited),
-        );
+        s.print_fn(decl, header, Some(name), generics);
         s.end(); // Close the head box.
         s.end(); // Close the outer box.
     })
@@ -34,10 +28,8 @@ fn test_fun_to_string() {
     with_default_globals(|| {
         let abba_ident = ast::Ident::from_str("abba");
 
-        let decl = ast::FnDecl {
-            inputs: Vec::new(),
-            output: ast::FunctionRetTy::Default(rustc_span::DUMMY_SP),
-        };
+        let decl =
+            ast::FnDecl { inputs: Vec::new(), output: ast::FnRetTy::Default(rustc_span::DUMMY_SP) };
         let generics = ast::Generics::default();
         assert_eq!(
             fun_to_string(&decl, ast::FnHeader::default(), abba_ident, &generics),
diff --git a/src/librustc_attr/Cargo.toml b/src/librustc_attr/Cargo.toml
new file mode 100644
index 0000000000..8aaba15d84
--- /dev/null
+++ b/src/librustc_attr/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_attr"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+name = "rustc_attr"
+path = "lib.rs"
+doctest = false
+
+[dependencies]
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_serialize = { path = "../libserialize", package = "serialize" }
+rustc_errors = { path = "../librustc_errors" }
+rustc_span = { path = "../librustc_span" }
+rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_feature = { path = "../librustc_feature" }
+rustc_macros = { path = "../librustc_macros" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_session = { path = "../librustc_session" }
+rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_attr/builtin.rs b/src/librustc_attr/builtin.rs
new file mode 100644
index 0000000000..08eae24da9
--- /dev/null
+++ b/src/librustc_attr/builtin.rs
@@ -0,0 +1,1072 @@
+//! Parsing and validation of builtin attributes
+
+use super::{find_by_name, mark_used};
+
+use rustc_ast::ast::{self, Attribute, MetaItem, MetaItemKind, NestedMetaItem};
+use rustc_ast_pretty::pprust;
+use rustc_errors::{struct_span_err, Applicability, Handler};
+use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
+use rustc_macros::HashStable_Generic;
+use rustc_session::parse::{feature_err, ParseSess};
+use rustc_span::hygiene::Transparency;
+use rustc_span::{symbol::sym, symbol::Symbol, Span};
+use std::num::NonZeroU32;
+
+pub fn is_builtin_attr(attr: &Attribute) -> bool {
+    attr.is_doc_comment() || attr.ident().filter(|ident| is_builtin_attr_name(ident.name)).is_some()
+}
+
+enum AttrError {
+    MultipleItem(String),
+    UnknownMetaItem(String, &'static [&'static str]),
+    MissingSince,
+    MissingFeature,
+    MultipleStabilityLevels,
+    UnsupportedLiteral(&'static str, /* is_bytestr */ bool),
+}
+
+fn handle_errors(sess: &ParseSess, span: Span, error: AttrError) {
+    let diag = &sess.span_diagnostic;
+    match error {
+        AttrError::MultipleItem(item) => {
+            struct_span_err!(diag, span, E0538, "multiple '{}' items", item).emit();
+        }
+        AttrError::UnknownMetaItem(item, expected) => {
+            let expected = expected.iter().map(|name| format!("`{}`", name)).collect::<Vec<_>>();
+            struct_span_err!(diag, span, E0541, "unknown meta item '{}'", item)
+                .span_label(span, format!("expected one of {}", expected.join(", ")))
+                .emit();
+        }
+        AttrError::MissingSince => {
+            struct_span_err!(diag, span, E0542, "missing 'since'").emit();
+        }
+        AttrError::MissingFeature => {
+            struct_span_err!(diag, span, E0546, "missing 'feature'").emit();
+        }
+        AttrError::MultipleStabilityLevels => {
+            struct_span_err!(diag, span, E0544, "multiple stability levels").emit();
+        }
+        AttrError::UnsupportedLiteral(msg, is_bytestr) => {
+            let mut err = struct_span_err!(diag, span, E0565, "{}", msg);
+            if is_bytestr {
+                if let Ok(lint_str) = sess.source_map().span_to_snippet(span) {
+                    err.span_suggestion(
+                        span,
+                        "consider removing the prefix",
+                        lint_str[1..].to_string(),
+                        Applicability::MaybeIncorrect,
+                    );
+                }
+            }
+            err.emit();
+        }
+    }
+}
+
+#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable)]
+pub enum InlineAttr {
+    None,
+    Hint,
+    Always,
+    Never,
+}
+
+#[derive(Clone, RustcEncodable, RustcDecodable)]
+pub enum OptimizeAttr {
+    None,
+    Speed,
+    Size,
+}
+
+#[derive(Copy, Clone, PartialEq)]
+pub enum UnwindAttr {
+    Allowed,
+    Aborts,
+}
+
+/// Determine what `#[unwind]` attribute is present in `attrs`, if any.
+pub fn find_unwind_attr(diagnostic: Option<&Handler>, attrs: &[Attribute]) -> Option<UnwindAttr> {
+    attrs.iter().fold(None, |ia, attr| {
+        if attr.check_name(sym::unwind) {
+            if let Some(meta) = attr.meta() {
+                if let MetaItemKind::List(items) = meta.kind {
+                    if items.len() == 1 {
+                        if items[0].check_name(sym::allowed) {
+                            return Some(UnwindAttr::Allowed);
+                        } else if items[0].check_name(sym::aborts) {
+                            return Some(UnwindAttr::Aborts);
+                        }
+                    }
+
+                    diagnostic.map(|d| {
+                        struct_span_err!(d, attr.span, E0633, "malformed `unwind` attribute input")
+                            .span_label(attr.span, "invalid argument")
+                            .span_suggestions(
+                                attr.span,
+                                "the allowed arguments are `allowed` and `aborts`",
+                                (vec!["allowed", "aborts"])
+                                    .into_iter()
+                                    .map(|s| format!("#[unwind({})]", s)),
+                                Applicability::MachineApplicable,
+                            )
+                            .emit();
+                    });
+                }
+            }
+        }
+
+        ia
+    })
+}
+
+/// Represents the #[stable], #[unstable], #[rustc_deprecated] attributes.
+#[derive(
+    RustcEncodable,
+    RustcDecodable,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    Hash,
+    HashStable_Generic
+)]
+pub struct Stability {
+    pub level: StabilityLevel,
+    pub feature: Symbol,
+    pub rustc_depr: Option<RustcDeprecation>,
+}
+
+/// Represents the #[rustc_const_unstable] and #[rustc_const_stable] attributes.
+#[derive(
+    RustcEncodable,
+    RustcDecodable,
+    Copy,
+    Clone,
+    Debug,
+    PartialEq,
+    Eq,
+    Hash,
+    HashStable_Generic
+)]
+pub struct ConstStability {
+    pub level: StabilityLevel,
+    pub feature: Symbol,
+    /// whether the function has a `#[rustc_promotable]` attribute
+    pub promotable: bool,
+    /// whether the function has a `#[rustc_allow_const_fn_ptr]` attribute
+    pub allow_const_fn_ptr: bool,
+}
+
+/// The available stability levels.
+#[derive(
+    RustcEncodable,
+    RustcDecodable,
+    PartialEq,
+    PartialOrd,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    Hash,
+    HashStable_Generic
+)]
+pub enum StabilityLevel {
+    // Reason for the current stability level and the relevant rust-lang issue
+    Unstable { reason: Option<Symbol>, issue: Option<NonZeroU32>, is_soft: bool },
+    Stable { since: Symbol },
+}
+
+impl StabilityLevel {
+    pub fn is_unstable(&self) -> bool {
+        if let StabilityLevel::Unstable { .. } = *self { true } else { false }
+    }
+    pub fn is_stable(&self) -> bool {
+        if let StabilityLevel::Stable { .. } = *self { true } else { false }
+    }
+}
+
+#[derive(
+    RustcEncodable,
+    RustcDecodable,
+    PartialEq,
+    PartialOrd,
+    Copy,
+    Clone,
+    Debug,
+    Eq,
+    Hash,
+    HashStable_Generic
+)]
+pub struct RustcDeprecation {
+    pub since: Symbol,
+    pub reason: Symbol,
+    /// A text snippet used to completely replace any use of the deprecated item in an expression.
+    pub suggestion: Option<Symbol>,
+}
+
+/// Checks if `attrs` contains an attribute like `#![feature(feature_name)]`.
+/// This will not perform any "sanity checks" on the form of the attributes.
+pub fn contains_feature_attr(attrs: &[Attribute], feature_name: Symbol) -> bool {
+    attrs.iter().any(|item| {
+        item.check_name(sym::feature)
+            && item
+                .meta_item_list()
+                .map(|list| list.iter().any(|mi| mi.is_word() && mi.check_name(feature_name)))
+                .unwrap_or(false)
+    })
+}
+
+/// Collects stability info from all stability attributes in `attrs`.
+/// Returns `None` if no stability attributes are found.
+pub fn find_stability(
+    sess: &ParseSess,
+    attrs: &[Attribute],
+    item_sp: Span,
+) -> (Option<Stability>, Option<ConstStability>) {
+    find_stability_generic(sess, attrs.iter(), item_sp)
+}
+
+fn find_stability_generic<'a, I>(
+    sess: &ParseSess,
+    attrs_iter: I,
+    item_sp: Span,
+) -> (Option<Stability>, Option<ConstStability>)
+where
+    I: Iterator<Item = &'a Attribute>,
+{
+    use StabilityLevel::*;
+
+    let mut stab: Option<Stability> = None;
+    let mut rustc_depr: Option<RustcDeprecation> = None;
+    let mut const_stab: Option<ConstStability> = None;
+    let mut promotable = false;
+    let mut allow_const_fn_ptr = false;
+    let diagnostic = &sess.span_diagnostic;
+
+    'outer: for attr in attrs_iter {
+        if ![
+            sym::rustc_deprecated,
+            sym::rustc_const_unstable,
+            sym::rustc_const_stable,
+            sym::unstable,
+            sym::stable,
+            sym::rustc_promotable,
+            sym::rustc_allow_const_fn_ptr,
+        ]
+        .iter()
+        .any(|&s| attr.has_name(s))
+        {
+            continue; // not a stability level
+        }
+
+        mark_used(attr);
+
+        let meta = attr.meta();
+
+        if attr.has_name(sym::rustc_promotable) {
+            promotable = true;
+        }
+        if attr.has_name(sym::rustc_allow_const_fn_ptr) {
+            allow_const_fn_ptr = true;
+        }
+        // attributes with data
+        else if let Some(MetaItem { kind: MetaItemKind::List(ref metas), .. }) = meta {
+            let meta = meta.as_ref().unwrap();
+            let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
+                if item.is_some() {
+                    handle_errors(
+                        sess,
+                        meta.span,
+                        AttrError::MultipleItem(pprust::path_to_string(&meta.path)),
+                    );
+                    return false;
+                }
+                if let Some(v) = meta.value_str() {
+                    *item = Some(v);
+                    true
+                } else {
+                    struct_span_err!(diagnostic, meta.span, E0539, "incorrect meta item").emit();
+                    false
+                }
+            };
+
+            macro_rules! get_meta {
+                ($($name:ident),+) => {
+                    $(
+                        let mut $name = None;
+                    )+
+                    for meta in metas {
+                        if let Some(mi) = meta.meta_item() {
+                            match mi.name_or_empty() {
+                                $(
+                                    sym::$name => if !get(mi, &mut $name) { continue 'outer },
+                                )+
+                                _ => {
+                                    let expected = &[ $( stringify!($name) ),+ ];
+                                    handle_errors(
+                                        sess,
+                                        mi.span,
+                                        AttrError::UnknownMetaItem(
+                                            pprust::path_to_string(&mi.path),
+                                            expected,
+                                        ),
+                                    );
+                                    continue 'outer
+                                }
+                            }
+                        } else {
+                            handle_errors(
+                                sess,
+                                meta.span(),
+                                AttrError::UnsupportedLiteral(
+                                    "unsupported literal",
+                                    false,
+                                ),
+                            );
+                            continue 'outer
+                        }
+                    }
+                }
+            }
+
+            let meta_name = meta.name_or_empty();
+            match meta_name {
+                sym::rustc_deprecated => {
+                    if rustc_depr.is_some() {
+                        struct_span_err!(
+                            diagnostic,
+                            item_sp,
+                            E0540,
+                            "multiple rustc_deprecated attributes"
+                        )
+                        .emit();
+                        continue 'outer;
+                    }
+
+                    get_meta!(since, reason, suggestion);
+
+                    match (since, reason) {
+                        (Some(since), Some(reason)) => {
+                            rustc_depr = Some(RustcDeprecation { since, reason, suggestion })
+                        }
+                        (None, _) => {
+                            handle_errors(sess, attr.span, AttrError::MissingSince);
+                            continue;
+                        }
+                        _ => {
+                            struct_span_err!(diagnostic, attr.span, E0543, "missing 'reason'")
+                                .emit();
+                            continue;
+                        }
+                    }
+                }
+                sym::rustc_const_unstable | sym::unstable => {
+                    if meta_name == sym::unstable && stab.is_some() {
+                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
+                        break;
+                    } else if meta_name == sym::rustc_const_unstable && const_stab.is_some() {
+                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
+                        break;
+                    }
+
+                    let mut feature = None;
+                    let mut reason = None;
+                    let mut issue = None;
+                    let mut issue_num = None;
+                    let mut is_soft = false;
+                    for meta in metas {
+                        if let Some(mi) = meta.meta_item() {
+                            match mi.name_or_empty() {
+                                sym::feature => {
+                                    if !get(mi, &mut feature) {
+                                        continue 'outer;
+                                    }
+                                }
+                                sym::reason => {
+                                    if !get(mi, &mut reason) {
+                                        continue 'outer;
+                                    }
+                                }
+                                sym::issue => {
+                                    if !get(mi, &mut issue) {
+                                        continue 'outer;
+                                    }
+
+                                    // These unwraps are safe because `get` ensures the meta item
+                                    // is a name/value pair string literal.
+                                    issue_num = match &*issue.unwrap().as_str() {
+                                        "none" => None,
+                                        issue => {
+                                            let emit_diag = |msg: &str| {
+                                                struct_span_err!(
+                                                    diagnostic,
+                                                    mi.span,
+                                                    E0545,
+                                                    "`issue` must be a non-zero numeric string \
+                                                    or \"none\"",
+                                                )
+                                                .span_label(
+                                                    mi.name_value_literal().unwrap().span,
+                                                    msg,
+                                                )
+                                                .emit();
+                                            };
+                                            match issue.parse() {
+                                                Ok(num) if num == 0 => {
+                                                    emit_diag(
+                                                        "`issue` must not be \"0\", \
+                                                        use \"none\" instead",
+                                                    );
+                                                    continue 'outer;
+                                                }
+                                                Ok(num) => NonZeroU32::new(num),
+                                                Err(err) => {
+                                                    emit_diag(&err.to_string());
+                                                    continue 'outer;
+                                                }
+                                            }
+                                        }
+                                    };
+                                }
+                                sym::soft => {
+                                    if !mi.is_word() {
+                                        let msg = "`soft` should not have any arguments";
+                                        sess.span_diagnostic.span_err(mi.span, msg);
+                                    }
+                                    is_soft = true;
+                                }
+                                _ => {
+                                    handle_errors(
+                                        sess,
+                                        meta.span(),
+                                        AttrError::UnknownMetaItem(
+                                            pprust::path_to_string(&mi.path),
+                                            &["feature", "reason", "issue", "soft"],
+                                        ),
+                                    );
+                                    continue 'outer;
+                                }
+                            }
+                        } else {
+                            handle_errors(
+                                sess,
+                                meta.span(),
+                                AttrError::UnsupportedLiteral("unsupported literal", false),
+                            );
+                            continue 'outer;
+                        }
+                    }
+
+                    match (feature, reason, issue) {
+                        (Some(feature), reason, Some(_)) => {
+                            let level = Unstable { reason, issue: issue_num, is_soft };
+                            if sym::unstable == meta_name {
+                                stab = Some(Stability { level, feature, rustc_depr: None });
+                            } else {
+                                const_stab = Some(ConstStability {
+                                    level,
+                                    feature,
+                                    promotable: false,
+                                    allow_const_fn_ptr: false,
+                                });
+                            }
+                        }
+                        (None, _, _) => {
+                            handle_errors(sess, attr.span, AttrError::MissingFeature);
+                            continue;
+                        }
+                        _ => {
+                            struct_span_err!(diagnostic, attr.span, E0547, "missing 'issue'")
+                                .emit();
+                            continue;
+                        }
+                    }
+                }
+                sym::rustc_const_stable | sym::stable => {
+                    if meta_name == sym::stable && stab.is_some() {
+                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
+                        break;
+                    } else if meta_name == sym::rustc_const_stable && const_stab.is_some() {
+                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
+                        break;
+                    }
+
+                    let mut feature = None;
+                    let mut since = None;
+                    for meta in metas {
+                        match meta {
+                            NestedMetaItem::MetaItem(mi) => match mi.name_or_empty() {
+                                sym::feature => {
+                                    if !get(mi, &mut feature) {
+                                        continue 'outer;
+                                    }
+                                }
+                                sym::since => {
+                                    if !get(mi, &mut since) {
+                                        continue 'outer;
+                                    }
+                                }
+                                _ => {
+                                    handle_errors(
+                                        sess,
+                                        meta.span(),
+                                        AttrError::UnknownMetaItem(
+                                            pprust::path_to_string(&mi.path),
+                                            &["since", "note"],
+                                        ),
+                                    );
+                                    continue 'outer;
+                                }
+                            },
+                            NestedMetaItem::Literal(lit) => {
+                                handle_errors(
+                                    sess,
+                                    lit.span,
+                                    AttrError::UnsupportedLiteral("unsupported literal", false),
+                                );
+                                continue 'outer;
+                            }
+                        }
+                    }
+
+                    match (feature, since) {
+                        (Some(feature), Some(since)) => {
+                            let level = Stable { since };
+                            if sym::stable == meta_name {
+                                stab = Some(Stability { level, feature, rustc_depr: None });
+                            } else {
+                                const_stab = Some(ConstStability {
+                                    level,
+                                    feature,
+                                    promotable: false,
+                                    allow_const_fn_ptr: false,
+                                });
+                            }
+                        }
+                        (None, _) => {
+                            handle_errors(sess, attr.span, AttrError::MissingFeature);
+                            continue;
+                        }
+                        _ => {
+                            handle_errors(sess, attr.span, AttrError::MissingSince);
+                            continue;
+                        }
+                    }
+                }
+                _ => unreachable!(),
+            }
+        }
+    }
+
+    // Merge the deprecation info into the stability info
+    if let Some(rustc_depr) = rustc_depr {
+        if let Some(ref mut stab) = stab {
+            stab.rustc_depr = Some(rustc_depr);
+        } else {
+            struct_span_err!(
+                diagnostic,
+                item_sp,
+                E0549,
+                "rustc_deprecated attribute must be paired with \
+                       either stable or unstable attribute"
+            )
+            .emit();
+        }
+    }
+
+    // Merge the const-unstable info into the stability info
+    if promotable || allow_const_fn_ptr {
+        if let Some(ref mut stab) = const_stab {
+            stab.promotable = promotable;
+            stab.allow_const_fn_ptr = allow_const_fn_ptr;
+        } else {
+            struct_span_err!(
+                diagnostic,
+                item_sp,
+                E0717,
+                "rustc_promotable and rustc_allow_const_fn_ptr attributes \
+                      must be paired with either a rustc_const_unstable or a rustc_const_stable \
+                      attribute"
+            )
+            .emit();
+        }
+    }
+
+    (stab, const_stab)
+}
+
+pub fn find_crate_name(attrs: &[Attribute]) -> Option<Symbol> {
+    super::first_attr_value_str_by_name(attrs, sym::crate_name)
+}
+
+/// Tests if a cfg-pattern matches the cfg set
+pub fn cfg_matches(cfg: &ast::MetaItem, sess: &ParseSess, features: Option<&Features>) -> bool {
+    eval_condition(cfg, sess, &mut |cfg| {
+        let gate = find_gated_cfg(|sym| cfg.check_name(sym));
+        if let (Some(feats), Some(gated_cfg)) = (features, gate) {
+            gate_cfg(&gated_cfg, cfg.span, sess, feats);
+        }
+        let error = |span, msg| {
+            sess.span_diagnostic.span_err(span, msg);
+            true
+        };
+        if cfg.path.segments.len() != 1 {
+            return error(cfg.path.span, "`cfg` predicate key must be an identifier");
+        }
+        match &cfg.kind {
+            MetaItemKind::List(..) => {
+                error(cfg.span, "unexpected parentheses after `cfg` predicate key")
+            }
+            MetaItemKind::NameValue(lit) if !lit.kind.is_str() => {
+                handle_errors(
+                    sess,
+                    lit.span,
+                    AttrError::UnsupportedLiteral(
+                        "literal in `cfg` predicate value must be a string",
+                        lit.kind.is_bytestr(),
+                    ),
+                );
+                true
+            }
+            MetaItemKind::NameValue(..) | MetaItemKind::Word => {
+                let ident = cfg.ident().expect("multi-segment cfg predicate");
+                sess.config.contains(&(ident.name, cfg.value_str()))
+            }
+        }
+    })
+}
+
+fn gate_cfg(gated_cfg: &GatedCfg, cfg_span: Span, sess: &ParseSess, features: &Features) {
+    let (cfg, feature, has_feature) = gated_cfg;
+    if !has_feature(features) && !cfg_span.allows_unstable(*feature) {
+        let explain = format!("`cfg({})` is experimental and subject to change", cfg);
+        feature_err(sess, *feature, cfg_span, &explain).emit();
+    }
+}
+
+/// Evaluate a cfg-like condition (with `any` and `all`), using `eval` to
+/// evaluate individual items.
+pub fn eval_condition(
+    cfg: &ast::MetaItem,
+    sess: &ParseSess,
+    eval: &mut impl FnMut(&ast::MetaItem) -> bool,
+) -> bool {
+    match cfg.kind {
+        ast::MetaItemKind::List(ref mis) => {
+            for mi in mis.iter() {
+                if !mi.is_meta_item() {
+                    handle_errors(
+                        sess,
+                        mi.span(),
+                        AttrError::UnsupportedLiteral("unsupported literal", false),
+                    );
+                    return false;
+                }
+            }
+
+            // The unwraps below may look dangerous, but we've already asserted
+            // that they won't fail with the loop above.
+            match cfg.name_or_empty() {
+                sym::any => {
+                    mis.iter().any(|mi| eval_condition(mi.meta_item().unwrap(), sess, eval))
+                }
+                sym::all => {
+                    mis.iter().all(|mi| eval_condition(mi.meta_item().unwrap(), sess, eval))
+                }
+                sym::not => {
+                    if mis.len() != 1 {
+                        struct_span_err!(
+                            sess.span_diagnostic,
+                            cfg.span,
+                            E0536,
+                            "expected 1 cfg-pattern"
+                        )
+                        .emit();
+                        return false;
+                    }
+
+                    !eval_condition(mis[0].meta_item().unwrap(), sess, eval)
+                }
+                _ => {
+                    struct_span_err!(
+                        sess.span_diagnostic,
+                        cfg.span,
+                        E0537,
+                        "invalid predicate `{}`",
+                        pprust::path_to_string(&cfg.path)
+                    )
+                    .emit();
+                    false
+                }
+            }
+        }
+        ast::MetaItemKind::Word | ast::MetaItemKind::NameValue(..) => eval(cfg),
+    }
+}
+
+#[derive(RustcEncodable, RustcDecodable, Clone, HashStable_Generic)]
+pub struct Deprecation {
+    pub since: Option<Symbol>,
+    pub note: Option<Symbol>,
+}
+
+/// Finds the deprecation attribute. `None` if none exists.
+pub fn find_deprecation(
+    sess: &ParseSess,
+    attrs: &[Attribute],
+    item_sp: Span,
+) -> Option<Deprecation> {
+    find_deprecation_generic(sess, attrs.iter(), item_sp)
+}
+
+fn find_deprecation_generic<'a, I>(
+    sess: &ParseSess,
+    attrs_iter: I,
+    item_sp: Span,
+) -> Option<Deprecation>
+where
+    I: Iterator<Item = &'a Attribute>,
+{
+    let mut depr: Option<Deprecation> = None;
+    let diagnostic = &sess.span_diagnostic;
+
+    'outer: for attr in attrs_iter {
+        if !attr.check_name(sym::deprecated) {
+            continue;
+        }
+
+        if depr.is_some() {
+            struct_span_err!(diagnostic, item_sp, E0550, "multiple deprecated attributes").emit();
+            break;
+        }
+
+        let meta = match attr.meta() {
+            Some(meta) => meta,
+            None => continue,
+        };
+        depr = match &meta.kind {
+            MetaItemKind::Word => Some(Deprecation { since: None, note: None }),
+            MetaItemKind::NameValue(..) => {
+                meta.value_str().map(|note| Deprecation { since: None, note: Some(note) })
+            }
+            MetaItemKind::List(list) => {
+                let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
+                    if item.is_some() {
+                        handle_errors(
+                            sess,
+                            meta.span,
+                            AttrError::MultipleItem(pprust::path_to_string(&meta.path)),
+                        );
+                        return false;
+                    }
+                    if let Some(v) = meta.value_str() {
+                        *item = Some(v);
+                        true
+                    } else {
+                        if let Some(lit) = meta.name_value_literal() {
+                            handle_errors(
+                                sess,
+                                lit.span,
+                                AttrError::UnsupportedLiteral(
+                                    "literal in `deprecated` \
+                                    value must be a string",
+                                    lit.kind.is_bytestr(),
+                                ),
+                            );
+                        } else {
+                            struct_span_err!(diagnostic, meta.span, E0551, "incorrect meta item")
+                                .emit();
+                        }
+
+                        false
+                    }
+                };
+
+                let mut since = None;
+                let mut note = None;
+                for meta in list {
+                    match meta {
+                        NestedMetaItem::MetaItem(mi) => match mi.name_or_empty() {
+                            sym::since => {
+                                if !get(mi, &mut since) {
+                                    continue 'outer;
+                                }
+                            }
+                            sym::note => {
+                                if !get(mi, &mut note) {
+                                    continue 'outer;
+                                }
+                            }
+                            _ => {
+                                handle_errors(
+                                    sess,
+                                    meta.span(),
+                                    AttrError::UnknownMetaItem(
+                                        pprust::path_to_string(&mi.path),
+                                        &["since", "note"],
+                                    ),
+                                );
+                                continue 'outer;
+                            }
+                        },
+                        NestedMetaItem::Literal(lit) => {
+                            handle_errors(
+                                sess,
+                                lit.span,
+                                AttrError::UnsupportedLiteral(
+                                    "item in `deprecated` must be a key/value pair",
+                                    false,
+                                ),
+                            );
+                            continue 'outer;
+                        }
+                    }
+                }
+
+                Some(Deprecation { since, note })
+            }
+        };
+    }
+
+    depr
+}
+
+#[derive(PartialEq, Debug, RustcEncodable, RustcDecodable, Copy, Clone)]
+pub enum ReprAttr {
+    ReprInt(IntType),
+    ReprC,
+    ReprPacked(u32),
+    ReprSimd,
+    ReprTransparent,
+    ReprAlign(u32),
+    ReprNoNiche,
+}
+
+#[derive(Eq, PartialEq, Debug, RustcEncodable, RustcDecodable, Copy, Clone, HashStable_Generic)]
+pub enum IntType {
+    SignedInt(ast::IntTy),
+    UnsignedInt(ast::UintTy),
+}
+
+impl IntType {
+    #[inline]
+    pub fn is_signed(self) -> bool {
+        use IntType::*;
+
+        match self {
+            SignedInt(..) => true,
+            UnsignedInt(..) => false,
+        }
+    }
+}
+
+/// Parse #[repr(...)] forms.
+///
+/// Valid repr contents: any of the primitive integral type names (see
+/// `int_type_of_word`, below) to specify enum discriminant type; `C`, to use
+/// the same discriminant size that the corresponding C enum would or C
+/// structure layout, `packed` to remove padding, and `transparent` to elegate representation
+/// concerns to the only non-ZST field.
+pub fn find_repr_attrs(sess: &ParseSess, attr: &Attribute) -> Vec<ReprAttr> {
+    use ReprAttr::*;
+
+    let mut acc = Vec::new();
+    let diagnostic = &sess.span_diagnostic;
+    if attr.has_name(sym::repr) {
+        if let Some(items) = attr.meta_item_list() {
+            mark_used(attr);
+            for item in items {
+                if !item.is_meta_item() {
+                    handle_errors(
+                        sess,
+                        item.span(),
+                        AttrError::UnsupportedLiteral(
+                            "meta item in `repr` must be an identifier",
+                            false,
+                        ),
+                    );
+                    continue;
+                }
+
+                let mut recognised = false;
+                if item.is_word() {
+                    let hint = match item.name_or_empty() {
+                        sym::C => Some(ReprC),
+                        sym::packed => Some(ReprPacked(1)),
+                        sym::simd => Some(ReprSimd),
+                        sym::transparent => Some(ReprTransparent),
+                        sym::no_niche => Some(ReprNoNiche),
+                        name => int_type_of_word(name).map(ReprInt),
+                    };
+
+                    if let Some(h) = hint {
+                        recognised = true;
+                        acc.push(h);
+                    }
+                } else if let Some((name, value)) = item.name_value_literal() {
+                    let parse_alignment = |node: &ast::LitKind| -> Result<u32, &'static str> {
+                        if let ast::LitKind::Int(literal, ast::LitIntType::Unsuffixed) = node {
+                            if literal.is_power_of_two() {
+                                // rustc::ty::layout::Align restricts align to <= 2^29
+                                if *literal <= 1 << 29 {
+                                    Ok(*literal as u32)
+                                } else {
+                                    Err("larger than 2^29")
+                                }
+                            } else {
+                                Err("not a power of two")
+                            }
+                        } else {
+                            Err("not an unsuffixed integer")
+                        }
+                    };
+
+                    let mut literal_error = None;
+                    if name == sym::align {
+                        recognised = true;
+                        match parse_alignment(&value.kind) {
+                            Ok(literal) => acc.push(ReprAlign(literal)),
+                            Err(message) => literal_error = Some(message),
+                        };
+                    } else if name == sym::packed {
+                        recognised = true;
+                        match parse_alignment(&value.kind) {
+                            Ok(literal) => acc.push(ReprPacked(literal)),
+                            Err(message) => literal_error = Some(message),
+                        };
+                    }
+                    if let Some(literal_error) = literal_error {
+                        struct_span_err!(
+                            diagnostic,
+                            item.span(),
+                            E0589,
+                            "invalid `repr(align)` attribute: {}",
+                            literal_error
+                        )
+                        .emit();
+                    }
+                } else {
+                    if let Some(meta_item) = item.meta_item() {
+                        if meta_item.check_name(sym::align) {
+                            if let MetaItemKind::NameValue(ref value) = meta_item.kind {
+                                recognised = true;
+                                let mut err = struct_span_err!(
+                                    diagnostic,
+                                    item.span(),
+                                    E0693,
+                                    "incorrect `repr(align)` attribute format"
+                                );
+                                match value.kind {
+                                    ast::LitKind::Int(int, ast::LitIntType::Unsuffixed) => {
+                                        err.span_suggestion(
+                                            item.span(),
+                                            "use parentheses instead",
+                                            format!("align({})", int),
+                                            Applicability::MachineApplicable,
+                                        );
+                                    }
+                                    ast::LitKind::Str(s, _) => {
+                                        err.span_suggestion(
+                                            item.span(),
+                                            "use parentheses instead",
+                                            format!("align({})", s),
+                                            Applicability::MachineApplicable,
+                                        );
+                                    }
+                                    _ => {}
+                                }
+                                err.emit();
+                            }
+                        }
+                    }
+                }
+                if !recognised {
+                    // Not a word we recognize
+                    struct_span_err!(
+                        diagnostic,
+                        item.span(),
+                        E0552,
+                        "unrecognized representation hint"
+                    )
+                    .emit();
+                }
+            }
+        }
+    }
+    acc
+}
+
+fn int_type_of_word(s: Symbol) -> Option<IntType> {
+    use IntType::*;
+
+    match s {
+        sym::i8 => Some(SignedInt(ast::IntTy::I8)),
+        sym::u8 => Some(UnsignedInt(ast::UintTy::U8)),
+        sym::i16 => Some(SignedInt(ast::IntTy::I16)),
+        sym::u16 => Some(UnsignedInt(ast::UintTy::U16)),
+        sym::i32 => Some(SignedInt(ast::IntTy::I32)),
+        sym::u32 => Some(UnsignedInt(ast::UintTy::U32)),
+        sym::i64 => Some(SignedInt(ast::IntTy::I64)),
+        sym::u64 => Some(UnsignedInt(ast::UintTy::U64)),
+        sym::i128 => Some(SignedInt(ast::IntTy::I128)),
+        sym::u128 => Some(UnsignedInt(ast::UintTy::U128)),
+        sym::isize => Some(SignedInt(ast::IntTy::Isize)),
+        sym::usize => Some(UnsignedInt(ast::UintTy::Usize)),
+        _ => None,
+    }
+}
+
+pub enum TransparencyError {
+    UnknownTransparency(Symbol, Span),
+    MultipleTransparencyAttrs(Span, Span),
+}
+
+pub fn find_transparency(
+    attrs: &[Attribute],
+    is_legacy: bool,
+) -> (Transparency, Option<TransparencyError>) {
+    let mut transparency = None;
+    let mut error = None;
+    for attr in attrs {
+        if attr.check_name(sym::rustc_macro_transparency) {
+            if let Some((_, old_span)) = transparency {
+                error = Some(TransparencyError::MultipleTransparencyAttrs(old_span, attr.span));
+                break;
+            } else if let Some(value) = attr.value_str() {
+                transparency = Some((
+                    match &*value.as_str() {
+                        "transparent" => Transparency::Transparent,
+                        "semitransparent" => Transparency::SemiTransparent,
+                        "opaque" => Transparency::Opaque,
+                        _ => {
+                            error = Some(TransparencyError::UnknownTransparency(value, attr.span));
+                            continue;
+                        }
+                    },
+                    attr.span,
+                ));
+            }
+        }
+    }
+    let fallback = if is_legacy { Transparency::SemiTransparent } else { Transparency::Opaque };
+    (transparency.map_or(fallback, |t| t.0), error)
+}
+
+pub fn allow_internal_unstable<'a>(
+    attrs: &[Attribute],
+    diag: &'a rustc_errors::Handler,
+) -> Option<impl Iterator<Item = Symbol> + 'a> {
+    let attr = find_by_name(attrs, sym::allow_internal_unstable)?;
+    let list = attr.meta_item_list().or_else(|| {
+        diag.span_err(attr.span, "allow_internal_unstable expects list of feature names");
+        None
+    })?;
+    Some(list.into_iter().filter_map(move |it| {
+        let name = it.ident().map(|ident| ident.name);
+        if name.is_none() {
+            diag.span_err(it.span(), "`allow_internal_unstable` expects feature names");
+        }
+        name
+    }))
+}
diff --git a/src/librustc_attr/lib.rs b/src/librustc_attr/lib.rs
new file mode 100644
index 0000000000..9803501fb9
--- /dev/null
+++ b/src/librustc_attr/lib.rs
@@ -0,0 +1,16 @@
+//! Functions and types dealing with attributes and meta items.
+//!
+//! FIXME(Centril): For now being, much of the logic is still in `rustc_ast::attr`.
+//! The goal is to move the definition of `MetaItem` and things that don't need to be in `syntax`
+//! to this crate.
+
+mod builtin;
+
+pub use builtin::*;
+pub use IntType::*;
+pub use ReprAttr::*;
+pub use StabilityLevel::*;
+
+pub use rustc_ast::attr::*;
+
+pub(crate) use rustc_ast::HashStableContext;
diff --git a/src/librustc_builtin_macros/Cargo.toml b/src/librustc_builtin_macros/Cargo.toml
index 3ce7f5d770..c15438bde4 100644
--- a/src/librustc_builtin_macros/Cargo.toml
+++ b/src/librustc_builtin_macros/Cargo.toml
@@ -12,6 +12,8 @@ doctest = false
 [dependencies]
 fmt_macros = { path = "../libfmt_macros" }
 log = "0.4"
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_feature = { path = "../librustc_feature" }
@@ -19,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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_expand = { path = "../librustc_expand" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_builtin_macros/asm.rs b/src/librustc_builtin_macros/asm.rs
index 4723544316..9811a6621a 100644
--- a/src/librustc_builtin_macros/asm.rs
+++ b/src/librustc_builtin_macros/asm.rs
@@ -2,15 +2,15 @@
 //
 use State::*;
 
+use rustc_ast::ast::{self, AsmDialect};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, Token};
+use rustc_ast::tokenstream::{self, TokenStream};
 use rustc_errors::{struct_span_err, DiagnosticBuilder, PResult};
 use rustc_expand::base::*;
 use rustc_parse::parser::Parser;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, AsmDialect};
-use syntax::ptr::P;
-use syntax::token::{self, Token};
-use syntax::tokenstream::{self, TokenStream};
 
 enum State {
     Asm,
@@ -151,7 +151,7 @@ fn parse_inline_asm<'a>(
 
                     let constraint = parse_asm_str(&mut p)?;
 
-                    let span = p.prev_span;
+                    let span = p.prev_token.span;
 
                     p.expect(&token::OpenDelim(token::Paren))?;
                     let expr = p.parse_expr()?;
@@ -182,7 +182,7 @@ fn parse_inline_asm<'a>(
                     };
 
                     let is_rw = output.is_some();
-                    let is_indirect = constraint_str.contains("*");
+                    let is_indirect = constraint_str.contains('*');
                     outputs.push(ast::InlineAsmOutput {
                         constraint: output.unwrap_or(constraint),
                         expr,
@@ -199,18 +199,18 @@ fn parse_inline_asm<'a>(
 
                     let constraint = parse_asm_str(&mut p)?;
 
-                    if constraint.as_str().starts_with("=") {
+                    if constraint.as_str().starts_with('=') {
                         struct_span_err!(
                             cx.parse_sess.span_diagnostic,
-                            p.prev_span,
+                            p.prev_token.span,
                             E0662,
                             "input operand constraint contains '='"
                         )
                         .emit();
-                    } else if constraint.as_str().starts_with("+") {
+                    } else if constraint.as_str().starts_with('+') {
                         struct_span_err!(
                             cx.parse_sess.span_diagnostic,
-                            p.prev_span,
+                            p.prev_token.span,
                             E0663,
                             "input operand constraint contains '+'"
                         )
@@ -233,11 +233,11 @@ fn parse_inline_asm<'a>(
                     let s = parse_asm_str(&mut p)?;
 
                     if OPTIONS.iter().any(|&opt| s == opt) {
-                        cx.span_warn(p.prev_span, "expected a clobber, found an option");
-                    } else if s.as_str().starts_with("{") || s.as_str().ends_with("}") {
+                        cx.span_warn(p.prev_token.span, "expected a clobber, found an option");
+                    } else if s.as_str().starts_with('{') || s.as_str().ends_with('}') {
                         struct_span_err!(
                             cx.parse_sess.span_diagnostic,
-                            p.prev_span,
+                            p.prev_token.span,
                             E0664,
                             "clobber should not be surrounded by braces"
                         )
@@ -259,7 +259,7 @@ fn parse_inline_asm<'a>(
                 } else if option == sym::intel {
                     dialect = AsmDialect::Intel;
                 } else {
-                    cx.span_warn(p.prev_span, "unrecognized option");
+                    cx.span_warn(p.prev_token.span, "unrecognized option");
                 }
 
                 if p.token == token::Comma {
diff --git a/src/librustc_builtin_macros/assert.rs b/src/librustc_builtin_macros/assert.rs
index a992b6e266..09ff770e87 100644
--- a/src/librustc_builtin_macros/assert.rs
+++ b/src/librustc_builtin_macros/assert.rs
@@ -1,14 +1,14 @@
 use rustc_errors::{Applicability, DiagnosticBuilder};
 
+use rustc_ast::ast::{self, *};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, TokenKind};
+use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};
+use rustc_ast_pretty::pprust;
 use rustc_expand::base::*;
 use rustc_parse::parser::Parser;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, *};
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::token::{self, TokenKind};
-use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
 
 pub fn expand_assert<'cx>(
     cx: &'cx mut ExtCtxt<'_>,
@@ -80,17 +80,15 @@ fn parse_assert<'a>(
     //     my_function();
     // );
     //
-    // Warn about semicolon and suggest removing it. Eventually, this should be turned into an
-    // error.
+    // Emit an error about semicolon and suggest removing it.
     if parser.token == token::Semi {
-        let mut err = cx.struct_span_warn(sp, "macro requires an expression as an argument");
+        let mut err = cx.struct_span_err(sp, "macro requires an expression as an argument");
         err.span_suggestion(
             parser.token.span,
             "try removing semicolon",
             String::new(),
             Applicability::MaybeIncorrect,
         );
-        err.note("this is going to be an error in the future");
         err.emit();
 
         parser.bump();
@@ -101,19 +99,17 @@ fn parse_assert<'a>(
     //
     // assert!(true "error message");
     //
-    // Parse this as an actual message, and suggest inserting a comma. Eventually, this should be
-    // turned into an error.
+    // Emit an error and suggest inserting a comma.
     let custom_message =
         if let token::Literal(token::Lit { kind: token::Str, .. }) = parser.token.kind {
-            let mut err = cx.struct_span_warn(parser.token.span, "unexpected string literal");
-            let comma_span = parser.prev_span.shrink_to_hi();
+            let mut err = cx.struct_span_err(parser.token.span, "unexpected string literal");
+            let comma_span = parser.prev_token.span.shrink_to_hi();
             err.span_suggestion_short(
                 comma_span,
                 "try adding a comma",
                 ", ".to_string(),
                 Applicability::MaybeIncorrect,
             );
-            err.note("this is going to be an error in the future");
             err.emit();
 
             parse_custom_message(&mut parser)
diff --git a/src/librustc_builtin_macros/cfg.rs b/src/librustc_builtin_macros/cfg.rs
index cee62a54f0..3c09b26af4 100644
--- a/src/librustc_builtin_macros/cfg.rs
+++ b/src/librustc_builtin_macros/cfg.rs
@@ -2,13 +2,13 @@
 //! a literal `true` or `false` based on whether the given cfg matches the
 //! current compilation environment.
 
+use rustc_ast::ast;
+use rustc_ast::token;
+use rustc_ast::tokenstream::TokenStream;
+use rustc_attr as attr;
 use rustc_errors::DiagnosticBuilder;
 use rustc_expand::base::{self, *};
 use rustc_span::Span;
-use syntax::ast;
-use syntax::attr;
-use syntax::token;
-use syntax::tokenstream::TokenStream;
 
 pub fn expand_cfg(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/cmdline_attrs.rs b/src/librustc_builtin_macros/cmdline_attrs.rs
index 2f7f7e73ac..7ddbf08306 100644
--- a/src/librustc_builtin_macros/cmdline_attrs.rs
+++ b/src/librustc_builtin_macros/cmdline_attrs.rs
@@ -1,11 +1,11 @@
 //! Attributes injected into the crate root from command line using `-Z crate-attr`.
 
+use rustc_ast::ast::{self, AttrItem, AttrStyle};
+use rustc_ast::attr::mk_attr;
+use rustc_ast::token;
 use rustc_expand::panictry;
+use rustc_session::parse::ParseSess;
 use rustc_span::FileName;
-use syntax::ast::{self, AttrItem, AttrStyle};
-use syntax::attr::mk_attr;
-use syntax::sess::ParseSess;
-use syntax::token;
 
 pub fn inject(mut krate: ast::Crate, parse_sess: &ParseSess, attrs: &[String]) -> ast::Crate {
     for raw_attr in attrs {
diff --git a/src/librustc_builtin_macros/compile_error.rs b/src/librustc_builtin_macros/compile_error.rs
index 4d8d168a2a..f5955604e5 100644
--- a/src/librustc_builtin_macros/compile_error.rs
+++ b/src/librustc_builtin_macros/compile_error.rs
@@ -1,8 +1,8 @@
 // The compiler code necessary to support the compile_error! extension.
 
+use rustc_ast::tokenstream::TokenStream;
 use rustc_expand::base::{self, *};
 use rustc_span::Span;
-use syntax::tokenstream::TokenStream;
 
 pub fn expand_compile_error<'cx>(
     cx: &'cx mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/concat.rs b/src/librustc_builtin_macros/concat.rs
index ed65611da6..e0ce37b95f 100644
--- a/src/librustc_builtin_macros/concat.rs
+++ b/src/librustc_builtin_macros/concat.rs
@@ -1,7 +1,7 @@
+use rustc_ast::ast;
+use rustc_ast::tokenstream::TokenStream;
 use rustc_expand::base::{self, DummyResult};
 use rustc_span::symbol::Symbol;
-use syntax::ast;
-use syntax::tokenstream::TokenStream;
 
 use std::string::String;
 
@@ -49,7 +49,7 @@ pub fn expand_concat(
             }
         }
     }
-    if missing_literal.len() > 0 {
+    if !missing_literal.is_empty() {
         let mut err = cx.struct_span_err(missing_literal, "expected a literal");
         err.note("only literals (like `\"foo\"`, `42` and `3.14`) can be passed to `concat!()`");
         err.emit();
diff --git a/src/librustc_builtin_macros/concat_idents.rs b/src/librustc_builtin_macros/concat_idents.rs
index 449cb2a0b1..b55e71b251 100644
--- a/src/librustc_builtin_macros/concat_idents.rs
+++ b/src/librustc_builtin_macros/concat_idents.rs
@@ -1,10 +1,10 @@
+use rustc_ast::ast;
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, Token};
+use rustc_ast::tokenstream::{TokenStream, TokenTree};
 use rustc_expand::base::{self, *};
 use rustc_span::symbol::Symbol;
 use rustc_span::Span;
-use syntax::ast;
-use syntax::ptr::P;
-use syntax::token::{self, Token};
-use syntax::tokenstream::{TokenStream, TokenTree};
 
 pub fn expand_concat_idents<'cx>(
     cx: &'cx mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/bounds.rs b/src/librustc_builtin_macros/deriving/bounds.rs
index ceb9aab484..a1c818caff 100644
--- a/src/librustc_builtin_macros/deriving/bounds.rs
+++ b/src/librustc_builtin_macros/deriving/bounds.rs
@@ -2,9 +2,9 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_ast::ast::MetaItem;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::Span;
-use syntax::ast::MetaItem;
 
 pub fn expand_deriving_copy(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/clone.rs b/src/librustc_builtin_macros/deriving/clone.rs
index 0df5ef3c9d..97569ef813 100644
--- a/src/librustc_builtin_macros/deriving/clone.rs
+++ b/src/librustc_builtin_macros/deriving/clone.rs
@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_ast::ast::{self, Expr, GenericArg, Generics, ItemKind, MetaItem, VariantData};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, Expr, GenericArg, Generics, ItemKind, MetaItem, VariantData};
-use syntax::ptr::P;
 
 pub fn expand_deriving_clone(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/cmp/eq.rs b/src/librustc_builtin_macros/deriving/cmp/eq.rs
index cb8933c147..b39f41513e 100644
--- a/src/librustc_builtin_macros/deriving/cmp/eq.rs
+++ b/src/librustc_builtin_macros/deriving/cmp/eq.rs
@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_ast::ast::{self, Expr, GenericArg, Ident, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, Expr, GenericArg, Ident, MetaItem};
-use syntax::ptr::P;
 
 pub fn expand_deriving_eq(
     cx: &mut ExtCtxt<'_>,
@@ -16,8 +16,8 @@ pub fn expand_deriving_eq(
     push: &mut dyn FnMut(Annotatable),
 ) {
     let inline = cx.meta_word(span, sym::inline);
-    let hidden = syntax::attr::mk_nested_word_item(Ident::new(sym::hidden, span));
-    let doc = syntax::attr::mk_list_item(Ident::new(sym::doc, span), vec![hidden]);
+    let hidden = rustc_ast::attr::mk_nested_word_item(Ident::new(sym::hidden, span));
+    let doc = rustc_ast::attr::mk_list_item(Ident::new(sym::doc, span), vec![hidden]);
     let attrs = vec![cx.attribute(inline), cx.attribute(doc)];
     let trait_def = TraitDef {
         span,
diff --git a/src/librustc_builtin_macros/deriving/cmp/ord.rs b/src/librustc_builtin_macros/deriving/cmp/ord.rs
index fa43098380..b23fbc6f62 100644
--- a/src/librustc_builtin_macros/deriving/cmp/ord.rs
+++ b/src/librustc_builtin_macros/deriving/cmp/ord.rs
@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_ast::ast::{self, Expr, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast::{self, Expr, MetaItem};
-use syntax::ptr::P;
 
 pub fn expand_deriving_ord(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs b/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs
index dc2912895a..d3f1a9c15f 100644
--- a/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs
+++ b/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs
@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::{path_local, path_std};
 
+use rustc_ast::ast::{BinOpKind, Expr, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast::{BinOpKind, Expr, MetaItem};
-use syntax::ptr::P;
 
 pub fn expand_deriving_partial_eq(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs b/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs
index a54d8c56f7..835ccd1b02 100644
--- a/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs
+++ b/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs
@@ -4,11 +4,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::{path_local, path_std, pathvec_std};
 
+use rustc_ast::ast::{self, BinOpKind, Expr, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, BinOpKind, Expr, MetaItem};
-use syntax::ptr::P;
 
 pub fn expand_deriving_partial_ord(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/debug.rs b/src/librustc_builtin_macros/deriving/debug.rs
index f68fddee71..f47be3c3c1 100644
--- a/src/librustc_builtin_macros/deriving/debug.rs
+++ b/src/librustc_builtin_macros/deriving/debug.rs
@@ -2,12 +2,12 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_ast::ast::{self, Ident};
+use rustc_ast::ast::{Expr, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::sym;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, Ident};
-use syntax::ast::{Expr, MetaItem};
-use syntax::ptr::P;
 
 pub fn expand_deriving_debug(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/decodable.rs b/src/librustc_builtin_macros/deriving/decodable.rs
index 3b20ebbbab..ac5d08ba62 100644
--- a/src/librustc_builtin_macros/deriving/decodable.rs
+++ b/src/librustc_builtin_macros/deriving/decodable.rs
@@ -4,12 +4,12 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::pathvec_std;
 
+use rustc_ast::ast;
+use rustc_ast::ast::{Expr, MetaItem, Mutability};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::Symbol;
 use rustc_span::Span;
-use syntax::ast;
-use syntax::ast::{Expr, MetaItem, Mutability};
-use syntax::ptr::P;
 
 pub fn expand_deriving_rustc_decodable(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/default.rs b/src/librustc_builtin_macros/deriving/default.rs
index b4f059e94c..cb85a0b1a1 100644
--- a/src/librustc_builtin_macros/deriving/default.rs
+++ b/src/librustc_builtin_macros/deriving/default.rs
@@ -2,12 +2,12 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::path_std;
 
+use rustc_ast::ast::{Expr, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_errors::struct_span_err;
 use rustc_expand::base::{Annotatable, DummyResult, ExtCtxt};
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
-use syntax::ast::{Expr, MetaItem};
-use syntax::ptr::P;
 
 pub fn expand_deriving_default(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/encodable.rs b/src/librustc_builtin_macros/deriving/encodable.rs
index b330f00939..9073085381 100644
--- a/src/librustc_builtin_macros/deriving/encodable.rs
+++ b/src/librustc_builtin_macros/deriving/encodable.rs
@@ -89,11 +89,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::pathvec_std;
 
+use rustc_ast::ast::{Expr, ExprKind, MetaItem, Mutability};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::Symbol;
 use rustc_span::Span;
-use syntax::ast::{Expr, ExprKind, MetaItem, Mutability};
-use syntax::ptr::P;
 
 pub fn expand_deriving_rustc_encodable(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/generic/mod.rs b/src/librustc_builtin_macros/deriving/generic/mod.rs
index f8918016c1..e0c619fcbd 100644
--- a/src/librustc_builtin_macros/deriving/generic/mod.rs
+++ b/src/librustc_builtin_macros/deriving/generic/mod.rs
@@ -181,16 +181,16 @@ use std::cell::RefCell;
 use std::iter;
 use std::vec;
 
+use rustc_ast::ast::{self, BinOpKind, EnumDef, Expr, Generics, Ident, PatKind};
+use rustc_ast::ast::{GenericArg, GenericParamKind, VariantData};
+use rustc_ast::ptr::P;
+use rustc_ast::util::map_in_place::MapInPlace;
+use rustc_attr as attr;
 use rustc_expand::base::{Annotatable, ExtCtxt};
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::respan;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, BinOpKind, EnumDef, Expr, Generics, Ident, PatKind};
-use syntax::ast::{GenericArg, GenericParamKind, VariantData};
-use syntax::attr;
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
-use syntax::util::map_in_place::MapInPlace;
 
 use ty::{LifetimeBounds, Path, Ptr, PtrTy, Self_, Ty};
 
@@ -339,7 +339,7 @@ fn find_type_parameters(
     ty_param_names: &[ast::Name],
     cx: &ExtCtxt<'_>,
 ) -> Vec<P<ast::Ty>> {
-    use syntax::visit;
+    use rustc_ast::visit;
 
     struct Visitor<'a, 'b> {
         cx: &'a ExtCtxt<'b>,
@@ -482,7 +482,7 @@ impl<'a> TraitDef<'a> {
                         })
                         .cloned(),
                 );
-                push(Annotatable::Item(P(ast::Item { attrs: attrs, ..(*newitem).clone() })))
+                push(Annotatable::Item(P(ast::Item { attrs, ..(*newitem).clone() })))
             }
             _ => {
                 // Non-Item derive is an error, but it should have been
@@ -531,26 +531,27 @@ impl<'a> TraitDef<'a> {
         type_ident: Ident,
         generics: &Generics,
         field_tys: Vec<P<ast::Ty>>,
-        methods: Vec<ast::AssocItem>,
+        methods: Vec<P<ast::AssocItem>>,
     ) -> P<ast::Item> {
         let trait_path = self.path.to_path(cx, self.span, type_ident, generics);
 
         // Transform associated types from `deriving::ty::Ty` into `ast::AssocItem`
-        let associated_types =
-            self.associated_types.iter().map(|&(ident, ref type_def)| ast::AssocItem {
+        let associated_types = self.associated_types.iter().map(|&(ident, ref type_def)| {
+            P(ast::AssocItem {
                 id: ast::DUMMY_NODE_ID,
                 span: self.span,
                 ident,
                 vis: respan(self.span.shrink_to_lo(), ast::VisibilityKind::Inherited),
-                defaultness: ast::Defaultness::Final,
                 attrs: Vec::new(),
-                generics: Generics::default(),
                 kind: ast::AssocItemKind::TyAlias(
+                    ast::Defaultness::Final,
+                    Generics::default(),
                     Vec::new(),
                     Some(type_def.to_ty(cx, self.span, type_ident, generics)),
                 ),
                 tokens: None,
-            });
+            })
+        });
 
         let Generics { mut params, mut where_clause, span } =
             self.generics.to_generics(cx, self.span, type_ident, generics);
@@ -587,14 +588,14 @@ impl<'a> TraitDef<'a> {
                         span: self.span,
                         bound_generic_params: wb.bound_generic_params.clone(),
                         bounded_ty: wb.bounded_ty.clone(),
-                        bounds: wb.bounds.iter().cloned().collect(),
+                        bounds: wb.bounds.to_vec(),
                     })
                 }
                 ast::WherePredicate::RegionPredicate(ref rb) => {
                     ast::WherePredicate::RegionPredicate(ast::WhereRegionPredicate {
                         span: self.span,
                         lifetime: rb.lifetime,
-                        bounds: rb.bounds.iter().cloned().collect(),
+                        bounds: rb.bounds.to_vec(),
                     })
                 }
                 ast::WherePredicate::EqPredicate(ref we) => {
@@ -688,18 +689,18 @@ impl<'a> TraitDef<'a> {
         attr::mark_used(&attr);
         let opt_trait_ref = Some(trait_ref);
         let unused_qual = {
-            let word = syntax::attr::mk_nested_word_item(Ident::new(
+            let word = rustc_ast::attr::mk_nested_word_item(Ident::new(
                 Symbol::intern("unused_qualifications"),
                 self.span,
             ));
-            let list = syntax::attr::mk_list_item(Ident::new(sym::allow, self.span), vec![word]);
+            let list = rustc_ast::attr::mk_list_item(Ident::new(sym::allow, self.span), vec![word]);
             cx.attribute(list)
         };
 
         let mut a = vec![attr, unused_qual];
         a.extend(self.attributes.iter().cloned());
 
-        let unsafety = if self.is_unsafe { ast::Unsafety::Unsafe } else { ast::Unsafety::Normal };
+        let unsafety = if self.is_unsafe { ast::Unsafe::Yes(self.span) } else { ast::Unsafe::No };
 
         cx.item(
             self.span,
@@ -709,7 +710,7 @@ impl<'a> TraitDef<'a> {
                 unsafety,
                 polarity: ast::ImplPolarity::Positive,
                 defaultness: ast::Defaultness::Final,
-                constness: ast::Constness::NotConst,
+                constness: ast::Const::No,
                 generics: trait_generics,
                 of_trait: opt_trait_ref,
                 self_ty: self_type,
@@ -824,7 +825,8 @@ fn find_repr_type_name(sess: &ParseSess, type_attrs: &[ast::Attribute]) -> &'sta
                 attr::ReprPacked(_)
                 | attr::ReprSimd
                 | attr::ReprAlign(_)
-                | attr::ReprTransparent => continue,
+                | attr::ReprTransparent
+                | attr::ReprNoNiche => continue,
 
                 attr::ReprC => "i32",
 
@@ -938,7 +940,7 @@ impl<'a> MethodDef<'a> {
         explicit_self: Option<ast::ExplicitSelf>,
         arg_types: Vec<(Ident, P<ast::Ty>)>,
         body: P<Expr>,
-    ) -> ast::AssocItem {
+    ) -> P<ast::AssocItem> {
         // Create the generics that aren't for `Self`.
         let fn_generics = self.generics.to_generics(cx, trait_.span, type_ident, generics);
 
@@ -955,10 +957,10 @@ impl<'a> MethodDef<'a> {
         let ret_type = self.get_ret_ty(cx, trait_, generics, type_ident);
 
         let method_ident = cx.ident_of(self.name, trait_.span);
-        let fn_decl = cx.fn_decl(args, ast::FunctionRetTy::Ty(ret_type));
+        let fn_decl = cx.fn_decl(args, ast::FnRetTy::Ty(ret_type));
         let body_block = cx.block_expr(body);
 
-        let unsafety = if self.is_unsafe { ast::Unsafety::Unsafe } else { ast::Unsafety::Normal };
+        let unsafety = if self.is_unsafe { ast::Unsafe::Yes(trait_.span) } else { ast::Unsafe::No };
 
         let trait_lo_sp = trait_.span.shrink_to_lo();
 
@@ -966,19 +968,18 @@ impl<'a> MethodDef<'a> {
             header: ast::FnHeader { unsafety, ext: ast::Extern::None, ..ast::FnHeader::default() },
             decl: fn_decl,
         };
+        let def = ast::Defaultness::Final;
 
         // Create the method.
-        ast::AssocItem {
+        P(ast::AssocItem {
             id: ast::DUMMY_NODE_ID,
             attrs: self.attributes.clone(),
-            generics: fn_generics,
             span: trait_.span,
             vis: respan(trait_lo_sp, ast::VisibilityKind::Inherited),
-            defaultness: ast::Defaultness::Final,
             ident: method_ident,
-            kind: ast::AssocItemKind::Fn(sig, Some(body_block)),
+            kind: ast::AssocItemKind::Fn(def, sig, fn_generics, Some(body_block)),
             tokens: None,
-        }
+        })
     }
 
     /// ```
diff --git a/src/librustc_builtin_macros/deriving/generic/ty.rs b/src/librustc_builtin_macros/deriving/generic/ty.rs
index d2df64cac4..bd54a73531 100644
--- a/src/librustc_builtin_macros/deriving/generic/ty.rs
+++ b/src/librustc_builtin_macros/deriving/generic/ty.rs
@@ -4,12 +4,12 @@
 pub use PtrTy::*;
 pub use Ty::*;
 
+use rustc_ast::ast::{self, Expr, GenericArg, GenericParamKind, Generics, Ident, SelfKind};
+use rustc_ast::ptr::P;
 use rustc_expand::base::ExtCtxt;
 use rustc_span::source_map::{respan, DUMMY_SP};
 use rustc_span::symbol::kw;
 use rustc_span::Span;
-use syntax::ast::{self, Expr, GenericArg, GenericParamKind, Generics, Ident, SelfKind};
-use syntax::ptr::P;
 
 /// The types of pointers
 #[derive(Clone)]
diff --git a/src/librustc_builtin_macros/deriving/hash.rs b/src/librustc_builtin_macros/deriving/hash.rs
index e620711aa2..8776e7ef50 100644
--- a/src/librustc_builtin_macros/deriving/hash.rs
+++ b/src/librustc_builtin_macros/deriving/hash.rs
@@ -2,11 +2,11 @@ use crate::deriving::generic::ty::*;
 use crate::deriving::generic::*;
 use crate::deriving::{self, path_std, pathvec_std};
 
+use rustc_ast::ast::{Expr, MetaItem, Mutability};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast::{Expr, MetaItem, Mutability};
-use syntax::ptr::P;
 
 pub fn expand_deriving_hash(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/deriving/mod.rs b/src/librustc_builtin_macros/deriving/mod.rs
index 914dcdf196..5ba9d3800e 100644
--- a/src/librustc_builtin_macros/deriving/mod.rs
+++ b/src/librustc_builtin_macros/deriving/mod.rs
@@ -1,10 +1,10 @@
 //! The compiler code necessary to implement the `#[derive]` extensions.
 
+use rustc_ast::ast::{self, ItemKind, MetaItem};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt, MultiItemModifier};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, ItemKind, MetaItem};
-use syntax::ptr::P;
 
 macro path_local($x:ident) {
     generic::ty::Path::new_local(stringify!($x))
@@ -157,10 +157,10 @@ fn inject_impl_of_structural_trait(
         ast::Ident::invalid(),
         attrs,
         ItemKind::Impl {
-            unsafety: ast::Unsafety::Normal,
+            unsafety: ast::Unsafe::No,
             polarity: ast::ImplPolarity::Positive,
             defaultness: ast::Defaultness::Final,
-            constness: ast::Constness::NotConst,
+            constness: ast::Const::No,
             generics,
             of_trait: Some(trait_ref),
             self_ty: self_type,
diff --git a/src/librustc_builtin_macros/env.rs b/src/librustc_builtin_macros/env.rs
index 896bb8ca05..fba76f8b49 100644
--- a/src/librustc_builtin_macros/env.rs
+++ b/src/librustc_builtin_macros/env.rs
@@ -3,11 +3,11 @@
 // interface.
 //
 
+use rustc_ast::ast::{self, GenericArg, Ident};
+use rustc_ast::tokenstream::TokenStream;
 use rustc_expand::base::{self, *};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, GenericArg, Ident};
-use syntax::tokenstream::TokenStream;
 
 use std::env;
 
diff --git a/src/librustc_builtin_macros/format.rs b/src/librustc_builtin_macros/format.rs
index a9298abe2d..2883159a9f 100644
--- a/src/librustc_builtin_macros/format.rs
+++ b/src/librustc_builtin_macros/format.rs
@@ -3,15 +3,15 @@ use Position::*;
 
 use fmt_macros as parse;
 
+use rustc_ast::ast;
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::tokenstream::TokenStream;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
 use rustc_expand::base::{self, *};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{MultiSpan, Span};
-use syntax::ast;
-use syntax::ptr::P;
-use syntax::token;
-use syntax::tokenstream::TokenStream;
 
 use std::borrow::Cow;
 use std::collections::hash_map::Entry;
@@ -156,44 +156,43 @@ fn parse_args<'a>(
         if p.token == token::Eof {
             break;
         } // accept trailing commas
-        if p.token.is_ident() && p.look_ahead(1, |t| *t == token::Eq) {
-            named = true;
-            let name = if let token::Ident(name, _) = p.token.kind {
+        match p.token.ident() {
+            Some((ident, _)) if p.look_ahead(1, |t| *t == token::Eq) => {
+                named = true;
                 p.bump();
-                name
-            } else {
-                unreachable!();
-            };
+                p.expect(&token::Eq)?;
+                let e = p.parse_expr()?;
+                if let Some(prev) = names.get(&ident.name) {
+                    ecx.struct_span_err(e.span, &format!("duplicate argument named `{}`", ident))
+                        .span_label(args[*prev].span, "previously here")
+                        .span_label(e.span, "duplicate argument")
+                        .emit();
+                    continue;
+                }
 
-            p.expect(&token::Eq)?;
-            let e = p.parse_expr()?;
-            if let Some(prev) = names.get(&name) {
-                ecx.struct_span_err(e.span, &format!("duplicate argument named `{}`", name))
-                    .span_label(args[*prev].span, "previously here")
-                    .span_label(e.span, "duplicate argument")
-                    .emit();
-                continue;
+                // Resolve names into slots early.
+                // Since all the positional args are already seen at this point
+                // if the input is valid, we can simply append to the positional
+                // args. And remember the names.
+                let slot = args.len();
+                names.insert(ident.name, slot);
+                args.push(e);
             }
-
-            // Resolve names into slots early.
-            // Since all the positional args are already seen at this point
-            // if the input is valid, we can simply append to the positional
-            // args. And remember the names.
-            let slot = args.len();
-            names.insert(name, slot);
-            args.push(e);
-        } else {
-            let e = p.parse_expr()?;
-            if named {
-                let mut err = ecx
-                    .struct_span_err(e.span, "positional arguments cannot follow named arguments");
-                err.span_label(e.span, "positional arguments must be before named arguments");
-                for (_, pos) in &names {
-                    err.span_label(args[*pos].span, "named argument");
+            _ => {
+                let e = p.parse_expr()?;
+                if named {
+                    let mut err = ecx.struct_span_err(
+                        e.span,
+                        "positional arguments cannot follow named arguments",
+                    );
+                    err.span_label(e.span, "positional arguments must be before named arguments");
+                    for pos in names.values() {
+                        err.span_label(args[*pos].span, "named argument");
+                    }
+                    err.emit();
                 }
-                err.emit();
+                args.push(e);
             }
-            args.push(e);
         }
     }
     Ok((fmtstr, args, names))
@@ -284,7 +283,7 @@ impl<'a, 'b> Context<'a, 'b> {
                                 err.tool_only_span_suggestion(
                                     sp,
                                     &format!("use the `{}` trait", name),
-                                    fmt.to_string(),
+                                    (*fmt).to_string(),
                                     Applicability::MaybeIncorrect,
                                 );
                             }
@@ -359,7 +358,7 @@ impl<'a, 'b> Context<'a, 'b> {
             refs.sort();
             refs.dedup();
             let (arg_list, mut sp) = if refs.len() == 1 {
-                let spans: Vec<_> = spans.into_iter().filter_map(|sp| sp.map(|sp| *sp)).collect();
+                let spans: Vec<_> = spans.into_iter().filter_map(|sp| sp.copied()).collect();
                 (
                     format!("argument {}", refs[0]),
                     if spans.is_empty() {
@@ -476,7 +475,7 @@ impl<'a, 'b> Context<'a, 'b> {
                 match ty {
                     Placeholder(_) => {
                         // record every (position, type) combination only once
-                        let ref mut seen_ty = self.arg_unique_types[arg];
+                        let seen_ty = &mut self.arg_unique_types[arg];
                         let i = seen_ty.iter().position(|x| *x == ty).unwrap_or_else(|| {
                             let i = seen_ty.len();
                             seen_ty.push(ty);
@@ -526,7 +525,7 @@ impl<'a, 'b> Context<'a, 'b> {
 
         // Map the arguments
         for i in 0..args_len {
-            let ref arg_types = self.arg_types[i];
+            let arg_types = &self.arg_types[i];
             let arg_offsets = arg_types.iter().map(|offset| sofar + *offset).collect::<Vec<_>>();
             self.arg_index_map.push(arg_offsets);
             sofar += self.arg_unique_types[i].len();
@@ -597,7 +596,7 @@ impl<'a, 'b> Context<'a, 'b> {
                             let arg_idx = match arg_index_consumed.get_mut(i) {
                                 None => 0, // error already emitted elsewhere
                                 Some(offset) => {
-                                    let ref idx_map = self.arg_index_map[i];
+                                    let idx_map = &self.arg_index_map[i];
                                     // unwrap_or branch: error already emitted elsewhere
                                     let arg_idx = *idx_map.get(*offset).unwrap_or(&0);
                                     *offset += 1;
@@ -721,7 +720,7 @@ impl<'a, 'b> Context<'a, 'b> {
             let name = names_pos[i];
             let span = self.ecx.with_def_site_ctxt(e.span);
             pats.push(self.ecx.pat_ident(span, name));
-            for ref arg_ty in self.arg_unique_types[i].iter() {
+            for arg_ty in self.arg_unique_types[i].iter() {
                 locals.push(Context::format_arg(self.ecx, self.macsp, e.span, arg_ty, name));
             }
             heads.push(self.ecx.expr_addr_of(e.span, e));
@@ -894,7 +893,7 @@ pub fn expand_preparsed_format_args(
     };
 
     let (is_literal, fmt_snippet) = match ecx.source_map().span_to_snippet(fmt_sp) {
-        Ok(s) => (s.starts_with("\"") || s.starts_with("r#"), Some(s)),
+        Ok(s) => (s.starts_with('"') || s.starts_with("r#"), Some(s)),
         _ => (false, None),
     };
 
@@ -904,7 +903,7 @@ pub fn expand_preparsed_format_args(
     };
 
     /// Finds the indices of all characters that have been processed and differ between the actual
-    /// written code (code snippet) and the `InternedString` that get's processed in the `Parser`
+    /// written code (code snippet) and the `InternedString` that gets processed in the `Parser`
     /// in order to properly synthethise the intra-string `Span`s for error diagnostics.
     fn find_skips(snippet: &str, is_raw: bool) -> Vec<usize> {
         let mut eat_ws = false;
@@ -1096,7 +1095,7 @@ pub fn expand_preparsed_format_args(
         cx.str_pieces.push(s);
     }
 
-    if cx.invalid_refs.len() >= 1 {
+    if !cx.invalid_refs.is_empty() {
         cx.report_invalid_references(numbered_position_args);
     }
 
diff --git a/src/librustc_builtin_macros/global_allocator.rs b/src/librustc_builtin_macros/global_allocator.rs
index 957d34b7d8..5d16be3206 100644
--- a/src/librustc_builtin_macros/global_allocator.rs
+++ b/src/librustc_builtin_macros/global_allocator.rs
@@ -1,12 +1,14 @@
 use crate::util::check_builtin_macro_attribute;
 
+use rustc_ast::ast::{self, Attribute, Expr, FnHeader, FnSig, Generics, Ident, Param};
+use rustc_ast::ast::{ItemKind, Mutability, Stmt, Ty, TyKind, Unsafe};
+use rustc_ast::expand::allocator::{
+    AllocatorKind, AllocatorMethod, AllocatorTy, ALLOCATOR_METHODS,
+};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{Annotatable, ExtCtxt};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::{self, Attribute, Expr, FnHeader, FnSig, Generics, Ident, Param};
-use syntax::ast::{ItemKind, Mutability, Stmt, Ty, TyKind, Unsafety};
-use syntax::expand::allocator::{AllocatorKind, AllocatorMethod, AllocatorTy, ALLOCATOR_METHODS};
-use syntax::ptr::P;
 
 pub fn expand(
     ecx: &mut ExtCtxt<'_>,
@@ -55,18 +57,19 @@ impl AllocFnFactory<'_, '_> {
     fn allocator_fn(&self, method: &AllocatorMethod) -> Stmt {
         let mut abi_args = Vec::new();
         let mut i = 0;
-        let ref mut mk = || {
+        let mut mk = || {
             let name = self.cx.ident_of(&format!("arg{}", i), self.span);
             i += 1;
             name
         };
-        let args = method.inputs.iter().map(|ty| self.arg_ty(ty, &mut abi_args, mk)).collect();
+        let args = method.inputs.iter().map(|ty| self.arg_ty(ty, &mut abi_args, &mut mk)).collect();
         let result = self.call_allocator(method.name, args);
         let (output_ty, output_expr) = self.ret_ty(&method.output, result);
-        let decl = self.cx.fn_decl(abi_args, ast::FunctionRetTy::Ty(output_ty));
-        let header = FnHeader { unsafety: Unsafety::Unsafe, ..FnHeader::default() };
+        let decl = self.cx.fn_decl(abi_args, ast::FnRetTy::Ty(output_ty));
+        let header = FnHeader { unsafety: Unsafe::Yes(self.span), ..FnHeader::default() };
         let sig = FnSig { decl, header };
-        let kind = ItemKind::Fn(sig, Generics::default(), self.cx.block_expr(output_expr));
+        let block = Some(self.cx.block_expr(output_expr));
+        let kind = ItemKind::Fn(ast::Defaultness::Final, sig, Generics::default(), block);
         let item = self.cx.item(
             self.span,
             self.cx.ident_of(&self.kind.fn_name(method.name), self.span),
diff --git a/src/librustc_builtin_macros/global_asm.rs b/src/librustc_builtin_macros/global_asm.rs
index 052e62ee9f..307e7fe712 100644
--- a/src/librustc_builtin_macros/global_asm.rs
+++ b/src/librustc_builtin_macros/global_asm.rs
@@ -8,15 +8,15 @@
 //! LLVM's `module asm "some assembly here"`. All of LLVM's caveats
 //! therefore apply.
 
+use rustc_ast::ast;
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::tokenstream::TokenStream;
 use rustc_errors::DiagnosticBuilder;
 use rustc_expand::base::{self, *};
 use rustc_span::source_map::respan;
 use rustc_span::Span;
 use smallvec::smallvec;
-use syntax::ast;
-use syntax::ptr::P;
-use syntax::token;
-use syntax::tokenstream::TokenStream;
 
 pub fn expand_global_asm<'cx>(
     cx: &'cx mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/lib.rs b/src/librustc_builtin_macros/lib.rs
index c735ba0df3..9a8b0a87cb 100644
--- a/src/librustc_builtin_macros/lib.rs
+++ b/src/librustc_builtin_macros/lib.rs
@@ -13,11 +13,11 @@ extern crate proc_macro;
 
 use crate::deriving::*;
 
+use rustc_ast::ast::Ident;
 use rustc_expand::base::{MacroExpanderFn, Resolver, SyntaxExtension, SyntaxExtensionKind};
 use rustc_expand::proc_macro::BangProcMacro;
 use rustc_span::edition::Edition;
 use rustc_span::symbol::sym;
-use syntax::ast::Ident;
 
 mod asm;
 mod assert;
diff --git a/src/librustc_builtin_macros/log_syntax.rs b/src/librustc_builtin_macros/log_syntax.rs
index 7c7fc286e0..ae3a889428 100644
--- a/src/librustc_builtin_macros/log_syntax.rs
+++ b/src/librustc_builtin_macros/log_syntax.rs
@@ -1,14 +1,13 @@
+use rustc_ast::tokenstream::TokenStream;
+use rustc_ast_pretty::pprust;
 use rustc_expand::base;
-use rustc_span;
-use syntax::print;
-use syntax::tokenstream::TokenStream;
 
 pub fn expand_log_syntax<'cx>(
     _cx: &'cx mut base::ExtCtxt<'_>,
     sp: rustc_span::Span,
     tts: TokenStream,
 ) -> Box<dyn base::MacResult + 'cx> {
-    println!("{}", print::pprust::tts_to_string(tts));
+    println!("{}", pprust::tts_to_string(tts));
 
     // any so that `log_syntax` can be invoked as an expression and item.
     base::DummyResult::any_valid(sp)
diff --git a/src/librustc_builtin_macros/proc_macro_harness.rs b/src/librustc_builtin_macros/proc_macro_harness.rs
index ae70608505..7972466236 100644
--- a/src/librustc_builtin_macros/proc_macro_harness.rs
+++ b/src/librustc_builtin_macros/proc_macro_harness.rs
@@ -1,20 +1,22 @@
 use std::mem;
 
+use rustc_ast::ast::{self, Ident, NodeId};
+use rustc_ast::attr;
+use rustc_ast::expand::is_proc_macro_attr;
+use rustc_ast::ptr::P;
+use rustc_ast::visit::{self, Visitor};
+use rustc_ast_pretty::pprust;
 use rustc_expand::base::{ExtCtxt, Resolver};
 use rustc_expand::expand::{AstFragment, ExpansionConfig};
+use rustc_session::parse::ParseSess;
 use rustc_span::hygiene::AstPass;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{Span, DUMMY_SP};
 use smallvec::smallvec;
-use syntax::ast::{self, Ident};
-use syntax::attr;
-use syntax::expand::is_proc_macro_attr;
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
-use syntax::visit::{self, Visitor};
+use std::cell::RefCell;
 
 struct ProcMacroDerive {
+    id: NodeId,
     trait_name: ast::Name,
     function_name: Ident,
     span: Span,
@@ -27,6 +29,7 @@ enum ProcMacroDefType {
 }
 
 struct ProcMacroDef {
+    id: NodeId,
     function_name: Ident,
     span: Span,
     def_type: ProcMacroDefType,
@@ -69,9 +72,6 @@ pub fn inject(
     if has_proc_macro_decls || is_proc_macro_crate {
         visit::walk_crate(&mut collect, &krate);
     }
-    // NOTE: If you change the order of macros in this vec
-    // for any reason, you must also update 'raw_proc_macro'
-    // in src/librustc_metadata/decoder.rs
     let macros = collect.macros;
 
     if !is_proc_macro_crate {
@@ -86,7 +86,8 @@ pub fn inject(
         return krate;
     }
 
-    krate.module.items.push(mk_decls(&mut cx, &macros));
+    let decls = mk_decls(&mut krate, &mut cx, &macros);
+    krate.module.items.push(decls);
 
     krate
 }
@@ -148,7 +149,7 @@ impl<'a> CollectProcMacros<'a> {
                         .span_err(attr.span(), "attribute must be of form: `attributes(foo, bar)`");
                     &[]
                 })
-                .into_iter()
+                .iter()
                 .filter_map(|attr| {
                     let attr = match attr.meta_item() {
                         Some(meta_item) => meta_item,
@@ -181,6 +182,7 @@ impl<'a> CollectProcMacros<'a> {
 
         if self.in_root && item.vis.node.is_pub() {
             self.macros.push(ProcMacro::Derive(ProcMacroDerive {
+                id: item.id,
                 span: item.span,
                 trait_name: trait_ident.name,
                 function_name: item.ident,
@@ -200,6 +202,7 @@ impl<'a> CollectProcMacros<'a> {
     fn collect_attr_proc_macro(&mut self, item: &'a ast::Item) {
         if self.in_root && item.vis.node.is_pub() {
             self.macros.push(ProcMacro::Def(ProcMacroDef {
+                id: item.id,
                 span: item.span,
                 function_name: item.ident,
                 def_type: ProcMacroDefType::Attr,
@@ -218,6 +221,7 @@ impl<'a> CollectProcMacros<'a> {
     fn collect_bang_proc_macro(&mut self, item: &'a ast::Item) {
         if self.in_root && item.vis.node.is_pub() {
             self.macros.push(ProcMacro::Def(ProcMacroDef {
+                id: item.id,
                 span: item.span,
                 function_name: item.ident,
                 def_type: ProcMacroDefType::Bang,
@@ -357,7 +361,15 @@ impl<'a> Visitor<'a> for CollectProcMacros<'a> {
 //              // ...
 //          ];
 //      }
-fn mk_decls(cx: &mut ExtCtxt<'_>, macros: &[ProcMacro]) -> P<ast::Item> {
+fn mk_decls(
+    ast_krate: &mut ast::Crate,
+    cx: &mut ExtCtxt<'_>,
+    macros: &[ProcMacro],
+) -> P<ast::Item> {
+    // We're the ones filling in this Vec,
+    // so it should be empty to start with
+    assert!(ast_krate.proc_macros.is_empty());
+
     let expn_id = cx.resolver.expansion_for_ast_pass(
         DUMMY_SP,
         AstPass::ProcMacroHarness,
@@ -376,6 +388,12 @@ fn mk_decls(cx: &mut ExtCtxt<'_>, macros: &[ProcMacro]) -> P<ast::Item> {
     let attr = cx.ident_of("attr", span);
     let bang = cx.ident_of("bang", span);
 
+    let krate_ref = RefCell::new(ast_krate);
+
+    // We add NodeIds to 'krate.proc_macros' in the order
+    // that we generate expressions. The position of each NodeId
+    // in the 'proc_macros' Vec corresponds to its position
+    // in the static array that will be generated
     let decls = {
         let local_path =
             |sp: Span, name| cx.expr_path(cx.path(sp.with_ctxt(span.ctxt()), vec![name]));
@@ -385,19 +403,26 @@ fn mk_decls(cx: &mut ExtCtxt<'_>, macros: &[ProcMacro]) -> P<ast::Item> {
         macros
             .iter()
             .map(|m| match m {
-                ProcMacro::Derive(cd) => cx.expr_call(
-                    span,
-                    proc_macro_ty_method_path(custom_derive),
-                    vec![
-                        cx.expr_str(cd.span, cd.trait_name),
-                        cx.expr_vec_slice(
-                            span,
-                            cd.attrs.iter().map(|&s| cx.expr_str(cd.span, s)).collect::<Vec<_>>(),
-                        ),
-                        local_path(cd.span, cd.function_name),
-                    ],
-                ),
+                ProcMacro::Derive(cd) => {
+                    krate_ref.borrow_mut().proc_macros.push(cd.id);
+                    cx.expr_call(
+                        span,
+                        proc_macro_ty_method_path(custom_derive),
+                        vec![
+                            cx.expr_str(cd.span, cd.trait_name),
+                            cx.expr_vec_slice(
+                                span,
+                                cd.attrs
+                                    .iter()
+                                    .map(|&s| cx.expr_str(cd.span, s))
+                                    .collect::<Vec<_>>(),
+                            ),
+                            local_path(cd.span, cd.function_name),
+                        ],
+                    )
+                }
                 ProcMacro::Def(ca) => {
+                    krate_ref.borrow_mut().proc_macros.push(ca.id);
                     let ident = match ca.def_type {
                         ProcMacroDefType::Attr => attr,
                         ProcMacroDefType::Bang => bang,
diff --git a/src/librustc_builtin_macros/source_util.rs b/src/librustc_builtin_macros/source_util.rs
index dc85a92d27..5ad72a7443 100644
--- a/src/librustc_builtin_macros/source_util.rs
+++ b/src/librustc_builtin_macros/source_util.rs
@@ -1,14 +1,14 @@
+use rustc_ast::ast;
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::tokenstream::TokenStream;
+use rustc_ast_pretty::pprust;
 use rustc_expand::base::{self, *};
 use rustc_expand::panictry;
 use rustc_parse::{self, new_sub_parser_from_file, parser::Parser, DirectoryOwnership};
 use rustc_session::lint::builtin::INCOMPLETE_INCLUDE;
 use rustc_span::symbol::Symbol;
 use rustc_span::{self, Pos, Span};
-use syntax::ast;
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::token;
-use syntax::tokenstream::TokenStream;
 
 use smallvec::SmallVec;
 
diff --git a/src/librustc_builtin_macros/standard_library_imports.rs b/src/librustc_builtin_macros/standard_library_imports.rs
index 0c982b21ee..30403f6dc4 100644
--- a/src/librustc_builtin_macros/standard_library_imports.rs
+++ b/src/librustc_builtin_macros/standard_library_imports.rs
@@ -1,12 +1,12 @@
+use rustc_ast::ptr::P;
+use rustc_ast::{ast, attr};
 use rustc_expand::base::{ExtCtxt, Resolver};
 use rustc_expand::expand::ExpansionConfig;
+use rustc_session::parse::ParseSess;
 use rustc_span::edition::Edition;
 use rustc_span::hygiene::AstPass;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::DUMMY_SP;
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
-use syntax::{ast, attr};
 
 pub fn inject(
     mut krate: ast::Crate,
diff --git a/src/librustc_builtin_macros/test.rs b/src/librustc_builtin_macros/test.rs
index 07715cdbcb..bc194a3eec 100644
--- a/src/librustc_builtin_macros/test.rs
+++ b/src/librustc_builtin_macros/test.rs
@@ -2,13 +2,13 @@
 /// Ideally, this code would be in libtest but for efficiency and error messages it lives here.
 use crate::util::check_builtin_macro_attribute;
 
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast_pretty::pprust;
 use rustc_expand::base::*;
 use rustc_span::source_map::respan;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast;
-use syntax::attr;
-use syntax::print::pprust;
 
 use std::iter;
 
@@ -184,83 +184,88 @@ pub fn expand_test_or_bench(
         ],
         // const $ident: test::TestDescAndFn =
         ast::ItemKind::Const(
+            ast::Defaultness::Final,
             cx.ty(sp, ast::TyKind::Path(None, test_path("TestDescAndFn"))),
             // test::TestDescAndFn {
-            cx.expr_struct(
-                sp,
-                test_path("TestDescAndFn"),
-                vec![
-                    // desc: test::TestDesc {
-                    field(
-                        "desc",
-                        cx.expr_struct(
-                            sp,
-                            test_path("TestDesc"),
-                            vec![
-                                // name: "path::to::test"
-                                field(
-                                    "name",
-                                    cx.expr_call(
-                                        sp,
-                                        cx.expr_path(test_path("StaticTestName")),
-                                        vec![cx.expr_str(
-                                            sp,
-                                            Symbol::intern(&item_path(
-                                                // skip the name of the root module
-                                                &cx.current_expansion.module.mod_path[1..],
-                                                &item.ident,
-                                            )),
-                                        )],
-                                    ),
-                                ),
-                                // ignore: true | false
-                                field("ignore", cx.expr_bool(sp, should_ignore(&item))),
-                                // allow_fail: true | false
-                                field("allow_fail", cx.expr_bool(sp, should_fail(&item))),
-                                // should_panic: ...
-                                field(
-                                    "should_panic",
-                                    match should_panic(cx, &item) {
-                                        // test::ShouldPanic::No
-                                        ShouldPanic::No => cx.expr_path(should_panic_path("No")),
-                                        // test::ShouldPanic::Yes
-                                        ShouldPanic::Yes(None) => {
-                                            cx.expr_path(should_panic_path("Yes"))
-                                        }
-                                        // test::ShouldPanic::YesWithMessage("...")
-                                        ShouldPanic::Yes(Some(sym)) => cx.expr_call(
+            Some(
+                cx.expr_struct(
+                    sp,
+                    test_path("TestDescAndFn"),
+                    vec![
+                        // desc: test::TestDesc {
+                        field(
+                            "desc",
+                            cx.expr_struct(
+                                sp,
+                                test_path("TestDesc"),
+                                vec![
+                                    // name: "path::to::test"
+                                    field(
+                                        "name",
+                                        cx.expr_call(
                                             sp,
-                                            cx.expr_path(should_panic_path("YesWithMessage")),
-                                            vec![cx.expr_str(sp, sym)],
+                                            cx.expr_path(test_path("StaticTestName")),
+                                            vec![cx.expr_str(
+                                                sp,
+                                                Symbol::intern(&item_path(
+                                                    // skip the name of the root module
+                                                    &cx.current_expansion.module.mod_path[1..],
+                                                    &item.ident,
+                                                )),
+                                            )],
                                         ),
-                                    },
-                                ),
-                                // test_type: ...
-                                field(
-                                    "test_type",
-                                    match test_type(cx) {
-                                        // test::TestType::UnitTest
-                                        TestType::UnitTest => {
-                                            cx.expr_path(test_type_path("UnitTest"))
-                                        }
-                                        // test::TestType::IntegrationTest
-                                        TestType::IntegrationTest => {
-                                            cx.expr_path(test_type_path("IntegrationTest"))
-                                        }
-                                        // test::TestPath::Unknown
-                                        TestType::Unknown => {
-                                            cx.expr_path(test_type_path("Unknown"))
-                                        }
-                                    },
-                                ),
-                                // },
-                            ],
+                                    ),
+                                    // ignore: true | false
+                                    field("ignore", cx.expr_bool(sp, should_ignore(&item))),
+                                    // allow_fail: true | false
+                                    field("allow_fail", cx.expr_bool(sp, should_fail(&item))),
+                                    // should_panic: ...
+                                    field(
+                                        "should_panic",
+                                        match should_panic(cx, &item) {
+                                            // test::ShouldPanic::No
+                                            ShouldPanic::No => {
+                                                cx.expr_path(should_panic_path("No"))
+                                            }
+                                            // test::ShouldPanic::Yes
+                                            ShouldPanic::Yes(None) => {
+                                                cx.expr_path(should_panic_path("Yes"))
+                                            }
+                                            // test::ShouldPanic::YesWithMessage("...")
+                                            ShouldPanic::Yes(Some(sym)) => cx.expr_call(
+                                                sp,
+                                                cx.expr_path(should_panic_path("YesWithMessage")),
+                                                vec![cx.expr_str(sp, sym)],
+                                            ),
+                                        },
+                                    ),
+                                    // test_type: ...
+                                    field(
+                                        "test_type",
+                                        match test_type(cx) {
+                                            // test::TestType::UnitTest
+                                            TestType::UnitTest => {
+                                                cx.expr_path(test_type_path("UnitTest"))
+                                            }
+                                            // test::TestType::IntegrationTest
+                                            TestType::IntegrationTest => {
+                                                cx.expr_path(test_type_path("IntegrationTest"))
+                                            }
+                                            // test::TestPath::Unknown
+                                            TestType::Unknown => {
+                                                cx.expr_path(test_type_path("Unknown"))
+                                            }
+                                        },
+                                    ),
+                                    // },
+                                ],
+                            ),
                         ),
-                    ),
-                    // testfn: test::StaticTestFn(...) | test::StaticBenchFn(...)
-                    field("testfn", test_fn), // }
-                ],
-            ), // }
+                        // testfn: test::StaticTestFn(...) | test::StaticBenchFn(...)
+                        field("testfn", test_fn), // }
+                    ],
+                ), // }
+            ),
         ),
     );
     test_const = test_const.map(|mut tc| {
@@ -308,7 +313,7 @@ fn should_fail(i: &ast::Item) -> bool {
 fn should_panic(cx: &ExtCtxt<'_>, i: &ast::Item) -> ShouldPanic {
     match attr::find_by_name(&i.attrs, sym::should_panic) {
         Some(attr) => {
-            let ref sd = cx.parse_sess.span_diagnostic;
+            let sd = &cx.parse_sess.span_diagnostic;
 
             match attr.meta_item_list() {
                 // Handle #[should_panic(expected = "foo")]
@@ -373,22 +378,26 @@ fn test_type(cx: &ExtCtxt<'_>) -> TestType {
 
 fn has_test_signature(cx: &ExtCtxt<'_>, i: &ast::Item) -> bool {
     let has_should_panic_attr = attr::contains_name(&i.attrs, sym::should_panic);
-    let ref sd = cx.parse_sess.span_diagnostic;
-    if let ast::ItemKind::Fn(ref sig, ref generics, _) = i.kind {
-        if sig.header.unsafety == ast::Unsafety::Unsafe {
-            sd.span_err(i.span, "unsafe functions cannot be used for tests");
+    let sd = &cx.parse_sess.span_diagnostic;
+    if let ast::ItemKind::Fn(_, ref sig, ref generics, _) = i.kind {
+        if let ast::Unsafe::Yes(span) = sig.header.unsafety {
+            sd.struct_span_err(i.span, "unsafe functions cannot be used for tests")
+                .span_label(span, "`unsafe` because of this")
+                .emit();
             return false;
         }
-        if sig.header.asyncness.node.is_async() {
-            sd.span_err(i.span, "async functions cannot be used for tests");
+        if let ast::Async::Yes { span, .. } = sig.header.asyncness {
+            sd.struct_span_err(i.span, "async functions cannot be used for tests")
+                .span_label(span, "`async` because of this")
+                .emit();
             return false;
         }
 
         // If the termination trait is active, the compiler will check that the output
         // type implements the `Termination` trait as `libtest` enforces that.
         let has_output = match sig.decl.output {
-            ast::FunctionRetTy::Default(..) => false,
-            ast::FunctionRetTy::Ty(ref t) if t.kind.is_unit() => false,
+            ast::FnRetTy::Default(..) => false,
+            ast::FnRetTy::Ty(ref t) if t.kind.is_unit() => false,
             _ => true,
         };
 
@@ -419,7 +428,7 @@ fn has_test_signature(cx: &ExtCtxt<'_>, i: &ast::Item) -> bool {
 }
 
 fn has_bench_signature(cx: &ExtCtxt<'_>, i: &ast::Item) -> bool {
-    let has_sig = if let ast::ItemKind::Fn(ref sig, _, _) = i.kind {
+    let has_sig = if let ast::ItemKind::Fn(_, ref sig, _, _) = i.kind {
         // N.B., inadequate check, but we're running
         // well before resolve, can't get too deep.
         sig.decl.inputs.len() == 1
diff --git a/src/librustc_builtin_macros/test_harness.rs b/src/librustc_builtin_macros/test_harness.rs
index 17d180da6b..e7e1ad8eda 100644
--- a/src/librustc_builtin_macros/test_harness.rs
+++ b/src/librustc_builtin_macros/test_harness.rs
@@ -1,21 +1,21 @@
 // Code that generates a test runner to run all the tests in a crate
 
 use log::debug;
+use rustc_ast::ast::{self, Ident};
+use rustc_ast::attr;
+use rustc_ast::entry::{self, EntryPointType};
+use rustc_ast::mut_visit::{ExpectOne, *};
+use rustc_ast::ptr::P;
 use rustc_expand::base::{ExtCtxt, Resolver};
 use rustc_expand::expand::{AstFragment, ExpansionConfig};
 use rustc_feature::Features;
+use rustc_session::parse::ParseSess;
 use rustc_span::hygiene::{AstPass, SyntaxContext, Transparency};
 use rustc_span::source_map::respan;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::PanicStrategy;
 use smallvec::{smallvec, SmallVec};
-use syntax::ast::{self, Ident};
-use syntax::attr;
-use syntax::entry::{self, EntryPointType};
-use syntax::mut_visit::{ExpectOne, *};
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
 
 use std::{iter, mem};
 
@@ -170,22 +170,13 @@ impl MutVisitor for EntryPointCleaner {
                     ));
                     let allow_dead_code_item = attr::mk_list_item(allow_ident, vec![dc_nested]);
                     let allow_dead_code = attr::mk_attr_outer(allow_dead_code_item);
+                    let attrs = attrs
+                        .into_iter()
+                        .filter(|attr| !attr.check_name(sym::main) && !attr.check_name(sym::start))
+                        .chain(iter::once(allow_dead_code))
+                        .collect();
 
-                    ast::Item {
-                        id,
-                        ident,
-                        attrs: attrs
-                            .into_iter()
-                            .filter(|attr| {
-                                !attr.check_name(sym::main) && !attr.check_name(sym::start)
-                            })
-                            .chain(iter::once(allow_dead_code))
-                            .collect(),
-                        kind,
-                        vis,
-                        span,
-                        tokens,
-                    }
+                    ast::Item { id, ident, attrs, kind, vis, span, tokens }
                 }),
             EntryPointType::None | EntryPointType::OtherMain => item,
         };
@@ -305,9 +296,10 @@ fn mk_main(cx: &mut TestCtxt<'_>) -> P<ast::Item> {
         ecx.block(sp, vec![call_test_main])
     };
 
-    let decl = ecx.fn_decl(vec![], ast::FunctionRetTy::Ty(main_ret_ty));
+    let decl = ecx.fn_decl(vec![], ast::FnRetTy::Ty(main_ret_ty));
     let sig = ast::FnSig { decl, header: ast::FnHeader::default() };
-    let main = ast::ItemKind::Fn(sig, ast::Generics::default(), main_body);
+    let def = ast::Defaultness::Final;
+    let main = ast::ItemKind::Fn(def, sig, ast::Generics::default(), Some(main_body));
 
     // Honor the reexport_test_harness_main attribute
     let main_id = match cx.reexport_test_harness_main {
@@ -334,7 +326,7 @@ fn mk_main(cx: &mut TestCtxt<'_>) -> P<ast::Item> {
 /// &[&test1, &test2]
 fn mk_tests_slice(cx: &TestCtxt<'_>, sp: Span) -> P<ast::Expr> {
     debug!("building test vector from {} tests", cx.test_cases.len());
-    let ref ecx = cx.ext_cx;
+    let ecx = &cx.ext_cx;
 
     ecx.expr_vec_slice(
         sp,
diff --git a/src/librustc_builtin_macros/trace_macros.rs b/src/librustc_builtin_macros/trace_macros.rs
index c0b373f137..c17f2afe49 100644
--- a/src/librustc_builtin_macros/trace_macros.rs
+++ b/src/librustc_builtin_macros/trace_macros.rs
@@ -1,7 +1,7 @@
+use rustc_ast::tokenstream::{TokenStream, TokenTree};
 use rustc_expand::base::{self, ExtCtxt};
 use rustc_span::symbol::kw;
 use rustc_span::Span;
-use syntax::tokenstream::{TokenStream, TokenTree};
 
 pub fn expand_trace_macros(
     cx: &mut ExtCtxt<'_>,
diff --git a/src/librustc_builtin_macros/util.rs b/src/librustc_builtin_macros/util.rs
index b7d1a5d1d7..8ef76a8657 100644
--- a/src/librustc_builtin_macros/util.rs
+++ b/src/librustc_builtin_macros/util.rs
@@ -1,8 +1,8 @@
+use rustc_ast::ast::MetaItem;
 use rustc_expand::base::ExtCtxt;
 use rustc_feature::AttributeTemplate;
 use rustc_parse::validate_attr;
 use rustc_span::Symbol;
-use syntax::ast::MetaItem;
 
 pub fn check_builtin_macro_attribute(ecx: &ExtCtxt<'_>, meta_item: &MetaItem, name: Symbol) {
     // All the built-in macro attributes are "words" at the moment.
diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml
index dd9eadde09..0776cb1976 100644
--- a/src/librustc_codegen_llvm/Cargo.toml
+++ b/src/librustc_codegen_llvm/Cargo.toml
@@ -14,9 +14,11 @@ doctest = false
 bitflags = "1.0"
 flate2 = "1.0"
 libc = "0.2"
+measureme = "0.7.1"
 log = "0.4"
 rustc = { path = "../librustc" }
 rustc-demangle = "0.1"
+rustc_attr = { path = "../librustc_attr" }
 rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_data_structures = { path = "../librustc_data_structures" }
@@ -31,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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_codegen_llvm/abi.rs b/src/librustc_codegen_llvm/abi.rs
index c79d9f77e6..470a2bb8e1 100644
--- a/src/librustc_codegen_llvm/abi.rs
+++ b/src/librustc_codegen_llvm/abi.rs
@@ -148,7 +148,7 @@ impl LlvmType for CastTarget {
             .prefix
             .iter()
             .flat_map(|option_kind| {
-                option_kind.map(|kind| Reg { kind: kind, size: self.prefix_chunk }.llvm_type(cx))
+                option_kind.map(|kind| Reg { kind, size: self.prefix_chunk }.llvm_type(cx))
             })
             .chain((0..rest_count).map(|_| rest_ll_unit))
             .collect();
diff --git a/src/librustc_codegen_llvm/allocator.rs b/src/librustc_codegen_llvm/allocator.rs
index 6dcf49f23f..821377db0e 100644
--- a/src/librustc_codegen_llvm/allocator.rs
+++ b/src/librustc_codegen_llvm/allocator.rs
@@ -4,7 +4,7 @@ use crate::attributes;
 use libc::c_uint;
 use rustc::bug;
 use rustc::ty::TyCtxt;
-use syntax::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
+use rustc_ast::expand::allocator::{AllocatorKind, AllocatorTy, ALLOCATOR_METHODS};
 
 use crate::llvm::{self, False, True};
 use crate::ModuleLlvm;
diff --git a/src/librustc_codegen_llvm/asm.rs b/src/librustc_codegen_llvm/asm.rs
index e816bdeb1c..7975a70ab2 100644
--- a/src/librustc_codegen_llvm/asm.rs
+++ b/src/librustc_codegen_llvm/asm.rs
@@ -29,11 +29,17 @@ impl AsmBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
         let mut indirect_outputs = vec![];
         for (i, (out, &place)) in ia.outputs.iter().zip(&outputs).enumerate() {
             if out.is_rw {
-                inputs.push(self.load_operand(place).immediate());
+                let operand = self.load_operand(place);
+                if let OperandValue::Immediate(_) = operand.val {
+                    inputs.push(operand.immediate());
+                }
                 ext_constraints.push(i.to_string());
             }
             if out.is_indirect {
-                indirect_outputs.push(self.load_operand(place).immediate());
+                let operand = self.load_operand(place);
+                if let OperandValue::Immediate(_) = operand.val {
+                    indirect_outputs.push(operand.immediate());
+                }
             } else {
                 output_types.push(place.layout.llvm_type(self.cx()));
             }
@@ -60,7 +66,7 @@ impl AsmBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
             .chain(ia.inputs.iter().map(|s| s.to_string()))
             .chain(ext_constraints)
             .chain(clobbers)
-            .chain(arch_clobbers.iter().map(|s| s.to_string()))
+            .chain(arch_clobbers.iter().map(|s| (*s).to_string()))
             .collect::<Vec<String>>()
             .join(",");
 
@@ -134,7 +140,7 @@ fn inline_asm_call(
     output: &'ll llvm::Type,
     volatile: bool,
     alignstack: bool,
-    dia: ::syntax::ast::AsmDialect,
+    dia: ::rustc_ast::ast::AsmDialect,
 ) -> Option<&'ll Value> {
     let volatile = if volatile { llvm::True } else { llvm::False };
     let alignstack = if alignstack { llvm::True } else { llvm::False };
diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs
index fc1b365cf9..a9e4fdba03 100644
--- a/src/librustc_codegen_llvm/attributes.rs
+++ b/src/librustc_codegen_llvm/attributes.rs
@@ -21,7 +21,7 @@ use crate::attributes;
 use crate::llvm::AttributePlace::Function;
 use crate::llvm::{self, Attribute};
 use crate::llvm_util;
-pub use syntax::attr::{self, InlineAttr, OptimizeAttr};
+pub use rustc_attr::{self as attr, InlineAttr, OptimizeAttr};
 
 use crate::context::CodegenCx;
 use crate::value::Value;
@@ -46,6 +46,31 @@ fn inline(cx: &CodegenCx<'ll, '_>, val: &'ll Value, inline: InlineAttr) {
     };
 }
 
+/// Apply LLVM sanitize attributes.
+#[inline]
+pub fn sanitize(cx: &CodegenCx<'ll, '_>, codegen_fn_flags: CodegenFnAttrFlags, llfn: &'ll Value) {
+    if let Some(ref sanitizer) = cx.tcx.sess.opts.debugging_opts.sanitizer {
+        match *sanitizer {
+            Sanitizer::Address => {
+                if !codegen_fn_flags.contains(CodegenFnAttrFlags::NO_SANITIZE_ADDRESS) {
+                    llvm::Attribute::SanitizeAddress.apply_llfn(Function, llfn);
+                }
+            }
+            Sanitizer::Memory => {
+                if !codegen_fn_flags.contains(CodegenFnAttrFlags::NO_SANITIZE_MEMORY) {
+                    llvm::Attribute::SanitizeMemory.apply_llfn(Function, llfn);
+                }
+            }
+            Sanitizer::Thread => {
+                if !codegen_fn_flags.contains(CodegenFnAttrFlags::NO_SANITIZE_THREAD) {
+                    llvm::Attribute::SanitizeThread.apply_llfn(Function, llfn);
+                }
+            }
+            Sanitizer::Leak => {}
+        }
+    }
+}
+
 /// Tell LLVM to emit or not emit the information necessary to unwind the stack for the function.
 #[inline]
 pub fn emit_uwtable(val: &'ll Value, emit: bool) {
@@ -288,6 +313,7 @@ pub fn from_fn_attrs(
     if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::ALLOCATOR) {
         Attribute::NoAlias.apply_llfn(llvm::AttributePlace::ReturnValue, llfn);
     }
+    sanitize(cx, codegen_fn_attrs.flags, llfn);
 
     unwind(
         llfn,
diff --git a/src/librustc_codegen_llvm/back/lto.rs b/src/librustc_codegen_llvm/back/lto.rs
index b5895b5369..ee56d0e26c 100644
--- a/src/librustc_codegen_llvm/back/lto.rs
+++ b/src/librustc_codegen_llvm/back/lto.rs
@@ -110,23 +110,21 @@ fn prepare_lto(
                 symbol_white_list.extend(exported_symbols[&cnum].iter().filter_map(symbol_filter));
             }
 
-            let _timer = cgcx.prof.generic_activity("LLVM_lto_load_upstream_bitcode");
             let archive = ArchiveRO::open(&path).expect("wanted an rlib");
             let bytecodes = archive
                 .iter()
                 .filter_map(|child| child.ok().and_then(|c| c.name().map(|name| (name, c))))
                 .filter(|&(name, _)| name.ends_with(RLIB_BYTECODE_EXTENSION));
             for (name, data) in bytecodes {
+                let _timer =
+                    cgcx.prof.generic_activity_with_arg("LLVM_lto_load_upstream_bitcode", name);
                 info!("adding bytecode {}", name);
                 let bc_encoded = data.data();
 
-                let (bc, id) = cgcx
-                    .prof
-                    .extra_verbose_generic_activity(&format!("decode {}", name))
-                    .run(|| match DecodedBytecode::new(bc_encoded) {
-                        Ok(b) => Ok((b.bytecode(), b.identifier().to_string())),
-                        Err(e) => Err(diag_handler.fatal(&e)),
-                    })?;
+                let (bc, id) = match DecodedBytecode::new(bc_encoded) {
+                    Ok(b) => Ok((b.bytecode(), b.identifier().to_string())),
+                    Err(e) => Err(diag_handler.fatal(&e)),
+                }?;
                 let bc = SerializedModule::FromRlib(bc);
                 upstream_modules.push((bc, CString::new(id).unwrap()));
             }
@@ -239,7 +237,7 @@ fn fat_lto(
     let module: ModuleCodegen<ModuleLlvm> = match costliest_module {
         Some((_cost, i)) => in_memory.remove(i),
         None => {
-            assert!(serialized_modules.len() > 0, "must have at least one serialized module");
+            assert!(!serialized_modules.is_empty(), "must have at least one serialized module");
             let (buffer, name) = serialized_modules.remove(0);
             info!("no in-memory regular modules to choose from, parsing {:?}", name);
             ModuleCodegen {
@@ -281,14 +279,14 @@ fn fat_lto(
         // save and persist everything with the original module.
         let mut linker = Linker::new(llmod);
         for (bc_decoded, name) in serialized_modules {
-            let _timer = cgcx.prof.generic_activity("LLVM_fat_lto_link_module");
+            let _timer = cgcx
+                .prof
+                .generic_activity_with_arg("LLVM_fat_lto_link_module", format!("{:?}", name));
             info!("linking {:?}", name);
-            cgcx.prof.extra_verbose_generic_activity(&format!("ll link {:?}", name)).run(|| {
-                let data = bc_decoded.data();
-                linker.add(&data).map_err(|()| {
-                    let msg = format!("failed to load bc of {:?}", name);
-                    write::llvm_err(&diag_handler, &msg)
-                })
+            let data = bc_decoded.data();
+            linker.add(&data).map_err(|()| {
+                let msg = format!("failed to load bc of {:?}", name);
+                write::llvm_err(&diag_handler, &msg)
             })?;
             serialized_bitcode.push(bc_decoded);
         }
@@ -465,15 +463,18 @@ fn thin_lto(
                 // If previous imports have been deleted, or we get an IO error
                 // reading the file storing them, then we'll just use `None` as the
                 // prev_import_map, which will force the code to be recompiled.
-                let prev =
-                    if path.exists() { ThinLTOImports::load_from_file(&path).ok() } else { None };
-                let curr = ThinLTOImports::from_thin_lto_data(data);
+                let prev = if path.exists() {
+                    ThinLTOImportMaps::load_from_file(&path).ok()
+                } else {
+                    None
+                };
+                let curr = ThinLTOImportMaps::from_thin_lto_data(data);
                 (Some(path), prev, curr)
             } else {
                 // If we don't compile incrementally, we don't need to load the
                 // import data from LLVM.
                 assert!(green_modules.is_empty());
-                let curr = ThinLTOImports::default();
+                let curr = ThinLTOImportMaps::default();
                 (None, None, curr)
             };
         info!("thin LTO import map loaded");
@@ -499,31 +500,58 @@ fn thin_lto(
             let module_name = module_name_to_str(module_name);
 
             // If (1.) the module hasn't changed, and (2.) none of the modules
-            // it imports from has changed, *and* (3.) the import-set itself has
-            // not changed from the previous compile when it was last
-            // ThinLTO'ed, then we can re-use the post-ThinLTO version of the
-            // module. Otherwise, freshly perform LTO optimization.
+            // it imports from have changed, *and* (3.) the import and export
+            // sets themselves have not changed from the previous compile when
+            // it was last ThinLTO'ed, then we can re-use the post-ThinLTO
+            // version of the module. Otherwise, freshly perform LTO
+            // optimization.
+            //
+            // (Note that globally, the export set is just the inverse of the
+            // import set.)
+            //
+            // For further justification of why the above is necessary and sufficient,
+            // see the LLVM blog post on ThinLTO:
+            //
+            // http://blog.llvm.org/2016/06/thinlto-scalable-and-incremental-lto.html
+            //
+            // which states the following:
+            //
+            // ```quote
+            // any particular ThinLTO backend must be redone iff:
+            //
+            // 1. The corresponding (primary) module’s bitcode changed
+            // 2. The list of imports into or exports from the module changed
+            // 3. The bitcode for any module being imported from has changed
+            // 4. Any global analysis result affecting either the primary module
+            //    or anything it imports has changed.
+            // ```
             //
             // This strategy means we can always save the computed imports as
             // canon: when we reuse the post-ThinLTO version, condition (3.)
-            // ensures that the curent import set is the same as the previous
+            // ensures that the current import set is the same as the previous
             // one. (And of course, when we don't reuse the post-ThinLTO
             // version, the current import set *is* the correct one, since we
             // are doing the ThinLTO in this current compilation cycle.)
             //
-            // See rust-lang/rust#59535.
+            // For more discussion, see rust-lang/rust#59535 (where the import
+            // issue was discovered) and rust-lang/rust#69798 (where the
+            // analogous export issue was discovered).
             if let (Some(prev_import_map), true) =
                 (prev_import_map.as_ref(), green_modules.contains_key(module_name))
             {
                 assert!(cgcx.incr_comp_session_dir.is_some());
 
-                let prev_imports = prev_import_map.modules_imported_by(module_name);
-                let curr_imports = curr_import_map.modules_imported_by(module_name);
+                let prev_imports = prev_import_map.imports_of(module_name);
+                let curr_imports = curr_import_map.imports_of(module_name);
+                let prev_exports = prev_import_map.exports_of(module_name);
+                let curr_exports = curr_import_map.exports_of(module_name);
                 let imports_all_green = curr_imports
                     .iter()
                     .all(|imported_module| green_modules.contains_key(imported_module));
-
-                if imports_all_green && equivalent_as_sets(prev_imports, curr_imports) {
+                if imports_all_green
+                    && equivalent_as_sets(prev_imports, curr_imports)
+                    && equivalent_as_sets(prev_exports, curr_exports)
+                {
                     let work_product = green_modules[module_name].clone();
                     copy_jobs.push(work_product);
                     info!(" - {}: re-used", module_name);
@@ -540,7 +568,7 @@ fn thin_lto(
             }));
         }
 
-        // Save the curent ThinLTO import information for the next compilation
+        // Save the current ThinLTO import information for the next compilation
         // session, overwriting the previous serialized imports (if any).
         if let Some(path) = import_map_path {
             if let Err(err) = curr_import_map.save_to_file(&path) {
@@ -577,6 +605,8 @@ pub(crate) fn run_pass_manager(
     config: &ModuleConfig,
     thin: bool,
 ) {
+    let _timer = cgcx.prof.extra_verbose_generic_activity("LLVM_lto_optimize", &module.name[..]);
+
     // Now we have one massive module inside of llmod. Time to run the
     // LTO-specific optimization passes that LLVM provides.
     //
@@ -584,6 +614,20 @@ pub(crate) fn run_pass_manager(
     //      tools/lto/LTOCodeGenerator.cpp
     debug!("running the pass manager");
     unsafe {
+        if write::should_use_new_llvm_pass_manager(config) {
+            let opt_stage = if thin { llvm::OptStage::ThinLTO } else { llvm::OptStage::FatLTO };
+            let opt_level = config.opt_level.unwrap_or(config::OptLevel::No);
+            // See comment below for why this is necessary.
+            let opt_level = if let config::OptLevel::No = opt_level {
+                config::OptLevel::Less
+            } else {
+                opt_level
+            };
+            write::optimize_with_new_llvm_pass_manager(cgcx, module, config, opt_level, opt_stage);
+            debug!("lto done");
+            return;
+        }
+
         let pm = llvm::LLVMCreatePassManager();
         llvm::LLVMAddAnalysisPasses(module.module_llvm.tm, pm);
 
@@ -634,9 +678,7 @@ pub(crate) fn run_pass_manager(
             llvm::LLVMRustAddPass(pm, pass.unwrap());
         }
 
-        cgcx.prof
-            .extra_verbose_generic_activity("LTO_passes")
-            .run(|| llvm::LLVMRunPassManager(pm, module.module_llvm.llmod()));
+        llvm::LLVMRunPassManager(pm, module.module_llvm.llmod());
 
         llvm::LLVMDisposePassManager(pm);
     }
@@ -760,7 +802,9 @@ pub unsafe fn optimize_thin_module(
         // Like with "fat" LTO, get some better optimizations if landing pads
         // are disabled by removing all landing pads.
         if cgcx.no_landing_pads {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_remove_landing_pads");
+            let _timer = cgcx
+                .prof
+                .generic_activity_with_arg("LLVM_thin_lto_remove_landing_pads", thin_module.name());
             llvm::LLVMRustMarkAllFunctionsNounwind(llmod);
             save_temp_bitcode(&cgcx, &module, "thin-lto-after-nounwind");
         }
@@ -774,7 +818,8 @@ pub unsafe fn optimize_thin_module(
         // You can find some more comments about these functions in the LLVM
         // bindings we've got (currently `PassWrapper.cpp`)
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_rename");
+            let _timer =
+                cgcx.prof.generic_activity_with_arg("LLVM_thin_lto_rename", thin_module.name());
             if !llvm::LLVMRustPrepareThinLTORename(thin_module.shared.data.0, llmod) {
                 let msg = "failed to prepare thin LTO module";
                 return Err(write::llvm_err(&diag_handler, msg));
@@ -783,7 +828,9 @@ pub unsafe fn optimize_thin_module(
         }
 
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_resolve_weak");
+            let _timer = cgcx
+                .prof
+                .generic_activity_with_arg("LLVM_thin_lto_resolve_weak", thin_module.name());
             if !llvm::LLVMRustPrepareThinLTOResolveWeak(thin_module.shared.data.0, llmod) {
                 let msg = "failed to prepare thin LTO module";
                 return Err(write::llvm_err(&diag_handler, msg));
@@ -792,7 +839,9 @@ pub unsafe fn optimize_thin_module(
         }
 
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_internalize");
+            let _timer = cgcx
+                .prof
+                .generic_activity_with_arg("LLVM_thin_lto_internalize", thin_module.name());
             if !llvm::LLVMRustPrepareThinLTOInternalize(thin_module.shared.data.0, llmod) {
                 let msg = "failed to prepare thin LTO module";
                 return Err(write::llvm_err(&diag_handler, msg));
@@ -801,7 +850,8 @@ pub unsafe fn optimize_thin_module(
         }
 
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_import");
+            let _timer =
+                cgcx.prof.generic_activity_with_arg("LLVM_thin_lto_import", thin_module.name());
             if !llvm::LLVMRustPrepareThinLTOImport(thin_module.shared.data.0, llmod) {
                 let msg = "failed to prepare thin LTO module";
                 return Err(write::llvm_err(&diag_handler, msg));
@@ -839,7 +889,9 @@ pub unsafe fn optimize_thin_module(
         // so it appears). Hopefully we can remove this once upstream bugs are
         // fixed in LLVM.
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_patch_debuginfo");
+            let _timer = cgcx
+                .prof
+                .generic_activity_with_arg("LLVM_thin_lto_patch_debuginfo", thin_module.name());
             llvm::LLVMRustThinLTOPatchDICompileUnit(llmod, cu1);
             save_temp_bitcode(cgcx, &module, "thin-lto-after-patch");
         }
@@ -850,7 +902,6 @@ pub unsafe fn optimize_thin_module(
         // populate a thin-specific pass manager, which presumably LLVM treats a
         // little differently.
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_thin_lto_optimize");
             info!("running thin lto passes over {}", module.name);
             let config = cgcx.config(module.kind);
             run_pass_manager(cgcx, &module, config, true);
@@ -860,17 +911,32 @@ pub unsafe fn optimize_thin_module(
     Ok(module)
 }
 
+/// Summarizes module import/export relationships used by LLVM's ThinLTO pass.
+///
+/// Note that we tend to have two such instances of `ThinLTOImportMaps` in use:
+/// one loaded from a file that represents the relationships used during the
+/// compilation associated with the incremetnal build artifacts we are
+/// attempting to reuse, and another constructed via `from_thin_lto_data`, which
+/// captures the relationships of ThinLTO in the current compilation.
 #[derive(Debug, Default)]
-pub struct ThinLTOImports {
+pub struct ThinLTOImportMaps {
     // key = llvm name of importing module, value = list of modules it imports from
     imports: FxHashMap<String, Vec<String>>,
+    // key = llvm name of exporting module, value = list of modules it exports to
+    exports: FxHashMap<String, Vec<String>>,
 }
 
-impl ThinLTOImports {
-    fn modules_imported_by(&self, llvm_module_name: &str) -> &[String] {
+impl ThinLTOImportMaps {
+    /// Returns modules imported by `llvm_module_name` during some ThinLTO pass.
+    fn imports_of(&self, llvm_module_name: &str) -> &[String] {
         self.imports.get(llvm_module_name).map(|v| &v[..]).unwrap_or(&[])
     }
 
+    /// Returns modules exported by `llvm_module_name` during some ThinLTO pass.
+    fn exports_of(&self, llvm_module_name: &str) -> &[String] {
+        self.exports.get(llvm_module_name).map(|v| &v[..]).unwrap_or(&[])
+    }
+
     fn save_to_file(&self, path: &Path) -> io::Result<()> {
         use std::io::Write;
         let file = File::create(path)?;
@@ -885,18 +951,22 @@ impl ThinLTOImports {
         Ok(())
     }
 
-    fn load_from_file(path: &Path) -> io::Result<ThinLTOImports> {
+    fn load_from_file(path: &Path) -> io::Result<ThinLTOImportMaps> {
         use std::io::BufRead;
         let mut imports = FxHashMap::default();
-        let mut current_module = None;
-        let mut current_imports = vec![];
+        let mut exports: FxHashMap<_, Vec<_>> = FxHashMap::default();
+        let mut current_module: Option<String> = None;
+        let mut current_imports: Vec<String> = vec![];
         let file = File::open(path)?;
         for line in io::BufReader::new(file).lines() {
             let line = line?;
             if line.is_empty() {
                 let importing_module = current_module.take().expect("Importing module not set");
+                for imported in &current_imports {
+                    exports.entry(imported.clone()).or_default().push(importing_module.clone());
+                }
                 imports.insert(importing_module, mem::replace(&mut current_imports, vec![]));
-            } else if line.starts_with(" ") {
+            } else if line.starts_with(' ') {
                 // Space marks an imported module
                 assert_ne!(current_module, None);
                 current_imports.push(line.trim().to_string());
@@ -906,17 +976,17 @@ impl ThinLTOImports {
                 current_module = Some(line.trim().to_string());
             }
         }
-        Ok(ThinLTOImports { imports })
+        Ok(ThinLTOImportMaps { imports, exports })
     }
 
     /// Loads the ThinLTO import map from ThinLTOData.
-    unsafe fn from_thin_lto_data(data: *const llvm::ThinLTOData) -> ThinLTOImports {
+    unsafe fn from_thin_lto_data(data: *const llvm::ThinLTOData) -> ThinLTOImportMaps {
         unsafe extern "C" fn imported_module_callback(
             payload: *mut libc::c_void,
             importing_module_name: *const libc::c_char,
             imported_module_name: *const libc::c_char,
         ) {
-            let map = &mut *(payload as *mut ThinLTOImports);
+            let map = &mut *(payload as *mut ThinLTOImportMaps);
             let importing_module_name = CStr::from_ptr(importing_module_name);
             let importing_module_name = module_name_to_str(&importing_module_name);
             let imported_module_name = CStr::from_ptr(imported_module_name);
@@ -930,8 +1000,18 @@ impl ThinLTOImports {
                 .get_mut(importing_module_name)
                 .unwrap()
                 .push(imported_module_name.to_owned());
+
+            if !map.exports.contains_key(imported_module_name) {
+                map.exports.insert(imported_module_name.to_owned(), vec![]);
+            }
+
+            map.exports
+                .get_mut(imported_module_name)
+                .unwrap()
+                .push(importing_module_name.to_owned());
         }
-        let mut map = ThinLTOImports::default();
+
+        let mut map = ThinLTOImportMaps::default();
         llvm::LLVMRustGetThinLTOModuleImports(
             data,
             imported_module_callback,
diff --git a/src/librustc_codegen_llvm/back/profiling.rs b/src/librustc_codegen_llvm/back/profiling.rs
new file mode 100644
index 0000000000..2741f7d848
--- /dev/null
+++ b/src/librustc_codegen_llvm/back/profiling.rs
@@ -0,0 +1,58 @@
+use measureme::{event_id::SEPARATOR_BYTE, EventId, StringComponent, StringId};
+use rustc_data_structures::profiling::{SelfProfiler, TimingGuard};
+use std::ffi::{c_void, CStr};
+use std::os::raw::c_char;
+use std::sync::Arc;
+
+fn llvm_args_to_string_id(profiler: &SelfProfiler, pass_name: &str, ir_name: &str) -> EventId {
+    let pass_name = profiler.get_or_alloc_cached_string(pass_name);
+    let mut components = vec![StringComponent::Ref(pass_name)];
+    // handle that LazyCallGraph::SCC is a comma separated list within parentheses
+    let parentheses: &[_] = &['(', ')'];
+    let trimmed = ir_name.trim_matches(parentheses);
+    for part in trimmed.split(", ") {
+        let demangled_ir_name = rustc_demangle::demangle(part).to_string();
+        let ir_name = profiler.get_or_alloc_cached_string(demangled_ir_name);
+        components.push(StringComponent::Value(SEPARATOR_BYTE));
+        components.push(StringComponent::Ref(ir_name));
+    }
+    EventId::from_label(profiler.alloc_string(components.as_slice()))
+}
+
+pub struct LlvmSelfProfiler<'a> {
+    profiler: Arc<SelfProfiler>,
+    stack: Vec<TimingGuard<'a>>,
+    llvm_pass_event_kind: StringId,
+}
+
+impl<'a> LlvmSelfProfiler<'a> {
+    pub fn new(profiler: Arc<SelfProfiler>) -> Self {
+        let llvm_pass_event_kind = profiler.alloc_string("LLVM Pass");
+        Self { profiler, stack: Vec::default(), llvm_pass_event_kind }
+    }
+
+    fn before_pass_callback(&'a mut self, pass_name: &str, ir_name: &str) {
+        let event_id = llvm_args_to_string_id(&self.profiler, pass_name, ir_name);
+
+        self.stack.push(TimingGuard::start(&self.profiler, self.llvm_pass_event_kind, event_id));
+    }
+    fn after_pass_callback(&mut self) {
+        self.stack.pop();
+    }
+}
+
+pub unsafe extern "C" fn selfprofile_before_pass_callback(
+    llvm_self_profiler: *mut c_void,
+    pass_name: *const c_char,
+    ir_name: *const c_char,
+) {
+    let llvm_self_profiler = &mut *(llvm_self_profiler as *mut LlvmSelfProfiler<'_>);
+    let pass_name = CStr::from_ptr(pass_name).to_str().expect("valid UTF-8");
+    let ir_name = CStr::from_ptr(ir_name).to_str().expect("valid UTF-8");
+    llvm_self_profiler.before_pass_callback(pass_name, ir_name);
+}
+
+pub unsafe extern "C" fn selfprofile_after_pass_callback(llvm_self_profiler: *mut c_void) {
+    let llvm_self_profiler = &mut *(llvm_self_profiler as *mut LlvmSelfProfiler<'_>);
+    llvm_self_profiler.after_pass_callback();
+}
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs
index 4be7b84660..0c24312810 100644
--- a/src/librustc_codegen_llvm/back/write.rs
+++ b/src/librustc_codegen_llvm/back/write.rs
@@ -1,6 +1,9 @@
 use crate::attributes;
 use crate::back::bytecode;
 use crate::back::lto::ThinBuffer;
+use crate::back::profiling::{
+    selfprofile_after_pass_callback, selfprofile_before_pass_callback, LlvmSelfProfiler,
+};
 use crate::base;
 use crate::common;
 use crate::consts;
@@ -111,6 +114,18 @@ pub fn to_llvm_opt_settings(
     }
 }
 
+fn to_pass_builder_opt_level(cfg: config::OptLevel) -> llvm::PassBuilderOptLevel {
+    use config::OptLevel::*;
+    match cfg {
+        No => llvm::PassBuilderOptLevel::O0,
+        Less => llvm::PassBuilderOptLevel::O1,
+        Default => llvm::PassBuilderOptLevel::O2,
+        Aggressive => llvm::PassBuilderOptLevel::O3,
+        Size => llvm::PassBuilderOptLevel::Os,
+        SizeMin => llvm::PassBuilderOptLevel::Oz,
+    }
+}
+
 // If find_features is true this won't access `sess.crate_types` by assuming
 // that `is_pie_binary` is false. When we discover LLVM target features
 // `sess.crate_types` is uninitialized so we cannot access it.
@@ -303,6 +318,99 @@ unsafe extern "C" fn diagnostic_handler(info: &DiagnosticInfo, user: *mut c_void
     }
 }
 
+fn get_pgo_gen_path(config: &ModuleConfig) -> Option<CString> {
+    match config.pgo_gen {
+        SwitchWithOptPath::Enabled(ref opt_dir_path) => {
+            let path = if let Some(dir_path) = opt_dir_path {
+                dir_path.join("default_%m.profraw")
+            } else {
+                PathBuf::from("default_%m.profraw")
+            };
+
+            Some(CString::new(format!("{}", path.display())).unwrap())
+        }
+        SwitchWithOptPath::Disabled => None,
+    }
+}
+
+fn get_pgo_use_path(config: &ModuleConfig) -> Option<CString> {
+    config
+        .pgo_use
+        .as_ref()
+        .map(|path_buf| CString::new(path_buf.to_string_lossy().as_bytes()).unwrap())
+}
+
+pub(crate) fn should_use_new_llvm_pass_manager(config: &ModuleConfig) -> bool {
+    // We only support the new pass manager starting with LLVM 9.
+    if llvm_util::get_major_version() < 9 {
+        return false;
+    }
+
+    // The new pass manager is disabled by default.
+    config.new_llvm_pass_manager.unwrap_or(false)
+}
+
+pub(crate) unsafe fn optimize_with_new_llvm_pass_manager(
+    cgcx: &CodegenContext<LlvmCodegenBackend>,
+    module: &ModuleCodegen<ModuleLlvm>,
+    config: &ModuleConfig,
+    opt_level: config::OptLevel,
+    opt_stage: llvm::OptStage,
+) {
+    let unroll_loops =
+        opt_level != config::OptLevel::Size && opt_level != config::OptLevel::SizeMin;
+    let using_thin_buffers = opt_stage == llvm::OptStage::PreLinkThinLTO || config.bitcode_needed();
+    let pgo_gen_path = get_pgo_gen_path(config);
+    let pgo_use_path = get_pgo_use_path(config);
+    let is_lto = opt_stage == llvm::OptStage::ThinLTO || opt_stage == llvm::OptStage::FatLTO;
+    // Sanitizer instrumentation is only inserted during the pre-link optimization stage.
+    let sanitizer_options = if !is_lto {
+        config.sanitizer.as_ref().map(|s| llvm::SanitizerOptions {
+            sanitize_memory: *s == Sanitizer::Memory,
+            sanitize_thread: *s == Sanitizer::Thread,
+            sanitize_address: *s == Sanitizer::Address,
+            sanitize_recover: config.sanitizer_recover.contains(s),
+            sanitize_memory_track_origins: config.sanitizer_memory_track_origins as c_int,
+        })
+    } else {
+        None
+    };
+
+    let llvm_selfprofiler = if cgcx.prof.llvm_recording_enabled() {
+        let mut llvm_profiler = LlvmSelfProfiler::new(cgcx.prof.get_self_profiler().unwrap());
+        &mut llvm_profiler as *mut _ as *mut c_void
+    } else {
+        std::ptr::null_mut()
+    };
+
+    // FIXME: NewPM doesn't provide a facility to pass custom InlineParams.
+    // We would have to add upstream support for this first, before we can support
+    // config.inline_threshold and our more aggressive default thresholds.
+    // FIXME: NewPM uses an different and more explicit way to textually represent
+    // pass pipelines. It would probably make sense to expose this, but it would
+    // require a different format than the current -C passes.
+    llvm::LLVMRustOptimizeWithNewPassManager(
+        module.module_llvm.llmod(),
+        &*module.module_llvm.tm,
+        to_pass_builder_opt_level(opt_level),
+        opt_stage,
+        config.no_prepopulate_passes,
+        config.verify_llvm_ir,
+        using_thin_buffers,
+        config.merge_functions,
+        unroll_loops,
+        config.vectorize_slp,
+        config.vectorize_loop,
+        config.no_builtins,
+        sanitizer_options.as_ref(),
+        pgo_gen_path.as_ref().map_or(std::ptr::null(), |s| s.as_ptr()),
+        pgo_use_path.as_ref().map_or(std::ptr::null(), |s| s.as_ptr()),
+        llvm_selfprofiler,
+        selfprofile_before_pass_callback,
+        selfprofile_after_pass_callback,
+    );
+}
+
 // Unsafe due to LLVM calls.
 pub(crate) unsafe fn optimize(
     cgcx: &CodegenContext<LlvmCodegenBackend>,
@@ -310,7 +418,7 @@ pub(crate) unsafe fn optimize(
     module: &ModuleCodegen<ModuleLlvm>,
     config: &ModuleConfig,
 ) -> Result<(), FatalError> {
-    let _timer = cgcx.prof.generic_activity("LLVM_module_optimize");
+    let _timer = cgcx.prof.generic_activity_with_arg("LLVM_module_optimize", &module.name[..]);
 
     let llmod = module.module_llvm.llmod();
     let llcx = &*module.module_llvm.llcx;
@@ -327,6 +435,22 @@ pub(crate) unsafe fn optimize(
     }
 
     if let Some(opt_level) = config.opt_level {
+        if should_use_new_llvm_pass_manager(config) {
+            let opt_stage = match cgcx.lto {
+                Lto::Fat => llvm::OptStage::PreLinkFatLTO,
+                Lto::Thin | Lto::ThinLocal => llvm::OptStage::PreLinkThinLTO,
+                _ if cgcx.opts.cg.linker_plugin_lto.enabled() => llvm::OptStage::PreLinkThinLTO,
+                _ => llvm::OptStage::PreLinkNoLTO,
+            };
+            optimize_with_new_llvm_pass_manager(cgcx, module, config, opt_level, opt_stage);
+            return Ok(());
+        }
+
+        if cgcx.prof.llvm_recording_enabled() {
+            diag_handler
+                .warn("`-Z self-profile-events = llvm` requires `-Z new-llvm-pass-manager`");
+        }
+
         // Create the two optimizing pass managers. These mirror what clang
         // does, and are by populated by LLVM's default PassManagerBuilder.
         // Each manager has a different set of passes, but they also share
@@ -424,23 +548,17 @@ pub(crate) unsafe fn optimize(
 
         // Finally, run the actual optimization passes
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_module_optimize_function_passes");
-            let desc = &format!("llvm function passes [{}]", module_name.unwrap());
-            let _timer = if config.time_module {
-                Some(cgcx.prof.extra_verbose_generic_activity(desc))
-            } else {
-                None
-            };
+            let _timer = cgcx.prof.extra_verbose_generic_activity(
+                "LLVM_module_optimize_function_passes",
+                &module.name[..],
+            );
             llvm::LLVMRustRunFunctionPassManager(fpm, llmod);
         }
         {
-            let _timer = cgcx.prof.generic_activity("LLVM_module_optimize_module_passes");
-            let desc = &format!("llvm module passes [{}]", module_name.unwrap());
-            let _timer = if config.time_module {
-                Some(cgcx.prof.extra_verbose_generic_activity(desc))
-            } else {
-                None
-            };
+            let _timer = cgcx.prof.extra_verbose_generic_activity(
+                "LLVM_module_optimize_module_passes",
+                &module.name[..],
+            );
             llvm::LLVMRunPassManager(mpm, llmod);
         }
 
@@ -480,7 +598,7 @@ pub(crate) unsafe fn codegen(
     module: ModuleCodegen<ModuleLlvm>,
     config: &ModuleConfig,
 ) -> Result<CompiledModule, FatalError> {
-    let _timer = cgcx.prof.generic_activity("LLVM_module_codegen");
+    let _timer = cgcx.prof.generic_activity_with_arg("LLVM_module_codegen", &module.name[..]);
     {
         let llmod = module.module_llvm.llmod();
         let llcx = &*module.module_llvm.llcx;
@@ -533,12 +651,17 @@ pub(crate) unsafe fn codegen(
         let obj_out = cgcx.output_filenames.temp_path(OutputType::Object, module_name);
 
         if write_bc || config.emit_bc_compressed || config.embed_bitcode {
-            let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_make_bitcode");
+            let _timer = cgcx
+                .prof
+                .generic_activity_with_arg("LLVM_module_codegen_make_bitcode", &module.name[..]);
             let thin = ThinBuffer::new(llmod);
             let data = thin.data();
 
             if write_bc {
-                let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_emit_bitcode");
+                let _timer = cgcx.prof.generic_activity_with_arg(
+                    "LLVM_module_codegen_emit_bitcode",
+                    &module.name[..],
+                );
                 if let Err(e) = fs::write(&bc_out, data) {
                     let msg = format!("failed to write bytecode to {}: {}", bc_out.display(), e);
                     diag_handler.err(&msg);
@@ -546,13 +669,18 @@ pub(crate) unsafe fn codegen(
             }
 
             if config.embed_bitcode {
-                let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_embed_bitcode");
+                let _timer = cgcx.prof.generic_activity_with_arg(
+                    "LLVM_module_codegen_embed_bitcode",
+                    &module.name[..],
+                );
                 embed_bitcode(cgcx, llcx, llmod, Some(data));
             }
 
             if config.emit_bc_compressed {
-                let _timer =
-                    cgcx.prof.generic_activity("LLVM_module_codegen_emit_compressed_bitcode");
+                let _timer = cgcx.prof.generic_activity_with_arg(
+                    "LLVM_module_codegen_emit_compressed_bitcode",
+                    &module.name[..],
+                );
                 let dst = bc_out.with_extension(RLIB_BYTECODE_EXTENSION);
                 let data = bytecode::encode(&module.name, data);
                 if let Err(e) = fs::write(&dst, data) {
@@ -565,15 +693,10 @@ pub(crate) unsafe fn codegen(
         }
 
         {
-            let desc = &format!("codegen passes [{}]", module_name.unwrap());
-            let _timer = if config.time_module {
-                Some(cgcx.prof.extra_verbose_generic_activity(desc))
-            } else {
-                None
-            };
-
             if config.emit_ir {
-                let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_emit_ir");
+                let _timer = cgcx
+                    .prof
+                    .generic_activity_with_arg("LLVM_module_codegen_emit_ir", &module.name[..]);
                 let out = cgcx.output_filenames.temp_path(OutputType::LlvmAssembly, module_name);
                 let out_c = path_to_c_string(&out);
 
@@ -602,7 +725,7 @@ pub(crate) unsafe fn codegen(
                         Err(_) => return 0,
                     };
 
-                    if let Err(_) = write!(cursor, "{:#}", demangled) {
+                    if write!(cursor, "{:#}", demangled).is_err() {
                         // Possible only if provided buffer is not big enough
                         return 0;
                     }
@@ -618,7 +741,9 @@ pub(crate) unsafe fn codegen(
             }
 
             if config.emit_asm || asm_to_obj {
-                let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_emit_asm");
+                let _timer = cgcx
+                    .prof
+                    .generic_activity_with_arg("LLVM_module_codegen_emit_asm", &module.name[..]);
                 let path = cgcx.output_filenames.temp_path(OutputType::Assembly, module_name);
 
                 // We can't use the same module for asm and binary output, because that triggers
@@ -638,7 +763,9 @@ pub(crate) unsafe fn codegen(
             }
 
             if write_obj {
-                let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_emit_obj");
+                let _timer = cgcx
+                    .prof
+                    .generic_activity_with_arg("LLVM_module_codegen_emit_obj", &module.name[..]);
                 with_codegen(tm, llmod, config.no_builtins, |cpm| {
                     write_output_file(
                         diag_handler,
@@ -650,7 +777,9 @@ pub(crate) unsafe fn codegen(
                     )
                 })?;
             } else if asm_to_obj {
-                let _timer = cgcx.prof.generic_activity("LLVM_module_codegen_asm_to_obj");
+                let _timer = cgcx
+                    .prof
+                    .generic_activity_with_arg("LLVM_module_codegen_asm_to_obj", &module.name[..]);
                 let assembly = cgcx.output_filenames.temp_path(OutputType::Assembly, module_name);
                 run_assembler(cgcx, diag_handler, &assembly, &obj_out);
 
@@ -752,24 +881,8 @@ pub unsafe fn with_llvm_pmb(
     let opt_size =
         config.opt_size.map(|x| to_llvm_opt_settings(x).1).unwrap_or(llvm::CodeGenOptSizeNone);
     let inline_threshold = config.inline_threshold;
-
-    let pgo_gen_path = match config.pgo_gen {
-        SwitchWithOptPath::Enabled(ref opt_dir_path) => {
-            let path = if let Some(dir_path) = opt_dir_path {
-                dir_path.join("default_%m.profraw")
-            } else {
-                PathBuf::from("default_%m.profraw")
-            };
-
-            Some(CString::new(format!("{}", path.display())).unwrap())
-        }
-        SwitchWithOptPath::Disabled => None,
-    };
-
-    let pgo_use_path = config
-        .pgo_use
-        .as_ref()
-        .map(|path_buf| CString::new(path_buf.to_string_lossy().as_bytes()).unwrap());
+    let pgo_gen_path = get_pgo_gen_path(config);
+    let pgo_use_path = get_pgo_use_path(config);
 
     llvm::LLVMRustConfigurePassManagerBuilder(
         builder,
diff --git a/src/librustc_codegen_llvm/base.rs b/src/librustc_codegen_llvm/base.rs
index d3b524c1a1..04c084e459 100644
--- a/src/librustc_codegen_llvm/base.rs
+++ b/src/librustc_codegen_llvm/base.rs
@@ -15,6 +15,7 @@
 
 use super::ModuleLlvm;
 
+use crate::attributes;
 use crate::builder::Builder;
 use crate::common;
 use crate::context::CodegenCx;
@@ -23,7 +24,7 @@ use crate::metadata;
 use crate::value::Value;
 
 use rustc::dep_graph;
-use rustc::middle::codegen_fn_attrs::CodegenFnAttrs;
+use rustc::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc::middle::cstore::EncodedMetadata;
 use rustc::middle::exported_symbols;
 use rustc::mir::mono::{Linkage, Visibility};
@@ -131,7 +132,9 @@ pub fn compile_codegen_unit(
 
             // If this codegen unit contains the main function, also create the
             // wrapper here
-            maybe_create_entry_wrapper::<Builder<'_, '_, '_>>(&cx);
+            if let Some(entry) = maybe_create_entry_wrapper::<Builder<'_, '_, '_>>(&cx) {
+                attributes::sanitize(&cx, CodegenFnAttrFlags::empty(), entry);
+            }
 
             // Run replace-all-uses-with for statics that need it
             for &(old_g, new_g) in cx.statics_to_rauw().borrow().iter() {
diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs
index 357b0b6c45..32604d5601 100644
--- a/src/librustc_codegen_llvm/builder.rs
+++ b/src/librustc_codegen_llvm/builder.rs
@@ -7,7 +7,7 @@ use crate::type_of::LayoutLlvmExt;
 use crate::value::Value;
 use libc::{c_char, c_uint};
 use log::debug;
-use rustc::session::config;
+use rustc::session::config::{self, Sanitizer};
 use rustc::ty::layout::{self, Align, Size, TyLayout};
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc_codegen_ssa::base::to_immediate;
@@ -57,6 +57,7 @@ impl BackendTypes for Builder<'_, 'll, 'tcx> {
     type Funclet = <CodegenCx<'ll, 'tcx> as BackendTypes>::Funclet;
 
     type DIScope = <CodegenCx<'ll, 'tcx> as BackendTypes>::DIScope;
+    type DIVariable = <CodegenCx<'ll, 'tcx> as BackendTypes>::DIVariable;
 }
 
 impl ty::layout::HasDataLayout for Builder<'_, '_, '_> {
@@ -302,8 +303,8 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         rhs: Self::Value,
     ) -> (Self::Value, Self::Value) {
         use rustc::ty::{Int, Uint};
-        use syntax::ast::IntTy::*;
-        use syntax::ast::UintTy::*;
+        use rustc_ast::ast::IntTy::*;
+        use rustc_ast::ast::UintTy::*;
 
         let new_kind = match ty.kind {
             Int(t @ Isize) => Int(t.normalize(self.tcx.sess.target.ptr_width)),
@@ -780,13 +781,18 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
         align: Align,
         flags: MemFlags,
     ) {
-        let ptr_width = &self.sess().target.target.target_pointer_width;
-        let intrinsic_key = format!("llvm.memset.p0i8.i{}", ptr_width);
-        let llintrinsicfn = self.get_intrinsic(&intrinsic_key);
+        let is_volatile = flags.contains(MemFlags::VOLATILE);
         let ptr = self.pointercast(ptr, self.type_i8p());
-        let align = self.const_u32(align.bytes() as u32);
-        let volatile = self.const_bool(flags.contains(MemFlags::VOLATILE));
-        self.call(llintrinsicfn, &[ptr, fill_byte, size, align, volatile], None);
+        unsafe {
+            llvm::LLVMRustBuildMemSet(
+                self.llbuilder,
+                ptr,
+                align.bytes() as c_uint,
+                fill_byte,
+                size,
+                is_volatile,
+            );
+        }
     }
 
     fn select(
@@ -984,11 +990,11 @@ impl BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
     }
 
     fn lifetime_start(&mut self, ptr: &'ll Value, size: Size) {
-        self.call_lifetime_intrinsic("llvm.lifetime.start", ptr, size);
+        self.call_lifetime_intrinsic("llvm.lifetime.start.p0i8", ptr, size);
     }
 
     fn lifetime_end(&mut self, ptr: &'ll Value, size: Size) {
-        self.call_lifetime_intrinsic("llvm.lifetime.end", ptr, size);
+        self.call_lifetime_intrinsic("llvm.lifetime.end.p0i8", ptr, size);
     }
 
     fn call(
@@ -1232,12 +1238,19 @@ impl Builder<'a, 'll, 'tcx> {
     }
 
     fn call_lifetime_intrinsic(&mut self, intrinsic: &str, ptr: &'ll Value, size: Size) {
-        if self.cx.sess().opts.optimize == config::OptLevel::No {
+        let size = size.bytes();
+        if size == 0 {
             return;
         }
 
-        let size = size.bytes();
-        if size == 0 {
+        let opts = &self.cx.sess().opts;
+        let emit = match opts.debugging_opts.sanitizer {
+            // Some sanitizer use lifetime intrinsics. When they are in use,
+            // emit lifetime intrinsics regardless of optimization level.
+            Some(Sanitizer::Address) | Some(Sanitizer::Memory) => true,
+            _ => opts.optimize != config::OptLevel::No,
+        };
+        if !emit {
             return;
         }
 
diff --git a/src/librustc_codegen_llvm/common.rs b/src/librustc_codegen_llvm/common.rs
index 76f6eeb3f7..df38eeec00 100644
--- a/src/librustc_codegen_llvm/common.rs
+++ b/src/librustc_codegen_llvm/common.rs
@@ -18,8 +18,8 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
 
 use libc::{c_char, c_uint};
 
+use rustc_ast::ast::Mutability;
 use rustc_span::symbol::Symbol;
-use syntax::ast::Mutability;
 
 pub use crate::context::CodegenCx;
 
@@ -91,6 +91,7 @@ impl BackendTypes for CodegenCx<'ll, 'tcx> {
     type Funclet = Funclet<'ll>;
 
     type DIScope = &'ll llvm::debuginfo::DIScope;
+    type DIVariable = &'ll llvm::debuginfo::DIVariable;
 }
 
 impl CodegenCx<'ll, 'tcx> {
diff --git a/src/librustc_codegen_llvm/consts.rs b/src/librustc_codegen_llvm/consts.rs
index 38090cb26b..09a84aff16 100644
--- a/src/librustc_codegen_llvm/consts.rs
+++ b/src/librustc_codegen_llvm/consts.rs
@@ -78,11 +78,9 @@ pub fn codegen_static_initializer(
     cx: &CodegenCx<'ll, 'tcx>,
     def_id: DefId,
 ) -> Result<(&'ll Value, &'tcx Allocation), ErrorHandled> {
-    let static_ = cx.tcx.const_eval_poly(def_id)?;
-
-    let alloc = match static_.val {
-        ty::ConstKind::Value(ConstValue::ByRef { alloc, offset }) if offset.bytes() == 0 => alloc,
-        _ => bug!("static const eval returned {:#?}", static_),
+    let alloc = match cx.tcx.const_eval_poly(def_id)? {
+        ConstValue::ByRef { alloc, offset } if offset.bytes() == 0 => alloc,
+        val => bug!("static const eval returned {:#?}", val),
     };
     Ok((const_alloc_to_llvm(cx, alloc), alloc))
 }
diff --git a/src/librustc_codegen_llvm/context.rs b/src/librustc_codegen_llvm/context.rs
index 50a35fe3dc..3466363ac7 100644
--- a/src/librustc_codegen_llvm/context.rs
+++ b/src/librustc_codegen_llvm/context.rs
@@ -12,7 +12,7 @@ use rustc_codegen_ssa::traits::*;
 use crate::callee::get_fn;
 use rustc::bug;
 use rustc::mir::mono::CodegenUnit;
-use rustc::session::config::{self, DebugInfo};
+use rustc::session::config::{self, CFGuard, DebugInfo};
 use rustc::session::Session;
 use rustc::ty::layout::{
     FnAbiExt, HasParamEnv, LayoutError, LayoutOf, PointeeInfo, Size, TyLayout, VariantIdx,
@@ -174,7 +174,6 @@ pub unsafe fn create_module(
 
         let llvm_data_layout = llvm::LLVMGetDataLayout(llmod);
         let llvm_data_layout = str::from_utf8(CStr::from_ptr(llvm_data_layout).to_bytes())
-            .ok()
             .expect("got a non-UTF8 data-layout from LLVM");
 
         // Unfortunately LLVM target specs change over time, and right now we
@@ -227,6 +226,16 @@ pub unsafe fn create_module(
         llvm::LLVMRustAddModuleFlag(llmod, avoid_plt, 1);
     }
 
+    // Set module flags to enable Windows Control Flow Guard (/guard:cf) metadata
+    // only (`cfguard=1`) or metadata and checks (`cfguard=2`).
+    match sess.opts.debugging_opts.control_flow_guard {
+        CFGuard::Disabled => {}
+        CFGuard::NoChecks => {
+            llvm::LLVMRustAddModuleFlag(llmod, "cfguard\0".as_ptr() as *const _, 1)
+        }
+        CFGuard::Checks => llvm::LLVMRustAddModuleFlag(llmod, "cfguard\0".as_ptr() as *const _, 2),
+    }
+
     llmod
 }
 
@@ -552,10 +561,6 @@ impl CodegenCx<'b, 'tcx> {
             t_v8f64: t_f64, 8;
         }
 
-        ifn!("llvm.memset.p0i8.i16", fn(i8p, t_i8, t_i16, t_i32, i1) -> void);
-        ifn!("llvm.memset.p0i8.i32", fn(i8p, t_i8, t_i32, t_i32, i1) -> void);
-        ifn!("llvm.memset.p0i8.i64", fn(i8p, t_i8, t_i64, t_i32, i1) -> void);
-
         ifn!("llvm.trap", fn() -> void);
         ifn!("llvm.debugtrap", fn() -> void);
         ifn!("llvm.frameaddress", fn(t_i32) -> i8p);
@@ -820,8 +825,8 @@ impl CodegenCx<'b, 'tcx> {
         ifn!("llvm.usub.sat.i64", fn(t_i64, t_i64) -> t_i64);
         ifn!("llvm.usub.sat.i128", fn(t_i128, t_i128) -> t_i128);
 
-        ifn!("llvm.lifetime.start", fn(t_i64, i8p) -> void);
-        ifn!("llvm.lifetime.end", fn(t_i64, i8p) -> void);
+        ifn!("llvm.lifetime.start.p0i8", fn(t_i64, i8p) -> void);
+        ifn!("llvm.lifetime.end.p0i8", fn(t_i64, i8p) -> void);
 
         ifn!("llvm.expect.i1", fn(i1, i1) -> i1);
         ifn!("llvm.eh.typeid.for", fn(i8p) -> t_i32);
diff --git a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs b/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
index eba05ed5d7..cdb9657e1f 100644
--- a/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
+++ b/src/librustc_codegen_llvm/debuginfo/create_scope_map.rs
@@ -66,14 +66,8 @@ fn make_mir_scope(
     if !has_variables.contains(scope) {
         // Do not create a DIScope if there are no variables
         // defined in this MIR Scope, to avoid debuginfo bloat.
-
-        // However, we don't skip creating a nested scope if
-        // our parent is the root, because we might want to
-        // put arguments in the root and not have shadowing.
-        if parent_scope.scope_metadata.unwrap() != fn_metadata {
-            debug_context.scopes[scope] = parent_scope;
-            return;
-        }
+        debug_context.scopes[scope] = parent_scope;
+        return;
     }
 
     let loc = span_start(cx, scope_data.span);
diff --git a/src/librustc_codegen_llvm/debuginfo/gdb.rs b/src/librustc_codegen_llvm/debuginfo/gdb.rs
index eae461a575..753a4e18fa 100644
--- a/src/librustc_codegen_llvm/debuginfo/gdb.rs
+++ b/src/librustc_codegen_llvm/debuginfo/gdb.rs
@@ -9,8 +9,8 @@ use rustc::bug;
 use rustc::session::config::DebugInfo;
 use rustc_codegen_ssa::traits::*;
 
+use rustc_ast::attr;
 use rustc_span::symbol::sym;
-use syntax::attr;
 
 /// Inserts a side-effect free instruction sequence that makes sure that the
 /// .debug_gdb_scripts global is referenced, so it isn't removed by the linker.
diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs
index d1f70ad43b..46c4a51111 100644
--- a/src/librustc_codegen_llvm/debuginfo/metadata.rs
+++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs
@@ -32,11 +32,11 @@ use rustc::ty::subst::{GenericArgKind, SubstsRef};
 use rustc::ty::Instance;
 use rustc::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt};
 use rustc::{bug, span_bug};
+use rustc_ast::ast;
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::const_cstr;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_fs_util::path_to_c_string;
 use rustc_hir::def::CtorKind;
@@ -45,11 +45,9 @@ use rustc_index::vec::{Idx, IndexVec};
 use rustc_span::symbol::{Interner, Symbol};
 use rustc_span::{self, FileName, Span};
 use rustc_target::abi::HasDataLayout;
-use syntax::ast;
 
 use libc::{c_longlong, c_uint};
 use std::collections::hash_map::Entry;
-use std::ffi::CString;
 use std::fmt::{self, Write};
 use std::hash::{Hash, Hasher};
 use std::iter;
@@ -227,11 +225,11 @@ impl TypeMap<'ll, 'tcx> {
     /// Gets the unique type ID string for an enum variant part.
     /// Variant parts are not types and shouldn't really have their own ID,
     /// but it makes `set_members_of_composite_type()` simpler.
-    fn get_unique_type_id_str_of_enum_variant_part(&mut self, enum_type_id: UniqueTypeId) -> &str {
-        let variant_part_type_id =
-            format!("{}_variant_part", self.get_unique_type_id_as_string(enum_type_id));
-        let interner_key = self.unique_id_interner.intern(&variant_part_type_id);
-        self.unique_id_interner.get(interner_key)
+    fn get_unique_type_id_str_of_enum_variant_part(
+        &mut self,
+        enum_type_id: UniqueTypeId,
+    ) -> String {
+        format!("{}_variant_part", self.get_unique_type_id_as_string(enum_type_id))
     }
 }
 
@@ -637,12 +635,14 @@ pub fn type_metadata(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>, usage_site_span: Sp
                 unsafe {
                     // The choice of type here is pretty arbitrary -
                     // anything reading the debuginfo for a recursive
-                    // type is going to see *somthing* weird - the only
+                    // type is going to see *something* weird - the only
                     // question is what exactly it will see.
                     let (size, align) = cx.size_and_align_of(t);
+                    let name = "<recur_type>";
                     llvm::LLVMRustDIBuilderCreateBasicType(
                         DIB(cx),
-                        SmallCStr::new("<recur_type>").as_ptr(),
+                        name.as_ptr().cast(),
+                        name.len(),
                         size.bits(),
                         align.bits() as u32,
                         DW_ATE_unsigned,
@@ -786,16 +786,17 @@ fn file_metadata_raw(
             let (file_name, directory) = v.key();
             debug!("file_metadata: file_name: {:?}, directory: {:?}", file_name, directory);
 
-            let file_name = SmallCStr::new(if let Some(file_name) = file_name {
-                &file_name
-            } else {
-                "<unknown>"
-            });
-            let directory =
-                SmallCStr::new(if let Some(directory) = directory { &directory } else { "" });
+            let file_name = file_name.as_deref().unwrap_or("<unknown>");
+            let directory = directory.as_deref().unwrap_or("");
 
             let file_metadata = unsafe {
-                llvm::LLVMRustDIBuilderCreateFile(DIB(cx), file_name.as_ptr(), directory.as_ptr())
+                llvm::LLVMRustDIBuilderCreateFile(
+                    DIB(cx),
+                    file_name.as_ptr().cast(),
+                    file_name.len(),
+                    directory.as_ptr().cast(),
+                    directory.len(),
+                )
             };
 
             v.insert(file_metadata);
@@ -819,11 +820,11 @@ fn basic_type_metadata(cx: &CodegenCx<'ll, 'tcx>, t: Ty<'tcx>) -> &'ll DIType {
     };
 
     let (size, align) = cx.size_and_align_of(t);
-    let name = SmallCStr::new(name);
     let ty_metadata = unsafe {
         llvm::LLVMRustDIBuilderCreateBasicType(
             DIB(cx),
-            name.as_ptr(),
+            name.as_ptr().cast(),
+            name.len(),
             size.bits(),
             align.bits() as u32,
             encoding,
@@ -851,14 +852,15 @@ fn pointer_type_metadata(
 ) -> &'ll DIType {
     let (pointer_size, pointer_align) = cx.size_and_align_of(pointer_type);
     let name = compute_debuginfo_type_name(cx.tcx, pointer_type, false);
-    let name = SmallCStr::new(&name);
     unsafe {
         llvm::LLVMRustDIBuilderCreatePointerType(
             DIB(cx),
             pointee_type_metadata,
             pointer_size.bits(),
             pointer_align.bits() as u32,
-            name.as_ptr(),
+            0, // Ignore DWARF address space.
+            name.as_ptr().cast(),
+            name.len(),
         )
     }
 }
@@ -889,11 +891,9 @@ pub fn compile_unit_metadata(
     let producer = format!("clang LLVM ({})", rustc_producer);
 
     let name_in_debuginfo = name_in_debuginfo.to_string_lossy();
-    let name_in_debuginfo = SmallCStr::new(&name_in_debuginfo);
-    let work_dir = SmallCStr::new(&tcx.sess.working_dir.0.to_string_lossy());
-    let producer = CString::new(producer).unwrap();
+    let work_dir = tcx.sess.working_dir.0.to_string_lossy();
     let flags = "\0";
-    let split_name = "\0";
+    let split_name = "";
 
     // FIXME(#60020):
     //
@@ -916,19 +916,23 @@ pub fn compile_unit_metadata(
     unsafe {
         let file_metadata = llvm::LLVMRustDIBuilderCreateFile(
             debug_context.builder,
-            name_in_debuginfo.as_ptr(),
-            work_dir.as_ptr(),
+            name_in_debuginfo.as_ptr().cast(),
+            name_in_debuginfo.len(),
+            work_dir.as_ptr().cast(),
+            work_dir.len(),
         );
 
         let unit_metadata = llvm::LLVMRustDIBuilderCreateCompileUnit(
             debug_context.builder,
             DW_LANG_RUST,
             file_metadata,
-            producer.as_ptr(),
+            producer.as_ptr().cast(),
+            producer.len(),
             tcx.sess.opts.optimize != config::OptLevel::No,
             flags.as_ptr().cast(),
             0,
             split_name.as_ptr().cast(),
+            split_name.len(),
             kind,
         );
 
@@ -1021,12 +1025,12 @@ impl<'ll> MemberDescription<'ll> {
         cx: &CodegenCx<'ll, '_>,
         composite_type_metadata: &'ll DIScope,
     ) -> &'ll DIType {
-        let member_name = CString::new(self.name).unwrap();
         unsafe {
             llvm::LLVMRustDIBuilderCreateVariantMemberType(
                 DIB(cx),
                 composite_type_metadata,
-                member_name.as_ptr(),
+                self.name.as_ptr().cast(),
+                self.name.len(),
                 unknown_file_metadata(cx),
                 UNKNOWN_LINE_NUMBER,
                 self.size.bits(),
@@ -1779,13 +1783,20 @@ fn prepare_enum_metadata(
                 .discriminants(cx.tcx)
                 .zip(&def.variants)
                 .map(|((_, discr), v)| {
-                    let name = SmallCStr::new(&v.ident.as_str());
+                    let name = v.ident.as_str();
+                    let is_unsigned = match discr.ty.kind {
+                        ty::Int(_) => false,
+                        ty::Uint(_) => true,
+                        _ => bug!("non integer discriminant"),
+                    };
                     unsafe {
                         Some(llvm::LLVMRustDIBuilderCreateEnumerator(
                             DIB(cx),
-                            name.as_ptr(),
+                            name.as_ptr().cast(),
+                            name.len(),
                             // FIXME: what if enumeration has i128 discriminant?
-                            discr.val as u64,
+                            discr.val as i64,
+                            is_unsigned,
                         ))
                     }
                 })
@@ -1794,13 +1805,15 @@ fn prepare_enum_metadata(
                 .as_generator()
                 .variant_range(enum_def_id, cx.tcx)
                 .map(|variant_index| {
-                    let name = SmallCStr::new(&substs.as_generator().variant_name(variant_index));
+                    let name = substs.as_generator().variant_name(variant_index);
                     unsafe {
                         Some(llvm::LLVMRustDIBuilderCreateEnumerator(
                             DIB(cx),
-                            name.as_ptr(),
-                            // FIXME: what if enumeration has i128 discriminant?
-                            variant_index.as_usize() as u64,
+                            name.as_ptr().cast(),
+                            name.len(),
+                            // Generators use u32 as discriminant type.
+                            variant_index.as_u32().into(),
+                            true, // IsUnsigned
                         ))
                     }
                 })
@@ -1818,9 +1831,13 @@ fn prepare_enum_metadata(
                 let discriminant_base_type_metadata =
                     type_metadata(cx, discr.to_ty(cx.tcx), rustc_span::DUMMY_SP);
 
+                let item_name;
                 let discriminant_name = match enum_type.kind {
-                    ty::Adt(..) => SmallCStr::new(&cx.tcx.item_name(enum_def_id).as_str()),
-                    ty::Generator(..) => SmallCStr::new(&enum_name),
+                    ty::Adt(..) => {
+                        item_name = cx.tcx.item_name(enum_def_id).as_str();
+                        &*item_name
+                    }
+                    ty::Generator(..) => enum_name.as_str(),
                     _ => bug!(),
                 };
 
@@ -1828,7 +1845,8 @@ fn prepare_enum_metadata(
                     llvm::LLVMRustDIBuilderCreateEnumerationType(
                         DIB(cx),
                         containing_scope,
-                        discriminant_name.as_ptr(),
+                        discriminant_name.as_ptr().cast(),
+                        discriminant_name.len(),
                         file_metadata,
                         UNKNOWN_LINE_NUMBER,
                         discriminant_size.bits(),
@@ -1863,11 +1881,6 @@ fn prepare_enum_metadata(
         _ => {}
     }
 
-    let enum_name = SmallCStr::new(&enum_name);
-    let unique_type_id_str = SmallCStr::new(
-        debug_context(cx).type_map.borrow().get_unique_type_id_as_string(unique_type_id),
-    );
-
     if use_enum_fallback(cx) {
         let discriminant_type_metadata = match layout.variants {
             layout::Variants::Single { .. }
@@ -1882,20 +1895,27 @@ fn prepare_enum_metadata(
             } => Some(discriminant_type_metadata(discr.value)),
         };
 
-        let enum_metadata = unsafe {
-            llvm::LLVMRustDIBuilderCreateUnionType(
-                DIB(cx),
-                containing_scope,
-                enum_name.as_ptr(),
-                file_metadata,
-                UNKNOWN_LINE_NUMBER,
-                layout.size.bits(),
-                layout.align.abi.bits() as u32,
-                DIFlags::FlagZero,
-                None,
-                0, // RuntimeLang
-                unique_type_id_str.as_ptr(),
-            )
+        let enum_metadata = {
+            let type_map = debug_context(cx).type_map.borrow();
+            let unique_type_id_str = type_map.get_unique_type_id_as_string(unique_type_id);
+
+            unsafe {
+                llvm::LLVMRustDIBuilderCreateUnionType(
+                    DIB(cx),
+                    containing_scope,
+                    enum_name.as_ptr().cast(),
+                    enum_name.len(),
+                    file_metadata,
+                    UNKNOWN_LINE_NUMBER,
+                    layout.size.bits(),
+                    layout.align.abi.bits() as u32,
+                    DIFlags::FlagZero,
+                    None,
+                    0, // RuntimeLang
+                    unique_type_id_str.as_ptr().cast(),
+                    unique_type_id_str.len(),
+                )
+            }
         };
 
         return create_and_register_recursive_type_forward_declaration(
@@ -1915,10 +1935,9 @@ fn prepare_enum_metadata(
     }
 
     let discriminator_name = match &enum_type.kind {
-        ty::Generator(..) => Some(SmallCStr::new(&"__state")),
-        _ => None,
+        ty::Generator(..) => "__state",
+        _ => "",
     };
-    let discriminator_name = discriminator_name.map(|n| n.as_ptr()).unwrap_or(ptr::null_mut());
     let discriminator_metadata = match layout.variants {
         // A single-variant enum has no discriminant.
         layout::Variants::Single { .. } => None,
@@ -1946,7 +1965,8 @@ fn prepare_enum_metadata(
                 Some(llvm::LLVMRustDIBuilderCreateMemberType(
                     DIB(cx),
                     containing_scope,
-                    discriminator_name,
+                    discriminator_name.as_ptr().cast(),
+                    discriminator_name.len(),
                     file_metadata,
                     UNKNOWN_LINE_NUMBER,
                     size.bits(),
@@ -1972,7 +1992,8 @@ fn prepare_enum_metadata(
                 Some(llvm::LLVMRustDIBuilderCreateMemberType(
                     DIB(cx),
                     containing_scope,
-                    discriminator_name,
+                    discriminator_name.as_ptr().cast(),
+                    discriminator_name.len(),
                     file_metadata,
                     UNKNOWN_LINE_NUMBER,
                     size.bits(),
@@ -2001,18 +2022,18 @@ fn prepare_enum_metadata(
         }
     };
 
-    let variant_part_unique_type_id_str = SmallCStr::new(
-        debug_context(cx)
-            .type_map
-            .borrow_mut()
-            .get_unique_type_id_str_of_enum_variant_part(unique_type_id),
-    );
+    let variant_part_unique_type_id_str = debug_context(cx)
+        .type_map
+        .borrow_mut()
+        .get_unique_type_id_str_of_enum_variant_part(unique_type_id);
     let empty_array = create_DIArray(DIB(cx), &[]);
+    let name = "";
     let variant_part = unsafe {
         llvm::LLVMRustDIBuilderCreateVariantPart(
             DIB(cx),
             containing_scope,
-            ptr::null_mut(),
+            name.as_ptr().cast(),
+            name.len(),
             file_metadata,
             UNKNOWN_LINE_NUMBER,
             layout.size.bits(),
@@ -2020,29 +2041,38 @@ fn prepare_enum_metadata(
             DIFlags::FlagZero,
             discriminator_metadata,
             empty_array,
-            variant_part_unique_type_id_str.as_ptr(),
+            variant_part_unique_type_id_str.as_ptr().cast(),
+            variant_part_unique_type_id_str.len(),
         )
     };
     outer_fields.push(Some(variant_part));
 
-    // The variant part must be wrapped in a struct according to DWARF.
-    let type_array = create_DIArray(DIB(cx), &outer_fields);
-    let struct_wrapper = unsafe {
-        llvm::LLVMRustDIBuilderCreateStructType(
-            DIB(cx),
-            Some(containing_scope),
-            enum_name.as_ptr(),
-            file_metadata,
-            UNKNOWN_LINE_NUMBER,
-            layout.size.bits(),
-            layout.align.abi.bits() as u32,
-            DIFlags::FlagZero,
-            None,
-            type_array,
-            0,
-            None,
-            unique_type_id_str.as_ptr(),
-        )
+    let struct_wrapper = {
+        // The variant part must be wrapped in a struct according to DWARF.
+        let type_array = create_DIArray(DIB(cx), &outer_fields);
+
+        let type_map = debug_context(cx).type_map.borrow();
+        let unique_type_id_str = type_map.get_unique_type_id_as_string(unique_type_id);
+
+        unsafe {
+            llvm::LLVMRustDIBuilderCreateStructType(
+                DIB(cx),
+                Some(containing_scope),
+                enum_name.as_ptr().cast(),
+                enum_name.len(),
+                file_metadata,
+                UNKNOWN_LINE_NUMBER,
+                layout.size.bits(),
+                layout.align.abi.bits() as u32,
+                DIFlags::FlagZero,
+                None,
+                type_array,
+                0,
+                None,
+                unique_type_id_str.as_ptr().cast(),
+                unique_type_id_str.len(),
+            )
+        }
     };
 
     return create_and_register_recursive_type_forward_declaration(
@@ -2135,7 +2165,7 @@ fn set_members_of_composite_type(
 /// Computes the type parameters for a type, if any, for the given metadata.
 fn compute_type_parameters(cx: &CodegenCx<'ll, 'tcx>, ty: Ty<'tcx>) -> Option<&'ll DIArray> {
     if let ty::Adt(def, substs) = ty.kind {
-        if !substs.types().next().is_none() {
+        if substs.types().next().is_some() {
             let generics = cx.tcx.generics_of(def.did);
             let names = get_parameter_names(cx, generics);
             let template_params: Vec<_> = substs
@@ -2147,12 +2177,13 @@ fn compute_type_parameters(cx: &CodegenCx<'ll, 'tcx>, ty: Ty<'tcx>) -> Option<&'
                             cx.tcx.normalize_erasing_regions(ParamEnv::reveal_all(), ty);
                         let actual_type_metadata =
                             type_metadata(cx, actual_type, rustc_span::DUMMY_SP);
-                        let name = SmallCStr::new(&name.as_str());
+                        let name = &name.as_str();
                         Some(unsafe {
                             Some(llvm::LLVMRustDIBuilderCreateTemplateTypeParameter(
                                 DIB(cx),
                                 None,
-                                name.as_ptr(),
+                                name.as_ptr().cast(),
+                                name.len(),
                                 actual_type_metadata,
                                 unknown_file_metadata(cx),
                                 0,
@@ -2191,10 +2222,9 @@ fn create_struct_stub(
 ) -> &'ll DICompositeType {
     let (struct_size, struct_align) = cx.size_and_align_of(struct_type);
 
-    let name = SmallCStr::new(struct_type_name);
-    let unique_type_id = SmallCStr::new(
-        debug_context(cx).type_map.borrow().get_unique_type_id_as_string(unique_type_id),
-    );
+    let type_map = debug_context(cx).type_map.borrow();
+    let unique_type_id = type_map.get_unique_type_id_as_string(unique_type_id);
+
     let metadata_stub = unsafe {
         // `LLVMRustDIBuilderCreateStructType()` wants an empty array. A null
         // pointer will lead to hard to trace and debug LLVM assertions
@@ -2204,7 +2234,8 @@ fn create_struct_stub(
         llvm::LLVMRustDIBuilderCreateStructType(
             DIB(cx),
             containing_scope,
-            name.as_ptr(),
+            struct_type_name.as_ptr().cast(),
+            struct_type_name.len(),
             unknown_file_metadata(cx),
             UNKNOWN_LINE_NUMBER,
             struct_size.bits(),
@@ -2214,7 +2245,8 @@ fn create_struct_stub(
             empty_array,
             0,
             None,
-            unique_type_id.as_ptr(),
+            unique_type_id.as_ptr().cast(),
+            unique_type_id.len(),
         )
     };
 
@@ -2230,10 +2262,9 @@ fn create_union_stub(
 ) -> &'ll DICompositeType {
     let (union_size, union_align) = cx.size_and_align_of(union_type);
 
-    let name = SmallCStr::new(union_type_name);
-    let unique_type_id = SmallCStr::new(
-        debug_context(cx).type_map.borrow().get_unique_type_id_as_string(unique_type_id),
-    );
+    let type_map = debug_context(cx).type_map.borrow();
+    let unique_type_id = type_map.get_unique_type_id_as_string(unique_type_id);
+
     let metadata_stub = unsafe {
         // `LLVMRustDIBuilderCreateUnionType()` wants an empty array. A null
         // pointer will lead to hard to trace and debug LLVM assertions
@@ -2243,7 +2274,8 @@ fn create_union_stub(
         llvm::LLVMRustDIBuilderCreateUnionType(
             DIB(cx),
             containing_scope,
-            name.as_ptr(),
+            union_type_name.as_ptr().cast(),
+            union_type_name.len(),
             unknown_file_metadata(cx),
             UNKNOWN_LINE_NUMBER,
             union_size.bits(),
@@ -2251,7 +2283,8 @@ fn create_union_stub(
             DIFlags::FlagZero,
             Some(empty_array),
             0, // RuntimeLang
-            unique_type_id.as_ptr(),
+            unique_type_id.as_ptr().cast(),
+            unique_type_id.len(),
         )
     };
 
@@ -2269,10 +2302,6 @@ pub fn create_global_var_metadata(cx: &CodegenCx<'ll, '_>, def_id: DefId, global
     let tcx = cx.tcx;
     let attrs = tcx.codegen_fn_attrs(def_id);
 
-    if attrs.flags.contains(CodegenFnAttrFlags::NO_DEBUG) {
-        return;
-    }
-
     let no_mangle = attrs.flags.contains(CodegenFnAttrFlags::NO_MANGLE);
     // We may want to remove the namespace scope if we're in an extern block (see
     // https://github.com/rust-lang/rust/pull/46457#issuecomment-351750952).
@@ -2289,13 +2318,15 @@ pub fn create_global_var_metadata(cx: &CodegenCx<'ll, '_>, def_id: DefId, global
     let is_local_to_unit = is_node_local_to_unit(cx, def_id);
     let variable_type = Instance::mono(cx.tcx, def_id).monomorphic_ty(cx.tcx);
     let type_metadata = type_metadata(cx, variable_type, span);
-    let var_name = SmallCStr::new(&tcx.item_name(def_id).as_str());
+    let var_name = tcx.item_name(def_id).as_str();
     let linkage_name = if no_mangle {
         None
     } else {
-        let linkage_name = mangled_name_of_instance(cx, Instance::mono(tcx, def_id));
-        Some(SmallCStr::new(&linkage_name.name.as_str()))
+        Some(mangled_name_of_instance(cx, Instance::mono(tcx, def_id)).name.as_str())
     };
+    // When empty, linkage_name field is omitted,
+    // which is what we want for no_mangle statics
+    let linkage_name = linkage_name.as_deref().unwrap_or("");
 
     let global_align = cx.align_of(variable_type);
 
@@ -2303,10 +2334,10 @@ pub fn create_global_var_metadata(cx: &CodegenCx<'ll, '_>, def_id: DefId, global
         llvm::LLVMRustDIBuilderCreateStaticVariable(
             DIB(cx),
             Some(var_scope),
-            var_name.as_ptr(),
-            // If null, linkage_name field is omitted,
-            // which is what we want for no_mangle statics
-            linkage_name.as_ref().map_or(ptr::null(), |name| name.as_ptr()),
+            var_name.as_ptr().cast(),
+            var_name.len(),
+            linkage_name.as_ptr().cast(),
+            linkage_name.len(),
             file_metadata,
             line_number,
             type_metadata,
@@ -2334,8 +2365,7 @@ pub fn create_vtable_metadata(cx: &CodegenCx<'ll, 'tcx>, ty: Ty<'tcx>, vtable: &
         // pointer will lead to hard to trace and debug LLVM assertions
         // later on in `llvm/lib/IR/Value.cpp`.
         let empty_array = create_DIArray(DIB(cx), &[]);
-
-        let name = const_cstr!("vtable");
+        let name = "vtable";
 
         // Create a new one each time. We don't want metadata caching
         // here, because each vtable will refer to a unique containing
@@ -2343,7 +2373,8 @@ pub fn create_vtable_metadata(cx: &CodegenCx<'ll, 'tcx>, ty: Ty<'tcx>, vtable: &
         let vtable_type = llvm::LLVMRustDIBuilderCreateStructType(
             DIB(cx),
             NO_SCOPE_METADATA,
-            name.as_ptr(),
+            name.as_ptr().cast(),
+            name.len(),
             unknown_file_metadata(cx),
             UNKNOWN_LINE_NUMBER,
             Size::ZERO.bits(),
@@ -2353,14 +2384,18 @@ pub fn create_vtable_metadata(cx: &CodegenCx<'ll, 'tcx>, ty: Ty<'tcx>, vtable: &
             empty_array,
             0,
             Some(type_metadata),
-            name.as_ptr(),
+            name.as_ptr().cast(),
+            name.len(),
         );
 
+        let linkage_name = "";
         llvm::LLVMRustDIBuilderCreateStaticVariable(
             DIB(cx),
             NO_SCOPE_METADATA,
-            name.as_ptr(),
-            ptr::null(),
+            name.as_ptr().cast(),
+            name.len(),
+            linkage_name.as_ptr().cast(),
+            linkage_name.len(),
             unknown_file_metadata(cx),
             UNKNOWN_LINE_NUMBER,
             vtable_type,
diff --git a/src/librustc_codegen_llvm/debuginfo/mod.rs b/src/librustc_codegen_llvm/debuginfo/mod.rs
index 0462dcff42..8deab1be3d 100644
--- a/src/librustc_codegen_llvm/debuginfo/mod.rs
+++ b/src/librustc_codegen_llvm/debuginfo/mod.rs
@@ -5,15 +5,13 @@ use rustc_codegen_ssa::mir::debuginfo::VariableKind::*;
 
 use self::metadata::{file_metadata, type_metadata, TypeMap};
 use self::namespace::mangled_name_of_instance;
-use self::source_loc::InternalDebugLocation::{self, UnknownLocation};
 use self::type_names::compute_debuginfo_type_name;
 use self::utils::{create_DIArray, is_node_local_to_unit, span_start, DIB};
 
 use crate::llvm;
 use crate::llvm::debuginfo::{
-    DIArray, DIBuilder, DIFile, DIFlags, DILexicalBlock, DISPFlags, DIScope, DIType,
+    DIArray, DIBuilder, DIFile, DIFlags, DILexicalBlock, DISPFlags, DIScope, DIType, DIVariable,
 };
-use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc::ty::subst::{GenericArgKind, SubstsRef};
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, LOCAL_CRATE};
 
@@ -23,24 +21,22 @@ use crate::common::CodegenCx;
 use crate::value::Value;
 use rustc::mir;
 use rustc::session::config::{self, DebugInfo};
-use rustc::ty::{self, Instance, InstanceDef, ParamEnv, Ty};
+use rustc::ty::{self, Instance, ParamEnv, Ty};
 use rustc_codegen_ssa::debuginfo::type_names;
 use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext, VariableKind};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_index::vec::IndexVec;
 
 use libc::c_uint;
 use log::debug;
 use std::cell::RefCell;
-use std::ffi::CString;
 
 use rustc::ty::layout::{self, HasTyCtxt, LayoutOf, Size};
+use rustc_ast::ast;
 use rustc_codegen_ssa::traits::*;
 use rustc_span::symbol::Symbol;
-use rustc_span::{self, BytePos, Pos, Span};
+use rustc_span::{self, BytePos, Span};
 use smallvec::SmallVec;
-use syntax::ast;
 
 mod create_scope_map;
 pub mod gdb;
@@ -52,7 +48,6 @@ mod utils;
 pub use self::create_scope_map::compute_mir_scopes;
 pub use self::metadata::create_global_var_metadata;
 pub use self::metadata::extend_scope_to_file;
-pub use self::source_loc::set_source_location;
 
 #[allow(non_upper_case_globals)]
 const DW_TAG_auto_variable: c_uint = 0x100;
@@ -143,35 +138,23 @@ pub fn finalize(cx: &CodegenCx<'_, '_>) {
     };
 }
 
-impl DebugInfoBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
-    fn declare_local(
+impl DebugInfoBuilderMethods for Builder<'a, 'll, 'tcx> {
+    // FIXME(eddyb) find a common convention for all of the debuginfo-related
+    // names (choose between `dbg`, `debug`, `debuginfo`, `debug_info` etc.).
+    fn dbg_var_addr(
         &mut self,
-        dbg_context: &FunctionDebugContext<&'ll DIScope>,
-        variable_name: ast::Name,
-        variable_type: Ty<'tcx>,
+        dbg_var: &'ll DIVariable,
         scope_metadata: &'ll DIScope,
         variable_alloca: Self::Value,
         direct_offset: Size,
         indirect_offsets: &[Size],
-        variable_kind: VariableKind,
         span: Span,
     ) {
-        assert!(!dbg_context.source_locations_enabled);
         let cx = self.cx();
 
-        let file = span_start(cx, span).file;
-        let file_metadata = file_metadata(cx, &file.name, dbg_context.defining_crate);
-
-        let loc = span_start(cx, span);
-        let type_metadata = type_metadata(cx, variable_type, span);
-
-        let (argument_index, dwarf_tag) = match variable_kind {
-            ArgumentVariable(index) => (index as c_uint, DW_TAG_arg_variable),
-            LocalVariable => (0, DW_TAG_auto_variable),
-        };
-        let align = cx.align_of(variable_type);
-
         // Convert the direct and indirect offsets to address ops.
+        // FIXME(eddyb) use `const`s instead of getting the values via FFI,
+        // the values should match the ones in the DWARF standard anyway.
         let op_deref = || unsafe { llvm::LLVMRustDIBuilderCreateOpDeref() };
         let op_plus_uconst = || unsafe { llvm::LLVMRustDIBuilderCreateOpPlusUconst() };
         let mut addr_ops = SmallVec::<[_; 8]>::new();
@@ -188,50 +171,32 @@ impl DebugInfoBuilderMethods<'tcx> for Builder<'a, 'll, 'tcx> {
             }
         }
 
-        let name = SmallCStr::new(&variable_name.as_str());
-        let metadata = unsafe {
-            llvm::LLVMRustDIBuilderCreateVariable(
-                DIB(cx),
-                dwarf_tag,
-                scope_metadata,
-                name.as_ptr(),
-                file_metadata,
-                loc.line as c_uint,
-                type_metadata,
-                cx.sess().opts.optimize != config::OptLevel::No,
-                DIFlags::FlagZero,
-                argument_index,
-                align.bytes() as u32,
-            )
-        };
-        source_loc::set_debug_location(
-            self,
-            InternalDebugLocation::new(scope_metadata, loc.line, loc.col.to_usize()),
-        );
+        // FIXME(eddyb) maybe this information could be extracted from `dbg_var`,
+        // to avoid having to pass it down in both places?
+        // NB: `var` doesn't seem to know about the column, so that's a limitation.
+        let dbg_loc = cx.create_debug_loc(scope_metadata, span);
         unsafe {
-            let debug_loc = llvm::LLVMGetCurrentDebugLocation(self.llbuilder);
-            let instr = llvm::LLVMRustDIBuilderInsertDeclareAtEnd(
+            // FIXME(eddyb) replace `llvm.dbg.declare` with `llvm.dbg.addr`.
+            llvm::LLVMRustDIBuilderInsertDeclareAtEnd(
                 DIB(cx),
                 variable_alloca,
-                metadata,
+                dbg_var,
                 addr_ops.as_ptr(),
                 addr_ops.len() as c_uint,
-                debug_loc,
+                dbg_loc,
                 self.llbb(),
             );
-
-            llvm::LLVMSetInstDebugLocation(self.llbuilder, instr);
         }
-        source_loc::set_debug_location(self, UnknownLocation);
     }
 
-    fn set_source_location(
-        &mut self,
-        debug_context: &mut FunctionDebugContext<&'ll DIScope>,
-        scope: &'ll DIScope,
-        span: Span,
-    ) {
-        set_source_location(debug_context, &self, scope, span)
+    fn set_source_location(&mut self, scope: &'ll DIScope, span: Span) {
+        debug!("set_source_location: {}", self.sess().source_map().span_to_string(span));
+
+        let dbg_loc = self.cx().create_debug_loc(scope, span);
+
+        unsafe {
+            llvm::LLVMSetCurrentDebugLocation(self.llbuilder, dbg_loc);
+        }
     }
     fn insert_reference_to_gdb_debug_scripts_section_global(&mut self) {
         gdb::insert_reference_to_gdb_debug_scripts_section_global(self)
@@ -273,12 +238,6 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
             return None;
         }
 
-        if let InstanceDef::Item(def_id) = instance.def {
-            if self.tcx().codegen_fn_attrs(def_id).flags.contains(CodegenFnAttrFlags::NO_DEBUG) {
-                return None;
-            }
-        }
-
         let span = mir.span;
 
         // This can be the case for functions inlined from another crate
@@ -312,11 +271,10 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
 
         // Get the linkage_name, which is just the symbol name
         let linkage_name = mangled_name_of_instance(self, instance);
+        let linkage_name = linkage_name.name.as_str();
 
-        let scope_line = span_start(self, span).line;
-
-        let function_name = CString::new(name).unwrap();
-        let linkage_name = SmallCStr::new(&linkage_name.name.as_str());
+        // FIXME(eddyb) does this need to be separate from `loc.line` for some reason?
+        let scope_line = loc.line;
 
         let mut flags = DIFlags::FlagPrototyped;
 
@@ -341,8 +299,10 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
             llvm::LLVMRustDIBuilderCreateFunction(
                 DIB(self),
                 containing_scope,
-                function_name.as_ptr(),
-                linkage_name.as_ptr(),
+                name.as_ptr().cast(),
+                name.len(),
+                linkage_name.as_ptr().cast(),
+                linkage_name.len(),
                 file_metadata,
                 loc.line as c_uint,
                 function_type_metadata,
@@ -364,7 +324,6 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
         };
         let mut fn_debug_context = FunctionDebugContext {
             scopes: IndexVec::from_elem(null_scope, &mir.source_scopes),
-            source_locations_enabled: false,
             defining_crate: def_id.krate,
         };
 
@@ -463,12 +422,13 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
                                 cx.tcx.normalize_erasing_regions(ParamEnv::reveal_all(), ty);
                             let actual_type_metadata =
                                 type_metadata(cx, actual_type, rustc_span::DUMMY_SP);
-                            let name = SmallCStr::new(&name.as_str());
+                            let name = name.as_str();
                             Some(unsafe {
                                 Some(llvm::LLVMRustDIBuilderCreateTemplateTypeParameter(
                                     DIB(cx),
                                     None,
-                                    name.as_ptr(),
+                                    name.as_ptr().cast(),
+                                    name.len(),
                                     actual_type_metadata,
                                     file_metadata,
                                     0,
@@ -558,4 +518,45 @@ impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
     fn debuginfo_finalize(&self) {
         finalize(self)
     }
+
+    // FIXME(eddyb) find a common convention for all of the debuginfo-related
+    // names (choose between `dbg`, `debug`, `debuginfo`, `debug_info` etc.).
+    fn create_dbg_var(
+        &self,
+        dbg_context: &FunctionDebugContext<&'ll DIScope>,
+        variable_name: ast::Name,
+        variable_type: Ty<'tcx>,
+        scope_metadata: &'ll DIScope,
+        variable_kind: VariableKind,
+        span: Span,
+    ) -> &'ll DIVariable {
+        let loc = span_start(self, span);
+        let file_metadata = file_metadata(self, &loc.file.name, dbg_context.defining_crate);
+
+        let type_metadata = type_metadata(self, variable_type, span);
+
+        let (argument_index, dwarf_tag) = match variable_kind {
+            ArgumentVariable(index) => (index as c_uint, DW_TAG_arg_variable),
+            LocalVariable => (0, DW_TAG_auto_variable),
+        };
+        let align = self.align_of(variable_type);
+
+        let name = variable_name.as_str();
+        unsafe {
+            llvm::LLVMRustDIBuilderCreateVariable(
+                DIB(self),
+                dwarf_tag,
+                scope_metadata,
+                name.as_ptr().cast(),
+                name.len(),
+                file_metadata,
+                loc.line as c_uint,
+                type_metadata,
+                true,
+                DIFlags::FlagZero,
+                argument_index,
+                align.bytes() as u32,
+            )
+        }
+    }
 }
diff --git a/src/librustc_codegen_llvm/debuginfo/namespace.rs b/src/librustc_codegen_llvm/debuginfo/namespace.rs
index 582f495207..55a3540809 100644
--- a/src/librustc_codegen_llvm/debuginfo/namespace.rs
+++ b/src/librustc_codegen_llvm/debuginfo/namespace.rs
@@ -1,6 +1,5 @@
 // Namespace Handling.
 
-use super::metadata::{unknown_file_metadata, UNKNOWN_LINE_NUMBER};
 use super::utils::{debug_context, DIB};
 use rustc::ty::{self, Instance};
 
@@ -10,8 +9,6 @@ use crate::llvm::debuginfo::DIScope;
 use rustc::hir::map::DefPathData;
 use rustc_hir::def_id::DefId;
 
-use rustc_data_structures::small_c_str::SmallCStr;
-
 pub fn mangled_name_of_instance<'a, 'tcx>(
     cx: &CodegenCx<'a, 'tcx>,
     instance: Instance<'tcx>,
@@ -34,16 +31,15 @@ pub fn item_namespace(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> &'ll DIScope {
         DefPathData::CrateRoot => cx.tcx.crate_name(def_id.krate),
         data => data.as_symbol(),
     };
-
-    let namespace_name = SmallCStr::new(&namespace_name.as_str());
+    let namespace_name = namespace_name.as_str();
 
     let scope = unsafe {
         llvm::LLVMRustDIBuilderCreateNameSpace(
             DIB(cx),
             parent_scope,
-            namespace_name.as_ptr(),
-            unknown_file_metadata(cx),
-            UNKNOWN_LINE_NUMBER,
+            namespace_name.as_ptr().cast(),
+            namespace_name.len(),
+            false, // ExportSymbols (only relevant for C++ anonymous namespaces)
         )
     };
 
diff --git a/src/librustc_codegen_llvm/debuginfo/source_loc.rs b/src/librustc_codegen_llvm/debuginfo/source_loc.rs
index 6afaca44e0..1f871c7d20 100644
--- a/src/librustc_codegen_llvm/debuginfo/source_loc.rs
+++ b/src/librustc_codegen_llvm/debuginfo/source_loc.rs
@@ -1,79 +1,35 @@
-use self::InternalDebugLocation::*;
-
 use super::metadata::UNKNOWN_COLUMN_NUMBER;
 use super::utils::{debug_context, span_start};
-use rustc_codegen_ssa::mir::debuginfo::FunctionDebugContext;
 
-use crate::builder::Builder;
-use crate::llvm;
+use crate::common::CodegenCx;
 use crate::llvm::debuginfo::DIScope;
-use log::debug;
+use crate::llvm::{self, Value};
 use rustc_codegen_ssa::traits::*;
 
 use libc::c_uint;
 use rustc_span::{Pos, Span};
 
-/// Sets the current debug location at the beginning of the span.
-///
-/// Maps to a call to llvm::LLVMSetCurrentDebugLocation(...).
-pub fn set_source_location<D>(
-    debug_context: &FunctionDebugContext<D>,
-    bx: &Builder<'_, 'll, '_>,
-    scope: &'ll DIScope,
-    span: Span,
-) {
-    let dbg_loc = if debug_context.source_locations_enabled {
-        debug!("set_source_location: {}", bx.sess().source_map().span_to_string(span));
-        let loc = span_start(bx.cx(), span);
-        InternalDebugLocation::new(scope, loc.line, loc.col.to_usize())
-    } else {
-        UnknownLocation
-    };
-    set_debug_location(bx, dbg_loc);
-}
-
-#[derive(Copy, Clone, PartialEq)]
-pub enum InternalDebugLocation<'ll> {
-    KnownLocation { scope: &'ll DIScope, line: usize, col: usize },
-    UnknownLocation,
-}
-
-impl InternalDebugLocation<'ll> {
-    pub fn new(scope: &'ll DIScope, line: usize, col: usize) -> Self {
-        KnownLocation { scope, line, col }
-    }
-}
-
-pub fn set_debug_location(bx: &Builder<'_, 'll, '_>, debug_location: InternalDebugLocation<'ll>) {
-    let metadata_node = match debug_location {
-        KnownLocation { scope, line, col } => {
-            // For MSVC, set the column number to zero.
-            // Otherwise, emit it. This mimics clang behaviour.
-            // See discussion in https://github.com/rust-lang/rust/issues/42921
-            let col_used = if bx.sess().target.target.options.is_like_msvc {
-                UNKNOWN_COLUMN_NUMBER
-            } else {
-                col as c_uint
-            };
-            debug!("setting debug location to {} {}", line, col);
-
-            unsafe {
-                Some(llvm::LLVMRustDIBuilderCreateDebugLocation(
-                    debug_context(bx.cx()).llcontext,
-                    line as c_uint,
-                    col_used,
-                    scope,
-                    None,
-                ))
-            }
+impl CodegenCx<'ll, '_> {
+    pub fn create_debug_loc(&self, scope: &'ll DIScope, span: Span) -> &'ll Value {
+        let loc = span_start(self, span);
+
+        // For MSVC, set the column number to zero.
+        // Otherwise, emit it. This mimics clang behaviour.
+        // See discussion in https://github.com/rust-lang/rust/issues/42921
+        let col_used = if self.sess().target.target.options.is_like_msvc {
+            UNKNOWN_COLUMN_NUMBER
+        } else {
+            loc.col.to_usize() as c_uint
+        };
+
+        unsafe {
+            llvm::LLVMRustDIBuilderCreateDebugLocation(
+                debug_context(self).llcontext,
+                loc.line as c_uint,
+                col_used,
+                scope,
+                None,
+            )
         }
-        UnknownLocation => {
-            debug!("clearing debug location ");
-            None
-        }
-    };
-
-    unsafe {
-        llvm::LLVMSetCurrentDebugLocation(bx.llbuilder, metadata_node);
     }
 }
diff --git a/src/librustc_codegen_llvm/declare.rs b/src/librustc_codegen_llvm/declare.rs
index bb06b52162..691f32dd85 100644
--- a/src/librustc_codegen_llvm/declare.rs
+++ b/src/librustc_codegen_llvm/declare.rs
@@ -19,7 +19,6 @@ use crate::llvm::AttributePlace::Function;
 use crate::type_::Type;
 use crate::value::Value;
 use log::debug;
-use rustc::session::config::Sanitizer;
 use rustc::ty::Ty;
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::small_c_str::SmallCStr;
@@ -47,21 +46,6 @@ fn declare_raw_fn(
         llvm::Attribute::NoRedZone.apply_llfn(Function, llfn);
     }
 
-    if let Some(ref sanitizer) = cx.tcx.sess.opts.debugging_opts.sanitizer {
-        match *sanitizer {
-            Sanitizer::Address => {
-                llvm::Attribute::SanitizeAddress.apply_llfn(Function, llfn);
-            }
-            Sanitizer::Memory => {
-                llvm::Attribute::SanitizeMemory.apply_llfn(Function, llfn);
-            }
-            Sanitizer::Thread => {
-                llvm::Attribute::SanitizeThread.apply_llfn(Function, llfn);
-            }
-            _ => {}
-        }
-    }
-
     attributes::default_optimisation_attrs(cx.tcx.sess, llfn);
     attributes::non_lazy_bind(cx.sess(), llfn);
     llfn
diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/src/librustc_codegen_llvm/intrinsic.rs
index 031837c1ef..1ae9d2a684 100644
--- a/src/librustc_codegen_llvm/intrinsic.rs
+++ b/src/librustc_codegen_llvm/intrinsic.rs
@@ -10,6 +10,7 @@ use crate::value::Value;
 use rustc::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf, Primitive};
 use rustc::ty::{self, Ty};
 use rustc::{bug, span_bug};
+use rustc_ast::ast;
 use rustc_codegen_ssa::base::{compare_simd_types, to_immediate, wants_msvc_seh};
 use rustc_codegen_ssa::common::{IntPredicate, TypeKind};
 use rustc_codegen_ssa::glue;
@@ -18,7 +19,6 @@ use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::MemFlags;
 use rustc_hir as hir;
 use rustc_target::abi::HasDataLayout;
-use syntax::ast;
 
 use rustc_codegen_ssa::common::span_invalid_monomorphization_error;
 use rustc_codegen_ssa::traits::*;
@@ -193,7 +193,7 @@ impl IntrinsicCallMethods<'tcx> for Builder<'a, 'll, 'tcx> {
                     .tcx
                     .const_eval_instance(ty::ParamEnv::reveal_all(), instance, None)
                     .unwrap();
-                OperandRef::from_const(self, ty_name).immediate_or_packed_pair(self)
+                OperandRef::from_const(self, ty_name, ret_ty).immediate_or_packed_pair(self)
             }
             "init" => {
                 let ty = substs.type_at(0);
diff --git a/src/librustc_codegen_llvm/lib.rs b/src/librustc_codegen_llvm/lib.rs
index 70e3874035..f326575457 100644
--- a/src/librustc_codegen_llvm/lib.rs
+++ b/src/librustc_codegen_llvm/lib.rs
@@ -6,18 +6,11 @@
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(bool_to_option)]
-#![feature(box_patterns)]
-#![feature(box_syntax)]
 #![feature(const_cstr_unchecked)]
 #![feature(crate_visibility_modifier)]
 #![feature(extern_types)]
 #![feature(in_band_lifetimes)]
-#![feature(libc)]
 #![feature(nll)]
-#![feature(optin_builtin_traits)]
-#![feature(concat_idents)]
-#![feature(link_args)]
-#![feature(static_nobundle)]
 #![feature(trusted_len)]
 #![recursion_limit = "256"]
 
@@ -26,20 +19,20 @@ use rustc_span::symbol::Symbol;
 
 pub use llvm_util::target_features;
 use rustc::dep_graph::WorkProduct;
+use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_codegen_ssa::back::lto::{LtoModuleCodegen, SerializedModule, ThinModule};
 use rustc_codegen_ssa::back::write::{CodegenContext, FatLTOInput, ModuleConfig};
 use rustc_codegen_ssa::traits::*;
-use rustc_codegen_ssa::CompiledModule;
+use rustc_codegen_ssa::{CodegenResults, CompiledModule};
 use rustc_errors::{FatalError, Handler};
 use std::any::Any;
 use std::ffi::CStr;
 use std::fs;
 use std::sync::Arc;
-use syntax::expand::allocator::AllocatorKind;
 
 use rustc::dep_graph::DepGraph;
 use rustc::middle::cstore::{EncodedMetadata, MetadataLoaderDyn};
-use rustc::session::config::{OptLevel, OutputFilenames, OutputType, PrintRequest};
+use rustc::session::config::{self, OptLevel, OutputFilenames, PrintRequest};
 use rustc::session::Session;
 use rustc::ty::{self, TyCtxt};
 use rustc::util::common::ErrorReported;
@@ -51,6 +44,7 @@ mod back {
     pub mod archive;
     pub mod bytecode;
     pub mod lto;
+    mod profiling;
     pub mod write;
 }
 
@@ -196,7 +190,7 @@ unsafe impl Sync for LlvmCodegenBackend {}
 
 impl LlvmCodegenBackend {
     pub fn new() -> Box<dyn CodegenBackend> {
-        box LlvmCodegenBackend(())
+        Box::new(LlvmCodegenBackend(()))
     }
 }
 
@@ -245,7 +239,7 @@ impl CodegenBackend for LlvmCodegenBackend {
     }
 
     fn metadata_loader(&self) -> Box<MetadataLoaderDyn> {
-        box metadata::LlvmMetadataLoader
+        Box::new(metadata::LlvmMetadataLoader)
     }
 
     fn provide(&self, providers: &mut ty::query::Providers<'_>) {
@@ -262,21 +256,20 @@ impl CodegenBackend for LlvmCodegenBackend {
         metadata: EncodedMetadata,
         need_metadata_module: bool,
     ) -> Box<dyn Any> {
-        box rustc_codegen_ssa::base::codegen_crate(
+        Box::new(rustc_codegen_ssa::base::codegen_crate(
             LlvmCodegenBackend(()),
             tcx,
             metadata,
             need_metadata_module,
-        )
+        ))
     }
 
-    fn join_codegen_and_link(
+    fn join_codegen(
         &self,
         ongoing_codegen: Box<dyn Any>,
         sess: &Session,
         dep_graph: &DepGraph,
-        outputs: &OutputFilenames,
-    ) -> Result<(), ErrorReported> {
+    ) -> Result<Box<dyn Any>, ErrorReported> {
         let (codegen_results, work_products) = ongoing_codegen
             .downcast::<rustc_codegen_ssa::back::write::OngoingCodegen<LlvmCodegenBackend>>()
             .expect("Expected LlvmCodegenBackend's OngoingCodegen, found Box<Any>")
@@ -291,21 +284,25 @@ impl CodegenBackend for LlvmCodegenBackend {
 
         sess.compile_status()?;
 
-        if !sess
-            .opts
-            .output_types
-            .keys()
-            .any(|&i| i == OutputType::Exe || i == OutputType::Metadata)
-        {
-            return Ok(());
-        }
+        Ok(Box::new(codegen_results))
+    }
+
+    fn link(
+        &self,
+        sess: &Session,
+        codegen_results: Box<dyn Any>,
+        outputs: &OutputFilenames,
+    ) -> Result<(), ErrorReported> {
+        let codegen_results = codegen_results
+            .downcast::<CodegenResults>()
+            .expect("Expected CodegenResults, found Box<Any>");
 
         if sess.opts.debugging_opts.no_link {
             // FIXME: use a binary format to encode the `.rlink` file
             let rlink_data = json::encode(&codegen_results).map_err(|err| {
                 sess.fatal(&format!("failed to encode rlink: {}", err));
             })?;
-            let rlink_file = outputs.with_extension("rlink");
+            let rlink_file = outputs.with_extension(config::RLINK_EXT);
             fs::write(&rlink_file, rlink_data).map_err(|err| {
                 sess.fatal(&format!("failed to write file {}: {}", rlink_file.display(), err));
             })?;
@@ -332,6 +329,12 @@ impl CodegenBackend for LlvmCodegenBackend {
         // any more, we can finalize it (which involves renaming it)
         rustc_incremental::finalize_session_directory(sess, codegen_results.crate_hash);
 
+        sess.time("llvm_dump_timing_file", || {
+            if sess.opts.debugging_opts.llvm_time_trace {
+                llvm_util::time_trace_profiler_finish("llvm_timings.json");
+            }
+        });
+
         Ok(())
     }
 }
diff --git a/src/librustc_codegen_llvm/llvm/ffi.rs b/src/librustc_codegen_llvm/llvm/ffi.rs
index 875b2c47b3..31a0f52809 100644
--- a/src/librustc_codegen_llvm/llvm/ffi.rs
+++ b/src/librustc_codegen_llvm/llvm/ffi.rs
@@ -381,10 +381,10 @@ pub enum AsmDialect {
 }
 
 impl AsmDialect {
-    pub fn from_generic(asm: syntax::ast::AsmDialect) -> Self {
+    pub fn from_generic(asm: rustc_ast::ast::AsmDialect) -> Self {
         match asm {
-            syntax::ast::AsmDialect::Att => AsmDialect::Att,
-            syntax::ast::AsmDialect::Intel => AsmDialect::Intel,
+            rustc_ast::ast::AsmDialect::Att => AsmDialect::Att,
+            rustc_ast::ast::AsmDialect::Intel => AsmDialect::Intel,
         }
     }
 }
@@ -402,6 +402,38 @@ pub enum CodeGenOptLevel {
     Aggressive,
 }
 
+/// LLVMRustPassBuilderOptLevel
+#[repr(C)]
+pub enum PassBuilderOptLevel {
+    O0,
+    O1,
+    O2,
+    O3,
+    Os,
+    Oz,
+}
+
+/// LLVMRustOptStage
+#[derive(PartialEq)]
+#[repr(C)]
+pub enum OptStage {
+    PreLinkNoLTO,
+    PreLinkThinLTO,
+    PreLinkFatLTO,
+    ThinLTO,
+    FatLTO,
+}
+
+/// LLVMRustSanitizerOptions
+#[repr(C)]
+pub struct SanitizerOptions {
+    pub sanitize_memory: bool,
+    pub sanitize_thread: bool,
+    pub sanitize_address: bool,
+    pub sanitize_recover: bool,
+    pub sanitize_memory_track_origins: c_int,
+}
+
 /// LLVMRelocMode
 #[derive(Copy, Clone, PartialEq)]
 #[repr(C)]
@@ -459,6 +491,7 @@ pub enum ArchiveKind {
     Other,
     K_GNU,
     K_BSD,
+    K_DARWIN,
     K_COFF,
 }
 
@@ -676,6 +709,10 @@ extern "C" {
     pub type ModuleBuffer;
 }
 
+pub type SelfProfileBeforePassCallback =
+    unsafe extern "C" fn(*mut c_void, *const c_char, *const c_char);
+pub type SelfProfileAfterPassCallback = unsafe extern "C" fn(*mut c_void);
+
 extern "C" {
     pub fn LLVMRustInstallFatalErrorHandler();
 
@@ -909,9 +946,7 @@ extern "C" {
     pub fn LLVMDisposeBuilder(Builder: &'a mut Builder<'a>);
 
     // Metadata
-    pub fn LLVMSetCurrentDebugLocation(Builder: &Builder<'a>, L: Option<&'a Value>);
-    pub fn LLVMGetCurrentDebugLocation(Builder: &Builder<'a>) -> &'a Value;
-    pub fn LLVMSetInstDebugLocation(Builder: &Builder<'a>, Inst: &'a Value);
+    pub fn LLVMSetCurrentDebugLocation(Builder: &Builder<'a>, L: &'a Value);
 
     // Terminators
     pub fn LLVMBuildRetVoid(B: &Builder<'a>) -> &'a Value;
@@ -1317,6 +1352,14 @@ extern "C" {
         Size: &'a Value,
         IsVolatile: bool,
     ) -> &'a Value;
+    pub fn LLVMRustBuildMemSet(
+        B: &Builder<'a>,
+        Dst: &'a Value,
+        DstAlign: c_uint,
+        Val: &'a Value,
+        Size: &'a Value,
+        IsVolatile: bool,
+    ) -> &'a Value;
     pub fn LLVMBuildSelect(
         B: &Builder<'a>,
         If: &'a Value,
@@ -1454,6 +1497,10 @@ extern "C" {
 
     pub fn LLVMInitializePasses();
 
+    pub fn LLVMTimeTraceProfilerInitialize();
+
+    pub fn LLVMTimeTraceProfilerFinish(FileName: *const c_char);
+
     pub fn LLVMAddAnalysisPasses(T: &'a TargetMachine, PM: &PassManager<'a>);
 
     pub fn LLVMPassManagerBuilderCreate() -> &'static mut PassManagerBuilder;
@@ -1560,17 +1607,21 @@ extern "C" {
         Lang: c_uint,
         File: &'a DIFile,
         Producer: *const c_char,
+        ProducerLen: size_t,
         isOptimized: bool,
         Flags: *const c_char,
         RuntimeVer: c_uint,
         SplitName: *const c_char,
+        SplitNameLen: size_t,
         kind: DebugEmissionKind,
     ) -> &'a DIDescriptor;
 
     pub fn LLVMRustDIBuilderCreateFile(
         Builder: &DIBuilder<'a>,
         Filename: *const c_char,
+        FilenameLen: size_t,
         Directory: *const c_char,
+        DirectoryLen: size_t,
     ) -> &'a DIFile;
 
     pub fn LLVMRustDIBuilderCreateSubroutineType(
@@ -1583,7 +1634,9 @@ extern "C" {
         Builder: &DIBuilder<'a>,
         Scope: &'a DIDescriptor,
         Name: *const c_char,
+        NameLen: size_t,
         LinkageName: *const c_char,
+        LinkageNameLen: size_t,
         File: &'a DIFile,
         LineNo: c_uint,
         Ty: &'a DIType,
@@ -1598,6 +1651,7 @@ extern "C" {
     pub fn LLVMRustDIBuilderCreateBasicType(
         Builder: &DIBuilder<'a>,
         Name: *const c_char,
+        NameLen: size_t,
         SizeInBits: u64,
         AlignInBits: u32,
         Encoding: c_uint,
@@ -1608,13 +1662,16 @@ extern "C" {
         PointeeTy: &'a DIType,
         SizeInBits: u64,
         AlignInBits: u32,
+        AddressSpace: c_uint,
         Name: *const c_char,
+        NameLen: size_t,
     ) -> &'a DIDerivedType;
 
     pub fn LLVMRustDIBuilderCreateStructType(
         Builder: &DIBuilder<'a>,
         Scope: Option<&'a DIDescriptor>,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNumber: c_uint,
         SizeInBits: u64,
@@ -1625,12 +1682,14 @@ extern "C" {
         RunTimeLang: c_uint,
         VTableHolder: Option<&'a DIType>,
         UniqueId: *const c_char,
+        UniqueIdLen: size_t,
     ) -> &'a DICompositeType;
 
     pub fn LLVMRustDIBuilderCreateMemberType(
         Builder: &DIBuilder<'a>,
         Scope: &'a DIDescriptor,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNo: c_uint,
         SizeInBits: u64,
@@ -1644,6 +1703,7 @@ extern "C" {
         Builder: &DIBuilder<'a>,
         Scope: &'a DIScope,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNumber: c_uint,
         SizeInBits: u64,
@@ -1672,7 +1732,9 @@ extern "C" {
         Builder: &DIBuilder<'a>,
         Context: Option<&'a DIScope>,
         Name: *const c_char,
+        NameLen: size_t,
         LinkageName: *const c_char,
+        LinkageNameLen: size_t,
         File: &'a DIFile,
         LineNo: c_uint,
         Ty: &'a DIType,
@@ -1687,6 +1749,7 @@ extern "C" {
         Tag: c_uint,
         Scope: &'a DIDescriptor,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNo: c_uint,
         Ty: &'a DIType,
@@ -1729,13 +1792,16 @@ extern "C" {
     pub fn LLVMRustDIBuilderCreateEnumerator(
         Builder: &DIBuilder<'a>,
         Name: *const c_char,
-        Val: u64,
+        NameLen: size_t,
+        Value: i64,
+        IsUnsigned: bool,
     ) -> &'a DIEnumerator;
 
     pub fn LLVMRustDIBuilderCreateEnumerationType(
         Builder: &DIBuilder<'a>,
         Scope: &'a DIScope,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNumber: c_uint,
         SizeInBits: u64,
@@ -1749,6 +1815,7 @@ extern "C" {
         Builder: &DIBuilder<'a>,
         Scope: &'a DIScope,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNumber: c_uint,
         SizeInBits: u64,
@@ -1757,12 +1824,14 @@ extern "C" {
         Elements: Option<&'a DIArray>,
         RunTimeLang: c_uint,
         UniqueId: *const c_char,
+        UniqueIdLen: size_t,
     ) -> &'a DIType;
 
     pub fn LLVMRustDIBuilderCreateVariantPart(
         Builder: &DIBuilder<'a>,
         Scope: &'a DIScope,
         Name: *const c_char,
+        NameLen: size_t,
         File: &'a DIFile,
         LineNo: c_uint,
         SizeInBits: u64,
@@ -1771,6 +1840,7 @@ extern "C" {
         Discriminator: Option<&'a DIDerivedType>,
         Elements: &'a DIArray,
         UniqueId: *const c_char,
+        UniqueIdLen: size_t,
     ) -> &'a DIDerivedType;
 
     pub fn LLVMSetUnnamedAddr(GlobalVar: &Value, UnnamedAddr: Bool);
@@ -1779,6 +1849,7 @@ extern "C" {
         Builder: &DIBuilder<'a>,
         Scope: Option<&'a DIScope>,
         Name: *const c_char,
+        NameLen: size_t,
         Ty: &'a DIType,
         File: &'a DIFile,
         LineNo: c_uint,
@@ -1789,8 +1860,8 @@ extern "C" {
         Builder: &DIBuilder<'a>,
         Scope: Option<&'a DIScope>,
         Name: *const c_char,
-        File: &'a DIFile,
-        LineNo: c_uint,
+        NameLen: size_t,
+        ExportSymbols: bool,
     ) -> &'a DINameSpace;
 
     pub fn LLVMRustDICompositeTypeReplaceArrays(
@@ -1886,6 +1957,26 @@ extern "C" {
         Output: *const c_char,
         FileType: FileType,
     ) -> LLVMRustResult;
+    pub fn LLVMRustOptimizeWithNewPassManager(
+        M: &'a Module,
+        TM: &'a TargetMachine,
+        OptLevel: PassBuilderOptLevel,
+        OptStage: OptStage,
+        NoPrepopulatePasses: bool,
+        VerifyIR: bool,
+        UseThinLTOBuffers: bool,
+        MergeFunctions: bool,
+        UnrollLoops: bool,
+        SLPVectorize: bool,
+        LoopVectorize: bool,
+        DisableSimplifyLibCalls: bool,
+        SanitizerOptions: Option<&SanitizerOptions>,
+        PGOGenPath: *const c_char,
+        PGOUsePath: *const c_char,
+        llvm_selfprofiler: *mut c_void,
+        begin_callback: SelfProfileBeforePassCallback,
+        end_callback: SelfProfileAfterPassCallback,
+    );
     pub fn LLVMRustPrintModule(
         M: &'a Module,
         Output: *const c_char,
diff --git a/src/librustc_codegen_llvm/llvm/mod.rs b/src/librustc_codegen_llvm/llvm/mod.rs
index eb13d6a575..96014cbee5 100644
--- a/src/librustc_codegen_llvm/llvm/mod.rs
+++ b/src/librustc_codegen_llvm/llvm/mod.rs
@@ -69,6 +69,7 @@ impl FromStr for ArchiveKind {
         match s {
             "gnu" => Ok(ArchiveKind::K_GNU),
             "bsd" => Ok(ArchiveKind::K_BSD),
+            "darwin" => Ok(ArchiveKind::K_DARWIN),
             "coff" => Ok(ArchiveKind::K_COFF),
             _ => Err(()),
         }
diff --git a/src/librustc_codegen_llvm/llvm_util.rs b/src/librustc_codegen_llvm/llvm_util.rs
index 4823fe10c4..0081a75a4d 100644
--- a/src/librustc_codegen_llvm/llvm_util.rs
+++ b/src/librustc_codegen_llvm/llvm_util.rs
@@ -61,7 +61,7 @@ unsafe fn configure_llvm(sess: &Session) {
     let sess_args = cg_opts.chain(tg_opts);
 
     let user_specified_args: FxHashSet<_> =
-        sess_args.clone().map(|s| llvm_arg_to_arg_name(s)).filter(|s| s.len() > 0).collect();
+        sess_args.clone().map(|s| llvm_arg_to_arg_name(s)).filter(|s| !s.is_empty()).collect();
 
     {
         // This adds the given argument to LLVM. Unless `force` is true
@@ -113,6 +113,15 @@ unsafe fn configure_llvm(sess: &Session) {
         }
     }
 
+    if sess.opts.debugging_opts.llvm_time_trace && get_major_version() >= 9 {
+        // time-trace is not thread safe and running it in parallel will cause seg faults.
+        if !sess.opts.debugging_opts.no_parallel_llvm {
+            bug!("`-Z llvm-time-trace` requires `-Z no-parallel-llvm")
+        }
+
+        llvm::LLVMTimeTraceProfilerInitialize();
+    }
+
     llvm::LLVMInitializePasses();
 
     ::rustc_llvm::initialize_available_targets();
@@ -120,6 +129,15 @@ unsafe fn configure_llvm(sess: &Session) {
     llvm::LLVMRustSetLLVMOptions(llvm_args.len() as c_int, llvm_args.as_ptr());
 }
 
+pub fn time_trace_profiler_finish(file_name: &str) {
+    unsafe {
+        if get_major_version() >= 9 {
+            let file_name = CString::new(file_name).unwrap();
+            llvm::LLVMTimeTraceProfilerFinish(file_name.as_ptr());
+        }
+    }
+}
+
 // WARNING: the features after applying `to_llvm_feature` must be known
 // to LLVM or the feature detection code will walk past the end of the feature
 // array, leading to crashes.
diff --git a/src/librustc_codegen_llvm/metadata.rs b/src/librustc_codegen_llvm/metadata.rs
index abe34bb148..0f30c2c020 100644
--- a/src/librustc_codegen_llvm/metadata.rs
+++ b/src/librustc_codegen_llvm/metadata.rs
@@ -22,10 +22,11 @@ impl MetadataLoader for LlvmMetadataLoader {
         // Use ArchiveRO for speed here, it's backed by LLVM and uses mmap
         // internally to read the file. We also avoid even using a memcpy by
         // just keeping the archive along while the metadata is in use.
-        let archive = ArchiveRO::open(filename).map(|ar| OwningRef::new(box ar)).map_err(|e| {
-            debug!("llvm didn't like `{}`: {}", filename.display(), e);
-            format!("failed to read rlib metadata in '{}': {}", filename.display(), e)
-        })?;
+        let archive =
+            ArchiveRO::open(filename).map(|ar| OwningRef::new(Box::new(ar))).map_err(|e| {
+                debug!("llvm didn't like `{}`: {}", filename.display(), e);
+                format!("failed to read rlib metadata in '{}': {}", filename.display(), e)
+            })?;
         let buf: OwningRef<_, [u8]> = archive.try_map(|ar| {
             ar.iter()
                 .filter_map(|s| s.ok())
@@ -44,9 +45,10 @@ impl MetadataLoader for LlvmMetadataLoader {
             let buf = path_to_c_string(filename);
             let mb = llvm::LLVMRustCreateMemoryBufferWithContentsOfFile(buf.as_ptr())
                 .ok_or_else(|| format!("error reading library: '{}'", filename.display()))?;
-            let of = ObjectFile::new(mb).map(|of| OwningRef::new(box of)).ok_or_else(|| {
-                format!("provided path not an object file: '{}'", filename.display())
-            })?;
+            let of =
+                ObjectFile::new(mb).map(|of| OwningRef::new(Box::new(of))).ok_or_else(|| {
+                    format!("provided path not an object file: '{}'", filename.display())
+                })?;
             let buf = of.try_map(|of| search_meta_section(of, target, filename))?;
             Ok(rustc_erase_owner!(buf))
         }
diff --git a/src/librustc_codegen_llvm/type_.rs b/src/librustc_codegen_llvm/type_.rs
index 628b6fe39e..aacaf130f9 100644
--- a/src/librustc_codegen_llvm/type_.rs
+++ b/src/librustc_codegen_llvm/type_.rs
@@ -12,10 +12,10 @@ use crate::common;
 use crate::type_of::LayoutLlvmExt;
 use rustc::ty::layout::{self, Align, Size, TyLayout};
 use rustc::ty::Ty;
+use rustc_ast::ast;
 use rustc_codegen_ssa::common::TypeKind;
 use rustc_data_structures::small_c_str::SmallCStr;
 use rustc_target::abi::call::{CastTarget, FnAbi, Reg};
-use syntax::ast;
 
 use std::fmt;
 use std::ptr;
diff --git a/src/librustc_codegen_llvm/va_arg.rs b/src/librustc_codegen_llvm/va_arg.rs
index 9bc3eec60a..a552f2cdb7 100644
--- a/src/librustc_codegen_llvm/va_arg.rs
+++ b/src/librustc_codegen_llvm/va_arg.rs
@@ -117,8 +117,7 @@ pub(super) fn emit_va_arg(
         // Windows x86_64
         ("x86_64", true) => {
             let target_ty_size = bx.cx.size_of(target_ty).bytes();
-            let indirect =
-                if target_ty_size > 8 || !target_ty_size.is_power_of_two() { true } else { false };
+            let indirect: bool = target_ty_size > 8 || !target_ty_size.is_power_of_two();
             emit_ptr_va_arg(bx, addr, target_ty, indirect, Align::from_bytes(8).unwrap(), false)
         }
         // For all other architecture/OS combinations fall back to using
diff --git a/src/librustc_codegen_ssa/Cargo.toml b/src/librustc_codegen_ssa/Cargo.toml
index 9f8b4e72a9..3181d568b0 100644
--- a/src/librustc_codegen_ssa/Cargo.toml
+++ b/src/librustc_codegen_ssa/Cargo.toml
@@ -20,10 +20,11 @@ jobserver = "0.1.11"
 tempfile = "3.1"
 
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc = { path = "../librustc" }
 rustc_apfloat = { path = "../librustc_apfloat" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_data_structures = { path = "../librustc_data_structures"}
 rustc_errors = { path = "../librustc_errors" }
diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index f56a4170c0..0dd2f029e8 100644
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -1,7 +1,7 @@
 use rustc::middle::cstore::{EncodedMetadata, LibSource, NativeLibrary, NativeLibraryKind};
 use rustc::middle::dependency_format::Linkage;
 use rustc::session::config::{
-    self, DebugInfo, OutputFilenames, OutputType, PrintRequest, Sanitizer,
+    self, CFGuard, DebugInfo, OutputFilenames, OutputType, PrintRequest, Sanitizer,
 };
 use rustc::session::search_paths::PathKind;
 /// For all the linkers we support, and information they might
@@ -186,7 +186,7 @@ pub fn get_linker(sess: &Session, linker: &Path, flavor: LinkerFlavor) -> (PathB
     if flavor == LinkerFlavor::Msvc && t.target_vendor == "uwp" {
         if let Some(ref tool) = msvc_tool {
             let original_path = tool.path();
-            if let Some(ref root_lib_path) = original_path.ancestors().skip(4).next() {
+            if let Some(ref root_lib_path) = original_path.ancestors().nth(4) {
                 let arch = match t.arch.as_str() {
                     "x86_64" => Some("x64".to_string()),
                     "x86" => Some("x86".to_string()),
@@ -765,6 +765,9 @@ fn link_sanitizer_runtime(sess: &Session, crate_type: config::CrateType, linker:
     let default_sysroot = filesearch::get_or_default_sysroot();
     let default_tlib =
         filesearch::make_target_lib_path(&default_sysroot, sess.opts.target_triple.triple());
+    let channel = option_env!("CFG_RELEASE_CHANNEL")
+        .map(|channel| format!("-{}", channel))
+        .unwrap_or_default();
 
     match sess.opts.target_triple.triple() {
         "x86_64-apple-darwin" => {
@@ -772,13 +775,13 @@ fn link_sanitizer_runtime(sess: &Session, crate_type: config::CrateType, linker:
             // LLVM will link to `@rpath/*.dylib`, so we need to specify an
             // rpath to the library as well (the rpath should be absolute, see
             // PR #41352 for details).
-            let libname = format!("rustc_rt.{}", name);
+            let libname = format!("rustc{}_rt.{}", channel, name);
             let rpath = default_tlib.to_str().expect("non-utf8 component in path");
             linker.args(&["-Wl,-rpath".into(), "-Xlinker".into(), rpath.into()]);
             linker.link_dylib(Symbol::intern(&libname));
         }
         "x86_64-unknown-linux-gnu" | "x86_64-fuchsia" | "aarch64-fuchsia" => {
-            let filename = format!("librustc_rt.{}.a", name);
+            let filename = format!("librustc{}_rt.{}.a", channel, name);
             let path = default_tlib.join(&filename);
             linker.link_whole_rlib(&path);
         }
@@ -968,7 +971,84 @@ pub fn print_native_static_libs(sess: &Session, all_native_libs: &[NativeLibrary
     }
 }
 
+// Because windows-gnu target is meant to be self-contained for pure Rust code it bundles
+// own mingw-w64 libraries. These libraries are usually not compatible with mingw-w64
+// installed in the system. This breaks many cases where Rust is mixed with other languages
+// (e.g. *-sys crates).
+// We prefer system mingw-w64 libraries if they are available to avoid this issue.
+fn get_crt_libs_path(sess: &Session) -> Option<PathBuf> {
+    fn find_exe_in_path<P>(exe_name: P) -> Option<PathBuf>
+    where
+        P: AsRef<Path>,
+    {
+        for dir in env::split_paths(&env::var_os("PATH")?) {
+            let full_path = dir.join(&exe_name);
+            if full_path.is_file() {
+                return Some(fix_windows_verbatim_for_gcc(&full_path));
+            }
+        }
+        None
+    }
+
+    fn probe(sess: &Session) -> Option<PathBuf> {
+        if let (linker, LinkerFlavor::Gcc) = linker_and_flavor(&sess) {
+            let linker_path = if cfg!(windows) && linker.extension().is_none() {
+                linker.with_extension("exe")
+            } else {
+                linker
+            };
+            if let Some(linker_path) = find_exe_in_path(linker_path) {
+                let mingw_arch = match &sess.target.target.arch {
+                    x if x == "x86" => "i686",
+                    x => x,
+                };
+                let mingw_bits = &sess.target.target.target_pointer_width;
+                let mingw_dir = format!("{}-w64-mingw32", mingw_arch);
+                // Here we have path/bin/gcc but we need path/
+                let mut path = linker_path;
+                path.pop();
+                path.pop();
+                // Loosely based on Clang MinGW driver
+                let probe_paths = vec![
+                    path.join(&mingw_dir).join("lib"),                // Typical path
+                    path.join(&mingw_dir).join("sys-root/mingw/lib"), // Rare path
+                    path.join(format!(
+                        "lib/mingw/tools/install/mingw{}/{}/lib",
+                        &mingw_bits, &mingw_dir
+                    )), // Chocolatey is creative
+                ];
+                for probe_path in probe_paths {
+                    if probe_path.join("crt2.o").exists() {
+                        return Some(probe_path);
+                    };
+                }
+            };
+        };
+        None
+    }
+
+    let mut system_library_path = sess.system_library_path.borrow_mut();
+    match &*system_library_path {
+        Some(Some(compiler_libs_path)) => Some(compiler_libs_path.clone()),
+        Some(None) => None,
+        None => {
+            let path = probe(sess);
+            *system_library_path = Some(path.clone());
+            path
+        }
+    }
+}
+
 pub fn get_file_path(sess: &Session, name: &str) -> PathBuf {
+    // prefer system {,dll}crt2.o libs, see get_crt_libs_path comment for more details
+    if sess.target.target.llvm_target.contains("windows-gnu") {
+        if let Some(compiler_libs_path) = get_crt_libs_path(sess) {
+            let file_path = compiler_libs_path.join(name);
+            if file_path.exists() {
+                return file_path;
+            }
+        }
+    }
     let fs = sess.target_filesearch(PathKind::Native);
     let file_path = fs.get_lib_path().join(name);
     if file_path.exists() {
@@ -1150,6 +1230,13 @@ fn link_args<'a, B: ArchiveBuilder<'a>>(
     // target descriptor
     let t = &sess.target.target;
 
+    // prefer system mingw-w64 libs, see get_crt_libs_path comment for more details
+    if cfg!(windows) && sess.target.target.llvm_target.contains("windows-gnu") {
+        if let Some(compiler_libs_path) = get_crt_libs_path(sess) {
+            cmd.include_path(&compiler_libs_path);
+        }
+    }
+
     cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
 
     for obj in codegen_results.modules.iter().filter_map(|m| m.object.as_ref()) {
@@ -1294,6 +1381,10 @@ fn link_args<'a, B: ArchiveBuilder<'a>>(
         cmd.pgo_gen();
     }
 
+    if sess.opts.debugging_opts.control_flow_guard != CFGuard::Disabled {
+        cmd.control_flow_guard();
+    }
+
     // FIXME (#2397): At some point we want to rpath our guesses as to
     // where extern libraries might live, based on the
     // addl_lib_search_paths
@@ -1428,17 +1519,25 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
     // for the current implementation of the standard library.
     let mut group_end = None;
     let mut group_start = None;
-    let mut end_with = FxHashSet::default();
+    // Crates available for linking thus far.
+    let mut available = FxHashSet::default();
+    // Crates required to satisfy dependencies discovered so far.
+    let mut required = FxHashSet::default();
+
     let info = &codegen_results.crate_info;
     for &(cnum, _) in deps.iter().rev() {
         if let Some(missing) = info.missing_lang_items.get(&cnum) {
-            end_with.extend(missing.iter().cloned());
-            if end_with.len() > 0 && group_end.is_none() {
-                group_end = Some(cnum);
-            }
+            let missing_crates = missing.iter().map(|i| info.lang_item_to_crate.get(i).copied());
+            required.extend(missing_crates);
+        }
+
+        required.insert(Some(cnum));
+        available.insert(Some(cnum));
+
+        if required.len() > available.len() && group_end.is_none() {
+            group_end = Some(cnum);
         }
-        end_with.retain(|item| info.lang_item_to_crate.get(item) != Some(&cnum));
-        if end_with.len() == 0 && group_end.is_some() {
+        if required.len() == available.len() && group_end.is_some() {
             group_start = Some(cnum);
             break;
         }
@@ -1566,7 +1665,7 @@ fn add_upstream_rust_crates<'a, B: ArchiveBuilder<'a>>(
         let name = cratepath.file_name().unwrap().to_str().unwrap();
         let name = &name[3..name.len() - 5]; // chop off lib/.rlib
 
-        sess.prof.extra_verbose_generic_activity(&format!("altering {}.rlib", name)).run(|| {
+        sess.prof.generic_activity_with_arg("link_altering_rlib", name).run(|| {
             let mut archive = <B as ArchiveBuilder>::new(sess, &dst, Some(cratepath));
             archive.update_symbols();
 
@@ -1719,7 +1818,7 @@ pub fn add_upstream_native_libraries(
 
 pub fn relevant_lib(sess: &Session, lib: &NativeLibrary) -> bool {
     match lib.cfg {
-        Some(ref cfg) => syntax::attr::cfg_matches(cfg, &sess.parse_sess, None),
+        Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, None),
         None => true,
     }
 }
diff --git a/src/librustc_codegen_ssa/back/linker.rs b/src/librustc_codegen_ssa/back/linker.rs
index 695f171dfb..5aafb8a12d 100644
--- a/src/librustc_codegen_ssa/back/linker.rs
+++ b/src/librustc_codegen_ssa/back/linker.rs
@@ -106,6 +106,7 @@ pub trait Linker {
     fn no_relro(&mut self);
     fn optimize(&mut self);
     fn pgo_gen(&mut self);
+    fn control_flow_guard(&mut self);
     fn debuginfo(&mut self);
     fn no_default_libraries(&mut self);
     fn build_dylib(&mut self, out_filename: &Path);
@@ -360,6 +361,10 @@ impl<'a> Linker for GccLinker<'a> {
         self.cmd.arg("__llvm_profile_runtime");
     }
 
+    fn control_flow_guard(&mut self) {
+        self.sess.warn("Windows Control Flow Guard is not supported by this linker.");
+    }
+
     fn debuginfo(&mut self) {
         if let DebugInfo::None = self.sess.opts.debuginfo {
             // If we are building without debuginfo enabled and we were called with
@@ -660,6 +665,10 @@ impl<'a> Linker for MsvcLinker<'a> {
         // Nothing needed here.
     }
 
+    fn control_flow_guard(&mut self) {
+        self.cmd.arg("/guard:cf");
+    }
+
     fn debuginfo(&mut self) {
         // This will cause the Microsoft linker to generate a PDB file
         // from the CodeView line tables in the object files.
@@ -862,6 +871,10 @@ impl<'a> Linker for EmLinker<'a> {
         // noop, but maybe we need something like the gnu linker?
     }
 
+    fn control_flow_guard(&mut self) {
+        self.sess.warn("Windows Control Flow Guard is not supported by this linker.");
+    }
+
     fn debuginfo(&mut self) {
         // Preserve names or generate source maps depending on debug info
         self.cmd.arg(match self.sess.opts.debuginfo {
@@ -1058,6 +1071,10 @@ impl<'a> Linker for WasmLd<'a> {
 
     fn debuginfo(&mut self) {}
 
+    fn control_flow_guard(&mut self) {
+        self.sess.warn("Windows Control Flow Guard is not supported by this linker.");
+    }
+
     fn no_default_libraries(&mut self) {}
 
     fn build_dylib(&mut self, _out_filename: &Path) {
@@ -1233,6 +1250,10 @@ impl<'a> Linker for PtxLinker<'a> {
 
     fn no_default_libraries(&mut self) {}
 
+    fn control_flow_guard(&mut self) {
+        self.sess.warn("Windows Control Flow Guard is not supported by this linker.");
+    }
+
     fn build_dylib(&mut self, _out_filename: &Path) {}
 
     fn export_symbols(&mut self, _tmpdir: &Path, _crate_type: CrateType) {}
diff --git a/src/librustc_codegen_ssa/back/symbol_export.rs b/src/librustc_codegen_ssa/back/symbol_export.rs
index a6cd0c0968..3fe256ce25 100644
--- a/src/librustc_codegen_ssa/back/symbol_export.rs
+++ b/src/librustc_codegen_ssa/back/symbol_export.rs
@@ -8,6 +8,7 @@ use rustc::ty::query::Providers;
 use rustc::ty::subst::{GenericArgKind, SubstsRef};
 use rustc::ty::Instance;
 use rustc::ty::{SymbolName, TyCtxt};
+use rustc_ast::expand::allocator::ALLOCATOR_METHODS;
 use rustc_codegen_utils::symbol_names;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
@@ -15,7 +16,6 @@ use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdMap, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::Node;
 use rustc_index::vec::IndexVec;
-use syntax::expand::allocator::ALLOCATOR_METHODS;
 
 pub fn threshold(tcx: TyCtxt<'_>) -> SymbolExportLevel {
     crates_export_threshold(&tcx.sess.crate_types.borrow())
diff --git a/src/librustc_codegen_ssa/back/write.rs b/src/librustc_codegen_ssa/back/write.rs
index 841827d15f..3afa475825 100644
--- a/src/librustc_codegen_ssa/back/write.rs
+++ b/src/librustc_codegen_ssa/back/write.rs
@@ -19,8 +19,10 @@ use rustc::session::config::{
 };
 use rustc::session::Session;
 use rustc::ty::TyCtxt;
+use rustc_ast::attr;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::profiling::SelfProfilerRef;
+use rustc_data_structures::profiling::TimingGuard;
 use rustc_data_structures::profiling::VerboseTimingGuard;
 use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::Lrc;
@@ -36,7 +38,6 @@ use rustc_span::hygiene::ExpnId;
 use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_target::spec::MergeFunctions;
-use syntax::attr;
 
 use std::any::Any;
 use std::fs;
@@ -87,6 +88,7 @@ pub struct ModuleConfig {
     pub vectorize_slp: bool,
     pub merge_functions: bool,
     pub inline_threshold: Option<usize>,
+    pub new_llvm_pass_manager: Option<bool>,
     // Instead of creating an object file by doing LLVM codegen, just
     // make the object file bitcode. Provides easy compatibility with
     // emscripten's ecc compiler, when used as the linker.
@@ -131,6 +133,7 @@ impl ModuleConfig {
             vectorize_slp: false,
             merge_functions: false,
             inline_threshold: None,
+            new_llvm_pass_manager: None,
         }
     }
 
@@ -139,6 +142,7 @@ impl ModuleConfig {
         self.no_prepopulate_passes = sess.opts.cg.no_prepopulate_passes;
         self.no_builtins = no_builtins || sess.target.target.options.no_builtins;
         self.inline_threshold = sess.opts.cg.inline_threshold;
+        self.new_llvm_pass_manager = sess.opts.debugging_opts.new_llvm_pass_manager;
         self.obj_is_bitcode =
             sess.target.target.options.obj_is_bitcode || sess.opts.cg.linker_plugin_lto.enabled();
         let embed_bitcode =
@@ -691,11 +695,17 @@ impl<B: WriteBackendMethods> WorkItem<B> {
         }
     }
 
-    fn profiling_event_id(&self) -> &'static str {
+    fn start_profiling<'a>(&self, cgcx: &'a CodegenContext<B>) -> TimingGuard<'a> {
         match *self {
-            WorkItem::Optimize(_) => "codegen_module_optimize",
-            WorkItem::CopyPostLtoArtifacts(_) => "codegen_copy_artifacts_from_incr_cache",
-            WorkItem::LTO(_) => "codegen_module_perform_lto",
+            WorkItem::Optimize(ref m) => {
+                cgcx.prof.generic_activity_with_arg("codegen_module_optimize", &m.name[..])
+            }
+            WorkItem::CopyPostLtoArtifacts(ref m) => cgcx
+                .prof
+                .generic_activity_with_arg("codegen_copy_artifacts_from_incr_cache", &m.name[..]),
+            WorkItem::LTO(ref m) => {
+                cgcx.prof.generic_activity_with_arg("codegen_module_perform_lto", m.name())
+            }
         }
     }
 }
@@ -726,7 +736,7 @@ fn execute_work_item<B: ExtraBackendMethods>(
     }
 }
 
-// Actual LTO type we end up chosing based on multiple factors.
+// Actual LTO type we end up choosing based on multiple factors.
 enum ComputedLtoType {
     No,
     Thin,
@@ -1234,11 +1244,11 @@ fn start_executing_work<B: ExtraBackendMethods>(
         while !codegen_done
             || running > 0
             || (!codegen_aborted
-                && (work_items.len() > 0
-                    || needs_fat_lto.len() > 0
-                    || needs_thin_lto.len() > 0
-                    || lto_import_only_modules.len() > 0
-                    || main_thread_worker_state != MainThreadWorkerState::Idle))
+                && !(work_items.is_empty()
+                    && needs_fat_lto.is_empty()
+                    && needs_thin_lto.is_empty()
+                    && lto_import_only_modules.is_empty()
+                    && main_thread_worker_state == MainThreadWorkerState::Idle))
         {
             // While there are still CGUs to be codegened, the coordinator has
             // to decide how to utilize the compiler processes implicit Token:
@@ -1247,7 +1257,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
                 if main_thread_worker_state == MainThreadWorkerState::Idle {
                     if !queue_full_enough(work_items.len(), running, max_workers) {
                         // The queue is not full enough, codegen more items:
-                        if let Err(_) = codegen_worker_send.send(Message::CodegenItem) {
+                        if codegen_worker_send.send(Message::CodegenItem).is_err() {
                             panic!("Could not send Message::CodegenItem to main thread")
                         }
                         main_thread_worker_state = MainThreadWorkerState::Codegenning;
@@ -1279,7 +1289,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
                 // Perform the serial work here of figuring out what we're
                 // going to LTO and then push a bunch of work items onto our
                 // queue to do LTO
-                if work_items.len() == 0
+                if work_items.is_empty()
                     && running == 0
                     && main_thread_worker_state == MainThreadWorkerState::Idle
                 {
@@ -1344,7 +1354,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
 
             // Spin up what work we can, only doing this while we've got available
             // parallelism slots and work left to spawn.
-            while !codegen_aborted && work_items.len() > 0 && running < tokens.len() {
+            while !codegen_aborted && !work_items.is_empty() && running < tokens.len() {
                 let (item, _) = work_items.pop().unwrap();
 
                 maybe_start_llvm_timer(prof, cgcx.config(item.module_kind()), &mut llvm_start_time);
@@ -1520,7 +1530,7 @@ fn start_executing_work<B: ExtraBackendMethods>(
         llvm_start_time: &mut Option<VerboseTimingGuard<'a>>,
     ) {
         if config.time_module && llvm_start_time.is_none() {
-            *llvm_start_time = Some(prof.extra_verbose_generic_activity("LLVM_passes"));
+            *llvm_start_time = Some(prof.extra_verbose_generic_activity("LLVM_passes", "crate"));
         }
     }
 }
@@ -1575,7 +1585,7 @@ fn spawn_work<B: ExtraBackendMethods>(cgcx: CodegenContext<B>, work: WorkItem<B>
         // as a diagnostic was already sent off to the main thread - just
         // surface that there was an error in this worker.
         bomb.result = {
-            let _prof_timer = cgcx.prof.generic_activity(work.profiling_event_id());
+            let _prof_timer = work.start_profiling(&cgcx);
             Some(execute_work_item(&cgcx, work))
         };
     });
diff --git a/src/librustc_codegen_ssa/base.rs b/src/librustc_codegen_ssa/base.rs
index efd5600712..d6e1ab8909 100644
--- a/src/librustc_codegen_ssa/base.rs
+++ b/src/librustc_codegen_ssa/base.rs
@@ -28,8 +28,8 @@ use crate::{CachedModuleCodegen, CrateInfo, MemFlags, ModuleCodegen, ModuleKind}
 use rustc::middle::codegen_fn_attrs::CodegenFnAttrs;
 use rustc::middle::cstore::EncodedMetadata;
 use rustc::middle::cstore::{self, LinkagePreference};
+use rustc::middle::lang_items;
 use rustc::middle::lang_items::StartFnLangItem;
-use rustc::middle::weak_lang_items;
 use rustc::mir::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem};
 use rustc::session::config::{self, EntryFnType, Lto};
 use rustc::session::Session;
@@ -37,6 +37,7 @@ use rustc::ty::layout::{self, Align, HasTyCtxt, LayoutOf, TyLayout, VariantIdx};
 use rustc::ty::layout::{FAT_PTR_ADDR, FAT_PTR_EXTRA};
 use rustc::ty::query::Providers;
 use rustc::ty::{self, Instance, Ty, TyCtxt};
+use rustc_attr as attr;
 use rustc_codegen_utils::{check_for_rustc_errors_attr, symbol_names_test};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::profiling::print_time_passes_entry;
@@ -46,7 +47,6 @@ use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_index::vec::Idx;
 use rustc_session::cgu_reuse_tracker::CguReuse;
 use rustc_span::Span;
-use syntax::attr;
 
 use std::cmp;
 use std::ops::{Deref, DerefMut};
@@ -391,10 +391,12 @@ pub fn codegen_instance<'a, 'tcx: 'a, Bx: BuilderMethods<'a, 'tcx>>(
 
 /// Creates the `main` function which will initialize the rust runtime and call
 /// users main function.
-pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &'a Bx::CodegenCx) {
+pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
+    cx: &'a Bx::CodegenCx,
+) -> Option<Bx::Function> {
     let (main_def_id, span) = match cx.tcx().entry_fn(LOCAL_CRATE) {
         Some((def_id, _)) => (def_id, cx.tcx().def_span(def_id)),
-        None => return,
+        None => return None,
     };
 
     let instance = Instance::mono(cx.tcx(), main_def_id);
@@ -402,17 +404,15 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &'
     if !cx.codegen_unit().contains_item(&MonoItem::Fn(instance)) {
         // We want to create the wrapper in the same codegen unit as Rust's main
         // function.
-        return;
+        return None;
     }
 
     let main_llfn = cx.get_fn_addr(instance);
 
-    let et = cx.tcx().entry_fn(LOCAL_CRATE).map(|e| e.1);
-    match et {
-        Some(EntryFnType::Main) => create_entry_fn::<Bx>(cx, span, main_llfn, main_def_id, true),
-        Some(EntryFnType::Start) => create_entry_fn::<Bx>(cx, span, main_llfn, main_def_id, false),
-        None => {} // Do nothing.
-    }
+    return cx.tcx().entry_fn(LOCAL_CRATE).map(|(_, et)| {
+        let use_start_lang_item = EntryFnType::Start != et;
+        create_entry_fn::<Bx>(cx, span, main_llfn, main_def_id, use_start_lang_item)
+    });
 
     fn create_entry_fn<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
         cx: &'a Bx::CodegenCx,
@@ -420,7 +420,7 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &'
         rust_main: Bx::Value,
         rust_main_def_id: DefId,
         use_start_lang_item: bool,
-    ) {
+    ) -> Bx::Function {
         // The entry function is either `int main(void)` or `int main(int argc, char **argv)`,
         // depending on whether the target needs `argc` and `argv` to be passed in.
         let llfty = if cx.sess().target.target.options.main_needs_argc_argv {
@@ -437,10 +437,10 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &'
         // listing.
         let main_ret_ty = cx.tcx().erase_regions(&main_ret_ty.no_bound_vars().unwrap());
 
-        if cx.get_defined_value("main").is_some() {
+        if cx.get_declared_value("main").is_some() {
             // FIXME: We should be smart and show a better diagnostic here.
             cx.sess()
-                .struct_span_err(sp, "entry symbol `main` defined multiple times")
+                .struct_span_err(sp, "entry symbol `main` declared multiple times")
                 .help("did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead")
                 .emit();
             cx.sess().abort_if_errors();
@@ -481,6 +481,8 @@ pub fn maybe_create_entry_wrapper<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(cx: &'
         let result = bx.call(start_fn, &args, None);
         let cast = bx.intcast(result, cx.type_int(), true);
         bx.ret(cast);
+
+        llfn
     }
 }
 
@@ -845,11 +847,8 @@ impl CrateInfo {
 
             // No need to look for lang items that are whitelisted and don't
             // actually need to exist.
-            let missing = missing
-                .iter()
-                .cloned()
-                .filter(|&l| !weak_lang_items::whitelisted(tcx, l))
-                .collect();
+            let missing =
+                missing.iter().cloned().filter(|&l| !lang_items::whitelisted(tcx, l)).collect();
             info.missing_lang_items.insert(cnum, missing);
         }
 
diff --git a/src/librustc_codegen_ssa/build.rs b/src/librustc_codegen_ssa/build.rs
new file mode 100644
index 0000000000..ea2af6e192
--- /dev/null
+++ b/src/librustc_codegen_ssa/build.rs
@@ -0,0 +1,4 @@
+fn main() {
+    println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=CFG_RELEASE_CHANNEL");
+}
diff --git a/src/librustc_codegen_ssa/lib.rs b/src/librustc_codegen_ssa/lib.rs
index b69def5428..a2bb39b9e4 100644
--- a/src/librustc_codegen_ssa/lib.rs
+++ b/src/librustc_codegen_ssa/lib.rs
@@ -1,11 +1,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(bool_to_option)]
 #![feature(box_patterns)]
-#![feature(box_syntax)]
-#![feature(core_intrinsics)]
-#![feature(libc)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
-#![feature(stmt_expr_attributes)]
 #![feature(try_blocks)]
 #![feature(in_band_lifetimes)]
 #![feature(nll)]
diff --git a/src/librustc_codegen_ssa/mir/analyze.rs b/src/librustc_codegen_ssa/mir/analyze.rs
index c3affd233f..04680a1751 100644
--- a/src/librustc_codegen_ssa/mir/analyze.rs
+++ b/src/librustc_codegen_ssa/mir/analyze.rs
@@ -8,7 +8,6 @@ use rustc::mir::visit::{
     MutatingUseContext, NonMutatingUseContext, NonUseContext, PlaceContext, Visitor,
 };
 use rustc::mir::{self, Location, TerminatorKind};
-use rustc::session::config::DebugInfo;
 use rustc::ty;
 use rustc::ty::layout::{HasTyCtxt, LayoutOf};
 use rustc_data_structures::graph::dominators::Dominators;
@@ -24,15 +23,6 @@ pub fn non_ssa_locals<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
     analyzer.visit_body(mir);
 
     for (local, decl) in mir.local_decls.iter_enumerated() {
-        // FIXME(eddyb): We should figure out how to use llvm.dbg.value instead
-        // of putting everything in allocas just so we can use llvm.dbg.declare.
-        if fx.cx.sess().opts.debuginfo == DebugInfo::Full {
-            if fx.mir.local_kind(local) == mir::LocalKind::Arg {
-                analyzer.not_ssa(local);
-                continue;
-            }
-        }
-
         let ty = fx.monomorphize(&decl.ty);
         debug!("local {:?} has type `{}`", local, ty);
         let layout = fx.cx.spanned_layout_of(ty, decl.source_info.span);
@@ -107,7 +97,7 @@ impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> {
 
     fn process_place(
         &mut self,
-        place_ref: &mir::PlaceRef<'_, 'tcx>,
+        place_ref: &mir::PlaceRef<'tcx>,
         context: PlaceContext,
         location: Location,
     ) {
@@ -134,7 +124,7 @@ impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> {
                 // ZSTs don't require any actual memory access.
                 let elem_ty = base_ty.projection_ty(cx.tcx(), elem).ty;
                 let elem_ty = self.fx.monomorphize(&elem_ty);
-                let span = self.fx.mir.local_decls[*place_ref.local].source_info.span;
+                let span = self.fx.mir.local_decls[place_ref.local].source_info.span;
                 if cx.spanned_layout_of(elem_ty, span).is_zst() {
                     return;
                 }
@@ -174,7 +164,7 @@ impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> {
                     // We use `NonUseContext::VarDebugInfo` for the base,
                     // which might not force the base local to memory,
                     // so we have to do it manually.
-                    self.visit_local(place_ref.local, context, location);
+                    self.visit_local(&place_ref.local, context, location);
                 }
             }
 
@@ -212,7 +202,7 @@ impl<Bx: BuilderMethods<'a, 'tcx>> LocalAnalyzer<'mir, 'a, 'tcx, Bx> {
                 };
             }
 
-            self.visit_place_base(place_ref.local, context, location);
+            self.visit_place_base(&place_ref.local, context, location);
             self.visit_projection(place_ref.local, place_ref.projection, context, location);
         }
     }
@@ -281,15 +271,6 @@ impl<'mir, 'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> Visitor<'tcx>
                 self.assign(local, location);
             }
 
-            PlaceContext::NonUse(NonUseContext::VarDebugInfo) => {
-                // We need to keep locals in `alloca`s for debuginfo.
-                // FIXME(eddyb): We should figure out how to use `llvm.dbg.value` instead
-                // of putting everything in allocas just so we can use `llvm.dbg.declare`.
-                if self.fx.cx.sess().opts.debuginfo == DebugInfo::Full {
-                    self.not_ssa(local);
-                }
-            }
-
             PlaceContext::NonUse(_) | PlaceContext::MutatingUse(MutatingUseContext::Retag) => {}
 
             PlaceContext::NonMutatingUse(NonMutatingUseContext::Copy)
diff --git a/src/librustc_codegen_ssa/mir/block.rs b/src/librustc_codegen_ssa/mir/block.rs
index 9169010da8..a1b54607b8 100644
--- a/src/librustc_codegen_ssa/mir/block.rs
+++ b/src/librustc_codegen_ssa/mir/block.rs
@@ -11,7 +11,7 @@ use crate::MemFlags;
 
 use rustc::middle::lang_items;
 use rustc::mir;
-use rustc::mir::interpret::PanicInfo;
+use rustc::mir::AssertKind;
 use rustc::ty::layout::{self, FnAbiExt, HasTyCtxt, LayoutOf};
 use rustc::ty::{self, Instance, Ty, TypeFoldable};
 use rustc_index::vec::Idx;
@@ -264,7 +264,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             }
 
             PassMode::Direct(_) | PassMode::Pair(..) => {
-                let op = self.codegen_consume(&mut bx, &mir::Place::return_place().as_ref());
+                let op = self.codegen_consume(&mut bx, mir::Place::return_place().as_ref());
                 if let Ref(llval, _, align) = op.val {
                     bx.load(llval, align)
                 } else {
@@ -319,7 +319,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             return;
         }
 
-        let place = self.codegen_place(&mut bx, &location.as_ref());
+        let place = self.codegen_place(&mut bx, location.as_ref());
         let (args1, args2);
         let mut args = if let Some(llextra) = place.llextra {
             args2 = [place.llval, llextra];
@@ -378,7 +378,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         // checked operation, just a comparison with the minimum
         // value, so we have to check for the assert message.
         if !bx.check_overflow() {
-            if let PanicInfo::OverflowNeg = *msg {
+            if let AssertKind::OverflowNeg = *msg {
                 const_cond = Some(expected);
             }
         }
@@ -412,7 +412,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
 
         // Put together the arguments to the panic entry point.
         let (lang_item, args) = match msg {
-            PanicInfo::BoundsCheck { ref len, ref index } => {
+            AssertKind::BoundsCheck { ref len, ref index } => {
                 let len = self.codegen_operand(&mut bx, len).immediate();
                 let index = self.codegen_operand(&mut bx, index).immediate();
                 (lang_items::PanicBoundsCheckFnLangItem, vec![location, index, len])
@@ -515,12 +515,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             return;
         }
 
-        // For normal codegen, this Miri-specific intrinsic is just a NOP.
+        // For normal codegen, this Miri-specific intrinsic should never occur.
         if intrinsic == Some("miri_start_panic") {
-            let target = destination.as_ref().unwrap().1;
-            helper.maybe_sideeffect(self.mir, &mut bx, &[target]);
-            helper.funclet_br(self, &mut bx, target);
-            return;
+            bug!("`miri_start_panic` should never end up in compiled code");
         }
 
         // Emit a panic or a no-op for `panic_if_uninhabited`.
@@ -991,7 +988,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 caller.line as u32,
                 caller.col_display as u32 + 1,
             ));
-            OperandRef::from_const(bx, const_loc)
+            OperandRef::from_const(bx, const_loc, bx.tcx().caller_location_ty())
         })
     }
 
@@ -1111,7 +1108,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         } else {
             self.codegen_place(
                 bx,
-                &mir::PlaceRef { local: &dest.local, projection: &dest.projection },
+                mir::PlaceRef { local: dest.local, projection: &dest.projection },
             )
         };
         if fn_ret.is_indirect() {
@@ -1137,7 +1134,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 LocalRef::Place(place) => self.codegen_transmute_into(bx, src, place),
                 LocalRef::UnsizedPlace(_) => bug!("transmute must not involve unsized locals"),
                 LocalRef::Operand(None) => {
-                    let dst_layout = bx.layout_of(self.monomorphized_place_ty(&dst.as_ref()));
+                    let dst_layout = bx.layout_of(self.monomorphized_place_ty(dst.as_ref()));
                     assert!(!dst_layout.ty.has_erasable_regions());
                     let place = PlaceRef::alloca(bx, dst_layout);
                     place.storage_live(bx);
@@ -1145,13 +1142,14 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     let op = bx.load_operand(place);
                     place.storage_dead(bx);
                     self.locals[index] = LocalRef::Operand(Some(op));
+                    self.debug_introduce_local(bx, index);
                 }
                 LocalRef::Operand(Some(op)) => {
                     assert!(op.layout.is_zst(), "assigning to initialized SSAtemp");
                 }
             }
         } else {
-            let dst = self.codegen_place(bx, &dst.as_ref());
+            let dst = self.codegen_place(bx, dst.as_ref());
             self.codegen_transmute_into(bx, src, dst);
         }
     }
@@ -1186,6 +1184,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 let op = bx.load_operand(tmp);
                 tmp.storage_dead(bx);
                 self.locals[index] = LocalRef::Operand(Some(op));
+                self.debug_introduce_local(bx, index);
             }
             DirectOperand(index) => {
                 // If there is a cast, we have to store and reload.
@@ -1200,6 +1199,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     OperandRef::from_immediate_or_packed_pair(bx, llval, ret_abi.layout)
                 };
                 self.locals[index] = LocalRef::Operand(Some(op));
+                self.debug_introduce_local(bx, index);
             }
         }
     }
diff --git a/src/librustc_codegen_ssa/mir/constant.rs b/src/librustc_codegen_ssa/mir/constant.rs
index 3ce916d781..4248627dcc 100644
--- a/src/librustc_codegen_ssa/mir/constant.rs
+++ b/src/librustc_codegen_ssa/mir/constant.rs
@@ -1,7 +1,7 @@
 use crate::mir::operand::OperandRef;
 use crate::traits::*;
 use rustc::mir;
-use rustc::mir::interpret::ErrorHandled;
+use rustc::mir::interpret::{ConstValue, ErrorHandled};
 use rustc::ty::layout::{self, HasTyCtxt};
 use rustc::ty::{self, Ty};
 use rustc_index::vec::Idx;
@@ -30,7 +30,8 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             }
             _ => {
                 let val = self.eval_mir_constant(constant)?;
-                Ok(OperandRef::from_const(bx, val))
+                let ty = self.monomorphize(&constant.literal.ty);
+                Ok(OperandRef::from_const(bx, val, ty))
             }
         }
     }
@@ -38,7 +39,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
     pub fn eval_mir_constant(
         &mut self,
         constant: &mir::Constant<'tcx>,
-    ) -> Result<&'tcx ty::Const<'tcx>, ErrorHandled> {
+    ) -> Result<ConstValue<'tcx>, ErrorHandled> {
         match constant.literal.val {
             ty::ConstKind::Unevaluated(def_id, substs, promoted) => {
                 let substs = self.monomorphize(&substs);
@@ -55,7 +56,15 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                         err
                     })
             }
-            _ => Ok(self.monomorphize(&constant.literal)),
+            ty::ConstKind::Value(value) => Ok(value),
+            _ => {
+                let const_ = self.monomorphize(&constant.literal);
+                if let ty::ConstKind::Value(value) = const_.val {
+                    Ok(value)
+                } else {
+                    span_bug!(constant.span, "encountered bad ConstKind in codegen: {:?}", const_);
+                }
+            }
         }
     }
 
@@ -65,21 +74,22 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         bx: &Bx,
         span: Span,
         ty: Ty<'tcx>,
-        constant: Result<&'tcx ty::Const<'tcx>, ErrorHandled>,
+        constant: Result<ConstValue<'tcx>, ErrorHandled>,
     ) -> (Bx::Value, Ty<'tcx>) {
         constant
-            .map(|c| {
-                let field_ty = c.ty.builtin_index().unwrap();
-                let fields = match c.ty.kind {
+            .map(|val| {
+                let field_ty = ty.builtin_index().unwrap();
+                let fields = match ty.kind {
                     ty::Array(_, n) => n.eval_usize(bx.tcx(), ty::ParamEnv::reveal_all()),
-                    _ => bug!("invalid simd shuffle type: {}", c.ty),
+                    _ => bug!("invalid simd shuffle type: {}", ty),
                 };
+                let c = ty::Const::from_value(bx.tcx(), val, ty);
                 let values: Vec<_> = (0..fields)
                     .map(|field| {
                         let field = bx.tcx().const_field(
                             ty::ParamEnv::reveal_all().and((&c, mir::Field::new(field as usize))),
                         );
-                        if let Some(prim) = field.val.try_to_scalar() {
+                        if let Some(prim) = field.try_to_scalar() {
                             let layout = bx.layout_of(field_ty);
                             let scalar = match layout.abi {
                                 layout::Abi::Scalar(ref x) => x,
diff --git a/src/librustc_codegen_ssa/mir/debuginfo.rs b/src/librustc_codegen_ssa/mir/debuginfo.rs
index e0aec5d6dd..2dc1405f4e 100644
--- a/src/librustc_codegen_ssa/mir/debuginfo.rs
+++ b/src/librustc_codegen_ssa/mir/debuginfo.rs
@@ -1,20 +1,20 @@
 use crate::traits::*;
 use rustc::mir;
 use rustc::session::config::DebugInfo;
+use rustc::ty;
 use rustc::ty::layout::{LayoutOf, Size};
-use rustc::ty::TyCtxt;
 use rustc_hir::def_id::CrateNum;
 use rustc_index::vec::IndexVec;
 
-use rustc_span::symbol::kw;
+use rustc_span::symbol::{kw, Symbol};
 use rustc_span::{BytePos, Span};
 
-use super::OperandValue;
+use super::operand::OperandValue;
+use super::place::PlaceRef;
 use super::{FunctionCx, LocalRef};
 
 pub struct FunctionDebugContext<D> {
     pub scopes: IndexVec<mir::SourceScope, DebugScope<D>>,
-    pub source_locations_enabled: bool,
     pub defining_crate: CrateNum,
 }
 
@@ -24,6 +24,19 @@ pub enum VariableKind {
     LocalVariable,
 }
 
+/// Like `mir::VarDebugInfo`, but within a `mir::Local`.
+#[derive(Copy, Clone)]
+pub struct PerLocalVarDebugInfo<'tcx, D> {
+    pub name: Symbol,
+    pub source_info: mir::SourceInfo,
+
+    /// `DIVariable` returned by `create_dbg_var`.
+    pub dbg_var: Option<D>,
+
+    /// `.place.projection` from `mir::VarDebugInfo`.
+    pub projection: &'tcx ty::List<mir::PlaceElem<'tcx>>,
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct DebugScope<D> {
     pub scope_metadata: Option<D>,
@@ -35,16 +48,15 @@ pub struct DebugScope<D> {
 
 impl<D> DebugScope<D> {
     pub fn is_valid(&self) -> bool {
-        !self.scope_metadata.is_none()
+        self.scope_metadata.is_some()
     }
 }
 
 impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
-    pub fn set_debug_loc(&mut self, bx: &mut Bx, source_info: mir::SourceInfo) {
+    pub fn set_debug_loc(&self, bx: &mut Bx, source_info: mir::SourceInfo) {
         let (scope, span) = self.debug_loc(source_info);
-        if let Some(debug_context) = &mut self.debug_context {
-            // FIXME(eddyb) get rid of this unwrap somehow.
-            bx.set_source_location(debug_context, scope.unwrap(), span);
+        if let Some(scope) = scope {
+            bx.set_source_location(scope, span);
         }
     }
 
@@ -100,9 +112,9 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
 
     /// Apply debuginfo and/or name, after creating the `alloca` for a local,
     /// or initializing the local with an operand (whichever applies).
-    // FIXME(eddyb) use `llvm.dbg.value` (which would work for operands),
-    // not just `llvm.dbg.declare` (which requires `alloca`).
     pub fn debug_introduce_local(&self, bx: &mut Bx, local: mir::Local) {
+        let full_debug_info = bx.sess().opts.debuginfo == DebugInfo::Full;
+
         // FIXME(eddyb) maybe name the return place as `_0` or `return`?
         if local == mir::RETURN_PLACE {
             return;
@@ -112,77 +124,118 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             Some(per_local) => &per_local[local],
             None => return,
         };
-        let whole_local_var = vars.iter().copied().find(|var| var.place.projection.is_empty());
-        let has_proj = || vars.iter().any(|var| !var.place.projection.is_empty());
+        let whole_local_var = vars.iter().find(|var| var.projection.is_empty()).copied();
+        let has_proj = || vars.iter().any(|var| !var.projection.is_empty());
 
-        let (fallback_var, kind) = if self.mir.local_kind(local) == mir::LocalKind::Arg {
+        let fallback_var = if self.mir.local_kind(local) == mir::LocalKind::Arg {
             let arg_index = local.index() - 1;
 
             // Add debuginfo even to unnamed arguments.
             // FIXME(eddyb) is this really needed?
-            let var = if arg_index == 0 && has_proj() {
+            if arg_index == 0 && has_proj() {
                 // Hide closure environments from debuginfo.
                 // FIXME(eddyb) shouldn't `ArgumentVariable` indices
                 // be offset to account for the hidden environment?
                 None
+            } else if whole_local_var.is_some() {
+                // No need to make up anything, there is a `mir::VarDebugInfo`
+                // covering the whole local.
+                // FIXME(eddyb) take `whole_local_var.source_info.scope` into
+                // account, just in case it doesn't use `ArgumentVariable`
+                // (after #67586 gets fixed).
+                None
             } else {
-                Some(mir::VarDebugInfo {
-                    name: kw::Invalid,
-                    source_info: self.mir.local_decls[local].source_info,
-                    place: local.into(),
+                let name = kw::Invalid;
+                let decl = &self.mir.local_decls[local];
+                let (scope, span) = if full_debug_info {
+                    self.debug_loc(decl.source_info)
+                } else {
+                    (None, decl.source_info.span)
+                };
+                let dbg_var = scope.map(|scope| {
+                    // FIXME(eddyb) is this `+ 1` needed at all?
+                    let kind = VariableKind::ArgumentVariable(arg_index + 1);
+
+                    self.cx.create_dbg_var(
+                        self.debug_context.as_ref().unwrap(),
+                        name,
+                        self.monomorphize(&decl.ty),
+                        scope,
+                        kind,
+                        span,
+                    )
+                });
+
+                Some(PerLocalVarDebugInfo {
+                    name,
+                    source_info: decl.source_info,
+                    dbg_var,
+                    projection: ty::List::empty(),
                 })
-            };
-            (var, VariableKind::ArgumentVariable(arg_index + 1))
+            }
         } else {
-            (None, VariableKind::LocalVariable)
+            None
         };
 
         let local_ref = &self.locals[local];
 
-        if !bx.sess().fewer_names() {
-            let name = match whole_local_var.or(fallback_var.as_ref()) {
+        let name = if bx.sess().fewer_names() {
+            None
+        } else {
+            Some(match whole_local_var.or(fallback_var) {
                 Some(var) if var.name != kw::Invalid => var.name.to_string(),
                 _ => format!("{:?}", local),
-            };
+            })
+        };
+
+        if let Some(name) = &name {
             match local_ref {
                 LocalRef::Place(place) | LocalRef::UnsizedPlace(place) => {
-                    bx.set_var_name(place.llval, &name);
+                    bx.set_var_name(place.llval, name);
                 }
                 LocalRef::Operand(Some(operand)) => match operand.val {
                     OperandValue::Ref(x, ..) | OperandValue::Immediate(x) => {
-                        bx.set_var_name(x, &name);
+                        bx.set_var_name(x, name);
                     }
                     OperandValue::Pair(a, b) => {
                         // FIXME(eddyb) these are scalar components,
                         // maybe extract the high-level fields?
                         bx.set_var_name(a, &(name.clone() + ".0"));
-                        bx.set_var_name(b, &(name + ".1"));
+                        bx.set_var_name(b, &(name.clone() + ".1"));
                     }
                 },
                 LocalRef::Operand(None) => {}
             }
         }
 
-        if bx.sess().opts.debuginfo != DebugInfo::Full {
+        if !full_debug_info || vars.is_empty() && fallback_var.is_none() {
             return;
         }
 
-        let debug_context = match &self.debug_context {
-            Some(debug_context) => debug_context,
-            None => return,
-        };
-
-        // FIXME(eddyb) add debuginfo for unsized places too.
         let base = match local_ref {
-            LocalRef::Place(place) => place,
-            _ => return,
+            LocalRef::Operand(None) => return,
+
+            LocalRef::Operand(Some(operand)) => {
+                // "Spill" the value onto the stack, for debuginfo,
+                // without forcing non-debuginfo uses of the local
+                // to also load from the stack every single time.
+                // FIXME(#68817) use `llvm.dbg.value` instead,
+                // at least for the cases which LLVM handles correctly.
+                let spill_slot = PlaceRef::alloca(bx, operand.layout);
+                if let Some(name) = name {
+                    bx.set_var_name(spill_slot.llval, &(name + ".dbg.spill"));
+                }
+                operand.val.store(bx, spill_slot);
+                spill_slot
+            }
+
+            LocalRef::Place(place) => *place,
+
+            // FIXME(eddyb) add debuginfo for unsized places too.
+            LocalRef::UnsizedPlace(_) => return,
         };
 
-        let vars = vars.iter().copied().chain(if whole_local_var.is_none() {
-            fallback_var.as_ref()
-        } else {
-            None
-        });
+        let vars = vars.iter().copied().chain(fallback_var);
 
         for var in vars {
             let mut layout = base.layout;
@@ -190,10 +243,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             // FIXME(eddyb) use smallvec here.
             let mut indirect_offsets = vec![];
 
-            let kind =
-                if var.place.projection.is_empty() { kind } else { VariableKind::LocalVariable };
-
-            for elem in &var.place.projection[..] {
+            for elem in &var.projection[..] {
                 match *elem {
                     mir::ProjectionElem::Deref => {
                         indirect_offsets.push(Size::ZERO);
@@ -202,7 +252,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                                 .ty
                                 .builtin_deref(true)
                                 .unwrap_or_else(|| {
-                                    span_bug!(var.source_info.span, "cannot deref `{}`", layout.ty,)
+                                    span_bug!(var.source_info.span, "cannot deref `{}`", layout.ty)
                                 })
                                 .ty,
                         );
@@ -219,24 +269,23 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                     _ => span_bug!(
                         var.source_info.span,
                         "unsupported var debuginfo place `{:?}`",
-                        var.place,
+                        mir::Place { local, projection: var.projection },
                     ),
                 }
             }
 
             let (scope, span) = self.debug_loc(var.source_info);
             if let Some(scope) = scope {
-                bx.declare_local(
-                    debug_context,
-                    var.name,
-                    layout.ty,
-                    scope,
-                    base.llval,
-                    direct_offset,
-                    &indirect_offsets,
-                    kind,
-                    span,
-                );
+                if let Some(dbg_var) = var.dbg_var {
+                    bx.dbg_var_addr(
+                        dbg_var,
+                        scope,
+                        base.llval,
+                        direct_offset,
+                        &indirect_offsets,
+                        span,
+                    );
+                }
             }
         }
     }
@@ -248,20 +297,57 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             }
         }
     }
-}
 
-/// Partition all `VarDebuginfo` in `body`, by their base `Local`.
-pub fn per_local_var_debug_info(
-    tcx: TyCtxt<'tcx>,
-    body: &'a mir::Body<'tcx>,
-) -> Option<IndexVec<mir::Local, Vec<&'a mir::VarDebugInfo<'tcx>>>> {
-    if tcx.sess.opts.debuginfo == DebugInfo::Full || !tcx.sess.fewer_names() {
-        let mut per_local = IndexVec::from_elem(vec![], &body.local_decls);
-        for var in &body.var_debug_info {
-            per_local[var.place.local].push(var);
+    /// Partition all `VarDebugInfo` in `self.mir`, by their base `Local`.
+    pub fn compute_per_local_var_debug_info(
+        &self,
+    ) -> Option<IndexVec<mir::Local, Vec<PerLocalVarDebugInfo<'tcx, Bx::DIVariable>>>> {
+        let full_debug_info = self.cx.sess().opts.debuginfo == DebugInfo::Full;
+
+        if !full_debug_info && self.cx.sess().fewer_names() {
+            return None;
+        }
+
+        let mut per_local = IndexVec::from_elem(vec![], &self.mir.local_decls);
+        for var in &self.mir.var_debug_info {
+            let (scope, span) = if full_debug_info {
+                self.debug_loc(var.source_info)
+            } else {
+                (None, var.source_info.span)
+            };
+            let dbg_var = scope.map(|scope| {
+                let place = var.place;
+                let var_ty = self.monomorphized_place_ty(place.as_ref());
+                let var_kind = if self.mir.local_kind(place.local) == mir::LocalKind::Arg
+                    && place.projection.is_empty()
+                    && var.source_info.scope == mir::OUTERMOST_SOURCE_SCOPE
+                {
+                    let arg_index = place.local.index() - 1;
+
+                    // FIXME(eddyb) shouldn't `ArgumentVariable` indices be
+                    // offset in closures to account for the hidden environment?
+                    // Also, is this `+ 1` needed at all?
+                    VariableKind::ArgumentVariable(arg_index + 1)
+                } else {
+                    VariableKind::LocalVariable
+                };
+                self.cx.create_dbg_var(
+                    self.debug_context.as_ref().unwrap(),
+                    var.name,
+                    var_ty,
+                    scope,
+                    var_kind,
+                    span,
+                )
+            });
+
+            per_local[var.place.local].push(PerLocalVarDebugInfo {
+                name: var.name,
+                source_info: var.source_info,
+                dbg_var,
+                projection: var.place.projection,
+            });
         }
         Some(per_local)
-    } else {
-        None
     }
 }
diff --git a/src/librustc_codegen_ssa/mir/mod.rs b/src/librustc_codegen_ssa/mir/mod.rs
index 02b07ebfb7..64ead19b35 100644
--- a/src/librustc_codegen_ssa/mir/mod.rs
+++ b/src/librustc_codegen_ssa/mir/mod.rs
@@ -11,7 +11,7 @@ use rustc_index::bit_set::BitSet;
 use rustc_index::vec::IndexVec;
 
 use self::analyze::CleanupKind;
-use self::debuginfo::FunctionDebugContext;
+use self::debuginfo::{FunctionDebugContext, PerLocalVarDebugInfo};
 use self::place::PlaceRef;
 use rustc::mir::traversal;
 
@@ -74,9 +74,10 @@ pub struct FunctionCx<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> {
     /// notably `expect`.
     locals: IndexVec<mir::Local, LocalRef<'tcx, Bx::Value>>,
 
-    /// All `VarDebuginfo` from the MIR body, partitioned by `Local`.
-    /// This is `None` if no variable debuginfo/names are needed.
-    per_local_var_debug_info: Option<IndexVec<mir::Local, Vec<&'tcx mir::VarDebugInfo<'tcx>>>>,
+    /// All `VarDebugInfo` from the MIR body, partitioned by `Local`.
+    /// This is `None` if no var`#[non_exhaustive]`iable debuginfo/names are needed.
+    per_local_var_debug_info:
+        Option<IndexVec<mir::Local, Vec<PerLocalVarDebugInfo<'tcx, Bx::DIVariable>>>>,
 
     /// Caller location propagated if this function has `#[track_caller]`.
     caller_location: Option<OperandRef<'tcx, Bx::Value>>,
@@ -178,10 +179,12 @@ pub fn codegen_mir<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
         funclets,
         locals: IndexVec::new(),
         debug_context,
-        per_local_var_debug_info: debuginfo::per_local_var_debug_info(cx.tcx(), mir_body),
+        per_local_var_debug_info: None,
         caller_location: None,
     };
 
+    fx.per_local_var_debug_info = fx.compute_per_local_var_debug_info();
+
     let memory_locals = analyze::non_ssa_locals(&fx);
 
     // Allocate variable and temp allocas
@@ -227,13 +230,6 @@ pub fn codegen_mir<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
         bx.br(fx.blocks[mir::START_BLOCK]);
     }
 
-    // Up until here, IR instructions for this function have explicitly not been annotated with
-    // source code location, so we don't step into call setup code. From here on, source location
-    // emitting should be enabled.
-    if let Some(debug_context) = &mut fx.debug_context {
-        debug_context.source_locations_enabled = true;
-    }
-
     let rpo = traversal::reverse_postorder(&mir_body);
     let mut visited = BitSet::new_empty(mir_body.basic_blocks().len());
 
diff --git a/src/librustc_codegen_ssa/mir/operand.rs b/src/librustc_codegen_ssa/mir/operand.rs
index a155a6e78f..1e1fede258 100644
--- a/src/librustc_codegen_ssa/mir/operand.rs
+++ b/src/librustc_codegen_ssa/mir/operand.rs
@@ -8,8 +8,8 @@ use crate::MemFlags;
 
 use rustc::mir;
 use rustc::mir::interpret::{ConstValue, ErrorHandled, Pointer, Scalar};
-use rustc::ty;
 use rustc::ty::layout::{self, Align, LayoutOf, Size, TyLayout};
+use rustc::ty::Ty;
 
 use std::fmt;
 
@@ -66,20 +66,16 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
 
     pub fn from_const<Bx: BuilderMethods<'a, 'tcx, Value = V>>(
         bx: &mut Bx,
-        val: &'tcx ty::Const<'tcx>,
+        val: ConstValue<'tcx>,
+        ty: Ty<'tcx>,
     ) -> Self {
-        let layout = bx.layout_of(val.ty);
+        let layout = bx.layout_of(ty);
 
         if layout.is_zst() {
             return OperandRef::new_zst(bx, layout);
         }
 
-        let val_val = match val.val {
-            ty::ConstKind::Value(val_val) => val_val,
-            _ => bug!("encountered bad ConstKind in codegen"),
-        };
-
-        let val = match val_val {
+        let val = match val {
             ConstValue::Scalar(x) => {
                 let scalar = match layout.abi {
                     layout::Abi::Scalar(ref x) => x,
@@ -96,8 +92,7 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
                 let a = Scalar::from(Pointer::new(
                     bx.tcx().alloc_map.lock().create_memory_alloc(data),
                     Size::from_bytes(start as u64),
-                ))
-                .into();
+                ));
                 let a_llval = bx.scalar_to_backend(
                     a,
                     a_scalar,
@@ -369,11 +364,11 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
     fn maybe_codegen_consume_direct(
         &mut self,
         bx: &mut Bx,
-        place_ref: &mir::PlaceRef<'_, 'tcx>,
+        place_ref: mir::PlaceRef<'tcx>,
     ) -> Option<OperandRef<'tcx, Bx::Value>> {
         debug!("maybe_codegen_consume_direct(place_ref={:?})", place_ref);
 
-        match self.locals[*place_ref.local] {
+        match self.locals[place_ref.local] {
             LocalRef::Operand(Some(mut o)) => {
                 // Moves out of scalar and scalar pair fields are trivial.
                 for elem in place_ref.projection.iter() {
@@ -413,7 +408,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
     pub fn codegen_consume(
         &mut self,
         bx: &mut Bx,
-        place_ref: &mir::PlaceRef<'_, 'tcx>,
+        place_ref: mir::PlaceRef<'tcx>,
     ) -> OperandRef<'tcx, Bx::Value> {
         debug!("codegen_consume(place_ref={:?})", place_ref);
 
@@ -444,7 +439,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
 
         match *operand {
             mir::Operand::Copy(ref place) | mir::Operand::Move(ref place) => {
-                self.codegen_consume(bx, &place.as_ref())
+                self.codegen_consume(bx, place.as_ref())
             }
 
             mir::Operand::Constant(ref constant) => {
diff --git a/src/librustc_codegen_ssa/mir/place.rs b/src/librustc_codegen_ssa/mir/place.rs
index 5e03a35b8a..2eba88c6b5 100644
--- a/src/librustc_codegen_ssa/mir/place.rs
+++ b/src/librustc_codegen_ssa/mir/place.rs
@@ -408,14 +408,14 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
     pub fn codegen_place(
         &mut self,
         bx: &mut Bx,
-        place_ref: &mir::PlaceRef<'_, 'tcx>,
+        place_ref: mir::PlaceRef<'tcx>,
     ) -> PlaceRef<'tcx, Bx::Value> {
         debug!("codegen_place(place_ref={:?})", place_ref);
         let cx = self.cx;
         let tcx = self.cx.tcx();
 
         let result = match place_ref {
-            mir::PlaceRef { local, projection: [] } => match self.locals[**local] {
+            mir::PlaceRef { local, projection: [] } => match self.locals[local] {
                 LocalRef::Place(place) => {
                     return place;
                 }
@@ -428,13 +428,13 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             },
             mir::PlaceRef { local, projection: [proj_base @ .., mir::ProjectionElem::Deref] } => {
                 // Load the pointer from its location.
-                self.codegen_consume(bx, &mir::PlaceRef { local, projection: proj_base })
+                self.codegen_consume(bx, mir::PlaceRef { local, projection: proj_base })
                     .deref(bx.cx())
             }
             mir::PlaceRef { local, projection: [proj_base @ .., elem] } => {
                 // FIXME turn this recursion into iteration
                 let cg_base =
-                    self.codegen_place(bx, &mir::PlaceRef { local, projection: proj_base });
+                    self.codegen_place(bx, mir::PlaceRef { local, projection: proj_base });
 
                 match elem {
                     mir::ProjectionElem::Deref => bug!(),
@@ -497,7 +497,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         result
     }
 
-    pub fn monomorphized_place_ty(&self, place_ref: &mir::PlaceRef<'_, 'tcx>) -> Ty<'tcx> {
+    pub fn monomorphized_place_ty(&self, place_ref: mir::PlaceRef<'tcx>) -> Ty<'tcx> {
         let tcx = self.cx.tcx();
         let place_ty = mir::Place::ty_from(place_ref.local, place_ref.projection, *self.mir, tcx);
         self.monomorphize(&place_ty.ty)
diff --git a/src/librustc_codegen_ssa/mir/rvalue.rs b/src/librustc_codegen_ssa/mir/rvalue.rs
index 39cb501b7a..6d00460639 100644
--- a/src/librustc_codegen_ssa/mir/rvalue.rs
+++ b/src/librustc_codegen_ssa/mir/rvalue.rs
@@ -387,7 +387,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
 
             mir::Rvalue::AddressOf(mutability, ref place) => {
                 let mk_ptr = move |tcx: TyCtxt<'tcx>, ty: Ty<'tcx>| {
-                    tcx.mk_ptr(ty::TypeAndMut { ty, mutbl: mutability.into() })
+                    tcx.mk_ptr(ty::TypeAndMut { ty, mutbl: mutability })
                 };
                 self.codegen_place_to_pointer(bx, place, mk_ptr)
             }
@@ -467,7 +467,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             mir::Rvalue::Discriminant(ref place) => {
                 let discr_ty = rvalue.ty(*self.mir, bx.tcx());
                 let discr = self
-                    .codegen_place(&mut bx, &place.as_ref())
+                    .codegen_place(&mut bx, place.as_ref())
                     .codegen_get_discr(&mut bx, discr_ty);
                 (
                     bx,
@@ -541,7 +541,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
             }
         }
         // use common size calculation for non zero-sized types
-        let cg_value = self.codegen_place(bx, &place.as_ref());
+        let cg_value = self.codegen_place(bx, place.as_ref());
         cg_value.len(bx.cx())
     }
 
@@ -552,7 +552,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
         place: &mir::Place<'tcx>,
         mk_ptr_ty: impl FnOnce(TyCtxt<'tcx>, Ty<'tcx>) -> Ty<'tcx>,
     ) -> (Bx, OperandRef<'tcx, Bx::Value>) {
-        let cg_place = self.codegen_place(&mut bx, &place.as_ref());
+        let cg_place = self.codegen_place(&mut bx, place.as_ref());
 
         let ty = cg_place.layout.ty;
 
diff --git a/src/librustc_codegen_ssa/mir/statement.rs b/src/librustc_codegen_ssa/mir/statement.rs
index 8422c625d6..e68b41ad18 100644
--- a/src/librustc_codegen_ssa/mir/statement.rs
+++ b/src/librustc_codegen_ssa/mir/statement.rs
@@ -41,12 +41,12 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                         }
                     }
                 } else {
-                    let cg_dest = self.codegen_place(&mut bx, &place.as_ref());
+                    let cg_dest = self.codegen_place(&mut bx, place.as_ref());
                     self.codegen_rvalue(bx, cg_dest, rvalue)
                 }
             }
             mir::StatementKind::SetDiscriminant { box ref place, variant_index } => {
-                self.codegen_place(&mut bx, &place.as_ref())
+                self.codegen_place(&mut bx, place.as_ref())
                     .codegen_set_discr(&mut bx, variant_index);
                 bx
             }
@@ -70,7 +70,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 let outputs = asm
                     .outputs
                     .iter()
-                    .map(|output| self.codegen_place(&mut bx, &output.as_ref()))
+                    .map(|output| self.codegen_place(&mut bx, output.as_ref()))
                     .collect();
 
                 let input_vals = asm.inputs.iter().fold(
diff --git a/src/librustc_codegen_ssa/traits/backend.rs b/src/librustc_codegen_ssa/traits/backend.rs
index bc3a75250b..5535841156 100644
--- a/src/librustc_codegen_ssa/traits/backend.rs
+++ b/src/librustc_codegen_ssa/traits/backend.rs
@@ -7,9 +7,9 @@ use rustc::session::{config, Session};
 use rustc::ty::layout::{HasTyCtxt, LayoutOf, TyLayout};
 use rustc::ty::Ty;
 use rustc::ty::TyCtxt;
+use rustc_ast::expand::allocator::AllocatorKind;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use rustc_span::symbol::Symbol;
-use syntax::expand::allocator::AllocatorKind;
 
 use std::sync::Arc;
 
@@ -21,7 +21,10 @@ pub trait BackendTypes {
     type Type: CodegenObject;
     type Funclet;
 
+    // FIXME(eddyb) find a common convention for all of the debuginfo-related
+    // names (choose between `Dbg`, `Debug`, `DebugInfo`, `DI` etc.).
     type DIScope: Copy;
+    type DIVariable: Copy;
 }
 
 pub trait Backend<'tcx>:
diff --git a/src/librustc_codegen_ssa/traits/builder.rs b/src/librustc_codegen_ssa/traits/builder.rs
index 6f331e14a0..b3c830eef8 100644
--- a/src/librustc_codegen_ssa/traits/builder.rs
+++ b/src/librustc_codegen_ssa/traits/builder.rs
@@ -28,7 +28,7 @@ pub enum OverflowOp {
 
 pub trait BuilderMethods<'a, 'tcx>:
     HasCodegen<'tcx>
-    + DebugInfoBuilderMethods<'tcx>
+    + DebugInfoBuilderMethods
     + ArgAbiMethods<'tcx>
     + AbiBuilderMethods<'tcx>
     + IntrinsicCallMethods<'tcx>
diff --git a/src/librustc_codegen_ssa/traits/debuginfo.rs b/src/librustc_codegen_ssa/traits/debuginfo.rs
index d2784f5b86..14c5a1b8ee 100644
--- a/src/librustc_codegen_ssa/traits/debuginfo.rs
+++ b/src/librustc_codegen_ssa/traits/debuginfo.rs
@@ -3,10 +3,10 @@ use crate::mir::debuginfo::{FunctionDebugContext, VariableKind};
 use rustc::mir;
 use rustc::ty::layout::Size;
 use rustc::ty::{Instance, Ty};
+use rustc_ast::ast::Name;
 use rustc_hir::def_id::CrateNum;
 use rustc_span::{SourceFile, Span};
 use rustc_target::abi::call::FnAbi;
-use syntax::ast::Name;
 
 pub trait DebugInfoMethods<'tcx>: BackendTypes {
     fn create_vtable_metadata(&self, ty: Ty<'tcx>, vtable: Self::Value);
@@ -30,28 +30,34 @@ pub trait DebugInfoMethods<'tcx>: BackendTypes {
         defining_crate: CrateNum,
     ) -> Self::DIScope;
     fn debuginfo_finalize(&self);
-}
 
-pub trait DebugInfoBuilderMethods<'tcx>: BackendTypes {
-    fn declare_local(
-        &mut self,
+    // FIXME(eddyb) find a common convention for all of the debuginfo-related
+    // names (choose between `dbg`, `debug`, `debuginfo`, `debug_info` etc.).
+    fn create_dbg_var(
+        &self,
         dbg_context: &FunctionDebugContext<Self::DIScope>,
         variable_name: Name,
         variable_type: Ty<'tcx>,
         scope_metadata: Self::DIScope,
+        variable_kind: VariableKind,
+        span: Span,
+    ) -> Self::DIVariable;
+}
+
+pub trait DebugInfoBuilderMethods: BackendTypes {
+    // FIXME(eddyb) find a common convention for all of the debuginfo-related
+    // names (choose between `dbg`, `debug`, `debuginfo`, `debug_info` etc.).
+    fn dbg_var_addr(
+        &mut self,
+        dbg_var: Self::DIVariable,
+        scope_metadata: Self::DIScope,
         variable_alloca: Self::Value,
         direct_offset: Size,
         // NB: each offset implies a deref (i.e. they're steps in a pointer chain).
         indirect_offsets: &[Size],
-        variable_kind: VariableKind,
-        span: Span,
-    );
-    fn set_source_location(
-        &mut self,
-        debug_context: &mut FunctionDebugContext<Self::DIScope>,
-        scope: Self::DIScope,
         span: Span,
     );
+    fn set_source_location(&mut self, scope: Self::DIScope, span: Span);
     fn insert_reference_to_gdb_debug_scripts_section_global(&mut self);
     fn set_var_name(&mut self, value: Self::Value, name: &str);
 }
diff --git a/src/librustc_codegen_ssa/traits/mod.rs b/src/librustc_codegen_ssa/traits/mod.rs
index fff1b35507..d03ff8d4d3 100644
--- a/src/librustc_codegen_ssa/traits/mod.rs
+++ b/src/librustc_codegen_ssa/traits/mod.rs
@@ -8,7 +8,7 @@
 //! actual codegen, while the builder stores the information about the function during codegen and
 //! is used to produce the instructions of the backend IR.
 //!
-//! Finaly, a third `Backend` structure has to implement methods related to how codegen information
+//! Finally, a third `Backend` structure has to implement methods related to how codegen information
 //! is passed to the backend, especially for asynchronous compilation.
 //!
 //! The traits contain associated types that are backend-specific, such as the backend's value or
@@ -93,5 +93,6 @@ pub trait HasCodegen<'tcx>:
             Type = Self::Type,
             Funclet = Self::Funclet,
             DIScope = Self::DIScope,
+            DIVariable = Self::DIVariable,
         >;
 }
diff --git a/src/librustc_codegen_utils/Cargo.toml b/src/librustc_codegen_utils/Cargo.toml
index 8361a19ade..b5533a8307 100644
--- 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc = { path = "../librustc" }
 rustc_hir = { path = "../librustc_hir" }
diff --git a/src/librustc_codegen_utils/codegen_backend.rs b/src/librustc_codegen_utils/codegen_backend.rs
index fecb3986e7..96166e04c2 100644
--- a/src/librustc_codegen_utils/codegen_backend.rs
+++ b/src/librustc_codegen_utils/codegen_backend.rs
@@ -43,11 +43,22 @@ pub trait CodegenBackend {
     /// # Panics
     ///
     /// Panics when the passed `Box<dyn Any>` was not returned by `codegen_backend`.
-    fn join_codegen_and_link(
+    fn join_codegen(
         &self,
         ongoing_codegen: Box<dyn Any>,
         sess: &Session,
         dep_graph: &DepGraph,
+    ) -> Result<Box<dyn Any>, ErrorReported>;
+
+    /// This is called on the returned `Box<dyn Any>` from `join_codegen`
+    ///
+    /// # Panics
+    ///
+    /// Panics when the passed `Box<dyn Any>` was not returned by `join_codegen`.
+    fn link(
+        &self,
+        sess: &Session,
+        codegen_results: Box<dyn Any>,
         outputs: &OutputFilenames,
     ) -> Result<(), ErrorReported>;
 }
diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs
index 6b802bf530..38906bbaef 100644
--- a/src/librustc_codegen_utils/lib.rs
+++ b/src/librustc_codegen_utils/lib.rs
@@ -3,10 +3,6 @@
 //! This API is completely unstable and subject to change.
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-#![feature(arbitrary_self_types)]
-#![feature(box_patterns)]
-#![feature(box_syntax)]
-#![feature(core_intrinsics)]
 #![feature(never_type)]
 #![feature(nll)]
 #![feature(in_band_lifetimes)]
diff --git a/src/librustc_codegen_utils/link.rs b/src/librustc_codegen_utils/link.rs
index 4dab4545b4..524fb0a59c 100644
--- a/src/librustc_codegen_utils/link.rs
+++ b/src/librustc_codegen_utils/link.rs
@@ -1,9 +1,9 @@
 use rustc::session::config::{self, Input, OutputFilenames, OutputType};
 use rustc::session::Session;
+use rustc_ast::{ast, attr};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
 use std::path::{Path, PathBuf};
-use syntax::{ast, attr};
 
 pub fn out_filename(
     sess: &Session,
@@ -78,7 +78,7 @@ pub fn find_crate_name(sess: Option<&Session>, attrs: &[ast::Attribute], input:
     }
     if let Input::File(ref path) = *input {
         if let Some(s) = path.file_stem().and_then(|s| s.to_str()) {
-            if s.starts_with("-") {
+            if s.starts_with('-') {
                 let msg = format!(
                     "crate names cannot start with a `-`, but \
                                    `{}` has a leading hyphen",
diff --git a/src/librustc_codegen_utils/symbol_names.rs b/src/librustc_codegen_utils/symbol_names.rs
index 6713459f62..cfde09fad6 100644
--- a/src/librustc_codegen_utils/symbol_names.rs
+++ b/src/librustc_codegen_utils/symbol_names.rs
@@ -185,7 +185,7 @@ fn compute_symbol_name(
     //
     // * On the wasm32 targets there is a bug (or feature) in LLD [1] where the
     //   same-named symbol when imported from different wasm modules will get
-    //   hooked up incorectly. As a result foreign symbols, on the wasm target,
+    //   hooked up incorrectly. As a result foreign symbols, on the wasm target,
     //   with a wasm import module, get mangled. Additionally our codegen will
     //   deduplicate symbols based purely on the symbol name, but for wasm this
     //   isn't quite right because the same-named symbol on wasm can come from
diff --git a/src/librustc_codegen_utils/symbol_names/v0.rs b/src/librustc_codegen_utils/symbol_names/v0.rs
index ff4e128e19..ce6d0d9dc5 100644
--- a/src/librustc_codegen_utils/symbol_names/v0.rs
+++ b/src/librustc_codegen_utils/symbol_names/v0.rs
@@ -2,12 +2,12 @@ use rustc::hir::map::{DefPathData, DisambiguatedDefPathData};
 use rustc::ty::print::{Print, Printer};
 use rustc::ty::subst::{GenericArg, GenericArgKind, Subst};
 use rustc::ty::{self, Instance, Ty, TyCtxt, TypeFoldable};
+use rustc_ast::ast::{FloatTy, IntTy, UintTy};
 use rustc_data_structures::base_n;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_target::spec::abi::Abi;
-use syntax::ast::{FloatTy, IntTy, UintTy};
 
 use std::fmt::Write;
 use std::ops::Range;
diff --git a/src/librustc_data_structures/box_region.rs b/src/librustc_data_structures/box_region.rs
index 94abb89503..dbc54291f4 100644
--- a/src/librustc_data_structures/box_region.rs
+++ b/src/librustc_data_structures/box_region.rs
@@ -25,6 +25,7 @@ pub struct PinnedGenerator<I, A, R> {
 }
 
 impl<I, A, R> PinnedGenerator<I, A, R> {
+    #[cfg(bootstrap)]
     pub fn new<T: Generator<Yield = YieldType<I, A>, Return = R> + 'static>(
         generator: T,
     ) -> (I, Self) {
@@ -39,6 +40,22 @@ impl<I, A, R> PinnedGenerator<I, A, R> {
         (init, result)
     }
 
+    #[cfg(not(bootstrap))]
+    pub fn new<T: Generator<Yield = YieldType<I, A>, Return = R> + 'static>(
+        generator: T,
+    ) -> (I, Self) {
+        let mut result = PinnedGenerator { generator: Box::pin(generator) };
+
+        // Run it to the first yield to set it up
+        let init = match Pin::new(&mut result.generator).resume(()) {
+            GeneratorState::Yielded(YieldType::Initial(y)) => y,
+            _ => panic!(),
+        };
+
+        (init, result)
+    }
+
+    #[cfg(bootstrap)]
     pub unsafe fn access(&mut self, closure: *mut dyn FnMut()) {
         BOX_REGION_ARG.with(|i| {
             i.set(Action::Access(AccessAction(closure)));
@@ -50,6 +67,19 @@ impl<I, A, R> PinnedGenerator<I, A, R> {
         }
     }
 
+    #[cfg(not(bootstrap))]
+    pub unsafe fn access(&mut self, closure: *mut dyn FnMut()) {
+        BOX_REGION_ARG.with(|i| {
+            i.set(Action::Access(AccessAction(closure)));
+        });
+
+        // Call the generator, which in turn will call the closure in BOX_REGION_ARG
+        if let GeneratorState::Complete(_) = Pin::new(&mut self.generator).resume(()) {
+            panic!()
+        }
+    }
+
+    #[cfg(bootstrap)]
     pub fn complete(&mut self) -> R {
         // Tell the generator we want it to complete, consuming it and yielding a result
         BOX_REGION_ARG.with(|i| i.set(Action::Complete));
@@ -57,6 +87,15 @@ impl<I, A, R> PinnedGenerator<I, A, R> {
         let result = Pin::new(&mut self.generator).resume();
         if let GeneratorState::Complete(r) = result { r } else { panic!() }
     }
+
+    #[cfg(not(bootstrap))]
+    pub fn complete(&mut self) -> R {
+        // Tell the generator we want it to complete, consuming it and yielding a result
+        BOX_REGION_ARG.with(|i| i.set(Action::Complete));
+
+        let result = Pin::new(&mut self.generator).resume(());
+        if let GeneratorState::Complete(r) = result { r } else { panic!() }
+    }
 }
 
 #[derive(PartialEq)]
diff --git a/src/librustc_data_structures/graph/vec_graph/tests.rs b/src/librustc_data_structures/graph/vec_graph/tests.rs
index 1db8bd4b10..c8f9792671 100644
--- a/src/librustc_data_structures/graph/vec_graph/tests.rs
+++ b/src/librustc_data_structures/graph/vec_graph/tests.rs
@@ -23,7 +23,7 @@ fn num_nodes() {
 }
 
 #[test]
-fn succesors() {
+fn successors() {
     let graph = create_graph();
     assert_eq!(graph.successors(0), &[1]);
     assert_eq!(graph.successors(1), &[2, 3]);
diff --git a/src/librustc_data_structures/lib.rs b/src/librustc_data_structures/lib.rs
index aaac7fb446..13792a0c89 100644
--- a/src/librustc_data_structures/lib.rs
+++ b/src/librustc_data_structures/lib.rs
@@ -12,7 +12,6 @@
 #![feature(generators)]
 #![feature(generator_trait)]
 #![feature(fn_traits)]
-#![feature(unsize)]
 #![feature(specialization)]
 #![feature(optin_builtin_traits)]
 #![feature(nll)]
@@ -20,11 +19,9 @@
 #![feature(hash_raw_entry)]
 #![feature(stmt_expr_attributes)]
 #![feature(core_intrinsics)]
-#![feature(integer_atomics)]
 #![feature(test)]
 #![feature(associated_type_bounds)]
 #![feature(thread_id_value)]
-#![cfg_attr(unix, feature(libc))]
 #![allow(rustc::default_hash_types)]
 
 #[macro_use]
diff --git a/src/librustc_data_structures/macros.rs b/src/librustc_data_structures/macros.rs
index 83e6dbedee..67fbe3058c 100644
--- a/src/librustc_data_structures/macros.rs
+++ b/src/librustc_data_structures/macros.rs
@@ -17,3 +17,41 @@ macro_rules! static_assert_size {
         const _: [(); $size] = [(); ::std::mem::size_of::<$ty>()];
     };
 }
+
+#[macro_export]
+macro_rules! enum_from_u32 {
+    ($(#[$attr:meta])* pub enum $name:ident {
+        $($variant:ident = $e:expr,)*
+    }) => {
+        $(#[$attr])*
+        pub enum $name {
+            $($variant = $e),*
+        }
+
+        impl $name {
+            pub fn from_u32(u: u32) -> Option<$name> {
+                $(if u == $name::$variant as u32 {
+                    return Some($name::$variant)
+                })*
+                None
+            }
+        }
+    };
+    ($(#[$attr:meta])* pub enum $name:ident {
+        $($variant:ident,)*
+    }) => {
+        $(#[$attr])*
+        pub enum $name {
+            $($variant,)*
+        }
+
+        impl $name {
+            pub fn from_u32(u: u32) -> Option<$name> {
+                $(if u == $name::$variant as u32 {
+                    return Some($name::$variant)
+                })*
+                None
+            }
+        }
+    }
+}
diff --git a/src/librustc_data_structures/obligation_forest/graphviz.rs b/src/librustc_data_structures/obligation_forest/graphviz.rs
index ddf89d9962..e1784f44fd 100644
--- a/src/librustc_data_structures/obligation_forest/graphviz.rs
+++ b/src/librustc_data_structures/obligation_forest/graphviz.rs
@@ -2,6 +2,7 @@ use crate::obligation_forest::{ForestObligation, ObligationForest};
 use graphviz as dot;
 use std::env::var_os;
 use std::fs::File;
+use std::io::BufWriter;
 use std::path::Path;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
@@ -31,7 +32,7 @@ impl<O: ForestObligation> ObligationForest<O> {
 
         let file_path = dir.as_ref().join(format!("{:010}_{}.gv", counter, description));
 
-        let mut gv_file = File::create(file_path).unwrap();
+        let mut gv_file = BufWriter::new(File::create(file_path).unwrap());
 
         dot::render(&self, &mut gv_file).unwrap();
     }
@@ -51,7 +52,7 @@ impl<'a, O: ForestObligation + 'a> dot::Labeller<'a> for &'a ObligationForest<O>
 
     fn node_label(&self, index: &Self::Node) -> dot::LabelText<'_> {
         let node = &self.nodes[*index];
-        let label = format!("{:?} ({:?})", node.obligation.as_predicate(), node.state.get());
+        let label = format!("{:?} ({:?})", node.obligation.as_cache_key(), node.state.get());
 
         dot::LabelText::LabelStr(label.into())
     }
diff --git a/src/librustc_data_structures/obligation_forest/mod.rs b/src/librustc_data_structures/obligation_forest/mod.rs
index 974d9dcfae..6711a49b2b 100644
--- a/src/librustc_data_structures/obligation_forest/mod.rs
+++ b/src/librustc_data_structures/obligation_forest/mod.rs
@@ -74,7 +74,7 @@
 
 use crate::fx::{FxHashMap, FxHashSet};
 
-use std::cell::{Cell, RefCell};
+use std::cell::Cell;
 use std::collections::hash_map::Entry;
 use std::fmt::Debug;
 use std::hash;
@@ -86,9 +86,13 @@ mod graphviz;
 mod tests;
 
 pub trait ForestObligation: Clone + Debug {
-    type Predicate: Clone + hash::Hash + Eq + Debug;
+    type CacheKey: Clone + hash::Hash + Eq + Debug;
 
-    fn as_predicate(&self) -> &Self::Predicate;
+    /// Converts this `ForestObligation` suitable for use as a cache key.
+    /// If two distinct `ForestObligations`s return the same cache key,
+    /// then it must be sound to use the result of processing one obligation
+    /// (e.g. success for error) for the other obligation
+    fn as_cache_key(&self) -> Self::CacheKey;
 }
 
 pub trait ObligationProcessor {
@@ -138,15 +142,15 @@ pub struct ObligationForest<O: ForestObligation> {
     nodes: Vec<Node<O>>,
 
     /// A cache of predicates that have been successfully completed.
-    done_cache: FxHashSet<O::Predicate>,
+    done_cache: FxHashSet<O::CacheKey>,
 
     /// A cache of the nodes in `nodes`, indexed by predicate. Unfortunately,
     /// its contents are not guaranteed to match those of `nodes`. See the
     /// comments in `process_obligation` for details.
-    active_cache: FxHashMap<O::Predicate, usize>,
+    active_cache: FxHashMap<O::CacheKey, usize>,
 
     /// A vector reused in compress(), to avoid allocating new vectors.
-    node_rewrites: RefCell<Vec<usize>>,
+    node_rewrites: Vec<usize>,
 
     obligation_tree_id_generator: ObligationTreeIdGenerator,
 
@@ -157,7 +161,7 @@ pub struct ObligationForest<O: ForestObligation> {
     /// See [this][details] for details.
     ///
     /// [details]: https://github.com/rust-lang/rust/pull/53255#issuecomment-421184780
-    error_cache: FxHashMap<ObligationTreeId, FxHashSet<O::Predicate>>,
+    error_cache: FxHashMap<ObligationTreeId, FxHashSet<O::CacheKey>>,
 }
 
 #[derive(Debug)]
@@ -285,7 +289,7 @@ impl<O: ForestObligation> ObligationForest<O> {
             nodes: vec![],
             done_cache: Default::default(),
             active_cache: Default::default(),
-            node_rewrites: RefCell::new(vec![]),
+            node_rewrites: vec![],
             obligation_tree_id_generator: (0..).map(ObligationTreeId),
             error_cache: Default::default(),
         }
@@ -305,11 +309,12 @@ impl<O: ForestObligation> ObligationForest<O> {
 
     // Returns Err(()) if we already know this obligation failed.
     fn register_obligation_at(&mut self, obligation: O, parent: Option<usize>) -> Result<(), ()> {
-        if self.done_cache.contains(obligation.as_predicate()) {
+        if self.done_cache.contains(&obligation.as_cache_key()) {
+            debug!("register_obligation_at: ignoring already done obligation: {:?}", obligation);
             return Ok(());
         }
 
-        match self.active_cache.entry(obligation.as_predicate().clone()) {
+        match self.active_cache.entry(obligation.as_cache_key()) {
             Entry::Occupied(o) => {
                 let node = &mut self.nodes[*o.get()];
                 if let Some(parent_index) = parent {
@@ -333,7 +338,7 @@ impl<O: ForestObligation> ObligationForest<O> {
                     && self
                         .error_cache
                         .get(&obligation_tree_id)
-                        .map(|errors| errors.contains(obligation.as_predicate()))
+                        .map(|errors| errors.contains(&obligation.as_cache_key()))
                         .unwrap_or(false);
 
                 if already_failed {
@@ -380,7 +385,7 @@ impl<O: ForestObligation> ObligationForest<O> {
         self.error_cache
             .entry(node.obligation_tree_id)
             .or_default()
-            .insert(node.obligation.as_predicate().clone());
+            .insert(node.obligation.as_cache_key());
     }
 
     /// Performs a pass through the obligation list. This must
@@ -590,7 +595,7 @@ impl<O: ForestObligation> ObligationForest<O> {
     #[inline(never)]
     fn compress(&mut self, do_completed: DoCompleted) -> Option<Vec<O>> {
         let orig_nodes_len = self.nodes.len();
-        let mut node_rewrites: Vec<_> = self.node_rewrites.replace(vec![]);
+        let mut node_rewrites: Vec<_> = std::mem::take(&mut self.node_rewrites);
         debug_assert!(node_rewrites.is_empty());
         node_rewrites.extend(0..orig_nodes_len);
         let mut dead_nodes = 0;
@@ -618,11 +623,11 @@ impl<O: ForestObligation> ObligationForest<O> {
                     // `self.nodes`. See the comment in `process_obligation`
                     // for more details.
                     if let Some((predicate, _)) =
-                        self.active_cache.remove_entry(node.obligation.as_predicate())
+                        self.active_cache.remove_entry(&node.obligation.as_cache_key())
                     {
                         self.done_cache.insert(predicate);
                     } else {
-                        self.done_cache.insert(node.obligation.as_predicate().clone());
+                        self.done_cache.insert(node.obligation.as_cache_key().clone());
                     }
                     if do_completed == DoCompleted::Yes {
                         // Extract the success stories.
@@ -635,7 +640,7 @@ impl<O: ForestObligation> ObligationForest<O> {
                     // We *intentionally* remove the node from the cache at this point. Otherwise
                     // tests must come up with a different type on every type error they
                     // check against.
-                    self.active_cache.remove(node.obligation.as_predicate());
+                    self.active_cache.remove(&node.obligation.as_cache_key());
                     self.insert_into_error_cache(index);
                     node_rewrites[index] = orig_nodes_len;
                     dead_nodes += 1;
@@ -651,7 +656,7 @@ impl<O: ForestObligation> ObligationForest<O> {
         }
 
         node_rewrites.truncate(0);
-        self.node_rewrites.replace(node_rewrites);
+        self.node_rewrites = node_rewrites;
 
         if do_completed == DoCompleted::Yes { Some(removed_done_obligations) } else { None }
     }
diff --git a/src/librustc_data_structures/obligation_forest/tests.rs b/src/librustc_data_structures/obligation_forest/tests.rs
index e29335aab2..01652465ee 100644
--- a/src/librustc_data_structures/obligation_forest/tests.rs
+++ b/src/librustc_data_structures/obligation_forest/tests.rs
@@ -4,9 +4,9 @@ use std::fmt;
 use std::marker::PhantomData;
 
 impl<'a> super::ForestObligation for &'a str {
-    type Predicate = &'a str;
+    type CacheKey = &'a str;
 
-    fn as_predicate(&self) -> &Self::Predicate {
+    fn as_cache_key(&self) -> Self::CacheKey {
         self
     }
 }
diff --git a/src/librustc_data_structures/profiling.rs b/src/librustc_data_structures/profiling.rs
index 90f74328a1..a70314c35c 100644
--- a/src/librustc_data_structures/profiling.rs
+++ b/src/librustc_data_structures/profiling.rs
@@ -81,8 +81,12 @@
 //!
 //! [mm]: https://github.com/rust-lang/measureme/
 
+use crate::cold_path;
 use crate::fx::FxHashMap;
 
+use std::borrow::Borrow;
+use std::collections::hash_map::Entry;
+use std::convert::Into;
 use std::error::Error;
 use std::fs;
 use std::path::Path;
@@ -123,11 +127,15 @@ bitflags::bitflags! {
         const INCR_CACHE_LOADS   = 1 << 4;
 
         const QUERY_KEYS         = 1 << 5;
+        const FUNCTION_ARGS      = 1 << 6;
+        const LLVM               = 1 << 7;
 
         const DEFAULT = Self::GENERIC_ACTIVITIES.bits |
                         Self::QUERY_PROVIDERS.bits |
                         Self::QUERY_BLOCKED.bits |
                         Self::INCR_CACHE_LOADS.bits;
+
+        const ARGS = Self::QUERY_KEYS.bits | Self::FUNCTION_ARGS.bits;
     }
 }
 
@@ -142,6 +150,9 @@ const EVENT_FILTERS_BY_NAME: &[(&str, EventFilter)] = &[
     ("query-blocked", EventFilter::QUERY_BLOCKED),
     ("incr-cache-load", EventFilter::INCR_CACHE_LOADS),
     ("query-keys", EventFilter::QUERY_KEYS),
+    ("function-args", EventFilter::FUNCTION_ARGS),
+    ("args", EventFilter::ARGS),
+    ("llvm", EventFilter::LLVM),
 ];
 
 /// Something that uniquely identifies a query invocation.
@@ -216,43 +227,68 @@ impl SelfProfilerRef {
     /// VerboseTimingGuard returned from this call is dropped. In addition to recording
     /// a measureme event, "verbose" generic activities also print a timing entry to
     /// stdout if the compiler is invoked with -Ztime or -Ztime-passes.
-    #[inline(always)]
     pub fn verbose_generic_activity<'a>(
         &'a self,
-        event_id: &'static str,
+        event_label: &'static str,
     ) -> VerboseTimingGuard<'a> {
-        VerboseTimingGuard::start(
-            event_id,
-            self.print_verbose_generic_activities,
-            self.generic_activity(event_id),
-        )
+        let message =
+            if self.print_verbose_generic_activities { Some(event_label.to_owned()) } else { None };
+
+        VerboseTimingGuard::start(message, self.generic_activity(event_label))
     }
 
     /// Start profiling a extra verbose generic activity. Profiling continues until the
     /// VerboseTimingGuard returned from this call is dropped. In addition to recording
     /// a measureme event, "extra verbose" generic activities also print a timing entry to
     /// stdout if the compiler is invoked with -Ztime-passes.
-    #[inline(always)]
-    pub fn extra_verbose_generic_activity<'a>(
+    pub fn extra_verbose_generic_activity<'a, A>(
         &'a self,
-        event_id: &'a str,
-    ) -> VerboseTimingGuard<'a> {
-        // FIXME: This does not yet emit a measureme event
-        // because callers encode arguments into `event_id`.
-        VerboseTimingGuard::start(
-            event_id,
-            self.print_extra_verbose_generic_activities,
-            TimingGuard::none(),
-        )
+        event_label: &'static str,
+        event_arg: A,
+    ) -> VerboseTimingGuard<'a>
+    where
+        A: Borrow<str> + Into<String>,
+    {
+        let message = if self.print_extra_verbose_generic_activities {
+            Some(format!("{}({})", event_label, event_arg.borrow()))
+        } else {
+            None
+        };
+
+        VerboseTimingGuard::start(message, self.generic_activity_with_arg(event_label, event_arg))
+    }
+
+    /// Start profiling a generic activity. Profiling continues until the
+    /// TimingGuard returned from this call is dropped.
+    #[inline(always)]
+    pub fn generic_activity(&self, event_label: &'static str) -> TimingGuard<'_> {
+        self.exec(EventFilter::GENERIC_ACTIVITIES, |profiler| {
+            let event_label = profiler.get_or_alloc_cached_string(event_label);
+            let event_id = EventId::from_label(event_label);
+            TimingGuard::start(profiler, profiler.generic_activity_event_kind, event_id)
+        })
     }
 
     /// Start profiling a generic activity. Profiling continues until the
     /// TimingGuard returned from this call is dropped.
     #[inline(always)]
-    pub fn generic_activity(&self, event_id: &'static str) -> TimingGuard<'_> {
+    pub fn generic_activity_with_arg<A>(
+        &self,
+        event_label: &'static str,
+        event_arg: A,
+    ) -> TimingGuard<'_>
+    where
+        A: Borrow<str> + Into<String>,
+    {
         self.exec(EventFilter::GENERIC_ACTIVITIES, |profiler| {
-            let event_id = profiler.get_or_alloc_cached_string(event_id);
-            let event_id = EventId::from_label(event_id);
+            let builder = EventIdBuilder::new(&profiler.profiler);
+            let event_label = profiler.get_or_alloc_cached_string(event_label);
+            let event_id = if profiler.event_filter_mask.contains(EventFilter::FUNCTION_ARGS) {
+                let event_arg = profiler.get_or_alloc_cached_string(event_arg);
+                builder.from_label_and_arg(event_label, event_arg)
+            } else {
+                builder.from_label(event_label)
+            };
             TimingGuard::start(profiler, profiler.generic_activity_event_kind, event_id)
         })
     }
@@ -331,13 +367,22 @@ impl SelfProfilerRef {
     pub fn enabled(&self) -> bool {
         self.profiler.is_some()
     }
+
+    #[inline]
+    pub fn llvm_recording_enabled(&self) -> bool {
+        self.event_filter_mask.contains(EventFilter::LLVM)
+    }
+    #[inline]
+    pub fn get_self_profiler(&self) -> Option<Arc<SelfProfiler>> {
+        self.profiler.clone()
+    }
 }
 
 pub struct SelfProfiler {
     profiler: Profiler,
     event_filter_mask: EventFilter,
 
-    string_cache: RwLock<FxHashMap<&'static str, StringId>>,
+    string_cache: RwLock<FxHashMap<String, StringId>>,
 
     query_event_kind: StringId,
     generic_activity_event_kind: StringId,
@@ -380,7 +425,7 @@ impl SelfProfiler {
             }
 
             // Warn about any unknown event names
-            if unknown_events.len() > 0 {
+            if !unknown_events.is_empty() {
                 unknown_events.sort();
                 unknown_events.dedup();
 
@@ -419,13 +464,16 @@ impl SelfProfiler {
     /// Gets a `StringId` for the given string. This method makes sure that
     /// any strings going through it will only be allocated once in the
     /// profiling data.
-    pub fn get_or_alloc_cached_string(&self, s: &'static str) -> StringId {
+    pub fn get_or_alloc_cached_string<A>(&self, s: A) -> StringId
+    where
+        A: Borrow<str> + Into<String>,
+    {
         // Only acquire a read-lock first since we assume that the string is
         // already present in the common case.
         {
             let string_cache = self.string_cache.read();
 
-            if let Some(&id) = string_cache.get(s) {
+            if let Some(&id) = string_cache.get(s.borrow()) {
                 return id;
             }
         }
@@ -433,7 +481,13 @@ impl SelfProfiler {
         let mut string_cache = self.string_cache.write();
         // Check if the string has already been added in the small time window
         // between dropping the read lock and acquiring the write lock.
-        *string_cache.entry(s).or_insert_with(|| self.profiler.alloc_string(s))
+        match string_cache.entry(s.into()) {
+            Entry::Occupied(e) => *e.get(),
+            Entry::Vacant(e) => {
+                let string_id = self.profiler.alloc_string(&e.key()[..]);
+                *e.insert(string_id)
+            }
+        }
     }
 
     pub fn map_query_invocation_id_to_string(&self, from: QueryInvocationId, to: StringId) {
@@ -478,9 +532,11 @@ impl<'a> TimingGuard<'a> {
     #[inline]
     pub fn finish_with_query_invocation_id(self, query_invocation_id: QueryInvocationId) {
         if let Some(guard) = self.0 {
-            let event_id = StringId::new_virtual(query_invocation_id.0);
-            let event_id = EventId::from_virtual(event_id);
-            guard.finish_with_override_event_id(event_id);
+            cold_path(|| {
+                let event_id = StringId::new_virtual(query_invocation_id.0);
+                let event_id = EventId::from_virtual(event_id);
+                guard.finish_with_override_event_id(event_id);
+            });
         }
     }
 
@@ -498,18 +554,13 @@ impl<'a> TimingGuard<'a> {
 
 #[must_use]
 pub struct VerboseTimingGuard<'a> {
-    event_id: &'a str,
-    start: Option<Instant>,
+    start_and_message: Option<(Instant, String)>,
     _guard: TimingGuard<'a>,
 }
 
 impl<'a> VerboseTimingGuard<'a> {
-    pub fn start(event_id: &'a str, verbose: bool, _guard: TimingGuard<'a>) -> Self {
-        VerboseTimingGuard {
-            event_id,
-            _guard,
-            start: if unlikely!(verbose) { Some(Instant::now()) } else { None },
-        }
+    pub fn start(message: Option<String>, _guard: TimingGuard<'a>) -> Self {
+        VerboseTimingGuard { _guard, start_and_message: message.map(|msg| (Instant::now(), msg)) }
     }
 
     #[inline(always)]
@@ -521,7 +572,9 @@ impl<'a> VerboseTimingGuard<'a> {
 
 impl Drop for VerboseTimingGuard<'_> {
     fn drop(&mut self) {
-        self.start.map(|start| print_time_passes_entry(true, self.event_id, start.elapsed()));
+        if let Some((start, ref message)) = self.start_and_message {
+            print_time_passes_entry(true, &message[..], start.elapsed());
+        }
     }
 }
 
diff --git a/src/librustc_data_structures/sharded.rs b/src/librustc_data_structures/sharded.rs
index ee3f88ff16..d08d46a741 100644
--- a/src/librustc_data_structures/sharded.rs
+++ b/src/librustc_data_structures/sharded.rs
@@ -13,7 +13,7 @@ struct CacheAligned<T>(T);
 #[cfg(parallel_compiler)]
 // 32 shards is sufficient to reduce contention on an 8-core Ryzen 7 1700,
 // but this should be tested on higher core count CPUs. How the `Sharded` type gets used
-// may also affect the ideal nunber of shards.
+// may also affect the ideal number of shards.
 const SHARD_BITS: usize = 5;
 
 #[cfg(not(parallel_compiler))]
@@ -41,7 +41,7 @@ impl<T> Sharded<T> {
         let mut values: SmallVec<[_; SHARDS]> =
             (0..SHARDS).map(|_| CacheAligned(Lock::new(value()))).collect();
 
-        // Create an unintialized array
+        // Create an uninitialized array
         let mut shards: mem::MaybeUninit<[CacheAligned<Lock<T>>; SHARDS]> =
             mem::MaybeUninit::uninit();
 
@@ -69,12 +69,21 @@ impl<T> Sharded<T> {
     /// `hash` can be computed with any hasher, so long as that hasher is used
     /// consistently for each `Sharded` instance.
     #[inline]
-    pub fn get_shard_by_hash(&self, hash: u64) -> &Lock<T> {
+    pub fn get_shard_index_by_hash(&self, hash: u64) -> usize {
         let hash_len = mem::size_of::<usize>();
         // Ignore the top 7 bits as hashbrown uses these and get the next SHARD_BITS highest bits.
         // hashbrown also uses the lowest bits, so we can't use those
         let bits = (hash >> (hash_len * 8 - 7 - SHARD_BITS)) as usize;
-        let i = bits % SHARDS;
+        bits % SHARDS
+    }
+
+    #[inline]
+    pub fn get_shard_by_hash(&self, hash: u64) -> &Lock<T> {
+        &self.shards[self.get_shard_index_by_hash(hash)].0
+    }
+
+    #[inline]
+    pub fn get_shard_by_index(&self, i: usize) -> &Lock<T> {
         &self.shards[i].0
     }
 
diff --git a/src/librustc_data_structures/sip128.rs b/src/librustc_data_structures/sip128.rs
index f805be8499..beb28dd072 100644
--- a/src/librustc_data_structures/sip128.rs
+++ b/src/librustc_data_structures/sip128.rs
@@ -4,7 +4,6 @@ use std::cmp;
 use std::hash::Hasher;
 use std::mem;
 use std::ptr;
-use std::slice;
 
 #[cfg(test)]
 mod tests;
@@ -70,7 +69,9 @@ macro_rules! load_int_le {
     }};
 }
 
-/// Loads an u64 using up to 7 bytes of a byte slice.
+/// Loads a u64 using up to 7 bytes of a byte slice. It looks clumsy but the
+/// `copy_nonoverlapping` calls that occur (via `load_int_le!`) all have fixed
+/// sizes and avoid calling `memcpy`, which is good for speed.
 ///
 /// Unsafe because: unchecked indexing at start..start+len
 #[inline]
@@ -79,15 +80,15 @@ unsafe fn u8to64_le(buf: &[u8], start: usize, len: usize) -> u64 {
     let mut i = 0; // current byte index (from LSB) in the output u64
     let mut out = 0;
     if i + 3 < len {
-        out = u64::from(load_int_le!(buf, start + i, u32));
+        out = load_int_le!(buf, start + i, u32) as u64;
         i += 4;
     }
     if i + 1 < len {
-        out |= u64::from(load_int_le!(buf, start + i, u16)) << (i * 8);
+        out |= (load_int_le!(buf, start + i, u16) as u64) << (i * 8);
         i += 2
     }
     if i < len {
-        out |= u64::from(*buf.get_unchecked(start + i)) << (i * 8);
+        out |= (*buf.get_unchecked(start + i) as u64) << (i * 8);
         i += 1;
     }
     debug_assert_eq!(i, len);
@@ -122,42 +123,76 @@ impl SipHasher128 {
         self.state.v1 ^= 0xee;
     }
 
-    // Specialized write function that is only valid for buffers with len <= 8.
-    // It's used to force inlining of write_u8 and write_usize, those would normally be inlined
-    // except for composite types (that includes slices and str hashing because of delimiter).
-    // Without this extra push the compiler is very reluctant to inline delimiter writes,
-    // degrading performance substantially for the most common use cases.
+    // A specialized write function for values with size <= 8.
+    //
+    // The hashing of multi-byte integers depends on endianness. E.g.:
+    // - little-endian: `write_u32(0xDDCCBBAA)` == `write([0xAA, 0xBB, 0xCC, 0xDD])`
+    // - big-endian:    `write_u32(0xDDCCBBAA)` == `write([0xDD, 0xCC, 0xBB, 0xAA])`
+    //
+    // This function does the right thing for little-endian hardware. On
+    // big-endian hardware `x` must be byte-swapped first to give the right
+    // behaviour. After any byte-swapping, the input must be zero-extended to
+    // 64-bits. The caller is responsible for the byte-swapping and
+    // zero-extension.
     #[inline]
-    fn short_write(&mut self, msg: &[u8]) {
-        debug_assert!(msg.len() <= 8);
-        let length = msg.len();
-        self.length += length;
+    fn short_write<T>(&mut self, _x: T, x: u64) {
+        let size = mem::size_of::<T>();
+        self.length += size;
+
+        // The original number must be zero-extended, not sign-extended.
+        debug_assert!(if size < 8 { x >> (8 * size) == 0 } else { true });
 
+        // The number of bytes needed to fill `self.tail`.
         let needed = 8 - self.ntail;
-        let fill = cmp::min(length, needed);
-        if fill == 8 {
-            self.tail = unsafe { load_int_le!(msg, 0, u64) };
-        } else {
-            self.tail |= unsafe { u8to64_le(msg, 0, fill) } << (8 * self.ntail);
-            if length < needed {
-                self.ntail += length;
-                return;
-            }
+
+        // SipHash parses the input stream as 8-byte little-endian integers.
+        // Inputs are put into `self.tail` until 8 bytes of data have been
+        // collected, and then that word is processed.
+        //
+        // For example, imagine that `self.tail` is 0x0000_00EE_DDCC_BBAA,
+        // `self.ntail` is 5 (because 5 bytes have been put into `self.tail`),
+        // and `needed` is therefore 3.
+        //
+        // - Scenario 1, `self.write_u8(0xFF)`: we have already zero-extended
+        //   the input to 0x0000_0000_0000_00FF. We now left-shift it five
+        //   bytes, giving 0x0000_FF00_0000_0000. We then bitwise-OR that value
+        //   into `self.tail`, resulting in 0x0000_FFEE_DDCC_BBAA.
+        //   (Zero-extension of the original input is critical in this scenario
+        //   because we don't want the high two bytes of `self.tail` to be
+        //   touched by the bitwise-OR.) `self.tail` is not yet full, so we
+        //   return early, after updating `self.ntail` to 6.
+        //
+        // - Scenario 2, `self.write_u32(0xIIHH_GGFF)`: we have already
+        //   zero-extended the input to 0x0000_0000_IIHH_GGFF. We now
+        //   left-shift it five bytes, giving 0xHHGG_FF00_0000_0000. We then
+        //   bitwise-OR that value into `self.tail`, resulting in
+        //   0xHHGG_FFEE_DDCC_BBAA. `self.tail` is now full, and we can use it
+        //   to update `self.state`. (As mentioned above, this assumes a
+        //   little-endian machine; on a big-endian machine we would have
+        //   byte-swapped 0xIIHH_GGFF in the caller, giving 0xFFGG_HHII, and we
+        //   would then end up bitwise-ORing 0xGGHH_II00_0000_0000 into
+        //   `self.tail`).
+        //
+        self.tail |= x << (8 * self.ntail);
+        if size < needed {
+            self.ntail += size;
+            return;
         }
+
+        // `self.tail` is full, process it.
         self.state.v3 ^= self.tail;
         Sip24Rounds::c_rounds(&mut self.state);
         self.state.v0 ^= self.tail;
 
-        // Buffered tail is now flushed, process new input.
-        self.ntail = length - needed;
-        self.tail = unsafe { u8to64_le(msg, needed, self.ntail) };
-    }
-
-    #[inline(always)]
-    fn short_write_gen<T>(&mut self, x: T) {
-        let bytes =
-            unsafe { slice::from_raw_parts(&x as *const T as *const u8, mem::size_of::<T>()) };
-        self.short_write(bytes);
+        // Continuing scenario 2: we have one byte left over from the input. We
+        // set `self.ntail` to 1 and `self.tail` to `0x0000_0000_IIHH_GGFF >>
+        // 8*3`, which is 0x0000_0000_0000_00II. (Or on a big-endian machine
+        // the prior byte-swapping would leave us with 0x0000_0000_0000_00FF.)
+        //
+        // The `if` is needed to avoid shifting by 64 bits, which Rust
+        // complains about.
+        self.ntail = size - needed;
+        self.tail = if needed < 8 { x >> (8 * needed) } else { 0 };
     }
 
     #[inline]
@@ -182,52 +217,52 @@ impl SipHasher128 {
 impl Hasher for SipHasher128 {
     #[inline]
     fn write_u8(&mut self, i: u8) {
-        self.short_write_gen(i);
+        self.short_write(i, i as u64);
     }
 
     #[inline]
     fn write_u16(&mut self, i: u16) {
-        self.short_write_gen(i);
+        self.short_write(i, i.to_le() as u64);
     }
 
     #[inline]
     fn write_u32(&mut self, i: u32) {
-        self.short_write_gen(i);
+        self.short_write(i, i.to_le() as u64);
     }
 
     #[inline]
     fn write_u64(&mut self, i: u64) {
-        self.short_write_gen(i);
+        self.short_write(i, i.to_le() as u64);
     }
 
     #[inline]
     fn write_usize(&mut self, i: usize) {
-        self.short_write_gen(i);
+        self.short_write(i, i.to_le() as u64);
     }
 
     #[inline]
     fn write_i8(&mut self, i: i8) {
-        self.short_write_gen(i);
+        self.short_write(i, i as u8 as u64);
     }
 
     #[inline]
     fn write_i16(&mut self, i: i16) {
-        self.short_write_gen(i);
+        self.short_write(i, (i as u16).to_le() as u64);
     }
 
     #[inline]
     fn write_i32(&mut self, i: i32) {
-        self.short_write_gen(i);
+        self.short_write(i, (i as u32).to_le() as u64);
     }
 
     #[inline]
     fn write_i64(&mut self, i: i64) {
-        self.short_write_gen(i);
+        self.short_write(i, (i as u64).to_le() as u64);
     }
 
     #[inline]
     fn write_isize(&mut self, i: isize) {
-        self.short_write_gen(i);
+        self.short_write(i, (i as usize).to_le() as u64);
     }
 
     #[inline]
diff --git a/src/librustc_data_structures/sorted_map.rs b/src/librustc_data_structures/sorted_map.rs
index 08706aac11..8c42b74b85 100644
--- a/src/librustc_data_structures/sorted_map.rs
+++ b/src/librustc_data_structures/sorted_map.rs
@@ -4,6 +4,10 @@ use std::iter::FromIterator;
 use std::mem;
 use std::ops::{Bound, Index, IndexMut, RangeBounds};
 
+mod index_map;
+
+pub use index_map::SortedIndexMultiMap;
+
 /// `SortedMap` is a data structure with similar characteristics as BTreeMap but
 /// slightly different trade-offs: lookup, insertion, and removal are O(log(N))
 /// and elements can be iterated in order cheaply.
diff --git a/src/librustc_data_structures/sorted_map/index_map.rs b/src/librustc_data_structures/sorted_map/index_map.rs
new file mode 100644
index 0000000000..b7005ccdc9
--- /dev/null
+++ b/src/librustc_data_structures/sorted_map/index_map.rs
@@ -0,0 +1,218 @@
+//! A variant of `SortedMap` that preserves insertion order.
+
+use std::borrow::Borrow;
+use std::hash::{Hash, Hasher};
+use std::iter::FromIterator;
+
+use crate::stable_hasher::{HashStable, StableHasher};
+use rustc_index::vec::{Idx, IndexVec};
+
+/// An indexed multi-map that preserves insertion order while permitting both `O(log n)` lookup of
+/// an item by key and `O(1)` lookup by index.
+///
+/// This data structure is a hybrid of an [`IndexVec`] and a [`SortedMap`]. Like `IndexVec`,
+/// `SortedIndexMultiMap` assigns a typed index to each item while preserving insertion order.
+/// Like `SortedMap`, `SortedIndexMultiMap` has efficient lookup of items by key. However, this
+/// is accomplished by sorting an array of item indices instead of the items themselves.
+///
+/// Unlike `SortedMap`, this data structure can hold multiple equivalent items at once, so the
+/// `get_by_key` method and its variants return an iterator instead of an `Option`. Equivalent
+/// items will be yielded in insertion order.
+///
+/// Unlike a general-purpose map like `BTreeSet` or `HashSet`, `SortedMap` and
+/// `SortedIndexMultiMap` require `O(n)` time to insert a single item. This is because we may need
+/// to insert into the middle of the sorted array. Users should avoid mutating this data structure
+/// in-place.
+///
+/// [`IndexVec`]: ../../rustc_index/vec/struct.IndexVec.html
+/// [`SortedMap`]: ../sorted_map/struct.SortedMap.html
+#[derive(Clone, Debug)]
+pub struct SortedIndexMultiMap<I: Idx, K, V> {
+    /// The elements of the map in insertion order.
+    items: IndexVec<I, (K, V)>,
+
+    /// Indices of the items in the set, sorted by the item's key.
+    idx_sorted_by_item_key: Vec<I>,
+}
+
+impl<I: Idx, K: Ord, V> SortedIndexMultiMap<I, K, V> {
+    pub fn new() -> Self {
+        SortedIndexMultiMap { items: IndexVec::new(), idx_sorted_by_item_key: Vec::new() }
+    }
+
+    pub fn len(&self) -> usize {
+        self.items.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.items.is_empty()
+    }
+
+    /// Returns an iterator over the items in the map in insertion order.
+    pub fn into_iter(self) -> impl DoubleEndedIterator<Item = (K, V)> {
+        self.items.into_iter()
+    }
+
+    /// Returns an iterator over the items in the map in insertion order along with their indices.
+    pub fn into_iter_enumerated(self) -> impl DoubleEndedIterator<Item = (I, (K, V))> {
+        self.items.into_iter_enumerated()
+    }
+
+    /// Returns an iterator over the items in the map in insertion order.
+    pub fn iter(&self) -> impl '_ + DoubleEndedIterator<Item = (&K, &V)> {
+        self.items.iter().map(|(ref k, ref v)| (k, v))
+    }
+
+    /// Returns an iterator over the items in the map in insertion order along with their indices.
+    pub fn iter_enumerated(&self) -> impl '_ + DoubleEndedIterator<Item = (I, (&K, &V))> {
+        self.items.iter_enumerated().map(|(i, (ref k, ref v))| (i, (k, v)))
+    }
+
+    /// Returns the item in the map with the given index.
+    pub fn get(&self, idx: I) -> Option<&(K, V)> {
+        self.items.get(idx)
+    }
+
+    /// Returns an iterator over the items in the map that are equal to `key`.
+    ///
+    /// If there are multiple items that are equivalent to `key`, they will be yielded in
+    /// insertion order.
+    pub fn get_by_key<Q: 'a>(&'a self, key: &Q) -> impl 'a + Iterator<Item = &'a V>
+    where
+        Q: Ord + ?Sized,
+        K: Borrow<Q>,
+    {
+        self.get_by_key_enumerated(key).map(|(_, v)| v)
+    }
+
+    /// Returns an iterator over the items in the map that are equal to `key` along with their
+    /// indices.
+    ///
+    /// If there are multiple items that are equivalent to `key`, they will be yielded in
+    /// insertion order.
+    pub fn get_by_key_enumerated<Q>(&self, key: &Q) -> impl '_ + Iterator<Item = (I, &V)>
+    where
+        Q: Ord + ?Sized,
+        K: Borrow<Q>,
+    {
+        // FIXME: This should be in the standard library as `equal_range`. See rust-lang/rfcs#2184.
+        match self.binary_search_idx(key) {
+            Err(_) => self.idxs_to_items_enumerated(&[]),
+
+            Ok(idx) => {
+                let start = self.find_lower_bound(key, idx);
+                let end = self.find_upper_bound(key, idx);
+                self.idxs_to_items_enumerated(&self.idx_sorted_by_item_key[start..end])
+            }
+        }
+    }
+
+    fn binary_search_idx<Q>(&self, key: &Q) -> Result<usize, usize>
+    where
+        Q: Ord + ?Sized,
+        K: Borrow<Q>,
+    {
+        self.idx_sorted_by_item_key.binary_search_by(|&idx| self.items[idx].0.borrow().cmp(key))
+    }
+
+    /// Returns the index into the `idx_sorted_by_item_key` array of the first item equal to
+    /// `key`.
+    ///
+    /// `initial` must be an index into that same array for an item that is equal to `key`.
+    fn find_lower_bound<Q>(&self, key: &Q, initial: usize) -> usize
+    where
+        Q: Ord + ?Sized,
+        K: Borrow<Q>,
+    {
+        debug_assert!(self.items[self.idx_sorted_by_item_key[initial]].0.borrow() == key);
+
+        // FIXME: At present, this uses linear search, meaning lookup is only `O(log n)` if duplicate
+        // entries are rare. It would be better to start with a linear search for the common case but
+        // fall back to an exponential search if many duplicates are found. This applies to
+        // `upper_bound` as well.
+        let mut start = initial;
+        while start != 0 && self.items[self.idx_sorted_by_item_key[start - 1]].0.borrow() == key {
+            start -= 1;
+        }
+
+        start
+    }
+
+    /// Returns the index into the `idx_sorted_by_item_key` array of the first item greater than
+    /// `key`, or `self.len()` if no such item exists.
+    ///
+    /// `initial` must be an index into that same array for an item that is equal to `key`.
+    fn find_upper_bound<Q>(&self, key: &Q, initial: usize) -> usize
+    where
+        Q: Ord + ?Sized,
+        K: Borrow<Q>,
+    {
+        debug_assert!(self.items[self.idx_sorted_by_item_key[initial]].0.borrow() == key);
+
+        // See the FIXME for `find_lower_bound`.
+        let mut end = initial + 1;
+        let len = self.items.len();
+        while end < len && self.items[self.idx_sorted_by_item_key[end]].0.borrow() == key {
+            end += 1;
+        }
+
+        end
+    }
+
+    fn idxs_to_items_enumerated(&'a self, idxs: &'a [I]) -> impl 'a + Iterator<Item = (I, &'a V)> {
+        idxs.iter().map(move |&idx| (idx, &self.items[idx].1))
+    }
+}
+
+impl<I: Idx, K: Eq, V: Eq> Eq for SortedIndexMultiMap<I, K, V> {}
+impl<I: Idx, K: PartialEq, V: PartialEq> PartialEq for SortedIndexMultiMap<I, K, V> {
+    fn eq(&self, other: &Self) -> bool {
+        // No need to compare the sorted index. If the items are the same, the index will be too.
+        self.items == other.items
+    }
+}
+
+impl<I: Idx, K, V> Hash for SortedIndexMultiMap<I, K, V>
+where
+    K: Hash,
+    V: Hash,
+{
+    fn hash<H: Hasher>(&self, hasher: &mut H) {
+        self.items.hash(hasher)
+    }
+}
+impl<I: Idx, K, V, C> HashStable<C> for SortedIndexMultiMap<I, K, V>
+where
+    K: HashStable<C>,
+    V: HashStable<C>,
+{
+    fn hash_stable(&self, ctx: &mut C, hasher: &mut StableHasher) {
+        self.items.hash_stable(ctx, hasher)
+    }
+}
+
+impl<I: Idx, K: Ord, V> FromIterator<(K, V)> for SortedIndexMultiMap<I, K, V> {
+    fn from_iter<J>(iter: J) -> Self
+    where
+        J: IntoIterator<Item = (K, V)>,
+    {
+        let items = IndexVec::from_iter(iter);
+        let mut idx_sorted_by_item_key: Vec<_> = items.indices().collect();
+
+        // `sort_by_key` is stable, so insertion order is preserved for duplicate items.
+        idx_sorted_by_item_key.sort_by_key(|&idx| &items[idx].0);
+
+        SortedIndexMultiMap { items, idx_sorted_by_item_key }
+    }
+}
+
+impl<I: Idx, K, V> std::ops::Index<I> for SortedIndexMultiMap<I, K, V> {
+    type Output = V;
+
+    fn index(&self, idx: I) -> &Self::Output {
+        &self.items[idx].1
+    }
+}
+
+#[cfg(tests)]
+mod tests;
diff --git a/src/librustc_data_structures/sorted_map/tests.rs b/src/librustc_data_structures/sorted_map/tests.rs
index 692e1deb4b..7d91e1fdce 100644
--- a/src/librustc_data_structures/sorted_map/tests.rs
+++ b/src/librustc_data_structures/sorted_map/tests.rs
@@ -1,4 +1,30 @@
-use super::SortedMap;
+use super::{SortedIndexMultiMap, SortedMap};
+
+#[test]
+fn test_sorted_index_multi_map() {
+    let entries: Vec<_> = vec![(2, 0), (1, 0), (2, 1), (3, 0), (2, 2)];
+    let set: SortedIndexMultiMap<usize, _, _> = entries.iter().copied().collect();
+
+    // Insertion order is preserved.
+    assert!(entries.iter().map(|(ref k, ref v)| (k, v)).eq(set.iter()));
+
+    // Indexing
+    for (i, expect) in entries.iter().enumerate() {
+        assert_eq!(set[i], expect.1);
+    }
+
+    // `get_by_key` works.
+    assert_eq!(set.get_by_key(&3).copied().collect::<Vec<_>>(), vec![0]);
+    assert!(set.get_by_key(&4).next().is_none());
+
+    // `get_by_key` returns items in insertion order.
+    let twos: Vec<_> = set.get_by_key_enumerated(&2).collect();
+    let idxs: Vec<usize> = twos.iter().map(|(i, _)| *i).collect();
+    let values: Vec<usize> = twos.iter().map(|(_, &v)| v).collect();
+
+    assert_eq!(idxs, vec![0, 2, 4]);
+    assert_eq!(values, vec![0, 1, 2]);
+}
 
 #[test]
 fn test_insert_and_iter() {
diff --git a/src/librustc_data_structures/stable_hasher.rs b/src/librustc_data_structures/stable_hasher.rs
index 0a26bf3bdc..a98e77cebd 100644
--- a/src/librustc_data_structures/stable_hasher.rs
+++ b/src/librustc_data_structures/stable_hasher.rs
@@ -27,6 +27,7 @@ pub trait StableHasherResult: Sized {
 }
 
 impl StableHasher {
+    #[inline]
     pub fn new() -> Self {
         StableHasher { state: SipHasher128::new_with_keys(0, 0) }
     }
diff --git a/src/librustc_data_structures/sync.rs b/src/librustc_data_structures/sync.rs
index fa98b4d72d..9051b1751b 100644
--- a/src/librustc_data_structures/sync.rs
+++ b/src/librustc_data_structures/sync.rs
@@ -203,11 +203,7 @@ cfg_if! {
             t.into_iter()
         }
 
-        pub fn par_for_each_in<T: IntoIterator>(
-            t: T,
-            for_each:
-                impl Fn(<<T as IntoIterator>::IntoIter as Iterator>::Item) + Sync + Send
-        ) {
+        pub fn par_for_each_in<T: IntoIterator>(t: T, for_each: impl Fn(T::Item) + Sync + Send) {
             // We catch panics here ensuring that all the loop iterations execute.
             // This makes behavior consistent with the parallel compiler.
             let mut panic = None;
@@ -397,9 +393,7 @@ cfg_if! {
 
         pub fn par_for_each_in<T: IntoParallelIterator>(
             t: T,
-            for_each: impl Fn(
-                <<T as IntoParallelIterator>::Iter as ParallelIterator>::Item
-            ) + Sync + Send
+            for_each: impl Fn(T::Item) + Sync + Send,
         ) {
             t.into_par_iter().for_each(for_each)
         }
diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
index b856e5da5a..26f1741153 100644
--- a/src/librustc_driver/Cargo.toml
+++ b/src/librustc_driver/Cargo.toml
@@ -14,6 +14,7 @@ lazy_static = "1.0"
 log = "0.4"
 env_logger = { version = "0.7", default-features = false }
 rustc = { path = "../librustc" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
 rustc_target = { path = "../librustc_target" }
 rustc_lint = { path = "../librustc_lint" }
 rustc_data_structures = { path = "../librustc_data_structures" }
@@ -25,11 +26,12 @@ rustc_mir = { path = "../librustc_mir" }
 rustc_parse = { path = "../librustc_parse" }
 rustc_plugin_impl = { path = "../librustc_plugin_impl" }
 rustc_save_analysis = { path = "../librustc_save_analysis" }
+rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 
 [target.'cfg(windows)'.dependencies]
diff --git a/src/librustc_driver/args.rs b/src/librustc_driver/args.rs
index 5e2c43596d..5686819c61 100644
--- a/src/librustc_driver/args.rs
+++ b/src/librustc_driver/args.rs
@@ -4,7 +4,7 @@ use std::fs;
 use std::io;
 
 pub fn arg_expand(arg: String) -> Result<Vec<String>, Error> {
-    if arg.starts_with("@") {
+    if arg.starts_with('@') {
         let path = &arg[1..];
         let file = match fs::read_to_string(path) {
             Ok(file) => file,
diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index 019ff431bc..e6c98ad27e 100644
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -5,12 +5,7 @@
 //! This API is completely unstable and subject to change.
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-#![feature(box_syntax)]
-#![cfg_attr(unix, feature(libc))]
 #![feature(nll)]
-#![feature(set_stdio)]
-#![feature(no_debug)]
-#![feature(integer_atomics)]
 #![recursion_limit = "256"]
 
 pub extern crate getopts;
@@ -31,25 +26,30 @@ use rustc::session::{config, DiagnosticOutput, Session};
 use rustc::session::{early_error, early_warn};
 use rustc::ty::TyCtxt;
 use rustc::util::common::ErrorReported;
+use rustc_codegen_ssa::CodegenResults;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use rustc_data_structures::profiling::print_time_passes_entry;
 use rustc_data_structures::sync::SeqCst;
-use rustc_errors::{registry::Registry, PResult};
+use rustc_errors::{
+    registry::{InvalidErrorCode, Registry},
+    PResult,
+};
 use rustc_feature::{find_gated_cfg, UnstableFeatures};
 use rustc_hir::def_id::LOCAL_CRATE;
-use rustc_interface::util::get_builtin_codegen_backend;
+use rustc_interface::util::{collect_crate_types, get_builtin_codegen_backend};
 use rustc_interface::{interface, Queries};
 use rustc_lint::LintStore;
 use rustc_metadata::locator;
 use rustc_save_analysis as save;
 use rustc_save_analysis::DumpHandler;
-use rustc_serialize::json::ToJson;
+use rustc_serialize::json::{self, ToJson};
 
 use std::borrow::Cow;
 use std::cmp::max;
 use std::default::Default;
 use std::env;
 use std::ffi::OsString;
+use std::fs;
 use std::io::{self, Read, Write};
 use std::mem;
 use std::panic::{self, catch_unwind};
@@ -58,10 +58,10 @@ use std::process::{self, Command, Stdio};
 use std::str;
 use std::time::Instant;
 
+use rustc_ast::ast;
 use rustc_span::source_map::FileLoader;
 use rustc_span::symbol::sym;
 use rustc_span::FileName;
-use syntax::ast;
 
 mod args;
 pub mod pretty;
@@ -123,10 +123,6 @@ pub trait Callbacks {
     }
 }
 
-pub struct DefaultCallbacks;
-
-impl Callbacks for DefaultCallbacks {}
-
 #[derive(Default)]
 pub struct TimePassesCallbacks {
     time_passes: bool,
@@ -286,7 +282,8 @@ pub fn run_compiler(
                 &matches,
                 compiler.input(),
             )
-        });
+        })
+        .and_then(|| RustcDefaultCalls::try_process_rlink(sess, compiler));
 
         if should_stop == Compilation::Stop {
             return sess.compile_status();
@@ -527,12 +524,11 @@ fn stdout_isatty() -> bool {
 
 fn handle_explain(registry: Registry, code: &str, output: ErrorOutputType) {
     let normalised =
-        if code.starts_with("E") { code.to_string() } else { format!("E{0:0>4}", code) };
-    match registry.find_description(&normalised) {
-        Some(ref description) => {
+        if code.starts_with('E') { code.to_string() } else { format!("E{0:0>4}", code) };
+    match registry.try_find_description(&normalised) {
+        Ok(Some(description)) => {
             let mut is_in_code_block = false;
             let mut text = String::new();
-
             // Slice off the leading newline and print.
             for line in description.lines() {
                 let indent_level =
@@ -548,16 +544,18 @@ fn handle_explain(registry: Registry, code: &str, output: ErrorOutputType) {
                 }
                 text.push('\n');
             }
-
             if stdout_isatty() {
                 show_content_with_pager(&text);
             } else {
                 print!("{}", text);
             }
         }
-        None => {
+        Ok(None) => {
             early_error(output, &format!("no extended information for {}", code));
         }
+        Err(InvalidErrorCode) => {
+            early_error(output, &format!("{} is not a valid error code", code));
+        }
     }
 }
 
@@ -593,6 +591,34 @@ fn show_content_with_pager(content: &String) {
 }
 
 impl RustcDefaultCalls {
+    fn process_rlink(sess: &Session, compiler: &interface::Compiler) -> Result<(), ErrorReported> {
+        if let Input::File(file) = compiler.input() {
+            // FIXME: #![crate_type] and #![crate_name] support not implemented yet
+            let attrs = vec![];
+            sess.crate_types.set(collect_crate_types(sess, &attrs));
+            let outputs = compiler.build_output_filenames(&sess, &attrs);
+            let rlink_data = fs::read_to_string(file).unwrap_or_else(|err| {
+                sess.fatal(&format!("failed to read rlink file: {}", err));
+            });
+            let codegen_results: CodegenResults = json::decode(&rlink_data).unwrap_or_else(|err| {
+                sess.fatal(&format!("failed to decode rlink: {}", err));
+            });
+            compiler.codegen_backend().link(&sess, Box::new(codegen_results), &outputs)
+        } else {
+            sess.fatal("rlink must be a file")
+        }
+    }
+
+    pub fn try_process_rlink(sess: &Session, compiler: &interface::Compiler) -> Compilation {
+        if sess.opts.debugging_opts.link_only {
+            let result = RustcDefaultCalls::process_rlink(sess, compiler);
+            abort_on_err(result, sess);
+            Compilation::Stop
+        } else {
+            Compilation::Continue
+        }
+    }
+
     pub fn list_metadata(
         sess: &Session,
         metadata_loader: &dyn MetadataLoader,
@@ -654,6 +680,10 @@ impl RustcDefaultCalls {
                     println!("{}", targets.join("\n"));
                 }
                 Sysroot => println!("{}", sess.sysroot.display()),
+                TargetLibdir => println!(
+                    "{}",
+                    sess.target_tlib_path.as_ref().unwrap_or(&sess.host_tlib_path).dir.display()
+                ),
                 TargetSpec => println!("{}", sess.target.target.to_json().pretty()),
                 FileNames | CrateName => {
                     let input = input.unwrap_or_else(|| {
@@ -668,7 +698,7 @@ impl RustcDefaultCalls {
                         println!("{}", id);
                         continue;
                     }
-                    let crate_types = rustc_interface::util::collect_crate_types(sess, attrs);
+                    let crate_types = collect_crate_types(sess, attrs);
                     for &style in &crate_types {
                         let fname = rustc_codegen_utils::link::filename_for_input(
                             sess, style, &id, &t_outputs,
diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs
index 6ef6dcf87e..ca129ac598 100644
--- a/src/librustc_driver/pretty.rs
+++ b/src/librustc_driver/pretty.rs
@@ -5,14 +5,13 @@ use rustc::session::config::{Input, PpMode, PpSourceMode};
 use rustc::session::Session;
 use rustc::ty::{self, TyCtxt};
 use rustc::util::common::ErrorReported;
+use rustc_ast::ast;
+use rustc_ast_pretty::pprust;
 use rustc_hir as hir;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::print as pprust_hir;
 use rustc_mir::util::{write_mir_graphviz, write_mir_pretty};
-
 use rustc_span::FileName;
-use syntax::ast;
-use syntax::print::pprust;
 
 use std::cell::Cell;
 use std::fs::File;
@@ -70,19 +69,19 @@ where
     match *ppmode {
         PpmNormal => {
             let annotation = NoAnn { sess: tcx.sess, tcx: Some(tcx) };
-            f(&annotation, tcx.hir().forest.krate())
+            f(&annotation, tcx.hir().krate())
         }
 
         PpmIdentified => {
             let annotation = IdentifiedAnnotation { sess: tcx.sess, tcx: Some(tcx) };
-            f(&annotation, tcx.hir().forest.krate())
+            f(&annotation, tcx.hir().krate())
         }
         PpmTyped => {
             abort_on_err(tcx.analysis(LOCAL_CRATE), tcx.sess);
 
             let empty_tables = ty::TypeckTables::empty(None);
             let annotation = TypedAnnotation { tcx, tables: Cell::new(&empty_tables) };
-            tcx.dep_graph.with_ignore(|| f(&annotation, tcx.hir().forest.krate()))
+            tcx.dep_graph.with_ignore(|| f(&annotation, tcx.hir().krate()))
         }
         _ => panic!("Should use call_with_pp_support"),
     }
@@ -144,7 +143,7 @@ impl<'hir> HirPrinterSupport<'hir> for NoAnn<'hir> {
     }
 
     fn hir_map<'a>(&'a self) -> Option<&'a hir_map::Map<'hir>> {
-        self.tcx.map(|tcx| tcx.hir())
+        self.tcx.map(|tcx| *tcx.hir())
     }
 
     fn pp_ann<'a>(&'a self) -> &'a dyn pprust_hir::PpAnn {
@@ -156,7 +155,7 @@ impl<'hir> pprust::PpAnn for NoAnn<'hir> {}
 impl<'hir> pprust_hir::PpAnn for NoAnn<'hir> {
     fn nested(&self, state: &mut pprust_hir::State<'_>, nested: pprust_hir::Nested) {
         if let Some(tcx) = self.tcx {
-            pprust_hir::PpAnn::nested(tcx.hir(), state, nested)
+            pprust_hir::PpAnn::nested(*tcx.hir(), state, nested)
         }
     }
 }
@@ -218,7 +217,7 @@ impl<'hir> HirPrinterSupport<'hir> for IdentifiedAnnotation<'hir> {
     }
 
     fn hir_map<'a>(&'a self) -> Option<&'a hir_map::Map<'hir>> {
-        self.tcx.map(|tcx| tcx.hir())
+        self.tcx.map(|tcx| *tcx.hir())
     }
 
     fn pp_ann<'a>(&'a self) -> &'a dyn pprust_hir::PpAnn {
@@ -229,7 +228,7 @@ impl<'hir> HirPrinterSupport<'hir> for IdentifiedAnnotation<'hir> {
 impl<'hir> pprust_hir::PpAnn for IdentifiedAnnotation<'hir> {
     fn nested(&self, state: &mut pprust_hir::State<'_>, nested: pprust_hir::Nested) {
         if let Some(ref tcx) = self.tcx {
-            pprust_hir::PpAnn::nested(tcx.hir(), state, nested)
+            pprust_hir::PpAnn::nested(*tcx.hir(), state, nested)
         }
     }
     fn pre(&self, s: &mut pprust_hir::State<'_>, node: pprust_hir::AnnNode<'_>) {
@@ -335,7 +334,7 @@ impl<'a, 'tcx> pprust_hir::PpAnn for TypedAnnotation<'a, 'tcx> {
         if let pprust_hir::Nested::Body(id) = nested {
             self.tables.set(self.tcx.body_tables(id));
         }
-        pprust_hir::PpAnn::nested(self.tcx.hir(), state, nested);
+        pprust_hir::PpAnn::nested(*self.tcx.hir(), state, nested);
         self.tables.set(old_tables);
     }
     fn pre(&self, s: &mut pprust_hir::State<'_>, node: pprust_hir::AnnNode<'_>) {
@@ -392,14 +391,16 @@ pub fn print_after_parsing(
         call_with_pp_support(&s, sess, None, move |annotation| {
             debug!("pretty printing source code {:?}", s);
             let sess = annotation.sess();
+            let parse = &sess.parse_sess;
             *out = pprust::print_crate(
                 sess.source_map(),
-                &sess.parse_sess,
                 krate,
                 src_name,
                 src,
                 annotation.pp_ann(),
                 false,
+                parse.edition,
+                parse.injected_crate_name.try_get().is_some(),
             )
         })
     } else {
@@ -432,14 +433,16 @@ pub fn print_after_hir_lowering<'tcx>(
             call_with_pp_support(&s, tcx.sess, Some(tcx), move |annotation| {
                 debug!("pretty printing source code {:?}", s);
                 let sess = annotation.sess();
+                let parse = &sess.parse_sess;
                 *out = pprust::print_crate(
                     sess.source_map(),
-                    &sess.parse_sess,
                     krate,
                     src_name,
                     src,
                     annotation.pp_ann(),
                     true,
+                    parse.edition,
+                    parse.injected_crate_name.try_get().is_some(),
                 )
             })
         }
@@ -449,14 +452,8 @@ pub fn print_after_hir_lowering<'tcx>(
             call_with_pp_support_hir(&s, tcx, move |annotation, krate| {
                 debug!("pretty printing source code {:?}", s);
                 let sess = annotation.sess();
-                *out = pprust_hir::print_crate(
-                    sess.source_map(),
-                    &sess.parse_sess,
-                    krate,
-                    src_name,
-                    src,
-                    annotation.pp_ann(),
-                )
+                let sm = sess.source_map();
+                *out = pprust_hir::print_crate(sm, krate, src_name, src, annotation.pp_ann())
             })
         }
 
diff --git a/src/librustc_error_codes/error_codes.rs b/src/librustc_error_codes/error_codes.rs
index 180ccb1597..11d1209923 100644
--- a/src/librustc_error_codes/error_codes.rs
+++ b/src/librustc_error_codes/error_codes.rs
@@ -353,6 +353,7 @@ E0631: include_str!("./error_codes/E0631.md"),
 E0633: include_str!("./error_codes/E0633.md"),
 E0635: include_str!("./error_codes/E0635.md"),
 E0636: include_str!("./error_codes/E0636.md"),
+E0637: include_str!("./error_codes/E0637.md"),
 E0638: include_str!("./error_codes/E0638.md"),
 E0639: include_str!("./error_codes/E0639.md"),
 E0641: include_str!("./error_codes/E0641.md"),
@@ -394,9 +395,11 @@ E0714: include_str!("./error_codes/E0714.md"),
 E0715: include_str!("./error_codes/E0715.md"),
 E0716: include_str!("./error_codes/E0716.md"),
 E0718: include_str!("./error_codes/E0718.md"),
+E0719: include_str!("./error_codes/E0719.md"),
 E0720: include_str!("./error_codes/E0720.md"),
 E0723: include_str!("./error_codes/E0723.md"),
 E0725: include_str!("./error_codes/E0725.md"),
+E0727: include_str!("./error_codes/E0727.md"),
 E0728: include_str!("./error_codes/E0728.md"),
 E0729: include_str!("./error_codes/E0729.md"),
 E0730: include_str!("./error_codes/E0730.md"),
@@ -415,6 +418,8 @@ E0743: include_str!("./error_codes/E0743.md"),
 E0744: include_str!("./error_codes/E0744.md"),
 E0745: include_str!("./error_codes/E0745.md"),
 E0746: include_str!("./error_codes/E0746.md"),
+E0747: include_str!("./error_codes/E0747.md"),
+E0748: include_str!("./error_codes/E0748.md"),
 ;
 //  E0006, // merged with E0005
 //  E0008, // cannot bind by-move into a pattern guard
@@ -583,7 +588,6 @@ E0746: include_str!("./error_codes/E0746.md"),
     E0632, // cannot provide explicit generic arguments when `impl Trait` is
            // used in argument position
     E0634, // type has conflicting packed representaton hints
-    E0637, // "'_" is not a valid lifetime bound
     E0640, // infer outlives requirements
 //  E0645, // trait aliases not finished
     E0657, // `impl Trait` can only capture lifetimes bound at the fn level
@@ -602,11 +606,9 @@ E0746: include_str!("./error_codes/E0746.md"),
     E0710, // an unknown tool name found in scoped lint
     E0711, // a feature has been declared with conflicting stability attributes
     E0717, // rustc_promotable without stability attribute
-    E0719, // duplicate values for associated type binding
 //  E0721, // `await` keyword
     E0722, // Malformed `#[optimize]` attribute
     E0724, // `#[ffi_returns_twice]` is only allowed in foreign functions
     E0726, // non-explicit (not `'_`) elided lifetime in unsupported position
-    E0727, // `async` generators are not yet supported
     E0739, // invalid track_caller application/syntax
 }
diff --git a/src/librustc_error_codes/error_codes/E0009.md b/src/librustc_error_codes/error_codes/E0009.md
index abb7fe41ab..aaabba0434 100644
--- a/src/librustc_error_codes/error_codes/E0009.md
+++ b/src/librustc_error_codes/error_codes/E0009.md
@@ -1,3 +1,5 @@
+#### Note: this error code is no longer emitted by the compiler.
+
 In a pattern, all values that don't implement the `Copy` trait have to be bound
 the same way. The goal here is to avoid binding simultaneously by-move and
 by-ref.
@@ -6,7 +8,9 @@ This limitation may be removed in a future version of Rust.
 
 Erroneous code example:
 
-```compile_fail,E0009
+```
+#![feature(move_ref_pattern)]
+
 struct X { x: (), }
 
 let x = Some((X { x: () }, X { x: () }));
diff --git a/src/librustc_error_codes/error_codes/E0080.md b/src/librustc_error_codes/error_codes/E0080.md
index 273238a943..7b1bbde614 100644
--- a/src/librustc_error_codes/error_codes/E0080.md
+++ b/src/librustc_error_codes/error_codes/E0080.md
@@ -14,7 +14,10 @@ constant expression that had to be evaluated. Attempting to divide by 0
 or causing an integer overflow are two ways to induce this error.
 
 Ensure that the expressions given can be evaluated as the desired integer type.
-See the FFI section of the Reference for more information about using a custom
-integer type:
 
-https://doc.rust-lang.org/reference.html#ffi-attributes
+See the [Custom Discriminants][custom-discriminants] section of the Reference
+for more information about setting custom integer types on fieldless enums
+using the [`repr` attribute][repr-attribute].
+
+[custom-discriminants]: https://doc.rust-lang.org/reference/items/enumerations.html#custom-discriminant-values-for-field-less-enumerations
+[repr-attribute]: https://doc.rust-lang.org/reference/type-layout.html#reprc-enums
diff --git a/src/librustc_error_codes/error_codes/E0133.md b/src/librustc_error_codes/error_codes/E0133.md
index 0488cdd808..1adbcc3135 100644
--- a/src/librustc_error_codes/error_codes/E0133.md
+++ b/src/librustc_error_codes/error_codes/E0133.md
@@ -28,4 +28,6 @@ fn main() {
 }
 ```
 
-See also https://doc.rust-lang.org/book/ch19-01-unsafe-rust.html
+See the [unsafe section][unsafe-section] of the Book for more details.
+
+[unsafe-section]: https://doc.rust-lang.org/book/ch19-01-unsafe-rust.html
diff --git a/src/librustc_error_codes/error_codes/E0154.md b/src/librustc_error_codes/error_codes/E0154.md
index 725a775e72..e437a71897 100644
--- a/src/librustc_error_codes/error_codes/E0154.md
+++ b/src/librustc_error_codes/error_codes/E0154.md
@@ -27,7 +27,8 @@ fn f() {
 }
 ```
 
-See the Declaration Statements section of the reference for more information
-about what constitutes an Item declaration and what does not:
+See the [Declaration Statements][declaration-statements] section of the
+reference for more information about what constitutes an item declaration
+and what does not.
 
-https://doc.rust-lang.org/reference.html#statements
+[declaration-statements]: https://doc.rust-lang.org/reference/statements.html#declaration-statements
diff --git a/src/librustc_error_codes/error_codes/E0260.md b/src/librustc_error_codes/error_codes/E0260.md
index 4a36735ae7..b8bdb81fcb 100644
--- a/src/librustc_error_codes/error_codes/E0260.md
+++ b/src/librustc_error_codes/error_codes/E0260.md
@@ -28,7 +28,8 @@ extern crate core as xyz;
 struct abc;
 ```
 
-See the Declaration Statements section of the reference for more information
-about what constitutes an Item declaration and what does not:
+See the [Declaration Statements][declaration-statements] section of the
+reference for more information about what constitutes an item declaration
+and what does not.
 
-https://doc.rust-lang.org/reference.html#statements
+[declaration-statements]: https://doc.rust-lang.org/reference/statements.html#declaration-statements
diff --git a/src/librustc_error_codes/error_codes/E0263.md b/src/librustc_error_codes/error_codes/E0263.md
index bb4da43b3f..37271ac692 100644
--- a/src/librustc_error_codes/error_codes/E0263.md
+++ b/src/librustc_error_codes/error_codes/E0263.md
@@ -1,7 +1,16 @@
-A lifetime name cannot be declared more than once in the same scope. For
-example:
+A lifetime was declared more than once in the same scope.
+
+Erroneous code example:
 
 ```compile_fail,E0263
-// error, lifetime name `'a` declared twice in the same scope
-fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) { }
+fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str, z: &'a str) { // error!
+}
+```
+
+Two lifetimes cannot have the same name. To fix this example, change
+the second `'a` lifetime into something else (`'c` for example):
+
+```
+fn foo<'a, 'b, 'c>(x: &'a str, y: &'b str, z: &'c str) { // ok!
+}
 ```
diff --git a/src/librustc_error_codes/error_codes/E0264.md b/src/librustc_error_codes/error_codes/E0264.md
index e1e7516cec..708eac8837 100644
--- a/src/librustc_error_codes/error_codes/E0264.md
+++ b/src/librustc_error_codes/error_codes/E0264.md
@@ -1,4 +1,6 @@
-An unknown external lang item was used. Erroneous code example:
+An unknown external lang item was used.
+
+Erroneous code example:
 
 ```compile_fail,E0264
 #![feature(lang_items)]
diff --git a/src/librustc_error_codes/error_codes/E0267.md b/src/librustc_error_codes/error_codes/E0267.md
index 066ebee0ff..951490df87 100644
--- a/src/librustc_error_codes/error_codes/E0267.md
+++ b/src/librustc_error_codes/error_codes/E0267.md
@@ -1,5 +1,7 @@
-This error indicates the use of a loop keyword (`break` or `continue`) inside a
-closure but outside of any loop. Erroneous code example:
+A loop keyword (`break` or `continue`) was used inside a closure but outside of
+any loop.
+
+Erroneous code example:
 
 ```compile_fail,E0267
 let w = || { break; }; // error: `break` inside of a closure
diff --git a/src/librustc_error_codes/error_codes/E0268.md b/src/librustc_error_codes/error_codes/E0268.md
index 7f3ac11860..436aef79fe 100644
--- a/src/librustc_error_codes/error_codes/E0268.md
+++ b/src/librustc_error_codes/error_codes/E0268.md
@@ -1,6 +1,6 @@
-This error indicates the use of a loop keyword (`break` or `continue`) outside
-of a loop. Without a loop to break out of or continue in, no sensible action can
-be taken. Erroneous code example:
+A loop keyword (`break` or `continue`) was used outside of a loop.
+
+Erroneous code example:
 
 ```compile_fail,E0268
 fn some_func() {
@@ -8,6 +8,7 @@ fn some_func() {
 }
 ```
 
+Without a loop to break out of or continue in, no sensible action can be taken.
 Please verify that you are using `break` and `continue` only in loops. Example:
 
 ```
diff --git a/src/librustc_error_codes/error_codes/E0271.md b/src/librustc_error_codes/error_codes/E0271.md
index 4078598b39..31334069ed 100644
--- a/src/librustc_error_codes/error_codes/E0271.md
+++ b/src/librustc_error_codes/error_codes/E0271.md
@@ -1,9 +1,6 @@
-This is because of a type mismatch between the associated type of some
-trait (e.g., `T::Bar`, where `T` implements `trait Quux { type Bar; }`)
-and another type `U` that is required to be equal to `T::Bar`, but is not.
-Examples follow.
+A type mismatched an associated type of a trait.
 
-Here is a basic example:
+Erroneous code example:
 
 ```compile_fail,E0271
 trait Trait { type AssociatedType; }
@@ -17,6 +14,11 @@ impl Trait for i8 { type AssociatedType = &'static str; }
 foo(3_i8);
 ```
 
+This is because of a type mismatch between the associated type of some
+trait (e.g., `T::Bar`, where `T` implements `trait Quux { type Bar; }`)
+and another type `U` that is required to be equal to `T::Bar`, but is not.
+Examples follow.
+
 Here is that same example again, with some explanatory comments:
 
 ```compile_fail,E0271
diff --git a/src/librustc_error_codes/error_codes/E0275.md b/src/librustc_error_codes/error_codes/E0275.md
index 836a9a95fa..2d12fcea4c 100644
--- a/src/librustc_error_codes/error_codes/E0275.md
+++ b/src/librustc_error_codes/error_codes/E0275.md
@@ -1,8 +1,6 @@
-This error occurs when there was a recursive trait requirement that overflowed
-before it could be evaluated. Often this means that there is unbounded
-recursion in resolving some type bounds.
+An evaluation of a trait requirement overflowed.
 
-For example, in the following code:
+Erroneous code example:
 
 ```compile_fail,E0275
 trait Foo {}
@@ -12,6 +10,10 @@ struct Bar<T>(T);
 impl<T> Foo for T where Bar<T>: Foo {}
 ```
 
+This error occurs when there was a recursive trait requirement that overflowed
+before it could be evaluated. This often means that there is an unbounded
+recursion in resolving some type bounds.
+
 To determine if a `T` is `Foo`, we need to check if `Bar<T>` is `Foo`. However,
 to do this check, we need to determine that `Bar<Bar<T>>` is `Foo`. To
 determine this, we check if `Bar<Bar<Bar<T>>>` is `Foo`, and so on. This is
diff --git a/src/librustc_error_codes/error_codes/E0276.md b/src/librustc_error_codes/error_codes/E0276.md
index 0e3a613bf9..ad76968c58 100644
--- a/src/librustc_error_codes/error_codes/E0276.md
+++ b/src/librustc_error_codes/error_codes/E0276.md
@@ -1,5 +1,6 @@
-This error occurs when a bound in an implementation of a trait does not match
-the bounds specified in the original trait. For example:
+A trait implementation has stricter requirements than the trait definition.
+
+Erroneous code example:
 
 ```compile_fail,E0276
 trait Foo {
diff --git a/src/librustc_error_codes/error_codes/E0277.md b/src/librustc_error_codes/error_codes/E0277.md
index 2034a5b988..2e2cd5e01f 100644
--- a/src/librustc_error_codes/error_codes/E0277.md
+++ b/src/librustc_error_codes/error_codes/E0277.md
@@ -1,5 +1,7 @@
 You tried to use a type which doesn't implement some trait in a place which
-expected that trait. Erroneous code example:
+expected that trait.
+
+Erroneous code example:
 
 ```compile_fail,E0277
 // here we declare the Foo trait with a bar method
diff --git a/src/librustc_error_codes/error_codes/E0282.md b/src/librustc_error_codes/error_codes/E0282.md
index 54a9de0025..49d2205f92 100644
--- a/src/librustc_error_codes/error_codes/E0282.md
+++ b/src/librustc_error_codes/error_codes/E0282.md
@@ -1,3 +1,11 @@
+The compiler could not infer a type and asked for a type annotation.
+
+Erroneous code example:
+
+```compile_fail,E0282
+let x = "hello".chars().rev().collect();
+```
+
 This error indicates that type inference did not result in one unique possible
 type, and extra information is required. In most cases this can be provided
 by adding a type annotation. Sometimes you need to specify a generic type
@@ -8,13 +16,9 @@ parameter with a `FromIterator` bound, which for a `char` iterator is
 implemented by `Vec` and `String` among others. Consider the following snippet
 that reverses the characters of a string:
 
-```compile_fail,E0282
-let x = "hello".chars().rev().collect();
-```
-
-In this case, the compiler cannot infer what the type of `x` should be:
-`Vec<char>` and `String` are both suitable candidates. To specify which type to
-use, you can use a type annotation on `x`:
+In the first code example, the compiler cannot infer what the type of `x` should
+be: `Vec<char>` and `String` are both suitable candidates. To specify which type
+to use, you can use a type annotation on `x`:
 
 ```
 let x: Vec<char> = "hello".chars().rev().collect();
diff --git a/src/librustc_error_codes/error_codes/E0283.md b/src/librustc_error_codes/error_codes/E0283.md
index 075f8b2e3b..6885f9a486 100644
--- a/src/librustc_error_codes/error_codes/E0283.md
+++ b/src/librustc_error_codes/error_codes/E0283.md
@@ -1,7 +1,6 @@
-This error occurs when the compiler doesn't have enough information
-to unambiguously choose an implementation.
+An implementation cannot be chosen unambiguously because of lack of information.
 
-For example:
+Erroneous code example:
 
 ```compile_fail,E0283
 trait Generator {
@@ -27,7 +26,9 @@ fn main() {
 }
 ```
 
-To resolve this error use the concrete type:
+This error can be solved by adding type annotations that provide the missing
+information to the compiler. In this case, the solution is to use a concrete
+type:
 
 ```
 trait Generator {
diff --git a/src/librustc_error_codes/error_codes/E0303.md b/src/librustc_error_codes/error_codes/E0303.md
index 700a66438e..459906047c 100644
--- a/src/librustc_error_codes/error_codes/E0303.md
+++ b/src/librustc_error_codes/error_codes/E0303.md
@@ -33,4 +33,6 @@ match Some("hi".to_string()) {
 
 The `op_string_ref` binding has type `&Option<&String>` in both cases.
 
-See also https://github.com/rust-lang/rust/issues/14587
+See also [Issue 14587][issue-14587].
+
+[issue-14587]: https://github.com/rust-lang/rust/issues/14587
diff --git a/src/librustc_error_codes/error_codes/E0307.md b/src/librustc_error_codes/error_codes/E0307.md
index c628d17683..52707b93ac 100644
--- a/src/librustc_error_codes/error_codes/E0307.md
+++ b/src/librustc_error_codes/error_codes/E0307.md
@@ -1,5 +1,19 @@
-This error indicates that the `self` parameter in a method has an invalid
-"receiver type".
+The `self` parameter in a method has an invalid "receiver type".
+
+Erroneous code example:
+
+```compile_fail,E0307
+struct Foo;
+struct Bar;
+
+trait Trait {
+    fn foo(&self);
+}
+
+impl Trait for Foo {
+    fn foo(self: &Bar) {}
+}
+```
 
 Methods take a special first parameter, of which there are three variants:
 `self`, `&self`, and `&mut self`. These are syntactic sugar for
@@ -36,7 +50,7 @@ impl Trait for Foo {
 }
 ```
 
-E0307 will be emitted by the compiler when using an invalid receiver type,
+This error will be emitted by the compiler when using an invalid receiver type,
 like in the following example:
 
 ```compile_fail,E0307
diff --git a/src/librustc_error_codes/error_codes/E0309.md b/src/librustc_error_codes/error_codes/E0309.md
index 73ce740747..e719ee590a 100644
--- a/src/librustc_error_codes/error_codes/E0309.md
+++ b/src/librustc_error_codes/error_codes/E0309.md
@@ -1,9 +1,7 @@
-The type definition contains some field whose type
-requires an outlives annotation. Outlives annotations
-(e.g., `T: 'a`) are used to guarantee that all the data in T is valid
-for at least the lifetime `'a`. This scenario most commonly
-arises when the type contains an associated type reference
-like `<T as SomeTrait<'a>>::Output`, as shown in this example:
+A parameter type is missing an explicit lifetime bound and may not live long
+enough.
+
+Erroneous code example:
 
 ```compile_fail,E0309
 // This won't compile because the applicable impl of
@@ -25,9 +23,15 @@ where
 }
 ```
 
-Here, the where clause `T: 'a` that appears on the impl is not known to be
-satisfied on the struct. To make this example compile, you have to add
-a where-clause like `T: 'a` to the struct definition:
+The type definition contains some field whose type requires an outlives
+annotation. Outlives annotations (e.g., `T: 'a`) are used to guarantee that all
+the data in T is valid for at least the lifetime `'a`. This scenario most
+commonly arises when the type contains an associated type reference like
+`<T as SomeTrait<'a>>::Output`, as shown in the previous code.
+
+There, the where clause `T: 'a` that appears on the impl is not known to be
+satisfied on the struct. To make this example compile, you have to add a
+where-clause like `T: 'a` to the struct definition:
 
 ```
 struct Foo<'a, T>
diff --git a/src/librustc_error_codes/error_codes/E0310.md b/src/librustc_error_codes/error_codes/E0310.md
index be87ccb114..8d4311d018 100644
--- a/src/librustc_error_codes/error_codes/E0310.md
+++ b/src/librustc_error_codes/error_codes/E0310.md
@@ -1,7 +1,7 @@
-Types in type definitions have lifetimes associated with them that represent
-how long the data stored within them is guaranteed to be live. This lifetime
-must be as long as the data needs to be alive, and missing the constraint that
-denotes this will cause this error.
+A parameter type is missing a lifetime constraint or has a lifetime that
+does not live long enough.
+
+Erroneous code example:
 
 ```compile_fail,E0310
 // This won't compile because T is not constrained to the static lifetime
@@ -11,6 +11,11 @@ struct Foo<T> {
 }
 ```
 
+Type parameters in type definitions have lifetimes associated with them that
+represent how long the data stored within them is guaranteed to live. This
+lifetime must be as long as the data needs to be alive, and missing the
+constraint that denotes this will cause this error.
+
 This will compile, because it has the constraint on the type parameter:
 
 ```
diff --git a/src/librustc_error_codes/error_codes/E0317.md b/src/librustc_error_codes/error_codes/E0317.md
index e31a2b56be..230911c208 100644
--- a/src/librustc_error_codes/error_codes/E0317.md
+++ b/src/librustc_error_codes/error_codes/E0317.md
@@ -1,14 +1,30 @@
-This error occurs when an `if` expression without an `else` block is used in a
-context where a type other than `()` is expected, for example a `let`
-expression:
+An `if` expression is missing an `else` block.
+
+Erroneous code example:
 
 ```compile_fail,E0317
-fn main() {
-    let x = 5;
-    let a = if x == 5 { 1 };
-}
+let x = 5;
+let a = if x == 5 {
+    1
+};
 ```
 
+This error occurs when an `if` expression without an `else` block is used in a
+context where a type other than `()` is expected. In the previous code example,
+the `let` expression was expecting a value but since there was no `else`, no
+value was returned.
+
 An `if` expression without an `else` block has the type `()`, so this is a type
 error. To resolve it, add an `else` block having the same type as the `if`
 block.
+
+So to fix the previous code example:
+
+```
+let x = 5;
+let a = if x == 5 {
+    1
+} else {
+    2
+};
+```
diff --git a/src/librustc_error_codes/error_codes/E0321.md b/src/librustc_error_codes/error_codes/E0321.md
index 49cec94430..bfcdabfe9d 100644
--- a/src/librustc_error_codes/error_codes/E0321.md
+++ b/src/librustc_error_codes/error_codes/E0321.md
@@ -1,5 +1,7 @@
 A cross-crate opt-out trait was implemented on something which wasn't a struct
-or enum type. Erroneous code example:
+or enum type.
+
+Erroneous code example:
 
 ```compile_fail,E0321
 #![feature(optin_builtin_traits)]
diff --git a/src/librustc_error_codes/error_codes/E0322.md b/src/librustc_error_codes/error_codes/E0322.md
index d2ee426763..ccef8681dd 100644
--- a/src/librustc_error_codes/error_codes/E0322.md
+++ b/src/librustc_error_codes/error_codes/E0322.md
@@ -1,3 +1,13 @@
+The `Sized` trait was implemented explicitly.
+
+Erroneous code example:
+
+```compile_fail,E0322
+struct Foo;
+
+impl Sized for Foo {} // error!
+```
+
 The `Sized` trait is a special trait built-in to the compiler for types with a
 constant size known at compile-time. This trait is automatically implemented
 for types as needed by the compiler, and it is currently disallowed to
diff --git a/src/librustc_error_codes/error_codes/E0323.md b/src/librustc_error_codes/error_codes/E0323.md
index 6d34c35f9c..0bf42d17eb 100644
--- a/src/librustc_error_codes/error_codes/E0323.md
+++ b/src/librustc_error_codes/error_codes/E0323.md
@@ -1,4 +1,5 @@
 An associated const was implemented when another trait item was expected.
+
 Erroneous code example:
 
 ```compile_fail,E0323
diff --git a/src/librustc_error_codes/error_codes/E0324.md b/src/librustc_error_codes/error_codes/E0324.md
index b8c9e59699..1442cb77dd 100644
--- a/src/librustc_error_codes/error_codes/E0324.md
+++ b/src/librustc_error_codes/error_codes/E0324.md
@@ -1,5 +1,6 @@
-A method was implemented when another trait item was expected. Erroneous
-code example:
+A method was implemented when another trait item was expected.
+
+Erroneous code example:
 
 ```compile_fail,E0324
 struct Bar;
diff --git a/src/librustc_error_codes/error_codes/E0325.md b/src/librustc_error_codes/error_codes/E0325.md
index f685b92cbf..656fd1ec82 100644
--- a/src/librustc_error_codes/error_codes/E0325.md
+++ b/src/librustc_error_codes/error_codes/E0325.md
@@ -1,4 +1,5 @@
 An associated type was implemented when another trait item was expected.
+
 Erroneous code example:
 
 ```compile_fail,E0325
diff --git a/src/librustc_error_codes/error_codes/E0326.md b/src/librustc_error_codes/error_codes/E0326.md
index 0702d00c2d..bc522e9cf4 100644
--- a/src/librustc_error_codes/error_codes/E0326.md
+++ b/src/librustc_error_codes/error_codes/E0326.md
@@ -1,7 +1,6 @@
-The types of any associated constants in a trait implementation must match the
-types in the trait definition. This error indicates that there was a mismatch.
+An implementation of a trait doesn't match the type constraint.
 
-Here's an example of this error:
+Erroneous code example:
 
 ```compile_fail,E0326
 trait Foo {
@@ -14,3 +13,6 @@ impl Foo for Bar {
     const BAR: u32 = 5; // error, expected bool, found u32
 }
 ```
+
+The types of any associated constants in a trait implementation must match the
+types in the trait definition.
diff --git a/src/librustc_error_codes/error_codes/E0364.md b/src/librustc_error_codes/error_codes/E0364.md
index 0cca8f58b1..ec1fb911f3 100644
--- a/src/librustc_error_codes/error_codes/E0364.md
+++ b/src/librustc_error_codes/error_codes/E0364.md
@@ -26,7 +26,7 @@ pub use foo::X;
 fn main() {}
 ```
 
-See the 'Use Declarations' section of the reference for more information on
-this topic:
+See the [Use Declarations][use-declarations] section of the reference for
+more information on this topic.
 
-https://doc.rust-lang.org/reference.html#use-declarations
+[use-declarations]: https://doc.rust-lang.org/reference/items/use-declarations.html
diff --git a/src/librustc_error_codes/error_codes/E0365.md b/src/librustc_error_codes/error_codes/E0365.md
index 8f90d949e3..e3d417a7d0 100644
--- a/src/librustc_error_codes/error_codes/E0365.md
+++ b/src/librustc_error_codes/error_codes/E0365.md
@@ -26,7 +26,7 @@ pub use foo as foo2;
 fn main() {}
 ```
 
-See the 'Use Declarations' section of the reference for more information
-on this topic:
+See the [Use Declarations][use-declarations] section of the reference for
+more information on this topic.
 
-https://doc.rust-lang.org/reference.html#use-declarations
+[use-declarations]: https://doc.rust-lang.org/reference/items/use-declarations.html
diff --git a/src/librustc_error_codes/error_codes/E0367.md b/src/librustc_error_codes/error_codes/E0367.md
index 7d661b2f03..cfebeada27 100644
--- a/src/librustc_error_codes/error_codes/E0367.md
+++ b/src/librustc_error_codes/error_codes/E0367.md
@@ -1,8 +1,9 @@
 An attempt was made to implement `Drop` on a specialization of a generic type.
-An example is shown below:
+
+Erroneous code example:
 
 ```compile_fail,E0367
-trait Foo{}
+trait Foo {}
 
 struct MyStruct<T> {
     t: T
diff --git a/src/librustc_error_codes/error_codes/E0368.md b/src/librustc_error_codes/error_codes/E0368.md
index 0bb283258c..7b9d933482 100644
--- a/src/librustc_error_codes/error_codes/E0368.md
+++ b/src/librustc_error_codes/error_codes/E0368.md
@@ -1,5 +1,7 @@
-This error indicates that a binary assignment operator like `+=` or `^=` was
-applied to a type that doesn't support it. For example:
+A binary assignment operator like `+=` or `^=` was applied to a type that
+doesn't support it.
+
+Erroneous code example:
 
 ```compile_fail,E0368
 let mut x = 12f32; // error: binary operation `<<` cannot be applied to
diff --git a/src/librustc_error_codes/error_codes/E0369.md b/src/librustc_error_codes/error_codes/E0369.md
index 397979e564..ab0f4b4084 100644
--- a/src/librustc_error_codes/error_codes/E0369.md
+++ b/src/librustc_error_codes/error_codes/E0369.md
@@ -1,4 +1,5 @@
 A binary operation was attempted on a type which doesn't support it.
+
 Erroneous code example:
 
 ```compile_fail,E0369
diff --git a/src/librustc_error_codes/error_codes/E0370.md b/src/librustc_error_codes/error_codes/E0370.md
index a3d280fc6d..14e954722a 100644
--- a/src/librustc_error_codes/error_codes/E0370.md
+++ b/src/librustc_error_codes/error_codes/E0370.md
@@ -1,5 +1,7 @@
 The maximum value of an enum was reached, so it cannot be automatically
-set in the next enum value. Erroneous code example:
+set in the next enum value.
+
+Erroneous code example:
 
 ```compile_fail,E0370
 #[repr(i64)]
diff --git a/src/librustc_error_codes/error_codes/E0371.md b/src/librustc_error_codes/error_codes/E0371.md
index 9363cddb1d..a44721346e 100644
--- a/src/librustc_error_codes/error_codes/E0371.md
+++ b/src/librustc_error_codes/error_codes/E0371.md
@@ -1,9 +1,6 @@
-When `Trait2` is a subtrait of `Trait1` (for example, when `Trait2` has a
-definition like `trait Trait2: Trait1 { ... }`), it is not allowed to implement
-`Trait1` for `Trait2`. This is because `Trait2` already implements `Trait1` by
-definition, so it is not useful to do this.
+A trait was implemented on another which already automatically implemented it.
 
-Example:
+Erroneous code examples:
 
 ```compile_fail,E0371
 trait Foo { fn foo(&self) { } }
@@ -15,3 +12,8 @@ impl Foo for Baz { } // error, `Baz` implements `Bar` which implements `Foo`
 impl Baz for Baz { } // error, `Baz` (trivially) implements `Baz`
 impl Baz for Bar { } // Note: This is OK
 ```
+
+When `Trait2` is a subtrait of `Trait1` (for example, when `Trait2` has a
+definition like `trait Trait2: Trait1 { ... }`), it is not allowed to implement
+`Trait1` for `Trait2`. This is because `Trait2` already implements `Trait1` by
+definition, so it is not useful to do this.
diff --git a/src/librustc_error_codes/error_codes/E0373.md b/src/librustc_error_codes/error_codes/E0373.md
index 808363e6eb..fd96987793 100644
--- a/src/librustc_error_codes/error_codes/E0373.md
+++ b/src/librustc_error_codes/error_codes/E0373.md
@@ -1,6 +1,6 @@
-This error occurs when an attempt is made to use data captured by a closure,
-when that data may no longer exist. It's most commonly seen when attempting to
-return a closure:
+A captured variable in a closure may not live long enough.
+
+Erroneous code example:
 
 ```compile_fail,E0373
 fn foo() -> Box<Fn(u32) -> u32> {
@@ -9,6 +9,10 @@ fn foo() -> Box<Fn(u32) -> u32> {
 }
 ```
 
+This error occurs when an attempt is made to use data captured by a closure,
+when that data may no longer exist. It's most commonly seen when attempting to
+return a closure as shown in the previous code example.
+
 Notice that `x` is stack-allocated by `foo()`. By default, Rust captures
 closed-over data by reference. This means that once `foo()` returns, `x` no
 longer exists. An attempt to access `x` within the closure would thus be
diff --git a/src/librustc_error_codes/error_codes/E0374.md b/src/librustc_error_codes/error_codes/E0374.md
index 0e1a4bf809..6d7dc88823 100644
--- a/src/librustc_error_codes/error_codes/E0374.md
+++ b/src/librustc_error_codes/error_codes/E0374.md
@@ -1,9 +1,5 @@
-A struct without a field containing an unsized type cannot implement
-`CoerceUnsized`. An [unsized type][1] is any type that the compiler
-doesn't know the length or alignment of at compile time. Any struct
-containing an unsized type is also unsized.
-
-[1]: https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait
+`CoerceUnsized` was implemented on a struct which does not contain a field with
+an unsized type.
 
 Example of erroneous code:
 
@@ -20,6 +16,12 @@ impl<T, U> CoerceUnsized<Foo<U>> for Foo<T>
     where T: CoerceUnsized<U> {}
 ```
 
+An [unsized type][1] is any type where the compiler does not know the length or
+alignment of at compile time. Any struct containing an unsized type is also
+unsized.
+
+[1]: https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait
+
 `CoerceUnsized` is used to coerce one struct containing an unsized type
 into another struct containing a different unsized type. If the struct
 doesn't have any fields of unsized types then you don't need explicit
diff --git a/src/librustc_error_codes/error_codes/E0375.md b/src/librustc_error_codes/error_codes/E0375.md
index 31fcd85cb0..71e5305716 100644
--- a/src/librustc_error_codes/error_codes/E0375.md
+++ b/src/librustc_error_codes/error_codes/E0375.md
@@ -1,12 +1,7 @@
-A struct with more than one field containing an unsized type cannot implement
-`CoerceUnsized`. This only occurs when you are trying to coerce one of the
-types in your struct to another type in the struct. In this case we try to
-impl `CoerceUnsized` from `T` to `U` which are both types that the struct
-takes. An [unsized type][1] is any type that the compiler doesn't know the
-length or alignment of at compile time. Any struct containing an unsized type
-is also unsized.
+`CoerceUnsized` was implemented on a struct which contains more than one field
+with an unsized type.
 
-Example of erroneous code:
+Erroneous code example:
 
 ```compile_fail,E0375
 #![feature(coerce_unsized)]
@@ -22,6 +17,14 @@ struct Foo<T: ?Sized, U: ?Sized> {
 impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
 ```
 
+A struct with more than one field containing an unsized type cannot implement
+`CoerceUnsized`. This only occurs when you are trying to coerce one of the
+types in your struct to another type in the struct. In this case we try to
+impl `CoerceUnsized` from `T` to `U` which are both types that the struct
+takes. An [unsized type][1] is any type that the compiler doesn't know the
+length or alignment of at compile time. Any struct containing an unsized type
+is also unsized.
+
 `CoerceUnsized` only allows for coercion from a structure with a single
 unsized type field to another struct with a single unsized type field.
 In fact Rust only allows for a struct to have one unsized type in a struct
diff --git a/src/librustc_error_codes/error_codes/E0376.md b/src/librustc_error_codes/error_codes/E0376.md
index b028aab458..50de15bd30 100644
--- a/src/librustc_error_codes/error_codes/E0376.md
+++ b/src/librustc_error_codes/error_codes/E0376.md
@@ -1,14 +1,6 @@
-The type you are trying to impl `CoerceUnsized` for is not a struct.
-`CoerceUnsized` can only be implemented for a struct. Unsized types are
-already able to be coerced without an implementation of `CoerceUnsized`
-whereas a struct containing an unsized type needs to know the unsized type
-field it's containing is able to be coerced. An [unsized type][1]
-is any type that the compiler doesn't know the length or alignment of at
-compile time. Any struct containing an unsized type is also unsized.
-
-[1]: https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait
+`CoerceUnsized` was implemented on something that isn't a struct.
 
-Example of erroneous code:
+Erroneous code example:
 
 ```compile_fail,E0376
 #![feature(coerce_unsized)]
@@ -22,6 +14,15 @@ struct Foo<T: ?Sized> {
 impl<T, U> CoerceUnsized<U> for Foo<T> {}
 ```
 
+`CoerceUnsized` can only be implemented for a struct. Unsized types are
+already able to be coerced without an implementation of `CoerceUnsized`
+whereas a struct containing an unsized type needs to know the unsized type
+field it's containing is able to be coerced. An [unsized type][1]
+is any type that the compiler doesn't know the length or alignment of at
+compile time. Any struct containing an unsized type is also unsized.
+
+[1]: https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait
+
 The `CoerceUnsized` trait takes a struct type. Make sure the type you are
 providing to `CoerceUnsized` is a struct with only the last field containing an
 unsized type.
diff --git a/src/librustc_error_codes/error_codes/E0378.md b/src/librustc_error_codes/error_codes/E0378.md
index 311483c890..7f4374738d 100644
--- a/src/librustc_error_codes/error_codes/E0378.md
+++ b/src/librustc_error_codes/error_codes/E0378.md
@@ -1,10 +1,28 @@
+The `DispatchFromDyn` trait was implemented on something which is not a pointer
+or a newtype wrapper around a pointer.
+
+Erroneous code example:
+
+```compile-fail,E0378
+#![feature(dispatch_from_dyn)]
+use std::ops::DispatchFromDyn;
+
+struct WrapperExtraField<T> {
+    ptr: T,
+    extra_stuff: i32,
+}
+
+impl<T, U> DispatchFromDyn<WrapperExtraField<U>> for WrapperExtraField<T>
+where
+    T: DispatchFromDyn<U>,
+{}
+```
+
 The `DispatchFromDyn` trait currently can only be implemented for
 builtin pointer types and structs that are newtype wrappers around them
 — that is, the struct must have only one field (except for`PhantomData`),
 and that field must itself implement `DispatchFromDyn`.
 
-Examples:
-
 ```
 #![feature(dispatch_from_dyn, unsize)]
 use std::{
@@ -20,6 +38,8 @@ where
 {}
 ```
 
+Another example:
+
 ```
 #![feature(dispatch_from_dyn)]
 use std::{
@@ -37,21 +57,3 @@ where
     T: DispatchFromDyn<U>,
 {}
 ```
-
-Example of illegal `DispatchFromDyn` implementation
-(illegal because of extra field)
-
-```compile-fail,E0378
-#![feature(dispatch_from_dyn)]
-use std::ops::DispatchFromDyn;
-
-struct WrapperExtraField<T> {
-    ptr: T,
-    extra_stuff: i32,
-}
-
-impl<T, U> DispatchFromDyn<WrapperExtraField<U>> for WrapperExtraField<T>
-where
-    T: DispatchFromDyn<U>,
-{}
-```
diff --git a/src/librustc_error_codes/error_codes/E0379.md b/src/librustc_error_codes/error_codes/E0379.md
index 3503da6ac2..930204847e 100644
--- a/src/librustc_error_codes/error_codes/E0379.md
+++ b/src/librustc_error_codes/error_codes/E0379.md
@@ -1,3 +1,15 @@
+A trait method was declared const.
+
+Erroneous code example:
+
+```compile_fail,E0379
+#![feature(const_fn)]
+
+trait Foo {
+    const fn bar() -> u32; // error!
+}
+```
+
 Trait methods cannot be declared `const` by design. For more information, see
 [RFC 911].
 
diff --git a/src/librustc_error_codes/error_codes/E0380.md b/src/librustc_error_codes/error_codes/E0380.md
index fe5de56933..638f0c8ecc 100644
--- a/src/librustc_error_codes/error_codes/E0380.md
+++ b/src/librustc_error_codes/error_codes/E0380.md
@@ -1,4 +1,14 @@
-Auto traits cannot have methods or associated items.
-For more information see the [opt-in builtin traits RFC][RFC 19].
+An auto trait was declared with a method or an associated item.
+
+Erroneous code example:
+
+```compile_fail,E0380
+unsafe auto trait Trait {
+    type Output; // error!
+}
+```
+
+Auto traits cannot have methods or associated items. For more information see
+the [opt-in builtin traits RFC][RFC 19].
 
 [RFC 19]: https://github.com/rust-lang/rfcs/blob/master/text/0019-opt-in-builtin-traits.md
diff --git a/src/librustc_error_codes/error_codes/E0382.md b/src/librustc_error_codes/error_codes/E0382.md
index 1592eac2ec..d1408a0629 100644
--- a/src/librustc_error_codes/error_codes/E0382.md
+++ b/src/librustc_error_codes/error_codes/E0382.md
@@ -1,5 +1,4 @@
-This error occurs when an attempt is made to use a variable after its contents
-have been moved elsewhere.
+A variable was used after its contents have been moved elsewhere.
 
 Erroneous code example:
 
@@ -104,7 +103,7 @@ With this approach, x and y share ownership of the data via the `Rc` (reference
 count type). `RefCell` essentially performs runtime borrow checking: ensuring
 that at most one writer or multiple readers can access the data at any one time.
 
-If you wish to learn more about ownership in Rust, start with the chapter in the
-Book:
+If you wish to learn more about ownership in Rust, start with the
+[Understanding Ownership][understanding-ownership] chapter in the Book.
 
-https://doc.rust-lang.org/book/ch04-00-understanding-ownership.html
+[understanding-ownership]: https://doc.rust-lang.org/book/ch04-00-understanding-ownership.html
diff --git a/src/librustc_error_codes/error_codes/E0384.md b/src/librustc_error_codes/error_codes/E0384.md
index 7c7ee744a8..e21fac0797 100644
--- a/src/librustc_error_codes/error_codes/E0384.md
+++ b/src/librustc_error_codes/error_codes/E0384.md
@@ -1,4 +1,4 @@
-This error occurs when an attempt is made to reassign an immutable variable.
+An immutable variable was reassigned.
 
 Erroneous code example:
 
diff --git a/src/librustc_error_codes/error_codes/E0387.md b/src/librustc_error_codes/error_codes/E0387.md
index 3a5facfdd2..38ad19bd6a 100644
--- a/src/librustc_error_codes/error_codes/E0387.md
+++ b/src/librustc_error_codes/error_codes/E0387.md
@@ -52,6 +52,6 @@ fn mutable() {
 }
 ```
 
-You can read more about cell types in the API documentation:
+You can read more in the API documentation for [Cell][std-cell].
 
-https://doc.rust-lang.org/std/cell/
+[std-cell]: https://doc.rust-lang.org/std/cell/
diff --git a/src/librustc_error_codes/error_codes/E0390.md b/src/librustc_error_codes/error_codes/E0390.md
index 9d05740d6f..ecc5b5568a 100644
--- a/src/librustc_error_codes/error_codes/E0390.md
+++ b/src/librustc_error_codes/error_codes/E0390.md
@@ -1,4 +1,6 @@
-You tried to implement methods for a primitive type. Erroneous code example:
+A method was implemented on a primitive type.
+
+Erroneous code example:
 
 ```compile_fail,E0390
 struct Foo {
diff --git a/src/librustc_error_codes/error_codes/E0391.md b/src/librustc_error_codes/error_codes/E0391.md
index 5db9ad16d0..dff50ccaa0 100644
--- a/src/librustc_error_codes/error_codes/E0391.md
+++ b/src/librustc_error_codes/error_codes/E0391.md
@@ -1,7 +1,6 @@
-This error indicates that some types or traits depend on each other
-and therefore cannot be constructed.
+A type dependency cycle has been encountered.
 
-The following example contains a circular dependency between two traits:
+Erroneous code example:
 
 ```compile_fail,E0391
 trait FirstTrait : SecondTrait {
@@ -12,3 +11,6 @@ trait SecondTrait : FirstTrait {
 
 }
 ```
+
+The previous example contains a circular dependency between two traits:
+`FirstTrait` depends on `SecondTrait` which itself depends on `FirstTrait`.
diff --git a/src/librustc_error_codes/error_codes/E0392.md b/src/librustc_error_codes/error_codes/E0392.md
index 1d93e904e3..f373d89456 100644
--- a/src/librustc_error_codes/error_codes/E0392.md
+++ b/src/librustc_error_codes/error_codes/E0392.md
@@ -1,5 +1,6 @@
-This error indicates that a type or lifetime parameter has been declared
-but not actually used. Here is an example that demonstrates the error:
+A type or lifetime parameter has been declared but is not actually used.
+
+Erroneous code example:
 
 ```compile_fail,E0392
 enum Foo<T> {
diff --git a/src/librustc_error_codes/error_codes/E0393.md b/src/librustc_error_codes/error_codes/E0393.md
index 7cce99401c..3e853cf1b8 100644
--- a/src/librustc_error_codes/error_codes/E0393.md
+++ b/src/librustc_error_codes/error_codes/E0393.md
@@ -1,5 +1,6 @@
 A type parameter which references `Self` in its default value was not specified.
-Example of erroneous code:
+
+Erroneous code example:
 
 ```compile_fail,E0393
 trait A<T=Self> {}
diff --git a/src/librustc_error_codes/error_codes/E0399.md b/src/librustc_error_codes/error_codes/E0399.md
index 71482c3ca6..6ea6054b41 100644
--- a/src/librustc_error_codes/error_codes/E0399.md
+++ b/src/librustc_error_codes/error_codes/E0399.md
@@ -1,9 +1,11 @@
+#### Note: this error code is no longer emitted by the compiler
+
 You implemented a trait, overriding one or more of its associated types but did
 not reimplement its default methods.
 
 Example of erroneous code:
 
-```compile_fail,E0399
+```
 #![feature(associated_type_defaults)]
 
 pub trait Foo {
diff --git a/src/librustc_error_codes/error_codes/E0454.md b/src/librustc_error_codes/error_codes/E0454.md
index d331488508..80eb91e43d 100644
--- a/src/librustc_error_codes/error_codes/E0454.md
+++ b/src/librustc_error_codes/error_codes/E0454.md
@@ -1,6 +1,6 @@
 A link name was given with an empty name. Erroneous code example:
 
-```ignore (cannot-test-this-because-rustdoc-stops-compile-fail-before-codegen)
+```compile_fail,E0454
 #[link(name = "")] extern {}
 // error: `#[link(name = "")]` given with empty name
 ```
diff --git a/src/librustc_error_codes/error_codes/E0455.md b/src/librustc_error_codes/error_codes/E0455.md
index a642528dee..2f80c34b88 100644
--- a/src/librustc_error_codes/error_codes/E0455.md
+++ b/src/librustc_error_codes/error_codes/E0455.md
@@ -15,5 +15,7 @@ To solve this error you can use conditional compilation:
 extern {}
 ```
 
-See more:
-https://doc.rust-lang.org/reference/attributes.html#conditional-compilation
+Learn more in the [Conditional Compilation][conditional-compilation] section
+of the Reference.
+
+[conditional-compilation]: https://doc.rust-lang.org/reference/attributes.html#conditional-compilation
diff --git a/src/librustc_error_codes/error_codes/E0458.md b/src/librustc_error_codes/error_codes/E0458.md
index 385079d403..5996f190b3 100644
--- a/src/librustc_error_codes/error_codes/E0458.md
+++ b/src/librustc_error_codes/error_codes/E0458.md
@@ -1,6 +1,6 @@
 An unknown "kind" was specified for a link attribute. Erroneous code example:
 
-```ignore (cannot-test-this-because-rustdoc-stops-compile-fail-before-codegen)
+```compile_fail,E0458
 #[link(kind = "wonderful_unicorn")] extern {}
 // error: unknown kind: `wonderful_unicorn`
 ```
diff --git a/src/librustc_error_codes/error_codes/E0459.md b/src/librustc_error_codes/error_codes/E0459.md
index 663bc322ee..580cbf1e1c 100644
--- a/src/librustc_error_codes/error_codes/E0459.md
+++ b/src/librustc_error_codes/error_codes/E0459.md
@@ -1,6 +1,6 @@
 A link was used without a name parameter. Erroneous code example:
 
-```ignore (cannot-test-this-because-rustdoc-stops-compile-fail-before-codegen)
+```compile_fail,E0459
 #[link(kind = "dylib")] extern {}
 // error: `#[link(...)]` specified without `name = "foo"`
 ```
diff --git a/src/librustc_error_codes/error_codes/E0499.md b/src/librustc_error_codes/error_codes/E0499.md
index 370ceef530..a07e8eb3b3 100644
--- a/src/librustc_error_codes/error_codes/E0499.md
+++ b/src/librustc_error_codes/error_codes/E0499.md
@@ -10,11 +10,13 @@ x;
 // error: cannot borrow `i` as mutable more than once at a time
 ```
 
-Please note that in rust, you can either have many immutable references, or one
-mutable reference. Take a look at
-https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html for more
-information. Example:
+Please note that in Rust, you can either have many immutable references, or one
+mutable reference. For more details you may want to read the
+[References & Borrowing][references-and-borrowing] section of the Book.
 
+[references-and-borrowing]: https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
+
+Example:
 
 ```
 let mut i = 0;
diff --git a/src/librustc_error_codes/error_codes/E0501.md b/src/librustc_error_codes/error_codes/E0501.md
index 95e0dfd400..f5aa17a809 100644
--- a/src/librustc_error_codes/error_codes/E0501.md
+++ b/src/librustc_error_codes/error_codes/E0501.md
@@ -3,9 +3,10 @@ captured by a closure. Because the closure has borrowed the variable, it is not
 available for use until the closure goes out of scope.
 
 Note that a capture will either move or borrow a variable, but in this
-situation, the closure is borrowing the variable. Take a look at
-http://rustbyexample.com/fn/closures/capture.html for more information about
-capturing.
+situation, the closure is borrowing the variable. Take a look at the chapter
+on [Capturing][capturing] in Rust By Example for more information.
+
+[capturing]: https://doc.rust-lang.org/stable/rust-by-example/fn/closures/capture.html
 
 Erroneous code example:
 
diff --git a/src/librustc_error_codes/error_codes/E0502.md b/src/librustc_error_codes/error_codes/E0502.md
index 69220259e3..f15c05d558 100644
--- a/src/librustc_error_codes/error_codes/E0502.md
+++ b/src/librustc_error_codes/error_codes/E0502.md
@@ -25,5 +25,7 @@ fn foo(a: &mut i32) {
 }
 ```
 
-For more information on the rust ownership system, take a look at
-https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html.
+For more information on Rust's ownership system, take a look at the
+[References & Borrowing][references-and-borrowing] section of the Book.
+
+[references-and-borrowing]: https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
diff --git a/src/librustc_error_codes/error_codes/E0503.md b/src/librustc_error_codes/error_codes/E0503.md
index c683619e3d..c52525fee5 100644
--- a/src/librustc_error_codes/error_codes/E0503.md
+++ b/src/librustc_error_codes/error_codes/E0503.md
@@ -48,5 +48,7 @@ fn main() {
 }
 ```
 
-You can find more information about borrowing in the rust-book:
-http://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
+For more information on Rust's ownership system, take a look at the
+[References & Borrowing][references-and-borrowing] section of the Book.
+
+[references-and-borrowing]: https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
diff --git a/src/librustc_error_codes/error_codes/E0505.md b/src/librustc_error_codes/error_codes/E0505.md
index 14baa01cb5..b11e3c0e94 100644
--- a/src/librustc_error_codes/error_codes/E0505.md
+++ b/src/librustc_error_codes/error_codes/E0505.md
@@ -81,5 +81,7 @@ fn main() {
 }
 ```
 
-You can find more information about borrowing in the rust-book:
-http://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
+For more information on Rust's ownership system, take a look at the
+[References & Borrowing][references-and-borrowing] section of the Book.
+
+[references-and-borrowing]: https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
diff --git a/src/librustc_error_codes/error_codes/E0507.md b/src/librustc_error_codes/error_codes/E0507.md
index 89a6fb4737..1e3457e96c 100644
--- a/src/librustc_error_codes/error_codes/E0507.md
+++ b/src/librustc_error_codes/error_codes/E0507.md
@@ -127,5 +127,7 @@ let borrowed = &mut cave;
 mem::replace(&mut borrowed.knight, TheDarkKnight).nothing_is_true(); // ok!
 ```
 
-You can find more information about borrowing in the rust-book:
-http://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
+For more information on Rust's ownership system, take a look at the
+[References & Borrowing][references-and-borrowing] section of the Book.
+
+[references-and-borrowing]: https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html
diff --git a/src/librustc_error_codes/error_codes/E0511.md b/src/librustc_error_codes/error_codes/E0511.md
index 2d6ff8241e..4f6644f358 100644
--- a/src/librustc_error_codes/error_codes/E0511.md
+++ b/src/librustc_error_codes/error_codes/E0511.md
@@ -1,7 +1,7 @@
 Invalid monomorphization of an intrinsic function was used. Erroneous code
 example:
 
-```ignore (error-emitted-at-codegen-which-cannot-be-handled-by-compile_fail)
+```compile_fail,E0511
 #![feature(platform_intrinsics)]
 
 extern "platform-intrinsic" {
diff --git a/src/librustc_error_codes/error_codes/E0525.md b/src/librustc_error_codes/error_codes/E0525.md
index 95e5f362bd..a769440ca1 100644
--- a/src/librustc_error_codes/error_codes/E0525.md
+++ b/src/librustc_error_codes/error_codes/E0525.md
@@ -36,5 +36,7 @@ fn main() {
 }
 ```
 
-To understand better how closures work in Rust, read:
-https://doc.rust-lang.org/book/ch13-01-closures.html
+To better understand how these work in Rust, read the [Closures][closures]
+chapter of the Book.
+
+[closures]: https://doc.rust-lang.org/book/ch13-01-closures.html
diff --git a/src/librustc_error_codes/error_codes/E0534.md b/src/librustc_error_codes/error_codes/E0534.md
index e50b84764b..1ca9411b8d 100644
--- a/src/librustc_error_codes/error_codes/E0534.md
+++ b/src/librustc_error_codes/error_codes/E0534.md
@@ -2,7 +2,7 @@ The `inline` attribute was malformed.
 
 Erroneous code example:
 
-```ignore (compile_fail not working here; see Issue #43707)
+```compile_fail,E0534
 #[inline()] // error: expected one argument
 pub fn something() {}
 
@@ -31,5 +31,7 @@ compiler about inlining opportunity:
 fn something() {}
 ```
 
-For more information about the inline attribute, read:
-https://doc.rust-lang.org/reference.html#inline-attributes
+For more information see the [`inline` attribute][inline-attribute] section
+of the Reference.
+
+[inline-attribute]: https://doc.rust-lang.org/reference/attributes/codegen.html#the-inline-attribute
diff --git a/src/librustc_error_codes/error_codes/E0535.md b/src/librustc_error_codes/error_codes/E0535.md
index e9abfe5dda..0cf3118b02 100644
--- a/src/librustc_error_codes/error_codes/E0535.md
+++ b/src/librustc_error_codes/error_codes/E0535.md
@@ -2,7 +2,7 @@ An unknown argument was given to the `inline` attribute.
 
 Erroneous code example:
 
-```ignore (compile_fail not working here; see Issue #43707)
+```compile_fail,E0535
 #[inline(unknown)] // error: invalid argument
 pub fn something() {}
 
@@ -24,5 +24,7 @@ pub fn something() {}
 fn main() {}
 ```
 
-For more information about the inline attribute, https:
-read://doc.rust-lang.org/reference.html#inline-attributes
+For more information see the [`inline` Attribute][inline-attribute] section
+of the Reference.
+
+[inline-attribute]: https://doc.rust-lang.org/reference/attributes/codegen.html#the-inline-attribute
diff --git a/src/librustc_error_codes/error_codes/E0536.md b/src/librustc_error_codes/error_codes/E0536.md
index 9006906a70..c081a3d9cf 100644
--- a/src/librustc_error_codes/error_codes/E0536.md
+++ b/src/librustc_error_codes/error_codes/E0536.md
@@ -18,5 +18,7 @@ pub fn something() {}
 pub fn main() {}
 ```
 
-For more information about the cfg attribute, read:
-https://doc.rust-lang.org/reference.html#conditional-compilation
+For more information about the `cfg` attribute, read the section on
+[Conditional Compilation][conditional-compilation] in the Reference.
+
+[conditional-compilation]: https://doc.rust-lang.org/reference/conditional-compilation.html
diff --git a/src/librustc_error_codes/error_codes/E0537.md b/src/librustc_error_codes/error_codes/E0537.md
index 82d8c6188a..123efd4f57 100644
--- a/src/librustc_error_codes/error_codes/E0537.md
+++ b/src/librustc_error_codes/error_codes/E0537.md
@@ -24,5 +24,7 @@ pub fn something() {}
 pub fn main() {}
 ```
 
-For more information about the cfg attribute, read:
-https://doc.rust-lang.org/reference.html#conditional-compilation
+For more information about the `cfg` attribute, read the section on
+[Conditional Compilation][conditional-compilation] in the Reference.
+
+[conditional-compilation]: https://doc.rust-lang.org/reference/conditional-compilation.html
diff --git a/src/librustc_error_codes/error_codes/E0565.md b/src/librustc_error_codes/error_codes/E0565.md
index 1faedf4593..d5bba941c1 100644
--- a/src/librustc_error_codes/error_codes/E0565.md
+++ b/src/librustc_error_codes/error_codes/E0565.md
@@ -2,9 +2,11 @@ A literal was used in a built-in attribute that doesn't support literals.
 
 Erroneous code example:
 
-```ignore (compile_fail not working here; see Issue #43707)
-#[inline("always")] // error: unsupported literal
-pub fn something() {}
+```compile_fail,E0565
+#[repr("C")] // error: meta item in `repr` must be an identifier
+struct Repr {}
+
+fn main() {}
 ```
 
 Literals in attributes are new and largely unsupported in built-in attributes.
@@ -12,6 +14,8 @@ Work to support literals where appropriate is ongoing. Try using an unquoted
 name instead:
 
 ```
-#[inline(always)]
-pub fn something() {}
+#[repr(C)] // ok!
+struct Repr {}
+
+fn main() {}
 ```
diff --git a/src/librustc_error_codes/error_codes/E0591.md b/src/librustc_error_codes/error_codes/E0591.md
index 782d4cf29c..7f68815b1c 100644
--- a/src/librustc_error_codes/error_codes/E0591.md
+++ b/src/librustc_error_codes/error_codes/E0591.md
@@ -54,7 +54,7 @@ This pattern should be rewritten. There are a few possible ways to do this:
 
 - change the original fn declaration to match the expected signature,
   and do the cast in the fn body (the preferred option)
-- cast the fn item fo a fn pointer before calling transmute, as shown here:
+- cast the fn item of a fn pointer before calling transmute, as shown here:
 
     ```
     # extern "C" fn foo(_: Box<i32>) {}
diff --git a/src/librustc_error_codes/error_codes/E0601.md b/src/librustc_error_codes/error_codes/E0601.md
index 12ae767c9e..8180c5db46 100644
--- a/src/librustc_error_codes/error_codes/E0601.md
+++ b/src/librustc_error_codes/error_codes/E0601.md
@@ -8,5 +8,7 @@ fn main() {
 }
 ```
 
-If you don't know the basics of Rust, you can go look to the Rust Book to get
-started: https://doc.rust-lang.org/book/
+If you don't know the basics of Rust, you can look at the
+[Rust Book][rust-book] to get started.
+
+[rust-book]: https://doc.rust-lang.org/book/
diff --git a/src/librustc_error_codes/error_codes/E0610.md b/src/librustc_error_codes/error_codes/E0610.md
index d590ce51a3..c737bd618c 100644
--- a/src/librustc_error_codes/error_codes/E0610.md
+++ b/src/librustc_error_codes/error_codes/E0610.md
@@ -24,6 +24,7 @@ let variable = Foo { x: 0, y: -12 };
 println!("x: {}, y: {}", variable.x, variable.y);
 ```
 
-For more information about primitives and structs, take a look at The Book:
-https://doc.rust-lang.org/book/ch03-02-data-types.html
-https://doc.rust-lang.org/book/ch05-00-structs.html
+For more information about [primitives] and [structs], take a look at the Book.
+
+[primitives]: https://doc.rust-lang.org/book/ch03-02-data-types.html
+[structs]: https://doc.rust-lang.org/book/ch05-00-structs.html
diff --git a/src/librustc_error_codes/error_codes/E0626.md b/src/librustc_error_codes/error_codes/E0626.md
index db50bd7ac4..cc6e03d1ca 100644
--- a/src/librustc_error_codes/error_codes/E0626.md
+++ b/src/librustc_error_codes/error_codes/E0626.md
@@ -12,7 +12,7 @@ let mut b = || {
     yield (); // ...is still in scope here, when the yield occurs.
     println!("{}", a);
 };
-Pin::new(&mut b).resume();
+Pin::new(&mut b).resume(());
 ```
 
 At present, it is not permitted to have a yield that occurs while a
@@ -31,7 +31,7 @@ let mut b = || {
     yield ();
     println!("{}", a);
 };
-Pin::new(&mut b).resume();
+Pin::new(&mut b).resume(());
 ```
 
 This is a very simple case, of course. In more complex cases, we may
@@ -50,7 +50,7 @@ let mut b = || {
     yield x; // ...when this yield occurs.
   }
 };
-Pin::new(&mut b).resume();
+Pin::new(&mut b).resume(());
 ```
 
 Such cases can sometimes be resolved by iterating "by value" (or using
@@ -66,7 +66,7 @@ let mut b = || {
     yield x; // <-- Now yield is OK.
   }
 };
-Pin::new(&mut b).resume();
+Pin::new(&mut b).resume(());
 ```
 
 If taking ownership is not an option, using indices can work too:
@@ -83,7 +83,7 @@ let mut b = || {
     yield x; // <-- Now yield is OK.
   }
 };
-Pin::new(&mut b).resume();
+Pin::new(&mut b).resume(());
 
 // (*) -- Unfortunately, these temporaries are currently required.
 // See <https://github.com/rust-lang/rust/issues/43122>.
diff --git a/src/librustc_error_codes/error_codes/E0633.md b/src/librustc_error_codes/error_codes/E0633.md
index 65cdf90036..7f488cde66 100644
--- a/src/librustc_error_codes/error_codes/E0633.md
+++ b/src/librustc_error_codes/error_codes/E0633.md
@@ -2,7 +2,9 @@ The `unwind` attribute was malformed.
 
 Erroneous code example:
 
-```ignore (compile_fail not working here; see Issue #43707)
+```compile_fail,E0633
+#![feature(unwind_attributes)]
+
 #[unwind()] // error: expected one argument
 pub extern fn something() {}
 
diff --git a/src/librustc_error_codes/error_codes/E0637.md b/src/librustc_error_codes/error_codes/E0637.md
new file mode 100644
index 0000000000..e114d3d0f9
--- /dev/null
+++ b/src/librustc_error_codes/error_codes/E0637.md
@@ -0,0 +1,32 @@
+An underscore `_` character has been used as the identifier for a lifetime.
+
+Erroneous example:
+```compile_fail,E0106,E0637
+fn longest<'_>(str1: &'_ str, str2: &'_ str) -> &'_ str {
+         //^^ `'_` is a reserved lifetime name
+    if str1.len() > str2.len() {
+        str1
+    } else {
+        str2
+    }
+}
+```
+`'_`, cannot be used as a lifetime identifier because it is a reserved for the
+anonymous lifetime. To fix this, use a lowercase letter such as 'a, or a series
+of lowercase letters such as `'foo`.  For more information, see [the
+book][bk-no].  For more information on using the anonymous lifetime in rust
+nightly, see [the nightly book][bk-al].
+
+Corrected example:
+```
+fn longest<'a>(str1: &'a str, str2: &'a str) -> &'a str {
+    if str1.len() > str2.len() {
+        str1
+    } else {
+        str2
+    }
+}
+```
+
+[bk-no]: https://doc.rust-lang.org/book/appendix-02-operators.html#non-operator-symbols
+[bk-al]: https://doc.rust-lang.org/nightly/edition-guide/rust-2018/ownership-and-lifetimes/the-anonymous-lifetime.html
diff --git a/src/librustc_error_codes/error_codes/E0660.md b/src/librustc_error_codes/error_codes/E0660.md
index bceab1e005..189459175d 100644
--- a/src/librustc_error_codes/error_codes/E0660.md
+++ b/src/librustc_error_codes/error_codes/E0660.md
@@ -6,6 +6,7 @@ Erroneous code example:
 asm!("nop" "nop");
 ```
 
-Considering that this would be a long explanation, we instead recommend you to
-take a look at the unstable book:
-https://doc.rust-lang.org/unstable-book/language-features/asm.html
+Considering that this would be a long explanation, we instead recommend you
+take a look at the [`asm`] chapter of the Unstable book:
+
+[asm]: https://doc.rust-lang.org/stable/unstable-book/library-features/asm.html
diff --git a/src/librustc_error_codes/error_codes/E0661.md b/src/librustc_error_codes/error_codes/E0661.md
index 9979a61ee9..b171ada620 100644
--- a/src/librustc_error_codes/error_codes/E0661.md
+++ b/src/librustc_error_codes/error_codes/E0661.md
@@ -7,6 +7,7 @@ let a;
 asm!("nop" : "r"(a));
 ```
 
-Considering that this would be a long explanation, we instead recommend you to
-take a look at the unstable book:
-https://doc.rust-lang.org/unstable-book/language-features/asm.html
+Considering that this would be a long explanation, we instead recommend you
+take a look at the [`asm`] chapter of the Unstable book:
+
+[asm]: https://doc.rust-lang.org/stable/unstable-book/library-features/asm.html
diff --git a/src/librustc_error_codes/error_codes/E0662.md b/src/librustc_error_codes/error_codes/E0662.md
index 3ba00eaab5..c15e736610 100644
--- a/src/librustc_error_codes/error_codes/E0662.md
+++ b/src/librustc_error_codes/error_codes/E0662.md
@@ -9,6 +9,7 @@ asm!("xor %eax, %eax"
     );
 ```
 
-Considering that this would be a long explanation, we instead recommend you to
-take a look at the unstable book:
-https://doc.rust-lang.org/unstable-book/language-features/asm.html
+Considering that this would be a long explanation, we instead recommend you
+take a look at the [`asm`] chapter of the Unstable book:
+
+[asm]: https://doc.rust-lang.org/stable/unstable-book/library-features/asm.html
diff --git a/src/librustc_error_codes/error_codes/E0663.md b/src/librustc_error_codes/error_codes/E0663.md
index be121aa0b7..bd450230ec 100644
--- a/src/librustc_error_codes/error_codes/E0663.md
+++ b/src/librustc_error_codes/error_codes/E0663.md
@@ -9,6 +9,7 @@ asm!("xor %eax, %eax"
     );
 ```
 
-Considering that this would be a long explanation, we instead recommend you to
-take a look at the unstable book:
-https://doc.rust-lang.org/unstable-book/language-features/asm.html
+Considering that this would be a long explanation, we instead recommend you
+take a look at the [`asm`] chapter of the Unstable book:
+
+[asm]: https://doc.rust-lang.org/stable/unstable-book/library-features/asm.html
diff --git a/src/librustc_error_codes/error_codes/E0664.md b/src/librustc_error_codes/error_codes/E0664.md
index 2b9546453d..768ffdf2de 100644
--- a/src/librustc_error_codes/error_codes/E0664.md
+++ b/src/librustc_error_codes/error_codes/E0664.md
@@ -10,6 +10,7 @@ asm!("mov $$0x200, %eax"
     );
 ```
 
-Considering that this would be a long explanation, we instead recommend you to
-take a look at the unstable book:
-https://doc.rust-lang.org/unstable-book/language-features/asm.html
+Considering that this would be a long explanation, we instead recommend you
+take a look at the [`asm`] chapter of the Unstable book:
+
+[asm]: https://doc.rust-lang.org/stable/unstable-book/library-features/asm.html
diff --git a/src/librustc_error_codes/error_codes/E0668.md b/src/librustc_error_codes/error_codes/E0668.md
index 2621a31a9e..f5d26244fb 100644
--- a/src/librustc_error_codes/error_codes/E0668.md
+++ b/src/librustc_error_codes/error_codes/E0668.md
@@ -6,7 +6,7 @@ assembly call.
 
 In particular, it can happen if you forgot the closing bracket of a register
 constraint (see issue #51430):
-```ignore (error-emitted-at-codegen-which-cannot-be-handled-by-compile_fail)
+```compile_fail,E0668
 #![feature(asm)]
 
 fn main() {
diff --git a/src/librustc_error_codes/error_codes/E0719.md b/src/librustc_error_codes/error_codes/E0719.md
new file mode 100644
index 0000000000..38bc63550a
--- /dev/null
+++ b/src/librustc_error_codes/error_codes/E0719.md
@@ -0,0 +1,35 @@
+The value for an associated type has already been specified.
+
+Erroneous code example:
+
+```compile_fail,E0719
+#![feature(associated_type_bounds)]
+
+trait FooTrait {}
+trait BarTrait {}
+
+// error: associated type `Item` in trait `Iterator` is specified twice
+struct Foo<T: Iterator<Item: FooTrait, Item: BarTrait>> { f: T }
+```
+
+`Item` in trait `Iterator` cannot be specified multiple times for struct `Foo`.
+To fix this, create a new trait that is a combination of the desired traits and
+specify the associated type with the new trait.
+
+Corrected example:
+
+```
+#![feature(associated_type_bounds)]
+
+trait FooTrait {}
+trait BarTrait {}
+trait FooBarTrait: FooTrait + BarTrait {}
+
+struct Foo<T: Iterator<Item: FooBarTrait>> { f: T }
+```
+
+For more information about associated types, see [the book][bk-at]. For more
+information on associated type bounds, see [RFC 2289][rfc-2289].
+
+[bk-at]: https://doc.rust-lang.org/book/ch19-03-advanced-traits.html#specifying-placeholder-types-in-trait-definitions-with-associated-types
+[rfc-2289]: https://rust-lang.github.io/rfcs/2289-associated-type-bounds.html
diff --git a/src/librustc_error_codes/error_codes/E0727.md b/src/librustc_error_codes/error_codes/E0727.md
new file mode 100644
index 0000000000..528807ee9a
--- /dev/null
+++ b/src/librustc_error_codes/error_codes/E0727.md
@@ -0,0 +1,26 @@
+A `yield` clause was used in an `async` context.
+
+Example of erroneous code:
+
+```compile_fail
+#![feature(generators)]
+
+let generator = || {
+    async {
+        yield;
+    }
+};
+```
+
+Here, the `yield` keyword is used in an `async` block,
+which is not yet supported.
+
+To fix this error, you have to move `yield` out of the `async` block:
+
+```
+#![feature(generators)]
+
+let generator = || {
+    yield;
+};
+```
diff --git a/src/librustc_error_codes/error_codes/E0747.md b/src/librustc_error_codes/error_codes/E0747.md
new file mode 100644
index 0000000000..df1afbfef4
--- /dev/null
+++ b/src/librustc_error_codes/error_codes/E0747.md
@@ -0,0 +1,20 @@
+Generic arguments must be provided in the same order as the corresponding
+generic parameters are declared.
+
+Erroneous code example:
+
+```compile_fail,E0747
+struct S<'a, T>(&'a T);
+
+type X = S<(), 'static>; // error: the type argument is provided before the
+                         // lifetime argument
+```
+
+The argument order should be changed to match the parameter declaration
+order, as in the following.
+
+```
+struct S<'a, T>(&'a T);
+
+type X = S<'static, ()>; // ok
+```
diff --git a/src/librustc_error_codes/error_codes/E0748.md b/src/librustc_error_codes/error_codes/E0748.md
new file mode 100644
index 0000000000..69f1c02612
--- /dev/null
+++ b/src/librustc_error_codes/error_codes/E0748.md
@@ -0,0 +1,16 @@
+A raw string isn't correctly terminated because the trailing `#` count doesn't
+match its leading `#` count.
+
+Erroneous code example:
+
+```compile_fail,E0748
+let dolphins = r##"Dolphins!"#; // error!
+```
+
+To terminate a raw string, you have to have the same number of `#` at the end
+as at the beginning. Example:
+
+```
+let dolphins = r#"Dolphins!"#; // One `#` at the beginning, one at the end so
+                               // all good!
+```
diff --git a/src/librustc_error_codes/lib.rs b/src/librustc_error_codes/lib.rs
index f051fdd11b..4353a294cc 100644
--- a/src/librustc_error_codes/lib.rs
+++ b/src/librustc_error_codes/lib.rs
@@ -3,8 +3,9 @@
 
 macro_rules! register_diagnostics {
     ($($ecode:ident: $message:expr,)* ; $($code:ident,)*) => (
-        pub static DIAGNOSTICS: &[(&str, &str)] = &[
-            $( (stringify!($ecode), $message), )*
+        pub static DIAGNOSTICS: &[(&str, Option<&str>)] = &[
+            $( (stringify!($ecode), Some($message)), )*
+            $( (stringify!($code), None), )*
         ];
     )
 }
diff --git a/src/librustc_errors/Cargo.toml b/src/librustc_errors/Cargo.toml
index 01ea80659d..b8340b1a1d 100644
--- a/src/librustc_errors/Cargo.toml
+++ b/src/librustc_errors/Cargo.toml
@@ -18,7 +18,7 @@ unicode-width = "0.1.4"
 atty = "0.2"
 termcolor = "1.0"
 annotate-snippets = "0.6.1"
-term_size = "0.3.1"
+termize = "0.1.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["handleapi", "synchapi", "winbase"] }
diff --git a/src/librustc_errors/annotate_snippet_emitter_writer.rs b/src/librustc_errors/annotate_snippet_emitter_writer.rs
index 009ab6ac5b..d83175694f 100644
--- a/src/librustc_errors/annotate_snippet_emitter_writer.rs
+++ b/src/librustc_errors/annotate_snippet_emitter_writer.rs
@@ -23,7 +23,7 @@ pub struct AnnotateSnippetEmitterWriter {
     /// If true, will normalize line numbers with `LL` to prevent noise in UI test diffs.
     ui_testing: bool,
 
-    external_macro_backtrace: bool,
+    macro_backtrace: bool,
 }
 
 impl Emitter for AnnotateSnippetEmitterWriter {
@@ -32,12 +32,12 @@ impl Emitter for AnnotateSnippetEmitterWriter {
         let mut children = diag.children.clone();
         let (mut primary_span, suggestions) = self.primary_span_formatted(&diag);
 
-        self.fix_multispans_in_std_macros(
+        self.fix_multispans_in_extern_macros_and_render_macro_backtrace(
             &self.source_map,
             &mut primary_span,
             &mut children,
             &diag.level,
-            self.external_macro_backtrace,
+            self.macro_backtrace,
         );
 
         self.emit_messages_default(
@@ -172,9 +172,9 @@ impl AnnotateSnippetEmitterWriter {
     pub fn new(
         source_map: Option<Lrc<SourceMap>>,
         short_message: bool,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> Self {
-        Self { source_map, short_message, ui_testing: false, external_macro_backtrace }
+        Self { source_map, short_message, ui_testing: false, macro_backtrace }
     }
 
     /// Allows to modify `Self` to enable or disable the `ui_testing` flag.
diff --git a/src/librustc_errors/diagnostic.rs b/src/librustc_errors/diagnostic.rs
index 5286e8c19b..1cc5daafed 100644
--- a/src/librustc_errors/diagnostic.rs
+++ b/src/librustc_errors/diagnostic.rs
@@ -167,17 +167,17 @@ impl Diagnostic {
         found: DiagnosticStyledString,
     ) -> &mut Self {
         let mut msg: Vec<_> =
-            vec![(format!("required when trying to coerce from type `"), Style::NoStyle)];
+            vec![("required when trying to coerce from type `".to_string(), Style::NoStyle)];
         msg.extend(expected.0.iter().map(|x| match *x {
             StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
             StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
         }));
-        msg.push((format!("` to type '"), Style::NoStyle));
+        msg.push(("` to type '".to_string(), Style::NoStyle));
         msg.extend(found.0.iter().map(|x| match *x {
             StringPart::Normal(ref s) => (s.to_owned(), Style::NoStyle),
             StringPart::Highlighted(ref s) => (s.to_owned(), Style::Highlight),
         }));
-        msg.push((format!("`"), Style::NoStyle));
+        msg.push(("`".to_string(), Style::NoStyle));
 
         // For now, just attach these as notes
         self.highlighted_note(msg);
@@ -194,6 +194,7 @@ impl Diagnostic {
         found_extra: &dyn fmt::Display,
     ) -> &mut Self {
         let expected_label = format!("expected {}", expected_label);
+
         let found_label = format!("found {}", found_label);
         let (found_padding, expected_padding) = if expected_label.len() > found_label.len() {
             (expected_label.len() - found_label.len(), 0)
diff --git a/src/librustc_errors/diagnostic_builder.rs b/src/librustc_errors/diagnostic_builder.rs
index 0796c46e0d..008d2e9241 100644
--- a/src/librustc_errors/diagnostic_builder.rs
+++ b/src/librustc_errors/diagnostic_builder.rs
@@ -106,7 +106,11 @@ impl<'a> DiagnosticBuilder<'a> {
     ///
     /// See `emit` and `delay_as_bug` for details.
     pub fn emit_unless(&mut self, delay: bool) {
-        if delay { self.delay_as_bug() } else { self.emit() }
+        if delay {
+            self.delay_as_bug();
+        } else {
+            self.emit();
+        }
     }
 
     /// Stashes diagnostic for possible later improvement in a different,
@@ -185,11 +189,25 @@ impl<'a> DiagnosticBuilder<'a> {
     /// all, and you just supplied a `Span` to create the diagnostic,
     /// then the snippet will just include that `Span`, which is
     /// called the primary span.
-    pub fn span_label<T: Into<String>>(&mut self, span: Span, label: T) -> &mut Self {
+    pub fn span_label(&mut self, span: Span, label: impl Into<String>) -> &mut Self {
         self.0.diagnostic.span_label(span, label);
         self
     }
 
+    /// Labels all the given spans with the provided label.
+    /// See `span_label` for more information.
+    pub fn span_labels(
+        &mut self,
+        spans: impl IntoIterator<Item = Span>,
+        label: impl AsRef<str>,
+    ) -> &mut Self {
+        let label = label.as_ref();
+        for span in spans {
+            self.0.diagnostic.span_label(span, label);
+        }
+        self
+    }
+
     forward!(pub fn note_expected_found(
         &mut self,
         expected_label: &dyn fmt::Display,
@@ -354,6 +372,7 @@ impl<'a> DiagnosticBuilder<'a> {
     /// Creates a new `DiagnosticBuilder` with an already constructed
     /// diagnostic.
     crate fn new_diagnostic(handler: &'a Handler, diagnostic: Diagnostic) -> DiagnosticBuilder<'a> {
+        debug!("Created new diagnostic");
         DiagnosticBuilder(Box::new(DiagnosticBuilderInner {
             handler,
             diagnostic,
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index 7ef623807d..eb9d4b887a 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -14,7 +14,6 @@ use rustc_span::{MultiSpan, SourceFile, Span};
 
 use crate::snippet::{Annotation, AnnotationType, Line, MultilineAnnotation, Style, StyledString};
 use crate::styled_buffer::StyledBuffer;
-use crate::Level::Error;
 use crate::{
     pluralize, CodeSuggestion, Diagnostic, DiagnosticId, Level, SubDiagnostic, SuggestionStyle,
 };
@@ -27,6 +26,7 @@ use std::borrow::Cow;
 use std::cmp::{max, min, Reverse};
 use std::io;
 use std::io::prelude::*;
+use std::iter;
 use std::path::Path;
 use termcolor::{Ansi, BufferWriter, ColorChoice, ColorSpec, StandardStream};
 use termcolor::{Buffer, Color, WriteColor};
@@ -54,19 +54,11 @@ impl HumanReadableErrorType {
         source_map: Option<Lrc<SourceMap>>,
         teach: bool,
         terminal_width: Option<usize>,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> EmitterWriter {
         let (short, color_config) = self.unzip();
         let color = color_config.suggests_using_colors();
-        EmitterWriter::new(
-            dst,
-            source_map,
-            short,
-            teach,
-            color,
-            terminal_width,
-            external_macro_backtrace,
-        )
+        EmitterWriter::new(dst, source_map, short, teach, color, terminal_width, macro_backtrace)
     }
 }
 
@@ -239,7 +231,7 @@ pub trait Emitter {
                ].contains(&sugg.style)
             {
                 let substitution = &sugg.substitutions[0].parts[0].snippet.trim();
-                let msg = if substitution.len() == 0 || sugg.style.hide_inline() {
+                let msg = if substitution.is_empty() || sugg.style.hide_inline() {
                     // This substitution is only removal OR we explicitly don't want to show the
                     // code inline (`hide_inline`). Therefore, we don't show the substitution.
                     format!("help: {}", sugg.msg)
@@ -280,10 +272,7 @@ pub trait Emitter {
         }
     }
 
-    // This does a small "fix" for multispans by looking to see if it can find any that
-    // point directly at <*macros>. Since these are often difficult to read, this
-    // will change the span to point at the use site.
-    fn fix_multispans_in_std_macros(
+    fn fix_multispans_in_extern_macros_and_render_macro_backtrace(
         &self,
         source_map: &Option<Lrc<SourceMap>>,
         span: &mut MultiSpan,
@@ -291,127 +280,187 @@ pub trait Emitter {
         level: &Level,
         backtrace: bool,
     ) {
-        let mut spans_updated = self.fix_multispan_in_std_macros(source_map, span, backtrace);
-        for child in children.iter_mut() {
-            spans_updated |=
-                self.fix_multispan_in_std_macros(source_map, &mut child.span, backtrace);
+        // Check for spans in macros, before `fix_multispans_in_extern_macros`
+        // has a chance to replace them.
+        let has_macro_spans = iter::once(&*span)
+            .chain(children.iter().map(|child| &child.span))
+            .flat_map(|span| span.primary_spans())
+            .copied()
+            .flat_map(|sp| {
+                sp.macro_backtrace().filter_map(|expn_data| {
+                    match expn_data.kind {
+                        ExpnKind::Root => None,
+
+                        // Skip past non-macro entries, just in case there
+                        // are some which do actually involve macros.
+                        ExpnKind::Desugaring(..) | ExpnKind::AstPass(..) => None,
+
+                        ExpnKind::Macro(macro_kind, _) => Some(macro_kind),
+                    }
+                })
+            })
+            .next();
+
+        if !backtrace {
+            self.fix_multispans_in_extern_macros(source_map, span, children);
         }
-        let msg = if level == &Error {
-            "this error originates in a macro outside of the current crate \
-             (in Nightly builds, run with -Z external-macro-backtrace \
-              for more info)"
-                .to_string()
-        } else {
-            "this warning originates in a macro outside of the current crate \
-             (in Nightly builds, run with -Z external-macro-backtrace \
-              for more info)"
-                .to_string()
-        };
 
-        if spans_updated {
-            children.push(SubDiagnostic {
-                level: Level::Note,
-                message: vec![(msg, Style::NoStyle)],
-                span: MultiSpan::new(),
-                render_span: None,
-            });
+        self.render_multispans_macro_backtrace(span, children, backtrace);
+
+        if !backtrace {
+            if let Some(macro_kind) = has_macro_spans {
+                let msg = format!(
+                    "this {} originates in {} {} \
+                    (in Nightly builds, run with -Z macro-backtrace for more info)",
+                    level,
+                    macro_kind.article(),
+                    macro_kind.descr(),
+                );
+
+                children.push(SubDiagnostic {
+                    level: Level::Note,
+                    message: vec![(msg, Style::NoStyle)],
+                    span: MultiSpan::new(),
+                    render_span: None,
+                });
+            }
         }
     }
 
-    // This "fixes" MultiSpans that contain Spans that are pointing to locations inside of
-    // <*macros>. Since these locations are often difficult to read, we move these Spans from
-    // <*macros> to their corresponding use site.
-    fn fix_multispan_in_std_macros(
+    fn render_multispans_macro_backtrace(
         &self,
-        source_map: &Option<Lrc<SourceMap>>,
         span: &mut MultiSpan,
-        always_backtrace: bool,
-    ) -> bool {
-        let sm = match source_map {
-            Some(ref sm) => sm,
-            None => return false,
-        };
+        children: &mut Vec<SubDiagnostic>,
+        backtrace: bool,
+    ) {
+        for span in iter::once(span).chain(children.iter_mut().map(|child| &mut child.span)) {
+            self.render_multispan_macro_backtrace(span, backtrace);
+        }
+    }
 
-        let mut before_after: Vec<(Span, Span)> = vec![];
+    fn render_multispan_macro_backtrace(&self, span: &mut MultiSpan, always_backtrace: bool) {
         let mut new_labels: Vec<(Span, String)> = vec![];
 
-        // First, find all the spans in <*macros> and point instead at their use site
-        for sp in span.primary_spans() {
+        for &sp in span.primary_spans() {
             if sp.is_dummy() {
                 continue;
             }
-            let call_sp = sm.call_span_if_macro(*sp);
-            if call_sp != *sp && !always_backtrace {
-                before_after.push((*sp, call_sp));
-            }
+
+            // FIXME(eddyb) use `retain` on `macro_backtrace` to remove all the
+            // entries we don't want to print, to make sure the indices being
+            // printed are contiguous (or omitted if there's only one entry).
             let macro_backtrace: Vec<_> = sp.macro_backtrace().collect();
-            let backtrace_len = macro_backtrace.len();
             for (i, trace) in macro_backtrace.iter().rev().enumerate() {
-                // Only show macro locations that are local
-                // and display them like a span_note
                 if trace.def_site.is_dummy() {
                     continue;
                 }
+
                 if always_backtrace {
                     new_labels.push((
                         trace.def_site,
                         format!(
                             "in this expansion of `{}`{}",
                             trace.kind.descr(),
-                            if backtrace_len > 2 {
-                                // if backtrace_len == 1 it'll be pointed
-                                // at by "in this macro invocation"
+                            if macro_backtrace.len() > 2 {
+                                // if macro_backtrace.len() == 1 it'll be
+                                // pointed at by "in this macro invocation"
                                 format!(" (#{})", i + 1)
                             } else {
                                 String::new()
-                            }
+                            },
                         ),
                     ));
                 }
-                // Check to make sure we're not in any <*macros>
-                if !sm.span_to_filename(trace.def_site).is_macros()
-                    && matches!(trace.kind, ExpnKind::Macro(MacroKind::Bang, _))
+
+                // Don't add a label on the call site if the diagnostic itself
+                // already points to (a part of) that call site, as the label
+                // is meant for showing the relevant invocation when the actual
+                // diagnostic is pointing to some part of macro definition.
+                //
+                // This also handles the case where an external span got replaced
+                // with the call site span by `fix_multispans_in_extern_macros`.
+                //
+                // NB: `-Zmacro-backtrace` overrides this, for uniformity, as the
+                // "in this expansion of" label above is always added in that mode,
+                // and it needs an "in this macro invocation" label to match that.
+                let redundant_span = trace.call_site.contains(sp);
+
+                if !redundant_span && matches!(trace.kind, ExpnKind::Macro(MacroKind::Bang, _))
                     || always_backtrace
                 {
                     new_labels.push((
                         trace.call_site,
                         format!(
                             "in this macro invocation{}",
-                            if backtrace_len > 2 && always_backtrace {
+                            if macro_backtrace.len() > 2 && always_backtrace {
                                 // only specify order when the macro
                                 // backtrace is multiple levels deep
                                 format!(" (#{})", i + 1)
                             } else {
                                 String::new()
-                            }
+                            },
                         ),
                     ));
-                    if !always_backtrace {
-                        break;
-                    }
+                }
+                if !always_backtrace {
+                    break;
                 }
             }
         }
+
         for (label_span, label_text) in new_labels {
             span.push_span_label(label_span, label_text);
         }
-        for sp_label in span.span_labels() {
-            if sp_label.span.is_dummy() {
-                continue;
-            }
-            if sm.span_to_filename(sp_label.span.clone()).is_macros() && !always_backtrace {
-                if let Some(use_site) = sp_label.span.macro_backtrace().last() {
-                    before_after.push((sp_label.span, use_site.call_site));
-                }
-            }
+    }
+
+    // This does a small "fix" for multispans by looking to see if it can find any that
+    // point directly at <*macros>. Since these are often difficult to read, this
+    // will change the span to point at the use site.
+    fn fix_multispans_in_extern_macros(
+        &self,
+        source_map: &Option<Lrc<SourceMap>>,
+        span: &mut MultiSpan,
+        children: &mut Vec<SubDiagnostic>,
+    ) {
+        for span in iter::once(span).chain(children.iter_mut().map(|child| &mut child.span)) {
+            self.fix_multispan_in_extern_macros(source_map, span);
         }
+    }
+
+    // This "fixes" MultiSpans that contain Spans that are pointing to locations inside of
+    // <*macros>. Since these locations are often difficult to read, we move these Spans from
+    // <*macros> to their corresponding use site.
+    fn fix_multispan_in_extern_macros(
+        &self,
+        source_map: &Option<Lrc<SourceMap>>,
+        span: &mut MultiSpan,
+    ) {
+        let sm = match source_map {
+            Some(ref sm) => sm,
+            None => return,
+        };
+
+        // First, find all the spans in <*macros> and point instead at their use site
+        let replacements: Vec<(Span, Span)> = span
+            .primary_spans()
+            .iter()
+            .copied()
+            .chain(span.span_labels().iter().map(|sp_label| sp_label.span))
+            .filter_map(|sp| {
+                if !sp.is_dummy() && sm.span_to_filename(sp).is_macros() {
+                    let maybe_callsite = sp.source_callsite();
+                    if sp != maybe_callsite {
+                        return Some((sp, maybe_callsite));
+                    }
+                }
+                None
+            })
+            .collect();
+
         // After we have them, make sure we replace these 'bad' def sites with their use sites
-        let spans_updated = !before_after.is_empty();
-        for (before, after) in before_after {
-            span.replace(before, after);
+        for (from, to) in replacements {
+            span.replace(from, to);
         }
-
-        spans_updated
     }
 }
 
@@ -424,12 +473,12 @@ impl Emitter for EmitterWriter {
         let mut children = diag.children.clone();
         let (mut primary_span, suggestions) = self.primary_span_formatted(&diag);
 
-        self.fix_multispans_in_std_macros(
+        self.fix_multispans_in_extern_macros_and_render_macro_backtrace(
             &self.sm,
             &mut primary_span,
             &mut children,
             &diag.level,
-            self.external_macro_backtrace,
+            self.macro_backtrace,
         );
 
         self.emit_messages_default(
@@ -508,7 +557,7 @@ pub struct EmitterWriter {
     ui_testing: bool,
     terminal_width: Option<usize>,
 
-    external_macro_backtrace: bool,
+    macro_backtrace: bool,
 }
 
 #[derive(Debug)]
@@ -525,7 +574,7 @@ impl EmitterWriter {
         short_message: bool,
         teach: bool,
         terminal_width: Option<usize>,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> EmitterWriter {
         let dst = Destination::from_stderr(color_config);
         EmitterWriter {
@@ -535,7 +584,7 @@ impl EmitterWriter {
             teach,
             ui_testing: false,
             terminal_width,
-            external_macro_backtrace,
+            macro_backtrace,
         }
     }
 
@@ -546,7 +595,7 @@ impl EmitterWriter {
         teach: bool,
         colored: bool,
         terminal_width: Option<usize>,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> EmitterWriter {
         EmitterWriter {
             dst: Raw(dst, colored),
@@ -555,7 +604,7 @@ impl EmitterWriter {
             teach,
             ui_testing: false,
             terminal_width,
-            external_macro_backtrace,
+            macro_backtrace,
         }
     }
 
@@ -1367,7 +1416,7 @@ impl EmitterWriter {
                 } else if self.ui_testing {
                     140
                 } else {
-                    term_size::dimensions()
+                    termize::dimensions()
                         .map(|(w, _)| w.saturating_sub(code_offset))
                         .unwrap_or(std::usize::MAX)
                 };
@@ -1525,9 +1574,9 @@ impl EmitterWriter {
 
             let line_start = sm.lookup_char_pos(parts[0].span.lo()).line;
             draw_col_separator_no_space(&mut buffer, 1, max_line_num_len + 1);
-            let mut line_pos = 0;
             let mut lines = complete.lines();
-            for line in lines.by_ref().take(MAX_SUGGESTION_HIGHLIGHT_LINES) {
+            for (line_pos, line) in lines.by_ref().take(MAX_SUGGESTION_HIGHLIGHT_LINES).enumerate()
+            {
                 // Print the span column to avoid confusion
                 buffer.puts(
                     row_num,
@@ -1538,7 +1587,6 @@ impl EmitterWriter {
                 // print the suggestion
                 draw_col_separator(&mut buffer, row_num, max_line_num_len + 1);
                 buffer.append(row_num, line, Style::NoStyle);
-                line_pos += 1;
                 row_num += 1;
             }
 
diff --git a/src/librustc_errors/json.rs b/src/librustc_errors/json.rs
index 3ddf9b0989..0767b8dda9 100644
--- a/src/librustc_errors/json.rs
+++ b/src/librustc_errors/json.rs
@@ -36,7 +36,7 @@ pub struct JsonEmitter {
     pretty: bool,
     ui_testing: bool,
     json_rendered: HumanReadableErrorType,
-    external_macro_backtrace: bool,
+    macro_backtrace: bool,
 }
 
 impl JsonEmitter {
@@ -45,23 +45,23 @@ impl JsonEmitter {
         source_map: Lrc<SourceMap>,
         pretty: bool,
         json_rendered: HumanReadableErrorType,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> JsonEmitter {
         JsonEmitter {
-            dst: Box::new(io::stderr()),
+            dst: Box::new(io::BufWriter::new(io::stderr())),
             registry,
             sm: source_map,
             pretty,
             ui_testing: false,
             json_rendered,
-            external_macro_backtrace,
+            macro_backtrace,
         }
     }
 
     pub fn basic(
         pretty: bool,
         json_rendered: HumanReadableErrorType,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> JsonEmitter {
         let file_path_mapping = FilePathMapping::empty();
         JsonEmitter::stderr(
@@ -69,7 +69,7 @@ impl JsonEmitter {
             Lrc::new(SourceMap::new(file_path_mapping)),
             pretty,
             json_rendered,
-            external_macro_backtrace,
+            macro_backtrace,
         )
     }
 
@@ -79,7 +79,7 @@ impl JsonEmitter {
         source_map: Lrc<SourceMap>,
         pretty: bool,
         json_rendered: HumanReadableErrorType,
-        external_macro_backtrace: bool,
+        macro_backtrace: bool,
     ) -> JsonEmitter {
         JsonEmitter {
             dst,
@@ -88,7 +88,7 @@ impl JsonEmitter {
             pretty,
             ui_testing: false,
             json_rendered,
-            external_macro_backtrace,
+            macro_backtrace,
         }
     }
 
@@ -104,7 +104,8 @@ impl Emitter for JsonEmitter {
             writeln!(&mut self.dst, "{}", as_pretty_json(&data))
         } else {
             writeln!(&mut self.dst, "{}", as_json(&data))
-        };
+        }
+        .and_then(|_| self.dst.flush());
         if let Err(e) = result {
             panic!("failed to print diagnostics: {:?}", e);
         }
@@ -116,7 +117,8 @@ impl Emitter for JsonEmitter {
             writeln!(&mut self.dst, "{}", as_pretty_json(&data))
         } else {
             writeln!(&mut self.dst, "{}", as_json(&data))
-        };
+        }
+        .and_then(|_| self.dst.flush());
         if let Err(e) = result {
             panic!("failed to print notification: {:?}", e);
         }
@@ -245,13 +247,7 @@ impl Diagnostic {
         let buf = BufWriter::default();
         let output = buf.clone();
         je.json_rendered
-            .new_emitter(
-                Box::new(buf),
-                Some(je.sm.clone()),
-                false,
-                None,
-                je.external_macro_backtrace,
-            )
+            .new_emitter(Box::new(buf), Some(je.sm.clone()), false, None, je.macro_backtrace)
             .ui_testing(je.ui_testing)
             .emit_diagnostic(diag);
         let output = Arc::try_unwrap(output.0).unwrap().into_inner().unwrap();
@@ -379,13 +375,13 @@ impl DiagnosticSpan {
 
 impl DiagnosticSpanLine {
     fn line_from_source_file(
-        fm: &rustc_span::SourceFile,
+        sf: &rustc_span::SourceFile,
         index: usize,
         h_start: usize,
         h_end: usize,
     ) -> DiagnosticSpanLine {
         DiagnosticSpanLine {
-            text: fm.get_line(index).map_or(String::new(), |l| l.into_owned()),
+            text: sf.get_line(index).map_or(String::new(), |l| l.into_owned()),
             highlight_start: h_start,
             highlight_end: h_end,
         }
@@ -398,13 +394,13 @@ impl DiagnosticSpanLine {
         je.sm
             .span_to_lines(span)
             .map(|lines| {
-                let fm = &*lines.file;
+                let sf = &*lines.file;
                 lines
                     .lines
                     .iter()
                     .map(|line| {
                         DiagnosticSpanLine::line_from_source_file(
-                            fm,
+                            sf,
                             line.line_index,
                             line.start_col.0 + 1,
                             line.end_col.0 + 1,
@@ -423,10 +419,10 @@ impl DiagnosticCode {
                 DiagnosticId::Error(s) => s,
                 DiagnosticId::Lint(s) => s,
             };
-            let explanation =
-                je.registry.as_ref().and_then(|registry| registry.find_description(&s));
+            let je_result =
+                je.registry.as_ref().map(|registry| registry.try_find_description(&s)).unwrap();
 
-            DiagnosticCode { code: s, explanation }
+            DiagnosticCode { code: s, explanation: je_result.unwrap_or(None) }
         })
     }
 }
diff --git a/src/librustc_errors/lib.rs b/src/librustc_errors/lib.rs
index 19f72e3a3e..f0e388a597 100644
--- a/src/librustc_errors/lib.rs
+++ b/src/librustc_errors/lib.rs
@@ -4,9 +4,7 @@
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(crate_visibility_modifier)]
-#![cfg_attr(unix, feature(libc))]
 #![feature(nll)]
-#![feature(optin_builtin_traits)]
 
 pub use emitter::ColorConfig;
 
@@ -146,7 +144,7 @@ pub struct SubstitutionPart {
 impl CodeSuggestion {
     /// Returns the assembled code suggestions, whether they should be shown with an underline
     /// and whether the substitution only differs in capitalization.
-    pub fn splice_lines(&self, cm: &SourceMap) -> Vec<(String, Vec<SubstitutionPart>, bool)> {
+    pub fn splice_lines(&self, sm: &SourceMap) -> Vec<(String, Vec<SubstitutionPart>, bool)> {
         use rustc_span::{CharPos, Pos};
 
         fn push_trailing(
@@ -165,7 +163,7 @@ impl CodeSuggestion {
                         None => buf.push_str(&line[lo..]),
                     }
                 }
-                if let None = hi_opt {
+                if hi_opt.is_none() {
                     buf.push('\n');
                 }
             }
@@ -178,7 +176,7 @@ impl CodeSuggestion {
             .filter(|subst| {
                 // Suggestions coming from macros can have malformed spans. This is a heavy
                 // handed approach to avoid ICEs by ignoring the suggestion outright.
-                let invalid = subst.parts.iter().any(|item| cm.is_valid_span(item.span).is_err());
+                let invalid = subst.parts.iter().any(|item| sm.is_valid_span(item.span).is_err());
                 if invalid {
                     debug!("splice_lines: suggestion contains an invalid span: {:?}", subst);
                 }
@@ -195,7 +193,7 @@ impl CodeSuggestion {
                 let hi = substitution.parts.iter().map(|part| part.span.hi()).max()?;
                 let bounding_span = Span::with_root_ctxt(lo, hi);
                 // The different spans might belong to different contexts, if so ignore suggestion.
-                let lines = cm.span_to_lines(bounding_span).ok()?;
+                let lines = sm.span_to_lines(bounding_span).ok()?;
                 assert!(!lines.lines.is_empty());
 
                 // To build up the result, we do this for each span:
@@ -207,36 +205,36 @@ impl CodeSuggestion {
                 // - splice in the span substitution
                 //
                 // Finally push the trailing line segment of the last span
-                let fm = &lines.file;
-                let mut prev_hi = cm.lookup_char_pos(bounding_span.lo());
+                let sf = &lines.file;
+                let mut prev_hi = sm.lookup_char_pos(bounding_span.lo());
                 prev_hi.col = CharPos::from_usize(0);
 
-                let mut prev_line = fm.get_line(lines.lines[0].line_index);
+                let mut prev_line = sf.get_line(lines.lines[0].line_index);
                 let mut buf = String::new();
 
                 for part in &substitution.parts {
-                    let cur_lo = cm.lookup_char_pos(part.span.lo());
+                    let cur_lo = sm.lookup_char_pos(part.span.lo());
                     if prev_hi.line == cur_lo.line {
                         push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, Some(&cur_lo));
                     } else {
                         push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);
                         // push lines between the previous and current span (if any)
                         for idx in prev_hi.line..(cur_lo.line - 1) {
-                            if let Some(line) = fm.get_line(idx) {
+                            if let Some(line) = sf.get_line(idx) {
                                 buf.push_str(line.as_ref());
                                 buf.push('\n');
                             }
                         }
-                        if let Some(cur_line) = fm.get_line(cur_lo.line - 1) {
+                        if let Some(cur_line) = sf.get_line(cur_lo.line - 1) {
                             let end = std::cmp::min(cur_line.len(), cur_lo.col.to_usize());
                             buf.push_str(&cur_line[..end]);
                         }
                     }
                     buf.push_str(&part.snippet);
-                    prev_hi = cm.lookup_char_pos(part.span.hi());
-                    prev_line = fm.get_line(prev_hi.line - 1);
+                    prev_hi = sm.lookup_char_pos(part.span.hi());
+                    prev_line = sf.get_line(prev_hi.line - 1);
                 }
-                let only_capitalization = is_case_difference(cm, &buf, bounding_span);
+                let only_capitalization = is_case_difference(sm, &buf, bounding_span);
                 // if the replacement already ends with a newline, don't print the next line
                 if !buf.ends_with('\n') {
                     push_trailing(&mut buf, prev_line.as_ref(), &prev_hi, None);
@@ -336,9 +334,9 @@ pub struct HandlerFlags {
     /// If true, immediately print bugs registered with `delay_span_bug`.
     /// (rustc: see `-Z report-delayed-bugs`)
     pub report_delayed_bugs: bool,
-    /// show macro backtraces even for non-local macros.
-    /// (rustc: see `-Z external-macro-backtrace`)
-    pub external_macro_backtrace: bool,
+    /// Show macro backtraces.
+    /// (rustc: see `-Z macro-backtrace`)
+    pub macro_backtrace: bool,
     /// If true, identical diagnostics are reported only once.
     pub deduplicate_diagnostics: bool,
 }
@@ -365,27 +363,27 @@ impl Handler {
         color_config: ColorConfig,
         can_emit_warnings: bool,
         treat_err_as_bug: Option<usize>,
-        cm: Option<Lrc<SourceMap>>,
+        sm: Option<Lrc<SourceMap>>,
     ) -> Self {
         Self::with_tty_emitter_and_flags(
             color_config,
-            cm,
+            sm,
             HandlerFlags { can_emit_warnings, treat_err_as_bug, ..Default::default() },
         )
     }
 
     pub fn with_tty_emitter_and_flags(
         color_config: ColorConfig,
-        cm: Option<Lrc<SourceMap>>,
+        sm: Option<Lrc<SourceMap>>,
         flags: HandlerFlags,
     ) -> Self {
         let emitter = Box::new(EmitterWriter::stderr(
             color_config,
-            cm,
+            sm,
             false,
             false,
             None,
-            flags.external_macro_backtrace,
+            flags.macro_backtrace,
         ));
         Self::with_emitter_and_flags(emitter, flags)
     }
@@ -778,8 +776,12 @@ impl HandlerInner {
                 .emitted_diagnostic_codes
                 .iter()
                 .filter_map(|x| match &x {
-                    DiagnosticId::Error(s) if registry.find_description(s).is_some() => {
-                        Some(s.clone())
+                    DiagnosticId::Error(s) => {
+                        if let Ok(Some(_explanation)) = registry.try_find_description(s) {
+                            Some(s.clone())
+                        } else {
+                            None
+                        }
                     }
                     _ => None,
                 })
diff --git a/src/librustc_errors/registry.rs b/src/librustc_errors/registry.rs
index 771542cb06..32700c6500 100644
--- a/src/librustc_errors/registry.rs
+++ b/src/librustc_errors/registry.rs
@@ -1,16 +1,32 @@
 use rustc_data_structures::fx::FxHashMap;
 
+#[derive(Debug)]
+pub struct InvalidErrorCode;
+
 #[derive(Clone)]
 pub struct Registry {
-    descriptions: FxHashMap<&'static str, &'static str>,
+    long_descriptions: FxHashMap<&'static str, Option<&'static str>>,
 }
 
 impl Registry {
-    pub fn new(descriptions: &[(&'static str, &'static str)]) -> Registry {
-        Registry { descriptions: descriptions.iter().cloned().collect() }
+    pub fn new(long_descriptions: &[(&'static str, Option<&'static str>)]) -> Registry {
+        Registry { long_descriptions: long_descriptions.iter().cloned().collect() }
     }
 
+    /// This will panic if an invalid error code is passed in
     pub fn find_description(&self, code: &str) -> Option<&'static str> {
-        self.descriptions.get(code).cloned()
+        self.try_find_description(code).unwrap()
+    }
+    /// Returns `InvalidErrorCode` if the code requested does not exist in the
+    /// registry. Otherwise, returns an `Option` where `None` means the error
+    /// code is valid but has no extended information.
+    pub fn try_find_description(
+        &self,
+        code: &str,
+    ) -> Result<Option<&'static str>, InvalidErrorCode> {
+        if !self.long_descriptions.contains_key(code) {
+            return Err(InvalidErrorCode);
+        }
+        Ok(*self.long_descriptions.get(code).unwrap())
     }
 }
diff --git a/src/librustc_errors/snippet.rs b/src/librustc_errors/snippet.rs
index a39e19f0bf..0660590a72 100644
--- a/src/librustc_errors/snippet.rs
+++ b/src/librustc_errors/snippet.rs
@@ -152,7 +152,7 @@ impl Annotation {
             //       |
             //
             // Note that this would be the complete output users would see.
-            label.len() > 0
+            !label.is_empty()
         } else {
             false
         }
diff --git a/src/librustc_expand/Cargo.toml b/src/librustc_expand/Cargo.toml
index d04dd079be..3cb7903077 100644
--- a/src/librustc_expand/Cargo.toml
+++ b/src/librustc_expand/Cargo.toml
@@ -14,7 +14,9 @@ doctest = false
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 log = "0.4"
 rustc_span = { path = "../librustc_span" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
 rustc_ast_passes = { path = "../librustc_ast_passes" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_feature = { path = "../librustc_feature" }
@@ -22,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" }
+rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_expand/base.rs b/src/librustc_expand/base.rs
index 52ba14dbc3..f15e626c27 100644
--- a/src/librustc_expand/base.rs
+++ b/src/librustc_expand/base.rs
@@ -1,23 +1,23 @@
 use crate::expand::{self, AstFragment, Invocation};
 
+use rustc_ast::ast::{self, Attribute, Name, NodeId, PatKind};
+use rustc_ast::mut_visit::{self, MutVisitor};
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::tokenstream::{self, TokenStream, TokenTree};
+use rustc_ast::visit::{AssocCtxt, Visitor};
+use rustc_attr::{self as attr, Deprecation, HasAttrs, Stability};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::{self, Lrc};
 use rustc_errors::{DiagnosticBuilder, DiagnosticId};
 use rustc_parse::{self, parser, DirectoryOwnership, MACRO_ARGUMENTS};
+use rustc_session::parse::ParseSess;
 use rustc_span::edition::Edition;
 use rustc_span::hygiene::{AstPass, ExpnData, ExpnId, ExpnKind};
 use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::{FileName, MultiSpan, Span, DUMMY_SP};
 use smallvec::{smallvec, SmallVec};
-use syntax::ast::{self, Attribute, Name, NodeId, PatKind};
-use syntax::attr::{self, Deprecation, HasAttrs, Stability};
-use syntax::mut_visit::{self, MutVisitor};
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
-use syntax::token;
-use syntax::tokenstream::{self, TokenStream};
-use syntax::visit::Visitor;
 
 use std::default::Default;
 use std::iter;
@@ -62,7 +62,7 @@ impl HasAttrs for Annotatable {
         }
     }
 
-    fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
+    fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec<Attribute>)) {
         match self {
             Annotatable::Item(item) => item.visit_attrs(f),
             Annotatable::TraitItem(trait_item) => trait_item.visit_attrs(f),
@@ -103,8 +103,8 @@ impl Annotatable {
     pub fn visit_with<'a, V: Visitor<'a>>(&'a self, visitor: &mut V) {
         match self {
             Annotatable::Item(item) => visitor.visit_item(item),
-            Annotatable::TraitItem(trait_item) => visitor.visit_trait_item(trait_item),
-            Annotatable::ImplItem(impl_item) => visitor.visit_impl_item(impl_item),
+            Annotatable::TraitItem(item) => visitor.visit_assoc_item(item, AssocCtxt::Trait),
+            Annotatable::ImplItem(item) => visitor.visit_assoc_item(item, AssocCtxt::Impl),
             Annotatable::ForeignItem(foreign_item) => visitor.visit_foreign_item(foreign_item),
             Annotatable::Stmt(stmt) => visitor.visit_stmt(stmt),
             Annotatable::Expr(expr) => visitor.visit_expr(expr),
@@ -118,6 +118,31 @@ impl Annotatable {
         }
     }
 
+    crate fn into_tokens(self) -> TokenStream {
+        // `Annotatable` can be converted into tokens directly, but we
+        // are packing it into a nonterminal as a piece of AST to make
+        // the produced token stream look nicer in pretty-printed form.
+        let nt = match self {
+            Annotatable::Item(item) => token::NtItem(item),
+            Annotatable::TraitItem(item) | Annotatable::ImplItem(item) => {
+                token::NtItem(P(item.and_then(ast::AssocItem::into_item)))
+            }
+            Annotatable::ForeignItem(item) => {
+                token::NtItem(P(item.and_then(ast::ForeignItem::into_item)))
+            }
+            Annotatable::Stmt(stmt) => token::NtStmt(stmt.into_inner()),
+            Annotatable::Expr(expr) => token::NtExpr(expr),
+            Annotatable::Arm(..)
+            | Annotatable::Field(..)
+            | Annotatable::FieldPat(..)
+            | Annotatable::GenericParam(..)
+            | Annotatable::Param(..)
+            | Annotatable::StructField(..)
+            | Annotatable::Variant(..) => panic!("unexpected annotatable"),
+        };
+        TokenTree::token(token::Interpolated(Lrc::new(nt)), DUMMY_SP).into()
+    }
+
     pub fn expect_item(self) -> P<ast::Item> {
         match self {
             Annotatable::Item(i) => i,
@@ -136,23 +161,23 @@ impl Annotatable {
         }
     }
 
-    pub fn expect_trait_item(self) -> ast::AssocItem {
+    pub fn expect_trait_item(self) -> P<ast::AssocItem> {
         match self {
-            Annotatable::TraitItem(i) => i.into_inner(),
+            Annotatable::TraitItem(i) => i,
             _ => panic!("expected Item"),
         }
     }
 
-    pub fn expect_impl_item(self) -> ast::AssocItem {
+    pub fn expect_impl_item(self) -> P<ast::AssocItem> {
         match self {
-            Annotatable::ImplItem(i) => i.into_inner(),
+            Annotatable::ImplItem(i) => i,
             _ => panic!("expected Item"),
         }
     }
 
-    pub fn expect_foreign_item(self) -> ast::ForeignItem {
+    pub fn expect_foreign_item(self) -> P<ast::ForeignItem> {
         match self {
-            Annotatable::ForeignItem(i) => i.into_inner(),
+            Annotatable::ForeignItem(i) => i,
             _ => panic!("expected foreign item"),
         }
     }
@@ -382,17 +407,17 @@ pub trait MacResult {
     }
 
     /// Creates zero or more impl items.
-    fn make_impl_items(self: Box<Self>) -> Option<SmallVec<[ast::AssocItem; 1]>> {
+    fn make_impl_items(self: Box<Self>) -> Option<SmallVec<[P<ast::AssocItem>; 1]>> {
         None
     }
 
     /// Creates zero or more trait items.
-    fn make_trait_items(self: Box<Self>) -> Option<SmallVec<[ast::AssocItem; 1]>> {
+    fn make_trait_items(self: Box<Self>) -> Option<SmallVec<[P<ast::AssocItem>; 1]>> {
         None
     }
 
     /// Creates zero or more items in an `extern {}` block
-    fn make_foreign_items(self: Box<Self>) -> Option<SmallVec<[ast::ForeignItem; 1]>> {
+    fn make_foreign_items(self: Box<Self>) -> Option<SmallVec<[P<ast::ForeignItem>; 1]>> {
         None
     }
 
@@ -470,9 +495,9 @@ make_MacEager! {
     expr: P<ast::Expr>,
     pat: P<ast::Pat>,
     items: SmallVec<[P<ast::Item>; 1]>,
-    impl_items: SmallVec<[ast::AssocItem; 1]>,
-    trait_items: SmallVec<[ast::AssocItem; 1]>,
-    foreign_items: SmallVec<[ast::ForeignItem; 1]>,
+    impl_items: SmallVec<[P<ast::AssocItem>; 1]>,
+    trait_items: SmallVec<[P<ast::AssocItem>; 1]>,
+    foreign_items: SmallVec<[P<ast::ForeignItem>; 1]>,
     stmts: SmallVec<[ast::Stmt; 1]>,
     ty: P<ast::Ty>,
 }
@@ -486,15 +511,15 @@ impl MacResult for MacEager {
         self.items
     }
 
-    fn make_impl_items(self: Box<Self>) -> Option<SmallVec<[ast::AssocItem; 1]>> {
+    fn make_impl_items(self: Box<Self>) -> Option<SmallVec<[P<ast::AssocItem>; 1]>> {
         self.impl_items
     }
 
-    fn make_trait_items(self: Box<Self>) -> Option<SmallVec<[ast::AssocItem; 1]>> {
+    fn make_trait_items(self: Box<Self>) -> Option<SmallVec<[P<ast::AssocItem>; 1]>> {
         self.trait_items
     }
 
-    fn make_foreign_items(self: Box<Self>) -> Option<SmallVec<[ast::ForeignItem; 1]>> {
+    fn make_foreign_items(self: Box<Self>) -> Option<SmallVec<[P<ast::ForeignItem>; 1]>> {
         self.foreign_items
     }
 
@@ -586,15 +611,15 @@ impl MacResult for DummyResult {
         Some(SmallVec::new())
     }
 
-    fn make_impl_items(self: Box<DummyResult>) -> Option<SmallVec<[ast::AssocItem; 1]>> {
+    fn make_impl_items(self: Box<DummyResult>) -> Option<SmallVec<[P<ast::AssocItem>; 1]>> {
         Some(SmallVec::new())
     }
 
-    fn make_trait_items(self: Box<DummyResult>) -> Option<SmallVec<[ast::AssocItem; 1]>> {
+    fn make_trait_items(self: Box<DummyResult>) -> Option<SmallVec<[P<ast::AssocItem>; 1]>> {
         Some(SmallVec::new())
     }
 
-    fn make_foreign_items(self: Box<Self>) -> Option<SmallVec<[ast::ForeignItem; 1]>> {
+    fn make_foreign_items(self: Box<Self>) -> Option<SmallVec<[P<ast::ForeignItem>; 1]>> {
         Some(SmallVec::new())
     }
 
@@ -1113,7 +1138,11 @@ pub fn expr_to_string(
     err_msg: &str,
 ) -> Option<(Symbol, ast::StrStyle)> {
     expr_to_spanned_string(cx, expr, err_msg)
-        .map_err(|err| err.map(|mut err| err.emit()))
+        .map_err(|err| {
+            err.map(|mut err| {
+                err.emit();
+            })
+        })
         .ok()
         .map(|(symbol, style, _)| (symbol, style))
 }
diff --git a/src/librustc_expand/build.rs b/src/librustc_expand/build.rs
index 11f94ab2e6..48ceaf5fcc 100644
--- a/src/librustc_expand/build.rs
+++ b/src/librustc_expand/build.rs
@@ -1,10 +1,10 @@
 use crate::base::ExtCtxt;
 
+use rustc_ast::ast::{self, AttrVec, BlockCheckMode, Expr, Ident, PatKind, UnOp};
+use rustc_ast::attr;
+use rustc_ast::ptr::P;
 use rustc_span::source_map::{respan, Spanned};
 use rustc_span::symbol::{kw, sym, Symbol};
-use syntax::ast::{self, AttrVec, BlockCheckMode, Expr, Ident, PatKind, UnOp};
-use syntax::attr;
-use syntax::ptr::P;
 
 use rustc_span::Span;
 
@@ -507,7 +507,7 @@ impl<'a> ExtCtxt<'a> {
             span,
             ast::ExprKind::Closure(
                 ast::CaptureBy::Ref,
-                ast::IsAsync::NotAsync,
+                ast::Async::No,
                 ast::Movability::Movable,
                 fn_decl,
                 body,
@@ -519,7 +519,7 @@ impl<'a> ExtCtxt<'a> {
     pub fn lambda(&self, span: Span, ids: Vec<ast::Ident>, body: P<ast::Expr>) -> P<ast::Expr> {
         let fn_decl = self.fn_decl(
             ids.iter().map(|id| self.param(span, *id, self.ty(span, ast::TyKind::Infer))).collect(),
-            ast::FunctionRetTy::Default(span),
+            ast::FnRetTy::Default(span),
         );
 
         // FIXME -- We are using `span` as the span of the `|...|`
@@ -530,7 +530,7 @@ impl<'a> ExtCtxt<'a> {
             span,
             ast::ExprKind::Closure(
                 ast::CaptureBy::Ref,
-                ast::IsAsync::NotAsync,
+                ast::Async::No,
                 ast::Movability::Movable,
                 fn_decl,
                 body,
@@ -569,7 +569,7 @@ impl<'a> ExtCtxt<'a> {
     }
 
     // FIXME: unused `self`
-    pub fn fn_decl(&self, inputs: Vec<ast::Param>, output: ast::FunctionRetTy) -> P<ast::FnDecl> {
+    pub fn fn_decl(&self, inputs: Vec<ast::Param>, output: ast::FnRetTy) -> P<ast::FnDecl> {
         P(ast::FnDecl { inputs, output })
     }
 
@@ -634,7 +634,7 @@ impl<'a> ExtCtxt<'a> {
         mutbl: ast::Mutability,
         expr: P<ast::Expr>,
     ) -> P<ast::Item> {
-        self.item(span, name, Vec::new(), ast::ItemKind::Static(ty, mutbl, expr))
+        self.item(span, name, Vec::new(), ast::ItemKind::Static(ty, mutbl, Some(expr)))
     }
 
     pub fn item_const(
@@ -644,7 +644,8 @@ impl<'a> ExtCtxt<'a> {
         ty: P<ast::Ty>,
         expr: P<ast::Expr>,
     ) -> P<ast::Item> {
-        self.item(span, name, Vec::new(), ast::ItemKind::Const(ty, expr))
+        let def = ast::Defaultness::Final;
+        self.item(span, name, Vec::new(), ast::ItemKind::Const(def, ty, Some(expr)))
     }
 
     pub fn attribute(&self, mi: ast::MetaItem) -> ast::Attribute {
diff --git a/src/librustc_expand/expand.rs b/src/librustc_expand/expand.rs
index a65ba8903b..effa89e8bf 100644
--- a/src/librustc_expand/expand.rs
+++ b/src/librustc_expand/expand.rs
@@ -5,27 +5,28 @@ use crate::mbe::macro_rules::annotate_err_with_kind;
 use crate::placeholders::{placeholder, PlaceholderExpander};
 use crate::proc_macro::collect_derives;
 
-use rustc_data_structures::sync::Lrc;
+use rustc_ast::ast::{self, AttrItem, Block, Ident, LitKind, NodeId, PatKind, Path};
+use rustc_ast::ast::{ItemKind, MacArgs, MacStmtStyle, StmtKind};
+use rustc_ast::mut_visit::*;
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::tokenstream::TokenStream;
+use rustc_ast::util::map_in_place::MapInPlace;
+use rustc_ast::visit::{self, AssocCtxt, Visitor};
+use rustc_ast_pretty::pprust;
+use rustc_attr::{self as attr, is_builtin_attr, HasAttrs};
 use rustc_errors::{Applicability, FatalError, PResult};
 use rustc_feature::Features;
 use rustc_parse::configure;
 use rustc_parse::parser::Parser;
 use rustc_parse::validate_attr;
 use rustc_parse::DirectoryOwnership;
+use rustc_session::lint::builtin::UNUSED_DOC_COMMENTS;
+use rustc_session::lint::BuiltinLintDiagnostics;
+use rustc_session::parse::{feature_err, ParseSess};
 use rustc_span::source_map::respan;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{FileName, Span, DUMMY_SP};
-use syntax::ast::{self, AttrItem, Block, Ident, LitKind, NodeId, PatKind, Path};
-use syntax::ast::{ItemKind, MacArgs, MacStmtStyle, StmtKind};
-use syntax::attr::{self, is_builtin_attr, HasAttrs};
-use syntax::mut_visit::*;
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::sess::{feature_err, ParseSess};
-use syntax::token;
-use syntax::tokenstream::{TokenStream, TokenTree};
-use syntax::util::map_in_place::MapInPlace;
-use syntax::visit::{self, Visitor};
 
 use smallvec::{smallvec, SmallVec};
 use std::io::ErrorKind;
@@ -39,7 +40,7 @@ macro_rules! ast_fragments {
         $($Kind:ident($AstTy:ty) {
             $kind_name:expr;
             $(one fn $mut_visit_ast:ident; fn $visit_ast:ident;)?
-            $(many fn $flat_map_ast_elt:ident; fn $visit_ast_elt:ident;)?
+            $(many fn $flat_map_ast_elt:ident; fn $visit_ast_elt:ident($($args:tt)*);)?
             fn $make_ast:ident;
         })*
     ) => {
@@ -127,7 +128,7 @@ macro_rules! ast_fragments {
                     AstFragment::OptExpr(None) => {}
                     $($(AstFragment::$Kind(ref ast) => visitor.$visit_ast(ast),)?)*
                     $($(AstFragment::$Kind(ref ast) => for ast_elt in &ast[..] {
-                        visitor.$visit_ast_elt(ast_elt);
+                        visitor.$visit_ast_elt(ast_elt, $($args)*);
                     })?)*
                 }
             }
@@ -147,52 +148,58 @@ ast_fragments! {
     Pat(P<ast::Pat>) { "pattern"; one fn visit_pat; fn visit_pat; fn make_pat; }
     Ty(P<ast::Ty>) { "type"; one fn visit_ty; fn visit_ty; fn make_ty; }
     Stmts(SmallVec<[ast::Stmt; 1]>) {
-        "statement"; many fn flat_map_stmt; fn visit_stmt; fn make_stmts;
+        "statement"; many fn flat_map_stmt; fn visit_stmt(); fn make_stmts;
     }
     Items(SmallVec<[P<ast::Item>; 1]>) {
-        "item"; many fn flat_map_item; fn visit_item; fn make_items;
+        "item"; many fn flat_map_item; fn visit_item(); fn make_items;
     }
-    TraitItems(SmallVec<[ast::AssocItem; 1]>) {
-        "trait item"; many fn flat_map_trait_item; fn visit_trait_item; fn make_trait_items;
+    TraitItems(SmallVec<[P<ast::AssocItem>; 1]>) {
+        "trait item";
+        many fn flat_map_trait_item;
+        fn visit_assoc_item(AssocCtxt::Trait);
+        fn make_trait_items;
     }
-    ImplItems(SmallVec<[ast::AssocItem; 1]>) {
-        "impl item"; many fn flat_map_impl_item; fn visit_impl_item; fn make_impl_items;
+    ImplItems(SmallVec<[P<ast::AssocItem>; 1]>) {
+        "impl item";
+        many fn flat_map_impl_item;
+        fn visit_assoc_item(AssocCtxt::Impl);
+        fn make_impl_items;
     }
-    ForeignItems(SmallVec<[ast::ForeignItem; 1]>) {
+    ForeignItems(SmallVec<[P<ast::ForeignItem>; 1]>) {
         "foreign item";
         many fn flat_map_foreign_item;
-        fn visit_foreign_item;
+        fn visit_foreign_item();
         fn make_foreign_items;
     }
     Arms(SmallVec<[ast::Arm; 1]>) {
-        "match arm"; many fn flat_map_arm; fn visit_arm; fn make_arms;
+        "match arm"; many fn flat_map_arm; fn visit_arm(); fn make_arms;
     }
     Fields(SmallVec<[ast::Field; 1]>) {
-        "field expression"; many fn flat_map_field; fn visit_field; fn make_fields;
+        "field expression"; many fn flat_map_field; fn visit_field(); fn make_fields;
     }
     FieldPats(SmallVec<[ast::FieldPat; 1]>) {
         "field pattern";
         many fn flat_map_field_pattern;
-        fn visit_field_pattern;
+        fn visit_field_pattern();
         fn make_field_patterns;
     }
     GenericParams(SmallVec<[ast::GenericParam; 1]>) {
         "generic parameter";
         many fn flat_map_generic_param;
-        fn visit_generic_param;
+        fn visit_generic_param();
         fn make_generic_params;
     }
     Params(SmallVec<[ast::Param; 1]>) {
-        "function parameter"; many fn flat_map_param; fn visit_param; fn make_params;
+        "function parameter"; many fn flat_map_param; fn visit_param(); fn make_params;
     }
     StructFields(SmallVec<[ast::StructField; 1]>) {
         "field";
         many fn flat_map_struct_field;
-        fn visit_struct_field;
+        fn visit_struct_field();
         fn make_struct_fields;
     }
     Variants(SmallVec<[ast::Variant; 1]>) {
-        "variant"; many fn flat_map_variant; fn visit_variant; fn make_variants;
+        "variant"; many fn flat_map_variant; fn visit_variant(); fn make_variants;
     }
 }
 
@@ -363,7 +370,17 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                 krate.attrs = vec![];
                 krate.module = ast::Mod { inner: orig_mod_span, items: vec![], inline: true };
             }
-            _ => unreachable!(),
+            Some(ast::Item { span, kind, .. }) => {
+                krate.attrs = vec![];
+                krate.module = ast::Mod { inner: orig_mod_span, items: vec![], inline: true };
+                self.cx.span_err(
+                    span,
+                    &format!(
+                        "expected crate top-level item to be a module after macro expansion, found {} {}",
+                        kind.article(), kind.descr()
+                    ),
+                );
+            }
         };
         self.cx.trace_macros_diag();
         krate
@@ -435,27 +452,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                         _ => unreachable!(),
                     };
                     if !item.derive_allowed() {
-                        let attr = attr::find_by_name(item.attrs(), sym::derive);
-                        let span = attr.map_or(item.span(), |attr| attr.span);
-                        let mut err = self.cx.struct_span_err(
-                            span,
-                            "`derive` may only be applied to structs, enums and unions",
-                        );
-                        if let Some(ast::Attribute { style: ast::AttrStyle::Inner, .. }) = attr {
-                            let trait_list = derives
-                                .iter()
-                                .map(|t| pprust::path_to_string(t))
-                                .collect::<Vec<_>>();
-                            let suggestion = format!("#[derive({})]", trait_list.join(", "));
-                            err.span_suggestion(
-                                span,
-                                "try an outer attribute",
-                                suggestion,
-                                // We don't 𝑘𝑛𝑜𝑤 that the following item is an ADT
-                                Applicability::MaybeIncorrect,
-                            );
-                        }
-                        err.emit();
+                        self.error_derive_forbidden_on_non_adt(&derives, &item);
                     }
 
                     let mut item = self.fully_configure(item);
@@ -504,6 +501,26 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
         fragment_with_placeholders
     }
 
+    fn error_derive_forbidden_on_non_adt(&self, derives: &[Path], item: &Annotatable) {
+        let attr = attr::find_by_name(item.attrs(), sym::derive);
+        let span = attr.map_or(item.span(), |attr| attr.span);
+        let mut err = self
+            .cx
+            .struct_span_err(span, "`derive` may only be applied to structs, enums and unions");
+        if let Some(ast::Attribute { style: ast::AttrStyle::Inner, .. }) = attr {
+            let trait_list = derives.iter().map(|t| pprust::path_to_string(t)).collect::<Vec<_>>();
+            let suggestion = format!("#[derive({})]", trait_list.join(", "));
+            err.span_suggestion(
+                span,
+                "try an outer attribute",
+                suggestion,
+                // We don't 𝑘𝑛𝑜𝑤 that the following item is an ADT
+                Applicability::MaybeIncorrect,
+            );
+        }
+        err.emit();
+    }
+
     fn resolve_imports(&mut self) {
         if self.monotonic {
             self.cx.resolver.resolve_imports();
@@ -553,15 +570,15 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
         // we know that fold result vector will contain exactly one element
         match item {
             Annotatable::Item(item) => Annotatable::Item(cfg.flat_map_item(item).pop().unwrap()),
-            Annotatable::TraitItem(item) => Annotatable::TraitItem(
-                item.map(|item| cfg.flat_map_trait_item(item).pop().unwrap()),
-            ),
+            Annotatable::TraitItem(item) => {
+                Annotatable::TraitItem(cfg.flat_map_trait_item(item).pop().unwrap())
+            }
             Annotatable::ImplItem(item) => {
-                Annotatable::ImplItem(item.map(|item| cfg.flat_map_impl_item(item).pop().unwrap()))
+                Annotatable::ImplItem(cfg.flat_map_impl_item(item).pop().unwrap())
+            }
+            Annotatable::ForeignItem(item) => {
+                Annotatable::ForeignItem(cfg.flat_map_foreign_item(item).pop().unwrap())
             }
-            Annotatable::ForeignItem(item) => Annotatable::ForeignItem(
-                item.map(|item| cfg.flat_map_foreign_item(item).pop().unwrap()),
-            ),
             Annotatable::Stmt(stmt) => {
                 Annotatable::Stmt(stmt.map(|stmt| cfg.flat_map_stmt(stmt).pop().unwrap()))
             }
@@ -589,21 +606,38 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
         }
     }
 
-    fn expand_invoc(&mut self, invoc: Invocation, ext: &SyntaxExtensionKind) -> AstFragment {
-        if self.cx.current_expansion.depth > self.cx.ecfg.recursion_limit {
-            let expn_data = self.cx.current_expansion.id.expn_data();
-            let suggested_limit = self.cx.ecfg.recursion_limit * 2;
-            let mut err = self.cx.struct_span_err(
+    fn error_recursion_limit_reached(&mut self) {
+        let expn_data = self.cx.current_expansion.id.expn_data();
+        let suggested_limit = self.cx.ecfg.recursion_limit * 2;
+        self.cx
+            .struct_span_err(
                 expn_data.call_site,
                 &format!("recursion limit reached while expanding `{}`", expn_data.kind.descr()),
-            );
-            err.help(&format!(
-                "consider adding a `#![recursion_limit=\"{}\"]` attribute to your crate",
-                suggested_limit
-            ));
-            err.emit();
-            self.cx.trace_macros_diag();
-            FatalError.raise();
+            )
+            .help(&format!(
+                "consider adding a `#![recursion_limit=\"{}\"]` attribute to your crate (`{}`)",
+                suggested_limit, self.cx.ecfg.crate_name,
+            ))
+            .emit();
+        self.cx.trace_macros_diag();
+        FatalError.raise();
+    }
+
+    /// A macro's expansion does not fit in this fragment kind.
+    /// For example, a non-type macro in a type position.
+    fn error_wrong_fragment_kind(&mut self, kind: AstFragmentKind, mac: &ast::Mac, span: Span) {
+        let msg = format!(
+            "non-{kind} macro in {kind} position: {path}",
+            kind = kind.name(),
+            path = pprust::path_to_string(&mac.path),
+        );
+        self.cx.span_err(span, &msg);
+        self.cx.trace_macros_diag();
+    }
+
+    fn expand_invoc(&mut self, invoc: Invocation, ext: &SyntaxExtensionKind) -> AstFragment {
+        if self.cx.current_expansion.depth > self.cx.ecfg.recursion_limit {
+            self.error_recursion_limit_reached();
         }
 
         let (fragment_kind, span) = (invoc.fragment_kind, invoc.span());
@@ -621,13 +655,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                     let result = if let Some(result) = fragment_kind.make_from(tok_result) {
                         result
                     } else {
-                        let msg = format!(
-                            "non-{kind} macro in {kind} position: {path}",
-                            kind = fragment_kind.name(),
-                            path = pprust::path_to_string(&mac.path),
-                        );
-                        self.cx.span_err(span, &msg);
-                        self.cx.trace_macros_diag();
+                        self.error_wrong_fragment_kind(fragment_kind, &mac, span);
                         fragment_kind.dummy(span)
                     };
                     self.cx.current_expansion.prior_type_ascription = prev;
@@ -639,34 +667,14 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
                 SyntaxExtensionKind::Attr(expander) => {
                     self.gate_proc_macro_input(&item);
                     self.gate_proc_macro_attr_item(span, &item);
-                    let item_tok = TokenTree::token(
-                        token::Interpolated(Lrc::new(match item {
-                            Annotatable::Item(item) => token::NtItem(item),
-                            Annotatable::TraitItem(item) => token::NtTraitItem(item.into_inner()),
-                            Annotatable::ImplItem(item) => token::NtImplItem(item.into_inner()),
-                            Annotatable::ForeignItem(item) => {
-                                token::NtForeignItem(item.into_inner())
-                            }
-                            Annotatable::Stmt(stmt) => token::NtStmt(stmt.into_inner()),
-                            Annotatable::Expr(expr) => token::NtExpr(expr),
-                            Annotatable::Arm(..)
-                            | Annotatable::Field(..)
-                            | Annotatable::FieldPat(..)
-                            | Annotatable::GenericParam(..)
-                            | Annotatable::Param(..)
-                            | Annotatable::StructField(..)
-                            | Annotatable::Variant(..) => panic!("unexpected annotatable"),
-                        })),
-                        DUMMY_SP,
-                    )
-                    .into();
-                    let item = attr.unwrap_normal_item();
-                    if let MacArgs::Eq(..) = item.args {
+                    let tokens = item.into_tokens();
+                    let attr_item = attr.unwrap_normal_item();
+                    if let MacArgs::Eq(..) = attr_item.args {
                         self.cx.span_err(span, "key-value macro attributes are not supported");
                     }
                     let tok_result =
-                        expander.expand(self.cx, span, item.args.inner_tokens(), item_tok);
-                    self.parse_ast_fragment(tok_result, fragment_kind, &item.path, span)
+                        expander.expand(self.cx, span, attr_item.args.inner_tokens(), tokens);
+                    self.parse_ast_fragment(tok_result, fragment_kind, &attr_item.path, span)
                 }
                 SyntaxExtensionKind::LegacyAttr(expander) => {
                     match validate_attr::parse_meta(self.cx.parse_sess, &attr) {
@@ -806,7 +814,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
         span: Span,
     ) -> AstFragment {
         let mut parser = self.cx.new_parser_from_tts(toks);
-        match parse_ast_fragment(&mut parser, kind, false) {
+        match parse_ast_fragment(&mut parser, kind) {
             Ok(fragment) => {
                 ensure_complete_parse(&mut parser, path, kind.name(), span);
                 fragment
@@ -825,7 +833,6 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
 pub fn parse_ast_fragment<'a>(
     this: &mut Parser<'a>,
     kind: AstFragmentKind,
-    macro_legacy_warnings: bool,
 ) -> PResult<'a, AstFragment> {
     Ok(match kind {
         AstFragmentKind::Items => {
@@ -837,32 +844,30 @@ pub fn parse_ast_fragment<'a>(
         }
         AstFragmentKind::TraitItems => {
             let mut items = SmallVec::new();
-            while this.token != token::Eof {
-                items.push(this.parse_trait_item(&mut false)?);
+            while let Some(item) = this.parse_trait_item()? {
+                items.extend(item);
             }
             AstFragment::TraitItems(items)
         }
         AstFragmentKind::ImplItems => {
             let mut items = SmallVec::new();
-            while this.token != token::Eof {
-                items.push(this.parse_impl_item(&mut false)?);
+            while let Some(item) = this.parse_impl_item()? {
+                items.extend(item);
             }
             AstFragment::ImplItems(items)
         }
         AstFragmentKind::ForeignItems => {
             let mut items = SmallVec::new();
-            while this.token != token::Eof {
-                items.push(this.parse_foreign_item(DUMMY_SP)?);
+            while let Some(item) = this.parse_foreign_item()? {
+                items.extend(item);
             }
             AstFragment::ForeignItems(items)
         }
         AstFragmentKind::Stmts => {
             let mut stmts = SmallVec::new();
-            while this.token != token::Eof &&
-                    // won't make progress on a `}`
-                    this.token != token::CloseDelim(token::Brace)
-            {
-                if let Some(stmt) = this.parse_full_stmt(macro_legacy_warnings)? {
+            // Won't make progress on a `}`.
+            while this.token != token::Eof && this.token != token::CloseDelim(token::Brace) {
+                if let Some(stmt) = this.parse_full_stmt()? {
                     stmts.push(stmt);
                 }
             }
@@ -1015,13 +1020,10 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
     }
 
     /// If `item` is an attr invocation, remove and return the macro attribute and derive traits.
-    fn classify_item<T>(
+    fn classify_item(
         &mut self,
-        item: &mut T,
-    ) -> (Option<ast::Attribute>, Vec<Path>, /* after_derive */ bool)
-    where
-        T: HasAttrs,
-    {
+        item: &mut impl HasAttrs,
+    ) -> (Option<ast::Attribute>, Vec<Path>, /* after_derive */ bool) {
         let (mut attr, mut traits, mut after_derive) = (None, Vec::new(), false);
 
         item.visit_attrs(|mut attrs| {
@@ -1035,9 +1037,9 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
     /// Alternative to `classify_item()` that ignores `#[derive]` so invocations fallthrough
     /// to the unused-attributes lint (making it an error on statements and expressions
     /// is a breaking change)
-    fn classify_nonitem<T: HasAttrs>(
+    fn classify_nonitem(
         &mut self,
-        nonitem: &mut T,
+        nonitem: &mut impl HasAttrs,
     ) -> (Option<ast::Attribute>, /* after_derive */ bool) {
         let (mut attr, mut after_derive) = (None, false);
 
@@ -1067,6 +1069,16 @@ impl<'a, 'b> InvocationCollector<'a, 'b> {
                     .note("this may become a hard error in a future release")
                     .emit();
             }
+
+            if attr.doc_str().is_some() {
+                self.cx.parse_sess.buffer_lint_with_diagnostic(
+                    &UNUSED_DOC_COMMENTS,
+                    attr.span,
+                    ast::CRATE_NODE_ID,
+                    "unused doc comment",
+                    BuiltinLintDiagnostics::UnusedDocComment(attr.span),
+                );
+            }
         }
     }
 }
@@ -1360,21 +1372,14 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
                     _ => unreachable!(),
                 })
             }
-            ast::ItemKind::Mod(ast::Mod { inner, .. }) => {
-                if item.ident == Ident::invalid() {
-                    return noop_flat_map_item(item, self);
-                }
-
+            ast::ItemKind::Mod(ast::Mod { inner, inline, .. })
+                if item.ident != Ident::invalid() =>
+            {
                 let orig_directory_ownership = self.cx.current_expansion.directory_ownership;
                 let mut module = (*self.cx.current_expansion.module).clone();
                 module.mod_path.push(item.ident);
 
-                // Detect if this is an inline module (`mod m { ... }` as opposed to `mod m;`).
-                // In the non-inline case, `inner` is never the dummy span (cf. `parse_item_mod`).
-                // Thus, if `inner` is the dummy span, we know the module is inline.
-                let inline_module = item.span.contains(inner) || inner.is_dummy();
-
-                if inline_module {
+                if inline {
                     if let Some(path) = attr::first_attr_value_str_by_name(&item.attrs, sym::path) {
                         self.cx.current_expansion.directory_ownership =
                             DirectoryOwnership::Owned { relative: None };
@@ -1410,7 +1415,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
         }
     }
 
-    fn flat_map_trait_item(&mut self, item: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_trait_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         let mut item = configure!(self, item);
 
         let (attr, traits, after_derive) = self.classify_item(&mut item);
@@ -1419,7 +1424,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
                 .collect_attr(
                     attr,
                     traits,
-                    Annotatable::TraitItem(P(item)),
+                    Annotatable::TraitItem(item),
                     AstFragmentKind::TraitItems,
                     after_derive,
                 )
@@ -1427,16 +1432,20 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
         }
 
         match item.kind {
-            ast::AssocItemKind::Macro(mac) => {
-                let ast::AssocItem { attrs, span, .. } = item;
-                self.check_attributes(&attrs);
-                self.collect_bang(mac, span, AstFragmentKind::TraitItems).make_trait_items()
+            ast::AssocItemKind::Macro(..) => {
+                self.check_attributes(&item.attrs);
+                item.and_then(|item| match item.kind {
+                    ast::AssocItemKind::Macro(mac) => self
+                        .collect_bang(mac, item.span, AstFragmentKind::TraitItems)
+                        .make_trait_items(),
+                    _ => unreachable!(),
+                })
             }
             _ => noop_flat_map_assoc_item(item, self),
         }
     }
 
-    fn flat_map_impl_item(&mut self, item: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_impl_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         let mut item = configure!(self, item);
 
         let (attr, traits, after_derive) = self.classify_item(&mut item);
@@ -1445,7 +1454,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
                 .collect_attr(
                     attr,
                     traits,
-                    Annotatable::ImplItem(P(item)),
+                    Annotatable::ImplItem(item),
                     AstFragmentKind::ImplItems,
                     after_derive,
                 )
@@ -1453,10 +1462,14 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
         }
 
         match item.kind {
-            ast::AssocItemKind::Macro(mac) => {
-                let ast::AssocItem { attrs, span, .. } = item;
-                self.check_attributes(&attrs);
-                self.collect_bang(mac, span, AstFragmentKind::ImplItems).make_impl_items()
+            ast::AssocItemKind::Macro(..) => {
+                self.check_attributes(&item.attrs);
+                item.and_then(|item| match item.kind {
+                    ast::AssocItemKind::Macro(mac) => self
+                        .collect_bang(mac, item.span, AstFragmentKind::ImplItems)
+                        .make_impl_items(),
+                    _ => unreachable!(),
+                })
             }
             _ => noop_flat_map_assoc_item(item, self),
         }
@@ -1481,8 +1494,8 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
 
     fn flat_map_foreign_item(
         &mut self,
-        mut foreign_item: ast::ForeignItem,
-    ) -> SmallVec<[ast::ForeignItem; 1]> {
+        mut foreign_item: P<ast::ForeignItem>,
+    ) -> SmallVec<[P<ast::ForeignItem>; 1]> {
         let (attr, traits, after_derive) = self.classify_item(&mut foreign_item);
 
         if attr.is_some() || !traits.is_empty() {
@@ -1490,21 +1503,25 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
                 .collect_attr(
                     attr,
                     traits,
-                    Annotatable::ForeignItem(P(foreign_item)),
+                    Annotatable::ForeignItem(foreign_item),
                     AstFragmentKind::ForeignItems,
                     after_derive,
                 )
                 .make_foreign_items();
         }
 
-        if let ast::ForeignItemKind::Macro(mac) = foreign_item.kind {
-            self.check_attributes(&foreign_item.attrs);
-            return self
-                .collect_bang(mac, foreign_item.span, AstFragmentKind::ForeignItems)
-                .make_foreign_items();
+        match foreign_item.kind {
+            ast::ForeignItemKind::Macro(..) => {
+                self.check_attributes(&foreign_item.attrs);
+                foreign_item.and_then(|item| match item.kind {
+                    ast::ForeignItemKind::Macro(mac) => self
+                        .collect_bang(mac, item.span, AstFragmentKind::ForeignItems)
+                        .make_foreign_items(),
+                    _ => unreachable!(),
+                })
+            }
+            _ => noop_flat_map_foreign_item(foreign_item, self),
         }
-
-        noop_flat_map_foreign_item(foreign_item, self)
     }
 
     fn visit_item_kind(&mut self, item: &mut ast::ItemKind) {
@@ -1627,10 +1644,9 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
                         }
                     }
                 } else {
-                    let mut err = self.cx.struct_span_err(
-                        it.span(),
-                        &format!("expected path to external documentation"),
-                    );
+                    let mut err = self
+                        .cx
+                        .struct_span_err(it.span(), "expected path to external documentation");
 
                     // Check if the user erroneously used `doc(include(...))` syntax.
                     let literal = it.meta_item_list().and_then(|list| {
@@ -1660,7 +1676,7 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> {
             }
 
             let meta = attr::mk_list_item(Ident::with_dummy_span(sym::doc), items);
-            *at = attr::Attribute {
+            *at = ast::Attribute {
                 kind: ast::AttrKind::Normal(AttrItem {
                     path: meta.path,
                     args: meta.kind.mac_args(meta.span),
diff --git a/src/librustc_expand/lib.rs b/src/librustc_expand/lib.rs
index 4fe7c268c4..f119c956ce 100644
--- a/src/librustc_expand/lib.rs
+++ b/src/librustc_expand/lib.rs
@@ -1,3 +1,4 @@
+#![feature(cow_is_borrowed)]
 #![feature(crate_visibility_modifier)]
 #![feature(decl_macro)]
 #![feature(proc_macro_diagnostic)]
diff --git a/src/librustc_expand/mbe.rs b/src/librustc_expand/mbe.rs
index fe207a4c87..57957a1fa8 100644
--- a/src/librustc_expand/mbe.rs
+++ b/src/librustc_expand/mbe.rs
@@ -9,9 +9,9 @@ crate mod macro_rules;
 crate mod quoted;
 crate mod transcribe;
 
-use syntax::ast;
-use syntax::token::{self, Token, TokenKind};
-use syntax::tokenstream::DelimSpan;
+use rustc_ast::ast;
+use rustc_ast::token::{self, Token, TokenKind};
+use rustc_ast::tokenstream::DelimSpan;
 
 use rustc_span::Span;
 
diff --git a/src/librustc_expand/mbe/macro_check.rs b/src/librustc_expand/mbe/macro_check.rs
index 47865b2fb9..6eb834beac 100644
--- a/src/librustc_expand/mbe/macro_check.rs
+++ b/src/librustc_expand/mbe/macro_check.rs
@@ -106,13 +106,13 @@
 //! bound.
 use crate::mbe::{KleeneToken, TokenTree};
 
+use rustc_ast::ast::NodeId;
+use rustc_ast::token::{DelimToken, Token, TokenKind};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_session::lint::builtin::META_VARIABLE_MISUSE;
 use rustc_session::parse::ParseSess;
-use rustc_span::symbol::{kw, sym};
+use rustc_span::symbol::kw;
 use rustc_span::{symbol::Ident, MultiSpan, Span};
-use syntax::ast::NodeId;
-use syntax::token::{DelimToken, Token, TokenKind};
 
 use smallvec::SmallVec;
 
@@ -392,7 +392,7 @@ fn check_nested_occurrences(
                 NestedMacroState::Empty,
                 &TokenTree::Token(Token { kind: TokenKind::Ident(name, false), .. }),
             ) => {
-                if name == sym::macro_rules {
+                if name == kw::MacroRules {
                     state = NestedMacroState::MacroRules;
                 } else if name == kw::Macro {
                     state = NestedMacroState::Macro;
diff --git a/src/librustc_expand/mbe/macro_parser.rs b/src/librustc_expand/mbe/macro_parser.rs
index 246f66084b..5f75b99d91 100644
--- a/src/librustc_expand/mbe/macro_parser.rs
+++ b/src/librustc_expand/mbe/macro_parser.rs
@@ -76,14 +76,13 @@ use TokenTreeOrTokenTreeSlice::*;
 
 use crate::mbe::{self, TokenTree};
 
+use rustc_ast::ast::{Ident, Name};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, DocComment, Nonterminal, Token};
+use rustc_ast_pretty::pprust;
 use rustc_parse::parser::{FollowedByType, Parser, PathStyle};
-use rustc_parse::Directory;
+use rustc_session::parse::ParseSess;
 use rustc_span::symbol::{kw, sym, Symbol};
-use syntax::ast::{Ident, Name};
-use syntax::print::pprust;
-use syntax::sess::ParseSess;
-use syntax::token::{self, DocComment, Nonterminal, Token};
-use syntax::tokenstream::TokenStream;
 
 use rustc_errors::{FatalError, PResult};
 use rustc_span::Span;
@@ -91,6 +90,7 @@ use smallvec::{smallvec, SmallVec};
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::Lrc;
+use std::borrow::Cow;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::mem;
 use std::ops::{Deref, DerefMut};
@@ -612,28 +612,9 @@ fn inner_parse_loop<'root, 'tt>(
     Success(())
 }
 
-/// Use the given sequence of token trees (`ms`) as a matcher. Match the given token stream `tts`
-/// against it and return the match.
-///
-/// # Parameters
-///
-/// - `sess`: The session into which errors are emitted
-/// - `tts`: The tokenstream we are matching against the pattern `ms`
-/// - `ms`: A sequence of token trees representing a pattern against which we are matching
-/// - `directory`: Information about the file locations (needed for the black-box parser)
-/// - `recurse_into_modules`: Whether or not to recurse into modules (needed for the black-box
-///   parser)
-pub(super) fn parse(
-    sess: &ParseSess,
-    tts: TokenStream,
-    ms: &[TokenTree],
-    directory: Option<Directory<'_>>,
-    recurse_into_modules: bool,
-) -> NamedParseResult {
-    // Create a parser that can be used for the "black box" parts.
-    let mut parser =
-        Parser::new(sess, tts, directory, recurse_into_modules, true, rustc_parse::MACRO_ARGUMENTS);
-
+/// Use the given sequence of token trees (`ms`) as a matcher. Match the token
+/// stream from the given `parser` against it and return the match.
+pub(super) fn parse_tt(parser: &mut Cow<'_, Parser<'_>>, ms: &[TokenTree]) -> NamedParseResult {
     // A queue of possible matcher positions. We initialize it with the matcher position in which
     // the "dot" is before the first token of the first token tree in `ms`. `inner_parse_loop` then
     // processes all of these possible matcher positions and produces possible next positions into
@@ -658,7 +639,7 @@ pub(super) fn parse(
         // parsing from the black-box parser done. The result is that `next_items` will contain a
         // bunch of possible next matcher positions in `next_items`.
         match inner_parse_loop(
-            sess,
+            parser.sess,
             &mut cur_items,
             &mut next_items,
             &mut eof_items,
@@ -683,7 +664,7 @@ pub(super) fn parse(
             if eof_items.len() == 1 {
                 let matches =
                     eof_items[0].matches.iter_mut().map(|dv| Lrc::make_mut(dv).pop().unwrap());
-                return nameize(sess, ms, matches);
+                return nameize(parser.sess, ms, matches);
             } else if eof_items.len() > 1 {
                 return Error(
                     parser.token.span,
@@ -708,9 +689,14 @@ pub(super) fn parse(
         // unnecessary implicit clone later in Rc::make_mut.
         drop(eof_items);
 
+        // If there are no possible next positions AND we aren't waiting for the black-box parser,
+        // then there is a syntax error.
+        if bb_items.is_empty() && next_items.is_empty() {
+            return Failure(parser.token.clone(), "no rules expected this token in macro call");
+        }
         // Another possibility is that we need to call out to parse some rust nonterminal
         // (black-box) parser. However, if there is not EXACTLY ONE of these, something is wrong.
-        if (!bb_items.is_empty() && !next_items.is_empty()) || bb_items.len() > 1 {
+        else if (!bb_items.is_empty() && !next_items.is_empty()) || bb_items.len() > 1 {
             let nts = bb_items
                 .iter()
                 .map(|item| match item.top_elts.get_tt(item.idx) {
@@ -732,16 +718,11 @@ pub(super) fn parse(
                 ),
             );
         }
-        // If there are no possible next positions AND we aren't waiting for the black-box parser,
-        // then there is a syntax error.
-        else if bb_items.is_empty() && next_items.is_empty() {
-            return Failure(parser.token.take(), "no rules expected this token in macro call");
-        }
         // Dump all possible `next_items` into `cur_items` for the next iteration.
         else if !next_items.is_empty() {
             // Now process the next token
             cur_items.extend(next_items.drain(..));
-            parser.bump();
+            parser.to_mut().bump();
         }
         // Finally, we have the case where we need to call the black-box parser to get some
         // nonterminal.
@@ -753,7 +734,7 @@ pub(super) fn parse(
                 let match_cur = item.match_cur;
                 item.push_match(
                     match_cur,
-                    MatchedNonterminal(Lrc::new(parse_nt(&mut parser, span, ident.name))),
+                    MatchedNonterminal(Lrc::new(parse_nt(parser.to_mut(), span, ident.name))),
                 );
                 item.idx += 1;
                 item.match_cur += 1;
@@ -769,11 +750,8 @@ pub(super) fn parse(
 
 /// The token is an identifier, but not `_`.
 /// We prohibit passing `_` to macros expecting `ident` for now.
-fn get_macro_name(token: &Token) -> Option<(Name, bool)> {
-    match token.kind {
-        token::Ident(name, is_raw) if name != kw::Underscore => Some((name, is_raw)),
-        _ => None,
-    }
+fn get_macro_ident(token: &Token) -> Option<(Ident, bool)> {
+    token.ident().filter(|(ident, _)| ident.name != kw::Underscore)
 }
 
 /// Checks whether a non-terminal may begin with a particular token.
@@ -784,7 +762,7 @@ fn may_begin_with(token: &Token, name: Name) -> bool {
     /// Checks whether the non-terminal may contain a single (non-keyword) identifier.
     fn may_be_ident(nt: &token::Nonterminal) -> bool {
         match *nt {
-            token::NtItem(_) | token::NtBlock(_) | token::NtVis(_) => false,
+            token::NtItem(_) | token::NtBlock(_) | token::NtVis(_) | token::NtLifetime(_) => false,
             _ => true,
         }
     }
@@ -796,8 +774,8 @@ fn may_begin_with(token: &Token, name: Name) -> bool {
             && !token.is_keyword(kw::Let)
         }
         sym::ty => token.can_begin_type(),
-        sym::ident => get_macro_name(token).is_some(),
-        sym::literal => token.can_begin_literal_or_bool(),
+        sym::ident => get_macro_ident(token).is_some(),
+        sym::literal => token.can_begin_literal_maybe_minus(),
         sym::vis => match token.kind {
             // The follow-set of :vis + "priv" keyword + interpolated
             token::Comma | token::Ident(..) | token::Interpolated(_) => true,
@@ -875,8 +853,6 @@ fn parse_nt(p: &mut Parser<'_>, sp: Span, name: Symbol) -> Nonterminal {
     if name == sym::tt {
         return token::NtTT(p.parse_token_tree());
     }
-    // check at the beginning and the parser checks after each bump
-    p.process_potential_macro_variable();
     match parse_nt_inner(p, sp, name) {
         Ok(nt) => nt,
         Err(mut err) => {
@@ -903,10 +879,9 @@ fn parse_nt_inner<'a>(p: &mut Parser<'a>, sp: Span, name: Symbol) -> PResult<'a,
         sym::ty => token::NtTy(p.parse_ty()?),
         // this could be handled like a token, since it is one
         sym::ident => {
-            if let Some((name, is_raw)) = get_macro_name(&p.token) {
-                let span = p.token.span;
+            if let Some((ident, is_raw)) = get_macro_ident(&p.token) {
                 p.bump();
-                token::NtIdent(Ident::new(name, span), is_raw)
+                token::NtIdent(ident, is_raw)
             } else {
                 let token_str = pprust::token_to_string(&p.token);
                 let msg = &format!("expected ident, found {}", &token_str);
@@ -914,7 +889,7 @@ fn parse_nt_inner<'a>(p: &mut Parser<'a>, sp: Span, name: Symbol) -> PResult<'a,
             }
         }
         sym::path => token::NtPath(p.parse_path(PathStyle::Type)?),
-        sym::meta => token::NtMeta(p.parse_attr_item()?),
+        sym::meta => token::NtMeta(P(p.parse_attr_item()?)),
         sym::vis => token::NtVis(p.parse_visibility(FollowedByType::Yes)?),
         sym::lifetime => {
             if p.check_lifetime() {
diff --git a/src/librustc_expand/mbe/macro_rules.rs b/src/librustc_expand/mbe/macro_rules.rs
index d72317af9e..51b172a211 100644
--- a/src/librustc_expand/mbe/macro_rules.rs
+++ b/src/librustc_expand/mbe/macro_rules.rs
@@ -1,29 +1,29 @@
-use crate::base::{DummyResult, ExtCtxt, MacResult, TTMacroExpander};
+use crate::base::{DummyResult, ExpansionData, ExtCtxt, MacResult, TTMacroExpander};
 use crate::base::{SyntaxExtension, SyntaxExtensionKind};
 use crate::expand::{ensure_complete_parse, parse_ast_fragment, AstFragment, AstFragmentKind};
 use crate::mbe;
 use crate::mbe::macro_check;
-use crate::mbe::macro_parser::parse;
+use crate::mbe::macro_parser::parse_tt;
 use crate::mbe::macro_parser::{Error, Failure, Success};
-use crate::mbe::macro_parser::{MatchedNonterminal, MatchedSeq, NamedParseResult};
+use crate::mbe::macro_parser::{MatchedNonterminal, MatchedSeq};
 use crate::mbe::transcribe::transcribe;
 
+use rustc_ast::ast;
+use rustc_ast::token::{self, NtTT, Token, TokenKind::*};
+use rustc_ast::tokenstream::{DelimSpan, TokenStream};
+use rustc_ast_pretty::pprust;
+use rustc_attr::{self as attr, TransparencyError};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{Applicability, DiagnosticBuilder, FatalError};
 use rustc_feature::Features;
 use rustc_parse::parser::Parser;
 use rustc_parse::Directory;
+use rustc_session::parse::ParseSess;
 use rustc_span::edition::Edition;
 use rustc_span::hygiene::Transparency;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
-use syntax::ast;
-use syntax::attr::{self, TransparencyError};
-use syntax::print::pprust;
-use syntax::sess::ParseSess;
-use syntax::token::{self, NtTT, Token, TokenKind::*};
-use syntax::tokenstream::{DelimSpan, TokenStream};
 
 use log::debug;
 use std::borrow::Cow;
@@ -87,7 +87,7 @@ fn suggest_slice_pat(e: &mut DiagnosticBuilder<'_>, site_span: Span, parser: &Pa
 impl<'a> ParserAnyMacro<'a> {
     crate fn make(mut self: Box<ParserAnyMacro<'a>>, kind: AstFragmentKind) -> AstFragment {
         let ParserAnyMacro { site_span, macro_ident, ref mut parser, arm_span } = *self;
-        let fragment = panictry!(parse_ast_fragment(parser, kind, true).map_err(|mut e| {
+        let fragment = panictry!(parse_ast_fragment(parser, kind).map_err(|mut e| {
             if parser.token == token::Eof && e.message().ends_with(", found `<eof>`") {
                 if !e.span.is_dummy() {
                     // early end of macro arm (#52866)
@@ -166,9 +166,9 @@ impl TTMacroExpander for MacroRulesMacroExpander {
     }
 }
 
-fn trace_macros_note(cx: &mut ExtCtxt<'_>, sp: Span, message: String) {
+fn trace_macros_note(cx_expansions: &mut FxHashMap<Span, Vec<String>>, sp: Span, message: String) {
     let sp = sp.macro_backtrace().last().map(|trace| trace.call_site).unwrap_or(sp);
-    cx.expansions.entry(sp).or_default().push(message);
+    cx_expansions.entry(sp).or_default().push(message);
 }
 
 /// Given `lhses` and `rhses`, this is the new macro we create
@@ -184,11 +184,33 @@ fn generic_extension<'cx>(
 ) -> Box<dyn MacResult + 'cx> {
     if cx.trace_macros() {
         let msg = format!("expanding `{}! {{ {} }}`", name, pprust::tts_to_string(arg.clone()));
-        trace_macros_note(cx, sp, msg);
+        trace_macros_note(&mut cx.expansions, sp, msg);
     }
 
     // Which arm's failure should we report? (the one furthest along)
     let mut best_failure: Option<(Token, &str)> = None;
+
+    // We create a base parser that can be used for the "black box" parts.
+    // Every iteration needs a fresh copy of that parser. However, the parser
+    // is not mutated on many of the iterations, particularly when dealing with
+    // macros like this:
+    //
+    // macro_rules! foo {
+    //     ("a") => (A);
+    //     ("b") => (B);
+    //     ("c") => (C);
+    //     // ... etc. (maybe hundreds more)
+    // }
+    //
+    // as seen in the `html5ever` benchmark. We use a `Cow` so that the base
+    // parser is only cloned when necessary (upon mutation). Furthermore, we
+    // reinitialize the `Cow` with the base parser at the start of every
+    // iteration, so that any mutated parsers are not reused. This is all quite
+    // hacky, but speeds up the `html5ever` benchmark significantly. (Issue
+    // 68836 suggests a more comprehensive but more complex change to deal with
+    // this situation.)
+    let parser = parser_from_cx(&cx.current_expansion, &cx.parse_sess, arg.clone());
+
     for (i, lhs) in lhses.iter().enumerate() {
         // try each arm's matchers
         let lhs_tt = match *lhs {
@@ -200,13 +222,14 @@ fn generic_extension<'cx>(
         // This is used so that if a matcher is not `Success(..)`ful,
         // then the spans which became gated when parsing the unsuccessful matcher
         // are not recorded. On the first `Success(..)`ful matcher, the spans are merged.
-        let mut gated_spans_snaphot = mem::take(&mut *cx.parse_sess.gated_spans.spans.borrow_mut());
+        let mut gated_spans_snapshot =
+            mem::take(&mut *cx.parse_sess.gated_spans.spans.borrow_mut());
 
-        match parse_tt(cx, lhs_tt, arg.clone()) {
+        match parse_tt(&mut Cow::Borrowed(&parser), lhs_tt) {
             Success(named_matches) => {
                 // The matcher was `Success(..)`ful.
                 // Merge the gated spans from parsing the matcher with the pre-existing ones.
-                cx.parse_sess.gated_spans.merge(gated_spans_snaphot);
+                cx.parse_sess.gated_spans.merge(gated_spans_snapshot);
 
                 let rhs = match rhses[i] {
                     // ignore delimiters
@@ -232,11 +255,11 @@ fn generic_extension<'cx>(
 
                 if cx.trace_macros() {
                     let msg = format!("to `{}`", pprust::tts_to_string(tts.clone()));
-                    trace_macros_note(cx, sp, msg);
+                    trace_macros_note(&mut cx.expansions, sp, msg);
                 }
 
                 let directory = Directory {
-                    path: Cow::from(cx.current_expansion.module.directory.as_path()),
+                    path: cx.current_expansion.module.directory.clone(),
                     ownership: cx.current_expansion.directory_ownership,
                 };
                 let mut p = Parser::new(cx.parse_sess(), tts, Some(directory), true, false, None);
@@ -244,7 +267,6 @@ fn generic_extension<'cx>(
                     cx.current_expansion.module.mod_path.last().map(|id| id.to_string());
                 p.last_type_ascription = cx.current_expansion.prior_type_ascription;
 
-                p.process_potential_macro_variable();
                 // Let the context choose how to interpret the result.
                 // Weird, but useful for X-macros.
                 return Box::new(ParserAnyMacro {
@@ -267,8 +289,9 @@ fn generic_extension<'cx>(
 
         // The matcher was not `Success(..)`ful.
         // Restore to the state before snapshotting and maybe try again.
-        mem::swap(&mut gated_spans_snaphot, &mut cx.parse_sess.gated_spans.spans.borrow_mut());
+        mem::swap(&mut gated_spans_snapshot, &mut cx.parse_sess.gated_spans.spans.borrow_mut());
     }
+    drop(parser);
 
     let (token, label) = best_failure.expect("ran no matchers");
     let span = token.span.substitute_dummy(sp);
@@ -286,7 +309,8 @@ fn generic_extension<'cx>(
                 mbe::TokenTree::Delimited(_, ref delim) => &delim.tts[..],
                 _ => continue,
             };
-            match parse_tt(cx, lhs_tt, arg.clone()) {
+            let parser = parser_from_cx(&cx.current_expansion, &cx.parse_sess, arg.clone());
+            match parse_tt(&mut Cow::Borrowed(&parser), lhs_tt) {
                 Success(_) => {
                     if comma_span.is_dummy() {
                         err.note("you might be missing a comma");
@@ -368,7 +392,8 @@ pub fn compile_declarative_macro(
         ),
     ];
 
-    let argument_map = match parse(sess, body, &argument_gram, None, true) {
+    let parser = Parser::new(sess, body, None, true, true, rustc_parse::MACRO_ARGUMENTS);
+    let argument_map = match parse_tt(&mut Cow::Borrowed(&parser), &argument_gram) {
         Success(m) => m,
         Failure(token, msg) => {
             let s = parse_failure_msg(&token);
@@ -945,7 +970,7 @@ fn check_matcher_core(
                                         msg,
                                         ts[..ts.len() - 1]
                                             .iter()
-                                            .map(|s| *s)
+                                            .copied()
                                             .collect::<Vec<_>>()
                                             .join(", "),
                                         ts[ts.len() - 1],
@@ -966,7 +991,7 @@ fn token_can_be_followed_by_any(tok: &mbe::TokenTree) -> bool {
     if let mbe::TokenTree::MetaVarDecl(_, _, frag_spec) = *tok {
         frag_can_be_followed_by_any(frag_spec.name)
     } else {
-        // (Non NT's can always be followed by anthing in matchers.)
+        // (Non NT's can always be followed by anything in matchers.)
         true
     }
 }
@@ -1184,14 +1209,16 @@ fn quoted_tt_to_string(tt: &mbe::TokenTree) -> String {
     }
 }
 
-/// Use this token tree as a matcher to parse given tts.
-fn parse_tt(cx: &ExtCtxt<'_>, mtch: &[mbe::TokenTree], tts: TokenStream) -> NamedParseResult {
-    // `None` is because we're not interpolating
+fn parser_from_cx<'cx>(
+    current_expansion: &'cx ExpansionData,
+    sess: &'cx ParseSess,
+    tts: TokenStream,
+) -> Parser<'cx> {
     let directory = Directory {
-        path: Cow::from(cx.current_expansion.module.directory.as_path()),
-        ownership: cx.current_expansion.directory_ownership,
+        path: current_expansion.module.directory.clone(),
+        ownership: current_expansion.directory_ownership,
     };
-    parse(cx.parse_sess(), tts, mtch, Some(directory), true)
+    Parser::new(sess, tts, Some(directory), true, true, rustc_parse::MACRO_ARGUMENTS)
 }
 
 /// Generates an appropriate parsing failure message. For EOF, this is "unexpected end...". For
diff --git a/src/librustc_expand/mbe/quoted.rs b/src/librustc_expand/mbe/quoted.rs
index 4a33c51d57..b19fae6559 100644
--- a/src/librustc_expand/mbe/quoted.rs
+++ b/src/librustc_expand/mbe/quoted.rs
@@ -1,12 +1,12 @@
 use crate::mbe::macro_parser;
 use crate::mbe::{Delimited, KleeneOp, KleeneToken, SequenceRepetition, TokenTree};
 
+use rustc_ast::ast;
+use rustc_ast::token::{self, Token};
+use rustc_ast::tokenstream;
+use rustc_ast_pretty::pprust;
+use rustc_session::parse::ParseSess;
 use rustc_span::symbol::kw;
-use syntax::ast;
-use syntax::print::pprust;
-use syntax::sess::ParseSess;
-use syntax::token::{self, Token};
-use syntax::tokenstream;
 
 use rustc_span::Span;
 
@@ -112,7 +112,7 @@ fn parse_tree(
                     sess.span_diagnostic.span_err(span.entire(), &msg);
                 }
                 // Parse the contents of the sequence itself
-                let sequence = parse(tts.into(), expect_matchers, sess);
+                let sequence = parse(tts, expect_matchers, sess);
                 // Get the Kleene operator and optional separator
                 let (separator, kleene) = parse_sep_and_kleene_op(trees, span.entire(), sess);
                 // Count the number of captured "names" (i.e., named metavars)
@@ -159,7 +159,7 @@ fn parse_tree(
         // descend into the delimited set and further parse it.
         tokenstream::TokenTree::Delimited(span, delim, tts) => TokenTree::Delimited(
             span,
-            Lrc::new(Delimited { delim, tts: parse(tts.into(), expect_matchers, sess) }),
+            Lrc::new(Delimited { delim, tts: parse(tts, expect_matchers, sess) }),
         ),
     }
 }
diff --git a/src/librustc_expand/mbe/transcribe.rs b/src/librustc_expand/mbe/transcribe.rs
index 104a5233c9..d12dedf9e0 100644
--- a/src/librustc_expand/mbe/transcribe.rs
+++ b/src/librustc_expand/mbe/transcribe.rs
@@ -2,15 +2,15 @@ use crate::base::ExtCtxt;
 use crate::mbe;
 use crate::mbe::macro_parser::{MatchedNonterminal, MatchedSeq, NamedMatch};
 
+use rustc_ast::ast::{Ident, Mac};
+use rustc_ast::mut_visit::{self, MutVisitor};
+use rustc_ast::token::{self, NtTT, Token};
+use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndJoint};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::pluralize;
 use rustc_span::hygiene::{ExpnId, Transparency};
 use rustc_span::Span;
-use syntax::ast::{Ident, Mac};
-use syntax::mut_visit::{self, MutVisitor};
-use syntax::token::{self, NtTT, Token};
-use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndJoint};
 
 use smallvec::{smallvec, SmallVec};
 use std::mem;
@@ -119,9 +119,9 @@ pub(super) fn transcribe(
         let tree = if let Some(tree) = stack.last_mut().unwrap().next() {
             // If it still has a TokenTree we have not looked at yet, use that tree.
             tree
-        }
-        // The else-case never produces a value for `tree` (it `continue`s or `return`s).
-        else {
+        } else {
+            // This else-case never produces a value for `tree` (it `continue`s or `return`s).
+
             // Otherwise, if we have just reached the end of a sequence and we can keep repeating,
             // go back to the beginning of the sequence.
             if let Frame::Sequence { idx, sep, .. } = stack.last_mut().unwrap() {
@@ -155,8 +155,7 @@ pub(super) fn transcribe(
                     }
 
                     // Step back into the parent Delimited.
-                    let tree =
-                        TokenTree::Delimited(span, forest.delim, TokenStream::new(result).into());
+                    let tree = TokenTree::Delimited(span, forest.delim, TokenStream::new(result));
                     result = result_stack.pop().unwrap();
                     result.push(tree.into());
                 }
diff --git a/src/librustc_expand/mut_visit/tests.rs b/src/librustc_expand/mut_visit/tests.rs
index 003ce0fcb1..4c947d8fa2 100644
--- a/src/librustc_expand/mut_visit/tests.rs
+++ b/src/librustc_expand/mut_visit/tests.rs
@@ -1,9 +1,9 @@
 use crate::tests::{matches_codepattern, string_to_crate};
 
-use syntax::ast::{self, Ident};
-use syntax::mut_visit::{self, MutVisitor};
-use syntax::print::pprust;
-use syntax::with_default_globals;
+use rustc_ast::ast::{self, Ident};
+use rustc_ast::mut_visit::{self, MutVisitor};
+use rustc_ast::with_default_globals;
+use rustc_ast_pretty::pprust;
 
 // This version doesn't care about getting comments or doc-strings in.
 fn fake_print_crate(s: &mut pprust::State<'_>, krate: &ast::Crate) {
diff --git a/src/librustc_expand/parse/lexer/tests.rs b/src/librustc_expand/parse/lexer/tests.rs
index 2ef81d80a1..2cb6267e0f 100644
--- a/src/librustc_expand/parse/lexer/tests.rs
+++ b/src/librustc_expand/parse/lexer/tests.rs
@@ -1,13 +1,13 @@
+use rustc_ast::token::{self, Token, TokenKind};
+use rustc_ast::util::comments::is_doc_comment;
+use rustc_ast::with_default_globals;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{emitter::EmitterWriter, Handler};
 use rustc_parse::lexer::StringReader;
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::{FilePathMapping, SourceMap};
 use rustc_span::symbol::Symbol;
 use rustc_span::{BytePos, Span};
-use syntax::sess::ParseSess;
-use syntax::token::{self, Token, TokenKind};
-use syntax::util::comments::is_doc_comment;
-use syntax::with_default_globals;
 
 use std::io;
 use std::path::PathBuf;
diff --git a/src/librustc_expand/parse/tests.rs b/src/librustc_expand/parse/tests.rs
index b79e289412..55e815bd4a 100644
--- a/src/librustc_expand/parse/tests.rs
+++ b/src/librustc_expand/parse/tests.rs
@@ -1,18 +1,18 @@
 use crate::tests::{matches_codepattern, string_to_stream, with_error_checking_parse};
 
+use rustc_ast::ast::{self, Name, PatKind};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, Token};
+use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};
+use rustc_ast::visit;
+use rustc_ast::with_default_globals;
+use rustc_ast_pretty::pprust::item_to_string;
 use rustc_errors::PResult;
 use rustc_parse::new_parser_from_source_str;
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::FilePathMapping;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{BytePos, FileName, Pos, Span};
-use syntax::ast::{self, Name, PatKind};
-use syntax::print::pprust::item_to_string;
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
-use syntax::token::{self, Token};
-use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
-use syntax::visit;
-use syntax::with_default_globals;
 
 use std::path::PathBuf;
 
@@ -65,7 +65,7 @@ fn string_to_tts_macro() {
 
         match tts {
             [TokenTree::Token(Token { kind: token::Ident(name_macro_rules, false), .. }), TokenTree::Token(Token { kind: token::Not, .. }), TokenTree::Token(Token { kind: token::Ident(name_zip, false), .. }), TokenTree::Delimited(_, macro_delim, macro_tts)]
-                if name_macro_rules == &sym::macro_rules && name_zip.as_str() == "zip" =>
+                if name_macro_rules == &kw::MacroRules && name_zip.as_str() == "zip" =>
             {
                 let tts = &macro_tts.trees().collect::<Vec<_>>();
                 match &tts[..] {
diff --git a/src/librustc_expand/placeholders.rs b/src/librustc_expand/placeholders.rs
index 8b18a5dc4b..cd4f0a61d4 100644
--- a/src/librustc_expand/placeholders.rs
+++ b/src/librustc_expand/placeholders.rs
@@ -1,10 +1,10 @@
 use crate::base::ExtCtxt;
 use crate::expand::{AstFragment, AstFragmentKind};
 
+use rustc_ast::ast;
+use rustc_ast::mut_visit::*;
+use rustc_ast::ptr::P;
 use rustc_span::source_map::{dummy_spanned, DUMMY_SP};
-use syntax::ast;
-use syntax::mut_visit::*;
-use syntax::ptr::P;
 
 use smallvec::{smallvec, SmallVec};
 
@@ -25,7 +25,6 @@ pub fn placeholder(
 
     let ident = ast::Ident::invalid();
     let attrs = Vec::new();
-    let generics = ast::Generics::default();
     let vis = vis.unwrap_or_else(|| dummy_spanned(ast::VisibilityKind::Inherited));
     let span = DUMMY_SP;
     let expr_placeholder = || {
@@ -51,37 +50,35 @@ pub fn placeholder(
             kind: ast::ItemKind::Mac(mac_placeholder()),
             tokens: None,
         })]),
-        AstFragmentKind::TraitItems => AstFragment::TraitItems(smallvec![ast::AssocItem {
+        AstFragmentKind::TraitItems => AstFragment::TraitItems(smallvec![P(ast::AssocItem {
             id,
             span,
             ident,
             vis,
             attrs,
-            generics,
             kind: ast::AssocItemKind::Macro(mac_placeholder()),
-            defaultness: ast::Defaultness::Final,
             tokens: None,
-        }]),
-        AstFragmentKind::ImplItems => AstFragment::ImplItems(smallvec![ast::AssocItem {
+        })]),
+        AstFragmentKind::ImplItems => AstFragment::ImplItems(smallvec![P(ast::AssocItem {
             id,
             span,
             ident,
             vis,
             attrs,
-            generics,
             kind: ast::AssocItemKind::Macro(mac_placeholder()),
-            defaultness: ast::Defaultness::Final,
             tokens: None,
-        }]),
-        AstFragmentKind::ForeignItems => AstFragment::ForeignItems(smallvec![ast::ForeignItem {
-            id,
-            span,
-            ident,
-            vis,
-            attrs,
-            kind: ast::ForeignItemKind::Macro(mac_placeholder()),
-            tokens: None,
-        }]),
+        })]),
+        AstFragmentKind::ForeignItems => {
+            AstFragment::ForeignItems(smallvec![P(ast::ForeignItem {
+                id,
+                span,
+                ident,
+                vis,
+                attrs,
+                kind: ast::ForeignItemKind::Macro(mac_placeholder()),
+                tokens: None,
+            })])
+        }
         AstFragmentKind::Pat => {
             AstFragment::Pat(P(ast::Pat { id, span, kind: ast::PatKind::Mac(mac_placeholder()) }))
         }
@@ -250,21 +247,24 @@ impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
         noop_flat_map_item(item, self)
     }
 
-    fn flat_map_trait_item(&mut self, item: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_trait_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         match item.kind {
             ast::AssocItemKind::Macro(_) => self.remove(item.id).make_trait_items(),
             _ => noop_flat_map_assoc_item(item, self),
         }
     }
 
-    fn flat_map_impl_item(&mut self, item: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_impl_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         match item.kind {
             ast::AssocItemKind::Macro(_) => self.remove(item.id).make_impl_items(),
             _ => noop_flat_map_assoc_item(item, self),
         }
     }
 
-    fn flat_map_foreign_item(&mut self, item: ast::ForeignItem) -> SmallVec<[ast::ForeignItem; 1]> {
+    fn flat_map_foreign_item(
+        &mut self,
+        item: P<ast::ForeignItem>,
+    ) -> SmallVec<[P<ast::ForeignItem>; 1]> {
         match item.kind {
             ast::ForeignItemKind::Macro(_) => self.remove(item.id).make_foreign_items(),
             _ => noop_flat_map_foreign_item(item, self),
diff --git a/src/librustc_expand/proc_macro.rs b/src/librustc_expand/proc_macro.rs
index cb6249e936..84a546345b 100644
--- a/src/librustc_expand/proc_macro.rs
+++ b/src/librustc_expand/proc_macro.rs
@@ -1,13 +1,13 @@
 use crate::base::{self, *};
 use crate::proc_macro_server;
 
+use rustc_ast::ast::{self, ItemKind, MetaItemKind, NestedMetaItem};
+use rustc_ast::token;
+use rustc_ast::tokenstream::{self, TokenStream};
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{Applicability, FatalError};
 use rustc_span::symbol::sym;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, ItemKind, MetaItemKind, NestedMetaItem};
-use syntax::token;
-use syntax::tokenstream::{self, TokenStream};
 
 const EXEC_STRATEGY: pm::bridge::server::SameThread = pm::bridge::server::SameThread;
 
diff --git a/src/librustc_expand/proc_macro_server.rs b/src/librustc_expand/proc_macro_server.rs
index d441613ac5..5f21ff503d 100644
--- a/src/librustc_expand/proc_macro_server.rs
+++ b/src/librustc_expand/proc_macro_server.rs
@@ -1,17 +1,17 @@
 use crate::base::ExtCtxt;
 
+use rustc_ast::ast;
+use rustc_ast::token;
+use rustc_ast::tokenstream::{self, DelimSpan, IsJoint::*, TokenStream, TreeAndJoint};
+use rustc_ast::util::comments;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::Diagnostic;
 use rustc_parse::lexer::nfc_normalize;
 use rustc_parse::{nt_to_tokenstream, parse_stream_from_source_str};
+use rustc_session::parse::ParseSess;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{BytePos, FileName, MultiSpan, Pos, SourceFile, Span};
-use syntax::ast;
-use syntax::print::pprust;
-use syntax::sess::ParseSess;
-use syntax::token;
-use syntax::tokenstream::{self, DelimSpan, IsJoint::*, TokenStream, TreeAndJoint};
-use syntax::util::comments;
 
 use pm::bridge::{server, TokenTree};
 use pm::{Delimiter, Level, LineColumn, Spacing};
@@ -54,13 +54,13 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)>
     fn from_internal(
         ((tree, is_joint), sess, stack): (TreeAndJoint, &ParseSess, &mut Vec<Self>),
     ) -> Self {
-        use syntax::token::*;
+        use rustc_ast::token::*;
 
         let joint = is_joint == Joint;
         let Token { kind, span } = match tree {
             tokenstream::TokenTree::Delimited(span, delim, tts) => {
                 let delimiter = Delimiter::from_internal(delim);
-                return TokenTree::Group(Group { delimiter, stream: tts.into(), span });
+                return TokenTree::Group(Group { delimiter, stream: tts, span });
             }
             tokenstream::TokenTree::Token(token) => token,
         };
@@ -191,17 +191,13 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)>
 
 impl ToInternal<TokenStream> for TokenTree<Group, Punct, Ident, Literal> {
     fn to_internal(self) -> TokenStream {
-        use syntax::token::*;
+        use rustc_ast::token::*;
 
         let (ch, joint, span) = match self {
             TokenTree::Punct(Punct { ch, joint, span }) => (ch, joint, span),
             TokenTree::Group(Group { delimiter, stream, span }) => {
-                return tokenstream::TokenTree::Delimited(
-                    span,
-                    delimiter.to_internal(),
-                    stream.into(),
-                )
-                .into();
+                return tokenstream::TokenTree::Delimited(span, delimiter.to_internal(), stream)
+                    .into();
             }
             TokenTree::Ident(self::Ident { sym, is_raw, span }) => {
                 return tokenstream::TokenTree::token(Ident(sym, is_raw), span).into();
@@ -209,7 +205,7 @@ impl ToInternal<TokenStream> for TokenTree<Group, Punct, Ident, Literal> {
             TokenTree::Literal(self::Literal {
                 lit: token::Lit { kind: token::Integer, symbol, suffix },
                 span,
-            }) if symbol.as_str().starts_with("-") => {
+            }) if symbol.as_str().starts_with('-') => {
                 let minus = BinOp(BinOpToken::Minus);
                 let symbol = Symbol::intern(&symbol.as_str()[1..]);
                 let integer = TokenKind::lit(token::Integer, symbol, suffix);
@@ -220,7 +216,7 @@ impl ToInternal<TokenStream> for TokenTree<Group, Punct, Ident, Literal> {
             TokenTree::Literal(self::Literal {
                 lit: token::Lit { kind: token::Float, symbol, suffix },
                 span,
-            }) if symbol.as_str().starts_with("-") => {
+            }) if symbol.as_str().starts_with('-') => {
                 let minus = BinOp(BinOpToken::Minus);
                 let symbol = Symbol::intern(&symbol.as_str()[1..]);
                 let float = TokenKind::lit(token::Float, symbol, suffix);
diff --git a/src/librustc_expand/tests.rs b/src/librustc_expand/tests.rs
index 82ab74ac15..fbc49ddd56 100644
--- a/src/librustc_expand/tests.rs
+++ b/src/librustc_expand/tests.rs
@@ -1,10 +1,10 @@
+use rustc_ast::ast;
+use rustc_ast::tokenstream::TokenStream;
+use rustc_ast::with_default_globals;
 use rustc_parse::{new_parser_from_source_str, parser::Parser, source_file_to_stream};
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::{FilePathMapping, SourceMap};
 use rustc_span::{BytePos, MultiSpan, Span};
-use syntax::ast;
-use syntax::sess::ParseSess;
-use syntax::tokenstream::TokenStream;
-use syntax::with_default_globals;
 
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::emitter::EmitterWriter;
diff --git a/src/librustc_expand/tokenstream/tests.rs b/src/librustc_expand/tokenstream/tests.rs
index 287c168f76..db329f22d1 100644
--- a/src/librustc_expand/tokenstream/tests.rs
+++ b/src/librustc_expand/tokenstream/tests.rs
@@ -1,11 +1,11 @@
 use crate::tests::string_to_stream;
 
+use rustc_ast::ast::Name;
+use rustc_ast::token;
+use rustc_ast::tokenstream::{TokenStream, TokenStreamBuilder, TokenTree};
+use rustc_ast::with_default_globals;
 use rustc_span::{BytePos, Span};
 use smallvec::smallvec;
-use syntax::ast::Name;
-use syntax::token;
-use syntax::tokenstream::{TokenStream, TokenStreamBuilder, TokenTree};
-use syntax::with_default_globals;
 
 fn string_to_ts(string: &str) -> TokenStream {
     string_to_stream(string.to_owned())
diff --git a/src/librustc_feature/active.rs b/src/librustc_feature/active.rs
index f20a57ea61..3a0fc6f8da 100644
--- a/src/librustc_feature/active.rs
+++ b/src/librustc_feature/active.rs
@@ -99,6 +99,9 @@ declare_features! (
 
     // no-tracking-issue-start
 
+    /// Allows using `rustc_*` attributes (RFC 572).
+    (active, rustc_attrs, "1.0.0", None, None),
+
     /// Allows using compiler's own crates.
     (active, rustc_private, "1.0.0", Some(27812), None),
 
@@ -128,9 +131,6 @@ declare_features! (
     /// Allows using `#[link_name="llvm.*"]`.
     (active, link_llvm_intrinsics, "1.0.0", Some(29602), None),
 
-    /// Allows using `rustc_*` attributes (RFC 572).
-    (active, rustc_attrs, "1.0.0", Some(29642), None),
-
     /// Allows using the `box $expr` syntax.
     (active, box_syntax, "1.0.0", Some(49733), None),
 
@@ -204,6 +204,10 @@ declare_features! (
     /// Added for testing E0705; perma-unstable.
     (active, test_2018_feature, "1.31.0", None, Some(Edition::Edition2018)),
 
+    /// Allows `#[repr(no_niche)]` (an implementation detail of `rustc`,
+    /// it is not on path for eventual stabilization).
+    (active, no_niche, "1.42.0", None, None),
+
     // no-tracking-issue-end
 
     // -------------------------------------------------------------------------
@@ -285,9 +289,6 @@ declare_features! (
     /// Permits specifying whether a function should permit unwinding or abort on unwind.
     (active, unwind_attributes, "1.4.0", Some(58760), None),
 
-    /// Allows `#[no_debug]`.
-    (active, no_debug, "1.5.0", Some(29721), None),
-
     /// Allows attributes on expressions and non-item statements.
     (active, stmt_expr_attributes, "1.6.0", Some(15701), None),
 
@@ -344,9 +345,6 @@ declare_features! (
     /// Allows `extern "x86-interrupt" fn()`.
     (active, abi_x86_interrupt, "1.17.0", Some(40180), None),
 
-    /// Allows overlapping impls of marker traits.
-    (active, overlapping_marker_traits, "1.18.0", Some(29864), None),
-
     /// Allows a test to fail without failing the whole suite.
     (active, allow_fail, "1.19.0", Some(46488), None),
 
@@ -362,9 +360,6 @@ declare_features! (
     /// Allows `#[doc(masked)]`.
     (active, doc_masked, "1.21.0", Some(44027), None),
 
-    /// Allows `#[doc(spotlight)]`.
-    (active, doc_spotlight, "1.22.0", Some(45040), None),
-
     /// Allows `#[doc(include = "some-file")]`.
     (active, external_doc, "1.22.0", Some(44732), None),
 
@@ -386,7 +381,7 @@ declare_features! (
     /// Allows defining `trait X = A + B;` alias items.
     (active, trait_alias, "1.24.0", Some(41517), None),
 
-    /// Allows infering `'static` outlives requirements (RFC 2093).
+    /// Allows inferring `'static` outlives requirements (RFC 2093).
     (active, infer_static_outlives_requirements, "1.26.0", Some(54185), None),
 
     /// Allows accessing fields of unions inside `const` functions.
@@ -538,12 +533,22 @@ declare_features! (
     /// For example, you can write `x @ Some(y)`.
     (active, bindings_after_at, "1.41.0", Some(65490), None),
 
+    /// Allows patterns with concurrent by-move and by-ref bindings.
+    /// For example, you can write `Foo(a, ref b)` where `a` is by-move and `b` is by-ref.
+    (active, move_ref_pattern, "1.42.0", Some(68354), None),
+
     /// Allows `impl const Trait for T` syntax.
     (active, const_trait_impl, "1.42.0", Some(67792), None),
 
     /// Allows `T: ?const Trait` syntax in bounds.
     (active, const_trait_bound_opt_out, "1.42.0", Some(67794), None),
 
+    /// Allows the use of `no_sanitize` attribute.
+    (active, no_sanitize, "1.42.0", Some(39699), None),
+
+    // Allows limiting the evaluation steps of const expressions
+    (active, const_eval_limit, "1.43.0", Some(67217), None),
+
     // -------------------------------------------------------------------------
     // feature-group-end: actual feature gates
     // -------------------------------------------------------------------------
@@ -556,7 +561,6 @@ pub const INCOMPLETE_FEATURES: &[Symbol] = &[
     sym::impl_trait_in_bindings,
     sym::generic_associated_types,
     sym::const_generics,
-    sym::or_patterns,
     sym::let_chains,
     sym::raw_dylib,
     sym::const_trait_impl,
diff --git a/src/librustc_feature/builtin_attrs.rs b/src/librustc_feature/builtin_attrs.rs
index a38726e3de..e9a5364c65 100644
--- a/src/librustc_feature/builtin_attrs.rs
+++ b/src/librustc_feature/builtin_attrs.rs
@@ -175,7 +175,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     // Stable attributes:
     // ==========================================================================
 
-    // Condtional compilation:
+    // Conditional compilation:
     ungated!(cfg, Normal, template!(List: "predicate")),
     ungated!(cfg_attr, Normal, template!(List: "predicate, attr1, attr2, ...")),
 
@@ -239,6 +239,10 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     // Limits:
     ungated!(recursion_limit, CrateLevel, template!(NameValueStr: "N")),
     ungated!(type_length_limit, CrateLevel, template!(NameValueStr: "N")),
+    gated!(
+        const_eval_limit, CrateLevel, template!(NameValueStr: "N"), const_eval_limit,
+        experimental!(const_eval_limit)
+    ),
 
     // Entry point:
     ungated!(main, Normal, template!(Word)),
@@ -261,6 +265,11 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
     ungated!(cold, Whitelisted, template!(Word)),
     ungated!(no_builtins, Whitelisted, template!(Word)),
     ungated!(target_feature, Whitelisted, template!(List: r#"enable = "name""#)),
+    gated!(
+        no_sanitize, Whitelisted,
+        template!(List: "address, memory, thread"),
+        experimental!(no_sanitize)
+    ),
 
     // FIXME: #14408 whitelist docs since rustdoc looks at them
     ungated!(doc, Whitelisted, template!(List: "hidden|inline|...", NameValueStr: "string")),
@@ -498,16 +507,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
             cfg_fn!(rustc_attrs),
         ),
     ),
-    (
-        sym::no_debug, Whitelisted, template!(Word),
-        Gated(
-            Stability::Deprecated("https://github.com/rust-lang/rust/issues/29721", None),
-            sym::no_debug,
-            "the `#[no_debug]` attribute was an experimental feature that has been \
-            deprecated due to lack of demand",
-            cfg_fn!(no_debug)
-        )
-    ),
     gated!(
         // Used in resolve:
         prelude_import, Whitelisted, template!(Word),
diff --git a/src/librustc_feature/removed.rs b/src/librustc_feature/removed.rs
index d5b6fe81c7..4e348054fb 100644
--- a/src/librustc_feature/removed.rs
+++ b/src/librustc_feature/removed.rs
@@ -108,7 +108,11 @@ declare_features! (
     /// Allows using `#[on_unimplemented(..)]` on traits.
     /// (Moved to `rustc_attrs`.)
     (removed, on_unimplemented, "1.40.0", None, None, None),
-
+    /// Allows overlapping impls of marker traits.
+    (removed, overlapping_marker_traits, "1.42.0", Some(29864), None,
+     Some("removed in favor of `#![feature(marker_trait_attr)]`")),
+    /// Allows `#[no_debug]`.
+    (removed, no_debug, "1.43.0", Some(29721), None, Some("removed due to lack of demand")),
     // -------------------------------------------------------------------------
     // feature-group-end: removed features
     // -------------------------------------------------------------------------
diff --git a/src/librustc_hir/Cargo.toml b/src/librustc_hir/Cargo.toml
index f2e420dbae..872d114fb1 100644
--- a/src/librustc_hir/Cargo.toml
+++ b/src/librustc_hir/Cargo.toml
@@ -10,6 +10,7 @@ path = "lib.rs"
 doctest = false
 
 [dependencies]
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
 rustc_target = { path = "../librustc_target" }
 rustc_macros = { path = "../librustc_macros" }
 rustc_data_structures = { path = "../librustc_data_structures" }
@@ -17,6 +18,6 @@ rustc_index = { path = "../librustc_index" }
 rustc_span = { path = "../librustc_span" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
-rustc_session = { path = "../librustc_session" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
+lazy_static = "1"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_hir/def.rs b/src/librustc_hir/def.rs
index 83e30d85c5..595543eaf5 100644
--- a/src/librustc_hir/def.rs
+++ b/src/librustc_hir/def.rs
@@ -1,10 +1,10 @@
 use crate::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use crate::hir;
 
+use rustc_ast::ast;
+use rustc_ast::ast::NodeId;
 use rustc_macros::HashStable_Generic;
 use rustc_span::hygiene::MacroKind;
-use syntax::ast;
-use syntax::ast::NodeId;
 
 use std::fmt::Debug;
 
diff --git a/src/librustc_hir/hir.rs b/src/librustc_hir/hir.rs
index b62a7e413e..f948e22e84 100644
--- a/src/librustc_hir/hir.rs
+++ b/src/librustc_hir/hir.rs
@@ -1,31 +1,32 @@
-use crate::def::{DefKind, Res};
+use crate::def::{DefKind, Namespace, Res};
 use crate::def_id::DefId;
 crate use crate::hir_id::HirId;
 use crate::itemlikevisit;
 use crate::print;
 
 crate use BlockCheckMode::*;
-crate use FunctionRetTy::*;
+crate use FnRetTy::*;
 crate use UnsafeSource::*;
 
+use rustc_ast::ast::{self, AsmDialect, CrateSugar, Ident, Name};
+use rustc_ast::ast::{AttrVec, Attribute, FloatTy, IntTy, Label, LitKind, StrStyle, UintTy};
+pub use rustc_ast::ast::{BorrowKind, ImplPolarity, IsAuto};
+pub use rustc_ast::ast::{CaptureBy, Movability, Mutability};
+use rustc_ast::node_id::NodeMap;
+use rustc_ast::tokenstream::TokenStream;
+use rustc_ast::util::parser::ExprPrecedence;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::{par_for_each_in, Send, Sync};
 use rustc_errors::FatalError;
 use rustc_macros::HashStable_Generic;
-use rustc_session::node_id::NodeMap;
 use rustc_span::source_map::{SourceMap, Spanned};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{MultiSpan, Span, DUMMY_SP};
 use rustc_target::spec::abi::Abi;
+
 use smallvec::SmallVec;
 use std::collections::{BTreeMap, BTreeSet};
 use std::fmt;
-use syntax::ast::{self, AsmDialect, CrateSugar, Ident, Name, NodeId};
-use syntax::ast::{AttrVec, Attribute, FloatTy, IntTy, Label, LitKind, StrStyle, UintTy};
-pub use syntax::ast::{BorrowKind, ImplPolarity, IsAuto};
-pub use syntax::ast::{CaptureBy, Constness, Movability, Mutability, Unsafety};
-use syntax::tokenstream::TokenStream;
-use syntax::util::parser::ExprPrecedence;
 
 #[derive(Copy, Clone, RustcEncodable, RustcDecodable, HashStable_Generic)]
 pub struct Lifetime {
@@ -297,6 +298,14 @@ impl GenericArg<'_> {
             _ => false,
         }
     }
+
+    pub fn descr(&self) -> &'static str {
+        match self {
+            GenericArg::Lifetime(_) => "lifetime",
+            GenericArg::Type(_) => "type",
+            GenericArg::Const(_) => "constant",
+        }
+    }
 }
 
 #[derive(RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
@@ -440,6 +449,16 @@ pub struct GenericParam<'hir> {
     pub kind: GenericParamKind<'hir>,
 }
 
+impl GenericParam<'hir> {
+    pub fn bounds_span(&self) -> Option<Span> {
+        self.bounds.iter().fold(None, |span, bound| {
+            let span = span.map(|s| s.to(bound.span())).unwrap_or_else(|| bound.span());
+
+            Some(span)
+        })
+    }
+}
+
 #[derive(Default)]
 pub struct GenericParamCount {
     pub lifetimes: usize,
@@ -512,7 +531,7 @@ pub enum SyntheticTyParamKind {
 #[derive(RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
 pub struct WhereClause<'hir> {
     pub predicates: &'hir [WherePredicate<'hir>],
-    // Only valid if predicates isn't empty.
+    // Only valid if predicates aren't empty.
     pub span: Span,
 }
 
@@ -624,6 +643,9 @@ pub struct Crate<'hir> {
     /// A list of modules written out in the order in which they
     /// appear in the crate. This includes the main crate module.
     pub modules: BTreeMap<HirId, ModuleItems>,
+    /// A list of proc macro HirIds, written out in the order in which
+    /// they are declared in the static array generated by proc_macro_harness.
+    pub proc_macros: Vec<HirId>,
 }
 
 impl Crate<'hir> {
@@ -657,15 +679,15 @@ impl Crate<'_> {
     where
         V: itemlikevisit::ItemLikeVisitor<'hir>,
     {
-        for (_, item) in &self.items {
+        for item in self.items.values() {
             visitor.visit_item(item);
         }
 
-        for (_, trait_item) in &self.trait_items {
+        for trait_item in self.trait_items.values() {
             visitor.visit_trait_item(trait_item);
         }
 
-        for (_, impl_item) in &self.impl_items {
+        for impl_item in self.impl_items.values() {
             visitor.visit_impl_item(impl_item);
         }
     }
@@ -1482,7 +1504,7 @@ pub fn is_range_literal(sm: &SourceMap, expr: &Expr<'_>) -> bool {
         let end_point = sm.end_point(*span);
 
         if let Ok(end_string) = sm.span_to_snippet(end_point) {
-            !(end_string.ends_with("}") || end_string.ends_with(")"))
+            !(end_string.ends_with('}') || end_string.ends_with(')'))
         } else {
             false
         }
@@ -1883,6 +1905,15 @@ pub enum ImplItemKind<'hir> {
     OpaqueTy(GenericBounds<'hir>),
 }
 
+impl ImplItemKind<'_> {
+    pub fn namespace(&self) -> Namespace {
+        match self {
+            ImplItemKind::OpaqueTy(..) | ImplItemKind::TyAlias(..) => Namespace::TypeNS,
+            ImplItemKind::Const(..) | ImplItemKind::Method(..) => Namespace::ValueNS,
+        }
+    }
+}
+
 // The name of the associated type for `Fn` return types.
 pub const FN_OUTPUT_NAME: Symbol = sym::Output;
 
@@ -1979,6 +2010,8 @@ pub enum OpaqueTyOrigin {
     FnReturn,
     /// `async fn`
     AsyncFn,
+    /// Impl trait in bindings, consts, statics, bounds.
+    Misc,
 }
 
 /// The various kinds of types recognized by the compiler.
@@ -2066,7 +2099,7 @@ pub struct FnDecl<'hir> {
     ///
     /// Additional argument data is stored in the function's [body](Body::parameters).
     pub inputs: &'hir [Ty<'hir>],
-    pub output: FunctionRetTy<'hir>,
+    pub output: FnRetTy<'hir>,
     pub c_variadic: bool,
     /// Does the function have an implicit self?
     pub implicit_self: ImplicitSelfKind,
@@ -2098,18 +2131,8 @@ impl ImplicitSelfKind {
     }
 }
 
-#[derive(
-    Copy,
-    Clone,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    HashStable_Generic,
-    Ord,
-    RustcEncodable,
-    RustcDecodable,
-    Debug
-)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, RustcEncodable, RustcDecodable, Debug)]
+#[derive(HashStable_Generic)]
 pub enum IsAsync {
     Async,
     NotAsync,
@@ -2142,7 +2165,7 @@ impl Defaultness {
 }
 
 #[derive(RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
-pub enum FunctionRetTy<'hir> {
+pub enum FnRetTy<'hir> {
     /// Return type is not specified.
     ///
     /// Functions default to `()` and
@@ -2153,7 +2176,7 @@ pub enum FunctionRetTy<'hir> {
     Return(&'hir Ty<'hir>),
 }
 
-impl fmt::Display for FunctionRetTy<'_> {
+impl fmt::Display for FnRetTy<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Return(ref ty) => print::to_string(print::NO_ANN, |s| s.print_type(ty)).fmt(f),
@@ -2162,7 +2185,7 @@ impl fmt::Display for FunctionRetTy<'_> {
     }
 }
 
-impl FunctionRetTy<'_> {
+impl FnRetTy<'_> {
     pub fn span(&self) -> Span {
         match *self {
             Self::DefaultReturn(span) => span,
@@ -2259,10 +2282,10 @@ impl TraitRef<'_> {
 
 #[derive(RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
 pub struct PolyTraitRef<'hir> {
-    /// The `'a` in `<'a> Foo<&'a T>`.
+    /// The `'a` in `for<'a> Foo<&'a T>`.
     pub bound_generic_params: &'hir [GenericParam<'hir>],
 
-    /// The `Foo<&'a T>` in `<'a> Foo<&'a T>`.
+    /// The `Foo<&'a T>` in `for<'a> Foo<&'a T>`.
     pub trait_ref: TraitRef<'hir>,
 
     pub span: Span,
@@ -2378,6 +2401,38 @@ pub struct Item<'hir> {
     pub span: Span,
 }
 
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(RustcEncodable, RustcDecodable, HashStable_Generic)]
+pub enum Unsafety {
+    Unsafe,
+    Normal,
+}
+
+impl Unsafety {
+    pub fn prefix_str(&self) -> &'static str {
+        match self {
+            Self::Unsafe => "unsafe ",
+            Self::Normal => "",
+        }
+    }
+}
+
+impl fmt::Display for Unsafety {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(match *self {
+            Self::Unsafe => "unsafe",
+            Self::Normal => "normal",
+        })
+    }
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
+#[derive(RustcEncodable, RustcDecodable, HashStable_Generic)]
+pub enum Constness {
+    Const,
+    NotConst,
+}
+
 #[derive(Copy, Clone, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
 pub struct FnHeader {
     pub unsafety: Unsafety,
@@ -2453,16 +2508,16 @@ pub enum ItemKind<'hir> {
 }
 
 impl ItemKind<'_> {
-    pub fn descriptive_variant(&self) -> &str {
+    pub fn descr(&self) -> &str {
         match *self {
             ItemKind::ExternCrate(..) => "extern crate",
-            ItemKind::Use(..) => "use",
+            ItemKind::Use(..) => "`use` import",
             ItemKind::Static(..) => "static item",
             ItemKind::Const(..) => "constant item",
             ItemKind::Fn(..) => "function",
             ItemKind::Mod(..) => "module",
-            ItemKind::ForeignMod(..) => "foreign module",
-            ItemKind::GlobalAsm(..) => "global asm",
+            ItemKind::ForeignMod(..) => "extern block",
+            ItemKind::GlobalAsm(..) => "global asm item",
             ItemKind::TyAlias(..) => "type alias",
             ItemKind::OpaqueTy(..) => "opaque type",
             ItemKind::Enum(..) => "enum",
@@ -2470,7 +2525,7 @@ impl ItemKind<'_> {
             ItemKind::Union(..) => "union",
             ItemKind::Trait(..) => "trait",
             ItemKind::TraitAlias(..) => "trait alias",
-            ItemKind::Impl { .. } => "impl",
+            ItemKind::Impl { .. } => "implementation",
         }
     }
 
@@ -2575,13 +2630,24 @@ pub type CaptureModeMap = NodeMap<CaptureBy>;
 // has length > 0 if the trait is found through an chain of imports, starting with the
 // import/use statement in the scope where the trait is used.
 #[derive(Clone, Debug)]
-pub struct TraitCandidate {
+pub struct TraitCandidate<ID = HirId> {
     pub def_id: DefId,
-    pub import_ids: SmallVec<[NodeId; 1]>,
+    pub import_ids: SmallVec<[ID; 1]>,
+}
+
+impl<ID> TraitCandidate<ID> {
+    pub fn map_import_ids<F, T>(self, f: F) -> TraitCandidate<T>
+    where
+        F: Fn(ID) -> T,
+    {
+        let TraitCandidate { def_id, import_ids } = self;
+        let import_ids = import_ids.into_iter().map(f).collect();
+        TraitCandidate { def_id, import_ids }
+    }
 }
 
 // Trait method resolution
-pub type TraitMap = NodeMap<Vec<TraitCandidate>>;
+pub type TraitMap<ID = HirId> = NodeMap<Vec<TraitCandidate<ID>>>;
 
 // Map from the NodeId of a glob import to a list of items which are actually
 // imported.
@@ -2630,4 +2696,25 @@ impl Node<'_> {
             _ => None,
         }
     }
+
+    pub fn fn_decl(&self) -> Option<&FnDecl<'_>> {
+        match self {
+            Node::TraitItem(TraitItem { kind: TraitItemKind::Method(fn_sig, _), .. })
+            | Node::ImplItem(ImplItem { kind: ImplItemKind::Method(fn_sig, _), .. })
+            | Node::Item(Item { kind: ItemKind::Fn(fn_sig, _, _), .. }) => Some(fn_sig.decl),
+            Node::ForeignItem(ForeignItem { kind: ForeignItemKind::Fn(fn_decl, _, _), .. }) => {
+                Some(fn_decl)
+            }
+            _ => None,
+        }
+    }
+
+    pub fn generics(&self) -> Option<&Generics<'_>> {
+        match self {
+            Node::TraitItem(TraitItem { generics, .. })
+            | Node::ImplItem(ImplItem { generics, .. })
+            | Node::Item(Item { kind: ItemKind::Fn(_, generics, _), .. }) => Some(generics),
+            _ => None,
+        }
+    }
 }
diff --git a/src/librustc_hir/intravisit.rs b/src/librustc_hir/intravisit.rs
index 539a0eee0e..45257b04d7 100644
--- a/src/librustc_hir/intravisit.rs
+++ b/src/librustc_hir/intravisit.rs
@@ -34,9 +34,9 @@
 use crate::hir::*;
 use crate::hir_id::CRATE_HIR_ID;
 use crate::itemlikevisit::{ItemLikeVisitor, ParItemLikeVisitor};
+use rustc_ast::ast::{Attribute, Ident, Label, Name};
+use rustc_ast::walk_list;
 use rustc_span::Span;
-use syntax::ast::{Attribute, Ident, Label, Name};
-use syntax::walk_list;
 
 pub struct DeepVisitor<'v, V> {
     visitor: &'v mut V,
@@ -865,8 +865,8 @@ pub fn walk_where_predicate<'v, V: Visitor<'v>>(
     }
 }
 
-pub fn walk_fn_ret_ty<'v, V: Visitor<'v>>(visitor: &mut V, ret_ty: &'v FunctionRetTy<'v>) {
-    if let FunctionRetTy::Return(ref output_ty) = *ret_ty {
+pub fn walk_fn_ret_ty<'v, V: Visitor<'v>>(visitor: &mut V, ret_ty: &'v FnRetTy<'v>) {
+    if let FnRetTy::Return(ref output_ty) = *ret_ty {
         visitor.visit_ty(output_ty)
     }
 }
diff --git a/src/librustc_hir/lang_items.rs b/src/librustc_hir/lang_items.rs
new file mode 100644
index 0000000000..fc91b68e3e
--- /dev/null
+++ b/src/librustc_hir/lang_items.rs
@@ -0,0 +1,261 @@
+//! Defines language items.
+//!
+//! Language items are items that represent concepts intrinsic to the language
+//! itself. Examples are:
+//!
+//! * Traits that specify "kinds"; e.g., `Sync`, `Send`.
+//! * Traits that represent operators; e.g., `Add`, `Sub`, `Index`.
+//! * Functions called by the compiler itself.
+
+pub use self::LangItem::*;
+
+use crate::def_id::DefId;
+use crate::Target;
+
+use rustc_ast::ast;
+use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
+use rustc_macros::HashStable_Generic;
+use rustc_span::symbol::{sym, Symbol};
+use rustc_span::Span;
+
+use lazy_static::lazy_static;
+
+// The actual lang items defined come at the end of this file in one handy table.
+// So you probably just want to nip down to the end.
+macro_rules! language_item_table {
+    (
+        $( $variant:ident, $name:expr, $method:ident, $target:path; )*
+    ) => {
+
+        enum_from_u32! {
+            /// A representation of all the valid language items in Rust.
+            #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable)]
+            pub enum LangItem {
+                $($variant,)*
+            }
+        }
+
+        impl LangItem {
+            /// Returns the `name` in `#[lang = "$name"]`.
+            /// For example, `LangItem::EqTraitLangItem`,
+            /// that is `#[lang = "eq"]` would result in `"eq"`.
+            pub fn name(self) -> &'static str {
+                match self {
+                    $( $variant => $name, )*
+                }
+            }
+        }
+
+        #[derive(HashStable_Generic)]
+        pub struct LanguageItems {
+            /// Mappings from lang items to their possibly found `DefId`s.
+            /// The index corresponds to the order in `LangItem`.
+            pub items: Vec<Option<DefId>>,
+            /// Lang items that were not found during collection.
+            pub missing: Vec<LangItem>,
+        }
+
+        impl LanguageItems {
+            /// Construct an empty collection of lang items and no missing ones.
+            pub fn new() -> Self {
+                fn init_none(_: LangItem) -> Option<DefId> { None }
+
+                Self {
+                    items: vec![$(init_none($variant)),*],
+                    missing: Vec::new(),
+                }
+            }
+
+            /// Returns the mappings to the possibly found `DefId`s for each lang item.
+            pub fn items(&self) -> &[Option<DefId>] {
+                &*self.items
+            }
+
+            /// Requires that a given `LangItem` was bound and returns the corresponding `DefId`.
+            /// If it wasn't bound, e.g. due to a missing `#[lang = "<it.name()>"]`,
+            /// returns an error message as a string.
+            pub fn require(&self, it: LangItem) -> Result<DefId, String> {
+                self.items[it as usize].ok_or_else(|| format!("requires `{}` lang_item", it.name()))
+            }
+
+            $(
+                /// Returns the corresponding `DefId` for the lang item
+                #[doc = $name]
+                /// if it exists.
+                #[allow(dead_code)]
+                pub fn $method(&self) -> Option<DefId> {
+                    self.items[$variant as usize]
+                }
+            )*
+        }
+
+        lazy_static! {
+            /// A mapping from the name of the lang item to its order and the form it must be of.
+            pub static ref ITEM_REFS: FxHashMap<&'static str, (usize, Target)> = {
+                let mut item_refs = FxHashMap::default();
+                $( item_refs.insert($name, ($variant as usize, $target)); )*
+                item_refs
+            };
+        }
+
+// End of the macro
+    }
+}
+
+impl<CTX> HashStable<CTX> for LangItem {
+    fn hash_stable(&self, _: &mut CTX, hasher: &mut StableHasher) {
+        ::std::hash::Hash::hash(self, hasher);
+    }
+}
+
+/// Extracts the first `lang = "$name"` out of a list of attributes.
+/// The attributes `#[panic_handler]` and `#[alloc_error_handler]`
+/// are also extracted out when found.
+pub fn extract(attrs: &[ast::Attribute]) -> Option<(Symbol, Span)> {
+    attrs.iter().find_map(|attr| {
+        Some(match attr {
+            _ if attr.check_name(sym::lang) => (attr.value_str()?, attr.span),
+            _ if attr.check_name(sym::panic_handler) => (sym::panic_impl, attr.span),
+            _ if attr.check_name(sym::alloc_error_handler) => (sym::oom, attr.span),
+            _ => return None,
+        })
+    })
+}
+
+language_item_table! {
+//  Variant name,                Name,                 Method name,             Target;
+    BoolImplItem,                "bool",               bool_impl,               Target::Impl;
+    CharImplItem,                "char",               char_impl,               Target::Impl;
+    StrImplItem,                 "str",                str_impl,                Target::Impl;
+    SliceImplItem,               "slice",              slice_impl,              Target::Impl;
+    SliceU8ImplItem,             "slice_u8",           slice_u8_impl,           Target::Impl;
+    StrAllocImplItem,            "str_alloc",          str_alloc_impl,          Target::Impl;
+    SliceAllocImplItem,          "slice_alloc",        slice_alloc_impl,        Target::Impl;
+    SliceU8AllocImplItem,        "slice_u8_alloc",     slice_u8_alloc_impl,     Target::Impl;
+    ConstPtrImplItem,            "const_ptr",          const_ptr_impl,          Target::Impl;
+    MutPtrImplItem,              "mut_ptr",            mut_ptr_impl,            Target::Impl;
+    I8ImplItem,                  "i8",                 i8_impl,                 Target::Impl;
+    I16ImplItem,                 "i16",                i16_impl,                Target::Impl;
+    I32ImplItem,                 "i32",                i32_impl,                Target::Impl;
+    I64ImplItem,                 "i64",                i64_impl,                Target::Impl;
+    I128ImplItem,                "i128",               i128_impl,               Target::Impl;
+    IsizeImplItem,               "isize",              isize_impl,              Target::Impl;
+    U8ImplItem,                  "u8",                 u8_impl,                 Target::Impl;
+    U16ImplItem,                 "u16",                u16_impl,                Target::Impl;
+    U32ImplItem,                 "u32",                u32_impl,                Target::Impl;
+    U64ImplItem,                 "u64",                u64_impl,                Target::Impl;
+    U128ImplItem,                "u128",               u128_impl,               Target::Impl;
+    UsizeImplItem,               "usize",              usize_impl,              Target::Impl;
+    F32ImplItem,                 "f32",                f32_impl,                Target::Impl;
+    F64ImplItem,                 "f64",                f64_impl,                Target::Impl;
+    F32RuntimeImplItem,          "f32_runtime",        f32_runtime_impl,        Target::Impl;
+    F64RuntimeImplItem,          "f64_runtime",        f64_runtime_impl,        Target::Impl;
+
+    SizedTraitLangItem,          "sized",              sized_trait,             Target::Trait;
+    UnsizeTraitLangItem,         "unsize",             unsize_trait,            Target::Trait;
+    // trait injected by #[derive(PartialEq)], (i.e. "Partial EQ").
+    StructuralPeqTraitLangItem,  "structural_peq",     structural_peq_trait,    Target::Trait;
+    // trait injected by #[derive(Eq)], (i.e. "Total EQ"; no, I will not apologize).
+    StructuralTeqTraitLangItem,  "structural_teq",     structural_teq_trait,    Target::Trait;
+    CopyTraitLangItem,           "copy",               copy_trait,              Target::Trait;
+    CloneTraitLangItem,          "clone",              clone_trait,             Target::Trait;
+    SyncTraitLangItem,           "sync",               sync_trait,              Target::Trait;
+    FreezeTraitLangItem,         "freeze",             freeze_trait,            Target::Trait;
+
+    DropTraitLangItem,           "drop",               drop_trait,              Target::Trait;
+
+    CoerceUnsizedTraitLangItem,  "coerce_unsized",     coerce_unsized_trait,    Target::Trait;
+    DispatchFromDynTraitLangItem,"dispatch_from_dyn",  dispatch_from_dyn_trait, Target::Trait;
+
+    AddTraitLangItem,            "add",                add_trait,               Target::Trait;
+    SubTraitLangItem,            "sub",                sub_trait,               Target::Trait;
+    MulTraitLangItem,            "mul",                mul_trait,               Target::Trait;
+    DivTraitLangItem,            "div",                div_trait,               Target::Trait;
+    RemTraitLangItem,            "rem",                rem_trait,               Target::Trait;
+    NegTraitLangItem,            "neg",                neg_trait,               Target::Trait;
+    NotTraitLangItem,            "not",                not_trait,               Target::Trait;
+    BitXorTraitLangItem,         "bitxor",             bitxor_trait,            Target::Trait;
+    BitAndTraitLangItem,         "bitand",             bitand_trait,            Target::Trait;
+    BitOrTraitLangItem,          "bitor",              bitor_trait,             Target::Trait;
+    ShlTraitLangItem,            "shl",                shl_trait,               Target::Trait;
+    ShrTraitLangItem,            "shr",                shr_trait,               Target::Trait;
+    AddAssignTraitLangItem,      "add_assign",         add_assign_trait,        Target::Trait;
+    SubAssignTraitLangItem,      "sub_assign",         sub_assign_trait,        Target::Trait;
+    MulAssignTraitLangItem,      "mul_assign",         mul_assign_trait,        Target::Trait;
+    DivAssignTraitLangItem,      "div_assign",         div_assign_trait,        Target::Trait;
+    RemAssignTraitLangItem,      "rem_assign",         rem_assign_trait,        Target::Trait;
+    BitXorAssignTraitLangItem,   "bitxor_assign",      bitxor_assign_trait,     Target::Trait;
+    BitAndAssignTraitLangItem,   "bitand_assign",      bitand_assign_trait,     Target::Trait;
+    BitOrAssignTraitLangItem,    "bitor_assign",       bitor_assign_trait,      Target::Trait;
+    ShlAssignTraitLangItem,      "shl_assign",         shl_assign_trait,        Target::Trait;
+    ShrAssignTraitLangItem,      "shr_assign",         shr_assign_trait,        Target::Trait;
+    IndexTraitLangItem,          "index",              index_trait,             Target::Trait;
+    IndexMutTraitLangItem,       "index_mut",          index_mut_trait,         Target::Trait;
+
+    UnsafeCellTypeLangItem,      "unsafe_cell",        unsafe_cell_type,        Target::Struct;
+    VaListTypeLangItem,          "va_list",            va_list,                 Target::Struct;
+
+    DerefTraitLangItem,          "deref",              deref_trait,             Target::Trait;
+    DerefMutTraitLangItem,       "deref_mut",          deref_mut_trait,         Target::Trait;
+    ReceiverTraitLangItem,       "receiver",           receiver_trait,          Target::Trait;
+
+    FnTraitLangItem,             "fn",                 fn_trait,                Target::Trait;
+    FnMutTraitLangItem,          "fn_mut",             fn_mut_trait,            Target::Trait;
+    FnOnceTraitLangItem,         "fn_once",            fn_once_trait,           Target::Trait;
+
+    FutureTraitLangItem,         "future_trait",       future_trait,            Target::Trait;
+    GeneratorStateLangItem,      "generator_state",    gen_state,               Target::Enum;
+    GeneratorTraitLangItem,      "generator",          gen_trait,               Target::Trait;
+    UnpinTraitLangItem,          "unpin",              unpin_trait,             Target::Trait;
+    PinTypeLangItem,             "pin",                pin_type,                Target::Struct;
+
+    // Don't be fooled by the naming here: this lang item denotes `PartialEq`, not `Eq`.
+    EqTraitLangItem,             "eq",                 eq_trait,                Target::Trait;
+    PartialOrdTraitLangItem,     "partial_ord",        partial_ord_trait,       Target::Trait;
+
+    // A number of panic-related lang items. The `panic` item corresponds to
+    // divide-by-zero and various panic cases with `match`. The
+    // `panic_bounds_check` item is for indexing arrays.
+    //
+    // The `begin_unwind` lang item has a predefined symbol name and is sort of
+    // a "weak lang item" in the sense that a crate is not required to have it
+    // defined to use it, but a final product is required to define it
+    // somewhere. Additionally, there are restrictions on crates that use a weak
+    // lang item, but do not have it defined.
+    PanicFnLangItem,             "panic",              panic_fn,                Target::Fn;
+    PanicBoundsCheckFnLangItem,  "panic_bounds_check", panic_bounds_check_fn,   Target::Fn;
+    PanicInfoLangItem,           "panic_info",         panic_info,              Target::Struct;
+    PanicLocationLangItem,       "panic_location",     panic_location,          Target::Struct;
+    PanicImplLangItem,           "panic_impl",         panic_impl,              Target::Fn;
+    // Libstd panic entry point. Necessary for const eval to be able to catch it
+    BeginPanicFnLangItem,        "begin_panic",        begin_panic_fn,          Target::Fn;
+
+    ExchangeMallocFnLangItem,    "exchange_malloc",    exchange_malloc_fn,      Target::Fn;
+    BoxFreeFnLangItem,           "box_free",           box_free_fn,             Target::Fn;
+    DropInPlaceFnLangItem,       "drop_in_place",      drop_in_place_fn,        Target::Fn;
+    OomLangItem,                 "oom",                oom,                     Target::Fn;
+    AllocLayoutLangItem,         "alloc_layout",       alloc_layout,            Target::Struct;
+
+    StartFnLangItem,             "start",              start_fn,                Target::Fn;
+
+    EhPersonalityLangItem,       "eh_personality",     eh_personality,          Target::Fn;
+    EhUnwindResumeLangItem,      "eh_unwind_resume",   eh_unwind_resume,        Target::Fn;
+    EhCatchTypeinfoLangItem,     "eh_catch_typeinfo",  eh_catch_typeinfo,       Target::Static;
+
+    OwnedBoxLangItem,            "owned_box",          owned_box,               Target::Struct;
+
+    PhantomDataItem,             "phantom_data",       phantom_data,            Target::Struct;
+
+    ManuallyDropItem,            "manually_drop",      manually_drop,           Target::Struct;
+
+    MaybeUninitLangItem,         "maybe_uninit",       maybe_uninit,            Target::Union;
+
+    // Align offset for stride != 1; must not panic.
+    AlignOffsetLangItem,         "align_offset",       align_offset_fn,         Target::Fn;
+
+    TerminationTraitLangItem,    "termination",        termination,             Target::Trait;
+
+    Arc,                         "arc",                arc,                     Target::Struct;
+    Rc,                          "rc",                 rc,                      Target::Struct;
+}
diff --git a/src/librustc_hir/lib.rs b/src/librustc_hir/lib.rs
index f54fa291bd..d958dfc681 100644
--- a/src/librustc_hir/lib.rs
+++ b/src/librustc_hir/lib.rs
@@ -12,14 +12,20 @@
 extern crate rustc_data_structures;
 
 pub mod def;
-pub mod def_id;
+pub use rustc_span::def_id;
 mod hir;
 pub mod hir_id;
 pub mod intravisit;
 pub mod itemlikevisit;
+pub mod lang_items;
 pub mod pat_util;
 pub mod print;
 mod stable_hash_impls;
+mod target;
+pub mod weak_lang_items;
+
 pub use hir::*;
 pub use hir_id::*;
+pub use lang_items::{LangItem, LanguageItems};
 pub use stable_hash_impls::HashStableContext;
+pub use target::{MethodKind, Target};
diff --git a/src/librustc_hir/pat_util.rs b/src/librustc_hir/pat_util.rs
index 6bca45b4f8..0b9ffdf21f 100644
--- a/src/librustc_hir/pat_util.rs
+++ b/src/librustc_hir/pat_util.rs
@@ -1,8 +1,8 @@
 use crate::def::{CtorOf, DefKind, Res};
 use crate::def_id::DefId;
 use crate::hir::{self, HirId, PatKind};
+use rustc_ast::ast;
 use rustc_span::Span;
-use syntax::ast;
 
 use std::iter::{Enumerate, ExactSizeIterator};
 
diff --git a/src/librustc_hir/print.rs b/src/librustc_hir/print.rs
index b9598c9376..8cbbef959c 100644
--- a/src/librustc_hir/print.rs
+++ b/src/librustc_hir/print.rs
@@ -1,13 +1,12 @@
+use rustc_ast::ast;
+use rustc_ast::util::parser::{self, AssocOp, Fixity};
+use rustc_ast_pretty::pp::Breaks::{Consistent, Inconsistent};
+use rustc_ast_pretty::pp::{self, Breaks};
+use rustc_ast_pretty::pprust::{Comments, PrintState};
 use rustc_span::source_map::{SourceMap, Spanned};
-use rustc_span::symbol::kw;
+use rustc_span::symbol::{kw, IdentPrinter};
 use rustc_span::{self, BytePos, FileName};
 use rustc_target::spec::abi::Abi;
-use syntax::ast;
-use syntax::print::pp::Breaks::{Consistent, Inconsistent};
-use syntax::print::pp::{self, Breaks};
-use syntax::print::pprust::{self, Comments, PrintState};
-use syntax::sess::ParseSess;
-use syntax::util::parser::{self, AssocOp, Fixity};
 
 use crate::hir;
 use crate::hir::{GenericArg, GenericParam, GenericParamKind, Node};
@@ -127,7 +126,7 @@ impl<'a> PrintState<'a> for State<'a> {
     }
 
     fn print_ident(&mut self, ident: ast::Ident) {
-        self.s.word(pprust::ast_ident_to_string(ident, ident.is_raw_guess()));
+        self.s.word(IdentPrinter::for_ast_ident(ident, ident.is_raw_guess()).to_string());
         self.ann.post(self, AnnNode::Name(&ident.name))
     }
 
@@ -141,14 +140,13 @@ pub const INDENT_UNIT: usize = 4;
 /// Requires you to pass an input filename and reader so that
 /// it can scan the input text for comments to copy forward.
 pub fn print_crate<'a>(
-    cm: &'a SourceMap,
-    sess: &ParseSess,
+    sm: &'a SourceMap,
     krate: &hir::Crate<'_>,
     filename: FileName,
     input: String,
     ann: &'a dyn PpAnn,
 ) -> String {
-    let mut s = State::new_from_input(cm, sess, filename, input, ann);
+    let mut s = State::new_from_input(sm, filename, input, ann);
 
     // When printing the AST, we sometimes need to inject `#[no_std]` here.
     // Since you can't compile the HIR, it's not necessary.
@@ -160,13 +158,12 @@ pub fn print_crate<'a>(
 
 impl<'a> State<'a> {
     pub fn new_from_input(
-        cm: &'a SourceMap,
-        sess: &ParseSess,
+        sm: &'a SourceMap,
         filename: FileName,
         input: String,
         ann: &'a dyn PpAnn,
     ) -> State<'a> {
-        State { s: pp::mk_printer(), comments: Some(Comments::new(cm, sess, filename, input)), ann }
+        State { s: pp::mk_printer(), comments: Some(Comments::new(sm, filename, input)), ann }
     }
 }
 
@@ -457,14 +454,17 @@ impl<'a> State<'a> {
     fn print_associated_type(
         &mut self,
         ident: ast::Ident,
+        generics: &hir::Generics<'_>,
         bounds: Option<hir::GenericBounds<'_>>,
         ty: Option<&hir::Ty<'_>>,
     ) {
         self.word_space("type");
         self.print_ident(ident);
+        self.print_generic_params(&generics.params);
         if let Some(bounds) = bounds {
             self.print_bounds(":", bounds);
         }
+        self.print_where_clause(&generics.where_clause);
         if let Some(ty) = ty {
             self.s.space();
             self.word_space("=");
@@ -648,7 +648,7 @@ impl<'a> State<'a> {
                     self.s.space();
                 }
 
-                if constness == ast::Constness::Const {
+                if constness == hir::Constness::Const {
                     self.word_nbsp("const");
                 }
 
@@ -905,6 +905,7 @@ impl<'a> State<'a> {
             hir::TraitItemKind::Type(ref bounds, ref default) => {
                 self.print_associated_type(
                     ti.ident,
+                    &ti.generics,
                     Some(bounds),
                     default.as_ref().map(|ty| &**ty),
                 );
@@ -933,7 +934,7 @@ impl<'a> State<'a> {
                 self.ann.nested(self, Nested::Body(body));
             }
             hir::ImplItemKind::TyAlias(ref ty) => {
-                self.print_associated_type(ii.ident, None, Some(ty));
+                self.print_associated_type(ii.ident, &ii.generics, None, Some(ty));
             }
             hir::ImplItemKind::OpaqueTy(bounds) => {
                 self.word_space("type");
diff --git a/src/librustc_hir/stable_hash_impls.rs b/src/librustc_hir/stable_hash_impls.rs
index 696a350ebd..3938a0369b 100644
--- a/src/librustc_hir/stable_hash_impls.rs
+++ b/src/librustc_hir/stable_hash_impls.rs
@@ -1,19 +1,17 @@
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 
-use crate::def_id::DefId;
 use crate::hir::{BodyId, Expr, ImplItemId, ItemId, Mod, TraitItemId, Ty, VisibilityKind};
 use crate::hir_id::HirId;
 
 /// Requirements for a `StableHashingContext` to be used in this crate.
 /// This is a hack to allow using the `HashStable_Generic` derive macro
 /// instead of implementing everything in librustc.
-pub trait HashStableContext: syntax::HashStableContext + rustc_target::HashStableContext {
-    fn hash_def_id(&mut self, _: DefId, hasher: &mut StableHasher);
+pub trait HashStableContext:
+    rustc_ast::HashStableContext + rustc_target::HashStableContext
+{
     fn hash_hir_id(&mut self, _: HirId, hasher: &mut StableHasher);
     fn hash_body_id(&mut self, _: BodyId, hasher: &mut StableHasher);
-    fn hash_item_id(&mut self, _: ItemId, hasher: &mut StableHasher);
-    fn hash_impl_item_id(&mut self, _: ImplItemId, hasher: &mut StableHasher);
-    fn hash_trait_item_id(&mut self, _: TraitItemId, hasher: &mut StableHasher);
+    fn hash_reference_to_item(&mut self, _: HirId, hasher: &mut StableHasher);
     fn hash_hir_mod(&mut self, _: &Mod<'_>, hasher: &mut StableHasher);
     fn hash_hir_expr(&mut self, _: &Expr<'_>, hasher: &mut StableHasher);
     fn hash_hir_ty(&mut self, _: &Ty<'_>, hasher: &mut StableHasher);
@@ -26,33 +24,34 @@ impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for HirId {
     }
 }
 
-impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for DefId {
-    fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
-        hcx.hash_def_id(*self, hasher)
-    }
-}
-
 impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for BodyId {
     fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
         hcx.hash_body_id(*self, hasher)
     }
 }
 
+// The following implementations of HashStable for `ItemId`, `TraitItemId`, and
+// `ImplItemId` deserve special attention. Normally we do not hash `NodeId`s within
+// the HIR, since they just signify a HIR nodes own path. But `ItemId` et al
+// are used when another item in the HIR is *referenced* and we certainly
+// want to pick up on a reference changing its target, so we hash the NodeIds
+// in "DefPath Mode".
+
 impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for ItemId {
     fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
-        hcx.hash_item_id(*self, hasher)
+        hcx.hash_reference_to_item(self.id, hasher)
     }
 }
 
 impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for ImplItemId {
     fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
-        hcx.hash_impl_item_id(*self, hasher)
+        hcx.hash_reference_to_item(self.hir_id, hasher)
     }
 }
 
 impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for TraitItemId {
     fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
-        hcx.hash_trait_item_id(*self, hasher)
+        hcx.hash_reference_to_item(self.hir_id, hasher)
     }
 }
 
diff --git a/src/librustc_hir/target.rs b/src/librustc_hir/target.rs
new file mode 100644
index 0000000000..501976fc3c
--- /dev/null
+++ b/src/librustc_hir/target.rs
@@ -0,0 +1,125 @@
+//! This module implements some validity checks for attributes.
+//! In particular it verifies that `#[inline]` and `#[repr]` attributes are
+//! attached to items that actually support them and if there are
+//! conflicts between multiple such attributes attached to the same
+//! item.
+
+use crate::hir;
+use crate::{Item, ItemKind, TraitItem, TraitItemKind};
+
+use std::fmt::{self, Display};
+
+#[derive(Copy, Clone, PartialEq)]
+pub enum MethodKind {
+    Trait { body: bool },
+    Inherent,
+}
+
+#[derive(Copy, Clone, PartialEq)]
+pub enum Target {
+    ExternCrate,
+    Use,
+    Static,
+    Const,
+    Fn,
+    Closure,
+    Mod,
+    ForeignMod,
+    GlobalAsm,
+    TyAlias,
+    OpaqueTy,
+    Enum,
+    Struct,
+    Union,
+    Trait,
+    TraitAlias,
+    Impl,
+    Expression,
+    Statement,
+    AssocConst,
+    Method(MethodKind),
+    AssocTy,
+    ForeignFn,
+    ForeignStatic,
+    ForeignTy,
+}
+
+impl Display for Target {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}",
+            match *self {
+                Target::ExternCrate => "extern crate",
+                Target::Use => "use",
+                Target::Static => "static item",
+                Target::Const => "constant item",
+                Target::Fn => "function",
+                Target::Closure => "closure",
+                Target::Mod => "module",
+                Target::ForeignMod => "foreign module",
+                Target::GlobalAsm => "global asm",
+                Target::TyAlias => "type alias",
+                Target::OpaqueTy => "opaque type",
+                Target::Enum => "enum",
+                Target::Struct => "struct",
+                Target::Union => "union",
+                Target::Trait => "trait",
+                Target::TraitAlias => "trait alias",
+                Target::Impl => "item",
+                Target::Expression => "expression",
+                Target::Statement => "statement",
+                Target::AssocConst => "associated const",
+                Target::Method(_) => "method",
+                Target::AssocTy => "associated type",
+                Target::ForeignFn => "foreign function",
+                Target::ForeignStatic => "foreign static item",
+                Target::ForeignTy => "foreign type",
+            }
+        )
+    }
+}
+
+impl Target {
+    pub fn from_item(item: &Item<'_>) -> Target {
+        match item.kind {
+            ItemKind::ExternCrate(..) => Target::ExternCrate,
+            ItemKind::Use(..) => Target::Use,
+            ItemKind::Static(..) => Target::Static,
+            ItemKind::Const(..) => Target::Const,
+            ItemKind::Fn(..) => Target::Fn,
+            ItemKind::Mod(..) => Target::Mod,
+            ItemKind::ForeignMod(..) => Target::ForeignMod,
+            ItemKind::GlobalAsm(..) => Target::GlobalAsm,
+            ItemKind::TyAlias(..) => Target::TyAlias,
+            ItemKind::OpaqueTy(..) => Target::OpaqueTy,
+            ItemKind::Enum(..) => Target::Enum,
+            ItemKind::Struct(..) => Target::Struct,
+            ItemKind::Union(..) => Target::Union,
+            ItemKind::Trait(..) => Target::Trait,
+            ItemKind::TraitAlias(..) => Target::TraitAlias,
+            ItemKind::Impl { .. } => Target::Impl,
+        }
+    }
+
+    pub fn from_trait_item(trait_item: &TraitItem<'_>) -> Target {
+        match trait_item.kind {
+            TraitItemKind::Const(..) => Target::AssocConst,
+            TraitItemKind::Method(_, hir::TraitMethod::Required(_)) => {
+                Target::Method(MethodKind::Trait { body: false })
+            }
+            TraitItemKind::Method(_, hir::TraitMethod::Provided(_)) => {
+                Target::Method(MethodKind::Trait { body: true })
+            }
+            TraitItemKind::Type(..) => Target::AssocTy,
+        }
+    }
+
+    pub fn from_foreign_item(foreign_item: &hir::ForeignItem<'_>) -> Target {
+        match foreign_item.kind {
+            hir::ForeignItemKind::Fn(..) => Target::ForeignFn,
+            hir::ForeignItemKind::Static(..) => Target::ForeignStatic,
+            hir::ForeignItemKind::Type => Target::ForeignTy,
+        }
+    }
+}
diff --git a/src/librustc_hir/weak_lang_items.rs b/src/librustc_hir/weak_lang_items.rs
new file mode 100644
index 0000000000..405a31d5a6
--- /dev/null
+++ b/src/librustc_hir/weak_lang_items.rs
@@ -0,0 +1,48 @@
+//! Validity checking for weak lang items
+
+use crate::def_id::DefId;
+use crate::{lang_items, LangItem, LanguageItems};
+
+use rustc_ast::ast;
+use rustc_data_structures::fx::FxHashMap;
+use rustc_span::symbol::{sym, Symbol};
+
+use lazy_static::lazy_static;
+
+macro_rules! weak_lang_items {
+    ($($name:ident, $item:ident, $sym:ident;)*) => (
+
+lazy_static! {
+    pub static ref WEAK_ITEMS_REFS: FxHashMap<Symbol, LangItem> = {
+        let mut map = FxHashMap::default();
+        $(map.insert(sym::$name, lang_items::$item);)*
+        map
+    };
+}
+
+pub fn link_name(attrs: &[ast::Attribute]) -> Option<Symbol> {
+    lang_items::extract(attrs).and_then(|(name, _)| {
+        $(if name == sym::$name {
+            Some(sym::$sym)
+        } else)* {
+            None
+        }
+    })
+}
+
+impl LanguageItems {
+    pub fn is_weak_lang_item(&self, item_def_id: DefId) -> bool {
+        let did = Some(item_def_id);
+
+        $(self.$name() == did)||*
+    }
+}
+
+) }
+
+weak_lang_items! {
+    panic_impl,         PanicImplLangItem,          rust_begin_unwind;
+    eh_personality,     EhPersonalityLangItem,      rust_eh_personality;
+    eh_unwind_resume,   EhUnwindResumeLangItem,     rust_eh_unwind_resume;
+    oom,                OomLangItem,                rust_oom;
+}
diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml
index 09b33a6c83..eddfb81ea8 100644
--- 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_fs_util = { path = "../librustc_fs_util" }
 rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_incremental/assert_dep_graph.rs b/src/librustc_incremental/assert_dep_graph.rs
index 9490128e32..c82ed0c2c4 100644
--- a/src/librustc_incremental/assert_dep_graph.rs
+++ b/src/librustc_incremental/assert_dep_graph.rs
@@ -38,6 +38,7 @@ use rustc::dep_graph::debug::{DepNodeFilter, EdgeFilter};
 use rustc::dep_graph::{DepGraphQuery, DepKind, DepNode};
 use rustc::hir::map::Map;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::graph::implementation::{Direction, NodeIndex, INCOMING, OUTGOING};
 use rustc_hir as hir;
@@ -45,11 +46,10 @@ use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast;
 
 use std::env;
 use std::fs::{self, File};
-use std::io::Write;
+use std::io::{BufWriter, Write};
 
 pub fn assert_dep_graph(tcx: TyCtxt<'_>) {
     tcx.dep_graph.with_ignore(|| {
@@ -235,7 +235,7 @@ fn dump_graph(tcx: TyCtxt<'_>) {
     {
         // dump a .txt file with just the edges:
         let txt_path = format!("{}.txt", path);
-        let mut file = File::create(&txt_path).unwrap();
+        let mut file = BufWriter::new(File::create(&txt_path).unwrap());
         for &(ref source, ref target) in &edges {
             write!(file, "{:?} -> {:?}\n", source, target).unwrap();
         }
diff --git a/src/librustc_incremental/assert_module_sources.rs b/src/librustc_incremental/assert_module_sources.rs
index 70abb38278..261540abca 100644
--- a/src/librustc_incremental/assert_module_sources.rs
+++ b/src/librustc_incremental/assert_module_sources.rs
@@ -23,11 +23,11 @@
 
 use rustc::mir::mono::CodegenUnitNameBuilder;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_session::cgu_reuse_tracker::*;
 use rustc_span::symbol::{sym, Symbol};
 use std::collections::BTreeSet;
-use syntax::ast;
 
 pub fn assert_module_sources(tcx: TyCtxt<'_>) {
     tcx.dep_graph.with_ignore(|| {
@@ -81,10 +81,7 @@ impl AssertModuleSource<'tcx> {
         if !self.tcx.sess.opts.debugging_opts.query_dep_graph {
             self.tcx.sess.span_fatal(
                 attr.span,
-                &format!(
-                    "found CGU-reuse attribute but `-Zquery-dep-graph` \
-                          was not specified"
-                ),
+                "found CGU-reuse attribute but `-Zquery-dep-graph` was not specified",
             );
         }
 
@@ -107,7 +104,7 @@ impl AssertModuleSource<'tcx> {
         }
 
         // Split of the "special suffix" if there is one.
-        let (user_path, cgu_special_suffix) = if let Some(index) = user_path.rfind(".") {
+        let (user_path, cgu_special_suffix) = if let Some(index) = user_path.rfind('.') {
             (&user_path[..index], Some(&user_path[index + 1..]))
         } else {
             (&user_path[..], None)
diff --git a/src/librustc_incremental/lib.rs b/src/librustc_incremental/lib.rs
index 7ce4def288..ca824fde7e 100644
--- a/src/librustc_incremental/lib.rs
+++ b/src/librustc_incremental/lib.rs
@@ -3,7 +3,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(in_band_lifetimes)]
 #![feature(nll)]
-#![feature(specialization)]
 #![recursion_limit = "256"]
 
 #[macro_use]
diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/src/librustc_incremental/persist/dirty_clean.rs
index c5e74868bd..e212dc8107 100644
--- a/src/librustc_incremental/persist/dirty_clean.rs
+++ b/src/librustc_incremental/persist/dirty_clean.rs
@@ -16,6 +16,7 @@
 use rustc::dep_graph::{label_strs, DepNode};
 use rustc::hir::map::Map;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast::{self, Attribute, NestedMetaItem};
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
@@ -28,7 +29,6 @@ use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use std::iter::FromIterator;
 use std::vec::Vec;
-use syntax::ast::{self, Attribute, NestedMetaItem};
 
 const EXCEPT: Symbol = sym::except;
 const LABEL: Symbol = sym::label;
@@ -78,7 +78,7 @@ const BASE_STRUCT: &[&str] =
 const BASE_TRAIT_DEF: &[&str] = &[
     label_strs::associated_item_def_ids,
     label_strs::generics_of,
-    label_strs::is_object_safe,
+    label_strs::object_safety_violations,
     label_strs::predicates_of,
     label_strs::specialization_graph_of,
     label_strs::trait_def,
@@ -168,7 +168,7 @@ pub fn check_dirty_clean_annotations(tcx: TyCtxt<'_>) {
 
         // Note that we cannot use the existing "unused attribute"-infrastructure
         // here, since that is running before codegen. This is also the reason why
-        // all codegen-specific attributes are `Whitelisted` in syntax::feature_gate.
+        // all codegen-specific attributes are `Whitelisted` in rustc_ast::feature_gate.
         all_attrs.report_unchecked_attrs(&dirty_clean_visitor.checked_attrs);
     })
 }
@@ -343,7 +343,8 @@ impl DirtyCleanVisitor<'tcx> {
                 &format!("clean/dirty auto-assertions not yet defined for {:?}", node),
             ),
         };
-        let labels = Labels::from_iter(labels.iter().flat_map(|s| s.iter().map(|l| l.to_string())));
+        let labels =
+            Labels::from_iter(labels.iter().flat_map(|s| s.iter().map(|l| (*l).to_string())));
         (name, labels)
     }
 
@@ -537,10 +538,7 @@ impl FindAllAttrs<'tcx> {
             if !checked_attrs.contains(&attr.id) {
                 self.tcx.sess.span_err(
                     attr.span,
-                    &format!(
-                        "found unchecked \
-                    `#[rustc_dirty]` / `#[rustc_clean]` attribute"
-                    ),
+                    "found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute",
                 );
             }
         }
diff --git a/src/librustc_incremental/persist/file_format.rs b/src/librustc_incremental/persist/file_format.rs
index 7534b7e9ef..5c72b049d9 100644
--- a/src/librustc_incremental/persist/file_format.rs
+++ b/src/librustc_incremental/persist/file_format.rs
@@ -90,8 +90,7 @@ pub fn read_file(
         let mut rustc_version_str_len = [0u8; 1];
         file.read_exact(&mut rustc_version_str_len)?;
         let rustc_version_str_len = rustc_version_str_len[0] as usize;
-        let mut buffer = Vec::with_capacity(rustc_version_str_len);
-        buffer.resize(rustc_version_str_len, 0);
+        let mut buffer = vec![0; rustc_version_str_len];
         file.read_exact(&mut buffer)?;
 
         if buffer != rustc_version().as_bytes() {
diff --git a/src/librustc_incremental/persist/fs.rs b/src/librustc_incremental/persist/fs.rs
index ba20006d73..8548ad392d 100644
--- a/src/librustc_incremental/persist/fs.rs
+++ b/src/librustc_incremental/persist/fs.rs
@@ -152,7 +152,7 @@ pub fn lock_file_path(session_dir: &Path) -> PathBuf {
     let directory_name = session_dir.file_name().unwrap().to_string_lossy();
     assert_no_characters_lost(&directory_name);
 
-    let dash_indices: Vec<_> = directory_name.match_indices("-").map(|(idx, _)| idx).collect();
+    let dash_indices: Vec<_> = directory_name.match_indices('-').map(|(idx, _)| idx).collect();
     if dash_indices.len() != 3 {
         bug!(
             "Encountered incremental compilation session directory with \
@@ -342,7 +342,7 @@ pub fn finalize_session_directory(sess: &Session, svh: Svh) {
 
     // Keep the 's-{timestamp}-{random-number}' prefix, but replace the
     // '-working' part with the SVH of the crate
-    let dash_indices: Vec<_> = old_sub_dir_name.match_indices("-").map(|(idx, _)| idx).collect();
+    let dash_indices: Vec<_> = old_sub_dir_name.match_indices('-').map(|(idx, _)| idx).collect();
     if dash_indices.len() != 3 {
         bug!(
             "Encountered incremental compilation session directory with \
@@ -594,7 +594,7 @@ fn extract_timestamp_from_session_dir(directory_name: &str) -> Result<SystemTime
         return Err(());
     }
 
-    let dash_indices: Vec<_> = directory_name.match_indices("-").map(|(idx, _)| idx).collect();
+    let dash_indices: Vec<_> = directory_name.match_indices('-').map(|(idx, _)| idx).collect();
     if dash_indices.len() != 3 {
         return Err(());
     }
diff --git a/src/librustc_incremental/persist/work_product.rs b/src/librustc_incremental/persist/work_product.rs
index 65a742a202..b1861acec0 100644
--- a/src/librustc_incremental/persist/work_product.rs
+++ b/src/librustc_incremental/persist/work_product.rs
@@ -13,9 +13,7 @@ pub fn copy_cgu_workproducts_to_incr_comp_cache_dir(
     files: &[(WorkProductFileKind, PathBuf)],
 ) -> Option<(WorkProductId, WorkProduct)> {
     debug!("copy_cgu_workproducts_to_incr_comp_cache_dir({:?},{:?})", cgu_name, files);
-    if sess.opts.incremental.is_none() {
-        return None;
-    }
+    sess.opts.incremental.as_ref()?;
 
     let saved_files = files
         .iter()
diff --git a/src/librustc_index/vec.rs b/src/librustc_index/vec.rs
index d14bafb44f..1dfe97238a 100644
--- a/src/librustc_index/vec.rs
+++ b/src/librustc_index/vec.rs
@@ -574,6 +574,14 @@ impl<I: Idx, T> IndexVec<I, T> {
         IndexVec { raw: vec![elem; n], _marker: PhantomData }
     }
 
+    /// Create an `IndexVec` with `n` elements, where the value of each
+    /// element is the result of `func(i)`
+    #[inline]
+    pub fn from_fn_n(func: impl FnMut(I) -> T, n: usize) -> Self {
+        let indices = (0..n).map(I::new);
+        Self::from_raw(indices.map(func).collect())
+    }
+
     #[inline]
     pub fn push(&mut self, d: T) -> I {
         let idx = I::new(self.len());
diff --git a/src/librustc_infer/Cargo.toml b/src/librustc_infer/Cargo.toml
new file mode 100644
index 0000000000..de99214901
--- /dev/null
+++ b/src/librustc_infer/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_infer"
+version = "0.0.0"
+edition = "2018"
+
+[lib]
+name = "rustc_infer"
+path = "lib.rs"
+doctest = false
+
+[dependencies]
+fmt_macros = { path = "../libfmt_macros" }
+graphviz = { path = "../libgraphviz" }
+log = { version = "0.4", features = ["release_max_level_info", "std"] }
+rustc_attr = { path = "../librustc_attr" }
+rustc = { path = "../librustc" }
+rustc_data_structures = { path = "../librustc_data_structures" }
+rustc_errors = { path = "../librustc_errors" }
+rustc_error_codes = { path = "../librustc_error_codes" }
+rustc_hir = { path = "../librustc_hir" }
+rustc_index = { path = "../librustc_index" }
+rustc_macros = { path = "../librustc_macros" }
+rustc_session = { path = "../librustc_session" }
+rustc_span = { path = "../librustc_span" }
+rustc_target = { path = "../librustc_target" }
+smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc/infer/at.rs b/src/librustc_infer/infer/at.rs
similarity index 98%
rename from src/librustc/infer/at.rs
rename to src/librustc_infer/infer/at.rs
index c58f1bd87b..04f5b03c0e 100644
--- a/src/librustc/infer/at.rs
+++ b/src/librustc_infer/infer/at.rs
@@ -27,8 +27,8 @@
 
 use super::*;
 
-use crate::ty::relate::{Relate, TypeRelation};
-use crate::ty::Const;
+use rustc::ty::relate::{Relate, TypeRelation};
+use rustc::ty::Const;
 
 pub struct At<'a, 'tcx> {
     pub infcx: &'a InferCtxt<'a, 'tcx>,
@@ -179,7 +179,7 @@ impl<'a, 'tcx> At<'a, 'tcx> {
         T: ToTrace<'tcx>,
     {
         let trace = ToTrace::to_trace(self.cause, a_is_expected, a, b);
-        Trace { at: self, trace: trace, a_is_expected }
+        Trace { at: self, trace, a_is_expected }
     }
 }
 
diff --git a/src/librustc/infer/canonical/canonicalizer.rs b/src/librustc_infer/infer/canonical/canonicalizer.rs
similarity index 95%
rename from src/librustc/infer/canonical/canonicalizer.rs
rename to src/librustc_infer/infer/canonical/canonicalizer.rs
index b720168f35..4d3f25290e 100644
--- a/src/librustc/infer/canonical/canonicalizer.rs
+++ b/src/librustc_infer/infer/canonical/canonicalizer.rs
@@ -10,10 +10,10 @@ use crate::infer::canonical::{
     OriginalQueryValues,
 };
 use crate::infer::InferCtxt;
-use crate::ty::flags::FlagComputation;
-use crate::ty::fold::{TypeFoldable, TypeFolder};
-use crate::ty::subst::GenericArg;
-use crate::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
+use rustc::ty::flags::FlagComputation;
+use rustc::ty::fold::{TypeFoldable, TypeFolder};
+use rustc::ty::subst::GenericArg;
+use rustc::ty::{self, BoundVar, InferConst, List, Ty, TyCtxt, TypeFlags};
 use std::sync::atomic::Ordering;
 
 use rustc_data_structures::fx::FxHashMap;
@@ -167,11 +167,17 @@ impl CanonicalizeRegionMode for CanonicalizeQueryResponse {
         r: ty::Region<'tcx>,
     ) -> ty::Region<'tcx> {
         match r {
-            ty::ReFree(_) | ty::ReEmpty | ty::ReErased | ty::ReStatic | ty::ReEarlyBound(..) => r,
+            ty::ReFree(_)
+            | ty::ReErased
+            | ty::ReStatic
+            | ty::ReEmpty(ty::UniverseIndex::ROOT)
+            | ty::ReEarlyBound(..) => r,
+
             ty::RePlaceholder(placeholder) => canonicalizer.canonical_var_for_region(
                 CanonicalVarInfo { kind: CanonicalVarKind::PlaceholderRegion(*placeholder) },
                 r,
             ),
+
             ty::ReVar(vid) => {
                 let universe = canonicalizer.region_var_universe(*vid);
                 canonicalizer.canonical_var_for_region(
@@ -179,6 +185,11 @@ impl CanonicalizeRegionMode for CanonicalizeQueryResponse {
                     r,
                 )
             }
+
+            ty::ReEmpty(ui) => {
+                bug!("canonicalizing 'empty in universe {:?}", ui) // FIXME
+            }
+
             _ => {
                 // Other than `'static` or `'empty`, the query
                 // response should be executing in a fully
@@ -213,7 +224,7 @@ impl CanonicalizeRegionMode for CanonicalizeUserTypeAnnotation {
         r: ty::Region<'tcx>,
     ) -> ty::Region<'tcx> {
         match r {
-            ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReErased | ty::ReEmpty | ty::ReStatic => r,
+            ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReErased | ty::ReStatic => r,
             ty::ReVar(_) => canonicalizer.canonical_var_for_region_in_root_universe(r),
             _ => {
                 // We only expect region names that the user can type.
@@ -306,7 +317,9 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
                 let r = self
                     .infcx
                     .unwrap()
-                    .borrow_region_constraints()
+                    .inner
+                    .borrow_mut()
+                    .unwrap_region_constraints()
                     .opportunistic_resolve_var(self.tcx, vid);
                 debug!(
                     "canonical: region var found with vid {:?}, \
@@ -320,8 +333,8 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
             | ty::ReEarlyBound(..)
             | ty::ReFree(_)
             | ty::ReScope(_)
+            | ty::ReEmpty(_)
             | ty::RePlaceholder(..)
-            | ty::ReEmpty
             | ty::ReErased => self.canonicalize_region_mode.canonicalize_free_region(self, r),
 
             ty::ReClosureBound(..) => {
@@ -344,10 +357,8 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
                     // `TyVar(vid)` is unresolved, track its universe index in the canonicalized
                     // result.
                     Err(mut ui) => {
-                        if !self.infcx.unwrap().tcx.sess.opts.debugging_opts.chalk {
-                            // FIXME: perf problem described in #55921.
-                            ui = ty::UniverseIndex::ROOT;
-                        }
+                        // FIXME: perf problem described in #55921.
+                        ui = ty::UniverseIndex::ROOT;
                         self.canonicalize_ty_var(
                             CanonicalVarInfo {
                                 kind: CanonicalVarKind::Ty(CanonicalTyVarKind::General(ui)),
@@ -434,10 +445,8 @@ impl<'cx, 'tcx> TypeFolder<'tcx> for Canonicalizer<'cx, 'tcx> {
                     // `ConstVar(vid)` is unresolved, track its universe index in the
                     // canonicalized result
                     Err(mut ui) => {
-                        if !self.infcx.unwrap().tcx.sess.opts.debugging_opts.chalk {
-                            // FIXME: perf problem described in #55921.
-                            ui = ty::UniverseIndex::ROOT;
-                        }
+                        // FIXME: perf problem described in #55921.
+                        ui = ty::UniverseIndex::ROOT;
                         return self.canonicalize_const_var(
                             CanonicalVarInfo { kind: CanonicalVarKind::Const(ui) },
                             ct,
@@ -610,7 +619,7 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> {
 
     /// Returns the universe in which `vid` is defined.
     fn region_var_universe(&self, vid: ty::RegionVid) -> ty::UniverseIndex {
-        self.infcx.unwrap().borrow_region_constraints().var_universe(vid)
+        self.infcx.unwrap().inner.borrow_mut().unwrap_region_constraints().var_universe(vid)
     }
 
     /// Creates a canonical variable (with the given `info`)
@@ -656,7 +665,7 @@ impl<'cx, 'tcx> Canonicalizer<'cx, 'tcx> {
         } else {
             let var = self.canonical_var(info, const_var.into());
             self.tcx().mk_const(ty::Const {
-                val: ty::ConstKind::Bound(self.binder_index, var.into()),
+                val: ty::ConstKind::Bound(self.binder_index, var),
                 ty: self.fold_ty(const_var.ty),
             })
         }
diff --git a/src/librustc_infer/infer/canonical/mod.rs b/src/librustc_infer/infer/canonical/mod.rs
new file mode 100644
index 0000000000..ba019a8cf0
--- /dev/null
+++ b/src/librustc_infer/infer/canonical/mod.rs
@@ -0,0 +1,163 @@
+//! **Canonicalization** is the key to constructing a query in the
+//! middle of type inference. Ordinarily, it is not possible to store
+//! types from type inference in query keys, because they contain
+//! references to inference variables whose lifetimes are too short
+//! and so forth. Canonicalizing a value T1 using `canonicalize_query`
+//! produces two things:
+//!
+//! - a value T2 where each unbound inference variable has been
+//!   replaced with a **canonical variable**;
+//! - a map M (of type `CanonicalVarValues`) from those canonical
+//!   variables back to the original.
+//!
+//! We can then do queries using T2. These will give back constraints
+//! on the canonical variables which can be translated, using the map
+//! M, into constraints in our source context. This process of
+//! translating the results back is done by the
+//! `instantiate_query_result` method.
+//!
+//! For a more detailed look at what is happening here, check
+//! out the [chapter in the rustc guide][c].
+//!
+//! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
+
+use crate::infer::{ConstVariableOrigin, ConstVariableOriginKind};
+use crate::infer::{InferCtxt, RegionVariableOrigin, TypeVariableOrigin, TypeVariableOriginKind};
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::subst::GenericArg;
+use rustc::ty::{self, BoundVar, List};
+use rustc_index::vec::IndexVec;
+use rustc_span::source_map::Span;
+
+pub use rustc::infer::canonical::*;
+use substitute::CanonicalExt;
+
+mod canonicalizer;
+pub mod query_response;
+mod substitute;
+
+impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
+    /// Creates a substitution S for the canonical value with fresh
+    /// inference variables and applies it to the canonical value.
+    /// Returns both the instantiated result *and* the substitution S.
+    ///
+    /// This is only meant to be invoked as part of constructing an
+    /// inference context at the start of a query (see
+    /// `InferCtxtBuilder::enter_with_canonical`). It basically
+    /// brings the canonical value "into scope" within your new infcx.
+    ///
+    /// At the end of processing, the substitution S (once
+    /// canonicalized) then represents the values that you computed
+    /// for each of the canonical inputs to your query.
+
+    pub fn instantiate_canonical_with_fresh_inference_vars<T>(
+        &self,
+        span: Span,
+        canonical: &Canonical<'tcx, T>,
+    ) -> (T, CanonicalVarValues<'tcx>)
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        // For each universe that is referred to in the incoming
+        // query, create a universe in our local inference context. In
+        // practice, as of this writing, all queries have no universes
+        // in them, so this code has no effect, but it is looking
+        // forward to the day when we *do* want to carry universes
+        // through into queries.
+        let universes: IndexVec<ty::UniverseIndex, _> = std::iter::once(ty::UniverseIndex::ROOT)
+            .chain((0..canonical.max_universe.as_u32()).map(|_| self.create_next_universe()))
+            .collect();
+
+        let canonical_inference_vars =
+            self.instantiate_canonical_vars(span, canonical.variables, |ui| universes[ui]);
+        let result = canonical.substitute(self.tcx, &canonical_inference_vars);
+        (result, canonical_inference_vars)
+    }
+
+    /// Given the "infos" about the canonical variables from some
+    /// canonical, creates fresh variables with the same
+    /// characteristics (see `instantiate_canonical_var` for
+    /// details). You can then use `substitute` to instantiate the
+    /// canonical variable with these inference variables.
+    fn instantiate_canonical_vars(
+        &self,
+        span: Span,
+        variables: &List<CanonicalVarInfo>,
+        universe_map: impl Fn(ty::UniverseIndex) -> ty::UniverseIndex,
+    ) -> CanonicalVarValues<'tcx> {
+        let var_values: IndexVec<BoundVar, GenericArg<'tcx>> = variables
+            .iter()
+            .map(|info| self.instantiate_canonical_var(span, *info, &universe_map))
+            .collect();
+
+        CanonicalVarValues { var_values }
+    }
+
+    /// Given the "info" about a canonical variable, creates a fresh
+    /// variable for it. If this is an existentially quantified
+    /// variable, then you'll get a new inference variable; if it is a
+    /// universally quantified variable, you get a placeholder.
+    fn instantiate_canonical_var(
+        &self,
+        span: Span,
+        cv_info: CanonicalVarInfo,
+        universe_map: impl Fn(ty::UniverseIndex) -> ty::UniverseIndex,
+    ) -> GenericArg<'tcx> {
+        match cv_info.kind {
+            CanonicalVarKind::Ty(ty_kind) => {
+                let ty = match ty_kind {
+                    CanonicalTyVarKind::General(ui) => self.next_ty_var_in_universe(
+                        TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span },
+                        universe_map(ui),
+                    ),
+
+                    CanonicalTyVarKind::Int => self.next_int_var(),
+
+                    CanonicalTyVarKind::Float => self.next_float_var(),
+                };
+                ty.into()
+            }
+
+            CanonicalVarKind::PlaceholderTy(ty::PlaceholderType { universe, name }) => {
+                let universe_mapped = universe_map(universe);
+                let placeholder_mapped = ty::PlaceholderType { universe: universe_mapped, name };
+                self.tcx.mk_ty(ty::Placeholder(placeholder_mapped)).into()
+            }
+
+            CanonicalVarKind::Region(ui) => self
+                .next_region_var_in_universe(
+                    RegionVariableOrigin::MiscVariable(span),
+                    universe_map(ui),
+                )
+                .into(),
+
+            CanonicalVarKind::PlaceholderRegion(ty::PlaceholderRegion { universe, name }) => {
+                let universe_mapped = universe_map(universe);
+                let placeholder_mapped = ty::PlaceholderRegion { universe: universe_mapped, name };
+                self.tcx.mk_region(ty::RePlaceholder(placeholder_mapped)).into()
+            }
+
+            CanonicalVarKind::Const(ui) => self
+                .next_const_var_in_universe(
+                    self.next_ty_var_in_universe(
+                        TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span },
+                        universe_map(ui),
+                    ),
+                    ConstVariableOrigin { kind: ConstVariableOriginKind::MiscVariable, span },
+                    universe_map(ui),
+                )
+                .into(),
+
+            CanonicalVarKind::PlaceholderConst(ty::PlaceholderConst { universe, name }) => {
+                let universe_mapped = universe_map(universe);
+                let placeholder_mapped = ty::PlaceholderConst { universe: universe_mapped, name };
+                self.tcx
+                    .mk_const(ty::Const {
+                        val: ty::ConstKind::Placeholder(placeholder_mapped),
+                        ty: self.tcx.types.err, // FIXME(const_generics)
+                    })
+                    .into()
+            }
+        }
+    }
+}
diff --git a/src/librustc/infer/canonical/query_response.rs b/src/librustc_infer/infer/canonical/query_response.rs
similarity index 89%
rename from src/librustc/infer/canonical/query_response.rs
rename to src/librustc_infer/infer/canonical/query_response.rs
index 012900f8af..966bd99787 100644
--- a/src/librustc/infer/canonical/query_response.rs
+++ b/src/librustc_infer/infer/canonical/query_response.rs
@@ -7,21 +7,22 @@
 //!
 //! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
 
-use crate::arena::ArenaAllocatable;
-use crate::infer::canonical::substitute::substitute_value;
+use crate::infer::canonical::substitute::{substitute_value, CanonicalExt};
 use crate::infer::canonical::{
     Canonical, CanonicalVarValues, CanonicalizedQueryResponse, Certainty, OriginalQueryValues,
     QueryOutlivesConstraint, QueryRegionConstraints, QueryResponse,
 };
+use crate::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
 use crate::infer::region_constraints::{Constraint, RegionConstraintData};
-use crate::infer::InferCtxtBuilder;
-use crate::infer::{InferCtxt, InferOk, InferResult};
+use crate::infer::{InferCtxt, InferCtxtBuilder, InferOk, InferResult, NLLRegionVariableOrigin};
 use crate::traits::query::{Fallible, NoSolution};
-use crate::traits::TraitEngine;
+use crate::traits::{DomainGoal, TraitEngine};
 use crate::traits::{Obligation, ObligationCause, PredicateObligation};
-use crate::ty::fold::TypeFoldable;
-use crate::ty::subst::{GenericArg, GenericArgKind};
-use crate::ty::{self, BoundVar, Ty, TyCtxt};
+use rustc::arena::ArenaAllocatable;
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::relate::TypeRelation;
+use rustc::ty::subst::{GenericArg, GenericArgKind};
+use rustc::ty::{self, BoundVar, Ty, TyCtxt};
 use rustc_data_structures::captures::Captures;
 use rustc_index::vec::Idx;
 use rustc_index::vec::IndexVec;
@@ -304,13 +305,31 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
                 }
 
                 (GenericArgKind::Type(v1), GenericArgKind::Type(v2)) => {
-                    let ok = self.at(cause, param_env).eq(v1, v2)?;
-                    obligations.extend(ok.into_obligations());
+                    TypeRelating::new(
+                        self,
+                        QueryTypeRelatingDelegate {
+                            infcx: self,
+                            param_env,
+                            cause,
+                            obligations: &mut obligations,
+                        },
+                        ty::Variance::Invariant,
+                    )
+                    .relate(&v1, &v2)?;
                 }
 
                 (GenericArgKind::Const(v1), GenericArgKind::Const(v2)) => {
-                    let ok = self.at(cause, param_env).eq(v1, v2)?;
-                    obligations.extend(ok.into_obligations());
+                    TypeRelating::new(
+                        self,
+                        QueryTypeRelatingDelegate {
+                            infcx: self,
+                            param_env,
+                            cause,
+                            obligations: &mut obligations,
+                        },
+                        ty::Variance::Invariant,
+                    )
+                    .relate(&v1, &v2)?;
                 }
 
                 _ => {
@@ -421,7 +440,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
         for _ in num_universes_in_query..num_universes_in_response {
             universe_map.push(self.create_next_universe());
         }
-        assert!(universe_map.len() >= 1); // always have the root universe
+        assert!(!universe_map.is_empty()); // always have the root universe
         assert_eq!(universe_map[ty::UniverseIndex::ROOT.as_usize()], ty::UniverseIndex::ROOT);
 
         // Every canonical query result includes values for each of
@@ -630,7 +649,7 @@ pub fn make_query_region_constraints<'tcx>(
     assert!(givens.is_empty());
 
     let outlives: Vec<_> = constraints
-        .into_iter()
+        .iter()
         .map(|(k, _)| match *k {
             // Swap regions because we are going from sub (<=) to outlives
             // (>=).
@@ -656,3 +675,55 @@ pub fn make_query_region_constraints<'tcx>(
 
     QueryRegionConstraints { outlives, member_constraints: member_constraints.clone() }
 }
+
+struct QueryTypeRelatingDelegate<'a, 'tcx> {
+    infcx: &'a InferCtxt<'a, 'tcx>,
+    obligations: &'a mut Vec<PredicateObligation<'tcx>>,
+    param_env: ty::ParamEnv<'tcx>,
+    cause: &'a ObligationCause<'tcx>,
+}
+
+impl<'tcx> TypeRelatingDelegate<'tcx> for QueryTypeRelatingDelegate<'_, 'tcx> {
+    fn create_next_universe(&mut self) -> ty::UniverseIndex {
+        self.infcx.create_next_universe()
+    }
+
+    fn next_existential_region_var(&mut self, from_forall: bool) -> ty::Region<'tcx> {
+        let origin = NLLRegionVariableOrigin::Existential { from_forall };
+        self.infcx.next_nll_region_var(origin)
+    }
+
+    fn next_placeholder_region(&mut self, placeholder: ty::PlaceholderRegion) -> ty::Region<'tcx> {
+        self.infcx.tcx.mk_region(ty::RePlaceholder(placeholder))
+    }
+
+    fn generalize_existential(&mut self, universe: ty::UniverseIndex) -> ty::Region<'tcx> {
+        self.infcx.next_nll_region_var_in_universe(
+            NLLRegionVariableOrigin::Existential { from_forall: false },
+            universe,
+        )
+    }
+
+    fn push_outlives(&mut self, sup: ty::Region<'tcx>, sub: ty::Region<'tcx>) {
+        self.obligations.push(Obligation {
+            cause: self.cause.clone(),
+            param_env: self.param_env,
+            predicate: ty::Predicate::RegionOutlives(ty::Binder::dummy(ty::OutlivesPredicate(
+                sup, sub,
+            ))),
+            recursion_depth: 0,
+        });
+    }
+
+    fn push_domain_goal(&mut self, _: DomainGoal<'tcx>) {
+        bug!("should never be invoked with eager normalization")
+    }
+
+    fn normalization() -> NormalizationStrategy {
+        NormalizationStrategy::Eager
+    }
+
+    fn forbid_inference_vars() -> bool {
+        true
+    }
+}
diff --git a/src/librustc/infer/canonical/substitute.rs b/src/librustc_infer/infer/canonical/substitute.rs
similarity index 78%
rename from src/librustc/infer/canonical/substitute.rs
rename to src/librustc_infer/infer/canonical/substitute.rs
index 9251634563..99ddedfe88 100644
--- a/src/librustc/infer/canonical/substitute.rs
+++ b/src/librustc_infer/infer/canonical/substitute.rs
@@ -7,19 +7,16 @@
 //! [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
 
 use crate::infer::canonical::{Canonical, CanonicalVarValues};
-use crate::ty::fold::TypeFoldable;
-use crate::ty::subst::GenericArgKind;
-use crate::ty::{self, TyCtxt};
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::subst::GenericArgKind;
+use rustc::ty::{self, TyCtxt};
 
-impl<'tcx, V> Canonical<'tcx, V> {
+pub(super) trait CanonicalExt<'tcx, V> {
     /// Instantiate the wrapped value, replacing each canonical value
     /// with the value given in `var_values`.
-    pub fn substitute(&self, tcx: TyCtxt<'tcx>, var_values: &CanonicalVarValues<'tcx>) -> V
+    fn substitute(&self, tcx: TyCtxt<'tcx>, var_values: &CanonicalVarValues<'tcx>) -> V
     where
-        V: TypeFoldable<'tcx>,
-    {
-        self.substitute_projected(tcx, var_values, |value| value)
-    }
+        V: TypeFoldable<'tcx>;
 
     /// Allows one to apply a substitute to some subset of
     /// `self.value`. Invoke `projection_fn` with `self.value` to get
@@ -27,7 +24,25 @@ impl<'tcx, V> Canonical<'tcx, V> {
     /// variables bound in `self` (usually this extracts from subset
     /// of `self`). Apply the substitution `var_values` to this value
     /// V, replacing each of the canonical variables.
-    pub fn substitute_projected<T>(
+    fn substitute_projected<T>(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        var_values: &CanonicalVarValues<'tcx>,
+        projection_fn: impl FnOnce(&V) -> &T,
+    ) -> T
+    where
+        T: TypeFoldable<'tcx>;
+}
+
+impl<'tcx, V> CanonicalExt<'tcx, V> for Canonical<'tcx, V> {
+    fn substitute(&self, tcx: TyCtxt<'tcx>, var_values: &CanonicalVarValues<'tcx>) -> V
+    where
+        V: TypeFoldable<'tcx>,
+    {
+        self.substitute_projected(tcx, var_values, |value| value)
+    }
+
+    fn substitute_projected<T>(
         &self,
         tcx: TyCtxt<'tcx>,
         var_values: &CanonicalVarValues<'tcx>,
diff --git a/src/librustc/infer/combine.rs b/src/librustc_infer/infer/combine.rs
similarity index 92%
rename from src/librustc/infer/combine.rs
rename to src/librustc_infer/infer/combine.rs
index 5d765a2a3d..9d06e26d9b 100644
--- a/src/librustc/infer/combine.rs
+++ b/src/librustc_infer/infer/combine.rs
@@ -33,15 +33,15 @@ use super::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
 use super::{InferCtxt, MiscVariable, TypeTrace};
 
 use crate::traits::{Obligation, PredicateObligations};
-use crate::ty::error::TypeError;
-use crate::ty::relate::{self, Relate, RelateResult, TypeRelation};
-use crate::ty::subst::SubstsRef;
-use crate::ty::{self, InferConst, Ty, TyCtxt};
-use crate::ty::{IntType, UintType};
 
+use rustc::ty::error::TypeError;
+use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
+use rustc::ty::subst::SubstsRef;
+use rustc::ty::{self, InferConst, Ty, TyCtxt};
+use rustc::ty::{IntType, UintType};
+use rustc_ast::ast;
 use rustc_hir::def_id::DefId;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast;
 
 #[derive(Clone)]
 pub struct CombineFields<'infcx, 'tcx> {
@@ -74,8 +74,9 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
         match (&a.kind, &b.kind) {
             // Relate integral variables to other types
             (&ty::Infer(ty::IntVar(a_id)), &ty::Infer(ty::IntVar(b_id))) => {
-                self.int_unification_table
+                self.inner
                     .borrow_mut()
+                    .int_unification_table
                     .unify_var_var(a_id, b_id)
                     .map_err(|e| int_unification_error(a_is_expected, e))?;
                 Ok(a)
@@ -95,8 +96,9 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
 
             // Relate floating-point variables to other types
             (&ty::Infer(ty::FloatVar(a_id)), &ty::Infer(ty::FloatVar(b_id))) => {
-                self.float_unification_table
+                self.inner
                     .borrow_mut()
+                    .float_unification_table
                     .unify_var_var(a_id, b_id)
                     .map_err(|e| float_unification_error(relation.a_is_expected(), e))?;
                 Ok(a)
@@ -131,8 +133,8 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
             return Ok(a);
         }
 
-        let a = replace_if_possible(self.const_unification_table.borrow_mut(), a);
-        let b = replace_if_possible(self.const_unification_table.borrow_mut(), b);
+        let a = replace_if_possible(&mut self.inner.borrow_mut().const_unification_table, a);
+        let b = replace_if_possible(&mut self.inner.borrow_mut().const_unification_table, b);
 
         let a_is_expected = relation.a_is_expected();
 
@@ -141,8 +143,9 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
                 ty::ConstKind::Infer(InferConst::Var(a_vid)),
                 ty::ConstKind::Infer(InferConst::Var(b_vid)),
             ) => {
-                self.const_unification_table
+                self.inner
                     .borrow_mut()
+                    .const_unification_table
                     .unify_var_var(a_vid, b_vid)
                     .map_err(|e| const_unification_error(a_is_expected, e))?;
                 return Ok(a);
@@ -174,8 +177,9 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
         vid: ty::ConstVid<'tcx>,
         value: &'tcx ty::Const<'tcx>,
     ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
-        self.const_unification_table
+        self.inner
             .borrow_mut()
+            .const_unification_table
             .unify_var_value(
                 vid,
                 ConstVarValue {
@@ -196,8 +200,9 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
         vid: ty::IntVid,
         val: ty::IntVarValue,
     ) -> RelateResult<'tcx, Ty<'tcx>> {
-        self.int_unification_table
+        self.inner
             .borrow_mut()
+            .int_unification_table
             .unify_var_value(vid, Some(val))
             .map_err(|e| int_unification_error(vid_is_expected, e))?;
         match val {
@@ -212,8 +217,9 @@ impl<'infcx, 'tcx> InferCtxt<'infcx, 'tcx> {
         vid: ty::FloatVid,
         val: ast::FloatTy,
     ) -> RelateResult<'tcx, Ty<'tcx>> {
-        self.float_unification_table
+        self.inner
             .borrow_mut()
+            .float_unification_table
             .unify_var_value(vid, Some(ty::FloatVarValue(val)))
             .map_err(|e| float_unification_error(vid_is_expected, e))?;
         Ok(self.tcx.mk_mach_float(val))
@@ -260,7 +266,7 @@ impl<'infcx, 'tcx> CombineFields<'infcx, 'tcx> {
         use self::RelationDir::*;
 
         // Get the actual variable that b_vid has been inferred to
-        debug_assert!(self.infcx.type_variables.borrow_mut().probe(b_vid).is_unknown());
+        debug_assert!(self.infcx.inner.borrow_mut().type_variables.probe(b_vid).is_unknown());
 
         debug!("instantiate(a_ty={:?} dir={:?} b_vid={:?})", a_ty, dir, b_vid);
 
@@ -280,7 +286,7 @@ impl<'infcx, 'tcx> CombineFields<'infcx, 'tcx> {
             "instantiate(a_ty={:?}, dir={:?}, b_vid={:?}, generalized b_ty={:?})",
             a_ty, dir, b_vid, b_ty
         );
-        self.infcx.type_variables.borrow_mut().instantiate(b_vid, b_ty);
+        self.infcx.inner.borrow_mut().type_variables.instantiate(b_vid, b_ty);
 
         if needs_wf {
             self.obligations.push(Obligation::new(
@@ -338,7 +344,7 @@ impl<'infcx, 'tcx> CombineFields<'infcx, 'tcx> {
 
         debug!("generalize: ambient_variance = {:?}", ambient_variance);
 
-        let for_universe = match self.infcx.type_variables.borrow_mut().probe(for_vid) {
+        let for_universe = match self.infcx.inner.borrow_mut().type_variables.probe(for_vid) {
             v @ TypeVariableValue::Known { .. } => {
                 panic!("instantiating {:?} which has a known value {:?}", for_vid, v,)
             }
@@ -350,7 +356,7 @@ impl<'infcx, 'tcx> CombineFields<'infcx, 'tcx> {
         let mut generalize = Generalizer {
             infcx: self.infcx,
             span: self.trace.cause.span,
-            for_vid_sub_root: self.infcx.type_variables.borrow_mut().sub_root_var(for_vid),
+            for_vid_sub_root: self.infcx.inner.borrow_mut().type_variables.sub_root_var(for_vid),
             for_universe,
             ambient_variance,
             needs_wf: false,
@@ -502,17 +508,16 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
         // us from creating infinitely sized types.
         match t.kind {
             ty::Infer(ty::TyVar(vid)) => {
-                let mut variables = self.infcx.type_variables.borrow_mut();
-                let vid = variables.root_var(vid);
-                let sub_vid = variables.sub_root_var(vid);
+                let vid = self.infcx.inner.borrow_mut().type_variables.root_var(vid);
+                let sub_vid = self.infcx.inner.borrow_mut().type_variables.sub_root_var(vid);
                 if sub_vid == self.for_vid_sub_root {
                     // If sub-roots are equal, then `for_vid` and
                     // `vid` are related via subtyping.
                     Err(TypeError::CyclicTy(self.root_ty))
                 } else {
-                    match variables.probe(vid) {
+                    let probe = self.infcx.inner.borrow_mut().type_variables.probe(vid);
+                    match probe {
                         TypeVariableValue::Known { value: u } => {
-                            drop(variables);
                             debug!("generalize: known value {:?}", u);
                             self.relate(&u, &u)
                         }
@@ -536,8 +541,13 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
                                 ty::Covariant | ty::Contravariant => (),
                             }
 
-                            let origin = *variables.var_origin(vid);
-                            let new_var_id = variables.new_var(self.for_universe, false, origin);
+                            let origin =
+                                *self.infcx.inner.borrow_mut().type_variables.var_origin(vid);
+                            let new_var_id = self.infcx.inner.borrow_mut().type_variables.new_var(
+                                self.for_universe,
+                                false,
+                                origin,
+                            );
                             let u = self.tcx().mk_ty_var(new_var_id);
                             debug!("generalize: replacing original vid={:?} with new={:?}", vid, u);
                             Ok(u)
@@ -577,7 +587,7 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
 
             ty::RePlaceholder(..)
             | ty::ReVar(..)
-            | ty::ReEmpty
+            | ty::ReEmpty(_)
             | ty::ReStatic
             | ty::ReScope(..)
             | ty::ReEarlyBound(..)
@@ -612,7 +622,7 @@ impl TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
 
         match c.val {
             ty::ConstKind::Infer(InferConst::Var(vid)) => {
-                let mut variable_table = self.infcx.const_unification_table.borrow_mut();
+                let variable_table = &mut self.infcx.inner.borrow_mut().const_unification_table;
                 let var_value = variable_table.probe_value(vid);
                 match var_value.val {
                     ConstVariableValue::Known { value: u } => self.relate(&u, &u),
diff --git a/src/librustc/infer/equate.rs b/src/librustc_infer/infer/equate.rs
similarity index 76%
rename from src/librustc/infer/equate.rs
rename to src/librustc_infer/infer/equate.rs
index 4a41cdb140..bb0c124a18 100644
--- a/src/librustc/infer/equate.rs
+++ b/src/librustc_infer/infer/equate.rs
@@ -1,10 +1,10 @@
 use super::combine::{CombineFields, RelationDir};
 use super::Subtype;
 
-use crate::ty::relate::{self, Relate, RelateResult, TypeRelation};
-use crate::ty::subst::SubstsRef;
-use crate::ty::TyVar;
-use crate::ty::{self, Ty, TyCtxt};
+use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
+use rustc::ty::subst::SubstsRef;
+use rustc::ty::TyVar;
+use rustc::ty::{self, Ty, TyCtxt};
 
 use rustc_hir::def_id::DefId;
 
@@ -19,7 +19,7 @@ impl<'combine, 'infcx, 'tcx> Equate<'combine, 'infcx, 'tcx> {
         fields: &'combine mut CombineFields<'infcx, 'tcx>,
         a_is_expected: bool,
     ) -> Equate<'combine, 'infcx, 'tcx> {
-        Equate { fields: fields, a_is_expected: a_is_expected }
+        Equate { fields, a_is_expected }
     }
 }
 
@@ -72,14 +72,14 @@ impl TypeRelation<'tcx> for Equate<'combine, 'infcx, 'tcx> {
         }
 
         let infcx = self.fields.infcx;
-        let a = infcx.type_variables.borrow_mut().replace_if_possible(a);
-        let b = infcx.type_variables.borrow_mut().replace_if_possible(b);
+        let a = infcx.inner.borrow_mut().type_variables.replace_if_possible(a);
+        let b = infcx.inner.borrow_mut().type_variables.replace_if_possible(b);
 
         debug!("{}.tys: replacements ({:?}, {:?})", self.tag(), a, b);
 
         match (&a.kind, &b.kind) {
             (&ty::Infer(TyVar(a_id)), &ty::Infer(TyVar(b_id))) => {
-                infcx.type_variables.borrow_mut().equate(a_id, b_id);
+                infcx.inner.borrow_mut().type_variables.equate(a_id, b_id);
             }
 
             (&ty::Infer(TyVar(a_id)), _) => {
@@ -105,7 +105,12 @@ impl TypeRelation<'tcx> for Equate<'combine, 'infcx, 'tcx> {
     ) -> RelateResult<'tcx, ty::Region<'tcx>> {
         debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
         let origin = Subtype(box self.fields.trace.clone());
-        self.fields.infcx.borrow_region_constraints().make_eqregion(origin, a, b);
+        self.fields
+            .infcx
+            .inner
+            .borrow_mut()
+            .unwrap_region_constraints()
+            .make_eqregion(origin, a, b);
         Ok(a)
     }
 
@@ -125,7 +130,13 @@ impl TypeRelation<'tcx> for Equate<'combine, 'infcx, 'tcx> {
     where
         T: Relate<'tcx>,
     {
-        self.fields.higher_ranked_sub(a, b, self.a_is_expected)?;
-        self.fields.higher_ranked_sub(b, a, self.a_is_expected)
+        if a.skip_binder().has_escaping_bound_vars() || b.skip_binder().has_escaping_bound_vars() {
+            self.fields.higher_ranked_sub(a, b, self.a_is_expected)?;
+            self.fields.higher_ranked_sub(b, a, self.a_is_expected)
+        } else {
+            // Fast path for the common case.
+            self.relate(a.skip_binder(), b.skip_binder())?;
+            return Ok(a.clone());
+        }
     }
 }
diff --git a/src/librustc_infer/infer/error_reporting/mod.rs b/src/librustc_infer/infer/error_reporting/mod.rs
new file mode 100644
index 0000000000..40b493de9f
--- /dev/null
+++ b/src/librustc_infer/infer/error_reporting/mod.rs
@@ -0,0 +1,2106 @@
+//! Error Reporting Code for the inference engine
+//!
+//! Because of the way inference, and in particular region inference,
+//! works, it often happens that errors are not detected until far after
+//! the relevant line of code has been type-checked. Therefore, there is
+//! an elaborate system to track why a particular constraint in the
+//! inference graph arose so that we can explain to the user what gave
+//! rise to a particular error.
+//!
+//! The basis of the system are the "origin" types. An "origin" is the
+//! reason that a constraint or inference variable arose. There are
+//! different "origin" enums for different kinds of constraints/variables
+//! (e.g., `TypeOrigin`, `RegionVariableOrigin`). An origin always has
+//! a span, but also more information so that we can generate a meaningful
+//! error message.
+//!
+//! Having a catalog of all the different reasons an error can arise is
+//! also useful for other reasons, like cross-referencing FAQs etc, though
+//! we are not really taking advantage of this yet.
+//!
+//! # Region Inference
+//!
+//! Region inference is particularly tricky because it always succeeds "in
+//! the moment" and simply registers a constraint. Then, at the end, we
+//! can compute the full graph and report errors, so we need to be able to
+//! store and later report what gave rise to the conflicting constraints.
+//!
+//! # Subtype Trace
+//!
+//! Determining whether `T1 <: T2` often involves a number of subtypes and
+//! subconstraints along the way. A "TypeTrace" is an extended version
+//! of an origin that traces the types and other values that were being
+//! compared. It is not necessarily comprehensive (in fact, at the time of
+//! this writing it only tracks the root values being compared) but I'd
+//! like to extend it to include significant "waypoints". For example, if
+//! you are comparing `(T1, T2) <: (T3, T4)`, and the problem is that `T2
+//! <: T4` fails, I'd like the trace to include enough information to say
+//! "in the 2nd element of the tuple". Similarly, failures when comparing
+//! arguments or return types in fn types should be able to cite the
+//! specific position, etc.
+//!
+//! # Reality vs plan
+//!
+//! Of course, there is still a LOT of code in typeck that has yet to be
+//! ported to this system, and which relies on string concatenation at the
+//! time of error detection.
+
+use super::lexical_region_resolve::RegionResolutionError;
+use super::region_constraints::GenericKind;
+use super::{InferCtxt, RegionVariableOrigin, SubregionOrigin, TypeTrace, ValuePairs};
+
+use crate::infer::opaque_types;
+use crate::infer::{self, SuppressRegionErrors};
+use crate::traits::error_reporting::report_object_safety_error;
+use crate::traits::{
+    IfExpressionCause, MatchExpressionArmCause, ObligationCause, ObligationCauseCode,
+};
+
+use rustc::hir::map;
+use rustc::middle::region;
+use rustc::ty::error::TypeError;
+use rustc::ty::{
+    self,
+    subst::{Subst, SubstsRef},
+    Region, Ty, TyCtxt, TypeFoldable,
+};
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_errors::{pluralize, struct_span_err};
+use rustc_errors::{Applicability, DiagnosticBuilder, DiagnosticStyledString};
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_hir::Node;
+use rustc_span::{DesugaringKind, Pos, Span};
+use rustc_target::spec::abi;
+use std::{cmp, fmt};
+
+mod note;
+
+mod need_type_info;
+pub use need_type_info::TypeAnnotationNeeded;
+
+pub mod nice_region_error;
+
+pub(super) fn note_and_explain_region(
+    tcx: TyCtxt<'tcx>,
+    region_scope_tree: &region::ScopeTree,
+    err: &mut DiagnosticBuilder<'_>,
+    prefix: &str,
+    region: ty::Region<'tcx>,
+    suffix: &str,
+) {
+    let (description, span) = match *region {
+        ty::ReScope(scope) => {
+            let new_string;
+            let unknown_scope =
+                || format!("{}unknown scope: {:?}{}.  Please report a bug.", prefix, scope, suffix);
+            let span = scope.span(tcx, region_scope_tree);
+            let tag = match tcx.hir().find(scope.hir_id(region_scope_tree)) {
+                Some(Node::Block(_)) => "block",
+                Some(Node::Expr(expr)) => match expr.kind {
+                    hir::ExprKind::Call(..) => "call",
+                    hir::ExprKind::MethodCall(..) => "method call",
+                    hir::ExprKind::Match(.., hir::MatchSource::IfLetDesugar { .. }) => "if let",
+                    hir::ExprKind::Match(.., hir::MatchSource::WhileLetDesugar) => "while let",
+                    hir::ExprKind::Match(.., hir::MatchSource::ForLoopDesugar) => "for",
+                    hir::ExprKind::Match(..) => "match",
+                    _ => "expression",
+                },
+                Some(Node::Stmt(_)) => "statement",
+                Some(Node::Item(it)) => item_scope_tag(&it),
+                Some(Node::TraitItem(it)) => trait_item_scope_tag(&it),
+                Some(Node::ImplItem(it)) => impl_item_scope_tag(&it),
+                Some(_) | None => {
+                    err.span_note(span, &unknown_scope());
+                    return;
+                }
+            };
+            let scope_decorated_tag = match scope.data {
+                region::ScopeData::Node => tag,
+                region::ScopeData::CallSite => "scope of call-site for function",
+                region::ScopeData::Arguments => "scope of function body",
+                region::ScopeData::Destruction => {
+                    new_string = format!("destruction scope surrounding {}", tag);
+                    &new_string[..]
+                }
+                region::ScopeData::Remainder(first_statement_index) => {
+                    new_string = format!(
+                        "block suffix following statement {}",
+                        first_statement_index.index()
+                    );
+                    &new_string[..]
+                }
+            };
+            explain_span(tcx, scope_decorated_tag, span)
+        }
+
+        ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReStatic => {
+            msg_span_from_free_region(tcx, region)
+        }
+
+        ty::ReEmpty(ty::UniverseIndex::ROOT) => ("the empty lifetime".to_owned(), None),
+
+        // uh oh, hope no user ever sees THIS
+        ty::ReEmpty(ui) => (format!("the empty lifetime in universe {:?}", ui), None),
+
+        ty::RePlaceholder(_) => ("any other region".to_string(), None),
+
+        // FIXME(#13998) RePlaceholder should probably print like
+        // ReFree rather than dumping Debug output on the user.
+        //
+        // We shouldn't really be having unification failures with ReVar
+        // and ReLateBound though.
+        ty::ReVar(_) | ty::ReLateBound(..) | ty::ReErased => {
+            (format!("lifetime {:?}", region), None)
+        }
+
+        // We shouldn't encounter an error message with ReClosureBound.
+        ty::ReClosureBound(..) => {
+            bug!("encountered unexpected ReClosureBound: {:?}", region,);
+        }
+    };
+
+    emit_msg_span(err, prefix, description, span, suffix);
+}
+
+pub(super) fn note_and_explain_free_region(
+    tcx: TyCtxt<'tcx>,
+    err: &mut DiagnosticBuilder<'_>,
+    prefix: &str,
+    region: ty::Region<'tcx>,
+    suffix: &str,
+) {
+    let (description, span) = msg_span_from_free_region(tcx, region);
+
+    emit_msg_span(err, prefix, description, span, suffix);
+}
+
+fn msg_span_from_free_region(
+    tcx: TyCtxt<'tcx>,
+    region: ty::Region<'tcx>,
+) -> (String, Option<Span>) {
+    match *region {
+        ty::ReEarlyBound(_) | ty::ReFree(_) => {
+            msg_span_from_early_bound_and_free_regions(tcx, region)
+        }
+        ty::ReStatic => ("the static lifetime".to_owned(), None),
+        ty::ReEmpty(ty::UniverseIndex::ROOT) => ("an empty lifetime".to_owned(), None),
+        ty::ReEmpty(ui) => (format!("an empty lifetime in universe {:?}", ui), None),
+        _ => bug!("{:?}", region),
+    }
+}
+
+fn msg_span_from_early_bound_and_free_regions(
+    tcx: TyCtxt<'tcx>,
+    region: ty::Region<'tcx>,
+) -> (String, Option<Span>) {
+    let sm = tcx.sess.source_map();
+
+    let scope = region.free_region_binding_scope(tcx);
+    let node = tcx.hir().as_local_hir_id(scope).unwrap_or(hir::DUMMY_HIR_ID);
+    let tag = match tcx.hir().find(node) {
+        Some(Node::Block(_)) | Some(Node::Expr(_)) => "body",
+        Some(Node::Item(it)) => item_scope_tag(&it),
+        Some(Node::TraitItem(it)) => trait_item_scope_tag(&it),
+        Some(Node::ImplItem(it)) => impl_item_scope_tag(&it),
+        _ => unreachable!(),
+    };
+    let (prefix, span) = match *region {
+        ty::ReEarlyBound(ref br) => {
+            let mut sp = sm.def_span(tcx.hir().span(node));
+            if let Some(param) =
+                tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(br.name))
+            {
+                sp = param.span;
+            }
+            (format!("the lifetime `{}` as defined on", br.name), sp)
+        }
+        ty::ReFree(ty::FreeRegion { bound_region: ty::BoundRegion::BrNamed(_, name), .. }) => {
+            let mut sp = sm.def_span(tcx.hir().span(node));
+            if let Some(param) =
+                tcx.hir().get_generics(scope).and_then(|generics| generics.get_named(name))
+            {
+                sp = param.span;
+            }
+            (format!("the lifetime `{}` as defined on", name), sp)
+        }
+        ty::ReFree(ref fr) => match fr.bound_region {
+            ty::BrAnon(idx) => {
+                (format!("the anonymous lifetime #{} defined on", idx + 1), tcx.hir().span(node))
+            }
+            _ => (
+                format!("the lifetime `{}` as defined on", region),
+                sm.def_span(tcx.hir().span(node)),
+            ),
+        },
+        _ => bug!(),
+    };
+    let (msg, opt_span) = explain_span(tcx, tag, span);
+    (format!("{} {}", prefix, msg), opt_span)
+}
+
+fn emit_msg_span(
+    err: &mut DiagnosticBuilder<'_>,
+    prefix: &str,
+    description: String,
+    span: Option<Span>,
+    suffix: &str,
+) {
+    let message = format!("{}{}{}", prefix, description, suffix);
+
+    if let Some(span) = span {
+        err.span_note(span, &message);
+    } else {
+        err.note(&message);
+    }
+}
+
+fn item_scope_tag(item: &hir::Item<'_>) -> &'static str {
+    match item.kind {
+        hir::ItemKind::Impl { .. } => "impl",
+        hir::ItemKind::Struct(..) => "struct",
+        hir::ItemKind::Union(..) => "union",
+        hir::ItemKind::Enum(..) => "enum",
+        hir::ItemKind::Trait(..) => "trait",
+        hir::ItemKind::Fn(..) => "function body",
+        _ => "item",
+    }
+}
+
+fn trait_item_scope_tag(item: &hir::TraitItem<'_>) -> &'static str {
+    match item.kind {
+        hir::TraitItemKind::Method(..) => "method body",
+        hir::TraitItemKind::Const(..) | hir::TraitItemKind::Type(..) => "associated item",
+    }
+}
+
+fn impl_item_scope_tag(item: &hir::ImplItem<'_>) -> &'static str {
+    match item.kind {
+        hir::ImplItemKind::Method(..) => "method body",
+        hir::ImplItemKind::Const(..)
+        | hir::ImplItemKind::OpaqueTy(..)
+        | hir::ImplItemKind::TyAlias(..) => "associated item",
+    }
+}
+
+fn explain_span(tcx: TyCtxt<'tcx>, heading: &str, span: Span) -> (String, Option<Span>) {
+    let lo = tcx.sess.source_map().lookup_char_pos(span.lo());
+    (format!("the {} at {}:{}", heading, lo.line, lo.col.to_usize() + 1), Some(span))
+}
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    pub fn report_region_errors(
+        &self,
+        region_scope_tree: &region::ScopeTree,
+        errors: &Vec<RegionResolutionError<'tcx>>,
+        suppress: SuppressRegionErrors,
+    ) {
+        debug!(
+            "report_region_errors(): {} errors to start, suppress = {:?}",
+            errors.len(),
+            suppress
+        );
+
+        if suppress.suppressed() {
+            return;
+        }
+
+        // try to pre-process the errors, which will group some of them
+        // together into a `ProcessedErrors` group:
+        let errors = self.process_errors(errors);
+
+        debug!("report_region_errors: {} errors after preprocessing", errors.len());
+
+        for error in errors {
+            debug!("report_region_errors: error = {:?}", error);
+
+            if !self.try_report_nice_region_error(&error) {
+                match error.clone() {
+                    // These errors could indicate all manner of different
+                    // problems with many different solutions. Rather
+                    // than generate a "one size fits all" error, what we
+                    // attempt to do is go through a number of specific
+                    // scenarios and try to find the best way to present
+                    // the error. If all of these fails, we fall back to a rather
+                    // general bit of code that displays the error information
+                    RegionResolutionError::ConcreteFailure(origin, sub, sup) => {
+                        if sub.is_placeholder() || sup.is_placeholder() {
+                            self.report_placeholder_failure(region_scope_tree, origin, sub, sup)
+                                .emit();
+                        } else {
+                            self.report_concrete_failure(region_scope_tree, origin, sub, sup)
+                                .emit();
+                        }
+                    }
+
+                    RegionResolutionError::GenericBoundFailure(origin, param_ty, sub) => {
+                        self.report_generic_bound_failure(
+                            region_scope_tree,
+                            origin.span(),
+                            Some(origin),
+                            param_ty,
+                            sub,
+                        );
+                    }
+
+                    RegionResolutionError::SubSupConflict(
+                        _,
+                        var_origin,
+                        sub_origin,
+                        sub_r,
+                        sup_origin,
+                        sup_r,
+                    ) => {
+                        if sub_r.is_placeholder() {
+                            self.report_placeholder_failure(
+                                region_scope_tree,
+                                sub_origin,
+                                sub_r,
+                                sup_r,
+                            )
+                            .emit();
+                        } else if sup_r.is_placeholder() {
+                            self.report_placeholder_failure(
+                                region_scope_tree,
+                                sup_origin,
+                                sub_r,
+                                sup_r,
+                            )
+                            .emit();
+                        } else {
+                            self.report_sub_sup_conflict(
+                                region_scope_tree,
+                                var_origin,
+                                sub_origin,
+                                sub_r,
+                                sup_origin,
+                                sup_r,
+                            );
+                        }
+                    }
+
+                    RegionResolutionError::UpperBoundUniverseConflict(
+                        _,
+                        _,
+                        var_universe,
+                        sup_origin,
+                        sup_r,
+                    ) => {
+                        assert!(sup_r.is_placeholder());
+
+                        // Make a dummy value for the "sub region" --
+                        // this is the initial value of the
+                        // placeholder. In practice, we expect more
+                        // tailored errors that don't really use this
+                        // value.
+                        let sub_r = self.tcx.mk_region(ty::ReEmpty(var_universe));
+
+                        self.report_placeholder_failure(
+                            region_scope_tree,
+                            sup_origin,
+                            sub_r,
+                            sup_r,
+                        )
+                        .emit();
+                    }
+
+                    RegionResolutionError::MemberConstraintFailure {
+                        hidden_ty,
+                        member_region,
+                        span,
+                    } => {
+                        let hidden_ty = self.resolve_vars_if_possible(&hidden_ty);
+                        opaque_types::unexpected_hidden_region_diagnostic(
+                            self.tcx,
+                            Some(region_scope_tree),
+                            span,
+                            hidden_ty,
+                            member_region,
+                        )
+                        .emit();
+                    }
+                }
+            }
+        }
+    }
+
+    // This method goes through all the errors and try to group certain types
+    // of error together, for the purpose of suggesting explicit lifetime
+    // parameters to the user. This is done so that we can have a more
+    // complete view of what lifetimes should be the same.
+    // If the return value is an empty vector, it means that processing
+    // failed (so the return value of this method should not be used).
+    //
+    // The method also attempts to weed out messages that seem like
+    // duplicates that will be unhelpful to the end-user. But
+    // obviously it never weeds out ALL errors.
+    fn process_errors(
+        &self,
+        errors: &Vec<RegionResolutionError<'tcx>>,
+    ) -> Vec<RegionResolutionError<'tcx>> {
+        debug!("process_errors()");
+
+        // We want to avoid reporting generic-bound failures if we can
+        // avoid it: these have a very high rate of being unhelpful in
+        // practice. This is because they are basically secondary
+        // checks that test the state of the region graph after the
+        // rest of inference is done, and the other kinds of errors
+        // indicate that the region constraint graph is internally
+        // inconsistent, so these test results are likely to be
+        // meaningless.
+        //
+        // Therefore, we filter them out of the list unless they are
+        // the only thing in the list.
+
+        let is_bound_failure = |e: &RegionResolutionError<'tcx>| match *e {
+            RegionResolutionError::GenericBoundFailure(..) => true,
+            RegionResolutionError::ConcreteFailure(..)
+            | RegionResolutionError::SubSupConflict(..)
+            | RegionResolutionError::UpperBoundUniverseConflict(..)
+            | RegionResolutionError::MemberConstraintFailure { .. } => false,
+        };
+
+        let mut errors = if errors.iter().all(|e| is_bound_failure(e)) {
+            errors.clone()
+        } else {
+            errors.iter().filter(|&e| !is_bound_failure(e)).cloned().collect()
+        };
+
+        // sort the errors by span, for better error message stability.
+        errors.sort_by_key(|u| match *u {
+            RegionResolutionError::ConcreteFailure(ref sro, _, _) => sro.span(),
+            RegionResolutionError::GenericBoundFailure(ref sro, _, _) => sro.span(),
+            RegionResolutionError::SubSupConflict(_, ref rvo, _, _, _, _) => rvo.span(),
+            RegionResolutionError::UpperBoundUniverseConflict(_, ref rvo, _, _, _) => rvo.span(),
+            RegionResolutionError::MemberConstraintFailure { span, .. } => span,
+        });
+        errors
+    }
+
+    /// Adds a note if the types come from similarly named crates
+    fn check_and_note_conflicting_crates(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        terr: &TypeError<'tcx>,
+    ) {
+        use hir::def_id::CrateNum;
+        use map::DisambiguatedDefPathData;
+        use ty::print::Printer;
+        use ty::subst::GenericArg;
+
+        struct AbsolutePathPrinter<'tcx> {
+            tcx: TyCtxt<'tcx>,
+        }
+
+        struct NonTrivialPath;
+
+        impl<'tcx> Printer<'tcx> for AbsolutePathPrinter<'tcx> {
+            type Error = NonTrivialPath;
+
+            type Path = Vec<String>;
+            type Region = !;
+            type Type = !;
+            type DynExistential = !;
+            type Const = !;
+
+            fn tcx<'a>(&'a self) -> TyCtxt<'tcx> {
+                self.tcx
+            }
+
+            fn print_region(self, _region: ty::Region<'_>) -> Result<Self::Region, Self::Error> {
+                Err(NonTrivialPath)
+            }
+
+            fn print_type(self, _ty: Ty<'tcx>) -> Result<Self::Type, Self::Error> {
+                Err(NonTrivialPath)
+            }
+
+            fn print_dyn_existential(
+                self,
+                _predicates: &'tcx ty::List<ty::ExistentialPredicate<'tcx>>,
+            ) -> Result<Self::DynExistential, Self::Error> {
+                Err(NonTrivialPath)
+            }
+
+            fn print_const(self, _ct: &'tcx ty::Const<'tcx>) -> Result<Self::Const, Self::Error> {
+                Err(NonTrivialPath)
+            }
+
+            fn path_crate(self, cnum: CrateNum) -> Result<Self::Path, Self::Error> {
+                Ok(vec![self.tcx.original_crate_name(cnum).to_string()])
+            }
+            fn path_qualified(
+                self,
+                _self_ty: Ty<'tcx>,
+                _trait_ref: Option<ty::TraitRef<'tcx>>,
+            ) -> Result<Self::Path, Self::Error> {
+                Err(NonTrivialPath)
+            }
+
+            fn path_append_impl(
+                self,
+                _print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
+                _disambiguated_data: &DisambiguatedDefPathData,
+                _self_ty: Ty<'tcx>,
+                _trait_ref: Option<ty::TraitRef<'tcx>>,
+            ) -> Result<Self::Path, Self::Error> {
+                Err(NonTrivialPath)
+            }
+            fn path_append(
+                self,
+                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
+                disambiguated_data: &DisambiguatedDefPathData,
+            ) -> Result<Self::Path, Self::Error> {
+                let mut path = print_prefix(self)?;
+                path.push(disambiguated_data.data.as_symbol().to_string());
+                Ok(path)
+            }
+            fn path_generic_args(
+                self,
+                print_prefix: impl FnOnce(Self) -> Result<Self::Path, Self::Error>,
+                _args: &[GenericArg<'tcx>],
+            ) -> Result<Self::Path, Self::Error> {
+                print_prefix(self)
+            }
+        }
+
+        let report_path_match = |err: &mut DiagnosticBuilder<'_>, did1: DefId, did2: DefId| {
+            // Only external crates, if either is from a local
+            // module we could have false positives
+            if !(did1.is_local() || did2.is_local()) && did1.krate != did2.krate {
+                let abs_path =
+                    |def_id| AbsolutePathPrinter { tcx: self.tcx }.print_def_path(def_id, &[]);
+
+                // We compare strings because DefPath can be different
+                // for imported and non-imported crates
+                let same_path = || -> Result<_, NonTrivialPath> {
+                    Ok(self.tcx.def_path_str(did1) == self.tcx.def_path_str(did2)
+                        || abs_path(did1)? == abs_path(did2)?)
+                };
+                if same_path().unwrap_or(false) {
+                    let crate_name = self.tcx.crate_name(did1.krate);
+                    err.note(&format!(
+                        "perhaps two different versions of crate `{}` are being used?",
+                        crate_name
+                    ));
+                }
+            }
+        };
+        match *terr {
+            TypeError::Sorts(ref exp_found) => {
+                // if they are both "path types", there's a chance of ambiguity
+                // due to different versions of the same crate
+                if let (&ty::Adt(exp_adt, _), &ty::Adt(found_adt, _)) =
+                    (&exp_found.expected.kind, &exp_found.found.kind)
+                {
+                    report_path_match(err, exp_adt.did, found_adt.did);
+                }
+            }
+            TypeError::Traits(ref exp_found) => {
+                report_path_match(err, exp_found.expected, exp_found.found);
+            }
+            _ => (), // FIXME(#22750) handle traits and stuff
+        }
+    }
+
+    fn note_error_origin(
+        &self,
+        err: &mut DiagnosticBuilder<'tcx>,
+        cause: &ObligationCause<'tcx>,
+        exp_found: Option<ty::error::ExpectedFound<Ty<'tcx>>>,
+    ) {
+        match cause.code {
+            ObligationCauseCode::Pattern { origin_expr: true, span: Some(span), root_ty } => {
+                let ty = self.resolve_vars_if_possible(&root_ty);
+                if ty.is_suggestable() {
+                    // don't show type `_`
+                    err.span_label(span, format!("this expression has type `{}`", ty));
+                }
+                if let Some(ty::error::ExpectedFound { found, .. }) = exp_found {
+                    if ty.is_box() && ty.boxed_ty() == found {
+                        if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
+                            err.span_suggestion(
+                                span,
+                                "consider dereferencing the boxed value",
+                                format!("*{}", snippet),
+                                Applicability::MachineApplicable,
+                            );
+                        }
+                    }
+                }
+            }
+            ObligationCauseCode::Pattern { origin_expr: false, span: Some(span), .. } => {
+                err.span_label(span, "expected due to this");
+            }
+            ObligationCauseCode::MatchExpressionArm(box MatchExpressionArmCause {
+                source,
+                ref prior_arms,
+                last_ty,
+                scrut_hir_id,
+                ..
+            }) => match source {
+                hir::MatchSource::IfLetDesugar { .. } => {
+                    let msg = "`if let` arms have incompatible types";
+                    err.span_label(cause.span, msg);
+                }
+                hir::MatchSource::TryDesugar => {
+                    if let Some(ty::error::ExpectedFound { expected, .. }) = exp_found {
+                        let scrut_expr = self.tcx.hir().expect_expr(scrut_hir_id);
+                        let scrut_ty = if let hir::ExprKind::Call(_, args) = &scrut_expr.kind {
+                            let arg_expr = args.first().expect("try desugaring call w/out arg");
+                            self.in_progress_tables
+                                .and_then(|tables| tables.borrow().expr_ty_opt(arg_expr))
+                        } else {
+                            bug!("try desugaring w/out call expr as scrutinee");
+                        };
+
+                        match scrut_ty {
+                            Some(ty) if expected == ty => {
+                                let source_map = self.tcx.sess.source_map();
+                                err.span_suggestion(
+                                    source_map.end_point(cause.span),
+                                    "try removing this `?`",
+                                    "".to_string(),
+                                    Applicability::MachineApplicable,
+                                );
+                            }
+                            _ => {}
+                        }
+                    }
+                }
+                _ => {
+                    // `last_ty` can be `!`, `expected` will have better info when present.
+                    let t = self.resolve_vars_if_possible(&match exp_found {
+                        Some(ty::error::ExpectedFound { expected, .. }) => expected,
+                        _ => last_ty,
+                    });
+                    let msg = "`match` arms have incompatible types";
+                    err.span_label(cause.span, msg);
+                    if prior_arms.len() <= 4 {
+                        for sp in prior_arms {
+                            err.span_label(*sp, format!("this is found to be of type `{}`", t));
+                        }
+                    } else if let Some(sp) = prior_arms.last() {
+                        err.span_label(
+                            *sp,
+                            format!("this and all prior arms are found to be of type `{}`", t),
+                        );
+                    }
+                }
+            },
+            ObligationCauseCode::IfExpression(box IfExpressionCause { then, outer, semicolon }) => {
+                err.span_label(then, "expected because of this");
+                outer.map(|sp| err.span_label(sp, "`if` and `else` have incompatible types"));
+                if let Some(sp) = semicolon {
+                    err.span_suggestion_short(
+                        sp,
+                        "consider removing this semicolon",
+                        String::new(),
+                        Applicability::MachineApplicable,
+                    );
+                }
+            }
+            _ => (),
+        }
+    }
+
+    /// Given that `other_ty` is the same as a type argument for `name` in `sub`, populate `value`
+    /// highlighting `name` and every type argument that isn't at `pos` (which is `other_ty`), and
+    /// populate `other_value` with `other_ty`.
+    ///
+    /// ```text
+    /// Foo<Bar<Qux>>
+    /// ^^^^--------^ this is highlighted
+    /// |   |
+    /// |   this type argument is exactly the same as the other type, not highlighted
+    /// this is highlighted
+    /// Bar<Qux>
+    /// -------- this type is the same as a type argument in the other type, not highlighted
+    /// ```
+    fn highlight_outer(
+        &self,
+        value: &mut DiagnosticStyledString,
+        other_value: &mut DiagnosticStyledString,
+        name: String,
+        sub: ty::subst::SubstsRef<'tcx>,
+        pos: usize,
+        other_ty: Ty<'tcx>,
+    ) {
+        // `value` and `other_value` hold two incomplete type representation for display.
+        // `name` is the path of both types being compared. `sub`
+        value.push_highlighted(name);
+        let len = sub.len();
+        if len > 0 {
+            value.push_highlighted("<");
+        }
+
+        // Output the lifetimes for the first type
+        let lifetimes = sub
+            .regions()
+            .map(|lifetime| {
+                let s = lifetime.to_string();
+                if s.is_empty() { "'_".to_string() } else { s }
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+        if !lifetimes.is_empty() {
+            if sub.regions().count() < len {
+                value.push_normal(lifetimes + ", ");
+            } else {
+                value.push_normal(lifetimes);
+            }
+        }
+
+        // Highlight all the type arguments that aren't at `pos` and compare the type argument at
+        // `pos` and `other_ty`.
+        for (i, type_arg) in sub.types().enumerate() {
+            if i == pos {
+                let values = self.cmp(type_arg, other_ty);
+                value.0.extend((values.0).0);
+                other_value.0.extend((values.1).0);
+            } else {
+                value.push_highlighted(type_arg.to_string());
+            }
+
+            if len > 0 && i != len - 1 {
+                value.push_normal(", ");
+            }
+        }
+        if len > 0 {
+            value.push_highlighted(">");
+        }
+    }
+
+    /// If `other_ty` is the same as a type argument present in `sub`, highlight `path` in `t1_out`,
+    /// as that is the difference to the other type.
+    ///
+    /// For the following code:
+    ///
+    /// ```norun
+    /// let x: Foo<Bar<Qux>> = foo::<Bar<Qux>>();
+    /// ```
+    ///
+    /// The type error output will behave in the following way:
+    ///
+    /// ```text
+    /// Foo<Bar<Qux>>
+    /// ^^^^--------^ this is highlighted
+    /// |   |
+    /// |   this type argument is exactly the same as the other type, not highlighted
+    /// this is highlighted
+    /// Bar<Qux>
+    /// -------- this type is the same as a type argument in the other type, not highlighted
+    /// ```
+    fn cmp_type_arg(
+        &self,
+        mut t1_out: &mut DiagnosticStyledString,
+        mut t2_out: &mut DiagnosticStyledString,
+        path: String,
+        sub: ty::subst::SubstsRef<'tcx>,
+        other_path: String,
+        other_ty: Ty<'tcx>,
+    ) -> Option<()> {
+        for (i, ta) in sub.types().enumerate() {
+            if ta == other_ty {
+                self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);
+                return Some(());
+            }
+            if let &ty::Adt(def, _) = &ta.kind {
+                let path_ = self.tcx.def_path_str(def.did.clone());
+                if path_ == other_path {
+                    self.highlight_outer(&mut t1_out, &mut t2_out, path, sub, i, &other_ty);
+                    return Some(());
+                }
+            }
+        }
+        None
+    }
+
+    /// Adds a `,` to the type representation only if it is appropriate.
+    fn push_comma(
+        &self,
+        value: &mut DiagnosticStyledString,
+        other_value: &mut DiagnosticStyledString,
+        len: usize,
+        pos: usize,
+    ) {
+        if len > 0 && pos != len - 1 {
+            value.push_normal(", ");
+            other_value.push_normal(", ");
+        }
+    }
+
+    /// For generic types with parameters with defaults, remove the parameters corresponding to
+    /// the defaults. This repeats a lot of the logic found in `ty::print::pretty`.
+    fn strip_generic_default_params(
+        &self,
+        def_id: DefId,
+        substs: ty::subst::SubstsRef<'tcx>,
+    ) -> SubstsRef<'tcx> {
+        let generics = self.tcx.generics_of(def_id);
+        let mut num_supplied_defaults = 0;
+        let mut type_params = generics
+            .params
+            .iter()
+            .rev()
+            .filter_map(|param| match param.kind {
+                ty::GenericParamDefKind::Lifetime => None,
+                ty::GenericParamDefKind::Type { has_default, .. } => {
+                    Some((param.def_id, has_default))
+                }
+                ty::GenericParamDefKind::Const => None, // FIXME(const_generics:defaults)
+            })
+            .peekable();
+        let has_default = {
+            let has_default = type_params.peek().map(|(_, has_default)| has_default);
+            *has_default.unwrap_or(&false)
+        };
+        if has_default {
+            let types = substs.types().rev();
+            for ((def_id, has_default), actual) in type_params.zip(types) {
+                if !has_default {
+                    break;
+                }
+                if self.tcx.type_of(def_id).subst(self.tcx, substs) != actual {
+                    break;
+                }
+                num_supplied_defaults += 1;
+            }
+        }
+        let len = generics.params.len();
+        let mut generics = generics.clone();
+        generics.params.truncate(len - num_supplied_defaults);
+        substs.truncate_to(self.tcx, &generics)
+    }
+
+    /// Given two `fn` signatures highlight only sub-parts that are different.
+    fn cmp_fn_sig(
+        &self,
+        sig1: &ty::PolyFnSig<'tcx>,
+        sig2: &ty::PolyFnSig<'tcx>,
+    ) -> (DiagnosticStyledString, DiagnosticStyledString) {
+        let get_lifetimes = |sig| {
+            use rustc_hir::def::Namespace;
+            let mut s = String::new();
+            let (_, (sig, reg)) = ty::print::FmtPrinter::new(self.tcx, &mut s, Namespace::TypeNS)
+                .name_all_regions(sig)
+                .unwrap();
+            let lts: Vec<String> = reg.into_iter().map(|(_, kind)| kind.to_string()).collect();
+            (if lts.is_empty() { String::new() } else { format!("for<{}> ", lts.join(", ")) }, sig)
+        };
+
+        let (lt1, sig1) = get_lifetimes(sig1);
+        let (lt2, sig2) = get_lifetimes(sig2);
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        let mut values = (
+            DiagnosticStyledString::normal("".to_string()),
+            DiagnosticStyledString::normal("".to_string()),
+        );
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        // ^^^^^^
+        values.0.push(sig1.unsafety.prefix_str(), sig1.unsafety != sig2.unsafety);
+        values.1.push(sig2.unsafety.prefix_str(), sig1.unsafety != sig2.unsafety);
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        //        ^^^^^^^^^^
+        if sig1.abi != abi::Abi::Rust {
+            values.0.push(format!("extern {} ", sig1.abi), sig1.abi != sig2.abi);
+        }
+        if sig2.abi != abi::Abi::Rust {
+            values.1.push(format!("extern {} ", sig2.abi), sig1.abi != sig2.abi);
+        }
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        //                   ^^^^^^^^
+        let lifetime_diff = lt1 != lt2;
+        values.0.push(lt1, lifetime_diff);
+        values.1.push(lt2, lifetime_diff);
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        //                           ^^^
+        values.0.push_normal("fn(");
+        values.1.push_normal("fn(");
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        //                              ^^^^^
+        let len1 = sig1.inputs().len();
+        let len2 = sig2.inputs().len();
+        if len1 == len2 {
+            for (i, (l, r)) in sig1.inputs().iter().zip(sig2.inputs().iter()).enumerate() {
+                let (x1, x2) = self.cmp(l, r);
+                (values.0).0.extend(x1.0);
+                (values.1).0.extend(x2.0);
+                self.push_comma(&mut values.0, &mut values.1, len1, i);
+            }
+        } else {
+            for (i, l) in sig1.inputs().iter().enumerate() {
+                values.0.push_highlighted(l.to_string());
+                if i != len1 - 1 {
+                    values.0.push_highlighted(", ");
+                }
+            }
+            for (i, r) in sig2.inputs().iter().enumerate() {
+                values.1.push_highlighted(r.to_string());
+                if i != len2 - 1 {
+                    values.1.push_highlighted(", ");
+                }
+            }
+        }
+
+        if sig1.c_variadic {
+            if len1 > 0 {
+                values.0.push_normal(", ");
+            }
+            values.0.push("...", !sig2.c_variadic);
+        }
+        if sig2.c_variadic {
+            if len2 > 0 {
+                values.1.push_normal(", ");
+            }
+            values.1.push("...", !sig1.c_variadic);
+        }
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        //                                   ^
+        values.0.push_normal(")");
+        values.1.push_normal(")");
+
+        // unsafe extern "C" for<'a> fn(&'a T) -> &'a T
+        //                                     ^^^^^^^^
+        let output1 = sig1.output();
+        let output2 = sig2.output();
+        let (x1, x2) = self.cmp(output1, output2);
+        if !output1.is_unit() {
+            values.0.push_normal(" -> ");
+            (values.0).0.extend(x1.0);
+        }
+        if !output2.is_unit() {
+            values.1.push_normal(" -> ");
+            (values.1).0.extend(x2.0);
+        }
+        values
+    }
+
+    /// Compares two given types, eliding parts that are the same between them and highlighting
+    /// relevant differences, and return two representation of those types for highlighted printing.
+    fn cmp(&self, t1: Ty<'tcx>, t2: Ty<'tcx>) -> (DiagnosticStyledString, DiagnosticStyledString) {
+        debug!("cmp(t1={}, t1.kind={:?}, t2={}, t2.kind={:?})", t1, t1.kind, t2, t2.kind);
+
+        // helper functions
+        fn equals<'tcx>(a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
+            match (&a.kind, &b.kind) {
+                (a, b) if *a == *b => true,
+                (&ty::Int(_), &ty::Infer(ty::InferTy::IntVar(_)))
+                | (&ty::Infer(ty::InferTy::IntVar(_)), &ty::Int(_))
+                | (&ty::Infer(ty::InferTy::IntVar(_)), &ty::Infer(ty::InferTy::IntVar(_)))
+                | (&ty::Float(_), &ty::Infer(ty::InferTy::FloatVar(_)))
+                | (&ty::Infer(ty::InferTy::FloatVar(_)), &ty::Float(_))
+                | (&ty::Infer(ty::InferTy::FloatVar(_)), &ty::Infer(ty::InferTy::FloatVar(_))) => {
+                    true
+                }
+                _ => false,
+            }
+        }
+
+        fn push_ty_ref<'tcx>(
+            r: &ty::Region<'tcx>,
+            ty: Ty<'tcx>,
+            mutbl: hir::Mutability,
+            s: &mut DiagnosticStyledString,
+        ) {
+            let mut r = r.to_string();
+            if r == "'_" {
+                r.clear();
+            } else {
+                r.push(' ');
+            }
+            s.push_highlighted(format!("&{}{}", r, mutbl.prefix_str()));
+            s.push_normal(ty.to_string());
+        }
+
+        // process starts here
+        match (&t1.kind, &t2.kind) {
+            (&ty::Adt(def1, sub1), &ty::Adt(def2, sub2)) => {
+                let sub_no_defaults_1 = self.strip_generic_default_params(def1.did, sub1);
+                let sub_no_defaults_2 = self.strip_generic_default_params(def2.did, sub2);
+                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
+                let path1 = self.tcx.def_path_str(def1.did.clone());
+                let path2 = self.tcx.def_path_str(def2.did.clone());
+                if def1.did == def2.did {
+                    // Easy case. Replace same types with `_` to shorten the output and highlight
+                    // the differing ones.
+                    //     let x: Foo<Bar, Qux> = y::<Foo<Quz, Qux>>();
+                    //     Foo<Bar, _>
+                    //     Foo<Quz, _>
+                    //         ---  ^ type argument elided
+                    //         |
+                    //         highlighted in output
+                    values.0.push_normal(path1);
+                    values.1.push_normal(path2);
+
+                    // Avoid printing out default generic parameters that are common to both
+                    // types.
+                    let len1 = sub_no_defaults_1.len();
+                    let len2 = sub_no_defaults_2.len();
+                    let common_len = cmp::min(len1, len2);
+                    let remainder1: Vec<_> = sub1.types().skip(common_len).collect();
+                    let remainder2: Vec<_> = sub2.types().skip(common_len).collect();
+                    let common_default_params = remainder1
+                        .iter()
+                        .rev()
+                        .zip(remainder2.iter().rev())
+                        .filter(|(a, b)| a == b)
+                        .count();
+                    let len = sub1.len() - common_default_params;
+                    let consts_offset = len - sub1.consts().count();
+
+                    // Only draw `<...>` if there're lifetime/type arguments.
+                    if len > 0 {
+                        values.0.push_normal("<");
+                        values.1.push_normal("<");
+                    }
+
+                    fn lifetime_display(lifetime: Region<'_>) -> String {
+                        let s = lifetime.to_string();
+                        if s.is_empty() { "'_".to_string() } else { s }
+                    }
+                    // At one point we'd like to elide all lifetimes here, they are irrelevant for
+                    // all diagnostics that use this output
+                    //
+                    //     Foo<'x, '_, Bar>
+                    //     Foo<'y, '_, Qux>
+                    //         ^^  ^^  --- type arguments are not elided
+                    //         |   |
+                    //         |   elided as they were the same
+                    //         not elided, they were different, but irrelevant
+                    let lifetimes = sub1.regions().zip(sub2.regions());
+                    for (i, lifetimes) in lifetimes.enumerate() {
+                        let l1 = lifetime_display(lifetimes.0);
+                        let l2 = lifetime_display(lifetimes.1);
+                        if lifetimes.0 == lifetimes.1 {
+                            values.0.push_normal("'_");
+                            values.1.push_normal("'_");
+                        } else {
+                            values.0.push_highlighted(l1);
+                            values.1.push_highlighted(l2);
+                        }
+                        self.push_comma(&mut values.0, &mut values.1, len, i);
+                    }
+
+                    // We're comparing two types with the same path, so we compare the type
+                    // arguments for both. If they are the same, do not highlight and elide from the
+                    // output.
+                    //     Foo<_, Bar>
+                    //     Foo<_, Qux>
+                    //         ^ elided type as this type argument was the same in both sides
+                    let type_arguments = sub1.types().zip(sub2.types());
+                    let regions_len = sub1.regions().count();
+                    let num_display_types = consts_offset - regions_len;
+                    for (i, (ta1, ta2)) in type_arguments.take(num_display_types).enumerate() {
+                        let i = i + regions_len;
+                        if ta1 == ta2 {
+                            values.0.push_normal("_");
+                            values.1.push_normal("_");
+                        } else {
+                            let (x1, x2) = self.cmp(ta1, ta2);
+                            (values.0).0.extend(x1.0);
+                            (values.1).0.extend(x2.0);
+                        }
+                        self.push_comma(&mut values.0, &mut values.1, len, i);
+                    }
+
+                    // Do the same for const arguments, if they are equal, do not highlight and
+                    // elide them from the output.
+                    let const_arguments = sub1.consts().zip(sub2.consts());
+                    for (i, (ca1, ca2)) in const_arguments.enumerate() {
+                        let i = i + consts_offset;
+                        if ca1 == ca2 {
+                            values.0.push_normal("_");
+                            values.1.push_normal("_");
+                        } else {
+                            values.0.push_highlighted(ca1.to_string());
+                            values.1.push_highlighted(ca2.to_string());
+                        }
+                        self.push_comma(&mut values.0, &mut values.1, len, i);
+                    }
+
+                    // Close the type argument bracket.
+                    // Only draw `<...>` if there're lifetime/type arguments.
+                    if len > 0 {
+                        values.0.push_normal(">");
+                        values.1.push_normal(">");
+                    }
+                    values
+                } else {
+                    // Check for case:
+                    //     let x: Foo<Bar<Qux> = foo::<Bar<Qux>>();
+                    //     Foo<Bar<Qux>
+                    //         ------- this type argument is exactly the same as the other type
+                    //     Bar<Qux>
+                    if self
+                        .cmp_type_arg(
+                            &mut values.0,
+                            &mut values.1,
+                            path1.clone(),
+                            sub_no_defaults_1,
+                            path2.clone(),
+                            &t2,
+                        )
+                        .is_some()
+                    {
+                        return values;
+                    }
+                    // Check for case:
+                    //     let x: Bar<Qux> = y:<Foo<Bar<Qux>>>();
+                    //     Bar<Qux>
+                    //     Foo<Bar<Qux>>
+                    //         ------- this type argument is exactly the same as the other type
+                    if self
+                        .cmp_type_arg(
+                            &mut values.1,
+                            &mut values.0,
+                            path2,
+                            sub_no_defaults_2,
+                            path1,
+                            &t1,
+                        )
+                        .is_some()
+                    {
+                        return values;
+                    }
+
+                    // We can't find anything in common, highlight relevant part of type path.
+                    //     let x: foo::bar::Baz<Qux> = y:<foo::bar::Bar<Zar>>();
+                    //     foo::bar::Baz<Qux>
+                    //     foo::bar::Bar<Zar>
+                    //               -------- this part of the path is different
+
+                    let t1_str = t1.to_string();
+                    let t2_str = t2.to_string();
+                    let min_len = t1_str.len().min(t2_str.len());
+
+                    const SEPARATOR: &str = "::";
+                    let separator_len = SEPARATOR.len();
+                    let split_idx: usize = t1_str
+                        .split(SEPARATOR)
+                        .zip(t2_str.split(SEPARATOR))
+                        .take_while(|(mod1_str, mod2_str)| mod1_str == mod2_str)
+                        .map(|(mod_str, _)| mod_str.len() + separator_len)
+                        .sum();
+
+                    debug!(
+                        "cmp: separator_len={}, split_idx={}, min_len={}",
+                        separator_len, split_idx, min_len
+                    );
+
+                    if split_idx >= min_len {
+                        // paths are identical, highlight everything
+                        (
+                            DiagnosticStyledString::highlighted(t1_str),
+                            DiagnosticStyledString::highlighted(t2_str),
+                        )
+                    } else {
+                        let (common, uniq1) = t1_str.split_at(split_idx);
+                        let (_, uniq2) = t2_str.split_at(split_idx);
+                        debug!("cmp: common={}, uniq1={}, uniq2={}", common, uniq1, uniq2);
+
+                        values.0.push_normal(common);
+                        values.0.push_highlighted(uniq1);
+                        values.1.push_normal(common);
+                        values.1.push_highlighted(uniq2);
+
+                        values
+                    }
+                }
+            }
+
+            // When finding T != &T, highlight only the borrow
+            (&ty::Ref(r1, ref_ty1, mutbl1), _) if equals(&ref_ty1, &t2) => {
+                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
+                push_ty_ref(&r1, ref_ty1, mutbl1, &mut values.0);
+                values.1.push_normal(t2.to_string());
+                values
+            }
+            (_, &ty::Ref(r2, ref_ty2, mutbl2)) if equals(&t1, &ref_ty2) => {
+                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
+                values.0.push_normal(t1.to_string());
+                push_ty_ref(&r2, ref_ty2, mutbl2, &mut values.1);
+                values
+            }
+
+            // When encountering &T != &mut T, highlight only the borrow
+            (&ty::Ref(r1, ref_ty1, mutbl1), &ty::Ref(r2, ref_ty2, mutbl2))
+                if equals(&ref_ty1, &ref_ty2) =>
+            {
+                let mut values = (DiagnosticStyledString::new(), DiagnosticStyledString::new());
+                push_ty_ref(&r1, ref_ty1, mutbl1, &mut values.0);
+                push_ty_ref(&r2, ref_ty2, mutbl2, &mut values.1);
+                values
+            }
+
+            // When encountering tuples of the same size, highlight only the differing types
+            (&ty::Tuple(substs1), &ty::Tuple(substs2)) if substs1.len() == substs2.len() => {
+                let mut values =
+                    (DiagnosticStyledString::normal("("), DiagnosticStyledString::normal("("));
+                let len = substs1.len();
+                for (i, (left, right)) in substs1.types().zip(substs2.types()).enumerate() {
+                    let (x1, x2) = self.cmp(left, right);
+                    (values.0).0.extend(x1.0);
+                    (values.1).0.extend(x2.0);
+                    self.push_comma(&mut values.0, &mut values.1, len, i);
+                }
+                if len == 1 {
+                    // Keep the output for single element tuples as `(ty,)`.
+                    values.0.push_normal(",");
+                    values.1.push_normal(",");
+                }
+                values.0.push_normal(")");
+                values.1.push_normal(")");
+                values
+            }
+
+            (ty::FnDef(did1, substs1), ty::FnDef(did2, substs2)) => {
+                let sig1 = self.tcx.fn_sig(*did1).subst(self.tcx, substs1);
+                let sig2 = self.tcx.fn_sig(*did2).subst(self.tcx, substs2);
+                let mut values = self.cmp_fn_sig(&sig1, &sig2);
+                let path1 = format!(" {{{}}}", self.tcx.def_path_str_with_substs(*did1, substs1));
+                let path2 = format!(" {{{}}}", self.tcx.def_path_str_with_substs(*did2, substs2));
+                let same_path = path1 == path2;
+                values.0.push(path1, !same_path);
+                values.1.push(path2, !same_path);
+                values
+            }
+
+            (ty::FnDef(did1, substs1), ty::FnPtr(sig2)) => {
+                let sig1 = self.tcx.fn_sig(*did1).subst(self.tcx, substs1);
+                let mut values = self.cmp_fn_sig(&sig1, sig2);
+                values.0.push_normal(format!(
+                    " {{{}}}",
+                    self.tcx.def_path_str_with_substs(*did1, substs1)
+                ));
+                values
+            }
+
+            (ty::FnPtr(sig1), ty::FnDef(did2, substs2)) => {
+                let sig2 = self.tcx.fn_sig(*did2).subst(self.tcx, substs2);
+                let mut values = self.cmp_fn_sig(sig1, &sig2);
+                values.1.push_normal(format!(
+                    " {{{}}}",
+                    self.tcx.def_path_str_with_substs(*did2, substs2)
+                ));
+                values
+            }
+
+            (ty::FnPtr(sig1), ty::FnPtr(sig2)) => self.cmp_fn_sig(sig1, sig2),
+
+            _ => {
+                if t1 == t2 {
+                    // The two types are the same, elide and don't highlight.
+                    (DiagnosticStyledString::normal("_"), DiagnosticStyledString::normal("_"))
+                } else {
+                    // We couldn't find anything in common, highlight everything.
+                    (
+                        DiagnosticStyledString::highlighted(t1.to_string()),
+                        DiagnosticStyledString::highlighted(t2.to_string()),
+                    )
+                }
+            }
+        }
+    }
+
+    pub fn note_type_err(
+        &self,
+        diag: &mut DiagnosticBuilder<'tcx>,
+        cause: &ObligationCause<'tcx>,
+        secondary_span: Option<(Span, String)>,
+        mut values: Option<ValuePairs<'tcx>>,
+        terr: &TypeError<'tcx>,
+    ) {
+        let span = cause.span(self.tcx);
+
+        // For some types of errors, expected-found does not make
+        // sense, so just ignore the values we were given.
+        match terr {
+            TypeError::CyclicTy(_) => {
+                values = None;
+            }
+            _ => {}
+        }
+
+        struct OpaqueTypesVisitor<'tcx> {
+            types: FxHashMap<TyCategory, FxHashSet<Span>>,
+            expected: FxHashMap<TyCategory, FxHashSet<Span>>,
+            found: FxHashMap<TyCategory, FxHashSet<Span>>,
+            ignore_span: Span,
+            tcx: TyCtxt<'tcx>,
+        }
+
+        impl<'tcx> OpaqueTypesVisitor<'tcx> {
+            fn visit_expected_found(
+                tcx: TyCtxt<'tcx>,
+                expected: Ty<'tcx>,
+                found: Ty<'tcx>,
+                ignore_span: Span,
+            ) -> Self {
+                let mut types_visitor = OpaqueTypesVisitor {
+                    types: Default::default(),
+                    expected: Default::default(),
+                    found: Default::default(),
+                    ignore_span,
+                    tcx,
+                };
+                // The visitor puts all the relevant encountered types in `self.types`, but in
+                // here we want to visit two separate types with no relation to each other, so we
+                // move the results from `types` to `expected` or `found` as appropriate.
+                expected.visit_with(&mut types_visitor);
+                std::mem::swap(&mut types_visitor.expected, &mut types_visitor.types);
+                found.visit_with(&mut types_visitor);
+                std::mem::swap(&mut types_visitor.found, &mut types_visitor.types);
+                types_visitor
+            }
+
+            fn report(&self, err: &mut DiagnosticBuilder<'_>) {
+                self.add_labels_for_types(err, "expected", &self.expected);
+                self.add_labels_for_types(err, "found", &self.found);
+            }
+
+            fn add_labels_for_types(
+                &self,
+                err: &mut DiagnosticBuilder<'_>,
+                target: &str,
+                types: &FxHashMap<TyCategory, FxHashSet<Span>>,
+            ) {
+                for (key, values) in types.iter() {
+                    let count = values.len();
+                    let kind = key.descr();
+                    for sp in values {
+                        err.span_label(
+                            *sp,
+                            format!(
+                                "{}{}{} {}{}",
+                                if sp.is_desugaring(DesugaringKind::Async) {
+                                    "the `Output` of this `async fn`'s "
+                                } else if count == 1 {
+                                    "the "
+                                } else {
+                                    ""
+                                },
+                                if count > 1 { "one of the " } else { "" },
+                                target,
+                                kind,
+                                pluralize!(count),
+                            ),
+                        );
+                    }
+                }
+            }
+        }
+
+        impl<'tcx> ty::fold::TypeVisitor<'tcx> for OpaqueTypesVisitor<'tcx> {
+            fn visit_ty(&mut self, t: Ty<'tcx>) -> bool {
+                if let Some((kind, def_id)) = TyCategory::from_ty(t) {
+                    let span = self.tcx.def_span(def_id);
+                    // Avoid cluttering the output when the "found" and error span overlap:
+                    //
+                    // error[E0308]: mismatched types
+                    //   --> $DIR/issue-20862.rs:2:5
+                    //    |
+                    // LL |     |y| x + y
+                    //    |     ^^^^^^^^^
+                    //    |     |
+                    //    |     the found closure
+                    //    |     expected `()`, found closure
+                    //    |
+                    //    = note: expected unit type `()`
+                    //                 found closure `[closure@$DIR/issue-20862.rs:2:5: 2:14 x:_]`
+                    if !self.ignore_span.overlaps(span) {
+                        self.types.entry(kind).or_default().insert(span);
+                    }
+                }
+                t.super_visit_with(self)
+            }
+        }
+
+        debug!("note_type_err(diag={:?})", diag);
+        let (expected_found, exp_found, is_simple_error) = match values {
+            None => (None, None, false),
+            Some(values) => {
+                let (is_simple_error, exp_found) = match values {
+                    ValuePairs::Types(exp_found) => {
+                        let is_simple_err =
+                            exp_found.expected.is_simple_text() && exp_found.found.is_simple_text();
+                        OpaqueTypesVisitor::visit_expected_found(
+                            self.tcx,
+                            exp_found.expected,
+                            exp_found.found,
+                            span,
+                        )
+                        .report(diag);
+
+                        (is_simple_err, Some(exp_found))
+                    }
+                    _ => (false, None),
+                };
+                let vals = match self.values_str(&values) {
+                    Some((expected, found)) => Some((expected, found)),
+                    None => {
+                        // Derived error. Cancel the emitter.
+                        diag.cancel();
+                        return;
+                    }
+                };
+                (vals, exp_found, is_simple_error)
+            }
+        };
+
+        // Ignore msg for object safe coercion
+        // since E0038 message will be printed
+        match terr {
+            TypeError::ObjectUnsafeCoercion(_) => {}
+            _ => {
+                diag.span_label(span, terr.to_string());
+                if let Some((sp, msg)) = secondary_span {
+                    diag.span_label(sp, msg);
+                }
+            }
+        };
+        if let Some((expected, found)) = expected_found {
+            let expected_label = exp_found.map_or("type".into(), |ef| ef.expected.prefix_string());
+            let found_label = exp_found.map_or("type".into(), |ef| ef.found.prefix_string());
+            match (&terr, expected == found) {
+                (TypeError::Sorts(values), extra) => {
+                    let sort_string = |ty: Ty<'tcx>| match (extra, &ty.kind) {
+                        (true, ty::Opaque(def_id, _)) => format!(
+                            " (opaque type at {})",
+                            self.tcx
+                                .sess
+                                .source_map()
+                                .mk_substr_filename(self.tcx.def_span(*def_id)),
+                        ),
+                        (true, _) => format!(" ({})", ty.sort_string(self.tcx)),
+                        (false, _) => "".to_string(),
+                    };
+                    if !(values.expected.is_simple_text() && values.found.is_simple_text())
+                        || (exp_found.map_or(false, |ef| {
+                            // This happens when the type error is a subset of the expectation,
+                            // like when you have two references but one is `usize` and the other
+                            // is `f32`. In those cases we still want to show the `note`. If the
+                            // value from `ef` is `Infer(_)`, then we ignore it.
+                            if !ef.expected.is_ty_infer() {
+                                ef.expected != values.expected
+                            } else if !ef.found.is_ty_infer() {
+                                ef.found != values.found
+                            } else {
+                                false
+                            }
+                        }))
+                    {
+                        diag.note_expected_found_extra(
+                            &expected_label,
+                            expected,
+                            &found_label,
+                            found,
+                            &sort_string(values.expected),
+                            &sort_string(values.found),
+                        );
+                    }
+                }
+                (TypeError::ObjectUnsafeCoercion(_), _) => {
+                    diag.note_unsuccessfull_coercion(found, expected);
+                }
+                (_, _) => {
+                    debug!(
+                        "note_type_err: exp_found={:?}, expected={:?} found={:?}",
+                        exp_found, expected, found
+                    );
+                    if !is_simple_error || terr.must_include_note() {
+                        diag.note_expected_found(&expected_label, expected, &found_label, found);
+                    }
+                }
+            }
+        }
+        if let Some(exp_found) = exp_found {
+            self.suggest_as_ref_where_appropriate(span, &exp_found, diag);
+        }
+
+        // In some (most?) cases cause.body_id points to actual body, but in some cases
+        // it's a actual definition. According to the comments (e.g. in
+        // librustc_typeck/check/compare_method.rs:compare_predicate_entailment) the latter
+        // is relied upon by some other code. This might (or might not) need cleanup.
+        let body_owner_def_id =
+            self.tcx.hir().opt_local_def_id(cause.body_id).unwrap_or_else(|| {
+                self.tcx.hir().body_owner_def_id(hir::BodyId { hir_id: cause.body_id })
+            });
+        self.check_and_note_conflicting_crates(diag, terr);
+        self.tcx.note_and_explain_type_err(diag, terr, span, body_owner_def_id);
+
+        // It reads better to have the error origin as the final
+        // thing.
+        self.note_error_origin(diag, &cause, exp_found);
+    }
+
+    /// When encountering a case where `.as_ref()` on a `Result` or `Option` would be appropriate,
+    /// suggests it.
+    fn suggest_as_ref_where_appropriate(
+        &self,
+        span: Span,
+        exp_found: &ty::error::ExpectedFound<Ty<'tcx>>,
+        diag: &mut DiagnosticBuilder<'tcx>,
+    ) {
+        match (&exp_found.expected.kind, &exp_found.found.kind) {
+            (ty::Adt(exp_def, exp_substs), ty::Ref(_, found_ty, _)) => {
+                if let ty::Adt(found_def, found_substs) = found_ty.kind {
+                    let path_str = format!("{:?}", exp_def);
+                    if exp_def == &found_def {
+                        let opt_msg = "you can convert from `&Option<T>` to `Option<&T>` using \
+                                       `.as_ref()`";
+                        let result_msg = "you can convert from `&Result<T, E>` to \
+                                          `Result<&T, &E>` using `.as_ref()`";
+                        let have_as_ref = &[
+                            ("std::option::Option", opt_msg),
+                            ("core::option::Option", opt_msg),
+                            ("std::result::Result", result_msg),
+                            ("core::result::Result", result_msg),
+                        ];
+                        if let Some(msg) = have_as_ref
+                            .iter()
+                            .filter_map(
+                                |(path, msg)| if &path_str == path { Some(msg) } else { None },
+                            )
+                            .next()
+                        {
+                            let mut show_suggestion = true;
+                            for (exp_ty, found_ty) in exp_substs.types().zip(found_substs.types()) {
+                                match exp_ty.kind {
+                                    ty::Ref(_, exp_ty, _) => {
+                                        match (&exp_ty.kind, &found_ty.kind) {
+                                            (_, ty::Param(_))
+                                            | (_, ty::Infer(_))
+                                            | (ty::Param(_), _)
+                                            | (ty::Infer(_), _) => {}
+                                            _ if ty::TyS::same_type(exp_ty, found_ty) => {}
+                                            _ => show_suggestion = false,
+                                        };
+                                    }
+                                    ty::Param(_) | ty::Infer(_) => {}
+                                    _ => show_suggestion = false,
+                                }
+                            }
+                            if let (Ok(snippet), true) =
+                                (self.tcx.sess.source_map().span_to_snippet(span), show_suggestion)
+                            {
+                                diag.span_suggestion(
+                                    span,
+                                    msg,
+                                    format!("{}.as_ref()", snippet),
+                                    Applicability::MachineApplicable,
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+            _ => {}
+        }
+    }
+
+    pub fn report_and_explain_type_error(
+        &self,
+        trace: TypeTrace<'tcx>,
+        terr: &TypeError<'tcx>,
+    ) -> DiagnosticBuilder<'tcx> {
+        debug!("report_and_explain_type_error(trace={:?}, terr={:?})", trace, terr);
+
+        let span = trace.cause.span(self.tcx);
+        let failure_code = trace.cause.as_failure_code(terr);
+        let mut diag = match failure_code {
+            FailureCode::Error0038(did) => {
+                let violations = self.tcx.object_safety_violations(did);
+                report_object_safety_error(self.tcx, span, did, violations)
+            }
+            FailureCode::Error0317(failure_str) => {
+                struct_span_err!(self.tcx.sess, span, E0317, "{}", failure_str)
+            }
+            FailureCode::Error0580(failure_str) => {
+                struct_span_err!(self.tcx.sess, span, E0580, "{}", failure_str)
+            }
+            FailureCode::Error0308(failure_str) => {
+                struct_span_err!(self.tcx.sess, span, E0308, "{}", failure_str)
+            }
+            FailureCode::Error0644(failure_str) => {
+                struct_span_err!(self.tcx.sess, span, E0644, "{}", failure_str)
+            }
+        };
+        self.note_type_err(&mut diag, &trace.cause, None, Some(trace.values), terr);
+        diag
+    }
+
+    fn values_str(
+        &self,
+        values: &ValuePairs<'tcx>,
+    ) -> Option<(DiagnosticStyledString, DiagnosticStyledString)> {
+        match *values {
+            infer::Types(ref exp_found) => self.expected_found_str_ty(exp_found),
+            infer::Regions(ref exp_found) => self.expected_found_str(exp_found),
+            infer::Consts(ref exp_found) => self.expected_found_str(exp_found),
+            infer::TraitRefs(ref exp_found) => {
+                let pretty_exp_found = ty::error::ExpectedFound {
+                    expected: exp_found.expected.print_only_trait_path(),
+                    found: exp_found.found.print_only_trait_path(),
+                };
+                self.expected_found_str(&pretty_exp_found)
+            }
+            infer::PolyTraitRefs(ref exp_found) => {
+                let pretty_exp_found = ty::error::ExpectedFound {
+                    expected: exp_found.expected.print_only_trait_path(),
+                    found: exp_found.found.print_only_trait_path(),
+                };
+                self.expected_found_str(&pretty_exp_found)
+            }
+        }
+    }
+
+    fn expected_found_str_ty(
+        &self,
+        exp_found: &ty::error::ExpectedFound<Ty<'tcx>>,
+    ) -> Option<(DiagnosticStyledString, DiagnosticStyledString)> {
+        let exp_found = self.resolve_vars_if_possible(exp_found);
+        if exp_found.references_error() {
+            return None;
+        }
+
+        Some(self.cmp(exp_found.expected, exp_found.found))
+    }
+
+    /// Returns a string of the form "expected `{}`, found `{}`".
+    fn expected_found_str<T: fmt::Display + TypeFoldable<'tcx>>(
+        &self,
+        exp_found: &ty::error::ExpectedFound<T>,
+    ) -> Option<(DiagnosticStyledString, DiagnosticStyledString)> {
+        let exp_found = self.resolve_vars_if_possible(exp_found);
+        if exp_found.references_error() {
+            return None;
+        }
+
+        Some((
+            DiagnosticStyledString::highlighted(exp_found.expected.to_string()),
+            DiagnosticStyledString::highlighted(exp_found.found.to_string()),
+        ))
+    }
+
+    pub fn report_generic_bound_failure(
+        &self,
+        region_scope_tree: &region::ScopeTree,
+        span: Span,
+        origin: Option<SubregionOrigin<'tcx>>,
+        bound_kind: GenericKind<'tcx>,
+        sub: Region<'tcx>,
+    ) {
+        self.construct_generic_bound_failure(region_scope_tree, span, origin, bound_kind, sub)
+            .emit();
+    }
+
+    pub fn construct_generic_bound_failure(
+        &self,
+        region_scope_tree: &region::ScopeTree,
+        span: Span,
+        origin: Option<SubregionOrigin<'tcx>>,
+        bound_kind: GenericKind<'tcx>,
+        sub: Region<'tcx>,
+    ) -> DiagnosticBuilder<'a> {
+        // Attempt to obtain the span of the parameter so we can
+        // suggest adding an explicit lifetime bound to it.
+        let type_param_span = match (self.in_progress_tables, bound_kind) {
+            (Some(ref table), GenericKind::Param(ref param)) => {
+                let table = table.borrow();
+                table.local_id_root.and_then(|did| {
+                    let generics = self.tcx.generics_of(did);
+                    // Account for the case where `did` corresponds to `Self`, which doesn't have
+                    // the expected type argument.
+                    if !(generics.has_self && param.index == 0) {
+                        let type_param = generics.type_param(param, self.tcx);
+                        let hir = &self.tcx.hir();
+                        hir.as_local_hir_id(type_param.def_id).map(|id| {
+                            // Get the `hir::Param` to verify whether it already has any bounds.
+                            // We do this to avoid suggesting code that ends up as `T: 'a'b`,
+                            // instead we suggest `T: 'a + 'b` in that case.
+                            let mut has_bounds = false;
+                            if let Node::GenericParam(param) = hir.get(id) {
+                                has_bounds = !param.bounds.is_empty();
+                            }
+                            let sp = hir.span(id);
+                            // `sp` only covers `T`, change it so that it covers
+                            // `T:` when appropriate
+                            let is_impl_trait = bound_kind.to_string().starts_with("impl ");
+                            let sp = if has_bounds && !is_impl_trait {
+                                sp.to(self
+                                    .tcx
+                                    .sess
+                                    .source_map()
+                                    .next_point(self.tcx.sess.source_map().next_point(sp)))
+                            } else {
+                                sp
+                            };
+                            (sp, has_bounds, is_impl_trait)
+                        })
+                    } else {
+                        None
+                    }
+                })
+            }
+            _ => None,
+        };
+
+        let labeled_user_string = match bound_kind {
+            GenericKind::Param(ref p) => format!("the parameter type `{}`", p),
+            GenericKind::Projection(ref p) => format!("the associated type `{}`", p),
+        };
+
+        if let Some(SubregionOrigin::CompareImplMethodObligation {
+            span,
+            item_name,
+            impl_item_def_id,
+            trait_item_def_id,
+        }) = origin
+        {
+            return self.report_extra_impl_obligation(
+                span,
+                item_name,
+                impl_item_def_id,
+                trait_item_def_id,
+                &format!("`{}: {}`", bound_kind, sub),
+            );
+        }
+
+        fn binding_suggestion<'tcx, S: fmt::Display>(
+            err: &mut DiagnosticBuilder<'tcx>,
+            type_param_span: Option<(Span, bool, bool)>,
+            bound_kind: GenericKind<'tcx>,
+            sub: S,
+        ) {
+            let msg = "consider adding an explicit lifetime bound";
+            if let Some((sp, has_lifetimes, is_impl_trait)) = type_param_span {
+                let suggestion = if is_impl_trait {
+                    format!("{} + {}", bound_kind, sub)
+                } else {
+                    let tail = if has_lifetimes { " + " } else { "" };
+                    format!("{}: {}{}", bound_kind, sub, tail)
+                };
+                err.span_suggestion(
+                    sp,
+                    &format!("{}...", msg),
+                    suggestion,
+                    Applicability::MaybeIncorrect, // Issue #41966
+                );
+            } else {
+                let consider = format!(
+                    "{} {}...",
+                    msg,
+                    if type_param_span.map(|(_, _, is_impl_trait)| is_impl_trait).unwrap_or(false) {
+                        format!(" `{}` to `{}`", sub, bound_kind)
+                    } else {
+                        format!("`{}: {}`", bound_kind, sub)
+                    },
+                );
+                err.help(&consider);
+            }
+        }
+
+        let mut err = match *sub {
+            ty::ReEarlyBound(ty::EarlyBoundRegion { name, .. })
+            | ty::ReFree(ty::FreeRegion { bound_region: ty::BrNamed(_, name), .. }) => {
+                // Does the required lifetime have a nice name we can print?
+                let mut err = struct_span_err!(
+                    self.tcx.sess,
+                    span,
+                    E0309,
+                    "{} may not live long enough",
+                    labeled_user_string
+                );
+                // Explicitly use the name instead of `sub`'s `Display` impl. The `Display` impl
+                // for the bound is not suitable for suggestions when `-Zverbose` is set because it
+                // uses `Debug` output, so we handle it specially here so that suggestions are
+                // always correct.
+                binding_suggestion(&mut err, type_param_span, bound_kind, name);
+                err
+            }
+
+            ty::ReStatic => {
+                // Does the required lifetime have a nice name we can print?
+                let mut err = struct_span_err!(
+                    self.tcx.sess,
+                    span,
+                    E0310,
+                    "{} may not live long enough",
+                    labeled_user_string
+                );
+                binding_suggestion(&mut err, type_param_span, bound_kind, "'static");
+                err
+            }
+
+            _ => {
+                // If not, be less specific.
+                let mut err = struct_span_err!(
+                    self.tcx.sess,
+                    span,
+                    E0311,
+                    "{} may not live long enough",
+                    labeled_user_string
+                );
+                err.help(&format!(
+                    "consider adding an explicit lifetime bound for `{}`",
+                    bound_kind
+                ));
+                note_and_explain_region(
+                    self.tcx,
+                    region_scope_tree,
+                    &mut err,
+                    &format!("{} must be valid for ", labeled_user_string),
+                    sub,
+                    "...",
+                );
+                err
+            }
+        };
+
+        if let Some(origin) = origin {
+            self.note_region_origin(&mut err, &origin);
+        }
+        err
+    }
+
+    fn report_sub_sup_conflict(
+        &self,
+        region_scope_tree: &region::ScopeTree,
+        var_origin: RegionVariableOrigin,
+        sub_origin: SubregionOrigin<'tcx>,
+        sub_region: Region<'tcx>,
+        sup_origin: SubregionOrigin<'tcx>,
+        sup_region: Region<'tcx>,
+    ) {
+        let mut err = self.report_inference_failure(var_origin);
+
+        note_and_explain_region(
+            self.tcx,
+            region_scope_tree,
+            &mut err,
+            "first, the lifetime cannot outlive ",
+            sup_region,
+            "...",
+        );
+
+        match (&sup_origin, &sub_origin) {
+            (&infer::Subtype(ref sup_trace), &infer::Subtype(ref sub_trace)) => {
+                debug!("report_sub_sup_conflict: var_origin={:?}", var_origin);
+                debug!("report_sub_sup_conflict: sub_region={:?}", sub_region);
+                debug!("report_sub_sup_conflict: sub_origin={:?}", sub_origin);
+                debug!("report_sub_sup_conflict: sup_region={:?}", sup_region);
+                debug!("report_sub_sup_conflict: sup_origin={:?}", sup_origin);
+                debug!("report_sub_sup_conflict: sup_trace={:?}", sup_trace);
+                debug!("report_sub_sup_conflict: sub_trace={:?}", sub_trace);
+                debug!("report_sub_sup_conflict: sup_trace.values={:?}", sup_trace.values);
+                debug!("report_sub_sup_conflict: sub_trace.values={:?}", sub_trace.values);
+
+                if let (Some((sup_expected, sup_found)), Some((sub_expected, sub_found))) =
+                    (self.values_str(&sup_trace.values), self.values_str(&sub_trace.values))
+                {
+                    if sub_expected == sup_expected && sub_found == sup_found {
+                        note_and_explain_region(
+                            self.tcx,
+                            region_scope_tree,
+                            &mut err,
+                            "...but the lifetime must also be valid for ",
+                            sub_region,
+                            "...",
+                        );
+                        err.span_note(
+                            sup_trace.cause.span,
+                            &format!("...so that the {}", sup_trace.cause.as_requirement_str()),
+                        );
+
+                        err.note_expected_found(&"", sup_expected, &"", sup_found);
+                        err.emit();
+                        return;
+                    }
+                }
+            }
+            _ => {}
+        }
+
+        self.note_region_origin(&mut err, &sup_origin);
+
+        note_and_explain_region(
+            self.tcx,
+            region_scope_tree,
+            &mut err,
+            "but, the lifetime must be valid for ",
+            sub_region,
+            "...",
+        );
+
+        self.note_region_origin(&mut err, &sub_origin);
+        err.emit();
+    }
+}
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    fn report_inference_failure(
+        &self,
+        var_origin: RegionVariableOrigin,
+    ) -> DiagnosticBuilder<'tcx> {
+        let br_string = |br: ty::BoundRegion| {
+            let mut s = match br {
+                ty::BrNamed(_, name) => name.to_string(),
+                _ => String::new(),
+            };
+            if !s.is_empty() {
+                s.push_str(" ");
+            }
+            s
+        };
+        let var_description = match var_origin {
+            infer::MiscVariable(_) => String::new(),
+            infer::PatternRegion(_) => " for pattern".to_string(),
+            infer::AddrOfRegion(_) => " for borrow expression".to_string(),
+            infer::Autoref(_) => " for autoref".to_string(),
+            infer::Coercion(_) => " for automatic coercion".to_string(),
+            infer::LateBoundRegion(_, br, infer::FnCall) => {
+                format!(" for lifetime parameter {}in function call", br_string(br))
+            }
+            infer::LateBoundRegion(_, br, infer::HigherRankedType) => {
+                format!(" for lifetime parameter {}in generic type", br_string(br))
+            }
+            infer::LateBoundRegion(_, br, infer::AssocTypeProjection(def_id)) => format!(
+                " for lifetime parameter {}in trait containing associated type `{}`",
+                br_string(br),
+                self.tcx.associated_item(def_id).ident
+            ),
+            infer::EarlyBoundRegion(_, name) => format!(" for lifetime parameter `{}`", name),
+            infer::BoundRegionInCoherence(name) => {
+                format!(" for lifetime parameter `{}` in coherence check", name)
+            }
+            infer::UpvarRegion(ref upvar_id, _) => {
+                let var_name = self.tcx.hir().name(upvar_id.var_path.hir_id);
+                format!(" for capture of `{}` by closure", var_name)
+            }
+            infer::NLL(..) => bug!("NLL variable found in lexical phase"),
+        };
+
+        struct_span_err!(
+            self.tcx.sess,
+            var_origin.span(),
+            E0495,
+            "cannot infer an appropriate lifetime{} \
+             due to conflicting requirements",
+            var_description
+        )
+    }
+}
+
+enum FailureCode {
+    Error0038(DefId),
+    Error0317(&'static str),
+    Error0580(&'static str),
+    Error0308(&'static str),
+    Error0644(&'static str),
+}
+
+trait ObligationCauseExt<'tcx> {
+    fn as_failure_code(&self, terr: &TypeError<'tcx>) -> FailureCode;
+    fn as_requirement_str(&self) -> &'static str;
+}
+
+impl<'tcx> ObligationCauseExt<'tcx> for ObligationCause<'tcx> {
+    fn as_failure_code(&self, terr: &TypeError<'tcx>) -> FailureCode {
+        use self::FailureCode::*;
+        use crate::traits::ObligationCauseCode::*;
+        match self.code {
+            CompareImplMethodObligation { .. } => Error0308("method not compatible with trait"),
+            CompareImplTypeObligation { .. } => Error0308("type not compatible with trait"),
+            MatchExpressionArm(box MatchExpressionArmCause { source, .. }) => {
+                Error0308(match source {
+                    hir::MatchSource::IfLetDesugar { .. } => {
+                        "`if let` arms have incompatible types"
+                    }
+                    hir::MatchSource::TryDesugar => {
+                        "try expression alternatives have incompatible types"
+                    }
+                    _ => "`match` arms have incompatible types",
+                })
+            }
+            IfExpression { .. } => Error0308("`if` and `else` have incompatible types"),
+            IfExpressionWithNoElse => Error0317("`if` may be missing an `else` clause"),
+            MainFunctionType => Error0580("`main` function has wrong type"),
+            StartFunctionType => Error0308("`#[start]` function has wrong type"),
+            IntrinsicType => Error0308("intrinsic has wrong type"),
+            MethodReceiver => Error0308("mismatched `self` parameter type"),
+
+            // In the case where we have no more specific thing to
+            // say, also take a look at the error code, maybe we can
+            // tailor to that.
+            _ => match terr {
+                TypeError::CyclicTy(ty) if ty.is_closure() || ty.is_generator() => {
+                    Error0644("closure/generator type that references itself")
+                }
+                TypeError::IntrinsicCast => {
+                    Error0308("cannot coerce intrinsics to function pointers")
+                }
+                TypeError::ObjectUnsafeCoercion(did) => Error0038(*did),
+                _ => Error0308("mismatched types"),
+            },
+        }
+    }
+
+    fn as_requirement_str(&self) -> &'static str {
+        use crate::traits::ObligationCauseCode::*;
+        match self.code {
+            CompareImplMethodObligation { .. } => "method type is compatible with trait",
+            CompareImplTypeObligation { .. } => "associated type is compatible with trait",
+            ExprAssignable => "expression is assignable",
+            MatchExpressionArm(box MatchExpressionArmCause { source, .. }) => match source {
+                hir::MatchSource::IfLetDesugar { .. } => "`if let` arms have compatible types",
+                _ => "`match` arms have compatible types",
+            },
+            IfExpression { .. } => "`if` and `else` have incompatible types",
+            IfExpressionWithNoElse => "`if` missing an `else` returns `()`",
+            MainFunctionType => "`main` function has the correct type",
+            StartFunctionType => "`#[start]` function has the correct type",
+            IntrinsicType => "intrinsic has the correct type",
+            MethodReceiver => "method receiver has the correct type",
+            _ => "types are compatible",
+        }
+    }
+}
+
+/// This is a bare signal of what kind of type we're dealing with. `ty::TyKind` tracks
+/// extra information about each type, but we only care about the category.
+#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+crate enum TyCategory {
+    Closure,
+    Opaque,
+    Generator,
+    Foreign,
+}
+
+impl TyCategory {
+    fn descr(&self) -> &'static str {
+        match self {
+            Self::Closure => "closure",
+            Self::Opaque => "opaque type",
+            Self::Generator => "generator",
+            Self::Foreign => "foreign type",
+        }
+    }
+
+    pub fn from_ty(ty: Ty<'_>) -> Option<(Self, DefId)> {
+        match ty.kind {
+            ty::Closure(def_id, _) => Some((Self::Closure, def_id)),
+            ty::Opaque(def_id, _) => Some((Self::Opaque, def_id)),
+            ty::Generator(def_id, ..) => Some((Self::Generator, def_id)),
+            ty::Foreign(def_id) => Some((Self::Foreign, def_id)),
+            _ => None,
+        }
+    }
+}
diff --git a/src/librustc/infer/error_reporting/need_type_info.rs b/src/librustc_infer/infer/error_reporting/need_type_info.rs
similarity index 96%
rename from src/librustc/infer/error_reporting/need_type_info.rs
rename to src/librustc_infer/infer/error_reporting/need_type_info.rs
index 9947dea234..285f0c9cf5 100644
--- a/src/librustc/infer/error_reporting/need_type_info.rs
+++ b/src/librustc_infer/infer/error_reporting/need_type_info.rs
@@ -1,13 +1,13 @@
-use crate::hir::map::Map;
 use crate::infer::type_variable::TypeVariableOriginKind;
 use crate::infer::InferCtxt;
-use crate::ty::print::Print;
-use crate::ty::{self, DefIdTree, Infer, Ty, TyVar};
+use rustc::hir::map::Map;
+use rustc::ty::print::Print;
+use rustc::ty::{self, DefIdTree, Infer, Ty, TyVar};
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Namespace};
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
-use rustc_hir::{Body, Expr, ExprKind, FunctionRetTy, HirId, Local, Pat};
+use rustc_hir::{Body, Expr, ExprKind, FnRetTy, HirId, Local, Pat};
 use rustc_span::source_map::DesugaringKind;
 use rustc_span::symbol::kw;
 use rustc_span::Span;
@@ -47,9 +47,12 @@ impl<'a, 'tcx> FindLocalByTypeVisitor<'a, 'tcx> {
                 if ty.walk().any(|inner_ty| {
                     inner_ty == self.target_ty
                         || match (&inner_ty.kind, &self.target_ty.kind) {
-                            (&Infer(TyVar(a_vid)), &Infer(TyVar(b_vid))) => {
-                                self.infcx.type_variables.borrow_mut().sub_unified(a_vid, b_vid)
-                            }
+                            (&Infer(TyVar(a_vid)), &Infer(TyVar(b_vid))) => self
+                                .infcx
+                                .inner
+                                .borrow_mut()
+                                .type_variables
+                                .sub_unified(a_vid, b_vid),
                             _ => false,
                         }
                 }) {
@@ -105,7 +108,7 @@ impl<'a, 'tcx> Visitor<'tcx> for FindLocalByTypeVisitor<'a, 'tcx> {
 fn closure_return_type_suggestion(
     span: Span,
     err: &mut DiagnosticBuilder<'_>,
-    output: &FunctionRetTy<'_>,
+    output: &FnRetTy<'_>,
     body: &Body<'_>,
     descr: &str,
     name: &str,
@@ -114,7 +117,7 @@ fn closure_return_type_suggestion(
     parent_descr: Option<&str>,
 ) {
     let (arrow, post) = match output {
-        FunctionRetTy::DefaultReturn(_) => ("-> ", " "),
+        FnRetTy::DefaultReturn(_) => ("-> ", " "),
         _ => ("", ""),
     };
     let suggestion = match body.value.kind {
@@ -166,7 +169,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         highlight: Option<ty::print::RegionHighlightMode>,
     ) -> (String, Option<Span>, Cow<'static, str>, Option<String>, Option<&'static str>) {
         if let ty::Infer(ty::TyVar(ty_vid)) = ty.kind {
-            let ty_vars = self.type_variables.borrow();
+            let ty_vars = &self.inner.borrow().type_variables;
             let var_origin = ty_vars.var_origin(ty_vid);
             if let TypeVariableOriginKind::TypeParameterDefinition(name, def_id) = var_origin.kind {
                 let parent_def_id = def_id.and_then(|def_id| self.tcx.parent(def_id));
@@ -224,7 +227,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         let ty_to_string = |ty: Ty<'tcx>| -> String {
             let mut s = String::new();
             let mut printer = ty::print::FmtPrinter::new(self.tcx, &mut s, Namespace::TypeNS);
-            let ty_vars = self.type_variables.borrow();
+            let ty_vars = &self.inner.borrow().type_variables;
             let getter = move |ty_vid| {
                 let var_origin = ty_vars.var_origin(ty_vid);
                 if let TypeVariableOriginKind::TypeParameterDefinition(name, _) = var_origin.kind {
@@ -388,7 +391,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
             err.span_label(pattern.span, msg);
         } else if let Some(e) = local_visitor.found_method_call {
             if let ExprKind::MethodCall(segment, ..) = &e.kind {
-                // Suggest specifiying type params or point out the return type of the call:
+                // Suggest specifying type params or point out the return type of the call:
                 //
                 // error[E0282]: type annotations needed
                 //   --> $DIR/type-annotations-needed-expr.rs:2:39
diff --git a/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs
similarity index 98%
rename from src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs
index 8f4c643992..1a09729ef6 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/different_lifetimes.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/different_lifetimes.rs
@@ -3,7 +3,7 @@
 
 use crate::infer::error_reporting::nice_region_error::util::AnonymousParamInfo;
 use crate::infer::error_reporting::nice_region_error::NiceRegionError;
-use crate::util::common::ErrorReported;
+use rustc::util::common::ErrorReported;
 
 use rustc_errors::struct_span_err;
 
@@ -45,7 +45,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
     ///
     /// It will later be extended to trait objects.
     pub(super) fn try_report_anon_anon_conflict(&self) -> Option<ErrorReported> {
-        let (span, sub, sup) = self.regions();
+        let (span, sub, sup) = self.regions()?;
 
         // Determine whether the sub and sup consist of both anonymous (elided) regions.
         let anon_reg_sup = self.tcx().is_suitable_region(sup)?;
diff --git a/src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs
similarity index 99%
rename from src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs
index 8e2592b531..2ae7f4cc04 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/find_anon_type.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/find_anon_type.rs
@@ -1,7 +1,7 @@
-use crate::hir::map::Map;
 use crate::infer::error_reporting::nice_region_error::NiceRegionError;
-use crate::middle::resolve_lifetime as rl;
-use crate::ty::{self, Region, TyCtxt};
+use rustc::hir::map::Map;
+use rustc::middle::resolve_lifetime as rl;
+use rustc::ty::{self, Region, TyCtxt};
 use rustc_hir as hir;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::Node;
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs
new file mode 100644
index 0000000000..d8c314a0d2
--- /dev/null
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/mod.rs
@@ -0,0 +1,87 @@
+use crate::infer::lexical_region_resolve::RegionResolutionError;
+use crate::infer::lexical_region_resolve::RegionResolutionError::*;
+use crate::infer::InferCtxt;
+use rustc::ty::{self, TyCtxt};
+use rustc::util::common::ErrorReported;
+use rustc_errors::DiagnosticBuilder;
+use rustc_span::source_map::Span;
+
+mod different_lifetimes;
+mod find_anon_type;
+mod named_anon_conflict;
+mod outlives_closure;
+mod placeholder_error;
+mod static_impl_trait;
+mod trait_impl_difference;
+mod util;
+
+impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
+    pub fn try_report_nice_region_error(&self, error: &RegionResolutionError<'tcx>) -> bool {
+        if let Some(tables) = self.in_progress_tables {
+            let tables = tables.borrow();
+            NiceRegionError::new(self, error.clone(), Some(&tables)).try_report().is_some()
+        } else {
+            NiceRegionError::new(self, error.clone(), None).try_report().is_some()
+        }
+    }
+}
+
+pub struct NiceRegionError<'cx, 'tcx> {
+    infcx: &'cx InferCtxt<'cx, 'tcx>,
+    error: Option<RegionResolutionError<'tcx>>,
+    regions: Option<(Span, ty::Region<'tcx>, ty::Region<'tcx>)>,
+    tables: Option<&'cx ty::TypeckTables<'tcx>>,
+}
+
+impl<'cx, 'tcx> NiceRegionError<'cx, 'tcx> {
+    pub fn new(
+        infcx: &'cx InferCtxt<'cx, 'tcx>,
+        error: RegionResolutionError<'tcx>,
+        tables: Option<&'cx ty::TypeckTables<'tcx>>,
+    ) -> Self {
+        Self { infcx, error: Some(error), regions: None, tables }
+    }
+
+    pub fn new_from_span(
+        infcx: &'cx InferCtxt<'cx, 'tcx>,
+        span: Span,
+        sub: ty::Region<'tcx>,
+        sup: ty::Region<'tcx>,
+        tables: Option<&'cx ty::TypeckTables<'tcx>>,
+    ) -> Self {
+        Self { infcx, error: None, regions: Some((span, sub, sup)), tables }
+    }
+
+    fn tcx(&self) -> TyCtxt<'tcx> {
+        self.infcx.tcx
+    }
+
+    pub fn try_report_from_nll(&self) -> Option<DiagnosticBuilder<'cx>> {
+        // Due to the improved diagnostics returned by the MIR borrow checker, only a subset of
+        // the nice region errors are required when running under the MIR borrow checker.
+        self.try_report_named_anon_conflict().or_else(|| self.try_report_placeholder_conflict())
+    }
+
+    pub fn try_report(&self) -> Option<ErrorReported> {
+        self.try_report_from_nll()
+            .map(|mut diag| {
+                diag.emit();
+                ErrorReported
+            })
+            .or_else(|| self.try_report_anon_anon_conflict())
+            .or_else(|| self.try_report_outlives_closure())
+            .or_else(|| self.try_report_static_impl_trait())
+            .or_else(|| self.try_report_impl_not_conforming_to_trait())
+    }
+
+    pub fn regions(&self) -> Option<(Span, ty::Region<'tcx>, ty::Region<'tcx>)> {
+        match (&self.error, self.regions) {
+            (Some(ConcreteFailure(origin, sub, sup)), None) => Some((origin.span(), sub, sup)),
+            (Some(SubSupConflict(_, _, origin, sub, _, sup)), None) => {
+                Some((origin.span(), sub, sup))
+            }
+            (None, Some((span, sub, sup))) => Some((span, sub, sup)),
+            _ => None,
+        }
+    }
+}
diff --git a/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/named_anon_conflict.rs
similarity index 96%
rename from src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/named_anon_conflict.rs
index df37f53606..02ce357967 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/named_anon_conflict.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/named_anon_conflict.rs
@@ -1,15 +1,15 @@
 //! Error Reporting for Anonymous Region Lifetime Errors
 //! where one region is named and the other is anonymous.
 use crate::infer::error_reporting::nice_region_error::NiceRegionError;
-use crate::ty;
+use rustc::ty;
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
-use rustc_hir::{FunctionRetTy, TyKind};
+use rustc_hir::{FnRetTy, TyKind};
 
 impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
     /// When given a `ConcreteFailure` for a function with parameters containing a named region and
     /// an anonymous region, emit an descriptive diagnostic error.
     pub(super) fn try_report_named_anon_conflict(&self) -> Option<DiagnosticBuilder<'a>> {
-        let (span, sub, sup) = self.regions();
+        let (span, sub, sup) = self.regions()?;
 
         debug!(
             "try_report_named_anon_conflict(sub={:?}, sup={:?}, error={:?})",
@@ -79,7 +79,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
             {
                 return None;
             }
-            if let FunctionRetTy::Return(ty) = &fndecl.output {
+            if let FnRetTy::Return(ty) = &fndecl.output {
                 if let (TyKind::Def(_, _), ty::ReStatic) = (&ty.kind, sub) {
                     // This is an impl Trait return that evaluates de need of 'static.
                     // We handle this case better in `static_impl_trait`.
diff --git a/src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/outlives_closure.rs
similarity index 98%
rename from src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/outlives_closure.rs
index af0e5ef800..d88e6555af 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/outlives_closure.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/outlives_closure.rs
@@ -4,8 +4,8 @@
 use crate::infer::error_reporting::nice_region_error::NiceRegionError;
 use crate::infer::lexical_region_resolve::RegionResolutionError::SubSupConflict;
 use crate::infer::SubregionOrigin;
-use crate::ty::RegionKind;
-use crate::util::common::ErrorReported;
+use rustc::ty::RegionKind;
+use rustc::util::common::ErrorReported;
 use rustc_hir::{Expr, ExprKind::Closure, Node};
 
 impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
diff --git a/src/librustc/infer/error_reporting/nice_region_error/placeholder_error.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/placeholder_error.rs
similarity index 95%
rename from src/librustc/infer/error_reporting/nice_region_error/placeholder_error.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/placeholder_error.rs
index 7b31fe7cd7..57313dbab4 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/placeholder_error.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/placeholder_error.rs
@@ -3,10 +3,10 @@ use crate::infer::lexical_region_resolve::RegionResolutionError;
 use crate::infer::ValuePairs;
 use crate::infer::{SubregionOrigin, TypeTrace};
 use crate::traits::{ObligationCause, ObligationCauseCode};
-use crate::ty::error::ExpectedFound;
-use crate::ty::print::{FmtPrinter, Print, RegionHighlightMode};
-use crate::ty::subst::SubstsRef;
-use crate::ty::{self, TyCtxt};
+use rustc::ty::error::ExpectedFound;
+use rustc::ty::print::{FmtPrinter, Print, RegionHighlightMode};
+use rustc::ty::subst::SubstsRef;
+use rustc::ty::{self, TyCtxt};
 use rustc_errors::DiagnosticBuilder;
 use rustc_hir::def::Namespace;
 use rustc_hir::def_id::DefId;
@@ -107,6 +107,25 @@ impl NiceRegionError<'me, 'tcx> {
                 found.substs,
             )),
 
+            Some(RegionResolutionError::UpperBoundUniverseConflict(
+                vid,
+                _,
+                _,
+                SubregionOrigin::Subtype(box TypeTrace {
+                    cause,
+                    values: ValuePairs::TraitRefs(ExpectedFound { expected, found }),
+                }),
+                sup_placeholder @ ty::RePlaceholder(_),
+            )) if expected.def_id == found.def_id => Some(self.try_report_placeholders_trait(
+                Some(self.tcx().mk_region(ty::ReVar(*vid))),
+                cause,
+                None,
+                Some(*sup_placeholder),
+                expected.def_id,
+                expected.substs,
+                found.substs,
+            )),
+
             Some(RegionResolutionError::ConcreteFailure(
                 SubregionOrigin::Subtype(box TypeTrace {
                     cause,
diff --git a/src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
similarity index 97%
rename from src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
index c6fc4cd3c1..655e28bbd3 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/static_impl_trait.rs
@@ -3,8 +3,8 @@
 use crate::infer::error_reporting::msg_span_from_free_region;
 use crate::infer::error_reporting::nice_region_error::NiceRegionError;
 use crate::infer::lexical_region_resolve::RegionResolutionError;
-use crate::ty::{BoundRegion, FreeRegion, RegionKind};
-use crate::util::common::ErrorReported;
+use rustc::ty::{BoundRegion, FreeRegion, RegionKind};
+use rustc::util::common::ErrorReported;
 use rustc_errors::Applicability;
 
 impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
diff --git a/src/librustc/infer/error_reporting/nice_region_error/trait_impl_difference.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs
similarity index 97%
rename from src/librustc/infer/error_reporting/nice_region_error/trait_impl_difference.rs
rename to src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs
index a33cb51113..f8cab9f84c 100644
--- a/src/librustc/infer/error_reporting/nice_region_error/trait_impl_difference.rs
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs
@@ -4,8 +4,8 @@ use crate::infer::error_reporting::nice_region_error::NiceRegionError;
 use crate::infer::lexical_region_resolve::RegionResolutionError;
 use crate::infer::{Subtype, ValuePairs};
 use crate::traits::ObligationCauseCode::CompareImplMethodObligation;
-use crate::ty::Ty;
-use crate::util::common::ErrorReported;
+use rustc::ty::Ty;
+use rustc::util::common::ErrorReported;
 use rustc_span::Span;
 
 impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/util.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/util.rs
new file mode 100644
index 0000000000..cab632935f
--- /dev/null
+++ b/src/librustc_infer/infer/error_reporting/nice_region_error/util.rs
@@ -0,0 +1,132 @@
+//! Helper functions corresponding to lifetime errors due to
+//! anonymous regions.
+
+use crate::infer::error_reporting::nice_region_error::NiceRegionError;
+use rustc::ty::{self, DefIdTree, Region, Ty};
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_span::Span;
+
+// The struct contains the information about the anonymous region
+// we are searching for.
+#[derive(Debug)]
+pub(super) struct AnonymousParamInfo<'tcx> {
+    // the parameter corresponding to the anonymous region
+    pub param: &'tcx hir::Param<'tcx>,
+    // the type corresponding to the anonymopus region parameter
+    pub param_ty: Ty<'tcx>,
+    // the ty::BoundRegion corresponding to the anonymous region
+    pub bound_region: ty::BoundRegion,
+    // param_ty_span contains span of parameter type
+    pub param_ty_span: Span,
+    // corresponds to id the argument is the first parameter
+    // in the declaration
+    pub is_first: bool,
+}
+
+impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
+    // This method walks the Type of the function body parameters using
+    // `fold_regions()` function and returns the
+    // &hir::Param of the function parameter corresponding to the anonymous
+    // region and the Ty corresponding to the named region.
+    // Currently only the case where the function declaration consists of
+    // one named region and one anonymous region is handled.
+    // Consider the example `fn foo<'a>(x: &'a i32, y: &i32) -> &'a i32`
+    // Here, we would return the hir::Param for y, we return the type &'a
+    // i32, which is the type of y but with the anonymous region replaced
+    // with 'a, the corresponding bound region and is_first which is true if
+    // the hir::Param is the first parameter in the function declaration.
+    pub(super) fn find_param_with_region(
+        &self,
+        anon_region: Region<'tcx>,
+        replace_region: Region<'tcx>,
+    ) -> Option<AnonymousParamInfo<'_>> {
+        let (id, bound_region) = match *anon_region {
+            ty::ReFree(ref free_region) => (free_region.scope, free_region.bound_region),
+            ty::ReEarlyBound(ebr) => (
+                self.tcx().parent(ebr.def_id).unwrap(),
+                ty::BoundRegion::BrNamed(ebr.def_id, ebr.name),
+            ),
+            _ => return None, // not a free region
+        };
+
+        let hir = &self.tcx().hir();
+        if let Some(hir_id) = hir.as_local_hir_id(id) {
+            if let Some(body_id) = hir.maybe_body_owned_by(hir_id) {
+                let body = hir.body(body_id);
+                let owner_id = hir.body_owner(body_id);
+                let fn_decl = hir.fn_decl_by_hir_id(owner_id).unwrap();
+                if let Some(tables) = self.tables {
+                    body.params
+                        .iter()
+                        .enumerate()
+                        .filter_map(|(index, param)| {
+                            // May return None; sometimes the tables are not yet populated.
+                            let ty_hir_id = fn_decl.inputs[index].hir_id;
+                            let param_ty_span = hir.span(ty_hir_id);
+                            let ty = tables.node_type_opt(param.hir_id)?;
+                            let mut found_anon_region = false;
+                            let new_param_ty = self.tcx().fold_regions(&ty, &mut false, |r, _| {
+                                if *r == *anon_region {
+                                    found_anon_region = true;
+                                    replace_region
+                                } else {
+                                    r
+                                }
+                            });
+                            if found_anon_region {
+                                let is_first = index == 0;
+                                Some(AnonymousParamInfo {
+                                    param,
+                                    param_ty: new_param_ty,
+                                    param_ty_span,
+                                    bound_region,
+                                    is_first,
+                                })
+                            } else {
+                                None
+                            }
+                        })
+                        .next()
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        } else {
+            None
+        }
+    }
+
+    // Here, we check for the case where the anonymous region
+    // is in the return type.
+    // FIXME(#42703) - Need to handle certain cases here.
+    pub(super) fn is_return_type_anon(
+        &self,
+        scope_def_id: DefId,
+        br: ty::BoundRegion,
+        decl: &hir::FnDecl<'_>,
+    ) -> Option<Span> {
+        let ret_ty = self.tcx().type_of(scope_def_id);
+        if let ty::FnDef(_, _) = ret_ty.kind {
+            let sig = ret_ty.fn_sig(self.tcx());
+            let late_bound_regions =
+                self.tcx().collect_referenced_late_bound_regions(&sig.output());
+            if late_bound_regions.iter().any(|r| *r == br) {
+                return Some(decl.output.span());
+            }
+        }
+        None
+    }
+
+    // Here we check for the case where anonymous region
+    // corresponds to self and if yes, we display E0312.
+    // FIXME(#42700) - Need to format self properly to
+    // enable E0621 for it.
+    pub(super) fn is_self_anon(&self, is_first: bool, scope_def_id: DefId) -> bool {
+        is_first
+            && self.tcx().opt_associated_item(scope_def_id).map(|i| i.method_has_self_argument)
+                == Some(true)
+    }
+}
diff --git a/src/librustc/infer/error_reporting/note.rs b/src/librustc_infer/infer/error_reporting/note.rs
similarity index 99%
rename from src/librustc/infer/error_reporting/note.rs
rename to src/librustc_infer/infer/error_reporting/note.rs
index 11dda71b8c..5c0caa48d0 100644
--- a/src/librustc/infer/error_reporting/note.rs
+++ b/src/librustc_infer/infer/error_reporting/note.rs
@@ -1,8 +1,8 @@
-use crate::infer::error_reporting::note_and_explain_region;
+use crate::infer::error_reporting::{note_and_explain_region, ObligationCauseExt};
 use crate::infer::{self, InferCtxt, SubregionOrigin};
-use crate::middle::region;
-use crate::ty::error::TypeError;
-use crate::ty::{self, Region};
+use rustc::middle::region;
+use rustc::ty::error::TypeError;
+use rustc::ty::{self, Region};
 use rustc_errors::{struct_span_err, DiagnosticBuilder};
 
 impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
@@ -645,8 +645,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                     self.tcx.sess,
                     span,
                     E0491,
-                    "in type `{}`, reference has a longer lifetime \
-                                                than the data it references",
+                    "in type `{}`, reference has a longer lifetime than the data it references",
                     self.ty_to_string(ty)
                 );
                 note_and_explain_region(
diff --git a/src/librustc/infer/freshen.rs b/src/librustc_infer/infer/freshen.rs
similarity index 93%
rename from src/librustc/infer/freshen.rs
rename to src/librustc_infer/infer/freshen.rs
index 1608795997..a454feea36 100644
--- a/src/librustc/infer/freshen.rs
+++ b/src/librustc_infer/infer/freshen.rs
@@ -31,8 +31,8 @@
 //! variable only once, and it does so as soon as it can, so it is reasonable to ask what the type
 //! inferencer knows "so far".
 
-use crate::ty::fold::TypeFolder;
-use crate::ty::{self, Ty, TyCtxt, TypeFoldable};
+use rustc::ty::fold::TypeFolder;
+use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
 
 use rustc_data_structures::fx::FxHashMap;
 
@@ -130,7 +130,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
             | ty::ReScope(_)
             | ty::ReVar(_)
             | ty::RePlaceholder(..)
-            | ty::ReEmpty
+            | ty::ReEmpty(_)
             | ty::ReErased => {
                 // replace all free regions with 'erased
                 self.tcx().lifetimes.re_erased
@@ -143,10 +143,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
     }
 
     fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
-        if !t.needs_infer()
-            && !t.has_erasable_regions()
-            && !(t.has_closure_types() && self.infcx.in_progress_tables.is_some())
-        {
+        if !t.needs_infer() && !t.has_erasable_regions() {
             return t;
         }
 
@@ -154,14 +151,15 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
 
         match t.kind {
             ty::Infer(ty::TyVar(v)) => {
-                let opt_ty = self.infcx.type_variables.borrow_mut().probe(v).known();
+                let opt_ty = self.infcx.inner.borrow_mut().type_variables.probe(v).known();
                 self.freshen_ty(opt_ty, ty::TyVar(v), ty::FreshTy)
             }
 
             ty::Infer(ty::IntVar(v)) => self.freshen_ty(
                 self.infcx
-                    .int_unification_table
+                    .inner
                     .borrow_mut()
+                    .int_unification_table
                     .probe_value(v)
                     .map(|v| v.to_type(tcx)),
                 ty::IntVar(v),
@@ -170,8 +168,9 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
 
             ty::Infer(ty::FloatVar(v)) => self.freshen_ty(
                 self.infcx
-                    .float_unification_table
+                    .inner
                     .borrow_mut()
+                    .float_unification_table
                     .probe_value(v)
                     .map(|v| v.to_type(tcx)),
                 ty::FloatVar(v),
@@ -225,8 +224,14 @@ impl<'a, 'tcx> TypeFolder<'tcx> for TypeFreshener<'a, 'tcx> {
     fn fold_const(&mut self, ct: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
         match ct.val {
             ty::ConstKind::Infer(ty::InferConst::Var(v)) => {
-                let opt_ct =
-                    self.infcx.const_unification_table.borrow_mut().probe_value(v).val.known();
+                let opt_ct = self
+                    .infcx
+                    .inner
+                    .borrow_mut()
+                    .const_unification_table
+                    .probe_value(v)
+                    .val
+                    .known();
                 return self.freshen_const(
                     opt_ct,
                     ty::InferConst::Var(v),
diff --git a/src/librustc/infer/fudge.rs b/src/librustc_infer/infer/fudge.rs
similarity index 88%
rename from src/librustc/infer/fudge.rs
rename to src/librustc_infer/infer/fudge.rs
index 265e45635c..16bf0f3d1c 100644
--- a/src/librustc/infer/fudge.rs
+++ b/src/librustc_infer/infer/fudge.rs
@@ -1,5 +1,5 @@
-use crate::ty::fold::{TypeFoldable, TypeFolder};
-use crate::ty::{self, ConstVid, FloatVid, IntVid, RegionVid, Ty, TyCtxt, TyVid};
+use rustc::ty::fold::{TypeFoldable, TypeFolder};
+use rustc::ty::{self, ConstVid, FloatVid, IntVid, RegionVid, Ty, TyCtxt, TyVid};
 
 use super::type_variable::TypeVariableOrigin;
 use super::InferCtxt;
@@ -8,11 +8,10 @@ use super::{ConstVariableOrigin, RegionVariableOrigin};
 use rustc_data_structures::unify as ut;
 use ut::UnifyKey;
 
-use std::cell::RefMut;
 use std::ops::Range;
 
 fn const_vars_since_snapshot<'tcx>(
-    mut table: RefMut<'_, ut::UnificationTable<ut::InPlace<ConstVid<'tcx>>>>,
+    table: &mut ut::UnificationTable<ut::InPlace<ConstVid<'tcx>>>,
     snapshot: &ut::Snapshot<ut::InPlace<ConstVid<'tcx>>>,
 ) -> (Range<ConstVid<'tcx>>, Vec<ConstVariableOrigin>) {
     let range = table.vars_since_snapshot(snapshot);
@@ -82,23 +81,18 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                     // going to be popped, so we will have to
                     // eliminate any references to them.
 
-                    let type_vars = self
-                        .type_variables
-                        .borrow_mut()
-                        .vars_since_snapshot(&snapshot.type_snapshot);
-                    let int_vars = self
-                        .int_unification_table
-                        .borrow_mut()
-                        .vars_since_snapshot(&snapshot.int_snapshot);
-                    let float_vars = self
-                        .float_unification_table
-                        .borrow_mut()
-                        .vars_since_snapshot(&snapshot.float_snapshot);
-                    let region_vars = self
-                        .borrow_region_constraints()
+                    let mut inner = self.inner.borrow_mut();
+                    let type_vars =
+                        inner.type_variables.vars_since_snapshot(&snapshot.type_snapshot);
+                    let int_vars =
+                        inner.int_unification_table.vars_since_snapshot(&snapshot.int_snapshot);
+                    let float_vars =
+                        inner.float_unification_table.vars_since_snapshot(&snapshot.float_snapshot);
+                    let region_vars = inner
+                        .unwrap_region_constraints()
                         .vars_since_snapshot(&snapshot.region_constraints_snapshot);
                     let const_vars = const_vars_since_snapshot(
-                        self.const_unification_table.borrow_mut(),
+                        &mut inner.const_unification_table,
                         &snapshot.const_snapshot,
                     );
 
@@ -166,7 +160,9 @@ impl<'a, 'tcx> TypeFolder<'tcx> for InferenceFudger<'a, 'tcx> {
                     // variables to their binding anyhow, we know
                     // that it is unbound, so we can just return
                     // it.
-                    debug_assert!(self.infcx.type_variables.borrow_mut().probe(vid).is_unknown());
+                    debug_assert!(
+                        self.infcx.inner.borrow_mut().type_variables.probe(vid).is_unknown()
+                    );
                     ty
                 }
             }
diff --git a/src/librustc/infer/glb.rs b/src/librustc_infer/infer/glb.rs
similarity index 90%
rename from src/librustc/infer/glb.rs
rename to src/librustc_infer/infer/glb.rs
index 293dc80d98..8b26bcef57 100644
--- a/src/librustc/infer/glb.rs
+++ b/src/librustc_infer/infer/glb.rs
@@ -4,8 +4,8 @@ use super::InferCtxt;
 use super::Subtype;
 
 use crate::traits::ObligationCause;
-use crate::ty::relate::{Relate, RelateResult, TypeRelation};
-use crate::ty::{self, Ty, TyCtxt};
+use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
+use rustc::ty::{self, Ty, TyCtxt};
 
 /// "Greatest lower bound" (common subtype)
 pub struct Glb<'combine, 'infcx, 'tcx> {
@@ -18,7 +18,7 @@ impl<'combine, 'infcx, 'tcx> Glb<'combine, 'infcx, 'tcx> {
         fields: &'combine mut CombineFields<'infcx, 'tcx>,
         a_is_expected: bool,
     ) -> Glb<'combine, 'infcx, 'tcx> {
-        Glb { fields: fields, a_is_expected: a_is_expected }
+        Glb { fields, a_is_expected }
     }
 }
 
@@ -66,7 +66,12 @@ impl TypeRelation<'tcx> for Glb<'combine, 'infcx, 'tcx> {
         debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
 
         let origin = Subtype(box self.fields.trace.clone());
-        Ok(self.fields.infcx.borrow_region_constraints().glb_regions(self.tcx(), origin, a, b))
+        Ok(self.fields.infcx.inner.borrow_mut().unwrap_region_constraints().glb_regions(
+            self.tcx(),
+            origin,
+            a,
+            b,
+        ))
     }
 
     fn consts(
diff --git a/src/librustc/infer/higher_ranked/README.md b/src/librustc_infer/infer/higher_ranked/README.md
similarity index 100%
rename from src/librustc/infer/higher_ranked/README.md
rename to src/librustc_infer/infer/higher_ranked/README.md
diff --git a/src/librustc_infer/infer/higher_ranked/mod.rs b/src/librustc_infer/infer/higher_ranked/mod.rs
new file mode 100644
index 0000000000..33781188a9
--- /dev/null
+++ b/src/librustc_infer/infer/higher_ranked/mod.rs
@@ -0,0 +1,148 @@
+//! Helper routines for higher-ranked things. See the `doc` module at
+//! the end of the file for details.
+
+use super::combine::CombineFields;
+use super::{HigherRankedType, InferCtxt, PlaceholderMap};
+
+use crate::infer::CombinedSnapshot;
+use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
+use rustc::ty::{self, Binder, TypeFoldable};
+
+impl<'a, 'tcx> CombineFields<'a, 'tcx> {
+    pub fn higher_ranked_sub<T>(
+        &mut self,
+        a: &Binder<T>,
+        b: &Binder<T>,
+        a_is_expected: bool,
+    ) -> RelateResult<'tcx, Binder<T>>
+    where
+        T: Relate<'tcx>,
+    {
+        debug!("higher_ranked_sub(a={:?}, b={:?})", a, b);
+
+        // Rather than checking the subtype relationship between `a` and `b`
+        // as-is, we need to do some extra work here in order to make sure
+        // that function subtyping works correctly with respect to regions
+        //
+        // Note: this is a subtle algorithm.  For a full explanation,
+        // please see the large comment at the end of the file in the (inlined) module
+        // `doc`.
+
+        let span = self.trace.cause.span;
+
+        return self.infcx.commit_if_ok(|snapshot| {
+            // First, we instantiate each bound region in the supertype with a
+            // fresh placeholder region.
+            let (b_prime, placeholder_map) = self.infcx.replace_bound_vars_with_placeholders(b);
+
+            // Next, we instantiate each bound region in the subtype
+            // with a fresh region variable. These region variables --
+            // but no other pre-existing region variables -- can name
+            // the placeholders.
+            let (a_prime, _) =
+                self.infcx.replace_bound_vars_with_fresh_vars(span, HigherRankedType, a);
+
+            debug!("a_prime={:?}", a_prime);
+            debug!("b_prime={:?}", b_prime);
+
+            // Compare types now that bound regions have been replaced.
+            let result = self.sub(a_is_expected).relate(&a_prime, &b_prime)?;
+
+            self.infcx.leak_check(!a_is_expected, &placeholder_map, snapshot)?;
+
+            debug!("higher_ranked_sub: OK result={:?}", result);
+
+            Ok(ty::Binder::bind(result))
+        });
+    }
+}
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    /// Replaces all regions (resp. types) bound by `binder` with placeholder
+    /// regions (resp. types) and return a map indicating which bound-region
+    /// placeholder region. This is the first step of checking subtyping
+    /// when higher-ranked things are involved.
+    ///
+    /// **Important:** you must call this function from within a snapshot.
+    /// Moreover, before committing the snapshot, you must eventually call
+    /// either `plug_leaks` or `pop_placeholders` to remove the placeholder
+    /// regions. If you rollback the snapshot (or are using a probe), then
+    /// the pop occurs as part of the rollback, so an explicit call is not
+    /// needed (but is also permitted).
+    ///
+    /// For more information about how placeholders and HRTBs work, see
+    /// the [rustc guide].
+    ///
+    /// [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/hrtb.html
+    pub fn replace_bound_vars_with_placeholders<T>(
+        &self,
+        binder: &ty::Binder<T>,
+    ) -> (T, PlaceholderMap<'tcx>)
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        let next_universe = self.create_next_universe();
+
+        let fld_r = |br| {
+            self.tcx.mk_region(ty::RePlaceholder(ty::PlaceholderRegion {
+                universe: next_universe,
+                name: br,
+            }))
+        };
+
+        let fld_t = |bound_ty: ty::BoundTy| {
+            self.tcx.mk_ty(ty::Placeholder(ty::PlaceholderType {
+                universe: next_universe,
+                name: bound_ty.var,
+            }))
+        };
+
+        let fld_c = |bound_var: ty::BoundVar, ty| {
+            self.tcx.mk_const(ty::Const {
+                val: ty::ConstKind::Placeholder(ty::PlaceholderConst {
+                    universe: next_universe,
+                    name: bound_var,
+                }),
+                ty,
+            })
+        };
+
+        let (result, map) = self.tcx.replace_bound_vars(binder, fld_r, fld_t, fld_c);
+
+        debug!(
+            "replace_bound_vars_with_placeholders(\
+             next_universe={:?}, \
+             binder={:?}, \
+             result={:?}, \
+             map={:?})",
+            next_universe, binder, result, map,
+        );
+
+        (result, map)
+    }
+
+    /// See `infer::region_constraints::RegionConstraintCollector::leak_check`.
+    pub fn leak_check(
+        &self,
+        overly_polymorphic: bool,
+        placeholder_map: &PlaceholderMap<'tcx>,
+        snapshot: &CombinedSnapshot<'_, 'tcx>,
+    ) -> RelateResult<'tcx, ()> {
+        // If the user gave `-Zno-leak-check`, or we have been
+        // configured to skip the leak check, then skip the leak check
+        // completely. The leak check is deprecated. Any legitimate
+        // subtyping errors that it would have caught will now be
+        // caught later on, during region checking. However, we
+        // continue to use it for a transition period.
+        if self.tcx.sess.opts.debugging_opts.no_leak_check || self.skip_leak_check.get() {
+            return Ok(());
+        }
+
+        self.inner.borrow_mut().unwrap_region_constraints().leak_check(
+            self.tcx,
+            overly_polymorphic,
+            placeholder_map,
+            snapshot,
+        )
+    }
+}
diff --git a/src/librustc/infer/lattice.rs b/src/librustc_infer/infer/lattice.rs
similarity index 93%
rename from src/librustc/infer/lattice.rs
rename to src/librustc_infer/infer/lattice.rs
index 3e0aa4727a..42f9b3ab77 100644
--- a/src/librustc/infer/lattice.rs
+++ b/src/librustc_infer/infer/lattice.rs
@@ -23,9 +23,9 @@ use super::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use super::InferCtxt;
 
 use crate::traits::ObligationCause;
-use crate::ty::relate::{RelateResult, TypeRelation};
-use crate::ty::TyVar;
-use crate::ty::{self, Ty};
+use rustc::ty::relate::{RelateResult, TypeRelation};
+use rustc::ty::TyVar;
+use rustc::ty::{self, Ty};
 
 pub trait LatticeDir<'f, 'tcx>: TypeRelation<'tcx> {
     fn infcx(&self) -> &'f InferCtxt<'f, 'tcx>;
@@ -56,8 +56,8 @@ where
     }
 
     let infcx = this.infcx();
-    let a = infcx.type_variables.borrow_mut().replace_if_possible(a);
-    let b = infcx.type_variables.borrow_mut().replace_if_possible(b);
+    let a = infcx.inner.borrow_mut().type_variables.replace_if_possible(a);
+    let b = infcx.inner.borrow_mut().type_variables.replace_if_possible(b);
     match (&a.kind, &b.kind) {
         // If one side is known to be a variable and one is not,
         // create a variable (`v`) to represent the LUB. Make sure to
diff --git a/src/librustc/infer/lexical_region_resolve/README.md b/src/librustc_infer/infer/lexical_region_resolve/README.md
similarity index 100%
rename from src/librustc/infer/lexical_region_resolve/README.md
rename to src/librustc_infer/infer/lexical_region_resolve/README.md
diff --git a/src/librustc/infer/lexical_region_resolve/graphviz.rs b/src/librustc_infer/infer/lexical_region_resolve/graphviz.rs
similarity index 98%
rename from src/librustc/infer/lexical_region_resolve/graphviz.rs
rename to src/librustc_infer/infer/lexical_region_resolve/graphviz.rs
index a930e707c5..eb52f10e40 100644
--- a/src/librustc/infer/lexical_region_resolve/graphviz.rs
+++ b/src/librustc_infer/infer/lexical_region_resolve/graphviz.rs
@@ -11,9 +11,9 @@ use graphviz as dot;
 use super::Constraint;
 use crate::infer::region_constraints::RegionConstraintData;
 use crate::infer::SubregionOrigin;
-use crate::middle::free_region::RegionRelations;
-use crate::middle::region;
-use crate::ty;
+use rustc::middle::free_region::RegionRelations;
+use rustc::middle::region;
+use rustc::ty;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir::def_id::DefIndex;
 
diff --git a/src/librustc_infer/infer/lexical_region_resolve/mod.rs b/src/librustc_infer/infer/lexical_region_resolve/mod.rs
new file mode 100644
index 0000000000..b7278ecd5e
--- /dev/null
+++ b/src/librustc_infer/infer/lexical_region_resolve/mod.rs
@@ -0,0 +1,1029 @@
+//! Lexical region resolution.
+
+use crate::infer::region_constraints::Constraint;
+use crate::infer::region_constraints::GenericKind;
+use crate::infer::region_constraints::MemberConstraint;
+use crate::infer::region_constraints::RegionConstraintData;
+use crate::infer::region_constraints::VarInfos;
+use crate::infer::region_constraints::VerifyBound;
+use crate::infer::RegionVariableOrigin;
+use crate::infer::SubregionOrigin;
+use rustc::middle::free_region::RegionRelations;
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::{self, Ty, TyCtxt};
+use rustc::ty::{ReEarlyBound, ReEmpty, ReErased, ReFree, ReStatic};
+use rustc::ty::{ReLateBound, RePlaceholder, ReScope, ReVar};
+use rustc::ty::{Region, RegionVid};
+use rustc_data_structures::fx::FxHashSet;
+use rustc_data_structures::graph::implementation::{
+    Direction, Graph, NodeIndex, INCOMING, OUTGOING,
+};
+use rustc_index::vec::{Idx, IndexVec};
+use rustc_span::Span;
+use std::fmt;
+
+mod graphviz;
+
+/// This function performs lexical region resolution given a complete
+/// set of constraints and variable origins. It performs a fixed-point
+/// iteration to find region values which satisfy all constraints,
+/// assuming such values can be found. It returns the final values of
+/// all the variables as well as a set of errors that must be reported.
+pub fn resolve<'tcx>(
+    region_rels: &RegionRelations<'_, 'tcx>,
+    var_infos: VarInfos,
+    data: RegionConstraintData<'tcx>,
+) -> (LexicalRegionResolutions<'tcx>, Vec<RegionResolutionError<'tcx>>) {
+    debug!("RegionConstraintData: resolve_regions()");
+    let mut errors = vec![];
+    let mut resolver = LexicalResolver { region_rels, var_infos, data };
+    let values = resolver.infer_variable_values(&mut errors);
+    (values, errors)
+}
+
+/// Contains the result of lexical region resolution. Offers methods
+/// to lookup up the final value of a region variable.
+pub struct LexicalRegionResolutions<'tcx> {
+    values: IndexVec<RegionVid, VarValue<'tcx>>,
+    error_region: ty::Region<'tcx>,
+}
+
+#[derive(Copy, Clone, Debug)]
+enum VarValue<'tcx> {
+    Value(Region<'tcx>),
+    ErrorValue,
+}
+
+#[derive(Clone, Debug)]
+pub enum RegionResolutionError<'tcx> {
+    /// `ConcreteFailure(o, a, b)`:
+    ///
+    /// `o` requires that `a <= b`, but this does not hold
+    ConcreteFailure(SubregionOrigin<'tcx>, Region<'tcx>, Region<'tcx>),
+
+    /// `GenericBoundFailure(p, s, a)
+    ///
+    /// The parameter/associated-type `p` must be known to outlive the lifetime
+    /// `a` (but none of the known bounds are sufficient).
+    GenericBoundFailure(SubregionOrigin<'tcx>, GenericKind<'tcx>, Region<'tcx>),
+
+    /// `SubSupConflict(v, v_origin, sub_origin, sub_r, sup_origin, sup_r)`:
+    ///
+    /// Could not infer a value for `v` (which has origin `v_origin`)
+    /// because `sub_r <= v` (due to `sub_origin`) but `v <= sup_r` (due to `sup_origin`) and
+    /// `sub_r <= sup_r` does not hold.
+    SubSupConflict(
+        RegionVid,
+        RegionVariableOrigin,
+        SubregionOrigin<'tcx>,
+        Region<'tcx>,
+        SubregionOrigin<'tcx>,
+        Region<'tcx>,
+    ),
+
+    /// Indicates a `'b: 'a` constraint where `'a` is in a universe that
+    /// cannot name the placeholder `'b`.
+    UpperBoundUniverseConflict(
+        RegionVid,
+        RegionVariableOrigin,
+        ty::UniverseIndex,     // the universe index of the region variable
+        SubregionOrigin<'tcx>, // cause of the constraint
+        Region<'tcx>,          // the placeholder `'b`
+    ),
+
+    /// Indicates a failure of a `MemberConstraint`. These arise during
+    /// impl trait processing explicitly -- basically, the impl trait's hidden type
+    /// included some region that it was not supposed to.
+    MemberConstraintFailure { span: Span, hidden_ty: Ty<'tcx>, member_region: Region<'tcx> },
+}
+
+struct RegionAndOrigin<'tcx> {
+    region: Region<'tcx>,
+    origin: SubregionOrigin<'tcx>,
+}
+
+type RegionGraph<'tcx> = Graph<(), Constraint<'tcx>>;
+
+struct LexicalResolver<'cx, 'tcx> {
+    region_rels: &'cx RegionRelations<'cx, 'tcx>,
+    var_infos: VarInfos,
+    data: RegionConstraintData<'tcx>,
+}
+
+impl<'cx, 'tcx> LexicalResolver<'cx, 'tcx> {
+    fn tcx(&self) -> TyCtxt<'tcx> {
+        self.region_rels.tcx
+    }
+
+    fn infer_variable_values(
+        &mut self,
+        errors: &mut Vec<RegionResolutionError<'tcx>>,
+    ) -> LexicalRegionResolutions<'tcx> {
+        let mut var_data = self.construct_var_data(self.tcx());
+
+        // Dorky hack to cause `dump_constraints` to only get called
+        // if debug mode is enabled:
+        debug!(
+            "----() End constraint listing (context={:?}) {:?}---",
+            self.region_rels.context,
+            self.dump_constraints(self.region_rels)
+        );
+        graphviz::maybe_print_constraints_for(&self.data, self.region_rels);
+
+        let graph = self.construct_graph();
+        self.expand_givens(&graph);
+        loop {
+            self.expansion(&mut var_data);
+            if !self.enforce_member_constraints(&graph, &mut var_data) {
+                break;
+            }
+        }
+        self.collect_errors(&mut var_data, errors);
+        self.collect_var_errors(&var_data, &graph, errors);
+        var_data
+    }
+
+    fn num_vars(&self) -> usize {
+        self.var_infos.len()
+    }
+
+    /// Initially, the value for all variables is set to `'empty`, the
+    /// empty region. The `expansion` phase will grow this larger.
+    fn construct_var_data(&self, tcx: TyCtxt<'tcx>) -> LexicalRegionResolutions<'tcx> {
+        LexicalRegionResolutions {
+            error_region: tcx.lifetimes.re_static,
+            values: IndexVec::from_fn_n(
+                |vid| {
+                    let vid_universe = self.var_infos[vid].universe;
+                    let re_empty = tcx.mk_region(ty::ReEmpty(vid_universe));
+                    VarValue::Value(re_empty)
+                },
+                self.num_vars(),
+            ),
+        }
+    }
+
+    fn dump_constraints(&self, free_regions: &RegionRelations<'_, 'tcx>) {
+        debug!("----() Start constraint listing (context={:?}) ()----", free_regions.context);
+        for (idx, (constraint, _)) in self.data.constraints.iter().enumerate() {
+            debug!("Constraint {} => {:?}", idx, constraint);
+        }
+    }
+
+    fn expand_givens(&mut self, graph: &RegionGraph<'_>) {
+        // Givens are a kind of horrible hack to account for
+        // constraints like 'c <= '0 that are known to hold due to
+        // closure signatures (see the comment above on the `givens`
+        // field). They should go away. But until they do, the role
+        // of this fn is to account for the transitive nature:
+        //
+        //     Given 'c <= '0
+        //     and   '0 <= '1
+        //     then  'c <= '1
+
+        let seeds: Vec<_> = self.data.givens.iter().cloned().collect();
+        for (r, vid) in seeds {
+            // While all things transitively reachable in the graph
+            // from the variable (`'0` in the example above).
+            let seed_index = NodeIndex(vid.index() as usize);
+            for succ_index in graph.depth_traverse(seed_index, OUTGOING) {
+                let succ_index = succ_index.0;
+
+                // The first N nodes correspond to the region
+                // variables. Other nodes correspond to constant
+                // regions.
+                if succ_index < self.num_vars() {
+                    let succ_vid = RegionVid::new(succ_index);
+
+                    // Add `'c <= '1`.
+                    self.data.givens.insert((r, succ_vid));
+                }
+            }
+        }
+    }
+
+    /// Enforce all member constraints and return true if anything
+    /// changed. See `enforce_member_constraint` for more details.
+    fn enforce_member_constraints(
+        &self,
+        graph: &RegionGraph<'tcx>,
+        var_values: &mut LexicalRegionResolutions<'tcx>,
+    ) -> bool {
+        // Note: we don't use the `any` combinator because we don't
+        // want to stop at the first constraint that makes a change.
+        let mut any_changed = false;
+        for member_constraint in &self.data.member_constraints {
+            any_changed |= self.enforce_member_constraint(graph, member_constraint, var_values);
+        }
+        any_changed
+    }
+
+    /// Enforce a constraint like
+    ///
+    /// ```
+    /// 'r member of ['c...]
+    /// ```
+    ///
+    /// We look for all choice regions from the list `'c...` that:
+    ///
+    /// (a) are greater than the current value of `'r` (which is a lower bound)
+    ///
+    /// and
+    ///
+    /// (b) are compatible with the upper bounds of `'r` that we can
+    /// find by traversing the graph.
+    ///
+    /// From that list, we look for a *minimal* option `'c_min`. If we
+    /// find one, then we can enforce that `'r: 'c_min`.
+    fn enforce_member_constraint(
+        &self,
+        graph: &RegionGraph<'tcx>,
+        member_constraint: &MemberConstraint<'tcx>,
+        var_values: &mut LexicalRegionResolutions<'tcx>,
+    ) -> bool {
+        debug!("enforce_member_constraint(member_constraint={:#?})", member_constraint);
+
+        // The constraint is some inference variable (`vid`) which
+        // must be equal to one of the options.
+        let member_vid = match member_constraint.member_region {
+            ty::ReVar(vid) => *vid,
+            _ => return false,
+        };
+
+        // The current value of `vid` is a lower bound LB -- i.e., we
+        // know that `LB <= vid` must be true.
+        let member_lower_bound: ty::Region<'tcx> = match var_values.value(member_vid) {
+            VarValue::ErrorValue => return false,
+            VarValue::Value(r) => r,
+        };
+
+        // Find all the "upper bounds" -- that is, each region `b` such that
+        // `r0 <= b` must hold.
+        let (member_upper_bounds, _) =
+            self.collect_concrete_regions(graph, member_vid, OUTGOING, None);
+
+        // Get an iterator over the *available choice* -- that is,
+        // each choice region `c` where `lb <= c` and `c <= ub` for all the
+        // upper bounds `ub`.
+        debug!("enforce_member_constraint: upper_bounds={:#?}", member_upper_bounds);
+        let mut options = member_constraint.choice_regions.iter().filter(|option| {
+            self.sub_concrete_regions(member_lower_bound, option)
+                && member_upper_bounds
+                    .iter()
+                    .all(|upper_bound| self.sub_concrete_regions(option, upper_bound.region))
+        });
+
+        // If there is more than one option, we only make a choice if
+        // there is a single *least* choice -- i.e., some available
+        // region that is `<=` all the others.
+        let mut least_choice: ty::Region<'tcx> = match options.next() {
+            Some(&r) => r,
+            None => return false,
+        };
+        debug!("enforce_member_constraint: least_choice={:?}", least_choice);
+        for &option in options {
+            debug!("enforce_member_constraint: option={:?}", option);
+            if !self.sub_concrete_regions(least_choice, option) {
+                if self.sub_concrete_regions(option, least_choice) {
+                    debug!("enforce_member_constraint: new least choice");
+                    least_choice = option;
+                } else {
+                    debug!("enforce_member_constraint: no least choice");
+                    return false;
+                }
+            }
+        }
+
+        debug!("enforce_member_constraint: final least choice = {:?}", least_choice);
+        if least_choice != member_lower_bound {
+            *var_values.value_mut(member_vid) = VarValue::Value(least_choice);
+            true
+        } else {
+            false
+        }
+    }
+
+    fn expansion(&self, var_values: &mut LexicalRegionResolutions<'tcx>) {
+        let mut constraints = IndexVec::from_elem_n(Vec::new(), var_values.values.len());
+        let mut changes = Vec::new();
+        for constraint in self.data.constraints.keys() {
+            let (a_vid, a_region, b_vid, b_data) = match *constraint {
+                Constraint::RegSubVar(a_region, b_vid) => {
+                    let b_data = var_values.value_mut(b_vid);
+                    (None, a_region, b_vid, b_data)
+                }
+                Constraint::VarSubVar(a_vid, b_vid) => match *var_values.value(a_vid) {
+                    VarValue::ErrorValue => continue,
+                    VarValue::Value(a_region) => {
+                        let b_data = var_values.value_mut(b_vid);
+                        (Some(a_vid), a_region, b_vid, b_data)
+                    }
+                },
+                Constraint::RegSubReg(..) | Constraint::VarSubReg(..) => {
+                    // These constraints are checked after expansion
+                    // is done, in `collect_errors`.
+                    continue;
+                }
+            };
+            if self.expand_node(a_region, b_vid, b_data) {
+                changes.push(b_vid);
+            }
+            if let Some(a_vid) = a_vid {
+                match *b_data {
+                    VarValue::Value(ReStatic) | VarValue::ErrorValue => (),
+                    _ => {
+                        constraints[a_vid].push((a_vid, b_vid));
+                        constraints[b_vid].push((a_vid, b_vid));
+                    }
+                }
+            }
+        }
+
+        while let Some(vid) = changes.pop() {
+            constraints[vid].retain(|&(a_vid, b_vid)| {
+                let a_region = match *var_values.value(a_vid) {
+                    VarValue::ErrorValue => return false,
+                    VarValue::Value(a_region) => a_region,
+                };
+                let b_data = var_values.value_mut(b_vid);
+                if self.expand_node(a_region, b_vid, b_data) {
+                    changes.push(b_vid);
+                }
+                match *b_data {
+                    VarValue::Value(ReStatic) | VarValue::ErrorValue => false,
+                    _ => true,
+                }
+            });
+        }
+    }
+
+    fn expand_node(
+        &self,
+        a_region: Region<'tcx>,
+        b_vid: RegionVid,
+        b_data: &mut VarValue<'tcx>,
+    ) -> bool {
+        debug!("expand_node({:?}, {:?} == {:?})", a_region, b_vid, b_data);
+
+        match *a_region {
+            // Check if this relationship is implied by a given.
+            ty::ReEarlyBound(_) | ty::ReFree(_) => {
+                if self.data.givens.contains(&(a_region, b_vid)) {
+                    debug!("given");
+                    return false;
+                }
+            }
+
+            _ => {}
+        }
+
+        match *b_data {
+            VarValue::Value(cur_region) => {
+                // Identical scopes can show up quite often, if the fixed point
+                // iteration converges slowly. Skip them. This is purely an
+                // optimization.
+                if let (ReScope(a_scope), ReScope(cur_scope)) = (a_region, cur_region) {
+                    if a_scope == cur_scope {
+                        return false;
+                    }
+                }
+
+                // This is a specialized version of the `lub_concrete_regions`
+                // check below for a common case, here purely as an
+                // optimization.
+                let b_universe = self.var_infos[b_vid].universe;
+                if let ReEmpty(a_universe) = a_region {
+                    if *a_universe == b_universe {
+                        return false;
+                    }
+                }
+
+                let mut lub = self.lub_concrete_regions(a_region, cur_region);
+                if lub == cur_region {
+                    return false;
+                }
+
+                // Watch out for `'b: !1` relationships, where the
+                // universe of `'b` can't name the placeholder `!1`. In
+                // that case, we have to grow `'b` to be `'static` for the
+                // relationship to hold. This is obviously a kind of sub-optimal
+                // choice -- in the future, when we incorporate a knowledge
+                // of the parameter environment, we might be able to find a
+                // tighter bound than `'static`.
+                //
+                // (This might e.g. arise from being asked to prove `for<'a> { 'b: 'a }`.)
+                if let ty::RePlaceholder(p) = lub {
+                    if b_universe.cannot_name(p.universe) {
+                        lub = self.tcx().lifetimes.re_static;
+                    }
+                }
+
+                debug!("Expanding value of {:?} from {:?} to {:?}", b_vid, cur_region, lub);
+
+                *b_data = VarValue::Value(lub);
+                return true;
+            }
+
+            VarValue::ErrorValue => {
+                return false;
+            }
+        }
+    }
+
+    /// True if `a <= b`, but not defined over inference variables.
+    fn sub_concrete_regions(&self, a: Region<'tcx>, b: Region<'tcx>) -> bool {
+        let tcx = self.tcx();
+        let sub_free_regions = |r1, r2| self.region_rels.free_regions.sub_free_regions(tcx, r1, r2);
+
+        // Check for the case where we know that `'b: 'static` -- in that case,
+        // `a <= b` for all `a`.
+        let b_free_or_static = self.region_rels.free_regions.is_free_or_static(b);
+        if b_free_or_static && sub_free_regions(tcx.lifetimes.re_static, b) {
+            return true;
+        }
+
+        // If both `a` and `b` are free, consult the declared
+        // relationships.  Note that this can be more precise than the
+        // `lub` relationship defined below, since sometimes the "lub"
+        // is actually the `postdom_upper_bound` (see
+        // `TransitiveRelation` for more details).
+        let a_free_or_static = self.region_rels.free_regions.is_free_or_static(a);
+        if a_free_or_static && b_free_or_static {
+            return sub_free_regions(a, b);
+        }
+
+        // For other cases, leverage the LUB code to find the LUB and
+        // check if it is equal to `b`.
+        self.lub_concrete_regions(a, b) == b
+    }
+
+    /// Returns the least-upper-bound of `a` and `b`; i.e., the
+    /// smallest region `c` such that `a <= c` and `b <= c`.
+    ///
+    /// Neither `a` nor `b` may be an inference variable (hence the
+    /// term "concrete regions").
+    fn lub_concrete_regions(&self, a: Region<'tcx>, b: Region<'tcx>) -> Region<'tcx> {
+        let r = match (a, b) {
+            (&ty::ReClosureBound(..), _)
+            | (_, &ty::ReClosureBound(..))
+            | (&ReLateBound(..), _)
+            | (_, &ReLateBound(..))
+            | (&ReErased, _)
+            | (_, &ReErased) => {
+                bug!("cannot relate region: LUB({:?}, {:?})", a, b);
+            }
+
+            (&ReVar(v_id), _) | (_, &ReVar(v_id)) => {
+                span_bug!(
+                    self.var_infos[v_id].origin.span(),
+                    "lub_concrete_regions invoked with non-concrete \
+                     regions: {:?}, {:?}",
+                    a,
+                    b
+                );
+            }
+
+            (&ReStatic, _) | (_, &ReStatic) => {
+                // nothing lives longer than `'static`
+                self.tcx().lifetimes.re_static
+            }
+
+            (&ReEmpty(_), r @ ReEarlyBound(_))
+            | (r @ ReEarlyBound(_), &ReEmpty(_))
+            | (&ReEmpty(_), r @ ReFree(_))
+            | (r @ ReFree(_), &ReEmpty(_))
+            | (&ReEmpty(_), r @ ReScope(_))
+            | (r @ ReScope(_), &ReEmpty(_)) => {
+                // All empty regions are less than early-bound, free,
+                // and scope regions.
+                r
+            }
+
+            (&ReEmpty(a_ui), &ReEmpty(b_ui)) => {
+                // Empty regions are ordered according to the universe
+                // they are associated with.
+                let ui = a_ui.min(b_ui);
+                self.tcx().mk_region(ReEmpty(ui))
+            }
+
+            (&ReEmpty(empty_ui), &RePlaceholder(placeholder))
+            | (&RePlaceholder(placeholder), &ReEmpty(empty_ui)) => {
+                // If this empty region is from a universe that can
+                // name the placeholder, then the placeholder is
+                // larger; otherwise, the only ancestor is `'static`.
+                if empty_ui.can_name(placeholder.universe) {
+                    self.tcx().mk_region(RePlaceholder(placeholder))
+                } else {
+                    self.tcx().lifetimes.re_static
+                }
+            }
+
+            (&ReEarlyBound(_), &ReScope(s_id))
+            | (&ReScope(s_id), &ReEarlyBound(_))
+            | (&ReFree(_), &ReScope(s_id))
+            | (&ReScope(s_id), &ReFree(_)) => {
+                // A "free" region can be interpreted as "some region
+                // at least as big as fr.scope".  So, we can
+                // reasonably compare free regions and scopes:
+                let fr_scope = match (a, b) {
+                    (&ReEarlyBound(ref br), _) | (_, &ReEarlyBound(ref br)) => {
+                        self.region_rels.region_scope_tree.early_free_scope(self.tcx(), br)
+                    }
+                    (&ReFree(ref fr), _) | (_, &ReFree(ref fr)) => {
+                        self.region_rels.region_scope_tree.free_scope(self.tcx(), fr)
+                    }
+                    _ => bug!(),
+                };
+                let r_id =
+                    self.region_rels.region_scope_tree.nearest_common_ancestor(fr_scope, s_id);
+                if r_id == fr_scope {
+                    // if the free region's scope `fr.scope` is bigger than
+                    // the scope region `s_id`, then the LUB is the free
+                    // region itself:
+                    match (a, b) {
+                        (_, &ReScope(_)) => return a,
+                        (&ReScope(_), _) => return b,
+                        _ => bug!(),
+                    }
+                }
+
+                // otherwise, we don't know what the free region is,
+                // so we must conservatively say the LUB is static:
+                self.tcx().lifetimes.re_static
+            }
+
+            (&ReScope(a_id), &ReScope(b_id)) => {
+                // The region corresponding to an outer block is a
+                // subtype of the region corresponding to an inner
+                // block.
+                let lub = self.region_rels.region_scope_tree.nearest_common_ancestor(a_id, b_id);
+                self.tcx().mk_region(ReScope(lub))
+            }
+
+            (&ReEarlyBound(_), &ReEarlyBound(_))
+            | (&ReFree(_), &ReEarlyBound(_))
+            | (&ReEarlyBound(_), &ReFree(_))
+            | (&ReFree(_), &ReFree(_)) => self.region_rels.lub_free_regions(a, b),
+
+            // For these types, we cannot define any additional
+            // relationship:
+            (&RePlaceholder(..), _) | (_, &RePlaceholder(..)) => {
+                if a == b {
+                    a
+                } else {
+                    self.tcx().lifetimes.re_static
+                }
+            }
+        };
+
+        debug!("lub_concrete_regions({:?}, {:?}) = {:?}", a, b, r);
+
+        r
+    }
+
+    /// After expansion is complete, go and check upper bounds (i.e.,
+    /// cases where the region cannot grow larger than a fixed point)
+    /// and check that they are satisfied.
+    fn collect_errors(
+        &self,
+        var_data: &mut LexicalRegionResolutions<'tcx>,
+        errors: &mut Vec<RegionResolutionError<'tcx>>,
+    ) {
+        for (constraint, origin) in &self.data.constraints {
+            debug!("collect_errors: constraint={:?} origin={:?}", constraint, origin);
+            match *constraint {
+                Constraint::RegSubVar(..) | Constraint::VarSubVar(..) => {
+                    // Expansion will ensure that these constraints hold. Ignore.
+                }
+
+                Constraint::RegSubReg(sub, sup) => {
+                    if self.sub_concrete_regions(sub, sup) {
+                        continue;
+                    }
+
+                    debug!(
+                        "collect_errors: region error at {:?}: \
+                         cannot verify that {:?} <= {:?}",
+                        origin, sub, sup
+                    );
+
+                    errors.push(RegionResolutionError::ConcreteFailure(
+                        (*origin).clone(),
+                        sub,
+                        sup,
+                    ));
+                }
+
+                Constraint::VarSubReg(a_vid, b_region) => {
+                    let a_data = var_data.value_mut(a_vid);
+                    debug!("contraction: {:?} == {:?}, {:?}", a_vid, a_data, b_region);
+
+                    let a_region = match *a_data {
+                        VarValue::ErrorValue => continue,
+                        VarValue::Value(a_region) => a_region,
+                    };
+
+                    // Do not report these errors immediately:
+                    // instead, set the variable value to error and
+                    // collect them later.
+                    if !self.sub_concrete_regions(a_region, b_region) {
+                        debug!(
+                            "collect_errors: region error at {:?}: \
+                             cannot verify that {:?}={:?} <= {:?}",
+                            origin, a_vid, a_region, b_region
+                        );
+                        *a_data = VarValue::ErrorValue;
+                    }
+                }
+            }
+        }
+
+        // Check that all member constraints are satisfied.
+        for member_constraint in &self.data.member_constraints {
+            let member_region = var_data.normalize(self.tcx(), member_constraint.member_region);
+            let choice_regions = member_constraint
+                .choice_regions
+                .iter()
+                .map(|&choice_region| var_data.normalize(self.tcx(), choice_region));
+            if !choice_regions.clone().any(|choice_region| member_region == choice_region) {
+                let span = self.tcx().def_span(member_constraint.opaque_type_def_id);
+                errors.push(RegionResolutionError::MemberConstraintFailure {
+                    span,
+                    hidden_ty: member_constraint.hidden_ty,
+                    member_region,
+                });
+            }
+        }
+
+        for verify in &self.data.verifys {
+            debug!("collect_errors: verify={:?}", verify);
+            let sub = var_data.normalize(self.tcx(), verify.region);
+
+            let verify_kind_ty = verify.kind.to_ty(self.tcx());
+            if self.bound_is_met(&verify.bound, var_data, verify_kind_ty, sub) {
+                continue;
+            }
+
+            debug!(
+                "collect_errors: region error at {:?}: \
+                 cannot verify that {:?} <= {:?}",
+                verify.origin, verify.region, verify.bound
+            );
+
+            errors.push(RegionResolutionError::GenericBoundFailure(
+                verify.origin.clone(),
+                verify.kind,
+                sub,
+            ));
+        }
+    }
+
+    /// Go over the variables that were declared to be error variables
+    /// and create a `RegionResolutionError` for each of them.
+    fn collect_var_errors(
+        &self,
+        var_data: &LexicalRegionResolutions<'tcx>,
+        graph: &RegionGraph<'tcx>,
+        errors: &mut Vec<RegionResolutionError<'tcx>>,
+    ) {
+        debug!("collect_var_errors");
+
+        // This is the best way that I have found to suppress
+        // duplicate and related errors. Basically we keep a set of
+        // flags for every node. Whenever an error occurs, we will
+        // walk some portion of the graph looking to find pairs of
+        // conflicting regions to report to the user. As we walk, we
+        // trip the flags from false to true, and if we find that
+        // we've already reported an error involving any particular
+        // node we just stop and don't report the current error.  The
+        // idea is to report errors that derive from independent
+        // regions of the graph, but not those that derive from
+        // overlapping locations.
+        let mut dup_vec = IndexVec::from_elem_n(None, self.num_vars());
+
+        for (node_vid, value) in var_data.values.iter_enumerated() {
+            match *value {
+                VarValue::Value(_) => { /* Inference successful */ }
+                VarValue::ErrorValue => {
+                    // Inference impossible: this value contains
+                    // inconsistent constraints.
+                    //
+                    // I think that in this case we should report an
+                    // error now -- unlike the case above, we can't
+                    // wait to see whether the user needs the result
+                    // of this variable. The reason is that the mere
+                    // existence of this variable implies that the
+                    // region graph is inconsistent, whether or not it
+                    // is used.
+                    //
+                    // For example, we may have created a region
+                    // variable that is the GLB of two other regions
+                    // which do not have a GLB. Even if that variable
+                    // is not used, it implies that those two regions
+                    // *should* have a GLB.
+                    //
+                    // At least I think this is true. It may be that
+                    // the mere existence of a conflict in a region
+                    // variable that is not used is not a problem, so
+                    // if this rule starts to create problems we'll
+                    // have to revisit this portion of the code and
+                    // think hard about it. =) -- nikomatsakis
+                    self.collect_error_for_expanding_node(graph, &mut dup_vec, node_vid, errors);
+                }
+            }
+        }
+    }
+
+    fn construct_graph(&self) -> RegionGraph<'tcx> {
+        let num_vars = self.num_vars();
+
+        let mut graph = Graph::new();
+
+        for _ in 0..num_vars {
+            graph.add_node(());
+        }
+
+        // Issue #30438: two distinct dummy nodes, one for incoming
+        // edges (dummy_source) and another for outgoing edges
+        // (dummy_sink). In `dummy -> a -> b -> dummy`, using one
+        // dummy node leads one to think (erroneously) there exists a
+        // path from `b` to `a`. Two dummy nodes sidesteps the issue.
+        let dummy_source = graph.add_node(());
+        let dummy_sink = graph.add_node(());
+
+        for constraint in self.data.constraints.keys() {
+            match *constraint {
+                Constraint::VarSubVar(a_id, b_id) => {
+                    graph.add_edge(
+                        NodeIndex(a_id.index() as usize),
+                        NodeIndex(b_id.index() as usize),
+                        *constraint,
+                    );
+                }
+                Constraint::RegSubVar(_, b_id) => {
+                    graph.add_edge(dummy_source, NodeIndex(b_id.index() as usize), *constraint);
+                }
+                Constraint::VarSubReg(a_id, _) => {
+                    graph.add_edge(NodeIndex(a_id.index() as usize), dummy_sink, *constraint);
+                }
+                Constraint::RegSubReg(..) => {
+                    // this would be an edge from `dummy_source` to
+                    // `dummy_sink`; just ignore it.
+                }
+            }
+        }
+
+        return graph;
+    }
+
+    fn collect_error_for_expanding_node(
+        &self,
+        graph: &RegionGraph<'tcx>,
+        dup_vec: &mut IndexVec<RegionVid, Option<RegionVid>>,
+        node_idx: RegionVid,
+        errors: &mut Vec<RegionResolutionError<'tcx>>,
+    ) {
+        // Errors in expanding nodes result from a lower-bound that is
+        // not contained by an upper-bound.
+        let (mut lower_bounds, lower_dup) =
+            self.collect_concrete_regions(graph, node_idx, INCOMING, Some(dup_vec));
+        let (mut upper_bounds, upper_dup) =
+            self.collect_concrete_regions(graph, node_idx, OUTGOING, Some(dup_vec));
+
+        if lower_dup || upper_dup {
+            return;
+        }
+
+        // We place free regions first because we are special casing
+        // SubSupConflict(ReFree, ReFree) when reporting error, and so
+        // the user will more likely get a specific suggestion.
+        fn region_order_key(x: &RegionAndOrigin<'_>) -> u8 {
+            match *x.region {
+                ReEarlyBound(_) => 0,
+                ReFree(_) => 1,
+                _ => 2,
+            }
+        }
+        lower_bounds.sort_by_key(region_order_key);
+        upper_bounds.sort_by_key(region_order_key);
+
+        let node_universe = self.var_infos[node_idx].universe;
+
+        for lower_bound in &lower_bounds {
+            let effective_lower_bound = if let ty::RePlaceholder(p) = lower_bound.region {
+                if node_universe.cannot_name(p.universe) {
+                    self.tcx().lifetimes.re_static
+                } else {
+                    lower_bound.region
+                }
+            } else {
+                lower_bound.region
+            };
+
+            for upper_bound in &upper_bounds {
+                if !self.sub_concrete_regions(effective_lower_bound, upper_bound.region) {
+                    let origin = self.var_infos[node_idx].origin;
+                    debug!(
+                        "region inference error at {:?} for {:?}: SubSupConflict sub: {:?} \
+                         sup: {:?}",
+                        origin, node_idx, lower_bound.region, upper_bound.region
+                    );
+                    errors.push(RegionResolutionError::SubSupConflict(
+                        node_idx,
+                        origin,
+                        lower_bound.origin.clone(),
+                        lower_bound.region,
+                        upper_bound.origin.clone(),
+                        upper_bound.region,
+                    ));
+                    return;
+                }
+            }
+        }
+
+        // If we have a scenario like `exists<'a> { forall<'b> { 'b:
+        // 'a } }`, we wind up without any lower-bound -- all we have
+        // are placeholders as upper bounds, but the universe of the
+        // variable `'a` doesn't permit those placeholders.
+        for upper_bound in &upper_bounds {
+            if let ty::RePlaceholder(p) = upper_bound.region {
+                if node_universe.cannot_name(p.universe) {
+                    let origin = self.var_infos[node_idx].origin;
+                    errors.push(RegionResolutionError::UpperBoundUniverseConflict(
+                        node_idx,
+                        origin,
+                        node_universe,
+                        upper_bound.origin.clone(),
+                        upper_bound.region,
+                    ));
+                    return;
+                }
+            }
+        }
+
+        // Errors in earlier passes can yield error variables without
+        // resolution errors here; delay ICE in favor of those errors.
+        self.tcx().sess.delay_span_bug(
+            self.var_infos[node_idx].origin.span(),
+            &format!(
+                "collect_error_for_expanding_node() could not find \
+                 error for var {:?} in universe {:?}, lower_bounds={:#?}, \
+                 upper_bounds={:#?}",
+                node_idx, node_universe, lower_bounds, upper_bounds
+            ),
+        );
+    }
+
+    fn collect_concrete_regions(
+        &self,
+        graph: &RegionGraph<'tcx>,
+        orig_node_idx: RegionVid,
+        dir: Direction,
+        mut dup_vec: Option<&mut IndexVec<RegionVid, Option<RegionVid>>>,
+    ) -> (Vec<RegionAndOrigin<'tcx>>, bool) {
+        struct WalkState<'tcx> {
+            set: FxHashSet<RegionVid>,
+            stack: Vec<RegionVid>,
+            result: Vec<RegionAndOrigin<'tcx>>,
+            dup_found: bool,
+        }
+        let mut state = WalkState {
+            set: Default::default(),
+            stack: vec![orig_node_idx],
+            result: Vec::new(),
+            dup_found: false,
+        };
+        state.set.insert(orig_node_idx);
+
+        // to start off the process, walk the source node in the
+        // direction specified
+        process_edges(&self.data, &mut state, graph, orig_node_idx, dir);
+
+        while !state.stack.is_empty() {
+            let node_idx = state.stack.pop().unwrap();
+
+            // check whether we've visited this node on some previous walk
+            if let Some(dup_vec) = &mut dup_vec {
+                if dup_vec[node_idx].is_none() {
+                    dup_vec[node_idx] = Some(orig_node_idx);
+                } else if dup_vec[node_idx] != Some(orig_node_idx) {
+                    state.dup_found = true;
+                }
+
+                debug!(
+                    "collect_concrete_regions(orig_node_idx={:?}, node_idx={:?})",
+                    orig_node_idx, node_idx
+                );
+            }
+
+            process_edges(&self.data, &mut state, graph, node_idx, dir);
+        }
+
+        let WalkState { result, dup_found, .. } = state;
+        return (result, dup_found);
+
+        fn process_edges<'tcx>(
+            this: &RegionConstraintData<'tcx>,
+            state: &mut WalkState<'tcx>,
+            graph: &RegionGraph<'tcx>,
+            source_vid: RegionVid,
+            dir: Direction,
+        ) {
+            debug!("process_edges(source_vid={:?}, dir={:?})", source_vid, dir);
+
+            let source_node_index = NodeIndex(source_vid.index() as usize);
+            for (_, edge) in graph.adjacent_edges(source_node_index, dir) {
+                match edge.data {
+                    Constraint::VarSubVar(from_vid, to_vid) => {
+                        let opp_vid = if from_vid == source_vid { to_vid } else { from_vid };
+                        if state.set.insert(opp_vid) {
+                            state.stack.push(opp_vid);
+                        }
+                    }
+
+                    Constraint::RegSubVar(region, _) | Constraint::VarSubReg(_, region) => {
+                        state.result.push(RegionAndOrigin {
+                            region,
+                            origin: this.constraints.get(&edge.data).unwrap().clone(),
+                        });
+                    }
+
+                    Constraint::RegSubReg(..) => panic!(
+                        "cannot reach reg-sub-reg edge in region inference \
+                         post-processing"
+                    ),
+                }
+            }
+        }
+    }
+
+    fn bound_is_met(
+        &self,
+        bound: &VerifyBound<'tcx>,
+        var_values: &LexicalRegionResolutions<'tcx>,
+        generic_ty: Ty<'tcx>,
+        min: ty::Region<'tcx>,
+    ) -> bool {
+        match bound {
+            VerifyBound::IfEq(k, b) => {
+                (var_values.normalize(self.region_rels.tcx, *k) == generic_ty)
+                    && self.bound_is_met(b, var_values, generic_ty, min)
+            }
+
+            VerifyBound::OutlivedBy(r) => {
+                self.sub_concrete_regions(min, var_values.normalize(self.tcx(), r))
+            }
+
+            VerifyBound::IsEmpty => {
+                if let ty::ReEmpty(_) = min {
+                    true
+                } else {
+                    false
+                }
+            }
+
+            VerifyBound::AnyBound(bs) => {
+                bs.iter().any(|b| self.bound_is_met(b, var_values, generic_ty, min))
+            }
+
+            VerifyBound::AllBounds(bs) => {
+                bs.iter().all(|b| self.bound_is_met(b, var_values, generic_ty, min))
+            }
+        }
+    }
+}
+
+impl<'tcx> fmt::Debug for RegionAndOrigin<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "RegionAndOrigin({:?},{:?})", self.region, self.origin)
+    }
+}
+
+impl<'tcx> LexicalRegionResolutions<'tcx> {
+    fn normalize<T>(&self, tcx: TyCtxt<'tcx>, value: T) -> T
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        tcx.fold_regions(&value, &mut false, |r, _db| match r {
+            ty::ReVar(rid) => self.resolve_var(*rid),
+            _ => r,
+        })
+    }
+
+    fn value(&self, rid: RegionVid) -> &VarValue<'tcx> {
+        &self.values[rid]
+    }
+
+    fn value_mut(&mut self, rid: RegionVid) -> &mut VarValue<'tcx> {
+        &mut self.values[rid]
+    }
+
+    pub fn resolve_var(&self, rid: RegionVid) -> ty::Region<'tcx> {
+        let result = match self.values[rid] {
+            VarValue::Value(r) => r,
+            VarValue::ErrorValue => self.error_region,
+        };
+        debug!("resolve_var({:?}) = {:?}", rid, result);
+        result
+    }
+}
diff --git a/src/librustc/infer/lub.rs b/src/librustc_infer/infer/lub.rs
similarity index 90%
rename from src/librustc/infer/lub.rs
rename to src/librustc_infer/infer/lub.rs
index b512d3df3e..20ddeec685 100644
--- a/src/librustc/infer/lub.rs
+++ b/src/librustc_infer/infer/lub.rs
@@ -4,8 +4,8 @@ use super::InferCtxt;
 use super::Subtype;
 
 use crate::traits::ObligationCause;
-use crate::ty::relate::{Relate, RelateResult, TypeRelation};
-use crate::ty::{self, Ty, TyCtxt};
+use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
+use rustc::ty::{self, Ty, TyCtxt};
 
 /// "Least upper bound" (common supertype)
 pub struct Lub<'combine, 'infcx, 'tcx> {
@@ -18,7 +18,7 @@ impl<'combine, 'infcx, 'tcx> Lub<'combine, 'infcx, 'tcx> {
         fields: &'combine mut CombineFields<'infcx, 'tcx>,
         a_is_expected: bool,
     ) -> Lub<'combine, 'infcx, 'tcx> {
-        Lub { fields: fields, a_is_expected: a_is_expected }
+        Lub { fields, a_is_expected }
     }
 }
 
@@ -66,7 +66,12 @@ impl TypeRelation<'tcx> for Lub<'combine, 'infcx, 'tcx> {
         debug!("{}.regions({:?}, {:?})", self.tag(), a, b);
 
         let origin = Subtype(box self.fields.trace.clone());
-        Ok(self.fields.infcx.borrow_region_constraints().lub_regions(self.tcx(), origin, a, b))
+        Ok(self.fields.infcx.inner.borrow_mut().unwrap_region_constraints().lub_regions(
+            self.tcx(),
+            origin,
+            a,
+            b,
+        ))
     }
 
     fn consts(
diff --git a/src/librustc_infer/infer/mod.rs b/src/librustc_infer/infer/mod.rs
new file mode 100644
index 0000000000..938a0e7ab3
--- /dev/null
+++ b/src/librustc_infer/infer/mod.rs
@@ -0,0 +1,1816 @@
+//! See the Book for more information.
+
+pub use self::freshen::TypeFreshener;
+pub use self::LateBoundRegionConversionTime::*;
+pub use self::RegionVariableOrigin::*;
+pub use self::SubregionOrigin::*;
+pub use self::ValuePairs::*;
+pub use rustc::ty::IntVarValue;
+
+use crate::traits::{self, ObligationCause, PredicateObligations, TraitEngine};
+
+use rustc::infer::canonical::{Canonical, CanonicalVarValues};
+use rustc::infer::unify_key::{ConstVarValue, ConstVariableValue};
+use rustc::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind, ToType};
+use rustc::middle::free_region::RegionRelations;
+use rustc::middle::lang_items;
+use rustc::middle::region;
+use rustc::mir;
+use rustc::mir::interpret::ConstEvalResult;
+use rustc::session::config::BorrowckMode;
+use rustc::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
+use rustc::ty::fold::{TypeFoldable, TypeFolder};
+use rustc::ty::relate::RelateResult;
+use rustc::ty::subst::{GenericArg, InternalSubsts, SubstsRef};
+use rustc::ty::{self, GenericParamDefKind, InferConst, Ty, TyCtxt};
+use rustc::ty::{ConstVid, FloatVid, IntVid, TyVid};
+
+use rustc_ast::ast;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::sync::Lrc;
+use rustc_data_structures::unify as ut;
+use rustc_errors::DiagnosticBuilder;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_span::symbol::Symbol;
+use rustc_span::Span;
+use std::cell::{Cell, Ref, RefCell};
+use std::collections::BTreeMap;
+use std::fmt;
+
+use self::combine::CombineFields;
+use self::lexical_region_resolve::LexicalRegionResolutions;
+use self::outlives::env::OutlivesEnvironment;
+use self::region_constraints::{GenericKind, RegionConstraintData, VarInfos, VerifyBound};
+use self::region_constraints::{RegionConstraintCollector, RegionSnapshot};
+use self::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+
+pub mod at;
+pub mod canonical;
+mod combine;
+mod equate;
+pub mod error_reporting;
+mod freshen;
+mod fudge;
+mod glb;
+mod higher_ranked;
+pub mod lattice;
+mod lexical_region_resolve;
+mod lub;
+pub mod nll_relate;
+pub mod opaque_types;
+pub mod outlives;
+pub mod region_constraints;
+pub mod resolve;
+mod sub;
+pub mod type_variable;
+
+use crate::infer::canonical::OriginalQueryValues;
+pub use rustc::infer::unify_key;
+
+#[must_use]
+#[derive(Debug)]
+pub struct InferOk<'tcx, T> {
+    pub value: T,
+    pub obligations: PredicateObligations<'tcx>,
+}
+pub type InferResult<'tcx, T> = Result<InferOk<'tcx, T>, TypeError<'tcx>>;
+
+pub type Bound<T> = Option<T>;
+pub type UnitResult<'tcx> = RelateResult<'tcx, ()>; // "unify result"
+pub type FixupResult<'tcx, T> = Result<T, FixupError<'tcx>>; // "fixup result"
+
+/// A flag that is used to suppress region errors. This is normally
+/// false, but sometimes -- when we are doing region checks that the
+/// NLL borrow checker will also do -- it might be set to true.
+#[derive(Copy, Clone, Default, Debug)]
+pub struct SuppressRegionErrors {
+    suppressed: bool,
+}
+
+impl SuppressRegionErrors {
+    pub fn suppressed(self) -> bool {
+        self.suppressed
+    }
+
+    /// Indicates that the MIR borrowck will repeat these region
+    /// checks, so we should ignore errors if NLL is (unconditionally)
+    /// enabled.
+    pub fn when_nll_is_enabled(tcx: TyCtxt<'_>) -> Self {
+        // FIXME(Centril): Once we actually remove `::Migrate` also make
+        // this always `true` and then proceed to eliminate the dead code.
+        match tcx.borrowck_mode() {
+            // If we're on Migrate mode, report AST region errors
+            BorrowckMode::Migrate => SuppressRegionErrors { suppressed: false },
+
+            // If we're on MIR, don't report AST region errors as they should be reported by NLL
+            BorrowckMode::Mir => SuppressRegionErrors { suppressed: true },
+        }
+    }
+}
+
+/// This type contains all the things within `InferCtxt` that sit within a
+/// `RefCell` and are involved with taking/rolling back snapshots. Snapshot
+/// operations are hot enough that we want only one call to `borrow_mut` per
+/// call to `start_snapshot` and `rollback_to`.
+pub struct InferCtxtInner<'tcx> {
+    /// Cache for projections. This cache is snapshotted along with the infcx.
+    ///
+    /// Public so that `traits::project` can use it.
+    pub projection_cache: traits::ProjectionCache<'tcx>,
+
+    /// We instantiate `UnificationTable` with `bounds<Ty>` because the types
+    /// that might instantiate a general type variable have an order,
+    /// represented by its upper and lower bounds.
+    type_variables: type_variable::TypeVariableTable<'tcx>,
+
+    /// Map from const parameter variable to the kind of const it represents.
+    const_unification_table: ut::UnificationTable<ut::InPlace<ty::ConstVid<'tcx>>>,
+
+    /// Map from integral variable to the kind of integer it represents.
+    int_unification_table: ut::UnificationTable<ut::InPlace<ty::IntVid>>,
+
+    /// Map from floating variable to the kind of float it represents.
+    float_unification_table: ut::UnificationTable<ut::InPlace<ty::FloatVid>>,
+
+    /// Tracks the set of region variables and the constraints between them.
+    /// This is initially `Some(_)` but when
+    /// `resolve_regions_and_report_errors` is invoked, this gets set to `None`
+    /// -- further attempts to perform unification, etc., may fail if new
+    /// region constraints would've been added.
+    region_constraints: Option<RegionConstraintCollector<'tcx>>,
+
+    /// A set of constraints that regionck must validate. Each
+    /// constraint has the form `T:'a`, meaning "some type `T` must
+    /// outlive the lifetime 'a". These constraints derive from
+    /// instantiated type parameters. So if you had a struct defined
+    /// like
+    ///
+    ///     struct Foo<T:'static> { ... }
+    ///
+    /// then in some expression `let x = Foo { ... }` it will
+    /// instantiate the type parameter `T` with a fresh type `$0`. At
+    /// the same time, it will record a region obligation of
+    /// `$0:'static`. This will get checked later by regionck. (We
+    /// can't generally check these things right away because we have
+    /// to wait until types are resolved.)
+    ///
+    /// These are stored in a map keyed to the id of the innermost
+    /// enclosing fn body / static initializer expression. This is
+    /// because the location where the obligation was incurred can be
+    /// relevant with respect to which sublifetime assumptions are in
+    /// place. The reason that we store under the fn-id, and not
+    /// something more fine-grained, is so that it is easier for
+    /// regionck to be sure that it has found *all* the region
+    /// obligations (otherwise, it's easy to fail to walk to a
+    /// particular node-id).
+    ///
+    /// Before running `resolve_regions_and_report_errors`, the creator
+    /// of the inference context is expected to invoke
+    /// `process_region_obligations` (defined in `self::region_obligations`)
+    /// for each body-id in this map, which will process the
+    /// obligations within. This is expected to be done 'late enough'
+    /// that all type inference variables have been bound and so forth.
+    pub region_obligations: Vec<(hir::HirId, RegionObligation<'tcx>)>,
+}
+
+impl<'tcx> InferCtxtInner<'tcx> {
+    fn new() -> InferCtxtInner<'tcx> {
+        InferCtxtInner {
+            projection_cache: Default::default(),
+            type_variables: type_variable::TypeVariableTable::new(),
+            const_unification_table: ut::UnificationTable::new(),
+            int_unification_table: ut::UnificationTable::new(),
+            float_unification_table: ut::UnificationTable::new(),
+            region_constraints: Some(RegionConstraintCollector::new()),
+            region_obligations: vec![],
+        }
+    }
+
+    pub fn unwrap_region_constraints(&mut self) -> &mut RegionConstraintCollector<'tcx> {
+        self.region_constraints.as_mut().expect("region constraints already solved")
+    }
+}
+
+pub struct InferCtxt<'a, 'tcx> {
+    pub tcx: TyCtxt<'tcx>,
+
+    /// During type-checking/inference of a body, `in_progress_tables`
+    /// contains a reference to the tables being built up, which are
+    /// used for reading closure kinds/signatures as they are inferred,
+    /// and for error reporting logic to read arbitrary node types.
+    pub in_progress_tables: Option<&'a RefCell<ty::TypeckTables<'tcx>>>,
+
+    pub inner: RefCell<InferCtxtInner<'tcx>>,
+
+    /// If set, this flag causes us to skip the 'leak check' during
+    /// higher-ranked subtyping operations. This flag is a temporary one used
+    /// to manage the removal of the leak-check: for the time being, we still run the
+    /// leak-check, but we issue warnings. This flag can only be set to true
+    /// when entering a snapshot.
+    skip_leak_check: Cell<bool>,
+
+    /// Once region inference is done, the values for each variable.
+    lexical_region_resolutions: RefCell<Option<LexicalRegionResolutions<'tcx>>>,
+
+    /// Caches the results of trait selection. This cache is used
+    /// for things that have to do with the parameters in scope.
+    pub selection_cache: traits::SelectionCache<'tcx>,
+
+    /// Caches the results of trait evaluation.
+    pub evaluation_cache: traits::EvaluationCache<'tcx>,
+
+    /// the set of predicates on which errors have been reported, to
+    /// avoid reporting the same error twice.
+    pub reported_trait_errors: RefCell<FxHashMap<Span, Vec<ty::Predicate<'tcx>>>>,
+
+    pub reported_closure_mismatch: RefCell<FxHashSet<(Span, Option<Span>)>>,
+
+    /// When an error occurs, we want to avoid reporting "derived"
+    /// errors that are due to this original failure. Normally, we
+    /// handle this with the `err_count_on_creation` count, which
+    /// basically just tracks how many errors were reported when we
+    /// started type-checking a fn and checks to see if any new errors
+    /// have been reported since then. Not great, but it works.
+    ///
+    /// However, when errors originated in other passes -- notably
+    /// resolve -- this heuristic breaks down. Therefore, we have this
+    /// auxiliary flag that one can set whenever one creates a
+    /// type-error that is due to an error in a prior pass.
+    ///
+    /// Don't read this flag directly, call `is_tainted_by_errors()`
+    /// and `set_tainted_by_errors()`.
+    tainted_by_errors_flag: Cell<bool>,
+
+    /// Track how many errors were reported when this infcx is created.
+    /// If the number of errors increases, that's also a sign (line
+    /// `tained_by_errors`) to avoid reporting certain kinds of errors.
+    // FIXME(matthewjasper) Merge into `tainted_by_errors_flag`
+    err_count_on_creation: usize,
+
+    /// This flag is true while there is an active snapshot.
+    in_snapshot: Cell<bool>,
+
+    /// What is the innermost universe we have created? Starts out as
+    /// `UniverseIndex::root()` but grows from there as we enter
+    /// universal quantifiers.
+    ///
+    /// N.B., at present, we exclude the universal quantifiers on the
+    /// item we are type-checking, and just consider those names as
+    /// part of the root universe. So this would only get incremented
+    /// when we enter into a higher-ranked (`for<..>`) type or trait
+    /// bound.
+    universe: Cell<ty::UniverseIndex>,
+}
+
+/// A map returned by `replace_bound_vars_with_placeholders()`
+/// indicating the placeholder region that each late-bound region was
+/// replaced with.
+pub type PlaceholderMap<'tcx> = BTreeMap<ty::BoundRegion, ty::Region<'tcx>>;
+
+/// See the `error_reporting` module for more details.
+#[derive(Clone, Debug, PartialEq, Eq, TypeFoldable)]
+pub enum ValuePairs<'tcx> {
+    Types(ExpectedFound<Ty<'tcx>>),
+    Regions(ExpectedFound<ty::Region<'tcx>>),
+    Consts(ExpectedFound<&'tcx ty::Const<'tcx>>),
+    TraitRefs(ExpectedFound<ty::TraitRef<'tcx>>),
+    PolyTraitRefs(ExpectedFound<ty::PolyTraitRef<'tcx>>),
+}
+
+/// The trace designates the path through inference that we took to
+/// encounter an error or subtyping constraint.
+///
+/// See the `error_reporting` module for more details.
+#[derive(Clone, Debug)]
+pub struct TypeTrace<'tcx> {
+    cause: ObligationCause<'tcx>,
+    values: ValuePairs<'tcx>,
+}
+
+/// The origin of a `r1 <= r2` constraint.
+///
+/// See `error_reporting` module for more details
+#[derive(Clone, Debug)]
+pub enum SubregionOrigin<'tcx> {
+    /// Arose from a subtyping relation
+    Subtype(Box<TypeTrace<'tcx>>),
+
+    /// Stack-allocated closures cannot outlive innermost loop
+    /// or function so as to ensure we only require finite stack
+    InfStackClosure(Span),
+
+    /// Invocation of closure must be within its lifetime
+    InvokeClosure(Span),
+
+    /// Dereference of reference must be within its lifetime
+    DerefPointer(Span),
+
+    /// Closure bound must not outlive captured variables
+    ClosureCapture(Span, hir::HirId),
+
+    /// Index into slice must be within its lifetime
+    IndexSlice(Span),
+
+    /// When casting `&'a T` to an `&'b Trait` object,
+    /// relating `'a` to `'b`
+    RelateObjectBound(Span),
+
+    /// Some type parameter was instantiated with the given type,
+    /// and that type must outlive some region.
+    RelateParamBound(Span, Ty<'tcx>),
+
+    /// The given region parameter was instantiated with a region
+    /// that must outlive some other region.
+    RelateRegionParamBound(Span),
+
+    /// A bound placed on type parameters that states that must outlive
+    /// the moment of their instantiation.
+    RelateDefaultParamBound(Span, Ty<'tcx>),
+
+    /// Creating a pointer `b` to contents of another reference
+    Reborrow(Span),
+
+    /// Creating a pointer `b` to contents of an upvar
+    ReborrowUpvar(Span, ty::UpvarId),
+
+    /// Data with type `Ty<'tcx>` was borrowed
+    DataBorrowed(Ty<'tcx>, Span),
+
+    /// (&'a &'b T) where a >= b
+    ReferenceOutlivesReferent(Ty<'tcx>, Span),
+
+    /// Type or region parameters must be in scope.
+    ParameterInScope(ParameterOrigin, Span),
+
+    /// The type T of an expression E must outlive the lifetime for E.
+    ExprTypeIsNotInScope(Ty<'tcx>, Span),
+
+    /// A `ref b` whose region does not enclose the decl site
+    BindingTypeIsNotValidAtDecl(Span),
+
+    /// Regions appearing in a method receiver must outlive method call
+    CallRcvr(Span),
+
+    /// Regions appearing in a function argument must outlive func call
+    CallArg(Span),
+
+    /// Region in return type of invoked fn must enclose call
+    CallReturn(Span),
+
+    /// Operands must be in scope
+    Operand(Span),
+
+    /// Region resulting from a `&` expr must enclose the `&` expr
+    AddrOf(Span),
+
+    /// An auto-borrow that does not enclose the expr where it occurs
+    AutoBorrow(Span),
+
+    /// Region constraint arriving from destructor safety
+    SafeDestructor(Span),
+
+    /// Comparing the signature and requirements of an impl method against
+    /// the containing trait.
+    CompareImplMethodObligation {
+        span: Span,
+        item_name: ast::Name,
+        impl_item_def_id: DefId,
+        trait_item_def_id: DefId,
+    },
+}
+
+// `SubregionOrigin` is used a lot. Make sure it doesn't unintentionally get bigger.
+#[cfg(target_arch = "x86_64")]
+static_assert_size!(SubregionOrigin<'_>, 32);
+
+/// Places that type/region parameters can appear.
+#[derive(Clone, Copy, Debug)]
+pub enum ParameterOrigin {
+    Path,               // foo::bar
+    MethodCall,         // foo.bar() <-- parameters on impl providing bar()
+    OverloadedOperator, // a + b when overloaded
+    OverloadedDeref,    // *a when overloaded
+}
+
+/// Times when we replace late-bound regions with variables:
+#[derive(Clone, Copy, Debug)]
+pub enum LateBoundRegionConversionTime {
+    /// when a fn is called
+    FnCall,
+
+    /// when two higher-ranked types are compared
+    HigherRankedType,
+
+    /// when projecting an associated type
+    AssocTypeProjection(DefId),
+}
+
+/// Reasons to create a region inference variable
+///
+/// See `error_reporting` module for more details
+#[derive(Copy, Clone, Debug)]
+pub enum RegionVariableOrigin {
+    /// Region variables created for ill-categorized reasons,
+    /// mostly indicates places in need of refactoring
+    MiscVariable(Span),
+
+    /// Regions created by a `&P` or `[...]` pattern
+    PatternRegion(Span),
+
+    /// Regions created by `&` operator
+    AddrOfRegion(Span),
+
+    /// Regions created as part of an autoref of a method receiver
+    Autoref(Span),
+
+    /// Regions created as part of an automatic coercion
+    Coercion(Span),
+
+    /// Region variables created as the values for early-bound regions
+    EarlyBoundRegion(Span, Symbol),
+
+    /// Region variables created for bound regions
+    /// in a function or method that is called
+    LateBoundRegion(Span, ty::BoundRegion, LateBoundRegionConversionTime),
+
+    UpvarRegion(ty::UpvarId, Span),
+
+    BoundRegionInCoherence(ast::Name),
+
+    /// This origin is used for the inference variables that we create
+    /// during NLL region processing.
+    NLL(NLLRegionVariableOrigin),
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum NLLRegionVariableOrigin {
+    /// During NLL region processing, we create variables for free
+    /// regions that we encounter in the function signature and
+    /// elsewhere. This origin indices we've got one of those.
+    FreeRegion,
+
+    /// "Universal" instantiation of a higher-ranked region (e.g.,
+    /// from a `for<'a> T` binder). Meant to represent "any region".
+    Placeholder(ty::PlaceholderRegion),
+
+    Existential {
+        /// If this is true, then this variable was created to represent a lifetime
+        /// bound in a `for` binder. For example, it might have been created to
+        /// represent the lifetime `'a` in a type like `for<'a> fn(&'a u32)`.
+        /// Such variables are created when we are trying to figure out if there
+        /// is any valid instantiation of `'a` that could fit into some scenario.
+        ///
+        /// This is used to inform error reporting: in the case that we are trying to
+        /// determine whether there is any valid instantiation of a `'a` variable that meets
+        /// some constraint C, we want to blame the "source" of that `for` type,
+        /// rather than blaming the source of the constraint C.
+        from_forall: bool,
+    },
+}
+
+impl NLLRegionVariableOrigin {
+    pub fn is_universal(self) -> bool {
+        match self {
+            NLLRegionVariableOrigin::FreeRegion => true,
+            NLLRegionVariableOrigin::Placeholder(..) => true,
+            NLLRegionVariableOrigin::Existential { .. } => false,
+        }
+    }
+
+    pub fn is_existential(self) -> bool {
+        !self.is_universal()
+    }
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum FixupError<'tcx> {
+    UnresolvedIntTy(IntVid),
+    UnresolvedFloatTy(FloatVid),
+    UnresolvedTy(TyVid),
+    UnresolvedConst(ConstVid<'tcx>),
+}
+
+/// See the `region_obligations` field for more information.
+#[derive(Clone)]
+pub struct RegionObligation<'tcx> {
+    pub sub_region: ty::Region<'tcx>,
+    pub sup_type: Ty<'tcx>,
+    pub origin: SubregionOrigin<'tcx>,
+}
+
+impl<'tcx> fmt::Display for FixupError<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use self::FixupError::*;
+
+        match *self {
+            UnresolvedIntTy(_) => write!(
+                f,
+                "cannot determine the type of this integer; \
+                 add a suffix to specify the type explicitly"
+            ),
+            UnresolvedFloatTy(_) => write!(
+                f,
+                "cannot determine the type of this number; \
+                 add a suffix to specify the type explicitly"
+            ),
+            UnresolvedTy(_) => write!(f, "unconstrained type"),
+            UnresolvedConst(_) => write!(f, "unconstrained const value"),
+        }
+    }
+}
+
+/// Helper type of a temporary returned by `tcx.infer_ctxt()`.
+/// Necessary because we can't write the following bound:
+/// `F: for<'b, 'tcx> where 'tcx FnOnce(InferCtxt<'b, 'tcx>)`.
+pub struct InferCtxtBuilder<'tcx> {
+    global_tcx: TyCtxt<'tcx>,
+    fresh_tables: Option<RefCell<ty::TypeckTables<'tcx>>>,
+}
+
+pub trait TyCtxtInferExt<'tcx> {
+    fn infer_ctxt(self) -> InferCtxtBuilder<'tcx>;
+}
+
+impl TyCtxtInferExt<'tcx> for TyCtxt<'tcx> {
+    fn infer_ctxt(self) -> InferCtxtBuilder<'tcx> {
+        InferCtxtBuilder { global_tcx: self, fresh_tables: None }
+    }
+}
+
+impl<'tcx> InferCtxtBuilder<'tcx> {
+    /// Used only by `rustc_typeck` during body type-checking/inference,
+    /// will initialize `in_progress_tables` with fresh `TypeckTables`.
+    pub fn with_fresh_in_progress_tables(mut self, table_owner: DefId) -> Self {
+        self.fresh_tables = Some(RefCell::new(ty::TypeckTables::empty(Some(table_owner))));
+        self
+    }
+
+    /// Given a canonical value `C` as a starting point, create an
+    /// inference context that contains each of the bound values
+    /// within instantiated as a fresh variable. The `f` closure is
+    /// invoked with the new infcx, along with the instantiated value
+    /// `V` and a substitution `S`. This substitution `S` maps from
+    /// the bound values in `C` to their instantiated values in `V`
+    /// (in other words, `S(C) = V`).
+    pub fn enter_with_canonical<T, R>(
+        &mut self,
+        span: Span,
+        canonical: &Canonical<'tcx, T>,
+        f: impl for<'a> FnOnce(InferCtxt<'a, 'tcx>, T, CanonicalVarValues<'tcx>) -> R,
+    ) -> R
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        self.enter(|infcx| {
+            let (value, subst) =
+                infcx.instantiate_canonical_with_fresh_inference_vars(span, canonical);
+            f(infcx, value, subst)
+        })
+    }
+
+    pub fn enter<R>(&mut self, f: impl for<'a> FnOnce(InferCtxt<'a, 'tcx>) -> R) -> R {
+        let InferCtxtBuilder { global_tcx, ref fresh_tables } = *self;
+        let in_progress_tables = fresh_tables.as_ref();
+        global_tcx.enter_local(|tcx| {
+            f(InferCtxt {
+                tcx,
+                in_progress_tables,
+                inner: RefCell::new(InferCtxtInner::new()),
+                lexical_region_resolutions: RefCell::new(None),
+                selection_cache: Default::default(),
+                evaluation_cache: Default::default(),
+                reported_trait_errors: Default::default(),
+                reported_closure_mismatch: Default::default(),
+                tainted_by_errors_flag: Cell::new(false),
+                err_count_on_creation: tcx.sess.err_count(),
+                in_snapshot: Cell::new(false),
+                skip_leak_check: Cell::new(false),
+                universe: Cell::new(ty::UniverseIndex::ROOT),
+            })
+        })
+    }
+}
+
+impl<'tcx, T> InferOk<'tcx, T> {
+    pub fn unit(self) -> InferOk<'tcx, ()> {
+        InferOk { value: (), obligations: self.obligations }
+    }
+
+    /// Extracts `value`, registering any obligations into `fulfill_cx`.
+    pub fn into_value_registering_obligations(
+        self,
+        infcx: &InferCtxt<'_, 'tcx>,
+        fulfill_cx: &mut dyn TraitEngine<'tcx>,
+    ) -> T {
+        let InferOk { value, obligations } = self;
+        for obligation in obligations {
+            fulfill_cx.register_predicate_obligation(infcx, obligation);
+        }
+        value
+    }
+}
+
+impl<'tcx> InferOk<'tcx, ()> {
+    pub fn into_obligations(self) -> PredicateObligations<'tcx> {
+        self.obligations
+    }
+}
+
+#[must_use = "once you start a snapshot, you should always consume it"]
+pub struct CombinedSnapshot<'a, 'tcx> {
+    projection_cache_snapshot: traits::ProjectionCacheSnapshot,
+    type_snapshot: type_variable::Snapshot<'tcx>,
+    const_snapshot: ut::Snapshot<ut::InPlace<ty::ConstVid<'tcx>>>,
+    int_snapshot: ut::Snapshot<ut::InPlace<ty::IntVid>>,
+    float_snapshot: ut::Snapshot<ut::InPlace<ty::FloatVid>>,
+    region_constraints_snapshot: RegionSnapshot,
+    region_obligations_snapshot: usize,
+    universe: ty::UniverseIndex,
+    was_in_snapshot: bool,
+    was_skip_leak_check: bool,
+    _in_progress_tables: Option<Ref<'a, ty::TypeckTables<'tcx>>>,
+}
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    pub fn is_in_snapshot(&self) -> bool {
+        self.in_snapshot.get()
+    }
+
+    pub fn freshen<T: TypeFoldable<'tcx>>(&self, t: T) -> T {
+        t.fold_with(&mut self.freshener())
+    }
+
+    pub fn type_var_diverges(&'a self, ty: Ty<'_>) -> bool {
+        match ty.kind {
+            ty::Infer(ty::TyVar(vid)) => self.inner.borrow().type_variables.var_diverges(vid),
+            _ => false,
+        }
+    }
+
+    pub fn freshener<'b>(&'b self) -> TypeFreshener<'b, 'tcx> {
+        freshen::TypeFreshener::new(self)
+    }
+
+    pub fn type_is_unconstrained_numeric(&'a self, ty: Ty<'_>) -> UnconstrainedNumeric {
+        use rustc::ty::error::UnconstrainedNumeric::Neither;
+        use rustc::ty::error::UnconstrainedNumeric::{UnconstrainedFloat, UnconstrainedInt};
+        match ty.kind {
+            ty::Infer(ty::IntVar(vid)) => {
+                if self.inner.borrow_mut().int_unification_table.probe_value(vid).is_some() {
+                    Neither
+                } else {
+                    UnconstrainedInt
+                }
+            }
+            ty::Infer(ty::FloatVar(vid)) => {
+                if self.inner.borrow_mut().float_unification_table.probe_value(vid).is_some() {
+                    Neither
+                } else {
+                    UnconstrainedFloat
+                }
+            }
+            _ => Neither,
+        }
+    }
+
+    pub fn unsolved_variables(&self) -> Vec<Ty<'tcx>> {
+        let mut inner = self.inner.borrow_mut();
+        // FIXME(const_generics): should there be an equivalent function for const variables?
+
+        let mut vars: Vec<Ty<'_>> = inner
+            .type_variables
+            .unsolved_variables()
+            .into_iter()
+            .map(|t| self.tcx.mk_ty_var(t))
+            .collect();
+        vars.extend(
+            (0..inner.int_unification_table.len())
+                .map(|i| ty::IntVid { index: i as u32 })
+                .filter(|&vid| inner.int_unification_table.probe_value(vid).is_none())
+                .map(|v| self.tcx.mk_int_var(v)),
+        );
+        vars.extend(
+            (0..inner.float_unification_table.len())
+                .map(|i| ty::FloatVid { index: i as u32 })
+                .filter(|&vid| inner.float_unification_table.probe_value(vid).is_none())
+                .map(|v| self.tcx.mk_float_var(v)),
+        );
+        vars
+    }
+
+    fn combine_fields(
+        &'a self,
+        trace: TypeTrace<'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
+    ) -> CombineFields<'a, 'tcx> {
+        CombineFields {
+            infcx: self,
+            trace,
+            cause: None,
+            param_env,
+            obligations: PredicateObligations::new(),
+        }
+    }
+
+    /// Clear the "currently in a snapshot" flag, invoke the closure,
+    /// then restore the flag to its original value. This flag is a
+    /// debugging measure designed to detect cases where we start a
+    /// snapshot, create type variables, and register obligations
+    /// which may involve those type variables in the fulfillment cx,
+    /// potentially leaving "dangling type variables" behind.
+    /// In such cases, an assertion will fail when attempting to
+    /// register obligations, within a snapshot. Very useful, much
+    /// better than grovelling through megabytes of `RUSTC_LOG` output.
+    ///
+    /// HOWEVER, in some cases the flag is unhelpful. In particular, we
+    /// sometimes create a "mini-fulfilment-cx" in which we enroll
+    /// obligations. As long as this fulfillment cx is fully drained
+    /// before we return, this is not a problem, as there won't be any
+    /// escaping obligations in the main cx. In those cases, you can
+    /// use this function.
+    pub fn save_and_restore_in_snapshot_flag<F, R>(&self, func: F) -> R
+    where
+        F: FnOnce(&Self) -> R,
+    {
+        let flag = self.in_snapshot.replace(false);
+        let result = func(self);
+        self.in_snapshot.set(flag);
+        result
+    }
+
+    fn start_snapshot(&self) -> CombinedSnapshot<'a, 'tcx> {
+        debug!("start_snapshot()");
+
+        let in_snapshot = self.in_snapshot.replace(true);
+
+        let mut inner = self.inner.borrow_mut();
+        CombinedSnapshot {
+            projection_cache_snapshot: inner.projection_cache.snapshot(),
+            type_snapshot: inner.type_variables.snapshot(),
+            const_snapshot: inner.const_unification_table.snapshot(),
+            int_snapshot: inner.int_unification_table.snapshot(),
+            float_snapshot: inner.float_unification_table.snapshot(),
+            region_constraints_snapshot: inner.unwrap_region_constraints().start_snapshot(),
+            region_obligations_snapshot: inner.region_obligations.len(),
+            universe: self.universe(),
+            was_in_snapshot: in_snapshot,
+            was_skip_leak_check: self.skip_leak_check.get(),
+            // Borrow tables "in progress" (i.e., during typeck)
+            // to ban writes from within a snapshot to them.
+            _in_progress_tables: self.in_progress_tables.map(|tables| tables.borrow()),
+        }
+    }
+
+    fn rollback_to(&self, cause: &str, snapshot: CombinedSnapshot<'a, 'tcx>) {
+        debug!("rollback_to(cause={})", cause);
+        let CombinedSnapshot {
+            projection_cache_snapshot,
+            type_snapshot,
+            const_snapshot,
+            int_snapshot,
+            float_snapshot,
+            region_constraints_snapshot,
+            region_obligations_snapshot,
+            universe,
+            was_in_snapshot,
+            was_skip_leak_check,
+            _in_progress_tables,
+        } = snapshot;
+
+        self.in_snapshot.set(was_in_snapshot);
+        self.universe.set(universe);
+        self.skip_leak_check.set(was_skip_leak_check);
+
+        let mut inner = self.inner.borrow_mut();
+        inner.projection_cache.rollback_to(projection_cache_snapshot);
+        inner.type_variables.rollback_to(type_snapshot);
+        inner.const_unification_table.rollback_to(const_snapshot);
+        inner.int_unification_table.rollback_to(int_snapshot);
+        inner.float_unification_table.rollback_to(float_snapshot);
+        inner.unwrap_region_constraints().rollback_to(region_constraints_snapshot);
+        inner.region_obligations.truncate(region_obligations_snapshot);
+    }
+
+    fn commit_from(&self, snapshot: CombinedSnapshot<'a, 'tcx>) {
+        debug!("commit_from()");
+        let CombinedSnapshot {
+            projection_cache_snapshot,
+            type_snapshot,
+            const_snapshot,
+            int_snapshot,
+            float_snapshot,
+            region_constraints_snapshot,
+            region_obligations_snapshot: _,
+            universe: _,
+            was_in_snapshot,
+            was_skip_leak_check,
+            _in_progress_tables,
+        } = snapshot;
+
+        self.in_snapshot.set(was_in_snapshot);
+        self.skip_leak_check.set(was_skip_leak_check);
+
+        let mut inner = self.inner.borrow_mut();
+        inner.projection_cache.commit(projection_cache_snapshot);
+        inner.type_variables.commit(type_snapshot);
+        inner.const_unification_table.commit(const_snapshot);
+        inner.int_unification_table.commit(int_snapshot);
+        inner.float_unification_table.commit(float_snapshot);
+        inner.unwrap_region_constraints().commit(region_constraints_snapshot);
+    }
+
+    /// Executes `f` and commit the bindings.
+    pub fn commit_unconditionally<R, F>(&self, f: F) -> R
+    where
+        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> R,
+    {
+        debug!("commit_unconditionally()");
+        let snapshot = self.start_snapshot();
+        let r = f(&snapshot);
+        self.commit_from(snapshot);
+        r
+    }
+
+    /// Execute `f` and commit the bindings if closure `f` returns `Ok(_)`.
+    pub fn commit_if_ok<T, E, F>(&self, f: F) -> Result<T, E>
+    where
+        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> Result<T, E>,
+    {
+        debug!("commit_if_ok()");
+        let snapshot = self.start_snapshot();
+        let r = f(&snapshot);
+        debug!("commit_if_ok() -- r.is_ok() = {}", r.is_ok());
+        match r {
+            Ok(_) => {
+                self.commit_from(snapshot);
+            }
+            Err(_) => {
+                self.rollback_to("commit_if_ok -- error", snapshot);
+            }
+        }
+        r
+    }
+
+    /// Execute `f` then unroll any bindings it creates.
+    pub fn probe<R, F>(&self, f: F) -> R
+    where
+        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> R,
+    {
+        debug!("probe()");
+        let snapshot = self.start_snapshot();
+        let r = f(&snapshot);
+        self.rollback_to("probe", snapshot);
+        r
+    }
+
+    /// If `should_skip` is true, then execute `f` then unroll any bindings it creates.
+    pub fn probe_maybe_skip_leak_check<R, F>(&self, should_skip: bool, f: F) -> R
+    where
+        F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> R,
+    {
+        debug!("probe()");
+        let snapshot = self.start_snapshot();
+        let skip_leak_check = should_skip || self.skip_leak_check.get();
+        self.skip_leak_check.set(skip_leak_check);
+        let r = f(&snapshot);
+        self.rollback_to("probe", snapshot);
+        r
+    }
+
+    /// Scan the constraints produced since `snapshot` began and returns:
+    ///
+    /// - `None` -- if none of them involve "region outlives" constraints
+    /// - `Some(true)` -- if there are `'a: 'b` constraints where `'a` or `'b` is a placeholder
+    /// - `Some(false)` -- if there are `'a: 'b` constraints but none involve placeholders
+    pub fn region_constraints_added_in_snapshot(
+        &self,
+        snapshot: &CombinedSnapshot<'a, 'tcx>,
+    ) -> Option<bool> {
+        self.inner
+            .borrow_mut()
+            .unwrap_region_constraints()
+            .region_constraints_added_in_snapshot(&snapshot.region_constraints_snapshot)
+    }
+
+    pub fn add_given(&self, sub: ty::Region<'tcx>, sup: ty::RegionVid) {
+        self.inner.borrow_mut().unwrap_region_constraints().add_given(sub, sup);
+    }
+
+    pub fn can_sub<T>(&self, param_env: ty::ParamEnv<'tcx>, a: T, b: T) -> UnitResult<'tcx>
+    where
+        T: at::ToTrace<'tcx>,
+    {
+        let origin = &ObligationCause::dummy();
+        self.probe(|_| {
+            self.at(origin, param_env).sub(a, b).map(|InferOk { obligations: _, .. }| {
+                // Ignore obligations, since we are unrolling
+                // everything anyway.
+            })
+        })
+    }
+
+    pub fn can_eq<T>(&self, param_env: ty::ParamEnv<'tcx>, a: T, b: T) -> UnitResult<'tcx>
+    where
+        T: at::ToTrace<'tcx>,
+    {
+        let origin = &ObligationCause::dummy();
+        self.probe(|_| {
+            self.at(origin, param_env).eq(a, b).map(|InferOk { obligations: _, .. }| {
+                // Ignore obligations, since we are unrolling
+                // everything anyway.
+            })
+        })
+    }
+
+    pub fn sub_regions(
+        &self,
+        origin: SubregionOrigin<'tcx>,
+        a: ty::Region<'tcx>,
+        b: ty::Region<'tcx>,
+    ) {
+        debug!("sub_regions({:?} <: {:?})", a, b);
+        self.inner.borrow_mut().unwrap_region_constraints().make_subregion(origin, a, b);
+    }
+
+    /// Require that the region `r` be equal to one of the regions in
+    /// the set `regions`.
+    pub fn member_constraint(
+        &self,
+        opaque_type_def_id: DefId,
+        definition_span: Span,
+        hidden_ty: Ty<'tcx>,
+        region: ty::Region<'tcx>,
+        in_regions: &Lrc<Vec<ty::Region<'tcx>>>,
+    ) {
+        debug!("member_constraint({:?} <: {:?})", region, in_regions);
+        self.inner.borrow_mut().unwrap_region_constraints().member_constraint(
+            opaque_type_def_id,
+            definition_span,
+            hidden_ty,
+            region,
+            in_regions,
+        );
+    }
+
+    pub fn subtype_predicate(
+        &self,
+        cause: &ObligationCause<'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
+        predicate: &ty::PolySubtypePredicate<'tcx>,
+    ) -> Option<InferResult<'tcx, ()>> {
+        // Subtle: it's ok to skip the binder here and resolve because
+        // `shallow_resolve` just ignores anything that is not a type
+        // variable, and because type variable's can't (at present, at
+        // least) capture any of the things bound by this binder.
+        //
+        // NOTE(nmatsakis): really, there is no *particular* reason to do this
+        // `shallow_resolve` here except as a micro-optimization.
+        // Naturally I could not resist.
+        let two_unbound_type_vars = {
+            let a = self.shallow_resolve(predicate.skip_binder().a);
+            let b = self.shallow_resolve(predicate.skip_binder().b);
+            a.is_ty_var() && b.is_ty_var()
+        };
+
+        if two_unbound_type_vars {
+            // Two unbound type variables? Can't make progress.
+            return None;
+        }
+
+        Some(self.commit_if_ok(|snapshot| {
+            let (ty::SubtypePredicate { a_is_expected, a, b }, placeholder_map) =
+                self.replace_bound_vars_with_placeholders(predicate);
+
+            let ok = self.at(cause, param_env).sub_exp(a_is_expected, a, b)?;
+
+            self.leak_check(false, &placeholder_map, snapshot)?;
+
+            Ok(ok.unit())
+        }))
+    }
+
+    pub fn region_outlives_predicate(
+        &self,
+        cause: &traits::ObligationCause<'tcx>,
+        predicate: &ty::PolyRegionOutlivesPredicate<'tcx>,
+    ) -> UnitResult<'tcx> {
+        self.commit_if_ok(|snapshot| {
+            let (ty::OutlivesPredicate(r_a, r_b), placeholder_map) =
+                self.replace_bound_vars_with_placeholders(predicate);
+            let origin = SubregionOrigin::from_obligation_cause(cause, || {
+                RelateRegionParamBound(cause.span)
+            });
+            self.sub_regions(origin, r_b, r_a); // `b : a` ==> `a <= b`
+            self.leak_check(false, &placeholder_map, snapshot)?;
+            Ok(())
+        })
+    }
+
+    pub fn next_ty_var_id(&self, diverging: bool, origin: TypeVariableOrigin) -> TyVid {
+        self.inner.borrow_mut().type_variables.new_var(self.universe(), diverging, origin)
+    }
+
+    pub fn next_ty_var(&self, origin: TypeVariableOrigin) -> Ty<'tcx> {
+        self.tcx.mk_ty_var(self.next_ty_var_id(false, origin))
+    }
+
+    pub fn next_ty_var_in_universe(
+        &self,
+        origin: TypeVariableOrigin,
+        universe: ty::UniverseIndex,
+    ) -> Ty<'tcx> {
+        let vid = self.inner.borrow_mut().type_variables.new_var(universe, false, origin);
+        self.tcx.mk_ty_var(vid)
+    }
+
+    pub fn next_diverging_ty_var(&self, origin: TypeVariableOrigin) -> Ty<'tcx> {
+        self.tcx.mk_ty_var(self.next_ty_var_id(true, origin))
+    }
+
+    pub fn next_const_var(
+        &self,
+        ty: Ty<'tcx>,
+        origin: ConstVariableOrigin,
+    ) -> &'tcx ty::Const<'tcx> {
+        self.tcx.mk_const_var(self.next_const_var_id(origin), ty)
+    }
+
+    pub fn next_const_var_in_universe(
+        &self,
+        ty: Ty<'tcx>,
+        origin: ConstVariableOrigin,
+        universe: ty::UniverseIndex,
+    ) -> &'tcx ty::Const<'tcx> {
+        let vid = self
+            .inner
+            .borrow_mut()
+            .const_unification_table
+            .new_key(ConstVarValue { origin, val: ConstVariableValue::Unknown { universe } });
+        self.tcx.mk_const_var(vid, ty)
+    }
+
+    pub fn next_const_var_id(&self, origin: ConstVariableOrigin) -> ConstVid<'tcx> {
+        self.inner.borrow_mut().const_unification_table.new_key(ConstVarValue {
+            origin,
+            val: ConstVariableValue::Unknown { universe: self.universe() },
+        })
+    }
+
+    fn next_int_var_id(&self) -> IntVid {
+        self.inner.borrow_mut().int_unification_table.new_key(None)
+    }
+
+    pub fn next_int_var(&self) -> Ty<'tcx> {
+        self.tcx.mk_int_var(self.next_int_var_id())
+    }
+
+    fn next_float_var_id(&self) -> FloatVid {
+        self.inner.borrow_mut().float_unification_table.new_key(None)
+    }
+
+    pub fn next_float_var(&self) -> Ty<'tcx> {
+        self.tcx.mk_float_var(self.next_float_var_id())
+    }
+
+    /// Creates a fresh region variable with the next available index.
+    /// The variable will be created in the maximum universe created
+    /// thus far, allowing it to name any region created thus far.
+    pub fn next_region_var(&self, origin: RegionVariableOrigin) -> ty::Region<'tcx> {
+        self.next_region_var_in_universe(origin, self.universe())
+    }
+
+    /// Creates a fresh region variable with the next available index
+    /// in the given universe; typically, you can use
+    /// `next_region_var` and just use the maximal universe.
+    pub fn next_region_var_in_universe(
+        &self,
+        origin: RegionVariableOrigin,
+        universe: ty::UniverseIndex,
+    ) -> ty::Region<'tcx> {
+        let region_var =
+            self.inner.borrow_mut().unwrap_region_constraints().new_region_var(universe, origin);
+        self.tcx.mk_region(ty::ReVar(region_var))
+    }
+
+    /// Return the universe that the region `r` was created in.  For
+    /// most regions (e.g., `'static`, named regions from the user,
+    /// etc) this is the root universe U0. For inference variables or
+    /// placeholders, however, it will return the universe which which
+    /// they are associated.
+    fn universe_of_region(&self, r: ty::Region<'tcx>) -> ty::UniverseIndex {
+        self.inner.borrow_mut().unwrap_region_constraints().universe(r)
+    }
+
+    /// Number of region variables created so far.
+    pub fn num_region_vars(&self) -> usize {
+        self.inner.borrow_mut().unwrap_region_constraints().num_region_vars()
+    }
+
+    /// Just a convenient wrapper of `next_region_var` for using during NLL.
+    pub fn next_nll_region_var(&self, origin: NLLRegionVariableOrigin) -> ty::Region<'tcx> {
+        self.next_region_var(RegionVariableOrigin::NLL(origin))
+    }
+
+    /// Just a convenient wrapper of `next_region_var` for using during NLL.
+    pub fn next_nll_region_var_in_universe(
+        &self,
+        origin: NLLRegionVariableOrigin,
+        universe: ty::UniverseIndex,
+    ) -> ty::Region<'tcx> {
+        self.next_region_var_in_universe(RegionVariableOrigin::NLL(origin), universe)
+    }
+
+    pub fn var_for_def(&self, span: Span, param: &ty::GenericParamDef) -> GenericArg<'tcx> {
+        match param.kind {
+            GenericParamDefKind::Lifetime => {
+                // Create a region inference variable for the given
+                // region parameter definition.
+                self.next_region_var(EarlyBoundRegion(span, param.name)).into()
+            }
+            GenericParamDefKind::Type { .. } => {
+                // Create a type inference variable for the given
+                // type parameter definition. The substitutions are
+                // for actual parameters that may be referred to by
+                // the default of this type parameter, if it exists.
+                // e.g., `struct Foo<A, B, C = (A, B)>(...);` when
+                // used in a path such as `Foo::<T, U>::new()` will
+                // use an inference variable for `C` with `[T, U]`
+                // as the substitutions for the default, `(T, U)`.
+                let ty_var_id = self.inner.borrow_mut().type_variables.new_var(
+                    self.universe(),
+                    false,
+                    TypeVariableOrigin {
+                        kind: TypeVariableOriginKind::TypeParameterDefinition(
+                            param.name,
+                            Some(param.def_id),
+                        ),
+                        span,
+                    },
+                );
+
+                self.tcx.mk_ty_var(ty_var_id).into()
+            }
+            GenericParamDefKind::Const { .. } => {
+                let origin = ConstVariableOrigin {
+                    kind: ConstVariableOriginKind::ConstParameterDefinition(param.name),
+                    span,
+                };
+                let const_var_id =
+                    self.inner.borrow_mut().const_unification_table.new_key(ConstVarValue {
+                        origin,
+                        val: ConstVariableValue::Unknown { universe: self.universe() },
+                    });
+                self.tcx.mk_const_var(const_var_id, self.tcx.type_of(param.def_id)).into()
+            }
+        }
+    }
+
+    /// Given a set of generics defined on a type or impl, returns a substitution mapping each
+    /// type/region parameter to a fresh inference variable.
+    pub fn fresh_substs_for_item(&self, span: Span, def_id: DefId) -> SubstsRef<'tcx> {
+        InternalSubsts::for_item(self.tcx, def_id, |param, _| self.var_for_def(span, param))
+    }
+
+    /// Returns `true` if errors have been reported since this infcx was
+    /// created. This is sometimes used as a heuristic to skip
+    /// reporting errors that often occur as a result of earlier
+    /// errors, but where it's hard to be 100% sure (e.g., unresolved
+    /// inference variables, regionck errors).
+    pub fn is_tainted_by_errors(&self) -> bool {
+        debug!(
+            "is_tainted_by_errors(err_count={}, err_count_on_creation={}, \
+             tainted_by_errors_flag={})",
+            self.tcx.sess.err_count(),
+            self.err_count_on_creation,
+            self.tainted_by_errors_flag.get()
+        );
+
+        if self.tcx.sess.err_count() > self.err_count_on_creation {
+            return true; // errors reported since this infcx was made
+        }
+        self.tainted_by_errors_flag.get()
+    }
+
+    /// Set the "tainted by errors" flag to true. We call this when we
+    /// observe an error from a prior pass.
+    pub fn set_tainted_by_errors(&self) {
+        debug!("set_tainted_by_errors()");
+        self.tainted_by_errors_flag.set(true)
+    }
+
+    /// Process the region constraints and report any errors that
+    /// result. After this, no more unification operations should be
+    /// done -- or the compiler will panic -- but it is legal to use
+    /// `resolve_vars_if_possible` as well as `fully_resolve`.
+    pub fn resolve_regions_and_report_errors(
+        &self,
+        region_context: DefId,
+        region_map: &region::ScopeTree,
+        outlives_env: &OutlivesEnvironment<'tcx>,
+        suppress: SuppressRegionErrors,
+    ) {
+        assert!(
+            self.is_tainted_by_errors() || self.inner.borrow().region_obligations.is_empty(),
+            "region_obligations not empty: {:#?}",
+            self.inner.borrow().region_obligations
+        );
+
+        let region_rels = &RegionRelations::new(
+            self.tcx,
+            region_context,
+            region_map,
+            outlives_env.free_region_map(),
+        );
+        let (var_infos, data) = self
+            .inner
+            .borrow_mut()
+            .region_constraints
+            .take()
+            .expect("regions already resolved")
+            .into_infos_and_data();
+        let (lexical_region_resolutions, errors) =
+            lexical_region_resolve::resolve(region_rels, var_infos, data);
+
+        let old_value = self.lexical_region_resolutions.replace(Some(lexical_region_resolutions));
+        assert!(old_value.is_none());
+
+        if !self.is_tainted_by_errors() {
+            // As a heuristic, just skip reporting region errors
+            // altogether if other errors have been reported while
+            // this infcx was in use.  This is totally hokey but
+            // otherwise we have a hard time separating legit region
+            // errors from silly ones.
+            self.report_region_errors(region_map, &errors, suppress);
+        }
+    }
+
+    /// Obtains (and clears) the current set of region
+    /// constraints. The inference context is still usable: further
+    /// unifications will simply add new constraints.
+    ///
+    /// This method is not meant to be used with normal lexical region
+    /// resolution. Rather, it is used in the NLL mode as a kind of
+    /// interim hack: basically we run normal type-check and generate
+    /// region constraints as normal, but then we take them and
+    /// translate them into the form that the NLL solver
+    /// understands. See the NLL module for mode details.
+    pub fn take_and_reset_region_constraints(&self) -> RegionConstraintData<'tcx> {
+        assert!(
+            self.inner.borrow().region_obligations.is_empty(),
+            "region_obligations not empty: {:#?}",
+            self.inner.borrow().region_obligations
+        );
+
+        self.inner.borrow_mut().unwrap_region_constraints().take_and_reset_data()
+    }
+
+    /// Gives temporary access to the region constraint data.
+    #[allow(non_camel_case_types)] // bug with impl trait
+    pub fn with_region_constraints<R>(
+        &self,
+        op: impl FnOnce(&RegionConstraintData<'tcx>) -> R,
+    ) -> R {
+        let mut inner = self.inner.borrow_mut();
+        op(inner.unwrap_region_constraints().data())
+    }
+
+    /// Takes ownership of the list of variable regions. This implies
+    /// that all the region constraints have already been taken, and
+    /// hence that `resolve_regions_and_report_errors` can never be
+    /// called. This is used only during NLL processing to "hand off" ownership
+    /// of the set of region variables into the NLL region context.
+    pub fn take_region_var_origins(&self) -> VarInfos {
+        let (var_infos, data) = self
+            .inner
+            .borrow_mut()
+            .region_constraints
+            .take()
+            .expect("regions already resolved")
+            .into_infos_and_data();
+        assert!(data.is_empty());
+        var_infos
+    }
+
+    pub fn ty_to_string(&self, t: Ty<'tcx>) -> String {
+        self.resolve_vars_if_possible(&t).to_string()
+    }
+
+    pub fn tys_to_string(&self, ts: &[Ty<'tcx>]) -> String {
+        let tstrs: Vec<String> = ts.iter().map(|t| self.ty_to_string(*t)).collect();
+        format!("({})", tstrs.join(", "))
+    }
+
+    pub fn trait_ref_to_string(&self, t: &ty::TraitRef<'tcx>) -> String {
+        self.resolve_vars_if_possible(t).print_only_trait_path().to_string()
+    }
+
+    /// If `TyVar(vid)` resolves to a type, return that type. Else, return the
+    /// universe index of `TyVar(vid)`.
+    pub fn probe_ty_var(&self, vid: TyVid) -> Result<Ty<'tcx>, ty::UniverseIndex> {
+        use self::type_variable::TypeVariableValue;
+
+        match self.inner.borrow_mut().type_variables.probe(vid) {
+            TypeVariableValue::Known { value } => Ok(value),
+            TypeVariableValue::Unknown { universe } => Err(universe),
+        }
+    }
+
+    /// Resolve any type variables found in `value` -- but only one
+    /// level.  So, if the variable `?X` is bound to some type
+    /// `Foo<?Y>`, then this would return `Foo<?Y>` (but `?Y` may
+    /// itself be bound to a type).
+    ///
+    /// Useful when you only need to inspect the outermost level of
+    /// the type and don't care about nested types (or perhaps you
+    /// will be resolving them as well, e.g. in a loop).
+    pub fn shallow_resolve<T>(&self, value: T) -> T
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        let mut r = ShallowResolver::new(self);
+        value.fold_with(&mut r)
+    }
+
+    pub fn root_var(&self, var: ty::TyVid) -> ty::TyVid {
+        self.inner.borrow_mut().type_variables.root_var(var)
+    }
+
+    /// Where possible, replaces type/const variables in
+    /// `value` with their final value. Note that region variables
+    /// are unaffected. If a type/const variable has not been unified, it
+    /// is left as is. This is an idempotent operation that does
+    /// not affect inference state in any way and so you can do it
+    /// at will.
+    pub fn resolve_vars_if_possible<T>(&self, value: &T) -> T
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        if !value.needs_infer() {
+            return value.clone(); // Avoid duplicated subst-folding.
+        }
+        let mut r = resolve::OpportunisticVarResolver::new(self);
+        value.fold_with(&mut r)
+    }
+
+    /// Returns the first unresolved variable contained in `T`. In the
+    /// process of visiting `T`, this will resolve (where possible)
+    /// type variables in `T`, but it never constructs the final,
+    /// resolved type, so it's more efficient than
+    /// `resolve_vars_if_possible()`.
+    pub fn unresolved_type_vars<T>(&self, value: &T) -> Option<(Ty<'tcx>, Option<Span>)>
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        let mut r = resolve::UnresolvedTypeFinder::new(self);
+        value.visit_with(&mut r);
+        r.first_unresolved
+    }
+
+    pub fn probe_const_var(
+        &self,
+        vid: ty::ConstVid<'tcx>,
+    ) -> Result<&'tcx ty::Const<'tcx>, ty::UniverseIndex> {
+        match self.inner.borrow_mut().const_unification_table.probe_value(vid).val {
+            ConstVariableValue::Known { value } => Ok(value),
+            ConstVariableValue::Unknown { universe } => Err(universe),
+        }
+    }
+
+    pub fn fully_resolve<T: TypeFoldable<'tcx>>(&self, value: &T) -> FixupResult<'tcx, T> {
+        /*!
+         * Attempts to resolve all type/region/const variables in
+         * `value`. Region inference must have been run already (e.g.,
+         * by calling `resolve_regions_and_report_errors`). If some
+         * variable was never unified, an `Err` results.
+         *
+         * This method is idempotent, but it not typically not invoked
+         * except during the writeback phase.
+         */
+
+        resolve::fully_resolve(self, value)
+    }
+
+    // [Note-Type-error-reporting]
+    // An invariant is that anytime the expected or actual type is Error (the special
+    // error type, meaning that an error occurred when typechecking this expression),
+    // this is a derived error. The error cascaded from another error (that was already
+    // reported), so it's not useful to display it to the user.
+    // The following methods implement this logic.
+    // They check if either the actual or expected type is Error, and don't print the error
+    // in this case. The typechecker should only ever report type errors involving mismatched
+    // types using one of these methods, and should not call span_err directly for such
+    // errors.
+
+    pub fn type_error_struct_with_diag<M>(
+        &self,
+        sp: Span,
+        mk_diag: M,
+        actual_ty: Ty<'tcx>,
+    ) -> DiagnosticBuilder<'tcx>
+    where
+        M: FnOnce(String) -> DiagnosticBuilder<'tcx>,
+    {
+        let actual_ty = self.resolve_vars_if_possible(&actual_ty);
+        debug!("type_error_struct_with_diag({:?}, {:?})", sp, actual_ty);
+
+        // Don't report an error if actual type is `Error`.
+        if actual_ty.references_error() {
+            return self.tcx.sess.diagnostic().struct_dummy();
+        }
+
+        mk_diag(self.ty_to_string(actual_ty))
+    }
+
+    pub fn report_mismatched_types(
+        &self,
+        cause: &ObligationCause<'tcx>,
+        expected: Ty<'tcx>,
+        actual: Ty<'tcx>,
+        err: TypeError<'tcx>,
+    ) -> DiagnosticBuilder<'tcx> {
+        let trace = TypeTrace::types(cause, true, expected, actual);
+        self.report_and_explain_type_error(trace, &err)
+    }
+
+    pub fn replace_bound_vars_with_fresh_vars<T>(
+        &self,
+        span: Span,
+        lbrct: LateBoundRegionConversionTime,
+        value: &ty::Binder<T>,
+    ) -> (T, BTreeMap<ty::BoundRegion, ty::Region<'tcx>>)
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        let fld_r = |br| self.next_region_var(LateBoundRegion(span, br, lbrct));
+        let fld_t = |_| {
+            self.next_ty_var(TypeVariableOrigin {
+                kind: TypeVariableOriginKind::MiscVariable,
+                span,
+            })
+        };
+        let fld_c = |_, ty| {
+            self.next_const_var(
+                ty,
+                ConstVariableOrigin { kind: ConstVariableOriginKind::MiscVariable, span },
+            )
+        };
+        self.tcx.replace_bound_vars(value, fld_r, fld_t, fld_c)
+    }
+
+    /// See the [`region_constraints::verify_generic_bound`] method.
+    pub fn verify_generic_bound(
+        &self,
+        origin: SubregionOrigin<'tcx>,
+        kind: GenericKind<'tcx>,
+        a: ty::Region<'tcx>,
+        bound: VerifyBound<'tcx>,
+    ) {
+        debug!("verify_generic_bound({:?}, {:?} <: {:?})", kind, a, bound);
+
+        self.inner
+            .borrow_mut()
+            .unwrap_region_constraints()
+            .verify_generic_bound(origin, kind, a, bound);
+    }
+
+    pub fn type_is_copy_modulo_regions(
+        &self,
+        param_env: ty::ParamEnv<'tcx>,
+        ty: Ty<'tcx>,
+        span: Span,
+    ) -> bool {
+        let ty = self.resolve_vars_if_possible(&ty);
+
+        if !(param_env, ty).has_local_value() {
+            return ty.is_copy_modulo_regions(self.tcx, param_env, span);
+        }
+
+        let copy_def_id = self.tcx.require_lang_item(lang_items::CopyTraitLangItem, None);
+
+        // This can get called from typeck (by euv), and `moves_by_default`
+        // rightly refuses to work with inference variables, but
+        // moves_by_default has a cache, which we want to use in other
+        // cases.
+        traits::type_known_to_meet_bound_modulo_regions(self, param_env, ty, copy_def_id, span)
+    }
+
+    /// Obtains the latest type of the given closure; this may be a
+    /// closure in the current function, in which case its
+    /// `ClosureKind` may not yet be known.
+    pub fn closure_kind(
+        &self,
+        closure_def_id: DefId,
+        closure_substs: SubstsRef<'tcx>,
+    ) -> Option<ty::ClosureKind> {
+        let closure_kind_ty = closure_substs.as_closure().kind_ty(closure_def_id, self.tcx);
+        let closure_kind_ty = self.shallow_resolve(closure_kind_ty);
+        closure_kind_ty.to_opt_closure_kind()
+    }
+
+    /// Obtains the signature of a closure. For closures, unlike
+    /// `tcx.fn_sig(def_id)`, this method will work during the
+    /// type-checking of the enclosing function and return the closure
+    /// signature in its partially inferred state.
+    pub fn closure_sig(&self, def_id: DefId, substs: SubstsRef<'tcx>) -> ty::PolyFnSig<'tcx> {
+        let closure_sig_ty = substs.as_closure().sig_ty(def_id, self.tcx);
+        let closure_sig_ty = self.shallow_resolve(closure_sig_ty);
+        closure_sig_ty.fn_sig(self.tcx)
+    }
+
+    /// Normalizes associated types in `value`, potentially returning
+    /// new obligations that must further be processed.
+    pub fn partially_normalize_associated_types_in<T>(
+        &self,
+        span: Span,
+        body_id: hir::HirId,
+        param_env: ty::ParamEnv<'tcx>,
+        value: &T,
+    ) -> InferOk<'tcx, T>
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        debug!("partially_normalize_associated_types_in(value={:?})", value);
+        let mut selcx = traits::SelectionContext::new(self);
+        let cause = ObligationCause::misc(span, body_id);
+        let traits::Normalized { value, obligations } =
+            traits::normalize(&mut selcx, param_env, cause, value);
+        debug!(
+            "partially_normalize_associated_types_in: result={:?} predicates={:?}",
+            value, obligations
+        );
+        InferOk { value, obligations }
+    }
+
+    /// Clears the selection, evaluation, and projection caches. This is useful when
+    /// repeatedly attempting to select an `Obligation` while changing only
+    /// its `ParamEnv`, since `FulfillmentContext` doesn't use probing.
+    pub fn clear_caches(&self) {
+        self.selection_cache.clear();
+        self.evaluation_cache.clear();
+        self.inner.borrow_mut().projection_cache.clear();
+    }
+
+    fn universe(&self) -> ty::UniverseIndex {
+        self.universe.get()
+    }
+
+    /// Creates and return a fresh universe that extends all previous
+    /// universes. Updates `self.universe` to that new universe.
+    pub fn create_next_universe(&self) -> ty::UniverseIndex {
+        let u = self.universe.get().next_universe();
+        self.universe.set(u);
+        u
+    }
+
+    /// Resolves and evaluates a constant.
+    ///
+    /// The constant can be located on a trait like `<A as B>::C`, in which case the given
+    /// substitutions and environment are used to resolve the constant. Alternatively if the
+    /// constant has generic parameters in scope the substitutions are used to evaluate the value of
+    /// the constant. For example in `fn foo<T>() { let _ = [0; bar::<T>()]; }` the repeat count
+    /// constant `bar::<T>()` requires a substitution for `T`, if the substitution for `T` is still
+    /// too generic for the constant to be evaluated then `Err(ErrorHandled::TooGeneric)` is
+    /// returned.
+    ///
+    /// This handles inferences variables within both `param_env` and `substs` by
+    /// performing the operation on their respective canonical forms.
+    pub fn const_eval_resolve(
+        &self,
+        param_env: ty::ParamEnv<'tcx>,
+        def_id: DefId,
+        substs: SubstsRef<'tcx>,
+        promoted: Option<mir::Promoted>,
+        span: Option<Span>,
+    ) -> ConstEvalResult<'tcx> {
+        let mut original_values = OriginalQueryValues::default();
+        let canonical = self.canonicalize_query(&(param_env, substs), &mut original_values);
+
+        let (param_env, substs) = canonical.value;
+        // The return value is the evaluated value which doesn't contain any reference to inference
+        // variables, thus we don't need to substitute back the original values.
+        self.tcx.const_eval_resolve(param_env, def_id, substs, promoted, span)
+    }
+}
+
+pub struct ShallowResolver<'a, 'tcx> {
+    infcx: &'a InferCtxt<'a, 'tcx>,
+}
+
+impl<'a, 'tcx> ShallowResolver<'a, 'tcx> {
+    #[inline(always)]
+    pub fn new(infcx: &'a InferCtxt<'a, 'tcx>) -> Self {
+        ShallowResolver { infcx }
+    }
+
+    /// If `typ` is a type variable of some kind, resolve it one level
+    /// (but do not resolve types found in the result). If `typ` is
+    /// not a type variable, just return it unmodified.
+    pub fn shallow_resolve(&mut self, typ: Ty<'tcx>) -> Ty<'tcx> {
+        match typ.kind {
+            ty::Infer(ty::TyVar(v)) => {
+                // Not entirely obvious: if `typ` is a type variable,
+                // it can be resolved to an int/float variable, which
+                // can then be recursively resolved, hence the
+                // recursion. Note though that we prevent type
+                // variables from unifying to other type variables
+                // directly (though they may be embedded
+                // structurally), and we prevent cycles in any case,
+                // so this recursion should always be of very limited
+                // depth.
+                //
+                // Note: if these two lines are combined into one we get
+                // dynamic borrow errors on `self.infcx.inner`.
+                let known = self.infcx.inner.borrow_mut().type_variables.probe(v).known();
+                known.map(|t| self.fold_ty(t)).unwrap_or(typ)
+            }
+
+            ty::Infer(ty::IntVar(v)) => self
+                .infcx
+                .inner
+                .borrow_mut()
+                .int_unification_table
+                .probe_value(v)
+                .map(|v| v.to_type(self.infcx.tcx))
+                .unwrap_or(typ),
+
+            ty::Infer(ty::FloatVar(v)) => self
+                .infcx
+                .inner
+                .borrow_mut()
+                .float_unification_table
+                .probe_value(v)
+                .map(|v| v.to_type(self.infcx.tcx))
+                .unwrap_or(typ),
+
+            _ => typ,
+        }
+    }
+
+    // `resolver.shallow_resolve_changed(ty)` is equivalent to
+    // `resolver.shallow_resolve(ty) != ty`, but more efficient. It's always
+    // inlined, despite being large, because it has only two call sites that
+    // are extremely hot.
+    #[inline(always)]
+    pub fn shallow_resolve_changed(&self, infer: ty::InferTy) -> bool {
+        match infer {
+            ty::TyVar(v) => {
+                use self::type_variable::TypeVariableValue;
+
+                // If `inlined_probe` returns a `Known` value its `kind` never
+                // matches `infer`.
+                match self.infcx.inner.borrow_mut().type_variables.inlined_probe(v) {
+                    TypeVariableValue::Unknown { .. } => false,
+                    TypeVariableValue::Known { .. } => true,
+                }
+            }
+
+            ty::IntVar(v) => {
+                // If inlined_probe_value returns a value it's always a
+                // `ty::Int(_)` or `ty::UInt(_)`, which never matches a
+                // `ty::Infer(_)`.
+                self.infcx.inner.borrow_mut().int_unification_table.inlined_probe_value(v).is_some()
+            }
+
+            ty::FloatVar(v) => {
+                // If inlined_probe_value returns a value it's always a
+                // `ty::Float(_)`, which never matches a `ty::Infer(_)`.
+                //
+                // Not `inlined_probe_value(v)` because this call site is colder.
+                self.infcx.inner.borrow_mut().float_unification_table.probe_value(v).is_some()
+            }
+
+            _ => unreachable!(),
+        }
+    }
+}
+
+impl<'a, 'tcx> TypeFolder<'tcx> for ShallowResolver<'a, 'tcx> {
+    fn tcx<'b>(&'b self) -> TyCtxt<'tcx> {
+        self.infcx.tcx
+    }
+
+    fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
+        self.shallow_resolve(ty)
+    }
+
+    fn fold_const(&mut self, ct: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
+        if let ty::Const { val: ty::ConstKind::Infer(InferConst::Var(vid)), .. } = ct {
+            self.infcx
+                .inner
+                .borrow_mut()
+                .const_unification_table
+                .probe_value(*vid)
+                .val
+                .known()
+                .unwrap_or(ct)
+        } else {
+            ct
+        }
+    }
+}
+
+impl<'tcx> TypeTrace<'tcx> {
+    pub fn span(&self) -> Span {
+        self.cause.span
+    }
+
+    pub fn types(
+        cause: &ObligationCause<'tcx>,
+        a_is_expected: bool,
+        a: Ty<'tcx>,
+        b: Ty<'tcx>,
+    ) -> TypeTrace<'tcx> {
+        TypeTrace { cause: cause.clone(), values: Types(ExpectedFound::new(a_is_expected, a, b)) }
+    }
+
+    pub fn dummy(tcx: TyCtxt<'tcx>) -> TypeTrace<'tcx> {
+        TypeTrace {
+            cause: ObligationCause::dummy(),
+            values: Types(ExpectedFound { expected: tcx.types.err, found: tcx.types.err }),
+        }
+    }
+}
+
+impl<'tcx> SubregionOrigin<'tcx> {
+    pub fn span(&self) -> Span {
+        match *self {
+            Subtype(ref a) => a.span(),
+            InfStackClosure(a) => a,
+            InvokeClosure(a) => a,
+            DerefPointer(a) => a,
+            ClosureCapture(a, _) => a,
+            IndexSlice(a) => a,
+            RelateObjectBound(a) => a,
+            RelateParamBound(a, _) => a,
+            RelateRegionParamBound(a) => a,
+            RelateDefaultParamBound(a, _) => a,
+            Reborrow(a) => a,
+            ReborrowUpvar(a, _) => a,
+            DataBorrowed(_, a) => a,
+            ReferenceOutlivesReferent(_, a) => a,
+            ParameterInScope(_, a) => a,
+            ExprTypeIsNotInScope(_, a) => a,
+            BindingTypeIsNotValidAtDecl(a) => a,
+            CallRcvr(a) => a,
+            CallArg(a) => a,
+            CallReturn(a) => a,
+            Operand(a) => a,
+            AddrOf(a) => a,
+            AutoBorrow(a) => a,
+            SafeDestructor(a) => a,
+            CompareImplMethodObligation { span, .. } => span,
+        }
+    }
+
+    pub fn from_obligation_cause<F>(cause: &traits::ObligationCause<'tcx>, default: F) -> Self
+    where
+        F: FnOnce() -> Self,
+    {
+        match cause.code {
+            traits::ObligationCauseCode::ReferenceOutlivesReferent(ref_type) => {
+                SubregionOrigin::ReferenceOutlivesReferent(ref_type, cause.span)
+            }
+
+            traits::ObligationCauseCode::CompareImplMethodObligation {
+                item_name,
+                impl_item_def_id,
+                trait_item_def_id,
+            } => SubregionOrigin::CompareImplMethodObligation {
+                span: cause.span,
+                item_name,
+                impl_item_def_id,
+                trait_item_def_id,
+            },
+
+            _ => default(),
+        }
+    }
+}
+
+impl RegionVariableOrigin {
+    pub fn span(&self) -> Span {
+        match *self {
+            MiscVariable(a) => a,
+            PatternRegion(a) => a,
+            AddrOfRegion(a) => a,
+            Autoref(a) => a,
+            Coercion(a) => a,
+            EarlyBoundRegion(a, ..) => a,
+            LateBoundRegion(a, ..) => a,
+            BoundRegionInCoherence(_) => rustc_span::DUMMY_SP,
+            UpvarRegion(_, a) => a,
+            NLL(..) => bug!("NLL variable used with `span`"),
+        }
+    }
+}
+
+impl<'tcx> fmt::Debug for RegionObligation<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "RegionObligation(sub_region={:?}, sup_type={:?})",
+            self.sub_region, self.sup_type
+        )
+    }
+}
diff --git a/src/librustc_infer/infer/nll_relate/mod.rs b/src/librustc_infer/infer/nll_relate/mod.rs
new file mode 100644
index 0000000000..50bea300c5
--- /dev/null
+++ b/src/librustc_infer/infer/nll_relate/mod.rs
@@ -0,0 +1,1007 @@
+//! This code is kind of an alternate way of doing subtyping,
+//! supertyping, and type equating, distinct from the `combine.rs`
+//! code but very similar in its effect and design. Eventually the two
+//! ought to be merged. This code is intended for use in NLL and chalk.
+//!
+//! Here are the key differences:
+//!
+//! - This code may choose to bypass some checks (e.g., the occurs check)
+//!   in the case where we know that there are no unbound type inference
+//!   variables. This is the case for NLL, because at NLL time types are fully
+//!   inferred up-to regions.
+//! - This code uses "universes" to handle higher-ranked regions and
+//!   not the leak-check. This is "more correct" than what rustc does
+//!   and we are generally migrating in this direction, but NLL had to
+//!   get there first.
+//!
+//! Also, this code assumes that there are no bound types at all, not even
+//! free ones. This is ok because:
+//! - we are not relating anything quantified over some type variable
+//! - we will have instantiated all the bound type vars already (the one
+//!   thing we relate in chalk are basically domain goals and their
+//!   constituents)
+
+use crate::infer::InferCtxt;
+use crate::infer::{ConstVarValue, ConstVariableValue};
+use crate::traits::DomainGoal;
+use rustc::ty::error::TypeError;
+use rustc::ty::fold::{TypeFoldable, TypeVisitor};
+use rustc::ty::relate::{self, Relate, RelateResult, TypeRelation};
+use rustc::ty::subst::GenericArg;
+use rustc::ty::{self, InferConst, Ty, TyCtxt};
+use rustc_data_structures::fx::FxHashMap;
+use std::fmt::Debug;
+
+#[derive(PartialEq)]
+pub enum NormalizationStrategy {
+    Lazy,
+    Eager,
+}
+
+pub struct TypeRelating<'me, 'tcx, D>
+where
+    D: TypeRelatingDelegate<'tcx>,
+{
+    infcx: &'me InferCtxt<'me, 'tcx>,
+
+    /// Callback to use when we deduce an outlives relationship
+    delegate: D,
+
+    /// How are we relating `a` and `b`?
+    ///
+    /// - Covariant means `a <: b`.
+    /// - Contravariant means `b <: a`.
+    /// - Invariant means `a == b.
+    /// - Bivariant means that it doesn't matter.
+    ambient_variance: ty::Variance,
+
+    /// When we pass through a set of binders (e.g., when looking into
+    /// a `fn` type), we push a new bound region scope onto here. This
+    /// will contain the instantiated region for each region in those
+    /// binders. When we then encounter a `ReLateBound(d, br)`, we can
+    /// use the De Bruijn index `d` to find the right scope, and then
+    /// bound region name `br` to find the specific instantiation from
+    /// within that scope. See `replace_bound_region`.
+    ///
+    /// This field stores the instantiations for late-bound regions in
+    /// the `a` type.
+    a_scopes: Vec<BoundRegionScope<'tcx>>,
+
+    /// Same as `a_scopes`, but for the `b` type.
+    b_scopes: Vec<BoundRegionScope<'tcx>>,
+}
+
+pub trait TypeRelatingDelegate<'tcx> {
+    /// Push a constraint `sup: sub` -- this constraint must be
+    /// satisfied for the two types to be related. `sub` and `sup` may
+    /// be regions from the type or new variables created through the
+    /// delegate.
+    fn push_outlives(&mut self, sup: ty::Region<'tcx>, sub: ty::Region<'tcx>);
+
+    /// Push a domain goal that will need to be proved for the two types to
+    /// be related. Used for lazy normalization.
+    fn push_domain_goal(&mut self, domain_goal: DomainGoal<'tcx>);
+
+    /// Creates a new universe index. Used when instantiating placeholders.
+    fn create_next_universe(&mut self) -> ty::UniverseIndex;
+
+    /// Creates a new region variable representing a higher-ranked
+    /// region that is instantiated existentially. This creates an
+    /// inference variable, typically.
+    ///
+    /// So e.g., if you have `for<'a> fn(..) <: for<'b> fn(..)`, then
+    /// we will invoke this method to instantiate `'a` with an
+    /// inference variable (though `'b` would be instantiated first,
+    /// as a placeholder).
+    fn next_existential_region_var(&mut self, was_placeholder: bool) -> ty::Region<'tcx>;
+
+    /// Creates a new region variable representing a
+    /// higher-ranked region that is instantiated universally.
+    /// This creates a new region placeholder, typically.
+    ///
+    /// So e.g., if you have `for<'a> fn(..) <: for<'b> fn(..)`, then
+    /// we will invoke this method to instantiate `'b` with a
+    /// placeholder region.
+    fn next_placeholder_region(&mut self, placeholder: ty::PlaceholderRegion) -> ty::Region<'tcx>;
+
+    /// Creates a new existential region in the given universe. This
+    /// is used when handling subtyping and type variables -- if we
+    /// have that `?X <: Foo<'a>`, for example, we would instantiate
+    /// `?X` with a type like `Foo<'?0>` where `'?0` is a fresh
+    /// existential variable created by this function. We would then
+    /// relate `Foo<'?0>` with `Foo<'a>` (and probably add an outlives
+    /// relation stating that `'?0: 'a`).
+    fn generalize_existential(&mut self, universe: ty::UniverseIndex) -> ty::Region<'tcx>;
+
+    /// Define the normalization strategy to use, eager or lazy.
+    fn normalization() -> NormalizationStrategy;
+
+    /// Enables some optimizations if we do not expect inference variables
+    /// in the RHS of the relation.
+    fn forbid_inference_vars() -> bool;
+}
+
+#[derive(Clone, Debug)]
+struct ScopesAndKind<'tcx> {
+    scopes: Vec<BoundRegionScope<'tcx>>,
+    kind: GenericArg<'tcx>,
+}
+
+#[derive(Clone, Debug, Default)]
+struct BoundRegionScope<'tcx> {
+    map: FxHashMap<ty::BoundRegion, ty::Region<'tcx>>,
+}
+
+#[derive(Copy, Clone)]
+struct UniversallyQuantified(bool);
+
+impl<'me, 'tcx, D> TypeRelating<'me, 'tcx, D>
+where
+    D: TypeRelatingDelegate<'tcx>,
+{
+    pub fn new(
+        infcx: &'me InferCtxt<'me, 'tcx>,
+        delegate: D,
+        ambient_variance: ty::Variance,
+    ) -> Self {
+        Self { infcx, delegate, ambient_variance, a_scopes: vec![], b_scopes: vec![] }
+    }
+
+    fn ambient_covariance(&self) -> bool {
+        match self.ambient_variance {
+            ty::Variance::Covariant | ty::Variance::Invariant => true,
+            ty::Variance::Contravariant | ty::Variance::Bivariant => false,
+        }
+    }
+
+    fn ambient_contravariance(&self) -> bool {
+        match self.ambient_variance {
+            ty::Variance::Contravariant | ty::Variance::Invariant => true,
+            ty::Variance::Covariant | ty::Variance::Bivariant => false,
+        }
+    }
+
+    fn create_scope(
+        &mut self,
+        value: &ty::Binder<impl TypeFoldable<'tcx>>,
+        universally_quantified: UniversallyQuantified,
+    ) -> BoundRegionScope<'tcx> {
+        let mut scope = BoundRegionScope::default();
+
+        // Create a callback that creates (via the delegate) either an
+        // existential or placeholder region as needed.
+        let mut next_region = {
+            let delegate = &mut self.delegate;
+            let mut lazy_universe = None;
+            move |br: ty::BoundRegion| {
+                if universally_quantified.0 {
+                    // The first time this closure is called, create a
+                    // new universe for the placeholders we will make
+                    // from here out.
+                    let universe = lazy_universe.unwrap_or_else(|| {
+                        let universe = delegate.create_next_universe();
+                        lazy_universe = Some(universe);
+                        universe
+                    });
+
+                    let placeholder = ty::PlaceholderRegion { universe, name: br };
+                    delegate.next_placeholder_region(placeholder)
+                } else {
+                    delegate.next_existential_region_var(true)
+                }
+            }
+        };
+
+        value.skip_binder().visit_with(&mut ScopeInstantiator {
+            next_region: &mut next_region,
+            target_index: ty::INNERMOST,
+            bound_region_scope: &mut scope,
+        });
+
+        scope
+    }
+
+    /// When we encounter binders during the type traversal, we record
+    /// the value to substitute for each of the things contained in
+    /// that binder. (This will be either a universal placeholder or
+    /// an existential inference variable.) Given the De Bruijn index
+    /// `debruijn` (and name `br`) of some binder we have now
+    /// encountered, this routine finds the value that we instantiated
+    /// the region with; to do so, it indexes backwards into the list
+    /// of ambient scopes `scopes`.
+    fn lookup_bound_region(
+        debruijn: ty::DebruijnIndex,
+        br: &ty::BoundRegion,
+        first_free_index: ty::DebruijnIndex,
+        scopes: &[BoundRegionScope<'tcx>],
+    ) -> ty::Region<'tcx> {
+        // The debruijn index is a "reverse index" into the
+        // scopes listing. So when we have INNERMOST (0), we
+        // want the *last* scope pushed, and so forth.
+        let debruijn_index = debruijn.index() - first_free_index.index();
+        let scope = &scopes[scopes.len() - debruijn_index - 1];
+
+        // Find this bound region in that scope to map to a
+        // particular region.
+        scope.map[br]
+    }
+
+    /// If `r` is a bound region, find the scope in which it is bound
+    /// (from `scopes`) and return the value that we instantiated it
+    /// with. Otherwise just return `r`.
+    fn replace_bound_region(
+        &self,
+        r: ty::Region<'tcx>,
+        first_free_index: ty::DebruijnIndex,
+        scopes: &[BoundRegionScope<'tcx>],
+    ) -> ty::Region<'tcx> {
+        debug!("replace_bound_regions(scopes={:?})", scopes);
+        if let ty::ReLateBound(debruijn, br) = r {
+            Self::lookup_bound_region(*debruijn, br, first_free_index, scopes)
+        } else {
+            r
+        }
+    }
+
+    /// Push a new outlives requirement into our output set of
+    /// constraints.
+    fn push_outlives(&mut self, sup: ty::Region<'tcx>, sub: ty::Region<'tcx>) {
+        debug!("push_outlives({:?}: {:?})", sup, sub);
+
+        self.delegate.push_outlives(sup, sub);
+    }
+
+    /// Relate a projection type and some value type lazily. This will always
+    /// succeed, but we push an additional `ProjectionEq` goal depending
+    /// on the value type:
+    /// - if the value type is any type `T` which is not a projection, we push
+    ///   `ProjectionEq(projection = T)`.
+    /// - if the value type is another projection `other_projection`, we create
+    ///   a new inference variable `?U` and push the two goals
+    ///   `ProjectionEq(projection = ?U)`, `ProjectionEq(other_projection = ?U)`.
+    fn relate_projection_ty(
+        &mut self,
+        projection_ty: ty::ProjectionTy<'tcx>,
+        value_ty: Ty<'tcx>,
+    ) -> Ty<'tcx> {
+        use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+        use crate::traits::WhereClause;
+        use rustc_span::DUMMY_SP;
+
+        match value_ty.kind {
+            ty::Projection(other_projection_ty) => {
+                let var = self.infcx.next_ty_var(TypeVariableOrigin {
+                    kind: TypeVariableOriginKind::MiscVariable,
+                    span: DUMMY_SP,
+                });
+                self.relate_projection_ty(projection_ty, var);
+                self.relate_projection_ty(other_projection_ty, var);
+                var
+            }
+
+            _ => {
+                let projection = ty::ProjectionPredicate { projection_ty, ty: value_ty };
+                self.delegate
+                    .push_domain_goal(DomainGoal::Holds(WhereClause::ProjectionEq(projection)));
+                value_ty
+            }
+        }
+    }
+
+    /// Relate a type inference variable with a value type. This works
+    /// by creating a "generalization" G of the value where all the
+    /// lifetimes are replaced with fresh inference values. This
+    /// genearlization G becomes the value of the inference variable,
+    /// and is then related in turn to the value. So e.g. if you had
+    /// `vid = ?0` and `value = &'a u32`, we might first instantiate
+    /// `?0` to a type like `&'0 u32` where `'0` is a fresh variable,
+    /// and then relate `&'0 u32` with `&'a u32` (resulting in
+    /// relations between `'0` and `'a`).
+    ///
+    /// The variable `pair` can be either a `(vid, ty)` or `(ty, vid)`
+    /// -- in other words, it is always a (unresolved) inference
+    /// variable `vid` and a type `ty` that are being related, but the
+    /// vid may appear either as the "a" type or the "b" type,
+    /// depending on where it appears in the tuple. The trait
+    /// `VidValuePair` lets us work with the vid/type while preserving
+    /// the "sidedness" when necessary -- the sidedness is relevant in
+    /// particular for the variance and set of in-scope things.
+    fn relate_ty_var<PAIR: VidValuePair<'tcx>>(
+        &mut self,
+        pair: PAIR,
+    ) -> RelateResult<'tcx, Ty<'tcx>> {
+        debug!("relate_ty_var({:?})", pair);
+
+        let vid = pair.vid();
+        let value_ty = pair.value_ty();
+
+        // FIXME(invariance) -- this logic assumes invariance, but that is wrong.
+        // This only presently applies to chalk integration, as NLL
+        // doesn't permit type variables to appear on both sides (and
+        // doesn't use lazy norm).
+        match value_ty.kind {
+            ty::Infer(ty::TyVar(value_vid)) => {
+                // Two type variables: just equate them.
+                self.infcx.inner.borrow_mut().type_variables.equate(vid, value_vid);
+                return Ok(value_ty);
+            }
+
+            ty::Projection(projection_ty) if D::normalization() == NormalizationStrategy::Lazy => {
+                return Ok(self.relate_projection_ty(projection_ty, self.infcx.tcx.mk_ty_var(vid)));
+            }
+
+            _ => (),
+        }
+
+        let generalized_ty = self.generalize_value(value_ty, vid)?;
+        debug!("relate_ty_var: generalized_ty = {:?}", generalized_ty);
+
+        if D::forbid_inference_vars() {
+            // In NLL, we don't have type inference variables
+            // floating around, so we can do this rather imprecise
+            // variant of the occurs-check.
+            assert!(!generalized_ty.has_infer_types_or_consts());
+        }
+
+        self.infcx.inner.borrow_mut().type_variables.instantiate(vid, generalized_ty);
+
+        // The generalized values we extract from `canonical_var_values` have
+        // been fully instantiated and hence the set of scopes we have
+        // doesn't matter -- just to be sure, put an empty vector
+        // in there.
+        let old_a_scopes = ::std::mem::take(pair.vid_scopes(self));
+
+        // Relate the generalized kind to the original one.
+        let result = pair.relate_generalized_ty(self, generalized_ty);
+
+        // Restore the old scopes now.
+        *pair.vid_scopes(self) = old_a_scopes;
+
+        debug!("relate_ty_var: complete, result = {:?}", result);
+        result
+    }
+
+    fn generalize_value<T: Relate<'tcx>>(
+        &mut self,
+        value: T,
+        for_vid: ty::TyVid,
+    ) -> RelateResult<'tcx, T> {
+        let universe = self.infcx.probe_ty_var(for_vid).unwrap_err();
+
+        let mut generalizer = TypeGeneralizer {
+            infcx: self.infcx,
+            delegate: &mut self.delegate,
+            first_free_index: ty::INNERMOST,
+            ambient_variance: self.ambient_variance,
+            for_vid_sub_root: self.infcx.inner.borrow_mut().type_variables.sub_root_var(for_vid),
+            universe,
+        };
+
+        generalizer.relate(&value, &value)
+    }
+}
+
+/// When we instantiate a inference variable with a value in
+/// `relate_ty_var`, we always have the pair of a `TyVid` and a `Ty`,
+/// but the ordering may vary (depending on whether the inference
+/// variable was found on the `a` or `b` sides). Therefore, this trait
+/// allows us to factor out common code, while preserving the order
+/// when needed.
+trait VidValuePair<'tcx>: Debug {
+    /// Extract the inference variable (which could be either the
+    /// first or second part of the tuple).
+    fn vid(&self) -> ty::TyVid;
+
+    /// Extract the value it is being related to (which will be the
+    /// opposite part of the tuple from the vid).
+    fn value_ty(&self) -> Ty<'tcx>;
+
+    /// Extract the scopes that apply to whichever side of the tuple
+    /// the vid was found on.  See the comment where this is called
+    /// for more details on why we want them.
+    fn vid_scopes<D: TypeRelatingDelegate<'tcx>>(
+        &self,
+        relate: &'r mut TypeRelating<'_, 'tcx, D>,
+    ) -> &'r mut Vec<BoundRegionScope<'tcx>>;
+
+    /// Given a generalized type G that should replace the vid, relate
+    /// G to the value, putting G on whichever side the vid would have
+    /// appeared.
+    fn relate_generalized_ty<D>(
+        &self,
+        relate: &mut TypeRelating<'_, 'tcx, D>,
+        generalized_ty: Ty<'tcx>,
+    ) -> RelateResult<'tcx, Ty<'tcx>>
+    where
+        D: TypeRelatingDelegate<'tcx>;
+}
+
+impl VidValuePair<'tcx> for (ty::TyVid, Ty<'tcx>) {
+    fn vid(&self) -> ty::TyVid {
+        self.0
+    }
+
+    fn value_ty(&self) -> Ty<'tcx> {
+        self.1
+    }
+
+    fn vid_scopes<D>(
+        &self,
+        relate: &'r mut TypeRelating<'_, 'tcx, D>,
+    ) -> &'r mut Vec<BoundRegionScope<'tcx>>
+    where
+        D: TypeRelatingDelegate<'tcx>,
+    {
+        &mut relate.a_scopes
+    }
+
+    fn relate_generalized_ty<D>(
+        &self,
+        relate: &mut TypeRelating<'_, 'tcx, D>,
+        generalized_ty: Ty<'tcx>,
+    ) -> RelateResult<'tcx, Ty<'tcx>>
+    where
+        D: TypeRelatingDelegate<'tcx>,
+    {
+        relate.relate(&generalized_ty, &self.value_ty())
+    }
+}
+
+// In this case, the "vid" is the "b" type.
+impl VidValuePair<'tcx> for (Ty<'tcx>, ty::TyVid) {
+    fn vid(&self) -> ty::TyVid {
+        self.1
+    }
+
+    fn value_ty(&self) -> Ty<'tcx> {
+        self.0
+    }
+
+    fn vid_scopes<D>(
+        &self,
+        relate: &'r mut TypeRelating<'_, 'tcx, D>,
+    ) -> &'r mut Vec<BoundRegionScope<'tcx>>
+    where
+        D: TypeRelatingDelegate<'tcx>,
+    {
+        &mut relate.b_scopes
+    }
+
+    fn relate_generalized_ty<D>(
+        &self,
+        relate: &mut TypeRelating<'_, 'tcx, D>,
+        generalized_ty: Ty<'tcx>,
+    ) -> RelateResult<'tcx, Ty<'tcx>>
+    where
+        D: TypeRelatingDelegate<'tcx>,
+    {
+        relate.relate(&self.value_ty(), &generalized_ty)
+    }
+}
+
+impl<D> TypeRelation<'tcx> for TypeRelating<'me, 'tcx, D>
+where
+    D: TypeRelatingDelegate<'tcx>,
+{
+    fn tcx(&self) -> TyCtxt<'tcx> {
+        self.infcx.tcx
+    }
+
+    // FIXME(oli-obk): not sure how to get the correct ParamEnv
+    fn param_env(&self) -> ty::ParamEnv<'tcx> {
+        ty::ParamEnv::empty()
+    }
+
+    fn tag(&self) -> &'static str {
+        "nll::subtype"
+    }
+
+    fn a_is_expected(&self) -> bool {
+        true
+    }
+
+    fn relate_with_variance<T: Relate<'tcx>>(
+        &mut self,
+        variance: ty::Variance,
+        a: &T,
+        b: &T,
+    ) -> RelateResult<'tcx, T> {
+        debug!("relate_with_variance(variance={:?}, a={:?}, b={:?})", variance, a, b);
+
+        let old_ambient_variance = self.ambient_variance;
+        self.ambient_variance = self.ambient_variance.xform(variance);
+
+        debug!("relate_with_variance: ambient_variance = {:?}", self.ambient_variance);
+
+        let r = self.relate(a, b)?;
+
+        self.ambient_variance = old_ambient_variance;
+
+        debug!("relate_with_variance: r={:?}", r);
+
+        Ok(r)
+    }
+
+    fn tys(&mut self, a: Ty<'tcx>, mut b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
+        let a = self.infcx.shallow_resolve(a);
+
+        if !D::forbid_inference_vars() {
+            b = self.infcx.shallow_resolve(b);
+        }
+
+        if a == b {
+            return Ok(a);
+        }
+
+        match (&a.kind, &b.kind) {
+            (_, &ty::Infer(ty::TyVar(vid))) => {
+                if D::forbid_inference_vars() {
+                    // Forbid inference variables in the RHS.
+                    bug!("unexpected inference var {:?}", b)
+                } else {
+                    self.relate_ty_var((a, vid))
+                }
+            }
+
+            (&ty::Infer(ty::TyVar(vid)), _) => self.relate_ty_var((vid, b)),
+
+            (&ty::Projection(projection_ty), _)
+                if D::normalization() == NormalizationStrategy::Lazy =>
+            {
+                Ok(self.relate_projection_ty(projection_ty, b))
+            }
+
+            (_, &ty::Projection(projection_ty))
+                if D::normalization() == NormalizationStrategy::Lazy =>
+            {
+                Ok(self.relate_projection_ty(projection_ty, a))
+            }
+
+            _ => {
+                debug!("tys(a={:?}, b={:?}, variance={:?})", a, b, self.ambient_variance);
+
+                // Will also handle unification of `IntVar` and `FloatVar`.
+                self.infcx.super_combine_tys(self, a, b)
+            }
+        }
+    }
+
+    fn regions(
+        &mut self,
+        a: ty::Region<'tcx>,
+        b: ty::Region<'tcx>,
+    ) -> RelateResult<'tcx, ty::Region<'tcx>> {
+        debug!("regions(a={:?}, b={:?}, variance={:?})", a, b, self.ambient_variance);
+
+        let v_a = self.replace_bound_region(a, ty::INNERMOST, &self.a_scopes);
+        let v_b = self.replace_bound_region(b, ty::INNERMOST, &self.b_scopes);
+
+        debug!("regions: v_a = {:?}", v_a);
+        debug!("regions: v_b = {:?}", v_b);
+
+        if self.ambient_covariance() {
+            // Covariance: a <= b. Hence, `b: a`.
+            self.push_outlives(v_b, v_a);
+        }
+
+        if self.ambient_contravariance() {
+            // Contravariant: b <= a. Hence, `a: b`.
+            self.push_outlives(v_a, v_b);
+        }
+
+        Ok(a)
+    }
+
+    fn consts(
+        &mut self,
+        a: &'tcx ty::Const<'tcx>,
+        mut b: &'tcx ty::Const<'tcx>,
+    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
+        let a = self.infcx.shallow_resolve(a);
+
+        if !D::forbid_inference_vars() {
+            b = self.infcx.shallow_resolve(b);
+        }
+
+        match b.val {
+            ty::ConstKind::Infer(InferConst::Var(_)) if D::forbid_inference_vars() => {
+                // Forbid inference variables in the RHS.
+                bug!("unexpected inference var {:?}", b)
+            }
+            // FIXME(invariance): see the related FIXME above.
+            _ => self.infcx.super_combine_consts(self, a, b),
+        }
+    }
+
+    fn binders<T>(
+        &mut self,
+        a: &ty::Binder<T>,
+        b: &ty::Binder<T>,
+    ) -> RelateResult<'tcx, ty::Binder<T>>
+    where
+        T: Relate<'tcx>,
+    {
+        // We want that
+        //
+        // ```
+        // for<'a> fn(&'a u32) -> &'a u32 <:
+        //   fn(&'b u32) -> &'b u32
+        // ```
+        //
+        // but not
+        //
+        // ```
+        // fn(&'a u32) -> &'a u32 <:
+        //   for<'b> fn(&'b u32) -> &'b u32
+        // ```
+        //
+        // We therefore proceed as follows:
+        //
+        // - Instantiate binders on `b` universally, yielding a universe U1.
+        // - Instantiate binders on `a` existentially in U1.
+
+        debug!("binders({:?}: {:?}, ambient_variance={:?})", a, b, self.ambient_variance);
+
+        if !a.skip_binder().has_escaping_bound_vars() && !b.skip_binder().has_escaping_bound_vars()
+        {
+            // Fast path for the common case.
+            self.relate(a.skip_binder(), b.skip_binder())?;
+            return Ok(a.clone());
+        }
+
+        if self.ambient_covariance() {
+            // Covariance, so we want `for<..> A <: for<..> B` --
+            // therefore we compare any instantiation of A (i.e., A
+            // instantiated with existentials) against every
+            // instantiation of B (i.e., B instantiated with
+            // universals).
+
+            let b_scope = self.create_scope(b, UniversallyQuantified(true));
+            let a_scope = self.create_scope(a, UniversallyQuantified(false));
+
+            debug!("binders: a_scope = {:?} (existential)", a_scope);
+            debug!("binders: b_scope = {:?} (universal)", b_scope);
+
+            self.b_scopes.push(b_scope);
+            self.a_scopes.push(a_scope);
+
+            // Reset the ambient variance to covariant. This is needed
+            // to correctly handle cases like
+            //
+            //     for<'a> fn(&'a u32, &'a u3) == for<'b, 'c> fn(&'b u32, &'c u32)
+            //
+            // Somewhat surprisingly, these two types are actually
+            // **equal**, even though the one on the right looks more
+            // polymorphic. The reason is due to subtyping. To see it,
+            // consider that each function can call the other:
+            //
+            // - The left function can call the right with `'b` and
+            //   `'c` both equal to `'a`
+            //
+            // - The right function can call the left with `'a` set to
+            //   `{P}`, where P is the point in the CFG where the call
+            //   itself occurs. Note that `'b` and `'c` must both
+            //   include P. At the point, the call works because of
+            //   subtyping (i.e., `&'b u32 <: &{P} u32`).
+            let variance = ::std::mem::replace(&mut self.ambient_variance, ty::Variance::Covariant);
+
+            self.relate(a.skip_binder(), b.skip_binder())?;
+
+            self.ambient_variance = variance;
+
+            self.b_scopes.pop().unwrap();
+            self.a_scopes.pop().unwrap();
+        }
+
+        if self.ambient_contravariance() {
+            // Contravariance, so we want `for<..> A :> for<..> B`
+            // -- therefore we compare every instantiation of A (i.e.,
+            // A instantiated with universals) against any
+            // instantiation of B (i.e., B instantiated with
+            // existentials). Opposite of above.
+
+            let a_scope = self.create_scope(a, UniversallyQuantified(true));
+            let b_scope = self.create_scope(b, UniversallyQuantified(false));
+
+            debug!("binders: a_scope = {:?} (universal)", a_scope);
+            debug!("binders: b_scope = {:?} (existential)", b_scope);
+
+            self.a_scopes.push(a_scope);
+            self.b_scopes.push(b_scope);
+
+            // Reset ambient variance to contravariance. See the
+            // covariant case above for an explanation.
+            let variance =
+                ::std::mem::replace(&mut self.ambient_variance, ty::Variance::Contravariant);
+
+            self.relate(a.skip_binder(), b.skip_binder())?;
+
+            self.ambient_variance = variance;
+
+            self.b_scopes.pop().unwrap();
+            self.a_scopes.pop().unwrap();
+        }
+
+        Ok(a.clone())
+    }
+}
+
+/// When we encounter a binder like `for<..> fn(..)`, we actually have
+/// to walk the `fn` value to find all the values bound by the `for`
+/// (these are not explicitly present in the ty representation right
+/// now). This visitor handles that: it descends the type, tracking
+/// binder depth, and finds late-bound regions targeting the
+/// `for<..`>.  For each of those, it creates an entry in
+/// `bound_region_scope`.
+struct ScopeInstantiator<'me, 'tcx> {
+    next_region: &'me mut dyn FnMut(ty::BoundRegion) -> ty::Region<'tcx>,
+    // The debruijn index of the scope we are instantiating.
+    target_index: ty::DebruijnIndex,
+    bound_region_scope: &'me mut BoundRegionScope<'tcx>,
+}
+
+impl<'me, 'tcx> TypeVisitor<'tcx> for ScopeInstantiator<'me, 'tcx> {
+    fn visit_binder<T: TypeFoldable<'tcx>>(&mut self, t: &ty::Binder<T>) -> bool {
+        self.target_index.shift_in(1);
+        t.super_visit_with(self);
+        self.target_index.shift_out(1);
+
+        false
+    }
+
+    fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool {
+        let ScopeInstantiator { bound_region_scope, next_region, .. } = self;
+
+        match r {
+            ty::ReLateBound(debruijn, br) if *debruijn == self.target_index => {
+                bound_region_scope.map.entry(*br).or_insert_with(|| next_region(*br));
+            }
+
+            _ => {}
+        }
+
+        false
+    }
+}
+
+/// The "type generalize" is used when handling inference variables.
+///
+/// The basic strategy for handling a constraint like `?A <: B` is to
+/// apply a "generalization strategy" to the type `B` -- this replaces
+/// all the lifetimes in the type `B` with fresh inference
+/// variables. (You can read more about the strategy in this [blog
+/// post].)
+///
+/// As an example, if we had `?A <: &'x u32`, we would generalize `&'x
+/// u32` to `&'0 u32` where `'0` is a fresh variable. This becomes the
+/// value of `A`. Finally, we relate `&'0 u32 <: &'x u32`, which
+/// establishes `'0: 'x` as a constraint.
+///
+/// As a side-effect of this generalization procedure, we also replace
+/// all the bound regions that we have traversed with concrete values,
+/// so that the resulting generalized type is independent from the
+/// scopes.
+///
+/// [blog post]: https://is.gd/0hKvIr
+struct TypeGeneralizer<'me, 'tcx, D>
+where
+    D: TypeRelatingDelegate<'tcx>,
+{
+    infcx: &'me InferCtxt<'me, 'tcx>,
+
+    delegate: &'me mut D,
+
+    /// After we generalize this type, we are going to relative it to
+    /// some other type. What will be the variance at this point?
+    ambient_variance: ty::Variance,
+
+    first_free_index: ty::DebruijnIndex,
+
+    /// The vid of the type variable that is in the process of being
+    /// instantiated. If we find this within the value we are folding,
+    /// that means we would have created a cyclic value.
+    for_vid_sub_root: ty::TyVid,
+
+    /// The universe of the type variable that is in the process of being
+    /// instantiated. If we find anything that this universe cannot name,
+    /// we reject the relation.
+    universe: ty::UniverseIndex,
+}
+
+impl<D> TypeRelation<'tcx> for TypeGeneralizer<'me, 'tcx, D>
+where
+    D: TypeRelatingDelegate<'tcx>,
+{
+    fn tcx(&self) -> TyCtxt<'tcx> {
+        self.infcx.tcx
+    }
+
+    // FIXME(oli-obk): not sure how to get the correct ParamEnv
+    fn param_env(&self) -> ty::ParamEnv<'tcx> {
+        ty::ParamEnv::empty()
+    }
+
+    fn tag(&self) -> &'static str {
+        "nll::generalizer"
+    }
+
+    fn a_is_expected(&self) -> bool {
+        true
+    }
+
+    fn relate_with_variance<T: Relate<'tcx>>(
+        &mut self,
+        variance: ty::Variance,
+        a: &T,
+        b: &T,
+    ) -> RelateResult<'tcx, T> {
+        debug!(
+            "TypeGeneralizer::relate_with_variance(variance={:?}, a={:?}, b={:?})",
+            variance, a, b
+        );
+
+        let old_ambient_variance = self.ambient_variance;
+        self.ambient_variance = self.ambient_variance.xform(variance);
+
+        debug!(
+            "TypeGeneralizer::relate_with_variance: ambient_variance = {:?}",
+            self.ambient_variance
+        );
+
+        let r = self.relate(a, b)?;
+
+        self.ambient_variance = old_ambient_variance;
+
+        debug!("TypeGeneralizer::relate_with_variance: r={:?}", r);
+
+        Ok(r)
+    }
+
+    fn tys(&mut self, a: Ty<'tcx>, _: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
+        use crate::infer::type_variable::TypeVariableValue;
+
+        debug!("TypeGeneralizer::tys(a={:?})", a);
+
+        match a.kind {
+            ty::Infer(ty::TyVar(_)) | ty::Infer(ty::IntVar(_)) | ty::Infer(ty::FloatVar(_))
+                if D::forbid_inference_vars() =>
+            {
+                bug!("unexpected inference variable encountered in NLL generalization: {:?}", a);
+            }
+
+            ty::Infer(ty::TyVar(vid)) => {
+                let variables = &mut self.infcx.inner.borrow_mut().type_variables;
+                let vid = variables.root_var(vid);
+                let sub_vid = variables.sub_root_var(vid);
+                if sub_vid == self.for_vid_sub_root {
+                    // If sub-roots are equal, then `for_vid` and
+                    // `vid` are related via subtyping.
+                    debug!("TypeGeneralizer::tys: occurs check failed");
+                    return Err(TypeError::Mismatch);
+                } else {
+                    match variables.probe(vid) {
+                        TypeVariableValue::Known { value: u } => {
+                            drop(variables);
+                            self.relate(&u, &u)
+                        }
+                        TypeVariableValue::Unknown { universe: _universe } => {
+                            if self.ambient_variance == ty::Bivariant {
+                                // FIXME: we may need a WF predicate (related to #54105).
+                            }
+
+                            let origin = *variables.var_origin(vid);
+
+                            // Replacing with a new variable in the universe `self.universe`,
+                            // it will be unified later with the original type variable in
+                            // the universe `_universe`.
+                            let new_var_id = variables.new_var(self.universe, false, origin);
+
+                            let u = self.tcx().mk_ty_var(new_var_id);
+                            debug!("generalize: replacing original vid={:?} with new={:?}", vid, u);
+                            return Ok(u);
+                        }
+                    }
+                }
+            }
+
+            ty::Infer(ty::IntVar(_)) | ty::Infer(ty::FloatVar(_)) => {
+                // No matter what mode we are in,
+                // integer/floating-point types must be equal to be
+                // relatable.
+                Ok(a)
+            }
+
+            ty::Placeholder(placeholder) => {
+                if self.universe.cannot_name(placeholder.universe) {
+                    debug!(
+                        "TypeGeneralizer::tys: root universe {:?} cannot name\
+                         placeholder in universe {:?}",
+                        self.universe, placeholder.universe
+                    );
+                    Err(TypeError::Mismatch)
+                } else {
+                    Ok(a)
+                }
+            }
+
+            _ => relate::super_relate_tys(self, a, a),
+        }
+    }
+
+    fn regions(
+        &mut self,
+        a: ty::Region<'tcx>,
+        _: ty::Region<'tcx>,
+    ) -> RelateResult<'tcx, ty::Region<'tcx>> {
+        debug!("TypeGeneralizer::regions(a={:?})", a);
+
+        if let ty::ReLateBound(debruijn, _) = a {
+            if *debruijn < self.first_free_index {
+                return Ok(a);
+            }
+        }
+
+        // For now, we just always create a fresh region variable to
+        // replace all the regions in the source type. In the main
+        // type checker, we special case the case where the ambient
+        // variance is `Invariant` and try to avoid creating a fresh
+        // region variable, but since this comes up so much less in
+        // NLL (only when users use `_` etc) it is much less
+        // important.
+        //
+        // As an aside, since these new variables are created in
+        // `self.universe` universe, this also serves to enforce the
+        // universe scoping rules.
+        //
+        // FIXME(#54105) -- if the ambient variance is bivariant,
+        // though, we may however need to check well-formedness or
+        // risk a problem like #41677 again.
+
+        let replacement_region_vid = self.delegate.generalize_existential(self.universe);
+
+        Ok(replacement_region_vid)
+    }
+
+    fn consts(
+        &mut self,
+        a: &'tcx ty::Const<'tcx>,
+        _: &'tcx ty::Const<'tcx>,
+    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
+        match a.val {
+            ty::ConstKind::Infer(InferConst::Var(_)) if D::forbid_inference_vars() => {
+                bug!("unexpected inference variable encountered in NLL generalization: {:?}", a);
+            }
+            ty::ConstKind::Infer(InferConst::Var(vid)) => {
+                let variable_table = &mut self.infcx.inner.borrow_mut().const_unification_table;
+                let var_value = variable_table.probe_value(vid);
+                match var_value.val.known() {
+                    Some(u) => self.relate(&u, &u),
+                    None => {
+                        let new_var_id = variable_table.new_key(ConstVarValue {
+                            origin: var_value.origin,
+                            val: ConstVariableValue::Unknown { universe: self.universe },
+                        });
+                        Ok(self.tcx().mk_const_var(new_var_id, a.ty))
+                    }
+                }
+            }
+            _ => relate::super_relate_consts(self, a, a),
+        }
+    }
+
+    fn binders<T>(
+        &mut self,
+        a: &ty::Binder<T>,
+        _: &ty::Binder<T>,
+    ) -> RelateResult<'tcx, ty::Binder<T>>
+    where
+        T: Relate<'tcx>,
+    {
+        debug!("TypeGeneralizer::binders(a={:?})", a);
+
+        self.first_free_index.shift_in(1);
+        let result = self.relate(a.skip_binder(), a.skip_binder())?;
+        self.first_free_index.shift_out(1);
+        Ok(ty::Binder::bind(result))
+    }
+}
diff --git a/src/librustc_infer/infer/opaque_types/mod.rs b/src/librustc_infer/infer/opaque_types/mod.rs
new file mode 100644
index 0000000000..4d264008ee
--- /dev/null
+++ b/src/librustc_infer/infer/opaque_types/mod.rs
@@ -0,0 +1,1328 @@
+use crate::infer::error_reporting::{note_and_explain_free_region, note_and_explain_region};
+use crate::infer::{self, InferCtxt, InferOk, TypeVariableOrigin, TypeVariableOriginKind};
+use crate::traits::{self, PredicateObligation};
+use rustc::middle::region;
+use rustc::session::config::nightly_options;
+use rustc::ty::fold::{BottomUpFolder, TypeFoldable, TypeFolder, TypeVisitor};
+use rustc::ty::free_region_map::FreeRegionRelations;
+use rustc::ty::subst::{GenericArg, GenericArgKind, InternalSubsts, SubstsRef};
+use rustc::ty::{self, GenericParamDefKind, Ty, TyCtxt};
+use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::sync::Lrc;
+use rustc_errors::{struct_span_err, DiagnosticBuilder};
+use rustc_hir as hir;
+use rustc_hir::def_id::{DefId, DefIdMap};
+use rustc_hir::Node;
+use rustc_span::Span;
+
+pub type OpaqueTypeMap<'tcx> = DefIdMap<OpaqueTypeDecl<'tcx>>;
+
+/// Information about the opaque types whose values we
+/// are inferring in this function (these are the `impl Trait` that
+/// appear in the return type).
+#[derive(Copy, Clone, Debug)]
+pub struct OpaqueTypeDecl<'tcx> {
+    /// The opaque type (`ty::Opaque`) for this declaration.
+    pub opaque_type: Ty<'tcx>,
+
+    /// The substitutions that we apply to the opaque type that this
+    /// `impl Trait` desugars to. e.g., if:
+    ///
+    ///     fn foo<'a, 'b, T>() -> impl Trait<'a>
+    ///
+    /// winds up desugared to:
+    ///
+    ///     type Foo<'x, X> = impl Trait<'x>
+    ///     fn foo<'a, 'b, T>() -> Foo<'a, T>
+    ///
+    /// then `substs` would be `['a, T]`.
+    pub substs: SubstsRef<'tcx>,
+
+    /// The span of this particular definition of the opaque type.  So
+    /// for example:
+    ///
+    /// ```
+    /// type Foo = impl Baz;
+    /// fn bar() -> Foo {
+    ///             ^^^ This is the span we are looking for!
+    /// ```
+    ///
+    /// In cases where the fn returns `(impl Trait, impl Trait)` or
+    /// other such combinations, the result is currently
+    /// over-approximated, but better than nothing.
+    pub definition_span: Span,
+
+    /// The type variable that represents the value of the opaque type
+    /// that we require. In other words, after we compile this function,
+    /// we will be created a constraint like:
+    ///
+    ///     Foo<'a, T> = ?C
+    ///
+    /// where `?C` is the value of this type variable. =) It may
+    /// naturally refer to the type and lifetime parameters in scope
+    /// in this function, though ultimately it should only reference
+    /// those that are arguments to `Foo` in the constraint above. (In
+    /// other words, `?C` should not include `'b`, even though it's a
+    /// lifetime parameter on `foo`.)
+    pub concrete_ty: Ty<'tcx>,
+
+    /// Returns `true` if the `impl Trait` bounds include region bounds.
+    /// For example, this would be true for:
+    ///
+    ///     fn foo<'a, 'b, 'c>() -> impl Trait<'c> + 'a + 'b
+    ///
+    /// but false for:
+    ///
+    ///     fn foo<'c>() -> impl Trait<'c>
+    ///
+    /// unless `Trait` was declared like:
+    ///
+    ///     trait Trait<'c>: 'c
+    ///
+    /// in which case it would be true.
+    ///
+    /// This is used during regionck to decide whether we need to
+    /// impose any additional constraints to ensure that region
+    /// variables in `concrete_ty` wind up being constrained to
+    /// something from `substs` (or, at minimum, things that outlive
+    /// the fn body). (Ultimately, writeback is responsible for this
+    /// check.)
+    pub has_required_region_bounds: bool,
+
+    /// The origin of the opaque type.
+    pub origin: hir::OpaqueTyOrigin,
+}
+
+/// Whether member constraints should be generated for all opaque types
+pub enum GenerateMemberConstraints {
+    /// The default, used by typeck
+    WhenRequired,
+    /// The borrow checker needs member constraints in any case where we don't
+    /// have a `'static` bound. This is because the borrow checker has more
+    /// flexibility in the values of regions. For example, given `f<'a, 'b>`
+    /// the borrow checker can have an inference variable outlive `'a` and `'b`,
+    /// but not be equal to `'static`.
+    IfNoStaticBound,
+}
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    /// Replaces all opaque types in `value` with fresh inference variables
+    /// and creates appropriate obligations. For example, given the input:
+    ///
+    ///     impl Iterator<Item = impl Debug>
+    ///
+    /// this method would create two type variables, `?0` and `?1`. It would
+    /// return the type `?0` but also the obligations:
+    ///
+    ///     ?0: Iterator<Item = ?1>
+    ///     ?1: Debug
+    ///
+    /// Moreover, it returns a `OpaqueTypeMap` that would map `?0` to
+    /// info about the `impl Iterator<..>` type and `?1` to info about
+    /// the `impl Debug` type.
+    ///
+    /// # Parameters
+    ///
+    /// - `parent_def_id` -- the `DefId` of the function in which the opaque type
+    ///   is defined
+    /// - `body_id` -- the body-id with which the resulting obligations should
+    ///   be associated
+    /// - `param_env` -- the in-scope parameter environment to be used for
+    ///   obligations
+    /// - `value` -- the value within which we are instantiating opaque types
+    /// - `value_span` -- the span where the value came from, used in error reporting
+    pub fn instantiate_opaque_types<T: TypeFoldable<'tcx>>(
+        &self,
+        parent_def_id: DefId,
+        body_id: hir::HirId,
+        param_env: ty::ParamEnv<'tcx>,
+        value: &T,
+        value_span: Span,
+    ) -> InferOk<'tcx, (T, OpaqueTypeMap<'tcx>)> {
+        debug!(
+            "instantiate_opaque_types(value={:?}, parent_def_id={:?}, body_id={:?}, \
+             param_env={:?}, value_span={:?})",
+            value, parent_def_id, body_id, param_env, value_span,
+        );
+        let mut instantiator = Instantiator {
+            infcx: self,
+            parent_def_id,
+            body_id,
+            param_env,
+            value_span,
+            opaque_types: Default::default(),
+            obligations: vec![],
+        };
+        let value = instantiator.instantiate_opaque_types_in_map(value);
+        InferOk { value: (value, instantiator.opaque_types), obligations: instantiator.obligations }
+    }
+
+    /// Given the map `opaque_types` containing the opaque
+    /// `impl Trait` types whose underlying, hidden types are being
+    /// inferred, this method adds constraints to the regions
+    /// appearing in those underlying hidden types to ensure that they
+    /// at least do not refer to random scopes within the current
+    /// function. These constraints are not (quite) sufficient to
+    /// guarantee that the regions are actually legal values; that
+    /// final condition is imposed after region inference is done.
+    ///
+    /// # The Problem
+    ///
+    /// Let's work through an example to explain how it works. Assume
+    /// the current function is as follows:
+    ///
+    /// ```text
+    /// fn foo<'a, 'b>(..) -> (impl Bar<'a>, impl Bar<'b>)
+    /// ```
+    ///
+    /// Here, we have two `impl Trait` types whose values are being
+    /// inferred (the `impl Bar<'a>` and the `impl
+    /// Bar<'b>`). Conceptually, this is sugar for a setup where we
+    /// define underlying opaque types (`Foo1`, `Foo2`) and then, in
+    /// the return type of `foo`, we *reference* those definitions:
+    ///
+    /// ```text
+    /// type Foo1<'x> = impl Bar<'x>;
+    /// type Foo2<'x> = impl Bar<'x>;
+    /// fn foo<'a, 'b>(..) -> (Foo1<'a>, Foo2<'b>) { .. }
+    ///                    //  ^^^^ ^^
+    ///                    //  |    |
+    ///                    //  |    substs
+    ///                    //  def_id
+    /// ```
+    ///
+    /// As indicating in the comments above, each of those references
+    /// is (in the compiler) basically a substitution (`substs`)
+    /// applied to the type of a suitable `def_id` (which identifies
+    /// `Foo1` or `Foo2`).
+    ///
+    /// Now, at this point in compilation, what we have done is to
+    /// replace each of the references (`Foo1<'a>`, `Foo2<'b>`) with
+    /// fresh inference variables C1 and C2. We wish to use the values
+    /// of these variables to infer the underlying types of `Foo1` and
+    /// `Foo2`. That is, this gives rise to higher-order (pattern) unification
+    /// constraints like:
+    ///
+    /// ```text
+    /// for<'a> (Foo1<'a> = C1)
+    /// for<'b> (Foo1<'b> = C2)
+    /// ```
+    ///
+    /// For these equation to be satisfiable, the types `C1` and `C2`
+    /// can only refer to a limited set of regions. For example, `C1`
+    /// can only refer to `'static` and `'a`, and `C2` can only refer
+    /// to `'static` and `'b`. The job of this function is to impose that
+    /// constraint.
+    ///
+    /// Up to this point, C1 and C2 are basically just random type
+    /// inference variables, and hence they may contain arbitrary
+    /// regions. In fact, it is fairly likely that they do! Consider
+    /// this possible definition of `foo`:
+    ///
+    /// ```text
+    /// fn foo<'a, 'b>(x: &'a i32, y: &'b i32) -> (impl Bar<'a>, impl Bar<'b>) {
+    ///         (&*x, &*y)
+    ///     }
+    /// ```
+    ///
+    /// Here, the values for the concrete types of the two impl
+    /// traits will include inference variables:
+    ///
+    /// ```text
+    /// &'0 i32
+    /// &'1 i32
+    /// ```
+    ///
+    /// Ordinarily, the subtyping rules would ensure that these are
+    /// sufficiently large. But since `impl Bar<'a>` isn't a specific
+    /// type per se, we don't get such constraints by default. This
+    /// is where this function comes into play. It adds extra
+    /// constraints to ensure that all the regions which appear in the
+    /// inferred type are regions that could validly appear.
+    ///
+    /// This is actually a bit of a tricky constraint in general. We
+    /// want to say that each variable (e.g., `'0`) can only take on
+    /// values that were supplied as arguments to the opaque type
+    /// (e.g., `'a` for `Foo1<'a>`) or `'static`, which is always in
+    /// scope. We don't have a constraint quite of this kind in the current
+    /// region checker.
+    ///
+    /// # The Solution
+    ///
+    /// We generally prefer to make `<=` constraints, since they
+    /// integrate best into the region solver. To do that, we find the
+    /// "minimum" of all the arguments that appear in the substs: that
+    /// is, some region which is less than all the others. In the case
+    /// of `Foo1<'a>`, that would be `'a` (it's the only choice, after
+    /// all). Then we apply that as a least bound to the variables
+    /// (e.g., `'a <= '0`).
+    ///
+    /// In some cases, there is no minimum. Consider this example:
+    ///
+    /// ```text
+    /// fn baz<'a, 'b>() -> impl Trait<'a, 'b> { ... }
+    /// ```
+    ///
+    /// Here we would report a more complex "in constraint", like `'r
+    /// in ['a, 'b, 'static]` (where `'r` is some region appearing in
+    /// the hidden type).
+    ///
+    /// # Constrain regions, not the hidden concrete type
+    ///
+    /// Note that generating constraints on each region `Rc` is *not*
+    /// the same as generating an outlives constraint on `Tc` iself.
+    /// For example, if we had a function like this:
+    ///
+    /// ```rust
+    /// fn foo<'a, T>(x: &'a u32, y: T) -> impl Foo<'a> {
+    ///   (x, y)
+    /// }
+    ///
+    /// // Equivalent to:
+    /// type FooReturn<'a, T> = impl Foo<'a>;
+    /// fn foo<'a, T>(..) -> FooReturn<'a, T> { .. }
+    /// ```
+    ///
+    /// then the hidden type `Tc` would be `(&'0 u32, T)` (where `'0`
+    /// is an inference variable). If we generated a constraint that
+    /// `Tc: 'a`, then this would incorrectly require that `T: 'a` --
+    /// but this is not necessary, because the opaque type we
+    /// create will be allowed to reference `T`. So we only generate a
+    /// constraint that `'0: 'a`.
+    ///
+    /// # The `free_region_relations` parameter
+    ///
+    /// The `free_region_relations` argument is used to find the
+    /// "minimum" of the regions supplied to a given opaque type.
+    /// It must be a relation that can answer whether `'a <= 'b`,
+    /// where `'a` and `'b` are regions that appear in the "substs"
+    /// for the opaque type references (the `<'a>` in `Foo1<'a>`).
+    ///
+    /// Note that we do not impose the constraints based on the
+    /// generic regions from the `Foo1` definition (e.g., `'x`). This
+    /// is because the constraints we are imposing here is basically
+    /// the concern of the one generating the constraining type C1,
+    /// which is the current function. It also means that we can
+    /// take "implied bounds" into account in some cases:
+    ///
+    /// ```text
+    /// trait SomeTrait<'a, 'b> { }
+    /// fn foo<'a, 'b>(_: &'a &'b u32) -> impl SomeTrait<'a, 'b> { .. }
+    /// ```
+    ///
+    /// Here, the fact that `'b: 'a` is known only because of the
+    /// implied bounds from the `&'a &'b u32` parameter, and is not
+    /// "inherent" to the opaque type definition.
+    ///
+    /// # Parameters
+    ///
+    /// - `opaque_types` -- the map produced by `instantiate_opaque_types`
+    /// - `free_region_relations` -- something that can be used to relate
+    ///   the free regions (`'a`) that appear in the impl trait.
+    pub fn constrain_opaque_types<FRR: FreeRegionRelations<'tcx>>(
+        &self,
+        opaque_types: &OpaqueTypeMap<'tcx>,
+        free_region_relations: &FRR,
+    ) {
+        debug!("constrain_opaque_types()");
+
+        for (&def_id, opaque_defn) in opaque_types {
+            self.constrain_opaque_type(
+                def_id,
+                opaque_defn,
+                GenerateMemberConstraints::WhenRequired,
+                free_region_relations,
+            );
+        }
+    }
+
+    /// See `constrain_opaque_types` for documentation.
+    pub fn constrain_opaque_type<FRR: FreeRegionRelations<'tcx>>(
+        &self,
+        def_id: DefId,
+        opaque_defn: &OpaqueTypeDecl<'tcx>,
+        mode: GenerateMemberConstraints,
+        free_region_relations: &FRR,
+    ) {
+        debug!("constrain_opaque_type()");
+        debug!("constrain_opaque_type: def_id={:?}", def_id);
+        debug!("constrain_opaque_type: opaque_defn={:#?}", opaque_defn);
+
+        let tcx = self.tcx;
+
+        let concrete_ty = self.resolve_vars_if_possible(&opaque_defn.concrete_ty);
+
+        debug!("constrain_opaque_type: concrete_ty={:?}", concrete_ty);
+
+        let opaque_type_generics = tcx.generics_of(def_id);
+
+        let span = tcx.def_span(def_id);
+
+        // If there are required region bounds, we can use them.
+        if opaque_defn.has_required_region_bounds {
+            let predicates_of = tcx.predicates_of(def_id);
+            debug!("constrain_opaque_type: predicates: {:#?}", predicates_of,);
+            let bounds = predicates_of.instantiate(tcx, opaque_defn.substs);
+            debug!("constrain_opaque_type: bounds={:#?}", bounds);
+            let opaque_type = tcx.mk_opaque(def_id, opaque_defn.substs);
+
+            let required_region_bounds =
+                required_region_bounds(tcx, opaque_type, bounds.predicates);
+            debug_assert!(!required_region_bounds.is_empty());
+
+            for required_region in required_region_bounds {
+                concrete_ty.visit_with(&mut ConstrainOpaqueTypeRegionVisitor {
+                    tcx: self.tcx,
+                    op: |r| self.sub_regions(infer::CallReturn(span), required_region, r),
+                });
+            }
+            if let GenerateMemberConstraints::IfNoStaticBound = mode {
+                self.generate_member_constraint(
+                    concrete_ty,
+                    opaque_type_generics,
+                    opaque_defn,
+                    def_id,
+                );
+            }
+            return;
+        }
+
+        // There were no `required_region_bounds`,
+        // so we have to search for a `least_region`.
+        // Go through all the regions used as arguments to the
+        // opaque type. These are the parameters to the opaque
+        // type; so in our example above, `substs` would contain
+        // `['a]` for the first impl trait and `'b` for the
+        // second.
+        let mut least_region = None;
+        for param in &opaque_type_generics.params {
+            match param.kind {
+                GenericParamDefKind::Lifetime => {}
+                _ => continue,
+            }
+
+            // Get the value supplied for this region from the substs.
+            let subst_arg = opaque_defn.substs.region_at(param.index as usize);
+
+            // Compute the least upper bound of it with the other regions.
+            debug!("constrain_opaque_types: least_region={:?}", least_region);
+            debug!("constrain_opaque_types: subst_arg={:?}", subst_arg);
+            match least_region {
+                None => least_region = Some(subst_arg),
+                Some(lr) => {
+                    if free_region_relations.sub_free_regions(self.tcx, lr, subst_arg) {
+                        // keep the current least region
+                    } else if free_region_relations.sub_free_regions(self.tcx, subst_arg, lr) {
+                        // switch to `subst_arg`
+                        least_region = Some(subst_arg);
+                    } else {
+                        // There are two regions (`lr` and
+                        // `subst_arg`) which are not relatable. We
+                        // can't find a best choice. Therefore,
+                        // instead of creating a single bound like
+                        // `'r: 'a` (which is our preferred choice),
+                        // we will create a "in bound" like `'r in
+                        // ['a, 'b, 'c]`, where `'a..'c` are the
+                        // regions that appear in the impl trait.
+
+                        // For now, enforce a feature gate outside of async functions.
+                        self.member_constraint_feature_gate(opaque_defn, def_id, lr, subst_arg);
+
+                        return self.generate_member_constraint(
+                            concrete_ty,
+                            opaque_type_generics,
+                            opaque_defn,
+                            def_id,
+                        );
+                    }
+                }
+            }
+        }
+
+        let least_region = least_region.unwrap_or(tcx.lifetimes.re_static);
+        debug!("constrain_opaque_types: least_region={:?}", least_region);
+
+        if let GenerateMemberConstraints::IfNoStaticBound = mode {
+            if least_region != tcx.lifetimes.re_static {
+                self.generate_member_constraint(
+                    concrete_ty,
+                    opaque_type_generics,
+                    opaque_defn,
+                    def_id,
+                );
+            }
+        }
+        concrete_ty.visit_with(&mut ConstrainOpaqueTypeRegionVisitor {
+            tcx: self.tcx,
+            op: |r| self.sub_regions(infer::CallReturn(span), least_region, r),
+        });
+    }
+
+    /// As a fallback, we sometimes generate an "in constraint". For
+    /// a case like `impl Foo<'a, 'b>`, where `'a` and `'b` cannot be
+    /// related, we would generate a constraint `'r in ['a, 'b,
+    /// 'static]` for each region `'r` that appears in the hidden type
+    /// (i.e., it must be equal to `'a`, `'b`, or `'static`).
+    ///
+    /// `conflict1` and `conflict2` are the two region bounds that we
+    /// detected which were unrelated. They are used for diagnostics.
+    fn generate_member_constraint(
+        &self,
+        concrete_ty: Ty<'tcx>,
+        opaque_type_generics: &ty::Generics,
+        opaque_defn: &OpaqueTypeDecl<'tcx>,
+        opaque_type_def_id: DefId,
+    ) {
+        // Create the set of choice regions: each region in the hidden
+        // type can be equal to any of the region parameters of the
+        // opaque type definition.
+        let choice_regions: Lrc<Vec<ty::Region<'tcx>>> = Lrc::new(
+            opaque_type_generics
+                .params
+                .iter()
+                .filter(|param| match param.kind {
+                    GenericParamDefKind::Lifetime => true,
+                    GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => false,
+                })
+                .map(|param| opaque_defn.substs.region_at(param.index as usize))
+                .chain(std::iter::once(self.tcx.lifetimes.re_static))
+                .collect(),
+        );
+
+        concrete_ty.visit_with(&mut ConstrainOpaqueTypeRegionVisitor {
+            tcx: self.tcx,
+            op: |r| {
+                self.member_constraint(
+                    opaque_type_def_id,
+                    opaque_defn.definition_span,
+                    concrete_ty,
+                    r,
+                    &choice_regions,
+                )
+            },
+        });
+    }
+
+    /// Member constraints are presently feature-gated except for
+    /// async-await. We expect to lift this once we've had a bit more
+    /// time.
+    fn member_constraint_feature_gate(
+        &self,
+        opaque_defn: &OpaqueTypeDecl<'tcx>,
+        opaque_type_def_id: DefId,
+        conflict1: ty::Region<'tcx>,
+        conflict2: ty::Region<'tcx>,
+    ) -> bool {
+        // If we have `#![feature(member_constraints)]`, no problems.
+        if self.tcx.features().member_constraints {
+            return false;
+        }
+
+        let span = self.tcx.def_span(opaque_type_def_id);
+
+        // Without a feature-gate, we only generate member-constraints for async-await.
+        let context_name = match opaque_defn.origin {
+            // No feature-gate required for `async fn`.
+            hir::OpaqueTyOrigin::AsyncFn => return false,
+
+            // Otherwise, generate the label we'll use in the error message.
+            hir::OpaqueTyOrigin::TypeAlias
+            | hir::OpaqueTyOrigin::FnReturn
+            | hir::OpaqueTyOrigin::Misc => "impl Trait",
+        };
+        let msg = format!("ambiguous lifetime bound in `{}`", context_name);
+        let mut err = self.tcx.sess.struct_span_err(span, &msg);
+
+        let conflict1_name = conflict1.to_string();
+        let conflict2_name = conflict2.to_string();
+        let label_owned;
+        let label = match (&*conflict1_name, &*conflict2_name) {
+            ("'_", "'_") => "the elided lifetimes here do not outlive one another",
+            _ => {
+                label_owned = format!(
+                    "neither `{}` nor `{}` outlives the other",
+                    conflict1_name, conflict2_name,
+                );
+                &label_owned
+            }
+        };
+        err.span_label(span, label);
+
+        if nightly_options::is_nightly_build() {
+            err.help("add #![feature(member_constraints)] to the crate attributes to enable");
+        }
+
+        err.emit();
+        true
+    }
+
+    /// Given the fully resolved, instantiated type for an opaque
+    /// type, i.e., the value of an inference variable like C1 or C2
+    /// (*), computes the "definition type" for an opaque type
+    /// definition -- that is, the inferred value of `Foo1<'x>` or
+    /// `Foo2<'x>` that we would conceptually use in its definition:
+    ///
+    ///     type Foo1<'x> = impl Bar<'x> = AAA; <-- this type AAA
+    ///     type Foo2<'x> = impl Bar<'x> = BBB; <-- or this type BBB
+    ///     fn foo<'a, 'b>(..) -> (Foo1<'a>, Foo2<'b>) { .. }
+    ///
+    /// Note that these values are defined in terms of a distinct set of
+    /// generic parameters (`'x` instead of `'a`) from C1 or C2. The main
+    /// purpose of this function is to do that translation.
+    ///
+    /// (*) C1 and C2 were introduced in the comments on
+    /// `constrain_opaque_types`. Read that comment for more context.
+    ///
+    /// # Parameters
+    ///
+    /// - `def_id`, the `impl Trait` type
+    /// - `substs`, the substs  used to instantiate this opaque type
+    /// - `instantiated_ty`, the inferred type C1 -- fully resolved, lifted version of
+    ///   `opaque_defn.concrete_ty`
+    pub fn infer_opaque_definition_from_instantiation(
+        &self,
+        def_id: DefId,
+        substs: SubstsRef<'tcx>,
+        instantiated_ty: Ty<'tcx>,
+        span: Span,
+    ) -> Ty<'tcx> {
+        debug!(
+            "infer_opaque_definition_from_instantiation(def_id={:?}, instantiated_ty={:?})",
+            def_id, instantiated_ty
+        );
+
+        // Use substs to build up a reverse map from regions to their
+        // identity mappings. This is necessary because of `impl
+        // Trait` lifetimes are computed by replacing existing
+        // lifetimes with 'static and remapping only those used in the
+        // `impl Trait` return type, resulting in the parameters
+        // shifting.
+        let id_substs = InternalSubsts::identity_for_item(self.tcx, def_id);
+        let map: FxHashMap<GenericArg<'tcx>, GenericArg<'tcx>> =
+            substs.iter().enumerate().map(|(index, subst)| (*subst, id_substs[index])).collect();
+
+        // Convert the type from the function into a type valid outside
+        // the function, by replacing invalid regions with 'static,
+        // after producing an error for each of them.
+        let definition_ty = instantiated_ty.fold_with(&mut ReverseMapper::new(
+            self.tcx,
+            self.is_tainted_by_errors(),
+            def_id,
+            map,
+            instantiated_ty,
+            span,
+        ));
+        debug!("infer_opaque_definition_from_instantiation: definition_ty={:?}", definition_ty);
+
+        definition_ty
+    }
+}
+
+pub fn unexpected_hidden_region_diagnostic(
+    tcx: TyCtxt<'tcx>,
+    region_scope_tree: Option<&region::ScopeTree>,
+    span: Span,
+    hidden_ty: Ty<'tcx>,
+    hidden_region: ty::Region<'tcx>,
+) -> DiagnosticBuilder<'tcx> {
+    let mut err = struct_span_err!(
+        tcx.sess,
+        span,
+        E0700,
+        "hidden type for `impl Trait` captures lifetime that does not appear in bounds",
+    );
+
+    // Explain the region we are capturing.
+    if let ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReStatic | ty::ReEmpty(_) = hidden_region {
+        // Assuming regionck succeeded (*), we ought to always be
+        // capturing *some* region from the fn header, and hence it
+        // ought to be free. So under normal circumstances, we will go
+        // down this path which gives a decent human readable
+        // explanation.
+        //
+        // (*) if not, the `tainted_by_errors` flag would be set to
+        // true in any case, so we wouldn't be here at all.
+        note_and_explain_free_region(
+            tcx,
+            &mut err,
+            &format!("hidden type `{}` captures ", hidden_ty),
+            hidden_region,
+            "",
+        );
+    } else {
+        // Ugh. This is a painful case: the hidden region is not one
+        // that we can easily summarize or explain. This can happen
+        // in a case like
+        // `src/test/ui/multiple-lifetimes/ordinary-bounds-unsuited.rs`:
+        //
+        // ```
+        // fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b> {
+        //   if condition() { a } else { b }
+        // }
+        // ```
+        //
+        // Here the captured lifetime is the intersection of `'a` and
+        // `'b`, which we can't quite express.
+
+        if let Some(region_scope_tree) = region_scope_tree {
+            // If the `region_scope_tree` is available, this is being
+            // invoked from the "region inferencer error". We can at
+            // least report a really cryptic error for now.
+            note_and_explain_region(
+                tcx,
+                region_scope_tree,
+                &mut err,
+                &format!("hidden type `{}` captures ", hidden_ty),
+                hidden_region,
+                "",
+            );
+        } else {
+            // If the `region_scope_tree` is *unavailable*, this is
+            // being invoked by the code that comes *after* region
+            // inferencing. This is a bug, as the region inferencer
+            // ought to have noticed the failed constraint and invoked
+            // error reporting, which in turn should have prevented us
+            // from getting trying to infer the hidden type
+            // completely.
+            tcx.sess.delay_span_bug(
+                span,
+                &format!(
+                    "hidden type captures unexpected lifetime `{:?}` \
+                     but no region inference failure",
+                    hidden_region,
+                ),
+            );
+        }
+    }
+
+    err
+}
+
+// Visitor that requires that (almost) all regions in the type visited outlive
+// `least_region`. We cannot use `push_outlives_components` because regions in
+// closure signatures are not included in their outlives components. We need to
+// ensure all regions outlive the given bound so that we don't end up with,
+// say, `ReScope` appearing in a return type and causing ICEs when other
+// functions end up with region constraints involving regions from other
+// functions.
+//
+// We also cannot use `for_each_free_region` because for closures it includes
+// the regions parameters from the enclosing item.
+//
+// We ignore any type parameters because impl trait values are assumed to
+// capture all the in-scope type parameters.
+struct ConstrainOpaqueTypeRegionVisitor<'tcx, OP>
+where
+    OP: FnMut(ty::Region<'tcx>),
+{
+    tcx: TyCtxt<'tcx>,
+    op: OP,
+}
+
+impl<'tcx, OP> TypeVisitor<'tcx> for ConstrainOpaqueTypeRegionVisitor<'tcx, OP>
+where
+    OP: FnMut(ty::Region<'tcx>),
+{
+    fn visit_binder<T: TypeFoldable<'tcx>>(&mut self, t: &ty::Binder<T>) -> bool {
+        t.skip_binder().visit_with(self);
+        false // keep visiting
+    }
+
+    fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool {
+        match *r {
+            // ignore bound regions, keep visiting
+            ty::ReLateBound(_, _) => false,
+            _ => {
+                (self.op)(r);
+                false
+            }
+        }
+    }
+
+    fn visit_ty(&mut self, ty: Ty<'tcx>) -> bool {
+        // We're only interested in types involving regions
+        if !ty.flags.intersects(ty::TypeFlags::HAS_FREE_REGIONS) {
+            return false; // keep visiting
+        }
+
+        match ty.kind {
+            ty::Closure(def_id, ref substs) => {
+                // Skip lifetime parameters of the enclosing item(s)
+
+                for upvar_ty in substs.as_closure().upvar_tys(def_id, self.tcx) {
+                    upvar_ty.visit_with(self);
+                }
+
+                substs.as_closure().sig_ty(def_id, self.tcx).visit_with(self);
+            }
+
+            ty::Generator(def_id, ref substs, _) => {
+                // Skip lifetime parameters of the enclosing item(s)
+                // Also skip the witness type, because that has no free regions.
+
+                for upvar_ty in substs.as_generator().upvar_tys(def_id, self.tcx) {
+                    upvar_ty.visit_with(self);
+                }
+
+                substs.as_generator().return_ty(def_id, self.tcx).visit_with(self);
+                substs.as_generator().yield_ty(def_id, self.tcx).visit_with(self);
+                substs.as_generator().resume_ty(def_id, self.tcx).visit_with(self);
+            }
+            _ => {
+                ty.super_visit_with(self);
+            }
+        }
+
+        false
+    }
+}
+
+struct ReverseMapper<'tcx> {
+    tcx: TyCtxt<'tcx>,
+
+    /// If errors have already been reported in this fn, we suppress
+    /// our own errors because they are sometimes derivative.
+    tainted_by_errors: bool,
+
+    opaque_type_def_id: DefId,
+    map: FxHashMap<GenericArg<'tcx>, GenericArg<'tcx>>,
+    map_missing_regions_to_empty: bool,
+
+    /// initially `Some`, set to `None` once error has been reported
+    hidden_ty: Option<Ty<'tcx>>,
+
+    /// Span of function being checked.
+    span: Span,
+}
+
+impl ReverseMapper<'tcx> {
+    fn new(
+        tcx: TyCtxt<'tcx>,
+        tainted_by_errors: bool,
+        opaque_type_def_id: DefId,
+        map: FxHashMap<GenericArg<'tcx>, GenericArg<'tcx>>,
+        hidden_ty: Ty<'tcx>,
+        span: Span,
+    ) -> Self {
+        Self {
+            tcx,
+            tainted_by_errors,
+            opaque_type_def_id,
+            map,
+            map_missing_regions_to_empty: false,
+            hidden_ty: Some(hidden_ty),
+            span,
+        }
+    }
+
+    fn fold_kind_mapping_missing_regions_to_empty(
+        &mut self,
+        kind: GenericArg<'tcx>,
+    ) -> GenericArg<'tcx> {
+        assert!(!self.map_missing_regions_to_empty);
+        self.map_missing_regions_to_empty = true;
+        let kind = kind.fold_with(self);
+        self.map_missing_regions_to_empty = false;
+        kind
+    }
+
+    fn fold_kind_normally(&mut self, kind: GenericArg<'tcx>) -> GenericArg<'tcx> {
+        assert!(!self.map_missing_regions_to_empty);
+        kind.fold_with(self)
+    }
+}
+
+impl TypeFolder<'tcx> for ReverseMapper<'tcx> {
+    fn tcx(&self) -> TyCtxt<'tcx> {
+        self.tcx
+    }
+
+    fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
+        match r {
+            // Ignore bound regions and `'static` regions that appear in the
+            // type, we only need to remap regions that reference lifetimes
+            // from the function declaraion.
+            // This would ignore `'r` in a type like `for<'r> fn(&'r u32)`.
+            ty::ReLateBound(..) | ty::ReStatic => return r,
+
+            // If regions have been erased (by writeback), don't try to unerase
+            // them.
+            ty::ReErased => return r,
+
+            // The regions that we expect from borrow checking.
+            ty::ReEarlyBound(_) | ty::ReFree(_) | ty::ReEmpty(ty::UniverseIndex::ROOT) => {}
+
+            ty::ReEmpty(_)
+            | ty::RePlaceholder(_)
+            | ty::ReVar(_)
+            | ty::ReScope(_)
+            | ty::ReClosureBound(_) => {
+                // All of the regions in the type should either have been
+                // erased by writeback, or mapped back to named regions by
+                // borrow checking.
+                bug!("unexpected region kind in opaque type: {:?}", r);
+            }
+        }
+
+        let generics = self.tcx().generics_of(self.opaque_type_def_id);
+        match self.map.get(&r.into()).map(|k| k.unpack()) {
+            Some(GenericArgKind::Lifetime(r1)) => r1,
+            Some(u) => panic!("region mapped to unexpected kind: {:?}", u),
+            None if self.map_missing_regions_to_empty || self.tainted_by_errors => {
+                self.tcx.lifetimes.re_root_empty
+            }
+            None if generics.parent.is_some() => {
+                if let Some(hidden_ty) = self.hidden_ty.take() {
+                    unexpected_hidden_region_diagnostic(
+                        self.tcx,
+                        None,
+                        self.tcx.def_span(self.opaque_type_def_id),
+                        hidden_ty,
+                        r,
+                    )
+                    .emit();
+                }
+                self.tcx.lifetimes.re_root_empty
+            }
+            None => {
+                self.tcx
+                    .sess
+                    .struct_span_err(self.span, "non-defining opaque type use in defining scope")
+                    .span_label(
+                        self.span,
+                        format!(
+                            "lifetime `{}` is part of concrete type but not used in \
+                                 parameter list of the `impl Trait` type alias",
+                            r
+                        ),
+                    )
+                    .emit();
+
+                self.tcx().lifetimes.re_static
+            }
+        }
+    }
+
+    fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
+        match ty.kind {
+            ty::Closure(def_id, substs) => {
+                // I am a horrible monster and I pray for death. When
+                // we encounter a closure here, it is always a closure
+                // from within the function that we are currently
+                // type-checking -- one that is now being encapsulated
+                // in an opaque type. Ideally, we would
+                // go through the types/lifetimes that it references
+                // and treat them just like we would any other type,
+                // which means we would error out if we find any
+                // reference to a type/region that is not in the
+                // "reverse map".
+                //
+                // **However,** in the case of closures, there is a
+                // somewhat subtle (read: hacky) consideration. The
+                // problem is that our closure types currently include
+                // all the lifetime parameters declared on the
+                // enclosing function, even if they are unused by the
+                // closure itself. We can't readily filter them out,
+                // so here we replace those values with `'empty`. This
+                // can't really make a difference to the rest of the
+                // compiler; those regions are ignored for the
+                // outlives relation, and hence don't affect trait
+                // selection or auto traits, and they are erased
+                // during codegen.
+
+                let generics = self.tcx.generics_of(def_id);
+                let substs = self.tcx.mk_substs(substs.iter().enumerate().map(|(index, &kind)| {
+                    if index < generics.parent_count {
+                        // Accommodate missing regions in the parent kinds...
+                        self.fold_kind_mapping_missing_regions_to_empty(kind)
+                    } else {
+                        // ...but not elsewhere.
+                        self.fold_kind_normally(kind)
+                    }
+                }));
+
+                self.tcx.mk_closure(def_id, substs)
+            }
+
+            ty::Generator(def_id, substs, movability) => {
+                let generics = self.tcx.generics_of(def_id);
+                let substs = self.tcx.mk_substs(substs.iter().enumerate().map(|(index, &kind)| {
+                    if index < generics.parent_count {
+                        // Accommodate missing regions in the parent kinds...
+                        self.fold_kind_mapping_missing_regions_to_empty(kind)
+                    } else {
+                        // ...but not elsewhere.
+                        self.fold_kind_normally(kind)
+                    }
+                }));
+
+                self.tcx.mk_generator(def_id, substs, movability)
+            }
+
+            ty::Param(..) => {
+                // Look it up in the substitution list.
+                match self.map.get(&ty.into()).map(|k| k.unpack()) {
+                    // Found it in the substitution list; replace with the parameter from the
+                    // opaque type.
+                    Some(GenericArgKind::Type(t1)) => t1,
+                    Some(u) => panic!("type mapped to unexpected kind: {:?}", u),
+                    None => {
+                        self.tcx
+                            .sess
+                            .struct_span_err(
+                                self.span,
+                                &format!(
+                                    "type parameter `{}` is part of concrete type but not \
+                                          used in parameter list for the `impl Trait` type alias",
+                                    ty
+                                ),
+                            )
+                            .emit();
+
+                        self.tcx().types.err
+                    }
+                }
+            }
+
+            _ => ty.super_fold_with(self),
+        }
+    }
+
+    fn fold_const(&mut self, ct: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
+        trace!("checking const {:?}", ct);
+        // Find a const parameter
+        match ct.val {
+            ty::ConstKind::Param(..) => {
+                // Look it up in the substitution list.
+                match self.map.get(&ct.into()).map(|k| k.unpack()) {
+                    // Found it in the substitution list, replace with the parameter from the
+                    // opaque type.
+                    Some(GenericArgKind::Const(c1)) => c1,
+                    Some(u) => panic!("const mapped to unexpected kind: {:?}", u),
+                    None => {
+                        self.tcx
+                            .sess
+                            .struct_span_err(
+                                self.span,
+                                &format!(
+                                    "const parameter `{}` is part of concrete type but not \
+                                          used in parameter list for the `impl Trait` type alias",
+                                    ct
+                                ),
+                            )
+                            .emit();
+
+                        self.tcx().consts.err
+                    }
+                }
+            }
+
+            _ => ct,
+        }
+    }
+}
+
+struct Instantiator<'a, 'tcx> {
+    infcx: &'a InferCtxt<'a, 'tcx>,
+    parent_def_id: DefId,
+    body_id: hir::HirId,
+    param_env: ty::ParamEnv<'tcx>,
+    value_span: Span,
+    opaque_types: OpaqueTypeMap<'tcx>,
+    obligations: Vec<PredicateObligation<'tcx>>,
+}
+
+impl<'a, 'tcx> Instantiator<'a, 'tcx> {
+    fn instantiate_opaque_types_in_map<T: TypeFoldable<'tcx>>(&mut self, value: &T) -> T {
+        debug!("instantiate_opaque_types_in_map(value={:?})", value);
+        let tcx = self.infcx.tcx;
+        value.fold_with(&mut BottomUpFolder {
+            tcx,
+            ty_op: |ty| {
+                if ty.references_error() {
+                    return tcx.types.err;
+                } else if let ty::Opaque(def_id, substs) = ty.kind {
+                    // Check that this is `impl Trait` type is
+                    // declared by `parent_def_id` -- i.e., one whose
+                    // value we are inferring.  At present, this is
+                    // always true during the first phase of
+                    // type-check, but not always true later on during
+                    // NLL. Once we support named opaque types more fully,
+                    // this same scenario will be able to arise during all phases.
+                    //
+                    // Here is an example using type alias `impl Trait`
+                    // that indicates the distinction we are checking for:
+                    //
+                    // ```rust
+                    // mod a {
+                    //   pub type Foo = impl Iterator;
+                    //   pub fn make_foo() -> Foo { .. }
+                    // }
+                    //
+                    // mod b {
+                    //   fn foo() -> a::Foo { a::make_foo() }
+                    // }
+                    // ```
+                    //
+                    // Here, the return type of `foo` references a
+                    // `Opaque` indeed, but not one whose value is
+                    // presently being inferred. You can get into a
+                    // similar situation with closure return types
+                    // today:
+                    //
+                    // ```rust
+                    // fn foo() -> impl Iterator { .. }
+                    // fn bar() {
+                    //     let x = || foo(); // returns the Opaque assoc with `foo`
+                    // }
+                    // ```
+                    if let Some(opaque_hir_id) = tcx.hir().as_local_hir_id(def_id) {
+                        let parent_def_id = self.parent_def_id;
+                        let def_scope_default = || {
+                            let opaque_parent_hir_id = tcx.hir().get_parent_item(opaque_hir_id);
+                            parent_def_id == tcx.hir().local_def_id(opaque_parent_hir_id)
+                        };
+                        let (in_definition_scope, origin) = match tcx.hir().find(opaque_hir_id) {
+                            Some(Node::Item(item)) => match item.kind {
+                                // Anonymous `impl Trait`
+                                hir::ItemKind::OpaqueTy(hir::OpaqueTy {
+                                    impl_trait_fn: Some(parent),
+                                    origin,
+                                    ..
+                                }) => (parent == self.parent_def_id, origin),
+                                // Named `type Foo = impl Bar;`
+                                hir::ItemKind::OpaqueTy(hir::OpaqueTy {
+                                    impl_trait_fn: None,
+                                    origin,
+                                    ..
+                                }) => (
+                                    may_define_opaque_type(tcx, self.parent_def_id, opaque_hir_id),
+                                    origin,
+                                ),
+                                _ => (def_scope_default(), hir::OpaqueTyOrigin::TypeAlias),
+                            },
+                            Some(Node::ImplItem(item)) => match item.kind {
+                                hir::ImplItemKind::OpaqueTy(_) => (
+                                    may_define_opaque_type(tcx, self.parent_def_id, opaque_hir_id),
+                                    hir::OpaqueTyOrigin::TypeAlias,
+                                ),
+                                _ => (def_scope_default(), hir::OpaqueTyOrigin::TypeAlias),
+                            },
+                            _ => bug!(
+                                "expected (impl) item, found {}",
+                                tcx.hir().node_to_string(opaque_hir_id),
+                            ),
+                        };
+                        if in_definition_scope {
+                            return self.fold_opaque_ty(ty, def_id, substs, origin);
+                        }
+
+                        debug!(
+                            "instantiate_opaque_types_in_map: \
+                             encountered opaque outside its definition scope \
+                             def_id={:?}",
+                            def_id,
+                        );
+                    }
+                }
+
+                ty
+            },
+            lt_op: |lt| lt,
+            ct_op: |ct| ct,
+        })
+    }
+
+    fn fold_opaque_ty(
+        &mut self,
+        ty: Ty<'tcx>,
+        def_id: DefId,
+        substs: SubstsRef<'tcx>,
+        origin: hir::OpaqueTyOrigin,
+    ) -> Ty<'tcx> {
+        let infcx = self.infcx;
+        let tcx = infcx.tcx;
+
+        debug!("instantiate_opaque_types: Opaque(def_id={:?}, substs={:?})", def_id, substs);
+
+        // Use the same type variable if the exact same opaque type appears more
+        // than once in the return type (e.g., if it's passed to a type alias).
+        if let Some(opaque_defn) = self.opaque_types.get(&def_id) {
+            debug!("instantiate_opaque_types: returning concrete ty {:?}", opaque_defn.concrete_ty);
+            return opaque_defn.concrete_ty;
+        }
+        let span = tcx.def_span(def_id);
+        debug!("fold_opaque_ty {:?} {:?}", self.value_span, span);
+        let ty_var = infcx
+            .next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::TypeInference, span });
+
+        let predicates_of = tcx.predicates_of(def_id);
+        debug!("instantiate_opaque_types: predicates={:#?}", predicates_of,);
+        let bounds = predicates_of.instantiate(tcx, substs);
+
+        let param_env = tcx.param_env(def_id);
+        let InferOk { value: bounds, obligations } =
+            infcx.partially_normalize_associated_types_in(span, self.body_id, param_env, &bounds);
+        self.obligations.extend(obligations);
+
+        debug!("instantiate_opaque_types: bounds={:?}", bounds);
+
+        let required_region_bounds = required_region_bounds(tcx, ty, bounds.predicates.clone());
+        debug!("instantiate_opaque_types: required_region_bounds={:?}", required_region_bounds);
+
+        // Make sure that we are in fact defining the *entire* type
+        // (e.g., `type Foo<T: Bound> = impl Bar;` needs to be
+        // defined by a function like `fn foo<T: Bound>() -> Foo<T>`).
+        debug!("instantiate_opaque_types: param_env={:#?}", self.param_env,);
+        debug!("instantiate_opaque_types: generics={:#?}", tcx.generics_of(def_id),);
+
+        // Ideally, we'd get the span where *this specific `ty` came
+        // from*, but right now we just use the span from the overall
+        // value being folded. In simple cases like `-> impl Foo`,
+        // these are the same span, but not in cases like `-> (impl
+        // Foo, impl Bar)`.
+        let definition_span = self.value_span;
+
+        self.opaque_types.insert(
+            def_id,
+            OpaqueTypeDecl {
+                opaque_type: ty,
+                substs,
+                definition_span,
+                concrete_ty: ty_var,
+                has_required_region_bounds: !required_region_bounds.is_empty(),
+                origin,
+            },
+        );
+        debug!("instantiate_opaque_types: ty_var={:?}", ty_var);
+
+        for predicate in &bounds.predicates {
+            if let ty::Predicate::Projection(projection) = &predicate {
+                if projection.skip_binder().ty.references_error() {
+                    // No point on adding these obligations since there's a type error involved.
+                    return ty_var;
+                }
+            }
+        }
+
+        self.obligations.reserve(bounds.predicates.len());
+        for predicate in bounds.predicates {
+            // Change the predicate to refer to the type variable,
+            // which will be the concrete type instead of the opaque type.
+            // This also instantiates nested instances of `impl Trait`.
+            let predicate = self.instantiate_opaque_types_in_map(&predicate);
+
+            let cause = traits::ObligationCause::new(span, self.body_id, traits::SizedReturnType);
+
+            // Require that the predicate holds for the concrete type.
+            debug!("instantiate_opaque_types: predicate={:?}", predicate);
+            self.obligations.push(traits::Obligation::new(cause, self.param_env, predicate));
+        }
+
+        ty_var
+    }
+}
+
+/// Returns `true` if `opaque_hir_id` is a sibling or a child of a sibling of `def_id`.
+///
+/// Example:
+/// ```rust
+/// pub mod foo {
+///     pub mod bar {
+///         pub trait Bar { .. }
+///
+///         pub type Baz = impl Bar;
+///
+///         fn f1() -> Baz { .. }
+///     }
+///
+///     fn f2() -> bar::Baz { .. }
+/// }
+/// ```
+///
+/// Here, `def_id` is the `DefId` of the defining use of the opaque type (e.g., `f1` or `f2`),
+/// and `opaque_hir_id` is the `HirId` of the definition of the opaque type `Baz`.
+/// For the above example, this function returns `true` for `f1` and `false` for `f2`.
+pub fn may_define_opaque_type(tcx: TyCtxt<'_>, def_id: DefId, opaque_hir_id: hir::HirId) -> bool {
+    let mut hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
+
+    // Named opaque types can be defined by any siblings or children of siblings.
+    let scope = tcx.hir().get_defining_scope(opaque_hir_id);
+    // We walk up the node tree until we hit the root or the scope of the opaque type.
+    while hir_id != scope && hir_id != hir::CRATE_HIR_ID {
+        hir_id = tcx.hir().get_parent_item(hir_id);
+    }
+    // Syntactically, we are allowed to define the concrete type if:
+    let res = hir_id == scope;
+    trace!(
+        "may_define_opaque_type(def={:?}, opaque_node={:?}) = {}",
+        tcx.hir().find(hir_id),
+        tcx.hir().get(opaque_hir_id),
+        res
+    );
+    res
+}
+
+/// Given a set of predicates that apply to an object type, returns
+/// the region bounds that the (erased) `Self` type must
+/// outlive. Precisely *because* the `Self` type is erased, the
+/// parameter `erased_self_ty` must be supplied to indicate what type
+/// has been used to represent `Self` in the predicates
+/// themselves. This should really be a unique type; `FreshTy(0)` is a
+/// popular choice.
+///
+/// N.B., in some cases, particularly around higher-ranked bounds,
+/// this function returns a kind of conservative approximation.
+/// That is, all regions returned by this function are definitely
+/// required, but there may be other region bounds that are not
+/// returned, as well as requirements like `for<'a> T: 'a`.
+///
+/// Requires that trait definitions have been processed so that we can
+/// elaborate predicates and walk supertraits.
+//
+// FIXME: callers may only have a `&[Predicate]`, not a `Vec`, so that's
+// what this code should accept.
+crate fn required_region_bounds(
+    tcx: TyCtxt<'tcx>,
+    erased_self_ty: Ty<'tcx>,
+    predicates: Vec<ty::Predicate<'tcx>>,
+) -> Vec<ty::Region<'tcx>> {
+    debug!(
+        "required_region_bounds(erased_self_ty={:?}, predicates={:?})",
+        erased_self_ty, predicates
+    );
+
+    assert!(!erased_self_ty.has_escaping_bound_vars());
+
+    traits::elaborate_predicates(tcx, predicates)
+        .filter_map(|predicate| {
+            match predicate {
+                ty::Predicate::Projection(..)
+                | ty::Predicate::Trait(..)
+                | ty::Predicate::Subtype(..)
+                | ty::Predicate::WellFormed(..)
+                | ty::Predicate::ObjectSafe(..)
+                | ty::Predicate::ClosureKind(..)
+                | ty::Predicate::RegionOutlives(..)
+                | ty::Predicate::ConstEvaluatable(..) => None,
+                ty::Predicate::TypeOutlives(predicate) => {
+                    // Search for a bound of the form `erased_self_ty
+                    // : 'a`, but be wary of something like `for<'a>
+                    // erased_self_ty : 'a` (we interpret a
+                    // higher-ranked bound like that as 'static,
+                    // though at present the code in `fulfill.rs`
+                    // considers such bounds to be unsatisfiable, so
+                    // it's kind of a moot point since you could never
+                    // construct such an object, but this seems
+                    // correct even if that code changes).
+                    let ty::OutlivesPredicate(ref t, ref r) = predicate.skip_binder();
+                    if t == &erased_self_ty && !r.has_escaping_bound_vars() {
+                        Some(*r)
+                    } else {
+                        None
+                    }
+                }
+            }
+        })
+        .collect()
+}
diff --git a/src/librustc/infer/outlives/env.rs b/src/librustc_infer/infer/outlives/env.rs
similarity index 99%
rename from src/librustc/infer/outlives/env.rs
rename to src/librustc_infer/infer/outlives/env.rs
index ee2e629c2f..aac6c7640c 100644
--- a/src/librustc/infer/outlives/env.rs
+++ b/src/librustc_infer/infer/outlives/env.rs
@@ -1,7 +1,7 @@
 use crate::infer::{GenericKind, InferCtxt};
 use crate::traits::query::outlives_bounds::{self, OutlivesBound};
-use crate::ty::free_region_map::FreeRegionMap;
-use crate::ty::{self, Ty};
+use rustc::ty::free_region_map::FreeRegionMap;
+use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir as hir;
 use rustc_span::Span;
diff --git a/src/librustc/infer/outlives/mod.rs b/src/librustc_infer/infer/outlives/mod.rs
similarity index 100%
rename from src/librustc/infer/outlives/mod.rs
rename to src/librustc_infer/infer/outlives/mod.rs
diff --git a/src/librustc/infer/outlives/obligations.rs b/src/librustc_infer/infer/outlives/obligations.rs
similarity index 98%
rename from src/librustc/infer/outlives/obligations.rs
rename to src/librustc_infer/infer/outlives/obligations.rs
index 45e4a84589..e3790b0273 100644
--- a/src/librustc/infer/outlives/obligations.rs
+++ b/src/librustc_infer/infer/outlives/obligations.rs
@@ -63,11 +63,13 @@ use crate::infer::outlives::env::RegionBoundPairs;
 use crate::infer::outlives::verify::VerifyBoundCx;
 use crate::infer::{self, GenericKind, InferCtxt, RegionObligation, SubregionOrigin, VerifyBound};
 use crate::traits::ObligationCause;
-use crate::ty::outlives::Component;
-use crate::ty::subst::GenericArgKind;
-use crate::ty::{self, Region, Ty, TyCtxt, TypeFoldable};
+use rustc::ty::outlives::Component;
+use rustc::ty::subst::GenericArgKind;
+use rustc::ty::{self, Region, Ty, TyCtxt, TypeFoldable};
+
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir as hir;
+use smallvec::smallvec;
 
 impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
     /// Registers that the given region obligation must be resolved
@@ -82,7 +84,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
     ) {
         debug!("register_region_obligation(body_id={:?}, obligation={:?})", body_id, obligation);
 
-        self.region_obligations.borrow_mut().push((body_id, obligation));
+        self.inner.borrow_mut().region_obligations.push((body_id, obligation));
     }
 
     pub fn register_region_obligation_with_cause(
@@ -103,7 +105,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
 
     /// Trait queries just want to pass back type obligations "as is"
     pub fn take_registered_region_obligations(&self) -> Vec<(hir::HirId, RegionObligation<'tcx>)> {
-        ::std::mem::take(&mut *self.region_obligations.borrow_mut())
+        ::std::mem::take(&mut self.inner.borrow_mut().region_obligations)
     }
 
     /// Process the region obligations that must be proven (during
diff --git a/src/librustc/infer/outlives/verify.rs b/src/librustc_infer/infer/outlives/verify.rs
similarity index 94%
rename from src/librustc/infer/outlives/verify.rs
rename to src/librustc_infer/infer/outlives/verify.rs
index 8ee8482e79..08f73d2c9d 100644
--- a/src/librustc/infer/outlives/verify.rs
+++ b/src/librustc_infer/infer/outlives/verify.rs
@@ -1,11 +1,13 @@
 use crate::infer::outlives::env::RegionBoundPairs;
 use crate::infer::{GenericKind, VerifyBound};
 use crate::traits;
-use crate::ty::subst::{InternalSubsts, Subst};
-use crate::ty::{self, Ty, TyCtxt};
+use rustc::ty::subst::{InternalSubsts, Subst};
+use rustc::ty::{self, Ty, TyCtxt};
 use rustc_data_structures::captures::Captures;
 use rustc_hir::def_id::DefId;
 
+use smallvec::smallvec;
+
 /// The `TypeOutlives` struct has the job of "lowering" a `T: 'a`
 /// obligation into a series of `'a: 'b` constraints and "verifys", as
 /// described on the module comment. The final constraints are emitted
@@ -60,7 +62,18 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
         // scope type parameters:
         let param_bounds = param_bounds.chain(self.implicit_region_bound);
 
-        VerifyBound::AnyBound(param_bounds.map(|r| VerifyBound::OutlivedBy(r)).collect())
+        let any_bounds: Vec<_> = param_bounds.map(|r| VerifyBound::OutlivedBy(r)).collect();
+
+        if any_bounds.is_empty() {
+            // We know that all types `T` outlive `'empty`, so if we
+            // can find no other bound, then check that the region
+            // being tested is `'empty`.
+            VerifyBound::IsEmpty
+        } else {
+            // If we can find any other bound `R` such that `T: R`, then
+            // we don't need to check for `'empty`, because `R: 'empty`.
+            VerifyBound::AnyBound(any_bounds)
+        }
     }
 
     /// Given a projection like `T::Item`, searches the environment
@@ -127,7 +140,6 @@ impl<'cx, 'tcx> VerifyBoundCx<'cx, 'tcx> {
         // Extend with bounds that we can find from the trait.
         let trait_bounds = self
             .projection_declared_bounds_from_trait(projection_ty)
-            .into_iter()
             .map(|r| VerifyBound::OutlivedBy(r));
 
         // see the extensive comment in projection_must_outlive
diff --git a/src/librustc/infer/region_constraints/README.md b/src/librustc_infer/infer/region_constraints/README.md
similarity index 100%
rename from src/librustc/infer/region_constraints/README.md
rename to src/librustc_infer/infer/region_constraints/README.md
diff --git a/src/librustc/infer/region_constraints/leak_check.rs b/src/librustc_infer/infer/region_constraints/leak_check.rs
similarity index 87%
rename from src/librustc/infer/region_constraints/leak_check.rs
rename to src/librustc_infer/infer/region_constraints/leak_check.rs
index 3b3a464ba5..6ebe3f5759 100644
--- a/src/librustc/infer/region_constraints/leak_check.rs
+++ b/src/librustc_infer/infer/region_constraints/leak_check.rs
@@ -1,7 +1,7 @@
 use super::*;
 use crate::infer::{CombinedSnapshot, PlaceholderMap};
-use crate::ty::error::TypeError;
-use crate::ty::relate::RelateResult;
+use rustc::ty::error::TypeError;
+use rustc::ty::relate::RelateResult;
 
 impl<'tcx> RegionConstraintCollector<'tcx> {
     /// Searches region constraints created since `snapshot` that
@@ -33,20 +33,8 @@ impl<'tcx> RegionConstraintCollector<'tcx> {
 
         assert!(self.in_snapshot());
 
-        // If the user gave `-Zno-leak-check`, then skip the leak
-        // check completely. This is wildly unsound and also not
-        // unlikely to cause an ICE or two. It is intended for use
-        // only during a transition period, in which the MIR typeck
-        // uses the "universe-style" check, and the rest of typeck
-        // uses the more conservative leak check.  Since the leak
-        // check is more conservative, we can't test the
-        // universe-style check without disabling it.
-        if tcx.sess.opts.debugging_opts.no_leak_check {
-            return Ok(());
-        }
-
         // Go through each placeholder that we created.
-        for (_, &placeholder_region) in placeholder_map {
+        for &placeholder_region in placeholder_map.values() {
             // Find the universe this placeholder inhabits.
             let placeholder = match placeholder_region {
                 ty::RePlaceholder(p) => p,
@@ -97,7 +85,7 @@ impl<'tcx> TaintSet<'tcx> {
     fn new(directions: TaintDirections, initial_region: ty::Region<'tcx>) -> Self {
         let mut regions = FxHashSet::default();
         regions.insert(initial_region);
-        TaintSet { directions: directions, regions: regions }
+        TaintSet { directions, regions }
     }
 
     fn fixed_point(
diff --git a/src/librustc_infer/infer/region_constraints/mod.rs b/src/librustc_infer/infer/region_constraints/mod.rs
new file mode 100644
index 0000000000..868b950437
--- /dev/null
+++ b/src/librustc_infer/infer/region_constraints/mod.rs
@@ -0,0 +1,918 @@
+//! See `README.md`.
+
+use self::CombineMapType::*;
+use self::UndoLog::*;
+
+use super::unify_key;
+use super::{MiscVariable, RegionVariableOrigin, SubregionOrigin};
+
+use rustc::ty::ReStatic;
+use rustc::ty::{self, Ty, TyCtxt};
+use rustc::ty::{ReLateBound, ReVar};
+use rustc::ty::{Region, RegionVid};
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::sync::Lrc;
+use rustc_data_structures::unify as ut;
+use rustc_hir::def_id::DefId;
+use rustc_index::vec::IndexVec;
+use rustc_span::Span;
+
+use std::collections::BTreeMap;
+use std::ops::Range;
+use std::{cmp, fmt, mem};
+
+mod leak_check;
+
+pub use rustc::infer::MemberConstraint;
+
+#[derive(Default)]
+pub struct RegionConstraintCollector<'tcx> {
+    /// For each `RegionVid`, the corresponding `RegionVariableOrigin`.
+    var_infos: IndexVec<RegionVid, RegionVariableInfo>,
+
+    data: RegionConstraintData<'tcx>,
+
+    /// For a given pair of regions (R1, R2), maps to a region R3 that
+    /// is designated as their LUB (edges R1 <= R3 and R2 <= R3
+    /// exist). This prevents us from making many such regions.
+    lubs: CombineMap<'tcx>,
+
+    /// For a given pair of regions (R1, R2), maps to a region R3 that
+    /// is designated as their GLB (edges R3 <= R1 and R3 <= R2
+    /// exist). This prevents us from making many such regions.
+    glbs: CombineMap<'tcx>,
+
+    /// The undo log records actions that might later be undone.
+    ///
+    /// Note: `num_open_snapshots` is used to track if we are actively
+    /// snapshotting. When the `start_snapshot()` method is called, we
+    /// increment `num_open_snapshots` to indicate that we are now actively
+    /// snapshotting. The reason for this is that otherwise we end up adding
+    /// entries for things like the lower bound on a variable and so forth,
+    /// which can never be rolled back.
+    undo_log: Vec<UndoLog<'tcx>>,
+
+    /// The number of open snapshots, i.e., those that haven't been committed or
+    /// rolled back.
+    num_open_snapshots: usize,
+
+    /// When we add a R1 == R2 constriant, we currently add (a) edges
+    /// R1 <= R2 and R2 <= R1 and (b) we unify the two regions in this
+    /// table. You can then call `opportunistic_resolve_var` early
+    /// which will map R1 and R2 to some common region (i.e., either
+    /// R1 or R2). This is important when dropck and other such code
+    /// is iterating to a fixed point, because otherwise we sometimes
+    /// would wind up with a fresh stream of region variables that
+    /// have been equated but appear distinct.
+    unification_table: ut::UnificationTable<ut::InPlace<ty::RegionVid>>,
+
+    /// a flag set to true when we perform any unifications; this is used
+    /// to micro-optimize `take_and_reset_data`
+    any_unifications: bool,
+}
+
+pub type VarInfos = IndexVec<RegionVid, RegionVariableInfo>;
+
+/// The full set of region constraints gathered up by the collector.
+/// Describes constraints between the region variables and other
+/// regions, as well as other conditions that must be verified, or
+/// assumptions that can be made.
+#[derive(Debug, Default, Clone)]
+pub struct RegionConstraintData<'tcx> {
+    /// Constraints of the form `A <= B`, where either `A` or `B` can
+    /// be a region variable (or neither, as it happens).
+    pub constraints: BTreeMap<Constraint<'tcx>, SubregionOrigin<'tcx>>,
+
+    /// Constraints of the form `R0 member of [R1, ..., Rn]`, meaning that
+    /// `R0` must be equal to one of the regions `R1..Rn`. These occur
+    /// with `impl Trait` quite frequently.
+    pub member_constraints: Vec<MemberConstraint<'tcx>>,
+
+    /// A "verify" is something that we need to verify after inference
+    /// is done, but which does not directly affect inference in any
+    /// way.
+    ///
+    /// An example is a `A <= B` where neither `A` nor `B` are
+    /// inference variables.
+    pub verifys: Vec<Verify<'tcx>>,
+
+    /// A "given" is a relationship that is known to hold. In
+    /// particular, we often know from closure fn signatures that a
+    /// particular free region must be a subregion of a region
+    /// variable:
+    ///
+    ///    foo.iter().filter(<'a> |x: &'a &'b T| ...)
+    ///
+    /// In situations like this, `'b` is in fact a region variable
+    /// introduced by the call to `iter()`, and `'a` is a bound region
+    /// on the closure (as indicated by the `<'a>` prefix). If we are
+    /// naive, we wind up inferring that `'b` must be `'static`,
+    /// because we require that it be greater than `'a` and we do not
+    /// know what `'a` is precisely.
+    ///
+    /// This hashmap is used to avoid that naive scenario. Basically
+    /// we record the fact that `'a <= 'b` is implied by the fn
+    /// signature, and then ignore the constraint when solving
+    /// equations. This is a bit of a hack but seems to work.
+    pub givens: FxHashSet<(Region<'tcx>, ty::RegionVid)>,
+}
+
+/// Represents a constraint that influences the inference process.
+#[derive(Clone, Copy, PartialEq, Eq, Debug, PartialOrd, Ord)]
+pub enum Constraint<'tcx> {
+    /// A region variable is a subregion of another.
+    VarSubVar(RegionVid, RegionVid),
+
+    /// A concrete region is a subregion of region variable.
+    RegSubVar(Region<'tcx>, RegionVid),
+
+    /// A region variable is a subregion of a concrete region. This does not
+    /// directly affect inference, but instead is checked after
+    /// inference is complete.
+    VarSubReg(RegionVid, Region<'tcx>),
+
+    /// A constraint where neither side is a variable. This does not
+    /// directly affect inference, but instead is checked after
+    /// inference is complete.
+    RegSubReg(Region<'tcx>, Region<'tcx>),
+}
+
+impl Constraint<'_> {
+    pub fn involves_placeholders(&self) -> bool {
+        match self {
+            Constraint::VarSubVar(_, _) => false,
+            Constraint::VarSubReg(_, r) | Constraint::RegSubVar(r, _) => r.is_placeholder(),
+            Constraint::RegSubReg(r, s) => r.is_placeholder() || s.is_placeholder(),
+        }
+    }
+}
+
+/// `VerifyGenericBound(T, _, R, RS)`: the parameter type `T` (or
+/// associated type) must outlive the region `R`. `T` is known to
+/// outlive `RS`. Therefore, verify that `R <= RS[i]` for some
+/// `i`. Inference variables may be involved (but this verification
+/// step doesn't influence inference).
+#[derive(Debug, Clone)]
+pub struct Verify<'tcx> {
+    pub kind: GenericKind<'tcx>,
+    pub origin: SubregionOrigin<'tcx>,
+    pub region: Region<'tcx>,
+    pub bound: VerifyBound<'tcx>,
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Hash, TypeFoldable)]
+pub enum GenericKind<'tcx> {
+    Param(ty::ParamTy),
+    Projection(ty::ProjectionTy<'tcx>),
+}
+
+/// Describes the things that some `GenericKind` value `G` is known to
+/// outlive. Each variant of `VerifyBound` can be thought of as a
+/// function:
+///
+///     fn(min: Region) -> bool { .. }
+///
+/// where `true` means that the region `min` meets that `G: min`.
+/// (False means nothing.)
+///
+/// So, for example, if we have the type `T` and we have in scope that
+/// `T: 'a` and `T: 'b`, then the verify bound might be:
+///
+///     fn(min: Region) -> bool {
+///        ('a: min) || ('b: min)
+///     }
+///
+/// This is described with a `AnyRegion('a, 'b)` node.
+#[derive(Debug, Clone)]
+pub enum VerifyBound<'tcx> {
+    /// Given a kind K and a bound B, expands to a function like the
+    /// following, where `G` is the generic for which this verify
+    /// bound was created:
+    ///
+    /// ```rust
+    /// fn(min) -> bool {
+    ///     if G == K {
+    ///         B(min)
+    ///     } else {
+    ///         false
+    ///     }
+    /// }
+    /// ```
+    ///
+    /// In other words, if the generic `G` that we are checking is
+    /// equal to `K`, then check the associated verify bound
+    /// (otherwise, false).
+    ///
+    /// This is used when we have something in the environment that
+    /// may or may not be relevant, depending on the region inference
+    /// results. For example, we may have `where <T as
+    /// Trait<'a>>::Item: 'b` in our where-clauses. If we are
+    /// generating the verify-bound for `<T as Trait<'0>>::Item`, then
+    /// this where-clause is only relevant if `'0` winds up inferred
+    /// to `'a`.
+    ///
+    /// So we would compile to a verify-bound like
+    ///
+    /// ```
+    /// IfEq(<T as Trait<'a>>::Item, AnyRegion('a))
+    /// ```
+    ///
+    /// meaning, if the subject G is equal to `<T as Trait<'a>>::Item`
+    /// (after inference), and `'a: min`, then `G: min`.
+    IfEq(Ty<'tcx>, Box<VerifyBound<'tcx>>),
+
+    /// Given a region `R`, expands to the function:
+    ///
+    /// ```
+    /// fn(min) -> bool {
+    ///     R: min
+    /// }
+    /// ```
+    ///
+    /// This is used when we can establish that `G: R` -- therefore,
+    /// if `R: min`, then by transitivity `G: min`.
+    OutlivedBy(Region<'tcx>),
+
+    /// Given a region `R`, true if it is `'empty`.
+    IsEmpty,
+
+    /// Given a set of bounds `B`, expands to the function:
+    ///
+    /// ```rust
+    /// fn(min) -> bool {
+    ///     exists (b in B) { b(min) }
+    /// }
+    /// ```
+    ///
+    /// In other words, if we meet some bound in `B`, that suffices.
+    /// This is used when all the bounds in `B` are known to apply to `G`.
+    AnyBound(Vec<VerifyBound<'tcx>>),
+
+    /// Given a set of bounds `B`, expands to the function:
+    ///
+    /// ```rust
+    /// fn(min) -> bool {
+    ///     forall (b in B) { b(min) }
+    /// }
+    /// ```
+    ///
+    /// In other words, if we meet *all* bounds in `B`, that suffices.
+    /// This is used when *some* bound in `B` is known to suffice, but
+    /// we don't know which.
+    AllBounds(Vec<VerifyBound<'tcx>>),
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Hash)]
+struct TwoRegions<'tcx> {
+    a: Region<'tcx>,
+    b: Region<'tcx>,
+}
+
+#[derive(Copy, Clone, PartialEq)]
+enum UndoLog<'tcx> {
+    /// We added `RegionVid`.
+    AddVar(RegionVid),
+
+    /// We added the given `constraint`.
+    AddConstraint(Constraint<'tcx>),
+
+    /// We added the given `verify`.
+    AddVerify(usize),
+
+    /// We added the given `given`.
+    AddGiven(Region<'tcx>, ty::RegionVid),
+
+    /// We added a GLB/LUB "combination variable".
+    AddCombination(CombineMapType, TwoRegions<'tcx>),
+
+    /// During skolemization, we sometimes purge entries from the undo
+    /// log in a kind of minisnapshot (unlike other snapshots, this
+    /// purging actually takes place *on success*). In that case, we
+    /// replace the corresponding entry with `Noop` so as to avoid the
+    /// need to do a bunch of swapping. (We can't use `swap_remove` as
+    /// the order of the vector is important.)
+    Purged,
+}
+
+#[derive(Copy, Clone, PartialEq)]
+enum CombineMapType {
+    Lub,
+    Glb,
+}
+
+type CombineMap<'tcx> = FxHashMap<TwoRegions<'tcx>, RegionVid>;
+
+#[derive(Debug, Clone, Copy)]
+pub struct RegionVariableInfo {
+    pub origin: RegionVariableOrigin,
+    pub universe: ty::UniverseIndex,
+}
+
+pub struct RegionSnapshot {
+    length: usize,
+    region_snapshot: ut::Snapshot<ut::InPlace<ty::RegionVid>>,
+    any_unifications: bool,
+}
+
+/// When working with placeholder regions, we often wish to find all of
+/// the regions that are either reachable from a placeholder region, or
+/// which can reach a placeholder region, or both. We call such regions
+/// *tainted* regions. This struct allows you to decide what set of
+/// tainted regions you want.
+#[derive(Debug)]
+pub struct TaintDirections {
+    incoming: bool,
+    outgoing: bool,
+}
+
+impl TaintDirections {
+    pub fn incoming() -> Self {
+        TaintDirections { incoming: true, outgoing: false }
+    }
+
+    pub fn outgoing() -> Self {
+        TaintDirections { incoming: false, outgoing: true }
+    }
+
+    pub fn both() -> Self {
+        TaintDirections { incoming: true, outgoing: true }
+    }
+}
+
+impl<'tcx> RegionConstraintCollector<'tcx> {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn num_region_vars(&self) -> usize {
+        self.var_infos.len()
+    }
+
+    pub fn region_constraint_data(&self) -> &RegionConstraintData<'tcx> {
+        &self.data
+    }
+
+    /// Once all the constraints have been gathered, extract out the final data.
+    ///
+    /// Not legal during a snapshot.
+    pub fn into_infos_and_data(self) -> (VarInfos, RegionConstraintData<'tcx>) {
+        assert!(!self.in_snapshot());
+        (self.var_infos, self.data)
+    }
+
+    /// Takes (and clears) the current set of constraints. Note that
+    /// the set of variables remains intact, but all relationships
+    /// between them are reset. This is used during NLL checking to
+    /// grab the set of constraints that arose from a particular
+    /// operation.
+    ///
+    /// We don't want to leak relationships between variables between
+    /// points because just because (say) `r1 == r2` was true at some
+    /// point P in the graph doesn't imply that it will be true at
+    /// some other point Q, in NLL.
+    ///
+    /// Not legal during a snapshot.
+    pub fn take_and_reset_data(&mut self) -> RegionConstraintData<'tcx> {
+        assert!(!self.in_snapshot());
+
+        // If you add a new field to `RegionConstraintCollector`, you
+        // should think carefully about whether it needs to be cleared
+        // or updated in some way.
+        let RegionConstraintCollector {
+            var_infos: _,
+            data,
+            lubs,
+            glbs,
+            undo_log: _,
+            num_open_snapshots: _,
+            unification_table,
+            any_unifications,
+        } = self;
+
+        // Clear the tables of (lubs, glbs), so that we will create
+        // fresh regions if we do a LUB operation. As it happens,
+        // LUB/GLB are not performed by the MIR type-checker, which is
+        // the one that uses this method, but it's good to be correct.
+        lubs.clear();
+        glbs.clear();
+
+        // Clear all unifications and recreate the variables a "now
+        // un-unified" state. Note that when we unify `a` and `b`, we
+        // also insert `a <= b` and a `b <= a` edges, so the
+        // `RegionConstraintData` contains the relationship here.
+        if *any_unifications {
+            unification_table.reset_unifications(|vid| unify_key::RegionVidKey { min_vid: vid });
+            *any_unifications = false;
+        }
+
+        mem::take(data)
+    }
+
+    pub fn data(&self) -> &RegionConstraintData<'tcx> {
+        &self.data
+    }
+
+    fn in_snapshot(&self) -> bool {
+        self.num_open_snapshots > 0
+    }
+
+    pub fn start_snapshot(&mut self) -> RegionSnapshot {
+        let length = self.undo_log.len();
+        debug!("RegionConstraintCollector: start_snapshot({})", length);
+        self.num_open_snapshots += 1;
+        RegionSnapshot {
+            length,
+            region_snapshot: self.unification_table.snapshot(),
+            any_unifications: self.any_unifications,
+        }
+    }
+
+    fn assert_open_snapshot(&self, snapshot: &RegionSnapshot) {
+        assert!(self.undo_log.len() >= snapshot.length);
+        assert!(self.num_open_snapshots > 0);
+    }
+
+    pub fn commit(&mut self, snapshot: RegionSnapshot) {
+        debug!("RegionConstraintCollector: commit({})", snapshot.length);
+        self.assert_open_snapshot(&snapshot);
+
+        if self.num_open_snapshots == 1 {
+            // The root snapshot. It's safe to clear the undo log because
+            // there's no snapshot further out that we might need to roll back
+            // to.
+            assert!(snapshot.length == 0);
+            self.undo_log.clear();
+        }
+
+        self.num_open_snapshots -= 1;
+
+        self.unification_table.commit(snapshot.region_snapshot);
+    }
+
+    pub fn rollback_to(&mut self, snapshot: RegionSnapshot) {
+        debug!("RegionConstraintCollector: rollback_to({:?})", snapshot);
+        self.assert_open_snapshot(&snapshot);
+
+        while self.undo_log.len() > snapshot.length {
+            let undo_entry = self.undo_log.pop().unwrap();
+            self.rollback_undo_entry(undo_entry);
+        }
+
+        self.num_open_snapshots -= 1;
+
+        self.unification_table.rollback_to(snapshot.region_snapshot);
+        self.any_unifications = snapshot.any_unifications;
+    }
+
+    fn rollback_undo_entry(&mut self, undo_entry: UndoLog<'tcx>) {
+        match undo_entry {
+            Purged => {
+                // nothing to do here
+            }
+            AddVar(vid) => {
+                self.var_infos.pop().unwrap();
+                assert_eq!(self.var_infos.len(), vid.index() as usize);
+            }
+            AddConstraint(ref constraint) => {
+                self.data.constraints.remove(constraint);
+            }
+            AddVerify(index) => {
+                self.data.verifys.pop();
+                assert_eq!(self.data.verifys.len(), index);
+            }
+            AddGiven(sub, sup) => {
+                self.data.givens.remove(&(sub, sup));
+            }
+            AddCombination(Glb, ref regions) => {
+                self.glbs.remove(regions);
+            }
+            AddCombination(Lub, ref regions) => {
+                self.lubs.remove(regions);
+            }
+        }
+    }
+
+    pub fn new_region_var(
+        &mut self,
+        universe: ty::UniverseIndex,
+        origin: RegionVariableOrigin,
+    ) -> RegionVid {
+        let vid = self.var_infos.push(RegionVariableInfo { origin, universe });
+
+        let u_vid = self.unification_table.new_key(unify_key::RegionVidKey { min_vid: vid });
+        assert_eq!(vid, u_vid);
+        if self.in_snapshot() {
+            self.undo_log.push(AddVar(vid));
+        }
+        debug!("created new region variable {:?} in {:?} with origin {:?}", vid, universe, origin);
+        return vid;
+    }
+
+    /// Returns the universe for the given variable.
+    pub fn var_universe(&self, vid: RegionVid) -> ty::UniverseIndex {
+        self.var_infos[vid].universe
+    }
+
+    /// Returns the origin for the given variable.
+    pub fn var_origin(&self, vid: RegionVid) -> RegionVariableOrigin {
+        self.var_infos[vid].origin
+    }
+
+    /// Removes all the edges to/from the placeholder regions that are
+    /// in `skols`. This is used after a higher-ranked operation
+    /// completes to remove all trace of the placeholder regions
+    /// created in that time.
+    pub fn pop_placeholders(&mut self, placeholders: &FxHashSet<ty::Region<'tcx>>) {
+        debug!("pop_placeholders(placeholders={:?})", placeholders);
+
+        assert!(self.in_snapshot());
+
+        let constraints_to_kill: Vec<usize> = self
+            .undo_log
+            .iter()
+            .enumerate()
+            .rev()
+            .filter(|&(_, undo_entry)| kill_constraint(placeholders, undo_entry))
+            .map(|(index, _)| index)
+            .collect();
+
+        for index in constraints_to_kill {
+            let undo_entry = mem::replace(&mut self.undo_log[index], Purged);
+            self.rollback_undo_entry(undo_entry);
+        }
+
+        return;
+
+        fn kill_constraint<'tcx>(
+            placeholders: &FxHashSet<ty::Region<'tcx>>,
+            undo_entry: &UndoLog<'tcx>,
+        ) -> bool {
+            match undo_entry {
+                &AddConstraint(Constraint::VarSubVar(..)) => false,
+                &AddConstraint(Constraint::RegSubVar(a, _)) => placeholders.contains(&a),
+                &AddConstraint(Constraint::VarSubReg(_, b)) => placeholders.contains(&b),
+                &AddConstraint(Constraint::RegSubReg(a, b)) => {
+                    placeholders.contains(&a) || placeholders.contains(&b)
+                }
+                &AddGiven(..) => false,
+                &AddVerify(_) => false,
+                &AddCombination(_, ref two_regions) => {
+                    placeholders.contains(&two_regions.a) || placeholders.contains(&two_regions.b)
+                }
+                &AddVar(..) | &Purged => false,
+            }
+        }
+    }
+
+    fn add_constraint(&mut self, constraint: Constraint<'tcx>, origin: SubregionOrigin<'tcx>) {
+        // cannot add constraints once regions are resolved
+        debug!("RegionConstraintCollector: add_constraint({:?})", constraint);
+
+        // never overwrite an existing (constraint, origin) - only insert one if it isn't
+        // present in the map yet. This prevents origins from outside the snapshot being
+        // replaced with "less informative" origins e.g., during calls to `can_eq`
+        let in_snapshot = self.in_snapshot();
+        let undo_log = &mut self.undo_log;
+        self.data.constraints.entry(constraint).or_insert_with(|| {
+            if in_snapshot {
+                undo_log.push(AddConstraint(constraint));
+            }
+            origin
+        });
+    }
+
+    fn add_verify(&mut self, verify: Verify<'tcx>) {
+        // cannot add verifys once regions are resolved
+        debug!("RegionConstraintCollector: add_verify({:?})", verify);
+
+        // skip no-op cases known to be satisfied
+        if let VerifyBound::AllBounds(ref bs) = verify.bound {
+            if bs.is_empty() {
+                return;
+            }
+        }
+
+        let index = self.data.verifys.len();
+        self.data.verifys.push(verify);
+        if self.in_snapshot() {
+            self.undo_log.push(AddVerify(index));
+        }
+    }
+
+    pub fn add_given(&mut self, sub: Region<'tcx>, sup: ty::RegionVid) {
+        // cannot add givens once regions are resolved
+        if self.data.givens.insert((sub, sup)) {
+            debug!("add_given({:?} <= {:?})", sub, sup);
+
+            if self.in_snapshot() {
+                self.undo_log.push(AddGiven(sub, sup));
+            }
+        }
+    }
+
+    pub fn make_eqregion(
+        &mut self,
+        origin: SubregionOrigin<'tcx>,
+        sub: Region<'tcx>,
+        sup: Region<'tcx>,
+    ) {
+        if sub != sup {
+            // Eventually, it would be nice to add direct support for
+            // equating regions.
+            self.make_subregion(origin.clone(), sub, sup);
+            self.make_subregion(origin, sup, sub);
+
+            if let (ty::ReVar(sub), ty::ReVar(sup)) = (*sub, *sup) {
+                debug!("make_eqregion: uniying {:?} with {:?}", sub, sup);
+                self.unification_table.union(sub, sup);
+                self.any_unifications = true;
+            }
+        }
+    }
+
+    pub fn member_constraint(
+        &mut self,
+        opaque_type_def_id: DefId,
+        definition_span: Span,
+        hidden_ty: Ty<'tcx>,
+        member_region: ty::Region<'tcx>,
+        choice_regions: &Lrc<Vec<ty::Region<'tcx>>>,
+    ) {
+        debug!("member_constraint({:?} in {:#?})", member_region, choice_regions);
+
+        if choice_regions.iter().any(|&r| r == member_region) {
+            return;
+        }
+
+        self.data.member_constraints.push(MemberConstraint {
+            opaque_type_def_id,
+            definition_span,
+            hidden_ty,
+            member_region,
+            choice_regions: choice_regions.clone(),
+        });
+    }
+
+    pub fn make_subregion(
+        &mut self,
+        origin: SubregionOrigin<'tcx>,
+        sub: Region<'tcx>,
+        sup: Region<'tcx>,
+    ) {
+        // cannot add constraints once regions are resolved
+        debug!(
+            "RegionConstraintCollector: make_subregion({:?}, {:?}) due to {:?}",
+            sub, sup, origin
+        );
+
+        match (sub, sup) {
+            (&ReLateBound(..), _) | (_, &ReLateBound(..)) => {
+                span_bug!(origin.span(), "cannot relate bound region: {:?} <= {:?}", sub, sup);
+            }
+            (_, &ReStatic) => {
+                // all regions are subregions of static, so we can ignore this
+            }
+            (&ReVar(sub_id), &ReVar(sup_id)) => {
+                self.add_constraint(Constraint::VarSubVar(sub_id, sup_id), origin);
+            }
+            (_, &ReVar(sup_id)) => {
+                self.add_constraint(Constraint::RegSubVar(sub, sup_id), origin);
+            }
+            (&ReVar(sub_id), _) => {
+                self.add_constraint(Constraint::VarSubReg(sub_id, sup), origin);
+            }
+            _ => {
+                self.add_constraint(Constraint::RegSubReg(sub, sup), origin);
+            }
+        }
+    }
+
+    /// See [`Verify::VerifyGenericBound`].
+    pub fn verify_generic_bound(
+        &mut self,
+        origin: SubregionOrigin<'tcx>,
+        kind: GenericKind<'tcx>,
+        sub: Region<'tcx>,
+        bound: VerifyBound<'tcx>,
+    ) {
+        self.add_verify(Verify { kind, origin, region: sub, bound });
+    }
+
+    pub fn lub_regions(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        origin: SubregionOrigin<'tcx>,
+        a: Region<'tcx>,
+        b: Region<'tcx>,
+    ) -> Region<'tcx> {
+        // cannot add constraints once regions are resolved
+        debug!("RegionConstraintCollector: lub_regions({:?}, {:?})", a, b);
+        match (a, b) {
+            (r @ &ReStatic, _) | (_, r @ &ReStatic) => {
+                r // nothing lives longer than static
+            }
+
+            _ if a == b => {
+                a // LUB(a,a) = a
+            }
+
+            _ => self.combine_vars(tcx, Lub, a, b, origin),
+        }
+    }
+
+    pub fn glb_regions(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        origin: SubregionOrigin<'tcx>,
+        a: Region<'tcx>,
+        b: Region<'tcx>,
+    ) -> Region<'tcx> {
+        // cannot add constraints once regions are resolved
+        debug!("RegionConstraintCollector: glb_regions({:?}, {:?})", a, b);
+        match (a, b) {
+            (&ReStatic, r) | (r, &ReStatic) => {
+                r // static lives longer than everything else
+            }
+
+            _ if a == b => {
+                a // GLB(a,a) = a
+            }
+
+            _ => self.combine_vars(tcx, Glb, a, b, origin),
+        }
+    }
+
+    pub fn opportunistic_resolve_var(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        rid: RegionVid,
+    ) -> ty::Region<'tcx> {
+        let vid = self.unification_table.probe_value(rid).min_vid;
+        tcx.mk_region(ty::ReVar(vid))
+    }
+
+    fn combine_map(&mut self, t: CombineMapType) -> &mut CombineMap<'tcx> {
+        match t {
+            Glb => &mut self.glbs,
+            Lub => &mut self.lubs,
+        }
+    }
+
+    fn combine_vars(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        t: CombineMapType,
+        a: Region<'tcx>,
+        b: Region<'tcx>,
+        origin: SubregionOrigin<'tcx>,
+    ) -> Region<'tcx> {
+        let vars = TwoRegions { a, b };
+        if let Some(&c) = self.combine_map(t).get(&vars) {
+            return tcx.mk_region(ReVar(c));
+        }
+        let a_universe = self.universe(a);
+        let b_universe = self.universe(b);
+        let c_universe = cmp::max(a_universe, b_universe);
+        let c = self.new_region_var(c_universe, MiscVariable(origin.span()));
+        self.combine_map(t).insert(vars, c);
+        if self.in_snapshot() {
+            self.undo_log.push(AddCombination(t, vars));
+        }
+        let new_r = tcx.mk_region(ReVar(c));
+        for &old_r in &[a, b] {
+            match t {
+                Glb => self.make_subregion(origin.clone(), new_r, old_r),
+                Lub => self.make_subregion(origin.clone(), old_r, new_r),
+            }
+        }
+        debug!("combine_vars() c={:?}", c);
+        new_r
+    }
+
+    pub fn universe(&self, region: Region<'tcx>) -> ty::UniverseIndex {
+        match *region {
+            ty::ReScope(..)
+            | ty::ReStatic
+            | ty::ReErased
+            | ty::ReFree(..)
+            | ty::ReEarlyBound(..) => ty::UniverseIndex::ROOT,
+            ty::ReEmpty(ui) => ui,
+            ty::RePlaceholder(placeholder) => placeholder.universe,
+            ty::ReClosureBound(vid) | ty::ReVar(vid) => self.var_universe(vid),
+            ty::ReLateBound(..) => bug!("universe(): encountered bound region {:?}", region),
+        }
+    }
+
+    pub fn vars_since_snapshot(
+        &self,
+        mark: &RegionSnapshot,
+    ) -> (Range<RegionVid>, Vec<RegionVariableOrigin>) {
+        let range = self.unification_table.vars_since_snapshot(&mark.region_snapshot);
+        (
+            range.clone(),
+            (range.start.index()..range.end.index())
+                .map(|index| self.var_infos[ty::RegionVid::from(index)].origin)
+                .collect(),
+        )
+    }
+
+    /// See [`RegionInference::region_constraints_added_in_snapshot`].
+    pub fn region_constraints_added_in_snapshot(&self, mark: &RegionSnapshot) -> Option<bool> {
+        self.undo_log[mark.length..]
+            .iter()
+            .map(|&elt| match elt {
+                AddConstraint(constraint) => Some(constraint.involves_placeholders()),
+                _ => None,
+            })
+            .max()
+            .unwrap_or(None)
+    }
+}
+
+impl fmt::Debug for RegionSnapshot {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "RegionSnapshot(length={})", self.length)
+    }
+}
+
+impl<'tcx> fmt::Debug for GenericKind<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            GenericKind::Param(ref p) => write!(f, "{:?}", p),
+            GenericKind::Projection(ref p) => write!(f, "{:?}", p),
+        }
+    }
+}
+
+impl<'tcx> fmt::Display for GenericKind<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            GenericKind::Param(ref p) => write!(f, "{}", p),
+            GenericKind::Projection(ref p) => write!(f, "{}", p),
+        }
+    }
+}
+
+impl<'tcx> GenericKind<'tcx> {
+    pub fn to_ty(&self, tcx: TyCtxt<'tcx>) -> Ty<'tcx> {
+        match *self {
+            GenericKind::Param(ref p) => p.to_ty(tcx),
+            GenericKind::Projection(ref p) => tcx.mk_projection(p.item_def_id, p.substs),
+        }
+    }
+}
+
+impl<'tcx> VerifyBound<'tcx> {
+    pub fn must_hold(&self) -> bool {
+        match self {
+            VerifyBound::IfEq(..) => false,
+            VerifyBound::OutlivedBy(ty::ReStatic) => true,
+            VerifyBound::OutlivedBy(_) => false,
+            VerifyBound::IsEmpty => false,
+            VerifyBound::AnyBound(bs) => bs.iter().any(|b| b.must_hold()),
+            VerifyBound::AllBounds(bs) => bs.iter().all(|b| b.must_hold()),
+        }
+    }
+
+    pub fn cannot_hold(&self) -> bool {
+        match self {
+            VerifyBound::IfEq(_, b) => b.cannot_hold(),
+            VerifyBound::IsEmpty => false,
+            VerifyBound::OutlivedBy(_) => false,
+            VerifyBound::AnyBound(bs) => bs.iter().all(|b| b.cannot_hold()),
+            VerifyBound::AllBounds(bs) => bs.iter().any(|b| b.cannot_hold()),
+        }
+    }
+
+    pub fn or(self, vb: VerifyBound<'tcx>) -> VerifyBound<'tcx> {
+        if self.must_hold() || vb.cannot_hold() {
+            self
+        } else if self.cannot_hold() || vb.must_hold() {
+            vb
+        } else {
+            VerifyBound::AnyBound(vec![self, vb])
+        }
+    }
+
+    pub fn and(self, vb: VerifyBound<'tcx>) -> VerifyBound<'tcx> {
+        if self.must_hold() && vb.must_hold() {
+            self
+        } else if self.cannot_hold() && vb.cannot_hold() {
+            self
+        } else {
+            VerifyBound::AllBounds(vec![self, vb])
+        }
+    }
+}
+
+impl<'tcx> RegionConstraintData<'tcx> {
+    /// Returns `true` if this region constraint data contains no constraints, and `false`
+    /// otherwise.
+    pub fn is_empty(&self) -> bool {
+        let RegionConstraintData { constraints, member_constraints, verifys, givens } = self;
+        constraints.is_empty()
+            && member_constraints.is_empty()
+            && verifys.is_empty()
+            && givens.is_empty()
+    }
+}
diff --git a/src/librustc/infer/resolve.rs b/src/librustc_infer/infer/resolve.rs
similarity index 93%
rename from src/librustc/infer/resolve.rs
rename to src/librustc_infer/infer/resolve.rs
index d7dc607044..ce0f2f4089 100644
--- a/src/librustc/infer/resolve.rs
+++ b/src/librustc_infer/infer/resolve.rs
@@ -1,7 +1,7 @@
 use super::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use super::{FixupError, FixupResult, InferCtxt, Span};
-use crate::ty::fold::{TypeFolder, TypeVisitor};
-use crate::ty::{self, Const, InferConst, Ty, TyCtxt, TypeFoldable};
+use rustc::ty::fold::{TypeFolder, TypeVisitor};
+use rustc::ty::{self, Const, InferConst, Ty, TyCtxt, TypeFoldable};
 
 ///////////////////////////////////////////////////////////////////////////
 // OPPORTUNISTIC VAR RESOLVER
@@ -28,7 +28,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for OpportunisticVarResolver<'a, 'tcx> {
     }
 
     fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
-        if !t.has_infer_types() && !t.has_infer_consts() {
+        if !t.has_infer_types_or_consts() {
             t // micro-optimize -- if there is nothing in this type that this fold affects...
         } else {
             let t = self.infcx.shallow_resolve(t);
@@ -37,7 +37,7 @@ impl<'a, 'tcx> TypeFolder<'tcx> for OpportunisticVarResolver<'a, 'tcx> {
     }
 
     fn fold_const(&mut self, ct: &'tcx Const<'tcx>) -> &'tcx Const<'tcx> {
-        if !ct.has_infer_consts() {
+        if !ct.has_infer_types_or_consts() {
             ct // micro-optimize -- if there is nothing in this const that this fold affects...
         } else {
             let ct = self.infcx.shallow_resolve(ct);
@@ -75,9 +75,12 @@ impl<'a, 'tcx> TypeFolder<'tcx> for OpportunisticTypeAndRegionResolver<'a, 'tcx>
 
     fn fold_region(&mut self, r: ty::Region<'tcx>) -> ty::Region<'tcx> {
         match *r {
-            ty::ReVar(rid) => {
-                self.infcx.borrow_region_constraints().opportunistic_resolve_var(self.tcx(), rid)
-            }
+            ty::ReVar(rid) => self
+                .infcx
+                .inner
+                .borrow_mut()
+                .unwrap_region_constraints()
+                .opportunistic_resolve_var(self.tcx(), rid),
             _ => r,
         }
     }
@@ -120,7 +123,7 @@ impl<'a, 'tcx> TypeVisitor<'tcx> for UnresolvedTypeFinder<'a, 'tcx> {
                 // Since we called `shallow_resolve` above, this must
                 // be an (as yet...) unresolved inference variable.
                 let ty_var_span = if let ty::TyVar(ty_vid) = infer_ty {
-                    let ty_vars = self.infcx.type_variables.borrow();
+                    let ty_vars = &self.infcx.inner.borrow().type_variables;
                     if let TypeVariableOrigin {
                         kind: TypeVariableOriginKind::TypeParameterDefinition(_, _),
                         span,
@@ -157,7 +160,7 @@ pub fn fully_resolve<'a, 'tcx, T>(infcx: &InferCtxt<'a, 'tcx>, value: &T) -> Fix
 where
     T: TypeFoldable<'tcx>,
 {
-    let mut full_resolver = FullTypeResolver { infcx: infcx, err: None };
+    let mut full_resolver = FullTypeResolver { infcx, err: None };
     let result = value.fold_with(&mut full_resolver);
     match full_resolver.err {
         None => Ok(result),
@@ -166,7 +169,7 @@ where
 }
 
 // N.B. This type is not public because the protocol around checking the
-// `err` field is not enforcable otherwise.
+// `err` field is not enforceable otherwise.
 struct FullTypeResolver<'a, 'tcx> {
     infcx: &'a InferCtxt<'a, 'tcx>,
     err: Option<FixupError<'tcx>>,
diff --git a/src/librustc/infer/sub.rs b/src/librustc_infer/infer/sub.rs
similarity index 89%
rename from src/librustc/infer/sub.rs
rename to src/librustc_infer/infer/sub.rs
index f355ffe196..f6fc38b535 100644
--- a/src/librustc/infer/sub.rs
+++ b/src/librustc_infer/infer/sub.rs
@@ -2,10 +2,10 @@ use super::combine::{CombineFields, RelationDir};
 use super::SubregionOrigin;
 
 use crate::traits::Obligation;
-use crate::ty::fold::TypeFoldable;
-use crate::ty::relate::{Cause, Relate, RelateResult, TypeRelation};
-use crate::ty::TyVar;
-use crate::ty::{self, Ty, TyCtxt};
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::relate::{Cause, Relate, RelateResult, TypeRelation};
+use rustc::ty::TyVar;
+use rustc::ty::{self, Ty, TyCtxt};
 use std::mem;
 
 /// Ensures `a` is made a subtype of `b`. Returns `a` on success.
@@ -19,7 +19,7 @@ impl<'combine, 'infcx, 'tcx> Sub<'combine, 'infcx, 'tcx> {
         f: &'combine mut CombineFields<'infcx, 'tcx>,
         a_is_expected: bool,
     ) -> Sub<'combine, 'infcx, 'tcx> {
-        Sub { fields: f, a_is_expected: a_is_expected }
+        Sub { fields: f, a_is_expected }
     }
 
     fn with_expected_switched<R, F: FnOnce(&mut Self) -> R>(&mut self, f: F) -> R {
@@ -80,8 +80,8 @@ impl TypeRelation<'tcx> for Sub<'combine, 'infcx, 'tcx> {
         }
 
         let infcx = self.fields.infcx;
-        let a = infcx.type_variables.borrow_mut().replace_if_possible(a);
-        let b = infcx.type_variables.borrow_mut().replace_if_possible(b);
+        let a = infcx.inner.borrow_mut().type_variables.replace_if_possible(a);
+        let b = infcx.inner.borrow_mut().type_variables.replace_if_possible(b);
         match (&a.kind, &b.kind) {
             (&ty::Infer(TyVar(a_vid)), &ty::Infer(TyVar(b_vid))) => {
                 // Shouldn't have any LBR here, so we can safely put
@@ -95,7 +95,7 @@ impl TypeRelation<'tcx> for Sub<'combine, 'infcx, 'tcx> {
                 // have to record in the `type_variables` tracker that
                 // the two variables are equal modulo subtyping, which
                 // is important to the occurs check later on.
-                infcx.type_variables.borrow_mut().sub(a_vid, b_vid);
+                infcx.inner.borrow_mut().type_variables.sub(a_vid, b_vid);
                 self.fields.obligations.push(Obligation::new(
                     self.fields.trace.cause.clone(),
                     self.fields.param_env,
@@ -140,7 +140,12 @@ impl TypeRelation<'tcx> for Sub<'combine, 'infcx, 'tcx> {
         // from the "cause" field, we could perhaps give more tailored
         // error messages.
         let origin = SubregionOrigin::Subtype(box self.fields.trace.clone());
-        self.fields.infcx.borrow_region_constraints().make_subregion(origin, a, b);
+        self.fields
+            .infcx
+            .inner
+            .borrow_mut()
+            .unwrap_region_constraints()
+            .make_subregion(origin, a, b);
 
         Ok(a)
     }
diff --git a/src/librustc/infer/type_variable.rs b/src/librustc_infer/infer/type_variable.rs
similarity index 97%
rename from src/librustc/infer/type_variable.rs
rename to src/librustc_infer/infer/type_variable.rs
index 8ea1b705d4..b59c560669 100644
--- a/src/librustc/infer/type_variable.rs
+++ b/src/librustc_infer/infer/type_variable.rs
@@ -1,4 +1,4 @@
-use crate::ty::{self, Ty, TyVid};
+use rustc::ty::{self, Ty, TyVid};
 use rustc_hir::def_id::DefId;
 use rustc_span::symbol::Symbol;
 use rustc_span::Span;
@@ -453,18 +453,3 @@ impl<'tcx> ut::UnifyValue for TypeVariableValue<'tcx> {
         }
     }
 }
-
-/// Raw `TyVid` are used as the unification key for `sub_relations`;
-/// they carry no values.
-impl ut::UnifyKey for ty::TyVid {
-    type Value = ();
-    fn index(&self) -> u32 {
-        self.index
-    }
-    fn from_index(i: u32) -> ty::TyVid {
-        ty::TyVid { index: i }
-    }
-    fn tag() -> &'static str {
-        "TyVid"
-    }
-}
diff --git a/src/librustc_infer/lib.rs b/src/librustc_infer/lib.rs
new file mode 100644
index 0000000000..6c66ef47f3
--- /dev/null
+++ b/src/librustc_infer/lib.rs
@@ -0,0 +1,38 @@
+//! This crates defines the trait resolution method and the type inference engine.
+//!
+//! - **Traits.** Trait resolution is implemented in the `traits` module.
+//! - **Type inference.** The type inference code can be found in the `infer` module;
+//!   this code handles low-level equality and subtyping operations. The
+//!   type check pass in the compiler is found in the `librustc_typeck` crate.
+//!
+//! For more information about how rustc works, see the [rustc guide].
+//!
+//! [rustc guide]: https://rust-lang.github.io/rustc-guide/
+//!
+//! # Note
+//!
+//! This API is completely unstable and subject to change.
+
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![feature(bool_to_option)]
+#![feature(box_patterns)]
+#![feature(box_syntax)]
+#![feature(drain_filter)]
+#![feature(never_type)]
+#![feature(range_is_empty)]
+#![feature(in_band_lifetimes)]
+#![feature(crate_visibility_modifier)]
+#![recursion_limit = "512"]
+
+#[macro_use]
+extern crate rustc_macros;
+#[cfg(target_arch = "x86_64")]
+#[macro_use]
+extern crate rustc_data_structures;
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate rustc;
+
+pub mod infer;
+pub mod traits;
diff --git a/src/librustc/traits/auto_trait.rs b/src/librustc_infer/traits/auto_trait.rs
similarity index 98%
rename from src/librustc/traits/auto_trait.rs
rename to src/librustc_infer/traits/auto_trait.rs
index fdb6432f7c..39be8fc1c0 100644
--- a/src/librustc/traits/auto_trait.rs
+++ b/src/librustc_infer/traits/auto_trait.rs
@@ -5,8 +5,8 @@ use super::*;
 
 use crate::infer::region_constraints::{Constraint, RegionConstraintData};
 use crate::infer::InferCtxt;
-use crate::ty::fold::TypeFolder;
-use crate::ty::{Region, RegionVid};
+use rustc::ty::fold::TypeFolder;
+use rustc::ty::{Region, RegionVid};
 
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 
@@ -150,7 +150,7 @@ impl<'tcx> AutoTraitFinder<'tcx> {
             // SelectionContext to return it back to us.
 
             let (new_env, user_env) = match self.evaluate_predicates(
-                &mut infcx,
+                &infcx,
                 trait_did,
                 ty,
                 orig_env,
@@ -198,12 +198,22 @@ impl<'tcx> AutoTraitFinder<'tcx> {
                 panic!("Unable to fulfill trait {:?} for '{:?}': {:?}", trait_did, ty, e)
             });
 
-            let body_id_map: FxHashMap<_, _> =
-                infcx.region_obligations.borrow().iter().map(|&(id, _)| (id, vec![])).collect();
+            let body_id_map: FxHashMap<_, _> = infcx
+                .inner
+                .borrow()
+                .region_obligations
+                .iter()
+                .map(|&(id, _)| (id, vec![]))
+                .collect();
 
             infcx.process_registered_region_obligations(&body_id_map, None, full_env);
 
-            let region_data = infcx.borrow_region_constraints().region_constraint_data().clone();
+            let region_data = infcx
+                .inner
+                .borrow_mut()
+                .unwrap_region_constraints()
+                .region_constraint_data()
+                .clone();
 
             let vid_to_region = self.map_vid_to_region(&region_data);
 
@@ -339,7 +349,7 @@ impl AutoTraitFinder<'tcx> {
                         already_visited.remove(&pred);
                         self.add_user_pred(
                             &mut user_computed_preds,
-                            ty::Predicate::Trait(pred, ast::Constness::NotConst),
+                            ty::Predicate::Trait(pred, hir::Constness::NotConst),
                         );
                         predicates.push_back(pred);
                     } else {
@@ -445,7 +455,7 @@ impl AutoTraitFinder<'tcx> {
                                     // predicate has some other kind of region. An region
                                     // variable isn't something we can actually display to a user,
                                     // so we choose their new predicate (which doesn't have a region
-                                    // varaible).
+                                    // variable).
                                     //
                                     // In both cases, we want to remove the old predicate,
                                     // from `user_computed_preds`, and replace it with the new
@@ -691,7 +701,7 @@ impl AutoTraitFinder<'tcx> {
                     //  some subobligations. We then process these subobligations
                     //  like any other generated sub-obligations.
                     //
-                    // 3. We receieve an 'ambiguous' result (Ok(None))
+                    // 3. We receive an 'ambiguous' result (Ok(None))
                     // If we were actually trying to compile a crate,
                     // we would need to re-process this obligation later.
                     // However, all we care about is finding out what bounds
diff --git a/src/librustc_infer/traits/codegen/mod.rs b/src/librustc_infer/traits/codegen/mod.rs
new file mode 100644
index 0000000000..f499565e91
--- /dev/null
+++ b/src/librustc_infer/traits/codegen/mod.rs
@@ -0,0 +1,114 @@
+// This file contains various trait resolution methods used by codegen.
+// They all assume regions can be erased and monomorphic types.  It
+// seems likely that they should eventually be merged into more
+// general routines.
+
+use crate::infer::{InferCtxt, TyCtxtInferExt};
+use crate::traits::{
+    FulfillmentContext, Obligation, ObligationCause, SelectionContext, TraitEngine, Vtable,
+};
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::{self, TyCtxt};
+
+/// Attempts to resolve an obligation to a vtable. The result is
+/// a shallow vtable resolution, meaning that we do not
+/// (necessarily) resolve all nested obligations on the impl. Note
+/// that type check should guarantee to us that all nested
+/// obligations *could be* resolved if we wanted to.
+/// Assumes that this is run after the entire crate has been successfully type-checked.
+pub fn codegen_fulfill_obligation<'tcx>(
+    ty: TyCtxt<'tcx>,
+    (param_env, trait_ref): (ty::ParamEnv<'tcx>, ty::PolyTraitRef<'tcx>),
+) -> Option<Vtable<'tcx, ()>> {
+    // Remove any references to regions; this helps improve caching.
+    let trait_ref = ty.erase_regions(&trait_ref);
+
+    debug!(
+        "codegen_fulfill_obligation(trait_ref={:?}, def_id={:?})",
+        (param_env, trait_ref),
+        trait_ref.def_id()
+    );
+
+    // Do the initial selection for the obligation. This yields the
+    // shallow result we are looking for -- that is, what specific impl.
+    ty.infer_ctxt().enter(|infcx| {
+        let mut selcx = SelectionContext::new(&infcx);
+
+        let obligation_cause = ObligationCause::dummy();
+        let obligation =
+            Obligation::new(obligation_cause, param_env, trait_ref.to_poly_trait_predicate());
+
+        let selection = match selcx.select(&obligation) {
+            Ok(Some(selection)) => selection,
+            Ok(None) => {
+                // Ambiguity can happen when monomorphizing during trans
+                // expands to some humongo type that never occurred
+                // statically -- this humongo type can then overflow,
+                // leading to an ambiguous result. So report this as an
+                // overflow bug, since I believe this is the only case
+                // where ambiguity can result.
+                infcx.tcx.sess.delay_span_bug(
+                    rustc_span::DUMMY_SP,
+                    &format!(
+                        "encountered ambiguity selecting `{:?}` during codegen, presuming due to \
+                         overflow or prior type error",
+                        trait_ref
+                    ),
+                );
+                return None;
+            }
+            Err(e) => {
+                bug!("Encountered error `{:?}` selecting `{:?}` during codegen", e, trait_ref)
+            }
+        };
+
+        debug!("fulfill_obligation: selection={:?}", selection);
+
+        // Currently, we use a fulfillment context to completely resolve
+        // all nested obligations. This is because they can inform the
+        // inference of the impl's type parameters.
+        let mut fulfill_cx = FulfillmentContext::new();
+        let vtable = selection.map(|predicate| {
+            debug!("fulfill_obligation: register_predicate_obligation {:?}", predicate);
+            fulfill_cx.register_predicate_obligation(&infcx, predicate);
+        });
+        let vtable = infcx.drain_fulfillment_cx_or_panic(&mut fulfill_cx, &vtable);
+
+        info!("Cache miss: {:?} => {:?}", trait_ref, vtable);
+        Some(vtable)
+    })
+}
+
+// # Global Cache
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    /// Finishes processes any obligations that remain in the
+    /// fulfillment context, and then returns the result with all type
+    /// variables removed and regions erased. Because this is intended
+    /// for use after type-check has completed, if any errors occur,
+    /// it will panic. It is used during normalization and other cases
+    /// where processing the obligations in `fulfill_cx` may cause
+    /// type inference variables that appear in `result` to be
+    /// unified, and hence we need to process those obligations to get
+    /// the complete picture of the type.
+    fn drain_fulfillment_cx_or_panic<T>(
+        &self,
+        fulfill_cx: &mut FulfillmentContext<'tcx>,
+        result: &T,
+    ) -> T
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        debug!("drain_fulfillment_cx_or_panic()");
+
+        // In principle, we only need to do this so long as `result`
+        // contains unbound type parameters. It could be a slight
+        // optimization to stop iterating early.
+        if let Err(errors) = fulfill_cx.select_all_or_error(self) {
+            bug!("Encountered errors `{:?}` resolving bounds after type-checking", errors);
+        }
+
+        let result = self.resolve_vars_if_possible(result);
+        self.tcx.erase_regions(&result)
+    }
+}
diff --git a/src/librustc/traits/coherence.rs b/src/librustc_infer/traits/coherence.rs
similarity index 92%
rename from src/librustc/traits/coherence.rs
rename to src/librustc_infer/traits/coherence.rs
index 29ea47809a..15c5f4d402 100644
--- a/src/librustc/traits/coherence.rs
+++ b/src/librustc_infer/traits/coherence.rs
@@ -4,13 +4,13 @@
 //! [trait-resolution]: https://rust-lang.github.io/rustc-guide/traits/resolution.html
 //! [trait-specialization]: https://rust-lang.github.io/rustc-guide/traits/specialization.html
 
-use crate::infer::{CombinedSnapshot, InferOk};
+use crate::infer::{CombinedSnapshot, InferOk, TyCtxtInferExt};
 use crate::traits::select::IntercrateAmbiguityCause;
-use crate::traits::IntercrateMode;
+use crate::traits::SkipLeakCheck;
 use crate::traits::{self, Normalized, Obligation, ObligationCause, SelectionContext};
-use crate::ty::fold::TypeFoldable;
-use crate::ty::subst::Subst;
-use crate::ty::{self, Ty, TyCtxt};
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::subst::Subst;
+use rustc::ty::{self, Ty, TyCtxt};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_span::symbol::sym;
 use rustc_span::DUMMY_SP;
@@ -26,7 +26,7 @@ enum InCrate {
 #[derive(Debug, Copy, Clone)]
 pub enum Conflict {
     Upstream,
-    Downstream { used_to_be_broken: bool },
+    Downstream,
 }
 
 pub struct OverlapResult<'tcx> {
@@ -39,10 +39,10 @@ pub struct OverlapResult<'tcx> {
 }
 
 pub fn add_placeholder_note(err: &mut rustc_errors::DiagnosticBuilder<'_>) {
-    err.note(&format!(
+    err.note(
         "this behavior recently changed as a result of a bug fix; \
-         see rust-lang/rust#56105 for details"
-    ));
+         see rust-lang/rust#56105 for details",
+    );
 }
 
 /// If there are types that satisfy both impls, invokes `on_overlap`
@@ -52,7 +52,7 @@ pub fn overlapping_impls<F1, F2, R>(
     tcx: TyCtxt<'_>,
     impl1_def_id: DefId,
     impl2_def_id: DefId,
-    intercrate_mode: IntercrateMode,
+    skip_leak_check: SkipLeakCheck,
     on_overlap: F1,
     no_overlap: F2,
 ) -> R
@@ -63,14 +63,13 @@ where
     debug!(
         "overlapping_impls(\
            impl1_def_id={:?}, \
-           impl2_def_id={:?},
-           intercrate_mode={:?})",
-        impl1_def_id, impl2_def_id, intercrate_mode
+           impl2_def_id={:?})",
+        impl1_def_id, impl2_def_id,
     );
 
     let overlaps = tcx.infer_ctxt().enter(|infcx| {
-        let selcx = &mut SelectionContext::intercrate(&infcx, intercrate_mode);
-        overlap(selcx, impl1_def_id, impl2_def_id).is_some()
+        let selcx = &mut SelectionContext::intercrate(&infcx);
+        overlap(selcx, skip_leak_check, impl1_def_id, impl2_def_id).is_some()
     });
 
     if !overlaps {
@@ -81,9 +80,9 @@ where
     // this time tracking intercrate ambuiguity causes for better
     // diagnostics. (These take time and can lead to false errors.)
     tcx.infer_ctxt().enter(|infcx| {
-        let selcx = &mut SelectionContext::intercrate(&infcx, intercrate_mode);
+        let selcx = &mut SelectionContext::intercrate(&infcx);
         selcx.enable_tracking_intercrate_ambiguity_causes();
-        on_overlap(overlap(selcx, impl1_def_id, impl2_def_id).unwrap())
+        on_overlap(overlap(selcx, skip_leak_check, impl1_def_id, impl2_def_id).unwrap())
     })
 }
 
@@ -113,12 +112,15 @@ fn with_fresh_ty_vars<'cx, 'tcx>(
 /// where-clauses)? If so, returns an `ImplHeader` that unifies the two impls.
 fn overlap<'cx, 'tcx>(
     selcx: &mut SelectionContext<'cx, 'tcx>,
+    skip_leak_check: SkipLeakCheck,
     a_def_id: DefId,
     b_def_id: DefId,
 ) -> Option<OverlapResult<'tcx>> {
     debug!("overlap(a_def_id={:?}, b_def_id={:?})", a_def_id, b_def_id);
 
-    selcx.infcx().probe(|snapshot| overlap_within_probe(selcx, a_def_id, b_def_id, snapshot))
+    selcx.infcx().probe_maybe_skip_leak_check(skip_leak_check.is_yes(), |snapshot| {
+        overlap_within_probe(selcx, a_def_id, b_def_id, snapshot)
+    })
 }
 
 fn overlap_within_probe(
@@ -146,7 +148,9 @@ fn overlap_within_probe(
         .eq_impl_headers(&a_impl_header, &b_impl_header)
     {
         Ok(InferOk { obligations, value: () }) => obligations,
-        Err(_) => return None,
+        Err(_) => {
+            return None;
+        }
     };
 
     debug!("overlap: unification check succeeded");
@@ -195,15 +199,7 @@ pub fn trait_ref_is_knowable<'tcx>(
     if orphan_check_trait_ref(tcx, trait_ref, InCrate::Remote).is_ok() {
         // A downstream or cousin crate is allowed to implement some
         // substitution of this trait-ref.
-
-        // A trait can be implementable for a trait ref by both the current
-        // crate and crates downstream of it. Older versions of rustc
-        // were not aware of this, causing incoherence (issue #43355).
-        let used_to_be_broken = orphan_check_trait_ref(tcx, trait_ref, InCrate::Local).is_ok();
-        if used_to_be_broken {
-            debug!("trait_ref_is_knowable({:?}) - USED TO BE BROKEN", trait_ref);
-        }
-        return Some(Conflict::Downstream { used_to_be_broken });
+        return Some(Conflict::Downstream);
     }
 
     if trait_ref_is_local_or_fundamental(tcx, trait_ref) {
@@ -403,8 +399,7 @@ fn orphan_check_trait_ref<'tcx>(
             let local_type = trait_ref
                 .input_types()
                 .flat_map(|ty| uncover_fundamental_ty(tcx, ty, in_crate))
-                .filter(|ty| ty_is_non_local_constructor(ty, in_crate).is_none())
-                .next();
+                .find(|ty| ty_is_non_local_constructor(ty, in_crate).is_none());
 
             debug!("orphan_check_trait_ref: uncovered ty local_type: `{:?}`", local_type);
 
@@ -510,7 +505,7 @@ fn ty_is_non_local_constructor<'tcx>(ty: Ty<'tcx>, in_crate: InCrate) -> Option<
             //
             // We choose to treat all opaque types as non-local, even
             // those that appear within the same crate. This seems
-            // somewhat suprising at first, but makes sense when
+            // somewhat surprising at first, but makes sense when
             // you consider that opaque types are supposed to hide
             // the underlying type *within the same crate*. When an
             // opaque type is used from outside the module
diff --git a/src/librustc/traits/engine.rs b/src/librustc_infer/traits/engine.rs
similarity index 86%
rename from src/librustc/traits/engine.rs
rename to src/librustc_infer/traits/engine.rs
index 84bfc86e6a..e23810dd16 100644
--- a/src/librustc/traits/engine.rs
+++ b/src/librustc_infer/traits/engine.rs
@@ -1,9 +1,9 @@
 use crate::infer::InferCtxt;
 use crate::traits::Obligation;
-use crate::ty::{self, ToPredicate, Ty, TyCtxt, WithConstness};
+use rustc::ty::{self, ToPredicate, Ty, TyCtxt, WithConstness};
 use rustc_hir::def_id::DefId;
 
-use super::{ChalkFulfillmentContext, FulfillmentContext, FulfillmentError};
+use super::{FulfillmentContext, FulfillmentError};
 use super::{ObligationCause, PredicateObligation};
 
 pub trait TraitEngine<'tcx>: 'tcx {
@@ -78,11 +78,7 @@ impl<T: ?Sized + TraitEngine<'tcx>> TraitEngineExt<'tcx> for T {
 }
 
 impl dyn TraitEngine<'tcx> {
-    pub fn new(tcx: TyCtxt<'tcx>) -> Box<Self> {
-        if tcx.sess.opts.debugging_opts.chalk {
-            Box::new(ChalkFulfillmentContext::new())
-        } else {
-            Box::new(FulfillmentContext::new())
-        }
+    pub fn new(_tcx: TyCtxt<'tcx>) -> Box<Self> {
+        Box::new(FulfillmentContext::new())
     }
 }
diff --git a/src/librustc_infer/traits/error_reporting/mod.rs b/src/librustc_infer/traits/error_reporting/mod.rs
new file mode 100644
index 0000000000..10143ae015
--- /dev/null
+++ b/src/librustc_infer/traits/error_reporting/mod.rs
@@ -0,0 +1,1643 @@
+pub mod on_unimplemented;
+pub mod suggestions;
+
+use super::{
+    ConstEvalFailure, EvaluationResult, FulfillmentError, FulfillmentErrorCode,
+    MismatchedProjectionTypes, ObjectSafetyViolation, Obligation, ObligationCause,
+    ObligationCauseCode, OnUnimplementedDirective, OnUnimplementedNote,
+    OutputTypeParameterMismatch, Overflow, PredicateObligation, SelectionContext, SelectionError,
+    TraitNotObjectSafe,
+};
+
+use crate::infer::error_reporting::{TyCategory, TypeAnnotationNeeded as ErrorCode};
+use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use crate::infer::{self, InferCtxt, TyCtxtInferExt};
+use rustc::mir::interpret::ErrorHandled;
+use rustc::session::DiagnosticMessageId;
+use rustc::ty::error::ExpectedFound;
+use rustc::ty::fast_reject;
+use rustc::ty::fold::TypeFolder;
+use rustc::ty::SubtypePredicate;
+use rustc::ty::{
+    self, AdtKind, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness,
+};
+use rustc_ast::ast;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
+use rustc_hir as hir;
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+use rustc_hir::{QPath, TyKind, WhereBoundPredicate, WherePredicate};
+use rustc_span::source_map::SourceMap;
+use rustc_span::{ExpnKind, Span, DUMMY_SP};
+use std::fmt;
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    pub fn report_fulfillment_errors(
+        &self,
+        errors: &[FulfillmentError<'tcx>],
+        body_id: Option<hir::BodyId>,
+        fallback_has_occurred: bool,
+    ) {
+        #[derive(Debug)]
+        struct ErrorDescriptor<'tcx> {
+            predicate: ty::Predicate<'tcx>,
+            index: Option<usize>, // None if this is an old error
+        }
+
+        let mut error_map: FxHashMap<_, Vec<_>> = self
+            .reported_trait_errors
+            .borrow()
+            .iter()
+            .map(|(&span, predicates)| {
+                (
+                    span,
+                    predicates
+                        .iter()
+                        .map(|&predicate| ErrorDescriptor { predicate, index: None })
+                        .collect(),
+                )
+            })
+            .collect();
+
+        for (index, error) in errors.iter().enumerate() {
+            // We want to ignore desugarings here: spans are equivalent even
+            // if one is the result of a desugaring and the other is not.
+            let mut span = error.obligation.cause.span;
+            let expn_data = span.ctxt().outer_expn_data();
+            if let ExpnKind::Desugaring(_) = expn_data.kind {
+                span = expn_data.call_site;
+            }
+
+            error_map.entry(span).or_default().push(ErrorDescriptor {
+                predicate: error.obligation.predicate,
+                index: Some(index),
+            });
+
+            self.reported_trait_errors
+                .borrow_mut()
+                .entry(span)
+                .or_default()
+                .push(error.obligation.predicate.clone());
+        }
+
+        // We do this in 2 passes because we want to display errors in order, though
+        // maybe it *is* better to sort errors by span or something.
+        let mut is_suppressed = vec![false; errors.len()];
+        for (_, error_set) in error_map.iter() {
+            // We want to suppress "duplicate" errors with the same span.
+            for error in error_set {
+                if let Some(index) = error.index {
+                    // Suppress errors that are either:
+                    // 1) strictly implied by another error.
+                    // 2) implied by an error with a smaller index.
+                    for error2 in error_set {
+                        if error2.index.map_or(false, |index2| is_suppressed[index2]) {
+                            // Avoid errors being suppressed by already-suppressed
+                            // errors, to prevent all errors from being suppressed
+                            // at once.
+                            continue;
+                        }
+
+                        if self.error_implies(&error2.predicate, &error.predicate)
+                            && !(error2.index >= error.index
+                                && self.error_implies(&error.predicate, &error2.predicate))
+                        {
+                            info!("skipping {:?} (implied by {:?})", error, error2);
+                            is_suppressed[index] = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        for (error, suppressed) in errors.iter().zip(is_suppressed) {
+            if !suppressed {
+                self.report_fulfillment_error(error, body_id, fallback_has_occurred);
+            }
+        }
+    }
+
+    // returns if `cond` not occurring implies that `error` does not occur - i.e., that
+    // `error` occurring implies that `cond` occurs.
+    fn error_implies(&self, cond: &ty::Predicate<'tcx>, error: &ty::Predicate<'tcx>) -> bool {
+        if cond == error {
+            return true;
+        }
+
+        let (cond, error) = match (cond, error) {
+            (&ty::Predicate::Trait(..), &ty::Predicate::Trait(ref error, _)) => (cond, error),
+            _ => {
+                // FIXME: make this work in other cases too.
+                return false;
+            }
+        };
+
+        for implication in super::elaborate_predicates(self.tcx, vec![*cond]) {
+            if let ty::Predicate::Trait(implication, _) = implication {
+                let error = error.to_poly_trait_ref();
+                let implication = implication.to_poly_trait_ref();
+                // FIXME: I'm just not taking associated types at all here.
+                // Eventually I'll need to implement param-env-aware
+                // `Γ₁ ⊦ φ₁ => Γ₂ ⊦ φ₂` logic.
+                let param_env = ty::ParamEnv::empty();
+                if self.can_sub(param_env, error, implication).is_ok() {
+                    debug!("error_implies: {:?} -> {:?} -> {:?}", cond, error, implication);
+                    return true;
+                }
+            }
+        }
+
+        false
+    }
+
+    fn report_fulfillment_error(
+        &self,
+        error: &FulfillmentError<'tcx>,
+        body_id: Option<hir::BodyId>,
+        fallback_has_occurred: bool,
+    ) {
+        debug!("report_fulfillment_error({:?})", error);
+        match error.code {
+            FulfillmentErrorCode::CodeSelectionError(ref selection_error) => {
+                self.report_selection_error(
+                    &error.obligation,
+                    selection_error,
+                    fallback_has_occurred,
+                    error.points_at_arg_span,
+                );
+            }
+            FulfillmentErrorCode::CodeProjectionError(ref e) => {
+                self.report_projection_error(&error.obligation, e);
+            }
+            FulfillmentErrorCode::CodeAmbiguity => {
+                self.maybe_report_ambiguity(&error.obligation, body_id);
+            }
+            FulfillmentErrorCode::CodeSubtypeError(ref expected_found, ref err) => {
+                self.report_mismatched_types(
+                    &error.obligation.cause,
+                    expected_found.expected,
+                    expected_found.found,
+                    err.clone(),
+                )
+                .emit();
+            }
+        }
+    }
+
+    fn report_projection_error(
+        &self,
+        obligation: &PredicateObligation<'tcx>,
+        error: &MismatchedProjectionTypes<'tcx>,
+    ) {
+        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
+
+        if predicate.references_error() {
+            return;
+        }
+
+        self.probe(|_| {
+            let err_buf;
+            let mut err = &error.err;
+            let mut values = None;
+
+            // try to find the mismatched types to report the error with.
+            //
+            // this can fail if the problem was higher-ranked, in which
+            // cause I have no idea for a good error message.
+            if let ty::Predicate::Projection(ref data) = predicate {
+                let mut selcx = SelectionContext::new(self);
+                let (data, _) = self.replace_bound_vars_with_fresh_vars(
+                    obligation.cause.span,
+                    infer::LateBoundRegionConversionTime::HigherRankedType,
+                    data,
+                );
+                let mut obligations = vec![];
+                let normalized_ty = super::normalize_projection_type(
+                    &mut selcx,
+                    obligation.param_env,
+                    data.projection_ty,
+                    obligation.cause.clone(),
+                    0,
+                    &mut obligations,
+                );
+
+                debug!(
+                    "report_projection_error obligation.cause={:?} obligation.param_env={:?}",
+                    obligation.cause, obligation.param_env
+                );
+
+                debug!(
+                    "report_projection_error normalized_ty={:?} data.ty={:?}",
+                    normalized_ty, data.ty
+                );
+
+                let is_normalized_ty_expected = match &obligation.cause.code {
+                    ObligationCauseCode::ItemObligation(_)
+                    | ObligationCauseCode::BindingObligation(_, _)
+                    | ObligationCauseCode::ObjectCastObligation(_) => false,
+                    _ => true,
+                };
+
+                if let Err(error) = self.at(&obligation.cause, obligation.param_env).eq_exp(
+                    is_normalized_ty_expected,
+                    normalized_ty,
+                    data.ty,
+                ) {
+                    values = Some(infer::ValuePairs::Types(ExpectedFound::new(
+                        is_normalized_ty_expected,
+                        normalized_ty,
+                        data.ty,
+                    )));
+
+                    err_buf = error;
+                    err = &err_buf;
+                }
+            }
+
+            let msg = format!("type mismatch resolving `{}`", predicate);
+            let error_id = (DiagnosticMessageId::ErrorId(271), Some(obligation.cause.span), msg);
+            let fresh = self.tcx.sess.one_time_diagnostics.borrow_mut().insert(error_id);
+            if fresh {
+                let mut diag = struct_span_err!(
+                    self.tcx.sess,
+                    obligation.cause.span,
+                    E0271,
+                    "type mismatch resolving `{}`",
+                    predicate
+                );
+                self.note_type_err(&mut diag, &obligation.cause, None, values, err);
+                self.note_obligation_cause(&mut diag, obligation);
+                diag.emit();
+            }
+        });
+    }
+
+    fn fuzzy_match_tys(&self, a: Ty<'tcx>, b: Ty<'tcx>) -> bool {
+        /// returns the fuzzy category of a given type, or None
+        /// if the type can be equated to any type.
+        fn type_category(t: Ty<'_>) -> Option<u32> {
+            match t.kind {
+                ty::Bool => Some(0),
+                ty::Char => Some(1),
+                ty::Str => Some(2),
+                ty::Int(..) | ty::Uint(..) | ty::Infer(ty::IntVar(..)) => Some(3),
+                ty::Float(..) | ty::Infer(ty::FloatVar(..)) => Some(4),
+                ty::Ref(..) | ty::RawPtr(..) => Some(5),
+                ty::Array(..) | ty::Slice(..) => Some(6),
+                ty::FnDef(..) | ty::FnPtr(..) => Some(7),
+                ty::Dynamic(..) => Some(8),
+                ty::Closure(..) => Some(9),
+                ty::Tuple(..) => Some(10),
+                ty::Projection(..) => Some(11),
+                ty::Param(..) => Some(12),
+                ty::Opaque(..) => Some(13),
+                ty::Never => Some(14),
+                ty::Adt(adt, ..) => match adt.adt_kind() {
+                    AdtKind::Struct => Some(15),
+                    AdtKind::Union => Some(16),
+                    AdtKind::Enum => Some(17),
+                },
+                ty::Generator(..) => Some(18),
+                ty::Foreign(..) => Some(19),
+                ty::GeneratorWitness(..) => Some(20),
+                ty::Placeholder(..) | ty::Bound(..) | ty::Infer(..) | ty::Error => None,
+                ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
+            }
+        }
+
+        match (type_category(a), type_category(b)) {
+            (Some(cat_a), Some(cat_b)) => match (&a.kind, &b.kind) {
+                (&ty::Adt(def_a, _), &ty::Adt(def_b, _)) => def_a == def_b,
+                _ => cat_a == cat_b,
+            },
+            // infer and error can be equated to all types
+            _ => true,
+        }
+    }
+
+    fn describe_generator(&self, body_id: hir::BodyId) -> Option<&'static str> {
+        self.tcx.hir().body(body_id).generator_kind.map(|gen_kind| match gen_kind {
+            hir::GeneratorKind::Gen => "a generator",
+            hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Block) => "an async block",
+            hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Fn) => "an async function",
+            hir::GeneratorKind::Async(hir::AsyncGeneratorKind::Closure) => "an async closure",
+        })
+    }
+
+    fn find_similar_impl_candidates(
+        &self,
+        trait_ref: ty::PolyTraitRef<'tcx>,
+    ) -> Vec<ty::TraitRef<'tcx>> {
+        let simp = fast_reject::simplify_type(self.tcx, trait_ref.skip_binder().self_ty(), true);
+        let all_impls = self.tcx.all_impls(trait_ref.def_id());
+
+        match simp {
+            Some(simp) => all_impls
+                .iter()
+                .filter_map(|&def_id| {
+                    let imp = self.tcx.impl_trait_ref(def_id).unwrap();
+                    let imp_simp = fast_reject::simplify_type(self.tcx, imp.self_ty(), true);
+                    if let Some(imp_simp) = imp_simp {
+                        if simp != imp_simp {
+                            return None;
+                        }
+                    }
+
+                    Some(imp)
+                })
+                .collect(),
+            None => {
+                all_impls.iter().map(|&def_id| self.tcx.impl_trait_ref(def_id).unwrap()).collect()
+            }
+        }
+    }
+
+    fn report_similar_impl_candidates(
+        &self,
+        impl_candidates: Vec<ty::TraitRef<'tcx>>,
+        err: &mut DiagnosticBuilder<'_>,
+    ) {
+        if impl_candidates.is_empty() {
+            return;
+        }
+
+        let len = impl_candidates.len();
+        let end = if impl_candidates.len() <= 5 { impl_candidates.len() } else { 4 };
+
+        let normalize = |candidate| {
+            self.tcx.infer_ctxt().enter(|ref infcx| {
+                let normalized = infcx
+                    .at(&ObligationCause::dummy(), ty::ParamEnv::empty())
+                    .normalize(candidate)
+                    .ok();
+                match normalized {
+                    Some(normalized) => format!("\n  {:?}", normalized.value),
+                    None => format!("\n  {:?}", candidate),
+                }
+            })
+        };
+
+        // Sort impl candidates so that ordering is consistent for UI tests.
+        let mut normalized_impl_candidates =
+            impl_candidates.iter().map(normalize).collect::<Vec<String>>();
+
+        // Sort before taking the `..end` range,
+        // because the ordering of `impl_candidates` may not be deterministic:
+        // https://github.com/rust-lang/rust/pull/57475#issuecomment-455519507
+        normalized_impl_candidates.sort();
+
+        err.help(&format!(
+            "the following implementations were found:{}{}",
+            normalized_impl_candidates[..end].join(""),
+            if len > 5 { format!("\nand {} others", len - 4) } else { String::new() }
+        ));
+    }
+
+    /// Reports that an overflow has occurred and halts compilation. We
+    /// halt compilation unconditionally because it is important that
+    /// overflows never be masked -- they basically represent computations
+    /// whose result could not be truly determined and thus we can't say
+    /// if the program type checks or not -- and they are unusual
+    /// occurrences in any case.
+    pub fn report_overflow_error<T>(
+        &self,
+        obligation: &Obligation<'tcx, T>,
+        suggest_increasing_limit: bool,
+    ) -> !
+    where
+        T: fmt::Display + TypeFoldable<'tcx>,
+    {
+        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
+        let mut err = struct_span_err!(
+            self.tcx.sess,
+            obligation.cause.span,
+            E0275,
+            "overflow evaluating the requirement `{}`",
+            predicate
+        );
+
+        if suggest_increasing_limit {
+            self.suggest_new_overflow_limit(&mut err);
+        }
+
+        self.note_obligation_cause_code(
+            &mut err,
+            &obligation.predicate,
+            &obligation.cause.code,
+            &mut vec![],
+        );
+
+        err.emit();
+        self.tcx.sess.abort_if_errors();
+        bug!();
+    }
+
+    /// Reports that a cycle was detected which led to overflow and halts
+    /// compilation. This is equivalent to `report_overflow_error` except
+    /// that we can give a more helpful error message (and, in particular,
+    /// we do not suggest increasing the overflow limit, which is not
+    /// going to help).
+    pub fn report_overflow_error_cycle(&self, cycle: &[PredicateObligation<'tcx>]) -> ! {
+        let cycle = self.resolve_vars_if_possible(&cycle.to_owned());
+        assert!(!cycle.is_empty());
+
+        debug!("report_overflow_error_cycle: cycle={:?}", cycle);
+
+        self.report_overflow_error(&cycle[0], false);
+    }
+
+    pub fn report_extra_impl_obligation(
+        &self,
+        error_span: Span,
+        item_name: ast::Name,
+        _impl_item_def_id: DefId,
+        trait_item_def_id: DefId,
+        requirement: &dyn fmt::Display,
+    ) -> DiagnosticBuilder<'tcx> {
+        let msg = "impl has stricter requirements than trait";
+        let sp = self.tcx.sess.source_map().def_span(error_span);
+
+        let mut err = struct_span_err!(self.tcx.sess, sp, E0276, "{}", msg);
+
+        if let Some(trait_item_span) = self.tcx.hir().span_if_local(trait_item_def_id) {
+            let span = self.tcx.sess.source_map().def_span(trait_item_span);
+            err.span_label(span, format!("definition of `{}` from trait", item_name));
+        }
+
+        err.span_label(sp, format!("impl has extra requirement {}", requirement));
+
+        err
+    }
+
+    /// Gets the parent trait chain start
+    fn get_parent_trait_ref(
+        &self,
+        code: &ObligationCauseCode<'tcx>,
+    ) -> Option<(String, Option<Span>)> {
+        match code {
+            &ObligationCauseCode::BuiltinDerivedObligation(ref data) => {
+                let parent_trait_ref = self.resolve_vars_if_possible(&data.parent_trait_ref);
+                match self.get_parent_trait_ref(&data.parent_code) {
+                    Some(t) => Some(t),
+                    None => {
+                        let ty = parent_trait_ref.skip_binder().self_ty();
+                        let span =
+                            TyCategory::from_ty(ty).map(|(_, def_id)| self.tcx.def_span(def_id));
+                        Some((ty.to_string(), span))
+                    }
+                }
+            }
+            _ => None,
+        }
+    }
+
+    pub fn report_selection_error(
+        &self,
+        obligation: &PredicateObligation<'tcx>,
+        error: &SelectionError<'tcx>,
+        fallback_has_occurred: bool,
+        points_at_arg: bool,
+    ) {
+        let tcx = self.tcx;
+        let span = obligation.cause.span;
+
+        let mut err = match *error {
+            SelectionError::Unimplemented => {
+                if let ObligationCauseCode::CompareImplMethodObligation {
+                    item_name,
+                    impl_item_def_id,
+                    trait_item_def_id,
+                }
+                | ObligationCauseCode::CompareImplTypeObligation {
+                    item_name,
+                    impl_item_def_id,
+                    trait_item_def_id,
+                } = obligation.cause.code
+                {
+                    self.report_extra_impl_obligation(
+                        span,
+                        item_name,
+                        impl_item_def_id,
+                        trait_item_def_id,
+                        &format!("`{}`", obligation.predicate),
+                    )
+                    .emit();
+                    return;
+                }
+                match obligation.predicate {
+                    ty::Predicate::Trait(ref trait_predicate, _) => {
+                        let trait_predicate = self.resolve_vars_if_possible(trait_predicate);
+
+                        if self.tcx.sess.has_errors() && trait_predicate.references_error() {
+                            return;
+                        }
+                        let trait_ref = trait_predicate.to_poly_trait_ref();
+                        let (post_message, pre_message, type_def) = self
+                            .get_parent_trait_ref(&obligation.cause.code)
+                            .map(|(t, s)| {
+                                (
+                                    format!(" in `{}`", t),
+                                    format!("within `{}`, ", t),
+                                    s.map(|s| (format!("within this `{}`", t), s)),
+                                )
+                            })
+                            .unwrap_or_default();
+
+                        let OnUnimplementedNote { message, label, note, enclosing_scope } =
+                            self.on_unimplemented_note(trait_ref, obligation);
+                        let have_alt_message = message.is_some() || label.is_some();
+                        let is_try = self
+                            .tcx
+                            .sess
+                            .source_map()
+                            .span_to_snippet(span)
+                            .map(|s| &s == "?")
+                            .unwrap_or(false);
+                        let is_from = format!("{}", trait_ref.print_only_trait_path())
+                            .starts_with("std::convert::From<");
+                        let (message, note) = if is_try && is_from {
+                            (
+                                Some(format!(
+                                    "`?` couldn't convert the error to `{}`",
+                                    trait_ref.self_ty(),
+                                )),
+                                Some(
+                                    "the question mark operation (`?`) implicitly performs a \
+                                     conversion on the error value using the `From` trait"
+                                        .to_owned(),
+                                ),
+                            )
+                        } else {
+                            (message, note)
+                        };
+
+                        let mut err = struct_span_err!(
+                            self.tcx.sess,
+                            span,
+                            E0277,
+                            "{}",
+                            message.unwrap_or_else(|| format!(
+                                "the trait bound `{}` is not satisfied{}",
+                                trait_ref.without_const().to_predicate(),
+                                post_message,
+                            ))
+                        );
+
+                        let explanation =
+                            if obligation.cause.code == ObligationCauseCode::MainFunctionType {
+                                "consider using `()`, or a `Result`".to_owned()
+                            } else {
+                                format!(
+                                    "{}the trait `{}` is not implemented for `{}`",
+                                    pre_message,
+                                    trait_ref.print_only_trait_path(),
+                                    trait_ref.self_ty(),
+                                )
+                            };
+
+                        if self.suggest_add_reference_to_arg(
+                            &obligation,
+                            &mut err,
+                            &trait_ref,
+                            points_at_arg,
+                            have_alt_message,
+                        ) {
+                            self.note_obligation_cause(&mut err, obligation);
+                            err.emit();
+                            return;
+                        }
+                        if let Some(ref s) = label {
+                            // If it has a custom `#[rustc_on_unimplemented]`
+                            // error message, let's display it as the label!
+                            err.span_label(span, s.as_str());
+                            err.help(&explanation);
+                        } else {
+                            err.span_label(span, explanation);
+                        }
+                        if let Some((msg, span)) = type_def {
+                            err.span_label(span, &msg);
+                        }
+                        if let Some(ref s) = note {
+                            // If it has a custom `#[rustc_on_unimplemented]` note, let's display it
+                            err.note(s.as_str());
+                        }
+                        if let Some(ref s) = enclosing_scope {
+                            let enclosing_scope_span = tcx.def_span(
+                                tcx.hir()
+                                    .opt_local_def_id(obligation.cause.body_id)
+                                    .unwrap_or_else(|| {
+                                        tcx.hir().body_owner_def_id(hir::BodyId {
+                                            hir_id: obligation.cause.body_id,
+                                        })
+                                    }),
+                            );
+
+                            err.span_label(enclosing_scope_span, s.as_str());
+                        }
+
+                        self.suggest_borrow_on_unsized_slice(&obligation.cause.code, &mut err);
+                        self.suggest_fn_call(&obligation, &mut err, &trait_ref, points_at_arg);
+                        self.suggest_remove_reference(&obligation, &mut err, &trait_ref);
+                        self.suggest_semicolon_removal(&obligation, &mut err, span, &trait_ref);
+                        self.note_version_mismatch(&mut err, &trait_ref);
+                        if self.suggest_impl_trait(&mut err, span, &obligation, &trait_ref) {
+                            err.emit();
+                            return;
+                        }
+
+                        // Try to report a help message
+                        if !trait_ref.has_infer_types_or_consts()
+                            && self.predicate_can_apply(obligation.param_env, trait_ref)
+                        {
+                            // If a where-clause may be useful, remind the
+                            // user that they can add it.
+                            //
+                            // don't display an on-unimplemented note, as
+                            // these notes will often be of the form
+                            //     "the type `T` can't be frobnicated"
+                            // which is somewhat confusing.
+                            self.suggest_restricting_param_bound(
+                                &mut err,
+                                &trait_ref,
+                                obligation.cause.body_id,
+                            );
+                        } else {
+                            if !have_alt_message {
+                                // Can't show anything else useful, try to find similar impls.
+                                let impl_candidates = self.find_similar_impl_candidates(trait_ref);
+                                self.report_similar_impl_candidates(impl_candidates, &mut err);
+                            }
+                            self.suggest_change_mut(
+                                &obligation,
+                                &mut err,
+                                &trait_ref,
+                                points_at_arg,
+                            );
+                        }
+
+                        // If this error is due to `!: Trait` not implemented but `(): Trait` is
+                        // implemented, and fallback has occurred, then it could be due to a
+                        // variable that used to fallback to `()` now falling back to `!`. Issue a
+                        // note informing about the change in behaviour.
+                        if trait_predicate.skip_binder().self_ty().is_never()
+                            && fallback_has_occurred
+                        {
+                            let predicate = trait_predicate.map_bound(|mut trait_pred| {
+                                trait_pred.trait_ref.substs = self.tcx.mk_substs_trait(
+                                    self.tcx.mk_unit(),
+                                    &trait_pred.trait_ref.substs[1..],
+                                );
+                                trait_pred
+                            });
+                            let unit_obligation = Obligation {
+                                predicate: ty::Predicate::Trait(
+                                    predicate,
+                                    hir::Constness::NotConst,
+                                ),
+                                ..obligation.clone()
+                            };
+                            if self.predicate_may_hold(&unit_obligation) {
+                                err.note(
+                                    "the trait is implemented for `()`. \
+                                     Possibly this error has been caused by changes to \
+                                     Rust's type-inference algorithm (see issue #48950 \
+                                     <https://github.com/rust-lang/rust/issues/48950> \
+                                     for more information). Consider whether you meant to use \
+                                     the type `()` here instead.",
+                                );
+                            }
+                        }
+
+                        err
+                    }
+
+                    ty::Predicate::Subtype(ref predicate) => {
+                        // Errors for Subtype predicates show up as
+                        // `FulfillmentErrorCode::CodeSubtypeError`,
+                        // not selection error.
+                        span_bug!(span, "subtype requirement gave wrong error: `{:?}`", predicate)
+                    }
+
+                    ty::Predicate::RegionOutlives(ref predicate) => {
+                        let predicate = self.resolve_vars_if_possible(predicate);
+                        let err = self
+                            .region_outlives_predicate(&obligation.cause, &predicate)
+                            .err()
+                            .unwrap();
+                        struct_span_err!(
+                            self.tcx.sess,
+                            span,
+                            E0279,
+                            "the requirement `{}` is not satisfied (`{}`)",
+                            predicate,
+                            err,
+                        )
+                    }
+
+                    ty::Predicate::Projection(..) | ty::Predicate::TypeOutlives(..) => {
+                        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
+                        struct_span_err!(
+                            self.tcx.sess,
+                            span,
+                            E0280,
+                            "the requirement `{}` is not satisfied",
+                            predicate
+                        )
+                    }
+
+                    ty::Predicate::ObjectSafe(trait_def_id) => {
+                        let violations = self.tcx.object_safety_violations(trait_def_id);
+                        report_object_safety_error(self.tcx, span, trait_def_id, violations)
+                    }
+
+                    ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
+                        let found_kind = self.closure_kind(closure_def_id, closure_substs).unwrap();
+                        let closure_span = self
+                            .tcx
+                            .sess
+                            .source_map()
+                            .def_span(self.tcx.hir().span_if_local(closure_def_id).unwrap());
+                        let hir_id = self.tcx.hir().as_local_hir_id(closure_def_id).unwrap();
+                        let mut err = struct_span_err!(
+                            self.tcx.sess,
+                            closure_span,
+                            E0525,
+                            "expected a closure that implements the `{}` trait, \
+                             but this closure only implements `{}`",
+                            kind,
+                            found_kind
+                        );
+
+                        err.span_label(
+                            closure_span,
+                            format!("this closure implements `{}`, not `{}`", found_kind, kind),
+                        );
+                        err.span_label(
+                            obligation.cause.span,
+                            format!("the requirement to implement `{}` derives from here", kind),
+                        );
+
+                        // Additional context information explaining why the closure only implements
+                        // a particular trait.
+                        if let Some(tables) = self.in_progress_tables {
+                            let tables = tables.borrow();
+                            match (found_kind, tables.closure_kind_origins().get(hir_id)) {
+                                (ty::ClosureKind::FnOnce, Some((span, name))) => {
+                                    err.span_label(
+                                        *span,
+                                        format!(
+                                            "closure is `FnOnce` because it moves the \
+                                         variable `{}` out of its environment",
+                                            name
+                                        ),
+                                    );
+                                }
+                                (ty::ClosureKind::FnMut, Some((span, name))) => {
+                                    err.span_label(
+                                        *span,
+                                        format!(
+                                            "closure is `FnMut` because it mutates the \
+                                         variable `{}` here",
+                                            name
+                                        ),
+                                    );
+                                }
+                                _ => {}
+                            }
+                        }
+
+                        err.emit();
+                        return;
+                    }
+
+                    ty::Predicate::WellFormed(ty) => {
+                        // WF predicates cannot themselves make
+                        // errors. They can only block due to
+                        // ambiguity; otherwise, they always
+                        // degenerate into other obligations
+                        // (which may fail).
+                        span_bug!(span, "WF predicate not satisfied for {:?}", ty);
+                    }
+
+                    ty::Predicate::ConstEvaluatable(..) => {
+                        // Errors for `ConstEvaluatable` predicates show up as
+                        // `SelectionError::ConstEvalFailure`,
+                        // not `Unimplemented`.
+                        span_bug!(
+                            span,
+                            "const-evaluatable requirement gave wrong error: `{:?}`",
+                            obligation
+                        )
+                    }
+                }
+            }
+
+            OutputTypeParameterMismatch(ref found_trait_ref, ref expected_trait_ref, _) => {
+                let found_trait_ref = self.resolve_vars_if_possible(&*found_trait_ref);
+                let expected_trait_ref = self.resolve_vars_if_possible(&*expected_trait_ref);
+
+                if expected_trait_ref.self_ty().references_error() {
+                    return;
+                }
+
+                let found_trait_ty = found_trait_ref.self_ty();
+
+                let found_did = match found_trait_ty.kind {
+                    ty::Closure(did, _) | ty::Foreign(did) | ty::FnDef(did, _) => Some(did),
+                    ty::Adt(def, _) => Some(def.did),
+                    _ => None,
+                };
+
+                let found_span = found_did
+                    .and_then(|did| self.tcx.hir().span_if_local(did))
+                    .map(|sp| self.tcx.sess.source_map().def_span(sp)); // the sp could be an fn def
+
+                if self.reported_closure_mismatch.borrow().contains(&(span, found_span)) {
+                    // We check closures twice, with obligations flowing in different directions,
+                    // but we want to complain about them only once.
+                    return;
+                }
+
+                self.reported_closure_mismatch.borrow_mut().insert((span, found_span));
+
+                let found = match found_trait_ref.skip_binder().substs.type_at(1).kind {
+                    ty::Tuple(ref tys) => vec![ArgKind::empty(); tys.len()],
+                    _ => vec![ArgKind::empty()],
+                };
+
+                let expected_ty = expected_trait_ref.skip_binder().substs.type_at(1);
+                let expected = match expected_ty.kind {
+                    ty::Tuple(ref tys) => tys
+                        .iter()
+                        .map(|t| ArgKind::from_expected_ty(t.expect_ty(), Some(span)))
+                        .collect(),
+                    _ => vec![ArgKind::Arg("_".to_owned(), expected_ty.to_string())],
+                };
+
+                if found.len() == expected.len() {
+                    self.report_closure_arg_mismatch(
+                        span,
+                        found_span,
+                        found_trait_ref,
+                        expected_trait_ref,
+                    )
+                } else {
+                    let (closure_span, found) = found_did
+                        .and_then(|did| self.tcx.hir().get_if_local(did))
+                        .map(|node| {
+                            let (found_span, found) = self.get_fn_like_arguments(node);
+                            (Some(found_span), found)
+                        })
+                        .unwrap_or((found_span, found));
+
+                    self.report_arg_count_mismatch(
+                        span,
+                        closure_span,
+                        expected,
+                        found,
+                        found_trait_ty.is_closure(),
+                    )
+                }
+            }
+
+            TraitNotObjectSafe(did) => {
+                let violations = self.tcx.object_safety_violations(did);
+                report_object_safety_error(self.tcx, span, did, violations)
+            }
+
+            ConstEvalFailure(ErrorHandled::TooGeneric) => {
+                // In this instance, we have a const expression containing an unevaluated
+                // generic parameter. We have no idea whether this expression is valid or
+                // not (e.g. it might result in an error), but we don't want to just assume
+                // that it's okay, because that might result in post-monomorphisation time
+                // errors. The onus is really on the caller to provide values that it can
+                // prove are well-formed.
+                let mut err = self
+                    .tcx
+                    .sess
+                    .struct_span_err(span, "constant expression depends on a generic parameter");
+                // FIXME(const_generics): we should suggest to the user how they can resolve this
+                // issue. However, this is currently not actually possible
+                // (see https://github.com/rust-lang/rust/issues/66962#issuecomment-575907083).
+                err.note("this may fail depending on what value the parameter takes");
+                err
+            }
+
+            // Already reported in the query.
+            ConstEvalFailure(ErrorHandled::Reported) => {
+                self.tcx.sess.delay_span_bug(span, "constant in type had an ignored error");
+                return;
+            }
+
+            Overflow => {
+                bug!("overflow should be handled before the `report_selection_error` path");
+            }
+        };
+
+        self.note_obligation_cause(&mut err, obligation);
+        self.point_at_returns_when_relevant(&mut err, &obligation);
+
+        err.emit();
+    }
+
+    /// If the `Self` type of the unsatisfied trait `trait_ref` implements a trait
+    /// with the same path as `trait_ref`, a help message about
+    /// a probable version mismatch is added to `err`
+    fn note_version_mismatch(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        trait_ref: &ty::PolyTraitRef<'tcx>,
+    ) {
+        let get_trait_impl = |trait_def_id| {
+            let mut trait_impl = None;
+            self.tcx.for_each_relevant_impl(trait_def_id, trait_ref.self_ty(), |impl_def_id| {
+                if trait_impl.is_none() {
+                    trait_impl = Some(impl_def_id);
+                }
+            });
+            trait_impl
+        };
+        let required_trait_path = self.tcx.def_path_str(trait_ref.def_id());
+        let all_traits = self.tcx.all_traits(LOCAL_CRATE);
+        let traits_with_same_path: std::collections::BTreeSet<_> = all_traits
+            .iter()
+            .filter(|trait_def_id| **trait_def_id != trait_ref.def_id())
+            .filter(|trait_def_id| self.tcx.def_path_str(**trait_def_id) == required_trait_path)
+            .collect();
+        for trait_with_same_path in traits_with_same_path {
+            if let Some(impl_def_id) = get_trait_impl(*trait_with_same_path) {
+                let impl_span = self.tcx.def_span(impl_def_id);
+                err.span_help(impl_span, "trait impl with same name found");
+                let trait_crate = self.tcx.crate_name(trait_with_same_path.krate);
+                let crate_msg = format!(
+                    "perhaps two different versions of crate `{}` are being used?",
+                    trait_crate
+                );
+                err.note(&crate_msg);
+            }
+        }
+    }
+
+    fn mk_obligation_for_def_id(
+        &self,
+        def_id: DefId,
+        output_ty: Ty<'tcx>,
+        cause: ObligationCause<'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
+    ) -> PredicateObligation<'tcx> {
+        let new_trait_ref =
+            ty::TraitRef { def_id, substs: self.tcx.mk_substs_trait(output_ty, &[]) };
+        Obligation::new(cause, param_env, new_trait_ref.without_const().to_predicate())
+    }
+}
+
+pub fn recursive_type_with_infinite_size_error(
+    tcx: TyCtxt<'tcx>,
+    type_def_id: DefId,
+) -> DiagnosticBuilder<'tcx> {
+    assert!(type_def_id.is_local());
+    let span = tcx.hir().span_if_local(type_def_id).unwrap();
+    let span = tcx.sess.source_map().def_span(span);
+    let mut err = struct_span_err!(
+        tcx.sess,
+        span,
+        E0072,
+        "recursive type `{}` has infinite size",
+        tcx.def_path_str(type_def_id)
+    );
+    err.span_label(span, "recursive type has infinite size");
+    err.help(&format!(
+        "insert indirection (e.g., a `Box`, `Rc`, or `&`) \
+                           at some point to make `{}` representable",
+        tcx.def_path_str(type_def_id)
+    ));
+    err
+}
+
+pub fn report_object_safety_error(
+    tcx: TyCtxt<'tcx>,
+    span: Span,
+    trait_def_id: DefId,
+    violations: Vec<ObjectSafetyViolation>,
+) -> DiagnosticBuilder<'tcx> {
+    let trait_str = tcx.def_path_str(trait_def_id);
+    let trait_span = tcx.hir().get_if_local(trait_def_id).and_then(|node| match node {
+        hir::Node::Item(item) => Some(item.ident.span),
+        _ => None,
+    });
+    let span = tcx.sess.source_map().def_span(span);
+    let mut err = struct_span_err!(
+        tcx.sess,
+        span,
+        E0038,
+        "the trait `{}` cannot be made into an object",
+        trait_str
+    );
+    err.span_label(span, format!("the trait `{}` cannot be made into an object", trait_str));
+
+    let mut reported_violations = FxHashSet::default();
+    let mut had_span_label = false;
+    for violation in violations {
+        if let ObjectSafetyViolation::SizedSelf(sp) = &violation {
+            if !sp.is_empty() {
+                // Do not report `SizedSelf` without spans pointing at `SizedSelf` obligations
+                // with a `Span`.
+                reported_violations.insert(ObjectSafetyViolation::SizedSelf(vec![].into()));
+            }
+        }
+        if reported_violations.insert(violation.clone()) {
+            let spans = violation.spans();
+            let msg = if trait_span.is_none() || spans.is_empty() {
+                format!("the trait cannot be made into an object because {}", violation.error_msg())
+            } else {
+                had_span_label = true;
+                format!("...because {}", violation.error_msg())
+            };
+            if spans.is_empty() {
+                err.note(&msg);
+            } else {
+                for span in spans {
+                    err.span_label(span, &msg);
+                }
+            }
+            match (trait_span, violation.solution()) {
+                (Some(_), Some((note, None))) => {
+                    err.help(&note);
+                }
+                (Some(_), Some((note, Some((sugg, span))))) => {
+                    err.span_suggestion(span, &note, sugg, Applicability::MachineApplicable);
+                }
+                // Only provide the help if its a local trait, otherwise it's not actionable.
+                _ => {}
+            }
+        }
+    }
+    if let (Some(trait_span), true) = (trait_span, had_span_label) {
+        err.span_label(trait_span, "this trait cannot be made into an object...");
+    }
+
+    if tcx.sess.trait_methods_not_found.borrow().contains(&span) {
+        // Avoid emitting error caused by non-existing method (#58734)
+        err.cancel();
+    }
+
+    err
+}
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    fn maybe_report_ambiguity(
+        &self,
+        obligation: &PredicateObligation<'tcx>,
+        body_id: Option<hir::BodyId>,
+    ) {
+        // Unable to successfully determine, probably means
+        // insufficient type information, but could mean
+        // ambiguous impls. The latter *ought* to be a
+        // coherence violation, so we don't report it here.
+
+        let predicate = self.resolve_vars_if_possible(&obligation.predicate);
+        let span = obligation.cause.span;
+
+        debug!(
+            "maybe_report_ambiguity(predicate={:?}, obligation={:?} body_id={:?}, code={:?})",
+            predicate, obligation, body_id, obligation.cause.code,
+        );
+
+        // Ambiguity errors are often caused as fallout from earlier
+        // errors. So just ignore them if this infcx is tainted.
+        if self.is_tainted_by_errors() {
+            return;
+        }
+
+        let mut err = match predicate {
+            ty::Predicate::Trait(ref data, _) => {
+                let trait_ref = data.to_poly_trait_ref();
+                let self_ty = trait_ref.self_ty();
+                debug!("self_ty {:?} {:?} trait_ref {:?}", self_ty, self_ty.kind, trait_ref);
+
+                if predicate.references_error() {
+                    return;
+                }
+                // Typically, this ambiguity should only happen if
+                // there are unresolved type inference variables
+                // (otherwise it would suggest a coherence
+                // failure). But given #21974 that is not necessarily
+                // the case -- we can have multiple where clauses that
+                // are only distinguished by a region, which results
+                // in an ambiguity even when all types are fully
+                // known, since we don't dispatch based on region
+                // relationships.
+
+                // This is kind of a hack: it frequently happens that some earlier
+                // error prevents types from being fully inferred, and then we get
+                // a bunch of uninteresting errors saying something like "<generic
+                // #0> doesn't implement Sized".  It may even be true that we
+                // could just skip over all checks where the self-ty is an
+                // inference variable, but I was afraid that there might be an
+                // inference variable created, registered as an obligation, and
+                // then never forced by writeback, and hence by skipping here we'd
+                // be ignoring the fact that we don't KNOW the type works
+                // out. Though even that would probably be harmless, given that
+                // we're only talking about builtin traits, which are known to be
+                // inhabited. We used to check for `self.tcx.sess.has_errors()` to
+                // avoid inundating the user with unnecessary errors, but we now
+                // check upstream for type errors and don't add the obligations to
+                // begin with in those cases.
+                if self
+                    .tcx
+                    .lang_items()
+                    .sized_trait()
+                    .map_or(false, |sized_id| sized_id == trait_ref.def_id())
+                {
+                    self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0282).emit();
+                    return;
+                }
+                let mut err = self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0283);
+                err.note(&format!("cannot resolve `{}`", predicate));
+                if let ObligationCauseCode::ItemObligation(def_id) = obligation.cause.code {
+                    self.suggest_fully_qualified_path(&mut err, def_id, span, trait_ref.def_id());
+                } else if let (
+                    Ok(ref snippet),
+                    ObligationCauseCode::BindingObligation(ref def_id, _),
+                ) =
+                    (self.tcx.sess.source_map().span_to_snippet(span), &obligation.cause.code)
+                {
+                    let generics = self.tcx.generics_of(*def_id);
+                    if !generics.params.is_empty() && !snippet.ends_with('>') {
+                        // FIXME: To avoid spurious suggestions in functions where type arguments
+                        // where already supplied, we check the snippet to make sure it doesn't
+                        // end with a turbofish. Ideally we would have access to a `PathSegment`
+                        // instead. Otherwise we would produce the following output:
+                        //
+                        // error[E0283]: type annotations needed
+                        //   --> $DIR/issue-54954.rs:3:24
+                        //    |
+                        // LL | const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
+                        //    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^
+                        //    |                        |
+                        //    |                        cannot infer type
+                        //    |                        help: consider specifying the type argument
+                        //    |                        in the function call:
+                        //    |                        `Tt::const_val::<[i8; 123]>::<T>`
+                        // ...
+                        // LL |     const fn const_val<T: Sized>() -> usize {
+                        //    |              --------- - required by this bound in `Tt::const_val`
+                        //    |
+                        //    = note: cannot resolve `_: Tt`
+
+                        err.span_suggestion(
+                            span,
+                            &format!(
+                                "consider specifying the type argument{} in the function call",
+                                if generics.params.len() > 1 { "s" } else { "" },
+                            ),
+                            format!(
+                                "{}::<{}>",
+                                snippet,
+                                generics
+                                    .params
+                                    .iter()
+                                    .map(|p| p.name.to_string())
+                                    .collect::<Vec<String>>()
+                                    .join(", ")
+                            ),
+                            Applicability::HasPlaceholders,
+                        );
+                    }
+                }
+                err
+            }
+
+            ty::Predicate::WellFormed(ty) => {
+                // Same hacky approach as above to avoid deluging user
+                // with error messages.
+                if ty.references_error() || self.tcx.sess.has_errors() {
+                    return;
+                }
+                self.need_type_info_err(body_id, span, ty, ErrorCode::E0282)
+            }
+
+            ty::Predicate::Subtype(ref data) => {
+                if data.references_error() || self.tcx.sess.has_errors() {
+                    // no need to overload user in such cases
+                    return;
+                }
+                let &SubtypePredicate { a_is_expected: _, a, b } = data.skip_binder();
+                // both must be type variables, or the other would've been instantiated
+                assert!(a.is_ty_var() && b.is_ty_var());
+                self.need_type_info_err(body_id, span, a, ErrorCode::E0282)
+            }
+            ty::Predicate::Projection(ref data) => {
+                let trait_ref = data.to_poly_trait_ref(self.tcx);
+                let self_ty = trait_ref.self_ty();
+                if predicate.references_error() {
+                    return;
+                }
+                let mut err = self.need_type_info_err(body_id, span, self_ty, ErrorCode::E0284);
+                err.note(&format!("cannot resolve `{}`", predicate));
+                err
+            }
+
+            _ => {
+                if self.tcx.sess.has_errors() {
+                    return;
+                }
+                let mut err = struct_span_err!(
+                    self.tcx.sess,
+                    span,
+                    E0284,
+                    "type annotations needed: cannot resolve `{}`",
+                    predicate,
+                );
+                err.span_label(span, &format!("cannot resolve `{}`", predicate));
+                err
+            }
+        };
+        self.note_obligation_cause(&mut err, obligation);
+        err.emit();
+    }
+
+    /// Returns `true` if the trait predicate may apply for *some* assignment
+    /// to the type parameters.
+    fn predicate_can_apply(
+        &self,
+        param_env: ty::ParamEnv<'tcx>,
+        pred: ty::PolyTraitRef<'tcx>,
+    ) -> bool {
+        struct ParamToVarFolder<'a, 'tcx> {
+            infcx: &'a InferCtxt<'a, 'tcx>,
+            var_map: FxHashMap<Ty<'tcx>, Ty<'tcx>>,
+        }
+
+        impl<'a, 'tcx> TypeFolder<'tcx> for ParamToVarFolder<'a, 'tcx> {
+            fn tcx<'b>(&'b self) -> TyCtxt<'tcx> {
+                self.infcx.tcx
+            }
+
+            fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
+                if let ty::Param(ty::ParamTy { name, .. }) = ty.kind {
+                    let infcx = self.infcx;
+                    self.var_map.entry(ty).or_insert_with(|| {
+                        infcx.next_ty_var(TypeVariableOrigin {
+                            kind: TypeVariableOriginKind::TypeParameterDefinition(name, None),
+                            span: DUMMY_SP,
+                        })
+                    })
+                } else {
+                    ty.super_fold_with(self)
+                }
+            }
+        }
+
+        self.probe(|_| {
+            let mut selcx = SelectionContext::new(self);
+
+            let cleaned_pred =
+                pred.fold_with(&mut ParamToVarFolder { infcx: self, var_map: Default::default() });
+
+            let cleaned_pred = super::project::normalize(
+                &mut selcx,
+                param_env,
+                ObligationCause::dummy(),
+                &cleaned_pred,
+            )
+            .value;
+
+            let obligation = Obligation::new(
+                ObligationCause::dummy(),
+                param_env,
+                cleaned_pred.without_const().to_predicate(),
+            );
+
+            self.predicate_may_hold(&obligation)
+        })
+    }
+
+    fn note_obligation_cause(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        obligation: &PredicateObligation<'tcx>,
+    ) {
+        // First, attempt to add note to this error with an async-await-specific
+        // message, and fall back to regular note otherwise.
+        if !self.maybe_note_obligation_cause_for_async_await(err, obligation) {
+            self.note_obligation_cause_code(
+                err,
+                &obligation.predicate,
+                &obligation.cause.code,
+                &mut vec![],
+            );
+            self.suggest_unsized_bound_if_applicable(err, obligation);
+        }
+    }
+
+    fn suggest_unsized_bound_if_applicable(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        obligation: &PredicateObligation<'tcx>,
+    ) {
+        if let (
+            ty::Predicate::Trait(pred, _),
+            ObligationCauseCode::BindingObligation(item_def_id, span),
+        ) = (&obligation.predicate, &obligation.cause.code)
+        {
+            if let (Some(generics), true) = (
+                self.tcx.hir().get_if_local(*item_def_id).as_ref().and_then(|n| n.generics()),
+                Some(pred.def_id()) == self.tcx.lang_items().sized_trait(),
+            ) {
+                for param in generics.params {
+                    if param.span == *span
+                        && !param.bounds.iter().any(|bound| {
+                            bound.trait_def_id() == self.tcx.lang_items().sized_trait()
+                        })
+                    {
+                        let (span, separator) = match param.bounds {
+                            [] => (span.shrink_to_hi(), ":"),
+                            [.., bound] => (bound.span().shrink_to_hi(), " + "),
+                        };
+                        err.span_suggestion(
+                            span,
+                            "consider relaxing the implicit `Sized` restriction",
+                            format!("{} ?Sized", separator),
+                            Applicability::MachineApplicable,
+                        );
+                        return;
+                    }
+                }
+            }
+        }
+    }
+
+    fn is_recursive_obligation(
+        &self,
+        obligated_types: &mut Vec<&ty::TyS<'tcx>>,
+        cause_code: &ObligationCauseCode<'tcx>,
+    ) -> bool {
+        if let ObligationCauseCode::BuiltinDerivedObligation(ref data) = cause_code {
+            let parent_trait_ref = self.resolve_vars_if_possible(&data.parent_trait_ref);
+
+            if obligated_types.iter().any(|ot| ot == &parent_trait_ref.skip_binder().self_ty()) {
+                return true;
+            }
+        }
+        false
+    }
+}
+
+/// Summarizes information
+#[derive(Clone)]
+pub enum ArgKind {
+    /// An argument of non-tuple type. Parameters are (name, ty)
+    Arg(String, String),
+
+    /// An argument of tuple type. For a "found" argument, the span is
+    /// the locationo in the source of the pattern. For a "expected"
+    /// argument, it will be None. The vector is a list of (name, ty)
+    /// strings for the components of the tuple.
+    Tuple(Option<Span>, Vec<(String, String)>),
+}
+
+impl ArgKind {
+    fn empty() -> ArgKind {
+        ArgKind::Arg("_".to_owned(), "_".to_owned())
+    }
+
+    /// Creates an `ArgKind` from the expected type of an
+    /// argument. It has no name (`_`) and an optional source span.
+    pub fn from_expected_ty(t: Ty<'_>, span: Option<Span>) -> ArgKind {
+        match t.kind {
+            ty::Tuple(ref tys) => ArgKind::Tuple(
+                span,
+                tys.iter().map(|ty| ("_".to_owned(), ty.to_string())).collect::<Vec<_>>(),
+            ),
+            _ => ArgKind::Arg("_".to_owned(), t.to_string()),
+        }
+    }
+}
+
+/// Suggest restricting a type param with a new bound.
+pub fn suggest_constraining_type_param(
+    tcx: TyCtxt<'_>,
+    generics: &hir::Generics<'_>,
+    err: &mut DiagnosticBuilder<'_>,
+    param_name: &str,
+    constraint: &str,
+    source_map: &SourceMap,
+    span: Span,
+    def_id: Option<DefId>,
+) -> bool {
+    const MSG_RESTRICT_BOUND_FURTHER: &str = "consider further restricting this bound with";
+    const MSG_RESTRICT_TYPE: &str = "consider restricting this type parameter with";
+    const MSG_RESTRICT_TYPE_FURTHER: &str = "consider further restricting this type parameter with";
+
+    let param = generics.params.iter().find(|p| p.name.ident().as_str() == param_name);
+
+    let param = if let Some(param) = param {
+        param
+    } else {
+        return false;
+    };
+
+    if def_id == tcx.lang_items().sized_trait() {
+        // Type parameters are already `Sized` by default.
+        err.span_label(param.span, &format!("this type parameter needs to be `{}`", constraint));
+        return true;
+    }
+
+    if param_name.starts_with("impl ") {
+        // If there's an `impl Trait` used in argument position, suggest
+        // restricting it:
+        //
+        //   fn foo(t: impl Foo) { ... }
+        //             --------
+        //             |
+        //             help: consider further restricting this bound with `+ Bar`
+        //
+        // Suggestion for tools in this case is:
+        //
+        //   fn foo(t: impl Foo) { ... }
+        //             --------
+        //             |
+        //             replace with: `impl Foo + Bar`
+
+        err.span_help(param.span, &format!("{} `+ {}`", MSG_RESTRICT_BOUND_FURTHER, constraint));
+
+        err.tool_only_span_suggestion(
+            param.span,
+            MSG_RESTRICT_BOUND_FURTHER,
+            format!("{} + {}", param_name, constraint),
+            Applicability::MachineApplicable,
+        );
+
+        return true;
+    }
+
+    if generics.where_clause.predicates.is_empty() {
+        if let Some(bounds_span) = param.bounds_span() {
+            // If user has provided some bounds, suggest restricting them:
+            //
+            //   fn foo<T: Foo>(t: T) { ... }
+            //             ---
+            //             |
+            //             help: consider further restricting this bound with `+ Bar`
+            //
+            // Suggestion for tools in this case is:
+            //
+            //   fn foo<T: Foo>(t: T) { ... }
+            //          --
+            //          |
+            //          replace with: `T: Bar +`
+
+            err.span_help(
+                bounds_span,
+                &format!("{} `+ {}`", MSG_RESTRICT_BOUND_FURTHER, constraint),
+            );
+
+            let span_hi = param.span.with_hi(span.hi());
+            let span_with_colon = source_map.span_through_char(span_hi, ':');
+
+            if span_hi != param.span && span_with_colon != span_hi {
+                err.tool_only_span_suggestion(
+                    span_with_colon,
+                    MSG_RESTRICT_BOUND_FURTHER,
+                    format!("{}: {} + ", param_name, constraint),
+                    Applicability::MachineApplicable,
+                );
+            }
+        } else {
+            // If user hasn't provided any bounds, suggest adding a new one:
+            //
+            //   fn foo<T>(t: T) { ... }
+            //          - help: consider restricting this type parameter with `T: Foo`
+
+            err.span_help(
+                param.span,
+                &format!("{} `{}: {}`", MSG_RESTRICT_TYPE, param_name, constraint),
+            );
+
+            err.tool_only_span_suggestion(
+                param.span,
+                MSG_RESTRICT_TYPE,
+                format!("{}: {}", param_name, constraint),
+                Applicability::MachineApplicable,
+            );
+        }
+
+        true
+    } else {
+        // This part is a bit tricky, because using the `where` clause user can
+        // provide zero, one or many bounds for the same type parameter, so we
+        // have following cases to consider:
+        //
+        // 1) When the type parameter has been provided zero bounds
+        //
+        //    Message:
+        //      fn foo<X, Y>(x: X, y: Y) where Y: Foo { ... }
+        //             - help: consider restricting this type parameter with `where X: Bar`
+        //
+        //    Suggestion:
+        //      fn foo<X, Y>(x: X, y: Y) where Y: Foo { ... }
+        //                                           - insert: `, X: Bar`
+        //
+        //
+        // 2) When the type parameter has been provided one bound
+        //
+        //    Message:
+        //      fn foo<T>(t: T) where T: Foo { ... }
+        //                            ^^^^^^
+        //                            |
+        //                            help: consider further restricting this bound with `+ Bar`
+        //
+        //    Suggestion:
+        //      fn foo<T>(t: T) where T: Foo { ... }
+        //                            ^^
+        //                            |
+        //                            replace with: `T: Bar +`
+        //
+        //
+        // 3) When the type parameter has been provided many bounds
+        //
+        //    Message:
+        //      fn foo<T>(t: T) where T: Foo, T: Bar {... }
+        //             - help: consider further restricting this type parameter with `where T: Zar`
+        //
+        //    Suggestion:
+        //      fn foo<T>(t: T) where T: Foo, T: Bar {... }
+        //                                          - insert: `, T: Zar`
+
+        let mut param_spans = Vec::new();
+
+        for predicate in generics.where_clause.predicates {
+            if let WherePredicate::BoundPredicate(WhereBoundPredicate {
+                span, bounded_ty, ..
+            }) = predicate
+            {
+                if let TyKind::Path(QPath::Resolved(_, path)) = &bounded_ty.kind {
+                    if let Some(segment) = path.segments.first() {
+                        if segment.ident.to_string() == param_name {
+                            param_spans.push(span);
+                        }
+                    }
+                }
+            }
+        }
+
+        let where_clause_span =
+            generics.where_clause.span_for_predicates_or_empty_place().shrink_to_hi();
+
+        match &param_spans[..] {
+            &[] => {
+                err.span_help(
+                    param.span,
+                    &format!("{} `where {}: {}`", MSG_RESTRICT_TYPE, param_name, constraint),
+                );
+
+                err.tool_only_span_suggestion(
+                    where_clause_span,
+                    MSG_RESTRICT_TYPE,
+                    format!(", {}: {}", param_name, constraint),
+                    Applicability::MachineApplicable,
+                );
+            }
+
+            &[&param_span] => {
+                err.span_help(
+                    param_span,
+                    &format!("{} `+ {}`", MSG_RESTRICT_BOUND_FURTHER, constraint),
+                );
+
+                let span_hi = param_span.with_hi(span.hi());
+                let span_with_colon = source_map.span_through_char(span_hi, ':');
+
+                if span_hi != param_span && span_with_colon != span_hi {
+                    err.tool_only_span_suggestion(
+                        span_with_colon,
+                        MSG_RESTRICT_BOUND_FURTHER,
+                        format!("{}: {} +", param_name, constraint),
+                        Applicability::MachineApplicable,
+                    );
+                }
+            }
+
+            _ => {
+                err.span_help(
+                    param.span,
+                    &format!(
+                        "{} `where {}: {}`",
+                        MSG_RESTRICT_TYPE_FURTHER, param_name, constraint,
+                    ),
+                );
+
+                err.tool_only_span_suggestion(
+                    where_clause_span,
+                    MSG_RESTRICT_BOUND_FURTHER,
+                    format!(", {}: {}", param_name, constraint),
+                    Applicability::MachineApplicable,
+                );
+            }
+        }
+
+        true
+    }
+}
diff --git a/src/librustc_infer/traits/error_reporting/on_unimplemented.rs b/src/librustc_infer/traits/error_reporting/on_unimplemented.rs
new file mode 100644
index 0000000000..87c1107bd4
--- /dev/null
+++ b/src/librustc_infer/traits/error_reporting/on_unimplemented.rs
@@ -0,0 +1,223 @@
+use super::{
+    ObligationCauseCode, OnUnimplementedDirective, OnUnimplementedNote, PredicateObligation,
+};
+use crate::infer::InferCtxt;
+use rustc::ty::subst::Subst;
+use rustc::ty::{self, GenericParamDefKind};
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_span::symbol::sym;
+
+impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
+    fn impl_similar_to(
+        &self,
+        trait_ref: ty::PolyTraitRef<'tcx>,
+        obligation: &PredicateObligation<'tcx>,
+    ) -> Option<DefId> {
+        let tcx = self.tcx;
+        let param_env = obligation.param_env;
+        let trait_ref = tcx.erase_late_bound_regions(&trait_ref);
+        let trait_self_ty = trait_ref.self_ty();
+
+        let mut self_match_impls = vec![];
+        let mut fuzzy_match_impls = vec![];
+
+        self.tcx.for_each_relevant_impl(trait_ref.def_id, trait_self_ty, |def_id| {
+            let impl_substs = self.fresh_substs_for_item(obligation.cause.span, def_id);
+            let impl_trait_ref = tcx.impl_trait_ref(def_id).unwrap().subst(tcx, impl_substs);
+
+            let impl_self_ty = impl_trait_ref.self_ty();
+
+            if let Ok(..) = self.can_eq(param_env, trait_self_ty, impl_self_ty) {
+                self_match_impls.push(def_id);
+
+                if trait_ref
+                    .substs
+                    .types()
+                    .skip(1)
+                    .zip(impl_trait_ref.substs.types().skip(1))
+                    .all(|(u, v)| self.fuzzy_match_tys(u, v))
+                {
+                    fuzzy_match_impls.push(def_id);
+                }
+            }
+        });
+
+        let impl_def_id = if self_match_impls.len() == 1 {
+            self_match_impls[0]
+        } else if fuzzy_match_impls.len() == 1 {
+            fuzzy_match_impls[0]
+        } else {
+            return None;
+        };
+
+        tcx.has_attr(impl_def_id, sym::rustc_on_unimplemented).then_some(impl_def_id)
+    }
+
+    /// Used to set on_unimplemented's `ItemContext`
+    /// to be the enclosing (async) block/function/closure
+    fn describe_enclosure(&self, hir_id: hir::HirId) -> Option<&'static str> {
+        let hir = &self.tcx.hir();
+        let node = hir.find(hir_id)?;
+        match &node {
+            hir::Node::Item(hir::Item { kind: hir::ItemKind::Fn(sig, _, body_id), .. }) => {
+                self.describe_generator(*body_id).or_else(|| {
+                    Some(if let hir::FnHeader { asyncness: hir::IsAsync::Async, .. } = sig.header {
+                        "an async function"
+                    } else {
+                        "a function"
+                    })
+                })
+            }
+            hir::Node::TraitItem(hir::TraitItem {
+                kind: hir::TraitItemKind::Method(_, hir::TraitMethod::Provided(body_id)),
+                ..
+            }) => self.describe_generator(*body_id).or_else(|| Some("a trait method")),
+            hir::Node::ImplItem(hir::ImplItem {
+                kind: hir::ImplItemKind::Method(sig, body_id),
+                ..
+            }) => self.describe_generator(*body_id).or_else(|| {
+                Some(if let hir::FnHeader { asyncness: hir::IsAsync::Async, .. } = sig.header {
+                    "an async method"
+                } else {
+                    "a method"
+                })
+            }),
+            hir::Node::Expr(hir::Expr {
+                kind: hir::ExprKind::Closure(_is_move, _, body_id, _, gen_movability),
+                ..
+            }) => self.describe_generator(*body_id).or_else(|| {
+                Some(if gen_movability.is_some() { "an async closure" } else { "a closure" })
+            }),
+            hir::Node::Expr(hir::Expr { .. }) => {
+                let parent_hid = hir.get_parent_node(hir_id);
+                if parent_hid != hir_id {
+                    return self.describe_enclosure(parent_hid);
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        }
+    }
+
+    crate fn on_unimplemented_note(
+        &self,
+        trait_ref: ty::PolyTraitRef<'tcx>,
+        obligation: &PredicateObligation<'tcx>,
+    ) -> OnUnimplementedNote {
+        let def_id =
+            self.impl_similar_to(trait_ref, obligation).unwrap_or_else(|| trait_ref.def_id());
+        let trait_ref = *trait_ref.skip_binder();
+
+        let mut flags = vec![];
+        flags.push((
+            sym::item_context,
+            self.describe_enclosure(obligation.cause.body_id).map(|s| s.to_owned()),
+        ));
+
+        match obligation.cause.code {
+            ObligationCauseCode::BuiltinDerivedObligation(..)
+            | ObligationCauseCode::ImplDerivedObligation(..) => {}
+            _ => {
+                // this is a "direct", user-specified, rather than derived,
+                // obligation.
+                flags.push((sym::direct, None));
+            }
+        }
+
+        if let ObligationCauseCode::ItemObligation(item) = obligation.cause.code {
+            // FIXME: maybe also have some way of handling methods
+            // from other traits? That would require name resolution,
+            // which we might want to be some sort of hygienic.
+            //
+            // Currently I'm leaving it for what I need for `try`.
+            if self.tcx.trait_of_item(item) == Some(trait_ref.def_id) {
+                let method = self.tcx.item_name(item);
+                flags.push((sym::from_method, None));
+                flags.push((sym::from_method, Some(method.to_string())));
+            }
+        }
+        if let Some((t, _)) = self.get_parent_trait_ref(&obligation.cause.code) {
+            flags.push((sym::parent_trait, Some(t)));
+        }
+
+        if let Some(k) = obligation.cause.span.desugaring_kind() {
+            flags.push((sym::from_desugaring, None));
+            flags.push((sym::from_desugaring, Some(format!("{:?}", k))));
+        }
+        let generics = self.tcx.generics_of(def_id);
+        let self_ty = trait_ref.self_ty();
+        // This is also included through the generics list as `Self`,
+        // but the parser won't allow you to use it
+        flags.push((sym::_Self, Some(self_ty.to_string())));
+        if let Some(def) = self_ty.ty_adt_def() {
+            // We also want to be able to select self's original
+            // signature with no type arguments resolved
+            flags.push((sym::_Self, Some(self.tcx.type_of(def.did).to_string())));
+        }
+
+        for param in generics.params.iter() {
+            let value = match param.kind {
+                GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => {
+                    trait_ref.substs[param.index as usize].to_string()
+                }
+                GenericParamDefKind::Lifetime => continue,
+            };
+            let name = param.name;
+            flags.push((name, Some(value)));
+        }
+
+        if let Some(true) = self_ty.ty_adt_def().map(|def| def.did.is_local()) {
+            flags.push((sym::crate_local, None));
+        }
+
+        // Allow targeting all integers using `{integral}`, even if the exact type was resolved
+        if self_ty.is_integral() {
+            flags.push((sym::_Self, Some("{integral}".to_owned())));
+        }
+
+        if let ty::Array(aty, len) = self_ty.kind {
+            flags.push((sym::_Self, Some("[]".to_owned())));
+            flags.push((sym::_Self, Some(format!("[{}]", aty))));
+            if let Some(def) = aty.ty_adt_def() {
+                // We also want to be able to select the array's type's original
+                // signature with no type arguments resolved
+                flags.push((
+                    sym::_Self,
+                    Some(format!("[{}]", self.tcx.type_of(def.did).to_string())),
+                ));
+                let tcx = self.tcx;
+                if let Some(len) = len.try_eval_usize(tcx, ty::ParamEnv::empty()) {
+                    flags.push((
+                        sym::_Self,
+                        Some(format!("[{}; {}]", self.tcx.type_of(def.did).to_string(), len)),
+                    ));
+                } else {
+                    flags.push((
+                        sym::_Self,
+                        Some(format!("[{}; _]", self.tcx.type_of(def.did).to_string())),
+                    ));
+                }
+            }
+        }
+        if let ty::Dynamic(traits, _) = self_ty.kind {
+            for t in *traits.skip_binder() {
+                match t {
+                    ty::ExistentialPredicate::Trait(trait_ref) => {
+                        flags.push((sym::_Self, Some(self.tcx.def_path_str(trait_ref.def_id))))
+                    }
+                    _ => {}
+                }
+            }
+        }
+
+        if let Ok(Some(command)) =
+            OnUnimplementedDirective::of_item(self.tcx, trait_ref.def_id, def_id)
+        {
+            command.evaluate(self.tcx, trait_ref, &flags[..])
+        } else {
+            OnUnimplementedNote::default()
+        }
+    }
+}
diff --git a/src/librustc/traits/error_reporting/suggestions.rs b/src/librustc_infer/traits/error_reporting/suggestions.rs
similarity index 94%
rename from src/librustc/traits/error_reporting/suggestions.rs
rename to src/librustc_infer/traits/error_reporting/suggestions.rs
index 72629c6a3c..d05955fb85 100644
--- a/src/librustc/traits/error_reporting/suggestions.rs
+++ b/src/librustc_infer/traits/error_reporting/suggestions.rs
@@ -4,10 +4,10 @@ use super::{
 };
 
 use crate::infer::InferCtxt;
-use crate::traits::object_safety::object_safety_violations;
-use crate::ty::TypeckTables;
-use crate::ty::{self, AdtKind, DefIdTree, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
+use crate::traits::error_reporting::suggest_constraining_type_param;
 
+use rustc::ty::TypeckTables;
+use rustc::ty::{self, AdtKind, DefIdTree, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
 use rustc_errors::{
     error_code, pluralize, struct_span_err, Applicability, DiagnosticBuilder, Style,
 };
@@ -16,7 +16,6 @@ use rustc_hir::def::DefKind;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::Node;
-use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{MultiSpan, Span, DUMMY_SP};
 use std::fmt;
@@ -145,12 +144,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                     let param_name = self_ty.to_string();
                     let constraint = trait_ref.print_only_trait_path().to_string();
                     if suggest_constraining_type_param(
+                        self.tcx,
                         generics,
                         &mut err,
                         &param_name,
                         &constraint,
                         self.tcx.sess.source_map(),
                         *span,
+                        Some(trait_ref.def_id()),
                     ) {
                         return;
                     }
@@ -400,9 +401,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
             let refs_number =
                 snippet.chars().filter(|c| !c.is_whitespace()).take_while(|c| *c == '&').count();
-            if let Some('\'') =
-                snippet.chars().filter(|c| !c.is_whitespace()).skip(refs_number).next()
-            {
+            if let Some('\'') = snippet.chars().filter(|c| !c.is_whitespace()).nth(refs_number) {
                 // Do not suggest removal of borrow from type arguments.
                 return;
             }
@@ -428,12 +427,16 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                             .span_take_while(span, |c| c.is_whitespace() || *c == '&');
 
                         let remove_refs = refs_remaining + 1;
-                        let format_str =
-                            format!("consider removing {} leading `&`-references", remove_refs);
+
+                        let msg = if remove_refs == 1 {
+                            "consider removing the leading `&`-reference".to_string()
+                        } else {
+                            format!("consider removing {} leading `&`-references", remove_refs)
+                        };
 
                         err.span_suggestion_short(
                             sp,
-                            &format_str,
+                            &msg,
                             String::new(),
                             Applicability::MachineApplicable,
                         );
@@ -459,14 +462,12 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
             let refs_number =
                 snippet.chars().filter(|c| !c.is_whitespace()).take_while(|c| *c == '&').count();
-            if let Some('\'') =
-                snippet.chars().filter(|c| !c.is_whitespace()).skip(refs_number).next()
-            {
+            if let Some('\'') = snippet.chars().filter(|c| !c.is_whitespace()).nth(refs_number) {
                 // Do not suggest removal of borrow from type arguments.
                 return;
             }
             let trait_ref = self.resolve_vars_if_possible(trait_ref);
-            if trait_ref.has_infer_types() {
+            if trait_ref.has_infer_types_or_consts() {
                 // Do not ICE while trying to find if a reborrow would succeed on a trait with
                 // unresolved bindings.
                 return;
@@ -581,14 +582,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                 // If the `dyn Trait` is not object safe, do not suggest `Box<dyn Trait>`.
                 predicates
                     .principal_def_id()
-                    .map_or(true, |def_id| object_safety_violations(self.tcx, def_id).is_empty())
+                    .map_or(true, |def_id| self.tcx.object_safety_violations(def_id).is_empty())
             }
             // We only want to suggest `impl Trait` to `dyn Trait`s.
             // For example, `fn foo() -> str` needs to be filtered out.
             _ => return false,
         };
 
-        let ret_ty = if let hir::FunctionRetTy::Return(ret_ty) = sig.decl.output {
+        let ret_ty = if let hir::FnRetTy::Return(ret_ty) = sig.decl.output {
             ret_ty
         } else {
             return false;
@@ -696,10 +697,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                     })
                     .collect::<Vec<_>>();
                 // Add the suggestion for the return type.
-                suggestions.push((
-                    ret_ty.span,
-                    format!("Box<{}{}>", if has_dyn { "" } else { "dyn " }, snippet),
-                ));
+                suggestions.push((ret_ty.span, format!("Box<dyn {}>", trait_obj)));
                 err.multipart_suggestion(
                     "return a boxed trait object instead",
                     suggestions,
@@ -1506,9 +1504,9 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
                 );
                 if suggest_const_in_array_repeat_expressions {
                     err.note(
-                        "this array initializer can be evaluated at compile-time, for more \
-                         information, see issue \
-                         https://github.com/rust-lang/rust/issues/49147",
+                        "this array initializer can be evaluated at compile-time, see issue \
+                         #48147 <https://github.com/rust-lang/rust/issues/49147> \
+                         for more information",
                     );
                     if tcx.sess.opts.unstable_features.is_nightly_build() {
                         err.help(
@@ -1644,83 +1642,12 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
         let current_limit = self.tcx.sess.recursion_limit.get();
         let suggested_limit = current_limit * 2;
         err.help(&format!(
-            "consider adding a `#![recursion_limit=\"{}\"]` attribute to your crate",
-            suggested_limit
+            "consider adding a `#![recursion_limit=\"{}\"]` attribute to your crate (`{}`)",
+            suggested_limit, self.tcx.crate_name,
         ));
     }
 }
 
-/// Suggest restricting a type param with a new bound.
-pub fn suggest_constraining_type_param(
-    generics: &hir::Generics<'_>,
-    err: &mut DiagnosticBuilder<'_>,
-    param_name: &str,
-    constraint: &str,
-    source_map: &SourceMap,
-    span: Span,
-) -> bool {
-    let restrict_msg = "consider further restricting this bound";
-    if let Some(param) =
-        generics.params.iter().filter(|p| p.name.ident().as_str() == param_name).next()
-    {
-        if param_name.starts_with("impl ") {
-            // `impl Trait` in argument:
-            // `fn foo(x: impl Trait) {}` → `fn foo(t: impl Trait + Trait2) {}`
-            err.span_suggestion(
-                param.span,
-                restrict_msg,
-                // `impl CurrentTrait + MissingTrait`
-                format!("{} + {}", param_name, constraint),
-                Applicability::MachineApplicable,
-            );
-        } else if generics.where_clause.predicates.is_empty() && param.bounds.is_empty() {
-            // If there are no bounds whatsoever, suggest adding a constraint
-            // to the type parameter:
-            // `fn foo<T>(t: T) {}` → `fn foo<T: Trait>(t: T) {}`
-            err.span_suggestion(
-                param.span,
-                "consider restricting this bound",
-                format!("{}: {}", param_name, constraint),
-                Applicability::MachineApplicable,
-            );
-        } else if !generics.where_clause.predicates.is_empty() {
-            // There is a `where` clause, so suggest expanding it:
-            // `fn foo<T>(t: T) where T: Debug {}` →
-            // `fn foo<T>(t: T) where T: Debug, T: Trait {}`
-            err.span_suggestion(
-                generics.where_clause.span().unwrap().shrink_to_hi(),
-                &format!("consider further restricting type parameter `{}`", param_name),
-                format!(", {}: {}", param_name, constraint),
-                Applicability::MachineApplicable,
-            );
-        } else {
-            // If there is no `where` clause lean towards constraining to the
-            // type parameter:
-            // `fn foo<X: Bar, T>(t: T, x: X) {}` → `fn foo<T: Trait>(t: T) {}`
-            // `fn foo<T: Bar>(t: T) {}` → `fn foo<T: Bar + Trait>(t: T) {}`
-            let sp = param.span.with_hi(span.hi());
-            let span = source_map.span_through_char(sp, ':');
-            if sp != param.span && sp != span {
-                // Only suggest if we have high certainty that the span
-                // covers the colon in `foo<T: Trait>`.
-                err.span_suggestion(
-                    span,
-                    restrict_msg,
-                    format!("{}: {} + ", param_name, constraint),
-                    Applicability::MachineApplicable,
-                );
-            } else {
-                err.span_label(
-                    param.span,
-                    &format!("consider adding a `where {}: {}` bound", param_name, constraint),
-                );
-            }
-        }
-        return true;
-    }
-    false
-}
-
 /// Collect all the returned expressions within the input expression.
 /// Used to point at the return spans when we want to suggest some change to them.
 #[derive(Default)]
diff --git a/src/librustc/traits/fulfill.rs b/src/librustc_infer/traits/fulfill.rs
similarity index 92%
rename from src/librustc/traits/fulfill.rs
rename to src/librustc_infer/traits/fulfill.rs
index 0aac6fb81e..ac9ff484a0 100644
--- a/src/librustc/traits/fulfill.rs
+++ b/src/librustc_infer/traits/fulfill.rs
@@ -1,6 +1,6 @@
 use crate::infer::{InferCtxt, ShallowResolver};
-use crate::ty::error::ExpectedFound;
-use crate::ty::{self, ToPolyTraitRef, Ty, TypeFoldable};
+use rustc::ty::error::ExpectedFound;
+use rustc::ty::{self, ToPolyTraitRef, Ty, TypeFoldable};
 use rustc_data_structures::obligation_forest::ProcessResult;
 use rustc_data_structures::obligation_forest::{DoCompleted, Error, ForestObligation};
 use rustc_data_structures::obligation_forest::{ObligationForest, ObligationProcessor};
@@ -18,10 +18,13 @@ use super::{FulfillmentError, FulfillmentErrorCode};
 use super::{ObligationCause, PredicateObligation};
 
 impl<'tcx> ForestObligation for PendingPredicateObligation<'tcx> {
-    type Predicate = ty::Predicate<'tcx>;
+    /// Note that we include both the `ParamEnv` and the `Predicate`,
+    /// as the `ParamEnv` can influence whether fulfillment succeeds
+    /// or fails.
+    type CacheKey = ty::ParamEnvAnd<'tcx, ty::Predicate<'tcx>>;
 
-    fn as_predicate(&self) -> &Self::Predicate {
-        &self.obligation.predicate
+    fn as_cache_key(&self) -> Self::CacheKey {
+        self.obligation.param_env.and(self.obligation.predicate)
     }
 }
 
@@ -296,7 +299,7 @@ impl<'a, 'b, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'b, 'tcx> {
 
         let obligation = &mut pending_obligation.obligation;
 
-        if obligation.predicate.has_infer_types() {
+        if obligation.predicate.has_infer_types_or_consts() {
             obligation.predicate =
                 self.selcx.infcx().resolve_vars_if_possible(&obligation.predicate);
         }
@@ -343,16 +346,7 @@ impl<'a, 'b, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'b, 'tcx> {
                         // This is a bit subtle: for the most part, the
                         // only reason we can fail to make progress on
                         // trait selection is because we don't have enough
-                        // information about the types in the trait. One
-                        // exception is that we sometimes haven't decided
-                        // what kind of closure a closure is. *But*, in
-                        // that case, it turns out, the type of the
-                        // closure will also change, because the closure
-                        // also includes references to its upvars as part
-                        // of its type, and those types are resolved at
-                        // the same time.
-                        //
-                        // FIXME(#32286) logic seems false if no upvars
+                        // information about the types in the trait.
                         pending_obligation.stalled_on =
                             trait_ref_type_vars(self.selcx, data.to_poly_trait_ref());
 
@@ -507,27 +501,15 @@ impl<'a, 'b, 'tcx> ObligationProcessor for FulfillProcessor<'a, 'b, 'tcx> {
             }
 
             ty::Predicate::ConstEvaluatable(def_id, substs) => {
-                if obligation.param_env.has_local_value() {
-                    ProcessResult::Unchanged
-                } else {
-                    if !substs.has_local_value() {
-                        match self.selcx.tcx().const_eval_resolve(
-                            obligation.param_env,
-                            def_id,
-                            substs,
-                            None,
-                            Some(obligation.cause.span),
-                        ) {
-                            Ok(_) => ProcessResult::Changed(vec![]),
-                            Err(err) => {
-                                ProcessResult::Error(CodeSelectionError(ConstEvalFailure(err)))
-                            }
-                        }
-                    } else {
-                        pending_obligation.stalled_on =
-                            substs.types().map(|ty| infer_ty(ty)).collect();
-                        ProcessResult::Unchanged
-                    }
+                match self.selcx.infcx().const_eval_resolve(
+                    obligation.param_env,
+                    def_id,
+                    substs,
+                    None,
+                    Some(obligation.cause.span),
+                ) {
+                    Ok(_) => ProcessResult::Changed(vec![]),
+                    Err(err) => ProcessResult::Error(CodeSelectionError(ConstEvalFailure(err))),
                 }
             }
         }
diff --git a/src/librustc_infer/traits/misc.rs b/src/librustc_infer/traits/misc.rs
new file mode 100644
index 0000000000..7ab918c159
--- /dev/null
+++ b/src/librustc_infer/traits/misc.rs
@@ -0,0 +1,71 @@
+//! Miscellaneous type-system utilities that are too small to deserve their own modules.
+
+use crate::infer::TyCtxtInferExt;
+use crate::traits::{self, ObligationCause};
+
+use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
+use rustc_hir as hir;
+
+#[derive(Clone)]
+pub enum CopyImplementationError<'tcx> {
+    InfrigingFields(Vec<&'tcx ty::FieldDef>),
+    NotAnAdt,
+    HasDestructor,
+}
+
+pub fn can_type_implement_copy(
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    self_type: Ty<'tcx>,
+) -> Result<(), CopyImplementationError<'tcx>> {
+    // FIXME: (@jroesch) float this code up
+    tcx.infer_ctxt().enter(|infcx| {
+        let (adt, substs) = match self_type.kind {
+            // These types used to have a builtin impl.
+            // Now libcore provides that impl.
+            ty::Uint(_)
+            | ty::Int(_)
+            | ty::Bool
+            | ty::Float(_)
+            | ty::Char
+            | ty::RawPtr(..)
+            | ty::Never
+            | ty::Ref(_, _, hir::Mutability::Not) => return Ok(()),
+
+            ty::Adt(adt, substs) => (adt, substs),
+
+            _ => return Err(CopyImplementationError::NotAnAdt),
+        };
+
+        let mut infringing = Vec::new();
+        for variant in &adt.variants {
+            for field in &variant.fields {
+                let ty = field.ty(tcx, substs);
+                if ty.references_error() {
+                    continue;
+                }
+                let span = tcx.def_span(field.did);
+                let cause = ObligationCause { span, ..ObligationCause::dummy() };
+                let ctx = traits::FulfillmentContext::new();
+                match traits::fully_normalize(&infcx, ctx, cause, param_env, &ty) {
+                    Ok(ty) => {
+                        if !infcx.type_is_copy_modulo_regions(param_env, ty, span) {
+                            infringing.push(field);
+                        }
+                    }
+                    Err(errors) => {
+                        infcx.report_fulfillment_errors(&errors, None, false);
+                    }
+                };
+            }
+        }
+        if !infringing.is_empty() {
+            return Err(CopyImplementationError::InfrigingFields(infringing));
+        }
+        if adt.has_dtor(tcx) {
+            return Err(CopyImplementationError::HasDestructor);
+        }
+
+        Ok(())
+    })
+}
diff --git a/src/librustc_infer/traits/mod.rs b/src/librustc_infer/traits/mod.rs
new file mode 100644
index 0000000000..800f8e91a7
--- /dev/null
+++ b/src/librustc_infer/traits/mod.rs
@@ -0,0 +1,642 @@
+//! Trait Resolution. See the [rustc guide] for more information on how this works.
+//!
+//! [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/resolution.html
+
+#[allow(dead_code)]
+pub mod auto_trait;
+pub mod codegen;
+mod coherence;
+mod engine;
+pub mod error_reporting;
+mod fulfill;
+pub mod misc;
+mod object_safety;
+mod on_unimplemented;
+mod project;
+pub mod query;
+mod select;
+mod specialize;
+mod structural_impls;
+mod structural_match;
+mod util;
+pub mod wf;
+
+use crate::infer::outlives::env::OutlivesEnvironment;
+use crate::infer::{InferCtxt, SuppressRegionErrors, TyCtxtInferExt};
+use rustc::middle::region;
+use rustc::ty::error::{ExpectedFound, TypeError};
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::subst::{InternalSubsts, SubstsRef};
+use rustc::ty::{self, GenericParamDefKind, ToPredicate, Ty, TyCtxt, WithConstness};
+use rustc::util::common::ErrorReported;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_span::{Span, DUMMY_SP};
+
+use std::fmt::Debug;
+
+pub use self::FulfillmentErrorCode::*;
+pub use self::ObligationCauseCode::*;
+pub use self::SelectionError::*;
+pub use self::Vtable::*;
+
+pub use self::coherence::{add_placeholder_note, orphan_check, overlapping_impls};
+pub use self::coherence::{OrphanCheckErr, OverlapResult};
+pub use self::engine::{TraitEngine, TraitEngineExt};
+pub use self::fulfill::{FulfillmentContext, PendingPredicateObligation};
+pub use self::object_safety::astconv_object_safety_violations;
+pub use self::object_safety::is_vtable_safe_method;
+pub use self::object_safety::MethodViolationCode;
+pub use self::object_safety::ObjectSafetyViolation;
+pub use self::on_unimplemented::{OnUnimplementedDirective, OnUnimplementedNote};
+pub use self::project::MismatchedProjectionTypes;
+pub use self::project::{
+    normalize, normalize_projection_type, normalize_to, poly_project_and_unify_type,
+};
+pub use self::project::{Normalized, ProjectionCache, ProjectionCacheSnapshot, Reveal};
+pub use self::select::{EvaluationCache, SelectionCache, SelectionContext};
+pub use self::select::{EvaluationResult, IntercrateAmbiguityCause, OverflowError};
+pub use self::specialize::find_associated_item;
+pub use self::specialize::specialization_graph::FutureCompatOverlapError;
+pub use self::specialize::specialization_graph::FutureCompatOverlapErrorKind;
+pub use self::specialize::{specialization_graph, translate_substs, OverlapError};
+pub use self::structural_match::search_for_structural_match_violation;
+pub use self::structural_match::type_marked_structural;
+pub use self::structural_match::NonStructuralMatchTy;
+pub use self::util::{elaborate_predicates, elaborate_trait_ref, elaborate_trait_refs};
+pub use self::util::{expand_trait_aliases, TraitAliasExpander};
+pub use self::util::{
+    get_vtable_index_of_object_method, impl_is_default, impl_item_is_final,
+    predicate_for_trait_def, upcast_choices,
+};
+pub use self::util::{
+    supertrait_def_ids, supertraits, transitive_bounds, SupertraitDefIds, Supertraits,
+};
+
+pub use rustc::traits::*;
+
+/// Whether to skip the leak check, as part of a future compatibility warning step.
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum SkipLeakCheck {
+    Yes,
+    No,
+}
+
+impl SkipLeakCheck {
+    fn is_yes(self) -> bool {
+        self == SkipLeakCheck::Yes
+    }
+}
+
+/// The "default" for skip-leak-check corresponds to the current
+/// behavior (do not skip the leak check) -- not the behavior we are
+/// transitioning into.
+impl Default for SkipLeakCheck {
+    fn default() -> Self {
+        SkipLeakCheck::No
+    }
+}
+
+/// The mode that trait queries run in.
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+pub enum TraitQueryMode {
+    // Standard/un-canonicalized queries get accurate
+    // spans etc. passed in and hence can do reasonable
+    // error reporting on their own.
+    Standard,
+    // Canonicalized queries get dummy spans and hence
+    // must generally propagate errors to
+    // pre-canonicalization callsites.
+    Canonical,
+}
+
+/// An `Obligation` represents some trait reference (e.g., `int: Eq`) for
+/// which the vtable must be found. The process of finding a vtable is
+/// called "resolving" the `Obligation`. This process consists of
+/// either identifying an `impl` (e.g., `impl Eq for int`) that
+/// provides the required vtable, or else finding a bound that is in
+/// scope. The eventual result is usually a `Selection` (defined below).
+#[derive(Clone, PartialEq, Eq, Hash)]
+pub struct Obligation<'tcx, T> {
+    /// The reason we have to prove this thing.
+    pub cause: ObligationCause<'tcx>,
+
+    /// The environment in which we should prove this thing.
+    pub param_env: ty::ParamEnv<'tcx>,
+
+    /// The thing we are trying to prove.
+    pub predicate: T,
+
+    /// If we started proving this as a result of trying to prove
+    /// something else, track the total depth to ensure termination.
+    /// If this goes over a certain threshold, we abort compilation --
+    /// in such cases, we can not say whether or not the predicate
+    /// holds for certain. Stupid halting problem; such a drag.
+    pub recursion_depth: usize,
+}
+
+pub type PredicateObligation<'tcx> = Obligation<'tcx, ty::Predicate<'tcx>>;
+pub type TraitObligation<'tcx> = Obligation<'tcx, ty::PolyTraitPredicate<'tcx>>;
+
+// `PredicateObligation` is used a lot. Make sure it doesn't unintentionally get bigger.
+#[cfg(target_arch = "x86_64")]
+static_assert_size!(PredicateObligation<'_>, 112);
+
+pub type Obligations<'tcx, O> = Vec<Obligation<'tcx, O>>;
+pub type PredicateObligations<'tcx> = Vec<PredicateObligation<'tcx>>;
+pub type TraitObligations<'tcx> = Vec<TraitObligation<'tcx>>;
+
+pub type Selection<'tcx> = Vtable<'tcx, PredicateObligation<'tcx>>;
+
+pub struct FulfillmentError<'tcx> {
+    pub obligation: PredicateObligation<'tcx>,
+    pub code: FulfillmentErrorCode<'tcx>,
+    /// Diagnostics only: we opportunistically change the `code.span` when we encounter an
+    /// obligation error caused by a call argument. When this is the case, we also signal that in
+    /// this field to ensure accuracy of suggestions.
+    pub points_at_arg_span: bool,
+}
+
+#[derive(Clone)]
+pub enum FulfillmentErrorCode<'tcx> {
+    CodeSelectionError(SelectionError<'tcx>),
+    CodeProjectionError(MismatchedProjectionTypes<'tcx>),
+    CodeSubtypeError(ExpectedFound<Ty<'tcx>>, TypeError<'tcx>), // always comes from a SubtypePredicate
+    CodeAmbiguity,
+}
+
+/// Creates predicate obligations from the generic bounds.
+pub fn predicates_for_generics<'tcx>(
+    cause: ObligationCause<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    generic_bounds: &ty::InstantiatedPredicates<'tcx>,
+) -> PredicateObligations<'tcx> {
+    util::predicates_for_generics(cause, 0, param_env, generic_bounds)
+}
+
+/// Determines whether the type `ty` is known to meet `bound` and
+/// returns true if so. Returns false if `ty` either does not meet
+/// `bound` or is not known to meet bound (note that this is
+/// conservative towards *no impl*, which is the opposite of the
+/// `evaluate` methods).
+pub fn type_known_to_meet_bound_modulo_regions<'a, 'tcx>(
+    infcx: &InferCtxt<'a, 'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    ty: Ty<'tcx>,
+    def_id: DefId,
+    span: Span,
+) -> bool {
+    debug!(
+        "type_known_to_meet_bound_modulo_regions(ty={:?}, bound={:?})",
+        ty,
+        infcx.tcx.def_path_str(def_id)
+    );
+
+    let trait_ref = ty::TraitRef { def_id, substs: infcx.tcx.mk_substs_trait(ty, &[]) };
+    let obligation = Obligation {
+        param_env,
+        cause: ObligationCause::misc(span, hir::DUMMY_HIR_ID),
+        recursion_depth: 0,
+        predicate: trait_ref.without_const().to_predicate(),
+    };
+
+    let result = infcx.predicate_must_hold_modulo_regions(&obligation);
+    debug!(
+        "type_known_to_meet_ty={:?} bound={} => {:?}",
+        ty,
+        infcx.tcx.def_path_str(def_id),
+        result
+    );
+
+    if result && ty.has_infer_types_or_consts() {
+        // Because of inference "guessing", selection can sometimes claim
+        // to succeed while the success requires a guess. To ensure
+        // this function's result remains infallible, we must confirm
+        // that guess. While imperfect, I believe this is sound.
+
+        // The handling of regions in this area of the code is terrible,
+        // see issue #29149. We should be able to improve on this with
+        // NLL.
+        let mut fulfill_cx = FulfillmentContext::new_ignoring_regions();
+
+        // We can use a dummy node-id here because we won't pay any mind
+        // to region obligations that arise (there shouldn't really be any
+        // anyhow).
+        let cause = ObligationCause::misc(span, hir::DUMMY_HIR_ID);
+
+        fulfill_cx.register_bound(infcx, param_env, ty, def_id, cause);
+
+        // Note: we only assume something is `Copy` if we can
+        // *definitively* show that it implements `Copy`. Otherwise,
+        // assume it is move; linear is always ok.
+        match fulfill_cx.select_all_or_error(infcx) {
+            Ok(()) => {
+                debug!(
+                    "type_known_to_meet_bound_modulo_regions: ty={:?} bound={} success",
+                    ty,
+                    infcx.tcx.def_path_str(def_id)
+                );
+                true
+            }
+            Err(e) => {
+                debug!(
+                    "type_known_to_meet_bound_modulo_regions: ty={:?} bound={} errors={:?}",
+                    ty,
+                    infcx.tcx.def_path_str(def_id),
+                    e
+                );
+                false
+            }
+        }
+    } else {
+        result
+    }
+}
+
+fn do_normalize_predicates<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    region_context: DefId,
+    cause: ObligationCause<'tcx>,
+    elaborated_env: ty::ParamEnv<'tcx>,
+    predicates: Vec<ty::Predicate<'tcx>>,
+) -> Result<Vec<ty::Predicate<'tcx>>, ErrorReported> {
+    debug!(
+        "do_normalize_predicates(predicates={:?}, region_context={:?}, cause={:?})",
+        predicates, region_context, cause,
+    );
+    let span = cause.span;
+    tcx.infer_ctxt().enter(|infcx| {
+        // FIXME. We should really... do something with these region
+        // obligations. But this call just continues the older
+        // behavior (i.e., doesn't cause any new bugs), and it would
+        // take some further refactoring to actually solve them. In
+        // particular, we would have to handle implied bounds
+        // properly, and that code is currently largely confined to
+        // regionck (though I made some efforts to extract it
+        // out). -nmatsakis
+        //
+        // @arielby: In any case, these obligations are checked
+        // by wfcheck anyway, so I'm not sure we have to check
+        // them here too, and we will remove this function when
+        // we move over to lazy normalization *anyway*.
+        let fulfill_cx = FulfillmentContext::new_ignoring_regions();
+        let predicates =
+            match fully_normalize(&infcx, fulfill_cx, cause, elaborated_env, &predicates) {
+                Ok(predicates) => predicates,
+                Err(errors) => {
+                    infcx.report_fulfillment_errors(&errors, None, false);
+                    return Err(ErrorReported);
+                }
+            };
+
+        debug!("do_normalize_predictes: normalized predicates = {:?}", predicates);
+
+        let region_scope_tree = region::ScopeTree::default();
+
+        // We can use the `elaborated_env` here; the region code only
+        // cares about declarations like `'a: 'b`.
+        let outlives_env = OutlivesEnvironment::new(elaborated_env);
+
+        infcx.resolve_regions_and_report_errors(
+            region_context,
+            &region_scope_tree,
+            &outlives_env,
+            SuppressRegionErrors::default(),
+        );
+
+        let predicates = match infcx.fully_resolve(&predicates) {
+            Ok(predicates) => predicates,
+            Err(fixup_err) => {
+                // If we encounter a fixup error, it means that some type
+                // variable wound up unconstrained. I actually don't know
+                // if this can happen, and I certainly don't expect it to
+                // happen often, but if it did happen it probably
+                // represents a legitimate failure due to some kind of
+                // unconstrained variable, and it seems better not to ICE,
+                // all things considered.
+                tcx.sess.span_err(span, &fixup_err.to_string());
+                return Err(ErrorReported);
+            }
+        };
+        if predicates.has_local_value() {
+            // FIXME: shouldn't we, you know, actually report an error here? or an ICE?
+            Err(ErrorReported)
+        } else {
+            Ok(predicates)
+        }
+    })
+}
+
+// FIXME: this is gonna need to be removed ...
+/// Normalizes the parameter environment, reporting errors if they occur.
+pub fn normalize_param_env_or_error<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    region_context: DefId,
+    unnormalized_env: ty::ParamEnv<'tcx>,
+    cause: ObligationCause<'tcx>,
+) -> ty::ParamEnv<'tcx> {
+    // I'm not wild about reporting errors here; I'd prefer to
+    // have the errors get reported at a defined place (e.g.,
+    // during typeck). Instead I have all parameter
+    // environments, in effect, going through this function
+    // and hence potentially reporting errors. This ensures of
+    // course that we never forget to normalize (the
+    // alternative seemed like it would involve a lot of
+    // manual invocations of this fn -- and then we'd have to
+    // deal with the errors at each of those sites).
+    //
+    // In any case, in practice, typeck constructs all the
+    // parameter environments once for every fn as it goes,
+    // and errors will get reported then; so after typeck we
+    // can be sure that no errors should occur.
+
+    debug!(
+        "normalize_param_env_or_error(region_context={:?}, unnormalized_env={:?}, cause={:?})",
+        region_context, unnormalized_env, cause
+    );
+
+    let mut predicates: Vec<_> =
+        util::elaborate_predicates(tcx, unnormalized_env.caller_bounds.to_vec()).collect();
+
+    debug!("normalize_param_env_or_error: elaborated-predicates={:?}", predicates);
+
+    let elaborated_env = ty::ParamEnv::new(
+        tcx.intern_predicates(&predicates),
+        unnormalized_env.reveal,
+        unnormalized_env.def_id,
+    );
+
+    // HACK: we are trying to normalize the param-env inside *itself*. The problem is that
+    // normalization expects its param-env to be already normalized, which means we have
+    // a circularity.
+    //
+    // The way we handle this is by normalizing the param-env inside an unnormalized version
+    // of the param-env, which means that if the param-env contains unnormalized projections,
+    // we'll have some normalization failures. This is unfortunate.
+    //
+    // Lazy normalization would basically handle this by treating just the
+    // normalizing-a-trait-ref-requires-itself cycles as evaluation failures.
+    //
+    // Inferred outlives bounds can create a lot of `TypeOutlives` predicates for associated
+    // types, so to make the situation less bad, we normalize all the predicates *but*
+    // the `TypeOutlives` predicates first inside the unnormalized parameter environment, and
+    // then we normalize the `TypeOutlives` bounds inside the normalized parameter environment.
+    //
+    // This works fairly well because trait matching  does not actually care about param-env
+    // TypeOutlives predicates - these are normally used by regionck.
+    let outlives_predicates: Vec<_> = predicates
+        .drain_filter(|predicate| match predicate {
+            ty::Predicate::TypeOutlives(..) => true,
+            _ => false,
+        })
+        .collect();
+
+    debug!(
+        "normalize_param_env_or_error: predicates=(non-outlives={:?}, outlives={:?})",
+        predicates, outlives_predicates
+    );
+    let non_outlives_predicates = match do_normalize_predicates(
+        tcx,
+        region_context,
+        cause.clone(),
+        elaborated_env,
+        predicates,
+    ) {
+        Ok(predicates) => predicates,
+        // An unnormalized env is better than nothing.
+        Err(ErrorReported) => {
+            debug!("normalize_param_env_or_error: errored resolving non-outlives predicates");
+            return elaborated_env;
+        }
+    };
+
+    debug!("normalize_param_env_or_error: non-outlives predicates={:?}", non_outlives_predicates);
+
+    // Not sure whether it is better to include the unnormalized TypeOutlives predicates
+    // here. I believe they should not matter, because we are ignoring TypeOutlives param-env
+    // predicates here anyway. Keeping them here anyway because it seems safer.
+    let outlives_env: Vec<_> =
+        non_outlives_predicates.iter().chain(&outlives_predicates).cloned().collect();
+    let outlives_env =
+        ty::ParamEnv::new(tcx.intern_predicates(&outlives_env), unnormalized_env.reveal, None);
+    let outlives_predicates = match do_normalize_predicates(
+        tcx,
+        region_context,
+        cause,
+        outlives_env,
+        outlives_predicates,
+    ) {
+        Ok(predicates) => predicates,
+        // An unnormalized env is better than nothing.
+        Err(ErrorReported) => {
+            debug!("normalize_param_env_or_error: errored resolving outlives predicates");
+            return elaborated_env;
+        }
+    };
+    debug!("normalize_param_env_or_error: outlives predicates={:?}", outlives_predicates);
+
+    let mut predicates = non_outlives_predicates;
+    predicates.extend(outlives_predicates);
+    debug!("normalize_param_env_or_error: final predicates={:?}", predicates);
+    ty::ParamEnv::new(
+        tcx.intern_predicates(&predicates),
+        unnormalized_env.reveal,
+        unnormalized_env.def_id,
+    )
+}
+
+pub fn fully_normalize<'a, 'tcx, T>(
+    infcx: &InferCtxt<'a, 'tcx>,
+    mut fulfill_cx: FulfillmentContext<'tcx>,
+    cause: ObligationCause<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    value: &T,
+) -> Result<T, Vec<FulfillmentError<'tcx>>>
+where
+    T: TypeFoldable<'tcx>,
+{
+    debug!("fully_normalize_with_fulfillcx(value={:?})", value);
+    let selcx = &mut SelectionContext::new(infcx);
+    let Normalized { value: normalized_value, obligations } =
+        project::normalize(selcx, param_env, cause, value);
+    debug!(
+        "fully_normalize: normalized_value={:?} obligations={:?}",
+        normalized_value, obligations
+    );
+    for obligation in obligations {
+        fulfill_cx.register_predicate_obligation(selcx.infcx(), obligation);
+    }
+
+    debug!("fully_normalize: select_all_or_error start");
+    fulfill_cx.select_all_or_error(infcx)?;
+    debug!("fully_normalize: select_all_or_error complete");
+    let resolved_value = infcx.resolve_vars_if_possible(&normalized_value);
+    debug!("fully_normalize: resolved_value={:?}", resolved_value);
+    Ok(resolved_value)
+}
+
+/// Normalizes the predicates and checks whether they hold in an empty
+/// environment. If this returns false, then either normalize
+/// encountered an error or one of the predicates did not hold. Used
+/// when creating vtables to check for unsatisfiable methods.
+pub fn normalize_and_test_predicates<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    predicates: Vec<ty::Predicate<'tcx>>,
+) -> bool {
+    debug!("normalize_and_test_predicates(predicates={:?})", predicates);
+
+    let result = tcx.infer_ctxt().enter(|infcx| {
+        let param_env = ty::ParamEnv::reveal_all();
+        let mut selcx = SelectionContext::new(&infcx);
+        let mut fulfill_cx = FulfillmentContext::new();
+        let cause = ObligationCause::dummy();
+        let Normalized { value: predicates, obligations } =
+            normalize(&mut selcx, param_env, cause.clone(), &predicates);
+        for obligation in obligations {
+            fulfill_cx.register_predicate_obligation(&infcx, obligation);
+        }
+        for predicate in predicates {
+            let obligation = Obligation::new(cause.clone(), param_env, predicate);
+            fulfill_cx.register_predicate_obligation(&infcx, obligation);
+        }
+
+        fulfill_cx.select_all_or_error(&infcx).is_ok()
+    });
+    debug!("normalize_and_test_predicates(predicates={:?}) = {:?}", predicates, result);
+    result
+}
+
+fn substitute_normalize_and_test_predicates<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    key: (DefId, SubstsRef<'tcx>),
+) -> bool {
+    debug!("substitute_normalize_and_test_predicates(key={:?})", key);
+
+    let predicates = tcx.predicates_of(key.0).instantiate(tcx, key.1).predicates;
+    let result = normalize_and_test_predicates(tcx, predicates);
+
+    debug!("substitute_normalize_and_test_predicates(key={:?}) = {:?}", key, result);
+    result
+}
+
+/// Given a trait `trait_ref`, iterates the vtable entries
+/// that come from `trait_ref`, including its supertraits.
+#[inline] // FIXME(#35870): avoid closures being unexported due to `impl Trait`.
+fn vtable_methods<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_ref: ty::PolyTraitRef<'tcx>,
+) -> &'tcx [Option<(DefId, SubstsRef<'tcx>)>] {
+    debug!("vtable_methods({:?})", trait_ref);
+
+    tcx.arena.alloc_from_iter(supertraits(tcx, trait_ref).flat_map(move |trait_ref| {
+        let trait_methods = tcx
+            .associated_items(trait_ref.def_id())
+            .in_definition_order()
+            .filter(|item| item.kind == ty::AssocKind::Method);
+
+        // Now list each method's DefId and InternalSubsts (for within its trait).
+        // If the method can never be called from this object, produce None.
+        trait_methods.map(move |trait_method| {
+            debug!("vtable_methods: trait_method={:?}", trait_method);
+            let def_id = trait_method.def_id;
+
+            // Some methods cannot be called on an object; skip those.
+            if !is_vtable_safe_method(tcx, trait_ref.def_id(), &trait_method) {
+                debug!("vtable_methods: not vtable safe");
+                return None;
+            }
+
+            // The method may have some early-bound lifetimes; add regions for those.
+            let substs = trait_ref.map_bound(|trait_ref| {
+                InternalSubsts::for_item(tcx, def_id, |param, _| match param.kind {
+                    GenericParamDefKind::Lifetime => tcx.lifetimes.re_erased.into(),
+                    GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => {
+                        trait_ref.substs[param.index as usize]
+                    }
+                })
+            });
+
+            // The trait type may have higher-ranked lifetimes in it;
+            // erase them if they appear, so that we get the type
+            // at some particular call site.
+            let substs =
+                tcx.normalize_erasing_late_bound_regions(ty::ParamEnv::reveal_all(), &substs);
+
+            // It's possible that the method relies on where-clauses that
+            // do not hold for this particular set of type parameters.
+            // Note that this method could then never be called, so we
+            // do not want to try and codegen it, in that case (see #23435).
+            let predicates = tcx.predicates_of(def_id).instantiate_own(tcx, substs);
+            if !normalize_and_test_predicates(tcx, predicates.predicates) {
+                debug!("vtable_methods: predicates do not hold");
+                return None;
+            }
+
+            Some((def_id, substs))
+        })
+    }))
+}
+
+impl<'tcx, O> Obligation<'tcx, O> {
+    pub fn new(
+        cause: ObligationCause<'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
+        predicate: O,
+    ) -> Obligation<'tcx, O> {
+        Obligation { cause, param_env, recursion_depth: 0, predicate }
+    }
+
+    fn with_depth(
+        cause: ObligationCause<'tcx>,
+        recursion_depth: usize,
+        param_env: ty::ParamEnv<'tcx>,
+        predicate: O,
+    ) -> Obligation<'tcx, O> {
+        Obligation { cause, param_env, recursion_depth, predicate }
+    }
+
+    pub fn misc(
+        span: Span,
+        body_id: hir::HirId,
+        param_env: ty::ParamEnv<'tcx>,
+        trait_ref: O,
+    ) -> Obligation<'tcx, O> {
+        Obligation::new(ObligationCause::misc(span, body_id), param_env, trait_ref)
+    }
+
+    pub fn with<P>(&self, value: P) -> Obligation<'tcx, P> {
+        Obligation {
+            cause: self.cause.clone(),
+            param_env: self.param_env,
+            recursion_depth: self.recursion_depth,
+            predicate: value,
+        }
+    }
+}
+
+impl<'tcx> FulfillmentError<'tcx> {
+    fn new(
+        obligation: PredicateObligation<'tcx>,
+        code: FulfillmentErrorCode<'tcx>,
+    ) -> FulfillmentError<'tcx> {
+        FulfillmentError { obligation, code, points_at_arg_span: false }
+    }
+}
+
+impl<'tcx> TraitObligation<'tcx> {
+    fn self_ty(&self) -> ty::Binder<Ty<'tcx>> {
+        self.predicate.map_bound(|p| p.self_ty())
+    }
+}
+
+pub fn provide(providers: &mut ty::query::Providers<'_>) {
+    object_safety::provide(providers);
+    *providers = ty::query::Providers {
+        specialization_graph_of: specialize::specialization_graph_provider,
+        specializes: specialize::specializes,
+        codegen_fulfill_obligation: codegen::codegen_fulfill_obligation,
+        vtable_methods,
+        substitute_normalize_and_test_predicates,
+        ..*providers
+    };
+}
diff --git a/src/librustc_infer/traits/object_safety.rs b/src/librustc_infer/traits/object_safety.rs
new file mode 100644
index 0000000000..6f20f5ac47
--- /dev/null
+++ b/src/librustc_infer/traits/object_safety.rs
@@ -0,0 +1,777 @@
+//! "Object safety" refers to the ability for a trait to be converted
+//! to an object. In general, traits may only be converted to an
+//! object if all of their methods meet certain criteria. In particular,
+//! they must:
+//!
+//!   - have a suitable receiver from which we can extract a vtable and coerce to a "thin" version
+//!     that doesn't contain the vtable;
+//!   - not reference the erased type `Self` except for in this receiver;
+//!   - not have generic type parameters.
+
+use super::elaborate_predicates;
+
+use crate::infer::TyCtxtInferExt;
+use crate::traits::{self, Obligation, ObligationCause};
+use rustc::ty::subst::{InternalSubsts, Subst};
+use rustc::ty::{self, Predicate, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
+use rustc_errors::Applicability;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_session::lint::builtin::WHERE_CLAUSES_OBJECT_SAFETY;
+use rustc_span::symbol::Symbol;
+use rustc_span::Span;
+use smallvec::SmallVec;
+
+use std::iter;
+
+pub use crate::traits::{MethodViolationCode, ObjectSafetyViolation};
+
+/// Returns the object safety violations that affect
+/// astconv -- currently, `Self` in supertraits. This is needed
+/// because `object_safety_violations` can't be used during
+/// type collection.
+pub fn astconv_object_safety_violations(
+    tcx: TyCtxt<'_>,
+    trait_def_id: DefId,
+) -> Vec<ObjectSafetyViolation> {
+    debug_assert!(tcx.generics_of(trait_def_id).has_self);
+    let violations = traits::supertrait_def_ids(tcx, trait_def_id)
+        .map(|def_id| predicates_reference_self(tcx, def_id, true))
+        .filter(|spans| !spans.is_empty())
+        .map(|spans| ObjectSafetyViolation::SupertraitSelf(spans))
+        .collect();
+
+    debug!("astconv_object_safety_violations(trait_def_id={:?}) = {:?}", trait_def_id, violations);
+
+    violations
+}
+
+fn object_safety_violations(tcx: TyCtxt<'_>, trait_def_id: DefId) -> Vec<ObjectSafetyViolation> {
+    debug_assert!(tcx.generics_of(trait_def_id).has_self);
+    debug!("object_safety_violations: {:?}", trait_def_id);
+
+    traits::supertrait_def_ids(tcx, trait_def_id)
+        .flat_map(|def_id| object_safety_violations_for_trait(tcx, def_id))
+        .collect()
+}
+
+/// We say a method is *vtable safe* if it can be invoked on a trait
+/// object. Note that object-safe traits can have some
+/// non-vtable-safe methods, so long as they require `Self: Sized` or
+/// otherwise ensure that they cannot be used when `Self = Trait`.
+pub fn is_vtable_safe_method(tcx: TyCtxt<'_>, trait_def_id: DefId, method: &ty::AssocItem) -> bool {
+    debug_assert!(tcx.generics_of(trait_def_id).has_self);
+    debug!("is_vtable_safe_method({:?}, {:?})", trait_def_id, method);
+    // Any method that has a `Self: Sized` bound cannot be called.
+    if generics_require_sized_self(tcx, method.def_id) {
+        return false;
+    }
+
+    match virtual_call_violation_for_method(tcx, trait_def_id, method) {
+        None | Some(MethodViolationCode::WhereClauseReferencesSelf) => true,
+        Some(_) => false,
+    }
+}
+
+fn object_safety_violations_for_trait(
+    tcx: TyCtxt<'_>,
+    trait_def_id: DefId,
+) -> Vec<ObjectSafetyViolation> {
+    // Check methods for violations.
+    let mut violations: Vec<_> = tcx
+        .associated_items(trait_def_id)
+        .in_definition_order()
+        .filter(|item| item.kind == ty::AssocKind::Method)
+        .filter_map(|item| {
+            object_safety_violation_for_method(tcx, trait_def_id, &item)
+                .map(|(code, span)| ObjectSafetyViolation::Method(item.ident.name, code, span))
+        })
+        .filter(|violation| {
+            if let ObjectSafetyViolation::Method(
+                _,
+                MethodViolationCode::WhereClauseReferencesSelf,
+                span,
+            ) = violation
+            {
+                // Using `CRATE_NODE_ID` is wrong, but it's hard to get a more precise id.
+                // It's also hard to get a use site span, so we use the method definition span.
+                tcx.struct_span_lint_hir(
+                    WHERE_CLAUSES_OBJECT_SAFETY,
+                    hir::CRATE_HIR_ID,
+                    *span,
+                    |lint| {
+                        let mut err = lint.build(&format!(
+                            "the trait `{}` cannot be made into an object",
+                            tcx.def_path_str(trait_def_id)
+                        ));
+                        let node = tcx.hir().get_if_local(trait_def_id);
+                        let msg = if let Some(hir::Node::Item(item)) = node {
+                            err.span_label(
+                                item.ident.span,
+                                "this trait cannot be made into an object...",
+                            );
+                            format!("...because {}", violation.error_msg())
+                        } else {
+                            format!(
+                                "the trait cannot be made into an object because {}",
+                                violation.error_msg()
+                            )
+                        };
+                        err.span_label(*span, &msg);
+                        match (node, violation.solution()) {
+                            (Some(_), Some((note, None))) => {
+                                err.help(&note);
+                            }
+                            (Some(_), Some((note, Some((sugg, span))))) => {
+                                err.span_suggestion(
+                                    span,
+                                    &note,
+                                    sugg,
+                                    Applicability::MachineApplicable,
+                                );
+                            }
+                            // Only provide the help if its a local trait, otherwise it's not actionable.
+                            _ => {}
+                        }
+                        err.emit();
+                    },
+                );
+                false
+            } else {
+                true
+            }
+        })
+        .collect();
+
+    // Check the trait itself.
+    if trait_has_sized_self(tcx, trait_def_id) {
+        // We don't want to include the requirement from `Sized` itself to be `Sized` in the list.
+        let spans = get_sized_bounds(tcx, trait_def_id);
+        violations.push(ObjectSafetyViolation::SizedSelf(spans));
+    }
+    let spans = predicates_reference_self(tcx, trait_def_id, false);
+    if !spans.is_empty() {
+        violations.push(ObjectSafetyViolation::SupertraitSelf(spans));
+    }
+
+    violations.extend(
+        tcx.associated_items(trait_def_id)
+            .in_definition_order()
+            .filter(|item| item.kind == ty::AssocKind::Const)
+            .map(|item| ObjectSafetyViolation::AssocConst(item.ident.name, item.ident.span)),
+    );
+
+    debug!(
+        "object_safety_violations_for_trait(trait_def_id={:?}) = {:?}",
+        trait_def_id, violations
+    );
+
+    violations
+}
+
+fn get_sized_bounds(tcx: TyCtxt<'_>, trait_def_id: DefId) -> SmallVec<[Span; 1]> {
+    tcx.hir()
+        .get_if_local(trait_def_id)
+        .and_then(|node| match node {
+            hir::Node::Item(hir::Item {
+                kind: hir::ItemKind::Trait(.., generics, bounds, _),
+                ..
+            }) => Some(
+                generics
+                    .where_clause
+                    .predicates
+                    .iter()
+                    .filter_map(|pred| {
+                        match pred {
+                            hir::WherePredicate::BoundPredicate(pred)
+                                if pred.bounded_ty.hir_id.owner_def_id() == trait_def_id =>
+                            {
+                                // Fetch spans for trait bounds that are Sized:
+                                // `trait T where Self: Pred`
+                                Some(pred.bounds.iter().filter_map(|b| match b {
+                                    hir::GenericBound::Trait(
+                                        trait_ref,
+                                        hir::TraitBoundModifier::None,
+                                    ) if trait_has_sized_self(
+                                        tcx,
+                                        trait_ref.trait_ref.trait_def_id(),
+                                    ) =>
+                                    {
+                                        Some(trait_ref.span)
+                                    }
+                                    _ => None,
+                                }))
+                            }
+                            _ => None,
+                        }
+                    })
+                    .flatten()
+                    .chain(bounds.iter().filter_map(|b| match b {
+                        hir::GenericBound::Trait(trait_ref, hir::TraitBoundModifier::None)
+                            if trait_has_sized_self(tcx, trait_ref.trait_ref.trait_def_id()) =>
+                        {
+                            // Fetch spans for supertraits that are `Sized`: `trait T: Super`
+                            Some(trait_ref.span)
+                        }
+                        _ => None,
+                    }))
+                    .collect::<SmallVec<[Span; 1]>>(),
+            ),
+            _ => None,
+        })
+        .unwrap_or_else(SmallVec::new)
+}
+
+fn predicates_reference_self(
+    tcx: TyCtxt<'_>,
+    trait_def_id: DefId,
+    supertraits_only: bool,
+) -> SmallVec<[Span; 1]> {
+    let trait_ref = ty::Binder::dummy(ty::TraitRef::identity(tcx, trait_def_id));
+    let predicates = if supertraits_only {
+        tcx.super_predicates_of(trait_def_id)
+    } else {
+        tcx.predicates_of(trait_def_id)
+    };
+    let self_ty = tcx.types.self_param;
+    let has_self_ty = |t: Ty<'_>| t.walk().any(|t| t == self_ty);
+    predicates
+        .predicates
+        .iter()
+        .map(|(predicate, sp)| (predicate.subst_supertrait(tcx, &trait_ref), sp))
+        .filter_map(|(predicate, &sp)| {
+            match predicate {
+                ty::Predicate::Trait(ref data, _) => {
+                    // In the case of a trait predicate, we can skip the "self" type.
+                    if data.skip_binder().input_types().skip(1).any(has_self_ty) {
+                        Some(sp)
+                    } else {
+                        None
+                    }
+                }
+                ty::Predicate::Projection(ref data) => {
+                    // And similarly for projections. This should be redundant with
+                    // the previous check because any projection should have a
+                    // matching `Trait` predicate with the same inputs, but we do
+                    // the check to be safe.
+                    //
+                    // Note that we *do* allow projection *outputs* to contain
+                    // `self` (i.e., `trait Foo: Bar<Output=Self::Result> { type Result; }`),
+                    // we just require the user to specify *both* outputs
+                    // in the object type (i.e., `dyn Foo<Output=(), Result=()>`).
+                    //
+                    // This is ALT2 in issue #56288, see that for discussion of the
+                    // possible alternatives.
+                    if data
+                        .skip_binder()
+                        .projection_ty
+                        .trait_ref(tcx)
+                        .input_types()
+                        .skip(1)
+                        .any(has_self_ty)
+                    {
+                        Some(sp)
+                    } else {
+                        None
+                    }
+                }
+                ty::Predicate::WellFormed(..)
+                | ty::Predicate::ObjectSafe(..)
+                | ty::Predicate::TypeOutlives(..)
+                | ty::Predicate::RegionOutlives(..)
+                | ty::Predicate::ClosureKind(..)
+                | ty::Predicate::Subtype(..)
+                | ty::Predicate::ConstEvaluatable(..) => None,
+            }
+        })
+        .collect()
+}
+
+fn trait_has_sized_self(tcx: TyCtxt<'_>, trait_def_id: DefId) -> bool {
+    generics_require_sized_self(tcx, trait_def_id)
+}
+
+fn generics_require_sized_self(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+    let sized_def_id = match tcx.lang_items().sized_trait() {
+        Some(def_id) => def_id,
+        None => {
+            return false; /* No Sized trait, can't require it! */
+        }
+    };
+
+    // Search for a predicate like `Self : Sized` amongst the trait bounds.
+    let predicates = tcx.predicates_of(def_id);
+    let predicates = predicates.instantiate_identity(tcx).predicates;
+    elaborate_predicates(tcx, predicates).any(|predicate| match predicate {
+        ty::Predicate::Trait(ref trait_pred, _) => {
+            trait_pred.def_id() == sized_def_id && trait_pred.skip_binder().self_ty().is_param(0)
+        }
+        ty::Predicate::Projection(..)
+        | ty::Predicate::Subtype(..)
+        | ty::Predicate::RegionOutlives(..)
+        | ty::Predicate::WellFormed(..)
+        | ty::Predicate::ObjectSafe(..)
+        | ty::Predicate::ClosureKind(..)
+        | ty::Predicate::TypeOutlives(..)
+        | ty::Predicate::ConstEvaluatable(..) => false,
+    })
+}
+
+/// Returns `Some(_)` if this method makes the containing trait not object safe.
+fn object_safety_violation_for_method(
+    tcx: TyCtxt<'_>,
+    trait_def_id: DefId,
+    method: &ty::AssocItem,
+) -> Option<(MethodViolationCode, Span)> {
+    debug!("object_safety_violation_for_method({:?}, {:?})", trait_def_id, method);
+    // Any method that has a `Self : Sized` requisite is otherwise
+    // exempt from the regulations.
+    if generics_require_sized_self(tcx, method.def_id) {
+        return None;
+    }
+
+    let violation = virtual_call_violation_for_method(tcx, trait_def_id, method);
+    // Get an accurate span depending on the violation.
+    violation.map(|v| {
+        let node = tcx.hir().get_if_local(method.def_id);
+        let span = match (v, node) {
+            (MethodViolationCode::ReferencesSelfInput(arg), Some(node)) => node
+                .fn_decl()
+                .and_then(|decl| decl.inputs.get(arg + 1))
+                .map_or(method.ident.span, |arg| arg.span),
+            (MethodViolationCode::UndispatchableReceiver, Some(node)) => node
+                .fn_decl()
+                .and_then(|decl| decl.inputs.get(0))
+                .map_or(method.ident.span, |arg| arg.span),
+            (MethodViolationCode::ReferencesSelfOutput, Some(node)) => {
+                node.fn_decl().map_or(method.ident.span, |decl| decl.output.span())
+            }
+            _ => method.ident.span,
+        };
+        (v, span)
+    })
+}
+
+/// Returns `Some(_)` if this method cannot be called on a trait
+/// object; this does not necessarily imply that the enclosing trait
+/// is not object safe, because the method might have a where clause
+/// `Self:Sized`.
+fn virtual_call_violation_for_method<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_def_id: DefId,
+    method: &ty::AssocItem,
+) -> Option<MethodViolationCode> {
+    // The method's first parameter must be named `self`
+    if !method.method_has_self_argument {
+        // We'll attempt to provide a structured suggestion for `Self: Sized`.
+        let sugg =
+            tcx.hir().get_if_local(method.def_id).as_ref().and_then(|node| node.generics()).map(
+                |generics| match generics.where_clause.predicates {
+                    [] => (" where Self: Sized", generics.where_clause.span),
+                    [.., pred] => (", Self: Sized", pred.span().shrink_to_hi()),
+                },
+            );
+        return Some(MethodViolationCode::StaticMethod(sugg));
+    }
+
+    let sig = tcx.fn_sig(method.def_id);
+
+    for (i, input_ty) in sig.skip_binder().inputs()[1..].iter().enumerate() {
+        if contains_illegal_self_type_reference(tcx, trait_def_id, input_ty) {
+            return Some(MethodViolationCode::ReferencesSelfInput(i));
+        }
+    }
+    if contains_illegal_self_type_reference(tcx, trait_def_id, sig.output().skip_binder()) {
+        return Some(MethodViolationCode::ReferencesSelfOutput);
+    }
+
+    // We can't monomorphize things like `fn foo<A>(...)`.
+    let own_counts = tcx.generics_of(method.def_id).own_counts();
+    if own_counts.types + own_counts.consts != 0 {
+        return Some(MethodViolationCode::Generic);
+    }
+
+    if tcx
+        .predicates_of(method.def_id)
+        .predicates
+        .iter()
+        // A trait object can't claim to live more than the concrete type,
+        // so outlives predicates will always hold.
+        .cloned()
+        .filter(|(p, _)| p.to_opt_type_outlives().is_none())
+        .collect::<Vec<_>>()
+        // Do a shallow visit so that `contains_illegal_self_type_reference`
+        // may apply it's custom visiting.
+        .visit_tys_shallow(|t| contains_illegal_self_type_reference(tcx, trait_def_id, t))
+    {
+        return Some(MethodViolationCode::WhereClauseReferencesSelf);
+    }
+
+    let receiver_ty =
+        tcx.liberate_late_bound_regions(method.def_id, &sig.map_bound(|sig| sig.inputs()[0]));
+
+    // Until `unsized_locals` is fully implemented, `self: Self` can't be dispatched on.
+    // However, this is already considered object-safe. We allow it as a special case here.
+    // FIXME(mikeyhew) get rid of this `if` statement once `receiver_is_dispatchable` allows
+    // `Receiver: Unsize<Receiver[Self => dyn Trait]>`.
+    if receiver_ty != tcx.types.self_param {
+        if !receiver_is_dispatchable(tcx, method, receiver_ty) {
+            return Some(MethodViolationCode::UndispatchableReceiver);
+        } else {
+            // Do sanity check to make sure the receiver actually has the layout of a pointer.
+
+            use rustc::ty::layout::Abi;
+
+            let param_env = tcx.param_env(method.def_id);
+
+            let abi_of_ty = |ty: Ty<'tcx>| -> &Abi {
+                match tcx.layout_of(param_env.and(ty)) {
+                    Ok(layout) => &layout.abi,
+                    Err(err) => bug!("error: {}\n while computing layout for type {:?}", err, ty),
+                }
+            };
+
+            // e.g., `Rc<()>`
+            let unit_receiver_ty =
+                receiver_for_self_ty(tcx, receiver_ty, tcx.mk_unit(), method.def_id);
+
+            match abi_of_ty(unit_receiver_ty) {
+                &Abi::Scalar(..) => (),
+                abi => {
+                    tcx.sess.delay_span_bug(
+                        tcx.def_span(method.def_id),
+                        &format!(
+                            "receiver when `Self = ()` should have a Scalar ABI; found {:?}",
+                            abi
+                        ),
+                    );
+                }
+            }
+
+            let trait_object_ty =
+                object_ty_for_trait(tcx, trait_def_id, tcx.mk_region(ty::ReStatic));
+
+            // e.g., `Rc<dyn Trait>`
+            let trait_object_receiver =
+                receiver_for_self_ty(tcx, receiver_ty, trait_object_ty, method.def_id);
+
+            match abi_of_ty(trait_object_receiver) {
+                &Abi::ScalarPair(..) => (),
+                abi => {
+                    tcx.sess.delay_span_bug(
+                        tcx.def_span(method.def_id),
+                        &format!(
+                            "receiver when `Self = {}` should have a ScalarPair ABI; \
+                                 found {:?}",
+                            trait_object_ty, abi
+                        ),
+                    );
+                }
+            }
+        }
+    }
+
+    None
+}
+
+/// Performs a type substitution to produce the version of `receiver_ty` when `Self = self_ty`.
+/// For example, for `receiver_ty = Rc<Self>` and `self_ty = Foo`, returns `Rc<Foo>`.
+fn receiver_for_self_ty<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    receiver_ty: Ty<'tcx>,
+    self_ty: Ty<'tcx>,
+    method_def_id: DefId,
+) -> Ty<'tcx> {
+    debug!("receiver_for_self_ty({:?}, {:?}, {:?})", receiver_ty, self_ty, method_def_id);
+    let substs = InternalSubsts::for_item(tcx, method_def_id, |param, _| {
+        if param.index == 0 { self_ty.into() } else { tcx.mk_param_from_def(param) }
+    });
+
+    let result = receiver_ty.subst(tcx, substs);
+    debug!(
+        "receiver_for_self_ty({:?}, {:?}, {:?}) = {:?}",
+        receiver_ty, self_ty, method_def_id, result
+    );
+    result
+}
+
+/// Creates the object type for the current trait. For example,
+/// if the current trait is `Deref`, then this will be
+/// `dyn Deref<Target = Self::Target> + 'static`.
+fn object_ty_for_trait<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_def_id: DefId,
+    lifetime: ty::Region<'tcx>,
+) -> Ty<'tcx> {
+    debug!("object_ty_for_trait: trait_def_id={:?}", trait_def_id);
+
+    let trait_ref = ty::TraitRef::identity(tcx, trait_def_id);
+
+    let trait_predicate =
+        ty::ExistentialPredicate::Trait(ty::ExistentialTraitRef::erase_self_ty(tcx, trait_ref));
+
+    let mut associated_types = traits::supertraits(tcx, ty::Binder::dummy(trait_ref))
+        .flat_map(|super_trait_ref| {
+            tcx.associated_items(super_trait_ref.def_id())
+                .in_definition_order()
+                .map(move |item| (super_trait_ref, item))
+        })
+        .filter(|(_, item)| item.kind == ty::AssocKind::Type)
+        .collect::<Vec<_>>();
+
+    // existential predicates need to be in a specific order
+    associated_types.sort_by_cached_key(|(_, item)| tcx.def_path_hash(item.def_id));
+
+    let projection_predicates = associated_types.into_iter().map(|(super_trait_ref, item)| {
+        // We *can* get bound lifetimes here in cases like
+        // `trait MyTrait: for<'s> OtherTrait<&'s T, Output=bool>`.
+        //
+        // binder moved to (*)...
+        let super_trait_ref = super_trait_ref.skip_binder();
+        ty::ExistentialPredicate::Projection(ty::ExistentialProjection {
+            ty: tcx.mk_projection(item.def_id, super_trait_ref.substs),
+            item_def_id: item.def_id,
+            substs: super_trait_ref.substs,
+        })
+    });
+
+    let existential_predicates =
+        tcx.mk_existential_predicates(iter::once(trait_predicate).chain(projection_predicates));
+
+    let object_ty = tcx.mk_dynamic(
+        // (*) ... binder re-introduced here
+        ty::Binder::bind(existential_predicates),
+        lifetime,
+    );
+
+    debug!("object_ty_for_trait: object_ty=`{}`", object_ty);
+
+    object_ty
+}
+
+/// Checks the method's receiver (the `self` argument) can be dispatched on when `Self` is a
+/// trait object. We require that `DispatchableFromDyn` be implemented for the receiver type
+/// in the following way:
+/// - let `Receiver` be the type of the `self` argument, i.e `Self`, `&Self`, `Rc<Self>`,
+/// - require the following bound:
+///
+///   ```
+///   Receiver[Self => T]: DispatchFromDyn<Receiver[Self => dyn Trait]>
+///   ```
+///
+///   where `Foo[X => Y]` means "the same type as `Foo`, but with `X` replaced with `Y`"
+///   (substitution notation).
+///
+/// Some examples of receiver types and their required obligation:
+/// - `&'a mut self` requires `&'a mut Self: DispatchFromDyn<&'a mut dyn Trait>`,
+/// - `self: Rc<Self>` requires `Rc<Self>: DispatchFromDyn<Rc<dyn Trait>>`,
+/// - `self: Pin<Box<Self>>` requires `Pin<Box<Self>>: DispatchFromDyn<Pin<Box<dyn Trait>>>`.
+///
+/// The only case where the receiver is not dispatchable, but is still a valid receiver
+/// type (just not object-safe), is when there is more than one level of pointer indirection.
+/// E.g., `self: &&Self`, `self: &Rc<Self>`, `self: Box<Box<Self>>`. In these cases, there
+/// is no way, or at least no inexpensive way, to coerce the receiver from the version where
+/// `Self = dyn Trait` to the version where `Self = T`, where `T` is the unknown erased type
+/// contained by the trait object, because the object that needs to be coerced is behind
+/// a pointer.
+///
+/// In practice, we cannot use `dyn Trait` explicitly in the obligation because it would result
+/// in a new check that `Trait` is object safe, creating a cycle (until object_safe_for_dispatch
+/// is stabilized, see tracking issue https://github.com/rust-lang/rust/issues/43561).
+/// Instead, we fudge a little by introducing a new type parameter `U` such that
+/// `Self: Unsize<U>` and `U: Trait + ?Sized`, and use `U` in place of `dyn Trait`.
+/// Written as a chalk-style query:
+///
+///     forall (U: Trait + ?Sized) {
+///         if (Self: Unsize<U>) {
+///             Receiver: DispatchFromDyn<Receiver[Self => U]>
+///         }
+///     }
+///
+/// for `self: &'a mut Self`, this means `&'a mut Self: DispatchFromDyn<&'a mut U>`
+/// for `self: Rc<Self>`, this means `Rc<Self>: DispatchFromDyn<Rc<U>>`
+/// for `self: Pin<Box<Self>>`, this means `Pin<Box<Self>>: DispatchFromDyn<Pin<Box<U>>>`
+//
+// FIXME(mikeyhew) when unsized receivers are implemented as part of unsized rvalues, add this
+// fallback query: `Receiver: Unsize<Receiver[Self => U]>` to support receivers like
+// `self: Wrapper<Self>`.
+#[allow(dead_code)]
+fn receiver_is_dispatchable<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    method: &ty::AssocItem,
+    receiver_ty: Ty<'tcx>,
+) -> bool {
+    debug!("receiver_is_dispatchable: method = {:?}, receiver_ty = {:?}", method, receiver_ty);
+
+    let traits = (tcx.lang_items().unsize_trait(), tcx.lang_items().dispatch_from_dyn_trait());
+    let (unsize_did, dispatch_from_dyn_did) = if let (Some(u), Some(cu)) = traits {
+        (u, cu)
+    } else {
+        debug!("receiver_is_dispatchable: Missing Unsize or DispatchFromDyn traits");
+        return false;
+    };
+
+    // the type `U` in the query
+    // use a bogus type parameter to mimic a forall(U) query using u32::MAX for now.
+    // FIXME(mikeyhew) this is a total hack. Once object_safe_for_dispatch is stabilized, we can
+    // replace this with `dyn Trait`
+    let unsized_self_ty: Ty<'tcx> =
+        tcx.mk_ty_param(::std::u32::MAX, Symbol::intern("RustaceansAreAwesome"));
+
+    // `Receiver[Self => U]`
+    let unsized_receiver_ty =
+        receiver_for_self_ty(tcx, receiver_ty, unsized_self_ty, method.def_id);
+
+    // create a modified param env, with `Self: Unsize<U>` and `U: Trait` added to caller bounds
+    // `U: ?Sized` is already implied here
+    let param_env = {
+        let mut param_env = tcx.param_env(method.def_id);
+
+        // Self: Unsize<U>
+        let unsize_predicate = ty::TraitRef {
+            def_id: unsize_did,
+            substs: tcx.mk_substs_trait(tcx.types.self_param, &[unsized_self_ty.into()]),
+        }
+        .without_const()
+        .to_predicate();
+
+        // U: Trait<Arg1, ..., ArgN>
+        let trait_predicate = {
+            let substs =
+                InternalSubsts::for_item(tcx, method.container.assert_trait(), |param, _| {
+                    if param.index == 0 {
+                        unsized_self_ty.into()
+                    } else {
+                        tcx.mk_param_from_def(param)
+                    }
+                });
+
+            ty::TraitRef { def_id: unsize_did, substs }.without_const().to_predicate()
+        };
+
+        let caller_bounds: Vec<Predicate<'tcx>> = param_env
+            .caller_bounds
+            .iter()
+            .cloned()
+            .chain(iter::once(unsize_predicate))
+            .chain(iter::once(trait_predicate))
+            .collect();
+
+        param_env.caller_bounds = tcx.intern_predicates(&caller_bounds);
+
+        param_env
+    };
+
+    // Receiver: DispatchFromDyn<Receiver[Self => U]>
+    let obligation = {
+        let predicate = ty::TraitRef {
+            def_id: dispatch_from_dyn_did,
+            substs: tcx.mk_substs_trait(receiver_ty, &[unsized_receiver_ty.into()]),
+        }
+        .without_const()
+        .to_predicate();
+
+        Obligation::new(ObligationCause::dummy(), param_env, predicate)
+    };
+
+    tcx.infer_ctxt().enter(|ref infcx| {
+        // the receiver is dispatchable iff the obligation holds
+        infcx.predicate_must_hold_modulo_regions(&obligation)
+    })
+}
+
+fn contains_illegal_self_type_reference<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_def_id: DefId,
+    ty: Ty<'tcx>,
+) -> bool {
+    // This is somewhat subtle. In general, we want to forbid
+    // references to `Self` in the argument and return types,
+    // since the value of `Self` is erased. However, there is one
+    // exception: it is ok to reference `Self` in order to access
+    // an associated type of the current trait, since we retain
+    // the value of those associated types in the object type
+    // itself.
+    //
+    // ```rust
+    // trait SuperTrait {
+    //     type X;
+    // }
+    //
+    // trait Trait : SuperTrait {
+    //     type Y;
+    //     fn foo(&self, x: Self) // bad
+    //     fn foo(&self) -> Self // bad
+    //     fn foo(&self) -> Option<Self> // bad
+    //     fn foo(&self) -> Self::Y // OK, desugars to next example
+    //     fn foo(&self) -> <Self as Trait>::Y // OK
+    //     fn foo(&self) -> Self::X // OK, desugars to next example
+    //     fn foo(&self) -> <Self as SuperTrait>::X // OK
+    // }
+    // ```
+    //
+    // However, it is not as simple as allowing `Self` in a projected
+    // type, because there are illegal ways to use `Self` as well:
+    //
+    // ```rust
+    // trait Trait : SuperTrait {
+    //     ...
+    //     fn foo(&self) -> <Self as SomeOtherTrait>::X;
+    // }
+    // ```
+    //
+    // Here we will not have the type of `X` recorded in the
+    // object type, and we cannot resolve `Self as SomeOtherTrait`
+    // without knowing what `Self` is.
+
+    let mut supertraits: Option<Vec<ty::PolyTraitRef<'tcx>>> = None;
+    let mut error = false;
+    let self_ty = tcx.types.self_param;
+    ty.maybe_walk(|ty| {
+        match ty.kind {
+            ty::Param(_) => {
+                if ty == self_ty {
+                    error = true;
+                }
+
+                false // no contained types to walk
+            }
+
+            ty::Projection(ref data) => {
+                // This is a projected type `<Foo as SomeTrait>::X`.
+
+                // Compute supertraits of current trait lazily.
+                if supertraits.is_none() {
+                    let trait_ref = ty::Binder::bind(ty::TraitRef::identity(tcx, trait_def_id));
+                    supertraits = Some(traits::supertraits(tcx, trait_ref).collect());
+                }
+
+                // Determine whether the trait reference `Foo as
+                // SomeTrait` is in fact a supertrait of the
+                // current trait. In that case, this type is
+                // legal, because the type `X` will be specified
+                // in the object type.  Note that we can just use
+                // direct equality here because all of these types
+                // are part of the formal parameter listing, and
+                // hence there should be no inference variables.
+                let projection_trait_ref = ty::Binder::bind(data.trait_ref(tcx));
+                let is_supertrait_of_current_trait =
+                    supertraits.as_ref().unwrap().contains(&projection_trait_ref);
+
+                if is_supertrait_of_current_trait {
+                    false // do not walk contained types, do not report error, do collect $200
+                } else {
+                    true // DO walk contained types, POSSIBLY reporting an error
+                }
+            }
+
+            _ => true, // walk contained types, if any
+        }
+    });
+
+    error
+}
+
+pub fn provide(providers: &mut ty::query::Providers<'_>) {
+    *providers = ty::query::Providers { object_safety_violations, ..*providers };
+}
diff --git a/src/librustc_infer/traits/on_unimplemented.rs b/src/librustc_infer/traits/on_unimplemented.rs
new file mode 100644
index 0000000000..19260293ee
--- /dev/null
+++ b/src/librustc_infer/traits/on_unimplemented.rs
@@ -0,0 +1,383 @@
+use fmt_macros::{Parser, Piece, Position};
+
+use rustc::ty::{self, GenericParamDefKind, TyCtxt};
+use rustc::util::common::ErrorReported;
+
+use rustc_ast::ast::{MetaItem, NestedMetaItem};
+use rustc_attr as attr;
+use rustc_data_structures::fx::FxHashMap;
+use rustc_errors::struct_span_err;
+use rustc_hir::def_id::DefId;
+use rustc_span::symbol::{kw, sym, Symbol};
+use rustc_span::Span;
+
+#[derive(Clone, Debug)]
+pub struct OnUnimplementedFormatString(Symbol);
+
+#[derive(Debug)]
+pub struct OnUnimplementedDirective {
+    pub condition: Option<MetaItem>,
+    pub subcommands: Vec<OnUnimplementedDirective>,
+    pub message: Option<OnUnimplementedFormatString>,
+    pub label: Option<OnUnimplementedFormatString>,
+    pub note: Option<OnUnimplementedFormatString>,
+    pub enclosing_scope: Option<OnUnimplementedFormatString>,
+}
+
+#[derive(Default)]
+pub struct OnUnimplementedNote {
+    pub message: Option<String>,
+    pub label: Option<String>,
+    pub note: Option<String>,
+    pub enclosing_scope: Option<String>,
+}
+
+fn parse_error(
+    tcx: TyCtxt<'_>,
+    span: Span,
+    message: &str,
+    label: &str,
+    note: Option<&str>,
+) -> ErrorReported {
+    let mut diag = struct_span_err!(tcx.sess, span, E0232, "{}", message);
+    diag.span_label(span, label);
+    if let Some(note) = note {
+        diag.note(note);
+    }
+    diag.emit();
+    ErrorReported
+}
+
+impl<'tcx> OnUnimplementedDirective {
+    fn parse(
+        tcx: TyCtxt<'tcx>,
+        trait_def_id: DefId,
+        items: &[NestedMetaItem],
+        span: Span,
+        is_root: bool,
+    ) -> Result<Self, ErrorReported> {
+        let mut errored = false;
+        let mut item_iter = items.iter();
+
+        let condition = if is_root {
+            None
+        } else {
+            let cond = item_iter
+                .next()
+                .ok_or_else(|| {
+                    parse_error(
+                        tcx,
+                        span,
+                        "empty `on`-clause in `#[rustc_on_unimplemented]`",
+                        "empty on-clause here",
+                        None,
+                    )
+                })?
+                .meta_item()
+                .ok_or_else(|| {
+                    parse_error(
+                        tcx,
+                        span,
+                        "invalid `on`-clause in `#[rustc_on_unimplemented]`",
+                        "invalid on-clause here",
+                        None,
+                    )
+                })?;
+            attr::eval_condition(cond, &tcx.sess.parse_sess, &mut |_| true);
+            Some(cond.clone())
+        };
+
+        let mut message = None;
+        let mut label = None;
+        let mut note = None;
+        let mut enclosing_scope = None;
+        let mut subcommands = vec![];
+
+        let parse_value = |value_str| {
+            OnUnimplementedFormatString::try_parse(tcx, trait_def_id, value_str, span).map(Some)
+        };
+
+        for item in item_iter {
+            if item.check_name(sym::message) && message.is_none() {
+                if let Some(message_) = item.value_str() {
+                    message = parse_value(message_)?;
+                    continue;
+                }
+            } else if item.check_name(sym::label) && label.is_none() {
+                if let Some(label_) = item.value_str() {
+                    label = parse_value(label_)?;
+                    continue;
+                }
+            } else if item.check_name(sym::note) && note.is_none() {
+                if let Some(note_) = item.value_str() {
+                    note = parse_value(note_)?;
+                    continue;
+                }
+            } else if item.check_name(sym::enclosing_scope) && enclosing_scope.is_none() {
+                if let Some(enclosing_scope_) = item.value_str() {
+                    enclosing_scope = parse_value(enclosing_scope_)?;
+                    continue;
+                }
+            } else if item.check_name(sym::on)
+                && is_root
+                && message.is_none()
+                && label.is_none()
+                && note.is_none()
+            {
+                if let Some(items) = item.meta_item_list() {
+                    if let Ok(subcommand) =
+                        Self::parse(tcx, trait_def_id, &items, item.span(), false)
+                    {
+                        subcommands.push(subcommand);
+                    } else {
+                        errored = true;
+                    }
+                    continue;
+                }
+            }
+
+            // nothing found
+            parse_error(
+                tcx,
+                item.span(),
+                "this attribute must have a valid value",
+                "expected value here",
+                Some(r#"eg `#[rustc_on_unimplemented(message="foo")]`"#),
+            );
+        }
+
+        if errored {
+            Err(ErrorReported)
+        } else {
+            Ok(OnUnimplementedDirective {
+                condition,
+                subcommands,
+                message,
+                label,
+                note,
+                enclosing_scope,
+            })
+        }
+    }
+
+    pub fn of_item(
+        tcx: TyCtxt<'tcx>,
+        trait_def_id: DefId,
+        impl_def_id: DefId,
+    ) -> Result<Option<Self>, ErrorReported> {
+        let attrs = tcx.get_attrs(impl_def_id);
+
+        let attr = if let Some(item) = attr::find_by_name(&attrs, sym::rustc_on_unimplemented) {
+            item
+        } else {
+            return Ok(None);
+        };
+
+        let result = if let Some(items) = attr.meta_item_list() {
+            Self::parse(tcx, trait_def_id, &items, attr.span, true).map(Some)
+        } else if let Some(value) = attr.value_str() {
+            Ok(Some(OnUnimplementedDirective {
+                condition: None,
+                message: None,
+                subcommands: vec![],
+                label: Some(OnUnimplementedFormatString::try_parse(
+                    tcx,
+                    trait_def_id,
+                    value,
+                    attr.span,
+                )?),
+                note: None,
+                enclosing_scope: None,
+            }))
+        } else {
+            return Err(ErrorReported);
+        };
+        debug!("of_item({:?}/{:?}) = {:?}", trait_def_id, impl_def_id, result);
+        result
+    }
+
+    pub fn evaluate(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        trait_ref: ty::TraitRef<'tcx>,
+        options: &[(Symbol, Option<String>)],
+    ) -> OnUnimplementedNote {
+        let mut message = None;
+        let mut label = None;
+        let mut note = None;
+        let mut enclosing_scope = None;
+        info!("evaluate({:?}, trait_ref={:?}, options={:?})", self, trait_ref, options);
+
+        for command in self.subcommands.iter().chain(Some(self)).rev() {
+            if let Some(ref condition) = command.condition {
+                if !attr::eval_condition(condition, &tcx.sess.parse_sess, &mut |c| {
+                    c.ident().map_or(false, |ident| {
+                        options.contains(&(ident.name, c.value_str().map(|s| s.to_string())))
+                    })
+                }) {
+                    debug!("evaluate: skipping {:?} due to condition", command);
+                    continue;
+                }
+            }
+            debug!("evaluate: {:?} succeeded", command);
+            if let Some(ref message_) = command.message {
+                message = Some(message_.clone());
+            }
+
+            if let Some(ref label_) = command.label {
+                label = Some(label_.clone());
+            }
+
+            if let Some(ref note_) = command.note {
+                note = Some(note_.clone());
+            }
+
+            if let Some(ref enclosing_scope_) = command.enclosing_scope {
+                enclosing_scope = Some(enclosing_scope_.clone());
+            }
+        }
+
+        let options: FxHashMap<Symbol, String> =
+            options.iter().filter_map(|(k, v)| v.as_ref().map(|v| (*k, v.to_owned()))).collect();
+        OnUnimplementedNote {
+            label: label.map(|l| l.format(tcx, trait_ref, &options)),
+            message: message.map(|m| m.format(tcx, trait_ref, &options)),
+            note: note.map(|n| n.format(tcx, trait_ref, &options)),
+            enclosing_scope: enclosing_scope.map(|e_s| e_s.format(tcx, trait_ref, &options)),
+        }
+    }
+}
+
+impl<'tcx> OnUnimplementedFormatString {
+    fn try_parse(
+        tcx: TyCtxt<'tcx>,
+        trait_def_id: DefId,
+        from: Symbol,
+        err_sp: Span,
+    ) -> Result<Self, ErrorReported> {
+        let result = OnUnimplementedFormatString(from);
+        result.verify(tcx, trait_def_id, err_sp)?;
+        Ok(result)
+    }
+
+    fn verify(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        trait_def_id: DefId,
+        span: Span,
+    ) -> Result<(), ErrorReported> {
+        let name = tcx.item_name(trait_def_id);
+        let generics = tcx.generics_of(trait_def_id);
+        let s = self.0.as_str();
+        let parser = Parser::new(&s, None, vec![], false);
+        let mut result = Ok(());
+        for token in parser {
+            match token {
+                Piece::String(_) => (), // Normal string, no need to check it
+                Piece::NextArgument(a) => match a.position {
+                    // `{Self}` is allowed
+                    Position::ArgumentNamed(s) if s == kw::SelfUpper => (),
+                    // `{ThisTraitsName}` is allowed
+                    Position::ArgumentNamed(s) if s == name => (),
+                    // `{from_method}` is allowed
+                    Position::ArgumentNamed(s) if s == sym::from_method => (),
+                    // `{from_desugaring}` is allowed
+                    Position::ArgumentNamed(s) if s == sym::from_desugaring => (),
+                    // `{ItemContext}` is allowed
+                    Position::ArgumentNamed(s) if s == sym::item_context => (),
+                    // So is `{A}` if A is a type parameter
+                    Position::ArgumentNamed(s) => {
+                        match generics.params.iter().find(|param| param.name == s) {
+                            Some(_) => (),
+                            None => {
+                                struct_span_err!(
+                                    tcx.sess,
+                                    span,
+                                    E0230,
+                                    "there is no parameter `{}` on trait `{}`",
+                                    s,
+                                    name
+                                )
+                                .emit();
+                                result = Err(ErrorReported);
+                            }
+                        }
+                    }
+                    // `{:1}` and `{}` are not to be used
+                    Position::ArgumentIs(_) | Position::ArgumentImplicitlyIs(_) => {
+                        struct_span_err!(
+                            tcx.sess,
+                            span,
+                            E0231,
+                            "only named substitution parameters are allowed"
+                        )
+                        .emit();
+                        result = Err(ErrorReported);
+                    }
+                },
+            }
+        }
+
+        result
+    }
+
+    pub fn format(
+        &self,
+        tcx: TyCtxt<'tcx>,
+        trait_ref: ty::TraitRef<'tcx>,
+        options: &FxHashMap<Symbol, String>,
+    ) -> String {
+        let name = tcx.item_name(trait_ref.def_id);
+        let trait_str = tcx.def_path_str(trait_ref.def_id);
+        let generics = tcx.generics_of(trait_ref.def_id);
+        let generic_map = generics
+            .params
+            .iter()
+            .filter_map(|param| {
+                let value = match param.kind {
+                    GenericParamDefKind::Type { .. } | GenericParamDefKind::Const => {
+                        trait_ref.substs[param.index as usize].to_string()
+                    }
+                    GenericParamDefKind::Lifetime => return None,
+                };
+                let name = param.name;
+                Some((name, value))
+            })
+            .collect::<FxHashMap<Symbol, String>>();
+        let empty_string = String::new();
+
+        let s = self.0.as_str();
+        let parser = Parser::new(&s, None, vec![], false);
+        let item_context = (options.get(&sym::item_context)).unwrap_or(&empty_string);
+        parser
+            .map(|p| match p {
+                Piece::String(s) => s,
+                Piece::NextArgument(a) => match a.position {
+                    Position::ArgumentNamed(s) => match generic_map.get(&s) {
+                        Some(val) => val,
+                        None if s == name => &trait_str,
+                        None => {
+                            if let Some(val) = options.get(&s) {
+                                val
+                            } else if s == sym::from_desugaring || s == sym::from_method {
+                                // don't break messages using these two arguments incorrectly
+                                &empty_string
+                            } else if s == sym::item_context {
+                                &item_context
+                            } else {
+                                bug!(
+                                    "broken on_unimplemented {:?} for {:?}: \
+                                      no argument matching {:?}",
+                                    self.0,
+                                    trait_ref,
+                                    s
+                                )
+                            }
+                        }
+                    },
+                    _ => bug!("broken on_unimplemented {:?} - bad format arg", self.0),
+                },
+            })
+            .collect()
+    }
+}
diff --git a/src/librustc/traits/project.rs b/src/librustc_infer/traits/project.rs
similarity index 92%
rename from src/librustc/traits/project.rs
rename to src/librustc_infer/traits/project.rs
index 3085837335..78483cf657 100644
--- a/src/librustc/traits/project.rs
+++ b/src/librustc_infer/traits/project.rs
@@ -14,57 +14,16 @@ use super::{VtableClosureData, VtableFnPointerData, VtableGeneratorData, VtableI
 
 use crate::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use crate::infer::{InferCtxt, InferOk, LateBoundRegionConversionTime};
-use crate::ty::fold::{TypeFoldable, TypeFolder};
-use crate::ty::subst::{InternalSubsts, Subst};
-use crate::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, WithConstness};
+use rustc::ty::fold::{TypeFoldable, TypeFolder};
+use rustc::ty::subst::{InternalSubsts, Subst};
+use rustc::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, WithConstness};
+use rustc_ast::ast::Ident;
 use rustc_data_structures::snapshot_map::{Snapshot, SnapshotMap};
 use rustc_hir::def_id::DefId;
-use rustc_macros::HashStable;
 use rustc_span::symbol::sym;
 use rustc_span::DUMMY_SP;
-use syntax::ast::Ident;
-
-/// Depending on the stage of compilation, we want projection to be
-/// more or less conservative.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, HashStable)]
-pub enum Reveal {
-    /// At type-checking time, we refuse to project any associated
-    /// type that is marked `default`. Non-`default` ("final") types
-    /// are always projected. This is necessary in general for
-    /// soundness of specialization. However, we *could* allow
-    /// projections in fully-monomorphic cases. We choose not to,
-    /// because we prefer for `default type` to force the type
-    /// definition to be treated abstractly by any consumers of the
-    /// impl. Concretely, that means that the following example will
-    /// fail to compile:
-    ///
-    /// ```
-    /// trait Assoc {
-    ///     type Output;
-    /// }
-    ///
-    /// impl<T> Assoc for T {
-    ///     default type Output = bool;
-    /// }
-    ///
-    /// fn main() {
-    ///     let <() as Assoc>::Output = true;
-    /// }
-    UserFacing,
-
-    /// At codegen time, all monomorphic projections will succeed.
-    /// Also, `impl Trait` is normalized to the concrete type,
-    /// which has to be already collected by type-checking.
-    ///
-    /// NOTE: as `impl Trait`'s concrete type should *never*
-    /// be observable directly by the user, `Reveal::All`
-    /// should not be used by checks which may expose
-    /// type equality or type contents to the user.
-    /// There are some exceptions, e.g., around OIBITS and
-    /// transmute-checking, which expose some details, but
-    /// not the whole concrete type of the `impl Trait`.
-    All,
-}
+
+pub use rustc::traits::Reveal;
 
 pub type PolyProjectionObligation<'tcx> = Obligation<'tcx, ty::PolyProjectionPredicate<'tcx>>;
 
@@ -257,7 +216,22 @@ pub fn normalize<'a, 'b, 'tcx, T>(
 where
     T: TypeFoldable<'tcx>,
 {
-    normalize_with_depth(selcx, param_env, cause, 0, value)
+    let mut obligations = Vec::new();
+    let value = normalize_to(selcx, param_env, cause, value, &mut obligations);
+    Normalized { value, obligations }
+}
+
+pub fn normalize_to<'a, 'b, 'tcx, T>(
+    selcx: &'a mut SelectionContext<'b, 'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    cause: ObligationCause<'tcx>,
+    value: &T,
+    obligations: &mut Vec<PredicateObligation<'tcx>>,
+) -> T
+where
+    T: TypeFoldable<'tcx>,
+{
+    normalize_with_depth_to(selcx, param_env, cause, 0, value, obligations)
 }
 
 /// As `normalize`, but with a custom depth.
@@ -268,11 +242,27 @@ pub fn normalize_with_depth<'a, 'b, 'tcx, T>(
     depth: usize,
     value: &T,
 ) -> Normalized<'tcx, T>
+where
+    T: TypeFoldable<'tcx>,
+{
+    let mut obligations = Vec::new();
+    let value = normalize_with_depth_to(selcx, param_env, cause, depth, value, &mut obligations);
+    Normalized { value, obligations }
+}
+
+pub fn normalize_with_depth_to<'a, 'b, 'tcx, T>(
+    selcx: &'a mut SelectionContext<'b, 'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    cause: ObligationCause<'tcx>,
+    depth: usize,
+    value: &T,
+    obligations: &mut Vec<PredicateObligation<'tcx>>,
+) -> T
 where
     T: TypeFoldable<'tcx>,
 {
     debug!("normalize_with_depth(depth={}, value={:?})", depth, value);
-    let mut normalizer = AssocTypeNormalizer::new(selcx, param_env, cause, depth);
+    let mut normalizer = AssocTypeNormalizer::new(selcx, param_env, cause, depth, obligations);
     let result = normalizer.fold(value);
     debug!(
         "normalize_with_depth: depth={} result={:?} with {} obligations",
@@ -281,14 +271,14 @@ where
         normalizer.obligations.len()
     );
     debug!("normalize_with_depth: depth={} obligations={:?}", depth, normalizer.obligations);
-    Normalized { value: result, obligations: normalizer.obligations }
+    result
 }
 
 struct AssocTypeNormalizer<'a, 'b, 'tcx> {
     selcx: &'a mut SelectionContext<'b, 'tcx>,
     param_env: ty::ParamEnv<'tcx>,
     cause: ObligationCause<'tcx>,
-    obligations: Vec<PredicateObligation<'tcx>>,
+    obligations: &'a mut Vec<PredicateObligation<'tcx>>,
     depth: usize,
 }
 
@@ -298,8 +288,9 @@ impl<'a, 'b, 'tcx> AssocTypeNormalizer<'a, 'b, 'tcx> {
         param_env: ty::ParamEnv<'tcx>,
         cause: ObligationCause<'tcx>,
         depth: usize,
+        obligations: &'a mut Vec<PredicateObligation<'tcx>>,
     ) -> AssocTypeNormalizer<'a, 'b, 'tcx> {
-        AssocTypeNormalizer { selcx, param_env, cause, obligations: vec![], depth }
+        AssocTypeNormalizer { selcx, param_env, cause, obligations, depth }
     }
 
     fn fold<T: TypeFoldable<'tcx>>(&mut self, value: &T) -> T {
@@ -384,7 +375,7 @@ impl<'a, 'b, 'tcx> TypeFolder<'tcx> for AssocTypeNormalizer<'a, 'b, 'tcx> {
                 );
                 debug!(
                     "AssocTypeNormalizer: depth={} normalized {:?} to {:?}, \
-                        now with {} obligations",
+                     now with {} obligations",
                     self.depth,
                     ty,
                     normalized_ty,
@@ -412,7 +403,7 @@ pub type NormalizedTy<'tcx> = Normalized<'tcx, Ty<'tcx>>;
 
 impl<'tcx, T> Normalized<'tcx, T> {
     pub fn with<U>(self, value: U) -> Normalized<'tcx, U> {
-        Normalized { value: value, obligations: self.obligations }
+        Normalized { value, obligations: self.obligations }
     }
 }
 
@@ -482,8 +473,8 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
 
     debug!(
         "opt_normalize_projection_type(\
-           projection_ty={:?}, \
-           depth={})",
+         projection_ty={:?}, \
+         depth={})",
         projection_ty, depth
     );
 
@@ -495,26 +486,18 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
     // bounds. It might be the case that we want two distinct caches,
     // or else another kind of cache entry.
 
-    let cache_result = infcx.projection_cache.borrow_mut().try_start(cache_key);
+    let cache_result = infcx.inner.borrow_mut().projection_cache.try_start(cache_key);
     match cache_result {
         Ok(()) => {}
         Err(ProjectionCacheEntry::Ambiguous) => {
-            // If we found ambiguity the last time, that generally
-            // means we will continue to do so until some type in the
-            // key changes (and we know it hasn't, because we just
-            // fully resolved it). One exception though is closure
-            // types, which can transition from having a fixed kind to
-            // no kind with no visible change in the key.
-            //
-            // FIXME(#32286) refactor this so that closure type
-            // changes
+            // If we found ambiguity the last time, that means we will continue
+            // to do so until some type in the key changes (and we know it
+            // hasn't, because we just fully resolved it).
             debug!(
                 "opt_normalize_projection_type: \
-                    found cache entry: ambiguous"
+                 found cache entry: ambiguous"
             );
-            if !projection_ty.has_closure_types() {
-                return None;
-            }
+            return None;
         }
         Err(ProjectionCacheEntry::InProgress) => {
             // If while normalized A::B, we are asked to normalize
@@ -539,7 +522,7 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
 
             debug!(
                 "opt_normalize_projection_type: \
-                    found cache entry: in-progress"
+                 found cache entry: in-progress"
             );
 
             // But for now, let's classify this as an overflow:
@@ -562,14 +545,14 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
             // evaluations can causes ICEs (e.g., #43132).
             debug!(
                 "opt_normalize_projection_type: \
-                    found normalized ty `{:?}`",
+                 found normalized ty `{:?}`",
                 ty
             );
 
             // Once we have inferred everything we need to know, we
             // can ignore the `obligations` from that point on.
             if infcx.unresolved_type_vars(&ty.value).is_none() {
-                infcx.projection_cache.borrow_mut().complete_normalized(cache_key, &ty);
+                infcx.inner.borrow_mut().projection_cache.complete_normalized(cache_key, &ty);
             // No need to extend `obligations`.
             } else {
                 obligations.extend(ty.obligations);
@@ -587,7 +570,7 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
         Err(ProjectionCacheEntry::Error) => {
             debug!(
                 "opt_normalize_projection_type: \
-                    found error"
+                 found error"
             );
             let result = normalize_to_error(selcx, param_env, projection_ty, cause, depth);
             obligations.extend(result.obligations);
@@ -608,50 +591,55 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
 
             debug!(
                 "opt_normalize_projection_type: \
-                    projected_ty={:?} \
-                    depth={} \
-                    projected_obligations={:?}",
+                 projected_ty={:?} \
+                 depth={} \
+                 projected_obligations={:?}",
                 projected_ty, depth, projected_obligations
             );
 
             let result = if projected_ty.has_projections() {
-                let mut normalizer = AssocTypeNormalizer::new(selcx, param_env, cause, depth + 1);
+                let mut normalizer = AssocTypeNormalizer::new(
+                    selcx,
+                    param_env,
+                    cause,
+                    depth + 1,
+                    &mut projected_obligations,
+                );
                 let normalized_ty = normalizer.fold(&projected_ty);
 
                 debug!(
                     "opt_normalize_projection_type: \
-                        normalized_ty={:?} depth={}",
+                     normalized_ty={:?} depth={}",
                     normalized_ty, depth
                 );
 
-                projected_obligations.extend(normalizer.obligations);
                 Normalized { value: normalized_ty, obligations: projected_obligations }
             } else {
                 Normalized { value: projected_ty, obligations: projected_obligations }
             };
 
             let cache_value = prune_cache_value_obligations(infcx, &result);
-            infcx.projection_cache.borrow_mut().insert_ty(cache_key, cache_value);
+            infcx.inner.borrow_mut().projection_cache.insert_ty(cache_key, cache_value);
             obligations.extend(result.obligations);
             Some(result.value)
         }
         Ok(ProjectedTy::NoProgress(projected_ty)) => {
             debug!(
                 "opt_normalize_projection_type: \
-                    projected_ty={:?} no progress",
+                 projected_ty={:?} no progress",
                 projected_ty
             );
             let result = Normalized { value: projected_ty, obligations: vec![] };
-            infcx.projection_cache.borrow_mut().insert_ty(cache_key, result.clone());
+            infcx.inner.borrow_mut().projection_cache.insert_ty(cache_key, result.clone());
             // No need to extend `obligations`.
             Some(result.value)
         }
         Err(ProjectionTyError::TooManyCandidates) => {
             debug!(
                 "opt_normalize_projection_type: \
-                    too many candidates"
+                 too many candidates"
             );
-            infcx.projection_cache.borrow_mut().ambiguous(cache_key);
+            infcx.inner.borrow_mut().projection_cache.ambiguous(cache_key);
             None
         }
         Err(ProjectionTyError::TraitSelectionError(_)) => {
@@ -661,7 +649,7 @@ fn opt_normalize_projection_type<'a, 'b, 'tcx>(
             // Trait`, which when processed will cause the error to be
             // reported later
 
-            infcx.projection_cache.borrow_mut().error(cache_key);
+            infcx.inner.borrow_mut().projection_cache.error(cache_key);
             let result = normalize_to_error(selcx, param_env, projection_ty, cause, depth);
             obligations.extend(result.obligations);
             Some(result.value)
@@ -971,7 +959,7 @@ fn assemble_candidates_from_predicates<'cx, 'tcx, I>(
 
             debug!(
                 "assemble_candidates_from_predicates: candidate={:?} \
-                    is_match={} same_def_id={}",
+                 is_match={} same_def_id={}",
                 data, is_match, same_def_id
             );
 
@@ -1058,25 +1046,40 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
                     // an error when we confirm the candidate
                     // (which will ultimately lead to `normalize_to_error`
                     // being invoked).
-                    node_item.item.defaultness.has_value()
+                    false
                 } else {
+                    // If we're looking at a trait *impl*, the item is
+                    // specializable if the impl or the item are marked
+                    // `default`.
                     node_item.item.defaultness.is_default()
                         || super::util::impl_is_default(selcx.tcx(), node_item.node.def_id())
                 };
 
-                // Only reveal a specializable default if we're past type-checking
-                // and the obligations is monomorphic, otherwise passes such as
-                // transmute checking and polymorphic MIR optimizations could
-                // get a result which isn't correct for all monomorphizations.
-                if !is_default {
-                    true
-                } else if obligation.param_env.reveal == Reveal::All {
-                    // NOTE(eddyb) inference variables can resolve to parameters, so
-                    // assume `poly_trait_ref` isn't monomorphic, if it contains any.
-                    let poly_trait_ref = selcx.infcx().resolve_vars_if_possible(&poly_trait_ref);
-                    !poly_trait_ref.needs_infer() && !poly_trait_ref.needs_subst()
-                } else {
-                    false
+                match is_default {
+                    // Non-specializable items are always projectable
+                    false => true,
+
+                    // Only reveal a specializable default if we're past type-checking
+                    // and the obligation is monomorphic, otherwise passes such as
+                    // transmute checking and polymorphic MIR optimizations could
+                    // get a result which isn't correct for all monomorphizations.
+                    true if obligation.param_env.reveal == Reveal::All => {
+                        // NOTE(eddyb) inference variables can resolve to parameters, so
+                        // assume `poly_trait_ref` isn't monomorphic, if it contains any.
+                        let poly_trait_ref =
+                            selcx.infcx().resolve_vars_if_possible(&poly_trait_ref);
+                        !poly_trait_ref.needs_infer() && !poly_trait_ref.needs_subst()
+                    }
+
+                    true => {
+                        debug!(
+                            "assemble_candidates_from_impls: not eligible due to default: \
+                             assoc_ty={} predicate={}",
+                            selcx.tcx().def_path_str(node_item.item.def_id),
+                            obligation.predicate,
+                        );
+                        false
+                    }
                 }
             }
             super::VtableParam(..) => {
@@ -1233,7 +1236,7 @@ fn confirm_object_candidate<'cx, 'tcx>(
             None => {
                 debug!(
                     "confirm_object_candidate: no env-predicate \
-                        found in object type `{:?}`; ill-formed",
+                     found in object type `{:?}`; ill-formed",
                     object_ty
                 );
                 return Progress::error(selcx.tcx());
@@ -1288,7 +1291,7 @@ fn confirm_generator_candidate<'cx, 'tcx>(
                 substs: trait_ref.substs,
                 item_def_id: obligation.predicate.item_def_id,
             },
-            ty: ty,
+            ty,
         }
     });
 
@@ -1477,7 +1480,7 @@ fn assoc_ty_def(
         {
             return specialization_graph::NodeItem {
                 node: specialization_graph::Node::Impl(impl_def_id),
-                item,
+                item: *item,
             };
         }
     }
diff --git a/src/librustc_infer/traits/query/dropck_outlives.rs b/src/librustc_infer/traits/query/dropck_outlives.rs
new file mode 100644
index 0000000000..a1d7a2836e
--- /dev/null
+++ b/src/librustc_infer/traits/query/dropck_outlives.rs
@@ -0,0 +1,137 @@
+use crate::infer::at::At;
+use crate::infer::canonical::OriginalQueryValues;
+use crate::infer::InferOk;
+
+use rustc::ty::subst::GenericArg;
+use rustc::ty::{self, Ty, TyCtxt};
+
+pub use rustc::traits::query::{DropckOutlivesResult, DtorckConstraint};
+
+impl<'cx, 'tcx> At<'cx, 'tcx> {
+    /// Given a type `ty` of some value being dropped, computes a set
+    /// of "kinds" (types, regions) that must be outlive the execution
+    /// of the destructor. These basically correspond to data that the
+    /// destructor might access. This is used during regionck to
+    /// impose "outlives" constraints on any lifetimes referenced
+    /// within.
+    ///
+    /// The rules here are given by the "dropck" RFCs, notably [#1238]
+    /// and [#1327]. This is a fixed-point computation, where we
+    /// explore all the data that will be dropped (transitively) when
+    /// a value of type `ty` is dropped. For each type T that will be
+    /// dropped and which has a destructor, we must assume that all
+    /// the types/regions of T are live during the destructor, unless
+    /// they are marked with a special attribute (`#[may_dangle]`).
+    ///
+    /// [#1238]: https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md
+    /// [#1327]: https://github.com/rust-lang/rfcs/blob/master/text/1327-dropck-param-eyepatch.md
+    pub fn dropck_outlives(&self, ty: Ty<'tcx>) -> InferOk<'tcx, Vec<GenericArg<'tcx>>> {
+        debug!("dropck_outlives(ty={:?}, param_env={:?})", ty, self.param_env,);
+
+        // Quick check: there are a number of cases that we know do not require
+        // any destructor.
+        let tcx = self.infcx.tcx;
+        if trivial_dropck_outlives(tcx, ty) {
+            return InferOk { value: vec![], obligations: vec![] };
+        }
+
+        let mut orig_values = OriginalQueryValues::default();
+        let c_ty = self.infcx.canonicalize_query(&self.param_env.and(ty), &mut orig_values);
+        let span = self.cause.span;
+        debug!("c_ty = {:?}", c_ty);
+        if let Ok(result) = &tcx.dropck_outlives(c_ty) {
+            if result.is_proven() {
+                if let Ok(InferOk { value, obligations }) =
+                    self.infcx.instantiate_query_response_and_region_obligations(
+                        self.cause,
+                        self.param_env,
+                        &orig_values,
+                        result,
+                    )
+                {
+                    let ty = self.infcx.resolve_vars_if_possible(&ty);
+                    let kinds = value.into_kinds_reporting_overflows(tcx, span, ty);
+                    return InferOk { value: kinds, obligations };
+                }
+            }
+        }
+
+        // Errors and ambiuity in dropck occur in two cases:
+        // - unresolved inference variables at the end of typeck
+        // - non well-formed types where projections cannot be resolved
+        // Either of these should have created an error before.
+        tcx.sess.delay_span_bug(span, "dtorck encountered internal error");
+
+        InferOk { value: vec![], obligations: vec![] }
+    }
+}
+
+/// This returns true if the type `ty` is "trivial" for
+/// dropck-outlives -- that is, if it doesn't require any types to
+/// outlive. This is similar but not *quite* the same as the
+/// `needs_drop` test in the compiler already -- that is, for every
+/// type T for which this function return true, needs-drop would
+/// return `false`. But the reverse does not hold: in particular,
+/// `needs_drop` returns false for `PhantomData`, but it is not
+/// trivial for dropck-outlives.
+///
+/// Note also that `needs_drop` requires a "global" type (i.e., one
+/// with erased regions), but this function does not.
+pub fn trivial_dropck_outlives<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> bool {
+    match ty.kind {
+        // None of these types have a destructor and hence they do not
+        // require anything in particular to outlive the dtor's
+        // execution.
+        ty::Infer(ty::FreshIntTy(_))
+        | ty::Infer(ty::FreshFloatTy(_))
+        | ty::Bool
+        | ty::Int(_)
+        | ty::Uint(_)
+        | ty::Float(_)
+        | ty::Never
+        | ty::FnDef(..)
+        | ty::FnPtr(_)
+        | ty::Char
+        | ty::GeneratorWitness(..)
+        | ty::RawPtr(_)
+        | ty::Ref(..)
+        | ty::Str
+        | ty::Foreign(..)
+        | ty::Error => true,
+
+        // [T; N] and [T] have same properties as T.
+        ty::Array(ty, _) | ty::Slice(ty) => trivial_dropck_outlives(tcx, ty),
+
+        // (T1..Tn) and closures have same properties as T1..Tn --
+        // check if *any* of those are trivial.
+        ty::Tuple(ref tys) => tys.iter().all(|t| trivial_dropck_outlives(tcx, t.expect_ty())),
+        ty::Closure(def_id, ref substs) => {
+            substs.as_closure().upvar_tys(def_id, tcx).all(|t| trivial_dropck_outlives(tcx, t))
+        }
+
+        ty::Adt(def, _) => {
+            if Some(def.did) == tcx.lang_items().manually_drop() {
+                // `ManuallyDrop` never has a dtor.
+                true
+            } else {
+                // Other types might. Moreover, PhantomData doesn't
+                // have a dtor, but it is considered to own its
+                // content, so it is non-trivial. Unions can have `impl Drop`,
+                // and hence are non-trivial as well.
+                false
+            }
+        }
+
+        // The following *might* require a destructor: needs deeper inspection.
+        ty::Dynamic(..)
+        | ty::Projection(..)
+        | ty::Param(_)
+        | ty::Opaque(..)
+        | ty::Placeholder(..)
+        | ty::Infer(_)
+        | ty::Bound(..)
+        | ty::Generator(..) => false,
+
+        ty::UnnormalizedProjection(..) => bug!("only used with chalk-engine"),
+    }
+}
diff --git a/src/librustc/traits/query/evaluate_obligation.rs b/src/librustc_infer/traits/query/evaluate_obligation.rs
similarity index 100%
rename from src/librustc/traits/query/evaluate_obligation.rs
rename to src/librustc_infer/traits/query/evaluate_obligation.rs
diff --git a/src/librustc_infer/traits/query/method_autoderef.rs b/src/librustc_infer/traits/query/method_autoderef.rs
new file mode 100644
index 0000000000..80748c5ef3
--- /dev/null
+++ b/src/librustc_infer/traits/query/method_autoderef.rs
@@ -0,0 +1 @@
+pub use rustc::traits::query::{CandidateStep, MethodAutoderefBadTy, MethodAutoderefStepsResult};
diff --git a/src/librustc_infer/traits/query/mod.rs b/src/librustc_infer/traits/query/mod.rs
new file mode 100644
index 0000000000..77b5ec669a
--- /dev/null
+++ b/src/librustc_infer/traits/query/mod.rs
@@ -0,0 +1,15 @@
+//! Experimental types for the trait query interface. The methods
+//! defined in this module are all based on **canonicalization**,
+//! which makes a canonical query by replacing unbound inference
+//! variables and regions, so that results can be reused more broadly.
+//! The providers for the queries defined here can be found in
+//! `librustc_traits`.
+
+pub mod dropck_outlives;
+pub mod evaluate_obligation;
+pub mod method_autoderef;
+pub mod normalize;
+pub mod outlives_bounds;
+pub mod type_op;
+
+pub use rustc::traits::query::*;
diff --git a/src/librustc_infer/traits/query/normalize.rs b/src/librustc_infer/traits/query/normalize.rs
new file mode 100644
index 0000000000..4577e3d2e1
--- /dev/null
+++ b/src/librustc_infer/traits/query/normalize.rs
@@ -0,0 +1,189 @@
+//! Code for the 'normalization' query. This consists of a wrapper
+//! which folds deeply, invoking the underlying
+//! `normalize_projection_ty` query when it encounters projections.
+
+use crate::infer::at::At;
+use crate::infer::canonical::OriginalQueryValues;
+use crate::infer::{InferCtxt, InferOk};
+use crate::traits::project::Normalized;
+use crate::traits::{Obligation, ObligationCause, PredicateObligation, Reveal};
+use rustc::ty::fold::{TypeFoldable, TypeFolder};
+use rustc::ty::subst::Subst;
+use rustc::ty::{self, Ty, TyCtxt};
+
+use super::NoSolution;
+
+pub use rustc::traits::query::NormalizationResult;
+
+impl<'cx, 'tcx> At<'cx, 'tcx> {
+    /// Normalize `value` in the context of the inference context,
+    /// yielding a resulting type, or an error if `value` cannot be
+    /// normalized. If you don't care about regions, you should prefer
+    /// `normalize_erasing_regions`, which is more efficient.
+    ///
+    /// If the normalization succeeds and is unambiguous, returns back
+    /// the normalized value along with various outlives relations (in
+    /// the form of obligations that must be discharged).
+    ///
+    /// N.B., this will *eventually* be the main means of
+    /// normalizing, but for now should be used only when we actually
+    /// know that normalization will succeed, since error reporting
+    /// and other details are still "under development".
+    pub fn normalize<T>(&self, value: &T) -> Result<Normalized<'tcx, T>, NoSolution>
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        debug!(
+            "normalize::<{}>(value={:?}, param_env={:?})",
+            ::std::any::type_name::<T>(),
+            value,
+            self.param_env,
+        );
+        if !value.has_projections() {
+            return Ok(Normalized { value: value.clone(), obligations: vec![] });
+        }
+
+        let mut normalizer = QueryNormalizer {
+            infcx: self.infcx,
+            cause: self.cause,
+            param_env: self.param_env,
+            obligations: vec![],
+            error: false,
+            anon_depth: 0,
+        };
+
+        let value1 = value.fold_with(&mut normalizer);
+        if normalizer.error {
+            Err(NoSolution)
+        } else {
+            Ok(Normalized { value: value1, obligations: normalizer.obligations })
+        }
+    }
+}
+
+struct QueryNormalizer<'cx, 'tcx> {
+    infcx: &'cx InferCtxt<'cx, 'tcx>,
+    cause: &'cx ObligationCause<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    obligations: Vec<PredicateObligation<'tcx>>,
+    error: bool,
+    anon_depth: usize,
+}
+
+impl<'cx, 'tcx> TypeFolder<'tcx> for QueryNormalizer<'cx, 'tcx> {
+    fn tcx<'c>(&'c self) -> TyCtxt<'tcx> {
+        self.infcx.tcx
+    }
+
+    fn fold_ty(&mut self, ty: Ty<'tcx>) -> Ty<'tcx> {
+        if !ty.has_projections() {
+            return ty;
+        }
+
+        let ty = ty.super_fold_with(self);
+        match ty.kind {
+            ty::Opaque(def_id, substs) if !substs.has_escaping_bound_vars() => {
+                // (*)
+                // Only normalize `impl Trait` after type-checking, usually in codegen.
+                match self.param_env.reveal {
+                    Reveal::UserFacing => ty,
+
+                    Reveal::All => {
+                        let recursion_limit = *self.tcx().sess.recursion_limit.get();
+                        if self.anon_depth >= recursion_limit {
+                            let obligation = Obligation::with_depth(
+                                self.cause.clone(),
+                                recursion_limit,
+                                self.param_env,
+                                ty,
+                            );
+                            self.infcx.report_overflow_error(&obligation, true);
+                        }
+
+                        let generic_ty = self.tcx().type_of(def_id);
+                        let concrete_ty = generic_ty.subst(self.tcx(), substs);
+                        self.anon_depth += 1;
+                        if concrete_ty == ty {
+                            bug!(
+                                "infinite recursion generic_ty: {:#?}, substs: {:#?}, \
+                                 concrete_ty: {:#?}, ty: {:#?}",
+                                generic_ty,
+                                substs,
+                                concrete_ty,
+                                ty
+                            );
+                        }
+                        let folded_ty = self.fold_ty(concrete_ty);
+                        self.anon_depth -= 1;
+                        folded_ty
+                    }
+                }
+            }
+
+            ty::Projection(ref data) if !data.has_escaping_bound_vars() => {
+                // (*)
+                // (*) This is kind of hacky -- we need to be able to
+                // handle normalization within binders because
+                // otherwise we wind up a need to normalize when doing
+                // trait matching (since you can have a trait
+                // obligation like `for<'a> T::B : Fn(&'a int)`), but
+                // we can't normalize with bound regions in scope. So
+                // far now we just ignore binders but only normalize
+                // if all bound regions are gone (and then we still
+                // have to renormalize whenever we instantiate a
+                // binder). It would be better to normalize in a
+                // binding-aware fashion.
+
+                let tcx = self.infcx.tcx;
+
+                let mut orig_values = OriginalQueryValues::default();
+                // HACK(matthewjasper) `'static` is special-cased in selection,
+                // so we cannot canonicalize it.
+                let c_data = self
+                    .infcx
+                    .canonicalize_hr_query_hack(&self.param_env.and(*data), &mut orig_values);
+                debug!("QueryNormalizer: c_data = {:#?}", c_data);
+                debug!("QueryNormalizer: orig_values = {:#?}", orig_values);
+                match tcx.normalize_projection_ty(c_data) {
+                    Ok(result) => {
+                        // We don't expect ambiguity.
+                        if result.is_ambiguous() {
+                            self.error = true;
+                            return ty;
+                        }
+
+                        match self.infcx.instantiate_query_response_and_region_obligations(
+                            self.cause,
+                            self.param_env,
+                            &orig_values,
+                            &result,
+                        ) {
+                            Ok(InferOk { value: result, obligations }) => {
+                                debug!("QueryNormalizer: result = {:#?}", result);
+                                debug!("QueryNormalizer: obligations = {:#?}", obligations);
+                                self.obligations.extend(obligations);
+                                return result.normalized_ty;
+                            }
+
+                            Err(_) => {
+                                self.error = true;
+                                return ty;
+                            }
+                        }
+                    }
+
+                    Err(NoSolution) => {
+                        self.error = true;
+                        ty
+                    }
+                }
+            }
+
+            _ => ty,
+        }
+    }
+
+    fn fold_const(&mut self, constant: &'tcx ty::Const<'tcx>) -> &'tcx ty::Const<'tcx> {
+        constant.eval(self.infcx.tcx, self.param_env)
+    }
+}
diff --git a/src/librustc_infer/traits/query/outlives_bounds.rs b/src/librustc_infer/traits/query/outlives_bounds.rs
new file mode 100644
index 0000000000..eb32ebf5c4
--- /dev/null
+++ b/src/librustc_infer/traits/query/outlives_bounds.rs
@@ -0,0 +1,103 @@
+use crate::infer::canonical::OriginalQueryValues;
+use crate::infer::InferCtxt;
+use crate::traits::query::NoSolution;
+use crate::traits::{FulfillmentContext, ObligationCause, TraitEngine, TraitEngineExt};
+use rustc::ty::{self, Ty};
+use rustc_hir as hir;
+use rustc_span::source_map::Span;
+
+pub use rustc::traits::query::OutlivesBound;
+
+impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
+    /// Implied bounds are region relationships that we deduce
+    /// automatically. The idea is that (e.g.) a caller must check that a
+    /// function's argument types are well-formed immediately before
+    /// calling that fn, and hence the *callee* can assume that its
+    /// argument types are well-formed. This may imply certain relationships
+    /// between generic parameters. For example:
+    ///
+    ///     fn foo<'a,T>(x: &'a T)
+    ///
+    /// can only be called with a `'a` and `T` such that `&'a T` is WF.
+    /// For `&'a T` to be WF, `T: 'a` must hold. So we can assume `T: 'a`.
+    ///
+    /// # Parameters
+    ///
+    /// - `param_env`, the where-clauses in scope
+    /// - `body_id`, the body-id to use when normalizing assoc types.
+    ///   Note that this may cause outlives obligations to be injected
+    ///   into the inference context with this body-id.
+    /// - `ty`, the type that we are supposed to assume is WF.
+    /// - `span`, a span to use when normalizing, hopefully not important,
+    ///   might be useful if a `bug!` occurs.
+    pub fn implied_outlives_bounds(
+        &self,
+        param_env: ty::ParamEnv<'tcx>,
+        body_id: hir::HirId,
+        ty: Ty<'tcx>,
+        span: Span,
+    ) -> Vec<OutlivesBound<'tcx>> {
+        debug!("implied_outlives_bounds(ty = {:?})", ty);
+
+        let mut orig_values = OriginalQueryValues::default();
+        let key = self.canonicalize_query(&param_env.and(ty), &mut orig_values);
+        let result = match self.tcx.implied_outlives_bounds(key) {
+            Ok(r) => r,
+            Err(NoSolution) => {
+                self.tcx.sess.delay_span_bug(
+                    span,
+                    "implied_outlives_bounds failed to solve all obligations",
+                );
+                return vec![];
+            }
+        };
+        assert!(result.value.is_proven());
+
+        let result = self.instantiate_query_response_and_region_obligations(
+            &ObligationCause::misc(span, body_id),
+            param_env,
+            &orig_values,
+            &result,
+        );
+        debug!("implied_outlives_bounds for {:?}: {:#?}", ty, result);
+        let result = match result {
+            Ok(v) => v,
+            Err(_) => {
+                self.tcx.sess.delay_span_bug(span, "implied_outlives_bounds failed to instantiate");
+                return vec![];
+            }
+        };
+
+        // Instantiation may have produced new inference variables and constraints on those
+        // variables. Process these constraints.
+        let mut fulfill_cx = FulfillmentContext::new();
+        fulfill_cx.register_predicate_obligations(self, result.obligations);
+        if fulfill_cx.select_all_or_error(self).is_err() {
+            self.tcx.sess.delay_span_bug(
+                span,
+                "implied_outlives_bounds failed to solve obligations from instantiation",
+            );
+        }
+
+        result.value
+    }
+}
+
+pub fn explicit_outlives_bounds<'tcx>(
+    param_env: ty::ParamEnv<'tcx>,
+) -> impl Iterator<Item = OutlivesBound<'tcx>> + 'tcx {
+    debug!("explicit_outlives_bounds()");
+    param_env.caller_bounds.into_iter().filter_map(move |predicate| match predicate {
+        ty::Predicate::Projection(..)
+        | ty::Predicate::Trait(..)
+        | ty::Predicate::Subtype(..)
+        | ty::Predicate::WellFormed(..)
+        | ty::Predicate::ObjectSafe(..)
+        | ty::Predicate::ClosureKind(..)
+        | ty::Predicate::TypeOutlives(..)
+        | ty::Predicate::ConstEvaluatable(..) => None,
+        ty::Predicate::RegionOutlives(ref data) => data
+            .no_bound_vars()
+            .map(|ty::OutlivesPredicate(r_a, r_b)| OutlivesBound::RegionSubRegion(r_b, r_a)),
+    })
+}
diff --git a/src/librustc_infer/traits/query/type_op/ascribe_user_type.rs b/src/librustc_infer/traits/query/type_op/ascribe_user_type.rs
new file mode 100644
index 0000000000..b14b79f090
--- /dev/null
+++ b/src/librustc_infer/traits/query/type_op/ascribe_user_type.rs
@@ -0,0 +1,23 @@
+use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
+use crate::traits::query::Fallible;
+use rustc::ty::{ParamEnvAnd, TyCtxt};
+
+pub use rustc::traits::query::type_op::AscribeUserType;
+
+impl<'tcx> super::QueryTypeOp<'tcx> for AscribeUserType<'tcx> {
+    type QueryResponse = ();
+
+    fn try_fast_path(
+        _tcx: TyCtxt<'tcx>,
+        _key: &ParamEnvAnd<'tcx, Self>,
+    ) -> Option<Self::QueryResponse> {
+        None
+    }
+
+    fn perform_query(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, ()>> {
+        tcx.type_op_ascribe_user_type(canonicalized)
+    }
+}
diff --git a/src/librustc/traits/query/type_op/custom.rs b/src/librustc_infer/traits/query/type_op/custom.rs
similarity index 100%
rename from src/librustc/traits/query/type_op/custom.rs
rename to src/librustc_infer/traits/query/type_op/custom.rs
diff --git a/src/librustc_infer/traits/query/type_op/eq.rs b/src/librustc_infer/traits/query/type_op/eq.rs
new file mode 100644
index 0000000000..3b6fbc7d8d
--- /dev/null
+++ b/src/librustc_infer/traits/query/type_op/eq.rs
@@ -0,0 +1,23 @@
+use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
+use crate::traits::query::Fallible;
+use rustc::ty::{ParamEnvAnd, TyCtxt};
+
+pub use rustc::traits::query::type_op::Eq;
+
+impl<'tcx> super::QueryTypeOp<'tcx> for Eq<'tcx> {
+    type QueryResponse = ();
+
+    fn try_fast_path(
+        _tcx: TyCtxt<'tcx>,
+        key: &ParamEnvAnd<'tcx, Eq<'tcx>>,
+    ) -> Option<Self::QueryResponse> {
+        if key.value.a == key.value.b { Some(()) } else { None }
+    }
+
+    fn perform_query(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, ()>> {
+        tcx.type_op_eq(canonicalized)
+    }
+}
diff --git a/src/librustc/traits/query/type_op/implied_outlives_bounds.rs b/src/librustc_infer/traits/query/type_op/implied_outlives_bounds.rs
similarity index 96%
rename from src/librustc/traits/query/type_op/implied_outlives_bounds.rs
rename to src/librustc_infer/traits/query/type_op/implied_outlives_bounds.rs
index 6f45d76a8e..3dad546872 100644
--- a/src/librustc/traits/query/type_op/implied_outlives_bounds.rs
+++ b/src/librustc_infer/traits/query/type_op/implied_outlives_bounds.rs
@@ -1,7 +1,7 @@
 use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
 use crate::traits::query::outlives_bounds::OutlivesBound;
 use crate::traits::query::Fallible;
-use crate::ty::{ParamEnvAnd, Ty, TyCtxt};
+use rustc::ty::{ParamEnvAnd, Ty, TyCtxt};
 
 #[derive(Clone, Debug, HashStable, TypeFoldable, Lift)]
 pub struct ImpliedOutlivesBounds<'tcx> {
diff --git a/src/librustc_infer/traits/query/type_op/mod.rs b/src/librustc_infer/traits/query/type_op/mod.rs
new file mode 100644
index 0000000000..eb4c0a029e
--- /dev/null
+++ b/src/librustc_infer/traits/query/type_op/mod.rs
@@ -0,0 +1,136 @@
+use crate::infer::canonical::{
+    Canonicalized, CanonicalizedQueryResponse, OriginalQueryValues, QueryRegionConstraints,
+};
+use crate::infer::{InferCtxt, InferOk};
+use crate::traits::query::Fallible;
+use crate::traits::ObligationCause;
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::{ParamEnvAnd, TyCtxt};
+use std::fmt;
+use std::rc::Rc;
+
+pub mod ascribe_user_type;
+pub mod custom;
+pub mod eq;
+pub mod implied_outlives_bounds;
+pub mod normalize;
+pub mod outlives;
+pub mod prove_predicate;
+use self::prove_predicate::ProvePredicate;
+pub mod subtype;
+
+pub use rustc::traits::query::type_op::*;
+
+/// "Type ops" are used in NLL to perform some particular action and
+/// extract out the resulting region constraints (or an error if it
+/// cannot be completed).
+pub trait TypeOp<'tcx>: Sized + fmt::Debug {
+    type Output;
+
+    /// Processes the operation and all resulting obligations,
+    /// returning the final result along with any region constraints
+    /// (they will be given over to the NLL region solver).
+    fn fully_perform(
+        self,
+        infcx: &InferCtxt<'_, 'tcx>,
+    ) -> Fallible<(Self::Output, Option<Rc<QueryRegionConstraints<'tcx>>>)>;
+}
+
+/// "Query type ops" are type ops that are implemented using a
+/// [canonical query][c]. The `Self` type here contains the kernel of
+/// information needed to do the operation -- `TypeOp` is actually
+/// implemented for `ParamEnvAnd<Self>`, since we always need to bring
+/// along a parameter environment as well. For query type-ops, we will
+/// first canonicalize the key and then invoke the query on the tcx,
+/// which produces the resulting query region constraints.
+///
+/// [c]: https://rust-lang.github.io/rustc-guide/traits/canonicalization.html
+pub trait QueryTypeOp<'tcx>: fmt::Debug + Sized + TypeFoldable<'tcx> + 'tcx {
+    type QueryResponse: TypeFoldable<'tcx>;
+
+    /// Give query the option for a simple fast path that never
+    /// actually hits the tcx cache lookup etc. Return `Some(r)` with
+    /// a final result or `None` to do the full path.
+    fn try_fast_path(
+        tcx: TyCtxt<'tcx>,
+        key: &ParamEnvAnd<'tcx, Self>,
+    ) -> Option<Self::QueryResponse>;
+
+    /// Performs the actual query with the canonicalized key -- the
+    /// real work happens here. This method is not given an `infcx`
+    /// because it shouldn't need one -- and if it had access to one,
+    /// it might do things like invoke `sub_regions`, which would be
+    /// bad, because it would create subregion relationships that are
+    /// not captured in the return value.
+    fn perform_query(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self::QueryResponse>>;
+
+    fn fully_perform_into(
+        query_key: ParamEnvAnd<'tcx, Self>,
+        infcx: &InferCtxt<'_, 'tcx>,
+        output_query_region_constraints: &mut QueryRegionConstraints<'tcx>,
+    ) -> Fallible<Self::QueryResponse> {
+        if let Some(result) = QueryTypeOp::try_fast_path(infcx.tcx, &query_key) {
+            return Ok(result);
+        }
+
+        // FIXME(#33684) -- We need to use
+        // `canonicalize_hr_query_hack` here because of things
+        // like the subtype query, which go awry around
+        // `'static` otherwise.
+        let mut canonical_var_values = OriginalQueryValues::default();
+        let canonical_self =
+            infcx.canonicalize_hr_query_hack(&query_key, &mut canonical_var_values);
+        let canonical_result = Self::perform_query(infcx.tcx, canonical_self)?;
+
+        let param_env = query_key.param_env;
+
+        let InferOk { value, obligations } = infcx
+            .instantiate_nll_query_response_and_region_obligations(
+                &ObligationCause::dummy(),
+                param_env,
+                &canonical_var_values,
+                canonical_result,
+                output_query_region_constraints,
+            )?;
+
+        // Typically, instantiating NLL query results does not
+        // create obligations. However, in some cases there
+        // are unresolved type variables, and unify them *can*
+        // create obligations. In that case, we have to go
+        // fulfill them. We do this via a (recursive) query.
+        for obligation in obligations {
+            let () = ProvePredicate::fully_perform_into(
+                obligation.param_env.and(ProvePredicate::new(obligation.predicate)),
+                infcx,
+                output_query_region_constraints,
+            )?;
+        }
+
+        Ok(value)
+    }
+}
+
+impl<'tcx, Q> TypeOp<'tcx> for ParamEnvAnd<'tcx, Q>
+where
+    Q: QueryTypeOp<'tcx>,
+{
+    type Output = Q::QueryResponse;
+
+    fn fully_perform(
+        self,
+        infcx: &InferCtxt<'_, 'tcx>,
+    ) -> Fallible<(Self::Output, Option<Rc<QueryRegionConstraints<'tcx>>>)> {
+        let mut region_constraints = QueryRegionConstraints::default();
+        let r = Q::fully_perform_into(self, infcx, &mut region_constraints)?;
+
+        // Promote the final query-region-constraints into a
+        // (optional) ref-counted vector:
+        let opt_qrc =
+            if region_constraints.is_empty() { None } else { Some(Rc::new(region_constraints)) };
+
+        Ok((r, opt_qrc))
+    }
+}
diff --git a/src/librustc_infer/traits/query/type_op/normalize.rs b/src/librustc_infer/traits/query/type_op/normalize.rs
new file mode 100644
index 0000000000..d2eec53bf8
--- /dev/null
+++ b/src/librustc_infer/traits/query/type_op/normalize.rs
@@ -0,0 +1,68 @@
+use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
+use crate::traits::query::Fallible;
+use rustc::ty::fold::TypeFoldable;
+use rustc::ty::{self, Lift, ParamEnvAnd, Ty, TyCtxt};
+use std::fmt;
+
+pub use rustc::traits::query::type_op::Normalize;
+
+impl<'tcx, T> super::QueryTypeOp<'tcx> for Normalize<T>
+where
+    T: Normalizable<'tcx> + 'tcx,
+{
+    type QueryResponse = T;
+
+    fn try_fast_path(_tcx: TyCtxt<'tcx>, key: &ParamEnvAnd<'tcx, Self>) -> Option<T> {
+        if !key.value.value.has_projections() { Some(key.value.value) } else { None }
+    }
+
+    fn perform_query(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self::QueryResponse>> {
+        T::type_op_method(tcx, canonicalized)
+    }
+}
+
+pub trait Normalizable<'tcx>: fmt::Debug + TypeFoldable<'tcx> + Lift<'tcx> + Copy {
+    fn type_op_method(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>>;
+}
+
+impl Normalizable<'tcx> for Ty<'tcx> {
+    fn type_op_method(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
+        tcx.type_op_normalize_ty(canonicalized)
+    }
+}
+
+impl Normalizable<'tcx> for ty::Predicate<'tcx> {
+    fn type_op_method(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
+        tcx.type_op_normalize_predicate(canonicalized)
+    }
+}
+
+impl Normalizable<'tcx> for ty::PolyFnSig<'tcx> {
+    fn type_op_method(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
+        tcx.type_op_normalize_poly_fn_sig(canonicalized)
+    }
+}
+
+impl Normalizable<'tcx> for ty::FnSig<'tcx> {
+    fn type_op_method(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Normalize<Self>>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, Self>> {
+        tcx.type_op_normalize_fn_sig(canonicalized)
+    }
+}
diff --git a/src/librustc/traits/query/type_op/outlives.rs b/src/librustc_infer/traits/query/type_op/outlives.rs
similarity index 97%
rename from src/librustc/traits/query/type_op/outlives.rs
rename to src/librustc_infer/traits/query/type_op/outlives.rs
index 35afa63796..b94948cffd 100644
--- a/src/librustc/traits/query/type_op/outlives.rs
+++ b/src/librustc_infer/traits/query/type_op/outlives.rs
@@ -1,7 +1,7 @@
 use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
 use crate::traits::query::dropck_outlives::{trivial_dropck_outlives, DropckOutlivesResult};
 use crate::traits::query::Fallible;
-use crate::ty::{ParamEnvAnd, Ty, TyCtxt};
+use rustc::ty::{ParamEnvAnd, Ty, TyCtxt};
 
 #[derive(Copy, Clone, Debug, HashStable, TypeFoldable, Lift)]
 pub struct DropckOutlives<'tcx> {
diff --git a/src/librustc/traits/query/type_op/prove_predicate.rs b/src/librustc_infer/traits/query/type_op/prove_predicate.rs
similarity index 78%
rename from src/librustc/traits/query/type_op/prove_predicate.rs
rename to src/librustc_infer/traits/query/type_op/prove_predicate.rs
index 15870ec95d..8c68f7db9e 100644
--- a/src/librustc/traits/query/type_op/prove_predicate.rs
+++ b/src/librustc_infer/traits/query/type_op/prove_predicate.rs
@@ -1,17 +1,8 @@
 use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
 use crate::traits::query::Fallible;
-use crate::ty::{ParamEnvAnd, Predicate, TyCtxt};
+use rustc::ty::{ParamEnvAnd, Predicate, TyCtxt};
 
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, TypeFoldable, Lift)]
-pub struct ProvePredicate<'tcx> {
-    pub predicate: Predicate<'tcx>,
-}
-
-impl<'tcx> ProvePredicate<'tcx> {
-    pub fn new(predicate: Predicate<'tcx>) -> Self {
-        ProvePredicate { predicate }
-    }
-}
+pub use rustc::traits::query::type_op::ProvePredicate;
 
 impl<'tcx> super::QueryTypeOp<'tcx> for ProvePredicate<'tcx> {
     type QueryResponse = ();
diff --git a/src/librustc_infer/traits/query/type_op/subtype.rs b/src/librustc_infer/traits/query/type_op/subtype.rs
new file mode 100644
index 0000000000..053411b0ca
--- /dev/null
+++ b/src/librustc_infer/traits/query/type_op/subtype.rs
@@ -0,0 +1,20 @@
+use crate::infer::canonical::{Canonicalized, CanonicalizedQueryResponse};
+use crate::traits::query::Fallible;
+use rustc::ty::{ParamEnvAnd, TyCtxt};
+
+pub use rustc::traits::query::type_op::Subtype;
+
+impl<'tcx> super::QueryTypeOp<'tcx> for Subtype<'tcx> {
+    type QueryResponse = ();
+
+    fn try_fast_path(_tcx: TyCtxt<'tcx>, key: &ParamEnvAnd<'tcx, Self>) -> Option<()> {
+        if key.value.sub == key.value.sup { Some(()) } else { None }
+    }
+
+    fn perform_query(
+        tcx: TyCtxt<'tcx>,
+        canonicalized: Canonicalized<'tcx, ParamEnvAnd<'tcx, Self>>,
+    ) -> Fallible<CanonicalizedQueryResponse<'tcx, ()>> {
+        tcx.type_op_subtype(canonicalized)
+    }
+}
diff --git a/src/librustc_infer/traits/select.rs b/src/librustc_infer/traits/select.rs
new file mode 100644
index 0000000000..c0d8f3cfd4
--- /dev/null
+++ b/src/librustc_infer/traits/select.rs
@@ -0,0 +1,3823 @@
+// ignore-tidy-filelength
+
+//! Candidate selection. See the [rustc guide] for more information on how this works.
+//!
+//! [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/resolution.html#selection
+
+use self::EvaluationResult::*;
+use self::SelectionCandidate::*;
+
+use super::coherence::{self, Conflict};
+use super::project;
+use super::project::{
+    normalize_with_depth, normalize_with_depth_to, Normalized, ProjectionCacheKey,
+};
+use super::util;
+use super::util::{closure_trait_ref_and_return_type, predicate_for_trait_def};
+use super::wf;
+use super::DerivedObligationCause;
+use super::Selection;
+use super::SelectionResult;
+use super::TraitNotObjectSafe;
+use super::TraitQueryMode;
+use super::{BuiltinDerivedObligation, ImplDerivedObligation, ObligationCauseCode};
+use super::{ObjectCastObligation, Obligation};
+use super::{ObligationCause, PredicateObligation, TraitObligation};
+use super::{OutputTypeParameterMismatch, Overflow, SelectionError, Unimplemented};
+use super::{
+    VtableAutoImpl, VtableBuiltin, VtableClosure, VtableFnPointer, VtableGenerator, VtableImpl,
+    VtableObject, VtableParam, VtableTraitAlias,
+};
+use super::{
+    VtableAutoImplData, VtableBuiltinData, VtableClosureData, VtableFnPointerData,
+    VtableGeneratorData, VtableImplData, VtableObjectData, VtableTraitAliasData,
+};
+
+use crate::infer::{CombinedSnapshot, InferCtxt, InferOk, PlaceholderMap, TypeFreshener};
+use rustc::dep_graph::{DepKind, DepNodeIndex};
+use rustc::middle::lang_items;
+use rustc::ty::fast_reject;
+use rustc::ty::relate::TypeRelation;
+use rustc::ty::subst::{Subst, SubstsRef};
+use rustc::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
+use rustc_ast::attr;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_index::bit_set::GrowableBitSet;
+use rustc_span::symbol::sym;
+use rustc_target::spec::abi::Abi;
+
+use std::cell::{Cell, RefCell};
+use std::cmp;
+use std::fmt::{self, Display};
+use std::iter;
+use std::rc::Rc;
+
+pub use rustc::traits::select::*;
+
+pub struct SelectionContext<'cx, 'tcx> {
+    infcx: &'cx InferCtxt<'cx, 'tcx>,
+
+    /// Freshener used specifically for entries on the obligation
+    /// stack. This ensures that all entries on the stack at one time
+    /// will have the same set of placeholder entries, which is
+    /// important for checking for trait bounds that recursively
+    /// require themselves.
+    freshener: TypeFreshener<'cx, 'tcx>,
+
+    /// If `true`, indicates that the evaluation should be conservative
+    /// and consider the possibility of types outside this crate.
+    /// This comes up primarily when resolving ambiguity. Imagine
+    /// there is some trait reference `$0: Bar` where `$0` is an
+    /// inference variable. If `intercrate` is true, then we can never
+    /// say for sure that this reference is not implemented, even if
+    /// there are *no impls at all for `Bar`*, because `$0` could be
+    /// bound to some type that in a downstream crate that implements
+    /// `Bar`. This is the suitable mode for coherence. Elsewhere,
+    /// though, we set this to false, because we are only interested
+    /// in types that the user could actually have written --- in
+    /// other words, we consider `$0: Bar` to be unimplemented if
+    /// there is no type that the user could *actually name* that
+    /// would satisfy it. This avoids crippling inference, basically.
+    intercrate: bool,
+
+    intercrate_ambiguity_causes: Option<Vec<IntercrateAmbiguityCause>>,
+
+    /// Controls whether or not to filter out negative impls when selecting.
+    /// This is used in librustdoc to distinguish between the lack of an impl
+    /// and a negative impl
+    allow_negative_impls: bool,
+
+    /// The mode that trait queries run in, which informs our error handling
+    /// policy. In essence, canonicalized queries need their errors propagated
+    /// rather than immediately reported because we do not have accurate spans.
+    query_mode: TraitQueryMode,
+}
+
+#[derive(Clone, Debug)]
+pub enum IntercrateAmbiguityCause {
+    DownstreamCrate { trait_desc: String, self_desc: Option<String> },
+    UpstreamCrateUpdate { trait_desc: String, self_desc: Option<String> },
+    ReservationImpl { message: String },
+}
+
+impl IntercrateAmbiguityCause {
+    /// Emits notes when the overlap is caused by complex intercrate ambiguities.
+    /// See #23980 for details.
+    pub fn add_intercrate_ambiguity_hint(&self, err: &mut rustc_errors::DiagnosticBuilder<'_>) {
+        err.note(&self.intercrate_ambiguity_hint());
+    }
+
+    pub fn intercrate_ambiguity_hint(&self) -> String {
+        match self {
+            &IntercrateAmbiguityCause::DownstreamCrate { ref trait_desc, ref self_desc } => {
+                let self_desc = if let &Some(ref ty) = self_desc {
+                    format!(" for type `{}`", ty)
+                } else {
+                    String::new()
+                };
+                format!("downstream crates may implement trait `{}`{}", trait_desc, self_desc)
+            }
+            &IntercrateAmbiguityCause::UpstreamCrateUpdate { ref trait_desc, ref self_desc } => {
+                let self_desc = if let &Some(ref ty) = self_desc {
+                    format!(" for type `{}`", ty)
+                } else {
+                    String::new()
+                };
+                format!(
+                    "upstream crates may add a new impl of trait `{}`{} \
+                     in future versions",
+                    trait_desc, self_desc
+                )
+            }
+            &IntercrateAmbiguityCause::ReservationImpl { ref message } => message.clone(),
+        }
+    }
+}
+
+// A stack that walks back up the stack frame.
+struct TraitObligationStack<'prev, 'tcx> {
+    obligation: &'prev TraitObligation<'tcx>,
+
+    /// The trait ref from `obligation` but "freshened" with the
+    /// selection-context's freshener. Used to check for recursion.
+    fresh_trait_ref: ty::PolyTraitRef<'tcx>,
+
+    /// Starts out equal to `depth` -- if, during evaluation, we
+    /// encounter a cycle, then we will set this flag to the minimum
+    /// depth of that cycle for all participants in the cycle. These
+    /// participants will then forego caching their results. This is
+    /// not the most efficient solution, but it addresses #60010. The
+    /// problem we are trying to prevent:
+    ///
+    /// - If you have `A: AutoTrait` requires `B: AutoTrait` and `C: NonAutoTrait`
+    /// - `B: AutoTrait` requires `A: AutoTrait` (coinductive cycle, ok)
+    /// - `C: NonAutoTrait` requires `A: AutoTrait` (non-coinductive cycle, not ok)
+    ///
+    /// you don't want to cache that `B: AutoTrait` or `A: AutoTrait`
+    /// is `EvaluatedToOk`; this is because they were only considered
+    /// ok on the premise that if `A: AutoTrait` held, but we indeed
+    /// encountered a problem (later on) with `A: AutoTrait. So we
+    /// currently set a flag on the stack node for `B: AutoTrait` (as
+    /// well as the second instance of `A: AutoTrait`) to suppress
+    /// caching.
+    ///
+    /// This is a simple, targeted fix. A more-performant fix requires
+    /// deeper changes, but would permit more caching: we could
+    /// basically defer caching until we have fully evaluated the
+    /// tree, and then cache the entire tree at once. In any case, the
+    /// performance impact here shouldn't be so horrible: every time
+    /// this is hit, we do cache at least one trait, so we only
+    /// evaluate each member of a cycle up to N times, where N is the
+    /// length of the cycle. This means the performance impact is
+    /// bounded and we shouldn't have any terrible worst-cases.
+    reached_depth: Cell<usize>,
+
+    previous: TraitObligationStackList<'prev, 'tcx>,
+
+    /// The number of parent frames plus one (thus, the topmost frame has depth 1).
+    depth: usize,
+
+    /// The depth-first number of this node in the search graph -- a
+    /// pre-order index. Basically, a freshly incremented counter.
+    dfn: usize,
+}
+
+struct SelectionCandidateSet<'tcx> {
+    // A list of candidates that definitely apply to the current
+    // obligation (meaning: types unify).
+    vec: Vec<SelectionCandidate<'tcx>>,
+
+    // If `true`, then there were candidates that might or might
+    // not have applied, but we couldn't tell. This occurs when some
+    // of the input types are type variables, in which case there are
+    // various "builtin" rules that might or might not trigger.
+    ambiguous: bool,
+}
+
+#[derive(PartialEq, Eq, Debug, Clone)]
+struct EvaluatedCandidate<'tcx> {
+    candidate: SelectionCandidate<'tcx>,
+    evaluation: EvaluationResult,
+}
+
+/// When does the builtin impl for `T: Trait` apply?
+enum BuiltinImplConditions<'tcx> {
+    /// The impl is conditional on `T1, T2, ...: Trait`.
+    Where(ty::Binder<Vec<Ty<'tcx>>>),
+    /// There is no built-in impl. There may be some other
+    /// candidate (a where-clause or user-defined impl).
+    None,
+    /// It is unknown whether there is an impl.
+    Ambiguous,
+}
+
+impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
+    pub fn new(infcx: &'cx InferCtxt<'cx, 'tcx>) -> SelectionContext<'cx, 'tcx> {
+        SelectionContext {
+            infcx,
+            freshener: infcx.freshener(),
+            intercrate: false,
+            intercrate_ambiguity_causes: None,
+            allow_negative_impls: false,
+            query_mode: TraitQueryMode::Standard,
+        }
+    }
+
+    pub fn intercrate(infcx: &'cx InferCtxt<'cx, 'tcx>) -> SelectionContext<'cx, 'tcx> {
+        SelectionContext {
+            infcx,
+            freshener: infcx.freshener(),
+            intercrate: true,
+            intercrate_ambiguity_causes: None,
+            allow_negative_impls: false,
+            query_mode: TraitQueryMode::Standard,
+        }
+    }
+
+    pub fn with_negative(
+        infcx: &'cx InferCtxt<'cx, 'tcx>,
+        allow_negative_impls: bool,
+    ) -> SelectionContext<'cx, 'tcx> {
+        debug!("with_negative({:?})", allow_negative_impls);
+        SelectionContext {
+            infcx,
+            freshener: infcx.freshener(),
+            intercrate: false,
+            intercrate_ambiguity_causes: None,
+            allow_negative_impls,
+            query_mode: TraitQueryMode::Standard,
+        }
+    }
+
+    pub fn with_query_mode(
+        infcx: &'cx InferCtxt<'cx, 'tcx>,
+        query_mode: TraitQueryMode,
+    ) -> SelectionContext<'cx, 'tcx> {
+        debug!("with_query_mode({:?})", query_mode);
+        SelectionContext {
+            infcx,
+            freshener: infcx.freshener(),
+            intercrate: false,
+            intercrate_ambiguity_causes: None,
+            allow_negative_impls: false,
+            query_mode,
+        }
+    }
+
+    /// Enables tracking of intercrate ambiguity causes. These are
+    /// used in coherence to give improved diagnostics. We don't do
+    /// this until we detect a coherence error because it can lead to
+    /// false overflow results (#47139) and because it costs
+    /// computation time.
+    pub fn enable_tracking_intercrate_ambiguity_causes(&mut self) {
+        assert!(self.intercrate);
+        assert!(self.intercrate_ambiguity_causes.is_none());
+        self.intercrate_ambiguity_causes = Some(vec![]);
+        debug!("selcx: enable_tracking_intercrate_ambiguity_causes");
+    }
+
+    /// Gets the intercrate ambiguity causes collected since tracking
+    /// was enabled and disables tracking at the same time. If
+    /// tracking is not enabled, just returns an empty vector.
+    pub fn take_intercrate_ambiguity_causes(&mut self) -> Vec<IntercrateAmbiguityCause> {
+        assert!(self.intercrate);
+        self.intercrate_ambiguity_causes.take().unwrap_or(vec![])
+    }
+
+    pub fn infcx(&self) -> &'cx InferCtxt<'cx, 'tcx> {
+        self.infcx
+    }
+
+    pub fn tcx(&self) -> TyCtxt<'tcx> {
+        self.infcx.tcx
+    }
+
+    pub fn closure_typer(&self) -> &'cx InferCtxt<'cx, 'tcx> {
+        self.infcx
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Selection
+    //
+    // The selection phase tries to identify *how* an obligation will
+    // be resolved. For example, it will identify which impl or
+    // parameter bound is to be used. The process can be inconclusive
+    // if the self type in the obligation is not fully inferred. Selection
+    // can result in an error in one of two ways:
+    //
+    // 1. If no applicable impl or parameter bound can be found.
+    // 2. If the output type parameters in the obligation do not match
+    //    those specified by the impl/bound. For example, if the obligation
+    //    is `Vec<Foo>: Iterable<Bar>`, but the impl specifies
+    //    `impl<T> Iterable<T> for Vec<T>`, than an error would result.
+
+    /// Attempts to satisfy the obligation. If successful, this will affect the surrounding
+    /// type environment by performing unification.
+    pub fn select(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> SelectionResult<'tcx, Selection<'tcx>> {
+        debug!("select({:?})", obligation);
+        debug_assert!(!obligation.predicate.has_escaping_bound_vars());
+
+        let pec = &ProvisionalEvaluationCache::default();
+        let stack = self.push_stack(TraitObligationStackList::empty(pec), obligation);
+
+        let candidate = match self.candidate_from_obligation(&stack) {
+            Err(SelectionError::Overflow) => {
+                // In standard mode, overflow must have been caught and reported
+                // earlier.
+                assert!(self.query_mode == TraitQueryMode::Canonical);
+                return Err(SelectionError::Overflow);
+            }
+            Err(e) => {
+                return Err(e);
+            }
+            Ok(None) => {
+                return Ok(None);
+            }
+            Ok(Some(candidate)) => candidate,
+        };
+
+        match self.confirm_candidate(obligation, candidate) {
+            Err(SelectionError::Overflow) => {
+                assert!(self.query_mode == TraitQueryMode::Canonical);
+                Err(SelectionError::Overflow)
+            }
+            Err(e) => Err(e),
+            Ok(candidate) => Ok(Some(candidate)),
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // EVALUATION
+    //
+    // Tests whether an obligation can be selected or whether an impl
+    // can be applied to particular types. It skips the "confirmation"
+    // step and hence completely ignores output type parameters.
+    //
+    // The result is "true" if the obligation *may* hold and "false" if
+    // we can be sure it does not.
+
+    /// Evaluates whether the obligation `obligation` can be satisfied (by any means).
+    pub fn predicate_may_hold_fatal(&mut self, obligation: &PredicateObligation<'tcx>) -> bool {
+        debug!("predicate_may_hold_fatal({:?})", obligation);
+
+        // This fatal query is a stopgap that should only be used in standard mode,
+        // where we do not expect overflow to be propagated.
+        assert!(self.query_mode == TraitQueryMode::Standard);
+
+        self.evaluate_root_obligation(obligation)
+            .expect("Overflow should be caught earlier in standard query mode")
+            .may_apply()
+    }
+
+    /// Evaluates whether the obligation `obligation` can be satisfied
+    /// and returns an `EvaluationResult`. This is meant for the
+    /// *initial* call.
+    pub fn evaluate_root_obligation(
+        &mut self,
+        obligation: &PredicateObligation<'tcx>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        self.evaluation_probe(|this| {
+            this.evaluate_predicate_recursively(
+                TraitObligationStackList::empty(&ProvisionalEvaluationCache::default()),
+                obligation.clone(),
+            )
+        })
+    }
+
+    fn evaluation_probe(
+        &mut self,
+        op: impl FnOnce(&mut Self) -> Result<EvaluationResult, OverflowError>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        self.infcx.probe(|snapshot| -> Result<EvaluationResult, OverflowError> {
+            let result = op(self)?;
+            match self.infcx.region_constraints_added_in_snapshot(snapshot) {
+                None => Ok(result),
+                Some(_) => Ok(result.max(EvaluatedToOkModuloRegions)),
+            }
+        })
+    }
+
+    /// Evaluates the predicates in `predicates` recursively. Note that
+    /// this applies projections in the predicates, and therefore
+    /// is run within an inference probe.
+    fn evaluate_predicates_recursively<'o, I>(
+        &mut self,
+        stack: TraitObligationStackList<'o, 'tcx>,
+        predicates: I,
+    ) -> Result<EvaluationResult, OverflowError>
+    where
+        I: IntoIterator<Item = PredicateObligation<'tcx>>,
+    {
+        let mut result = EvaluatedToOk;
+        for obligation in predicates {
+            let eval = self.evaluate_predicate_recursively(stack, obligation.clone())?;
+            debug!("evaluate_predicate_recursively({:?}) = {:?}", obligation, eval);
+            if let EvaluatedToErr = eval {
+                // fast-path - EvaluatedToErr is the top of the lattice,
+                // so we don't need to look on the other predicates.
+                return Ok(EvaluatedToErr);
+            } else {
+                result = cmp::max(result, eval);
+            }
+        }
+        Ok(result)
+    }
+
+    fn evaluate_predicate_recursively<'o>(
+        &mut self,
+        previous_stack: TraitObligationStackList<'o, 'tcx>,
+        obligation: PredicateObligation<'tcx>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        debug!(
+            "evaluate_predicate_recursively(previous_stack={:?}, obligation={:?})",
+            previous_stack.head(),
+            obligation
+        );
+
+        // `previous_stack` stores a `TraitObligatiom`, while `obligation` is
+        // a `PredicateObligation`. These are distinct types, so we can't
+        // use any `Option` combinator method that would force them to be
+        // the same.
+        match previous_stack.head() {
+            Some(h) => self.check_recursion_limit(&obligation, h.obligation)?,
+            None => self.check_recursion_limit(&obligation, &obligation)?,
+        }
+
+        match obligation.predicate {
+            ty::Predicate::Trait(ref t, _) => {
+                debug_assert!(!t.has_escaping_bound_vars());
+                let obligation = obligation.with(t.clone());
+                self.evaluate_trait_predicate_recursively(previous_stack, obligation)
+            }
+
+            ty::Predicate::Subtype(ref p) => {
+                // Does this code ever run?
+                match self.infcx.subtype_predicate(&obligation.cause, obligation.param_env, p) {
+                    Some(Ok(InferOk { mut obligations, .. })) => {
+                        self.add_depth(obligations.iter_mut(), obligation.recursion_depth);
+                        self.evaluate_predicates_recursively(
+                            previous_stack,
+                            obligations.into_iter(),
+                        )
+                    }
+                    Some(Err(_)) => Ok(EvaluatedToErr),
+                    None => Ok(EvaluatedToAmbig),
+                }
+            }
+
+            ty::Predicate::WellFormed(ty) => match wf::obligations(
+                self.infcx,
+                obligation.param_env,
+                obligation.cause.body_id,
+                ty,
+                obligation.cause.span,
+            ) {
+                Some(mut obligations) => {
+                    self.add_depth(obligations.iter_mut(), obligation.recursion_depth);
+                    self.evaluate_predicates_recursively(previous_stack, obligations.into_iter())
+                }
+                None => Ok(EvaluatedToAmbig),
+            },
+
+            ty::Predicate::TypeOutlives(..) | ty::Predicate::RegionOutlives(..) => {
+                // We do not consider region relationships when evaluating trait matches.
+                Ok(EvaluatedToOkModuloRegions)
+            }
+
+            ty::Predicate::ObjectSafe(trait_def_id) => {
+                if self.tcx().is_object_safe(trait_def_id) {
+                    Ok(EvaluatedToOk)
+                } else {
+                    Ok(EvaluatedToErr)
+                }
+            }
+
+            ty::Predicate::Projection(ref data) => {
+                let project_obligation = obligation.with(data.clone());
+                match project::poly_project_and_unify_type(self, &project_obligation) {
+                    Ok(Some(mut subobligations)) => {
+                        self.add_depth(subobligations.iter_mut(), obligation.recursion_depth);
+                        let result = self.evaluate_predicates_recursively(
+                            previous_stack,
+                            subobligations.into_iter(),
+                        );
+                        if let Some(key) =
+                            ProjectionCacheKey::from_poly_projection_predicate(self, data)
+                        {
+                            self.infcx.inner.borrow_mut().projection_cache.complete(key);
+                        }
+                        result
+                    }
+                    Ok(None) => Ok(EvaluatedToAmbig),
+                    Err(_) => Ok(EvaluatedToErr),
+                }
+            }
+
+            ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
+                match self.infcx.closure_kind(closure_def_id, closure_substs) {
+                    Some(closure_kind) => {
+                        if closure_kind.extends(kind) {
+                            Ok(EvaluatedToOk)
+                        } else {
+                            Ok(EvaluatedToErr)
+                        }
+                    }
+                    None => Ok(EvaluatedToAmbig),
+                }
+            }
+
+            ty::Predicate::ConstEvaluatable(def_id, substs) => {
+                match self.tcx().const_eval_resolve(
+                    obligation.param_env,
+                    def_id,
+                    substs,
+                    None,
+                    None,
+                ) {
+                    Ok(_) => Ok(EvaluatedToOk),
+                    Err(_) => Ok(EvaluatedToErr),
+                }
+            }
+        }
+    }
+
+    fn evaluate_trait_predicate_recursively<'o>(
+        &mut self,
+        previous_stack: TraitObligationStackList<'o, 'tcx>,
+        mut obligation: TraitObligation<'tcx>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        debug!("evaluate_trait_predicate_recursively({:?})", obligation);
+
+        if !self.intercrate
+            && obligation.is_global()
+            && obligation.param_env.caller_bounds.iter().all(|bound| bound.needs_subst())
+        {
+            // If a param env has no global bounds, global obligations do not
+            // depend on its particular value in order to work, so we can clear
+            // out the param env and get better caching.
+            debug!("evaluate_trait_predicate_recursively({:?}) - in global", obligation);
+            obligation.param_env = obligation.param_env.without_caller_bounds();
+        }
+
+        let stack = self.push_stack(previous_stack, &obligation);
+        let fresh_trait_ref = stack.fresh_trait_ref;
+        if let Some(result) = self.check_evaluation_cache(obligation.param_env, fresh_trait_ref) {
+            debug!("CACHE HIT: EVAL({:?})={:?}", fresh_trait_ref, result);
+            return Ok(result);
+        }
+
+        if let Some(result) = stack.cache().get_provisional(fresh_trait_ref) {
+            debug!("PROVISIONAL CACHE HIT: EVAL({:?})={:?}", fresh_trait_ref, result);
+            stack.update_reached_depth(stack.cache().current_reached_depth());
+            return Ok(result);
+        }
+
+        // Check if this is a match for something already on the
+        // stack. If so, we don't want to insert the result into the
+        // main cache (it is cycle dependent) nor the provisional
+        // cache (which is meant for things that have completed but
+        // for a "backedge" -- this result *is* the backedge).
+        if let Some(cycle_result) = self.check_evaluation_cycle(&stack) {
+            return Ok(cycle_result);
+        }
+
+        let (result, dep_node) = self.in_task(|this| this.evaluate_stack(&stack));
+        let result = result?;
+
+        if !result.must_apply_modulo_regions() {
+            stack.cache().on_failure(stack.dfn);
+        }
+
+        let reached_depth = stack.reached_depth.get();
+        if reached_depth >= stack.depth {
+            debug!("CACHE MISS: EVAL({:?})={:?}", fresh_trait_ref, result);
+            self.insert_evaluation_cache(obligation.param_env, fresh_trait_ref, dep_node, result);
+
+            stack.cache().on_completion(stack.depth, |fresh_trait_ref, provisional_result| {
+                self.insert_evaluation_cache(
+                    obligation.param_env,
+                    fresh_trait_ref,
+                    dep_node,
+                    provisional_result.max(result),
+                );
+            });
+        } else {
+            debug!("PROVISIONAL: {:?}={:?}", fresh_trait_ref, result);
+            debug!(
+                "evaluate_trait_predicate_recursively: caching provisionally because {:?} \
+                 is a cycle participant (at depth {}, reached depth {})",
+                fresh_trait_ref, stack.depth, reached_depth,
+            );
+
+            stack.cache().insert_provisional(stack.dfn, reached_depth, fresh_trait_ref, result);
+        }
+
+        Ok(result)
+    }
+
+    /// If there is any previous entry on the stack that precisely
+    /// matches this obligation, then we can assume that the
+    /// obligation is satisfied for now (still all other conditions
+    /// must be met of course). One obvious case this comes up is
+    /// marker traits like `Send`. Think of a linked list:
+    ///
+    ///    struct List<T> { data: T, next: Option<Box<List<T>>> }
+    ///
+    /// `Box<List<T>>` will be `Send` if `T` is `Send` and
+    /// `Option<Box<List<T>>>` is `Send`, and in turn
+    /// `Option<Box<List<T>>>` is `Send` if `Box<List<T>>` is
+    /// `Send`.
+    ///
+    /// Note that we do this comparison using the `fresh_trait_ref`
+    /// fields. Because these have all been freshened using
+    /// `self.freshener`, we can be sure that (a) this will not
+    /// affect the inferencer state and (b) that if we see two
+    /// fresh regions with the same index, they refer to the same
+    /// unbound type variable.
+    fn check_evaluation_cycle(
+        &mut self,
+        stack: &TraitObligationStack<'_, 'tcx>,
+    ) -> Option<EvaluationResult> {
+        if let Some(cycle_depth) = stack
+            .iter()
+            .skip(1) // Skip top-most frame.
+            .find(|prev| {
+                stack.obligation.param_env == prev.obligation.param_env
+                    && stack.fresh_trait_ref == prev.fresh_trait_ref
+            })
+            .map(|stack| stack.depth)
+        {
+            debug!(
+                "evaluate_stack({:?}) --> recursive at depth {}",
+                stack.fresh_trait_ref, cycle_depth,
+            );
+
+            // If we have a stack like `A B C D E A`, where the top of
+            // the stack is the final `A`, then this will iterate over
+            // `A, E, D, C, B` -- i.e., all the participants apart
+            // from the cycle head. We mark them as participating in a
+            // cycle. This suppresses caching for those nodes. See
+            // `in_cycle` field for more details.
+            stack.update_reached_depth(cycle_depth);
+
+            // Subtle: when checking for a coinductive cycle, we do
+            // not compare using the "freshened trait refs" (which
+            // have erased regions) but rather the fully explicit
+            // trait refs. This is important because it's only a cycle
+            // if the regions match exactly.
+            let cycle = stack.iter().skip(1).take_while(|s| s.depth >= cycle_depth);
+            let cycle = cycle.map(|stack| {
+                ty::Predicate::Trait(stack.obligation.predicate, hir::Constness::NotConst)
+            });
+            if self.coinductive_match(cycle) {
+                debug!("evaluate_stack({:?}) --> recursive, coinductive", stack.fresh_trait_ref);
+                Some(EvaluatedToOk)
+            } else {
+                debug!("evaluate_stack({:?}) --> recursive, inductive", stack.fresh_trait_ref);
+                Some(EvaluatedToRecur)
+            }
+        } else {
+            None
+        }
+    }
+
+    fn evaluate_stack<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        // In intercrate mode, whenever any of the types are unbound,
+        // there can always be an impl. Even if there are no impls in
+        // this crate, perhaps the type would be unified with
+        // something from another crate that does provide an impl.
+        //
+        // In intra mode, we must still be conservative. The reason is
+        // that we want to avoid cycles. Imagine an impl like:
+        //
+        //     impl<T:Eq> Eq for Vec<T>
+        //
+        // and a trait reference like `$0 : Eq` where `$0` is an
+        // unbound variable. When we evaluate this trait-reference, we
+        // will unify `$0` with `Vec<$1>` (for some fresh variable
+        // `$1`), on the condition that `$1 : Eq`. We will then wind
+        // up with many candidates (since that are other `Eq` impls
+        // that apply) and try to winnow things down. This results in
+        // a recursive evaluation that `$1 : Eq` -- as you can
+        // imagine, this is just where we started. To avoid that, we
+        // check for unbound variables and return an ambiguous (hence possible)
+        // match if we've seen this trait before.
+        //
+        // This suffices to allow chains like `FnMut` implemented in
+        // terms of `Fn` etc, but we could probably make this more
+        // precise still.
+        let unbound_input_types =
+            stack.fresh_trait_ref.skip_binder().input_types().any(|ty| ty.is_fresh());
+        // This check was an imperfect workaround for a bug in the old
+        // intercrate mode; it should be removed when that goes away.
+        if unbound_input_types && self.intercrate {
+            debug!(
+                "evaluate_stack({:?}) --> unbound argument, intercrate -->  ambiguous",
+                stack.fresh_trait_ref
+            );
+            // Heuristics: show the diagnostics when there are no candidates in crate.
+            if self.intercrate_ambiguity_causes.is_some() {
+                debug!("evaluate_stack: intercrate_ambiguity_causes is some");
+                if let Ok(candidate_set) = self.assemble_candidates(stack) {
+                    if !candidate_set.ambiguous && candidate_set.vec.is_empty() {
+                        let trait_ref = stack.obligation.predicate.skip_binder().trait_ref;
+                        let self_ty = trait_ref.self_ty();
+                        let cause = IntercrateAmbiguityCause::DownstreamCrate {
+                            trait_desc: trait_ref.print_only_trait_path().to_string(),
+                            self_desc: if self_ty.has_concrete_skeleton() {
+                                Some(self_ty.to_string())
+                            } else {
+                                None
+                            },
+                        };
+                        debug!("evaluate_stack: pushing cause = {:?}", cause);
+                        self.intercrate_ambiguity_causes.as_mut().unwrap().push(cause);
+                    }
+                }
+            }
+            return Ok(EvaluatedToAmbig);
+        }
+        if unbound_input_types
+            && stack.iter().skip(1).any(|prev| {
+                stack.obligation.param_env == prev.obligation.param_env
+                    && self.match_fresh_trait_refs(
+                        &stack.fresh_trait_ref,
+                        &prev.fresh_trait_ref,
+                        prev.obligation.param_env,
+                    )
+            })
+        {
+            debug!(
+                "evaluate_stack({:?}) --> unbound argument, recursive --> giving up",
+                stack.fresh_trait_ref
+            );
+            return Ok(EvaluatedToUnknown);
+        }
+
+        match self.candidate_from_obligation(stack) {
+            Ok(Some(c)) => self.evaluate_candidate(stack, &c),
+            Ok(None) => Ok(EvaluatedToAmbig),
+            Err(Overflow) => Err(OverflowError),
+            Err(..) => Ok(EvaluatedToErr),
+        }
+    }
+
+    /// For defaulted traits, we use a co-inductive strategy to solve, so
+    /// that recursion is ok. This routine returns `true` if the top of the
+    /// stack (`cycle[0]`):
+    ///
+    /// - is a defaulted trait,
+    /// - it also appears in the backtrace at some position `X`,
+    /// - all the predicates at positions `X..` between `X` and the top are
+    ///   also defaulted traits.
+    pub fn coinductive_match<I>(&mut self, cycle: I) -> bool
+    where
+        I: Iterator<Item = ty::Predicate<'tcx>>,
+    {
+        let mut cycle = cycle;
+        cycle.all(|predicate| self.coinductive_predicate(predicate))
+    }
+
+    fn coinductive_predicate(&self, predicate: ty::Predicate<'tcx>) -> bool {
+        let result = match predicate {
+            ty::Predicate::Trait(ref data, _) => self.tcx().trait_is_auto(data.def_id()),
+            _ => false,
+        };
+        debug!("coinductive_predicate({:?}) = {:?}", predicate, result);
+        result
+    }
+
+    /// Further evaluates `candidate` to decide whether all type parameters match and whether nested
+    /// obligations are met. Returns whether `candidate` remains viable after this further
+    /// scrutiny.
+    fn evaluate_candidate<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+        candidate: &SelectionCandidate<'tcx>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        debug!(
+            "evaluate_candidate: depth={} candidate={:?}",
+            stack.obligation.recursion_depth, candidate
+        );
+        let result = self.evaluation_probe(|this| {
+            let candidate = (*candidate).clone();
+            match this.confirm_candidate(stack.obligation, candidate) {
+                Ok(selection) => this.evaluate_predicates_recursively(
+                    stack.list(),
+                    selection.nested_obligations().into_iter(),
+                ),
+                Err(..) => Ok(EvaluatedToErr),
+            }
+        })?;
+        debug!(
+            "evaluate_candidate: depth={} result={:?}",
+            stack.obligation.recursion_depth, result
+        );
+        Ok(result)
+    }
+
+    fn check_evaluation_cache(
+        &self,
+        param_env: ty::ParamEnv<'tcx>,
+        trait_ref: ty::PolyTraitRef<'tcx>,
+    ) -> Option<EvaluationResult> {
+        let tcx = self.tcx();
+        if self.can_use_global_caches(param_env) {
+            let cache = tcx.evaluation_cache.hashmap.borrow();
+            if let Some(cached) = cache.get(&param_env.and(trait_ref)) {
+                return Some(cached.get(tcx));
+            }
+        }
+        self.infcx
+            .evaluation_cache
+            .hashmap
+            .borrow()
+            .get(&param_env.and(trait_ref))
+            .map(|v| v.get(tcx))
+    }
+
+    fn insert_evaluation_cache(
+        &mut self,
+        param_env: ty::ParamEnv<'tcx>,
+        trait_ref: ty::PolyTraitRef<'tcx>,
+        dep_node: DepNodeIndex,
+        result: EvaluationResult,
+    ) {
+        // Avoid caching results that depend on more than just the trait-ref
+        // - the stack can create recursion.
+        if result.is_stack_dependent() {
+            return;
+        }
+
+        if self.can_use_global_caches(param_env) {
+            if !trait_ref.has_local_value() {
+                debug!(
+                    "insert_evaluation_cache(trait_ref={:?}, candidate={:?}) global",
+                    trait_ref, result,
+                );
+                // This may overwrite the cache with the same value
+                // FIXME: Due to #50507 this overwrites the different values
+                // This should be changed to use HashMapExt::insert_same
+                // when that is fixed
+                self.tcx()
+                    .evaluation_cache
+                    .hashmap
+                    .borrow_mut()
+                    .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, result));
+                return;
+            }
+        }
+
+        debug!("insert_evaluation_cache(trait_ref={:?}, candidate={:?})", trait_ref, result,);
+        self.infcx
+            .evaluation_cache
+            .hashmap
+            .borrow_mut()
+            .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, result));
+    }
+
+    /// For various reasons, it's possible for a subobligation
+    /// to have a *lower* recursion_depth than the obligation used to create it.
+    /// Projection sub-obligations may be returned from the projection cache,
+    /// which results in obligations with an 'old' `recursion_depth`.
+    /// Additionally, methods like `wf::obligations` and
+    /// `InferCtxt.subtype_predicate` produce subobligations without
+    /// taking in a 'parent' depth, causing the generated subobligations
+    /// to have a `recursion_depth` of `0`.
+    ///
+    /// To ensure that obligation_depth never decreasees, we force all subobligations
+    /// to have at least the depth of the original obligation.
+    fn add_depth<T: 'cx, I: Iterator<Item = &'cx mut Obligation<'tcx, T>>>(
+        &self,
+        it: I,
+        min_depth: usize,
+    ) {
+        it.for_each(|o| o.recursion_depth = cmp::max(min_depth, o.recursion_depth) + 1);
+    }
+
+    /// Checks that the recursion limit has not been exceeded.
+    ///
+    /// The weird return type of this function allows it to be used with the `try` (`?`)
+    /// operator within certain functions.
+    fn check_recursion_limit<T: Display + TypeFoldable<'tcx>, V: Display + TypeFoldable<'tcx>>(
+        &self,
+        obligation: &Obligation<'tcx, T>,
+        error_obligation: &Obligation<'tcx, V>,
+    ) -> Result<(), OverflowError> {
+        let recursion_limit = *self.infcx.tcx.sess.recursion_limit.get();
+        if obligation.recursion_depth >= recursion_limit {
+            match self.query_mode {
+                TraitQueryMode::Standard => {
+                    self.infcx().report_overflow_error(error_obligation, true);
+                }
+                TraitQueryMode::Canonical => {
+                    return Err(OverflowError);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // CANDIDATE ASSEMBLY
+    //
+    // The selection process begins by examining all in-scope impls,
+    // caller obligations, and so forth and assembling a list of
+    // candidates. See the [rustc guide] for more details.
+    //
+    // [rustc guide]:
+    // https://rust-lang.github.io/rustc-guide/traits/resolution.html#candidate-assembly
+
+    fn candidate_from_obligation<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+    ) -> SelectionResult<'tcx, SelectionCandidate<'tcx>> {
+        // Watch out for overflow. This intentionally bypasses (and does
+        // not update) the cache.
+        self.check_recursion_limit(&stack.obligation, &stack.obligation)?;
+
+        // Check the cache. Note that we freshen the trait-ref
+        // separately rather than using `stack.fresh_trait_ref` --
+        // this is because we want the unbound variables to be
+        // replaced with fresh types starting from index 0.
+        let cache_fresh_trait_pred = self.infcx.freshen(stack.obligation.predicate.clone());
+        debug!(
+            "candidate_from_obligation(cache_fresh_trait_pred={:?}, obligation={:?})",
+            cache_fresh_trait_pred, stack
+        );
+        debug_assert!(!stack.obligation.predicate.has_escaping_bound_vars());
+
+        if let Some(c) =
+            self.check_candidate_cache(stack.obligation.param_env, &cache_fresh_trait_pred)
+        {
+            debug!("CACHE HIT: SELECT({:?})={:?}", cache_fresh_trait_pred, c);
+            return c;
+        }
+
+        // If no match, compute result and insert into cache.
+        //
+        // FIXME(nikomatsakis) -- this cache is not taking into
+        // account cycles that may have occurred in forming the
+        // candidate. I don't know of any specific problems that
+        // result but it seems awfully suspicious.
+        let (candidate, dep_node) =
+            self.in_task(|this| this.candidate_from_obligation_no_cache(stack));
+
+        debug!("CACHE MISS: SELECT({:?})={:?}", cache_fresh_trait_pred, candidate);
+        self.insert_candidate_cache(
+            stack.obligation.param_env,
+            cache_fresh_trait_pred,
+            dep_node,
+            candidate.clone(),
+        );
+        candidate
+    }
+
+    fn in_task<OP, R>(&mut self, op: OP) -> (R, DepNodeIndex)
+    where
+        OP: FnOnce(&mut Self) -> R,
+    {
+        let (result, dep_node) =
+            self.tcx().dep_graph.with_anon_task(DepKind::TraitSelect, || op(self));
+        self.tcx().dep_graph.read_index(dep_node);
+        (result, dep_node)
+    }
+
+    // Treat negative impls as unimplemented, and reservation impls as ambiguity.
+    fn filter_negative_and_reservation_impls(
+        &mut self,
+        candidate: SelectionCandidate<'tcx>,
+    ) -> SelectionResult<'tcx, SelectionCandidate<'tcx>> {
+        if let ImplCandidate(def_id) = candidate {
+            let tcx = self.tcx();
+            match tcx.impl_polarity(def_id) {
+                ty::ImplPolarity::Negative if !self.allow_negative_impls => {
+                    return Err(Unimplemented);
+                }
+                ty::ImplPolarity::Reservation => {
+                    if let Some(intercrate_ambiguity_clauses) =
+                        &mut self.intercrate_ambiguity_causes
+                    {
+                        let attrs = tcx.get_attrs(def_id);
+                        let attr = attr::find_by_name(&attrs, sym::rustc_reservation_impl);
+                        let value = attr.and_then(|a| a.value_str());
+                        if let Some(value) = value {
+                            debug!(
+                                "filter_negative_and_reservation_impls: \
+                                 reservation impl ambiguity on {:?}",
+                                def_id
+                            );
+                            intercrate_ambiguity_clauses.push(
+                                IntercrateAmbiguityCause::ReservationImpl {
+                                    message: value.to_string(),
+                                },
+                            );
+                        }
+                    }
+                    return Ok(None);
+                }
+                _ => {}
+            };
+        }
+        Ok(Some(candidate))
+    }
+
+    fn candidate_from_obligation_no_cache<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+    ) -> SelectionResult<'tcx, SelectionCandidate<'tcx>> {
+        if stack.obligation.predicate.references_error() {
+            // If we encounter a `Error`, we generally prefer the
+            // most "optimistic" result in response -- that is, the
+            // one least likely to report downstream errors. But
+            // because this routine is shared by coherence and by
+            // trait selection, there isn't an obvious "right" choice
+            // here in that respect, so we opt to just return
+            // ambiguity and let the upstream clients sort it out.
+            return Ok(None);
+        }
+
+        if let Some(conflict) = self.is_knowable(stack) {
+            debug!("coherence stage: not knowable");
+            if self.intercrate_ambiguity_causes.is_some() {
+                debug!("evaluate_stack: intercrate_ambiguity_causes is some");
+                // Heuristics: show the diagnostics when there are no candidates in crate.
+                if let Ok(candidate_set) = self.assemble_candidates(stack) {
+                    let mut no_candidates_apply = true;
+                    {
+                        let evaluated_candidates =
+                            candidate_set.vec.iter().map(|c| self.evaluate_candidate(stack, &c));
+
+                        for ec in evaluated_candidates {
+                            match ec {
+                                Ok(c) => {
+                                    if c.may_apply() {
+                                        no_candidates_apply = false;
+                                        break;
+                                    }
+                                }
+                                Err(e) => return Err(e.into()),
+                            }
+                        }
+                    }
+
+                    if !candidate_set.ambiguous && no_candidates_apply {
+                        let trait_ref = stack.obligation.predicate.skip_binder().trait_ref;
+                        let self_ty = trait_ref.self_ty();
+                        let trait_desc = trait_ref.print_only_trait_path().to_string();
+                        let self_desc = if self_ty.has_concrete_skeleton() {
+                            Some(self_ty.to_string())
+                        } else {
+                            None
+                        };
+                        let cause = if let Conflict::Upstream = conflict {
+                            IntercrateAmbiguityCause::UpstreamCrateUpdate { trait_desc, self_desc }
+                        } else {
+                            IntercrateAmbiguityCause::DownstreamCrate { trait_desc, self_desc }
+                        };
+                        debug!("evaluate_stack: pushing cause = {:?}", cause);
+                        self.intercrate_ambiguity_causes.as_mut().unwrap().push(cause);
+                    }
+                }
+            }
+            return Ok(None);
+        }
+
+        let candidate_set = self.assemble_candidates(stack)?;
+
+        if candidate_set.ambiguous {
+            debug!("candidate set contains ambig");
+            return Ok(None);
+        }
+
+        let mut candidates = candidate_set.vec;
+
+        debug!("assembled {} candidates for {:?}: {:?}", candidates.len(), stack, candidates);
+
+        // At this point, we know that each of the entries in the
+        // candidate set is *individually* applicable. Now we have to
+        // figure out if they contain mutual incompatibilities. This
+        // frequently arises if we have an unconstrained input type --
+        // for example, we are looking for `$0: Eq` where `$0` is some
+        // unconstrained type variable. In that case, we'll get a
+        // candidate which assumes $0 == int, one that assumes `$0 ==
+        // usize`, etc. This spells an ambiguity.
+
+        // If there is more than one candidate, first winnow them down
+        // by considering extra conditions (nested obligations and so
+        // forth). We don't winnow if there is exactly one
+        // candidate. This is a relatively minor distinction but it
+        // can lead to better inference and error-reporting. An
+        // example would be if there was an impl:
+        //
+        //     impl<T:Clone> Vec<T> { fn push_clone(...) { ... } }
+        //
+        // and we were to see some code `foo.push_clone()` where `boo`
+        // is a `Vec<Bar>` and `Bar` does not implement `Clone`.  If
+        // we were to winnow, we'd wind up with zero candidates.
+        // Instead, we select the right impl now but report "`Bar` does
+        // not implement `Clone`".
+        if candidates.len() == 1 {
+            return self.filter_negative_and_reservation_impls(candidates.pop().unwrap());
+        }
+
+        // Winnow, but record the exact outcome of evaluation, which
+        // is needed for specialization. Propagate overflow if it occurs.
+        let mut candidates = candidates
+            .into_iter()
+            .map(|c| match self.evaluate_candidate(stack, &c) {
+                Ok(eval) if eval.may_apply() => {
+                    Ok(Some(EvaluatedCandidate { candidate: c, evaluation: eval }))
+                }
+                Ok(_) => Ok(None),
+                Err(OverflowError) => Err(Overflow),
+            })
+            .flat_map(Result::transpose)
+            .collect::<Result<Vec<_>, _>>()?;
+
+        debug!("winnowed to {} candidates for {:?}: {:?}", candidates.len(), stack, candidates);
+
+        let needs_infer = stack.obligation.predicate.needs_infer();
+
+        // If there are STILL multiple candidates, we can further
+        // reduce the list by dropping duplicates -- including
+        // resolving specializations.
+        if candidates.len() > 1 {
+            let mut i = 0;
+            while i < candidates.len() {
+                let is_dup = (0..candidates.len()).filter(|&j| i != j).any(|j| {
+                    self.candidate_should_be_dropped_in_favor_of(
+                        &candidates[i],
+                        &candidates[j],
+                        needs_infer,
+                    )
+                });
+                if is_dup {
+                    debug!("Dropping candidate #{}/{}: {:?}", i, candidates.len(), candidates[i]);
+                    candidates.swap_remove(i);
+                } else {
+                    debug!("Retaining candidate #{}/{}: {:?}", i, candidates.len(), candidates[i]);
+                    i += 1;
+
+                    // If there are *STILL* multiple candidates, give up
+                    // and report ambiguity.
+                    if i > 1 {
+                        debug!("multiple matches, ambig");
+                        return Ok(None);
+                    }
+                }
+            }
+        }
+
+        // If there are *NO* candidates, then there are no impls --
+        // that we know of, anyway. Note that in the case where there
+        // are unbound type variables within the obligation, it might
+        // be the case that you could still satisfy the obligation
+        // from another crate by instantiating the type variables with
+        // a type from another crate that does have an impl. This case
+        // is checked for in `evaluate_stack` (and hence users
+        // who might care about this case, like coherence, should use
+        // that function).
+        if candidates.is_empty() {
+            return Err(Unimplemented);
+        }
+
+        // Just one candidate left.
+        self.filter_negative_and_reservation_impls(candidates.pop().unwrap().candidate)
+    }
+
+    fn is_knowable<'o>(&mut self, stack: &TraitObligationStack<'o, 'tcx>) -> Option<Conflict> {
+        debug!("is_knowable(intercrate={:?})", self.intercrate);
+
+        if !self.intercrate {
+            return None;
+        }
+
+        let obligation = &stack.obligation;
+        let predicate = self.infcx().resolve_vars_if_possible(&obligation.predicate);
+
+        // Okay to skip binder because of the nature of the
+        // trait-ref-is-knowable check, which does not care about
+        // bound regions.
+        let trait_ref = predicate.skip_binder().trait_ref;
+
+        coherence::trait_ref_is_knowable(self.tcx(), trait_ref)
+    }
+
+    /// Returns `true` if the global caches can be used.
+    /// Do note that if the type itself is not in the
+    /// global tcx, the local caches will be used.
+    fn can_use_global_caches(&self, param_env: ty::ParamEnv<'tcx>) -> bool {
+        // If there are any e.g. inference variables in the `ParamEnv`, then we
+        // always use a cache local to this particular scope. Otherwise, we
+        // switch to a global cache.
+        if param_env.has_local_value() {
+            return false;
+        }
+
+        // Avoid using the master cache during coherence and just rely
+        // on the local cache. This effectively disables caching
+        // during coherence. It is really just a simplification to
+        // avoid us having to fear that coherence results "pollute"
+        // the master cache. Since coherence executes pretty quickly,
+        // it's not worth going to more trouble to increase the
+        // hit-rate, I don't think.
+        if self.intercrate {
+            return false;
+        }
+
+        // Otherwise, we can use the global cache.
+        true
+    }
+
+    fn check_candidate_cache(
+        &mut self,
+        param_env: ty::ParamEnv<'tcx>,
+        cache_fresh_trait_pred: &ty::PolyTraitPredicate<'tcx>,
+    ) -> Option<SelectionResult<'tcx, SelectionCandidate<'tcx>>> {
+        let tcx = self.tcx();
+        let trait_ref = &cache_fresh_trait_pred.skip_binder().trait_ref;
+        if self.can_use_global_caches(param_env) {
+            let cache = tcx.selection_cache.hashmap.borrow();
+            if let Some(cached) = cache.get(&param_env.and(*trait_ref)) {
+                return Some(cached.get(tcx));
+            }
+        }
+        self.infcx
+            .selection_cache
+            .hashmap
+            .borrow()
+            .get(&param_env.and(*trait_ref))
+            .map(|v| v.get(tcx))
+    }
+
+    /// Determines whether can we safely cache the result
+    /// of selecting an obligation. This is almost always `true`,
+    /// except when dealing with certain `ParamCandidate`s.
+    ///
+    /// Ordinarily, a `ParamCandidate` will contain no inference variables,
+    /// since it was usually produced directly from a `DefId`. However,
+    /// certain cases (currently only librustdoc's blanket impl finder),
+    /// a `ParamEnv` may be explicitly constructed with inference types.
+    /// When this is the case, we do *not* want to cache the resulting selection
+    /// candidate. This is due to the fact that it might not always be possible
+    /// to equate the obligation's trait ref and the candidate's trait ref,
+    /// if more constraints end up getting added to an inference variable.
+    ///
+    /// Because of this, we always want to re-run the full selection
+    /// process for our obligation the next time we see it, since
+    /// we might end up picking a different `SelectionCandidate` (or none at all).
+    fn can_cache_candidate(
+        &self,
+        result: &SelectionResult<'tcx, SelectionCandidate<'tcx>>,
+    ) -> bool {
+        match result {
+            Ok(Some(SelectionCandidate::ParamCandidate(trait_ref))) => {
+                !trait_ref.skip_binder().input_types().any(|t| t.walk().any(|t_| t_.is_ty_infer()))
+            }
+            _ => true,
+        }
+    }
+
+    fn insert_candidate_cache(
+        &mut self,
+        param_env: ty::ParamEnv<'tcx>,
+        cache_fresh_trait_pred: ty::PolyTraitPredicate<'tcx>,
+        dep_node: DepNodeIndex,
+        candidate: SelectionResult<'tcx, SelectionCandidate<'tcx>>,
+    ) {
+        let tcx = self.tcx();
+        let trait_ref = cache_fresh_trait_pred.skip_binder().trait_ref;
+
+        if !self.can_cache_candidate(&candidate) {
+            debug!(
+                "insert_candidate_cache(trait_ref={:?}, candidate={:?} -\
+                 candidate is not cacheable",
+                trait_ref, candidate
+            );
+            return;
+        }
+
+        if self.can_use_global_caches(param_env) {
+            if let Err(Overflow) = candidate {
+                // Don't cache overflow globally; we only produce this in certain modes.
+            } else if !trait_ref.has_local_value() {
+                if !candidate.has_local_value() {
+                    debug!(
+                        "insert_candidate_cache(trait_ref={:?}, candidate={:?}) global",
+                        trait_ref, candidate,
+                    );
+                    // This may overwrite the cache with the same value.
+                    tcx.selection_cache
+                        .hashmap
+                        .borrow_mut()
+                        .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, candidate));
+                    return;
+                }
+            }
+        }
+
+        debug!(
+            "insert_candidate_cache(trait_ref={:?}, candidate={:?}) local",
+            trait_ref, candidate,
+        );
+        self.infcx
+            .selection_cache
+            .hashmap
+            .borrow_mut()
+            .insert(param_env.and(trait_ref), WithDepNode::new(dep_node, candidate));
+    }
+
+    fn assemble_candidates<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+    ) -> Result<SelectionCandidateSet<'tcx>, SelectionError<'tcx>> {
+        let TraitObligationStack { obligation, .. } = *stack;
+        let obligation = &Obligation {
+            param_env: obligation.param_env,
+            cause: obligation.cause.clone(),
+            recursion_depth: obligation.recursion_depth,
+            predicate: self.infcx().resolve_vars_if_possible(&obligation.predicate),
+        };
+
+        if obligation.predicate.skip_binder().self_ty().is_ty_var() {
+            // Self is a type variable (e.g., `_: AsRef<str>`).
+            //
+            // This is somewhat problematic, as the current scheme can't really
+            // handle it turning to be a projection. This does end up as truly
+            // ambiguous in most cases anyway.
+            //
+            // Take the fast path out - this also improves
+            // performance by preventing assemble_candidates_from_impls from
+            // matching every impl for this trait.
+            return Ok(SelectionCandidateSet { vec: vec![], ambiguous: true });
+        }
+
+        let mut candidates = SelectionCandidateSet { vec: Vec::new(), ambiguous: false };
+
+        self.assemble_candidates_for_trait_alias(obligation, &mut candidates)?;
+
+        // Other bounds. Consider both in-scope bounds from fn decl
+        // and applicable impls. There is a certain set of precedence rules here.
+        let def_id = obligation.predicate.def_id();
+        let lang_items = self.tcx().lang_items();
+
+        if lang_items.copy_trait() == Some(def_id) {
+            debug!("obligation self ty is {:?}", obligation.predicate.skip_binder().self_ty());
+
+            // User-defined copy impls are permitted, but only for
+            // structs and enums.
+            self.assemble_candidates_from_impls(obligation, &mut candidates)?;
+
+            // For other types, we'll use the builtin rules.
+            let copy_conditions = self.copy_clone_conditions(obligation);
+            self.assemble_builtin_bound_candidates(copy_conditions, &mut candidates)?;
+        } else if lang_items.sized_trait() == Some(def_id) {
+            // Sized is never implementable by end-users, it is
+            // always automatically computed.
+            let sized_conditions = self.sized_conditions(obligation);
+            self.assemble_builtin_bound_candidates(sized_conditions, &mut candidates)?;
+        } else if lang_items.unsize_trait() == Some(def_id) {
+            self.assemble_candidates_for_unsizing(obligation, &mut candidates);
+        } else {
+            if lang_items.clone_trait() == Some(def_id) {
+                // Same builtin conditions as `Copy`, i.e., every type which has builtin support
+                // for `Copy` also has builtin support for `Clone`, and tuples/arrays of `Clone`
+                // types have builtin support for `Clone`.
+                let clone_conditions = self.copy_clone_conditions(obligation);
+                self.assemble_builtin_bound_candidates(clone_conditions, &mut candidates)?;
+            }
+
+            self.assemble_generator_candidates(obligation, &mut candidates)?;
+            self.assemble_closure_candidates(obligation, &mut candidates)?;
+            self.assemble_fn_pointer_candidates(obligation, &mut candidates)?;
+            self.assemble_candidates_from_impls(obligation, &mut candidates)?;
+            self.assemble_candidates_from_object_ty(obligation, &mut candidates);
+        }
+
+        self.assemble_candidates_from_projected_tys(obligation, &mut candidates);
+        self.assemble_candidates_from_caller_bounds(stack, &mut candidates)?;
+        // Auto implementations have lower priority, so we only
+        // consider triggering a default if there is no other impl that can apply.
+        if candidates.vec.is_empty() {
+            self.assemble_candidates_from_auto_impls(obligation, &mut candidates)?;
+        }
+        debug!("candidate list size: {}", candidates.vec.len());
+        Ok(candidates)
+    }
+
+    fn assemble_candidates_from_projected_tys(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) {
+        debug!("assemble_candidates_for_projected_tys({:?})", obligation);
+
+        // Before we go into the whole placeholder thing, just
+        // quickly check if the self-type is a projection at all.
+        match obligation.predicate.skip_binder().trait_ref.self_ty().kind {
+            ty::Projection(_) | ty::Opaque(..) => {}
+            ty::Infer(ty::TyVar(_)) => {
+                span_bug!(
+                    obligation.cause.span,
+                    "Self=_ should have been handled by assemble_candidates"
+                );
+            }
+            _ => return,
+        }
+
+        let result = self.infcx.probe(|snapshot| {
+            self.match_projection_obligation_against_definition_bounds(obligation, snapshot)
+        });
+
+        if result {
+            candidates.vec.push(ProjectionCandidate);
+        }
+    }
+
+    fn match_projection_obligation_against_definition_bounds(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        snapshot: &CombinedSnapshot<'_, 'tcx>,
+    ) -> bool {
+        let poly_trait_predicate = self.infcx().resolve_vars_if_possible(&obligation.predicate);
+        let (placeholder_trait_predicate, placeholder_map) =
+            self.infcx().replace_bound_vars_with_placeholders(&poly_trait_predicate);
+        debug!(
+            "match_projection_obligation_against_definition_bounds: \
+             placeholder_trait_predicate={:?}",
+            placeholder_trait_predicate,
+        );
+
+        let (def_id, substs) = match placeholder_trait_predicate.trait_ref.self_ty().kind {
+            ty::Projection(ref data) => (data.trait_ref(self.tcx()).def_id, data.substs),
+            ty::Opaque(def_id, substs) => (def_id, substs),
+            _ => {
+                span_bug!(
+                    obligation.cause.span,
+                    "match_projection_obligation_against_definition_bounds() called \
+                     but self-ty is not a projection: {:?}",
+                    placeholder_trait_predicate.trait_ref.self_ty()
+                );
+            }
+        };
+        debug!(
+            "match_projection_obligation_against_definition_bounds: \
+             def_id={:?}, substs={:?}",
+            def_id, substs
+        );
+
+        let predicates_of = self.tcx().predicates_of(def_id);
+        let bounds = predicates_of.instantiate(self.tcx(), substs);
+        debug!(
+            "match_projection_obligation_against_definition_bounds: \
+             bounds={:?}",
+            bounds
+        );
+
+        let elaborated_predicates = util::elaborate_predicates(self.tcx(), bounds.predicates);
+        let matching_bound = elaborated_predicates.filter_to_traits().find(|bound| {
+            self.infcx.probe(|_| {
+                self.match_projection(
+                    obligation,
+                    bound.clone(),
+                    placeholder_trait_predicate.trait_ref.clone(),
+                    &placeholder_map,
+                    snapshot,
+                )
+            })
+        });
+
+        debug!(
+            "match_projection_obligation_against_definition_bounds: \
+             matching_bound={:?}",
+            matching_bound
+        );
+        match matching_bound {
+            None => false,
+            Some(bound) => {
+                // Repeat the successful match, if any, this time outside of a probe.
+                let result = self.match_projection(
+                    obligation,
+                    bound,
+                    placeholder_trait_predicate.trait_ref.clone(),
+                    &placeholder_map,
+                    snapshot,
+                );
+
+                assert!(result);
+                true
+            }
+        }
+    }
+
+    fn match_projection(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        trait_bound: ty::PolyTraitRef<'tcx>,
+        placeholder_trait_ref: ty::TraitRef<'tcx>,
+        placeholder_map: &PlaceholderMap<'tcx>,
+        snapshot: &CombinedSnapshot<'_, 'tcx>,
+    ) -> bool {
+        debug_assert!(!placeholder_trait_ref.has_escaping_bound_vars());
+        self.infcx
+            .at(&obligation.cause, obligation.param_env)
+            .sup(ty::Binder::dummy(placeholder_trait_ref), trait_bound)
+            .is_ok()
+            && self.infcx.leak_check(false, placeholder_map, snapshot).is_ok()
+    }
+
+    /// Given an obligation like `<SomeTrait for T>`, searches the obligations that the caller
+    /// supplied to find out whether it is listed among them.
+    ///
+    /// Never affects the inference environment.
+    fn assemble_candidates_from_caller_bounds<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        debug!("assemble_candidates_from_caller_bounds({:?})", stack.obligation);
+
+        let all_bounds = stack
+            .obligation
+            .param_env
+            .caller_bounds
+            .iter()
+            .filter_map(|o| o.to_opt_poly_trait_ref());
+
+        // Micro-optimization: filter out predicates relating to different traits.
+        let matching_bounds =
+            all_bounds.filter(|p| p.def_id() == stack.obligation.predicate.def_id());
+
+        // Keep only those bounds which may apply, and propagate overflow if it occurs.
+        let mut param_candidates = vec![];
+        for bound in matching_bounds {
+            let wc = self.evaluate_where_clause(stack, bound.clone())?;
+            if wc.may_apply() {
+                param_candidates.push(ParamCandidate(bound));
+            }
+        }
+
+        candidates.vec.extend(param_candidates);
+
+        Ok(())
+    }
+
+    fn evaluate_where_clause<'o>(
+        &mut self,
+        stack: &TraitObligationStack<'o, 'tcx>,
+        where_clause_trait_ref: ty::PolyTraitRef<'tcx>,
+    ) -> Result<EvaluationResult, OverflowError> {
+        self.evaluation_probe(|this| {
+            match this.match_where_clause_trait_ref(stack.obligation, where_clause_trait_ref) {
+                Ok(obligations) => {
+                    this.evaluate_predicates_recursively(stack.list(), obligations.into_iter())
+                }
+                Err(()) => Ok(EvaluatedToErr),
+            }
+        })
+    }
+
+    fn assemble_generator_candidates(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        if self.tcx().lang_items().gen_trait() != Some(obligation.predicate.def_id()) {
+            return Ok(());
+        }
+
+        // Okay to skip binder because the substs on generator types never
+        // touch bound regions, they just capture the in-scope
+        // type/region parameters.
+        let self_ty = *obligation.self_ty().skip_binder();
+        match self_ty.kind {
+            ty::Generator(..) => {
+                debug!(
+                    "assemble_generator_candidates: self_ty={:?} obligation={:?}",
+                    self_ty, obligation
+                );
+
+                candidates.vec.push(GeneratorCandidate);
+            }
+            ty::Infer(ty::TyVar(_)) => {
+                debug!("assemble_generator_candidates: ambiguous self-type");
+                candidates.ambiguous = true;
+            }
+            _ => {}
+        }
+
+        Ok(())
+    }
+
+    /// Checks for the artificial impl that the compiler will create for an obligation like `X :
+    /// FnMut<..>` where `X` is a closure type.
+    ///
+    /// Note: the type parameters on a closure candidate are modeled as *output* type
+    /// parameters and hence do not affect whether this trait is a match or not. They will be
+    /// unified during the confirmation step.
+    fn assemble_closure_candidates(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        let kind = match self.tcx().fn_trait_kind_from_lang_item(obligation.predicate.def_id()) {
+            Some(k) => k,
+            None => {
+                return Ok(());
+            }
+        };
+
+        // Okay to skip binder because the substs on closure types never
+        // touch bound regions, they just capture the in-scope
+        // type/region parameters
+        match obligation.self_ty().skip_binder().kind {
+            ty::Closure(closure_def_id, closure_substs) => {
+                debug!("assemble_unboxed_candidates: kind={:?} obligation={:?}", kind, obligation);
+                match self.infcx.closure_kind(closure_def_id, closure_substs) {
+                    Some(closure_kind) => {
+                        debug!("assemble_unboxed_candidates: closure_kind = {:?}", closure_kind);
+                        if closure_kind.extends(kind) {
+                            candidates.vec.push(ClosureCandidate);
+                        }
+                    }
+                    None => {
+                        debug!("assemble_unboxed_candidates: closure_kind not yet known");
+                        candidates.vec.push(ClosureCandidate);
+                    }
+                }
+            }
+            ty::Infer(ty::TyVar(_)) => {
+                debug!("assemble_unboxed_closure_candidates: ambiguous self-type");
+                candidates.ambiguous = true;
+            }
+            _ => {}
+        }
+
+        Ok(())
+    }
+
+    /// Implements one of the `Fn()` family for a fn pointer.
+    fn assemble_fn_pointer_candidates(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        // We provide impl of all fn traits for fn pointers.
+        if self.tcx().fn_trait_kind_from_lang_item(obligation.predicate.def_id()).is_none() {
+            return Ok(());
+        }
+
+        // Okay to skip binder because what we are inspecting doesn't involve bound regions.
+        let self_ty = *obligation.self_ty().skip_binder();
+        match self_ty.kind {
+            ty::Infer(ty::TyVar(_)) => {
+                debug!("assemble_fn_pointer_candidates: ambiguous self-type");
+                candidates.ambiguous = true; // Could wind up being a fn() type.
+            }
+            // Provide an impl, but only for suitable `fn` pointers.
+            ty::FnDef(..) | ty::FnPtr(_) => {
+                if let ty::FnSig {
+                    unsafety: hir::Unsafety::Normal,
+                    abi: Abi::Rust,
+                    c_variadic: false,
+                    ..
+                } = self_ty.fn_sig(self.tcx()).skip_binder()
+                {
+                    candidates.vec.push(FnPointerCandidate);
+                }
+            }
+            _ => {}
+        }
+
+        Ok(())
+    }
+
+    /// Searches for impls that might apply to `obligation`.
+    fn assemble_candidates_from_impls(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        debug!("assemble_candidates_from_impls(obligation={:?})", obligation);
+
+        self.tcx().for_each_relevant_impl(
+            obligation.predicate.def_id(),
+            obligation.predicate.skip_binder().trait_ref.self_ty(),
+            |impl_def_id| {
+                self.infcx.probe(|snapshot| {
+                    if let Ok(_substs) = self.match_impl(impl_def_id, obligation, snapshot) {
+                        candidates.vec.push(ImplCandidate(impl_def_id));
+                    }
+                });
+            },
+        );
+
+        Ok(())
+    }
+
+    fn assemble_candidates_from_auto_impls(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        // Okay to skip binder here because the tests we do below do not involve bound regions.
+        let self_ty = *obligation.self_ty().skip_binder();
+        debug!("assemble_candidates_from_auto_impls(self_ty={:?})", self_ty);
+
+        let def_id = obligation.predicate.def_id();
+
+        if self.tcx().trait_is_auto(def_id) {
+            match self_ty.kind {
+                ty::Dynamic(..) => {
+                    // For object types, we don't know what the closed
+                    // over types are. This means we conservatively
+                    // say nothing; a candidate may be added by
+                    // `assemble_candidates_from_object_ty`.
+                }
+                ty::Foreign(..) => {
+                    // Since the contents of foreign types is unknown,
+                    // we don't add any `..` impl. Default traits could
+                    // still be provided by a manual implementation for
+                    // this trait and type.
+                }
+                ty::Param(..) | ty::Projection(..) => {
+                    // In these cases, we don't know what the actual
+                    // type is.  Therefore, we cannot break it down
+                    // into its constituent types. So we don't
+                    // consider the `..` impl but instead just add no
+                    // candidates: this means that typeck will only
+                    // succeed if there is another reason to believe
+                    // that this obligation holds. That could be a
+                    // where-clause or, in the case of an object type,
+                    // it could be that the object type lists the
+                    // trait (e.g., `Foo+Send : Send`). See
+                    // `compile-fail/typeck-default-trait-impl-send-param.rs`
+                    // for an example of a test case that exercises
+                    // this path.
+                }
+                ty::Infer(ty::TyVar(_)) => {
+                    // The auto impl might apply; we don't know.
+                    candidates.ambiguous = true;
+                }
+                ty::Generator(_, _, movability)
+                    if self.tcx().lang_items().unpin_trait() == Some(def_id) =>
+                {
+                    match movability {
+                        hir::Movability::Static => {
+                            // Immovable generators are never `Unpin`, so
+                            // suppress the normal auto-impl candidate for it.
+                        }
+                        hir::Movability::Movable => {
+                            // Movable generators are always `Unpin`, so add an
+                            // unconditional builtin candidate.
+                            candidates.vec.push(BuiltinCandidate { has_nested: false });
+                        }
+                    }
+                }
+
+                _ => candidates.vec.push(AutoImplCandidate(def_id)),
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Searches for impls that might apply to `obligation`.
+    fn assemble_candidates_from_object_ty(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) {
+        debug!(
+            "assemble_candidates_from_object_ty(self_ty={:?})",
+            obligation.self_ty().skip_binder()
+        );
+
+        self.infcx.probe(|_snapshot| {
+            // The code below doesn't care about regions, and the
+            // self-ty here doesn't escape this probe, so just erase
+            // any LBR.
+            let self_ty = self.tcx().erase_late_bound_regions(&obligation.self_ty());
+            let poly_trait_ref = match self_ty.kind {
+                ty::Dynamic(ref data, ..) => {
+                    if data.auto_traits().any(|did| did == obligation.predicate.def_id()) {
+                        debug!(
+                            "assemble_candidates_from_object_ty: matched builtin bound, \
+                             pushing candidate"
+                        );
+                        candidates.vec.push(BuiltinObjectCandidate);
+                        return;
+                    }
+
+                    if let Some(principal) = data.principal() {
+                        if !self.infcx.tcx.features().object_safe_for_dispatch {
+                            principal.with_self_ty(self.tcx(), self_ty)
+                        } else if self.tcx().is_object_safe(principal.def_id()) {
+                            principal.with_self_ty(self.tcx(), self_ty)
+                        } else {
+                            return;
+                        }
+                    } else {
+                        // Only auto trait bounds exist.
+                        return;
+                    }
+                }
+                ty::Infer(ty::TyVar(_)) => {
+                    debug!("assemble_candidates_from_object_ty: ambiguous");
+                    candidates.ambiguous = true; // could wind up being an object type
+                    return;
+                }
+                _ => return,
+            };
+
+            debug!("assemble_candidates_from_object_ty: poly_trait_ref={:?}", poly_trait_ref);
+
+            // Count only those upcast versions that match the trait-ref
+            // we are looking for. Specifically, do not only check for the
+            // correct trait, but also the correct type parameters.
+            // For example, we may be trying to upcast `Foo` to `Bar<i32>`,
+            // but `Foo` is declared as `trait Foo: Bar<u32>`.
+            let upcast_trait_refs = util::supertraits(self.tcx(), poly_trait_ref)
+                .filter(|upcast_trait_ref| {
+                    self.infcx
+                        .probe(|_| self.match_poly_trait_ref(obligation, *upcast_trait_ref).is_ok())
+                })
+                .count();
+
+            if upcast_trait_refs > 1 {
+                // Can be upcast in many ways; need more type information.
+                candidates.ambiguous = true;
+            } else if upcast_trait_refs == 1 {
+                candidates.vec.push(ObjectCandidate);
+            }
+        })
+    }
+
+    /// Searches for unsizing that might apply to `obligation`.
+    fn assemble_candidates_for_unsizing(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) {
+        // We currently never consider higher-ranked obligations e.g.
+        // `for<'a> &'a T: Unsize<Trait+'a>` to be implemented. This is not
+        // because they are a priori invalid, and we could potentially add support
+        // for them later, it's just that there isn't really a strong need for it.
+        // A `T: Unsize<U>` obligation is always used as part of a `T: CoerceUnsize<U>`
+        // impl, and those are generally applied to concrete types.
+        //
+        // That said, one might try to write a fn with a where clause like
+        //     for<'a> Foo<'a, T>: Unsize<Foo<'a, Trait>>
+        // where the `'a` is kind of orthogonal to the relevant part of the `Unsize`.
+        // Still, you'd be more likely to write that where clause as
+        //     T: Trait
+        // so it seems ok if we (conservatively) fail to accept that `Unsize`
+        // obligation above. Should be possible to extend this in the future.
+        let source = match obligation.self_ty().no_bound_vars() {
+            Some(t) => t,
+            None => {
+                // Don't add any candidates if there are bound regions.
+                return;
+            }
+        };
+        let target = obligation.predicate.skip_binder().trait_ref.substs.type_at(1);
+
+        debug!("assemble_candidates_for_unsizing(source={:?}, target={:?})", source, target);
+
+        let may_apply = match (&source.kind, &target.kind) {
+            // Trait+Kx+'a -> Trait+Ky+'b (upcasts).
+            (&ty::Dynamic(ref data_a, ..), &ty::Dynamic(ref data_b, ..)) => {
+                // Upcasts permit two things:
+                //
+                // 1. Dropping auto traits, e.g., `Foo + Send` to `Foo`
+                // 2. Tightening the region bound, e.g., `Foo + 'a` to `Foo + 'b` if `'a: 'b`
+                //
+                // Note that neither of these changes requires any
+                // change at runtime. Eventually this will be
+                // generalized.
+                //
+                // We always upcast when we can because of reason
+                // #2 (region bounds).
+                data_a.principal_def_id() == data_b.principal_def_id()
+                    && data_b
+                        .auto_traits()
+                        // All of a's auto traits need to be in b's auto traits.
+                        .all(|b| data_a.auto_traits().any(|a| a == b))
+            }
+
+            // `T` -> `Trait`
+            (_, &ty::Dynamic(..)) => true,
+
+            // Ambiguous handling is below `T` -> `Trait`, because inference
+            // variables can still implement `Unsize<Trait>` and nested
+            // obligations will have the final say (likely deferred).
+            (&ty::Infer(ty::TyVar(_)), _) | (_, &ty::Infer(ty::TyVar(_))) => {
+                debug!("assemble_candidates_for_unsizing: ambiguous");
+                candidates.ambiguous = true;
+                false
+            }
+
+            // `[T; n]` -> `[T]`
+            (&ty::Array(..), &ty::Slice(_)) => true,
+
+            // `Struct<T>` -> `Struct<U>`
+            (&ty::Adt(def_id_a, _), &ty::Adt(def_id_b, _)) if def_id_a.is_struct() => {
+                def_id_a == def_id_b
+            }
+
+            // `(.., T)` -> `(.., U)`
+            (&ty::Tuple(tys_a), &ty::Tuple(tys_b)) => tys_a.len() == tys_b.len(),
+
+            _ => false,
+        };
+
+        if may_apply {
+            candidates.vec.push(BuiltinUnsizeCandidate);
+        }
+    }
+
+    fn assemble_candidates_for_trait_alias(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        // Okay to skip binder here because the tests we do below do not involve bound regions.
+        let self_ty = *obligation.self_ty().skip_binder();
+        debug!("assemble_candidates_for_trait_alias(self_ty={:?})", self_ty);
+
+        let def_id = obligation.predicate.def_id();
+
+        if self.tcx().is_trait_alias(def_id) {
+            candidates.vec.push(TraitAliasCandidate(def_id));
+        }
+
+        Ok(())
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // WINNOW
+    //
+    // Winnowing is the process of attempting to resolve ambiguity by
+    // probing further. During the winnowing process, we unify all
+    // type variables and then we also attempt to evaluate recursive
+    // bounds to see if they are satisfied.
+
+    /// Returns `true` if `victim` should be dropped in favor of
+    /// `other`. Generally speaking we will drop duplicate
+    /// candidates and prefer where-clause candidates.
+    ///
+    /// See the comment for "SelectionCandidate" for more details.
+    fn candidate_should_be_dropped_in_favor_of(
+        &mut self,
+        victim: &EvaluatedCandidate<'tcx>,
+        other: &EvaluatedCandidate<'tcx>,
+        needs_infer: bool,
+    ) -> bool {
+        if victim.candidate == other.candidate {
+            return true;
+        }
+
+        // Check if a bound would previously have been removed when normalizing
+        // the param_env so that it can be given the lowest priority. See
+        // #50825 for the motivation for this.
+        let is_global =
+            |cand: &ty::PolyTraitRef<'_>| cand.is_global() && !cand.has_late_bound_regions();
+
+        match other.candidate {
+            // Prefer `BuiltinCandidate { has_nested: false }` to anything else.
+            // This is a fix for #53123 and prevents winnowing from accidentally extending the
+            // lifetime of a variable.
+            BuiltinCandidate { has_nested: false } => true,
+            ParamCandidate(ref cand) => match victim.candidate {
+                AutoImplCandidate(..) => {
+                    bug!(
+                        "default implementations shouldn't be recorded \
+                         when there are other valid candidates"
+                    );
+                }
+                // Prefer `BuiltinCandidate { has_nested: false }` to anything else.
+                // This is a fix for #53123 and prevents winnowing from accidentally extending the
+                // lifetime of a variable.
+                BuiltinCandidate { has_nested: false } => false,
+                ImplCandidate(..)
+                | ClosureCandidate
+                | GeneratorCandidate
+                | FnPointerCandidate
+                | BuiltinObjectCandidate
+                | BuiltinUnsizeCandidate
+                | BuiltinCandidate { .. }
+                | TraitAliasCandidate(..) => {
+                    // Global bounds from the where clause should be ignored
+                    // here (see issue #50825). Otherwise, we have a where
+                    // clause so don't go around looking for impls.
+                    !is_global(cand)
+                }
+                ObjectCandidate | ProjectionCandidate => {
+                    // Arbitrarily give param candidates priority
+                    // over projection and object candidates.
+                    !is_global(cand)
+                }
+                ParamCandidate(..) => false,
+            },
+            ObjectCandidate | ProjectionCandidate => match victim.candidate {
+                AutoImplCandidate(..) => {
+                    bug!(
+                        "default implementations shouldn't be recorded \
+                         when there are other valid candidates"
+                    );
+                }
+                // Prefer `BuiltinCandidate { has_nested: false }` to anything else.
+                // This is a fix for #53123 and prevents winnowing from accidentally extending the
+                // lifetime of a variable.
+                BuiltinCandidate { has_nested: false } => false,
+                ImplCandidate(..)
+                | ClosureCandidate
+                | GeneratorCandidate
+                | FnPointerCandidate
+                | BuiltinObjectCandidate
+                | BuiltinUnsizeCandidate
+                | BuiltinCandidate { .. }
+                | TraitAliasCandidate(..) => true,
+                ObjectCandidate | ProjectionCandidate => {
+                    // Arbitrarily give param candidates priority
+                    // over projection and object candidates.
+                    true
+                }
+                ParamCandidate(ref cand) => is_global(cand),
+            },
+            ImplCandidate(other_def) => {
+                // See if we can toss out `victim` based on specialization.
+                // This requires us to know *for sure* that the `other` impl applies
+                // i.e., `EvaluatedToOk`.
+                if other.evaluation.must_apply_modulo_regions() {
+                    match victim.candidate {
+                        ImplCandidate(victim_def) => {
+                            let tcx = self.tcx();
+                            if tcx.specializes((other_def, victim_def)) {
+                                return true;
+                            }
+                            return match tcx.impls_are_allowed_to_overlap(other_def, victim_def) {
+                                Some(ty::ImplOverlapKind::Permitted { marker: true }) => {
+                                    // Subtle: If the predicate we are evaluating has inference
+                                    // variables, do *not* allow discarding candidates due to
+                                    // marker trait impls.
+                                    //
+                                    // Without this restriction, we could end up accidentally
+                                    // constrainting inference variables based on an arbitrarily
+                                    // chosen trait impl.
+                                    //
+                                    // Imagine we have the following code:
+                                    //
+                                    // ```rust
+                                    // #[marker] trait MyTrait {}
+                                    // impl MyTrait for u8 {}
+                                    // impl MyTrait for bool {}
+                                    // ```
+                                    //
+                                    // And we are evaluating the predicate `<_#0t as MyTrait>`.
+                                    //
+                                    // During selection, we will end up with one candidate for each
+                                    // impl of `MyTrait`. If we were to discard one impl in favor
+                                    // of the other, we would be left with one candidate, causing
+                                    // us to "successfully" select the predicate, unifying
+                                    // _#0t with (for example) `u8`.
+                                    //
+                                    // However, we have no reason to believe that this unification
+                                    // is correct - we've essentially just picked an arbitrary
+                                    // *possibility* for _#0t, and required that this be the *only*
+                                    // possibility.
+                                    //
+                                    // Eventually, we will either:
+                                    // 1) Unify all inference variables in the predicate through
+                                    // some other means (e.g. type-checking of a function). We will
+                                    // then be in a position to drop marker trait candidates
+                                    // without constraining inference variables (since there are
+                                    // none left to constrin)
+                                    // 2) Be left with some unconstrained inference variables. We
+                                    // will then correctly report an inference error, since the
+                                    // existence of multiple marker trait impls tells us nothing
+                                    // about which one should actually apply.
+                                    !needs_infer
+                                }
+                                Some(_) => true,
+                                None => false,
+                            };
+                        }
+                        ParamCandidate(ref cand) => {
+                            // Prefer the impl to a global where clause candidate.
+                            return is_global(cand);
+                        }
+                        _ => (),
+                    }
+                }
+
+                false
+            }
+            ClosureCandidate
+            | GeneratorCandidate
+            | FnPointerCandidate
+            | BuiltinObjectCandidate
+            | BuiltinUnsizeCandidate
+            | BuiltinCandidate { has_nested: true } => {
+                match victim.candidate {
+                    ParamCandidate(ref cand) => {
+                        // Prefer these to a global where-clause bound
+                        // (see issue #50825).
+                        is_global(cand) && other.evaluation.must_apply_modulo_regions()
+                    }
+                    _ => false,
+                }
+            }
+            _ => false,
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // BUILTIN BOUNDS
+    //
+    // These cover the traits that are built-in to the language
+    // itself: `Copy`, `Clone` and `Sized`.
+
+    fn assemble_builtin_bound_candidates(
+        &mut self,
+        conditions: BuiltinImplConditions<'tcx>,
+        candidates: &mut SelectionCandidateSet<'tcx>,
+    ) -> Result<(), SelectionError<'tcx>> {
+        match conditions {
+            BuiltinImplConditions::Where(nested) => {
+                debug!("builtin_bound: nested={:?}", nested);
+                candidates
+                    .vec
+                    .push(BuiltinCandidate { has_nested: !nested.skip_binder().is_empty() });
+            }
+            BuiltinImplConditions::None => {}
+            BuiltinImplConditions::Ambiguous => {
+                debug!("assemble_builtin_bound_candidates: ambiguous builtin");
+                candidates.ambiguous = true;
+            }
+        }
+
+        Ok(())
+    }
+
+    fn sized_conditions(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> BuiltinImplConditions<'tcx> {
+        use self::BuiltinImplConditions::{Ambiguous, None, Where};
+
+        // NOTE: binder moved to (*)
+        let self_ty = self.infcx.shallow_resolve(obligation.predicate.skip_binder().self_ty());
+
+        match self_ty.kind {
+            ty::Infer(ty::IntVar(_))
+            | ty::Infer(ty::FloatVar(_))
+            | ty::Uint(_)
+            | ty::Int(_)
+            | ty::Bool
+            | ty::Float(_)
+            | ty::FnDef(..)
+            | ty::FnPtr(_)
+            | ty::RawPtr(..)
+            | ty::Char
+            | ty::Ref(..)
+            | ty::Generator(..)
+            | ty::GeneratorWitness(..)
+            | ty::Array(..)
+            | ty::Closure(..)
+            | ty::Never
+            | ty::Error => {
+                // safe for everything
+                Where(ty::Binder::dummy(Vec::new()))
+            }
+
+            ty::Str | ty::Slice(_) | ty::Dynamic(..) | ty::Foreign(..) => None,
+
+            ty::Tuple(tys) => {
+                Where(ty::Binder::bind(tys.last().into_iter().map(|k| k.expect_ty()).collect()))
+            }
+
+            ty::Adt(def, substs) => {
+                let sized_crit = def.sized_constraint(self.tcx());
+                // (*) binder moved here
+                Where(ty::Binder::bind(
+                    sized_crit.iter().map(|ty| ty.subst(self.tcx(), substs)).collect(),
+                ))
+            }
+
+            ty::Projection(_) | ty::Param(_) | ty::Opaque(..) => None,
+            ty::Infer(ty::TyVar(_)) => Ambiguous,
+
+            ty::UnnormalizedProjection(..)
+            | ty::Placeholder(..)
+            | ty::Bound(..)
+            | ty::Infer(ty::FreshTy(_))
+            | ty::Infer(ty::FreshIntTy(_))
+            | ty::Infer(ty::FreshFloatTy(_)) => {
+                bug!("asked to assemble builtin bounds of unexpected type: {:?}", self_ty);
+            }
+        }
+    }
+
+    fn copy_clone_conditions(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> BuiltinImplConditions<'tcx> {
+        // NOTE: binder moved to (*)
+        let self_ty = self.infcx.shallow_resolve(obligation.predicate.skip_binder().self_ty());
+
+        use self::BuiltinImplConditions::{Ambiguous, None, Where};
+
+        match self_ty.kind {
+            ty::Infer(ty::IntVar(_))
+            | ty::Infer(ty::FloatVar(_))
+            | ty::FnDef(..)
+            | ty::FnPtr(_)
+            | ty::Error => Where(ty::Binder::dummy(Vec::new())),
+
+            ty::Uint(_)
+            | ty::Int(_)
+            | ty::Bool
+            | ty::Float(_)
+            | ty::Char
+            | ty::RawPtr(..)
+            | ty::Never
+            | ty::Ref(_, _, hir::Mutability::Not) => {
+                // Implementations provided in libcore
+                None
+            }
+
+            ty::Dynamic(..)
+            | ty::Str
+            | ty::Slice(..)
+            | ty::Generator(..)
+            | ty::GeneratorWitness(..)
+            | ty::Foreign(..)
+            | ty::Ref(_, _, hir::Mutability::Mut) => None,
+
+            ty::Array(element_ty, _) => {
+                // (*) binder moved here
+                Where(ty::Binder::bind(vec![element_ty]))
+            }
+
+            ty::Tuple(tys) => {
+                // (*) binder moved here
+                Where(ty::Binder::bind(tys.iter().map(|k| k.expect_ty()).collect()))
+            }
+
+            ty::Closure(def_id, substs) => {
+                // (*) binder moved here
+                Where(ty::Binder::bind(substs.as_closure().upvar_tys(def_id, self.tcx()).collect()))
+            }
+
+            ty::Adt(..) | ty::Projection(..) | ty::Param(..) | ty::Opaque(..) => {
+                // Fallback to whatever user-defined impls exist in this case.
+                None
+            }
+
+            ty::Infer(ty::TyVar(_)) => {
+                // Unbound type variable. Might or might not have
+                // applicable impls and so forth, depending on what
+                // those type variables wind up being bound to.
+                Ambiguous
+            }
+
+            ty::UnnormalizedProjection(..)
+            | ty::Placeholder(..)
+            | ty::Bound(..)
+            | ty::Infer(ty::FreshTy(_))
+            | ty::Infer(ty::FreshIntTy(_))
+            | ty::Infer(ty::FreshFloatTy(_)) => {
+                bug!("asked to assemble builtin bounds of unexpected type: {:?}", self_ty);
+            }
+        }
+    }
+
+    /// For default impls, we need to break apart a type into its
+    /// "constituent types" -- meaning, the types that it contains.
+    ///
+    /// Here are some (simple) examples:
+    ///
+    /// ```
+    /// (i32, u32) -> [i32, u32]
+    /// Foo where struct Foo { x: i32, y: u32 } -> [i32, u32]
+    /// Bar<i32> where struct Bar<T> { x: T, y: u32 } -> [i32, u32]
+    /// Zed<i32> where enum Zed { A(T), B(u32) } -> [i32, u32]
+    /// ```
+    fn constituent_types_for_ty(&self, t: Ty<'tcx>) -> Vec<Ty<'tcx>> {
+        match t.kind {
+            ty::Uint(_)
+            | ty::Int(_)
+            | ty::Bool
+            | ty::Float(_)
+            | ty::FnDef(..)
+            | ty::FnPtr(_)
+            | ty::Str
+            | ty::Error
+            | ty::Infer(ty::IntVar(_))
+            | ty::Infer(ty::FloatVar(_))
+            | ty::Never
+            | ty::Char => Vec::new(),
+
+            ty::UnnormalizedProjection(..)
+            | ty::Placeholder(..)
+            | ty::Dynamic(..)
+            | ty::Param(..)
+            | ty::Foreign(..)
+            | ty::Projection(..)
+            | ty::Bound(..)
+            | ty::Infer(ty::TyVar(_))
+            | ty::Infer(ty::FreshTy(_))
+            | ty::Infer(ty::FreshIntTy(_))
+            | ty::Infer(ty::FreshFloatTy(_)) => {
+                bug!("asked to assemble constituent types of unexpected type: {:?}", t);
+            }
+
+            ty::RawPtr(ty::TypeAndMut { ty: element_ty, .. }) | ty::Ref(_, element_ty, _) => {
+                vec![element_ty]
+            }
+
+            ty::Array(element_ty, _) | ty::Slice(element_ty) => vec![element_ty],
+
+            ty::Tuple(ref tys) => {
+                // (T1, ..., Tn) -- meets any bound that all of T1...Tn meet
+                tys.iter().map(|k| k.expect_ty()).collect()
+            }
+
+            ty::Closure(def_id, ref substs) => {
+                substs.as_closure().upvar_tys(def_id, self.tcx()).collect()
+            }
+
+            ty::Generator(def_id, ref substs, _) => {
+                let witness = substs.as_generator().witness(def_id, self.tcx());
+                substs
+                    .as_generator()
+                    .upvar_tys(def_id, self.tcx())
+                    .chain(iter::once(witness))
+                    .collect()
+            }
+
+            ty::GeneratorWitness(types) => {
+                // This is sound because no regions in the witness can refer to
+                // the binder outside the witness. So we'll effectivly reuse
+                // the implicit binder around the witness.
+                types.skip_binder().to_vec()
+            }
+
+            // For `PhantomData<T>`, we pass `T`.
+            ty::Adt(def, substs) if def.is_phantom_data() => substs.types().collect(),
+
+            ty::Adt(def, substs) => def.all_fields().map(|f| f.ty(self.tcx(), substs)).collect(),
+
+            ty::Opaque(def_id, substs) => {
+                // We can resolve the `impl Trait` to its concrete type,
+                // which enforces a DAG between the functions requiring
+                // the auto trait bounds in question.
+                vec![self.tcx().type_of(def_id).subst(self.tcx(), substs)]
+            }
+        }
+    }
+
+    fn collect_predicates_for_types(
+        &mut self,
+        param_env: ty::ParamEnv<'tcx>,
+        cause: ObligationCause<'tcx>,
+        recursion_depth: usize,
+        trait_def_id: DefId,
+        types: ty::Binder<Vec<Ty<'tcx>>>,
+    ) -> Vec<PredicateObligation<'tcx>> {
+        // Because the types were potentially derived from
+        // higher-ranked obligations they may reference late-bound
+        // regions. For example, `for<'a> Foo<&'a int> : Copy` would
+        // yield a type like `for<'a> &'a int`. In general, we
+        // maintain the invariant that we never manipulate bound
+        // regions, so we have to process these bound regions somehow.
+        //
+        // The strategy is to:
+        //
+        // 1. Instantiate those regions to placeholder regions (e.g.,
+        //    `for<'a> &'a int` becomes `&0 int`.
+        // 2. Produce something like `&'0 int : Copy`
+        // 3. Re-bind the regions back to `for<'a> &'a int : Copy`
+
+        types
+            .skip_binder()
+            .iter()
+            .flat_map(|ty| {
+                // binder moved -\
+                let ty: ty::Binder<Ty<'tcx>> = ty::Binder::bind(ty); // <----/
+
+                self.infcx.commit_unconditionally(|_| {
+                    let (skol_ty, _) = self.infcx.replace_bound_vars_with_placeholders(&ty);
+                    let Normalized { value: normalized_ty, mut obligations } =
+                        project::normalize_with_depth(
+                            self,
+                            param_env,
+                            cause.clone(),
+                            recursion_depth,
+                            &skol_ty,
+                        );
+                    let skol_obligation = predicate_for_trait_def(
+                        self.tcx(),
+                        param_env,
+                        cause.clone(),
+                        trait_def_id,
+                        recursion_depth,
+                        normalized_ty,
+                        &[],
+                    );
+                    obligations.push(skol_obligation);
+                    obligations
+                })
+            })
+            .collect()
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // CONFIRMATION
+    //
+    // Confirmation unifies the output type parameters of the trait
+    // with the values found in the obligation, possibly yielding a
+    // type error.  See the [rustc guide] for more details.
+    //
+    // [rustc guide]:
+    // https://rust-lang.github.io/rustc-guide/traits/resolution.html#confirmation
+
+    fn confirm_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        candidate: SelectionCandidate<'tcx>,
+    ) -> Result<Selection<'tcx>, SelectionError<'tcx>> {
+        debug!("confirm_candidate({:?}, {:?})", obligation, candidate);
+
+        match candidate {
+            BuiltinCandidate { has_nested } => {
+                let data = self.confirm_builtin_candidate(obligation, has_nested);
+                Ok(VtableBuiltin(data))
+            }
+
+            ParamCandidate(param) => {
+                let obligations = self.confirm_param_candidate(obligation, param);
+                Ok(VtableParam(obligations))
+            }
+
+            ImplCandidate(impl_def_id) => {
+                Ok(VtableImpl(self.confirm_impl_candidate(obligation, impl_def_id)))
+            }
+
+            AutoImplCandidate(trait_def_id) => {
+                let data = self.confirm_auto_impl_candidate(obligation, trait_def_id);
+                Ok(VtableAutoImpl(data))
+            }
+
+            ProjectionCandidate => {
+                self.confirm_projection_candidate(obligation);
+                Ok(VtableParam(Vec::new()))
+            }
+
+            ClosureCandidate => {
+                let vtable_closure = self.confirm_closure_candidate(obligation)?;
+                Ok(VtableClosure(vtable_closure))
+            }
+
+            GeneratorCandidate => {
+                let vtable_generator = self.confirm_generator_candidate(obligation)?;
+                Ok(VtableGenerator(vtable_generator))
+            }
+
+            FnPointerCandidate => {
+                let data = self.confirm_fn_pointer_candidate(obligation)?;
+                Ok(VtableFnPointer(data))
+            }
+
+            TraitAliasCandidate(alias_def_id) => {
+                let data = self.confirm_trait_alias_candidate(obligation, alias_def_id);
+                Ok(VtableTraitAlias(data))
+            }
+
+            ObjectCandidate => {
+                let data = self.confirm_object_candidate(obligation);
+                Ok(VtableObject(data))
+            }
+
+            BuiltinObjectCandidate => {
+                // This indicates something like `Trait + Send: Send`. In this case, we know that
+                // this holds because that's what the object type is telling us, and there's really
+                // no additional obligations to prove and no types in particular to unify, etc.
+                Ok(VtableParam(Vec::new()))
+            }
+
+            BuiltinUnsizeCandidate => {
+                let data = self.confirm_builtin_unsize_candidate(obligation)?;
+                Ok(VtableBuiltin(data))
+            }
+        }
+    }
+
+    fn confirm_projection_candidate(&mut self, obligation: &TraitObligation<'tcx>) {
+        self.infcx.commit_unconditionally(|snapshot| {
+            let result =
+                self.match_projection_obligation_against_definition_bounds(obligation, snapshot);
+            assert!(result);
+        })
+    }
+
+    fn confirm_param_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        param: ty::PolyTraitRef<'tcx>,
+    ) -> Vec<PredicateObligation<'tcx>> {
+        debug!("confirm_param_candidate({:?},{:?})", obligation, param);
+
+        // During evaluation, we already checked that this
+        // where-clause trait-ref could be unified with the obligation
+        // trait-ref. Repeat that unification now without any
+        // transactional boundary; it should not fail.
+        match self.match_where_clause_trait_ref(obligation, param.clone()) {
+            Ok(obligations) => obligations,
+            Err(()) => {
+                bug!(
+                    "Where clause `{:?}` was applicable to `{:?}` but now is not",
+                    param,
+                    obligation
+                );
+            }
+        }
+    }
+
+    fn confirm_builtin_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        has_nested: bool,
+    ) -> VtableBuiltinData<PredicateObligation<'tcx>> {
+        debug!("confirm_builtin_candidate({:?}, {:?})", obligation, has_nested);
+
+        let lang_items = self.tcx().lang_items();
+        let obligations = if has_nested {
+            let trait_def = obligation.predicate.def_id();
+            let conditions = if Some(trait_def) == lang_items.sized_trait() {
+                self.sized_conditions(obligation)
+            } else if Some(trait_def) == lang_items.copy_trait() {
+                self.copy_clone_conditions(obligation)
+            } else if Some(trait_def) == lang_items.clone_trait() {
+                self.copy_clone_conditions(obligation)
+            } else {
+                bug!("unexpected builtin trait {:?}", trait_def)
+            };
+            let nested = match conditions {
+                BuiltinImplConditions::Where(nested) => nested,
+                _ => bug!("obligation {:?} had matched a builtin impl but now doesn't", obligation),
+            };
+
+            let cause = obligation.derived_cause(BuiltinDerivedObligation);
+            self.collect_predicates_for_types(
+                obligation.param_env,
+                cause,
+                obligation.recursion_depth + 1,
+                trait_def,
+                nested,
+            )
+        } else {
+            vec![]
+        };
+
+        debug!("confirm_builtin_candidate: obligations={:?}", obligations);
+
+        VtableBuiltinData { nested: obligations }
+    }
+
+    /// This handles the case where a `auto trait Foo` impl is being used.
+    /// The idea is that the impl applies to `X : Foo` if the following conditions are met:
+    ///
+    /// 1. For each constituent type `Y` in `X`, `Y : Foo` holds
+    /// 2. For each where-clause `C` declared on `Foo`, `[Self => X] C` holds.
+    fn confirm_auto_impl_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        trait_def_id: DefId,
+    ) -> VtableAutoImplData<PredicateObligation<'tcx>> {
+        debug!("confirm_auto_impl_candidate({:?}, {:?})", obligation, trait_def_id);
+
+        let types = obligation.predicate.map_bound(|inner| {
+            let self_ty = self.infcx.shallow_resolve(inner.self_ty());
+            self.constituent_types_for_ty(self_ty)
+        });
+        self.vtable_auto_impl(obligation, trait_def_id, types)
+    }
+
+    /// See `confirm_auto_impl_candidate`.
+    fn vtable_auto_impl(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        trait_def_id: DefId,
+        nested: ty::Binder<Vec<Ty<'tcx>>>,
+    ) -> VtableAutoImplData<PredicateObligation<'tcx>> {
+        debug!("vtable_auto_impl: nested={:?}", nested);
+
+        let cause = obligation.derived_cause(BuiltinDerivedObligation);
+        let mut obligations = self.collect_predicates_for_types(
+            obligation.param_env,
+            cause,
+            obligation.recursion_depth + 1,
+            trait_def_id,
+            nested,
+        );
+
+        let trait_obligations: Vec<PredicateObligation<'_>> =
+            self.infcx.commit_unconditionally(|_| {
+                let poly_trait_ref = obligation.predicate.to_poly_trait_ref();
+                let (trait_ref, _) =
+                    self.infcx.replace_bound_vars_with_placeholders(&poly_trait_ref);
+                let cause = obligation.derived_cause(ImplDerivedObligation);
+                self.impl_or_trait_obligations(
+                    cause,
+                    obligation.recursion_depth + 1,
+                    obligation.param_env,
+                    trait_def_id,
+                    &trait_ref.substs,
+                )
+            });
+
+        // Adds the predicates from the trait.  Note that this contains a `Self: Trait`
+        // predicate as usual.  It won't have any effect since auto traits are coinductive.
+        obligations.extend(trait_obligations);
+
+        debug!("vtable_auto_impl: obligations={:?}", obligations);
+
+        VtableAutoImplData { trait_def_id, nested: obligations }
+    }
+
+    fn confirm_impl_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        impl_def_id: DefId,
+    ) -> VtableImplData<'tcx, PredicateObligation<'tcx>> {
+        debug!("confirm_impl_candidate({:?},{:?})", obligation, impl_def_id);
+
+        // First, create the substitutions by matching the impl again,
+        // this time not in a probe.
+        self.infcx.commit_unconditionally(|snapshot| {
+            let substs = self.rematch_impl(impl_def_id, obligation, snapshot);
+            debug!("confirm_impl_candidate: substs={:?}", substs);
+            let cause = obligation.derived_cause(ImplDerivedObligation);
+            self.vtable_impl(
+                impl_def_id,
+                substs,
+                cause,
+                obligation.recursion_depth + 1,
+                obligation.param_env,
+            )
+        })
+    }
+
+    fn vtable_impl(
+        &mut self,
+        impl_def_id: DefId,
+        mut substs: Normalized<'tcx, SubstsRef<'tcx>>,
+        cause: ObligationCause<'tcx>,
+        recursion_depth: usize,
+        param_env: ty::ParamEnv<'tcx>,
+    ) -> VtableImplData<'tcx, PredicateObligation<'tcx>> {
+        debug!(
+            "vtable_impl(impl_def_id={:?}, substs={:?}, recursion_depth={})",
+            impl_def_id, substs, recursion_depth,
+        );
+
+        let mut impl_obligations = self.impl_or_trait_obligations(
+            cause,
+            recursion_depth,
+            param_env,
+            impl_def_id,
+            &substs.value,
+        );
+
+        debug!(
+            "vtable_impl: impl_def_id={:?} impl_obligations={:?}",
+            impl_def_id, impl_obligations
+        );
+
+        // Because of RFC447, the impl-trait-ref and obligations
+        // are sufficient to determine the impl substs, without
+        // relying on projections in the impl-trait-ref.
+        //
+        // e.g., `impl<U: Tr, V: Iterator<Item=U>> Foo<<U as Tr>::T> for V`
+        impl_obligations.append(&mut substs.obligations);
+
+        VtableImplData { impl_def_id, substs: substs.value, nested: impl_obligations }
+    }
+
+    fn confirm_object_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> VtableObjectData<'tcx, PredicateObligation<'tcx>> {
+        debug!("confirm_object_candidate({:?})", obligation);
+
+        // FIXME(nmatsakis) skipping binder here seems wrong -- we should
+        // probably flatten the binder from the obligation and the binder
+        // from the object. Have to try to make a broken test case that
+        // results.
+        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
+        let poly_trait_ref = match self_ty.kind {
+            ty::Dynamic(ref data, ..) => data
+                .principal()
+                .unwrap_or_else(|| {
+                    span_bug!(obligation.cause.span, "object candidate with no principal")
+                })
+                .with_self_ty(self.tcx(), self_ty),
+            _ => span_bug!(obligation.cause.span, "object candidate with non-object"),
+        };
+
+        let mut upcast_trait_ref = None;
+        let mut nested = vec![];
+        let vtable_base;
+
+        {
+            let tcx = self.tcx();
+
+            // We want to find the first supertrait in the list of
+            // supertraits that we can unify with, and do that
+            // unification. We know that there is exactly one in the list
+            // where we can unify, because otherwise select would have
+            // reported an ambiguity. (When we do find a match, also
+            // record it for later.)
+            let nonmatching = util::supertraits(tcx, poly_trait_ref).take_while(|&t| {
+                match self.infcx.commit_if_ok(|_| self.match_poly_trait_ref(obligation, t)) {
+                    Ok(obligations) => {
+                        upcast_trait_ref = Some(t);
+                        nested.extend(obligations);
+                        false
+                    }
+                    Err(_) => true,
+                }
+            });
+
+            // Additionally, for each of the non-matching predicates that
+            // we pass over, we sum up the set of number of vtable
+            // entries, so that we can compute the offset for the selected
+            // trait.
+            vtable_base = nonmatching.map(|t| super::util::count_own_vtable_entries(tcx, t)).sum();
+        }
+
+        VtableObjectData { upcast_trait_ref: upcast_trait_ref.unwrap(), vtable_base, nested }
+    }
+
+    fn confirm_fn_pointer_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> Result<VtableFnPointerData<'tcx, PredicateObligation<'tcx>>, SelectionError<'tcx>> {
+        debug!("confirm_fn_pointer_candidate({:?})", obligation);
+
+        // Okay to skip binder; it is reintroduced below.
+        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
+        let sig = self_ty.fn_sig(self.tcx());
+        let trait_ref = closure_trait_ref_and_return_type(
+            self.tcx(),
+            obligation.predicate.def_id(),
+            self_ty,
+            sig,
+            util::TupleArgumentsFlag::Yes,
+        )
+        .map_bound(|(trait_ref, _)| trait_ref);
+
+        let Normalized { value: trait_ref, obligations } = project::normalize_with_depth(
+            self,
+            obligation.param_env,
+            obligation.cause.clone(),
+            obligation.recursion_depth + 1,
+            &trait_ref,
+        );
+
+        self.confirm_poly_trait_refs(
+            obligation.cause.clone(),
+            obligation.param_env,
+            obligation.predicate.to_poly_trait_ref(),
+            trait_ref,
+        )?;
+        Ok(VtableFnPointerData { fn_ty: self_ty, nested: obligations })
+    }
+
+    fn confirm_trait_alias_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        alias_def_id: DefId,
+    ) -> VtableTraitAliasData<'tcx, PredicateObligation<'tcx>> {
+        debug!("confirm_trait_alias_candidate({:?}, {:?})", obligation, alias_def_id);
+
+        self.infcx.commit_unconditionally(|_| {
+            let (predicate, _) =
+                self.infcx().replace_bound_vars_with_placeholders(&obligation.predicate);
+            let trait_ref = predicate.trait_ref;
+            let trait_def_id = trait_ref.def_id;
+            let substs = trait_ref.substs;
+
+            let trait_obligations = self.impl_or_trait_obligations(
+                obligation.cause.clone(),
+                obligation.recursion_depth,
+                obligation.param_env,
+                trait_def_id,
+                &substs,
+            );
+
+            debug!(
+                "confirm_trait_alias_candidate: trait_def_id={:?} trait_obligations={:?}",
+                trait_def_id, trait_obligations
+            );
+
+            VtableTraitAliasData { alias_def_id, substs: substs, nested: trait_obligations }
+        })
+    }
+
+    fn confirm_generator_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> Result<VtableGeneratorData<'tcx, PredicateObligation<'tcx>>, SelectionError<'tcx>> {
+        // Okay to skip binder because the substs on generator types never
+        // touch bound regions, they just capture the in-scope
+        // type/region parameters.
+        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
+        let (generator_def_id, substs) = match self_ty.kind {
+            ty::Generator(id, substs, _) => (id, substs),
+            _ => bug!("closure candidate for non-closure {:?}", obligation),
+        };
+
+        debug!("confirm_generator_candidate({:?},{:?},{:?})", obligation, generator_def_id, substs);
+
+        let trait_ref = self.generator_trait_ref_unnormalized(obligation, generator_def_id, substs);
+        let Normalized { value: trait_ref, mut obligations } = normalize_with_depth(
+            self,
+            obligation.param_env,
+            obligation.cause.clone(),
+            obligation.recursion_depth + 1,
+            &trait_ref,
+        );
+
+        debug!(
+            "confirm_generator_candidate(generator_def_id={:?}, \
+             trait_ref={:?}, obligations={:?})",
+            generator_def_id, trait_ref, obligations
+        );
+
+        obligations.extend(self.confirm_poly_trait_refs(
+            obligation.cause.clone(),
+            obligation.param_env,
+            obligation.predicate.to_poly_trait_ref(),
+            trait_ref,
+        )?);
+
+        Ok(VtableGeneratorData { generator_def_id, substs, nested: obligations })
+    }
+
+    fn confirm_closure_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> Result<VtableClosureData<'tcx, PredicateObligation<'tcx>>, SelectionError<'tcx>> {
+        debug!("confirm_closure_candidate({:?})", obligation);
+
+        let kind = self
+            .tcx()
+            .fn_trait_kind_from_lang_item(obligation.predicate.def_id())
+            .unwrap_or_else(|| bug!("closure candidate for non-fn trait {:?}", obligation));
+
+        // Okay to skip binder because the substs on closure types never
+        // touch bound regions, they just capture the in-scope
+        // type/region parameters.
+        let self_ty = self.infcx.shallow_resolve(*obligation.self_ty().skip_binder());
+        let (closure_def_id, substs) = match self_ty.kind {
+            ty::Closure(id, substs) => (id, substs),
+            _ => bug!("closure candidate for non-closure {:?}", obligation),
+        };
+
+        let trait_ref = self.closure_trait_ref_unnormalized(obligation, closure_def_id, substs);
+        let Normalized { value: trait_ref, mut obligations } = normalize_with_depth(
+            self,
+            obligation.param_env,
+            obligation.cause.clone(),
+            obligation.recursion_depth + 1,
+            &trait_ref,
+        );
+
+        debug!(
+            "confirm_closure_candidate(closure_def_id={:?}, trait_ref={:?}, obligations={:?})",
+            closure_def_id, trait_ref, obligations
+        );
+
+        obligations.extend(self.confirm_poly_trait_refs(
+            obligation.cause.clone(),
+            obligation.param_env,
+            obligation.predicate.to_poly_trait_ref(),
+            trait_ref,
+        )?);
+
+        obligations.push(Obligation::new(
+            obligation.cause.clone(),
+            obligation.param_env,
+            ty::Predicate::ClosureKind(closure_def_id, substs, kind),
+        ));
+
+        Ok(VtableClosureData { closure_def_id, substs, nested: obligations })
+    }
+
+    /// In the case of closure types and fn pointers,
+    /// we currently treat the input type parameters on the trait as
+    /// outputs. This means that when we have a match we have only
+    /// considered the self type, so we have to go back and make sure
+    /// to relate the argument types too. This is kind of wrong, but
+    /// since we control the full set of impls, also not that wrong,
+    /// and it DOES yield better error messages (since we don't report
+    /// errors as if there is no applicable impl, but rather report
+    /// errors are about mismatched argument types.
+    ///
+    /// Here is an example. Imagine we have a closure expression
+    /// and we desugared it so that the type of the expression is
+    /// `Closure`, and `Closure` expects an int as argument. Then it
+    /// is "as if" the compiler generated this impl:
+    ///
+    ///     impl Fn(int) for Closure { ... }
+    ///
+    /// Now imagine our obligation is `Fn(usize) for Closure`. So far
+    /// we have matched the self type `Closure`. At this point we'll
+    /// compare the `int` to `usize` and generate an error.
+    ///
+    /// Note that this checking occurs *after* the impl has selected,
+    /// because these output type parameters should not affect the
+    /// selection of the impl. Therefore, if there is a mismatch, we
+    /// report an error to the user.
+    fn confirm_poly_trait_refs(
+        &mut self,
+        obligation_cause: ObligationCause<'tcx>,
+        obligation_param_env: ty::ParamEnv<'tcx>,
+        obligation_trait_ref: ty::PolyTraitRef<'tcx>,
+        expected_trait_ref: ty::PolyTraitRef<'tcx>,
+    ) -> Result<Vec<PredicateObligation<'tcx>>, SelectionError<'tcx>> {
+        self.infcx
+            .at(&obligation_cause, obligation_param_env)
+            .sup(obligation_trait_ref, expected_trait_ref)
+            .map(|InferOk { obligations, .. }| obligations)
+            .map_err(|e| OutputTypeParameterMismatch(expected_trait_ref, obligation_trait_ref, e))
+    }
+
+    fn confirm_builtin_unsize_candidate(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+    ) -> Result<VtableBuiltinData<PredicateObligation<'tcx>>, SelectionError<'tcx>> {
+        let tcx = self.tcx();
+
+        // `assemble_candidates_for_unsizing` should ensure there are no late-bound
+        // regions here. See the comment there for more details.
+        let source = self.infcx.shallow_resolve(obligation.self_ty().no_bound_vars().unwrap());
+        let target = obligation.predicate.skip_binder().trait_ref.substs.type_at(1);
+        let target = self.infcx.shallow_resolve(target);
+
+        debug!("confirm_builtin_unsize_candidate(source={:?}, target={:?})", source, target);
+
+        let mut nested = vec![];
+        match (&source.kind, &target.kind) {
+            // Trait+Kx+'a -> Trait+Ky+'b (upcasts).
+            (&ty::Dynamic(ref data_a, r_a), &ty::Dynamic(ref data_b, r_b)) => {
+                // See `assemble_candidates_for_unsizing` for more info.
+                let existential_predicates = data_a.map_bound(|data_a| {
+                    let iter = data_a
+                        .principal()
+                        .map(|x| ty::ExistentialPredicate::Trait(x))
+                        .into_iter()
+                        .chain(
+                            data_a
+                                .projection_bounds()
+                                .map(|x| ty::ExistentialPredicate::Projection(x)),
+                        )
+                        .chain(data_b.auto_traits().map(ty::ExistentialPredicate::AutoTrait));
+                    tcx.mk_existential_predicates(iter)
+                });
+                let source_trait = tcx.mk_dynamic(existential_predicates, r_b);
+
+                // Require that the traits involved in this upcast are **equal**;
+                // only the **lifetime bound** is changed.
+                //
+                // FIXME: This condition is arguably too strong -- it would
+                // suffice for the source trait to be a *subtype* of the target
+                // trait. In particular, changing from something like
+                // `for<'a, 'b> Foo<'a, 'b>` to `for<'a> Foo<'a, 'a>` should be
+                // permitted. And, indeed, in the in commit
+                // 904a0bde93f0348f69914ee90b1f8b6e4e0d7cbc, this
+                // condition was loosened. However, when the leak check was
+                // added back, using subtype here actually guides the coercion
+                // code in such a way that it accepts `old-lub-glb-object.rs`.
+                // This is probably a good thing, but I've modified this to `.eq`
+                // because I want to continue rejecting that test (as we have
+                // done for quite some time) before we are firmly comfortable
+                // with what our behavior should be there. -nikomatsakis
+                let InferOk { obligations, .. } = self
+                    .infcx
+                    .at(&obligation.cause, obligation.param_env)
+                    .eq(target, source_trait) // FIXME -- see below
+                    .map_err(|_| Unimplemented)?;
+                nested.extend(obligations);
+
+                // Register one obligation for 'a: 'b.
+                let cause = ObligationCause::new(
+                    obligation.cause.span,
+                    obligation.cause.body_id,
+                    ObjectCastObligation(target),
+                );
+                let outlives = ty::OutlivesPredicate(r_a, r_b);
+                nested.push(Obligation::with_depth(
+                    cause,
+                    obligation.recursion_depth + 1,
+                    obligation.param_env,
+                    ty::Binder::bind(outlives).to_predicate(),
+                ));
+            }
+
+            // `T` -> `Trait`
+            (_, &ty::Dynamic(ref data, r)) => {
+                let mut object_dids = data.auto_traits().chain(data.principal_def_id());
+                if let Some(did) = object_dids.find(|did| !tcx.is_object_safe(*did)) {
+                    return Err(TraitNotObjectSafe(did));
+                }
+
+                let cause = ObligationCause::new(
+                    obligation.cause.span,
+                    obligation.cause.body_id,
+                    ObjectCastObligation(target),
+                );
+
+                let predicate_to_obligation = |predicate| {
+                    Obligation::with_depth(
+                        cause.clone(),
+                        obligation.recursion_depth + 1,
+                        obligation.param_env,
+                        predicate,
+                    )
+                };
+
+                // Create obligations:
+                //  - Casting `T` to `Trait`
+                //  - For all the various builtin bounds attached to the object cast. (In other
+                //  words, if the object type is `Foo + Send`, this would create an obligation for
+                //  the `Send` check.)
+                //  - Projection predicates
+                nested.extend(
+                    data.iter().map(|predicate| {
+                        predicate_to_obligation(predicate.with_self_ty(tcx, source))
+                    }),
+                );
+
+                // We can only make objects from sized types.
+                let tr = ty::TraitRef::new(
+                    tcx.require_lang_item(lang_items::SizedTraitLangItem, None),
+                    tcx.mk_substs_trait(source, &[]),
+                );
+                nested.push(predicate_to_obligation(tr.without_const().to_predicate()));
+
+                // If the type is `Foo + 'a`, ensure that the type
+                // being cast to `Foo + 'a` outlives `'a`:
+                let outlives = ty::OutlivesPredicate(source, r);
+                nested.push(predicate_to_obligation(ty::Binder::dummy(outlives).to_predicate()));
+            }
+
+            // `[T; n]` -> `[T]`
+            (&ty::Array(a, _), &ty::Slice(b)) => {
+                let InferOk { obligations, .. } = self
+                    .infcx
+                    .at(&obligation.cause, obligation.param_env)
+                    .eq(b, a)
+                    .map_err(|_| Unimplemented)?;
+                nested.extend(obligations);
+            }
+
+            // `Struct<T>` -> `Struct<U>`
+            (&ty::Adt(def, substs_a), &ty::Adt(_, substs_b)) => {
+                let fields =
+                    def.all_fields().map(|field| tcx.type_of(field.did)).collect::<Vec<_>>();
+
+                // The last field of the structure has to exist and contain type parameters.
+                let field = if let Some(&field) = fields.last() {
+                    field
+                } else {
+                    return Err(Unimplemented);
+                };
+                let mut ty_params = GrowableBitSet::new_empty();
+                let mut found = false;
+                for ty in field.walk() {
+                    if let ty::Param(p) = ty.kind {
+                        ty_params.insert(p.index as usize);
+                        found = true;
+                    }
+                }
+                if !found {
+                    return Err(Unimplemented);
+                }
+
+                // Replace type parameters used in unsizing with
+                // Error and ensure they do not affect any other fields.
+                // This could be checked after type collection for any struct
+                // with a potentially unsized trailing field.
+                let params = substs_a
+                    .iter()
+                    .enumerate()
+                    .map(|(i, &k)| if ty_params.contains(i) { tcx.types.err.into() } else { k });
+                let substs = tcx.mk_substs(params);
+                for &ty in fields.split_last().unwrap().1 {
+                    if ty.subst(tcx, substs).references_error() {
+                        return Err(Unimplemented);
+                    }
+                }
+
+                // Extract `Field<T>` and `Field<U>` from `Struct<T>` and `Struct<U>`.
+                let inner_source = field.subst(tcx, substs_a);
+                let inner_target = field.subst(tcx, substs_b);
+
+                // Check that the source struct with the target's
+                // unsized parameters is equal to the target.
+                let params = substs_a.iter().enumerate().map(|(i, &k)| {
+                    if ty_params.contains(i) { substs_b.type_at(i).into() } else { k }
+                });
+                let new_struct = tcx.mk_adt(def, tcx.mk_substs(params));
+                let InferOk { obligations, .. } = self
+                    .infcx
+                    .at(&obligation.cause, obligation.param_env)
+                    .eq(target, new_struct)
+                    .map_err(|_| Unimplemented)?;
+                nested.extend(obligations);
+
+                // Construct the nested `Field<T>: Unsize<Field<U>>` predicate.
+                nested.push(predicate_for_trait_def(
+                    tcx,
+                    obligation.param_env,
+                    obligation.cause.clone(),
+                    obligation.predicate.def_id(),
+                    obligation.recursion_depth + 1,
+                    inner_source,
+                    &[inner_target.into()],
+                ));
+            }
+
+            // `(.., T)` -> `(.., U)`
+            (&ty::Tuple(tys_a), &ty::Tuple(tys_b)) => {
+                assert_eq!(tys_a.len(), tys_b.len());
+
+                // The last field of the tuple has to exist.
+                let (&a_last, a_mid) = if let Some(x) = tys_a.split_last() {
+                    x
+                } else {
+                    return Err(Unimplemented);
+                };
+                let &b_last = tys_b.last().unwrap();
+
+                // Check that the source tuple with the target's
+                // last element is equal to the target.
+                let new_tuple = tcx.mk_tup(
+                    a_mid.iter().map(|k| k.expect_ty()).chain(iter::once(b_last.expect_ty())),
+                );
+                let InferOk { obligations, .. } = self
+                    .infcx
+                    .at(&obligation.cause, obligation.param_env)
+                    .eq(target, new_tuple)
+                    .map_err(|_| Unimplemented)?;
+                nested.extend(obligations);
+
+                // Construct the nested `T: Unsize<U>` predicate.
+                nested.push(predicate_for_trait_def(
+                    tcx,
+                    obligation.param_env,
+                    obligation.cause.clone(),
+                    obligation.predicate.def_id(),
+                    obligation.recursion_depth + 1,
+                    a_last.expect_ty(),
+                    &[b_last],
+                ));
+            }
+
+            _ => bug!(),
+        };
+
+        Ok(VtableBuiltinData { nested })
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Matching
+    //
+    // Matching is a common path used for both evaluation and
+    // confirmation.  It basically unifies types that appear in impls
+    // and traits. This does affect the surrounding environment;
+    // therefore, when used during evaluation, match routines must be
+    // run inside of a `probe()` so that their side-effects are
+    // contained.
+
+    fn rematch_impl(
+        &mut self,
+        impl_def_id: DefId,
+        obligation: &TraitObligation<'tcx>,
+        snapshot: &CombinedSnapshot<'_, 'tcx>,
+    ) -> Normalized<'tcx, SubstsRef<'tcx>> {
+        match self.match_impl(impl_def_id, obligation, snapshot) {
+            Ok(substs) => substs,
+            Err(()) => {
+                bug!(
+                    "Impl {:?} was matchable against {:?} but now is not",
+                    impl_def_id,
+                    obligation
+                );
+            }
+        }
+    }
+
+    fn match_impl(
+        &mut self,
+        impl_def_id: DefId,
+        obligation: &TraitObligation<'tcx>,
+        snapshot: &CombinedSnapshot<'_, 'tcx>,
+    ) -> Result<Normalized<'tcx, SubstsRef<'tcx>>, ()> {
+        let impl_trait_ref = self.tcx().impl_trait_ref(impl_def_id).unwrap();
+
+        // Before we create the substitutions and everything, first
+        // consider a "quick reject". This avoids creating more types
+        // and so forth that we need to.
+        if self.fast_reject_trait_refs(obligation, &impl_trait_ref) {
+            return Err(());
+        }
+
+        let (skol_obligation, placeholder_map) =
+            self.infcx().replace_bound_vars_with_placeholders(&obligation.predicate);
+        let skol_obligation_trait_ref = skol_obligation.trait_ref;
+
+        let impl_substs = self.infcx.fresh_substs_for_item(obligation.cause.span, impl_def_id);
+
+        let impl_trait_ref = impl_trait_ref.subst(self.tcx(), impl_substs);
+
+        let Normalized { value: impl_trait_ref, obligations: mut nested_obligations } =
+            project::normalize_with_depth(
+                self,
+                obligation.param_env,
+                obligation.cause.clone(),
+                obligation.recursion_depth + 1,
+                &impl_trait_ref,
+            );
+
+        debug!(
+            "match_impl(impl_def_id={:?}, obligation={:?}, \
+             impl_trait_ref={:?}, skol_obligation_trait_ref={:?})",
+            impl_def_id, obligation, impl_trait_ref, skol_obligation_trait_ref
+        );
+
+        let InferOk { obligations, .. } = self
+            .infcx
+            .at(&obligation.cause, obligation.param_env)
+            .eq(skol_obligation_trait_ref, impl_trait_ref)
+            .map_err(|e| debug!("match_impl: failed eq_trait_refs due to `{}`", e))?;
+        nested_obligations.extend(obligations);
+
+        if let Err(e) = self.infcx.leak_check(false, &placeholder_map, snapshot) {
+            debug!("match_impl: failed leak check due to `{}`", e);
+            return Err(());
+        }
+
+        if !self.intercrate
+            && self.tcx().impl_polarity(impl_def_id) == ty::ImplPolarity::Reservation
+        {
+            debug!("match_impl: reservation impls only apply in intercrate mode");
+            return Err(());
+        }
+
+        debug!("match_impl: success impl_substs={:?}", impl_substs);
+        Ok(Normalized { value: impl_substs, obligations: nested_obligations })
+    }
+
+    fn fast_reject_trait_refs(
+        &mut self,
+        obligation: &TraitObligation<'_>,
+        impl_trait_ref: &ty::TraitRef<'_>,
+    ) -> bool {
+        // We can avoid creating type variables and doing the full
+        // substitution if we find that any of the input types, when
+        // simplified, do not match.
+
+        obligation.predicate.skip_binder().input_types().zip(impl_trait_ref.input_types()).any(
+            |(obligation_ty, impl_ty)| {
+                let simplified_obligation_ty =
+                    fast_reject::simplify_type(self.tcx(), obligation_ty, true);
+                let simplified_impl_ty = fast_reject::simplify_type(self.tcx(), impl_ty, false);
+
+                simplified_obligation_ty.is_some()
+                    && simplified_impl_ty.is_some()
+                    && simplified_obligation_ty != simplified_impl_ty
+            },
+        )
+    }
+
+    /// Normalize `where_clause_trait_ref` and try to match it against
+    /// `obligation`. If successful, return any predicates that
+    /// result from the normalization. Normalization is necessary
+    /// because where-clauses are stored in the parameter environment
+    /// unnormalized.
+    fn match_where_clause_trait_ref(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        where_clause_trait_ref: ty::PolyTraitRef<'tcx>,
+    ) -> Result<Vec<PredicateObligation<'tcx>>, ()> {
+        self.match_poly_trait_ref(obligation, where_clause_trait_ref)
+    }
+
+    /// Returns `Ok` if `poly_trait_ref` being true implies that the
+    /// obligation is satisfied.
+    fn match_poly_trait_ref(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        poly_trait_ref: ty::PolyTraitRef<'tcx>,
+    ) -> Result<Vec<PredicateObligation<'tcx>>, ()> {
+        debug!(
+            "match_poly_trait_ref: obligation={:?} poly_trait_ref={:?}",
+            obligation, poly_trait_ref
+        );
+
+        self.infcx
+            .at(&obligation.cause, obligation.param_env)
+            .sup(obligation.predicate.to_poly_trait_ref(), poly_trait_ref)
+            .map(|InferOk { obligations, .. }| obligations)
+            .map_err(|_| ())
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Miscellany
+
+    fn match_fresh_trait_refs(
+        &self,
+        previous: &ty::PolyTraitRef<'tcx>,
+        current: &ty::PolyTraitRef<'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
+    ) -> bool {
+        let mut matcher = ty::_match::Match::new(self.tcx(), param_env);
+        matcher.relate(previous, current).is_ok()
+    }
+
+    fn push_stack<'o>(
+        &mut self,
+        previous_stack: TraitObligationStackList<'o, 'tcx>,
+        obligation: &'o TraitObligation<'tcx>,
+    ) -> TraitObligationStack<'o, 'tcx> {
+        let fresh_trait_ref =
+            obligation.predicate.to_poly_trait_ref().fold_with(&mut self.freshener);
+
+        let dfn = previous_stack.cache.next_dfn();
+        let depth = previous_stack.depth() + 1;
+        TraitObligationStack {
+            obligation,
+            fresh_trait_ref,
+            reached_depth: Cell::new(depth),
+            previous: previous_stack,
+            dfn,
+            depth,
+        }
+    }
+
+    fn closure_trait_ref_unnormalized(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        closure_def_id: DefId,
+        substs: SubstsRef<'tcx>,
+    ) -> ty::PolyTraitRef<'tcx> {
+        debug!(
+            "closure_trait_ref_unnormalized(obligation={:?}, closure_def_id={:?}, substs={:?})",
+            obligation, closure_def_id, substs,
+        );
+        let closure_type = self.infcx.closure_sig(closure_def_id, substs);
+
+        debug!("closure_trait_ref_unnormalized: closure_type = {:?}", closure_type);
+
+        // (1) Feels icky to skip the binder here, but OTOH we know
+        // that the self-type is an unboxed closure type and hence is
+        // in fact unparameterized (or at least does not reference any
+        // regions bound in the obligation). Still probably some
+        // refactoring could make this nicer.
+        closure_trait_ref_and_return_type(
+            self.tcx(),
+            obligation.predicate.def_id(),
+            obligation.predicate.skip_binder().self_ty(), // (1)
+            closure_type,
+            util::TupleArgumentsFlag::No,
+        )
+        .map_bound(|(trait_ref, _)| trait_ref)
+    }
+
+    fn generator_trait_ref_unnormalized(
+        &mut self,
+        obligation: &TraitObligation<'tcx>,
+        closure_def_id: DefId,
+        substs: SubstsRef<'tcx>,
+    ) -> ty::PolyTraitRef<'tcx> {
+        let gen_sig = substs.as_generator().poly_sig(closure_def_id, self.tcx());
+
+        // (1) Feels icky to skip the binder here, but OTOH we know
+        // that the self-type is an generator type and hence is
+        // in fact unparameterized (or at least does not reference any
+        // regions bound in the obligation). Still probably some
+        // refactoring could make this nicer.
+
+        super::util::generator_trait_ref_and_outputs(
+            self.tcx(),
+            obligation.predicate.def_id(),
+            obligation.predicate.skip_binder().self_ty(), // (1)
+            gen_sig,
+        )
+        .map_bound(|(trait_ref, ..)| trait_ref)
+    }
+
+    /// Returns the obligations that are implied by instantiating an
+    /// impl or trait. The obligations are substituted and fully
+    /// normalized. This is used when confirming an impl or default
+    /// impl.
+    fn impl_or_trait_obligations(
+        &mut self,
+        cause: ObligationCause<'tcx>,
+        recursion_depth: usize,
+        param_env: ty::ParamEnv<'tcx>,
+        def_id: DefId,           // of impl or trait
+        substs: SubstsRef<'tcx>, // for impl or trait
+    ) -> Vec<PredicateObligation<'tcx>> {
+        debug!("impl_or_trait_obligations(def_id={:?})", def_id);
+        let tcx = self.tcx();
+
+        // To allow for one-pass evaluation of the nested obligation,
+        // each predicate must be preceded by the obligations required
+        // to normalize it.
+        // for example, if we have:
+        //    impl<U: Iterator<Item: Copy>, V: Iterator<Item = U>> Foo for V
+        // the impl will have the following predicates:
+        //    <V as Iterator>::Item = U,
+        //    U: Iterator, U: Sized,
+        //    V: Iterator, V: Sized,
+        //    <U as Iterator>::Item: Copy
+        // When we substitute, say, `V => IntoIter<u32>, U => $0`, the last
+        // obligation will normalize to `<$0 as Iterator>::Item = $1` and
+        // `$1: Copy`, so we must ensure the obligations are emitted in
+        // that order.
+        let predicates = tcx.predicates_of(def_id);
+        assert_eq!(predicates.parent, None);
+        let mut obligations = Vec::with_capacity(predicates.predicates.len());
+        for (predicate, _) in predicates.predicates {
+            let predicate = normalize_with_depth_to(
+                self,
+                param_env,
+                cause.clone(),
+                recursion_depth,
+                &predicate.subst(tcx, substs),
+                &mut obligations,
+            );
+            obligations.push(Obligation {
+                cause: cause.clone(),
+                recursion_depth,
+                param_env,
+                predicate,
+            });
+        }
+
+        // We are performing deduplication here to avoid exponential blowups
+        // (#38528) from happening, but the real cause of the duplication is
+        // unknown. What we know is that the deduplication avoids exponential
+        // amount of predicates being propagated when processing deeply nested
+        // types.
+        //
+        // This code is hot enough that it's worth avoiding the allocation
+        // required for the FxHashSet when possible. Special-casing lengths 0,
+        // 1 and 2 covers roughly 75-80% of the cases.
+        if obligations.len() <= 1 {
+            // No possibility of duplicates.
+        } else if obligations.len() == 2 {
+            // Only two elements. Drop the second if they are equal.
+            if obligations[0] == obligations[1] {
+                obligations.truncate(1);
+            }
+        } else {
+            // Three or more elements. Use a general deduplication process.
+            let mut seen = FxHashSet::default();
+            obligations.retain(|i| seen.insert(i.clone()));
+        }
+
+        obligations
+    }
+}
+
+impl<'tcx> TraitObligation<'tcx> {
+    #[allow(unused_comparisons)]
+    pub fn derived_cause(
+        &self,
+        variant: fn(DerivedObligationCause<'tcx>) -> ObligationCauseCode<'tcx>,
+    ) -> ObligationCause<'tcx> {
+        /*!
+         * Creates a cause for obligations that are derived from
+         * `obligation` by a recursive search (e.g., for a builtin
+         * bound, or eventually a `auto trait Foo`). If `obligation`
+         * is itself a derived obligation, this is just a clone, but
+         * otherwise we create a "derived obligation" cause so as to
+         * keep track of the original root obligation for error
+         * reporting.
+         */
+
+        let obligation = self;
+
+        // NOTE(flaper87): As of now, it keeps track of the whole error
+        // chain. Ideally, we should have a way to configure this either
+        // by using -Z verbose or just a CLI argument.
+        let derived_cause = DerivedObligationCause {
+            parent_trait_ref: obligation.predicate.to_poly_trait_ref(),
+            parent_code: Rc::new(obligation.cause.code.clone()),
+        };
+        let derived_code = variant(derived_cause);
+        ObligationCause::new(obligation.cause.span, obligation.cause.body_id, derived_code)
+    }
+}
+
+impl<'o, 'tcx> TraitObligationStack<'o, 'tcx> {
+    fn list(&'o self) -> TraitObligationStackList<'o, 'tcx> {
+        TraitObligationStackList::with(self)
+    }
+
+    fn cache(&self) -> &'o ProvisionalEvaluationCache<'tcx> {
+        self.previous.cache
+    }
+
+    fn iter(&'o self) -> TraitObligationStackList<'o, 'tcx> {
+        self.list()
+    }
+
+    /// Indicates that attempting to evaluate this stack entry
+    /// required accessing something from the stack at depth `reached_depth`.
+    fn update_reached_depth(&self, reached_depth: usize) {
+        assert!(
+            self.depth > reached_depth,
+            "invoked `update_reached_depth` with something under this stack: \
+             self.depth={} reached_depth={}",
+            self.depth,
+            reached_depth,
+        );
+        debug!("update_reached_depth(reached_depth={})", reached_depth);
+        let mut p = self;
+        while reached_depth < p.depth {
+            debug!("update_reached_depth: marking {:?} as cycle participant", p.fresh_trait_ref);
+            p.reached_depth.set(p.reached_depth.get().min(reached_depth));
+            p = p.previous.head.unwrap();
+        }
+    }
+}
+
+/// The "provisional evaluation cache" is used to store intermediate cache results
+/// when solving auto traits. Auto traits are unusual in that they can support
+/// cycles. So, for example, a "proof tree" like this would be ok:
+///
+/// - `Foo<T>: Send` :-
+///   - `Bar<T>: Send` :-
+///     - `Foo<T>: Send` -- cycle, but ok
+///   - `Baz<T>: Send`
+///
+/// Here, to prove `Foo<T>: Send`, we have to prove `Bar<T>: Send` and
+/// `Baz<T>: Send`. Proving `Bar<T>: Send` in turn required `Foo<T>: Send`.
+/// For non-auto traits, this cycle would be an error, but for auto traits (because
+/// they are coinductive) it is considered ok.
+///
+/// However, there is a complication: at the point where we have
+/// "proven" `Bar<T>: Send`, we have in fact only proven it
+/// *provisionally*. In particular, we proved that `Bar<T>: Send`
+/// *under the assumption* that `Foo<T>: Send`. But what if we later
+/// find out this assumption is wrong?  Specifically, we could
+/// encounter some kind of error proving `Baz<T>: Send`. In that case,
+/// `Bar<T>: Send` didn't turn out to be true.
+///
+/// In Issue #60010, we found a bug in rustc where it would cache
+/// these intermediate results. This was fixed in #60444 by disabling
+/// *all* caching for things involved in a cycle -- in our example,
+/// that would mean we don't cache that `Bar<T>: Send`.  But this led
+/// to large slowdowns.
+///
+/// Specifically, imagine this scenario, where proving `Baz<T>: Send`
+/// first requires proving `Bar<T>: Send` (which is true:
+///
+/// - `Foo<T>: Send` :-
+///   - `Bar<T>: Send` :-
+///     - `Foo<T>: Send` -- cycle, but ok
+///   - `Baz<T>: Send`
+///     - `Bar<T>: Send` -- would be nice for this to be a cache hit!
+///     - `*const T: Send` -- but what if we later encounter an error?
+///
+/// The *provisional evaluation cache* resolves this issue. It stores
+/// cache results that we've proven but which were involved in a cycle
+/// in some way. We track the minimal stack depth (i.e., the
+/// farthest from the top of the stack) that we are dependent on.
+/// The idea is that the cache results within are all valid -- so long as
+/// none of the nodes in between the current node and the node at that minimum
+/// depth result in an error (in which case the cached results are just thrown away).
+///
+/// During evaluation, we consult this provisional cache and rely on
+/// it. Accessing a cached value is considered equivalent to accessing
+/// a result at `reached_depth`, so it marks the *current* solution as
+/// provisional as well. If an error is encountered, we toss out any
+/// provisional results added from the subtree that encountered the
+/// error.  When we pop the node at `reached_depth` from the stack, we
+/// can commit all the things that remain in the provisional cache.
+struct ProvisionalEvaluationCache<'tcx> {
+    /// next "depth first number" to issue -- just a counter
+    dfn: Cell<usize>,
+
+    /// Stores the "coldest" depth (bottom of stack) reached by any of
+    /// the evaluation entries. The idea here is that all things in the provisional
+    /// cache are always dependent on *something* that is colder in the stack:
+    /// therefore, if we add a new entry that is dependent on something *colder still*,
+    /// we have to modify the depth for all entries at once.
+    ///
+    /// Example:
+    ///
+    /// Imagine we have a stack `A B C D E` (with `E` being the top of
+    /// the stack).  We cache something with depth 2, which means that
+    /// it was dependent on C.  Then we pop E but go on and process a
+    /// new node F: A B C D F.  Now F adds something to the cache with
+    /// depth 1, meaning it is dependent on B.  Our original cache
+    /// entry is also dependent on B, because there is a path from E
+    /// to C and then from C to F and from F to B.
+    reached_depth: Cell<usize>,
+
+    /// Map from cache key to the provisionally evaluated thing.
+    /// The cache entries contain the result but also the DFN in which they
+    /// were added. The DFN is used to clear out values on failure.
+    ///
+    /// Imagine we have a stack like:
+    ///
+    /// - `A B C` and we add a cache for the result of C (DFN 2)
+    /// - Then we have a stack `A B D` where `D` has DFN 3
+    /// - We try to solve D by evaluating E: `A B D E` (DFN 4)
+    /// - `E` generates various cache entries which have cyclic dependices on `B`
+    ///   - `A B D E F` and so forth
+    ///   - the DFN of `F` for example would be 5
+    /// - then we determine that `E` is in error -- we will then clear
+    ///   all cache values whose DFN is >= 4 -- in this case, that
+    ///   means the cached value for `F`.
+    map: RefCell<FxHashMap<ty::PolyTraitRef<'tcx>, ProvisionalEvaluation>>,
+}
+
+/// A cache value for the provisional cache: contains the depth-first
+/// number (DFN) and result.
+#[derive(Copy, Clone, Debug)]
+struct ProvisionalEvaluation {
+    from_dfn: usize,
+    result: EvaluationResult,
+}
+
+impl<'tcx> Default for ProvisionalEvaluationCache<'tcx> {
+    fn default() -> Self {
+        Self {
+            dfn: Cell::new(0),
+            reached_depth: Cell::new(std::usize::MAX),
+            map: Default::default(),
+        }
+    }
+}
+
+impl<'tcx> ProvisionalEvaluationCache<'tcx> {
+    /// Get the next DFN in sequence (basically a counter).
+    fn next_dfn(&self) -> usize {
+        let result = self.dfn.get();
+        self.dfn.set(result + 1);
+        result
+    }
+
+    /// Check the provisional cache for any result for
+    /// `fresh_trait_ref`. If there is a hit, then you must consider
+    /// it an access to the stack slots at depth
+    /// `self.current_reached_depth()` and above.
+    fn get_provisional(&self, fresh_trait_ref: ty::PolyTraitRef<'tcx>) -> Option<EvaluationResult> {
+        debug!(
+            "get_provisional(fresh_trait_ref={:?}) = {:#?} with reached-depth {}",
+            fresh_trait_ref,
+            self.map.borrow().get(&fresh_trait_ref),
+            self.reached_depth.get(),
+        );
+        Some(self.map.borrow().get(&fresh_trait_ref)?.result)
+    }
+
+    /// Current value of the `reached_depth` counter -- all the
+    /// provisional cache entries are dependent on the item at this
+    /// depth.
+    fn current_reached_depth(&self) -> usize {
+        self.reached_depth.get()
+    }
+
+    /// Insert a provisional result into the cache. The result came
+    /// from the node with the given DFN. It accessed a minimum depth
+    /// of `reached_depth` to compute. It evaluated `fresh_trait_ref`
+    /// and resulted in `result`.
+    fn insert_provisional(
+        &self,
+        from_dfn: usize,
+        reached_depth: usize,
+        fresh_trait_ref: ty::PolyTraitRef<'tcx>,
+        result: EvaluationResult,
+    ) {
+        debug!(
+            "insert_provisional(from_dfn={}, reached_depth={}, fresh_trait_ref={:?}, result={:?})",
+            from_dfn, reached_depth, fresh_trait_ref, result,
+        );
+        let r_d = self.reached_depth.get();
+        self.reached_depth.set(r_d.min(reached_depth));
+
+        debug!("insert_provisional: reached_depth={:?}", self.reached_depth.get());
+
+        self.map.borrow_mut().insert(fresh_trait_ref, ProvisionalEvaluation { from_dfn, result });
+    }
+
+    /// Invoked when the node with dfn `dfn` does not get a successful
+    /// result.  This will clear out any provisional cache entries
+    /// that were added since `dfn` was created. This is because the
+    /// provisional entries are things which must assume that the
+    /// things on the stack at the time of their creation succeeded --
+    /// since the failing node is presently at the top of the stack,
+    /// these provisional entries must either depend on it or some
+    /// ancestor of it.
+    fn on_failure(&self, dfn: usize) {
+        debug!("on_failure(dfn={:?})", dfn,);
+        self.map.borrow_mut().retain(|key, eval| {
+            if !eval.from_dfn >= dfn {
+                debug!("on_failure: removing {:?}", key);
+                false
+            } else {
+                true
+            }
+        });
+    }
+
+    /// Invoked when the node at depth `depth` completed without
+    /// depending on anything higher in the stack (if that completion
+    /// was a failure, then `on_failure` should have been invoked
+    /// already). The callback `op` will be invoked for each
+    /// provisional entry that we can now confirm.
+    fn on_completion(
+        &self,
+        depth: usize,
+        mut op: impl FnMut(ty::PolyTraitRef<'tcx>, EvaluationResult),
+    ) {
+        debug!("on_completion(depth={}, reached_depth={})", depth, self.reached_depth.get(),);
+
+        if self.reached_depth.get() < depth {
+            debug!("on_completion: did not yet reach depth to complete");
+            return;
+        }
+
+        for (fresh_trait_ref, eval) in self.map.borrow_mut().drain() {
+            debug!("on_completion: fresh_trait_ref={:?} eval={:?}", fresh_trait_ref, eval,);
+
+            op(fresh_trait_ref, eval.result);
+        }
+
+        self.reached_depth.set(std::usize::MAX);
+    }
+}
+
+#[derive(Copy, Clone)]
+struct TraitObligationStackList<'o, 'tcx> {
+    cache: &'o ProvisionalEvaluationCache<'tcx>,
+    head: Option<&'o TraitObligationStack<'o, 'tcx>>,
+}
+
+impl<'o, 'tcx> TraitObligationStackList<'o, 'tcx> {
+    fn empty(cache: &'o ProvisionalEvaluationCache<'tcx>) -> TraitObligationStackList<'o, 'tcx> {
+        TraitObligationStackList { cache, head: None }
+    }
+
+    fn with(r: &'o TraitObligationStack<'o, 'tcx>) -> TraitObligationStackList<'o, 'tcx> {
+        TraitObligationStackList { cache: r.cache(), head: Some(r) }
+    }
+
+    fn head(&self) -> Option<&'o TraitObligationStack<'o, 'tcx>> {
+        self.head
+    }
+
+    fn depth(&self) -> usize {
+        if let Some(head) = self.head { head.depth } else { 0 }
+    }
+}
+
+impl<'o, 'tcx> Iterator for TraitObligationStackList<'o, 'tcx> {
+    type Item = &'o TraitObligationStack<'o, 'tcx>;
+
+    fn next(&mut self) -> Option<&'o TraitObligationStack<'o, 'tcx>> {
+        match self.head {
+            Some(o) => {
+                *self = o.previous;
+                Some(o)
+            }
+            None => None,
+        }
+    }
+}
+
+impl<'o, 'tcx> fmt::Debug for TraitObligationStack<'o, 'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "TraitObligationStack({:?})", self.obligation)
+    }
+}
diff --git a/src/librustc_infer/traits/specialize/mod.rs b/src/librustc_infer/traits/specialize/mod.rs
new file mode 100644
index 0000000000..ee1c737c20
--- /dev/null
+++ b/src/librustc_infer/traits/specialize/mod.rs
@@ -0,0 +1,472 @@
+//! Logic and data structures related to impl specialization, explained in
+//! greater detail below.
+//!
+//! At the moment, this implementation support only the simple "chain" rule:
+//! If any two impls overlap, one must be a strict subset of the other.
+//!
+//! See the [rustc guide] for a bit more detail on how specialization
+//! fits together with the rest of the trait machinery.
+//!
+//! [rustc guide]: https://rust-lang.github.io/rustc-guide/traits/specialization.html
+
+pub mod specialization_graph;
+use specialization_graph::GraphExt;
+
+use crate::infer::{InferCtxt, InferOk, TyCtxtInferExt};
+use crate::traits::select::IntercrateAmbiguityCause;
+use crate::traits::{self, coherence, FutureCompatOverlapErrorKind, ObligationCause, TraitEngine};
+use rustc::lint::LintDiagnosticBuilder;
+use rustc::ty::subst::{InternalSubsts, Subst, SubstsRef};
+use rustc::ty::{self, TyCtxt, TypeFoldable};
+use rustc_data_structures::fx::FxHashSet;
+use rustc_errors::struct_span_err;
+use rustc_hir::def_id::DefId;
+use rustc_session::lint::builtin::COHERENCE_LEAK_CHECK;
+use rustc_session::lint::builtin::ORDER_DEPENDENT_TRAIT_OBJECTS;
+use rustc_span::DUMMY_SP;
+
+use super::util::impl_trait_ref_and_oblig;
+use super::{FulfillmentContext, SelectionContext};
+
+/// Information pertinent to an overlapping impl error.
+#[derive(Debug)]
+pub struct OverlapError {
+    pub with_impl: DefId,
+    pub trait_desc: String,
+    pub self_desc: Option<String>,
+    pub intercrate_ambiguity_causes: Vec<IntercrateAmbiguityCause>,
+    pub involves_placeholder: bool,
+}
+
+/// Given a subst for the requested impl, translate it to a subst
+/// appropriate for the actual item definition (whether it be in that impl,
+/// a parent impl, or the trait).
+///
+/// When we have selected one impl, but are actually using item definitions from
+/// a parent impl providing a default, we need a way to translate between the
+/// type parameters of the two impls. Here the `source_impl` is the one we've
+/// selected, and `source_substs` is a substitution of its generics.
+/// And `target_node` is the impl/trait we're actually going to get the
+/// definition from. The resulting substitution will map from `target_node`'s
+/// generics to `source_impl`'s generics as instantiated by `source_subst`.
+///
+/// For example, consider the following scenario:
+///
+/// ```rust
+/// trait Foo { ... }
+/// impl<T, U> Foo for (T, U) { ... }  // target impl
+/// impl<V> Foo for (V, V) { ... }     // source impl
+/// ```
+///
+/// Suppose we have selected "source impl" with `V` instantiated with `u32`.
+/// This function will produce a substitution with `T` and `U` both mapping to `u32`.
+///
+/// where-clauses add some trickiness here, because they can be used to "define"
+/// an argument indirectly:
+///
+/// ```rust
+/// impl<'a, I, T: 'a> Iterator for Cloned<I>
+///    where I: Iterator<Item = &'a T>, T: Clone
+/// ```
+///
+/// In a case like this, the substitution for `T` is determined indirectly,
+/// through associated type projection. We deal with such cases by using
+/// *fulfillment* to relate the two impls, requiring that all projections are
+/// resolved.
+pub fn translate_substs<'a, 'tcx>(
+    infcx: &InferCtxt<'a, 'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    source_impl: DefId,
+    source_substs: SubstsRef<'tcx>,
+    target_node: specialization_graph::Node,
+) -> SubstsRef<'tcx> {
+    debug!(
+        "translate_substs({:?}, {:?}, {:?}, {:?})",
+        param_env, source_impl, source_substs, target_node
+    );
+    let source_trait_ref =
+        infcx.tcx.impl_trait_ref(source_impl).unwrap().subst(infcx.tcx, &source_substs);
+
+    // translate the Self and Param parts of the substitution, since those
+    // vary across impls
+    let target_substs = match target_node {
+        specialization_graph::Node::Impl(target_impl) => {
+            // no need to translate if we're targeting the impl we started with
+            if source_impl == target_impl {
+                return source_substs;
+            }
+
+            fulfill_implication(infcx, param_env, source_trait_ref, target_impl).unwrap_or_else(
+                |_| {
+                    bug!(
+                        "When translating substitutions for specialization, the expected \
+                         specialization failed to hold"
+                    )
+                },
+            )
+        }
+        specialization_graph::Node::Trait(..) => source_trait_ref.substs,
+    };
+
+    // directly inherent the method generics, since those do not vary across impls
+    source_substs.rebase_onto(infcx.tcx, source_impl, target_substs)
+}
+
+/// Given a selected impl described by `impl_data`, returns the
+/// definition and substitutions for the method with the name `name`
+/// the kind `kind`, and trait method substitutions `substs`, in
+/// that impl, a less specialized impl, or the trait default,
+/// whichever applies.
+pub fn find_associated_item<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    item: &ty::AssocItem,
+    substs: SubstsRef<'tcx>,
+    impl_data: &super::VtableImplData<'tcx, ()>,
+) -> (DefId, SubstsRef<'tcx>) {
+    debug!("find_associated_item({:?}, {:?}, {:?}, {:?})", param_env, item, substs, impl_data);
+    assert!(!substs.needs_infer());
+
+    let trait_def_id = tcx.trait_id_of_impl(impl_data.impl_def_id).unwrap();
+    let trait_def = tcx.trait_def(trait_def_id);
+
+    let ancestors = trait_def.ancestors(tcx, impl_data.impl_def_id);
+    match ancestors.leaf_def(tcx, item.ident, item.kind) {
+        Some(node_item) => {
+            let substs = tcx.infer_ctxt().enter(|infcx| {
+                let param_env = param_env.with_reveal_all();
+                let substs = substs.rebase_onto(tcx, trait_def_id, impl_data.substs);
+                let substs = translate_substs(
+                    &infcx,
+                    param_env,
+                    impl_data.impl_def_id,
+                    substs,
+                    node_item.node,
+                );
+                infcx.tcx.erase_regions(&substs)
+            });
+            (node_item.item.def_id, substs)
+        }
+        None => bug!("{:?} not found in {:?}", item, impl_data.impl_def_id),
+    }
+}
+
+/// Is `impl1` a specialization of `impl2`?
+///
+/// Specialization is determined by the sets of types to which the impls apply;
+/// `impl1` specializes `impl2` if it applies to a subset of the types `impl2` applies
+/// to.
+pub(super) fn specializes(tcx: TyCtxt<'_>, (impl1_def_id, impl2_def_id): (DefId, DefId)) -> bool {
+    debug!("specializes({:?}, {:?})", impl1_def_id, impl2_def_id);
+
+    // The feature gate should prevent introducing new specializations, but not
+    // taking advantage of upstream ones.
+    if !tcx.features().specialization && (impl1_def_id.is_local() || impl2_def_id.is_local()) {
+        return false;
+    }
+
+    // We determine whether there's a subset relationship by:
+    //
+    // - skolemizing impl1,
+    // - assuming the where clauses for impl1,
+    // - instantiating impl2 with fresh inference variables,
+    // - unifying,
+    // - attempting to prove the where clauses for impl2
+    //
+    // The last three steps are encapsulated in `fulfill_implication`.
+    //
+    // See RFC 1210 for more details and justification.
+
+    // Currently we do not allow e.g., a negative impl to specialize a positive one
+    if tcx.impl_polarity(impl1_def_id) != tcx.impl_polarity(impl2_def_id) {
+        return false;
+    }
+
+    // create a parameter environment corresponding to a (placeholder) instantiation of impl1
+    let penv = tcx.param_env(impl1_def_id);
+    let impl1_trait_ref = tcx.impl_trait_ref(impl1_def_id).unwrap();
+
+    // Create a infcx, taking the predicates of impl1 as assumptions:
+    tcx.infer_ctxt().enter(|infcx| {
+        // Normalize the trait reference. The WF rules ought to ensure
+        // that this always succeeds.
+        let impl1_trait_ref = match traits::fully_normalize(
+            &infcx,
+            FulfillmentContext::new(),
+            ObligationCause::dummy(),
+            penv,
+            &impl1_trait_ref,
+        ) {
+            Ok(impl1_trait_ref) => impl1_trait_ref,
+            Err(err) => {
+                bug!("failed to fully normalize {:?}: {:?}", impl1_trait_ref, err);
+            }
+        };
+
+        // Attempt to prove that impl2 applies, given all of the above.
+        fulfill_implication(&infcx, penv, impl1_trait_ref, impl2_def_id).is_ok()
+    })
+}
+
+/// Attempt to fulfill all obligations of `target_impl` after unification with
+/// `source_trait_ref`. If successful, returns a substitution for *all* the
+/// generics of `target_impl`, including both those needed to unify with
+/// `source_trait_ref` and those whose identity is determined via a where
+/// clause in the impl.
+fn fulfill_implication<'a, 'tcx>(
+    infcx: &InferCtxt<'a, 'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    source_trait_ref: ty::TraitRef<'tcx>,
+    target_impl: DefId,
+) -> Result<SubstsRef<'tcx>, ()> {
+    debug!(
+        "fulfill_implication({:?}, trait_ref={:?} |- {:?} applies)",
+        param_env, source_trait_ref, target_impl
+    );
+
+    let selcx = &mut SelectionContext::new(&infcx);
+    let target_substs = infcx.fresh_substs_for_item(DUMMY_SP, target_impl);
+    let (target_trait_ref, mut obligations) =
+        impl_trait_ref_and_oblig(selcx, param_env, target_impl, target_substs);
+    debug!(
+        "fulfill_implication: target_trait_ref={:?}, obligations={:?}",
+        target_trait_ref, obligations
+    );
+
+    // do the impls unify? If not, no specialization.
+    match infcx.at(&ObligationCause::dummy(), param_env).eq(source_trait_ref, target_trait_ref) {
+        Ok(InferOk { obligations: o, .. }) => {
+            obligations.extend(o);
+        }
+        Err(_) => {
+            debug!(
+                "fulfill_implication: {:?} does not unify with {:?}",
+                source_trait_ref, target_trait_ref
+            );
+            return Err(());
+        }
+    }
+
+    // attempt to prove all of the predicates for impl2 given those for impl1
+    // (which are packed up in penv)
+
+    infcx.save_and_restore_in_snapshot_flag(|infcx| {
+        // If we came from `translate_substs`, we already know that the
+        // predicates for our impl hold (after all, we know that a more
+        // specialized impl holds, so our impl must hold too), and
+        // we only want to process the projections to determine the
+        // the types in our substs using RFC 447, so we can safely
+        // ignore region obligations, which allows us to avoid threading
+        // a node-id to assign them with.
+        //
+        // If we came from specialization graph construction, then
+        // we already make a mockery out of the region system, so
+        // why not ignore them a bit earlier?
+        let mut fulfill_cx = FulfillmentContext::new_ignoring_regions();
+        for oblig in obligations.into_iter() {
+            fulfill_cx.register_predicate_obligation(&infcx, oblig);
+        }
+        match fulfill_cx.select_all_or_error(infcx) {
+            Err(errors) => {
+                // no dice!
+                debug!(
+                    "fulfill_implication: for impls on {:?} and {:?}, \
+                     could not fulfill: {:?} given {:?}",
+                    source_trait_ref, target_trait_ref, errors, param_env.caller_bounds
+                );
+                Err(())
+            }
+
+            Ok(()) => {
+                debug!(
+                    "fulfill_implication: an impl for {:?} specializes {:?}",
+                    source_trait_ref, target_trait_ref
+                );
+
+                // Now resolve the *substitution* we built for the target earlier, replacing
+                // the inference variables inside with whatever we got from fulfillment.
+                Ok(infcx.resolve_vars_if_possible(&target_substs))
+            }
+        }
+    })
+}
+
+// Query provider for `specialization_graph_of`.
+pub(super) fn specialization_graph_provider(
+    tcx: TyCtxt<'_>,
+    trait_id: DefId,
+) -> &specialization_graph::Graph {
+    let mut sg = specialization_graph::Graph::new();
+
+    let mut trait_impls = tcx.all_impls(trait_id);
+
+    // The coherence checking implementation seems to rely on impls being
+    // iterated over (roughly) in definition order, so we are sorting by
+    // negated `CrateNum` (so remote definitions are visited first) and then
+    // by a flattened version of the `DefIndex`.
+    trait_impls
+        .sort_unstable_by_key(|def_id| (-(def_id.krate.as_u32() as i64), def_id.index.index()));
+
+    for impl_def_id in trait_impls {
+        if impl_def_id.is_local() {
+            // This is where impl overlap checking happens:
+            let insert_result = sg.insert(tcx, impl_def_id);
+            // Report error if there was one.
+            let (overlap, used_to_be_allowed) = match insert_result {
+                Err(overlap) => (Some(overlap), None),
+                Ok(Some(overlap)) => (Some(overlap.error), Some(overlap.kind)),
+                Ok(None) => (None, None),
+            };
+
+            if let Some(overlap) = overlap {
+                let impl_span =
+                    tcx.sess.source_map().def_span(tcx.span_of_impl(impl_def_id).unwrap());
+
+                // Work to be done after we've built the DiagnosticBuilder. We have to define it
+                // now because the struct_lint methods don't return back the DiagnosticBuilder
+                // that's passed in.
+                let decorate = |err: LintDiagnosticBuilder<'_>| {
+                    let msg = format!(
+                        "conflicting implementations of trait `{}`{}:{}",
+                        overlap.trait_desc,
+                        overlap
+                            .self_desc
+                            .clone()
+                            .map_or(String::new(), |ty| { format!(" for type `{}`", ty) }),
+                        match used_to_be_allowed {
+                            Some(FutureCompatOverlapErrorKind::Issue33140) => " (E0119)",
+                            _ => "",
+                        }
+                    );
+                    let mut err = err.build(&msg);
+                    match tcx.span_of_impl(overlap.with_impl) {
+                        Ok(span) => {
+                            err.span_label(
+                                tcx.sess.source_map().def_span(span),
+                                "first implementation here".to_string(),
+                            );
+
+                            err.span_label(
+                                impl_span,
+                                format!(
+                                    "conflicting implementation{}",
+                                    overlap
+                                        .self_desc
+                                        .map_or(String::new(), |ty| format!(" for `{}`", ty))
+                                ),
+                            );
+                        }
+                        Err(cname) => {
+                            let msg = match to_pretty_impl_header(tcx, overlap.with_impl) {
+                                Some(s) => format!(
+                                    "conflicting implementation in crate `{}`:\n- {}",
+                                    cname, s
+                                ),
+                                None => format!("conflicting implementation in crate `{}`", cname),
+                            };
+                            err.note(&msg);
+                        }
+                    }
+
+                    for cause in &overlap.intercrate_ambiguity_causes {
+                        cause.add_intercrate_ambiguity_hint(&mut err);
+                    }
+
+                    if overlap.involves_placeholder {
+                        coherence::add_placeholder_note(&mut err);
+                    }
+                    err.emit()
+                };
+
+                match used_to_be_allowed {
+                    None => {
+                        let err = struct_span_err!(tcx.sess, impl_span, E0119, "");
+                        decorate(LintDiagnosticBuilder::new(err));
+                    }
+                    Some(kind) => {
+                        let lint = match kind {
+                            FutureCompatOverlapErrorKind::Issue33140 => {
+                                ORDER_DEPENDENT_TRAIT_OBJECTS
+                            }
+                            FutureCompatOverlapErrorKind::LeakCheck => COHERENCE_LEAK_CHECK,
+                        };
+                        tcx.struct_span_lint_hir(
+                            lint,
+                            tcx.hir().as_local_hir_id(impl_def_id).unwrap(),
+                            impl_span,
+                            decorate,
+                        )
+                    }
+                };
+            }
+        } else {
+            let parent = tcx.impl_parent(impl_def_id).unwrap_or(trait_id);
+            sg.record_impl_from_cstore(tcx, parent, impl_def_id)
+        }
+    }
+
+    tcx.arena.alloc(sg)
+}
+
+/// Recovers the "impl X for Y" signature from `impl_def_id` and returns it as a
+/// string.
+fn to_pretty_impl_header(tcx: TyCtxt<'_>, impl_def_id: DefId) -> Option<String> {
+    use std::fmt::Write;
+
+    let trait_ref = if let Some(tr) = tcx.impl_trait_ref(impl_def_id) {
+        tr
+    } else {
+        return None;
+    };
+
+    let mut w = "impl".to_owned();
+
+    let substs = InternalSubsts::identity_for_item(tcx, impl_def_id);
+
+    // FIXME: Currently only handles ?Sized.
+    //        Needs to support ?Move and ?DynSized when they are implemented.
+    let mut types_without_default_bounds = FxHashSet::default();
+    let sized_trait = tcx.lang_items().sized_trait();
+
+    if !substs.is_noop() {
+        types_without_default_bounds.extend(substs.types());
+        w.push('<');
+        w.push_str(
+            &substs
+                .iter()
+                .map(|k| k.to_string())
+                .filter(|k| k != "'_")
+                .collect::<Vec<_>>()
+                .join(", "),
+        );
+        w.push('>');
+    }
+
+    write!(w, " {} for {}", trait_ref.print_only_trait_path(), tcx.type_of(impl_def_id)).unwrap();
+
+    // The predicates will contain default bounds like `T: Sized`. We need to
+    // remove these bounds, and add `T: ?Sized` to any untouched type parameters.
+    let predicates = tcx.predicates_of(impl_def_id).predicates;
+    let mut pretty_predicates =
+        Vec::with_capacity(predicates.len() + types_without_default_bounds.len());
+
+    for (p, _) in predicates {
+        if let Some(poly_trait_ref) = p.to_opt_poly_trait_ref() {
+            if Some(poly_trait_ref.def_id()) == sized_trait {
+                types_without_default_bounds.remove(poly_trait_ref.self_ty());
+                continue;
+            }
+        }
+        pretty_predicates.push(p.to_string());
+    }
+
+    pretty_predicates
+        .extend(types_without_default_bounds.iter().map(|ty| format!("{}: ?Sized", ty)));
+
+    if !pretty_predicates.is_empty() {
+        write!(w, "\n  where {}", pretty_predicates.join(", ")).unwrap();
+    }
+
+    w.push(';');
+    Some(w)
+}
diff --git a/src/librustc_infer/traits/specialize/specialization_graph.rs b/src/librustc_infer/traits/specialize/specialization_graph.rs
new file mode 100644
index 0000000000..17d4a22b9d
--- /dev/null
+++ b/src/librustc_infer/traits/specialize/specialization_graph.rs
@@ -0,0 +1,379 @@
+use super::OverlapError;
+
+use crate::traits;
+use rustc::ty::fast_reject::{self, SimplifiedType};
+use rustc::ty::{self, TyCtxt, TypeFoldable};
+use rustc_hir::def_id::DefId;
+
+pub use rustc::traits::specialization_graph::*;
+
+#[derive(Copy, Clone, Debug)]
+pub enum FutureCompatOverlapErrorKind {
+    Issue33140,
+    LeakCheck,
+}
+
+#[derive(Debug)]
+pub struct FutureCompatOverlapError {
+    pub error: OverlapError,
+    pub kind: FutureCompatOverlapErrorKind,
+}
+
+/// The result of attempting to insert an impl into a group of children.
+enum Inserted {
+    /// The impl was inserted as a new child in this group of children.
+    BecameNewSibling(Option<FutureCompatOverlapError>),
+
+    /// The impl should replace existing impls [X1, ..], because the impl specializes X1, X2, etc.
+    ReplaceChildren(Vec<DefId>),
+
+    /// The impl is a specialization of an existing child.
+    ShouldRecurseOn(DefId),
+}
+
+trait ChildrenExt {
+    fn insert_blindly(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId);
+    fn remove_existing(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId);
+
+    fn insert(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        impl_def_id: DefId,
+        simplified_self: Option<SimplifiedType>,
+    ) -> Result<Inserted, OverlapError>;
+}
+
+impl ChildrenExt for Children {
+    /// Insert an impl into this set of children without comparing to any existing impls.
+    fn insert_blindly(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId) {
+        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
+        if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) {
+            debug!("insert_blindly: impl_def_id={:?} st={:?}", impl_def_id, st);
+            self.nonblanket_impls.entry(st).or_default().push(impl_def_id)
+        } else {
+            debug!("insert_blindly: impl_def_id={:?} st=None", impl_def_id);
+            self.blanket_impls.push(impl_def_id)
+        }
+    }
+
+    /// Removes an impl from this set of children. Used when replacing
+    /// an impl with a parent. The impl must be present in the list of
+    /// children already.
+    fn remove_existing(&mut self, tcx: TyCtxt<'tcx>, impl_def_id: DefId) {
+        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
+        let vec: &mut Vec<DefId>;
+        if let Some(st) = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false) {
+            debug!("remove_existing: impl_def_id={:?} st={:?}", impl_def_id, st);
+            vec = self.nonblanket_impls.get_mut(&st).unwrap();
+        } else {
+            debug!("remove_existing: impl_def_id={:?} st=None", impl_def_id);
+            vec = &mut self.blanket_impls;
+        }
+
+        let index = vec.iter().position(|d| *d == impl_def_id).unwrap();
+        vec.remove(index);
+    }
+
+    /// Attempt to insert an impl into this set of children, while comparing for
+    /// specialization relationships.
+    fn insert(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        impl_def_id: DefId,
+        simplified_self: Option<SimplifiedType>,
+    ) -> Result<Inserted, OverlapError> {
+        let mut last_lint = None;
+        let mut replace_children = Vec::new();
+
+        debug!("insert(impl_def_id={:?}, simplified_self={:?})", impl_def_id, simplified_self,);
+
+        let possible_siblings = match simplified_self {
+            Some(st) => PotentialSiblings::Filtered(filtered_children(self, st)),
+            None => PotentialSiblings::Unfiltered(iter_children(self)),
+        };
+
+        for possible_sibling in possible_siblings {
+            debug!(
+                "insert: impl_def_id={:?}, simplified_self={:?}, possible_sibling={:?}",
+                impl_def_id, simplified_self, possible_sibling,
+            );
+
+            let create_overlap_error = |overlap: traits::coherence::OverlapResult<'_>| {
+                let trait_ref = overlap.impl_header.trait_ref.unwrap();
+                let self_ty = trait_ref.self_ty();
+
+                OverlapError {
+                    with_impl: possible_sibling,
+                    trait_desc: trait_ref.print_only_trait_path().to_string(),
+                    // Only report the `Self` type if it has at least
+                    // some outer concrete shell; otherwise, it's
+                    // not adding much information.
+                    self_desc: if self_ty.has_concrete_skeleton() {
+                        Some(self_ty.to_string())
+                    } else {
+                        None
+                    },
+                    intercrate_ambiguity_causes: overlap.intercrate_ambiguity_causes,
+                    involves_placeholder: overlap.involves_placeholder,
+                }
+            };
+
+            let report_overlap_error = |overlap: traits::coherence::OverlapResult<'_>,
+                                        last_lint: &mut _| {
+                // Found overlap, but no specialization; error out or report future-compat warning.
+
+                // Do we *still* get overlap if we disable the future-incompatible modes?
+                let should_err = traits::overlapping_impls(
+                    tcx,
+                    possible_sibling,
+                    impl_def_id,
+                    traits::SkipLeakCheck::default(),
+                    |_| true,
+                    || false,
+                );
+
+                let error = create_overlap_error(overlap);
+
+                if should_err {
+                    Err(error)
+                } else {
+                    *last_lint = Some(FutureCompatOverlapError {
+                        error,
+                        kind: FutureCompatOverlapErrorKind::LeakCheck,
+                    });
+
+                    Ok((false, false))
+                }
+            };
+
+            let last_lint_mut = &mut last_lint;
+            let (le, ge) = traits::overlapping_impls(
+                tcx,
+                possible_sibling,
+                impl_def_id,
+                traits::SkipLeakCheck::Yes,
+                |overlap| {
+                    if let Some(overlap_kind) =
+                        tcx.impls_are_allowed_to_overlap(impl_def_id, possible_sibling)
+                    {
+                        match overlap_kind {
+                            ty::ImplOverlapKind::Permitted { marker: _ } => {}
+                            ty::ImplOverlapKind::Issue33140 => {
+                                *last_lint_mut = Some(FutureCompatOverlapError {
+                                    error: create_overlap_error(overlap),
+                                    kind: FutureCompatOverlapErrorKind::Issue33140,
+                                });
+                            }
+                        }
+
+                        return Ok((false, false));
+                    }
+
+                    let le = tcx.specializes((impl_def_id, possible_sibling));
+                    let ge = tcx.specializes((possible_sibling, impl_def_id));
+
+                    if le == ge {
+                        report_overlap_error(overlap, last_lint_mut)
+                    } else {
+                        Ok((le, ge))
+                    }
+                },
+                || Ok((false, false)),
+            )?;
+
+            if le && !ge {
+                debug!(
+                    "descending as child of TraitRef {:?}",
+                    tcx.impl_trait_ref(possible_sibling).unwrap()
+                );
+
+                // The impl specializes `possible_sibling`.
+                return Ok(Inserted::ShouldRecurseOn(possible_sibling));
+            } else if ge && !le {
+                debug!(
+                    "placing as parent of TraitRef {:?}",
+                    tcx.impl_trait_ref(possible_sibling).unwrap()
+                );
+
+                replace_children.push(possible_sibling);
+            } else {
+                // Either there's no overlap, or the overlap was already reported by
+                // `overlap_error`.
+            }
+        }
+
+        if !replace_children.is_empty() {
+            return Ok(Inserted::ReplaceChildren(replace_children));
+        }
+
+        // No overlap with any potential siblings, so add as a new sibling.
+        debug!("placing as new sibling");
+        self.insert_blindly(tcx, impl_def_id);
+        Ok(Inserted::BecameNewSibling(last_lint))
+    }
+}
+
+fn iter_children(children: &mut Children) -> impl Iterator<Item = DefId> + '_ {
+    let nonblanket = children.nonblanket_impls.iter_mut().flat_map(|(_, v)| v.iter());
+    children.blanket_impls.iter().chain(nonblanket).cloned()
+}
+
+fn filtered_children(
+    children: &mut Children,
+    st: SimplifiedType,
+) -> impl Iterator<Item = DefId> + '_ {
+    let nonblanket = children.nonblanket_impls.entry(st).or_default().iter();
+    children.blanket_impls.iter().chain(nonblanket).cloned()
+}
+
+// A custom iterator used by Children::insert
+enum PotentialSiblings<I, J>
+where
+    I: Iterator<Item = DefId>,
+    J: Iterator<Item = DefId>,
+{
+    Unfiltered(I),
+    Filtered(J),
+}
+
+impl<I, J> Iterator for PotentialSiblings<I, J>
+where
+    I: Iterator<Item = DefId>,
+    J: Iterator<Item = DefId>,
+{
+    type Item = DefId;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match *self {
+            PotentialSiblings::Unfiltered(ref mut iter) => iter.next(),
+            PotentialSiblings::Filtered(ref mut iter) => iter.next(),
+        }
+    }
+}
+
+pub trait GraphExt {
+    /// Insert a local impl into the specialization graph. If an existing impl
+    /// conflicts with it (has overlap, but neither specializes the other),
+    /// information about the area of overlap is returned in the `Err`.
+    fn insert(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        impl_def_id: DefId,
+    ) -> Result<Option<FutureCompatOverlapError>, OverlapError>;
+
+    /// Insert cached metadata mapping from a child impl back to its parent.
+    fn record_impl_from_cstore(&mut self, tcx: TyCtxt<'tcx>, parent: DefId, child: DefId);
+}
+
+impl GraphExt for Graph {
+    /// Insert a local impl into the specialization graph. If an existing impl
+    /// conflicts with it (has overlap, but neither specializes the other),
+    /// information about the area of overlap is returned in the `Err`.
+    fn insert(
+        &mut self,
+        tcx: TyCtxt<'tcx>,
+        impl_def_id: DefId,
+    ) -> Result<Option<FutureCompatOverlapError>, OverlapError> {
+        assert!(impl_def_id.is_local());
+
+        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
+        let trait_def_id = trait_ref.def_id;
+
+        debug!(
+            "insert({:?}): inserting TraitRef {:?} into specialization graph",
+            impl_def_id, trait_ref
+        );
+
+        // If the reference itself contains an earlier error (e.g., due to a
+        // resolution failure), then we just insert the impl at the top level of
+        // the graph and claim that there's no overlap (in order to suppress
+        // bogus errors).
+        if trait_ref.references_error() {
+            debug!(
+                "insert: inserting dummy node for erroneous TraitRef {:?}, \
+                 impl_def_id={:?}, trait_def_id={:?}",
+                trait_ref, impl_def_id, trait_def_id
+            );
+
+            self.parent.insert(impl_def_id, trait_def_id);
+            self.children.entry(trait_def_id).or_default().insert_blindly(tcx, impl_def_id);
+            return Ok(None);
+        }
+
+        let mut parent = trait_def_id;
+        let mut last_lint = None;
+        let simplified = fast_reject::simplify_type(tcx, trait_ref.self_ty(), false);
+
+        // Descend the specialization tree, where `parent` is the current parent node.
+        loop {
+            use self::Inserted::*;
+
+            let insert_result =
+                self.children.entry(parent).or_default().insert(tcx, impl_def_id, simplified)?;
+
+            match insert_result {
+                BecameNewSibling(opt_lint) => {
+                    last_lint = opt_lint;
+                    break;
+                }
+                ReplaceChildren(grand_children_to_be) => {
+                    // We currently have
+                    //
+                    //     P
+                    //     |
+                    //     G
+                    //
+                    // and we are inserting the impl N. We want to make it:
+                    //
+                    //     P
+                    //     |
+                    //     N
+                    //     |
+                    //     G
+
+                    // Adjust P's list of children: remove G and then add N.
+                    {
+                        let siblings = self.children.get_mut(&parent).unwrap();
+                        for &grand_child_to_be in &grand_children_to_be {
+                            siblings.remove_existing(tcx, grand_child_to_be);
+                        }
+                        siblings.insert_blindly(tcx, impl_def_id);
+                    }
+
+                    // Set G's parent to N and N's parent to P.
+                    for &grand_child_to_be in &grand_children_to_be {
+                        self.parent.insert(grand_child_to_be, impl_def_id);
+                    }
+                    self.parent.insert(impl_def_id, parent);
+
+                    // Add G as N's child.
+                    for &grand_child_to_be in &grand_children_to_be {
+                        self.children
+                            .entry(impl_def_id)
+                            .or_default()
+                            .insert_blindly(tcx, grand_child_to_be);
+                    }
+                    break;
+                }
+                ShouldRecurseOn(new_parent) => {
+                    parent = new_parent;
+                }
+            }
+        }
+
+        self.parent.insert(impl_def_id, parent);
+        Ok(last_lint)
+    }
+
+    /// Insert cached metadata mapping from a child impl back to its parent.
+    fn record_impl_from_cstore(&mut self, tcx: TyCtxt<'tcx>, parent: DefId, child: DefId) {
+        if self.parent.insert(child, parent).is_some() {
+            bug!(
+                "When recording an impl from the crate store, information about its parent \
+                 was already present."
+            );
+        }
+
+        self.children.entry(parent).or_default().insert_blindly(tcx, child);
+    }
+}
diff --git a/src/librustc_infer/traits/structural_impls.rs b/src/librustc_infer/traits/structural_impls.rs
new file mode 100644
index 0000000000..6630f664f9
--- /dev/null
+++ b/src/librustc_infer/traits/structural_impls.rs
@@ -0,0 +1,71 @@
+use crate::traits;
+use crate::traits::project::Normalized;
+use rustc::ty;
+use rustc::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
+
+use std::fmt;
+
+// Structural impls for the structs in `traits`.
+
+impl<'tcx, T: fmt::Debug> fmt::Debug for Normalized<'tcx, T> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Normalized({:?}, {:?})", self.value, self.obligations)
+    }
+}
+
+impl<'tcx, O: fmt::Debug> fmt::Debug for traits::Obligation<'tcx, O> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if ty::tls::with(|tcx| tcx.sess.verbose()) {
+            write!(
+                f,
+                "Obligation(predicate={:?}, cause={:?}, param_env={:?}, depth={})",
+                self.predicate, self.cause, self.param_env, self.recursion_depth
+            )
+        } else {
+            write!(f, "Obligation(predicate={:?}, depth={})", self.predicate, self.recursion_depth)
+        }
+    }
+}
+
+impl<'tcx> fmt::Debug for traits::FulfillmentError<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "FulfillmentError({:?},{:?})", self.obligation, self.code)
+    }
+}
+
+impl<'tcx> fmt::Debug for traits::FulfillmentErrorCode<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match *self {
+            super::CodeSelectionError(ref e) => write!(f, "{:?}", e),
+            super::CodeProjectionError(ref e) => write!(f, "{:?}", e),
+            super::CodeSubtypeError(ref a, ref b) => {
+                write!(f, "CodeSubtypeError({:?}, {:?})", a, b)
+            }
+            super::CodeAmbiguity => write!(f, "Ambiguity"),
+        }
+    }
+}
+
+impl<'tcx> fmt::Debug for traits::MismatchedProjectionTypes<'tcx> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "MismatchedProjectionTypes({:?})", self.err)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// TypeFoldable implementations.
+
+impl<'tcx, O: TypeFoldable<'tcx>> TypeFoldable<'tcx> for traits::Obligation<'tcx, O> {
+    fn super_fold_with<F: TypeFolder<'tcx>>(&self, folder: &mut F) -> Self {
+        traits::Obligation {
+            cause: self.cause.clone(),
+            recursion_depth: self.recursion_depth,
+            predicate: self.predicate.fold_with(folder),
+            param_env: self.param_env.fold_with(folder),
+        }
+    }
+
+    fn super_visit_with<V: TypeVisitor<'tcx>>(&self, visitor: &mut V) -> bool {
+        self.predicate.visit_with(visitor)
+    }
+}
diff --git a/src/librustc/traits/structural_match.rs b/src/librustc_infer/traits/structural_match.rs
similarity index 97%
rename from src/librustc/traits/structural_match.rs
rename to src/librustc_infer/traits/structural_match.rs
index b2c3c23b4e..60682f5812 100644
--- a/src/librustc/traits/structural_match.rs
+++ b/src/librustc_infer/traits/structural_match.rs
@@ -1,9 +1,8 @@
-use crate::ty::fold::{TypeFoldable, TypeVisitor};
-use crate::ty::{self, AdtDef, Ty, TyCtxt};
+use crate::infer::{InferCtxt, TyCtxtInferExt};
+use crate::traits::ObligationCause;
+use crate::traits::{self, ConstPatternStructural, TraitEngine};
 
-use rustc::infer::InferCtxt;
-use rustc::traits::ObligationCause;
-use rustc::traits::{self, ConstPatternStructural, TraitEngine};
+use rustc::ty::{self, AdtDef, Ty, TyCtxt, TypeFoldable, TypeVisitor};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_span::Span;
diff --git a/src/librustc_infer/traits/util.rs b/src/librustc_infer/traits/util.rs
new file mode 100644
index 0000000000..cd4595e76c
--- /dev/null
+++ b/src/librustc_infer/traits/util.rs
@@ -0,0 +1,675 @@
+use rustc_errors::DiagnosticBuilder;
+use rustc_span::Span;
+use smallvec::smallvec;
+use smallvec::SmallVec;
+
+use rustc::ty::outlives::Component;
+use rustc::ty::subst::{GenericArg, Subst, SubstsRef};
+use rustc::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, WithConstness};
+use rustc_data_structures::fx::FxHashSet;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+
+use super::{Normalized, Obligation, ObligationCause, PredicateObligation, SelectionContext};
+
+fn anonymize_predicate<'tcx>(tcx: TyCtxt<'tcx>, pred: &ty::Predicate<'tcx>) -> ty::Predicate<'tcx> {
+    match *pred {
+        ty::Predicate::Trait(ref data, constness) => {
+            ty::Predicate::Trait(tcx.anonymize_late_bound_regions(data), constness)
+        }
+
+        ty::Predicate::RegionOutlives(ref data) => {
+            ty::Predicate::RegionOutlives(tcx.anonymize_late_bound_regions(data))
+        }
+
+        ty::Predicate::TypeOutlives(ref data) => {
+            ty::Predicate::TypeOutlives(tcx.anonymize_late_bound_regions(data))
+        }
+
+        ty::Predicate::Projection(ref data) => {
+            ty::Predicate::Projection(tcx.anonymize_late_bound_regions(data))
+        }
+
+        ty::Predicate::WellFormed(data) => ty::Predicate::WellFormed(data),
+
+        ty::Predicate::ObjectSafe(data) => ty::Predicate::ObjectSafe(data),
+
+        ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind) => {
+            ty::Predicate::ClosureKind(closure_def_id, closure_substs, kind)
+        }
+
+        ty::Predicate::Subtype(ref data) => {
+            ty::Predicate::Subtype(tcx.anonymize_late_bound_regions(data))
+        }
+
+        ty::Predicate::ConstEvaluatable(def_id, substs) => {
+            ty::Predicate::ConstEvaluatable(def_id, substs)
+        }
+    }
+}
+
+struct PredicateSet<'tcx> {
+    tcx: TyCtxt<'tcx>,
+    set: FxHashSet<ty::Predicate<'tcx>>,
+}
+
+impl PredicateSet<'tcx> {
+    fn new(tcx: TyCtxt<'tcx>) -> Self {
+        Self { tcx, set: Default::default() }
+    }
+
+    fn insert(&mut self, pred: &ty::Predicate<'tcx>) -> bool {
+        // We have to be careful here because we want
+        //
+        //    for<'a> Foo<&'a int>
+        //
+        // and
+        //
+        //    for<'b> Foo<&'b int>
+        //
+        // to be considered equivalent. So normalize all late-bound
+        // regions before we throw things into the underlying set.
+        self.set.insert(anonymize_predicate(self.tcx, pred))
+    }
+}
+
+impl<T: AsRef<ty::Predicate<'tcx>>> Extend<T> for PredicateSet<'tcx> {
+    fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
+        for pred in iter {
+            self.insert(pred.as_ref());
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// `Elaboration` iterator
+///////////////////////////////////////////////////////////////////////////
+
+/// "Elaboration" is the process of identifying all the predicates that
+/// are implied by a source predicate. Currently, this basically means
+/// walking the "supertraits" and other similar assumptions. For example,
+/// if we know that `T: Ord`, the elaborator would deduce that `T: PartialOrd`
+/// holds as well. Similarly, if we have `trait Foo: 'static`, and we know that
+/// `T: Foo`, then we know that `T: 'static`.
+pub struct Elaborator<'tcx> {
+    stack: Vec<ty::Predicate<'tcx>>,
+    visited: PredicateSet<'tcx>,
+}
+
+pub fn elaborate_trait_ref<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_ref: ty::PolyTraitRef<'tcx>,
+) -> Elaborator<'tcx> {
+    elaborate_predicates(tcx, vec![trait_ref.without_const().to_predicate()])
+}
+
+pub fn elaborate_trait_refs<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_refs: impl Iterator<Item = ty::PolyTraitRef<'tcx>>,
+) -> Elaborator<'tcx> {
+    let predicates = trait_refs.map(|trait_ref| trait_ref.without_const().to_predicate()).collect();
+    elaborate_predicates(tcx, predicates)
+}
+
+pub fn elaborate_predicates<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    mut predicates: Vec<ty::Predicate<'tcx>>,
+) -> Elaborator<'tcx> {
+    let mut visited = PredicateSet::new(tcx);
+    predicates.retain(|pred| visited.insert(pred));
+    Elaborator { stack: predicates, visited }
+}
+
+impl Elaborator<'tcx> {
+    pub fn filter_to_traits(self) -> FilterToTraits<Self> {
+        FilterToTraits::new(self)
+    }
+
+    fn elaborate(&mut self, predicate: &ty::Predicate<'tcx>) {
+        let tcx = self.visited.tcx;
+        match *predicate {
+            ty::Predicate::Trait(ref data, _) => {
+                // Get predicates declared on the trait.
+                let predicates = tcx.super_predicates_of(data.def_id());
+
+                let predicates = predicates
+                    .predicates
+                    .iter()
+                    .map(|(pred, _)| pred.subst_supertrait(tcx, &data.to_poly_trait_ref()));
+                debug!("super_predicates: data={:?} predicates={:?}", data, predicates.clone());
+
+                // Only keep those bounds that we haven't already seen.
+                // This is necessary to prevent infinite recursion in some
+                // cases. One common case is when people define
+                // `trait Sized: Sized { }` rather than `trait Sized { }`.
+                let visited = &mut self.visited;
+                let predicates = predicates.filter(|pred| visited.insert(pred));
+
+                self.stack.extend(predicates);
+            }
+            ty::Predicate::WellFormed(..) => {
+                // Currently, we do not elaborate WF predicates,
+                // although we easily could.
+            }
+            ty::Predicate::ObjectSafe(..) => {
+                // Currently, we do not elaborate object-safe
+                // predicates.
+            }
+            ty::Predicate::Subtype(..) => {
+                // Currently, we do not "elaborate" predicates like `X <: Y`,
+                // though conceivably we might.
+            }
+            ty::Predicate::Projection(..) => {
+                // Nothing to elaborate in a projection predicate.
+            }
+            ty::Predicate::ClosureKind(..) => {
+                // Nothing to elaborate when waiting for a closure's kind to be inferred.
+            }
+            ty::Predicate::ConstEvaluatable(..) => {
+                // Currently, we do not elaborate const-evaluatable
+                // predicates.
+            }
+            ty::Predicate::RegionOutlives(..) => {
+                // Nothing to elaborate from `'a: 'b`.
+            }
+            ty::Predicate::TypeOutlives(ref data) => {
+                // We know that `T: 'a` for some type `T`. We can
+                // often elaborate this. For example, if we know that
+                // `[U]: 'a`, that implies that `U: 'a`. Similarly, if
+                // we know `&'a U: 'b`, then we know that `'a: 'b` and
+                // `U: 'b`.
+                //
+                // We can basically ignore bound regions here. So for
+                // example `for<'c> Foo<'a,'c>: 'b` can be elaborated to
+                // `'a: 'b`.
+
+                // Ignore `for<'a> T: 'a` -- we might in the future
+                // consider this as evidence that `T: 'static`, but
+                // I'm a bit wary of such constructions and so for now
+                // I want to be conservative. --nmatsakis
+                let ty_max = data.skip_binder().0;
+                let r_min = data.skip_binder().1;
+                if r_min.is_late_bound() {
+                    return;
+                }
+
+                let visited = &mut self.visited;
+                let mut components = smallvec![];
+                tcx.push_outlives_components(ty_max, &mut components);
+                self.stack.extend(
+                    components
+                        .into_iter()
+                        .filter_map(|component| match component {
+                            Component::Region(r) => {
+                                if r.is_late_bound() {
+                                    None
+                                } else {
+                                    Some(ty::Predicate::RegionOutlives(ty::Binder::dummy(
+                                        ty::OutlivesPredicate(r, r_min),
+                                    )))
+                                }
+                            }
+
+                            Component::Param(p) => {
+                                let ty = tcx.mk_ty_param(p.index, p.name);
+                                Some(ty::Predicate::TypeOutlives(ty::Binder::dummy(
+                                    ty::OutlivesPredicate(ty, r_min),
+                                )))
+                            }
+
+                            Component::UnresolvedInferenceVariable(_) => None,
+
+                            Component::Projection(_) | Component::EscapingProjection(_) => {
+                                // We can probably do more here. This
+                                // corresponds to a case like `<T as
+                                // Foo<'a>>::U: 'b`.
+                                None
+                            }
+                        })
+                        .filter(|p| visited.insert(p)),
+                );
+            }
+        }
+    }
+}
+
+impl Iterator for Elaborator<'tcx> {
+    type Item = ty::Predicate<'tcx>;
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.stack.len(), None)
+    }
+
+    fn next(&mut self) -> Option<ty::Predicate<'tcx>> {
+        // Extract next item from top-most stack frame, if any.
+        if let Some(pred) = self.stack.pop() {
+            self.elaborate(&pred);
+            Some(pred)
+        } else {
+            None
+        }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Supertrait iterator
+///////////////////////////////////////////////////////////////////////////
+
+pub type Supertraits<'tcx> = FilterToTraits<Elaborator<'tcx>>;
+
+pub fn supertraits<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_ref: ty::PolyTraitRef<'tcx>,
+) -> Supertraits<'tcx> {
+    elaborate_trait_ref(tcx, trait_ref).filter_to_traits()
+}
+
+pub fn transitive_bounds<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    bounds: impl Iterator<Item = ty::PolyTraitRef<'tcx>>,
+) -> Supertraits<'tcx> {
+    elaborate_trait_refs(tcx, bounds).filter_to_traits()
+}
+
+///////////////////////////////////////////////////////////////////////////
+// `TraitAliasExpander` iterator
+///////////////////////////////////////////////////////////////////////////
+
+/// "Trait alias expansion" is the process of expanding a sequence of trait
+/// references into another sequence by transitively following all trait
+/// aliases. e.g. If you have bounds like `Foo + Send`, a trait alias
+/// `trait Foo = Bar + Sync;`, and another trait alias
+/// `trait Bar = Read + Write`, then the bounds would expand to
+/// `Read + Write + Sync + Send`.
+/// Expansion is done via a DFS (depth-first search), and the `visited` field
+/// is used to avoid cycles.
+pub struct TraitAliasExpander<'tcx> {
+    tcx: TyCtxt<'tcx>,
+    stack: Vec<TraitAliasExpansionInfo<'tcx>>,
+}
+
+/// Stores information about the expansion of a trait via a path of zero or more trait aliases.
+#[derive(Debug, Clone)]
+pub struct TraitAliasExpansionInfo<'tcx> {
+    pub path: SmallVec<[(ty::PolyTraitRef<'tcx>, Span); 4]>,
+}
+
+impl<'tcx> TraitAliasExpansionInfo<'tcx> {
+    fn new(trait_ref: ty::PolyTraitRef<'tcx>, span: Span) -> Self {
+        Self { path: smallvec![(trait_ref, span)] }
+    }
+
+    /// Adds diagnostic labels to `diag` for the expansion path of a trait through all intermediate
+    /// trait aliases.
+    pub fn label_with_exp_info(
+        &self,
+        diag: &mut DiagnosticBuilder<'_>,
+        top_label: &str,
+        use_desc: &str,
+    ) {
+        diag.span_label(self.top().1, top_label);
+        if self.path.len() > 1 {
+            for (_, sp) in self.path.iter().rev().skip(1).take(self.path.len() - 2) {
+                diag.span_label(*sp, format!("referenced here ({})", use_desc));
+            }
+        }
+        diag.span_label(
+            self.bottom().1,
+            format!("trait alias used in trait object type ({})", use_desc),
+        );
+    }
+
+    pub fn trait_ref(&self) -> &ty::PolyTraitRef<'tcx> {
+        &self.top().0
+    }
+
+    pub fn top(&self) -> &(ty::PolyTraitRef<'tcx>, Span) {
+        self.path.last().unwrap()
+    }
+
+    pub fn bottom(&self) -> &(ty::PolyTraitRef<'tcx>, Span) {
+        self.path.first().unwrap()
+    }
+
+    fn clone_and_push(&self, trait_ref: ty::PolyTraitRef<'tcx>, span: Span) -> Self {
+        let mut path = self.path.clone();
+        path.push((trait_ref, span));
+
+        Self { path }
+    }
+}
+
+pub fn expand_trait_aliases<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_refs: impl IntoIterator<Item = (ty::PolyTraitRef<'tcx>, Span)>,
+) -> TraitAliasExpander<'tcx> {
+    let items: Vec<_> = trait_refs
+        .into_iter()
+        .map(|(trait_ref, span)| TraitAliasExpansionInfo::new(trait_ref, span))
+        .collect();
+    TraitAliasExpander { tcx, stack: items }
+}
+
+impl<'tcx> TraitAliasExpander<'tcx> {
+    /// If `item` is a trait alias and its predicate has not yet been visited, then expands `item`
+    /// to the definition, pushes the resulting expansion onto `self.stack`, and returns `false`.
+    /// Otherwise, immediately returns `true` if `item` is a regular trait, or `false` if it is a
+    /// trait alias.
+    /// The return value indicates whether `item` should be yielded to the user.
+    fn expand(&mut self, item: &TraitAliasExpansionInfo<'tcx>) -> bool {
+        let tcx = self.tcx;
+        let trait_ref = item.trait_ref();
+        let pred = trait_ref.without_const().to_predicate();
+
+        debug!("expand_trait_aliases: trait_ref={:?}", trait_ref);
+
+        // Don't recurse if this bound is not a trait alias.
+        let is_alias = tcx.is_trait_alias(trait_ref.def_id());
+        if !is_alias {
+            return true;
+        }
+
+        // Don't recurse if this trait alias is already on the stack for the DFS search.
+        let anon_pred = anonymize_predicate(tcx, &pred);
+        if item.path.iter().rev().skip(1).any(|(tr, _)| {
+            anonymize_predicate(tcx, &tr.without_const().to_predicate()) == anon_pred
+        }) {
+            return false;
+        }
+
+        // Get components of trait alias.
+        let predicates = tcx.super_predicates_of(trait_ref.def_id());
+
+        let items = predicates.predicates.iter().rev().filter_map(|(pred, span)| {
+            pred.subst_supertrait(tcx, &trait_ref)
+                .to_opt_poly_trait_ref()
+                .map(|trait_ref| item.clone_and_push(trait_ref, *span))
+        });
+        debug!("expand_trait_aliases: items={:?}", items.clone());
+
+        self.stack.extend(items);
+
+        false
+    }
+}
+
+impl<'tcx> Iterator for TraitAliasExpander<'tcx> {
+    type Item = TraitAliasExpansionInfo<'tcx>;
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.stack.len(), None)
+    }
+
+    fn next(&mut self) -> Option<TraitAliasExpansionInfo<'tcx>> {
+        while let Some(item) = self.stack.pop() {
+            if self.expand(&item) {
+                return Some(item);
+            }
+        }
+        None
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Iterator over def-IDs of supertraits
+///////////////////////////////////////////////////////////////////////////
+
+pub struct SupertraitDefIds<'tcx> {
+    tcx: TyCtxt<'tcx>,
+    stack: Vec<DefId>,
+    visited: FxHashSet<DefId>,
+}
+
+pub fn supertrait_def_ids(tcx: TyCtxt<'_>, trait_def_id: DefId) -> SupertraitDefIds<'_> {
+    SupertraitDefIds {
+        tcx,
+        stack: vec![trait_def_id],
+        visited: Some(trait_def_id).into_iter().collect(),
+    }
+}
+
+impl Iterator for SupertraitDefIds<'tcx> {
+    type Item = DefId;
+
+    fn next(&mut self) -> Option<DefId> {
+        let def_id = self.stack.pop()?;
+        let predicates = self.tcx.super_predicates_of(def_id);
+        let visited = &mut self.visited;
+        self.stack.extend(
+            predicates
+                .predicates
+                .iter()
+                .filter_map(|(pred, _)| pred.to_opt_poly_trait_ref())
+                .map(|trait_ref| trait_ref.def_id())
+                .filter(|&super_def_id| visited.insert(super_def_id)),
+        );
+        Some(def_id)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Other
+///////////////////////////////////////////////////////////////////////////
+
+/// A filter around an iterator of predicates that makes it yield up
+/// just trait references.
+pub struct FilterToTraits<I> {
+    base_iterator: I,
+}
+
+impl<I> FilterToTraits<I> {
+    fn new(base: I) -> FilterToTraits<I> {
+        FilterToTraits { base_iterator: base }
+    }
+}
+
+impl<'tcx, I: Iterator<Item = ty::Predicate<'tcx>>> Iterator for FilterToTraits<I> {
+    type Item = ty::PolyTraitRef<'tcx>;
+
+    fn next(&mut self) -> Option<ty::PolyTraitRef<'tcx>> {
+        while let Some(pred) = self.base_iterator.next() {
+            if let ty::Predicate::Trait(data, _) = pred {
+                return Some(data.to_poly_trait_ref());
+            }
+        }
+        None
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let (_, upper) = self.base_iterator.size_hint();
+        (0, upper)
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////
+// Other
+///////////////////////////////////////////////////////////////////////////
+
+/// Instantiate all bound parameters of the impl with the given substs,
+/// returning the resulting trait ref and all obligations that arise.
+/// The obligations are closed under normalization.
+pub fn impl_trait_ref_and_oblig<'a, 'tcx>(
+    selcx: &mut SelectionContext<'a, 'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    impl_def_id: DefId,
+    impl_substs: SubstsRef<'tcx>,
+) -> (ty::TraitRef<'tcx>, Vec<PredicateObligation<'tcx>>) {
+    let impl_trait_ref = selcx.tcx().impl_trait_ref(impl_def_id).unwrap();
+    let impl_trait_ref = impl_trait_ref.subst(selcx.tcx(), impl_substs);
+    let Normalized { value: impl_trait_ref, obligations: normalization_obligations1 } =
+        super::normalize(selcx, param_env, ObligationCause::dummy(), &impl_trait_ref);
+
+    let predicates = selcx.tcx().predicates_of(impl_def_id);
+    let predicates = predicates.instantiate(selcx.tcx(), impl_substs);
+    let Normalized { value: predicates, obligations: normalization_obligations2 } =
+        super::normalize(selcx, param_env, ObligationCause::dummy(), &predicates);
+    let impl_obligations =
+        predicates_for_generics(ObligationCause::dummy(), 0, param_env, &predicates);
+
+    let impl_obligations: Vec<_> = impl_obligations
+        .into_iter()
+        .chain(normalization_obligations1)
+        .chain(normalization_obligations2)
+        .collect();
+
+    (impl_trait_ref, impl_obligations)
+}
+
+/// See [`super::obligations_for_generics`].
+pub fn predicates_for_generics<'tcx>(
+    cause: ObligationCause<'tcx>,
+    recursion_depth: usize,
+    param_env: ty::ParamEnv<'tcx>,
+    generic_bounds: &ty::InstantiatedPredicates<'tcx>,
+) -> Vec<PredicateObligation<'tcx>> {
+    debug!("predicates_for_generics(generic_bounds={:?})", generic_bounds);
+
+    generic_bounds
+        .predicates
+        .iter()
+        .map(|&predicate| Obligation {
+            cause: cause.clone(),
+            recursion_depth,
+            param_env,
+            predicate,
+        })
+        .collect()
+}
+
+pub fn predicate_for_trait_ref<'tcx>(
+    cause: ObligationCause<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    trait_ref: ty::TraitRef<'tcx>,
+    recursion_depth: usize,
+) -> PredicateObligation<'tcx> {
+    Obligation {
+        cause,
+        param_env,
+        recursion_depth,
+        predicate: trait_ref.without_const().to_predicate(),
+    }
+}
+
+pub fn predicate_for_trait_def(
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    cause: ObligationCause<'tcx>,
+    trait_def_id: DefId,
+    recursion_depth: usize,
+    self_ty: Ty<'tcx>,
+    params: &[GenericArg<'tcx>],
+) -> PredicateObligation<'tcx> {
+    let trait_ref =
+        ty::TraitRef { def_id: trait_def_id, substs: tcx.mk_substs_trait(self_ty, params) };
+    predicate_for_trait_ref(cause, param_env, trait_ref, recursion_depth)
+}
+
+/// Casts a trait reference into a reference to one of its super
+/// traits; returns `None` if `target_trait_def_id` is not a
+/// supertrait.
+pub fn upcast_choices(
+    tcx: TyCtxt<'tcx>,
+    source_trait_ref: ty::PolyTraitRef<'tcx>,
+    target_trait_def_id: DefId,
+) -> Vec<ty::PolyTraitRef<'tcx>> {
+    if source_trait_ref.def_id() == target_trait_def_id {
+        return vec![source_trait_ref]; // Shortcut the most common case.
+    }
+
+    supertraits(tcx, source_trait_ref).filter(|r| r.def_id() == target_trait_def_id).collect()
+}
+
+/// Given a trait `trait_ref`, returns the number of vtable entries
+/// that come from `trait_ref`, excluding its supertraits. Used in
+/// computing the vtable base for an upcast trait of a trait object.
+pub fn count_own_vtable_entries(tcx: TyCtxt<'tcx>, trait_ref: ty::PolyTraitRef<'tcx>) -> usize {
+    let mut entries = 0;
+    // Count number of methods and add them to the total offset.
+    // Skip over associated types and constants.
+    for trait_item in tcx.associated_items(trait_ref.def_id()).in_definition_order() {
+        if trait_item.kind == ty::AssocKind::Method {
+            entries += 1;
+        }
+    }
+    entries
+}
+
+/// Given an upcast trait object described by `object`, returns the
+/// index of the method `method_def_id` (which should be part of
+/// `object.upcast_trait_ref`) within the vtable for `object`.
+pub fn get_vtable_index_of_object_method<N>(
+    tcx: TyCtxt<'tcx>,
+    object: &super::VtableObjectData<'tcx, N>,
+    method_def_id: DefId,
+) -> usize {
+    // Count number of methods preceding the one we are selecting and
+    // add them to the total offset.
+    // Skip over associated types and constants.
+    let mut entries = object.vtable_base;
+    for trait_item in tcx.associated_items(object.upcast_trait_ref.def_id()).in_definition_order() {
+        if trait_item.def_id == method_def_id {
+            // The item with the ID we were given really ought to be a method.
+            assert_eq!(trait_item.kind, ty::AssocKind::Method);
+            return entries;
+        }
+        if trait_item.kind == ty::AssocKind::Method {
+            entries += 1;
+        }
+    }
+
+    bug!("get_vtable_index_of_object_method: {:?} was not found", method_def_id);
+}
+
+pub fn closure_trait_ref_and_return_type(
+    tcx: TyCtxt<'tcx>,
+    fn_trait_def_id: DefId,
+    self_ty: Ty<'tcx>,
+    sig: ty::PolyFnSig<'tcx>,
+    tuple_arguments: TupleArgumentsFlag,
+) -> ty::Binder<(ty::TraitRef<'tcx>, Ty<'tcx>)> {
+    let arguments_tuple = match tuple_arguments {
+        TupleArgumentsFlag::No => sig.skip_binder().inputs()[0],
+        TupleArgumentsFlag::Yes => tcx.intern_tup(sig.skip_binder().inputs()),
+    };
+    let trait_ref = ty::TraitRef {
+        def_id: fn_trait_def_id,
+        substs: tcx.mk_substs_trait(self_ty, &[arguments_tuple.into()]),
+    };
+    ty::Binder::bind((trait_ref, sig.skip_binder().output()))
+}
+
+pub fn generator_trait_ref_and_outputs(
+    tcx: TyCtxt<'tcx>,
+    fn_trait_def_id: DefId,
+    self_ty: Ty<'tcx>,
+    sig: ty::PolyGenSig<'tcx>,
+) -> ty::Binder<(ty::TraitRef<'tcx>, Ty<'tcx>, Ty<'tcx>)> {
+    let trait_ref = ty::TraitRef {
+        def_id: fn_trait_def_id,
+        substs: tcx.mk_substs_trait(self_ty, &[sig.skip_binder().resume_ty.into()]),
+    };
+    ty::Binder::bind((trait_ref, sig.skip_binder().yield_ty, sig.skip_binder().return_ty))
+}
+
+pub fn impl_is_default(tcx: TyCtxt<'_>, node_item_def_id: DefId) -> bool {
+    match tcx.hir().as_local_hir_id(node_item_def_id) {
+        Some(hir_id) => {
+            let item = tcx.hir().expect_item(hir_id);
+            if let hir::ItemKind::Impl { defaultness, .. } = item.kind {
+                defaultness.is_default()
+            } else {
+                false
+            }
+        }
+        None => tcx.impl_defaultness(node_item_def_id).is_default(),
+    }
+}
+
+pub fn impl_item_is_final(tcx: TyCtxt<'_>, assoc_item: &ty::AssocItem) -> bool {
+    assoc_item.defaultness.is_final() && !impl_is_default(tcx, assoc_item.container.id())
+}
+
+pub enum TupleArgumentsFlag {
+    Yes,
+    No,
+}
diff --git a/src/librustc/traits/wf.rs b/src/librustc_infer/traits/wf.rs
similarity index 96%
rename from src/librustc/traits/wf.rs
rename to src/librustc_infer/traits/wf.rs
index 9fa3c87477..980a3f0478 100644
--- a/src/librustc/traits/wf.rs
+++ b/src/librustc_infer/traits/wf.rs
@@ -1,14 +1,13 @@
 use crate::infer::opaque_types::required_region_bounds;
 use crate::infer::InferCtxt;
-use crate::middle::lang_items;
 use crate::traits::{self, AssocTypeBoundData};
-use crate::ty::subst::SubstsRef;
-use crate::ty::{self, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
+use rustc::middle::lang_items;
+use rustc::ty::subst::SubstsRef;
+use rustc::ty::{self, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_span::symbol::{kw, Ident};
 use rustc_span::Span;
-use std::iter::once;
 
 /// Returns the set of obligations needed to make `ty` well-formed.
 /// If `ty` contains unresolved inference variables, this may include
@@ -26,6 +25,7 @@ pub fn obligations<'a, 'tcx>(
     let mut wf = WfPredicates { infcx, param_env, body_id, span, out: vec![], item: None };
     if wf.compute(ty) {
         debug!("wf::obligations({:?}, body_id={:?}) = {:?}", ty, body_id, wf.out);
+
         let result = wf.normalize();
         debug!("wf::obligations({:?}, body_id={:?}) ~~> {:?}", ty, body_id, result);
         Some(result)
@@ -143,15 +143,16 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
         let cause = self.cause(traits::MiscObligation);
         let infcx = &mut self.infcx;
         let param_env = self.param_env;
-        self.out
-            .iter()
-            .inspect(|pred| assert!(!pred.has_escaping_bound_vars()))
-            .flat_map(|pred| {
-                let mut selcx = traits::SelectionContext::new(infcx);
-                let pred = traits::normalize(&mut selcx, param_env, cause.clone(), pred);
-                once(pred.value).chain(pred.obligations)
-            })
-            .collect()
+        let mut obligations = Vec::with_capacity(self.out.len());
+        for pred in &self.out {
+            assert!(!pred.has_escaping_bound_vars());
+            let mut selcx = traits::SelectionContext::new(infcx);
+            let i = obligations.len();
+            let value =
+                traits::normalize_to(&mut selcx, param_env, cause.clone(), pred, &mut obligations);
+            obligations.insert(i, value);
+        }
+        obligations
     }
 
     /// Pushes the obligations required for `trait_ref` to be WF into `self.out`.
@@ -166,7 +167,7 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
         let extend_cause_with_original_assoc_item_obligation =
             |cause: &mut traits::ObligationCause<'_>,
              pred: &ty::Predicate<'_>,
-             trait_assoc_items: ty::AssocItemsIterator<'_>| {
+             trait_assoc_items: &[ty::AssocItem]| {
                 let trait_item = tcx
                     .hir()
                     .as_local_hir_id(trait_ref.def_id)
@@ -231,10 +232,8 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
                         //                 found type `()`
                         if let Some(hir::ItemKind::Impl { items, .. }) = item.map(|i| &i.kind) {
                             let trait_assoc_item = tcx.associated_item(proj.projection_def_id());
-                            if let Some(impl_item) = items
-                                .iter()
-                                .filter(|item| item.ident == trait_assoc_item.ident)
-                                .next()
+                            if let Some(impl_item) =
+                                items.iter().find(|item| item.ident == trait_assoc_item.ident)
                             {
                                 cause.span = impl_item.span;
                                 cause.code = traits::AssocTypeBound(Box::new(AssocTypeBoundData {
@@ -283,13 +282,12 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
                         ) = (&proj.skip_binder().self_ty().kind, item.map(|i| &i.kind))
                         {
                             if let Some((impl_item, trait_assoc_item)) = trait_assoc_items
-                                .filter(|i| i.def_id == *item_def_id)
-                                .next()
+                                .iter()
+                                .find(|i| i.def_id == *item_def_id)
                                 .and_then(|trait_assoc_item| {
                                     items
                                         .iter()
-                                        .filter(|i| i.ident == trait_assoc_item.ident)
-                                        .next()
+                                        .find(|i| i.ident == trait_assoc_item.ident)
                                         .map(|impl_item| (impl_item, trait_assoc_item))
                                 })
                             {
@@ -316,7 +314,10 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
             };
 
         if let Elaborate::All = elaborate {
-            let trait_assoc_items = tcx.associated_items(trait_ref.def_id);
+            // FIXME: Make `extend_cause_with_original_assoc_item_obligation` take an iterator
+            // instead of a slice.
+            let trait_assoc_items: Vec<_> =
+                tcx.associated_items(trait_ref.def_id).in_definition_order().copied().collect();
 
             let predicates = obligations.iter().map(|obligation| obligation.predicate).collect();
             let implied_obligations = traits::elaborate_predicates(tcx, predicates);
@@ -325,7 +326,7 @@ impl<'a, 'tcx> WfPredicates<'a, 'tcx> {
                 extend_cause_with_original_assoc_item_obligation(
                     &mut cause,
                     &pred,
-                    trait_assoc_items.clone(),
+                    &*trait_assoc_items,
                 );
                 traits::Obligation::new(cause, param_env, pred)
             });
diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml
index 1fe5248dbf..b29480a881 100644
--- a/src/librustc_interface/Cargo.toml
+++ b/src/librustc_interface/Cargo.toml
@@ -13,7 +13,8 @@ doctest = false
 log = "0.4"
 rayon = { version = "0.3.0", package = "rustc-rayon" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_builtin_macros = { path = "../librustc_builtin_macros" }
 rustc_expand = { path = "../librustc_expand" }
 rustc_parse = { path = "../librustc_parse" }
@@ -30,6 +31,7 @@ rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_codegen_llvm = { path = "../librustc_codegen_llvm", optional = true }
 rustc_hir = { path = "../librustc_hir" }
+rustc_infer = { path = "../librustc_infer" }
 rustc_metadata = { path = "../librustc_metadata" }
 rustc_mir = { path = "../librustc_mir" }
 rustc_mir_build = { path = "../librustc_mir_build" }
diff --git a/src/librustc_interface/callbacks.rs b/src/librustc_interface/callbacks.rs
index eb9c118bb0..0345b82d3b 100644
--- a/src/librustc_interface/callbacks.rs
+++ b/src/librustc_interface/callbacks.rs
@@ -11,10 +11,9 @@
 
 use rustc::ty::tls;
 use rustc_errors::{Diagnostic, TRACK_DIAGNOSTICS};
-use rustc_span;
 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| {
@@ -26,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) {
@@ -59,4 +58,5 @@ pub fn setup_callbacks() {
     rustc_span::SPAN_DEBUG.swap(&(span_debug as fn(_, &mut fmt::Formatter<'_>) -> _));
     rustc_hir::def_id::DEF_ID_DEBUG.swap(&(def_id_debug as fn(_, &mut fmt::Formatter<'_>) -> _));
     TRACK_DIAGNOSTICS.swap(&(track_diagnostic as fn(&_)));
+    rustc::ty::RESOLVE_INSTANCE.swap(&(rustc_ty::instance::resolve_instance as _));
 }
diff --git a/src/librustc_interface/interface.rs b/src/librustc_interface/interface.rs
index 9cd9eb66cf..e15217dfa6 100644
--- a/src/librustc_interface/interface.rs
+++ b/src/librustc_interface/interface.rs
@@ -2,11 +2,13 @@ pub use crate::passes::BoxedResolver;
 use crate::util;
 
 use rustc::lint;
-use rustc::session::config::{self, ErrorOutputType, Input};
+use rustc::session::config::{self, ErrorOutputType, Input, OutputFilenames};
 use rustc::session::early_error;
 use rustc::session::{DiagnosticOutput, Session};
 use rustc::ty;
 use rustc::util::common::ErrorReported;
+use rustc_ast::ast::{self, MetaItemKind};
+use rustc_ast::token;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::Lrc;
@@ -14,14 +16,12 @@ use rustc_data_structures::OnDrop;
 use rustc_errors::registry::Registry;
 use rustc_lint::LintStore;
 use rustc_parse::new_parser_from_source_str;
+use rustc_session::parse::{CrateConfig, ParseSess};
 use rustc_span::edition;
 use rustc_span::source_map::{FileLoader, FileName, SourceMap};
 use std::path::PathBuf;
 use std::result;
 use std::sync::{Arc, Mutex};
-use syntax::ast::{self, MetaItemKind};
-use syntax::sess::ParseSess;
-use syntax::token;
 
 pub type Result<T> = result::Result<T, ErrorReported>;
 
@@ -61,11 +61,24 @@ impl Compiler {
     pub fn output_file(&self) -> &Option<PathBuf> {
         &self.output_file
     }
+    pub fn build_output_filenames(
+        &self,
+        sess: &Session,
+        attrs: &[ast::Attribute],
+    ) -> OutputFilenames {
+        util::build_output_filenames(
+            &self.input,
+            &self.output_dir,
+            &self.output_file,
+            &attrs,
+            &sess,
+        )
+    }
 }
 
 /// Converts strings provided as `--cfg [cfgspec]` into a `crate_cfg`.
 pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> FxHashSet<(String, Option<String>)> {
-    syntax::with_default_globals(move || {
+    rustc_ast::with_default_globals(move || {
         let cfg = cfgspecs
             .into_iter()
             .map(|s| {
@@ -106,7 +119,7 @@ pub fn parse_cfgspecs(cfgspecs: Vec<String>) -> FxHashSet<(String, Option<String
 
                 error!(r#"expected `key` or `key="value"`"#);
             })
-            .collect::<ast::CrateConfig>();
+            .collect::<CrateConfig>();
         cfg.into_iter().map(|(a, b)| (a.to_string(), b.map(|b| b.to_string()))).collect()
     })
 }
diff --git a/src/librustc_interface/lib.rs b/src/librustc_interface/lib.rs
index e4e6849ab8..ba1e2216ca 100644
--- a/src/librustc_interface/lib.rs
+++ b/src/librustc_interface/lib.rs
@@ -2,10 +2,8 @@
 #![feature(box_syntax)]
 #![feature(set_stdio)]
 #![feature(nll)]
-#![feature(arbitrary_self_types)]
 #![feature(generator_trait)]
 #![feature(generators)]
-#![cfg_attr(unix, feature(libc))]
 #![recursion_limit = "256"]
 
 #[cfg(unix)]
diff --git a/src/librustc_interface/passes.rs b/src/librustc_interface/passes.rs
index d62c7539d5..29e9ea1833 100644
--- a/src/librustc_interface/passes.rs
+++ b/src/librustc_interface/passes.rs
@@ -13,11 +13,11 @@ use rustc::session::config::{self, CrateType, Input, OutputFilenames, OutputType
 use rustc::session::config::{PpMode, PpSourceMode};
 use rustc::session::search_paths::PathKind;
 use rustc::session::Session;
-use rustc::traits;
 use rustc::ty::steal::Steal;
 use rustc::ty::{self, GlobalCtxt, ResolverOutputs, TyCtxt};
 use rustc::util::common::ErrorReported;
-use rustc_builtin_macros;
+use rustc_ast::mut_visit::MutVisitor;
+use rustc_ast::{self, ast, visit};
 use rustc_codegen_ssa::back::link::emit_metadata;
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use rustc_codegen_utils::link::filename_for_metadata;
@@ -26,22 +26,18 @@ use rustc_data_structures::{box_region_allow_access, declare_box_region_type, pa
 use rustc_errors::PResult;
 use rustc_expand::base::ExtCtxt;
 use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
-use rustc_incremental;
+use rustc_hir::Crate;
+use rustc_infer::traits;
 use rustc_lint::LintStore;
 use rustc_mir as mir;
 use rustc_mir_build as mir_build;
 use rustc_parse::{parse_crate_from_file, parse_crate_from_source_str};
 use rustc_passes::{self, hir_stats, layout_test};
 use rustc_plugin_impl as plugin;
-use rustc_privacy;
 use rustc_resolve::{Resolver, ResolverArenas};
 use rustc_span::symbol::Symbol;
 use rustc_span::FileName;
-use rustc_traits;
 use rustc_typeck as typeck;
-use syntax::mut_visit::MutVisitor;
-use syntax::util::node_count::NodeCounter;
-use syntax::{self, ast, visit};
 
 use rustc_serialize::json;
 use tempfile::Builder as TempFileBuilder;
@@ -49,7 +45,7 @@ use tempfile::Builder as TempFileBuilder;
 use std::any::Any;
 use std::cell::RefCell;
 use std::ffi::OsString;
-use std::io::{self, Write};
+use std::io::{self, BufWriter, Write};
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::{env, fs, iter, mem};
@@ -83,7 +79,7 @@ pub fn parse<'a>(sess: &'a Session, input: &Input) -> PResult<'a, ast::Crate> {
 }
 
 fn count_nodes(krate: &ast::Crate) -> usize {
-    let mut counter = NodeCounter::new();
+    let mut counter = rustc_ast_passes::node_count::NodeCounter::new();
     visit::walk_crate(&mut counter, krate);
     counter.count
 }
@@ -193,7 +189,7 @@ pub fn register_plugins<'a>(
     }
 
     sess.time("recursion_limit", || {
-        middle::recursion_limit::update_limits(sess, &krate);
+        middle::limits::update_limits(sess, &krate);
     });
 
     let mut lint_store = rustc_lint::new_lint_store(
@@ -427,7 +423,7 @@ pub fn lower_to_hir<'res, 'tcx>(
     dep_graph: &'res DepGraph,
     krate: &'res ast::Crate,
     arena: &'tcx Arena<'tcx>,
-) -> Result<map::Forest<'tcx>> {
+) -> Crate<'tcx> {
     // Lower AST to HIR.
     let hir_crate = rustc_ast_lowering::lower_crate(
         sess,
@@ -442,8 +438,6 @@ pub fn lower_to_hir<'res, 'tcx>(
         hir_stats::print_hir_stats(&hir_crate);
     }
 
-    let hir_forest = map::Forest::new(hir_crate, &dep_graph);
-
     sess.time("early_lint_checks", || {
         rustc_lint::check_ast_crate(
             sess,
@@ -460,7 +454,7 @@ pub fn lower_to_hir<'res, 'tcx>(
         rustc_span::hygiene::clear_syntax_context_map();
     }
 
-    Ok(hir_forest)
+    hir_crate
 }
 
 // Returns all the paths that correspond to generated files.
@@ -575,7 +569,7 @@ fn write_out_deps(
             });
         }
 
-        let mut file = fs::File::create(&deps_filename)?;
+        let mut file = BufWriter::new(fs::File::create(&deps_filename)?);
         for path in out_filenames {
             writeln!(file, "{}: {}\n", path.display(), files.join(" "))?;
         }
@@ -702,15 +696,16 @@ impl<'tcx> QueryContext<'tcx> {
         ty::tls::enter_global(self.0, |tcx| f(tcx))
     }
 
-    pub fn print_stats(&self) {
-        self.0.queries.print_stats()
+    pub fn print_stats(&mut self) {
+        self.enter(|tcx| ty::query::print_stats(tcx))
     }
 }
 
 pub fn create_global_ctxt<'tcx>(
     compiler: &'tcx Compiler,
     lint_store: Lrc<LintStore>,
-    hir_forest: &'tcx map::Forest<'tcx>,
+    krate: &'tcx Crate<'tcx>,
+    dep_graph: DepGraph,
     mut resolver_outputs: ResolverOutputs,
     outputs: OutputFilenames,
     crate_name: &str,
@@ -721,7 +716,7 @@ pub fn create_global_ctxt<'tcx>(
     let defs = mem::take(&mut resolver_outputs.definitions);
 
     // Construct the HIR map.
-    let hir_map = map::map_crate(sess, &*resolver_outputs.cstore, &hir_forest, defs);
+    let hir_map = map::map_crate(sess, &*resolver_outputs.cstore, krate, dep_graph, defs);
 
     let query_result_on_disk_cache = rustc_incremental::load_query_result_cache(sess);
 
diff --git a/src/librustc_interface/proc_macro_decls.rs b/src/librustc_interface/proc_macro_decls.rs
index 9238f88b2b..076a8cef92 100644
--- a/src/librustc_interface/proc_macro_decls.rs
+++ b/src/librustc_interface/proc_macro_decls.rs
@@ -1,10 +1,10 @@
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::attr;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_span::symbol::sym;
-use syntax::attr;
 
 pub fn find(tcx: TyCtxt<'_>) -> Option<DefId> {
     tcx.proc_macro_decls_static(LOCAL_CRATE)
diff --git a/src/librustc_interface/queries.rs b/src/librustc_interface/queries.rs
index 0af9b17a29..426d97cc09 100644
--- a/src/librustc_interface/queries.rs
+++ b/src/librustc_interface/queries.rs
@@ -3,22 +3,22 @@ use crate::passes::{self, BoxedResolver, QueryContext};
 
 use rustc::arena::Arena;
 use rustc::dep_graph::DepGraph;
-use rustc::hir::map;
 use rustc::session::config::{OutputFilenames, OutputType};
 use rustc::session::Session;
 use rustc::ty::steal::Steal;
 use rustc::ty::{GlobalCtxt, ResolverOutputs};
 use rustc::util::common::ErrorReported;
+use rustc_ast::{self, ast};
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use rustc_data_structures::sync::{Lrc, Once, WorkerLocal};
 use rustc_hir::def_id::LOCAL_CRATE;
+use rustc_hir::Crate;
 use rustc_incremental::DepGraphFuture;
 use rustc_lint::LintStore;
 use std::any::Any;
 use std::cell::{Ref, RefCell, RefMut};
 use std::mem;
 use std::rc::Rc;
-use syntax::{self, ast};
 
 /// Represent the result of a query.
 /// This result can be stolen with the `take` method and generated with the `compute` method.
@@ -74,7 +74,7 @@ pub struct Queries<'tcx> {
     register_plugins: Query<(ast::Crate, Lrc<LintStore>)>,
     expansion: Query<(ast::Crate, Steal<Rc<RefCell<BoxedResolver>>>, Lrc<LintStore>)>,
     dep_graph: Query<DepGraph>,
-    lower_to_hir: Query<(&'tcx map::Forest<'tcx>, Steal<ResolverOutputs>)>,
+    lower_to_hir: Query<(&'tcx Crate<'tcx>, Steal<ResolverOutputs>)>,
     prepare_outputs: Query<OutputFilenames>,
     global_ctxt: Query<QueryContext<'tcx>>,
     ongoing_codegen: Query<Box<dyn Any>>,
@@ -207,9 +207,7 @@ impl<'tcx> Queries<'tcx> {
         })
     }
 
-    pub fn lower_to_hir(
-        &'tcx self,
-    ) -> Result<&Query<(&'tcx map::Forest<'tcx>, Steal<ResolverOutputs>)>> {
+    pub fn lower_to_hir(&'tcx self) -> Result<&Query<(&'tcx Crate<'tcx>, Steal<ResolverOutputs>)>> {
         self.lower_to_hir.compute(|| {
             let expansion_result = self.expansion()?;
             let peeked = expansion_result.peek();
@@ -217,14 +215,14 @@ impl<'tcx> Queries<'tcx> {
             let resolver = peeked.1.steal();
             let lint_store = &peeked.2;
             let hir = resolver.borrow_mut().access(|resolver| {
-                passes::lower_to_hir(
+                Ok(passes::lower_to_hir(
                     self.session(),
                     lint_store,
                     resolver,
                     &*self.dep_graph()?.peek(),
                     &krate,
                     &self.arena,
-                )
+                ))
             })?;
             let hir = self.arena.alloc(hir);
             Ok((hir, Steal::new(BoxedResolver::to_resolver_outputs(resolver))))
@@ -253,12 +251,14 @@ impl<'tcx> Queries<'tcx> {
             let outputs = self.prepare_outputs()?.peek().clone();
             let lint_store = self.expansion()?.peek().2.clone();
             let hir = self.lower_to_hir()?.peek();
-            let (ref hir_forest, ref resolver_outputs) = &*hir;
+            let dep_graph = self.dep_graph()?.peek().clone();
+            let (ref krate, ref resolver_outputs) = &*hir;
             let _timer = self.session().timer("create_global_ctxt");
             Ok(passes::create_global_ctxt(
                 self.compiler,
                 lint_store,
-                hir_forest,
+                krate,
+                dep_graph,
                 resolver_outputs.steal(),
                 outputs,
                 &crate_name,
@@ -310,19 +310,22 @@ pub struct Linker {
 
 impl Linker {
     pub fn link(self) -> Result<()> {
-        let r = self
-            .codegen_backend
-            .join_codegen_and_link(
-                self.ongoing_codegen,
-                &self.sess,
-                &self.dep_graph,
-                &self.prepare_outputs,
-            )
-            .map_err(|_| ErrorReported);
+        let codegen_results =
+            self.codegen_backend.join_codegen(self.ongoing_codegen, &self.sess, &self.dep_graph)?;
         let prof = self.sess.prof.clone();
         let dep_graph = self.dep_graph;
         prof.generic_activity("drop_dep_graph").run(move || drop(dep_graph));
-        r
+
+        if !self
+            .sess
+            .opts
+            .output_types
+            .keys()
+            .any(|&i| i == OutputType::Exe || i == OutputType::Metadata)
+        {
+            return Ok(());
+        }
+        self.codegen_backend.link(&self.sess, codegen_results, &self.prepare_outputs)
     }
 }
 
@@ -337,7 +340,7 @@ impl Compiler {
 
         if self.session().opts.debugging_opts.query_stats {
             if let Ok(gcx) = queries.global_ctxt() {
-                gcx.peek().print_stats();
+                gcx.peek_mut().print_stats();
             }
         }
 
diff --git a/src/librustc_interface/tests.rs b/src/librustc_interface/tests.rs
index ec75a1c6a3..1b80cf4e3d 100644
--- a/src/librustc_interface/tests.rs
+++ b/src/librustc_interface/tests.rs
@@ -18,7 +18,6 @@ use rustc_target::spec::{MergeFunctions, PanicStrategy, RelroLevel};
 use std::collections::{BTreeMap, BTreeSet};
 use std::iter::FromIterator;
 use std::path::PathBuf;
-use syntax;
 
 type CfgSpecs = FxHashSet<(String, Option<String>)>;
 
@@ -64,7 +63,7 @@ fn mk_map<K: Ord, V>(entries: Vec<(K, V)>) -> BTreeMap<K, V> {
 // When the user supplies --test we should implicitly supply --cfg test
 #[test]
 fn test_switch_implies_cfg_test() {
-    syntax::with_default_globals(|| {
+    rustc_ast::with_default_globals(|| {
         let matches = optgroups().parse(&["--test".to_string()]).unwrap();
         let (sess, cfg) = mk_session(matches);
         let cfg = build_configuration(&sess, to_crate_config(cfg));
@@ -75,7 +74,7 @@ fn test_switch_implies_cfg_test() {
 // When the user supplies --test and --cfg test, don't implicitly add another --cfg test
 #[test]
 fn test_switch_implies_cfg_test_unless_cfg_test() {
-    syntax::with_default_globals(|| {
+    rustc_ast::with_default_globals(|| {
         let matches = optgroups().parse(&["--test".to_string(), "--cfg=test".to_string()]).unwrap();
         let (sess, cfg) = mk_session(matches);
         let cfg = build_configuration(&sess, to_crate_config(cfg));
@@ -87,20 +86,20 @@ fn test_switch_implies_cfg_test_unless_cfg_test() {
 
 #[test]
 fn test_can_print_warnings() {
-    syntax::with_default_globals(|| {
+    rustc_ast::with_default_globals(|| {
         let matches = optgroups().parse(&["-Awarnings".to_string()]).unwrap();
         let (sess, _) = mk_session(matches);
         assert!(!sess.diagnostic().can_emit_warnings());
     });
 
-    syntax::with_default_globals(|| {
+    rustc_ast::with_default_globals(|| {
         let matches =
             optgroups().parse(&["-Awarnings".to_string(), "-Dwarnings".to_string()]).unwrap();
         let (sess, _) = mk_session(matches);
         assert!(sess.diagnostic().can_emit_warnings());
     });
 
-    syntax::with_default_globals(|| {
+    rustc_ast::with_default_globals(|| {
         let matches = optgroups().parse(&["-Adead_code".to_string()]).unwrap();
         let (sess, _) = mk_session(matches);
         assert!(sess.diagnostic().can_emit_warnings());
diff --git a/src/librustc_interface/util.rs b/src/librustc_interface/util.rs
index 3e65da9c47..7866ddbd4c 100644
--- a/src/librustc_interface/util.rs
+++ b/src/librustc_interface/util.rs
@@ -1,6 +1,11 @@
 use log::info;
 use rustc::lint;
 use rustc::ty;
+use rustc_ast::ast::{AttrVec, BlockCheckMode};
+use rustc_ast::mut_visit::{visit_clobber, MutVisitor, *};
+use rustc_ast::ptr::P;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
+use rustc_ast::{self, ast};
 use rustc_codegen_utils::codegen_backend::CodegenBackend;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
@@ -14,6 +19,7 @@ use rustc_resolve::{self, Resolver};
 use rustc_session as session;
 use rustc_session::config::{ErrorOutputType, Input, OutputFilenames};
 use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
+use rustc_session::parse::CrateConfig;
 use rustc_session::CrateDisambiguator;
 use rustc_session::{config, early_error, filesearch, DiagnosticOutput, Session};
 use rustc_span::edition::Edition;
@@ -28,11 +34,6 @@ use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, Once};
 #[cfg(not(parallel_compiler))]
 use std::{panic, thread};
-use syntax::ast::{AttrVec, BlockCheckMode};
-use syntax::mut_visit::{visit_clobber, MutVisitor, *};
-use syntax::ptr::P;
-use syntax::util::lev_distance::find_best_match_for_name;
-use syntax::{self, ast, attr};
 
 /// Adds `target_feature = "..."` cfgs for a variety of platform
 /// specific features (SSE, NEON etc.).
@@ -40,7 +41,7 @@ use syntax::{self, ast, attr};
 /// This is performed by checking whether a whitelisted set of
 /// features is available on the target machine, by querying LLVM.
 pub fn add_configuration(
-    cfg: &mut ast::CrateConfig,
+    cfg: &mut CrateConfig,
     sess: &Session,
     codegen_backend: &dyn CodegenBackend,
 ) {
@@ -146,7 +147,7 @@ pub fn spawn_thread_pool<F: FnOnce() -> R + Send, R: Send>(
     crate::callbacks::setup_callbacks();
 
     scoped_thread(cfg, || {
-        syntax::with_globals(edition, || {
+        rustc_ast::with_globals(edition, || {
             ty::tls::GCX_PTR.set(&Lock::new(0), || {
                 if let Some(stderr) = stderr {
                     io::set_panic(Some(box Sink(stderr.clone())));
@@ -182,15 +183,15 @@ pub fn spawn_thread_pool<F: FnOnce() -> R + Send, R: Send>(
 
     let with_pool = move |pool: &ThreadPool| pool.install(move || f());
 
-    syntax::with_globals(edition, || {
-        syntax::GLOBALS.with(|syntax_globals| {
+    rustc_ast::with_globals(edition, || {
+        rustc_ast::GLOBALS.with(|syntax_globals| {
             rustc_span::GLOBALS.with(|rustc_span_globals| {
                 // 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_ast::GLOBALS.set(syntax_globals, || {
                         rustc_span::GLOBALS.set(rustc_span_globals, || {
                             if let Some(stderr) = stderr {
                                 io::set_panic(Some(box Sink(stderr.clone())));
@@ -243,7 +244,7 @@ pub fn get_codegen_backend(sess: &Session) -> Box<dyn CodegenBackend> {
             .as_ref()
             .unwrap_or(&sess.target.target.options.codegen_backend);
         let backend = match &codegen_name[..] {
-            filename if filename.contains(".") => load_backend_from_dylib(filename.as_ref()),
+            filename if filename.contains('.') => load_backend_from_dylib(filename.as_ref()),
             codegen_name => get_builtin_codegen_backend(codegen_name),
         };
 
@@ -425,7 +426,7 @@ pub(crate) fn check_attr_crate_type(attrs: &[ast::Attribute], lint_buffer: &mut
     for a in attrs.iter() {
         if a.check_name(sym::crate_type) {
             if let Some(n) = a.value_str() {
-                if let Some(_) = categorize_crate_type(n) {
+                if categorize_crate_type(n).is_some() {
                     return;
                 }
 
@@ -547,7 +548,7 @@ pub fn build_output_filenames(
                 .opts
                 .crate_name
                 .clone()
-                .or_else(|| attr::find_crate_name(attrs).map(|n| n.to_string()))
+                .or_else(|| rustc_attr::find_crate_name(attrs).map(|n| n.to_string()))
                 .unwrap_or_else(|| input.filestem().to_owned());
 
             OutputFilenames::new(
@@ -619,8 +620,8 @@ impl<'a, 'b> ReplaceBodyWithLoop<'a, 'b> {
         ret
     }
 
-    fn should_ignore_fn(ret_ty: &ast::FunctionRetTy) -> bool {
-        if let ast::FunctionRetTy::Ty(ref ty) = ret_ty {
+    fn should_ignore_fn(ret_ty: &ast::FnRetTy) -> bool {
+        if let ast::FnRetTy::Ty(ref ty) = ret_ty {
             fn involves_impl_trait(ty: &ast::Ty) -> bool {
                 match ty.kind {
                     ast::TyKind::ImplTrait(..) => true,
@@ -638,7 +639,7 @@ impl<'a, 'b> ReplaceBodyWithLoop<'a, 'b> {
                                     ast::GenericArg::Type(ty) => Some(ty),
                                     _ => None,
                                 });
-                                any_involves_impl_trait(types.into_iter())
+                                any_involves_impl_trait(types)
                                     || data.constraints.iter().any(|c| match c.kind {
                                         ast::AssocTyConstraintKind::Bound { .. } => true,
                                         ast::AssocTyConstraintKind::Equality { ref ty } => {
@@ -667,7 +668,7 @@ impl<'a, 'b> ReplaceBodyWithLoop<'a, 'b> {
     }
 
     fn is_sig_const(sig: &ast::FnSig) -> bool {
-        sig.header.constness.node == ast::Constness::Const
+        matches!(sig.header.constness, ast::Const::Yes(_))
             || ReplaceBodyWithLoop::should_ignore_fn(&sig.decl.output)
     }
 }
@@ -676,22 +677,22 @@ impl<'a> MutVisitor for ReplaceBodyWithLoop<'a, '_> {
     fn visit_item_kind(&mut self, i: &mut ast::ItemKind) {
         let is_const = match i {
             ast::ItemKind::Static(..) | ast::ItemKind::Const(..) => true,
-            ast::ItemKind::Fn(ref sig, _, _) => Self::is_sig_const(sig),
+            ast::ItemKind::Fn(_, ref sig, _, _) => Self::is_sig_const(sig),
             _ => false,
         };
         self.run(is_const, |s| noop_visit_item_kind(i, s))
     }
 
-    fn flat_map_trait_item(&mut self, i: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_trait_item(&mut self, i: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         let is_const = match i.kind {
             ast::AssocItemKind::Const(..) => true,
-            ast::AssocItemKind::Fn(ref sig, _) => Self::is_sig_const(sig),
+            ast::AssocItemKind::Fn(_, ref sig, _, _) => Self::is_sig_const(sig),
             _ => false,
         };
         self.run(is_const, |s| noop_flat_map_assoc_item(i, s))
     }
 
-    fn flat_map_impl_item(&mut self, i: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_impl_item(&mut self, i: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         self.flat_map_trait_item(i)
     }
 
diff --git a/src/librustc_lexer/src/lib.rs b/src/librustc_lexer/src/lib.rs
index 969ce9b06e..25334461a1 100644
--- a/src/librustc_lexer/src/lib.rs
+++ b/src/librustc_lexer/src/lib.rs
@@ -35,7 +35,7 @@ impl Token {
     }
 }
 
-/// Enum represening common lexeme types.
+/// Enum representing common lexeme types.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub enum TokenKind {
     // Multi-char tokens:
diff --git a/src/librustc_lexer/src/unescape.rs b/src/librustc_lexer/src/unescape.rs
index 4f5e03d008..c51bf735fa 100644
--- a/src/librustc_lexer/src/unescape.rs
+++ b/src/librustc_lexer/src/unescape.rs
@@ -17,7 +17,7 @@ pub enum EscapeError {
 
     /// Escaped '\' character without continuation.
     LoneSlash,
-    /// Invalid escape characted (e.g. '\z').
+    /// Invalid escape character (e.g. '\z').
     InvalidEscape,
     /// Raw '\r' encountered.
     BareCarriageReturn,
@@ -43,7 +43,7 @@ pub enum EscapeError {
     UnclosedUnicodeEscape,
     /// '\u{_12}'
     LeadingUnderscoreUnicodeEscape,
-    /// More than 6 charactes in '\u{..}', e.g. '\u{10FFFF_FF}'
+    /// More than 6 characters in '\u{..}', e.g. '\u{10FFFF_FF}'
     OverlongUnicodeEscape,
     /// Invalid in-bound unicode character code, e.g. '\u{DFFF}'.
     LoneSurrogateUnicodeEscape,
diff --git a/src/librustc_lint/Cargo.toml b/src/librustc_lint/Cargo.toml
index 7e23e70577..6470d25fe0 100644
--- a/src/librustc_lint/Cargo.toml
+++ b/src/librustc_lint/Cargo.toml
@@ -12,12 +12,15 @@ path = "lib.rs"
 log = "0.4"
 unicode-security = "0.0.2"
 rustc = { path = "../librustc" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_feature = { path = "../librustc_feature" }
 rustc_index = { path = "../librustc_index" }
 rustc_session = { path = "../librustc_session" }
+rustc_infer = { path = "../librustc_infer" }
diff --git a/src/librustc_lint/array_into_iter.rs b/src/librustc_lint/array_into_iter.rs
index fb11b6771e..a91d735622 100644
--- a/src/librustc_lint/array_into_iter.rs
+++ b/src/librustc_lint/array_into_iter.rs
@@ -77,13 +77,13 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ArrayIntoIter {
                 // to an array or to a slice.
                 _ => bug!("array type coerced to something other than array or slice"),
             };
-            let msg = format!(
+            cx.struct_span_lint(ARRAY_INTO_ITER, *span, |lint| {
+                lint.build(&format!(
                 "this method call currently resolves to `<&{} as IntoIterator>::into_iter` (due \
                     to autoref coercions), but that might change in the future when \
                     `IntoIterator` impls for arrays are added.",
                 target,
-            );
-            cx.struct_span_lint(ARRAY_INTO_ITER, *span, &msg)
+                ))
                 .span_suggestion(
                     call.ident.span,
                     "use `.iter()` instead of `.into_iter()` to avoid ambiguity",
@@ -91,6 +91,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ArrayIntoIter {
                     Applicability::MachineApplicable,
                 )
                 .emit();
+            })
         }
     }
 }
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs
index c8d3d5f9c8..e1680015be 100644
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@ -23,8 +23,13 @@
 
 use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
 use rustc::hir::map::Map;
-use rustc::traits::misc::can_type_implement_copy;
+use rustc::lint::LintDiagnosticBuilder;
 use rustc::ty::{self, layout::VariantIdx, Ty, TyCtxt};
+use rustc_ast::ast::{self, Expr};
+use rustc_ast::attr::{self, HasAttrs};
+use rustc_ast::tokenstream::{TokenStream, TokenTree};
+use rustc_ast::visit::{FnCtxt, FnKind};
+use rustc_ast_pretty::pprust::{self, expr_to_string};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{Applicability, DiagnosticBuilder};
 use rustc_feature::Stability;
@@ -34,16 +39,12 @@ use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::DefId;
 use rustc_hir::{GenericParamKind, PatKind};
 use rustc_hir::{HirIdSet, Node};
+use rustc_infer::traits::misc::can_type_implement_copy;
 use rustc_session::lint::FutureIncompatibleInfo;
 use rustc_span::edition::Edition;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{BytePos, Span};
-use syntax::ast::{self, Expr};
-use syntax::attr::{self, HasAttrs};
-use syntax::print::pprust::{self, expr_to_string};
-use syntax::tokenstream::{TokenStream, TokenTree};
-use syntax::visit::FnKind;
 
 use crate::nonstandard_style::{method_context, MethodLateContext};
 
@@ -77,14 +78,16 @@ impl EarlyLintPass for WhileTrue {
                     if !lit.span.from_expansion() {
                         let msg = "denote infinite loops with `loop { ... }`";
                         let condition_span = cx.sess.source_map().def_span(e.span);
-                        cx.struct_span_lint(WHILE_TRUE, condition_span, msg)
-                            .span_suggestion_short(
-                                condition_span,
-                                "use `loop`",
-                                "loop".to_owned(),
-                                Applicability::MachineApplicable,
-                            )
-                            .emit();
+                        cx.struct_span_lint(WHILE_TRUE, condition_span, |lint| {
+                            lint.build(msg)
+                                .span_suggestion_short(
+                                    condition_span,
+                                    "use `loop`",
+                                    "loop".to_owned(),
+                                    Applicability::MachineApplicable,
+                                )
+                                .emit();
+                        })
                     }
                 }
             }
@@ -104,8 +107,9 @@ impl BoxPointers {
     fn check_heap_type(&self, cx: &LateContext<'_, '_>, span: Span, ty: Ty<'_>) {
         for leaf_ty in ty.walk() {
             if leaf_ty.is_box() {
-                let m = format!("type uses owned (Box type) pointers: {}", ty);
-                cx.span_lint(BOX_POINTERS, span, &m);
+                cx.struct_span_lint(BOX_POINTERS, span, |lint| {
+                    lint.build(&format!("type uses owned (Box type) pointers: {}", ty)).emit()
+                });
             }
         }
     }
@@ -174,29 +178,28 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonShorthandFieldPatterns {
                     if cx.tcx.find_field_index(ident, &variant)
                         == Some(cx.tcx.field_index(fieldpat.hir_id, cx.tables))
                     {
-                        let mut err = cx.struct_span_lint(
-                            NON_SHORTHAND_FIELD_PATTERNS,
-                            fieldpat.span,
-                            &format!("the `{}:` in this pattern is redundant", ident),
-                        );
-                        let binding = match binding_annot {
-                            hir::BindingAnnotation::Unannotated => None,
-                            hir::BindingAnnotation::Mutable => Some("mut"),
-                            hir::BindingAnnotation::Ref => Some("ref"),
-                            hir::BindingAnnotation::RefMut => Some("ref mut"),
-                        };
-                        let ident = if let Some(binding) = binding {
-                            format!("{} {}", binding, ident)
-                        } else {
-                            ident.to_string()
-                        };
-                        err.span_suggestion(
-                            fieldpat.span,
-                            "use shorthand field pattern",
-                            ident,
-                            Applicability::MachineApplicable,
-                        );
-                        err.emit();
+                        cx.struct_span_lint(NON_SHORTHAND_FIELD_PATTERNS, fieldpat.span, |lint| {
+                            let mut err = lint
+                                .build(&format!("the `{}:` in this pattern is redundant", ident));
+                            let binding = match binding_annot {
+                                hir::BindingAnnotation::Unannotated => None,
+                                hir::BindingAnnotation::Mutable => Some("mut"),
+                                hir::BindingAnnotation::Ref => Some("ref"),
+                                hir::BindingAnnotation::RefMut => Some("ref mut"),
+                            };
+                            let ident = if let Some(binding) = binding {
+                                format!("{} {}", binding, ident)
+                            } else {
+                                ident.to_string()
+                            };
+                            err.span_suggestion(
+                                fieldpat.span,
+                                "use shorthand field pattern",
+                                ident,
+                                Applicability::MachineApplicable,
+                            );
+                            err.emit();
+                        });
                     }
                 }
             }
@@ -213,26 +216,32 @@ declare_lint! {
 declare_lint_pass!(UnsafeCode => [UNSAFE_CODE]);
 
 impl UnsafeCode {
-    fn report_unsafe(&self, cx: &EarlyContext<'_>, span: Span, desc: &'static str) {
+    fn report_unsafe(
+        &self,
+        cx: &EarlyContext<'_>,
+        span: Span,
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    ) {
         // This comes from a macro that has `#[allow_internal_unsafe]`.
         if span.allows_unsafe() {
             return;
         }
 
-        cx.span_lint(UNSAFE_CODE, span, desc);
+        cx.struct_span_lint(UNSAFE_CODE, span, decorate);
     }
 }
 
 impl EarlyLintPass for UnsafeCode {
     fn check_attribute(&mut self, cx: &EarlyContext<'_>, attr: &ast::Attribute) {
         if attr.check_name(sym::allow_internal_unsafe) {
-            self.report_unsafe(
-                cx,
-                attr.span,
-                "`allow_internal_unsafe` allows defining \
+            self.report_unsafe(cx, attr.span, |lint| {
+                lint.build(
+                    "`allow_internal_unsafe` allows defining \
                                                macros using unsafe without triggering \
                                                the `unsafe_code` lint at their call site",
-            );
+                )
+                .emit()
+            });
         }
     }
 
@@ -240,53 +249,47 @@ impl EarlyLintPass for UnsafeCode {
         if let ast::ExprKind::Block(ref blk, _) = e.kind {
             // Don't warn about generated blocks; that'll just pollute the output.
             if blk.rules == ast::BlockCheckMode::Unsafe(ast::UserProvided) {
-                self.report_unsafe(cx, blk.span, "usage of an `unsafe` block");
+                self.report_unsafe(cx, blk.span, |lint| {
+                    lint.build("usage of an `unsafe` block").emit()
+                });
             }
         }
     }
 
     fn check_item(&mut self, cx: &EarlyContext<'_>, it: &ast::Item) {
         match it.kind {
-            ast::ItemKind::Trait(_, ast::Unsafety::Unsafe, ..) => {
-                self.report_unsafe(cx, it.span, "declaration of an `unsafe` trait")
+            ast::ItemKind::Trait(_, ast::Unsafe::Yes(_), ..) => {
+                self.report_unsafe(cx, it.span, |lint| {
+                    lint.build("declaration of an `unsafe` trait").emit()
+                })
             }
 
-            ast::ItemKind::Impl { unsafety: ast::Unsafety::Unsafe, .. } => {
-                self.report_unsafe(cx, it.span, "implementation of an `unsafe` trait")
+            ast::ItemKind::Impl { unsafety: ast::Unsafe::Yes(_), .. } => {
+                self.report_unsafe(cx, it.span, |lint| {
+                    lint.build("implementation of an `unsafe` trait").emit()
+                })
             }
 
             _ => return,
         }
     }
 
-    fn check_fn(
-        &mut self,
-        cx: &EarlyContext<'_>,
-        fk: FnKind<'_>,
-        _: &ast::FnDecl,
-        span: Span,
-        _: ast::NodeId,
-    ) {
-        match fk {
-            FnKind::ItemFn(_, ast::FnHeader { unsafety: ast::Unsafety::Unsafe, .. }, ..) => {
-                self.report_unsafe(cx, span, "declaration of an `unsafe` function")
-            }
-
-            FnKind::Method(_, sig, ..) => {
-                if sig.header.unsafety == ast::Unsafety::Unsafe {
-                    self.report_unsafe(cx, span, "implementation of an `unsafe` method")
-                }
-            }
-
-            _ => (),
-        }
-    }
-
-    fn check_trait_item(&mut self, cx: &EarlyContext<'_>, item: &ast::AssocItem) {
-        if let ast::AssocItemKind::Fn(ref sig, None) = item.kind {
-            if sig.header.unsafety == ast::Unsafety::Unsafe {
-                self.report_unsafe(cx, item.span, "declaration of an `unsafe` method")
-            }
+    fn check_fn(&mut self, cx: &EarlyContext<'_>, fk: FnKind<'_>, span: Span, _: ast::NodeId) {
+        if let FnKind::Fn(
+            ctxt,
+            _,
+            ast::FnSig { header: ast::FnHeader { unsafety: ast::Unsafe::Yes(_), .. }, .. },
+            _,
+            body,
+        ) = fk
+        {
+            let msg = match ctxt {
+                FnCtxt::Foreign => return,
+                FnCtxt::Free => "declaration of an `unsafe` function",
+                FnCtxt::Assoc(_) if body.is_none() => "declaration of an `unsafe` method",
+                FnCtxt::Assoc(_) => "implementation of an `unsafe` method",
+            };
+            self.report_unsafe(cx, span, |lint| lint.build(msg).emit());
         }
     }
 }
@@ -371,11 +374,9 @@ impl MissingDoc {
 
         let has_doc = attrs.iter().any(|a| has_doc(a));
         if !has_doc {
-            cx.span_lint(
-                MISSING_DOCS,
-                cx.tcx.sess.source_map().def_span(sp),
-                &format!("missing documentation for {}", desc),
-            );
+            cx.struct_span_lint(MISSING_DOCS, cx.tcx.sess.source_map().def_span(sp), |lint| {
+                lint.build(&format!("missing documentation for {}", desc)).emit()
+            });
         }
     }
 }
@@ -403,10 +404,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
         for macro_def in krate.exported_macros {
             let has_doc = macro_def.attrs.iter().any(|a| has_doc(a));
             if !has_doc {
-                cx.span_lint(
+                cx.struct_span_lint(
                     MISSING_DOCS,
                     cx.tcx.sess.source_map().def_span(macro_def.span),
-                    "missing documentation for macro",
+                    |lint| lint.build("missing documentation for macro").emit(),
                 );
             }
         }
@@ -554,12 +555,13 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingCopyImplementations {
             return;
         }
         if can_type_implement_copy(cx.tcx, param_env, ty).is_ok() {
-            cx.span_lint(
-                MISSING_COPY_IMPLEMENTATIONS,
-                item.span,
-                "type could implement `Copy`; consider adding `impl \
+            cx.struct_span_lint(MISSING_COPY_IMPLEMENTATIONS, item.span, |lint| {
+                lint.build(
+                    "type could implement `Copy`; consider adding `impl \
                           Copy`",
-            )
+                )
+                .emit()
+            })
         }
     }
 }
@@ -567,7 +569,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingCopyImplementations {
 declare_lint! {
     MISSING_DEBUG_IMPLEMENTATIONS,
     Allow,
-    "detects missing implementations of fmt::Debug"
+    "detects missing implementations of Debug"
 }
 
 #[derive(Default)]
@@ -608,12 +610,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDebugImplementations {
         }
 
         if !self.impling_types.as_ref().unwrap().contains(&item.hir_id) {
-            cx.span_lint(
-                MISSING_DEBUG_IMPLEMENTATIONS,
-                item.span,
-                "type does not implement `fmt::Debug`; consider adding `#[derive(Debug)]` \
-                          or a manual implementation",
-            )
+            cx.struct_span_lint(MISSING_DEBUG_IMPLEMENTATIONS, item.span, |lint| {
+                lint.build(&format!(
+                    "type does not implement `{}`; consider adding `#[derive(Debug)]` \
+                     or a manual implementation",
+                    cx.tcx.def_path_str(debug)
+                ))
+                .emit()
+            });
         }
     }
 }
@@ -636,33 +640,33 @@ declare_lint_pass!(
 impl EarlyLintPass for AnonymousParameters {
     fn check_trait_item(&mut self, cx: &EarlyContext<'_>, it: &ast::AssocItem) {
         match it.kind {
-            ast::AssocItemKind::Fn(ref sig, _) => {
+            ast::AssocItemKind::Fn(_, ref sig, _, _) => {
                 for arg in sig.decl.inputs.iter() {
                     match arg.pat.kind {
                         ast::PatKind::Ident(_, ident, None) => {
                             if ident.name == kw::Invalid {
-                                let ty_snip = cx.sess.source_map().span_to_snippet(arg.ty.span);
+                                cx.struct_span_lint(ANONYMOUS_PARAMETERS, arg.pat.span, |lint| {
+                                    let ty_snip = cx.sess.source_map().span_to_snippet(arg.ty.span);
 
-                                let (ty_snip, appl) = if let Ok(snip) = ty_snip {
-                                    (snip, Applicability::MachineApplicable)
-                                } else {
-                                    ("<type>".to_owned(), Applicability::HasPlaceholders)
-                                };
+                                    let (ty_snip, appl) = if let Ok(ref snip) = ty_snip {
+                                        (snip.as_str(), Applicability::MachineApplicable)
+                                    } else {
+                                        ("<type>", Applicability::HasPlaceholders)
+                                    };
 
-                                cx.struct_span_lint(
-                                    ANONYMOUS_PARAMETERS,
-                                    arg.pat.span,
-                                    "anonymous parameters are deprecated and will be \
+                                    lint.build(
+                                        "anonymous parameters are deprecated and will be \
                                      removed in the next edition.",
-                                )
-                                .span_suggestion(
-                                    arg.pat.span,
-                                    "try naming the parameter or explicitly \
-                                    ignoring it",
-                                    format!("_: {}", ty_snip),
-                                    appl,
-                                )
-                                .emit();
+                                    )
+                                    .span_suggestion(
+                                        arg.pat.span,
+                                        "try naming the parameter or explicitly \
+                                            ignoring it",
+                                        format!("_: {}", ty_snip),
+                                        appl,
+                                    )
+                                    .emit();
+                                })
                             }
                         }
                         _ => (),
@@ -696,14 +700,16 @@ fn lint_deprecated_attr(
     msg: &str,
     suggestion: Option<&str>,
 ) {
-    cx.struct_span_lint(DEPRECATED, attr.span, &msg)
-        .span_suggestion_short(
-            attr.span,
-            suggestion.unwrap_or("remove this attribute"),
-            String::new(),
-            Applicability::MachineApplicable,
-        )
-        .emit();
+    cx.struct_span_lint(DEPRECATED, attr.span, |lint| {
+        lint.build(msg)
+            .span_suggestion_short(
+                attr.span,
+                suggestion.unwrap_or("remove this attribute"),
+                String::new(),
+                Applicability::MachineApplicable,
+            )
+            .emit();
+    })
 }
 
 impl EarlyLintPass for DeprecatedAttr {
@@ -732,88 +738,59 @@ impl EarlyLintPass for DeprecatedAttr {
     }
 }
 
-declare_lint! {
-    pub UNUSED_DOC_COMMENTS,
-    Warn,
-    "detects doc comments that aren't used by rustdoc"
-}
+fn warn_if_doc(cx: &EarlyContext<'_>, node_span: Span, node_kind: &str, attrs: &[ast::Attribute]) {
+    let mut attrs = attrs.iter().peekable();
 
-declare_lint_pass!(UnusedDocComment => [UNUSED_DOC_COMMENTS]);
+    // Accumulate a single span for sugared doc comments.
+    let mut sugared_span: Option<Span> = None;
 
-impl UnusedDocComment {
-    fn warn_if_doc(
-        &self,
-        cx: &EarlyContext<'_>,
-        node_span: Span,
-        node_kind: &str,
-        is_macro_expansion: bool,
-        attrs: &[ast::Attribute],
-    ) {
-        let mut attrs = attrs.into_iter().peekable();
-
-        // Accumulate a single span for sugared doc comments.
-        let mut sugared_span: Option<Span> = None;
-
-        while let Some(attr) = attrs.next() {
-            if attr.is_doc_comment() {
-                sugared_span = Some(
-                    sugared_span.map_or_else(|| attr.span, |span| span.with_hi(attr.span.hi())),
-                );
-            }
-
-            if attrs.peek().map(|next_attr| next_attr.is_doc_comment()).unwrap_or_default() {
-                continue;
-            }
+    while let Some(attr) = attrs.next() {
+        if attr.is_doc_comment() {
+            sugared_span =
+                Some(sugared_span.map_or_else(|| attr.span, |span| span.with_hi(attr.span.hi())));
+        }
 
-            let span = sugared_span.take().unwrap_or_else(|| attr.span);
+        if attrs.peek().map(|next_attr| next_attr.is_doc_comment()).unwrap_or_default() {
+            continue;
+        }
 
-            if attr.is_doc_comment() || attr.check_name(sym::doc) {
-                let mut err = cx.struct_span_lint(UNUSED_DOC_COMMENTS, span, "unused doc comment");
+        let span = sugared_span.take().unwrap_or_else(|| attr.span);
 
+        if attr.is_doc_comment() || attr.check_name(sym::doc) {
+            cx.struct_span_lint(UNUSED_DOC_COMMENTS, span, |lint| {
+                let mut err = lint.build("unused doc comment");
                 err.span_label(
                     node_span,
                     format!("rustdoc does not generate documentation for {}", node_kind),
                 );
-
-                if is_macro_expansion {
-                    err.help(
-                        "to document an item produced by a macro, \
-                              the macro must produce the documentation as part of its expansion",
-                    );
-                }
-
                 err.emit();
-            }
+            });
         }
     }
 }
 
 impl EarlyLintPass for UnusedDocComment {
-    fn check_item(&mut self, cx: &EarlyContext<'_>, item: &ast::Item) {
-        if let ast::ItemKind::Mac(..) = item.kind {
-            self.warn_if_doc(cx, item.span, "macro expansions", true, &item.attrs);
-        }
-    }
-
     fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &ast::Stmt) {
-        let (kind, is_macro_expansion) = match stmt.kind {
-            ast::StmtKind::Local(..) => ("statements", false),
-            ast::StmtKind::Item(..) => ("inner items", false),
-            ast::StmtKind::Mac(..) => ("macro expansions", true),
+        let kind = match stmt.kind {
+            ast::StmtKind::Local(..) => "statements",
+            ast::StmtKind::Item(..) => "inner items",
             // expressions will be reported by `check_expr`.
-            ast::StmtKind::Semi(..) | ast::StmtKind::Expr(..) => return,
+            ast::StmtKind::Empty
+            | ast::StmtKind::Semi(_)
+            | ast::StmtKind::Expr(_)
+            | ast::StmtKind::Mac(_) => return,
         };
 
-        self.warn_if_doc(cx, stmt.span, kind, is_macro_expansion, stmt.kind.attrs());
+        warn_if_doc(cx, stmt.span, kind, stmt.kind.attrs());
     }
 
     fn check_arm(&mut self, cx: &EarlyContext<'_>, arm: &ast::Arm) {
         let arm_span = arm.pat.span.with_hi(arm.body.span.hi());
-        self.warn_if_doc(cx, arm_span, "match arms", false, &arm.attrs);
+        warn_if_doc(cx, arm_span, "match arms", &arm.attrs);
     }
 
     fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &ast::Expr) {
-        self.warn_if_doc(cx, expr.span, "expressions", false, &expr.attrs);
+        warn_if_doc(cx, expr.span, "expressions", &expr.attrs);
     }
 }
 
@@ -840,20 +817,20 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidNoMangleItems {
                         match param.kind {
                             GenericParamKind::Lifetime { .. } => {}
                             GenericParamKind::Type { .. } | GenericParamKind::Const { .. } => {
-                                let mut err = cx.struct_span_lint(
-                                    NO_MANGLE_GENERIC_ITEMS,
-                                    it.span,
-                                    "functions generic over types or consts must be mangled",
-                                );
-                                err.span_suggestion_short(
-                                    no_mangle_attr.span,
-                                    "remove this attribute",
-                                    String::new(),
-                                    // Use of `#[no_mangle]` suggests FFI intent; correct
-                                    // fix may be to monomorphize source by hand
-                                    Applicability::MaybeIncorrect,
-                                );
-                                err.emit();
+                                cx.struct_span_lint(NO_MANGLE_GENERIC_ITEMS, it.span, |lint| {
+                                    lint.build(
+                                        "functions generic over types or consts must be mangled",
+                                    )
+                                    .span_suggestion_short(
+                                        no_mangle_attr.span,
+                                        "remove this attribute",
+                                        String::new(),
+                                        // Use of `#[no_mangle]` suggests FFI intent; correct
+                                        // fix may be to monomorphize source by hand
+                                        Applicability::MaybeIncorrect,
+                                    )
+                                    .emit();
+                                });
                                 break;
                             }
                         }
@@ -864,26 +841,28 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidNoMangleItems {
                 if attr::contains_name(&it.attrs, sym::no_mangle) {
                     // Const items do not refer to a particular location in memory, and therefore
                     // don't have anything to attach a symbol to
-                    let msg = "const items should never be `#[no_mangle]`";
-                    let mut err = cx.struct_span_lint(NO_MANGLE_CONST_ITEMS, it.span, msg);
-
-                    // account for "pub const" (#45562)
-                    let start = cx
-                        .tcx
-                        .sess
-                        .source_map()
-                        .span_to_snippet(it.span)
-                        .map(|snippet| snippet.find("const").unwrap_or(0))
-                        .unwrap_or(0) as u32;
-                    // `const` is 5 chars
-                    let const_span = it.span.with_hi(BytePos(it.span.lo().0 + start + 5));
-                    err.span_suggestion(
-                        const_span,
-                        "try a static value",
-                        "pub static".to_owned(),
-                        Applicability::MachineApplicable,
-                    );
-                    err.emit();
+                    cx.struct_span_lint(NO_MANGLE_CONST_ITEMS, it.span, |lint| {
+                        let msg = "const items should never be `#[no_mangle]`";
+                        let mut err = lint.build(msg);
+
+                        // account for "pub const" (#45562)
+                        let start = cx
+                            .tcx
+                            .sess
+                            .source_map()
+                            .span_to_snippet(it.span)
+                            .map(|snippet| snippet.find("const").unwrap_or(0))
+                            .unwrap_or(0) as u32;
+                        // `const` is 5 chars
+                        let const_span = it.span.with_hi(BytePos(it.span.lo().0 + start + 5));
+                        err.span_suggestion(
+                            const_span,
+                            "try a static value",
+                            "pub static".to_owned(),
+                            Applicability::MachineApplicable,
+                        );
+                        err.emit();
+                    });
                 }
             }
             _ => {}
@@ -903,12 +882,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MutableTransmutes {
     fn check_expr(&mut self, cx: &LateContext<'_, '_>, expr: &hir::Expr<'_>) {
         use rustc_target::spec::abi::Abi::RustIntrinsic;
 
-        let msg = "mutating transmuted &mut T from &T may cause undefined behavior, \
-                   consider instead using an UnsafeCell";
         match get_transmute_from_to(cx, expr).map(|(ty1, ty2)| (&ty1.kind, &ty2.kind)) {
             Some((&ty::Ref(_, _, from_mt), &ty::Ref(_, _, to_mt))) => {
                 if to_mt == hir::Mutability::Mut && from_mt == hir::Mutability::Not {
-                    cx.span_lint(MUTABLE_TRANSMUTES, expr.span, msg);
+                    let msg = "mutating transmuted &mut T from &T may cause undefined behavior, \
+                               consider instead using an UnsafeCell";
+                    cx.struct_span_lint(MUTABLE_TRANSMUTES, expr.span, |lint| {
+                        lint.build(msg).emit()
+                    });
                 }
             }
             _ => (),
@@ -958,7 +939,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnstableFeatures {
         if attr.check_name(sym::feature) {
             if let Some(items) = attr.meta_item_list() {
                 for item in items {
-                    ctx.span_lint(UNSTABLE_FEATURES, item.span(), "unstable feature");
+                    ctx.struct_span_lint(UNSTABLE_FEATURES, item.span(), |lint| {
+                        lint.build("unstable feature").emit()
+                    });
                 }
             }
         }
@@ -993,28 +976,26 @@ impl UnreachablePub {
                     applicability = Applicability::MaybeIncorrect;
                 }
                 let def_span = cx.tcx.sess.source_map().def_span(span);
-                let mut err = cx.struct_span_lint(
-                    UNREACHABLE_PUB,
-                    def_span,
-                    &format!("unreachable `pub` {}", what),
-                );
-                let replacement = if cx.tcx.features().crate_visibility_modifier {
-                    "crate"
-                } else {
-                    "pub(crate)"
-                }
-                .to_owned();
+                cx.struct_span_lint(UNREACHABLE_PUB, def_span, |lint| {
+                    let mut err = lint.build(&format!("unreachable `pub` {}", what));
+                    let replacement = if cx.tcx.features().crate_visibility_modifier {
+                        "crate"
+                    } else {
+                        "pub(crate)"
+                    }
+                    .to_owned();
 
-                err.span_suggestion(
-                    vis.span,
-                    "consider restricting its visibility",
-                    replacement,
-                    applicability,
-                );
-                if exportable {
-                    err.help("or consider exporting it for use by other crates");
-                }
-                err.emit();
+                    err.span_suggestion(
+                        vis.span,
+                        "consider restricting its visibility",
+                        replacement,
+                        applicability,
+                    );
+                    if exportable {
+                        err.help("or consider exporting it for use by other crates");
+                    }
+                    err.emit();
+                });
             }
             _ => {}
         }
@@ -1123,28 +1104,30 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeAliasBounds {
         let mut suggested_changing_assoc_types = false;
         // There must not be a where clause
         if !type_alias_generics.where_clause.predicates.is_empty() {
-            let spans: Vec<_> = type_alias_generics
-                .where_clause
-                .predicates
-                .iter()
-                .map(|pred| pred.span())
-                .collect();
-            let mut err = cx.struct_span_lint(
+            cx.lint(
                 TYPE_ALIAS_BOUNDS,
-                spans,
-                "where clauses are not enforced in type aliases",
-            );
-            err.span_suggestion(
-                type_alias_generics.where_clause.span_for_predicates_or_empty_place(),
-                "the clause will not be checked when the type alias is used, and should be removed",
-                String::new(),
-                Applicability::MachineApplicable,
+                |lint| {
+                    let mut err = lint.build("where clauses are not enforced in type aliases");
+                    let spans: Vec<_> = type_alias_generics
+                        .where_clause
+                        .predicates
+                        .iter()
+                        .map(|pred| pred.span())
+                        .collect();
+                    err.set_span(spans);
+                    err.span_suggestion(
+                        type_alias_generics.where_clause.span_for_predicates_or_empty_place(),
+                        "the clause will not be checked when the type alias is used, and should be removed",
+                        String::new(),
+                        Applicability::MachineApplicable,
+                    );
+                    if !suggested_changing_assoc_types {
+                        TypeAliasBounds::suggest_changing_assoc_types(ty, &mut err);
+                        suggested_changing_assoc_types = true;
+                    }
+                    err.emit();
+                },
             );
-            if !suggested_changing_assoc_types {
-                TypeAliasBounds::suggest_changing_assoc_types(ty, &mut err);
-                suggested_changing_assoc_types = true;
-            }
-            err.emit();
         }
         // The parameters must not have bounds
         for param in type_alias_generics.params.iter() {
@@ -1157,19 +1140,18 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeAliasBounds {
                 })
                 .collect();
             if !spans.is_empty() {
-                let mut err = cx.struct_span_lint(
-                    TYPE_ALIAS_BOUNDS,
-                    spans,
-                    "bounds on generic parameters are not enforced in type aliases",
-                );
-                let msg = "the bound will not be checked when the type alias is used, \
-                           and should be removed";
-                err.multipart_suggestion(&msg, suggestion, Applicability::MachineApplicable);
-                if !suggested_changing_assoc_types {
-                    TypeAliasBounds::suggest_changing_assoc_types(ty, &mut err);
-                    suggested_changing_assoc_types = true;
-                }
-                err.emit();
+                cx.struct_span_lint(TYPE_ALIAS_BOUNDS, spans, |lint| {
+                    let mut err =
+                        lint.build("bounds on generic parameters are not enforced in type aliases");
+                    let msg = "the bound will not be checked when the type alias is used, \
+                                   and should be removed";
+                    err.multipart_suggestion(&msg, suggestion, Applicability::MachineApplicable);
+                    if !suggested_changing_assoc_types {
+                        TypeAliasBounds::suggest_changing_assoc_types(ty, &mut err);
+                        suggested_changing_assoc_types = true;
+                    }
+                    err.emit();
+                });
             }
         }
     }
@@ -1241,15 +1223,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TrivialConstraints {
                     ConstEvaluatable(..) => continue,
                 };
                 if predicate.is_global() {
-                    cx.span_lint(
-                        TRIVIAL_BOUNDS,
-                        span,
-                        &format!(
+                    cx.struct_span_lint(TRIVIAL_BOUNDS, span, |lint| {
+                        lint.build(&format!(
                             "{} bound {} does not depend on any type \
                                 or lifetime parameters",
                             predicate_kind_name, predicate
-                        ),
-                    );
+                        ))
+                        .emit()
+                    });
                 }
             }
         }
@@ -1326,28 +1307,32 @@ impl EarlyLintPass for EllipsisInclusiveRangePatterns {
             let suggestion = "use `..=` for an inclusive range";
             if parenthesise {
                 self.node_id = Some(pat.id);
-                let end = expr_to_string(&end);
-                let replace = match start {
-                    Some(start) => format!("&({}..={})", expr_to_string(&start), end),
-                    None => format!("&(..={})", end),
-                };
-                let mut err = cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, pat.span, msg);
-                err.span_suggestion(
-                    pat.span,
-                    suggestion,
-                    replace,
-                    Applicability::MachineApplicable,
-                );
-                err.emit();
+                cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, pat.span, |lint| {
+                    let end = expr_to_string(&end);
+                    let replace = match start {
+                        Some(start) => format!("&({}..={})", expr_to_string(&start), end),
+                        None => format!("&(..={})", end),
+                    };
+                    lint.build(msg)
+                        .span_suggestion(
+                            pat.span,
+                            suggestion,
+                            replace,
+                            Applicability::MachineApplicable,
+                        )
+                        .emit();
+                });
             } else {
-                let mut err = cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, join, msg);
-                err.span_suggestion_short(
-                    join,
-                    suggestion,
-                    "..=".to_owned(),
-                    Applicability::MachineApplicable,
-                );
-                err.emit();
+                cx.struct_span_lint(ELLIPSIS_INCLUSIVE_RANGE_PATTERNS, join, |lint| {
+                    lint.build(msg)
+                        .span_suggestion_short(
+                            join,
+                            suggestion,
+                            "..=".to_owned(),
+                            Applicability::MachineApplicable,
+                        )
+                        .emit();
+                });
             };
         }
     }
@@ -1393,7 +1378,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnnameableTestItems {
         }
 
         if let Some(attr) = attr::find_by_name(&it.attrs, sym::rustc_test_marker) {
-            cx.struct_span_lint(UNNAMEABLE_TEST_ITEMS, attr.span, "cannot test inner items").emit();
+            cx.struct_span_lint(UNNAMEABLE_TEST_ITEMS, attr.span, |lint| {
+                lint.build("cannot test inner items").emit()
+            });
         }
     }
 
@@ -1474,18 +1461,16 @@ impl KeywordIdents {
             return;
         }
 
-        let mut lint = cx.struct_span_lint(
-            KEYWORD_IDENTS,
-            ident.span,
-            &format!("`{}` is a keyword in the {} edition", ident, next_edition),
-        );
-        lint.span_suggestion(
-            ident.span,
-            "you can use a raw identifier to stay compatible",
-            format!("r#{}", ident),
-            Applicability::MachineApplicable,
-        );
-        lint.emit()
+        cx.struct_span_lint(KEYWORD_IDENTS, ident.span, |lint| {
+            lint.build(&format!("`{}` is a keyword in the {} edition", ident, next_edition))
+                .span_suggestion(
+                    ident.span,
+                    "you can use a raw identifier to stay compatible",
+                    format!("r#{}", ident),
+                    Applicability::MachineApplicable,
+                )
+                .emit()
+        });
     }
 }
 
@@ -1789,17 +1774,22 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ExplicitOutlivesRequirements {
             }
 
             if !lint_spans.is_empty() {
-                let mut err = cx.struct_span_lint(
-                    EXPLICIT_OUTLIVES_REQUIREMENTS,
-                    lint_spans.clone(),
-                    "outlives requirements can be inferred",
-                );
-                err.multipart_suggestion(
-                    if bound_count == 1 { "remove this bound" } else { "remove these bounds" },
-                    lint_spans.into_iter().map(|span| (span, "".to_owned())).collect::<Vec<_>>(),
-                    Applicability::MachineApplicable,
-                );
-                err.emit();
+                cx.struct_span_lint(EXPLICIT_OUTLIVES_REQUIREMENTS, lint_spans.clone(), |lint| {
+                    lint.build("outlives requirements can be inferred")
+                        .multipart_suggestion(
+                            if bound_count == 1 {
+                                "remove this bound"
+                            } else {
+                                "remove these bounds"
+                            },
+                            lint_spans
+                                .into_iter()
+                                .map(|span| (span, "".to_owned()))
+                                .collect::<Vec<_>>(),
+                            Applicability::MachineApplicable,
+                        )
+                        .emit();
+                });
             }
         }
     }
@@ -1826,15 +1816,13 @@ impl EarlyLintPass for IncompleteFeatures {
             .chain(features.declared_lib_features.iter().map(|(name, span)| (name, span)))
             .filter(|(name, _)| rustc_feature::INCOMPLETE_FEATURES.iter().any(|f| name == &f))
             .for_each(|(name, &span)| {
-                cx.struct_span_lint(
-                    INCOMPLETE_FEATURES,
-                    span,
-                    &format!(
+                cx.struct_span_lint(INCOMPLETE_FEATURES, span, |lint| {
+                    lint.build(&format!(
                         "the feature `{}` is incomplete and may cause the compiler to crash",
                         name,
-                    ),
-                )
-                .emit();
+                    ))
+                    .emit()
+                })
             });
     }
 }
@@ -1862,7 +1850,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidValue {
         /// Test if this constant is all-0.
         fn is_zero(expr: &hir::Expr<'_>) -> bool {
             use hir::ExprKind::*;
-            use syntax::ast::LitKind::*;
+            use rustc_ast::ast::LitKind::*;
             match &expr.kind {
                 Lit(lit) => {
                     if let Int(i, _) = lit.node {
@@ -1934,21 +1922,21 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidValue {
             use rustc::ty::TyKind::*;
             match ty.kind {
                 // Primitive types that don't like 0 as a value.
-                Ref(..) => Some((format!("references must be non-null"), None)),
-                Adt(..) if ty.is_box() => Some((format!("`Box` must be non-null"), None)),
-                FnPtr(..) => Some((format!("function pointers must be non-null"), None)),
-                Never => Some((format!("the `!` type has no valid value"), None)),
+                Ref(..) => Some(("references must be non-null".to_string(), None)),
+                Adt(..) if ty.is_box() => Some(("`Box` must be non-null".to_string(), None)),
+                FnPtr(..) => Some(("function pointers must be non-null".to_string(), None)),
+                Never => Some(("the `!` type has no valid value".to_string(), None)),
                 RawPtr(tm) if matches!(tm.ty.kind, Dynamic(..)) =>
                 // raw ptr to dyn Trait
                 {
-                    Some((format!("the vtable of a wide raw pointer must be non-null"), None))
+                    Some(("the vtable of a wide raw pointer must be non-null".to_string(), None))
                 }
                 // Primitive types with other constraints.
                 Bool if init == InitKind::Uninit => {
-                    Some((format!("booleans must be either `true` or `false`"), None))
+                    Some(("booleans must be either `true` or `false`".to_string(), None))
                 }
                 Char if init == InitKind::Uninit => {
-                    Some((format!("characters must be a valid Unicode codepoint"), None))
+                    Some(("characters must be a valid Unicode codepoint".to_string(), None))
                 }
                 // Recurse and checks for some compound types.
                 Adt(adt_def, substs) if !adt_def.is_union() => {
@@ -1976,7 +1964,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidValue {
                     }
                     // Now, recurse.
                     match adt_def.variants.len() {
-                        0 => Some((format!("enums with no variants have no valid value"), None)),
+                        0 => Some(("enums with no variants have no valid value".to_string(), None)),
                         1 => {
                             // Struct, or enum with exactly one variant.
                             // Proceed recursively, check all fields.
@@ -2024,30 +2012,28 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for InvalidValue {
             // We are extremely conservative with what we warn about.
             let conjured_ty = cx.tables.expr_ty(expr);
             if let Some((msg, span)) = ty_find_init_error(cx.tcx, conjured_ty, init) {
-                let mut err = cx.struct_span_lint(
-                    INVALID_VALUE,
-                    expr.span,
-                    &format!(
+                cx.struct_span_lint(INVALID_VALUE, expr.span, |lint| {
+                    let mut err = lint.build(&format!(
                         "the type `{}` does not permit {}",
                         conjured_ty,
                         match init {
                             InitKind::Zeroed => "zero-initialization",
                             InitKind::Uninit => "being left uninitialized",
                         },
-                    ),
-                );
-                err.span_label(expr.span, "this code causes undefined behavior when executed");
-                err.span_label(
-                    expr.span,
-                    "help: use `MaybeUninit<T>` instead, \
-                    and only call `assume_init` after initialization is done",
-                );
-                if let Some(span) = span {
-                    err.span_note(span, &msg);
-                } else {
-                    err.note(&msg);
-                }
-                err.emit();
+                    ));
+                    err.span_label(expr.span, "this code causes undefined behavior when executed");
+                    err.span_label(
+                        expr.span,
+                        "help: use `MaybeUninit<T>` instead, \
+                            and only call `assume_init` after initialization is done",
+                    );
+                    if let Some(span) = span {
+                        err.span_note(span, &msg);
+                    } else {
+                        err.note(&msg);
+                    }
+                    err.emit();
+                });
             }
         }
     }
diff --git a/src/librustc_lint/context.rs b/src/librustc_lint/context.rs
index 3b8cce5635..5b7b73b48e 100644
--- a/src/librustc_lint/context.rs
+++ b/src/librustc_lint/context.rs
@@ -20,21 +20,22 @@ use crate::levels::LintLevelsBuilder;
 use crate::passes::{EarlyLintPassObject, LateLintPassObject};
 use rustc::hir::map::definitions::{DefPathData, DisambiguatedDefPathData};
 use rustc::lint::add_elided_lifetime_in_path_suggestion;
+use rustc::lint::LintDiagnosticBuilder;
 use rustc::middle::privacy::AccessLevels;
 use rustc::middle::stability;
 use rustc::ty::layout::{LayoutError, LayoutOf, TyLayout};
 use rustc::ty::{self, print::Printer, subst::GenericArg, Ty, TyCtxt};
+use rustc_ast::ast;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::sync;
-use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
+use rustc_errors::{struct_span_err, Applicability};
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_session::lint::BuiltinLintDiagnostics;
 use rustc_session::lint::{FutureIncompatibleInfo, Level, Lint, LintBuffer, LintId};
 use rustc_session::Session;
 use rustc_span::{symbol::Symbol, MultiSpan, Span, DUMMY_SP};
-use syntax::ast;
-use syntax::util::lev_distance::find_best_match_for_name;
 
 use std::slice;
 
@@ -334,7 +335,7 @@ impl LintStore {
             lint_name.to_string()
         };
         // If the lint was scoped with `tool::` check if the tool lint exists
-        if let Some(_) = tool_name {
+        if tool_name.is_some() {
             match self.by_name.get(&complete_name) {
                 None => match self.lint_groups.get(&*complete_name) {
                     None => return CheckLintNameResult::Tool(Err((None, String::new()))),
@@ -368,7 +369,7 @@ impl LintStore {
                         return if *silent {
                             CheckLintNameResult::Ok(&lint_ids)
                         } else {
-                            CheckLintNameResult::Tool(Err((Some(&lint_ids), name.to_string())))
+                            CheckLintNameResult::Tool(Err((Some(&lint_ids), (*name).to_string())))
                         };
                     }
                     CheckLintNameResult::Ok(&lint_ids)
@@ -403,7 +404,7 @@ impl LintStore {
                         return if *silent {
                             CheckLintNameResult::Tool(Err((Some(&lint_ids), complete_name)))
                         } else {
-                            CheckLintNameResult::Tool(Err((Some(&lint_ids), name.to_string())))
+                            CheckLintNameResult::Tool(Err((Some(&lint_ids), (*name).to_string())))
                         };
                     }
                     CheckLintNameResult::Tool(Err((Some(&lint_ids), complete_name)))
@@ -473,150 +474,128 @@ pub trait LintContext: Sized {
     fn sess(&self) -> &Session;
     fn lints(&self) -> &LintStore;
 
-    fn lookup_and_emit<S: Into<MultiSpan>>(&self, lint: &'static Lint, span: Option<S>, msg: &str) {
-        self.lookup(lint, span, msg).emit();
-    }
-
-    fn lookup_and_emit_with_diagnostics<S: Into<MultiSpan>>(
+    fn lookup_with_diagnostics(
         &self,
         lint: &'static Lint,
-        span: Option<S>,
-        msg: &str,
+        span: Option<impl Into<MultiSpan>>,
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
         diagnostic: BuiltinLintDiagnostics,
     ) {
-        let mut db = self.lookup(lint, span, msg);
-
-        let sess = self.sess();
-        match diagnostic {
-            BuiltinLintDiagnostics::Normal => (),
-            BuiltinLintDiagnostics::BareTraitObject(span, is_global) => {
-                let (sugg, app) = match sess.source_map().span_to_snippet(span) {
-                    Ok(s) if is_global => {
-                        (format!("dyn ({})", s), Applicability::MachineApplicable)
-                    }
-                    Ok(s) => (format!("dyn {}", s), Applicability::MachineApplicable),
-                    Err(_) => ("dyn <type>".to_string(), Applicability::HasPlaceholders),
-                };
-                db.span_suggestion(span, "use `dyn`", sugg, app);
-            }
-            BuiltinLintDiagnostics::AbsPathWithModule(span) => {
-                let (sugg, app) = match sess.source_map().span_to_snippet(span) {
-                    Ok(ref s) => {
-                        // FIXME(Manishearth) ideally the emitting code
-                        // can tell us whether or not this is global
-                        let opt_colon = if s.trim_start().starts_with("::") { "" } else { "::" };
-
-                        (format!("crate{}{}", opt_colon, s), Applicability::MachineApplicable)
-                    }
-                    Err(_) => ("crate::<path>".to_string(), Applicability::HasPlaceholders),
-                };
-                db.span_suggestion(span, "use `crate`", sugg, app);
-            }
-            BuiltinLintDiagnostics::ProcMacroDeriveResolutionFallback(span) => {
-                db.span_label(
-                    span,
-                    "names from parent modules are not accessible without an explicit import",
-                );
-            }
-            BuiltinLintDiagnostics::MacroExpandedMacroExportsAccessedByAbsolutePaths(span_def) => {
-                db.span_note(span_def, "the macro is defined here");
-            }
-            BuiltinLintDiagnostics::ElidedLifetimesInPaths(
-                n,
-                path_span,
-                incl_angl_brckt,
-                insertion_span,
-                anon_lts,
-            ) => {
-                add_elided_lifetime_in_path_suggestion(
-                    sess,
-                    &mut db,
+        self.lookup(lint, span, |lint| {
+            // We first generate a blank diagnostic.
+            let mut db = lint.build("");
+
+            // Now, set up surrounding context.
+            let sess = self.sess();
+            match diagnostic {
+                BuiltinLintDiagnostics::Normal => (),
+                BuiltinLintDiagnostics::BareTraitObject(span, is_global) => {
+                    let (sugg, app) = match sess.source_map().span_to_snippet(span) {
+                        Ok(s) if is_global => {
+                            (format!("dyn ({})", s), Applicability::MachineApplicable)
+                        }
+                        Ok(s) => (format!("dyn {}", s), Applicability::MachineApplicable),
+                        Err(_) => ("dyn <type>".to_string(), Applicability::HasPlaceholders),
+                    };
+                    db.span_suggestion(span, "use `dyn`", sugg, app);
+                }
+                BuiltinLintDiagnostics::AbsPathWithModule(span) => {
+                    let (sugg, app) = match sess.source_map().span_to_snippet(span) {
+                        Ok(ref s) => {
+                            // FIXME(Manishearth) ideally the emitting code
+                            // can tell us whether or not this is global
+                            let opt_colon =
+                                if s.trim_start().starts_with("::") { "" } else { "::" };
+
+                            (format!("crate{}{}", opt_colon, s), Applicability::MachineApplicable)
+                        }
+                        Err(_) => ("crate::<path>".to_string(), Applicability::HasPlaceholders),
+                    };
+                    db.span_suggestion(span, "use `crate`", sugg, app);
+                }
+                BuiltinLintDiagnostics::ProcMacroDeriveResolutionFallback(span) => {
+                    db.span_label(
+                        span,
+                        "names from parent modules are not accessible without an explicit import",
+                    );
+                }
+                BuiltinLintDiagnostics::MacroExpandedMacroExportsAccessedByAbsolutePaths(
+                    span_def,
+                ) => {
+                    db.span_note(span_def, "the macro is defined here");
+                }
+                BuiltinLintDiagnostics::ElidedLifetimesInPaths(
                     n,
                     path_span,
                     incl_angl_brckt,
                     insertion_span,
                     anon_lts,
-                );
-            }
-            BuiltinLintDiagnostics::UnknownCrateTypes(span, note, sugg) => {
-                db.span_suggestion(span, &note, sugg, Applicability::MaybeIncorrect);
-            }
-            BuiltinLintDiagnostics::UnusedImports(message, replaces) => {
-                if !replaces.is_empty() {
-                    db.tool_only_multipart_suggestion(
-                        &message,
-                        replaces,
-                        Applicability::MachineApplicable,
+                ) => {
+                    add_elided_lifetime_in_path_suggestion(
+                        sess,
+                        &mut db,
+                        n,
+                        path_span,
+                        incl_angl_brckt,
+                        insertion_span,
+                        anon_lts,
                     );
                 }
-            }
-            BuiltinLintDiagnostics::RedundantImport(spans, ident) => {
-                for (span, is_imported) in spans {
-                    let introduced = if is_imported { "imported" } else { "defined" };
-                    db.span_label(
-                        span,
-                        format!("the item `{}` is already {} here", ident, introduced),
-                    );
+                BuiltinLintDiagnostics::UnknownCrateTypes(span, note, sugg) => {
+                    db.span_suggestion(span, &note, sugg, Applicability::MaybeIncorrect);
+                }
+                BuiltinLintDiagnostics::UnusedImports(message, replaces) => {
+                    if !replaces.is_empty() {
+                        db.tool_only_multipart_suggestion(
+                            &message,
+                            replaces,
+                            Applicability::MachineApplicable,
+                        );
+                    }
+                }
+                BuiltinLintDiagnostics::RedundantImport(spans, ident) => {
+                    for (span, is_imported) in spans {
+                        let introduced = if is_imported { "imported" } else { "defined" };
+                        db.span_label(
+                            span,
+                            format!("the item `{}` is already {} here", ident, introduced),
+                        );
+                    }
+                }
+                BuiltinLintDiagnostics::DeprecatedMacro(suggestion, span) => {
+                    stability::deprecation_suggestion(&mut db, suggestion, span)
+                }
+                BuiltinLintDiagnostics::UnusedDocComment(span) => {
+                    db.span_label(span, "rustdoc does not generate documentation for macros");
+                    db.help("to document an item produced by a macro, \
+                                  the macro must produce the documentation as part of its expansion");
                 }
             }
-            BuiltinLintDiagnostics::DeprecatedMacro(suggestion, span) => {
-                stability::deprecation_suggestion(&mut db, suggestion, span)
-            }
-        }
-
-        db.emit();
+            // Rewrap `db`, and pass control to the user.
+            decorate(LintDiagnosticBuilder::new(db));
+        });
     }
 
+    // FIXME: These methods should not take an Into<MultiSpan> -- instead, callers should need to
+    // set the span in their `decorate` function (preferably using set_span).
     fn lookup<S: Into<MultiSpan>>(
         &self,
         lint: &'static Lint,
         span: Option<S>,
-        msg: &str,
-    ) -> DiagnosticBuilder<'_>;
-
-    /// Emit a lint at the appropriate level, for a particular span.
-    fn span_lint<S: Into<MultiSpan>>(&self, lint: &'static Lint, span: S, msg: &str) {
-        self.lookup_and_emit(lint, Some(span), msg);
-    }
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    );
 
     fn struct_span_lint<S: Into<MultiSpan>>(
         &self,
         lint: &'static Lint,
         span: S,
-        msg: &str,
-    ) -> DiagnosticBuilder<'_> {
-        self.lookup(lint, Some(span), msg)
-    }
-
-    /// Emit a lint and note at the appropriate level, for a particular span.
-    fn span_lint_note(
-        &self,
-        lint: &'static Lint,
-        span: Span,
-        msg: &str,
-        note_span: Span,
-        note: &str,
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
     ) {
-        let mut err = self.lookup(lint, Some(span), msg);
-        if note_span == span {
-            err.note(note);
-        } else {
-            err.span_note(note_span, note);
-        }
-        err.emit();
-    }
-
-    /// Emit a lint and help at the appropriate level, for a particular span.
-    fn span_lint_help(&self, lint: &'static Lint, span: Span, msg: &str, help: &str) {
-        let mut err = self.lookup(lint, Some(span), msg);
-        self.span_lint(lint, span, msg);
-        err.span_help(span, help);
-        err.emit();
+        self.lookup(lint, Some(span), decorate);
     }
-
     /// Emit a lint at the appropriate level, with no associated span.
-    fn lint(&self, lint: &'static Lint, msg: &str) {
-        self.lookup_and_emit(lint, None as Option<Span>, msg);
+    fn lint(&self, lint: &'static Lint, decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>)) {
+        self.lookup(lint, None as Option<Span>, decorate);
     }
 }
 
@@ -654,13 +633,13 @@ impl LintContext for LateContext<'_, '_> {
         &self,
         lint: &'static Lint,
         span: Option<S>,
-        msg: &str,
-    ) -> DiagnosticBuilder<'_> {
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    ) {
         let hir_id = self.last_node_with_lint_attrs;
 
         match span {
-            Some(s) => self.tcx.struct_span_lint_hir(lint, hir_id, s, msg),
-            None => self.tcx.struct_lint_node(lint, hir_id, msg),
+            Some(s) => self.tcx.struct_span_lint_hir(lint, hir_id, s, decorate),
+            None => self.tcx.struct_lint_node(lint, hir_id, decorate),
         }
     }
 }
@@ -681,9 +660,9 @@ impl LintContext for EarlyContext<'_> {
         &self,
         lint: &'static Lint,
         span: Option<S>,
-        msg: &str,
-    ) -> DiagnosticBuilder<'_> {
-        self.builder.struct_lint(lint, span.map(|s| s.into()), msg)
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    ) {
+        self.builder.struct_lint(lint, span.map(|s| s.into()), decorate)
     }
 }
 
diff --git a/src/librustc_lint/early.rs b/src/librustc_lint/early.rs
index 490114b2d4..ff6e9e000b 100644
--- a/src/librustc_lint/early.rs
+++ b/src/librustc_lint/early.rs
@@ -16,11 +16,11 @@
 
 use crate::context::{EarlyContext, LintContext, LintStore};
 use crate::passes::{EarlyLintPass, EarlyLintPassObject};
+use rustc_ast::ast;
+use rustc_ast::visit as ast_visit;
 use rustc_session::lint::{LintBuffer, LintPass};
 use rustc_session::Session;
 use rustc_span::Span;
-use syntax::ast;
-use syntax::visit as ast_visit;
 
 use log::debug;
 use std::slice;
@@ -37,11 +37,18 @@ struct EarlyContextAndPass<'a, T: EarlyLintPass> {
 impl<'a, T: EarlyLintPass> EarlyContextAndPass<'a, T> {
     fn check_id(&mut self, id: ast::NodeId) {
         for early_lint in self.context.buffered.take(id) {
-            self.context.lookup_and_emit_with_diagnostics(
-                early_lint.lint_id.lint,
-                Some(early_lint.span.clone()),
-                &early_lint.msg,
-                early_lint.diagnostic,
+            let rustc_session::lint::BufferedEarlyLint {
+                span,
+                msg,
+                node_id: _,
+                lint_id,
+                diagnostic,
+            } = early_lint;
+            self.context.lookup_with_diagnostics(
+                lint_id.lint,
+                Some(span),
+                |lint| lint.build(&msg).emit(),
+                diagnostic,
             );
         }
     }
@@ -116,17 +123,11 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
         ast_visit::walk_stmt(self, s);
     }
 
-    fn visit_fn(
-        &mut self,
-        fk: ast_visit::FnKind<'a>,
-        decl: &'a ast::FnDecl,
-        span: Span,
-        id: ast::NodeId,
-    ) {
-        run_early_pass!(self, check_fn, fk, decl, span, id);
+    fn visit_fn(&mut self, fk: ast_visit::FnKind<'a>, span: Span, id: ast::NodeId) {
+        run_early_pass!(self, check_fn, fk, span, id);
         self.check_id(id);
-        ast_visit::walk_fn(self, fk, decl, span);
-        run_early_pass!(self, check_fn_post, fk, decl, span, id);
+        ast_visit::walk_fn(self, fk, span);
+        run_early_pass!(self, check_fn_post, fk, span, id);
     }
 
     fn visit_variant_data(&mut self, s: &'a ast::VariantData) {
@@ -213,19 +214,18 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
         ast_visit::walk_poly_trait_ref(self, t, m);
     }
 
-    fn visit_trait_item(&mut self, trait_item: &'a ast::AssocItem) {
-        self.with_lint_attrs(trait_item.id, &trait_item.attrs, |cx| {
-            run_early_pass!(cx, check_trait_item, trait_item);
-            ast_visit::walk_trait_item(cx, trait_item);
-            run_early_pass!(cx, check_trait_item_post, trait_item);
-        });
-    }
-
-    fn visit_impl_item(&mut self, impl_item: &'a ast::AssocItem) {
-        self.with_lint_attrs(impl_item.id, &impl_item.attrs, |cx| {
-            run_early_pass!(cx, check_impl_item, impl_item);
-            ast_visit::walk_impl_item(cx, impl_item);
-            run_early_pass!(cx, check_impl_item_post, impl_item);
+    fn visit_assoc_item(&mut self, item: &'a ast::AssocItem, ctxt: ast_visit::AssocCtxt) {
+        self.with_lint_attrs(item.id, &item.attrs, |cx| match ctxt {
+            ast_visit::AssocCtxt::Trait => {
+                run_early_pass!(cx, check_trait_item, item);
+                ast_visit::walk_assoc_item(cx, item, ctxt);
+                run_early_pass!(cx, check_trait_item_post, item);
+            }
+            ast_visit::AssocCtxt::Impl => {
+                run_early_pass!(cx, check_impl_item, item);
+                ast_visit::walk_assoc_item(cx, item, ctxt);
+                run_early_pass!(cx, check_impl_item_post, item);
+            }
         });
     }
 
@@ -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
@@ -349,10 +349,8 @@ pub fn check_ast_crate<T: EarlyLintPass>(
         }
     } else {
         for pass in &mut passes {
-            buffered = sess
-                .prof
-                .extra_verbose_generic_activity(&format!("running lint: {}", pass.name()))
-                .run(|| {
+            buffered =
+                sess.prof.extra_verbose_generic_activity("run_lint", pass.name()).run(|| {
                     early_lint_crate(
                         sess,
                         lint_store,
diff --git a/src/librustc_lint/internal.rs b/src/librustc_lint/internal.rs
index 8480c85075..db109aef6e 100644
--- a/src/librustc_lint/internal.rs
+++ b/src/librustc_lint/internal.rs
@@ -2,13 +2,13 @@
 //! Clippy.
 
 use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
+use rustc_ast::ast::{Ident, Item, ItemKind};
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::Applicability;
 use rustc_hir::{GenericArg, HirId, MutTy, Mutability, Path, PathSegment, QPath, Ty, TyKind};
 use rustc_session::{declare_lint_pass, declare_tool_lint, impl_lint_pass};
 use rustc_span::hygiene::{ExpnKind, MacroKind};
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast::{Ident, Item, ItemKind};
 
 declare_tool_lint! {
     pub rustc::DEFAULT_HASH_TYPES,
@@ -37,16 +37,22 @@ impl_lint_pass!(DefaultHashTypes => [DEFAULT_HASH_TYPES]);
 impl EarlyLintPass for DefaultHashTypes {
     fn check_ident(&mut self, cx: &EarlyContext<'_>, ident: Ident) {
         if let Some(replace) = self.map.get(&ident.name) {
-            let msg = format!("Prefer {} over {}, it has better performance", replace, ident);
-            let mut db = cx.struct_span_lint(DEFAULT_HASH_TYPES, ident.span, &msg);
-            db.span_suggestion(
-                ident.span,
-                "use",
-                replace.to_string(),
-                Applicability::MaybeIncorrect, // FxHashMap, ... needs another import
-            );
-            db.note(&format!("a `use rustc_data_structures::fx::{}` may be necessary", replace))
-                .emit();
+            cx.struct_span_lint(DEFAULT_HASH_TYPES, ident.span, |lint| {
+                // FIXME: We can avoid a copy here. Would require us to take String instead of &str.
+                let msg = format!("Prefer {} over {}, it has better performance", replace, ident);
+                lint.build(&msg)
+                    .span_suggestion(
+                        ident.span,
+                        "use",
+                        replace.to_string(),
+                        Applicability::MaybeIncorrect, // FxHashMap, ... needs another import
+                    )
+                    .note(&format!(
+                        "a `use rustc_data_structures::fx::{}` may be necessary",
+                        replace
+                    ))
+                    .emit();
+            });
         }
     }
 }
@@ -85,14 +91,16 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TyTyKind {
         if let Some(last) = segments.last() {
             let span = path.span.with_hi(last.ident.span.hi());
             if lint_ty_kind_usage(cx, last) {
-                cx.struct_span_lint(USAGE_OF_TY_TYKIND, span, "usage of `ty::TyKind::<kind>`")
-                    .span_suggestion(
-                        span,
-                        "try using ty::<kind> directly",
-                        "ty".to_string(),
-                        Applicability::MaybeIncorrect, // ty maybe needs an import
-                    )
-                    .emit();
+                cx.struct_span_lint(USAGE_OF_TY_TYKIND, span, |lint| {
+                    lint.build("usage of `ty::TyKind::<kind>`")
+                        .span_suggestion(
+                            span,
+                            "try using ty::<kind> directly",
+                            "ty".to_string(),
+                            Applicability::MaybeIncorrect, // ty maybe needs an import
+                        )
+                        .emit();
+                })
             }
         }
     }
@@ -103,32 +111,28 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TyTyKind {
                 if let QPath::Resolved(_, path) = qpath {
                     if let Some(last) = path.segments.iter().last() {
                         if lint_ty_kind_usage(cx, last) {
-                            cx.struct_span_lint(
-                                USAGE_OF_TY_TYKIND,
-                                path.span,
-                                "usage of `ty::TyKind`",
-                            )
-                            .help("try using `Ty` instead")
-                            .emit();
+                            cx.struct_span_lint(USAGE_OF_TY_TYKIND, path.span, |lint| {
+                                lint.build("usage of `ty::TyKind`")
+                                    .help("try using `Ty` instead")
+                                    .emit();
+                            })
                         } else {
                             if ty.span.from_expansion() {
                                 return;
                             }
                             if let Some(t) = is_ty_or_ty_ctxt(cx, ty) {
                                 if path.segments.len() > 1 {
-                                    cx.struct_span_lint(
-                                        USAGE_OF_QUALIFIED_TY,
-                                        path.span,
-                                        &format!("usage of qualified `ty::{}`", t),
-                                    )
-                                    .span_suggestion(
-                                        path.span,
-                                        "try using it unqualified",
-                                        t,
-                                        // The import probably needs to be changed
-                                        Applicability::MaybeIncorrect,
-                                    )
-                                    .emit();
+                                    cx.struct_span_lint(USAGE_OF_QUALIFIED_TY, path.span, |lint| {
+                                        lint.build(&format!("usage of qualified `ty::{}`", t))
+                                            .span_suggestion(
+                                                path.span,
+                                                "try using it unqualified",
+                                                t,
+                                                // The import probably needs to be changed
+                                                Applicability::MaybeIncorrect,
+                                            )
+                                            .emit();
+                                    })
                                 }
                             }
                         }
@@ -142,19 +146,17 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TyTyKind {
                     }
                 }
                 if let Some(t) = is_ty_or_ty_ctxt(cx, &inner_ty) {
-                    cx.struct_span_lint(
-                        TY_PASS_BY_REFERENCE,
-                        ty.span,
-                        &format!("passing `{}` by reference", t),
-                    )
-                    .span_suggestion(
-                        ty.span,
-                        "try passing by value",
-                        t,
-                        // Changing type of function argument
-                        Applicability::MaybeIncorrect,
-                    )
-                    .emit();
+                    cx.struct_span_lint(TY_PASS_BY_REFERENCE, ty.span, |lint| {
+                        lint.build(&format!("passing `{}` by reference", t))
+                            .span_suggestion(
+                                ty.span,
+                                "try passing by value",
+                                t,
+                                // Changing type of function argument
+                                Applicability::MaybeIncorrect,
+                            )
+                            .emit();
+                    })
                 }
             }
             _ => {}
@@ -234,10 +236,12 @@ impl EarlyLintPass for LintPassImpl {
                         cx.struct_span_lint(
                             LINT_PASS_IMPL_WITHOUT_MACRO,
                             lint_pass.path.span,
-                            "implementing `LintPass` by hand",
+                            |lint| {
+                                lint.build("implementing `LintPass` by hand")
+                                    .help("try using `declare_lint_pass!` or `impl_lint_pass!` instead")
+                                    .emit();
+                            },
                         )
-                        .help("try using `declare_lint_pass!` or `impl_lint_pass!` instead")
-                        .emit();
                     }
                 }
             }
diff --git a/src/librustc_lint/late.rs b/src/librustc_lint/late.rs
index 30a3788377..ee03232a0c 100644
--- a/src/librustc_lint/late.rs
+++ b/src/librustc_lint/late.rs
@@ -17,6 +17,8 @@
 use crate::{passes::LateLintPassObject, LateContext, LateLintPass, LintStore};
 use rustc::hir::map::Map;
 use rustc::ty::{self, TyCtxt};
+use rustc_ast::ast;
+use rustc_ast::walk_list;
 use rustc_data_structures::sync::{join, par_iter, ParallelIterator};
 use rustc_hir as hir;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
@@ -24,8 +26,6 @@ use rustc_hir::intravisit as hir_visit;
 use rustc_hir::intravisit::Visitor;
 use rustc_session::lint::LintPass;
 use rustc_span::Span;
-use syntax::ast;
-use syntax::walk_list;
 
 use log::debug;
 use std::any::Any;
@@ -441,27 +441,20 @@ fn late_lint_crate<'tcx, T: for<'a> LateLintPass<'a, 'tcx>>(tcx: TyCtxt<'tcx>, b
         late_lint_pass_crate(tcx, builtin_lints);
     } else {
         for pass in &mut passes {
-            tcx.sess
-                .prof
-                .extra_verbose_generic_activity(&format!("running late lint: {}", pass.name()))
-                .run(|| {
-                    late_lint_pass_crate(tcx, LateLintPassObjects { lints: slice::from_mut(pass) });
-                });
+            tcx.sess.prof.extra_verbose_generic_activity("run_late_lint", pass.name()).run(|| {
+                late_lint_pass_crate(tcx, LateLintPassObjects { lints: slice::from_mut(pass) });
+            });
         }
 
         let mut passes: Vec<_> =
             unerased_lint_store(tcx).late_module_passes.iter().map(|pass| (pass)()).collect();
 
         for pass in &mut passes {
-            tcx.sess
-                .prof
-                .extra_verbose_generic_activity(&format!(
-                    "running late module lint: {}",
-                    pass.name()
-                ))
-                .run(|| {
+            tcx.sess.prof.extra_verbose_generic_activity("run_late_module_lint", pass.name()).run(
+                || {
                     late_lint_pass_crate(tcx, LateLintPassObjects { lints: slice::from_mut(pass) });
-                });
+                },
+            );
         }
     }
 }
diff --git a/src/librustc_lint/levels.rs b/src/librustc_lint/levels.rs
index d5bbdc5316..e0db2ae64f 100644
--- a/src/librustc_lint/levels.rs
+++ b/src/librustc_lint/levels.rs
@@ -1,24 +1,24 @@
 use crate::context::{CheckLintNameResult, LintStore};
 use crate::late::unerased_lint_store;
 use rustc::hir::map::Map;
-use rustc::lint::struct_lint_level;
-use rustc::lint::{LintLevelMap, LintLevelSets, LintSet, LintSource};
+use rustc::lint::LintDiagnosticBuilder;
+use rustc::lint::{struct_lint_level, LintLevelMap, LintLevelSets, LintSet, LintSource};
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast::unwrap_or;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
+use rustc_errors::{struct_span_err, Applicability};
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, LOCAL_CRATE};
-use rustc_hir::hir_id::HirId;
-use rustc_hir::intravisit;
+use rustc_hir::{intravisit, HirId};
 use rustc_session::lint::{builtin, Level, Lint};
+use rustc_session::parse::feature_err;
 use rustc_session::Session;
-use rustc_span::{sym, MultiSpan, Symbol};
-use syntax::ast;
-use syntax::attr;
-use syntax::print::pprust;
-use syntax::sess::feature_err;
-use syntax::unwrap_or;
+use rustc_span::source_map::MultiSpan;
+use rustc_span::symbol::{sym, Symbol};
 
 use std::cmp;
 
@@ -40,8 +40,8 @@ fn lint_levels(tcx: TyCtxt<'_>, cnum: CrateNum) -> &LintLevelMap {
     tcx.arena.alloc(builder.levels.build_map())
 }
 
-pub struct LintLevelsBuilder<'a> {
-    sess: &'a Session,
+pub struct LintLevelsBuilder<'s> {
+    sess: &'s Session,
     sets: LintLevelSets,
     id_to_set: FxHashMap<HirId, u32>,
     cur: u32,
@@ -53,8 +53,8 @@ pub struct BuilderPush {
     pub changed: bool,
 }
 
-impl<'a> LintLevelsBuilder<'a> {
-    pub fn new(sess: &'a Session, warn_about_weird_lints: bool, store: &LintStore) -> Self {
+impl<'s> LintLevelsBuilder<'s> {
+    pub fn new(sess: &'s Session, warn_about_weird_lints: bool, store: &LintStore) -> Self {
         let mut builder = LintLevelsBuilder {
             sess,
             sets: LintLevelSets::new(),
@@ -234,27 +234,29 @@ impl<'a> LintLevelsBuilder<'a> {
                                 let lint = builtin::RENAMED_AND_REMOVED_LINTS;
                                 let (lvl, src) =
                                     self.sets.get_lint_level(lint, self.cur, Some(&specs), &sess);
-                                let msg = format!(
-                                    "lint name `{}` is deprecated \
-                                     and may not have an effect in the future. \
-                                     Also `cfg_attr(cargo-clippy)` won't be necessary anymore",
-                                    name
-                                );
                                 struct_lint_level(
                                     self.sess,
                                     lint,
                                     lvl,
                                     src,
                                     Some(li.span().into()),
-                                    &msg,
-                                )
-                                .span_suggestion(
-                                    li.span(),
-                                    "change it to",
-                                    new_lint_name.to_string(),
-                                    Applicability::MachineApplicable,
-                                )
-                                .emit();
+                                    |lint| {
+                                        let msg = format!(
+                                            "lint name `{}` is deprecated \
+                                             and may not have an effect in the future. \
+                                             Also `cfg_attr(cargo-clippy)` won't be necessary anymore",
+                                            name
+                                        );
+                                        lint.build(&msg)
+                                            .span_suggestion(
+                                                li.span(),
+                                                "change it to",
+                                                new_lint_name.to_string(),
+                                                Applicability::MachineApplicable,
+                                            )
+                                            .emit();
+                                    },
+                                );
 
                                 let src = LintSource::Node(
                                     Symbol::intern(&new_lint_name),
@@ -280,48 +282,49 @@ impl<'a> LintLevelsBuilder<'a> {
                         let lint = builtin::RENAMED_AND_REMOVED_LINTS;
                         let (level, src) =
                             self.sets.get_lint_level(lint, self.cur, Some(&specs), &sess);
-                        let mut err = struct_lint_level(
+                        struct_lint_level(
                             self.sess,
                             lint,
                             level,
                             src,
                             Some(li.span().into()),
-                            &msg,
+                            |lint| {
+                                let mut err = lint.build(&msg);
+                                if let Some(new_name) = renamed {
+                                    err.span_suggestion(
+                                        li.span(),
+                                        "use the new name",
+                                        new_name,
+                                        Applicability::MachineApplicable,
+                                    );
+                                }
+                                err.emit();
+                            },
                         );
-                        if let Some(new_name) = renamed {
-                            err.span_suggestion(
-                                li.span(),
-                                "use the new name",
-                                new_name,
-                                Applicability::MachineApplicable,
-                            );
-                        }
-                        err.emit();
                     }
                     CheckLintNameResult::NoLint(suggestion) => {
                         let lint = builtin::UNKNOWN_LINTS;
                         let (level, src) =
                             self.sets.get_lint_level(lint, self.cur, Some(&specs), self.sess);
-                        let msg = format!("unknown lint: `{}`", name);
-                        let mut db = struct_lint_level(
+                        struct_lint_level(
                             self.sess,
                             lint,
                             level,
                             src,
                             Some(li.span().into()),
-                            &msg,
+                            |lint| {
+                                let mut db = lint.build(&format!("unknown lint: `{}`", name));
+                                if let Some(suggestion) = suggestion {
+                                    db.span_suggestion(
+                                        li.span(),
+                                        "did you mean",
+                                        suggestion.to_string(),
+                                        Applicability::MachineApplicable,
+                                    );
+                                }
+                                db.emit();
+                            },
                         );
-
-                        if let Some(suggestion) = suggestion {
-                            db.span_suggestion(
-                                li.span(),
-                                "did you mean",
-                                suggestion.to_string(),
-                                Applicability::MachineApplicable,
-                            );
-                        }
-
-                        db.emit();
                     }
                 }
             }
@@ -372,12 +375,12 @@ impl<'a> LintLevelsBuilder<'a> {
         }
 
         let prev = self.cur;
-        if specs.len() > 0 {
+        if !specs.is_empty() {
             self.cur = self.sets.list.len() as u32;
-            self.sets.list.push(LintSet::Node { specs: specs, parent: prev });
+            self.sets.list.push(LintSet::Node { specs, parent: prev });
         }
 
-        BuilderPush { prev: prev, changed: prev != self.cur }
+        BuilderPush { prev, changed: prev != self.cur }
     }
 
     /// Called after `push` when the scope of a set of attributes are exited.
@@ -391,10 +394,10 @@ impl<'a> LintLevelsBuilder<'a> {
         &self,
         lint: &'static Lint,
         span: Option<MultiSpan>,
-        msg: &str,
-    ) -> DiagnosticBuilder<'a> {
+        decorate: impl for<'a> FnOnce(LintDiagnosticBuilder<'a>),
+    ) {
         let (level, src) = self.sets.get_lint_level(lint, self.cur, None, self.sess);
-        struct_lint_level(self.sess, lint, level, src, span, msg)
+        struct_lint_level(self.sess, lint, level, src, span, decorate)
     }
 
     /// Registers the ID provided with the current set of lints stored in
diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index 78e9d0f14f..825ac04bc0 100644
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -28,7 +28,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![cfg_attr(test, feature(test))]
 #![feature(bool_to_option)]
-#![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(crate_visibility_modifier)]
 #![feature(never_type)]
@@ -56,6 +55,7 @@ mod unused;
 
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_session::lint::builtin::{
@@ -63,7 +63,6 @@ use rustc_session::lint::builtin::{
     INTRA_DOC_LINK_RESOLUTION_FAILURE, MISSING_DOC_CODE_EXAMPLES, PRIVATE_DOC_TESTS,
 };
 use rustc_span::Span;
-use syntax::ast;
 
 use array_into_iter::ArrayIntoIter;
 use builtin::*;
@@ -95,7 +94,7 @@ fn lint_mod(tcx: TyCtxt<'_>, module_def_id: DefId) {
 
 macro_rules! pre_expansion_lint_passes {
     ($macro:path, $args:tt) => {
-        $macro!($args, [KeywordIdents: KeywordIdents, UnusedDocComment: UnusedDocComment,]);
+        $macro!($args, [KeywordIdents: KeywordIdents,]);
     };
 }
 
@@ -114,7 +113,8 @@ macro_rules! early_lint_passes {
                 WhileTrue: WhileTrue,
                 NonAsciiIdents: NonAsciiIdents,
                 IncompleteFeatures: IncompleteFeatures,
-                RedundantSemicolon: RedundantSemicolon,
+                RedundantSemicolons: RedundantSemicolons,
+                UnusedDocComment: UnusedDocComment,
             ]
         );
     };
@@ -274,7 +274,8 @@ fn register_builtins(store: &mut LintStore, no_interleave_lints: bool) {
         UNUSED_EXTERN_CRATES,
         UNUSED_FEATURES,
         UNUSED_LABELS,
-        UNUSED_PARENS
+        UNUSED_PARENS,
+        REDUNDANT_SEMICOLONS
     );
 
     add_lint_group!(
@@ -306,6 +307,8 @@ fn register_builtins(store: &mut LintStore, no_interleave_lints: bool) {
     store.register_renamed("unstable_name_collision", "unstable_name_collisions");
     store.register_renamed("unused_doc_comment", "unused_doc_comments");
     store.register_renamed("async_idents", "keyword_idents");
+    store.register_renamed("exceeding_bitshifts", "arithmetic_overflow");
+    store.register_renamed("redundant_semicolon", "redundant_semicolons");
     store.register_removed("unknown_features", "replaced by an error");
     store.register_removed("unsigned_negation", "replaced by negate_unsigned feature gate");
     store.register_removed("negate_unsigned", "cast a signed value instead");
@@ -324,47 +327,58 @@ fn register_builtins(store: &mut LintStore, no_interleave_lints: bool) {
     );
     store.register_removed(
         "hr_lifetime_in_assoc_type",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/33685",
+        "converted into hard error, see issue #33685 \
+         <https://github.com/rust-lang/rust/issues/33685> for more information",
     );
     store.register_removed(
         "inaccessible_extern_crate",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36886",
+        "converted into hard error, see issue #36886 \
+         <https://github.com/rust-lang/rust/issues/36886> for more information",
     );
     store.register_removed(
         "super_or_self_in_global_path",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36888",
+        "converted into hard error, see issue #36888 \
+         <https://github.com/rust-lang/rust/issues/36888> for more information",
     );
     store.register_removed(
         "overlapping_inherent_impls",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36889",
+        "converted into hard error, see issue #36889 \
+         <https://github.com/rust-lang/rust/issues/36889> for more information",
     );
     store.register_removed(
         "illegal_floating_point_constant_pattern",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36890",
+        "converted into hard error, see issue #36890 \
+         <https://github.com/rust-lang/rust/issues/36890> for more information",
     );
     store.register_removed(
         "illegal_struct_or_enum_constant_pattern",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36891",
+        "converted into hard error, see issue #36891 \
+         <https://github.com/rust-lang/rust/issues/36891> for more information",
     );
     store.register_removed(
         "lifetime_underscore",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36892",
+        "converted into hard error, see issue #36892 \
+         <https://github.com/rust-lang/rust/issues/36892> for more information",
     );
     store.register_removed(
         "extra_requirement_in_impl",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/37166",
+        "converted into hard error, see issue #37166 \
+         <https://github.com/rust-lang/rust/issues/37166> for more information",
     );
     store.register_removed(
         "legacy_imports",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/38260",
+        "converted into hard error, see issue #38260 \
+         <https://github.com/rust-lang/rust/issues/38260> for more information",
     );
     store.register_removed(
         "coerce_never",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/48950",
+        "converted into hard error, see issue #48950 \
+         <https://github.com/rust-lang/rust/issues/48950> for more information",
     );
     store.register_removed(
         "resolve_trait_on_defaulted_unit",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/48950",
+        "converted into hard error, see issue #48950 \
+         <https://github.com/rust-lang/rust/issues/48950> for more information",
     );
     store.register_removed(
         "private_no_mangle_fns",
@@ -377,35 +391,43 @@ fn register_builtins(store: &mut LintStore, no_interleave_lints: bool) {
     store.register_removed("bad_repr", "replaced with a generic attribute input check");
     store.register_removed(
         "duplicate_matcher_binding_name",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/57742",
+        "converted into hard error, see issue #57742 \
+         <https://github.com/rust-lang/rust/issues/57742> for more information",
     );
     store.register_removed(
         "incoherent_fundamental_impls",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/46205",
+        "converted into hard error, see issue #46205 \
+         <https://github.com/rust-lang/rust/issues/46205> for more information",
     );
     store.register_removed(
         "legacy_constructor_visibility",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/39207",
+        "converted into hard error, see issue #39207 \
+         <https://github.com/rust-lang/rust/issues/39207> for more information",
     );
     store.register_removed(
         "legacy_directory_ownership",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/37872",
+        "converted into hard error, see issue #37872 \
+         <https://github.com/rust-lang/rust/issues/37872> for more information",
     );
     store.register_removed(
         "safe_extern_statics",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/36247",
+        "converted into hard error, see issue #36247 \
+         <https://github.com/rust-lang/rust/issues/36247> for more information",
     );
     store.register_removed(
         "parenthesized_params_in_types_and_modules",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/42238",
+        "converted into hard error, see issue #42238 \
+         <https://github.com/rust-lang/rust/issues/42238> for more information",
     );
     store.register_removed(
         "duplicate_macro_exports",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/35896",
+        "converted into hard error, see issue #35896 \
+         <https://github.com/rust-lang/rust/issues/35896> for more information",
     );
     store.register_removed(
         "nested_impl_trait",
-        "converted into hard error, see https://github.com/rust-lang/rust/issues/59014",
+        "converted into hard error, see issue #59014 \
+         <https://github.com/rust-lang/rust/issues/59014> for more information",
     );
     store.register_removed("plugin_as_library", "plugins have been deprecated and retired");
 }
diff --git a/src/librustc_lint/non_ascii_idents.rs b/src/librustc_lint/non_ascii_idents.rs
index 3c85a1b31b..470fac2675 100644
--- a/src/librustc_lint/non_ascii_idents.rs
+++ b/src/librustc_lint/non_ascii_idents.rs
@@ -1,5 +1,5 @@
 use crate::{EarlyContext, EarlyLintPass, LintContext};
-use syntax::ast;
+use rustc_ast::ast;
 
 declare_lint! {
     pub NON_ASCII_IDENTS,
@@ -22,19 +22,13 @@ impl EarlyLintPass for NonAsciiIdents {
         if name_str.is_ascii() {
             return;
         }
-        cx.struct_span_lint(
-            NON_ASCII_IDENTS,
-            ident.span,
-            "identifier contains non-ASCII characters",
-        )
-        .emit();
+        cx.struct_span_lint(NON_ASCII_IDENTS, ident.span, |lint| {
+            lint.build("identifier contains non-ASCII characters").emit()
+        });
         if !name_str.chars().all(GeneralSecurityProfile::identifier_allowed) {
-            cx.struct_span_lint(
-                UNCOMMON_CODEPOINTS,
-                ident.span,
-                "identifier contains uncommon Unicode codepoints",
-            )
-            .emit();
+            cx.struct_span_lint(UNCOMMON_CODEPOINTS, ident.span, |lint| {
+                lint.build("identifier contains uncommon Unicode codepoints").emit()
+            })
         }
     }
 }
diff --git a/src/librustc_lint/nonstandard_style.rs b/src/librustc_lint/nonstandard_style.rs
index 394da4a5bb..b0560dc9fd 100644
--- a/src/librustc_lint/nonstandard_style.rs
+++ b/src/librustc_lint/nonstandard_style.rs
@@ -1,5 +1,7 @@
 use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
 use rustc::ty;
+use rustc_ast::ast;
+use rustc_attr as attr;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
@@ -8,8 +10,6 @@ use rustc_hir::{GenericParamKind, PatKind};
 use rustc_span::symbol::sym;
 use rustc_span::{symbol::Ident, BytePos, Span};
 use rustc_target::spec::abi::Abi;
-use syntax::ast;
-use syntax::attr;
 
 #[derive(PartialEq)]
 pub enum MethodLateContext {
@@ -107,15 +107,17 @@ impl NonCamelCaseTypes {
         let name = &ident.name.as_str();
 
         if !is_camel_case(name) {
-            let msg = format!("{} `{}` should have an upper camel case name", sort, name);
-            cx.struct_span_lint(NON_CAMEL_CASE_TYPES, ident.span, &msg)
-                .span_suggestion(
-                    ident.span,
-                    "convert the identifier to upper camel case",
-                    to_camel_case(name),
-                    Applicability::MaybeIncorrect,
-                )
-                .emit();
+            cx.struct_span_lint(NON_CAMEL_CASE_TYPES, ident.span, |lint| {
+                let msg = format!("{} `{}` should have an upper camel case name", sort, name);
+                lint.build(&msg)
+                    .span_suggestion(
+                        ident.span,
+                        "convert the identifier to upper camel case",
+                        to_camel_case(name),
+                        Applicability::MaybeIncorrect,
+                    )
+                    .emit()
+            })
         }
     }
 }
@@ -223,25 +225,25 @@ impl NonSnakeCase {
         let name = &ident.name.as_str();
 
         if !is_snake_case(name) {
-            let sc = NonSnakeCase::to_snake_case(name);
-
-            let msg = format!("{} `{}` should have a snake case name", sort, name);
-            let mut err = cx.struct_span_lint(NON_SNAKE_CASE, ident.span, &msg);
-
-            // We have a valid span in almost all cases, but we don't have one when linting a crate
-            // name provided via the command line.
-            if !ident.span.is_dummy() {
-                err.span_suggestion(
-                    ident.span,
-                    "convert the identifier to snake case",
-                    sc,
-                    Applicability::MaybeIncorrect,
-                );
-            } else {
-                err.help(&format!("convert the identifier to snake case: `{}`", sc));
-            }
+            cx.struct_span_lint(NON_SNAKE_CASE, ident.span, |lint| {
+                let sc = NonSnakeCase::to_snake_case(name);
+                let msg = format!("{} `{}` should have a snake case name", sort, name);
+                let mut err = lint.build(&msg);
+                // We have a valid span in almost all cases, but we don't have one when linting a crate
+                // name provided via the command line.
+                if !ident.span.is_dummy() {
+                    err.span_suggestion(
+                        ident.span,
+                        "convert the identifier to snake case",
+                        sc,
+                        Applicability::MaybeIncorrect,
+                    );
+                } else {
+                    err.help(&format!("convert the identifier to snake case: `{}`", sc));
+                }
 
-            err.emit();
+                err.emit();
+            });
         }
     }
 }
@@ -386,19 +388,18 @@ declare_lint_pass!(NonUpperCaseGlobals => [NON_UPPER_CASE_GLOBALS]);
 impl NonUpperCaseGlobals {
     fn check_upper_case(cx: &LateContext<'_, '_>, sort: &str, ident: &Ident) {
         let name = &ident.name.as_str();
-
         if name.chars().any(|c| c.is_lowercase()) {
-            let uc = NonSnakeCase::to_snake_case(&name).to_uppercase();
-
-            let msg = format!("{} `{}` should have an upper case name", sort, name);
-            cx.struct_span_lint(NON_UPPER_CASE_GLOBALS, ident.span, &msg)
-                .span_suggestion(
-                    ident.span,
-                    "convert the identifier to upper case",
-                    uc,
-                    Applicability::MaybeIncorrect,
-                )
-                .emit();
+            cx.struct_span_lint(NON_UPPER_CASE_GLOBALS, ident.span, |lint| {
+                let uc = NonSnakeCase::to_snake_case(&name).to_uppercase();
+                lint.build(&format!("{} `{}` should have an upper case name", sort, name))
+                    .span_suggestion(
+                        ident.span,
+                        "convert the identifier to upper case",
+                        uc,
+                        Applicability::MaybeIncorrect,
+                    )
+                    .emit();
+            })
         }
     }
 }
diff --git a/src/librustc_lint/passes.rs b/src/librustc_lint/passes.rs
index 7e5d670767..813be2a032 100644
--- a/src/librustc_lint/passes.rs
+++ b/src/librustc_lint/passes.rs
@@ -1,11 +1,11 @@
 use crate::context::{EarlyContext, LateContext};
 
+use rustc_ast::ast;
 use rustc_data_structures::sync;
 use rustc_hir as hir;
 use rustc_session::lint::builtin::HardwiredLints;
 use rustc_session::lint::LintPass;
 use rustc_span::Span;
-use syntax::ast;
 
 #[macro_export]
 macro_rules! late_lint_methods {
@@ -179,10 +179,9 @@ macro_rules! early_lint_methods {
             fn check_where_predicate(a: &ast::WherePredicate);
             fn check_poly_trait_ref(a: &ast::PolyTraitRef,
                                     b: &ast::TraitBoundModifier);
-            fn check_fn(a: syntax::visit::FnKind<'_>, b: &ast::FnDecl, c: Span, d_: ast::NodeId);
+            fn check_fn(a: rustc_ast::visit::FnKind<'_>, c: Span, d_: ast::NodeId);
             fn check_fn_post(
-                a: syntax::visit::FnKind<'_>,
-                b: &ast::FnDecl,
+                a: rustc_ast::visit::FnKind<'_>,
                 c: Span,
                 d: ast::NodeId
             );
diff --git a/src/librustc_lint/redundant_semicolon.rs b/src/librustc_lint/redundant_semicolon.rs
index 21b244ad75..0f807cd497 100644
--- a/src/librustc_lint/redundant_semicolon.rs
+++ b/src/librustc_lint/redundant_semicolon.rs
@@ -1,48 +1,41 @@
 use crate::{EarlyContext, EarlyLintPass, LintContext};
+use rustc_ast::ast::{Block, StmtKind};
 use rustc_errors::Applicability;
-use syntax::ast::{ExprKind, Stmt, StmtKind};
+use rustc_span::Span;
 
 declare_lint! {
-    pub REDUNDANT_SEMICOLON,
+    pub REDUNDANT_SEMICOLONS,
     Warn,
     "detects unnecessary trailing semicolons"
 }
 
-declare_lint_pass!(RedundantSemicolon => [REDUNDANT_SEMICOLON]);
+declare_lint_pass!(RedundantSemicolons => [REDUNDANT_SEMICOLONS]);
 
-impl EarlyLintPass for RedundantSemicolon {
-    fn check_stmt(&mut self, cx: &EarlyContext<'_>, stmt: &Stmt) {
-        if let StmtKind::Semi(expr) = &stmt.kind {
-            if let ExprKind::Tup(ref v) = &expr.kind {
-                if v.is_empty() {
-                    // Strings of excess semicolons are encoded as empty tuple expressions
-                    // during the parsing stage, so we check for empty tuple expressions
-                    // which span only semicolons
-                    if let Ok(source_str) = cx.sess().source_map().span_to_snippet(stmt.span) {
-                        if source_str.chars().all(|c| c == ';') {
-                            let multiple = (stmt.span.hi() - stmt.span.lo()).0 > 1;
-                            let msg = if multiple {
-                                "unnecessary trailing semicolons"
-                            } else {
-                                "unnecessary trailing semicolon"
-                            };
-                            let mut err = cx.struct_span_lint(REDUNDANT_SEMICOLON, stmt.span, &msg);
-                            let suggest_msg = if multiple {
-                                "remove these semicolons"
-                            } else {
-                                "remove this semicolon"
-                            };
-                            err.span_suggestion(
-                                stmt.span,
-                                &suggest_msg,
-                                String::new(),
-                                Applicability::MaybeIncorrect,
-                            );
-                            err.emit();
-                        }
-                    }
-                }
+impl EarlyLintPass for RedundantSemicolons {
+    fn check_block(&mut self, cx: &EarlyContext<'_>, block: &Block) {
+        let mut seq = None;
+        for stmt in block.stmts.iter() {
+            match (&stmt.kind, &mut seq) {
+                (StmtKind::Empty, None) => seq = Some((stmt.span, false)),
+                (StmtKind::Empty, Some(seq)) => *seq = (seq.0.to(stmt.span), true),
+                (_, seq) => maybe_lint_redundant_semis(cx, seq),
             }
         }
+        maybe_lint_redundant_semis(cx, &mut seq);
+    }
+}
+
+fn maybe_lint_redundant_semis(cx: &EarlyContext<'_>, seq: &mut Option<(Span, bool)>) {
+    if let Some((span, multiple)) = seq.take() {
+        cx.struct_span_lint(REDUNDANT_SEMICOLONS, span, |lint| {
+            let (msg, rem) = if multiple {
+                ("unnecessary trailing semicolons", "remove these semicolons")
+            } else {
+                ("unnecessary trailing semicolon", "remove this semicolon")
+            };
+            lint.build(msg)
+                .span_suggestion(span, rem, String::new(), Applicability::MaybeIncorrect)
+                .emit();
+        });
     }
 }
diff --git a/src/librustc_lint/types.rs b/src/librustc_lint/types.rs
index 674a82b619..86d93612e9 100644
--- a/src/librustc_lint/types.rs
+++ b/src/librustc_lint/types.rs
@@ -5,6 +5,8 @@ use rustc::mir::interpret::{sign_extend, truncate};
 use rustc::ty::layout::{self, IntegerExt, LayoutOf, SizeSkeleton, VariantIdx};
 use rustc::ty::subst::SubstsRef;
 use rustc::ty::{self, AdtKind, ParamEnv, Ty, TyCtxt};
+use rustc_ast::ast;
+use rustc_attr as attr;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
@@ -15,7 +17,6 @@ use rustc_span::source_map;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
 use rustc_target::spec::abi::Abi;
-use syntax::{ast, attr};
 
 use log::debug;
 use std::cmp;
@@ -66,6 +67,7 @@ fn lint_overflowing_range_endpoint<'a, 'tcx>(
 ) -> bool {
     // We only want to handle exclusive (`..`) ranges,
     // which are represented as `ExprKind::Struct`.
+    let mut overwritten = false;
     if let ExprKind::Struct(_, eps, _) = &parent_expr.kind {
         if eps.len() != 2 {
             return false;
@@ -74,35 +76,32 @@ fn lint_overflowing_range_endpoint<'a, 'tcx>(
         // (`..=`) instead only if it is the `end` that is
         // overflowing and only by 1.
         if eps[1].expr.hir_id == expr.hir_id && lit_val - 1 == max {
-            let mut err = cx.struct_span_lint(
-                OVERFLOWING_LITERALS,
-                parent_expr.span,
-                &format!("range endpoint is out of range for `{}`", ty),
-            );
-            if let Ok(start) = cx.sess().source_map().span_to_snippet(eps[0].span) {
-                use ast::{LitIntType, LitKind};
-                // We need to preserve the literal's suffix,
-                // as it may determine typing information.
-                let suffix = match lit.node {
-                    LitKind::Int(_, LitIntType::Signed(s)) => format!("{}", s.name_str()),
-                    LitKind::Int(_, LitIntType::Unsigned(s)) => format!("{}", s.name_str()),
-                    LitKind::Int(_, LitIntType::Unsuffixed) => "".to_owned(),
-                    _ => bug!(),
-                };
-                let suggestion = format!("{}..={}{}", start, lit_val - 1, suffix);
-                err.span_suggestion(
-                    parent_expr.span,
-                    &"use an inclusive range instead",
-                    suggestion,
-                    Applicability::MachineApplicable,
-                );
-                err.emit();
-                return true;
-            }
+            cx.struct_span_lint(OVERFLOWING_LITERALS, parent_expr.span, |lint| {
+                let mut err = lint.build(&format!("range endpoint is out of range for `{}`", ty));
+                if let Ok(start) = cx.sess().source_map().span_to_snippet(eps[0].span) {
+                    use ast::{LitIntType, LitKind};
+                    // We need to preserve the literal's suffix,
+                    // as it may determine typing information.
+                    let suffix = match lit.node {
+                        LitKind::Int(_, LitIntType::Signed(s)) => s.name_str().to_string(),
+                        LitKind::Int(_, LitIntType::Unsigned(s)) => s.name_str().to_string(),
+                        LitKind::Int(_, LitIntType::Unsuffixed) => "".to_string(),
+                        _ => bug!(),
+                    };
+                    let suggestion = format!("{}..={}{}", start, lit_val - 1, suffix);
+                    err.span_suggestion(
+                        parent_expr.span,
+                        &"use an inclusive range instead",
+                        suggestion,
+                        Applicability::MachineApplicable,
+                    );
+                    err.emit();
+                    overwritten = true;
+                }
+            });
         }
     }
-
-    false
+    overwritten
 }
 
 // For `isize` & `usize`, be conservative with the warnings, so that the
@@ -152,41 +151,39 @@ fn report_bin_hex_error(
     negative: bool,
 ) {
     let size = layout::Integer::from_attr(&cx.tcx, ty).size();
-    let (t, actually) = match ty {
-        attr::IntType::SignedInt(t) => {
-            let actually = sign_extend(val, size) as i128;
-            (t.name_str(), actually.to_string())
-        }
-        attr::IntType::UnsignedInt(t) => {
-            let actually = truncate(val, size);
-            (t.name_str(), actually.to_string())
-        }
-    };
-    let mut err = cx.struct_span_lint(
-        OVERFLOWING_LITERALS,
-        expr.span,
-        &format!("literal out of range for {}", t),
-    );
-    err.note(&format!(
-        "the literal `{}` (decimal `{}`) does not fit into \
-            an `{}` and will become `{}{}`",
-        repr_str, val, t, actually, t
-    ));
-    if let Some(sugg_ty) = get_type_suggestion(&cx.tables.node_type(expr.hir_id), val, negative) {
-        if let Some(pos) = repr_str.chars().position(|c| c == 'i' || c == 'u') {
-            let (sans_suffix, _) = repr_str.split_at(pos);
-            err.span_suggestion(
-                expr.span,
-                &format!("consider using `{}` instead", sugg_ty),
-                format!("{}{}", sans_suffix, sugg_ty),
-                Applicability::MachineApplicable,
-            );
-        } else {
-            err.help(&format!("consider using `{}` instead", sugg_ty));
+    cx.struct_span_lint(OVERFLOWING_LITERALS, expr.span, |lint| {
+        let (t, actually) = match ty {
+            attr::IntType::SignedInt(t) => {
+                let actually = sign_extend(val, size) as i128;
+                (t.name_str(), actually.to_string())
+            }
+            attr::IntType::UnsignedInt(t) => {
+                let actually = truncate(val, size);
+                (t.name_str(), actually.to_string())
+            }
+        };
+        let mut err = lint.build(&format!("literal out of range for {}", t));
+        err.note(&format!(
+            "the literal `{}` (decimal `{}`) does not fit into \
+                    an `{}` and will become `{}{}`",
+            repr_str, val, t, actually, t
+        ));
+        if let Some(sugg_ty) = get_type_suggestion(&cx.tables.node_type(expr.hir_id), val, negative)
+        {
+            if let Some(pos) = repr_str.chars().position(|c| c == 'i' || c == 'u') {
+                let (sans_suffix, _) = repr_str.split_at(pos);
+                err.span_suggestion(
+                    expr.span,
+                    &format!("consider using `{}` instead", sugg_ty),
+                    format!("{}{}", sans_suffix, sugg_ty),
+                    Applicability::MachineApplicable,
+                );
+            } else {
+                err.help(&format!("consider using `{}` instead", sugg_ty));
+            }
         }
-    }
-
-    err.emit();
+        err.emit();
+    });
 }
 
 // This function finds the next fitting type and generates a suggestion string.
@@ -197,8 +194,8 @@ fn report_bin_hex_error(
 //
 // No suggestion for: `isize`, `usize`.
 fn get_type_suggestion(t: Ty<'_>, val: u128, negative: bool) -> Option<&'static str> {
-    use syntax::ast::IntTy::*;
-    use syntax::ast::UintTy::*;
+    use rustc_ast::ast::IntTy::*;
+    use rustc_ast::ast::UintTy::*;
     macro_rules! find_fit {
         ($ty:expr, $val:expr, $negative:expr,
          $($type:ident => [$($utypes:expr),*] => [$($itypes:expr),*]),+) => {
@@ -269,11 +266,9 @@ fn lint_int_literal<'a, 'tcx>(
             }
         }
 
-        cx.span_lint(
-            OVERFLOWING_LITERALS,
-            e.span,
-            &format!("literal out of range for `{}`", t.name_str()),
-        );
+        cx.struct_span_lint(OVERFLOWING_LITERALS, e.span, |lint| {
+            lint.build(&format!("literal out of range for `{}`", t.name_str())).emit()
+        });
     }
 }
 
@@ -297,18 +292,16 @@ fn lint_uint_literal<'a, 'tcx>(
             match par_e.kind {
                 hir::ExprKind::Cast(..) => {
                     if let ty::Char = cx.tables.expr_ty(par_e).kind {
-                        let mut err = cx.struct_span_lint(
-                            OVERFLOWING_LITERALS,
-                            par_e.span,
-                            "only `u8` can be cast into `char`",
-                        );
-                        err.span_suggestion(
-                            par_e.span,
-                            &"use a `char` literal instead",
-                            format!("'\\u{{{:X}}}'", lit_val),
-                            Applicability::MachineApplicable,
-                        );
-                        err.emit();
+                        cx.struct_span_lint(OVERFLOWING_LITERALS, par_e.span, |lint| {
+                            lint.build("only `u8` can be cast into `char`")
+                                .span_suggestion(
+                                    par_e.span,
+                                    &"use a `char` literal instead",
+                                    format!("'\\u{{{:X}}}'", lit_val),
+                                    Applicability::MachineApplicable,
+                                )
+                                .emit();
+                        });
                         return;
                     }
                 }
@@ -326,11 +319,9 @@ fn lint_uint_literal<'a, 'tcx>(
             report_bin_hex_error(cx, e, attr::IntType::UnsignedInt(t), repr_str, lit_val, false);
             return;
         }
-        cx.span_lint(
-            OVERFLOWING_LITERALS,
-            e.span,
-            &format!("literal out of range for `{}`", t.name_str()),
-        );
+        cx.struct_span_lint(OVERFLOWING_LITERALS, e.span, |lint| {
+            lint.build(&format!("literal out of range for `{}`", t.name_str())).emit()
+        });
     }
 }
 
@@ -360,11 +351,9 @@ fn lint_literal<'a, 'tcx>(
                 _ => bug!(),
             };
             if is_infinite == Ok(true) {
-                cx.span_lint(
-                    OVERFLOWING_LITERALS,
-                    e.span,
-                    &format!("literal out of range for `{}`", t.name_str()),
-                );
+                cx.struct_span_lint(OVERFLOWING_LITERALS, e.span, |lint| {
+                    lint.build(&format!("literal out of range for `{}`", t.name_str())).emit()
+                });
             }
         }
         _ => {}
@@ -382,11 +371,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for TypeLimits {
             }
             hir::ExprKind::Binary(binop, ref l, ref r) => {
                 if is_comparison(binop) && !check_limits(cx, binop, &l, &r) {
-                    cx.span_lint(
-                        UNUSED_COMPARISONS,
-                        e.span,
-                        "comparison is useless due to type limits",
-                    );
+                    cx.struct_span_lint(UNUSED_COMPARISONS, e.span, |lint| {
+                        lint.build("comparison is useless due to type limits").emit()
+                    });
                 }
             }
             hir::ExprKind::Lit(ref lit) => lint_literal(cx, self, e, lit),
@@ -882,22 +869,21 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
         note: &str,
         help: Option<&str>,
     ) {
-        let mut diag = self.cx.struct_span_lint(
-            IMPROPER_CTYPES,
-            sp,
-            &format!("`extern` block uses type `{}`, which is not FFI-safe", ty),
-        );
-        diag.span_label(sp, "not FFI-safe");
-        if let Some(help) = help {
-            diag.help(help);
-        }
-        diag.note(note);
-        if let ty::Adt(def, _) = ty.kind {
-            if let Some(sp) = self.cx.tcx.hir().span_if_local(def.did) {
-                diag.span_note(sp, "type defined here");
+        self.cx.struct_span_lint(IMPROPER_CTYPES, sp, |lint| {
+            let mut diag =
+                lint.build(&format!("`extern` block uses type `{}`, which is not FFI-safe", ty));
+            diag.span_label(sp, "not FFI-safe");
+            if let Some(help) = help {
+                diag.help(help);
             }
-        }
-        diag.emit();
+            diag.note(note);
+            if let ty::Adt(def, _) = ty.kind {
+                if let Some(sp) = self.cx.tcx.hir().span_if_local(def.did) {
+                    diag.span_note(sp, "the type is defined here");
+                }
+            }
+            diag.emit();
+        });
     }
 
     fn check_for_opaque_ty(&mut self, sp: Span, ty: Ty<'tcx>) -> bool {
@@ -967,7 +953,7 @@ impl<'a, 'tcx> ImproperCTypesVisitor<'a, 'tcx> {
             self.check_type_for_ffi_and_report_errors(input_hir.span, input_ty, false);
         }
 
-        if let hir::FunctionRetTy::Return(ref ret_hir) = decl.output {
+        if let hir::FnRetTy::Return(ref ret_hir) = decl.output {
             let ret_ty = sig.output();
             if !ret_ty.is_unit() {
                 self.check_type_for_ffi_and_report_errors(ret_hir.span, ret_ty, false);
@@ -1061,14 +1047,17 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for VariantSizeDifferences {
             // We only warn if the largest variant is at least thrice as large as
             // the second-largest.
             if largest > slargest * 3 && slargest > 0 {
-                cx.span_lint(
+                cx.struct_span_lint(
                     VARIANT_SIZE_DIFFERENCES,
                     enum_definition.variants[largest_index].span,
-                    &format!(
-                        "enum variant is more than three times \
+                    |lint| {
+                        lint.build(&format!(
+                            "enum variant is more than three times \
                                           larger ({} bytes) than the next largest",
-                        largest
-                    ),
+                            largest
+                        ))
+                        .emit()
+                    },
                 );
             }
         }
diff --git a/src/librustc_lint/unused.rs b/src/librustc_lint/unused.rs
index bb2c4fa1aa..02f04b2345 100644
--- a/src/librustc_lint/unused.rs
+++ b/src/librustc_lint/unused.rs
@@ -1,6 +1,10 @@
 use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};
 use rustc::ty::adjustment;
 use rustc::ty::{self, Ty};
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast::util::parser;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{pluralize, Applicability};
 use rustc_feature::{AttributeType, BuiltinAttribute, BUILTIN_ATTRIBUTE_MAP};
@@ -11,10 +15,6 @@ use rustc_session::lint::builtin::UNUSED_ATTRIBUTES;
 use rustc_span::symbol::Symbol;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{BytePos, Span};
-use syntax::ast;
-use syntax::attr;
-use syntax::print::pprust;
-use syntax::util::parser;
 
 use log::debug;
 
@@ -104,16 +104,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
         };
 
         if let Some(must_use_op) = must_use_op {
-            cx.span_lint(
-                UNUSED_MUST_USE,
-                expr.span,
-                &format!("unused {} that must be used", must_use_op),
-            );
+            cx.struct_span_lint(UNUSED_MUST_USE, expr.span, |lint| {
+                lint.build(&format!("unused {} that must be used", must_use_op)).emit()
+            });
             op_warned = true;
         }
 
         if !(type_permits_lack_of_use || fn_warned || op_warned) {
-            cx.span_lint(UNUSED_RESULTS, s.span, "unused result");
+            cx.struct_span_lint(UNUSED_RESULTS, s.span, |lint| lint.build("unused result").emit());
         }
 
         // Returns whether an error has been emitted (and thus another does not need to be later).
@@ -126,8 +124,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
             descr_post: &str,
             plural_len: usize,
         ) -> bool {
-            if ty.is_unit()
-                || cx.tcx.is_ty_uninhabited_from(cx.tcx.hir().get_module_parent(expr.hir_id), ty)
+            if ty.is_unit() || cx.tcx.is_ty_uninhabited_from(cx.tcx.parent_module(expr.hir_id), ty)
             {
                 return true;
             }
@@ -204,6 +201,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
         }
 
         // Returns whether an error has been emitted (and thus another does not need to be later).
+        // FIXME: Args desc_{pre,post}_path could be made lazy by taking Fn() -> &str, but this
+        // would make calling it a big awkward. Could also take String (so args are moved), but
+        // this would still require a copy into the format string, which would only be executed
+        // when needed.
         fn check_must_use_def(
             cx: &LateContext<'_, '_>,
             def_id: DefId,
@@ -213,18 +214,20 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedResults {
         ) -> bool {
             for attr in cx.tcx.get_attrs(def_id).iter() {
                 if attr.check_name(sym::must_use) {
-                    let msg = format!(
-                        "unused {}`{}`{} that must be used",
-                        descr_pre_path,
-                        cx.tcx.def_path_str(def_id),
-                        descr_post_path
-                    );
-                    let mut err = cx.struct_span_lint(UNUSED_MUST_USE, span, &msg);
-                    // check for #[must_use = "..."]
-                    if let Some(note) = attr.value_str() {
-                        err.note(&note.as_str());
-                    }
-                    err.emit();
+                    cx.struct_span_lint(UNUSED_MUST_USE, span, |lint| {
+                        let msg = format!(
+                            "unused {}`{}`{} that must be used",
+                            descr_pre_path,
+                            cx.tcx.def_path_str(def_id),
+                            descr_post_path
+                        );
+                        let mut err = lint.build(&msg);
+                        // check for #[must_use = "..."]
+                        if let Some(note) = attr.value_str() {
+                            err.note(&note.as_str());
+                        }
+                        err.emit();
+                    });
                     return true;
                 }
             }
@@ -245,7 +248,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for PathStatements {
     fn check_stmt(&mut self, cx: &LateContext<'_, '_>, s: &hir::Stmt<'_>) {
         if let hir::StmtKind::Semi(ref expr) = s.kind {
             if let hir::ExprKind::Path(_) = expr.kind {
-                cx.span_lint(PATH_STATEMENTS, s.span, "path statement with no effect");
+                cx.struct_span_lint(PATH_STATEMENTS, s.span, |lint| {
+                    lint.build("path statement with no effect").emit()
+                });
             }
         }
     }
@@ -286,17 +291,21 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedAttributes {
 
         if !attr::is_used(attr) {
             debug!("emitting warning for: {:?}", attr);
-            cx.span_lint(UNUSED_ATTRIBUTES, attr.span, "unused attribute");
+            cx.struct_span_lint(UNUSED_ATTRIBUTES, attr.span, |lint| {
+                lint.build("unused attribute").emit()
+            });
             // Is it a builtin attribute that must be used at the crate level?
             if attr_info.map_or(false, |(_, ty, ..)| ty == &AttributeType::CrateLevel) {
-                let msg = match attr.style {
-                    ast::AttrStyle::Outer => {
-                        "crate-level attribute should be an inner attribute: add an exclamation \
-                         mark: `#![foo]`"
-                    }
-                    ast::AttrStyle::Inner => "crate-level attribute should be in the root module",
-                };
-                cx.span_lint(UNUSED_ATTRIBUTES, attr.span, msg);
+                cx.struct_span_lint(UNUSED_ATTRIBUTES, attr.span, |lint| {
+                    let msg = match attr.style {
+                        ast::AttrStyle::Outer => {
+                            "crate-level attribute should be an inner attribute: add an exclamation \
+                             mark: `#![foo]`"
+                        }
+                        ast::AttrStyle::Inner => "crate-level attribute should be in the root module",
+                    };
+                    lint.build(msg).emit()
+                });
             }
         } else {
             debug!("Attr was used: {:?}", attr);
@@ -406,58 +415,60 @@ impl UnusedParens {
         msg: &str,
         keep_space: (bool, bool),
     ) {
-        let span_msg = format!("unnecessary parentheses around {}", msg);
-        let mut err = cx.struct_span_lint(UNUSED_PARENS, span, &span_msg);
-        let mut ate_left_paren = false;
-        let mut ate_right_paren = false;
-        let parens_removed = pattern.trim_matches(|c| match c {
-            '(' => {
-                if ate_left_paren {
-                    false
-                } else {
-                    ate_left_paren = true;
-                    true
+        cx.struct_span_lint(UNUSED_PARENS, span, |lint| {
+            let span_msg = format!("unnecessary parentheses around {}", msg);
+            let mut err = lint.build(&span_msg);
+            let mut ate_left_paren = false;
+            let mut ate_right_paren = false;
+            let parens_removed = pattern.trim_matches(|c| match c {
+                '(' => {
+                    if ate_left_paren {
+                        false
+                    } else {
+                        ate_left_paren = true;
+                        true
+                    }
                 }
-            }
-            ')' => {
-                if ate_right_paren {
-                    false
-                } else {
-                    ate_right_paren = true;
-                    true
+                ')' => {
+                    if ate_right_paren {
+                        false
+                    } else {
+                        ate_right_paren = true;
+                        true
+                    }
                 }
-            }
-            _ => false,
-        });
+                _ => false,
+            });
 
-        let replace = {
-            let mut replace = if keep_space.0 {
-                let mut s = String::from(" ");
-                s.push_str(parens_removed);
-                s
-            } else {
-                String::from(parens_removed)
-            };
+            let replace = {
+                let mut replace = if keep_space.0 {
+                    let mut s = String::from(" ");
+                    s.push_str(parens_removed);
+                    s
+                } else {
+                    String::from(parens_removed)
+                };
 
-            if keep_space.1 {
-                replace.push(' ');
-            }
-            replace
-        };
+                if keep_space.1 {
+                    replace.push(' ');
+                }
+                replace
+            };
 
-        err.span_suggestion_short(
-            span,
-            "remove these parentheses",
-            replace,
-            Applicability::MachineApplicable,
-        );
-        err.emit();
+            err.span_suggestion_short(
+                span,
+                "remove these parentheses",
+                replace,
+                Applicability::MachineApplicable,
+            );
+            err.emit();
+        });
     }
 }
 
 impl EarlyLintPass for UnusedParens {
     fn check_expr(&mut self, cx: &EarlyContext<'_>, e: &ast::Expr) {
-        use syntax::ast::ExprKind::*;
+        use rustc_ast::ast::ExprKind::*;
         let (value, msg, followed_by_block, left_pos, right_pos) = match e.kind {
             Let(ref pat, ..) => {
                 self.check_unused_parens_pat(cx, pat, false, false);
@@ -587,6 +598,14 @@ impl EarlyLintPass for UnusedParens {
             }
         }
     }
+
+    fn check_item(&mut self, cx: &EarlyContext<'_>, item: &ast::Item) {
+        use ast::ItemKind::*;
+
+        if let Const(.., Some(expr)) | Static(.., Some(expr)) = &item.kind {
+            self.check_unused_parens_expr(cx, expr, "assigned value", false, None, None);
+        }
+    }
 }
 
 declare_lint! {
@@ -623,8 +642,9 @@ impl UnusedImportBraces {
                 ast::UseTreeKind::Nested(_) => return,
             };
 
-            let msg = format!("braces around {} is unnecessary", node_name);
-            cx.span_lint(UNUSED_IMPORT_BRACES, item.span, &msg);
+            cx.struct_span_lint(UNUSED_IMPORT_BRACES, item.span, |lint| {
+                lint.build(&format!("braces around {} is unnecessary", node_name)).emit()
+            });
         }
     }
 }
@@ -654,15 +674,17 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnusedAllocation {
 
         for adj in cx.tables.expr_adjustments(e) {
             if let adjustment::Adjust::Borrow(adjustment::AutoBorrow::Ref(_, m)) = adj.kind {
-                let msg = match m {
-                    adjustment::AutoBorrowMutability::Not => {
-                        "unnecessary allocation, use `&` instead"
-                    }
-                    adjustment::AutoBorrowMutability::Mut { .. } => {
-                        "unnecessary allocation, use `&mut` instead"
-                    }
-                };
-                cx.span_lint(UNUSED_ALLOCATION, e.span, msg);
+                cx.struct_span_lint(UNUSED_ALLOCATION, e.span, |lint| {
+                    let msg = match m {
+                        adjustment::AutoBorrowMutability::Not => {
+                            "unnecessary allocation, use `&` instead"
+                        }
+                        adjustment::AutoBorrowMutability::Mut { .. } => {
+                            "unnecessary allocation, use `&mut` instead"
+                        }
+                    };
+                    lint.build(msg).emit()
+                });
             }
         }
     }
diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs
index 405ce0307c..9b4f03b3fb 100644
--- a/src/librustc_llvm/build.rs
+++ b/src/librustc_llvm/build.rs
@@ -178,7 +178,7 @@ fn main() {
     for lib in output(&mut cmd).split_whitespace() {
         let name = if lib.starts_with("-l") {
             &lib[2..]
-        } else if lib.starts_with("-") {
+        } else if lib.starts_with('-') {
             &lib[1..]
         } else if Path::new(lib).exists() {
             // On MSVC llvm-config will print the full name to libraries, but
diff --git a/src/librustc_macros/Cargo.toml b/src/librustc_macros/Cargo.toml
index c28fcb1a39..73eb0dd56d 100644
--- a/src/librustc_macros/Cargo.toml
+++ b/src/librustc_macros/Cargo.toml
@@ -12,4 +12,3 @@ synstructure = "0.12.1"
 syn = { version = "1", features = ["full"] }
 proc-macro2 = "1"
 quote = "1"
-itertools = "0.8"
diff --git a/src/librustc_macros/src/hash_stable.rs b/src/librustc_macros/src/hash_stable.rs
index e6f457dd66..dc6ae961e5 100644
--- a/src/librustc_macros/src/hash_stable.rs
+++ b/src/librustc_macros/src/hash_stable.rs
@@ -1,7 +1,6 @@
 use proc_macro2::{self, Ident};
 use quote::quote;
 use syn::{self, parse_quote, Meta, NestedMeta};
-use synstructure;
 
 struct Attributes {
     ignore: bool,
diff --git a/src/librustc_macros/src/lib.rs b/src/librustc_macros/src/lib.rs
index 3f55d81ce7..6b30ae42a1 100644
--- a/src/librustc_macros/src/lib.rs
+++ b/src/librustc_macros/src/lib.rs
@@ -1,8 +1,6 @@
 #![allow(rustc::default_hash_types)]
 #![recursion_limit = "128"]
 
-extern crate proc_macro;
-
 use synstructure::decl_derive;
 
 use proc_macro::TokenStream;
diff --git a/src/librustc_macros/src/lift.rs b/src/librustc_macros/src/lift.rs
index 1b91fc5018..a246b34b2c 100644
--- a/src/librustc_macros/src/lift.rs
+++ b/src/librustc_macros/src/lift.rs
@@ -1,7 +1,5 @@
-use proc_macro2;
 use quote::quote;
 use syn::{self, parse_quote};
-use synstructure;
 
 pub fn lift_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
     s.add_bounds(synstructure::AddBounds::Generics);
diff --git a/src/librustc_macros/src/query.rs b/src/librustc_macros/src/query.rs
index f680b0d64c..56b7be2f7e 100644
--- a/src/librustc_macros/src/query.rs
+++ b/src/librustc_macros/src/query.rs
@@ -1,8 +1,6 @@
-use itertools::Itertools;
 use proc_macro::TokenStream;
 use proc_macro2::{Delimiter, TokenTree};
 use quote::quote;
-use syn;
 use syn::parse::{Parse, ParseStream, Result};
 use syn::punctuated::Punctuated;
 use syn::spanned::Spanned;
@@ -35,6 +33,9 @@ enum QueryModifier {
     /// The description of the query.
     Desc(Option<Ident>, Punctuated<Expr, Token![,]>),
 
+    /// Use this type for the in-memory cache.
+    Storage(Type),
+
     /// Cache the query to disk if the `Expr` returns true.
     Cache(Option<(IdentOrWild, IdentOrWild)>, Block),
 
@@ -50,13 +51,10 @@ enum QueryModifier {
     /// Don't hash the result, instead just mark a query red if it runs
     NoHash,
 
-    /// Don't force the query
-    NoForce,
-
     /// Generate a dep node based on the dependencies of the query
     Anon,
 
-    /// Always evaluate the query, ignoring its depdendencies
+    /// Always evaluate the query, ignoring its dependencies
     EvalAlways,
 }
 
@@ -108,14 +106,15 @@ impl Parse for QueryModifier {
             let id = args.parse()?;
             let block = input.parse()?;
             Ok(QueryModifier::LoadCached(tcx, id, block))
+        } else if modifier == "storage" {
+            let ty = input.parse()?;
+            Ok(QueryModifier::Storage(ty))
         } else if modifier == "fatal_cycle" {
             Ok(QueryModifier::FatalCycle)
         } else if modifier == "cycle_delay_bug" {
             Ok(QueryModifier::CycleDelayBug)
         } else if modifier == "no_hash" {
             Ok(QueryModifier::NoHash)
-        } else if modifier == "no_force" {
-            Ok(QueryModifier::NoForce)
         } else if modifier == "anon" {
             Ok(QueryModifier::Anon)
         } else if modifier == "eval_always" {
@@ -200,6 +199,9 @@ struct QueryModifiers {
     /// The description of the query.
     desc: Option<(Option<Ident>, Punctuated<Expr, Token![,]>)>,
 
+    /// Use this type for the in-memory cache.
+    storage: Option<Type>,
+
     /// Cache the query to disk if the `Block` returns true.
     cache: Option<(Option<(IdentOrWild, IdentOrWild)>, Block)>,
 
@@ -215,25 +217,22 @@ struct QueryModifiers {
     /// Don't hash the result, instead just mark a query red if it runs
     no_hash: bool,
 
-    /// Don't force the query
-    no_force: bool,
-
     /// Generate a dep node based on the dependencies of the query
     anon: bool,
 
-    // Always evaluate the query, ignoring its depdendencies
+    // Always evaluate the query, ignoring its dependencies
     eval_always: bool,
 }
 
 /// Process query modifiers into a struct, erroring on duplicates
 fn process_modifiers(query: &mut Query) -> QueryModifiers {
     let mut load_cached = None;
+    let mut storage = None;
     let mut cache = None;
     let mut desc = None;
     let mut fatal_cycle = false;
     let mut cycle_delay_bug = false;
     let mut no_hash = false;
-    let mut no_force = false;
     let mut anon = false;
     let mut eval_always = false;
     for modifier in query.modifiers.0.drain(..) {
@@ -244,6 +243,12 @@ fn process_modifiers(query: &mut Query) -> QueryModifiers {
                 }
                 load_cached = Some((tcx, id, block));
             }
+            QueryModifier::Storage(ty) => {
+                if storage.is_some() {
+                    panic!("duplicate modifier `storage` for query `{}`", query.name);
+                }
+                storage = Some(ty);
+            }
             QueryModifier::Cache(args, expr) => {
                 if cache.is_some() {
                     panic!("duplicate modifier `cache` for query `{}`", query.name);
@@ -274,12 +279,6 @@ fn process_modifiers(query: &mut Query) -> QueryModifiers {
                 }
                 no_hash = true;
             }
-            QueryModifier::NoForce => {
-                if no_force {
-                    panic!("duplicate modifier `no_force` for query `{}`", query.name);
-                }
-                no_force = true;
-            }
             QueryModifier::Anon => {
                 if anon {
                     panic!("duplicate modifier `anon` for query `{}`", query.name);
@@ -296,12 +295,12 @@ fn process_modifiers(query: &mut Query) -> QueryModifiers {
     }
     QueryModifiers {
         load_cached,
+        storage,
         cache,
         desc,
         fatal_cycle,
         cycle_delay_bug,
         no_hash,
-        no_force,
         anon,
         eval_always,
     }
@@ -410,7 +409,6 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
     let mut dep_node_def_stream = quote! {};
     let mut dep_node_force_stream = quote! {};
     let mut try_load_from_on_disk_cache_stream = quote! {};
-    let mut no_force_queries = Vec::new();
     let mut cached_queries = quote! {};
 
     for group in groups.0 {
@@ -429,19 +427,19 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
                 cached_queries.extend(quote! {
                     #name,
                 });
-            }
 
-            if modifiers.cache.is_some() && !modifiers.no_force {
                 try_load_from_on_disk_cache_stream.extend(quote! {
                     DepKind::#name => {
-                        debug_assert!(tcx.dep_graph
-                                         .node_color(self)
-                                         .map(|c| c.is_green())
-                                         .unwrap_or(false));
-
-                        let key = RecoverKey::recover(tcx, self).unwrap();
-                        if queries::#name::cache_on_disk(tcx, key, None) {
-                            let _ = tcx.#name(key);
+                        if <#arg as DepNodeParams>::CAN_RECONSTRUCT_QUERY_KEY {
+                            debug_assert!($tcx.dep_graph
+                                            .node_color($dep_node)
+                                            .map(|c| c.is_green())
+                                            .unwrap_or(false));
+
+                            let key = <#arg as DepNodeParams>::recover($tcx, $dep_node).unwrap();
+                            if queries::#name::cache_on_disk($tcx, key, None) {
+                                let _ = $tcx.#name(key);
+                            }
                         }
                     }
                 });
@@ -453,6 +451,10 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
             if modifiers.fatal_cycle {
                 attributes.push(quote! { fatal_cycle });
             };
+            // Pass on the storage modifier
+            if let Some(ref ty) = modifiers.storage {
+                attributes.push(quote! { storage(#ty) });
+            };
             // Pass on the cycle_delay_bug modifier
             if modifiers.cycle_delay_bug {
                 attributes.push(quote! { cycle_delay_bug });
@@ -470,10 +472,7 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
                 attributes.push(quote! { eval_always });
             };
 
-            let mut attribute_stream = quote! {};
-            for e in attributes.into_iter().intersperse(quote! {,}) {
-                attribute_stream.extend(e);
-            }
+            let attribute_stream = quote! {#(#attributes),*};
 
             // Add the query to the group
             group_stream.extend(quote! {
@@ -485,24 +484,21 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
                 [#attribute_stream] #name(#arg),
             });
 
-            if modifiers.no_force {
-                no_force_queries.push(name.clone());
-            } else {
-                // Add a match arm to force the query given the dep node
-                dep_node_force_stream.extend(quote! {
-                    DepKind::#name => {
-                        if let Some(key) = RecoverKey::recover($tcx, $dep_node) {
+            // Add a match arm to force the query given the dep node
+            dep_node_force_stream.extend(quote! {
+                DepKind::#name => {
+                    if <#arg as DepNodeParams>::CAN_RECONSTRUCT_QUERY_KEY {
+                        if let Some(key) = <#arg as DepNodeParams>::recover($tcx, $dep_node) {
                             $tcx.force_query::<crate::ty::query::queries::#name<'_>>(
                                 key,
                                 DUMMY_SP,
                                 *$dep_node
                             );
-                        } else {
-                            return false;
+                            return true;
                         }
                     }
-                });
-            }
+                }
+            });
 
             add_query_description_impl(&query, modifiers, &mut query_description_stream);
         }
@@ -512,12 +508,6 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
         });
     }
 
-    // Add an arm for the no force queries to panic when trying to force them
-    for query in no_force_queries {
-        dep_node_force_stream.extend(quote! {
-            DepKind::#query |
-        });
-    }
     dep_node_force_stream.extend(quote! {
         DepKind::Null => {
             bug!("Cannot force dep node: {:?}", $dep_node)
@@ -561,14 +551,9 @@ pub fn rustc_queries(input: TokenStream) -> TokenStream {
 
         #query_description_stream
 
-        impl DepNode {
-            /// Check whether the query invocation corresponding to the given
-            /// DepNode is eligible for on-disk-caching. If so, this is method
-            /// will execute the query corresponding to the given DepNode.
-            /// Also, as a sanity check, it expects that the corresponding query
-            /// invocation has been marked as green already.
-            pub fn try_load_from_on_disk_cache(&self, tcx: TyCtxt<'_>) {
-                match self.kind {
+        macro_rules! rustc_dep_node_try_load_from_on_disk_cache {
+            ($dep_node:expr, $tcx:expr) => {
+                match $dep_node.kind {
                     #try_load_from_on_disk_cache_stream
                     _ => (),
                 }
diff --git a/src/librustc_macros/src/symbols.rs b/src/librustc_macros/src/symbols.rs
index c692c7f399..feddcd5f99 100644
--- a/src/librustc_macros/src/symbols.rs
+++ b/src/librustc_macros/src/symbols.rs
@@ -1,7 +1,6 @@
 use proc_macro::TokenStream;
 use quote::quote;
 use std::collections::HashSet;
-use syn;
 use syn::parse::{Parse, ParseStream, Result};
 use syn::{braced, parse_macro_input, Ident, LitStr, Token};
 
diff --git a/src/librustc_macros/src/type_foldable.rs b/src/librustc_macros/src/type_foldable.rs
index 3d58984a90..687401e334 100644
--- a/src/librustc_macros/src/type_foldable.rs
+++ b/src/librustc_macros/src/type_foldable.rs
@@ -1,6 +1,4 @@
 use quote::quote;
-use syn;
-use synstructure;
 
 pub fn type_foldable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
     if let syn::Data::Union(_) = s.ast().data {
diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml
index 6da584733a..8abfb20965 100644
--- a/src/librustc_metadata/Cargo.toml
+++ b/src/librustc_metadata/Cargo.toml
@@ -15,6 +15,8 @@ log = "0.4"
 memmap = "0.7"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 rustc = { path = "../librustc" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
@@ -22,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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_expand = { path = "../librustc_expand" }
 rustc_parse = { path = "../librustc_parse" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_metadata/creader.rs b/src/librustc_metadata/creader.rs
index 351e72d467..18b4c9ad50 100644
--- a/src/librustc_metadata/creader.rs
+++ b/src/librustc_metadata/creader.rs
@@ -10,6 +10,9 @@ use rustc::session::config;
 use rustc::session::search_paths::PathKind;
 use rustc::session::{CrateDisambiguator, Session};
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast::expand::allocator::{global_allocator_spans, AllocatorKind};
 use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::struct_span_err;
@@ -20,9 +23,6 @@ use rustc_span::edition::Edition;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::{PanicStrategy, TargetTriple};
-use syntax::ast;
-use syntax::attr;
-use syntax::expand::allocator::{global_allocator_spans, AllocatorKind};
 
 use log::{debug, info, log_enabled};
 use proc_macro::bridge::client::ProcMacro;
@@ -76,6 +76,21 @@ impl<'a> LoadError<'a> {
     }
 }
 
+/// A reference to `CrateMetadata` that can also give access to whole crate store when necessary.
+#[derive(Clone, Copy)]
+crate struct CrateMetadataRef<'a> {
+    pub cdata: &'a CrateMetadata,
+    pub cstore: &'a CStore,
+}
+
+impl std::ops::Deref for CrateMetadataRef<'_> {
+    type Target = CrateMetadata;
+
+    fn deref(&self) -> &Self::Target {
+        self.cdata
+    }
+}
+
 fn dump_crates(cstore: &CStore) {
     info!("resolved crates:");
     cstore.iter_crate_data(|cnum, data| {
@@ -100,10 +115,11 @@ impl CStore {
         CrateNum::new(self.metas.len() - 1)
     }
 
-    crate fn get_crate_data(&self, cnum: CrateNum) -> &CrateMetadata {
-        self.metas[cnum]
+    crate fn get_crate_data(&self, cnum: CrateNum) -> CrateMetadataRef<'_> {
+        let cdata = self.metas[cnum]
             .as_ref()
-            .unwrap_or_else(|| panic!("Failed to get crate data for {:?}", cnum))
+            .unwrap_or_else(|| panic!("Failed to get crate data for {:?}", cnum));
+        CrateMetadataRef { cdata, cstore: self }
     }
 
     fn set_crate_data(&mut self, cnum: CrateNum, data: CrateMetadata) {
@@ -217,7 +233,7 @@ impl<'a> CrateLoader<'a> {
             // We're also sure to compare *paths*, not actual byte slices. The
             // `source` stores paths which are normalized which may be different
             // from the strings on the command line.
-            let source = self.cstore.get_crate_data(cnum).source();
+            let source = self.cstore.get_crate_data(cnum).cdata.source();
             if let Some(entry) = self.sess.opts.externs.get(&name.as_str()) {
                 // Only use `--extern crate_name=path` here, not `--extern crate_name`.
                 if let Some(mut files) = entry.files() {
@@ -463,7 +479,7 @@ impl<'a> CrateLoader<'a> {
             self.load(&mut locator)
                 .map(|r| (r, None))
                 .or_else(|| {
-                    dep_kind = DepKind::UnexportedMacrosOnly;
+                    dep_kind = DepKind::MacrosOnly;
                     self.load_proc_macro(&mut locator, path_kind)
                 })
                 .ok_or_else(move || LoadError::LocatorError(locator))?
@@ -473,7 +489,7 @@ impl<'a> CrateLoader<'a> {
             (LoadResult::Previous(cnum), None) => {
                 let data = self.cstore.get_crate_data(cnum);
                 if data.is_proc_macro_crate() {
-                    dep_kind = DepKind::UnexportedMacrosOnly;
+                    dep_kind = DepKind::MacrosOnly;
                 }
                 data.update_dep_kind(|data_dep_kind| cmp::max(data_dep_kind, dep_kind));
                 Ok(cnum)
@@ -547,9 +563,6 @@ impl<'a> CrateLoader<'a> {
                     "resolving dep crate {} hash: `{}` extra filename: `{}`",
                     dep.name, dep.hash, dep.extra_filename
                 );
-                if dep.kind == DepKind::UnexportedMacrosOnly {
-                    return krate;
-                }
                 let dep_kind = match dep_kind {
                     DepKind::MacrosOnly => DepKind::MacrosOnly,
                     _ => dep.kind,
@@ -680,10 +693,7 @@ impl<'a> CrateLoader<'a> {
 
             // Sanity check the loaded crate to ensure it is indeed a profiler runtime
             if !data.is_profiler_runtime() {
-                self.sess.err(&format!(
-                    "the crate `profiler_builtins` is not \
-                                        a profiler runtime"
-                ));
+                self.sess.err("the crate `profiler_builtins` is not a profiler runtime");
             }
         }
     }
@@ -694,7 +704,7 @@ impl<'a> CrateLoader<'a> {
                 self.sess
                     .struct_span_err(*span2, "cannot define multiple global allocators")
                     .span_label(*span2, "cannot define a new global allocator")
-                    .span_label(*span1, "previous global allocator is defined here")
+                    .span_label(*span1, "previous global allocator defined here")
                     .emit();
                 true
             }
@@ -853,7 +863,7 @@ impl<'a> CrateLoader<'a> {
                     None => item.ident.name,
                 };
                 let dep_kind = if attr::contains_name(&item.attrs, sym::no_link) {
-                    DepKind::UnexportedMacrosOnly
+                    DepKind::MacrosOnly
                 } else {
                     DepKind::Explicit
                 };
diff --git a/src/librustc_metadata/dependency_format.rs b/src/librustc_metadata/dependency_format.rs
index 375f372005..9e71839dbf 100644
--- a/src/librustc_metadata/dependency_format.rs
+++ b/src/librustc_metadata/dependency_format.rs
@@ -339,7 +339,7 @@ fn activate_injected_dep(
 // there's only going to be one allocator in the output.
 fn verify_ok(tcx: TyCtxt<'_>, list: &[Linkage]) {
     let sess = &tcx.sess;
-    if list.len() == 0 {
+    if list.is_empty() {
         return;
     }
     let mut panic_runtime = None;
diff --git a/src/librustc_metadata/lib.rs b/src/librustc_metadata/lib.rs
index cf925ab918..d4cc3c3261 100644
--- a/src/librustc_metadata/lib.rs
+++ b/src/librustc_metadata/lib.rs
@@ -1,16 +1,11 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(bool_to_option)]
-#![feature(box_patterns)]
 #![feature(core_intrinsics)]
 #![feature(crate_visibility_modifier)]
 #![feature(drain_filter)]
 #![feature(in_band_lifetimes)]
-#![feature(libc)]
 #![feature(nll)]
 #![feature(proc_macro_internals)]
-#![feature(proc_macro_quote)]
-#![feature(rustc_private)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(specialization)]
 #![feature(stmt_expr_attributes)]
 #![recursion_limit = "256"]
diff --git a/src/librustc_metadata/locator.rs b/src/librustc_metadata/locator.rs
index 2157b8ce15..efa259d0c4 100644
--- a/src/librustc_metadata/locator.rs
+++ b/src/librustc_metadata/locator.rs
@@ -711,7 +711,7 @@ impl<'a> CrateLocator<'a> {
         // See also #68149 which provides more detail on why emitting the
         // dependency on the rlib is a bad thing.
         //
-        // We currenty do not verify that these other sources are even in sync,
+        // We currently do not verify that these other sources are even in sync,
         // and this is arguably a bug (see #10786), but because reading metadata
         // is quite slow (especially from dylibs) we currently do not read it
         // from the other crate sources.
diff --git a/src/librustc_metadata/native_libs.rs b/src/librustc_metadata/native_libs.rs
index bbf6973be5..2fa9cb099d 100644
--- a/src/librustc_metadata/native_libs.rs
+++ b/src/librustc_metadata/native_libs.rs
@@ -2,6 +2,7 @@ use rustc::middle::cstore::{self, NativeLibrary};
 use rustc::session::parse::feature_err;
 use rustc::session::Session;
 use rustc::ty::TyCtxt;
+use rustc_attr as attr;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
@@ -9,7 +10,6 @@ use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_span::source_map::Span;
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_target::spec::abi::Abi;
-use syntax::attr;
 
 crate fn collect(tcx: TyCtxt<'_>) -> Vec<NativeLibrary> {
     let mut collector = Collector { tcx, libs: Vec::new() };
diff --git a/src/librustc_metadata/rmeta/decoder.rs b/src/librustc_metadata/rmeta/decoder.rs
index 6280121f65..e60ae5b6c2 100644
--- a/src/librustc_metadata/rmeta/decoder.rs
+++ b/src/librustc_metadata/rmeta/decoder.rs
@@ -1,5 +1,6 @@
 // Decoding metadata from a single crate's metadata
 
+use crate::creader::CrateMetadataRef;
 use crate::rmeta::table::{FixedSizeEncoding, Table};
 use crate::rmeta::*;
 
@@ -34,14 +35,14 @@ use std::u32;
 
 use log::debug;
 use proc_macro::bridge::client::ProcMacro;
+use rustc_ast::ast::{self, Ident};
+use rustc_attr as attr;
 use rustc_expand::base::{SyntaxExtension, SyntaxExtensionKind};
 use rustc_expand::proc_macro::{AttrProcMacro, BangProcMacro, ProcMacroDerive};
 use rustc_serialize::{opaque, Decodable, Decoder, SpecializedDecoder};
 use rustc_span::source_map::{self, respan, Spanned};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{self, hygiene::MacroKind, BytePos, Pos, Span, DUMMY_SP};
-use syntax::ast::{self, Ident};
-use syntax::attr;
 
 pub use cstore_impl::{provide, provide_extern};
 
@@ -125,7 +126,7 @@ struct ImportedSourceFile {
 
 pub(super) struct DecodeContext<'a, 'tcx> {
     opaque: opaque::Decoder<'a>,
-    cdata: Option<&'a CrateMetadata>,
+    cdata: Option<CrateMetadataRef<'a>>,
     sess: Option<&'tcx Session>,
     tcx: Option<TyCtxt<'tcx>>,
 
@@ -141,7 +142,7 @@ pub(super) struct DecodeContext<'a, 'tcx> {
 /// Abstract over the various ways one can create metadata decoders.
 pub(super) trait Metadata<'a, 'tcx>: Copy {
     fn raw_bytes(self) -> &'a [u8];
-    fn cdata(self) -> Option<&'a CrateMetadata> {
+    fn cdata(self) -> Option<CrateMetadataRef<'a>> {
         None
     }
     fn sess(self) -> Option<&'tcx Session> {
@@ -162,7 +163,7 @@ pub(super) trait Metadata<'a, 'tcx>: Copy {
             lazy_state: LazyState::NoNode,
             alloc_decoding_session: self
                 .cdata()
-                .map(|cdata| cdata.alloc_decoding_state.new_decoding_session()),
+                .map(|cdata| cdata.cdata.alloc_decoding_state.new_decoding_session()),
         }
     }
 }
@@ -185,33 +186,33 @@ impl<'a, 'tcx> Metadata<'a, 'tcx> for (&'a MetadataBlob, &'tcx Session) {
     }
 }
 
-impl<'a, 'tcx> Metadata<'a, 'tcx> for &'a CrateMetadata {
+impl<'a, 'tcx> Metadata<'a, 'tcx> for &'a CrateMetadataRef<'a> {
     fn raw_bytes(self) -> &'a [u8] {
         self.blob.raw_bytes()
     }
-    fn cdata(self) -> Option<&'a CrateMetadata> {
-        Some(self)
+    fn cdata(self) -> Option<CrateMetadataRef<'a>> {
+        Some(*self)
     }
 }
 
-impl<'a, 'tcx> Metadata<'a, 'tcx> for (&'a CrateMetadata, &'tcx Session) {
+impl<'a, 'tcx> Metadata<'a, 'tcx> for (&'a CrateMetadataRef<'a>, &'tcx Session) {
     fn raw_bytes(self) -> &'a [u8] {
         self.0.raw_bytes()
     }
-    fn cdata(self) -> Option<&'a CrateMetadata> {
-        Some(self.0)
+    fn cdata(self) -> Option<CrateMetadataRef<'a>> {
+        Some(*self.0)
     }
     fn sess(self) -> Option<&'tcx Session> {
         Some(&self.1)
     }
 }
 
-impl<'a, 'tcx> Metadata<'a, 'tcx> for (&'a CrateMetadata, TyCtxt<'tcx>) {
+impl<'a, 'tcx> Metadata<'a, 'tcx> for (&'a CrateMetadataRef<'a>, TyCtxt<'tcx>) {
     fn raw_bytes(self) -> &'a [u8] {
         self.0.raw_bytes()
     }
-    fn cdata(self) -> Option<&'a CrateMetadata> {
-        Some(self.0)
+    fn cdata(self) -> Option<CrateMetadataRef<'a>> {
+        Some(*self.0)
     }
     fn tcx(self) -> Option<TyCtxt<'tcx>> {
         Some(self.1)
@@ -242,7 +243,7 @@ impl<'a, 'tcx> DecodeContext<'a, 'tcx> {
         self.tcx.expect("missing TyCtxt in DecodeContext")
     }
 
-    fn cdata(&self) -> &'a CrateMetadata {
+    fn cdata(&self) -> CrateMetadataRef<'a> {
         self.cdata.expect("missing CrateMetadata in DecodeContext")
     }
 
@@ -408,20 +409,12 @@ impl<'a, 'tcx> SpecializedDecoder<Span> for DecodeContext<'a, 'tcx> {
             {
                 last_source_file
             } else {
-                let mut a = 0;
-                let mut b = imported_source_files.len();
-
-                while b - a > 1 {
-                    let m = (a + b) / 2;
-                    if imported_source_files[m].original_start_pos > lo {
-                        b = m;
-                    } else {
-                        a = m;
-                    }
-                }
+                let index = imported_source_files
+                    .binary_search_by_key(&lo, |source_file| source_file.original_start_pos)
+                    .unwrap_or_else(|index| index - 1);
 
-                self.last_source_file_index = a;
-                &imported_source_files[a]
+                self.last_source_file_index = index;
+                &imported_source_files[index]
             }
         };
 
@@ -500,7 +493,7 @@ impl MetadataBlob {
     }
 }
 
-impl<'tcx> EntryKind<'tcx> {
+impl EntryKind {
     fn def_kind(&self) -> Option<DefKind> {
         Some(match *self {
             EntryKind::Const(..) => DefKind::Const,
@@ -566,59 +559,16 @@ impl CrateRoot<'_> {
     }
 }
 
-impl<'a, 'tcx> CrateMetadata {
-    crate fn new(
-        sess: &Session,
-        blob: MetadataBlob,
-        root: CrateRoot<'static>,
-        raw_proc_macros: Option<&'static [ProcMacro]>,
-        cnum: CrateNum,
-        cnum_map: CrateNumMap,
-        dep_kind: DepKind,
-        source: CrateSource,
-        private_dep: bool,
-        host_hash: Option<Svh>,
-    ) -> CrateMetadata {
-        let def_path_table = record_time(&sess.perf_stats.decode_def_path_tables_time, || {
-            root.def_path_table.decode((&blob, sess))
-        });
-        let trait_impls = root
-            .impls
-            .decode((&blob, sess))
-            .map(|trait_impls| (trait_impls.trait_id, trait_impls.impls))
-            .collect();
-        let alloc_decoding_state =
-            AllocDecodingState::new(root.interpret_alloc_index.decode(&blob).collect());
-        let dependencies = Lock::new(cnum_map.iter().cloned().collect());
-        CrateMetadata {
-            blob,
-            root,
-            def_path_table,
-            trait_impls,
-            raw_proc_macros,
-            source_map_import_info: Once::new(),
-            alloc_decoding_state,
-            dep_node_index: AtomicCell::new(DepNodeIndex::INVALID),
-            cnum,
-            cnum_map,
-            dependencies,
-            dep_kind: Lock::new(dep_kind),
-            source,
-            private_dep,
-            host_hash,
-            extern_crate: Lock::new(None),
-        }
-    }
-
+impl<'a, 'tcx> CrateMetadataRef<'a> {
     fn is_proc_macro(&self, id: DefIndex) -> bool {
         self.root.proc_macro_data.and_then(|data| data.decode(self).find(|x| *x == id)).is_some()
     }
 
-    fn maybe_kind(&self, item_id: DefIndex) -> Option<EntryKind<'tcx>> {
+    fn maybe_kind(&self, item_id: DefIndex) -> Option<EntryKind> {
         self.root.per_def.kind.get(self, item_id).map(|k| k.decode(self))
     }
 
-    fn kind(&self, item_id: DefIndex) -> EntryKind<'tcx> {
+    fn kind(&self, item_id: DefIndex) -> EntryKind {
         assert!(!self.is_proc_macro(item_id));
         self.maybe_kind(item_id).unwrap_or_else(|| {
             bug!(
@@ -630,17 +580,9 @@ impl<'a, 'tcx> CrateMetadata {
         })
     }
 
-    fn local_def_id(&self, index: DefIndex) -> DefId {
-        DefId { krate: self.cnum, index }
-    }
-
     fn raw_proc_macro(&self, id: DefIndex) -> &ProcMacro {
         // DefIndex's in root.proc_macro_data have a one-to-one correspondence
         // with items in 'raw_proc_macros'.
-        // NOTE: If you update the order of macros in 'proc_macro_data' for any reason,
-        // you must also update src/librustc_builtin_macros/proc_macro_harness.rs
-        // Failing to do so will result in incorrect data being associated
-        // with proc macros when deserialized.
         let pos = self.root.proc_macro_data.unwrap().decode(self).position(|i| i == id).unwrap();
         &self.raw_proc_macros.unwrap()[pos]
     }
@@ -727,7 +669,7 @@ impl<'a, 'tcx> CrateMetadata {
     fn get_variant(
         &self,
         tcx: TyCtxt<'tcx>,
-        kind: &EntryKind<'_>,
+        kind: &EntryKind,
         index: DefIndex,
         parent_did: DefId,
     ) -> ty::VariantDef {
@@ -1203,18 +1145,6 @@ impl<'a, 'tcx> CrateMetadata {
             .collect()
     }
 
-    // Translate a DefId from the current compilation environment to a DefId
-    // for an external crate.
-    fn reverse_translate_def_id(&self, did: DefId) -> Option<DefId> {
-        for (local, &global) in self.cnum_map.iter_enumerated() {
-            if global == did.krate {
-                return Some(DefId { krate: local, index: did.index });
-            }
-        }
-
-        None
-    }
-
     fn get_inherent_implementations_for_type(
         &self,
         tcx: TyCtxt<'tcx>,
@@ -1394,6 +1324,13 @@ impl<'a, 'tcx> CrateMetadata {
         }
     }
 
+    fn generator_kind(&self, id: DefIndex) -> Option<hir::GeneratorKind> {
+        match self.kind(id) {
+            EntryKind::Generator(data) => Some(data),
+            _ => None,
+        }
+    }
+
     fn fn_sig(&self, id: DefIndex, tcx: TyCtxt<'tcx>) -> ty::PolyFnSig<'tcx> {
         self.root.per_def.fn_sig.get(self, id).unwrap().decode((self, tcx))
     }
@@ -1414,11 +1351,6 @@ impl<'a, 'tcx> CrateMetadata {
         DefPath::make(self.cnum, id, |parent| self.def_key(parent))
     }
 
-    #[inline]
-    fn def_path_hash(&self, index: DefIndex) -> DefPathHash {
-        self.def_path_table.def_path_hash(index)
-    }
-
     /// Imports the source_map from an external crate into the source_map of the crate
     /// currently being compiled (the "local crate").
     ///
@@ -1445,10 +1377,10 @@ impl<'a, 'tcx> CrateMetadata {
     /// Proc macro crates don't currently export spans, so this function does not have
     /// to work for them.
     fn imported_source_files(
-        &'a self,
+        &self,
         local_source_map: &source_map::SourceMap,
-    ) -> &[ImportedSourceFile] {
-        self.source_map_import_info.init_locking(|| {
+    ) -> &'a [ImportedSourceFile] {
+        self.cdata.source_map_import_info.init_locking(|| {
             let external_source_map = self.root.source_map.decode(self);
 
             external_source_map
@@ -1503,8 +1435,8 @@ impl<'a, 'tcx> CrateMetadata {
                     );
                     debug!(
                         "CrateMetaData::imported_source_files alloc \
-                        source_file {:?} original (start_pos {:?} end_pos {:?}) \
-                        translated (start_pos {:?} end_pos {:?})",
+                         source_file {:?} original (start_pos {:?} end_pos {:?}) \
+                         translated (start_pos {:?} end_pos {:?})",
                         local_version.name,
                         start_pos,
                         end_pos,
@@ -1521,29 +1453,50 @@ impl<'a, 'tcx> CrateMetadata {
                 .collect()
         })
     }
+}
 
-    /// Get the `DepNodeIndex` corresponding this crate. The result of this
-    /// method is cached in the `dep_node_index` field.
-    fn get_crate_dep_node_index(&self, tcx: TyCtxt<'tcx>) -> DepNodeIndex {
-        let mut dep_node_index = self.dep_node_index.load();
-
-        if unlikely!(dep_node_index == DepNodeIndex::INVALID) {
-            // We have not cached the DepNodeIndex for this upstream crate yet,
-            // so use the dep-graph to find it out and cache it.
-            // Note that multiple threads can enter this block concurrently.
-            // That is fine because the DepNodeIndex remains constant
-            // throughout the whole compilation session, and multiple stores
-            // would always write the same value.
-
-            let def_path_hash = self.def_path_hash(CRATE_DEF_INDEX);
-            let dep_node = def_path_hash.to_dep_node(dep_graph::DepKind::CrateMetadata);
-
-            dep_node_index = tcx.dep_graph.dep_node_index_of(&dep_node);
-            assert!(dep_node_index != DepNodeIndex::INVALID);
-            self.dep_node_index.store(dep_node_index);
+impl CrateMetadata {
+    crate fn new(
+        sess: &Session,
+        blob: MetadataBlob,
+        root: CrateRoot<'static>,
+        raw_proc_macros: Option<&'static [ProcMacro]>,
+        cnum: CrateNum,
+        cnum_map: CrateNumMap,
+        dep_kind: DepKind,
+        source: CrateSource,
+        private_dep: bool,
+        host_hash: Option<Svh>,
+    ) -> CrateMetadata {
+        let def_path_table = record_time(&sess.perf_stats.decode_def_path_tables_time, || {
+            root.def_path_table.decode((&blob, sess))
+        });
+        let trait_impls = root
+            .impls
+            .decode((&blob, sess))
+            .map(|trait_impls| (trait_impls.trait_id, trait_impls.impls))
+            .collect();
+        let alloc_decoding_state =
+            AllocDecodingState::new(root.interpret_alloc_index.decode(&blob).collect());
+        let dependencies = Lock::new(cnum_map.iter().cloned().collect());
+        CrateMetadata {
+            blob,
+            root,
+            def_path_table,
+            trait_impls,
+            raw_proc_macros,
+            source_map_import_info: Once::new(),
+            alloc_decoding_state,
+            dep_node_index: AtomicCell::new(DepNodeIndex::INVALID),
+            cnum,
+            cnum_map,
+            dependencies,
+            dep_kind: Lock::new(dep_kind),
+            source,
+            private_dep,
+            host_hash,
+            extern_crate: Lock::new(None),
         }
-
-        dep_node_index
     }
 
     crate fn dependencies(&self) -> LockGuard<'_, Vec<CrateNum>> {
@@ -1618,10 +1571,55 @@ impl<'a, 'tcx> CrateMetadata {
     crate fn hash(&self) -> Svh {
         self.root.hash
     }
+
+    fn local_def_id(&self, index: DefIndex) -> DefId {
+        DefId { krate: self.cnum, index }
+    }
+
+    // Translate a DefId from the current compilation environment to a DefId
+    // for an external crate.
+    fn reverse_translate_def_id(&self, did: DefId) -> Option<DefId> {
+        for (local, &global) in self.cnum_map.iter_enumerated() {
+            if global == did.krate {
+                return Some(DefId { krate: local, index: did.index });
+            }
+        }
+
+        None
+    }
+
+    #[inline]
+    fn def_path_hash(&self, index: DefIndex) -> DefPathHash {
+        self.def_path_table.def_path_hash(index)
+    }
+
+    /// Get the `DepNodeIndex` corresponding this crate. The result of this
+    /// method is cached in the `dep_node_index` field.
+    fn get_crate_dep_node_index(&self, tcx: TyCtxt<'tcx>) -> DepNodeIndex {
+        let mut dep_node_index = self.dep_node_index.load();
+
+        if unlikely!(dep_node_index == DepNodeIndex::INVALID) {
+            // We have not cached the DepNodeIndex for this upstream crate yet,
+            // so use the dep-graph to find it out and cache it.
+            // Note that multiple threads can enter this block concurrently.
+            // That is fine because the DepNodeIndex remains constant
+            // throughout the whole compilation session, and multiple stores
+            // would always write the same value.
+
+            let def_path_hash = self.def_path_hash(CRATE_DEF_INDEX);
+            let dep_node = def_path_hash.to_dep_node(dep_graph::DepKind::CrateMetadata);
+
+            dep_node_index = tcx.dep_graph.dep_node_index_of(&dep_node);
+            assert!(dep_node_index != DepNodeIndex::INVALID);
+            self.dep_node_index.store(dep_node_index);
+        }
+
+        dep_node_index
+    }
 }
 
 // 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_metadata/rmeta/decoder/cstore_impl.rs b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
index fb7e5541e2..c890640d43 100644
--- a/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
+++ b/src/librustc_metadata/rmeta/decoder/cstore_impl.rs
@@ -7,7 +7,7 @@ use crate::rmeta::{self, encoder};
 use rustc::hir::exports::Export;
 use rustc::hir::map::definitions::DefPathTable;
 use rustc::hir::map::{DefKey, DefPath, DefPathHash};
-use rustc::middle::cstore::{CrateSource, CrateStore, DepKind, EncodedMetadata, NativeLibraryKind};
+use rustc::middle::cstore::{CrateSource, CrateStore, EncodedMetadata, NativeLibraryKind};
 use rustc::middle::exported_symbols::ExportedSymbol;
 use rustc::middle::stability::DeprecationEntry;
 use rustc::session::{CrateDisambiguator, Session};
@@ -25,15 +25,15 @@ use smallvec::SmallVec;
 use std::any::Any;
 use std::sync::Arc;
 
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast::expand::allocator::AllocatorKind;
+use rustc_ast::ptr::P;
+use rustc_ast::tokenstream::DelimSpan;
 use rustc_span::source_map;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::Symbol;
 use rustc_span::{FileName, Span};
-use syntax::ast;
-use syntax::attr;
-use syntax::expand::allocator::AllocatorKind;
-use syntax::ptr::P;
-use syntax::tokenstream::DelimSpan;
 
 macro_rules! provide {
     (<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident,
@@ -134,6 +134,7 @@ provide! { <'tcx> tcx, def_id, other, cdata,
     asyncness => { cdata.asyncness(def_id.index) }
     is_foreign_item => { cdata.is_foreign_item(def_id.index) }
     static_mutability => { cdata.static_mutability(def_id.index) }
+    generator_kind => { cdata.generator_kind(def_id.index) }
     def_kind => { cdata.def_kind(def_id.index) }
     def_span => { cdata.get_span(def_id.index, &tcx.sess) }
     lookup_stability => {
@@ -392,14 +393,6 @@ pub fn provide(providers: &mut Providers<'_>) {
 }
 
 impl CStore {
-    pub fn export_macros_untracked(&self, cnum: CrateNum) {
-        let data = self.get_crate_data(cnum);
-        let mut dep_kind = data.dep_kind.lock();
-        if *dep_kind == DepKind::UnexportedMacrosOnly {
-            *dep_kind = DepKind::MacrosOnly;
-        }
-    }
-
     pub fn struct_field_names_untracked(&self, def: DefId, sess: &Session) -> Vec<Spanned<Symbol>> {
         self.get_crate_data(def.krate).get_struct_field_names(def.index, sess)
     }
@@ -524,7 +517,7 @@ impl CrateStore for CStore {
     }
 
     fn def_path_table(&self, cnum: CrateNum) -> &DefPathTable {
-        &self.get_crate_data(cnum).def_path_table
+        &self.get_crate_data(cnum).cdata.def_path_table
     }
 
     fn crates_untracked(&self) -> Vec<CrateNum> {
diff --git a/src/librustc_metadata/rmeta/encoder.rs b/src/librustc_metadata/rmeta/encoder.rs
index 9d2bea28c8..7624b1d562 100644
--- a/src/librustc_metadata/rmeta/encoder.rs
+++ b/src/librustc_metadata/rmeta/encoder.rs
@@ -25,6 +25,8 @@ use rustc_data_structures::sync::Lrc;
 use rustc_serialize::{opaque, Encodable, Encoder, SpecializedEncoder};
 
 use log::{debug, trace};
+use rustc_ast::ast;
+use rustc_ast::attr;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym, Ident, Symbol};
 use rustc_span::{self, FileName, SourceFile, Span};
@@ -32,9 +34,6 @@ use std::hash::Hash;
 use std::num::NonZeroUsize;
 use std::path::Path;
 use std::u32;
-use syntax::ast;
-use syntax::attr;
-use syntax::expand::is_proc_macro_attr;
 
 use rustc_hir as hir;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
@@ -307,7 +306,7 @@ impl<'tcx> EncodeContext<'tcx> {
                 assert!(
                     last_min_end <= lazy.position,
                     "make sure that the calls to `lazy*` \
-                    are in the same order as the metadata fields",
+                     are in the same order as the metadata fields",
                 );
                 lazy.position.get() - last_min_end.get()
             }
@@ -494,7 +493,7 @@ impl<'tcx> EncodeContext<'tcx> {
             edition: tcx.sess.edition(),
             has_global_allocator: tcx.has_global_allocator(LOCAL_CRATE),
             has_panic_handler: tcx.has_panic_handler(LOCAL_CRATE),
-            has_default_lib_allocator: has_default_lib_allocator,
+            has_default_lib_allocator,
             plugin_registrar_fn: tcx.plugin_registrar_fn(LOCAL_CRATE).map(|id| id.index),
             proc_macro_decls_static: if is_proc_macro {
                 let id = tcx.proc_macro_decls_static(LOCAL_CRATE).unwrap();
@@ -504,7 +503,7 @@ impl<'tcx> EncodeContext<'tcx> {
             },
             proc_macro_data,
             proc_macro_stability: if is_proc_macro {
-                tcx.lookup_stability(DefId::local(CRATE_DEF_INDEX)).map(|stab| *stab)
+                tcx.lookup_stability(DefId::local(CRATE_DEF_INDEX)).copied()
             } else {
                 None
             },
@@ -796,7 +795,7 @@ impl EncodeContext<'tcx> {
         record!(self.per_def.kind[def_id] <- match trait_item.kind {
             ty::AssocKind::Const => {
                 let rendered =
-                    hir::print::to_string(self.tcx.hir(), |s| s.print_trait_item(ast_item));
+                    hir::print::to_string(&self.tcx.hir(), |s| s.print_trait_item(ast_item));
                 let rendered_const = self.lazy(RenderedConst(rendered));
 
                 EntryKind::AssocConst(
@@ -1009,7 +1008,7 @@ impl EncodeContext<'tcx> {
 
     fn encode_rendered_const_for_body(&mut self, body_id: hir::BodyId) -> Lazy<RenderedConst> {
         let body = self.tcx.hir().body(body_id);
-        let rendered = hir::print::to_string(self.tcx.hir(), |s| s.print_expr(&body.value));
+        let rendered = hir::print::to_string(&self.tcx.hir(), |s| s.print_expr(&body.value));
         let rendered_const = &RenderedConst(rendered);
         self.lazy(rendered_const)
     }
@@ -1236,7 +1235,7 @@ impl EncodeContext<'tcx> {
 
     /// Serialize the text of exported macros
     fn encode_info_for_macro_def(&mut self, macro_def: &hir::MacroDef<'_>) {
-        use syntax::print::pprust;
+        use rustc_ast_pretty::pprust;
         let def_id = self.tcx.hir().local_def_id(macro_def.hir_id);
         record!(self.per_def.kind[def_id] <- EntryKind::MacroDef(self.lazy(MacroDef {
             body: pprust::tts_to_string(macro_def.body.clone()),
@@ -1249,12 +1248,7 @@ impl EncodeContext<'tcx> {
         self.encode_deprecation(def_id);
     }
 
-    fn encode_info_for_generic_param(
-        &mut self,
-        def_id: DefId,
-        kind: EntryKind<'tcx>,
-        encode_type: bool,
-    ) {
+    fn encode_info_for_generic_param(&mut self, def_id: DefId, kind: EntryKind, encode_type: bool) {
         record!(self.per_def.kind[def_id] <- kind);
         record!(self.per_def.visibility[def_id] <- ty::Visibility::Public);
         record!(self.per_def.span[def_id] <- self.tcx.def_span(def_id));
@@ -1272,12 +1266,9 @@ impl EncodeContext<'tcx> {
         let ty = self.tcx.typeck_tables_of(def_id).node_type(hir_id);
 
         record!(self.per_def.kind[def_id] <- match ty.kind {
-            ty::Generator(def_id, ..) => {
-                let layout = self.tcx.generator_layout(def_id);
-                let data = GeneratorData {
-                    layout: layout.clone(),
-                };
-                EntryKind::Generator(self.lazy(data))
+            ty::Generator(..) => {
+                let data = self.tcx.generator_kind(def_id).unwrap();
+                EntryKind::Generator(data)
             }
 
             ty::Closure(..) => EntryKind::Closure,
@@ -1328,13 +1319,7 @@ impl EncodeContext<'tcx> {
         let is_proc_macro = self.tcx.sess.crate_types.borrow().contains(&CrateType::ProcMacro);
         if is_proc_macro {
             let tcx = self.tcx;
-            Some(self.lazy(tcx.hir().krate().items.values().filter_map(|item| {
-                if item.attrs.iter().any(|attr| is_proc_macro_attr(attr)) {
-                    Some(item.hir_id.owner)
-                } else {
-                    None
-                }
-            })))
+            Some(self.lazy(tcx.hir().krate().proc_macros.iter().map(|p| p.owner)))
         } else {
             None
         }
diff --git a/src/librustc_metadata/rmeta/mod.rs b/src/librustc_metadata/rmeta/mod.rs
index 426ea62b8c..1553b6cf0a 100644
--- a/src/librustc_metadata/rmeta/mod.rs
+++ b/src/librustc_metadata/rmeta/mod.rs
@@ -10,6 +10,8 @@ use rustc::mir;
 use rustc::session::config::SymbolManglingVersion;
 use rustc::session::CrateDisambiguator;
 use rustc::ty::{self, ReprOptions, Ty};
+use rustc_ast::ast;
+use rustc_attr as attr;
 use rustc_data_structures::svh::Svh;
 use rustc_data_structures::sync::MetadataRef;
 use rustc_hir as hir;
@@ -21,7 +23,6 @@ use rustc_span::edition::Edition;
 use rustc_span::symbol::Symbol;
 use rustc_span::{self, Span};
 use rustc_target::spec::{PanicStrategy, TargetTriple};
-use syntax::{ast, attr};
 
 use std::marker::PhantomData;
 use std::num::NonZeroUsize;
@@ -200,7 +201,7 @@ crate struct CrateRoot<'tcx> {
 
     per_def: LazyPerDefTables<'tcx>,
 
-    /// The DefIndex's of any proc macros delcared by this crate.
+    /// The DefIndex's of any proc macros declared by this crate.
     proc_macro_data: Option<Lazy<[DefIndex]>>,
 
     compiler_builtins: bool,
@@ -251,7 +252,7 @@ macro_rules! define_per_def_tables {
 }
 
 define_per_def_tables! {
-    kind: Table<DefIndex, Lazy!(EntryKind<'tcx>)>,
+    kind: Table<DefIndex, Lazy<EntryKind>>,
     visibility: Table<DefIndex, Lazy<ty::Visibility>>,
     span: Table<DefIndex, Lazy<Span>>,
     attributes: Table<DefIndex, Lazy<[ast::Attribute]>>,
@@ -278,7 +279,7 @@ define_per_def_tables! {
 }
 
 #[derive(Copy, Clone, RustcEncodable, RustcDecodable)]
-enum EntryKind<'tcx> {
+enum EntryKind {
     Const(mir::ConstQualifs, Lazy<RenderedConst>),
     ImmStatic,
     MutStatic,
@@ -301,7 +302,7 @@ enum EntryKind<'tcx> {
     Mod(Lazy<ModData>),
     MacroDef(Lazy<MacroDef>),
     Closure,
-    Generator(Lazy!(GeneratorData<'tcx>)),
+    Generator(hir::GeneratorKind),
     Trait(Lazy<TraitData>),
     Impl(Lazy<ImplData>),
     Method(Lazy<MethodData>),
diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml
index 00881e3ea6..1ee581e64a 100644
--- a/src/librustc_mir/Cargo.toml
+++ b/src/librustc_mir/Cargo.toml
@@ -15,17 +15,20 @@ dot = { path = "../libgraphviz", package = "graphviz" }
 itertools = "0.8"
 log = "0.4"
 log_settings = "0.1.1"
-polonius-engine = "0.11.0"
+polonius-engine = "0.12.0"
 rustc = { path = "../librustc" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_index = { path = "../librustc_index" }
+rustc_infer = { path = "../librustc_infer" }
 rustc_lexer = { path = "../librustc_lexer" }
 rustc_macros = { path = "../librustc_macros" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_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/borrow_check/constraint_generation.rs b/src/librustc_mir/borrow_check/constraint_generation.rs
index 0f6a360c79..46cfe0897a 100644
--- a/src/librustc_mir/borrow_check/constraint_generation.rs
+++ b/src/librustc_mir/borrow_check/constraint_generation.rs
@@ -1,4 +1,3 @@
-use rustc::infer::InferCtxt;
 use rustc::mir::visit::TyContext;
 use rustc::mir::visit::Visitor;
 use rustc::mir::{
@@ -8,6 +7,7 @@ use rustc::mir::{
 use rustc::ty::fold::TypeFoldable;
 use rustc::ty::subst::SubstsRef;
 use rustc::ty::{self, RegionVid, Ty};
+use rustc_infer::infer::InferCtxt;
 
 use crate::borrow_check::{
     borrow_set::BorrowSet, facts::AllFacts, location::LocationTable, nll::ToRegionVid,
@@ -97,7 +97,7 @@ impl<'cg, 'cx, 'tcx> Visitor<'tcx> for ConstraintGeneration<'cg, 'cx, 'tcx> {
             ));
 
             // If there are borrows on this now dead local, we need to record them as `killed`.
-            if let StatementKind::StorageDead(ref local) = statement.kind {
+            if let StatementKind::StorageDead(local) = statement.kind {
                 record_killed_borrows_for_local(
                     all_facts,
                     self.borrow_set,
@@ -212,7 +212,7 @@ impl<'cx, 'cg, 'tcx> ConstraintGeneration<'cx, 'cg, 'tcx> {
                         local, location
                     );
 
-                    if let Some(borrow_indices) = self.borrow_set.local_map.get(local) {
+                    if let Some(borrow_indices) = self.borrow_set.local_map.get(&local) {
                         for &borrow_index in borrow_indices {
                             let places_conflict = places_conflict::places_conflict(
                                 self.infcx.tcx,
@@ -239,10 +239,10 @@ fn record_killed_borrows_for_local(
     all_facts: &mut AllFacts,
     borrow_set: &BorrowSet<'_>,
     location_table: &LocationTable,
-    local: &Local,
+    local: Local,
     location: Location,
 ) {
-    if let Some(borrow_indices) = borrow_set.local_map.get(local) {
+    if let Some(borrow_indices) = borrow_set.local_map.get(&local) {
         all_facts.killed.reserve(borrow_indices.len());
         for &borrow_index in borrow_indices {
             let location_index = location_table.mid_index(location);
diff --git a/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs b/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
index 521657ea49..8d4afd2c3b 100644
--- a/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/conflict_errors.rs
@@ -3,7 +3,6 @@ use rustc::mir::{
     FakeReadCause, Local, LocalDecl, LocalInfo, LocalKind, Location, Operand, Place, PlaceRef,
     ProjectionElem, Rvalue, Statement, StatementKind, TerminatorKind, VarBindingForm,
 };
-use rustc::traits::error_reporting::suggest_constraining_type_param;
 use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{Applicability, DiagnosticBuilder};
@@ -11,6 +10,7 @@ use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::{AsyncGeneratorKind, GeneratorKind};
 use rustc_index::vec::Idx;
+use rustc_infer::traits::error_reporting::suggest_constraining_type_param;
 use rustc_span::source_map::DesugaringKind;
 use rustc_span::Span;
 
@@ -51,7 +51,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         &mut self,
         location: Location,
         desired_action: InitializationRequiringAction,
-        (moved_place, used_place, span): (PlaceRef<'cx, 'tcx>, PlaceRef<'cx, 'tcx>, Span),
+        (moved_place, used_place, span): (PlaceRef<'tcx>, PlaceRef<'tcx>, Span),
         mpi: MovePathIndex,
     ) {
         debug!(
@@ -217,12 +217,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         tcx.hir().get_generics(tcx.closure_base_def_id(self.mir_def_id))
                     {
                         suggest_constraining_type_param(
+                            tcx,
                             generics,
                             &mut err,
                             &param.name.as_str(),
                             "Copy",
                             tcx.sess.source_map(),
                             span,
+                            None,
                         );
                     }
                 }
@@ -395,14 +397,20 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
             (BorrowKind::Mut { .. }, BorrowKind::Mut { .. }) => {
                 first_borrow_desc = "first ";
-                self.cannot_mutably_borrow_multiply(
+                let mut err = self.cannot_mutably_borrow_multiply(
                     span,
                     &desc_place,
                     &msg_place,
                     issued_span,
                     &msg_borrow,
                     None,
-                )
+                );
+                self.suggest_split_at_mut_if_applicable(
+                    &mut err,
+                    &place,
+                    &issued_borrow.borrowed_place,
+                );
+                err
             }
 
             (BorrowKind::Unique, BorrowKind::Unique) => {
@@ -547,6 +555,23 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         err
     }
 
+    fn suggest_split_at_mut_if_applicable(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        place: &Place<'tcx>,
+        borrowed_place: &Place<'tcx>,
+    ) {
+        match (&place.projection[..], &borrowed_place.projection[..]) {
+            ([ProjectionElem::Index(_)], [ProjectionElem::Index(_)]) => {
+                err.help(
+                    "consider using `.split_at_mut(position)` or similar method to obtain \
+                     two mutable non-overlapping sub-slices",
+                );
+            }
+            _ => {}
+        }
+    }
+
     /// Returns the description of the root place for a conflicting borrow and the full
     /// descriptions of the places that caused the conflict.
     ///
@@ -604,8 +629,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                     cursor = proj_base;
 
                     match elem {
-                        ProjectionElem::Field(field, _) if union_ty(local, proj_base).is_some() => {
-                            return Some((PlaceRef { local, projection: proj_base }, field));
+                        ProjectionElem::Field(field, _)
+                            if union_ty(*local, proj_base).is_some() =>
+                        {
+                            return Some((
+                                PlaceRef { local: *local, projection: proj_base },
+                                field,
+                            ));
                         }
                         _ => {}
                     }
@@ -617,19 +647,22 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 // borrowed place and look for a access to a different field of the same union.
                 let Place { local, projection } = second_borrowed_place;
 
-                let mut cursor = projection.as_ref();
+                let mut cursor = &projection[..];
                 while let [proj_base @ .., elem] = cursor {
                     cursor = proj_base;
 
                     if let ProjectionElem::Field(field, _) = elem {
-                        if let Some(union_ty) = union_ty(local, proj_base) {
+                        if let Some(union_ty) = union_ty(*local, proj_base) {
                             if field != target_field
-                                && local == target_base.local
+                                && *local == target_base.local
                                 && proj_base == target_base.projection
                             {
                                 // FIXME when we avoid clone reuse describe_place closure
                                 let describe_base_place = self
-                                    .describe_place(PlaceRef { local, projection: proj_base })
+                                    .describe_place(PlaceRef {
+                                        local: *local,
+                                        projection: proj_base,
+                                    })
                                     .unwrap_or_else(|| "_".to_owned());
 
                                 return Some((
@@ -686,12 +719,12 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         let borrow_span = borrow_spans.var_or_use();
 
         assert!(root_place.projection.is_empty());
-        let proper_span = self.body.local_decls[*root_place.local].source_info.span;
+        let proper_span = self.body.local_decls[root_place.local].source_info.span;
 
         let root_place_projection = self.infcx.tcx.intern_place_elems(root_place.projection);
 
         if self.access_place_error_reported.contains(&(
-            Place { local: *root_place.local, projection: root_place_projection },
+            Place { local: root_place.local, projection: root_place_projection },
             borrow_span,
         )) {
             debug!(
@@ -702,7 +735,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         }
 
         self.access_place_error_reported.insert((
-            Place { local: *root_place.local, projection: root_place_projection },
+            Place { local: root_place.local, projection: root_place_projection },
             borrow_span,
         ));
 
@@ -1139,7 +1172,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             let root_place =
                 self.prefixes(borrow.borrowed_place.as_ref(), PrefixSet::All).last().unwrap();
             let local = root_place.local;
-            match self.body.local_kind(*local) {
+            match self.body.local_kind(local) {
                 LocalKind::ReturnPointer | LocalKind::Temp => {
                     ("temporary value".to_string(), "temporary value created here".to_string())
                 }
@@ -1198,7 +1231,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 GeneratorKind::Async(async_kind) => match async_kind {
                     AsyncGeneratorKind::Block => "async block",
                     AsyncGeneratorKind::Closure => "async closure",
-                    _ => bug!("async block/closure expected, but async funtion found."),
+                    _ => bug!("async block/closure expected, but async function found."),
                 },
                 GeneratorKind::Gen => "generator",
             },
@@ -1224,7 +1257,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             }
             _ => bug!(
                 "report_escaping_closure_capture called with unexpected constraint \
-                       category: `{:?}`",
+                 category: `{:?}`",
                 category
             ),
         };
@@ -1242,24 +1275,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     ) -> DiagnosticBuilder<'cx> {
         let tcx = self.infcx.tcx;
 
-        let escapes_from = if tcx.is_closure(self.mir_def_id) {
-            let tables = tcx.typeck_tables_of(self.mir_def_id);
-            let mir_hir_id = tcx.hir().def_index_to_hir_id(self.mir_def_id.index);
-            match tables.node_type(mir_hir_id).kind {
-                ty::Closure(..) => "closure",
-                ty::Generator(..) => "generator",
-                _ => bug!("Closure body doesn't have a closure or generator type"),
-            }
-        } else {
-            "function"
-        };
+        let (_, escapes_from) = tcx.article_and_description(self.mir_def_id);
 
         let mut err =
             borrowck_errors::borrowed_data_escapes_closure(tcx, escape_span, escapes_from);
 
         err.span_label(
             upvar_span,
-            format!("`{}` is declared here, outside of the {} body", upvar_name, escapes_from),
+            format!("`{}` declared here, outside of the {} body", upvar_name, escapes_from),
         );
 
         err.span_label(borrow_span, format!("borrow is only valid in the {} body", escapes_from));
@@ -1317,7 +1340,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 // there.
                 let mut mpis = vec![mpi];
                 let move_paths = &self.move_data.move_paths;
-                mpis.extend(move_paths[mpi].parents(move_paths));
+                mpis.extend(move_paths[mpi].parents(move_paths).map(|(mpi, _)| mpi));
 
                 for moi in &self.move_data.loc_map[location] {
                     debug!("report_use_of_moved_or_uninitialized: moi={:?}", moi);
@@ -1498,7 +1521,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         err.buffer(&mut self.errors_buffer);
     }
 
-    fn classify_drop_access_kind(&self, place: PlaceRef<'cx, 'tcx>) -> StorageDeadOrDrop<'tcx> {
+    fn classify_drop_access_kind(&self, place: PlaceRef<'tcx>) -> StorageDeadOrDrop<'tcx> {
         let tcx = self.infcx.tcx;
         match place.projection {
             [] => StorageDeadOrDrop::LocalStorageDead,
@@ -1513,9 +1536,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         StorageDeadOrDrop::LocalStorageDead
                         | StorageDeadOrDrop::BoxedStorageDead => {
                             assert!(
-                                Place::ty_from(&place.local, proj_base, *self.body, tcx)
-                                    .ty
-                                    .is_box(),
+                                Place::ty_from(place.local, proj_base, *self.body, tcx).ty.is_box(),
                                 "Drop of value behind a reference or raw pointer"
                             );
                             StorageDeadOrDrop::BoxedStorageDead
@@ -1523,7 +1544,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         StorageDeadOrDrop::Destructor(_) => base_access,
                     },
                     ProjectionElem::Field(..) | ProjectionElem::Downcast(..) => {
-                        let base_ty = Place::ty_from(&place.local, proj_base, *self.body, tcx).ty;
+                        let base_ty = Place::ty_from(place.local, proj_base, *self.body, tcx).ty;
                         match base_ty.kind {
                             ty::Adt(def, _) if def.has_dtor(tcx) => {
                                 // Report the outermost adt with a destructor
@@ -1854,7 +1875,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                 // as the HIR doesn't have full types for closure arguments.
                 let return_ty = *sig.output().skip_binder();
                 let mut return_span = fn_decl.output.span();
-                if let hir::FunctionRetTy::Return(ty) = &fn_decl.output {
+                if let hir::FnRetTy::Return(ty) = &fn_decl.output {
                     if let hir::TyKind::Rptr(lifetime, _) = ty.kind {
                         return_span = lifetime.span;
                     }
diff --git a/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs b/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
index 01b7c5645f..6475677988 100644
--- a/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/explain_borrow.rs
@@ -2,7 +2,6 @@
 
 use std::collections::VecDeque;
 
-use rustc::infer::NLLRegionVariableOrigin;
 use rustc::mir::{
     Body, CastKind, ConstraintCategory, FakeReadCause, Local, Location, Operand, Place, Rvalue,
     Statement, StatementKind, TerminatorKind,
@@ -12,6 +11,7 @@ use rustc::ty::{self, RegionVid, TyCtxt};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{Applicability, DiagnosticBuilder};
 use rustc_index::vec::IndexVec;
+use rustc_infer::infer::NLLRegionVariableOrigin;
 use rustc_span::symbol::Symbol;
 use rustc_span::Span;
 
diff --git a/src/librustc_mir/borrow_check/diagnostics/mod.rs b/src/librustc_mir/borrow_check/diagnostics/mod.rs
index 0fc73d33f9..7110a4a305 100644
--- a/src/librustc_mir/borrow_check/diagnostics/mod.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/mod.rs
@@ -51,7 +51,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     pub(super) fn add_moved_or_invoked_closure_note(
         &self,
         location: Location,
-        place: PlaceRef<'cx, 'tcx>,
+        place: PlaceRef<'tcx>,
         diag: &mut DiagnosticBuilder<'_>,
     ) {
         debug!("add_moved_or_invoked_closure_note: location={:?} place={:?}", location, place);
@@ -139,7 +139,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
     /// End-user visible description of `place` if one can be found. If the
     /// place is a temporary for instance, None will be returned.
-    pub(super) fn describe_place(&self, place_ref: PlaceRef<'cx, 'tcx>) -> Option<String> {
+    pub(super) fn describe_place(&self, place_ref: PlaceRef<'tcx>) -> Option<String> {
         self.describe_place_with_options(place_ref, IncludingDowncast(false))
     }
 
@@ -149,7 +149,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// `Downcast` and `IncludingDowncast` is true
     pub(super) fn describe_place_with_options(
         &self,
-        place: PlaceRef<'cx, 'tcx>,
+        place: PlaceRef<'tcx>,
         including_downcast: IncludingDowncast,
     ) -> Option<String> {
         let mut buf = String::new();
@@ -162,29 +162,29 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// Appends end-user visible description of `place` to `buf`.
     fn append_place_to_string(
         &self,
-        place: PlaceRef<'cx, 'tcx>,
+        place: PlaceRef<'tcx>,
         buf: &mut String,
         mut autoderef: bool,
         including_downcast: &IncludingDowncast,
     ) -> Result<(), ()> {
         match place {
             PlaceRef { local, projection: [] } => {
-                self.append_local_to_string(*local, buf)?;
+                self.append_local_to_string(local, buf)?;
             }
             PlaceRef { local, projection: [ProjectionElem::Deref] }
-                if self.body.local_decls[*local].is_ref_for_guard() =>
+                if self.body.local_decls[local].is_ref_for_guard() =>
             {
                 self.append_place_to_string(
-                    PlaceRef { local: local, projection: &[] },
+                    PlaceRef { local, projection: &[] },
                     buf,
                     autoderef,
                     &including_downcast,
                 )?;
             }
             PlaceRef { local, projection: [ProjectionElem::Deref] }
-                if self.body.local_decls[*local].is_ref_to_static() =>
+                if self.body.local_decls[local].is_ref_to_static() =>
             {
-                let local_info = &self.body.local_decls[*local].local_info;
+                let local_info = &self.body.local_decls[local].local_info;
                 if let LocalInfo::StaticRef { def_id, .. } = *local_info {
                     buf.push_str(&self.infcx.tcx.item_name(def_id).as_str());
                 } else {
@@ -303,11 +303,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     }
 
     /// End-user visible description of the `field`nth field of `base`
-    fn describe_field(&self, place: PlaceRef<'cx, 'tcx>, field: Field) -> String {
+    fn describe_field(&self, place: PlaceRef<'tcx>, field: Field) -> String {
         // FIXME Place2 Make this work iteratively
         match place {
             PlaceRef { local, projection: [] } => {
-                let local = &self.body.local_decls[*local];
+                let local = &self.body.local_decls[local];
                 self.describe_field_from_ty(&local.ty, field, None)
             }
             PlaceRef { local, projection: [proj_base @ .., elem] } => match elem {
@@ -399,7 +399,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
     pub(super) fn borrowed_content_source(
         &self,
-        deref_base: PlaceRef<'cx, 'tcx>,
+        deref_base: PlaceRef<'tcx>,
     ) -> BorrowedContentSource<'tcx> {
         let tcx = self.infcx.tcx;
 
@@ -619,14 +619,14 @@ pub(super) enum BorrowedContentSource<'tcx> {
 impl BorrowedContentSource<'tcx> {
     pub(super) fn describe_for_unnamed_place(&self) -> String {
         match *self {
-            BorrowedContentSource::DerefRawPointer => format!("a raw pointer"),
-            BorrowedContentSource::DerefSharedRef => format!("a shared reference"),
-            BorrowedContentSource::DerefMutableRef => format!("a mutable reference"),
+            BorrowedContentSource::DerefRawPointer => "a raw pointer".to_string(),
+            BorrowedContentSource::DerefSharedRef => "a shared reference".to_string(),
+            BorrowedContentSource::DerefMutableRef => "a mutable reference".to_string(),
             BorrowedContentSource::OverloadedDeref(ty) => {
                 if ty.is_rc() {
-                    format!("an `Rc`")
+                    "an `Rc`".to_string()
                 } else if ty.is_arc() {
-                    format!("an `Arc`")
+                    "an `Arc`".to_string()
                 } else {
                     format!("dereference of `{}`", ty)
                 }
@@ -649,16 +649,16 @@ impl BorrowedContentSource<'tcx> {
 
     pub(super) fn describe_for_immutable_place(&self) -> String {
         match *self {
-            BorrowedContentSource::DerefRawPointer => format!("a `*const` pointer"),
-            BorrowedContentSource::DerefSharedRef => format!("a `&` reference"),
+            BorrowedContentSource::DerefRawPointer => "a `*const` pointer".to_string(),
+            BorrowedContentSource::DerefSharedRef => "a `&` reference".to_string(),
             BorrowedContentSource::DerefMutableRef => {
                 bug!("describe_for_immutable_place: DerefMutableRef isn't immutable")
             }
             BorrowedContentSource::OverloadedDeref(ty) => {
                 if ty.is_rc() {
-                    format!("an `Rc`")
+                    "an `Rc`".to_string()
                 } else if ty.is_arc() {
-                    format!("an `Arc`")
+                    "an `Arc`".to_string()
                 } else {
                     format!("a dereference of `{}`", ty)
                 }
@@ -694,7 +694,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// Finds the spans associated to a move or copy of move_place at location.
     pub(super) fn move_spans(
         &self,
-        moved_place: PlaceRef<'cx, 'tcx>, // Could also be an upvar.
+        moved_place: PlaceRef<'tcx>, // Could also be an upvar.
         location: Location,
     ) -> UseSpans {
         use self::UseSpans::*;
@@ -782,7 +782,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     fn closure_span(
         &self,
         def_id: DefId,
-        target_place: PlaceRef<'cx, 'tcx>,
+        target_place: PlaceRef<'tcx>,
         places: &Vec<Operand<'tcx>>,
     ) -> Option<(Span, Option<GeneratorKind>, Span)> {
         debug!(
diff --git a/src/librustc_mir/borrow_check/diagnostics/move_errors.rs b/src/librustc_mir/borrow_check/diagnostics/move_errors.rs
index c3ad6834dc..9451fee499 100644
--- a/src/librustc_mir/borrow_check/diagnostics/move_errors.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/move_errors.rs
@@ -274,8 +274,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
         let description = if place.projection.len() == 1 {
             format!("static item `{}`", self.describe_place(place.as_ref()).unwrap())
         } else {
-            let base_static =
-                PlaceRef { local: &place.local, projection: &[ProjectionElem::Deref] };
+            let base_static = PlaceRef { local: place.local, projection: &[ProjectionElem::Deref] };
 
             format!(
                 "`{:?}` as `{:?}` is a static item",
@@ -304,17 +303,17 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
 
         let deref_base = match deref_target_place.projection.as_ref() {
             &[ref proj_base @ .., ProjectionElem::Deref] => {
-                PlaceRef { local: &deref_target_place.local, projection: &proj_base }
+                PlaceRef { local: deref_target_place.local, projection: &proj_base }
             }
             _ => bug!("deref_target_place is not a deref projection"),
         };
 
         if let PlaceRef { local, projection: [] } = deref_base {
-            let decl = &self.body.local_decls[*local];
+            let decl = &self.body.local_decls[local];
             if decl.is_ref_for_guard() {
                 let mut err = self.cannot_move_out_of(
                     span,
-                    &format!("`{}` in pattern guard", self.local_names[*local].unwrap()),
+                    &format!("`{}` in pattern guard", self.local_names[local].unwrap()),
                 );
                 err.note(
                     "variables bound in patterns cannot be moved from \
@@ -444,7 +443,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                     let place_ty = move_from.ty(*self.body, self.infcx.tcx).ty;
                     let place_desc = match self.describe_place(move_from.as_ref()) {
                         Some(desc) => format!("`{}`", desc),
-                        None => format!("value"),
+                        None => "value".to_string(),
                     };
 
                     self.note_type_does_not_implement_copy(err, &place_desc, place_ty, Some(span));
@@ -467,7 +466,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 let place_ty = original_path.ty(*self.body, self.infcx.tcx).ty;
                 let place_desc = match self.describe_place(original_path.as_ref()) {
                     Some(desc) => format!("`{}`", desc),
-                    None => format!("value"),
+                    None => "value".to_string(),
                 };
                 self.note_type_does_not_implement_copy(err, &place_desc, place_ty, Some(span));
 
@@ -520,7 +519,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
     }
 
     fn add_move_error_details(&self, err: &mut DiagnosticBuilder<'a>, binds_to: &[Local]) {
-        for (j, local) in binds_to.into_iter().enumerate() {
+        for (j, local) in binds_to.iter().enumerate() {
             let bind_to = &self.body.local_decls[*local];
             let binding_span = bind_to.source_info.span;
 
diff --git a/src/librustc_mir/borrow_check/diagnostics/mutability_errors.rs b/src/librustc_mir/borrow_check/diagnostics/mutability_errors.rs
index ae468e83ae..c6fe0dba80 100644
--- a/src/librustc_mir/borrow_check/diagnostics/mutability_errors.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/mutability_errors.rs
@@ -10,7 +10,7 @@ use rustc_span::Span;
 use crate::borrow_check::diagnostics::BorrowedContentSource;
 use crate::borrow_check::MirBorrowckCtxt;
 use crate::util::collect_writes::FindAssignments;
-use rustc_errors::Applicability;
+use rustc_errors::{Applicability, DiagnosticBuilder};
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub(crate) enum AccessKind {
@@ -23,7 +23,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
         &mut self,
         access_place: &Place<'tcx>,
         span: Span,
-        the_place_err: PlaceRef<'cx, 'tcx>,
+        the_place_err: PlaceRef<'tcx>,
         error_access: AccessKind,
         location: Location,
     ) {
@@ -47,7 +47,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 if access_place.as_local().is_some() {
                     reason = ", as it is not declared as mutable".to_string();
                 } else {
-                    let name = self.local_names[*local].expect("immutable unnamed local");
+                    let name = self.local_names[local].expect("immutable unnamed local");
                     reason = format!(", as `{}` is not declared as mutable", name);
                 }
             }
@@ -70,20 +70,20 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             }
 
             PlaceRef { local, projection: [ProjectionElem::Deref] }
-                if self.body.local_decls[*local].is_ref_for_guard() =>
+                if self.body.local_decls[local].is_ref_for_guard() =>
             {
                 item_msg = format!("`{}`", access_place_desc.unwrap());
                 reason = ", as it is immutable for the pattern guard".to_string();
             }
             PlaceRef { local, projection: [ProjectionElem::Deref] }
-                if self.body.local_decls[*local].is_ref_to_static() =>
+                if self.body.local_decls[local].is_ref_to_static() =>
             {
                 if access_place.projection.len() == 1 {
                     item_msg = format!("immutable static item `{}`", access_place_desc.unwrap());
                     reason = String::new();
                 } else {
                     item_msg = format!("`{}`", access_place_desc.unwrap());
-                    let local_info = &self.body.local_decls[*local].local_info;
+                    let local_info = &self.body.local_decls[local].local_info;
                     if let LocalInfo::StaticRef { def_id, .. } = *local_info {
                         let static_name = &self.infcx.tcx.item_name(def_id);
                         reason = format!(", as `{}` is an immutable static item", static_name);
@@ -93,7 +93,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 }
             }
             PlaceRef { local: _, projection: [proj_base @ .., ProjectionElem::Deref] } => {
-                if *the_place_err.local == Local::new(1)
+                if the_place_err.local == Local::new(1)
                     && proj_base.is_empty()
                     && !self.upvars.is_empty()
                 {
@@ -212,7 +212,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 if {
                     self.body
                         .local_decls
-                        .get(*local)
+                        .get(local)
                         .map(|local_decl| {
                             if let LocalInfo::User(ClearCrossCrate::Set(
                                 mir::BindingForm::ImplicitSelf(kind),
@@ -224,7 +224,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                                 // Deliberately fall into this case for all implicit self types,
                                 // so that we don't fall in to the next case with them.
                                 kind == mir::ImplicitSelfKind::MutRef
-                            } else if Some(kw::SelfLower) == self.local_names[*local] {
+                            } else if Some(kw::SelfLower) == self.local_names[local] {
                                 // Otherwise, check if the name is the self kewyord - in which case
                                 // we have an explicit self. Do the same thing in this case and check
                                 // for a `self: &mut Self` to suggest removing the `&mut`.
@@ -247,20 +247,20 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             // We want to suggest users use `let mut` for local (user
             // variable) mutations...
             PlaceRef { local, projection: [] }
-                if self.body.local_decls[*local].can_be_made_mutable() =>
+                if self.body.local_decls[local].can_be_made_mutable() =>
             {
                 // ... but it doesn't make sense to suggest it on
                 // variables that are `ref x`, `ref mut x`, `&self`,
                 // or `&mut self` (such variables are simply not
                 // mutable).
-                let local_decl = &self.body.local_decls[*local];
+                let local_decl = &self.body.local_decls[local];
                 assert_eq!(local_decl.mutability, Mutability::Not);
 
                 err.span_label(span, format!("cannot {ACT}", ACT = act));
                 err.span_suggestion(
                     local_decl.source_info.span,
                     "consider changing this to be mutable",
-                    format!("mut {}", self.local_names[*local].unwrap()),
+                    format!("mut {}", self.local_names[local].unwrap()),
                     Applicability::MachineApplicable,
                 );
             }
@@ -312,7 +312,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             }
 
             PlaceRef { local, projection: [ProjectionElem::Deref] }
-                if self.body.local_decls[*local].is_ref_for_guard() =>
+                if self.body.local_decls[local].is_ref_for_guard() =>
             {
                 err.span_label(span, format!("cannot {ACT}", ACT = act));
                 err.note(
@@ -326,43 +326,9 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             // FIXME: can this case be generalized to work for an
             // arbitrary base for the projection?
             PlaceRef { local, projection: [ProjectionElem::Deref] }
-                if self.body.local_decls[*local].is_user_variable() =>
+                if self.body.local_decls[local].is_user_variable() =>
             {
-                let local_decl = &self.body.local_decls[*local];
-                let suggestion = match local_decl.local_info {
-                    LocalInfo::User(ClearCrossCrate::Set(mir::BindingForm::ImplicitSelf(_))) => {
-                        Some(suggest_ampmut_self(self.infcx.tcx, local_decl))
-                    }
-
-                    LocalInfo::User(ClearCrossCrate::Set(mir::BindingForm::Var(
-                        mir::VarBindingForm {
-                            binding_mode: ty::BindingMode::BindByValue(_),
-                            opt_ty_info,
-                            ..
-                        },
-                    ))) => Some(suggest_ampmut(
-                        self.infcx.tcx,
-                        self.body,
-                        *local,
-                        local_decl,
-                        opt_ty_info,
-                    )),
-
-                    LocalInfo::User(ClearCrossCrate::Set(mir::BindingForm::Var(
-                        mir::VarBindingForm {
-                            binding_mode: ty::BindingMode::BindByReference(_),
-                            ..
-                        },
-                    ))) => {
-                        let pattern_span = local_decl.source_info.span;
-                        suggest_ref_mut(self.infcx.tcx, pattern_span)
-                            .map(|replacement| (pattern_span, replacement))
-                    }
-
-                    LocalInfo::User(ClearCrossCrate::Clear) => bug!("saw cleared local state"),
-
-                    _ => unreachable!(),
-                };
+                let local_decl = &self.body.local_decls[local];
 
                 let (pointer_sigil, pointer_desc) = if local_decl.ty.is_region_ptr() {
                     ("&", "reference")
@@ -370,17 +336,53 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                     ("*const", "pointer")
                 };
 
-                if let Some((err_help_span, suggested_code)) = suggestion {
-                    err.span_suggestion(
-                        err_help_span,
-                        &format!("consider changing this to be a mutable {}", pointer_desc),
-                        suggested_code,
-                        Applicability::MachineApplicable,
-                    );
-                }
-
-                match self.local_names[*local] {
+                match self.local_names[local] {
                     Some(name) if !local_decl.from_compiler_desugaring() => {
+                        let suggestion = match local_decl.local_info {
+                            LocalInfo::User(ClearCrossCrate::Set(
+                                mir::BindingForm::ImplicitSelf(_),
+                            )) => Some(suggest_ampmut_self(self.infcx.tcx, local_decl)),
+
+                            LocalInfo::User(ClearCrossCrate::Set(mir::BindingForm::Var(
+                                mir::VarBindingForm {
+                                    binding_mode: ty::BindingMode::BindByValue(_),
+                                    opt_ty_info,
+                                    ..
+                                },
+                            ))) => Some(suggest_ampmut(
+                                self.infcx.tcx,
+                                self.body,
+                                local,
+                                local_decl,
+                                opt_ty_info,
+                            )),
+
+                            LocalInfo::User(ClearCrossCrate::Set(mir::BindingForm::Var(
+                                mir::VarBindingForm {
+                                    binding_mode: ty::BindingMode::BindByReference(_),
+                                    ..
+                                },
+                            ))) => {
+                                let pattern_span = local_decl.source_info.span;
+                                suggest_ref_mut(self.infcx.tcx, pattern_span)
+                                    .map(|replacement| (pattern_span, replacement))
+                            }
+
+                            LocalInfo::User(ClearCrossCrate::Clear) => {
+                                bug!("saw cleared local state")
+                            }
+
+                            _ => unreachable!(),
+                        };
+
+                        if let Some((err_help_span, suggested_code)) = suggestion {
+                            err.span_suggestion(
+                                err_help_span,
+                                &format!("consider changing this to be a mutable {}", pointer_desc),
+                                suggested_code,
+                                Applicability::MachineApplicable,
+                            );
+                        }
                         err.span_label(
                             span,
                             format!(
@@ -411,12 +413,8 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                 local,
                 projection: [ProjectionElem::Deref],
                 // FIXME document what is this 1 magic number about
-            } if *local == Local::new(1) && !self.upvars.is_empty() => {
-                err.span_label(span, format!("cannot {ACT}", ACT = act));
-                err.span_help(
-                    self.body.span,
-                    "consider changing this to accept closures that implement `FnMut`",
-                );
+            } if local == Local::new(1) && !self.upvars.is_empty() => {
+                self.expected_fn_found_fn_mut_call(&mut err, span, act);
             }
 
             PlaceRef { local: _, projection: [.., ProjectionElem::Deref] } => {
@@ -448,6 +446,101 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
 
         err.buffer(&mut self.errors_buffer);
     }
+
+    /// Targeted error when encountering an `FnMut` closure where an `Fn` closure was expected.
+    fn expected_fn_found_fn_mut_call(&self, err: &mut DiagnosticBuilder<'_>, sp: Span, act: &str) {
+        err.span_label(sp, format!("cannot {}", act));
+
+        let hir = self.infcx.tcx.hir();
+        let closure_id = hir.as_local_hir_id(self.mir_def_id).unwrap();
+        let fn_call_id = hir.get_parent_node(closure_id);
+        let node = hir.get(fn_call_id);
+        let item_id = hir.get_parent_item(fn_call_id);
+        let mut look_at_return = true;
+        // If we can detect the expression to be an `fn` call where the closure was an argument,
+        // we point at the `fn` definition argument...
+        match node {
+            hir::Node::Expr(hir::Expr { kind: hir::ExprKind::Call(func, args), .. }) => {
+                let arg_pos = args
+                    .iter()
+                    .enumerate()
+                    .filter(|(_, arg)| arg.span == self.body.span)
+                    .map(|(pos, _)| pos)
+                    .next();
+                let def_id = hir.local_def_id(item_id);
+                let tables = self.infcx.tcx.typeck_tables_of(def_id);
+                if let Some(ty::FnDef(def_id, _)) =
+                    tables.node_type_opt(func.hir_id).as_ref().map(|ty| &ty.kind)
+                {
+                    let arg = match hir.get_if_local(*def_id) {
+                        Some(hir::Node::Item(hir::Item {
+                            ident,
+                            kind: hir::ItemKind::Fn(sig, ..),
+                            ..
+                        }))
+                        | Some(hir::Node::TraitItem(hir::TraitItem {
+                            ident,
+                            kind: hir::TraitItemKind::Method(sig, _),
+                            ..
+                        }))
+                        | Some(hir::Node::ImplItem(hir::ImplItem {
+                            ident,
+                            kind: hir::ImplItemKind::Method(sig, _),
+                            ..
+                        })) => Some(
+                            arg_pos
+                                .and_then(|pos| {
+                                    sig.decl.inputs.get(
+                                        pos + if sig.decl.implicit_self.has_implicit_self() {
+                                            1
+                                        } else {
+                                            0
+                                        },
+                                    )
+                                })
+                                .map(|arg| arg.span)
+                                .unwrap_or(ident.span),
+                        ),
+                        _ => None,
+                    };
+                    if let Some(span) = arg {
+                        err.span_label(span, "change this to accept `FnMut` instead of `Fn`");
+                        err.span_label(func.span, "expects `Fn` instead of `FnMut`");
+                        if self.infcx.tcx.sess.source_map().is_multiline(self.body.span) {
+                            err.span_label(self.body.span, "in this closure");
+                        }
+                        look_at_return = false;
+                    }
+                }
+            }
+            _ => {}
+        }
+        if look_at_return && hir.get_return_block(closure_id).is_some() {
+            // ...otherwise we are probably in the tail expression of the function, point at the
+            // return type.
+            match hir.get(hir.get_parent_item(fn_call_id)) {
+                hir::Node::Item(hir::Item { ident, kind: hir::ItemKind::Fn(sig, ..), .. })
+                | hir::Node::TraitItem(hir::TraitItem {
+                    ident,
+                    kind: hir::TraitItemKind::Method(sig, _),
+                    ..
+                })
+                | hir::Node::ImplItem(hir::ImplItem {
+                    ident,
+                    kind: hir::ImplItemKind::Method(sig, _),
+                    ..
+                }) => {
+                    err.span_label(ident.span, "");
+                    err.span_label(
+                        sig.decl.output.span(),
+                        "change this to return `FnMut` instead of `Fn`",
+                    );
+                    err.span_label(self.body.span, "in this closure");
+                }
+                _ => {}
+            }
+        }
+    }
 }
 
 fn suggest_ampmut_self<'tcx>(
diff --git a/src/librustc_mir/borrow_check/diagnostics/region_errors.rs b/src/librustc_mir/borrow_check/diagnostics/region_errors.rs
index b999dfa303..8cd75d4a2f 100644
--- a/src/librustc_mir/borrow_check/diagnostics/region_errors.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/region_errors.rs
@@ -1,12 +1,11 @@
 //! Error reporting machinery for lifetime errors.
 
-use rustc::infer::{
-    error_reporting::nice_region_error::NiceRegionError, opaque_types, NLLRegionVariableOrigin,
-};
 use rustc::mir::ConstraintCategory;
 use rustc::ty::{self, RegionVid, Ty};
 use rustc_errors::{Applicability, DiagnosticBuilder};
-use rustc_hir::def_id::DefId;
+use rustc_infer::infer::{
+    error_reporting::nice_region_error::NiceRegionError, opaque_types, NLLRegionVariableOrigin,
+};
 use rustc_span::symbol::kw;
 use rustc_span::Span;
 
@@ -58,8 +57,8 @@ crate enum RegionErrorKind<'tcx> {
 
     /// An unexpected hidden region for an opaque type.
     UnexpectedHiddenRegion {
-        /// The def id of the opaque type.
-        opaque_type_def_id: DefId,
+        /// The span for the member constraint.
+        span: Span,
         /// The hidden type.
         hidden_ty: Ty<'tcx>,
         /// The unexpected region.
@@ -194,18 +193,16 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                     }
                 }
 
-                RegionErrorKind::UnexpectedHiddenRegion {
-                    opaque_type_def_id,
-                    hidden_ty,
-                    member_region,
-                } => {
+                RegionErrorKind::UnexpectedHiddenRegion { span, hidden_ty, member_region } => {
                     let region_scope_tree = &self.infcx.tcx.region_scope_tree(self.mir_def_id);
+                    let named_ty = self.regioncx.name_regions(self.infcx.tcx, hidden_ty);
+                    let named_region = self.regioncx.name_regions(self.infcx.tcx, member_region);
                     opaque_types::unexpected_hidden_region_diagnostic(
                         self.infcx.tcx,
                         Some(region_scope_tree),
-                        opaque_type_def_id,
-                        hidden_ty,
-                        member_region,
+                        span,
+                        named_ty,
+                        named_region,
                     )
                     .buffer(&mut self.errors_buffer);
                 }
@@ -430,18 +427,17 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             errci.outlived_fr,
         );
 
-        let escapes_from = match self.regioncx.universal_regions().defining_ty {
-            DefiningTy::Closure(..) => "closure",
-            DefiningTy::Generator(..) => "generator",
-            DefiningTy::FnDef(..) => "function",
-            DefiningTy::Const(..) => "const",
-        };
+        let (_, escapes_from) = self
+            .infcx
+            .tcx
+            .article_and_description(self.regioncx.universal_regions().defining_ty.def_id());
 
         // Revert to the normal error in these cases.
         // Assignments aren't "escapes" in function items.
         if (fr_name_and_span.is_none() && outlived_fr_name_and_span.is_none())
-            || (*category == ConstraintCategory::Assignment && escapes_from == "function")
-            || escapes_from == "const"
+            || (*category == ConstraintCategory::Assignment
+                && self.regioncx.universal_regions().defining_ty.is_fn_def())
+            || self.regioncx.universal_regions().defining_ty.is_const()
         {
             return self.report_general_error(&ErrorConstraintInfo {
                 fr_is_local: true,
@@ -457,7 +453,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
             diag.span_label(
                 outlived_fr_span,
                 format!(
-                    "`{}` is declared here, outside of the {} body",
+                    "`{}` declared here, outside of the {} body",
                     outlived_fr_name, escapes_from
                 ),
             );
@@ -507,8 +503,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
         let mut diag =
             self.infcx.tcx.sess.struct_span_err(*span, "lifetime may not live long enough");
 
-        let mir_def_name =
-            if self.infcx.tcx.is_closure(self.mir_def_id) { "closure" } else { "function" };
+        let (_, mir_def_name) = self.infcx.tcx.article_and_description(self.mir_def_id);
 
         let fr_name = self.give_region_a_name(*fr).unwrap();
         fr_name.highlight_region_name(&mut diag);
@@ -588,6 +583,10 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                             {
                                 found = true;
                                 break;
+                            } else {
+                                // If there's already a lifetime bound, don't
+                                // suggest anything.
+                                return;
                             }
                         }
                     }
@@ -613,7 +612,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
                         } else {
                             "'_".to_string()
                         };
-                        let suggestion = if snippet.ends_with(";") {
+                        let suggestion = if snippet.ends_with(';') {
                             // `type X = impl Trait;`
                             format!("{} + {};", &snippet[..snippet.len() - 1], suggestable_fr_name)
                         } else {
diff --git a/src/librustc_mir/borrow_check/diagnostics/region_name.rs b/src/librustc_mir/borrow_check/diagnostics/region_name.rs
index 47eb2d8940..01ace74287 100644
--- a/src/librustc_mir/borrow_check/diagnostics/region_name.rs
+++ b/src/librustc_mir/borrow_check/diagnostics/region_name.rs
@@ -291,7 +291,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
             | ty::ReScope(..)
             | ty::ReVar(..)
             | ty::RePlaceholder(..)
-            | ty::ReEmpty
+            | ty::ReEmpty(_)
             | ty::ReErased
             | ty::ReClosureBound(..) => None,
         }
@@ -645,8 +645,8 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
                 ..
             }) => (
                 match return_ty.output {
-                    hir::FunctionRetTy::DefaultReturn(_) => tcx.sess.source_map().end_point(*span),
-                    hir::FunctionRetTy::Return(_) => return_ty.output.span(),
+                    hir::FnRetTy::DefaultReturn(_) => tcx.sess.source_map().end_point(*span),
+                    hir::FnRetTy::Return(_) => return_ty.output.span(),
                 },
                 if gen_move.is_some() { " of generator" } else { " of closure" },
             ),
diff --git a/src/librustc_mir/borrow_check/facts.rs b/src/librustc_mir/borrow_check/facts.rs
index a16c36d749..cd8139b17b 100644
--- a/src/librustc_mir/borrow_check/facts.rs
+++ b/src/librustc_mir/borrow_check/facts.rs
@@ -8,7 +8,7 @@ use rustc_index::vec::Idx;
 use std::error::Error;
 use std::fmt::Debug;
 use std::fs::{self, File};
-use std::io::Write;
+use std::io::{BufWriter, Write};
 use std::path::Path;
 
 #[derive(Copy, Clone, Debug)]
@@ -71,16 +71,16 @@ impl AllFactsExt for AllFacts {
                 killed,
                 outlives,
                 invalidates,
-                var_used,
-                var_defined,
-                var_drop_used,
-                var_uses_region,
-                var_drops_region,
-                child,
-                path_belongs_to_var,
-                initialized_at,
-                moved_out_at,
-                path_accessed_at,
+                var_used_at,
+                var_defined_at,
+                var_dropped_at,
+                use_of_var_derefs_origin,
+                drop_of_var_derefs_origin,
+                child_path,
+                path_is_var,
+                path_assigned_at_base,
+                path_moved_at_base,
+                path_accessed_at_base,
                 known_subset,
             ])
         }
@@ -117,7 +117,7 @@ impl<'w> FactWriter<'w> {
         T: FactRow,
     {
         let file = &self.dir.join(file_name);
-        let mut file = File::create(file)?;
+        let mut file = BufWriter::new(File::create(file)?);
         for row in rows {
             row.write(&mut file, self.location_table)?;
         }
@@ -126,11 +126,19 @@ impl<'w> FactWriter<'w> {
 }
 
 trait FactRow {
-    fn write(&self, out: &mut File, location_table: &LocationTable) -> Result<(), Box<dyn Error>>;
+    fn write(
+        &self,
+        out: &mut dyn Write,
+        location_table: &LocationTable,
+    ) -> Result<(), Box<dyn Error>>;
 }
 
 impl FactRow for RegionVid {
-    fn write(&self, out: &mut File, location_table: &LocationTable) -> Result<(), Box<dyn Error>> {
+    fn write(
+        &self,
+        out: &mut dyn Write,
+        location_table: &LocationTable,
+    ) -> Result<(), Box<dyn Error>> {
         write_row(out, location_table, &[self])
     }
 }
@@ -140,7 +148,11 @@ where
     A: FactCell,
     B: FactCell,
 {
-    fn write(&self, out: &mut File, location_table: &LocationTable) -> Result<(), Box<dyn Error>> {
+    fn write(
+        &self,
+        out: &mut dyn Write,
+        location_table: &LocationTable,
+    ) -> Result<(), Box<dyn Error>> {
         write_row(out, location_table, &[&self.0, &self.1])
     }
 }
@@ -151,7 +163,11 @@ where
     B: FactCell,
     C: FactCell,
 {
-    fn write(&self, out: &mut File, location_table: &LocationTable) -> Result<(), Box<dyn Error>> {
+    fn write(
+        &self,
+        out: &mut dyn Write,
+        location_table: &LocationTable,
+    ) -> Result<(), Box<dyn Error>> {
         write_row(out, location_table, &[&self.0, &self.1, &self.2])
     }
 }
@@ -163,7 +179,11 @@ where
     C: FactCell,
     D: FactCell,
 {
-    fn write(&self, out: &mut File, location_table: &LocationTable) -> Result<(), Box<dyn Error>> {
+    fn write(
+        &self,
+        out: &mut dyn Write,
+        location_table: &LocationTable,
+    ) -> Result<(), Box<dyn Error>> {
         write_row(out, location_table, &[&self.0, &self.1, &self.2, &self.3])
     }
 }
diff --git a/src/librustc_mir/borrow_check/flows.rs b/src/librustc_mir/borrow_check/flows.rs
deleted file mode 100644
index 57c544fda0..0000000000
--- a/src/librustc_mir/borrow_check/flows.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-//! Manages the dataflow bits required for borrowck.
-//!
-//! FIXME: this might be better as a "generic" fixed-point combinator,
-//! but is not as ugly as it is right now.
-
-use rustc::mir::{BasicBlock, Location};
-use rustc_index::bit_set::BitIter;
-
-use crate::borrow_check::location::LocationIndex;
-
-use crate::borrow_check::nll::PoloniusOutput;
-
-use crate::dataflow::indexes::BorrowIndex;
-use crate::dataflow::move_paths::HasMoveData;
-use crate::dataflow::Borrows;
-use crate::dataflow::EverInitializedPlaces;
-use crate::dataflow::MaybeUninitializedPlaces;
-use crate::dataflow::{FlowAtLocation, FlowsAtLocation};
-use either::Either;
-use std::fmt;
-use std::rc::Rc;
-
-crate struct Flows<'b, 'tcx> {
-    borrows: FlowAtLocation<'tcx, Borrows<'b, 'tcx>>,
-    pub uninits: FlowAtLocation<'tcx, MaybeUninitializedPlaces<'b, 'tcx>>,
-    pub ever_inits: FlowAtLocation<'tcx, EverInitializedPlaces<'b, 'tcx>>,
-
-    /// Polonius Output
-    pub polonius_output: Option<Rc<PoloniusOutput>>,
-}
-
-impl<'b, 'tcx> Flows<'b, 'tcx> {
-    crate fn new(
-        borrows: FlowAtLocation<'tcx, Borrows<'b, 'tcx>>,
-        uninits: FlowAtLocation<'tcx, MaybeUninitializedPlaces<'b, 'tcx>>,
-        ever_inits: FlowAtLocation<'tcx, EverInitializedPlaces<'b, 'tcx>>,
-        polonius_output: Option<Rc<PoloniusOutput>>,
-    ) -> Self {
-        Flows { borrows, uninits, ever_inits, polonius_output }
-    }
-
-    crate fn borrows_in_scope(
-        &self,
-        location: LocationIndex,
-    ) -> impl Iterator<Item = BorrowIndex> + '_ {
-        if let Some(ref polonius) = self.polonius_output {
-            Either::Left(polonius.errors_at(location).iter().cloned())
-        } else {
-            Either::Right(self.borrows.iter_incoming())
-        }
-    }
-
-    crate fn with_outgoing_borrows(&self, op: impl FnOnce(BitIter<'_, BorrowIndex>)) {
-        self.borrows.with_iter_outgoing(op)
-    }
-}
-
-macro_rules! each_flow {
-    ($this:ident, $meth:ident($arg:ident)) => {
-        FlowAtLocation::$meth(&mut $this.borrows, $arg);
-        FlowAtLocation::$meth(&mut $this.uninits, $arg);
-        FlowAtLocation::$meth(&mut $this.ever_inits, $arg);
-    };
-}
-
-impl<'b, 'tcx> FlowsAtLocation for Flows<'b, 'tcx> {
-    fn reset_to_entry_of(&mut self, bb: BasicBlock) {
-        each_flow!(self, reset_to_entry_of(bb));
-    }
-
-    fn reset_to_exit_of(&mut self, bb: BasicBlock) {
-        each_flow!(self, reset_to_exit_of(bb));
-    }
-
-    fn reconstruct_statement_effect(&mut self, location: Location) {
-        each_flow!(self, reconstruct_statement_effect(location));
-    }
-
-    fn reconstruct_terminator_effect(&mut self, location: Location) {
-        each_flow!(self, reconstruct_terminator_effect(location));
-    }
-
-    fn apply_local_effect(&mut self, location: Location) {
-        each_flow!(self, apply_local_effect(location));
-    }
-}
-
-impl<'b, 'tcx> fmt::Display for Flows<'b, 'tcx> {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let mut s = String::new();
-
-        s.push_str("borrows in effect: [");
-        let mut saw_one = false;
-        self.borrows.each_state_bit(|borrow| {
-            if saw_one {
-                s.push_str(", ");
-            };
-            saw_one = true;
-            let borrow_data = &self.borrows.operator().borrows()[borrow];
-            s.push_str(&borrow_data.to_string());
-        });
-        s.push_str("] ");
-
-        s.push_str("borrows generated: [");
-        let mut saw_one = false;
-        self.borrows.each_gen_bit(|borrow| {
-            if saw_one {
-                s.push_str(", ");
-            };
-            saw_one = true;
-            let borrow_data = &self.borrows.operator().borrows()[borrow];
-            s.push_str(&borrow_data.to_string());
-        });
-        s.push_str("] ");
-
-        s.push_str("uninits: [");
-        let mut saw_one = false;
-        self.uninits.each_state_bit(|mpi_uninit| {
-            if saw_one {
-                s.push_str(", ");
-            };
-            saw_one = true;
-            let move_path = &self.uninits.operator().move_data().move_paths[mpi_uninit];
-            s.push_str(&move_path.to_string());
-        });
-        s.push_str("] ");
-
-        s.push_str("ever_init: [");
-        let mut saw_one = false;
-        self.ever_inits.each_state_bit(|mpi_ever_init| {
-            if saw_one {
-                s.push_str(", ");
-            };
-            saw_one = true;
-            let ever_init = &self.ever_inits.operator().move_data().inits[mpi_ever_init];
-            s.push_str(&format!("{:?}", ever_init));
-        });
-        s.push_str("]");
-
-        fmt::Display::fmt(&s, fmt)
-    }
-}
diff --git a/src/librustc_mir/borrow_check/invalidation.rs b/src/librustc_mir/borrow_check/invalidation.rs
index bb56c11872..d33639aa9d 100644
--- a/src/librustc_mir/borrow_check/invalidation.rs
+++ b/src/librustc_mir/borrow_check/invalidation.rs
@@ -63,7 +63,7 @@ impl<'cx, 'tcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx> {
                 self.mutate_place(location, lhs, Shallow(None), JustWrite);
             }
             StatementKind::FakeRead(_, _) => {
-                // Only relavent for initialized/liveness/safety checks.
+                // Only relevant for initialized/liveness/safety checks.
             }
             StatementKind::SetDiscriminant { ref place, variant_index: _ } => {
                 self.mutate_place(location, place, Shallow(None), JustWrite);
@@ -153,13 +153,13 @@ impl<'cx, 'tcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx> {
             }
             TerminatorKind::Assert { ref cond, expected: _, ref msg, target: _, cleanup: _ } => {
                 self.consume_operand(location, cond);
-                use rustc::mir::interpret::PanicInfo;
-                if let PanicInfo::BoundsCheck { ref len, ref index } = *msg {
+                use rustc::mir::AssertKind;
+                if let AssertKind::BoundsCheck { ref len, ref index } = *msg {
                     self.consume_operand(location, len);
                     self.consume_operand(location, index);
                 }
             }
-            TerminatorKind::Yield { ref value, resume, drop: _ } => {
+            TerminatorKind::Yield { ref value, resume, resume_arg, drop: _ } => {
                 self.consume_operand(location, value);
 
                 // Invalidate all borrows of local places
@@ -170,6 +170,8 @@ impl<'cx, 'tcx> Visitor<'tcx> for InvalidationGenerator<'cx, 'tcx> {
                         self.all_facts.invalidates.push((resume, i));
                     }
                 }
+
+                self.mutate_place(location, resume_arg, Deep, JustWrite);
             }
             TerminatorKind::Resume | TerminatorKind::Return | TerminatorKind::GeneratorDrop => {
                 // Invalidate all borrows of local places
diff --git a/src/librustc_mir/borrow_check/member_constraints.rs b/src/librustc_mir/borrow_check/member_constraints.rs
index c95919685b..4323e2db84 100644
--- a/src/librustc_mir/borrow_check/member_constraints.rs
+++ b/src/librustc_mir/borrow_check/member_constraints.rs
@@ -1,5 +1,5 @@
 use crate::rustc::ty::{self, Ty};
-use rustc::infer::region_constraints::MemberConstraint;
+use rustc::infer::MemberConstraint;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::DefId;
 use rustc_index::vec::IndexVec;
@@ -125,7 +125,7 @@ where
         // wind up mapped to the same key `S`, we would append the
         // linked list for `Ra` onto the end of the linked list for
         // `Rb` (or vice versa) -- this basically just requires
-        // rewriting the final link from one list to point at the othe
+        // rewriting the final link from one list to point at the other
         // other (see `append_list`).
 
         let MemberConstraintSet { first_constraints, mut constraints, choice_regions } = self;
diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs
index 3bfe510a72..a61d00b012 100644
--- a/src/librustc_mir/borrow_check/mod.rs
+++ b/src/librustc_mir/borrow_check/mod.rs
@@ -1,11 +1,10 @@
 //! This query borrow-checks the MIR to (further) ensure it is not broken.
 
-use rustc::infer::InferCtxt;
 use rustc::lint::builtin::MUTABLE_BORROW_RESERVATION_CONFLICT;
 use rustc::lint::builtin::UNUSED_MUT;
 use rustc::mir::{
-    read_only, Body, BodyAndCache, ClearCrossCrate, Local, Location, Mutability, Operand, Place,
-    PlaceElem, PlaceRef, ReadOnlyBodyAndCache,
+    read_only, traversal, Body, BodyAndCache, ClearCrossCrate, Local, Location, Mutability,
+    Operand, Place, PlaceElem, PlaceRef, ReadOnlyBodyAndCache,
 };
 use rustc::mir::{AggregateKind, BasicBlock, BorrowCheckResult, BorrowKind};
 use rustc::mir::{Field, ProjectionElem, Promoted, Rvalue, Statement, StatementKind};
@@ -20,29 +19,29 @@ use rustc_hir as hir;
 use rustc_hir::{def_id::DefId, HirId, Node};
 use rustc_index::bit_set::BitSet;
 use rustc_index::vec::IndexVec;
+use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
 
+use either::Either;
 use smallvec::SmallVec;
 use std::cell::RefCell;
 use std::collections::BTreeMap;
 use std::mem;
 use std::rc::Rc;
 
+use rustc_ast::ast::Name;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::Name;
 
+use crate::dataflow;
+use crate::dataflow::generic::{Analysis, BorrowckFlowState as Flows, BorrowckResults};
 use crate::dataflow::indexes::{BorrowIndex, InitIndex, MoveOutIndex, MovePathIndex};
-use crate::dataflow::move_paths::{HasMoveData, InitLocation, LookupResult, MoveData, MoveError};
+use crate::dataflow::move_paths::{InitLocation, LookupResult, MoveData, MoveError};
 use crate::dataflow::Borrows;
-use crate::dataflow::DataflowResultsConsumer;
 use crate::dataflow::EverInitializedPlaces;
-use crate::dataflow::FlowAtLocation;
 use crate::dataflow::MoveDataParamEnv;
-use crate::dataflow::{do_dataflow, DebugFormatted};
 use crate::dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 use crate::transform::MirSource;
 
 use self::diagnostics::{AccessKind, RegionName};
-use self::flows::Flows;
 use self::location::LocationTable;
 use self::prefixes::PrefixSet;
 use self::MutateMode::{JustWrite, WriteAndRead};
@@ -54,7 +53,6 @@ mod constraint_generation;
 mod constraints;
 mod diagnostics;
 mod facts;
-mod flows;
 mod invalidation;
 mod location;
 mod member_constraints;
@@ -70,7 +68,7 @@ mod universal_regions;
 mod used_muts;
 
 crate use borrow_set::{BorrowData, BorrowSet};
-crate use nll::ToRegionVid;
+crate use nll::{PoloniusOutput, ToRegionVid};
 crate use place_ext::PlaceExt;
 crate use places_conflict::{places_conflict, PlaceConflictBias};
 crate use region_infer::RegionInferenceContext;
@@ -88,11 +86,13 @@ crate struct Upvar {
     mutability: Mutability,
 }
 
+const DEREF_PROJECTION: &[PlaceElem<'_>; 1] = &[ProjectionElem::Deref];
+
 pub fn provide(providers: &mut Providers<'_>) {
     *providers = Providers { mir_borrowck, ..*providers };
 }
 
-fn mir_borrowck(tcx: TyCtxt<'_>, def_id: DefId) -> BorrowCheckResult<'_> {
+fn mir_borrowck(tcx: TyCtxt<'_>, def_id: DefId) -> &BorrowCheckResult<'_> {
     let (input_body, promoted) = tcx.mir_validated(def_id);
     debug!("run query mir_borrowck: {}", tcx.def_path_str(def_id));
 
@@ -103,7 +103,7 @@ fn mir_borrowck(tcx: TyCtxt<'_>, def_id: DefId) -> BorrowCheckResult<'_> {
     });
     debug!("mir_borrowck done");
 
-    opt_closure_req
+    tcx.arena.alloc(opt_closure_req)
 }
 
 fn do_mir_borrowck<'a, 'tcx>(
@@ -115,7 +115,6 @@ fn do_mir_borrowck<'a, 'tcx>(
     debug!("do_mir_borrowck(def_id = {:?})", def_id);
 
     let tcx = infcx.tcx;
-    let attributes = tcx.get_attrs(def_id);
     let param_env = tcx.param_env(def_id);
     let id = tcx.hir().as_local_hir_id(def_id).expect("do_mir_borrowck: non-local DefId");
 
@@ -139,6 +138,9 @@ fn do_mir_borrowck<'a, 'tcx>(
 
     // Gather the upvars of a closure, if any.
     let tables = tcx.typeck_tables_of(def_id);
+    if tables.tainted_by_errors {
+        infcx.set_tainted_by_errors();
+    }
     let upvars: Vec<_> = tables
         .upvar_list
         .get(&def_id)
@@ -188,43 +190,50 @@ fn do_mir_borrowck<'a, 'tcx>(
 
     let mdpe = MoveDataParamEnv { move_data, param_env };
 
-    let dead_unwinds = BitSet::new_empty(body.basic_blocks().len());
-    let mut flow_inits = FlowAtLocation::new(do_dataflow(
-        tcx,
-        &body,
-        def_id,
-        &attributes,
-        &dead_unwinds,
-        MaybeInitializedPlaces::new(tcx, &body, &mdpe),
-        |bd, i| DebugFormatted::new(&bd.move_data().move_paths[i]),
-    ));
+    let mut flow_inits = MaybeInitializedPlaces::new(tcx, &body, &mdpe)
+        .into_engine(tcx, &body, def_id)
+        .iterate_to_fixpoint()
+        .into_results_cursor(&body);
 
     let locals_are_invalidated_at_exit = tcx.hir().body_owner_kind(id).is_fn_or_closure();
     let borrow_set =
         Rc::new(BorrowSet::build(tcx, body, locals_are_invalidated_at_exit, &mdpe.move_data));
 
     // Compute non-lexical lifetimes.
-    let nll::NllOutput { regioncx, polonius_output, opt_closure_req, nll_errors } =
-        nll::compute_regions(
-            infcx,
-            def_id,
-            free_regions,
-            body,
-            &promoted,
-            location_table,
-            param_env,
-            &mut flow_inits,
-            &mdpe.move_data,
-            &borrow_set,
-        );
+    let nll::NllOutput {
+        regioncx,
+        opaque_type_values,
+        polonius_output,
+        opt_closure_req,
+        nll_errors,
+    } = nll::compute_regions(
+        infcx,
+        def_id,
+        free_regions,
+        body,
+        &promoted,
+        location_table,
+        param_env,
+        &mut flow_inits,
+        &mdpe.move_data,
+        &borrow_set,
+    );
 
     // Dump MIR results into a file, if that is enabled. This let us
     // write unit-tests, as well as helping with debugging.
     nll::dump_mir_results(infcx, MirSource::item(def_id), &body, &regioncx, &opt_closure_req);
 
-    // We also have a `#[rustc_nll]` annotation that causes us to dump
+    // We also have a `#[rustc_regions]` annotation that causes us to dump
     // information.
-    nll::dump_annotation(infcx, &body, def_id, &regioncx, &opt_closure_req, &mut errors_buffer);
+    nll::dump_annotation(
+        infcx,
+        &body,
+        def_id,
+        &regioncx,
+        &opt_closure_req,
+        &opaque_type_values,
+        &mut errors_buffer,
+    );
 
     // The various `flow_*` structures can be large. We drop `flow_inits` here
     // so it doesn't overlap with the others below. This reduces peak memory
@@ -233,33 +242,15 @@ fn do_mir_borrowck<'a, 'tcx>(
 
     let regioncx = Rc::new(regioncx);
 
-    let flow_borrows = FlowAtLocation::new(do_dataflow(
-        tcx,
-        &body,
-        def_id,
-        &attributes,
-        &dead_unwinds,
-        Borrows::new(tcx, &body, regioncx.clone(), &borrow_set),
-        |rs, i| DebugFormatted::new(&rs.location(i)),
-    ));
-    let flow_uninits = FlowAtLocation::new(do_dataflow(
-        tcx,
-        &body,
-        def_id,
-        &attributes,
-        &dead_unwinds,
-        MaybeUninitializedPlaces::new(tcx, &body, &mdpe),
-        |bd, i| DebugFormatted::new(&bd.move_data().move_paths[i]),
-    ));
-    let flow_ever_inits = FlowAtLocation::new(do_dataflow(
-        tcx,
-        &body,
-        def_id,
-        &attributes,
-        &dead_unwinds,
-        EverInitializedPlaces::new(tcx, &body, &mdpe),
-        |bd, i| DebugFormatted::new(&bd.move_data().inits[i]),
-    ));
+    let flow_borrows = Borrows::new(tcx, &body, regioncx.clone(), &borrow_set)
+        .into_engine(tcx, &body, def_id)
+        .iterate_to_fixpoint();
+    let flow_uninits = MaybeUninitializedPlaces::new(tcx, &body, &mdpe)
+        .into_engine(tcx, &body, def_id)
+        .iterate_to_fixpoint();
+    let flow_ever_inits = EverInitializedPlaces::new(tcx, &body, &mdpe)
+        .into_engine(tcx, &body, def_id)
+        .iterate_to_fixpoint();
 
     let movable_generator = match tcx.hir().get(id) {
         Node::Expr(&hir::Expr {
@@ -294,17 +285,28 @@ fn do_mir_borrowck<'a, 'tcx>(
         local_names,
         region_names: RefCell::default(),
         next_region_name: RefCell::new(1),
+        polonius_output,
     };
 
     // Compute and report region errors, if any.
     mbcx.report_region_errors(nll_errors);
 
-    let mut state = Flows::new(flow_borrows, flow_uninits, flow_ever_inits, polonius_output);
+    let results = BorrowckResults {
+        ever_inits: flow_ever_inits,
+        uninits: flow_uninits,
+        borrows: flow_borrows,
+    };
 
     if let Some(errors) = move_errors {
         mbcx.report_move_errors(errors);
     }
-    mbcx.analyze_results(&mut state); // entry point for DataflowResultsConsumer
+
+    dataflow::generic::visit_results(
+        &*body,
+        traversal::reverse_postorder(&*body).map(|(bb, _)| bb),
+        &results,
+        &mut mbcx,
+    );
 
     // Convert any reservation warnings into lints.
     let reservation_warnings = mem::take(&mut mbcx.reservation_warnings);
@@ -319,18 +321,20 @@ fn do_mir_borrowck<'a, 'tcx>(
         };
 
         // Span and message don't matter; we overwrite them below anyway
-        let mut diag = mbcx.infcx.tcx.struct_span_lint_hir(
+        mbcx.infcx.tcx.struct_span_lint_hir(
             MUTABLE_BORROW_RESERVATION_CONFLICT,
             lint_root,
             DUMMY_SP,
-            "",
-        );
+            |lint| {
+                let mut diag = lint.build("");
 
-        diag.message = initial_diag.styled_message().clone();
-        diag.span = initial_diag.span.clone();
+                diag.message = initial_diag.styled_message().clone();
+                diag.span = initial_diag.span.clone();
 
+                diag.buffer(&mut mbcx.errors_buffer);
+            },
+        );
         initial_diag.cancel();
-        diag.buffer(&mut mbcx.errors_buffer);
     }
 
     // For each non-user used mutable variable, check if it's been assigned from
@@ -363,7 +367,7 @@ fn do_mir_borrowck<'a, 'tcx>(
         // Skip over locals that begin with an underscore or have no name
         match mbcx.local_names[local] {
             Some(name) => {
-                if name.as_str().starts_with("_") {
+                if name.as_str().starts_with('_') {
                     continue;
                 }
             }
@@ -376,20 +380,17 @@ fn do_mir_borrowck<'a, 'tcx>(
             continue;
         }
 
-        let mut_span = tcx.sess.source_map().span_until_non_whitespace(span);
-        tcx.struct_span_lint_hir(
-            UNUSED_MUT,
-            lint_root,
-            span,
-            "variable does not need to be mutable",
-        )
-        .span_suggestion_short(
-            mut_span,
-            "remove this `mut`",
-            String::new(),
-            Applicability::MachineApplicable,
-        )
-        .emit();
+        tcx.struct_span_lint_hir(UNUSED_MUT, lint_root, span, |lint| {
+            let mut_span = tcx.sess.source_map().span_until_non_whitespace(span);
+            lint.build("variable does not need to be mutable")
+                .span_suggestion_short(
+                    mut_span,
+                    "remove this `mut`",
+                    String::new(),
+                    Applicability::MachineApplicable,
+                )
+                .emit();
+        })
     }
 
     // Buffer any move errors that we collected and de-duplicated.
@@ -406,6 +407,7 @@ fn do_mir_borrowck<'a, 'tcx>(
     }
 
     let result = BorrowCheckResult {
+        concrete_opaque_types: opaque_type_values,
         closure_requirements: opt_closure_req,
         used_mut_upvars: mbcx.used_mut_upvars,
     };
@@ -452,7 +454,7 @@ crate struct MirBorrowckCtxt<'cx, 'tcx> {
     /// for the activation of the borrow.
     reservation_warnings:
         FxHashMap<BorrowIndex, (Place<'tcx>, Span, Location, BorrowKind, BorrowData<'tcx>)>,
-    /// This field keeps track of move errors that are to be reported for given move indicies.
+    /// This field keeps track of move errors that are to be reported for given move indices.
     ///
     /// There are situations where many errors can be reported for a single move out (see #53807)
     /// and we want only the best of those errors.
@@ -466,10 +468,10 @@ crate struct MirBorrowckCtxt<'cx, 'tcx> {
     /// `BTreeMap` is used to preserve the order of insertions when iterating. This is necessary
     /// when errors in the map are being re-added to the error buffer so that errors with the
     /// same primary span come out in a consistent order.
-    move_error_reported: BTreeMap<Vec<MoveOutIndex>, (PlaceRef<'cx, 'tcx>, DiagnosticBuilder<'cx>)>,
+    move_error_reported: BTreeMap<Vec<MoveOutIndex>, (PlaceRef<'tcx>, DiagnosticBuilder<'cx>)>,
     /// This field keeps track of errors reported in the checking of uninitialized variables,
     /// so that we don't report seemingly duplicate errors.
-    uninitialized_error_reported: FxHashSet<PlaceRef<'cx, 'tcx>>,
+    uninitialized_error_reported: FxHashSet<PlaceRef<'tcx>>,
     /// Errors to be reported buffer
     errors_buffer: Vec<Diagnostic>,
     /// This field keeps track of all the local variables that are declared mut and are mutated.
@@ -500,6 +502,9 @@ crate struct MirBorrowckCtxt<'cx, 'tcx> {
 
     /// The counter for generating new region names.
     next_region_name: RefCell<usize>,
+
+    /// Results of Polonius analysis.
+    polonius_output: Option<Rc<PoloniusOutput>>,
 }
 
 // Check that:
@@ -507,24 +512,16 @@ crate struct MirBorrowckCtxt<'cx, 'tcx> {
 // 2. loans made in overlapping scopes do not conflict
 // 3. assignments do not affect things loaned out as immutable
 // 4. moves do not affect things loaned out in any way
-impl<'cx, 'tcx> DataflowResultsConsumer<'cx, 'tcx> for MirBorrowckCtxt<'cx, 'tcx> {
+impl<'cx, 'tcx> dataflow::generic::ResultsVisitor<'cx, 'tcx> for MirBorrowckCtxt<'cx, 'tcx> {
     type FlowState = Flows<'cx, 'tcx>;
 
-    fn body(&self) -> &'cx Body<'tcx> {
-        *self.body
-    }
-
-    fn visit_block_entry(&mut self, bb: BasicBlock, flow_state: &Self::FlowState) {
-        debug!("MirBorrowckCtxt::process_block({:?}): {}", bb, flow_state);
-    }
-
-    fn visit_statement_entry(
+    fn visit_statement(
         &mut self,
-        location: Location,
+        flow_state: &Flows<'cx, 'tcx>,
         stmt: &'cx Statement<'tcx>,
-        flow_state: &Self::FlowState,
+        location: Location,
     ) {
-        debug!("MirBorrowckCtxt::process_statement({:?}, {:?}): {}", location, stmt, flow_state);
+        debug!("MirBorrowckCtxt::process_statement({:?}, {:?}): {:?}", location, stmt, flow_state);
         let span = stmt.source_info.span;
 
         self.check_activations(location, span, flow_state);
@@ -607,17 +604,16 @@ impl<'cx, 'tcx> DataflowResultsConsumer<'cx, 'tcx> for MirBorrowckCtxt<'cx, 'tcx
         }
     }
 
-    fn visit_terminator_entry(
+    fn visit_terminator(
         &mut self,
-        location: Location,
+        flow_state: &Flows<'cx, 'tcx>,
         term: &'cx Terminator<'tcx>,
-        flow_state: &Self::FlowState,
+        loc: Location,
     ) {
-        let loc = location;
-        debug!("MirBorrowckCtxt::process_terminator({:?}, {:?}): {}", location, term, flow_state);
+        debug!("MirBorrowckCtxt::process_terminator({:?}, {:?}): {:?}", loc, term, flow_state);
         let span = term.source_info.span;
 
-        self.check_activations(location, span, flow_state);
+        self.check_activations(loc, span, flow_state);
 
         match term.kind {
             TerminatorKind::SwitchInt { ref discr, switch_ty: _, values: _, targets: _ } => {
@@ -677,25 +673,48 @@ impl<'cx, 'tcx> DataflowResultsConsumer<'cx, 'tcx> for MirBorrowckCtxt<'cx, 'tcx
             }
             TerminatorKind::Assert { ref cond, expected: _, ref msg, target: _, cleanup: _ } => {
                 self.consume_operand(loc, (cond, span), flow_state);
-                use rustc::mir::interpret::PanicInfo;
-                if let PanicInfo::BoundsCheck { ref len, ref index } = *msg {
+                use rustc::mir::AssertKind;
+                if let AssertKind::BoundsCheck { ref len, ref index } = *msg {
                     self.consume_operand(loc, (len, span), flow_state);
                     self.consume_operand(loc, (index, span), flow_state);
                 }
             }
 
-            TerminatorKind::Yield { ref value, resume: _, drop: _ } => {
+            TerminatorKind::Yield { ref value, resume: _, ref resume_arg, drop: _ } => {
                 self.consume_operand(loc, (value, span), flow_state);
+                self.mutate_place(loc, (resume_arg, span), Deep, JustWrite, flow_state);
+            }
 
+            TerminatorKind::Goto { target: _ }
+            | TerminatorKind::Abort
+            | TerminatorKind::Unreachable
+            | TerminatorKind::Resume
+            | TerminatorKind::Return
+            | TerminatorKind::GeneratorDrop
+            | TerminatorKind::FalseEdges { real_target: _, imaginary_target: _ }
+            | TerminatorKind::FalseUnwind { real_target: _, unwind: _ } => {
+                // no data used, thus irrelevant to borrowck
+            }
+        }
+    }
+
+    fn visit_terminator_exit(
+        &mut self,
+        flow_state: &Flows<'cx, 'tcx>,
+        term: &'cx Terminator<'tcx>,
+        loc: Location,
+    ) {
+        let span = term.source_info.span;
+
+        match term.kind {
+            TerminatorKind::Yield { value: _, resume: _, resume_arg: _, drop: _ } => {
                 if self.movable_generator {
                     // Look for any active borrows to locals
                     let borrow_set = self.borrow_set.clone();
-                    flow_state.with_outgoing_borrows(|borrows| {
-                        for i in borrows {
-                            let borrow = &borrow_set[i];
-                            self.check_for_local_borrow(borrow, span);
-                        }
-                    });
+                    for i in flow_state.borrows.iter() {
+                        let borrow = &borrow_set[i];
+                        self.check_for_local_borrow(borrow, span);
+                    }
                 }
             }
 
@@ -705,20 +724,22 @@ impl<'cx, 'tcx> DataflowResultsConsumer<'cx, 'tcx> for MirBorrowckCtxt<'cx, 'tcx
                 // StorageDead, but we don't always emit those (notably on unwind paths),
                 // so this "extra check" serves as a kind of backup.
                 let borrow_set = self.borrow_set.clone();
-                flow_state.with_outgoing_borrows(|borrows| {
-                    for i in borrows {
-                        let borrow = &borrow_set[i];
-                        self.check_for_invalidation_at_exit(loc, borrow, span);
-                    }
-                });
+                for i in flow_state.borrows.iter() {
+                    let borrow = &borrow_set[i];
+                    self.check_for_invalidation_at_exit(loc, borrow, span);
+                }
             }
-            TerminatorKind::Goto { target: _ }
-            | TerminatorKind::Abort
-            | TerminatorKind::Unreachable
+
+            TerminatorKind::Abort
+            | TerminatorKind::Assert { .. }
+            | TerminatorKind::Call { .. }
+            | TerminatorKind::Drop { .. }
+            | TerminatorKind::DropAndReplace { .. }
             | TerminatorKind::FalseEdges { real_target: _, imaginary_target: _ }
-            | TerminatorKind::FalseUnwind { real_target: _, unwind: _ } => {
-                // no data used, thus irrelevant to borrowck
-            }
+            | TerminatorKind::FalseUnwind { real_target: _, unwind: _ }
+            | TerminatorKind::Goto { .. }
+            | TerminatorKind::SwitchInt { .. }
+            | TerminatorKind::Unreachable => {}
         }
     }
 }
@@ -822,9 +843,9 @@ enum InitializationRequiringAction {
     PartialAssignment,
 }
 
-struct RootPlace<'d, 'tcx> {
-    place_local: &'d Local,
-    place_projection: &'d [PlaceElem<'tcx>],
+struct RootPlace<'tcx> {
+    place_local: Local,
+    place_projection: &'tcx [PlaceElem<'tcx>],
     is_local_mutation_allowed: LocalMutationIsAllowed,
 }
 
@@ -853,6 +874,10 @@ impl InitializationRequiringAction {
 }
 
 impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
+    fn body(&self) -> &'cx Body<'tcx> {
+        *self.body
+    }
+
     /// Checks an access to the given place to see if it is allowed. Examines the set of borrows
     /// that are in scope, as well as which paths have been initialized, to ensure that (a) the
     /// place is initialized and (b) it is not borrowed in some way that would prevent this
@@ -932,8 +957,17 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         let tcx = self.infcx.tcx;
         let body = self.body;
         let body: &Body<'_> = &body;
-        let location_table = self.location_table.start_index(location);
         let borrow_set = self.borrow_set.clone();
+
+        // Use polonius output if it has been enabled.
+        let polonius_output = self.polonius_output.clone();
+        let borrows_in_scope = if let Some(polonius) = &polonius_output {
+            let location = self.location_table.start_index(location);
+            Either::Left(polonius.errors_at(location).iter().copied())
+        } else {
+            Either::Right(flow_state.borrows.iter())
+        };
+
         each_borrow_involving_path(
             self,
             tcx,
@@ -941,7 +975,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             location,
             (sd, place_span.0),
             &borrow_set,
-            flow_state.borrows_in_scope(location_table),
+            borrows_in_scope,
             |this, borrow_index, borrow| match (rw, borrow.kind) {
                 // Obviously an activation is compatible with its own
                 // reservation (or even prior activating uses of same
@@ -1381,8 +1415,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     ) {
         debug!("check_for_invalidation_at_exit({:?})", borrow);
         let place = &borrow.borrowed_place;
-        let deref = [ProjectionElem::Deref];
-        let mut root_place = PlaceRef { local: &place.local, projection: &[] };
+        let mut root_place = PlaceRef { local: place.local, projection: &[] };
 
         // FIXME(nll-rfc#40): do more precise destructor tracking here. For now
         // we just know that all locals are dropped at function exit (otherwise
@@ -1391,11 +1424,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         // FIXME: allow thread-locals to borrow other thread locals?
 
         let (might_be_alive, will_be_dropped) =
-            if self.body.local_decls[*root_place.local].is_ref_to_thread_local() {
+            if self.body.local_decls[root_place.local].is_ref_to_thread_local() {
                 // Thread-locals might be dropped after the function exits
                 // We have to dereference the outer reference because
                 // borrows don't conflict behind shared references.
-                root_place.projection = &deref;
+                root_place.projection = DEREF_PROJECTION;
                 (true, true)
             } else {
                 (false, self.locals_are_invalidated_at_exit)
@@ -1471,9 +1504,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
             // initial reservation.
         }
     }
-}
 
-impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     fn check_if_reassignment_to_immutable_state(
         &mut self,
         location: Location,
@@ -1496,7 +1527,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         &mut self,
         location: Location,
         desired_action: InitializationRequiringAction,
-        place_span: (PlaceRef<'cx, 'tcx>, Span),
+        place_span: (PlaceRef<'tcx>, Span),
         flow_state: &Flows<'cx, 'tcx>,
     ) {
         let maybe_uninits = &flow_state.uninits;
@@ -1562,22 +1593,27 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         &mut self,
         location: Location,
         desired_action: InitializationRequiringAction,
-        place_span: (PlaceRef<'cx, 'tcx>, Span),
-        maybe_uninits: &FlowAtLocation<'tcx, MaybeUninitializedPlaces<'cx, 'tcx>>,
+        place_span: (PlaceRef<'tcx>, Span),
+        maybe_uninits: &BitSet<MovePathIndex>,
         from: u32,
         to: u32,
     ) {
         if let Some(mpi) = self.move_path_for_place(place_span.0) {
-            let mut child = self.move_data.move_paths[mpi].first_child;
-            while let Some(child_mpi) = child {
-                let child_move_place = &self.move_data.move_paths[child_mpi];
-                let child_place = &child_move_place.place;
-                let last_proj = child_place.projection.last().unwrap();
+            let move_paths = &self.move_data.move_paths;
+
+            let root_path = &move_paths[mpi];
+            for (child_mpi, child_move_path) in root_path.children(move_paths) {
+                let last_proj = child_move_path.place.projection.last().unwrap();
                 if let ProjectionElem::ConstantIndex { offset, from_end, .. } = last_proj {
                     debug_assert!(!from_end, "Array constant indexing shouldn't be `from_end`.");
 
                     if (from..to).contains(offset) {
-                        if let Some(uninit_child) = maybe_uninits.has_any_child_of(child_mpi) {
+                        let uninit_child =
+                            self.move_data.find_in_move_path_or_its_descendants(child_mpi, |mpi| {
+                                maybe_uninits.contains(mpi)
+                            });
+
+                        if let Some(uninit_child) = uninit_child {
                             self.report_use_of_moved_or_uninitialized(
                                 location,
                                 desired_action,
@@ -1588,7 +1624,6 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         }
                     }
                 }
-                child = child_move_place.next_sibling;
             }
         }
     }
@@ -1597,7 +1632,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         &mut self,
         location: Location,
         desired_action: InitializationRequiringAction,
-        place_span: (PlaceRef<'cx, 'tcx>, Span),
+        place_span: (PlaceRef<'tcx>, Span),
         flow_state: &Flows<'cx, 'tcx>,
     ) {
         let maybe_uninits = &flow_state.uninits;
@@ -1649,12 +1684,16 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
         debug!("check_if_path_or_subpath_is_moved place: {:?}", place_span.0);
         if let Some(mpi) = self.move_path_for_place(place_span.0) {
-            if let Some(child_mpi) = maybe_uninits.has_any_child_of(mpi) {
+            let uninit_mpi = self
+                .move_data
+                .find_in_move_path_or_its_descendants(mpi, |mpi| maybe_uninits.contains(mpi));
+
+            if let Some(uninit_mpi) = uninit_mpi {
                 self.report_use_of_moved_or_uninitialized(
                     location,
                     desired_action,
                     (place_span.0, place_span.0, place_span.1),
-                    child_mpi,
+                    uninit_mpi,
                 );
                 return; // don't bother finding other problems.
             }
@@ -1671,10 +1710,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// An Err result includes a tag indicated why the search failed.
     /// Currently this can only occur if the place is built off of a
     /// static variable, as we do not track those in the MoveData.
-    fn move_path_closest_to(
-        &mut self,
-        place: PlaceRef<'_, 'tcx>,
-    ) -> (PlaceRef<'cx, 'tcx>, MovePathIndex) {
+    fn move_path_closest_to(&mut self, place: PlaceRef<'tcx>) -> (PlaceRef<'tcx>, MovePathIndex) {
         match self.move_data.rev_lookup.find(place) {
             LookupResult::Parent(Some(mpi)) | LookupResult::Exact(mpi) => {
                 (self.move_data.move_paths[mpi].place.as_ref(), mpi)
@@ -1683,7 +1719,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         }
     }
 
-    fn move_path_for_place(&mut self, place: PlaceRef<'_, 'tcx>) -> Option<MovePathIndex> {
+    fn move_path_for_place(&mut self, place: PlaceRef<'tcx>) -> Option<MovePathIndex> {
         // If returns None, then there is no move path corresponding
         // to a direct owner of `place` (which means there is nothing
         // that borrowck tracks for its analysis).
@@ -1722,7 +1758,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                     self.check_if_full_path_is_moved(
                         location, InitializationRequiringAction::Use,
                         (PlaceRef {
-                            local: &place.local,
+                            local: place.local,
                             projection: proj_base,
                         }, span), flow_state);
                     // (base initialized; no need to
@@ -1740,13 +1776,13 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                     // assigning to `P.f` requires `P` itself
                     // be already initialized
                     let tcx = self.infcx.tcx;
-                    let base_ty = Place::ty_from(&place.local, proj_base, self.body(), tcx).ty;
+                    let base_ty = Place::ty_from(place.local, proj_base, self.body(), tcx).ty;
                     match base_ty.kind {
                         ty::Adt(def, _) if def.has_dtor(tcx) => {
                             self.check_if_path_or_subpath_is_moved(
                                 location, InitializationRequiringAction::Assignment,
                                 (PlaceRef {
-                                    local: &place.local,
+                                    local: place.local,
                                     projection: proj_base,
                                 }, span), flow_state);
 
@@ -1759,7 +1795,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
                         // is allowed, remove this match arm.
                         ty::Adt(..) | ty::Tuple(..) => {
                             check_parent_of_field(self, location, PlaceRef {
-                                local: &place.local,
+                                local: place.local,
                                 projection: proj_base,
                             }, span, flow_state);
 
@@ -1778,7 +1814,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
         fn check_parent_of_field<'cx, 'tcx>(
             this: &mut MirBorrowckCtxt<'cx, 'tcx>,
             location: Location,
-            base: PlaceRef<'cx, 'tcx>,
+            base: PlaceRef<'tcx>,
             span: Span,
             flow_state: &Flows<'cx, 'tcx>,
         ) {
@@ -1991,16 +2027,16 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     }
 
     /// Adds the place into the used mutable variables set
-    fn add_used_mut<'d>(&mut self, root_place: RootPlace<'d, 'tcx>, flow_state: &Flows<'cx, 'tcx>) {
+    fn add_used_mut(&mut self, root_place: RootPlace<'tcx>, flow_state: &Flows<'cx, 'tcx>) {
         match root_place {
             RootPlace { place_local: local, place_projection: [], is_local_mutation_allowed } => {
                 // If the local may have been initialized, and it is now currently being
                 // mutated, then it is justified to be annotated with the `mut`
                 // keyword, since the mutation may be a possible reassignment.
                 if is_local_mutation_allowed != LocalMutationIsAllowed::Yes
-                    && self.is_local_ever_initialized(*local, flow_state).is_some()
+                    && self.is_local_ever_initialized(local, flow_state).is_some()
                 {
-                    self.used_mut.insert(*local);
+                    self.used_mut.insert(local);
                 }
             }
             RootPlace {
@@ -2025,14 +2061,14 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 
     /// Whether this value can be written or borrowed mutably.
     /// Returns the root place if the place passed in is a projection.
-    fn is_mutable<'d>(
+    fn is_mutable(
         &self,
-        place: PlaceRef<'d, 'tcx>,
+        place: PlaceRef<'tcx>,
         is_local_mutation_allowed: LocalMutationIsAllowed,
-    ) -> Result<RootPlace<'d, 'tcx>, PlaceRef<'d, 'tcx>> {
+    ) -> Result<RootPlace<'tcx>, PlaceRef<'tcx>> {
         match place {
             PlaceRef { local, projection: [] } => {
-                let local = &self.body.local_decls[*local];
+                let local = &self.body.local_decls[local];
                 match local.mutability {
                     Mutability::Not => match is_local_mutation_allowed {
                         LocalMutationIsAllowed::Yes => Ok(RootPlace {
@@ -2180,7 +2216,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// then returns the index of the field being projected. Note that this closure will always
     /// be `self` in the current MIR, because that is the only time we directly access the fields
     /// of a closure type.
-    pub fn is_upvar_field_projection(&self, place_ref: PlaceRef<'cx, 'tcx>) -> Option<Field> {
+    pub fn is_upvar_field_projection(&self, place_ref: PlaceRef<'tcx>) -> Option<Field> {
         let mut place_projection = place_ref.projection;
         let mut by_ref = false;
 
diff --git a/src/librustc_mir/borrow_check/nll.rs b/src/librustc_mir/borrow_check/nll.rs
index 73718d5834..ba1b322524 100644
--- a/src/librustc_mir/borrow_check/nll.rs
+++ b/src/librustc_mir/borrow_check/nll.rs
@@ -1,14 +1,15 @@
 //! The entry point of the NLL borrow checker.
 
-use rustc::infer::InferCtxt;
 use rustc::mir::{
     BasicBlock, Body, BodyAndCache, ClosureOutlivesSubject, ClosureRegionRequirements, LocalKind,
     Location, Promoted, ReadOnlyBodyAndCache,
 };
 use rustc::ty::{self, RegionKind, RegionVid};
+use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::Diagnostic;
 use rustc_hir::def_id::DefId;
 use rustc_index::vec::IndexVec;
+use rustc_infer::infer::InferCtxt;
 use rustc_span::symbol::sym;
 use std::env;
 use std::fmt::Debug;
@@ -20,8 +21,8 @@ use std::str::FromStr;
 use self::mir_util::PassWhere;
 use polonius_engine::{Algorithm, Output};
 
+use crate::dataflow::generic::ResultsCursor;
 use crate::dataflow::move_paths::{InitKind, InitLocation, MoveData};
-use crate::dataflow::FlowAtLocation;
 use crate::dataflow::MaybeInitializedPlaces;
 use crate::transform::MirSource;
 use crate::util as mir_util;
@@ -46,6 +47,7 @@ crate type PoloniusOutput = Output<RustcFacts>;
 /// closure requirements to propagate, and any generated errors.
 crate struct NllOutput<'tcx> {
     pub regioncx: RegionInferenceContext<'tcx>,
+    pub opaque_type_values: FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>>,
     pub polonius_output: Option<Rc<PoloniusOutput>>,
     pub opt_closure_req: Option<ClosureRegionRequirements<'tcx>>,
     pub nll_errors: RegionErrors<'tcx>,
@@ -84,15 +86,18 @@ fn populate_polonius_move_facts(
     body: &Body<'_>,
 ) {
     all_facts
-        .path_belongs_to_var
+        .path_is_var
         .extend(move_data.rev_lookup.iter_locals_enumerated().map(|(v, &m)| (m, v)));
 
     for (child, move_path) in move_data.move_paths.iter_enumerated() {
-        all_facts
-            .child
-            .extend(move_path.parents(&move_data.move_paths).iter().map(|&parent| (child, parent)));
+        if let Some(parent) = move_path.parent {
+            all_facts.child_path.push((child, parent));
+        }
     }
 
+    let fn_entry_start = location_table
+        .start_index(Location { block: BasicBlock::from_u32(0u32), statement_index: 0 });
+
     // initialized_at
     for init in move_data.inits.iter() {
         match init.location {
@@ -113,28 +118,37 @@ fn populate_polonius_move_facts(
                         // the successors, but not in the unwind block.
                         let first_statement = Location { block: successor, statement_index: 0 };
                         all_facts
-                            .initialized_at
+                            .path_assigned_at_base
                             .push((init.path, location_table.start_index(first_statement)));
                     }
                 } else {
                     // In all other cases, the initialization just happens at the
                     // midpoint, like any other effect.
-                    all_facts.initialized_at.push((init.path, location_table.mid_index(location)));
+                    all_facts
+                        .path_assigned_at_base
+                        .push((init.path, location_table.mid_index(location)));
                 }
             }
             // Arguments are initialized on function entry
             InitLocation::Argument(local) => {
                 assert!(body.local_kind(local) == LocalKind::Arg);
-                let fn_entry = Location { block: BasicBlock::from_u32(0u32), statement_index: 0 };
-                all_facts.initialized_at.push((init.path, location_table.start_index(fn_entry)));
+                all_facts.path_assigned_at_base.push((init.path, fn_entry_start));
             }
         }
     }
 
+    for (local, &path) in move_data.rev_lookup.iter_locals_enumerated() {
+        if body.local_kind(local) != LocalKind::Arg {
+            // Non-arguments start out deinitialised; we simulate this with an
+            // initial move:
+            all_facts.path_moved_at_base.push((path, fn_entry_start));
+        }
+    }
+
     // moved_out_at
     // deinitialisation is assumed to always happen!
     all_facts
-        .moved_out_at
+        .path_moved_at_base
         .extend(move_data.moves.iter().map(|mo| (mo.path, location_table.mid_index(mo.source))));
 }
 
@@ -149,7 +163,7 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
     promoted: &IndexVec<Promoted, ReadOnlyBodyAndCache<'_, 'tcx>>,
     location_table: &LocationTable,
     param_env: ty::ParamEnv<'tcx>,
-    flow_inits: &mut FlowAtLocation<'tcx, MaybeInitializedPlaces<'cx, 'tcx>>,
+    flow_inits: &mut ResultsCursor<'cx, 'tcx, MaybeInitializedPlaces<'cx, 'tcx>>,
     move_data: &MoveData<'tcx>,
     borrow_set: &BorrowSet<'tcx>,
 ) -> NllOutput<'tcx> {
@@ -160,20 +174,21 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
     let elements = &Rc::new(RegionValueElements::new(&body));
 
     // Run the MIR type-checker.
-    let MirTypeckResults { constraints, universal_region_relations } = type_check::type_check(
-        infcx,
-        param_env,
-        body,
-        promoted,
-        def_id,
-        &universal_regions,
-        location_table,
-        borrow_set,
-        &mut all_facts,
-        flow_inits,
-        move_data,
-        elements,
-    );
+    let MirTypeckResults { constraints, universal_region_relations, opaque_type_values } =
+        type_check::type_check(
+            infcx,
+            param_env,
+            body,
+            promoted,
+            def_id,
+            &universal_regions,
+            location_table,
+            borrow_set,
+            &mut all_facts,
+            flow_inits,
+            move_data,
+            elements,
+        );
 
     if let Some(all_facts) = &mut all_facts {
         let _prof_timer = infcx.tcx.prof.generic_activity("polonius_fact_generation");
@@ -279,8 +294,16 @@ pub(in crate::borrow_check) fn compute_regions<'cx, 'tcx>(
     let (closure_region_requirements, nll_errors) =
         regioncx.solve(infcx, &body, def_id, polonius_output.clone());
 
+    if !nll_errors.is_empty() {
+        // Suppress unhelpful extra errors in `infer_opaque_types`.
+        infcx.set_tainted_by_errors();
+    }
+
+    let remapped_opaque_tys = regioncx.infer_opaque_types(&infcx, opaque_type_values, body.span);
+
     NllOutput {
         regioncx,
+        opaque_type_values: remapped_opaque_tys,
         polonius_output,
         opt_closure_req: closure_region_requirements,
         nll_errors,
@@ -344,6 +367,7 @@ pub(super) fn dump_annotation<'a, 'tcx>(
     mir_def_id: DefId,
     regioncx: &RegionInferenceContext<'tcx>,
     closure_region_requirements: &Option<ClosureRegionRequirements<'_>>,
+    opaque_type_values: &FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>>,
     errors_buffer: &mut Vec<Diagnostic>,
 ) {
     let tcx = infcx.tcx;
@@ -359,7 +383,7 @@ pub(super) fn dump_annotation<'a, 'tcx>(
     // viewing the intraprocedural state, the -Zdump-mir output is
     // better.
 
-    if let Some(closure_region_requirements) = closure_region_requirements {
+    let mut err = if let Some(closure_region_requirements) = closure_region_requirements {
         let mut err = tcx.sess.diagnostic().span_note_diag(body.span, "external requirements");
 
         regioncx.annotate(tcx, &mut err);
@@ -377,13 +401,19 @@ pub(super) fn dump_annotation<'a, 'tcx>(
         })
         .unwrap();
 
-        err.buffer(errors_buffer);
+        err
     } else {
         let mut err = tcx.sess.diagnostic().span_note_diag(body.span, "no external requirements");
         regioncx.annotate(tcx, &mut err);
 
-        err.buffer(errors_buffer);
+        err
+    };
+
+    if !opaque_type_values.is_empty() {
+        err.note(&format!("Inferred opaque type values:\n{:#?}", opaque_type_values));
     }
+
+    err.buffer(errors_buffer);
 }
 
 fn for_each_region_constraint(
diff --git a/src/librustc_mir/borrow_check/place_ext.rs b/src/librustc_mir/borrow_check/place_ext.rs
index ac02da2661..01c44d0d90 100644
--- a/src/librustc_mir/borrow_check/place_ext.rs
+++ b/src/librustc_mir/borrow_check/place_ext.rs
@@ -48,7 +48,7 @@ impl<'tcx> PlaceExt<'tcx> for Place<'tcx> {
             let proj_base = &self.projection[..i];
 
             if *elem == ProjectionElem::Deref {
-                let ty = Place::ty_from(&self.local, proj_base, body, tcx).ty;
+                let ty = Place::ty_from(self.local, proj_base, body, tcx).ty;
                 match ty.kind {
                     ty::Ref(_, _, hir::Mutability::Not) if i == 0 => {
                         // For references to thread-local statics, we do need
diff --git a/src/librustc_mir/borrow_check/places_conflict.rs b/src/librustc_mir/borrow_check/places_conflict.rs
index b95d1af11a..767ffa50fe 100644
--- a/src/librustc_mir/borrow_check/places_conflict.rs
+++ b/src/librustc_mir/borrow_check/places_conflict.rs
@@ -48,7 +48,7 @@ pub(super) fn borrow_conflicts_with_place<'tcx>(
     body: &Body<'tcx>,
     borrow_place: &Place<'tcx>,
     borrow_kind: BorrowKind,
-    access_place: PlaceRef<'_, 'tcx>,
+    access_place: PlaceRef<'tcx>,
     access: AccessDepth,
     bias: PlaceConflictBias,
 ) -> bool {
@@ -73,7 +73,7 @@ fn place_components_conflict<'tcx>(
     body: &Body<'tcx>,
     borrow_place: &Place<'tcx>,
     borrow_kind: BorrowKind,
-    access_place: PlaceRef<'_, 'tcx>,
+    access_place: PlaceRef<'tcx>,
     access: AccessDepth,
     bias: PlaceConflictBias,
 ) -> bool {
@@ -119,7 +119,7 @@ fn place_components_conflict<'tcx>(
     //    and either equal or disjoint.
     //  - If we did run out of access, the borrow can access a part of it.
 
-    let borrow_local = &borrow_place.local;
+    let borrow_local = borrow_place.local;
     let access_local = access_place.local;
 
     match place_base_conflict(borrow_local, access_local) {
@@ -293,7 +293,7 @@ fn place_components_conflict<'tcx>(
 // Given that the bases of `elem1` and `elem2` are always either equal
 // or disjoint (and have the same type!), return the overlap situation
 // between `elem1` and `elem2`.
-fn place_base_conflict(l1: &Local, l2: &Local) -> Overlap {
+fn place_base_conflict(l1: Local, l2: Local) -> Overlap {
     if l1 == l2 {
         // the same local - base case, equal
         debug!("place_element_conflict: DISJOINT-OR-EQ-LOCAL");
@@ -311,7 +311,7 @@ fn place_base_conflict(l1: &Local, l2: &Local) -> Overlap {
 fn place_projection_conflict<'tcx>(
     tcx: TyCtxt<'tcx>,
     body: &Body<'tcx>,
-    pi1_local: &Local,
+    pi1_local: Local,
     pi1_proj_base: &[PlaceElem<'tcx>],
     pi1_elem: &PlaceElem<'tcx>,
     pi2_elem: &PlaceElem<'tcx>,
diff --git a/src/librustc_mir/borrow_check/prefixes.rs b/src/librustc_mir/borrow_check/prefixes.rs
index 31bee460fa..c64e8c363a 100644
--- a/src/librustc_mir/borrow_check/prefixes.rs
+++ b/src/librustc_mir/borrow_check/prefixes.rs
@@ -13,12 +13,12 @@ use rustc::mir::{Place, PlaceRef, ProjectionElem, ReadOnlyBodyAndCache};
 use rustc::ty::{self, TyCtxt};
 use rustc_hir as hir;
 
-pub trait IsPrefixOf<'cx, 'tcx> {
-    fn is_prefix_of(&self, other: PlaceRef<'cx, 'tcx>) -> bool;
+pub trait IsPrefixOf<'tcx> {
+    fn is_prefix_of(&self, other: PlaceRef<'tcx>) -> bool;
 }
 
-impl<'cx, 'tcx> IsPrefixOf<'cx, 'tcx> for PlaceRef<'cx, 'tcx> {
-    fn is_prefix_of(&self, other: PlaceRef<'cx, 'tcx>) -> bool {
+impl<'tcx> IsPrefixOf<'tcx> for PlaceRef<'tcx> {
+    fn is_prefix_of(&self, other: PlaceRef<'tcx>) -> bool {
         self.local == other.local
             && self.projection.len() <= other.projection.len()
             && self.projection == &other.projection[..self.projection.len()]
@@ -29,7 +29,7 @@ pub(super) struct Prefixes<'cx, 'tcx> {
     body: ReadOnlyBodyAndCache<'cx, 'tcx>,
     tcx: TyCtxt<'tcx>,
     kind: PrefixSet,
-    next: Option<PlaceRef<'cx, 'tcx>>,
+    next: Option<PlaceRef<'tcx>>,
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
@@ -50,7 +50,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
     /// terminating the iteration early based on `kind`.
     pub(super) fn prefixes(
         &self,
-        place_ref: PlaceRef<'cx, 'tcx>,
+        place_ref: PlaceRef<'tcx>,
         kind: PrefixSet,
     ) -> Prefixes<'cx, 'tcx> {
         Prefixes { next: Some(place_ref), kind, body: self.body, tcx: self.infcx.tcx }
@@ -58,7 +58,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
 }
 
 impl<'cx, 'tcx> Iterator for Prefixes<'cx, 'tcx> {
-    type Item = PlaceRef<'cx, 'tcx>;
+    type Item = PlaceRef<'tcx>;
     fn next(&mut self) -> Option<Self::Item> {
         let mut cursor = self.next?;
 
diff --git a/src/librustc_mir/borrow_check/region_infer/dump_mir.rs b/src/librustc_mir/borrow_check/region_infer/dump_mir.rs
index b236ffe807..369e540231 100644
--- a/src/librustc_mir/borrow_check/region_infer/dump_mir.rs
+++ b/src/librustc_mir/borrow_check/region_infer/dump_mir.rs
@@ -4,7 +4,7 @@
 //! context internal state.
 
 use super::{OutlivesConstraint, RegionInferenceContext};
-use rustc::infer::NLLRegionVariableOrigin;
+use rustc_infer::infer::NLLRegionVariableOrigin;
 use std::io::{self, Write};
 
 // Room for "'_#NNNNr" before things get misaligned.
diff --git a/src/librustc_mir/borrow_check/region_infer/mod.rs b/src/librustc_mir/borrow_check/region_infer/mod.rs
index 26d9cf2e04..144f655420 100644
--- a/src/librustc_mir/borrow_check/region_infer/mod.rs
+++ b/src/librustc_mir/borrow_check/region_infer/mod.rs
@@ -1,9 +1,6 @@
 use std::collections::VecDeque;
 use std::rc::Rc;
 
-use rustc::infer::canonical::QueryOutlivesConstraint;
-use rustc::infer::region_constraints::{GenericKind, VarInfos, VerifyBound};
-use rustc::infer::{InferCtxt, NLLRegionVariableOrigin, RegionVariableOrigin};
 use rustc::mir::{
     Body, ClosureOutlivesRequirement, ClosureOutlivesSubject, ClosureRegionRequirements,
     ConstraintCategory, Local, Location,
@@ -12,11 +9,12 @@ use rustc::ty::{self, subst::SubstsRef, RegionVid, Ty, TyCtxt, TypeFoldable};
 use rustc_data_structures::binary_search_util;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::graph::scc::Sccs;
-use rustc_data_structures::graph::vec_graph::VecGraph;
-use rustc_data_structures::graph::WithSuccessors;
 use rustc_hir::def_id::DefId;
 use rustc_index::bit_set::BitSet;
 use rustc_index::vec::IndexVec;
+use rustc_infer::infer::canonical::QueryOutlivesConstraint;
+use rustc_infer::infer::region_constraints::{GenericKind, VarInfos, VerifyBound};
+use rustc_infer::infer::{InferCtxt, NLLRegionVariableOrigin, RegionVariableOrigin};
 use rustc_span::Span;
 
 use crate::borrow_check::{
@@ -26,6 +24,7 @@ use crate::borrow_check::{
     diagnostics::{RegionErrorKind, RegionErrors},
     member_constraints::{MemberConstraintSet, NllMemberConstraintIndex},
     nll::{PoloniusOutput, ToRegionVid},
+    region_infer::reverse_sccs::ReverseSccGraph,
     region_infer::values::{
         LivenessValues, PlaceholderIndices, RegionElement, RegionValueElements, RegionValues,
         ToElementIndex,
@@ -36,6 +35,8 @@ use crate::borrow_check::{
 
 mod dump_mir;
 mod graphviz;
+mod opaque_types;
+mod reverse_sccs;
 
 pub mod values;
 
@@ -65,9 +66,10 @@ pub struct RegionInferenceContext<'tcx> {
     /// compute the values of each region.
     constraint_sccs: Rc<Sccs<RegionVid, ConstraintSccIndex>>,
 
-    /// Reverse of the SCC constraint graph -- i.e., an edge `A -> B`
-    /// exists if `B: A`. Computed lazilly.
-    rev_constraint_graph: Option<Rc<VecGraph<ConstraintSccIndex>>>,
+    /// Reverse of the SCC constraint graph --  i.e., an edge `A -> B` exists if
+    /// `B: A`. This is used to compute the universal regions that are required
+    /// to outlive a given SCC. Computed lazily.
+    rev_scc_graph: Option<Rc<ReverseSccGraph>>,
 
     /// The "R0 member of [R1..Rn]" constraints, indexed by SCC.
     member_constraints: Rc<MemberConstraintSet<'tcx, ConstraintSccIndex>>,
@@ -287,7 +289,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             constraints,
             constraint_graph,
             constraint_sccs,
-            rev_constraint_graph: None,
+            rev_scc_graph: None,
             member_constraints,
             member_constraints_applied: Vec::new(),
             closure_bounds_mapping,
@@ -510,7 +512,9 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             self.check_universal_regions(body, outlives_requirements.as_mut(), &mut errors_buffer);
         }
 
-        self.check_member_constraints(infcx, &mut errors_buffer);
+        if errors_buffer.is_empty() {
+            self.check_member_constraints(infcx, &mut errors_buffer);
+        }
 
         let outlives_requirements = outlives_requirements.unwrap_or(vec![]);
 
@@ -677,15 +681,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
         // free region that must outlive the member region `R0` (`UB:
         // R0`). Therefore, we need only keep an option `O` if `UB: O`
         // for all UB.
-        if choice_regions.len() > 1 {
-            let universal_region_relations = self.universal_region_relations.clone();
-            let rev_constraint_graph = self.rev_constraint_graph();
-            for ub in self.upper_bounds(scc, &rev_constraint_graph) {
-                debug!("apply_member_constraint: ub={:?}", ub);
-                choice_regions.retain(|&o_r| universal_region_relations.outlives(ub, o_r));
-            }
-            debug!("apply_member_constraint: after ub, choice_regions={:?}", choice_regions);
+        let rev_scc_graph = self.reverse_scc_graph();
+        let universal_region_relations = &self.universal_region_relations;
+        for ub in rev_scc_graph.upper_bounds(scc) {
+            debug!("apply_member_constraint: ub={:?}", ub);
+            choice_regions.retain(|&o_r| universal_region_relations.outlives(ub, o_r));
         }
+        debug!("apply_member_constraint: after ub, choice_regions={:?}", choice_regions);
 
         // If we ruled everything out, we're done.
         if choice_regions.is_empty() {
@@ -741,32 +743,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
         }
     }
 
-    /// Compute and return the reverse SCC-based constraint graph (lazilly).
-    fn upper_bounds(
-        &'a mut self,
-        scc0: ConstraintSccIndex,
-        rev_constraint_graph: &'a VecGraph<ConstraintSccIndex>,
-    ) -> impl Iterator<Item = RegionVid> + 'a {
-        let scc_values = &self.scc_values;
-        let mut duplicates = FxHashSet::default();
-        rev_constraint_graph
-            .depth_first_search(scc0)
-            .skip(1)
-            .flat_map(move |scc1| scc_values.universal_regions_outlived_by(scc1))
-            .filter(move |&r| duplicates.insert(r))
-    }
-
-    /// Compute and return the reverse SCC-based constraint graph (lazilly).
-    fn rev_constraint_graph(&mut self) -> Rc<VecGraph<ConstraintSccIndex>> {
-        if let Some(g) = &self.rev_constraint_graph {
-            return g.clone();
-        }
-
-        let rev_graph = Rc::new(self.constraint_sccs.reverse());
-        self.rev_constraint_graph = Some(rev_graph.clone());
-        rev_graph
-    }
-
     /// Returns `true` if all the elements in the value of `scc_b` are nameable
     /// in `scc_a`. Used during constraint propagation, and only once
     /// the value of `scc_b` has been computed.
@@ -1108,6 +1084,11 @@ impl<'tcx> RegionInferenceContext<'tcx> {
                 self.eval_if_eq(tcx, body, generic_ty, lower_bound, test_ty, verify_bound1)
             }
 
+            VerifyBound::IsEmpty => {
+                let lower_bound_scc = self.constraint_sccs.scc(lower_bound);
+                self.scc_values.elements_contained_in(lower_bound_scc).next().is_none()
+            }
+
             VerifyBound::OutlivedBy(r) => {
                 let r_vid = self.to_region_vid(r);
                 self.eval_outlives(r_vid, lower_bound)
@@ -1598,7 +1579,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             // If not, report an error.
             let member_region = infcx.tcx.mk_region(ty::ReVar(member_region_vid));
             errors_buffer.push(RegionErrorKind::UnexpectedHiddenRegion {
-                opaque_type_def_id: m_c.opaque_type_def_id,
+                span: m_c.definition_span,
                 hidden_ty: m_c.hidden_ty,
                 member_region,
             });
diff --git a/src/librustc_mir/borrow_check/region_infer/opaque_types.rs b/src/librustc_mir/borrow_check/region_infer/opaque_types.rs
new file mode 100644
index 0000000000..15bbc5677d
--- /dev/null
+++ b/src/librustc_mir/borrow_check/region_infer/opaque_types.rs
@@ -0,0 +1,149 @@
+use rustc::ty::{self, TyCtxt, TypeFoldable};
+use rustc_data_structures::fx::FxHashMap;
+use rustc_hir::def_id::DefId;
+use rustc_infer::infer::InferCtxt;
+use rustc_span::Span;
+
+use super::RegionInferenceContext;
+
+impl<'tcx> RegionInferenceContext<'tcx> {
+    /// Resolve any opaque types that were encountered while borrow checking
+    /// this item. This is then used to get the type in the `type_of` query.
+    ///
+    /// For example consider `fn f<'a>(x: &'a i32) -> impl Sized + 'a { x }`.
+    /// This is lowered to give HIR something like
+    ///
+    /// type f<'a>::_Return<'_a> = impl Sized + '_a;
+    /// fn f<'a>(x: &'a i32) -> f<'static>::_Return<'a> { x }
+    ///
+    /// When checking the return type record the type from the return and the
+    /// type used in the return value. In this case they might be `_Return<'1>`
+    /// and `&'2 i32` respectively.
+    ///
+    /// Once we to this method, we have completed region inference and want to
+    /// call `infer_opaque_definition_from_instantiation` to get the inferred
+    /// type of `_Return<'_a>`. `infer_opaque_definition_from_instantiation`
+    /// compares lifetimes directly, so we need to map the inference variables
+    /// back to concrete lifetimes: `'static`, `ReEarlyBound` or `ReFree`.
+    ///
+    /// First we map all the lifetimes in the concrete type to an equal
+    /// universal region that occurs in the concrete type's substs, in this case
+    /// this would result in `&'1 i32`. We only consider regions in the substs
+    /// in case there is an equal region that does not. For example, this should
+    /// be allowed:
+    /// `fn f<'a: 'b, 'b: 'a>(x: *mut &'b i32) -> impl Sized + 'a { x }`
+    ///
+    /// Then we map the regions in both the type and the subst to their
+    /// `external_name` giving `concrete_type = &'a i32`,
+    /// `substs = ['static, 'a]`. This will then allow
+    /// `infer_opaque_definition_from_instantiation` to determine that
+    /// `_Return<'_a> = &'_a i32`.
+    ///
+    /// There's a slight complication around closures. Given
+    /// `fn f<'a: 'a>() { || {} }` the closure's type is something like
+    /// `f::<'a>::{{closure}}`. The region parameter from f is essentially
+    /// ignored by type checking so ends up being inferred to an empty region.
+    /// Calling `universal_upper_bound` for such a region gives `fr_fn_body`,
+    /// which has no `external_name` in which case we use `'empty` as the
+    /// region to pass to `infer_opaque_definition_from_instantiation`.
+    pub(in crate::borrow_check) fn infer_opaque_types(
+        &self,
+        infcx: &InferCtxt<'_, 'tcx>,
+        opaque_ty_decls: FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>>,
+        span: Span,
+    ) -> FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>> {
+        opaque_ty_decls
+            .into_iter()
+            .map(|(opaque_def_id, ty::ResolvedOpaqueTy { concrete_type, substs })| {
+                debug!(
+                    "infer_opaque_types(concrete_type = {:?}, substs = {:?})",
+                    concrete_type, substs
+                );
+
+                let mut subst_regions = vec![self.universal_regions.fr_static];
+                let universal_substs =
+                    infcx.tcx.fold_regions(&substs, &mut false, |region, _| match *region {
+                        ty::ReVar(vid) => {
+                            subst_regions.push(vid);
+                            self.definitions[vid].external_name.unwrap_or_else(|| {
+                                infcx.tcx.sess.delay_span_bug(
+                                    span,
+                                    "opaque type with non-universal region substs",
+                                );
+                                infcx.tcx.lifetimes.re_static
+                            })
+                        }
+                        // We don't fold regions in the predicates of opaque
+                        // types to `ReVar`s. This means that in a case like
+                        //
+                        // fn f<'a: 'a>() -> impl Iterator<Item = impl Sized>
+                        //
+                        // The inner opaque type has `'static` in its substs.
+                        ty::ReStatic => region,
+                        _ => {
+                            infcx.tcx.sess.delay_span_bug(
+                                span,
+                                &format!("unexpected concrete region in borrowck: {:?}", region),
+                            );
+                            region
+                        }
+                    });
+
+                subst_regions.sort();
+                subst_regions.dedup();
+
+                let universal_concrete_type =
+                    infcx.tcx.fold_regions(&concrete_type, &mut false, |region, _| match *region {
+                        ty::ReVar(vid) => subst_regions
+                            .iter()
+                            .find(|ur_vid| self.eval_equal(vid, **ur_vid))
+                            .and_then(|ur_vid| self.definitions[*ur_vid].external_name)
+                            .unwrap_or(infcx.tcx.lifetimes.re_root_empty),
+                        ty::ReLateBound(..) => region,
+                        _ => {
+                            infcx.tcx.sess.delay_span_bug(
+                                span,
+                                &format!("unexpected concrete region in borrowck: {:?}", region),
+                            );
+                            region
+                        }
+                    });
+
+                debug!(
+                    "infer_opaque_types(universal_concrete_type = {:?}, universal_substs = {:?})",
+                    universal_concrete_type, universal_substs
+                );
+
+                let remapped_type = infcx.infer_opaque_definition_from_instantiation(
+                    opaque_def_id,
+                    universal_substs,
+                    universal_concrete_type,
+                    span,
+                );
+                (
+                    opaque_def_id,
+                    ty::ResolvedOpaqueTy { concrete_type: remapped_type, substs: universal_substs },
+                )
+            })
+            .collect()
+    }
+
+    /// Map the regions in the type to named regions. This is similar to what
+    /// `infer_opaque_types` does, but can infer any universal region, not only
+    /// ones from the substs for the opaque type. It also doesn't double check
+    /// that the regions produced are in fact equal to the named region they are
+    /// replaced with. This is fine because this function is only to improve the
+    /// region names in error messages.
+    pub(in crate::borrow_check) fn name_regions<T>(&self, tcx: TyCtxt<'tcx>, ty: T) -> T
+    where
+        T: TypeFoldable<'tcx>,
+    {
+        tcx.fold_regions(&ty, &mut false, |region, _| match *region {
+            ty::ReVar(vid) => {
+                let upper_bound = self.universal_upper_bound(vid);
+                self.definitions[upper_bound].external_name.unwrap_or(region)
+            }
+            _ => region,
+        })
+    }
+}
diff --git a/src/librustc_mir/borrow_check/region_infer/reverse_sccs.rs b/src/librustc_mir/borrow_check/region_infer/reverse_sccs.rs
new file mode 100644
index 0000000000..ff19ac5f21
--- /dev/null
+++ b/src/librustc_mir/borrow_check/region_infer/reverse_sccs.rs
@@ -0,0 +1,68 @@
+use crate::borrow_check::constraints::ConstraintSccIndex;
+use crate::borrow_check::RegionInferenceContext;
+use itertools::Itertools;
+use rustc::ty::RegionVid;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_data_structures::graph::vec_graph::VecGraph;
+use rustc_data_structures::graph::WithSuccessors;
+use std::ops::Range;
+use std::rc::Rc;
+
+crate struct ReverseSccGraph {
+    graph: VecGraph<ConstraintSccIndex>,
+    /// For each SCC, the range of `universal_regions` that use that SCC as
+    /// their value.
+    scc_regions: FxHashMap<ConstraintSccIndex, Range<usize>>,
+    /// All of the universal regions, in grouped so that `scc_regions` can
+    /// index into here.
+    universal_regions: Vec<RegionVid>,
+}
+
+impl ReverseSccGraph {
+    /// Find all universal regions that are required to outlive the given SCC.
+    pub(super) fn upper_bounds<'a>(
+        &'a self,
+        scc0: ConstraintSccIndex,
+    ) -> impl Iterator<Item = RegionVid> + 'a {
+        let mut duplicates = FxHashSet::default();
+        self.graph
+            .depth_first_search(scc0)
+            .flat_map(move |scc1| {
+                self.scc_regions
+                    .get(&scc1)
+                    .map_or(&[][..], |range| &self.universal_regions[range.clone()])
+            })
+            .copied()
+            .filter(move |r| duplicates.insert(*r))
+    }
+}
+
+impl RegionInferenceContext<'_> {
+    /// Compute and return the reverse SCC-based constraint graph (lazily).
+    pub(super) fn reverse_scc_graph(&mut self) -> Rc<ReverseSccGraph> {
+        if let Some(g) = &self.rev_scc_graph {
+            return g.clone();
+        }
+
+        let graph = self.constraint_sccs.reverse();
+        let mut paired_scc_regions = self
+            .universal_regions
+            .universal_regions()
+            .map(|region| (self.constraint_sccs.scc(region), region))
+            .collect_vec();
+        paired_scc_regions.sort();
+        let universal_regions = paired_scc_regions.iter().map(|&(_, region)| region).collect();
+
+        let mut scc_regions = FxHashMap::default();
+        let mut start = 0;
+        for (scc, group) in &paired_scc_regions.into_iter().group_by(|(scc, _)| *scc) {
+            let group_size = group.count();
+            scc_regions.insert(scc, start..start + group_size);
+            start += group_size;
+        }
+
+        let rev_graph = Rc::new(ReverseSccGraph { graph, scc_regions, universal_regions });
+        self.rev_scc_graph = Some(rev_graph.clone());
+        rev_graph
+    }
+}
diff --git a/src/librustc_mir/borrow_check/region_infer/values.rs b/src/librustc_mir/borrow_check/region_infer/values.rs
index 3126d44014..675463cb1c 100644
--- a/src/librustc_mir/borrow_check/region_infer/values.rs
+++ b/src/librustc_mir/borrow_check/region_infer/values.rs
@@ -140,7 +140,7 @@ impl<N: Idx> LivenessValues<N> {
     /// Each of the regions in num_region_variables will be initialized with an
     /// empty set of points and no causal information.
     crate fn new(elements: Rc<RegionValueElements>) -> Self {
-        Self { points: SparseBitMatrix::new(elements.num_points), elements: elements }
+        Self { points: SparseBitMatrix::new(elements.num_points), elements }
     }
 
     /// Iterate through each region that has a value in this set.
diff --git a/src/librustc_mir/borrow_check/renumber.rs b/src/librustc_mir/borrow_check/renumber.rs
index ab08cb0a31..a63d18c27f 100644
--- a/src/librustc_mir/borrow_check/renumber.rs
+++ b/src/librustc_mir/borrow_check/renumber.rs
@@ -1,9 +1,9 @@
-use rustc::infer::{InferCtxt, NLLRegionVariableOrigin};
 use rustc::mir::visit::{MutVisitor, TyContext};
 use rustc::mir::{BodyAndCache, Location, PlaceElem, Promoted};
 use rustc::ty::subst::SubstsRef;
 use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
 use rustc_index::vec::IndexVec;
+use rustc_infer::infer::{InferCtxt, NLLRegionVariableOrigin};
 
 /// Replaces all free regions appearing in the MIR with fresh
 /// inference variables, returning the number of variables created.
diff --git a/src/librustc_mir/borrow_check/type_check/constraint_conversion.rs b/src/librustc_mir/borrow_check/type_check/constraint_conversion.rs
index 8f65a0f01c..576759c2a3 100644
--- a/src/librustc_mir/borrow_check/type_check/constraint_conversion.rs
+++ b/src/librustc_mir/borrow_check/type_check/constraint_conversion.rs
@@ -1,12 +1,12 @@
-use rustc::infer::canonical::QueryOutlivesConstraint;
-use rustc::infer::canonical::QueryRegionConstraints;
-use rustc::infer::outlives::env::RegionBoundPairs;
-use rustc::infer::outlives::obligations::{TypeOutlives, TypeOutlivesDelegate};
-use rustc::infer::region_constraints::{GenericKind, VerifyBound};
-use rustc::infer::{self, InferCtxt, SubregionOrigin};
 use rustc::mir::ConstraintCategory;
 use rustc::ty::subst::GenericArgKind;
 use rustc::ty::{self, TyCtxt};
+use rustc_infer::infer::canonical::QueryOutlivesConstraint;
+use rustc_infer::infer::canonical::QueryRegionConstraints;
+use rustc_infer::infer::outlives::env::RegionBoundPairs;
+use rustc_infer::infer::outlives::obligations::{TypeOutlives, TypeOutlivesDelegate};
+use rustc_infer::infer::region_constraints::{GenericKind, VerifyBound};
+use rustc_infer::infer::{self, InferCtxt, SubregionOrigin};
 use rustc_span::DUMMY_SP;
 
 use crate::borrow_check::{
@@ -160,7 +160,8 @@ impl<'a, 'b, 'tcx> TypeOutlivesDelegate<'tcx> for &'a mut ConstraintConversion<'
         a: ty::Region<'tcx>,
         b: ty::Region<'tcx>,
     ) {
-        if let ty::ReEmpty = a {
+        // FIXME -- this is not the fix I would prefer
+        if let ty::ReEmpty(ty::UniverseIndex::ROOT) = a {
             return;
         }
         let b = self.to_region_vid(b);
@@ -175,7 +176,8 @@ impl<'a, 'b, 'tcx> TypeOutlivesDelegate<'tcx> for &'a mut ConstraintConversion<'
         a: ty::Region<'tcx>,
         bound: VerifyBound<'tcx>,
     ) {
-        if let ty::ReEmpty = a {
+        // FIXME: I'd prefer if NLL had a notion of empty
+        if let ty::ReEmpty(ty::UniverseIndex::ROOT) = a {
             return;
         }
         let type_test = self.verify_to_type_test(kind, a, bound);
diff --git a/src/librustc_mir/borrow_check/type_check/free_region_relations.rs b/src/librustc_mir/borrow_check/type_check/free_region_relations.rs
index f0dc94f417..137216531a 100644
--- a/src/librustc_mir/borrow_check/type_check/free_region_relations.rs
+++ b/src/librustc_mir/borrow_check/type_check/free_region_relations.rs
@@ -1,12 +1,12 @@
-use rustc::infer::canonical::QueryRegionConstraints;
-use rustc::infer::region_constraints::GenericKind;
-use rustc::infer::InferCtxt;
 use rustc::mir::ConstraintCategory;
-use rustc::traits::query::outlives_bounds::{self, OutlivesBound};
-use rustc::traits::query::type_op::{self, TypeOp};
 use rustc::ty::free_region_map::FreeRegionRelations;
-use rustc::ty::{self, RegionVid, Ty};
+use rustc::ty::{self, RegionVid, Ty, TyCtxt};
 use rustc_data_structures::transitive_relation::TransitiveRelation;
+use rustc_infer::infer::canonical::QueryRegionConstraints;
+use rustc_infer::infer::region_constraints::GenericKind;
+use rustc_infer::infer::InferCtxt;
+use rustc_infer::traits::query::outlives_bounds::{self, OutlivesBound};
+use rustc_infer::traits::query::type_op::{self, TypeOp};
 use rustc_span::DUMMY_SP;
 use std::rc::Rc;
 
@@ -333,7 +333,7 @@ impl UniversalRegionRelationsBuilder<'cx, 'tcx> {
                     // `where Type:` is lowered to `where Type: 'empty` so that
                     // we check `Type` is well formed, but there's no use for
                     // this bound here.
-                    if let ty::ReEmpty = r1 {
+                    if let ty::ReEmpty(_) = r1 {
                         return;
                     }
 
@@ -359,7 +359,12 @@ impl UniversalRegionRelationsBuilder<'cx, 'tcx> {
 /// over the `FreeRegionMap` from lexical regions and
 /// `UniversalRegions` (from NLL)`.
 impl<'tcx> FreeRegionRelations<'tcx> for UniversalRegionRelations<'tcx> {
-    fn sub_free_regions(&self, shorter: ty::Region<'tcx>, longer: ty::Region<'tcx>) -> bool {
+    fn sub_free_regions(
+        &self,
+        _tcx: TyCtxt<'tcx>,
+        shorter: ty::Region<'tcx>,
+        longer: ty::Region<'tcx>,
+    ) -> bool {
         let shorter = shorter.to_region_vid();
         assert!(self.universal_regions.is_universal_region(shorter));
         let longer = longer.to_region_vid();
diff --git a/src/librustc_mir/borrow_check/type_check/input_output.rs b/src/librustc_mir/borrow_check/type_check/input_output.rs
index 3d3b1e5cbf..37cf77b709 100644
--- a/src/librustc_mir/borrow_check/type_check/input_output.rs
+++ b/src/librustc_mir/borrow_check/type_check/input_output.rs
@@ -7,9 +7,9 @@
 //! `RETURN_PLACE` the MIR arguments) are always fully normalized (and
 //! contain revealed `impl Trait` values).
 
-use rustc::infer::LateBoundRegionConversionTime;
 use rustc::mir::*;
 use rustc::ty::Ty;
+use rustc_infer::infer::LateBoundRegionConversionTime;
 
 use rustc_index::vec::Idx;
 use rustc_span::Span;
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/mod.rs b/src/librustc_mir/borrow_check/type_check/liveness/mod.rs
index e461ce739a..cdf962ee31 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/mod.rs
+++ b/src/librustc_mir/borrow_check/type_check/liveness/mod.rs
@@ -3,8 +3,8 @@ use rustc::ty::{RegionVid, TyCtxt};
 use rustc_data_structures::fx::FxHashSet;
 use std::rc::Rc;
 
+use crate::dataflow::generic::ResultsCursor;
 use crate::dataflow::move_paths::MoveData;
-use crate::dataflow::FlowAtLocation;
 use crate::dataflow::MaybeInitializedPlaces;
 
 use crate::borrow_check::{
@@ -30,11 +30,11 @@ mod trace;
 ///
 /// N.B., this computation requires normalization; therefore, it must be
 /// performed before
-pub(super) fn generate<'tcx>(
+pub(super) fn generate<'mir, 'tcx>(
     typeck: &mut TypeChecker<'_, 'tcx>,
     body: ReadOnlyBodyAndCache<'_, 'tcx>,
     elements: &Rc<RegionValueElements>,
-    flow_inits: &mut FlowAtLocation<'tcx, MaybeInitializedPlaces<'_, 'tcx>>,
+    flow_inits: &mut ResultsCursor<'mir, 'tcx, MaybeInitializedPlaces<'mir, 'tcx>>,
     move_data: &MoveData<'tcx>,
     location_table: &LocationTable,
 ) {
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/polonius.rs b/src/librustc_mir/borrow_check/type_check/liveness/polonius.rs
index 055415f287..407e0628b6 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/polonius.rs
+++ b/src/librustc_mir/borrow_check/type_check/liveness/polonius.rs
@@ -12,12 +12,12 @@ type VarPointRelation = Vec<(Local, LocationIndex)>;
 type PathPointRelation = Vec<(MovePathIndex, LocationIndex)>;
 
 struct UseFactsExtractor<'me> {
-    var_defined: &'me mut VarPointRelation,
-    var_used: &'me mut VarPointRelation,
+    var_defined_at: &'me mut VarPointRelation,
+    var_used_at: &'me mut VarPointRelation,
     location_table: &'me LocationTable,
-    var_drop_used: &'me mut Vec<(Local, Location)>,
+    var_dropped_at: &'me mut VarPointRelation,
     move_data: &'me MoveData<'me>,
-    path_accessed_at: &'me mut PathPointRelation,
+    path_accessed_at_base: &'me mut PathPointRelation,
 }
 
 // A Visitor to walk through the MIR and extract point-wise facts
@@ -28,22 +28,22 @@ impl UseFactsExtractor<'_> {
 
     fn insert_def(&mut self, local: Local, location: Location) {
         debug!("UseFactsExtractor::insert_def()");
-        self.var_defined.push((local, self.location_to_index(location)));
+        self.var_defined_at.push((local, self.location_to_index(location)));
     }
 
     fn insert_use(&mut self, local: Local, location: Location) {
         debug!("UseFactsExtractor::insert_use()");
-        self.var_used.push((local, self.location_to_index(location)));
+        self.var_used_at.push((local, self.location_to_index(location)));
     }
 
     fn insert_drop_use(&mut self, local: Local, location: Location) {
         debug!("UseFactsExtractor::insert_drop_use()");
-        self.var_drop_used.push((local, location));
+        self.var_dropped_at.push((local, self.location_to_index(location)));
     }
 
     fn insert_path_access(&mut self, path: MovePathIndex, location: Location) {
         debug!("UseFactsExtractor::insert_path_access({:?}, {:?})", path, location);
-        self.path_accessed_at.push((path, self.location_to_index(location)));
+        self.path_accessed_at_base.push((path, self.location_table.start_index(location)));
     }
 
     fn place_to_mpi(&self, place: &Place<'_>) -> Option<MovePathIndex> {
@@ -88,51 +88,54 @@ pub(super) fn populate_access_facts(
     body: ReadOnlyBodyAndCache<'_, 'tcx>,
     location_table: &LocationTable,
     move_data: &MoveData<'_>,
-    drop_used: &mut Vec<(Local, Location)>,
+    dropped_at: &mut Vec<(Local, Location)>,
 ) {
     debug!("populate_access_facts()");
 
     if let Some(facts) = typeck.borrowck_context.all_facts.as_mut() {
         let mut extractor = UseFactsExtractor {
-            var_defined: &mut facts.var_defined,
-            var_used: &mut facts.var_used,
-            var_drop_used: drop_used,
-            path_accessed_at: &mut facts.path_accessed_at,
+            var_defined_at: &mut facts.var_defined_at,
+            var_used_at: &mut facts.var_used_at,
+            var_dropped_at: &mut facts.var_dropped_at,
+            path_accessed_at_base: &mut facts.path_accessed_at_base,
             location_table,
             move_data,
         };
         extractor.visit_body(body);
 
-        facts.var_drop_used.extend(
-            drop_used.iter().map(|&(local, location)| (local, location_table.mid_index(location))),
+        facts.var_dropped_at.extend(
+            dropped_at.iter().map(|&(local, location)| (local, location_table.mid_index(location))),
         );
 
         for (local, local_decl) in body.local_decls.iter_enumerated() {
-            debug!("add var_uses_regions facts - local={:?}, type={:?}", local, local_decl.ty);
+            debug!(
+                "add use_of_var_derefs_origin facts - local={:?}, type={:?}",
+                local, local_decl.ty
+            );
             let _prof_timer = typeck.infcx.tcx.prof.generic_activity("polonius_fact_generation");
             let universal_regions = &typeck.borrowck_context.universal_regions;
             typeck.infcx.tcx.for_each_free_region(&local_decl.ty, |region| {
                 let region_vid = universal_regions.to_region_vid(region);
-                facts.var_uses_region.push((local, region_vid));
+                facts.use_of_var_derefs_origin.push((local, region_vid));
             });
         }
     }
 }
 
 // For every potentially drop()-touched region `region` in `local`'s type
-// (`kind`), emit a Polonius `var_drops_region(local, region)` fact.
-pub(super) fn add_var_drops_regions(
+// (`kind`), emit a Polonius `use_of_var_derefs_origin(local, origin)` fact.
+pub(super) fn add_drop_of_var_derefs_origin(
     typeck: &mut TypeChecker<'_, 'tcx>,
     local: Local,
     kind: &GenericArg<'tcx>,
 ) {
-    debug!("add_var_drops_region(local={:?}, kind={:?}", local, kind);
+    debug!("add_drop_of_var_derefs_origin(local={:?}, kind={:?}", local, kind);
     if let Some(facts) = typeck.borrowck_context.all_facts.as_mut() {
         let _prof_timer = typeck.infcx.tcx.prof.generic_activity("polonius_fact_generation");
         let universal_regions = &typeck.borrowck_context.universal_regions;
         typeck.infcx.tcx.for_each_free_region(kind, |drop_live_region| {
             let region_vid = universal_regions.to_region_vid(drop_live_region);
-            facts.var_drops_region.push((local, region_vid));
+            facts.drop_of_var_derefs_origin.push((local, region_vid));
         });
     }
 }
diff --git a/src/librustc_mir/borrow_check/type_check/liveness/trace.rs b/src/librustc_mir/borrow_check/type_check/liveness/trace.rs
index ebb925ae0c..baa9d1d212 100644
--- a/src/librustc_mir/borrow_check/type_check/liveness/trace.rs
+++ b/src/librustc_mir/borrow_check/type_check/liveness/trace.rs
@@ -1,16 +1,17 @@
-use rustc::infer::canonical::QueryRegionConstraints;
 use rustc::mir::{BasicBlock, ConstraintCategory, Local, Location, ReadOnlyBodyAndCache};
-use rustc::traits::query::dropck_outlives::DropckOutlivesResult;
-use rustc::traits::query::type_op::outlives::DropckOutlives;
-use rustc::traits::query::type_op::TypeOp;
 use rustc::ty::{Ty, TypeFoldable};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_index::bit_set::HybridBitSet;
+use rustc_infer::infer::canonical::QueryRegionConstraints;
+use rustc_infer::traits::query::dropck_outlives::DropckOutlivesResult;
+use rustc_infer::traits::query::type_op::outlives::DropckOutlives;
+use rustc_infer::traits::query::type_op::TypeOp;
 use std::rc::Rc;
 
+use crate::dataflow::generic::ResultsCursor;
 use crate::dataflow::indexes::MovePathIndex;
-use crate::dataflow::move_paths::MoveData;
-use crate::dataflow::{FlowAtLocation, FlowsAtLocation, MaybeInitializedPlaces};
+use crate::dataflow::move_paths::{HasMoveData, MoveData};
+use crate::dataflow::MaybeInitializedPlaces;
 
 use crate::borrow_check::{
     region_infer::values::{self, PointIndex, RegionValueElements},
@@ -38,7 +39,7 @@ pub(super) fn trace(
     typeck: &mut TypeChecker<'_, 'tcx>,
     body: ReadOnlyBodyAndCache<'_, 'tcx>,
     elements: &Rc<RegionValueElements>,
-    flow_inits: &mut FlowAtLocation<'tcx, MaybeInitializedPlaces<'_, 'tcx>>,
+    flow_inits: &mut ResultsCursor<'mir, 'tcx, MaybeInitializedPlaces<'mir, 'tcx>>,
     move_data: &MoveData<'tcx>,
     live_locals: Vec<Local>,
     polonius_drop_used: Option<Vec<(Local, Location)>>,
@@ -85,7 +86,7 @@ struct LivenessContext<'me, 'typeck, 'flow, 'tcx> {
 
     /// Results of dataflow tracking which variables (and paths) have been
     /// initialized.
-    flow_inits: &'me mut FlowAtLocation<'tcx, MaybeInitializedPlaces<'flow, 'tcx>>,
+    flow_inits: &'me mut ResultsCursor<'flow, 'tcx, MaybeInitializedPlaces<'flow, 'tcx>>,
 
     /// Index indicating where each variable is assigned, used, or
     /// dropped.
@@ -389,23 +390,26 @@ impl LivenessResults<'me, 'typeck, 'flow, 'tcx> {
 }
 
 impl LivenessContext<'_, '_, '_, 'tcx> {
+    /// Returns `true` if the local variable (or some part of it) is initialized at the current
+    /// cursor position. Callers should call one of the `seek` methods immediately before to point
+    /// the cursor to the desired location.
+    fn initialized_at_curr_loc(&self, mpi: MovePathIndex) -> bool {
+        let state = self.flow_inits.get();
+        if state.contains(mpi) {
+            return true;
+        }
+
+        let move_paths = &self.flow_inits.analysis().move_data().move_paths;
+        move_paths[mpi].find_descendant(&move_paths, |mpi| state.contains(mpi)).is_some()
+    }
+
     /// Returns `true` if the local variable (or some part of it) is initialized in
     /// the terminator of `block`. We need to check this to determine if a
     /// DROP of some local variable will have an effect -- note that
     /// drops, as they may unwind, are always terminators.
     fn initialized_at_terminator(&mut self, block: BasicBlock, mpi: MovePathIndex) -> bool {
-        // Compute the set of initialized paths at terminator of block
-        // by resetting to the start of the block and then applying
-        // the effects of all statements. This is the only way to get
-        // "just ahead" of a terminator.
-        self.flow_inits.reset_to_entry_of(block);
-        for statement_index in 0..self.body[block].statements.len() {
-            let location = Location { block, statement_index };
-            self.flow_inits.reconstruct_statement_effect(location);
-            self.flow_inits.apply_local_effect(location);
-        }
-
-        self.flow_inits.has_any_child_of(mpi).is_some()
+        self.flow_inits.seek_before(self.body.terminator_loc(block));
+        self.initialized_at_curr_loc(mpi)
     }
 
     /// Returns `true` if the path `mpi` (or some part of it) is initialized at
@@ -414,8 +418,8 @@ impl LivenessContext<'_, '_, '_, 'tcx> {
     /// **Warning:** Does not account for the result of `Call`
     /// instructions.
     fn initialized_at_exit(&mut self, block: BasicBlock, mpi: MovePathIndex) -> bool {
-        self.flow_inits.reset_to_exit_of(block);
-        self.flow_inits.has_any_child_of(mpi).is_some()
+        self.flow_inits.seek_after(self.body.terminator_loc(block));
+        self.initialized_at_curr_loc(mpi)
     }
 
     /// Stores the result that all regions in `value` are live for the
@@ -480,7 +484,7 @@ impl LivenessContext<'_, '_, '_, 'tcx> {
         for &kind in &drop_data.dropck_result.kinds {
             Self::make_all_regions_live(self.elements, &mut self.typeck, kind, live_at);
 
-            polonius::add_var_drops_regions(&mut self.typeck, dropped_local, &kind);
+            polonius::add_drop_of_var_derefs_origin(&mut self.typeck, dropped_local, &kind);
         }
     }
 
diff --git a/src/librustc_mir/borrow_check/type_check/mod.rs b/src/librustc_mir/borrow_check/type_check/mod.rs
index 7d98cf90ee..ace9294981 100644
--- a/src/librustc_mir/borrow_check/type_check/mod.rs
+++ b/src/librustc_mir/borrow_check/type_check/mod.rs
@@ -5,18 +5,10 @@ use std::{fmt, iter, mem};
 
 use either::Either;
 
-use rustc::infer::canonical::QueryRegionConstraints;
-use rustc::infer::outlives::env::RegionBoundPairs;
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::infer::{InferCtxt, InferOk, LateBoundRegionConversionTime, NLLRegionVariableOrigin};
-use rustc::mir::interpret::PanicInfo;
 use rustc::mir::tcx::PlaceTy;
 use rustc::mir::visit::{NonMutatingUseContext, PlaceContext, Visitor};
+use rustc::mir::AssertKind;
 use rustc::mir::*;
-use rustc::traits::query::type_op;
-use rustc::traits::query::type_op::custom::CustomTypeOp;
-use rustc::traits::query::{Fallible, NoSolution};
-use rustc::traits::{self, ObligationCause, PredicateObligations};
 use rustc::ty::adjustment::PointerCast;
 use rustc::ty::cast::CastTy;
 use rustc::ty::fold::TypeFoldable;
@@ -31,11 +23,21 @@ use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_infer::infer::canonical::QueryRegionConstraints;
+use rustc_infer::infer::opaque_types::GenerateMemberConstraints;
+use rustc_infer::infer::outlives::env::RegionBoundPairs;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::infer::{
+    InferCtxt, InferOk, LateBoundRegionConversionTime, NLLRegionVariableOrigin,
+};
+use rustc_infer::traits::query::type_op;
+use rustc_infer::traits::query::type_op::custom::CustomTypeOp;
+use rustc_infer::traits::query::{Fallible, NoSolution};
+use rustc_infer::traits::{self, ObligationCause, PredicateObligations};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast;
 
+use crate::dataflow::generic::ResultsCursor;
 use crate::dataflow::move_paths::MoveData;
-use crate::dataflow::FlowAtLocation;
 use crate::dataflow::MaybeInitializedPlaces;
 use crate::transform::promote_consts::should_suggest_const_in_array_repeat_expressions_attribute;
 
@@ -114,7 +116,7 @@ mod relate_tys;
 ///   constraints for the regions in the types of variables
 /// - `flow_inits` -- results of a maybe-init dataflow analysis
 /// - `move_data` -- move-data constructed when performing the maybe-init dataflow analysis
-pub(crate) fn type_check<'tcx>(
+pub(crate) fn type_check<'mir, 'tcx>(
     infcx: &InferCtxt<'_, 'tcx>,
     param_env: ty::ParamEnv<'tcx>,
     body: ReadOnlyBodyAndCache<'_, 'tcx>,
@@ -124,7 +126,7 @@ pub(crate) fn type_check<'tcx>(
     location_table: &LocationTable,
     borrow_set: &BorrowSet<'tcx>,
     all_facts: &mut Option<AllFacts>,
-    flow_inits: &mut FlowAtLocation<'tcx, MaybeInitializedPlaces<'_, 'tcx>>,
+    flow_inits: &mut ResultsCursor<'mir, 'tcx, MaybeInitializedPlaces<'mir, 'tcx>>,
     move_data: &MoveData<'tcx>,
     elements: &Rc<RegionValueElements>,
 ) -> MirTypeckResults<'tcx> {
@@ -159,7 +161,7 @@ pub(crate) fn type_check<'tcx>(
         constraints: &mut constraints,
     };
 
-    type_check_internal(
+    let opaque_type_values = type_check_internal(
         infcx,
         mir_def_id,
         param_env,
@@ -174,10 +176,11 @@ pub(crate) fn type_check<'tcx>(
             liveness::generate(&mut cx, body, elements, flow_inits, move_data, location_table);
 
             translate_outlives_facts(&mut cx);
+            cx.opaque_type_values
         },
     );
 
-    MirTypeckResults { constraints, universal_region_relations }
+    MirTypeckResults { constraints, universal_region_relations, opaque_type_values }
 }
 
 fn type_check_internal<'a, 'tcx, R>(
@@ -190,7 +193,7 @@ fn type_check_internal<'a, 'tcx, R>(
     implicit_region_bound: ty::Region<'tcx>,
     borrowck_context: &'a mut BorrowCheckContext<'a, 'tcx>,
     universal_region_relations: &'a UniversalRegionRelations<'tcx>,
-    mut extra: impl FnMut(&mut TypeChecker<'a, 'tcx>) -> R,
+    extra: impl FnOnce(TypeChecker<'a, 'tcx>) -> R,
 ) -> R {
     let mut checker = TypeChecker::new(
         infcx,
@@ -213,7 +216,7 @@ fn type_check_internal<'a, 'tcx, R>(
         checker.typeck_mir(body);
     }
 
-    extra(&mut checker)
+    extra(checker)
 }
 
 fn translate_outlives_facts(typeck: &mut TypeChecker<'_, '_>) {
@@ -576,7 +579,7 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
             | ConstraintCategory::UseAsConst
             | ConstraintCategory::UseAsStatic = constraint.category
             {
-                // "Returning" from a promoted is an assigment to a
+                // "Returning" from a promoted is an assignment to a
                 // temporary from the user's point of view.
                 constraint.category = ConstraintCategory::Boring;
             }
@@ -812,6 +815,7 @@ struct TypeChecker<'a, 'tcx> {
     reported_errors: FxHashSet<(Ty<'tcx>, Span)>,
     borrowck_context: &'a mut BorrowCheckContext<'a, 'tcx>,
     universal_region_relations: &'a UniversalRegionRelations<'tcx>,
+    opaque_type_values: FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>>,
 }
 
 struct BorrowCheckContext<'a, 'tcx> {
@@ -825,6 +829,7 @@ struct BorrowCheckContext<'a, 'tcx> {
 crate struct MirTypeckResults<'tcx> {
     crate constraints: MirTypeckRegionConstraints<'tcx>,
     crate universal_region_relations: Rc<UniversalRegionRelations<'tcx>>,
+    crate opaque_type_values: FxHashMap<DefId, ty::ResolvedOpaqueTy<'tcx>>,
 }
 
 /// A collection of region constraints that must be satisfied for the
@@ -971,6 +976,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
             borrowck_context,
             reported_errors: Default::default(),
             universal_region_relations,
+            opaque_type_values: FxHashMap::default(),
         };
         checker.check_user_type_annotations();
         checker
@@ -1204,10 +1210,29 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
              anon_ty={:?})",
             revealed_ty, anon_ty
         );
+
+        // Fast path for the common case.
+        if !anon_ty.has_opaque_types() {
+            if let Err(terr) = self.eq_types(anon_ty, revealed_ty, locations, category) {
+                span_mirbug!(
+                    self,
+                    locations,
+                    "eq_opaque_type_and_type: `{:?}=={:?}` failed with `{:?}`",
+                    revealed_ty,
+                    anon_ty,
+                    terr
+                );
+            }
+            return Ok(());
+        }
+
         let infcx = self.infcx;
         let tcx = infcx.tcx;
         let param_env = self.param_env;
         let body = self.body;
+        let concrete_opaque_types = &tcx.typeck_tables_of(anon_owner_def_id).concrete_opaque_types;
+        let mut opaque_type_values = Vec::new();
+
         debug!("eq_opaque_type_and_type: mir_def_id={:?}", self.mir_def_id);
         let opaque_type_map = self.fully_perform_op(
             locations,
@@ -1232,6 +1257,15 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
                          revealed_ty={:?}",
                         output_ty, opaque_type_map, revealed_ty
                     );
+                    // Make sure that the inferred types are well-formed. I'm
+                    // not entirely sure this is needed (the HIR type check
+                    // didn't do this) but it seems sensible to prevent opaque
+                    // types hiding ill-formed types.
+                    obligations.obligations.push(traits::Obligation::new(
+                        ObligationCause::dummy(),
+                        param_env,
+                        ty::Predicate::WellFormed(revealed_ty),
+                    ));
                     obligations.add(
                         infcx
                             .at(&ObligationCause::dummy(), param_env)
@@ -1239,47 +1273,76 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
                     );
 
                     for (&opaque_def_id, opaque_decl) in &opaque_type_map {
-                        let opaque_defn_ty = tcx.type_of(opaque_def_id);
-                        let opaque_defn_ty = opaque_defn_ty.subst(tcx, opaque_decl.substs);
-                        let opaque_defn_ty = renumber::renumber_regions(infcx, &opaque_defn_ty);
-                        let concrete_is_opaque = infcx
-                            .resolve_vars_if_possible(&opaque_decl.concrete_ty)
-                            .is_impl_trait();
+                        let resolved_ty = infcx.resolve_vars_if_possible(&opaque_decl.concrete_ty);
+                        let concrete_is_opaque = if let ty::Opaque(def_id, _) = resolved_ty.kind {
+                            def_id == opaque_def_id
+                        } else {
+                            false
+                        };
+                        let opaque_defn_ty = match concrete_opaque_types.get(&opaque_def_id) {
+                            None => {
+                                if !concrete_is_opaque {
+                                    tcx.sess.delay_span_bug(
+                                        body.span,
+                                        &format!(
+                                            "Non-defining use of {:?} with revealed type",
+                                            opaque_def_id,
+                                        ),
+                                    );
+                                }
+                                continue;
+                            }
+                            Some(opaque_defn_ty) => opaque_defn_ty,
+                        };
+                        debug!("opaque_defn_ty = {:?}", opaque_defn_ty);
+                        let subst_opaque_defn_ty =
+                            opaque_defn_ty.concrete_type.subst(tcx, opaque_decl.substs);
+                        let renumbered_opaque_defn_ty =
+                            renumber::renumber_regions(infcx, &subst_opaque_defn_ty);
 
                         debug!(
-                            "eq_opaque_type_and_type: concrete_ty={:?}={:?} opaque_defn_ty={:?} \
-                            concrete_is_opaque={}",
-                            opaque_decl.concrete_ty,
-                            infcx.resolve_vars_if_possible(&opaque_decl.concrete_ty),
-                            opaque_defn_ty,
-                            concrete_is_opaque
+                            "eq_opaque_type_and_type: concrete_ty={:?}={:?} opaque_defn_ty={:?}",
+                            opaque_decl.concrete_ty, resolved_ty, renumbered_opaque_defn_ty,
                         );
 
-                        // concrete_is_opaque is `true` when we're using an opaque `impl Trait`
-                        // type without 'revealing' it. For example, code like this:
-                        //
-                        // type Foo = impl Debug;
-                        // fn foo1() -> Foo { ... }
-                        // fn foo2() -> Foo { foo1() }
-                        //
-                        // In `foo2`, we're not revealing the type of `Foo` - we're
-                        // just treating it as the opaque type.
-                        //
-                        // When this occurs, we do *not* want to try to equate
-                        // the concrete type with the underlying defining type
-                        // of the opaque type - this will always fail, since
-                        // the defining type of an opaque type is always
-                        // some other type (e.g. not itself)
-                        // Essentially, none of the normal obligations apply here -
-                        // we're just passing around some unknown opaque type,
-                        // without actually looking at the underlying type it
-                        // gets 'revealed' into
-
                         if !concrete_is_opaque {
+                            // Equate concrete_ty (an inference variable) with
+                            // the renumbered type from typeck.
                             obligations.add(
                                 infcx
                                     .at(&ObligationCause::dummy(), param_env)
-                                    .eq(opaque_decl.concrete_ty, opaque_defn_ty)?,
+                                    .eq(opaque_decl.concrete_ty, renumbered_opaque_defn_ty)?,
+                            );
+                            opaque_type_values.push((
+                                opaque_def_id,
+                                ty::ResolvedOpaqueTy {
+                                    concrete_type: renumbered_opaque_defn_ty,
+                                    substs: opaque_decl.substs,
+                                },
+                            ));
+                        } else {
+                            // We're using an opaque `impl Trait` type without
+                            // 'revealing' it. For example, code like this:
+                            //
+                            // type Foo = impl Debug;
+                            // fn foo1() -> Foo { ... }
+                            // fn foo2() -> Foo { foo1() }
+                            //
+                            // In `foo2`, we're not revealing the type of `Foo` - we're
+                            // just treating it as the opaque type.
+                            //
+                            // When this occurs, we do *not* want to try to equate
+                            // the concrete type with the underlying defining type
+                            // of the opaque type - this will always fail, since
+                            // the defining type of an opaque type is always
+                            // some other type (e.g. not itself)
+                            // Essentially, none of the normal obligations apply here -
+                            // we're just passing around some unknown opaque type,
+                            // without actually looking at the underlying type it
+                            // gets 'revealed' into
+                            debug!(
+                                "eq_opaque_type_and_type: non-defining use of {:?}",
+                                opaque_def_id,
                             );
                         }
                     }
@@ -1295,6 +1358,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
             ),
         )?;
 
+        self.opaque_type_values.extend(opaque_type_values);
+
         let universal_region_relations = self.universal_region_relations;
 
         // Finally, if we instantiated the anon types successfully, we
@@ -1311,6 +1376,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
                             infcx.constrain_opaque_type(
                                 opaque_def_id,
                                 &opaque_decl,
+                                GenerateMemberConstraints::IfNoStaticBound,
                                 universal_region_relations,
                             );
                             Ok(InferOk { value: (), obligations: vec![] })
@@ -1575,7 +1641,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
                     span_mirbug!(self, term, "bad Assert ({:?}, not bool", cond_ty);
                 }
 
-                if let PanicInfo::BoundsCheck { ref len, ref index } = *msg {
+                if let AssertKind::BoundsCheck { ref len, ref index } = *msg {
                     if len.ty(body, tcx) != tcx.types.usize {
                         span_mirbug!(self, len, "bounds-check length non-usize {:?}", len)
                     }
@@ -1839,7 +1905,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
             // expressions evaluate through `as_temp` or `into` a return
             // slot or local, so to find all unsized rvalues it is enough
             // to check all temps, return slots and locals.
-            if let None = self.reported_errors.replace((ty, span)) {
+            if self.reported_errors.replace((ty, span)).is_none() {
                 let mut diag = struct_span_err!(
                     self.tcx().sess,
                     span,
@@ -1950,7 +2016,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
                                                 tcx.mk_substs_trait(ty, &[]),
                                             ),
                                         }),
-                                        ast::Constness::NotConst,
+                                        hir::Constness::NotConst,
                                     ),
                                 ),
                                 &traits::SelectionError::Unimplemented,
@@ -2402,7 +2468,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
             match elem {
                 ProjectionElem::Deref => {
                     let tcx = self.infcx.tcx;
-                    let base_ty = Place::ty_from(&borrowed_place.local, proj_base, body, tcx).ty;
+                    let base_ty = Place::ty_from(borrowed_place.local, proj_base, body, tcx).ty;
 
                     debug!("add_reborrow_constraint - base_ty = {:?}", base_ty);
                     match base_ty.kind {
@@ -2525,7 +2591,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
         substs: SubstsRef<'tcx>,
         location: Location,
     ) -> ty::InstantiatedPredicates<'tcx> {
-        if let Some(closure_region_requirements) = tcx.mir_borrowck(def_id).closure_requirements {
+        if let Some(ref closure_region_requirements) = tcx.mir_borrowck(def_id).closure_requirements
+        {
             let closure_constraints = QueryRegionConstraints {
                 outlives: closure_region_requirements.apply_requirements(tcx, def_id, substs),
 
@@ -2591,7 +2658,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
         self.prove_predicates(
             Some(ty::Predicate::Trait(
                 trait_ref.to_poly_trait_ref().to_poly_trait_predicate(),
-                ast::Constness::NotConst,
+                hir::Constness::NotConst,
             )),
             locations,
             category,
diff --git a/src/librustc_mir/borrow_check/type_check/relate_tys.rs b/src/librustc_mir/borrow_check/type_check/relate_tys.rs
index edbcd71515..b0f048ff1a 100644
--- a/src/librustc_mir/borrow_check/type_check/relate_tys.rs
+++ b/src/librustc_mir/borrow_check/type_check/relate_tys.rs
@@ -1,10 +1,10 @@
-use rustc::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
-use rustc::infer::{InferCtxt, NLLRegionVariableOrigin};
 use rustc::mir::ConstraintCategory;
-use rustc::traits::query::Fallible;
-use rustc::traits::DomainGoal;
 use rustc::ty::relate::TypeRelation;
 use rustc::ty::{self, Ty};
+use rustc_infer::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
+use rustc_infer::infer::{InferCtxt, NLLRegionVariableOrigin};
+use rustc_infer::traits::query::Fallible;
+use rustc_infer::traits::DomainGoal;
 
 use crate::borrow_check::constraints::OutlivesConstraint;
 use crate::borrow_check::type_check::{BorrowCheckContext, Locations};
@@ -64,7 +64,7 @@ impl TypeRelatingDelegate<'tcx> for NllTypeRelatingDelegate<'_, '_, 'tcx> {
     }
 
     fn next_existential_region_var(&mut self, from_forall: bool) -> ty::Region<'tcx> {
-        if let Some(_) = &mut self.borrowck_context {
+        if self.borrowck_context.is_some() {
             let origin = NLLRegionVariableOrigin::Existential { from_forall };
             self.infcx.next_nll_region_var(origin)
         } else {
diff --git a/src/librustc_mir/borrow_check/universal_regions.rs b/src/librustc_mir/borrow_check/universal_regions.rs
index 6e36508ed6..67b00e9ffd 100644
--- a/src/librustc_mir/borrow_check/universal_regions.rs
+++ b/src/librustc_mir/borrow_check/universal_regions.rs
@@ -13,7 +13,6 @@
 //! just returns them for other code to use.
 
 use either::Either;
-use rustc::infer::{InferCtxt, NLLRegionVariableOrigin};
 use rustc::middle::lang_items;
 use rustc::ty::fold::TypeFoldable;
 use rustc::ty::subst::{InternalSubsts, Subst, SubstsRef};
@@ -24,6 +23,7 @@ use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::{BodyOwnerKind, HirId};
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_infer::infer::{InferCtxt, NLLRegionVariableOrigin};
 use std::iter;
 
 use crate::borrow_check::nll::ToRegionVid;
@@ -131,6 +131,29 @@ impl<'tcx> DefiningTy<'tcx> {
             DefiningTy::FnDef(..) | DefiningTy::Const(..) => 0,
         }
     }
+
+    pub fn is_fn_def(&self) -> bool {
+        match *self {
+            DefiningTy::FnDef(..) => true,
+            _ => false,
+        }
+    }
+
+    pub fn is_const(&self) -> bool {
+        match *self {
+            DefiningTy::Const(..) => true,
+            _ => false,
+        }
+    }
+
+    pub fn def_id(&self) -> DefId {
+        match *self {
+            DefiningTy::Closure(def_id, ..)
+            | DefiningTy::Generator(def_id, ..)
+            | DefiningTy::FnDef(def_id, ..)
+            | DefiningTy::Const(def_id, ..) => def_id,
+        }
+    }
 }
 
 #[derive(Debug)]
@@ -463,7 +486,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
             defining_ty,
             unnormalized_output_ty,
             unnormalized_input_tys,
-            yield_ty: yield_ty,
+            yield_ty,
         }
     }
 
@@ -581,9 +604,11 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
 
             DefiningTy::Generator(def_id, substs, movability) => {
                 assert_eq!(self.mir_def_id, def_id);
+                let resume_ty = substs.as_generator().resume_ty(def_id, tcx);
                 let output = substs.as_generator().return_ty(def_id, tcx);
                 let generator_ty = tcx.mk_generator(def_id, substs, movability);
-                let inputs_and_output = self.infcx.tcx.intern_type_list(&[generator_ty, output]);
+                let inputs_and_output =
+                    self.infcx.tcx.intern_type_list(&[generator_ty, resume_ty, output]);
                 ty::Binder::dummy(inputs_and_output)
             }
 
diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs
deleted file mode 100644
index aad0e16293..0000000000
--- a/src/librustc_mir/const_eval.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Not in interpret to make sure we do not use private implementation details
-
-use rustc::mir;
-use rustc::ty::layout::VariantIdx;
-use rustc::ty::{self, TyCtxt};
-use rustc_span::{source_map::DUMMY_SP, symbol::Symbol};
-
-use crate::interpret::{intern_const_alloc_recursive, ConstValue, InternKind, InterpCx};
-
-mod error;
-mod eval_queries;
-mod fn_queries;
-mod machine;
-
-pub use error::*;
-pub use eval_queries::*;
-pub use fn_queries::*;
-pub use machine::*;
-
-/// Extracts a field of a (variant of a) const.
-// this function uses `unwrap` copiously, because an already validated constant must have valid
-// fields and can thus never fail outside of compiler bugs
-pub(crate) fn const_field<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    variant: Option<VariantIdx>,
-    field: mir::Field,
-    value: &'tcx ty::Const<'tcx>,
-) -> &'tcx ty::Const<'tcx> {
-    trace!("const_field: {:?}, {:?}", field, value);
-    let ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, false);
-    // get the operand again
-    let op = ecx.eval_const_to_op(value, None).unwrap();
-    // downcast
-    let down = match variant {
-        None => op,
-        Some(variant) => ecx.operand_downcast(op, variant).unwrap(),
-    };
-    // then project
-    let field = ecx.operand_field(down, field.index() as u64).unwrap();
-    // and finally move back to the const world, always normalizing because
-    // this is not called for statics.
-    op_to_const(&ecx, field)
-}
-
-pub(crate) fn const_caller_location<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    (file, line, col): (Symbol, u32, u32),
-) -> &'tcx ty::Const<'tcx> {
-    trace!("const_caller_location: {}:{}:{}", file, line, col);
-    let mut ecx = mk_eval_cx(tcx, DUMMY_SP, ty::ParamEnv::reveal_all(), false);
-
-    let loc_ty = tcx.caller_location_ty();
-    let loc_place = ecx.alloc_caller_location(file, line, col);
-    intern_const_alloc_recursive(&mut ecx, InternKind::Constant, loc_place, false).unwrap();
-    let loc_const = ty::Const {
-        ty: loc_ty,
-        val: ty::ConstKind::Value(ConstValue::Scalar(loc_place.ptr.into())),
-    };
-
-    tcx.mk_const(loc_const)
-}
-
-// this function uses `unwrap` copiously, because an already validated constant
-// must have valid fields and can thus never fail outside of compiler bugs
-pub(crate) fn destructure_const<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-    val: &'tcx ty::Const<'tcx>,
-) -> mir::DestructuredConst<'tcx> {
-    trace!("destructure_const: {:?}", val);
-    let ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, false);
-    let op = ecx.eval_const_to_op(val, None).unwrap();
-
-    let variant = ecx.read_discriminant(op).unwrap().1;
-
-    let field_count = match val.ty.kind {
-        ty::Array(_, len) => len.eval_usize(tcx, param_env),
-        ty::Adt(def, _) => def.variants[variant].fields.len() as u64,
-        ty::Tuple(substs) => substs.len() as u64,
-        _ => bug!("cannot destructure constant {:?}", val),
-    };
-
-    let down = ecx.operand_downcast(op, variant).unwrap();
-    let fields_iter = (0..field_count).map(|i| {
-        let field_op = ecx.operand_field(down, i).unwrap();
-        op_to_const(&ecx, field_op)
-    });
-    let fields = tcx.arena.alloc_from_iter(fields_iter);
-
-    mir::DestructuredConst { variant, fields }
-}
diff --git a/src/librustc_mir/const_eval/error.rs b/src/librustc_mir/const_eval/error.rs
index c2db3c31f8..63ad9ec8ca 100644
--- a/src/librustc_mir/const_eval/error.rs
+++ b/src/librustc_mir/const_eval/error.rs
@@ -1,33 +1,47 @@
 use std::error::Error;
 use std::fmt;
 
+use rustc::mir::AssertKind;
+use rustc_span::Symbol;
+
 use super::InterpCx;
-use crate::interpret::{ConstEvalErr, InterpErrorInfo, Machine};
+use crate::interpret::{ConstEvalErr, InterpError, InterpErrorInfo, Machine};
+
+/// The CTFE machine has some custom error kinds.
 #[derive(Clone, Debug)]
-pub enum ConstEvalError {
+pub enum ConstEvalErrKind {
     NeedsRfc(String),
     ConstAccessesStatic,
+    AssertFailure(AssertKind<u64>),
+    Panic { msg: Symbol, line: u32, col: u32, file: Symbol },
 }
 
-impl<'tcx> Into<InterpErrorInfo<'tcx>> for ConstEvalError {
+// The errors become `MachineStop` with plain strings when being raised.
+// `ConstEvalErr` (in `librustc/mir/interpret/error.rs`) knows to
+// handle these.
+impl<'tcx> Into<InterpErrorInfo<'tcx>> for ConstEvalErrKind {
     fn into(self) -> InterpErrorInfo<'tcx> {
-        err_unsup!(Unsupported(self.to_string())).into()
+        InterpError::MachineStop(Box::new(self.to_string())).into()
     }
 }
 
-impl fmt::Display for ConstEvalError {
+impl fmt::Display for ConstEvalErrKind {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        use self::ConstEvalError::*;
+        use self::ConstEvalErrKind::*;
         match *self {
             NeedsRfc(ref msg) => {
                 write!(f, "\"{}\" needs an rfc before being allowed inside constants", msg)
             }
             ConstAccessesStatic => write!(f, "constant accesses static"),
+            AssertFailure(ref msg) => write!(f, "{:?}", msg),
+            Panic { msg, line, col, file } => {
+                write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col)
+            }
         }
     }
 }
 
-impl Error for ConstEvalError {}
+impl Error for ConstEvalErrKind {}
 
 /// Turn an interpreter error into something to report to the user.
 /// As a side-effect, if RUSTC_CTFE_BACKTRACE is set, this prints the backtrace.
diff --git a/src/librustc_mir/const_eval/eval_queries.rs b/src/librustc_mir/const_eval/eval_queries.rs
index 428db8356b..ffbff00cf3 100644
--- a/src/librustc_mir/const_eval/eval_queries.rs
+++ b/src/librustc_mir/const_eval/eval_queries.rs
@@ -89,7 +89,7 @@ pub(super) fn mk_eval_cx<'mir, 'tcx>(
     InterpCx::new(
         tcx.at(span),
         param_env,
-        CompileTimeInterpreter::new(),
+        CompileTimeInterpreter::new(*tcx.sess.const_eval_limit.get()),
         MemoryExtra { can_access_statics },
     )
 }
@@ -97,7 +97,7 @@ pub(super) fn mk_eval_cx<'mir, 'tcx>(
 pub(super) fn op_to_const<'tcx>(
     ecx: &CompileTimeEvalContext<'_, 'tcx>,
     op: OpTy<'tcx>,
-) -> &'tcx ty::Const<'tcx> {
+) -> ConstValue<'tcx> {
     // We do not have value optimizations for everything.
     // Only scalars and slices, since they are very common.
     // Note that further down we turn scalars of undefined bits back to `ByRef`. These can result
@@ -144,7 +144,7 @@ pub(super) fn op_to_const<'tcx>(
             ConstValue::Scalar(Scalar::zst())
         }
     };
-    let val = match immediate {
+    match immediate {
         Ok(mplace) => to_const_value(mplace),
         // see comment on `let try_as_immediate` above
         Err(ImmTy { imm: Immediate::Scalar(x), .. }) => match x {
@@ -166,8 +166,7 @@ pub(super) fn op_to_const<'tcx>(
             let len: usize = len.try_into().unwrap();
             ConstValue::Slice { data, start, end: start + len }
         }
-    };
-    ecx.tcx.mk_const(ty::Const { val: ty::ConstKind::Value(val), ty: op.layout.ty })
+    }
 }
 
 fn validate_and_turn_into_const<'tcx>(
@@ -187,7 +186,12 @@ fn validate_and_turn_into_const<'tcx>(
         if cid.promoted.is_none() {
             let mut ref_tracking = RefTracking::new(mplace);
             while let Some((mplace, path)) = ref_tracking.todo.pop() {
-                ecx.validate_operand(mplace.into(), path, Some(&mut ref_tracking))?;
+                ecx.const_validate_operand(
+                    mplace.into(),
+                    path,
+                    &mut ref_tracking,
+                    /*may_ref_to_static*/ is_static,
+                )?;
             }
         }
         // Now that we validated, turn this into a proper constant.
@@ -195,13 +199,10 @@ fn validate_and_turn_into_const<'tcx>(
         // whether they become immediates.
         if is_static || cid.promoted.is_some() {
             let ptr = mplace.ptr.assert_ptr();
-            Ok(tcx.mk_const(ty::Const {
-                val: ty::ConstKind::Value(ConstValue::ByRef {
-                    alloc: ecx.tcx.alloc_map.lock().unwrap_memory(ptr.alloc_id),
-                    offset: ptr.offset,
-                }),
-                ty: mplace.layout.ty,
-            }))
+            Ok(ConstValue::ByRef {
+                alloc: ecx.tcx.alloc_map.lock().unwrap_memory(ptr.alloc_id),
+                offset: ptr.offset,
+            })
         } else {
             Ok(op_to_const(&ecx, mplace.into()))
         }
@@ -209,12 +210,11 @@ fn validate_and_turn_into_const<'tcx>(
 
     val.map_err(|error| {
         let err = error_to_const_error(&ecx, error);
-        match err.struct_error(ecx.tcx, "it is undefined behavior to use this value") {
-            Ok(mut diag) => {
-                diag.note(note_on_undefined_behavior_error());
-                diag.emit();
-                ErrorHandled::Reported
-            }
+        match err.struct_error(ecx.tcx, "it is undefined behavior to use this value", |mut diag| {
+            diag.note(note_on_undefined_behavior_error());
+            diag.emit();
+        }) {
+            Ok(_) => ErrorHandled::Reported,
             Err(err) => err,
         }
     })
@@ -231,7 +231,7 @@ pub fn const_eval_validated_provider<'tcx>(
         match tcx.const_eval_validated(key) {
             // try again with reveal all as requested
             Err(ErrorHandled::TooGeneric) => {}
-            // dedupliate calls
+            // deduplicate calls
             other => return other,
         }
     }
@@ -272,7 +272,7 @@ pub fn const_eval_raw_provider<'tcx>(
         match tcx.const_eval_raw(key) {
             // try again with reveal all as requested
             Err(ErrorHandled::TooGeneric) => {}
-            // dedupliate calls
+            // deduplicate calls
             other => return other,
         }
     }
@@ -289,7 +289,10 @@ pub fn const_eval_raw_provider<'tcx>(
     let cid = key.value;
     let def_id = cid.instance.def.def_id();
 
-    if def_id.is_local() && tcx.typeck_tables_of(def_id).tainted_by_errors {
+    if def_id.is_local()
+        && tcx.has_typeck_tables(def_id)
+        && tcx.typeck_tables_of(def_id).tainted_by_errors
+    {
         return Err(ErrorHandled::Reported);
     }
 
@@ -299,7 +302,7 @@ pub fn const_eval_raw_provider<'tcx>(
     let mut ecx = InterpCx::new(
         tcx.at(span),
         key.param_env,
-        CompileTimeInterpreter::new(),
+        CompileTimeInterpreter::new(*tcx.sess.const_eval_limit.get()),
         MemoryExtra { can_access_statics: is_static },
     );
 
diff --git a/src/librustc_mir/const_eval/fn_queries.rs b/src/librustc_mir/const_eval/fn_queries.rs
index 5eeb92f583..27efcd5084 100644
--- a/src/librustc_mir/const_eval/fn_queries.rs
+++ b/src/librustc_mir/const_eval/fn_queries.rs
@@ -1,11 +1,11 @@
 use rustc::hir::map::blocks::FnLikeNode;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_attr as attr;
 use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
+use rustc_hir::def_id::{DefId, LocalDefId};
 use rustc_span::symbol::Symbol;
 use rustc_target::spec::abi::Abi;
-use syntax::attr;
 
 /// Whether the `def_id` counts as const fn in your current crate, considering all active
 /// feature gates
@@ -82,72 +82,96 @@ pub fn is_min_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
     }
 }
 
-pub fn provide(providers: &mut Providers<'_>) {
-    /// Const evaluability whitelist is here to check evaluability at the
-    /// top level beforehand.
-    fn is_const_intrinsic(tcx: TyCtxt<'_>, def_id: DefId) -> Option<bool> {
-        if tcx.is_closure(def_id) {
-            return None;
-        }
+pub fn is_parent_const_impl_raw(tcx: TyCtxt<'_>, hir_id: hir::HirId) -> bool {
+    let parent_id = tcx.hir().get_parent_did(hir_id);
+    if !parent_id.is_top_level_module() {
+        is_const_impl_raw(tcx, LocalDefId::from_def_id(parent_id))
+    } else {
+        false
+    }
+}
 
-        match tcx.fn_sig(def_id).abi() {
-            Abi::RustIntrinsic | Abi::PlatformIntrinsic => {
-                Some(tcx.lookup_const_stability(def_id).is_some())
-            }
-            _ => None,
+/// Checks whether the function has a `const` modifier or, in case it is an intrinsic, whether
+/// said intrinsic is on the whitelist for being const callable.
+fn is_const_fn_raw(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+    let hir_id =
+        tcx.hir().as_local_hir_id(def_id).expect("Non-local call to local provider is_const_fn");
+
+    let node = tcx.hir().get(hir_id);
+
+    if let Some(whitelisted) = is_const_intrinsic(tcx, def_id) {
+        whitelisted
+    } else if let Some(fn_like) = FnLikeNode::from_node(node) {
+        if fn_like.constness() == hir::Constness::Const {
+            return true;
         }
-    }
 
-    /// Checks whether the function has a `const` modifier or, in case it is an intrinsic, whether
-    /// said intrinsic is on the whitelist for being const callable.
-    fn is_const_fn_raw(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
-        let hir_id = tcx
-            .hir()
-            .as_local_hir_id(def_id)
-            .expect("Non-local call to local provider is_const_fn");
+        // If the function itself is not annotated with `const`, it may still be a `const fn`
+        // if it resides in a const trait impl.
+        is_parent_const_impl_raw(tcx, hir_id)
+    } else if let hir::Node::Ctor(_) = node {
+        true
+    } else {
+        false
+    }
+}
 
-        let node = tcx.hir().get(hir_id);
+/// Const evaluability whitelist is here to check evaluability at the
+/// top level beforehand.
+fn is_const_intrinsic(tcx: TyCtxt<'_>, def_id: DefId) -> Option<bool> {
+    if tcx.is_closure(def_id) {
+        return None;
+    }
 
-        if let Some(whitelisted) = is_const_intrinsic(tcx, def_id) {
-            whitelisted
-        } else if let Some(fn_like) = FnLikeNode::from_node(node) {
-            fn_like.constness() == hir::Constness::Const
-        } else if let hir::Node::Ctor(_) = node {
-            true
-        } else {
-            false
+    match tcx.fn_sig(def_id).abi() {
+        Abi::RustIntrinsic | Abi::PlatformIntrinsic => {
+            Some(tcx.lookup_const_stability(def_id).is_some())
         }
+        _ => None,
     }
+}
 
-    fn is_promotable_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
-        is_const_fn(tcx, def_id)
-            && match tcx.lookup_const_stability(def_id) {
-                Some(stab) => {
-                    if cfg!(debug_assertions) && stab.promotable {
-                        let sig = tcx.fn_sig(def_id);
-                        assert_eq!(
-                            sig.unsafety(),
-                            hir::Unsafety::Normal,
-                            "don't mark const unsafe fns as promotable",
-                            // https://github.com/rust-lang/rust/pull/53851#issuecomment-418760682
-                        );
-                    }
-                    stab.promotable
+/// Checks whether the given item is an `impl` that has a `const` modifier.
+fn is_const_impl_raw(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
+    let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
+    let node = tcx.hir().get(hir_id);
+    matches!(
+        node,
+        hir::Node::Item(hir::Item {
+            kind: hir::ItemKind::Impl { constness: hir::Constness::Const, .. },
+            ..
+        })
+    )
+}
+
+fn is_promotable_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+    is_const_fn(tcx, def_id)
+        && match tcx.lookup_const_stability(def_id) {
+            Some(stab) => {
+                if cfg!(debug_assertions) && stab.promotable {
+                    let sig = tcx.fn_sig(def_id);
+                    assert_eq!(
+                        sig.unsafety(),
+                        hir::Unsafety::Normal,
+                        "don't mark const unsafe fns as promotable",
+                        // https://github.com/rust-lang/rust/pull/53851#issuecomment-418760682
+                    );
                 }
-                None => false,
+                stab.promotable
             }
-    }
+            None => false,
+        }
+}
 
-    fn const_fn_is_allowed_fn_ptr(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
-        is_const_fn(tcx, def_id)
-            && tcx
-                .lookup_const_stability(def_id)
-                .map(|stab| stab.allow_const_fn_ptr)
-                .unwrap_or(false)
-    }
+fn const_fn_is_allowed_fn_ptr(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
+    is_const_fn(tcx, def_id)
+        && tcx.lookup_const_stability(def_id).map(|stab| stab.allow_const_fn_ptr).unwrap_or(false)
+}
 
+pub fn provide(providers: &mut Providers<'_>) {
     *providers = Providers {
         is_const_fn_raw,
+        is_const_impl_raw: |tcx, def_id| is_const_impl_raw(tcx, LocalDefId::from_def_id(def_id)),
         is_promotable_const_fn,
         const_fn_is_allowed_fn_ptr,
         ..*providers
diff --git a/src/librustc_mir/const_eval/machine.rs b/src/librustc_mir/const_eval/machine.rs
index 1aed91baba..ed80298346 100644
--- a/src/librustc_mir/const_eval/machine.rs
+++ b/src/librustc_mir/const_eval/machine.rs
@@ -1,18 +1,20 @@
 use rustc::mir;
 use rustc::ty::layout::HasTyCtxt;
-use rustc::ty::{self, Ty, TyCtxt};
-use rustc_hir::def_id::DefId;
+use rustc::ty::{self, Ty};
 use std::borrow::{Borrow, Cow};
 use std::collections::hash_map::Entry;
+use std::convert::TryFrom;
 use std::hash::Hash;
 
 use rustc_data_structures::fx::FxHashMap;
 
+use rustc::mir::AssertMessage;
 use rustc_span::source_map::Span;
+use rustc_span::symbol::Symbol;
 
 use crate::interpret::{
-    self, snapshot, AllocId, Allocation, AssertMessage, GlobalId, ImmTy, InterpCx, InterpResult,
-    Memory, MemoryKind, OpTy, PlaceTy, Pointer, Scalar,
+    self, snapshot, AllocId, Allocation, GlobalId, ImmTy, InterpCx, InterpResult, Memory,
+    MemoryKind, OpTy, PlaceTy, Pointer, Scalar,
 };
 
 use super::error::*;
@@ -56,11 +58,34 @@ impl<'mir, 'tcx> InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>> {
         self.dump_place(*dest);
         return Ok(true);
     }
+
+    /// "Intercept" a function call to a panic-related function
+    /// because we have something special to do for it.
+    /// If this returns successfully (`Ok`), the function should just be evaluated normally.
+    fn hook_panic_fn(
+        &mut self,
+        span: Span,
+        instance: ty::Instance<'tcx>,
+        args: &[OpTy<'tcx>],
+    ) -> InterpResult<'tcx> {
+        let def_id = instance.def_id();
+        if Some(def_id) == self.tcx.lang_items().panic_fn()
+            || Some(def_id) == self.tcx.lang_items().begin_panic_fn()
+        {
+            // &'static str
+            assert!(args.len() == 1);
+
+            let msg_place = self.deref_operand(args[0])?;
+            let msg = Symbol::intern(self.read_str(msg_place)?);
+            let span = self.find_closest_untracked_caller_location().unwrap_or(span);
+            let (file, line, col) = self.location_triple_for_span(span);
+            Err(ConstEvalErrKind::Panic { msg, file, line, col }.into())
+        } else {
+            Ok(())
+        }
+    }
 }
 
-/// Number of steps until the detector even starts doing anything.
-/// Also, a warning is shown to the user when this number is reached.
-const STEPS_UNTIL_DETECTOR_ENABLED: isize = 1_000_000;
 /// The number of steps between loop detector snapshots.
 /// Should be a power of two for performance reasons.
 const DETECTOR_SNAPSHOT_PERIOD: isize = 256;
@@ -73,6 +98,8 @@ pub struct CompileTimeInterpreter<'mir, 'tcx> {
     /// detector period.
     pub(super) steps_since_detector_enabled: isize,
 
+    pub(super) is_detector_enabled: bool,
+
     /// Extra state to detect loops.
     pub(super) loop_detector: snapshot::InfiniteLoopDetector<'mir, 'tcx>,
 }
@@ -84,10 +111,14 @@ pub struct MemoryExtra {
 }
 
 impl<'mir, 'tcx> CompileTimeInterpreter<'mir, 'tcx> {
-    pub(super) fn new() -> Self {
+    pub(super) fn new(const_eval_limit: usize) -> Self {
+        let steps_until_detector_enabled =
+            isize::try_from(const_eval_limit).unwrap_or(std::isize::MAX);
+
         CompileTimeInterpreter {
             loop_detector: Default::default(),
-            steps_since_detector_enabled: -STEPS_UNTIL_DETECTOR_ENABLED,
+            steps_since_detector_enabled: -steps_until_detector_enabled,
+            is_detector_enabled: const_eval_limit != 0,
         }
     }
 }
@@ -198,13 +229,11 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
                 }
             } else {
                 // Some functions we support even if they are non-const -- but avoid testing
-                // that for const fn!  We certainly do *not* want to actually call the fn
+                // that for const fn!
+                ecx.hook_panic_fn(span, instance, args)?;
+                // We certainly do *not* want to actually call the fn
                 // though, so be sure we return here.
-                return if ecx.hook_panic_fn(span, instance, args)? {
-                    Ok(None)
-                } else {
-                    throw_unsup_format!("calling non-const function `{}`", instance)
-                };
+                throw_unsup_format!("calling non-const function `{}`", instance)
             }
         }
         // This is a const fn. Call it.
@@ -212,7 +241,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
             Ok(body) => *body,
             Err(err) => {
                 if let err_unsup!(NoMirFor(ref path)) = err.kind {
-                    return Err(ConstEvalError::NeedsRfc(format!(
+                    return Err(ConstEvalErrKind::NeedsRfc(format!(
                         "calling extern function `{}`",
                         path
                     ))
@@ -246,7 +275,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
         }
         // An intrinsic that we do not support
         let intrinsic_name = ecx.tcx.item_name(instance.def_id());
-        Err(ConstEvalError::NeedsRfc(format!("calling intrinsic `{}`", intrinsic_name)).into())
+        Err(ConstEvalErrKind::NeedsRfc(format!("calling intrinsic `{}`", intrinsic_name)).into())
     }
 
     fn assert_panic(
@@ -255,8 +284,9 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
         msg: &AssertMessage<'tcx>,
         _unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
-        use rustc::mir::interpret::PanicInfo::*;
-        Err(match msg {
+        use rustc::mir::AssertKind::*;
+        // Convert `AssertKind<Operand>` to `AssertKind<u64>`.
+        let err = match msg {
             BoundsCheck { ref len, ref index } => {
                 let len = ecx
                     .read_immediate(ecx.eval_operand(len, None)?)
@@ -268,21 +298,20 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
                     .expect("can't eval index")
                     .to_scalar()?
                     .to_machine_usize(&*ecx)?;
-                err_panic!(BoundsCheck { len, index })
+                BoundsCheck { len, index }
             }
-            Overflow(op) => err_panic!(Overflow(*op)),
-            OverflowNeg => err_panic!(OverflowNeg),
-            DivisionByZero => err_panic!(DivisionByZero),
-            RemainderByZero => err_panic!(RemainderByZero),
-            ResumedAfterReturn(generator_kind) => err_panic!(ResumedAfterReturn(*generator_kind)),
-            ResumedAfterPanic(generator_kind) => err_panic!(ResumedAfterPanic(*generator_kind)),
-            Panic { .. } => bug!("`Panic` variant cannot occur in MIR"),
-        }
-        .into())
+            Overflow(op) => Overflow(*op),
+            OverflowNeg => OverflowNeg,
+            DivisionByZero => DivisionByZero,
+            RemainderByZero => RemainderByZero,
+            ResumedAfterReturn(generator_kind) => ResumedAfterReturn(*generator_kind),
+            ResumedAfterPanic(generator_kind) => ResumedAfterPanic(*generator_kind),
+        };
+        Err(ConstEvalErrKind::AssertFailure(err).into())
     }
 
     fn ptr_to_int(_mem: &Memory<'mir, 'tcx, Self>, _ptr: Pointer) -> InterpResult<'tcx, u64> {
-        Err(ConstEvalError::NeedsRfc("pointer-to-integer cast".to_string()).into())
+        Err(ConstEvalErrKind::NeedsRfc("pointer-to-integer cast".to_string()).into())
     }
 
     fn binary_ptr_op(
@@ -291,14 +320,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
         _left: ImmTy<'tcx>,
         _right: ImmTy<'tcx>,
     ) -> InterpResult<'tcx, (Scalar, bool, Ty<'tcx>)> {
-        Err(ConstEvalError::NeedsRfc("pointer arithmetic or comparison".to_string()).into())
-    }
-
-    fn find_foreign_static(
-        _tcx: TyCtxt<'tcx>,
-        _def_id: DefId,
-    ) -> InterpResult<'tcx, Cow<'tcx, Allocation<Self::PointerTag>>> {
-        throw_unsup!(ReadForeignStatic)
+        Err(ConstEvalErrKind::NeedsRfc("pointer arithmetic or comparison".to_string()).into())
     }
 
     #[inline(always)]
@@ -321,10 +343,14 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
         _ecx: &mut InterpCx<'mir, 'tcx, Self>,
         _dest: PlaceTy<'tcx>,
     ) -> InterpResult<'tcx> {
-        Err(ConstEvalError::NeedsRfc("heap allocations via `box` keyword".to_string()).into())
+        Err(ConstEvalErrKind::NeedsRfc("heap allocations via `box` keyword".to_string()).into())
     }
 
     fn before_terminator(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
+        if !ecx.machine.is_detector_enabled {
+            return Ok(());
+        }
+
         {
             let steps = &mut ecx.machine.steps_since_detector_enabled;
 
@@ -355,7 +381,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for CompileTimeInterpreter<'mir,
         if memory_extra.can_access_statics {
             Ok(())
         } else {
-            Err(ConstEvalError::ConstAccessesStatic.into())
+            Err(ConstEvalErrKind::ConstAccessesStatic.into())
         }
     }
 }
diff --git a/src/librustc_mir/const_eval/mod.rs b/src/librustc_mir/const_eval/mod.rs
new file mode 100644
index 0000000000..cb65839762
--- /dev/null
+++ b/src/librustc_mir/const_eval/mod.rs
@@ -0,0 +1,87 @@
+// Not in interpret to make sure we do not use private implementation details
+
+use rustc::mir;
+use rustc::ty::layout::VariantIdx;
+use rustc::ty::{self, TyCtxt};
+use rustc_span::{source_map::DUMMY_SP, symbol::Symbol};
+
+use crate::interpret::{intern_const_alloc_recursive, ConstValue, InternKind, InterpCx};
+
+mod error;
+mod eval_queries;
+mod fn_queries;
+mod machine;
+
+pub use error::*;
+pub use eval_queries::*;
+pub use fn_queries::*;
+pub use machine::*;
+
+/// Extracts a field of a (variant of a) const.
+// this function uses `unwrap` copiously, because an already validated constant must have valid
+// fields and can thus never fail outside of compiler bugs
+pub(crate) fn const_field<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    variant: Option<VariantIdx>,
+    field: mir::Field,
+    value: &'tcx ty::Const<'tcx>,
+) -> ConstValue<'tcx> {
+    trace!("const_field: {:?}, {:?}", field, value);
+    let ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, false);
+    // get the operand again
+    let op = ecx.eval_const_to_op(value, None).unwrap();
+    // downcast
+    let down = match variant {
+        None => op,
+        Some(variant) => ecx.operand_downcast(op, variant).unwrap(),
+    };
+    // then project
+    let field = ecx.operand_field(down, field.index() as u64).unwrap();
+    // and finally move back to the const world, always normalizing because
+    // this is not called for statics.
+    op_to_const(&ecx, field)
+}
+
+pub(crate) fn const_caller_location<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    (file, line, col): (Symbol, u32, u32),
+) -> ConstValue<'tcx> {
+    trace!("const_caller_location: {}:{}:{}", file, line, col);
+    let mut ecx = mk_eval_cx(tcx, DUMMY_SP, ty::ParamEnv::reveal_all(), false);
+
+    let loc_place = ecx.alloc_caller_location(file, line, col);
+    intern_const_alloc_recursive(&mut ecx, InternKind::Constant, loc_place, false).unwrap();
+    ConstValue::Scalar(loc_place.ptr)
+}
+
+// this function uses `unwrap` copiously, because an already validated constant
+// must have valid fields and can thus never fail outside of compiler bugs
+pub(crate) fn destructure_const<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    val: &'tcx ty::Const<'tcx>,
+) -> mir::DestructuredConst<'tcx> {
+    trace!("destructure_const: {:?}", val);
+    let ecx = mk_eval_cx(tcx, DUMMY_SP, param_env, false);
+    let op = ecx.eval_const_to_op(val, None).unwrap();
+
+    let variant = ecx.read_discriminant(op).unwrap().1;
+
+    let field_count = match val.ty.kind {
+        ty::Array(_, len) => len.eval_usize(tcx, param_env),
+        ty::Adt(def, _) => def.variants[variant].fields.len() as u64,
+        ty::Tuple(substs) => substs.len() as u64,
+        _ => bug!("cannot destructure constant {:?}", val),
+    };
+
+    let down = ecx.operand_downcast(op, variant).unwrap();
+    let fields_iter = (0..field_count).map(|i| {
+        let field_op = ecx.operand_field(down, i).unwrap();
+        let val = op_to_const(&ecx, field_op);
+        ty::Const::from_value(tcx, val, field_op.layout.ty)
+    });
+    let fields = tcx.arena.alloc_from_iter(fields_iter);
+
+    mir::DestructuredConst { variant, fields }
+}
diff --git a/src/librustc_mir/dataflow/at_location.rs b/src/librustc_mir/dataflow/at_location.rs
index c6d29211d4..e4eb850684 100644
--- a/src/librustc_mir/dataflow/at_location.rs
+++ b/src/librustc_mir/dataflow/at_location.rs
@@ -4,7 +4,6 @@
 use rustc::mir::{BasicBlock, Location};
 use rustc_index::bit_set::{BitIter, BitSet, HybridBitSet};
 
-use crate::dataflow::move_paths::{HasMoveData, MovePathIndex};
 use crate::dataflow::{BitDenotation, DataflowResults, GenKillSet};
 
 use std::borrow::Borrow;
@@ -168,43 +167,3 @@ where
         self.stmt_trans.apply(&mut self.curr_state)
     }
 }
-
-impl<'tcx, T, DR> FlowAtLocation<'tcx, T, DR>
-where
-    T: HasMoveData<'tcx> + BitDenotation<'tcx, Idx = MovePathIndex>,
-    DR: Borrow<DataflowResults<'tcx, T>>,
-{
-    pub fn has_any_child_of(&self, mpi: T::Idx) -> Option<T::Idx> {
-        // We process `mpi` before the loop below, for two reasons:
-        // - it's a little different from the loop case (we don't traverse its
-        //   siblings);
-        // - ~99% of the time the loop isn't reached, and this code is hot, so
-        //   we don't want to allocate `todo` unnecessarily.
-        if self.contains(mpi) {
-            return Some(mpi);
-        }
-        let move_data = self.operator().move_data();
-        let move_path = &move_data.move_paths[mpi];
-        let mut todo = if let Some(child) = move_path.first_child {
-            vec![child]
-        } else {
-            return None;
-        };
-
-        while let Some(mpi) = todo.pop() {
-            if self.contains(mpi) {
-                return Some(mpi);
-            }
-            let move_path = &move_data.move_paths[mpi];
-            if let Some(child) = move_path.first_child {
-                todo.push(child);
-            }
-            // After we've processed the original `mpi`, we should always
-            // traverse the siblings of any of its children.
-            if let Some(sibling) = move_path.next_sibling {
-                todo.push(sibling);
-            }
-        }
-        return None;
-    }
-}
diff --git a/src/librustc_mir/dataflow/generic/cursor.rs b/src/librustc_mir/dataflow/generic/cursor.rs
index d2eff494ad..8c0ab15052 100644
--- a/src/librustc_mir/dataflow/generic/cursor.rs
+++ b/src/librustc_mir/dataflow/generic/cursor.rs
@@ -65,6 +65,13 @@ where
         &self.state
     }
 
+    /// Returns `true` if the dataflow state at the current location contains the given element.
+    ///
+    /// Shorthand for `self.get().contains(elem)`
+    pub fn contains(&self, elem: A::Idx) -> bool {
+        self.state.contains(elem)
+    }
+
     /// Resets the cursor to the start of the given basic block.
     pub fn seek_to_block_start(&mut self, block: BasicBlock) {
         self.state.overwrite(&self.results.borrow().entry_sets[block]);
diff --git a/src/librustc_mir/dataflow/generic/engine.rs b/src/librustc_mir/dataflow/generic/engine.rs
index c0152b0c7d..8d800f2d0b 100644
--- a/src/librustc_mir/dataflow/generic/engine.rs
+++ b/src/librustc_mir/dataflow/generic/engine.rs
@@ -5,13 +5,13 @@ use std::fs;
 use std::path::PathBuf;
 
 use rustc::mir::{self, traversal, BasicBlock, Location};
-use rustc::ty::TyCtxt;
+use rustc::ty::{self, TyCtxt};
+use rustc_ast::ast;
 use rustc_data_structures::work_queue::WorkQueue;
 use rustc_hir::def_id::DefId;
 use rustc_index::bit_set::BitSet;
 use rustc_index::vec::IndexVec;
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast;
 
 use super::graphviz;
 use super::{Analysis, GenKillAnalysis, GenKillSet, Results};
@@ -44,15 +44,20 @@ where
         def_id: DefId,
         analysis: A,
     ) -> Self {
+        // If there are no back-edges in the control-flow graph, we only ever need to apply the
+        // transfer function for each block exactly once (assuming that we process blocks in RPO).
+        //
+        // In this case, there's no need to compute the block transfer functions ahead of time.
+        if !body.is_cfg_cyclic() {
+            return Self::new(tcx, body, def_id, analysis, None);
+        }
+
+        // Otherwise, compute and store the cumulative transfer function for each block.
+
         let bits_per_block = analysis.bits_per_block(body);
         let mut trans_for_block =
             IndexVec::from_elem(GenKillSet::identity(bits_per_block), body.basic_blocks());
 
-        // Compute cumulative block transfer functions.
-        //
-        // FIXME: we may want to skip this if the MIR is acyclic, since we will never access a
-        // block transfer function more than once.
-
         for (block, block_data) in body.basic_blocks().iter_enumerated() {
             let trans = &mut trans_for_block[block];
 
@@ -62,11 +67,10 @@ where
                 analysis.statement_effect(trans, statement, loc);
             }
 
-            if let Some(terminator) = &block_data.terminator {
-                let loc = Location { block, statement_index: block_data.statements.len() };
-                analysis.before_terminator_effect(trans, terminator, loc);
-                analysis.terminator_effect(trans, terminator, loc);
-            }
+            let terminator = block_data.terminator();
+            let loc = Location { block, statement_index: block_data.statements.len() };
+            analysis.before_terminator_effect(trans, terminator, loc);
+            analysis.terminator_effect(trans, terminator, loc);
         }
 
         Self::new(tcx, body, def_id, analysis, Some(trans_for_block))
@@ -100,7 +104,7 @@ where
     ) -> Self {
         let bits_per_block = analysis.bits_per_block(body);
 
-        let bottom_value_set = if A::BOTTOM_VALUE == true {
+        let bottom_value_set = if A::BOTTOM_VALUE {
             BitSet::new_filled(bits_per_block)
         } else {
             BitSet::new_empty(bits_per_block)
@@ -234,9 +238,27 @@ where
                 }
             }
 
-            SwitchInt { ref targets, .. } => {
-                for target in targets {
-                    self.propagate_bits_into_entry_set_for(in_out, *target, dirty_list);
+            SwitchInt { ref targets, ref values, ref discr, .. } => {
+                let Engine { tcx, body, .. } = *self;
+                let enum_ = discr
+                    .place()
+                    .and_then(|discr| switch_on_enum_discriminant(tcx, body, bb_data, discr));
+                match enum_ {
+                    // If this is a switch on an enum discriminant, a custom effect may be applied
+                    // along each outgoing edge.
+                    Some((enum_place, enum_def)) => {
+                        self.propagate_bits_into_enum_discriminant_switch_successors(
+                            in_out, bb, enum_def, enum_place, dirty_list, &*values, &*targets,
+                        );
+                    }
+
+                    // Otherwise, it's just a normal `SwitchInt`, and every successor sees the same
+                    // exit state.
+                    None => {
+                        for target in targets.iter().copied() {
+                            self.propagate_bits_into_entry_set_for(&in_out, target, dirty_list);
+                        }
+                    }
                 }
             }
 
@@ -283,6 +305,79 @@ where
             dirty_queue.insert(bb);
         }
     }
+
+    fn propagate_bits_into_enum_discriminant_switch_successors(
+        &mut self,
+        in_out: &mut BitSet<A::Idx>,
+        bb: BasicBlock,
+        enum_def: &'tcx ty::AdtDef,
+        enum_place: &mir::Place<'tcx>,
+        dirty_list: &mut WorkQueue<BasicBlock>,
+        values: &[u128],
+        targets: &[BasicBlock],
+    ) {
+        // MIR building adds discriminants to the `values` array in the same order as they
+        // are yielded by `AdtDef::discriminants`. We rely on this to match each
+        // discriminant in `values` to its corresponding variant in linear time.
+        let mut tmp = BitSet::new_empty(in_out.domain_size());
+        let mut discriminants = enum_def.discriminants(self.tcx);
+        for (value, target) in values.iter().zip(targets.iter().copied()) {
+            let (variant_idx, _) = discriminants.find(|&(_, discr)| discr.val == *value).expect(
+                "Order of `AdtDef::discriminants` differed from that of `SwitchInt::values`",
+            );
+
+            tmp.overwrite(in_out);
+            self.analysis.apply_discriminant_switch_effect(
+                &mut tmp,
+                bb,
+                enum_place,
+                enum_def,
+                variant_idx,
+            );
+            self.propagate_bits_into_entry_set_for(&tmp, target, dirty_list);
+        }
+
+        std::mem::drop(tmp);
+
+        // Propagate dataflow state along the "otherwise" edge.
+        let otherwise = targets.last().copied().unwrap();
+        self.propagate_bits_into_entry_set_for(&in_out, otherwise, dirty_list);
+    }
+}
+
+/// Inspect a `SwitchInt`-terminated basic block to see if the condition of that `SwitchInt` is
+/// an enum discriminant.
+///
+/// We expect such blocks to have a call to `discriminant` as their last statement like so:
+///   _42 = discriminant(_1)
+///   SwitchInt(_42, ..)
+///
+/// If the basic block matches this pattern, this function returns the place corresponding to the
+/// enum (`_1` in the example above) as well as the `AdtDef` of that enum.
+fn switch_on_enum_discriminant(
+    tcx: TyCtxt<'tcx>,
+    body: &'mir mir::Body<'tcx>,
+    block: &'mir mir::BasicBlockData<'tcx>,
+    switch_on: &mir::Place<'tcx>,
+) -> Option<(&'mir mir::Place<'tcx>, &'tcx ty::AdtDef)> {
+    match block.statements.last().map(|stmt| &stmt.kind) {
+        Some(mir::StatementKind::Assign(box (lhs, mir::Rvalue::Discriminant(discriminated))))
+            if lhs == switch_on =>
+        {
+            match &discriminated.ty(body, tcx).ty.kind {
+                ty::Adt(def, _) => Some((discriminated, def)),
+
+                // `Rvalue::Discriminant` is also used to get the active yield point for a
+                // generator, but we do not need edge-specific effects in that case. This may
+                // change in the future.
+                ty::Generator(..) => None,
+
+                t => bug!("`discriminant` called on unexpected type {:?}", t),
+            }
+        }
+
+        _ => None,
+    }
 }
 
 // Graphviz
@@ -331,7 +426,7 @@ where
     let mut buf = Vec::new();
 
     let graphviz = graphviz::Formatter::new(body, def_id, results, &mut *formatter);
-    dot::render(&graphviz, &mut buf)?;
+    dot::render_opts(&graphviz, &mut buf, &[dot::RenderOption::Monospace])?;
     fs::write(&path, buf)?;
     Ok(())
 }
@@ -350,7 +445,7 @@ impl RustcMirAttrs {
         let mut ret = RustcMirAttrs::default();
 
         let rustc_mir_attrs = attrs
-            .into_iter()
+            .iter()
             .filter(|attr| attr.check_name(sym::rustc_mir))
             .flat_map(|attr| attr.meta_item_list().into_iter().flat_map(|v| v.into_iter()));
 
diff --git a/src/librustc_mir/dataflow/generic/graphviz.rs b/src/librustc_mir/dataflow/generic/graphviz.rs
index fdf86e7b53..f8e1d3e9fe 100644
--- a/src/librustc_mir/dataflow/generic/graphviz.rs
+++ b/src/librustc_mir/dataflow/generic/graphviz.rs
@@ -171,10 +171,19 @@ where
         //   | | (on successful return)           | +_4        |
         //   +-+----------------------------------+------------+
 
-        write!(
-            w,
-            r#"<table border="1" cellborder="1" cellspacing="0" cellpadding="3" sides="rb">"#,
-        )?;
+        // N.B., Some attributes (`align`, `balign`) are repeated on parent elements and their
+        // children. This is because `xdot` seemed to have a hard time correctly propagating
+        // attributes. Make sure to test the output before trying to remove the redundancy.
+        // Notably, `align` was found to have no effect when applied only to <table>.
+
+        let table_fmt = concat!(
+            " border=\"1\"",
+            " cellborder=\"1\"",
+            " cellspacing=\"0\"",
+            " cellpadding=\"3\"",
+            " sides=\"rb\"",
+        );
+        write!(w, r#"<table{fmt}>"#, fmt = table_fmt)?;
 
         // A + B: Block header
         if self.state_formatter.column_names().is_empty() {
@@ -186,7 +195,9 @@ where
         // C: Entry state
         self.bg = Background::Light;
         self.results.seek_to_block_start(block);
-        self.write_row_with_full_state(w, "", "(on_entry)")?;
+        let block_entry_state = self.results.get().clone();
+
+        self.write_row_with_full_state(w, "", "(on entry)")?;
 
         // D: Statement transfer functions
         for (i, statement) in body[block].statements.iter().enumerate() {
@@ -204,29 +215,42 @@ where
         self.write_row_for_location(w, "T", &terminator_str, terminator_loc)?;
 
         // F: Exit state
+
+        // Write the full dataflow state immediately after the terminator if it differs from the
+        // state at block entry.
         self.results.seek_after(terminator_loc);
-        if let mir::TerminatorKind::Call { destination: Some(_), .. } = &terminator.kind {
-            self.write_row_with_full_state(w, "", "(on unwind)")?;
-
-            let num_state_columns = self.num_state_columns();
-            self.write_row(w, "", "(on successful return)", |this, w, fmt| {
-                write!(
-                    w,
-                    r#"<td colspan="{colspan}" {fmt} align="left">"#,
-                    colspan = num_state_columns,
-                    fmt = fmt,
-                )?;
-
-                let state_on_unwind = this.results.get().clone();
-                this.results.seek_after_assume_call_returns(terminator_loc);
-                write_diff(w, this.results.analysis(), &state_on_unwind, this.results.get())?;
-
-                write!(w, "</td>")
-            })?;
-        } else {
-            self.write_row_with_full_state(w, "", "(on exit)")?;
+        if self.results.get() != &block_entry_state {
+            let after_terminator_name = match terminator.kind {
+                mir::TerminatorKind::Call { destination: Some(_), .. } => "(on unwind)",
+                _ => "(on exit)",
+            };
+
+            self.write_row_with_full_state(w, "", after_terminator_name)?;
         }
 
+        // Write any changes caused by terminator-specific effects
+        match terminator.kind {
+            mir::TerminatorKind::Call { destination: Some(_), .. } => {
+                let num_state_columns = self.num_state_columns();
+                self.write_row(w, "", "(on successful return)", |this, w, fmt| {
+                    write!(
+                        w,
+                        r#"<td balign="left" colspan="{colspan}" {fmt} align="left">"#,
+                        colspan = num_state_columns,
+                        fmt = fmt,
+                    )?;
+
+                    let state_on_unwind = this.results.get().clone();
+                    this.results.seek_after_assume_call_returns(terminator_loc);
+                    write_diff(w, this.results.analysis(), &state_on_unwind, this.results.get())?;
+
+                    write!(w, "</td>")
+                })?;
+            }
+
+            _ => {}
+        };
+
         write!(w, "</table>")
     }
 
@@ -311,7 +335,9 @@ where
         f: impl FnOnce(&mut Self, &mut W, &str) -> io::Result<()>,
     ) -> io::Result<()> {
         let bg = self.toggle_background();
-        let fmt = format!("sides=\"tl\" {}", bg.attr());
+        let valign = if mir.starts_with("(on ") && mir != "(on entry)" { "bottom" } else { "top" };
+
+        let fmt = format!("valign=\"{}\" sides=\"tl\" {}", valign, bg.attr());
 
         write!(
             w,
@@ -345,7 +371,7 @@ where
                 colspan = this.num_state_columns(),
                 fmt = fmt,
             )?;
-            pretty_print_state_elems(w, analysis, state.iter(), ",", LIMIT_40_ALIGN_1)?;
+            pretty_print_state_elems(w, analysis, state.iter(), ", ", LIMIT_30_ALIGN_1)?;
             write!(w, "}}</td>")
         })
     }
@@ -387,7 +413,6 @@ pub struct SimpleDiff<T: Idx> {
 }
 
 impl<T: Idx> SimpleDiff<T> {
-    #![allow(unused)]
     pub fn new(bits_per_block: usize) -> Self {
         SimpleDiff { prev_state: BitSet::new_empty(bits_per_block), prev_loc: Location::START }
     }
@@ -417,8 +442,8 @@ where
         }
 
         self.prev_loc = location;
-        write!(w, r#"<td {fmt} align="left">"#, fmt = fmt)?;
-        results.seek_before(location);
+        write!(w, r#"<td {fmt} balign="left" align="left">"#, fmt = fmt)?;
+        results.seek_after(location);
         let curr_state = results.get();
         write_diff(&mut w, results.analysis(), &self.prev_state, curr_state)?;
         self.prev_state.overwrite(curr_state);
@@ -434,7 +459,6 @@ pub struct TwoPhaseDiff<T: Idx> {
 }
 
 impl<T: Idx> TwoPhaseDiff<T> {
-    #![allow(unused)]
     pub fn new(bits_per_block: usize) -> Self {
         TwoPhaseDiff { prev_state: BitSet::new_empty(bits_per_block), prev_loc: Location::START }
     }
@@ -445,7 +469,7 @@ where
     A: Analysis<'tcx>,
 {
     fn column_names(&self) -> &[&str] {
-        &["ENTRY", " EXIT"]
+        &["BEFORE", " AFTER"]
     }
 
     fn write_state_for_location(
@@ -465,7 +489,7 @@ where
 
         self.prev_loc = location;
 
-        // Entry
+        // Before
 
         write!(w, r#"<td {fmt} align="left">"#, fmt = fmt)?;
         results.seek_before(location);
@@ -474,7 +498,7 @@ where
         self.prev_state.overwrite(curr_state);
         write!(w, "</td>")?;
 
-        // Exit
+        // After
 
         write!(w, r#"<td {fmt} align="left">"#, fmt = fmt)?;
         results.seek_after(location);
@@ -492,7 +516,6 @@ pub struct BlockTransferFunc<'a, 'tcx, T: Idx> {
 }
 
 impl<T: Idx> BlockTransferFunc<'mir, 'tcx, T> {
-    #![allow(unused)]
     pub fn new(
         body: &'mir mir::Body<'tcx>,
         trans_for_block: IndexVec<BasicBlock, GenKillSet<T>>,
@@ -527,12 +550,12 @@ where
         for set in &[&block_trans.gen, &block_trans.kill] {
             write!(
                 w,
-                r#"<td {fmt} rowspan="{rowspan}" align="center">"#,
+                r#"<td {fmt} rowspan="{rowspan}" balign="left" align="left">"#,
                 fmt = fmt,
                 rowspan = rowspan
             )?;
 
-            pretty_print_state_elems(&mut w, results.analysis(), set.iter(), "\n", None)?;
+            pretty_print_state_elems(&mut w, results.analysis(), set.iter(), BR_LEFT, None)?;
             write!(w, "</td>")?;
         }
 
@@ -564,25 +587,28 @@ fn write_diff<A: Analysis<'tcx>>(
 
     if !set.is_empty() {
         write!(w, r#"<font color="darkgreen">+"#)?;
-        pretty_print_state_elems(w, analysis, set.iter(), ",", LIMIT_40_ALIGN_1)?;
+        pretty_print_state_elems(w, analysis, set.iter(), ", ", LIMIT_30_ALIGN_1)?;
         write!(w, r#"</font>"#)?;
     }
 
     if !set.is_empty() && !clear.is_empty() {
-        write!(w, "<br/>")?;
+        write!(w, "{}", BR_LEFT)?;
     }
 
     if !clear.is_empty() {
         write!(w, r#"<font color="red">-"#)?;
-        pretty_print_state_elems(w, analysis, clear.iter(), ",", LIMIT_40_ALIGN_1)?;
+        pretty_print_state_elems(w, analysis, clear.iter(), ", ", LIMIT_30_ALIGN_1)?;
         write!(w, r#"</font>"#)?;
     }
 
     Ok(())
 }
 
+const BR_LEFT: &str = r#"<br align="left"/>"#;
+const BR_LEFT_SPACE: &str = r#"<br align="left"/> "#;
+
 /// Line break policy that breaks at 40 characters and starts the next line with a single space.
-const LIMIT_40_ALIGN_1: Option<LineBreak> = Some(LineBreak { sequence: "<br/> ", limit: 40 });
+const LIMIT_30_ALIGN_1: Option<LineBreak> = Some(LineBreak { sequence: BR_LEFT_SPACE, limit: 30 });
 
 struct LineBreak {
     sequence: &'static str,
@@ -613,13 +639,6 @@ where
     let mut line_break_inserted = false;
 
     for idx in elems {
-        if first {
-            first = false;
-        } else {
-            write!(w, "{}", sep)?;
-            curr_line_width += sep_width;
-        }
-
         buf.clear();
         analysis.pretty_print_idx(&mut buf, idx)?;
         let idx_str =
@@ -627,11 +646,18 @@ where
         let escaped = dot::escape_html(idx_str);
         let escaped_width = escaped.chars().count();
 
-        if let Some(line_break) = &line_break {
-            if curr_line_width + sep_width + escaped_width > line_break.limit {
-                write!(w, "{}", line_break.sequence)?;
-                line_break_inserted = true;
-                curr_line_width = 0;
+        if first {
+            first = false;
+        } else {
+            write!(w, "{}", sep)?;
+            curr_line_width += sep_width;
+
+            if let Some(line_break) = &line_break {
+                if curr_line_width + sep_width + escaped_width > line_break.limit {
+                    write!(w, "{}", line_break.sequence)?;
+                    line_break_inserted = true;
+                    curr_line_width = 0;
+                }
             }
         }
 
diff --git a/src/librustc_mir/dataflow/generic/mod.rs b/src/librustc_mir/dataflow/generic/mod.rs
index c9b4f875eb..9a102c9a3d 100644
--- a/src/librustc_mir/dataflow/generic/mod.rs
+++ b/src/librustc_mir/dataflow/generic/mod.rs
@@ -35,6 +35,9 @@
 use std::io;
 
 use rustc::mir::{self, BasicBlock, Location};
+use rustc::ty::layout::VariantIdx;
+use rustc::ty::{self, TyCtxt};
+use rustc_hir::def_id::DefId;
 use rustc_index::bit_set::{BitSet, HybridBitSet};
 use rustc_index::vec::{Idx, IndexVec};
 
@@ -43,9 +46,12 @@ use crate::dataflow::BottomValue;
 mod cursor;
 mod engine;
 mod graphviz;
+mod visitor;
 
 pub use self::cursor::{ResultsCursor, ResultsRefCursor};
 pub use self::engine::Engine;
+pub use self::visitor::{visit_results, ResultsVisitor};
+pub use self::visitor::{BorrowckFlowState, BorrowckResults};
 
 /// A dataflow analysis that has converged to fixpoint.
 pub struct Results<'tcx, A>
@@ -69,6 +75,24 @@ where
     pub fn entry_set_for_block(&self, block: BasicBlock) -> &BitSet<A::Idx> {
         &self.entry_sets[block]
     }
+
+    pub fn visit_with(
+        &self,
+        body: &'mir mir::Body<'tcx>,
+        blocks: impl IntoIterator<Item = BasicBlock>,
+        vis: &mut impl ResultsVisitor<'mir, 'tcx, FlowState = BitSet<A::Idx>>,
+    ) {
+        visit_results(body, blocks, self, vis)
+    }
+
+    pub fn visit_in_rpo_with(
+        &self,
+        body: &'mir mir::Body<'tcx>,
+        vis: &mut impl ResultsVisitor<'mir, 'tcx, FlowState = BitSet<A::Idx>>,
+    ) {
+        let blocks = mir::traversal::reverse_postorder(body);
+        visit_results(body, blocks.map(|(bb, _)| bb), self, vis)
+    }
 }
 
 /// Define the domain of a dataflow problem.
@@ -166,6 +190,45 @@ pub trait Analysis<'tcx>: AnalysisDomain<'tcx> {
         args: &[mir::Operand<'tcx>],
         return_place: &mir::Place<'tcx>,
     );
+
+    /// Updates the current dataflow state with the effect of taking a particular branch in a
+    /// `SwitchInt` terminator.
+    ///
+    /// Much like `apply_call_return_effect`, this effect is only propagated along a single
+    /// outgoing edge from this basic block.
+    fn apply_discriminant_switch_effect(
+        &self,
+        _state: &mut BitSet<Self::Idx>,
+        _block: BasicBlock,
+        _enum_place: &mir::Place<'tcx>,
+        _adt: &ty::AdtDef,
+        _variant: VariantIdx,
+    ) {
+    }
+
+    /// Creates an `Engine` to find the fixpoint for this dataflow problem.
+    ///
+    /// You shouldn't need to override this outside this module, since the combination of the
+    /// default impl and the one for all `A: GenKillAnalysis` will do the right thing.
+    /// Its purpose is to enable method chaining like so:
+    ///
+    /// ```ignore(cross-crate-imports)
+    /// let results = MyAnalysis::new(tcx, body)
+    ///     .into_engine(tcx, body, def_id)
+    ///     .iterate_to_fixpoint()
+    ///     .into_results_cursor(body);
+    /// ```
+    fn into_engine(
+        self,
+        tcx: TyCtxt<'tcx>,
+        body: &'mir mir::Body<'tcx>,
+        def_id: DefId,
+    ) -> Engine<'mir, 'tcx, Self>
+    where
+        Self: Sized,
+    {
+        Engine::new_generic(tcx, body, def_id, self)
+    }
 }
 
 /// A gen/kill dataflow problem.
@@ -220,6 +283,17 @@ pub trait GenKillAnalysis<'tcx>: Analysis<'tcx> {
         args: &[mir::Operand<'tcx>],
         return_place: &mir::Place<'tcx>,
     );
+
+    /// See `Analysis::apply_discriminant_switch_effect`.
+    fn discriminant_switch_effect(
+        &self,
+        _state: &mut impl GenKill<Self::Idx>,
+        _block: BasicBlock,
+        _enum_place: &mir::Place<'tcx>,
+        _adt: &ty::AdtDef,
+        _variant: VariantIdx,
+    ) {
+    }
 }
 
 impl<A> Analysis<'tcx> for A
@@ -272,6 +346,29 @@ where
     ) {
         self.call_return_effect(state, block, func, args, return_place);
     }
+
+    fn apply_discriminant_switch_effect(
+        &self,
+        state: &mut BitSet<Self::Idx>,
+        block: BasicBlock,
+        enum_place: &mir::Place<'tcx>,
+        adt: &ty::AdtDef,
+        variant: VariantIdx,
+    ) {
+        self.discriminant_switch_effect(state, block, enum_place, adt, variant);
+    }
+
+    fn into_engine(
+        self,
+        tcx: TyCtxt<'tcx>,
+        body: &'mir mir::Body<'tcx>,
+        def_id: DefId,
+    ) -> Engine<'mir, 'tcx, Self>
+    where
+        Self: Sized,
+    {
+        Engine::new_gen_kill(tcx, body, def_id, self)
+    }
 }
 
 /// The legal operations for a transfer function in a gen/kill problem.
diff --git a/src/librustc_mir/dataflow/generic/visitor.rs b/src/librustc_mir/dataflow/generic/visitor.rs
new file mode 100644
index 0000000000..6e1513bcd1
--- /dev/null
+++ b/src/librustc_mir/dataflow/generic/visitor.rs
@@ -0,0 +1,272 @@
+use rustc::mir::{self, BasicBlock, Location};
+use rustc_index::bit_set::BitSet;
+
+use super::{Analysis, Results};
+use crate::dataflow::impls::{borrows::Borrows, EverInitializedPlaces, MaybeUninitializedPlaces};
+
+/// Calls the corresponding method in `ResultsVisitor` for every location in a `mir::Body` with the
+/// dataflow state at that location.
+pub fn visit_results<F>(
+    body: &'mir mir::Body<'tcx>,
+    blocks: impl IntoIterator<Item = BasicBlock>,
+    results: &impl ResultsVisitable<'tcx, FlowState = F>,
+    vis: &mut impl ResultsVisitor<'mir, 'tcx, FlowState = F>,
+) {
+    let mut state = results.new_flow_state(body);
+
+    for block in blocks {
+        let block_data = &body[block];
+        results.reset_to_block_start(&mut state, block);
+
+        for (statement_index, stmt) in block_data.statements.iter().enumerate() {
+            let loc = Location { block, statement_index };
+
+            results.reconstruct_before_statement_effect(&mut state, stmt, loc);
+            vis.visit_statement(&state, stmt, loc);
+
+            results.reconstruct_statement_effect(&mut state, stmt, loc);
+            vis.visit_statement_exit(&state, stmt, loc);
+        }
+
+        let loc = body.terminator_loc(block);
+        let term = block_data.terminator();
+
+        results.reconstruct_before_terminator_effect(&mut state, term, loc);
+        vis.visit_terminator(&state, term, loc);
+
+        results.reconstruct_terminator_effect(&mut state, term, loc);
+        vis.visit_terminator_exit(&state, term, loc);
+    }
+}
+
+pub trait ResultsVisitor<'mir, 'tcx> {
+    type FlowState;
+
+    /// Called with the `before_statement_effect` of the given statement applied to `state` but not
+    /// its `statement_effect`.
+    fn visit_statement(
+        &mut self,
+        _state: &Self::FlowState,
+        _statement: &'mir mir::Statement<'tcx>,
+        _location: Location,
+    ) {
+    }
+
+    /// Called with both the `before_statement_effect` and the `statement_effect` of the given
+    /// statement applied to `state`.
+    fn visit_statement_exit(
+        &mut self,
+        _state: &Self::FlowState,
+        _statement: &'mir mir::Statement<'tcx>,
+        _location: Location,
+    ) {
+    }
+
+    /// Called with the `before_terminator_effect` of the given terminator applied to `state` but not
+    /// its `terminator_effect`.
+    fn visit_terminator(
+        &mut self,
+        _state: &Self::FlowState,
+        _terminator: &'mir mir::Terminator<'tcx>,
+        _location: Location,
+    ) {
+    }
+
+    /// Called with both the `before_terminator_effect` and the `terminator_effect` of the given
+    /// terminator applied to `state`.
+    ///
+    /// The `call_return_effect` (if one exists) will *not* be applied to `state`.
+    fn visit_terminator_exit(
+        &mut self,
+        _state: &Self::FlowState,
+        _terminator: &'mir mir::Terminator<'tcx>,
+        _location: Location,
+    ) {
+    }
+}
+
+/// Things that can be visited by a `ResultsVisitor`.
+///
+/// This trait exists so that we can visit the results of multiple dataflow analyses simultaneously.
+/// DO NOT IMPLEMENT MANUALLY. Instead, use the `impl_visitable` macro below.
+pub trait ResultsVisitable<'tcx> {
+    type FlowState;
+
+    /// Creates an empty `FlowState` to hold the transient state for these dataflow results.
+    ///
+    /// The value of the newly created `FlowState` will be overwritten by `reset_to_block_start`
+    /// before it can be observed by a `ResultsVisitor`.
+    fn new_flow_state(&self, body: &mir::Body<'tcx>) -> Self::FlowState;
+
+    fn reset_to_block_start(&self, state: &mut Self::FlowState, block: BasicBlock);
+
+    fn reconstruct_before_statement_effect(
+        &self,
+        state: &mut Self::FlowState,
+        statement: &mir::Statement<'tcx>,
+        location: Location,
+    );
+
+    fn reconstruct_statement_effect(
+        &self,
+        state: &mut Self::FlowState,
+        statement: &mir::Statement<'tcx>,
+        location: Location,
+    );
+
+    fn reconstruct_before_terminator_effect(
+        &self,
+        state: &mut Self::FlowState,
+        terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    );
+
+    fn reconstruct_terminator_effect(
+        &self,
+        state: &mut Self::FlowState,
+        terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    );
+}
+
+impl<'tcx, A> ResultsVisitable<'tcx> for Results<'tcx, A>
+where
+    A: Analysis<'tcx>,
+{
+    type FlowState = BitSet<A::Idx>;
+
+    fn new_flow_state(&self, body: &mir::Body<'tcx>) -> Self::FlowState {
+        BitSet::new_empty(self.analysis.bits_per_block(body))
+    }
+
+    fn reset_to_block_start(&self, state: &mut Self::FlowState, block: BasicBlock) {
+        state.overwrite(&self.entry_set_for_block(block));
+    }
+
+    fn reconstruct_before_statement_effect(
+        &self,
+        state: &mut Self::FlowState,
+        stmt: &mir::Statement<'tcx>,
+        loc: Location,
+    ) {
+        self.analysis.apply_before_statement_effect(state, stmt, loc);
+    }
+
+    fn reconstruct_statement_effect(
+        &self,
+        state: &mut Self::FlowState,
+        stmt: &mir::Statement<'tcx>,
+        loc: Location,
+    ) {
+        self.analysis.apply_statement_effect(state, stmt, loc);
+    }
+
+    fn reconstruct_before_terminator_effect(
+        &self,
+        state: &mut Self::FlowState,
+        term: &mir::Terminator<'tcx>,
+        loc: Location,
+    ) {
+        self.analysis.apply_before_terminator_effect(state, term, loc);
+    }
+
+    fn reconstruct_terminator_effect(
+        &self,
+        state: &mut Self::FlowState,
+        term: &mir::Terminator<'tcx>,
+        loc: Location,
+    ) {
+        self.analysis.apply_terminator_effect(state, term, loc);
+    }
+}
+
+/// A tuple with named fields that can hold either the results or the transient state of the
+/// dataflow analyses used by the borrow checker.
+#[derive(Debug)]
+pub struct BorrowckAnalyses<B, U, E> {
+    pub borrows: B,
+    pub uninits: U,
+    pub ever_inits: E,
+}
+
+/// The results of the dataflow analyses used by the borrow checker.
+pub type BorrowckResults<'mir, 'tcx> = BorrowckAnalyses<
+    Results<'tcx, Borrows<'mir, 'tcx>>,
+    Results<'tcx, MaybeUninitializedPlaces<'mir, 'tcx>>,
+    Results<'tcx, EverInitializedPlaces<'mir, 'tcx>>,
+>;
+
+/// The transient state of the dataflow analyses used by the borrow checker.
+pub type BorrowckFlowState<'mir, 'tcx> =
+    <BorrowckResults<'mir, 'tcx> as ResultsVisitable<'tcx>>::FlowState;
+
+macro_rules! impl_visitable {
+    ( $(
+        $T:ident { $( $field:ident : $A:ident ),* $(,)? }
+    )* ) => { $(
+        impl<'tcx, $($A),*> ResultsVisitable<'tcx> for $T<$( Results<'tcx, $A> ),*>
+        where
+            $( $A: Analysis<'tcx>, )*
+        {
+            type FlowState = $T<$( BitSet<$A::Idx> ),*>;
+
+            fn new_flow_state(&self, body: &mir::Body<'tcx>) -> Self::FlowState {
+                $T {
+                    $( $field: BitSet::new_empty(self.$field.analysis.bits_per_block(body)) ),*
+                }
+            }
+
+            fn reset_to_block_start(
+                &self,
+                state: &mut Self::FlowState,
+                block: BasicBlock,
+            ) {
+                $( state.$field.overwrite(&self.$field.entry_sets[block]); )*
+            }
+
+            fn reconstruct_before_statement_effect(
+                &self,
+                state: &mut Self::FlowState,
+                stmt: &mir::Statement<'tcx>,
+                loc: Location,
+            ) {
+                $( self.$field.analysis
+                    .apply_before_statement_effect(&mut state.$field, stmt, loc); )*
+            }
+
+            fn reconstruct_statement_effect(
+                &self,
+                state: &mut Self::FlowState,
+                stmt: &mir::Statement<'tcx>,
+                loc: Location,
+            ) {
+                $( self.$field.analysis
+                    .apply_statement_effect(&mut state.$field, stmt, loc); )*
+            }
+
+            fn reconstruct_before_terminator_effect(
+                &self,
+                state: &mut Self::FlowState,
+                term: &mir::Terminator<'tcx>,
+                loc: Location,
+            ) {
+                $( self.$field.analysis
+                    .apply_before_terminator_effect(&mut state.$field, term, loc); )*
+            }
+
+            fn reconstruct_terminator_effect(
+                &self,
+                state: &mut Self::FlowState,
+                term: &mir::Terminator<'tcx>,
+                loc: Location,
+            ) {
+                $( self.$field.analysis
+                    .apply_terminator_effect(&mut state.$field, term, loc); )*
+            }
+        }
+    )* }
+}
+
+impl_visitable! {
+    BorrowckAnalyses { borrows: B, uninits: U, ever_inits: E }
+}
diff --git a/src/librustc_mir/dataflow/graphviz.rs b/src/librustc_mir/dataflow/graphviz.rs
index 45d2b1a71f..a9ef7ef6c5 100644
--- a/src/librustc_mir/dataflow/graphviz.rs
+++ b/src/librustc_mir/dataflow/graphviz.rs
@@ -72,7 +72,7 @@ pub struct Edge {
 
 fn outgoing(body: &Body<'_>, bb: BasicBlock) -> Vec<Edge> {
     (0..body[bb].terminator().successors().count())
-        .map(|index| Edge { source: bb, index: index })
+        .map(|index| Edge { source: bb, index })
         .collect()
 }
 
diff --git a/src/librustc_mir/dataflow/impls/borrowed_locals.rs b/src/librustc_mir/dataflow/impls/borrowed_locals.rs
index 63834d0ecd..95a676c089 100644
--- a/src/librustc_mir/dataflow/impls/borrowed_locals.rs
+++ b/src/librustc_mir/dataflow/impls/borrowed_locals.rs
@@ -1,102 +1,274 @@
 pub use super::*;
 
-use crate::dataflow::{BitDenotation, GenKillSet};
+use crate::dataflow::generic::{AnalysisDomain, GenKill, GenKillAnalysis};
 use rustc::mir::visit::Visitor;
 use rustc::mir::*;
+use rustc::ty::{ParamEnv, TyCtxt};
+use rustc_span::DUMMY_SP;
 
-/// This calculates if any part of a MIR local could have previously been borrowed.
-/// This means that once a local has been borrowed, its bit will be set
-/// from that point and onwards, until we see a StorageDead statement for the local,
-/// at which points there is no memory associated with the local, so it cannot be borrowed.
-/// This is used to compute which locals are live during a yield expression for
-/// immovable generators.
-#[derive(Copy, Clone)]
-pub struct HaveBeenBorrowedLocals<'a, 'tcx> {
-    body: &'a Body<'tcx>,
+pub type MaybeMutBorrowedLocals<'mir, 'tcx> = MaybeBorrowedLocals<MutBorrow<'mir, 'tcx>>;
+
+/// A dataflow analysis that tracks whether a pointer or reference could possibly exist that points
+/// to a given local.
+///
+/// The `K` parameter determines what kind of borrows are tracked. By default,
+/// `MaybeBorrowedLocals` looks for *any* borrow of a local. If you are only interested in borrows
+/// that might allow mutation, use the `MaybeMutBorrowedLocals` type alias instead.
+///
+/// At present, this is used as a very limited form of alias analysis. For example,
+/// `MaybeBorrowedLocals` is used to compute which locals are live during a yield expression for
+/// immovable generators. `MaybeMutBorrowedLocals` is used during const checking to prove that a
+/// local has not been mutated via indirect assignment (e.g., `*p = 42`), the side-effects of a
+/// function call or inline assembly.
+pub struct MaybeBorrowedLocals<K = AnyBorrow> {
+    kind: K,
+    ignore_borrow_on_drop: bool,
+}
+
+impl MaybeBorrowedLocals {
+    /// A dataflow analysis that records whether a pointer or reference exists that may alias the
+    /// given local.
+    pub fn all_borrows() -> Self {
+        MaybeBorrowedLocals { kind: AnyBorrow, ignore_borrow_on_drop: false }
+    }
+}
+
+impl MaybeMutBorrowedLocals<'mir, 'tcx> {
+    /// A dataflow analysis that records whether a pointer or reference exists that may *mutably*
+    /// alias the given local.
+    ///
+    /// This includes `&mut` and pointers derived from an `&mut`, as well as shared borrows of
+    /// types with interior mutability.
+    pub fn mut_borrows_only(
+        tcx: TyCtxt<'tcx>,
+        body: &'mir mir::Body<'tcx>,
+        param_env: ParamEnv<'tcx>,
+    ) -> Self {
+        MaybeBorrowedLocals {
+            kind: MutBorrow { body, tcx, param_env },
+            ignore_borrow_on_drop: false,
+        }
+    }
 }
 
-impl<'a, 'tcx> HaveBeenBorrowedLocals<'a, 'tcx> {
-    pub fn new(body: &'a Body<'tcx>) -> Self {
-        HaveBeenBorrowedLocals { body }
+impl<K> MaybeBorrowedLocals<K> {
+    /// During dataflow analysis, ignore the borrow that may occur when a place is dropped.
+    ///
+    /// Drop terminators may call custom drop glue (`Drop::drop`), which takes `&mut self` as a
+    /// parameter. In the general case, a drop impl could launder that reference into the
+    /// surrounding environment through a raw pointer, thus creating a valid `*mut` pointing to the
+    /// dropped local. We are not yet willing to declare this particular case UB, so we must treat
+    /// all dropped locals as mutably borrowed for now. See discussion on [#61069].
+    ///
+    /// In some contexts, we know that this borrow will never occur. For example, during
+    /// const-eval, custom drop glue cannot be run. Code that calls this should document the
+    /// assumptions that justify ignoring `Drop` terminators in this way.
+    ///
+    /// [#61069]: https://github.com/rust-lang/rust/pull/61069
+    pub fn unsound_ignore_borrow_on_drop(self) -> Self {
+        MaybeBorrowedLocals { ignore_borrow_on_drop: true, ..self }
     }
 
-    pub fn body(&self) -> &Body<'tcx> {
-        self.body
+    fn transfer_function<'a, T>(&'a self, trans: &'a mut T) -> TransferFunction<'a, T, K> {
+        TransferFunction {
+            kind: &self.kind,
+            trans,
+            ignore_borrow_on_drop: self.ignore_borrow_on_drop,
+        }
     }
 }
 
-impl<'a, 'tcx> BitDenotation<'tcx> for HaveBeenBorrowedLocals<'a, 'tcx> {
+impl<K> AnalysisDomain<'tcx> for MaybeBorrowedLocals<K>
+where
+    K: BorrowAnalysisKind<'tcx>,
+{
     type Idx = Local;
-    fn name() -> &'static str {
-        "has_been_borrowed_locals"
+
+    const NAME: &'static str = K::ANALYSIS_NAME;
+
+    fn bits_per_block(&self, body: &mir::Body<'tcx>) -> usize {
+        body.local_decls().len()
+    }
+
+    fn initialize_start_block(&self, _: &mir::Body<'tcx>, _: &mut BitSet<Self::Idx>) {
+        // No locals are aliased on function entry
+    }
+}
+
+impl<K> GenKillAnalysis<'tcx> for MaybeBorrowedLocals<K>
+where
+    K: BorrowAnalysisKind<'tcx>,
+{
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        statement: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
+        self.transfer_function(trans).visit_statement(statement, location);
     }
-    fn bits_per_block(&self) -> usize {
-        self.body.local_decls.len()
+
+    fn terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    ) {
+        self.transfer_function(trans).visit_terminator(terminator, location);
     }
 
-    fn start_block_effect(&self, _on_entry: &mut BitSet<Local>) {
-        // Nothing is borrowed on function entry
+    fn call_return_effect(
+        &self,
+        _trans: &mut impl GenKill<Self::Idx>,
+        _block: mir::BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
+        _dest_place: &mir::Place<'tcx>,
+    ) {
     }
+}
+
+impl<K> BottomValue for MaybeBorrowedLocals<K> {
+    // bottom = unborrowed
+    const BOTTOM_VALUE: bool = false;
+}
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Local>, loc: Location) {
-        let stmt = &self.body[loc.block].statements[loc.statement_index];
+/// A `Visitor` that defines the transfer function for `MaybeBorrowedLocals`.
+struct TransferFunction<'a, T, K> {
+    trans: &'a mut T,
+    kind: &'a K,
+    ignore_borrow_on_drop: bool,
+}
 
-        BorrowedLocalsVisitor { trans }.visit_statement(stmt, loc);
+impl<T, K> Visitor<'tcx> for TransferFunction<'a, T, K>
+where
+    T: GenKill<Local>,
+    K: BorrowAnalysisKind<'tcx>,
+{
+    fn visit_statement(&mut self, stmt: &Statement<'tcx>, location: Location) {
+        self.super_statement(stmt, location);
 
-        // StorageDead invalidates all borrows and raw pointers to a local
-        match stmt.kind {
-            StatementKind::StorageDead(l) => trans.kill(l),
-            _ => (),
+        // When we reach a `StorageDead` statement, we can assume that any pointers to this memory
+        // are now invalid.
+        if let StatementKind::StorageDead(local) = stmt.kind {
+            self.trans.kill(local);
         }
     }
 
-    fn terminator_effect(&self, trans: &mut GenKillSet<Local>, loc: Location) {
-        let terminator = self.body[loc.block].terminator();
-        BorrowedLocalsVisitor { trans }.visit_terminator(terminator, loc);
-        match &terminator.kind {
-            // Drop terminators borrows the location
-            TerminatorKind::Drop { location, .. }
-            | TerminatorKind::DropAndReplace { location, .. } => {
-                if let Some(local) = find_local(location) {
-                    trans.gen(local);
+    fn visit_rvalue(&mut self, rvalue: &mir::Rvalue<'tcx>, location: Location) {
+        self.super_rvalue(rvalue, location);
+
+        match rvalue {
+            mir::Rvalue::AddressOf(mt, borrowed_place) => {
+                if !borrowed_place.is_indirect() && self.kind.in_address_of(*mt, borrowed_place) {
+                    self.trans.gen(borrowed_place.local);
                 }
             }
-            _ => (),
+
+            mir::Rvalue::Ref(_, kind, borrowed_place) => {
+                if !borrowed_place.is_indirect() && self.kind.in_ref(*kind, borrowed_place) {
+                    self.trans.gen(borrowed_place.local);
+                }
+            }
+
+            mir::Rvalue::Cast(..)
+            | mir::Rvalue::Use(..)
+            | mir::Rvalue::Repeat(..)
+            | mir::Rvalue::Len(..)
+            | mir::Rvalue::BinaryOp(..)
+            | mir::Rvalue::CheckedBinaryOp(..)
+            | mir::Rvalue::NullaryOp(..)
+            | mir::Rvalue::UnaryOp(..)
+            | mir::Rvalue::Discriminant(..)
+            | mir::Rvalue::Aggregate(..) => {}
         }
     }
 
-    fn propagate_call_return(
-        &self,
-        _in_out: &mut BitSet<Local>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
-        _dest_place: &mir::Place<'tcx>,
-    ) {
-        // Nothing to do when a call returns successfully
+    fn visit_terminator(&mut self, terminator: &mir::Terminator<'tcx>, location: Location) {
+        self.super_terminator(terminator, location);
+
+        match terminator.kind {
+            mir::TerminatorKind::Drop { location: dropped_place, .. }
+            | mir::TerminatorKind::DropAndReplace { location: dropped_place, .. } => {
+                // See documentation for `unsound_ignore_borrow_on_drop` for an explanation.
+                if !self.ignore_borrow_on_drop {
+                    self.trans.gen(dropped_place.local);
+                }
+            }
+
+            TerminatorKind::Abort
+            | TerminatorKind::Assert { .. }
+            | TerminatorKind::Call { .. }
+            | TerminatorKind::FalseEdges { .. }
+            | TerminatorKind::FalseUnwind { .. }
+            | TerminatorKind::GeneratorDrop
+            | TerminatorKind::Goto { .. }
+            | TerminatorKind::Resume
+            | TerminatorKind::Return
+            | TerminatorKind::SwitchInt { .. }
+            | TerminatorKind::Unreachable
+            | TerminatorKind::Yield { .. } => {}
+        }
     }
 }
 
-impl<'a, 'tcx> BottomValue for HaveBeenBorrowedLocals<'a, 'tcx> {
-    // bottom = unborrowed
-    const BOTTOM_VALUE: bool = false;
+pub struct AnyBorrow;
+
+pub struct MutBorrow<'mir, 'tcx> {
+    tcx: TyCtxt<'tcx>,
+    body: &'mir Body<'tcx>,
+    param_env: ParamEnv<'tcx>,
+}
+
+impl MutBorrow<'mir, 'tcx> {
+    /// `&` and `&raw` only allow mutation if the borrowed place is `!Freeze`.
+    ///
+    /// This assumes that it is UB to take the address of a struct field whose type is
+    /// `Freeze`, then use pointer arithmetic to derive a pointer to a *different* field of
+    /// that same struct whose type is `!Freeze`. If we decide that this is not UB, we will
+    /// have to check the type of the borrowed **local** instead of the borrowed **place**
+    /// below. See [rust-lang/unsafe-code-guidelines#134].
+    ///
+    /// [rust-lang/unsafe-code-guidelines#134]: https://github.com/rust-lang/unsafe-code-guidelines/issues/134
+    fn shared_borrow_allows_mutation(&self, place: &Place<'tcx>) -> bool {
+        !place.ty(self.body, self.tcx).ty.is_freeze(self.tcx, self.param_env, DUMMY_SP)
+    }
 }
 
-struct BorrowedLocalsVisitor<'gk> {
-    trans: &'gk mut GenKillSet<Local>,
+pub trait BorrowAnalysisKind<'tcx> {
+    const ANALYSIS_NAME: &'static str;
+
+    fn in_address_of(&self, mt: Mutability, place: &Place<'tcx>) -> bool;
+    fn in_ref(&self, kind: mir::BorrowKind, place: &Place<'tcx>) -> bool;
 }
 
-fn find_local(place: &Place<'_>) -> Option<Local> {
-    if !place.is_indirect() { Some(place.local) } else { None }
+impl BorrowAnalysisKind<'tcx> for AnyBorrow {
+    const ANALYSIS_NAME: &'static str = "maybe_borrowed_locals";
+
+    fn in_ref(&self, _: mir::BorrowKind, _: &Place<'_>) -> bool {
+        true
+    }
+    fn in_address_of(&self, _: Mutability, _: &Place<'_>) -> bool {
+        true
+    }
 }
 
-impl<'tcx> Visitor<'tcx> for BorrowedLocalsVisitor<'_> {
-    fn visit_rvalue(&mut self, rvalue: &Rvalue<'tcx>, location: Location) {
-        if let Rvalue::Ref(_, _, ref place) = *rvalue {
-            if let Some(local) = find_local(place) {
-                self.trans.gen(local);
+impl BorrowAnalysisKind<'tcx> for MutBorrow<'mir, 'tcx> {
+    const ANALYSIS_NAME: &'static str = "maybe_mut_borrowed_locals";
+
+    fn in_ref(&self, kind: mir::BorrowKind, place: &Place<'tcx>) -> bool {
+        match kind {
+            mir::BorrowKind::Mut { .. } => true,
+            mir::BorrowKind::Shared | mir::BorrowKind::Shallow | mir::BorrowKind::Unique => {
+                self.shared_borrow_allows_mutation(place)
             }
         }
+    }
 
-        self.super_rvalue(rvalue, location)
+    fn in_address_of(&self, mt: Mutability, place: &Place<'tcx>) -> bool {
+        match mt {
+            Mutability::Mut => true,
+            Mutability::Not => self.shared_borrow_allows_mutation(place),
+        }
     }
 }
diff --git a/src/librustc_mir/dataflow/impls/borrows.rs b/src/librustc_mir/dataflow/impls/borrows.rs
index f94ee67f2b..a7c0efd63b 100644
--- a/src/librustc_mir/dataflow/impls/borrows.rs
+++ b/src/librustc_mir/dataflow/impls/borrows.rs
@@ -4,13 +4,12 @@ use rustc::ty::TyCtxt;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_index::bit_set::BitSet;
-use rustc_index::vec::IndexVec;
 
 use crate::borrow_check::{
-    places_conflict, BorrowData, BorrowSet, PlaceConflictBias, PlaceExt, RegionInferenceContext,
-    ToRegionVid,
+    places_conflict, BorrowSet, PlaceConflictBias, PlaceExt, RegionInferenceContext, ToRegionVid,
 };
-use crate::dataflow::{BitDenotation, BottomValue, GenKillSet};
+use crate::dataflow::generic::{self, GenKill};
+use crate::dataflow::BottomValue;
 
 use std::rc::Rc;
 
@@ -160,10 +159,6 @@ impl<'a, 'tcx> Borrows<'a, 'tcx> {
         }
     }
 
-    crate fn borrows(&self) -> &IndexVec<BorrowIndex, BorrowData<'tcx>> {
-        &self.borrow_set.borrows
-    }
-
     pub fn location(&self, idx: BorrowIndex) -> &Location {
         &self.borrow_set.borrows[idx].reserve_location
     }
@@ -172,7 +167,7 @@ impl<'a, 'tcx> Borrows<'a, 'tcx> {
     /// That means they went out of a nonlexical scope
     fn kill_loans_out_of_scope_at_location(
         &self,
-        trans: &mut GenKillSet<BorrowIndex>,
+        trans: &mut impl GenKill<BorrowIndex>,
         location: Location,
     ) {
         // NOTE: The state associated with a given `location`
@@ -187,16 +182,21 @@ impl<'a, 'tcx> Borrows<'a, 'tcx> {
         // region, then setting that gen-bit will override any
         // potential kill introduced here.
         if let Some(indices) = self.borrows_out_of_scope_at_location.get(&location) {
-            trans.kill_all(indices);
+            trans.kill_all(indices.iter().copied());
         }
     }
 
     /// Kill any borrows that conflict with `place`.
-    fn kill_borrows_on_place(&self, trans: &mut GenKillSet<BorrowIndex>, place: &Place<'tcx>) {
+    fn kill_borrows_on_place(&self, trans: &mut impl GenKill<BorrowIndex>, place: &Place<'tcx>) {
         debug!("kill_borrows_on_place: place={:?}", place);
 
-        let other_borrows_of_local =
-            self.borrow_set.local_map.get(&place.local).into_iter().flat_map(|bs| bs.into_iter());
+        let other_borrows_of_local = self
+            .borrow_set
+            .local_map
+            .get(&place.local)
+            .into_iter()
+            .flat_map(|bs| bs.iter())
+            .copied();
 
         // If the borrowed place is a local with no projections, all other borrows of this
         // local must conflict. This is purely an optimization so we don't have to call
@@ -212,7 +212,7 @@ impl<'a, 'tcx> Borrows<'a, 'tcx> {
         // pair of array indices are unequal, so that when `places_conflict` returns true, we
         // will be assured that two places being compared definitely denotes the same sets of
         // locations.
-        let definitely_conflicting_borrows = other_borrows_of_local.filter(|&&i| {
+        let definitely_conflicting_borrows = other_borrows_of_local.filter(|&i| {
             places_conflict(
                 self.tcx,
                 self.body,
@@ -226,36 +226,41 @@ impl<'a, 'tcx> Borrows<'a, 'tcx> {
     }
 }
 
-impl<'a, 'tcx> BitDenotation<'tcx> for Borrows<'a, 'tcx> {
+impl<'tcx> generic::AnalysisDomain<'tcx> for Borrows<'_, 'tcx> {
     type Idx = BorrowIndex;
-    fn name() -> &'static str {
-        "borrows"
-    }
-    fn bits_per_block(&self) -> usize {
+
+    const NAME: &'static str = "borrows";
+
+    fn bits_per_block(&self, _: &mir::Body<'tcx>) -> usize {
         self.borrow_set.borrows.len() * 2
     }
 
-    fn start_block_effect(&self, _entry_set: &mut BitSet<Self::Idx>) {
+    fn initialize_start_block(&self, _: &mir::Body<'tcx>, _: &mut BitSet<Self::Idx>) {
         // no borrows of code region_scopes have been taken prior to
         // function execution, so this method has no effect.
     }
 
-    fn before_statement_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
-        debug!("Borrows::before_statement_effect trans: {:?} location: {:?}", trans, location);
-        self.kill_loans_out_of_scope_at_location(trans, location);
+    fn pretty_print_idx(&self, w: &mut impl std::io::Write, idx: Self::Idx) -> std::io::Result<()> {
+        write!(w, "{:?}", self.location(idx))
     }
+}
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
-        debug!("Borrows::statement_effect: trans={:?} location={:?}", trans, location);
-
-        let block = &self.body.basic_blocks().get(location.block).unwrap_or_else(|| {
-            panic!("could not find block at location {:?}", location);
-        });
-        let stmt = block.statements.get(location.statement_index).unwrap_or_else(|| {
-            panic!("could not find statement at location {:?}");
-        });
+impl<'tcx> generic::GenKillAnalysis<'tcx> for Borrows<'_, 'tcx> {
+    fn before_statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _statement: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
+        self.kill_loans_out_of_scope_at_location(trans, location);
+    }
 
-        debug!("Borrows::statement_effect: stmt={:?}", stmt);
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        stmt: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
         match stmt.kind {
             mir::StatementKind::Assign(box (ref lhs, ref rhs)) => {
                 if let mir::Rvalue::Ref(_, _, ref place) = *rhs {
@@ -301,18 +306,29 @@ impl<'a, 'tcx> BitDenotation<'tcx> for Borrows<'a, 'tcx> {
         }
     }
 
-    fn before_terminator_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
-        debug!("Borrows::before_terminator_effect: trans={:?} location={:?}", trans, location);
+    fn before_terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    ) {
         self.kill_loans_out_of_scope_at_location(trans, location);
     }
 
-    fn terminator_effect(&self, _: &mut GenKillSet<Self::Idx>, _: Location) {}
+    fn terminator_effect(
+        &self,
+        _: &mut impl GenKill<Self::Idx>,
+        _: &mir::Terminator<'tcx>,
+        _: Location,
+    ) {
+    }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        _in_out: &mut BitSet<BorrowIndex>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
+        _trans: &mut impl GenKill<Self::Idx>,
+        _block: mir::BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
         _dest_place: &mir::Place<'tcx>,
     ) {
     }
diff --git a/src/librustc_mir/dataflow/impls/indirect_mutation.rs b/src/librustc_mir/dataflow/impls/indirect_mutation.rs
deleted file mode 100644
index 85bf342c8a..0000000000
--- a/src/librustc_mir/dataflow/impls/indirect_mutation.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-use rustc::mir::visit::Visitor;
-use rustc::mir::{self, Local, Location};
-use rustc::ty::{self, TyCtxt};
-use rustc_index::bit_set::BitSet;
-use rustc_span::DUMMY_SP;
-
-use crate::dataflow::{self, GenKillSet};
-
-/// Whether a borrow to a `Local` has been created that could allow that `Local` to be mutated
-/// indirectly. This could either be a mutable reference (`&mut`) or a shared borrow if the type of
-/// that `Local` allows interior mutability. Operations that can mutate local's indirectly include:
-/// assignments through a pointer (`*p = 42`), function calls, drop terminators and inline assembly.
-///
-/// If this returns false for a `Local` at a given statement (or terminator), that `Local` could
-/// not possibly have been mutated indirectly prior to that statement.
-#[derive(Copy, Clone)]
-pub struct IndirectlyMutableLocals<'mir, 'tcx> {
-    body: &'mir mir::Body<'tcx>,
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-}
-
-impl<'mir, 'tcx> IndirectlyMutableLocals<'mir, 'tcx> {
-    pub fn new(
-        tcx: TyCtxt<'tcx>,
-        body: &'mir mir::Body<'tcx>,
-        param_env: ty::ParamEnv<'tcx>,
-    ) -> Self {
-        IndirectlyMutableLocals { body, tcx, param_env }
-    }
-
-    fn transfer_function<'a>(
-        &self,
-        trans: &'a mut GenKillSet<Local>,
-    ) -> TransferFunction<'a, 'mir, 'tcx> {
-        TransferFunction { body: self.body, tcx: self.tcx, param_env: self.param_env, trans }
-    }
-}
-
-impl<'mir, 'tcx> dataflow::BitDenotation<'tcx> for IndirectlyMutableLocals<'mir, 'tcx> {
-    type Idx = Local;
-
-    fn name() -> &'static str {
-        "mut_borrowed_locals"
-    }
-
-    fn bits_per_block(&self) -> usize {
-        self.body.local_decls.len()
-    }
-
-    fn start_block_effect(&self, _entry_set: &mut BitSet<Local>) {
-        // Nothing is borrowed on function entry
-    }
-
-    fn statement_effect(&self, trans: &mut GenKillSet<Local>, loc: Location) {
-        let stmt = &self.body[loc.block].statements[loc.statement_index];
-        self.transfer_function(trans).visit_statement(stmt, loc);
-    }
-
-    fn terminator_effect(&self, trans: &mut GenKillSet<Local>, loc: Location) {
-        let terminator = self.body[loc.block].terminator();
-        self.transfer_function(trans).visit_terminator(terminator, loc);
-    }
-
-    fn propagate_call_return(
-        &self,
-        _in_out: &mut BitSet<Local>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
-        _dest_place: &mir::Place<'tcx>,
-    ) {
-        // Nothing to do when a call returns successfully
-    }
-}
-
-impl<'mir, 'tcx> dataflow::BottomValue for IndirectlyMutableLocals<'mir, 'tcx> {
-    // bottom = unborrowed
-    const BOTTOM_VALUE: bool = false;
-}
-
-/// A `Visitor` that defines the transfer function for `IndirectlyMutableLocals`.
-struct TransferFunction<'a, 'mir, 'tcx> {
-    trans: &'a mut GenKillSet<Local>,
-    body: &'mir mir::Body<'tcx>,
-    tcx: TyCtxt<'tcx>,
-    param_env: ty::ParamEnv<'tcx>,
-}
-
-impl<'tcx> TransferFunction<'_, '_, 'tcx> {
-    /// Returns `true` if this borrow would allow mutation of the `borrowed_place`.
-    fn borrow_allows_mutation(
-        &self,
-        kind: mir::BorrowKind,
-        borrowed_place: &mir::Place<'tcx>,
-    ) -> bool {
-        match kind {
-            mir::BorrowKind::Mut { .. } => true,
-
-            mir::BorrowKind::Shared | mir::BorrowKind::Shallow | mir::BorrowKind::Unique => {
-                !borrowed_place.ty(self.body, self.tcx).ty.is_freeze(
-                    self.tcx,
-                    self.param_env,
-                    DUMMY_SP,
-                )
-            }
-        }
-    }
-}
-
-impl<'tcx> Visitor<'tcx> for TransferFunction<'_, '_, 'tcx> {
-    fn visit_rvalue(&mut self, rvalue: &mir::Rvalue<'tcx>, location: Location) {
-        if let mir::Rvalue::Ref(_, kind, ref borrowed_place) = *rvalue {
-            if self.borrow_allows_mutation(kind, borrowed_place) {
-                if !borrowed_place.is_indirect() {
-                    self.trans.gen(borrowed_place.local);
-                }
-            }
-        }
-
-        self.super_rvalue(rvalue, location);
-    }
-
-    fn visit_terminator(&mut self, terminator: &mir::Terminator<'tcx>, location: Location) {
-        // This method purposely does nothing except call `super_terminator`. It exists solely to
-        // document the subtleties around drop terminators.
-
-        self.super_terminator(terminator, location);
-
-        if let mir::TerminatorKind::Drop { location: _, .. }
-        | mir::TerminatorKind::DropAndReplace { location: _, .. } = &terminator.kind
-        {
-            // Although drop terminators mutably borrow the location being dropped, that borrow
-            // cannot live beyond the drop terminator because the dropped location is invalidated.
-        }
-    }
-}
diff --git a/src/librustc_mir/dataflow/impls/mod.rs b/src/librustc_mir/dataflow/impls/mod.rs
index 6b66406338..87d8e9e411 100644
--- a/src/librustc_mir/dataflow/impls/mod.rs
+++ b/src/librustc_mir/dataflow/impls/mod.rs
@@ -3,7 +3,8 @@
 //! zero-sized structure.
 
 use rustc::mir::{self, Body, Location};
-use rustc::ty::TyCtxt;
+use rustc::ty::layout::VariantIdx;
+use rustc::ty::{self, TyCtxt};
 use rustc_index::bit_set::BitSet;
 use rustc_index::vec::Idx;
 
@@ -11,19 +12,19 @@ use super::MoveDataParamEnv;
 
 use crate::util::elaborate_drops::DropFlagState;
 
-use super::move_paths::{HasMoveData, InitIndex, InitKind, MoveData, MovePathIndex};
-use super::{BitDenotation, BottomValue, GenKillSet};
+use super::generic::{AnalysisDomain, GenKill, GenKillAnalysis};
+use super::move_paths::{HasMoveData, InitIndex, InitKind, LookupResult, MoveData, MovePathIndex};
+use super::BottomValue;
 
 use super::drop_flag_effects_for_function_entry;
 use super::drop_flag_effects_for_location;
 use super::on_lookup_result_bits;
+use crate::dataflow::drop_flag_effects;
 
 mod borrowed_locals;
-mod indirect_mutation;
 mod storage_liveness;
 
 pub use self::borrowed_locals::*;
-pub use self::indirect_mutation::IndirectlyMutableLocals;
 pub use self::storage_liveness::*;
 
 pub(super) mod borrows;
@@ -216,6 +217,7 @@ impl<'a, 'tcx> HasMoveData<'tcx> for DefinitelyInitializedPlaces<'a, 'tcx> {
 /// }
 /// ```
 pub struct EverInitializedPlaces<'a, 'tcx> {
+    #[allow(dead_code)]
     tcx: TyCtxt<'tcx>,
     body: &'a Body<'tcx>,
     mdpe: &'a MoveDataParamEnv<'tcx>,
@@ -235,7 +237,7 @@ impl<'a, 'tcx> HasMoveData<'tcx> for EverInitializedPlaces<'a, 'tcx> {
 
 impl<'a, 'tcx> MaybeInitializedPlaces<'a, 'tcx> {
     fn update_bits(
-        trans: &mut GenKillSet<MovePathIndex>,
+        trans: &mut impl GenKill<MovePathIndex>,
         path: MovePathIndex,
         state: DropFlagState,
     ) {
@@ -248,7 +250,7 @@ impl<'a, 'tcx> MaybeInitializedPlaces<'a, 'tcx> {
 
 impl<'a, 'tcx> MaybeUninitializedPlaces<'a, 'tcx> {
     fn update_bits(
-        trans: &mut GenKillSet<MovePathIndex>,
+        trans: &mut impl GenKill<MovePathIndex>,
         path: MovePathIndex,
         state: DropFlagState,
     ) {
@@ -261,7 +263,7 @@ impl<'a, 'tcx> MaybeUninitializedPlaces<'a, 'tcx> {
 
 impl<'a, 'tcx> DefinitelyInitializedPlaces<'a, 'tcx> {
     fn update_bits(
-        trans: &mut GenKillSet<MovePathIndex>,
+        trans: &mut impl GenKill<MovePathIndex>,
         path: MovePathIndex,
         state: DropFlagState,
     ) {
@@ -272,39 +274,56 @@ impl<'a, 'tcx> DefinitelyInitializedPlaces<'a, 'tcx> {
     }
 }
 
-impl<'a, 'tcx> BitDenotation<'tcx> for MaybeInitializedPlaces<'a, 'tcx> {
+impl<'tcx> AnalysisDomain<'tcx> for MaybeInitializedPlaces<'_, 'tcx> {
     type Idx = MovePathIndex;
-    fn name() -> &'static str {
-        "maybe_init"
-    }
-    fn bits_per_block(&self) -> usize {
+
+    const NAME: &'static str = "maybe_init";
+
+    fn bits_per_block(&self, _: &mir::Body<'tcx>) -> usize {
         self.move_data().move_paths.len()
     }
 
-    fn start_block_effect(&self, entry_set: &mut BitSet<MovePathIndex>) {
+    fn initialize_start_block(&self, _: &mir::Body<'tcx>, state: &mut BitSet<Self::Idx>) {
         drop_flag_effects_for_function_entry(self.tcx, self.body, self.mdpe, |path, s| {
             assert!(s == DropFlagState::Present);
-            entry_set.insert(path);
+            state.insert(path);
         });
     }
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn pretty_print_idx(&self, w: &mut impl std::io::Write, mpi: Self::Idx) -> std::io::Result<()> {
+        write!(w, "{}", self.move_data().move_paths[mpi])
+    }
+}
+
+impl<'tcx> GenKillAnalysis<'tcx> for MaybeInitializedPlaces<'_, 'tcx> {
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _statement: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
         drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
             Self::update_bits(trans, path, s)
         })
     }
 
-    fn terminator_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    ) {
         drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
             Self::update_bits(trans, path, s)
         })
     }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        in_out: &mut BitSet<MovePathIndex>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
+        trans: &mut impl GenKill<Self::Idx>,
+        _block: mir::BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
         dest_place: &mir::Place<'tcx>,
     ) {
         // when a call returns successfully, that means we need to set
@@ -315,50 +334,98 @@ impl<'a, 'tcx> BitDenotation<'tcx> for MaybeInitializedPlaces<'a, 'tcx> {
             self.move_data(),
             self.move_data().rev_lookup.find(dest_place.as_ref()),
             |mpi| {
-                in_out.insert(mpi);
+                trans.gen(mpi);
             },
         );
     }
+
+    fn discriminant_switch_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _block: mir::BasicBlock,
+        enum_place: &mir::Place<'tcx>,
+        _adt: &ty::AdtDef,
+        variant: VariantIdx,
+    ) {
+        let enum_mpi = match self.move_data().rev_lookup.find(enum_place.as_ref()) {
+            LookupResult::Exact(mpi) => mpi,
+            LookupResult::Parent(_) => return,
+        };
+
+        // Kill all move paths that correspond to variants other than this one
+        let move_paths = &self.move_data().move_paths;
+        let enum_path = &move_paths[enum_mpi];
+        for (mpi, variant_path) in enum_path.children(move_paths) {
+            trans.kill(mpi);
+            match variant_path.place.projection.last().unwrap() {
+                mir::ProjectionElem::Downcast(_, idx) if *idx == variant => continue,
+                _ => drop_flag_effects::on_all_children_bits(
+                    self.tcx,
+                    self.body,
+                    self.move_data(),
+                    mpi,
+                    |mpi| trans.kill(mpi),
+                ),
+            }
+        }
+    }
 }
 
-impl<'a, 'tcx> BitDenotation<'tcx> for MaybeUninitializedPlaces<'a, 'tcx> {
+impl<'tcx> AnalysisDomain<'tcx> for MaybeUninitializedPlaces<'_, 'tcx> {
     type Idx = MovePathIndex;
-    fn name() -> &'static str {
-        "maybe_uninit"
-    }
-    fn bits_per_block(&self) -> usize {
+
+    const NAME: &'static str = "maybe_uninit";
+
+    fn bits_per_block(&self, _: &mir::Body<'tcx>) -> usize {
         self.move_data().move_paths.len()
     }
 
     // sets on_entry bits for Arg places
-    fn start_block_effect(&self, entry_set: &mut BitSet<MovePathIndex>) {
+    fn initialize_start_block(&self, body: &mir::Body<'tcx>, state: &mut BitSet<Self::Idx>) {
         // set all bits to 1 (uninit) before gathering counterevidence
-        assert!(self.bits_per_block() == entry_set.domain_size());
-        entry_set.insert_all();
+        assert!(self.bits_per_block(body) == state.domain_size());
+        state.insert_all();
 
         drop_flag_effects_for_function_entry(self.tcx, self.body, self.mdpe, |path, s| {
             assert!(s == DropFlagState::Present);
-            entry_set.remove(path);
+            state.remove(path);
         });
     }
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn pretty_print_idx(&self, w: &mut impl std::io::Write, mpi: Self::Idx) -> std::io::Result<()> {
+        write!(w, "{}", self.move_data().move_paths[mpi])
+    }
+}
+
+impl<'tcx> GenKillAnalysis<'tcx> for MaybeUninitializedPlaces<'_, 'tcx> {
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _statement: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
         drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
             Self::update_bits(trans, path, s)
         })
     }
 
-    fn terminator_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    ) {
         drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
             Self::update_bits(trans, path, s)
         })
     }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        in_out: &mut BitSet<MovePathIndex>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
+        trans: &mut impl GenKill<Self::Idx>,
+        _block: mir::BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
         dest_place: &mir::Place<'tcx>,
     ) {
         // when a call returns successfully, that means we need to set
@@ -369,48 +436,65 @@ impl<'a, 'tcx> BitDenotation<'tcx> for MaybeUninitializedPlaces<'a, 'tcx> {
             self.move_data(),
             self.move_data().rev_lookup.find(dest_place.as_ref()),
             |mpi| {
-                in_out.remove(mpi);
+                trans.kill(mpi);
             },
         );
     }
 }
 
-impl<'a, 'tcx> BitDenotation<'tcx> for DefinitelyInitializedPlaces<'a, 'tcx> {
+impl<'a, 'tcx> AnalysisDomain<'tcx> for DefinitelyInitializedPlaces<'a, 'tcx> {
     type Idx = MovePathIndex;
-    fn name() -> &'static str {
-        "definite_init"
-    }
-    fn bits_per_block(&self) -> usize {
+
+    const NAME: &'static str = "definite_init";
+
+    fn bits_per_block(&self, _: &mir::Body<'tcx>) -> usize {
         self.move_data().move_paths.len()
     }
 
     // sets on_entry bits for Arg places
-    fn start_block_effect(&self, entry_set: &mut BitSet<MovePathIndex>) {
-        entry_set.clear();
+    fn initialize_start_block(&self, _: &mir::Body<'tcx>, state: &mut BitSet<Self::Idx>) {
+        state.clear();
 
         drop_flag_effects_for_function_entry(self.tcx, self.body, self.mdpe, |path, s| {
             assert!(s == DropFlagState::Present);
-            entry_set.insert(path);
+            state.insert(path);
         });
     }
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn pretty_print_idx(&self, w: &mut impl std::io::Write, mpi: Self::Idx) -> std::io::Result<()> {
+        write!(w, "{}", self.move_data().move_paths[mpi])
+    }
+}
+
+impl<'tcx> GenKillAnalysis<'tcx> for DefinitelyInitializedPlaces<'_, 'tcx> {
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _statement: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
         drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
             Self::update_bits(trans, path, s)
         })
     }
 
-    fn terminator_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    ) {
         drop_flag_effects_for_location(self.tcx, self.body, self.mdpe, location, |path, s| {
             Self::update_bits(trans, path, s)
         })
     }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        in_out: &mut BitSet<MovePathIndex>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
+        trans: &mut impl GenKill<Self::Idx>,
+        _block: mir::BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
         dest_place: &mir::Place<'tcx>,
     ) {
         // when a call returns successfully, that means we need to set
@@ -421,30 +505,36 @@ impl<'a, 'tcx> BitDenotation<'tcx> for DefinitelyInitializedPlaces<'a, 'tcx> {
             self.move_data(),
             self.move_data().rev_lookup.find(dest_place.as_ref()),
             |mpi| {
-                in_out.insert(mpi);
+                trans.gen(mpi);
             },
         );
     }
 }
 
-impl<'a, 'tcx> BitDenotation<'tcx> for EverInitializedPlaces<'a, 'tcx> {
+impl<'tcx> AnalysisDomain<'tcx> for EverInitializedPlaces<'_, 'tcx> {
     type Idx = InitIndex;
-    fn name() -> &'static str {
-        "ever_init"
-    }
-    fn bits_per_block(&self) -> usize {
+
+    const NAME: &'static str = "ever_init";
+
+    fn bits_per_block(&self, _: &mir::Body<'tcx>) -> usize {
         self.move_data().inits.len()
     }
 
-    fn start_block_effect(&self, entry_set: &mut BitSet<InitIndex>) {
-        for arg_init in 0..self.body.arg_count {
-            entry_set.insert(InitIndex::new(arg_init));
+    fn initialize_start_block(&self, body: &mir::Body<'tcx>, state: &mut BitSet<Self::Idx>) {
+        for arg_init in 0..body.arg_count {
+            state.insert(InitIndex::new(arg_init));
         }
     }
+}
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
-        let (_, body, move_data) = (self.tcx, self.body, self.move_data());
-        let stmt = &body[location.block].statements[location.statement_index];
+impl<'tcx> GenKillAnalysis<'tcx> for EverInitializedPlaces<'_, 'tcx> {
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        stmt: &mir::Statement<'tcx>,
+        location: Location,
+    ) {
+        let move_data = self.move_data();
         let init_path_map = &move_data.init_path_map;
         let init_loc_map = &move_data.init_loc_map;
         let rev_lookup = &move_data.rev_lookup;
@@ -453,7 +543,7 @@ impl<'a, 'tcx> BitDenotation<'tcx> for EverInitializedPlaces<'a, 'tcx> {
             "statement {:?} at loc {:?} initializes move_indexes {:?}",
             stmt, location, &init_loc_map[location]
         );
-        trans.gen_all(&init_loc_map[location]);
+        trans.gen_all(init_loc_map[location].iter().copied());
 
         match stmt.kind {
             mir::StatementKind::StorageDead(local) => {
@@ -464,13 +554,18 @@ impl<'a, 'tcx> BitDenotation<'tcx> for EverInitializedPlaces<'a, 'tcx> {
                     "stmt {:?} at loc {:?} clears the ever initialized status of {:?}",
                     stmt, location, &init_path_map[move_path_index]
                 );
-                trans.kill_all(&init_path_map[move_path_index]);
+                trans.kill_all(init_path_map[move_path_index].iter().copied());
             }
             _ => {}
         }
     }
 
-    fn terminator_effect(&self, trans: &mut GenKillSet<Self::Idx>, location: Location) {
+    fn terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _terminator: &mir::Terminator<'tcx>,
+        location: Location,
+    ) {
         let (body, move_data) = (self.body, self.move_data());
         let term = body[location.block].terminator();
         let init_loc_map = &move_data.init_loc_map;
@@ -479,28 +574,29 @@ impl<'a, 'tcx> BitDenotation<'tcx> for EverInitializedPlaces<'a, 'tcx> {
             term, location, &init_loc_map[location]
         );
         trans.gen_all(
-            init_loc_map[location].iter().filter(|init_index| {
-                move_data.inits[**init_index].kind != InitKind::NonPanicPathOnly
-            }),
+            init_loc_map[location]
+                .iter()
+                .filter(|init_index| {
+                    move_data.inits[**init_index].kind != InitKind::NonPanicPathOnly
+                })
+                .copied(),
         );
     }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        in_out: &mut BitSet<InitIndex>,
-        call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
+        trans: &mut impl GenKill<Self::Idx>,
+        block: mir::BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
         _dest_place: &mir::Place<'tcx>,
     ) {
         let move_data = self.move_data();
-        let bits_per_block = self.bits_per_block();
         let init_loc_map = &move_data.init_loc_map;
 
-        let call_loc =
-            Location { block: call_bb, statement_index: self.body[call_bb].statements.len() };
+        let call_loc = self.body.terminator_loc(block);
         for init_index in &init_loc_map[call_loc] {
-            assert!(init_index.index() < bits_per_block);
-            in_out.insert(*init_index);
+            trans.gen(*init_index);
         }
     }
 }
diff --git a/src/librustc_mir/dataflow/impls/storage_liveness.rs b/src/librustc_mir/dataflow/impls/storage_liveness.rs
index 6a48d1e980..fabe562e68 100644
--- a/src/librustc_mir/dataflow/impls/storage_liveness.rs
+++ b/src/librustc_mir/dataflow/impls/storage_liveness.rs
@@ -1,45 +1,39 @@
 pub use super::*;
 
-use crate::dataflow::BitDenotation;
-use crate::dataflow::HaveBeenBorrowedLocals;
-use crate::dataflow::{DataflowResults, DataflowResultsCursor, DataflowResultsRefCursor};
+use crate::dataflow::generic::{self as dataflow, GenKill, Results, ResultsRefCursor};
+use crate::dataflow::BottomValue;
 use rustc::mir::visit::{NonMutatingUseContext, PlaceContext, Visitor};
 use rustc::mir::*;
 use std::cell::RefCell;
 
 #[derive(Copy, Clone)]
-pub struct MaybeStorageLive<'a, 'tcx> {
-    body: &'a Body<'tcx>,
-}
+pub struct MaybeStorageLive;
 
-impl<'a, 'tcx> MaybeStorageLive<'a, 'tcx> {
-    pub fn new(body: &'a Body<'tcx>) -> Self {
-        MaybeStorageLive { body }
-    }
+impl dataflow::AnalysisDomain<'tcx> for MaybeStorageLive {
+    type Idx = Local;
 
-    pub fn body(&self) -> &Body<'tcx> {
-        self.body
-    }
-}
+    const NAME: &'static str = "maybe_storage_live";
 
-impl<'a, 'tcx> BitDenotation<'tcx> for MaybeStorageLive<'a, 'tcx> {
-    type Idx = Local;
-    fn name() -> &'static str {
-        "maybe_storage_live"
-    }
-    fn bits_per_block(&self) -> usize {
-        self.body.local_decls.len()
+    fn bits_per_block(&self, body: &mir::Body<'tcx>) -> usize {
+        body.local_decls.len()
     }
 
-    fn start_block_effect(&self, _on_entry: &mut BitSet<Local>) {
-        // Nothing is live on function entry (generators only have a self
-        // argument, and we don't care about that)
-        assert_eq!(1, self.body.arg_count);
+    fn initialize_start_block(&self, body: &mir::Body<'tcx>, on_entry: &mut BitSet<Self::Idx>) {
+        // The resume argument is live on function entry (we don't care about
+        // the `self` argument)
+        for arg in body.args_iter().skip(1) {
+            on_entry.insert(arg);
+        }
     }
+}
 
-    fn statement_effect(&self, trans: &mut GenKillSet<Local>, loc: Location) {
-        let stmt = &self.body[loc.block].statements[loc.statement_index];
-
+impl dataflow::GenKillAnalysis<'tcx> for MaybeStorageLive {
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        stmt: &mir::Statement<'tcx>,
+        _: Location,
+    ) {
         match stmt.kind {
             StatementKind::StorageLive(l) => trans.gen(l),
             StatementKind::StorageDead(l) => trans.kill(l),
@@ -47,162 +41,225 @@ impl<'a, 'tcx> BitDenotation<'tcx> for MaybeStorageLive<'a, 'tcx> {
         }
     }
 
-    fn terminator_effect(&self, _trans: &mut GenKillSet<Local>, _loc: Location) {
+    fn terminator_effect(
+        &self,
+        _trans: &mut impl GenKill<Self::Idx>,
+        _: &mir::Terminator<'tcx>,
+        _: Location,
+    ) {
         // Terminators have no effect
     }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        _in_out: &mut BitSet<Local>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
-        _dest_place: &mir::Place<'tcx>,
+        _trans: &mut impl GenKill<Self::Idx>,
+        _block: BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
+        _return_place: &mir::Place<'tcx>,
     ) {
         // Nothing to do when a call returns successfully
     }
 }
 
-impl<'a, 'tcx> BottomValue for MaybeStorageLive<'a, 'tcx> {
+impl BottomValue for MaybeStorageLive {
     /// bottom = dead
     const BOTTOM_VALUE: bool = false;
 }
 
+type BorrowedLocalsResults<'a, 'tcx> = ResultsRefCursor<'a, 'a, 'tcx, MaybeBorrowedLocals>;
+
 /// Dataflow analysis that determines whether each local requires storage at a
 /// given location; i.e. whether its storage can go away without being observed.
-pub struct RequiresStorage<'mir, 'tcx> {
+pub struct MaybeRequiresStorage<'mir, 'tcx> {
     body: ReadOnlyBodyAndCache<'mir, 'tcx>,
-    borrowed_locals:
-        RefCell<DataflowResultsRefCursor<'mir, 'tcx, HaveBeenBorrowedLocals<'mir, 'tcx>>>,
+    borrowed_locals: RefCell<BorrowedLocalsResults<'mir, 'tcx>>,
 }
 
-impl<'mir, 'tcx: 'mir> RequiresStorage<'mir, 'tcx> {
+impl<'mir, 'tcx> MaybeRequiresStorage<'mir, 'tcx> {
     pub fn new(
         body: ReadOnlyBodyAndCache<'mir, 'tcx>,
-        borrowed_locals: &'mir DataflowResults<'tcx, HaveBeenBorrowedLocals<'mir, 'tcx>>,
+        borrowed_locals: &'mir Results<'tcx, MaybeBorrowedLocals>,
     ) -> Self {
-        RequiresStorage {
+        MaybeRequiresStorage {
             body,
-            borrowed_locals: RefCell::new(DataflowResultsCursor::new(borrowed_locals, *body)),
+            borrowed_locals: RefCell::new(ResultsRefCursor::new(*body, borrowed_locals)),
         }
     }
-
-    pub fn body(&self) -> &Body<'tcx> {
-        &self.body
-    }
 }
 
-impl<'mir, 'tcx> BitDenotation<'tcx> for RequiresStorage<'mir, 'tcx> {
+impl<'mir, 'tcx> dataflow::AnalysisDomain<'tcx> for MaybeRequiresStorage<'mir, 'tcx> {
     type Idx = Local;
-    fn name() -> &'static str {
-        "requires_storage"
-    }
-    fn bits_per_block(&self) -> usize {
-        self.body.local_decls.len()
+
+    const NAME: &'static str = "requires_storage";
+
+    fn bits_per_block(&self, body: &mir::Body<'tcx>) -> usize {
+        body.local_decls.len()
     }
 
-    fn start_block_effect(&self, _sets: &mut BitSet<Local>) {
-        // Nothing is live on function entry (generators only have a self
-        // argument, and we don't care about that)
-        assert_eq!(1, self.body.arg_count);
+    fn initialize_start_block(&self, body: &mir::Body<'tcx>, on_entry: &mut BitSet<Self::Idx>) {
+        // The resume argument is live on function entry (we don't care about
+        // the `self` argument)
+        for arg in body.args_iter().skip(1) {
+            on_entry.insert(arg);
+        }
     }
+}
 
-    fn before_statement_effect(&self, sets: &mut GenKillSet<Self::Idx>, loc: Location) {
-        // If we borrow or assign to a place then it needs storage for that
-        // statement.
-        self.check_for_borrow(sets, loc);
+impl<'mir, 'tcx> dataflow::GenKillAnalysis<'tcx> for MaybeRequiresStorage<'mir, 'tcx> {
+    fn before_statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        stmt: &mir::Statement<'tcx>,
+        loc: Location,
+    ) {
+        // If a place is borrowed in a statement, it needs storage for that statement.
+        self.borrowed_locals.borrow().analysis().statement_effect(trans, stmt, loc);
 
-        let stmt = &self.body[loc.block].statements[loc.statement_index];
-        match stmt.kind {
-            StatementKind::StorageDead(l) => sets.kill(l),
-            StatementKind::Assign(box (ref place, _))
-            | StatementKind::SetDiscriminant { box ref place, .. } => {
-                sets.gen(place.local);
+        match &stmt.kind {
+            StatementKind::StorageDead(l) => trans.kill(*l),
+
+            // If a place is assigned to in a statement, it needs storage for that statement.
+            StatementKind::Assign(box (place, _))
+            | StatementKind::SetDiscriminant { box place, .. } => {
+                trans.gen(place.local);
             }
-            StatementKind::InlineAsm(box InlineAsm { ref outputs, .. }) => {
-                for place in &**outputs {
-                    sets.gen(place.local);
+            StatementKind::InlineAsm(asm) => {
+                for place in &*asm.outputs {
+                    trans.gen(place.local);
                 }
             }
-            _ => (),
+
+            // Nothing to do for these. Match exhaustively so this fails to compile when new
+            // variants are added.
+            StatementKind::AscribeUserType(..)
+            | StatementKind::FakeRead(..)
+            | StatementKind::Nop
+            | StatementKind::Retag(..)
+            | StatementKind::StorageLive(..) => {}
         }
     }
 
-    fn statement_effect(&self, sets: &mut GenKillSet<Local>, loc: Location) {
+    fn statement_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        _: &mir::Statement<'tcx>,
+        loc: Location,
+    ) {
         // If we move from a place then only stops needing storage *after*
         // that statement.
-        self.check_for_move(sets, loc);
+        self.check_for_move(trans, loc);
     }
 
-    fn before_terminator_effect(&self, sets: &mut GenKillSet<Local>, loc: Location) {
-        self.check_for_borrow(sets, loc);
+    fn before_terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        terminator: &mir::Terminator<'tcx>,
+        loc: Location,
+    ) {
+        // If a place is borrowed in a terminator, it needs storage for that terminator.
+        self.borrowed_locals.borrow().analysis().terminator_effect(trans, terminator, loc);
 
-        if let TerminatorKind::Call { destination: Some((Place { local, .. }, _)), .. } =
-            self.body[loc.block].terminator().kind
-        {
-            sets.gen(local);
+        match &terminator.kind {
+            TerminatorKind::Call { destination: Some((place, _)), .. }
+            | TerminatorKind::Yield { resume_arg: place, .. } => {
+                trans.gen(place.local);
+            }
+
+            // Nothing to do for these. Match exhaustively so this fails to compile when new
+            // variants are added.
+            TerminatorKind::Call { destination: None, .. }
+            | TerminatorKind::Abort
+            | TerminatorKind::Assert { .. }
+            | TerminatorKind::Drop { .. }
+            | TerminatorKind::DropAndReplace { .. }
+            | TerminatorKind::FalseEdges { .. }
+            | TerminatorKind::FalseUnwind { .. }
+            | TerminatorKind::GeneratorDrop
+            | TerminatorKind::Goto { .. }
+            | TerminatorKind::Resume
+            | TerminatorKind::Return
+            | TerminatorKind::SwitchInt { .. }
+            | TerminatorKind::Unreachable => {}
         }
     }
 
-    fn terminator_effect(&self, sets: &mut GenKillSet<Local>, loc: Location) {
-        // For call terminators the destination requires storage for the call
-        // and after the call returns successfully, but not after a panic.
-        // Since `propagate_call_unwind` doesn't exist, we have to kill the
-        // destination here, and then gen it again in `propagate_call_return`.
-        if let TerminatorKind::Call { destination: Some((ref place, _)), .. } =
-            self.body[loc.block].terminator().kind
-        {
-            if let Some(local) = place.as_local() {
-                sets.kill(local);
+    fn terminator_effect(
+        &self,
+        trans: &mut impl GenKill<Self::Idx>,
+        terminator: &mir::Terminator<'tcx>,
+        loc: Location,
+    ) {
+        match &terminator.kind {
+            // For call terminators the destination requires storage for the call
+            // and after the call returns successfully, but not after a panic.
+            // Since `propagate_call_unwind` doesn't exist, we have to kill the
+            // destination here, and then gen it again in `call_return_effect`.
+            TerminatorKind::Call { destination: Some((place, _)), .. } => {
+                trans.kill(place.local);
             }
+
+            // Nothing to do for these. Match exhaustively so this fails to compile when new
+            // variants are added.
+            TerminatorKind::Call { destination: None, .. }
+            | TerminatorKind::Yield { .. }
+            | TerminatorKind::Abort
+            | TerminatorKind::Assert { .. }
+            | TerminatorKind::Drop { .. }
+            | TerminatorKind::DropAndReplace { .. }
+            | TerminatorKind::FalseEdges { .. }
+            | TerminatorKind::FalseUnwind { .. }
+            | TerminatorKind::GeneratorDrop
+            | TerminatorKind::Goto { .. }
+            | TerminatorKind::Resume
+            | TerminatorKind::Return
+            | TerminatorKind::SwitchInt { .. }
+            | TerminatorKind::Unreachable => {}
         }
-        self.check_for_move(sets, loc);
+
+        self.check_for_move(trans, loc);
     }
 
-    fn propagate_call_return(
+    fn call_return_effect(
         &self,
-        in_out: &mut BitSet<Local>,
-        _call_bb: mir::BasicBlock,
-        _dest_bb: mir::BasicBlock,
-        dest_place: &mir::Place<'tcx>,
+        trans: &mut impl GenKill<Self::Idx>,
+        _block: BasicBlock,
+        _func: &mir::Operand<'tcx>,
+        _args: &[mir::Operand<'tcx>],
+        return_place: &mir::Place<'tcx>,
     ) {
-        in_out.insert(dest_place.local);
+        trans.gen(return_place.local);
     }
 }
 
-impl<'mir, 'tcx> RequiresStorage<'mir, 'tcx> {
+impl<'mir, 'tcx> MaybeRequiresStorage<'mir, 'tcx> {
     /// Kill locals that are fully moved and have not been borrowed.
-    fn check_for_move(&self, sets: &mut GenKillSet<Local>, loc: Location) {
-        let mut visitor = MoveVisitor { sets, borrowed_locals: &self.borrowed_locals };
+    fn check_for_move(&self, trans: &mut impl GenKill<Local>, loc: Location) {
+        let mut visitor = MoveVisitor { trans, borrowed_locals: &self.borrowed_locals };
         visitor.visit_location(self.body, loc);
     }
-
-    /// Gen locals that are newly borrowed. This includes borrowing any part of
-    /// a local (we rely on this behavior of `HaveBeenBorrowedLocals`).
-    fn check_for_borrow(&self, sets: &mut GenKillSet<Local>, loc: Location) {
-        let mut borrowed_locals = self.borrowed_locals.borrow_mut();
-        borrowed_locals.seek(loc);
-        borrowed_locals.each_gen_bit(|l| sets.gen(l));
-    }
 }
 
-impl<'mir, 'tcx> BottomValue for RequiresStorage<'mir, 'tcx> {
+impl<'mir, 'tcx> BottomValue for MaybeRequiresStorage<'mir, 'tcx> {
     /// bottom = dead
     const BOTTOM_VALUE: bool = false;
 }
 
-struct MoveVisitor<'a, 'mir, 'tcx> {
-    borrowed_locals:
-        &'a RefCell<DataflowResultsRefCursor<'mir, 'tcx, HaveBeenBorrowedLocals<'mir, 'tcx>>>,
-    sets: &'a mut GenKillSet<Local>,
+struct MoveVisitor<'a, 'mir, 'tcx, T> {
+    borrowed_locals: &'a RefCell<BorrowedLocalsResults<'mir, 'tcx>>,
+    trans: &'a mut T,
 }
 
-impl<'a, 'mir: 'a, 'tcx> Visitor<'tcx> for MoveVisitor<'a, 'mir, 'tcx> {
+impl<'a, 'mir, 'tcx, T> Visitor<'tcx> for MoveVisitor<'a, 'mir, 'tcx, T>
+where
+    T: GenKill<Local>,
+{
     fn visit_local(&mut self, local: &Local, context: PlaceContext, loc: Location) {
         if PlaceContext::NonMutatingUse(NonMutatingUseContext::Move) == context {
             let mut borrowed_locals = self.borrowed_locals.borrow_mut();
-            borrowed_locals.seek(loc);
+            borrowed_locals.seek_before(loc);
             if !borrowed_locals.contains(*local) {
-                self.sets.kill(*local);
+                self.trans.kill(*local);
             }
         }
     }
diff --git a/src/librustc_mir/dataflow/mod.rs b/src/librustc_mir/dataflow/mod.rs
index e29730f267..b4e33b9502 100644
--- a/src/librustc_mir/dataflow/mod.rs
+++ b/src/librustc_mir/dataflow/mod.rs
@@ -1,6 +1,6 @@
+use rustc_ast::ast::{self, MetaItem};
+use rustc_ast_pretty::pprust;
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast::{self, MetaItem};
-use syntax::print::pprust;
 
 use rustc_data_structures::work_queue::WorkQueue;
 use rustc_index::bit_set::{BitSet, HybridBitSet};
@@ -16,17 +16,15 @@ use std::borrow::Borrow;
 use std::fmt;
 use std::io;
 use std::path::PathBuf;
-use std::usize;
 
 pub use self::at_location::{FlowAtLocation, FlowsAtLocation};
 pub(crate) use self::drop_flag_effects::*;
 pub use self::impls::borrows::Borrows;
 pub use self::impls::DefinitelyInitializedPlaces;
 pub use self::impls::EverInitializedPlaces;
-pub use self::impls::HaveBeenBorrowedLocals;
-pub use self::impls::IndirectlyMutableLocals;
+pub use self::impls::{MaybeBorrowedLocals, MaybeMutBorrowedLocals};
 pub use self::impls::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
-pub use self::impls::{MaybeStorageLive, RequiresStorage};
+pub use self::impls::{MaybeRequiresStorage, MaybeStorageLive};
 
 use self::move_paths::MoveData;
 
@@ -690,11 +688,7 @@ pub trait BottomValue {
     /// 3. Override `join` to do the opposite from what it's doing now.
     #[inline]
     fn join<T: Idx>(&self, inout_set: &mut BitSet<T>, in_set: &BitSet<T>) -> bool {
-        if Self::BOTTOM_VALUE == false {
-            inout_set.union(in_set)
-        } else {
-            inout_set.intersect(in_set)
-        }
+        if !Self::BOTTOM_VALUE { inout_set.union(in_set) } else { inout_set.intersect(in_set) }
     }
 }
 
@@ -822,7 +816,7 @@ where
         let bits_per_block = denotation.bits_per_block();
         let num_blocks = body.basic_blocks().len();
 
-        let on_entry = if D::BOTTOM_VALUE == true {
+        let on_entry = if D::BOTTOM_VALUE {
             vec![BitSet::new_filled(bits_per_block); num_blocks]
         } else {
             vec![BitSet::new_empty(bits_per_block); num_blocks]
diff --git a/src/librustc_mir/dataflow/move_paths/builder.rs b/src/librustc_mir/dataflow/move_paths/builder.rs
index adba38d2a8..7c449ad119 100644
--- a/src/librustc_mir/dataflow/move_paths/builder.rs
+++ b/src/librustc_mir/dataflow/move_paths/builder.rs
@@ -109,7 +109,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
             let proj_base = &place.projection[..i];
             let body = self.builder.body;
             let tcx = self.builder.tcx;
-            let place_ty = Place::ty_from(&place.local, proj_base, body, tcx).ty;
+            let place_ty = Place::ty_from(place.local, proj_base, body, tcx).ty;
             match place_ty.kind {
                 ty::Ref(..) | ty::RawPtr(..) => {
                     let proj = &place.projection[..i + 1];
@@ -380,8 +380,10 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
                 self.gather_operand(discr);
             }
 
-            TerminatorKind::Yield { ref value, .. } => {
+            TerminatorKind::Yield { ref value, resume_arg: ref place, .. } => {
                 self.gather_operand(value);
+                self.create_move_path(place);
+                self.gather_init(place.as_ref(), InitKind::Deep);
             }
 
             TerminatorKind::Drop { ref location, target: _, unwind: _ } => {
@@ -472,7 +474,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
     }
 
     fn record_move(&mut self, place: &Place<'tcx>, path: MovePathIndex) {
-        let move_out = self.builder.data.moves.push(MoveOut { path: path, source: self.loc });
+        let move_out = self.builder.data.moves.push(MoveOut { path, source: self.loc });
         debug!(
             "gather_move({:?}, {:?}): adding move {:?} of {:?}",
             self.loc, place, move_out, path
@@ -481,7 +483,7 @@ impl<'b, 'a, 'tcx> Gatherer<'b, 'a, 'tcx> {
         self.builder.data.loc_map[self.loc].push(move_out);
     }
 
-    fn gather_init(&mut self, place: PlaceRef<'cx, 'tcx>, kind: InitKind) {
+    fn gather_init(&mut self, place: PlaceRef<'tcx>, kind: InitKind) {
         debug!("gather_init({:?}, {:?})", self.loc, place);
 
         let mut place = place;
diff --git a/src/librustc_mir/dataflow/move_paths/mod.rs b/src/librustc_mir/dataflow/move_paths/mod.rs
index a46465ab49..593952bfa7 100644
--- a/src/librustc_mir/dataflow/move_paths/mod.rs
+++ b/src/librustc_mir/dataflow/move_paths/mod.rs
@@ -58,19 +58,67 @@ pub struct MovePath<'tcx> {
 }
 
 impl<'tcx> MovePath<'tcx> {
-    pub fn parents(
+    /// Returns an iterator over the parents of `self`.
+    pub fn parents<'a>(
+        &self,
+        move_paths: &'a IndexVec<MovePathIndex, MovePath<'tcx>>,
+    ) -> impl 'a + Iterator<Item = (MovePathIndex, &'a MovePath<'tcx>)> {
+        let first = self.parent.map(|mpi| (mpi, &move_paths[mpi]));
+        MovePathLinearIter {
+            next: first,
+            fetch_next: move |_, parent: &MovePath<'_>| {
+                parent.parent.map(|mpi| (mpi, &move_paths[mpi]))
+            },
+        }
+    }
+
+    /// Returns an iterator over the immediate children of `self`.
+    pub fn children<'a>(
+        &self,
+        move_paths: &'a IndexVec<MovePathIndex, MovePath<'tcx>>,
+    ) -> impl 'a + Iterator<Item = (MovePathIndex, &'a MovePath<'tcx>)> {
+        let first = self.first_child.map(|mpi| (mpi, &move_paths[mpi]));
+        MovePathLinearIter {
+            next: first,
+            fetch_next: move |_, child: &MovePath<'_>| {
+                child.next_sibling.map(|mpi| (mpi, &move_paths[mpi]))
+            },
+        }
+    }
+
+    /// Finds the closest descendant of `self` for which `f` returns `true` using a breadth-first
+    /// search.
+    ///
+    /// `f` will **not** be called on `self`.
+    pub fn find_descendant(
         &self,
         move_paths: &IndexVec<MovePathIndex, MovePath<'_>>,
-    ) -> Vec<MovePathIndex> {
-        let mut parents = Vec::new();
+        f: impl Fn(MovePathIndex) -> bool,
+    ) -> Option<MovePathIndex> {
+        let mut todo = if let Some(child) = self.first_child {
+            vec![child]
+        } else {
+            return None;
+        };
+
+        while let Some(mpi) = todo.pop() {
+            if f(mpi) {
+                return Some(mpi);
+            }
+
+            let move_path = &move_paths[mpi];
+            if let Some(child) = move_path.first_child {
+                todo.push(child);
+            }
 
-        let mut curr_parent = self.parent;
-        while let Some(parent_mpi) = curr_parent {
-            parents.push(parent_mpi);
-            curr_parent = move_paths[parent_mpi].parent;
+            // After we've processed the original `mpi`, we should always
+            // traverse the siblings of any of its children.
+            if let Some(sibling) = move_path.next_sibling {
+                todo.push(sibling);
+            }
         }
 
-        parents
+        None
     }
 }
 
@@ -96,6 +144,25 @@ impl<'tcx> fmt::Display for MovePath<'tcx> {
     }
 }
 
+#[allow(unused)]
+struct MovePathLinearIter<'a, 'tcx, F> {
+    next: Option<(MovePathIndex, &'a MovePath<'tcx>)>,
+    fetch_next: F,
+}
+
+impl<'a, 'tcx, F> Iterator for MovePathLinearIter<'a, 'tcx, F>
+where
+    F: FnMut(MovePathIndex, &'a MovePath<'tcx>) -> Option<(MovePathIndex, &'a MovePath<'tcx>)>,
+{
+    type Item = (MovePathIndex, &'a MovePath<'tcx>);
+
+    fn next(&mut self) -> Option<Self::Item> {
+        let ret = self.next.take()?;
+        self.next = (self.fetch_next)(ret.0, ret.1);
+        Some(ret)
+    }
+}
+
 #[derive(Debug)]
 pub struct MoveData<'tcx> {
     pub move_paths: IndexVec<MovePathIndex, MovePath<'tcx>>,
@@ -245,8 +312,8 @@ impl MovePathLookup {
     // alternative will *not* create a MovePath on the fly for an
     // unknown place, but will rather return the nearest available
     // parent.
-    pub fn find(&self, place: PlaceRef<'_, '_>) -> LookupResult {
-        let mut result = self.locals[*place.local];
+    pub fn find(&self, place: PlaceRef<'_>) -> LookupResult {
+        let mut result = self.locals[place.local];
 
         for elem in place.projection.iter() {
             if let Some(&subpath) = self.projections.get(&(result, elem.lift())) {
@@ -333,4 +400,16 @@ impl<'tcx> MoveData<'tcx> {
             }
         }
     }
+
+    pub fn find_in_move_path_or_its_descendants(
+        &self,
+        root: MovePathIndex,
+        pred: impl Fn(MovePathIndex) -> bool,
+    ) -> Option<MovePathIndex> {
+        if pred(root) {
+            return Some(root);
+        }
+
+        self.move_paths[root].find_descendant(&self.move_paths, pred)
+    }
 }
diff --git a/src/librustc_mir/interpret/cast.rs b/src/librustc_mir/interpret/cast.rs
index 9461a06690..3cbb0667ff 100644
--- a/src/librustc_mir/interpret/cast.rs
+++ b/src/librustc_mir/interpret/cast.rs
@@ -1,8 +1,8 @@
 use rustc::ty::adjustment::PointerCast;
 use rustc::ty::layout::{self, Size, TyLayout};
 use rustc::ty::{self, Ty, TypeAndMut, TypeFoldable};
+use rustc_ast::ast::FloatTy;
 use rustc_span::symbol::sym;
-use syntax::ast::FloatTy;
 
 use rustc::mir::interpret::{InterpResult, PointerArithmetic, Scalar};
 use rustc::mir::CastKind;
@@ -202,7 +202,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
             Char => {
                 // `u8` to `char` cast
-                debug_assert_eq!(v as u8 as u128, v);
+                assert_eq!(v as u8 as u128, v);
                 Ok(Scalar::from_uint(v, Size::from_bytes(4)))
             }
 
diff --git a/src/librustc_mir/interpret/eval_context.rs b/src/librustc_mir/interpret/eval_context.rs
index 206d3d1567..9b28b7a20c 100644
--- a/src/librustc_mir/interpret/eval_context.rs
+++ b/src/librustc_mir/interpret/eval_context.rs
@@ -264,7 +264,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
     #[inline(always)]
     pub fn cur_frame(&self) -> usize {
-        assert!(self.stack.len() > 0);
+        assert!(!self.stack.is_empty());
         self.stack.len() - 1
     }
 
@@ -457,10 +457,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
                 // Check if this brought us over the size limit.
                 if size.bytes() >= self.tcx.data_layout().obj_size_bound() {
-                    throw_ub_format!(
-                        "wide pointer metadata contains invalid information: \
-                        total size is bigger than largest supported object"
-                    );
+                    throw_ub!(InvalidMeta("total size is bigger than largest supported object"));
                 }
                 Ok(Some((size, align)))
             }
@@ -476,10 +473,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
                 // Make sure the slice is not too big.
                 let size = elem.size.checked_mul(len, &*self.tcx).ok_or_else(|| {
-                    err_ub_format!(
-                        "invalid slice: \
-                        total size is bigger than largest supported object"
-                    )
+                    err_ub!(InvalidMeta("slice is bigger than largest supported object"))
                 })?;
                 Ok(Some((size, elem.align.abi)))
             }
@@ -505,7 +499,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         return_place: Option<PlaceTy<'tcx, M::PointerTag>>,
         return_to_block: StackPopCleanup,
     ) -> InterpResult<'tcx> {
-        if self.stack.len() > 0 {
+        if !self.stack.is_empty() {
             info!("PAUSING({}) {}", self.cur_frame(), self.frame().instance);
         }
         ::log_settings::settings().indentation += 1;
@@ -670,7 +664,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         );
         if cur_unwinding {
             // Follow the unwind edge.
-            let unwind = next_block.expect("Encounted StackPopCleanup::None when unwinding!");
+            let unwind = next_block.expect("Encountered StackPopCleanup::None when unwinding!");
             self.unwind_to_block(unwind);
         } else {
             // Follow the normal return edge.
@@ -685,7 +679,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                     // invariant -- that is, unless a function somehow has a ptr to
                     // its return place... but the way MIR is currently generated, the
                     // return place is always a local and then this cannot happen.
-                    self.validate_operand(self.place_to_op(return_place)?, vec![], None)?;
+                    self.validate_operand(self.place_to_op(return_place)?)?;
                 }
             } else {
                 // Uh, that shouldn't happen... the function did not intend to return
@@ -698,7 +692,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             }
         }
 
-        if self.stack.len() > 0 {
+        if !self.stack.is_empty() {
             info!(
                 "CONTINUING({}) {} (unwinding = {})",
                 self.cur_frame(),
@@ -756,6 +750,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
     pub(super) fn const_eval(
         &self,
         gid: GlobalId<'tcx>,
+        ty: Ty<'tcx>,
     ) -> InterpResult<'tcx, OpTy<'tcx, M::PointerTag>> {
         // For statics we pick `ParamEnv::reveal_all`, because statics don't have generics
         // and thus don't care about the parameter environment. While we could just use
@@ -767,17 +762,14 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         } else {
             self.param_env
         };
-        let val = if let Some(promoted) = gid.promoted {
-            self.tcx.const_eval_promoted(param_env, gid.instance, promoted)?
-        } else {
-            self.tcx.const_eval_instance(param_env, gid.instance, Some(self.tcx.span))?
-        };
+        let val = self.tcx.const_eval_global_id(param_env, gid, Some(self.tcx.span))?;
 
         // Even though `ecx.const_eval` is called from `eval_const_to_op` we can never have a
         // recursion deeper than one level, because the `tcx.const_eval` above is guaranteed to not
         // return `ConstValue::Unevaluated`, which is the only way that `eval_const_to_op` will call
         // `ecx.const_eval`.
-        self.eval_const_to_op(val, None)
+        let const_ = ty::Const { val: ty::ConstKind::Value(val), ty };
+        self.eval_const_to_op(&const_, None)
     }
 
     pub fn const_eval_raw(
diff --git a/src/librustc_mir/interpret/intern.rs b/src/librustc_mir/interpret/intern.rs
index 0c65b77a38..9b13db2289 100644
--- a/src/librustc_mir/interpret/intern.rs
+++ b/src/librustc_mir/interpret/intern.rs
@@ -9,7 +9,7 @@ use rustc::ty::{self, Ty};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 
-use syntax::ast::Mutability;
+use rustc_ast::ast::Mutability;
 
 use super::{AllocId, Allocation, InterpCx, MPlaceTy, Machine, MemoryKind, Scalar, ValueVisitor};
 
@@ -187,7 +187,7 @@ impl<'rt, 'mir, 'tcx, M: CompileTimeMachine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx
         self.walk_aggregate(mplace, fields)
     }
 
-    fn visit_primitive(&mut self, mplace: MPlaceTy<'tcx>) -> InterpResult<'tcx> {
+    fn visit_value(&mut self, mplace: MPlaceTy<'tcx>) -> InterpResult<'tcx> {
         // Handle Reference types, as these are the only relocations supported by const eval.
         // Raw pointers (and boxes) are handled by the `leftover_relocations` logic.
         let ty = mplace.layout.ty;
@@ -263,8 +263,11 @@ impl<'rt, 'mir, 'tcx, M: CompileTimeMachine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx
                     None => self.ref_tracking.track((mplace, mutability, mode), || ()),
                 }
             }
+            Ok(())
+        } else {
+            // Not a reference -- proceed recursively.
+            self.walk_value(mplace)
         }
-        Ok(())
     }
 }
 
@@ -326,12 +329,15 @@ pub fn intern_const_alloc_recursive<M: CompileTimeMachine<'mir, 'tcx>>(
             // to read enum discriminants in order to find references in enum variant fields.
             if let err_unsup!(ValidationFailure(_)) = error.kind {
                 let err = crate::const_eval::error_to_const_error(&ecx, error);
-                match err.struct_error(ecx.tcx, "it is undefined behavior to use this value") {
-                    Ok(mut diag) => {
+                match err.struct_error(
+                    ecx.tcx,
+                    "it is undefined behavior to use this value",
+                    |mut diag| {
                         diag.note(crate::const_eval::note_on_undefined_behavior_error());
                         diag.emit();
-                    }
-                    Err(ErrorHandled::TooGeneric) | Err(ErrorHandled::Reported) => {}
+                    },
+                ) {
+                    Ok(()) | Err(ErrorHandled::TooGeneric) | Err(ErrorHandled::Reported) => {}
                 }
             }
         }
diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs
index cd6d94357e..891afbf437 100644
--- a/src/librustc_mir/interpret/intrinsics.rs
+++ b/src/librustc_mir/interpret/intrinsics.rs
@@ -48,22 +48,15 @@ crate fn eval_nullary_intrinsic<'tcx>(
     param_env: ty::ParamEnv<'tcx>,
     def_id: DefId,
     substs: SubstsRef<'tcx>,
-) -> InterpResult<'tcx, &'tcx ty::Const<'tcx>> {
+) -> InterpResult<'tcx, ConstValue<'tcx>> {
     let tp_ty = substs.type_at(0);
     let name = tcx.item_name(def_id);
     Ok(match name {
         sym::type_name => {
             let alloc = type_name::alloc_type_name(tcx, tp_ty);
-            tcx.mk_const(ty::Const {
-                val: ty::ConstKind::Value(ConstValue::Slice {
-                    data: alloc,
-                    start: 0,
-                    end: alloc.len(),
-                }),
-                ty: tcx.mk_static_str(),
-            })
+            ConstValue::Slice { data: alloc, start: 0, end: alloc.len() }
         }
-        sym::needs_drop => ty::Const::from_bool(tcx, tp_ty.needs_drop(tcx, param_env)),
+        sym::needs_drop => ConstValue::from_bool(tp_ty.needs_drop(tcx, param_env)),
         sym::size_of | sym::min_align_of | sym::pref_align_of => {
             let layout = tcx.layout_of(param_env.and(tp_ty)).map_err(|e| err_inval!(Layout(e)))?;
             let n = match name {
@@ -72,11 +65,9 @@ crate fn eval_nullary_intrinsic<'tcx>(
                 sym::size_of => layout.size.bytes(),
                 _ => bug!(),
             };
-            ty::Const::from_usize(tcx, n)
-        }
-        sym::type_id => {
-            ty::Const::from_bits(tcx, tcx.type_id_hash(tp_ty).into(), param_env.and(tcx.types.u64))
+            ConstValue::from_machine_usize(n, &tcx)
         }
+        sym::type_id => ConstValue::from_u64(tcx.type_id_hash(tp_ty)),
         other => bug!("`{}` is not a zero arg intrinsic", other),
     })
 }
@@ -119,7 +110,14 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             | sym::type_id
             | sym::type_name => {
                 let gid = GlobalId { instance, promoted: None };
-                let val = self.const_eval(gid)?;
+                let ty = match intrinsic_name {
+                    sym::min_align_of | sym::pref_align_of | sym::size_of => self.tcx.types.usize,
+                    sym::needs_drop => self.tcx.types.bool,
+                    sym::type_id => self.tcx.types.u64,
+                    sym::type_name => self.tcx.mk_static_str(),
+                    _ => span_bug!(span, "Already checked for nullary intrinsics"),
+                };
+                let val = self.const_eval(gid, ty)?;
                 self.copy_op(val, dest)?;
             }
 
@@ -205,7 +203,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                         if is_add {
                             // max unsigned
                             Scalar::from_uint(
-                                u128::max_value() >> (128 - num_bits),
+                                u128::MAX >> (128 - num_bits),
                                 Size::from_bits(num_bits),
                             )
                         } else {
@@ -218,19 +216,34 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 };
                 self.write_scalar(val, dest)?;
             }
-            sym::unchecked_shl | sym::unchecked_shr => {
+            sym::unchecked_shl
+            | sym::unchecked_shr
+            | sym::unchecked_add
+            | sym::unchecked_sub
+            | sym::unchecked_mul
+            | sym::unchecked_div
+            | sym::unchecked_rem => {
                 let l = self.read_immediate(args[0])?;
                 let r = self.read_immediate(args[1])?;
                 let bin_op = match intrinsic_name {
                     sym::unchecked_shl => BinOp::Shl,
                     sym::unchecked_shr => BinOp::Shr,
+                    sym::unchecked_add => BinOp::Add,
+                    sym::unchecked_sub => BinOp::Sub,
+                    sym::unchecked_mul => BinOp::Mul,
+                    sym::unchecked_div => BinOp::Div,
+                    sym::unchecked_rem => BinOp::Rem,
                     _ => bug!("Already checked for int ops"),
                 };
                 let (val, overflowed, _ty) = self.overflowing_binary_op(bin_op, l, r)?;
                 if overflowed {
                     let layout = self.layout_of(substs.type_at(0))?;
                     let r_val = self.force_bits(r.to_scalar()?, layout.size)?;
-                    throw_ub_format!("Overflowing shift by {} in `{}`", r_val, intrinsic_name);
+                    if let sym::unchecked_shl | sym::unchecked_shr = intrinsic_name {
+                        throw_ub_format!("Overflowing shift by {} in `{}`", r_val, intrinsic_name);
+                    } else {
+                        throw_ub_format!("Overflow executing `{}`", intrinsic_name);
+                    }
                 }
                 self.write_scalar(val, dest)?;
             }
@@ -361,32 +374,6 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         Ok(true)
     }
 
-    /// "Intercept" a function call to a panic-related function
-    /// because we have something special to do for it.
-    /// Returns `true` if an intercept happened.
-    pub fn hook_panic_fn(
-        &mut self,
-        span: Span,
-        instance: ty::Instance<'tcx>,
-        args: &[OpTy<'tcx, M::PointerTag>],
-    ) -> InterpResult<'tcx, bool> {
-        let def_id = instance.def_id();
-        if Some(def_id) == self.tcx.lang_items().panic_fn()
-            || Some(def_id) == self.tcx.lang_items().begin_panic_fn()
-        {
-            // &'static str
-            assert!(args.len() == 1);
-
-            let msg_place = self.deref_operand(args[0])?;
-            let msg = Symbol::intern(self.read_str(msg_place)?);
-            let span = self.find_closest_untracked_caller_location().unwrap_or(span);
-            let (file, line, col) = self.location_triple_for_span(span);
-            throw_panic!(Panic { msg, file, line, col })
-        } else {
-            return Ok(false);
-        }
-    }
-
     pub fn exact_div(
         &mut self,
         a: ImmTy<'tcx, M::PointerTag>,
@@ -394,10 +381,11 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         dest: PlaceTy<'tcx, M::PointerTag>,
     ) -> InterpResult<'tcx> {
         // Performs an exact division, resulting in undefined behavior where
-        // `x % y != 0` or `y == 0` or `x == T::min_value() && y == -1`.
-        // First, check x % y != 0.
-        if self.binary_op(BinOp::Rem, a, b)?.to_bits()? != 0 {
-            // Then, check if `b` is -1, which is the "min_value / -1" case.
+        // `x % y != 0` or `y == 0` or `x == T::MIN && y == -1`.
+        // First, check x % y != 0 (or if that computation overflows).
+        let (res, overflow, _ty) = self.overflowing_binary_op(BinOp::Rem, a, b)?;
+        if overflow || res.assert_bits(a.layout.size) != 0 {
+            // Then, check if `b` is -1, which is the "MIN / -1" case.
             let minus1 = Scalar::from_int(-1, dest.layout.size);
             let b_scalar = b.to_scalar().unwrap();
             if b_scalar == minus1 {
@@ -406,6 +394,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 throw_ub_format!("exact_div: {} cannot be divided by {} without remainder", a, b,)
             }
         }
+        // `Rem` says this is all right, so we can let `Div` do its job.
         self.binop_ignore_overflow(BinOp::Div, a, b, dest)
     }
 }
diff --git a/src/librustc_mir/interpret/intrinsics/caller_location.rs b/src/librustc_mir/interpret/intrinsics/caller_location.rs
index 0525108d2d..566601f0ca 100644
--- a/src/librustc_mir/interpret/intrinsics/caller_location.rs
+++ b/src/librustc_mir/interpret/intrinsics/caller_location.rs
@@ -54,12 +54,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         location
     }
 
-    pub fn alloc_caller_location_for_span(&mut self, span: Span) -> MPlaceTy<'tcx, M::PointerTag> {
-        let (file, line, column) = self.location_triple_for_span(span);
-        self.alloc_caller_location(file, line, column)
-    }
-
-    pub(super) fn location_triple_for_span(&self, span: Span) -> (Symbol, u32, u32) {
+    crate fn location_triple_for_span(&self, span: Span) -> (Symbol, u32, u32) {
         let topmost = span.ctxt().outer_expn().expansion_cause().unwrap_or(span);
         let caller = self.tcx.sess.source_map().lookup_char_pos(topmost.lo());
         (
@@ -68,4 +63,9 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             caller.col_display as u32 + 1,
         )
     }
+
+    pub fn alloc_caller_location_for_span(&mut self, span: Span) -> MPlaceTy<'tcx, M::PointerTag> {
+        let (file, line, column) = self.location_triple_for_span(span);
+        self.alloc_caller_location(file, line, column)
+    }
 }
diff --git a/src/librustc_mir/interpret/machine.rs b/src/librustc_mir/interpret/machine.rs
index 3309e9b9b6..6615cc608f 100644
--- a/src/librustc_mir/interpret/machine.rs
+++ b/src/librustc_mir/interpret/machine.rs
@@ -6,13 +6,12 @@ use std::borrow::{Borrow, Cow};
 use std::hash::Hash;
 
 use rustc::mir;
-use rustc::ty::{self, Ty, TyCtxt};
-use rustc_hir::def_id::DefId;
+use rustc::ty::{self, Ty};
 use rustc_span::Span;
 
 use super::{
-    AllocId, Allocation, AllocationExtra, AssertMessage, Frame, ImmTy, InterpCx, InterpResult,
-    Memory, MemoryKind, OpTy, Operand, PlaceTy, Pointer, Scalar,
+    AllocId, Allocation, AllocationExtra, Frame, ImmTy, InterpCx, InterpResult, Memory, MemoryKind,
+    OpTy, Operand, PlaceTy, Pointer, Scalar,
 };
 
 /// Data returned by Machine::stack_pop,
@@ -123,10 +122,6 @@ pub trait Machine<'mir, 'tcx>: Sized {
     /// Whether to enforce the validity invariant
     fn enforce_validity(ecx: &InterpCx<'mir, 'tcx, Self>) -> bool;
 
-    /// Called before a basic block terminator is executed.
-    /// You can use this to detect endlessly running programs.
-    fn before_terminator(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx>;
-
     /// Entry point to all function calls.
     ///
     /// Returns either the mir to use for the call, or `None` if execution should
@@ -171,22 +166,10 @@ pub trait Machine<'mir, 'tcx>: Sized {
     fn assert_panic(
         ecx: &mut InterpCx<'mir, 'tcx, Self>,
         span: Span,
-        msg: &AssertMessage<'tcx>,
+        msg: &mir::AssertMessage<'tcx>,
         unwind: Option<mir::BasicBlock>,
     ) -> InterpResult<'tcx>;
 
-    /// Called for read access to a foreign static item.
-    ///
-    /// This will only be called once per static and machine; the result is cached in
-    /// the machine memory. (This relies on `AllocMap::get_or` being able to add the
-    /// owned allocation to the map even when the map is shared.)
-    ///
-    /// This allocation will then be fed to `tag_allocation` to initialize the "extra" state.
-    fn find_foreign_static(
-        tcx: TyCtxt<'tcx>,
-        def_id: DefId,
-    ) -> InterpResult<'tcx, Cow<'tcx, Allocation>>;
-
     /// Called for all binary operations where the LHS has pointer type.
     ///
     /// Returns a (value, overflowed) pair if the operation succeeded
@@ -204,6 +187,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
     ) -> InterpResult<'tcx>;
 
     /// Called to read the specified `local` from the `frame`.
+    #[inline]
     fn access_local(
         _ecx: &InterpCx<'mir, 'tcx, Self>,
         frame: &Frame<'mir, 'tcx, Self::PointerTag, Self::FrameExtra>,
@@ -212,7 +196,15 @@ pub trait Machine<'mir, 'tcx>: Sized {
         frame.locals[local].access()
     }
 
+    /// Called before a basic block terminator is executed.
+    /// You can use this to detect endlessly running programs.
+    #[inline]
+    fn before_terminator(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
+        Ok(())
+    }
+
     /// Called before a `Static` value is accessed.
+    #[inline]
     fn before_access_static(
         _memory_extra: &Self::MemoryExtra,
         _allocation: &Allocation,
@@ -220,11 +212,22 @@ pub trait Machine<'mir, 'tcx>: Sized {
         Ok(())
     }
 
+    /// Called for *every* memory access to determine the real ID of the given allocation.
+    /// This provides a way for the machine to "redirect" certain allocations as it sees fit.
+    ///
+    /// This is used by Miri to redirect extern statics to real allocations.
+    ///
+    /// This function must be idempotent.
+    #[inline]
+    fn canonical_alloc_id(_mem: &Memory<'mir, 'tcx, Self>, id: AllocId) -> AllocId {
+        id
+    }
+
     /// Called to initialize the "extra" state of an allocation and make the pointers
     /// it contains (in relocations) tagged.  The way we construct allocations is
     /// to always first construct it without extra and then add the extra.
     /// This keeps uniform code paths for handling both allocations created by CTFE
-    /// for statics, and allocations ceated by Miri during evaluation.
+    /// for statics, and allocations created by Miri during evaluation.
     ///
     /// `kind` is the kind of the allocation being tagged; it can be `None` when
     /// it's a static and `STATIC_KIND` is `None`.
@@ -247,6 +250,8 @@ pub trait Machine<'mir, 'tcx>: Sized {
     /// Return the "base" tag for the given *static* allocation: the one that is used for direct
     /// accesses to this static/const/fn allocation. If `id` is not a static allocation,
     /// this will return an unusable tag (i.e., accesses will be UB)!
+    ///
+    /// Expects `id` to be already canonical, if needed.
     fn tag_static_base_pointer(memory_extra: &Self::MemoryExtra, id: AllocId) -> Self::PointerTag;
 
     /// Executes a retagging operation
@@ -259,7 +264,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
         Ok(())
     }
 
-    /// Called immediately before a new stack frame got pushed
+    /// Called immediately before a new stack frame got pushed.
     fn stack_push(ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx, Self::FrameExtra>;
 
     /// Called immediately after a stack frame gets popped
diff --git a/src/librustc_mir/interpret/memory.rs b/src/librustc_mir/interpret/memory.rs
index 0bcdf9ae3c..82a467c7ba 100644
--- a/src/librustc_mir/interpret/memory.rs
+++ b/src/librustc_mir/interpret/memory.rs
@@ -14,7 +14,7 @@ use rustc::ty::layout::{Align, HasDataLayout, Size, TargetDataLayout};
 use rustc::ty::{self, query::TyCtxtAt, Instance, ParamEnv};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 
-use syntax::ast::Mutability;
+use rustc_ast::ast::Mutability;
 
 use super::{
     AllocId, AllocMap, Allocation, AllocationExtra, CheckInAllocMsg, ErrorHandled, GlobalAlloc,
@@ -150,7 +150,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
     /// through a pointer that was created by the program.
     #[inline]
     pub fn tag_static_base_pointer(&self, ptr: Pointer) -> Pointer<M::PointerTag> {
-        ptr.with_tag(M::tag_static_base_pointer(&self.extra, ptr.alloc_id))
+        let id = M::canonical_alloc_id(self, ptr.alloc_id);
+        ptr.with_tag(M::tag_static_base_pointer(&self.extra, id))
     }
 
     pub fn create_fn_alloc(
@@ -421,6 +422,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
     /// The `GlobalAlloc::Memory` branch here is still reachable though; when a static
     /// contains a reference to memory that was created during its evaluation (i.e., not to
     /// another static), those inner references only exist in "resolved" form.
+    ///
+    /// Assumes `id` is already canonical.
     fn get_static_alloc(
         memory_extra: &M::MemoryExtra,
         tcx: TyCtxtAt<'tcx>,
@@ -434,31 +437,30 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
             Some(GlobalAlloc::Static(def_id)) => {
                 // We got a "lazy" static that has not been computed yet.
                 if tcx.is_foreign_item(def_id) {
-                    trace!("static_alloc: foreign item {:?}", def_id);
-                    M::find_foreign_static(tcx.tcx, def_id)?
-                } else {
-                    trace!("static_alloc: Need to compute {:?}", def_id);
-                    let instance = Instance::mono(tcx.tcx, def_id);
-                    let gid = GlobalId { instance, promoted: None };
-                    // use the raw query here to break validation cycles. Later uses of the static
-                    // will call the full query anyway
-                    let raw_const =
-                        tcx.const_eval_raw(ty::ParamEnv::reveal_all().and(gid)).map_err(|err| {
-                            // no need to report anything, the const_eval call takes care of that
-                            // for statics
-                            assert!(tcx.is_static(def_id));
-                            match err {
-                                ErrorHandled::Reported => err_inval!(ReferencedConstant),
-                                ErrorHandled::TooGeneric => err_inval!(TooGeneric),
-                            }
-                        })?;
-                    // Make sure we use the ID of the resolved memory, not the lazy one!
-                    let id = raw_const.alloc_id;
-                    let allocation = tcx.alloc_map.lock().unwrap_memory(id);
-
-                    M::before_access_static(memory_extra, allocation)?;
-                    Cow::Borrowed(allocation)
+                    trace!("get_static_alloc: foreign item {:?}", def_id);
+                    throw_unsup!(ReadForeignStatic)
                 }
+                trace!("get_static_alloc: Need to compute {:?}", def_id);
+                let instance = Instance::mono(tcx.tcx, def_id);
+                let gid = GlobalId { instance, promoted: None };
+                // use the raw query here to break validation cycles. Later uses of the static
+                // will call the full query anyway
+                let raw_const =
+                    tcx.const_eval_raw(ty::ParamEnv::reveal_all().and(gid)).map_err(|err| {
+                        // no need to report anything, the const_eval call takes care of that
+                        // for statics
+                        assert!(tcx.is_static(def_id));
+                        match err {
+                            ErrorHandled::Reported => err_inval!(ReferencedConstant),
+                            ErrorHandled::TooGeneric => err_inval!(TooGeneric),
+                        }
+                    })?;
+                // Make sure we use the ID of the resolved memory, not the lazy one!
+                let id = raw_const.alloc_id;
+                let allocation = tcx.alloc_map.lock().unwrap_memory(id);
+
+                M::before_access_static(memory_extra, allocation)?;
+                Cow::Borrowed(allocation)
             }
         };
         // We got tcx memory. Let the machine initialize its "extra" stuff.
@@ -478,6 +480,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
         &self,
         id: AllocId,
     ) -> InterpResult<'tcx, &Allocation<M::PointerTag, M::AllocExtra>> {
+        let id = M::canonical_alloc_id(self, id);
         // The error type of the inner closure here is somewhat funny.  We have two
         // ways of "erroring": An actual error, or because we got a reference from
         // `get_static_alloc` that we can actually use directly without inserting anything anywhere.
@@ -513,6 +516,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
         &mut self,
         id: AllocId,
     ) -> InterpResult<'tcx, &mut Allocation<M::PointerTag, M::AllocExtra>> {
+        let id = M::canonical_alloc_id(self, id);
         let tcx = self.tcx;
         let memory_extra = &self.extra;
         let a = self.alloc_map.get_mut_or(id, || {
@@ -550,6 +554,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
         id: AllocId,
         liveness: AllocCheck,
     ) -> InterpResult<'static, (Size, Align)> {
+        let id = M::canonical_alloc_id(self, id);
         // # Regular allocations
         // Don't use `self.get_raw` here as that will
         // a) cause cycles in case `id` refers to a static
@@ -560,7 +565,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
 
         // # Function pointers
         // (both global from `alloc_map` and local from `extra_fn_ptr_map`)
-        if let Ok(_) = self.get_fn_alloc(id) {
+        if self.get_fn_alloc(id).is_some() {
             return if let AllocCheck::Dereferenceable = liveness {
                 // The caller requested no function pointers.
                 throw_unsup!(DerefFunctionPointer)
@@ -602,14 +607,15 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
         }
     }
 
-    fn get_fn_alloc(&self, id: AllocId) -> InterpResult<'tcx, FnVal<'tcx, M::ExtraFnVal>> {
+    /// Assumes `id` is already canonical.
+    fn get_fn_alloc(&self, id: AllocId) -> Option<FnVal<'tcx, M::ExtraFnVal>> {
         trace!("reading fn ptr: {}", id);
         if let Some(extra) = self.extra_fn_ptr_map.get(&id) {
-            Ok(FnVal::Other(*extra))
+            Some(FnVal::Other(*extra))
         } else {
             match self.tcx.alloc_map.lock().get(id) {
-                Some(GlobalAlloc::Function(instance)) => Ok(FnVal::Instance(instance)),
-                _ => throw_unsup!(ExecuteMemory),
+                Some(GlobalAlloc::Function(instance)) => Some(FnVal::Instance(instance)),
+                _ => None,
             }
         }
     }
@@ -622,7 +628,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
         if ptr.offset.bytes() != 0 {
             throw_unsup!(InvalidFunctionPointer)
         }
-        self.get_fn_alloc(ptr.alloc_id)
+        let id = M::canonical_alloc_id(self, ptr.alloc_id);
+        self.get_fn_alloc(id).ok_or_else(|| err_unsup!(ExecuteMemory).into())
     }
 
     pub fn mark_immutable(&mut self, id: AllocId) -> InterpResult<'tcx> {
@@ -791,6 +798,33 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {
         self.get_raw(ptr.alloc_id)?.read_c_str(self, ptr)
     }
 
+    /// Reads a 0x0000-terminated u16-sequence from memory. Returns them as a Vec<u16>.
+    /// Terminator 0x0000 is not included in the returned Vec<u16>.
+    ///
+    /// Performs appropriate bounds checks.
+    pub fn read_wide_str(&self, ptr: Scalar<M::PointerTag>) -> InterpResult<'tcx, Vec<u16>> {
+        let size_2bytes = Size::from_bytes(2);
+        let align_2bytes = Align::from_bytes(2).unwrap();
+        // We need to read at least 2 bytes, so we *need* a ptr.
+        let mut ptr = self.force_ptr(ptr)?;
+        let allocation = self.get_raw(ptr.alloc_id)?;
+        let mut u16_seq = Vec::new();
+
+        loop {
+            ptr = self
+                .check_ptr_access(ptr.into(), size_2bytes, align_2bytes)?
+                .expect("cannot be a ZST");
+            let single_u16 = allocation.read_scalar(self, ptr, size_2bytes)?.to_u16()?;
+            if single_u16 != 0x0000 {
+                u16_seq.push(single_u16);
+                ptr = ptr.offset(size_2bytes, self)?;
+            } else {
+                break;
+            }
+        }
+        Ok(u16_seq)
+    }
+
     /// Writes the given stream of bytes into memory.
     ///
     /// Performs appropriate bounds checks.
diff --git a/src/librustc_mir/interpret/operand.rs b/src/librustc_mir/interpret/operand.rs
index d1c08da6cb..22b1a7b713 100644
--- a/src/librustc_mir/interpret/operand.rs
+++ b/src/librustc_mir/interpret/operand.rs
@@ -13,8 +13,8 @@ pub use rustc::mir::interpret::ScalarMaybeUndef;
 use rustc::mir::interpret::{
     sign_extend, truncate, AllocId, ConstValue, GlobalId, InterpResult, Pointer, Scalar,
 };
+use rustc_ast::ast;
 use rustc_macros::HashStable;
-use syntax::ast;
 
 /// An `Immediate` represents a single immediate self-contained Rust value.
 ///
@@ -96,40 +96,40 @@ pub struct ImmTy<'tcx, Tag = ()> {
 impl<Tag: Copy> std::fmt::Display for ImmTy<'tcx, Tag> {
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match &self.imm {
-            Immediate::Scalar(ScalarMaybeUndef::Scalar(s)) => match s.to_bits(self.layout.size) {
-                Ok(s) => {
-                    match self.layout.ty.kind {
-                        ty::Int(_) => {
-                            return write!(
-                                fmt,
-                                "{}",
-                                super::sign_extend(s, self.layout.size) as i128,
-                            );
-                        }
-                        ty::Uint(_) => return write!(fmt, "{}", s),
-                        ty::Bool if s == 0 => return fmt.write_str("false"),
-                        ty::Bool if s == 1 => return fmt.write_str("true"),
-                        ty::Char => {
-                            if let Some(c) = u32::try_from(s).ok().and_then(std::char::from_u32) {
-                                return write!(fmt, "{}", c);
-                            }
+            // We cannot use `to_bits_or_ptr` as we do not have a `tcx`.
+            // So we use `is_bits` and circumvent a bunch of sanity checking -- but
+            // this is anyway only for printing.
+            Immediate::Scalar(ScalarMaybeUndef::Scalar(s)) if s.is_ptr() => {
+                fmt.write_str("{pointer}")
+            }
+            Immediate::Scalar(ScalarMaybeUndef::Scalar(s)) => {
+                let s = s.assert_bits(self.layout.size);
+                match self.layout.ty.kind {
+                    ty::Int(_) => {
+                        return write!(fmt, "{}", super::sign_extend(s, self.layout.size) as i128,);
+                    }
+                    ty::Uint(_) => return write!(fmt, "{}", s),
+                    ty::Bool if s == 0 => return fmt.write_str("false"),
+                    ty::Bool if s == 1 => return fmt.write_str("true"),
+                    ty::Char => {
+                        if let Some(c) = u32::try_from(s).ok().and_then(std::char::from_u32) {
+                            return write!(fmt, "{}", c);
                         }
-                        ty::Float(ast::FloatTy::F32) => {
-                            if let Ok(u) = u32::try_from(s) {
-                                return write!(fmt, "{}", f32::from_bits(u));
-                            }
+                    }
+                    ty::Float(ast::FloatTy::F32) => {
+                        if let Ok(u) = u32::try_from(s) {
+                            return write!(fmt, "{}", f32::from_bits(u));
                         }
-                        ty::Float(ast::FloatTy::F64) => {
-                            if let Ok(u) = u64::try_from(s) {
-                                return write!(fmt, "{}", f64::from_bits(u));
-                            }
+                    }
+                    ty::Float(ast::FloatTy::F64) => {
+                        if let Ok(u) = u64::try_from(s) {
+                            return write!(fmt, "{}", f64::from_bits(u));
                         }
-                        _ => {}
                     }
-                    write!(fmt, "{:x}", s)
+                    _ => {}
                 }
-                Err(_) => fmt.write_str("{pointer}"),
-            },
+                write!(fmt, "{:x}", s)
+            }
             Immediate::Scalar(ScalarMaybeUndef::Undef) => fmt.write_str("{undef}"),
             Immediate::ScalarPair(..) => fmt.write_str("{wide pointer or tuple}"),
         }
@@ -205,11 +205,6 @@ impl<'tcx, Tag: Copy> ImmTy<'tcx, Tag> {
     pub fn from_int(i: impl Into<i128>, layout: TyLayout<'tcx>) -> Self {
         Self::from_scalar(Scalar::from_int(i, layout.size), layout)
     }
-
-    #[inline]
-    pub fn to_bits(self) -> InterpResult<'tcx, u128> {
-        self.to_scalar()?.to_bits(self.layout.size)
-    }
 }
 
 // Use the existing layout if given (but sanity check in debug mode),
@@ -509,7 +504,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         &self,
         ops: &[mir::Operand<'tcx>],
     ) -> InterpResult<'tcx, Vec<OpTy<'tcx, M::PointerTag>>> {
-        ops.into_iter().map(|op| self.eval_operand(op, None)).collect()
+        ops.iter().map(|op| self.eval_operand(op, None)).collect()
     }
 
     // Used when the miri-engine runs into a constant and for extracting information from constants
@@ -518,7 +513,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
     /// "universe" (param_env).
     crate fn eval_const_to_op(
         &self,
-        val: &'tcx ty::Const<'tcx>,
+        val: &ty::Const<'tcx>,
         layout: Option<TyLayout<'tcx>>,
     ) -> InterpResult<'tcx, OpTy<'tcx, M::PointerTag>> {
         let tag_scalar = |scalar| match scalar {
@@ -536,7 +531,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                 // potentially requiring the current static to be evaluated again. This is not a
                 // problem here, because we are building an operand which means an actual read is
                 // happening.
-                return Ok(OpTy::from(self.const_eval(GlobalId { instance, promoted })?));
+                return Ok(self.const_eval(GlobalId { instance, promoted }, val.ty)?);
             }
             ty::ConstKind::Infer(..)
             | ty::ConstKind::Bound(..)
@@ -683,7 +678,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                             // Then computing the absolute variant idx should not overflow any more.
                             let variant_index = variants_start
                                 .checked_add(variant_index_relative)
-                                .expect("oveflow computing absolute variant idx");
+                                .expect("overflow computing absolute variant idx");
                             let variants_len = rval
                                 .layout
                                 .ty
diff --git a/src/librustc_mir/interpret/operator.rs b/src/librustc_mir/interpret/operator.rs
index 5050fe4906..f2ee5e047a 100644
--- a/src/librustc_mir/interpret/operator.rs
+++ b/src/librustc_mir/interpret/operator.rs
@@ -6,7 +6,7 @@ use rustc::ty::{
     Ty,
 };
 use rustc_apfloat::Float;
-use syntax::ast::FloatTy;
+use rustc_ast::ast::FloatTy;
 
 use super::{ImmTy, Immediate, InterpCx, Machine, PlaceTy};
 
@@ -134,9 +134,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             let mut r = r as u32;
             let size = left_layout.size;
             oflo |= r >= size.bits() as u32;
-            if oflo {
-                r %= size.bits() as u32;
-            }
+            r %= size.bits() as u32;
             let result = if signed {
                 let l = self.sign_extend(l, left_layout) as i128;
                 let result = match bin_op {
@@ -168,6 +166,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             )
         }
 
+        let size = left_layout.size;
+
         // Operations that need special treatment for signed integers
         if left_layout.abi.is_signed() {
             let op: Option<fn(&i128, &i128) -> bool> = match bin_op {
@@ -195,32 +195,31 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             if let Some(op) = op {
                 let l128 = self.sign_extend(l, left_layout) as i128;
                 let r = self.sign_extend(r, right_layout) as i128;
-                let size = left_layout.size;
+                // We need a special check for overflowing remainder:
+                // "int_min % -1" overflows and returns 0, but after casting things to a larger int
+                // type it does *not* overflow nor give an unrepresentable result!
                 match bin_op {
-                    Rem | Div => {
-                        // int_min / -1
+                    Rem => {
                         if r == -1 && l == (1 << (size.bits() - 1)) {
-                            return Ok((Scalar::from_uint(l, size), true, left_layout.ty));
+                            return Ok((Scalar::from_int(0, size), true, left_layout.ty));
                         }
                     }
                     _ => {}
                 }
-                trace!("{}, {}, {}", l, l128, r);
-                let (result, mut oflo) = op(l128, r);
-                trace!("{}, {}", result, oflo);
-                if !oflo && size.bits() != 128 {
-                    let max = 1 << (size.bits() - 1);
-                    oflo = result >= max || result < -max;
-                }
-                // this may be out-of-bounds for the result type, so we have to truncate ourselves
+
+                let (result, oflo) = op(l128, r);
+                // This may be out-of-bounds for the result type, so we have to truncate ourselves.
+                // If that truncation loses any information, we have an overflow.
                 let result = result as u128;
                 let truncated = self.truncate(result, left_layout);
-                return Ok((Scalar::from_uint(truncated, size), oflo, left_layout.ty));
+                return Ok((
+                    Scalar::from_uint(truncated, size),
+                    oflo || self.sign_extend(truncated, left_layout) != result,
+                    left_layout.ty,
+                ));
             }
         }
 
-        let size = left_layout.size;
-
         let (val, ty) = match bin_op {
             Eq => (Scalar::from_bool(l == r), self.tcx.types.bool),
             Ne => (Scalar::from_bool(l != r), self.tcx.types.bool),
@@ -235,7 +234,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             BitXor => (Scalar::from_uint(l ^ r, size), left_layout.ty),
 
             Add | Sub | Mul | Rem | Div => {
-                debug_assert!(!left_layout.abi.is_signed());
+                assert!(!left_layout.abi.is_signed());
                 let op: fn(u128, u128) -> (u128, bool) = match bin_op {
                     Add => u128::overflowing_add,
                     Sub => u128::overflowing_sub,
@@ -247,6 +246,8 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                     _ => bug!(),
                 };
                 let (result, oflo) = op(l, r);
+                // Truncate to target type.
+                // If that truncation loses any information, we have an overflow.
                 let truncated = self.truncate(result, left_layout);
                 return Ok((
                     Scalar::from_uint(truncated, size),
@@ -341,7 +342,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         }
     }
 
-    /// Typed version of `checked_binary_op`, returning an `ImmTy`. Also ignores overflows.
+    /// Typed version of `overflowing_binary_op`, returning an `ImmTy`. Also ignores overflows.
     #[inline]
     pub fn binary_op(
         &self,
@@ -353,11 +354,13 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         Ok(ImmTy::from_scalar(val, self.layout_of(ty)?))
     }
 
-    pub fn unary_op(
+    /// Returns the result of the specified operation, whether it overflowed, and
+    /// the result type.
+    pub fn overflowing_unary_op(
         &self,
         un_op: mir::UnOp,
         val: ImmTy<'tcx, M::PointerTag>,
-    ) -> InterpResult<'tcx, ImmTy<'tcx, M::PointerTag>> {
+    ) -> InterpResult<'tcx, (Scalar<M::PointerTag>, bool, Ty<'tcx>)> {
         use rustc::mir::UnOp::*;
 
         let layout = val.layout;
@@ -371,7 +374,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                     Not => !val,
                     _ => bug!("Invalid bool op {:?}", un_op),
                 };
-                Ok(ImmTy::from_scalar(Scalar::from_bool(res), self.layout_of(self.tcx.types.bool)?))
+                Ok((Scalar::from_bool(res), false, self.tcx.types.bool))
             }
             ty::Float(fty) => {
                 let res = match (un_op, fty) {
@@ -379,21 +382,36 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                     (Neg, FloatTy::F64) => Scalar::from_f64(-val.to_f64()?),
                     _ => bug!("Invalid float op {:?}", un_op),
                 };
-                Ok(ImmTy::from_scalar(res, layout))
+                Ok((res, false, layout.ty))
             }
             _ => {
                 assert!(layout.ty.is_integral());
                 let val = self.force_bits(val, layout.size)?;
-                let res = match un_op {
-                    Not => !val,
+                let (res, overflow) = match un_op {
+                    Not => (self.truncate(!val, layout), false), // bitwise negation, then truncate
                     Neg => {
+                        // arithmetic negation
                         assert!(layout.abi.is_signed());
-                        (-(val as i128)) as u128
+                        let val = self.sign_extend(val, layout) as i128;
+                        let (res, overflow) = val.overflowing_neg();
+                        let res = res as u128;
+                        // Truncate to target type.
+                        // If that truncation loses any information, we have an overflow.
+                        let truncated = self.truncate(res, layout);
+                        (truncated, overflow || self.sign_extend(truncated, layout) != res)
                     }
                 };
-                // res needs tuncating
-                Ok(ImmTy::from_uint(self.truncate(res, layout), layout))
+                Ok((Scalar::from_uint(res, layout.size), overflow, layout.ty))
             }
         }
     }
+
+    pub fn unary_op(
+        &self,
+        un_op: mir::UnOp,
+        val: ImmTy<'tcx, M::PointerTag>,
+    ) -> InterpResult<'tcx, ImmTy<'tcx, M::PointerTag>> {
+        let (val, _overflow, ty) = self.overflowing_unary_op(un_op, val)?;
+        Ok(ImmTy::from_scalar(val, self.layout_of(ty)?))
+    }
 }
diff --git a/src/librustc_mir/interpret/place.rs b/src/librustc_mir/interpret/place.rs
index 721766cc93..a4815b9696 100644
--- a/src/librustc_mir/interpret/place.rs
+++ b/src/librustc_mir/interpret/place.rs
@@ -655,7 +655,7 @@ where
             }
             local => PlaceTy {
                 // This works even for dead/uninitialized locals; we check further when writing
-                place: Place::Local { frame: self.cur_frame(), local: local },
+                place: Place::Local { frame: self.cur_frame(), local },
                 layout: self.layout_of_local(self.frame(), local, None)?,
             },
         };
@@ -689,7 +689,7 @@ where
 
         if M::enforce_validity(self) {
             // Data got changed, better make sure it matches the type!
-            self.validate_operand(self.place_to_op(dest)?, vec![], None)?;
+            self.validate_operand(self.place_to_op(dest)?)?;
         }
 
         Ok(())
@@ -706,7 +706,7 @@ where
 
         if M::enforce_validity(self) {
             // Data got changed, better make sure it matches the type!
-            self.validate_operand(dest.into(), vec![], None)?;
+            self.validate_operand(dest.into())?;
         }
 
         Ok(())
@@ -843,7 +843,7 @@ where
 
         if M::enforce_validity(self) {
             // Data got changed, better make sure it matches the type!
-            self.validate_operand(self.place_to_op(dest)?, vec![], None)?;
+            self.validate_operand(self.place_to_op(dest)?)?;
         }
 
         Ok(())
@@ -951,7 +951,7 @@ where
 
         if M::enforce_validity(self) {
             // Data got changed, better make sure it matches the type!
-            self.validate_operand(dest.into(), vec![], None)?;
+            self.validate_operand(dest.into())?;
         }
 
         Ok(())
diff --git a/src/librustc_mir/interpret/snapshot.rs b/src/librustc_mir/interpret/snapshot.rs
index a8e67c8f20..ee45179fd8 100644
--- a/src/librustc_mir/interpret/snapshot.rs
+++ b/src/librustc_mir/interpret/snapshot.rs
@@ -15,12 +15,12 @@ use rustc::mir::interpret::{
 
 use rustc::ty::layout::{Align, Size};
 use rustc::ty::{self, TyCtxt};
+use rustc_ast::ast::Mutability;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_index::vec::IndexVec;
 use rustc_macros::HashStable;
 use rustc_span::source_map::Span;
-use syntax::ast::Mutability;
 
 use super::eval_context::{LocalState, StackPopCleanup};
 use super::{
@@ -292,7 +292,7 @@ where
 
         let all_bytes = 0..self.len();
         // This 'inspect' is okay since following access respects undef and relocations. This does
-        // influence interpreter exeuction, but only to detect the error of cycles in evalution
+        // influence interpreter exeuction, but only to detect the error of cycles in evaluation
         // dependencies.
         let bytes = self.inspect_with_undef_and_ptr_outside_interpreter(all_bytes);
 
diff --git a/src/librustc_mir/interpret/step.rs b/src/librustc_mir/interpret/step.rs
index a99abc4cbf..f298a6677d 100644
--- a/src/librustc_mir/interpret/step.rs
+++ b/src/librustc_mir/interpret/step.rs
@@ -38,6 +38,9 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
     /// Returns `true` as long as there are more things to do.
     ///
     /// This is used by [priroda](https://github.com/oli-obk/priroda)
+    ///
+    /// This is marked `#inline(always)` to work around adverserial codegen when `opt-level = 3`
+    #[inline(always)]
     pub fn step(&mut self) -> InterpResult<'tcx, bool> {
         if self.stack.is_empty() {
             return Ok(false);
@@ -284,7 +287,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         self.eval_terminator(terminator)?;
         if !self.stack.is_empty() {
             // This should change *something*
-            debug_assert!(self.cur_frame() != old_stack || self.frame().block != old_bb);
+            assert!(self.cur_frame() != old_stack || self.frame().block != old_bb);
             if let Some(block) = self.frame().block {
                 info!("// executing {:?}", block);
             }
diff --git a/src/librustc_mir/interpret/terminator.rs b/src/librustc_mir/interpret/terminator.rs
index 37dcab512b..ea8378574a 100644
--- a/src/librustc_mir/interpret/terminator.rs
+++ b/src/librustc_mir/interpret/terminator.rs
@@ -172,7 +172,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
         }
         let caller_arg = caller_arg.next().ok_or_else(|| err_unsup!(FunctionArgCountMismatch))?;
         if rust_abi {
-            debug_assert!(!caller_arg.layout.is_zst(), "ZSTs must have been already filtered out");
+            assert!(!caller_arg.layout.is_zst(), "ZSTs must have been already filtered out");
         }
         // Now, check
         if !Self::check_argument_compat(rust_abi, caller_arg.layout, callee_arg.layout) {
@@ -293,7 +293,7 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                                 let (&untuple_arg, args) = args.split_last().unwrap();
                                 trace!("eval_fn_call: Will pass last argument by untupling");
                                 Cow::from(args.iter().map(|&a| Ok(a))
-                                .chain((0..untuple_arg.layout.fields.count()).into_iter()
+                                .chain((0..untuple_arg.layout.fields.count())
                                     .map(|i| self.operand_field(untuple_arg, i as u64))
                                 )
                                 .collect::<InterpResult<'_, Vec<OpTy<'tcx, M::PointerTag>>>>()?)
@@ -305,15 +305,14 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
                         let mut caller_iter = caller_args
                             .iter()
                             .filter(|op| !rust_abi || !op.layout.is_zst())
-                            .map(|op| *op);
+                            .copied();
 
                         // Now we have to spread them out across the callee's locals,
                         // taking into account the `spread_arg`.  If we could write
                         // this is a single iterator (that handles `spread_arg`), then
                         // `pass_argument` would be the loop body. It takes care to
-                        // not advance `caller_iter` for ZSTs.
-                        let mut locals_iter = body.args_iter();
-                        while let Some(local) = locals_iter.next() {
+                        // not advance `caller_iter` for ZSTs
+                        for local in body.args_iter() {
                             let dest = self.eval_place(&mir::Place::from(local))?;
                             if Some(local) == body.spread_arg {
                                 // Must be a tuple
diff --git a/src/librustc_mir/interpret/validity.rs b/src/librustc_mir/interpret/validity.rs
index aa2b3040a7..05bb010959 100644
--- a/src/librustc_mir/interpret/validity.rs
+++ b/src/librustc_mir/interpret/validity.rs
@@ -46,6 +46,8 @@ macro_rules! try_validation {
     ($e:expr, $what:expr, $where:expr, $details:expr) => {{
         match $e {
             Ok(x) => x,
+            // We re-throw the error, so we are okay with allocation:
+            // this can only slow down builds that fail anyway.
             Err(_) => throw_validation_failure!($what, $where, $details),
         }
     }};
@@ -53,6 +55,8 @@ macro_rules! try_validation {
     ($e:expr, $what:expr, $where:expr) => {{
         match $e {
             Ok(x) => x,
+            // We re-throw the error, so we are okay with allocation:
+            // this can only slow down builds that fail anyway.
             Err(_) => throw_validation_failure!($what, $where),
         }
     }};
@@ -67,11 +71,12 @@ pub enum PathElem {
     Field(Symbol),
     Variant(Symbol),
     GeneratorState(VariantIdx),
-    ClosureVar(Symbol),
+    CapturedVar(Symbol),
     ArrayElem(usize),
     TupleElem(usize),
     Deref,
-    Tag,
+    EnumTag,
+    GeneratorTag,
     DynDowncast,
 }
 
@@ -109,9 +114,11 @@ fn write_path(out: &mut String, path: &Vec<PathElem>) {
     for elem in path.iter() {
         match elem {
             Field(name) => write!(out, ".{}", name),
-            Variant(name) => write!(out, ".<downcast-variant({})>", name),
+            EnumTag => write!(out, ".<enum-tag>"),
+            Variant(name) => write!(out, ".<enum-variant({})>", name),
+            GeneratorTag => write!(out, ".<generator-tag>"),
             GeneratorState(idx) => write!(out, ".<generator-state({})>", idx.index()),
-            ClosureVar(name) => write!(out, ".<closure-var({})>", name),
+            CapturedVar(name) => write!(out, ".<captured-var({})>", name),
             TupleElem(idx) => write!(out, ".{}", idx),
             ArrayElem(idx) => write!(out, "[{}]", idx),
             // `.<deref>` does not match Rust syntax, but it is more readable for long paths -- and
@@ -119,7 +126,6 @@ fn write_path(out: &mut String, path: &Vec<PathElem>) {
             // even use the usual syntax because we are just showing the projections,
             // not the root.
             Deref => write!(out, ".<deref>"),
-            Tag => write!(out, ".<enum-tag>"),
             DynDowncast => write!(out, ".<dyn-downcast>"),
         }
         .unwrap()
@@ -142,16 +148,16 @@ fn wrapping_range_contains(r: &RangeInclusive<u128>, test: u128) -> bool {
 // "expected something <in the given range>" makes sense.
 fn wrapping_range_format(r: &RangeInclusive<u128>, max_hi: u128) -> String {
     let (lo, hi) = r.clone().into_inner();
-    debug_assert!(hi <= max_hi);
+    assert!(hi <= max_hi);
     if lo > hi {
         format!("less or equal to {}, or greater or equal to {}", hi, lo)
     } else if lo == hi {
         format!("equal to {}", lo)
     } else if lo == 0 {
-        debug_assert!(hi < max_hi, "should not be printing if the range covers everything");
+        assert!(hi < max_hi, "should not be printing if the range covers everything");
         format!("less or equal to {}", hi)
     } else if hi == max_hi {
-        debug_assert!(lo > 0, "should not be printing if the range covers everything");
+        assert!(lo > 0, "should not be printing if the range covers everything");
         format!("greater or equal to {}", lo)
     } else {
         format!("in the range {:?}", r)
@@ -165,11 +171,27 @@ struct ValidityVisitor<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> {
     path: Vec<PathElem>,
     ref_tracking_for_consts:
         Option<&'rt mut RefTracking<MPlaceTy<'tcx, M::PointerTag>, Vec<PathElem>>>,
+    may_ref_to_static: bool,
     ecx: &'rt InterpCx<'mir, 'tcx, M>,
 }
 
 impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M> {
     fn aggregate_field_path_elem(&mut self, layout: TyLayout<'tcx>, field: usize) -> PathElem {
+        // First, check if we are projecting to a variant.
+        match layout.variants {
+            layout::Variants::Multiple { discr_index, .. } => {
+                if discr_index == field {
+                    return match layout.ty.kind {
+                        ty::Adt(def, ..) if def.is_enum() => PathElem::EnumTag,
+                        ty::Generator(..) => PathElem::GeneratorTag,
+                        _ => bug!("non-variant type {:?}", layout.ty),
+                    };
+                }
+            }
+            layout::Variants::Single { .. } => {}
+        }
+
+        // Now we know we are projecting to a field, so figure out which one.
         match layout.ty.kind {
             // generators and closures.
             ty::Closure(def_id, _) | ty::Generator(def_id, _, _) => {
@@ -190,7 +212,7 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M
                     }
                 }
 
-                PathElem::ClosureVar(name.unwrap_or_else(|| {
+                PathElem::CapturedVar(name.unwrap_or_else(|| {
                     // Fall back to showing the field index.
                     sym::integer(field)
                 }))
@@ -201,13 +223,13 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M
 
             // enums
             ty::Adt(def, ..) if def.is_enum() => {
-                // we might be projecting *to* a variant, or to a field *in*a variant.
+                // we might be projecting *to* a variant, or to a field *in* a variant.
                 match layout.variants {
                     layout::Variants::Single { index } => {
                         // Inside a variant
                         PathElem::Field(def.variants[index].fields[field].ident.name)
                     }
-                    _ => bug!(),
+                    layout::Variants::Multiple { .. } => bug!("we handled variants above"),
                 }
             }
 
@@ -288,195 +310,184 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValidityVisitor<'rt, 'mir, 'tcx, M
 
         Ok(())
     }
-}
-
-impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
-    for ValidityVisitor<'rt, 'mir, 'tcx, M>
-{
-    type V = OpTy<'tcx, M::PointerTag>;
-
-    #[inline(always)]
-    fn ecx(&self) -> &InterpCx<'mir, 'tcx, M> {
-        &self.ecx
-    }
-
-    #[inline]
-    fn visit_field(
-        &mut self,
-        old_op: OpTy<'tcx, M::PointerTag>,
-        field: usize,
-        new_op: OpTy<'tcx, M::PointerTag>,
-    ) -> InterpResult<'tcx> {
-        let elem = self.aggregate_field_path_elem(old_op.layout, field);
-        self.visit_elem(new_op, elem)
-    }
 
-    #[inline]
-    fn visit_variant(
+    /// Check a reference or `Box`.
+    fn check_safe_pointer(
         &mut self,
-        old_op: OpTy<'tcx, M::PointerTag>,
-        variant_id: VariantIdx,
-        new_op: OpTy<'tcx, M::PointerTag>,
+        value: OpTy<'tcx, M::PointerTag>,
+        kind: &str,
     ) -> InterpResult<'tcx> {
-        let name = match old_op.layout.ty.kind {
-            ty::Adt(adt, _) => PathElem::Variant(adt.variants[variant_id].ident.name),
-            // Generators also have variants
-            ty::Generator(..) => PathElem::GeneratorState(variant_id),
-            _ => bug!("Unexpected type with variant: {:?}", old_op.layout.ty),
-        };
-        self.visit_elem(new_op, name)
-    }
-
-    #[inline]
-    fn visit_value(&mut self, op: OpTy<'tcx, M::PointerTag>) -> InterpResult<'tcx> {
-        trace!("visit_value: {:?}, {:?}", *op, op.layout);
-        // Translate some possible errors to something nicer.
-        match self.walk_value(op) {
-            Ok(()) => Ok(()),
+        let value = self.ecx.read_immediate(value)?;
+        // Handle wide pointers.
+        // Check metadata early, for better diagnostics
+        let place = try_validation!(self.ecx.ref_to_mplace(value), "undefined pointer", self.path);
+        if place.layout.is_unsized() {
+            self.check_wide_ptr_meta(place.meta, place.layout)?;
+        }
+        // Make sure this is dereferenceable and all.
+        let size_and_align = match self.ecx.size_and_align_of(place.meta, place.layout) {
+            Ok(res) => res,
             Err(err) => match err.kind {
-                err_ub!(InvalidDiscriminant(val)) => {
-                    throw_validation_failure!(val, self.path, "a valid enum discriminant")
+                err_ub!(InvalidMeta(msg)) => throw_validation_failure!(
+                    format_args!("invalid {} metadata: {}", kind, msg),
+                    self.path
+                ),
+                _ => bug!("Unexpected error during ptr size_and_align_of: {}", err),
+            },
+        };
+        let (size, align) = size_and_align
+            // for the purpose of validity, consider foreign types to have
+            // alignment and size determined by the layout (size will be 0,
+            // alignment should take attributes into account).
+            .unwrap_or_else(|| (place.layout.size, place.layout.align.abi));
+        let ptr: Option<_> = match self.ecx.memory.check_ptr_access_align(
+            place.ptr,
+            size,
+            Some(align),
+            CheckInAllocMsg::InboundsTest,
+        ) {
+            Ok(ptr) => ptr,
+            Err(err) => {
+                info!(
+                    "{:?} did not pass access check for size {:?}, align {:?}",
+                    place.ptr, size, align
+                );
+                match err.kind {
+                    err_unsup!(InvalidNullPointerUsage) => {
+                        throw_validation_failure!(format_args!("a NULL {}", kind), self.path)
+                    }
+                    err_unsup!(AlignmentCheckFailed { required, has }) => {
+                        throw_validation_failure!(
+                            format_args!(
+                                "an unaligned {} \
+                                    (required {} byte alignment but found {})",
+                                kind,
+                                required.bytes(),
+                                has.bytes()
+                            ),
+                            self.path
+                        )
+                    }
+                    err_unsup!(ReadBytesAsPointer) => throw_validation_failure!(
+                        format_args!("a dangling {} (created from integer)", kind),
+                        self.path
+                    ),
+                    err_unsup!(PointerOutOfBounds { .. }) | err_unsup!(DanglingPointerDeref) => {
+                        throw_validation_failure!(
+                            format_args!("a dangling {} (not entirely in bounds)", kind),
+                            self.path
+                        )
+                    }
+                    _ => bug!("Unexpected error during ptr inbounds test: {}", err),
                 }
-                err_unsup!(ReadPointerAsBytes) => {
-                    throw_validation_failure!("a pointer", self.path, "plain (non-pointer) bytes")
+            }
+        };
+        // Recursive checking
+        if let Some(ref mut ref_tracking) = self.ref_tracking_for_consts {
+            if let Some(ptr) = ptr {
+                // not a ZST
+                // Skip validation entirely for some external statics
+                let alloc_kind = self.ecx.tcx.alloc_map.lock().get(ptr.alloc_id);
+                if let Some(GlobalAlloc::Static(did)) = alloc_kind {
+                    // `extern static` cannot be validated as they have no body.
+                    // FIXME: Statics from other crates are also skipped.
+                    // They might be checked at a different type, but for now we
+                    // want to avoid recursing too deeply.  This is not sound!
+                    if !did.is_local() || self.ecx.tcx.is_foreign_item(did) {
+                        return Ok(());
+                    }
+                    if !self.may_ref_to_static && self.ecx.tcx.is_static(did) {
+                        throw_validation_failure!(
+                            format_args!("a {} pointing to a static variable", kind),
+                            self.path
+                        );
+                    }
                 }
-                _ => Err(err),
-            },
+            }
+            // Proceed recursively even for ZST, no reason to skip them!
+            // `!` is a ZST and we want to validate it.
+            // Normalize before handing `place` to tracking because that will
+            // check for duplicates.
+            let place = if size.bytes() > 0 {
+                self.ecx.force_mplace_ptr(place).expect("we already bounds-checked")
+            } else {
+                place
+            };
+            let path = &self.path;
+            ref_tracking.track(place, || {
+                // We need to clone the path anyway, make sure it gets created
+                // with enough space for the additional `Deref`.
+                let mut new_path = Vec::with_capacity(path.len() + 1);
+                new_path.clone_from(path);
+                new_path.push(PathElem::Deref);
+                new_path
+            });
         }
+        Ok(())
     }
 
-    fn visit_primitive(&mut self, value: OpTy<'tcx, M::PointerTag>) -> InterpResult<'tcx> {
-        let value = self.ecx.read_immediate(value)?;
+    /// Check if this is a value of primitive type, and if yes check the validity of the value
+    /// at that type.  Return `true` if the type is indeed primitive.
+    fn try_visit_primitive(
+        &mut self,
+        value: OpTy<'tcx, M::PointerTag>,
+    ) -> InterpResult<'tcx, bool> {
         // Go over all the primitive types
         let ty = value.layout.ty;
         match ty.kind {
             ty::Bool => {
-                let value = value.to_scalar_or_undef();
+                let value = self.ecx.read_scalar(value)?;
                 try_validation!(value.to_bool(), value, self.path, "a boolean");
+                Ok(true)
             }
             ty::Char => {
-                let value = value.to_scalar_or_undef();
+                let value = self.ecx.read_scalar(value)?;
                 try_validation!(value.to_char(), value, self.path, "a valid unicode codepoint");
+                Ok(true)
             }
             ty::Float(_) | ty::Int(_) | ty::Uint(_) => {
+                let value = self.ecx.read_scalar(value)?;
                 // NOTE: Keep this in sync with the array optimization for int/float
                 // types below!
-                let size = value.layout.size;
-                let value = value.to_scalar_or_undef();
                 if self.ref_tracking_for_consts.is_some() {
                     // Integers/floats in CTFE: Must be scalar bits, pointers are dangerous
-                    try_validation!(
-                        value.to_bits(size),
-                        value,
-                        self.path,
-                        "initialized plain (non-pointer) bytes"
-                    );
+                    let is_bits = value.not_undef().map_or(false, |v| v.is_bits());
+                    if !is_bits {
+                        throw_validation_failure!(
+                            value,
+                            self.path,
+                            "initialized plain (non-pointer) bytes"
+                        )
+                    }
                 } else {
                     // At run-time, for now, we accept *anything* for these types, including
                     // undef. We should fix that, but let's start low.
                 }
+                Ok(true)
             }
             ty::RawPtr(..) => {
                 // We are conservative with undef for integers, but try to
                 // actually enforce our current rules for raw pointers.
-                let place =
-                    try_validation!(self.ecx.ref_to_mplace(value), "undefined pointer", self.path);
+                let place = try_validation!(
+                    self.ecx.ref_to_mplace(self.ecx.read_immediate(value)?),
+                    "undefined pointer",
+                    self.path
+                );
                 if place.layout.is_unsized() {
                     self.check_wide_ptr_meta(place.meta, place.layout)?;
                 }
+                Ok(true)
             }
-            _ if ty.is_box() || ty.is_region_ptr() => {
-                // Handle wide pointers.
-                // Check metadata early, for better diagnostics
-                let place =
-                    try_validation!(self.ecx.ref_to_mplace(value), "undefined pointer", self.path);
-                if place.layout.is_unsized() {
-                    self.check_wide_ptr_meta(place.meta, place.layout)?;
-                }
-                // Make sure this is dereferenceable and all.
-                let (size, align) = self
-                    .ecx
-                    .size_and_align_of(place.meta, place.layout)?
-                    // for the purpose of validity, consider foreign types to have
-                    // alignment and size determined by the layout (size will be 0,
-                    // alignment should take attributes into account).
-                    .unwrap_or_else(|| (place.layout.size, place.layout.align.abi));
-                let ptr: Option<_> = match self.ecx.memory.check_ptr_access_align(
-                    place.ptr,
-                    size,
-                    Some(align),
-                    CheckInAllocMsg::InboundsTest,
-                ) {
-                    Ok(ptr) => ptr,
-                    Err(err) => {
-                        info!(
-                            "{:?} did not pass access check for size {:?}, align {:?}",
-                            place.ptr, size, align
-                        );
-                        match err.kind {
-                            err_unsup!(InvalidNullPointerUsage) => {
-                                throw_validation_failure!("NULL reference", self.path)
-                            }
-                            err_unsup!(AlignmentCheckFailed { required, has }) => {
-                                throw_validation_failure!(
-                                    format_args!(
-                                        "unaligned reference \
-                                    (required {} byte alignment but found {})",
-                                        required.bytes(),
-                                        has.bytes()
-                                    ),
-                                    self.path
-                                )
-                            }
-                            err_unsup!(ReadBytesAsPointer) => throw_validation_failure!(
-                                "dangling reference (created from integer)",
-                                self.path
-                            ),
-                            _ => throw_validation_failure!(
-                                "dangling reference (not entirely in bounds)",
-                                self.path
-                            ),
-                        }
-                    }
-                };
-                // Recursive checking
-                if let Some(ref mut ref_tracking) = self.ref_tracking_for_consts {
-                    if let Some(ptr) = ptr {
-                        // not a ZST
-                        // Skip validation entirely for some external statics
-                        let alloc_kind = self.ecx.tcx.alloc_map.lock().get(ptr.alloc_id);
-                        if let Some(GlobalAlloc::Static(did)) = alloc_kind {
-                            // `extern static` cannot be validated as they have no body.
-                            // FIXME: Statics from other crates are also skipped.
-                            // They might be checked at a different type, but for now we
-                            // want to avoid recursing too deeply.  This is not sound!
-                            if !did.is_local() || self.ecx.tcx.is_foreign_item(did) {
-                                return Ok(());
-                            }
-                        }
-                    }
-                    // Proceed recursively even for ZST, no reason to skip them!
-                    // `!` is a ZST and we want to validate it.
-                    // Normalize before handing `place` to tracking because that will
-                    // check for duplicates.
-                    let place = if size.bytes() > 0 {
-                        self.ecx.force_mplace_ptr(place).expect("we already bounds-checked")
-                    } else {
-                        place
-                    };
-                    let path = &self.path;
-                    ref_tracking.track(place, || {
-                        // We need to clone the path anyway, make sure it gets created
-                        // with enough space for the additional `Deref`.
-                        let mut new_path = Vec::with_capacity(path.len() + 1);
-                        new_path.clone_from(path);
-                        new_path.push(PathElem::Deref);
-                        new_path
-                    });
-                }
+            ty::Ref(..) => {
+                self.check_safe_pointer(value, "reference")?;
+                Ok(true)
+            }
+            ty::Adt(def, ..) if def.is_box() => {
+                self.check_safe_pointer(value, "box")?;
+                Ok(true)
             }
             ty::FnPtr(_sig) => {
-                let value = value.to_scalar_or_undef();
+                let value = self.ecx.read_scalar(value)?;
                 let _fn = try_validation!(
                     value.not_undef().and_then(|ptr| self.ecx.memory.get_fn(ptr)),
                     value,
@@ -484,27 +495,49 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
                     "a function pointer"
                 );
                 // FIXME: Check if the signature matches
+                Ok(true)
+            }
+            ty::Never => throw_validation_failure!("a value of the never type `!`", self.path),
+            ty::Foreign(..) | ty::FnDef(..) => {
+                // Nothing to check.
+                Ok(true)
             }
-            // This should be all the primitive types
-            _ => bug!("Unexpected primitive type {}", value.layout.ty),
+            // The above should be all the (inhabited) primitive types. The rest is compound, we
+            // check them by visiting their fields/variants.
+            // (`Str` UTF-8 check happens in `visit_aggregate`, too.)
+            ty::Adt(..)
+            | ty::Tuple(..)
+            | ty::Array(..)
+            | ty::Slice(..)
+            | ty::Str
+            | ty::Dynamic(..)
+            | ty::Closure(..)
+            | ty::Generator(..) => Ok(false),
+            // Some types only occur during typechecking, they have no layout.
+            // We should not see them here and we could not check them anyway.
+            ty::Error
+            | ty::Infer(..)
+            | ty::Placeholder(..)
+            | ty::Bound(..)
+            | ty::Param(..)
+            | ty::Opaque(..)
+            | ty::UnnormalizedProjection(..)
+            | ty::Projection(..)
+            | ty::GeneratorWitness(..) => bug!("Encountered invalid type {:?}", ty),
         }
-        Ok(())
-    }
-
-    fn visit_uninhabited(&mut self) -> InterpResult<'tcx> {
-        throw_validation_failure!("a value of an uninhabited type", self.path)
     }
 
     fn visit_scalar(
         &mut self,
         op: OpTy<'tcx, M::PointerTag>,
-        layout: &layout::Scalar,
+        scalar_layout: &layout::Scalar,
     ) -> InterpResult<'tcx> {
         let value = self.ecx.read_scalar(op)?;
+        let valid_range = &scalar_layout.valid_range;
+        let (lo, hi) = valid_range.clone().into_inner();
         // Determine the allowed range
-        let (lo, hi) = layout.valid_range.clone().into_inner();
         // `max_hi` is as big as the size fits
-        let max_hi = u128::max_value() >> (128 - op.layout.size.bits());
+        let max_hi = u128::MAX >> (128 - op.layout.size.bits());
         assert!(hi <= max_hi);
         // We could also write `(hi + 1) % (max_hi + 1) == lo` but `max_hi + 1` overflows for `u128`
         if (lo == 0 && hi == max_hi) || (hi + 1 == lo) {
@@ -516,7 +549,7 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
             value.not_undef(),
             value,
             self.path,
-            format_args!("something {}", wrapping_range_format(&layout.valid_range, max_hi),)
+            format_args!("something {}", wrapping_range_format(valid_range, max_hi),)
         );
         let bits = match value.to_bits_or_ptr(op.layout.size, self.ecx) {
             Err(ptr) => {
@@ -528,7 +561,7 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
                             self.path,
                             format_args!(
                                 "something that cannot possibly fail to be {}",
-                                wrapping_range_format(&layout.valid_range, max_hi)
+                                wrapping_range_format(valid_range, max_hi)
                             )
                         )
                     }
@@ -541,7 +574,7 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
                         self.path,
                         format_args!(
                             "something that cannot possibly fail to be {}",
-                            wrapping_range_format(&layout.valid_range, max_hi)
+                            wrapping_range_format(valid_range, max_hi)
                         )
                     )
                 }
@@ -549,16 +582,122 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
             Ok(data) => data,
         };
         // Now compare. This is slightly subtle because this is a special "wrap-around" range.
-        if wrapping_range_contains(&layout.valid_range, bits) {
+        if wrapping_range_contains(&valid_range, bits) {
             Ok(())
         } else {
             throw_validation_failure!(
                 bits,
                 self.path,
-                format_args!("something {}", wrapping_range_format(&layout.valid_range, max_hi))
+                format_args!("something {}", wrapping_range_format(valid_range, max_hi))
             )
         }
     }
+}
+
+impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
+    for ValidityVisitor<'rt, 'mir, 'tcx, M>
+{
+    type V = OpTy<'tcx, M::PointerTag>;
+
+    #[inline(always)]
+    fn ecx(&self) -> &InterpCx<'mir, 'tcx, M> {
+        &self.ecx
+    }
+
+    #[inline]
+    fn visit_field(
+        &mut self,
+        old_op: OpTy<'tcx, M::PointerTag>,
+        field: usize,
+        new_op: OpTy<'tcx, M::PointerTag>,
+    ) -> InterpResult<'tcx> {
+        let elem = self.aggregate_field_path_elem(old_op.layout, field);
+        self.visit_elem(new_op, elem)
+    }
+
+    #[inline]
+    fn visit_variant(
+        &mut self,
+        old_op: OpTy<'tcx, M::PointerTag>,
+        variant_id: VariantIdx,
+        new_op: OpTy<'tcx, M::PointerTag>,
+    ) -> InterpResult<'tcx> {
+        let name = match old_op.layout.ty.kind {
+            ty::Adt(adt, _) => PathElem::Variant(adt.variants[variant_id].ident.name),
+            // Generators also have variants
+            ty::Generator(..) => PathElem::GeneratorState(variant_id),
+            _ => bug!("Unexpected type with variant: {:?}", old_op.layout.ty),
+        };
+        self.visit_elem(new_op, name)
+    }
+
+    #[inline(always)]
+    fn visit_union(&mut self, op: OpTy<'tcx, M::PointerTag>, fields: usize) -> InterpResult<'tcx> {
+        // Empty unions are not accepted by rustc. But uninhabited enums
+        // claim to be unions, so allow them, too.
+        assert!(op.layout.abi.is_uninhabited() || fields > 0);
+        Ok(())
+    }
+
+    #[inline]
+    fn visit_value(&mut self, op: OpTy<'tcx, M::PointerTag>) -> InterpResult<'tcx> {
+        trace!("visit_value: {:?}, {:?}", *op, op.layout);
+
+        // Check primitive types -- the leafs of our recursive descend.
+        if self.try_visit_primitive(op)? {
+            return Ok(());
+        }
+        // Sanity check: `builtin_deref` does not know any pointers that are not primitive.
+        assert!(op.layout.ty.builtin_deref(true).is_none());
+
+        // Recursively walk the type. Translate some possible errors to something nicer.
+        match self.walk_value(op) {
+            Ok(()) => {}
+            Err(err) => match err.kind {
+                err_ub!(InvalidDiscriminant(val)) => {
+                    throw_validation_failure!(val, self.path, "a valid enum discriminant")
+                }
+                err_unsup!(ReadPointerAsBytes) => {
+                    throw_validation_failure!("a pointer", self.path, "plain (non-pointer) bytes")
+                }
+                // Propagate upwards (that will also check for unexpected errors).
+                _ => return Err(err),
+            },
+        }
+
+        // *After* all of this, check the ABI.  We need to check the ABI to handle
+        // types like `NonNull` where the `Scalar` info is more restrictive than what
+        // the fields say (`rustc_layout_scalar_valid_range_start`).
+        // But in most cases, this will just propagate what the fields say,
+        // and then we want the error to point at the field -- so, first recurse,
+        // then check ABI.
+        //
+        // FIXME: We could avoid some redundant checks here. For newtypes wrapping
+        // scalars, we do the same check on every "level" (e.g., first we check
+        // MyNewtype and then the scalar in there).
+        match op.layout.abi {
+            layout::Abi::Uninhabited => {
+                throw_validation_failure!(
+                    format_args!("a value of uninhabited type {:?}", op.layout.ty),
+                    self.path
+                );
+            }
+            layout::Abi::Scalar(ref scalar_layout) => {
+                self.visit_scalar(op, scalar_layout)?;
+            }
+            layout::Abi::ScalarPair { .. } | layout::Abi::Vector { .. } => {
+                // These have fields that we already visited above, so we already checked
+                // all their scalar-level restrictions.
+                // There is also no equivalent to `rustc_layout_scalar_valid_range_start`
+                // that would make skipping them here an issue.
+            }
+            layout::Abi::Aggregate { .. } => {
+                // Nothing to do.
+            }
+        }
+
+        Ok(())
+    }
 
     fn visit_aggregate(
         &mut self,
@@ -657,31 +796,59 @@ impl<'rt, 'mir, 'tcx, M: Machine<'mir, 'tcx>> ValueVisitor<'mir, 'tcx, M>
 }
 
 impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
-    /// This function checks the data at `op`. `op` is assumed to cover valid memory if it
-    /// is an indirect operand.
-    /// It will error if the bits at the destination do not match the ones described by the layout.
-    ///
-    /// `ref_tracking_for_consts` can be `None` to avoid recursive checking below references.
-    /// This also toggles between "run-time" (no recursion) and "compile-time" (with recursion)
-    /// validation (e.g., pointer values are fine in integers at runtime) and various other const
-    /// specific validation checks.
-    pub fn validate_operand(
+    fn validate_operand_internal(
         &self,
         op: OpTy<'tcx, M::PointerTag>,
         path: Vec<PathElem>,
         ref_tracking_for_consts: Option<
             &mut RefTracking<MPlaceTy<'tcx, M::PointerTag>, Vec<PathElem>>,
         >,
+        may_ref_to_static: bool,
     ) -> InterpResult<'tcx> {
-        trace!("validate_operand: {:?}, {:?}", *op, op.layout.ty);
+        trace!("validate_operand_internal: {:?}, {:?}", *op, op.layout.ty);
 
         // Construct a visitor
-        let mut visitor = ValidityVisitor { path, ref_tracking_for_consts, ecx: self };
+        let mut visitor =
+            ValidityVisitor { path, ref_tracking_for_consts, may_ref_to_static, ecx: self };
 
         // Try to cast to ptr *once* instead of all the time.
         let op = self.force_op_ptr(op).unwrap_or(op);
 
-        // Run it
-        visitor.visit_value(op)
+        // Run it.
+        match visitor.visit_value(op) {
+            Ok(()) => Ok(()),
+            Err(err) if matches!(err.kind, err_unsup!(ValidationFailure { .. })) => Err(err),
+            Err(err) if cfg!(debug_assertions) => {
+                bug!("Unexpected error during validation: {}", err)
+            }
+            Err(err) => Err(err),
+        }
+    }
+
+    /// This function checks the data at `op` to be const-valid.
+    /// `op` is assumed to cover valid memory if it is an indirect operand.
+    /// It will error if the bits at the destination do not match the ones described by the layout.
+    ///
+    /// `ref_tracking` is used to record references that we encounter so that they
+    /// can be checked recursively by an outside driving loop.
+    ///
+    /// `may_ref_to_static` controls whether references are allowed to point to statics.
+    #[inline(always)]
+    pub fn const_validate_operand(
+        &self,
+        op: OpTy<'tcx, M::PointerTag>,
+        path: Vec<PathElem>,
+        ref_tracking: &mut RefTracking<MPlaceTy<'tcx, M::PointerTag>, Vec<PathElem>>,
+        may_ref_to_static: bool,
+    ) -> InterpResult<'tcx> {
+        self.validate_operand_internal(op, path, Some(ref_tracking), may_ref_to_static)
+    }
+
+    /// This function checks the data at `op` to be runtime-valid.
+    /// `op` is assumed to cover valid memory if it is an indirect operand.
+    /// It will error if the bits at the destination do not match the ones described by the layout.
+    #[inline(always)]
+    pub fn validate_operand(&self, op: OpTy<'tcx, M::PointerTag>) -> InterpResult<'tcx> {
+        self.validate_operand_internal(op, vec![], None, false)
     }
 }
diff --git a/src/librustc_mir/interpret/visitor.rs b/src/librustc_mir/interpret/visitor.rs
index d2594e8707..8808fc70cf 100644
--- a/src/librustc_mir/interpret/visitor.rs
+++ b/src/librustc_mir/interpret/visitor.rs
@@ -120,7 +120,7 @@ macro_rules! make_value_visitor {
             }
             /// Visits the given value as a union. No automatic recursion can happen here.
             #[inline(always)]
-            fn visit_union(&mut self, _v: Self::V) -> InterpResult<'tcx>
+            fn visit_union(&mut self, _v: Self::V, _fields: usize) -> InterpResult<'tcx>
             {
                 Ok(())
             }
@@ -150,8 +150,9 @@ macro_rules! make_value_visitor {
             ) -> InterpResult<'tcx> {
                 self.visit_value(new_val)
             }
-
             /// Called when recursing into an enum variant.
+            /// This gives the visitor the chance to track the stack of nested fields that
+            /// we are descending through.
             #[inline(always)]
             fn visit_variant(
                 &mut self,
@@ -162,33 +163,6 @@ macro_rules! make_value_visitor {
                 self.visit_value(new_val)
             }
 
-            /// Called whenever we reach a value with uninhabited layout.
-            /// Recursing to fields will *always* continue after this!  This is not meant to control
-            /// whether and how we descend recursively/ into the scalar's fields if there are any,
-            /// it is meant to provide the chance for additional checks when a value of uninhabited
-            /// layout is detected.
-            #[inline(always)]
-            fn visit_uninhabited(&mut self) -> InterpResult<'tcx>
-            { Ok(()) }
-            /// Called whenever we reach a value with scalar layout.
-            /// We do NOT provide a `ScalarMaybeUndef` here to avoid accessing memory if the
-            /// visitor is not even interested in scalars.
-            /// Recursing to fields will *always* continue after this!  This is not meant to control
-            /// whether and how we descend recursively/ into the scalar's fields if there are any,
-            /// it is meant to provide the chance for additional checks when a value of scalar
-            /// layout is detected.
-            #[inline(always)]
-            fn visit_scalar(&mut self, _v: Self::V, _layout: &layout::Scalar) -> InterpResult<'tcx>
-            { Ok(()) }
-
-            /// Called whenever we reach a value of primitive type. There can be no recursion
-            /// below such a value. This is the leaf function.
-            /// We do *not* provide an `ImmTy` here because some implementations might want
-            /// to write to the place this primitive lives in.
-            #[inline(always)]
-            fn visit_primitive(&mut self, _v: Self::V) -> InterpResult<'tcx>
-            { Ok(()) }
-
             // Default recursors. Not meant to be overloaded.
             fn walk_aggregate(
                 &mut self,
@@ -204,23 +178,10 @@ macro_rules! make_value_visitor {
             fn walk_value(&mut self, v: Self::V) -> InterpResult<'tcx>
             {
                 trace!("walk_value: type: {}", v.layout().ty);
-                // If this is a multi-variant layout, we have to find the right one and proceed with
-                // that.
-                match v.layout().variants {
-                    layout::Variants::Multiple { .. } => {
-                        let op = v.to_op(self.ecx())?;
-                        let idx = self.ecx().read_discriminant(op)?.1;
-                        let inner = v.project_downcast(self.ecx(), idx)?;
-                        trace!("walk_value: variant layout: {:#?}", inner.layout());
-                        // recurse with the inner type
-                        return self.visit_variant(v, idx, inner);
-                    }
-                    layout::Variants::Single { .. } => {}
-                }
 
-                // Even for single variants, we might be able to get a more refined type:
-                // If it is a trait object, switch to the actual type that was used to create it.
+                // Special treatment for special types, where the (static) layout is not sufficient.
                 match v.layout().ty.kind {
+                    // If it is a trait object, switch to the real type that was used to create it.
                     ty::Dynamic(..) => {
                         // immediate trait objects are not a thing
                         let dest = v.to_op(self.ecx())?.assert_mem_place(self.ecx());
@@ -229,56 +190,16 @@ macro_rules! make_value_visitor {
                         // recurse with the inner type
                         return self.visit_field(v, 0, Value::from_mem_place(inner));
                     },
-                    ty::Generator(..) => {
-                        // FIXME: Generator layout is lying: it claims a whole bunch of fields exist
-                        // when really many of them can be uninitialized.
-                        // Just treat them as a union for now, until hopefully the layout
-                        // computation is fixed.
-                        return self.visit_union(v);
-                    }
+                    // Slices do not need special handling here: they have `Array` field
+                    // placement with length 0, so we enter the `Array` case below which
+                    // indirectly uses the metadata to determine the actual length.
                     _ => {},
                 };
 
-                // If this is a scalar, visit it as such.
-                // Things can be aggregates and have scalar layout at the same time, and that
-                // is very relevant for `NonNull` and similar structs: We need to visit them
-                // at their scalar layout *before* descending into their fields.
-                // FIXME: We could avoid some redundant checks here. For newtypes wrapping
-                // scalars, we do the same check on every "level" (e.g., first we check
-                // MyNewtype and then the scalar in there).
-                match v.layout().abi {
-                    layout::Abi::Uninhabited => {
-                        self.visit_uninhabited()?;
-                    }
-                    layout::Abi::Scalar(ref layout) => {
-                        self.visit_scalar(v, layout)?;
-                    }
-                    // FIXME: Should we do something for ScalarPair? Vector?
-                    _ => {}
-                }
-
-                // Check primitive types.  We do this after checking the scalar layout,
-                // just to have that done as well.  Primitives can have varying layout,
-                // so we check them separately and before aggregate handling.
-                // It is CRITICAL that we get this check right, or we might be
-                // validating the wrong thing!
-                let primitive = match v.layout().fields {
-                    // Primitives appear as Union with 0 fields - except for Boxes and fat pointers.
-                    layout::FieldPlacement::Union(0) => true,
-                    _ => v.layout().ty.builtin_deref(true).is_some(),
-                };
-                if primitive {
-                    return self.visit_primitive(v);
-                }
-
-                // Proceed into the fields.
+                // Visit the fields of this value.
                 match v.layout().fields {
                     layout::FieldPlacement::Union(fields) => {
-                        // Empty unions are not accepted by rustc. That's great, it means we can
-                        // use that as an unambiguous signal for detecting primitives.  Make sure
-                        // we did not miss any primitive.
-                        assert!(fields > 0);
-                        self.visit_union(v)
+                        self.visit_union(v, fields)?;
                     },
                     layout::FieldPlacement::Arbitrary { ref offsets, .. } => {
                         // FIXME: We collect in a vec because otherwise there are lifetime
@@ -288,18 +209,35 @@ macro_rules! make_value_visitor {
                                 v.project_field(self.ecx(), i as u64)
                             })
                             .collect();
-                        self.visit_aggregate(v, fields.into_iter())
+                        self.visit_aggregate(v, fields.into_iter())?;
                     },
                     layout::FieldPlacement::Array { .. } => {
                         // Let's get an mplace first.
                         let mplace = v.to_op(self.ecx())?.assert_mem_place(self.ecx());
                         // Now we can go over all the fields.
+                        // This uses the *run-time length*, i.e., if we are a slice,
+                        // the dynamic info from the metadata is used.
                         let iter = self.ecx().mplace_array_fields(mplace)?
                             .map(|f| f.and_then(|f| {
                                 Ok(Value::from_mem_place(f))
                             }));
-                        self.visit_aggregate(v, iter)
+                        self.visit_aggregate(v, iter)?;
+                    }
+                }
+
+                match v.layout().variants {
+                    // If this is a multi-variant layout, find the right variant and proceed
+                    // with *its* fields.
+                    layout::Variants::Multiple { .. } => {
+                        let op = v.to_op(self.ecx())?;
+                        let idx = self.ecx().read_discriminant(op)?.1;
+                        let inner = v.project_downcast(self.ecx(), idx)?;
+                        trace!("walk_value: variant layout: {:#?}", inner.layout());
+                        // recurse with the inner type
+                        self.visit_variant(v, idx, inner)
                     }
+                    // For single-variant layouts, we already did anything there is to do.
+                    layout::Variants::Single { .. } => Ok(())
                 }
             }
         }
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index 5e42ba3279..284dd74ce9 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -1,27 +1,20 @@
 /*!
 
-Rust MIR: a lowered representation of Rust. Also: an experiment!
+Rust MIR: a lowered representation of Rust.
 
 */
 
 #![feature(nll)]
 #![feature(in_band_lifetimes)]
-#![feature(inner_deref)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(bool_to_option)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(crate_visibility_modifier)]
-#![feature(core_intrinsics)]
-#![feature(decl_macro)]
 #![feature(drain_filter)]
 #![feature(exhaustive_patterns)]
 #![feature(iter_order_by)]
 #![feature(never_type)]
 #![feature(specialization)]
-#![feature(try_trait)]
-#![feature(unicode_internals)]
-#![feature(slice_concat_ext)]
 #![feature(trusted_len)]
 #![feature(try_blocks)]
 #![feature(associated_type_bounds)]
diff --git a/src/librustc_mir/monomorphize/collector.rs b/src/librustc_mir/monomorphize/collector.rs
index dd2071a6c5..862a7ef1e7 100644
--- a/src/librustc_mir/monomorphize/collector.rs
+++ b/src/librustc_mir/monomorphize/collector.rs
@@ -357,7 +357,7 @@ fn collect_items_rec<'tcx>(
             recursion_depth_reset = None;
 
             if let Ok(val) = tcx.const_eval_poly(def_id) {
-                collect_const(tcx, val, InternalSubsts::empty(), &mut neighbors);
+                collect_const_value(tcx, val, &mut neighbors);
             }
         }
         MonoItem::Fn(instance) => {
@@ -401,10 +401,8 @@ fn record_accesses<'tcx>(
     // We collect this into a `SmallVec` to avoid calling `is_inlining_candidate` in the lock.
     // FIXME: Call `is_inlining_candidate` when pushing to `neighbors` in `collect_items_rec`
     // instead to avoid creating this `SmallVec`.
-    let accesses: SmallVec<[_; 128]> = callees
-        .into_iter()
-        .map(|mono_item| (*mono_item, is_inlining_candidate(mono_item)))
-        .collect();
+    let accesses: SmallVec<[_; 128]> =
+        callees.iter().map(|mono_item| (*mono_item, is_inlining_candidate(mono_item))).collect();
 
     inlining_map.lock_mut().record_accesses(caller, &accesses);
 }
@@ -826,11 +824,8 @@ fn find_vtable_types_for_unsizing<'tcx>(
         (&ty::Adt(source_adt_def, source_substs), &ty::Adt(target_adt_def, target_substs)) => {
             assert_eq!(source_adt_def, target_adt_def);
 
-            let kind = monomorphize::custom_coerce_unsize_info(tcx, source_ty, target_ty);
-
-            let coerce_index = match kind {
-                CustomCoerceUnsized::Struct(i) => i,
-            };
+            let CustomCoerceUnsized::Struct(coerce_index) =
+                monomorphize::custom_coerce_unsize_info(tcx, source_ty, target_ty);
 
             let source_fields = &source_adt_def.non_enum_variant().fields;
             let target_fields = &target_adt_def.non_enum_variant().fields;
@@ -971,7 +966,7 @@ impl ItemLikeVisitor<'v> for RootCollector<'_, 'v> {
                 let def_id = self.tcx.hir().local_def_id(item.hir_id);
 
                 if let Ok(val) = self.tcx.const_eval_poly(def_id) {
-                    collect_const(self.tcx, val, InternalSubsts::empty(), &mut self.output);
+                    collect_const_value(self.tcx, val, &mut self.output);
                 }
             }
             hir::ItemKind::Fn(..) => {
@@ -1185,18 +1180,10 @@ fn collect_const<'tcx>(
         tcx.subst_and_normalize_erasing_regions(param_substs, param_env, &constant);
 
     match substituted_constant.val {
-        ty::ConstKind::Value(ConstValue::Scalar(Scalar::Ptr(ptr))) => {
-            collect_miri(tcx, ptr.alloc_id, output)
-        }
-        ty::ConstKind::Value(ConstValue::Slice { data: alloc, start: _, end: _ })
-        | ty::ConstKind::Value(ConstValue::ByRef { alloc, .. }) => {
-            for &((), id) in alloc.relocations().values() {
-                collect_miri(tcx, id, output);
-            }
-        }
+        ty::ConstKind::Value(val) => collect_const_value(tcx, val, output),
         ty::ConstKind::Unevaluated(def_id, substs, promoted) => {
             match tcx.const_eval_resolve(param_env, def_id, substs, promoted, None) {
-                Ok(val) => collect_const(tcx, val, param_substs, output),
+                Ok(val) => collect_const_value(tcx, val, output),
                 Err(ErrorHandled::Reported) => {}
                 Err(ErrorHandled::TooGeneric) => {
                     span_bug!(tcx.def_span(def_id), "collection encountered polymorphic constant",)
@@ -1206,3 +1193,19 @@ fn collect_const<'tcx>(
         _ => {}
     }
 }
+
+fn collect_const_value<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    value: ConstValue<'tcx>,
+    output: &mut Vec<MonoItem<'tcx>>,
+) {
+    match value {
+        ConstValue::Scalar(Scalar::Ptr(ptr)) => collect_miri(tcx, ptr.alloc_id, output),
+        ConstValue::Slice { data: alloc, start: _, end: _ } | ConstValue::ByRef { alloc, .. } => {
+            for &((), id) in alloc.relocations().values() {
+                collect_miri(tcx, id, output);
+            }
+        }
+        _ => {}
+    }
+}
diff --git a/src/librustc_mir/monomorphize/mod.rs b/src/librustc_mir/monomorphize/mod.rs
index 8bc63bfcfc..7177bf726d 100644
--- a/src/librustc_mir/monomorphize/mod.rs
+++ b/src/librustc_mir/monomorphize/mod.rs
@@ -13,12 +13,12 @@ pub fn custom_coerce_unsize_info<'tcx>(
     let def_id = tcx.lang_items().coerce_unsized_trait().unwrap();
 
     let trait_ref = ty::Binder::bind(ty::TraitRef {
-        def_id: def_id,
+        def_id,
         substs: tcx.mk_substs_trait(source_ty, &[target_ty.into()]),
     });
 
     match tcx.codegen_fulfill_obligation((ty::ParamEnv::reveal_all(), trait_ref)) {
-        traits::VtableImpl(traits::VtableImplData { impl_def_id, .. }) => {
+        Some(traits::VtableImpl(traits::VtableImplData { impl_def_id, .. })) => {
             tcx.coerce_unsized_info(impl_def_id).custom_kind.unwrap()
         }
         vtable => {
diff --git a/src/librustc_mir/monomorphize/partitioning.rs b/src/librustc_mir/monomorphize/partitioning.rs
index de45808a48..9b81d69ce6 100644
--- a/src/librustc_mir/monomorphize/partitioning.rs
+++ b/src/librustc_mir/monomorphize/partitioning.rs
@@ -680,13 +680,20 @@ fn characteristic_def_id_of_mono_item<'tcx>(
 
             if tcx.trait_of_item(def_id).is_some() {
                 let self_ty = instance.substs.type_at(0);
-                // This is an implementation of a trait method.
+                // This is a default implementation of a trait method.
                 return characteristic_def_id_of_type(self_ty).or(Some(def_id));
             }
 
             if let Some(impl_def_id) = tcx.impl_of_method(def_id) {
-                // This is a method within an inherent impl, find out what the
-                // self-type is:
+                if tcx.sess.opts.incremental.is_some()
+                    && tcx.trait_id_of_impl(impl_def_id) == tcx.lang_items().drop_trait()
+                {
+                    // Put `Drop::drop` into the same cgu as `drop_in_place`
+                    // since `drop_in_place` is the only thing that can
+                    // call it.
+                    return None;
+                }
+                // This is a method within an impl, find out what the self-type is:
                 let impl_self_ty = tcx.subst_and_normalize_erasing_regions(
                     instance.substs,
                     ty::ParamEnv::reveal_all(),
diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs
index 94a5f2b3bf..1f7db2861a 100644
--- a/src/librustc_mir/shim.rs
+++ b/src/librustc_mir/shim.rs
@@ -40,7 +40,7 @@ fn make_shim<'tcx>(tcx: TyCtxt<'tcx>, instance: ty::InstanceDef<'tcx>) -> &'tcx
         ),
         ty::InstanceDef::FnPtrShim(def_id, ty) => {
             let trait_ = tcx.trait_of_item(def_id).unwrap();
-            let adjustment = match tcx.lang_items().fn_trait_kind(trait_) {
+            let adjustment = match tcx.fn_trait_kind_from_lang_item(trait_) {
                 Some(ty::ClosureKind::FnOnce) => Adjustment::Identity,
                 Some(ty::ClosureKind::FnMut) | Some(ty::ClosureKind::Fn) => Adjustment::Deref,
                 None => bug!("fn pointer {:?} is not an fn", ty),
@@ -68,6 +68,7 @@ fn make_shim<'tcx>(tcx: TyCtxt<'tcx>, instance: ty::InstanceDef<'tcx>) -> &'tcx
             let fn_mut = tcx.lang_items().fn_mut_trait().unwrap();
             let call_mut = tcx
                 .associated_items(fn_mut)
+                .in_definition_order()
                 .find(|it| it.kind == ty::AssocKind::Method)
                 .unwrap()
                 .def_id;
diff --git a/src/librustc_mir/transform/add_retag.rs b/src/librustc_mir/transform/add_retag.rs
index a5b467c1e1..2306177c14 100644
--- a/src/librustc_mir/transform/add_retag.rs
+++ b/src/librustc_mir/transform/add_retag.rs
@@ -14,13 +14,13 @@ pub struct AddRetag;
 /// after the assignment, we can be sure to obtain the same place value.
 /// (Concurrent accesses by other threads are no problem as these are anyway non-atomic
 /// copies.  Data races are UB.)
-fn is_stable(place: PlaceRef<'_, '_>) -> bool {
+fn is_stable(place: PlaceRef<'_>) -> bool {
     place.projection.iter().all(|elem| {
         match elem {
             // Which place this evaluates to can change with any memory write,
             // so cannot assume this to be stable.
             ProjectionElem::Deref => false,
-            // Array indices are intersting, but MIR building generates a *fresh*
+            // Array indices are interesting, but MIR building generates a *fresh*
             // temporary for every array access, so the index cannot be changed as
             // a side-effect.
             ProjectionElem::Index { .. } |
@@ -75,8 +75,8 @@ impl<'tcx> MirPass<'tcx> for AddRetag {
         {
             let source_info = SourceInfo {
                 scope: OUTERMOST_SOURCE_SCOPE,
-                span: span, // FIXME: Consider using just the span covering the function
-                            // argument declaration.
+                span, // FIXME: Consider using just the span covering the function
+                      // argument declaration.
             };
             // Gather all arguments, skip return value.
             let places = local_decls
diff --git a/src/librustc_mir/transform/check_consts/ops.rs b/src/librustc_mir/transform/check_consts/ops.rs
index 3263905ead..9ba44a4d18 100644
--- a/src/librustc_mir/transform/check_consts/ops.rs
+++ b/src/librustc_mir/transform/check_consts/ops.rs
@@ -65,10 +65,8 @@ impl NonConstOp for Downcast {
 pub struct FnCallIndirect;
 impl NonConstOp for FnCallIndirect {
     fn emit_error(&self, item: &Item<'_, '_>, span: Span) {
-        let mut err = item
-            .tcx
-            .sess
-            .struct_span_err(span, &format!("function pointers are not allowed in const fn"));
+        let mut err =
+            item.tcx.sess.struct_span_err(span, "function pointers are not allowed in const fn");
         err.emit();
     }
 }
diff --git a/src/librustc_mir/transform/check_consts/qualifs.rs b/src/librustc_mir/transform/check_consts/qualifs.rs
index 577736f9bd..baff8383c2 100644
--- a/src/librustc_mir/transform/check_consts/qualifs.rs
+++ b/src/librustc_mir/transform/check_consts/qualifs.rs
@@ -34,8 +34,8 @@ pub trait Qualif {
 
     fn in_projection_structurally(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
-        place: PlaceRef<'_, 'tcx>,
+        per_local: &mut impl FnMut(Local) -> bool,
+        place: PlaceRef<'tcx>,
     ) -> bool {
         if let [proj_base @ .., elem] = place.projection {
             let base_qualif = Self::in_place(
@@ -66,26 +66,26 @@ pub trait Qualif {
 
     fn in_projection(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
-        place: PlaceRef<'_, 'tcx>,
+        per_local: &mut impl FnMut(Local) -> bool,
+        place: PlaceRef<'tcx>,
     ) -> bool {
         Self::in_projection_structurally(cx, per_local, place)
     }
 
     fn in_place(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
-        place: PlaceRef<'_, 'tcx>,
+        per_local: &mut impl FnMut(Local) -> bool,
+        place: PlaceRef<'tcx>,
     ) -> bool {
         match place {
-            PlaceRef { local, projection: [] } => per_local(*local),
+            PlaceRef { local, projection: [] } => per_local(local),
             PlaceRef { local: _, projection: [.., _] } => Self::in_projection(cx, per_local, place),
         }
     }
 
     fn in_operand(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
+        per_local: &mut impl FnMut(Local) -> bool,
         operand: &Operand<'tcx>,
     ) -> bool {
         match *operand {
@@ -94,39 +94,30 @@ pub trait Qualif {
             }
 
             Operand::Constant(ref constant) => {
-                if constant.check_static_ptr(cx.tcx).is_some() {
-                    // `mir_const_qualif` does return the qualifs in the final value of a `static`,
-                    // so we could use value-based qualification here, but we shouldn't do this
-                    // without a good reason.
-                    //
-                    // Note: this uses `constant.literal.ty` which is a reference or pointer to the
-                    // type of the actual `static` item.
-                    Self::in_any_value_of_ty(cx, constant.literal.ty)
-                } else if let ty::ConstKind::Unevaluated(def_id, _, promoted) = constant.literal.val
-                {
+                // Check the qualifs of the value of `const` items.
+                if let ty::ConstKind::Unevaluated(def_id, _, promoted) = constant.literal.val {
                     assert!(promoted.is_none());
                     // Don't peek inside trait associated constants.
-                    if cx.tcx.trait_of_item(def_id).is_some() {
-                        Self::in_any_value_of_ty(cx, constant.literal.ty)
-                    } else {
+                    if cx.tcx.trait_of_item(def_id).is_none() {
                         let qualifs = cx.tcx.at(constant.span).mir_const_qualif(def_id);
-                        let qualif = Self::in_qualifs(&qualifs);
+                        if !Self::in_qualifs(&qualifs) {
+                            return false;
+                        }
 
                         // Just in case the type is more specific than
                         // the definition, e.g., impl associated const
                         // with type parameters, take it into account.
-                        qualif && Self::in_any_value_of_ty(cx, constant.literal.ty)
                     }
-                } else {
-                    false
                 }
+                // Otherwise use the qualifs of the type.
+                Self::in_any_value_of_ty(cx, constant.literal.ty)
             }
         }
     }
 
     fn in_rvalue_structurally(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
+        per_local: &mut impl FnMut(Local) -> bool,
         rvalue: &Rvalue<'tcx>,
     ) -> bool {
         match *rvalue {
@@ -149,12 +140,12 @@ pub trait Qualif {
             Rvalue::Ref(_, _, ref place) | Rvalue::AddressOf(_, ref place) => {
                 // Special-case reborrows to be more like a copy of the reference.
                 if let [proj_base @ .., ProjectionElem::Deref] = place.projection.as_ref() {
-                    let base_ty = Place::ty_from(&place.local, proj_base, *cx.body, cx.tcx).ty;
+                    let base_ty = Place::ty_from(place.local, proj_base, *cx.body, cx.tcx).ty;
                     if let ty::Ref(..) = base_ty.kind {
                         return Self::in_place(
                             cx,
                             per_local,
-                            PlaceRef { local: &place.local, projection: proj_base },
+                            PlaceRef { local: place.local, projection: proj_base },
                         );
                     }
                 }
@@ -170,7 +161,7 @@ pub trait Qualif {
 
     fn in_rvalue(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
+        per_local: &mut impl FnMut(Local) -> bool,
         rvalue: &Rvalue<'tcx>,
     ) -> bool {
         Self::in_rvalue_structurally(cx, per_local, rvalue)
@@ -178,7 +169,7 @@ pub trait Qualif {
 
     fn in_call(
         cx: &ConstCx<'_, 'tcx>,
-        _per_local: &impl Fn(Local) -> bool,
+        _per_local: &mut impl FnMut(Local) -> bool,
         _callee: &Operand<'tcx>,
         _args: &[Operand<'tcx>],
         return_ty: Ty<'tcx>,
@@ -208,7 +199,7 @@ impl Qualif for HasMutInterior {
 
     fn in_rvalue(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
+        per_local: &mut impl FnMut(Local) -> bool,
         rvalue: &Rvalue<'tcx>,
     ) -> bool {
         match *rvalue {
@@ -249,7 +240,7 @@ impl Qualif for NeedsDrop {
 
     fn in_rvalue(
         cx: &ConstCx<'_, 'tcx>,
-        per_local: &impl Fn(Local) -> bool,
+        per_local: &mut impl FnMut(Local) -> bool,
         rvalue: &Rvalue<'tcx>,
     ) -> bool {
         if let Rvalue::Aggregate(ref kind, _) = *rvalue {
diff --git a/src/librustc_mir/transform/check_consts/resolver.rs b/src/librustc_mir/transform/check_consts/resolver.rs
index 2cd2495eef..3e14cc6d32 100644
--- a/src/librustc_mir/transform/check_consts/resolver.rs
+++ b/src/librustc_mir/transform/check_consts/resolver.rs
@@ -15,7 +15,7 @@ use crate::dataflow::{self as old_dataflow, generic as dataflow};
 /// `FlowSensitiveAnalysis`.
 ///
 /// This transfer does nothing when encountering an indirect assignment. Consumers should rely on
-/// the `IndirectlyMutableLocals` dataflow pass to see if a `Local` may have become qualified via
+/// the `MaybeMutBorrowedLocals` dataflow pass to see if a `Local` may have become qualified via
 /// an indirect assignment or function call.
 struct TransferFunction<'a, 'mir, 'tcx, Q> {
     item: &'a Item<'mir, 'tcx>,
@@ -48,7 +48,7 @@ where
 
         match (value, place.as_ref()) {
             (true, mir::PlaceRef { local, .. }) => {
-                self.qualifs_per_local.insert(*local);
+                self.qualifs_per_local.insert(local);
             }
 
             // For now, we do not clear the qualif if a local is overwritten in full by
@@ -71,8 +71,13 @@ where
         return_place: &mir::Place<'tcx>,
     ) {
         let return_ty = return_place.ty(*self.item.body, self.item.tcx).ty;
-        let qualif =
-            Q::in_call(self.item, &|l| self.qualifs_per_local.contains(l), func, args, return_ty);
+        let qualif = Q::in_call(
+            self.item,
+            &mut |l| self.qualifs_per_local.contains(l),
+            func,
+            args,
+            return_ty,
+        );
         if !return_place.is_indirect() {
             self.assign_qualif_direct(return_place, qualif);
         }
@@ -105,7 +110,7 @@ where
         rvalue: &mir::Rvalue<'tcx>,
         location: Location,
     ) {
-        let qualif = Q::in_rvalue(self.item, &|l| self.qualifs_per_local.contains(l), rvalue);
+        let qualif = Q::in_rvalue(self.item, &mut |l| self.qualifs_per_local.contains(l), rvalue);
         if !place.is_indirect() {
             self.assign_qualif_direct(place, qualif);
         }
@@ -120,7 +125,8 @@ where
         // here; that occurs in `apply_call_return_effect`.
 
         if let mir::TerminatorKind::DropAndReplace { value, location: dest, .. } = kind {
-            let qualif = Q::in_operand(self.item, &|l| self.qualifs_per_local.contains(l), value);
+            let qualif =
+                Q::in_operand(self.item, &mut |l| self.qualifs_per_local.contains(l), value);
             if !dest.is_indirect() {
                 self.assign_qualif_direct(dest, qualif);
             }
diff --git a/src/librustc_mir/transform/check_consts/validation.rs b/src/librustc_mir/transform/check_consts/validation.rs
index 44b2a90053..133772407c 100644
--- a/src/librustc_mir/transform/check_consts/validation.rs
+++ b/src/librustc_mir/transform/check_consts/validation.rs
@@ -3,28 +3,32 @@
 use rustc::middle::lang_items;
 use rustc::mir::visit::{MutatingUseContext, NonMutatingUseContext, PlaceContext, Visitor};
 use rustc::mir::*;
-use rustc::traits::{self, TraitEngine};
 use rustc::ty::cast::CastTy;
-use rustc::ty::{self, TyCtxt};
+use rustc::ty::{self, Instance, InstanceDef, TyCtxt};
 use rustc_errors::struct_span_err;
 use rustc_hir::{def_id::DefId, HirId};
 use rustc_index::bit_set::BitSet;
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits::{self, TraitEngine};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
 
 use std::borrow::Cow;
 use std::ops::Deref;
 
-use self::old_dataflow::IndirectlyMutableLocals;
 use super::ops::{self, NonConstOp};
 use super::qualifs::{self, HasMutInterior, NeedsDrop};
 use super::resolver::FlowSensitiveAnalysis;
 use super::{is_lang_panic_fn, ConstKind, Item, Qualif};
 use crate::const_eval::{is_const_fn, is_unstable_const_fn};
-use crate::dataflow::{self as old_dataflow, generic as dataflow};
+use crate::dataflow::generic::{self as dataflow, Analysis};
+use crate::dataflow::MaybeMutBorrowedLocals;
 
+// We are using `MaybeMutBorrowedLocals` as a proxy for whether an item may have been mutated
+// through a pointer prior to the given point. This is okay even though `MaybeMutBorrowedLocals`
+// kills locals upon `StorageDead` because a local will never be used after a `StorageDead`.
 pub type IndirectlyMutableResults<'mir, 'tcx> =
-    old_dataflow::DataflowResultsCursor<'mir, 'tcx, IndirectlyMutableLocals<'mir, 'tcx>>;
+    dataflow::ResultsCursor<'mir, 'tcx, MaybeMutBorrowedLocals<'mir, 'tcx>>;
 
 struct QualifCursor<'a, 'mir, 'tcx, Q: Qualif> {
     cursor: dataflow::ResultsCursor<'mir, 'tcx, FlowSensitiveAnalysis<'a, 'mir, 'tcx, Q>>,
@@ -33,10 +37,10 @@ struct QualifCursor<'a, 'mir, 'tcx, Q: Qualif> {
 
 impl<Q: Qualif> QualifCursor<'a, 'mir, 'tcx, Q> {
     pub fn new(q: Q, item: &'a Item<'mir, 'tcx>) -> Self {
-        let analysis = FlowSensitiveAnalysis::new(q, item);
-        let results = dataflow::Engine::new_generic(item.tcx, &item.body, item.def_id, analysis)
-            .iterate_to_fixpoint();
-        let cursor = dataflow::ResultsCursor::new(*item.body, results);
+        let cursor = FlowSensitiveAnalysis::new(q, item)
+            .into_engine(item.tcx, &item.body, item.def_id)
+            .iterate_to_fixpoint()
+            .into_results_cursor(*item.body);
 
         let mut in_any_value_of_ty = BitSet::new_empty(item.body.local_decls.len());
         for (local, decl) in item.body.local_decls.iter_enumerated() {
@@ -57,14 +61,14 @@ pub struct Qualifs<'a, 'mir, 'tcx> {
 
 impl Qualifs<'a, 'mir, 'tcx> {
     fn indirectly_mutable(&mut self, local: Local, location: Location) -> bool {
-        self.indirectly_mutable.seek(location);
+        self.indirectly_mutable.seek_before(location);
         self.indirectly_mutable.get().contains(local)
     }
 
     /// Returns `true` if `local` is `NeedsDrop` at the given `Location`.
     ///
     /// Only updates the cursor if absolutely necessary
-    fn needs_drop_lazy_seek(&mut self, local: Local, location: Location) -> bool {
+    fn needs_drop(&mut self, local: Local, location: Location) -> bool {
         if !self.needs_drop.in_any_value_of_ty.contains(local) {
             return false;
         }
@@ -76,7 +80,7 @@ impl Qualifs<'a, 'mir, 'tcx> {
     /// Returns `true` if `local` is `HasMutInterior` at the given `Location`.
     ///
     /// Only updates the cursor if absolutely necessary.
-    fn has_mut_interior_lazy_seek(&mut self, local: Local, location: Location) -> bool {
+    fn has_mut_interior(&mut self, local: Local, location: Location) -> bool {
         if !self.has_mut_interior.in_any_value_of_ty.contains(local) {
             return false;
         }
@@ -86,17 +90,6 @@ impl Qualifs<'a, 'mir, 'tcx> {
             || self.indirectly_mutable(local, location)
     }
 
-    /// Returns `true` if `local` is `HasMutInterior`, but requires the `has_mut_interior` and
-    /// `indirectly_mutable` cursors to be updated beforehand.
-    fn has_mut_interior_eager_seek(&self, local: Local) -> bool {
-        if !self.has_mut_interior.in_any_value_of_ty.contains(local) {
-            return false;
-        }
-
-        self.has_mut_interior.cursor.get().contains(local)
-            || self.indirectly_mutable.get().contains(local)
-    }
-
     fn in_return_place(&mut self, item: &Item<'_, 'tcx>) -> ConstQualifs {
         // Find the `Return` terminator if one exists.
         //
@@ -120,8 +113,8 @@ impl Qualifs<'a, 'mir, 'tcx> {
         let return_loc = item.body.terminator_loc(return_block);
 
         ConstQualifs {
-            needs_drop: self.needs_drop_lazy_seek(RETURN_PLACE, return_loc),
-            has_mut_interior: self.has_mut_interior_lazy_seek(RETURN_PLACE, return_loc),
+            needs_drop: self.needs_drop(RETURN_PLACE, return_loc),
+            has_mut_interior: self.has_mut_interior(RETURN_PLACE, return_loc),
         }
     }
 }
@@ -144,22 +137,21 @@ impl Deref for Validator<'_, 'mir, 'tcx> {
 
 impl Validator<'a, 'mir, 'tcx> {
     pub fn new(item: &'a Item<'mir, 'tcx>) -> Self {
+        let Item { tcx, body, def_id, param_env, .. } = *item;
+
         let needs_drop = QualifCursor::new(NeedsDrop, item);
         let has_mut_interior = QualifCursor::new(HasMutInterior, item);
 
-        let dead_unwinds = BitSet::new_empty(item.body.basic_blocks().len());
-        let indirectly_mutable = old_dataflow::do_dataflow(
-            item.tcx,
-            &*item.body,
-            item.def_id,
-            &item.tcx.get_attrs(item.def_id),
-            &dead_unwinds,
-            old_dataflow::IndirectlyMutableLocals::new(item.tcx, *item.body, item.param_env),
-            |_, local| old_dataflow::DebugFormatted::new(&local),
-        );
-
-        let indirectly_mutable =
-            old_dataflow::DataflowResultsCursor::new(indirectly_mutable, *item.body);
+        // We can use `unsound_ignore_borrow_on_drop` here because custom drop impls are not
+        // allowed in a const.
+        //
+        // FIXME(ecstaticmorse): Someday we want to allow custom drop impls. How do we do this
+        // without breaking stable code?
+        let indirectly_mutable = MaybeMutBorrowedLocals::mut_borrows_only(tcx, *body, param_env)
+            .unsound_ignore_borrow_on_drop()
+            .into_engine(tcx, *body, def_id)
+            .iterate_to_fixpoint()
+            .into_results_cursor(*body);
 
         let qualifs = Qualifs { needs_drop, has_mut_interior, indirectly_mutable };
 
@@ -244,23 +236,6 @@ impl Validator<'a, 'mir, 'tcx> {
             self.check_op_spanned(ops::StaticAccess, span)
         }
     }
-
-    fn check_immutable_borrow_like(&mut self, location: Location, place: &Place<'tcx>) {
-        // FIXME: Change the `in_*` methods to take a `FnMut` so we don't have to manually
-        // seek the cursors beforehand.
-        self.qualifs.has_mut_interior.cursor.seek_before(location);
-        self.qualifs.indirectly_mutable.seek(location);
-
-        let borrowed_place_has_mut_interior = HasMutInterior::in_place(
-            &self.item,
-            &|local| self.qualifs.has_mut_interior_eager_seek(local),
-            place.as_ref(),
-        );
-
-        if borrowed_place_has_mut_interior {
-            self.check_op(ops::CellBorrow);
-        }
-    }
 }
 
 impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
@@ -301,7 +276,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
                         }
                     };
                     self.visit_place_base(&place.local, ctx, location);
-                    self.visit_projection(&place.local, reborrowed_proj, ctx, location);
+                    self.visit_projection(place.local, reborrowed_proj, ctx, location);
                     return;
                 }
             }
@@ -314,7 +289,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
                         Mutability::Mut => PlaceContext::MutatingUse(MutatingUseContext::AddressOf),
                     };
                     self.visit_place_base(&place.local, ctx, location);
-                    self.visit_projection(&place.local, reborrowed_proj, ctx, location);
+                    self.visit_projection(place.local, reborrowed_proj, ctx, location);
                     return;
                 }
             }
@@ -366,12 +341,17 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
             Rvalue::AddressOf(Mutability::Mut, _) => self.check_op(ops::MutAddressOf),
 
             Rvalue::Ref(_, BorrowKind::Shared, ref place)
-            | Rvalue::Ref(_, BorrowKind::Shallow, ref place) => {
-                self.check_immutable_borrow_like(location, place)
-            }
-
-            Rvalue::AddressOf(Mutability::Not, ref place) => {
-                self.check_immutable_borrow_like(location, place)
+            | Rvalue::Ref(_, BorrowKind::Shallow, ref place)
+            | Rvalue::AddressOf(Mutability::Not, ref place) => {
+                let borrowed_place_has_mut_interior = HasMutInterior::in_place(
+                    &self.item,
+                    &mut |local| self.qualifs.has_mut_interior(local, location),
+                    place.as_ref(),
+                );
+
+                if borrowed_place_has_mut_interior {
+                    self.check_op(ops::CellBorrow);
+                }
             }
 
             Rvalue::Cast(CastKind::Misc, ref operand, cast_ty) => {
@@ -428,7 +408,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
     }
     fn visit_projection_elem(
         &mut self,
-        place_local: &Local,
+        place_local: Local,
         proj_base: &[PlaceElem<'tcx>],
         elem: &PlaceElem<'tcx>,
         context: PlaceContext,
@@ -452,7 +432,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
                 if let ty::RawPtr(_) = base_ty.kind {
                     if proj_base.is_empty() {
                         if let (local, []) = (place_local, proj_base) {
-                            let decl = &self.body.local_decls[*local];
+                            let decl = &self.body.local_decls[local];
                             if let LocalInfo::StaticRef { def_id, .. } = decl.local_info {
                                 let span = decl.source_info.span;
                                 self.check_static(def_id, span);
@@ -522,8 +502,8 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
             TerminatorKind::Call { func, .. } => {
                 let fn_ty = func.ty(*self.body, self.tcx);
 
-                let def_id = match fn_ty.kind {
-                    ty::FnDef(def_id, _) => def_id,
+                let (def_id, substs) = match fn_ty.kind {
+                    ty::FnDef(def_id, substs) => (def_id, substs),
 
                     ty::FnPtr(_) => {
                         self.check_op(ops::FnCallIndirect);
@@ -540,6 +520,20 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
                     return;
                 }
 
+                // See if this is a trait method for a concrete type whose impl of that trait is
+                // `const`.
+                if self.tcx.features().const_trait_impl {
+                    let instance = Instance::resolve(self.tcx, self.param_env, def_id, substs);
+                    debug!("Resolving ({:?}) -> {:?}", def_id, instance);
+                    if let Some(func) = instance {
+                        if let InstanceDef::Item(def_id) = func.def {
+                            if is_const_fn(self.tcx, def_id) {
+                                return;
+                            }
+                        }
+                    }
+                }
+
                 if is_lang_panic_fn(self.tcx, def_id) {
                     self.check_op(ops::Panic);
                 } else if let Some(feature) = is_unstable_const_fn(self.tcx, def_id) {
@@ -571,7 +565,7 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
                 let needs_drop = if let Some(local) = dropped_place.as_local() {
                     // Use the span where the local was declared as the span of the drop error.
                     err_span = self.body.local_decls[local].source_info.span;
-                    self.qualifs.needs_drop_lazy_seek(local, location)
+                    self.qualifs.needs_drop(local, location)
                 } else {
                     true
                 };
@@ -588,7 +582,10 @@ impl Visitor<'tcx> for Validator<'_, 'mir, 'tcx> {
 
 fn error_min_const_fn_violation(tcx: TyCtxt<'_>, span: Span, msg: Cow<'_, str>) {
     struct_span_err!(tcx.sess, span, E0723, "{}", msg)
-        .note("for more information, see issue https://github.com/rust-lang/rust/issues/57563")
+        .note(
+            "see issue #57563 <https://github.com/rust-lang/rust/issues/57563> \
+             for more information",
+        )
         .help("add `#![feature(const_fn)]` to the crate attributes to enable")
         .emit();
 }
@@ -616,16 +613,16 @@ fn check_short_circuiting_in_const_local(item: &Item<'_, 'tcx>) {
                 *span,
                 &format!(
                     "use of {} here does not actually short circuit due to \
-                the const evaluator presently not being able to do control flow. \
-                See https://github.com/rust-lang/rust/issues/49146 for more \
-                information.",
+                     the const evaluator presently not being able to do control flow. \
+                     See issue #49146 <https://github.com/rust-lang/rust/issues/49146> \
+                     for more information.",
                     kind
                 ),
             );
         }
         for local in locals {
             let span = body.local_decls[local].source_info.span;
-            error.span_note(span, "more locals defined here");
+            error.span_note(span, "more locals are defined here");
         }
         error.emit();
     }
@@ -664,7 +661,7 @@ fn place_as_reborrow(
         //
         // This is sufficient to prevent an access to a `static mut` from being marked as a
         // reborrow, even if the check above were to disappear.
-        let inner_ty = Place::ty_from(&place.local, inner, body, tcx).ty;
+        let inner_ty = Place::ty_from(place.local, inner, body, tcx).ty;
         match inner_ty.kind {
             ty::Ref(..) => Some(inner),
             _ => None,
diff --git a/src/librustc_mir/transform/check_unsafety.rs b/src/librustc_mir/transform/check_unsafety.rs
index 73bd6c1c6c..4dcbcdcbae 100644
--- a/src/librustc_mir/transform/check_unsafety.rs
+++ b/src/librustc_mir/transform/check_unsafety.rs
@@ -148,16 +148,10 @@ impl<'a, 'tcx> Visitor<'tcx> for UnsafetyChecker<'a, 'tcx> {
                 let cast_out = CastTy::from_ty(cast_ty).expect("bad output type for cast");
                 match (cast_in, cast_out) {
                     (CastTy::Ptr(_), CastTy::Int(_)) | (CastTy::FnPtr, CastTy::Int(_)) => {
-                        self.register_violations(
-                            &[UnsafetyViolation {
-                                source_info: self.source_info,
-                                description: Symbol::intern("cast of pointer to int"),
-                                details: Symbol::intern(
-                                    "casting pointers to integers in constants",
-                                ),
-                                kind: UnsafetyViolationKind::General,
-                            }],
-                            &[],
+                        self.require_unsafe(
+                            "cast of pointer to int",
+                            "casting pointers to integers in constants",
+                            UnsafetyViolationKind::General,
                         );
                     }
                     _ => {}
@@ -171,14 +165,10 @@ impl<'a, 'tcx> Visitor<'tcx> for UnsafetyChecker<'a, 'tcx> {
                 if self.const_context && self.tcx.features().const_compare_raw_pointers =>
             {
                 if let ty::RawPtr(_) | ty::FnPtr(..) = lhs.ty(self.body, self.tcx).kind {
-                    self.register_violations(
-                        &[UnsafetyViolation {
-                            source_info: self.source_info,
-                            description: Symbol::intern("pointer operation"),
-                            details: Symbol::intern("operations on pointers in constants"),
-                            kind: UnsafetyViolationKind::General,
-                        }],
-                        &[],
+                    self.require_unsafe(
+                        "pointer operation",
+                        "operations on pointers in constants",
+                        UnsafetyViolationKind::General,
                     );
                 }
             }
@@ -188,6 +178,16 @@ impl<'a, 'tcx> Visitor<'tcx> for UnsafetyChecker<'a, 'tcx> {
     }
 
     fn visit_place(&mut self, place: &Place<'tcx>, context: PlaceContext, _location: Location) {
+        // prevent
+        // * `&mut x.field`
+        // * `x.field = y;`
+        // * `&x.field` if `field`'s type has interior mutability
+        // because either of these would allow modifying the layout constrained field and
+        // insert values that violate the layout constraints.
+        if context.is_mutating_use() || context.is_borrow() {
+            self.check_mut_borrowing_layout_constrained_field(place, context.is_mutating_use());
+        }
+
         for (i, elem) in place.projection.iter().enumerate() {
             let proj_base = &place.projection[..i];
 
@@ -199,39 +199,18 @@ impl<'a, 'tcx> Visitor<'tcx> for UnsafetyChecker<'a, 'tcx> {
                         .as_ref()
                         .assert_crate_local()
                         .lint_root;
-                    self.register_violations(
-                        &[UnsafetyViolation {
-                            source_info,
-                            description: Symbol::intern("borrow of packed field"),
-                            details: Symbol::intern(
-                                "fields of packed structs might be misaligned: dereferencing a \
-                            misaligned pointer or even just creating a misaligned reference \
-                            is undefined behavior",
-                            ),
-                            kind: UnsafetyViolationKind::BorrowPacked(lint_root),
-                        }],
-                        &[],
+                    self.require_unsafe(
+                        "borrow of packed field",
+                        "fields of packed structs might be misaligned: dereferencing a \
+                        misaligned pointer or even just creating a misaligned reference \
+                        is undefined behavior",
+                        UnsafetyViolationKind::BorrowPacked(lint_root),
                     );
                 }
             }
-            let is_borrow_of_interior_mut = context.is_borrow()
-                && !Place::ty_from(&place.local, proj_base, self.body, self.tcx).ty.is_freeze(
-                    self.tcx,
-                    self.param_env,
-                    self.source_info.span,
-                );
-            // prevent
-            // * `&mut x.field`
-            // * `x.field = y;`
-            // * `&x.field` if `field`'s type has interior mutability
-            // because either of these would allow modifying the layout constrained field and
-            // insert values that violate the layout constraints.
-            if context.is_mutating_use() || is_borrow_of_interior_mut {
-                self.check_mut_borrowing_layout_constrained_field(place, context.is_mutating_use());
-            }
             let old_source_info = self.source_info;
-            if let (local, []) = (&place.local, proj_base) {
-                let decl = &self.body.local_decls[*local];
+            if let [] = proj_base {
+                let decl = &self.body.local_decls[place.local];
                 if decl.internal {
                     if let LocalInfo::StaticRef { def_id, .. } = decl.local_info {
                         if self.tcx.is_mutable_static(def_id) {
@@ -256,11 +235,11 @@ impl<'a, 'tcx> Visitor<'tcx> for UnsafetyChecker<'a, 'tcx> {
                         // Internal locals are used in the `move_val_init` desugaring.
                         // We want to check unsafety against the source info of the
                         // desugaring, rather than the source info of the RHS.
-                        self.source_info = self.body.local_decls[*local].source_info;
+                        self.source_info = self.body.local_decls[place.local].source_info;
                     }
                 }
             }
-            let base_ty = Place::ty_from(&place.local, proj_base, self.body, self.tcx).ty;
+            let base_ty = Place::ty_from(place.local, proj_base, self.body, self.tcx).ty;
             match base_ty.kind {
                 ty::RawPtr(..) => self.require_unsafe(
                     "dereference of raw pointer",
@@ -412,10 +391,12 @@ impl<'a, 'tcx> UnsafetyChecker<'a, 'tcx> {
             cursor = proj_base;
 
             match elem {
+                // Modifications behind a dereference don't affect the value of
+                // the pointer.
+                ProjectionElem::Deref => return,
                 ProjectionElem::Field(..) => {
                     let ty =
-                        Place::ty_from(&place.local, proj_base, &self.body.local_decls, self.tcx)
-                            .ty;
+                        Place::ty_from(place.local, proj_base, &self.body.local_decls, self.tcx).ty;
                     match ty.kind {
                         ty::Adt(def, _) => match self.tcx.layout_scalar_valid_range(def.did) {
                             (Bound::Unbounded, Bound::Unbounded) => {}
@@ -426,7 +407,14 @@ impl<'a, 'tcx> UnsafetyChecker<'a, 'tcx> {
                                         "mutating layout constrained fields cannot statically be \
                                         checked for valid values",
                                     )
-                                } else {
+
+                                // Check `is_freeze` as late as possible to avoid cycle errors
+                                // with opaque types.
+                                } else if !place.ty(self.body, self.tcx).ty.is_freeze(
+                                    self.tcx,
+                                    self.param_env,
+                                    self.source_info.span,
+                                ) {
                                     (
                                         "borrow of layout constrained field with interior \
                                         mutability",
@@ -434,16 +422,13 @@ impl<'a, 'tcx> UnsafetyChecker<'a, 'tcx> {
                                         lose the constraints. Coupled with interior mutability, \
                                         the field can be changed to invalid values",
                                     )
+                                } else {
+                                    continue;
                                 };
-                                let source_info = self.source_info;
-                                self.register_violations(
-                                    &[UnsafetyViolation {
-                                        source_info,
-                                        description: Symbol::intern(description),
-                                        details: Symbol::intern(details),
-                                        kind: UnsafetyViolationKind::GeneralAndConstFn,
-                                    }],
-                                    &[],
+                                self.require_unsafe(
+                                    description,
+                                    details,
+                                    UnsafetyViolationKind::GeneralAndConstFn,
                                 );
                             }
                         },
@@ -538,18 +523,20 @@ fn unsafe_derive_on_repr_packed(tcx: TyCtxt<'_>, def_id: DefId) {
         .as_local_hir_id(def_id)
         .unwrap_or_else(|| bug!("checking unsafety for non-local def id {:?}", def_id));
 
-    // FIXME: when we make this a hard error, this should have its
-    // own error code.
-    let message = if tcx.generics_of(def_id).own_requires_monomorphization() {
-        "`#[derive]` can't be used on a `#[repr(packed)]` struct with \
-         type or const parameters (error E0133)"
-            .to_string()
-    } else {
-        "`#[derive]` can't be used on a `#[repr(packed)]` struct that \
-         does not derive Copy (error E0133)"
-            .to_string()
-    };
-    tcx.lint_hir(SAFE_PACKED_BORROWS, lint_hir_id, tcx.def_span(def_id), &message);
+    tcx.struct_span_lint_hir(SAFE_PACKED_BORROWS, lint_hir_id, tcx.def_span(def_id), |lint| {
+        // FIXME: when we make this a hard error, this should have its
+        // own error code.
+        let message = if tcx.generics_of(def_id).own_requires_monomorphization() {
+            "`#[derive]` can't be used on a `#[repr(packed)]` struct with \
+             type or const parameters (error E0133)"
+                .to_string()
+        } else {
+            "`#[derive]` can't be used on a `#[repr(packed)]` struct that \
+             does not derive Copy (error E0133)"
+                .to_string()
+        };
+        lint.build(&message).emit()
+    });
 }
 
 /// Returns the `HirId` for an enclosing scope that is also `unsafe`.
@@ -580,16 +567,18 @@ fn is_enclosed(
 
 fn report_unused_unsafe(tcx: TyCtxt<'_>, used_unsafe: &FxHashSet<hir::HirId>, id: hir::HirId) {
     let span = tcx.sess.source_map().def_span(tcx.hir().span(id));
-    let msg = "unnecessary `unsafe` block";
-    let mut db = tcx.struct_span_lint_hir(UNUSED_UNSAFE, id, span, msg);
-    db.span_label(span, msg);
-    if let Some((kind, id)) = is_enclosed(tcx, used_unsafe, id) {
-        db.span_label(
-            tcx.sess.source_map().def_span(tcx.hir().span(id)),
-            format!("because it's nested under this `unsafe` {}", kind),
-        );
-    }
-    db.emit();
+    tcx.struct_span_lint_hir(UNUSED_UNSAFE, id, span, |lint| {
+        let msg = "unnecessary `unsafe` block";
+        let mut db = lint.build(msg);
+        db.span_label(span, msg);
+        if let Some((kind, id)) = is_enclosed(tcx, used_unsafe, id) {
+            db.span_label(
+                tcx.sess.source_map().def_span(tcx.hir().span(id)),
+                format!("because it's nested under this `unsafe` {}", kind),
+            );
+        }
+        db.emit();
+    });
 }
 
 fn builtin_derive_def_id(tcx: TyCtxt<'_>, def_id: DefId) -> Option<DefId> {
@@ -641,19 +630,21 @@ pub fn check_unsafety(tcx: TyCtxt<'_>, def_id: DefId) {
                         SAFE_PACKED_BORROWS,
                         lint_hir_id,
                         source_info.span,
-                        &format!(
-                            "{} is unsafe and requires unsafe function or block (error E0133)",
-                            description
-                        ),
+                        |lint| {
+                            lint.build(&format!(
+                                "{} is unsafe and requires unsafe function or block (error E0133)",
+                                description
+                            ))
+                            .note(&details.as_str())
+                            .emit()
+                        },
                     )
-                    .note(&details.as_str())
-                    .emit();
                 }
             }
         }
     }
 
-    let mut unsafe_blocks: Vec<_> = unsafe_blocks.into_iter().collect();
+    let mut unsafe_blocks: Vec<_> = unsafe_blocks.iter().collect();
     unsafe_blocks.sort_by_cached_key(|(hir_id, _)| tcx.hir().hir_to_node_id(*hir_id));
     let used_unsafe: FxHashSet<_> =
         unsafe_blocks.iter().flat_map(|&&(id, used)| used.then_some(id)).collect();
diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index d645f6cf18..a07c8575b3 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -4,29 +4,29 @@
 use std::borrow::Cow;
 use std::cell::Cell;
 
-use rustc::mir::interpret::{InterpResult, PanicInfo, Scalar};
+use rustc::lint;
+use rustc::mir::interpret::{InterpResult, Scalar};
 use rustc::mir::visit::{
     MutVisitor, MutatingUseContext, NonMutatingUseContext, PlaceContext, Visitor,
 };
 use rustc::mir::{
-    read_only, AggregateKind, BasicBlock, BinOp, Body, BodyAndCache, ClearCrossCrate, Constant,
-    Local, LocalDecl, LocalKind, Location, Operand, Place, ReadOnlyBodyAndCache, Rvalue,
+    read_only, AggregateKind, AssertKind, BasicBlock, BinOp, Body, BodyAndCache, ClearCrossCrate,
+    Constant, Local, LocalDecl, LocalKind, Location, Operand, Place, ReadOnlyBodyAndCache, Rvalue,
     SourceInfo, SourceScope, SourceScopeData, Statement, StatementKind, Terminator, TerminatorKind,
     UnOp, RETURN_PLACE,
 };
-use rustc::traits;
 use rustc::ty::layout::{
     HasDataLayout, HasTyCtxt, LayoutError, LayoutOf, Size, TargetDataLayout, TyLayout,
 };
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::{self, ConstKind, Instance, ParamEnv, Ty, TyCtxt, TypeFoldable};
+use rustc_ast::ast::Mutability;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def::DefKind;
-use rustc_hir::def_id::DefId;
 use rustc_hir::HirId;
 use rustc_index::vec::IndexVec;
-use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::Mutability;
+use rustc_infer::traits;
+use rustc_span::Span;
 
 use crate::const_eval::error_to_const_error;
 use crate::interpret::{
@@ -198,7 +198,7 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine {
     fn assert_panic(
         _ecx: &mut InterpCx<'mir, 'tcx, Self>,
         _span: Span,
-        _msg: &rustc::mir::interpret::AssertMessage<'tcx>,
+        _msg: &rustc::mir::AssertMessage<'tcx>,
         _unwind: Option<rustc::mir::BasicBlock>,
     ) -> InterpResult<'tcx> {
         bug!("panics terminators are not evaluated in ConstProp");
@@ -221,13 +221,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine {
         ));
     }
 
-    fn find_foreign_static(
-        _tcx: TyCtxt<'tcx>,
-        _def_id: DefId,
-    ) -> InterpResult<'tcx, Cow<'tcx, Allocation<Self::PointerTag>>> {
-        throw_unsup!(ReadForeignStatic)
-    }
-
     #[inline(always)]
     fn init_allocation_extra<'b>(
         _memory_extra: &(),
@@ -278,10 +271,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine {
         Ok(())
     }
 
-    fn before_terminator(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
-        Ok(())
-    }
-
     #[inline(always)]
     fn stack_push(_ecx: &mut InterpCx<'mir, 'tcx, Self>) -> InterpResult<'tcx> {
         Ok(())
@@ -292,7 +281,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine {
 struct ConstPropagator<'mir, 'tcx> {
     ecx: InterpCx<'mir, 'tcx, ConstPropMachine>,
     tcx: TyCtxt<'tcx>,
-    source: MirSource<'tcx>,
     can_const_prop: IndexVec<Local, ConstPropMode>,
     param_env: ParamEnv<'tcx>,
     // FIXME(eddyb) avoid cloning these two fields more than once,
@@ -372,7 +360,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         ConstPropagator {
             ecx,
             tcx,
-            source,
             param_env,
             can_const_prop,
             // FIXME(eddyb) avoid cloning these two fields more than once,
@@ -410,57 +397,25 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         }
     }
 
-    fn use_ecx<F, T>(&mut self, source_info: SourceInfo, f: F) -> Option<T>
+    fn use_ecx<F, T>(&mut self, f: F) -> Option<T>
     where
         F: FnOnce(&mut Self) -> InterpResult<'tcx, T>,
     {
-        self.ecx.tcx.span = source_info.span;
-        // FIXME(eddyb) move this to the `Panic(_)` error case, so that
-        // `f(self)` is always called, and that the only difference when the
-        // scope's `local_data` is missing, is that the lint isn't emitted.
-        let lint_root = self.lint_root(source_info)?;
         let r = match f(self) {
             Ok(val) => Some(val),
             Err(error) => {
-                use rustc::mir::interpret::{
-                    InterpError::*, UndefinedBehaviorInfo, UnsupportedOpInfo,
-                };
-                match error.kind {
-                    MachineStop(_) => bug!("ConstProp does not stop"),
-
-                    // Some error shouldn't come up because creating them causes
-                    // an allocation, which we should avoid. When that happens,
-                    // dedicated error variants should be introduced instead.
-                    // Only test this in debug builds though to avoid disruptions.
-                    Unsupported(UnsupportedOpInfo::Unsupported(_))
-                    | Unsupported(UnsupportedOpInfo::ValidationFailure(_))
-                    | UndefinedBehavior(UndefinedBehaviorInfo::Ub(_))
-                    | UndefinedBehavior(UndefinedBehaviorInfo::UbExperimental(_))
-                        if cfg!(debug_assertions) =>
-                    {
-                        bug!("const-prop encountered allocating error: {:?}", error.kind);
-                    }
-
-                    Unsupported(_)
-                    | UndefinedBehavior(_)
-                    | InvalidProgram(_)
-                    | ResourceExhaustion(_) => {
-                        // Ignore these errors.
-                    }
-                    Panic(_) => {
-                        let diagnostic = error_to_const_error(&self.ecx, error);
-                        diagnostic.report_as_lint(
-                            self.ecx.tcx,
-                            "this expression will panic at runtime",
-                            lint_root,
-                            None,
-                        );
-                    }
-                }
+                // Some errors shouldn't come up because creating them causes
+                // an allocation, which we should avoid. When that happens,
+                // dedicated error variants should be introduced instead.
+                // Only test this in debug builds though to avoid disruptions.
+                debug_assert!(
+                    !error.kind.allocates(),
+                    "const-prop encountered allocating error: {}",
+                    error
+                );
                 None
             }
         };
-        self.ecx.tcx.span = DUMMY_SP;
         r
     }
 
@@ -504,36 +459,55 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         }
     }
 
-    fn eval_place(&mut self, place: &Place<'tcx>, source_info: SourceInfo) -> Option<OpTy<'tcx>> {
+    fn eval_place(&mut self, place: &Place<'tcx>) -> Option<OpTy<'tcx>> {
         trace!("eval_place(place={:?})", place);
-        self.use_ecx(source_info, |this| this.ecx.eval_place_to_op(place, None))
+        self.use_ecx(|this| this.ecx.eval_place_to_op(place, None))
     }
 
     fn eval_operand(&mut self, op: &Operand<'tcx>, source_info: SourceInfo) -> Option<OpTy<'tcx>> {
         match *op {
             Operand::Constant(ref c) => self.eval_constant(c, source_info),
-            Operand::Move(ref place) | Operand::Copy(ref place) => {
-                self.eval_place(place, source_info)
-            }
+            Operand::Move(ref place) | Operand::Copy(ref place) => self.eval_place(place),
         }
     }
 
-    fn check_unary_op(&mut self, arg: &Operand<'tcx>, source_info: SourceInfo) -> Option<()> {
-        self.use_ecx(source_info, |this| {
-            let ty = arg.ty(&this.local_decls, this.tcx);
-
-            if ty.is_integral() {
-                let arg = this.ecx.eval_operand(arg, None)?;
-                let prim = this.ecx.read_immediate(arg)?;
-                // Need to do overflow check here: For actual CTFE, MIR
-                // generation emits code that does this before calling the op.
-                if prim.to_bits()? == (1 << (prim.layout.size.bits() - 1)) {
-                    throw_panic!(OverflowNeg)
-                }
-            }
+    fn report_assert_as_lint(
+        &self,
+        lint: &'static lint::Lint,
+        source_info: SourceInfo,
+        message: &'static str,
+        panic: AssertKind<u64>,
+    ) -> Option<()> {
+        let lint_root = self.lint_root(source_info)?;
+        self.tcx.struct_span_lint_hir(lint, lint_root, source_info.span, |lint| {
+            let mut err = lint.build(message);
+            err.span_label(source_info.span, format!("{:?}", panic));
+            err.emit()
+        });
+        return None;
+    }
 
-            Ok(())
-        })?;
+    fn check_unary_op(
+        &mut self,
+        op: UnOp,
+        arg: &Operand<'tcx>,
+        source_info: SourceInfo,
+    ) -> Option<()> {
+        if self.use_ecx(|this| {
+            let val = this.ecx.read_immediate(this.ecx.eval_operand(arg, None)?)?;
+            let (_res, overflow, _ty) = this.ecx.overflowing_unary_op(op, val)?;
+            Ok(overflow)
+        })? {
+            // `AssertKind` only has an `OverflowNeg` variant, so make sure that is
+            // appropriate to use.
+            assert_eq!(op, UnOp::Neg, "Neg is the only UnOp that can overflow");
+            self.report_assert_as_lint(
+                lint::builtin::ARITHMETIC_OVERFLOW,
+                source_info,
+                "this arithmetic operation will overflow",
+                AssertKind::OverflowNeg,
+            )?;
+        }
 
         Some(())
     }
@@ -544,45 +518,41 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         left: &Operand<'tcx>,
         right: &Operand<'tcx>,
         source_info: SourceInfo,
-        place_layout: TyLayout<'tcx>,
-        overflow_check: bool,
     ) -> Option<()> {
-        let r = self.use_ecx(source_info, |this| {
-            this.ecx.read_immediate(this.ecx.eval_operand(right, None)?)
-        })?;
+        let r =
+            self.use_ecx(|this| this.ecx.read_immediate(this.ecx.eval_operand(right, None)?))?;
+        // Check for exceeding shifts *even if* we cannot evaluate the LHS.
         if op == BinOp::Shr || op == BinOp::Shl {
-            let left_bits = place_layout.size.bits();
+            // We need the type of the LHS. We cannot use `place_layout` as that is the type
+            // of the result, which for checked binops is not the same!
+            let left_ty = left.ty(&self.local_decls, self.tcx);
+            let left_size_bits = self.ecx.layout_of(left_ty).ok()?.size.bits();
             let right_size = r.layout.size;
-            let r_bits = r.to_scalar().and_then(|r| r.to_bits(right_size));
-            if r_bits.map_or(false, |b| b >= left_bits as u128) {
-                let lint_root = self.lint_root(source_info)?;
-                let dir = if op == BinOp::Shr { "right" } else { "left" };
-                self.tcx.lint_hir(
-                    ::rustc::lint::builtin::EXCEEDING_BITSHIFTS,
-                    lint_root,
-                    source_info.span,
-                    &format!("attempt to shift {} with overflow", dir),
-                );
-                return None;
+            let r_bits = r.to_scalar().ok();
+            // This is basically `force_bits`.
+            let r_bits = r_bits.and_then(|r| r.to_bits_or_ptr(right_size, &self.tcx).ok());
+            if r_bits.map_or(false, |b| b >= left_size_bits as u128) {
+                self.report_assert_as_lint(
+                    lint::builtin::ARITHMETIC_OVERFLOW,
+                    source_info,
+                    "this arithmetic operation will overflow",
+                    AssertKind::Overflow(op),
+                )?;
             }
         }
 
-        // If overflow checking is enabled (like in debug mode by default),
-        // then we'll already catch overflow when we evaluate the `Assert` statement
-        // in MIR. However, if overflow checking is disabled, then there won't be any
-        // `Assert` statement and so we have to do additional checking here.
-        if !overflow_check {
-            self.use_ecx(source_info, |this| {
-                let l = this.ecx.read_immediate(this.ecx.eval_operand(left, None)?)?;
-                let (_, overflow, _ty) = this.ecx.overflowing_binary_op(op, l, r)?;
-
-                if overflow {
-                    let err = err_panic!(Overflow(op)).into();
-                    return Err(err);
-                }
-
-                Ok(())
-            })?;
+        // The remaining operators are handled through `overflowing_binary_op`.
+        if self.use_ecx(|this| {
+            let l = this.ecx.read_immediate(this.ecx.eval_operand(left, None)?)?;
+            let (_res, overflow, _ty) = this.ecx.overflowing_binary_op(op, l, r)?;
+            Ok(overflow)
+        })? {
+            self.report_assert_as_lint(
+                lint::builtin::ARITHMETIC_OVERFLOW,
+                source_info,
+                "this arithmetic operation will overflow",
+                AssertKind::Overflow(op),
+            )?;
         }
 
         Some(())
@@ -605,8 +575,6 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
             return None;
         }
 
-        let overflow_check = self.tcx.sess.overflow_checks();
-
         // Perform any special handling for specific Rvalue types.
         // Generally, checks here fall into one of two categories:
         //   1. Additional checking to provide useful lints to the user
@@ -615,19 +583,26 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         //   2. Working around bugs in other parts of the compiler
         //        - In this case, we'll return `None` from this function to stop evaluation.
         match rvalue {
-            // Additional checking: if overflow checks are disabled (which is usually the case in
-            // release mode), then we need to do additional checking here to give lints to the user
-            // if an overflow would occur.
-            Rvalue::UnaryOp(UnOp::Neg, arg) if !overflow_check => {
-                trace!("checking UnaryOp(op = Neg, arg = {:?})", arg);
-                self.check_unary_op(arg, source_info)?;
+            // Additional checking: give lints to the user if an overflow would occur.
+            // We do this here and not in the `Assert` terminator as that terminator is
+            // only sometimes emitted (overflow checks can be disabled), but we want to always
+            // lint.
+            Rvalue::UnaryOp(op, arg) => {
+                trace!("checking UnaryOp(op = {:?}, arg = {:?})", op, arg);
+                self.check_unary_op(*op, arg, source_info)?;
             }
-
-            // Additional checking: check for overflows on integer binary operations and report
-            // them to the user as lints.
             Rvalue::BinaryOp(op, left, right) => {
                 trace!("checking BinaryOp(op = {:?}, left = {:?}, right = {:?})", op, left, right);
-                self.check_binary_op(*op, left, right, source_info, place_layout, overflow_check)?;
+                self.check_binary_op(*op, left, right, source_info)?;
+            }
+            Rvalue::CheckedBinaryOp(op, left, right) => {
+                trace!(
+                    "checking CheckedBinaryOp(op = {:?}, left = {:?}, right = {:?})",
+                    op,
+                    left,
+                    right
+                );
+                self.check_binary_op(*op, left, right, source_info)?;
             }
 
             // Do not try creating references (#67862)
@@ -640,7 +615,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
             _ => {}
         }
 
-        self.use_ecx(source_info, |this| {
+        self.use_ecx(|this| {
             trace!("calling eval_rvalue_into_place(rvalue = {:?}, place = {:?})", rvalue, place);
             this.ecx.eval_rvalue_into_place(rvalue, place)?;
             Ok(())
@@ -662,18 +637,19 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
         source_info: SourceInfo,
     ) {
         trace!("attepting to replace {:?} with {:?}", rval, value);
-        if let Err(e) = self.ecx.validate_operand(
+        if let Err(e) = self.ecx.const_validate_operand(
             value,
             vec![],
             // FIXME: is ref tracking too expensive?
-            Some(&mut interpret::RefTracking::empty()),
+            &mut interpret::RefTracking::empty(),
+            /*may_ref_to_static*/ true,
         ) {
             trace!("validation error, attempt failed: {:?}", e);
             return;
         }
 
-        // FIXME> figure out what tho do when try_read_immediate fails
-        let imm = self.use_ecx(source_info, |this| this.ecx.try_read_immediate(value));
+        // FIXME> figure out what to do when try_read_immediate fails
+        let imm = self.use_ecx(|this| this.ecx.try_read_immediate(value));
 
         if let Some(Ok(imm)) = imm {
             match *imm {
@@ -696,7 +672,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
                     if let ty::Tuple(substs) = ty {
                         // Only do it if tuple is also a pair with two scalars
                         if substs.len() == 2 {
-                            let opt_ty1_ty2 = self.use_ecx(source_info, |this| {
+                            let opt_ty1_ty2 = self.use_ecx(|this| {
                                 let ty1 = substs[0].expect_ty();
                                 let ty2 = substs[1].expect_ty();
                                 let ty_is_scalar = |ty| {
@@ -906,41 +882,40 @@ impl<'mir, 'tcx> MutVisitor<'tcx> for ConstPropagator<'mir, 'tcx> {
                             }
                             Operand::Constant(_) => {}
                         }
-                        let span = terminator.source_info.span;
-                        let hir_id = self
-                            .tcx
-                            .hir()
-                            .as_local_hir_id(self.source.def_id())
-                            .expect("some part of a failing const eval must be local");
                         let msg = match msg {
-                            PanicInfo::Overflow(_)
-                            | PanicInfo::OverflowNeg
-                            | PanicInfo::DivisionByZero
-                            | PanicInfo::RemainderByZero => msg.description().to_owned(),
-                            PanicInfo::BoundsCheck { ref len, ref index } => {
+                            AssertKind::DivisionByZero => AssertKind::DivisionByZero,
+                            AssertKind::RemainderByZero => AssertKind::RemainderByZero,
+                            AssertKind::BoundsCheck { ref len, ref index } => {
                                 let len =
                                     self.eval_operand(len, source_info).expect("len must be const");
-                                let len = match self.ecx.read_scalar(len) {
-                                    Ok(ScalarMaybeUndef::Scalar(Scalar::Raw { data, .. })) => data,
-                                    other => bug!("const len not primitive: {:?}", other),
-                                };
+                                let len = self
+                                    .ecx
+                                    .read_scalar(len)
+                                    .unwrap()
+                                    .to_machine_usize(&self.tcx)
+                                    .unwrap();
                                 let index = self
                                     .eval_operand(index, source_info)
                                     .expect("index must be const");
-                                let index = match self.ecx.read_scalar(index) {
-                                    Ok(ScalarMaybeUndef::Scalar(Scalar::Raw { data, .. })) => data,
-                                    other => bug!("const index not primitive: {:?}", other),
-                                };
-                                format!(
-                                    "index out of bounds: \
-                                    the len is {} but the index is {}",
-                                    len, index,
-                                )
+                                let index = self
+                                    .ecx
+                                    .read_scalar(index)
+                                    .unwrap()
+                                    .to_machine_usize(&self.tcx)
+                                    .unwrap();
+                                AssertKind::BoundsCheck { len, index }
                             }
-                            // Need proper const propagator for these
+                            // Overflow is are already covered by checks on the binary operators.
+                            AssertKind::Overflow(_) | AssertKind::OverflowNeg => return,
+                            // Need proper const propagator for these.
                             _ => return,
                         };
-                        self.tcx.lint_hir(::rustc::lint::builtin::CONST_ERR, hir_id, span, &msg);
+                        self.report_assert_as_lint(
+                            lint::builtin::UNCONDITIONAL_PANIC,
+                            source_info,
+                            "this operation will panic at runtime",
+                            msg,
+                        );
                     } else {
                         if self.should_const_prop(value) {
                             if let ScalarMaybeUndef::Scalar(scalar) = value_const {
diff --git a/src/librustc_mir/transform/dump_mir.rs b/src/librustc_mir/transform/dump_mir.rs
index 2cbda33ad2..5dec2c6df9 100644
--- a/src/librustc_mir/transform/dump_mir.rs
+++ b/src/librustc_mir/transform/dump_mir.rs
@@ -61,7 +61,7 @@ pub fn on_mir_pass<'tcx>(
 
 pub fn emit_mir(tcx: TyCtxt<'_>, outputs: &OutputFilenames) -> io::Result<()> {
     let path = outputs.path(OutputType::Mir);
-    let mut f = File::create(&path)?;
+    let mut f = io::BufWriter::new(File::create(&path)?);
     mir_util::write_mir_pretty(tcx, None, &mut f)?;
     Ok(())
 }
diff --git a/src/librustc_mir/transform/elaborate_drops.rs b/src/librustc_mir/transform/elaborate_drops.rs
index 1c0b1b8c13..5d02074aaa 100644
--- a/src/librustc_mir/transform/elaborate_drops.rs
+++ b/src/librustc_mir/transform/elaborate_drops.rs
@@ -1,8 +1,8 @@
-use crate::dataflow::move_paths::{HasMoveData, LookupResult, MoveData, MovePathIndex};
-use crate::dataflow::DataflowResults;
+use crate::dataflow;
+use crate::dataflow::generic::{Analysis, ResultsCursor};
+use crate::dataflow::move_paths::{LookupResult, MoveData, MovePathIndex};
+use crate::dataflow::on_lookup_result_bits;
 use crate::dataflow::MoveDataParamEnv;
-use crate::dataflow::{self, do_dataflow, DebugFormatted};
-use crate::dataflow::{drop_flag_effects_for_location, on_lookup_result_bits};
 use crate::dataflow::{on_all_children_bits, on_all_drop_children_bits};
 use crate::dataflow::{MaybeInitializedPlaces, MaybeUninitializedPlaces};
 use crate::transform::{MirPass, MirSource};
@@ -40,31 +40,24 @@ impl<'tcx> MirPass<'tcx> for ElaborateDrops {
             let body = &*body;
             let env = MoveDataParamEnv { move_data, param_env };
             let dead_unwinds = find_dead_unwinds(tcx, body, def_id, &env);
-            let flow_inits = do_dataflow(
-                tcx,
-                body,
-                def_id,
-                &[],
-                &dead_unwinds,
-                MaybeInitializedPlaces::new(tcx, body, &env),
-                |bd, p| DebugFormatted::new(&bd.move_data().move_paths[p]),
-            );
-            let flow_uninits = do_dataflow(
-                tcx,
-                body,
-                def_id,
-                &[],
-                &dead_unwinds,
-                MaybeUninitializedPlaces::new(tcx, body, &env),
-                |bd, p| DebugFormatted::new(&bd.move_data().move_paths[p]),
-            );
+
+            let inits = MaybeInitializedPlaces::new(tcx, body, &env)
+                .into_engine(tcx, body, def_id)
+                .dead_unwinds(&dead_unwinds)
+                .iterate_to_fixpoint()
+                .into_results_cursor(body);
+
+            let uninits = MaybeUninitializedPlaces::new(tcx, body, &env)
+                .into_engine(tcx, body, def_id)
+                .dead_unwinds(&dead_unwinds)
+                .iterate_to_fixpoint()
+                .into_results_cursor(body);
 
             ElaborateDropsCtxt {
                 tcx,
                 body,
                 env: &env,
-                flow_inits,
-                flow_uninits,
+                init_data: InitializationData { inits, uninits },
                 drop_flags: Default::default(),
                 patch: MirPatch::new(body),
             }
@@ -87,15 +80,10 @@ fn find_dead_unwinds<'tcx>(
     // We only need to do this pass once, because unwind edges can only
     // reach cleanup blocks, which can't have unwind edges themselves.
     let mut dead_unwinds = BitSet::new_empty(body.basic_blocks().len());
-    let flow_inits = do_dataflow(
-        tcx,
-        body,
-        def_id,
-        &[],
-        &dead_unwinds,
-        MaybeInitializedPlaces::new(tcx, body, &env),
-        |bd, p| DebugFormatted::new(&bd.move_data().move_paths[p]),
-    );
+    let mut flow_inits = MaybeInitializedPlaces::new(tcx, body, &env)
+        .into_engine(tcx, body, def_id)
+        .iterate_to_fixpoint()
+        .into_results_cursor(body);
     for (bb, bb_data) in body.basic_blocks().iter_enumerated() {
         let location = match bb_data.terminator().kind {
             TerminatorKind::Drop { ref location, unwind: Some(_), .. }
@@ -103,15 +91,7 @@ fn find_dead_unwinds<'tcx>(
             _ => continue,
         };
 
-        let mut init_data = InitializationData {
-            live: flow_inits.sets().entry_set_for(bb.index()).to_owned(),
-            dead: BitSet::new_empty(env.move_data.move_paths.len()),
-        };
-        debug!("find_dead_unwinds @ {:?}: {:?}; init_data={:?}", bb, bb_data, init_data.live);
-        for stmt in 0..bb_data.statements.len() {
-            let loc = Location { block: bb, statement_index: stmt };
-            init_data.apply_location(tcx, body, env, loc);
-        }
+        debug!("find_dead_unwinds @ {:?}: {:?}", bb, bb_data);
 
         let path = match env.move_data.rev_lookup.find(location.as_ref()) {
             LookupResult::Exact(e) => e,
@@ -121,12 +101,18 @@ fn find_dead_unwinds<'tcx>(
             }
         };
 
-        debug!("find_dead_unwinds @ {:?}: path({:?})={:?}", bb, location, path);
+        flow_inits.seek_before(body.terminator_loc(bb));
+        debug!(
+            "find_dead_unwinds @ {:?}: path({:?})={:?}; init_data={:?}",
+            bb,
+            location,
+            path,
+            flow_inits.get()
+        );
 
         let mut maybe_live = false;
         on_all_drop_children_bits(tcx, body, &env, path, |child| {
-            let (child_maybe_live, _) = init_data.state(child);
-            maybe_live |= child_maybe_live;
+            maybe_live |= flow_inits.contains(child);
         });
 
         debug!("find_dead_unwinds @ {:?}: maybe_live={}", bb, maybe_live);
@@ -138,41 +124,23 @@ fn find_dead_unwinds<'tcx>(
     dead_unwinds
 }
 
-struct InitializationData {
-    live: BitSet<MovePathIndex>,
-    dead: BitSet<MovePathIndex>,
+struct InitializationData<'mir, 'tcx> {
+    inits: ResultsCursor<'mir, 'tcx, MaybeInitializedPlaces<'mir, 'tcx>>,
+    uninits: ResultsCursor<'mir, 'tcx, MaybeUninitializedPlaces<'mir, 'tcx>>,
 }
 
-impl InitializationData {
-    fn apply_location<'tcx>(
-        &mut self,
-        tcx: TyCtxt<'tcx>,
-        body: &Body<'tcx>,
-        env: &MoveDataParamEnv<'tcx>,
-        loc: Location,
-    ) {
-        drop_flag_effects_for_location(tcx, body, env, loc, |path, df| {
-            debug!("at location {:?}: setting {:?} to {:?}", loc, path, df);
-            match df {
-                DropFlagState::Present => {
-                    self.live.insert(path);
-                    self.dead.remove(path);
-                }
-                DropFlagState::Absent => {
-                    self.dead.insert(path);
-                    self.live.remove(path);
-                }
-            }
-        });
+impl InitializationData<'_, '_> {
+    fn seek_before(&mut self, loc: Location) {
+        self.inits.seek_before(loc);
+        self.uninits.seek_before(loc);
     }
 
-    fn state(&self, path: MovePathIndex) -> (bool, bool) {
-        (self.live.contains(path), self.dead.contains(path))
+    fn maybe_live_dead(&self, path: MovePathIndex) -> (bool, bool) {
+        (self.inits.contains(path), self.uninits.contains(path))
     }
 }
 
 struct Elaborator<'a, 'b, 'tcx> {
-    init_data: &'a InitializationData,
     ctxt: &'a mut ElaborateDropsCtxt<'b, 'tcx>,
 }
 
@@ -203,13 +171,13 @@ impl<'a, 'b, 'tcx> DropElaborator<'a, 'tcx> for Elaborator<'a, 'b, 'tcx> {
 
     fn drop_style(&self, path: Self::Path, mode: DropFlagMode) -> DropStyle {
         let ((maybe_live, maybe_dead), multipart) = match mode {
-            DropFlagMode::Shallow => (self.init_data.state(path), false),
+            DropFlagMode::Shallow => (self.ctxt.init_data.maybe_live_dead(path), false),
             DropFlagMode::Deep => {
                 let mut some_live = false;
                 let mut some_dead = false;
                 let mut children_count = 0;
                 on_all_drop_children_bits(self.tcx(), self.body(), self.ctxt.env, path, |child| {
-                    let (live, dead) = self.init_data.state(child);
+                    let (live, dead) = self.ctxt.init_data.maybe_live_dead(child);
                     debug!("elaborate_drop: state({:?}) = {:?}", child, (live, dead));
                     some_live |= live;
                     some_dead |= dead;
@@ -283,8 +251,7 @@ struct ElaborateDropsCtxt<'a, 'tcx> {
     tcx: TyCtxt<'tcx>,
     body: &'a Body<'tcx>,
     env: &'a MoveDataParamEnv<'tcx>,
-    flow_inits: DataflowResults<'tcx, MaybeInitializedPlaces<'a, 'tcx>>,
-    flow_uninits: DataflowResults<'tcx, MaybeUninitializedPlaces<'a, 'tcx>>,
+    init_data: InitializationData<'a, 'tcx>,
     drop_flags: FxHashMap<MovePathIndex, Local>,
     patch: MirPatch<'tcx>,
 }
@@ -298,22 +265,6 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
         self.env.param_env
     }
 
-    fn initialization_data_at(&self, loc: Location) -> InitializationData {
-        let mut data = InitializationData {
-            live: self.flow_inits.sets().entry_set_for(loc.block.index()).to_owned(),
-            dead: self.flow_uninits.sets().entry_set_for(loc.block.index()).to_owned(),
-        };
-        for stmt in 0..loc.statement_index {
-            data.apply_location(
-                self.tcx,
-                self.body,
-                self.env,
-                Location { block: loc.block, statement_index: stmt },
-            );
-        }
-        data
-    }
-
     fn create_drop_flag(&mut self, index: MovePathIndex, span: Span) {
         let tcx = self.tcx;
         let patch = &mut self.patch;
@@ -349,10 +300,7 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
                 _ => continue,
             };
 
-            let init_data = self.initialization_data_at(Location {
-                block: bb,
-                statement_index: data.statements.len(),
-            });
+            self.init_data.seek_before(self.body.terminator_loc(bb));
 
             let path = self.move_data().rev_lookup.find(location.as_ref());
             debug!("collect_drop_flags: {:?}, place {:?} ({:?})", bb, location, path);
@@ -361,7 +309,7 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
                 LookupResult::Exact(e) => e,
                 LookupResult::Parent(None) => continue,
                 LookupResult::Parent(Some(parent)) => {
-                    let (_maybe_live, maybe_dead) = init_data.state(parent);
+                    let (_maybe_live, maybe_dead) = self.init_data.maybe_live_dead(parent);
                     if maybe_dead {
                         span_bug!(
                             terminator.source_info.span,
@@ -376,7 +324,7 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
             };
 
             on_all_drop_children_bits(self.tcx, self.body, self.env, path, |child| {
-                let (maybe_live, maybe_dead) = init_data.state(child);
+                let (maybe_live, maybe_dead) = self.init_data.maybe_live_dead(child);
                 debug!(
                     "collect_drop_flags: collecting {:?} from {:?}@{:?} - {:?}",
                     child,
@@ -399,10 +347,10 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
             let resume_block = self.patch.resume_block();
             match terminator.kind {
                 TerminatorKind::Drop { ref location, target, unwind } => {
-                    let init_data = self.initialization_data_at(loc);
+                    self.init_data.seek_before(loc);
                     match self.move_data().rev_lookup.find(location.as_ref()) {
                         LookupResult::Exact(path) => elaborate_drop(
-                            &mut Elaborator { init_data: &init_data, ctxt: self },
+                            &mut Elaborator { ctxt: self },
                             terminator.source_info,
                             location,
                             path,
@@ -482,10 +430,9 @@ impl<'b, 'tcx> ElaborateDropsCtxt<'b, 'tcx> {
         match self.move_data().rev_lookup.find(location.as_ref()) {
             LookupResult::Exact(path) => {
                 debug!("elaborate_drop_and_replace({:?}) - tracked {:?}", terminator, path);
-                let init_data = self.initialization_data_at(loc);
-
+                self.init_data.seek_before(loc);
                 elaborate_drop(
-                    &mut Elaborator { init_data: &init_data, ctxt: self },
+                    &mut Elaborator { ctxt: self },
                     terminator.source_info,
                     location,
                     path,
diff --git a/src/librustc_mir/transform/generator.rs b/src/librustc_mir/transform/generator.rs
index 1c86d6f3f6..d060a0eab3 100644
--- a/src/librustc_mir/transform/generator.rs
+++ b/src/librustc_mir/transform/generator.rs
@@ -49,9 +49,8 @@
 //! For generators with state 1 (returned) and state 2 (poisoned) it does nothing.
 //! Otherwise it drops all the values in scope at the last suspension point.
 
-use crate::dataflow::{do_dataflow, DataflowResultsCursor, DebugFormatted};
-use crate::dataflow::{DataflowResults, DataflowResultsConsumer, FlowAtLocation};
-use crate::dataflow::{HaveBeenBorrowedLocals, MaybeStorageLive, RequiresStorage};
+use crate::dataflow::generic::{self as dataflow, Analysis};
+use crate::dataflow::{MaybeBorrowedLocals, MaybeRequiresStorage, MaybeStorageLive};
 use crate::transform::no_landing_pads::no_landing_pads;
 use crate::transform::simplify;
 use crate::transform::{MirPass, MirSource};
@@ -185,17 +184,24 @@ fn self_arg() -> Local {
     Local::new(1)
 }
 
-/// Generator have not been resumed yet
+/// Generator has not been resumed yet.
 const UNRESUMED: usize = GeneratorSubsts::UNRESUMED;
-/// Generator has returned / is completed
+/// Generator has returned / is completed.
 const RETURNED: usize = GeneratorSubsts::RETURNED;
-/// Generator has been poisoned
+/// Generator has panicked and is poisoned.
 const POISONED: usize = GeneratorSubsts::POISONED;
 
-struct SuspensionPoint {
+/// A `yield` point in the generator.
+struct SuspensionPoint<'tcx> {
+    /// State discriminant used when suspending or resuming at this point.
     state: usize,
+    /// The block to jump to after resumption.
     resume: BasicBlock,
+    /// Where to move the resume argument after resumption.
+    resume_arg: Place<'tcx>,
+    /// Which block to jump to if the generator is dropped in this state.
     drop: Option<BasicBlock>,
+    /// Set of locals that have live storage while at this suspension point.
     storage_liveness: liveness::LiveVarSet,
 }
 
@@ -216,7 +222,7 @@ struct TransformVisitor<'tcx> {
     storage_liveness: FxHashMap<BasicBlock, liveness::LiveVarSet>,
 
     // A list of suspension points, generated during the transform
-    suspension_points: Vec<SuspensionPoint>,
+    suspension_points: Vec<SuspensionPoint<'tcx>>,
 
     // The original RETURN_PLACE local
     new_ret_local: Local,
@@ -303,8 +309,8 @@ impl MutVisitor<'tcx> for TransformVisitor<'tcx> {
                 Operand::Move(Place::from(self.new_ret_local)),
                 None,
             )),
-            TerminatorKind::Yield { ref value, resume, drop } => {
-                Some((VariantIdx::new(0), Some(resume), value.clone(), drop))
+            TerminatorKind::Yield { ref value, resume, resume_arg, drop } => {
+                Some((VariantIdx::new(0), Some((resume, resume_arg)), value.clone(), drop))
             }
             _ => None,
         };
@@ -319,13 +325,23 @@ impl MutVisitor<'tcx> for TransformVisitor<'tcx> {
                     self.make_state(state_idx, v),
                 )),
             });
-            let state = if let Some(resume) = resume {
+            let state = if let Some((resume, resume_arg)) = resume {
                 // Yield
                 let state = 3 + self.suspension_points.len();
 
+                // The resume arg target location might itself be remapped if its base local is
+                // live across a yield.
+                let resume_arg =
+                    if let Some(&(ty, variant, idx)) = self.remap.get(&resume_arg.local) {
+                        self.make_field(variant, idx, ty)
+                    } else {
+                        resume_arg
+                    };
+
                 self.suspension_points.push(SuspensionPoint {
                     state,
                     resume,
+                    resume_arg,
                     drop,
                     storage_liveness: self.storage_liveness.get(&block).unwrap().clone(),
                 });
@@ -378,28 +394,35 @@ fn make_generator_state_argument_pinned<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body
     PinArgVisitor { ref_gen_ty, tcx }.visit_body(body);
 }
 
-fn replace_result_variable<'tcx>(
-    ret_ty: Ty<'tcx>,
+/// Allocates a new local and replaces all references of `local` with it. Returns the new local.
+///
+/// `local` will be changed to a new local decl with type `ty`.
+///
+/// Note that the new local will be uninitialized. It is the caller's responsibility to assign some
+/// valid value to it before its first use.
+fn replace_local<'tcx>(
+    local: Local,
+    ty: Ty<'tcx>,
     body: &mut BodyAndCache<'tcx>,
     tcx: TyCtxt<'tcx>,
 ) -> Local {
     let source_info = source_info(body);
-    let new_ret = LocalDecl {
+    let new_decl = LocalDecl {
         mutability: Mutability::Mut,
-        ty: ret_ty,
+        ty,
         user_ty: UserTypeProjections::none(),
         source_info,
         internal: false,
         is_block_tail: None,
         local_info: LocalInfo::Other,
     };
-    let new_ret_local = Local::new(body.local_decls.len());
-    body.local_decls.push(new_ret);
-    body.local_decls.swap(RETURN_PLACE, new_ret_local);
+    let new_local = Local::new(body.local_decls.len());
+    body.local_decls.push(new_decl);
+    body.local_decls.swap(local, new_local);
 
-    RenameLocalVisitor { from: RETURN_PLACE, to: new_ret_local, tcx }.visit_body(body);
+    RenameLocalVisitor { from: local, to: new_local, tcx }.visit_body(body);
 
-    new_ret_local
+    new_local
 }
 
 struct StorageIgnored(liveness::LiveVarSet);
@@ -442,18 +465,15 @@ fn locals_live_across_suspend_points(
     source: MirSource<'tcx>,
     movable: bool,
 ) -> LivenessInfo {
-    let dead_unwinds = BitSet::new_empty(body.basic_blocks().len());
     let def_id = source.def_id();
     let body_ref: &Body<'_> = &body;
 
     // Calculate when MIR locals have live storage. This gives us an upper bound of their
     // lifetimes.
-    let storage_live_analysis = MaybeStorageLive::new(body_ref);
-    let storage_live_results =
-        do_dataflow(tcx, body_ref, def_id, &[], &dead_unwinds, storage_live_analysis, |bd, p| {
-            DebugFormatted::new(&bd.body().local_decls[p])
-        });
-    let mut storage_live_cursor = DataflowResultsCursor::new(&storage_live_results, body_ref);
+    let mut storage_live = MaybeStorageLive
+        .into_engine(tcx, body_ref, def_id)
+        .iterate_to_fixpoint()
+        .into_results_cursor(body_ref);
 
     // Find the MIR locals which do not use StorageLive/StorageDead statements.
     // The storage of these locals are always live.
@@ -462,32 +482,19 @@ fn locals_live_across_suspend_points(
 
     // Calculate the MIR locals which have been previously
     // borrowed (even if they are still active).
-    let borrowed_locals_analysis = HaveBeenBorrowedLocals::new(body_ref);
-    let borrowed_locals_results = do_dataflow(
-        tcx,
-        body_ref,
-        def_id,
-        &[],
-        &dead_unwinds,
-        borrowed_locals_analysis,
-        |bd, p| DebugFormatted::new(&bd.body().local_decls[p]),
-    );
-    let mut borrowed_locals_cursor = DataflowResultsCursor::new(&borrowed_locals_results, body_ref);
+    let borrowed_locals_results =
+        MaybeBorrowedLocals::all_borrows().into_engine(tcx, body_ref, def_id).iterate_to_fixpoint();
+
+    let mut borrowed_locals_cursor =
+        dataflow::ResultsCursor::new(body_ref, &borrowed_locals_results);
 
     // Calculate the MIR locals that we actually need to keep storage around
     // for.
-    let requires_storage_analysis = RequiresStorage::new(body, &borrowed_locals_results);
-    let requires_storage_results = do_dataflow(
-        tcx,
-        body_ref,
-        def_id,
-        &[],
-        &dead_unwinds,
-        requires_storage_analysis,
-        |bd, p| DebugFormatted::new(&bd.body().local_decls[p]),
-    );
+    let requires_storage_results = MaybeRequiresStorage::new(body, &borrowed_locals_results)
+        .into_engine(tcx, body_ref, def_id)
+        .iterate_to_fixpoint();
     let mut requires_storage_cursor =
-        DataflowResultsCursor::new(&requires_storage_results, body_ref);
+        dataflow::ResultsCursor::new(body_ref, &requires_storage_results);
 
     // Calculate the liveness of MIR locals ignoring borrows.
     let mut live_locals = liveness::LiveVarSet::new_empty(body.local_decls.len());
@@ -499,7 +506,7 @@ fn locals_live_across_suspend_points(
 
     for (block, data) in body.basic_blocks().iter_enumerated() {
         if let TerminatorKind::Yield { .. } = data.terminator().kind {
-            let loc = Location { block: block, statement_index: data.statements.len() };
+            let loc = Location { block, statement_index: data.statements.len() };
 
             if !movable {
                 // The `liveness` variable contains the liveness of MIR locals ignoring borrows.
@@ -512,18 +519,18 @@ fn locals_live_across_suspend_points(
                 // If a borrow is converted to a raw reference, we must also assume that it lives
                 // forever. Note that the final liveness is still bounded by the storage liveness
                 // of the local, which happens using the `intersect` operation below.
-                borrowed_locals_cursor.seek(loc);
+                borrowed_locals_cursor.seek_before(loc);
                 liveness.outs[block].union(borrowed_locals_cursor.get());
             }
 
-            storage_live_cursor.seek(loc);
-            let storage_liveness = storage_live_cursor.get();
+            storage_live.seek_before(loc);
+            let storage_liveness = storage_live.get();
 
             // Store the storage liveness for later use so we can restore the state
             // after a suspension point
             storage_liveness_map.insert(block, storage_liveness.clone());
 
-            requires_storage_cursor.seek(loc);
+            requires_storage_cursor.seek_before(loc);
             let storage_required = requires_storage_cursor.get().clone();
 
             // Locals live are live at this point only if they are used across
@@ -593,7 +600,7 @@ fn compute_storage_conflicts(
     body: &'mir Body<'tcx>,
     stored_locals: &liveness::LiveVarSet,
     ignored: &StorageIgnored,
-    requires_storage: DataflowResults<'tcx, RequiresStorage<'mir, 'tcx>>,
+    requires_storage: dataflow::Results<'tcx, MaybeRequiresStorage<'mir, 'tcx>>,
 ) -> BitMatrix<GeneratorSavedLocal, GeneratorSavedLocal> {
     assert_eq!(body.local_decls.len(), ignored.0.domain_size());
     assert_eq!(body.local_decls.len(), stored_locals.domain_size());
@@ -611,8 +618,11 @@ fn compute_storage_conflicts(
         stored_locals: &stored_locals,
         local_conflicts: BitMatrix::from_row_n(&ineligible_locals, body.local_decls.len()),
     };
-    let mut state = FlowAtLocation::new(requires_storage);
-    visitor.analyze_results(&mut state);
+
+    // Visit only reachable basic blocks. The exact order is not important.
+    let reachable_blocks = traversal::preorder(body).map(|(bb, _)| bb);
+    requires_storage.visit_with(body, reachable_blocks, &mut visitor);
+
     let local_conflicts = visitor.local_conflicts;
 
     // Compress the matrix using only stored locals (Local -> GeneratorSavedLocal).
@@ -641,60 +651,45 @@ fn compute_storage_conflicts(
     storage_conflicts
 }
 
-struct StorageConflictVisitor<'body, 'tcx, 's> {
-    body: &'body Body<'tcx>,
+struct StorageConflictVisitor<'mir, 'tcx, 's> {
+    body: &'mir Body<'tcx>,
     stored_locals: &'s liveness::LiveVarSet,
     // FIXME(tmandry): Consider using sparse bitsets here once we have good
     // benchmarks for generators.
     local_conflicts: BitMatrix<Local, Local>,
 }
 
-impl<'body, 'tcx, 's> DataflowResultsConsumer<'body, 'tcx>
-    for StorageConflictVisitor<'body, 'tcx, 's>
-{
-    type FlowState = FlowAtLocation<'tcx, RequiresStorage<'body, 'tcx>>;
-
-    fn body(&self) -> &'body Body<'tcx> {
-        self.body
-    }
-
-    fn visit_block_entry(&mut self, block: BasicBlock, flow_state: &Self::FlowState) {
-        // statement_index is only used for logging, so this is fine.
-        self.apply_state(flow_state, Location { block, statement_index: 0 });
-    }
+impl dataflow::ResultsVisitor<'mir, 'tcx> for StorageConflictVisitor<'mir, 'tcx, '_> {
+    type FlowState = BitSet<Local>;
 
-    fn visit_statement_entry(
+    fn visit_statement(
         &mut self,
+        state: &Self::FlowState,
+        _statement: &'mir Statement<'tcx>,
         loc: Location,
-        _stmt: &Statement<'tcx>,
-        flow_state: &Self::FlowState,
     ) {
-        self.apply_state(flow_state, loc);
+        self.apply_state(state, loc);
     }
 
-    fn visit_terminator_entry(
+    fn visit_terminator(
         &mut self,
+        state: &Self::FlowState,
+        _terminator: &'mir Terminator<'tcx>,
         loc: Location,
-        _term: &Terminator<'tcx>,
-        flow_state: &Self::FlowState,
     ) {
-        self.apply_state(flow_state, loc);
+        self.apply_state(state, loc);
     }
 }
 
 impl<'body, 'tcx, 's> StorageConflictVisitor<'body, 'tcx, 's> {
-    fn apply_state(
-        &mut self,
-        flow_state: &FlowAtLocation<'tcx, RequiresStorage<'body, 'tcx>>,
-        loc: Location,
-    ) {
+    fn apply_state(&mut self, flow_state: &BitSet<Local>, loc: Location) {
         // Ignore unreachable blocks.
         match self.body.basic_blocks()[loc.block].terminator().kind {
             TerminatorKind::Unreachable => return,
             _ => (),
         };
 
-        let mut eligible_storage_live = flow_state.as_dense().clone();
+        let mut eligible_storage_live = flow_state.clone();
         eligible_storage_live.intersect(&self.stored_locals);
 
         for local in eligible_storage_live.iter() {
@@ -792,6 +787,10 @@ fn compute_layout<'tcx>(
     (remap, layout, storage_liveness)
 }
 
+/// Replaces the entry point of `body` with a block that switches on the generator discriminant and
+/// dispatches to blocks according to `cases`.
+///
+/// After this function, the former entry point of the function will be bb1.
 fn insert_switch<'tcx>(
     body: &mut BodyAndCache<'tcx>,
     cases: Vec<(usize, BasicBlock)>,
@@ -885,10 +884,11 @@ fn create_generator_drop_shim<'tcx>(
     drop_clean: BasicBlock,
 ) -> BodyAndCache<'tcx> {
     let mut body = body.clone();
+    body.arg_count = 1; // make sure the resume argument is not included here
 
     let source_info = source_info(&body);
 
-    let mut cases = create_cases(&mut body, transform, |point| point.drop);
+    let mut cases = create_cases(&mut body, transform, Operation::Drop);
 
     cases.insert(0, (UNRESUMED, drop_clean));
 
@@ -1006,9 +1006,9 @@ fn create_generator_resume_function<'tcx>(
         }
     }
 
-    let mut cases = create_cases(body, &transform, |point| Some(point.resume));
+    let mut cases = create_cases(body, &transform, Operation::Resume);
 
-    use rustc::mir::interpret::PanicInfo::{ResumedAfterPanic, ResumedAfterReturn};
+    use rustc::mir::AssertKind::{ResumedAfterPanic, ResumedAfterReturn};
 
     // Jump to the entry point on the unresumed
     cases.insert(0, (UNRESUMED, BasicBlock::new(0)));
@@ -1056,14 +1056,27 @@ fn insert_clean_drop(body: &mut BodyAndCache<'_>) -> BasicBlock {
     drop_clean
 }
 
-fn create_cases<'tcx, F>(
+/// An operation that can be performed on a generator.
+#[derive(PartialEq, Copy, Clone)]
+enum Operation {
+    Resume,
+    Drop,
+}
+
+impl Operation {
+    fn target_block(self, point: &SuspensionPoint<'_>) -> Option<BasicBlock> {
+        match self {
+            Operation::Resume => Some(point.resume),
+            Operation::Drop => point.drop,
+        }
+    }
+}
+
+fn create_cases<'tcx>(
     body: &mut BodyAndCache<'tcx>,
     transform: &TransformVisitor<'tcx>,
-    target: F,
-) -> Vec<(usize, BasicBlock)>
-where
-    F: Fn(&SuspensionPoint) -> Option<BasicBlock>,
-{
+    operation: Operation,
+) -> Vec<(usize, BasicBlock)> {
     let source_info = source_info(body);
 
     transform
@@ -1071,12 +1084,19 @@ where
         .iter()
         .filter_map(|point| {
             // Find the target for this suspension point, if applicable
-            target(point).map(|target| {
+            operation.target_block(point).map(|target| {
                 let block = BasicBlock::new(body.basic_blocks().len());
                 let mut statements = Vec::new();
 
                 // Create StorageLive instructions for locals with live storage
                 for i in 0..(body.local_decls.len()) {
+                    if i == 2 {
+                        // The resume argument is live on function entry. Don't insert a
+                        // `StorageLive`, or the following `Assign` will read from uninitialized
+                        // memory.
+                        continue;
+                    }
+
                     let l = Local::new(i);
                     if point.storage_liveness.contains(l) && !transform.remap.contains_key(&l) {
                         statements
@@ -1084,6 +1104,18 @@ where
                     }
                 }
 
+                if operation == Operation::Resume {
+                    // Move the resume argument to the destination place of the `Yield` terminator
+                    let resume_arg = Local::new(2); // 0 = return, 1 = self
+                    statements.push(Statement {
+                        source_info,
+                        kind: StatementKind::Assign(box (
+                            point.resume_arg,
+                            Rvalue::Use(Operand::Move(resume_arg.into())),
+                        )),
+                    });
+                }
+
                 // Then jump to the real target
                 body.basic_blocks_mut().push(BasicBlockData {
                     statements,
@@ -1138,7 +1170,29 @@ impl<'tcx> MirPass<'tcx> for StateTransform {
 
         // We rename RETURN_PLACE which has type mir.return_ty to new_ret_local
         // RETURN_PLACE then is a fresh unused local with type ret_ty.
-        let new_ret_local = replace_result_variable(ret_ty, body, tcx);
+        let new_ret_local = replace_local(RETURN_PLACE, ret_ty, body, tcx);
+
+        // We also replace the resume argument and insert an `Assign`.
+        // This is needed because the resume argument `_2` might be live across a `yield`, in which
+        // case there is no `Assign` to it that the transform can turn into a store to the generator
+        // state. After the yield the slot in the generator state would then be uninitialized.
+        let resume_local = Local::new(2);
+        let new_resume_local =
+            replace_local(resume_local, body.local_decls[resume_local].ty, body, tcx);
+
+        // When first entering the generator, move the resume argument into its new local.
+        let source_info = source_info(body);
+        let stmts = &mut body.basic_blocks_mut()[BasicBlock::new(0)].statements;
+        stmts.insert(
+            0,
+            Statement {
+                source_info,
+                kind: StatementKind::Assign(box (
+                    new_resume_local.into(),
+                    Rvalue::Use(Operand::Move(resume_local.into())),
+                )),
+            },
+        );
 
         // Extract locals which are live across suspension point into `layout`
         // `remap` gives a mapping from local indices onto generator struct indices
@@ -1162,9 +1216,9 @@ impl<'tcx> MirPass<'tcx> for StateTransform {
         };
         transform.visit_body(body);
 
-        // Update our MIR struct to reflect the changed we've made
+        // Update our MIR struct to reflect the changes we've made
         body.yield_ty = None;
-        body.arg_count = 1;
+        body.arg_count = 2; // self, resume arg
         body.spread_arg = None;
         body.generator_layout = Some(layout);
 
diff --git a/src/librustc_mir/transform/inline.rs b/src/librustc_mir/transform/inline.rs
index 96cd8fc135..b6802505df 100644
--- a/src/librustc_mir/transform/inline.rs
+++ b/src/librustc_mir/transform/inline.rs
@@ -8,6 +8,7 @@ use rustc_index::vec::{Idx, IndexVec};
 use rustc::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc::mir::visit::*;
 use rustc::mir::*;
+use rustc::session::config::Sanitizer;
 use rustc::ty::subst::{InternalSubsts, Subst, SubstsRef};
 use rustc::ty::{self, Instance, InstanceDef, ParamEnv, Ty, TyCtxt, TypeFoldable};
 
@@ -16,8 +17,8 @@ use crate::transform::{MirPass, MirSource};
 use std::collections::VecDeque;
 use std::iter;
 
+use rustc_attr as attr;
 use rustc_target::spec::abi::Abi;
-use syntax::attr;
 
 const DEFAULT_THRESHOLD: usize = 50;
 const HINT_THRESHOLD: usize = 100;
@@ -228,6 +229,28 @@ impl Inliner<'tcx> {
             return false;
         }
 
+        // Avoid inlining functions marked as no_sanitize if sanitizer is enabled,
+        // since instrumentation might be enabled and performed on the caller.
+        match self.tcx.sess.opts.debugging_opts.sanitizer {
+            Some(Sanitizer::Address) => {
+                if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::NO_SANITIZE_ADDRESS) {
+                    return false;
+                }
+            }
+            Some(Sanitizer::Memory) => {
+                if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::NO_SANITIZE_MEMORY) {
+                    return false;
+                }
+            }
+            Some(Sanitizer::Thread) => {
+                if codegen_fn_attrs.flags.contains(CodegenFnAttrFlags::NO_SANITIZE_THREAD) {
+                    return false;
+                }
+            }
+            Some(Sanitizer::Leak) => {}
+            None => {}
+        }
+
         let hinted = match codegen_fn_attrs.inline {
             // Just treat inline(always) as a hint for now,
             // there are cases that prevent inlining that we
@@ -640,8 +663,8 @@ impl<'a, 'tcx> Integrator<'a, 'tcx> {
         new
     }
 
-    fn make_integrate_local(&self, local: &Local) -> Local {
-        if *local == RETURN_PLACE {
+    fn make_integrate_local(&self, local: Local) -> Local {
+        if local == RETURN_PLACE {
             return self.destination.local;
         }
 
@@ -660,7 +683,7 @@ impl<'a, 'tcx> MutVisitor<'tcx> for Integrator<'a, 'tcx> {
     }
 
     fn visit_local(&mut self, local: &mut Local, _ctxt: PlaceContext, _location: Location) {
-        *local = self.make_integrate_local(local);
+        *local = self.make_integrate_local(*local);
     }
 
     fn visit_place(&mut self, place: &mut Place<'tcx>, context: PlaceContext, location: Location) {
@@ -680,7 +703,7 @@ impl<'a, 'tcx> MutVisitor<'tcx> for Integrator<'a, 'tcx> {
 
     fn process_projection_elem(&mut self, elem: &PlaceElem<'tcx>) -> Option<PlaceElem<'tcx>> {
         if let PlaceElem::Index(local) = elem {
-            let new_local = self.make_integrate_local(local);
+            let new_local = self.make_integrate_local(*local);
 
             if new_local != *local {
                 return Some(PlaceElem::Index(new_local));
diff --git a/src/librustc_mir/transform/mod.rs b/src/librustc_mir/transform/mod.rs
index 3c37eccc18..57e002bf3f 100644
--- a/src/librustc_mir/transform/mod.rs
+++ b/src/librustc_mir/transform/mod.rs
@@ -4,13 +4,13 @@ use rustc::mir::{BodyAndCache, ConstQualifs, MirPhase, Promoted};
 use rustc::ty::query::Providers;
 use rustc::ty::steal::Steal;
 use rustc::ty::{InstanceDef, TyCtxt, TypeFoldable};
+use rustc_ast::ast;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, DefIdSet, LOCAL_CRATE};
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_index::vec::IndexVec;
 use rustc_span::Span;
 use std::borrow::Cow;
-use syntax::ast;
 
 pub mod add_call_guards;
 pub mod add_moves_for_packed_drops;
@@ -122,7 +122,7 @@ impl<'tcx> MirSource<'tcx> {
 /// type `T`.
 pub fn default_name<T: ?Sized>() -> Cow<'static, str> {
     let name = ::std::any::type_name::<T>();
-    if let Some(tail) = name.rfind(":") { Cow::from(&name[tail + 1..]) } else { Cow::from(name) }
+    if let Some(tail) = name.rfind(':') { Cow::from(&name[tail + 1..]) } else { Cow::from(name) }
 }
 
 /// A streamlined trait that you can implement to create a pass; the
@@ -209,7 +209,7 @@ fn mir_const_qualif(tcx: TyCtxt<'_>, def_id: DefId) -> ConstQualifs {
 
     // We return the qualifs in the return place for every MIR body, even though it is only used
     // when deciding to promote a reference to a `const` for now.
-    validator.qualifs_in_return_place().into()
+    validator.qualifs_in_return_place()
 }
 
 fn mir_const(tcx: TyCtxt<'_>, def_id: DefId) -> &Steal<BodyAndCache<'_>> {
diff --git a/src/librustc_mir/transform/promote_consts.rs b/src/librustc_mir/transform/promote_consts.rs
index f058ac834e..7dd134a35d 100644
--- a/src/librustc_mir/transform/promote_consts.rs
+++ b/src/librustc_mir/transform/promote_consts.rs
@@ -18,10 +18,10 @@ use rustc::mir::*;
 use rustc::ty::cast::CastTy;
 use rustc::ty::subst::InternalSubsts;
 use rustc::ty::{self, List, TyCtxt, TypeFoldable};
+use rustc_ast::ast::LitKind;
 use rustc_hir::def_id::DefId;
 use rustc_span::symbol::sym;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::LitKind;
 
 use rustc_index::vec::{Idx, IndexVec};
 use rustc_target::spec::abi::Abi;
@@ -329,7 +329,7 @@ impl<'tcx> Validator<'_, 'tcx> {
                                 // FIXME(eddyb) this is probably excessive, with
                                 // the exception of `union` member accesses.
                                 let ty =
-                                    Place::ty_from(&place.local, proj_base, *self.body, self.tcx)
+                                    Place::ty_from(place.local, proj_base, *self.body, self.tcx)
                                         .projection_ty(self.tcx, elem)
                                         .ty;
                                 if ty.is_freeze(self.tcx, self.param_env, DUMMY_SP) {
@@ -407,7 +407,7 @@ impl<'tcx> Validator<'_, 'tcx> {
 
     // FIXME(eddyb) maybe cache this?
     fn qualif_local<Q: qualifs::Qualif>(&self, local: Local) -> bool {
-        let per_local = &|l| self.qualif_local::<Q>(l);
+        let per_local = &mut |l| self.qualif_local::<Q>(l);
 
         if let TempState::Defined { location: loc, .. } = self.temps[local] {
             let num_stmts = self.body[loc.block].statements.len();
@@ -463,6 +463,7 @@ impl<'tcx> Validator<'_, 'tcx> {
                 let terminator = self.body[loc.block].terminator();
                 match &terminator.kind {
                     TerminatorKind::Call { func, args, .. } => self.validate_call(func, args),
+                    TerminatorKind::Yield { .. } => Err(Unpromotable),
                     kind => {
                         span_bug!(terminator.source_info.span, "{:?} not promotable", kind);
                     }
@@ -473,9 +474,9 @@ impl<'tcx> Validator<'_, 'tcx> {
         }
     }
 
-    fn validate_place(&self, place: PlaceRef<'_, 'tcx>) -> Result<(), Unpromotable> {
+    fn validate_place(&self, place: PlaceRef<'tcx>) -> Result<(), Unpromotable> {
         match place {
-            PlaceRef { local, projection: [] } => self.validate_local(*local),
+            PlaceRef { local, projection: [] } => self.validate_local(local),
             PlaceRef { local: _, projection: [proj_base @ .., elem] } => {
                 match *elem {
                     ProjectionElem::Deref | ProjectionElem::Downcast(..) => {
@@ -589,10 +590,10 @@ impl<'tcx> Validator<'_, 'tcx> {
                 // Raw reborrows can come from reference to pointer coercions,
                 // so are allowed.
                 if let [proj_base @ .., ProjectionElem::Deref] = place.projection.as_ref() {
-                    let base_ty = Place::ty_from(&place.local, proj_base, *self.body, self.tcx).ty;
+                    let base_ty = Place::ty_from(place.local, proj_base, *self.body, self.tcx).ty;
                     if let ty::Ref(..) = base_ty.kind {
                         return self.validate_place(PlaceRef {
-                            local: &place.local,
+                            local: place.local,
                             projection: proj_base,
                         });
                     }
@@ -628,9 +629,9 @@ impl<'tcx> Validator<'_, 'tcx> {
                 // Special-case reborrows to be more like a copy of the reference.
                 let mut place = place.as_ref();
                 if let [proj_base @ .., ProjectionElem::Deref] = &place.projection {
-                    let base_ty = Place::ty_from(&place.local, proj_base, *self.body, self.tcx).ty;
+                    let base_ty = Place::ty_from(place.local, proj_base, *self.body, self.tcx).ty;
                     if let ty::Ref(..) = base_ty.kind {
-                        place = PlaceRef { local: &place.local, projection: proj_base };
+                        place = PlaceRef { local: place.local, projection: proj_base };
                     }
                 }
 
@@ -640,7 +641,7 @@ impl<'tcx> Validator<'_, 'tcx> {
                 // `<HasMutInterior as Qualif>::in_projection` from
                 // `check_consts::qualifs` but without recursion.
                 let mut has_mut_interior =
-                    self.qualif_local::<qualifs::HasMutInterior>(*place.local);
+                    self.qualif_local::<qualifs::HasMutInterior>(place.local);
                 if has_mut_interior {
                     let mut place_projection = place.projection;
                     // FIXME(eddyb) use a forward loop instead of a reverse one.
@@ -919,7 +920,7 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
             let (blocks, local_decls) = self.source.basic_blocks_and_local_decls_mut();
             match candidate {
                 Candidate::Ref(loc) => {
-                    let ref mut statement = blocks[loc.block].statements[loc.statement_index];
+                    let statement = &mut blocks[loc.block].statements[loc.statement_index];
                     match statement.kind {
                         StatementKind::Assign(box (
                             _,
@@ -970,7 +971,7 @@ impl<'a, 'tcx> Promoter<'a, 'tcx> {
                     }
                 }
                 Candidate::Repeat(loc) => {
-                    let ref mut statement = blocks[loc.block].statements[loc.statement_index];
+                    let statement = &mut blocks[loc.block].statements[loc.statement_index];
                     match statement.kind {
                         StatementKind::Assign(box (_, Rvalue::Repeat(ref mut operand, _))) => {
                             let ty = operand.ty(local_decls, self.tcx);
diff --git a/src/librustc_mir/transform/qualify_min_const_fn.rs b/src/librustc_mir/transform/qualify_min_const_fn.rs
index b047e534e4..5a99ee2730 100644
--- a/src/librustc_mir/transform/qualify_min_const_fn.rs
+++ b/src/librustc_mir/transform/qualify_min_const_fn.rs
@@ -1,15 +1,23 @@
 use rustc::mir::*;
 use rustc::ty::{self, adjustment::PointerCast, Predicate, Ty, TyCtxt};
+use rustc_attr as attr;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
 use std::borrow::Cow;
-use syntax::{ast, attr};
 
 type McfResult = Result<(), (Span, Cow<'static, str>)>;
 
 pub fn is_min_const_fn(tcx: TyCtxt<'tcx>, def_id: DefId, body: &'a Body<'tcx>) -> McfResult {
+    // Prevent const trait methods from being annotated as `stable`.
+    if tcx.features().staged_api {
+        let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
+        if crate::const_eval::is_parent_const_impl_raw(tcx, hir_id) {
+            return Err((body.span, "trait methods cannot be stable const fn".into()));
+        }
+    }
+
     let mut current = def_id;
     loop {
         let predicates = tcx.predicates_of(current);
@@ -34,7 +42,7 @@ pub fn is_min_const_fn(tcx: TyCtxt<'tcx>, def_id: DefId, body: &'a Body<'tcx>) -
                     match pred.skip_binder().self_ty().kind {
                         ty::Param(ref p) => {
                             // Allow `T: ?const Trait`
-                            if *constness == ast::Constness::NotConst
+                            if *constness == hir::Constness::NotConst
                                 && feature_allowed(tcx, def_id, sym::const_trait_bound_opt_out)
                             {
                                 continue;
@@ -268,7 +276,7 @@ fn check_place(
             ProjectionElem::Downcast(_symbol, _variant_index) => {}
 
             ProjectionElem::Field(..) => {
-                let base_ty = Place::ty_from(&place.local, &proj_base, body, tcx).ty;
+                let base_ty = Place::ty_from(place.local, &proj_base, body, tcx).ty;
                 if let Some(def) = base_ty.ty_adt_def() {
                     // No union field accesses in `const fn`
                     if def.is_union() {
diff --git a/src/librustc_mir/transform/rustc_peek.rs b/src/librustc_mir/transform/rustc_peek.rs
index 7a90cb0390..22ac3410a7 100644
--- a/src/librustc_mir/transform/rustc_peek.rs
+++ b/src/librustc_mir/transform/rustc_peek.rs
@@ -1,7 +1,7 @@
+use rustc_ast::ast;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
 use rustc_target::spec::abi::Abi;
-use syntax::ast;
 
 use crate::transform::{MirPass, MirSource};
 use rustc::mir::{self, Body, BodyAndCache, Local, Location};
@@ -9,24 +9,20 @@ use rustc::ty::{self, Ty, TyCtxt};
 use rustc_hir::def_id::DefId;
 use rustc_index::bit_set::BitSet;
 
+use crate::dataflow::generic::{Analysis, Results, ResultsCursor};
 use crate::dataflow::move_paths::{HasMoveData, MoveData};
 use crate::dataflow::move_paths::{LookupResult, MovePathIndex};
-use crate::dataflow::BitDenotation;
-use crate::dataflow::DataflowResults;
-use crate::dataflow::DataflowResultsCursor;
-use crate::dataflow::IndirectlyMutableLocals;
+use crate::dataflow::MaybeMutBorrowedLocals;
 use crate::dataflow::MoveDataParamEnv;
-use crate::dataflow::{do_dataflow, DebugFormatted};
 use crate::dataflow::{
     DefinitelyInitializedPlaces, MaybeInitializedPlaces, MaybeUninitializedPlaces,
 };
 
-use crate::dataflow::has_rustc_mir_with;
-
 pub struct SanityCheck;
 
 impl<'tcx> MirPass<'tcx> for SanityCheck {
     fn run_pass(&self, tcx: TyCtxt<'tcx>, src: MirSource<'tcx>, body: &mut BodyAndCache<'tcx>) {
+        use crate::dataflow::has_rustc_mir_with;
         let def_id = src.def_id();
         if !tcx.has_attr(def_id, sym::rustc_mir) {
             debug!("skipping rustc_peek::SanityCheck on {}", tcx.def_path_str(def_id));
@@ -38,44 +34,20 @@ impl<'tcx> MirPass<'tcx> for SanityCheck {
         let attributes = tcx.get_attrs(def_id);
         let param_env = tcx.param_env(def_id);
         let move_data = MoveData::gather_moves(body, tcx, param_env).unwrap();
-        let mdpe = MoveDataParamEnv { move_data: move_data, param_env: param_env };
-        let dead_unwinds = BitSet::new_empty(body.basic_blocks().len());
-        let flow_inits = do_dataflow(
-            tcx,
-            body,
-            def_id,
-            &attributes,
-            &dead_unwinds,
-            MaybeInitializedPlaces::new(tcx, body, &mdpe),
-            |bd, i| DebugFormatted::new(&bd.move_data().move_paths[i]),
-        );
-        let flow_uninits = do_dataflow(
-            tcx,
-            body,
-            def_id,
-            &attributes,
-            &dead_unwinds,
-            MaybeUninitializedPlaces::new(tcx, body, &mdpe),
-            |bd, i| DebugFormatted::new(&bd.move_data().move_paths[i]),
-        );
-        let flow_def_inits = do_dataflow(
-            tcx,
-            body,
-            def_id,
-            &attributes,
-            &dead_unwinds,
-            DefinitelyInitializedPlaces::new(tcx, body, &mdpe),
-            |bd, i| DebugFormatted::new(&bd.move_data().move_paths[i]),
-        );
-        let flow_indirectly_mut = do_dataflow(
-            tcx,
-            body,
-            def_id,
-            &attributes,
-            &dead_unwinds,
-            IndirectlyMutableLocals::new(tcx, body, param_env),
-            |_, i| DebugFormatted::new(&i),
-        );
+        let mdpe = MoveDataParamEnv { move_data, param_env };
+
+        let flow_inits = MaybeInitializedPlaces::new(tcx, body, &mdpe)
+            .into_engine(tcx, body, def_id)
+            .iterate_to_fixpoint();
+        let flow_uninits = MaybeUninitializedPlaces::new(tcx, body, &mdpe)
+            .into_engine(tcx, body, def_id)
+            .iterate_to_fixpoint();
+        let flow_def_inits = DefinitelyInitializedPlaces::new(tcx, body, &mdpe)
+            .into_engine(tcx, body, def_id)
+            .iterate_to_fixpoint();
+        let flow_mut_borrowed = MaybeMutBorrowedLocals::mut_borrows_only(tcx, body, param_env)
+            .into_engine(tcx, body, def_id)
+            .iterate_to_fixpoint();
 
         if has_rustc_mir_with(&attributes, sym::rustc_peek_maybe_init).is_some() {
             sanity_check_via_rustc_peek(tcx, body, def_id, &attributes, &flow_inits);
@@ -87,7 +59,7 @@ impl<'tcx> MirPass<'tcx> for SanityCheck {
             sanity_check_via_rustc_peek(tcx, body, def_id, &attributes, &flow_def_inits);
         }
         if has_rustc_mir_with(&attributes, sym::rustc_peek_indirectly_mutable).is_some() {
-            sanity_check_via_rustc_peek(tcx, body, def_id, &attributes, &flow_indirectly_mut);
+            sanity_check_via_rustc_peek(tcx, body, def_id, &attributes, &flow_mut_borrowed);
         }
         if has_rustc_mir_with(&attributes, sym::stop_after_dataflow).is_some() {
             tcx.sess.fatal("stop_after_dataflow ended compilation");
@@ -111,18 +83,18 @@ impl<'tcx> MirPass<'tcx> for SanityCheck {
 /// (If there are any calls to `rustc_peek` that do not match the
 /// expression form above, then that emits an error as well, but those
 /// errors are not intended to be used for unit tests.)
-pub fn sanity_check_via_rustc_peek<'tcx, O>(
+pub fn sanity_check_via_rustc_peek<'tcx, A>(
     tcx: TyCtxt<'tcx>,
     body: &Body<'tcx>,
     def_id: DefId,
     _attributes: &[ast::Attribute],
-    results: &DataflowResults<'tcx, O>,
+    results: &Results<'tcx, A>,
 ) where
-    O: RustcPeekAt<'tcx>,
+    A: RustcPeekAt<'tcx>,
 {
     debug!("sanity_check_via_rustc_peek def_id: {:?}", def_id);
 
-    let mut cursor = DataflowResultsCursor::new(results, body);
+    let mut cursor = ResultsCursor::new(body, results);
 
     let peek_calls = body.basic_blocks().iter_enumerated().filter_map(|(bb, block_data)| {
         PeekCall::from_terminator(tcx, block_data.terminator()).map(|call| (bb, block_data, call))
@@ -153,9 +125,9 @@ pub fn sanity_check_via_rustc_peek<'tcx, O>(
             | (PeekCallKind::ByVal, mir::Rvalue::Use(mir::Operand::Move(place)))
             | (PeekCallKind::ByVal, mir::Rvalue::Use(mir::Operand::Copy(place))) => {
                 let loc = Location { block: bb, statement_index };
-                cursor.seek(loc);
+                cursor.seek_before(loc);
                 let state = cursor.get();
-                results.operator().peek_at(tcx, place, state, call);
+                results.analysis.peek_at(tcx, place, state, call);
             }
 
             _ => {
@@ -255,7 +227,7 @@ impl PeekCall {
     }
 }
 
-pub trait RustcPeekAt<'tcx>: BitDenotation<'tcx> {
+pub trait RustcPeekAt<'tcx>: Analysis<'tcx> {
     fn peek_at(
         &self,
         tcx: TyCtxt<'tcx>,
@@ -265,9 +237,9 @@ pub trait RustcPeekAt<'tcx>: BitDenotation<'tcx> {
     );
 }
 
-impl<'tcx, O> RustcPeekAt<'tcx> for O
+impl<'tcx, A> RustcPeekAt<'tcx> for A
 where
-    O: BitDenotation<'tcx, Idx = MovePathIndex> + HasMoveData<'tcx>,
+    A: Analysis<'tcx, Idx = MovePathIndex> + HasMoveData<'tcx>,
 {
     fn peek_at(
         &self,
@@ -292,7 +264,7 @@ where
     }
 }
 
-impl<'tcx> RustcPeekAt<'tcx> for IndirectlyMutableLocals<'_, 'tcx> {
+impl<'tcx> RustcPeekAt<'tcx> for MaybeMutBorrowedLocals<'_, 'tcx> {
     fn peek_at(
         &self,
         tcx: TyCtxt<'tcx>,
diff --git a/src/librustc_mir/transform/simplify.rs b/src/librustc_mir/transform/simplify.rs
index ddf8d73e54..597d3f0237 100644
--- a/src/librustc_mir/transform/simplify.rs
+++ b/src/librustc_mir/transform/simplify.rs
@@ -230,7 +230,7 @@ impl<'a, 'tcx> CfgSimplifier<'a, 'tcx> {
         };
 
         let first_succ = {
-            if let Some(&first_succ) = terminator.successors().nth(0) {
+            if let Some(&first_succ) = terminator.successors().next() {
                 if terminator.successors().all(|s| *s == first_succ) {
                     let count = terminator.successors().count();
                     self.pred_count[first_succ] -= (count - 1) as u32;
diff --git a/src/librustc_mir/transform/simplify_try.rs b/src/librustc_mir/transform/simplify_try.rs
index e733b0a5b5..3f28f03304 100644
--- a/src/librustc_mir/transform/simplify_try.rs
+++ b/src/librustc_mir/transform/simplify_try.rs
@@ -52,6 +52,8 @@ impl<'tcx> MirPass<'tcx> for SimplifyArmIdentity {
                 Some(x) => x,
             };
             if local_tmp_s0 != local_tmp_s1
+                // Avoid moving into ourselves.
+                || local_0 == local_1
                 // The field-and-variant information match up.
                 || vf_s0 != vf_s1
                 // Source and target locals have the same type.
@@ -64,6 +66,7 @@ impl<'tcx> MirPass<'tcx> for SimplifyArmIdentity {
             }
 
             // Right shape; transform!
+            s0.source_info = s2.source_info;
             match &mut s0.kind {
                 StatementKind::Assign(box (place, rvalue)) => {
                     *place = local_0.into();
@@ -139,7 +142,7 @@ fn match_variant_field_place<'tcx>(place: &Place<'tcx>) -> Option<(Local, VarFie
         PlaceRef {
             local,
             projection: &[ProjectionElem::Downcast(_, var_idx), ProjectionElem::Field(field, ty)],
-        } => Some((*local, VarField { field, field_ty: ty, var_idx })),
+        } => Some((local, VarField { field, field_ty: ty, var_idx })),
         _ => None,
     }
 }
diff --git a/src/librustc_mir/transform/uninhabited_enum_branching.rs b/src/librustc_mir/transform/uninhabited_enum_branching.rs
index 0bf0ff2852..bbaa66f595 100644
--- a/src/librustc_mir/transform/uninhabited_enum_branching.rs
+++ b/src/librustc_mir/transform/uninhabited_enum_branching.rs
@@ -28,7 +28,7 @@ fn get_switched_on_type<'tcx>(
 
     // Only bother checking blocks which terminate by switching on a local.
     if let Some(local) = get_discriminant_local(&terminator.kind) {
-        let stmt_before_term = (block_data.statements.len() > 0)
+        let stmt_before_term = (!block_data.statements.is_empty())
             .then(|| &block_data.statements[block_data.statements.len() - 1].kind);
 
         if let Some(StatementKind::Assign(box (l, Rvalue::Discriminant(place)))) = stmt_before_term
@@ -100,7 +100,7 @@ impl<'tcx> MirPass<'tcx> for UninhabitedEnumBranching {
                 &mut body.basic_blocks_mut()[bb].terminator_mut().kind
             {
                 let vals = &*values;
-                let zipped = vals.iter().zip(targets.into_iter());
+                let zipped = vals.iter().zip(targets.iter());
 
                 let mut matched_values = Vec::with_capacity(allowed_variants.len());
                 let mut matched_targets = Vec::with_capacity(allowed_variants.len() + 1);
diff --git a/src/librustc_mir/util/aggregate.rs b/src/librustc_mir/util/aggregate.rs
index be515ef571..927c8f6dfb 100644
--- a/src/librustc_mir/util/aggregate.rs
+++ b/src/librustc_mir/util/aggregate.rs
@@ -49,7 +49,6 @@ pub fn expand_aggregate<'tcx>(
     };
 
     operands
-        .into_iter()
         .enumerate()
         .map(move |(i, (op, ty))| {
             let lhs_field = if let AggregateKind::Array(_) = kind {
diff --git a/src/librustc_mir/util/alignment.rs b/src/librustc_mir/util/alignment.rs
index e17c7a80f1..d7f2abfbe9 100644
--- a/src/librustc_mir/util/alignment.rs
+++ b/src/librustc_mir/util/alignment.rs
@@ -46,7 +46,7 @@ where
             // encountered a Deref, which is ABI-aligned
             ProjectionElem::Deref => break,
             ProjectionElem::Field(..) => {
-                let ty = Place::ty_from(&place.local, proj_base, local_decls, tcx).ty;
+                let ty = Place::ty_from(place.local, proj_base, local_decls, tcx).ty;
                 match ty.kind {
                     ty::Adt(def, _) if def.repr.packed() => return true,
                     _ => {}
diff --git a/src/librustc_mir/util/elaborate_drops.rs b/src/librustc_mir/util/elaborate_drops.rs
index 1be3da4b3d..ecf0a8ea83 100644
--- a/src/librustc_mir/util/elaborate_drops.rs
+++ b/src/librustc_mir/util/elaborate_drops.rs
@@ -153,9 +153,9 @@ where
     // FIXME: I think we should just control the flags externally,
     // and then we do not need this machinery.
     pub fn elaborate_drop(&mut self, bb: BasicBlock) {
-        debug!("elaborate_drop({:?})", self);
+        debug!("elaborate_drop({:?}, {:?})", bb, self);
         let style = self.elaborator.drop_style(self.path, DropFlagMode::Deep);
-        debug!("elaborate_drop({:?}): live - {:?}", self, style);
+        debug!("elaborate_drop({:?}, {:?}): live - {:?}", bb, self, style);
         match style {
             DropStyle::Dead => {
                 self.elaborator
@@ -369,7 +369,7 @@ where
 
     fn open_drop_for_adt(&mut self, adt: &'tcx ty::AdtDef, substs: SubstsRef<'tcx>) -> BasicBlock {
         debug!("open_drop_for_adt({:?}, {:?}, {:?})", self, adt, substs);
-        if adt.variants.len() == 0 {
+        if adt.variants.is_empty() {
             return self.elaborator.patch().new_block(BasicBlockData {
                 statements: vec![],
                 terminator: Some(Terminator {
@@ -426,25 +426,21 @@ where
         let mut unwind_blocks =
             if unwind.is_cleanup() { None } else { Some(Vec::with_capacity(adt.variants.len())) };
 
+        let mut have_otherwise_with_drop_glue = false;
         let mut have_otherwise = false;
         let tcx = self.tcx();
 
         for (variant_index, discr) in adt.discriminants(tcx) {
+            let variant = &adt.variants[variant_index];
             let subpath = self.elaborator.downcast_subpath(self.path, variant_index);
+
             if let Some(variant_path) = subpath {
                 let base_place = tcx.mk_place_elem(
                     self.place.clone(),
-                    ProjectionElem::Downcast(
-                        Some(adt.variants[variant_index].ident.name),
-                        variant_index,
-                    ),
-                );
-                let fields = self.move_paths_for_fields(
-                    &base_place,
-                    variant_path,
-                    &adt.variants[variant_index],
-                    substs,
+                    ProjectionElem::Downcast(Some(variant.ident.name), variant_index),
                 );
+                let fields =
+                    self.move_paths_for_fields(&base_place, variant_path, &variant, substs);
                 values.push(discr.val);
                 if let Unwind::To(unwind) = unwind {
                     // We can't use the half-ladder from the original
@@ -474,16 +470,30 @@ where
                 normal_blocks.push(normal);
             } else {
                 have_otherwise = true;
+
+                let param_env = self.elaborator.param_env();
+                let have_field_with_drop_glue = variant
+                    .fields
+                    .iter()
+                    .any(|field| field.ty(tcx, substs).needs_drop(tcx, param_env));
+                if have_field_with_drop_glue {
+                    have_otherwise_with_drop_glue = true;
+                }
             }
         }
 
-        if have_otherwise {
+        if !have_otherwise {
+            values.pop();
+        } else if !have_otherwise_with_drop_glue {
+            normal_blocks.push(self.goto_block(succ, unwind));
+            if let Unwind::To(unwind) = unwind {
+                unwind_blocks.as_mut().unwrap().push(self.goto_block(unwind, Unwind::InCleanup));
+            }
+        } else {
             normal_blocks.push(self.drop_block(succ, unwind));
             if let Unwind::To(unwind) = unwind {
                 unwind_blocks.as_mut().unwrap().push(self.drop_block(unwind, Unwind::InCleanup));
             }
-        } else {
-            values.pop();
         }
 
         (
@@ -539,7 +549,7 @@ where
         debug!("destructor_call_block({:?}, {:?})", self, succ);
         let tcx = self.tcx();
         let drop_trait = tcx.lang_items().drop_trait().unwrap();
-        let drop_fn = tcx.associated_items(drop_trait).next().unwrap();
+        let drop_fn = tcx.associated_items(drop_trait).in_definition_order().next().unwrap();
         let ty = self.place_ty(self.place);
         let substs = tcx.mk_substs_trait(ty, &[]);
 
@@ -721,7 +731,7 @@ where
         self.elaborator.patch().new_block(base_block)
     }
 
-    /// Ceates a pair of drop-loops of `place`, which drops its contents, even
+    /// Creates a pair of drop-loops of `place`, which drops its contents, even
     /// in the case of 1 panic. If `ptr_based`, creates a pointer loop,
     /// otherwise create an index loop.
     fn drop_loop_pair(
@@ -862,7 +872,7 @@ where
         debug!("drop_flag_reset_block({:?},{:?})", self, mode);
 
         let block = self.new_block(unwind, TerminatorKind::Goto { target: succ });
-        let block_start = Location { block: block, statement_index: 0 };
+        let block_start = Location { block, statement_index: 0 };
         self.elaborator.clear_drop_flag(block_start, self.path, mode);
         block
     }
@@ -911,7 +921,7 @@ where
 
         let call = TerminatorKind::Call {
             func: Operand::function_handle(tcx, free_func, substs, self.source_info.span),
-            args: args,
+            args,
             destination: Some((unit_temp, target)),
             cleanup: None,
             from_hir_call: false,
@@ -929,6 +939,11 @@ where
         self.new_block(unwind, block)
     }
 
+    fn goto_block(&mut self, target: BasicBlock, unwind: Unwind) -> BasicBlock {
+        let block = TerminatorKind::Goto { target };
+        self.new_block(unwind, block)
+    }
+
     fn drop_flag_test_block(
         &mut self,
         on_set: BasicBlock,
diff --git a/src/librustc_mir/util/liveness.rs b/src/librustc_mir/util/liveness.rs
index 1488bfe4d6..b12ad1e4c1 100644
--- a/src/librustc_mir/util/liveness.rs
+++ b/src/librustc_mir/util/liveness.rs
@@ -36,7 +36,7 @@ use rustc_data_structures::work_queue::WorkQueue;
 use rustc_index::bit_set::BitSet;
 use rustc_index::vec::{Idx, IndexVec};
 use std::fs;
-use std::io::{self, Write};
+use std::io::{self, BufWriter, Write};
 use std::path::{Path, PathBuf};
 
 pub type LiveVarSet = BitSet<Local>;
@@ -288,7 +288,8 @@ fn dump_matched_mir_node<'tcx>(
     let item_id = tcx.hir().as_local_hir_id(source.def_id()).unwrap();
     let file_name = format!("rustc.node{}{}-liveness.mir", item_id, pass_name);
     file_path.push(&file_name);
-    let _ = fs::File::create(&file_path).and_then(|mut file| {
+    let _ = fs::File::create(&file_path).and_then(|file| {
+        let mut file = BufWriter::new(file);
         writeln!(file, "// MIR local liveness analysis for `{}`", node_path)?;
         writeln!(file, "// source = {:?}", source)?;
         writeln!(file, "// pass_name = {}", pass_name)?;
diff --git a/src/librustc_mir/util/patch.rs b/src/librustc_mir/util/patch.rs
index 68aa82f902..473692a43f 100644
--- a/src/librustc_mir/util/patch.rs
+++ b/src/librustc_mir/util/patch.rs
@@ -37,7 +37,7 @@ impl<'tcx> MirPatch<'tcx> {
         let mut resume_stmt_block = None;
         for (bb, block) in body.basic_blocks().iter_enumerated() {
             if let TerminatorKind::Resume = block.terminator().kind {
-                if block.statements.len() > 0 {
+                if !block.statements.is_empty() {
                     assert!(resume_stmt_block.is_none());
                     resume_stmt_block = Some(bb);
                 } else {
diff --git a/src/librustc_mir/util/pretty.rs b/src/librustc_mir/util/pretty.rs
index e0919e7e8f..416a5bd7d2 100644
--- a/src/librustc_mir/util/pretty.rs
+++ b/src/librustc_mir/util/pretty.rs
@@ -297,7 +297,7 @@ where
     writeln!(w, "{}{:?}{}: {{", INDENT, block, cleanup_text)?;
 
     // List of statements in the middle.
-    let mut current_location = Location { block: block, statement_index: 0 };
+    let mut current_location = Location { block, statement_index: 0 };
     for statement in &data.statements {
         extra_data(PassWhere::BeforeLocation(current_location), w)?;
         let indented_body = format!("{0}{0}{1:?};", INDENT, statement);
@@ -477,7 +477,7 @@ fn write_scope_tree(
         indented_decl.push_str(";");
 
         let local_name =
-            if local == RETURN_PLACE { format!(" return place") } else { String::new() };
+            if local == RETURN_PLACE { " return place".to_string() } else { String::new() };
 
         writeln!(
             w,
@@ -490,7 +490,7 @@ fn write_scope_tree(
     }
 
     let children = match scope_tree.get(&parent) {
-        Some(childs) => childs,
+        Some(children) => children,
         None => return Ok(()),
     };
 
diff --git a/src/librustc_mir_build/Cargo.toml b/src/librustc_mir_build/Cargo.toml
index a22c4d18d5..d53188a39e 100644
--- a/src/librustc_mir_build/Cargo.toml
+++ b/src/librustc_mir_build/Cargo.toml
@@ -11,18 +11,19 @@ doctest = false
 
 [dependencies]
 arena = { path = "../libarena" }
-itertools = "0.8"
 log = "0.4"
 rustc = { path = "../librustc" }
 rustc_apfloat = { path = "../librustc_apfloat" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_index = { path = "../librustc_index" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
+rustc_infer = { path = "../librustc_infer" }
 rustc_macros = { path = "../librustc_macros" }
 rustc_serialize = { path = "../libserialize", package = "serialize" }
 rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
diff --git a/src/librustc_mir_build/build/block.rs b/src/librustc_mir_build/build/block.rs
index c517d3113c..df5526ad76 100644
--- a/src/librustc_mir_build/build/block.rs
+++ b/src/librustc_mir_build/build/block.rs
@@ -149,7 +149,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                             &pattern,
                             UserTypeProjections::none(),
                             &mut |this, _, _, _, node, span, _, _| {
-                                this.storage_live_binding(block, node, span, OutsideGuard);
+                                this.storage_live_binding(block, node, span, OutsideGuard, true);
                                 this.schedule_drop_for_binding(node, span, OutsideGuard);
                             },
                         )
diff --git a/src/librustc_mir_build/build/expr/as_place.rs b/src/librustc_mir_build/build/expr/as_place.rs
index f27760f692..d77cc49c94 100644
--- a/src/librustc_mir_build/build/expr/as_place.rs
+++ b/src/librustc_mir_build/build/expr/as_place.rs
@@ -5,7 +5,7 @@ use crate::build::ForGuard::{OutsideGuard, RefWithinGuard};
 use crate::build::{BlockAnd, BlockAndExtension, Builder};
 use crate::hair::*;
 use rustc::middle::region;
-use rustc::mir::interpret::PanicInfo::BoundsCheck;
+use rustc::mir::AssertKind::BoundsCheck;
 use rustc::mir::*;
 use rustc::ty::{self, CanonicalUserTypeAnnotation, Ty, TyCtxt, Variance};
 use rustc_span::Span;
@@ -364,7 +364,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     ) {
         let tcx = self.hir.tcx();
         let place_ty =
-            Place::ty_from(&base_place.local, &base_place.projection, &self.local_decls, tcx);
+            Place::ty_from(base_place.local, &base_place.projection, &self.local_decls, tcx);
         if let ty::Slice(_) = place_ty.ty.kind {
             // We need to create fake borrows to ensure that the bounds
             // check that we just did stays valid. Since we can't assign to
@@ -374,7 +374,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 match elem {
                     ProjectionElem::Deref => {
                         let fake_borrow_deref_ty = Place::ty_from(
-                            &base_place.local,
+                            base_place.local,
                             &base_place.projection[..idx],
                             &self.local_decls,
                             tcx,
@@ -399,7 +399,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     }
                     ProjectionElem::Index(_) => {
                         let index_ty = Place::ty_from(
-                            &base_place.local,
+                            base_place.local,
                             &base_place.projection[..idx],
                             &self.local_decls,
                             tcx,
diff --git a/src/librustc_mir_build/build/expr/as_rvalue.rs b/src/librustc_mir_build/build/expr/as_rvalue.rs
index 5959b85225..dc97f321a3 100644
--- a/src/librustc_mir_build/build/expr/as_rvalue.rs
+++ b/src/librustc_mir_build/build/expr/as_rvalue.rs
@@ -6,7 +6,7 @@ use crate::build::expr::category::{Category, RvalueFunc};
 use crate::build::{BlockAnd, BlockAndExtension, Builder};
 use crate::hair::*;
 use rustc::middle::region;
-use rustc::mir::interpret::PanicInfo;
+use rustc::mir::AssertKind;
 use rustc::mir::*;
 use rustc::ty::{self, Ty, UpvarSubsts};
 use rustc_span::Span;
@@ -86,7 +86,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                         block,
                         Operand::Move(is_min),
                         false,
-                        PanicInfo::OverflowNeg,
+                        AssertKind::OverflowNeg,
                         expr_span,
                     );
                 }
@@ -230,18 +230,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 block = unpack!(this.stmt_expr(block, expr, None));
                 block.and(this.unit_rvalue())
             }
-            ExprKind::Yield { value } => {
-                let value = unpack!(block = this.as_operand(block, scope, value));
-                let resume = this.cfg.start_new_block();
-                let cleanup = this.generator_drop_cleanup();
-                this.cfg.terminate(
-                    block,
-                    source_info,
-                    TerminatorKind::Yield { value: value, resume: resume, drop: cleanup },
-                );
-                resume.and(this.unit_rvalue())
-            }
-            ExprKind::Literal { .. }
+            ExprKind::Yield { .. }
+            | ExprKind::Literal { .. }
             | ExprKind::StaticRef { .. }
             | ExprKind::Block { .. }
             | ExprKind::Match { .. }
@@ -304,7 +294,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             let val = tcx.mk_place_field(result_value.clone(), val_fld, ty);
             let of = tcx.mk_place_field(result_value, of_fld, bool_ty);
 
-            let err = PanicInfo::Overflow(op);
+            let err = AssertKind::Overflow(op);
 
             block = self.assert(block, Operand::Move(of), false, err, span);
 
@@ -315,11 +305,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 // and 2. there are two possible failure cases, divide-by-zero and overflow.
 
                 let zero_err = if op == BinOp::Div {
-                    PanicInfo::DivisionByZero
+                    AssertKind::DivisionByZero
                 } else {
-                    PanicInfo::RemainderByZero
+                    AssertKind::RemainderByZero
                 };
-                let overflow_err = PanicInfo::Overflow(op);
+                let overflow_err = AssertKind::Overflow(op);
 
                 // Check for / 0
                 let is_zero = self.temp(bool_ty, span);
@@ -393,20 +383,20 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let arg_place = unpack!(block = this.as_place(block, arg));
 
         let mutability = match arg_place.as_ref() {
-            PlaceRef { local, projection: &[] } => this.local_decls[*local].mutability,
+            PlaceRef { local, projection: &[] } => this.local_decls[local].mutability,
             PlaceRef { local, projection: &[ProjectionElem::Deref] } => {
                 debug_assert!(
-                    this.local_decls[*local].is_ref_for_guard(),
+                    this.local_decls[local].is_ref_for_guard(),
                     "Unexpected capture place",
                 );
-                this.local_decls[*local].mutability
+                this.local_decls[local].mutability
             }
             PlaceRef {
-                ref local,
+                local,
                 projection: &[ref proj_base @ .., ProjectionElem::Field(upvar_index, _)],
             }
             | PlaceRef {
-                ref local,
+                local,
                 projection:
                     &[ref proj_base @ .., ProjectionElem::Field(upvar_index, _), ProjectionElem::Deref],
             } => {
diff --git a/src/librustc_mir_build/build/expr/category.rs b/src/librustc_mir_build/build/expr/category.rs
index c4d340953c..cc139dee63 100644
--- a/src/librustc_mir_build/build/expr/category.rs
+++ b/src/librustc_mir_build/build/expr/category.rs
@@ -50,6 +50,7 @@ impl Category {
             | ExprKind::Adt { .. }
             | ExprKind::Borrow { .. }
             | ExprKind::AddressOf { .. }
+            | ExprKind::Yield { .. }
             | ExprKind::Call { .. } => Some(Category::Rvalue(RvalueFunc::Into)),
 
             ExprKind::Array { .. }
@@ -63,7 +64,6 @@ impl Category {
             | ExprKind::Repeat { .. }
             | ExprKind::Assign { .. }
             | ExprKind::AssignOp { .. }
-            | ExprKind::Yield { .. }
             | ExprKind::InlineAsm { .. } => Some(Category::Rvalue(RvalueFunc::AsRvalue)),
 
             ExprKind::Literal { .. } | ExprKind::StaticRef { .. } => Some(Category::Constant),
diff --git a/src/librustc_mir_build/build/expr/into.rs b/src/librustc_mir_build/build/expr/into.rs
index 5ef338c624..4583e244f4 100644
--- a/src/librustc_mir_build/build/expr/into.rs
+++ b/src/librustc_mir_build/build/expr/into.rs
@@ -365,6 +365,24 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 block.unit()
             }
 
+            ExprKind::Yield { value } => {
+                let scope = this.local_scope();
+                let value = unpack!(block = this.as_operand(block, scope, value));
+                let resume = this.cfg.start_new_block();
+                let cleanup = this.generator_drop_cleanup();
+                this.cfg.terminate(
+                    block,
+                    source_info,
+                    TerminatorKind::Yield {
+                        value,
+                        resume,
+                        resume_arg: *destination,
+                        drop: cleanup,
+                    },
+                );
+                resume.unit()
+            }
+
             // these are the cases that are more naturally handled by some other mode
             ExprKind::Unary { .. }
             | ExprKind::Binary { .. }
@@ -376,8 +394,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             | ExprKind::Tuple { .. }
             | ExprKind::Closure { .. }
             | ExprKind::Literal { .. }
-            | ExprKind::StaticRef { .. }
-            | ExprKind::Yield { .. } => {
+            | ExprKind::StaticRef { .. } => {
                 debug_assert!(match Category::of(&expr.kind).unwrap() {
                     // should be handled above
                     Category::Rvalue(RvalueFunc::Into) => false,
diff --git a/src/librustc_mir_build/build/matches/mod.rs b/src/librustc_mir_build/build/matches/mod.rs
index 801e50eab8..e7c7e2b47f 100644
--- a/src/librustc_mir_build/build/matches/mod.rs
+++ b/src/librustc_mir_build/build/matches/mod.rs
@@ -19,15 +19,16 @@ use rustc_hir::HirId;
 use rustc_index::bit_set::BitSet;
 use rustc_span::Span;
 use smallvec::{smallvec, SmallVec};
-use syntax::ast::Name;
+use rustc_ast::ast::Name;
 
 // helper functions, broken out by category:
 mod simplify;
 mod test;
 mod util;
 
-use itertools::Itertools;
+use std::borrow::Borrow;
 use std::convert::TryFrom;
+use std::mem;
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// Generates MIR for a `match` expression.
@@ -66,12 +67,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// We generate MIR in the following steps:
     ///
     /// 1. Evaluate the scrutinee and add the fake read of it ([Builder::lower_scrutinee]).
-    /// 2. Create the prebinding and otherwise blocks ([Builder::create_match_candidates]).
-    /// 3. Create the decision tree ([Builder::lower_match_tree]).
-    /// 4. Determine the fake borrows that are needed from the places that were
+    /// 2. Create the decision tree ([Builder::lower_match_tree]).
+    /// 3. Determine the fake borrows that are needed from the places that were
     ///    matched against and create the required temporaries for them
     ///    ([Builder::calculate_fake_borrows]).
-    /// 5. Create everything else: the guards and the arms ([Builder::lower_match_arms]).
+    /// 4. Create everything else: the guards and the arms ([Builder::lower_match_arms]).
     ///
     /// ## False edges
     ///
@@ -93,17 +93,17 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let scrutinee_place =
             unpack!(block = self.lower_scrutinee(block, scrutinee, scrutinee_span,));
 
-        let mut arm_candidates = self.create_match_candidates(&scrutinee_place, &arms);
+        let mut arm_candidates = self.create_match_candidates(scrutinee_place, &arms);
 
         let match_has_guard = arms.iter().any(|arm| arm.guard.is_some());
-        let candidates =
-            arm_candidates.iter_mut().flat_map(|(_, candidates)| candidates).collect::<Vec<_>>();
+        let mut candidates =
+            arm_candidates.iter_mut().map(|(_, candidate)| candidate).collect::<Vec<_>>();
 
         let fake_borrow_temps =
-            self.lower_match_tree(block, scrutinee_span, match_has_guard, candidates);
+            self.lower_match_tree(block, scrutinee_span, match_has_guard, &mut candidates);
 
         self.lower_match_arms(
-            &destination,
+            destination,
             scrutinee_place,
             scrutinee_span,
             arm_candidates,
@@ -137,7 +137,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // check safety.
         let cause_matched_place = FakeReadCause::ForMatchedPlace;
         let source_info = self.source_info(scrutinee_span);
-        self.cfg.push_fake_read(block, source_info, cause_matched_place, scrutinee_place.clone());
+        self.cfg.push_fake_read(block, source_info, cause_matched_place, scrutinee_place);
 
         block.and(scrutinee_place)
     }
@@ -145,42 +145,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// Create the initial `Candidate`s for a `match` expression.
     fn create_match_candidates<'pat>(
         &mut self,
-        scrutinee: &Place<'tcx>,
+        scrutinee: Place<'tcx>,
         arms: &'pat [Arm<'tcx>],
-    ) -> Vec<(&'pat Arm<'tcx>, Vec<Candidate<'pat, 'tcx>>)> {
-        let candidate_count = arms.iter().map(|c| c.top_pats_hack().len()).sum::<usize>();
-        let pre_binding_blocks: Vec<_> =
-            (0..candidate_count).map(|_| self.cfg.start_new_block()).collect();
-
-        let mut candidate_pre_binding_blocks = pre_binding_blocks.iter();
-        let mut next_candidate_pre_binding_blocks = pre_binding_blocks.iter().skip(1);
-
+    ) -> Vec<(&'pat Arm<'tcx>, Candidate<'pat, 'tcx>)> {
         // Assemble a list of candidates: there is one candidate per pattern,
         // which means there may be more than one candidate *per arm*.
         arms.iter()
             .map(|arm| {
                 let arm_has_guard = arm.guard.is_some();
-                let arm_candidates: Vec<_> = arm
-                    .top_pats_hack()
-                    .iter()
-                    .zip(candidate_pre_binding_blocks.by_ref())
-                    .map(|(pattern, pre_binding_block)| Candidate {
-                        span: pattern.span,
-                        match_pairs: smallvec![MatchPair::new(*scrutinee, pattern)],
-                        bindings: vec![],
-                        ascriptions: vec![],
-                        otherwise_block: if arm_has_guard {
-                            Some(self.cfg.start_new_block())
-                        } else {
-                            None
-                        },
-                        pre_binding_block: *pre_binding_block,
-                        next_candidate_pre_binding_block: next_candidate_pre_binding_blocks
-                            .next()
-                            .copied(),
-                    })
-                    .collect();
-                (arm, arm_candidates)
+                let arm_candidate = Candidate::new(scrutinee, &arm.pattern, arm_has_guard);
+                (arm, arm_candidate)
             })
             .collect()
     }
@@ -196,22 +170,38 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         block: BasicBlock,
         scrutinee_span: Span,
         match_has_guard: bool,
-        mut candidates: Vec<&mut Candidate<'pat, 'tcx>>,
+        candidates: &mut [&mut Candidate<'pat, 'tcx>],
     ) -> Vec<(Place<'tcx>, Local)> {
         // The set of places that we are creating fake borrows of. If there are
         // no match guards then we don't need any fake borrows, so don't track
         // them.
         let mut fake_borrows = if match_has_guard { Some(FxHashSet::default()) } else { None };
 
+        let mut otherwise = None;
+
         // This will generate code to test scrutinee_place and
         // branch to the appropriate arm block
-        self.match_candidates(
-            scrutinee_span,
-            &mut Some(block),
-            None,
-            &mut candidates,
-            &mut fake_borrows,
-        );
+        self.match_candidates(scrutinee_span, block, &mut otherwise, candidates, &mut fake_borrows);
+
+        if let Some(otherwise_block) = otherwise {
+            // See the doc comment on `match_candidates` for why we may have an
+            // otherwise block. Match checking will ensure this is actually
+            // unreachable.
+            let source_info = self.source_info(scrutinee_span);
+            self.cfg.terminate(otherwise_block, source_info, TerminatorKind::Unreachable);
+        }
+
+        // Link each leaf candidate to the `pre_binding_block` of the next one.
+        let mut previous_candidate: Option<&mut Candidate<'_, '_>> = None;
+
+        for candidate in candidates {
+            candidate.visit_leaves(|leaf_candidate| {
+                if let Some(ref mut prev) = previous_candidate {
+                    prev.next_candidate_pre_binding_block = leaf_candidate.pre_binding_block;
+                }
+                previous_candidate = Some(leaf_candidate);
+            });
+        }
 
         if let Some(ref borrows) = fake_borrows {
             self.calculate_fake_borrows(borrows, scrutinee_span)
@@ -231,7 +221,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         destination: &Place<'tcx>,
         scrutinee_place: Place<'tcx>,
         scrutinee_span: Span,
-        arm_candidates: Vec<(&'_ Arm<'tcx>, Vec<Candidate<'_, 'tcx>>)>,
+        arm_candidates: Vec<(&'_ Arm<'tcx>, Candidate<'_, 'tcx>)>,
         outer_source_info: SourceInfo,
         fake_borrow_temps: Vec<(Place<'tcx>, Local)>,
     ) -> BlockAnd<()> {
@@ -239,8 +229,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
         let arm_end_blocks: Vec<_> = arm_candidates
             .into_iter()
-            .map(|(arm, candidates)| {
-                debug!("lowering arm {:?}\ncanidates = {:?}", arm, candidates);
+            .map(|(arm, candidate)| {
+                debug!("lowering arm {:?}\ncanidate = {:?}", arm, candidate);
 
                 let arm_source_info = self.source_info(arm.span);
                 let arm_scope = (arm.scope, arm_source_info);
@@ -249,18 +239,18 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     let scope = this.declare_bindings(
                         None,
                         arm.span,
-                        &arm.top_pats_hack()[0],
+                        &arm.pattern,
                         ArmHasGuard(arm.guard.is_some()),
                         Some((Some(&scrutinee_place), scrutinee_span)),
                     );
 
                     let arm_block = this.bind_pattern(
                         outer_source_info,
-                        candidates,
+                        candidate,
                         arm.guard.as_ref().map(|g| (g, match_scope)),
                         &fake_borrow_temps,
                         scrutinee_span,
-                        arm.scope,
+                        Some(arm.scope),
                     );
 
                     if let Some(source_scope) = scope {
@@ -284,41 +274,82 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         end_block.unit()
     }
 
-    /// Binds the variables and ascribes types for a given `match` arm.
+    /// Binds the variables and ascribes types for a given `match` arm or
+    /// `let` binding.
     ///
     /// Also check if the guard matches, if it's provided.
+    /// `arm_scope` should be `Some` if and only if this is called for a
+    /// `match` arm.
     fn bind_pattern(
         &mut self,
         outer_source_info: SourceInfo,
-        mut candidates: Vec<Candidate<'_, 'tcx>>,
+        candidate: Candidate<'_, 'tcx>,
         guard: Option<(&Guard<'tcx>, region::Scope)>,
         fake_borrow_temps: &Vec<(Place<'tcx>, Local)>,
         scrutinee_span: Span,
-        arm_scope: region::Scope,
+        arm_scope: Option<region::Scope>,
     ) -> BasicBlock {
-        if candidates.len() == 1 {
+        if candidate.subcandidates.is_empty() {
             // Avoid generating another `BasicBlock` when we only have one
             // candidate.
             self.bind_and_guard_matched_candidate(
-                candidates.pop().unwrap(),
+                candidate,
+                &[],
                 guard,
                 fake_borrow_temps,
                 scrutinee_span,
+                true,
             )
         } else {
-            let arm_block = self.cfg.start_new_block();
-            for candidate in candidates {
-                // Avoid scheduling drops multiple times.
-                self.clear_top_scope(arm_scope);
-                let binding_end = self.bind_and_guard_matched_candidate(
-                    candidate,
-                    guard,
-                    fake_borrow_temps,
-                    scrutinee_span,
-                );
-                self.cfg.goto(binding_end, outer_source_info, arm_block);
-            }
-            arm_block
+            // It's helpful to avoid scheduling drops multiple times to save
+            // drop elaboration from having to clean up the extra drops.
+            //
+            // If we are in a `let` then we only schedule drops for the first
+            // candidate.
+            //
+            // If we're in a `match` arm then we could have a case like so:
+            //
+            // Ok(x) | Err(x) if return => { /* ... */ }
+            //
+            // In this case we don't want a drop of `x` scheduled when we
+            // return: it isn't bound by move until right before enter the arm.
+            // To handle this we instead unschedule it's drop after each time
+            // we lower the guard.
+            let target_block = self.cfg.start_new_block();
+            let mut schedule_drops = true;
+            // We keep a stack of all of the bindings and type asciptions
+            // from the the parent candidates that we visit, that also need to
+            // be bound for each candidate.
+            traverse_candidate(
+                candidate,
+                &mut Vec::new(),
+                &mut |leaf_candidate, parent_bindings| {
+                    if let Some(arm_scope) = arm_scope {
+                        self.clear_top_scope(arm_scope);
+                    }
+                    let binding_end = self.bind_and_guard_matched_candidate(
+                        leaf_candidate,
+                        parent_bindings,
+                        guard,
+                        &fake_borrow_temps,
+                        scrutinee_span,
+                        schedule_drops,
+                    );
+                    if arm_scope.is_none() {
+                        schedule_drops = false;
+                    }
+                    self.cfg.goto(binding_end, outer_source_info, target_block);
+                },
+                |inner_candidate, parent_bindings| {
+                    parent_bindings.push((inner_candidate.bindings, inner_candidate.ascriptions));
+                    inner_candidate.subcandidates.into_iter()
+                },
+                |parent_bindings| {
+                    parent_bindings.pop();
+                },
+            );
+
+            target_block
         }
     }
 
@@ -332,7 +363,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             // Optimize the case of `let x = ...` to write directly into `x`
             PatKind::Binding { mode: BindingMode::ByValue, var, subpattern: None, .. } => {
                 let place =
-                    self.storage_live_binding(block, var, irrefutable_pat.span, OutsideGuard);
+                    self.storage_live_binding(block, var, irrefutable_pat.span, OutsideGuard, true);
                 unpack!(block = self.into(&place, block, initializer));
 
                 // Inject a fake read, see comments on `FakeReadCause::ForLet`.
@@ -367,13 +398,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     hair::pattern::Ascription { user_ty: pat_ascription_ty, variance: _, user_ty_span },
             } => {
                 let place =
-                    self.storage_live_binding(block, var, irrefutable_pat.span, OutsideGuard);
+                    self.storage_live_binding(block, var, irrefutable_pat.span, OutsideGuard, true);
                 unpack!(block = self.into(&place, block, initializer));
 
                 // Inject a fake read, see comments on `FakeReadCause::ForLet`.
                 let pattern_source_info = self.source_info(irrefutable_pat.span);
                 let cause_let = FakeReadCause::ForLet;
-                self.cfg.push_fake_read(block, pattern_source_info, cause_let, place.clone());
+                self.cfg.push_fake_read(block, pattern_source_info, cause_let, place);
 
                 let ty_source_info = self.source_info(user_ty_span);
                 let user_ty = pat_ascription_ty.user_ty(
@@ -412,7 +443,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
             _ => {
                 let place = unpack!(block = self.as_place(block, initializer));
-                self.place_into_pattern(block, irrefutable_pat, &place, true)
+                self.place_into_pattern(block, irrefutable_pat, place, true)
             }
         }
     }
@@ -421,67 +452,50 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         &mut self,
         block: BasicBlock,
         irrefutable_pat: Pat<'tcx>,
-        initializer: &Place<'tcx>,
+        initializer: Place<'tcx>,
         set_match_place: bool,
     ) -> BlockAnd<()> {
-        // create a dummy candidate
-        let mut candidate = Candidate {
-            span: irrefutable_pat.span,
-            match_pairs: smallvec![MatchPair::new(*initializer, &irrefutable_pat)],
-            bindings: vec![],
-            ascriptions: vec![],
-
-            // since we don't call `match_candidates`, next fields are unused
-            otherwise_block: None,
-            pre_binding_block: block,
-            next_candidate_pre_binding_block: None,
-        };
+        let mut candidate = Candidate::new(initializer, &irrefutable_pat, false);
 
-        // Simplify the candidate. Since the pattern is irrefutable, this should
-        // always convert all match-pairs into bindings.
-        self.simplify_candidate(&mut candidate);
-
-        if !candidate.match_pairs.is_empty() {
-            // ICE if no other errors have been emitted. This used to be a hard error that wouldn't
-            // be reached because `hair::pattern::check_match::check_match` wouldn't have let the
-            // compiler continue. In our tests this is only ever hit by
-            // `ui/consts/const-match-check.rs` with `--cfg eval1`, and that file already generates
-            // a different error before hand.
-            self.hir.tcx().sess.delay_span_bug(
-                candidate.match_pairs[0].pattern.span,
-                &format!(
-                    "match pairs {:?} remaining after simplifying irrefutable pattern",
-                    candidate.match_pairs,
-                ),
-            );
-        }
+        let fake_borrow_temps =
+            self.lower_match_tree(block, irrefutable_pat.span, false, &mut [&mut candidate]);
 
-        // for matches and function arguments, the place that is being matched
+        // For matches and function arguments, the place that is being matched
         // can be set when creating the variables. But the place for
         // let PATTERN = ... might not even exist until we do the assignment.
-        // so we set it here instead
+        // so we set it here instead.
         if set_match_place {
-            for binding in &candidate.bindings {
-                let local = self.var_local_id(binding.var_id, OutsideGuard);
-
-                if let LocalInfo::User(ClearCrossCrate::Set(BindingForm::Var(VarBindingForm {
-                    opt_match_place: Some((ref mut match_place, _)),
-                    ..
-                }))) = self.local_decls[local].local_info
-                {
-                    *match_place = Some(*initializer);
-                } else {
-                    bug!("Let binding to non-user variable.")
+            let mut candidate_ref = &candidate;
+            while let Some(next) = {
+                for binding in &candidate_ref.bindings {
+                    let local = self.var_local_id(binding.var_id, OutsideGuard);
+
+                    if let LocalInfo::User(ClearCrossCrate::Set(BindingForm::Var(
+                        VarBindingForm { opt_match_place: Some((ref mut match_place, _)), .. },
+                    ))) = self.local_decls[local].local_info
+                    {
+                        *match_place = Some(initializer);
+                    } else {
+                        bug!("Let binding to non-user variable.")
+                    }
                 }
+                // All of the subcandidates should bind the same locals, so we
+                // only visit the first one.
+                candidate_ref.subcandidates.get(0)
+            } {
+                candidate_ref = next;
             }
         }
 
-        self.ascribe_types(block, &candidate.ascriptions);
-
-        // now apply the bindings, which will also declare the variables
-        self.bind_matched_candidate_for_arm_body(block, &candidate.bindings);
-
-        block.unit()
+        self.bind_pattern(
+            self.source_info(irrefutable_pat.span),
+            candidate,
+            None,
+            &fake_borrow_temps,
+            irrefutable_pat.span,
+            None,
+        )
+        .unit()
     }
 
     /// Declares the bindings of the given patterns and returns the visibility
@@ -531,12 +545,15 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         var: HirId,
         span: Span,
         for_guard: ForGuard,
+        schedule_drop: bool,
     ) -> Place<'tcx> {
         let local_id = self.var_local_id(var, for_guard);
         let source_info = self.source_info(span);
         self.cfg.push(block, Statement { source_info, kind: StatementKind::StorageLive(local_id) });
         let region_scope = self.hir.region_scope_tree.var_scope(var.local_id);
-        self.schedule_drop(span, region_scope, local_id, DropKind::Storage);
+        if schedule_drop {
+            self.schedule_drop(span, region_scope, local_id, DropKind::Storage);
+        }
         Place::from(local_id)
     }
 
@@ -632,36 +649,90 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 }
             }
             PatKind::Or { ref pats } => {
-                for pat in pats {
-                    self.visit_bindings(&pat, pattern_user_ty.clone(), f);
-                }
+                self.visit_bindings(&pats[0], pattern_user_ty, f);
             }
         }
     }
 }
 
 #[derive(Debug)]
-crate struct Candidate<'pat, 'tcx> {
-    // span of the original pattern that gave rise to this candidate
+struct Candidate<'pat, 'tcx> {
+    /// `Span` of the original pattern that gave rise to this candidate
     span: Span,
 
-    // all of these must be satisfied...
+    /// This `Candidate` has a guard.
+    has_guard: bool,
+
+    /// All of these must be satisfied...
     match_pairs: SmallVec<[MatchPair<'pat, 'tcx>; 1]>,
 
-    // ...these bindings established...
+    /// ...these bindings established...
     bindings: Vec<Binding<'tcx>>,
 
-    // ...and these types asserted...
+    /// ...and these types asserted...
     ascriptions: Vec<Ascription<'tcx>>,
 
-    // ...and the guard must be evaluated, if false branch to Block...
+    /// ... and if this is non-empty, one of these subcandidates also has to match ...
+    subcandidates: Vec<Candidate<'pat, 'tcx>>,
+
+    /// ...and the guard must be evaluated, if false branch to Block...
     otherwise_block: Option<BasicBlock>,
 
-    // ...and the blocks for add false edges between candidates
-    pre_binding_block: BasicBlock,
+    /// ...and the blocks for add false edges between candidates
+    pre_binding_block: Option<BasicBlock>,
     next_candidate_pre_binding_block: Option<BasicBlock>,
 }
 
+impl<'tcx, 'pat> Candidate<'pat, 'tcx> {
+    fn new(place: Place<'tcx>, pattern: &'pat Pat<'tcx>, has_guard: bool) -> Self {
+        Candidate {
+            span: pattern.span,
+            has_guard,
+            match_pairs: smallvec![MatchPair { place, pattern }],
+            bindings: Vec::new(),
+            ascriptions: Vec::new(),
+            subcandidates: Vec::new(),
+            otherwise_block: None,
+            pre_binding_block: None,
+            next_candidate_pre_binding_block: None,
+        }
+    }
+
+    /// Visit the leaf candidates (those with no subcandidates) contained in
+    /// this candidate.
+    fn visit_leaves<'a>(&'a mut self, mut visit_leaf: impl FnMut(&'a mut Self)) {
+        traverse_candidate(
+            self,
+            &mut (),
+            &mut move |c, _| visit_leaf(c),
+            move |c, _| c.subcandidates.iter_mut(),
+            |_| {},
+        );
+    }
+}
+
+/// A depth-first traversal of the `Candidate` and all of its recursive
+/// subcandidates.
+fn traverse_candidate<'pat, 'tcx: 'pat, C, T, I>(
+    candidate: C,
+    context: &mut T,
+    visit_leaf: &mut impl FnMut(C, &mut T),
+    get_children: impl Copy + Fn(C, &mut T) -> I,
+    complete_children: impl Copy + Fn(&mut T),
+) where
+    C: Borrow<Candidate<'pat, 'tcx>>,
+    I: Iterator<Item = C>,
+{
+    if candidate.borrow().subcandidates.is_empty() {
+        visit_leaf(candidate, context)
+    } else {
+        for child in get_children(candidate, context) {
+            traverse_candidate(child, context, visit_leaf, get_children, complete_children);
+        }
+        complete_children(context)
+    }
+}
+
 #[derive(Clone, Debug)]
 struct Binding<'tcx> {
     span: Span,
@@ -758,13 +829,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// which of these candidates, if any, is the correct one. The
     /// candidates are sorted such that the first item in the list
     /// has the highest priority. When a candidate is found to match
-    /// the value, we will generate a branch to the appropriate
+    /// the value, we will set and generate a branch to the appropriate
     /// prebinding block.
     ///
     /// If we find that *NONE* of the candidates apply, we branch to the
-    /// `otherwise_block`. In principle, this means that the input list was not
-    /// exhaustive, though at present we sometimes are not smart enough to
-    /// recognize all exhaustive inputs.
+    /// `otherwise_block`, setting it to `Some` if required. In principle, this
+    /// means that the input list was not exhaustive, though at present we
+    /// sometimes are not smart enough to recognize all exhaustive inputs.
     ///
     /// It might be surprising that the input can be inexhaustive.
     /// Indeed, initially, it is not, because all matches are
@@ -775,11 +846,26 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     ///
     /// If `fake_borrows` is Some, then places which need fake borrows
     /// will be added to it.
+    ///
+    /// For an example of a case where we set `otherwise_block`, even for an
+    /// exhaustive match consider:
+    ///
+    /// match x {
+    ///     (true, true) => (),
+    ///     (_, false) => (),
+    ///     (false, true) => (),
+    /// }
+    ///
+    /// For this match, we check if `x.0` matches `true` (for the first
+    /// arm). If that's false, we check `x.1`. If it's `true` we check if
+    /// `x.0` matches `false` (for the third arm). In the (impossible at
+    /// runtime) case when `x.0` is now `true`, we branch to
+    /// `otherwise_block`.
     fn match_candidates<'pat>(
         &mut self,
         span: Span,
-        start_block: &mut Option<BasicBlock>,
-        otherwise_block: Option<BasicBlock>,
+        start_block: BasicBlock,
+        otherwise_block: &mut Option<BasicBlock>,
         candidates: &mut [&mut Candidate<'pat, 'tcx>],
         fake_borrows: &mut Option<FxHashSet<Place<'tcx>>>,
     ) {
@@ -791,10 +877,45 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // Start by simplifying candidates. Once this process is complete, all
         // the match pairs which remain require some form of test, whether it
         // be a switch or pattern comparison.
+        let mut split_or_candidate = false;
         for candidate in &mut *candidates {
-            self.simplify_candidate(candidate);
+            split_or_candidate |= self.simplify_candidate(candidate);
         }
 
+        if split_or_candidate {
+            // At least one of the candidates has been split into subcandidates.
+            // We need to change the candidate list to include those.
+            let mut new_candidates = Vec::new();
+
+            for candidate in candidates {
+                candidate.visit_leaves(|leaf_candidate| new_candidates.push(leaf_candidate));
+            }
+            self.match_simplified_candidates(
+                span,
+                start_block,
+                otherwise_block,
+                &mut *new_candidates,
+                fake_borrows,
+            );
+        } else {
+            self.match_simplified_candidates(
+                span,
+                start_block,
+                otherwise_block,
+                candidates,
+                fake_borrows,
+            );
+        };
+    }
+
+    fn match_simplified_candidates(
+        &mut self,
+        span: Span,
+        start_block: BasicBlock,
+        otherwise_block: &mut Option<BasicBlock>,
+        candidates: &mut [&mut Candidate<'_, 'tcx>],
+        fake_borrows: &mut Option<FxHashSet<Place<'tcx>>>,
+    ) {
         // The candidates are sorted by priority. Check to see whether the
         // higher priority candidates (and hence at the front of the slice)
         // have satisfied all their match pairs.
@@ -802,7 +923,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         debug!("match_candidates: {:?} candidates fully matched", fully_matched);
         let (matched_candidates, unmatched_candidates) = candidates.split_at_mut(fully_matched);
 
-        let block: BasicBlock = if !matched_candidates.is_empty() {
+        let block = if !matched_candidates.is_empty() {
             let otherwise_block =
                 self.select_matched_candidates(matched_candidates, start_block, fake_borrows);
 
@@ -816,7 +937,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 self.cfg.start_new_block()
             }
         } else {
-            *start_block.get_or_insert_with(|| self.cfg.start_new_block())
+            start_block
         };
 
         // If there are no candidates that still need testing, we're
@@ -824,15 +945,22 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // never reach this point.
         if unmatched_candidates.is_empty() {
             let source_info = self.source_info(span);
-            match otherwise_block {
-                Some(otherwise) => self.cfg.goto(block, source_info, otherwise),
-                None => self.cfg.terminate(block, source_info, TerminatorKind::Unreachable),
+            if let Some(otherwise) = *otherwise_block {
+                self.cfg.goto(block, source_info, otherwise);
+            } else {
+                *otherwise_block = Some(block);
             }
             return;
         }
 
         // Test for the remaining candidates.
-        self.test_candidates(span, unmatched_candidates, block, otherwise_block, fake_borrows);
+        self.test_candidates_with_or(
+            span,
+            unmatched_candidates,
+            block,
+            otherwise_block,
+            fake_borrows,
+        );
     }
 
     /// Link up matched candidates. For example, if we have something like
@@ -856,13 +984,17 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     fn select_matched_candidates(
         &mut self,
         matched_candidates: &mut [&mut Candidate<'_, 'tcx>],
-        start_block: &mut Option<BasicBlock>,
+        start_block: BasicBlock,
         fake_borrows: &mut Option<FxHashSet<Place<'tcx>>>,
     ) -> Option<BasicBlock> {
         debug_assert!(
             !matched_candidates.is_empty(),
             "select_matched_candidates called with no candidates",
         );
+        debug_assert!(
+            matched_candidates.iter().all(|c| c.subcandidates.is_empty()),
+            "subcandidates should be empty in select_matched_candidates",
+        );
 
         // Insert a borrows of prefixes of places that are bound and are
         // behind a dereference projection.
@@ -899,65 +1031,206 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
         let fully_matched_with_guard = matched_candidates
             .iter()
-            .position(|c| c.otherwise_block.is_none())
+            .position(|c| !c.has_guard)
             .unwrap_or(matched_candidates.len() - 1);
 
         let (reachable_candidates, unreachable_candidates) =
             matched_candidates.split_at_mut(fully_matched_with_guard + 1);
 
-        let first_candidate = &reachable_candidates[0];
-        let first_prebinding_block = first_candidate.pre_binding_block;
+        let mut next_prebinding = start_block;
 
-        // `goto -> first_prebinding_block` from the `start_block` if there is one.
-        if let Some(start_block) = *start_block {
-            let source_info = self.source_info(first_candidate.span);
-            self.cfg.goto(start_block, source_info, first_prebinding_block);
-        } else {
-            *start_block = Some(first_prebinding_block);
+        for candidate in reachable_candidates.iter_mut() {
+            assert!(candidate.otherwise_block.is_none());
+            assert!(candidate.pre_binding_block.is_none());
+            candidate.pre_binding_block = Some(next_prebinding);
+            if candidate.has_guard {
+                // Create the otherwise block for this candidate, which is the
+                // pre-binding block for the next candidate.
+                next_prebinding = self.cfg.start_new_block();
+                candidate.otherwise_block = Some(next_prebinding);
+            }
         }
 
-        for (first_candidate, second_candidate) in reachable_candidates.iter().tuple_windows() {
-            let source_info = self.source_info(first_candidate.span);
-            if let Some(otherwise_block) = first_candidate.otherwise_block {
-                self.false_edges(
-                    otherwise_block,
-                    second_candidate.pre_binding_block,
-                    first_candidate.next_candidate_pre_binding_block,
-                    source_info,
-                );
-            } else {
-                bug!("candidate other than the last has no guard");
+        debug!(
+            "match_candidates: add pre_binding_blocks for unreachable {:?}",
+            unreachable_candidates,
+        );
+        for candidate in unreachable_candidates {
+            assert!(candidate.pre_binding_block.is_none());
+            candidate.pre_binding_block = Some(self.cfg.start_new_block());
+        }
+
+        reachable_candidates.last_mut().unwrap().otherwise_block
+    }
+
+    /// Tests a candidate where there are only or-patterns left to test, or
+    /// forwards to [Builder::test_candidates].
+    ///
+    /// Given a pattern `(P | Q, R | S)` we (in principle) generate a CFG like
+    /// so
+    ///
+    /// ```text
+    /// [ start ]
+    ///      |
+    /// [ match P, Q ]
+    ///      |
+    ///      +----------------------------------------+------------------------------------+
+    ///      |                                        |                                    |
+    ///      V                                        V                                    V
+    /// [ P matches ]                           [ Q matches ]                        [ otherwise ]
+    ///      |                                        |                                    |
+    ///      V                                        V                                    |
+    /// [ match R, S ]                          [ match R, S ]                             |
+    ///      |                                        |                                    |
+    ///      +--------------+------------+            +--------------+------------+        |
+    ///      |              |            |            |              |            |        |
+    ///      V              V            V            V              V            V        |
+    /// [ R matches ] [ S matches ] [otherwise ] [ R matches ] [ S matches ] [otherwise ]  |
+    ///      |              |            |            |              |            |        |
+    ///      +--------------+------------|------------+--------------+            |        |
+    ///      |                           |                                        |        |
+    ///      |                           +----------------------------------------+--------+
+    ///      |                           |
+    ///      V                           V
+    /// [ Success ]                 [ Failure ]
+    /// ```
+    ///
+    /// In practice there are some complications:
+    ///
+    /// * If there's a guard, then the otherwise branch of the first match on
+    ///   `R | S` goes to a test for whether `Q` matches, and the control flow
+    ///   doesn't merge into a single success block until after the guard is
+    ///   tested.
+    /// * If neither `P` or `Q` has any bindings or type ascriptions and there
+    ///   isn't a match guard, then we create a smaller CFG like:
+    ///
+    /// ```text
+    ///     ...
+    ///      +---------------+------------+
+    ///      |               |            |
+    /// [ P matches ] [ Q matches ] [ otherwise ]
+    ///      |               |            |
+    ///      +---------------+            |
+    ///      |                           ...
+    /// [ match R, S ]
+    ///      |
+    ///     ...
+    /// ```
+    fn test_candidates_with_or(
+        &mut self,
+        span: Span,
+        candidates: &mut [&mut Candidate<'_, 'tcx>],
+        block: BasicBlock,
+        otherwise_block: &mut Option<BasicBlock>,
+        fake_borrows: &mut Option<FxHashSet<Place<'tcx>>>,
+    ) {
+        let (first_candidate, remaining_candidates) = candidates.split_first_mut().unwrap();
+
+        // All of the or-patterns have been sorted to the end, so if the first
+        // pattern is an or-pattern we only have or-patterns.
+        match *first_candidate.match_pairs[0].pattern.kind {
+            PatKind::Or { .. } => (),
+            _ => {
+                self.test_candidates(span, candidates, block, otherwise_block, fake_borrows);
+                return;
             }
         }
 
-        debug!("match_candidates: add false edges for unreachable {:?}", unreachable_candidates);
-        for candidate in unreachable_candidates {
-            if let Some(otherwise) = candidate.otherwise_block {
-                let source_info = self.source_info(candidate.span);
-                let unreachable = self.cfg.start_new_block();
-                self.false_edges(
-                    otherwise,
-                    unreachable,
-                    candidate.next_candidate_pre_binding_block,
-                    source_info,
-                );
-                self.cfg.terminate(unreachable, source_info, TerminatorKind::Unreachable);
+        let match_pairs = mem::take(&mut first_candidate.match_pairs);
+        first_candidate.pre_binding_block = Some(block);
+
+        let mut otherwise = None;
+        for match_pair in match_pairs {
+            if let PatKind::Or { ref pats } = *match_pair.pattern.kind {
+                let or_span = match_pair.pattern.span;
+                let place = match_pair.place;
+
+                first_candidate.visit_leaves(|leaf_candidate| {
+                    self.test_or_pattern(
+                        leaf_candidate,
+                        &mut otherwise,
+                        pats,
+                        or_span,
+                        place,
+                        fake_borrows,
+                    );
+                });
+            } else {
+                bug!("Or-patterns should have been sorted to the end");
             }
         }
 
-        let last_candidate = reachable_candidates.last().unwrap();
-        if let Some(otherwise) = last_candidate.otherwise_block {
-            let source_info = self.source_info(last_candidate.span);
-            let block = self.cfg.start_new_block();
-            self.false_edges(
-                otherwise,
-                block,
-                last_candidate.next_candidate_pre_binding_block,
-                source_info,
-            );
-            Some(block)
+        let remainder_start = otherwise.unwrap_or_else(|| self.cfg.start_new_block());
+
+        self.match_candidates(
+            span,
+            remainder_start,
+            otherwise_block,
+            remaining_candidates,
+            fake_borrows,
+        )
+    }
+
+    fn test_or_pattern<'pat>(
+        &mut self,
+        candidate: &mut Candidate<'pat, 'tcx>,
+        otherwise: &mut Option<BasicBlock>,
+        pats: &'pat [Pat<'tcx>],
+        or_span: Span,
+        place: Place<'tcx>,
+        fake_borrows: &mut Option<FxHashSet<Place<'tcx>>>,
+    ) {
+        debug!("test_or_pattern:\ncandidate={:#?}\npats={:#?}", candidate, pats);
+        let mut or_candidates: Vec<_> =
+            pats.iter().map(|pat| Candidate::new(place, pat, candidate.has_guard)).collect();
+        let mut or_candidate_refs: Vec<_> = or_candidates.iter_mut().collect();
+        let otherwise = if candidate.otherwise_block.is_some() {
+            &mut candidate.otherwise_block
         } else {
-            None
+            otherwise
+        };
+        self.match_candidates(
+            or_span,
+            candidate.pre_binding_block.unwrap(),
+            otherwise,
+            &mut or_candidate_refs,
+            fake_borrows,
+        );
+        candidate.subcandidates = or_candidates;
+        self.merge_trivial_subcandidates(candidate, self.source_info(or_span));
+    }
+
+    /// Try to merge all of the subcandidates of the given candidate into one.
+    /// This avoids exponentially large CFGs in cases like `(1 | 2, 3 | 4, ...)`.
+    fn merge_trivial_subcandidates(
+        &mut self,
+        candidate: &mut Candidate<'_, 'tcx>,
+        source_info: SourceInfo,
+    ) {
+        if candidate.subcandidates.is_empty() || candidate.has_guard {
+            // FIXME(or_patterns; matthewjasper) Don't give up if we have a guard.
+            return;
+        }
+
+        let mut can_merge = true;
+
+        // Not `Iterator::all` because we don't want to short-circuit.
+        for subcandidate in &mut candidate.subcandidates {
+            self.merge_trivial_subcandidates(subcandidate, source_info);
+
+            // FIXME(or_patterns; matthewjasper) Try to be more aggressive here.
+            can_merge &= subcandidate.subcandidates.is_empty()
+                && subcandidate.bindings.is_empty()
+                && subcandidate.ascriptions.is_empty();
+        }
+
+        if can_merge {
+            let any_matches = self.cfg.start_new_block();
+            for subcandidate in mem::take(&mut candidate.subcandidates) {
+                let or_block = subcandidate.pre_binding_block.unwrap();
+                self.cfg.goto(or_block, source_info, any_matches);
+            }
+            candidate.pre_binding_block = Some(any_matches);
         }
     }
 
@@ -1078,7 +1351,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         span: Span,
         mut candidates: &'b mut [&'c mut Candidate<'pat, 'tcx>],
         block: BasicBlock,
-        mut otherwise_block: Option<BasicBlock>,
+        otherwise_block: &mut Option<BasicBlock>,
         fake_borrows: &mut Option<FxHashSet<Place<'tcx>>>,
     ) {
         // extract the match-pair from the highest priority candidate
@@ -1115,7 +1388,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
 
         // Insert a Shallow borrow of any places that is switched on.
-        fake_borrows.as_mut().map(|fb| fb.insert(match_place.clone()));
+        fake_borrows.as_mut().map(|fb| fb.insert(match_place));
 
         // perform the test, branching to one of N blocks. For each of
         // those N possible outcomes, create a (initially empty)
@@ -1150,52 +1423,52 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // improves the speed of llvm when optimizing long string literal
         // matches
         let make_target_blocks = move |this: &mut Self| -> Vec<BasicBlock> {
+            // The block that we should branch to if none of the
+            // `target_candidates` match. This is either the block where we
+            // start matching the untested candidates if there are any,
+            // otherwise it's the `otherwise_block`.
+            let remainder_start = &mut None;
+            let remainder_start =
+                if candidates.is_empty() { &mut *otherwise_block } else { remainder_start };
+
             // For each outcome of test, process the candidates that still
             // apply. Collect a list of blocks where control flow will
             // branch if one of the `target_candidate` sets is not
             // exhaustive.
-            if !candidates.is_empty() {
-                let remainder_start = &mut None;
-                this.match_candidates(
-                    span,
-                    remainder_start,
-                    otherwise_block,
-                    candidates,
-                    fake_borrows,
-                );
-                otherwise_block = Some(remainder_start.unwrap());
-            };
-
-            target_candidates
+            let target_blocks: Vec<_> = target_candidates
                 .into_iter()
                 .map(|mut candidates| {
-                    if candidates.len() != 0 {
-                        let candidate_start = &mut None;
+                    if !candidates.is_empty() {
+                        let candidate_start = this.cfg.start_new_block();
                         this.match_candidates(
                             span,
                             candidate_start,
-                            otherwise_block,
+                            remainder_start,
                             &mut *candidates,
                             fake_borrows,
                         );
-                        candidate_start.unwrap()
+                        candidate_start
                     } else {
-                        *otherwise_block.get_or_insert_with(|| {
-                            let unreachable = this.cfg.start_new_block();
-                            let source_info = this.source_info(span);
-                            this.cfg.terminate(
-                                unreachable,
-                                source_info,
-                                TerminatorKind::Unreachable,
-                            );
-                            unreachable
-                        })
+                        *remainder_start.get_or_insert_with(|| this.cfg.start_new_block())
                     }
                 })
-                .collect()
+                .collect();
+
+            if !candidates.is_empty() {
+                let remainder_start = remainder_start.unwrap_or_else(|| this.cfg.start_new_block());
+                this.match_candidates(
+                    span,
+                    remainder_start,
+                    otherwise_block,
+                    candidates,
+                    fake_borrows,
+                );
+            };
+
+            target_blocks
         };
 
-        self.perform_test(block, &match_place, &test, make_target_blocks);
+        self.perform_test(block, match_place, &test, make_target_blocks);
     }
 
     /// Determine the fake borrows that are needed from a set of places that
@@ -1241,7 +1514,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     // Insert a shallow borrow after a deref. For other
                     // projections the borrow of prefix_cursor will
                     // conflict with any mutation of base.
-                    all_fake_borrows.push(PlaceRef { local: &place.local, projection: proj_base });
+                    all_fake_borrows.push(PlaceRef { local: place.local, projection: proj_base });
                 }
             }
 
@@ -1258,7 +1531,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             .into_iter()
             .map(|matched_place_ref| {
                 let matched_place = Place {
-                    local: *matched_place_ref.local,
+                    local: matched_place_ref.local,
                     projection: tcx.intern_place_elems(matched_place_ref.projection),
                 };
                 let fake_borrow_deref_ty = matched_place.ty(&self.local_decls, tcx).ty;
@@ -1287,9 +1560,11 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     fn bind_and_guard_matched_candidate<'pat>(
         &mut self,
         candidate: Candidate<'pat, 'tcx>,
+        parent_bindings: &[(Vec<Binding<'tcx>>, Vec<Ascription<'tcx>>)],
         guard: Option<(&Guard<'tcx>, region::Scope)>,
         fake_borrows: &Vec<(Place<'tcx>, Local)>,
         scrutinee_span: Span,
+        schedule_drops: bool,
     ) -> BasicBlock {
         debug!("bind_and_guard_matched_candidate(candidate={:?})", candidate);
 
@@ -1297,15 +1572,9 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
 
         let candidate_source_info = self.source_info(candidate.span);
 
-        let mut block = candidate.pre_binding_block;
+        let mut block = candidate.pre_binding_block.unwrap();
 
-        // If we are adding our own statements, then we need a fresh block.
-        let create_fresh_block = candidate.next_candidate_pre_binding_block.is_some()
-            || !candidate.bindings.is_empty()
-            || !candidate.ascriptions.is_empty()
-            || guard.is_some();
-
-        if create_fresh_block {
+        if candidate.next_candidate_pre_binding_block.is_some() {
             let fresh_block = self.cfg.start_new_block();
             self.false_edges(
                 block,
@@ -1314,11 +1583,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 candidate_source_info,
             );
             block = fresh_block;
-            self.ascribe_types(block, &candidate.ascriptions);
-        } else {
-            return block;
         }
 
+        self.ascribe_types(
+            block,
+            parent_bindings
+                .iter()
+                .flat_map(|(_, ascriptions)| ascriptions)
+                .chain(&candidate.ascriptions),
+        );
+
         // rust-lang/rust#27282: The `autoref` business deserves some
         // explanation here.
         //
@@ -1401,23 +1675,23 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         //      reference to that.
         if let Some((guard, region_scope)) = guard {
             let tcx = self.hir.tcx();
+            let bindings = parent_bindings
+                .iter()
+                .flat_map(|(bindings, _)| bindings)
+                .chain(&candidate.bindings);
 
-            self.bind_matched_candidate_for_guard(block, &candidate.bindings);
+            self.bind_matched_candidate_for_guard(block, schedule_drops, bindings.clone());
             let guard_frame = GuardFrame {
-                locals: candidate
-                    .bindings
-                    .iter()
-                    .map(|b| GuardFrameLocal::new(b.var_id, b.binding_mode))
-                    .collect(),
+                locals: bindings.map(|b| GuardFrameLocal::new(b.var_id, b.binding_mode)).collect(),
             };
             debug!("entering guard building context: {:?}", guard_frame);
             self.guard_context.push(guard_frame);
 
             let re_erased = tcx.lifetimes.re_erased;
             let scrutinee_source_info = self.source_info(scrutinee_span);
-            for (place, temp) in fake_borrows {
-                let borrow = Rvalue::Ref(re_erased, BorrowKind::Shallow, *place);
-                self.cfg.push_assign(block, scrutinee_source_info, &Place::from(*temp), borrow);
+            for &(place, temp) in fake_borrows {
+                let borrow = Rvalue::Ref(re_erased, BorrowKind::Shallow, place);
+                self.cfg.push_assign(block, scrutinee_source_info, &Place::from(temp), borrow);
             }
 
             // the block to branch to if the guard fails; if there is no
@@ -1437,11 +1711,23 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 self.cfg.push_fake_read(post_guard_block, guard_end, cause, Place::from(temp));
             }
 
+            let otherwise_block = candidate.otherwise_block.unwrap_or_else(|| {
+                let unreachable = self.cfg.start_new_block();
+                self.cfg.terminate(unreachable, source_info, TerminatorKind::Unreachable);
+                unreachable
+            });
+            let outside_scope = self.cfg.start_new_block();
             self.exit_scope(
                 source_info.span,
                 region_scope,
                 otherwise_post_guard_block,
-                candidate.otherwise_block.unwrap(),
+                outside_scope,
+            );
+            self.false_edges(
+                outside_scope,
+                otherwise_block,
+                candidate.next_candidate_pre_binding_block,
+                source_info,
             );
 
             // We want to ensure that the matched candidates are bound
@@ -1470,9 +1756,14 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             // ```
             //
             // and that is clearly not correct.
-            let by_value_bindings = candidate.bindings.iter().filter(|binding| {
-                if let BindingMode::ByValue = binding.binding_mode { true } else { false }
-            });
+            let by_value_bindings =
+                parent_bindings
+                    .iter()
+                    .flat_map(|(bindings, _)| bindings)
+                    .chain(&candidate.bindings)
+                    .filter(|binding| {
+                        if let BindingMode::ByValue = binding.binding_mode { true } else { false }
+                    });
             // Read all of the by reference bindings to ensure that the
             // place they refer to can't be modified by the guard.
             for binding in by_value_bindings.clone() {
@@ -1480,22 +1771,35 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 let cause = FakeReadCause::ForGuardBinding;
                 self.cfg.push_fake_read(post_guard_block, guard_end, cause, Place::from(local_id));
             }
-            self.bind_matched_candidate_for_arm_body(post_guard_block, by_value_bindings);
+            assert!(schedule_drops, "patterns with guards must schedule drops");
+            self.bind_matched_candidate_for_arm_body(post_guard_block, true, by_value_bindings);
 
             post_guard_block
         } else {
-            assert!(candidate.otherwise_block.is_none());
             // (Here, it is not too early to bind the matched
             // candidate on `block`, because there is no guard result
             // that we have to inspect before we bind them.)
-            self.bind_matched_candidate_for_arm_body(block, &candidate.bindings);
+            self.bind_matched_candidate_for_arm_body(
+                block,
+                schedule_drops,
+                parent_bindings
+                    .iter()
+                    .flat_map(|(bindings, _)| bindings)
+                    .chain(&candidate.bindings),
+            );
             block
         }
     }
 
     /// Append `AscribeUserType` statements onto the end of `block`
     /// for each ascription
-    fn ascribe_types(&mut self, block: BasicBlock, ascriptions: &[Ascription<'tcx>]) {
+    fn ascribe_types<'b>(
+        &mut self,
+        block: BasicBlock,
+        ascriptions: impl IntoIterator<Item = &'b Ascription<'tcx>>,
+    ) where
+        'tcx: 'b,
+    {
         for ascription in ascriptions {
             let source_info = self.source_info(ascription.span);
 
@@ -1522,22 +1826,35 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
     }
 
-    fn bind_matched_candidate_for_guard(&mut self, block: BasicBlock, bindings: &[Binding<'tcx>]) {
-        debug!("bind_matched_candidate_for_guard(block={:?}, bindings={:?})", block, bindings);
+    fn bind_matched_candidate_for_guard<'b>(
+        &mut self,
+        block: BasicBlock,
+        schedule_drops: bool,
+        bindings: impl IntoIterator<Item = &'b Binding<'tcx>>,
+    ) where
+        'tcx: 'b,
+    {
+        debug!("bind_matched_candidate_for_guard(block={:?})", block);
 
         // Assign each of the bindings. Since we are binding for a
         // guard expression, this will never trigger moves out of the
         // candidate.
         let re_erased = self.hir.tcx().lifetimes.re_erased;
         for binding in bindings {
+            debug!("bind_matched_candidate_for_guard(binding={:?})", binding);
             let source_info = self.source_info(binding.span);
 
             // For each pattern ident P of type T, `ref_for_guard` is
             // a reference R: &T pointing to the location matched by
             // the pattern, and every occurrence of P within a guard
             // denotes *R.
-            let ref_for_guard =
-                self.storage_live_binding(block, binding.var_id, binding.span, RefWithinGuard);
+            let ref_for_guard = self.storage_live_binding(
+                block,
+                binding.var_id,
+                binding.span,
+                RefWithinGuard,
+                schedule_drops,
+            );
             match binding.binding_mode {
                 BindingMode::ByValue => {
                     let rvalue = Rvalue::Ref(re_erased, BorrowKind::Shared, binding.source);
@@ -1549,6 +1866,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                         binding.var_id,
                         binding.span,
                         OutsideGuard,
+                        schedule_drops,
                     );
 
                     let rvalue = Rvalue::Ref(re_erased, borrow_kind, binding.source);
@@ -1563,6 +1881,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     fn bind_matched_candidate_for_arm_body<'b>(
         &mut self,
         block: BasicBlock,
+        schedule_drops: bool,
         bindings: impl IntoIterator<Item = &'b Binding<'tcx>>,
     ) where
         'tcx: 'b,
@@ -1573,9 +1892,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         // Assign each of the bindings. This may trigger moves out of the candidate.
         for binding in bindings {
             let source_info = self.source_info(binding.span);
-            let local =
-                self.storage_live_binding(block, binding.var_id, binding.span, OutsideGuard);
-            self.schedule_drop_for_binding(binding.var_id, binding.span, OutsideGuard);
+            let local = self.storage_live_binding(
+                block,
+                binding.var_id,
+                binding.span,
+                OutsideGuard,
+                schedule_drops,
+            );
+            if schedule_drops {
+                self.schedule_drop_for_binding(binding.var_id, binding.span, OutsideGuard);
+            }
             let rvalue = match binding.binding_mode {
                 BindingMode::ByValue => {
                     Rvalue::Use(self.consume_by_copy_or_move(binding.source.clone()))
@@ -1616,8 +1942,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let tcx = self.hir.tcx();
         let debug_source_info = SourceInfo { span: source_info.span, scope: visibility_scope };
         let binding_mode = match mode {
-            BindingMode::ByValue => ty::BindingMode::BindByValue(mutability.into()),
-            BindingMode::ByRef(_) => ty::BindingMode::BindByReference(mutability.into()),
+            BindingMode::ByValue => ty::BindingMode::BindByValue(mutability),
+            BindingMode::ByRef(_) => ty::BindingMode::BindByReference(mutability),
         };
         debug!("declare_binding: user_ty={:?}", user_ty);
         let local = LocalDecl::<'tcx> {
diff --git a/src/librustc_mir_build/build/matches/simplify.rs b/src/librustc_mir_build/build/matches/simplify.rs
index fb3babca32..80fa0c4486 100644
--- a/src/librustc_mir_build/build/matches/simplify.rs
+++ b/src/librustc_mir_build/build/matches/simplify.rs
@@ -16,18 +16,42 @@ use crate::build::matches::{Ascription, Binding, Candidate, MatchPair};
 use crate::build::Builder;
 use crate::hair::{self, *};
 use rustc::mir::interpret::truncate;
+use rustc::mir::Place;
 use rustc::ty;
 use rustc::ty::layout::{Integer, IntegerExt, Size};
+use rustc_attr::{SignedInt, UnsignedInt};
 use rustc_hir::RangeEnd;
-use syntax::attr::{SignedInt, UnsignedInt};
 
 use std::mem;
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
-    crate fn simplify_candidate<'pat>(&mut self, candidate: &mut Candidate<'pat, 'tcx>) {
+    /// Simplify a candidate so that all match pairs require a test.
+    ///
+    /// This method will also split a candidate where the only match-pair is an
+    /// or-pattern into multiple candidates. This is so that
+    ///
+    /// match x {
+    ///     0 | 1 => { ... },
+    ///     2 | 3 => { ... },
+    /// }
+    ///
+    /// only generates a single switch. If this happens this method returns
+    /// `true`.
+    pub(super) fn simplify_candidate<'pat>(
+        &mut self,
+        candidate: &mut Candidate<'pat, 'tcx>,
+    ) -> bool {
         // repeatedly simplify match pairs until fixed point is reached
         loop {
             let match_pairs = mem::take(&mut candidate.match_pairs);
+
+            if let [MatchPair { pattern: Pat { kind: box PatKind::Or { pats }, .. }, place }] =
+                *match_pairs
+            {
+                candidate.subcandidates = self.create_or_subcandidates(candidate, place, pats);
+                return true;
+            }
+
             let mut changed = false;
             for match_pair in match_pairs {
                 match self.simplify_match_pair(match_pair, candidate) {
@@ -40,11 +64,35 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 }
             }
             if !changed {
-                return; // if we were not able to simplify any, done.
+                // Move or-patterns to the end, because they can result in us
+                // creating additional candidates, so we want to test them as
+                // late as possible.
+                candidate
+                    .match_pairs
+                    .sort_by_key(|pair| matches!(*pair.pattern.kind, PatKind::Or { .. }));
+                return false; // if we were not able to simplify any, done.
             }
         }
     }
 
+    /// Given `candidate` that has a single or-pattern for its match-pairs,
+    /// creates a fresh candidate for each of its input subpatterns passed via
+    /// `pats`.
+    fn create_or_subcandidates<'pat>(
+        &mut self,
+        candidate: &Candidate<'pat, 'tcx>,
+        place: Place<'tcx>,
+        pats: &'pat [Pat<'tcx>],
+    ) -> Vec<Candidate<'pat, 'tcx>> {
+        pats.iter()
+            .map(|pat| {
+                let mut candidate = Candidate::new(place, pat, candidate.has_guard);
+                self.simplify_candidate(&mut candidate);
+                candidate
+            })
+            .collect()
+    }
+
     /// Tries to simplify `match_pair`, returning `Ok(())` if
     /// successful. If successful, new match pairs and bindings will
     /// have been pushed into the candidate. If no simplification is
@@ -65,7 +113,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 // value being matched, taking the variance field into account.
                 candidate.ascriptions.push(Ascription {
                     span: user_ty_span,
-                    user_ty: user_ty,
+                    user_ty,
                     source: match_pair.place,
                     variance,
                 });
diff --git a/src/librustc_mir_build/build/matches/test.rs b/src/librustc_mir_build/build/matches/test.rs
index 1f97f5f1b7..d23a2708dc 100644
--- a/src/librustc_mir_build/build/matches/test.rs
+++ b/src/librustc_mir_build/build/matches/test.rs
@@ -24,7 +24,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// Identifies what test is needed to decide if `match_pair` is applicable.
     ///
     /// It is a bug to call this with a simplifiable pattern.
-    crate fn test<'pat>(&mut self, match_pair: &MatchPair<'pat, 'tcx>) -> Test<'tcx> {
+    pub(super) fn test<'pat>(&mut self, match_pair: &MatchPair<'pat, 'tcx>) -> Test<'tcx> {
         match *match_pair.pattern.kind {
             PatKind::Variant { ref adt_def, substs: _, variant_index: _, subpatterns: _ } => Test {
                 span: match_pair.pattern.span,
@@ -64,17 +64,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             PatKind::Slice { ref prefix, ref slice, ref suffix } => {
                 let len = prefix.len() + suffix.len();
                 let op = if slice.is_some() { BinOp::Ge } else { BinOp::Eq };
-                Test {
-                    span: match_pair.pattern.span,
-                    kind: TestKind::Len { len: len as u64, op: op },
-                }
+                Test { span: match_pair.pattern.span, kind: TestKind::Len { len: len as u64, op } }
             }
 
-            PatKind::Or { .. } => self
-                .hir
-                .tcx()
-                .sess
-                .span_fatal(match_pair.pattern.span, "or-patterns are not fully implemented yet"),
+            PatKind::Or { .. } => bug!("or-patterns should have already been handled"),
 
             PatKind::AscribeUserType { .. }
             | PatKind::Array { .. }
@@ -85,7 +78,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
     }
 
-    crate fn add_cases_to_switch<'pat>(
+    pub(super) fn add_cases_to_switch<'pat>(
         &mut self,
         test_place: &Place<'tcx>,
         candidate: &Candidate<'pat, 'tcx>,
@@ -129,7 +122,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
     }
 
-    crate fn add_variants_to_switch<'pat>(
+    pub(super) fn add_variants_to_switch<'pat>(
         &mut self,
         test_place: &Place<'tcx>,
         candidate: &Candidate<'pat, 'tcx>,
@@ -156,10 +149,10 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         }
     }
 
-    crate fn perform_test(
+    pub(super) fn perform_test(
         &mut self,
         block: BasicBlock,
-        place: &Place<'tcx>,
+        place: Place<'tcx>,
         test: &Test<'tcx>,
         make_target_blocks: impl FnOnce(&mut Self) -> Vec<BasicBlock>,
     ) {
@@ -209,7 +202,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 );
                 let discr_ty = adt_def.repr.discr_type().to_ty(tcx);
                 let discr = self.temp(discr_ty, test.span);
-                self.cfg.push_assign(block, source_info, &discr, Rvalue::Discriminant(*place));
+                self.cfg.push_assign(block, source_info, &discr, Rvalue::Discriminant(place));
                 assert_eq!(values.len() + 1, targets.len());
                 self.cfg.terminate(
                     block,
@@ -226,19 +219,14 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             TestKind::SwitchInt { switch_ty, ref options, indices: _ } => {
                 let target_blocks = make_target_blocks(self);
                 let terminator = if switch_ty.kind == ty::Bool {
-                    assert!(options.len() > 0 && options.len() <= 2);
+                    assert!(!options.is_empty() && options.len() <= 2);
                     if let [first_bb, second_bb] = *target_blocks {
                         let (true_bb, false_bb) = match options[0] {
                             1 => (first_bb, second_bb),
                             0 => (second_bb, first_bb),
                             v => span_bug!(test.span, "expected boolean value but got {:?}", v),
                         };
-                        TerminatorKind::if_(
-                            self.hir.tcx(),
-                            Operand::Copy(*place),
-                            true_bb,
-                            false_bb,
-                        )
+                        TerminatorKind::if_(self.hir.tcx(), Operand::Copy(place), true_bb, false_bb)
                     } else {
                         bug!("`TestKind::SwitchInt` on `bool` should have two targets")
                     }
@@ -246,7 +234,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     // The switch may be inexhaustive so we have a catch all block
                     debug_assert_eq!(options.len() + 1, target_blocks.len());
                     TerminatorKind::SwitchInt {
-                        discr: Operand::Copy(*place),
+                        discr: Operand::Copy(place),
                         switch_ty,
                         values: options.clone().into(),
                         targets: target_blocks,
@@ -271,7 +259,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                     if let [success, fail] = *make_target_blocks(self) {
                         assert_eq!(value.ty, ty);
                         let expect = self.literal_operand(test.span, value);
-                        let val = Operand::Copy(*place);
+                        let val = Operand::Copy(place);
                         self.compare(block, success, fail, source_info, BinOp::Eq, expect, val);
                     } else {
                         bug!("`TestKind::Eq` should have two target blocks");
@@ -286,7 +274,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 // Test `val` by computing `lo <= val && val <= hi`, using primitive comparisons.
                 let lo = self.literal_operand(test.span, lo);
                 let hi = self.literal_operand(test.span, hi);
-                let val = Operand::Copy(*place);
+                let val = Operand::Copy(place);
 
                 if let [success, fail] = *target_blocks {
                     self.compare(
@@ -315,7 +303,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 let actual = self.temp(usize_ty, test.span);
 
                 // actual = len(place)
-                self.cfg.push_assign(block, source_info, &actual, Rvalue::Len(*place));
+                self.cfg.push_assign(block, source_info, &actual, Rvalue::Len(place));
 
                 // expected = <N>
                 let expected = self.push_usize(block, source_info, len);
@@ -371,13 +359,13 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         make_target_blocks: impl FnOnce(&mut Self) -> Vec<BasicBlock>,
         source_info: SourceInfo,
         value: &'tcx ty::Const<'tcx>,
-        place: &Place<'tcx>,
+        place: Place<'tcx>,
         mut ty: Ty<'tcx>,
     ) {
         use rustc::middle::lang_items::EqTraitLangItem;
 
         let mut expect = self.literal_operand(source_info.span, value);
-        let mut val = Operand::Copy(*place);
+        let mut val = Operand::Copy(place);
 
         // If we're using `b"..."` as a pattern, we need to insert an
         // unsizing coercion, as the byte string has the type `&[u8; N]`.
@@ -502,7 +490,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// that it *doesn't* apply. For now, we return false, indicate that the
     /// test does not apply to this candidate, but it might be we can get
     /// tighter match code if we do something a bit different.
-    crate fn sort_candidate<'pat>(
+    pub(super) fn sort_candidate<'pat>(
         &mut self,
         test_place: &Place<'tcx>,
         test: &Test<'tcx>,
@@ -755,8 +743,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         let downcast_place = tcx.mk_place_elem(match_pair.place, elem); // `(x as Variant)`
         let consequent_match_pairs = subpatterns.iter().map(|subpattern| {
             // e.g., `(x as Variant).0`
-            let place =
-                tcx.mk_place_field(downcast_place.clone(), subpattern.field, subpattern.pattern.ty);
+            let place = tcx.mk_place_field(downcast_place, subpattern.field, subpattern.pattern.ty);
             // e.g., `(x as Variant).0 @ P1`
             MatchPair::new(place, &subpattern.pattern)
         });
diff --git a/src/librustc_mir_build/build/mod.rs b/src/librustc_mir_build/build/mod.rs
index fa5f266c76..b60a637471 100644
--- a/src/librustc_mir_build/build/mod.rs
+++ b/src/librustc_mir_build/build/mod.rs
@@ -7,16 +7,17 @@ use rustc::middle::region;
 use rustc::mir::*;
 use rustc::ty::subst::Subst;
 use rustc::ty::{self, Ty, TyCtxt};
+use rustc_attr::{self as attr, UnwindAttr};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::{GeneratorKind, HirIdMap, Node};
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_infer::infer::TyCtxtInferExt;
 use rustc_span::symbol::kw;
 use rustc_span::Span;
 use rustc_target::spec::abi::Abi;
 use rustc_target::spec::PanicStrategy;
 use std::u32;
-use syntax::attr::{self, UnwindAttr};
 
 use super::lints;
 
@@ -68,6 +69,12 @@ fn mir_build(tcx: TyCtxt<'_>, def_id: DefId) -> BodyAndCache<'_> {
             let fn_sig = cx.tables().liberated_fn_sigs()[id];
             let fn_def_id = tcx.hir().local_def_id(id);
 
+            let safety = match fn_sig.unsafety {
+                hir::Unsafety::Normal => Safety::Safe,
+                hir::Unsafety::Unsafe => Safety::FnUnsafe,
+            };
+
+            let body = tcx.hir().body(body_id);
             let ty = tcx.type_of(fn_def_id);
             let mut abi = fn_sig.abi;
             let implicit_argument = match ty.kind {
@@ -75,21 +82,25 @@ fn mir_build(tcx: TyCtxt<'_>, def_id: DefId) -> BodyAndCache<'_> {
                     // HACK(eddyb) Avoid having RustCall on closures,
                     // as it adds unnecessary (and wrong) auto-tupling.
                     abi = Abi::Rust;
-                    Some(ArgInfo(liberated_closure_env_ty(tcx, id, body_id), None, None, None))
+                    vec![ArgInfo(liberated_closure_env_ty(tcx, id, body_id), None, None, None)]
                 }
                 ty::Generator(..) => {
                     let gen_ty = tcx.body_tables(body_id).node_type(id);
-                    Some(ArgInfo(gen_ty, None, None, None))
-                }
-                _ => None,
-            };
 
-            let safety = match fn_sig.unsafety {
-                hir::Unsafety::Normal => Safety::Safe,
-                hir::Unsafety::Unsafe => Safety::FnUnsafe,
+                    // The resume argument may be missing, in that case we need to provide it here.
+                    // It will always be `()` in this case.
+                    if body.params.is_empty() {
+                        vec![
+                            ArgInfo(gen_ty, None, None, None),
+                            ArgInfo(tcx.mk_unit(), None, None, None),
+                        ]
+                    } else {
+                        vec![ArgInfo(gen_ty, None, None, None)]
+                    }
+                }
+                _ => vec![],
             };
 
-            let body = tcx.hir().body(body_id);
             let explicit_arguments = body.params.iter().enumerate().map(|(index, arg)| {
                 let owner_id = tcx.hir().body_owner(body_id);
                 let opt_ty_info;
@@ -407,7 +418,7 @@ struct GuardFrameLocal {
 
 impl GuardFrameLocal {
     fn new(id: hir::HirId, _binding_mode: BindingMode) -> Self {
-        GuardFrameLocal { id: id }
+        GuardFrameLocal { id }
     }
 }
 
@@ -660,14 +671,51 @@ fn construct_const<'a, 'tcx>(
     builder.finish()
 }
 
+/// Construct MIR for a item that has had errors in type checking.
+///
+/// This is required because we may still want to run MIR passes on an item
+/// with type errors, but normal MIR construction can't handle that in general.
 fn construct_error<'a, 'tcx>(hir: Cx<'a, 'tcx>, body_id: hir::BodyId) -> Body<'tcx> {
-    let owner_id = hir.tcx().hir().body_owner(body_id);
-    let span = hir.tcx().hir().span(owner_id);
-    let ty = hir.tcx().types.err;
-    let mut builder = Builder::new(hir, span, 0, Safety::Safe, ty, span, None);
+    let tcx = hir.tcx();
+    let owner_id = tcx.hir().body_owner(body_id);
+    let span = tcx.hir().span(owner_id);
+    let ty = tcx.types.err;
+    let num_params = match hir.body_owner_kind {
+        hir::BodyOwnerKind::Fn => tcx.hir().fn_decl_by_hir_id(owner_id).unwrap().inputs.len(),
+        hir::BodyOwnerKind::Closure => {
+            if tcx.hir().body(body_id).generator_kind().is_some() {
+                // Generators have an implicit `self` parameter *and* a possibly
+                // implicit resume parameter.
+                2
+            } else {
+                // The implicit self parameter adds another local in MIR.
+                1 + tcx.hir().fn_decl_by_hir_id(owner_id).unwrap().inputs.len()
+            }
+        }
+        hir::BodyOwnerKind::Const => 0,
+        hir::BodyOwnerKind::Static(_) => 0,
+    };
+    let mut builder = Builder::new(hir, span, num_params, Safety::Safe, ty, span, None);
     let source_info = builder.source_info(span);
+    // Some MIR passes will expect the number of parameters to match the
+    // function declaration.
+    for _ in 0..num_params {
+        builder.local_decls.push(LocalDecl {
+            mutability: Mutability::Mut,
+            ty,
+            user_ty: UserTypeProjections::none(),
+            source_info,
+            internal: false,
+            local_info: LocalInfo::Other,
+            is_block_tail: None,
+        });
+    }
     builder.cfg.terminate(START_BLOCK, source_info, TerminatorKind::Unreachable);
-    builder.finish()
+    let mut body = builder.finish();
+    if tcx.hir().body(body_id).generator_kind.is_some() {
+        body.yield_ty = Some(ty);
+    }
+    body
 }
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
@@ -834,7 +882,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                             span: tcx_hir.span(var_id),
                         },
                         place: Place {
-                            local: closure_env_arg.into(),
+                            local: closure_env_arg,
                             projection: tcx.intern_place_elems(&projs),
                         },
                     });
@@ -879,7 +927,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                         self.local_decls[local].local_info = if let Some(kind) = self_binding {
                             LocalInfo::User(ClearCrossCrate::Set(BindingForm::ImplicitSelf(*kind)))
                         } else {
-                            let binding_mode = ty::BindingMode::BindByValue(mutability.into());
+                            let binding_mode = ty::BindingMode::BindByValue(mutability);
                             LocalInfo::User(ClearCrossCrate::Set(BindingForm::Var(
                                 VarBindingForm {
                                     binding_mode,
@@ -899,7 +947,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                             matches::ArmHasGuard(false),
                             Some((Some(&place), span)),
                         );
-                        unpack!(block = self.place_into_pattern(block, pattern, &place, false));
+                        unpack!(block = self.place_into_pattern(block, pattern, place, false));
                     }
                 }
                 self.source_scope = original_source_scope;
diff --git a/src/librustc_mir_build/hair/constant.rs b/src/librustc_mir_build/hair/constant.rs
index 2d9ee62da3..d5e5398b9d 100644
--- a/src/librustc_mir_build/hair/constant.rs
+++ b/src/librustc_mir_build/hair/constant.rs
@@ -2,8 +2,8 @@ use rustc::mir::interpret::{
     truncate, Allocation, ConstValue, LitToConstError, LitToConstInput, Scalar,
 };
 use rustc::ty::{self, layout::Size, ParamEnv, TyCtxt, TyS};
+use rustc_ast::ast;
 use rustc_span::symbol::Symbol;
-use syntax::ast;
 
 crate fn lit_to_const<'tcx>(
     tcx: TyCtxt<'tcx>,
@@ -50,7 +50,7 @@ crate fn lit_to_const<'tcx>(
         (ast::LitKind::Err(_), _) => return Err(LitToConstError::Reported),
         _ => return Err(LitToConstError::TypeError),
     };
-    Ok(tcx.mk_const(ty::Const { val: ty::ConstKind::Value(lit), ty }))
+    Ok(ty::Const::from_value(tcx, lit, ty))
 }
 
 fn parse_float<'tcx>(num: Symbol, fty: ast::FloatTy, neg: bool) -> Result<ConstValue<'tcx>, ()> {
diff --git a/src/librustc_mir_build/hair/cx/block.rs b/src/librustc_mir_build/hair/cx/block.rs
index a883b84f8f..8d7225c8c7 100644
--- a/src/librustc_mir_build/hair/cx/block.rs
+++ b/src/librustc_mir_build/hair/cx/block.rs
@@ -84,7 +84,7 @@ fn mirror_stmts<'a, 'tcx>(
 
                 result.push(StmtRef::Mirror(Box::new(Stmt {
                     kind: StmtKind::Let {
-                        remainder_scope: remainder_scope,
+                        remainder_scope,
                         init_scope: region::Scope {
                             id: hir_id.local_id,
                             data: region::ScopeData::Node,
diff --git a/src/librustc_mir_build/hair/cx/expr.rs b/src/librustc_mir_build/hair/cx/expr.rs
index d6786ea247..46d49b6b49 100644
--- a/src/librustc_mir_build/hair/cx/expr.rs
+++ b/src/librustc_mir_build/hair/cx/expr.rs
@@ -187,13 +187,12 @@ fn make_mirror_unadjusted<'a, 'tcx>(
                 if let Some((adt_def, index)) = adt_data {
                     let substs = cx.tables().node_substs(fun.hir_id);
                     let user_provided_types = cx.tables().user_provided_types();
-                    let user_ty =
-                        user_provided_types.get(fun.hir_id).map(|u_ty| *u_ty).map(|mut u_ty| {
-                            if let UserType::TypeOf(ref mut did, _) = &mut u_ty.value {
-                                *did = adt_def.did;
-                            }
-                            u_ty
-                        });
+                    let user_ty = user_provided_types.get(fun.hir_id).copied().map(|mut u_ty| {
+                        if let UserType::TypeOf(ref mut did, _) = &mut u_ty.value {
+                            *did = adt_def.did;
+                        }
+                        u_ty
+                    });
                     debug!("make_mirror_unadjusted: (call) user_ty={:?}", user_ty);
 
                     let field_refs = args
@@ -329,7 +328,7 @@ fn make_mirror_unadjusted<'a, 'tcx>(
             ty::Adt(adt, substs) => match adt.adt_kind() {
                 AdtKind::Struct | AdtKind::Union => {
                     let user_provided_types = cx.tables().user_provided_types();
-                    let user_ty = user_provided_types.get(expr.hir_id).map(|u_ty| *u_ty);
+                    let user_ty = user_provided_types.get(expr.hir_id).copied();
                     debug!("make_mirror_unadjusted: (struct/union) user_ty={:?}", user_ty);
                     ExprKind::Adt {
                         adt_def: adt,
@@ -351,7 +350,7 @@ fn make_mirror_unadjusted<'a, 'tcx>(
 
                             let index = adt.variant_index_with_id(variant_id);
                             let user_provided_types = cx.tables().user_provided_types();
-                            let user_ty = user_provided_types.get(expr.hir_id).map(|u_ty| *u_ty);
+                            let user_ty = user_provided_types.get(expr.hir_id).copied();
                             debug!("make_mirror_unadjusted: (variant) user_ty={:?}", user_ty);
                             ExprKind::Adt {
                                 adt_def: adt,
@@ -418,7 +417,17 @@ fn make_mirror_unadjusted<'a, 'tcx>(
                 None,
                 Some(span),
             ) {
-                Ok(cv) => cv.eval_usize(cx.tcx, ty::ParamEnv::reveal_all()),
+                Ok(cv) => {
+                    if let Some(count) = cv.try_to_bits_for_ty(
+                        cx.tcx,
+                        ty::ParamEnv::reveal_all(),
+                        cx.tcx.types.usize,
+                    ) {
+                        count as u64
+                    } else {
+                        bug!("repeat count constant value can't be converted to usize");
+                    }
+                }
                 Err(ErrorHandled::Reported) => 0,
                 Err(ErrorHandled::TooGeneric) => {
                     let span = cx.tcx.def_span(def_id);
@@ -560,7 +569,7 @@ fn make_mirror_unadjusted<'a, 'tcx>(
         }
         hir::ExprKind::Type(ref source, ref ty) => {
             let user_provided_types = cx.tables.user_provided_types();
-            let user_ty = user_provided_types.get(ty.hir_id).map(|u_ty| *u_ty);
+            let user_ty = user_provided_types.get(ty.hir_id).copied();
             debug!("make_mirror_unadjusted: (type) user_ty={:?}", user_ty);
             if source.is_syntactic_place_expr() {
                 ExprKind::PlaceTypeAscription { source: source.to_ref(), user_ty }
@@ -595,7 +604,7 @@ fn user_substs_applied_to_res<'tcx>(
         | Res::Def(DefKind::Ctor(_, CtorKind::Fn), _)
         | Res::Def(DefKind::Const, _)
         | Res::Def(DefKind::AssocConst, _) => {
-            cx.tables().user_provided_types().get(hir_id).map(|u_ty| *u_ty)
+            cx.tables().user_provided_types().get(hir_id).copied()
         }
 
         // A unit struct/variant which is used as a value (e.g.,
@@ -734,7 +743,7 @@ fn convert_path_expr<'a, 'tcx>(
 
         Res::Def(DefKind::Ctor(_, CtorKind::Const), def_id) => {
             let user_provided_types = cx.tables.user_provided_types();
-            let user_provided_type = user_provided_types.get(expr.hir_id).map(|u_ty| *u_ty);
+            let user_provided_type = user_provided_types.get(expr.hir_id).copied();
             debug!("convert_path_expr: user_provided_type={:?}", user_provided_type);
             let ty = cx.tables().node_type(expr.hir_id);
             match ty.kind {
diff --git a/src/librustc_mir_build/hair/cx/mod.rs b/src/librustc_mir_build/hair/cx/mod.rs
index 5503d1a86e..449e2e7494 100644
--- a/src/librustc_mir_build/hair/cx/mod.rs
+++ b/src/librustc_mir_build/hair/cx/mod.rs
@@ -5,20 +5,20 @@
 use crate::hair::util::UserAnnotatedTyHelpers;
 use crate::hair::*;
 
-use rustc::infer::InferCtxt;
 use rustc::middle::region;
 use rustc::mir::interpret::{LitToConstError, LitToConstInput};
 use rustc::ty::layout::VariantIdx;
 use rustc::ty::subst::Subst;
 use rustc::ty::subst::{GenericArg, InternalSubsts};
 use rustc::ty::{self, Ty, TyCtxt};
+use rustc_ast::ast;
+use rustc_ast::attr;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::Node;
 use rustc_index::vec::Idx;
+use rustc_infer::infer::InferCtxt;
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast;
-use syntax::attr;
 
 #[derive(Clone)]
 crate struct Cx<'a, 'tcx> {
@@ -168,17 +168,19 @@ impl<'a, 'tcx> Cx<'a, 'tcx> {
         params: &[GenericArg<'tcx>],
     ) -> &'tcx ty::Const<'tcx> {
         let substs = self.tcx.mk_substs_trait(self_ty, params);
-        for item in self.tcx.associated_items(trait_def_id) {
-            // The unhygienic comparison here is acceptable because this is only
-            // used on known traits.
-            if item.kind == ty::AssocKind::Method && item.ident.name == method_name {
-                let method_ty = self.tcx.type_of(item.def_id);
-                let method_ty = method_ty.subst(self.tcx, substs);
-                return ty::Const::zero_sized(self.tcx, method_ty);
-            }
-        }
 
-        bug!("found no method `{}` in `{:?}`", method_name, trait_def_id);
+        // The unhygienic comparison here is acceptable because this is only
+        // used on known traits.
+        let item = self
+            .tcx
+            .associated_items(trait_def_id)
+            .filter_by_name_unhygienic(method_name)
+            .find(|item| item.kind == ty::AssocKind::Method)
+            .expect("trait method not found");
+
+        let method_ty = self.tcx.type_of(item.def_id);
+        let method_ty = method_ty.subst(self.tcx, substs);
+        ty::Const::zero_sized(self.tcx, method_ty)
     }
 
     crate fn all_fields(&mut self, adt_def: &ty::AdtDef, variant_index: VariantIdx) -> Vec<Field> {
diff --git a/src/librustc_mir_build/hair/mod.rs b/src/librustc_mir_build/hair/mod.rs
index 0f2c76152e..cb93ba7c92 100644
--- a/src/librustc_mir_build/hair/mod.rs
+++ b/src/librustc_mir_build/hair/mod.rs
@@ -315,17 +315,6 @@ crate struct Arm<'tcx> {
     crate span: Span,
 }
 
-impl<'tcx> Arm<'tcx> {
-    // HACK(or_patterns; Centril | dlrobertson): Remove this and
-    // correctly handle each case in which this method is used.
-    crate fn top_pats_hack(&self) -> &[Pat<'tcx>] {
-        match &*self.pattern.kind {
-            PatKind::Or { pats } => pats,
-            _ => std::slice::from_ref(&self.pattern),
-        }
-    }
-}
-
 #[derive(Clone, Debug)]
 crate enum Guard<'tcx> {
     If(ExprRef<'tcx>),
diff --git a/src/librustc_mir_build/hair/pattern/_match.rs b/src/librustc_mir_build/hair/pattern/_match.rs
index 08ed6b521b..71aefa85c9 100644
--- a/src/librustc_mir_build/hair/pattern/_match.rs
+++ b/src/librustc_mir_build/hair/pattern/_match.rs
@@ -245,8 +245,8 @@ use rustc::mir::interpret::{truncate, AllocId, ConstValue, Pointer, Scalar};
 use rustc::mir::Field;
 use rustc::util::common::ErrorReported;
 
+use rustc_attr::{SignedInt, UnsignedInt};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::attr::{SignedInt, UnsignedInt};
 
 use arena::TypedArena;
 
@@ -343,12 +343,11 @@ impl<'tcx> PatternFolder<'tcx> for LiteralExpander<'tcx> {
                         ty: rty,
                         span: pat.span,
                         kind: box PatKind::Constant {
-                            value: self.tcx.mk_const(Const {
-                                val: ty::ConstKind::Value(
-                                    self.fold_const_value_deref(*val, rty, crty),
-                                ),
-                                ty: rty,
-                            }),
+                            value: Const::from_value(
+                                self.tcx,
+                                self.fold_const_value_deref(*val, rty, crty),
+                                rty,
+                            ),
                         },
                     },
                 },
@@ -412,7 +411,7 @@ impl<'p, 'tcx> PatStack<'p, 'tcx> {
     }
 
     fn iter(&self) -> impl Iterator<Item = &Pat<'tcx>> {
-        self.0.iter().map(|p| *p)
+        self.0.iter().copied()
     }
 
     // If the first pattern is an or-pattern, expand this pattern. Otherwise, return `None`.
@@ -838,7 +837,7 @@ impl<'tcx> Constructor<'tcx> {
                             // eliminate it straight away.
                             remaining_ranges = vec![];
                         } else {
-                            // Otherwise explicitely compute the remaining ranges.
+                            // Otherwise explicitly compute the remaining ranges.
                             remaining_ranges = other_range.subtract_from(remaining_ranges);
                         }
 
@@ -1001,7 +1000,7 @@ impl<'tcx> Constructor<'tcx> {
                         PatKind::Leaf { subpatterns }
                     }
                 }
-                ty::Ref(..) => PatKind::Deref { subpattern: subpatterns.nth(0).unwrap() },
+                ty::Ref(..) => PatKind::Deref { subpattern: subpatterns.next().unwrap() },
                 ty::Slice(_) | ty::Array(..) => bug!("bad slice pattern {:?} {:?}", self, ty),
                 _ => PatKind::Wild,
             },
@@ -1397,21 +1396,19 @@ impl<'tcx> IntRange<'tcx> {
     ) -> Option<IntRange<'tcx>> {
         if let Some((target_size, bias)) = Self::integral_size_and_signed_bias(tcx, value.ty) {
             let ty = value.ty;
-            let val = if let ty::ConstKind::Value(ConstValue::Scalar(Scalar::Raw { data, size })) =
-                value.val
-            {
-                // For this specific pattern we can skip a lot of effort and go
-                // straight to the result, after doing a bit of checking. (We
-                // could remove this branch and just use the next branch, which
-                // is more general but much slower.)
-                Scalar::<()>::check_raw(data, size, target_size);
-                data
-            } else if let Some(val) = value.try_eval_bits(tcx, param_env, ty) {
-                // This is a more general form of the previous branch.
-                val
-            } else {
-                return None;
-            };
+            let val = (|| {
+                if let ty::ConstKind::Value(ConstValue::Scalar(scalar)) = value.val {
+                    // For this specific pattern we can skip a lot of effort and go
+                    // straight to the result, after doing a bit of checking. (We
+                    // could remove this branch and just fall through, which
+                    // is more general but much slower.)
+                    if let Ok(bits) = scalar.to_bits_or_ptr(target_size, &tcx) {
+                        return Some(bits);
+                    }
+                }
+                // This is a more general form of the previous case.
+                value.try_eval_bits(tcx, param_env, ty)
+            })()?;
             let val = val ^ bias;
             Some(IntRange { range: val..=val, ty, span })
         } else {
@@ -2235,24 +2232,26 @@ fn lint_overlapping_patterns<'tcx>(
     overlaps: Vec<IntRange<'tcx>>,
 ) {
     if let (true, Some(hir_id)) = (!overlaps.is_empty(), hir_id) {
-        let mut err = tcx.struct_span_lint_hir(
+        tcx.struct_span_lint_hir(
             lint::builtin::OVERLAPPING_PATTERNS,
             hir_id,
             ctor_range.span,
-            "multiple patterns covering the same range",
+            |lint| {
+                let mut err = lint.build("multiple patterns covering the same range");
+                err.span_label(ctor_range.span, "overlapping patterns");
+                for int_range in overlaps {
+                    // Use the real type for user display of the ranges:
+                    err.span_label(
+                        int_range.span,
+                        &format!(
+                            "this range overlaps on `{}`",
+                            IntRange { range: int_range.range, ty, span: DUMMY_SP }.to_pat(tcx),
+                        ),
+                    );
+                }
+                err.emit();
+            },
         );
-        err.span_label(ctor_range.span, "overlapping patterns");
-        for int_range in overlaps {
-            // Use the real type for user display of the ranges:
-            err.span_label(
-                int_range.span,
-                &format!(
-                    "this range overlaps on `{}`",
-                    IntRange { range: int_range.range, ty, span: DUMMY_SP }.to_pat(tcx),
-                ),
-            );
-        }
-        err.emit();
     }
 }
 
@@ -2332,7 +2331,7 @@ fn specialize_one_pattern<'p, 'tcx>(
         PatKind::Binding { .. } | PatKind::Wild => Some(ctor_wild_subpatterns.iter().collect()),
 
         PatKind::Variant { adt_def, variant_index, ref subpatterns, .. } => {
-            let ref variant = adt_def.variants[variant_index];
+            let variant = &adt_def.variants[variant_index];
             let is_non_exhaustive = cx.is_foreign_non_exhaustive_variant(pat.ty, variant);
             Some(Variant(variant.def_id))
                 .filter(|variant_constructor| variant_constructor == constructor)
diff --git a/src/librustc_mir_build/hair/pattern/check_match.rs b/src/librustc_mir_build/hair/pattern/check_match.rs
index 82822f0c47..d0eefb2e4d 100644
--- a/src/librustc_mir_build/hair/pattern/check_match.rs
+++ b/src/librustc_mir_build/hair/pattern/check_match.rs
@@ -6,6 +6,7 @@ use super::{PatCtxt, PatKind, PatternError};
 
 use rustc::hir::map::Map;
 use rustc::ty::{self, Ty, TyCtxt};
+use rustc_ast::ast::Mutability;
 use rustc_errors::{error_code, struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def::*;
@@ -16,9 +17,7 @@ use rustc_session::lint::builtin::BINDINGS_WITH_VARIANT_NAME;
 use rustc_session::lint::builtin::{IRREFUTABLE_LET_PATTERNS, UNREACHABLE_PATTERNS};
 use rustc_session::parse::feature_err;
 use rustc_session::Session;
-use rustc_span::symbol::sym;
-use rustc_span::{MultiSpan, Span};
-use syntax::ast::Mutability;
+use rustc_span::{sym, Span};
 
 use std::slice;
 
@@ -114,8 +113,10 @@ impl PatCtxt<'_, '_> {
 
 impl<'tcx> MatchVisitor<'_, 'tcx> {
     fn check_patterns(&mut self, has_guard: bool, pat: &Pat<'_>) {
-        check_legality_of_move_bindings(self, has_guard, pat);
-        check_borrow_conflicts_in_at_patterns(self, pat);
+        if !self.tcx.features().move_ref_pattern {
+            check_legality_of_move_bindings(self, has_guard, pat);
+        }
+        pat.walk_always(|pat| check_borrow_conflicts_in_at_patterns(self, pat));
         if !self.tcx.features().bindings_after_at {
             check_legality_of_bindings_in_at_patterns(self, pat);
         }
@@ -141,7 +142,7 @@ impl<'tcx> MatchVisitor<'_, 'tcx> {
     }
 
     fn check_in_cx(&self, hir_id: HirId, f: impl FnOnce(MatchCheckCtxt<'_, 'tcx>)) {
-        let module = self.tcx.hir().get_module_parent(hir_id);
+        let module = self.tcx.parent_module(hir_id);
         MatchCheckCtxt::create_and_enter(self.tcx, self.param_env, module, |cx| f(cx));
     }
 
@@ -285,26 +286,27 @@ fn check_for_bindings_named_same_as_variants(cx: &MatchVisitor<'_, '_>, pat: &Pa
                             variant.ident == ident && variant.ctor_kind == CtorKind::Const
                         })
                     {
-                        let ty_path = cx.tcx.def_path_str(edef.did);
-                        cx.tcx
-                            .struct_span_lint_hir(
-                                BINDINGS_WITH_VARIANT_NAME,
-                                p.hir_id,
-                                p.span,
-                                &format!(
+                        cx.tcx.struct_span_lint_hir(
+                            BINDINGS_WITH_VARIANT_NAME,
+                            p.hir_id,
+                            p.span,
+                            |lint| {
+                                let ty_path = cx.tcx.def_path_str(edef.did);
+                                lint.build(&format!(
                                     "pattern binding `{}` is named the same as one \
-                                    of the variants of the type `{}`",
+                                                of the variants of the type `{}`",
                                     ident, ty_path
-                                ),
-                            )
-                            .code(error_code!(E0170))
-                            .span_suggestion(
-                                p.span,
-                                "to match on the variant, qualify the path",
-                                format!("{}::{}", ty_path, ident),
-                                Applicability::MachineApplicable,
-                            )
-                            .emit();
+                                ))
+                                .code(error_code!(E0170))
+                                .span_suggestion(
+                                    p.span,
+                                    "to match on the variant, qualify the path",
+                                    format!("{}::{}", ty_path, ident),
+                                    Applicability::MachineApplicable,
+                                )
+                                .emit();
+                            },
+                        )
                     }
                 }
             }
@@ -324,22 +326,26 @@ fn pat_is_catchall(pat: &super::Pat<'_>) -> bool {
 }
 
 fn unreachable_pattern(tcx: TyCtxt<'_>, span: Span, id: HirId, catchall: Option<Span>) {
-    let mut err = tcx.struct_span_lint_hir(UNREACHABLE_PATTERNS, id, span, "unreachable pattern");
-    if let Some(catchall) = catchall {
-        // We had a catchall pattern, hint at that.
-        err.span_label(span, "unreachable pattern");
-        err.span_label(catchall, "matches any value");
-    }
-    err.emit();
+    tcx.struct_span_lint_hir(UNREACHABLE_PATTERNS, id, span, |lint| {
+        let mut err = lint.build("unreachable pattern");
+        if let Some(catchall) = catchall {
+            // We had a catchall pattern, hint at that.
+            err.span_label(span, "unreachable pattern");
+            err.span_label(catchall, "matches any value");
+        }
+        err.emit();
+    });
 }
 
 fn irrefutable_let_pattern(tcx: TyCtxt<'_>, span: Span, id: HirId, source: hir::MatchSource) {
-    let msg = match source {
-        hir::MatchSource::IfLetDesugar { .. } => "irrefutable if-let pattern",
-        hir::MatchSource::WhileLetDesugar => "irrefutable while-let pattern",
-        _ => bug!(),
-    };
-    tcx.lint_hir(IRREFUTABLE_LET_PATTERNS, id, span, msg);
+    tcx.struct_span_lint_hir(IRREFUTABLE_LET_PATTERNS, id, span, |lint| {
+        let msg = match source {
+            hir::MatchSource::IfLetDesugar { .. } => "irrefutable if-let pattern",
+            hir::MatchSource::WhileLetDesugar => "irrefutable while-let pattern",
+            _ => bug!(),
+        };
+        lint.build(msg).emit()
+    });
 }
 
 /// Check for unreachable patterns.
@@ -559,6 +565,11 @@ fn maybe_point_at_variant(ty: Ty<'_>, patterns: &[super::Pat<'_>]) -> Vec<Span>
     covered
 }
 
+/// Check if a by-value binding is by-value. That is, check if the binding's type is not `Copy`.
+fn is_binding_by_move(cx: &MatchVisitor<'_, '_>, hir_id: HirId, span: Span) -> bool {
+    !cx.tables.node_type(hir_id).is_copy_modulo_regions(cx.tcx, cx.param_env, span)
+}
+
 /// Check the legality of legality of by-move bindings.
 fn check_legality_of_move_bindings(cx: &mut MatchVisitor<'_, '_>, has_guard: bool, pat: &Pat<'_>) {
     let sess = cx.tcx.sess;
@@ -589,8 +600,7 @@ fn check_legality_of_move_bindings(cx: &mut MatchVisitor<'_, '_>, has_guard: boo
     pat.walk_always(|p| {
         if let hir::PatKind::Binding(.., sub) = &p.kind {
             if let Some(ty::BindByValue(_)) = tables.extract_binding_mode(sess, p.hir_id, p.span) {
-                let pat_ty = tables.node_type(p.hir_id);
-                if !pat_ty.is_copy_modulo_regions(cx.tcx, cx.param_env, pat.span) {
+                if is_binding_by_move(cx, p.hir_id, p.span) {
                     check_move(p, sub.as_deref());
                 }
             }
@@ -599,11 +609,11 @@ fn check_legality_of_move_bindings(cx: &mut MatchVisitor<'_, '_>, has_guard: boo
 
     // Found some bad by-move spans, error!
     if !by_move_spans.is_empty() {
-        let mut err = struct_span_err!(
-            sess,
-            MultiSpan::from_spans(by_move_spans.clone()),
-            E0009,
-            "cannot bind by-move and by-ref in the same pattern",
+        let mut err = feature_err(
+            &sess.parse_sess,
+            sym::move_ref_pattern,
+            by_move_spans.clone(),
+            "binding by-move and by-ref in the same pattern is unstable",
         );
         for span in by_ref_spans.iter() {
             err.span_label(*span, "by-ref pattern here");
@@ -615,81 +625,118 @@ fn check_legality_of_move_bindings(cx: &mut MatchVisitor<'_, '_>, has_guard: boo
     }
 }
 
-/// Check that there are no borrow conflicts in `binding @ subpat` patterns.
+/// Check that there are no borrow or move conflicts in `binding @ subpat` patterns.
 ///
 /// For example, this would reject:
 /// - `ref x @ Some(ref mut y)`,
-/// - `ref mut x @ Some(ref y)`
-/// - `ref mut x @ Some(ref mut y)`.
+/// - `ref mut x @ Some(ref y)`,
+/// - `ref mut x @ Some(ref mut y)`,
+/// - `ref mut? x @ Some(y)`, and
+/// - `x @ Some(ref mut? y)`.
 ///
 /// This analysis is *not* subsumed by NLL.
 fn check_borrow_conflicts_in_at_patterns(cx: &MatchVisitor<'_, '_>, pat: &Pat<'_>) {
-    let tab = cx.tables;
-    let sess = cx.tcx.sess;
-    // Get the mutability of `p` if it's by-ref.
-    let extract_binding_mut = |hir_id, span| match tab.extract_binding_mode(sess, hir_id, span)? {
-        ty::BindByValue(_) => None,
-        ty::BindByReference(m) => Some(m),
+    // Extract `sub` in `binding @ sub`.
+    let (name, sub) = match &pat.kind {
+        hir::PatKind::Binding(.., name, Some(sub)) => (*name, sub),
+        _ => return,
     };
-    pat.walk_always(|pat| {
-        // Extract `sub` in `binding @ sub`.
-        let (name, sub) = match &pat.kind {
-            hir::PatKind::Binding(.., name, Some(sub)) => (*name, sub),
-            _ => return,
-        };
+    let binding_span = pat.span.with_hi(name.span.hi());
 
-        // Extract the mutability.
-        let mut_outer = match extract_binding_mut(pat.hir_id, pat.span) {
-            None => return,
-            Some(m) => m,
-        };
+    let tables = cx.tables;
+    let sess = cx.tcx.sess;
 
-        // We now have `ref $mut_outer binding @ sub` (semantically).
-        // Recurse into each binding in `sub` and find mutability conflicts.
-        let mut conflicts_mut_mut = Vec::new();
-        let mut conflicts_mut_ref = Vec::new();
-        sub.each_binding(|_, hir_id, span, _| {
-            if let Some(mut_inner) = extract_binding_mut(hir_id, span) {
-                match (mut_outer, mut_inner) {
-                    (Mutability::Not, Mutability::Not) => {}
-                    (Mutability::Mut, Mutability::Mut) => conflicts_mut_mut.push(span),
-                    _ => conflicts_mut_ref.push(span),
+    // Get the binding move, extract the mutability if by-ref.
+    let mut_outer = match tables.extract_binding_mode(sess, pat.hir_id, pat.span) {
+        Some(ty::BindByValue(_)) if is_binding_by_move(cx, pat.hir_id, pat.span) => {
+            // We have `x @ pat` where `x` is by-move. Reject all borrows in `pat`.
+            let mut conflicts_ref = Vec::new();
+            sub.each_binding(|_, hir_id, span, _| {
+                match tables.extract_binding_mode(sess, hir_id, span) {
+                    Some(ty::BindByValue(_)) | None => {}
+                    Some(ty::BindByReference(_)) => conflicts_ref.push(span),
                 }
+            });
+            if !conflicts_ref.is_empty() {
+                let occurs_because = format!(
+                    "move occurs because `{}` has type `{}` which does not implement the `Copy` trait",
+                    name,
+                    tables.node_type(pat.hir_id),
+                );
+                sess.struct_span_err(pat.span, "borrow of moved value")
+                    .span_label(binding_span, format!("value moved into `{}` here", name))
+                    .span_label(binding_span, occurs_because)
+                    .span_labels(conflicts_ref, "value borrowed here after move")
+                    .emit();
             }
-        });
+            return;
+        }
+        Some(ty::BindByValue(_)) | None => return,
+        Some(ty::BindByReference(m)) => m,
+    };
 
-        // Report errors if any.
-        let binding_span = pat.span.with_hi(name.span.hi());
-        if !conflicts_mut_mut.is_empty() {
-            // Report mutability conflicts for e.g. `ref mut x @ Some(ref mut y)`.
-            let msg = &format!("cannot borrow `{}` as mutable more than once at a time", name);
-            let mut err = sess.struct_span_err(pat.span, msg);
-            err.span_label(binding_span, "first mutable borrow occurs here");
-            for sp in conflicts_mut_mut {
-                err.span_label(sp, "another mutable borrow occurs here");
-            }
-            for sp in conflicts_mut_ref {
-                err.span_label(sp, "also borrowed as immutable here");
-            }
-            err.emit();
-        } else if !conflicts_mut_ref.is_empty() {
-            // Report mutability conflicts for e.g. `ref x @ Some(ref mut y)` or the converse.
-            let (primary, also) = match mut_outer {
-                Mutability::Mut => ("mutable", "immutable"),
-                Mutability::Not => ("immutable", "mutable"),
-            };
-            let msg = &format!(
-                "cannot borrow `{}` as {} because it is also borrowed as {}",
-                name, also, primary,
-            );
-            let mut err = sess.struct_span_err(pat.span, msg);
-            err.span_label(binding_span, &format!("{} borrow occurs here", primary));
-            for sp in conflicts_mut_ref {
-                err.span_label(sp, &format!("{} borrow occurs here", also));
+    // We now have `ref $mut_outer binding @ sub` (semantically).
+    // Recurse into each binding in `sub` and find mutability or move conflicts.
+    let mut conflicts_move = Vec::new();
+    let mut conflicts_mut_mut = Vec::new();
+    let mut conflicts_mut_ref = Vec::new();
+    sub.each_binding(|_, hir_id, span, name| {
+        match tables.extract_binding_mode(sess, hir_id, span) {
+            Some(ty::BindByReference(mut_inner)) => match (mut_outer, mut_inner) {
+                (Mutability::Not, Mutability::Not) => {} // Both sides are `ref`.
+                (Mutability::Mut, Mutability::Mut) => conflicts_mut_mut.push((span, name)), // 2x `ref mut`.
+                _ => conflicts_mut_ref.push((span, name)), // `ref` + `ref mut` in either direction.
+            },
+            Some(ty::BindByValue(_)) if is_binding_by_move(cx, hir_id, span) => {
+                conflicts_move.push((span, name)) // `ref mut?` + by-move conflict.
             }
-            err.emit();
+            Some(ty::BindByValue(_)) | None => {} // `ref mut?` + by-copy is fine.
         }
     });
+
+    // Report errors if any.
+    if !conflicts_mut_mut.is_empty() {
+        // Report mutability conflicts for e.g. `ref mut x @ Some(ref mut y)`.
+        let mut err = sess
+            .struct_span_err(pat.span, "cannot borrow value as mutable more than once at a time");
+        err.span_label(binding_span, format!("first mutable borrow, by `{}`, occurs here", name));
+        for (span, name) in conflicts_mut_mut {
+            err.span_label(span, format!("another mutable borrow, by `{}`, occurs here", name));
+        }
+        for (span, name) in conflicts_mut_ref {
+            err.span_label(span, format!("also borrowed as immutable, by `{}`, here", name));
+        }
+        for (span, name) in conflicts_move {
+            err.span_label(span, format!("also moved into `{}` here", name));
+        }
+        err.emit();
+    } else if !conflicts_mut_ref.is_empty() {
+        // Report mutability conflicts for e.g. `ref x @ Some(ref mut y)` or the converse.
+        let (primary, also) = match mut_outer {
+            Mutability::Mut => ("mutable", "immutable"),
+            Mutability::Not => ("immutable", "mutable"),
+        };
+        let msg =
+            format!("cannot borrow value as {} because it is also borrowed as {}", also, primary);
+        let mut err = sess.struct_span_err(pat.span, &msg);
+        err.span_label(binding_span, format!("{} borrow, by `{}`, occurs here", primary, name));
+        for (span, name) in conflicts_mut_ref {
+            err.span_label(span, format!("{} borrow, by `{}`, occurs here", also, name));
+        }
+        for (span, name) in conflicts_move {
+            err.span_label(span, format!("also moved into `{}` here", name));
+        }
+        err.emit();
+    } else if !conflicts_move.is_empty() {
+        // Report by-ref and by-move conflicts, e.g. `ref x @ y`.
+        let mut err =
+            sess.struct_span_err(pat.span, "cannot move out of value because it is borrowed");
+        err.span_label(binding_span, format!("value borrowed, by `{}`, here", name));
+        for (span, name) in conflicts_move {
+            err.span_label(span, format!("value moved into `{}` here", name));
+        }
+        err.emit();
+    }
 }
 
 /// Forbids bindings in `@` patterns. This used to be is necessary for memory safety,
diff --git a/src/librustc_mir_build/hair/pattern/const_to_pat.rs b/src/librustc_mir_build/hair/pattern/const_to_pat.rs
index a21a0ee8a1..27d1bce76e 100644
--- a/src/librustc_mir_build/hair/pattern/const_to_pat.rs
+++ b/src/librustc_mir_build/hair/pattern/const_to_pat.rs
@@ -1,10 +1,10 @@
-use rustc::infer::InferCtxt;
 use rustc::lint;
 use rustc::mir::Field;
-use rustc::traits::predicate_for_trait_def;
-use rustc::traits::{self, ObligationCause, PredicateObligation};
 use rustc::ty::{self, Ty, TyCtxt};
 use rustc_hir as hir;
+use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
+use rustc_infer::traits::predicate_for_trait_def;
+use rustc_infer::traits::{self, ObligationCause, PredicateObligation};
 
 use rustc_index::vec::Idx;
 
@@ -109,11 +109,14 @@ impl<'a, 'tcx> ConstToPat<'a, 'tcx> {
                     }
                 };
                 let path = self.tcx().def_path_str(adt_def.did);
-                let msg = format!(
-                    "to use a constant of type `{}` in a pattern, \
-                     `{}` must be annotated with `#[derive(PartialEq, Eq)]`",
-                    path, path,
-                );
+
+                let make_msg = || -> String {
+                    format!(
+                        "to use a constant of type `{}` in a pattern, \
+                         `{}` must be annotated with `#[derive(PartialEq, Eq)]`",
+                        path, path,
+                    )
+                };
 
                 // double-check there even *is* a semantic `PartialEq` to dispatch to.
                 //
@@ -143,13 +146,13 @@ impl<'a, 'tcx> ConstToPat<'a, 'tcx> {
 
                 if !ty_is_partial_eq {
                     // span_fatal avoids ICE from resolution of non-existent method (rare case).
-                    self.tcx().sess.span_fatal(self.span, &msg);
+                    self.tcx().sess.span_fatal(self.span, &make_msg());
                 } else {
-                    self.tcx().lint_hir(
+                    self.tcx().struct_span_lint_hir(
                         lint::builtin::INDIRECT_STRUCTURAL_MATCH,
                         self.id,
                         self.span,
-                        &msg,
+                        |lint| lint.build(&make_msg()).emit(),
                     );
                 }
             }
@@ -177,11 +180,11 @@ impl<'a, 'tcx> ConstToPat<'a, 'tcx> {
 
         let kind = match cv.ty.kind {
             ty::Float(_) => {
-                tcx.lint_hir(
+                tcx.struct_span_lint_hir(
                     ::rustc::lint::builtin::ILLEGAL_FLOATING_POINT_LITERAL_PATTERN,
                     id,
                     span,
-                    "floating-point types cannot be used in patterns",
+                    |lint| lint.build("floating-point types cannot be used in patterns").emit(),
                 );
                 PatKind::Constant { value: cv }
             }
diff --git a/src/librustc_mir_build/hair/pattern/mod.rs b/src/librustc_mir_build/hair/pattern/mod.rs
index b44c7a8c66..f58216fbb4 100644
--- a/src/librustc_mir_build/hair/pattern/mod.rs
+++ b/src/librustc_mir_build/hair/pattern/mod.rs
@@ -16,6 +16,7 @@ use rustc::ty::layout::VariantIdx;
 use rustc::ty::subst::{GenericArg, SubstsRef};
 use rustc::ty::{self, AdtDef, DefIdTree, Region, Ty, TyCtxt, UserType};
 use rustc::ty::{CanonicalUserType, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations};
+use rustc_ast::ast;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, CtorOf, DefKind, Res};
@@ -23,7 +24,6 @@ use rustc_hir::pat_util::EnumerateAndAdjustIterator;
 use rustc_hir::RangeEnd;
 use rustc_index::vec::Idx;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast;
 
 use std::cmp::Ordering;
 use std::fmt;
@@ -769,7 +769,10 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> {
                     Some(span),
                 ) {
                     Ok(value) => {
-                        let pattern = self.const_to_pat(value, id, span);
+                        let const_ =
+                            ty::Const::from_value(self.tcx, value, self.tables.node_type(id));
+
+                        let pattern = self.const_to_pat(&const_, id, span);
                         if !is_associated_const {
                             return pattern;
                         }
@@ -789,7 +792,7 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> {
                                         user_ty_span: span,
                                     },
                                 }),
-                                ty: value.ty,
+                                ty: const_.ty,
                             }
                         } else {
                             pattern
@@ -1037,7 +1040,7 @@ crate fn compare_const_vals<'tcx>(
             }
             ty::Int(ity) => {
                 use rustc::ty::layout::{Integer, IntegerExt};
-                use syntax::attr::SignedInt;
+                use rustc_attr::SignedInt;
                 let size = Integer::from_attr(&tcx, SignedInt(ity)).size();
                 let a = sign_extend(a, size);
                 let b = sign_extend(b, size);
diff --git a/src/librustc_mir_build/lib.rs b/src/librustc_mir_build/lib.rs
index 42292d635b..3c35827d15 100644
--- a/src/librustc_mir_build/lib.rs
+++ b/src/librustc_mir_build/lib.rs
@@ -5,7 +5,6 @@
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(crate_visibility_modifier)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(bool_to_option)]
 #![recursion_limit = "256"]
 
diff --git a/src/librustc_mir_build/lints.rs b/src/librustc_mir_build/lints.rs
index 4244e1b8d8..0017f800de 100644
--- a/src/librustc_mir_build/lints.rs
+++ b/src/librustc_mir_build/lints.rs
@@ -124,18 +124,15 @@ fn check_fn_for_unconditional_recursion<'tcx>(
     if !reached_exit_without_self_call && !self_call_locations.is_empty() {
         let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
         let sp = tcx.sess.source_map().def_span(tcx.hir().span(hir_id));
-        let mut db = tcx.struct_span_lint_hir(
-            UNCONDITIONAL_RECURSION,
-            hir_id,
-            sp,
-            "function cannot return without recursing",
-        );
-        db.span_label(sp, "cannot return without recursing");
-        // offer some help to the programmer.
-        for location in &self_call_locations {
-            db.span_label(location.span, "recursive call site");
-        }
-        db.help("a `loop` may express intention better if this is on purpose");
-        db.emit();
+        tcx.struct_span_lint_hir(UNCONDITIONAL_RECURSION, hir_id, sp, |lint| {
+            let mut db = lint.build("function cannot return without recursing");
+            db.span_label(sp, "cannot return without recursing");
+            // offer some help to the programmer.
+            for location in &self_call_locations {
+                db.span_label(location.span, "recursive call site");
+            }
+            db.help("a `loop` may express intention better if this is on purpose");
+            db.emit();
+        });
     }
 }
diff --git a/src/librustc_parse/Cargo.toml b/src/librustc_parse/Cargo.toml
index 8071bc6312..b02cabab0a 100644
--- a/src/librustc_parse/Cargo.toml
+++ b/src/librustc_parse/Cargo.toml
@@ -12,6 +12,8 @@ doctest = false
 [dependencies]
 bitflags = "1.0"
 log = "0.4"
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_feature = { path = "../librustc_feature" }
 rustc_lexer = { path = "../librustc_lexer" }
@@ -19,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" }
+rustc_ast = { path = "../librustc_ast" }
 unicode-normalization = "0.1.11"
diff --git a/src/librustc_parse/config.rs b/src/librustc_parse/config.rs
index bf696faf2f..f42091e7c2 100644
--- a/src/librustc_parse/config.rs
+++ b/src/librustc_parse/config.rs
@@ -9,22 +9,22 @@
 //! [#64197]: https://github.com/rust-lang/rust/issues/64197
 
 use crate::{parse_in, validate_attr};
+use rustc_ast::ast::{self, AttrItem, Attribute, MetaItem};
+use rustc_ast::attr::HasAttrs;
+use rustc_ast::mut_visit::*;
+use rustc_ast::ptr::P;
+use rustc_ast::util::map_in_place::MapInPlace;
+use rustc_attr as attr;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{error_code, struct_span_err, Applicability, Handler};
 use rustc_feature::{Feature, Features, State as FeatureState};
 use rustc_feature::{
     ACCEPTED_FEATURES, ACTIVE_FEATURES, REMOVED_FEATURES, STABLE_REMOVED_FEATURES,
 };
+use rustc_session::parse::{feature_err, ParseSess};
 use rustc_span::edition::{Edition, ALL_EDITIONS};
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, AttrItem, Attribute, MetaItem};
-use syntax::attr;
-use syntax::attr::HasAttrs;
-use syntax::mut_visit::*;
-use syntax::ptr::P;
-use syntax::sess::{feature_err, ParseSess};
-use syntax::util::map_in_place::MapInPlace;
 
 use smallvec::SmallVec;
 
@@ -207,30 +207,29 @@ pub fn features(
     edition: Edition,
     allow_features: &Option<Vec<String>>,
 ) -> (ast::Crate, Features) {
-    let features;
-    {
-        let mut strip_unconfigured = StripUnconfigured { sess, features: None };
+    let mut strip_unconfigured = StripUnconfigured { sess, features: None };
 
-        let unconfigured_attrs = krate.attrs.clone();
-        let err_count = sess.span_diagnostic.err_count();
-        if let Some(attrs) = strip_unconfigured.configure(krate.attrs) {
-            krate.attrs = attrs;
-        } else {
-            // the entire crate is unconfigured
+    let unconfigured_attrs = krate.attrs.clone();
+    let diag = &sess.span_diagnostic;
+    let err_count = diag.err_count();
+    let features = match strip_unconfigured.configure(krate.attrs) {
+        None => {
+            // The entire crate is unconfigured.
             krate.attrs = Vec::new();
             krate.module.items = Vec::new();
-            return (krate, Features::default());
+            Features::default()
         }
-
-        features = get_features(&sess.span_diagnostic, &krate.attrs, edition, allow_features);
-
-        // Avoid reconfiguring malformed `cfg_attr`s
-        if err_count == sess.span_diagnostic.err_count() {
-            strip_unconfigured.features = Some(&features);
-            strip_unconfigured.configure(unconfigured_attrs);
+        Some(attrs) => {
+            krate.attrs = attrs;
+            let features = get_features(diag, &krate.attrs, edition, allow_features);
+            if err_count == diag.err_count() {
+                // Avoid reconfiguring malformed `cfg_attr`s.
+                strip_unconfigured.features = Some(&features);
+                strip_unconfigured.configure(unconfigured_attrs);
+            }
+            features
         }
-    }
-
+    };
     (krate, features)
 }
 
@@ -258,7 +257,7 @@ impl<'a> StripUnconfigured<'a> {
     /// Parse and expand all `cfg_attr` attributes into a list of attributes
     /// that are within each `cfg_attr` that has a true configuration predicate.
     ///
-    /// Gives compiler warnigns if any `cfg_attr` does not contain any
+    /// Gives compiler warnings if any `cfg_attr` does not contain any
     /// attributes and is in the original source code. Gives compiler errors if
     /// the syntax of any `cfg_attr` is incorrect.
     pub fn process_cfg_attrs<T: HasAttrs>(&mut self, node: &mut T) {
@@ -315,10 +314,11 @@ impl<'a> StripUnconfigured<'a> {
                 validate_attr::check_meta_bad_delim(self.sess, dspan, delim, msg);
                 match parse_in(self.sess, tts.clone(), "`cfg_attr` input", |p| p.parse_cfg_attr()) {
                     Ok(r) => return Some(r),
-                    Err(mut e) => e
-                        .help(&format!("the valid syntax is `{}`", CFG_ATTR_GRAMMAR_HELP))
-                        .note(CFG_ATTR_NOTE_REF)
-                        .emit(),
+                    Err(mut e) => {
+                        e.help(&format!("the valid syntax is `{}`", CFG_ATTR_GRAMMAR_HELP))
+                            .note(CFG_ATTR_NOTE_REF)
+                            .emit();
+                    }
                 }
             }
             _ => self.error_malformed_cfg_attr_missing(attr.span),
@@ -346,7 +346,13 @@ impl<'a> StripUnconfigured<'a> {
             if !is_cfg(attr) {
                 return true;
             }
-
+            let meta_item = match validate_attr::parse_meta(self.sess, attr) {
+                Ok(meta_item) => meta_item,
+                Err(mut err) => {
+                    err.emit();
+                    return true;
+                }
+            };
             let error = |span, msg, suggestion: &str| {
                 let mut err = self.sess.span_diagnostic.struct_span_err(span, msg);
                 if !suggestion.is_empty() {
@@ -360,41 +366,15 @@ impl<'a> StripUnconfigured<'a> {
                 err.emit();
                 true
             };
-
-            let meta_item = match validate_attr::parse_meta(self.sess, attr) {
-                Ok(meta_item) => meta_item,
-                Err(mut err) => {
-                    err.emit();
-                    return true;
-                }
-            };
-            let nested_meta_items = if let Some(nested_meta_items) = meta_item.meta_item_list() {
-                nested_meta_items
-            } else {
-                return error(
-                    meta_item.span,
-                    "`cfg` is not followed by parentheses",
-                    "cfg(/* predicate */)",
-                );
-            };
-
-            if nested_meta_items.is_empty() {
-                return error(meta_item.span, "`cfg` predicate is not specified", "");
-            } else if nested_meta_items.len() > 1 {
-                return error(
-                    nested_meta_items.last().unwrap().span(),
-                    "multiple `cfg` predicates are specified",
-                    "",
-                );
-            }
-
-            match nested_meta_items[0].meta_item() {
-                Some(meta_item) => attr::cfg_matches(meta_item, self.sess, self.features),
-                None => error(
-                    nested_meta_items[0].span(),
-                    "`cfg` predicate key cannot be a literal",
-                    "",
-                ),
+            let span = meta_item.span;
+            match meta_item.meta_item_list() {
+                None => error(span, "`cfg` is not followed by parentheses", "cfg(/* predicate */)"),
+                Some([]) => error(span, "`cfg` predicate is not specified", ""),
+                Some([_, .., l]) => error(l.span(), "multiple `cfg` predicates are specified", ""),
+                Some([single]) => match single.meta_item() {
+                    Some(meta_item) => attr::cfg_matches(meta_item, self.sess, self.features),
+                    None => error(single.span(), "`cfg` predicate key cannot be a literal", ""),
+                },
             }
         })
     }
@@ -531,11 +511,11 @@ impl<'a> MutVisitor for StripUnconfigured<'a> {
         noop_flat_map_item(configure!(self, item), self)
     }
 
-    fn flat_map_impl_item(&mut self, item: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_impl_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         noop_flat_map_assoc_item(configure!(self, item), self)
     }
 
-    fn flat_map_trait_item(&mut self, item: ast::AssocItem) -> SmallVec<[ast::AssocItem; 1]> {
+    fn flat_map_trait_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
         noop_flat_map_assoc_item(configure!(self, item), self)
     }
 
@@ -561,14 +541,9 @@ fn is_cfg(attr: &Attribute) -> bool {
 
 /// Process the potential `cfg` attributes on a module.
 /// Also determine if the module should be included in this configuration.
-pub fn process_configure_mod(
-    sess: &ParseSess,
-    cfg_mods: bool,
-    attrs: &[Attribute],
-) -> (bool, Vec<Attribute>) {
+pub fn process_configure_mod(sess: &ParseSess, cfg_mods: bool, attrs: &mut Vec<Attribute>) -> bool {
     // Don't perform gated feature checking.
     let mut strip_unconfigured = StripUnconfigured { sess, features: None };
-    let mut attrs = attrs.to_owned();
-    strip_unconfigured.process_cfg_attrs(&mut attrs);
-    (!cfg_mods || strip_unconfigured.in_cfg(&attrs), attrs)
+    strip_unconfigured.process_cfg_attrs(attrs);
+    !cfg_mods || strip_unconfigured.in_cfg(&attrs)
 }
diff --git a/src/librustc_parse/lexer/mod.rs b/src/librustc_parse/lexer/mod.rs
index 02e4808679..f7fb704fcb 100644
--- a/src/librustc_parse/lexer/mod.rs
+++ b/src/librustc_parse/lexer/mod.rs
@@ -1,12 +1,12 @@
+use rustc_ast::token::{self, Token, TokenKind};
+use rustc_ast::util::comments;
 use rustc_data_structures::sync::Lrc;
-use rustc_errors::{DiagnosticBuilder, FatalError};
+use rustc_errors::{error_code, DiagnosticBuilder, FatalError};
 use rustc_lexer::unescape;
 use rustc_lexer::Base;
+use rustc_session::parse::ParseSess;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{BytePos, Pos, Span};
-use syntax::sess::ParseSess;
-use syntax::token::{self, Token, TokenKind};
-use syntax::util::comments;
 
 use log::debug;
 use std::char;
@@ -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 {
@@ -248,8 +248,9 @@ impl<'a> StringReader<'a> {
                                    a future release!",
                             )
                             .note(
-                                "for more information, see issue #42326 \
-                                   <https://github.com/rust-lang/rust/issues/42326>",
+                                "see issue #42326 \
+                                 <https://github.com/rust-lang/rust/issues/42326> \
+                                 for more information",
                             )
                             .emit();
                         None
@@ -326,8 +327,7 @@ impl<'a> StringReader<'a> {
         match kind {
             rustc_lexer::LiteralKind::Char { terminated } => {
                 if !terminated {
-                    self.fatal_span_(start, suffix_start, "unterminated character literal".into())
-                        .raise()
+                    self.fatal_span_(start, suffix_start, "unterminated character literal").raise()
                 }
                 let content_start = start + BytePos(1);
                 let content_end = suffix_start - BytePos(1);
@@ -337,12 +337,8 @@ impl<'a> StringReader<'a> {
             }
             rustc_lexer::LiteralKind::Byte { terminated } => {
                 if !terminated {
-                    self.fatal_span_(
-                        start + BytePos(1),
-                        suffix_start,
-                        "unterminated byte constant".into(),
-                    )
-                    .raise()
+                    self.fatal_span_(start + BytePos(1), suffix_start, "unterminated byte constant")
+                        .raise()
                 }
                 let content_start = start + BytePos(2);
                 let content_end = suffix_start - BytePos(1);
@@ -352,7 +348,7 @@ impl<'a> StringReader<'a> {
             }
             rustc_lexer::LiteralKind::Str { terminated } => {
                 if !terminated {
-                    self.fatal_span_(start, suffix_start, "unterminated double quote string".into())
+                    self.fatal_span_(start, suffix_start, "unterminated double quote string")
                         .raise()
                 }
                 let content_start = start + BytePos(1);
@@ -366,7 +362,7 @@ impl<'a> StringReader<'a> {
                     self.fatal_span_(
                         start + BytePos(1),
                         suffix_start,
-                        "unterminated double quote byte string".into(),
+                        "unterminated double quote byte string",
                     )
                     .raise()
                 }
@@ -499,7 +495,11 @@ impl<'a> StringReader<'a> {
     }
 
     fn report_unterminated_raw_string(&self, start: BytePos, n_hashes: usize) -> ! {
-        let mut err = self.struct_span_fatal(start, start, "unterminated raw string");
+        let mut err = self.sess.span_diagnostic.struct_span_fatal_with_code(
+            self.mk_sp(start, start),
+            "unterminated raw string",
+            error_code!(E0748),
+        );
         err.span_label(self.mk_sp(start, start), "unterminated raw string");
 
         if n_hashes > 0 {
diff --git a/src/librustc_parse/lexer/tokentrees.rs b/src/librustc_parse/lexer/tokentrees.rs
index a28bff3bab..b65b894172 100644
--- a/src/librustc_parse/lexer/tokentrees.rs
+++ b/src/librustc_parse/lexer/tokentrees.rs
@@ -1,15 +1,15 @@
 use super::{StringReader, UnmatchedBrace};
 
-use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::PResult;
-use rustc_span::Span;
-use syntax::print::pprust::token_to_string;
-use syntax::token::{self, Token};
-use syntax::tokenstream::{
+use rustc_ast::token::{self, Token};
+use rustc_ast::tokenstream::{
     DelimSpan,
     IsJoint::{self, *},
     TokenStream, TokenTree, TreeAndJoint,
 };
+use rustc_ast_pretty::pprust::token_to_string;
+use rustc_data_structures::fx::FxHashMap;
+use rustc_errors::PResult;
+use rustc_span::Span;
 
 impl<'a> StringReader<'a> {
     crate fn into_token_trees(self) -> (PResult<'a, TokenStream>, Vec<UnmatchedBrace>) {
@@ -40,6 +40,7 @@ struct TokenTreesReader<'a> {
     /// Used only for error recovery when arriving to EOF with mismatched braces.
     matching_delim_spans: Vec<(token::DelimToken, Span, Span)>,
     last_unclosed_found_span: Option<Span>,
+    /// Collect empty block spans that might have been auto-inserted by editors.
     last_delim_empty_block_spans: FxHashMap<token::DelimToken, Span>,
 }
 
@@ -93,10 +94,8 @@ impl<'a> TokenTreesReader<'a> {
                 }
 
                 if let Some((delim, _)) = self.open_braces.last() {
-                    if let Some((_, open_sp, close_sp)) = self
-                        .matching_delim_spans
-                        .iter()
-                        .filter(|(d, open_sp, close_sp)| {
+                    if let Some((_, open_sp, close_sp)) =
+                        self.matching_delim_spans.iter().find(|(d, open_sp, close_sp)| {
                             if let Some(close_padding) = sm.span_to_margin(*close_sp) {
                                 if let Some(open_padding) = sm.span_to_margin(*open_sp) {
                                     return delim == d && close_padding != open_padding;
@@ -104,7 +103,6 @@ impl<'a> TokenTreesReader<'a> {
                             }
                             false
                         })
-                        .next()
                     // these are in reverse order as they get inserted on close, but
                     {
                         // we want the last open/first close
@@ -141,10 +139,14 @@ impl<'a> TokenTreesReader<'a> {
 
                         if tts.is_empty() {
                             let empty_block_span = open_brace_span.to(close_brace_span);
-                            self.last_delim_empty_block_spans.insert(delim, empty_block_span);
+                            if !sm.is_multiline(empty_block_span) {
+                                // Only track if the block is in the form of `{}`, otherwise it is
+                                // likely that it was written on purpose.
+                                self.last_delim_empty_block_spans.insert(delim, empty_block_span);
+                            }
                         }
 
-                        if self.open_braces.len() == 0 {
+                        if self.open_braces.is_empty() {
                             // Clear up these spans to avoid suggesting them as we've found
                             // properly matched delimiters so far for an entire block.
                             self.matching_delim_spans.clear();
@@ -212,7 +214,7 @@ impl<'a> TokenTreesReader<'a> {
                     _ => {}
                 }
 
-                Ok(TokenTree::Delimited(delim_span, delim, tts.into()).into())
+                Ok(TokenTree::Delimited(delim_span, delim, tts).into())
             }
             token::CloseDelim(delim) => {
                 // An unexpected closing delimiter (i.e., there is no
diff --git a/src/librustc_parse/lexer/unescape_error_reporting.rs b/src/librustc_parse/lexer/unescape_error_reporting.rs
index 88762dabd8..d41775a143 100644
--- a/src/librustc_parse/lexer/unescape_error_reporting.rs
+++ b/src/librustc_parse/lexer/unescape_error_reporting.rs
@@ -69,7 +69,7 @@ pub(crate) fn emit_unescape_error(
                     format!("\"{}\"", lit),
                     Applicability::MachineApplicable,
                 )
-                .emit()
+                .emit();
         }
         EscapeError::EscapeOnlyChar => {
             let (c, _span) = last_char();
diff --git a/src/librustc_parse/lib.rs b/src/librustc_parse/lib.rs
index 08f4f21015..10d524776a 100644
--- a/src/librustc_parse/lib.rs
+++ b/src/librustc_parse/lib.rs
@@ -2,20 +2,17 @@
 
 #![feature(bool_to_option)]
 #![feature(crate_visibility_modifier)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
-
-use syntax::ast;
-use syntax::print::pprust;
-use syntax::sess::ParseSess;
-use syntax::token::{self, Nonterminal};
-use syntax::tokenstream::{self, TokenStream, TokenTree};
 
+use rustc_ast::ast;
+use rustc_ast::token::{self, Nonterminal};
+use rustc_ast::tokenstream::{self, TokenStream, TokenTree};
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{Diagnostic, FatalError, Level, PResult};
+use rustc_session::parse::ParseSess;
 use rustc_span::{FileName, SourceFile, Span};
 
-use std::borrow::Cow;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::str;
 
 use log::info;
@@ -31,8 +28,8 @@ pub mod validate_attr;
 pub mod config;
 
 #[derive(Clone)]
-pub struct Directory<'a> {
-    pub path: Cow<'a, Path>,
+pub struct Directory {
+    pub path: PathBuf,
     pub ownership: DirectoryOwnership,
 }
 
@@ -173,7 +170,7 @@ fn maybe_source_file_to_parser(
     let (stream, unclosed_delims) = maybe_file_to_stream(sess, source_file, None)?;
     let mut parser = stream_to_parser(sess, stream, None);
     parser.unclosed_delims = unclosed_delims;
-    if parser.token == token::Eof && parser.token.span.is_dummy() {
+    if parser.token == token::Eof {
         parser.token.span = Span::new(end_pos, end_pos, parser.token.span.ctxt());
     }
 
@@ -271,12 +268,12 @@ 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,
     stream: TokenStream,
-    base_dir: Directory<'a>,
+    base_dir: Directory,
 ) -> Parser<'a> {
     Parser::new(sess, stream, Some(base_dir), true, false, None)
 }
@@ -316,9 +313,6 @@ pub fn nt_to_tokenstream(nt: &Nonterminal, sess: &ParseSess, span: Span) -> Toke
         Nonterminal::NtItem(ref item) => {
             prepend_attrs(sess, &item.attrs, item.tokens.as_ref(), span)
         }
-        Nonterminal::NtTraitItem(ref item) | Nonterminal::NtImplItem(ref item) => {
-            prepend_attrs(sess, &item.attrs, item.tokens.as_ref(), span)
-        }
         Nonterminal::NtIdent(ident, is_raw) => {
             Some(tokenstream::TokenTree::token(token::Ident(ident.name, is_raw), ident.span).into())
         }
@@ -376,7 +370,7 @@ fn prepend_attrs(
     span: rustc_span::Span,
 ) -> Option<tokenstream::TokenStream> {
     let tokens = tokens?;
-    if attrs.len() == 0 {
+    if attrs.is_empty() {
         return Some(tokens.clone());
     }
     let mut builder = tokenstream::TokenStreamBuilder::new();
@@ -425,7 +419,7 @@ fn prepend_attrs(
         builder.push(tokenstream::TokenTree::Delimited(
             delim_span,
             token::DelimToken::Bracket,
-            brackets.build().into(),
+            brackets.build(),
         ));
     }
     builder.push(tokens.clone());
diff --git a/src/librustc_parse/parser/attr.rs b/src/librustc_parse/parser/attr.rs
index 3d40b91a7b..bdd78e671a 100644
--- a/src/librustc_parse/parser/attr.rs
+++ b/src/librustc_parse/parser/attr.rs
@@ -1,11 +1,11 @@
 use super::{Parser, PathStyle, TokenType};
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast::token::{self, Nonterminal};
+use rustc_ast::util::comments;
+use rustc_ast_pretty::pprust;
 use rustc_errors::PResult;
 use rustc_span::{Span, Symbol};
-use syntax::ast;
-use syntax::attr;
-use syntax::print::pprust;
-use syntax::token::{self, Nonterminal};
-use syntax::util::comments;
 
 use log::debug;
 
@@ -37,7 +37,7 @@ impl<'a> Parser<'a> {
                     let inner_parse_policy = InnerAttributeParsePolicy::NotPermitted {
                         reason: inner_error_reason,
                         saw_doc_comment: just_parsed_doc_comment,
-                        prev_attr_sp: attrs.last().and_then(|a| Some(a.span)),
+                        prev_attr_sp: attrs.last().map(|a| a.span),
                     };
                     let attr = self.parse_attribute_with_inner_parse_policy(inner_parse_policy)?;
                     attrs.push(attr);
@@ -116,7 +116,7 @@ impl<'a> Parser<'a> {
                 self.expect(&token::OpenDelim(token::Bracket))?;
                 let item = self.parse_attr_item()?;
                 self.expect(&token::CloseDelim(token::Bracket))?;
-                let hi = self.prev_span;
+                let hi = self.prev_token.span;
 
                 let attr_sp = lo.to(hi);
 
@@ -138,7 +138,7 @@ impl<'a> Parser<'a> {
 
                         if let Some(prev_attr_sp) = prev_attr_sp {
                             diagnostic
-                                .span_label(attr_sp, "not permitted following an outer attibute")
+                                .span_label(attr_sp, "not permitted following an outer attribute")
                                 .span_label(prev_attr_sp, prev_attr_note);
                         }
 
@@ -149,7 +149,7 @@ impl<'a> Parser<'a> {
                                    source files. Outer attributes, like `#[test]`, annotate the \
                                    item following them.",
                             )
-                            .emit()
+                            .emit();
                     }
                 }
 
@@ -177,7 +177,7 @@ impl<'a> Parser<'a> {
     pub fn parse_attr_item(&mut self) -> PResult<'a, ast::AttrItem> {
         let item = match self.token.kind {
             token::Interpolated(ref nt) => match **nt {
-                Nonterminal::NtMeta(ref item) => Some(item.clone()),
+                Nonterminal::NtMeta(ref item) => Some(item.clone().into_inner()),
                 _ => None,
             },
             _ => None,
@@ -239,7 +239,7 @@ impl<'a> Parser<'a> {
                                     (`1u8`, `1.0f32`, etc.), use an unsuffixed version \
                                     (`1`, `1.0`, etc.)",
                 )
-                .emit()
+                .emit();
         }
 
         Ok(lit)
@@ -255,7 +255,7 @@ impl<'a> Parser<'a> {
         while self.token.kind != token::Eof {
             let lo = self.token.span;
             let item = self.parse_attr_item()?;
-            expanded_attrs.push((item, lo.to(self.prev_span)));
+            expanded_attrs.push((item, lo.to(self.prev_token.span)));
             if !self.eat(&token::Comma) {
                 break;
             }
@@ -303,7 +303,7 @@ impl<'a> Parser<'a> {
         let lo = self.token.span;
         let path = self.parse_path(PathStyle::Mod)?;
         let kind = self.parse_meta_item_kind()?;
-        let span = lo.to(self.prev_span);
+        let span = lo.to(self.prev_token.span);
         Ok(ast::MetaItem { path, kind, span })
     }
 
diff --git a/src/librustc_parse/parser/diagnostics.rs b/src/librustc_parse/parser/diagnostics.rs
index 80bc5c158a..7c1df531ad 100644
--- a/src/librustc_parse/parser/diagnostics.rs
+++ b/src/librustc_parse/parser/diagnostics.rs
@@ -1,24 +1,25 @@
+use super::ty::AllowPlus;
 use super::{BlockMode, Parser, PathStyle, SemiColonMode, SeqSep, TokenExpectType, TokenType};
 
+use rustc_ast::ast::{
+    self, BinOpKind, BindingMode, BlockCheckMode, Expr, ExprKind, Ident, Item, Param,
+};
+use rustc_ast::ast::{AttrVec, ItemKind, Mutability, Pat, PatKind, PathSegment, QSelf, Ty, TyKind};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, TokenKind};
+use rustc_ast::util::parser::AssocOp;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::{pluralize, struct_span_err};
 use rustc_errors::{Applicability, DiagnosticBuilder, Handler, PResult};
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::kw;
 use rustc_span::{MultiSpan, Span, SpanSnippetError, DUMMY_SP};
-use syntax::ast::{
-    self, BinOpKind, BindingMode, BlockCheckMode, Expr, ExprKind, Ident, Item, Param,
-};
-use syntax::ast::{AttrVec, ItemKind, Mutability, Pat, PatKind, PathSegment, QSelf, Ty, TyKind};
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::token::{self, token_can_begin_expr, TokenKind};
-use syntax::util::parser::AssocOp;
 
 use log::{debug, trace};
 use std::mem;
 
-const TURBOFISH: &'static str = "use `::<...>` instead of `<...>` to specify type arguments";
+const TURBOFISH: &str = "use `::<...>` instead of `<...>` to specify type arguments";
 
 /// Creates a placeholder argument.
 pub(super) fn dummy_arg(ident: Ident) -> Param {
@@ -191,17 +192,19 @@ impl<'a> Parser<'a> {
             TokenKind::CloseDelim(token::DelimToken::Brace),
             TokenKind::CloseDelim(token::DelimToken::Paren),
         ];
-        if let token::Ident(name, false) = self.token.kind {
-            if Ident::new(name, self.token.span).is_raw_guess()
-                && self.look_ahead(1, |t| valid_follow.contains(&t.kind))
+        match self.token.ident() {
+            Some((ident, false))
+                if ident.is_raw_guess()
+                    && self.look_ahead(1, |t| valid_follow.contains(&t.kind)) =>
             {
                 err.span_suggestion(
-                    self.token.span,
+                    ident.span,
                     "you can escape reserved keywords to use them as identifiers",
-                    format!("r#{}", name),
+                    format!("r#{}", ident.name),
                     Applicability::MaybeIncorrect,
                 );
             }
+            _ => {}
         }
         if let Some(token_descr) = super::token_descr_opt(&self.token) {
             err.span_label(self.token.span, format!("expected identifier, found {}", token_descr));
@@ -259,24 +262,24 @@ impl<'a> Parser<'a> {
             };
             (
                 format!("expected one of {}, found {}", expect, actual),
-                (self.prev_span.shrink_to_hi(), format!("expected one of {}", short_expect)),
+                (self.prev_token.span.shrink_to_hi(), format!("expected one of {}", short_expect)),
             )
         } else if expected.is_empty() {
             (
                 format!("unexpected token: {}", actual),
-                (self.prev_span, "unexpected token after this".to_string()),
+                (self.prev_token.span, "unexpected token after this".to_string()),
             )
         } else {
             (
                 format!("expected {}, found {}", expect, actual),
-                (self.prev_span.shrink_to_hi(), format!("expected {}", expect)),
+                (self.prev_token.span.shrink_to_hi(), format!("expected {}", expect)),
             )
         };
         self.last_unexpected_token_span = Some(self.token.span);
         let mut err = self.struct_span_err(self.token.span, &msg_exp);
         let sp = if self.token == token::Eof {
             // This is EOF; don't want to point at the following char, but rather the last token.
-            self.prev_span
+            self.prev_token.span
         } else {
             label_sp
         };
@@ -297,7 +300,7 @@ impl<'a> Parser<'a> {
         }
 
         let sm = self.sess.source_map();
-        if self.prev_span == DUMMY_SP {
+        if self.prev_token.span == DUMMY_SP {
             // Account for macro context where the previous span might not be
             // available to avoid incorrect output (#54841).
             err.span_label(self.token.span, label_exp);
@@ -365,8 +368,8 @@ impl<'a> Parser<'a> {
                           type: `<expr>: <type>`",
                 );
                 err.note(
-                    "for more information, see \
-                          https://github.com/rust-lang/rust/issues/23416",
+                    "see issue #23416 <https://github.com/rust-lang/rust/issues/23416> \
+                     for more information",
                 );
             }
         }
@@ -576,7 +579,7 @@ impl<'a> Parser<'a> {
         match inner_op.kind {
             ExprKind::Binary(op, _, _) if op.node.is_comparison() => {
                 // Respan to include both operators.
-                let op_span = op.span.to(self.prev_span);
+                let op_span = op.span.to(self.prev_token.span);
                 let mut err =
                     self.struct_span_err(op_span, "comparison operators cannot be chained");
 
@@ -631,7 +634,7 @@ impl<'a> Parser<'a> {
                                 // FIXME: actually check that the two expressions in the binop are
                                 // paths and resynthesize new fn call expression instead of using
                                 // `ExprKind::Err` placeholder.
-                                mk_err_expr(self, inner_op.span.to(self.prev_span))
+                                mk_err_expr(self, inner_op.span.to(self.prev_token.span))
                             }
                             Err(mut expr_err) => {
                                 expr_err.cancel();
@@ -653,7 +656,7 @@ impl<'a> Parser<'a> {
                                 // FIXME: actually check that the two expressions in the binop are
                                 // paths and resynthesize new fn call expression instead of using
                                 // `ExprKind::Err` placeholder.
-                                mk_err_expr(self, inner_op.span.to(self.prev_span))
+                                mk_err_expr(self, inner_op.span.to(self.prev_token.span))
                             }
                         }
                     } else {
@@ -693,11 +696,11 @@ impl<'a> Parser<'a> {
 
     pub(super) fn maybe_report_ambiguous_plus(
         &mut self,
-        allow_plus: bool,
+        allow_plus: AllowPlus,
         impl_dyn_multi: bool,
         ty: &Ty,
     ) {
-        if !allow_plus && impl_dyn_multi {
+        if matches!(allow_plus, AllowPlus::No) && impl_dyn_multi {
             let sum_with_parens = format!("({})", pprust::ty_to_string(&ty));
             self.struct_span_err(ty.span, "ambiguous `+` in a type")
                 .span_suggestion(
@@ -712,17 +715,17 @@ impl<'a> Parser<'a> {
 
     pub(super) fn maybe_recover_from_bad_type_plus(
         &mut self,
-        allow_plus: bool,
+        allow_plus: AllowPlus,
         ty: &Ty,
     ) -> PResult<'a, ()> {
         // Do not add `+` to expected tokens.
-        if !allow_plus || !self.token.is_like_plus() {
+        if matches!(allow_plus, AllowPlus::No) || !self.token.is_like_plus() {
             return Ok(());
         }
 
         self.bump(); // `+`
         let bounds = self.parse_generic_bounds(None)?;
-        let sum_span = ty.span.to(self.prev_span);
+        let sum_span = ty.span.to(self.prev_token.span);
 
         let mut err = struct_span_err!(
             self.sess.span_diagnostic,
@@ -789,7 +792,7 @@ impl<'a> Parser<'a> {
 
         let mut path = ast::Path { segments: Vec::new(), span: DUMMY_SP };
         self.parse_path_segments(&mut path.segments, T::PATH_STYLE)?;
-        path.span = ty_span.to(self.prev_span);
+        path.span = ty_span.to(self.prev_token.span);
 
         let ty_str = self.span_to_snippet(ty_span).unwrap_or_else(|_| pprust::ty_to_string(&ty));
         self.struct_span_err(path.span, "missing angle brackets in associated item path")
@@ -808,9 +811,9 @@ impl<'a> Parser<'a> {
 
     pub(super) fn maybe_consume_incorrect_semicolon(&mut self, items: &[P<Item>]) -> bool {
         if self.eat(&token::Semi) {
-            let mut err = self.struct_span_err(self.prev_span, "expected item, found `;`");
+            let mut err = self.struct_span_err(self.prev_token.span, "expected item, found `;`");
             err.span_suggestion_short(
-                self.prev_span,
+                self.prev_token.span,
                 "remove this semicolon",
                 String::new(),
                 Applicability::MachineApplicable,
@@ -853,10 +856,10 @@ impl<'a> Parser<'a> {
             }
             // We don't want to point at the following span after DUMMY_SP.
             // This happens when the parser finds an empty TokenStream.
-            _ if self.prev_span == DUMMY_SP => (self.token.span, self.token.span),
+            _ if self.prev_token.span == DUMMY_SP => (self.token.span, self.token.span),
             // EOF, don't want to point at the following char, but rather the last token.
-            (token::Eof, None) => (self.prev_span, self.token.span),
-            _ => (self.prev_span.shrink_to_hi(), self.token.span),
+            (token::Eof, None) => (self.prev_token.span, self.token.span),
+            _ => (self.prev_token.span.shrink_to_hi(), self.token.span),
         };
         let msg = format!(
             "expected `{}`, found {}",
@@ -893,14 +896,13 @@ impl<'a> Parser<'a> {
         let sm = self.sess.source_map();
         let msg = format!("expected `;`, found `{}`", super::token_descr(&self.token));
         let appl = Applicability::MachineApplicable;
-        if self.token.span == DUMMY_SP || self.prev_span == DUMMY_SP {
-            // Likely inside a macro, can't provide meaninful suggestions.
+        if self.token.span == DUMMY_SP || self.prev_token.span == DUMMY_SP {
+            // Likely inside a macro, can't provide meaningful suggestions.
             return self.expect(&token::Semi).map(drop);
-        } else if !sm.is_multiline(self.prev_span.until(self.token.span)) {
+        } else if !sm.is_multiline(self.prev_token.span.until(self.token.span)) {
             // The current token is in the same line as the prior token, not recoverable.
         } else if self.look_ahead(1, |t| {
-            t == &token::CloseDelim(token::Brace)
-                || token_can_begin_expr(t) && t.kind != token::Colon
+            t == &token::CloseDelim(token::Brace) || t.can_begin_expr() && t.kind != token::Colon
         }) && [token::Comma, token::Colon].contains(&self.token.kind)
         {
             // Likely typo: `,` → `;` or `:` → `;`. This is triggered if the current token is
@@ -910,7 +912,7 @@ impl<'a> Parser<'a> {
             //   let x = 32:
             //   let y = 42;
             self.bump();
-            let sp = self.prev_span;
+            let sp = self.prev_token.span;
             self.struct_span_err(sp, &msg)
                 .span_suggestion(sp, "change this to `;`", ";".to_string(), appl)
                 .emit();
@@ -918,7 +920,7 @@ impl<'a> Parser<'a> {
         } else if self.look_ahead(0, |t| {
             t == &token::CloseDelim(token::Brace)
                 || (
-                    token_can_begin_expr(t) && t != &token::Semi && t != &token::Pound
+                    t.can_begin_expr() && t != &token::Semi && t != &token::Pound
                     // Avoid triggering with too many trailing `#` in raw string.
                 )
         }) {
@@ -927,7 +929,7 @@ impl<'a> Parser<'a> {
             //
             //   let x = 32
             //   let y = 42;
-            let sp = self.prev_span.shrink_to_hi();
+            let sp = self.prev_token.span.shrink_to_hi();
             self.struct_span_err(sp, &msg)
                 .span_label(self.token.span, "unexpected token")
                 .span_suggestion_short(sp, "add `;` here", ";".to_string(), appl)
@@ -937,47 +939,6 @@ impl<'a> Parser<'a> {
         self.expect(&token::Semi).map(drop) // Error unconditionally
     }
 
-    pub(super) fn parse_semi_or_incorrect_foreign_fn_body(
-        &mut self,
-        ident: &Ident,
-        extern_sp: Span,
-    ) -> PResult<'a, ()> {
-        if self.token != token::Semi {
-            // This might be an incorrect fn definition (#62109).
-            let parser_snapshot = self.clone();
-            match self.parse_inner_attrs_and_block() {
-                Ok((_, body)) => {
-                    self.struct_span_err(ident.span, "incorrect `fn` inside `extern` block")
-                        .span_label(ident.span, "can't have a body")
-                        .span_label(body.span, "this body is invalid here")
-                        .span_label(
-                            extern_sp,
-                            "`extern` blocks define existing foreign functions and `fn`s \
-                             inside of them cannot have a body",
-                        )
-                        .help(
-                            "you might have meant to write a function accessible through ffi, \
-                               which can be done by writing `extern fn` outside of the \
-                               `extern` block",
-                        )
-                        .note(
-                            "for more information, visit \
-                               https://doc.rust-lang.org/std/keyword.extern.html",
-                        )
-                        .emit();
-                }
-                Err(mut err) => {
-                    err.cancel();
-                    mem::replace(self, parser_snapshot);
-                    self.expect_semi()?;
-                }
-            }
-        } else {
-            self.bump();
-        }
-        Ok(())
-    }
-
     /// Consumes alternative await syntaxes like `await!(<expr>)`, `await <expr>`,
     /// `await? <expr>`, `await(<expr>)`, and `await { <expr> }`.
     pub(super) fn recover_incorrect_await_syntax(
@@ -1002,7 +963,7 @@ impl<'a> Parser<'a> {
         self.expect(&token::OpenDelim(token::Paren))?;
         let expr = self.parse_expr()?;
         self.expect(&token::CloseDelim(token::Paren))?;
-        Ok((self.prev_span, expr, false))
+        Ok((self.prev_token.span, expr, false))
     }
 
     fn recover_await_prefix(&mut self, await_sp: Span) -> PResult<'a, (Span, P<Expr>, bool)> {
@@ -1054,7 +1015,7 @@ impl<'a> Parser<'a> {
                     String::new(),
                     Applicability::MachineApplicable,
                 )
-                .emit()
+                .emit();
         }
     }
 
@@ -1077,10 +1038,10 @@ impl<'a> Parser<'a> {
                     .span_to_snippet(pat.span.trim_start(begin_par_sp).unwrap())
                     .unwrap_or_else(|_| pprust::pat_to_string(&pat));
 
-                self.struct_span_err(self.prev_span, "unexpected closing `)`")
+                self.struct_span_err(self.prev_token.span, "unexpected closing `)`")
                     .span_label(begin_par_sp, "opening `(`")
                     .span_suggestion(
-                        begin_par_sp.to(self.prev_span),
+                        begin_par_sp.to(self.prev_token.span),
                         "remove parenthesis in `for` loop",
                         format!("{} in {}", pat_str, pprust::expr_to_string(&expr)),
                         // With e.g. `for (x) in y)` this would replace `(x) in y)`
@@ -1132,7 +1093,7 @@ impl<'a> Parser<'a> {
                 err.emit();
                 // Recover from parse error, callers expect the closing delim to be consumed.
                 self.consume_block(delim, ConsumeClosingDelim::Yes);
-                self.mk_expr(lo.to(self.prev_span), ExprKind::Err, AttrVec::new())
+                self.mk_expr(lo.to(self.prev_token.span), ExprKind::Err, AttrVec::new())
             }
         }
     }
@@ -1179,7 +1140,7 @@ impl<'a> Parser<'a> {
                     err.span_label(sp, "unclosed delimiter");
                 }
                 err.span_suggestion_short(
-                    self.prev_span.shrink_to_hi(),
+                    self.prev_token.span.shrink_to_hi(),
                     &format!("{} may belong here", delim.to_string()),
                     delim.to_string(),
                     Applicability::MaybeIncorrect,
@@ -1287,9 +1248,9 @@ impl<'a> Parser<'a> {
     pub(super) fn check_for_for_in_in_typo(&mut self, in_span: Span) {
         if self.eat_keyword(kw::In) {
             // a common typo: `for _ in in bar {}`
-            self.struct_span_err(self.prev_span, "expected iterable, found keyword `in`")
+            self.struct_span_err(self.prev_token.span, "expected iterable, found keyword `in`")
                 .span_suggestion_short(
-                    in_span.until(self.prev_span),
+                    in_span.until(self.prev_token.span),
                     "remove the duplicated `in`",
                     String::new(),
                     Applicability::MachineApplicable,
@@ -1336,8 +1297,7 @@ impl<'a> Parser<'a> {
         err: &mut DiagnosticBuilder<'_>,
         pat: P<ast::Pat>,
         require_name: bool,
-        is_self_allowed: bool,
-        is_trait_item: bool,
+        first_param: bool,
     ) -> Option<Ident> {
         // If we find a pattern followed by an identifier, it could be an (incorrect)
         // C-style parameter declaration.
@@ -1357,13 +1317,12 @@ impl<'a> Parser<'a> {
             return Some(ident);
         } else if let PatKind::Ident(_, ident, _) = pat.kind {
             if require_name
-                && (is_trait_item
-                    || self.token == token::Comma
+                && (self.token == token::Comma
                     || self.token == token::Lt
                     || self.token == token::CloseDelim(token::Paren))
             {
                 // `fn foo(a, b) {}`, `fn foo(a<x>, b<y>) {}` or `fn foo(usize, usize) {}`
-                if is_self_allowed {
+                if first_param {
                     err.span_suggestion(
                         pat.span,
                         "if this is a `self` type, give it a parameter name",
@@ -1420,21 +1379,12 @@ impl<'a> Parser<'a> {
         Ok((pat, ty))
     }
 
-    pub(super) fn recover_bad_self_param(
-        &mut self,
-        mut param: ast::Param,
-        is_trait_item: bool,
-    ) -> PResult<'a, ast::Param> {
+    pub(super) fn recover_bad_self_param(&mut self, mut param: Param) -> PResult<'a, Param> {
         let sp = param.pat.span;
         param.ty.kind = TyKind::Err;
-        let mut err = self.struct_span_err(sp, "unexpected `self` parameter in function");
-        if is_trait_item {
-            err.span_label(sp, "must be the first associated function parameter");
-        } else {
-            err.span_label(sp, "not valid as function parameter");
-            err.note("`self` is only valid as the first parameter of an associated function");
-        }
-        err.emit();
+        self.struct_span_err(sp, "unexpected `self` parameter in function")
+            .span_label(sp, "must be the first parameter of an associated function")
+            .emit();
         Ok(param)
     }
 
diff --git a/src/librustc_parse/parser/expr.rs b/src/librustc_parse/parser/expr.rs
index 098c8355ab..57337855ed 100644
--- a/src/librustc_parse/parser/expr.rs
+++ b/src/librustc_parse/parser/expr.rs
@@ -1,23 +1,22 @@
 use super::pat::{GateOr, PARAM_EXPECTED};
-use super::{BlockMode, Parser, PathStyle, PrevTokenKind, Restrictions, TokenType};
+use super::ty::{AllowPlus, RecoverQPath};
+use super::{BlockMode, Parser, PathStyle, Restrictions, TokenType};
 use super::{SemiColonMode, SeqSep, TokenExpectType};
 use crate::maybe_recover_from_interpolated_ty_qpath;
 
+use rustc_ast::ast::{self, AttrStyle, AttrVec, CaptureBy, Field, Ident, Lit, DUMMY_NODE_ID};
+use rustc_ast::ast::{AnonConst, BinOp, BinOpKind, FnDecl, FnRetTy, Mac, Param, Ty, TyKind, UnOp};
+use rustc_ast::ast::{Arm, Async, BlockCheckMode, Expr, ExprKind, Label, Movability, RangeLimits};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, Token, TokenKind};
+use rustc_ast::util::classify;
+use rustc_ast::util::literal::LitError;
+use rustc_ast::util::parser::{prec_let_scrutinee_needs_par, AssocOp, Fixity};
+use rustc_ast_pretty::pprust;
 use rustc_errors::{Applicability, PResult};
 use rustc_span::source_map::{self, Span, Spanned};
 use rustc_span::symbol::{kw, sym, Symbol};
 use std::mem;
-use syntax::ast::{self, AttrStyle, AttrVec, CaptureBy, Field, Ident, Lit, DUMMY_NODE_ID};
-use syntax::ast::{
-    AnonConst, BinOp, BinOpKind, FnDecl, FunctionRetTy, Mac, Param, Ty, TyKind, UnOp,
-};
-use syntax::ast::{Arm, BlockCheckMode, Expr, ExprKind, IsAsync, Label, Movability, RangeLimits};
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::token::{self, Token, TokenKind};
-use syntax::util::classify;
-use syntax::util::literal::LitError;
-use syntax::util::parser::{prec_let_scrutinee_needs_par, AssocOp, Fixity};
 
 /// Possibly accepts an `token::Interpolated` expression (a pre-parsed expression
 /// dropped into the token stream, which happens while parsing the result of
@@ -51,7 +50,6 @@ macro_rules! maybe_whole_expr {
                         AttrVec::new(),
                     ));
                 }
-                // N.B., `NtIdent(ident)` is normalized to `Ident` in `fn bump`.
                 _ => {}
             };
         }
@@ -98,15 +96,14 @@ impl<'a> Parser<'a> {
     fn parse_expr_catch_underscore(&mut self) -> PResult<'a, P<Expr>> {
         match self.parse_expr() {
             Ok(expr) => Ok(expr),
-            Err(mut err) => match self.token.kind {
-                token::Ident(name, false)
-                    if name == kw::Underscore && self.look_ahead(1, |t| t == &token::Comma) =>
+            Err(mut err) => match self.token.ident() {
+                Some((Ident { name: kw::Underscore, .. }, false))
+                    if self.look_ahead(1, |t| t == &token::Comma) =>
                 {
                     // Special-case handling of `foo(_, _, _)`
                     err.emit();
-                    let sp = self.token.span;
                     self.bump();
-                    Ok(self.mk_expr(sp, ExprKind::Err, AttrVec::new()))
+                    Ok(self.mk_expr(self.prev_token.span, ExprKind::Err, AttrVec::new()))
                 }
                 _ => Err(err),
             },
@@ -165,17 +162,10 @@ impl<'a> Parser<'a> {
 
         self.expected_tokens.push(TokenType::Operator);
         while let Some(op) = self.check_assoc_op() {
-            // Adjust the span for interpolated LHS to point to the `$lhs` token and not to what
-            // it refers to. Interpolated identifiers are unwrapped early and never show up here
-            // as `PrevTokenKind::Interpolated` so if LHS is a single identifier we always process
-            // it as "interpolated", it doesn't change the answer for non-interpolated idents.
-            let lhs_span = match (self.prev_token_kind, &lhs.kind) {
-                (PrevTokenKind::Interpolated, _) => self.prev_span,
-                (PrevTokenKind::Ident, &ExprKind::Path(None, ref path))
-                    if path.segments.len() == 1 =>
-                {
-                    self.prev_span
-                }
+            // Adjust the span for interpolated LHS to point to the `$lhs` token
+            // and not to what it refers to.
+            let lhs_span = match self.prev_token.kind {
+                TokenKind::Interpolated(..) => self.prev_token.span,
                 _ => lhs.span,
             };
 
@@ -233,12 +223,8 @@ impl<'a> Parser<'a> {
 
             // Make sure that the span of the parent node is larger than the span of lhs and rhs,
             // including the attributes.
-            let lhs_span = lhs
-                .attrs
-                .iter()
-                .filter(|a| a.style == AttrStyle::Outer)
-                .next()
-                .map_or(lhs_span, |a| a.span);
+            let lhs_span =
+                lhs.attrs.iter().find(|a| a.style == AttrStyle::Outer).map_or(lhs_span, |a| a.span);
             let span = lhs_span.to(rhs.span);
             lhs = match op {
                 AssocOp::Add
@@ -344,21 +330,19 @@ impl<'a> Parser<'a> {
     ///
     /// Also performs recovery for `and` / `or` which are mistaken for `&&` and `||` respectively.
     fn check_assoc_op(&self) -> Option<Spanned<AssocOp>> {
-        Some(Spanned {
-            node: match (AssocOp::from_token(&self.token), &self.token.kind) {
-                (Some(op), _) => op,
-                (None, token::Ident(sym::and, false)) => {
-                    self.error_bad_logical_op("and", "&&", "conjunction");
-                    AssocOp::LAnd
-                }
-                (None, token::Ident(sym::or, false)) => {
-                    self.error_bad_logical_op("or", "||", "disjunction");
-                    AssocOp::LOr
-                }
-                _ => return None,
-            },
-            span: self.token.span,
-        })
+        let (op, span) = match (AssocOp::from_token(&self.token), self.token.ident()) {
+            (Some(op), _) => (op, self.token.span),
+            (None, Some((Ident { name: sym::and, span }, false))) => {
+                self.error_bad_logical_op("and", "&&", "conjunction");
+                (AssocOp::LAnd, span)
+            }
+            (None, Some((Ident { name: sym::or, span }, false))) => {
+                self.error_bad_logical_op("or", "||", "disjunction");
+                (AssocOp::LOr, span)
+            }
+            _ => return None,
+        };
+        Some(source_map::respan(span, op))
     }
 
     /// Error on `and` and `or` suggesting `&&` and `||` respectively.
@@ -449,7 +433,7 @@ impl<'a> Parser<'a> {
         let attrs = self.parse_or_use_outer_attributes(attrs)?;
         let lo = self.token.span;
         // Note: when adding new unary operators, don't forget to adjust TokenKind::can_begin_expr()
-        let (hi, ex) = match self.token.kind {
+        let (hi, ex) = match self.token.uninterpolate().kind {
             token::Not => self.parse_unary_expr(lo, UnOp::Not), // `!expr`
             token::Tilde => self.recover_tilde_expr(lo),        // `~expr`
             token::BinOp(token::Minus) => self.parse_unary_expr(lo, UnOp::Neg), // `-expr`
@@ -496,7 +480,7 @@ impl<'a> Parser<'a> {
     }
 
     fn is_mistaken_not_ident_negation(&self) -> bool {
-        let token_cannot_continue_expr = |t: &Token| match t.kind {
+        let token_cannot_continue_expr = |t: &Token| match t.uninterpolate().kind {
             // These tokens can start an expression after `!`, but
             // can't continue an expression after an ident
             token::Ident(name, is_raw) => token::ident_can_begin_expr(name, t.span, is_raw),
@@ -534,11 +518,13 @@ impl<'a> Parser<'a> {
         expr: PResult<'a, P<Expr>>,
     ) -> PResult<'a, (Span, P<Expr>)> {
         expr.map(|e| {
-            if self.prev_token_kind == PrevTokenKind::Interpolated {
-                (self.prev_span, e)
-            } else {
-                (e.span, e)
-            }
+            (
+                match self.prev_token.kind {
+                    TokenKind::Interpolated(..) => self.prev_token.span,
+                    _ => e.span,
+                },
+                e,
+            )
         })
     }
 
@@ -555,8 +541,8 @@ impl<'a> Parser<'a> {
         // Save the state of the parser before parsing type normally, in case there is a
         // LessThan comparison after this cast.
         let parser_snapshot_before_type = self.clone();
-        match self.parse_ty_no_plus() {
-            Ok(rhs) => Ok(mk_expr(self, rhs)),
+        let cast_expr = match self.parse_ty_no_plus() {
+            Ok(rhs) => mk_expr(self, rhs),
             Err(mut type_err) => {
                 // Rewind to before attempting to parse the type with generics, to recover
                 // from situations like `x as usize < y` in which we first tried to parse
@@ -610,22 +596,76 @@ impl<'a> Parser<'a> {
                             )
                             .emit();
 
-                        Ok(expr)
+                        expr
                     }
                     Err(mut path_err) => {
                         // Couldn't parse as a path, return original error and parser state.
                         path_err.cancel();
                         mem::replace(self, parser_snapshot_after_type);
-                        Err(type_err)
+                        return Err(type_err);
                     }
                 }
             }
-        }
+        };
+
+        self.parse_and_disallow_postfix_after_cast(cast_expr)
+    }
+
+    /// Parses a postfix operators such as `.`, `?`, or index (`[]`) after a cast,
+    /// then emits an error and returns the newly parsed tree.
+    /// The resulting parse tree for `&x as T[0]` has a precedence of `((&x) as T)[0]`.
+    fn parse_and_disallow_postfix_after_cast(
+        &mut self,
+        cast_expr: P<Expr>,
+    ) -> PResult<'a, P<Expr>> {
+        // Save the memory location of expr before parsing any following postfix operators.
+        // This will be compared with the memory location of the output expression.
+        // If they different we can assume we parsed another expression because the existing expression is not reallocated.
+        let addr_before = &*cast_expr as *const _ as usize;
+        let span = cast_expr.span;
+        let with_postfix = self.parse_dot_or_call_expr_with_(cast_expr, span)?;
+        let changed = addr_before != &*with_postfix as *const _ as usize;
+
+        // Check if an illegal postfix operator has been added after the cast.
+        // If the resulting expression is not a cast, or has a different memory location, it is an illegal postfix operator.
+        if !matches!(with_postfix.kind, ExprKind::Cast(_, _) | ExprKind::Type(_, _)) || changed {
+            let msg = format!(
+                "casts cannot be followed by {}",
+                match with_postfix.kind {
+                    ExprKind::Index(_, _) => "indexing",
+                    ExprKind::Try(_) => "?",
+                    ExprKind::Field(_, _) => "a field access",
+                    ExprKind::MethodCall(_, _) => "a method call",
+                    ExprKind::Call(_, _) => "a function call",
+                    ExprKind::Await(_) => "`.await`",
+                    ExprKind::Err => return Ok(with_postfix),
+                    _ => unreachable!("parse_dot_or_call_expr_with_ shouldn't produce this"),
+                }
+            );
+            let mut err = self.struct_span_err(span, &msg);
+            // If type ascription is "likely an error", the user will already be getting a useful
+            // help message, and doesn't need a second.
+            if self.last_type_ascription.map_or(false, |last_ascription| last_ascription.1) {
+                self.maybe_annotate_with_ascription(&mut err, false);
+            } else {
+                let suggestions = vec![
+                    (span.shrink_to_lo(), "(".to_string()),
+                    (span.shrink_to_hi(), ")".to_string()),
+                ];
+                err.multipart_suggestion(
+                    "try surrounding the expression in parentheses",
+                    suggestions,
+                    Applicability::MachineApplicable,
+                );
+            }
+            err.emit();
+        };
+        Ok(with_postfix)
     }
 
     fn parse_assoc_op_ascribe(&mut self, lhs: P<Expr>, lhs_span: Span) -> PResult<'a, P<Expr>> {
         let maybe_path = self.could_ascription_be_path(&lhs.kind);
-        self.last_type_ascription = Some((self.prev_span, maybe_path));
+        self.last_type_ascription = Some((self.prev_token.span, maybe_path));
         let lhs = self.parse_assoc_op_cast(lhs, lhs_span, ExprKind::Type)?;
         self.sess.gated_spans.gate(sym::type_ascription, lhs.span);
         Ok(lhs)
@@ -647,7 +687,7 @@ impl<'a> Parser<'a> {
             let found_raw = self.eat_keyword(kw::Raw);
             assert!(found_raw);
             let mutability = self.parse_const_or_mut().unwrap();
-            self.sess.gated_spans.gate(sym::raw_ref_op, lo.to(self.prev_span));
+            self.sess.gated_spans.gate(sym::raw_ref_op, lo.to(self.prev_token.span));
             (ast::BorrowKind::Raw, mutability)
         } else {
             // `mut?`
@@ -676,25 +716,16 @@ impl<'a> Parser<'a> {
             expr.map(|mut expr| {
                 attrs.extend::<Vec<_>>(expr.attrs.into());
                 expr.attrs = attrs;
-                self.error_attr_on_if_expr(&expr);
                 expr
             })
         })
     }
 
-    fn error_attr_on_if_expr(&self, expr: &Expr) {
-        if let (ExprKind::If(..), [a0, ..]) = (&expr.kind, &*expr.attrs) {
-            // Just point to the first attribute in there...
-            self.struct_span_err(a0.span, "attributes are not yet allowed on `if` expressions")
-                .emit();
-        }
-    }
-
     fn parse_dot_or_call_expr_with_(&mut self, mut e: P<Expr>, lo: Span) -> PResult<'a, P<Expr>> {
         loop {
             if self.eat(&token::Question) {
                 // `expr?`
-                e = self.mk_expr(lo.to(self.prev_span), ExprKind::Try(e), AttrVec::new());
+                e = self.mk_expr(lo.to(self.prev_token.span), ExprKind::Try(e), AttrVec::new());
                 continue;
             }
             if self.eat(&token::Dot) {
@@ -714,7 +745,7 @@ impl<'a> Parser<'a> {
     }
 
     fn parse_dot_suffix_expr(&mut self, lo: Span, base: P<Expr>) -> PResult<'a, P<Expr>> {
-        match self.token.kind {
+        match self.token.uninterpolate().kind {
             token::Ident(..) => self.parse_dot_suffix(base, lo),
             token::Literal(token::Lit { kind: token::Integer, symbol, suffix }) => {
                 Ok(self.parse_tuple_field_access_expr(lo, base, symbol, suffix))
@@ -746,8 +777,8 @@ impl<'a> Parser<'a> {
         let fstr = sym.as_str();
         let msg = format!("unexpected token: `{}`", sym);
 
-        let mut err = self.struct_span_err(self.prev_span, &msg);
-        err.span_label(self.prev_span, "unexpected token");
+        let mut err = self.struct_span_err(self.prev_token.span, &msg);
+        err.span_label(self.prev_token.span, "unexpected token");
 
         if fstr.chars().all(|x| "0123456789.".contains(x)) {
             let float = match fstr.parse::<f64>() {
@@ -764,10 +795,10 @@ impl<'a> Parser<'a> {
                 s.print_usize(float.trunc() as usize);
                 s.pclose();
                 s.s.word(".");
-                s.s.word(fstr.splitn(2, ".").last().unwrap().to_string())
+                s.s.word(fstr.splitn(2, '.').last().unwrap().to_string())
             });
             err.span_suggestion(
-                lo.to(self.prev_span),
+                lo.to(self.prev_token.span),
                 "try parenthesizing the first index",
                 sugg,
                 Applicability::MachineApplicable,
@@ -783,8 +814,8 @@ impl<'a> Parser<'a> {
         field: Symbol,
         suffix: Option<Symbol>,
     ) -> P<Expr> {
-        let span = self.token.span;
         self.bump();
+        let span = self.prev_token.span;
         let field = ExprKind::Field(base, Ident::new(field, span));
         self.expect_no_suffix(span, "a tuple index", suffix);
         self.mk_expr(lo.to(span), field, AttrVec::new())
@@ -793,7 +824,7 @@ impl<'a> Parser<'a> {
     /// Parse a function call expression, `expr(...)`.
     fn parse_fn_call_expr(&mut self, lo: Span, fun: P<Expr>) -> P<Expr> {
         let seq = self.parse_paren_expr_seq().map(|args| {
-            self.mk_expr(lo.to(self.prev_span), self.mk_call(fun, args), AttrVec::new())
+            self.mk_expr(lo.to(self.prev_token.span), self.mk_call(fun, args), AttrVec::new())
         });
         self.recover_seq_parse_error(token::Paren, lo, seq)
     }
@@ -803,12 +834,12 @@ impl<'a> Parser<'a> {
         self.bump(); // `[`
         let index = self.parse_expr()?;
         self.expect(&token::CloseDelim(token::Bracket))?;
-        Ok(self.mk_expr(lo.to(self.prev_span), self.mk_index(base, index), AttrVec::new()))
+        Ok(self.mk_expr(lo.to(self.prev_token.span), self.mk_index(base, index), AttrVec::new()))
     }
 
     /// Assuming we have just parsed `.`, continue parsing into an expression.
     fn parse_dot_suffix(&mut self, self_arg: P<Expr>, lo: Span) -> PResult<'a, P<Expr>> {
-        if self.token.span.rust_2018() && self.eat_keyword(kw::Await) {
+        if self.token.uninterpolated_span().rust_2018() && self.eat_keyword(kw::Await) {
             return self.mk_await_expr(self_arg, lo);
         }
 
@@ -820,19 +851,19 @@ impl<'a> Parser<'a> {
             let mut args = self.parse_paren_expr_seq()?;
             args.insert(0, self_arg);
 
-            let span = lo.to(self.prev_span);
+            let span = lo.to(self.prev_token.span);
             Ok(self.mk_expr(span, ExprKind::MethodCall(segment, args), AttrVec::new()))
         } else {
             // Field access `expr.f`
             if let Some(args) = segment.args {
                 self.struct_span_err(
                     args.span(),
-                    "field expressions may not have generic arguments",
+                    "field expressions cannot have generic arguments",
                 )
                 .emit();
             }
 
-            let span = lo.to(self.prev_span);
+            let span = lo.to(self.prev_token.span);
             Ok(self.mk_expr(span, ExprKind::Field(self_arg, segment.ident), AttrVec::new()))
         }
     }
@@ -878,18 +909,18 @@ impl<'a> Parser<'a> {
         } else if self.eat_keyword(kw::If) {
             self.parse_if_expr(attrs)
         } else if self.eat_keyword(kw::For) {
-            self.parse_for_expr(None, self.prev_span, attrs)
+            self.parse_for_expr(None, self.prev_token.span, attrs)
         } else if self.eat_keyword(kw::While) {
-            self.parse_while_expr(None, self.prev_span, attrs)
+            self.parse_while_expr(None, self.prev_token.span, attrs)
         } else if let Some(label) = self.eat_label() {
             self.parse_labeled_expr(label, attrs)
         } else if self.eat_keyword(kw::Loop) {
-            self.parse_loop_expr(None, self.prev_span, attrs)
+            self.parse_loop_expr(None, self.prev_token.span, attrs)
         } else if self.eat_keyword(kw::Continue) {
             let kind = ExprKind::Continue(self.eat_label());
-            Ok(self.mk_expr(lo.to(self.prev_span), kind, attrs))
+            Ok(self.mk_expr(lo.to(self.prev_token.span), kind, attrs))
         } else if self.eat_keyword(kw::Match) {
-            let match_sp = self.prev_span;
+            let match_sp = self.prev_token.span;
             self.parse_match_expr(attrs).map_err(|mut err| {
                 err.span_label(match_sp, "while parsing this match expression");
                 err
@@ -922,7 +953,7 @@ impl<'a> Parser<'a> {
             //       |             ^ expected expression
             self.bump();
             Ok(self.mk_expr_err(self.token.span))
-        } else if self.token.span.rust_2018() {
+        } else if self.token.uninterpolated_span().rust_2018() {
             // `Span::rust_2018()` is somewhat expensive; don't get it repeatedly.
             if self.check_keyword(kw::Async) {
                 if self.is_async_block() {
@@ -932,7 +963,7 @@ impl<'a> Parser<'a> {
                     self.parse_closure_expr(attrs)
                 }
             } else if self.eat_keyword(kw::Await) {
-                self.recover_incorrect_await_syntax(lo, self.prev_span, attrs)
+                self.recover_incorrect_await_syntax(lo, self.prev_token.span, attrs)
             } else {
                 self.parse_lit_expr(attrs)
             }
@@ -945,7 +976,7 @@ impl<'a> Parser<'a> {
         let lo = self.token.span;
         match self.parse_opt_lit() {
             Some(literal) => {
-                let expr = self.mk_expr(lo.to(self.prev_span), ExprKind::Lit(literal), attrs);
+                let expr = self.mk_expr(lo.to(self.prev_token.span), ExprKind::Lit(literal), attrs);
                 self.maybe_recover_from_bad_qpath(expr, true)
             }
             None => return Err(self.expected_expression_found()),
@@ -966,12 +997,12 @@ impl<'a> Parser<'a> {
         };
         let kind = if es.len() == 1 && !trailing_comma {
             // `(e)` is parenthesized `e`.
-            ExprKind::Paren(es.into_iter().nth(0).unwrap())
+            ExprKind::Paren(es.into_iter().next().unwrap())
         } else {
             // `(e,)` is a tuple with only one field, `e`.
             ExprKind::Tup(es)
         };
-        let expr = self.mk_expr(lo.to(self.prev_span), kind, attrs);
+        let expr = self.mk_expr(lo.to(self.prev_token.span), kind, attrs);
         self.maybe_recover_from_bad_qpath(expr, true)
     }
 
@@ -1006,7 +1037,7 @@ impl<'a> Parser<'a> {
                 ExprKind::Array(vec![first_expr])
             }
         };
-        let expr = self.mk_expr(lo.to(self.prev_span), kind, attrs);
+        let expr = self.mk_expr(lo.to(self.prev_token.span), kind, attrs);
         self.maybe_recover_from_bad_qpath(expr, true)
     }
 
@@ -1022,7 +1053,7 @@ impl<'a> Parser<'a> {
                 args: self.parse_mac_args()?,
                 prior_type_ascription: self.last_type_ascription,
             };
-            (self.prev_span, ExprKind::Mac(mac))
+            (self.prev_token.span, ExprKind::Mac(mac))
         } else if self.check(&token::OpenDelim(token::Brace)) {
             if let Some(expr) = self.maybe_parse_struct_expr(lo, &path, &attrs) {
                 return expr;
@@ -1066,7 +1097,7 @@ impl<'a> Parser<'a> {
         self.bump(); // `do`
         self.bump(); // `catch`
 
-        let span_dc = lo.to(self.prev_span);
+        let span_dc = lo.to(self.prev_token.span);
         self.struct_span_err(span_dc, "found removed `do catch` syntax")
             .span_suggestion(
                 span_dc,
@@ -1087,15 +1118,15 @@ impl<'a> Parser<'a> {
 
     /// Parse `"return" expr?`.
     fn parse_return_expr(&mut self, attrs: AttrVec) -> PResult<'a, P<Expr>> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let kind = ExprKind::Ret(self.parse_expr_opt()?);
-        let expr = self.mk_expr(lo.to(self.prev_span), kind, attrs);
+        let expr = self.mk_expr(lo.to(self.prev_token.span), kind, attrs);
         self.maybe_recover_from_bad_qpath(expr, true)
     }
 
     /// Parse `"('label ":")? break expr?`.
     fn parse_break_expr(&mut self, attrs: AttrVec) -> PResult<'a, P<Expr>> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let label = self.eat_label();
         let kind = if self.token != token::OpenDelim(token::Brace)
             || !self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL)
@@ -1104,15 +1135,15 @@ impl<'a> Parser<'a> {
         } else {
             None
         };
-        let expr = self.mk_expr(lo.to(self.prev_span), ExprKind::Break(label, kind), attrs);
+        let expr = self.mk_expr(lo.to(self.prev_token.span), ExprKind::Break(label, kind), attrs);
         self.maybe_recover_from_bad_qpath(expr, true)
     }
 
     /// Parse `"yield" expr?`.
     fn parse_yield_expr(&mut self, attrs: AttrVec) -> PResult<'a, P<Expr>> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let kind = ExprKind::Yield(self.parse_expr_opt()?);
-        let span = lo.to(self.prev_span);
+        let span = lo.to(self.prev_token.span);
         self.sess.gated_spans.gate(sym::generators, span);
         let expr = self.mk_expr(span, kind, attrs);
         self.maybe_recover_from_bad_qpath(expr, true)
@@ -1294,7 +1325,10 @@ impl<'a> Parser<'a> {
                         `proc_macro::Literal::*_unsuffixed` for code that will desugar \
                         to tuple field access",
                 );
-                err.note("for more context, see https://github.com/rust-lang/rust/issues/60210");
+                err.note(
+                    "see issue #60210 <https://github.com/rust-lang/rust/issues/60210> \
+                     for more information",
+                );
                 err
             } else {
                 self.struct_span_err(sp, &format!("suffixes on {} are invalid", kind))
@@ -1305,6 +1339,7 @@ impl<'a> Parser<'a> {
     }
 
     /// Matches `'-' lit | lit` (cf. `ast_validation::AstValidator::check_expr_within_pat`).
+    /// Keep this in sync with `Token::can_begin_literal_maybe_minus`.
     pub fn parse_literal_maybe_minus(&mut self) -> PResult<'a, P<Expr>> {
         maybe_whole_expr!(self);
 
@@ -1314,7 +1349,11 @@ impl<'a> Parser<'a> {
         let expr = self.mk_expr(lit.span, ExprKind::Lit(lit), AttrVec::new());
 
         if minus_present {
-            Ok(self.mk_expr(lo.to(self.prev_span), self.mk_unary(UnOp::Neg, expr), AttrVec::new()))
+            Ok(self.mk_expr(
+                lo.to(self.prev_token.span),
+                self.mk_unary(UnOp::Neg, expr),
+                AttrVec::new(),
+            ))
         } else {
             Ok(expr)
         }
@@ -1348,18 +1387,21 @@ impl<'a> Parser<'a> {
         let movability =
             if self.eat_keyword(kw::Static) { Movability::Static } else { Movability::Movable };
 
-        let asyncness =
-            if self.token.span.rust_2018() { self.parse_asyncness() } else { IsAsync::NotAsync };
-        if asyncness.is_async() {
+        let asyncness = if self.token.uninterpolated_span().rust_2018() {
+            self.parse_asyncness()
+        } else {
+            Async::No
+        };
+        if let Async::Yes { span, .. } = asyncness {
             // Feature-gate `async ||` closures.
-            self.sess.gated_spans.gate(sym::async_closure, self.prev_span);
+            self.sess.gated_spans.gate(sym::async_closure, span);
         }
 
         let capture_clause = self.parse_capture_clause();
         let decl = self.parse_fn_block_decl()?;
-        let decl_hi = self.prev_span;
+        let decl_hi = self.prev_token.span;
         let body = match decl.output {
-            FunctionRetTy::Default(_) => {
+            FnRetTy::Default(_) => {
                 let restrictions = self.restrictions - Restrictions::STMT_EXPR;
                 self.parse_expr_res(restrictions, None)?
             }
@@ -1377,7 +1419,7 @@ impl<'a> Parser<'a> {
         ))
     }
 
-    /// Parses an optional `move` prefix to a closure lke construct.
+    /// Parses an optional `move` prefix to a closure-like construct.
     fn parse_capture_clause(&mut self) -> CaptureBy {
         if self.eat_keyword(kw::Move) { CaptureBy::Value } else { CaptureBy::Ref }
     }
@@ -1399,7 +1441,7 @@ impl<'a> Parser<'a> {
             self.expect_or()?;
             args
         };
-        let output = self.parse_ret_ty(true, true)?;
+        let output = self.parse_ret_ty(AllowPlus::Yes, RecoverQPath::Yes)?;
 
         Ok(P(FnDecl { inputs, output }))
     }
@@ -1412,7 +1454,7 @@ impl<'a> Parser<'a> {
         let ty = if self.eat(&token::Colon) {
             self.parse_ty()?
         } else {
-            self.mk_ty(self.prev_span, TyKind::Infer)
+            self.mk_ty(self.prev_token.span, TyKind::Infer)
         };
         Ok(Param {
             attrs: attrs.into(),
@@ -1426,7 +1468,7 @@ impl<'a> Parser<'a> {
 
     /// Parses an `if` expression (`if` token already eaten).
     fn parse_if_expr(&mut self, attrs: AttrVec) -> PResult<'a, P<Expr>> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let cond = self.parse_cond_expr()?;
 
         // Verify that the parsed `if` condition makes sense as a condition. If it is a block, then
@@ -1445,7 +1487,7 @@ impl<'a> Parser<'a> {
             })?
         };
         let els = if self.eat_keyword(kw::Else) { Some(self.parse_else_expr()?) } else { None };
-        Ok(self.mk_expr(lo.to(self.prev_span), ExprKind::If(cond, thn, els), attrs))
+        Ok(self.mk_expr(lo.to(self.prev_token.span), ExprKind::If(cond, thn, els), attrs))
     }
 
     fn error_missing_if_cond(&self, lo: Span, span: Span) -> P<ast::Block> {
@@ -1471,7 +1513,7 @@ impl<'a> Parser<'a> {
     /// Parses a `let $pat = $expr` pseudo-expression.
     /// The `let` token has already been eaten.
     fn parse_let_expr(&mut self, attrs: AttrVec) -> PResult<'a, P<Expr>> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let pat = self.parse_top_pat(GateOr::No)?;
         self.expect(&token::Eq)?;
         let expr = self.with_res(Restrictions::NO_STRUCT_LITERAL, |this| {
@@ -1511,7 +1553,7 @@ impl<'a> Parser<'a> {
         if !self.eat_keyword(kw::In) {
             self.error_missing_in_for_loop();
         }
-        self.check_for_for_in_in_typo(self.prev_span);
+        self.check_for_for_in_in_typo(self.prev_token.span);
         let expr = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
 
         let pat = self.recover_parens_around_for_head(pat, &expr, begin_paren);
@@ -1520,11 +1562,11 @@ impl<'a> Parser<'a> {
         attrs.extend(iattrs);
 
         let kind = ExprKind::ForLoop(pat, expr, loop_block, opt_label);
-        Ok(self.mk_expr(lo.to(self.prev_span), kind, attrs))
+        Ok(self.mk_expr(lo.to(self.prev_token.span), kind, attrs))
     }
 
     fn error_missing_in_for_loop(&self) {
-        let in_span = self.prev_span.between(self.token.span);
+        let in_span = self.prev_token.span.between(self.token.span);
         self.struct_span_err(in_span, "missing `in` in `for` loop")
             .span_suggestion_short(
                 in_span,
@@ -1546,7 +1588,7 @@ impl<'a> Parser<'a> {
         let cond = self.parse_cond_expr()?;
         let (iattrs, body) = self.parse_inner_attrs_and_block()?;
         attrs.extend(iattrs);
-        Ok(self.mk_expr(lo.to(self.prev_span), ExprKind::While(cond, body, opt_label), attrs))
+        Ok(self.mk_expr(lo.to(self.prev_token.span), ExprKind::While(cond, body, opt_label), attrs))
     }
 
     /// Parses `loop { ... }` (`loop` token already eaten).
@@ -1558,21 +1600,20 @@ impl<'a> Parser<'a> {
     ) -> PResult<'a, P<Expr>> {
         let (iattrs, body) = self.parse_inner_attrs_and_block()?;
         attrs.extend(iattrs);
-        Ok(self.mk_expr(lo.to(self.prev_span), ExprKind::Loop(body, opt_label), attrs))
+        Ok(self.mk_expr(lo.to(self.prev_token.span), ExprKind::Loop(body, opt_label), attrs))
     }
 
     fn eat_label(&mut self) -> Option<Label> {
         self.token.lifetime().map(|ident| {
-            let span = self.token.span;
             self.bump();
-            Label { ident: Ident::new(ident.name, span) }
+            Label { ident }
         })
     }
 
     /// Parses a `match ... { ... }` expression (`match` token already eaten).
     fn parse_match_expr(&mut self, mut attrs: AttrVec) -> PResult<'a, P<Expr>> {
-        let match_span = self.prev_span;
-        let lo = self.prev_span;
+        let match_span = self.prev_token.span;
+        let lo = self.prev_token.span;
         let scrutinee = self.parse_expr_res(Restrictions::NO_STRUCT_LITERAL, None)?;
         if let Err(mut e) = self.expect(&token::OpenDelim(token::Brace)) {
             if self.token == token::Semi {
@@ -1628,10 +1669,10 @@ impl<'a> Parser<'a> {
         let hi = self.token.span;
 
         if require_comma {
-            let cm = self.sess.source_map();
+            let sm = self.sess.source_map();
             self.expect_one_of(&[token::Comma], &[token::CloseDelim(token::Brace)]).map_err(
                 |mut err| {
-                    match (cm.span_to_lines(expr.span), cm.span_to_lines(arm_start_span)) {
+                    match (sm.span_to_lines(expr.span), sm.span_to_lines(arm_start_span)) {
                         (Ok(ref expr_lines), Ok(ref arm_start_lines))
                             if arm_start_lines.lines[0].end_col == expr_lines.lines[0].end_col
                                 && expr_lines.lines.len() == 2
@@ -1685,8 +1726,10 @@ impl<'a> Parser<'a> {
         let (iattrs, body) = self.parse_inner_attrs_and_block()?;
         attrs.extend(iattrs);
         if self.eat_keyword(kw::Catch) {
-            let mut error =
-                self.struct_span_err(self.prev_span, "keyword `catch` cannot follow a `try` block");
+            let mut error = self.struct_span_err(
+                self.prev_token.span,
+                "keyword `catch` cannot follow a `try` block",
+            );
             error.help("try using `match` on the result of the `try` block instead");
             error.emit();
             Err(error)
@@ -1707,7 +1750,7 @@ impl<'a> Parser<'a> {
     fn is_try_block(&self) -> bool {
         self.token.is_keyword(kw::Try) &&
         self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace)) &&
-        self.token.span.rust_2018() &&
+        self.token.uninterpolated_span().rust_2018() &&
         // Prevent `while try {} {}`, `if try {} {} else {}`, etc.
         !self.restrictions.contains(Restrictions::NO_STRUCT_LITERAL)
     }
@@ -1720,7 +1763,7 @@ impl<'a> Parser<'a> {
         let (iattrs, body) = self.parse_inner_attrs_and_block()?;
         attrs.extend(iattrs);
         let kind = ExprKind::Async(capture_clause, DUMMY_NODE_ID, body);
-        Ok(self.mk_expr(lo.to(self.prev_span), kind, attrs))
+        Ok(self.mk_expr(lo.to(self.prev_token.span), kind, attrs))
     }
 
     fn is_async_block(&self) -> bool {
@@ -1784,7 +1827,7 @@ impl<'a> Parser<'a> {
         pth: ast::Path,
         mut attrs: AttrVec,
     ) -> PResult<'a, P<Expr>> {
-        let struct_sp = lo.to(self.prev_span);
+        let struct_sp = lo.to(self.prev_token.span);
         self.bump();
         let mut fields = Vec::new();
         let mut base = None;
@@ -1793,7 +1836,7 @@ impl<'a> Parser<'a> {
 
         while self.token != token::CloseDelim(token::Brace) {
             if self.eat(&token::DotDot) {
-                let exp_span = self.prev_span;
+                let exp_span = self.prev_token.span;
                 match self.parse_expr() {
                     Ok(e) => base = Some(e),
                     Err(mut e) => {
@@ -1833,10 +1876,16 @@ impl<'a> Parser<'a> {
                     }
                 }
                 Err(mut e) => {
+                    e.span_label(struct_sp, "while parsing this struct");
                     if let Some(f) = recovery_field {
                         fields.push(f);
+                        e.span_suggestion(
+                            self.prev_token.span.shrink_to_hi(),
+                            "try adding a comma",
+                            ",".into(),
+                            Applicability::MachineApplicable,
+                        );
                     }
-                    e.span_label(struct_sp, "while parsing this struct");
                     e.emit();
                     self.recover_stmt_(SemiColonMode::Comma, BlockMode::Ignore);
                     self.eat(&token::Comma);
@@ -1851,36 +1900,41 @@ impl<'a> Parser<'a> {
 
     /// Use in case of error after field-looking code: `S { foo: () with a }`.
     fn find_struct_error_after_field_looking_code(&self) -> Option<Field> {
-        if let token::Ident(name, _) = self.token.kind {
-            if !self.token.is_reserved_ident() && self.look_ahead(1, |t| *t == token::Colon) {
-                let span = self.token.span;
-                return Some(ast::Field {
-                    ident: Ident::new(name, span),
-                    span,
-                    expr: self.mk_expr_err(span),
+        match self.token.ident() {
+            Some((ident, is_raw))
+                if (is_raw || !ident.is_reserved())
+                    && self.look_ahead(1, |t| *t == token::Colon) =>
+            {
+                Some(ast::Field {
+                    ident,
+                    span: self.token.span,
+                    expr: self.mk_expr_err(self.token.span),
                     is_shorthand: false,
                     attrs: AttrVec::new(),
                     id: DUMMY_NODE_ID,
                     is_placeholder: false,
-                });
+                })
             }
+            _ => None,
         }
-        None
     }
 
     fn recover_struct_comma_after_dotdot(&mut self, span: Span) {
         if self.token != token::Comma {
             return;
         }
-        self.struct_span_err(span.to(self.prev_span), "cannot use a comma after the base struct")
-            .span_suggestion_short(
-                self.token.span,
-                "remove this comma",
-                String::new(),
-                Applicability::MachineApplicable,
-            )
-            .note("the base struct must always be the last field")
-            .emit();
+        self.struct_span_err(
+            span.to(self.prev_token.span),
+            "cannot use a comma after the base struct",
+        )
+        .span_suggestion_short(
+            self.token.span,
+            "remove this comma",
+            String::new(),
+            Applicability::MachineApplicable,
+        )
+        .note("the base struct must always be the last field")
+        .emit();
         self.recover_stmt();
     }
 
@@ -1970,7 +2024,7 @@ impl<'a> Parser<'a> {
         limits: RangeLimits,
     ) -> PResult<'a, ExprKind> {
         if end.is_none() && limits == RangeLimits::Closed {
-            self.error_inclusive_range_with_no_end(self.prev_span);
+            self.error_inclusive_range_with_no_end(self.prev_token.span);
             Ok(ExprKind::Err)
         } else {
             Ok(ExprKind::Range(start, end, limits))
@@ -1994,7 +2048,7 @@ impl<'a> Parser<'a> {
     }
 
     fn mk_await_expr(&mut self, self_arg: P<Expr>, lo: Span) -> PResult<'a, P<Expr>> {
-        let span = lo.to(self.prev_span);
+        let span = lo.to(self.prev_token.span);
         let await_expr = self.mk_expr(span, ExprKind::Await(self_arg), AttrVec::new());
         self.recover_from_await_method_call();
         Ok(await_expr)
diff --git a/src/librustc_parse/parser/generics.rs b/src/librustc_parse/parser/generics.rs
index 075583711f..59fd5f7c4b 100644
--- a/src/librustc_parse/parser/generics.rs
+++ b/src/librustc_parse/parser/generics.rs
@@ -1,10 +1,9 @@
 use super::Parser;
 
+use rustc_ast::ast::{self, Attribute, GenericBounds, GenericParam, GenericParamKind, WhereClause};
+use rustc_ast::token;
 use rustc_errors::PResult;
-use rustc_span::source_map::DUMMY_SP;
 use rustc_span::symbol::{kw, sym};
-use syntax::ast::{self, Attribute, GenericBounds, GenericParam, GenericParamKind, WhereClause};
-use syntax::token;
 
 impl<'a> Parser<'a> {
     /// Parses bounds of a lifetime parameter `BOUND + BOUND + BOUND`, possibly with trailing `+`.
@@ -30,7 +29,7 @@ impl<'a> Parser<'a> {
 
         // Parse optional colon and param bounds.
         let bounds = if self.eat(&token::Colon) {
-            self.parse_generic_bounds(Some(self.prev_span))?
+            self.parse_generic_bounds(Some(self.prev_token.span))?
         } else {
             Vec::new()
         };
@@ -55,7 +54,7 @@ impl<'a> Parser<'a> {
         self.expect(&token::Colon)?;
         let ty = self.parse_ty()?;
 
-        self.sess.gated_spans.gate(sym::const_generics, lo.to(self.prev_span));
+        self.sess.gated_spans.gate(sym::const_generics, lo.to(self.prev_token.span));
 
         Ok(GenericParam {
             ident,
@@ -121,15 +120,12 @@ impl<'a> Parser<'a> {
                         .span_label(attrs[0].span, "attributes must go before parameters")
                         .emit();
                     } else {
-                        self.struct_span_err(
-                            attrs[0].span,
-                            &format!("attribute without generic parameters"),
-                        )
-                        .span_label(
-                            attrs[0].span,
-                            "attributes are only permitted when preceding parameters",
-                        )
-                        .emit();
+                        self.struct_span_err(attrs[0].span, "attribute without generic parameters")
+                            .span_label(
+                                attrs[0].span,
+                                "attributes are only permitted when preceding parameters",
+                            )
+                            .emit();
                     }
                 }
                 break;
@@ -154,13 +150,16 @@ impl<'a> Parser<'a> {
         let (params, span) = if self.eat_lt() {
             let params = self.parse_generic_params()?;
             self.expect_gt()?;
-            (params, span_lo.to(self.prev_span))
+            (params, span_lo.to(self.prev_token.span))
         } else {
-            (vec![], self.prev_span.shrink_to_hi())
+            (vec![], self.prev_token.span.shrink_to_hi())
         };
         Ok(ast::Generics {
             params,
-            where_clause: WhereClause { predicates: Vec::new(), span: DUMMY_SP },
+            where_clause: WhereClause {
+                predicates: Vec::new(),
+                span: self.prev_token.span.shrink_to_hi(),
+            },
             span,
         })
     }
@@ -172,12 +171,12 @@ impl<'a> Parser<'a> {
     /// ```
     pub(super) fn parse_where_clause(&mut self) -> PResult<'a, WhereClause> {
         let mut where_clause =
-            WhereClause { predicates: Vec::new(), span: self.prev_span.to(self.prev_span) };
+            WhereClause { predicates: Vec::new(), span: self.prev_token.span.shrink_to_hi() };
 
         if !self.eat_keyword(kw::Where) {
             return Ok(where_clause);
         }
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
 
         // We are considering adding generics to the `where` keyword as an alternative higher-rank
         // parameter syntax (as in `where<'a>` or `where<T>`. To avoid that being a breaking
@@ -200,7 +199,11 @@ impl<'a> Parser<'a> {
                 self.expect(&token::Colon)?;
                 let bounds = self.parse_lt_param_bounds();
                 where_clause.predicates.push(ast::WherePredicate::RegionPredicate(
-                    ast::WhereRegionPredicate { span: lo.to(self.prev_span), lifetime, bounds },
+                    ast::WhereRegionPredicate {
+                        span: lo.to(self.prev_token.span),
+                        lifetime,
+                        bounds,
+                    },
                 ));
             } else if self.check_type() {
                 where_clause.predicates.push(self.parse_ty_where_predicate()?);
@@ -213,7 +216,7 @@ impl<'a> Parser<'a> {
             }
         }
 
-        where_clause.span = lo.to(self.prev_span);
+        where_clause.span = lo.to(self.prev_token.span);
         Ok(where_clause)
     }
 
@@ -232,9 +235,9 @@ impl<'a> Parser<'a> {
         // or with mandatory equality sign and the second type.
         let ty = self.parse_ty()?;
         if self.eat(&token::Colon) {
-            let bounds = self.parse_generic_bounds(Some(self.prev_span))?;
+            let bounds = self.parse_generic_bounds(Some(self.prev_token.span))?;
             Ok(ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate {
-                span: lo.to(self.prev_span),
+                span: lo.to(self.prev_token.span),
                 bound_generic_params: lifetime_defs,
                 bounded_ty: ty,
                 bounds,
@@ -244,7 +247,7 @@ impl<'a> Parser<'a> {
         } else if self.eat(&token::Eq) || self.eat(&token::EqEq) {
             let rhs_ty = self.parse_ty()?;
             Ok(ast::WherePredicate::EqPredicate(ast::WhereEqPredicate {
-                span: lo.to(self.prev_span),
+                span: lo.to(self.prev_token.span),
                 lhs_ty: ty,
                 rhs_ty,
                 id: ast::DUMMY_NODE_ID,
diff --git a/src/librustc_parse/parser/item.rs b/src/librustc_parse/parser/item.rs
index 31db7fc5f7..deb737056d 100644
--- a/src/librustc_parse/parser/item.rs
+++ b/src/librustc_parse/parser/item.rs
@@ -1,43 +1,61 @@
 use super::diagnostics::{dummy_arg, ConsumeClosingDelim, Error};
+use super::ty::{AllowPlus, RecoverQPath};
 use super::{FollowedByType, Parser, PathStyle};
 
 use crate::maybe_whole;
 
-use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder, PResult, StashKey};
-use rustc_span::source_map::{self, respan, Span};
+use rustc_ast::ast::{self, AttrStyle, AttrVec, Attribute, Ident, DUMMY_NODE_ID};
+use rustc_ast::ast::{AssocItem, AssocItemKind, ForeignItemKind, Item, ItemKind};
+use rustc_ast::ast::{
+    Async, Const, Defaultness, IsAuto, PathSegment, Unsafe, UseTree, UseTreeKind,
+};
+use rustc_ast::ast::{
+    BindingMode, Block, FnDecl, FnSig, Mac, MacArgs, MacDelimiter, Param, SelfKind,
+};
+use rustc_ast::ast::{EnumDef, Generics, StructField, TraitRef, Ty, TyKind, Variant, VariantData};
+use rustc_ast::ast::{FnHeader, ForeignItem, Mutability, Visibility, VisibilityKind};
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree};
+use rustc_ast_pretty::pprust;
+use rustc_errors::{struct_span_err, Applicability, PResult, StashKey};
+use rustc_span::edition::Edition;
+use rustc_span::source_map::{self, Span};
 use rustc_span::symbol::{kw, sym, Symbol};
-use rustc_span::BytePos;
-use syntax::ast::{self, AttrKind, AttrStyle, AttrVec, Attribute, Ident, DUMMY_NODE_ID};
-use syntax::ast::{AssocItem, AssocItemKind, Item, ItemKind, UseTree, UseTreeKind};
-use syntax::ast::{BindingMode, Block, FnDecl, FnSig, Mac, MacArgs, MacDelimiter, Param, SelfKind};
-use syntax::ast::{Constness, Defaultness, Extern, IsAsync, IsAuto, PathSegment, StrLit, Unsafety};
-use syntax::ast::{EnumDef, Generics, StructField, TraitRef, Ty, TyKind, Variant, VariantData};
-use syntax::ast::{FnHeader, ForeignItem, ForeignItemKind, Mutability, Visibility, VisibilityKind};
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::token;
-use syntax::tokenstream::{DelimSpan, TokenStream, TokenTree};
 
 use log::debug;
+use std::convert::TryFrom;
 use std::mem;
 
-pub(super) type ItemInfo = (Ident, ItemKind, Option<Vec<Attribute>>);
+pub(super) type ItemInfo = (Ident, ItemKind);
 
 impl<'a> Parser<'a> {
     pub fn parse_item(&mut self) -> PResult<'a, Option<P<Item>>> {
+        self.parse_item_(|_| true).map(|i| i.map(P))
+    }
+
+    fn parse_item_(&mut self, req_name: ReqName) -> PResult<'a, Option<Item>> {
         let attrs = self.parse_outer_attributes()?;
-        self.parse_item_(attrs, true, false)
+        self.parse_item_common(attrs, true, false, req_name)
     }
 
-    pub(super) fn parse_item_(
+    pub(super) fn parse_item_common(
         &mut self,
-        attrs: Vec<Attribute>,
-        macros_allowed: bool,
-        attributes_allowed: bool,
-    ) -> PResult<'a, Option<P<Item>>> {
+        mut attrs: Vec<Attribute>,
+        mac_allowed: bool,
+        attrs_allowed: bool,
+        req_name: ReqName,
+    ) -> PResult<'a, Option<Item>> {
+        maybe_whole!(self, NtItem, |item| {
+            let mut item = item;
+            mem::swap(&mut item.attrs, &mut attrs);
+            item.attrs.extend(attrs);
+            Some(item.into_inner())
+        });
+
         let mut unclosed_delims = vec![];
-        let (ret, tokens) = self.collect_tokens(|this| {
-            let item = this.parse_item_implementation(attrs, macros_allowed, attributes_allowed);
+        let (mut item, tokens) = self.collect_tokens(|this| {
+            let item = this.parse_item_common_(attrs, mac_allowed, attrs_allowed, req_name);
             unclosed_delims.append(&mut this.unclosed_delims);
             item
         })?;
@@ -57,500 +75,327 @@ impl<'a> Parser<'a> {
         // it (bad!). To work around this case for now we just avoid recording
         // `tokens` if we detect any inner attributes. This should help keep
         // expansion correct, but we should fix this bug one day!
-        Ok(ret.map(|item| {
-            item.map(|mut i| {
-                if !i.attrs.iter().any(|attr| attr.style == AttrStyle::Inner) {
-                    i.tokens = Some(tokens);
-                }
-                i
-            })
-        }))
+        if let Some(item) = &mut item {
+            if !item.attrs.iter().any(|attr| attr.style == AttrStyle::Inner) {
+                item.tokens = Some(tokens);
+            }
+        }
+        Ok(item)
     }
 
-    /// Parses one of the items allowed by the flags.
-    fn parse_item_implementation(
+    fn parse_item_common_(
         &mut self,
-        attrs: Vec<Attribute>,
-        macros_allowed: bool,
-        attributes_allowed: bool,
-    ) -> PResult<'a, Option<P<Item>>> {
-        maybe_whole!(self, NtItem, |item| {
-            let mut item = item.into_inner();
-            let mut attrs = attrs;
-            mem::swap(&mut item.attrs, &mut attrs);
-            item.attrs.extend(attrs);
-            Some(P(item))
-        });
-
+        mut attrs: Vec<Attribute>,
+        mac_allowed: bool,
+        attrs_allowed: bool,
+        req_name: ReqName,
+    ) -> PResult<'a, Option<Item>> {
         let lo = self.token.span;
-
         let vis = self.parse_visibility(FollowedByType::No)?;
-
-        if self.eat_keyword(kw::Use) {
-            // USE ITEM
-            let item_ = ItemKind::Use(P(self.parse_use_tree()?));
-            self.expect_semi()?;
-
-            let span = lo.to(self.prev_span);
-            let item = self.mk_item(span, Ident::invalid(), item_, vis, attrs);
+        let mut def = self.parse_defaultness();
+        let kind = self.parse_item_kind(&mut attrs, mac_allowed, lo, &vis, &mut def, req_name)?;
+        if let Some((ident, kind)) = kind {
+            self.error_on_unconsumed_default(def, &kind);
+            let span = lo.to(self.prev_token.span);
+            let id = DUMMY_NODE_ID;
+            let item = Item { ident, attrs, id, kind, vis, span, tokens: None };
             return Ok(Some(item));
         }
 
-        if self.eat_keyword(kw::Extern) {
-            let extern_sp = self.prev_span;
-            if self.eat_keyword(kw::Crate) {
-                return Ok(Some(self.parse_item_extern_crate(lo, vis, attrs)?));
-            }
-
-            let abi = self.parse_abi();
-
-            if self.eat_keyword(kw::Fn) {
-                // EXTERN FUNCTION ITEM
-                let fn_span = self.prev_span;
-                let header = FnHeader {
-                    unsafety: Unsafety::Normal,
-                    asyncness: respan(fn_span, IsAsync::NotAsync),
-                    constness: respan(fn_span, Constness::NotConst),
-                    ext: Extern::from_abi(abi),
-                };
-                return self.parse_item_fn(lo, vis, attrs, header);
-            } else if self.check(&token::OpenDelim(token::Brace)) {
-                return Ok(Some(self.parse_item_foreign_mod(lo, abi, vis, attrs, extern_sp)?));
-            }
-
-            self.unexpected()?;
+        // At this point, we have failed to parse an item.
+        self.error_on_unmatched_vis(&vis);
+        self.error_on_unmatched_defaultness(def);
+        if !attrs_allowed {
+            self.recover_attrs_no_item(&attrs)?;
         }
+        Ok(None)
+    }
 
-        if self.is_static_global() {
-            self.bump();
-            // STATIC ITEM
-            let m = self.parse_mutability();
-            let info = self.parse_item_const(Some(m))?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
+    /// Error in-case a non-inherited visibility was parsed but no item followed.
+    fn error_on_unmatched_vis(&self, vis: &Visibility) {
+        if let VisibilityKind::Inherited = vis.node {
+            return;
         }
+        let vs = pprust::vis_to_string(&vis);
+        let vs = vs.trim_end();
+        self.struct_span_err(vis.span, &format!("visibility `{}` is not followed by an item", vs))
+            .span_label(vis.span, "the visibility")
+            .help(&format!("you likely meant to define an item, e.g., `{} fn foo() {{}}`", vs))
+            .emit();
+    }
 
-        if self.eat_keyword(kw::Const) {
-            let const_span = self.prev_span;
-            if [kw::Fn, kw::Unsafe, kw::Extern].iter().any(|k| self.check_keyword(*k)) {
-                // CONST FUNCTION ITEM
-                let unsafety = self.parse_unsafety();
-
-                if self.check_keyword(kw::Extern) {
-                    self.sess.gated_spans.gate(sym::const_extern_fn, lo.to(self.token.span));
-                }
-                let ext = self.parse_extern()?;
-                self.expect_keyword(kw::Fn)?;
-
-                let header = FnHeader {
-                    unsafety,
-                    asyncness: respan(const_span, IsAsync::NotAsync),
-                    constness: respan(const_span, Constness::Const),
-                    ext,
-                };
-                return self.parse_item_fn(lo, vis, attrs, header);
-            }
-
-            // CONST ITEM
-            if self.eat_keyword(kw::Mut) {
-                let prev_span = self.prev_span;
-                self.struct_span_err(prev_span, "const globals cannot be mutable")
-                    .span_label(prev_span, "cannot be mutable")
-                    .span_suggestion(
-                        const_span,
-                        "you might want to declare a static instead",
-                        "static".to_owned(),
-                        Applicability::MaybeIncorrect,
-                    )
-                    .emit();
-            }
-
-            let info = self.parse_item_const(None)?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
+    /// Error in-case a `default` was parsed but no item followed.
+    fn error_on_unmatched_defaultness(&self, def: Defaultness) {
+        if let Defaultness::Default(sp) = def {
+            self.struct_span_err(sp, "`default` is not followed by an item")
+                .span_label(sp, "the `default` qualifier")
+                .note("only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`")
+                .emit();
         }
+    }
 
-        // Parses `async unsafe? fn`.
-        if self.check_keyword(kw::Async) {
-            let async_span = self.token.span;
-            if self.is_keyword_ahead(1, &[kw::Fn]) || self.is_keyword_ahead(2, &[kw::Fn]) {
-                // ASYNC FUNCTION ITEM
-                self.bump(); // `async`
-                let unsafety = self.parse_unsafety(); // `unsafe`?
-                self.expect_keyword(kw::Fn)?; // `fn`
-                let fn_span = self.prev_span;
-                let asyncness = respan(
-                    async_span,
-                    IsAsync::Async {
-                        closure_id: DUMMY_NODE_ID,
-                        return_impl_trait_id: DUMMY_NODE_ID,
-                    },
-                );
-                self.ban_async_in_2015(async_span);
-                let header = FnHeader {
-                    unsafety,
-                    asyncness,
-                    constness: respan(fn_span, Constness::NotConst),
-                    ext: Extern::None,
-                };
-                return self.parse_item_fn(lo, vis, attrs, header);
-            }
+    /// Error in-case `default` was parsed in an in-appropriate context.
+    fn error_on_unconsumed_default(&self, def: Defaultness, kind: &ItemKind) {
+        if let Defaultness::Default(span) = def {
+            let msg = format!("{} {} cannot be `default`", kind.article(), kind.descr());
+            self.struct_span_err(span, &msg)
+                .span_label(span, "`default` because of this")
+                .note("only associated `fn`, `const`, and `type` items can be `default`")
+                .emit();
         }
+    }
 
-        if self.check_keyword(kw::Unsafe) && self.is_keyword_ahead(1, &[kw::Trait, kw::Auto]) {
-            // UNSAFE TRAIT ITEM
-            self.bump(); // `unsafe`
-            let info = self.parse_item_trait(lo, Unsafety::Unsafe)?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
+    /// Parses one of the items allowed by the flags.
+    fn parse_item_kind(
+        &mut self,
+        attrs: &mut Vec<Attribute>,
+        macros_allowed: bool,
+        lo: Span,
+        vis: &Visibility,
+        def: &mut Defaultness,
+        req_name: ReqName,
+    ) -> PResult<'a, Option<ItemInfo>> {
+        let mut def = || mem::replace(def, Defaultness::Final);
 
-        if self.check_keyword(kw::Impl)
+        let info = if self.eat_keyword(kw::Use) {
+            // USE ITEM
+            let tree = self.parse_use_tree()?;
+            self.expect_semi()?;
+            (Ident::invalid(), ItemKind::Use(P(tree)))
+        } else if self.check_fn_front_matter() {
+            // FUNCTION ITEM
+            let (ident, sig, generics, body) = self.parse_fn(attrs, req_name)?;
+            (ident, ItemKind::Fn(def(), sig, generics, body))
+        } else if self.eat_keyword(kw::Extern) {
+            if self.eat_keyword(kw::Crate) {
+                // EXTERN CRATE
+                self.parse_item_extern_crate()?
+            } else {
+                // EXTERN BLOCK
+                self.parse_item_foreign_mod(attrs)?
+            }
+        } else if self.is_static_global() {
+            // STATIC ITEM
+            self.bump(); // `static`
+            let m = self.parse_mutability();
+            let (ident, ty, expr) = self.parse_item_global(Some(m))?;
+            (ident, ItemKind::Static(ty, m, expr))
+        } else if let Const::Yes(const_span) = self.parse_constness() {
+            // CONST ITEM
+            self.recover_const_mut(const_span);
+            let (ident, ty, expr) = self.parse_item_global(None)?;
+            (ident, ItemKind::Const(def(), ty, expr))
+        } else if self.check_keyword(kw::Trait) || self.check_auto_or_unsafe_trait_item() {
+            // TRAIT ITEM
+            self.parse_item_trait(attrs, lo)?
+        } else if self.check_keyword(kw::Impl)
             || self.check_keyword(kw::Unsafe) && self.is_keyword_ahead(1, &[kw::Impl])
-            || self.check_keyword(kw::Default) && self.is_keyword_ahead(1, &[kw::Impl, kw::Unsafe])
         {
             // IMPL ITEM
-            let defaultness = self.parse_defaultness();
-            let unsafety = self.parse_unsafety();
-            self.expect_keyword(kw::Impl)?;
-            let info = self.parse_item_impl(unsafety, defaultness)?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
-
-        if self.check_keyword(kw::Fn) {
-            // FUNCTION ITEM
-            self.bump();
-            let fn_span = self.prev_span;
-            let header = FnHeader {
-                unsafety: Unsafety::Normal,
-                asyncness: respan(fn_span, IsAsync::NotAsync),
-                constness: respan(fn_span, Constness::NotConst),
-                ext: Extern::None,
-            };
-            return self.parse_item_fn(lo, vis, attrs, header);
-        }
-
-        if self.check_keyword(kw::Unsafe)
-            && self.look_ahead(1, |t| *t != token::OpenDelim(token::Brace))
-        {
-            // UNSAFE FUNCTION ITEM
-            self.bump(); // `unsafe`
-            // `{` is also expected after `unsafe`; in case of error, include it in the diagnostic.
-            self.check(&token::OpenDelim(token::Brace));
-            let ext = self.parse_extern()?;
-            self.expect_keyword(kw::Fn)?;
-            let fn_span = self.prev_span;
-            let header = FnHeader {
-                unsafety: Unsafety::Unsafe,
-                asyncness: respan(fn_span, IsAsync::NotAsync),
-                constness: respan(fn_span, Constness::NotConst),
-                ext,
-            };
-            return self.parse_item_fn(lo, vis, attrs, header);
-        }
-
-        if self.eat_keyword(kw::Mod) {
+            self.parse_item_impl(attrs, def())?
+        } else if self.eat_keyword(kw::Mod) {
             // MODULE ITEM
-            let info = self.parse_item_mod(&attrs[..])?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
-
-        if self.eat_keyword(kw::Type) {
+            self.parse_item_mod(attrs)?
+        } else if self.eat_keyword(kw::Type) {
             // TYPE ITEM
-            let (ident, ty, generics) = self.parse_type_alias()?;
-            let kind = ItemKind::TyAlias(ty, generics);
-            return self.mk_item_with_info(attrs, lo, vis, (ident, kind, None));
-        }
-
-        if self.eat_keyword(kw::Enum) {
+            self.parse_type_alias(def())?
+        } else if self.eat_keyword(kw::Enum) {
             // ENUM ITEM
-            let info = self.parse_item_enum()?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
-
-        if self.check_keyword(kw::Trait)
-            || (self.check_keyword(kw::Auto) && self.is_keyword_ahead(1, &[kw::Trait]))
-        {
-            // TRAIT ITEM
-            let info = self.parse_item_trait(lo, Unsafety::Normal)?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
-
-        if self.eat_keyword(kw::Struct) {
+            self.parse_item_enum()?
+        } else if self.eat_keyword(kw::Struct) {
             // STRUCT ITEM
-            let info = self.parse_item_struct()?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
-
-        if self.is_union_item() {
+            self.parse_item_struct()?
+        } else if self.is_kw_followed_by_ident(kw::Union) {
             // UNION ITEM
-            self.bump();
-            let info = self.parse_item_union()?;
-            return self.mk_item_with_info(attrs, lo, vis, info);
-        }
+            self.bump(); // `union`
+            self.parse_item_union()?
+        } else if self.eat_keyword(kw::Macro) {
+            // MACROS 2.0 ITEM
+            self.parse_item_decl_macro(lo)?
+        } else if self.is_macro_rules_item() {
+            // MACRO_RULES ITEM
+            self.parse_item_macro_rules(vis)?
+        } else if vis.node.is_pub() && self.isnt_macro_invocation() {
+            self.recover_missing_kw_before_item()?;
+            return Ok(None);
+        } else if macros_allowed && self.token.is_path_start() {
+            // MACRO INVOCATION ITEM
+            (Ident::invalid(), ItemKind::Mac(self.parse_item_macro(vis)?))
+        } else {
+            return Ok(None);
+        };
+        Ok(Some(info))
+    }
 
-        if let Some(macro_def) = self.eat_macro_def(&attrs, &vis, lo)? {
-            return Ok(Some(macro_def));
-        }
+    /// When parsing a statement, would the start of a path be an item?
+    pub(super) fn is_path_start_item(&mut self) -> bool {
+        self.is_crate_vis() // no: `crate::b`, yes: `crate $item`
+        || self.is_kw_followed_by_ident(kw::Union) // no: `union::b`, yes: `union U { .. }`
+        || self.check_auto_or_unsafe_trait_item() // no: `auto::b`, yes: `auto trait X { .. }`
+        || self.is_async_fn() // no(2015): `async::b`, yes: `async fn`
+        || self.is_macro_rules_item() // no: `macro_rules::b`, yes: `macro_rules! mac`
+    }
+
+    /// Are we sure this could not possibly be a macro invocation?
+    fn isnt_macro_invocation(&mut self) -> bool {
+        self.check_ident() && self.look_ahead(1, |t| *t != token::Not && *t != token::ModSep)
+    }
 
-        // Verify whether we have encountered a struct or method definition where the user forgot to
-        // add the `struct` or `fn` keyword after writing `pub`: `pub S {}`
-        if vis.node.is_pub() && self.check_ident() && self.look_ahead(1, |t| *t != token::Not) {
-            // Space between `pub` keyword and the identifier
-            //
-            //     pub   S {}
-            //        ^^^ `sp` points here
-            let sp = self.prev_span.between(self.token.span);
-            let full_sp = self.prev_span.to(self.token.span);
-            let ident_sp = self.token.span;
-            if self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace)) {
-                // possible public struct definition where `struct` was forgotten
-                let ident = self.parse_ident().unwrap();
-                let msg = format!("add `struct` here to parse `{}` as a public struct", ident);
-                let mut err = self.struct_span_err(sp, "missing `struct` for struct definition");
+    /// Recover on encountering a struct or method definition where the user
+    /// forgot to add the `struct` or `fn` keyword after writing `pub`: `pub S {}`.
+    fn recover_missing_kw_before_item(&mut self) -> PResult<'a, ()> {
+        // Space between `pub` keyword and the identifier
+        //
+        //     pub   S {}
+        //        ^^^ `sp` points here
+        let sp = self.prev_token.span.between(self.token.span);
+        let full_sp = self.prev_token.span.to(self.token.span);
+        let ident_sp = self.token.span;
+        if self.look_ahead(1, |t| *t == token::OpenDelim(token::Brace)) {
+            // possible public struct definition where `struct` was forgotten
+            let ident = self.parse_ident().unwrap();
+            let msg = format!("add `struct` here to parse `{}` as a public struct", ident);
+            let mut err = self.struct_span_err(sp, "missing `struct` for struct definition");
+            err.span_suggestion_short(
+                sp,
+                &msg,
+                " struct ".into(),
+                Applicability::MaybeIncorrect, // speculative
+            );
+            return Err(err);
+        } else if self.look_ahead(1, |t| *t == token::OpenDelim(token::Paren)) {
+            let ident = self.parse_ident().unwrap();
+            self.bump(); // `(`
+            let kw_name = self.recover_first_param();
+            self.consume_block(token::Paren, ConsumeClosingDelim::Yes);
+            let (kw, kw_name, ambiguous) = if self.check(&token::RArrow) {
+                self.eat_to_tokens(&[&token::OpenDelim(token::Brace)]);
+                self.bump(); // `{`
+                ("fn", kw_name, false)
+            } else if self.check(&token::OpenDelim(token::Brace)) {
+                self.bump(); // `{`
+                ("fn", kw_name, false)
+            } else if self.check(&token::Colon) {
+                let kw = "struct";
+                (kw, kw, false)
+            } else {
+                ("fn` or `struct", "function or struct", true)
+            };
+
+            let msg = format!("missing `{}` for {} definition", kw, kw_name);
+            let mut err = self.struct_span_err(sp, &msg);
+            if !ambiguous {
+                self.consume_block(token::Brace, ConsumeClosingDelim::Yes);
+                let suggestion =
+                    format!("add `{}` here to parse `{}` as a public {}", kw, ident, kw_name);
                 err.span_suggestion_short(
                     sp,
-                    &msg,
-                    " struct ".into(),
-                    Applicability::MaybeIncorrect, // speculative
+                    &suggestion,
+                    format!(" {} ", kw),
+                    Applicability::MachineApplicable,
                 );
-                return Err(err);
-            } else if self.look_ahead(1, |t| *t == token::OpenDelim(token::Paren)) {
-                let ident = self.parse_ident().unwrap();
-                self.bump(); // `(`
-                let kw_name = self.recover_first_param();
-                self.consume_block(token::Paren, ConsumeClosingDelim::Yes);
-                let (kw, kw_name, ambiguous) = if self.check(&token::RArrow) {
-                    self.eat_to_tokens(&[&token::OpenDelim(token::Brace)]);
-                    self.bump(); // `{`
-                    ("fn", kw_name, false)
-                } else if self.check(&token::OpenDelim(token::Brace)) {
-                    self.bump(); // `{`
-                    ("fn", kw_name, false)
-                } else if self.check(&token::Colon) {
-                    let kw = "struct";
-                    (kw, kw, false)
-                } else {
-                    ("fn` or `struct", "function or struct", true)
-                };
-
-                let msg = format!("missing `{}` for {} definition", kw, kw_name);
-                let mut err = self.struct_span_err(sp, &msg);
-                if !ambiguous {
-                    self.consume_block(token::Brace, ConsumeClosingDelim::Yes);
-                    let suggestion =
-                        format!("add `{}` here to parse `{}` as a public {}", kw, ident, kw_name);
-                    err.span_suggestion_short(
-                        sp,
-                        &suggestion,
-                        format!(" {} ", kw),
-                        Applicability::MachineApplicable,
+            } else {
+                if let Ok(snippet) = self.span_to_snippet(ident_sp) {
+                    err.span_suggestion(
+                        full_sp,
+                        "if you meant to call a macro, try",
+                        format!("{}!", snippet),
+                        // this is the `ambiguous` conditional branch
+                        Applicability::MaybeIncorrect,
                     );
                 } else {
-                    if let Ok(snippet) = self.span_to_snippet(ident_sp) {
-                        err.span_suggestion(
-                            full_sp,
-                            "if you meant to call a macro, try",
-                            format!("{}!", snippet),
-                            // this is the `ambiguous` conditional branch
-                            Applicability::MaybeIncorrect,
-                        );
-                    } else {
-                        err.help(
-                            "if you meant to call a macro, remove the `pub` \
+                    err.help(
+                        "if you meant to call a macro, remove the `pub` \
                                   and add a trailing `!` after the identifier",
-                        );
-                    }
-                }
-                return Err(err);
-            } else if self.look_ahead(1, |t| *t == token::Lt) {
-                let ident = self.parse_ident().unwrap();
-                self.eat_to_tokens(&[&token::Gt]);
-                self.bump(); // `>`
-                let (kw, kw_name, ambiguous) = if self.eat(&token::OpenDelim(token::Paren)) {
-                    ("fn", self.recover_first_param(), false)
-                } else if self.check(&token::OpenDelim(token::Brace)) {
-                    ("struct", "struct", false)
-                } else {
-                    ("fn` or `struct", "function or struct", true)
-                };
-                let msg = format!("missing `{}` for {} definition", kw, kw_name);
-                let mut err = self.struct_span_err(sp, &msg);
-                if !ambiguous {
-                    err.span_suggestion_short(
-                        sp,
-                        &format!("add `{}` here to parse `{}` as a public {}", kw, ident, kw_name),
-                        format!(" {} ", kw),
-                        Applicability::MachineApplicable,
                     );
                 }
-                return Err(err);
             }
-        }
-        self.parse_macro_use_or_failure(attrs, macros_allowed, attributes_allowed, lo, vis)
-    }
-
-    pub(super) fn mk_item_with_info(
-        &self,
-        attrs: Vec<Attribute>,
-        lo: Span,
-        vis: Visibility,
-        info: ItemInfo,
-    ) -> PResult<'a, Option<P<Item>>> {
-        let (ident, item, extra_attrs) = info;
-        let span = lo.to(self.prev_span);
-        let attrs = Self::maybe_append(attrs, extra_attrs);
-        Ok(Some(self.mk_item(span, ident, item, vis, attrs)))
-    }
-
-    fn maybe_append<T>(mut lhs: Vec<T>, mut rhs: Option<Vec<T>>) -> Vec<T> {
-        if let Some(ref mut rhs) = rhs {
-            lhs.append(rhs);
-        }
-        lhs
-    }
-
-    /// This is the fall-through for parsing items.
-    fn parse_macro_use_or_failure(
-        &mut self,
-        attrs: Vec<Attribute>,
-        macros_allowed: bool,
-        attributes_allowed: bool,
-        lo: Span,
-        visibility: Visibility,
-    ) -> PResult<'a, Option<P<Item>>> {
-        if macros_allowed
-            && self.token.is_path_start()
-            && !(self.is_async_fn() && self.token.span.rust_2015())
-        {
-            // MACRO INVOCATION ITEM
-
-            let prev_span = self.prev_span;
-            self.complain_if_pub_macro(&visibility.node, prev_span);
-
-            // Item macro
-            let path = self.parse_path(PathStyle::Mod)?;
-            self.expect(&token::Not)?;
-            let args = self.parse_mac_args()?;
-            if args.need_semicolon() && !self.eat(&token::Semi) {
-                self.report_invalid_macro_expansion_item();
+            return Err(err);
+        } else if self.look_ahead(1, |t| *t == token::Lt) {
+            let ident = self.parse_ident().unwrap();
+            self.eat_to_tokens(&[&token::Gt]);
+            self.bump(); // `>`
+            let (kw, kw_name, ambiguous) = if self.eat(&token::OpenDelim(token::Paren)) {
+                ("fn", self.recover_first_param(), false)
+            } else if self.check(&token::OpenDelim(token::Brace)) {
+                ("struct", "struct", false)
+            } else {
+                ("fn` or `struct", "function or struct", true)
+            };
+            let msg = format!("missing `{}` for {} definition", kw, kw_name);
+            let mut err = self.struct_span_err(sp, &msg);
+            if !ambiguous {
+                err.span_suggestion_short(
+                    sp,
+                    &format!("add `{}` here to parse `{}` as a public {}", kw, ident, kw_name),
+                    format!(" {} ", kw),
+                    Applicability::MachineApplicable,
+                );
             }
-
-            let hi = self.prev_span;
-            let mac = Mac { path, args, prior_type_ascription: self.last_type_ascription };
-            let item =
-                self.mk_item(lo.to(hi), Ident::invalid(), ItemKind::Mac(mac), visibility, attrs);
-            return Ok(Some(item));
-        }
-
-        // FAILURE TO PARSE ITEM
-        match visibility.node {
-            VisibilityKind::Inherited => {}
-            _ => return Err(self.struct_span_err(self.prev_span, "unmatched visibility `pub`")),
+            return Err(err);
+        } else {
+            Ok(())
         }
+    }
 
-        if !attributes_allowed && !attrs.is_empty() {
-            self.expected_item_err(&attrs)?;
-        }
-        Ok(None)
+    /// Parses an item macro, e.g., `item!();`.
+    fn parse_item_macro(&mut self, vis: &Visibility) -> PResult<'a, Mac> {
+        let path = self.parse_path(PathStyle::Mod)?; // `foo::bar`
+        self.expect(&token::Not)?; // `!`
+        let args = self.parse_mac_args()?; // `( .. )` or `[ .. ]` (followed by `;`), or `{ .. }`.
+        self.eat_semi_for_macro_if_needed(&args);
+        self.complain_if_pub_macro(vis, false);
+        Ok(Mac { path, args, prior_type_ascription: self.last_type_ascription })
     }
 
-    /// Emits an expected-item-after-attributes error.
-    fn expected_item_err(&mut self, attrs: &[Attribute]) -> PResult<'a, ()> {
-        let message = match attrs.last() {
-            Some(&Attribute { kind: AttrKind::DocComment(_), .. }) => {
-                "expected item after doc comment"
-            }
-            _ => "expected item after attributes",
+    /// Recover if we parsed attributes and expected an item but there was none.
+    fn recover_attrs_no_item(&mut self, attrs: &[Attribute]) -> PResult<'a, ()> {
+        let (start, end) = match attrs {
+            [] => return Ok(()),
+            [x0] => (x0, x0),
+            [x0, .., xn] => (x0, xn),
         };
-
-        let mut err = self.struct_span_err(self.prev_span, message);
-        if attrs.last().unwrap().is_doc_comment() {
-            err.span_label(self.prev_span, "this doc comment doesn't document anything");
+        let msg = if end.is_doc_comment() {
+            "expected item after doc comment"
+        } else {
+            "expected item after attributes"
+        };
+        let mut err = self.struct_span_err(end.span, msg);
+        if end.is_doc_comment() {
+            err.span_label(end.span, "this doc comment doesn't document anything");
+        }
+        if let [.., penultimate, _] = attrs {
+            err.span_label(start.span.to(penultimate.span), "other attributes here");
         }
         Err(err)
     }
 
-    pub(super) fn is_async_fn(&self) -> bool {
+    fn is_async_fn(&self) -> bool {
         self.token.is_keyword(kw::Async) && self.is_keyword_ahead(1, &[kw::Fn])
     }
 
-    /// Parses a macro invocation inside a `trait`, `impl` or `extern` block.
-    fn parse_assoc_macro_invoc(
-        &mut self,
-        item_kind: &str,
-        vis: Option<&Visibility>,
-        at_end: &mut bool,
-    ) -> PResult<'a, Option<Mac>> {
-        if self.token.is_path_start() && !(self.is_async_fn() && self.token.span.rust_2015()) {
-            let prev_span = self.prev_span;
-            let path = self.parse_path(PathStyle::Mod)?;
-
-            if path.segments.len() == 1 {
-                if !self.eat(&token::Not) {
-                    return Err(self.missing_assoc_item_kind_err(item_kind, prev_span));
-                }
-            } else {
-                self.expect(&token::Not)?;
-            }
-
-            if let Some(vis) = vis {
-                self.complain_if_pub_macro(&vis.node, prev_span);
-            }
-
-            *at_end = true;
-
-            // eat a matched-delimiter token tree:
-            let args = self.parse_mac_args()?;
-            if args.need_semicolon() {
-                self.expect_semi()?;
-            }
-
-            Ok(Some(Mac { path, args, prior_type_ascription: self.last_type_ascription }))
-        } else {
-            Ok(None)
-        }
-    }
-
-    fn missing_assoc_item_kind_err(
-        &self,
-        item_type: &str,
-        prev_span: Span,
-    ) -> DiagnosticBuilder<'a> {
-        let expected_kinds = if item_type == "extern" {
-            "missing `fn`, `type`, or `static`"
-        } else {
-            "missing `fn`, `type`, or `const`"
-        };
-
-        // Given this code `path(`, it seems like this is not
-        // setting the visibility of a macro invocation, but rather
-        // a mistyped method declaration.
-        // Create a diagnostic pointing out that `fn` is missing.
-        //
-        // x |     pub path(&self) {
-        //   |        ^ missing `fn`, `type`, or `const`
-        //     pub  path(
-        //        ^^ `sp` below will point to this
-        let sp = prev_span.between(self.prev_span);
-        let mut err = self
-            .struct_span_err(sp, &format!("{} for {}-item declaration", expected_kinds, item_type));
-        err.span_label(sp, expected_kinds);
-        err
-    }
-
-    /// Parses an implementation item, `impl` keyword is already parsed.
+    /// Parses an implementation item.
     ///
-    ///    impl<'a, T> TYPE { /* impl items */ }
-    ///    impl<'a, T> TRAIT for TYPE { /* impl items */ }
-    ///    impl<'a, T> !TRAIT for TYPE { /* impl items */ }
-    ///    impl<'a, T> const TRAIT for TYPE { /* impl items */ }
+    /// ```
+    /// impl<'a, T> TYPE { /* impl items */ }
+    /// impl<'a, T> TRAIT for TYPE { /* impl items */ }
+    /// impl<'a, T> !TRAIT for TYPE { /* impl items */ }
+    /// impl<'a, T> const TRAIT for TYPE { /* impl items */ }
+    /// ```
     ///
     /// We actually parse slightly more relaxed grammar for better error reporting and recovery.
-    ///   `impl` GENERICS `const`? `!`? TYPE `for`? (TYPE | `..`) (`where` PREDICATES)? `{` BODY `}`
-    ///   `impl` GENERICS `const`? `!`? TYPE (`where` PREDICATES)? `{` BODY `}`
+    /// ```
+    /// "impl" GENERICS "const"? "!"? TYPE "for"? (TYPE | "..") ("where" PREDICATES)? "{" BODY "}"
+    /// "impl" GENERICS "const"? "!"? TYPE ("where" PREDICATES)? "{" BODY "}"
+    /// ```
     fn parse_item_impl(
         &mut self,
-        unsafety: Unsafety,
+        attrs: &mut Vec<Attribute>,
         defaultness: Defaultness,
     ) -> PResult<'a, ItemInfo> {
+        let unsafety = self.parse_unsafety();
+        self.expect_keyword(kw::Impl)?;
+
         // First, parse generic parameters if necessary.
         let mut generics = if self.choose_generics_over_qpath() {
             self.parse_generics()?
@@ -558,17 +403,14 @@ impl<'a> Parser<'a> {
             let mut generics = Generics::default();
             // impl A for B {}
             //    /\ this is where `generics.span` should point when there are no type params.
-            generics.span = self.prev_span.shrink_to_hi();
+            generics.span = self.prev_token.span.shrink_to_hi();
             generics
         };
 
-        let constness = if self.eat_keyword(kw::Const) {
-            let span = self.prev_span;
+        let constness = self.parse_constness();
+        if let Const::Yes(span) = constness {
             self.sess.gated_spans.gate(sym::const_trait_impl, span);
-            Constness::Const
-        } else {
-            Constness::NotConst
-        };
+        }
 
         // Disambiguate `impl !Trait for Type { ... }` and `impl ! { ... }` for the never type.
         let polarity = if self.check(&token::Not) && self.look_ahead(1, |t| t.can_begin_type()) {
@@ -582,7 +424,7 @@ impl<'a> Parser<'a> {
         let err_path = |span| ast::Path::from_ident(Ident::new(kw::Invalid, span));
         let ty_first = if self.token.is_keyword(kw::For) && self.look_ahead(1, |t| t != &token::Lt)
         {
-            let span = self.prev_span.between(self.token.span);
+            let span = self.prev_token.span.between(self.token.span);
             self.struct_span_err(span, "missing trait in a trait impl").emit();
             P(Ty { kind: TyKind::Path(None, err_path(span)), span, id: DUMMY_NODE_ID })
         } else {
@@ -591,12 +433,12 @@ impl<'a> Parser<'a> {
 
         // If `for` is missing we try to recover.
         let has_for = self.eat_keyword(kw::For);
-        let missing_for_span = self.prev_span.between(self.token.span);
+        let missing_for_span = self.prev_token.span.between(self.token.span);
 
         let ty_second = if self.token == token::DotDot {
             // We need to report this error after `cfg` expansion for compatibility reasons
             self.bump(); // `..`, do not add it to expected tokens
-            Some(self.mk_ty(self.prev_span, TyKind::Err))
+            Some(self.mk_ty(self.prev_token.span, TyKind::Err))
         } else if has_for || self.token.can_begin_type() {
             Some(self.parse_ty()?)
         } else {
@@ -605,7 +447,7 @@ impl<'a> Parser<'a> {
 
         generics.where_clause = self.parse_where_clause()?;
 
-        let (impl_items, attrs) = self.parse_impl_body()?;
+        let impl_items = self.parse_item_list(attrs, |p| p.parse_impl_item())?;
 
         let item_kind = match ty_second {
             Some(ty_second) => {
@@ -658,57 +500,97 @@ impl<'a> Parser<'a> {
             }
         };
 
-        Ok((Ident::invalid(), item_kind, Some(attrs)))
+        Ok((Ident::invalid(), item_kind))
     }
 
-    fn parse_impl_body(&mut self) -> PResult<'a, (Vec<AssocItem>, Vec<Attribute>)> {
+    fn parse_item_list<T>(
+        &mut self,
+        attrs: &mut Vec<Attribute>,
+        mut parse_item: impl FnMut(&mut Parser<'a>) -> PResult<'a, Option<Option<T>>>,
+    ) -> PResult<'a, Vec<T>> {
+        let open_brace_span = self.token.span;
         self.expect(&token::OpenDelim(token::Brace))?;
-        let attrs = self.parse_inner_attributes()?;
+        attrs.append(&mut self.parse_inner_attributes()?);
 
-        let mut impl_items = Vec::new();
+        let mut items = Vec::new();
         while !self.eat(&token::CloseDelim(token::Brace)) {
-            let mut at_end = false;
-            match self.parse_impl_item(&mut at_end) {
-                Ok(impl_item) => impl_items.push(impl_item),
+            if self.recover_doc_comment_before_brace() {
+                continue;
+            }
+            match parse_item(self) {
+                Ok(None) => {
+                    // We have to bail or we'll potentially never make progress.
+                    let non_item_span = self.token.span;
+                    self.consume_block(token::Brace, ConsumeClosingDelim::Yes);
+                    self.struct_span_err(non_item_span, "non-item in item list")
+                        .span_label(open_brace_span, "item list starts here")
+                        .span_label(non_item_span, "non-item starts here")
+                        .span_label(self.prev_token.span, "item list ends here")
+                        .emit();
+                    break;
+                }
+                Ok(Some(item)) => items.extend(item),
                 Err(mut err) => {
-                    err.emit();
-                    if !at_end {
-                        self.consume_block(token::Brace, ConsumeClosingDelim::Yes);
-                        break;
-                    }
+                    self.consume_block(token::Brace, ConsumeClosingDelim::Yes);
+                    err.span_label(open_brace_span, "while parsing this item list starting here")
+                        .span_label(self.prev_token.span, "the item list ends here")
+                        .emit();
+                    break;
                 }
             }
         }
-        Ok((impl_items, attrs))
+        Ok(items)
+    }
+
+    /// Recover on a doc comment before `}`.
+    fn recover_doc_comment_before_brace(&mut self) -> bool {
+        if let token::DocComment(_) = self.token.kind {
+            if self.look_ahead(1, |tok| tok == &token::CloseDelim(token::Brace)) {
+                struct_span_err!(
+                    self.diagnostic(),
+                    self.token.span,
+                    E0584,
+                    "found a documentation comment that doesn't document anything",
+                )
+                .span_label(self.token.span, "this doc comment doesn't document anything")
+                .help(
+                    "doc comments must come before what they document, maybe a \
+                    comment was intended with `//`?",
+                )
+                .emit();
+                self.bump();
+                return true;
+            }
+        }
+        false
     }
 
     /// Parses defaultness (i.e., `default` or nothing).
     fn parse_defaultness(&mut self) -> Defaultness {
-        // `pub` is included for better error messages
+        // We are interested in `default` followed by another identifier.
+        // However, we must avoid keywords that occur as binary operators.
+        // Currently, the only applicable keyword is `as` (`default as Ty`).
         if self.check_keyword(kw::Default)
-            && self.is_keyword_ahead(
-                1,
-                &[
-                    kw::Impl,
-                    kw::Const,
-                    kw::Async,
-                    kw::Fn,
-                    kw::Unsafe,
-                    kw::Extern,
-                    kw::Type,
-                    kw::Pub,
-                ],
-            )
+            && self.look_ahead(1, |t| t.is_non_raw_ident_where(|i| i.name != kw::As))
         {
             self.bump(); // `default`
-            Defaultness::Default
+            Defaultness::Default(self.prev_token.uninterpolated_span())
         } else {
             Defaultness::Final
         }
     }
 
-    /// Parses `auto? trait Foo { ... }` or `trait Foo = Bar;`.
-    fn parse_item_trait(&mut self, lo: Span, unsafety: Unsafety) -> PResult<'a, ItemInfo> {
+    /// Is this an `(unsafe auto? | auto) trait` item?
+    fn check_auto_or_unsafe_trait_item(&mut self) -> bool {
+        // auto trait
+        self.check_keyword(kw::Auto) && self.is_keyword_ahead(1, &[kw::Trait])
+            // unsafe auto trait
+            || self.check_keyword(kw::Unsafe) && self.is_keyword_ahead(1, &[kw::Trait, kw::Auto])
+    }
+
+    /// Parses `unsafe? auto? trait Foo { ... }` or `trait Foo = Bar;`.
+    fn parse_item_trait(&mut self, attrs: &mut Vec<Attribute>, lo: Span) -> PResult<'a, ItemInfo> {
+        let unsafety = self.parse_unsafety();
         // Parse optional `auto` prefix.
         let is_auto = if self.eat_keyword(kw::Auto) { IsAuto::Yes } else { IsAuto::No };
 
@@ -718,11 +600,14 @@ impl<'a> Parser<'a> {
 
         // Parse optional colon and supertrait bounds.
         let had_colon = self.eat(&token::Colon);
-        let span_at_colon = self.prev_span;
-        let bounds =
-            if had_colon { self.parse_generic_bounds(Some(self.prev_span))? } else { Vec::new() };
+        let span_at_colon = self.prev_token.span;
+        let bounds = if had_colon {
+            self.parse_generic_bounds(Some(self.prev_token.span))?
+        } else {
+            Vec::new()
+        };
 
-        let span_before_eq = self.prev_span;
+        let span_before_eq = self.prev_token.span;
         if self.eat(&token::Eq) {
             // It's a trait alias.
             if had_colon {
@@ -734,148 +619,59 @@ impl<'a> Parser<'a> {
             tps.where_clause = self.parse_where_clause()?;
             self.expect_semi()?;
 
-            let whole_span = lo.to(self.prev_span);
+            let whole_span = lo.to(self.prev_token.span);
             if is_auto == IsAuto::Yes {
                 let msg = "trait aliases cannot be `auto`";
                 self.struct_span_err(whole_span, msg).span_label(whole_span, msg).emit();
             }
-            if unsafety != Unsafety::Normal {
+            if let Unsafe::Yes(_) = unsafety {
                 let msg = "trait aliases cannot be `unsafe`";
                 self.struct_span_err(whole_span, msg).span_label(whole_span, msg).emit();
             }
 
             self.sess.gated_spans.gate(sym::trait_alias, whole_span);
 
-            Ok((ident, ItemKind::TraitAlias(tps, bounds), None))
+            Ok((ident, ItemKind::TraitAlias(tps, bounds)))
         } else {
             // It's a normal trait.
             tps.where_clause = self.parse_where_clause()?;
-            self.expect(&token::OpenDelim(token::Brace))?;
-            let mut trait_items = vec![];
-            while !self.eat(&token::CloseDelim(token::Brace)) {
-                if let token::DocComment(_) = self.token.kind {
-                    if self.look_ahead(1, |tok| tok == &token::CloseDelim(token::Brace)) {
-                        struct_span_err!(
-                            self.diagnostic(),
-                            self.token.span,
-                            E0584,
-                            "found a documentation comment that doesn't document anything",
-                        )
-                        .help(
-                            "doc comments must come before what they document, maybe a \
-                            comment was intended with `//`?",
-                        )
-                        .emit();
-                        self.bump();
-                        continue;
-                    }
-                }
-                let mut at_end = false;
-                match self.parse_trait_item(&mut at_end) {
-                    Ok(item) => trait_items.push(item),
-                    Err(mut e) => {
-                        e.emit();
-                        if !at_end {
-                            self.consume_block(token::Brace, ConsumeClosingDelim::Yes);
-                            break;
-                        }
-                    }
-                }
-            }
-            Ok((ident, ItemKind::Trait(is_auto, unsafety, tps, bounds, trait_items), None))
+            let items = self.parse_item_list(attrs, |p| p.parse_trait_item())?;
+            Ok((ident, ItemKind::Trait(is_auto, unsafety, tps, bounds, items)))
         }
     }
 
-    pub fn parse_impl_item(&mut self, at_end: &mut bool) -> PResult<'a, AssocItem> {
-        maybe_whole!(self, NtImplItem, |x| x);
-        self.parse_assoc_item(at_end, |_| true)
+    pub fn parse_impl_item(&mut self) -> PResult<'a, Option<Option<P<AssocItem>>>> {
+        self.parse_assoc_item(|_| true)
     }
 
-    pub fn parse_trait_item(&mut self, at_end: &mut bool) -> PResult<'a, AssocItem> {
-        maybe_whole!(self, NtTraitItem, |x| x);
-        // This is somewhat dubious; We don't want to allow
-        // param names to be left off if there is a definition...
-        //
-        // We don't allow param names to be left off in edition 2018.
-        self.parse_assoc_item(at_end, |t| t.span.rust_2018())
+    pub fn parse_trait_item(&mut self) -> PResult<'a, Option<Option<P<AssocItem>>>> {
+        self.parse_assoc_item(|edition| edition >= Edition::Edition2018)
     }
 
     /// Parses associated items.
-    fn parse_assoc_item(
-        &mut self,
-        at_end: &mut bool,
-        is_name_required: fn(&token::Token) -> bool,
-    ) -> PResult<'a, AssocItem> {
-        let attrs = self.parse_outer_attributes()?;
-        let mut unclosed_delims = vec![];
-        let (mut item, tokens) = self.collect_tokens(|this| {
-            let item = this.parse_assoc_item_(at_end, attrs, is_name_required);
-            unclosed_delims.append(&mut this.unclosed_delims);
-            item
-        })?;
-        self.unclosed_delims.append(&mut unclosed_delims);
-        // See `parse_item` for why this clause is here.
-        if !item.attrs.iter().any(|attr| attr.style == AttrStyle::Inner) {
-            item.tokens = Some(tokens);
-        }
-        Ok(item)
-    }
-
-    fn parse_assoc_item_(
-        &mut self,
-        at_end: &mut bool,
-        mut attrs: Vec<Attribute>,
-        is_name_required: fn(&token::Token) -> bool,
-    ) -> PResult<'a, AssocItem> {
-        let lo = self.token.span;
-        let vis = self.parse_visibility(FollowedByType::No)?;
-        let defaultness = self.parse_defaultness();
-        let (name, kind, generics) = if self.eat_keyword(kw::Type) {
-            self.parse_assoc_ty()?
-        } else if self.is_const_item() {
-            self.parse_assoc_const()?
-        } else if let Some(mac) = self.parse_assoc_macro_invoc("associated", Some(&vis), at_end)? {
-            (Ident::invalid(), AssocItemKind::Macro(mac), Generics::default())
-        } else {
-            self.parse_assoc_fn(at_end, &mut attrs, is_name_required)?
-        };
-
-        Ok(AssocItem {
-            id: DUMMY_NODE_ID,
-            span: lo.to(self.prev_span),
-            ident: name,
-            attrs,
-            vis,
-            defaultness,
-            generics,
-            kind,
-            tokens: None,
-        })
-    }
-
-    /// Returns `true` if we are looking at `const ID`
-    /// (returns `false` for things like `const fn`, etc.).
-    fn is_const_item(&self) -> bool {
-        self.token.is_keyword(kw::Const) && !self.is_keyword_ahead(1, &[kw::Fn, kw::Unsafe])
-    }
-
-    /// This parses the grammar:
-    ///
-    ///     AssocConst = "const" Ident ":" Ty "=" Expr ";"
-    fn parse_assoc_const(&mut self) -> PResult<'a, (Ident, AssocItemKind, Generics)> {
-        self.expect_keyword(kw::Const)?;
-        let ident = self.parse_ident()?;
-        self.expect(&token::Colon)?;
-        let ty = self.parse_ty()?;
-        let expr = if self.eat(&token::Eq) { Some(self.parse_expr()?) } else { None };
-        self.expect_semi()?;
-        Ok((ident, AssocItemKind::Const(ty, expr), Generics::default()))
+    fn parse_assoc_item(&mut self, req_name: ReqName) -> PResult<'a, Option<Option<P<AssocItem>>>> {
+        Ok(self.parse_item_(req_name)?.map(|Item { attrs, id, span, vis, ident, kind, tokens }| {
+            let kind = match AssocItemKind::try_from(kind) {
+                Ok(kind) => kind,
+                Err(kind) => match kind {
+                    ItemKind::Static(a, _, b) => {
+                        self.struct_span_err(span, "associated `static` items are not allowed")
+                            .emit();
+                        AssocItemKind::Const(Defaultness::Final, a, b)
+                    }
+                    _ => return self.error_bad_item_kind(span, &kind, "`trait`s or `impl`s"),
+                },
+            };
+            Some(P(Item { attrs, id, span, vis, ident, kind, tokens }))
+        }))
     }
 
-    /// Parses the following grammar:
-    ///
-    ///     AssocTy = Ident ["<"...">"] [":" [GenericBounds]] ["where" ...] ["=" Ty]
-    fn parse_assoc_ty(&mut self) -> PResult<'a, (Ident, AssocItemKind, Generics)> {
+    /// Parses a `type` alias with the following grammar:
+    /// ```
+    /// TypeAlias = "type" Ident Generics {":" GenericBounds}? {"=" Ty}? ";" ;
+    /// ```
+    /// The `"type"` has already been eaten.
+    fn parse_type_alias(&mut self, def: Defaultness) -> PResult<'a, ItemInfo> {
         let ident = self.parse_ident()?;
         let mut generics = self.parse_generics()?;
 
@@ -887,7 +683,7 @@ impl<'a> Parser<'a> {
         let default = if self.eat(&token::Eq) { Some(self.parse_ty()?) } else { None };
         self.expect_semi()?;
 
-        Ok((ident, AssocItemKind::TyAlias(bounds, default), generics))
+        Ok((ident, ItemKind::TyAlias(def, generics, bounds, default)))
     }
 
     /// Parses a `UseTree`.
@@ -927,7 +723,7 @@ impl<'a> Parser<'a> {
             }
         };
 
-        Ok(UseTree { prefix, kind, span: lo.to(self.prev_span) })
+        Ok(UseTree { prefix, kind, span: lo.to(self.prev_token.span) })
     }
 
     /// Parses `*` or `{...}`.
@@ -954,11 +750,10 @@ impl<'a> Parser<'a> {
     }
 
     fn parse_ident_or_underscore(&mut self) -> PResult<'a, ast::Ident> {
-        match self.token.kind {
-            token::Ident(name, false) if name == kw::Underscore => {
-                let span = self.token.span;
+        match self.token.ident() {
+            Some((ident @ Ident { name: kw::Underscore, .. }, false)) => {
                 self.bump();
-                Ok(Ident::new(name, span))
+                Ok(ident)
             }
             _ => self.parse_ident(),
         }
@@ -972,12 +767,7 @@ impl<'a> Parser<'a> {
     /// extern crate foo;
     /// extern crate bar as foo;
     /// ```
-    fn parse_item_extern_crate(
-        &mut self,
-        lo: Span,
-        visibility: Visibility,
-        attrs: Vec<Attribute>,
-    ) -> PResult<'a, P<Item>> {
+    fn parse_item_extern_crate(&mut self) -> PResult<'a, ItemInfo> {
         // Accept `extern crate name-like-this` for better diagnostics
         let orig_name = self.parse_crate_name_with_dashes()?;
         let (item_name, orig_name) = if let Some(rename) = self.parse_rename()? {
@@ -986,9 +776,7 @@ impl<'a> Parser<'a> {
             (orig_name, None)
         };
         self.expect_semi()?;
-
-        let span = lo.to(self.prev_span);
-        Ok(self.mk_item(span, item_name, ItemKind::ExternCrate(orig_name), visibility, attrs))
+        Ok((item_name, ItemKind::ExternCrate(orig_name)))
     }
 
     fn parse_crate_name_with_dashes(&mut self) -> PResult<'a, ast::Ident> {
@@ -1009,7 +797,7 @@ impl<'a> Parser<'a> {
             // Do not include `-` as part of the expected tokens list.
             while self.eat(&dash) {
                 fixed_crate_name = true;
-                replacement.push((self.prev_span, "_".to_string()));
+                replacement.push((self.prev_token.span, "_".to_string()));
                 idents.push(self.parse_ident()?);
             }
         }
@@ -1031,8 +819,7 @@ impl<'a> Parser<'a> {
 
     /// Parses `extern` for foreign ABIs modules.
     ///
-    /// `extern` is expected to have been
-    /// consumed before calling this method.
+    /// `extern` is expected to have been consumed before calling this method.
     ///
     /// # Examples
     ///
@@ -1040,143 +827,47 @@ impl<'a> Parser<'a> {
     /// extern "C" {}
     /// extern {}
     /// ```
-    fn parse_item_foreign_mod(
-        &mut self,
-        lo: Span,
-        abi: Option<StrLit>,
-        visibility: Visibility,
-        mut attrs: Vec<Attribute>,
-        extern_sp: Span,
-    ) -> PResult<'a, P<Item>> {
-        self.expect(&token::OpenDelim(token::Brace))?;
-
-        attrs.extend(self.parse_inner_attributes()?);
-
-        let mut foreign_items = vec![];
-        while !self.eat(&token::CloseDelim(token::Brace)) {
-            foreign_items.push(self.parse_foreign_item(extern_sp)?);
-        }
-
-        let prev_span = self.prev_span;
-        let m = ast::ForeignMod { abi, items: foreign_items };
-        let invalid = Ident::invalid();
-        Ok(self.mk_item(lo.to(prev_span), invalid, ItemKind::ForeignMod(m), visibility, attrs))
+    fn parse_item_foreign_mod(&mut self, attrs: &mut Vec<Attribute>) -> PResult<'a, ItemInfo> {
+        let abi = self.parse_abi(); // ABI?
+        let items = self.parse_item_list(attrs, |p| p.parse_foreign_item())?;
+        let module = ast::ForeignMod { abi, items };
+        Ok((Ident::invalid(), ItemKind::ForeignMod(module)))
     }
 
-    /// Parses a foreign item.
-    pub fn parse_foreign_item(&mut self, extern_sp: Span) -> PResult<'a, ForeignItem> {
-        maybe_whole!(self, NtForeignItem, |ni| ni);
-
-        let attrs = self.parse_outer_attributes()?;
-        let lo = self.token.span;
-        let visibility = self.parse_visibility(FollowedByType::No)?;
-
-        // FOREIGN STATIC ITEM
-        // Treat `const` as `static` for error recovery, but don't add it to expected tokens.
-        if self.check_keyword(kw::Static) || self.token.is_keyword(kw::Const) {
-            if self.token.is_keyword(kw::Const) {
-                let mut err =
-                    self.struct_span_err(self.token.span, "extern items cannot be `const`");
-
-                // The user wrote 'const fn'
-                if self.is_keyword_ahead(1, &[kw::Fn, kw::Unsafe]) {
-                    err.emit();
-                    // Consume `const`
-                    self.bump();
-                    // Consume `unsafe` if present, since `extern` blocks
-                    // don't allow it. This will leave behind a plain 'fn'
-                    self.eat_keyword(kw::Unsafe);
-                    // Treat 'const fn` as a plain `fn` for error recovery purposes.
-                    // We've already emitted an error, so compilation is guaranteed
-                    // to fail
-                    return Ok(self.parse_item_foreign_fn(visibility, lo, attrs, extern_sp)?);
-                }
-                err.span_suggestion(
-                    self.token.span,
-                    "try using a static value",
-                    "static".to_owned(),
-                    Applicability::MachineApplicable,
-                );
-                err.emit();
-            }
-            self.bump(); // `static` or `const`
-            return Ok(self.parse_item_foreign_static(visibility, lo, attrs)?);
-        }
-        // FOREIGN FUNCTION ITEM
-        if self.check_keyword(kw::Fn) {
-            return Ok(self.parse_item_foreign_fn(visibility, lo, attrs, extern_sp)?);
-        }
-        // FOREIGN TYPE ITEM
-        if self.check_keyword(kw::Type) {
-            return Ok(self.parse_item_foreign_type(visibility, lo, attrs)?);
-        }
-
-        match self.parse_assoc_macro_invoc("extern", Some(&visibility), &mut false)? {
-            Some(mac) => Ok(ForeignItem {
-                ident: Ident::invalid(),
-                span: lo.to(self.prev_span),
-                id: DUMMY_NODE_ID,
-                attrs,
-                vis: visibility,
-                kind: ForeignItemKind::Macro(mac),
-                tokens: None,
-            }),
-            None => {
-                if !attrs.is_empty() {
-                    self.expected_item_err(&attrs)?;
-                }
-
-                self.unexpected()
-            }
-        }
+    /// Parses a foreign item (one in an `extern { ... }` block).
+    pub fn parse_foreign_item(&mut self) -> PResult<'a, Option<Option<P<ForeignItem>>>> {
+        Ok(self.parse_item_(|_| true)?.map(|Item { attrs, id, span, vis, ident, kind, tokens }| {
+            let kind = match ForeignItemKind::try_from(kind) {
+                Ok(kind) => kind,
+                Err(kind) => match kind {
+                    ItemKind::Const(_, a, b) => {
+                        self.error_on_foreign_const(span, ident);
+                        ForeignItemKind::Static(a, Mutability::Not, b)
+                    }
+                    _ => return self.error_bad_item_kind(span, &kind, "`extern` blocks"),
+                },
+            };
+            Some(P(Item { attrs, id, span, vis, ident, kind, tokens }))
+        }))
     }
 
-    /// Parses a static item from a foreign module.
-    /// Assumes that the `static` keyword is already parsed.
-    fn parse_item_foreign_static(
-        &mut self,
-        vis: ast::Visibility,
-        lo: Span,
-        attrs: Vec<Attribute>,
-    ) -> PResult<'a, ForeignItem> {
-        let mutbl = self.parse_mutability();
-        let ident = self.parse_ident()?;
-        self.expect(&token::Colon)?;
-        let ty = self.parse_ty()?;
-        let hi = self.token.span;
-        self.expect_semi()?;
-        Ok(ForeignItem {
-            ident,
-            attrs,
-            kind: ForeignItemKind::Static(ty, mutbl),
-            id: DUMMY_NODE_ID,
-            span: lo.to(hi),
-            vis,
-            tokens: None,
-        })
+    fn error_bad_item_kind<T>(&self, span: Span, kind: &ItemKind, ctx: &str) -> Option<T> {
+        let span = self.sess.source_map().def_span(span);
+        let msg = format!("{} is not supported in {}", kind.descr(), ctx);
+        self.struct_span_err(span, &msg).emit();
+        return None;
     }
 
-    /// Parses a type from a foreign module.
-    fn parse_item_foreign_type(
-        &mut self,
-        vis: ast::Visibility,
-        lo: Span,
-        attrs: Vec<Attribute>,
-    ) -> PResult<'a, ForeignItem> {
-        self.expect_keyword(kw::Type)?;
-
-        let ident = self.parse_ident()?;
-        let hi = self.token.span;
-        self.expect_semi()?;
-        Ok(ast::ForeignItem {
-            ident,
-            attrs,
-            kind: ForeignItemKind::Ty,
-            id: DUMMY_NODE_ID,
-            span: lo.to(hi),
-            vis,
-            tokens: None,
-        })
+    fn error_on_foreign_const(&self, span: Span, ident: Ident) {
+        self.struct_span_err(ident.span, "extern items cannot be `const`")
+            .span_suggestion(
+                span.with_hi(ident.span.lo()),
+                "try using a static value",
+                "static ".to_string(),
+                Applicability::MachineApplicable,
+            )
+            .note("for more information, visit https://doc.rust-lang.org/std/keyword.extern.html")
+            .emit();
     }
 
     fn is_static_global(&mut self) -> bool {
@@ -1196,34 +887,46 @@ impl<'a> Parser<'a> {
         }
     }
 
-    /// Parse `["const" | ("static" "mut"?)] $ident ":" $ty = $expr` with
+    /// Recover on `const mut` with `const` already eaten.
+    fn recover_const_mut(&mut self, const_span: Span) {
+        if self.eat_keyword(kw::Mut) {
+            let span = self.prev_token.span;
+            self.struct_span_err(span, "const globals cannot be mutable")
+                .span_label(span, "cannot be mutable")
+                .span_suggestion(
+                    const_span,
+                    "you might want to declare a static instead",
+                    "static".to_owned(),
+                    Applicability::MaybeIncorrect,
+                )
+                .emit();
+        }
+    }
+
+    /// Parse `["const" | ("static" "mut"?)] $ident ":" $ty (= $expr)?` with
     /// `["const" | ("static" "mut"?)]` already parsed and stored in `m`.
     ///
     /// When `m` is `"const"`, `$ident` may also be `"_"`.
-    fn parse_item_const(&mut self, m: Option<Mutability>) -> PResult<'a, ItemInfo> {
+    fn parse_item_global(
+        &mut self,
+        m: Option<Mutability>,
+    ) -> PResult<'a, (Ident, P<Ty>, Option<P<ast::Expr>>)> {
         let id = if m.is_none() { self.parse_ident_or_underscore() } else { self.parse_ident() }?;
 
         // Parse the type of a `const` or `static mut?` item.
         // That is, the `":" $ty` fragment.
-        let ty = if self.token == token::Eq {
-            self.recover_missing_const_type(id, m)
-        } else {
-            // Not `=` so expect `":"" $ty` as usual.
-            self.expect(&token::Colon)?;
+        let ty = if self.eat(&token::Colon) {
             self.parse_ty()?
+        } else {
+            self.recover_missing_const_type(id, m)
         };
 
-        self.expect(&token::Eq)?;
-        let e = self.parse_expr()?;
+        let expr = if self.eat(&token::Eq) { Some(self.parse_expr()?) } else { None };
         self.expect_semi()?;
-        let item = match m {
-            Some(m) => ItemKind::Static(ty, m, e),
-            None => ItemKind::Const(ty, e),
-        };
-        Ok((id, item, None))
+        Ok((id, ty, expr))
     }
 
-    /// We were supposed to parse `:` but instead, we're already at `=`.
+    /// We were supposed to parse `:` but the `:` was missing.
     /// This means that the type is missing.
     fn recover_missing_const_type(&mut self, id: Ident, m: Option<Mutability>) -> P<Ty> {
         // Construct the error and stash it away with the hope
@@ -1247,18 +950,6 @@ impl<'a> Parser<'a> {
         P(Ty { kind: TyKind::Infer, span: id.span, id: ast::DUMMY_NODE_ID })
     }
 
-    /// Parses the grammar:
-    ///     Ident ["<"...">"] ["where" ...] ("=" | ":") Ty ";"
-    fn parse_type_alias(&mut self) -> PResult<'a, (Ident, P<Ty>, Generics)> {
-        let ident = self.parse_ident()?;
-        let mut tps = self.parse_generics()?;
-        tps.where_clause = self.parse_where_clause()?;
-        self.expect(&token::Eq)?;
-        let ty = self.parse_ty()?;
-        self.expect_semi()?;
-        Ok((ident, ty, tps))
-    }
-
     /// Parses an enum declaration.
     fn parse_item_enum(&mut self) -> PResult<'a, ItemInfo> {
         let id = self.parse_ident()?;
@@ -1273,7 +964,7 @@ impl<'a> Parser<'a> {
 
         let enum_definition =
             EnumDef { variants: variants.into_iter().filter_map(|v| v).collect() };
-        Ok((id, ItemKind::Enum(enum_definition, generics), None))
+        Ok((id, ItemKind::Enum(enum_definition, generics)))
     }
 
     fn parse_enum_variant(&mut self) -> PResult<'a, Option<Variant>> {
@@ -1306,7 +997,7 @@ impl<'a> Parser<'a> {
             attrs: variant_attrs,
             data: struct_def,
             disr_expr,
-            span: vlo.to(self.prev_span),
+            span: vlo.to(self.prev_token.span),
             is_placeholder: false,
         };
 
@@ -1367,7 +1058,7 @@ impl<'a> Parser<'a> {
             return Err(err);
         };
 
-        Ok((class_name, ItemKind::Struct(vdata, generics), None))
+        Ok((class_name, ItemKind::Struct(vdata, generics)))
     }
 
     /// Parses `union Foo { ... }`.
@@ -1391,12 +1082,7 @@ impl<'a> Parser<'a> {
             return Err(err);
         };
 
-        Ok((class_name, ItemKind::Union(vdata, generics), None))
-    }
-
-    pub(super) fn is_union_item(&self) -> bool {
-        self.token.is_keyword(kw::Union)
-            && self.look_ahead(1, |t| t.is_ident() && !t.is_reserved_ident())
+        Ok((class_name, ItemKind::Union(vdata, generics)))
     }
 
     fn parse_record_struct_body(
@@ -1478,19 +1164,19 @@ impl<'a> Parser<'a> {
             }
             token::CloseDelim(token::Brace) => {}
             token::DocComment(_) => {
-                let previous_span = self.prev_span;
+                let previous_span = self.prev_token.span;
                 let mut err = self.span_fatal_err(self.token.span, Error::UselessDocComment);
                 self.bump(); // consume the doc comment
                 let comma_after_doc_seen = self.eat(&token::Comma);
                 // `seen_comma` is always false, because we are inside doc block
                 // condition is here to make code more readable
-                if seen_comma == false && comma_after_doc_seen == true {
+                if !seen_comma && comma_after_doc_seen {
                     seen_comma = true;
                 }
                 if comma_after_doc_seen || self.token == token::CloseDelim(token::Brace) {
                     err.emit();
                 } else {
-                    if seen_comma == false {
+                    if !seen_comma {
                         let sp = self.sess.source_map().next_point(previous_span);
                         err.span_suggestion(
                             sp,
@@ -1503,7 +1189,7 @@ impl<'a> Parser<'a> {
                 }
             }
             _ => {
-                let sp = self.prev_span.shrink_to_hi();
+                let sp = self.prev_token.span.shrink_to_hi();
                 let mut err = self.struct_span_err(
                     sp,
                     &format!("expected `,`, or `}}`, found {}", super::token_descr(&self.token)),
@@ -1536,7 +1222,7 @@ impl<'a> Parser<'a> {
         self.expect(&token::Colon)?;
         let ty = self.parse_ty()?;
         Ok(StructField {
-            span: lo.to(self.prev_span),
+            span: lo.to(self.prev_token.span),
             ident: Some(name),
             vis,
             id: DUMMY_NODE_ID,
@@ -1546,124 +1232,127 @@ impl<'a> Parser<'a> {
         })
     }
 
-    pub(super) fn eat_macro_def(
-        &mut self,
-        attrs: &[Attribute],
-        vis: &Visibility,
-        lo: Span,
-    ) -> PResult<'a, Option<P<Item>>> {
-        let (ident, def) = if self.eat_keyword(kw::Macro) {
-            let ident = self.parse_ident()?;
-            let body = if self.check(&token::OpenDelim(token::Brace)) {
-                self.parse_mac_args()?
-            } else if self.check(&token::OpenDelim(token::Paren)) {
-                let params = self.parse_token_tree();
-                let pspan = params.span();
-                let body = if self.check(&token::OpenDelim(token::Brace)) {
-                    self.parse_token_tree()
-                } else {
-                    return self.unexpected();
-                };
-                let bspan = body.span();
-                let tokens = TokenStream::new(vec![
-                    params.into(),
-                    TokenTree::token(token::FatArrow, pspan.between(bspan)).into(),
-                    body.into(),
-                ]);
-                let dspan = DelimSpan::from_pair(pspan.shrink_to_lo(), bspan.shrink_to_hi());
-                P(MacArgs::Delimited(dspan, MacDelimiter::Brace, tokens))
-            } else {
+    /// Parses a declarative macro 2.0 definition.
+    /// The `macro` keyword has already been parsed.
+    /// ```
+    /// MacBody = "{" TOKEN_STREAM "}" ;
+    /// MacParams = "(" TOKEN_STREAM ")" ;
+    /// DeclMac = "macro" Ident MacParams? MacBody ;
+    /// ```
+    fn parse_item_decl_macro(&mut self, lo: Span) -> PResult<'a, ItemInfo> {
+        let ident = self.parse_ident()?;
+        let body = if self.check(&token::OpenDelim(token::Brace)) {
+            self.parse_mac_args()? // `MacBody`
+        } else if self.check(&token::OpenDelim(token::Paren)) {
+            let params = self.parse_token_tree(); // `MacParams`
+            let pspan = params.span();
+            if !self.check(&token::OpenDelim(token::Brace)) {
                 return self.unexpected();
-            };
+            }
+            let body = self.parse_token_tree(); // `MacBody`
+            // Convert `MacParams MacBody` into `{ MacParams => MacBody }`.
+            let bspan = body.span();
+            let arrow = TokenTree::token(token::FatArrow, pspan.between(bspan)); // `=>`
+            let tokens = TokenStream::new(vec![params.into(), arrow.into(), body.into()]);
+            let dspan = DelimSpan::from_pair(pspan.shrink_to_lo(), bspan.shrink_to_hi());
+            P(MacArgs::Delimited(dspan, MacDelimiter::Brace, tokens))
+        } else {
+            return self.unexpected();
+        };
+
+        self.sess.gated_spans.gate(sym::decl_macro, lo.to(self.prev_token.span));
+        Ok((ident, ItemKind::MacroDef(ast::MacroDef { body, legacy: false })))
+    }
 
-            (ident, ast::MacroDef { body, legacy: false })
-        } else if self.check_keyword(sym::macro_rules)
+    /// Is this unambiguously the start of a `macro_rules! foo` item defnition?
+    fn is_macro_rules_item(&mut self) -> bool {
+        self.check_keyword(kw::MacroRules)
             && self.look_ahead(1, |t| *t == token::Not)
             && self.look_ahead(2, |t| t.is_ident())
-        {
-            let prev_span = self.prev_span;
-            self.complain_if_pub_macro(&vis.node, prev_span);
-            self.bump();
-            self.bump();
-
-            let ident = self.parse_ident()?;
-            let body = self.parse_mac_args()?;
-            if body.need_semicolon() && !self.eat(&token::Semi) {
-                self.report_invalid_macro_expansion_item();
-            }
+    }
 
-            (ident, ast::MacroDef { body, legacy: true })
-        } else {
-            return Ok(None);
-        };
+    /// Parses a legacy `macro_rules! foo { ... }` declarative macro.
+    fn parse_item_macro_rules(&mut self, vis: &Visibility) -> PResult<'a, ItemInfo> {
+        self.expect_keyword(kw::MacroRules)?; // `macro_rules`
+        self.expect(&token::Not)?; // `!`
+
+        let ident = self.parse_ident()?;
+        let body = self.parse_mac_args()?;
+        self.eat_semi_for_macro_if_needed(&body);
+        self.complain_if_pub_macro(vis, true);
 
-        let span = lo.to(self.prev_span);
+        Ok((ident, ItemKind::MacroDef(ast::MacroDef { body, legacy: true })))
+    }
 
-        if !def.legacy {
-            self.sess.gated_spans.gate(sym::decl_macro, span);
+    /// Item macro invocations or `macro_rules!` definitions need inherited visibility.
+    /// If that's not the case, emit an error.
+    fn complain_if_pub_macro(&self, vis: &Visibility, macro_rules: bool) {
+        if let VisibilityKind::Inherited = vis.node {
+            return;
         }
 
-        Ok(Some(self.mk_item(span, ident, ItemKind::MacroDef(def), vis.clone(), attrs.to_vec())))
+        let vstr = pprust::vis_to_string(vis);
+        let vstr = vstr.trim_end();
+        if macro_rules {
+            let msg = format!("can't qualify macro_rules invocation with `{}`", vstr);
+            self.struct_span_err(vis.span, &msg)
+                .span_suggestion(
+                    vis.span,
+                    "try exporting the macro",
+                    "#[macro_export]".to_owned(),
+                    Applicability::MaybeIncorrect, // speculative
+                )
+                .emit();
+        } else {
+            self.struct_span_err(vis.span, "can't qualify macro invocation with `pub`")
+                .span_suggestion(
+                    vis.span,
+                    "remove the visibility",
+                    String::new(),
+                    Applicability::MachineApplicable,
+                )
+                .help(&format!("try adjusting the macro to put `{}` inside the invocation", vstr))
+                .emit();
+        }
     }
 
-    fn complain_if_pub_macro(&self, vis: &VisibilityKind, sp: Span) {
-        match *vis {
-            VisibilityKind::Inherited => {}
-            _ => {
-                let mut err = if self.token.is_keyword(sym::macro_rules) {
-                    let mut err =
-                        self.struct_span_err(sp, "can't qualify macro_rules invocation with `pub`");
-                    err.span_suggestion(
-                        sp,
-                        "try exporting the macro",
-                        "#[macro_export]".to_owned(),
-                        Applicability::MaybeIncorrect, // speculative
-                    );
-                    err
-                } else {
-                    let mut err =
-                        self.struct_span_err(sp, "can't qualify macro invocation with `pub`");
-                    err.help("try adjusting the macro to put `pub` inside the invocation");
-                    err
-                };
-                err.emit();
-            }
+    fn eat_semi_for_macro_if_needed(&mut self, args: &MacArgs) {
+        if args.need_semicolon() && !self.eat(&token::Semi) {
+            self.report_invalid_macro_expansion_item(args);
         }
     }
 
-    fn report_invalid_macro_expansion_item(&self) {
-        let has_close_delim = self
-            .sess
-            .source_map()
-            .span_to_snippet(self.prev_span)
-            .map(|s| s.ends_with(")") || s.ends_with("]"))
-            .unwrap_or(false);
-        let right_brace_span = if has_close_delim {
-            // it's safe to peel off one character only when it has the close delim
-            self.prev_span.with_lo(self.prev_span.hi() - BytePos(1))
-        } else {
-            self.prev_span.shrink_to_hi()
-        };
-
-        self.struct_span_err(
-            self.prev_span,
+    fn report_invalid_macro_expansion_item(&self, args: &MacArgs) {
+        let span = args.span().expect("undelimited macro call");
+        let mut err = self.struct_span_err(
+            span,
             "macros that expand to items must be delimited with braces or followed by a semicolon",
-        )
-        .multipart_suggestion(
-            "change the delimiters to curly braces",
-            vec![
-                (self.prev_span.with_hi(self.prev_span.lo() + BytePos(1)), "{".to_string()),
-                (right_brace_span, '}'.to_string()),
-            ],
-            Applicability::MaybeIncorrect,
-        )
-        .span_suggestion(
-            self.prev_span.shrink_to_hi(),
+        );
+        if self.unclosed_delims.is_empty() {
+            let DelimSpan { open, close } = match args {
+                MacArgs::Empty | MacArgs::Eq(..) => unreachable!(),
+                MacArgs::Delimited(dspan, ..) => *dspan,
+            };
+            err.multipart_suggestion(
+                "change the delimiters to curly braces",
+                vec![(open, "{".to_string()), (close, '}'.to_string())],
+                Applicability::MaybeIncorrect,
+            );
+        } else {
+            err.span_suggestion(
+                span,
+                "change the delimiters to curly braces",
+                " { /* items */ }".to_string(),
+                Applicability::HasPlaceholders,
+            );
+        }
+        err.span_suggestion(
+            span.shrink_to_hi(),
             "add a semicolon",
             ';'.to_string(),
             Applicability::MaybeIncorrect,
-        )
-        .emit();
+        );
+        err.emit();
     }
 
     /// Checks if current token is one of tokens which cannot be nested like `kw::Enum`. In case
@@ -1694,141 +1383,94 @@ impl<'a> Parser<'a> {
         }
         Ok(true)
     }
-
-    fn mk_item(
-        &self,
-        span: Span,
-        ident: Ident,
-        kind: ItemKind,
-        vis: Visibility,
-        attrs: Vec<Attribute>,
-    ) -> P<Item> {
-        P(Item { ident, attrs, id: DUMMY_NODE_ID, kind, vis, span, tokens: None })
-    }
 }
 
 /// The parsing configuration used to parse a parameter list (see `parse_fn_params`).
-pub(super) struct ParamCfg {
-    /// Is `self` is allowed as the first parameter?
-    pub is_self_allowed: bool,
-    /// `is_name_required` decides if, per-parameter,
-    /// the parameter must have a pattern or just a type.
-    pub is_name_required: fn(&token::Token) -> bool,
-}
+///
+/// The function decides if, per-parameter `p`, `p` must have a pattern or just a type.
+type ReqName = fn(Edition) -> bool;
 
 /// Parsing of functions and methods.
 impl<'a> Parser<'a> {
-    /// Parses an item-position function declaration.
-    fn parse_item_fn(
-        &mut self,
-        lo: Span,
-        vis: Visibility,
-        attrs: Vec<Attribute>,
-        header: FnHeader,
-    ) -> PResult<'a, Option<P<Item>>> {
-        let (ident, decl, generics) =
-            self.parse_fn_sig(ParamCfg { is_self_allowed: false, is_name_required: |_| true })?;
-        let (inner_attrs, body) = self.parse_inner_attrs_and_block()?;
-        let kind = ItemKind::Fn(FnSig { decl, header }, generics, body);
-        self.mk_item_with_info(attrs, lo, vis, (ident, kind, Some(inner_attrs)))
-    }
-
-    /// Parses a function declaration from a foreign module.
-    fn parse_item_foreign_fn(
-        &mut self,
-        vis: ast::Visibility,
-        lo: Span,
-        attrs: Vec<Attribute>,
-        extern_sp: Span,
-    ) -> PResult<'a, ForeignItem> {
-        self.expect_keyword(kw::Fn)?;
-        let (ident, decl, generics) =
-            self.parse_fn_sig(ParamCfg { is_self_allowed: false, is_name_required: |_| true })?;
-        let span = lo.to(self.token.span);
-        self.parse_semi_or_incorrect_foreign_fn_body(&ident, extern_sp)?;
-        Ok(ast::ForeignItem {
-            ident,
-            attrs,
-            kind: ForeignItemKind::Fn(decl, generics),
-            id: DUMMY_NODE_ID,
-            span,
-            vis,
-            tokens: None,
-        })
-    }
-
-    fn parse_assoc_fn(
+    /// Parse a function starting from the front matter (`const ...`) to the body `{ ... }` or `;`.
+    fn parse_fn(
         &mut self,
-        at_end: &mut bool,
         attrs: &mut Vec<Attribute>,
-        is_name_required: fn(&token::Token) -> bool,
-    ) -> PResult<'a, (Ident, AssocItemKind, Generics)> {
-        let header = self.parse_fn_front_matter()?;
-        let (ident, decl, generics) =
-            self.parse_fn_sig(ParamCfg { is_self_allowed: true, is_name_required })?;
-        let sig = FnSig { header, decl };
-        let body = self.parse_assoc_fn_body(at_end, attrs)?;
-        Ok((ident, AssocItemKind::Fn(sig, body), generics))
+        req_name: ReqName,
+    ) -> PResult<'a, (Ident, FnSig, Generics, Option<P<Block>>)> {
+        let header = self.parse_fn_front_matter()?; // `const ... fn`
+        let ident = self.parse_ident()?; // `foo`
+        let mut generics = self.parse_generics()?; // `<'a, T, ...>`
+        let decl = self.parse_fn_decl(req_name, AllowPlus::Yes)?; // `(p: u8, ...)`
+        generics.where_clause = self.parse_where_clause()?; // `where T: Ord`
+        let body = self.parse_fn_body(attrs)?; // `;` or `{ ... }`.
+        Ok((ident, FnSig { header, decl }, generics, body))
     }
 
-    /// Parse the "body" of a method in an associated item definition.
+    /// Parse the "body" of a function.
     /// This can either be `;` when there's no body,
-    /// or e.g. a block when the method is a provided one.
-    fn parse_assoc_fn_body(
-        &mut self,
-        at_end: &mut bool,
-        attrs: &mut Vec<Attribute>,
-    ) -> PResult<'a, Option<P<Block>>> {
-        Ok(match self.token.kind {
+    /// or e.g. a block when the function is a provided one.
+    fn parse_fn_body(&mut self, attrs: &mut Vec<Attribute>) -> PResult<'a, Option<P<Block>>> {
+        let (inner_attrs, body) = match self.token.kind {
             token::Semi => {
-                debug!("parse_assoc_fn_body(): parsing required method");
                 self.bump();
-                *at_end = true;
-                None
+                (Vec::new(), None)
             }
             token::OpenDelim(token::Brace) => {
-                debug!("parse_assoc_fn_body(): parsing provided method");
-                *at_end = true;
-                let (inner_attrs, body) = self.parse_inner_attrs_and_block()?;
-                attrs.extend(inner_attrs.iter().cloned());
-                Some(body)
+                let (attrs, body) = self.parse_inner_attrs_and_block()?;
+                (attrs, Some(body))
             }
             token::Interpolated(ref nt) => match **nt {
                 token::NtBlock(..) => {
-                    *at_end = true;
-                    let (inner_attrs, body) = self.parse_inner_attrs_and_block()?;
-                    attrs.extend(inner_attrs.iter().cloned());
-                    Some(body)
+                    let (attrs, body) = self.parse_inner_attrs_and_block()?;
+                    (attrs, Some(body))
                 }
                 _ => return self.expected_semi_or_open_brace(),
             },
             _ => return self.expected_semi_or_open_brace(),
-        })
+        };
+        attrs.extend(inner_attrs);
+        Ok(body)
     }
 
-    /// Parses all the "front matter" for a `fn` declaration, up to
-    /// and including the `fn` keyword:
+    /// Is the current token the start of an `FnHeader` / not a valid parse?
+    fn check_fn_front_matter(&mut self) -> bool {
+        // We use an over-approximation here.
+        // `const const`, `fn const` won't parse, but we're not stepping over other syntax either.
+        const QUALS: [Symbol; 4] = [kw::Const, kw::Async, kw::Unsafe, kw::Extern];
+        self.check_keyword(kw::Fn) // Definitely an `fn`.
+            // `$qual fn` or `$qual $qual`:
+            || QUALS.iter().any(|&kw| self.check_keyword(kw))
+                && self.look_ahead(1, |t| {
+                    // ...qualified and then `fn`, e.g. `const fn`.
+                    t.is_keyword(kw::Fn)
+                    // Two qualifiers. This is enough. Due `async` we need to check that it's reserved.
+                    || t.is_non_raw_ident_where(|i| QUALS.contains(&i.name) && i.is_reserved())
+                })
+            // `extern ABI fn`
+            || self.check_keyword(kw::Extern)
+                && self.look_ahead(1, |t| t.can_begin_literal_maybe_minus())
+                && self.look_ahead(2, |t| t.is_keyword(kw::Fn))
+    }
+
+    /// Parses all the "front matter" (or "qualifiers") for a `fn` declaration,
+    /// up to and including the `fn` keyword. The formal grammar is:
     ///
-    /// - `const fn`
-    /// - `unsafe fn`
-    /// - `const unsafe fn`
-    /// - `extern fn`
-    /// - etc.
+    /// ```
+    /// Extern = "extern" StringLit ;
+    /// FnQual = "const"? "async"? "unsafe"? Extern? ;
+    /// FnFrontMatter = FnQual? "fn" ;
+    /// ```
     fn parse_fn_front_matter(&mut self) -> PResult<'a, FnHeader> {
-        let is_const_fn = self.eat_keyword(kw::Const);
-        let const_span = self.prev_span;
+        let constness = self.parse_constness();
         let asyncness = self.parse_asyncness();
-        if let IsAsync::Async { .. } = asyncness {
-            self.ban_async_in_2015(self.prev_span);
-        }
-        let asyncness = respan(self.prev_span, asyncness);
         let unsafety = self.parse_unsafety();
-        let (constness, unsafety, ext) = if is_const_fn {
-            (respan(const_span, Constness::Const), unsafety, Extern::None)
-        } else {
-            let ext = self.parse_extern()?;
-            (respan(self.prev_span, Constness::NotConst), unsafety, ext)
-        };
+        let ext = self.parse_extern()?;
+
+        if let Async::Yes { span, .. } = asyncness {
+            self.ban_async_in_2015(span);
+        }
+
         if !self.eat_keyword(kw::Fn) {
             // It is possible for `expect_one_of` to recover given the contents of
             // `self.expected_tokens`, therefore, do not use `self.unexpected()` which doesn't
@@ -1837,45 +1479,49 @@ impl<'a> Parser<'a> {
                 unreachable!()
             }
         }
+
         Ok(FnHeader { constness, unsafety, asyncness, ext })
     }
 
-    /// Parse the "signature", including the identifier, parameters, and generics of a function.
-    fn parse_fn_sig(&mut self, cfg: ParamCfg) -> PResult<'a, (Ident, P<FnDecl>, Generics)> {
-        let ident = self.parse_ident()?;
-        let mut generics = self.parse_generics()?;
-        let decl = self.parse_fn_decl(cfg, true)?;
-        generics.where_clause = self.parse_where_clause()?;
-        Ok((ident, decl, generics))
+    /// We are parsing `async fn`. If we are on Rust 2015, emit an error.
+    fn ban_async_in_2015(&self, span: Span) {
+        if span.rust_2015() {
+            let diag = self.diagnostic();
+            struct_span_err!(diag, span, E0670, "`async fn` is not permitted in the 2015 edition")
+                .note("to use `async fn`, switch to Rust 2018")
+                .help("set `edition = \"2018\"` in `Cargo.toml`")
+                .note("for more on editions, read https://doc.rust-lang.org/edition-guide")
+                .emit();
+        }
     }
 
     /// Parses the parameter list and result type of a function declaration.
     pub(super) fn parse_fn_decl(
         &mut self,
-        cfg: ParamCfg,
-        ret_allow_plus: bool,
+        req_name: ReqName,
+        ret_allow_plus: AllowPlus,
     ) -> PResult<'a, P<FnDecl>> {
         Ok(P(FnDecl {
-            inputs: self.parse_fn_params(cfg)?,
-            output: self.parse_ret_ty(ret_allow_plus, true)?,
+            inputs: self.parse_fn_params(req_name)?,
+            output: self.parse_ret_ty(ret_allow_plus, RecoverQPath::Yes)?,
         }))
     }
 
     /// Parses the parameter list of a function, including the `(` and `)` delimiters.
-    fn parse_fn_params(&mut self, mut cfg: ParamCfg) -> PResult<'a, Vec<Param>> {
-        let is_trait_item = cfg.is_self_allowed;
-        // Parse the arguments, starting out with `self` being possibly allowed...
+    fn parse_fn_params(&mut self, req_name: ReqName) -> PResult<'a, Vec<Param>> {
+        let mut first_param = true;
+        // Parse the arguments, starting out with `self` being allowed...
         let (mut params, _) = self.parse_paren_comma_seq(|p| {
-            let param = p.parse_param_general(&cfg, is_trait_item).or_else(|mut e| {
+            let param = p.parse_param_general(req_name, first_param).or_else(|mut e| {
                 e.emit();
-                let lo = p.prev_span;
+                let lo = p.prev_token.span;
                 // Skip every token until next possible arg or end.
                 p.eat_to_tokens(&[&token::Comma, &token::CloseDelim(token::Paren)]);
                 // Create a placeholder argument for proper arg count (issue #34264).
-                Ok(dummy_arg(Ident::new(kw::Invalid, lo.to(p.prev_span))))
+                Ok(dummy_arg(Ident::new(kw::Invalid, lo.to(p.prev_token.span))))
             });
             // ...now that we've parsed the first argument, `self` is no longer allowed.
-            cfg.is_self_allowed = false;
+            first_param = false;
             param
         })?;
         // Replace duplicated recovered params with `_` pattern to avoid unnecessary errors.
@@ -1883,39 +1529,33 @@ impl<'a> Parser<'a> {
         Ok(params)
     }
 
-    /// Skips unexpected attributes and doc comments in this position and emits an appropriate
-    /// error.
-    /// This version of parse param doesn't necessarily require identifier names.
-    fn parse_param_general(&mut self, cfg: &ParamCfg, is_trait_item: bool) -> PResult<'a, Param> {
+    /// Parses a single function parameter.
+    ///
+    /// - `self` is syntactically allowed when `first_param` holds.
+    fn parse_param_general(&mut self, req_name: ReqName, first_param: bool) -> PResult<'a, Param> {
         let lo = self.token.span;
         let attrs = self.parse_outer_attributes()?;
 
         // Possibly parse `self`. Recover if we parsed it and it wasn't allowed here.
         if let Some(mut param) = self.parse_self_param()? {
             param.attrs = attrs.into();
-            return if cfg.is_self_allowed {
-                Ok(param)
-            } else {
-                self.recover_bad_self_param(param, is_trait_item)
-            };
+            return if first_param { Ok(param) } else { self.recover_bad_self_param(param) };
         }
 
         let is_name_required = match self.token.kind {
             token::DotDotDot => false,
-            _ => (cfg.is_name_required)(&self.token),
+            // FIXME: Consider using interpolated token for this edition check,
+            // it should match the intent of edition hygiene better.
+            _ => req_name(self.token.uninterpolate().span.edition()),
         };
         let (pat, ty) = if is_name_required || self.is_named_param() {
             debug!("parse_param_general parse_pat (is_name_required:{})", is_name_required);
 
             let pat = self.parse_fn_param_pat()?;
             if let Err(mut err) = self.expect(&token::Colon) {
-                return if let Some(ident) = self.parameter_without_type(
-                    &mut err,
-                    pat,
-                    is_name_required,
-                    cfg.is_self_allowed,
-                    is_trait_item,
-                ) {
+                return if let Some(ident) =
+                    self.parameter_without_type(&mut err, pat, is_name_required, first_param)
+                {
                     err.emit();
                     Ok(dummy_arg(ident))
                 } else {
@@ -1940,7 +1580,7 @@ impl<'a> Parser<'a> {
             }
             match ty {
                 Ok(ty) => {
-                    let ident = Ident::new(kw::Invalid, self.prev_span);
+                    let ident = Ident::new(kw::Invalid, self.prev_token.span);
                     let bm = BindingMode::ByValue(Mutability::Not);
                     let pat = self.mk_pat_ident(ty.span, bm, ident);
                     (pat, ty)
@@ -1969,20 +1609,14 @@ impl<'a> Parser<'a> {
     }
 
     /// Returns the parsed optional self parameter and whether a self shortcut was used.
-    ///
-    /// See `parse_self_param_with_attrs` to collect attributes.
     fn parse_self_param(&mut self) -> PResult<'a, Option<Param>> {
         // Extract an identifier *after* having confirmed that the token is one.
-        let expect_self_ident = |this: &mut Self| {
-            match this.token.kind {
-                // Preserve hygienic context.
-                token::Ident(name, _) => {
-                    let span = this.token.span;
-                    this.bump();
-                    Ident::new(name, span)
-                }
-                _ => unreachable!(),
+        let expect_self_ident = |this: &mut Self| match this.token.ident() {
+            Some((ident, false)) => {
+                this.bump();
+                ident
             }
+            _ => unreachable!(),
         };
         // Is `self` `n` tokens ahead?
         let is_isolated_self = |this: &Self, n| {
@@ -1995,7 +1629,7 @@ impl<'a> Parser<'a> {
         // Parse `self` or `self: TYPE`. We already know the current token is `self`.
         let parse_self_possibly_typed = |this: &mut Self, m| {
             let eself_ident = expect_self_ident(this);
-            let eself_hi = this.prev_span;
+            let eself_hi = this.prev_token.span;
             let eself = if this.eat(&token::Colon) {
                 SelfKind::Explicit(this.parse_ty()?, m)
             } else {
@@ -2009,14 +1643,14 @@ impl<'a> Parser<'a> {
             let span = this.token.span;
             this.struct_span_err(span, msg).span_label(span, msg).emit();
 
-            Ok((SelfKind::Value(Mutability::Not), expect_self_ident(this), this.prev_span))
+            Ok((SelfKind::Value(Mutability::Not), expect_self_ident(this), this.prev_token.span))
         };
 
         // Parse optional `self` parameter of a method.
         // Only a limited set of initial token sequences is considered `self` parameters; anything
         // else is parsed as a normal function parameter list, so some lookahead is required.
         let eself_lo = self.token.span;
-        let (eself, eself_ident, eself_hi) = match self.token.kind {
+        let (eself, eself_ident, eself_hi) = match self.token.uninterpolate().kind {
             token::BinOp(token::And) => {
                 let eself = if is_isolated_self(self, 1) {
                     // `&self`
@@ -2042,7 +1676,7 @@ impl<'a> Parser<'a> {
                     // `&not_self`
                     return Ok(None);
                 };
-                (eself, expect_self_ident(self), self.prev_span)
+                (eself, expect_self_ident(self), self.prev_token.span)
             }
             // `*self`
             token::BinOp(token::Star) if is_isolated_self(self, 1) => {
diff --git a/src/librustc_parse/parser/mod.rs b/src/librustc_parse/parser/mod.rs
index 4a9016394d..9376c7c1c7 100644
--- a/src/librustc_parse/parser/mod.rs
+++ b/src/librustc_parse/parser/mod.rs
@@ -16,20 +16,22 @@ use crate::lexer::UnmatchedBrace;
 use crate::{Directory, DirectoryOwnership};
 
 use log::debug;
+use rustc_ast::ast::DUMMY_NODE_ID;
+use rustc_ast::ast::{self, AttrStyle, AttrVec, Const, CrateSugar, Extern, Ident, Unsafe};
+use rustc_ast::ast::{
+    Async, MacArgs, MacDelimiter, Mutability, StrLit, Visibility, VisibilityKind,
+};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, DelimToken, Token, TokenKind};
+use rustc_ast::tokenstream::{self, DelimSpan, TokenStream, TokenTree, TreeAndJoint};
+use rustc_ast::util::comments::{doc_comment_style, strip_doc_comment_decoration};
+use rustc_ast_pretty::pprust;
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder, FatalError, PResult};
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::respan;
 use rustc_span::symbol::{kw, sym, Symbol};
-use rustc_span::{BytePos, FileName, Span, DUMMY_SP};
-use syntax::ast::{self, AttrStyle, AttrVec, CrateSugar, Extern, Ident, Unsafety, DUMMY_NODE_ID};
-use syntax::ast::{IsAsync, MacArgs, MacDelimiter, Mutability, StrLit, Visibility, VisibilityKind};
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::sess::ParseSess;
-use syntax::token::{self, DelimToken, Token, TokenKind};
-use syntax::tokenstream::{self, DelimSpan, TokenStream, TokenTree, TreeAndJoint};
-use syntax::util::comments::{doc_comment_style, strip_doc_comment_decoration};
-
-use std::borrow::Cow;
+use rustc_span::{FileName, Span, DUMMY_SP};
+
 use std::path::PathBuf;
 use std::{cmp, mem, slice};
 
@@ -76,45 +78,23 @@ macro_rules! maybe_recover_from_interpolated_ty_qpath {
                 if let token::NtTy(ty) = &**nt {
                     let ty = ty.clone();
                     $self.bump();
-                    return $self.maybe_recover_from_bad_qpath_stage_2($self.prev_span, ty);
+                    return $self.maybe_recover_from_bad_qpath_stage_2($self.prev_token.span, ty);
                 }
             }
         }
     };
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
-enum PrevTokenKind {
-    DocComment,
-    Comma,
-    Plus,
-    Interpolated,
-    Eof,
-    Ident,
-    BitOr,
-    Other,
-}
-
-// NOTE: `Ident`s are handled by `common.rs`.
-
 #[derive(Clone)]
 pub struct Parser<'a> {
     pub sess: &'a ParseSess,
-    /// The current normalized token.
-    /// "Normalized" means that some interpolated tokens
-    /// (`$i: ident` and `$l: lifetime` meta-variables) are replaced
-    /// with non-interpolated identifier and lifetime tokens they refer to.
-    /// Perhaps the normalized / non-normalized setup can be simplified somehow.
+    /// The current token.
     pub token: Token,
-    /// The span of the current non-normalized token.
-    meta_var_span: Option<Span>,
-    /// The span of the previous non-normalized token.
-    pub prev_span: Span,
-    /// The kind of the previous normalized token (in simplified form).
-    prev_token_kind: PrevTokenKind,
+    /// The previous token.
+    pub prev_token: Token,
     restrictions: Restrictions,
     /// Used to determine the path to externally loaded source files.
-    pub(super) directory: Directory<'a>,
+    pub(super) directory: Directory,
     /// `true` to parse sub-modules in other files.
     // Public for rustfmt usage.
     pub recurse_into_file_modules: bool,
@@ -271,8 +251,7 @@ impl TokenCursor {
             ]
             .iter()
             .cloned()
-            .collect::<TokenStream>()
-            .into(),
+            .collect::<TokenStream>(),
         );
 
         self.stack.push(mem::replace(
@@ -376,7 +355,7 @@ impl<'a> Parser<'a> {
     pub fn new(
         sess: &'a ParseSess,
         tokens: TokenStream,
-        directory: Option<Directory<'a>>,
+        directory: Option<Directory>,
         recurse_into_file_modules: bool,
         desugar_doc_comments: bool,
         subparser_name: Option<&'static str>,
@@ -384,19 +363,17 @@ impl<'a> Parser<'a> {
         let mut parser = Parser {
             sess,
             token: Token::dummy(),
-            prev_span: DUMMY_SP,
-            meta_var_span: None,
-            prev_token_kind: PrevTokenKind::Other,
+            prev_token: Token::dummy(),
             restrictions: Restrictions::empty(),
             recurse_into_file_modules,
             directory: Directory {
-                path: Cow::from(PathBuf::new()),
+                path: PathBuf::new(),
                 ownership: DirectoryOwnership::Owned { relative: None },
             },
             root_module_name: None,
             expected_tokens: Vec::new(),
             token_cursor: TokenCursor {
-                frame: TokenCursorFrame::new(DelimSpan::dummy(), token::NoDelim, &tokens.into()),
+                frame: TokenCursorFrame::new(DelimSpan::dummy(), token::NoDelim, &tokens),
                 stack: Vec::new(),
             },
             desugar_doc_comments,
@@ -409,7 +386,8 @@ impl<'a> Parser<'a> {
             subparser_name,
         };
 
-        parser.token = parser.next_tok();
+        // Make parser point to the first token.
+        parser.bump();
 
         if let Some(directory) = directory {
             parser.directory = directory;
@@ -418,16 +396,15 @@ impl<'a> Parser<'a> {
                 &sess.source_map().lookup_char_pos(parser.token.span.lo()).file.unmapped_path
             {
                 if let Some(directory_path) = path.parent() {
-                    parser.directory.path = Cow::from(directory_path.to_path_buf());
+                    parser.directory.path = directory_path.to_path_buf();
                 }
             }
         }
 
-        parser.process_potential_macro_variable();
         parser
     }
 
-    fn next_tok(&mut self) -> Token {
+    fn next_tok(&mut self, fallback_span: Span) -> Token {
         let mut next = if self.desugar_doc_comments {
             self.token_cursor.next_desugared()
         } else {
@@ -435,7 +412,7 @@ impl<'a> Parser<'a> {
         };
         if next.span.is_dummy() {
             // Tweak the location for better diagnostics, but keep syntactic context intact.
-            next.span = self.prev_span.with_ctxt(next.span.ctxt());
+            next.span = fallback_span.with_ctxt(next.span.ctxt());
         }
         next
     }
@@ -490,9 +467,9 @@ impl<'a> Parser<'a> {
     }
 
     fn parse_ident_common(&mut self, recover: bool) -> PResult<'a, ast::Ident> {
-        match self.token.kind {
-            token::Ident(name, _) => {
-                if self.token.is_reserved_ident() {
+        match self.token.ident() {
+            Some((ident, is_raw)) => {
+                if !is_raw && ident.is_reserved() {
                     let mut err = self.expected_ident_found();
                     if recover {
                         err.emit();
@@ -500,14 +477,14 @@ impl<'a> Parser<'a> {
                         return Err(err);
                     }
                 }
-                let span = self.token.span;
                 self.bump();
-                Ok(Ident::new(name, span))
+                Ok(ident)
             }
-            _ => Err(if self.prev_token_kind == PrevTokenKind::DocComment {
-                self.span_fatal_err(self.prev_span, Error::UselessDocComment)
-            } else {
-                self.expected_ident_found()
+            _ => Err(match self.prev_token.kind {
+                TokenKind::DocComment(..) => {
+                    self.span_fatal_err(self.prev_token.span, Error::UselessDocComment)
+                }
+                _ => self.expected_ident_found(),
             }),
         }
     }
@@ -568,6 +545,11 @@ impl<'a> Parser<'a> {
         if !self.eat_keyword(kw) { self.unexpected() } else { Ok(()) }
     }
 
+    /// Is the given keyword `kw` followed by a non-reserved identifier?
+    fn is_kw_followed_by_ident(&self, kw: Symbol) -> bool {
+        self.token.is_keyword(kw) && self.look_ahead(1, |t| t.is_ident() && !t.is_reserved_ident())
+    }
+
     fn check_or_expected(&mut self, ok: bool, typ: TokenType) -> bool {
         if ok {
             true
@@ -602,136 +584,76 @@ impl<'a> Parser<'a> {
         )
     }
 
-    /// Expects and consumes a `+`. if `+=` is seen, replaces it with a `=`
-    /// and continues. If a `+` is not seen, returns `false`.
-    ///
-    /// This is used when token-splitting `+=` into `+`.
-    /// See issue #47856 for an example of when this may occur.
-    fn eat_plus(&mut self) -> bool {
-        self.expected_tokens.push(TokenType::Token(token::BinOp(token::Plus)));
-        match self.token.kind {
-            token::BinOp(token::Plus) => {
-                self.bump();
+    /// Eats the expected token if it's present possibly breaking
+    /// compound tokens like multi-character operators in process.
+    /// Returns `true` if the token was eaten.
+    fn break_and_eat(&mut self, expected: TokenKind) -> bool {
+        if self.token.kind == expected {
+            self.bump();
+            return true;
+        }
+        match self.token.kind.break_two_token_op() {
+            Some((first, second)) if first == expected => {
+                let first_span = self.sess.source_map().start_point(self.token.span);
+                let second_span = self.token.span.with_lo(first_span.hi());
+                self.token = Token::new(first, first_span);
+                self.bump_with(Token::new(second, second_span));
                 true
             }
-            token::BinOpEq(token::Plus) => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                self.bump_with(token::Eq, span);
-                true
+            _ => {
+                self.expected_tokens.push(TokenType::Token(expected));
+                false
             }
-            _ => false,
         }
     }
 
-    /// Expects and consumes an `&`. If `&&` is seen, replaces it with a single
-    /// `&` and continues. If an `&` is not seen, signals an error.
+    /// Eats `+` possibly breaking tokens like `+=` in process.
+    fn eat_plus(&mut self) -> bool {
+        self.break_and_eat(token::BinOp(token::Plus))
+    }
+
+    /// Eats `&` possibly breaking tokens like `&&` in process.
+    /// Signals an error if `&` is not eaten.
     fn expect_and(&mut self) -> PResult<'a, ()> {
-        self.expected_tokens.push(TokenType::Token(token::BinOp(token::And)));
-        match self.token.kind {
-            token::BinOp(token::And) => {
-                self.bump();
-                Ok(())
-            }
-            token::AndAnd => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                Ok(self.bump_with(token::BinOp(token::And), span))
-            }
-            _ => self.unexpected(),
-        }
+        if self.break_and_eat(token::BinOp(token::And)) { Ok(()) } else { self.unexpected() }
     }
 
-    /// Expects and consumes an `|`. If `||` is seen, replaces it with a single
-    /// `|` and continues. If an `|` is not seen, signals an error.
+    /// Eats `|` possibly breaking tokens like `||` in process.
+    /// Signals an error if `|` was not eaten.
     fn expect_or(&mut self) -> PResult<'a, ()> {
-        self.expected_tokens.push(TokenType::Token(token::BinOp(token::Or)));
-        match self.token.kind {
-            token::BinOp(token::Or) => {
-                self.bump();
-                Ok(())
-            }
-            token::OrOr => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                Ok(self.bump_with(token::BinOp(token::Or), span))
-            }
-            _ => self.unexpected(),
-        }
+        if self.break_and_eat(token::BinOp(token::Or)) { Ok(()) } else { self.unexpected() }
     }
 
-    /// Attempts to consume a `<`. If `<<` is seen, replaces it with a single
-    /// `<` and continue. If `<-` is seen, replaces it with a single `<`
-    /// and continue. If a `<` is not seen, returns false.
-    ///
-    /// This is meant to be used when parsing generics on a path to get the
-    /// starting token.
+    /// Eats `<` possibly breaking tokens like `<<` in process.
     fn eat_lt(&mut self) -> bool {
-        self.expected_tokens.push(TokenType::Token(token::Lt));
-        let ate = match self.token.kind {
-            token::Lt => {
-                self.bump();
-                true
-            }
-            token::BinOp(token::Shl) => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                self.bump_with(token::Lt, span);
-                true
-            }
-            token::LArrow => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                self.bump_with(token::BinOp(token::Minus), span);
-                true
-            }
-            _ => false,
-        };
-
+        let ate = self.break_and_eat(token::Lt);
         if ate {
             // See doc comment for `unmatched_angle_bracket_count`.
             self.unmatched_angle_bracket_count += 1;
             self.max_angle_bracket_count += 1;
             debug!("eat_lt: (increment) count={:?}", self.unmatched_angle_bracket_count);
         }
-
         ate
     }
 
+    /// Eats `<` possibly breaking tokens like `<<` in process.
+    /// Signals an error if `<` was not eaten.
     fn expect_lt(&mut self) -> PResult<'a, ()> {
-        if !self.eat_lt() { self.unexpected() } else { Ok(()) }
+        if self.eat_lt() { Ok(()) } else { self.unexpected() }
     }
 
-    /// Expects and consumes a single `>` token. if a `>>` is seen, replaces it
-    /// with a single `>` and continues. If a `>` is not seen, signals an error.
+    /// Eats `>` possibly breaking tokens like `>>` in process.
+    /// Signals an error if `>` was not eaten.
     fn expect_gt(&mut self) -> PResult<'a, ()> {
-        self.expected_tokens.push(TokenType::Token(token::Gt));
-        let ate = match self.token.kind {
-            token::Gt => {
-                self.bump();
-                Some(())
-            }
-            token::BinOp(token::Shr) => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                Some(self.bump_with(token::Gt, span))
-            }
-            token::BinOpEq(token::Shr) => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                Some(self.bump_with(token::Ge, span))
-            }
-            token::Ge => {
-                let span = self.token.span.with_lo(self.token.span.lo() + BytePos(1));
-                Some(self.bump_with(token::Eq, span))
-            }
-            _ => None,
-        };
-
-        match ate {
-            Some(_) => {
-                // See doc comment for `unmatched_angle_bracket_count`.
-                if self.unmatched_angle_bracket_count > 0 {
-                    self.unmatched_angle_bracket_count -= 1;
-                    debug!("expect_gt: (decrement) count={:?}", self.unmatched_angle_bracket_count);
-                }
-
-                Ok(())
+        if self.break_and_eat(token::Gt) {
+            // See doc comment for `unmatched_angle_bracket_count`.
+            if self.unmatched_angle_bracket_count > 0 {
+                self.unmatched_angle_bracket_count -= 1;
+                debug!("expect_gt: (decrement) count={:?}", self.unmatched_angle_bracket_count);
             }
-            None => self.unexpected(),
+            Ok(())
+        } else {
+            self.unexpected()
         }
     }
 
@@ -768,7 +690,7 @@ impl<'a> Parser<'a> {
                             break;
                         }
                         Err(mut expect_err) => {
-                            let sp = self.prev_span.shrink_to_hi();
+                            let sp = self.prev_token.span.shrink_to_hi();
                             let token_str = pprust::token_kind_to_string(t);
 
                             // Attempt to keep parsing if it was a similar separator.
@@ -882,46 +804,27 @@ impl<'a> Parser<'a> {
         self.parse_delim_comma_seq(token::Paren, f)
     }
 
-    /// Advance the parser by one token.
-    pub fn bump(&mut self) {
-        if self.prev_token_kind == PrevTokenKind::Eof {
-            // Bumping after EOF is a bad sign, usually an infinite loop.
+    /// Advance the parser by one token using provided token as the next one.
+    fn bump_with(&mut self, next_token: Token) {
+        // Bumping after EOF is a bad sign, usually an infinite loop.
+        if self.prev_token.kind == TokenKind::Eof {
             let msg = "attempted to bump the parser past EOF (may be stuck in a loop)";
             self.span_bug(self.token.span, msg);
         }
 
-        self.prev_span = self.meta_var_span.take().unwrap_or(self.token.span);
-
-        // Record last token kind for possible error recovery.
-        self.prev_token_kind = match self.token.kind {
-            token::DocComment(..) => PrevTokenKind::DocComment,
-            token::Comma => PrevTokenKind::Comma,
-            token::BinOp(token::Plus) => PrevTokenKind::Plus,
-            token::BinOp(token::Or) => PrevTokenKind::BitOr,
-            token::Interpolated(..) => PrevTokenKind::Interpolated,
-            token::Eof => PrevTokenKind::Eof,
-            token::Ident(..) => PrevTokenKind::Ident,
-            _ => PrevTokenKind::Other,
-        };
+        // Update the current and previous tokens.
+        self.prev_token = mem::replace(&mut self.token, next_token);
 
-        self.token = self.next_tok();
-        self.expected_tokens.clear();
-        // Check after each token.
-        self.process_potential_macro_variable();
-    }
-
-    /// Advances the parser using provided token as a next one. Use this when
-    /// consuming a part of a token. For example a single `<` from `<<`.
-    fn bump_with(&mut self, next: TokenKind, span: Span) {
-        self.prev_span = self.token.span.with_hi(span.lo());
-        // It would be incorrect to record the kind of the current token, but
-        // fortunately for tokens currently using `bump_with`, the
-        // `prev_token_kind` will be of no use anyway.
-        self.prev_token_kind = PrevTokenKind::Other;
-        self.token = Token::new(next, span);
+        // Diagnostics.
         self.expected_tokens.clear();
     }
 
+    /// Advance the parser by one token.
+    pub fn bump(&mut self) {
+        let next_token = self.next_tok(self.token.span);
+        self.bump_with(next_token);
+    }
+
     /// Look-ahead `dist` tokens of `self.token` and get access to that token there.
     /// When `dist == 0` then the current token is looked at.
     pub fn look_ahead<R>(&self, dist: usize, looker: impl FnOnce(&Token) -> R) -> R {
@@ -947,17 +850,31 @@ impl<'a> Parser<'a> {
     }
 
     /// Parses asyncness: `async` or nothing.
-    fn parse_asyncness(&mut self) -> IsAsync {
+    fn parse_asyncness(&mut self) -> Async {
         if self.eat_keyword(kw::Async) {
-            IsAsync::Async { closure_id: DUMMY_NODE_ID, return_impl_trait_id: DUMMY_NODE_ID }
+            let span = self.prev_token.uninterpolated_span();
+            Async::Yes { span, closure_id: DUMMY_NODE_ID, return_impl_trait_id: DUMMY_NODE_ID }
         } else {
-            IsAsync::NotAsync
+            Async::No
         }
     }
 
     /// Parses unsafety: `unsafe` or nothing.
-    fn parse_unsafety(&mut self) -> Unsafety {
-        if self.eat_keyword(kw::Unsafe) { Unsafety::Unsafe } else { Unsafety::Normal }
+    fn parse_unsafety(&mut self) -> Unsafe {
+        if self.eat_keyword(kw::Unsafe) {
+            Unsafe::Yes(self.prev_token.uninterpolated_span())
+        } else {
+            Unsafe::No
+        }
+    }
+
+    /// Parses constness: `const` or nothing.
+    fn parse_constness(&mut self) -> Const {
+        if self.eat_keyword(kw::Const) {
+            Const::Yes(self.prev_token.uninterpolated_span())
+        } else {
+            Const::No
+        }
     }
 
     /// Parses mutability (`mut` or nothing).
@@ -981,7 +898,7 @@ impl<'a> Parser<'a> {
         {
             self.expect_no_suffix(self.token.span, "a tuple index", suffix);
             self.bump();
-            Ok(Ident::new(symbol, self.prev_span))
+            Ok(Ident::new(symbol, self.prev_token.span))
         } else {
             self.parse_ident_common(false)
         }
@@ -1011,7 +928,7 @@ impl<'a> Parser<'a> {
                 }
             } else if !delimited_only {
                 if self.eat(&token::Eq) {
-                    let eq_span = self.prev_span;
+                    let eq_span = self.prev_token.span;
                     let mut is_interpolated_expr = false;
                     if let token::Interpolated(nt) = &self.token.kind {
                         if let token::NtExpr(..) = **nt {
@@ -1048,39 +965,6 @@ impl<'a> Parser<'a> {
         }
     }
 
-    pub fn process_potential_macro_variable(&mut self) {
-        self.token = match self.token.kind {
-            token::Dollar
-                if self.token.span.from_expansion() && self.look_ahead(1, |t| t.is_ident()) =>
-            {
-                self.bump();
-                let name = match self.token.kind {
-                    token::Ident(name, _) => name,
-                    _ => unreachable!(),
-                };
-                let span = self.prev_span.to(self.token.span);
-                self.struct_span_err(span, &format!("unknown macro variable `{}`", name))
-                    .span_label(span, "unknown macro variable")
-                    .emit();
-                self.bump();
-                return;
-            }
-            token::Interpolated(ref nt) => {
-                self.meta_var_span = Some(self.token.span);
-                // Interpolated identifier and lifetime tokens are replaced with usual identifier
-                // and lifetime tokens, so the former are never encountered during normal parsing.
-                match **nt {
-                    token::NtIdent(ident, is_raw) => {
-                        Token::new(token::Ident(ident.name, is_raw), ident.span)
-                    }
-                    token::NtLifetime(ident) => Token::new(token::Lifetime(ident.name), ident.span),
-                    _ => return,
-                }
-            }
-            _ => return,
-        };
-    }
-
     /// Parses a single token tree from the input.
     pub fn parse_token_tree(&mut self) -> TokenTree {
         match self.token.kind {
@@ -1089,15 +973,14 @@ impl<'a> Parser<'a> {
                     &mut self.token_cursor.frame,
                     self.token_cursor.stack.pop().unwrap(),
                 );
-                self.token.span = frame.span.entire();
+                self.token = Token::new(TokenKind::CloseDelim(frame.delim), frame.span.close);
                 self.bump();
-                TokenTree::Delimited(frame.span, frame.delim, frame.tree_cursor.stream.into())
+                TokenTree::Delimited(frame.span, frame.delim, frame.tree_cursor.stream)
             }
             token::CloseDelim(_) | token::Eof => unreachable!(),
             _ => {
-                let token = self.token.take();
                 self.bump();
-                TokenTree::Token(token)
+                TokenTree::Token(self.prev_token.clone())
             }
         }
     }
@@ -1148,8 +1031,8 @@ impl<'a> Parser<'a> {
         self.expected_tokens.push(TokenType::Keyword(kw::Crate));
         if self.is_crate_vis() {
             self.bump(); // `crate`
-            self.sess.gated_spans.gate(sym::crate_visibility_modifier, self.prev_span);
-            return Ok(respan(self.prev_span, VisibilityKind::Crate(CrateSugar::JustCrate)));
+            self.sess.gated_spans.gate(sym::crate_visibility_modifier, self.prev_token.span);
+            return Ok(respan(self.prev_token.span, VisibilityKind::Crate(CrateSugar::JustCrate)));
         }
 
         if !self.eat_keyword(kw::Pub) {
@@ -1158,7 +1041,7 @@ impl<'a> Parser<'a> {
             // beginning of the current token would seem to be the "Schelling span".
             return Ok(respan(self.token.span.shrink_to_lo(), VisibilityKind::Inherited));
         }
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
 
         if self.check(&token::OpenDelim(token::Paren)) {
             // We don't `self.bump()` the `(` yet because this might be a struct definition where
@@ -1173,7 +1056,7 @@ impl<'a> Parser<'a> {
                 self.bump(); // `crate`
                 self.expect(&token::CloseDelim(token::Paren))?; // `)`
                 let vis = VisibilityKind::Crate(CrateSugar::PubCrate);
-                return Ok(respan(lo.to(self.prev_span), vis));
+                return Ok(respan(lo.to(self.prev_token.span), vis));
             } else if self.is_keyword_ahead(1, &[kw::In]) {
                 // Parse `pub(in path)`.
                 self.bump(); // `(`
@@ -1181,7 +1064,7 @@ impl<'a> Parser<'a> {
                 let path = self.parse_path(PathStyle::Mod)?; // `path`
                 self.expect(&token::CloseDelim(token::Paren))?; // `)`
                 let vis = VisibilityKind::Restricted { path: P(path), id: ast::DUMMY_NODE_ID };
-                return Ok(respan(lo.to(self.prev_span), vis));
+                return Ok(respan(lo.to(self.prev_token.span), vis));
             } else if self.look_ahead(2, |t| t == &token::CloseDelim(token::Paren))
                 && self.is_keyword_ahead(1, &[kw::Super, kw::SelfLower])
             {
@@ -1190,7 +1073,7 @@ impl<'a> Parser<'a> {
                 let path = self.parse_path(PathStyle::Mod)?; // `super`/`self`
                 self.expect(&token::CloseDelim(token::Paren))?; // `)`
                 let vis = VisibilityKind::Restricted { path: P(path), id: ast::DUMMY_NODE_ID };
-                return Ok(respan(lo.to(self.prev_span), vis));
+                return Ok(respan(lo.to(self.prev_token.span), vis));
             } else if let FollowedByType::No = fbt {
                 // Provide this diagnostic if a type cannot follow;
                 // in particular, if this is not a tuple struct.
@@ -1260,19 +1143,6 @@ impl<'a> Parser<'a> {
         }
     }
 
-    /// We are parsing `async fn`. If we are on Rust 2015, emit an error.
-    fn ban_async_in_2015(&self, async_span: Span) {
-        if async_span.rust_2015() {
-            struct_span_err!(
-                self.diagnostic(),
-                async_span,
-                E0670,
-                "`async fn` is not permitted in the 2015 edition",
-            )
-            .emit();
-        }
-    }
-
     fn collect_tokens<R>(
         &mut self,
         f: impl FnOnce(&mut Self) -> PResult<'a, R>,
@@ -1374,6 +1244,8 @@ pub fn emit_unclosed_delims(unclosed_delims: &mut Vec<UnmatchedBrace>, sess: &Pa
     *sess.reached_eof.borrow_mut() |=
         unclosed_delims.iter().any(|unmatched_delim| unmatched_delim.found_delim.is_none());
     for unmatched in unclosed_delims.drain(..) {
-        make_unclosed_delims_error(unmatched, sess).map(|mut e| e.emit());
+        make_unclosed_delims_error(unmatched, sess).map(|mut e| {
+            e.emit();
+        });
     }
 }
diff --git a/src/librustc_parse/parser/module.rs b/src/librustc_parse/parser/module.rs
index 6ce94d3c67..b436f1969b 100644
--- a/src/librustc_parse/parser/module.rs
+++ b/src/librustc_parse/parser/module.rs
@@ -4,12 +4,12 @@ use super::Parser;
 
 use crate::{new_sub_parser_from_file, DirectoryOwnership};
 
+use rustc_ast::ast::{self, Attribute, Crate, Ident, ItemKind, Mod};
+use rustc_ast::attr;
+use rustc_ast::token::{self, TokenKind};
 use rustc_errors::PResult;
 use rustc_span::source_map::{FileName, SourceMap, Span, DUMMY_SP};
 use rustc_span::symbol::sym;
-use syntax::ast::{self, Attribute, Crate, Ident, ItemKind, Mod};
-use syntax::attr;
-use syntax::token::{self, TokenKind};
 
 use std::path::{self, Path, PathBuf};
 
@@ -35,41 +35,41 @@ impl<'a> Parser<'a> {
             attrs: self.parse_inner_attributes()?,
             module: self.parse_mod_items(&token::Eof, lo)?,
             span: lo.to(self.token.span),
+            // Filled in by proc_macro_harness::inject()
+            proc_macros: Vec::new(),
         });
         krate
     }
 
     /// Parses a `mod <foo> { ... }` or `mod <foo>;` item.
-    pub(super) fn parse_item_mod(&mut self, outer_attrs: &[Attribute]) -> PResult<'a, ItemInfo> {
-        let (in_cfg, outer_attrs) =
-            crate::config::process_configure_mod(self.sess, self.cfg_mods, outer_attrs);
+    pub(super) fn parse_item_mod(&mut self, attrs: &mut Vec<Attribute>) -> PResult<'a, ItemInfo> {
+        let in_cfg = crate::config::process_configure_mod(self.sess, self.cfg_mods, attrs);
 
         let id_span = self.token.span;
         let id = self.parse_ident()?;
-        if self.eat(&token::Semi) {
+        let (module, mut inner_attrs) = if self.eat(&token::Semi) {
             if in_cfg && self.recurse_into_file_modules {
                 // This mod is in an external file. Let's go get it!
                 let ModulePathSuccess { path, directory_ownership } =
-                    self.submod_path(id, &outer_attrs, id_span)?;
-                let (module, attrs) =
-                    self.eval_src_mod(path, directory_ownership, id.to_string(), id_span)?;
-                Ok((id, ItemKind::Mod(module), Some(attrs)))
+                    self.submod_path(id, &attrs, id_span)?;
+                self.eval_src_mod(path, directory_ownership, id.to_string(), id_span)?
             } else {
-                let placeholder = ast::Mod { inner: DUMMY_SP, items: Vec::new(), inline: false };
-                Ok((id, ItemKind::Mod(placeholder), None))
+                (ast::Mod { inner: DUMMY_SP, items: Vec::new(), inline: false }, Vec::new())
             }
         } else {
             let old_directory = self.directory.clone();
-            self.push_directory(id, &outer_attrs);
+            self.push_directory(id, &attrs);
 
             self.expect(&token::OpenDelim(token::Brace))?;
             let mod_inner_lo = self.token.span;
-            let attrs = self.parse_inner_attributes()?;
+            let inner_attrs = self.parse_inner_attributes()?;
             let module = self.parse_mod_items(&token::CloseDelim(token::Brace), mod_inner_lo)?;
 
             self.directory = old_directory;
-            Ok((id, ItemKind::Mod(module), Some(attrs)))
-        }
+            (module, inner_attrs)
+        };
+        attrs.append(&mut inner_attrs);
+        Ok((id, ItemKind::Mod(module)))
     }
 
     /// Given a termination token, parses all of the items in a module.
@@ -90,7 +90,7 @@ impl<'a> Parser<'a> {
             }
         }
 
-        let hi = if self.token.span.is_dummy() { inner_lo } else { self.prev_span };
+        let hi = if self.token.span.is_dummy() { inner_lo } else { self.prev_token.span };
 
         Ok(Mod { inner: inner_lo.to(hi), items, inline: true })
     }
@@ -285,7 +285,7 @@ impl<'a> Parser<'a> {
 
     fn push_directory(&mut self, id: Ident, attrs: &[Attribute]) {
         if let Some(path) = attr::first_attr_value_str_by_name(attrs, sym::path) {
-            self.directory.path.to_mut().push(&*path.as_str());
+            self.directory.path.push(&*path.as_str());
             self.directory.ownership = DirectoryOwnership::Owned { relative: None };
         } else {
             // We have to push on the current module name in the case of relative
@@ -297,10 +297,10 @@ impl<'a> Parser<'a> {
             if let DirectoryOwnership::Owned { relative } = &mut self.directory.ownership {
                 if let Some(ident) = relative.take() {
                     // remove the relative offset
-                    self.directory.path.to_mut().push(&*ident.as_str());
+                    self.directory.path.push(&*ident.as_str());
                 }
             }
-            self.directory.path.to_mut().push(&*id.as_str());
+            self.directory.path.push(&*id.as_str());
         }
     }
 }
diff --git a/src/librustc_parse/parser/pat.rs b/src/librustc_parse/parser/pat.rs
index edb9044df9..687b7760d8 100644
--- a/src/librustc_parse/parser/pat.rs
+++ b/src/librustc_parse/parser/pat.rs
@@ -1,14 +1,16 @@
 use super::{Parser, PathStyle};
 use crate::{maybe_recover_from_interpolated_ty_qpath, maybe_whole};
+use rustc_ast::ast::{
+    self, AttrVec, Attribute, FieldPat, Mac, Pat, PatKind, RangeEnd, RangeSyntax,
+};
+use rustc_ast::ast::{BindingMode, Expr, ExprKind, Ident, Mutability, Path, QSelf};
+use rustc_ast::mut_visit::{noop_visit_mac, noop_visit_pat, MutVisitor};
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast_pretty::pprust;
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder, PResult};
 use rustc_span::source_map::{respan, Span, Spanned};
 use rustc_span::symbol::{kw, sym};
-use syntax::ast::{self, AttrVec, Attribute, FieldPat, Mac, Pat, PatKind, RangeEnd, RangeSyntax};
-use syntax::ast::{BindingMode, Expr, ExprKind, Ident, Mutability, Path, QSelf};
-use syntax::mut_visit::{noop_visit_mac, noop_visit_pat, MutVisitor};
-use syntax::print::pprust;
-use syntax::ptr::P;
-use syntax::token;
 
 type Expected = Option<&'static str>;
 
@@ -46,7 +48,7 @@ impl<'a> Parser<'a> {
     pub(super) fn parse_top_pat(&mut self, gate_or: GateOr) -> PResult<'a, P<Pat>> {
         // Allow a '|' before the pats (RFCs 1925, 2530, and 2535).
         let gated_leading_vert = self.eat_or_separator(None) && gate_or == GateOr::Yes;
-        let leading_vert_span = self.prev_span;
+        let leading_vert_span = self.prev_token.span;
 
         // Parse the possibly-or-pattern.
         let pat = self.parse_pat_with_or(None, gate_or, RecoverComma::Yes)?;
@@ -113,7 +115,7 @@ impl<'a> Parser<'a> {
             self.maybe_recover_unexpected_comma(pat.span, rc)?;
             pats.push(pat);
         }
-        let or_pattern_span = lo.to(self.prev_span);
+        let or_pattern_span = lo.to(self.prev_token.span);
 
         // Feature gate the or-pattern if instructed:
         if gate_or == GateOr::Yes {
@@ -149,7 +151,7 @@ impl<'a> Parser<'a> {
     /// Note that there are more tokens such as `@` for which we know that the `|`
     /// is an illegal parse. However, the user's intent is less clear in that case.
     fn recover_trailing_vert(&mut self, lo: Option<Span>) -> bool {
-        let is_end_ahead = self.look_ahead(1, |token| match &token.kind {
+        let is_end_ahead = self.look_ahead(1, |token| match &token.uninterpolate().kind {
             token::FatArrow // e.g. `a | => 0,`.
             | token::Ident(kw::If, false) // e.g. `a | if expr`.
             | token::Eq // e.g. `let a | = 0`.
@@ -204,7 +206,7 @@ impl<'a> Parser<'a> {
             // end of the comma-sequence so we know the span to suggest parenthesizing.
             err.cancel();
         }
-        let seq_span = lo.to(self.prev_span);
+        let seq_span = lo.to(self.prev_token.span);
         let mut err = self.struct_span_err(comma_span, "unexpected `,` in pattern");
         if let Ok(seq_snippet) = self.span_to_snippet(seq_span) {
             err.span_suggestion(
@@ -216,7 +218,7 @@ impl<'a> Parser<'a> {
             .span_suggestion(
                 seq_span,
                 "...or a vertical bar to match on multiple alternatives",
-                format!("{}", seq_snippet.replace(",", " |")),
+                seq_snippet.replace(",", " |"),
                 Applicability::MachineApplicable,
             );
         }
@@ -309,7 +311,7 @@ impl<'a> Parser<'a> {
         } else if self.eat_keyword(kw::Box) {
             // Parse `box pat`
             let pat = self.parse_pat_with_range_pat(false, None)?;
-            self.sess.gated_spans.gate(sym::box_patterns, lo.to(self.prev_span));
+            self.sess.gated_spans.gate(sym::box_patterns, lo.to(self.prev_token.span));
             PatKind::Box(pat)
         } else if self.can_be_ident_pat() {
             // Parse `ident @ pat`
@@ -326,7 +328,7 @@ impl<'a> Parser<'a> {
                 // Parse an unqualified path
                 (None, self.parse_path(PathStyle::Expr)?)
             };
-            let span = lo.to(self.prev_span);
+            let span = lo.to(self.prev_token.span);
 
             if qself.is_none() && self.check(&token::Not) {
                 self.parse_pat_mac_invoc(path)?
@@ -351,7 +353,7 @@ impl<'a> Parser<'a> {
             }
         };
 
-        let pat = self.mk_pat(lo.to(self.prev_span), pat);
+        let pat = self.mk_pat(lo.to(self.prev_token.span), pat);
         let pat = self.maybe_recover_from_bad_qpath(pat, true)?;
         let pat = self.recover_intersection_pat(pat)?;
 
@@ -457,7 +459,7 @@ impl<'a> Parser<'a> {
         if let token::Lifetime(name) = self.token.kind {
             self.bump(); // `'a`
 
-            let span = self.prev_span;
+            let span = self.prev_token.span;
             self.struct_span_err(span, &format!("unexpected lifetime `{}` in pattern", name))
                 .span_suggestion(
                     span,
@@ -477,7 +479,7 @@ impl<'a> Parser<'a> {
         // Here, `(pat,)` is a tuple pattern.
         // For backward compatibility, `(..)` is a tuple pattern as well.
         Ok(if fields.len() == 1 && !(trailing_comma || fields[0].is_rest()) {
-            PatKind::Paren(fields.into_iter().nth(0).unwrap())
+            PatKind::Paren(fields.into_iter().next().unwrap())
         } else {
             PatKind::Tuple(fields)
         })
@@ -485,7 +487,7 @@ impl<'a> Parser<'a> {
 
     /// Parse a mutable binding with the `mut` token already eaten.
     fn parse_pat_ident_mut(&mut self) -> PResult<'a, PatKind> {
-        let mut_span = self.prev_span;
+        let mut_span = self.prev_token.span;
 
         if self.eat_keyword(kw::Ref) {
             return self.recover_mut_ref_ident(mut_span);
@@ -503,23 +505,24 @@ impl<'a> Parser<'a> {
         // Parse the pattern we hope to be an identifier.
         let mut pat = self.parse_pat(Some("identifier"))?;
 
-        // Add `mut` to any binding in the parsed pattern.
-        let changed_any_binding = Self::make_all_value_bindings_mutable(&mut pat);
-
-        // Unwrap; If we don't have `mut $ident`, error.
-        let pat = pat.into_inner();
-        match &pat.kind {
-            PatKind::Ident(..) => {}
-            _ => self.ban_mut_general_pat(mut_span, &pat, changed_any_binding),
+        // If we don't have `mut $ident (@ pat)?`, error.
+        if let PatKind::Ident(BindingMode::ByValue(m @ Mutability::Not), ..) = &mut pat.kind {
+            // Don't recurse into the subpattern.
+            // `mut` on the outer binding doesn't affect the inner bindings.
+            *m = Mutability::Mut;
+        } else {
+            // Add `mut` to any binding in the parsed pattern.
+            let changed_any_binding = Self::make_all_value_bindings_mutable(&mut pat);
+            self.ban_mut_general_pat(mut_span, &pat, changed_any_binding);
         }
 
-        Ok(pat.kind)
+        Ok(pat.into_inner().kind)
     }
 
     /// Recover on `mut ref? ident @ pat` and suggest
     /// that the order of `mut` and `ref` is incorrect.
     fn recover_mut_ref_ident(&mut self, lo: Span) -> PResult<'a, PatKind> {
-        let mutref_span = lo.to(self.prev_span);
+        let mutref_span = lo.to(self.prev_token.span);
         self.struct_span_err(mutref_span, "the order of `mut` and `ref` is incorrect")
             .span_suggestion(
                 mutref_span,
@@ -542,11 +545,10 @@ impl<'a> Parser<'a> {
             }
 
             fn visit_pat(&mut self, pat: &mut P<Pat>) {
-                if let PatKind::Ident(BindingMode::ByValue(ref mut m @ Mutability::Not), ..) =
-                    pat.kind
+                if let PatKind::Ident(BindingMode::ByValue(m @ Mutability::Not), ..) = &mut pat.kind
                 {
-                    *m = Mutability::Mut;
                     self.0 = true;
+                    *m = Mutability::Mut;
                 }
                 noop_visit_pat(pat, self);
             }
@@ -569,7 +571,7 @@ impl<'a> Parser<'a> {
         self.struct_span_err(span, problem)
             .span_suggestion(span, suggestion, fix, Applicability::MachineApplicable)
             .note("`mut` may be followed by `variable` and `variable @ pattern`")
-            .emit()
+            .emit();
     }
 
     /// Eat any extraneous `mut`s and error + recover if we ate any.
@@ -580,7 +582,7 @@ impl<'a> Parser<'a> {
             return;
         }
 
-        let span = lo.to(self.prev_span);
+        let span = lo.to(self.prev_token.span);
         self.struct_span_err(span, "`mut` on a binding may not be repeated")
             .span_suggestion(
                 span,
@@ -627,12 +629,12 @@ impl<'a> Parser<'a> {
         } else if self.eat(&token::DotDotEq) {
             RangeEnd::Included(RangeSyntax::DotDotEq)
         } else if self.eat(&token::DotDot) {
-            self.sess.gated_spans.gate(sym::exclusive_range_pattern, self.prev_span);
+            self.sess.gated_spans.gate(sym::exclusive_range_pattern, self.prev_token.span);
             RangeEnd::Excluded
         } else {
             return None;
         };
-        Some(respan(self.prev_span, re))
+        Some(respan(self.prev_token.span, re))
     }
 
     /// Parse a range pattern `$begin $form $end?` where `$form = ".." | "..." | "..=" ;`.
@@ -676,7 +678,7 @@ impl<'a> Parser<'a> {
     /// expression syntax `...expr` for splatting in expressions.
     fn parse_pat_range_to(&mut self, mut re: Spanned<RangeEnd>) -> PResult<'a, PatKind> {
         let end = self.parse_pat_range_end()?;
-        self.sess.gated_spans.gate(sym::half_open_range_patterns, re.span.to(self.prev_span));
+        self.sess.gated_spans.gate(sym::half_open_range_patterns, re.span.to(self.prev_token.span));
         if let RangeEnd::Included(ref mut syn @ RangeSyntax::DotDotDot) = &mut re.node {
             *syn = RangeSyntax::DotDotEq;
             self.struct_span_err(re.span, "range-to patterns with `...` are not allowed")
@@ -696,7 +698,7 @@ impl<'a> Parser<'a> {
         self.look_ahead(dist, |t| {
             t.is_path_start() // e.g. `MY_CONST`;
                 || t.kind == token::Dot // e.g. `.5` for recovery;
-                || t.can_begin_literal_or_bool() // e.g. `42`.
+                || t.can_begin_literal_maybe_minus() // e.g. `42`.
                 || t.is_whole_expr()
         })
     }
@@ -712,7 +714,7 @@ impl<'a> Parser<'a> {
                 // Parse an unqualified path
                 (None, self.parse_path(PathStyle::Expr)?)
             };
-            let hi = self.prev_span;
+            let hi = self.prev_token.span;
             Ok(self.mk_expr(lo.to(hi), ExprKind::Path(qself, path), AttrVec::new()))
         } else {
             self.parse_literal_maybe_minus()
@@ -760,9 +762,8 @@ impl<'a> Parser<'a> {
         // binding mode then we do not end up here, because the lookahead
         // will direct us over to `parse_enum_variant()`.
         if self.token == token::OpenDelim(token::Paren) {
-            return Err(
-                self.struct_span_err(self.prev_span, "expected identifier, found enum pattern")
-            );
+            return Err(self
+                .struct_span_err(self.prev_token.span, "expected identifier, found enum pattern"));
         }
 
         Ok(PatKind::Ident(binding_mode, ident, sub))
@@ -824,7 +825,7 @@ impl<'a> Parser<'a> {
 
             // check that a comma comes after every field
             if !ate_comma {
-                let err = self.struct_span_err(self.prev_span, "expected `,`");
+                let err = self.struct_span_err(self.prev_token.span, "expected `,`");
                 if let Some(mut delayed) = delayed_err {
                     delayed.emit();
                 }
@@ -956,7 +957,7 @@ impl<'a> Parser<'a> {
             let is_ref = self.eat_keyword(kw::Ref);
             let is_mut = self.eat_keyword(kw::Mut);
             let fieldname = self.parse_ident()?;
-            hi = self.prev_span;
+            hi = self.prev_token.span;
 
             let bind_type = match (is_ref, is_mut) {
                 (true, true) => BindingMode::ByRef(Mutability::Mut),
diff --git a/src/librustc_parse/parser/path.rs b/src/librustc_parse/parser/path.rs
index 0358458c09..f88b4fe6ff 100644
--- a/src/librustc_parse/parser/path.rs
+++ b/src/librustc_parse/parser/path.rs
@@ -1,13 +1,16 @@
+use super::ty::{AllowPlus, RecoverQPath};
 use super::{Parser, TokenType};
 use crate::maybe_whole;
+use rustc_ast::ast::{
+    self, AngleBracketedArgs, Ident, ParenthesizedArgs, Path, PathSegment, QSelf,
+};
+use rustc_ast::ast::{
+    AnonConst, AssocTyConstraint, AssocTyConstraintKind, BlockCheckMode, GenericArg,
+};
+use rustc_ast::token::{self, Token};
 use rustc_errors::{pluralize, Applicability, PResult};
 use rustc_span::source_map::{BytePos, Span};
 use rustc_span::symbol::{kw, sym};
-use syntax::ast::{self, AngleBracketedArgs, Ident, ParenthesizedArgs, Path, PathSegment, QSelf};
-use syntax::ast::{
-    AnonConst, AssocTyConstraint, AssocTyConstraintKind, BlockCheckMode, GenericArg,
-};
-use syntax::token::{self, Token};
 
 use log::debug;
 use std::mem;
@@ -47,7 +50,7 @@ impl<'a> Parser<'a> {
     /// `<T as U>::F::a<S>` (without disambiguator)
     /// `<T as U>::F::a::<S>` (with disambiguator)
     pub(super) fn parse_qpath(&mut self, style: PathStyle) -> PResult<'a, (QSelf, Path)> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let ty = self.parse_ty()?;
 
         // `path` will contain the prefix of the path up to the `>`,
@@ -58,7 +61,7 @@ impl<'a> Parser<'a> {
         if self.eat_keyword(kw::As) {
             let path_lo = self.token.span;
             path = self.parse_path(PathStyle::Type)?;
-            path_span = path_lo.to(self.prev_span);
+            path_span = path_lo.to(self.prev_token.span);
         } else {
             path_span = self.token.span.to(self.token.span);
             path = ast::Path { segments: Vec::new(), span: path_span };
@@ -71,12 +74,47 @@ impl<'a> Parser<'a> {
             debug!("parse_qpath: (decrement) count={:?}", self.unmatched_angle_bracket_count);
         }
 
-        self.expect(&token::ModSep)?;
+        if !self.recover_colon_before_qpath_proj() {
+            self.expect(&token::ModSep)?;
+        }
 
         let qself = QSelf { ty, path_span, position: path.segments.len() };
         self.parse_path_segments(&mut path.segments, style)?;
 
-        Ok((qself, Path { segments: path.segments, span: lo.to(self.prev_span) }))
+        Ok((qself, Path { segments: path.segments, span: lo.to(self.prev_token.span) }))
+    }
+
+    /// Recover from an invalid single colon, when the user likely meant a qualified path.
+    /// We avoid emitting this if not followed by an identifier, as our assumption that the user
+    /// intended this to be a qualified path may not be correct.
+    ///
+    /// ```ignore (diagnostics)
+    /// <Bar as Baz<T>>:Qux
+    ///                ^ help: use double colon
+    /// ```
+    fn recover_colon_before_qpath_proj(&mut self) -> bool {
+        if self.token.kind != token::Colon
+            || self.look_ahead(1, |t| !t.is_ident() || t.is_reserved_ident())
+        {
+            return false;
+        }
+
+        self.bump(); // colon
+
+        self.diagnostic()
+            .struct_span_err(
+                self.prev_token.span,
+                "found single colon before projection in qualified path",
+            )
+            .span_suggestion(
+                self.prev_token.span,
+                "use double colon",
+                "::".to_string(),
+                Applicability::MachineApplicable,
+            )
+            .emit();
+
+        true
     }
 
     /// Parses simple paths.
@@ -98,7 +136,7 @@ impl<'a> Parser<'a> {
             path
         });
 
-        let lo = self.meta_var_span.unwrap_or(self.token.span);
+        let lo = self.token.span;
         let mut segments = Vec::new();
         let mod_sep_ctxt = self.token.span.ctxt();
         if self.eat(&token::ModSep) {
@@ -106,7 +144,7 @@ impl<'a> Parser<'a> {
         }
         self.parse_path_segments(&mut segments, style)?;
 
-        Ok(Path { segments, span: lo.to(self.prev_span) })
+        Ok(Path { segments, span: lo.to(self.prev_token.span) })
     }
 
     pub(super) fn parse_path_segments(
@@ -183,13 +221,13 @@ impl<'a> Parser<'a> {
                     let (args, constraints) =
                         self.parse_generic_args_with_leading_angle_bracket_recovery(style, lo)?;
                     self.expect_gt()?;
-                    let span = lo.to(self.prev_span);
+                    let span = lo.to(self.prev_token.span);
                     AngleBracketedArgs { args, constraints, span }.into()
                 } else {
                     // `(T, U) -> R`
                     let (inputs, _) = self.parse_paren_comma_seq(|p| p.parse_ty())?;
-                    let span = ident.span.to(self.prev_span);
-                    let output = self.parse_ret_ty(false, false)?;
+                    let span = ident.span.to(self.prev_token.span);
+                    let output = self.parse_ret_ty(AllowPlus::No, RecoverQPath::No)?;
                     ParenthesizedArgs { inputs, output, span }.into()
                 };
 
@@ -202,11 +240,10 @@ impl<'a> Parser<'a> {
     }
 
     pub(super) fn parse_path_segment_ident(&mut self) -> PResult<'a, Ident> {
-        match self.token.kind {
-            token::Ident(name, _) if name.is_path_segment_keyword() => {
-                let span = self.token.span;
+        match self.token.ident() {
+            Some((ident, false)) if ident.is_path_segment_keyword() => {
                 self.bump();
-                Ok(Ident::new(name, span))
+                Ok(ident)
             }
             _ => self.parse_ident(),
         }
@@ -375,13 +412,13 @@ impl<'a> Parser<'a> {
                     AssocTyConstraintKind::Equality { ty: self.parse_ty()? }
                 } else if self.eat(&token::Colon) {
                     AssocTyConstraintKind::Bound {
-                        bounds: self.parse_generic_bounds(Some(self.prev_span))?,
+                        bounds: self.parse_generic_bounds(Some(self.prev_token.span))?,
                     }
                 } else {
                     unreachable!();
                 };
 
-                let span = lo.to(self.prev_span);
+                let span = lo.to(self.prev_token.span);
 
                 // Gate associated type bounds, e.g., `Iterator<Item: Ord>`.
                 if let AssocTyConstraintKind::Bound { .. } = kind {
@@ -434,9 +471,9 @@ impl<'a> Parser<'a> {
         // FIXME: we would like to report this in ast_validation instead, but we currently do not
         // preserve ordering of generic parameters with respect to associated type binding, so we
         // lose that information after parsing.
-        if misplaced_assoc_ty_constraints.len() > 0 {
+        if !misplaced_assoc_ty_constraints.is_empty() {
             let mut err = self.struct_span_err(
-                args_lo.to(self.prev_span),
+                args_lo.to(self.prev_token.span),
                 "associated type bindings must be declared after generic parameters",
             );
             for span in misplaced_assoc_ty_constraints {
diff --git a/src/librustc_parse/parser/stmt.rs b/src/librustc_parse/parser/stmt.rs
index a94d8228bb..3864ec3aaa 100644
--- a/src/librustc_parse/parser/stmt.rs
+++ b/src/librustc_parse/parser/stmt.rs
@@ -2,19 +2,19 @@ use super::diagnostics::Error;
 use super::expr::LhsExpr;
 use super::pat::GateOr;
 use super::path::PathStyle;
-use super::{BlockMode, Parser, PrevTokenKind, Restrictions, SemiColonMode};
+use super::{BlockMode, Parser, Restrictions, SemiColonMode};
 use crate::maybe_whole;
 use crate::DirectoryOwnership;
 
+use rustc_ast::ast;
+use rustc_ast::ast::{AttrStyle, AttrVec, Attribute, Mac, MacStmtStyle};
+use rustc_ast::ast::{Block, BlockCheckMode, Expr, ExprKind, Local, Stmt, StmtKind, DUMMY_NODE_ID};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, TokenKind};
+use rustc_ast::util::classify;
 use rustc_errors::{Applicability, PResult};
-use rustc_span::source_map::{respan, Span};
-use rustc_span::symbol::{kw, sym, Symbol};
-use syntax::ast;
-use syntax::ast::{AttrStyle, AttrVec, Attribute, Mac, MacStmtStyle, VisibilityKind};
-use syntax::ast::{Block, BlockCheckMode, Expr, ExprKind, Local, Stmt, StmtKind, DUMMY_NODE_ID};
-use syntax::ptr::P;
-use syntax::token;
-use syntax::util::classify;
+use rustc_span::source_map::{BytePos, Span};
+use rustc_span::symbol::{kw, sym};
 
 use std::mem;
 
@@ -22,126 +22,92 @@ impl<'a> Parser<'a> {
     /// Parses a statement. This stops just before trailing semicolons on everything but items.
     /// e.g., a `StmtKind::Semi` parses to a `StmtKind::Expr`, leaving the trailing `;` unconsumed.
     pub fn parse_stmt(&mut self) -> PResult<'a, Option<Stmt>> {
-        Ok(self.parse_stmt_without_recovery(true).unwrap_or_else(|mut e| {
+        Ok(self.parse_stmt_without_recovery().unwrap_or_else(|mut e| {
             e.emit();
             self.recover_stmt_(SemiColonMode::Break, BlockMode::Ignore);
             None
         }))
     }
 
-    fn parse_stmt_without_recovery(
-        &mut self,
-        macro_legacy_warnings: bool,
-    ) -> PResult<'a, Option<Stmt>> {
+    fn parse_stmt_without_recovery(&mut self) -> PResult<'a, Option<Stmt>> {
         maybe_whole!(self, NtStmt, |x| Some(x));
 
         let attrs = self.parse_outer_attributes()?;
         let lo = self.token.span;
 
-        if self.eat_keyword(kw::Let) {
-            return self.parse_local_mk(lo, attrs.into()).map(Some);
-        }
-        if self.is_kw_followed_by_ident(kw::Mut) {
-            return self.recover_stmt_local(lo, attrs.into(), "missing keyword", "let mut");
-        }
-        if self.is_kw_followed_by_ident(kw::Auto) {
+        let stmt = if self.eat_keyword(kw::Let) {
+            self.parse_local_mk(lo, attrs.into())?
+        } else if self.is_kw_followed_by_ident(kw::Mut) {
+            self.recover_stmt_local(lo, attrs.into(), "missing keyword", "let mut")?
+        } else if self.is_kw_followed_by_ident(kw::Auto) {
             self.bump(); // `auto`
             let msg = "write `let` instead of `auto` to introduce a new variable";
-            return self.recover_stmt_local(lo, attrs.into(), msg, "let");
-        }
-        if self.is_kw_followed_by_ident(sym::var) {
+            self.recover_stmt_local(lo, attrs.into(), msg, "let")?
+        } else if self.is_kw_followed_by_ident(sym::var) {
             self.bump(); // `var`
             let msg = "write `let` instead of `var` to introduce a new variable";
-            return self.recover_stmt_local(lo, attrs.into(), msg, "let");
-        }
-
-        let mac_vis = respan(lo, VisibilityKind::Inherited);
-        if let Some(macro_def) = self.eat_macro_def(&attrs, &mac_vis, lo)? {
-            return Ok(Some(self.mk_stmt(lo.to(self.prev_span), StmtKind::Item(macro_def))));
-        }
-
-        // Starts like a simple path, being careful to avoid contextual keywords
-        // such as a union items, item with `crate` visibility or auto trait items.
-        // Our goal here is to parse an arbitrary path `a::b::c` but not something that starts
-        // like a path (1 token), but it fact not a path.
-        if self.token.is_path_start()
+            self.recover_stmt_local(lo, attrs.into(), msg, "let")?
+        } else if self.token.is_path_start()
             && !self.token.is_qpath_start()
-            && !self.is_union_item() // `union::b::c` - path, `union U { ... }` - not a path.
-            && !self.is_crate_vis() // `crate::b::c` - path, `crate struct S;` - not a path.
-            && !self.is_auto_trait_item()
-            && !self.is_async_fn()
+            && !self.is_path_start_item()
         {
-            let path = self.parse_path(PathStyle::Expr)?;
-
-            if self.eat(&token::Not) {
-                return self.parse_stmt_mac(lo, attrs.into(), path, macro_legacy_warnings);
-            }
-
-            let expr = if self.check(&token::OpenDelim(token::Brace)) {
-                self.parse_struct_expr(lo, path, AttrVec::new())?
-            } else {
-                let hi = self.prev_span;
-                self.mk_expr(lo.to(hi), ExprKind::Path(None, path), AttrVec::new())
-            };
-
-            let expr = self.with_res(Restrictions::STMT_EXPR, |this| {
-                let expr = this.parse_dot_or_call_expr_with(expr, lo, attrs.into())?;
-                this.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(expr))
-            })?;
-            return Ok(Some(self.mk_stmt(lo.to(self.prev_span), StmtKind::Expr(expr))));
-        }
+            // We have avoided contextual keywords like `union`, items with `crate` visibility,
+            // or `auto trait` items. We aim to parse an arbitrary path `a::b` but not something
+            // that starts like a path (1 token), but it fact not a path.
+            // Also, we avoid stealing syntax from `parse_item_`.
+            self.parse_stmt_path_start(lo, attrs)?
+        } else if let Some(item) = self.parse_stmt_item(attrs.clone())? {
+            // FIXME: Bad copy of attrs
+            self.mk_stmt(lo.to(item.span), StmtKind::Item(P(item)))
+        } else if self.eat(&token::Semi) {
+            // Do not attempt to parse an expression if we're done here.
+            self.error_outer_attrs(&attrs);
+            self.mk_stmt(lo, StmtKind::Empty)
+        } else if self.token != token::CloseDelim(token::Brace) {
+            // Remainder are line-expr stmts.
+            let e = self.parse_expr_res(Restrictions::STMT_EXPR, Some(attrs.into()))?;
+            self.mk_stmt(lo.to(e.span), StmtKind::Expr(e))
+        } else {
+            self.error_outer_attrs(&attrs);
+            return Ok(None);
+        };
+        Ok(Some(stmt))
+    }
 
-        // FIXME: Bad copy of attrs
-        let old_directory_ownership =
-            mem::replace(&mut self.directory.ownership, DirectoryOwnership::UnownedViaBlock);
-        let item = self.parse_item_(attrs.clone(), false, true)?;
-        self.directory.ownership = old_directory_ownership;
+    fn parse_stmt_item(&mut self, attrs: Vec<Attribute>) -> PResult<'a, Option<ast::Item>> {
+        let old = mem::replace(&mut self.directory.ownership, DirectoryOwnership::UnownedViaBlock);
+        let item = self.parse_item_common(attrs, false, true, |_| true)?;
+        self.directory.ownership = old;
+        Ok(item)
+    }
 
-        if let Some(item) = item {
-            return Ok(Some(self.mk_stmt(lo.to(item.span), StmtKind::Item(item))));
-        }
+    fn parse_stmt_path_start(&mut self, lo: Span, attrs: Vec<Attribute>) -> PResult<'a, Stmt> {
+        let path = self.parse_path(PathStyle::Expr)?;
 
-        // Do not attempt to parse an expression if we're done here.
-        if self.token == token::Semi {
-            self.error_outer_attrs(&attrs);
-            self.bump();
-            let mut last_semi = lo;
-            while self.token == token::Semi {
-                last_semi = self.token.span;
-                self.bump();
-            }
-            // We are encoding a string of semicolons as an an empty tuple that spans
-            // the excess semicolons to preserve this info until the lint stage.
-            let kind = StmtKind::Semi(self.mk_expr(
-                lo.to(last_semi),
-                ExprKind::Tup(Vec::new()),
-                AttrVec::new(),
-            ));
-            return Ok(Some(self.mk_stmt(lo.to(last_semi), kind)));
+        if self.eat(&token::Not) {
+            return self.parse_stmt_mac(lo, attrs.into(), path);
         }
 
-        if self.token == token::CloseDelim(token::Brace) {
-            self.error_outer_attrs(&attrs);
-            return Ok(None);
-        }
+        let expr = if self.check(&token::OpenDelim(token::Brace)) {
+            self.parse_struct_expr(lo, path, AttrVec::new())?
+        } else {
+            let hi = self.prev_token.span;
+            self.mk_expr(lo.to(hi), ExprKind::Path(None, path), AttrVec::new())
+        };
 
-        // Remainder are line-expr stmts.
-        let e = self.parse_expr_res(Restrictions::STMT_EXPR, Some(attrs.into()))?;
-        Ok(Some(self.mk_stmt(lo.to(e.span), StmtKind::Expr(e))))
+        let expr = self.with_res(Restrictions::STMT_EXPR, |this| {
+            let expr = this.parse_dot_or_call_expr_with(expr, lo, attrs.into())?;
+            this.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(expr))
+        })?;
+        Ok(self.mk_stmt(lo.to(self.prev_token.span), StmtKind::Expr(expr)))
     }
 
     /// Parses a statement macro `mac!(args)` provided a `path` representing `mac`.
     /// At this point, the `!` token after the path has already been eaten.
-    fn parse_stmt_mac(
-        &mut self,
-        lo: Span,
-        attrs: AttrVec,
-        path: ast::Path,
-        legacy_warnings: bool,
-    ) -> PResult<'a, Option<Stmt>> {
+    fn parse_stmt_mac(&mut self, lo: Span, attrs: AttrVec, path: ast::Path) -> PResult<'a, Stmt> {
         let args = self.parse_mac_args()?;
         let delim = args.delim();
-        let hi = self.prev_span;
+        let hi = self.prev_token.span;
 
         let style =
             if delim == token::Brace { MacStmtStyle::Braces } else { MacStmtStyle::NoBraces };
@@ -150,30 +116,6 @@ impl<'a> Parser<'a> {
 
         let kind = if delim == token::Brace || self.token == token::Semi || self.token == token::Eof
         {
-            StmtKind::Mac(P((mac, style, attrs.into())))
-        }
-        // We used to incorrectly stop parsing macro-expanded statements here.
-        // If the next token will be an error anyway but could have parsed with the
-        // earlier behavior, stop parsing here and emit a warning to avoid breakage.
-        else if legacy_warnings
-            && self.token.can_begin_expr()
-            && match self.token.kind {
-                // These can continue an expression, so we can't stop parsing and warn.
-                token::OpenDelim(token::Paren)
-                | token::OpenDelim(token::Bracket)
-                | token::BinOp(token::Minus)
-                | token::BinOp(token::Star)
-                | token::BinOp(token::And)
-                | token::BinOp(token::Or)
-                | token::AndAnd
-                | token::OrOr
-                | token::DotDot
-                | token::DotDotDot
-                | token::DotDotEq => false,
-                _ => true,
-            }
-        {
-            self.warn_missing_semicolon();
             StmtKind::Mac(P((mac, style, attrs)))
         } else {
             // Since none of the above applied, this is an expression statement macro.
@@ -183,55 +125,50 @@ impl<'a> Parser<'a> {
             let e = self.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(e))?;
             StmtKind::Expr(e)
         };
-        Ok(Some(self.mk_stmt(lo.to(hi), kind)))
+        Ok(self.mk_stmt(lo.to(hi), kind))
     }
 
     /// Error on outer attributes in this context.
     /// Also error if the previous token was a doc comment.
     fn error_outer_attrs(&self, attrs: &[Attribute]) {
-        if !attrs.is_empty() {
-            if self.prev_token_kind == PrevTokenKind::DocComment {
-                self.span_fatal_err(self.prev_span, Error::UselessDocComment).emit();
+        if let [.., last] = attrs {
+            if last.is_doc_comment() {
+                self.span_fatal_err(last.span, Error::UselessDocComment).emit();
             } else if attrs.iter().any(|a| a.style == AttrStyle::Outer) {
-                self.struct_span_err(self.token.span, "expected statement after outer attribute")
-                    .emit();
+                self.struct_span_err(last.span, "expected statement after outer attribute").emit();
             }
         }
     }
 
-    fn is_kw_followed_by_ident(&self, kw: Symbol) -> bool {
-        self.token.is_keyword(kw) && self.look_ahead(1, |t| t.is_ident() && !t.is_reserved_ident())
-    }
-
     fn recover_stmt_local(
         &mut self,
         lo: Span,
         attrs: AttrVec,
         msg: &str,
         sugg: &str,
-    ) -> PResult<'a, Option<Stmt>> {
+    ) -> PResult<'a, Stmt> {
         let stmt = self.parse_local_mk(lo, attrs)?;
         self.struct_span_err(lo, "invalid variable declaration")
             .span_suggestion(lo, msg, sugg.to_string(), Applicability::MachineApplicable)
             .emit();
-        Ok(Some(stmt))
+        Ok(stmt)
     }
 
     fn parse_local_mk(&mut self, lo: Span, attrs: AttrVec) -> PResult<'a, Stmt> {
-        let local = self.parse_local(attrs.into())?;
-        Ok(self.mk_stmt(lo.to(self.prev_span), StmtKind::Local(local)))
+        let local = self.parse_local(attrs)?;
+        Ok(self.mk_stmt(lo.to(self.prev_token.span), StmtKind::Local(local)))
     }
 
     /// Parses a local variable declaration.
     fn parse_local(&mut self, attrs: AttrVec) -> PResult<'a, P<Local>> {
-        let lo = self.prev_span;
+        let lo = self.prev_token.span;
         let pat = self.parse_top_pat(GateOr::Yes)?;
 
         let (err, ty) = if self.eat(&token::Colon) {
             // Save the state of the parser before parsing type normally, in case there is a `:`
             // instead of an `=` typo.
             let parser_snapshot_before_type = self.clone();
-            let colon_sp = self.prev_span;
+            let colon_sp = self.prev_token.span;
             match self.parse_ty() {
                 Ok(ty) => (None, Some(ty)),
                 Err(mut err) => {
@@ -284,7 +221,7 @@ impl<'a> Parser<'a> {
                 return Err(err);
             }
         };
-        let hi = if self.token == token::Semi { self.token.span } else { self.prev_span };
+        let hi = if self.token == token::Semi { self.token.span } else { self.prev_token.span };
         Ok(P(ast::Local { ty, pat, init, id: DUMMY_NODE_ID, span: lo.to(hi), attrs }))
     }
 
@@ -299,16 +236,6 @@ impl<'a> Parser<'a> {
         }
     }
 
-    fn is_auto_trait_item(&self) -> bool {
-        // auto trait
-        (self.token.is_keyword(kw::Auto) &&
-            self.is_keyword_ahead(1, &[kw::Trait]))
-        || // unsafe auto trait
-        (self.token.is_keyword(kw::Unsafe) &&
-         self.is_keyword_ahead(1, &[kw::Auto]) &&
-         self.is_keyword_ahead(2, &[kw::Trait]))
-    }
-
     /// Parses a block. No inner attributes are allowed.
     pub fn parse_block(&mut self) -> PResult<'a, P<Block>> {
         maybe_whole!(self, NtBlock, |x| x);
@@ -334,7 +261,7 @@ impl<'a> Parser<'a> {
         //      bar;
         //
         // which is valid in other languages, but not Rust.
-        match self.parse_stmt_without_recovery(false) {
+        match self.parse_stmt_without_recovery() {
             Ok(Some(stmt)) => {
                 if self.look_ahead(1, |t| t == &token::OpenDelim(token::Brace))
                     || do_not_suggest_help
@@ -346,7 +273,7 @@ impl<'a> Parser<'a> {
                 }
                 let stmt_span = if self.eat(&token::Semi) {
                     // Expand the span to include the semicolon.
-                    stmt.span.with_hi(self.prev_span.hi())
+                    stmt.span.with_hi(self.prev_token.span.hi())
                 } else {
                     stmt.span
                 };
@@ -393,7 +320,7 @@ impl<'a> Parser<'a> {
             if self.token == token::Eof {
                 break;
             }
-            let stmt = match self.parse_full_stmt(false) {
+            let stmt = match self.parse_full_stmt() {
                 Err(mut err) => {
                     self.maybe_annotate_with_ascription(&mut err, false);
                     err.emit();
@@ -409,66 +336,68 @@ impl<'a> Parser<'a> {
                 continue;
             };
         }
-        Ok(self.mk_block(stmts, s, lo.to(self.prev_span)))
+        Ok(self.mk_block(stmts, s, lo.to(self.prev_token.span)))
     }
 
     /// Parses a statement, including the trailing semicolon.
-    pub fn parse_full_stmt(&mut self, macro_legacy_warnings: bool) -> PResult<'a, Option<Stmt>> {
+    pub fn parse_full_stmt(&mut self) -> PResult<'a, Option<Stmt>> {
         // Skip looking for a trailing semicolon when we have an interpolated statement.
         maybe_whole!(self, NtStmt, |x| Some(x));
 
-        let mut stmt = match self.parse_stmt_without_recovery(macro_legacy_warnings)? {
+        let mut stmt = match self.parse_stmt_without_recovery()? {
             Some(stmt) => stmt,
             None => return Ok(None),
         };
 
         let mut eat_semi = true;
         match stmt.kind {
-            StmtKind::Expr(ref expr) if self.token != token::Eof => {
-                // expression without semicolon
-                if classify::expr_requires_semi_to_be_stmt(expr) {
-                    // Just check for errors and recover; do not eat semicolon yet.
-                    if let Err(mut e) =
-                        self.expect_one_of(&[], &[token::Semi, token::CloseDelim(token::Brace)])
-                    {
-                        e.emit();
-                        self.recover_stmt();
-                        // Don't complain about type errors in body tail after parse error (#57383).
-                        let sp = expr.span.to(self.prev_span);
-                        stmt.kind = StmtKind::Expr(self.mk_expr_err(sp));
+            // Expression without semicolon.
+            StmtKind::Expr(ref expr)
+                if self.token != token::Eof && classify::expr_requires_semi_to_be_stmt(expr) =>
+            {
+                // Just check for errors and recover; do not eat semicolon yet.
+                if let Err(mut e) =
+                    self.expect_one_of(&[], &[token::Semi, token::CloseDelim(token::Brace)])
+                {
+                    if let TokenKind::DocComment(..) = self.token.kind {
+                        if let Ok(snippet) = self.span_to_snippet(self.token.span) {
+                            let sp = self.token.span;
+                            let marker = &snippet[..3];
+                            let (comment_marker, doc_comment_marker) = marker.split_at(2);
+
+                            e.span_suggestion(
+                                sp.with_hi(sp.lo() + BytePos(marker.len() as u32)),
+                                &format!(
+                                    "add a space before `{}` to use a regular comment",
+                                    doc_comment_marker,
+                                ),
+                                format!("{} {}", comment_marker, doc_comment_marker),
+                                Applicability::MaybeIncorrect,
+                            );
+                        }
                     }
+                    e.emit();
+                    self.recover_stmt();
+                    // Don't complain about type errors in body tail after parse error (#57383).
+                    let sp = expr.span.to(self.prev_token.span);
+                    stmt.kind = StmtKind::Expr(self.mk_expr_err(sp));
                 }
             }
             StmtKind::Local(..) => {
-                // We used to incorrectly allow a macro-expanded let statement to lack a semicolon.
-                if macro_legacy_warnings && self.token != token::Semi {
-                    self.warn_missing_semicolon();
-                } else {
-                    self.expect_semi()?;
-                    eat_semi = false;
-                }
+                self.expect_semi()?;
+                eat_semi = false;
             }
+            StmtKind::Empty => eat_semi = false,
             _ => {}
         }
 
         if eat_semi && self.eat(&token::Semi) {
             stmt = stmt.add_trailing_semicolon();
         }
-        stmt.span = stmt.span.to(self.prev_span);
+        stmt.span = stmt.span.to(self.prev_token.span);
         Ok(Some(stmt))
     }
 
-    fn warn_missing_semicolon(&self) {
-        self.diagnostic()
-            .struct_span_warn(self.token.span, {
-                &format!("expected `;`, found {}", super::token_descr(&self.token))
-            })
-            .note({
-                "this was erroneously allowed and will become a hard error in a future release"
-            })
-            .emit();
-    }
-
     pub(super) fn mk_block(&self, stmts: Vec<Stmt>, rules: BlockCheckMode, span: Span) -> P<Block> {
         P(Block { stmts, id: DUMMY_NODE_ID, rules, span })
     }
diff --git a/src/librustc_parse/parser/ty.rs b/src/librustc_parse/parser/ty.rs
index a4cc9fa48f..16adf5c05a 100644
--- a/src/librustc_parse/parser/ty.rs
+++ b/src/librustc_parse/parser/ty.rs
@@ -1,20 +1,17 @@
-use super::item::ParamCfg;
-use super::{Parser, PathStyle, PrevTokenKind, TokenType};
+use super::{Parser, PathStyle, TokenType};
 
 use crate::{maybe_recover_from_interpolated_ty_qpath, maybe_whole};
 
+use rustc_ast::ast::{self, BareFnTy, FnRetTy, GenericParam, Lifetime, MutTy, Ty, TyKind};
+use rustc_ast::ast::{
+    GenericBound, GenericBounds, PolyTraitRef, TraitBoundModifier, TraitObjectSyntax,
+};
+use rustc_ast::ast::{Mac, Mutability};
+use rustc_ast::ptr::P;
+use rustc_ast::token::{self, Token, TokenKind};
 use rustc_errors::{pluralize, struct_span_err, Applicability, PResult};
 use rustc_span::source_map::Span;
 use rustc_span::symbol::{kw, sym};
-use syntax::ast::{
-    self, BareFnTy, FunctionRetTy, GenericParam, Ident, Lifetime, MutTy, Ty, TyKind,
-};
-use syntax::ast::{
-    GenericBound, GenericBounds, PolyTraitRef, TraitBoundModifier, TraitObjectSyntax,
-};
-use syntax::ast::{Mac, Mutability};
-use syntax::ptr::P;
-use syntax::token::{self, Token};
 
 /// Any `?` or `?const` modifiers that appear at the start of a bound.
 struct BoundModifiers {
@@ -36,6 +33,25 @@ impl BoundModifiers {
     }
 }
 
+#[derive(Copy, Clone, PartialEq)]
+pub(super) enum AllowPlus {
+    Yes,
+    No,
+}
+
+#[derive(PartialEq)]
+pub(super) enum RecoverQPath {
+    Yes,
+    No,
+}
+
+// Is `...` (`CVarArgs`) legal at this level of type parsing?
+#[derive(PartialEq)]
+enum AllowCVariadic {
+    Yes,
+    No,
+}
+
 /// Returns `true` if `IDENT t` can start a type -- `IDENT::a::b`, `IDENT<u8, u8>`,
 /// `IDENT<<u8 as Trait>::AssocTy>`.
 ///
@@ -48,14 +64,14 @@ fn can_continue_type_after_non_fn_ident(t: &Token) -> bool {
 impl<'a> Parser<'a> {
     /// Parses a type.
     pub fn parse_ty(&mut self) -> PResult<'a, P<Ty>> {
-        self.parse_ty_common(true, true, false)
+        self.parse_ty_common(AllowPlus::Yes, RecoverQPath::Yes, AllowCVariadic::No)
     }
 
     /// Parse a type suitable for a function or function pointer parameter.
     /// The difference from `parse_ty` is that this version allows `...`
     /// (`CVarArgs`) at the top level of the the type.
     pub(super) fn parse_ty_for_param(&mut self) -> PResult<'a, P<Ty>> {
-        self.parse_ty_common(true, true, true)
+        self.parse_ty_common(AllowPlus::Yes, RecoverQPath::Yes, AllowCVariadic::Yes)
     }
 
     /// Parses a type in restricted contexts where `+` is not permitted.
@@ -65,30 +81,31 @@ impl<'a> Parser<'a> {
     /// Example 2: `value1 as TYPE + value2`
     ///     `+` is prohibited to avoid interactions with expression grammar.
     pub(super) fn parse_ty_no_plus(&mut self) -> PResult<'a, P<Ty>> {
-        self.parse_ty_common(false, true, false)
+        self.parse_ty_common(AllowPlus::No, RecoverQPath::Yes, AllowCVariadic::No)
     }
 
     /// Parses an optional return type `[ -> TY ]` in a function declaration.
     pub(super) fn parse_ret_ty(
         &mut self,
-        allow_plus: bool,
-        allow_qpath_recovery: bool,
-    ) -> PResult<'a, FunctionRetTy> {
+        allow_plus: AllowPlus,
+        recover_qpath: RecoverQPath,
+    ) -> PResult<'a, FnRetTy> {
         Ok(if self.eat(&token::RArrow) {
             // FIXME(Centril): Can we unconditionally `allow_plus`?
-            FunctionRetTy::Ty(self.parse_ty_common(allow_plus, allow_qpath_recovery, false)?)
+            let ty = self.parse_ty_common(allow_plus, recover_qpath, AllowCVariadic::No)?;
+            FnRetTy::Ty(ty)
         } else {
-            FunctionRetTy::Default(self.token.span.shrink_to_lo())
+            FnRetTy::Default(self.token.span.shrink_to_lo())
         })
     }
 
     fn parse_ty_common(
         &mut self,
-        allow_plus: bool,
-        allow_qpath_recovery: bool,
-        // Is `...` (`CVarArgs`) legal in the immediate top level call?
-        allow_c_variadic: bool,
+        allow_plus: AllowPlus,
+        recover_qpath: RecoverQPath,
+        allow_c_variadic: AllowCVariadic,
     ) -> PResult<'a, P<Ty>> {
+        let allow_qpath_recovery = recover_qpath == RecoverQPath::Yes;
         maybe_recover_from_interpolated_ty_qpath!(self, allow_qpath_recovery);
         maybe_whole!(self, NtTy, |x| x);
 
@@ -124,7 +141,7 @@ impl<'a> Parser<'a> {
                 self.parse_ty_bare_fn(lifetime_defs)?
             } else {
                 let path = self.parse_path(PathStyle::Type)?;
-                let parse_plus = allow_plus && self.check_plus();
+                let parse_plus = allow_plus == AllowPlus::Yes && self.check_plus();
                 self.parse_remaining_bounds(lifetime_defs, path, lo, parse_plus)?
             }
         } else if self.eat_keyword(kw::Impl) {
@@ -144,7 +161,7 @@ impl<'a> Parser<'a> {
         } else if self.token.is_path_start() {
             self.parse_path_start_ty(lo, allow_plus)?
         } else if self.eat(&token::DotDotDot) {
-            if allow_c_variadic {
+            if allow_c_variadic == AllowCVariadic::Yes {
                 TyKind::CVarArgs
             } else {
                 // FIXME(Centril): Should we just allow `...` syntactically
@@ -160,7 +177,7 @@ impl<'a> Parser<'a> {
             return Err(err);
         };
 
-        let span = lo.to(self.prev_span);
+        let span = lo.to(self.prev_token.span);
         let ty = self.mk_ty(span, kind);
 
         // Try to recover from use of `+` with incorrect priority.
@@ -172,17 +189,17 @@ impl<'a> Parser<'a> {
     /// Parses either:
     /// - `(TYPE)`, a parenthesized type.
     /// - `(TYPE,)`, a tuple with a single field of type TYPE.
-    fn parse_ty_tuple_or_parens(&mut self, lo: Span, allow_plus: bool) -> PResult<'a, TyKind> {
+    fn parse_ty_tuple_or_parens(&mut self, lo: Span, allow_plus: AllowPlus) -> PResult<'a, TyKind> {
         let mut trailing_plus = false;
         let (ts, trailing) = self.parse_paren_comma_seq(|p| {
             let ty = p.parse_ty()?;
-            trailing_plus = p.prev_token_kind == PrevTokenKind::Plus;
+            trailing_plus = p.prev_token.kind == TokenKind::BinOp(token::Plus);
             Ok(ty)
         })?;
 
         if ts.len() == 1 && !trailing {
-            let ty = ts.into_iter().nth(0).unwrap().into_inner();
-            let maybe_bounds = allow_plus && self.token.is_like_plus();
+            let ty = ts.into_iter().next().unwrap().into_inner();
+            let maybe_bounds = allow_plus == AllowPlus::Yes && self.token.is_like_plus();
             match ty.kind {
                 // `(TY_BOUND_NOPAREN) + BOUND + ...`.
                 TyKind::Path(None, path) if maybe_bounds => {
@@ -194,7 +211,10 @@ impl<'a> Parser<'a> {
                     let path = match bounds.remove(0) {
                         GenericBound::Trait(pt, ..) => pt.trait_ref.path,
                         GenericBound::Outlives(..) => {
-                            self.span_bug(ty.span, "unexpected lifetime bound")
+                            return Err(self.struct_span_err(
+                                ty.span,
+                                "expected trait bound, not lifetime bound",
+                            ));
                         }
                     };
                     self.parse_remaining_bounds(Vec::new(), path, lo, true)
@@ -216,11 +236,11 @@ impl<'a> Parser<'a> {
     ) -> PResult<'a, TyKind> {
         assert_ne!(self.token, token::Question);
 
-        let poly_trait_ref = PolyTraitRef::new(generic_params, path, lo.to(self.prev_span));
+        let poly_trait_ref = PolyTraitRef::new(generic_params, path, lo.to(self.prev_token.span));
         let mut bounds = vec![GenericBound::Trait(poly_trait_ref, TraitBoundModifier::None)];
         if parse_plus {
             self.eat_plus(); // `+`, or `+=` gets split and `+` is discarded
-            bounds.append(&mut self.parse_generic_bounds(Some(self.prev_span))?);
+            bounds.append(&mut self.parse_generic_bounds(Some(self.prev_token.span))?);
         }
         Ok(TyKind::TraitObject(bounds, TraitObjectSyntax::None))
     }
@@ -228,7 +248,7 @@ impl<'a> Parser<'a> {
     /// Parses a raw pointer type: `*[const | mut] $type`.
     fn parse_ty_ptr(&mut self) -> PResult<'a, TyKind> {
         let mutbl = self.parse_const_or_mut().unwrap_or_else(|| {
-            let span = self.prev_span;
+            let span = self.prev_token.span;
             let msg = "expected mut or const in raw pointer type";
             self.struct_span_err(span, msg)
                 .span_label(span, msg)
@@ -288,8 +308,7 @@ impl<'a> Parser<'a> {
         let unsafety = self.parse_unsafety();
         let ext = self.parse_extern()?;
         self.expect_keyword(kw::Fn)?;
-        let cfg = ParamCfg { is_self_allowed: false, is_name_required: |_| false };
-        let decl = self.parse_fn_decl(cfg, false)?;
+        let decl = self.parse_fn_decl(|_| false, AllowPlus::No)?;
         Ok(TyKind::BareFn(P(BareFnTy { ext, unsafety, generic_params, decl })))
     }
 
@@ -297,14 +316,14 @@ impl<'a> Parser<'a> {
     fn parse_impl_ty(&mut self, impl_dyn_multi: &mut bool) -> PResult<'a, TyKind> {
         // Always parse bounds greedily for better error recovery.
         let bounds = self.parse_generic_bounds(None)?;
-        *impl_dyn_multi = bounds.len() > 1 || self.prev_token_kind == PrevTokenKind::Plus;
+        *impl_dyn_multi = bounds.len() > 1 || self.prev_token.kind == TokenKind::BinOp(token::Plus);
         Ok(TyKind::ImplTrait(ast::DUMMY_NODE_ID, bounds))
     }
 
     /// Is a `dyn B0 + ... + Bn` type allowed here?
     fn is_explicit_dyn_type(&mut self) -> bool {
         self.check_keyword(kw::Dyn)
-            && (self.token.span.rust_2018()
+            && (self.token.uninterpolated_span().rust_2018()
                 || self.look_ahead(1, |t| {
                     t.can_begin_bound() && !can_continue_type_after_non_fn_ident(t)
                 }))
@@ -317,7 +336,7 @@ impl<'a> Parser<'a> {
         self.bump(); // `dyn`
         // Always parse bounds greedily for better error recovery.
         let bounds = self.parse_generic_bounds(None)?;
-        *impl_dyn_multi = bounds.len() > 1 || self.prev_token_kind == PrevTokenKind::Plus;
+        *impl_dyn_multi = bounds.len() > 1 || self.prev_token.kind == TokenKind::BinOp(token::Plus);
         Ok(TyKind::TraitObject(bounds, TraitObjectSyntax::Dyn))
     }
 
@@ -327,7 +346,7 @@ impl<'a> Parser<'a> {
     /// 1. a type macro, `mac!(...)`,
     /// 2. a bare trait object, `B0 + ... + Bn`,
     /// 3. or a path, `path::to::MyType`.
-    fn parse_path_start_ty(&mut self, lo: Span, allow_plus: bool) -> PResult<'a, TyKind> {
+    fn parse_path_start_ty(&mut self, lo: Span, allow_plus: AllowPlus) -> PResult<'a, TyKind> {
         // Simple path
         let path = self.parse_path(PathStyle::Type)?;
         if self.eat(&token::Not) {
@@ -337,7 +356,7 @@ impl<'a> Parser<'a> {
                 args: self.parse_mac_args()?,
                 prior_type_ascription: self.last_type_ascription,
             }))
-        } else if allow_plus && self.check_plus() {
+        } else if allow_plus == AllowPlus::Yes && self.check_plus() {
             // `Trait1 + Trait2 + 'a`
             self.parse_remaining_bounds(Vec::new(), path, lo, true)
         } else {
@@ -349,7 +368,7 @@ impl<'a> Parser<'a> {
     fn error_illegal_c_varadic_ty(&self, lo: Span) {
         struct_span_err!(
             self.sess.span_diagnostic,
-            lo.to(self.prev_span),
+            lo.to(self.prev_token.span),
             E0743,
             "C-variadic type `...` may not be nested inside another type",
         )
@@ -360,7 +379,7 @@ impl<'a> Parser<'a> {
         &mut self,
         colon_span: Option<Span>,
     ) -> PResult<'a, GenericBounds> {
-        self.parse_generic_bounds_common(true, colon_span)
+        self.parse_generic_bounds_common(AllowPlus::Yes, colon_span)
     }
 
     /// Parses bounds of a type parameter `BOUND + BOUND + ...`, possibly with trailing `+`.
@@ -368,7 +387,7 @@ impl<'a> Parser<'a> {
     /// See `parse_generic_bound` for the `BOUND` grammar.
     fn parse_generic_bounds_common(
         &mut self,
-        allow_plus: bool,
+        allow_plus: AllowPlus,
         colon_span: Option<Span>,
     ) -> PResult<'a, GenericBounds> {
         let mut bounds = Vec::new();
@@ -378,7 +397,7 @@ impl<'a> Parser<'a> {
                 Ok(bound) => bounds.push(bound),
                 Err(neg_sp) => negative_bounds.push(neg_sp),
             }
-            if !allow_plus || !self.eat_plus() {
+            if allow_plus == AllowPlus::No || !self.eat_plus() {
                 break;
             }
         }
@@ -412,7 +431,7 @@ impl<'a> Parser<'a> {
         let mut err = self.struct_span_err(negative_bounds, "negative bounds are not supported");
         err.span_label(last_span, "negative bounds are not supported");
         if let Some(bound_list) = colon_span {
-            let bound_list = bound_list.to(self.prev_span);
+            let bound_list = bound_list.to(self.prev_token.span);
             let mut new_bound_list = String::new();
             if !bounds.is_empty() {
                 let mut snippets = bounds.iter().map(|bound| self.span_to_snippet(bound.span()));
@@ -437,7 +456,7 @@ impl<'a> Parser<'a> {
     /// BOUND = TY_BOUND | LT_BOUND
     /// ```
     fn parse_generic_bound(&mut self) -> PResult<'a, Result<GenericBound, Span>> {
-        let anchor_lo = self.prev_span;
+        let anchor_lo = self.prev_token.span;
         let lo = self.token.span;
         let has_parens = self.eat(&token::OpenDelim(token::Paren));
         let inner_lo = self.token.span;
@@ -451,7 +470,7 @@ impl<'a> Parser<'a> {
             self.parse_generic_ty_bound(lo, has_parens, modifiers)?
         };
 
-        Ok(if is_negative { Err(anchor_lo.to(self.prev_span)) } else { Ok(bound) })
+        Ok(if is_negative { Err(anchor_lo.to(self.prev_token.span)) } else { Ok(bound) })
     }
 
     /// Parses a lifetime ("outlives") bound, e.g. `'a`, according to:
@@ -491,15 +510,15 @@ impl<'a> Parser<'a> {
 
     /// Recover on `('lifetime)` with `(` already eaten.
     fn recover_paren_lifetime(&mut self, lo: Span, inner_lo: Span) -> PResult<'a, ()> {
-        let inner_span = inner_lo.to(self.prev_span);
+        let inner_span = inner_lo.to(self.prev_token.span);
         self.expect(&token::CloseDelim(token::Paren))?;
         let mut err = self.struct_span_err(
-            lo.to(self.prev_span),
+            lo.to(self.prev_token.span),
             "parenthesized lifetime bounds are not supported",
         );
         if let Ok(snippet) = self.span_to_snippet(inner_span) {
             err.span_suggestion_short(
-                lo.to(self.prev_span),
+                lo.to(self.prev_token.span),
                 "remove the parentheses",
                 snippet,
                 Applicability::MachineApplicable,
@@ -522,20 +541,20 @@ impl<'a> Parser<'a> {
         }
 
         // `? ...`
-        let first_question = self.prev_span;
+        let first_question = self.prev_token.span;
         if !self.eat_keyword(kw::Const) {
             return BoundModifiers { maybe: Some(first_question), maybe_const: None };
         }
 
         // `?const ...`
-        let maybe_const = first_question.to(self.prev_span);
+        let maybe_const = first_question.to(self.prev_token.span);
         self.sess.gated_spans.gate(sym::const_trait_bound_opt_out, maybe_const);
         if !self.eat(&token::Question) {
             return BoundModifiers { maybe: None, maybe_const: Some(maybe_const) };
         }
 
         // `?const ? ...`
-        let second_question = self.prev_span;
+        let second_question = self.prev_token.span;
         BoundModifiers { maybe: Some(second_question), maybe_const: Some(maybe_const) }
     }
 
@@ -559,7 +578,7 @@ impl<'a> Parser<'a> {
         }
 
         let modifier = modifiers.to_trait_bound_modifier();
-        let poly_trait = PolyTraitRef::new(lifetime_defs, path, lo.to(self.prev_span));
+        let poly_trait = PolyTraitRef::new(lifetime_defs, path, lo.to(self.prev_token.span));
         Ok(GenericBound::Trait(poly_trait, modifier))
     }
 
@@ -585,9 +604,8 @@ impl<'a> Parser<'a> {
     /// Parses a single lifetime `'a` or panics.
     pub fn expect_lifetime(&mut self) -> Lifetime {
         if let Some(ident) = self.token.lifetime() {
-            let span = self.token.span;
             self.bump();
-            Lifetime { ident: Ident::new(ident.name, span), id: ast::DUMMY_NODE_ID }
+            Lifetime { ident, id: ast::DUMMY_NODE_ID }
         } else {
             self.span_bug(self.token.span, "not a lifetime")
         }
diff --git a/src/librustc_parse/validate_attr.rs b/src/librustc_parse/validate_attr.rs
index 84562fbb46..029aa5ed2b 100644
--- a/src/librustc_parse/validate_attr.rs
+++ b/src/librustc_parse/validate_attr.rs
@@ -2,13 +2,13 @@
 
 use crate::parse_in;
 
+use rustc_ast::ast::{self, Attribute, MacArgs, MacDelimiter, MetaItem, MetaItemKind};
+use rustc_ast::tokenstream::DelimSpan;
 use rustc_errors::{Applicability, PResult};
 use rustc_feature::{AttributeTemplate, BUILTIN_ATTRIBUTE_MAP};
 use rustc_session::lint::builtin::ILL_FORMED_ATTRIBUTE_INPUT;
 use rustc_session::parse::ParseSess;
 use rustc_span::{sym, Symbol};
-use syntax::ast::{self, Attribute, MacArgs, MacDelimiter, MetaItem, MetaItemKind};
-use syntax::tokenstream::DelimSpan;
 
 pub fn check_meta(sess: &ParseSess, attr: &Attribute) {
     if attr.is_doc_comment() {
@@ -27,7 +27,11 @@ pub fn check_meta(sess: &ParseSess, attr: &Attribute) {
         _ => {
             if let MacArgs::Eq(..) = attr.get_normal_item().args {
                 // All key-value attributes are restricted to meta-item syntax.
-                parse_meta(sess, attr).map_err(|mut err| err.emit()).ok();
+                parse_meta(sess, attr)
+                    .map_err(|mut err| {
+                        err.emit();
+                    })
+                    .ok();
             }
         }
     }
@@ -152,6 +156,8 @@ pub fn check_builtin_attribute(
                 }
             }
         }
-        Err(mut err) => err.emit(),
+        Err(mut err) => {
+            err.emit();
+        }
     }
 }
diff --git a/src/librustc_passes/Cargo.toml b/src/librustc_passes/Cargo.toml
index 338808f6d4..af8e7a5b71 100644
--- a/src/librustc_passes/Cargo.toml
+++ b/src/librustc_passes/Cargo.toml
@@ -11,12 +11,14 @@ path = "lib.rs"
 [dependencies]
 log = "0.4"
 rustc = { path = "../librustc" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_feature = { path = "../librustc_feature" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_index = { path = "../librustc_index" }
+rustc_infer = { path = "../librustc_infer" }
 rustc_session = { path = "../librustc_session" }
 rustc_target = { path = "../librustc_target" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_passes/check_attr.rs b/src/librustc_passes/check_attr.rs
new file mode 100644
index 0000000000..f1ed074d6a
--- /dev/null
+++ b/src/librustc_passes/check_attr.rs
@@ -0,0 +1,481 @@
+//! This module implements some validity checks for attributes.
+//! In particular it verifies that `#[inline]` and `#[repr]` attributes are
+//! attached to items that actually support them and if there are
+//! conflicts between multiple such attributes attached to the same
+//! item.
+
+use rustc::hir::map::Map;
+use rustc::ty::query::Providers;
+use rustc::ty::TyCtxt;
+
+use rustc_ast::ast::{Attribute, NestedMetaItem};
+use rustc_ast::attr;
+use rustc_errors::struct_span_err;
+use rustc_hir as hir;
+use rustc_hir::def_id::DefId;
+use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
+use rustc_hir::DUMMY_HIR_ID;
+use rustc_hir::{self, HirId, Item, ItemKind, TraitItem};
+use rustc_hir::{MethodKind, Target};
+use rustc_session::lint::builtin::{CONFLICTING_REPR_HINTS, UNUSED_ATTRIBUTES};
+use rustc_session::parse::feature_err;
+use rustc_span::symbol::sym;
+use rustc_span::Span;
+
+fn target_from_impl_item<'tcx>(tcx: TyCtxt<'tcx>, impl_item: &hir::ImplItem<'_>) -> Target {
+    match impl_item.kind {
+        hir::ImplItemKind::Const(..) => Target::AssocConst,
+        hir::ImplItemKind::Method(..) => {
+            let parent_hir_id = tcx.hir().get_parent_item(impl_item.hir_id);
+            let containing_item = tcx.hir().expect_item(parent_hir_id);
+            let containing_impl_is_for_trait = match &containing_item.kind {
+                hir::ItemKind::Impl { ref of_trait, .. } => of_trait.is_some(),
+                _ => bug!("parent of an ImplItem must be an Impl"),
+            };
+            if containing_impl_is_for_trait {
+                Target::Method(MethodKind::Trait { body: true })
+            } else {
+                Target::Method(MethodKind::Inherent)
+            }
+        }
+        hir::ImplItemKind::TyAlias(..) | hir::ImplItemKind::OpaqueTy(..) => Target::AssocTy,
+    }
+}
+
+struct CheckAttrVisitor<'tcx> {
+    tcx: TyCtxt<'tcx>,
+}
+
+impl CheckAttrVisitor<'tcx> {
+    /// Checks any attribute.
+    fn check_attributes(
+        &self,
+        hir_id: HirId,
+        attrs: &'hir [Attribute],
+        span: &Span,
+        target: Target,
+        item: Option<&Item<'_>>,
+    ) {
+        let mut is_valid = true;
+        for attr in attrs {
+            is_valid &= if attr.check_name(sym::inline) {
+                self.check_inline(hir_id, attr, span, target)
+            } else if attr.check_name(sym::non_exhaustive) {
+                self.check_non_exhaustive(attr, span, target)
+            } else if attr.check_name(sym::marker) {
+                self.check_marker(attr, span, target)
+            } else if attr.check_name(sym::target_feature) {
+                self.check_target_feature(attr, span, target)
+            } else if attr.check_name(sym::track_caller) {
+                self.check_track_caller(&attr.span, attrs, span, target)
+            } else {
+                true
+            };
+        }
+
+        if !is_valid {
+            return;
+        }
+
+        if target == Target::Fn {
+            self.tcx.codegen_fn_attrs(self.tcx.hir().local_def_id(hir_id));
+        }
+
+        self.check_repr(attrs, span, target, item, hir_id);
+        self.check_used(attrs, target);
+    }
+
+    /// Checks if an `#[inline]` is applied to a function or a closure. Returns `true` if valid.
+    fn check_inline(&self, hir_id: HirId, attr: &Attribute, span: &Span, target: Target) -> bool {
+        match target {
+            Target::Fn
+            | Target::Closure
+            | Target::Method(MethodKind::Trait { body: true })
+            | Target::Method(MethodKind::Inherent) => true,
+            Target::Method(MethodKind::Trait { body: false }) | Target::ForeignFn => {
+                self.tcx.struct_span_lint_hir(UNUSED_ATTRIBUTES, hir_id, attr.span, |lint| {
+                    lint.build("`#[inline]` is ignored on function prototypes").emit()
+                });
+                true
+            }
+            // FIXME(#65833): We permit associated consts to have an `#[inline]` attribute with
+            // just a lint, because we previously erroneously allowed it and some crates used it
+            // accidentally, to to be compatible with crates depending on them, we can't throw an
+            // error here.
+            Target::AssocConst => {
+                self.tcx.struct_span_lint_hir(UNUSED_ATTRIBUTES, hir_id, attr.span, |lint| {
+                    lint.build("`#[inline]` is ignored on constants")
+                        .warn(
+                            "this was previously accepted by the compiler but is \
+                               being phased out; it will become a hard error in \
+                               a future release!",
+                        )
+                        .note(
+                            "see issue #65833 <https://github.com/rust-lang/rust/issues/65833> \
+                                 for more information",
+                        )
+                        .emit();
+                });
+                true
+            }
+            _ => {
+                struct_span_err!(
+                    self.tcx.sess,
+                    attr.span,
+                    E0518,
+                    "attribute should be applied to function or closure",
+                )
+                .span_label(*span, "not a function or closure")
+                .emit();
+                false
+            }
+        }
+    }
+
+    /// Checks if a `#[track_caller]` is applied to a non-naked function. Returns `true` if valid.
+    fn check_track_caller(
+        &self,
+        attr_span: &Span,
+        attrs: &'hir [Attribute],
+        span: &Span,
+        target: Target,
+    ) -> bool {
+        match target {
+            Target::Fn if attr::contains_name(attrs, sym::naked) => {
+                struct_span_err!(
+                    self.tcx.sess,
+                    *attr_span,
+                    E0736,
+                    "cannot use `#[track_caller]` with `#[naked]`",
+                )
+                .emit();
+                false
+            }
+            Target::Fn | Target::Method(MethodKind::Inherent) => true,
+            Target::Method(_) => {
+                struct_span_err!(
+                    self.tcx.sess,
+                    *attr_span,
+                    E0738,
+                    "`#[track_caller]` may not be used on trait methods",
+                )
+                .emit();
+                false
+            }
+            _ => {
+                struct_span_err!(
+                    self.tcx.sess,
+                    *attr_span,
+                    E0739,
+                    "attribute should be applied to function"
+                )
+                .span_label(*span, "not a function")
+                .emit();
+                false
+            }
+        }
+    }
+
+    /// Checks if the `#[non_exhaustive]` attribute on an `item` is valid. Returns `true` if valid.
+    fn check_non_exhaustive(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
+        match target {
+            Target::Struct | Target::Enum => true,
+            _ => {
+                struct_span_err!(
+                    self.tcx.sess,
+                    attr.span,
+                    E0701,
+                    "attribute can only be applied to a struct or enum"
+                )
+                .span_label(*span, "not a struct or enum")
+                .emit();
+                false
+            }
+        }
+    }
+
+    /// Checks if the `#[marker]` attribute on an `item` is valid. Returns `true` if valid.
+    fn check_marker(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
+        match target {
+            Target::Trait => true,
+            _ => {
+                self.tcx
+                    .sess
+                    .struct_span_err(attr.span, "attribute can only be applied to a trait")
+                    .span_label(*span, "not a trait")
+                    .emit();
+                false
+            }
+        }
+    }
+
+    /// Checks if the `#[target_feature]` attribute on `item` is valid. Returns `true` if valid.
+    fn check_target_feature(&self, attr: &Attribute, span: &Span, target: Target) -> bool {
+        match target {
+            Target::Fn
+            | Target::Method(MethodKind::Trait { body: true })
+            | Target::Method(MethodKind::Inherent) => true,
+            _ => {
+                self.tcx
+                    .sess
+                    .struct_span_err(attr.span, "attribute should be applied to a function")
+                    .span_label(*span, "not a function")
+                    .emit();
+                false
+            }
+        }
+    }
+
+    /// Checks if the `#[repr]` attributes on `item` are valid.
+    fn check_repr(
+        &self,
+        attrs: &'hir [Attribute],
+        span: &Span,
+        target: Target,
+        item: Option<&Item<'_>>,
+        hir_id: HirId,
+    ) {
+        // Extract the names of all repr hints, e.g., [foo, bar, align] for:
+        // ```
+        // #[repr(foo)]
+        // #[repr(bar, align(8))]
+        // ```
+        let hints: Vec<_> = attrs
+            .iter()
+            .filter(|attr| attr.check_name(sym::repr))
+            .filter_map(|attr| attr.meta_item_list())
+            .flatten()
+            .collect();
+
+        let mut int_reprs = 0;
+        let mut is_c = false;
+        let mut is_simd = false;
+        let mut is_transparent = false;
+
+        for hint in &hints {
+            let (article, allowed_targets) = match hint.name_or_empty() {
+                name @ sym::C | name @ sym::align => {
+                    is_c |= name == sym::C;
+                    match target {
+                        Target::Struct | Target::Union | Target::Enum => continue,
+                        _ => ("a", "struct, enum, or union"),
+                    }
+                }
+                sym::packed => {
+                    if target != Target::Struct && target != Target::Union {
+                        ("a", "struct or union")
+                    } else {
+                        continue;
+                    }
+                }
+                sym::simd => {
+                    is_simd = true;
+                    if target != Target::Struct { ("a", "struct") } else { continue }
+                }
+                sym::transparent => {
+                    is_transparent = true;
+                    match target {
+                        Target::Struct | Target::Union | Target::Enum => continue,
+                        _ => ("a", "struct, enum, or union"),
+                    }
+                }
+                sym::no_niche => {
+                    if !self.tcx.features().enabled(sym::no_niche) {
+                        feature_err(
+                            &self.tcx.sess.parse_sess,
+                            sym::no_niche,
+                            hint.span(),
+                            "the attribute `repr(no_niche)` is currently unstable",
+                        )
+                        .emit();
+                    }
+                    match target {
+                        Target::Struct | Target::Enum => continue,
+                        _ => ("a", "struct or enum"),
+                    }
+                }
+                sym::i8
+                | sym::u8
+                | sym::i16
+                | sym::u16
+                | sym::i32
+                | sym::u32
+                | sym::i64
+                | sym::u64
+                | sym::isize
+                | sym::usize => {
+                    int_reprs += 1;
+                    if target != Target::Enum { ("an", "enum") } else { continue }
+                }
+                _ => continue,
+            };
+            self.emit_repr_error(
+                hint.span(),
+                *span,
+                &format!("attribute should be applied to {}", allowed_targets),
+                &format!("not {} {}", article, allowed_targets),
+            )
+        }
+
+        // Just point at all repr hints if there are any incompatibilities.
+        // This is not ideal, but tracking precisely which ones are at fault is a huge hassle.
+        let hint_spans = hints.iter().map(|hint| hint.span());
+
+        // Error on repr(transparent, <anything else apart from no_niche>).
+        let non_no_niche = |hint: &&NestedMetaItem| hint.name_or_empty() != sym::no_niche;
+        let non_no_niche_count = hints.iter().filter(non_no_niche).count();
+        if is_transparent && non_no_niche_count > 1 {
+            let hint_spans: Vec<_> = hint_spans.clone().collect();
+            struct_span_err!(
+                self.tcx.sess,
+                hint_spans,
+                E0692,
+                "transparent {} cannot have other repr hints",
+                target
+            )
+            .emit();
+        }
+        // Warn on repr(u8, u16), repr(C, simd), and c-like-enum-repr(C, u8)
+        if (int_reprs > 1)
+            || (is_simd && is_c)
+            || (int_reprs == 1 && is_c && item.map_or(false, |item| is_c_like_enum(item)))
+        {
+            self.tcx.struct_span_lint_hir(
+                CONFLICTING_REPR_HINTS,
+                hir_id,
+                hint_spans.collect::<Vec<Span>>(),
+                |lint| {
+                    lint.build("conflicting representation hints")
+                        .code(rustc_errors::error_code!(E0566))
+                        .emit();
+                },
+            );
+        }
+    }
+
+    fn emit_repr_error(
+        &self,
+        hint_span: Span,
+        label_span: Span,
+        hint_message: &str,
+        label_message: &str,
+    ) {
+        struct_span_err!(self.tcx.sess, hint_span, E0517, "{}", hint_message)
+            .span_label(label_span, label_message)
+            .emit();
+    }
+
+    fn check_stmt_attributes(&self, stmt: &hir::Stmt<'_>) {
+        // When checking statements ignore expressions, they will be checked later
+        if let hir::StmtKind::Local(ref l) = stmt.kind {
+            for attr in l.attrs.iter() {
+                if attr.check_name(sym::inline) {
+                    self.check_inline(DUMMY_HIR_ID, attr, &stmt.span, Target::Statement);
+                }
+                if attr.check_name(sym::repr) {
+                    self.emit_repr_error(
+                        attr.span,
+                        stmt.span,
+                        "attribute should not be applied to a statement",
+                        "not a struct, enum, or union",
+                    );
+                }
+            }
+        }
+    }
+
+    fn check_expr_attributes(&self, expr: &hir::Expr<'_>) {
+        let target = match expr.kind {
+            hir::ExprKind::Closure(..) => Target::Closure,
+            _ => Target::Expression,
+        };
+        for attr in expr.attrs.iter() {
+            if attr.check_name(sym::inline) {
+                self.check_inline(DUMMY_HIR_ID, attr, &expr.span, target);
+            }
+            if attr.check_name(sym::repr) {
+                self.emit_repr_error(
+                    attr.span,
+                    expr.span,
+                    "attribute should not be applied to an expression",
+                    "not defining a struct, enum, or union",
+                );
+            }
+        }
+    }
+
+    fn check_used(&self, attrs: &'hir [Attribute], target: Target) {
+        for attr in attrs {
+            if attr.check_name(sym::used) && target != Target::Static {
+                self.tcx
+                    .sess
+                    .span_err(attr.span, "attribute must be applied to a `static` variable");
+            }
+        }
+    }
+}
+
+impl Visitor<'tcx> for CheckAttrVisitor<'tcx> {
+    type Map = Map<'tcx>;
+
+    fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, Self::Map> {
+        NestedVisitorMap::OnlyBodies(&self.tcx.hir())
+    }
+
+    fn visit_item(&mut self, item: &'tcx Item<'tcx>) {
+        let target = Target::from_item(item);
+        self.check_attributes(item.hir_id, item.attrs, &item.span, target, Some(item));
+        intravisit::walk_item(self, item)
+    }
+
+    fn visit_trait_item(&mut self, trait_item: &'tcx TraitItem<'tcx>) {
+        let target = Target::from_trait_item(trait_item);
+        self.check_attributes(trait_item.hir_id, &trait_item.attrs, &trait_item.span, target, None);
+        intravisit::walk_trait_item(self, trait_item)
+    }
+
+    fn visit_foreign_item(&mut self, f_item: &'tcx hir::ForeignItem<'tcx>) {
+        let target = Target::from_foreign_item(f_item);
+        self.check_attributes(f_item.hir_id, &f_item.attrs, &f_item.span, target, None);
+        intravisit::walk_foreign_item(self, f_item)
+    }
+
+    fn visit_impl_item(&mut self, impl_item: &'tcx hir::ImplItem<'tcx>) {
+        let target = target_from_impl_item(self.tcx, impl_item);
+        self.check_attributes(impl_item.hir_id, &impl_item.attrs, &impl_item.span, target, None);
+        intravisit::walk_impl_item(self, impl_item)
+    }
+
+    fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
+        self.check_stmt_attributes(stmt);
+        intravisit::walk_stmt(self, stmt)
+    }
+
+    fn visit_expr(&mut self, expr: &'tcx hir::Expr<'tcx>) {
+        self.check_expr_attributes(expr);
+        intravisit::walk_expr(self, expr)
+    }
+}
+
+fn is_c_like_enum(item: &Item<'_>) -> bool {
+    if let ItemKind::Enum(ref def, _) = item.kind {
+        for variant in def.variants {
+            match variant.data {
+                hir::VariantData::Unit(..) => { /* continue */ }
+                _ => return false,
+            }
+        }
+        true
+    } else {
+        false
+    }
+}
+
+fn check_mod_attrs(tcx: TyCtxt<'_>, module_def_id: DefId) {
+    tcx.hir()
+        .visit_item_likes_in_module(module_def_id, &mut CheckAttrVisitor { tcx }.as_deep_visitor());
+}
+
+pub(crate) fn provide(providers: &mut Providers<'_>) {
+    *providers = Providers { check_mod_attrs, ..*providers };
+}
diff --git a/src/librustc_passes/check_const.rs b/src/librustc_passes/check_const.rs
index faa85f68fa..53e8213ae4 100644
--- a/src/librustc_passes/check_const.rs
+++ b/src/librustc_passes/check_const.rs
@@ -8,16 +8,17 @@
 //! through, but errors for structured control flow in a `const` should be emitted here.
 
 use rustc::hir::map::Map;
+use rustc::hir::Hir;
 use rustc::session::config::nightly_options;
 use rustc::session::parse::feature_err;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast::Mutability;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_span::{sym, Span, Symbol};
-use syntax::ast::Mutability;
 
 use std::fmt;
 
@@ -34,7 +35,7 @@ impl NonConstExpr {
         match self {
             Self::Loop(src) => format!("`{}`", src.name()),
             Self::Match(src) => format!("`{}`", src.name()),
-            Self::OrPattern => format!("or-pattern"),
+            Self::OrPattern => "or-pattern".to_string(),
         }
     }
 
@@ -74,7 +75,7 @@ enum ConstKind {
 }
 
 impl ConstKind {
-    fn for_body(body: &hir::Body<'_>, hir_map: &Map<'_>) -> Option<Self> {
+    fn for_body(body: &hir::Body<'_>, hir_map: Hir<'_>) -> Option<Self> {
         let is_const_fn = |id| hir_map.fn_sig_by_hir_id(id).unwrap().header.is_const();
 
         let owner = hir_map.body_owner(body.id());
diff --git a/src/librustc_passes/dead.rs b/src/librustc_passes/dead.rs
index 2ff9d744f2..bcf9fd5a53 100644
--- a/src/librustc_passes/dead.rs
+++ b/src/librustc_passes/dead.rs
@@ -15,9 +15,8 @@ use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::{Node, PatKind, TyKind};
 use rustc_session::lint;
 
-use rustc_span;
+use rustc_ast::{ast, attr};
 use rustc_span::symbol::sym;
-use syntax::{ast, attr};
 
 // Any local node that may call something in its body block should be
 // explored. For example, if it's a live Node::Item that is a
@@ -554,13 +553,10 @@ impl DeadVisitor<'tcx> {
         node_type: &str,
         participle: &str,
     ) {
-        if !name.as_str().starts_with("_") {
-            self.tcx.lint_hir(
-                lint::builtin::DEAD_CODE,
-                id,
-                span,
-                &format!("{} is never {}: `{}`", node_type, participle, name),
-            );
+        if !name.as_str().starts_with('_') {
+            self.tcx.struct_span_lint_hir(lint::builtin::DEAD_CODE, id, span, |lint| {
+                lint.build(&format!("{} is never {}: `{}`", node_type, participle, name)).emit()
+            });
         }
     }
 }
@@ -605,13 +601,7 @@ impl Visitor<'tcx> for DeadVisitor<'tcx> {
                 hir::ItemKind::Struct(..) => "constructed", // Issue #52325
                 _ => "used",
             };
-            self.warn_dead_code(
-                item.hir_id,
-                span,
-                item.ident.name,
-                item.kind.descriptive_variant(),
-                participle,
-            );
+            self.warn_dead_code(item.hir_id, span, item.ident.name, item.kind.descr(), participle);
         } else {
             // Only continue if we didn't warn
             intravisit::walk_item(self, item);
diff --git a/src/librustc_passes/diagnostic_items.rs b/src/librustc_passes/diagnostic_items.rs
index 8d220a3f69..ae23e9e35f 100644
--- a/src/librustc_passes/diagnostic_items.rs
+++ b/src/librustc_passes/diagnostic_items.rs
@@ -11,12 +11,12 @@
 
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir as hir;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast;
 
 struct DiagnosticItemCollector<'tcx> {
     // items from this crate
@@ -73,10 +73,10 @@ fn collect_item(
                 )),
             };
             if let Some(span) = tcx.hir().span_if_local(original_def_id) {
-                err.span_note(span, "first defined here");
+                err.span_note(span, "the diagnostic item is first defined here");
             } else {
                 err.note(&format!(
-                    "first defined in crate `{}`.",
+                    "the diagnostic item is first defined in crate `{}`.",
                     tcx.crate_name(original_def_id.krate)
                 ));
             }
diff --git a/src/librustc_passes/entry.rs b/src/librustc_passes/entry.rs
index d36114fd3b..86596e2055 100644
--- a/src/librustc_passes/entry.rs
+++ b/src/librustc_passes/entry.rs
@@ -1,21 +1,21 @@
-use rustc::hir::map as hir_map;
+use rustc::hir::Hir;
 use rustc::session::config::EntryFnType;
 use rustc::session::{config, Session};
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::attr;
+use rustc_ast::entry::EntryPointType;
 use rustc_errors::struct_span_err;
 use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::{HirId, ImplItem, Item, ItemKind, TraitItem};
 use rustc_span::symbol::sym;
 use rustc_span::{Span, DUMMY_SP};
-use syntax::attr;
-use syntax::entry::EntryPointType;
 
 struct EntryContext<'a, 'tcx> {
     session: &'a Session,
 
-    map: &'a hir_map::Map<'tcx>,
+    map: Hir<'tcx>,
 
     /// The top-level function called `main`.
     main_fn: Option<(HirId, Span)>,
@@ -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 {
@@ -196,7 +196,7 @@ fn no_main_err(tcx: TyCtxt<'_>, visitor: &EntryContext<'_, '_>) {
     // The file may be empty, which leads to the diagnostic machinery not emitting this
     // note. This is a relatively simple way to detect that case and emit a span-less
     // note instead.
-    if let Ok(_) = tcx.sess.source_map().lookup_line(sp.lo()) {
+    if tcx.sess.source_map().lookup_line(sp.lo()).is_ok() {
         err.set_span(sp);
         err.span_label(sp, &note);
     } else {
diff --git a/src/librustc_passes/hir_stats.rs b/src/librustc_passes/hir_stats.rs
index b6ca2b3a59..c819809041 100644
--- a/src/librustc_passes/hir_stats.rs
+++ b/src/librustc_passes/hir_stats.rs
@@ -4,13 +4,13 @@
 
 use rustc::hir::map::Map;
 use rustc::util::common::to_readable_str;
+use rustc_ast::ast::{self, AttrId, NodeId};
+use rustc_ast::visit as ast_visit;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::intravisit as hir_visit;
 use rustc_hir::HirId;
 use rustc_span::Span;
-use syntax::ast::{self, AttrId, NodeId};
-use syntax::visit as ast_visit;
 
 #[derive(Copy, Clone, PartialEq, Eq, Hash)]
 enum Id {
@@ -302,19 +302,18 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
         ast_visit::walk_ty(self, t)
     }
 
-    fn visit_fn(&mut self, fk: ast_visit::FnKind<'v>, fd: &'v ast::FnDecl, s: Span, _: NodeId) {
-        self.record("FnDecl", Id::None, fd);
-        ast_visit::walk_fn(self, fk, fd, s)
-    }
-
-    fn visit_trait_item(&mut self, ti: &'v ast::AssocItem) {
-        self.record("TraitItem", Id::None, ti);
-        ast_visit::walk_trait_item(self, ti)
+    fn visit_fn(&mut self, fk: ast_visit::FnKind<'v>, s: Span, _: NodeId) {
+        self.record("FnDecl", Id::None, fk.decl());
+        ast_visit::walk_fn(self, fk, s)
     }
 
-    fn visit_impl_item(&mut self, ii: &'v ast::AssocItem) {
-        self.record("ImplItem", Id::None, ii);
-        ast_visit::walk_impl_item(self, ii)
+    fn visit_assoc_item(&mut self, item: &'v ast::AssocItem, ctxt: ast_visit::AssocCtxt) {
+        let label = match ctxt {
+            ast_visit::AssocCtxt::Trait => "TraitItem",
+            ast_visit::AssocCtxt::Impl => "ImplItem",
+        };
+        self.record(label, Id::None, item);
+        ast_visit::walk_assoc_item(self, item, ctxt);
     }
 
     fn visit_param_bound(&mut self, bounds: &'v ast::GenericBound) {
diff --git a/src/librustc_passes/lang_items.rs b/src/librustc_passes/lang_items.rs
new file mode 100644
index 0000000000..5f5acc7fdf
--- /dev/null
+++ b/src/librustc_passes/lang_items.rs
@@ -0,0 +1,174 @@
+//! Detecting language items.
+//!
+//! Language items are items that represent concepts intrinsic to the language
+//! itself. Examples are:
+//!
+//! * Traits that specify "kinds"; e.g., `Sync`, `Send`.
+//! * Traits that represent operators; e.g., `Add`, `Sub`, `Index`.
+//! * Functions called by the compiler itself.
+
+use crate::weak_lang_items;
+
+use rustc::middle::cstore::ExternCrate;
+use rustc::ty::TyCtxt;
+
+use rustc_errors::struct_span_err;
+use rustc_hir as hir;
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_hir::lang_items::{extract, ITEM_REFS};
+use rustc_hir::{LangItem, LanguageItems, Target};
+
+use rustc::ty::query::Providers;
+
+struct LanguageItemCollector<'tcx> {
+    items: LanguageItems,
+    tcx: TyCtxt<'tcx>,
+}
+
+impl ItemLikeVisitor<'v> for LanguageItemCollector<'tcx> {
+    fn visit_item(&mut self, item: &hir::Item<'_>) {
+        if let Some((value, span)) = extract(&item.attrs) {
+            let actual_target = Target::from_item(item);
+            match ITEM_REFS.get(&*value.as_str()).cloned() {
+                // Known lang item with attribute on correct target.
+                Some((item_index, expected_target)) if actual_target == expected_target => {
+                    let def_id = self.tcx.hir().local_def_id(item.hir_id);
+                    self.collect_item(item_index, def_id);
+                }
+                // Known lang item with attribute on incorrect target.
+                Some((_, expected_target)) => {
+                    struct_span_err!(
+                        self.tcx.sess,
+                        span,
+                        E0718,
+                        "`{}` language item must be applied to a {}",
+                        value,
+                        expected_target,
+                    )
+                    .span_label(
+                        span,
+                        format!(
+                            "attribute should be applied to a {}, not a {}",
+                            expected_target, actual_target,
+                        ),
+                    )
+                    .emit();
+                }
+                // Unknown lang item.
+                _ => {
+                    struct_span_err!(
+                        self.tcx.sess,
+                        span,
+                        E0522,
+                        "definition of an unknown language item: `{}`",
+                        value
+                    )
+                    .span_label(span, format!("definition of unknown language item `{}`", value))
+                    .emit();
+                }
+            }
+        }
+    }
+
+    fn visit_trait_item(&mut self, _trait_item: &hir::TraitItem<'_>) {
+        // At present, lang items are always items, not trait items.
+    }
+
+    fn visit_impl_item(&mut self, _impl_item: &hir::ImplItem<'_>) {
+        // At present, lang items are always items, not impl items.
+    }
+}
+
+impl LanguageItemCollector<'tcx> {
+    fn new(tcx: TyCtxt<'tcx>) -> LanguageItemCollector<'tcx> {
+        LanguageItemCollector { tcx, items: LanguageItems::new() }
+    }
+
+    fn collect_item(&mut self, item_index: usize, item_def_id: DefId) {
+        // Check for duplicates.
+        if let Some(original_def_id) = self.items.items[item_index] {
+            if original_def_id != item_def_id {
+                let name = LangItem::from_u32(item_index as u32).unwrap().name();
+                let mut err = match self.tcx.hir().span_if_local(item_def_id) {
+                    Some(span) => struct_span_err!(
+                        self.tcx.sess,
+                        span,
+                        E0152,
+                        "found duplicate lang item `{}`",
+                        name
+                    ),
+                    None => match self.tcx.extern_crate(item_def_id) {
+                        Some(ExternCrate { dependency_of, .. }) => {
+                            self.tcx.sess.struct_err(&format!(
+                                "duplicate lang item in crate `{}` (which `{}` depends on): `{}`.",
+                                self.tcx.crate_name(item_def_id.krate),
+                                self.tcx.crate_name(*dependency_of),
+                                name
+                            ))
+                        }
+                        _ => self.tcx.sess.struct_err(&format!(
+                            "duplicate lang item in crate `{}`: `{}`.",
+                            self.tcx.crate_name(item_def_id.krate),
+                            name
+                        )),
+                    },
+                };
+                if let Some(span) = self.tcx.hir().span_if_local(original_def_id) {
+                    err.span_note(span, "the lang item is first defined here");
+                } else {
+                    match self.tcx.extern_crate(original_def_id) {
+                        Some(ExternCrate { dependency_of, .. }) => {
+                            err.note(&format!(
+                                "the lang item is first defined in crate `{}` (which `{}` depends on)",
+                                self.tcx.crate_name(original_def_id.krate),
+                                self.tcx.crate_name(*dependency_of)
+                            ));
+                        }
+                        _ => {
+                            err.note(&format!(
+                                "the lang item is first defined in crate `{}`.",
+                                self.tcx.crate_name(original_def_id.krate)
+                            ));
+                        }
+                    }
+                }
+                err.emit();
+            }
+        }
+
+        // Matched.
+        self.items.items[item_index] = Some(item_def_id);
+    }
+}
+
+/// Traverses and collects all the lang items in all crates.
+fn collect<'tcx>(tcx: TyCtxt<'tcx>) -> LanguageItems {
+    // Initialize the collector.
+    let mut collector = LanguageItemCollector::new(tcx);
+
+    // Collect lang items in other crates.
+    for &cnum in tcx.crates().iter() {
+        for &(def_id, item_index) in tcx.defined_lang_items(cnum).iter() {
+            collector.collect_item(item_index, def_id);
+        }
+    }
+
+    // Collect lang items in this crate.
+    tcx.hir().krate().visit_all_item_likes(&mut collector);
+
+    // Extract out the found lang items.
+    let LanguageItemCollector { mut items, .. } = collector;
+
+    // Find all required but not-yet-defined lang items.
+    weak_lang_items::check_crate(tcx, &mut items);
+
+    items
+}
+
+pub fn provide(providers: &mut Providers<'_>) {
+    providers.get_lang_items = |tcx, id| {
+        assert_eq!(id, LOCAL_CRATE);
+        tcx.arena.alloc(collect(tcx))
+    };
+}
diff --git a/src/librustc_passes/layout_test.rs b/src/librustc_passes/layout_test.rs
index be3e1f4738..9f6598a0ec 100644
--- a/src/librustc_passes/layout_test.rs
+++ b/src/librustc_passes/layout_test.rs
@@ -7,12 +7,12 @@ use rustc::ty::layout::TyLayout;
 use rustc::ty::ParamEnv;
 use rustc::ty::Ty;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast::Attribute;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::ItemKind;
 use rustc_span::symbol::sym;
-use syntax::ast::Attribute;
 
 pub fn test_layout(tcx: TyCtxt<'_>) {
     if tcx.features().rustc_attrs {
diff --git a/src/librustc_passes/lib.rs b/src/librustc_passes/lib.rs
index d746f09792..afafbacb8f 100644
--- a/src/librustc_passes/lib.rs
+++ b/src/librustc_passes/lib.rs
@@ -7,7 +7,6 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(in_band_lifetimes)]
 #![feature(nll)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![recursion_limit = "256"]
 
 #[macro_use]
@@ -17,12 +16,14 @@ extern crate log;
 
 use rustc::ty::query::Providers;
 
+mod check_attr;
 mod check_const;
 pub mod dead;
 mod diagnostic_items;
 pub mod entry;
 pub mod hir_stats;
 mod intrinsicck;
+mod lang_items;
 pub mod layout_test;
 mod lib_features;
 mod liveness;
@@ -30,11 +31,15 @@ pub mod loops;
 mod reachable;
 mod region;
 pub mod stability;
+mod upvars;
+mod weak_lang_items;
 
 pub fn provide(providers: &mut Providers<'_>) {
+    check_attr::provide(providers);
     check_const::provide(providers);
     diagnostic_items::provide(providers);
     entry::provide(providers);
+    lang_items::provide(providers);
     lib_features::provide(providers);
     loops::provide(providers);
     liveness::provide(providers);
@@ -42,4 +47,5 @@ pub fn provide(providers: &mut Providers<'_>) {
     reachable::provide(providers);
     region::provide(providers);
     stability::provide(providers);
+    upvars::provide(providers);
 }
diff --git a/src/librustc_passes/lib_features.rs b/src/librustc_passes/lib_features.rs
index 2e306a1b4f..172d7e7628 100644
--- a/src/librustc_passes/lib_features.rs
+++ b/src/librustc_passes/lib_features.rs
@@ -8,12 +8,12 @@ use rustc::hir::map::Map;
 use rustc::middle::lib_features::LibFeatures;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast::{Attribute, MetaItem, MetaItemKind};
 use rustc_errors::struct_span_err;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_span::symbol::Symbol;
 use rustc_span::{sym, Span};
-use syntax::ast::{Attribute, MetaItem, MetaItemKind};
 
 fn new_lib_features() -> LibFeatures {
     LibFeatures { stable: Default::default(), unstable: Default::default() }
diff --git a/src/librustc_passes/liveness.rs b/src/librustc_passes/liveness.rs
index 7718139f6e..5b6d0fc74e 100644
--- a/src/librustc_passes/liveness.rs
+++ b/src/librustc_passes/liveness.rs
@@ -100,6 +100,7 @@ use rustc::hir::map::Map;
 use rustc::lint;
 use rustc::ty::query::Providers;
 use rustc::ty::{self, TyCtxt};
+use rustc_ast::ast;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
@@ -109,7 +110,6 @@ use rustc_hir::intravisit::{self, FnKind, NestedVisitorMap, Visitor};
 use rustc_hir::{Expr, HirId, HirIdMap, HirIdSet, Node};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast;
 
 use std::collections::VecDeque;
 use std::io;
@@ -144,11 +144,11 @@ enum LiveNodeKind {
 }
 
 fn live_node_kind_to_string(lnk: LiveNodeKind, tcx: TyCtxt<'_>) -> String {
-    let cm = tcx.sess.source_map();
+    let sm = tcx.sess.source_map();
     match lnk {
-        UpvarNode(s) => format!("Upvar node [{}]", cm.span_to_string(s)),
-        ExprNode(s) => format!("Expr node [{}]", cm.span_to_string(s)),
-        VarDefNode(s) => format!("Var def node [{}]", cm.span_to_string(s)),
+        UpvarNode(s) => format!("Upvar node [{}]", sm.span_to_string(s)),
+        ExprNode(s) => format!("Expr node [{}]", sm.span_to_string(s)),
+        VarDefNode(s) => format!("Var def node [{}]", sm.span_to_string(s)),
         ExitNode => "Exit node".to_owned(),
     }
 }
@@ -822,8 +822,15 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
             return false;
         }
 
-        let mut changed = false;
+        let mut any_changed = false;
         self.indices2(ln, succ_ln, |this, idx, succ_idx| {
+            // This is a special case, pulled out from the code below, where we
+            // don't have to do anything. It occurs about 60-70% of the time.
+            if this.rwu_table.packed_rwus[succ_idx] == INV_INV_FALSE {
+                return;
+            }
+
+            let mut changed = false;
             let mut rwu = this.rwu_table.get(idx);
             let succ_rwu = this.rwu_table.get(succ_idx);
             if succ_rwu.reader.is_valid() && !rwu.reader.is_valid() {
@@ -843,6 +850,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
 
             if changed {
                 this.rwu_table.assign_unpacked(idx, rwu);
+                any_changed = true;
             }
         });
 
@@ -851,9 +859,9 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
             ln,
             self.ln_str(succ_ln),
             first_merge,
-            changed
+            any_changed
         );
-        return changed;
+        return any_changed;
     }
 
     // Indicates that a local variable was *defined*; we know that no
@@ -1117,7 +1125,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
             }
 
             hir::ExprKind::Call(ref f, ref args) => {
-                let m = self.ir.tcx.hir().get_module_parent(expr.hir_id);
+                let m = self.ir.tcx.parent_module(expr.hir_id);
                 let succ = if self.ir.tcx.is_ty_uninhabited_from(m, self.tables.expr_ty(expr)) {
                     self.s.exit_ln
                 } else {
@@ -1128,7 +1136,7 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
             }
 
             hir::ExprKind::MethodCall(.., ref args) => {
-                let m = self.ir.tcx.hir().get_module_parent(expr.hir_id);
+                let m = self.ir.tcx.parent_module(expr.hir_id);
                 let succ = if self.ir.tcx.is_ty_uninhabited_from(m, self.tables.expr_ty(expr)) {
                     self.s.exit_ln
                 } else {
@@ -1513,45 +1521,47 @@ impl<'tcx> Liveness<'_, 'tcx> {
                 if ln == self.s.exit_ln { false } else { self.assigned_on_exit(ln, var).is_some() };
 
             if is_assigned {
-                self.ir
-                    .tcx
-                    .struct_span_lint_hir(
-                        lint::builtin::UNUSED_VARIABLES,
-                        hir_id,
-                        spans,
-                        &format!("variable `{}` is assigned to, but never used", name),
-                    )
-                    .note(&format!("consider using `_{}` instead", name))
-                    .emit();
+                self.ir.tcx.struct_span_lint_hir(
+                    lint::builtin::UNUSED_VARIABLES,
+                    hir_id,
+                    spans,
+                    |lint| {
+                        lint.build(&format!("variable `{}` is assigned to, but never used", name))
+                            .note(&format!("consider using `_{}` instead", name))
+                            .emit();
+                    },
+                )
             } else {
-                let mut err = self.ir.tcx.struct_span_lint_hir(
+                self.ir.tcx.struct_span_lint_hir(
                     lint::builtin::UNUSED_VARIABLES,
                     hir_id,
                     spans.clone(),
-                    &format!("unused variable: `{}`", name),
+                    |lint| {
+                        let mut err = lint.build(&format!("unused variable: `{}`", name));
+                        if self.ir.variable_is_shorthand(var) {
+                            if let Node::Binding(pat) = self.ir.tcx.hir().get(hir_id) {
+                                // Handle `ref` and `ref mut`.
+                                let spans = spans
+                                    .iter()
+                                    .map(|_span| (pat.span, format!("{}: _", name)))
+                                    .collect();
+
+                                err.multipart_suggestion(
+                                    "try ignoring the field",
+                                    spans,
+                                    Applicability::MachineApplicable,
+                                );
+                            }
+                        } else {
+                            err.multipart_suggestion(
+                                "consider prefixing with an underscore",
+                                spans.iter().map(|span| (*span, format!("_{}", name))).collect(),
+                                Applicability::MachineApplicable,
+                            );
+                        }
+                        err.emit()
+                    },
                 );
-
-                if self.ir.variable_is_shorthand(var) {
-                    if let Node::Binding(pat) = self.ir.tcx.hir().get(hir_id) {
-                        // Handle `ref` and `ref mut`.
-                        let spans =
-                            spans.iter().map(|_span| (pat.span, format!("{}: _", name))).collect();
-
-                        err.multipart_suggestion(
-                            "try ignoring the field",
-                            spans,
-                            Applicability::MachineApplicable,
-                        );
-                    }
-                } else {
-                    err.multipart_suggestion(
-                        "consider prefixing with an underscore",
-                        spans.iter().map(|span| (*span, format!("_{}", name))).collect(),
-                        Applicability::MachineApplicable,
-                    );
-                }
-
-                err.emit()
             }
         }
     }
@@ -1565,27 +1575,27 @@ impl<'tcx> Liveness<'_, 'tcx> {
     fn report_dead_assign(&self, hir_id: HirId, spans: Vec<Span>, var: Variable, is_param: bool) {
         if let Some(name) = self.should_warn(var) {
             if is_param {
-                self.ir
-                    .tcx
-                    .struct_span_lint_hir(
-                        lint::builtin::UNUSED_ASSIGNMENTS,
-                        hir_id,
-                        spans,
-                        &format!("value passed to `{}` is never read", name),
-                    )
-                    .help("maybe it is overwritten before being read?")
-                    .emit();
+                self.ir.tcx.struct_span_lint_hir(
+                    lint::builtin::UNUSED_ASSIGNMENTS,
+                    hir_id,
+                    spans,
+                    |lint| {
+                        lint.build(&format!("value passed to `{}` is never read", name))
+                            .help("maybe it is overwritten before being read?")
+                            .emit();
+                    },
+                )
             } else {
-                self.ir
-                    .tcx
-                    .struct_span_lint_hir(
-                        lint::builtin::UNUSED_ASSIGNMENTS,
-                        hir_id,
-                        spans,
-                        &format!("value assigned to `{}` is never read", name),
-                    )
-                    .help("maybe it is overwritten before being read?")
-                    .emit();
+                self.ir.tcx.struct_span_lint_hir(
+                    lint::builtin::UNUSED_ASSIGNMENTS,
+                    hir_id,
+                    spans,
+                    |lint| {
+                        lint.build(&format!("value assigned to `{}` is never read", name))
+                            .help("maybe it is overwritten before being read?")
+                            .emit();
+                    },
+                )
             }
         }
     }
diff --git a/src/librustc_passes/loops.rs b/src/librustc_passes/loops.rs
index 69d6b38005..2719057fb5 100644
--- a/src/librustc_passes/loops.rs
+++ b/src/librustc_passes/loops.rs
@@ -77,7 +77,7 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
                     return;
                 }
 
-                let loop_id = match label.target_id.into() {
+                let loop_id = match label.target_id {
                     Ok(loop_id) => loop_id,
                     Err(hir::LoopIdError::OutsideLoopScope) => hir::DUMMY_HIR_ID,
                     Err(hir::LoopIdError::UnlabeledCfInWhileCondition) => {
diff --git a/src/librustc_passes/reachable.rs b/src/librustc_passes/reachable.rs
index 667898046a..888f4370dd 100644
--- a/src/librustc_passes/reachable.rs
+++ b/src/librustc_passes/reachable.rs
@@ -362,12 +362,12 @@ impl<'a, 'tcx> ItemLikeVisitor<'tcx> for CollectPrivateImplItemsVisitor<'a, 'tcx
                     return;
                 }
 
-                let provided_trait_methods = self.tcx.provided_trait_methods(trait_def_id);
-                self.worklist.reserve(provided_trait_methods.len());
-                for default_method in provided_trait_methods {
-                    let hir_id = self.tcx.hir().as_local_hir_id(default_method.def_id).unwrap();
-                    self.worklist.push(hir_id);
-                }
+                // FIXME(#53488) remove `let`
+                let tcx = self.tcx;
+                self.worklist.extend(
+                    tcx.provided_trait_methods(trait_def_id)
+                        .map(|assoc| tcx.hir().as_local_hir_id(assoc.def_id).unwrap()),
+                );
             }
         }
     }
diff --git a/src/librustc_passes/region.rs b/src/librustc_passes/region.rs
index e79ca5c78d..282bd20a9b 100644
--- a/src/librustc_passes/region.rs
+++ b/src/librustc_passes/region.rs
@@ -4,12 +4,13 @@
 //! For more information about how MIR-based region-checking works,
 //! see the [rustc guide].
 //!
-//! [rustc guide]: https://rust-lang.github.io/rustc-guide/mir/borrowck.html
+//! [rustc guide]: https://rust-lang.github.io/rustc-guide/borrow_check.html
 
 use rustc::hir::map::Map;
 use rustc::middle::region::*;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::walk_list;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
@@ -18,7 +19,6 @@ use rustc_hir::{Arm, Block, Expr, Local, Node, Pat, PatKind, Stmt};
 use rustc_index::vec::Idx;
 use rustc_span::source_map;
 use rustc_span::Span;
-use syntax::walk_list;
 
 use std::mem;
 
@@ -285,7 +285,7 @@ fn resolve_expr<'tcx>(visitor: &mut RegionResolutionVisitor<'tcx>, expr: &'tcx h
 
     // Ordinarily, we can rely on the visit order of HIR intravisit
     // to correspond to the actual execution order of statements.
-    // However, there's a weird corner case with compund assignment
+    // However, there's a weird corner case with compound assignment
     // operators (e.g. `a += b`). The evaluation order depends on whether
     // or not the operator is overloaded (e.g. whether or not a trait
     // like AddAssign is implemented).
diff --git a/src/librustc_passes/stability.rs b/src/librustc_passes/stability.rs
index db8109c285..7ea9ab5335 100644
--- a/src/librustc_passes/stability.rs
+++ b/src/librustc_passes/stability.rs
@@ -7,9 +7,10 @@ use rustc::middle::privacy::AccessLevels;
 use rustc::middle::stability::{DeprecationEntry, Index};
 use rustc::session::parse::feature_err;
 use rustc::session::Session;
-use rustc::traits::misc::can_type_implement_copy;
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast::Attribute;
+use rustc_attr::{self as attr, ConstStability, Stability};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
@@ -17,10 +18,9 @@ use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::{Generics, HirId, Item, StructField, Variant};
+use rustc_infer::traits::misc::can_type_implement_copy;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::Span;
-use syntax::ast::Attribute;
-use syntax::attr::{self, Stability};
 
 use std::cmp::Ordering;
 use std::mem::replace;
@@ -41,6 +41,7 @@ struct Annotator<'a, 'tcx> {
     tcx: TyCtxt<'tcx>,
     index: &'a mut Index<'tcx>,
     parent_stab: Option<&'tcx Stability>,
+    parent_const_stab: Option<&'tcx ConstStability>,
     parent_depr: Option<DeprecationEntry>,
     in_trait_impl: bool,
 }
@@ -58,143 +59,196 @@ impl<'a, 'tcx> Annotator<'a, 'tcx> {
     ) where
         F: FnOnce(&mut Self),
     {
-        if self.tcx.features().staged_api {
-            // This crate explicitly wants staged API.
-            debug!("annotate(id = {:?}, attrs = {:?})", hir_id, attrs);
-            if let Some(..) = attr::find_deprecation(&self.tcx.sess.parse_sess, attrs, item_sp) {
-                self.tcx.sess.span_err(
-                    item_sp,
-                    "`#[deprecated]` cannot be used in staged API; \
-                                                 use `#[rustc_deprecated]` instead",
-                );
+        if !self.tcx.features().staged_api {
+            self.forbid_staged_api_attrs(hir_id, attrs, item_sp, kind, visit_children);
+            return;
+        }
+
+        // This crate explicitly wants staged API.
+
+        debug!("annotate(id = {:?}, attrs = {:?})", hir_id, attrs);
+        if let Some(..) = attr::find_deprecation(&self.tcx.sess.parse_sess, attrs, item_sp) {
+            self.tcx.sess.span_err(
+                item_sp,
+                "`#[deprecated]` cannot be used in staged API; \
+                                             use `#[rustc_deprecated]` instead",
+            );
+        }
+
+        let (stab, const_stab) = attr::find_stability(&self.tcx.sess.parse_sess, attrs, item_sp);
+
+        let const_stab = const_stab.map(|const_stab| {
+            let const_stab = self.tcx.intern_const_stability(const_stab);
+            self.index.const_stab_map.insert(hir_id, const_stab);
+            const_stab
+        });
+
+        if const_stab.is_none() {
+            debug!("annotate: const_stab not found, parent = {:?}", self.parent_const_stab);
+            if let Some(parent) = self.parent_const_stab {
+                if parent.level.is_unstable() {
+                    self.index.const_stab_map.insert(hir_id, parent);
+                }
             }
-            let (stab, const_stab) =
-                attr::find_stability(&self.tcx.sess.parse_sess, attrs, item_sp);
-            if let Some(const_stab) = const_stab {
-                let const_stab = self.tcx.intern_const_stability(const_stab);
-                self.index.const_stab_map.insert(hir_id, const_stab);
+        }
+
+        let stab = stab.map(|mut stab| {
+            // Error if prohibited, or can't inherit anything from a container.
+            if kind == AnnotationKind::Prohibited
+                || (kind == AnnotationKind::Container
+                    && stab.level.is_stable()
+                    && stab.rustc_depr.is_none())
+            {
+                self.tcx.sess.span_err(item_sp, "This stability annotation is useless");
             }
-            if let Some(mut stab) = stab {
-                // Error if prohibited, or can't inherit anything from a container.
-                if kind == AnnotationKind::Prohibited
-                    || (kind == AnnotationKind::Container
-                        && stab.level.is_stable()
-                        && stab.rustc_depr.is_none())
-                {
-                    self.tcx.sess.span_err(item_sp, "This stability annotation is useless");
-                }
 
-                debug!("annotate: found {:?}", stab);
-                // If parent is deprecated and we're not, inherit this by merging
-                // deprecated_since and its reason.
-                if let Some(parent_stab) = self.parent_stab {
-                    if parent_stab.rustc_depr.is_some() && stab.rustc_depr.is_none() {
-                        stab.rustc_depr = parent_stab.rustc_depr
-                    }
+            debug!("annotate: found {:?}", stab);
+            // If parent is deprecated and we're not, inherit this by merging
+            // deprecated_since and its reason.
+            if let Some(parent_stab) = self.parent_stab {
+                if parent_stab.rustc_depr.is_some() && stab.rustc_depr.is_none() {
+                    stab.rustc_depr = parent_stab.rustc_depr
                 }
+            }
 
-                let stab = self.tcx.intern_stability(stab);
-
-                // Check if deprecated_since < stable_since. If it is,
-                // this is *almost surely* an accident.
-                if let (
-                    &Some(attr::RustcDeprecation { since: dep_since, .. }),
-                    &attr::Stable { since: stab_since },
-                ) = (&stab.rustc_depr, &stab.level)
+            let stab = self.tcx.intern_stability(stab);
+
+            // Check if deprecated_since < stable_since. If it is,
+            // this is *almost surely* an accident.
+            if let (
+                &Some(attr::RustcDeprecation { since: dep_since, .. }),
+                &attr::Stable { since: stab_since },
+            ) = (&stab.rustc_depr, &stab.level)
+            {
+                // Explicit version of iter::order::lt to handle parse errors properly
+                for (dep_v, stab_v) in
+                    dep_since.as_str().split('.').zip(stab_since.as_str().split('.'))
                 {
-                    // Explicit version of iter::order::lt to handle parse errors properly
-                    for (dep_v, stab_v) in
-                        dep_since.as_str().split('.').zip(stab_since.as_str().split('.'))
-                    {
-                        if let (Ok(dep_v), Ok(stab_v)) = (dep_v.parse::<u64>(), stab_v.parse()) {
-                            match dep_v.cmp(&stab_v) {
-                                Ordering::Less => {
-                                    self.tcx.sess.span_err(
-                                        item_sp,
-                                        "An API can't be stabilized \
-                                                                     after it is deprecated",
-                                    );
-                                    break;
-                                }
-                                Ordering::Equal => continue,
-                                Ordering::Greater => break,
+                    if let (Ok(dep_v), Ok(stab_v)) = (dep_v.parse::<u64>(), stab_v.parse()) {
+                        match dep_v.cmp(&stab_v) {
+                            Ordering::Less => {
+                                self.tcx.sess.span_err(
+                                    item_sp,
+                                    "An API can't be stabilized \
+                                                                 after it is deprecated",
+                                );
+                                break;
                             }
-                        } else {
-                            // Act like it isn't less because the question is now nonsensical,
-                            // and this makes us not do anything else interesting.
-                            self.tcx.sess.span_err(
-                                item_sp,
-                                "Invalid stability or deprecation \
-                                                             version found",
-                            );
-                            break;
+                            Ordering::Equal => continue,
+                            Ordering::Greater => break,
                         }
+                    } else {
+                        // Act like it isn't less because the question is now nonsensical,
+                        // and this makes us not do anything else interesting.
+                        self.tcx.sess.span_err(
+                            item_sp,
+                            "Invalid stability or deprecation \
+                                                         version found",
+                        );
+                        break;
                     }
                 }
-
-                self.index.stab_map.insert(hir_id, stab);
-
-                let orig_parent_stab = replace(&mut self.parent_stab, Some(stab));
-                visit_children(self);
-                self.parent_stab = orig_parent_stab;
-            } else {
-                debug!("annotate: not found, parent = {:?}", self.parent_stab);
-                if let Some(stab) = self.parent_stab {
-                    if stab.level.is_unstable() {
-                        self.index.stab_map.insert(hir_id, stab);
-                    }
-                }
-                visit_children(self);
-            }
-        } else {
-            // Emit errors for non-staged-api crates.
-            let unstable_attrs = [
-                sym::unstable,
-                sym::stable,
-                sym::rustc_deprecated,
-                sym::rustc_const_unstable,
-                sym::rustc_const_stable,
-            ];
-            for attr in attrs {
-                let name = attr.name_or_empty();
-                if unstable_attrs.contains(&name) {
-                    attr::mark_used(attr);
-                    struct_span_err!(
-                        self.tcx.sess,
-                        attr.span,
-                        E0734,
-                        "stability attributes may not be used outside of the standard library",
-                    )
-                    .emit();
-                }
             }
 
-            // Propagate unstability.  This can happen even for non-staged-api crates in case
-            // -Zforce-unstable-if-unmarked is set.
+            self.index.stab_map.insert(hir_id, stab);
+            stab
+        });
+
+        if stab.is_none() {
+            debug!("annotate: stab not found, parent = {:?}", self.parent_stab);
             if let Some(stab) = self.parent_stab {
                 if stab.level.is_unstable() {
                     self.index.stab_map.insert(hir_id, stab);
                 }
             }
+        }
 
-            if let Some(depr) = attr::find_deprecation(&self.tcx.sess.parse_sess, attrs, item_sp) {
-                if kind == AnnotationKind::Prohibited {
-                    self.tcx.sess.span_err(item_sp, "This deprecation annotation is useless");
-                }
+        self.recurse_with_stability_attrs(stab, const_stab, visit_children);
+    }
+
+    fn recurse_with_stability_attrs(
+        &mut self,
+        stab: Option<&'tcx Stability>,
+        const_stab: Option<&'tcx ConstStability>,
+        f: impl FnOnce(&mut Self),
+    ) {
+        // These will be `Some` if this item changes the corresponding stability attribute.
+        let mut replaced_parent_stab = None;
+        let mut replaced_parent_const_stab = None;
+
+        if let Some(stab) = stab {
+            replaced_parent_stab = Some(replace(&mut self.parent_stab, Some(stab)));
+        }
+        if let Some(const_stab) = const_stab {
+            replaced_parent_const_stab =
+                Some(replace(&mut self.parent_const_stab, Some(const_stab)));
+        }
+
+        f(self);
+
+        if let Some(orig_parent_stab) = replaced_parent_stab {
+            self.parent_stab = orig_parent_stab;
+        }
+        if let Some(orig_parent_const_stab) = replaced_parent_const_stab {
+            self.parent_const_stab = orig_parent_const_stab;
+        }
+    }
+
+    fn forbid_staged_api_attrs(
+        &mut self,
+        hir_id: HirId,
+        attrs: &[Attribute],
+        item_sp: Span,
+        kind: AnnotationKind,
+        visit_children: impl FnOnce(&mut Self),
+    ) {
+        // Emit errors for non-staged-api crates.
+        let unstable_attrs = [
+            sym::unstable,
+            sym::stable,
+            sym::rustc_deprecated,
+            sym::rustc_const_unstable,
+            sym::rustc_const_stable,
+        ];
+        for attr in attrs {
+            let name = attr.name_or_empty();
+            if unstable_attrs.contains(&name) {
+                attr::mark_used(attr);
+                struct_span_err!(
+                    self.tcx.sess,
+                    attr.span,
+                    E0734,
+                    "stability attributes may not be used outside of the standard library",
+                )
+                .emit();
+            }
+        }
+
+        // Propagate unstability.  This can happen even for non-staged-api crates in case
+        // -Zforce-unstable-if-unmarked is set.
+        if let Some(stab) = self.parent_stab {
+            if stab.level.is_unstable() {
+                self.index.stab_map.insert(hir_id, stab);
+            }
+        }
 
-                // `Deprecation` is just two pointers, no need to intern it
-                let depr_entry = DeprecationEntry::local(depr, hir_id);
-                self.index.depr_map.insert(hir_id, depr_entry.clone());
-
-                let orig_parent_depr = replace(&mut self.parent_depr, Some(depr_entry));
-                visit_children(self);
-                self.parent_depr = orig_parent_depr;
-            } else if let Some(parent_depr) = self.parent_depr.clone() {
-                self.index.depr_map.insert(hir_id, parent_depr);
-                visit_children(self);
-            } else {
-                visit_children(self);
+        if let Some(depr) = attr::find_deprecation(&self.tcx.sess.parse_sess, attrs, item_sp) {
+            if kind == AnnotationKind::Prohibited {
+                self.tcx.sess.span_err(item_sp, "This deprecation annotation is useless");
             }
+
+            // `Deprecation` is just two pointers, no need to intern it
+            let depr_entry = DeprecationEntry::local(depr, hir_id);
+            self.index.depr_map.insert(hir_id, depr_entry.clone());
+
+            let orig_parent_depr = replace(&mut self.parent_depr, Some(depr_entry));
+            visit_children(self);
+            self.parent_depr = orig_parent_depr;
+        } else if let Some(parent_depr) = self.parent_depr.clone() {
+            self.index.depr_map.insert(hir_id, parent_depr);
+            visit_children(self);
+        } else {
+            visit_children(self);
         }
     }
 }
@@ -308,7 +362,7 @@ impl<'a, 'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'a, 'tcx> {
             // optional. They inherit stability from their parents when unannotated.
             hir::ItemKind::Impl { of_trait: None, .. } | hir::ItemKind::ForeignMod(..) => {}
 
-            _ => self.check_missing_stability(i.hir_id, i.span, i.kind.descriptive_variant()),
+            _ => self.check_missing_stability(i.hir_id, i.span, i.kind.descr()),
         }
 
         intravisit::walk_item(self, i)
@@ -376,6 +430,7 @@ fn new_index(tcx: TyCtxt<'tcx>) -> Index<'tcx> {
             tcx,
             index: &mut index,
             parent_stab: None,
+            parent_const_stab: None,
             parent_depr: None,
             in_trait_impl: false,
         };
@@ -468,7 +523,8 @@ impl Visitor<'tcx> for Checker<'tcx> {
                         let trait_item_def_id = self
                             .tcx
                             .associated_items(trait_did)
-                            .find(|item| item.ident.name == impl_item.ident.name)
+                            .filter_by_name_unhygienic(impl_item.ident.name)
+                            .next()
                             .map(|item| item.def_id);
                         if let Some(def_id) = trait_item_def_id {
                             // Pass `None` to skip deprecation warnings.
@@ -495,7 +551,7 @@ impl Visitor<'tcx> for Checker<'tcx> {
                     .emit();
                 } else {
                     let param_env = self.tcx.param_env(def_id);
-                    if !can_type_implement_copy(self.tcx, param_env, ty).is_ok() {
+                    if can_type_implement_copy(self.tcx, param_env, ty).is_err() {
                         feature_err(
                             &self.tcx.sess.parse_sess,
                             sym::untagged_unions,
@@ -599,20 +655,18 @@ pub fn check_unused_or_stable_features(tcx: TyCtxt<'_>) {
     }
 
     // FIXME(#44232): the `used_features` table no longer exists, so we
-    // don't lint about unused features. We should reenable this one day!
+    // don't lint about unused features. We should re-enable this one day!
 }
 
 fn unnecessary_stable_feature_lint(tcx: TyCtxt<'_>, span: Span, feature: Symbol, since: Symbol) {
-    tcx.lint_hir(
-        lint::builtin::STABLE_FEATURES,
-        hir::CRATE_HIR_ID,
-        span,
-        &format!(
+    tcx.struct_span_lint_hir(lint::builtin::STABLE_FEATURES, hir::CRATE_HIR_ID, span, |lint| {
+        lint.build(&format!(
             "the feature `{}` has been stable since {} and no longer requires \
-                  an attribute to enable",
+                      an attribute to enable",
             feature, since
-        ),
-    );
+        ))
+        .emit();
+    });
 }
 
 fn duplicate_feature_err(sess: &Session, span: Span, feature: Symbol) {
diff --git a/src/librustc/hir/upvars.rs b/src/librustc_passes/upvars.rs
similarity index 97%
rename from src/librustc/hir/upvars.rs
rename to src/librustc_passes/upvars.rs
index 4ca294f486..a2397f2733 100644
--- a/src/librustc/hir/upvars.rs
+++ b/src/librustc_passes/upvars.rs
@@ -1,8 +1,8 @@
 //! Upvar (closure capture) collection from cross-body HIR uses of `Res::Local`s.
 
-use crate::hir::map::Map;
-use crate::ty::query::Providers;
-use crate::ty::TyCtxt;
+use rustc::hir::map::Map;
+use rustc::ty::query::Providers;
+use rustc::ty::TyCtxt;
 use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
 use rustc_hir as hir;
 use rustc_hir::def::Res;
diff --git a/src/librustc_passes/weak_lang_items.rs b/src/librustc_passes/weak_lang_items.rs
new file mode 100644
index 0000000000..1511742446
--- /dev/null
+++ b/src/librustc_passes/weak_lang_items.rs
@@ -0,0 +1,103 @@
+//! Validity checking for weak lang items
+
+use rustc::middle::lang_items;
+use rustc::middle::lang_items::whitelisted;
+use rustc::session::config;
+
+use rustc::hir::map::Map;
+use rustc::ty::TyCtxt;
+use rustc_data_structures::fx::FxHashSet;
+use rustc_errors::struct_span_err;
+use rustc_hir as hir;
+use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
+use rustc_hir::weak_lang_items::WEAK_ITEMS_REFS;
+use rustc_span::symbol::Symbol;
+use rustc_span::Span;
+
+struct Context<'a, 'tcx> {
+    tcx: TyCtxt<'tcx>,
+    items: &'a mut lang_items::LanguageItems,
+}
+
+/// Checks the crate for usage of weak lang items, returning a vector of all the
+/// language items required by this crate, but not defined yet.
+pub fn check_crate<'tcx>(tcx: TyCtxt<'tcx>, items: &mut lang_items::LanguageItems) {
+    // These are never called by user code, they're generated by the compiler.
+    // They will never implicitly be added to the `missing` array unless we do
+    // so here.
+    if items.eh_personality().is_none() {
+        items.missing.push(lang_items::EhPersonalityLangItem);
+    }
+    if tcx.sess.target.target.options.custom_unwind_resume & items.eh_unwind_resume().is_none() {
+        items.missing.push(lang_items::EhUnwindResumeLangItem);
+    }
+
+    {
+        let mut cx = Context { tcx, items };
+        tcx.hir().krate().visit_all_item_likes(&mut cx.as_deep_visitor());
+    }
+    verify(tcx, items);
+}
+
+fn verify<'tcx>(tcx: TyCtxt<'tcx>, items: &lang_items::LanguageItems) {
+    // We only need to check for the presence of weak lang items if we're
+    // emitting something that's not an rlib.
+    let needs_check = tcx.sess.crate_types.borrow().iter().any(|kind| match *kind {
+        config::CrateType::Dylib
+        | config::CrateType::ProcMacro
+        | config::CrateType::Cdylib
+        | config::CrateType::Executable
+        | config::CrateType::Staticlib => true,
+        config::CrateType::Rlib => false,
+    });
+    if !needs_check {
+        return;
+    }
+
+    let mut missing = FxHashSet::default();
+    for &cnum in tcx.crates().iter() {
+        for &item in tcx.missing_lang_items(cnum).iter() {
+            missing.insert(item);
+        }
+    }
+
+    for (name, &item) in WEAK_ITEMS_REFS.iter() {
+        if missing.contains(&item) && !whitelisted(tcx, item) && items.require(item).is_err() {
+            if item == lang_items::PanicImplLangItem {
+                tcx.sess.err("`#[panic_handler]` function required, but not found");
+            } else if item == lang_items::OomLangItem {
+                tcx.sess.err("`#[alloc_error_handler]` function required, but not found");
+            } else {
+                tcx.sess.err(&format!("language item required, but not found: `{}`", name));
+            }
+        }
+    }
+}
+
+impl<'a, 'tcx> Context<'a, 'tcx> {
+    fn register(&mut self, name: Symbol, span: Span) {
+        if let Some(&item) = WEAK_ITEMS_REFS.get(&name) {
+            if self.items.require(item).is_err() {
+                self.items.missing.push(item);
+            }
+        } else {
+            struct_span_err!(self.tcx.sess, span, E0264, "unknown external lang item: `{}`", name)
+                .emit();
+        }
+    }
+}
+
+impl<'a, 'tcx, 'v> Visitor<'v> for Context<'a, 'tcx> {
+    type Map = Map<'v>;
+
+    fn nested_visit_map<'this>(&'this mut self) -> NestedVisitorMap<'this, Map<'v>> {
+        NestedVisitorMap::None
+    }
+
+    fn visit_foreign_item(&mut self, i: &hir::ForeignItem<'_>) {
+        if let Some((lang_item, _)) = hir::lang_items::extract(&i.attrs) {
+            self.register(lang_item, i.span);
+        }
+        intravisit::walk_foreign_item(self, i)
+    }
+}
diff --git a/src/librustc_plugin_impl/Cargo.toml b/src/librustc_plugin_impl/Cargo.toml
index 2214838c84..8931307259 100644
--- 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_plugin_impl/build.rs b/src/librustc_plugin_impl/build.rs
index c4b644031d..03e58d758c 100644
--- a/src/librustc_plugin_impl/build.rs
+++ b/src/librustc_plugin_impl/build.rs
@@ -2,12 +2,12 @@
 
 use rustc::ty::query::Providers;
 use rustc::ty::TyCtxt;
+use rustc_ast::attr;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::attr;
 
 struct RegistrarFinder {
     registrars: Vec<(hir::HirId, Span)>,
diff --git a/src/librustc_plugin_impl/load.rs b/src/librustc_plugin_impl/load.rs
index 84549c0dd4..9bd9bcb25b 100644
--- a/src/librustc_plugin_impl/load.rs
+++ b/src/librustc_plugin_impl/load.rs
@@ -3,11 +3,11 @@
 use crate::Registry;
 use rustc::middle::cstore::MetadataLoader;
 use rustc::session::Session;
+use rustc_ast::ast::{Crate, Ident};
 use rustc_errors::struct_span_err;
 use rustc_metadata::locator;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast::{Crate, Ident};
 
 use std::borrow::ToOwned;
 use std::env;
diff --git a/src/librustc_privacy/Cargo.toml b/src/librustc_privacy/Cargo.toml
index 4f341b5451..6d1272c117 100644
--- a/src/librustc_privacy/Cargo.toml
+++ b/src/librustc_privacy/Cargo.toml
@@ -10,10 +10,11 @@ path = "lib.rs"
 
 [dependencies]
 rustc = { path = "../librustc" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_typeck = { path = "../librustc_typeck" }
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 log = "0.4"
diff --git a/src/librustc_privacy/lib.rs b/src/librustc_privacy/lib.rs
index 60bf271d2d..24696b2033 100644
--- a/src/librustc_privacy/lib.rs
+++ b/src/librustc_privacy/lib.rs
@@ -11,6 +11,8 @@ use rustc::ty::fold::TypeVisitor;
 use rustc::ty::query::Providers;
 use rustc::ty::subst::InternalSubsts;
 use rustc::ty::{self, GenericParamDefKind, TraitRef, Ty, TyCtxt, TypeFoldable};
+use rustc_ast::ast::Ident;
+use rustc_attr as attr;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
@@ -21,8 +23,6 @@ use rustc_hir::{AssocItemKind, HirIdSet, Node, PatKind};
 use rustc_span::hygiene::Transparency;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
-use syntax::ast::Ident;
-use syntax::attr;
 
 use std::marker::PhantomData;
 use std::{cmp, fmt, mem};
@@ -327,7 +327,7 @@ fn def_id_visibility<'tcx>(
                 }
                 Node::Expr(expr) => {
                     return (
-                        ty::Visibility::Restricted(tcx.hir().get_module_parent(expr.hir_id)),
+                        ty::Visibility::Restricted(tcx.parent_module(expr.hir_id)),
                         expr.span,
                         "private",
                     );
@@ -657,7 +657,7 @@ impl EmbargoVisitor<'tcx> {
                 .map(|module_hir_id| self.tcx.hir().expect_item(module_hir_id))
             {
                 if let hir::ItemKind::Mod(m) = &item.kind {
-                    for item_id in m.item_ids.as_ref() {
+                    for item_id in m.item_ids {
                         let item = self.tcx.hir().expect_item(item_id.id);
                         let def_id = self.tcx.hir().local_def_id(item_id.id);
                         if !self.tcx.hygienic_eq(segment.ident, item.ident, def_id) {
@@ -1781,17 +1781,20 @@ impl SearchInterfaceForPrivateItemsVisitor<'tcx> {
 
     fn check_def_id(&mut self, def_id: DefId, kind: &str, descr: &dyn fmt::Display) -> bool {
         if self.leaks_private_dep(def_id) {
-            self.tcx.lint_hir(
+            self.tcx.struct_span_lint_hir(
                 lint::builtin::EXPORTED_PRIVATE_DEPENDENCIES,
                 self.item_id,
                 self.span,
-                &format!(
-                    "{} `{}` from private dependency '{}' in public \
-                                        interface",
-                    kind,
-                    descr,
-                    self.tcx.crate_name(def_id.krate)
-                ),
+                |lint| {
+                    lint.build(&format!(
+                        "{} `{}` from private dependency '{}' in public \
+                                                interface",
+                        kind,
+                        descr,
+                        self.tcx.crate_name(def_id.krate)
+                    ))
+                    .emit()
+                },
             );
         }
 
@@ -1802,23 +1805,23 @@ impl SearchInterfaceForPrivateItemsVisitor<'tcx> {
 
         let (vis, vis_span, vis_descr) = def_id_visibility(self.tcx, def_id);
         if !vis.is_at_least(self.required_visibility, self.tcx) {
-            let msg = format!("{} {} `{}` in public interface", vis_descr, kind, descr);
+            let make_msg = || format!("{} {} `{}` in public interface", vis_descr, kind, descr);
             if self.has_pub_restricted || self.has_old_errors || self.in_assoc_ty {
                 let mut err = if kind == "trait" {
-                    struct_span_err!(self.tcx.sess, self.span, E0445, "{}", msg)
+                    struct_span_err!(self.tcx.sess, self.span, E0445, "{}", make_msg())
                 } else {
-                    struct_span_err!(self.tcx.sess, self.span, E0446, "{}", msg)
+                    struct_span_err!(self.tcx.sess, self.span, E0446, "{}", make_msg())
                 };
                 err.span_label(self.span, format!("can't leak {} {}", vis_descr, kind));
                 err.span_label(vis_span, format!("`{}` declared as {}", descr, vis_descr));
                 err.emit();
             } else {
                 let err_code = if kind == "trait" { "E0445" } else { "E0446" };
-                self.tcx.lint_hir(
+                self.tcx.struct_span_lint_hir(
                     lint::builtin::PRIVATE_IN_PUBLIC,
                     hir_id,
                     self.span,
-                    &format!("{} (error {})", msg, err_code),
+                    |lint| lint.build(&format!("{} (error {})", make_msg(), err_code)).emit(),
                 );
             }
         }
diff --git a/src/librustc_resolve/Cargo.toml b/src/librustc_resolve/Cargo.toml
index c4cc6b09c7..11a3cedcc7 100644
--- a/src/librustc_resolve/Cargo.toml
+++ b/src/librustc_resolve/Cargo.toml
@@ -13,15 +13,18 @@ doctest = false
 [dependencies]
 bitflags = "1.2.1"
 log = "0.4"
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 arena = { path = "../libarena" }
 rustc = { path = "../librustc" }
 rustc_ast_lowering = { path = "../librustc_ast_lowering" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_errors = { path = "../librustc_errors" }
 rustc_expand = { path = "../librustc_expand" }
 rustc_feature = { path = "../librustc_feature" }
 rustc_hir = { path = "../librustc_hir" }
+rustc_infer = { path = "../librustc_infer" }
 rustc_metadata = { path = "../librustc_metadata" }
 rustc_session = { path = "../librustc_session" }
 rustc_span = { path = "../librustc_span" }
diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs
index 7ff076268a..ec5a8c4a0b 100644
--- a/src/librustc_resolve/build_reduced_graph.rs
+++ b/src/librustc_resolve/build_reduced_graph.rs
@@ -6,8 +6,7 @@
 //! Imports are also considered items and placed into modules here, but not resolved yet.
 
 use crate::def_collector::collect_definitions;
-use crate::imports::ImportDirective;
-use crate::imports::ImportDirectiveSubclass::{self, GlobImport, SingleImport};
+use crate::imports::{Import, ImportKind};
 use crate::macros::{LegacyBinding, LegacyScope};
 use crate::Namespace::{self, MacroNS, TypeNS, ValueNS};
 use crate::{CrateLint, Determinacy, PathResult, ResolutionError, VisResolutionError};
@@ -20,6 +19,12 @@ use rustc::bug;
 use rustc::hir::exports::Export;
 use rustc::middle::cstore::CrateStore;
 use rustc::ty;
+use rustc_ast::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
+use rustc_ast::ast::{AssocItem, AssocItemKind, MetaItemKind, StmtKind};
+use rustc_ast::ast::{Ident, Name};
+use rustc_ast::token::{self, Token};
+use rustc_ast::visit::{self, AssocCtxt, Visitor};
+use rustc_attr as attr;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{struct_span_err, Applicability};
 use rustc_expand::base::SyntaxExtension;
@@ -31,12 +36,6 @@ use rustc_span::hygiene::{ExpnId, MacroKind};
 use rustc_span::source_map::{respan, Spanned};
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
-use syntax::ast::{AssocItem, AssocItemKind, MetaItemKind, StmtKind};
-use syntax::ast::{Ident, Name};
-use syntax::attr;
-use syntax::token::{self, Token};
-use syntax::visit::{self, Visitor};
 
 use log::debug;
 use std::cell::Cell;
@@ -308,11 +307,11 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
         })
     }
 
-    // Add an import directive to the current module.
-    fn add_import_directive(
+    // Add an import to the current module.
+    fn add_import(
         &mut self,
         module_path: Vec<Segment>,
-        subclass: ImportDirectiveSubclass<'a>,
+        kind: ImportKind<'a>,
         span: Span,
         id: NodeId,
         item: &ast::Item,
@@ -321,11 +320,11 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
         vis: ty::Visibility,
     ) {
         let current_module = self.parent_scope.module;
-        let directive = self.r.arenas.alloc_import_directive(ImportDirective {
+        let import = self.r.arenas.alloc_import(Import {
+            kind,
             parent_scope: self.parent_scope,
             module_path,
             imported_module: Cell::new(None),
-            subclass,
             span,
             id,
             use_span: item.span,
@@ -337,25 +336,25 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
             used: Cell::new(false),
         });
 
-        debug!("add_import_directive({:?})", directive);
+        debug!("add_import({:?})", import);
 
-        self.r.indeterminate_imports.push(directive);
-        match directive.subclass {
+        self.r.indeterminate_imports.push(import);
+        match import.kind {
             // Don't add unresolved underscore imports to modules
-            SingleImport { target: Ident { name: kw::Underscore, .. }, .. } => {}
-            SingleImport { target, type_ns_only, .. } => {
+            ImportKind::Single { target: Ident { name: kw::Underscore, .. }, .. } => {}
+            ImportKind::Single { target, type_ns_only, .. } => {
                 self.r.per_ns(|this, ns| {
                     if !type_ns_only || ns == TypeNS {
                         let key = this.new_key(target, ns);
                         let mut resolution = this.resolution(current_module, key).borrow_mut();
-                        resolution.add_single_import(directive);
+                        resolution.add_single_import(import);
                     }
                 });
             }
             // We don't add prelude imports to the globs since they only affect lexical scopes,
             // which are not relevant to import resolution.
-            GlobImport { is_prelude: true, .. } => {}
-            GlobImport { .. } => current_module.globs.borrow_mut().push(directive),
+            ImportKind::Glob { is_prelude: true, .. } => {}
+            ImportKind::Glob { .. } => current_module.globs.borrow_mut().push(import),
             _ => unreachable!(),
         }
     }
@@ -480,7 +479,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
                     );
                 }
 
-                let subclass = SingleImport {
+                let kind = ImportKind::Single {
                     source: source.ident,
                     target: ident,
                     source_bindings: PerNS {
@@ -496,9 +495,9 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
                     type_ns_only,
                     nested,
                 };
-                self.add_import_directive(
+                self.add_import(
                     module_path,
-                    subclass,
+                    kind,
                     use_tree.span,
                     id,
                     item,
@@ -508,20 +507,11 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
                 );
             }
             ast::UseTreeKind::Glob => {
-                let subclass = GlobImport {
+                let kind = ImportKind::Glob {
                     is_prelude: attr::contains_name(&item.attrs, sym::prelude_import),
                     max_vis: Cell::new(ty::Visibility::Invisible),
                 };
-                self.add_import_directive(
-                    prefix,
-                    subclass,
-                    use_tree.span,
-                    id,
-                    item,
-                    root_span,
-                    item.id,
-                    vis,
-                );
+                self.add_import(prefix, kind, use_tree.span, id, item, root_span, item.id, vis);
             }
             ast::UseTreeKind::Nested(ref items) => {
                 // Ensure there is at most one `self` in the list
@@ -637,15 +627,12 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
                 let used = self.process_legacy_macro_imports(item, module);
                 let binding =
                     (module, ty::Visibility::Public, sp, expansion).to_name_binding(self.r.arenas);
-                let directive = self.r.arenas.alloc_import_directive(ImportDirective {
+                let import = self.r.arenas.alloc_import(Import {
+                    kind: ImportKind::ExternCrate { source: orig_name, target: ident },
                     root_id: item.id,
                     id: item.id,
                     parent_scope: self.parent_scope,
                     imported_module: Cell::new(Some(ModuleOrUniformRoot::Module(module))),
-                    subclass: ImportDirectiveSubclass::ExternCrate {
-                        source: orig_name,
-                        target: ident,
-                    },
                     has_attributes: !item.attrs.is_empty(),
                     use_span_with_attributes: item.span_with_attributes(),
                     use_span: item.span,
@@ -655,8 +642,8 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
                     vis: Cell::new(vis),
                     used: Cell::new(used),
                 });
-                self.r.potentially_unused_imports.push(directive);
-                let imported_binding = self.r.import(binding, directive);
+                self.r.potentially_unused_imports.push(import);
+                let imported_binding = self.r.import(binding, import);
                 if ptr::eq(parent, self.r.graph_root) {
                     if let Some(entry) = self.r.extern_prelude.get(&ident.modern()) {
                         if expansion != ExpnId::root()
@@ -718,8 +705,8 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
             }
 
             // These items live in the type namespace.
-            ItemKind::TyAlias(ref ty, _) => {
-                let def_kind = match ty.kind.opaque_top_hack() {
+            ItemKind::TyAlias(_, _, _, ref ty) => {
+                let def_kind = match ty.as_deref().and_then(|ty| ty.kind.opaque_top_hack()) {
                     None => DefKind::TyAlias,
                     Some(_) => DefKind::OpaqueTy,
                 };
@@ -829,7 +816,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
             ForeignItemKind::Static(..) => {
                 (Res::Def(DefKind::Static, self.r.definitions.local_def_id(item.id)), ValueNS)
             }
-            ForeignItemKind::Ty => {
+            ForeignItemKind::TyAlias(..) => {
                 (Res::Def(DefKind::ForeignTy, self.r.definitions.local_def_id(item.id)), TypeNS)
             }
             ForeignItemKind::Macro(_) => unreachable!(),
@@ -992,13 +979,13 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
             }
         }
 
-        let macro_use_directive = |this: &Self, span| {
-            this.r.arenas.alloc_import_directive(ImportDirective {
+        let macro_use_import = |this: &Self, span| {
+            this.r.arenas.alloc_import(Import {
+                kind: ImportKind::MacroUse,
                 root_id: item.id,
                 id: item.id,
                 parent_scope: this.parent_scope,
                 imported_module: Cell::new(Some(ModuleOrUniformRoot::Module(module))),
-                subclass: ImportDirectiveSubclass::MacroUse,
                 use_span_with_attributes: item.span_with_attributes(),
                 has_attributes: !item.attrs.is_empty(),
                 use_span: item.span,
@@ -1012,11 +999,11 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
 
         let allow_shadowing = self.parent_scope.expansion == ExpnId::root();
         if let Some(span) = import_all {
-            let directive = macro_use_directive(self, span);
-            self.r.potentially_unused_imports.push(directive);
+            let import = macro_use_import(self, span);
+            self.r.potentially_unused_imports.push(import);
             module.for_each_child(self, |this, ident, ns, binding| {
                 if ns == MacroNS {
-                    let imported_binding = this.r.import(binding, directive);
+                    let imported_binding = this.r.import(binding, import);
                     this.legacy_import_macro(ident.name, imported_binding, span, allow_shadowing);
                 }
             });
@@ -1031,9 +1018,9 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
                     ident.span,
                 );
                 if let Ok(binding) = result {
-                    let directive = macro_use_directive(self, ident.span);
-                    self.r.potentially_unused_imports.push(directive);
-                    let imported_binding = self.r.import(binding, directive);
+                    let import = macro_use_import(self, ident.span);
+                    self.r.potentially_unused_imports.push(import);
+                    let imported_binding = self.r.import(binding, import);
                     self.legacy_import_macro(
                         ident.name,
                         imported_binding,
@@ -1103,7 +1090,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
     // Macro uses will remove items from this set, and the remaining
     // items will be reported as `unused_macros`.
     fn insert_unused_macro(&mut self, ident: Ident, node_id: NodeId, span: Span) {
-        if !ident.as_str().starts_with("_") {
+        if !ident.as_str().starts_with('_') {
             self.r.unused_macros.insert(node_id, span);
         }
     }
@@ -1234,7 +1221,7 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
         self.parent_scope.legacy = orig_current_legacy_scope;
     }
 
-    fn visit_trait_item(&mut self, item: &'b AssocItem) {
+    fn visit_assoc_item(&mut self, item: &'b AssocItem, ctxt: AssocCtxt) {
         let parent = self.parent_scope.module;
 
         if let AssocItemKind::Macro(_) = item.kind {
@@ -1242,11 +1229,17 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
             return;
         }
 
+        if let AssocCtxt::Impl = ctxt {
+            self.resolve_visibility(&item.vis);
+            visit::walk_assoc_item(self, item, ctxt);
+            return;
+        }
+
         // Add the item to the trait info.
         let item_def_id = self.r.definitions.local_def_id(item.id);
         let (res, ns) = match item.kind {
             AssocItemKind::Const(..) => (Res::Def(DefKind::AssocConst, item_def_id), ValueNS),
-            AssocItemKind::Fn(ref sig, _) => {
+            AssocItemKind::Fn(_, ref sig, _, _) => {
                 if sig.decl.has_self() {
                     self.r.has_self.insert(item_def_id);
                 }
@@ -1260,16 +1253,7 @@ impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
         let expansion = self.parent_scope.expansion;
         self.r.define(parent, item.ident, ns, (res, vis, item.span, expansion));
 
-        visit::walk_trait_item(self, item);
-    }
-
-    fn visit_impl_item(&mut self, item: &'b ast::AssocItem) {
-        if let ast::AssocItemKind::Macro(..) = item.kind {
-            self.visit_invoc(item.id);
-        } else {
-            self.resolve_visibility(&item.vis);
-            visit::walk_impl_item(self, item);
-        }
+        visit::walk_assoc_item(self, item, ctxt);
     }
 
     fn visit_token(&mut self, t: Token) {
diff --git a/src/librustc_resolve/check_unused.rs b/src/librustc_resolve/check_unused.rs
index 4a6df92d82..722f843ab6 100644
--- a/src/librustc_resolve/check_unused.rs
+++ b/src/librustc_resolve/check_unused.rs
@@ -3,7 +3,7 @@
 //
 // Although this is mostly a lint pass, it lives in here because it depends on
 // resolve data structures and because it finalises the privacy information for
-// `use` directives.
+// `use` items.
 //
 // Unused trait imports can't be checked until the method resolution. We save
 // candidates here, and do the actual check in librustc_typeck/check_unused.rs.
@@ -23,17 +23,17 @@
 //  - `check_crate` finally emits the diagnostics based on the data generated
 //    in the last step
 
-use crate::imports::ImportDirectiveSubclass;
+use crate::imports::ImportKind;
 use crate::Resolver;
 
 use rustc::{lint, ty};
+use rustc_ast::ast;
+use rustc_ast::node_id::NodeMap;
+use rustc_ast::visit::{self, Visitor};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_errors::pluralize;
 use rustc_session::lint::BuiltinLintDiagnostics;
-use rustc_session::node_id::NodeMap;
 use rustc_span::{MultiSpan, Span, DUMMY_SP};
-use syntax::ast;
-use syntax::visit::{self, Visitor};
 
 struct UnusedImport<'a> {
     use_tree: &'a ast::UseTree,
@@ -58,7 +58,7 @@ struct UnusedImportCheckVisitor<'a, 'b> {
 }
 
 impl<'a, 'b> UnusedImportCheckVisitor<'a, 'b> {
-    // We have information about whether `use` (import) directives are actually
+    // We have information about whether `use` (import) items are actually
     // used now. If an import is not used at all, we signal a lint error.
     fn check_import(&mut self, id: ast::NodeId) {
         let mut used = false;
@@ -158,7 +158,7 @@ fn calc_unused_spans(
             }
         }
         ast::UseTreeKind::Nested(ref nested) => {
-            if nested.len() == 0 {
+            if nested.is_empty() {
                 return UnusedSpanResult::FlatUnused(use_tree.span, full_span);
             }
 
@@ -223,33 +223,33 @@ fn calc_unused_spans(
 
 impl Resolver<'_> {
     crate fn check_unused(&mut self, krate: &ast::Crate) {
-        for directive in self.potentially_unused_imports.iter() {
-            match directive.subclass {
-                _ if directive.used.get()
-                    || directive.vis.get() == ty::Visibility::Public
-                    || directive.span.is_dummy() =>
+        for import in self.potentially_unused_imports.iter() {
+            match import.kind {
+                _ if import.used.get()
+                    || import.vis.get() == ty::Visibility::Public
+                    || import.span.is_dummy() =>
                 {
-                    if let ImportDirectiveSubclass::MacroUse = directive.subclass {
-                        if !directive.span.is_dummy() {
+                    if let ImportKind::MacroUse = import.kind {
+                        if !import.span.is_dummy() {
                             self.lint_buffer.buffer_lint(
                                 lint::builtin::MACRO_USE_EXTERN_CRATE,
-                                directive.id,
-                                directive.span,
-                                "deprecated `#[macro_use]` directive used to \
+                                import.id,
+                                import.span,
+                                "deprecated `#[macro_use]` attribute used to \
                                 import macros should be replaced at use sites \
-                                with a `use` statement to import the macro \
+                                with a `use` item to import the macro \
                                 instead",
                             );
                         }
                     }
                 }
-                ImportDirectiveSubclass::ExternCrate { .. } => {
-                    self.maybe_unused_extern_crates.push((directive.id, directive.span));
+                ImportKind::ExternCrate { .. } => {
+                    self.maybe_unused_extern_crates.push((import.id, import.span));
                 }
-                ImportDirectiveSubclass::MacroUse => {
+                ImportKind::MacroUse => {
                     let lint = lint::builtin::UNUSED_IMPORTS;
                     let msg = "unused `#[macro_use]` import";
-                    self.lint_buffer.buffer_lint(lint, directive.id, directive.span, msg);
+                    self.lint_buffer.buffer_lint(lint, import.id, import.span, msg);
                 }
                 _ => {}
             }
diff --git a/src/librustc_resolve/def_collector.rs b/src/librustc_resolve/def_collector.rs
index 696ba0e994..0d276e6861 100644
--- a/src/librustc_resolve/def_collector.rs
+++ b/src/librustc_resolve/def_collector.rs
@@ -1,13 +1,13 @@
 use log::debug;
 use rustc::hir::map::definitions::*;
+use rustc_ast::ast::*;
+use rustc_ast::token::{self, Token};
+use rustc_ast::visit;
 use rustc_expand::expand::AstFragment;
 use rustc_hir::def_id::DefIndex;
 use rustc_span::hygiene::ExpnId;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
-use syntax::ast::*;
-use syntax::token::{self, Token};
-use syntax::visit;
 
 crate fn collect_definitions(
     definitions: &mut Definitions,
@@ -48,8 +48,8 @@ impl<'a> DefCollector<'a> {
         decl: &'a FnDecl,
         body: Option<&'a Block>,
     ) {
-        let (closure_id, return_impl_trait_id) = match header.asyncness.node {
-            IsAsync::Async { closure_id, return_impl_trait_id } => {
+        let (closure_id, return_impl_trait_id) = match header.asyncness {
+            Async::Yes { span: _, closure_id, return_impl_trait_id } => {
                 (closure_id, return_impl_trait_id)
             }
             _ => unreachable!(),
@@ -117,7 +117,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
             | ItemKind::ExternCrate(..)
             | ItemKind::ForeignMod(..)
             | ItemKind::TyAlias(..) => DefPathData::TypeNs(i.ident.name),
-            ItemKind::Fn(sig, generics, body) if sig.header.asyncness.node.is_async() => {
+            ItemKind::Fn(_, sig, generics, body) if sig.header.asyncness.is_async() => {
                 return self.visit_async_fn(
                     i.id,
                     i.ident.name,
@@ -125,7 +125,7 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
                     &sig.header,
                     generics,
                     &sig.decl,
-                    Some(body),
+                    body.as_deref(),
                 );
             }
             ItemKind::Static(..) | ItemKind::Const(..) | ItemKind::Fn(..) => {
@@ -213,39 +213,28 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
         visit::walk_generic_param(self, param);
     }
 
-    fn visit_trait_item(&mut self, ti: &'a AssocItem) {
-        let def_data = match ti.kind {
-            AssocItemKind::Fn(..) | AssocItemKind::Const(..) => DefPathData::ValueNs(ti.ident.name),
-            AssocItemKind::TyAlias(..) => DefPathData::TypeNs(ti.ident.name),
-            AssocItemKind::Macro(..) => return self.visit_macro_invoc(ti.id),
-        };
-
-        let def = self.create_def(ti.id, def_data, ti.span);
-        self.with_parent(def, |this| visit::walk_trait_item(this, ti));
-    }
-
-    fn visit_impl_item(&mut self, ii: &'a AssocItem) {
-        let def_data = match ii.kind {
-            AssocItemKind::Fn(FnSig { ref header, ref decl }, ref body)
-                if header.asyncness.node.is_async() =>
+    fn visit_assoc_item(&mut self, i: &'a AssocItem, ctxt: visit::AssocCtxt) {
+        let def_data = match &i.kind {
+            AssocItemKind::Fn(_, FnSig { header, decl }, generics, body)
+                if header.asyncness.is_async() =>
             {
                 return self.visit_async_fn(
-                    ii.id,
-                    ii.ident.name,
-                    ii.span,
+                    i.id,
+                    i.ident.name,
+                    i.span,
                     header,
-                    &ii.generics,
+                    generics,
                     decl,
                     body.as_deref(),
                 );
             }
-            AssocItemKind::Fn(..) | AssocItemKind::Const(..) => DefPathData::ValueNs(ii.ident.name),
-            AssocItemKind::TyAlias(..) => DefPathData::TypeNs(ii.ident.name),
-            AssocItemKind::Macro(..) => return self.visit_macro_invoc(ii.id),
+            AssocItemKind::Fn(..) | AssocItemKind::Const(..) => DefPathData::ValueNs(i.ident.name),
+            AssocItemKind::TyAlias(..) => DefPathData::TypeNs(i.ident.name),
+            AssocItemKind::Macro(..) => return self.visit_macro_invoc(i.id),
         };
 
-        let def = self.create_def(ii.id, def_data, ii.span);
-        self.with_parent(def, |this| visit::walk_impl_item(this, ii));
+        let def = self.create_def(i.id, def_data, i.span);
+        self.with_parent(def, |this| visit::walk_assoc_item(this, i, ctxt));
     }
 
     fn visit_pat(&mut self, pat: &'a Pat) {
@@ -268,10 +257,10 @@ impl<'a> visit::Visitor<'a> for DefCollector<'a> {
                 // we must create two defs.
                 let closure_def = self.create_def(expr.id, DefPathData::ClosureExpr, expr.span);
                 match asyncness {
-                    IsAsync::Async { closure_id, .. } => {
+                    Async::Yes { closure_id, .. } => {
                         self.create_def(closure_id, DefPathData::ClosureExpr, expr.span)
                     }
-                    IsAsync::NotAsync => closure_def,
+                    Async::No => closure_def,
                 }
             }
             ExprKind::Async(_, async_id, _) => {
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index b762e0b08a..47a05ec90d 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -4,10 +4,12 @@ use log::debug;
 use rustc::bug;
 use rustc::session::Session;
 use rustc::ty::{self, DefIdTree};
+use rustc_ast::ast::{self, Ident, Path};
+use rustc_ast::util::lev_distance::find_best_match_for_name;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::fx::FxHashSet;
-use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder};
+use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_feature::BUILTIN_ATTRIBUTES;
-use rustc_hir as hir;
 use rustc_hir::def::Namespace::{self, *};
 use rustc_hir::def::{self, CtorKind, CtorOf, DefKind, NonMacroAttrKind};
 use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
@@ -15,11 +17,8 @@ use rustc_span::hygiene::MacroKind;
 use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::{kw, Symbol};
 use rustc_span::{BytePos, MultiSpan, Span};
-use syntax::ast::{self, Ident, Path};
-use syntax::print::pprust;
-use syntax::util::lev_distance::find_best_match_for_name;
 
-use crate::imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver};
+use crate::imports::{Import, ImportKind, ImportResolver};
 use crate::path_names_to_string;
 use crate::{AmbiguityError, AmbiguityErrorMisc, AmbiguityKind};
 use crate::{BindingError, CrateLint, HasGenericParams, LegacyScope, Module, ModuleOrUniformRoot};
@@ -55,9 +54,9 @@ crate struct ImportSuggestion {
 /// *Attention*: the method used is very fragile since it essentially duplicates the work of the
 /// parser. If you need to use this function or something similar, please consider updating the
 /// `source_map` functions and this function to something more robust.
-fn reduce_impl_span_to_impl_keyword(cm: &SourceMap, impl_span: Span) -> Span {
-    let impl_span = cm.span_until_char(impl_span, '<');
-    let impl_span = cm.span_until_whitespace(impl_span);
+fn reduce_impl_span_to_impl_keyword(sm: &SourceMap, impl_span: Span) -> Span {
+    let impl_span = sm.span_until_char(impl_span, '<');
+    let impl_span = sm.span_until_whitespace(impl_span);
     impl_span
 }
 
@@ -99,16 +98,16 @@ impl<'a> Resolver<'a> {
                     E0401,
                     "can't use generic parameters from outer function",
                 );
-                err.span_label(span, format!("use of generic parameter from outer function"));
+                err.span_label(span, "use of generic parameter from outer function".to_string());
 
-                let cm = self.session.source_map();
+                let sm = self.session.source_map();
                 match outer_res {
                     Res::SelfTy(maybe_trait_defid, maybe_impl_defid) => {
                         if let Some(impl_span) =
                             maybe_impl_defid.and_then(|def_id| self.definitions.opt_span(def_id))
                         {
                             err.span_label(
-                                reduce_impl_span_to_impl_keyword(cm, impl_span),
+                                reduce_impl_span_to_impl_keyword(sm, impl_span),
                                 "`Self` type implicitly declared here, by this `impl`",
                             );
                         }
@@ -144,8 +143,8 @@ impl<'a> Resolver<'a> {
                 if has_generic_params == HasGenericParams::Yes {
                     // Try to retrieve the span of the function signature and generate a new
                     // message with a local type or const parameter.
-                    let sugg_msg = &format!("try using a local generic parameter instead");
-                    if let Some((sugg_span, snippet)) = cm.generate_local_type_param_snippet(span) {
+                    let sugg_msg = "try using a local generic parameter instead";
+                    if let Some((sugg_span, snippet)) = sm.generate_local_type_param_snippet(span) {
                         // Suggest the modification to the user
                         err.span_suggestion(
                             sugg_span,
@@ -153,13 +152,14 @@ impl<'a> Resolver<'a> {
                             snippet,
                             Applicability::MachineApplicable,
                         );
-                    } else if let Some(sp) = cm.generate_fn_name_span(span) {
+                    } else if let Some(sp) = sm.generate_fn_name_span(span) {
                         err.span_label(
                             sp,
-                            format!("try adding a local generic parameter in this method instead"),
+                            "try adding a local generic parameter in this method instead"
+                                .to_string(),
                         );
                     } else {
-                        err.help(&format!("try using a local generic parameter instead"));
+                        err.help("try using a local generic parameter instead");
                     }
                 }
 
@@ -249,8 +249,7 @@ impl<'a> Resolver<'a> {
                     self.session,
                     span,
                     E0409,
-                    "variable `{}` is bound in inconsistent \
-                                ways within the same match arm",
+                    "variable `{}` is bound inconsistently across alternatives separated by `|`",
                     variable_name
                 );
                 err.span_label(span, "bound in different ways");
@@ -769,6 +768,11 @@ impl<'a> Resolver<'a> {
         span: Span,
     ) -> bool {
         if let Some(suggestion) = suggestion {
+            // We shouldn't suggest underscore.
+            if suggestion.candidate == kw::Underscore {
+                return false;
+            }
+
             let msg = format!(
                 "{} {} with a similar name exists",
                 suggestion.res.article(),
@@ -1085,7 +1089,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
         }
 
         // Sort extern crate names in reverse order to get
-        // 1) some consistent ordering for emitted dignostics, and
+        // 1) some consistent ordering for emitted diagnostics, and
         // 2) `std` suggestions before `core` suggestions.
         let mut extern_crate_names =
             self.r.extern_prelude.iter().map(|(ident, _)| ident.name).collect::<Vec<_>>();
@@ -1121,7 +1125,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
     /// ```
     pub(crate) fn check_for_module_export_macro(
         &mut self,
-        directive: &'b ImportDirective<'b>,
+        import: &'b Import<'b>,
         module: ModuleOrUniformRoot<'b>,
         ident: Ident,
     ) -> Option<(Option<Suggestion>, Vec<String>)> {
@@ -1146,28 +1150,26 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
         let binding = resolution.borrow().binding()?;
         if let Res::Def(DefKind::Macro(MacroKind::Bang), _) = binding.res() {
             let module_name = crate_module.kind.name().unwrap();
-            let import = match directive.subclass {
-                ImportDirectiveSubclass::SingleImport { source, target, .. }
-                    if source != target =>
-                {
+            let import_snippet = match import.kind {
+                ImportKind::Single { source, target, .. } if source != target => {
                     format!("{} as {}", source, target)
                 }
                 _ => format!("{}", ident),
             };
 
             let mut corrections: Vec<(Span, String)> = Vec::new();
-            if !directive.is_nested() {
+            if !import.is_nested() {
                 // Assume this is the easy case of `use issue_59764::foo::makro;` and just remove
                 // intermediate segments.
-                corrections.push((directive.span, format!("{}::{}", module_name, import)));
+                corrections.push((import.span, format!("{}::{}", module_name, import_snippet)));
             } else {
                 // Find the binding span (and any trailing commas and spaces).
                 //   ie. `use a::b::{c, d, e};`
                 //                      ^^^
                 let (found_closing_brace, binding_span) = find_span_of_binding_until_next_binding(
                     self.r.session,
-                    directive.span,
-                    directive.use_span,
+                    import.span,
+                    import.use_span,
                 );
                 debug!(
                     "check_for_module_export_macro: found_closing_brace={:?} binding_span={:?}",
@@ -1204,7 +1206,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 let (has_nested, after_crate_name) = find_span_immediately_after_crate_name(
                     self.r.session,
                     module_name,
-                    directive.use_span,
+                    import.use_span,
                 );
                 debug!(
                     "check_for_module_export_macro: has_nested={:?} after_crate_name={:?}",
@@ -1220,11 +1222,11 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                         start_point,
                         if has_nested {
                             // In this case, `start_snippet` must equal '{'.
-                            format!("{}{}, ", start_snippet, import)
+                            format!("{}{}, ", start_snippet, import_snippet)
                         } else {
                             // In this case, add a `{`, then the moved import, then whatever
                             // was there before.
-                            format!("{{{}, {}", import, start_snippet)
+                            format!("{{{}, {}", import_snippet, start_snippet)
                         },
                     ));
                 }
@@ -1421,7 +1423,7 @@ crate fn show_candidates(
     // we want consistent results across executions, but candidates are produced
     // by iterating through a hash map, so make sure they are ordered:
     let mut path_strings: Vec<_> =
-        candidates.into_iter().map(|c| path_names_to_string(&c.path)).collect();
+        candidates.iter().map(|c| path_names_to_string(&c.path)).collect();
     path_strings.sort();
     path_strings.dedup();
 
@@ -1451,74 +1453,3 @@ crate fn show_candidates(
         err.note(&msg);
     }
 }
-
-crate fn report_missing_lifetime_specifiers(
-    sess: &Session,
-    span: Span,
-    count: usize,
-) -> DiagnosticBuilder<'_> {
-    struct_span_err!(sess, span, E0106, "missing lifetime specifier{}", pluralize!(count))
-}
-
-crate fn add_missing_lifetime_specifiers_label(
-    err: &mut DiagnosticBuilder<'_>,
-    span: Span,
-    count: usize,
-    lifetime_names: &FxHashSet<ast::Ident>,
-    snippet: Option<&str>,
-    missing_named_lifetime_spots: &[&hir::Generics<'_>],
-) {
-    if count > 1 {
-        err.span_label(span, format!("expected {} lifetime parameters", count));
-    } else {
-        let suggest_existing = |err: &mut DiagnosticBuilder<'_>, sugg| {
-            err.span_suggestion(
-                span,
-                "consider using the named lifetime",
-                sugg,
-                Applicability::MaybeIncorrect,
-            );
-        };
-        let suggest_new = |err: &mut DiagnosticBuilder<'_>, sugg| {
-            err.span_label(span, "expected named lifetime parameter");
-
-            if let Some(generics) = missing_named_lifetime_spots.iter().last() {
-                let mut introduce_suggestion = vec![];
-                introduce_suggestion.push(match &generics.params {
-                    [] => (generics.span, "<'lifetime>".to_string()),
-                    [param, ..] => (param.span.shrink_to_lo(), "'lifetime, ".to_string()),
-                });
-                introduce_suggestion.push((span, sugg));
-                err.multipart_suggestion(
-                    "consider introducing a named lifetime parameter",
-                    introduce_suggestion,
-                    Applicability::MaybeIncorrect,
-                );
-            }
-        };
-
-        match (lifetime_names.len(), lifetime_names.iter().next(), snippet) {
-            (1, Some(name), Some("&")) => {
-                suggest_existing(err, format!("&{} ", name));
-            }
-            (1, Some(name), Some("'_")) => {
-                suggest_existing(err, name.to_string());
-            }
-            (1, Some(name), Some(snippet)) if !snippet.ends_with(">") => {
-                suggest_existing(err, format!("{}<{}>", snippet, name));
-            }
-            (0, _, Some("&")) => {
-                suggest_new(err, "&'lifetime ".to_string());
-            }
-            (0, _, Some("'_")) => {
-                suggest_new(err, "'lifetime".to_string());
-            }
-            (0, _, Some(snippet)) if !snippet.ends_with(">") => {
-                suggest_new(err, format!("{}<'lifetime>", snippet));
-            }
-            _ => {
-                err.span_label(span, "expected lifetime parameter");
-            }
-        }
-    }
-}
diff --git a/src/librustc_resolve/imports.rs b/src/librustc_resolve/imports.rs
index 55ce51e0ff..485b86636a 100644
--- a/src/librustc_resolve/imports.rs
+++ b/src/librustc_resolve/imports.rs
@@ -1,7 +1,5 @@
 //! A bunch of methods and structures more or less related to resolving imports.
 
-use ImportDirectiveSubclass::*;
-
 use crate::diagnostics::Suggestion;
 use crate::Determinacy::{self, *};
 use crate::Namespace::{self, MacroNS, TypeNS};
@@ -15,6 +13,9 @@ use rustc::hir::exports::Export;
 use rustc::lint::builtin::{PUB_USE_OF_PRIVATE_EXTERN_CRATE, UNUSED_IMPORTS};
 use rustc::ty;
 use rustc::{bug, span_bug};
+use rustc_ast::ast::{Ident, Name, NodeId};
+use rustc_ast::unwrap_or;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::ptr_key::PtrKey;
 use rustc_errors::{pluralize, struct_span_err, Applicability};
@@ -25,9 +26,6 @@ use rustc_session::DiagnosticMessageId;
 use rustc_span::hygiene::ExpnId;
 use rustc_span::symbol::kw;
 use rustc_span::{MultiSpan, Span};
-use syntax::ast::{Ident, Name, NodeId};
-use syntax::unwrap_or;
-use syntax::util::lev_distance::find_best_match_for_name;
 
 use log::*;
 
@@ -36,10 +34,10 @@ use std::{mem, ptr};
 
 type Res = def::Res<NodeId>;
 
-/// Contains data for specific types of import directives.
+/// Contains data for specific kinds of imports.
 #[derive(Clone, Debug)]
-pub enum ImportDirectiveSubclass<'a> {
-    SingleImport {
+pub enum ImportKind<'a> {
+    Single {
         /// `source` in `use prefix::source as target`.
         source: Ident,
         /// `target` in `use prefix::source as target`.
@@ -53,7 +51,7 @@ pub enum ImportDirectiveSubclass<'a> {
         /// Did this import result from a nested import? ie. `use foo::{bar, baz};`
         nested: bool,
     },
-    GlobImport {
+    Glob {
         is_prelude: bool,
         max_vis: Cell<ty::Visibility>, // The visibility of the greatest re-export.
                                        // n.b. `max_vis` is only used in `finalize_import` to check for re-export errors.
@@ -65,19 +63,21 @@ pub enum ImportDirectiveSubclass<'a> {
     MacroUse,
 }
 
-/// One import directive.
+/// One import.
 #[derive(Debug, Clone)]
-crate struct ImportDirective<'a> {
-    /// The ID of the `extern crate`, `UseTree` etc that imported this `ImportDirective`.
+crate struct Import<'a> {
+    pub kind: ImportKind<'a>,
+
+    /// The ID of the `extern crate`, `UseTree` etc that imported this `Import`.
     ///
-    /// In the case where the `ImportDirective` was expanded from a "nested" use tree,
+    /// In the case where the `Import` was expanded from a "nested" use tree,
     /// this id is the ID of the leaf tree. For example:
     ///
     /// ```ignore (pacify the mercilous tidy)
     /// use foo::bar::{a, b}
     /// ```
     ///
-    /// If this is the import directive for `foo::bar::a`, we would have the ID of the `UseTree`
+    /// If this is the import for `foo::bar::a`, we would have the ID of the `UseTree`
     /// for `a` in this field.
     pub id: NodeId,
 
@@ -107,22 +107,21 @@ crate struct ImportDirective<'a> {
     pub module_path: Vec<Segment>,
     /// The resolution of `module_path`.
     pub imported_module: Cell<Option<ModuleOrUniformRoot<'a>>>,
-    pub subclass: ImportDirectiveSubclass<'a>,
     pub vis: Cell<ty::Visibility>,
     pub used: Cell<bool>,
 }
 
-impl<'a> ImportDirective<'a> {
+impl<'a> Import<'a> {
     pub fn is_glob(&self) -> bool {
-        match self.subclass {
-            ImportDirectiveSubclass::GlobImport { .. } => true,
+        match self.kind {
+            ImportKind::Glob { .. } => true,
             _ => false,
         }
     }
 
     pub fn is_nested(&self) -> bool {
-        match self.subclass {
-            ImportDirectiveSubclass::SingleImport { nested, .. } => nested,
+        match self.kind {
+            ImportKind::Single { nested, .. } => nested,
             _ => false,
         }
     }
@@ -136,8 +135,8 @@ impl<'a> ImportDirective<'a> {
 /// Records information about the resolution of a name in a namespace of a module.
 pub struct NameResolution<'a> {
     /// Single imports that may define the name in the namespace.
-    /// Import directives are arena-allocated, so it's ok to use pointers as keys.
-    single_imports: FxHashSet<PtrKey<'a, ImportDirective<'a>>>,
+    /// Imports are arena-allocated, so it's ok to use pointers as keys.
+    single_imports: FxHashSet<PtrKey<'a, Import<'a>>>,
     /// The least shadowable known binding for this name, or None if there are no known bindings.
     pub binding: Option<&'a NameBinding<'a>>,
     shadowed_glob: Option<&'a NameBinding<'a>>,
@@ -155,8 +154,8 @@ impl<'a> NameResolution<'a> {
         })
     }
 
-    crate fn add_single_import(&mut self, directive: &'a ImportDirective<'a>) {
-        self.single_imports.insert(PtrKey(directive));
+    crate fn add_single_import(&mut self, import: &'a Import<'a>) {
+        self.single_imports.insert(PtrKey(import));
     }
 }
 
@@ -313,9 +312,9 @@ impl<'a> Resolver<'a> {
                             }
                         }
 
-                        if !self.is_accessible_from(binding.vis, parent_scope.module) &&
+                        if !(self.is_accessible_from(binding.vis, parent_scope.module) ||
                        // Remove this together with `PUB_USE_OF_PRIVATE_EXTERN_CRATE`
-                       !(self.last_import_segment && binding.is_extern_crate())
+                       (self.last_import_segment && binding.is_extern_crate()))
                         {
                             self.privacy_errors.push(PrivacyError {
                                 ident,
@@ -348,8 +347,8 @@ impl<'a> Resolver<'a> {
                 single_import.imported_module.get(),
                 return Err((Undetermined, Weak::No))
             );
-            let ident = match single_import.subclass {
-                SingleImport { source, .. } => source,
+            let ident = match single_import.kind {
+                ImportKind::Single { source, .. } => source,
                 _ => unreachable!(),
             };
             match self.resolve_ident_in_module(
@@ -451,34 +450,34 @@ impl<'a> Resolver<'a> {
         Err((Determined, Weak::No))
     }
 
-    // Given a binding and an import directive that resolves to it,
-    // return the corresponding binding defined by the import directive.
+    // Given a binding and an import that resolves to it,
+    // return the corresponding binding defined by the import.
     crate fn import(
         &self,
         binding: &'a NameBinding<'a>,
-        directive: &'a ImportDirective<'a>,
+        import: &'a Import<'a>,
     ) -> &'a NameBinding<'a> {
-        let vis = if binding.pseudo_vis().is_at_least(directive.vis.get(), self) ||
+        let vis = if binding.pseudo_vis().is_at_least(import.vis.get(), self) ||
                      // cf. `PUB_USE_OF_PRIVATE_EXTERN_CRATE`
-                     !directive.is_glob() && binding.is_extern_crate()
+                     !import.is_glob() && binding.is_extern_crate()
         {
-            directive.vis.get()
+            import.vis.get()
         } else {
             binding.pseudo_vis()
         };
 
-        if let GlobImport { ref max_vis, .. } = directive.subclass {
-            if vis == directive.vis.get() || vis.is_at_least(max_vis.get(), self) {
+        if let ImportKind::Glob { ref max_vis, .. } = import.kind {
+            if vis == import.vis.get() || vis.is_at_least(max_vis.get(), self) {
                 max_vis.set(vis)
             }
         }
 
         self.arenas.alloc_name_binding(NameBinding {
-            kind: NameBindingKind::Import { binding, directive, used: Cell::new(false) },
+            kind: NameBindingKind::Import { binding, import, used: Cell::new(false) },
             ambiguity: None,
-            span: directive.span,
+            span: import.span,
             vis,
-            expansion: directive.parent_scope.expansion,
+            expansion: import.parent_scope.expansion,
         })
     }
 
@@ -577,17 +576,17 @@ impl<'a> Resolver<'a> {
         };
 
         // Define `binding` in `module`s glob importers.
-        for directive in module.glob_importers.borrow_mut().iter() {
+        for import in module.glob_importers.borrow_mut().iter() {
             let mut ident = key.ident;
-            let scope = match ident.span.reverse_glob_adjust(module.expansion, directive.span) {
+            let scope = match ident.span.reverse_glob_adjust(module.expansion, import.span) {
                 Some(Some(def)) => self.macro_def_scope(def),
-                Some(None) => directive.parent_scope.module,
+                Some(None) => import.parent_scope.module,
                 None => continue,
             };
             if self.is_accessible_from(binding.vis, scope) {
-                let imported_binding = self.import(binding, directive);
+                let imported_binding = self.import(binding, import);
                 let key = BindingKey { ident, ..key };
-                let _ = self.try_define(directive.parent_scope.module, key, imported_binding);
+                let _ = self.try_define(import.parent_scope.module, key, imported_binding);
             }
         }
 
@@ -596,13 +595,13 @@ impl<'a> Resolver<'a> {
 
     // Define a "dummy" resolution containing a Res::Err as a placeholder for a
     // failed resolution
-    fn import_dummy_binding(&mut self, directive: &'a ImportDirective<'a>) {
-        if let SingleImport { target, .. } = directive.subclass {
+    fn import_dummy_binding(&mut self, import: &'a Import<'a>) {
+        if let ImportKind::Single { target, .. } = import.kind {
             let dummy_binding = self.dummy_binding;
-            let dummy_binding = self.import(dummy_binding, directive);
+            let dummy_binding = self.import(dummy_binding, import);
             self.per_ns(|this, ns| {
                 let key = this.new_key(target, ns);
-                let _ = this.try_define(directive.parent_scope.module, key, dummy_binding);
+                let _ = this.try_define(import.parent_scope.module, key, dummy_binding);
                 // Consider erroneous imports used to avoid duplicate diagnostics.
                 this.record_use(target, ns, dummy_binding, false);
             });
@@ -671,7 +670,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             .chain(indeterminate_imports.into_iter().map(|i| (true, i)))
         {
             if let Some(err) = self.finalize_import(import) {
-                if let SingleImport { source, ref source_bindings, .. } = import.subclass {
+                if let ImportKind::Single { source, ref source_bindings, .. } = import.kind {
                     if source.name == kw::SelfLower {
                         // Silence `unresolved import` error if E0429 is already emitted
                         if let Err(Determined) = source_bindings.value_ns.get() {
@@ -695,7 +694,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 if seen_spans.insert(err.span) {
                     let path = import_path_to_string(
                         &import.module_path.iter().map(|seg| seg.ident).collect::<Vec<_>>(),
-                        &import.subclass,
+                        &import.kind,
                         err.span,
                     );
                     errors.push((path, err));
@@ -706,7 +705,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 self.r.used_imports.insert((import.id, TypeNS));
                 let path = import_path_to_string(
                     &import.module_path.iter().map(|seg| seg.ident).collect::<Vec<_>>(),
-                    &import.subclass,
+                    &import.kind,
                     import.span,
                 );
                 let err = UnresolvedImportError {
@@ -767,28 +766,28 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
 
     /// Attempts to resolve the given import, returning true if its resolution is determined.
     /// If successful, the resolved bindings are written into the module.
-    fn resolve_import(&mut self, directive: &'b ImportDirective<'b>) -> bool {
+    fn resolve_import(&mut self, import: &'b Import<'b>) -> bool {
         debug!(
             "(resolving import for module) resolving import `{}::...` in `{}`",
-            Segment::names_to_string(&directive.module_path),
-            module_to_string(directive.parent_scope.module).unwrap_or_else(|| "???".to_string()),
+            Segment::names_to_string(&import.module_path),
+            module_to_string(import.parent_scope.module).unwrap_or_else(|| "???".to_string()),
         );
 
-        let module = if let Some(module) = directive.imported_module.get() {
+        let module = if let Some(module) = import.imported_module.get() {
             module
         } else {
             // For better failure detection, pretend that the import will
             // not define any names while resolving its module path.
-            let orig_vis = directive.vis.replace(ty::Visibility::Invisible);
+            let orig_vis = import.vis.replace(ty::Visibility::Invisible);
             let path_res = self.r.resolve_path(
-                &directive.module_path,
+                &import.module_path,
                 None,
-                &directive.parent_scope,
+                &import.parent_scope,
                 false,
-                directive.span,
-                directive.crate_lint(),
+                import.span,
+                import.crate_lint(),
             );
-            directive.vis.set(orig_vis);
+            import.vis.set(orig_vis);
 
             match path_res {
                 PathResult::Module(module) => module,
@@ -797,23 +796,22 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             }
         };
 
-        directive.imported_module.set(Some(module));
-        let (source, target, source_bindings, target_bindings, type_ns_only) =
-            match directive.subclass {
-                SingleImport {
-                    source,
-                    target,
-                    ref source_bindings,
-                    ref target_bindings,
-                    type_ns_only,
-                    ..
-                } => (source, target, source_bindings, target_bindings, type_ns_only),
-                GlobImport { .. } => {
-                    self.resolve_glob_import(directive);
-                    return true;
-                }
-                _ => unreachable!(),
-            };
+        import.imported_module.set(Some(module));
+        let (source, target, source_bindings, target_bindings, type_ns_only) = match import.kind {
+            ImportKind::Single {
+                source,
+                target,
+                ref source_bindings,
+                ref target_bindings,
+                type_ns_only,
+                ..
+            } => (source, target, source_bindings, target_bindings, type_ns_only),
+            ImportKind::Glob { .. } => {
+                self.resolve_glob_import(import);
+                return true;
+            }
+            _ => unreachable!(),
+        };
 
         let mut indeterminate = false;
         self.r.per_ns(|this, ns| {
@@ -821,23 +819,23 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 if let Err(Undetermined) = source_bindings[ns].get() {
                     // For better failure detection, pretend that the import will
                     // not define any names while resolving its module path.
-                    let orig_vis = directive.vis.replace(ty::Visibility::Invisible);
+                    let orig_vis = import.vis.replace(ty::Visibility::Invisible);
                     let binding = this.resolve_ident_in_module(
                         module,
                         source,
                         ns,
-                        &directive.parent_scope,
+                        &import.parent_scope,
                         false,
-                        directive.span,
+                        import.span,
                     );
-                    directive.vis.set(orig_vis);
+                    import.vis.set(orig_vis);
 
                     source_bindings[ns].set(binding);
                 } else {
                     return;
                 };
 
-                let parent = directive.parent_scope.module;
+                let parent = import.parent_scope.module;
                 match source_bindings[ns].get() {
                     Err(Undetermined) => indeterminate = true,
                     // Don't update the resolution, because it was never added.
@@ -845,20 +843,20 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                     Err(Determined) => {
                         let key = this.new_key(target, ns);
                         this.update_resolution(parent, key, |_, resolution| {
-                            resolution.single_imports.remove(&PtrKey(directive));
+                            resolution.single_imports.remove(&PtrKey(import));
                         });
                     }
                     Ok(binding) if !binding.is_importable() => {
                         let msg = format!("`{}` is not directly importable", target);
-                        struct_span_err!(this.session, directive.span, E0253, "{}", &msg)
-                            .span_label(directive.span, "cannot be imported directly")
+                        struct_span_err!(this.session, import.span, E0253, "{}", &msg)
+                            .span_label(import.span, "cannot be imported directly")
                             .emit();
                         // Do not import this illegal binding. Import a dummy binding and pretend
                         // everything is fine
-                        this.import_dummy_binding(directive);
+                        this.import_dummy_binding(import);
                     }
                     Ok(binding) => {
-                        let imported_binding = this.import(binding, directive);
+                        let imported_binding = this.import(binding, import);
                         target_bindings[ns].set(Some(imported_binding));
                         this.define(parent, target, ns, imported_binding);
                     }
@@ -873,38 +871,35 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
     ///
     /// Optionally returns an unresolved import error. This error is buffered and used to
     /// consolidate multiple unresolved import errors into a single diagnostic.
-    fn finalize_import(
-        &mut self,
-        directive: &'b ImportDirective<'b>,
-    ) -> Option<UnresolvedImportError> {
-        let orig_vis = directive.vis.replace(ty::Visibility::Invisible);
+    fn finalize_import(&mut self, import: &'b Import<'b>) -> Option<UnresolvedImportError> {
+        let orig_vis = import.vis.replace(ty::Visibility::Invisible);
         let prev_ambiguity_errors_len = self.r.ambiguity_errors.len();
         let path_res = self.r.resolve_path(
-            &directive.module_path,
+            &import.module_path,
             None,
-            &directive.parent_scope,
+            &import.parent_scope,
             true,
-            directive.span,
-            directive.crate_lint(),
+            import.span,
+            import.crate_lint(),
         );
         let no_ambiguity = self.r.ambiguity_errors.len() == prev_ambiguity_errors_len;
-        directive.vis.set(orig_vis);
+        import.vis.set(orig_vis);
         if let PathResult::Failed { .. } | PathResult::NonModule(..) = path_res {
             // Consider erroneous imports used to avoid duplicate diagnostics.
-            self.r.used_imports.insert((directive.id, TypeNS));
+            self.r.used_imports.insert((import.id, TypeNS));
         }
         let module = match path_res {
             PathResult::Module(module) => {
                 // Consistency checks, analogous to `finalize_macro_resolutions`.
-                if let Some(initial_module) = directive.imported_module.get() {
+                if let Some(initial_module) = import.imported_module.get() {
                     if !ModuleOrUniformRoot::same_def(module, initial_module) && no_ambiguity {
-                        span_bug!(directive.span, "inconsistent resolution for an import");
+                        span_bug!(import.span, "inconsistent resolution for an import");
                     }
                 } else {
                     if self.r.privacy_errors.is_empty() {
                         let msg = "cannot determine resolution for the import";
                         let msg_note = "import resolution is stuck, try simplifying other imports";
-                        self.r.session.struct_span_err(directive.span, msg).note(msg_note).emit();
+                        self.r.session.struct_span_err(import.span, msg).note(msg_note).emit();
                     }
                 }
 
@@ -912,7 +907,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             }
             PathResult::Failed { is_error_from_last_segment: false, span, label, suggestion } => {
                 if no_ambiguity {
-                    assert!(directive.imported_module.get().is_none());
+                    assert!(import.imported_module.get().is_none());
                     self.r
                         .report_error(span, ResolutionError::FailedToResolve { label, suggestion });
                 }
@@ -920,11 +915,11 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             }
             PathResult::Failed { is_error_from_last_segment: true, span, label, suggestion } => {
                 if no_ambiguity {
-                    assert!(directive.imported_module.get().is_none());
+                    assert!(import.imported_module.get().is_none());
                     let err = match self.make_path_suggestion(
                         span,
-                        directive.module_path.clone(),
-                        &directive.parent_scope,
+                        import.module_path.clone(),
+                        &import.parent_scope,
                     ) {
                         Some((suggestion, note)) => UnresolvedImportError {
                             span,
@@ -949,7 +944,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             }
             PathResult::NonModule(path_res) if path_res.base_res() == Res::Err => {
                 if no_ambiguity {
-                    assert!(directive.imported_module.get().is_none());
+                    assert!(import.imported_module.get().is_none());
                 }
                 // The error was already reported earlier.
                 return None;
@@ -957,10 +952,8 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             PathResult::Indeterminate | PathResult::NonModule(..) => unreachable!(),
         };
 
-        let (ident, target, source_bindings, target_bindings, type_ns_only) = match directive
-            .subclass
-        {
-            SingleImport {
+        let (ident, target, source_bindings, target_bindings, type_ns_only) = match import.kind {
+            ImportKind::Single {
                 source,
                 target,
                 ref source_bindings,
@@ -968,25 +961,25 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 type_ns_only,
                 ..
             } => (source, target, source_bindings, target_bindings, type_ns_only),
-            GlobImport { is_prelude, ref max_vis } => {
-                if directive.module_path.len() <= 1 {
+            ImportKind::Glob { is_prelude, ref max_vis } => {
+                if import.module_path.len() <= 1 {
                     // HACK(eddyb) `lint_if_path_starts_with_module` needs at least
                     // 2 segments, so the `resolve_path` above won't trigger it.
-                    let mut full_path = directive.module_path.clone();
+                    let mut full_path = import.module_path.clone();
                     full_path.push(Segment::from_ident(Ident::invalid()));
                     self.r.lint_if_path_starts_with_module(
-                        directive.crate_lint(),
+                        import.crate_lint(),
                         &full_path,
-                        directive.span,
+                        import.span,
                         None,
                     );
                 }
 
                 if let ModuleOrUniformRoot::Module(module) = module {
-                    if module.def_id() == directive.parent_scope.module.def_id() {
+                    if module.def_id() == import.parent_scope.module.def_id() {
                         // Importing a module into itself is not allowed.
                         return Some(UnresolvedImportError {
-                            span: directive.span,
+                            span: import.span,
                             label: Some(String::from("cannot glob-import a module into itself")),
                             note: Vec::new(),
                             suggestion: None,
@@ -995,15 +988,10 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 }
                 if !is_prelude &&
                    max_vis.get() != ty::Visibility::Invisible && // Allow empty globs.
-                   !max_vis.get().is_at_least(directive.vis.get(), &*self)
+                   !max_vis.get().is_at_least(import.vis.get(), &*self)
                 {
                     let msg = "glob import doesn't reexport anything because no candidate is public enough";
-                    self.r.lint_buffer.buffer_lint(
-                        UNUSED_IMPORTS,
-                        directive.id,
-                        directive.span,
-                        msg,
-                    );
+                    self.r.lint_buffer.buffer_lint(UNUSED_IMPORTS, import.id, import.span, msg);
                 }
                 return None;
             }
@@ -1013,7 +1001,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
         let mut all_ns_err = true;
         self.r.per_ns(|this, ns| {
             if !type_ns_only || ns == TypeNS {
-                let orig_vis = directive.vis.replace(ty::Visibility::Invisible);
+                let orig_vis = import.vis.replace(ty::Visibility::Invisible);
                 let orig_blacklisted_binding =
                     mem::replace(&mut this.blacklisted_binding, target_bindings[ns].get());
                 let orig_last_import_segment = mem::replace(&mut this.last_import_segment, true);
@@ -1021,13 +1009,13 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                     module,
                     ident,
                     ns,
-                    &directive.parent_scope,
+                    &import.parent_scope,
                     true,
-                    directive.span,
+                    import.span,
                 );
                 this.last_import_segment = orig_last_import_segment;
                 this.blacklisted_binding = orig_blacklisted_binding;
-                directive.vis.set(orig_vis);
+                import.vis.set(orig_vis);
 
                 match binding {
                     Ok(binding) => {
@@ -1044,7 +1032,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                                         ident,
                                         ns,
                                         target_binding,
-                                        directive.module_path.is_empty(),
+                                        import.module_path.is_empty(),
                                     );
                                 }
                             }
@@ -1053,7 +1041,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                         let res = binding.res();
                         if let Ok(initial_res) = initial_res {
                             if res != initial_res && this.ambiguity_errors.is_empty() {
-                                span_bug!(directive.span, "inconsistent resolution for an import");
+                                span_bug!(import.span, "inconsistent resolution for an import");
                             }
                         } else {
                             if res != Res::Err
@@ -1064,7 +1052,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                                 let msg_note =
                                     "import resolution is stuck, try simplifying other imports";
                                 this.session
-                                    .struct_span_err(directive.span, msg)
+                                    .struct_span_err(import.span, msg)
                                     .note(msg_note)
                                     .emit();
                             }
@@ -1075,7 +1063,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                         // single import (see test `issue-55884-2.rs`). In theory single imports should
                         // always block globs, even if they are not yet resolved, so that this kind of
                         // self-inconsistent resolution never happens.
-                        // Reenable the assert when the issue is fixed.
+                        // Re-enable the assert when the issue is fixed.
                         // assert!(result[ns].get().is_err());
                     }
                 }
@@ -1090,9 +1078,9 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                         module,
                         ident,
                         ns,
-                        &directive.parent_scope,
+                        &import.parent_scope,
                         true,
-                        directive.span,
+                        import.span,
                     );
                     if binding.is_ok() {
                         all_ns_failed = false;
@@ -1143,7 +1131,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                     });
 
                 let (suggestion, note) =
-                    match self.check_for_module_export_macro(directive, module, ident) {
+                    match self.check_for_module_export_macro(import, module, ident) {
                         Some((suggestion, note)) => (suggestion.or(lev_suggestion), note),
                         _ => (lev_suggestion, Vec::new()),
                     };
@@ -1169,14 +1157,14 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 };
 
                 Some(UnresolvedImportError {
-                    span: directive.span,
+                    span: import.span,
                     label: Some(label),
                     note,
                     suggestion,
                 })
             } else {
                 // `resolve_ident_in_module` reported a privacy error.
-                self.r.import_dummy_binding(directive);
+                self.r.import_dummy_binding(import);
                 None
             };
         }
@@ -1185,7 +1173,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
         let mut any_successful_reexport = false;
         self.r.per_ns(|this, ns| {
             if let Ok(binding) = source_bindings[ns].get() {
-                let vis = directive.vis.get();
+                let vis = import.vis.get();
                 if !binding.pseudo_vis().is_at_least(vis, &*this) {
                     reexport_error = Some((ns, binding));
                 } else {
@@ -1206,42 +1194,42 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 );
                 self.r.lint_buffer.buffer_lint(
                     PUB_USE_OF_PRIVATE_EXTERN_CRATE,
-                    directive.id,
-                    directive.span,
+                    import.id,
+                    import.span,
                     &msg,
                 );
             } else if ns == TypeNS {
                 struct_span_err!(
                     self.r.session,
-                    directive.span,
+                    import.span,
                     E0365,
                     "`{}` is private, and cannot be re-exported",
                     ident
                 )
-                .span_label(directive.span, format!("re-export of private `{}`", ident))
+                .span_label(import.span, format!("re-export of private `{}`", ident))
                 .note(&format!("consider declaring type or module `{}` with `pub`", ident))
                 .emit();
             } else {
                 let msg = format!("`{}` is private, and cannot be re-exported", ident);
                 let note_msg =
                     format!("consider marking `{}` as `pub` in the imported module", ident,);
-                struct_span_err!(self.r.session, directive.span, E0364, "{}", &msg)
-                    .span_note(directive.span, &note_msg)
+                struct_span_err!(self.r.session, import.span, E0364, "{}", &msg)
+                    .span_note(import.span, &note_msg)
                     .emit();
             }
         }
 
-        if directive.module_path.len() <= 1 {
+        if import.module_path.len() <= 1 {
             // HACK(eddyb) `lint_if_path_starts_with_module` needs at least
             // 2 segments, so the `resolve_path` above won't trigger it.
-            let mut full_path = directive.module_path.clone();
+            let mut full_path = import.module_path.clone();
             full_path.push(Segment::from_ident(ident));
             self.r.per_ns(|this, ns| {
                 if let Ok(binding) = source_bindings[ns].get() {
                     this.lint_if_path_starts_with_module(
-                        directive.crate_lint(),
+                        import.crate_lint(),
                         &full_path,
-                        directive.span,
+                        import.span,
                         Some(binding),
                     );
                 }
@@ -1252,18 +1240,12 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
         // this may resolve to either a value or a type, but for documentation
         // purposes it's good enough to just favor one over the other.
         self.r.per_ns(|this, ns| {
-            if let Some(binding) = source_bindings[ns].get().ok() {
-                this.import_res_map.entry(directive.id).or_default()[ns] = Some(binding.res());
+            if let Ok(binding) = source_bindings[ns].get() {
+                this.import_res_map.entry(import.id).or_default()[ns] = Some(binding.res());
             }
         });
 
-        self.check_for_redundant_imports(
-            ident,
-            directive,
-            source_bindings,
-            target_bindings,
-            target,
-        );
+        self.check_for_redundant_imports(ident, import, source_bindings, target_bindings, target);
 
         debug!("(resolving single import) successfully resolved import");
         None
@@ -1272,19 +1254,19 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
     fn check_for_redundant_imports(
         &mut self,
         ident: Ident,
-        directive: &'b ImportDirective<'b>,
+        import: &'b Import<'b>,
         source_bindings: &PerNS<Cell<Result<&'b NameBinding<'b>, Determinacy>>>,
         target_bindings: &PerNS<Cell<Option<&'b NameBinding<'b>>>>,
         target: Ident,
     ) {
         // Skip if the import was produced by a macro.
-        if directive.parent_scope.expansion != ExpnId::root() {
+        if import.parent_scope.expansion != ExpnId::root() {
             return;
         }
 
         // Skip if we are inside a named module (in contrast to an anonymous
         // module defined by a block).
-        if let ModuleKind::Def(..) = directive.parent_scope.module.kind {
+        if let ModuleKind::Def(..) = import.parent_scope.module.kind {
             return;
         }
 
@@ -1293,7 +1275,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
         let mut redundant_span = PerNS { value_ns: None, type_ns: None, macro_ns: None };
 
         self.r.per_ns(|this, ns| {
-            if let Some(binding) = source_bindings[ns].get().ok() {
+            if let Ok(binding) = source_bindings[ns].get() {
                 if binding.res() == Res::Err {
                     return;
                 }
@@ -1304,10 +1286,10 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                 match this.early_resolve_ident_in_lexical_scope(
                     target,
                     ScopeSet::All(ns, false),
-                    &directive.parent_scope,
+                    &import.parent_scope,
                     false,
                     false,
-                    directive.span,
+                    import.span,
                 ) {
                     Ok(other_binding) => {
                         is_redundant[ns] = Some(
@@ -1329,35 +1311,35 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             redundant_spans.dedup();
             self.r.lint_buffer.buffer_lint_with_diagnostic(
                 UNUSED_IMPORTS,
-                directive.id,
-                directive.span,
+                import.id,
+                import.span,
                 &format!("the item `{}` is imported redundantly", ident),
                 BuiltinLintDiagnostics::RedundantImport(redundant_spans, ident),
             );
         }
     }
 
-    fn resolve_glob_import(&mut self, directive: &'b ImportDirective<'b>) {
-        let module = match directive.imported_module.get().unwrap() {
+    fn resolve_glob_import(&mut self, import: &'b Import<'b>) {
+        let module = match import.imported_module.get().unwrap() {
             ModuleOrUniformRoot::Module(module) => module,
             _ => {
-                self.r.session.span_err(directive.span, "cannot glob-import all possible crates");
+                self.r.session.span_err(import.span, "cannot glob-import all possible crates");
                 return;
             }
         };
 
         if module.is_trait() {
-            self.r.session.span_err(directive.span, "items in traits are not importable.");
+            self.r.session.span_err(import.span, "items in traits are not importable.");
             return;
-        } else if module.def_id() == directive.parent_scope.module.def_id() {
+        } else if module.def_id() == import.parent_scope.module.def_id() {
             return;
-        } else if let GlobImport { is_prelude: true, .. } = directive.subclass {
+        } else if let ImportKind::Glob { is_prelude: true, .. } = import.kind {
             self.r.prelude = Some(module);
             return;
         }
 
         // Add to module's glob_importers
-        module.glob_importers.borrow_mut().push(directive);
+        module.glob_importers.borrow_mut().push(import);
 
         // Ensure that `resolutions` isn't borrowed during `try_define`,
         // since it might get updated via a glob cycle.
@@ -1371,19 +1353,19 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             })
             .collect::<Vec<_>>();
         for (mut key, binding) in bindings {
-            let scope = match key.ident.span.reverse_glob_adjust(module.expansion, directive.span) {
+            let scope = match key.ident.span.reverse_glob_adjust(module.expansion, import.span) {
                 Some(Some(def)) => self.r.macro_def_scope(def),
-                Some(None) => directive.parent_scope.module,
+                Some(None) => import.parent_scope.module,
                 None => continue,
             };
             if self.r.is_accessible_from(binding.pseudo_vis(), scope) {
-                let imported_binding = self.r.import(binding, directive);
-                let _ = self.r.try_define(directive.parent_scope.module, key, imported_binding);
+                let imported_binding = self.r.import(binding, import);
+                let _ = self.r.try_define(import.parent_scope.module, key, imported_binding);
             }
         }
 
         // Record the destination of this import
-        self.r.record_partial_res(directive.id, PartialRes::new(module.res().unwrap()));
+        self.r.record_partial_res(import.id, PartialRes::new(module.res().unwrap()));
     }
 
     // Miscellaneous post-processing, including recording re-exports,
@@ -1403,25 +1385,20 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             if is_good_import || binding.is_macro_def() {
                 let res = binding.res();
                 if res != Res::Err {
-                    if let Some(def_id) = res.opt_def_id() {
-                        if !def_id.is_local() {
-                            this.cstore().export_macros_untracked(def_id.krate);
-                        }
-                    }
                     reexports.push(Export { ident, res, span: binding.span, vis: binding.vis });
                 }
             }
 
-            if let NameBindingKind::Import { binding: orig_binding, directive, .. } = binding.kind {
+            if let NameBindingKind::Import { binding: orig_binding, import, .. } = binding.kind {
                 if ns == TypeNS
                     && orig_binding.is_variant()
                     && !orig_binding.vis.is_at_least(binding.vis, &*this)
                 {
-                    let msg = match directive.subclass {
-                        ImportDirectiveSubclass::SingleImport { .. } => {
+                    let msg = match import.kind {
+                        ImportKind::Single { .. } => {
                             format!("variant `{}` is private and cannot be re-exported", ident)
                         }
-                        ImportDirectiveSubclass::GlobImport { .. } => {
+                        ImportKind::Glob { .. } => {
                             let msg = "enum is private and its variants \
                                            cannot be re-exported"
                                 .to_owned();
@@ -1437,18 +1414,18 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
                             }
                             msg
                         }
-                        ref s @ _ => bug!("unexpected import subclass {:?}", s),
+                        ref s => bug!("unexpected import kind {:?}", s),
                     };
                     let mut err = this.session.struct_span_err(binding.span, &msg);
 
-                    let imported_module = match directive.imported_module.get() {
+                    let imported_module = match import.imported_module.get() {
                         Some(ModuleOrUniformRoot::Module(module)) => module,
                         _ => bug!("module should exist"),
                     };
                     let parent_module = imported_module.parent.expect("parent should exist");
                     let resolutions = this.resolutions(parent_module).borrow();
-                    let enum_path_segment_index = directive.module_path.len() - 1;
-                    let enum_ident = directive.module_path[enum_path_segment_index].ident;
+                    let enum_path_segment_index = import.module_path.len() - 1;
+                    let enum_ident = import.module_path[enum_path_segment_index].ident;
 
                     let key = this.new_key(enum_ident, TypeNS);
                     let enum_resolution = resolutions.get(&key).expect("resolution should exist");
@@ -1478,7 +1455,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
             }
         });
 
-        if reexports.len() > 0 {
+        if !reexports.is_empty() {
             if let Some(def_id) = module.def_id() {
                 self.r.export_map.insert(def_id, reexports);
             }
@@ -1486,11 +1463,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
     }
 }
 
-fn import_path_to_string(
-    names: &[Ident],
-    subclass: &ImportDirectiveSubclass<'_>,
-    span: Span,
-) -> String {
+fn import_path_to_string(names: &[Ident], import_kind: &ImportKind<'_>, span: Span) -> String {
     let pos = names.iter().position(|p| span == p.span && p.name != kw::PathRoot);
     let global = !names.is_empty() && names[0].name == kw::PathRoot;
     if let Some(pos) = pos {
@@ -1499,22 +1472,22 @@ fn import_path_to_string(
     } else {
         let names = if global { &names[1..] } else { names };
         if names.is_empty() {
-            import_directive_subclass_to_string(subclass)
+            import_kind_to_string(import_kind)
         } else {
             format!(
                 "{}::{}",
                 names_to_string(&names.iter().map(|ident| ident.name).collect::<Vec<_>>()),
-                import_directive_subclass_to_string(subclass),
+                import_kind_to_string(import_kind),
             )
         }
     }
 }
 
-fn import_directive_subclass_to_string(subclass: &ImportDirectiveSubclass<'_>) -> String {
-    match *subclass {
-        SingleImport { source, .. } => source.to_string(),
-        GlobImport { .. } => "*".to_string(),
-        ExternCrate { .. } => "<extern crate>".to_string(),
-        MacroUse => "#[macro_use]".to_string(),
+fn import_kind_to_string(import_kind: &ImportKind<'_>) -> String {
+    match import_kind {
+        ImportKind::Single { source, .. } => source.to_string(),
+        ImportKind::Glob { .. } => "*".to_string(),
+        ImportKind::ExternCrate { .. } => "<extern crate>".to_string(),
+        ImportKind::MacroUse => "#[macro_use]".to_string(),
     }
 }
diff --git a/src/librustc_resolve/late.rs b/src/librustc_resolve/late.rs
index faa9eb3bc2..97d60e1a23 100644
--- a/src/librustc_resolve/late.rs
+++ b/src/librustc_resolve/late.rs
@@ -12,6 +12,11 @@ use crate::{Module, ModuleOrUniformRoot, NameBindingKind, ParentScope, PathResul
 use crate::{ResolutionError, Resolver, Segment, UseError};
 
 use rustc::{bug, lint, span_bug};
+use rustc_ast::ast::*;
+use rustc_ast::ptr::P;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
+use rustc_ast::visit::{self, AssocCtxt, FnCtxt, FnKind, Visitor};
+use rustc_ast::{unwrap_or, walk_list};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::DiagnosticId;
 use rustc_hir::def::Namespace::{self, *};
@@ -21,17 +26,13 @@ use rustc_hir::TraitCandidate;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
 use smallvec::{smallvec, SmallVec};
-use syntax::ast::*;
-use syntax::ptr::P;
-use syntax::util::lev_distance::find_best_match_for_name;
-use syntax::visit::{self, FnKind, Visitor};
-use syntax::{unwrap_or, walk_list};
 
 use log::debug;
 use std::collections::BTreeSet;
 use std::mem::replace;
 
 mod diagnostics;
+crate mod lifetimes;
 
 type Res = def::Res<NodeId>;
 
@@ -437,7 +438,8 @@ impl<'a, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
     }
     fn visit_foreign_item(&mut self, foreign_item: &'ast ForeignItem) {
         match foreign_item.kind {
-            ForeignItemKind::Fn(_, ref generics) => {
+            ForeignItemKind::Fn(_, _, ref generics, _)
+            | ForeignItemKind::TyAlias(_, ref generics, ..) => {
                 self.with_generic_param_rib(generics, ItemRibKind(HasGenericParams::Yes), |this| {
                     visit::walk_foreign_item(this, foreign_item);
                 });
@@ -447,18 +449,21 @@ impl<'a, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
                     visit::walk_foreign_item(this, foreign_item);
                 });
             }
-            ForeignItemKind::Ty | ForeignItemKind::Macro(..) => {
+            ForeignItemKind::Macro(..) => {
                 visit::walk_foreign_item(self, foreign_item);
             }
         }
     }
-    fn visit_fn(&mut self, fn_kind: FnKind<'ast>, declaration: &'ast FnDecl, sp: Span, _: NodeId) {
-        let previous_value = replace(&mut self.diagnostic_metadata.current_function, Some(sp));
-        debug!("(resolving function) entering function");
+    fn visit_fn(&mut self, fn_kind: FnKind<'ast>, sp: Span, _: NodeId) {
         let rib_kind = match fn_kind {
-            FnKind::ItemFn(..) => FnItemRibKind,
-            FnKind::Method(..) | FnKind::Closure(_) => NormalRibKind,
+            // Bail if there's no body.
+            FnKind::Fn(.., None) => return visit::walk_fn(self, fn_kind, sp),
+            FnKind::Fn(FnCtxt::Free, ..) | FnKind::Fn(FnCtxt::Foreign, ..) => FnItemRibKind,
+            FnKind::Fn(FnCtxt::Assoc(_), ..) | FnKind::Closure(..) => NormalRibKind,
         };
+        let previous_value = replace(&mut self.diagnostic_metadata.current_function, Some(sp));
+        debug!("(resolving function) entering function");
+        let declaration = fn_kind.decl();
 
         // Create a value rib for the function.
         self.with_rib(ValueNS, rib_kind, |this| {
@@ -471,8 +476,8 @@ impl<'a, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
 
                 // Resolve the function body, potentially inside the body of an async closure
                 match fn_kind {
-                    FnKind::ItemFn(.., body) | FnKind::Method(.., body) => this.visit_block(body),
-                    FnKind::Closure(body) => this.visit_expr(body),
+                    FnKind::Fn(.., body) => walk_list!(this, visit_block, body),
+                    FnKind::Closure(_, body) => this.visit_expr(body),
                 };
 
                 debug!("(resolving function) leaving function");
@@ -548,7 +553,7 @@ impl<'a, 'ast> Visitor<'ast> for LateResolutionVisitor<'a, '_, 'ast> {
         let prev = replace(&mut self.diagnostic_metadata.currently_processing_generics, true);
         match arg {
             GenericArg::Type(ref ty) => {
-                // We parse const arguments as path types as we cannot distiguish them during
+                // We parse const arguments as path types as we cannot distinguish them during
                 // parsing. We try to resolve that ambiguity by attempting resolution the type
                 // namespace first, and if that fails we try again in the value namespace. If
                 // resolution in the value namespace succeeds, we have an generic const argument on
@@ -794,7 +799,7 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
         debug!("(resolving item) resolving {} ({:?})", name, item.kind);
 
         match item.kind {
-            ItemKind::TyAlias(_, ref generics) | ItemKind::Fn(_, ref generics, _) => {
+            ItemKind::TyAlias(_, ref generics, _, _) | ItemKind::Fn(_, _, ref generics, _) => {
                 self.with_generic_param_rib(generics, ItemRibKind(HasGenericParams::Yes), |this| {
                     visit::walk_item(this, item)
                 });
@@ -824,37 +829,33 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
                         this.visit_generics(generics);
                         walk_list!(this, visit_param_bound, bounds);
 
-                        for trait_item in trait_items {
+                        let walk_assoc_item = |this: &mut Self, generics, item| {
+                            this.with_generic_param_rib(generics, AssocItemRibKind, |this| {
+                                visit::walk_assoc_item(this, item, AssocCtxt::Trait)
+                            });
+                        };
+
+                        for item in trait_items {
                             this.with_trait_items(trait_items, |this| {
-                                this.with_generic_param_rib(
-                                    &trait_item.generics,
-                                    AssocItemRibKind,
-                                    |this| {
-                                        match trait_item.kind {
-                                            AssocItemKind::Const(ref ty, ref default) => {
-                                                this.visit_ty(ty);
-
-                                                // Only impose the restrictions of
-                                                // ConstRibKind for an actual constant
-                                                // expression in a provided default.
-                                                if let Some(ref expr) = *default {
-                                                    this.with_constant_rib(|this| {
-                                                        this.visit_expr(expr);
-                                                    });
-                                                }
-                                            }
-                                            AssocItemKind::Fn(_, _) => {
-                                                visit::walk_trait_item(this, trait_item)
-                                            }
-                                            AssocItemKind::TyAlias(..) => {
-                                                visit::walk_trait_item(this, trait_item)
-                                            }
-                                            AssocItemKind::Macro(_) => {
-                                                panic!("unexpanded macro in resolve!")
-                                            }
-                                        };
-                                    },
-                                );
+                                match &item.kind {
+                                    AssocItemKind::Const(_, ty, default) => {
+                                        this.visit_ty(ty);
+                                        // Only impose the restrictions of `ConstRibKind` for an
+                                        // actual constant expression in a provided default.
+                                        if let Some(expr) = default {
+                                            this.with_constant_rib(|this| this.visit_expr(expr));
+                                        }
+                                    }
+                                    AssocItemKind::Fn(_, _, generics, _) => {
+                                        walk_assoc_item(this, generics, item);
+                                    }
+                                    AssocItemKind::TyAlias(_, generics, _, _) => {
+                                        walk_assoc_item(this, generics, item);
+                                    }
+                                    AssocItemKind::Macro(_) => {
+                                        panic!("unexpanded macro in resolve!")
+                                    }
+                                };
                             });
                         }
                     });
@@ -878,13 +879,13 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
                 });
             }
 
-            ItemKind::Static(ref ty, _, ref expr) | ItemKind::Const(ref ty, ref expr) => {
+            ItemKind::Static(ref ty, _, ref expr) | ItemKind::Const(_, ref ty, ref expr) => {
                 debug!("resolve_item ItemKind::Const");
                 self.with_item_rib(HasGenericParams::No, |this| {
                     this.visit_ty(ty);
-                    this.with_constant_rib(|this| {
-                        this.visit_expr(expr);
-                    });
+                    if let Some(expr) = expr {
+                        this.with_constant_rib(|this| this.visit_expr(expr));
+                    }
                 });
             }
 
@@ -1007,7 +1008,7 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
     /// When evaluating a `trait` use its associated types' idents for suggestionsa in E0412.
     fn with_trait_items<T>(
         &mut self,
-        trait_items: &Vec<AssocItem>,
+        trait_items: &Vec<P<AssocItem>>,
         f: impl FnOnce(&mut Self) -> T,
     ) -> T {
         let trait_assoc_types = replace(
@@ -1015,7 +1016,9 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
             trait_items
                 .iter()
                 .filter_map(|item| match &item.kind {
-                    AssocItemKind::TyAlias(bounds, _) if bounds.len() == 0 => Some(item.ident),
+                    AssocItemKind::TyAlias(_, _, bounds, _) if bounds.is_empty() => {
+                        Some(item.ident)
+                    }
                     _ => None,
                 })
                 .collect(),
@@ -1084,7 +1087,7 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
         opt_trait_reference: &'ast Option<TraitRef>,
         self_type: &'ast Ty,
         item_id: NodeId,
-        impl_items: &'ast [AssocItem],
+        impl_items: &'ast [P<AssocItem>],
     ) {
         debug!("resolve_implementation");
         // If applicable, create a rib for the type parameters.
@@ -1107,54 +1110,74 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
                         this.with_current_self_type(self_type, |this| {
                             this.with_self_rib_ns(ValueNS, Res::SelfCtor(item_def_id), |this| {
                                 debug!("resolve_implementation with_self_rib_ns(ValueNS, ...)");
-                                for impl_item in impl_items {
-                                    // We also need a new scope for the impl item type parameters.
-                                    this.with_generic_param_rib(&impl_item.generics,
-                                                                AssocItemRibKind,
-                                                                |this| {
-                                        use crate::ResolutionError::*;
-                                        match impl_item.kind {
-                                            AssocItemKind::Const(..) => {
-                                                debug!(
-                                                    "resolve_implementation AssocItemKind::Const",
-                                                );
-                                                // If this is a trait impl, ensure the const
-                                                // exists in trait
-                                                this.check_trait_item(
-                                                    impl_item.ident,
-                                                    ValueNS,
-                                                    impl_item.span,
-                                                    |n, s| ConstNotMemberOfTrait(n, s),
-                                                );
-
-                                                this.with_constant_rib(|this| {
-                                                    visit::walk_impl_item(this, impl_item)
-                                                });
-                                            }
-                                            AssocItemKind::Fn(..) => {
-                                                // If this is a trait impl, ensure the method
-                                                // exists in trait
-                                                this.check_trait_item(impl_item.ident,
-                                                                      ValueNS,
-                                                                      impl_item.span,
-                                                    |n, s| MethodNotMemberOfTrait(n, s));
-
-                                                visit::walk_impl_item(this, impl_item);
-                                            }
-                                            AssocItemKind::TyAlias(_, _) => {
-                                                // If this is a trait impl, ensure the type
-                                                // exists in trait
-                                                this.check_trait_item(impl_item.ident,
-                                                                      TypeNS,
-                                                                      impl_item.span,
-                                                    |n, s| TypeNotMemberOfTrait(n, s));
-
-                                                visit::walk_impl_item(this, impl_item);
-                                            }
-                                            AssocItemKind::Macro(_) =>
-                                                panic!("unexpanded macro in resolve!"),
+                                for item in impl_items {
+                                    use crate::ResolutionError::*;
+                                    match &item.kind {
+                                        AssocItemKind::Const(..) => {
+                                            debug!("resolve_implementation AssocItemKind::Const",);
+                                            // If this is a trait impl, ensure the const
+                                            // exists in trait
+                                            this.check_trait_item(
+                                                item.ident,
+                                                ValueNS,
+                                                item.span,
+                                                |n, s| ConstNotMemberOfTrait(n, s),
+                                            );
+
+                                            this.with_constant_rib(|this| {
+                                                visit::walk_assoc_item(this, item, AssocCtxt::Impl)
+                                            });
+                                        }
+                                        AssocItemKind::Fn(_, _, generics, _) => {
+                                            // We also need a new scope for the impl item type parameters.
+                                            this.with_generic_param_rib(
+                                                generics,
+                                                AssocItemRibKind,
+                                                |this| {
+                                                    // If this is a trait impl, ensure the method
+                                                    // exists in trait
+                                                    this.check_trait_item(
+                                                        item.ident,
+                                                        ValueNS,
+                                                        item.span,
+                                                        |n, s| MethodNotMemberOfTrait(n, s),
+                                                    );
+
+                                                    visit::walk_assoc_item(
+                                                        this,
+                                                        item,
+                                                        AssocCtxt::Impl,
+                                                    )
+                                                },
+                                            );
+                                        }
+                                        AssocItemKind::TyAlias(_, generics, _, _) => {
+                                            // We also need a new scope for the impl item type parameters.
+                                            this.with_generic_param_rib(
+                                                generics,
+                                                AssocItemRibKind,
+                                                |this| {
+                                                    // If this is a trait impl, ensure the type
+                                                    // exists in trait
+                                                    this.check_trait_item(
+                                                        item.ident,
+                                                        TypeNS,
+                                                        item.span,
+                                                        |n, s| TypeNotMemberOfTrait(n, s),
+                                                    );
+
+                                                    visit::walk_assoc_item(
+                                                        this,
+                                                        item,
+                                                        AssocCtxt::Impl,
+                                                    )
+                                                },
+                                            );
+                                        }
+                                        AssocItemKind::Macro(_) => {
+                                            panic!("unexpanded macro in resolve!")
                                         }
-                                    });
+                                    }
                                 }
                             });
                         });
@@ -2012,12 +2035,12 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
             // `async |x| ...` gets desugared to `|x| future_from_generator(|| ...)`, so we need to
             // resolve the arguments within the proper scopes so that usages of them inside the
             // closure are detected as upvars rather than normal closure arg usages.
-            ExprKind::Closure(_, IsAsync::Async { .. }, _, ref fn_decl, ref body, _span) => {
+            ExprKind::Closure(_, Async::Yes { .. }, _, ref fn_decl, ref body, _span) => {
                 self.with_rib(ValueNS, NormalRibKind, |this| {
                     // Resolve arguments:
                     this.resolve_params(&fn_decl.inputs);
                     // No need to resolve return type --
-                    // the outer closure return type is `FunctionRetTy::Default`.
+                    // the outer closure return type is `FnRetTy::Default`.
 
                     // Now resolve the inner closure
                     {
@@ -2060,7 +2083,7 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
         &mut self,
         mut ident: Ident,
         ns: Namespace,
-    ) -> Vec<TraitCandidate> {
+    ) -> Vec<TraitCandidate<NodeId>> {
         debug!("(getting traits containing item) looking for '{}'", ident.name);
 
         let mut found_traits = Vec::new();
@@ -2079,7 +2102,7 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
                 .is_ok()
             {
                 let def_id = module.def_id().unwrap();
-                found_traits.push(TraitCandidate { def_id: def_id, import_ids: smallvec![] });
+                found_traits.push(TraitCandidate { def_id, import_ids: smallvec![] });
             }
         }
 
@@ -2105,7 +2128,7 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
         ident: Ident,
         ns: Namespace,
         module: Module<'a>,
-        found_traits: &mut Vec<TraitCandidate>,
+        found_traits: &mut Vec<TraitCandidate<NodeId>>,
     ) {
         assert!(ns == TypeNS || ns == ValueNS);
         let mut traits = module.traits.borrow_mut();
@@ -2166,10 +2189,10 @@ impl<'a, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
         trait_name: Ident,
     ) -> SmallVec<[NodeId; 1]> {
         let mut import_ids = smallvec![];
-        while let NameBindingKind::Import { directive, binding, .. } = kind {
-            self.r.maybe_unused_trait_imports.insert(directive.id);
-            self.r.add_to_glob_map(&directive, trait_name);
-            import_ids.push(directive.id);
+        while let NameBindingKind::Import { import, binding, .. } = kind {
+            self.r.maybe_unused_trait_imports.insert(import.id);
+            self.r.add_to_glob_map(&import, trait_name);
+            import_ids.push(import.id);
             kind = &binding.kind;
         }
         import_ids
diff --git a/src/librustc_resolve/late/diagnostics.rs b/src/librustc_resolve/late/diagnostics.rs
index 6ec4a13500..fd62c80293 100644
--- a/src/librustc_resolve/late/diagnostics.rs
+++ b/src/librustc_resolve/late/diagnostics.rs
@@ -1,12 +1,16 @@
 use crate::diagnostics::{ImportSuggestion, TypoSuggestion};
+use crate::late::lifetimes::{ElisionFailureInfo, LifetimeContext};
 use crate::late::{LateResolutionVisitor, RibKind};
 use crate::path_names_to_string;
 use crate::{CrateLint, Module, ModuleKind, ModuleOrUniformRoot};
 use crate::{PathResult, PathSource, Segment};
 
 use rustc::session::config::nightly_options;
+use rustc_ast::ast::{self, Expr, ExprKind, Ident, Item, ItemKind, NodeId, Path, Ty, TyKind};
+use rustc_ast::util::lev_distance::find_best_match_for_name;
 use rustc_data_structures::fx::FxHashSet;
-use rustc_errors::{Applicability, DiagnosticBuilder};
+use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder};
+use rustc_hir as hir;
 use rustc_hir::def::Namespace::{self, *};
 use rustc_hir::def::{self, CtorKind, DefKind};
 use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX};
@@ -14,8 +18,6 @@ use rustc_hir::PrimTy;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::Span;
-use syntax::ast::{self, Expr, ExprKind, Ident, Item, ItemKind, NodeId, Path, Ty, TyKind};
-use syntax::util::lev_distance::find_best_match_for_name;
 
 use log::debug;
 
@@ -28,6 +30,40 @@ enum AssocSuggestion {
     AssocItem,
 }
 
+crate enum MissingLifetimeSpot<'tcx> {
+    Generics(&'tcx hir::Generics<'tcx>),
+    HigherRanked { span: Span, span_type: ForLifetimeSpanType },
+}
+
+crate enum ForLifetimeSpanType {
+    BoundEmpty,
+    BoundTail,
+    TypeEmpty,
+    TypeTail,
+}
+
+impl ForLifetimeSpanType {
+    crate fn descr(&self) -> &'static str {
+        match self {
+            Self::BoundEmpty | Self::BoundTail => "bound",
+            Self::TypeEmpty | Self::TypeTail => "type",
+        }
+    }
+
+    crate fn suggestion(&self, sugg: &str) -> String {
+        match self {
+            Self::BoundEmpty | Self::TypeEmpty => format!("for<{}> ", sugg),
+            Self::BoundTail | Self::TypeTail => format!(", {}", sugg),
+        }
+    }
+}
+
+impl<'tcx> Into<MissingLifetimeSpot<'tcx>> for &'tcx hir::Generics<'tcx> {
+    fn into(self) -> MissingLifetimeSpot<'tcx> {
+        MissingLifetimeSpot::Generics(self)
+    }
+}
+
 fn is_self_type(path: &[Segment], namespace: Namespace) -> bool {
     namespace == TypeNS && path.len() == 1 && path[0].ident.name == kw::SelfUpper
 }
@@ -141,7 +177,7 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
             err.code(rustc_errors::error_code!(E0411));
             err.span_label(
                 span,
-                format!("`Self` is only available in impls, traits, and type definitions"),
+                "`Self` is only available in impls, traits, and type definitions".to_string(),
             );
             return (err, Vec::new());
         }
@@ -150,12 +186,10 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
 
             err.code(rustc_errors::error_code!(E0424));
             err.span_label(span, match source {
-                PathSource::Pat => format!(
-                    "`self` value is a keyword and may not be bound to variables or shadowed",
-                ),
-                _ => format!(
-                    "`self` value is a keyword only available in methods with a `self` parameter",
-                ),
+                PathSource::Pat => "`self` value is a keyword and may not be bound to variables or shadowed"
+                                   .to_string(),
+                _ => "`self` value is a keyword only available in methods with a `self` parameter"
+                     .to_string(),
             });
             if let Some(span) = &self.diagnostic_metadata.current_function {
                 err.span_label(*span, "this function doesn't have a `self` parameter");
@@ -318,7 +352,7 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
         let mut has_self_arg = None;
         if let PathSource::Expr(parent) = source {
             match &parent?.kind {
-                ExprKind::Call(_, args) if args.len() > 0 => {
+                ExprKind::Call(_, args) if !args.is_empty() => {
                     let mut expr_kind = &args[0].kind;
                     loop {
                         match expr_kind {
@@ -444,7 +478,7 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
                 PathSource::Expr(Some(parent)) => {
                     suggested = path_sep(err, &parent);
                 }
-                PathSource::Expr(None) if followed_by_brace == true => {
+                PathSource::Expr(None) if followed_by_brace => {
                     if let Some((sp, snippet)) = closing_brace {
                         err.span_suggestion(
                             sp,
@@ -522,7 +556,7 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
                     if is_expected(ctor_def) && !accessible_ctor {
                         err.span_label(
                             span,
-                            format!("constructor is not visible here due to private fields"),
+                            "constructor is not visible here due to private fields".to_string(),
                         );
                     }
                 } else {
@@ -725,21 +759,21 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
 
     /// Only used in a specific case of type ascription suggestions
     fn get_colon_suggestion_span(&self, start: Span) -> Span {
-        let cm = self.r.session.source_map();
-        start.to(cm.next_point(start))
+        let sm = self.r.session.source_map();
+        start.to(sm.next_point(start))
     }
 
     fn type_ascription_suggestion(&self, err: &mut DiagnosticBuilder<'_>, base_span: Span) {
-        let cm = self.r.session.source_map();
-        let base_snippet = cm.span_to_snippet(base_span);
+        let sm = self.r.session.source_map();
+        let base_snippet = sm.span_to_snippet(base_span);
         if let Some(sp) = self.diagnostic_metadata.current_type_ascription.last() {
             let mut sp = *sp;
             loop {
                 // Try to find the `:`; bail on first non-':' / non-whitespace.
-                sp = cm.next_point(sp);
-                if let Ok(snippet) = cm.span_to_snippet(sp.to(cm.next_point(sp))) {
-                    let line_sp = cm.lookup_char_pos(sp.hi()).line;
-                    let line_base_sp = cm.lookup_char_pos(base_span.lo()).line;
+                sp = sm.next_point(sp);
+                if let Ok(snippet) = sm.span_to_snippet(sp.to(sm.next_point(sp))) {
+                    let line_sp = sm.lookup_char_pos(sp.hi()).line;
+                    let line_base_sp = sm.lookup_char_pos(base_span.lo()).line;
                     if snippet == ":" {
                         let mut show_label = true;
                         if line_sp != line_base_sp {
@@ -753,7 +787,7 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
                             let colon_sp = self.get_colon_suggestion_span(sp);
                             let after_colon_sp =
                                 self.get_colon_suggestion_span(colon_sp.shrink_to_hi());
-                            if !cm
+                            if !sm
                                 .span_to_snippet(after_colon_sp)
                                 .map(|s| s == " ")
                                 .unwrap_or(false)
@@ -770,8 +804,8 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
                                 let mut sp = after_colon_sp;
                                 for _ in 0..100 {
                                     // Try to find an assignment
-                                    sp = cm.next_point(sp);
-                                    let snippet = cm.span_to_snippet(sp.to(cm.next_point(sp)));
+                                    sp = sm.next_point(sp);
+                                    let snippet = sm.span_to_snippet(sp.to(sm.next_point(sp)));
                                     match snippet {
                                         Ok(ref x) if x.as_str() == "=" => {
                                             err.span_suggestion(
@@ -904,3 +938,202 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
         None
     }
 }
+
+impl<'tcx> LifetimeContext<'_, 'tcx> {
+    crate fn report_missing_lifetime_specifiers(
+        &self,
+        span: Span,
+        count: usize,
+    ) -> DiagnosticBuilder<'tcx> {
+        struct_span_err!(
+            self.tcx.sess,
+            span,
+            E0106,
+            "missing lifetime specifier{}",
+            pluralize!(count)
+        )
+    }
+
+    crate fn emit_undeclared_lifetime_error(&self, lifetime_ref: &hir::Lifetime) {
+        let mut err = struct_span_err!(
+            self.tcx.sess,
+            lifetime_ref.span,
+            E0261,
+            "use of undeclared lifetime name `{}`",
+            lifetime_ref
+        );
+        err.span_label(lifetime_ref.span, "undeclared lifetime");
+        for missing in &self.missing_named_lifetime_spots {
+            match missing {
+                MissingLifetimeSpot::Generics(generics) => {
+                    let (span, sugg) = if let Some(param) =
+                        generics.params.iter().find(|p| match p.kind {
+                            hir::GenericParamKind::Type {
+                                synthetic: Some(hir::SyntheticTyParamKind::ImplTrait),
+                                ..
+                            } => false,
+                            _ => true,
+                        }) {
+                        (param.span.shrink_to_lo(), format!("{}, ", lifetime_ref))
+                    } else {
+                        (generics.span, format!("<{}>", lifetime_ref))
+                    };
+                    err.span_suggestion(
+                        span,
+                        &format!("consider introducing lifetime `{}` here", lifetime_ref),
+                        sugg,
+                        Applicability::MaybeIncorrect,
+                    );
+                }
+                MissingLifetimeSpot::HigherRanked { span, span_type } => {
+                    err.span_suggestion(
+                        *span,
+                        &format!(
+                            "consider making the {} lifetime-generic with a new `{}` lifetime",
+                            span_type.descr(),
+                            lifetime_ref
+                        ),
+                        span_type.suggestion(&lifetime_ref.to_string()),
+                        Applicability::MaybeIncorrect,
+                    );
+                    err.note(
+                        "for more information on higher-ranked polymorphism, visit \
+                            https://doc.rust-lang.org/nomicon/hrtb.html",
+                    );
+                }
+            }
+        }
+        err.emit();
+    }
+
+    crate fn is_trait_ref_fn_scope(&mut self, trait_ref: &'tcx hir::PolyTraitRef<'tcx>) -> bool {
+        if let def::Res::Def(_, did) = trait_ref.trait_ref.path.res {
+            if [
+                self.tcx.lang_items().fn_once_trait(),
+                self.tcx.lang_items().fn_trait(),
+                self.tcx.lang_items().fn_mut_trait(),
+            ]
+            .contains(&Some(did))
+            {
+                let (span, span_type) = match &trait_ref.bound_generic_params {
+                    [] => (trait_ref.span.shrink_to_lo(), ForLifetimeSpanType::BoundEmpty),
+                    [.., bound] => (bound.span.shrink_to_hi(), ForLifetimeSpanType::BoundTail),
+                };
+                self.missing_named_lifetime_spots
+                    .push(MissingLifetimeSpot::HigherRanked { span, span_type });
+                return true;
+            }
+        };
+        false
+    }
+
+    crate fn add_missing_lifetime_specifiers_label(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        span: Span,
+        count: usize,
+        lifetime_names: &FxHashSet<ast::Ident>,
+        params: &[ElisionFailureInfo],
+    ) {
+        if count > 1 {
+            err.span_label(span, format!("expected {} lifetime parameters", count));
+        } else {
+            let snippet = self.tcx.sess.source_map().span_to_snippet(span).ok();
+            let suggest_existing = |err: &mut DiagnosticBuilder<'_>, sugg| {
+                err.span_suggestion(
+                    span,
+                    "consider using the named lifetime",
+                    sugg,
+                    Applicability::MaybeIncorrect,
+                );
+            };
+            let suggest_new = |err: &mut DiagnosticBuilder<'_>, sugg: &str| {
+                err.span_label(span, "expected named lifetime parameter");
+
+                for missing in self.missing_named_lifetime_spots.iter().rev() {
+                    let mut introduce_suggestion = vec![];
+                    let msg;
+                    let should_break;
+                    introduce_suggestion.push(match missing {
+                        MissingLifetimeSpot::Generics(generics) => {
+                            msg = "consider introducing a named lifetime parameter".to_string();
+                            should_break = true;
+                            if let Some(param) = generics.params.iter().find(|p| match p.kind {
+                                hir::GenericParamKind::Type {
+                                    synthetic: Some(hir::SyntheticTyParamKind::ImplTrait),
+                                    ..
+                                } => false,
+                                _ => true,
+                            }) {
+                                (param.span.shrink_to_lo(), "'a, ".to_string())
+                            } else {
+                                (generics.span, "<'a>".to_string())
+                            }
+                        }
+                        MissingLifetimeSpot::HigherRanked { span, span_type } => {
+                            msg = format!(
+                                "consider making the {} lifetime-generic with a new `'a` lifetime",
+                                span_type.descr(),
+                            );
+                            should_break = false;
+                            err.note(
+                                "for more information on higher-ranked polymorphism, visit \
+                             https://doc.rust-lang.org/nomicon/hrtb.html",
+                            );
+                            (*span, span_type.suggestion("'a"))
+                        }
+                    });
+                    for param in params {
+                        if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(param.span)
+                        {
+                            if snippet.starts_with('&') && !snippet.starts_with("&'") {
+                                introduce_suggestion
+                                    .push((param.span, format!("&'a {}", &snippet[1..])));
+                            } else if snippet.starts_with("&'_ ") {
+                                introduce_suggestion
+                                    .push((param.span, format!("&'a {}", &snippet[4..])));
+                            }
+                        }
+                    }
+                    introduce_suggestion.push((span, sugg.to_string()));
+                    err.multipart_suggestion(
+                        &msg,
+                        introduce_suggestion,
+                        Applicability::MaybeIncorrect,
+                    );
+                    if should_break {
+                        break;
+                    }
+                }
+            };
+
+            match (
+                lifetime_names.len(),
+                lifetime_names.iter().next(),
+                snippet.as_ref().map(|s| s.as_str()),
+            ) {
+                (1, Some(name), Some("&")) => {
+                    suggest_existing(err, format!("&{} ", name));
+                }
+                (1, Some(name), Some("'_")) => {
+                    suggest_existing(err, name.to_string());
+                }
+                (1, Some(name), Some(snippet)) if !snippet.ends_with('>') => {
+                    suggest_existing(err, format!("{}<{}>", snippet, name));
+                }
+                (0, _, Some("&")) => {
+                    suggest_new(err, "&'a ");
+                }
+                (0, _, Some("'_")) => {
+                    suggest_new(err, "'a");
+                }
+                (0, _, Some(snippet)) if !snippet.ends_with('>') => {
+                    suggest_new(err, &format!("{}<'a>", snippet));
+                }
+                _ => {
+                    err.span_label(span, "expected lifetime parameter");
+                }
+            }
+        }
+    }
+}
diff --git a/src/librustc_resolve/lifetimes.rs b/src/librustc_resolve/late/lifetimes.rs
similarity index 95%
rename from src/librustc_resolve/lifetimes.rs
rename to src/librustc_resolve/late/lifetimes.rs
index 6e9ed5fdc1..d2c20451f3 100644
--- a/src/librustc_resolve/lifetimes.rs
+++ b/src/librustc_resolve/late/lifetimes.rs
@@ -5,14 +5,15 @@
 //! used between functions, and they operate in a purely top-down
 //! way. Therefore, we break lifetime name resolution into a separate pass.
 
-use crate::diagnostics::{
-    add_missing_lifetime_specifiers_label, report_missing_lifetime_specifiers,
-};
+use crate::late::diagnostics::{ForLifetimeSpanType, MissingLifetimeSpot};
 use rustc::hir::map::Map;
 use rustc::lint;
 use rustc::middle::resolve_lifetime::*;
 use rustc::ty::{self, DefIdTree, GenericParamDefKind, TyCtxt};
 use rustc::{bug, span_bug};
+use rustc_ast::ast;
+use rustc_ast::attr;
+use rustc_ast::walk_list;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
@@ -26,9 +27,6 @@ use rustc_span::Span;
 use std::borrow::Cow;
 use std::cell::Cell;
 use std::mem::{replace, take};
-use syntax::ast;
-use syntax::attr;
-use syntax::walk_list;
 
 use log::debug;
 
@@ -153,8 +151,8 @@ struct NamedRegionMap {
     object_lifetime_defaults: HirIdMap<Vec<ObjectLifetimeDefault>>,
 }
 
-struct LifetimeContext<'a, 'tcx> {
-    tcx: TyCtxt<'tcx>,
+crate struct LifetimeContext<'a, 'tcx> {
+    crate tcx: TyCtxt<'tcx>,
     map: &'a mut NamedRegionMap,
     scope: ScopeRef<'a>,
 
@@ -186,7 +184,7 @@ struct LifetimeContext<'a, 'tcx> {
 
     /// When encountering an undefined named lifetime, we will suggest introducing it in these
     /// places.
-    missing_named_lifetime_spots: Vec<&'tcx hir::Generics<'tcx>>,
+    crate missing_named_lifetime_spots: Vec<MissingLifetimeSpot<'tcx>>,
 }
 
 #[derive(Debug)]
@@ -264,13 +262,14 @@ enum Elide {
 }
 
 #[derive(Clone, Debug)]
-struct ElisionFailureInfo {
+crate struct ElisionFailureInfo {
     /// Where we can find the argument pattern.
     parent: Option<hir::BodyId>,
     /// The index of the argument in the original definition.
     index: usize,
     lifetime_count: usize,
     have_bound_regions: bool,
+    crate span: Span,
 }
 
 type ScopeRef<'a> = &'a Scope<'a>;
@@ -348,7 +347,7 @@ fn krate(tcx: TyCtxt<'_>) -> NamedRegionMap {
             lifetime_uses: &mut Default::default(),
             missing_named_lifetime_spots: vec![],
         };
-        for (_, item) in &krate.items {
+        for item in krate.items.values() {
             visitor.visit_item(item);
         }
     }
@@ -389,7 +388,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
     fn visit_item(&mut self, item: &'tcx hir::Item<'tcx>) {
         match item.kind {
             hir::ItemKind::Fn(ref sig, ref generics, _) => {
-                self.missing_named_lifetime_spots.push(generics);
+                self.missing_named_lifetime_spots.push(generics.into());
                 self.visit_early_late(None, &sig.decl, generics, |this| {
                     intravisit::walk_item(this, item);
                 });
@@ -424,7 +423,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
             | hir::ItemKind::Trait(_, _, ref generics, ..)
             | hir::ItemKind::TraitAlias(ref generics, ..)
             | hir::ItemKind::Impl { ref generics, .. } => {
-                self.missing_named_lifetime_spots.push(generics);
+                self.missing_named_lifetime_spots.push(generics.into());
 
                 // Impls permit `'_` to be used and it is equivalent to "some fresh lifetime name".
                 // This is not true for other kinds of items.x
@@ -492,6 +491,21 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                 let next_early_index = self.next_early_index();
                 let was_in_fn_syntax = self.is_in_fn_syntax;
                 self.is_in_fn_syntax = true;
+                let lifetime_span: Option<Span> = c
+                    .generic_params
+                    .iter()
+                    .filter_map(|param| match param.kind {
+                        GenericParamKind::Lifetime { .. } => Some(param.span),
+                        _ => None,
+                    })
+                    .last();
+                let (span, span_type) = if let Some(span) = lifetime_span {
+                    (span.shrink_to_hi(), ForLifetimeSpanType::TypeTail)
+                } else {
+                    (ty.span.shrink_to_lo(), ForLifetimeSpanType::TypeEmpty)
+                };
+                self.missing_named_lifetime_spots
+                    .push(MissingLifetimeSpot::HigherRanked { span, span_type });
                 let scope = Scope::Binder {
                     lifetimes: c
                         .generic_params
@@ -514,6 +528,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                     this.check_lifetime_params(old_scope, &c.generic_params);
                     intravisit::walk_ty(this, ty);
                 });
+                self.missing_named_lifetime_spots.pop();
                 self.is_in_fn_syntax = was_in_fn_syntax;
             }
             hir::TyKind::TraitObject(bounds, ref lifetime) => {
@@ -525,7 +540,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                     LifetimeName::Implicit => {
                         // For types like `dyn Foo`, we should
                         // generate a special form of elided.
-                        span_bug!(ty.span, "object-lifetime-default expected, not implict",);
+                        span_bug!(ty.span, "object-lifetime-default expected, not implicit",);
                     }
                     LifetimeName::ImplicitObjectLifetimeDefault => {
                         // If the user does not write *anything*, we
@@ -597,7 +612,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                                 let parent_id = self.tcx.hir().get_parent_node(hir_id);
                                 let parent_impl_id = hir::ImplItemId { hir_id: parent_id };
                                 let parent_trait_id = hir::TraitItemId { hir_id: parent_id };
-                                let krate = self.tcx.hir().forest.krate();
+                                let krate = self.tcx.hir().krate();
 
                                 if !(krate.items.contains_key(&parent_id)
                                     || krate.impl_items.contains_key(&parent_impl_id)
@@ -696,7 +711,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
 
     fn visit_trait_item(&mut self, trait_item: &'tcx hir::TraitItem<'tcx>) {
         use self::hir::TraitItemKind::*;
-        self.missing_named_lifetime_spots.push(&trait_item.generics);
+        self.missing_named_lifetime_spots.push((&trait_item.generics).into());
         match trait_item.kind {
             Method(ref sig, _) => {
                 let tcx = self.tcx;
@@ -732,7 +747,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                     track_lifetime_uses: true,
                     opaque_type_parent: true,
                 };
-                self.with(scope, |_old_scope, this| {
+                self.with(scope, |old_scope, this| {
+                    this.check_lifetime_params(old_scope, &generics.params);
                     this.visit_generics(generics);
                     for bound in bounds {
                         this.visit_param_bound(bound);
@@ -753,7 +769,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
 
     fn visit_impl_item(&mut self, impl_item: &'tcx hir::ImplItem<'tcx>) {
         use self::hir::ImplItemKind::*;
-        self.missing_named_lifetime_spots.push(&impl_item.generics);
+        self.missing_named_lifetime_spots.push((&impl_item.generics).into());
         match impl_item.kind {
             Method(ref sig, _) => {
                 let tcx = self.tcx;
@@ -789,7 +805,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
                     track_lifetime_uses: true,
                     opaque_type_parent: true,
                 };
-                self.with(scope, |_old_scope, this| {
+                self.with(scope, |old_scope, this| {
+                    this.check_lifetime_params(old_scope, &generics.params);
                     this.visit_generics(generics);
                     this.visit_ty(ty);
                 });
@@ -864,8 +881,8 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
 
     fn visit_fn_decl(&mut self, fd: &'tcx hir::FnDecl<'tcx>) {
         let output = match fd.output {
-            hir::FunctionRetTy::DefaultReturn(_) => None,
-            hir::FunctionRetTy::Return(ref ty) => Some(&**ty),
+            hir::FnRetTy::DefaultReturn(_) => None,
+            hir::FnRetTy::Return(ref ty) => Some(&**ty),
         };
         self.visit_fn_like_elision(&fd.inputs, output);
     }
@@ -953,6 +970,7 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
     ) {
         debug!("visit_poly_trait_ref(trait_ref={:?})", trait_ref);
 
+        let should_pop_missing_lt = self.is_trait_ref_fn_scope(trait_ref);
         if !self.trait_ref_hack
             || trait_ref.bound_generic_params.iter().any(|param| match param.kind {
                 GenericParamKind::Lifetime { .. } => true,
@@ -988,10 +1006,13 @@ impl<'a, 'tcx> Visitor<'tcx> for LifetimeContext<'a, 'tcx> {
             self.with(scope, |old_scope, this| {
                 this.check_lifetime_params(old_scope, &trait_ref.bound_generic_params);
                 walk_list!(this, visit_generic_param, trait_ref.bound_generic_params);
-                this.visit_trait_ref(&trait_ref.trait_ref)
+                this.visit_trait_ref(&trait_ref.trait_ref);
             })
         } else {
-            self.visit_trait_ref(&trait_ref.trait_ref)
+            self.visit_trait_ref(&trait_ref.trait_ref);
+        }
+        if should_pop_missing_lt {
+            self.missing_named_lifetime_spots.pop();
         }
     }
 }
@@ -1011,13 +1032,13 @@ struct Shadower {
 }
 
 fn original_label(span: Span) -> Original {
-    Original { kind: ShadowKind::Label, span: span }
+    Original { kind: ShadowKind::Label, span }
 }
 fn shadower_label(span: Span) -> Shadower {
-    Shadower { kind: ShadowKind::Label, span: span }
+    Shadower { kind: ShadowKind::Label, span }
 }
 fn original_lifetime(span: Span) -> Original {
-    Original { kind: ShadowKind::Lifetime, span: span }
+    Original { kind: ShadowKind::Lifetime, span }
 }
 fn shadower_lifetime(param: &hir::GenericParam<'_>) -> Shadower {
     Shadower { kind: ShadowKind::Lifetime, span: param.span }
@@ -1326,7 +1347,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
         let missing_named_lifetime_spots = take(&mut self.missing_named_lifetime_spots);
         let mut this = LifetimeContext {
             tcx: *tcx,
-            map: map,
+            map,
             scope: &wrap_scope,
             trait_ref_hack: self.trait_ref_hack,
             is_in_fn_syntax: self.is_in_fn_syntax,
@@ -1556,22 +1577,28 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
                             }
                         }
 
-                        let mut err = self.tcx.struct_span_lint_hir(
+                        self.tcx.struct_span_lint_hir(
                             lint::builtin::SINGLE_USE_LIFETIMES,
                             id,
                             span,
-                            &format!("lifetime parameter `{}` only used once", name),
+                            |lint| {
+                                let mut err = lint.build(&format!(
+                                    "lifetime parameter `{}` only used once",
+                                    name
+                                ));
+                                if span == lifetime.span {
+                                    // spans are the same for in-band lifetime declarations
+                                    err.span_label(span, "this lifetime is only used here");
+                                } else {
+                                    err.span_label(span, "this lifetime...");
+                                    err.span_label(lifetime.span, "...is used only here");
+                                }
+                                self.suggest_eliding_single_use_lifetime(
+                                    &mut err, def_id, lifetime,
+                                );
+                                err.emit();
+                            },
                         );
-
-                        if span == lifetime.span {
-                            // spans are the same for in-band lifetime declarations
-                            err.span_label(span, "this lifetime is only used here");
-                        } else {
-                            err.span_label(span, "this lifetime...");
-                            err.span_label(lifetime.span, "...is used only here");
-                        }
-                        self.suggest_eliding_single_use_lifetime(&mut err, def_id, lifetime);
-                        err.emit();
                     }
                 }
                 Some(LifetimeUseSet::Many) => {
@@ -1591,26 +1618,32 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
                         _ => None,
                     } {
                         debug!("id ={:?} span = {:?} name = {:?}", id, span, name);
-                        let mut err = self.tcx.struct_span_lint_hir(
+                        self.tcx.struct_span_lint_hir(
                             lint::builtin::UNUSED_LIFETIMES,
                             id,
                             span,
-                            &format!("lifetime parameter `{}` never used", name),
-                        );
-                        if let Some(parent_def_id) = self.tcx.parent(def_id) {
-                            if let Some(generics) = self.tcx.hir().get_generics(parent_def_id) {
-                                let unused_lt_span = self.lifetime_deletion_span(name, generics);
-                                if let Some(span) = unused_lt_span {
-                                    err.span_suggestion(
-                                        span,
-                                        "elide the unused lifetime",
-                                        String::new(),
-                                        Applicability::MachineApplicable,
-                                    );
+                            |lint| {
+                                let mut err = lint
+                                    .build(&format!("lifetime parameter `{}` never used", name));
+                                if let Some(parent_def_id) = self.tcx.parent(def_id) {
+                                    if let Some(generics) =
+                                        self.tcx.hir().get_generics(parent_def_id)
+                                    {
+                                        let unused_lt_span =
+                                            self.lifetime_deletion_span(name, generics);
+                                        if let Some(span) = unused_lt_span {
+                                            err.span_suggestion(
+                                                span,
+                                                "elide the unused lifetime",
+                                                String::new(),
+                                                Applicability::MachineApplicable,
+                                            );
+                                        }
+                                    }
                                 }
-                            }
-                        }
-                        err.emit();
+                                err.emit();
+                            },
+                        );
                     }
                 }
             }
@@ -1824,29 +1857,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
 
             self.insert_lifetime(lifetime_ref, def);
         } else {
-            let mut err = struct_span_err!(
-                self.tcx.sess,
-                lifetime_ref.span,
-                E0261,
-                "use of undeclared lifetime name `{}`",
-                lifetime_ref
-            );
-            err.span_label(lifetime_ref.span, "undeclared lifetime");
-            if !self.is_in_fn_syntax {
-                for generics in &self.missing_named_lifetime_spots {
-                    let (span, sugg) = match &generics.params {
-                        [] => (generics.span, format!("<{}>", lifetime_ref)),
-                        [param, ..] => (param.span.shrink_to_lo(), format!("{}, ", lifetime_ref)),
-                    };
-                    err.span_suggestion(
-                        span,
-                        &format!("consider introducing lifetime `{}` here", lifetime_ref),
-                        sugg,
-                        Applicability::MaybeIncorrect,
-                    );
-                }
-            }
-            err.emit();
+            self.emit_undeclared_lifetime_error(lifetime_ref);
         }
     }
 
@@ -2230,6 +2241,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
                     index: i,
                     lifetime_count: gather.lifetimes.len(),
                     have_bound_regions: gather.have_bound_regions,
+                    span: input.span,
                 }
             })
             .collect();
@@ -2385,7 +2397,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
             }
         };
 
-        let mut err = report_missing_lifetime_specifiers(self.tcx.sess, span, lifetime_refs.len());
+        let mut err = self.report_missing_lifetime_specifiers(span, lifetime_refs.len());
         let mut add_label = true;
 
         if let Some(params) = error {
@@ -2394,13 +2406,12 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
             }
         }
         if add_label {
-            add_missing_lifetime_specifiers_label(
+            self.add_missing_lifetime_specifiers_label(
                 &mut err,
                 span,
                 lifetime_refs.len(),
                 &lifetime_names,
-                self.tcx.sess.source_map().span_to_snippet(span).ok().as_ref().map(|s| s.as_str()),
-                &self.missing_named_lifetime_spots,
+                error.map(|p| &p[..]).unwrap_or(&[]),
             );
         }
 
@@ -2442,8 +2453,10 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
         let elided_len = elided_params.len();
 
         for (i, info) in elided_params.into_iter().enumerate() {
-            let ElisionFailureInfo { parent, index, lifetime_count: n, have_bound_regions } = info;
+            let ElisionFailureInfo { parent, index, lifetime_count: n, have_bound_regions, span } =
+                info;
 
+            db.span_label(span, "");
             let help_name = if let Some(ident) =
                 parent.and_then(|body| self.tcx.hir().body(body).params[index].pat.simple_ident())
             {
@@ -2477,7 +2490,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
         if len == 0 {
             db.help(
                 "this function's return type contains a borrowed value, \
-                but there is no value for it to be borrowed from",
+                 but there is no value for it to be borrowed from",
             );
             self.suggest_lifetime(db, span, "consider giving it a 'static lifetime")
         } else if elided_len == 0 {
@@ -2491,14 +2504,14 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
         } else if elided_len == 1 {
             db.help(&format!(
                 "this function's return type contains a borrowed value, \
-                but the signature does not say which {} it is borrowed from",
+                 but the signature does not say which {} it is borrowed from",
                 m
             ));
             true
         } else {
             db.help(&format!(
                 "this function's return type contains a borrowed value, \
-                but the signature does not say whether it is borrowed from {}",
+                 but the signature does not say whether it is borrowed from {}",
                 m
             ));
             true
@@ -2706,7 +2719,7 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
             span_bug!(
                 lifetime_ref.span,
                 "lifetime reference not renumbered, \
-                 probably a bug in syntax::fold"
+                 probably a bug in rustc_ast::fold"
             );
         }
 
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 0b1752419b..492ac6ed83 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -9,9 +9,7 @@
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(bool_to_option)]
 #![feature(crate_visibility_modifier)]
-#![feature(label_break_value)]
 #![feature(nll)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![recursion_limit = "256"]
 
 pub use rustc_hir::def::{Namespace, PerNS};
@@ -25,6 +23,14 @@ use rustc::middle::cstore::{CrateStore, MetadataLoaderDyn};
 use rustc::span_bug;
 use rustc::ty::query::Providers;
 use rustc::ty::{self, DefIdTree, ResolverOutputs};
+use rustc_ast::ast::{self, FloatTy, Ident, IntTy, Name, NodeId, UintTy};
+use rustc_ast::ast::{Crate, CRATE_NODE_ID};
+use rustc_ast::ast::{ItemKind, Path};
+use rustc_ast::attr;
+use rustc_ast::node_id::{NodeMap, NodeSet};
+use rustc_ast::unwrap_or;
+use rustc_ast::visit::{self, Visitor};
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
 use rustc_data_structures::ptr_key::PtrKey;
 use rustc_data_structures::sync::Lrc;
@@ -37,19 +43,11 @@ use rustc_hir::PrimTy::{self, Bool, Char, Float, Int, Str, Uint};
 use rustc_hir::{GlobMap, TraitMap};
 use rustc_metadata::creader::{CStore, CrateLoader};
 use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer};
-use rustc_session::node_id::{NodeMap, NodeSet};
 use rustc_session::Session;
 use rustc_span::hygiene::{ExpnId, ExpnKind, MacroKind, SyntaxContext, Transparency};
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, FloatTy, Ident, IntTy, Name, NodeId, UintTy};
-use syntax::ast::{Crate, CRATE_NODE_ID};
-use syntax::ast::{ItemKind, Path};
-use syntax::attr;
-use syntax::print::pprust;
-use syntax::unwrap_or;
-use syntax::visit::{self, Visitor};
 
 use log::debug;
 use std::cell::{Cell, RefCell};
@@ -58,7 +56,7 @@ use std::{cmp, fmt, iter, ptr};
 
 use diagnostics::{extend_span_to_previous_binding, find_span_of_binding_until_next_binding};
 use diagnostics::{ImportSuggestion, Suggestion};
-use imports::{ImportDirective, ImportDirectiveSubclass, ImportResolver, NameResolution};
+use imports::{Import, ImportKind, ImportResolver, NameResolution};
 use late::{HasGenericParams, PathSource, Rib, RibKind::*};
 use macros::{LegacyBinding, LegacyScope};
 
@@ -70,7 +68,6 @@ mod def_collector;
 mod diagnostics;
 mod imports;
 mod late;
-mod lifetimes;
 mod macros;
 
 enum Weak {
@@ -459,8 +456,8 @@ pub struct ModuleData<'a> {
 
     no_implicit_prelude: bool,
 
-    glob_importers: RefCell<Vec<&'a ImportDirective<'a>>>,
-    globs: RefCell<Vec<&'a ImportDirective<'a>>>,
+    glob_importers: RefCell<Vec<&'a Import<'a>>>,
+    globs: RefCell<Vec<&'a Import<'a>>>,
 
     // Used to memoize the traits in this module for faster searches through all traits in scope.
     traits: RefCell<Option<Box<[(Ident, &'a NameBinding<'a>)]>>>,
@@ -587,7 +584,7 @@ impl<'a> ToNameBinding<'a> for &'a NameBinding<'a> {
 enum NameBindingKind<'a> {
     Res(Res, /* is_macro_export */ bool),
     Module(Module<'a>),
-    Import { binding: &'a NameBinding<'a>, directive: &'a ImportDirective<'a>, used: Cell<bool> },
+    Import { binding: &'a NameBinding<'a>, import: &'a Import<'a>, used: Cell<bool> },
 }
 
 impl<'a> NameBindingKind<'a> {
@@ -716,8 +713,7 @@ impl<'a> NameBinding<'a> {
     fn is_extern_crate(&self) -> bool {
         match self.kind {
             NameBindingKind::Import {
-                directive:
-                    &ImportDirective { subclass: ImportDirectiveSubclass::ExternCrate { .. }, .. },
+                import: &Import { kind: ImportKind::ExternCrate { .. }, .. },
                 ..
             } => true,
             NameBindingKind::Module(&ModuleData {
@@ -737,7 +733,7 @@ impl<'a> NameBinding<'a> {
 
     fn is_glob_import(&self) -> bool {
         match self.kind {
-            NameBindingKind::Import { directive, .. } => directive.is_glob(),
+            NameBindingKind::Import { import, .. } => import.is_glob(),
             _ => false,
         }
     }
@@ -842,10 +838,10 @@ pub struct Resolver<'a> {
     field_names: FxHashMap<DefId, Vec<Spanned<Name>>>,
 
     /// All imports known to succeed or fail.
-    determined_imports: Vec<&'a ImportDirective<'a>>,
+    determined_imports: Vec<&'a Import<'a>>,
 
     /// All non-determined imports.
-    indeterminate_imports: Vec<&'a ImportDirective<'a>>,
+    indeterminate_imports: Vec<&'a Import<'a>>,
 
     /// FIXME: Refactor things so that these fields are passed through arguments and not resolver.
     /// We are resolving a last import segment during import validation.
@@ -867,7 +863,7 @@ pub struct Resolver<'a> {
     /// `CrateNum` resolutions of `extern crate` items.
     extern_crate_map: NodeMap<CrateNum>,
     export_map: ExportMap<NodeId>,
-    trait_map: TraitMap,
+    trait_map: TraitMap<NodeId>,
 
     /// A map from nodes to anonymous modules.
     /// Anonymous modules are pseudo-modules that are implicitly created around items
@@ -950,7 +946,7 @@ pub struct Resolver<'a> {
     /// Avoid duplicated errors for "name already defined".
     name_already_seen: FxHashMap<Name, Span>,
 
-    potentially_unused_imports: Vec<&'a ImportDirective<'a>>,
+    potentially_unused_imports: Vec<&'a Import<'a>>,
 
     /// Table for mapping struct IDs into struct constructor IDs,
     /// it's not used during normal resolution, only for better error reporting.
@@ -974,7 +970,7 @@ pub struct ResolverArenas<'a> {
     modules: arena::TypedArena<ModuleData<'a>>,
     local_modules: RefCell<Vec<Module<'a>>>,
     name_bindings: arena::TypedArena<NameBinding<'a>>,
-    import_directives: arena::TypedArena<ImportDirective<'a>>,
+    imports: arena::TypedArena<Import<'a>>,
     name_resolutions: arena::TypedArena<RefCell<NameResolution<'a>>>,
     legacy_bindings: arena::TypedArena<LegacyBinding<'a>>,
     ast_paths: arena::TypedArena<ast::Path>,
@@ -994,11 +990,8 @@ impl<'a> ResolverArenas<'a> {
     fn alloc_name_binding(&'a self, name_binding: NameBinding<'a>) -> &'a NameBinding<'a> {
         self.name_bindings.alloc(name_binding)
     }
-    fn alloc_import_directive(
-        &'a self,
-        import_directive: ImportDirective<'a>,
-    ) -> &'a ImportDirective<'_> {
-        self.import_directives.alloc(import_directive)
+    fn alloc_import(&'a self, import: Import<'a>) -> &'a Import<'_> {
+        self.imports.alloc(import)
     }
     fn alloc_name_resolution(&'a self) -> &'a RefCell<NameResolution<'a>> {
         self.name_resolutions.alloc(Default::default())
@@ -1413,7 +1406,7 @@ impl<'a> Resolver<'a> {
                 misc2: AmbiguityErrorMisc::None,
             });
         }
-        if let NameBindingKind::Import { directive, binding, ref used } = used_binding.kind {
+        if let NameBindingKind::Import { import, binding, ref used } = used_binding.kind {
             // Avoid marking `extern crate` items that refer to a name from extern prelude,
             // but not introduce it, as used if they are accessed from lexical scope.
             if is_lexical_scope {
@@ -1426,17 +1419,17 @@ impl<'a> Resolver<'a> {
                 }
             }
             used.set(true);
-            directive.used.set(true);
-            self.used_imports.insert((directive.id, ns));
-            self.add_to_glob_map(&directive, ident);
+            import.used.set(true);
+            self.used_imports.insert((import.id, ns));
+            self.add_to_glob_map(&import, ident);
             self.record_use(ident, ns, binding, false);
         }
     }
 
     #[inline]
-    fn add_to_glob_map(&mut self, directive: &ImportDirective<'_>, ident: Ident) {
-        if directive.is_glob() {
-            self.glob_map.entry(directive.id).or_default().insert(ident.name);
+    fn add_to_glob_map(&mut self, import: &Import<'_>, ident: Ident) {
+        if import.is_glob() {
+            self.glob_map.entry(import.id).or_default().insert(ident.name);
         }
     }
 
@@ -2261,10 +2254,9 @@ impl<'a> Resolver<'a> {
         // `ExternCrate` (also used for `crate::...`) then no need to issue a
         // warning, this looks all good!
         if let Some(binding) = second_binding {
-            if let NameBindingKind::Import { directive: d, .. } = binding.kind {
-                // Careful: we still want to rewrite paths from
-                // renamed extern crates.
-                if let ImportDirectiveSubclass::ExternCrate { source: None, .. } = d.subclass {
+            if let NameBindingKind::Import { import, .. } = binding.kind {
+                // Careful: we still want to rewrite paths from renamed extern crates.
+                if let ImportKind::ExternCrate { source: None, .. } = import.kind {
                     return;
                 }
             }
@@ -2567,10 +2559,10 @@ impl<'a> Resolver<'a> {
 
         // See https://github.com/rust-lang/rust/issues/32354
         use NameBindingKind::Import;
-        let directive = match (&new_binding.kind, &old_binding.kind) {
+        let import = match (&new_binding.kind, &old_binding.kind) {
             // If there are two imports where one or both have attributes then prefer removing the
             // import without attributes.
-            (Import { directive: new, .. }, Import { directive: old, .. })
+            (Import { import: new, .. }, Import { import: old, .. })
                 if {
                     !new_binding.span.is_dummy()
                         && !old_binding.span.is_dummy()
@@ -2584,11 +2576,11 @@ impl<'a> Resolver<'a> {
                 }
             }
             // Otherwise prioritize the new binding.
-            (Import { directive, .. }, other) if !new_binding.span.is_dummy() => {
-                Some((directive, new_binding.span, other.is_import()))
+            (Import { import, .. }, other) if !new_binding.span.is_dummy() => {
+                Some((import, new_binding.span, other.is_import()))
             }
-            (other, Import { directive, .. }) if !old_binding.span.is_dummy() => {
-                Some((directive, old_binding.span, other.is_import()))
+            (other, Import { import, .. }) if !old_binding.span.is_dummy() => {
+                Some((import, old_binding.span, other.is_import()))
             }
             _ => None,
         };
@@ -2605,22 +2597,22 @@ impl<'a> Resolver<'a> {
             && !has_dummy_span
             && ((new_binding.is_extern_crate() || old_binding.is_extern_crate()) || from_item);
 
-        match directive {
-            Some((directive, span, true)) if should_remove_import && directive.is_nested() => {
-                self.add_suggestion_for_duplicate_nested_use(&mut err, directive, span)
+        match import {
+            Some((import, span, true)) if should_remove_import && import.is_nested() => {
+                self.add_suggestion_for_duplicate_nested_use(&mut err, import, span)
             }
-            Some((directive, _, true)) if should_remove_import && !directive.is_glob() => {
+            Some((import, _, true)) if should_remove_import && !import.is_glob() => {
                 // Simple case - remove the entire import. Due to the above match arm, this can
                 // only be a single use so just remove it entirely.
                 err.tool_only_span_suggestion(
-                    directive.use_span_with_attributes,
+                    import.use_span_with_attributes,
                     "remove unnecessary import",
                     String::new(),
                     Applicability::MaybeIncorrect,
                 );
             }
-            Some((directive, span, _)) => {
-                self.add_suggestion_for_rename_of_use(&mut err, name, directive, span)
+            Some((import, span, _)) => {
+                self.add_suggestion_for_rename_of_use(&mut err, name, import, span)
             }
             _ => {}
         }
@@ -2642,7 +2634,7 @@ impl<'a> Resolver<'a> {
         &self,
         err: &mut DiagnosticBuilder<'_>,
         name: Name,
-        directive: &ImportDirective<'_>,
+        import: &Import<'_>,
         binding_span: Span,
     ) {
         let suggested_name = if name.as_str().chars().next().unwrap().is_uppercase() {
@@ -2652,11 +2644,11 @@ impl<'a> Resolver<'a> {
         };
 
         let mut suggestion = None;
-        match directive.subclass {
-            ImportDirectiveSubclass::SingleImport { type_ns_only: true, .. } => {
+        match import.kind {
+            ImportKind::Single { type_ns_only: true, .. } => {
                 suggestion = Some(format!("self as {}", suggested_name))
             }
-            ImportDirectiveSubclass::SingleImport { source, .. } => {
+            ImportKind::Single { source, .. } => {
                 if let Some(pos) =
                     source.span.hi().0.checked_sub(binding_span.lo().0).map(|pos| pos as usize)
                 {
@@ -2666,13 +2658,13 @@ impl<'a> Resolver<'a> {
                                 "{} as {}{}",
                                 &snippet[..pos],
                                 suggested_name,
-                                if snippet.ends_with(";") { ";" } else { "" }
+                                if snippet.ends_with(';') { ";" } else { "" }
                             ))
                         }
                     }
                 }
             }
-            ImportDirectiveSubclass::ExternCrate { source, target, .. } => {
+            ImportKind::ExternCrate { source, target, .. } => {
                 suggestion = Some(format!(
                     "extern crate {} as {};",
                     source.unwrap_or(target.name),
@@ -2714,27 +2706,27 @@ impl<'a> Resolver<'a> {
     /// If the nested use contains only one import then the suggestion will remove the entire
     /// line.
     ///
-    /// It is expected that the directive provided is a nested import - this isn't checked by the
+    /// It is expected that the provided import is nested - this isn't checked by the
     /// function. If this invariant is not upheld, this function's behaviour will be unexpected
     /// as characters expected by span manipulations won't be present.
     fn add_suggestion_for_duplicate_nested_use(
         &self,
         err: &mut DiagnosticBuilder<'_>,
-        directive: &ImportDirective<'_>,
+        import: &Import<'_>,
         binding_span: Span,
     ) {
-        assert!(directive.is_nested());
+        assert!(import.is_nested());
         let message = "remove unnecessary import";
 
         // Two examples will be used to illustrate the span manipulations we're doing:
         //
         // - Given `use issue_52891::{d, a, e};` where `a` is a duplicate then `binding_span` is
-        //   `a` and `directive.use_span` is `issue_52891::{d, a, e};`.
+        //   `a` and `import.use_span` is `issue_52891::{d, a, e};`.
         // - Given `use issue_52891::{d, e, a};` where `a` is a duplicate then `binding_span` is
-        //   `a` and `directive.use_span` is `issue_52891::{d, e, a};`.
+        //   `a` and `import.use_span` is `issue_52891::{d, e, a};`.
 
         let (found_closing_brace, span) =
-            find_span_of_binding_until_next_binding(self.session, binding_span, directive.use_span);
+            find_span_of_binding_until_next_binding(self.session, binding_span, import.use_span);
 
         // If there was a closing brace then identify the span to remove any trailing commas from
         // previous imports.
@@ -2750,7 +2742,7 @@ impl<'a> Resolver<'a> {
                 // Remove the entire line if we cannot extend the span back, this indicates a
                 // `issue_52891::{self}` case.
                 err.span_suggestion(
-                    directive.use_span_with_attributes,
+                    import.use_span_with_attributes,
                     message,
                     String::new(),
                     Applicability::MaybeIncorrect,
@@ -2961,5 +2953,5 @@ impl CrateLint {
 }
 
 pub fn provide(providers: &mut Providers<'_>) {
-    lifetimes::provide(providers);
+    late::lifetimes::provide(providers);
 }
diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs
index 85b5d8ef1c..e11aec9066 100644
--- a/src/librustc_resolve/macros.rs
+++ b/src/librustc_resolve/macros.rs
@@ -10,6 +10,9 @@ use rustc::middle::stability;
 use rustc::session::parse::feature_err;
 use rustc::session::Session;
 use rustc::{lint, span_bug, ty};
+use rustc_ast::ast::{self, Ident, NodeId};
+use rustc_ast_pretty::pprust;
+use rustc_attr::{self as attr, StabilityLevel};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_expand::base::SyntaxExtension;
 use rustc_expand::base::{self, Indeterminate, InvocationRes};
@@ -22,9 +25,6 @@ use rustc_span::edition::Edition;
 use rustc_span::hygiene::{self, ExpnData, ExpnId, ExpnKind};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
-use syntax::ast::{self, Ident, NodeId};
-use syntax::attr::{self, StabilityLevel};
-use syntax::print::pprust;
 
 use rustc_data_structures::sync::Lrc;
 use rustc_span::hygiene::{AstPass, MacroKind};
diff --git a/src/librustc_save_analysis/Cargo.toml b/src/librustc_save_analysis/Cargo.toml
index e7a7eefc50..0f4cc4192b 100644
--- a/src/librustc_save_analysis/Cargo.toml
+++ b/src/librustc_save_analysis/Cargo.toml
@@ -11,12 +11,13 @@ path = "lib.rs"
 [dependencies]
 log = "0.4"
 rustc = { path = "../librustc" }
+rustc_ast_pretty = { path = "../librustc_ast_pretty" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_hir = { path = "../librustc_hir" }
 rustc_parse = { path = "../librustc_parse" }
 serde_json = "1"
-syntax = { path = "../libsyntax" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rls-data = "0.19"
 rls-span = "0.5"
diff --git a/src/librustc_save_analysis/dump_visitor.rs b/src/librustc_save_analysis/dump_visitor.rs
index d252fc542c..72c962749c 100644
--- a/src/librustc_save_analysis/dump_visitor.rs
+++ b/src/librustc_save_analysis/dump_visitor.rs
@@ -16,22 +16,21 @@
 use rustc::session::config::Input;
 use rustc::span_bug;
 use rustc::ty::{self, DefIdTree, TyCtxt};
+use rustc_ast::ast::{self, Attribute, NodeId, PatKind};
+use rustc_ast::ptr::P;
+use rustc_ast::token;
+use rustc_ast::visit::{self, Visitor};
+use rustc_ast::walk_list;
+use rustc_ast_pretty::pprust::{bounds_to_string, generic_params_to_string, ty_to_string};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir::def::{DefKind as HirDefKind, Res};
 use rustc_hir::def_id::DefId;
+use rustc_span::source_map::{respan, DUMMY_SP};
+use rustc_span::*;
 
 use std::env;
 use std::path::Path;
 
-use rustc_span::source_map::{respan, DUMMY_SP};
-use rustc_span::*;
-use syntax::ast::{self, Attribute, NodeId, PatKind};
-use syntax::print::pprust::{bounds_to_string, generic_params_to_string, ty_to_string};
-use syntax::ptr::P;
-use syntax::token;
-use syntax::visit::{self, Visitor};
-use syntax::walk_list;
-
 use crate::dumper::{Access, Dumper};
 use crate::sig;
 use crate::span_utils::SpanUtils;
@@ -286,13 +285,13 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                 v.visit_ty(&arg.ty);
             }
 
-            if let ast::FunctionRetTy::Ty(ref ret_ty) = sig.decl.output {
+            if let ast::FnRetTy::Ty(ref ret_ty) = sig.decl.output {
                 // In async functions, return types are desugared and redefined
                 // as an `impl Trait` existential type. Because of this, to match
                 // the definition paths when resolving nested types we need to
                 // start walking from the newly-created definition.
-                match sig.header.asyncness.node {
-                    ast::IsAsync::Async { return_impl_trait_id, .. } => {
+                match sig.header.asyncness {
+                    ast::Async::Yes { return_impl_trait_id, .. } => {
                         v.nest_tables(return_impl_trait_id, |v| v.visit_ty(ret_ty))
                     }
                     _ => v.visit_ty(ret_ty),
@@ -359,7 +358,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
         decl: &'l ast::FnDecl,
         header: &'l ast::FnHeader,
         ty_params: &'l ast::Generics,
-        body: &'l ast::Block,
+        body: Option<&'l ast::Block>,
     ) {
         let hir_id = self.tcx.hir().node_to_hir_id(item.id);
         self.nest_tables(item.id, |v| {
@@ -375,7 +374,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                 v.visit_ty(&arg.ty)
             }
 
-            if let ast::FunctionRetTy::Ty(ref ret_ty) = decl.output {
+            if let ast::FnRetTy::Ty(ref ret_ty) = decl.output {
                 if let ast::TyKind::ImplTrait(..) = ret_ty.kind {
                     // FIXME: Opaque type desugaring prevents us from easily
                     // processing trait bounds. See `visit_ty` for more details.
@@ -384,8 +383,8 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                     // as an `impl Trait` existential type. Because of this, to match
                     // the definition paths when resolving nested types we need to
                     // start walking from the newly-created definition.
-                    match header.asyncness.node {
-                        ast::IsAsync::Async { return_impl_trait_id, .. } => {
+                    match header.asyncness {
+                        ast::Async::Yes { return_impl_trait_id, .. } => {
                             v.nest_tables(return_impl_trait_id, |v| v.visit_ty(ret_ty))
                         }
                         _ => v.visit_ty(ret_ty),
@@ -393,7 +392,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                 }
             }
 
-            v.visit_block(&body);
+            walk_list!(v, visit_block, body);
         });
     }
 
@@ -401,7 +400,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
         &mut self,
         item: &'l ast::Item,
         typ: &'l ast::Ty,
-        expr: &'l ast::Expr,
+        expr: Option<&'l ast::Expr>,
     ) {
         let hir_id = self.tcx.hir().node_to_hir_id(item.id);
         self.nest_tables(item.id, |v| {
@@ -410,7 +409,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                 v.dumper.dump_def(&access_from!(v.save_ctxt, item, hir_id), var_data);
             }
             v.visit_ty(&typ);
-            v.visit_expr(expr);
+            walk_list!(v, visit_expr, expr);
         });
     }
 
@@ -650,7 +649,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
         generics: &'l ast::Generics,
         trait_ref: &'l Option<ast::TraitRef>,
         typ: &'l ast::Ty,
-        impl_items: &'l [ast::AssocItem],
+        impl_items: &'l [P<ast::AssocItem>],
     ) {
         if let Some(impl_data) = self.save_ctxt.get_item_data(item) {
             if !self.span.filter_generated(item.span) {
@@ -681,7 +680,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
         item: &'l ast::Item,
         generics: &'l ast::Generics,
         trait_refs: &'l ast::GenericBounds,
-        methods: &'l [ast::AssocItem],
+        methods: &'l [P<ast::AssocItem>],
     ) {
         let name = item.ident.to_string();
         let qualname = format!(
@@ -793,7 +792,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                         for t in &data.inputs {
                             self.visit_ty(t);
                         }
-                        if let ast::FunctionRetTy::Ty(ty) = &data.output {
+                        if let ast::FnRetTy::Ty(ty) = &data.output {
                             self.visit_ty(ty);
                         }
                     }
@@ -867,8 +866,8 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                 // FIXME do something with _path?
                 let hir_id = self.tcx.hir().node_to_hir_id(p.id);
                 let adt = match self.save_ctxt.tables.node_type_opt(hir_id) {
-                    Some(ty) => ty.ty_adt_def().unwrap(),
-                    None => {
+                    Some(ty) if ty.ty_adt_def().is_some() => ty.ty_adt_def().unwrap(),
+                    _ => {
                         visit::walk_pat(self, p);
                         return;
                     }
@@ -1005,7 +1004,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
         self.process_macro_use(trait_item.span);
         let vis_span = trait_item.span.shrink_to_lo();
         match trait_item.kind {
-            ast::AssocItemKind::Const(ref ty, ref expr) => {
+            ast::AssocItemKind::Const(_, ref ty, ref expr) => {
                 self.process_assoc_const(
                     trait_item.id,
                     trait_item.ident,
@@ -1016,18 +1015,18 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                     &trait_item.attrs,
                 );
             }
-            ast::AssocItemKind::Fn(ref sig, ref body) => {
+            ast::AssocItemKind::Fn(_, ref sig, ref generics, ref body) => {
                 self.process_method(
                     sig,
                     body.as_ref().map(|x| &**x),
                     trait_item.id,
                     trait_item.ident,
-                    &trait_item.generics,
+                    generics,
                     respan(vis_span, ast::VisibilityKind::Public),
                     trait_item.span,
                 );
             }
-            ast::AssocItemKind::TyAlias(ref bounds, ref default_ty) => {
+            ast::AssocItemKind::TyAlias(_, _, ref bounds, ref default_ty) => {
                 // FIXME do something with _bounds (for type refs)
                 let name = trait_item.ident.name.to_string();
                 let qualname = format!(
@@ -1075,7 +1074,7 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
     fn process_impl_item(&mut self, impl_item: &'l ast::AssocItem, impl_id: DefId) {
         self.process_macro_use(impl_item.span);
         match impl_item.kind {
-            ast::AssocItemKind::Const(ref ty, ref expr) => {
+            ast::AssocItemKind::Const(_, ref ty, ref expr) => {
                 self.process_assoc_const(
                     impl_item.id,
                     impl_item.ident,
@@ -1086,19 +1085,19 @@ impl<'l, 'tcx> DumpVisitor<'l, 'tcx> {
                     &impl_item.attrs,
                 );
             }
-            ast::AssocItemKind::Fn(ref sig, ref body) => {
+            ast::AssocItemKind::Fn(_, ref sig, ref generics, ref body) => {
                 self.process_method(
                     sig,
                     body.as_deref(),
                     impl_item.id,
                     impl_item.ident,
-                    &impl_item.generics,
+                    generics,
                     impl_item.vis.clone(),
                     impl_item.span,
                 );
             }
-            ast::AssocItemKind::TyAlias(_, None) => {}
-            ast::AssocItemKind::TyAlias(_, Some(ref ty)) => {
+            ast::AssocItemKind::TyAlias(_, _, _, None) => {}
+            ast::AssocItemKind::TyAlias(_, _, _, Some(ref ty)) => {
                 // FIXME: uses of the assoc type should ideally point to this
                 // 'def' and the name here should be a ref to the def in the
                 // trait.
@@ -1232,8 +1231,8 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
         let qualname =
             format!("::{}", self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(id)));
 
-        let cm = self.tcx.sess.source_map();
-        let filename = cm.span_to_filename(span);
+        let sm = self.tcx.sess.source_map();
+        let filename = sm.span_to_filename(span);
         let data_id = id_from_node_id(id, &self.save_ctxt);
         let children = m.items.iter().map(|i| id_from_node_id(i.id, &self.save_ctxt)).collect();
         let span = self.span_from_span(span);
@@ -1259,7 +1258,7 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
     }
 
     fn visit_item(&mut self, item: &'l ast::Item) {
-        use syntax::ast::ItemKind::*;
+        use rustc_ast::ast::ItemKind::*;
         self.process_macro_use(item.span);
         match item.kind {
             Use(ref use_tree) => {
@@ -1291,11 +1290,11 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
                     );
                 }
             }
-            Fn(ref sig, ref ty_params, ref body) => {
-                self.process_fn(item, &sig.decl, &sig.header, ty_params, &body)
+            Fn(_, ref sig, ref ty_params, ref body) => {
+                self.process_fn(item, &sig.decl, &sig.header, ty_params, body.as_deref())
             }
-            Static(ref typ, _, ref expr) => self.process_static_or_const_item(item, typ, expr),
-            Const(ref typ, ref expr) => self.process_static_or_const_item(item, &typ, &expr),
+            Static(ref typ, _, ref e) => self.process_static_or_const_item(item, typ, e.as_deref()),
+            Const(_, ref typ, ref e) => self.process_static_or_const_item(item, typ, e.as_deref()),
             Struct(ref def, ref ty_params) | Union(ref def, ref ty_params) => {
                 self.process_struct(item, def, ty_params)
             }
@@ -1310,12 +1309,15 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
                 self.process_mod(item);
                 visit::walk_mod(self, m);
             }
-            TyAlias(ref ty, ref ty_params) => {
+            TyAlias(_, ref ty_params, _, ref ty) => {
                 let qualname = format!(
                     "::{}",
                     self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))
                 );
-                let value = ty_to_string(&ty);
+                let value = match ty {
+                    Some(ty) => ty_to_string(&ty),
+                    None => "_".to_string(),
+                };
                 if !self.span.filter_generated(item.ident.span) {
                     let span = self.span_from_span(item.ident.span);
                     let id = id_from_node_id(item.id, &self.save_ctxt);
@@ -1340,7 +1342,7 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
                     );
                 }
 
-                self.visit_ty(&ty);
+                walk_list!(self, visit_ty, ty);
                 self.process_generic_params(ty_params, &qualname, item.id);
             }
             Mac(_) => (),
@@ -1450,7 +1452,7 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
                     self.visit_ty(&arg.ty);
                 }
 
-                if let ast::FunctionRetTy::Ty(ref ret_ty) = decl.output {
+                if let ast::FnRetTy::Ty(ref ret_ty) = decl.output {
                     self.visit_ty(&ret_ty);
                 }
 
@@ -1516,7 +1518,8 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
         let access = access_from!(self.save_ctxt, item, hir_id);
 
         match item.kind {
-            ast::ForeignItemKind::Fn(ref decl, ref generics) => {
+            ast::ForeignItemKind::Fn(_, ref sig, ref generics, _) => {
+                let decl = &sig.decl;
                 if let Some(fn_data) = self.save_ctxt.get_extern_item_data(item) {
                     down_cast_data!(fn_data, DefData, item.span);
 
@@ -1528,11 +1531,11 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
                     self.visit_ty(&arg.ty);
                 }
 
-                if let ast::FunctionRetTy::Ty(ref ret_ty) = decl.output {
+                if let ast::FnRetTy::Ty(ref ret_ty) = decl.output {
                     self.visit_ty(&ret_ty);
                 }
             }
-            ast::ForeignItemKind::Static(ref ty, _) => {
+            ast::ForeignItemKind::Static(ref ty, _, _) => {
                 if let Some(var_data) = self.save_ctxt.get_extern_item_data(item) {
                     down_cast_data!(var_data, DefData, item.span);
                     self.dumper.dump_def(&access, var_data);
@@ -1540,7 +1543,7 @@ impl<'l, 'tcx> Visitor<'l> for DumpVisitor<'l, 'tcx> {
 
                 self.visit_ty(ty);
             }
-            ast::ForeignItemKind::Ty => {
+            ast::ForeignItemKind::TyAlias(..) => {
                 if let Some(var_data) = self.save_ctxt.get_extern_item_data(item) {
                     down_cast_data!(var_data, DefData, item.span);
                     self.dumper.dump_def(&access, var_data);
diff --git a/src/librustc_save_analysis/lib.rs b/src/librustc_save_analysis/lib.rs
index f44ce6f4ea..88bfe7661e 100644
--- a/src/librustc_save_analysis/lib.rs
+++ b/src/librustc_save_analysis/lib.rs
@@ -13,11 +13,17 @@ use rustc::middle::privacy::AccessLevels;
 use rustc::session::config::{CrateType, Input, OutputType};
 use rustc::ty::{self, DefIdTree, TyCtxt};
 use rustc::{bug, span_bug};
+use rustc_ast::ast::{self, Attribute, NodeId, PatKind, DUMMY_NODE_ID};
+use rustc_ast::util::comments::strip_doc_comment_decoration;
+use rustc_ast::visit::{self, Visitor};
+use rustc_ast_pretty::pprust::{self, param_to_string, ty_to_string};
 use rustc_codegen_utils::link::{filename_for_metadata, out_filename};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorOf, DefKind as HirDefKind, Res};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_hir::Node;
+use rustc_span::source_map::Spanned;
+use rustc_span::*;
 
 use std::cell::Cell;
 use std::default::Default;
@@ -26,14 +32,6 @@ use std::fs::File;
 use std::io::BufWriter;
 use std::path::{Path, PathBuf};
 
-use rustc_span::source_map::Spanned;
-use rustc_span::*;
-use syntax::ast::{self, Attribute, NodeId, PatKind, DUMMY_NODE_ID};
-use syntax::print::pprust;
-use syntax::print::pprust::{param_to_string, ty_to_string};
-use syntax::util::comments::strip_doc_comment_decoration;
-use syntax::visit::{self, Visitor};
-
 use dump_visitor::DumpVisitor;
 use span_utils::SpanUtils;
 
@@ -68,9 +66,9 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
     fn span_from_span(&self, span: Span) -> SpanData {
         use rls_span::{Column, Row};
 
-        let cm = self.tcx.sess.source_map();
-        let start = cm.lookup_char_pos(span.lo());
-        let end = cm.lookup_char_pos(span.hi());
+        let sm = self.tcx.sess.source_map();
+        let start = sm.lookup_char_pos(span.lo());
+        let end = sm.lookup_char_pos(span.hi());
 
         SpanData {
             file_name: start.file.name.to_string().into(),
@@ -135,7 +133,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
             self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))
         );
         match item.kind {
-            ast::ForeignItemKind::Fn(ref decl, ref generics) => {
+            ast::ForeignItemKind::Fn(_, ref sig, ref generics, _) => {
                 filter!(self.span_utils, item.ident.span);
 
                 Some(Data::DefData(Def {
@@ -144,7 +142,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                     span: self.span_from_span(item.ident.span),
                     name: item.ident.to_string(),
                     qualname,
-                    value: make_signature(decl, generics),
+                    value: make_signature(&sig.decl, generics),
                     parent: None,
                     children: vec![],
                     decl_id: None,
@@ -153,7 +151,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                     attributes: lower_attributes(item.attrs.clone(), self),
                 }))
             }
-            ast::ForeignItemKind::Static(ref ty, _) => {
+            ast::ForeignItemKind::Static(ref ty, _, _) => {
                 filter!(self.span_utils, item.ident.span);
 
                 let id = id_from_node_id(item.id, self);
@@ -175,14 +173,14 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                 }))
             }
             // FIXME(plietar): needs a new DefKind in rls-data
-            ast::ForeignItemKind::Ty => None,
+            ast::ForeignItemKind::TyAlias(..) => None,
             ast::ForeignItemKind::Macro(..) => None,
         }
     }
 
     pub fn get_item_data(&self, item: &ast::Item) -> Option<Data> {
         match item.kind {
-            ast::ItemKind::Fn(ref sig, .., ref generics, _) => {
+            ast::ItemKind::Fn(_, ref sig, .., ref generics, _) => {
                 let qualname = format!(
                     "::{}",
                     self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))
@@ -229,7 +227,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                     attributes: lower_attributes(item.attrs.clone(), self),
                 }))
             }
-            ast::ItemKind::Const(ref typ, _) => {
+            ast::ItemKind::Const(_, ref typ, _) => {
                 let qualname = format!(
                     "::{}",
                     self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))
@@ -260,8 +258,8 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                     self.tcx.def_path_str(self.tcx.hir().local_def_id_from_node_id(item.id))
                 );
 
-                let cm = self.tcx.sess.source_map();
-                let filename = cm.span_to_filename(m.inner);
+                let sm = self.tcx.sess.source_map();
+                let filename = sm.span_to_filename(m.inner);
 
                 filter!(self.span_utils, item.ident.span);
 
@@ -336,7 +334,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                                     Some(_) => ImplKind::Direct,
                                     None => ImplKind::Inherent,
                                 },
-                                span: span,
+                                span,
                                 value: String::new(),
                                 parent: None,
                                 children: items
@@ -410,7 +408,6 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                         qualname.push_str(&self.tcx.hir().hir_to_pretty_string(self_ty.hir_id));
 
                         let trait_id = self.tcx.trait_id_of_impl(impl_id);
-                        let mut decl_id = None;
                         let mut docs = String::new();
                         let mut attrs = vec![];
                         let hir_id = self.tcx.hir().node_to_hir_id(id);
@@ -419,14 +416,18 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                             attrs = item.attrs.to_vec();
                         }
 
+                        let mut decl_id = None;
                         if let Some(def_id) = trait_id {
                             // A method in a trait impl.
                             qualname.push_str(" as ");
                             qualname.push_str(&self.tcx.def_path_str(def_id));
-                            self.tcx
+
+                            decl_id = self
+                                .tcx
                                 .associated_items(def_id)
-                                .find(|item| item.ident.name == ident.name)
-                                .map(|item| decl_id = Some(item.def_id));
+                                .filter_by_name_unhygienic(ident.name)
+                                .next()
+                                .map(|item| item.def_id);
                         }
                         qualname.push_str(">");
 
@@ -531,13 +532,16 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
                 match self.tables.expr_ty_adjusted(&hir_node).kind {
                     ty::Adt(def, _) if !def.is_enum() => {
                         let variant = &def.non_enum_variant();
-                        let index = self.tcx.find_field_index(ident, variant).unwrap();
                         filter!(self.span_utils, ident.span);
                         let span = self.span_from_span(ident.span);
                         return Some(Data::RefData(Ref {
                             kind: RefKind::Variable,
                             span,
-                            ref_id: id_from_def_id(variant.fields[index].did),
+                            ref_id: self
+                                .tcx
+                                .find_field_index(ident, variant)
+                                .map(|index| id_from_def_id(variant.fields[index].did))
+                                .unwrap_or_else(|| null_id()),
                         }));
                     }
                     ty::Tuple(..) => None,
@@ -717,11 +721,11 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
             Res::Def(HirDefKind::Method, decl_id) => {
                 let def_id = if decl_id.is_local() {
                     let ti = self.tcx.associated_item(decl_id);
+
                     self.tcx
                         .associated_items(ti.container.id())
-                        .find(|item| {
-                            item.ident.name == ti.ident.name && item.defaultness.has_value()
-                        })
+                        .filter_by_name_unhygienic(ti.ident.name)
+                        .find(|item| item.defaultness.has_value())
                         .map(|item| item.def_id)
                 } else {
                     None
@@ -814,7 +818,7 @@ impl<'l, 'tcx> SaveContext<'l, 'tcx> {
     fn lookup_def_id(&self, ref_id: NodeId) -> Option<DefId> {
         match self.get_path_res(ref_id) {
             Res::PrimTy(_) | Res::SelfTy(..) | Res::Err => None,
-            def => Some(def.def_id()),
+            def => def.opt_def_id(),
         }
     }
 
@@ -880,8 +884,8 @@ fn make_signature(decl: &ast::FnDecl, generics: &ast::Generics) -> String {
     sig.push_str(&decl.inputs.iter().map(param_to_string).collect::<Vec<_>>().join(", "));
     sig.push(')');
     match decl.output {
-        ast::FunctionRetTy::Default(_) => sig.push_str(" -> ()"),
-        ast::FunctionRetTy::Ty(ref t) => sig.push_str(&format!(" -> {}", ty_to_string(t))),
+        ast::FnRetTy::Default(_) => sig.push_str(" -> ()"),
+        ast::FnRetTy::Ty(ref t) => sig.push_str(&format!(" -> {}", ty_to_string(t))),
     }
 
     sig
diff --git a/src/librustc_save_analysis/sig.rs b/src/librustc_save_analysis/sig.rs
index a9d2bfabb1..2005366f83 100644
--- a/src/librustc_save_analysis/sig.rs
+++ b/src/librustc_save_analysis/sig.rs
@@ -29,9 +29,9 @@ use crate::{id_from_def_id, id_from_node_id, SaveContext};
 
 use rls_data::{SigElement, Signature};
 
+use rustc_ast::ast::{self, Extern, NodeId};
+use rustc_ast_pretty::pprust;
 use rustc_hir::def::{DefKind, Res};
-use syntax::ast::{self, Extern, NodeId};
-use syntax::print::pprust;
 
 pub fn item_signature(item: &ast::Item, scx: &SaveContext<'_, '_>) -> Option<Signature> {
     if !scx.config.signatures {
@@ -225,7 +225,7 @@ impl Sig for ast::Ty {
                     text.push('>');
                 }
 
-                if f.unsafety == ast::Unsafety::Unsafe {
+                if let ast::Unsafe::Yes(_) = f.unsafety {
                     text.push_str("unsafe ");
                 }
                 push_extern(&mut text, f.ext);
@@ -241,7 +241,7 @@ impl Sig for ast::Ty {
                     refs.extend(nested.refs.into_iter());
                 }
                 text.push(')');
-                if let ast::FunctionRetTy::Ty(ref t) = f.decl.output {
+                if let ast::FnRetTy::Ty(ref t) = f.decl.output {
                     text.push_str(" -> ");
                     let nested = t.make(offset + text.len(), None, scx)?;
                     text.push_str(&nested.text);
@@ -334,15 +334,18 @@ impl Sig for ast::Item {
 
                 let ty = ty.make(offset + text.len(), id, scx)?;
                 text.push_str(&ty.text);
-                text.push_str(" = ");
 
-                let expr = pprust::expr_to_string(expr).replace('\n', " ");
-                text.push_str(&expr);
+                if let Some(expr) = expr {
+                    text.push_str(" = ");
+                    let expr = pprust::expr_to_string(expr).replace('\n', " ");
+                    text.push_str(&expr);
+                }
+
                 text.push(';');
 
                 Ok(extend_sig(ty, text, defs, vec![]))
             }
-            ast::ItemKind::Const(ref ty, ref expr) => {
+            ast::ItemKind::Const(_, ref ty, ref expr) => {
                 let mut text = "const ".to_owned();
                 let name = self.ident.to_string();
                 let defs = vec![SigElement {
@@ -355,23 +358,26 @@ impl Sig for ast::Item {
 
                 let ty = ty.make(offset + text.len(), id, scx)?;
                 text.push_str(&ty.text);
-                text.push_str(" = ");
 
-                let expr = pprust::expr_to_string(expr).replace('\n', " ");
-                text.push_str(&expr);
+                if let Some(expr) = expr {
+                    text.push_str(" = ");
+                    let expr = pprust::expr_to_string(expr).replace('\n', " ");
+                    text.push_str(&expr);
+                }
+
                 text.push(';');
 
                 Ok(extend_sig(ty, text, defs, vec![]))
             }
-            ast::ItemKind::Fn(ast::FnSig { ref decl, header }, ref generics, _) => {
+            ast::ItemKind::Fn(_, ast::FnSig { ref decl, header }, ref generics, _) => {
                 let mut text = String::new();
-                if header.constness.node == ast::Constness::Const {
+                if let ast::Const::Yes(_) = header.constness {
                     text.push_str("const ");
                 }
-                if header.asyncness.node.is_async() {
+                if header.asyncness.is_async() {
                     text.push_str("async ");
                 }
-                if header.unsafety == ast::Unsafety::Unsafe {
+                if let ast::Unsafe::Yes(_) = header.unsafety {
                     text.push_str("unsafe ");
                 }
                 push_extern(&mut text, header.ext);
@@ -392,7 +398,7 @@ impl Sig for ast::Item {
                 }
                 sig.text.push(')');
 
-                if let ast::FunctionRetTy::Ty(ref t) = decl.output {
+                if let ast::FnRetTy::Ty(ref t) = decl.output {
                     sig.text.push_str(" -> ");
                     let nested = t.make(offset + sig.text.len(), None, scx)?;
                     sig.text.push_str(&nested.text);
@@ -417,12 +423,15 @@ impl Sig for ast::Item {
 
                 Ok(Signature { text, defs, refs: vec![] })
             }
-            ast::ItemKind::TyAlias(ref ty, ref generics) => {
+            ast::ItemKind::TyAlias(_, ref generics, _, ref ty) => {
                 let text = "type ".to_owned();
                 let mut sig = name_and_generics(text, offset, generics, self.id, self.ident, scx)?;
 
                 sig.text.push_str(" = ");
-                let ty = ty.make(offset + sig.text.len(), id, scx)?;
+                let ty = match ty {
+                    Some(ty) => ty.make(offset + sig.text.len(), id, scx)?,
+                    None => return Err("Ty"),
+                };
                 sig.text.push_str(&ty.text);
                 sig.text.push(';');
 
@@ -453,7 +462,7 @@ impl Sig for ast::Item {
                     text.push_str("auto ");
                 }
 
-                if unsafety == ast::Unsafety::Unsafe {
+                if let ast::Unsafe::Yes(_) = unsafety {
                     text.push_str("unsafe ");
                 }
                 text.push_str("trait ");
@@ -493,14 +502,14 @@ impl Sig for ast::Item {
                 items: _,
             } => {
                 let mut text = String::new();
-                if let ast::Defaultness::Default = defaultness {
+                if let ast::Defaultness::Default(_) = defaultness {
                     text.push_str("default ");
                 }
-                if unsafety == ast::Unsafety::Unsafe {
+                if let ast::Unsafe::Yes(_) = unsafety {
                     text.push_str("unsafe ");
                 }
                 text.push_str("impl");
-                if constness == ast::Constness::Const {
+                if let ast::Const::Yes(_) = constness {
                     text.push_str(" const");
                 }
 
@@ -723,7 +732,8 @@ impl Sig for ast::ForeignItem {
     fn make(&self, offset: usize, _parent_id: Option<NodeId>, scx: &SaveContext<'_, '_>) -> Result {
         let id = Some(self.id);
         match self.kind {
-            ast::ForeignItemKind::Fn(ref decl, ref generics) => {
+            ast::ForeignItemKind::Fn(_, ref sig, ref generics, _) => {
+                let decl = &sig.decl;
                 let mut text = String::new();
                 text.push_str("fn ");
 
@@ -742,7 +752,7 @@ impl Sig for ast::ForeignItem {
                 }
                 sig.text.push(')');
 
-                if let ast::FunctionRetTy::Ty(ref t) = decl.output {
+                if let ast::FnRetTy::Ty(ref t) = decl.output {
                     sig.text.push_str(" -> ");
                     let nested = t.make(offset + sig.text.len(), None, scx)?;
                     sig.text.push_str(&nested.text);
@@ -753,7 +763,7 @@ impl Sig for ast::ForeignItem {
 
                 Ok(sig)
             }
-            ast::ForeignItemKind::Static(ref ty, m) => {
+            ast::ForeignItemKind::Static(ref ty, m, _) => {
                 let mut text = "static ".to_owned();
                 if m == ast::Mutability::Mut {
                     text.push_str("mut ");
@@ -772,7 +782,7 @@ impl Sig for ast::ForeignItem {
 
                 Ok(extend_sig(ty_sig, text, defs, vec![]))
             }
-            ast::ForeignItemKind::Ty => {
+            ast::ForeignItemKind::TyAlias(..) => {
                 let mut text = "type ".to_owned();
                 let name = self.ident.to_string();
                 let defs = vec![SigElement {
@@ -783,7 +793,7 @@ impl Sig for ast::ForeignItem {
                 text.push_str(&name);
                 text.push(';');
 
-                Ok(Signature { text: text, defs: defs, refs: vec![] })
+                Ok(Signature { text, defs, refs: vec![] })
             }
             ast::ForeignItemKind::Macro(..) => Err("macro"),
         }
@@ -883,13 +893,13 @@ fn make_method_signature(
 ) -> Result {
     // FIXME code dup with function signature
     let mut text = String::new();
-    if m.header.constness.node == ast::Constness::Const {
+    if let ast::Const::Yes(_) = m.header.constness {
         text.push_str("const ");
     }
-    if m.header.asyncness.node.is_async() {
+    if m.header.asyncness.is_async() {
         text.push_str("async ");
     }
-    if m.header.unsafety == ast::Unsafety::Unsafe {
+    if let ast::Unsafe::Yes(_) = m.header.unsafety {
         text.push_str("unsafe ");
     }
     push_extern(&mut text, m.header.ext);
@@ -910,7 +920,7 @@ fn make_method_signature(
     }
     sig.text.push(')');
 
-    if let ast::FunctionRetTy::Ty(ref t) = m.decl.output {
+    if let ast::FnRetTy::Ty(ref t) = m.decl.output {
         sig.text.push_str(" -> ");
         let nested = t.make(sig.text.len(), None, scx)?;
         sig.text.push_str(&nested.text);
diff --git a/src/librustc_save_analysis/span_utils.rs b/src/librustc_save_analysis/span_utils.rs
index f904a0bb9f..152435206f 100644
--- a/src/librustc_save_analysis/span_utils.rs
+++ b/src/librustc_save_analysis/span_utils.rs
@@ -1,8 +1,8 @@
 use crate::generated_code;
 use rustc::session::Session;
+use rustc_ast::token::{self, TokenKind};
 use rustc_parse::lexer::{self, StringReader};
 use rustc_span::*;
-use syntax::token::{self, TokenKind};
 
 #[derive(Clone)]
 pub struct SpanUtils<'a> {
diff --git a/src/librustc_session/Cargo.toml b/src/librustc_session/Cargo.toml
index 47c23bc4dc..3895d0f806 100644
--- a/src/librustc_session/Cargo.toml
+++ b/src/librustc_session/Cargo.toml
@@ -19,3 +19,4 @@ rustc_span = { path = "../librustc_span" }
 rustc_index = { path = "../librustc_index" }
 rustc_fs_util = { path = "../librustc_fs_util" }
 num_cpus = "1.0"
+rustc_ast = { path = "../librustc_ast" }
diff --git a/src/librustc_session/code_stats.rs b/src/librustc_session/code_stats.rs
index 9b89c7ae32..c263da69c3 100644
--- a/src/librustc_session/code_stats.rs
+++ b/src/librustc_session/code_stats.rs
@@ -70,7 +70,7 @@ impl CodeStats {
             type_description: type_desc.to_string(),
             align: align.bytes(),
             overall_size: overall_size.bytes(),
-            packed: packed,
+            packed,
             opt_discr_size: opt_discr_size.map(|s| s.bytes()),
             variants,
         };
diff --git a/src/librustc_session/config.rs b/src/librustc_session/config.rs
index aa492b566e..c273e7fdbf 100644
--- a/src/librustc_session/config.rs
+++ b/src/librustc_session/config.rs
@@ -22,8 +22,6 @@ use rustc_span::symbol::{sym, Symbol};
 use rustc_errors::emitter::HumanReadableErrorType;
 use rustc_errors::{ColorConfig, FatalError, Handler, HandlerFlags};
 
-use getopts;
-
 use std::collections::btree_map::{
     Iter as BTreeMapIter, Keys as BTreeMapKeysIter, Values as BTreeMapValuesIter,
 };
@@ -70,6 +68,19 @@ impl FromStr for Sanitizer {
     }
 }
 
+/// The different settings that the `-Z control_flow_guard` flag can have.
+#[derive(Clone, Copy, PartialEq, Hash, Debug)]
+pub enum CFGuard {
+    /// Do not emit Control Flow Guard metadata or checks.
+    Disabled,
+
+    /// Emit Control Flow Guard metadata but no checks.
+    NoChecks,
+
+    /// Emit Control Flow Guard metadata and checks.
+    Checks,
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Hash)]
 pub enum OptLevel {
     No,         // -O0
@@ -380,6 +391,7 @@ impl ExternEntry {
 pub enum PrintRequest {
     FileNames,
     Sysroot,
+    TargetLibdir,
     CrateName,
     Cfg,
     TargetList,
@@ -454,6 +466,7 @@ pub struct OutputFilenames {
 
 impl_stable_hash_via_hash!(OutputFilenames);
 
+pub const RLINK_EXT: &str = "rlink";
 pub const RUST_CGU_EXT: &str = "rcgu";
 
 impl OutputFilenames {
@@ -613,7 +626,7 @@ impl DebuggingOptions {
             treat_err_as_bug: self.treat_err_as_bug,
             dont_buffer_diagnostics: self.dont_buffer_diagnostics,
             report_delayed_bugs: self.report_delayed_bugs,
-            external_macro_backtrace: self.external_macro_backtrace,
+            macro_backtrace: self.macro_backtrace,
             deduplicate_diagnostics: self.deduplicate_diagnostics.unwrap_or(true),
         }
     }
@@ -803,7 +816,6 @@ mod opt {
     #![allow(dead_code)]
 
     use super::RustcOptGroup;
-    use getopts;
 
     pub type R = RustcOptGroup;
     pub type S = &'static str;
@@ -901,7 +913,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
             "",
             "print",
             "Compiler information to print on stdout",
-            "[crate-name|file-names|sysroot|cfg|target-list|\
+            "[crate-name|file-names|sysroot|target-libdir|cfg|target-list|\
              target-cpus|target-features|relocation-models|\
              code-models|tls-models|target-spec-json|native-static-libs]",
         ),
@@ -995,19 +1007,26 @@ pub fn get_cmd_lint_options(
     matches: &getopts::Matches,
     error_format: ErrorOutputType,
 ) -> (Vec<(String, lint::Level)>, bool, Option<lint::Level>) {
-    let mut lint_opts = vec![];
+    let mut lint_opts_with_position = vec![];
     let mut describe_lints = false;
 
     for &level in &[lint::Allow, lint::Warn, lint::Deny, lint::Forbid] {
-        for lint_name in matches.opt_strs(level.as_str()) {
+        for (arg_pos, lint_name) in matches.opt_strs_pos(level.as_str()) {
             if lint_name == "help" {
                 describe_lints = true;
             } else {
-                lint_opts.push((lint_name.replace("-", "_"), level));
+                lint_opts_with_position.push((arg_pos, lint_name.replace("-", "_"), level));
             }
         }
     }
 
+    lint_opts_with_position.sort_by_key(|x| x.0);
+    let lint_opts = lint_opts_with_position
+        .iter()
+        .cloned()
+        .map(|(_, lint_name, level)| (lint_name, level))
+        .collect();
+
     let lint_cap = matches.opt_str("cap-lints").map(|cap| {
         lint::Level::from_str(&cap)
             .unwrap_or_else(|| early_error(error_format, &format!("unknown lint level: `{}`", cap)))
@@ -1111,7 +1130,7 @@ pub fn parse_error_format(
         // Conservatively require that the `--json` argument is coupled with
         // `--error-format=json`. This means that `--json` is specified we
         // should actually be emitting JSON blobs.
-        _ if matches.opt_strs("json").len() > 0 => {
+        _ if !matches.opt_strs("json").is_empty() => {
             early_error(
                 ErrorOutputType::default(),
                 "using `--json` requires also using `--error-format=json`",
@@ -1326,6 +1345,7 @@ fn collect_print_requests(
         "crate-name" => PrintRequest::CrateName,
         "file-names" => PrintRequest::FileNames,
         "sysroot" => PrintRequest::Sysroot,
+        "target-libdir" => PrintRequest::TargetLibdir,
         "cfg" => PrintRequest::Cfg,
         "target-list" => PrintRequest::TargetList,
         "target-cpus" => PrintRequest::TargetCPUs,
@@ -1482,10 +1502,8 @@ fn parse_libs(
             {
                 early_error(
                     error_format,
-                    &format!(
-                        "the library kind 'static-nobundle' is only \
-                         accepted on the nightly compiler"
-                    ),
+                    "the library kind 'static-nobundle' is only \
+                     accepted on the nightly compiler",
                 );
             }
             let mut name_parts = name.splitn(2, ':');
@@ -1849,7 +1867,6 @@ pub fn parse_crate_types_from_list(list_list: Vec<String>) -> Result<Vec<CrateTy
 pub mod nightly_options {
     use super::{ErrorOutputType, OptionStability, RustcOptGroup};
     use crate::early_error;
-    use getopts;
     use rustc_feature::UnstableFeatures;
 
     pub fn is_unstable_enabled(matches: &getopts::Matches) -> bool {
@@ -1980,8 +1997,8 @@ impl PpMode {
 /// how the hash should be calculated when adding a new command-line argument.
 crate mod dep_tracking {
     use super::{
-        CrateType, DebugInfo, ErrorOutputType, LinkerPluginLto, LtoCli, OptLevel, OutputTypes,
-        Passes, Sanitizer, SwitchWithOptPath, SymbolManglingVersion,
+        CFGuard, CrateType, DebugInfo, ErrorOutputType, LinkerPluginLto, LtoCli, OptLevel,
+        OutputTypes, Passes, Sanitizer, SwitchWithOptPath, SymbolManglingVersion,
     };
     use crate::lint;
     use crate::utils::NativeLibraryKind;
@@ -2053,6 +2070,7 @@ crate mod dep_tracking {
     impl_dep_tracking_hash_via_hash!(NativeLibraryKind);
     impl_dep_tracking_hash_via_hash!(Sanitizer);
     impl_dep_tracking_hash_via_hash!(Option<Sanitizer>);
+    impl_dep_tracking_hash_via_hash!(CFGuard);
     impl_dep_tracking_hash_via_hash!(TargetTriple);
     impl_dep_tracking_hash_via_hash!(Edition);
     impl_dep_tracking_hash_via_hash!(LinkerPluginLto);
diff --git a/src/librustc_session/lib.rs b/src/librustc_session/lib.rs
index 65d6635ada..4101c32d54 100644
--- a/src/librustc_session/lib.rs
+++ b/src/librustc_session/lib.rs
@@ -10,7 +10,6 @@ pub mod cgu_reuse_tracker;
 pub mod utils;
 #[macro_use]
 pub mod lint;
-pub mod node_id;
 pub mod parse;
 
 mod code_stats;
diff --git a/src/librustc_session/lint.rs b/src/librustc_session/lint.rs
index 2ba3932c7d..3b79972ccb 100644
--- a/src/librustc_session/lint.rs
+++ b/src/librustc_session/lint.rs
@@ -1,5 +1,5 @@
 pub use self::Level::*;
-use crate::node_id::{NodeId, NodeMap};
+use rustc_ast::node_id::{NodeId, NodeMap};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 use rustc_span::edition::Edition;
 use rustc_span::{sym, symbol::Ident, MultiSpan, Span, Symbol};
@@ -190,6 +190,7 @@ pub enum BuiltinLintDiagnostics {
     UnusedImports(String, Vec<(Span, String)>),
     RedundantImport(Vec<(Span, bool)>, Ident),
     DeprecatedMacro(Option<Symbol>, Span),
+    UnusedDocComment(Span),
 }
 
 /// Lints that are buffered up early on in the `Session` before the
diff --git a/src/librustc_session/lint/builtin.rs b/src/librustc_session/lint/builtin.rs
index c326061100..f8a4e02460 100644
--- a/src/librustc_session/lint/builtin.rs
+++ b/src/librustc_session/lint/builtin.rs
@@ -41,9 +41,15 @@ declare_lint! {
 }
 
 declare_lint! {
-    pub EXCEEDING_BITSHIFTS,
+    pub ARITHMETIC_OVERFLOW,
     Deny,
-    "shift exceeds the type's number of bits"
+    "arithmetic operation overflows"
+}
+
+declare_lint! {
+    pub UNCONDITIONAL_PANIC,
+    Deny,
+    "operation will cause a panic at runtime"
 }
 
 declare_lint! {
@@ -260,6 +266,16 @@ declare_lint! {
     };
 }
 
+declare_lint! {
+    pub COHERENCE_LEAK_CHECK,
+    Warn,
+    "distinct impls distinguished only by the leak-check code",
+    @future_incompatible = FutureIncompatibleInfo {
+        reference: "issue #56105 <https://github.com/rust-lang/rust/issues/56105>",
+        edition: None,
+    };
+}
+
 declare_lint! {
     pub DEPRECATED,
     Warn,
@@ -474,12 +490,19 @@ declare_lint! {
     };
 }
 
+declare_lint! {
+    pub INLINE_NO_SANITIZE,
+    Warn,
+    "detects incompatible use of `#[inline(always)]` and `#[no_sanitize(...)]`",
+}
+
 declare_lint_pass! {
     /// Does nothing as a lint pass, but registers some `Lint`s
     /// that are used by other parts of the compiler.
     HardwiredLints => [
         ILLEGAL_FLOATING_POINT_LITERAL_PATTERN,
-        EXCEEDING_BITSHIFTS,
+        ARITHMETIC_OVERFLOW,
+        UNCONDITIONAL_PANIC,
         UNUSED_IMPORTS,
         UNUSED_EXTERN_CRATES,
         UNUSED_QUALIFICATIONS,
@@ -509,6 +532,7 @@ declare_lint_pass! {
         MISSING_FRAGMENT_SPECIFIER,
         LATE_BOUND_LIFETIME_ARGUMENTS,
         ORDER_DEPENDENT_TRAIT_OBJECTS,
+        COHERENCE_LEAK_CHECK,
         DEPRECATED,
         UNUSED_UNSAFE,
         UNUSED_MUT,
@@ -537,5 +561,14 @@ declare_lint_pass! {
         MUTABLE_BORROW_RESERVATION_CONFLICT,
         INDIRECT_STRUCTURAL_MATCH,
         SOFT_UNSTABLE,
+        INLINE_NO_SANITIZE,
     ]
 }
+
+declare_lint! {
+    pub UNUSED_DOC_COMMENTS,
+    Warn,
+    "detects doc comments that aren't used by rustdoc"
+}
+
+declare_lint_pass!(UnusedDocComment => [UNUSED_DOC_COMMENTS]);
diff --git a/src/librustc_session/node_id.rs b/src/librustc_session/node_id.rs
deleted file mode 100644
index 9fefe908e5..0000000000
--- a/src/librustc_session/node_id.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use rustc_serialize::{Decoder, Encoder};
-use rustc_span::ExpnId;
-use std::fmt;
-
-rustc_index::newtype_index! {
-    pub struct NodeId {
-        ENCODABLE = custom
-        DEBUG_FORMAT = "NodeId({})"
-    }
-}
-
-rustc_data_structures::define_id_collections!(NodeMap, NodeSet, NodeId);
-
-impl NodeId {
-    pub fn placeholder_from_expn_id(expn_id: ExpnId) -> Self {
-        NodeId::from_u32(expn_id.as_u32())
-    }
-
-    pub fn placeholder_to_expn_id(self) -> ExpnId {
-        ExpnId::from_u32(self.as_u32())
-    }
-}
-
-impl fmt::Display for NodeId {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Display::fmt(&self.as_u32(), f)
-    }
-}
-
-impl rustc_serialize::UseSpecializedEncodable for NodeId {
-    fn default_encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
-        s.emit_u32(self.as_u32())
-    }
-}
-
-impl rustc_serialize::UseSpecializedDecodable for NodeId {
-    fn default_decode<D: Decoder>(d: &mut D) -> Result<NodeId, D::Error> {
-        d.read_u32().map(NodeId::from_u32)
-    }
-}
diff --git a/src/librustc_session/options.rs b/src/librustc_session/options.rs
index 34da2188a5..a1ecf4e852 100644
--- a/src/librustc_session/options.rs
+++ b/src/librustc_session/options.rs
@@ -11,8 +11,6 @@ use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy, RelroLevel
 use rustc_feature::UnstableFeatures;
 use rustc_span::edition::Edition;
 
-use getopts;
-
 use std::collections::BTreeMap;
 
 use std::collections::hash_map::DefaultHasher;
@@ -263,6 +261,8 @@ macro_rules! options {
         pub const parse_sanitizer_list: Option<&str> =
             Some("comma separated list of sanitizers");
         pub const parse_sanitizer_memory_track_origins: Option<&str> = None;
+        pub const parse_cfguard: Option<&str> =
+            Some("either `disabled`, `nochecks`, or `checks`");
         pub const parse_linker_flavor: Option<&str> =
             Some(::rustc_target::spec::LinkerFlavor::one_of());
         pub const parse_optimization_fuel: Option<&str> =
@@ -288,7 +288,7 @@ macro_rules! options {
     #[allow(dead_code)]
     mod $mod_set {
         use super::{$struct_name, Passes, Sanitizer, LtoCli, LinkerPluginLto, SwitchWithOptPath,
-            SymbolManglingVersion};
+            SymbolManglingVersion, CFGuard};
         use rustc_target::spec::{LinkerFlavor, MergeFunctions, PanicStrategy, RelroLevel};
         use std::path::PathBuf;
         use std::str::FromStr;
@@ -499,6 +499,16 @@ macro_rules! options {
             }
         }
 
+        fn parse_cfguard(slot: &mut CFGuard, v: Option<&str>) -> bool {
+            match v {
+                Some("disabled") => *slot = CFGuard::Disabled,
+                Some("nochecks") => *slot = CFGuard::NoChecks,
+                Some("checks") => *slot = CFGuard::Checks,
+                _ => return false,
+            }
+            true
+        }
+
         fn parse_linker_flavor(slote: &mut Option<LinkerFlavor>, v: Option<&str>) -> bool {
             match v.and_then(LinkerFlavor::from_str) {
                 Some(lf) => *slote = Some(lf),
@@ -718,6 +728,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "measure time of rustc processes"),
     time_llvm_passes: bool = (false, parse_bool, [UNTRACKED],
         "measure time of each LLVM pass"),
+    llvm_time_trace: bool = (false, parse_bool, [UNTRACKED],
+        "generate JSON tracing data file from LLVM data"),
     input_stats: bool = (false, parse_bool, [UNTRACKED],
         "gather statistics about the input"),
     asm_comments: bool = (false, parse_bool, [TRACKED],
@@ -764,8 +776,8 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "treat error number `val` that occurs as bug"),
     report_delayed_bugs: bool = (false, parse_bool, [TRACKED],
         "immediately print bugs registered with `delay_span_bug`"),
-    external_macro_backtrace: bool = (false, parse_bool, [UNTRACKED],
-        "show macro backtraces even for non-local macros"),
+    macro_backtrace: bool = (false, parse_bool, [UNTRACKED],
+        "show macro backtraces"),
     teach: bool = (false, parse_bool, [TRACKED],
         "show extended diagnostic help"),
     terminal_width: Option<usize> = (None, parse_opt_uint, [UNTRACKED],
@@ -910,8 +922,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "tell the linker to strip debuginfo when building without debuginfo enabled."),
     share_generics: Option<bool> = (None, parse_opt_bool, [TRACKED],
         "make the current crate share its generic instantiations"),
-    chalk: bool = (false, parse_bool, [TRACKED],
-        "enable the experimental Chalk-based trait solving engine"),
     no_parallel_llvm: bool = (false, parse_bool, [UNTRACKED],
         "don't run LLVM in parallel (while keeping codegen-units and ThinLTO)"),
     no_leak_check: bool = (false, parse_bool, [UNTRACKED],
@@ -928,7 +938,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
         "specifies which kinds of events get recorded by the self profiler;
         for example: `-Z self-profile-events=default,query-keys`
         all options: none, all, default, generic-activity, query-provider, query-cache-hit
-                     query-blocked, incr-cache-load, query-keys"),
+                     query-blocked, incr-cache-load, query-keys, function-args, args, llvm"),
     emit_stack_sizes: bool = (false, parse_bool, [UNTRACKED],
         "emits a section containing stack size metadata"),
     plt: Option<bool> = (None, parse_opt_bool, [TRACKED],
@@ -950,6 +960,12 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
          (such as entering an empty infinite loop) by inserting llvm.sideeffect"),
     deduplicate_diagnostics: Option<bool> = (None, parse_opt_bool, [UNTRACKED],
         "deduplicate identical diagnostics"),
+    control_flow_guard: CFGuard = (CFGuard::Disabled, parse_cfguard, [UNTRACKED],
+        "use Windows Control Flow Guard (`disabled`, `nochecks` or `checks`)"),
     no_link: bool = (false, parse_bool, [TRACKED],
         "compile without linking"),
+    link_only: bool = (false, parse_bool, [TRACKED],
+        "link the `.rlink` file generated by `-Z no-link`"),
+    new_llvm_pass_manager: Option<bool> = (None, parse_opt_bool, [TRACKED],
+        "use new LLVM pass manager"),
 }
diff --git a/src/librustc_session/parse.rs b/src/librustc_session/parse.rs
index 72c68fcb24..387d35422c 100644
--- a/src/librustc_session/parse.rs
+++ b/src/librustc_session/parse.rs
@@ -2,8 +2,7 @@
 //! It also serves as an input to the parser itself.
 
 use crate::lint::{BufferedEarlyLint, BuiltinLintDiagnostics, Lint, LintId};
-use crate::node_id::NodeId;
-
+use rustc_ast::node_id::NodeId;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_data_structures::sync::{Lock, Lrc, Once};
 use rustc_errors::{emitter::SilentEmitter, ColorConfig, Handler};
@@ -87,8 +86,8 @@ pub fn feature_err_issue<'a>(
 
     if let Some(n) = find_feature_issue(feature, issue) {
         err.note(&format!(
-            "for more information, see https://github.com/rust-lang/rust/issues/{}",
-            n,
+            "see issue #{} <https://github.com/rust-lang/rust/issues/{}> for more information",
+            n, n,
         ));
     }
 
@@ -125,9 +124,9 @@ pub struct ParseSess {
 
 impl ParseSess {
     pub fn new(file_path_mapping: FilePathMapping) -> Self {
-        let cm = Lrc::new(SourceMap::new(file_path_mapping));
-        let handler = Handler::with_tty_emitter(ColorConfig::Auto, true, None, Some(cm.clone()));
-        ParseSess::with_span_handler(handler, cm)
+        let sm = Lrc::new(SourceMap::new(file_path_mapping));
+        let handler = Handler::with_tty_emitter(ColorConfig::Auto, true, None, Some(sm.clone()));
+        ParseSess::with_span_handler(handler, sm)
     }
 
     pub fn with_span_handler(handler: Handler, source_map: Lrc<SourceMap>) -> Self {
@@ -149,9 +148,9 @@ impl ParseSess {
     }
 
     pub fn with_silent_emitter() -> Self {
-        let cm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
+        let sm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
         let handler = Handler::with_emitter(false, None, Box::new(SilentEmitter));
-        ParseSess::with_span_handler(handler, cm)
+        ParseSess::with_span_handler(handler, sm)
     }
 
     #[inline]
@@ -177,6 +176,25 @@ impl ParseSess {
         });
     }
 
+    pub fn buffer_lint_with_diagnostic(
+        &self,
+        lint: &'static Lint,
+        span: impl Into<MultiSpan>,
+        node_id: NodeId,
+        msg: &str,
+        diagnostic: BuiltinLintDiagnostics,
+    ) {
+        self.buffered_lints.with_lock(|buffered_lints| {
+            buffered_lints.push(BufferedEarlyLint {
+                span: span.into(),
+                node_id,
+                msg: msg.into(),
+                lint_id: LintId::of(lint),
+                diagnostic,
+            });
+        });
+    }
+
     /// Extend an error with a suggestion to wrap an expression with parentheses to allow the
     /// parser to continue parsing the following operation as part of the same expression.
     pub fn expr_parentheses_needed(
diff --git a/src/librustc_session/session.rs b/src/librustc_session/session.rs
index a40d6451b9..173b120e1f 100644
--- a/src/librustc_session/session.rs
+++ b/src/librustc_session/session.rs
@@ -33,7 +33,6 @@ use rustc_data_structures::jobserver::{self, Client};
 use rustc_data_structures::profiling::{SelfProfiler, SelfProfilerRef};
 use rustc_target::spec::{PanicStrategy, RelroLevel, Target, TargetTriple};
 
-use std;
 use std::cell::{self, RefCell};
 use std::env;
 use std::fmt;
@@ -89,6 +88,9 @@ pub struct Session {
     /// The maximum length of types during monomorphization.
     pub type_length_limit: Once<usize>,
 
+    /// The maximum blocks a const expression can evaluate.
+    pub const_eval_limit: Once<usize>,
+
     /// Map from imported macro spans (which consist of
     /// the localized span for the macro body) to the
     /// macro name and definition span in the source crate.
@@ -133,6 +135,10 @@ pub struct Session {
     /// Mapping from ident span to path span for paths that don't exist as written, but that
     /// exist under `std`. For example, wrote `str::from_utf8` instead of `std::str::from_utf8`.
     pub confused_type_with_std_module: Lock<FxHashMap<Span, Span>>,
+
+    /// Path for libraries that will take preference over libraries shipped by Rust.
+    /// Used by windows-gnu targets to priortize system mingw-w64 libraries.
+    pub system_library_path: OneThread<RefCell<Option<Option<PathBuf>>>>,
 }
 
 pub struct PerfStats {
@@ -389,6 +395,7 @@ impl Session {
         );
     }
 
+    #[inline]
     pub fn source_map(&self) -> &source_map::SourceMap {
         self.parse_sess.source_map()
     }
@@ -855,7 +862,7 @@ fn default_emitter(
     source_map: &Lrc<source_map::SourceMap>,
     emitter_dest: Option<Box<dyn Write + Send>>,
 ) -> Box<dyn Emitter + sync::Send> {
-    let external_macro_backtrace = sopts.debugging_opts.external_macro_backtrace;
+    let macro_backtrace = sopts.debugging_opts.macro_backtrace;
     match (sopts.error_format, emitter_dest) {
         (config::ErrorOutputType::HumanReadable(kind), dst) => {
             let (short, color_config) = kind.unzip();
@@ -864,7 +871,7 @@ fn default_emitter(
                 let emitter = AnnotateSnippetEmitterWriter::new(
                     Some(source_map.clone()),
                     short,
-                    external_macro_backtrace,
+                    macro_backtrace,
                 );
                 Box::new(emitter.ui_testing(sopts.debugging_opts.ui_testing()))
             } else {
@@ -875,7 +882,7 @@ fn default_emitter(
                         short,
                         sopts.debugging_opts.teach,
                         sopts.debugging_opts.terminal_width,
-                        external_macro_backtrace,
+                        macro_backtrace,
                     ),
                     Some(dst) => EmitterWriter::new(
                         dst,
@@ -884,7 +891,7 @@ fn default_emitter(
                         false, // no teach messages when writing to a buffer
                         false, // no colors when writing to a buffer
                         None,  // no terminal width
-                        external_macro_backtrace,
+                        macro_backtrace,
                     ),
                 };
                 Box::new(emitter.ui_testing(sopts.debugging_opts.ui_testing()))
@@ -896,7 +903,7 @@ fn default_emitter(
                 source_map.clone(),
                 pretty,
                 json_rendered,
-                external_macro_backtrace,
+                macro_backtrace,
             )
             .ui_testing(sopts.debugging_opts.ui_testing()),
         ),
@@ -907,7 +914,7 @@ fn default_emitter(
                 source_map.clone(),
                 pretty,
                 json_rendered,
-                external_macro_backtrace,
+                macro_backtrace,
             )
             .ui_testing(sopts.debugging_opts.ui_testing()),
         ),
@@ -1049,6 +1056,7 @@ fn build_session_(
         features: Once::new(),
         recursion_limit: Once::new(),
         type_length_limit: Once::new(),
+        const_eval_limit: Once::new(),
         imported_macro_spans: OneThread::new(RefCell::new(FxHashMap::default())),
         incr_comp_session: OneThread::new(RefCell::new(IncrCompSession::NotInitialized)),
         cgu_reuse_tracker,
@@ -1069,6 +1077,7 @@ fn build_session_(
         driver_lint_caps,
         trait_methods_not_found: Lock::new(Default::default()),
         confused_type_with_std_module: Lock::new(Default::default()),
+        system_library_path: OneThread::new(RefCell::new(Default::default())),
     };
 
     validate_commandline_args_with_session_available(&sess);
@@ -1121,7 +1130,8 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
         sess.err(
             "Profile-guided optimization does not yet work in conjunction \
                   with `-Cpanic=unwind` on Windows when targeting MSVC. \
-                  See https://github.com/rust-lang/rust/issues/61002 for details.",
+                  See issue #61002 <https://github.com/rust-lang/rust/issues/61002> \
+                  for more information.",
         );
     }
 
diff --git a/src/librustc_span/caching_source_map_view.rs b/src/librustc_span/caching_source_map_view.rs
index c329f2225b..d6725160a5 100644
--- a/src/librustc_span/caching_source_map_view.rs
+++ b/src/librustc_span/caching_source_map_view.rs
@@ -13,14 +13,14 @@ struct CacheEntry {
 }
 
 #[derive(Clone)]
-pub struct CachingSourceMapView<'cm> {
-    source_map: &'cm SourceMap,
+pub struct CachingSourceMapView<'sm> {
+    source_map: &'sm SourceMap,
     line_cache: [CacheEntry; 3],
     time_stamp: usize,
 }
 
-impl<'cm> CachingSourceMapView<'cm> {
-    pub fn new(source_map: &'cm SourceMap) -> CachingSourceMapView<'cm> {
+impl<'sm> CachingSourceMapView<'sm> {
+    pub fn new(source_map: &'sm SourceMap) -> CachingSourceMapView<'sm> {
         let files = source_map.files();
         let first_file = files[0].clone();
         let entry = CacheEntry {
diff --git a/src/librustc_hir/def_id.rs b/src/librustc_span/def_id.rs
similarity index 95%
rename from src/librustc_hir/def_id.rs
rename to src/librustc_span/def_id.rs
index 7ee778ddd8..66cdf46bd4 100644
--- a/src/librustc_hir/def_id.rs
+++ b/src/librustc_span/def_id.rs
@@ -1,3 +1,5 @@
+use crate::HashStableContext;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::AtomicRef;
 use rustc_index::vec::Idx;
 use rustc_serialize::{Decoder, Encoder};
@@ -18,15 +20,6 @@ pub enum CrateNum {
     Index(CrateId),
 }
 
-impl ::std::fmt::Debug for CrateNum {
-    fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
-        match self {
-            CrateNum::Index(id) => write!(fmt, "crate{}", id.private),
-            CrateNum::ReservedForIncrCompCache => write!(fmt, "crate for decoding incr comp cache"),
-        }
-    }
-}
-
 /// Item definitions in the currently-compiled crate would have the `CrateNum`
 /// `LOCAL_CRATE` in their `DefId`.
 pub const LOCAL_CRATE: CrateNum = CrateNum::Index(CrateId::from_u32_const(0));
@@ -100,6 +93,15 @@ impl rustc_serialize::UseSpecializedDecodable for CrateNum {
     }
 }
 
+impl ::std::fmt::Debug for CrateNum {
+    fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
+        match self {
+            CrateNum::Index(id) => write!(fmt, "crate{}", id.private),
+            CrateNum::ReservedForIncrCompCache => write!(fmt, "crate for decoding incr comp cache"),
+        }
+    }
+}
+
 rustc_index::newtype_index! {
     /// A DefIndex is an index into the hir-map for a crate, identifying a
     /// particular definition. It should really be considered an interned
@@ -128,7 +130,7 @@ impl DefId {
     /// Makes a local `DefId` from the given `DefIndex`.
     #[inline]
     pub fn local(index: DefIndex) -> DefId {
-        DefId { krate: LOCAL_CRATE, index: index }
+        DefId { krate: LOCAL_CRATE, index }
     }
 
     #[inline]
@@ -207,3 +209,9 @@ impl fmt::Debug for LocalDefId {
 
 impl rustc_serialize::UseSpecializedEncodable for LocalDefId {}
 impl rustc_serialize::UseSpecializedDecodable for LocalDefId {}
+
+impl<CTX: HashStableContext> HashStable<CTX> for DefId {
+    fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
+        hcx.hash_def_id(*self, hasher)
+    }
+}
diff --git a/src/librustc_span/lib.rs b/src/librustc_span/lib.rs
index 413bd77daa..502ea64aab 100644
--- a/src/librustc_span/lib.rs
+++ b/src/librustc_span/lib.rs
@@ -8,9 +8,7 @@
 #![feature(crate_visibility_modifier)]
 #![feature(nll)]
 #![feature(optin_builtin_traits)]
-#![feature(rustc_attrs)]
 #![feature(specialization)]
-#![feature(step_trait)]
 
 use rustc_data_structures::AtomicRef;
 use rustc_macros::HashStable_Generic;
@@ -25,7 +23,8 @@ use edition::Edition;
 pub mod hygiene;
 use hygiene::Transparency;
 pub use hygiene::{DesugaringKind, ExpnData, ExpnId, ExpnKind, MacroKind, SyntaxContext};
-
+pub mod def_id;
+use def_id::DefId;
 mod span_encoding;
 pub use span_encoding::{Span, DUMMY_SP};
 
@@ -90,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),
@@ -1076,7 +1075,7 @@ impl SourceFile {
         unmapped_path: FileName,
         mut src: String,
         start_pos: BytePos,
-    ) -> Result<SourceFile, OffsetOverflowError> {
+    ) -> Self {
         let normalized_pos = normalize_src(&mut src, start_pos);
 
         let src_hash = {
@@ -1090,14 +1089,12 @@ impl SourceFile {
             hasher.finish::<u128>()
         };
         let end_pos = start_pos.to_usize() + src.len();
-        if end_pos > u32::max_value() as usize {
-            return Err(OffsetOverflowError);
-        }
+        assert!(end_pos <= u32::max_value() as usize);
 
         let (lines, multibyte_chars, non_narrow_chars) =
             analyze_source_file::analyze_source_file(&src[..], start_pos);
 
-        Ok(SourceFile {
+        SourceFile {
             name,
             name_was_remapped,
             unmapped_path: Some(unmapped_path),
@@ -1112,7 +1109,7 @@ impl SourceFile {
             non_narrow_chars,
             normalized_pos,
             name_hash,
-        })
+        }
     }
 
     /// Returns the `BytePos` of the beginning of the current line.
@@ -1208,7 +1205,7 @@ impl SourceFile {
     /// number. If the source_file is empty or the position is located before the
     /// first line, `None` is returned.
     pub fn lookup_line(&self, pos: BytePos) -> Option<usize> {
-        if self.lines.len() == 0 {
+        if self.lines.is_empty() {
             return None;
         }
 
@@ -1561,6 +1558,7 @@ fn lookup_line(lines: &[BytePos], pos: BytePos) -> isize {
 /// instead of implementing everything in librustc.
 pub trait HashStableContext {
     fn hash_spans(&self) -> bool;
+    fn hash_def_id(&mut self, _: DefId, hasher: &mut StableHasher);
     fn byte_pos_to_line_and_col(
         &mut self,
         byte: BytePos,
diff --git a/src/librustc_span/source_map.rs b/src/librustc_span/source_map.rs
index c250df43a2..cd2d2c4c3d 100644
--- a/src/librustc_span/source_map.rs
+++ b/src/librustc_span/source_map.rs
@@ -12,10 +12,12 @@ pub use crate::*;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::StableHasher;
-use rustc_data_structures::sync::{Lock, LockGuard, Lrc, MappedLockGuard};
+use rustc_data_structures::sync::{AtomicU32, Lock, LockGuard, Lrc, MappedLockGuard};
 use std::cmp;
+use std::convert::TryFrom;
 use std::hash::Hash;
 use std::path::{Path, PathBuf};
+use std::sync::atomic::Ordering;
 
 use log::debug;
 use std::env;
@@ -131,6 +133,9 @@ pub(super) struct SourceMapFiles {
 }
 
 pub struct SourceMap {
+    /// The address space below this value is currently used by the files in the source map.
+    used_address_space: AtomicU32,
+
     files: Lock<SourceMapFiles>,
     file_loader: Box<dyn FileLoader + Sync + Send>,
     // This is used to apply the file path remapping as specified via
@@ -140,14 +145,24 @@ pub struct SourceMap {
 
 impl SourceMap {
     pub fn new(path_mapping: FilePathMapping) -> SourceMap {
-        SourceMap { files: Default::default(), file_loader: Box::new(RealFileLoader), path_mapping }
+        SourceMap {
+            used_address_space: AtomicU32::new(0),
+            files: Default::default(),
+            file_loader: Box::new(RealFileLoader),
+            path_mapping,
+        }
     }
 
     pub fn with_file_loader(
         file_loader: Box<dyn FileLoader + Sync + Send>,
         path_mapping: FilePathMapping,
     ) -> SourceMap {
-        SourceMap { files: Default::default(), file_loader, path_mapping }
+        SourceMap {
+            used_address_space: AtomicU32::new(0),
+            files: Default::default(),
+            file_loader,
+            path_mapping,
+        }
     }
 
     pub fn path_mapping(&self) -> &FilePathMapping {
@@ -191,15 +206,28 @@ impl SourceMap {
         &self,
         stable_id: StableSourceFileId,
     ) -> Option<Lrc<SourceFile>> {
-        self.files.borrow().stable_id_to_source_file.get(&stable_id).map(|sf| sf.clone())
-    }
-
-    fn next_start_pos(&self) -> usize {
-        match self.files.borrow().source_files.last() {
-            None => 0,
-            // Add one so there is some space between files. This lets us distinguish
-            // positions in the `SourceMap`, even in the presence of zero-length files.
-            Some(last) => last.end_pos.to_usize() + 1,
+        self.files.borrow().stable_id_to_source_file.get(&stable_id).cloned()
+    }
+
+    fn allocate_address_space(&self, size: usize) -> Result<usize, OffsetOverflowError> {
+        let size = u32::try_from(size).map_err(|_| OffsetOverflowError)?;
+
+        loop {
+            let current = self.used_address_space.load(Ordering::Relaxed);
+            let next = current
+                .checked_add(size)
+                // Add one so there is some space between files. This lets us distinguish
+                // positions in the `SourceMap`, even in the presence of zero-length files.
+                .and_then(|next| next.checked_add(1))
+                .ok_or(OffsetOverflowError)?;
+
+            if self
+                .used_address_space
+                .compare_exchange(current, next, Ordering::Relaxed, Ordering::Relaxed)
+                .is_ok()
+            {
+                return Ok(usize::try_from(current).unwrap());
+            }
         }
     }
 
@@ -218,8 +246,6 @@ impl SourceMap {
         filename: FileName,
         src: String,
     ) -> Result<Lrc<SourceFile>, OffsetOverflowError> {
-        let start_pos = self.next_start_pos();
-
         // The path is used to determine the directory for loading submodules and
         // include files, so it must be before remapping.
         // Note that filename may not be a valid path, eg it may be `<anon>` etc,
@@ -241,13 +267,15 @@ impl SourceMap {
         let lrc_sf = match self.source_file_by_stable_id(file_id) {
             Some(lrc_sf) => lrc_sf,
             None => {
+                let start_pos = self.allocate_address_space(src.len())?;
+
                 let source_file = Lrc::new(SourceFile::new(
                     filename,
                     was_remapped,
                     unmapped_path,
                     src,
                     Pos::from_usize(start_pos),
-                )?);
+                ));
 
                 let mut files = self.files.borrow_mut();
 
@@ -277,7 +305,9 @@ impl SourceMap {
         mut file_local_non_narrow_chars: Vec<NonNarrowChar>,
         mut file_local_normalized_pos: Vec<NormalizedPos>,
     ) -> Lrc<SourceFile> {
-        let start_pos = self.next_start_pos();
+        let start_pos = self
+            .allocate_address_space(source_len)
+            .expect("not enough address space for imported source file");
 
         let end_pos = Pos::from_usize(start_pos + source_len);
         let start_pos = Pos::from_usize(start_pos);
@@ -365,7 +395,7 @@ impl SourceMap {
                         .unwrap_or_else(|x| x);
                     let special_chars = end_width_idx - start_width_idx;
                     let non_narrow: usize = f.non_narrow_chars[start_width_idx..end_width_idx]
-                        .into_iter()
+                        .iter()
                         .map(|x| x.width())
                         .sum();
                     col.0 - special_chars + non_narrow
@@ -383,7 +413,7 @@ impl SourceMap {
                         .binary_search_by_key(&pos, |x| x.pos())
                         .unwrap_or_else(|x| x);
                     let non_narrow: usize =
-                        f.non_narrow_chars[0..end_width_idx].into_iter().map(|x| x.width()).sum();
+                        f.non_narrow_chars[0..end_width_idx].iter().map(|x| x.width()).sum();
                     chpos.0 - end_width_idx + non_narrow
                 };
                 Loc { file: f, line: 0, col: chpos, col_display }
@@ -590,7 +620,7 @@ impl SourceMap {
     /// if no character could be found or if an error occurred while retrieving the code snippet.
     pub fn span_extend_to_prev_char(&self, sp: Span, c: char) -> Span {
         if let Ok(prev_source) = self.span_to_prev_source(sp) {
-            let prev_source = prev_source.rsplit(c).nth(0).unwrap_or("").trim_start();
+            let prev_source = prev_source.rsplit(c).next().unwrap_or("").trim_start();
             if !prev_source.is_empty() && !prev_source.contains('\n') {
                 return sp.with_lo(BytePos(sp.lo().0 - prev_source.len() as u32));
             }
@@ -610,7 +640,7 @@ impl SourceMap {
         for ws in &[" ", "\t", "\n"] {
             let pat = pat.to_owned() + ws;
             if let Ok(prev_source) = self.span_to_prev_source(sp) {
-                let prev_source = prev_source.rsplit(&pat).nth(0).unwrap_or("").trim_start();
+                let prev_source = prev_source.rsplit(&pat).next().unwrap_or("").trim_start();
                 if !prev_source.is_empty() && (!prev_source.contains('\n') || accept_newlines) {
                     return sp.with_lo(BytePos(sp.lo().0 - prev_source.len() as u32));
                 }
@@ -625,7 +655,7 @@ impl SourceMap {
     pub fn span_until_char(&self, sp: Span, c: char) -> Span {
         match self.span_to_snippet(sp) {
             Ok(snippet) => {
-                let snippet = snippet.split(c).nth(0).unwrap_or("").trim_end();
+                let snippet = snippet.split(c).next().unwrap_or("").trim_end();
                 if !snippet.is_empty() && !snippet.contains('\n') {
                     sp.with_hi(BytePos(sp.lo().0 + snippet.len() as u32))
                 } else {
@@ -659,7 +689,7 @@ impl SourceMap {
                 whitespace_found = true;
             }
 
-            if whitespace_found && !c.is_whitespace() { false } else { true }
+            !whitespace_found || c.is_whitespace()
         })
     }
 
@@ -945,14 +975,6 @@ impl SourceMap {
             _ => None,
         })
     }
-    pub fn call_span_if_macro(&self, sp: Span) -> Span {
-        if self.span_to_filename(sp.clone()).is_macros() {
-            if let Some(use_site) = sp.macro_backtrace().last() {
-                return use_site.call_site;
-            }
-        }
-        sp
-    }
 }
 
 #[derive(Clone)]
diff --git a/src/librustc_span/symbol.rs b/src/librustc_span/symbol.rs
index e4f8b5a014..1e09cd79db 100644
--- a/src/librustc_span/symbol.rs
+++ b/src/librustc_span/symbol.rs
@@ -97,6 +97,7 @@ symbols! {
         Auto:               "auto",
         Catch:              "catch",
         Default:            "default",
+        MacroRules:         "macro_rules",
         Raw:                "raw",
         Union:              "union",
     }
@@ -120,6 +121,7 @@ symbols! {
         abi_vectorcall,
         abi_x86_interrupt,
         aborts,
+        address,
         add_with_overflow,
         advanced_slice_patterns,
         adx_target_feature,
@@ -206,6 +208,7 @@ symbols! {
         console,
         const_compare_raw_pointers,
         const_constructor,
+        const_eval_limit,
         const_extern_fn,
         const_fn,
         const_fn_union,
@@ -267,7 +270,6 @@ symbols! {
         doc_cfg,
         doc_keyword,
         doc_masked,
-        doc_spotlight,
         doctest,
         document_private_items,
         dotdoteq_in_patterns,
@@ -428,7 +430,6 @@ symbols! {
         macro_lifetime_matcher,
         macro_literal_matcher,
         macro_reexport,
-        macro_rules,
         macros_in_extern,
         macro_use,
         macro_vis_matcher,
@@ -445,6 +446,7 @@ symbols! {
         mem_uninitialized,
         mem_zeroed,
         member_constraints,
+        memory,
         message,
         meta,
         min_align_of,
@@ -455,6 +457,7 @@ symbols! {
         module,
         module_path,
         more_struct_aliases,
+        move_ref_pattern,
         move_val_init,
         movbe_target_feature,
         mul_with_overflow,
@@ -487,6 +490,8 @@ symbols! {
         None,
         non_exhaustive,
         non_modrs_mods,
+        no_sanitize,
+        no_niche,
         no_stack_check,
         no_start,
         no_std,
@@ -583,6 +588,7 @@ symbols! {
         repr128,
         repr_align,
         repr_align_enum,
+        repr_no_niche,
         repr_packed,
         repr_simd,
         repr_transparent,
@@ -682,7 +688,6 @@ symbols! {
         Some,
         specialization,
         speed,
-        spotlight,
         sse4a_target_feature,
         stable,
         staged_api,
@@ -721,6 +726,7 @@ symbols! {
         test_removed_feature,
         test_runner,
         then_with,
+        thread,
         thread_local,
         tool_attributes,
         tool_lints,
@@ -755,8 +761,13 @@ symbols! {
         u64,
         u8,
         unboxed_closures,
+        unchecked_add,
+        unchecked_div,
+        unchecked_mul,
+        unchecked_rem,
         unchecked_shl,
         unchecked_shr,
+        unchecked_sub,
         underscore_const_names,
         underscore_imports,
         underscore_lifetimes,
@@ -881,19 +892,17 @@ impl Hash for Ident {
 
 impl fmt::Debug for Ident {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.is_raw_guess() {
-            write!(f, "r#")?;
-        }
-        write!(f, "{}{:?}", self.name, self.span.ctxt())
+        fmt::Display::fmt(self, f)?;
+        fmt::Debug::fmt(&self.span.ctxt(), f)
     }
 }
 
+/// This implementation is supposed to be used in error messages, so it's expected to be identical
+/// to printing the original identifier token written in source code (`token_to_string`),
+/// except that AST identifiers don't keep the rawness flag, so we have to guess it.
 impl fmt::Display for Ident {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.is_raw_guess() {
-            write!(f, "r#")?;
-        }
-        fmt::Display::fmt(&self.name, f)
+        fmt::Display::fmt(&IdentPrinter::new(self.name, self.is_raw_guess(), None), f)
     }
 }
 
@@ -917,6 +926,59 @@ impl UseSpecializedDecodable for Ident {
     }
 }
 
+/// This is the most general way to print identifiers.
+/// AST pretty-printer is used as a fallback for turning AST structures into token streams for
+/// proc macros. Additionally, proc macros may stringify their input and expect it survive the
+/// stringification (especially true for proc macro derives written between Rust 1.15 and 1.30).
+/// So we need to somehow pretty-print `$crate` in a way preserving at least some of its
+/// hygiene data, most importantly name of the crate it refers to.
+/// As a result we print `$crate` as `crate` if it refers to the local crate
+/// and as `::other_crate_name` if it refers to some other crate.
+/// Note, that this is only done if the ident token is printed from inside of AST pretty-pringing,
+/// but not otherwise. Pretty-printing is the only way for proc macros to discover token contents,
+/// so we should not perform this lossy conversion if the top level call to the pretty-printer was
+/// done for a token stream or a single token.
+pub struct IdentPrinter {
+    symbol: Symbol,
+    is_raw: bool,
+    /// Span used for retrieving the crate name to which `$crate` refers to,
+    /// if this field is `None` then the `$crate` conversion doesn't happen.
+    convert_dollar_crate: Option<Span>,
+}
+
+impl IdentPrinter {
+    /// The most general `IdentPrinter` constructor. Do not use this.
+    pub fn new(symbol: Symbol, is_raw: bool, convert_dollar_crate: Option<Span>) -> IdentPrinter {
+        IdentPrinter { symbol, is_raw, convert_dollar_crate }
+    }
+
+    /// This implementation is supposed to be used when printing identifiers
+    /// as a part of pretty-printing for larger AST pieces.
+    /// Do not use this either.
+    pub fn for_ast_ident(ident: Ident, is_raw: bool) -> IdentPrinter {
+        IdentPrinter::new(ident.name, is_raw, Some(ident.span))
+    }
+}
+
+impl fmt::Display for IdentPrinter {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.is_raw {
+            f.write_str("r#")?;
+        } else {
+            if self.symbol == kw::DollarCrate {
+                if let Some(span) = self.convert_dollar_crate {
+                    let converted = span.ctxt().dollar_crate_name();
+                    if !converted.is_path_segment_keyword() {
+                        f.write_str("::")?;
+                    }
+                    return fmt::Display::fmt(&converted, f);
+                }
+            }
+        }
+        fmt::Display::fmt(&self.symbol, f)
+    }
+}
+
 /// An interned string.
 ///
 /// Internally, a `Symbol` is implemented as an index, and all operations
@@ -960,6 +1022,14 @@ impl Symbol {
     pub fn as_u32(self) -> u32 {
         self.0.as_u32()
     }
+
+    /// This method is supposed to be used in error messages, so it's expected to be
+    /// identical to printing the original identifier token written in source code
+    /// (`token_to_string`, `Ident::to_string`), except that symbols don't keep the rawness flag
+    /// or edition, so we have to guess the rawness using the global edition.
+    pub fn to_ident_string(self) -> String {
+        Ident::with_dummy_span(self).to_string()
+    }
 }
 
 impl fmt::Debug for Symbol {
@@ -981,6 +1051,7 @@ impl Encodable for Symbol {
 }
 
 impl Decodable for Symbol {
+    #[inline]
     fn decode<D: Decoder>(d: &mut D) -> Result<Symbol, D::Error> {
         Ok(Symbol::intern(&d.read_str()?))
     }
@@ -1019,6 +1090,7 @@ impl Interner {
         }
     }
 
+    #[inline]
     pub fn intern(&mut self, string: &str) -> Symbol {
         if let Some(&name) = self.names.get(string) {
             return name;
@@ -1059,6 +1131,9 @@ pub mod sym {
 
     symbols!();
 
+    // Used from a macro in `librustc_feature/accepted.rs`
+    pub use super::kw::MacroRules as macro_rules;
+
     // Get the symbol for an integer. The first few non-negative integers each
     // have a static symbol and therefore are fast.
     pub fn integer<N: TryInto<usize> + Copy + ToString>(n: N) -> Symbol {
diff --git a/src/librustc_target/abi/call/aarch64.rs b/src/librustc_target/abi/call/aarch64.rs
index 2dd41a0d80..c8bac5aebc 100644
--- a/src/librustc_target/abi/call/aarch64.rs
+++ b/src/librustc_target/abi/call/aarch64.rs
@@ -6,7 +6,7 @@ where
     Ty: TyLayoutMethods<'a, C> + Copy,
     C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout,
 {
-    arg.layout.homogeneous_aggregate(cx).unit().and_then(|unit| {
+    arg.layout.homogeneous_aggregate(cx).ok().and_then(|ha| ha.unit()).and_then(|unit| {
         let size = arg.layout.size;
 
         // Ensure we have at most four uniquely addressable members.
diff --git a/src/librustc_target/abi/call/arm.rs b/src/librustc_target/abi/call/arm.rs
index eb9364091d..59ec87e3c9 100644
--- a/src/librustc_target/abi/call/arm.rs
+++ b/src/librustc_target/abi/call/arm.rs
@@ -7,7 +7,7 @@ where
     Ty: TyLayoutMethods<'a, C> + Copy,
     C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout,
 {
-    arg.layout.homogeneous_aggregate(cx).unit().and_then(|unit| {
+    arg.layout.homogeneous_aggregate(cx).ok().and_then(|ha| ha.unit()).and_then(|unit| {
         let size = arg.layout.size;
 
         // Ensure we have at most four uniquely addressable members.
diff --git a/src/librustc_target/abi/call/mod.rs b/src/librustc_target/abi/call/mod.rs
index af82f9e318..77e7ff1e2a 100644
--- a/src/librustc_target/abi/call/mod.rs
+++ b/src/librustc_target/abi/call/mod.rs
@@ -120,6 +120,7 @@ impl Reg {
     reg_ctor!(i16, Integer, 16);
     reg_ctor!(i32, Integer, 32);
     reg_ctor!(i64, Integer, 64);
+    reg_ctor!(i128, Integer, 128);
 
     reg_ctor!(f32, Float, 32);
     reg_ctor!(f64, Float, 64);
@@ -219,26 +220,47 @@ impl CastTarget {
     }
 }
 
-/// Returns value from the `homogeneous_aggregate` test function.
+/// Return value from the `homogeneous_aggregate` test function.
 #[derive(Copy, Clone, Debug)]
 pub enum HomogeneousAggregate {
     /// Yes, all the "leaf fields" of this struct are passed in the
     /// same way (specified in the `Reg` value).
     Homogeneous(Reg),
 
-    /// There are distinct leaf fields passed in different ways,
-    /// or this is uninhabited.
-    Heterogeneous,
-
     /// There are no leaf fields at all.
     NoData,
 }
 
+/// Error from the `homogeneous_aggregate` test function, indicating
+/// there are distinct leaf fields passed in different ways,
+/// or this is uninhabited.
+#[derive(Copy, Clone, Debug)]
+pub struct Heterogeneous;
+
 impl HomogeneousAggregate {
     /// If this is a homogeneous aggregate, returns the homogeneous
     /// unit, else `None`.
     pub fn unit(self) -> Option<Reg> {
-        if let HomogeneousAggregate::Homogeneous(r) = self { Some(r) } else { None }
+        match self {
+            HomogeneousAggregate::Homogeneous(reg) => Some(reg),
+            HomogeneousAggregate::NoData => None,
+        }
+    }
+
+    /// Try to combine two `HomogeneousAggregate`s, e.g. from two fields in
+    /// the same `struct`. Only succeeds if only one of them has any data,
+    /// or both units are identical.
+    fn merge(self, other: HomogeneousAggregate) -> Result<HomogeneousAggregate, Heterogeneous> {
+        match (self, other) {
+            (x, HomogeneousAggregate::NoData) | (HomogeneousAggregate::NoData, x) => Ok(x),
+
+            (HomogeneousAggregate::Homogeneous(a), HomogeneousAggregate::Homogeneous(b)) => {
+                if a != b {
+                    return Err(Heterogeneous);
+                }
+                Ok(self)
+            }
+        }
     }
 }
 
@@ -250,8 +272,8 @@ impl<'a, Ty> TyLayout<'a, Ty> {
         }
     }
 
-    /// Returns `true` if this layout is an aggregate containing fields of only
-    /// a single type (e.g., `(u32, u32)`). Such aggregates are often
+    /// Returns `Homogeneous` if this layout is an aggregate containing fields of
+    /// only a single type (e.g., `(u32, u32)`). Such aggregates are often
     /// special-cased in ABIs.
     ///
     /// Note: We generally ignore fields of zero-sized type when computing
@@ -260,13 +282,13 @@ impl<'a, Ty> TyLayout<'a, Ty> {
     /// This is public so that it can be used in unit tests, but
     /// should generally only be relevant to the ABI details of
     /// specific targets.
-    pub fn homogeneous_aggregate<C>(&self, cx: &C) -> HomogeneousAggregate
+    pub fn homogeneous_aggregate<C>(&self, cx: &C) -> Result<HomogeneousAggregate, Heterogeneous>
     where
         Ty: TyLayoutMethods<'a, C> + Copy,
         C: LayoutOf<Ty = Ty, TyLayout = Self>,
     {
         match self.abi {
-            Abi::Uninhabited => HomogeneousAggregate::Heterogeneous,
+            Abi::Uninhabited => Err(Heterogeneous),
 
             // The primitive for this algorithm.
             Abi::Scalar(ref scalar) => {
@@ -274,80 +296,104 @@ impl<'a, Ty> TyLayout<'a, Ty> {
                     abi::Int(..) | abi::Pointer => RegKind::Integer,
                     abi::F32 | abi::F64 => RegKind::Float,
                 };
-                HomogeneousAggregate::Homogeneous(Reg { kind, size: self.size })
+                Ok(HomogeneousAggregate::Homogeneous(Reg { kind, size: self.size }))
             }
 
             Abi::Vector { .. } => {
                 assert!(!self.is_zst());
-                HomogeneousAggregate::Homogeneous(Reg { kind: RegKind::Vector, size: self.size })
+                Ok(HomogeneousAggregate::Homogeneous(Reg {
+                    kind: RegKind::Vector,
+                    size: self.size,
+                }))
             }
 
             Abi::ScalarPair(..) | Abi::Aggregate { .. } => {
-                let mut total = Size::ZERO;
-                let mut result = None;
-
-                let is_union = match self.fields {
-                    FieldPlacement::Array { count, .. } => {
-                        if count > 0 {
-                            return self.field(cx, 0).homogeneous_aggregate(cx);
-                        } else {
-                            return HomogeneousAggregate::NoData;
-                        }
-                    }
-                    FieldPlacement::Union(_) => true,
-                    FieldPlacement::Arbitrary { .. } => false,
-                };
+                // Helper for computing `homogenous_aggregate`, allowing a custom
+                // starting offset (used below for handling variants).
+                let from_fields_at =
+                    |layout: Self,
+                     start: Size|
+                     -> Result<(HomogeneousAggregate, Size), Heterogeneous> {
+                        let is_union = match layout.fields {
+                            FieldPlacement::Array { count, .. } => {
+                                assert_eq!(start, Size::ZERO);
+
+                                let result = if count > 0 {
+                                    layout.field(cx, 0).homogeneous_aggregate(cx)?
+                                } else {
+                                    HomogeneousAggregate::NoData
+                                };
+                                return Ok((result, layout.size));
+                            }
+                            FieldPlacement::Union(_) => true,
+                            FieldPlacement::Arbitrary { .. } => false,
+                        };
 
-                for i in 0..self.fields.count() {
-                    if !is_union && total != self.fields.offset(i) {
-                        return HomogeneousAggregate::Heterogeneous;
-                    }
+                        let mut result = HomogeneousAggregate::NoData;
+                        let mut total = start;
 
-                    let field = self.field(cx, i);
+                        for i in 0..layout.fields.count() {
+                            if !is_union && total != layout.fields.offset(i) {
+                                return Err(Heterogeneous);
+                            }
 
-                    match (result, field.homogeneous_aggregate(cx)) {
-                        (_, HomogeneousAggregate::NoData) => {
-                            // Ignore fields that have no data
-                        }
-                        (_, HomogeneousAggregate::Heterogeneous) => {
-                            // The field itself must be a homogeneous aggregate.
-                            return HomogeneousAggregate::Heterogeneous;
-                        }
-                        // If this is the first field, record the unit.
-                        (None, HomogeneousAggregate::Homogeneous(unit)) => {
-                            result = Some(unit);
-                        }
-                        // For all following fields, the unit must be the same.
-                        (Some(prev_unit), HomogeneousAggregate::Homogeneous(unit)) => {
-                            if prev_unit != unit {
-                                return HomogeneousAggregate::Heterogeneous;
+                            let field = layout.field(cx, i);
+
+                            result = result.merge(field.homogeneous_aggregate(cx)?)?;
+
+                            // Keep track of the offset (without padding).
+                            let size = field.size;
+                            if is_union {
+                                total = total.max(size);
+                            } else {
+                                total += size;
                             }
                         }
-                    }
 
-                    // Keep track of the offset (without padding).
-                    let size = field.size;
-                    if is_union {
-                        total = total.max(size);
-                    } else {
-                        total += size;
+                        Ok((result, total))
+                    };
+
+                let (mut result, mut total) = from_fields_at(*self, Size::ZERO)?;
+
+                match &self.variants {
+                    abi::Variants::Single { .. } => {}
+                    abi::Variants::Multiple { variants, .. } => {
+                        // Treat enum variants like union members.
+                        // HACK(eddyb) pretend the `enum` field (discriminant)
+                        // is at the start of every variant (otherwise the gap
+                        // at the start of all variants would disqualify them).
+                        //
+                        // NB: for all tagged `enum`s (which include all non-C-like
+                        // `enum`s with defined FFI representation), this will
+                        // match the homogeneous computation on the equivalent
+                        // `struct { tag; union { variant1; ... } }` and/or
+                        // `union { struct { tag; variant1; } ... }`
+                        // (the offsets of variant fields should be identical
+                        // between the two for either to be a homogeneous aggregate).
+                        let variant_start = total;
+                        for variant_idx in variants.indices() {
+                            let (variant_result, variant_total) =
+                                from_fields_at(self.for_variant(cx, variant_idx), variant_start)?;
+
+                            result = result.merge(variant_result)?;
+                            total = total.max(variant_total);
+                        }
                     }
                 }
 
                 // There needs to be no padding.
                 if total != self.size {
-                    HomogeneousAggregate::Heterogeneous
+                    Err(Heterogeneous)
                 } else {
                     match result {
-                        Some(reg) => {
+                        HomogeneousAggregate::Homogeneous(_) => {
                             assert_ne!(total, Size::ZERO);
-                            HomogeneousAggregate::Homogeneous(reg)
                         }
-                        None => {
+                        HomogeneousAggregate::NoData => {
                             assert_eq!(total, Size::ZERO);
-                            HomogeneousAggregate::NoData
                         }
                     }
+                    Ok(result)
                 }
             }
         }
@@ -493,6 +539,12 @@ pub struct FnAbi<'a, Ty> {
 
     pub c_variadic: bool,
 
+    /// The count of non-variadic arguments.
+    ///
+    /// Should only be different from args.len() when c_variadic is true.
+    /// This can be used to know whether an argument is variadic or not.
+    pub fixed_count: usize,
+
     pub conv: Conv,
 }
 
@@ -534,8 +586,7 @@ impl<'a, Ty> FnAbi<'a, Ty> {
             "nvptx" => nvptx::compute_abi_info(self),
             "nvptx64" => nvptx64::compute_abi_info(self),
             "hexagon" => hexagon::compute_abi_info(self),
-            "riscv32" => riscv::compute_abi_info(self, 32),
-            "riscv64" => riscv::compute_abi_info(self, 64),
+            "riscv32" | "riscv64" => riscv::compute_abi_info(cx, self),
             "wasm32" if cx.target_spec().target_os != "emscripten" => {
                 wasm32_bindgen_compat::compute_abi_info(self)
             }
diff --git a/src/librustc_target/abi/call/powerpc64.rs b/src/librustc_target/abi/call/powerpc64.rs
index 2db3954b48..93c4e97de1 100644
--- a/src/librustc_target/abi/call/powerpc64.rs
+++ b/src/librustc_target/abi/call/powerpc64.rs
@@ -22,7 +22,7 @@ where
     Ty: TyLayoutMethods<'a, C> + Copy,
     C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout,
 {
-    arg.layout.homogeneous_aggregate(cx).unit().and_then(|unit| {
+    arg.layout.homogeneous_aggregate(cx).ok().and_then(|ha| ha.unit()).and_then(|unit| {
         // ELFv1 only passes one-member aggregates transparently.
         // ELFv2 passes up to eight uniquely addressable members.
         if (abi == ELFv1 && arg.layout.size > unit.size)
diff --git a/src/librustc_target/abi/call/riscv.rs b/src/librustc_target/abi/call/riscv.rs
index 095e5aff74..11d6c4d819 100644
--- a/src/librustc_target/abi/call/riscv.rs
+++ b/src/librustc_target/abi/call/riscv.rs
@@ -1,49 +1,358 @@
 // Reference: RISC-V ELF psABI specification
 // https://github.com/riscv/riscv-elf-psabi-doc
+//
+// Reference: Clang RISC-V ELF psABI lowering code
+// https://github.com/llvm/llvm-project/blob/8e780252a7284be45cf1ba224cabd884847e8e92/clang/lib/CodeGen/TargetInfo.cpp#L9311-L9773
 
-use crate::abi::call::{ArgAbi, FnAbi};
+use crate::abi::call::{ArgAbi, ArgAttribute, CastTarget, FnAbi, PassMode, Reg, RegKind, Uniform};
+use crate::abi::{
+    self, Abi, FieldPlacement, HasDataLayout, LayoutOf, Size, TyLayout, TyLayoutMethods,
+};
+use crate::spec::HasTargetSpec;
+
+#[derive(Copy, Clone)]
+enum RegPassKind {
+    Float(Reg),
+    Integer(Reg),
+    Unknown,
+}
+
+#[derive(Copy, Clone)]
+enum FloatConv {
+    FloatPair(Reg, Reg),
+    Float(Reg),
+    MixedPair(Reg, Reg),
+}
+
+#[derive(Copy, Clone)]
+struct CannotUseFpConv;
+
+fn is_riscv_aggregate<'a, Ty>(arg: &ArgAbi<'a, Ty>) -> bool {
+    match arg.layout.abi {
+        Abi::Vector { .. } => true,
+        _ => arg.layout.is_aggregate(),
+    }
+}
+
+fn should_use_fp_conv_helper<'a, Ty, C>(
+    cx: &C,
+    arg_layout: &TyLayout<'a, Ty>,
+    xlen: u64,
+    flen: u64,
+    field1_kind: &mut RegPassKind,
+    field2_kind: &mut RegPassKind,
+) -> Result<(), CannotUseFpConv>
+where
+    Ty: TyLayoutMethods<'a, C> + Copy,
+    C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>>,
+{
+    match arg_layout.abi {
+        Abi::Scalar(ref scalar) => match scalar.value {
+            abi::Int(..) | abi::Pointer => {
+                if arg_layout.size.bits() > xlen {
+                    return Err(CannotUseFpConv);
+                }
+                match (*field1_kind, *field2_kind) {
+                    (RegPassKind::Unknown, _) => {
+                        *field1_kind = RegPassKind::Integer(Reg {
+                            kind: RegKind::Integer,
+                            size: arg_layout.size,
+                        });
+                    }
+                    (RegPassKind::Float(_), RegPassKind::Unknown) => {
+                        *field2_kind = RegPassKind::Integer(Reg {
+                            kind: RegKind::Integer,
+                            size: arg_layout.size,
+                        });
+                    }
+                    _ => return Err(CannotUseFpConv),
+                }
+            }
+            abi::F32 | abi::F64 => {
+                if arg_layout.size.bits() > flen {
+                    return Err(CannotUseFpConv);
+                }
+                match (*field1_kind, *field2_kind) {
+                    (RegPassKind::Unknown, _) => {
+                        *field1_kind =
+                            RegPassKind::Float(Reg { kind: RegKind::Float, size: arg_layout.size });
+                    }
+                    (_, RegPassKind::Unknown) => {
+                        *field2_kind =
+                            RegPassKind::Float(Reg { kind: RegKind::Float, size: arg_layout.size });
+                    }
+                    _ => return Err(CannotUseFpConv),
+                }
+            }
+        },
+        Abi::Vector { .. } | Abi::Uninhabited => return Err(CannotUseFpConv),
+        Abi::ScalarPair(..) | Abi::Aggregate { .. } => match arg_layout.fields {
+            FieldPlacement::Union(_) => {
+                if !arg_layout.is_zst() {
+                    return Err(CannotUseFpConv);
+                }
+            }
+            FieldPlacement::Array { count, .. } => {
+                for _ in 0..count {
+                    let elem_layout = arg_layout.field(cx, 0);
+                    should_use_fp_conv_helper(
+                        cx,
+                        &elem_layout,
+                        xlen,
+                        flen,
+                        field1_kind,
+                        field2_kind,
+                    )?;
+                }
+            }
+            FieldPlacement::Arbitrary { .. } => {
+                match arg_layout.variants {
+                    abi::Variants::Multiple { .. } => return Err(CannotUseFpConv),
+                    abi::Variants::Single { .. } => (),
+                }
+                for i in arg_layout.fields.index_by_increasing_offset() {
+                    let field = arg_layout.field(cx, i);
+                    should_use_fp_conv_helper(cx, &field, xlen, flen, field1_kind, field2_kind)?;
+                }
+            }
+        },
+    }
+    Ok(())
+}
+
+fn should_use_fp_conv<'a, Ty, C>(
+    cx: &C,
+    arg: &TyLayout<'a, Ty>,
+    xlen: u64,
+    flen: u64,
+) -> Option<FloatConv>
+where
+    Ty: TyLayoutMethods<'a, C> + Copy,
+    C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>>,
+{
+    let mut field1_kind = RegPassKind::Unknown;
+    let mut field2_kind = RegPassKind::Unknown;
+    if should_use_fp_conv_helper(cx, arg, xlen, flen, &mut field1_kind, &mut field2_kind).is_err() {
+        return None;
+    }
+    match (field1_kind, field2_kind) {
+        (RegPassKind::Integer(l), RegPassKind::Float(r)) => Some(FloatConv::MixedPair(l, r)),
+        (RegPassKind::Float(l), RegPassKind::Integer(r)) => Some(FloatConv::MixedPair(l, r)),
+        (RegPassKind::Float(l), RegPassKind::Float(r)) => Some(FloatConv::FloatPair(l, r)),
+        (RegPassKind::Float(f), RegPassKind::Unknown) => Some(FloatConv::Float(f)),
+        _ => None,
+    }
+}
+
+fn classify_ret<'a, Ty, C>(cx: &C, arg: &mut ArgAbi<'a, Ty>, xlen: u64, flen: u64) -> bool
+where
+    Ty: TyLayoutMethods<'a, C> + Copy,
+    C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>>,
+{
+    if let Some(conv) = should_use_fp_conv(cx, &arg.layout, xlen, flen) {
+        match conv {
+            FloatConv::Float(f) => {
+                arg.cast_to(f);
+            }
+            FloatConv::FloatPair(l, r) => {
+                arg.cast_to(CastTarget::pair(l, r));
+            }
+            FloatConv::MixedPair(l, r) => {
+                arg.cast_to(CastTarget::pair(l, r));
+            }
+        }
+        return false;
+    }
+
+    let total = arg.layout.size;
 
-fn classify_ret<Ty>(arg: &mut ArgAbi<'_, Ty>, xlen: u64) {
     // "Scalars wider than 2✕XLEN are passed by reference and are replaced in
     // the argument list with the address."
     // "Aggregates larger than 2✕XLEN bits are passed by reference and are
     // replaced in the argument list with the address, as are C++ aggregates
     // with nontrivial copy constructors, destructors, or vtables."
-    if arg.layout.size.bits() > 2 * xlen {
-        arg.make_indirect();
+    if total.bits() > 2 * xlen {
+        // We rely on the LLVM backend lowering code to lower passing a scalar larger than 2*XLEN.
+        if is_riscv_aggregate(arg) {
+            arg.make_indirect();
+        }
+        return true;
+    }
+
+    let xlen_reg = match xlen {
+        32 => Reg::i32(),
+        64 => Reg::i64(),
+        _ => unreachable!("Unsupported XLEN: {}", xlen),
+    };
+    if is_riscv_aggregate(arg) {
+        if total.bits() <= xlen {
+            arg.cast_to(xlen_reg);
+        } else {
+            arg.cast_to(Uniform { unit: xlen_reg, total: Size::from_bits(xlen * 2) });
+        }
+        return false;
     }
 
     // "When passed in registers, scalars narrower than XLEN bits are widened
     // according to the sign of their type up to 32 bits, then sign-extended to
     // XLEN bits."
-    arg.extend_integer_width_to(xlen); // this method only affects integer scalars
+    extend_integer_width(arg, xlen);
+    false
 }
 
-fn classify_arg<Ty>(arg: &mut ArgAbi<'_, Ty>, xlen: u64) {
+fn classify_arg<'a, Ty, C>(
+    cx: &C,
+    arg: &mut ArgAbi<'a, Ty>,
+    xlen: u64,
+    flen: u64,
+    is_vararg: bool,
+    avail_gprs: &mut u64,
+    avail_fprs: &mut u64,
+) where
+    Ty: TyLayoutMethods<'a, C> + Copy,
+    C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>>,
+{
+    if !is_vararg {
+        match should_use_fp_conv(cx, &arg.layout, xlen, flen) {
+            Some(FloatConv::Float(f)) if *avail_fprs >= 1 => {
+                *avail_fprs -= 1;
+                arg.cast_to(f);
+                return;
+            }
+            Some(FloatConv::FloatPair(l, r)) if *avail_fprs >= 2 => {
+                *avail_fprs -= 2;
+                arg.cast_to(CastTarget::pair(l, r));
+                return;
+            }
+            Some(FloatConv::MixedPair(l, r)) if *avail_fprs >= 1 && *avail_gprs >= 1 => {
+                *avail_gprs -= 1;
+                *avail_fprs -= 1;
+                arg.cast_to(CastTarget::pair(l, r));
+                return;
+            }
+            _ => (),
+        }
+    }
+
+    let total = arg.layout.size;
+    let align = arg.layout.align.abi.bits();
+
     // "Scalars wider than 2✕XLEN are passed by reference and are replaced in
     // the argument list with the address."
     // "Aggregates larger than 2✕XLEN bits are passed by reference and are
     // replaced in the argument list with the address, as are C++ aggregates
     // with nontrivial copy constructors, destructors, or vtables."
-    if arg.layout.size.bits() > 2 * xlen {
-        arg.make_indirect();
+    if total.bits() > 2 * xlen {
+        // We rely on the LLVM backend lowering code to lower passing a scalar larger than 2*XLEN.
+        if is_riscv_aggregate(arg) {
+            arg.make_indirect();
+        }
+        if *avail_gprs >= 1 {
+            *avail_gprs -= 1;
+        }
+        return;
+    }
+
+    let double_xlen_reg = match xlen {
+        32 => Reg::i64(),
+        64 => Reg::i128(),
+        _ => unreachable!("Unsupported XLEN: {}", xlen),
+    };
+
+    let xlen_reg = match xlen {
+        32 => Reg::i32(),
+        64 => Reg::i64(),
+        _ => unreachable!("Unsupported XLEN: {}", xlen),
+    };
+
+    if total.bits() > xlen {
+        let align_regs = align > xlen;
+        if is_riscv_aggregate(arg) {
+            arg.cast_to(Uniform {
+                unit: if align_regs { double_xlen_reg } else { xlen_reg },
+                total: Size::from_bits(xlen * 2),
+            });
+        }
+        if align_regs && is_vararg {
+            *avail_gprs -= *avail_gprs % 2;
+        }
+        if *avail_gprs >= 2 {
+            *avail_gprs -= 2;
+        } else {
+            *avail_gprs = 0;
+        }
+        return;
+    } else if is_riscv_aggregate(arg) {
+        arg.cast_to(xlen_reg);
+        if *avail_gprs >= 1 {
+            *avail_gprs -= 1;
+        }
+        return;
     }
 
     // "When passed in registers, scalars narrower than XLEN bits are widened
     // according to the sign of their type up to 32 bits, then sign-extended to
     // XLEN bits."
-    arg.extend_integer_width_to(xlen); // this method only affects integer scalars
+    if *avail_gprs >= 1 {
+        extend_integer_width(arg, xlen);
+        *avail_gprs -= 1;
+    }
 }
 
-pub fn compute_abi_info<Ty>(fn_abi: &mut FnAbi<'_, Ty>, xlen: u64) {
+fn extend_integer_width<'a, Ty>(arg: &mut ArgAbi<'a, Ty>, xlen: u64) {
+    match arg.layout.abi {
+        Abi::Scalar(ref scalar) => {
+            match scalar.value {
+                abi::Int(i, _) => {
+                    // 32-bit integers are always sign-extended
+                    if i.size().bits() == 32 && xlen > 32 {
+                        if let PassMode::Direct(ref mut attrs) = arg.mode {
+                            attrs.set(ArgAttribute::SExt);
+                            return;
+                        }
+                    }
+                }
+                _ => (),
+            }
+        }
+        _ => (),
+    }
+    arg.extend_integer_width_to(xlen);
+}
+
+pub fn compute_abi_info<'a, Ty, C>(cx: &C, fn_abi: &mut FnAbi<'a, Ty>)
+where
+    Ty: TyLayoutMethods<'a, C> + Copy,
+    C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout + HasTargetSpec,
+{
+    let flen = match &cx.target_spec().options.llvm_abiname[..] {
+        "ilp32f" | "lp64f" => 32,
+        "ilp32d" | "lp64d" => 64,
+        _ => 0,
+    };
+    let xlen = cx.data_layout().pointer_size.bits();
+
+    let mut avail_gprs = 8;
+    let mut avail_fprs = 8;
+
     if !fn_abi.ret.is_ignore() {
-        classify_ret(&mut fn_abi.ret, xlen);
+        if classify_ret(cx, &mut fn_abi.ret, xlen, flen) {
+            avail_gprs -= 1;
+        }
     }
 
-    for arg in &mut fn_abi.args {
+    for (i, arg) in fn_abi.args.iter_mut().enumerate() {
         if arg.is_ignore() {
             continue;
         }
-        classify_arg(arg, xlen);
+        classify_arg(
+            cx,
+            arg,
+            xlen,
+            flen,
+            i >= fn_abi.fixed_count,
+            &mut avail_gprs,
+            &mut avail_fprs,
+        );
     }
 }
diff --git a/src/librustc_target/abi/call/sparc64.rs b/src/librustc_target/abi/call/sparc64.rs
index 8bcb02b876..c80f8316fe 100644
--- a/src/librustc_target/abi/call/sparc64.rs
+++ b/src/librustc_target/abi/call/sparc64.rs
@@ -8,7 +8,7 @@ where
     Ty: TyLayoutMethods<'a, C> + Copy,
     C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout,
 {
-    arg.layout.homogeneous_aggregate(cx).unit().and_then(|unit| {
+    arg.layout.homogeneous_aggregate(cx).ok().and_then(|ha| ha.unit()).and_then(|unit| {
         // Ensure we have at most eight uniquely addressable members.
         if arg.layout.size > unit.size.checked_mul(8, cx).unwrap() {
             return None;
diff --git a/src/librustc_target/abi/call/wasm32.rs b/src/librustc_target/abi/call/wasm32.rs
index 852ead8c52..9aab64ef27 100644
--- a/src/librustc_target/abi/call/wasm32.rs
+++ b/src/librustc_target/abi/call/wasm32.rs
@@ -7,7 +7,7 @@ where
     C: LayoutOf<Ty = Ty, TyLayout = TyLayout<'a, Ty>> + HasDataLayout,
 {
     if val.layout.is_aggregate() {
-        if let Some(unit) = val.layout.homogeneous_aggregate(cx).unit() {
+        if let Some(unit) = val.layout.homogeneous_aggregate(cx).ok().and_then(|ha| ha.unit()) {
             let size = val.layout.size;
             if unit.size == size {
                 val.cast_to(Uniform { unit, total: size });
diff --git a/src/librustc_target/abi/call/x86.rs b/src/librustc_target/abi/call/x86.rs
index a7884849b8..e776a8b3fe 100644
--- a/src/librustc_target/abi/call/x86.rs
+++ b/src/librustc_target/abi/call/x86.rs
@@ -100,7 +100,7 @@ where
             };
 
             // At this point we know this must be a primitive of sorts.
-            let unit = arg.layout.homogeneous_aggregate(cx).unit().unwrap();
+            let unit = arg.layout.homogeneous_aggregate(cx).unwrap().unit().unwrap();
             assert_eq!(unit.size, arg.layout.size);
             if unit.kind == RegKind::Float {
                 continue;
diff --git a/src/librustc_target/abi/call/x86_64.rs b/src/librustc_target/abi/call/x86_64.rs
index a547d7262e..4c192c4678 100644
--- a/src/librustc_target/abi/call/x86_64.rs
+++ b/src/librustc_target/abi/call/x86_64.rs
@@ -56,16 +56,24 @@ where
 
             Abi::Vector { .. } => Class::Sse,
 
-            Abi::ScalarPair(..) | Abi::Aggregate { .. } => match layout.variants {
-                abi::Variants::Single { .. } => {
-                    for i in 0..layout.fields.count() {
-                        let field_off = off + layout.fields.offset(i);
-                        classify(cx, layout.field(cx, i), cls, field_off)?;
+            Abi::ScalarPair(..) | Abi::Aggregate { .. } => {
+                for i in 0..layout.fields.count() {
+                    let field_off = off + layout.fields.offset(i);
+                    classify(cx, layout.field(cx, i), cls, field_off)?;
+                }
+
+                match &layout.variants {
+                    abi::Variants::Single { .. } => {}
+                    abi::Variants::Multiple { variants, .. } => {
+                        // Treat enum variants like union members.
+                        for variant_idx in variants.indices() {
+                            classify(cx, layout.for_variant(cx, variant_idx), cls, off)?;
+                        }
                     }
-                    return Ok(());
                 }
-                abi::Variants::Multiple { .. } => return Err(Memory),
-            },
+
+                return Ok(());
+            }
         };
 
         // Fill in `cls` for scalars (Int/Sse) and vectors (Sse).
diff --git a/src/librustc_target/abi/mod.rs b/src/librustc_target/abi/mod.rs
index 3f44339bf4..a3a9b54276 100644
--- a/src/librustc_target/abi/mod.rs
+++ b/src/librustc_target/abi/mod.rs
@@ -101,7 +101,7 @@ impl TargetDataLayout {
             match &*spec_parts {
                 ["e"] => dl.endian = Endian::Little,
                 ["E"] => dl.endian = Endian::Big,
-                [p] if p.starts_with("P") => {
+                [p] if p.starts_with('P') => {
                     dl.instruction_address_space = parse_address_space(&p[1..], "P")?
                 }
                 ["a", ref a @ ..] => dl.aggregate_align = align(a, "a")?,
@@ -111,7 +111,7 @@ impl TargetDataLayout {
                     dl.pointer_size = size(s, p)?;
                     dl.pointer_align = align(a, p)?;
                 }
-                [s, ref a @ ..] if s.starts_with("i") => {
+                [s, ref a @ ..] if s.starts_with('i') => {
                     let bits = match s[1..].parse::<u64>() {
                         Ok(bits) => bits,
                         Err(_) => {
@@ -135,7 +135,7 @@ impl TargetDataLayout {
                         dl.i128_align = a;
                     }
                 }
-                [s, ref a @ ..] if s.starts_with("v") => {
+                [s, ref a @ ..] if s.starts_with('v') => {
                     let v_size = size(&s[1..], "v")?;
                     let a = align(a, s)?;
                     if let Some(v) = dl.vector_align.iter_mut().find(|v| v.0 == v_size) {
@@ -401,7 +401,7 @@ impl Align {
     }
 }
 
-/// A pair of aligments, ABI-mandated and preferred.
+/// A pair of alignments, ABI-mandated and preferred.
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug, RustcEncodable, RustcDecodable)]
 #[derive(HashStable_Generic)]
 pub struct AbiAndPrefAlign {
@@ -871,8 +871,26 @@ impl Niche {
 
 #[derive(PartialEq, Eq, Hash, Debug, HashStable_Generic)]
 pub struct LayoutDetails {
-    pub variants: Variants,
+    /// Says where the fields are located within the layout.
+    /// Primitives and uninhabited enums appear as unions without fields.
     pub fields: FieldPlacement,
+
+    /// Encodes information about multi-variant layouts.
+    /// Even with `Multiple` variants, a layout still has its own fields! Those are then
+    /// shared between all variants. One of them will be the discriminant,
+    /// but e.g. generators can have more.
+    ///
+    /// To access all fields of this layout, both `fields` and the fields of the active variant
+    /// must be taken into account.
+    pub variants: Variants,
+
+    /// The `abi` defines how this data is passed between functions, and it defines
+    /// value restrictions via `valid_range`.
+    ///
+    /// Note that this is entirely orthogonal to the recursive structure defined by
+    /// `variants` and `fields`; for example, `ManuallyDrop<Result<isize, isize>>` has
+    /// `Abi::ScalarPair`! So, even with non-`Aggregate` `abi`, `fields` and `variants`
+    /// have to be taken into account to find all fields of this layout.
     pub abi: Abi,
 
     /// The leaf scalar with the largest number of invalid values
diff --git a/src/librustc_target/lib.rs b/src/librustc_target/lib.rs
index 84c6d720b8..71150e74f7 100644
--- a/src/librustc_target/lib.rs
+++ b/src/librustc_target/lib.rs
@@ -8,10 +8,8 @@
 //! LLVM.
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
-#![feature(box_syntax)]
 #![feature(bool_to_option)]
 #![feature(nll)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 
 #[macro_use]
 extern crate log;
diff --git a/src/librustc_target/spec/apple_base.rs b/src/librustc_target/spec/apple_base.rs
index 325efd1097..d116ddf952 100644
--- a/src/librustc_target/spec/apple_base.rs
+++ b/src/librustc_target/spec/apple_base.rs
@@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions {
         has_rpath: true,
         dll_prefix: "lib".to_string(),
         dll_suffix: ".dylib".to_string(),
-        archive_format: "bsd".to_string(),
+        archive_format: "darwin".to_string(),
         pre_link_args: LinkArgs::new(),
         has_elf_tls: version >= (10, 7),
         abi_return_struct_as_int: true,
diff --git a/src/librustc_target/spec/i686_pc_windows_gnu.rs b/src/librustc_target/spec/i686_pc_windows_gnu.rs
index 35fbf87573..2091902d7c 100644
--- a/src/librustc_target/spec/i686_pc_windows_gnu.rs
+++ b/src/librustc_target/spec/i686_pc_windows_gnu.rs
@@ -5,6 +5,7 @@ pub fn target() -> TargetResult {
     base.cpu = "pentium4".to_string();
     base.max_atomic_width = Some(64);
     base.eliminate_frame_pointer = false; // Required for backtraces
+    base.linker = Some("i686-w64-mingw32-gcc".to_string());
 
     // Mark all dynamic libraries and executables as compatible with the larger 4GiB address
     // space available to x86 Windows binaries on x86_64.
diff --git a/src/librustc_target/spec/i686_unknown_uefi.rs b/src/librustc_target/spec/i686_unknown_uefi.rs
index 345590a00b..e299f92fde 100644
--- a/src/librustc_target/spec/i686_unknown_uefi.rs
+++ b/src/librustc_target/spec/i686_unknown_uefi.rs
@@ -29,7 +29,7 @@ pub fn target() -> TargetResult {
     base.abi_return_struct_as_int = true;
 
     // Use -GNU here, because of the reason below:
-    // Backgound and Problem:
+    // Background and Problem:
     //   If we use i686-unknown-windows, the LLVM IA32 MSVC generates compiler intrinsic
     //   _alldiv, _aulldiv, _allrem, _aullrem, _allmul, which will cause undefined symbol.
     //   A real issue is __aulldiv() is referred by __udivdi3() - udivmod_inner!(), from
@@ -64,7 +64,7 @@ pub fn target() -> TargetResult {
     //      i386/umoddi3.S
     // Possible solution:
     //   1. Eliminate Intrinsics generation.
-    //      1.1 Choose differnt target to bypass isTargetKnownWindowsMSVC().
+    //      1.1 Choose different target to bypass isTargetKnownWindowsMSVC().
     //      1.2 Remove the "Setup Windows compiler runtime calls" in LLVM
     //   2. Implement Intrinsics.
     //   We evaluated all options.
diff --git a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
index f070a3e5da..e0a402533e 100644
--- a/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
+++ b/src/librustc_target/spec/nvptx64_nvidia_cuda.rs
@@ -23,7 +23,7 @@ pub fn target() -> TargetResult {
             // The linker can be installed from `crates.io`.
             linker: Some("rust-ptx-linker".to_string()),
 
-            // With `ptx-linker` approach, it can be later overriden via link flags.
+            // With `ptx-linker` approach, it can be later overridden via link flags.
             cpu: "sm_30".to_string(),
 
             // FIXME: create tests for the atomics.
@@ -43,7 +43,7 @@ pub fn target() -> TargetResult {
             // Let the `ptx-linker` to handle LLVM lowering into MC / assembly.
             obj_is_bitcode: true,
 
-            // Convinient and predicable naming scheme.
+            // Convenient and predicable naming scheme.
             dll_prefix: "".to_string(),
             dll_suffix: ".ptx".to_string(),
             exe_suffix: ".ptx".to_string(),
diff --git a/src/librustc_target/spec/thumb_base.rs b/src/librustc_target/spec/thumb_base.rs
index 204f4723b7..99ab996be9 100644
--- a/src/librustc_target/spec/thumb_base.rs
+++ b/src/librustc_target/spec/thumb_base.rs
@@ -50,6 +50,9 @@ pub fn opts() -> TargetOptions {
         // until we figure a way to add the pretty printers without requiring a volatile load cf.
         // rust-lang/rust#44993.
         emit_debug_gdb_scripts: false,
+        // LLVM is eager to trash the link register when calling `noreturn` functions, which
+        // breaks debugging. Preserve LR by default to prevent that from happening.
+        eliminate_frame_pointer: false,
         ..Default::default()
     }
 }
diff --git a/src/librustc_target/spec/windows_msvc_base.rs b/src/librustc_target/spec/windows_msvc_base.rs
index 63a443cd07..52b166df93 100644
--- a/src/librustc_target/spec/windows_msvc_base.rs
+++ b/src/librustc_target/spec/windows_msvc_base.rs
@@ -1,9 +1,11 @@
-use crate::spec::{LinkArgs, LinkerFlavor, TargetOptions};
+use crate::spec::{LinkArgs, LinkerFlavor, LldFlavor, TargetOptions};
 use std::default::Default;
 
 pub fn opts() -> TargetOptions {
+    let pre_args = vec!["/NOLOGO".to_string(), "/NXCOMPAT".to_string()];
     let mut args = LinkArgs::new();
-    args.insert(LinkerFlavor::Msvc, vec!["/NOLOGO".to_string(), "/NXCOMPAT".to_string()]);
+    args.insert(LinkerFlavor::Msvc, pre_args.clone());
+    args.insert(LinkerFlavor::Lld(LldFlavor::Link), pre_args);
 
     TargetOptions {
         function_sections: true,
@@ -21,6 +23,7 @@ pub fn opts() -> TargetOptions {
         // language packs, and avoid generating Non-UTF-8 error
         // messages if a link error occurred.
         link_env: vec![("VSLANG".to_string(), "1033".to_string())],
+        lld_flavor: LldFlavor::Link,
         pre_link_args: args,
         crt_static_allows_dylibs: true,
         crt_static_respected: true,
diff --git a/src/librustc_target/spec/x86_64_pc_windows_gnu.rs b/src/librustc_target/spec/x86_64_pc_windows_gnu.rs
index 8f523a3b6c..3d3acc682d 100644
--- a/src/librustc_target/spec/x86_64_pc_windows_gnu.rs
+++ b/src/librustc_target/spec/x86_64_pc_windows_gnu.rs
@@ -5,6 +5,7 @@ pub fn target() -> TargetResult {
     base.cpu = "x86-64".to_string();
     base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
     base.max_atomic_width = Some(64);
+    base.linker = Some("x86_64-w64-mingw32-gcc".to_string());
 
     Ok(Target {
         llvm_target: "x86_64-pc-windows-gnu".to_string(),
diff --git a/src/librustc_traits/Cargo.toml b/src/librustc_traits/Cargo.toml
index 2cb25e63f8..0dc3ad2983 100644
--- 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
-chalk-engine = { version = "0.9.0", default-features=false }
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
+rustc_infer = { path = "../librustc_infer" }
diff --git a/src/librustc_traits/chalk_context/mod.rs b/src/librustc_traits/chalk_context/mod.rs
deleted file mode 100644
index 0b18352df3..0000000000
--- a/src/librustc_traits/chalk_context/mod.rs
+++ /dev/null
@@ -1,638 +0,0 @@
-mod program_clauses;
-mod resolvent_ops;
-mod unify;
-
-use chalk_engine::fallible::Fallible;
-use chalk_engine::forest::Forest;
-use chalk_engine::{context, hh::HhGoal, DelayedLiteral, ExClause, Literal};
-use rustc::infer::canonical::{
-    Canonical, CanonicalVarValues, Certainty, OriginalQueryValues, QueryRegionConstraints,
-    QueryResponse,
-};
-use rustc::infer::{InferCtxt, LateBoundRegionConversionTime};
-use rustc::traits::{
-    self, ChalkCanonicalGoal, ChalkContextLift, Clause, DomainGoal, Environment, ExClauseFold,
-    Goal, GoalKind, InEnvironment, QuantifierKind,
-};
-use rustc::ty::fold::{TypeFoldable, TypeFolder, TypeVisitor};
-use rustc::ty::query::Providers;
-use rustc::ty::subst::{GenericArg, GenericArgKind};
-use rustc::ty::{self, TyCtxt};
-use rustc_macros::{Lift, TypeFoldable};
-use rustc_span::DUMMY_SP;
-
-use std::fmt::{self, Debug};
-use std::marker::PhantomData;
-
-use self::unify::*;
-
-#[derive(Copy, Clone, Debug)]
-crate struct ChalkArenas<'tcx> {
-    _phantom: PhantomData<&'tcx ()>,
-}
-
-#[derive(Copy, Clone)]
-crate struct ChalkContext<'tcx> {
-    _arenas: ChalkArenas<'tcx>,
-    tcx: TyCtxt<'tcx>,
-}
-
-#[derive(Copy, Clone)]
-crate struct ChalkInferenceContext<'cx, 'tcx> {
-    infcx: &'cx InferCtxt<'cx, 'tcx>,
-}
-
-#[derive(Copy, Clone, Debug)]
-crate struct UniverseMap;
-
-crate type RegionConstraint<'tcx> = ty::OutlivesPredicate<GenericArg<'tcx>, ty::Region<'tcx>>;
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash, TypeFoldable, Lift)]
-crate struct ConstrainedSubst<'tcx> {
-    subst: CanonicalVarValues<'tcx>,
-    constraints: Vec<RegionConstraint<'tcx>>,
-}
-
-impl context::Context for ChalkArenas<'tcx> {
-    type CanonicalExClause = Canonical<'tcx, ChalkExClause<'tcx>>;
-
-    type CanonicalGoalInEnvironment = Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>;
-
-    // u-canonicalization not yet implemented
-    type UCanonicalGoalInEnvironment = Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>;
-
-    type CanonicalConstrainedSubst = Canonical<'tcx, ConstrainedSubst<'tcx>>;
-
-    // u-canonicalization not yet implemented
-    type UniverseMap = UniverseMap;
-
-    type Solution = Canonical<'tcx, QueryResponse<'tcx, ()>>;
-
-    type InferenceNormalizedSubst = CanonicalVarValues<'tcx>;
-
-    type GoalInEnvironment = InEnvironment<'tcx, Goal<'tcx>>;
-
-    type RegionConstraint = RegionConstraint<'tcx>;
-
-    type Substitution = CanonicalVarValues<'tcx>;
-
-    type Environment = Environment<'tcx>;
-
-    type Goal = Goal<'tcx>;
-
-    type DomainGoal = DomainGoal<'tcx>;
-
-    type BindersGoal = ty::Binder<Goal<'tcx>>;
-
-    type Parameter = GenericArg<'tcx>;
-
-    type ProgramClause = Clause<'tcx>;
-
-    type ProgramClauses = Vec<Clause<'tcx>>;
-
-    type UnificationResult = UnificationResult<'tcx>;
-
-    type Variance = ty::Variance;
-
-    fn goal_in_environment(
-        env: &Environment<'tcx>,
-        goal: Goal<'tcx>,
-    ) -> InEnvironment<'tcx, Goal<'tcx>> {
-        env.with(goal)
-    }
-}
-
-impl context::AggregateOps<ChalkArenas<'tcx>> for ChalkContext<'tcx> {
-    fn make_solution(
-        &self,
-        root_goal: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-        mut simplified_answers: impl context::AnswerStream<ChalkArenas<'tcx>>,
-    ) -> Option<Canonical<'tcx, QueryResponse<'tcx, ()>>> {
-        use chalk_engine::SimplifiedAnswer;
-
-        debug!("make_solution(root_goal = {:?})", root_goal);
-
-        if simplified_answers.peek_answer().is_none() {
-            return None;
-        }
-
-        let SimplifiedAnswer { subst: constrained_subst, ambiguous } =
-            simplified_answers.next_answer().unwrap();
-
-        debug!("make_solution: ambiguous flag = {}", ambiguous);
-
-        let ambiguous = simplified_answers.peek_answer().is_some() || ambiguous;
-
-        let solution = constrained_subst.unchecked_map(|cs| match ambiguous {
-            true => QueryResponse {
-                var_values: cs.subst.make_identity(self.tcx),
-                region_constraints: QueryRegionConstraints::default(),
-                certainty: Certainty::Ambiguous,
-                value: (),
-            },
-
-            false => QueryResponse {
-                var_values: cs.subst,
-                region_constraints: QueryRegionConstraints::default(),
-
-                // FIXME: restore this later once we get better at handling regions
-                // region_constraints: cs.constraints
-                //     .into_iter()
-                //     .map(|c| ty::Binder::bind(c))
-                //     .collect(),
-                certainty: Certainty::Proven,
-                value: (),
-            },
-        });
-
-        debug!("make_solution: solution = {:?}", solution);
-
-        Some(solution)
-    }
-}
-
-impl context::ContextOps<ChalkArenas<'tcx>> for ChalkContext<'tcx> {
-    /// Returns `true` if this is a coinductive goal: basically proving that an auto trait
-    /// is implemented or proving that a trait reference is well-formed.
-    fn is_coinductive(&self, goal: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>) -> bool {
-        use rustc::traits::{WellFormed, WhereClause};
-
-        let mut goal = goal.value.goal;
-        loop {
-            match goal {
-                GoalKind::DomainGoal(domain_goal) => match domain_goal {
-                    DomainGoal::WellFormed(WellFormed::Trait(..)) => return true,
-                    DomainGoal::Holds(WhereClause::Implemented(trait_predicate)) => {
-                        return self.tcx.trait_is_auto(trait_predicate.def_id());
-                    }
-                    _ => return false,
-                },
-
-                GoalKind::Quantified(_, bound_goal) => goal = *bound_goal.skip_binder(),
-                _ => return false,
-            }
-        }
-    }
-
-    /// Creates an inference table for processing a new goal and instantiate that goal
-    /// in that context, returning "all the pieces".
-    ///
-    /// More specifically: given a u-canonical goal `arg`, creates a
-    /// new inference table `T` and populates it with the universes
-    /// found in `arg`. Then, creates a substitution `S` that maps
-    /// each bound variable in `arg` to a fresh inference variable
-    /// from T. Returns:
-    ///
-    /// - the table `T`,
-    /// - the substitution `S`,
-    /// - the environment and goal found by substitution `S` into `arg`.
-    fn instantiate_ucanonical_goal<R>(
-        &self,
-        arg: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-        op: impl context::WithInstantiatedUCanonicalGoal<ChalkArenas<'tcx>, Output = R>,
-    ) -> R {
-        self.tcx.infer_ctxt().enter_with_canonical(DUMMY_SP, arg, |ref infcx, arg, subst| {
-            let chalk_infcx = &mut ChalkInferenceContext { infcx };
-            op.with(chalk_infcx, subst, arg.environment, arg.goal)
-        })
-    }
-
-    fn instantiate_ex_clause<R>(
-        &self,
-        _num_universes: usize,
-        arg: &Canonical<'tcx, ChalkExClause<'tcx>>,
-        op: impl context::WithInstantiatedExClause<ChalkArenas<'tcx>, Output = R>,
-    ) -> R {
-        self.tcx.infer_ctxt().enter_with_canonical(DUMMY_SP, &arg.upcast(), |ref infcx, arg, _| {
-            let chalk_infcx = &mut ChalkInferenceContext { infcx };
-            op.with(chalk_infcx, arg)
-        })
-    }
-
-    /// Returns `true` if this solution has no region constraints.
-    fn empty_constraints(ccs: &Canonical<'tcx, ConstrainedSubst<'tcx>>) -> bool {
-        ccs.value.constraints.is_empty()
-    }
-
-    fn inference_normalized_subst_from_ex_clause(
-        canon_ex_clause: &'a Canonical<'tcx, ChalkExClause<'tcx>>,
-    ) -> &'a CanonicalVarValues<'tcx> {
-        &canon_ex_clause.value.subst
-    }
-
-    fn inference_normalized_subst_from_subst(
-        canon_subst: &'a Canonical<'tcx, ConstrainedSubst<'tcx>>,
-    ) -> &'a CanonicalVarValues<'tcx> {
-        &canon_subst.value.subst
-    }
-
-    fn canonical(
-        u_canon: &'a Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-    ) -> &'a Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>> {
-        u_canon
-    }
-
-    fn is_trivial_substitution(
-        u_canon: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-        canonical_subst: &Canonical<'tcx, ConstrainedSubst<'tcx>>,
-    ) -> bool {
-        let subst = &canonical_subst.value.subst;
-        assert_eq!(u_canon.variables.len(), subst.var_values.len());
-        subst.var_values.iter_enumerated().all(|(cvar, kind)| match kind.unpack() {
-            GenericArgKind::Lifetime(r) => match r {
-                &ty::ReLateBound(debruijn, br) => {
-                    debug_assert_eq!(debruijn, ty::INNERMOST);
-                    cvar == br.assert_bound_var()
-                }
-                _ => false,
-            },
-            GenericArgKind::Type(ty) => match ty.kind {
-                ty::Bound(debruijn, bound_ty) => {
-                    debug_assert_eq!(debruijn, ty::INNERMOST);
-                    cvar == bound_ty.var
-                }
-                _ => false,
-            },
-            GenericArgKind::Const(ct) => match ct.val {
-                ty::ConstKind::Bound(debruijn, bound_ct) => {
-                    debug_assert_eq!(debruijn, ty::INNERMOST);
-                    cvar == bound_ct
-                }
-                _ => false,
-            },
-        })
-    }
-
-    fn num_universes(canon: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>) -> usize {
-        canon.max_universe.index() + 1
-    }
-
-    /// Convert a goal G *from* the canonical universes *into* our
-    /// local universes. This will yield a goal G' that is the same
-    /// but for the universes of universally quantified names.
-    fn map_goal_from_canonical(
-        _map: &UniverseMap,
-        value: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-    ) -> Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>> {
-        *value // FIXME universe maps not implemented yet
-    }
-
-    fn map_subst_from_canonical(
-        _map: &UniverseMap,
-        value: &Canonical<'tcx, ConstrainedSubst<'tcx>>,
-    ) -> Canonical<'tcx, ConstrainedSubst<'tcx>> {
-        value.clone() // FIXME universe maps not implemented yet
-    }
-}
-
-impl context::InferenceTable<ChalkArenas<'tcx>, ChalkArenas<'tcx>>
-    for ChalkInferenceContext<'cx, 'tcx>
-{
-    fn into_goal(&self, domain_goal: DomainGoal<'tcx>) -> Goal<'tcx> {
-        self.infcx.tcx.mk_goal(GoalKind::DomainGoal(domain_goal))
-    }
-
-    fn cannot_prove(&self) -> Goal<'tcx> {
-        self.infcx.tcx.mk_goal(GoalKind::CannotProve)
-    }
-
-    fn into_hh_goal(&mut self, goal: Goal<'tcx>) -> ChalkHhGoal<'tcx> {
-        match *goal {
-            GoalKind::Implies(hypotheses, goal) => {
-                HhGoal::Implies(hypotheses.iter().cloned().collect(), goal)
-            }
-            GoalKind::And(left, right) => HhGoal::And(left, right),
-            GoalKind::Not(subgoal) => HhGoal::Not(subgoal),
-            GoalKind::DomainGoal(d) => HhGoal::DomainGoal(d),
-            GoalKind::Quantified(QuantifierKind::Universal, binder) => HhGoal::ForAll(binder),
-            GoalKind::Quantified(QuantifierKind::Existential, binder) => HhGoal::Exists(binder),
-            GoalKind::Subtype(a, b) => HhGoal::Unify(ty::Variance::Covariant, a.into(), b.into()),
-            GoalKind::CannotProve => HhGoal::CannotProve,
-        }
-    }
-
-    fn add_clauses(
-        &mut self,
-        env: &Environment<'tcx>,
-        clauses: Vec<Clause<'tcx>>,
-    ) -> Environment<'tcx> {
-        Environment {
-            clauses: self
-                .infcx
-                .tcx
-                .mk_clauses(env.clauses.iter().cloned().chain(clauses.into_iter())),
-        }
-    }
-}
-
-impl context::TruncateOps<ChalkArenas<'tcx>, ChalkArenas<'tcx>>
-    for ChalkInferenceContext<'cx, 'tcx>
-{
-    fn truncate_goal(
-        &mut self,
-        _subgoal: &InEnvironment<'tcx, Goal<'tcx>>,
-    ) -> Option<InEnvironment<'tcx, Goal<'tcx>>> {
-        None // FIXME we should truncate at some point!
-    }
-
-    fn truncate_answer(
-        &mut self,
-        _subst: &CanonicalVarValues<'tcx>,
-    ) -> Option<CanonicalVarValues<'tcx>> {
-        None // FIXME we should truncate at some point!
-    }
-}
-
-impl context::UnificationOps<ChalkArenas<'tcx>, ChalkArenas<'tcx>>
-    for ChalkInferenceContext<'cx, 'tcx>
-{
-    fn program_clauses(
-        &self,
-        environment: &Environment<'tcx>,
-        goal: &DomainGoal<'tcx>,
-    ) -> Vec<Clause<'tcx>> {
-        self.program_clauses_impl(environment, goal)
-    }
-
-    fn instantiate_binders_universally(&mut self, arg: &ty::Binder<Goal<'tcx>>) -> Goal<'tcx> {
-        self.infcx.replace_bound_vars_with_placeholders(arg).0
-    }
-
-    fn instantiate_binders_existentially(&mut self, arg: &ty::Binder<Goal<'tcx>>) -> Goal<'tcx> {
-        self.infcx
-            .replace_bound_vars_with_fresh_vars(
-                DUMMY_SP,
-                LateBoundRegionConversionTime::HigherRankedType,
-                arg,
-            )
-            .0
-    }
-
-    fn debug_ex_clause(&mut self, value: &'v ChalkExClause<'tcx>) -> Box<dyn Debug + 'v> {
-        let string = format!("{:?}", self.infcx.resolve_vars_if_possible(value));
-        Box::new(string)
-    }
-
-    fn canonicalize_goal(
-        &mut self,
-        value: &InEnvironment<'tcx, Goal<'tcx>>,
-    ) -> Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>> {
-        let mut _orig_values = OriginalQueryValues::default();
-        self.infcx.canonicalize_query(value, &mut _orig_values)
-    }
-
-    fn canonicalize_ex_clause(
-        &mut self,
-        value: &ChalkExClause<'tcx>,
-    ) -> Canonical<'tcx, ChalkExClause<'tcx>> {
-        self.infcx.canonicalize_response(value)
-    }
-
-    fn canonicalize_constrained_subst(
-        &mut self,
-        subst: CanonicalVarValues<'tcx>,
-        constraints: Vec<RegionConstraint<'tcx>>,
-    ) -> Canonical<'tcx, ConstrainedSubst<'tcx>> {
-        self.infcx.canonicalize_response(&ConstrainedSubst { subst, constraints })
-    }
-
-    fn u_canonicalize_goal(
-        &mut self,
-        value: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-    ) -> (Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>, UniverseMap) {
-        (*value, UniverseMap)
-    }
-
-    fn invert_goal(
-        &mut self,
-        _value: &InEnvironment<'tcx, Goal<'tcx>>,
-    ) -> Option<InEnvironment<'tcx, Goal<'tcx>>> {
-        panic!("goal inversion not yet implemented")
-    }
-
-    fn unify_parameters(
-        &mut self,
-        environment: &Environment<'tcx>,
-        variance: ty::Variance,
-        a: &GenericArg<'tcx>,
-        b: &GenericArg<'tcx>,
-    ) -> Fallible<UnificationResult<'tcx>> {
-        self.infcx.commit_if_ok(|_| {
-            unify(self.infcx, *environment, variance, a, b)
-                .map_err(|_| chalk_engine::fallible::NoSolution)
-        })
-    }
-
-    fn sink_answer_subset(
-        &self,
-        value: &Canonical<'tcx, ConstrainedSubst<'tcx>>,
-    ) -> Canonical<'tcx, ConstrainedSubst<'tcx>> {
-        value.clone()
-    }
-
-    fn lift_delayed_literal(
-        &self,
-        value: DelayedLiteral<ChalkArenas<'tcx>>,
-    ) -> DelayedLiteral<ChalkArenas<'tcx>> {
-        match self.infcx.tcx.lift(&value) {
-            Some(literal) => literal,
-            None => bug!("cannot lift {:?}", value),
-        }
-    }
-
-    fn into_ex_clause(
-        &mut self,
-        result: UnificationResult<'tcx>,
-        ex_clause: &mut ChalkExClause<'tcx>,
-    ) {
-        into_ex_clause(result, ex_clause);
-    }
-}
-
-crate fn into_ex_clause(result: UnificationResult<'tcx>, ex_clause: &mut ChalkExClause<'tcx>) {
-    ex_clause.subgoals.extend(result.goals.into_iter().map(Literal::Positive));
-
-    // FIXME: restore this later once we get better at handling regions
-    let _ = result.constraints.len(); // trick `-D dead-code`
-    // ex_clause.constraints.extend(result.constraints);
-}
-
-type ChalkHhGoal<'tcx> = HhGoal<ChalkArenas<'tcx>>;
-
-type ChalkExClause<'tcx> = ExClause<ChalkArenas<'tcx>>;
-
-impl Debug for ChalkContext<'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "ChalkContext")
-    }
-}
-
-impl Debug for ChalkInferenceContext<'cx, 'tcx> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "ChalkInferenceContext")
-    }
-}
-
-impl ChalkContextLift<'tcx> for ChalkArenas<'a> {
-    type LiftedExClause = ChalkExClause<'tcx>;
-    type LiftedDelayedLiteral = DelayedLiteral<ChalkArenas<'tcx>>;
-    type LiftedLiteral = Literal<ChalkArenas<'tcx>>;
-
-    fn lift_ex_clause_to_tcx(
-        ex_clause: &ChalkExClause<'a>,
-        tcx: TyCtxt<'tcx>,
-    ) -> Option<Self::LiftedExClause> {
-        Some(ChalkExClause {
-            subst: tcx.lift(&ex_clause.subst)?,
-            delayed_literals: tcx.lift(&ex_clause.delayed_literals)?,
-            constraints: tcx.lift(&ex_clause.constraints)?,
-            subgoals: tcx.lift(&ex_clause.subgoals)?,
-        })
-    }
-
-    fn lift_delayed_literal_to_tcx(
-        literal: &DelayedLiteral<ChalkArenas<'a>>,
-        tcx: TyCtxt<'tcx>,
-    ) -> Option<Self::LiftedDelayedLiteral> {
-        Some(match literal {
-            DelayedLiteral::CannotProve(()) => DelayedLiteral::CannotProve(()),
-            DelayedLiteral::Negative(index) => DelayedLiteral::Negative(*index),
-            DelayedLiteral::Positive(index, subst) => {
-                DelayedLiteral::Positive(*index, tcx.lift(subst)?)
-            }
-        })
-    }
-
-    fn lift_literal_to_tcx(
-        literal: &Literal<ChalkArenas<'a>>,
-        tcx: TyCtxt<'tcx>,
-    ) -> Option<Self::LiftedLiteral> {
-        Some(match literal {
-            Literal::Negative(goal) => Literal::Negative(tcx.lift(goal)?),
-            Literal::Positive(goal) => Literal::Positive(tcx.lift(goal)?),
-        })
-    }
-}
-
-impl ExClauseFold<'tcx> for ChalkArenas<'tcx> {
-    fn fold_ex_clause_with<F: TypeFolder<'tcx>>(
-        ex_clause: &ChalkExClause<'tcx>,
-        folder: &mut F,
-    ) -> ChalkExClause<'tcx> {
-        ExClause {
-            subst: ex_clause.subst.fold_with(folder),
-            delayed_literals: ex_clause.delayed_literals.fold_with(folder),
-            constraints: ex_clause.constraints.fold_with(folder),
-            subgoals: ex_clause.subgoals.fold_with(folder),
-        }
-    }
-
-    fn visit_ex_clause_with<V: TypeVisitor<'tcx>>(
-        ex_clause: &ExClause<Self>,
-        visitor: &mut V,
-    ) -> bool {
-        let ExClause { subst, delayed_literals, constraints, subgoals } = ex_clause;
-        subst.visit_with(visitor)
-            || delayed_literals.visit_with(visitor)
-            || constraints.visit_with(visitor)
-            || subgoals.visit_with(visitor)
-    }
-}
-
-trait Upcast<'tcx>: 'tcx {
-    type Upcasted: 'tcx;
-
-    fn upcast(&self) -> Self::Upcasted;
-}
-
-impl<'tcx> Upcast<'tcx> for DelayedLiteral<ChalkArenas<'tcx>> {
-    type Upcasted = DelayedLiteral<ChalkArenas<'tcx>>;
-
-    fn upcast(&self) -> Self::Upcasted {
-        match self {
-            &DelayedLiteral::CannotProve(..) => DelayedLiteral::CannotProve(()),
-            &DelayedLiteral::Negative(index) => DelayedLiteral::Negative(index),
-            DelayedLiteral::Positive(index, subst) => {
-                DelayedLiteral::Positive(*index, subst.clone())
-            }
-        }
-    }
-}
-
-impl<'tcx> Upcast<'tcx> for Literal<ChalkArenas<'tcx>> {
-    type Upcasted = Literal<ChalkArenas<'tcx>>;
-
-    fn upcast(&self) -> Self::Upcasted {
-        match self {
-            &Literal::Negative(goal) => Literal::Negative(goal),
-            &Literal::Positive(goal) => Literal::Positive(goal),
-        }
-    }
-}
-
-impl<'tcx> Upcast<'tcx> for ExClause<ChalkArenas<'tcx>> {
-    type Upcasted = ExClause<ChalkArenas<'tcx>>;
-
-    fn upcast(&self) -> Self::Upcasted {
-        ExClause {
-            subst: self.subst.clone(),
-            delayed_literals: self.delayed_literals.iter().map(|l| l.upcast()).collect(),
-            constraints: self.constraints.clone(),
-            subgoals: self.subgoals.iter().map(|g| g.upcast()).collect(),
-        }
-    }
-}
-
-impl<'tcx, T> Upcast<'tcx> for Canonical<'tcx, T>
-where
-    T: Upcast<'tcx>,
-{
-    type Upcasted = Canonical<'tcx, T::Upcasted>;
-
-    fn upcast(&self) -> Self::Upcasted {
-        Canonical {
-            max_universe: self.max_universe,
-            value: self.value.upcast(),
-            variables: self.variables,
-        }
-    }
-}
-
-crate fn provide(p: &mut Providers<'_>) {
-    *p = Providers { evaluate_goal, ..*p };
-}
-
-crate fn evaluate_goal<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    goal: ChalkCanonicalGoal<'tcx>,
-) -> Result<&'tcx Canonical<'tcx, QueryResponse<'tcx, ()>>, traits::query::NoSolution> {
-    use crate::lowering::Lower;
-    use rustc::traits::WellFormed;
-
-    let goal = goal.unchecked_map(|goal| InEnvironment {
-        environment: goal.environment,
-        goal: match goal.goal {
-            ty::Predicate::WellFormed(ty) => {
-                tcx.mk_goal(GoalKind::DomainGoal(DomainGoal::WellFormed(WellFormed::Ty(ty))))
-            }
-
-            ty::Predicate::Subtype(predicate) => tcx.mk_goal(GoalKind::Quantified(
-                QuantifierKind::Universal,
-                predicate.map_bound(|pred| tcx.mk_goal(GoalKind::Subtype(pred.a, pred.b))),
-            )),
-
-            other => tcx.mk_goal(GoalKind::from_poly_domain_goal(other.lower(), tcx)),
-        },
-    });
-
-    debug!("evaluate_goal(goal = {:?})", goal);
-
-    let context = ChalkContext { _arenas: ChalkArenas { _phantom: PhantomData }, tcx };
-
-    let mut forest = Forest::new(context);
-    let solution = forest.solve(&goal);
-
-    debug!("evaluate_goal: solution = {:?}", solution);
-
-    solution.map(|ok| Ok(&*tcx.arena.alloc(ok))).unwrap_or(Err(traits::query::NoSolution))
-}
diff --git a/src/librustc_traits/chalk_context/program_clauses/builtin.rs b/src/librustc_traits/chalk_context/program_clauses/builtin.rs
deleted file mode 100644
index 7512cbbd88..0000000000
--- a/src/librustc_traits/chalk_context/program_clauses/builtin.rs
+++ /dev/null
@@ -1,316 +0,0 @@
-use crate::generic_types;
-use crate::lowering::Lower;
-use rustc::traits::{Clause, GoalKind, ProgramClause, ProgramClauseCategory};
-use rustc::ty::subst::{GenericArg, InternalSubsts, Subst};
-use rustc::ty::{self, Ty, TyCtxt};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-
-/// Returns a predicate of the form
-/// `Implemented(ty: Trait) :- Implemented(nested: Trait)...`
-/// where `Trait` is specified by `trait_def_id`.
-fn builtin_impl_clause(
-    tcx: TyCtxt<'tcx>,
-    ty: Ty<'tcx>,
-    nested: &[GenericArg<'tcx>],
-    trait_def_id: DefId,
-) -> ProgramClause<'tcx> {
-    ProgramClause {
-        goal: ty::TraitPredicate {
-            trait_ref: ty::TraitRef { def_id: trait_def_id, substs: tcx.mk_substs_trait(ty, &[]) },
-        }
-        .lower(),
-        hypotheses: tcx.mk_goals(
-            nested
-                .iter()
-                .cloned()
-                .map(|nested_ty| ty::TraitRef {
-                    def_id: trait_def_id,
-                    substs: tcx.mk_substs_trait(nested_ty.expect_ty(), &[]),
-                })
-                .map(|trait_ref| ty::TraitPredicate { trait_ref })
-                .map(|pred| GoalKind::DomainGoal(pred.lower()))
-                .map(|goal_kind| tcx.mk_goal(goal_kind)),
-        ),
-        category: ProgramClauseCategory::Other,
-    }
-}
-
-crate fn assemble_builtin_unsize_impls<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    unsize_def_id: DefId,
-    source: Ty<'tcx>,
-    target: Ty<'tcx>,
-    clauses: &mut Vec<Clause<'tcx>>,
-) {
-    match (&source.kind, &target.kind) {
-        (ty::Dynamic(data_a, ..), ty::Dynamic(data_b, ..)) => {
-            if data_a.principal_def_id() != data_b.principal_def_id()
-                || data_b.auto_traits().any(|b| data_a.auto_traits().all(|a| a != b))
-            {
-                return;
-            }
-
-            // FIXME: rules for trait upcast
-        }
-
-        (_, &ty::Dynamic(..)) => {
-            // FIXME: basically, we should have something like:
-            // ```
-            // forall<T> {
-            //     Implemented(T: Unsize< for<...> dyn Trait<...> >) :-
-            //         for<...> Implemented(T: Trait<...>).
-            // }
-            // ```
-            // The question is: how to correctly handle the higher-ranked
-            // `for<...>` binder in order to have a generic rule?
-            // (Having generic rules is useful for caching, as we may be able
-            // to turn this function and others into tcx queries later on).
-        }
-
-        (ty::Array(_, length), ty::Slice(_)) => {
-            let ty_param = generic_types::bound(tcx, 0);
-            let array_ty = tcx.mk_ty(ty::Array(ty_param, length));
-            let slice_ty = tcx.mk_ty(ty::Slice(ty_param));
-
-            // `forall<T> { Implemented([T; N]: Unsize<[T]>). }`
-            let clause = ProgramClause {
-                goal: ty::TraitPredicate {
-                    trait_ref: ty::TraitRef {
-                        def_id: unsize_def_id,
-                        substs: tcx.mk_substs_trait(array_ty, &[slice_ty.into()]),
-                    },
-                }
-                .lower(),
-                hypotheses: ty::List::empty(),
-                category: ProgramClauseCategory::Other,
-            };
-
-            clauses.push(Clause::ForAll(ty::Binder::bind(clause)));
-        }
-
-        (ty::Infer(ty::TyVar(_)), _) | (_, ty::Infer(ty::TyVar(_))) => {
-            // FIXME: ambiguous
-        }
-
-        (ty::Adt(def_id_a, ..), ty::Adt(def_id_b, ..)) => {
-            if def_id_a != def_id_b {
-                return;
-            }
-
-            // FIXME: rules for struct unsizing
-        }
-
-        (&ty::Tuple(tys_a), &ty::Tuple(tys_b)) => {
-            if tys_a.len() != tys_b.len() {
-                return;
-            }
-
-            // FIXME: rules for tuple unsizing
-        }
-
-        _ => (),
-    }
-}
-
-crate fn assemble_builtin_sized_impls<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    sized_def_id: DefId,
-    ty: Ty<'tcx>,
-    clauses: &mut Vec<Clause<'tcx>>,
-) {
-    let mut push_builtin_impl = |ty: Ty<'tcx>, nested: &[GenericArg<'tcx>]| {
-        let clause = builtin_impl_clause(tcx, ty, nested, sized_def_id);
-        // Bind innermost bound vars that may exist in `ty` and `nested`.
-        clauses.push(Clause::ForAll(ty::Binder::bind(clause)));
-    };
-
-    match &ty.kind {
-        // Non parametric primitive types.
-        ty::Bool
-        | ty::Char
-        | ty::Int(..)
-        | ty::Uint(..)
-        | ty::Float(..)
-        | ty::Infer(ty::IntVar(_))
-        | ty::Infer(ty::FloatVar(_))
-        | ty::Error
-        | ty::Never => push_builtin_impl(ty, &[]),
-
-        // These ones are always `Sized`.
-        &ty::Array(_, length) => {
-            push_builtin_impl(tcx.mk_ty(ty::Array(generic_types::bound(tcx, 0), length)), &[]);
-        }
-        ty::RawPtr(ptr) => {
-            push_builtin_impl(generic_types::raw_ptr(tcx, ptr.mutbl), &[]);
-        }
-        &ty::Ref(_, _, mutbl) => {
-            push_builtin_impl(generic_types::ref_ty(tcx, mutbl), &[]);
-        }
-        ty::FnPtr(fn_ptr) => {
-            let fn_ptr = fn_ptr.skip_binder();
-            let fn_ptr = generic_types::fn_ptr(
-                tcx,
-                fn_ptr.inputs_and_output.len(),
-                fn_ptr.c_variadic,
-                fn_ptr.unsafety,
-                fn_ptr.abi,
-            );
-            push_builtin_impl(fn_ptr, &[]);
-        }
-        &ty::FnDef(def_id, ..) => {
-            push_builtin_impl(generic_types::fn_def(tcx, def_id), &[]);
-        }
-        &ty::Closure(def_id, ..) => {
-            push_builtin_impl(generic_types::closure(tcx, def_id), &[]);
-        }
-        &ty::Generator(def_id, ..) => {
-            push_builtin_impl(generic_types::generator(tcx, def_id), &[]);
-        }
-
-        // `Sized` if the last type is `Sized` (because else we will get a WF error anyway).
-        &ty::Tuple(type_list) => {
-            let type_list = generic_types::type_list(tcx, type_list.len());
-            push_builtin_impl(tcx.mk_ty(ty::Tuple(type_list)), &type_list);
-        }
-
-        // Struct def
-        ty::Adt(adt_def, _) => {
-            let substs = InternalSubsts::bound_vars_for_item(tcx, adt_def.did);
-            let adt = tcx.mk_ty(ty::Adt(adt_def, substs));
-            let sized_constraint = adt_def
-                .sized_constraint(tcx)
-                .iter()
-                .map(|ty| GenericArg::from(ty.subst(tcx, substs)))
-                .collect::<Vec<_>>();
-            push_builtin_impl(adt, &sized_constraint);
-        }
-
-        // Artificially trigger an ambiguity by adding two possible types to
-        // unify against.
-        ty::Infer(ty::TyVar(_)) => {
-            push_builtin_impl(tcx.types.i32, &[]);
-            push_builtin_impl(tcx.types.f32, &[]);
-        }
-
-        ty::Projection(_projection_ty) => {
-            // FIXME: add builtin impls from the associated type values found in
-            // trait impls of `projection_ty.trait_ref(tcx)`.
-        }
-
-        // The `Sized` bound can only come from the environment.
-        ty::Param(..) | ty::Placeholder(..) | ty::UnnormalizedProjection(..) => (),
-
-        // Definitely not `Sized`.
-        ty::Foreign(..) | ty::Str | ty::Slice(..) | ty::Dynamic(..) | ty::Opaque(..) => (),
-
-        ty::Bound(..)
-        | ty::GeneratorWitness(..)
-        | ty::Infer(ty::FreshTy(_))
-        | ty::Infer(ty::FreshIntTy(_))
-        | ty::Infer(ty::FreshFloatTy(_)) => bug!("unexpected type {:?}", ty),
-    }
-}
-
-crate fn assemble_builtin_copy_clone_impls<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    ty: Ty<'tcx>,
-    clauses: &mut Vec<Clause<'tcx>>,
-) {
-    let mut push_builtin_impl = |ty: Ty<'tcx>, nested: &[GenericArg<'tcx>]| {
-        let clause = builtin_impl_clause(tcx, ty, nested, trait_def_id);
-        // Bind innermost bound vars that may exist in `ty` and `nested`.
-        clauses.push(Clause::ForAll(ty::Binder::bind(clause)));
-    };
-
-    match &ty.kind {
-        // Implementations provided in libcore.
-        ty::Bool
-        | ty::Char
-        | ty::Int(..)
-        | ty::Uint(..)
-        | ty::Float(..)
-        | ty::RawPtr(..)
-        | ty::Never
-        | ty::Ref(_, _, hir::Mutability::Not) => (),
-
-        // Non parametric primitive types.
-        ty::Infer(ty::IntVar(_)) | ty::Infer(ty::FloatVar(_)) | ty::Error => {
-            push_builtin_impl(ty, &[])
-        }
-
-        // These implement `Copy`/`Clone` if their element types do.
-        &ty::Array(_, length) => {
-            let element_ty = generic_types::bound(tcx, 0);
-            push_builtin_impl(
-                tcx.mk_ty(ty::Array(element_ty, length)),
-                &[GenericArg::from(element_ty)],
-            );
-        }
-        &ty::Tuple(type_list) => {
-            let type_list = generic_types::type_list(tcx, type_list.len());
-            push_builtin_impl(tcx.mk_ty(ty::Tuple(type_list)), &**type_list);
-        }
-        &ty::Closure(def_id, ..) => {
-            let closure_ty = generic_types::closure(tcx, def_id);
-            let upvar_tys: Vec<_> = match &closure_ty.kind {
-                ty::Closure(_, substs) => substs
-                    .as_closure()
-                    .upvar_tys(def_id, tcx)
-                    .map(|ty| GenericArg::from(ty))
-                    .collect(),
-                _ => bug!(),
-            };
-            push_builtin_impl(closure_ty, &upvar_tys);
-        }
-
-        // These ones are always `Clone`.
-        ty::FnPtr(fn_ptr) => {
-            let fn_ptr = fn_ptr.skip_binder();
-            let fn_ptr = generic_types::fn_ptr(
-                tcx,
-                fn_ptr.inputs_and_output.len(),
-                fn_ptr.c_variadic,
-                fn_ptr.unsafety,
-                fn_ptr.abi,
-            );
-            push_builtin_impl(fn_ptr, &[]);
-        }
-        &ty::FnDef(def_id, ..) => {
-            push_builtin_impl(generic_types::fn_def(tcx, def_id), &[]);
-        }
-
-        // These depend on whatever user-defined impls might exist.
-        ty::Adt(_, _) => (),
-
-        // Artificially trigger an ambiguity by adding two possible types to
-        // unify against.
-        ty::Infer(ty::TyVar(_)) => {
-            push_builtin_impl(tcx.types.i32, &[]);
-            push_builtin_impl(tcx.types.f32, &[]);
-        }
-
-        ty::Projection(_projection_ty) => {
-            // FIXME: add builtin impls from the associated type values found in
-            // trait impls of `projection_ty.trait_ref(tcx)`.
-        }
-
-        // The `Copy`/`Clone` bound can only come from the environment.
-        ty::Param(..) | ty::Placeholder(..) | ty::UnnormalizedProjection(..) | ty::Opaque(..) => (),
-
-        // Definitely not `Copy`/`Clone`.
-        ty::Dynamic(..)
-        | ty::Foreign(..)
-        | ty::Generator(..)
-        | ty::Str
-        | ty::Slice(..)
-        | ty::Ref(_, _, hir::Mutability::Mut) => (),
-
-        ty::Bound(..)
-        | ty::GeneratorWitness(..)
-        | ty::Infer(ty::FreshTy(_))
-        | ty::Infer(ty::FreshIntTy(_))
-        | ty::Infer(ty::FreshFloatTy(_)) => bug!("unexpected type {:?}", ty),
-    }
-}
diff --git a/src/librustc_traits/chalk_context/program_clauses/mod.rs b/src/librustc_traits/chalk_context/program_clauses/mod.rs
deleted file mode 100644
index 38a4a72964..0000000000
--- a/src/librustc_traits/chalk_context/program_clauses/mod.rs
+++ /dev/null
@@ -1,300 +0,0 @@
-mod builtin;
-mod primitive;
-
-use super::ChalkInferenceContext;
-use rustc::traits::{
-    Clause, DomainGoal, Environment, FromEnv, ProgramClause, ProgramClauseCategory, WellFormed,
-};
-use rustc::ty::{self, TyCtxt};
-use rustc_hir::def_id::DefId;
-use std::iter;
-
-use self::builtin::*;
-use self::primitive::*;
-
-fn assemble_clauses_from_impls<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    clauses: &mut Vec<Clause<'tcx>>,
-) {
-    tcx.for_each_impl(trait_def_id, |impl_def_id| {
-        clauses.extend(tcx.program_clauses_for(impl_def_id).into_iter().cloned());
-    });
-}
-
-fn assemble_clauses_from_assoc_ty_values<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    trait_def_id: DefId,
-    clauses: &mut Vec<Clause<'tcx>>,
-) {
-    tcx.for_each_impl(trait_def_id, |impl_def_id| {
-        for def_id in tcx.associated_item_def_ids(impl_def_id).iter() {
-            clauses.extend(tcx.program_clauses_for(*def_id).into_iter().cloned());
-        }
-    });
-}
-
-impl ChalkInferenceContext<'cx, 'tcx> {
-    pub(super) fn program_clauses_impl(
-        &self,
-        environment: &Environment<'tcx>,
-        goal: &DomainGoal<'tcx>,
-    ) -> Vec<Clause<'tcx>> {
-        use rustc::infer::canonical::OriginalQueryValues;
-        use rustc::traits::WhereClause::*;
-
-        let goal = self.infcx.resolve_vars_if_possible(goal);
-
-        debug!("program_clauses(goal = {:?})", goal);
-
-        let mut clauses = match goal {
-            DomainGoal::Holds(Implemented(trait_predicate)) => {
-                // These come from:
-                // * implementations of the trait itself (rule `Implemented-From-Impl`)
-                // * the trait decl (rule `Implemented-From-Env`)
-
-                let mut clauses = vec![];
-
-                assemble_clauses_from_impls(self.infcx.tcx, trait_predicate.def_id(), &mut clauses);
-
-                if Some(trait_predicate.def_id()) == self.infcx.tcx.lang_items().sized_trait() {
-                    assemble_builtin_sized_impls(
-                        self.infcx.tcx,
-                        trait_predicate.def_id(),
-                        trait_predicate.self_ty(),
-                        &mut clauses,
-                    );
-                }
-
-                if Some(trait_predicate.def_id()) == self.infcx.tcx.lang_items().unsize_trait() {
-                    let source = trait_predicate.self_ty();
-                    let target = trait_predicate.trait_ref.substs.type_at(1);
-                    assemble_builtin_unsize_impls(
-                        self.infcx.tcx,
-                        trait_predicate.def_id(),
-                        source,
-                        target,
-                        &mut clauses,
-                    );
-                }
-
-                if Some(trait_predicate.def_id()) == self.infcx.tcx.lang_items().copy_trait() {
-                    assemble_builtin_copy_clone_impls(
-                        self.infcx.tcx,
-                        trait_predicate.def_id(),
-                        trait_predicate.self_ty(),
-                        &mut clauses,
-                    );
-                }
-
-                if Some(trait_predicate.def_id()) == self.infcx.tcx.lang_items().clone_trait() {
-                    // For all builtin impls, the conditions for `Copy` and
-                    // `Clone` are the same.
-                    assemble_builtin_copy_clone_impls(
-                        self.infcx.tcx,
-                        trait_predicate.def_id(),
-                        trait_predicate.self_ty(),
-                        &mut clauses,
-                    );
-                }
-
-                // FIXME: we need to add special rules for other builtin impls:
-                // * `Generator`
-                // * `FnOnce` / `FnMut` / `Fn`
-                // * trait objects
-                // * auto traits
-
-                // Rule `Implemented-From-Env` will be computed from the environment.
-                clauses
-            }
-
-            DomainGoal::Holds(ProjectionEq(projection_predicate)) => {
-                // These come from:
-                // * the assoc type definition (rule `ProjectionEq-Placeholder`)
-                // * normalization of the assoc ty values (rule `ProjectionEq-Normalize`)
-                // * implied bounds from trait definitions (rule `Implied-Bound-From-Trait`)
-                // * implied bounds from type definitions (rule `Implied-Bound-From-Type`)
-
-                let clauses = self
-                    .infcx
-                    .tcx
-                    .program_clauses_for(projection_predicate.projection_ty.item_def_id)
-                    .into_iter()
-                    // only select `ProjectionEq-Placeholder` and `ProjectionEq-Normalize`
-                    .filter(|clause| clause.category() == ProgramClauseCategory::Other)
-                    .cloned()
-                    .collect::<Vec<_>>();
-
-                // Rules `Implied-Bound-From-Trait` and `Implied-Bound-From-Type` will be computed
-                // from the environment.
-                clauses
-            }
-
-            // For outlive requirements, just assume they hold. `ResolventOps::resolvent_clause`
-            // will register them as actual region constraints later.
-            DomainGoal::Holds(RegionOutlives(..)) | DomainGoal::Holds(TypeOutlives(..)) => {
-                vec![Clause::Implies(ProgramClause {
-                    goal,
-                    hypotheses: ty::List::empty(),
-                    category: ProgramClauseCategory::Other,
-                })]
-            }
-
-            DomainGoal::WellFormed(WellFormed::Trait(trait_predicate)) => {
-                // These come from -- the trait decl (rule `WellFormed-TraitRef`).
-                self.infcx
-                    .tcx
-                    .program_clauses_for(trait_predicate.def_id())
-                    .into_iter()
-                    // only select `WellFormed-TraitRef`
-                    .filter(|clause| clause.category() == ProgramClauseCategory::WellFormed)
-                    .cloned()
-                    .collect()
-            }
-
-            DomainGoal::WellFormed(WellFormed::Ty(ty)) => {
-                // These come from:
-                // * the associated type definition if `ty` refers to an unnormalized
-                //   associated type (rule `WellFormed-AssocTy`)
-                // * custom rules for built-in types
-                // * the type definition otherwise (rule `WellFormed-Type`)
-                let clauses = match ty.kind {
-                    ty::Projection(data) => self.infcx.tcx.program_clauses_for(data.item_def_id),
-
-                    // These types are always WF.
-                    ty::Bool
-                    | ty::Char
-                    | ty::Int(..)
-                    | ty::Uint(..)
-                    | ty::Float(..)
-                    | ty::Str
-                    | ty::Param(..)
-                    | ty::Placeholder(..)
-                    | ty::Error
-                    | ty::Never => {
-                        let wf_clause = ProgramClause {
-                            goal,
-                            hypotheses: ty::List::empty(),
-                            category: ProgramClauseCategory::WellFormed,
-                        };
-                        let wf_clause = Clause::Implies(wf_clause);
-
-                        self.infcx.tcx.mk_clauses(iter::once(wf_clause))
-                    }
-
-                    // Always WF (recall that we do not check for parameters to be WF).
-                    ty::RawPtr(ptr) => wf_clause_for_raw_ptr(self.infcx.tcx, ptr.mutbl),
-
-                    // Always WF (recall that we do not check for parameters to be WF).
-                    ty::FnPtr(fn_ptr) => {
-                        let fn_ptr = fn_ptr.skip_binder();
-                        wf_clause_for_fn_ptr(
-                            self.infcx.tcx,
-                            fn_ptr.inputs_and_output.len(),
-                            fn_ptr.c_variadic,
-                            fn_ptr.unsafety,
-                            fn_ptr.abi,
-                        )
-                    }
-
-                    // WF if inner type is `Sized`.
-                    ty::Slice(..) => wf_clause_for_slice(self.infcx.tcx),
-
-                    // WF if inner type is `Sized`.
-                    ty::Array(_, length) => wf_clause_for_array(self.infcx.tcx, length),
-
-                    // WF if all types but the last one are `Sized`.
-                    ty::Tuple(types) => wf_clause_for_tuple(self.infcx.tcx, types.len()),
-
-                    // WF if `sub_ty` outlives `region`.
-                    ty::Ref(_, _, mutbl) => wf_clause_for_ref(self.infcx.tcx, mutbl),
-
-                    ty::FnDef(def_id, ..) => wf_clause_for_fn_def(self.infcx.tcx, def_id),
-
-                    ty::Dynamic(..) => {
-                        // FIXME: no rules yet for trait objects
-                        ty::List::empty()
-                    }
-
-                    ty::Adt(def, ..) => self.infcx.tcx.program_clauses_for(def.did),
-
-                    // FIXME: these are probably wrong
-                    ty::Foreign(def_id)
-                    | ty::Closure(def_id, ..)
-                    | ty::Generator(def_id, ..)
-                    | ty::Opaque(def_id, ..) => self.infcx.tcx.program_clauses_for(def_id),
-
-                    // Artificially trigger an ambiguity.
-                    ty::Infer(..) => {
-                        let tcx = self.infcx.tcx;
-                        let types = [tcx.types.i32, tcx.types.u32, tcx.types.f32, tcx.types.f64];
-                        let clauses = types
-                            .iter()
-                            .cloned()
-                            .map(|ty| ProgramClause {
-                                goal: DomainGoal::WellFormed(WellFormed::Ty(ty)),
-                                hypotheses: ty::List::empty(),
-                                category: ProgramClauseCategory::WellFormed,
-                            })
-                            .map(|clause| Clause::Implies(clause));
-                        tcx.mk_clauses(clauses)
-                    }
-
-                    ty::GeneratorWitness(..) | ty::UnnormalizedProjection(..) | ty::Bound(..) => {
-                        bug!("unexpected type {:?}", ty)
-                    }
-                };
-
-                clauses
-                    .into_iter()
-                    .filter(|clause| clause.category() == ProgramClauseCategory::WellFormed)
-                    .cloned()
-                    .collect()
-            }
-
-            DomainGoal::FromEnv(FromEnv::Trait(..)) => {
-                // These come from:
-                // * implied bounds from trait definitions (rule `Implied-Bound-From-Trait`)
-                // * implied bounds from type definitions (rule `Implied-Bound-From-Type`)
-                // * implied bounds from assoc type defs (rules `Implied-Trait-From-AssocTy`,
-                //   `Implied-Bound-From-AssocTy` and `Implied-WC-From-AssocTy`)
-
-                // All of these rules are computed in the environment.
-                vec![]
-            }
-
-            DomainGoal::FromEnv(FromEnv::Ty(..)) => {
-                // There are no `FromEnv::Ty(..) :- ...` rules (this predicate only
-                // comes from the environment).
-                vec![]
-            }
-
-            DomainGoal::Normalize(projection_predicate) => {
-                // These come from -- assoc ty values (rule `Normalize-From-Impl`).
-                let mut clauses = vec![];
-
-                assemble_clauses_from_assoc_ty_values(
-                    self.infcx.tcx,
-                    projection_predicate.projection_ty.trait_ref(self.infcx.tcx).def_id,
-                    &mut clauses,
-                );
-
-                clauses
-            }
-        };
-
-        debug!("program_clauses: clauses = {:?}", clauses);
-        debug!("program_clauses: adding clauses from environment = {:?}", environment);
-
-        let mut _orig_query_values = OriginalQueryValues::default();
-        let canonical_environment =
-            self.infcx.canonicalize_query(environment, &mut _orig_query_values).value;
-        let env_clauses = self.infcx.tcx.program_clauses_for_env(canonical_environment);
-
-        debug!("program_clauses: env_clauses = {:?}", env_clauses);
-
-        clauses.extend(env_clauses.into_iter().cloned());
-        clauses.extend(environment.clauses.iter().cloned());
-        clauses
-    }
-}
diff --git a/src/librustc_traits/chalk_context/program_clauses/primitive.rs b/src/librustc_traits/chalk_context/program_clauses/primitive.rs
deleted file mode 100644
index ae4afe5843..0000000000
--- a/src/librustc_traits/chalk_context/program_clauses/primitive.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-use crate::generic_types;
-use crate::lowering::Lower;
-use rustc::traits::{
-    Clause, Clauses, DomainGoal, GoalKind, ProgramClause, ProgramClauseCategory, WellFormed,
-};
-use rustc::ty::{self, TyCtxt};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_target::spec::abi;
-use std::iter;
-
-crate fn wf_clause_for_raw_ptr(tcx: TyCtxt<'_>, mutbl: hir::Mutability) -> Clauses<'_> {
-    let ptr_ty = generic_types::raw_ptr(tcx, mutbl);
-
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(ptr_ty)),
-        hypotheses: ty::List::empty(),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::Implies(wf_clause);
-
-    // `forall<T> { WellFormed(*const T). }`
-    tcx.mk_clauses(iter::once(wf_clause))
-}
-
-crate fn wf_clause_for_fn_ptr(
-    tcx: TyCtxt<'_>,
-    arity_and_output: usize,
-    variadic: bool,
-    unsafety: hir::Unsafety,
-    abi: abi::Abi,
-) -> Clauses<'_> {
-    let fn_ptr = generic_types::fn_ptr(tcx, arity_and_output, variadic, unsafety, abi);
-
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(fn_ptr)),
-        hypotheses: ty::List::empty(),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::ForAll(ty::Binder::bind(wf_clause));
-
-    // `forall <T1, ..., Tn+1> { WellFormed(for<> fn(T1, ..., Tn) -> Tn+1). }`
-    // where `n + 1` == `arity_and_output`
-    tcx.mk_clauses(iter::once(wf_clause))
-}
-
-crate fn wf_clause_for_slice(tcx: TyCtxt<'_>) -> Clauses<'_> {
-    let ty = generic_types::bound(tcx, 0);
-    let slice_ty = tcx.mk_slice(ty);
-
-    let sized_trait = match tcx.lang_items().sized_trait() {
-        Some(def_id) => def_id,
-        None => return ty::List::empty(),
-    };
-    let sized_implemented =
-        ty::TraitRef { def_id: sized_trait, substs: tcx.mk_substs_trait(ty, ty::List::empty()) };
-    let sized_implemented: DomainGoal<'_> =
-        ty::TraitPredicate { trait_ref: sized_implemented }.lower();
-
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(slice_ty)),
-        hypotheses: tcx.mk_goals(iter::once(tcx.mk_goal(GoalKind::DomainGoal(sized_implemented)))),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::ForAll(ty::Binder::bind(wf_clause));
-
-    // `forall<T> { WellFormed([T]) :- Implemented(T: Sized). }`
-    tcx.mk_clauses(iter::once(wf_clause))
-}
-
-crate fn wf_clause_for_array<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    length: &'tcx ty::Const<'tcx>,
-) -> Clauses<'tcx> {
-    let ty = generic_types::bound(tcx, 0);
-    let array_ty = tcx.mk_ty(ty::Array(ty, length));
-
-    let sized_trait = match tcx.lang_items().sized_trait() {
-        Some(def_id) => def_id,
-        None => return ty::List::empty(),
-    };
-    let sized_implemented =
-        ty::TraitRef { def_id: sized_trait, substs: tcx.mk_substs_trait(ty, ty::List::empty()) };
-    let sized_implemented: DomainGoal<'_> =
-        ty::TraitPredicate { trait_ref: sized_implemented }.lower();
-
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(array_ty)),
-        hypotheses: tcx.mk_goals(iter::once(tcx.mk_goal(GoalKind::DomainGoal(sized_implemented)))),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::ForAll(ty::Binder::bind(wf_clause));
-
-    // `forall<T> { WellFormed([T; length]) :- Implemented(T: Sized). }`
-    tcx.mk_clauses(iter::once(wf_clause))
-}
-
-crate fn wf_clause_for_tuple(tcx: TyCtxt<'_>, arity: usize) -> Clauses<'_> {
-    let type_list = generic_types::type_list(tcx, arity);
-    let tuple_ty = tcx.mk_ty(ty::Tuple(type_list));
-
-    let sized_trait = match tcx.lang_items().sized_trait() {
-        Some(def_id) => def_id,
-        None => return ty::List::empty(),
-    };
-
-    // If `arity == 0` (i.e. the unit type) or `arity == 1`, this list of
-    // hypotheses is actually empty.
-    let sized_implemented = type_list[0..std::cmp::max(arity, 1) - 1]
-        .iter()
-        .map(|ty| ty::TraitRef {
-            def_id: sized_trait,
-            substs: tcx.mk_substs_trait(ty.expect_ty(), ty::List::empty()),
-        })
-        .map(|trait_ref| ty::TraitPredicate { trait_ref })
-        .map(|predicate| predicate.lower());
-
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(tuple_ty)),
-        hypotheses: tcx.mk_goals(
-            sized_implemented.map(|domain_goal| tcx.mk_goal(GoalKind::DomainGoal(domain_goal))),
-        ),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::ForAll(ty::Binder::bind(wf_clause));
-
-    // ```
-    // forall<T1, ..., Tn-1, Tn> {
-    //     WellFormed((T1, ..., Tn)) :-
-    //         Implemented(T1: Sized),
-    //         ...
-    //         Implemented(Tn-1: Sized).
-    // }
-    // ```
-    tcx.mk_clauses(iter::once(wf_clause))
-}
-
-crate fn wf_clause_for_ref(tcx: TyCtxt<'_>, mutbl: hir::Mutability) -> Clauses<'_> {
-    let region = tcx.mk_region(ty::ReLateBound(ty::INNERMOST, ty::BoundRegion::BrAnon(0)));
-    let ty = generic_types::bound(tcx, 1);
-    let ref_ty = tcx.mk_ref(region, ty::TypeAndMut { ty, mutbl });
-
-    let outlives: DomainGoal<'_> = ty::OutlivesPredicate(ty, region).lower();
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(ref_ty)),
-        hypotheses: tcx.mk_goals(iter::once(tcx.mk_goal(outlives.into_goal()))),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::ForAll(ty::Binder::bind(wf_clause));
-
-    // `forall<'a, T> { WellFormed(&'a T) :- Outlives(T: 'a). }`
-    tcx.mk_clauses(iter::once(wf_clause))
-}
-
-crate fn wf_clause_for_fn_def(tcx: TyCtxt<'_>, def_id: DefId) -> Clauses<'_> {
-    let fn_def = generic_types::fn_def(tcx, def_id);
-
-    let wf_clause = ProgramClause {
-        goal: DomainGoal::WellFormed(WellFormed::Ty(fn_def)),
-        hypotheses: ty::List::empty(),
-        category: ProgramClauseCategory::WellFormed,
-    };
-    let wf_clause = Clause::ForAll(ty::Binder::bind(wf_clause));
-
-    // `forall <T1, ..., Tn+1> { WellFormed(fn some_fn(T1, ..., Tn) -> Tn+1). }`
-    // where `def_id` maps to the `some_fn` function definition
-    tcx.mk_clauses(iter::once(wf_clause))
-}
diff --git a/src/librustc_traits/chalk_context/resolvent_ops.rs b/src/librustc_traits/chalk_context/resolvent_ops.rs
deleted file mode 100644
index 70e3c4c7ab..0000000000
--- a/src/librustc_traits/chalk_context/resolvent_ops.rs
+++ /dev/null
@@ -1,293 +0,0 @@
-use chalk_engine::fallible::{Fallible, NoSolution};
-use chalk_engine::{context, ExClause, Literal};
-use rustc::infer::canonical::{Canonical, CanonicalVarValues};
-use rustc::infer::{InferCtxt, LateBoundRegionConversionTime};
-use rustc::traits::{
-    Clause, DomainGoal, Environment, Goal, GoalKind, InEnvironment, ProgramClause, WhereClause,
-};
-use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
-use rustc::ty::subst::GenericArg;
-use rustc::ty::{self, Ty, TyCtxt};
-use rustc_span::DUMMY_SP;
-
-use super::unify::*;
-use super::{ChalkArenas, ChalkExClause, ChalkInferenceContext, ConstrainedSubst};
-
-impl context::ResolventOps<ChalkArenas<'tcx>, ChalkArenas<'tcx>>
-    for ChalkInferenceContext<'cx, 'tcx>
-{
-    fn resolvent_clause(
-        &mut self,
-        environment: &Environment<'tcx>,
-        goal: &DomainGoal<'tcx>,
-        subst: &CanonicalVarValues<'tcx>,
-        clause: &Clause<'tcx>,
-    ) -> Fallible<Canonical<'tcx, ChalkExClause<'tcx>>> {
-        use chalk_engine::context::UnificationOps;
-
-        debug!("resolvent_clause(goal = {:?}, clause = {:?})", goal, clause);
-
-        let result = self.infcx.probe(|_| {
-            let ProgramClause { goal: consequence, hypotheses, .. } = match clause {
-                Clause::Implies(program_clause) => *program_clause,
-                Clause::ForAll(program_clause) => {
-                    self.infcx
-                        .replace_bound_vars_with_fresh_vars(
-                            DUMMY_SP,
-                            LateBoundRegionConversionTime::HigherRankedType,
-                            program_clause,
-                        )
-                        .0
-                }
-            };
-
-            let result =
-                unify(self.infcx, *environment, ty::Variance::Invariant, goal, &consequence)
-                    .map_err(|_| NoSolution)?;
-
-            let mut ex_clause = ExClause {
-                subst: subst.clone(),
-                delayed_literals: vec![],
-                constraints: vec![],
-                subgoals: vec![],
-            };
-
-            self.into_ex_clause(result, &mut ex_clause);
-
-            ex_clause.subgoals.extend(hypotheses.iter().map(|g| match g {
-                GoalKind::Not(g) => Literal::Negative(environment.with(*g)),
-                g => Literal::Positive(environment.with(*g)),
-            }));
-
-            // If we have a goal of the form `T: 'a` or `'a: 'b`, then just
-            // assume it is true (no subgoals) and register it as a constraint
-            // instead.
-            match goal {
-                DomainGoal::Holds(WhereClause::RegionOutlives(pred)) => {
-                    assert_eq!(ex_clause.subgoals.len(), 0);
-                    ex_clause.constraints.push(ty::OutlivesPredicate(pred.0.into(), pred.1));
-                }
-
-                DomainGoal::Holds(WhereClause::TypeOutlives(pred)) => {
-                    assert_eq!(ex_clause.subgoals.len(), 0);
-                    ex_clause.constraints.push(ty::OutlivesPredicate(pred.0.into(), pred.1));
-                }
-
-                _ => (),
-            };
-
-            let canonical_ex_clause = self.canonicalize_ex_clause(&ex_clause);
-            Ok(canonical_ex_clause)
-        });
-
-        debug!("resolvent_clause: result = {:?}", result);
-        result
-    }
-
-    fn apply_answer_subst(
-        &mut self,
-        ex_clause: ChalkExClause<'tcx>,
-        selected_goal: &InEnvironment<'tcx, Goal<'tcx>>,
-        answer_table_goal: &Canonical<'tcx, InEnvironment<'tcx, Goal<'tcx>>>,
-        canonical_answer_subst: &Canonical<'tcx, ConstrainedSubst<'tcx>>,
-    ) -> Fallible<ChalkExClause<'tcx>> {
-        debug!(
-            "apply_answer_subst(ex_clause = {:?}, selected_goal = {:?})",
-            self.infcx.resolve_vars_if_possible(&ex_clause),
-            self.infcx.resolve_vars_if_possible(selected_goal)
-        );
-
-        let (answer_subst, _) = self
-            .infcx
-            .instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, canonical_answer_subst);
-
-        let mut substitutor = AnswerSubstitutor {
-            infcx: self.infcx,
-            environment: selected_goal.environment,
-            answer_subst: answer_subst.subst,
-            binder_index: ty::INNERMOST,
-            ex_clause,
-        };
-
-        substitutor.relate(&answer_table_goal.value, &selected_goal).map_err(|_| NoSolution)?;
-
-        let mut ex_clause = substitutor.ex_clause;
-        ex_clause.constraints.extend(answer_subst.constraints);
-
-        debug!("apply_answer_subst: ex_clause = {:?}", ex_clause);
-        Ok(ex_clause)
-    }
-}
-
-struct AnswerSubstitutor<'cx, 'tcx> {
-    infcx: &'cx InferCtxt<'cx, 'tcx>,
-    environment: Environment<'tcx>,
-    answer_subst: CanonicalVarValues<'tcx>,
-    binder_index: ty::DebruijnIndex,
-    ex_clause: ChalkExClause<'tcx>,
-}
-
-impl AnswerSubstitutor<'cx, 'tcx> {
-    fn unify_free_answer_var(
-        &mut self,
-        answer_var: ty::BoundVar,
-        pending: GenericArg<'tcx>,
-    ) -> RelateResult<'tcx, ()> {
-        let answer_param = &self.answer_subst.var_values[answer_var];
-        let pending =
-            &ty::fold::shift_out_vars(self.infcx.tcx, &pending, self.binder_index.as_u32());
-
-        super::into_ex_clause(
-            unify(self.infcx, self.environment, ty::Variance::Invariant, answer_param, pending)?,
-            &mut self.ex_clause,
-        );
-
-        Ok(())
-    }
-}
-
-impl TypeRelation<'tcx> for AnswerSubstitutor<'cx, 'tcx> {
-    fn tcx(&self) -> TyCtxt<'tcx> {
-        self.infcx.tcx
-    }
-
-    fn param_env(&self) -> ty::ParamEnv<'tcx> {
-        // FIXME(oli-obk): learn chalk and create param envs
-        ty::ParamEnv::empty()
-    }
-
-    fn tag(&self) -> &'static str {
-        "chalk_context::answer_substitutor"
-    }
-
-    fn a_is_expected(&self) -> bool {
-        true
-    }
-
-    fn relate_with_variance<T: Relate<'tcx>>(
-        &mut self,
-        _variance: ty::Variance,
-        a: &T,
-        b: &T,
-    ) -> RelateResult<'tcx, T> {
-        // We don't care about variance.
-        self.relate(a, b)
-    }
-
-    fn binders<T: Relate<'tcx>>(
-        &mut self,
-        a: &ty::Binder<T>,
-        b: &ty::Binder<T>,
-    ) -> RelateResult<'tcx, ty::Binder<T>> {
-        self.binder_index.shift_in(1);
-        let result = self.relate(a.skip_binder(), b.skip_binder())?;
-        self.binder_index.shift_out(1);
-        Ok(ty::Binder::bind(result))
-    }
-
-    fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
-        let b = self.infcx.shallow_resolve(b);
-        debug!("AnswerSubstitutor::tys(a = {:?}, b = {:?})", a, b);
-
-        if let &ty::Bound(debruijn, bound_ty) = &a.kind {
-            // Free bound var
-            if debruijn == self.binder_index {
-                self.unify_free_answer_var(bound_ty.var, b.into())?;
-                return Ok(b);
-            }
-        }
-
-        match (&a.kind, &b.kind) {
-            (&ty::Bound(a_debruijn, a_bound), &ty::Bound(b_debruijn, b_bound)) => {
-                assert_eq!(a_debruijn, b_debruijn);
-                assert_eq!(a_bound.var, b_bound.var);
-                Ok(a)
-            }
-
-            // Those should have been canonicalized away.
-            (ty::Placeholder(..), _) => {
-                bug!("unexpected placeholder ty in `AnswerSubstitutor`: {:?} ", a);
-            }
-
-            // Everything else should just be a perfect match as well,
-            // and we forbid inference variables.
-            _ => match ty::relate::super_relate_tys(self, a, b) {
-                Ok(ty) => Ok(ty),
-                Err(err) => bug!("type mismatch in `AnswerSubstitutor`: {}", err),
-            },
-        }
-    }
-
-    fn regions(
-        &mut self,
-        a: ty::Region<'tcx>,
-        b: ty::Region<'tcx>,
-    ) -> RelateResult<'tcx, ty::Region<'tcx>> {
-        let b = match b {
-            &ty::ReVar(vid) => self
-                .infcx
-                .borrow_region_constraints()
-                .opportunistic_resolve_var(self.infcx.tcx, vid),
-
-            other => other,
-        };
-
-        if let &ty::ReLateBound(debruijn, bound) = a {
-            // Free bound region
-            if debruijn == self.binder_index {
-                self.unify_free_answer_var(bound.assert_bound_var(), b.into())?;
-                return Ok(b);
-            }
-        }
-
-        match (a, b) {
-            (&ty::ReLateBound(a_debruijn, a_bound), &ty::ReLateBound(b_debruijn, b_bound)) => {
-                assert_eq!(a_debruijn, b_debruijn);
-                assert_eq!(a_bound.assert_bound_var(), b_bound.assert_bound_var());
-            }
-
-            (ty::ReStatic, ty::ReStatic)
-            | (ty::ReErased, ty::ReErased)
-            | (ty::ReEmpty, ty::ReEmpty) => (),
-
-            (&ty::ReFree(a_free), &ty::ReFree(b_free)) => {
-                assert_eq!(a_free, b_free);
-            }
-
-            _ => bug!("unexpected regions in `AnswerSubstitutor`: {:?}, {:?}", a, b),
-        }
-
-        Ok(a)
-    }
-
-    fn consts(
-        &mut self,
-        a: &'tcx ty::Const<'tcx>,
-        b: &'tcx ty::Const<'tcx>,
-    ) -> RelateResult<'tcx, &'tcx ty::Const<'tcx>> {
-        if let ty::Const { val: ty::ConstKind::Bound(debruijn, bound_ct), .. } = a {
-            if *debruijn == self.binder_index {
-                self.unify_free_answer_var(*bound_ct, b.into())?;
-                return Ok(b);
-            }
-        }
-
-        match (a, b) {
-            (
-                ty::Const { val: ty::ConstKind::Bound(a_debruijn, a_bound), .. },
-                ty::Const { val: ty::ConstKind::Bound(b_debruijn, b_bound), .. },
-            ) => {
-                assert_eq!(a_debruijn, b_debruijn);
-                assert_eq!(a_bound, b_bound);
-                Ok(a)
-            }
-
-            // Everything else should just be a perfect match as well,
-            // and we forbid inference variables.
-            _ => match ty::relate::super_relate_consts(self, a, b) {
-                Ok(ct) => Ok(ct),
-                Err(err) => bug!("const mismatch in `AnswerSubstitutor`: {}", err),
-            },
-        }
-    }
-}
diff --git a/src/librustc_traits/chalk_context/unify.rs b/src/librustc_traits/chalk_context/unify.rs
deleted file mode 100644
index fcb3c3b177..0000000000
--- a/src/librustc_traits/chalk_context/unify.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-use rustc::infer::nll_relate::{NormalizationStrategy, TypeRelating, TypeRelatingDelegate};
-use rustc::infer::{InferCtxt, RegionVariableOrigin};
-use rustc::traits::{DomainGoal, Environment, Goal, InEnvironment};
-use rustc::ty;
-use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
-use rustc_span::DUMMY_SP;
-
-crate struct UnificationResult<'tcx> {
-    crate goals: Vec<InEnvironment<'tcx, Goal<'tcx>>>,
-    crate constraints: Vec<super::RegionConstraint<'tcx>>,
-}
-
-crate fn unify<'me, 'tcx, T: Relate<'tcx>>(
-    infcx: &'me InferCtxt<'me, 'tcx>,
-    environment: Environment<'tcx>,
-    variance: ty::Variance,
-    a: &T,
-    b: &T,
-) -> RelateResult<'tcx, UnificationResult<'tcx>> {
-    debug!(
-        "unify(
-        a = {:?},
-        b = {:?},
-        environment = {:?},
-    )",
-        a, b, environment
-    );
-
-    let mut delegate = ChalkTypeRelatingDelegate::new(infcx, environment);
-
-    TypeRelating::new(infcx, &mut delegate, variance).relate(a, b)?;
-
-    debug!("unify: goals = {:?}, constraints = {:?}", delegate.goals, delegate.constraints);
-
-    Ok(UnificationResult { goals: delegate.goals, constraints: delegate.constraints })
-}
-
-struct ChalkTypeRelatingDelegate<'me, 'tcx> {
-    infcx: &'me InferCtxt<'me, 'tcx>,
-    environment: Environment<'tcx>,
-    goals: Vec<InEnvironment<'tcx, Goal<'tcx>>>,
-    constraints: Vec<super::RegionConstraint<'tcx>>,
-}
-
-impl ChalkTypeRelatingDelegate<'me, 'tcx> {
-    fn new(infcx: &'me InferCtxt<'me, 'tcx>, environment: Environment<'tcx>) -> Self {
-        Self { infcx, environment, goals: Vec::new(), constraints: Vec::new() }
-    }
-}
-
-impl TypeRelatingDelegate<'tcx> for &mut ChalkTypeRelatingDelegate<'_, 'tcx> {
-    fn create_next_universe(&mut self) -> ty::UniverseIndex {
-        self.infcx.create_next_universe()
-    }
-
-    fn next_existential_region_var(&mut self, _was_placeholder: bool) -> ty::Region<'tcx> {
-        self.infcx.next_region_var(RegionVariableOrigin::MiscVariable(DUMMY_SP))
-    }
-
-    fn next_placeholder_region(&mut self, placeholder: ty::PlaceholderRegion) -> ty::Region<'tcx> {
-        self.infcx.tcx.mk_region(ty::RePlaceholder(placeholder))
-    }
-
-    fn generalize_existential(&mut self, universe: ty::UniverseIndex) -> ty::Region<'tcx> {
-        self.infcx
-            .next_region_var_in_universe(RegionVariableOrigin::MiscVariable(DUMMY_SP), universe)
-    }
-
-    fn push_outlives(&mut self, sup: ty::Region<'tcx>, sub: ty::Region<'tcx>) {
-        self.constraints.push(ty::OutlivesPredicate(sup.into(), sub));
-    }
-
-    fn push_domain_goal(&mut self, domain_goal: DomainGoal<'tcx>) {
-        let goal = self.environment.with(self.infcx.tcx.mk_goal(domain_goal.into_goal()));
-        self.goals.push(goal);
-    }
-
-    fn normalization() -> NormalizationStrategy {
-        NormalizationStrategy::Lazy
-    }
-
-    fn forbid_inference_vars() -> bool {
-        false
-    }
-}
diff --git a/src/librustc_traits/dropck_outlives.rs b/src/librustc_traits/dropck_outlives.rs
index bc4d03cca7..2f854c045e 100644
--- a/src/librustc_traits/dropck_outlives.rs
+++ b/src/librustc_traits/dropck_outlives.rs
@@ -1,13 +1,14 @@
-use rustc::infer::canonical::{Canonical, QueryResponse};
-use rustc::traits::query::dropck_outlives::trivial_dropck_outlives;
-use rustc::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint};
-use rustc::traits::query::{CanonicalTyGoal, NoSolution};
-use rustc::traits::{Normalized, ObligationCause, TraitEngine, TraitEngineExt};
 use rustc::ty::query::Providers;
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir::def_id::DefId;
+use rustc_infer::infer::canonical::{Canonical, QueryResponse};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits::query::dropck_outlives::trivial_dropck_outlives;
+use rustc_infer::traits::query::dropck_outlives::{DropckOutlivesResult, DtorckConstraint};
+use rustc_infer::traits::query::{CanonicalTyGoal, NoSolution};
+use rustc_infer::traits::{Normalized, ObligationCause, TraitEngine, TraitEngineExt};
 use rustc_span::source_map::{Span, DUMMY_SP};
 
 crate fn provide(p: &mut Providers<'_>) {
@@ -91,7 +92,7 @@ fn dropck_outlives<'tcx>(
                 // information and will just decrease the speed at which we can emit these errors
                 // (since we'll be printing for just that much longer for the often enormous types
                 // that result here).
-                if result.overflows.len() >= 1 {
+                if !result.overflows.is_empty() {
                     break;
                 }
 
@@ -227,8 +228,8 @@ fn dtorck_constraint_for_ty<'tcx>(
             // In particular, skipping over `_interior` is safe
             // because any side-effects from dropping `_interior` can
             // only take place through references with lifetimes
-            // derived from lifetimes attached to the upvars, and we
-            // *do* incorporate the upvars here.
+            // derived from lifetimes attached to the upvars and resume
+            // argument, and we *do* incorporate those here.
 
             constraints.outlives.extend(
                 substs
@@ -236,6 +237,7 @@ fn dtorck_constraint_for_ty<'tcx>(
                     .upvar_tys(def_id, tcx)
                     .map(|t| -> ty::subst::GenericArg<'tcx> { t.into() }),
             );
+            constraints.outlives.push(substs.as_generator().resume_ty(def_id, tcx).into());
         }
 
         ty::Adt(def, substs) => {
diff --git a/src/librustc_traits/evaluate_obligation.rs b/src/librustc_traits/evaluate_obligation.rs
index 3ad1b223a8..4cf5b66b3c 100644
--- a/src/librustc_traits/evaluate_obligation.rs
+++ b/src/librustc_traits/evaluate_obligation.rs
@@ -1,9 +1,10 @@
-use rustc::traits::query::CanonicalPredicateGoal;
-use rustc::traits::{
-    EvaluationResult, Obligation, ObligationCause, OverflowError, SelectionContext, TraitQueryMode,
-};
 use rustc::ty::query::Providers;
 use rustc::ty::{ParamEnvAnd, TyCtxt};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits::query::CanonicalPredicateGoal;
+use rustc_infer::traits::{
+    EvaluationResult, Obligation, ObligationCause, OverflowError, SelectionContext, TraitQueryMode,
+};
 use rustc_span::source_map::DUMMY_SP;
 
 crate fn provide(p: &mut Providers<'_>) {
diff --git a/src/librustc_traits/generic_types.rs b/src/librustc_traits/generic_types.rs
deleted file mode 100644
index e1a9ec56f8..0000000000
--- a/src/librustc_traits/generic_types.rs
+++ /dev/null
@@ -1,67 +0,0 @@
-//! Utilities for creating generic types with bound vars in place of parameter values.
-
-use rustc::ty::subst::{GenericArg, InternalSubsts, SubstsRef};
-use rustc::ty::{self, Ty, TyCtxt};
-use rustc_hir as hir;
-use rustc_hir::def_id::DefId;
-use rustc_target::spec::abi;
-
-crate fn bound(tcx: TyCtxt<'tcx>, index: u32) -> Ty<'tcx> {
-    let ty = ty::Bound(ty::INNERMOST, ty::BoundVar::from_u32(index).into());
-    tcx.mk_ty(ty)
-}
-
-crate fn raw_ptr(tcx: TyCtxt<'tcx>, mutbl: hir::Mutability) -> Ty<'tcx> {
-    tcx.mk_ptr(ty::TypeAndMut { ty: bound(tcx, 0), mutbl })
-}
-
-crate fn fn_ptr(
-    tcx: TyCtxt<'tcx>,
-    arity_and_output: usize,
-    c_variadic: bool,
-    unsafety: hir::Unsafety,
-    abi: abi::Abi,
-) -> Ty<'tcx> {
-    let inputs_and_output = tcx.mk_type_list(
-        (0..arity_and_output)
-            .into_iter()
-            .map(|i| ty::BoundVar::from(i))
-            // DebruijnIndex(1) because we are going to inject these in a `PolyFnSig`
-            .map(|var| tcx.mk_ty(ty::Bound(ty::DebruijnIndex::from(1usize), var.into()))),
-    );
-
-    let fn_sig = ty::Binder::bind(ty::FnSig { inputs_and_output, c_variadic, unsafety, abi });
-    tcx.mk_fn_ptr(fn_sig)
-}
-
-crate fn type_list(tcx: TyCtxt<'tcx>, arity: usize) -> SubstsRef<'tcx> {
-    tcx.mk_substs(
-        (0..arity)
-            .into_iter()
-            .map(|i| ty::BoundVar::from(i))
-            .map(|var| tcx.mk_ty(ty::Bound(ty::INNERMOST, var.into())))
-            .map(|ty| GenericArg::from(ty)),
-    )
-}
-
-crate fn ref_ty(tcx: TyCtxt<'tcx>, mutbl: hir::Mutability) -> Ty<'tcx> {
-    let region = tcx.mk_region(ty::ReLateBound(ty::INNERMOST, ty::BoundRegion::BrAnon(0)));
-
-    tcx.mk_ref(region, ty::TypeAndMut { ty: bound(tcx, 1), mutbl })
-}
-
-crate fn fn_def(tcx: TyCtxt<'tcx>, def_id: DefId) -> Ty<'tcx> {
-    tcx.mk_ty(ty::FnDef(def_id, InternalSubsts::bound_vars_for_item(tcx, def_id)))
-}
-
-crate fn closure(tcx: TyCtxt<'tcx>, def_id: DefId) -> Ty<'tcx> {
-    tcx.mk_closure(def_id, InternalSubsts::bound_vars_for_item(tcx, def_id))
-}
-
-crate fn generator(tcx: TyCtxt<'tcx>, def_id: DefId) -> Ty<'tcx> {
-    tcx.mk_generator(
-        def_id,
-        InternalSubsts::bound_vars_for_item(tcx, def_id),
-        hir::Movability::Movable,
-    )
-}
diff --git a/src/librustc_traits/implied_outlives_bounds.rs b/src/librustc_traits/implied_outlives_bounds.rs
index 40f821c29d..1b6b873565 100644
--- a/src/librustc_traits/implied_outlives_bounds.rs
+++ b/src/librustc_traits/implied_outlives_bounds.rs
@@ -1,17 +1,17 @@
 //! Provider for the `implied_outlives_bounds` query.
 //! Do not call this query directory. See [`rustc::traits::query::implied_outlives_bounds`].
 
-use rustc::infer::canonical::{self, Canonical};
-use rustc::infer::InferCtxt;
-use rustc::traits::query::outlives_bounds::OutlivesBound;
-use rustc::traits::query::{CanonicalTyGoal, Fallible, NoSolution};
-use rustc::traits::wf;
-use rustc::traits::FulfillmentContext;
-use rustc::traits::{TraitEngine, TraitEngineExt};
 use rustc::ty::outlives::Component;
 use rustc::ty::query::Providers;
 use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
 use rustc_hir as hir;
+use rustc_infer::infer::canonical::{self, Canonical};
+use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
+use rustc_infer::traits::query::outlives_bounds::OutlivesBound;
+use rustc_infer::traits::query::{CanonicalTyGoal, Fallible, NoSolution};
+use rustc_infer::traits::wf;
+use rustc_infer::traits::FulfillmentContext;
+use rustc_infer::traits::{TraitEngine, TraitEngineExt};
 use rustc_span::source_map::DUMMY_SP;
 use smallvec::{smallvec, SmallVec};
 
@@ -84,7 +84,7 @@ fn compute_implied_outlives_bounds<'tcx>(
         // to avoids duplicate errors that otherwise show up.
         fulfill_cx.register_predicate_obligations(
             infcx,
-            obligations.iter().filter(|o| o.predicate.has_infer_types()).cloned(),
+            obligations.iter().filter(|o| o.predicate.has_infer_types_or_consts()).cloned(),
         );
 
         // From the full set of obligations, just filter down to the
diff --git a/src/librustc_traits/lib.rs b/src/librustc_traits/lib.rs
index fefe82fdec..894e3ef3a8 100644
--- a/src/librustc_traits/lib.rs
+++ b/src/librustc_traits/lib.rs
@@ -11,10 +11,8 @@ extern crate log;
 #[macro_use]
 extern crate rustc;
 
-mod chalk_context;
 mod dropck_outlives;
 mod evaluate_obligation;
-mod generic_types;
 mod implied_outlives_bounds;
 pub mod lowering;
 mod normalize_erasing_regions;
@@ -28,7 +26,6 @@ pub fn provide(p: &mut Providers<'_>) {
     evaluate_obligation::provide(p);
     implied_outlives_bounds::provide(p);
     lowering::provide(p);
-    chalk_context::provide(p);
     normalize_projection_ty::provide(p);
     normalize_erasing_regions::provide(p);
     type_op::provide(p);
diff --git a/src/librustc_traits/lowering/environment.rs b/src/librustc_traits/lowering/environment.rs
index 7df27e67d5..0e26e9461f 100644
--- a/src/librustc_traits/lowering/environment.rs
+++ b/src/librustc_traits/lowering/environment.rs
@@ -161,7 +161,7 @@ crate fn environment(tcx: TyCtxt<'_>, def_id: DefId) -> Environment<'_> {
     }
 
     // Compute the bounds on `Self` and the type parameters.
-    let ty::InstantiatedPredicates { predicates } =
+    let ty::InstantiatedPredicates { predicates, .. } =
         tcx.predicates_of(def_id).instantiate_identity(tcx);
 
     let clauses = predicates
diff --git a/src/librustc_traits/lowering/mod.rs b/src/librustc_traits/lowering/mod.rs
index b77c603da9..97b81c224d 100644
--- a/src/librustc_traits/lowering/mod.rs
+++ b/src/librustc_traits/lowering/mod.rs
@@ -9,12 +9,12 @@ use rustc::traits::{
 use rustc::ty::query::Providers;
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::{self, List, TyCtxt};
+use rustc_ast::ast;
 use rustc_hir as hir;
 use rustc_hir::def::DefKind;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_span::symbol::sym;
-use syntax::ast;
 
 use std::iter;
 
@@ -256,7 +256,7 @@ fn program_clauses_for_trait(tcx: TyCtxt<'_>, def_id: DefId) -> Clauses<'_> {
 
     // `WellFormed(WC)`
     let wf_conditions = where_clauses
-        .into_iter()
+        .iter()
         .map(|wc| wc.subst(tcx, bound_vars))
         .map(|wc| wc.map_bound(|goal| goal.into_well_formed_goal()));
 
diff --git a/src/librustc_traits/normalize_erasing_regions.rs b/src/librustc_traits/normalize_erasing_regions.rs
index e81b0242d6..4e5f20d80b 100644
--- a/src/librustc_traits/normalize_erasing_regions.rs
+++ b/src/librustc_traits/normalize_erasing_regions.rs
@@ -1,7 +1,8 @@
 use rustc::traits::query::NoSolution;
-use rustc::traits::{Normalized, ObligationCause};
 use rustc::ty::query::Providers;
 use rustc::ty::{self, ParamEnvAnd, Ty, TyCtxt};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits::{Normalized, ObligationCause};
 use std::sync::atomic::Ordering;
 
 crate fn provide(p: &mut Providers<'_>) {
diff --git a/src/librustc_traits/normalize_projection_ty.rs b/src/librustc_traits/normalize_projection_ty.rs
index e50ca485e0..b567895634 100644
--- a/src/librustc_traits/normalize_projection_ty.rs
+++ b/src/librustc_traits/normalize_projection_ty.rs
@@ -1,9 +1,12 @@
-use rustc::infer::canonical::{Canonical, QueryResponse};
-use rustc::traits::query::{normalize::NormalizationResult, CanonicalProjectionGoal, NoSolution};
-use rustc::traits::{self, ObligationCause, SelectionContext, TraitEngineExt};
 use rustc::ty::query::Providers;
 use rustc::ty::{ParamEnvAnd, TyCtxt};
 use rustc_hir as hir;
+use rustc_infer::infer::canonical::{Canonical, QueryResponse};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits::query::{
+    normalize::NormalizationResult, CanonicalProjectionGoal, NoSolution,
+};
+use rustc_infer::traits::{self, ObligationCause, SelectionContext, TraitEngineExt};
 use rustc_span::DUMMY_SP;
 use std::sync::atomic::Ordering;
 
diff --git a/src/librustc_traits/type_op.rs b/src/librustc_traits/type_op.rs
index 149c42e9c5..4118133806 100644
--- a/src/librustc_traits/type_op.rs
+++ b/src/librustc_traits/type_op.rs
@@ -1,13 +1,3 @@
-use rustc::infer::at::ToTrace;
-use rustc::infer::canonical::{Canonical, QueryResponse};
-use rustc::infer::InferCtxt;
-use rustc::traits::query::type_op::ascribe_user_type::AscribeUserType;
-use rustc::traits::query::type_op::eq::Eq;
-use rustc::traits::query::type_op::normalize::Normalize;
-use rustc::traits::query::type_op::prove_predicate::ProvePredicate;
-use rustc::traits::query::type_op::subtype::Subtype;
-use rustc::traits::query::{Fallible, NoSolution};
-use rustc::traits::{Normalized, Obligation, ObligationCause, TraitEngine, TraitEngineExt};
 use rustc::ty::query::Providers;
 use rustc::ty::subst::{GenericArg, Subst, UserSelfTy, UserSubsts};
 use rustc::ty::{
@@ -15,6 +5,16 @@ use rustc::ty::{
 };
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
+use rustc_infer::infer::at::ToTrace;
+use rustc_infer::infer::canonical::{Canonical, QueryResponse};
+use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
+use rustc_infer::traits::query::type_op::ascribe_user_type::AscribeUserType;
+use rustc_infer::traits::query::type_op::eq::Eq;
+use rustc_infer::traits::query::type_op::normalize::Normalize;
+use rustc_infer::traits::query::type_op::prove_predicate::ProvePredicate;
+use rustc_infer::traits::query::type_op::subtype::Subtype;
+use rustc_infer::traits::query::{Fallible, NoSolution};
+use rustc_infer::traits::{Normalized, Obligation, ObligationCause, TraitEngine, TraitEngineExt};
 use rustc_span::DUMMY_SP;
 use std::fmt;
 
diff --git a/src/librustc_ty/Cargo.toml b/src/librustc_ty/Cargo.toml
index fb0d93fe5e..6e64df3492 100644
--- a/src/librustc_ty/Cargo.toml
+++ b/src/librustc_ty/Cargo.toml
@@ -13,4 +13,6 @@ log = "0.4"
 rustc = { path = "../librustc" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 rustc_hir = { path = "../librustc_hir" }
+rustc_infer = { path = "../librustc_infer" }
 rustc_span = { path = "../librustc_span" }
+rustc_target = { path = "../librustc_target" }
diff --git a/src/librustc_ty/common_traits.rs b/src/librustc_ty/common_traits.rs
new file mode 100644
index 0000000000..e0ce6ad23a
--- /dev/null
+++ b/src/librustc_ty/common_traits.rs
@@ -0,0 +1,41 @@
+//! Queries for checking whether a type implements one of a few common traits.
+
+use rustc::middle::lang_items;
+use rustc::ty::{self, Ty, TyCtxt};
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits;
+use rustc_span::DUMMY_SP;
+
+fn is_copy_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
+    is_item_raw(tcx, query, lang_items::CopyTraitLangItem)
+}
+
+fn is_sized_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
+    is_item_raw(tcx, query, lang_items::SizedTraitLangItem)
+}
+
+fn is_freeze_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
+    is_item_raw(tcx, query, lang_items::FreezeTraitLangItem)
+}
+
+fn is_item_raw<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>,
+    item: lang_items::LangItem,
+) -> bool {
+    let (param_env, ty) = query.into_parts();
+    let trait_def_id = tcx.require_lang_item(item, None);
+    tcx.infer_ctxt().enter(|infcx| {
+        traits::type_known_to_meet_bound_modulo_regions(
+            &infcx,
+            param_env,
+            ty,
+            trait_def_id,
+            DUMMY_SP,
+        )
+    })
+}
+
+pub(crate) fn provide(providers: &mut ty::query::Providers<'_>) {
+    *providers = ty::query::Providers { is_copy_raw, is_sized_raw, is_freeze_raw, ..*providers };
+}
diff --git a/src/librustc_ty/instance.rs b/src/librustc_ty/instance.rs
new file mode 100644
index 0000000000..8b1ba57e81
--- /dev/null
+++ b/src/librustc_ty/instance.rs
@@ -0,0 +1,136 @@
+use rustc::ty::subst::SubstsRef;
+use rustc::ty::{self, Instance, TyCtxt, TypeFoldable};
+use rustc_hir::def_id::DefId;
+use rustc_infer::traits;
+use rustc_target::spec::abi::Abi;
+
+use log::debug;
+
+pub fn resolve_instance<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    def_id: DefId,
+    substs: SubstsRef<'tcx>,
+) -> Option<Instance<'tcx>> {
+    debug!("resolve(def_id={:?}, substs={:?})", def_id, substs);
+    let result = if let Some(trait_def_id) = tcx.trait_of_item(def_id) {
+        debug!(" => associated item, attempting to find impl in param_env {:#?}", param_env);
+        let item = tcx.associated_item(def_id);
+        resolve_associated_item(tcx, &item, param_env, trait_def_id, substs)
+    } else {
+        let ty = tcx.type_of(def_id);
+        let item_type = tcx.subst_and_normalize_erasing_regions(substs, param_env, &ty);
+
+        let def = match item_type.kind {
+            ty::FnDef(..)
+                if {
+                    let f = item_type.fn_sig(tcx);
+                    f.abi() == Abi::RustIntrinsic || f.abi() == Abi::PlatformIntrinsic
+                } =>
+            {
+                debug!(" => intrinsic");
+                ty::InstanceDef::Intrinsic(def_id)
+            }
+            _ => {
+                if Some(def_id) == tcx.lang_items().drop_in_place_fn() {
+                    let ty = substs.type_at(0);
+                    if ty.needs_drop(tcx, param_env.with_reveal_all()) {
+                        debug!(" => nontrivial drop glue");
+                        ty::InstanceDef::DropGlue(def_id, Some(ty))
+                    } else {
+                        debug!(" => trivial drop glue");
+                        ty::InstanceDef::DropGlue(def_id, None)
+                    }
+                } else {
+                    debug!(" => free item");
+                    ty::InstanceDef::Item(def_id)
+                }
+            }
+        };
+        Some(Instance { def, substs })
+    };
+    debug!("resolve(def_id={:?}, substs={:?}) = {:?}", def_id, substs, result);
+    result
+}
+
+fn resolve_associated_item<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    trait_item: &ty::AssocItem,
+    param_env: ty::ParamEnv<'tcx>,
+    trait_id: DefId,
+    rcvr_substs: SubstsRef<'tcx>,
+) -> Option<Instance<'tcx>> {
+    let def_id = trait_item.def_id;
+    debug!(
+        "resolve_associated_item(trait_item={:?}, \
+            param_env={:?}, \
+            trait_id={:?}, \
+            rcvr_substs={:?})",
+        def_id, param_env, trait_id, rcvr_substs
+    );
+
+    let trait_ref = ty::TraitRef::from_method(tcx, trait_id, rcvr_substs);
+    let vtbl = tcx.codegen_fulfill_obligation((param_env, ty::Binder::bind(trait_ref)))?;
+
+    // Now that we know which impl is being used, we can dispatch to
+    // the actual function:
+    match vtbl {
+        traits::VtableImpl(impl_data) => {
+            let (def_id, substs) =
+                traits::find_associated_item(tcx, param_env, trait_item, rcvr_substs, &impl_data);
+
+            let resolved_item = tcx.associated_item(def_id);
+
+            // Since this is a trait item, we need to see if the item is either a trait default item
+            // or a specialization because we can't resolve those unless we can `Reveal::All`.
+            // NOTE: This should be kept in sync with the similar code in
+            // `rustc::traits::project::assemble_candidates_from_impls()`.
+            let eligible = if !resolved_item.defaultness.is_default() {
+                true
+            } else if param_env.reveal == traits::Reveal::All {
+                !trait_ref.needs_subst()
+            } else {
+                false
+            };
+
+            if !eligible {
+                return None;
+            }
+
+            let substs = tcx.erase_regions(&substs);
+            Some(ty::Instance::new(def_id, substs))
+        }
+        traits::VtableGenerator(generator_data) => Some(Instance {
+            def: ty::InstanceDef::Item(generator_data.generator_def_id),
+            substs: generator_data.substs,
+        }),
+        traits::VtableClosure(closure_data) => {
+            let trait_closure_kind = tcx.fn_trait_kind_from_lang_item(trait_id).unwrap();
+            Some(Instance::resolve_closure(
+                tcx,
+                closure_data.closure_def_id,
+                closure_data.substs,
+                trait_closure_kind,
+            ))
+        }
+        traits::VtableFnPointer(ref data) => Some(Instance {
+            def: ty::InstanceDef::FnPtrShim(trait_item.def_id, data.fn_ty),
+            substs: rcvr_substs,
+        }),
+        traits::VtableObject(ref data) => {
+            let index = traits::get_vtable_index_of_object_method(tcx, data, def_id);
+            Some(Instance { def: ty::InstanceDef::Virtual(def_id, index), substs: rcvr_substs })
+        }
+        traits::VtableBuiltin(..) => {
+            if tcx.lang_items().clone_trait().is_some() {
+                Some(Instance {
+                    def: ty::InstanceDef::CloneShim(def_id, trait_ref.self_ty()),
+                    substs: rcvr_substs,
+                })
+            } else {
+                None
+            }
+        }
+        traits::VtableAutoImpl(..) | traits::VtableParam(..) | traits::VtableTraitAlias(..) => None,
+    }
+}
diff --git a/src/librustc_ty/lib.rs b/src/librustc_ty/lib.rs
index e5ec98743e..f9ee4e20d2 100644
--- a/src/librustc_ty/lib.rs
+++ b/src/librustc_ty/lib.rs
@@ -6,9 +6,7 @@
 
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![feature(bool_to_option)]
-#![feature(in_band_lifetimes)]
 #![feature(nll)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![recursion_limit = "256"]
 
 #[macro_use]
@@ -18,8 +16,13 @@ extern crate log;
 
 use rustc::ty::query::Providers;
 
+mod common_traits;
+pub mod instance;
+mod needs_drop;
 mod ty;
 
 pub fn provide(providers: &mut Providers<'_>) {
+    common_traits::provide(providers);
+    needs_drop::provide(providers);
     ty::provide(providers);
 }
diff --git a/src/librustc_ty/needs_drop.rs b/src/librustc_ty/needs_drop.rs
new file mode 100644
index 0000000000..0f71246c73
--- /dev/null
+++ b/src/librustc_ty/needs_drop.rs
@@ -0,0 +1,165 @@
+//! Check whether a type has (potentially) non-trivial drop glue.
+
+use rustc::ty::subst::Subst;
+use rustc::ty::util::{needs_drop_components, AlwaysRequiresDrop};
+use rustc::ty::{self, Ty, TyCtxt};
+use rustc_data_structures::fx::FxHashSet;
+use rustc_hir::def_id::DefId;
+use rustc_span::DUMMY_SP;
+
+type NeedsDropResult<T> = Result<T, AlwaysRequiresDrop>;
+
+fn needs_drop_raw<'tcx>(tcx: TyCtxt<'tcx>, query: ty::ParamEnvAnd<'tcx, Ty<'tcx>>) -> bool {
+    let adt_fields =
+        move |adt_def: &ty::AdtDef| tcx.adt_drop_tys(adt_def.did).map(|tys| tys.iter().copied());
+    // If we don't know a type doesn't need drop, for example if it's a type
+    // parameter without a `Copy` bound, then we conservatively return that it
+    // needs drop.
+    let res = NeedsDropTypes::new(tcx, query.param_env, query.value, adt_fields).next().is_some();
+    debug!("needs_drop_raw({:?}) = {:?}", query, res);
+    res
+}
+
+struct NeedsDropTypes<'tcx, F> {
+    tcx: TyCtxt<'tcx>,
+    param_env: ty::ParamEnv<'tcx>,
+    query_ty: Ty<'tcx>,
+    seen_tys: FxHashSet<Ty<'tcx>>,
+    /// A stack of types left to process, and the recursion depth when we
+    /// pushed that type. Each round, we pop something from the stack and check
+    /// if it needs drop. If the result depends on whether some other types
+    /// need drop we push them onto the stack.
+    unchecked_tys: Vec<(Ty<'tcx>, usize)>,
+    recursion_limit: usize,
+    adt_components: F,
+}
+
+impl<'tcx, F> NeedsDropTypes<'tcx, F> {
+    fn new(
+        tcx: TyCtxt<'tcx>,
+        param_env: ty::ParamEnv<'tcx>,
+        ty: Ty<'tcx>,
+        adt_components: F,
+    ) -> Self {
+        let mut seen_tys = FxHashSet::default();
+        seen_tys.insert(ty);
+        let recursion_limit = *tcx.sess.recursion_limit.get();
+        Self {
+            tcx,
+            param_env,
+            seen_tys,
+            query_ty: ty,
+            unchecked_tys: vec![(ty, 0)],
+            recursion_limit,
+            adt_components,
+        }
+    }
+}
+
+impl<'tcx, F, I> Iterator for NeedsDropTypes<'tcx, F>
+where
+    F: Fn(&ty::AdtDef) -> NeedsDropResult<I>,
+    I: Iterator<Item = Ty<'tcx>>,
+{
+    type Item = NeedsDropResult<Ty<'tcx>>;
+
+    fn next(&mut self) -> Option<NeedsDropResult<Ty<'tcx>>> {
+        let tcx = self.tcx;
+
+        while let Some((ty, level)) = self.unchecked_tys.pop() {
+            if level > self.recursion_limit {
+                // Not having a `Span` isn't great. But there's hopefully some other
+                // recursion limit error as well.
+                tcx.sess.span_err(
+                    DUMMY_SP,
+                    &format!("overflow while checking whether `{}` requires drop", self.query_ty),
+                );
+                return Some(Err(AlwaysRequiresDrop));
+            }
+
+            let components = match needs_drop_components(ty, &tcx.data_layout) {
+                Err(e) => return Some(Err(e)),
+                Ok(components) => components,
+            };
+            debug!("needs_drop_components({:?}) = {:?}", ty, components);
+
+            let queue_type = move |this: &mut Self, component: Ty<'tcx>| {
+                if this.seen_tys.insert(component) {
+                    this.unchecked_tys.push((component, level + 1));
+                }
+            };
+
+            for component in components {
+                match component.kind {
+                    _ if component.is_copy_modulo_regions(tcx, self.param_env, DUMMY_SP) => (),
+
+                    ty::Closure(def_id, substs) => {
+                        for upvar_ty in substs.as_closure().upvar_tys(def_id, tcx) {
+                            queue_type(self, upvar_ty);
+                        }
+                    }
+
+                    // Check for a `Drop` impl and whether this is a union or
+                    // `ManuallyDrop`. If it's a struct or enum without a `Drop`
+                    // impl then check whether the field types need `Drop`.
+                    ty::Adt(adt_def, substs) => {
+                        let tys = match (self.adt_components)(adt_def) {
+                            Err(e) => return Some(Err(e)),
+                            Ok(tys) => tys,
+                        };
+                        for required_ty in tys {
+                            let subst_ty = tcx.normalize_erasing_regions(
+                                self.param_env,
+                                required_ty.subst(tcx, substs),
+                            );
+                            queue_type(self, subst_ty);
+                        }
+                    }
+                    ty::Array(..) | ty::Opaque(..) | ty::Projection(..) | ty::Param(_) => {
+                        if ty == component {
+                            // Return the type to the caller: they may be able
+                            // to normalize further than we can.
+                            return Some(Ok(component));
+                        } else {
+                            // Store the type for later. We can't return here
+                            // because we would then lose any other components
+                            // of the type.
+                            queue_type(self, component);
+                        }
+                    }
+                    _ => return Some(Err(AlwaysRequiresDrop)),
+                }
+            }
+        }
+
+        return None;
+    }
+}
+
+fn adt_drop_tys(tcx: TyCtxt<'_>, def_id: DefId) -> Result<&ty::List<Ty<'_>>, AlwaysRequiresDrop> {
+    let adt_components = move |adt_def: &ty::AdtDef| {
+        if adt_def.is_manually_drop() {
+            debug!("adt_drop_tys: `{:?}` is manually drop", adt_def);
+            return Ok(Vec::new().into_iter());
+        } else if adt_def.destructor(tcx).is_some() {
+            debug!("adt_drop_tys: `{:?}` implements `Drop`", adt_def);
+            return Err(AlwaysRequiresDrop);
+        } else if adt_def.is_union() {
+            debug!("adt_drop_tys: `{:?}` is a union", adt_def);
+            return Ok(Vec::new().into_iter());
+        }
+        Ok(adt_def.all_fields().map(|field| tcx.type_of(field.did)).collect::<Vec<_>>().into_iter())
+    };
+
+    let adt_ty = tcx.type_of(def_id);
+    let param_env = tcx.param_env(def_id);
+    let res: Result<Vec<_>, _> =
+        NeedsDropTypes::new(tcx, param_env, adt_ty, adt_components).collect();
+
+    debug!("adt_drop_tys(`{}`) = `{:?}`", tcx.def_path_str(def_id), res);
+    res.map(|components| tcx.intern_type_list(&components))
+}
+
+pub(crate) fn provide(providers: &mut ty::query::Providers<'_>) {
+    *providers = ty::query::Providers { needs_drop_raw, adt_drop_tys, ..*providers };
+}
diff --git a/src/librustc_ty/ty.rs b/src/librustc_ty/ty.rs
index 8f882be1a0..6bc29d0493 100644
--- a/src/librustc_ty/ty.rs
+++ b/src/librustc_ty/ty.rs
@@ -1,15 +1,19 @@
 use rustc::hir::map as hir_map;
 use rustc::session::CrateDisambiguator;
-use rustc::traits::{self};
 use rustc::ty::subst::Subst;
 use rustc::ty::{self, ToPredicate, Ty, TyCtxt, WithConstness};
 use rustc_data_structures::svh::Svh;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
+use rustc_infer::traits;
 use rustc_span::symbol::Symbol;
 use rustc_span::Span;
 
-fn sized_constraint_for_ty(tcx: TyCtxt<'tcx>, adtdef: &ty::AdtDef, ty: Ty<'tcx>) -> Vec<Ty<'tcx>> {
+fn sized_constraint_for_ty<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    adtdef: &ty::AdtDef,
+    ty: Ty<'tcx>,
+) -> Vec<Ty<'tcx>> {
     use ty::TyKind::*;
 
     let result = match ty.kind {
@@ -206,6 +210,11 @@ fn associated_item_def_ids(tcx: TyCtxt<'_>, def_id: DefId) -> &[DefId] {
     }
 }
 
+fn associated_items<'tcx>(tcx: TyCtxt<'tcx>, def_id: DefId) -> &'tcx ty::AssociatedItems {
+    let items = tcx.associated_item_def_ids(def_id).iter().map(|did| tcx.associated_item(*did));
+    tcx.arena.alloc(ty::AssociatedItems::new(items))
+}
+
 fn def_span(tcx: TyCtxt<'_>, def_id: DefId) -> Span {
     tcx.hir().span_if_local(def_id).unwrap()
 }
@@ -228,7 +237,7 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
     }
     // Compute the bounds on Self and the type parameters.
 
-    let ty::InstantiatedPredicates { predicates } =
+    let ty::InstantiatedPredicates { predicates, .. } =
         tcx.predicates_of(def_id).instantiate_identity(tcx);
 
     // Finally, we have to normalize the bounds in the environment, in
@@ -243,11 +252,8 @@ fn param_env(tcx: TyCtxt<'_>, def_id: DefId) -> ty::ParamEnv<'_> {
     // are any errors at that point, so after type checking you can be
     // sure that this will succeed without errors anyway.
 
-    let unnormalized_env = ty::ParamEnv::new(
-        tcx.intern_predicates(&predicates),
-        traits::Reveal::UserFacing,
-        tcx.sess.opts.debugging_opts.chalk.then_some(def_id),
-    );
+    let unnormalized_env =
+        ty::ParamEnv::new(tcx.intern_predicates(&predicates), traits::Reveal::UserFacing, None);
 
     let body_id = tcx.hir().as_local_hir_id(def_id).map_or(hir::DUMMY_HIR_ID, |id| {
         tcx.hir().maybe_body_owned_by(id).map_or(id, |body| body.hir_id)
@@ -356,6 +362,7 @@ pub fn provide(providers: &mut ty::query::Providers<'_>) {
         asyncness,
         associated_item,
         associated_item_def_ids,
+        associated_items,
         adt_sized_constraint,
         def_span,
         param_env,
diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml
index 4b27d86dd0..51a9b259c8 100644
--- a/src/librustc_typeck/Cargo.toml
+++ b/src/librustc_typeck/Cargo.toml
@@ -14,11 +14,13 @@ doctest = false
 arena = { path = "../libarena" }
 log = "0.4"
 rustc = { path = "../librustc" }
+rustc_attr = { path = "../librustc_attr" }
 rustc_data_structures = { path = "../librustc_data_structures" }
 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" }
+rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 rustc_index = { path = "../librustc_index" }
+rustc_infer = { path = "../librustc_infer" }
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index c4a7f5aeb8..9f998c9900 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -9,32 +9,31 @@ use crate::collect::PlaceholderHirTyCollector;
 use crate::lint;
 use crate::middle::lang_items::SizedTraitLangItem;
 use crate::middle::resolve_lifetime as rl;
-use crate::namespace::Namespace;
 use crate::require_c_abi_if_c_variadic;
 use crate::util::common::ErrorReported;
 use rustc::lint::builtin::AMBIGUOUS_ASSOCIATED_ITEMS;
-use rustc::session::parse::feature_err;
-use rustc::traits;
-use rustc::traits::astconv_object_safety_violations;
-use rustc::traits::error_reporting::report_object_safety_error;
-use rustc::traits::wf::object_region_bounds;
+use rustc::session::{parse::feature_err, Session};
 use rustc::ty::subst::{self, InternalSubsts, Subst, SubstsRef};
 use rustc::ty::{self, Const, DefIdTree, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
 use rustc::ty::{GenericParamDef, GenericParamDefKind};
+use rustc_ast::ast;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticId};
 use rustc_hir as hir;
-use rustc_hir::def::{CtorOf, DefKind, Res};
+use rustc_hir::def::{CtorOf, DefKind, Namespace, Res};
 use rustc_hir::def_id::DefId;
-use rustc_hir::intravisit::Visitor;
+use rustc_hir::intravisit::{walk_generics, Visitor};
 use rustc_hir::print;
-use rustc_hir::{ExprKind, GenericArg, GenericArgs};
+use rustc_hir::{Constness, ExprKind, GenericArg, GenericArgs};
+use rustc_infer::traits;
+use rustc_infer::traits::astconv_object_safety_violations;
+use rustc_infer::traits::error_reporting::report_object_safety_error;
+use rustc_infer::traits::wf::object_region_bounds;
 use rustc_span::symbol::sym;
 use rustc_span::{MultiSpan, Span, DUMMY_SP};
 use rustc_target::spec::abi;
 use smallvec::SmallVec;
-use syntax::ast::{self, Constness};
-use syntax::util::lev_distance::find_best_match_for_name;
 
 use std::collections::BTreeSet;
 use std::iter;
@@ -133,6 +132,15 @@ enum GenericArgPosition {
     MethodCall,
 }
 
+/// A marker denoting that the generic arguments that were
+/// provided did not match the respective generic parameters.
+pub struct GenericArgCountMismatch {
+    /// Indicates whether a fatal error was reported (`Some`), or just a lint (`None`).
+    pub reported: Option<ErrorReported>,
+    /// A list of spans of arguments provided that were not valid.
+    pub invalid_args: Vec<Span>,
+}
+
 impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
     pub fn ast_region_to_region(
         &self,
@@ -263,7 +271,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         def: &ty::Generics,
         seg: &hir::PathSegment<'_>,
         is_method_call: bool,
-    ) -> bool {
+    ) -> Result<(), GenericArgCountMismatch> {
         let empty_args = hir::GenericArgs::none();
         let suppress_mismatch = Self::check_impl_trait(tcx, seg, &def);
         Self::check_generic_arg_count(
@@ -275,7 +283,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             def.parent.is_none() && def.has_self, // `has_self`
             seg.infer_args || suppress_mismatch,  // `infer_args`
         )
-        .0
     }
 
     /// Checks that the correct number of generic arguments have been provided.
@@ -288,7 +295,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         position: GenericArgPosition,
         has_self: bool,
         infer_args: bool,
-    ) -> (bool, Option<Vec<Span>>) {
+    ) -> Result<(), GenericArgCountMismatch> {
         // At this stage we are guaranteed that the generic arguments are in the correct order, e.g.
         // that lifetimes will proceed types. So it suffices to check the number of each generic
         // arguments in order to validate them with respect to the generic parameters.
@@ -314,7 +321,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         }
 
         // Prohibit explicit lifetime arguments if late-bound lifetime parameters are present.
-        let mut reported_late_bound_region_err = None;
+        let mut explicit_lifetimes = Ok(());
         if !infer_lifetimes {
             if let Some(span_late) = def.has_late_bound_regions {
                 let msg = "cannot specify lifetime arguments explicitly \
@@ -324,125 +331,150 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                 if position == GenericArgPosition::Value
                     && arg_counts.lifetimes != param_counts.lifetimes
                 {
+                    explicit_lifetimes = Err(true);
                     let mut err = tcx.sess.struct_span_err(span, msg);
                     err.span_note(span_late, note);
                     err.emit();
-                    reported_late_bound_region_err = Some(true);
                 } else {
+                    explicit_lifetimes = Err(false);
                     let mut multispan = MultiSpan::from_span(span);
                     multispan.push_span_label(span_late, note.to_string());
-                    tcx.lint_hir(
+                    tcx.struct_span_lint_hir(
                         lint::builtin::LATE_BOUND_LIFETIME_ARGUMENTS,
                         args.args[0].id(),
                         multispan,
-                        msg,
+                        |lint| lint.build(msg).emit(),
                     );
-                    reported_late_bound_region_err = Some(false);
                 }
             }
         }
 
-        let check_kind_count = |kind, required, permitted, provided, offset| {
-            debug!(
-                "check_kind_count: kind: {} required: {} permitted: {} provided: {} offset: {}",
-                kind, required, permitted, provided, offset
-            );
-            // We enforce the following: `required` <= `provided` <= `permitted`.
-            // For kinds without defaults (e.g.., lifetimes), `required == permitted`.
-            // For other kinds (i.e., types), `permitted` may be greater than `required`.
-            if required <= provided && provided <= permitted {
-                return (reported_late_bound_region_err.unwrap_or(false), None);
-            }
-
-            // Unfortunately lifetime and type parameter mismatches are typically styled
-            // differently in diagnostics, which means we have a few cases to consider here.
-            let (bound, quantifier) = if required != permitted {
-                if provided < required {
-                    (required, "at least ")
-                } else {
-                    // provided > permitted
-                    (permitted, "at most ")
+        let check_kind_count =
+            |kind, required, permitted, provided, offset, unexpected_spans: &mut Vec<Span>| {
+                debug!(
+                    "check_kind_count: kind: {} required: {} permitted: {} provided: {} offset: {}",
+                    kind, required, permitted, provided, offset
+                );
+                // We enforce the following: `required` <= `provided` <= `permitted`.
+                // For kinds without defaults (e.g.., lifetimes), `required == permitted`.
+                // For other kinds (i.e., types), `permitted` may be greater than `required`.
+                if required <= provided && provided <= permitted {
+                    return Ok(());
                 }
-            } else {
-                (required, "")
-            };
 
-            let mut potential_assoc_types: Option<Vec<Span>> = None;
-            let (spans, label) = if required == permitted && provided > permitted {
-                // In the case when the user has provided too many arguments,
-                // we want to point to the unexpected arguments.
-                let spans: Vec<Span> = args.args[offset + permitted..offset + provided]
-                    .iter()
-                    .map(|arg| arg.span())
-                    .collect();
-                potential_assoc_types = Some(spans.clone());
-                (spans, format!("unexpected {} argument", kind))
-            } else {
-                (
-                    vec![span],
-                    format!(
-                        "expected {}{} {} argument{}",
-                        quantifier,
-                        bound,
-                        kind,
-                        pluralize!(bound),
+                // Unfortunately lifetime and type parameter mismatches are typically styled
+                // differently in diagnostics, which means we have a few cases to consider here.
+                let (bound, quantifier) = if required != permitted {
+                    if provided < required {
+                        (required, "at least ")
+                    } else {
+                        // provided > permitted
+                        (permitted, "at most ")
+                    }
+                } else {
+                    (required, "")
+                };
+
+                let (spans, label) = if required == permitted && provided > permitted {
+                    // In the case when the user has provided too many arguments,
+                    // we want to point to the unexpected arguments.
+                    let spans: Vec<Span> = args.args[offset + permitted..offset + provided]
+                        .iter()
+                        .map(|arg| arg.span())
+                        .collect();
+                    unexpected_spans.extend(spans.clone());
+                    (spans, format!("unexpected {} argument", kind))
+                } else {
+                    (
+                        vec![span],
+                        format!(
+                            "expected {}{} {} argument{}",
+                            quantifier,
+                            bound,
+                            kind,
+                            pluralize!(bound),
+                        ),
+                    )
+                };
+
+                let mut err = tcx.sess.struct_span_err_with_code(
+                    spans.clone(),
+                    &format!(
+                        "wrong number of {} arguments: expected {}{}, found {}",
+                        kind, quantifier, bound, provided,
                     ),
-                )
+                    DiagnosticId::Error("E0107".into()),
+                );
+                for span in spans {
+                    err.span_label(span, label.as_str());
+                }
+                err.emit();
+
+                Err(true)
             };
 
-            let mut err = tcx.sess.struct_span_err_with_code(
-                spans.clone(),
-                &format!(
-                    "wrong number of {} arguments: expected {}{}, found {}",
-                    kind, quantifier, bound, provided,
-                ),
-                DiagnosticId::Error("E0107".into()),
-            );
-            for span in spans {
-                err.span_label(span, label.as_str());
-            }
-            err.emit();
+        let mut arg_count_correct = explicit_lifetimes;
+        let mut unexpected_spans = vec![];
 
-            (
-                provided > required, // `suppress_error`
-                potential_assoc_types,
-            )
-        };
-
-        if reported_late_bound_region_err.is_none()
+        if arg_count_correct.is_ok()
             && (!infer_lifetimes || arg_counts.lifetimes > param_counts.lifetimes)
         {
-            check_kind_count(
+            arg_count_correct = check_kind_count(
                 "lifetime",
                 param_counts.lifetimes,
                 param_counts.lifetimes,
                 arg_counts.lifetimes,
                 0,
-            );
+                &mut unexpected_spans,
+            )
+            .and(arg_count_correct);
         }
         // FIXME(const_generics:defaults)
         if !infer_args || arg_counts.consts > param_counts.consts {
-            check_kind_count(
+            arg_count_correct = check_kind_count(
                 "const",
                 param_counts.consts,
                 param_counts.consts,
                 arg_counts.consts,
                 arg_counts.lifetimes + arg_counts.types,
-            );
+                &mut unexpected_spans,
+            )
+            .and(arg_count_correct);
         }
         // Note that type errors are currently be emitted *after* const errors.
         if !infer_args || arg_counts.types > param_counts.types - defaults.types - has_self as usize
         {
-            check_kind_count(
+            arg_count_correct = check_kind_count(
                 "type",
                 param_counts.types - defaults.types - has_self as usize,
                 param_counts.types - has_self as usize,
                 arg_counts.types,
                 arg_counts.lifetimes,
+                &mut unexpected_spans,
             )
-        } else {
-            (reported_late_bound_region_err.unwrap_or(false), None)
+            .and(arg_count_correct);
         }
+
+        arg_count_correct.map_err(|reported_err| GenericArgCountMismatch {
+            reported: if reported_err { Some(ErrorReported) } else { None },
+            invalid_args: unexpected_spans,
+        })
+    }
+
+    /// Report an error that a generic argument did not match the generic parameter that was
+    /// expected.
+    fn generic_arg_mismatch_err(sess: &Session, arg: &GenericArg<'_>, kind: &'static str) {
+        let mut err = struct_span_err!(
+            sess,
+            arg.span(),
+            E0747,
+            "{} provided when a {} was expected",
+            arg.descr(),
+            kind,
+        );
+        // This note will be true as long as generic parameters are strictly ordered by their kind.
+        err.note(&format!("{} arguments must be provided before {} arguments", kind, arg.descr()));
+        err.emit();
     }
 
     /// Creates the relevant generic argument substitutions
@@ -480,8 +512,9 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         parent_substs: &[subst::GenericArg<'tcx>],
         has_self: bool,
         self_ty: Option<Ty<'tcx>>,
+        arg_count_correct: bool,
         args_for_def_id: impl Fn(DefId) -> (Option<&'b GenericArgs<'b>>, bool),
-        provided_kind: impl Fn(&GenericParamDef, &GenericArg<'_>) -> subst::GenericArg<'tcx>,
+        mut provided_kind: impl FnMut(&GenericParamDef, &GenericArg<'_>) -> subst::GenericArg<'tcx>,
         mut inferred_kind: impl FnMut(
             Option<&[subst::GenericArg<'tcx>]>,
             &GenericParamDef,
@@ -503,7 +536,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         // methods in `subst.rs`, so that we can iterate over the arguments and
         // parameters in lock-step linearly, instead of trying to match each pair.
         let mut substs: SmallVec<[subst::GenericArg<'tcx>; 8]> = SmallVec::with_capacity(count);
-
         // Iterate over each segment of the path.
         while let Some((def_id, defs)) = stack.pop() {
             let mut params = defs.params.iter().peekable();
@@ -540,6 +572,12 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             let mut args =
                 generic_args.iter().flat_map(|generic_args| generic_args.args.iter()).peekable();
 
+            // If we encounter a type or const when we expect a lifetime, we infer the lifetimes.
+            // If we later encounter a lifetime, we know that the arguments were provided in the
+            // wrong order. `force_infer_lt` records the type or const that forced lifetimes to be
+            // inferred, so we can use it for diagnostics later.
+            let mut force_infer_lt = None;
+
             loop {
                 // We're going to iterate through the generic arguments that the user
                 // provided, matching them with the generic parameters we expect.
@@ -560,30 +598,58 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                                 // We expected a lifetime argument, but got a type or const
                                 // argument. That means we're inferring the lifetimes.
                                 substs.push(inferred_kind(None, param, infer_args));
+                                force_infer_lt = Some(arg);
                                 params.next();
                             }
-                            (_, _) => {
+                            (_, kind) => {
                                 // We expected one kind of parameter, but the user provided
-                                // another. This is an error, but we need to handle it
-                                // gracefully so we can report sensible errors.
-                                // In this case, we're simply going to infer this argument.
-                                args.next();
+                                // another. This is an error. However, if we already know that
+                                // the arguments don't match up with the parameters, we won't issue
+                                // an additional error, as the user already knows what's wrong.
+                                if arg_count_correct {
+                                    Self::generic_arg_mismatch_err(tcx.sess, arg, kind.descr());
+                                }
+
+                                // We've reported the error, but we want to make sure that this
+                                // problem doesn't bubble down and create additional, irrelevant
+                                // errors. In this case, we're simply going to ignore the argument
+                                // and any following arguments. The rest of the parameters will be
+                                // inferred.
+                                while args.next().is_some() {}
                             }
                         }
                     }
-                    (Some(_), None) => {
+
+                    (Some(&arg), None) => {
                         // We should never be able to reach this point with well-formed input.
-                        // Getting to this point means the user supplied more arguments than
-                        // there are parameters.
-                        args.next();
+                        // There are two situations in which we can encounter this issue.
+                        //
+                        //  1.  The number of arguments is incorrect. In this case, an error
+                        //      will already have been emitted, and we can ignore it. This case
+                        //      also occurs when late-bound lifetime parameters are present, yet
+                        //      the lifetime arguments have also been explicitly specified by the
+                        //      user.
+                        //  2.  We've inferred some lifetimes, which have been provided later (i.e.
+                        //      after a type or const). We want to throw an error in this case.
+
+                        if arg_count_correct {
+                            let kind = arg.descr();
+                            assert_eq!(kind, "lifetime");
+                            let provided =
+                                force_infer_lt.expect("lifetimes ought to have been inferred");
+                            Self::generic_arg_mismatch_err(tcx.sess, provided, kind);
+                        }
+
+                        break;
                     }
+
                     (None, Some(&param)) => {
                         // If there are fewer arguments than parameters, it means
                         // we're inferring the remaining arguments.
                         substs.push(inferred_kind(Some(&substs), param, infer_args));
-                        args.next();
                         params.next();
                     }
+
                     (None, None) => break,
                 }
             }
@@ -595,7 +661,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
     /// Given the type/lifetime/const arguments provided to some path (along with
     /// an implicit `Self`, if this is a trait reference), returns the complete
     /// set of substitutions. This may involve applying defaulted type parameters.
-    /// Also returns back constriants on associated types.
+    /// Also returns back constraints on associated types.
     ///
     /// Example:
     ///
@@ -631,7 +697,8 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         generic_args: &'a hir::GenericArgs<'_>,
         infer_args: bool,
         self_ty: Option<Ty<'tcx>>,
-    ) -> (SubstsRef<'tcx>, Vec<ConvertedBinding<'a, 'tcx>>, Option<Vec<Span>>) {
+    ) -> (SubstsRef<'tcx>, Vec<ConvertedBinding<'a, 'tcx>>, Result<(), GenericArgCountMismatch>)
+    {
         // If the type is parameterized by this region, then replace this
         // region with the current anon region binding (in other words,
         // whatever & would get replaced with).
@@ -657,7 +724,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             assert!(self_ty.is_none() && parent_substs.is_empty());
         }
 
-        let (_, potential_assoc_types) = Self::check_generic_arg_count(
+        let arg_count_correct = Self::check_generic_arg_count(
             tcx,
             span,
             &generic_params,
@@ -684,21 +751,35 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         };
 
         let mut missing_type_params = vec![];
+        let mut inferred_params = vec![];
         let substs = Self::create_substs_for_generic_args(
             tcx,
             def_id,
             parent_substs,
             self_ty.is_some(),
             self_ty,
+            arg_count_correct.is_ok(),
             // Provide the generic args, and whether types should be inferred.
-            |_| (Some(generic_args), infer_args),
+            |did| {
+                if did == def_id {
+                    (Some(generic_args), infer_args)
+                } else {
+                    // The last component of this tuple is unimportant.
+                    (None, false)
+                }
+            },
             // Provide substitutions for parameters for which (valid) arguments have been provided.
             |param, arg| match (&param.kind, arg) {
                 (GenericParamDefKind::Lifetime, GenericArg::Lifetime(lt)) => {
                     self.ast_region_to_region(&lt, Some(param)).into()
                 }
                 (GenericParamDefKind::Type { .. }, GenericArg::Type(ty)) => {
-                    self.ast_ty_to_ty(&ty).into()
+                    if let (hir::TyKind::Infer, false) = (&ty.kind, self.allow_ty_infer()) {
+                        inferred_params.push(ty.span);
+                        tcx.types.err.into()
+                    } else {
+                        self.ast_ty_to_ty(&ty).into()
+                    }
                 }
                 (GenericParamDefKind::Const, GenericArg::Const(ct)) => {
                     self.ast_const_to_const(&ct.value, tcx.type_of(param.def_id)).into()
@@ -795,7 +876,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             generic_params, self_ty, substs
         );
 
-        (substs, assoc_bindings, potential_assoc_types)
+        (substs, assoc_bindings, arg_count_correct)
     }
 
     crate fn create_substs_for_associated_item(
@@ -889,10 +970,10 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                 ),
             );
         }
-        err.note(&format!(
+        err.note(
             "because of the default `Self` reference, type parameters must be \
-                            specified on object types"
-        ));
+                  specified on object types",
+        );
         err.emit();
     }
 
@@ -926,7 +1007,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         self_ty: Ty<'tcx>,
         bounds: &mut Bounds<'tcx>,
         speculative: bool,
-    ) -> Option<Vec<Span>> {
+    ) -> Result<(), GenericArgCountMismatch> {
         let trait_def_id = trait_ref.trait_def_id();
 
         debug!("instantiate_poly_trait_ref({:?}, def_id={:?})", trait_ref, trait_def_id);
@@ -943,7 +1024,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         } else {
             trait_ref.path.span
         };
-        let (substs, assoc_bindings, potential_assoc_types) = self.create_substs_for_ast_trait_ref(
+        let (substs, assoc_bindings, arg_count_correct) = self.create_substs_for_ast_trait_ref(
             path_span,
             trait_def_id,
             self_ty,
@@ -972,7 +1053,8 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             "instantiate_poly_trait_ref({:?}, bounds={:?}) -> {:?}",
             trait_ref, bounds, poly_trait_ref
         );
-        potential_assoc_types
+
+        arg_count_correct
     }
 
     /// Given a trait bound like `Debug`, applies that trait bound the given self-type to construct
@@ -1000,7 +1082,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         constness: Constness,
         self_ty: Ty<'tcx>,
         bounds: &mut Bounds<'tcx>,
-    ) -> Option<Vec<Span>> {
+    ) -> Result<(), GenericArgCountMismatch> {
         self.instantiate_poly_trait_ref_inner(
             &poly_trait_ref.trait_ref,
             poly_trait_ref.span,
@@ -1089,7 +1171,8 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         trait_def_id: DefId,
         self_ty: Ty<'tcx>,
         trait_segment: &'a hir::PathSegment<'a>,
-    ) -> (SubstsRef<'tcx>, Vec<ConvertedBinding<'a, 'tcx>>, Option<Vec<Span>>) {
+    ) -> (SubstsRef<'tcx>, Vec<ConvertedBinding<'a, 'tcx>>, Result<(), GenericArgCountMismatch>)
+    {
         debug!("create_substs_for_ast_trait_ref(trait_segment={:?})", trait_segment);
 
         self.complain_about_internal_fn_trait(span, trait_def_id, trait_segment);
@@ -1109,10 +1192,10 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         trait_def_id: DefId,
         assoc_name: ast::Ident,
     ) -> bool {
-        self.tcx().associated_items(trait_def_id).any(|item| {
-            item.kind == ty::AssocKind::Type
-                && self.tcx().hygienic_eq(assoc_name, item.ident, trait_def_id)
-        })
+        self.tcx()
+            .associated_items(trait_def_id)
+            .find_by_name_and_kind(self.tcx(), assoc_name, ty::AssocKind::Type, trait_def_id)
+            .is_some()
     }
 
     // Returns `true` if a bounds list includes `?Sized`.
@@ -1307,12 +1390,15 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                             );
                         }
                     };
+                    // FIXME: point at the type params that don't have appropriate lifetimes:
+                    // struct S1<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
+                    //                         ----  ----     ^^^^^^^
                     struct_span_err!(
                         tcx.sess,
                         binding.span,
                         E0582,
                         "binding for associated type `{}` references lifetime `{}`, \
-                                     which does not appear in the trait input types",
+                         which does not appear in the trait input types",
                         binding.item_name,
                         br_name
                     )
@@ -1342,8 +1428,12 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
 
         let (assoc_ident, def_scope) =
             tcx.adjust_ident_and_get_scope(binding.item_name, candidate.def_id(), hir_ref_id);
+
+        // We have already adjusted the item name above, so compare with `ident.modern()` instead
+        // of calling `filter_by_name_and_kind`.
         let assoc_ty = tcx
             .associated_items(candidate.def_id())
+            .filter_by_name_unhygienic(assoc_ident.name)
             .find(|i| i.kind == ty::AssocKind::Type && i.ident.modern() == assoc_ident)
             .expect("missing associated type");
 
@@ -1427,21 +1517,22 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         let mut potential_assoc_types = Vec::new();
         let dummy_self = self.tcx().types.trait_object_dummy_self;
         for trait_bound in trait_bounds.iter().rev() {
-            let cur_potential_assoc_types = self.instantiate_poly_trait_ref(
+            if let Err(GenericArgCountMismatch {
+                invalid_args: cur_potential_assoc_types, ..
+            }) = self.instantiate_poly_trait_ref(
                 trait_bound,
                 Constness::NotConst,
                 dummy_self,
                 &mut bounds,
-            );
-            potential_assoc_types.extend(cur_potential_assoc_types.into_iter().flatten());
+            ) {
+                potential_assoc_types.extend(cur_potential_assoc_types.into_iter());
+            }
         }
 
         // Expand trait aliases recursively and check that only one regular (non-auto) trait
         // is used and no 'maybe' bounds are used.
-        let expanded_traits = traits::expand_trait_aliases(
-            tcx,
-            bounds.trait_bounds.iter().map(|&(a, b, _)| (a.clone(), b)),
-        );
+        let expanded_traits =
+            traits::expand_trait_aliases(tcx, bounds.trait_bounds.iter().map(|&(a, b, _)| (a, b)));
         let (mut auto_traits, regular_traits): (Vec<_>, Vec<_>) =
             expanded_traits.partition(|i| tcx.trait_is_auto(i.trait_ref().def_id()));
         if regular_traits.len() > 1 {
@@ -1500,7 +1591,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             .filter(|(trait_ref, _, _)| !tcx.trait_is_auto(trait_ref.def_id()));
 
         for (base_trait_ref, span, constness) in regular_traits_refs_spans {
-            assert_eq!(constness, ast::Constness::NotConst);
+            assert_eq!(constness, Constness::NotConst);
 
             for trait_ref in traits::elaborate_trait_ref(tcx, base_trait_ref) {
                 debug!(
@@ -1511,6 +1602,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                     ty::Predicate::Trait(pred, _) => {
                         associated_types.entry(span).or_default().extend(
                             tcx.associated_items(pred.def_id())
+                                .in_definition_order()
                                 .filter(|item| item.kind == ty::AssocKind::Type)
                                 .map(|item| item.def_id),
                         );
@@ -1548,7 +1640,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         }
 
         for (projection_bound, _) in &bounds.projection_bounds {
-            for (_, def_ids) in &mut associated_types {
+            for def_ids in associated_types.values_mut() {
                 def_ids.remove(&projection_bound.projection_def_id());
             }
         }
@@ -1657,7 +1749,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         potential_assoc_types: Vec<Span>,
         trait_bounds: &[hir::PolyTraitRef<'_>],
     ) {
-        if !associated_types.values().any(|v| v.len() > 0) {
+        if !associated_types.values().any(|v| !v.is_empty()) {
             return;
         }
         let tcx = self.tcx();
@@ -1772,7 +1864,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             {
                 let types: Vec<_> =
                     assoc_items.iter().map(|item| format!("{} = Type", item.ident)).collect();
-                let code = if snippet.ends_with(">") {
+                let code = if snippet.ends_with('>') {
                     // The user wrote `Trait<'a>` or similar and we don't have a type we can
                     // suggest, but at least we can clue them to the correct syntax
                     // `Trait<'a, Item = Type>` while accounting for the `<'a>` in the
@@ -1965,13 +2057,11 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
 
             let mut where_bounds = vec![];
             for bound in bounds {
+                let bound_id = bound.def_id();
                 let bound_span = self
                     .tcx()
-                    .associated_items(bound.def_id())
-                    .find(|item| {
-                        item.kind == ty::AssocKind::Type
-                            && self.tcx().hygienic_eq(assoc_name, item.ident, bound.def_id())
-                    })
+                    .associated_items(bound_id)
+                    .find_by_name_and_kind(self.tcx(), assoc_name, ty::AssocKind::Type, bound_id)
                     .and_then(|item| self.tcx().hir().span_if_local(item.def_id));
 
                 if let Some(bound_span) = bound_span {
@@ -2049,7 +2139,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         );
 
         let all_candidate_names: Vec<_> = all_candidates()
-            .map(|r| self.tcx().associated_items(r.def_id()))
+            .map(|r| self.tcx().associated_items(r.def_id()).in_definition_order())
             .flatten()
             .filter_map(
                 |item| if item.kind == ty::AssocKind::Type { Some(item.ident.name) } else { None },
@@ -2195,9 +2285,13 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         let trait_did = bound.def_id();
         let (assoc_ident, def_scope) =
             tcx.adjust_ident_and_get_scope(assoc_ident, trait_did, hir_ref_id);
+
+        // We have already adjusted the item name above, so compare with `ident.modern()` instead
+        // of calling `filter_by_name_and_kind`.
         let item = tcx
             .associated_items(trait_did)
-            .find(|i| Namespace::from(i.kind) == Namespace::Type && i.ident.modern() == assoc_ident)
+            .in_definition_order()
+            .find(|i| i.kind.namespace() == Namespace::TypeNS && i.ident.modern() == assoc_ident)
             .expect("missing associated type");
 
         let ty = self.projected_ty_from_poly_trait_ref(span, item.def_id, assoc_segment, bound);
@@ -2211,34 +2305,31 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         tcx.check_stability(item.def_id, Some(hir_ref_id), span);
 
         if let Some(variant_def_id) = variant_resolution {
-            let mut err = tcx.struct_span_lint_hir(
-                AMBIGUOUS_ASSOCIATED_ITEMS,
-                hir_ref_id,
-                span,
-                "ambiguous associated item",
-            );
+            tcx.struct_span_lint_hir(AMBIGUOUS_ASSOCIATED_ITEMS, hir_ref_id, span, |lint| {
+                let mut err = lint.build("ambiguous associated item");
+                let mut could_refer_to = |kind: DefKind, def_id, also| {
+                    let note_msg = format!(
+                        "`{}` could{} refer to the {} defined here",
+                        assoc_ident,
+                        also,
+                        kind.descr(def_id)
+                    );
+                    err.span_note(tcx.def_span(def_id), &note_msg);
+                };
 
-            let mut could_refer_to = |kind: DefKind, def_id, also| {
-                let note_msg = format!(
-                    "`{}` could{} refer to {} defined here",
-                    assoc_ident,
-                    also,
-                    kind.descr(def_id)
+                could_refer_to(DefKind::Variant, variant_def_id, "");
+                could_refer_to(kind, item.def_id, " also");
+
+                err.span_suggestion(
+                    span,
+                    "use fully-qualified syntax",
+                    format!("<{} as {}>::{}", qself_ty, tcx.item_name(trait_did), assoc_ident),
+                    Applicability::MachineApplicable,
                 );
-                err.span_note(tcx.def_span(def_id), &note_msg);
-            };
-            could_refer_to(DefKind::Variant, variant_def_id, "");
-            could_refer_to(kind, item.def_id, " also");
 
-            err.span_suggestion(
-                span,
-                "use fully-qualified syntax",
-                format!("<{} as {}>::{}", qself_ty, tcx.item_name(trait_did), assoc_ident),
-                Applicability::MachineApplicable,
-            )
-            .emit();
+                err.emit();
+            });
         }
-
         Ok((ty, kind, item.def_id))
     }
 
@@ -2354,10 +2445,11 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                     break;
                 }
             }
-            for binding in segment.generic_args().bindings {
+
+            // Only emit the first error to avoid overloading the user with error messages.
+            if let [binding, ..] = segment.generic_args().bindings {
                 has_err = true;
                 Self::prohibit_assoc_ty_binding(self.tcx(), binding.span);
-                break;
             }
         }
         has_err
@@ -2630,7 +2722,13 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             }
             hir::TyKind::BareFn(ref bf) => {
                 require_c_abi_if_c_variadic(tcx, &bf.decl, bf.abi, ast_ty.span);
-                tcx.mk_fn_ptr(self.ty_of_fn(bf.unsafety, bf.abi, &bf.decl, &[], None))
+                tcx.mk_fn_ptr(self.ty_of_fn(
+                    bf.unsafety,
+                    bf.abi,
+                    &bf.decl,
+                    &hir::Generics::empty(),
+                    None,
+                ))
             }
             hir::TyKind::TraitObject(ref bounds, ref lifetime) => {
                 self.conv_object_ty_poly_trait_ref(ast_ty.span, bounds, lifetime)
@@ -2813,25 +2911,27 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         unsafety: hir::Unsafety,
         abi: abi::Abi,
         decl: &hir::FnDecl<'_>,
-        generic_params: &[hir::GenericParam<'_>],
+        generics: &hir::Generics<'_>,
         ident_span: Option<Span>,
     ) -> ty::PolyFnSig<'tcx> {
         debug!("ty_of_fn");
 
         let tcx = self.tcx();
 
-        // We proactively collect all the infered type params to emit a single error per fn def.
+        // We proactively collect all the inferred type params to emit a single error per fn def.
         let mut visitor = PlaceholderHirTyCollector::default();
         for ty in decl.inputs {
             visitor.visit_ty(ty);
         }
+        walk_generics(&mut visitor, generics);
+
         let input_tys = decl.inputs.iter().map(|a| self.ty_of_arg(a, None));
         let output_ty = match decl.output {
-            hir::FunctionRetTy::Return(ref output) => {
+            hir::FnRetTy::Return(ref output) => {
                 visitor.visit_ty(output);
                 self.ast_ty_to_ty(output)
             }
-            hir::FunctionRetTy::DefaultReturn(..) => tcx.mk_unit(),
+            hir::FnRetTy::DefaultReturn(..) => tcx.mk_unit(),
         };
 
         debug!("ty_of_fn: output_ty={:?}", output_ty);
@@ -2846,7 +2946,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             crate::collect::placeholder_type_error(
                 tcx,
                 ident_span.map(|sp| sp.shrink_to_hi()).unwrap_or(DUMMY_SP),
-                generic_params,
+                &generics.params[..],
                 visitor.0,
                 ident_span.is_some(),
             );
@@ -2872,8 +2972,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                 tcx.sess,
                 decl.output.span(),
                 E0581,
-                "return type references {} \
-                                            which is not constrained by the fn input types",
+                "return type references {} which is not constrained by the fn input types",
                 lifetime_name
             );
             if let ty::BrAnon(_) = *br {
@@ -2884,8 +2983,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                 // though we can easily give a hint that ought to be
                 // relevant.
                 err.note(
-                    "lifetimes appearing in an associated type \
-                          are not considered constrained",
+                    "lifetimes appearing in an associated type are not considered constrained",
                 );
             }
             err.emit();
diff --git a/src/librustc_typeck/check/_match.rs b/src/librustc_typeck/check/_match.rs
index 686cdfbc08..2c71fec680 100644
--- a/src/librustc_typeck/check/_match.rs
+++ b/src/librustc_typeck/check/_match.rs
@@ -1,11 +1,11 @@
 use crate::check::coercion::CoerceMany;
 use crate::check::{Diverges, Expectation, FnCtxt, Needs};
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::traits::ObligationCauseCode;
-use rustc::traits::{IfExpressionCause, MatchExpressionArmCause, ObligationCause};
 use rustc::ty::Ty;
 use rustc_hir as hir;
 use rustc_hir::ExprKind;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::traits::ObligationCauseCode;
+use rustc_infer::traits::{IfExpressionCause, MatchExpressionArmCause, ObligationCause};
 use rustc_span::Span;
 
 impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
diff --git a/src/librustc_typeck/check/autoderef.rs b/src/librustc_typeck/check/autoderef.rs
index e4dec97183..67bfb09025 100644
--- a/src/librustc_typeck/check/autoderef.rs
+++ b/src/librustc_typeck/check/autoderef.rs
@@ -1,17 +1,17 @@
 use super::method::MethodCallee;
 use super::{FnCtxt, Needs, PlaceOp};
 
-use rustc::infer::{InferCtxt, InferOk};
 use rustc::session::DiagnosticMessageId;
-use rustc::traits::{self, TraitEngine};
 use rustc::ty::adjustment::{Adjust, Adjustment, OverloadedDeref};
 use rustc::ty::{self, TraitRef, Ty, TyCtxt, WithConstness};
 use rustc::ty::{ToPredicate, TypeFoldable};
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
+use rustc_infer::infer::{InferCtxt, InferOk};
+use rustc_infer::traits::{self, TraitEngine};
 
+use rustc_ast::ast::Ident;
 use rustc_span::Span;
-use syntax::ast::Ident;
 
 use std::iter;
 
@@ -250,8 +250,8 @@ pub fn report_autoderef_recursion_limit_error<'tcx>(tcx: TyCtxt<'tcx>, span: Spa
         )
         .span_label(span, "deref recursion limit reached")
         .help(&format!(
-            "consider adding a `#![recursion_limit=\"{}\"]` attribute to your crate",
-            suggested_limit
+            "consider adding a `#![recursion_limit=\"{}\"]` attribute to your crate (`{}`)",
+            suggested_limit, tcx.crate_name,
         ))
         .emit();
     }
diff --git a/src/librustc_typeck/check/callee.rs b/src/librustc_typeck/check/callee.rs
index b33cc52b23..3f8019e64b 100644
--- a/src/librustc_typeck/check/callee.rs
+++ b/src/librustc_typeck/check/callee.rs
@@ -3,18 +3,18 @@ use super::method::MethodCallee;
 use super::{Expectation, FnCtxt, Needs, TupleArgumentsFlag};
 use crate::type_error_struct;
 
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use rustc::ty::adjustment::{Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability};
 use rustc::ty::subst::SubstsRef;
 use rustc::ty::{self, Ty, TyCtxt, TypeFoldable};
-use rustc::{infer, traits};
+use rustc_ast::ast::Ident;
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def::Res;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::{infer, traits};
 use rustc_span::Span;
 use rustc_target::spec::abi;
-use syntax::ast::Ident;
 
 /// Checks that it is legal to call methods of the trait corresponding
 /// to `trait_id` (this only cares about the trait, not the specific
diff --git a/src/librustc_typeck/check/cast.rs b/src/librustc_typeck/check/cast.rs
index d254a84df7..ff100c261f 100644
--- a/src/librustc_typeck/check/cast.rs
+++ b/src/librustc_typeck/check/cast.rs
@@ -36,18 +36,17 @@ use crate::type_error_struct;
 use crate::util::common::ErrorReported;
 use rustc::middle::lang_items;
 use rustc::session::Session;
-use rustc::traits;
-use rustc::traits::error_reporting::report_object_safety_error;
-use rustc::traits::object_safety_violations;
 use rustc::ty::adjustment::AllowTwoPhase;
 use rustc::ty::cast::{CastKind, CastTy};
 use rustc::ty::error::TypeError;
 use rustc::ty::subst::SubstsRef;
 use rustc::ty::{self, Ty, TypeAndMut, TypeFoldable};
+use rustc_ast::ast;
 use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
+use rustc_infer::traits;
+use rustc_infer::traits::error_reporting::report_object_safety_error;
 use rustc_span::Span;
-use syntax::ast;
 
 /// Reifies a cast check to be checked once we have full type information for
 /// a function context.
@@ -468,23 +467,20 @@ impl<'a, 'tcx> CastCheck<'tcx> {
         } else {
             ("", lint::builtin::TRIVIAL_CASTS)
         };
-        let mut err = fcx.tcx.struct_span_lint_hir(
-            lint,
-            self.expr.hir_id,
-            self.span,
-            &format!(
+        fcx.tcx.struct_span_lint_hir(lint, self.expr.hir_id, self.span, |err| {
+            err.build(&format!(
                 "trivial {}cast: `{}` as `{}`",
                 adjective,
                 fcx.ty_to_string(t_expr),
                 fcx.ty_to_string(t_cast)
-            ),
-        );
-        err.help(&format!(
-            "cast can be replaced by coercion; this might \
-                           require {}a temporary variable",
-            type_asc_or
-        ));
-        err.emit();
+            ))
+            .help(&format!(
+                "cast can be replaced by coercion; this might \
+                                   require {}a temporary variable",
+                type_asc_or
+            ))
+            .emit();
+        });
     }
 
     pub fn check(mut self, fcx: &FnCtxt<'a, 'tcx>) {
@@ -520,7 +516,7 @@ impl<'a, 'tcx> CastCheck<'tcx> {
     }
 
     fn report_object_unsafe_cast(&self, fcx: &FnCtxt<'a, 'tcx>, did: DefId) {
-        let violations = object_safety_violations(fcx.tcx, did);
+        let violations = fcx.tcx.object_safety_violations(did);
         let mut err = report_object_safety_error(fcx.tcx, self.cast_span, did, violations);
         err.note(&format!("required by cast to type '{}'", fcx.ty_to_string(self.cast_ty)));
         err.emit();
diff --git a/src/librustc_typeck/check/closure.rs b/src/librustc_typeck/check/closure.rs
index 084e6c8d08..8689db1b1e 100644
--- a/src/librustc_typeck/check/closure.rs
+++ b/src/librustc_typeck/check/closure.rs
@@ -4,16 +4,16 @@ use super::{check_fn, Expectation, FnCtxt, GeneratorTypes};
 
 use crate::astconv::AstConv;
 use crate::middle::{lang_items, region};
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::infer::LateBoundRegionConversionTime;
-use rustc::infer::{InferOk, InferResult};
-use rustc::traits::error_reporting::ArgKind;
-use rustc::traits::Obligation;
 use rustc::ty::fold::TypeFoldable;
 use rustc::ty::subst::InternalSubsts;
 use rustc::ty::{self, GenericParamDefKind, Ty};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::infer::LateBoundRegionConversionTime;
+use rustc_infer::infer::{InferOk, InferResult};
+use rustc_infer::traits::error_reporting::ArgKind;
+use rustc_infer::traits::Obligation;
 use rustc_span::source_map::Span;
 use rustc_target::spec::abi::Abi;
 use std::cmp;
@@ -92,8 +92,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 .into(),
             GenericParamDefKind::Const => span_bug!(expr.span, "closure has const param"),
         });
-        if let Some(GeneratorTypes { yield_ty, interior, movability }) = generator_types {
+        if let Some(GeneratorTypes { resume_ty, yield_ty, interior, movability }) = generator_types
+        {
             let generator_substs = substs.as_generator();
+            self.demand_eqtype(
+                expr.span,
+                resume_ty,
+                generator_substs.resume_ty(expr_def_id, self.tcx),
+            );
             self.demand_eqtype(
                 expr.span,
                 yield_ty,
@@ -170,7 +176,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     .next();
                 let kind = object_type
                     .principal_def_id()
-                    .and_then(|did| self.tcx.lang_items().fn_trait_kind(did));
+                    .and_then(|did| self.tcx.fn_trait_kind_from_lang_item(did));
                 (sig, kind)
             }
             ty::Infer(ty::TyVar(vid)) => self.deduce_expectations_from_obligations(vid),
@@ -208,7 +214,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // many viable options, so pick the most restrictive.
         let expected_kind = self
             .obligations_for_self_ty(expected_vid)
-            .filter_map(|(tr, _)| self.tcx.lang_items().fn_trait_kind(tr.def_id()))
+            .filter_map(|(tr, _)| self.tcx.fn_trait_kind_from_lang_item(tr.def_id()))
             .fold(None, |best, cur| Some(best.map_or(cur, |best| cmp::min(best, cur))));
 
         (expected_sig, expected_kind)
@@ -231,7 +237,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         let trait_ref = projection.to_poly_trait_ref(tcx);
 
-        let is_fn = tcx.lang_items().fn_trait_kind(trait_ref.def_id()).is_some();
+        let is_fn = tcx.fn_trait_kind_from_lang_item(trait_ref.def_id()).is_some();
         let gen_trait = tcx.require_lang_item(lang_items::GeneratorTraitLangItem, cause_span);
         let is_gen = gen_trait == trait_ref.def_id();
         if !is_fn && !is_gen {
@@ -242,7 +248,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         if is_gen {
             // Check that we deduce the signature from the `<_ as std::ops::Generator>::Return`
             // associated item and not yield.
-            let return_assoc_item = self.tcx.associated_items(gen_trait).nth(1).unwrap().def_id;
+            let return_assoc_item =
+                self.tcx.associated_items(gen_trait).in_definition_order().nth(1).unwrap().def_id;
             if return_assoc_item != projection.projection_def_id() {
                 debug!("deduce_sig_from_projection: not return assoc item of generator");
                 return None;
@@ -259,8 +266,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 _ => return None,
             }
         } else {
-            // Generators cannot have explicit arguments.
-            vec![]
+            // Generators with a `()` resume type may be defined with 0 or 1 explicit arguments,
+            // else they must have exactly 1 argument. For now though, just give up in this case.
+            return None;
         };
 
         let ret_param_ty = projection.skip_binder().ty;
@@ -548,8 +556,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // First, convert the types that the user supplied (if any).
         let supplied_arguments = decl.inputs.iter().map(|a| astconv.ast_ty_to_ty(a));
         let supplied_return = match decl.output {
-            hir::FunctionRetTy::Return(ref output) => astconv.ast_ty_to_ty(&output),
-            hir::FunctionRetTy::DefaultReturn(_) => match body.generator_kind {
+            hir::FnRetTy::Return(ref output) => astconv.ast_ty_to_ty(&output),
+            hir::FnRetTy::DefaultReturn(_) => match body.generator_kind {
                 // In the case of the async block that we create for a function body,
                 // we expect the return type of the block to match that of the enclosing
                 // function.
@@ -666,7 +674,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         // The `Future` trait has only one associted item, `Output`,
         // so check that this is what we see.
-        let output_assoc_item = self.tcx.associated_items(future_trait).nth(0).unwrap().def_id;
+        let output_assoc_item =
+            self.tcx.associated_items(future_trait).in_definition_order().next().unwrap().def_id;
         if output_assoc_item != predicate.projection_ty.item_def_id {
             span_bug!(
                 cause_span,
@@ -696,7 +705,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             self.tcx.types.err
         });
 
-        if let hir::FunctionRetTy::Return(ref output) = decl.output {
+        if let hir::FnRetTy::Return(ref output) = decl.output {
             astconv.ast_ty_to_ty(&output);
         }
 
diff --git a/src/librustc_typeck/check/coercion.rs b/src/librustc_typeck/check/coercion.rs
index bedef5042f..3720b74d92 100644
--- a/src/librustc_typeck/check/coercion.rs
+++ b/src/librustc_typeck/check/coercion.rs
@@ -52,11 +52,7 @@
 
 use crate::astconv::AstConv;
 use crate::check::{FnCtxt, Needs};
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::infer::{Coercion, InferOk, InferResult};
 use rustc::session::parse::feature_err;
-use rustc::traits::object_safety_violations;
-use rustc::traits::{self, ObligationCause, ObligationCauseCode};
 use rustc::ty::adjustment::{
     Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability, PointerCast,
 };
@@ -68,6 +64,9 @@ use rustc::ty::{self, Ty, TypeAndMut};
 use rustc_errors::{struct_span_err, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::infer::{Coercion, InferOk, InferResult};
+use rustc_infer::traits::{self, ObligationCause, ObligationCauseCode};
 use rustc_span::symbol::sym;
 use rustc_span::{self, Span};
 use rustc_target::spec::abi::Abi;
@@ -1363,7 +1362,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
         fcx: &FnCtxt<'a, 'tcx>,
         expected: Ty<'tcx>,
         sp: Span,
-        fn_output: &hir::FunctionRetTy<'_>,
+        fn_output: &hir::FnRetTy<'_>,
     ) {
         let return_sp = fn_output.span();
         err.span_label(return_sp, "expected because this return type...");
@@ -1389,7 +1388,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
         let has_impl = snippet_iter.next().map_or(false, |s| s == "impl");
         // Only suggest `Box<dyn Trait>` if `Trait` in `impl Trait` is object safe.
         let mut is_object_safe = false;
-        if let hir::FunctionRetTy::Return(ty) = fn_output {
+        if let hir::FnRetTy::Return(ty) = fn_output {
             // Get the return type.
             if let hir::TyKind::Def(..) = ty.kind {
                 let ty = AstConv::ast_ty_to_ty(fcx, ty);
@@ -1404,7 +1403,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
                         // Are of this `impl Trait`'s traits object safe?
                         is_object_safe = bounds.iter().all(|bound| {
                             bound.trait_def_id().map_or(false, |def_id| {
-                                object_safety_violations(fcx.tcx, def_id).is_empty()
+                                fcx.tcx.object_safety_violations(def_id).is_empty()
                             })
                         })
                     }
@@ -1430,7 +1429,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
 
     fn is_return_ty_unsized(&self, fcx: &FnCtxt<'a, 'tcx>, blk_id: hir::HirId) -> bool {
         if let Some((fn_decl, _)) = fcx.get_fn_decl(blk_id) {
-            if let hir::FunctionRetTy::Return(ty) = fn_decl.output {
+            if let hir::FnRetTy::Return(ty) = fn_decl.output {
                 let ty = AstConv::ast_ty_to_ty(fcx, ty);
                 if let ty::Dynamic(..) = ty.kind {
                     return true;
diff --git a/src/librustc_typeck/check/compare_method.rs b/src/librustc_typeck/check/compare_method.rs
index 414f80d84b..8b54b53437 100644
--- a/src/librustc_typeck/check/compare_method.rs
+++ b/src/librustc_typeck/check/compare_method.rs
@@ -1,6 +1,4 @@
 use rustc::hir::map::Map;
-use rustc::infer::{self, InferOk};
-use rustc::traits::{self, ObligationCause, ObligationCauseCode, Reveal};
 use rustc::ty::error::{ExpectedFound, TypeError};
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::util::ExplicitSelf;
@@ -11,6 +9,8 @@ use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::intravisit;
 use rustc_hir::{GenericParamKind, ImplItemKind, TraitItemKind};
+use rustc_infer::infer::{self, InferOk, TyCtxtInferExt};
+use rustc_infer::traits::{self, ObligationCause, ObligationCauseCode, Reveal};
 use rustc_span::Span;
 
 use super::{potentially_plural_count, FnCtxt, Inherited};
diff --git a/src/librustc_typeck/check/demand.rs b/src/librustc_typeck/check/demand.rs
index e0f9fcc693..3a2a315a10 100644
--- a/src/librustc_typeck/check/demand.rs
+++ b/src/librustc_typeck/check/demand.rs
@@ -1,15 +1,15 @@
 use crate::check::FnCtxt;
-use rustc::infer::InferOk;
-use rustc::traits::{self, ObligationCause};
+use rustc_infer::infer::InferOk;
+use rustc_infer::traits::{self, ObligationCause};
 
 use rustc::ty::adjustment::AllowTwoPhase;
 use rustc::ty::{self, AssocItem, Ty};
+use rustc_ast::util::parser::PREC_POSTFIX;
 use rustc_errors::{Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::{is_range_literal, print, Node};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::util::parser::PREC_POSTFIX;
 
 use super::method::probe;
 
@@ -24,6 +24,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         self.annotate_expected_due_to_let_ty(err, expr);
         self.suggest_compatible_variants(err, expr, expected, expr_ty);
         self.suggest_ref_or_into(err, expr, expected, expr_ty);
+        if self.suggest_calling_boxed_future_when_appropriate(err, expr, expected, expr_ty) {
+            return;
+        }
         self.suggest_boxing_when_appropriate(err, expr, expected, expr_ty);
         self.suggest_missing_await(err, expr, expected, expr_ty);
     }
@@ -40,7 +43,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         expected: Ty<'tcx>,
         actual: Ty<'tcx>,
     ) -> Option<DiagnosticBuilder<'tcx>> {
-        let cause = &self.misc(sp);
+        self.demand_suptype_with_origin(&self.misc(sp), expected, actual)
+    }
+
+    pub fn demand_suptype_with_origin(
+        &self,
+        cause: &ObligationCause<'tcx>,
+        expected: Ty<'tcx>,
+        actual: Ty<'tcx>,
+    ) -> Option<DiagnosticBuilder<'tcx>> {
         match self.at(cause, self.param_env).sup(expected, actual) {
             Ok(InferOk { obligations, value: () }) => {
                 self.register_predicates(obligations);
@@ -225,8 +236,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     //
                     // FIXME? Other potential candidate methods: `as_ref` and
                     // `as_mut`?
-                    .find(|a| a.check_name(sym::rustc_conversion_suggestion))
-                    .is_some()
+                    .any(|a| a.check_name(sym::rustc_conversion_suggestion))
         });
 
         methods
@@ -321,13 +331,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         hir_id: hir::HirId,
         sp: Span,
     ) -> bool {
-        let cm = self.sess().source_map();
+        let sm = self.sess().source_map();
         let parent_id = self.tcx.hir().get_parent_node(hir_id);
         if let Some(parent) = self.tcx.hir().find(parent_id) {
             // Account for fields
             if let Node::Expr(hir::Expr { kind: hir::ExprKind::Struct(_, fields, ..), .. }) = parent
             {
-                if let Ok(src) = cm.span_to_snippet(sp) {
+                if let Ok(src) = sm.span_to_snippet(sp) {
                     for field in *fields {
                         if field.ident.as_str() == src && field.is_shorthand {
                             return true;
@@ -361,9 +371,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         checked_ty: Ty<'tcx>,
         expected: Ty<'tcx>,
     ) -> Option<(Span, &'static str, String)> {
-        let cm = self.sess().source_map();
+        let sm = self.sess().source_map();
         let sp = expr.span;
-        if !cm.span_to_filename(sp).is_real() {
+        if !sm.span_to_filename(sp).is_real() {
             // Ignore if span is from within a macro #41858, #58298. We previously used the macro
             // call span, but that breaks down when the type error comes from multiple calls down.
             return None;
@@ -385,7 +395,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     if arr == self.tcx.types.u8 =>
                 {
                     if let hir::ExprKind::Lit(_) = expr.kind {
-                        if let Ok(src) = cm.span_to_snippet(sp) {
+                        if let Ok(src) = sm.span_to_snippet(sp) {
                             if src.starts_with("b\"") {
                                 return Some((
                                     sp,
@@ -400,8 +410,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     if arr == self.tcx.types.u8 =>
                 {
                     if let hir::ExprKind::Lit(_) = expr.kind {
-                        if let Ok(src) = cm.span_to_snippet(sp) {
-                            if src.starts_with("\"") {
+                        if let Ok(src) = sm.span_to_snippet(sp) {
+                            if src.starts_with('"') {
                                 return Some((
                                     sp,
                                     "consider adding a leading `b`",
@@ -447,7 +457,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                             sugg_sp = arg.span;
                         }
                     }
-                    if let Ok(src) = cm.span_to_snippet(sugg_sp) {
+                    if let Ok(src) = sm.span_to_snippet(sugg_sp) {
                         let needs_parens = match expr.kind {
                             // parenthesize if needed (Issue #46756)
                             hir::ExprKind::Cast(_, _) | hir::ExprKind::Binary(_, _, _) => true,
@@ -477,7 +487,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                 //                                   |     |
                                 //    consider dereferencing here: `*opt`  |
                                 // expected mutable reference, found enum `Option`
-                                if let Ok(src) = cm.span_to_snippet(left_expr.span) {
+                                if let Ok(src) = sm.span_to_snippet(left_expr.span) {
                                     return Some((
                                         left_expr.span,
                                         "consider dereferencing here to assign to the mutable \
@@ -513,9 +523,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             {
                 // We have `&T`, check if what was expected was `T`. If so,
                 // we may want to suggest removing a `&`.
-                if !cm.span_to_filename(expr.span).is_real() {
-                    if let Ok(code) = cm.span_to_snippet(sp) {
-                        if code.chars().next() == Some('&') {
+                if !sm.span_to_filename(expr.span).is_real() {
+                    if let Ok(code) = sm.span_to_snippet(sp) {
+                        if code.starts_with('&') {
                             return Some((
                                 sp,
                                 "consider removing the borrow",
@@ -525,7 +535,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     }
                     return None;
                 }
-                if let Ok(code) = cm.span_to_snippet(expr.span) {
+                if let Ok(code) = sm.span_to_snippet(expr.span) {
                     return Some((sp, "consider removing the borrow", code));
                 }
             }
@@ -536,6 +546,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 let item_def_id = self
                     .tcx
                     .associated_items(deref_trait)
+                    .in_definition_order()
                     .find(|item| item.kind == ty::AssocKind::Type)
                     .unwrap()
                     .def_id;
@@ -558,7 +569,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 let is_copy = self.infcx.type_is_copy_modulo_regions(self.param_env, expected, sp);
 
                 if is_copy && impls_deref {
-                    if let Ok(code) = cm.span_to_snippet(sp) {
+                    if let Ok(code) = sm.span_to_snippet(sp) {
                         let message = if checked_ty.is_region_ptr() {
                             "consider dereferencing the borrow"
                         } else {
@@ -697,7 +708,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 {
                     // Remove fractional part from literal, for example `42.0f32` into `42`
                     let src = src.trim_end_matches(&checked_ty.to_string());
-                    src.split(".").next().unwrap()
+                    src.split('.').next().unwrap()
                 } else {
                     src.trim_end_matches(&checked_ty.to_string())
                 },
@@ -797,9 +808,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         );
                         err.warn(
                             "if the rounded value cannot be represented by the target \
-                                  integer type, including `Inf` and `NaN`, casting will cause \
-                                  undefined behavior \
-                                  (https://github.com/rust-lang/rust/issues/10184)",
+                                integer type, including `Inf` and `NaN`, casting will cause \
+                                undefined behavior \
+                                (see issue #10184 <https://github.com/rust-lang/rust/issues/10184> \
+                                for more information)",
                         );
                     }
                     true
diff --git a/src/librustc_typeck/check/dropck.rs b/src/librustc_typeck/check/dropck.rs
index 32773e2ed8..ead7536f8c 100644
--- a/src/librustc_typeck/check/dropck.rs
+++ b/src/librustc_typeck/check/dropck.rs
@@ -2,16 +2,15 @@ use crate::check::regionck::RegionCtxt;
 use crate::hir;
 use crate::hir::def_id::DefId;
 use crate::util::common::ErrorReported;
-use rustc::infer::outlives::env::OutlivesEnvironment;
-use rustc::infer::{InferOk, SuppressRegionErrors};
 use rustc::middle::region;
-use rustc::traits::{ObligationCause, TraitEngine, TraitEngineExt};
 use rustc::ty::error::TypeError;
 use rustc::ty::relate::{Relate, RelateResult, TypeRelation};
 use rustc::ty::subst::{Subst, SubstsRef};
 use rustc::ty::{self, Predicate, Ty, TyCtxt};
 use rustc_errors::struct_span_err;
-
+use rustc_infer::infer::outlives::env::OutlivesEnvironment;
+use rustc_infer::infer::{InferOk, SuppressRegionErrors, TyCtxtInferExt};
+use rustc_infer::traits::{ObligationCause, TraitEngine, TraitEngineExt};
 use rustc_span::Span;
 
 /// This function confirms that the `Drop` implementation identified by
diff --git a/src/librustc_typeck/check/expr.rs b/src/librustc_typeck/check/expr.rs
index 2d704145e9..7570d9d4b2 100644
--- a/src/librustc_typeck/check/expr.rs
+++ b/src/librustc_typeck/check/expr.rs
@@ -17,26 +17,26 @@ use crate::check::TupleArgumentsFlag::DontTupleArguments;
 use crate::type_error_struct;
 use crate::util::common::ErrorReported;
 
-use rustc::infer;
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use rustc::middle::lang_items;
-use rustc::traits::{self, ObligationCauseCode};
 use rustc::ty;
 use rustc::ty::adjustment::{Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability};
 use rustc::ty::Ty;
 use rustc::ty::TypeFoldable;
 use rustc::ty::{AdtKind, Visibility};
+use rustc_ast::ast;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder, DiagnosticId};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};
 use rustc_hir::def_id::DefId;
 use rustc_hir::{ExprKind, QPath};
+use rustc_infer::infer;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::traits::{self, ObligationCauseCode};
 use rustc_span::hygiene::DesugaringKind;
 use rustc_span::source_map::Span;
 use rustc_span::symbol::{kw, sym, Symbol};
-use syntax::ast;
-use syntax::util::lev_distance::find_best_match_for_name;
 
 use std::fmt::Display;
 
@@ -404,7 +404,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let needs = Needs::maybe_mut_place(mutbl);
         let ty = self.check_expr_with_expectation_and_needs(&oprnd, hint, needs);
 
-        let tm = ty::TypeAndMut { ty: ty, mutbl: mutbl };
+        let tm = ty::TypeAndMut { ty, mutbl };
         match kind {
             _ if tm.ty.references_error() => self.tcx.types.err,
             hir::BorrowKind::Raw => {
@@ -1012,6 +1012,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             Ok(self.to_const(count, tcx.type_of(count_def_id)))
         } else {
             tcx.const_eval_poly(count_def_id)
+                .map(|val| ty::Const::from_value(tcx, val, tcx.type_of(count_def_id)))
         };
 
         let uty = match expected {
@@ -1587,7 +1588,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 &format!("a method `{}` also exists, call it with parentheses", field),
                 field,
                 expr_t,
-                expr.hir_id,
+                expr,
             );
         }
         err.emit();
@@ -1610,7 +1611,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 "use parentheses to call the method",
                 field,
                 expr_t,
-                expr.hir_id,
+                expr,
             );
         } else {
             err.help("methods are immutable and cannot be assigned to");
@@ -1797,9 +1798,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         expr: &'tcx hir::Expr<'tcx>,
         src: &'tcx hir::YieldSource,
     ) -> Ty<'tcx> {
-        match self.yield_ty {
-            Some(ty) => {
-                self.check_expr_coercable_to_type(&value, ty);
+        match self.resume_yield_tys {
+            Some((resume_ty, yield_ty)) => {
+                self.check_expr_coercable_to_type(&value, yield_ty);
+
+                resume_ty
             }
             // Given that this `yield` expression was generated as a result of lowering a `.await`,
             // we know that the yield type must be `()`; however, the context won't contain this
@@ -1807,6 +1810,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             // value's type against `()` (this check should always hold).
             None if src == &hir::YieldSource::Await => {
                 self.check_expr_coercable_to_type(&value, self.tcx.mk_unit());
+                self.tcx.mk_unit()
             }
             _ => {
                 struct_span_err!(
@@ -1816,9 +1820,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     "yield expression outside of generator literal"
                 )
                 .emit();
+                self.tcx.mk_unit()
             }
         }
-        self.tcx.mk_unit()
     }
 }
 
diff --git a/src/librustc_typeck/check/generator_interior.rs b/src/librustc_typeck/check/generator_interior.rs
index 75cc2c132f..50692e0f10 100644
--- a/src/librustc_typeck/check/generator_interior.rs
+++ b/src/librustc_typeck/check/generator_interior.rs
@@ -7,7 +7,7 @@ use super::FnCtxt;
 use rustc::hir::map::Map;
 use rustc::middle::region::{self, YieldData};
 use rustc::ty::{self, Ty};
-use rustc_data_structures::fx::FxHashMap;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};
 use rustc_hir::def_id::DefId;
@@ -160,33 +160,39 @@ pub fn resolve_interior<'a, 'tcx>(
 
     debug!("types in generator {:?}, span = {:?}", types, body.value.span);
 
-    // Replace all regions inside the generator interior with late bound regions
-    // Note that each region slot in the types gets a new fresh late bound region,
-    // which means that none of the regions inside relate to any other, even if
-    // typeck had previously found constraints that would cause them to be related.
     let mut counter = 0;
-    let fold_types: Vec<_> = types.iter().map(|(t, _)| t.ty).collect();
-    let folded_types = fcx.tcx.fold_regions(&fold_types, &mut false, |_, current_depth| {
-        counter += 1;
-        fcx.tcx.mk_region(ty::ReLateBound(current_depth, ty::BrAnon(counter)))
-    });
-
-    // Store the generator types and spans into the tables for this generator.
-    let types = types
+    let mut captured_tys = FxHashSet::default();
+    let type_causes: Vec<_> = types
         .into_iter()
-        .zip(&folded_types)
-        .map(|((mut interior_cause, _), ty)| {
-            interior_cause.ty = ty;
-            interior_cause
+        .filter_map(|(mut cause, _)| {
+            // Erase regions and canonicalize late-bound regions to deduplicate as many types as we
+            // can.
+            let erased = fcx.tcx.erase_regions(&cause.ty);
+            if captured_tys.insert(erased) {
+                // Replace all regions inside the generator interior with late bound regions.
+                // Note that each region slot in the types gets a new fresh late bound region,
+                // which means that none of the regions inside relate to any other, even if
+                // typeck had previously found constraints that would cause them to be related.
+                let folded = fcx.tcx.fold_regions(&erased, &mut false, |_, current_depth| {
+                    counter += 1;
+                    fcx.tcx.mk_region(ty::ReLateBound(current_depth, ty::BrAnon(counter)))
+                });
+
+                cause.ty = folded;
+                Some(cause)
+            } else {
+                None
+            }
         })
         .collect();
-    visitor.fcx.inh.tables.borrow_mut().generator_interior_types = types;
-
-    // Extract type components
-    let type_list = fcx.tcx.mk_type_list(folded_types.iter());
 
+    // Extract type components to build the witness type.
+    let type_list = fcx.tcx.mk_type_list(type_causes.iter().map(|cause| cause.ty));
     let witness = fcx.tcx.mk_generator_witness(ty::Binder::bind(type_list));
 
+    // Store the generator types and spans into the tables for this generator.
+    visitor.fcx.inh.tables.borrow_mut().generator_interior_types = type_causes;
+
     debug!(
         "types in generator after region replacement {:?}, span = {:?}",
         witness, body.value.span
diff --git a/src/librustc_typeck/check/method/confirm.rs b/src/librustc_typeck/check/method/confirm.rs
index 832aa9f62f..108affe5a8 100644
--- a/src/librustc_typeck/check/method/confirm.rs
+++ b/src/librustc_typeck/check/method/confirm.rs
@@ -4,14 +4,14 @@ use crate::astconv::AstConv;
 use crate::check::{callee, FnCtxt, Needs, PlaceOp};
 use crate::hir::def_id::DefId;
 use crate::hir::GenericArg;
-use rustc::infer::{self, InferOk};
-use rustc::traits;
 use rustc::ty::adjustment::{Adjust, Adjustment, OverloadedDeref, PointerCast};
 use rustc::ty::adjustment::{AllowTwoPhase, AutoBorrow, AutoBorrowMutability};
 use rustc::ty::fold::TypeFoldable;
 use rustc::ty::subst::{Subst, SubstsRef};
 use rustc::ty::{self, GenericParamDefKind, Ty};
 use rustc_hir as hir;
+use rustc_infer::infer::{self, InferOk};
+use rustc_infer::traits;
 use rustc_span::Span;
 
 use std::ops::Deref;
@@ -32,7 +32,7 @@ impl<'a, 'tcx> Deref for ConfirmContext<'a, 'tcx> {
 
 pub struct ConfirmResult<'tcx> {
     pub callee: MethodCallee<'tcx>,
-    pub illegal_sized_bound: bool,
+    pub illegal_sized_bound: Option<Span>,
 }
 
 impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
@@ -112,7 +112,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
         // Add any trait/regions obligations specified on the method's type parameters.
         // We won't add these if we encountered an illegal sized bound, so that we can use
         // a custom error in that case.
-        if !illegal_sized_bound {
+        if illegal_sized_bound.is_none() {
             let method_ty = self.tcx.mk_fn_ptr(ty::Binder::bind(method_sig));
             self.add_obligations(method_ty, all_substs, &method_predicates);
         }
@@ -299,7 +299,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
         // If they were not explicitly supplied, just construct fresh
         // variables.
         let generics = self.tcx.generics_of(pick.item.def_id);
-        AstConv::check_generic_arg_count_for_call(
+        let arg_count_correct = AstConv::check_generic_arg_count_for_call(
             self.tcx, self.span, &generics, &seg, true, // `is_method_call`
         );
 
@@ -313,10 +313,16 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
             parent_substs,
             false,
             None,
+            arg_count_correct.is_ok(),
             // Provide the generic args, and whether types should be inferred.
-            |_| {
-                // The last argument of the returned tuple here is unimportant.
-                if let Some(ref data) = seg.args { (Some(data), false) } else { (None, false) }
+            |def_id| {
+                // The last component of the returned tuple here is unimportant.
+                if def_id == pick.item.def_id {
+                    if let Some(ref data) = seg.args {
+                        return (Some(data), false);
+                    }
+                }
+                (None, false)
             },
             // Provide substitutions for parameters for which (valid) arguments have been provided.
             |param, arg| match (&param.kind, arg) {
@@ -561,23 +567,31 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
     fn predicates_require_illegal_sized_bound(
         &self,
         predicates: &ty::InstantiatedPredicates<'tcx>,
-    ) -> bool {
+    ) -> Option<Span> {
         let sized_def_id = match self.tcx.lang_items().sized_trait() {
             Some(def_id) => def_id,
-            None => return false,
+            None => return None,
         };
 
         traits::elaborate_predicates(self.tcx, predicates.predicates.clone())
             .filter_map(|predicate| match predicate {
                 ty::Predicate::Trait(trait_pred, _) if trait_pred.def_id() == sized_def_id => {
-                    Some(trait_pred)
+                    let span = predicates
+                        .predicates
+                        .iter()
+                        .zip(predicates.spans.iter())
+                        .filter_map(|(p, span)| if *p == predicate { Some(*span) } else { None })
+                        .next()
+                        .unwrap_or(rustc_span::DUMMY_SP);
+                    Some((trait_pred, span))
                 }
                 _ => None,
             })
-            .any(|trait_pred| match trait_pred.skip_binder().self_ty().kind {
-                ty::Dynamic(..) => true,
-                _ => false,
+            .filter_map(|(trait_pred, span)| match trait_pred.skip_binder().self_ty().kind {
+                ty::Dynamic(..) => Some(span),
+                _ => None,
             })
+            .next()
     }
 
     fn enforce_illegal_method_limitations(&self, pick: &probe::Pick<'_>) {
diff --git a/src/librustc_typeck/check/method/mod.rs b/src/librustc_typeck/check/method/mod.rs
index c1cf3522b5..542a1ac453 100644
--- a/src/librustc_typeck/check/method/mod.rs
+++ b/src/librustc_typeck/check/method/mod.rs
@@ -11,20 +11,19 @@ pub use self::CandidateSource::*;
 pub use self::MethodError::*;
 
 use crate::check::FnCtxt;
-use crate::namespace::Namespace;
-use rustc::infer::{self, InferOk};
-use rustc::traits;
 use rustc::ty::subst::Subst;
 use rustc::ty::subst::{InternalSubsts, SubstsRef};
 use rustc::ty::GenericParamDefKind;
-use rustc::ty::{self, ToPolyTraitRef, ToPredicate, TraitRef, Ty, TypeFoldable, WithConstness};
+use rustc::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TypeFoldable, WithConstness};
+use rustc_ast::ast;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::{Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
-use rustc_hir::def::{CtorOf, DefKind};
+use rustc_hir::def::{CtorOf, DefKind, Namespace};
 use rustc_hir::def_id::DefId;
+use rustc_infer::infer::{self, InferOk};
+use rustc_infer::traits;
 use rustc_span::Span;
-use syntax::ast;
 
 use self::probe::{IsSuggestion, ProbeScope};
 
@@ -58,7 +57,7 @@ pub enum MethodError<'tcx> {
 
     // Found a `Self: Sized` bound where `Self` is a trait object, also the caller may have
     // forgotten to import a trait.
-    IllegalSizedBound(Vec<DefId>, bool),
+    IllegalSizedBound(Vec<DefId>, bool, Span),
 
     // Found a match, but the return type is wrong
     BadReturnType,
@@ -68,7 +67,7 @@ pub enum MethodError<'tcx> {
 // could lead to matches if satisfied, and a list of not-in-scope traits which may work.
 pub struct NoMatchData<'tcx> {
     pub static_candidates: Vec<CandidateSource>,
-    pub unsatisfied_predicates: Vec<TraitRef<'tcx>>,
+    pub unsatisfied_predicates: Vec<(ty::Predicate<'tcx>, Option<ty::Predicate<'tcx>>)>,
     pub out_of_scope_traits: Vec<DefId>,
     pub lev_candidate: Option<ty::AssocItem>,
     pub mode: probe::Mode,
@@ -77,7 +76,7 @@ pub struct NoMatchData<'tcx> {
 impl<'tcx> NoMatchData<'tcx> {
     pub fn new(
         static_candidates: Vec<CandidateSource>,
-        unsatisfied_predicates: Vec<TraitRef<'tcx>>,
+        unsatisfied_predicates: Vec<(ty::Predicate<'tcx>, Option<ty::Predicate<'tcx>>)>,
         out_of_scope_traits: Vec<DefId>,
         lev_candidate: Option<ty::AssocItem>,
         mode: probe::Mode,
@@ -135,7 +134,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         msg: &str,
         method_name: ast::Ident,
         self_ty: Ty<'tcx>,
-        call_expr_id: hir::HirId,
+        call_expr: &hir::Expr<'_>,
     ) {
         let has_params = self
             .probe_for_name(
@@ -144,7 +143,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 method_name,
                 IsSuggestion(false),
                 self_ty,
-                call_expr_id,
+                call_expr.hir_id,
                 ProbeScope::TraitsInScope,
             )
             .and_then(|pick| {
@@ -152,13 +151,21 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 Ok(sig.inputs().skip_binder().len() > 1)
             });
 
+        // Account for `foo.bar<T>`;
+        let sugg_span = method_name.span.with_hi(call_expr.span.hi());
+        let snippet = self
+            .tcx
+            .sess
+            .source_map()
+            .span_to_snippet(sugg_span)
+            .unwrap_or_else(|_| method_name.to_string());
         let (suggestion, applicability) = if has_params.unwrap_or_default() {
-            (format!("{}(...)", method_name), Applicability::HasPlaceholders)
+            (format!("{}(...)", snippet), Applicability::HasPlaceholders)
         } else {
-            (format!("{}()", method_name), Applicability::MaybeIncorrect)
+            (format!("{}()", snippet), Applicability::MaybeIncorrect)
         };
 
-        err.span_suggestion(method_name.span, msg, suggestion, applicability);
+        err.span_suggestion(sugg_span, msg, suggestion, applicability);
     }
 
     /// Performs method lookup. If lookup is successful, it will return the callee
@@ -204,7 +211,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let result =
             self.confirm_method(span, self_expr, call_expr, self_ty, pick.clone(), segment);
 
-        if result.illegal_sized_bound {
+        if let Some(span) = result.illegal_sized_bound {
             let mut needs_mut = false;
             if let ty::Ref(region, t_type, mutability) = self_ty.kind {
                 let trait_type = self
@@ -249,7 +256,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 _ => Vec::new(),
             };
 
-            return Err(IllegalSizedBound(candidates, needs_mut));
+            return Err(IllegalSizedBound(candidates, needs_mut, span));
         }
 
         Ok(result.callee)
@@ -334,7 +341,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // Trait must have a method named `m_name` and it should not have
         // type parameters or early-bound regions.
         let tcx = self.tcx;
-        let method_item = match self.associated_item(trait_def_id, m_name, Namespace::Value) {
+        let method_item = match self.associated_item(trait_def_id, m_name, Namespace::ValueNS) {
             Some(method_item) => method_item,
             None => {
                 tcx.sess.delay_span_bug(
@@ -452,12 +459,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             ProbeScope::TraitsInScope,
         )?;
         debug!("resolve_ufcs: pick={:?}", pick);
-        for import_id in pick.import_ids {
-            let import_def_id = tcx.hir().local_def_id(import_id);
-            debug!("resolve_ufcs: used_trait_import: {:?}", import_def_id);
-            Lrc::get_mut(&mut self.tables.borrow_mut().used_trait_imports)
-                .unwrap()
-                .insert(import_def_id);
+        {
+            let mut tables = self.tables.borrow_mut();
+            let used_trait_imports = Lrc::get_mut(&mut tables.used_trait_imports).unwrap();
+            for import_id in pick.import_ids {
+                let import_def_id = tcx.hir().local_def_id(import_id);
+                debug!("resolve_ufcs: used_trait_import: {:?}", import_def_id);
+                used_trait_imports.insert(import_def_id);
+            }
         }
 
         let def_kind = pick.item.def_kind();
@@ -474,8 +483,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         item_name: ast::Ident,
         ns: Namespace,
     ) -> Option<ty::AssocItem> {
-        self.tcx.associated_items(def_id).find(|item| {
-            Namespace::from(item.kind) == ns && self.tcx.hygienic_eq(item_name, item.ident, def_id)
-        })
+        self.tcx
+            .associated_items(def_id)
+            .find_by_name_and_namespace(self.tcx, item_name, ns, def_id)
+            .copied()
     }
 }
diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs
index 2444fc60f7..d35761a6a2 100644
--- a/src/librustc_typeck/check/method/probe.rs
+++ b/src/librustc_typeck/check/method/probe.rs
@@ -7,37 +7,36 @@ use crate::check::autoderef::{self, Autoderef};
 use crate::check::FnCtxt;
 use crate::hir::def::DefKind;
 use crate::hir::def_id::DefId;
-use crate::namespace::Namespace;
 
-use rustc::infer::canonical::OriginalQueryValues;
-use rustc::infer::canonical::{Canonical, QueryResponse};
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
-use rustc::infer::{self, InferOk};
 use rustc::lint;
 use rustc::middle::stability;
 use rustc::session::config::nightly_options;
-use rustc::traits::query::method_autoderef::MethodAutoderefBadTy;
-use rustc::traits::query::method_autoderef::{CandidateStep, MethodAutoderefStepsResult};
-use rustc::traits::query::CanonicalTyGoal;
-use rustc::traits::{self, ObligationCause};
 use rustc::ty::subst::{InternalSubsts, Subst, SubstsRef};
 use rustc::ty::GenericParamDefKind;
 use rustc::ty::{
-    self, ParamEnvAnd, ToPolyTraitRef, ToPredicate, TraitRef, Ty, TyCtxt, TypeFoldable,
-    WithConstness,
+    self, ParamEnvAnd, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness,
 };
+use rustc_ast::ast;
+use rustc_ast::util::lev_distance::{find_best_match_for_name, lev_distance};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_data_structures::sync::Lrc;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
+use rustc_hir::def::Namespace;
+use rustc_infer::infer::canonical::OriginalQueryValues;
+use rustc_infer::infer::canonical::{Canonical, QueryResponse};
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
+use rustc_infer::infer::{self, InferOk, TyCtxtInferExt};
+use rustc_infer::traits::query::method_autoderef::MethodAutoderefBadTy;
+use rustc_infer::traits::query::method_autoderef::{CandidateStep, MethodAutoderefStepsResult};
+use rustc_infer::traits::query::CanonicalTyGoal;
+use rustc_infer::traits::{self, ObligationCause};
 use rustc_span::{symbol::Symbol, Span, DUMMY_SP};
 use std::cmp::max;
 use std::iter;
 use std::mem;
 use std::ops::Deref;
-use syntax::ast;
-use syntax::util::lev_distance::{find_best_match_for_name, lev_distance};
 
 use smallvec::{smallvec, SmallVec};
 
@@ -78,7 +77,7 @@ struct ProbeContext<'a, 'tcx> {
 
     /// Collects near misses when trait bounds for type parameters are unsatisfied and is only used
     /// for error reporting
-    unsatisfied_predicates: Vec<TraitRef<'tcx>>,
+    unsatisfied_predicates: Vec<(ty::Predicate<'tcx>, Option<ty::Predicate<'tcx>>)>,
 
     is_suggestion: IsSuggestion,
 }
@@ -382,11 +381,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     )
                     .emit();
                 } else {
-                    self.tcx.lint_hir(
+                    self.tcx.struct_span_lint_hir(
                         lint::builtin::TYVAR_BEHIND_RAW_POINTER,
                         scope_expr_id,
                         span,
-                        "type annotations needed",
+                        |lint| lint.build("type annotations needed").emit(),
                     );
                 }
             } else {
@@ -573,7 +572,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
     }
 
     fn assemble_inherent_candidates(&mut self) {
-        let steps = self.steps.clone();
+        let steps = Lrc::clone(&self.steps);
         for step in steps.iter() {
             self.assemble_probe(&step.self_ty);
         }
@@ -636,87 +635,51 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                 self.assemble_inherent_impl_for_primitive(lang_def_id);
             }
             ty::Slice(_) => {
-                let lang_def_id = lang_items.slice_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-
-                let lang_def_id = lang_items.slice_u8_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-
-                let lang_def_id = lang_items.slice_alloc_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-
-                let lang_def_id = lang_items.slice_u8_alloc_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::RawPtr(ty::TypeAndMut { ty: _, mutbl: hir::Mutability::Not }) => {
-                let lang_def_id = lang_items.const_ptr_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::RawPtr(ty::TypeAndMut { ty: _, mutbl: hir::Mutability::Mut }) => {
-                let lang_def_id = lang_items.mut_ptr_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Int(ast::IntTy::I8) => {
-                let lang_def_id = lang_items.i8_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Int(ast::IntTy::I16) => {
-                let lang_def_id = lang_items.i16_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Int(ast::IntTy::I32) => {
-                let lang_def_id = lang_items.i32_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Int(ast::IntTy::I64) => {
-                let lang_def_id = lang_items.i64_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Int(ast::IntTy::I128) => {
-                let lang_def_id = lang_items.i128_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Int(ast::IntTy::Isize) => {
-                let lang_def_id = lang_items.isize_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Uint(ast::UintTy::U8) => {
-                let lang_def_id = lang_items.u8_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Uint(ast::UintTy::U16) => {
-                let lang_def_id = lang_items.u16_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Uint(ast::UintTy::U32) => {
-                let lang_def_id = lang_items.u32_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-            }
-            ty::Uint(ast::UintTy::U64) => {
-                let lang_def_id = lang_items.u64_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
+                for &lang_def_id in &[
+                    lang_items.slice_impl(),
+                    lang_items.slice_u8_impl(),
+                    lang_items.slice_alloc_impl(),
+                    lang_items.slice_u8_alloc_impl(),
+                ] {
+                    self.assemble_inherent_impl_for_primitive(lang_def_id);
+                }
             }
-            ty::Uint(ast::UintTy::U128) => {
-                let lang_def_id = lang_items.u128_impl();
+            ty::RawPtr(ty::TypeAndMut { ty: _, mutbl }) => {
+                let lang_def_id = match mutbl {
+                    hir::Mutability::Not => lang_items.const_ptr_impl(),
+                    hir::Mutability::Mut => lang_items.mut_ptr_impl(),
+                };
                 self.assemble_inherent_impl_for_primitive(lang_def_id);
             }
-            ty::Uint(ast::UintTy::Usize) => {
-                let lang_def_id = lang_items.usize_impl();
+            ty::Int(i) => {
+                let lang_def_id = match i {
+                    ast::IntTy::I8 => lang_items.i8_impl(),
+                    ast::IntTy::I16 => lang_items.i16_impl(),
+                    ast::IntTy::I32 => lang_items.i32_impl(),
+                    ast::IntTy::I64 => lang_items.i64_impl(),
+                    ast::IntTy::I128 => lang_items.i128_impl(),
+                    ast::IntTy::Isize => lang_items.isize_impl(),
+                };
                 self.assemble_inherent_impl_for_primitive(lang_def_id);
             }
-            ty::Float(ast::FloatTy::F32) => {
-                let lang_def_id = lang_items.f32_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-
-                let lang_def_id = lang_items.f32_runtime_impl();
+            ty::Uint(i) => {
+                let lang_def_id = match i {
+                    ast::UintTy::U8 => lang_items.u8_impl(),
+                    ast::UintTy::U16 => lang_items.u16_impl(),
+                    ast::UintTy::U32 => lang_items.u32_impl(),
+                    ast::UintTy::U64 => lang_items.u64_impl(),
+                    ast::UintTy::U128 => lang_items.u128_impl(),
+                    ast::UintTy::Usize => lang_items.usize_impl(),
+                };
                 self.assemble_inherent_impl_for_primitive(lang_def_id);
             }
-            ty::Float(ast::FloatTy::F64) => {
-                let lang_def_id = lang_items.f64_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
-
-                let lang_def_id = lang_items.f64_runtime_impl();
-                self.assemble_inherent_impl_for_primitive(lang_def_id);
+            ty::Float(f) => {
+                let (lang_def_id1, lang_def_id2) = match f {
+                    ast::FloatTy::F32 => (lang_items.f32_impl(), lang_items.f32_runtime_impl()),
+                    ast::FloatTy::F64 => (lang_items.f64_impl(), lang_items.f64_runtime_impl()),
+                };
+                self.assemble_inherent_impl_for_primitive(lang_def_id1);
+                self.assemble_inherent_impl_for_primitive(lang_def_id2);
             }
             _ => {}
         }
@@ -902,13 +865,10 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
             for trait_candidate in applicable_traits.iter() {
                 let trait_did = trait_candidate.def_id;
                 if duplicates.insert(trait_did) {
-                    let import_ids = trait_candidate
-                        .import_ids
-                        .iter()
-                        .map(|node_id| self.fcx.tcx.hir().node_to_hir_id(*node_id))
-                        .collect();
-                    let result =
-                        self.assemble_extension_candidates_for_trait(import_ids, trait_did);
+                    let result = self.assemble_extension_candidates_for_trait(
+                        &trait_candidate.import_ids,
+                        trait_did,
+                    );
                     result?;
                 }
             }
@@ -920,7 +880,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
         let mut duplicates = FxHashSet::default();
         for trait_info in suggest::all_traits(self.tcx) {
             if duplicates.insert(trait_info.def_id) {
-                self.assemble_extension_candidates_for_trait(smallvec![], trait_info.def_id)?;
+                self.assemble_extension_candidates_for_trait(&smallvec![], trait_info.def_id)?;
             }
         }
         Ok(())
@@ -959,7 +919,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
 
     fn assemble_extension_candidates_for_trait(
         &mut self,
-        import_ids: SmallVec<[hir::HirId; 1]>,
+        import_ids: &SmallVec<[hir::HirId; 1]>,
         trait_def_id: DefId,
     ) -> Result<(), MethodError<'tcx>> {
         debug!("assemble_extension_candidates_for_trait(trait_def_id={:?})", trait_def_id);
@@ -1044,7 +1004,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
             return r;
         }
 
-        debug!("pick: actual search failed, assemble diagnotics");
+        debug!("pick: actual search failed, assemble diagnostics");
 
         let static_candidates = mem::take(&mut self.static_candidates);
         let private_candidate = self.private_candidate.take();
@@ -1227,7 +1187,10 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
         &self,
         self_ty: Ty<'tcx>,
         probes: ProbesIter,
-        possibly_unsatisfied_predicates: &mut Vec<TraitRef<'tcx>>,
+        possibly_unsatisfied_predicates: &mut Vec<(
+            ty::Predicate<'tcx>,
+            Option<ty::Predicate<'tcx>>,
+        )>,
         unstable_candidates: Option<&mut Vec<(&'b Candidate<'tcx>, Symbol)>>,
     ) -> Option<PickResult<'tcx>>
     where
@@ -1280,33 +1243,36 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
         stable_pick: &Pick<'_>,
         unstable_candidates: &[(&Candidate<'tcx>, Symbol)],
     ) {
-        let mut diag = self.tcx.struct_span_lint_hir(
+        self.tcx.struct_span_lint_hir(
             lint::builtin::UNSTABLE_NAME_COLLISIONS,
             self.fcx.body_id,
             self.span,
-            "a method with this name may be added to the standard library in the future",
-        );
-
-        // FIXME: This should be a `span_suggestion` instead of `help`
-        // However `self.span` only
-        // highlights the method name, so we can't use it. Also consider reusing the code from
-        // `report_method_error()`.
-        diag.help(&format!(
-            "call with fully qualified syntax `{}(...)` to keep using the current method",
-            self.tcx.def_path_str(stable_pick.item.def_id),
-        ));
-
-        if nightly_options::is_nightly_build() {
-            for (candidate, feature) in unstable_candidates {
+            |lint| {
+                let mut diag = lint.build(
+                    "a method with this name may be added to the standard library in the future",
+                );
+                // FIXME: This should be a `span_suggestion` instead of `help`
+                // However `self.span` only
+                // highlights the method name, so we can't use it. Also consider reusing the code from
+                // `report_method_error()`.
                 diag.help(&format!(
-                    "add `#![feature({})]` to the crate attributes to enable `{}`",
-                    feature,
-                    self.tcx.def_path_str(candidate.item.def_id),
+                    "call with fully qualified syntax `{}(...)` to keep using the current method",
+                    self.tcx.def_path_str(stable_pick.item.def_id),
                 ));
-            }
-        }
 
-        diag.emit();
+                if nightly_options::is_nightly_build() {
+                    for (candidate, feature) in unstable_candidates {
+                        diag.help(&format!(
+                            "add `#![feature({})]` to the crate attributes to enable `{}`",
+                            feature,
+                            self.tcx.def_path_str(candidate.item.def_id),
+                        ));
+                    }
+                }
+
+                diag.emit();
+            },
+        );
     }
 
     fn select_trait_candidate(
@@ -1343,7 +1309,10 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
         &self,
         self_ty: Ty<'tcx>,
         probe: &Candidate<'tcx>,
-        possibly_unsatisfied_predicates: &mut Vec<TraitRef<'tcx>>,
+        possibly_unsatisfied_predicates: &mut Vec<(
+            ty::Predicate<'tcx>,
+            Option<ty::Predicate<'tcx>>,
+        )>,
     ) -> ProbeResult {
         debug!("consider_probe: self_ty={:?} probe={:?}", self_ty, probe);
 
@@ -1398,21 +1367,44 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                     let predicate = trait_ref.without_const().to_predicate();
                     let obligation = traits::Obligation::new(cause, self.param_env, predicate);
                     if !self.predicate_may_hold(&obligation) {
-                        if self.probe(|_| self.select_trait_candidate(trait_ref).is_err()) {
+                        result = ProbeResult::NoMatch;
+                        if self.probe(|_| {
+                            match self.select_trait_candidate(trait_ref) {
+                                Err(_) => return true,
+                                Ok(Some(vtable))
+                                    if !vtable.borrow_nested_obligations().is_empty() =>
+                                {
+                                    for obligation in vtable.borrow_nested_obligations() {
+                                        // Determine exactly which obligation wasn't met, so
+                                        // that we can give more context in the error.
+                                        if !self.predicate_may_hold(&obligation) {
+                                            let o = self.resolve_vars_if_possible(obligation);
+                                            let predicate =
+                                                self.resolve_vars_if_possible(&predicate);
+                                            let p = if predicate == o.predicate {
+                                                // Avoid "`MyStruct: Foo` which is required by
+                                                // `MyStruct: Foo`" in E0599.
+                                                None
+                                            } else {
+                                                Some(predicate)
+                                            };
+                                            possibly_unsatisfied_predicates.push((o.predicate, p));
+                                        }
+                                    }
+                                }
+                                _ => {
+                                    // Some nested subobligation of this predicate
+                                    // failed.
+                                    let predicate = self.resolve_vars_if_possible(&predicate);
+                                    possibly_unsatisfied_predicates.push((predicate, None));
+                                }
+                            }
+                            false
+                        }) {
                             // This candidate's primary obligation doesn't even
                             // select - don't bother registering anything in
                             // `potentially_unsatisfied_predicates`.
                             return ProbeResult::NoMatch;
-                        } else {
-                            // Some nested subobligation of this predicate
-                            // failed.
-                            //
-                            // FIXME: try to find the exact nested subobligation
-                            // and point at it rather than reporting the entire
-                            // trait-ref?
-                            result = ProbeResult::NoMatch;
-                            let trait_ref = self.resolve_vars_if_possible(&trait_ref);
-                            possibly_unsatisfied_predicates.push(trait_ref);
                         }
                     }
                     vec![]
@@ -1429,9 +1421,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                 let o = self.resolve_vars_if_possible(&o);
                 if !self.predicate_may_hold(&o) {
                     result = ProbeResult::NoMatch;
-                    if let &ty::Predicate::Trait(ref pred, _) = &o.predicate {
-                        possibly_unsatisfied_predicates.push(pred.skip_binder().trait_ref);
-                    }
+                    possibly_unsatisfied_predicates.push((o.predicate, None));
                 }
             }
 
@@ -1524,21 +1514,18 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
 
             let method_names = pcx.candidate_method_names();
             pcx.allow_similar_names = false;
-            let applicable_close_candidates: Vec<ty::AssocItem> =
-                method_names
-                    .iter()
-                    .filter_map(|&method_name| {
-                        pcx.reset();
-                        pcx.method_name = Some(method_name);
-                        pcx.assemble_inherent_candidates();
-                        pcx.assemble_extension_candidates_for_traits_in_scope(hir::DUMMY_HIR_ID)
-                            .map_or(None, |_| {
-                                pcx.pick_core()
-                                    .and_then(|pick| pick.ok())
-                                    .and_then(|pick| Some(pick.item))
-                            })
-                    })
-                    .collect();
+            let applicable_close_candidates: Vec<ty::AssocItem> = method_names
+                .iter()
+                .filter_map(|&method_name| {
+                    pcx.reset();
+                    pcx.method_name = Some(method_name);
+                    pcx.assemble_inherent_candidates();
+                    pcx.assemble_extension_candidates_for_traits_in_scope(hir::DUMMY_HIR_ID)
+                        .map_or(None, |_| {
+                            pcx.pick_core().and_then(|pick| pick.ok()).map(|pick| pick.item)
+                        })
+                })
+                .collect();
 
             if applicable_close_candidates.is_empty() {
                 Ok(None)
@@ -1696,18 +1683,20 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
                 let max_dist = max(name.as_str().len(), 3) / 3;
                 self.tcx
                     .associated_items(def_id)
+                    .in_definition_order()
                     .filter(|x| {
                         let dist = lev_distance(&*name.as_str(), &x.ident.as_str());
-                        Namespace::from(x.kind) == Namespace::Value && dist > 0 && dist <= max_dist
+                        x.kind.namespace() == Namespace::ValueNS && dist > 0 && dist <= max_dist
                     })
+                    .copied()
                     .collect()
             } else {
                 self.fcx
-                    .associated_item(def_id, name, Namespace::Value)
+                    .associated_item(def_id, name, Namespace::ValueNS)
                     .map_or(Vec::new(), |x| vec![x])
             }
         } else {
-            self.tcx.associated_items(def_id).collect()
+            self.tcx.associated_items(def_id).in_definition_order().copied().collect()
         }
     }
 }
diff --git a/src/librustc_typeck/check/method/suggest.rs b/src/librustc_typeck/check/method/suggest.rs
index e9942fad3b..084601fbde 100644
--- a/src/librustc_typeck/check/method/suggest.rs
+++ b/src/librustc_typeck/check/method/suggest.rs
@@ -3,23 +3,23 @@
 
 use crate::check::FnCtxt;
 use crate::middle::lang_items::FnOnceTraitLangItem;
-use crate::namespace::Namespace;
 use rustc::hir::map as hir_map;
 use rustc::hir::map::Map;
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::traits::Obligation;
 use rustc::ty::print::with_crate_prefix;
 use rustc::ty::{self, ToPolyTraitRef, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness};
-use rustc_data_structures::fx::FxHashSet;
+use rustc_ast::ast;
+use rustc_ast::util::lev_distance;
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
-use rustc_hir::def::{DefKind, Res};
+use rustc_hir::def::{DefKind, Namespace, Res};
 use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX, LOCAL_CRATE};
 use rustc_hir::intravisit;
 use rustc_hir::{ExprKind, Node, QPath};
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::traits::Obligation;
+use rustc_span::symbol::kw;
 use rustc_span::{source_map, FileName, Span};
-use syntax::ast;
-use syntax::util::lev_distance;
 
 use std::cmp::Ordering;
 
@@ -97,13 +97,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         // Provide the best span we can. Use the item, if local to crate, else
                         // the impl, if local to crate (item may be defaulted), else nothing.
                         let item = match self
-                            .associated_item(impl_did, item_name, Namespace::Value)
+                            .associated_item(impl_did, item_name, Namespace::ValueNS)
                             .or_else(|| {
                                 let impl_trait_ref = self.tcx.impl_trait_ref(impl_did)?;
                                 self.associated_item(
                                     impl_trait_ref.def_id,
                                     item_name,
-                                    Namespace::Value,
+                                    Namespace::ValueNS,
                                 )
                             }) {
                             Some(item) => item,
@@ -167,7 +167,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                     .skip_binder()
                                     .get(0)
                                     .filter(|ty| ty.is_region_ptr() && !rcvr_ty.is_region_ptr())
-                                    .map(|ty| *ty)
+                                    .copied()
                                     .unwrap_or(rcvr_ty),
                             };
                             print_disambiguation_help(
@@ -185,7 +185,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     }
                     CandidateSource::TraitSource(trait_did) => {
                         let item =
-                            match self.associated_item(trait_did, item_name, Namespace::Value) {
+                            match self.associated_item(trait_did, item_name, Namespace::ValueNS) {
                                 Some(item) => item,
                                 None => continue,
                             };
@@ -264,7 +264,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     // be used exists at all, and the type is an ambiguous numeric type
                     // ({integer}/{float}).
                     let mut candidates = all_traits(self.tcx).into_iter().filter_map(|info| {
-                        self.associated_item(info.def_id, item_name, Namespace::Value)
+                        self.associated_item(info.def_id, item_name, Namespace::ValueNS)
                     });
                     if let (true, false, SelfSource::MethodCall(expr), Some(_)) = (
                         actual.is_numeric(),
@@ -427,7 +427,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         });
 
                     if let Some((field, field_ty)) = field_receiver {
-                        let scope = self.tcx.hir().get_module_parent(self.body_id);
+                        let scope = self.tcx.parent_module(self.body_id);
                         let is_accessible = field.vis.is_accessible_from(scope, self.tcx);
 
                         if is_accessible {
@@ -497,7 +497,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 if !static_sources.is_empty() {
                     err.note(
                         "found the following associated functions; to be used as methods, \
-                              functions must have a `self` parameter",
+                         functions must have a `self` parameter",
                     );
                     err.span_label(span, "this is an associated function, not a method");
                 }
@@ -535,22 +535,162 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     report_candidates(span, &mut err, static_sources, sugg_span);
                 }
 
+                let mut restrict_type_params = false;
                 if !unsatisfied_predicates.is_empty() {
+                    let def_span =
+                        |def_id| self.tcx.sess.source_map().def_span(self.tcx.def_span(def_id));
+                    let mut type_params = FxHashMap::default();
+                    let mut bound_spans = vec![];
+                    let mut collect_type_param_suggestions =
+                        |self_ty: Ty<'_>, parent_pred: &ty::Predicate<'_>, obligation: &str| {
+                            if let (ty::Param(_), ty::Predicate::Trait(p, _)) =
+                                (&self_ty.kind, parent_pred)
+                            {
+                                if let ty::Adt(def, _) = p.skip_binder().trait_ref.self_ty().kind {
+                                    let node = self
+                                        .tcx
+                                        .hir()
+                                        .as_local_hir_id(def.did)
+                                        .map(|id| self.tcx.hir().get(id));
+                                    match node {
+                                        Some(hir::Node::Item(hir::Item { kind, .. })) => {
+                                            if let Some(g) = kind.generics() {
+                                                let key = match &g.where_clause.predicates[..] {
+                                                    [.., pred] => {
+                                                        (pred.span().shrink_to_hi(), false)
+                                                    }
+                                                    [] => (
+                                                        g.where_clause
+                                                            .span_for_predicates_or_empty_place(),
+                                                        true,
+                                                    ),
+                                                };
+                                                type_params
+                                                    .entry(key)
+                                                    .or_insert_with(FxHashSet::default)
+                                                    .insert(obligation.to_owned());
+                                            }
+                                        }
+                                        _ => {}
+                                    }
+                                }
+                            }
+                        };
+                    let mut bound_span_label = |self_ty: Ty<'_>, obligation: &str, quiet: &str| {
+                        let msg = format!(
+                            "doesn't satisfy `{}`",
+                            if obligation.len() > 50 { quiet } else { obligation }
+                        );
+                        match &self_ty.kind {
+                            // Point at the type that couldn't satisfy the bound.
+                            ty::Adt(def, _) => bound_spans.push((def_span(def.did), msg)),
+                            // Point at the trait object that couldn't satisfy the bound.
+                            ty::Dynamic(preds, _) => {
+                                for pred in *preds.skip_binder() {
+                                    match pred {
+                                        ty::ExistentialPredicate::Trait(tr) => {
+                                            bound_spans.push((def_span(tr.def_id), msg.clone()))
+                                        }
+                                        ty::ExistentialPredicate::Projection(_)
+                                        | ty::ExistentialPredicate::AutoTrait(_) => {}
+                                    }
+                                }
+                            }
+                            // Point at the closure that couldn't satisfy the bound.
+                            ty::Closure(def_id, _) => bound_spans
+                                .push((def_span(*def_id), format!("doesn't satisfy `{}`", quiet))),
+                            _ => {}
+                        }
+                    };
+                    let mut format_pred = |pred| {
+                        match pred {
+                            ty::Predicate::Projection(pred) => {
+                                // `<Foo as Iterator>::Item = String`.
+                                let trait_ref =
+                                    pred.skip_binder().projection_ty.trait_ref(self.tcx);
+                                let assoc = self
+                                    .tcx
+                                    .associated_item(pred.skip_binder().projection_ty.item_def_id);
+                                let ty = pred.skip_binder().ty;
+                                let obligation = format!("{}::{} = {}", trait_ref, assoc.ident, ty);
+                                let quiet = format!(
+                                    "<_ as {}>::{} = {}",
+                                    trait_ref.print_only_trait_path(),
+                                    assoc.ident,
+                                    ty
+                                );
+                                bound_span_label(trait_ref.self_ty(), &obligation, &quiet);
+                                Some((obligation, trait_ref.self_ty()))
+                            }
+                            ty::Predicate::Trait(poly_trait_ref, _) => {
+                                let p = poly_trait_ref.skip_binder().trait_ref;
+                                let self_ty = p.self_ty();
+                                let path = p.print_only_trait_path();
+                                let obligation = format!("{}: {}", self_ty, path);
+                                let quiet = format!("_: {}", path);
+                                bound_span_label(self_ty, &obligation, &quiet);
+                                Some((obligation, self_ty))
+                            }
+                            _ => None,
+                        }
+                    };
                     let mut bound_list = unsatisfied_predicates
                         .iter()
-                        .map(|p| format!("`{} : {}`", p.self_ty(), p.print_only_trait_path()))
-                        .collect::<Vec<_>>();
-                    bound_list.sort();
-                    bound_list.dedup(); // #35677
-                    let bound_list = bound_list.join("\n");
-                    err.note(&format!(
-                        "the method `{}` exists but the following trait bounds \
-                                       were not satisfied:\n{}",
-                        item_name, bound_list
-                    ));
+                        .filter_map(|(pred, parent_pred)| {
+                            format_pred(*pred).map(|(p, self_ty)| match parent_pred {
+                                None => format!("`{}`", p),
+                                Some(parent_pred) => match format_pred(*parent_pred) {
+                                    None => format!("`{}`", p),
+                                    Some((parent_p, _)) => {
+                                        collect_type_param_suggestions(self_ty, parent_pred, &p);
+                                        format!("`{}`\nwhich is required by `{}`", p, parent_p)
+                                    }
+                                },
+                            })
+                        })
+                        .enumerate()
+                        .collect::<Vec<(usize, String)>>();
+                    for ((span, empty_where), obligations) in type_params.into_iter() {
+                        restrict_type_params = true;
+                        err.span_suggestion_verbose(
+                            span,
+                            &format!(
+                                "consider restricting the type parameter{s} to satisfy the \
+                                 trait bound{s}",
+                                s = pluralize!(obligations.len())
+                            ),
+                            format!(
+                                "{} {}",
+                                if empty_where { " where" } else { "," },
+                                obligations.into_iter().collect::<Vec<_>>().join(", ")
+                            ),
+                            Applicability::MaybeIncorrect,
+                        );
+                    }
+
+                    bound_list.sort_by(|(_, a), (_, b)| a.cmp(&b)); // Sort alphabetically.
+                    bound_list.dedup_by(|(_, a), (_, b)| a == b); // #35677
+                    bound_list.sort_by_key(|(pos, _)| *pos); // Keep the original predicate order.
+                    bound_spans.sort();
+                    bound_spans.dedup();
+                    for (span, msg) in bound_spans.into_iter() {
+                        err.span_label(span, &msg);
+                    }
+                    if !bound_list.is_empty() {
+                        let bound_list = bound_list
+                            .into_iter()
+                            .map(|(_, path)| path)
+                            .collect::<Vec<_>>()
+                            .join("\n");
+                        err.note(&format!(
+                            "the method `{}` exists but the following trait bounds were not \
+                             satisfied:\n{}",
+                            item_name, bound_list
+                        ));
+                    }
                 }
 
-                if actual.is_numeric() && actual.is_fresh() {
+                if actual.is_numeric() && actual.is_fresh() || restrict_type_params {
                 } else {
                     self.suggest_traits_to_import(
                         &mut err,
@@ -559,6 +699,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         item_name,
                         source,
                         out_of_scope_traits,
+                        &unsatisfied_predicates,
                     );
                 }
 
@@ -640,9 +781,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 err.emit();
             }
 
-            MethodError::IllegalSizedBound(candidates, needs_mut) => {
+            MethodError::IllegalSizedBound(candidates, needs_mut, bound_span) => {
                 let msg = format!("the `{}` method cannot be invoked on a trait object", item_name);
                 let mut err = self.sess().struct_span_err(span, &msg);
+                err.span_label(bound_span, "this has a `Sized` requirement");
                 if !candidates.is_empty() {
                     let help = format!(
                         "{an}other candidate{s} {were} found in the following trait{s}, perhaps \
@@ -685,7 +827,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         mut msg: String,
         candidates: Vec<DefId>,
     ) {
-        let module_did = self.tcx.hir().get_module_parent(self.body_id);
+        let module_did = self.tcx.parent_module(self.body_id);
         let module_id = self.tcx.hir().as_local_hir_id(module_did).unwrap();
         let krate = self.tcx.hir().krate();
         let (span, found_use) = UsePlacementFinder::check(self.tcx, krate, module_id);
@@ -757,6 +899,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         item_name: ast::Ident,
         source: SelfSource<'b>,
         valid_out_of_scope_traits: Vec<DefId>,
+        unsatisfied_predicates: &[(ty::Predicate<'tcx>, Option<ty::Predicate<'tcx>>)],
     ) {
         if self.suggest_valid_traits(err, valid_out_of_scope_traits) {
             return;
@@ -764,6 +907,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         let type_is_local = self.type_derefs_to_local(span, rcvr_ty, source);
 
+        let mut arbitrary_rcvr = vec![];
         // There are no traits implemented, so lets suggest some traits to
         // implement, by finding ones that have the item name, and are
         // legal to implement.
@@ -776,16 +920,71 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 // this isn't perfect (that is, there are cases when
                 // implementing a trait would be legal but is rejected
                 // here).
-                (type_is_local || info.def_id.is_local())
+                !unsatisfied_predicates.iter().any(|(p, _)| match p {
+                    // Hide traits if they are present in predicates as they can be fixed without
+                    // having to implement them.
+                    ty::Predicate::Trait(t, _) => t.def_id() != info.def_id,
+                    ty::Predicate::Projection(p) => p.item_def_id() != info.def_id,
+                    _ => true,
+                }) && (type_is_local || info.def_id.is_local())
                     && self
-                        .associated_item(info.def_id, item_name, Namespace::Value)
+                        .associated_item(info.def_id, item_name, Namespace::ValueNS)
                         .filter(|item| {
+                            if let ty::AssocKind::Method = item.kind {
+                                let id = self.tcx.hir().as_local_hir_id(item.def_id);
+                                if let Some(hir::Node::TraitItem(hir::TraitItem {
+                                    kind: hir::TraitItemKind::Method(fn_sig, method),
+                                    ..
+                                })) = id.map(|id| self.tcx.hir().get(id))
+                                {
+                                    let self_first_arg = match method {
+                                        hir::TraitMethod::Required([ident, ..]) => {
+                                            ident.name == kw::SelfLower
+                                        }
+                                        hir::TraitMethod::Provided(body_id) => {
+                                            match &self.tcx.hir().body(*body_id).params[..] {
+                                                [hir::Param {
+                                                    pat:
+                                                        hir::Pat {
+                                                            kind:
+                                                                hir::PatKind::Binding(
+                                                                    _,
+                                                                    _,
+                                                                    ident,
+                                                                    ..,
+                                                                ),
+                                                            ..
+                                                        },
+                                                    ..
+                                                }, ..] => ident.name == kw::SelfLower,
+                                                _ => false,
+                                            }
+                                        }
+                                        _ => false,
+                                    };
+
+                                    if !fn_sig.decl.implicit_self.has_implicit_self()
+                                        && self_first_arg
+                                    {
+                                        if let Some(ty) = fn_sig.decl.inputs.get(0) {
+                                            arbitrary_rcvr.push(ty.span);
+                                        }
+                                        return false;
+                                    }
+                                }
+                            }
                             // We only want to suggest public or local traits (#45781).
                             item.vis == ty::Visibility::Public || info.def_id.is_local()
                         })
                         .is_some()
             })
             .collect::<Vec<_>>();
+        for span in &arbitrary_rcvr {
+            err.span_label(
+                *span,
+                "the method might not be found because of this arbitrary self type",
+            );
+        }
 
         if !candidates.is_empty() {
             // Sort from most relevant to least relevant.
@@ -808,7 +1007,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             let message = |action| {
                 format!(
                     "the following {traits_define} an item `{name}`, perhaps you need to {action} \
-                 {one_of_them}:",
+                     {one_of_them}:",
                     traits_define =
                         if candidates.len() == 1 { "trait defines" } else { "traits define" },
                     action = action,
@@ -853,26 +1052,30 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                 } else {
                                     sp
                                 };
-                                // FIXME: contrast `t.def_id` against `param.bounds` to not suggest
-                                // traits already there. That can happen when the cause is that
-                                // we're in a const scope or associated function used as a method.
-                                err.span_suggestions(
-                                    sp,
-                                    &message(format!(
-                                        "restrict type parameter `{}` with",
-                                        param.name.ident(),
-                                    )),
-                                    candidates.iter().map(|t| {
-                                        format!(
-                                            "{}{} {}{}",
+                                let trait_def_ids: FxHashSet<DefId> = param
+                                    .bounds
+                                    .iter()
+                                    .filter_map(|bound| bound.trait_def_id())
+                                    .collect();
+                                if !candidates.iter().any(|t| trait_def_ids.contains(&t.def_id)) {
+                                    err.span_suggestions(
+                                        sp,
+                                        &message(format!(
+                                            "restrict type parameter `{}` with",
                                             param.name.ident(),
-                                            if impl_trait { " +" } else { ":" },
-                                            self.tcx.def_path_str(t.def_id),
-                                            if has_bounds.is_some() { " + " } else { "" },
-                                        )
-                                    }),
-                                    Applicability::MaybeIncorrect,
-                                );
+                                        )),
+                                        candidates.iter().map(|t| {
+                                            format!(
+                                                "{}{} {}{}",
+                                                param.name.ident(),
+                                                if impl_trait { " +" } else { ":" },
+                                                self.tcx.def_path_str(t.def_id),
+                                                if has_bounds.is_some() { " + " } else { "" },
+                                            )
+                                        }),
+                                        Applicability::MaybeIncorrect,
+                                    );
+                                }
                                 suggested = true;
                             }
                             Node::Item(hir::Item {
@@ -902,19 +1105,38 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             }
 
             if !suggested {
-                let mut msg = message(if let Some(param) = param_type {
+                let action = if let Some(param) = param_type {
                     format!("restrict type parameter `{}` with", param)
                 } else {
+                    // FIXME: it might only need to be imported into scope, not implemented.
                     "implement".to_string()
-                });
-                for (i, trait_info) in candidates.iter().enumerate() {
-                    msg.push_str(&format!(
-                        "\ncandidate #{}: `{}`",
-                        i + 1,
-                        self.tcx.def_path_str(trait_info.def_id),
-                    ));
+                };
+                let mut use_note = true;
+                if let [trait_info] = &candidates[..] {
+                    if let Some(span) = self.tcx.hir().span_if_local(trait_info.def_id) {
+                        err.span_note(
+                            self.tcx.sess.source_map().def_span(span),
+                            &format!(
+                                "`{}` defines an item `{}`, perhaps you need to {} it",
+                                self.tcx.def_path_str(trait_info.def_id),
+                                item_name,
+                                action
+                            ),
+                        );
+                        use_note = false
+                    }
+                }
+                if use_note {
+                    let mut msg = message(action);
+                    for (i, trait_info) in candidates.iter().enumerate() {
+                        msg.push_str(&format!(
+                            "\ncandidate #{}: `{}`",
+                            i + 1,
+                            self.tcx.def_path_str(trait_info.def_id),
+                        ));
+                    }
+                    err.note(&msg[..]);
                 }
-                err.note(&msg[..]);
             }
         }
     }
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 4d1f92d19c..19c69f5f9b 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -87,22 +87,13 @@ mod upvar;
 mod wfcheck;
 pub mod writeback;
 
-use crate::astconv::{AstConv, PathSeg};
+use crate::astconv::{AstConv, GenericArgCountMismatch, PathSeg};
 use crate::middle::lang_items;
-use crate::namespace::Namespace;
 use rustc::hir::map::blocks::FnLikeNode;
 use rustc::hir::map::Map;
-use rustc::infer::canonical::{Canonical, OriginalQueryValues, QueryResponse};
-use rustc::infer::error_reporting::TypeAnnotationNeeded::E0282;
-use rustc::infer::opaque_types::OpaqueTypeDecl;
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
-use rustc::infer::{self, InferCtxt, InferOk, InferResult};
 use rustc::middle::region;
 use rustc::mir::interpret::ConstValue;
 use rustc::session::parse::feature_err;
-use rustc::traits::error_reporting::recursive_type_with_infinite_size_error;
-use rustc::traits::{self, ObligationCause, ObligationCauseCode, TraitEngine};
 use rustc::ty::adjustment::{
     Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability, PointerCast,
 };
@@ -115,6 +106,9 @@ use rustc::ty::{
     self, AdtKind, CanonicalUserType, Const, GenericParamDefKind, RegionKind, ToPolyTraitRef,
     ToPredicate, Ty, TyCtxt, UserType, WithConstness,
 };
+use rustc_ast::ast;
+use rustc_ast::util::parser::ExprPrecedence;
+use rustc_attr as attr;
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder, DiagnosticId};
@@ -125,14 +119,19 @@ use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::{ExprKind, GenericArg, HirIdMap, Item, ItemKind, Node, PatKind, QPath};
 use rustc_index::vec::Idx;
+use rustc_infer::infer::canonical::{Canonical, OriginalQueryValues, QueryResponse};
+use rustc_infer::infer::error_reporting::TypeAnnotationNeeded::E0282;
+use rustc_infer::infer::opaque_types::OpaqueTypeDecl;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::infer::unify_key::{ConstVariableOrigin, ConstVariableOriginKind};
+use rustc_infer::infer::{self, InferCtxt, InferOk, InferResult, TyCtxtInferExt};
+use rustc_infer::traits::error_reporting::recursive_type_with_infinite_size_error;
+use rustc_infer::traits::{self, ObligationCause, ObligationCauseCode, TraitEngine};
 use rustc_span::hygiene::DesugaringKind;
 use rustc_span::source_map::{original_sp, DUMMY_SP};
 use rustc_span::symbol::{kw, sym, Ident};
 use rustc_span::{self, BytePos, MultiSpan, Span};
 use rustc_target::spec::abi::Abi;
-use syntax::ast;
-use syntax::attr;
-use syntax::util::parser::ExprPrecedence;
 
 use std::cell::{Cell, Ref, RefCell, RefMut};
 use std::cmp;
@@ -458,7 +457,7 @@ pub enum Diverges {
         /// where all arms diverge), we may be
         /// able to provide a more informative
         /// message to the user.
-        /// If this is `None`, a default messsage
+        /// If this is `None`, a default message
         /// will be generated, which is suitable
         /// for most cases.
         custom_note: Option<&'static str>,
@@ -573,7 +572,7 @@ pub struct FnCtxt<'a, 'tcx> {
     /// First span of a return site that we find. Used in error messages.
     ret_coercion_span: RefCell<Option<Span>>,
 
-    yield_ty: Option<Ty<'tcx>>,
+    resume_yield_tys: Option<(Ty<'tcx>, Ty<'tcx>)>,
 
     ps: RefCell<UnsafetyState>,
 
@@ -738,8 +737,8 @@ impl ItemLikeVisitor<'tcx> for CheckItemTypesVisitor<'tcx> {
 }
 
 pub fn check_wf_new(tcx: TyCtxt<'_>) {
-    let mut visit = wfcheck::CheckTypeWellFormedVisitor::new(tcx);
-    tcx.hir().krate().par_visit_all_item_likes(&mut visit);
+    let visit = wfcheck::CheckTypeWellFormedVisitor::new(tcx);
+    tcx.hir().krate().par_visit_all_item_likes(&visit);
 }
 
 fn check_mod_item_types(tcx: TyCtxt<'_>, module_def_id: DefId) {
@@ -837,8 +836,11 @@ fn has_typeck_tables(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
         return tcx.has_typeck_tables(outer_def_id);
     }
 
-    let id = tcx.hir().as_local_hir_id(def_id).unwrap();
-    primary_body_of(tcx, id).is_some()
+    if let Some(id) = tcx.hir().as_local_hir_id(def_id) {
+        primary_body_of(tcx, id).is_some()
+    } else {
+        false
+    }
 }
 
 fn used_trait_imports(tcx: TyCtxt<'_>, def_id: DefId) -> &DefIdSet {
@@ -894,7 +896,7 @@ where
                 ty::Opaque(def_id, substs) => {
                     debug!("fixup_opaque_types: found type {:?}", ty);
                     // Here, we replace any inference variables that occur within
-                    // the substs of an opaque type. By definition, any type occuring
+                    // the substs of an opaque type. By definition, any type occurring
                     // in the substs has a corresponding generic parameter, which is what
                     // we replace it with.
                     // This replacement is only run on the function signature, so any
@@ -1002,7 +1004,14 @@ fn typeck_tables_of_with_fallback<'tcx>(
         let fcx = if let (Some(header), Some(decl)) = (fn_header, fn_decl) {
             let fn_sig = if crate::collect::get_infer_ret_ty(&decl.output).is_some() {
                 let fcx = FnCtxt::new(&inh, param_env, body.value.hir_id);
-                AstConv::ty_of_fn(&fcx, header.unsafety, header.abi, decl, &[], None)
+                AstConv::ty_of_fn(
+                    &fcx,
+                    header.unsafety,
+                    header.abi,
+                    decl,
+                    &hir::Generics::empty(),
+                    None,
+                )
             } else {
                 tcx.fn_sig(def_id)
             };
@@ -1248,6 +1257,9 @@ impl<'a, 'tcx> Visitor<'tcx> for GatherLocalsVisitor<'a, 'tcx> {
 /// includes yield), it returns back some information about the yield
 /// points.
 struct GeneratorTypes<'tcx> {
+    /// Type of generator argument / values returned by `yield`.
+    resume_ty: Ty<'tcx>,
+
     /// Type of value that is yielded.
     yield_ty: Ty<'tcx>,
 
@@ -1308,7 +1320,11 @@ fn check_fn<'a, 'tcx>(
         let yield_ty = fcx
             .next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::TypeInference, span });
         fcx.require_type_is_sized(yield_ty, span, traits::SizedYieldType);
-        fcx.yield_ty = Some(yield_ty);
+
+        // Resume type defaults to `()` if the generator has no argument.
+        let resume_ty = fn_sig.inputs().get(0).copied().unwrap_or_else(|| tcx.mk_unit());
+
+        fcx.resume_yield_tys = Some((resume_ty, yield_ty));
     }
 
     let outer_def_id = tcx.closure_base_def_id(hir.local_def_id(fn_id));
@@ -1344,7 +1360,7 @@ fn check_fn<'a, 'tcx>(
         // for simple cases like `fn foo(x: Trait)`,
         // where we would error once on the parameter as a whole, and once on the binding `x`.
         if param.pat.simple_ident().is_none() && !tcx.features().unsized_locals {
-            fcx.require_type_is_sized(param_ty, decl.output.span(), traits::SizedArgumentType);
+            fcx.require_type_is_sized(param_ty, param.pat.span, traits::SizedArgumentType);
         }
 
         fcx.write_ty(param.hir_id, param_ty);
@@ -1361,8 +1377,11 @@ fn check_fn<'a, 'tcx>(
         let interior = fcx
             .next_ty_var(TypeVariableOrigin { kind: TypeVariableOriginKind::MiscVariable, span });
         fcx.deferred_generator_interiors.borrow_mut().push((body.id(), interior, gen_kind));
+
+        let (resume_ty, yield_ty) = fcx.resume_yield_tys.unwrap();
         Some(GeneratorTypes {
-            yield_ty: fcx.yield_ty.unwrap(),
+            resume_ty,
+            yield_ty,
             interior,
             movability: can_be_generator.unwrap(),
         })
@@ -1545,11 +1564,11 @@ fn check_union_fields(tcx: TyCtxt<'_>, span: Span, item_def_id: DefId) -> bool {
     if let ty::Adt(def, substs) = item_type.kind {
         assert!(def.is_union());
         let fields = &def.non_enum_variant().fields;
+        let param_env = tcx.param_env(item_def_id);
         for field in fields {
             let field_ty = field.ty(tcx, substs);
             // We are currently checking the type this field came from, so it must be local.
             let field_span = tcx.hir().span_if_local(field.did).unwrap();
-            let param_env = tcx.param_env(field.did);
             if field_ty.needs_drop(tcx, param_env) {
                 struct_span_err!(
                     tcx.sess,
@@ -1819,18 +1838,17 @@ fn maybe_check_static_with_link_section(tcx: TyCtxt<'_>, id: DefId, span: Span)
     // `#[link_section]` may contain arbitrary, or even undefined bytes, but it is
     // the consumer's responsibility to ensure all bytes that have been read
     // have defined values.
-    if let Ok(static_) = tcx.const_eval_poly(id) {
-        let alloc = if let ty::ConstKind::Value(ConstValue::ByRef { alloc, .. }) = static_.val {
-            alloc
-        } else {
-            bug!("Matching on non-ByRef static")
-        };
-        if alloc.relocations().len() != 0 {
-            let msg = "statics with a custom `#[link_section]` must be a \
+    match tcx.const_eval_poly(id) {
+        Ok(ConstValue::ByRef { alloc, .. }) => {
+            if alloc.relocations().len() != 0 {
+                let msg = "statics with a custom `#[link_section]` must be a \
                        simple list of bytes on the wasm target with no \
                        extra levels of indirection such as references";
-            tcx.sess.span_err(span, msg);
+                tcx.sess.span_err(span, msg);
+            }
         }
+        Ok(_) => bug!("Matching on non-ByRef static"),
+        Err(_) => {}
     }
 }
 
@@ -1926,7 +1944,7 @@ fn check_specialization_validity<'tcx>(
         }
     });
 
-    // If `opt_result` is `None`, we have only encoutered `default impl`s that don't contain the
+    // If `opt_result` is `None`, we have only encountered `default impl`s that don't contain the
     // item. This is allowed, the item isn't actually getting specialized here.
     let result = opt_result.unwrap_or(Ok(()));
 
@@ -1953,24 +1971,22 @@ fn check_impl_items_against_trait<'tcx>(
 
     // Locate trait definition and items
     let trait_def = tcx.trait_def(impl_trait_ref.def_id);
-    let mut overridden_associated_type = None;
 
     let impl_items = || impl_item_refs.iter().map(|iiref| tcx.hir().impl_item(iiref.id));
 
     // Check existing impl methods to see if they are both present in trait
     // and compatible with trait signature
     for impl_item in impl_items() {
+        let namespace = impl_item.kind.namespace();
         let ty_impl_item = tcx.associated_item(tcx.hir().local_def_id(impl_item.hir_id));
         let ty_trait_item = tcx
             .associated_items(impl_trait_ref.def_id)
-            .find(|ac| {
-                Namespace::from(&impl_item.kind) == Namespace::from(ac.kind)
-                    && tcx.hygienic_eq(ty_impl_item.ident, ac.ident, impl_trait_ref.def_id)
-            })
+            .find_by_name_and_namespace(tcx, ty_impl_item.ident, namespace, impl_trait_ref.def_id)
             .or_else(|| {
                 // Not compatible, but needed for the error message
                 tcx.associated_items(impl_trait_ref.def_id)
-                    .find(|ac| tcx.hygienic_eq(ty_impl_item.ident, ac.ident, impl_trait_ref.def_id))
+                    .filter_by_name(tcx, ty_impl_item.ident, impl_trait_ref.def_id)
+                    .next()
             });
 
         // Check that impl definition matches trait definition
@@ -2036,9 +2052,6 @@ fn check_impl_items_against_trait<'tcx>(
                 hir::ImplItemKind::OpaqueTy(..) | hir::ImplItemKind::TyAlias(_) => {
                     let opt_trait_span = tcx.hir().span_if_local(ty_trait_item.def_id);
                     if ty_trait_item.kind == ty::AssocKind::Type {
-                        if ty_trait_item.defaultness.has_value() {
-                            overridden_associated_type = Some(impl_item);
-                        }
                         compare_ty_impl(
                             tcx,
                             &ty_impl_item,
@@ -2072,9 +2085,7 @@ fn check_impl_items_against_trait<'tcx>(
 
     // Check for missing items from trait
     let mut missing_items = Vec::new();
-    let mut invalidated_items = Vec::new();
-    let associated_type_overridden = overridden_associated_type.is_some();
-    for trait_item in tcx.associated_items(impl_trait_ref.def_id) {
+    for trait_item in tcx.associated_items(impl_trait_ref.def_id).in_definition_order() {
         let is_implemented = trait_def
             .ancestors(tcx, impl_id)
             .leaf_def(tcx, trait_item.ident, trait_item.kind)
@@ -2083,9 +2094,7 @@ fn check_impl_items_against_trait<'tcx>(
 
         if !is_implemented && !traits::impl_is_default(tcx, impl_id) {
             if !trait_item.defaultness.has_value() {
-                missing_items.push(trait_item);
-            } else if associated_type_overridden {
-                invalidated_items.push(trait_item.ident);
+                missing_items.push(*trait_item);
             }
         }
     }
@@ -2093,19 +2102,6 @@ fn check_impl_items_against_trait<'tcx>(
     if !missing_items.is_empty() {
         missing_items_err(tcx, impl_span, &missing_items, full_impl_span);
     }
-
-    if !invalidated_items.is_empty() {
-        let invalidator = overridden_associated_type.unwrap();
-        struct_span_err!(
-            tcx.sess,
-            invalidator.span,
-            E0399,
-            "the following trait items need to be reimplemented as `{}` was overridden: `{}`",
-            invalidator.ident,
-            invalidated_items.iter().map(|name| name.to_string()).collect::<Vec<_>>().join("`, `")
-        )
-        .emit();
-    }
 }
 
 fn missing_items_err(
@@ -2154,8 +2150,77 @@ fn missing_items_err(
     err.emit();
 }
 
+/// Resugar `ty::GenericPredicates` in a way suitable to be used in structured suggestions.
+fn bounds_from_generic_predicates(
+    tcx: TyCtxt<'_>,
+    predicates: ty::GenericPredicates<'_>,
+) -> (String, String) {
+    let mut types: FxHashMap<Ty<'_>, Vec<DefId>> = FxHashMap::default();
+    let mut projections = vec![];
+    for (predicate, _) in predicates.predicates {
+        debug!("predicate {:?}", predicate);
+        match predicate {
+            ty::Predicate::Trait(trait_predicate, _) => {
+                let entry = types.entry(trait_predicate.skip_binder().self_ty()).or_default();
+                let def_id = trait_predicate.skip_binder().def_id();
+                if Some(def_id) != tcx.lang_items().sized_trait() {
+                    // Type params are `Sized` by default, do not add that restriction to the list
+                    // if it is a positive requirement.
+                    entry.push(trait_predicate.skip_binder().def_id());
+                }
+            }
+            ty::Predicate::Projection(projection_pred) => {
+                projections.push(projection_pred);
+            }
+            _ => {}
+        }
+    }
+    let generics = if types.is_empty() {
+        "".to_string()
+    } else {
+        format!(
+            "<{}>",
+            types
+                .keys()
+                .filter_map(|t| match t.kind {
+                    ty::Param(_) => Some(t.to_string()),
+                    // Avoid suggesting the following:
+                    // fn foo<T, <T as Trait>::Bar>(_: T) where T: Trait, <T as Trait>::Bar: Other {}
+                    _ => None,
+                })
+                .collect::<Vec<_>>()
+                .join(", ")
+        )
+    };
+    let mut where_clauses = vec![];
+    for (ty, bounds) in types {
+        for bound in &bounds {
+            where_clauses.push(format!("{}: {}", ty, tcx.def_path_str(*bound)));
+        }
+    }
+    for projection in &projections {
+        let p = projection.skip_binder();
+        // FIXME: this is not currently supported syntax, we should be looking at the `types` and
+        // insert the associated types where they correspond, but for now let's be "lazy" and
+        // propose this instead of the following valid resugaring:
+        // `T: Trait, Trait::Assoc = K` → `T: Trait<Assoc = K>`
+        where_clauses.push(format!("{} = {}", tcx.def_path_str(p.projection_ty.item_def_id), p.ty));
+    }
+    let where_clauses = if where_clauses.is_empty() {
+        String::new()
+    } else {
+        format!(" where {}", where_clauses.join(", "))
+    };
+    (generics, where_clauses)
+}
+
 /// Return placeholder code for the given function.
-fn fn_sig_suggestion(sig: &ty::FnSig<'_>, ident: Ident) -> String {
+fn fn_sig_suggestion(
+    tcx: TyCtxt<'_>,
+    sig: &ty::FnSig<'_>,
+    ident: Ident,
+    predicates: ty::GenericPredicates<'_>,
+) -> String {
     let args = sig
         .inputs()
         .iter()
@@ -2185,12 +2250,17 @@ fn fn_sig_suggestion(sig: &ty::FnSig<'_>, ident: Ident) -> String {
     let output = if !output.is_unit() { format!(" -> {:?}", output) } else { String::new() };
 
     let unsafety = sig.unsafety.prefix_str();
+    let (generics, where_clauses) = bounds_from_generic_predicates(tcx, predicates);
+
     // FIXME: this is not entirely correct, as the lifetimes from borrowed params will
     // not be present in the `fn` definition, not will we account for renamed
     // lifetimes between the `impl` and the `trait`, but this should be good enough to
     // fill in a significant portion of the missing code, and other subsequent
     // suggestions can help the user fix the code.
-    format!("{}fn {}({}){} {{ unimplemented!() }}", unsafety, ident, args, output)
+    format!(
+        "{}fn {}{}({}){}{} {{ todo!() }}",
+        unsafety, ident, generics, args, output, where_clauses
+    )
 }
 
 /// Return placeholder code for the given associated item.
@@ -2203,7 +2273,12 @@ fn suggestion_signature(assoc: &ty::AssocItem, tcx: TyCtxt<'_>) -> String {
             // late-bound regions, and we don't want method signatures to show up
             // `as for<'r> fn(&'r MyType)`.  Pretty-printing handles late-bound
             // regions just fine, showing `fn(&MyType)`.
-            fn_sig_suggestion(tcx.fn_sig(assoc.def_id).skip_binder(), assoc.ident)
+            fn_sig_suggestion(
+                tcx,
+                tcx.fn_sig(assoc.def_id).skip_binder(),
+                assoc.ident,
+                tcx.predicates_of(assoc.def_id),
+            )
         }
         ty::AssocKind::Type => format!("type {} = Type;", assoc.ident),
         // FIXME(type_alias_impl_trait): we should print bounds here too.
@@ -2585,7 +2660,7 @@ fn report_unexpected_variant_res(tcx: TyCtxt<'_>, res: Res, span: Span, qpath: &
         E0533,
         "expected unit struct, unit variant or constant, found {} `{}`",
         res.descr(),
-        hir::print::to_string(tcx.hir(), |s| s.print_qpath(qpath, false))
+        hir::print::to_string(&tcx.hir(), |s| s.print_qpath(qpath, false))
     )
     .emit();
 }
@@ -2599,13 +2674,13 @@ impl<'a, 'tcx> AstConv<'tcx> for FnCtxt<'a, 'tcx> {
         None
     }
 
-    fn default_constness_for_trait_bounds(&self) -> ast::Constness {
+    fn default_constness_for_trait_bounds(&self) -> hir::Constness {
         // FIXME: refactor this into a method
         let node = self.tcx.hir().get(self.body_id);
         if let Some(fn_like) = FnLikeNode::from_node(node) {
             fn_like.constness()
         } else {
-            ast::Constness::NotConst
+            hir::Constness::NotConst
         }
     }
 
@@ -2764,7 +2839,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             err_count_on_creation: inh.tcx.sess.err_count(),
             ret_coercion: None,
             ret_coercion_span: RefCell::new(None),
-            yield_ty: None,
+            resume_yield_tys: None,
             ps: RefCell::new(UnsafetyState::function(hir::Unsafety::Normal, hir::CRATE_HIR_ID)),
             diverges: Cell::new(Diverges::Maybe),
             has_errors: Cell::new(false),
@@ -2801,15 +2876,17 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
                 debug!("warn_if_unreachable: id={:?} span={:?} kind={}", id, span, kind);
 
-                let msg = format!("unreachable {}", kind);
-                self.tcx()
-                    .struct_span_lint_hir(lint::builtin::UNREACHABLE_CODE, id, span, &msg)
-                    .span_label(span, &msg)
-                    .span_label(
-                        orig_span,
-                        custom_note.unwrap_or("any code following this expression is unreachable"),
-                    )
-                    .emit();
+                self.tcx().struct_span_lint_hir(lint::builtin::UNREACHABLE_CODE, id, span, |lint| {
+                    let msg = format!("unreachable {}", kind);
+                    lint.build(&msg)
+                        .span_label(span, &msg)
+                        .span_label(
+                            orig_span,
+                            custom_note
+                                .unwrap_or("any code following this expression is unreachable"),
+                        )
+                        .emit();
+                })
             }
         }
     }
@@ -2830,14 +2907,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         debug!("resolve_vars_with_obligations(ty={:?})", ty);
 
         // No Infer()? Nothing needs doing.
-        if !ty.has_infer_types() && !ty.has_infer_consts() {
+        if !ty.has_infer_types_or_consts() {
             debug!("resolve_vars_with_obligations: ty={:?}", ty);
             return ty;
         }
 
         // If `ty` is a type variable, see whether we already know what it is.
         ty = self.resolve_vars_if_possible(&ty);
-        if !ty.has_infer_types() && !ty.has_infer_consts() {
+        if !ty.has_infer_types_or_consts() {
             debug!("resolve_vars_with_obligations: ty={:?}", ty);
             return ty;
         }
@@ -3382,7 +3459,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 //  }
                 //  ```
                 //
-                // In the above snippet, the inference varaible created by
+                // In the above snippet, the inference variable created by
                 // instantiating `Option<Foo>` will be completely unconstrained.
                 // We treat this as a non-defining use by making the inference
                 // variable fall back to the opaque type itself.
@@ -3748,17 +3825,58 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                  error_code: &str,
                                  c_variadic: bool,
                                  sugg_unit: bool| {
+            let (span, start_span, args) = match &expr.kind {
+                hir::ExprKind::Call(hir::Expr { span, .. }, args) => (*span, *span, &args[..]),
+                hir::ExprKind::MethodCall(path_segment, span, args) => (
+                    *span,
+                    // `sp` doesn't point at the whole `foo.bar()`, only at `bar`.
+                    path_segment
+                        .args
+                        .and_then(|args| args.args.iter().last())
+                        // Account for `foo.bar::<T>()`.
+                        .map(|arg| {
+                            // Skip the closing `>`.
+                            tcx.sess
+                                .source_map()
+                                .next_point(tcx.sess.source_map().next_point(arg.span()))
+                        })
+                        .unwrap_or(*span),
+                    &args[1..], // Skip the receiver.
+                ),
+                k => span_bug!(sp, "checking argument types on a non-call: `{:?}`", k),
+            };
+            let arg_spans = if args.is_empty() {
+                // foo()
+                // ^^^-- supplied 0 arguments
+                // |
+                // expected 2 arguments
+                vec![tcx.sess.source_map().next_point(start_span).with_hi(sp.hi())]
+            } else {
+                // foo(1, 2, 3)
+                // ^^^ -  -  - supplied 3 arguments
+                // |
+                // expected 2 arguments
+                args.iter().map(|arg| arg.span).collect::<Vec<Span>>()
+            };
+
             let mut err = tcx.sess.struct_span_err_with_code(
-                sp,
+                span,
                 &format!(
                     "this function takes {}{} but {} {} supplied",
                     if c_variadic { "at least " } else { "" },
-                    potentially_plural_count(expected_count, "parameter"),
-                    potentially_plural_count(arg_count, "parameter"),
+                    potentially_plural_count(expected_count, "argument"),
+                    potentially_plural_count(arg_count, "argument"),
                     if arg_count == 1 { "was" } else { "were" }
                 ),
                 DiagnosticId::Error(error_code.to_owned()),
             );
+            let label = format!("supplied {}", potentially_plural_count(arg_count, "argument"));
+            for (i, span) in arg_spans.into_iter().enumerate() {
+                err.span_label(
+                    span,
+                    if arg_count == 0 || i + 1 == arg_count { &label } else { "" },
+                );
+            }
 
             if let Some(def_s) = def_span.map(|sp| tcx.sess.source_map().def_span(sp)) {
                 err.span_label(def_s, "defined here");
@@ -3775,11 +3893,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 );
             } else {
                 err.span_label(
-                    sp,
+                    span,
                     format!(
                         "expected {}{}",
                         if c_variadic { "at least " } else { "" },
-                        potentially_plural_count(expected_count, "parameter")
+                        potentially_plural_count(expected_count, "argument")
                     ),
                 );
             }
@@ -4123,7 +4241,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let substs = self.fresh_substs_for_item(span, did);
         let substd_ty = self.instantiate_type_scheme(span, &substs, &ity);
 
-        TypeAndSubsts { substs: substs, ty: substd_ty }
+        TypeAndSubsts { substs, ty: substd_ty }
     }
 
     /// Unifies the output type with the expected type early, for more coercions
@@ -4885,7 +5003,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                             let sugg = if receiver.ends_with(".clone()")
                                 && method_call_list.contains(&method_call.as_str())
                             {
-                                let max_len = receiver.rfind(".").unwrap();
+                                let max_len = receiver.rfind('.').unwrap();
                                 format!("{}{}", &receiver[..max_len], method_call)
                             } else {
                                 if expr.precedence().order() < ExprPrecedence::MethodCall.order() {
@@ -4942,14 +5060,60 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 Applicability::MachineApplicable,
             );
             err.note(
-                "for more on the distinction between the stack and the \
-                        heap, read https://doc.rust-lang.org/book/ch15-01-box.html, \
-                        https://doc.rust-lang.org/rust-by-example/std/box.html, and \
-                        https://doc.rust-lang.org/std/boxed/index.html",
+                "for more on the distinction between the stack and the heap, read \
+                 https://doc.rust-lang.org/book/ch15-01-box.html, \
+                 https://doc.rust-lang.org/rust-by-example/std/box.html, and \
+                 https://doc.rust-lang.org/std/boxed/index.html",
             );
         }
     }
 
+    /// When encountering an `impl Future` where `BoxFuture` is expected, suggest `Box::pin`.
+    fn suggest_calling_boxed_future_when_appropriate(
+        &self,
+        err: &mut DiagnosticBuilder<'_>,
+        expr: &hir::Expr<'_>,
+        expected: Ty<'tcx>,
+        found: Ty<'tcx>,
+    ) -> bool {
+        // Handle #68197.
+
+        if self.tcx.hir().is_const_context(expr.hir_id) {
+            // Do not suggest `Box::new` in const context.
+            return false;
+        }
+        let pin_did = self.tcx.lang_items().pin_type();
+        match expected.kind {
+            ty::Adt(def, _) if Some(def.did) != pin_did => return false,
+            // This guards the `unwrap` and `mk_box` below.
+            _ if pin_did.is_none() || self.tcx.lang_items().owned_box().is_none() => return false,
+            _ => {}
+        }
+        let boxed_found = self.tcx.mk_box(found);
+        let new_found = self.tcx.mk_lang_item(boxed_found, lang_items::PinTypeLangItem).unwrap();
+        if let (true, Ok(snippet)) = (
+            self.can_coerce(new_found, expected),
+            self.sess().source_map().span_to_snippet(expr.span),
+        ) {
+            match found.kind {
+                ty::Adt(def, _) if def.is_box() => {
+                    err.help("use `Box::pin`");
+                }
+                _ => {
+                    err.span_suggestion(
+                        expr.span,
+                        "you need to pin and box this expression",
+                        format!("Box::pin({})", snippet),
+                        Applicability::MachineApplicable,
+                    );
+                }
+            }
+            true
+        } else {
+            false
+        }
+    }
+
     /// A common error is to forget to add a semicolon at the end of a block, e.g.,
     ///
     /// ```
@@ -5011,7 +5175,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // Only suggest changing the return type for methods that
         // haven't set a return type at all (and aren't `fn main()` or an impl).
         match (&fn_decl.output, found.is_suggestable(), can_suggest, expected.is_unit()) {
-            (&hir::FunctionRetTy::DefaultReturn(span), true, true, true) => {
+            (&hir::FnRetTy::DefaultReturn(span), true, true, true) => {
                 err.span_suggestion(
                     span,
                     "try adding a return type",
@@ -5020,18 +5184,18 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 );
                 true
             }
-            (&hir::FunctionRetTy::DefaultReturn(span), false, true, true) => {
+            (&hir::FnRetTy::DefaultReturn(span), false, true, true) => {
                 err.span_label(span, "possibly return type missing here?");
                 true
             }
-            (&hir::FunctionRetTy::DefaultReturn(span), _, false, true) => {
+            (&hir::FnRetTy::DefaultReturn(span), _, false, true) => {
                 // `fn main()` must return `()`, do not suggest changing return type
                 err.span_label(span, "expected `()` because of default return type");
                 true
             }
             // expectation was caused by something else, not the default return
-            (&hir::FunctionRetTy::DefaultReturn(_), _, _, false) => false,
-            (&hir::FunctionRetTy::Return(ref ty), _, _, _) => {
+            (&hir::FnRetTy::DefaultReturn(_), _, _, false) => false,
+            (&hir::FnRetTy::Return(ref ty), _, _, _) => {
                 // Only point to return type if the expected type is the return type, as if they
                 // are not, the expectation must have been caused by something else.
                 debug!("suggest_missing_return_type: return type {:?} node {:?}", ty, ty.kind);
@@ -5083,7 +5247,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 // Check for `Future` implementations by constructing a predicate to
                 // prove: `<T as Future>::Output == U`
                 let future_trait = self.tcx.lang_items().future_trait().unwrap();
-                let item_def_id = self.tcx.associated_items(future_trait).next().unwrap().def_id;
+                let item_def_id = self
+                    .tcx
+                    .associated_items(future_trait)
+                    .in_definition_order()
+                    .next()
+                    .unwrap()
+                    .def_id;
                 let predicate =
                     ty::Predicate::Projection(ty::Binder::bind(ty::ProjectionPredicate {
                         // `<T as Future>::Output`
@@ -5268,10 +5438,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             // parameter internally, but we don't allow users to specify the
             // parameter's value explicitly, so we have to do some error-
             // checking here.
-            let suppress_errors = AstConv::check_generic_arg_count_for_call(
-                tcx, span, &generics, &seg, false, // `is_method_call`
-            );
-            if suppress_errors {
+            if let Err(GenericArgCountMismatch { reported: Some(ErrorReported), .. }) =
+                AstConv::check_generic_arg_count_for_call(
+                    tcx, span, &generics, &seg, false, // `is_method_call`
+                )
+            {
                 infer_args_for_err.insert(index);
                 self.set_tainted_by_errors(); // See issue #53251.
             }
@@ -5283,9 +5454,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             .unwrap_or(false);
 
         let (res, self_ctor_substs) = if let Res::SelfCtor(impl_def_id) = res {
-            let ty = self.impl_self_ty(span, impl_def_id).ty;
-            let adt_def = ty.ty_adt_def();
-
+            let ty = self.normalize_ty(span, tcx.at(span).type_of(impl_def_id));
             match ty.kind {
                 ty::Adt(adt_def, substs) if adt_def.has_ctor() => {
                     let variant = adt_def.non_enum_variant();
@@ -5300,7 +5469,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         span,
                         "the `Self` constructor can only be used with tuple or unit structs",
                     );
-                    if let Some(adt_def) = adt_def {
+                    if let Some(adt_def) = ty.ty_adt_def() {
                         match adt_def.adt_kind() {
                             AdtKind::Enum => {
                                 err.help("did you mean to use one of the enum's variants?");
@@ -5336,6 +5505,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 &[][..],
                 has_self,
                 self_ty,
+                infer_args_for_err.is_empty(),
                 // Provide the generic args, and whether types should be inferred.
                 |def_id| {
                     if let Some(&PathSeg(_, index)) =
@@ -5481,8 +5651,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         self.tcx.sess.span_err(
             span,
-            "this function can only be invoked \
-                                      directly, not through a function pointer",
+            "this function can only be invoked directly, not through a function pointer",
         );
     }
 
diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs
index 028c39b80e..bf3511a261 100644
--- a/src/librustc_typeck/check/op.rs
+++ b/src/librustc_typeck/check/op.rs
@@ -2,14 +2,14 @@
 
 use super::method::MethodCallee;
 use super::{FnCtxt, Needs};
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use rustc::ty::adjustment::{Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability};
 use rustc::ty::TyKind::{Adt, Array, Char, FnDef, Never, Ref, Str, Tuple, Uint};
 use rustc::ty::{self, Ty, TypeFoldable};
-use rustc_errors::{self, struct_span_err, Applicability};
+use rustc_ast::ast::Ident;
+use rustc_errors::{self, struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
 use rustc_span::Span;
-use syntax::ast::Ident;
 
 impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     /// Checks a `a <op>= b`
@@ -25,7 +25,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         let ty =
             if !lhs_ty.is_ty_var() && !rhs_ty.is_ty_var() && is_builtin_binop(lhs_ty, rhs_ty, op) {
-                self.enforce_builtin_binop_types(lhs, lhs_ty, rhs, rhs_ty, op);
+                self.enforce_builtin_binop_types(&lhs.span, lhs_ty, &rhs.span, rhs_ty, op);
                 self.tcx.mk_unit()
             } else {
                 return_ty
@@ -86,8 +86,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     && !rhs_ty.is_ty_var()
                     && is_builtin_binop(lhs_ty, rhs_ty, op)
                 {
-                    let builtin_return_ty =
-                        self.enforce_builtin_binop_types(lhs_expr, lhs_ty, rhs_expr, rhs_ty, op);
+                    let builtin_return_ty = self.enforce_builtin_binop_types(
+                        &lhs_expr.span,
+                        lhs_ty,
+                        &rhs_expr.span,
+                        rhs_ty,
+                        op,
+                    );
                     self.demand_suptype(expr.span, builtin_return_ty, return_ty);
                 }
 
@@ -98,19 +103,23 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
     fn enforce_builtin_binop_types(
         &self,
-        lhs_expr: &'tcx hir::Expr<'tcx>,
+        lhs_span: &Span,
         lhs_ty: Ty<'tcx>,
-        rhs_expr: &'tcx hir::Expr<'tcx>,
+        rhs_span: &Span,
         rhs_ty: Ty<'tcx>,
         op: hir::BinOp,
     ) -> Ty<'tcx> {
         debug_assert!(is_builtin_binop(lhs_ty, rhs_ty, op));
 
+        // Special-case a single layer of referencing, so that things like `5.0 + &6.0f32` work.
+        // (See https://github.com/rust-lang/rust/issues/57447.)
+        let (lhs_ty, rhs_ty) = (deref_ty_if_possible(lhs_ty), deref_ty_if_possible(rhs_ty));
+
         let tcx = self.tcx;
         match BinOpCategory::from(op) {
             BinOpCategory::Shortcircuit => {
-                self.demand_suptype(lhs_expr.span, tcx.mk_bool(), lhs_ty);
-                self.demand_suptype(rhs_expr.span, tcx.mk_bool(), rhs_ty);
+                self.demand_suptype(*lhs_span, tcx.mk_bool(), lhs_ty);
+                self.demand_suptype(*rhs_span, tcx.mk_bool(), rhs_ty);
                 tcx.mk_bool()
             }
 
@@ -121,13 +130,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
             BinOpCategory::Math | BinOpCategory::Bitwise => {
                 // both LHS and RHS and result will have the same type
-                self.demand_suptype(rhs_expr.span, lhs_ty, rhs_ty);
+                self.demand_suptype(*rhs_span, lhs_ty, rhs_ty);
                 lhs_ty
             }
 
             BinOpCategory::Comparison => {
                 // both LHS and RHS and result will have the same type
-                self.demand_suptype(rhs_expr.span, lhs_ty, rhs_ty);
+                self.demand_suptype(*rhs_span, lhs_ty, rhs_ty);
                 tcx.mk_bool()
             }
         }
@@ -312,11 +321,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                         lhs_ty, missing_trait
                                     ));
                                 } else if !suggested_deref {
-                                    err.note(&format!(
-                                        "an implementation of `{}` might \
-                                         be missing for `{}`",
-                                        missing_trait, lhs_ty
-                                    ));
+                                    suggest_impl_missing(&mut err, lhs_ty, &missing_trait);
                                 }
                             }
                             err.emit();
@@ -458,11 +463,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                         lhs_ty, missing_trait
                                     ));
                                 } else if !suggested_deref && !involves_fn {
-                                    err.note(&format!(
-                                        "an implementation of `{}` might \
-                                         be missing for `{}`",
-                                        missing_trait, lhs_ty
-                                    ));
+                                    suggest_impl_missing(&mut err, lhs_ty, &missing_trait);
                                 }
                             }
                             err.emit();
@@ -494,7 +495,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 Some(hir_id) => hir_id,
                 None => return false,
             };
-            if self.tcx.has_typeck_tables(def_id) == false {
+            if !self.tcx.has_typeck_tables(def_id) {
                 return false;
             }
             let fn_sig = {
@@ -511,7 +512,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     Some(hir_id) => hir_id,
                     None => return false,
                 };
-                if self.tcx.has_typeck_tables(def_id) == false {
+                if !self.tcx.has_typeck_tables(def_id) {
                     return false;
                 }
                 match self.tcx.typeck_tables_of(def_id).liberated_fn_sigs().get(hir_id) {
@@ -528,7 +529,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 .lookup_op_method(fn_sig.output(), &[other_ty], Op::Binary(op, is_assign))
                 .is_ok()
             {
-                let (variable_snippet, applicability) = if fn_sig.inputs().len() > 0 {
+                let (variable_snippet, applicability) = if !fn_sig.inputs().is_empty() {
                     (
                         format!("{}( /* arguments */ )", source_map.span_to_snippet(span).unwrap()),
                         Applicability::HasPlaceholders,
@@ -596,15 +597,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         Ok(lstring) => {
                             err.span_suggestion(
                                 lhs_expr.span,
-                                if lstring.starts_with("&") {
+                                if lstring.starts_with('&') {
                                     remove_borrow_msg
                                 } else {
                                     msg
                                 },
-                                if lstring.starts_with("&") {
+                                if lstring.starts_with('&') {
                                     // let a = String::new();
                                     // let _ = &a + "bar";
-                                    format!("{}", &lstring[1..])
+                                    lstring[1..].to_string()
                                 } else {
                                     format!("{}.to_owned()", lstring)
                                 },
@@ -629,10 +630,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     is_assign,
                 ) {
                     (Ok(l), Ok(r), false) => {
-                        let to_string = if l.starts_with("&") {
+                        let to_string = if l.starts_with('&') {
                             // let a = String::new(); let b = String::new();
                             // let _ = &a + b;
-                            format!("{}", &l[1..])
+                            l[1..].to_string()
                         } else {
                             format!("{}.to_owned()", l)
                         };
@@ -698,11 +699,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                                 hir::UnOp::UnNot => "std::ops::Not",
                                 hir::UnOp::UnDeref => "std::ops::UnDerf",
                             };
-                            err.note(&format!(
-                                "an implementation of `{}` might \
-                                                be missing for `{}`",
-                                missing_trait, operand_ty
-                            ));
+                            suggest_impl_missing(&mut err, operand_ty, &missing_trait);
                         }
                     }
                     err.emit();
@@ -862,6 +859,14 @@ enum Op {
     Unary(hir::UnOp, Span),
 }
 
+/// Dereferences a single level of immutable referencing.
+fn deref_ty_if_possible<'tcx>(ty: Ty<'tcx>) -> Ty<'tcx> {
+    match ty.kind {
+        ty::Ref(_, ty, hir::Mutability::Not) => ty,
+        _ => ty,
+    }
+}
+
 /// Returns `true` if this is a built-in arithmetic operation (e.g., u32
 /// + u32, i16x4 == i16x4) and false if these types would have to be
 /// overloaded to be legal. There are two reasons that we distinguish
@@ -878,7 +883,11 @@ enum Op {
 /// Reason #2 is the killer. I tried for a while to always use
 /// overloaded logic and just check the types in constants/codegen after
 /// the fact, and it worked fine, except for SIMD types. -nmatsakis
-fn is_builtin_binop(lhs: Ty<'_>, rhs: Ty<'_>, op: hir::BinOp) -> bool {
+fn is_builtin_binop<'tcx>(lhs: Ty<'tcx>, rhs: Ty<'tcx>, op: hir::BinOp) -> bool {
+    // Special-case a single layer of referencing, so that things like `5.0 + &6.0f32` work.
+    // (See https://github.com/rust-lang/rust/issues/57447.)
+    let (lhs, rhs) = (deref_ty_if_possible(lhs), deref_ty_if_possible(rhs));
+
     match BinOpCategory::from(op) {
         BinOpCategory::Shortcircuit => true,
 
@@ -908,3 +917,16 @@ fn is_builtin_binop(lhs: Ty<'_>, rhs: Ty<'_>, op: hir::BinOp) -> bool {
         }
     }
 }
+
+/// If applicable, note that an implementation of `trait` for `ty` may fix the error.
+fn suggest_impl_missing(err: &mut DiagnosticBuilder<'_>, ty: Ty<'_>, missing_trait: &str) {
+    if let Adt(def, _) = ty.peel_refs().kind {
+        if def.did.is_local() {
+            err.note(&format!(
+                "an implementation of `{}` might \
+                be missing for `{}`",
+                missing_trait, ty
+            ));
+        }
+    }
+}
diff --git a/src/librustc_typeck/check/pat.rs b/src/librustc_typeck/check/pat.rs
index f9dee0e477..84854dff85 100644
--- a/src/librustc_typeck/check/pat.rs
+++ b/src/librustc_typeck/check/pat.rs
@@ -1,19 +1,19 @@
 use crate::check::FnCtxt;
-use rustc::infer;
-use rustc::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
-use rustc::traits::Pattern;
 use rustc::ty::subst::GenericArg;
 use rustc::ty::{self, BindingMode, Ty, TypeFoldable};
+use rustc_ast::ast;
+use rustc_ast::util::lev_distance::find_best_match_for_name;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::{pluralize, struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};
 use rustc_hir::pat_util::EnumerateAndAdjustIterator;
 use rustc_hir::{HirId, Pat, PatKind};
+use rustc_infer::infer;
+use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
+use rustc_infer::traits::{ObligationCause, Pattern};
 use rustc_span::hygiene::DesugaringKind;
-use rustc_span::Span;
-use syntax::ast;
-use syntax::util::lev_distance::find_best_match_for_name;
+use rustc_span::source_map::{Span, Spanned};
 
 use std::cmp;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
@@ -63,9 +63,30 @@ struct TopInfo<'tcx> {
     ///              found type `std::result::Result<_, _>`
     /// ```
     span: Option<Span>,
+    /// This refers to the parent pattern. Used to provide extra diagnostic information on errors.
+    /// ```text
+    /// error[E0308]: mismatched types
+    ///   --> $DIR/const-in-struct-pat.rs:8:17
+    ///   |
+    /// L | struct f;
+    ///   | --------- unit struct defined here
+    /// ...
+    /// L |     let Thing { f } = t;
+    ///   |                 ^
+    ///   |                 |
+    ///   |                 expected struct `std::string::String`, found struct `f`
+    ///   |                 `f` is interpreted as a unit struct, not a new binding
+    ///   |                 help: bind the struct field to a different name instead: `f: other_f`
+    /// ```
+    parent_pat: Option<&'tcx Pat<'tcx>>,
 }
 
 impl<'tcx> FnCtxt<'_, 'tcx> {
+    fn pattern_cause(&self, ti: TopInfo<'tcx>, cause_span: Span) -> ObligationCause<'tcx> {
+        let code = Pattern { span: ti.span, root_ty: ti.expected, origin_expr: ti.origin_expr };
+        self.cause(cause_span, code)
+    }
+
     fn demand_eqtype_pat_diag(
         &self,
         cause_span: Span,
@@ -73,9 +94,7 @@ impl<'tcx> FnCtxt<'_, 'tcx> {
         actual: Ty<'tcx>,
         ti: TopInfo<'tcx>,
     ) -> Option<DiagnosticBuilder<'tcx>> {
-        let code = Pattern { span: ti.span, root_ty: ti.expected, origin_expr: ti.origin_expr };
-        let cause = self.cause(cause_span, code);
-        self.demand_eqtype_with_origin(&cause, expected, actual)
+        self.demand_eqtype_with_origin(&self.pattern_cause(ti, cause_span), expected, actual)
     }
 
     fn demand_eqtype_pat(
@@ -89,6 +108,18 @@ impl<'tcx> FnCtxt<'_, 'tcx> {
     }
 }
 
+const INITIAL_BM: BindingMode = BindingMode::BindByValue(hir::Mutability::Not);
+
+/// Mode for adjusting the expected type and binding mode.
+enum AdjustMode {
+    /// Peel off all immediate reference types.
+    Peel,
+    /// Reset binding mode to the initial mode.
+    Reset,
+    /// Pass on the input binding mode and expected type.
+    Pass,
+}
+
 impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     /// Type check the given top level pattern against the `expected` type.
     ///
@@ -105,8 +136,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         span: Option<Span>,
         origin_expr: bool,
     ) {
-        let def_bm = BindingMode::BindByValue(hir::Mutability::Not);
-        self.check_pat(pat, expected, def_bm, TopInfo { expected, origin_expr, span });
+        let info = TopInfo { expected, origin_expr, span, parent_pat: None };
+        self.check_pat(pat, expected, INITIAL_BM, info);
     }
 
     /// Type check the given `pat` against the `expected` type
@@ -123,12 +154,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     ) {
         debug!("check_pat(pat={:?},expected={:?},def_bm={:?})", pat, expected, def_bm);
 
-        let path_resolution = match &pat.kind {
+        let path_res = match &pat.kind {
             PatKind::Path(qpath) => Some(self.resolve_ty_and_res_ufcs(qpath, pat.hir_id, pat.span)),
             _ => None,
         };
-        let is_nrp = self.is_non_ref_pat(pat, path_resolution.map(|(res, ..)| res));
-        let (expected, def_bm) = self.calc_default_binding_mode(pat, expected, def_bm, is_nrp);
+        let adjust_mode = self.calc_adjust_mode(pat, path_res.map(|(res, ..)| res));
+        let (expected, def_bm) = self.calc_default_binding_mode(pat, expected, def_bm, adjust_mode);
 
         let ty = match pat.kind {
             PatKind::Wild => expected,
@@ -141,14 +172,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 self.check_pat_tuple_struct(pat, qpath, subpats, ddpos, expected, def_bm, ti)
             }
             PatKind::Path(ref qpath) => {
-                self.check_pat_path(pat, path_resolution.unwrap(), qpath, expected)
+                self.check_pat_path(pat, path_res.unwrap(), qpath, expected, ti)
             }
             PatKind::Struct(ref qpath, fields, etc) => {
                 self.check_pat_struct(pat, qpath, fields, etc, expected, def_bm, ti)
             }
             PatKind::Or(pats) => {
+                let parent_pat = Some(pat);
                 for pat in pats {
-                    self.check_pat(pat, expected, def_bm, ti);
+                    self.check_pat(pat, expected, def_bm, TopInfo { parent_pat, ..ti });
                 }
                 expected
             }
@@ -223,64 +255,68 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         pat: &'tcx Pat<'tcx>,
         expected: Ty<'tcx>,
         def_bm: BindingMode,
-        is_non_ref_pat: bool,
+        adjust_mode: AdjustMode,
     ) -> (Ty<'tcx>, BindingMode) {
-        if is_non_ref_pat {
-            debug!("pattern is non reference pattern");
-            self.peel_off_references(pat, expected, def_bm)
-        } else {
-            // When you encounter a `&pat` pattern, reset to "by
-            // value". This is so that `x` and `y` here are by value,
-            // as they appear to be:
-            //
-            // ```
-            // match &(&22, &44) {
-            //   (&x, &y) => ...
-            // }
-            // ```
-            //
-            // See issue #46688.
-            let def_bm = match pat.kind {
-                PatKind::Ref(..) => ty::BindByValue(hir::Mutability::Not),
-                _ => def_bm,
-            };
-            (expected, def_bm)
+        match adjust_mode {
+            AdjustMode::Pass => (expected, def_bm),
+            AdjustMode::Reset => (expected, INITIAL_BM),
+            AdjustMode::Peel => self.peel_off_references(pat, expected, def_bm),
         }
     }
 
-    /// Is the pattern a "non reference pattern"?
+    /// How should the binding mode and expected type be adjusted?
+    ///
     /// When the pattern is a path pattern, `opt_path_res` must be `Some(res)`.
-    fn is_non_ref_pat(&self, pat: &'tcx Pat<'tcx>, opt_path_res: Option<Res>) -> bool {
-        match pat.kind {
+    fn calc_adjust_mode(&self, pat: &'tcx Pat<'tcx>, opt_path_res: Option<Res>) -> AdjustMode {
+        match &pat.kind {
+            // Type checking these product-like types successfully always require
+            // that the expected type be of those types and not reference types.
             PatKind::Struct(..)
             | PatKind::TupleStruct(..)
             | PatKind::Tuple(..)
             | PatKind::Box(_)
             | PatKind::Range(..)
-            | PatKind::Slice(..) => true,
-            PatKind::Lit(ref lt) => {
-                let ty = self.check_expr(lt);
-                match ty.kind {
-                    ty::Ref(..) => false,
-                    _ => true,
-                }
-            }
+            | PatKind::Slice(..) => AdjustMode::Peel,
+            // String and byte-string literals result in types `&str` and `&[u8]` respectively.
+            // All other literals result in non-reference types.
+            // As a result, we allow `if let 0 = &&0 {}` but not `if let "foo" = &&"foo {}`.
+            PatKind::Lit(lt) => match self.check_expr(lt).kind {
+                ty::Ref(..) => AdjustMode::Pass,
+                _ => AdjustMode::Peel,
+            },
             PatKind::Path(_) => match opt_path_res.unwrap() {
-                Res::Def(DefKind::Const, _) | Res::Def(DefKind::AssocConst, _) => false,
-                _ => true,
+                // These constants can be of a reference type, e.g. `const X: &u8 = &0;`.
+                // Peeling the reference types too early will cause type checking failures.
+                // Although it would be possible to *also* peel the types of the constants too.
+                Res::Def(DefKind::Const, _) | Res::Def(DefKind::AssocConst, _) => AdjustMode::Pass,
+                // In the `ValueNS`, we have `SelfCtor(..) | Ctor(_, Const), _)` remaining which
+                // could successfully compile. The former being `Self` requires a unit struct.
+                // In either case, and unlike constants, the pattern itself cannot be
+                // a reference type wherefore peeling doesn't give up any expressivity.
+                _ => AdjustMode::Peel,
             },
-            // FIXME(or_patterns; Centril | dlrobertson): To keep things compiling
-            // for or-patterns at the top level, we need to make `p_0 | ... | p_n`
-            // a "non reference pattern". For example the following currently compiles:
+            // When encountering a `& mut? pat` pattern, reset to "by value".
+            // This is so that `x` and `y` here are by value, as they appear to be:
+            //
             // ```
-            // match &1 {
-            //     e @ &(1...2) | e @ &(3...4) => {}
-            //     _ => {}
+            // match &(&22, &44) {
+            //   (&x, &y) => ...
             // }
             // ```
             //
-            // We should consider whether we should do something special in nested or-patterns.
-            PatKind::Or(_) | PatKind::Wild | PatKind::Binding(..) | PatKind::Ref(..) => false,
+            // See issue #46688.
+            PatKind::Ref(..) => AdjustMode::Reset,
+            // A `_` pattern works with any expected type, so there's no need to do anything.
+            PatKind::Wild
+            // Bindings also work with whatever the expected type is,
+            // and moreover if we peel references off, that will give us the wrong binding type.
+            // Also, we can have a subpattern `binding @ pat`.
+            // Each side of the `@` should be treated independently (like with OR-patterns).
+            | PatKind::Binding(..)
+            // An OR-pattern just propagates to each individual alternative.
+            // This is maximally flexible, allowing e.g., `Some(mut x) | &Some(mut x)`.
+            // In that example, `Some(mut x)` results in `Peel` whereas `&Some(mut x)` in `Reset`.
+            | PatKind::Or(_) => AdjustMode::Pass,
         }
     }
 
@@ -324,7 +360,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             });
         }
 
-        if pat_adjustments.len() > 0 {
+        if !pat_adjustments.is_empty() {
             debug!("default binding mode is now {:?}", def_bm);
             self.inh.tables.borrow_mut().pat_adjustments_mut().insert(pat.hir_id, pat_adjustments);
         }
@@ -346,16 +382,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // Byte string patterns behave the same way as array patterns
         // They can denote both statically and dynamically-sized byte arrays.
         let mut pat_ty = ty;
-        if let hir::ExprKind::Lit(ref lt) = lt.kind {
-            if let ast::LitKind::ByteStr(_) = lt.node {
-                let expected_ty = self.structurally_resolved_type(span, expected);
-                if let ty::Ref(_, r_ty, _) = expected_ty.kind {
-                    if let ty::Slice(_) = r_ty.kind {
-                        let tcx = self.tcx;
-                        pat_ty =
-                            tcx.mk_imm_ref(tcx.lifetimes.re_static, tcx.mk_slice(tcx.types.u8));
-                    }
-                }
+        if let hir::ExprKind::Lit(Spanned { node: ast::LitKind::ByteStr(_), .. }) = lt.kind {
+            let expected = self.structurally_resolved_type(span, expected);
+            if let ty::Ref(_, ty::TyS { kind: ty::Slice(_), .. }, _) = expected.kind {
+                let tcx = self.tcx;
+                pat_ty = tcx.mk_imm_ref(tcx.lifetimes.re_static, tcx.mk_slice(tcx.types.u8));
             }
         }
 
@@ -369,7 +400,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         //     &'static str <: expected
         //
         // then that's equivalent to there existing a LUB.
-        if let Some(mut err) = self.demand_suptype_diag(span, expected, pat_ty) {
+        let cause = self.pattern_cause(ti, span);
+        if let Some(mut err) = self.demand_suptype_with_origin(&cause, expected, pat_ty) {
             err.emit_unless(
                 ti.span
                     .filter(|&s| {
@@ -487,7 +519,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
     fn check_pat_ident(
         &self,
-        pat: &Pat<'_>,
+        pat: &'tcx Pat<'tcx>,
         ba: hir::BindingAnnotation,
         var_id: HirId,
         sub: Option<&'tcx Pat<'tcx>>,
@@ -508,7 +540,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let local_ty = self.local_ty(pat.span, pat.hir_id).decl_ty;
         let eq_ty = match bm {
             ty::BindByReference(mutbl) => {
-                // If the binding is like `ref x | ref const x | ref mut x`
+                // If the binding is like `ref x | ref mut x`,
                 // then `x` is assigned a value of type `&M T` where M is the
                 // mutability and T is the expected type.
                 //
@@ -528,17 +560,38 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // If there are multiple arms, make sure they all agree on
         // what the type of the binding `x` ought to be.
         if var_id != pat.hir_id {
-            let vt = self.local_ty(pat.span, var_id).decl_ty;
-            self.demand_eqtype_pat(pat.span, vt, local_ty, ti);
+            self.check_binding_alt_eq_ty(pat.span, var_id, local_ty, ti);
         }
 
         if let Some(p) = sub {
-            self.check_pat(&p, expected, def_bm, ti);
+            self.check_pat(&p, expected, def_bm, TopInfo { parent_pat: Some(&pat), ..ti });
         }
 
         local_ty
     }
 
+    fn check_binding_alt_eq_ty(&self, span: Span, var_id: HirId, ty: Ty<'tcx>, ti: TopInfo<'tcx>) {
+        let var_ty = self.local_ty(span, var_id).decl_ty;
+        if let Some(mut err) = self.demand_eqtype_pat_diag(span, var_ty, ty, ti) {
+            let hir = self.tcx.hir();
+            let var_ty = self.resolve_vars_with_obligations(var_ty);
+            let msg = format!("first introduced with type `{}` here", var_ty);
+            err.span_label(hir.span(var_id), msg);
+            let in_match = hir.parent_iter(var_id).any(|(_, n)| {
+                matches!(
+                    n,
+                    hir::Node::Expr(hir::Expr {
+                        kind: hir::ExprKind::Match(.., hir::MatchSource::Normal),
+                        ..
+                    })
+                )
+            });
+            let pre = if in_match { "in the same arm, " } else { "" };
+            err.note(&format!("{}a binding must have the same type in all alternatives", pre));
+            err.emit();
+        }
+    }
+
     fn borrow_pat_suggestion(
         &self,
         err: &mut DiagnosticBuilder<'_>,
@@ -620,6 +673,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             variant_ty
         } else {
             for field in fields {
+                let ti = TopInfo { parent_pat: Some(&pat), ..ti };
                 self.check_pat(&field.pat, self.tcx.types.err, def_bm, ti);
             }
             return self.tcx.types.err;
@@ -629,9 +683,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         self.demand_eqtype_pat(pat.span, expected, pat_ty, ti);
 
         // Type-check subpatterns.
-        if self
-            .check_struct_pat_fields(pat_ty, pat.hir_id, pat.span, variant, fields, etc, def_bm, ti)
-        {
+        if self.check_struct_pat_fields(pat_ty, &pat, variant, fields, etc, def_bm, ti) {
             pat_ty
         } else {
             self.tcx.types.err
@@ -644,6 +696,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         path_resolution: (Res, Option<Ty<'tcx>>, &'b [hir::PathSegment<'b>]),
         qpath: &hir::QPath<'_>,
         expected: Ty<'tcx>,
+        ti: TopInfo<'tcx>,
     ) -> Ty<'tcx> {
         let tcx = self.tcx;
 
@@ -668,14 +721,56 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         }
 
         // Type-check the path.
-        let pat_ty = self.instantiate_value_path(segments, opt_ty, res, pat.span, pat.hir_id).0;
-        self.demand_suptype(pat.span, expected, pat_ty);
+        let (pat_ty, pat_res) =
+            self.instantiate_value_path(segments, opt_ty, res, pat.span, pat.hir_id);
+        if let Some(err) =
+            self.demand_suptype_with_origin(&self.pattern_cause(ti, pat.span), expected, pat_ty)
+        {
+            self.emit_bad_pat_path(err, pat.span, res, pat_res, segments, ti.parent_pat);
+        }
         pat_ty
     }
 
+    fn emit_bad_pat_path(
+        &self,
+        mut e: DiagnosticBuilder<'_>,
+        pat_span: Span,
+        res: Res,
+        pat_res: Res,
+        segments: &'b [hir::PathSegment<'b>],
+        parent_pat: Option<&Pat<'_>>,
+    ) {
+        if let Some(span) = self.tcx.hir().res_span(pat_res) {
+            e.span_label(span, &format!("{} defined here", res.descr()));
+            if let [hir::PathSegment { ident, .. }] = &*segments {
+                e.span_label(
+                    pat_span,
+                    &format!(
+                        "`{}` is interpreted as {} {}, not a new binding",
+                        ident,
+                        res.article(),
+                        res.descr(),
+                    ),
+                );
+                let (msg, sugg) = match parent_pat {
+                    Some(Pat { kind: hir::PatKind::Struct(..), .. }) => (
+                        "bind the struct field to a different name instead",
+                        format!("{}: other_{}", ident, ident.as_str().to_lowercase()),
+                    ),
+                    _ => (
+                        "introduce a new binding instead",
+                        format!("other_{}", ident.as_str().to_lowercase()),
+                    ),
+                };
+                e.span_suggestion(ident.span, msg, sugg, Applicability::HasPlaceholders);
+            }
+        }
+        e.emit();
+    }
+
     fn check_pat_tuple_struct(
         &self,
-        pat: &Pat<'_>,
+        pat: &'tcx Pat<'tcx>,
         qpath: &hir::QPath<'_>,
         subpats: &'tcx [&'tcx Pat<'tcx>],
         ddpos: Option<usize>,
@@ -685,15 +780,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     ) -> Ty<'tcx> {
         let tcx = self.tcx;
         let on_error = || {
+            let parent_pat = Some(pat);
             for pat in subpats {
-                self.check_pat(&pat, tcx.types.err, def_bm, ti);
+                self.check_pat(&pat, tcx.types.err, def_bm, TopInfo { parent_pat, ..ti });
             }
         };
         let report_unexpected_res = |res: Res| {
             let msg = format!(
                 "expected tuple struct or tuple variant, found {} `{}`",
                 res.descr(),
-                hir::print::to_string(tcx.hir(), |s| s.print_qpath(qpath, false)),
+                hir::print::to_string(&tcx.hir(), |s| s.print_qpath(qpath, false)),
             );
             let mut err = struct_span_err!(tcx.sess, pat.span, E0164, "{}", msg);
             match (res, &pat.kind) {
@@ -761,7 +857,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             };
             for (i, subpat) in subpats.iter().enumerate_and_adjust(variant.fields.len(), ddpos) {
                 let field_ty = self.field_ty(subpat.span, &variant.fields[i], substs);
-                self.check_pat(&subpat, field_ty, def_bm, ti);
+                self.check_pat(&subpat, field_ty, def_bm, TopInfo { parent_pat: Some(&pat), ..ti });
 
                 self.tcx.check_stability(variant.fields[i].did, Some(pat.hir_id), subpat.span);
             }
@@ -809,7 +905,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         // N-arity-tuple, e.g., `V_i((p_0, .., p_N))`. Meanwhile, the user supplied a pattern
         // with the subpatterns directly in the tuple variant pattern, e.g., `V_i(p_0, .., p_N)`.
         let missing_parenthesis = match (&expected.kind, fields, had_err) {
-            // #67037: only do this if we could sucessfully type-check the expected type against
+            // #67037: only do this if we could successfully type-check the expected type against
             // the tuple struct pattern. Otherwise the substs could get out of range on e.g.,
             // `let P() = U;` where `P != U` with `struct P<T>(T);`.
             (ty::Adt(_, substs), [field], false) => {
@@ -886,7 +982,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         });
         let element_tys = tcx.mk_substs(element_tys_iter);
         let pat_ty = tcx.mk_ty(ty::Tuple(element_tys));
-        if let Some(mut err) = self.demand_eqtype_diag(span, expected, pat_ty) {
+        if let Some(mut err) = self.demand_eqtype_pat_diag(span, expected, pat_ty, ti) {
             err.emit();
             // Walk subpatterns with an expected type of `err` in this case to silence
             // further errors being emitted when using the bindings. #50333
@@ -906,8 +1002,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     fn check_struct_pat_fields(
         &self,
         adt_ty: Ty<'tcx>,
-        pat_id: HirId,
-        span: Span,
+        pat: &'tcx Pat<'tcx>,
         variant: &'tcx ty::VariantDef,
         fields: &'tcx [hir::FieldPat<'tcx>],
         etc: bool,
@@ -918,7 +1013,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
         let (substs, adt) = match adt_ty.kind {
             ty::Adt(adt, substs) => (substs, adt),
-            _ => span_bug!(span, "struct pattern is not an ADT"),
+            _ => span_bug!(pat.span, "struct pattern is not an ADT"),
         };
         let kind_name = adt.variant_descr();
 
@@ -951,7 +1046,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                         .get(&ident)
                         .map(|(i, f)| {
                             self.write_field_index(field.hir_id, *i);
-                            self.tcx.check_stability(f.did, Some(pat_id), span);
+                            self.tcx.check_stability(f.did, Some(pat.hir_id), span);
                             self.field_ty(span, f, substs)
                         })
                         .unwrap_or_else(|| {
@@ -962,7 +1057,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 }
             };
 
-            self.check_pat(&field.pat, field_ty, def_bm, ti);
+            self.check_pat(&field.pat, field_ty, def_bm, TopInfo { parent_pat: Some(&pat), ..ti });
         }
 
         let mut unmentioned_fields = variant
@@ -972,7 +1067,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             .filter(|ident| !used_fields.contains_key(&ident))
             .collect::<Vec<_>>();
 
-        if inexistent_fields.len() > 0 && !variant.recovered {
+        if !inexistent_fields.is_empty() && !variant.recovered {
             self.error_inexistent_fields(
                 kind_name,
                 &inexistent_fields,
@@ -985,7 +1080,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         if variant.is_field_list_non_exhaustive() && !adt.did.is_local() && !etc {
             struct_span_err!(
                 tcx.sess,
-                span,
+                pat.span,
                 E0638,
                 "`..` required with {} marked as non-exhaustive",
                 kind_name
@@ -997,14 +1092,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         if kind_name == "union" {
             if fields.len() != 1 {
                 tcx.sess
-                    .struct_span_err(span, "union patterns should have exactly one field")
+                    .struct_span_err(pat.span, "union patterns should have exactly one field")
                     .emit();
             }
             if etc {
-                tcx.sess.struct_span_err(span, "`..` cannot be used in union patterns").emit();
+                tcx.sess.struct_span_err(pat.span, "`..` cannot be used in union patterns").emit();
             }
-        } else if !etc && unmentioned_fields.len() > 0 {
-            self.error_unmentioned_fields(span, &unmentioned_fields, variant);
+        } else if !etc && !unmentioned_fields.is_empty() {
+            self.error_unmentioned_fields(pat.span, &unmentioned_fields, variant);
         }
         no_field_errors
     }
@@ -1164,7 +1259,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
     fn check_pat_ref(
         &self,
-        pat: &Pat<'_>,
+        pat: &'tcx Pat<'tcx>,
         inner: &'tcx Pat<'tcx>,
         mutbl: hir::Mutability,
         expected: Ty<'tcx>,
@@ -1190,7 +1285,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                     });
                     let rptr_ty = self.new_ref_ty(pat.span, mutbl, inner_ty);
                     debug!("check_pat_ref: demanding {:?} = {:?}", expected, rptr_ty);
-                    let err = self.demand_eqtype_diag(pat.span, expected, rptr_ty);
+                    let err = self.demand_eqtype_pat_diag(pat.span, expected, rptr_ty, ti);
 
                     // Look for a case like `fn foo(&foo: u32)` and suggest
                     // `fn foo(foo: &u32)`
@@ -1204,7 +1299,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         } else {
             (tcx.types.err, tcx.types.err)
         };
-        self.check_pat(&inner, inner_ty, def_bm, ti);
+        self.check_pat(&inner, inner_ty, def_bm, TopInfo { parent_pat: Some(&pat), ..ti });
         rptr_ty
     }
 
diff --git a/src/librustc_typeck/check/regionck.rs b/src/librustc_typeck/check/regionck.rs
index af2ccb4517..c0e33637fd 100644
--- a/src/librustc_typeck/check/regionck.rs
+++ b/src/librustc_typeck/check/regionck.rs
@@ -77,8 +77,6 @@ use crate::check::FnCtxt;
 use crate::mem_categorization as mc;
 use crate::middle::region;
 use rustc::hir::map::Map;
-use rustc::infer::outlives::env::OutlivesEnvironment;
-use rustc::infer::{self, RegionObligation, SuppressRegionErrors};
 use rustc::ty::adjustment;
 use rustc::ty::subst::{GenericArgKind, SubstsRef};
 use rustc::ty::{self, Ty};
@@ -86,6 +84,8 @@ use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
 use rustc_hir::PatKind;
+use rustc_infer::infer::outlives::env::OutlivesEnvironment;
+use rustc_infer::infer::{self, RegionObligation, SuppressRegionErrors};
 use rustc_span::Span;
 use std::mem;
 use std::ops::Deref;
diff --git a/src/librustc_typeck/check/upvar.rs b/src/librustc_typeck/check/upvar.rs
index e4502bf134..b5ed6335dc 100644
--- a/src/librustc_typeck/check/upvar.rs
+++ b/src/librustc_typeck/check/upvar.rs
@@ -36,15 +36,15 @@ use crate::expr_use_visitor as euv;
 use crate::mem_categorization as mc;
 use crate::mem_categorization::PlaceBase;
 use rustc::hir::map::Map;
-use rustc::infer::UpvarRegion;
 use rustc::ty::{self, Ty, TyCtxt, UpvarSubsts};
+use rustc_ast::ast;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::def_id::LocalDefId;
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
+use rustc_infer::infer::UpvarRegion;
 use rustc_span::Span;
-use syntax::ast;
 
 impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
     pub fn closure_analyze(&self, body: &'tcx hir::Body<'tcx>) {
diff --git a/src/librustc_typeck/check/wfcheck.rs b/src/librustc_typeck/check/wfcheck.rs
index 82811826ae..e8e34a4e8f 100644
--- a/src/librustc_typeck/check/wfcheck.rs
+++ b/src/librustc_typeck/check/wfcheck.rs
@@ -1,21 +1,21 @@
 use crate::check::{FnCtxt, Inherited};
 use crate::constrained_generic_params::{identify_constrained_generic_params, Parameter};
 
-use rustc::infer::opaque_types::may_define_opaque_type;
 use rustc::middle::lang_items;
 use rustc::session::parse::feature_err;
-use rustc::traits::{self, ObligationCause, ObligationCauseCode};
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::{
     self, AdtKind, GenericParamDefKind, ToPredicate, Ty, TyCtxt, TypeFoldable, WithConstness,
 };
+use rustc_ast::ast;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_errors::{struct_span_err, DiagnosticBuilder};
+use rustc_errors::{struct_span_err, Applicability, DiagnosticBuilder};
 use rustc_hir::def_id::DefId;
 use rustc_hir::ItemKind;
+use rustc_infer::infer::opaque_types::may_define_opaque_type;
+use rustc_infer::traits::{self, ObligationCause, ObligationCauseCode};
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast;
 
 use rustc_hir as hir;
 use rustc_hir::itemlikevisit::ParItemLikeVisitor;
@@ -176,9 +176,72 @@ pub fn check_trait_item(tcx: TyCtxt<'_>, def_id: DefId) {
         hir::TraitItemKind::Method(ref sig, _) => Some(sig),
         _ => None,
     };
+    check_object_unsafe_self_trait_by_name(tcx, &trait_item);
     check_associated_item(tcx, trait_item.hir_id, trait_item.span, method_sig);
 }
 
+fn could_be_self(trait_def_id: DefId, ty: &hir::Ty<'_>) -> bool {
+    match ty.kind {
+        hir::TyKind::TraitObject([trait_ref], ..) => match trait_ref.trait_ref.path.segments {
+            [s] => s.res.and_then(|r| r.opt_def_id()) == Some(trait_def_id),
+            _ => false,
+        },
+        _ => false,
+    }
+}
+
+/// Detect when an object unsafe trait is referring to itself in one of its associated items.
+/// When this is done, suggest using `Self` instead.
+fn check_object_unsafe_self_trait_by_name(tcx: TyCtxt<'_>, item: &hir::TraitItem<'_>) {
+    let (trait_name, trait_def_id) = match tcx.hir().get(tcx.hir().get_parent_item(item.hir_id)) {
+        hir::Node::Item(item) => match item.kind {
+            hir::ItemKind::Trait(..) => (item.ident, tcx.hir().local_def_id(item.hir_id)),
+            _ => return,
+        },
+        _ => return,
+    };
+    let mut trait_should_be_self = vec![];
+    match &item.kind {
+        hir::TraitItemKind::Const(ty, _) | hir::TraitItemKind::Type(_, Some(ty))
+            if could_be_self(trait_def_id, ty) =>
+        {
+            trait_should_be_self.push(ty.span)
+        }
+        hir::TraitItemKind::Method(sig, _) => {
+            for ty in sig.decl.inputs {
+                if could_be_self(trait_def_id, ty) {
+                    trait_should_be_self.push(ty.span);
+                }
+            }
+            match sig.decl.output {
+                hir::FnRetTy::Return(ty) if could_be_self(trait_def_id, ty) => {
+                    trait_should_be_self.push(ty.span);
+                }
+                _ => {}
+            }
+        }
+        _ => {}
+    }
+    if !trait_should_be_self.is_empty() {
+        if tcx.object_safety_violations(trait_def_id).is_empty() {
+            return;
+        }
+        let sugg = trait_should_be_self.iter().map(|span| (*span, "Self".to_string())).collect();
+        tcx.sess
+            .struct_span_err(
+                trait_should_be_self,
+                "associated item referring to unboxed trait object for its own trait",
+            )
+            .span_label(trait_name.span, "in this trait")
+            .multipart_suggestion(
+                "you might have meant to use `Self` to refer to the implementing type",
+                sugg,
+                Applicability::MachineApplicable,
+            )
+            .emit();
+    }
+}
+
 pub fn check_impl_item(tcx: TyCtxt<'_>, def_id: DefId) {
     let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
     let impl_item = tcx.hir().expect_impl_item(hir_id);
@@ -219,9 +282,17 @@ fn check_associated_item(
             ty::AssocKind::Method => {
                 let sig = fcx.tcx.fn_sig(item.def_id);
                 let sig = fcx.normalize_associated_types_in(span, &sig);
-                check_fn_or_method(tcx, fcx, span, sig, item.def_id, &mut implied_bounds);
-                let sig_if_method = sig_if_method.expect("bad signature for method");
-                check_method_receiver(fcx, sig_if_method, &item, self_ty);
+                let hir_sig = sig_if_method.expect("bad signature for method");
+                check_fn_or_method(
+                    tcx,
+                    fcx,
+                    item.ident.span,
+                    sig,
+                    hir_sig,
+                    item.def_id,
+                    &mut implied_bounds,
+                );
+                check_method_receiver(fcx, hir_sig, &item, self_ty);
             }
             ty::AssocKind::Type => {
                 if item.defaultness.has_value() {
@@ -354,17 +425,120 @@ fn check_trait(tcx: TyCtxt<'_>, item: &hir::Item<'_>) {
 
     for_item(tcx, item).with_fcx(|fcx, _| {
         check_where_clauses(tcx, fcx, item.span, trait_def_id, None);
+        check_associated_type_defaults(fcx, trait_def_id);
+
         vec![]
     });
 }
 
+/// Checks all associated type defaults of trait `trait_def_id`.
+///
+/// Assuming the defaults are used, check that all predicates (bounds on the
+/// assoc type and where clauses on the trait) hold.
+fn check_associated_type_defaults(fcx: &FnCtxt<'_, '_>, trait_def_id: DefId) {
+    let tcx = fcx.tcx;
+    let substs = InternalSubsts::identity_for_item(tcx, trait_def_id);
+
+    // For all assoc. types with defaults, build a map from
+    // `<Self as Trait<...>>::Assoc` to the default type.
+    let map = tcx
+        .associated_items(trait_def_id)
+        .in_definition_order()
+        .filter_map(|item| {
+            if item.kind == ty::AssocKind::Type && item.defaultness.has_value() {
+                // `<Self as Trait<...>>::Assoc`
+                let proj = ty::ProjectionTy { substs, item_def_id: item.def_id };
+                let default_ty = tcx.type_of(item.def_id);
+                debug!("assoc. type default mapping: {} -> {}", proj, default_ty);
+                Some((proj, default_ty))
+            } else {
+                None
+            }
+        })
+        .collect::<FxHashMap<_, _>>();
+
+    /// Replaces projections of associated types with their default types.
+    ///
+    /// This does a "shallow substitution", meaning that defaults that refer to
+    /// other defaulted assoc. types will still refer to the projection
+    /// afterwards, not to the other default. For example:
+    ///
+    /// ```compile_fail
+    /// trait Tr {
+    ///     type A: Clone = Vec<Self::B>;
+    ///     type B = u8;
+    /// }
+    /// ```
+    ///
+    /// This will end up replacing the bound `Self::A: Clone` with
+    /// `Vec<Self::B>: Clone`, not with `Vec<u8>: Clone`. If we did a deep
+    /// substitution and ended up with the latter, the trait would be accepted.
+    /// If an `impl` then replaced `B` with something that isn't `Clone`,
+    /// suddenly the default for `A` is no longer valid. The shallow
+    /// substitution forces the trait to add a `B: Clone` bound to be accepted,
+    /// which means that an `impl` can replace any default without breaking
+    /// others.
+    ///
+    /// Note that this isn't needed for soundness: The defaults would still be
+    /// checked in any impl that doesn't override them.
+    struct DefaultNormalizer<'tcx> {
+        tcx: TyCtxt<'tcx>,
+        map: FxHashMap<ty::ProjectionTy<'tcx>, Ty<'tcx>>,
+    }
+
+    impl<'tcx> ty::fold::TypeFolder<'tcx> for DefaultNormalizer<'tcx> {
+        fn tcx<'a>(&'a self) -> TyCtxt<'tcx> {
+            self.tcx
+        }
+
+        fn fold_ty(&mut self, t: Ty<'tcx>) -> Ty<'tcx> {
+            match t.kind {
+                ty::Projection(proj_ty) => {
+                    if let Some(default) = self.map.get(&proj_ty) {
+                        default
+                    } else {
+                        t.super_fold_with(self)
+                    }
+                }
+                _ => t.super_fold_with(self),
+            }
+        }
+    }
+
+    // Now take all predicates defined on the trait, replace any mention of
+    // the assoc. types with their default, and prove them.
+    // We only consider predicates that directly mention the assoc. type.
+    let mut norm = DefaultNormalizer { tcx, map };
+    let predicates = fcx.tcx.predicates_of(trait_def_id);
+    for &(orig_pred, span) in predicates.predicates.iter() {
+        let pred = orig_pred.fold_with(&mut norm);
+        if pred != orig_pred {
+            // Mentions one of the defaulted assoc. types
+            debug!("default suitability check: proving predicate: {} -> {}", orig_pred, pred);
+            let pred = fcx.normalize_associated_types_in(span, &pred);
+            let cause = traits::ObligationCause::new(
+                span,
+                fcx.body_id,
+                traits::ItemObligation(trait_def_id),
+            );
+            let obligation = traits::Obligation::new(cause, fcx.param_env, pred);
+
+            fcx.register_predicate(obligation);
+        }
+    }
+}
+
 fn check_item_fn(tcx: TyCtxt<'_>, item: &hir::Item<'_>) {
     for_item(tcx, item).with_fcx(|fcx, tcx| {
         let def_id = fcx.tcx.hir().local_def_id(item.hir_id);
         let sig = fcx.tcx.fn_sig(def_id);
         let sig = fcx.normalize_associated_types_in(item.span, &sig);
         let mut implied_bounds = vec![];
-        check_fn_or_method(tcx, fcx, item.span, sig, def_id, &mut implied_bounds);
+        let hir_sig = match &item.kind {
+            ItemKind::Fn(sig, ..) => sig,
+            _ => bug!("expected `ItemKind::Fn`, found `{:?}`", item.kind),
+        };
+        check_fn_or_method(tcx, fcx, item.ident.span, sig, hir_sig, def_id, &mut implied_bounds);
         implied_bounds
     })
 }
@@ -452,7 +626,7 @@ fn check_where_clauses<'tcx, 'fcx>(
     fcx: &FnCtxt<'fcx, 'tcx>,
     span: Span,
     def_id: DefId,
-    return_ty: Option<Ty<'tcx>>,
+    return_ty: Option<(Ty<'tcx>, Span)>,
 ) {
     debug!("check_where_clauses(def_id={:?}, return_ty={:?})", def_id, return_ty);
 
@@ -586,17 +760,22 @@ fn check_where_clauses<'tcx, 'fcx>(
 
     let mut predicates = predicates.instantiate_identity(fcx.tcx);
 
-    if let Some(return_ty) = return_ty {
-        predicates.predicates.extend(check_opaque_types(tcx, fcx, def_id, span, return_ty));
+    if let Some((return_ty, span)) = return_ty {
+        let opaque_types = check_opaque_types(tcx, fcx, def_id, span, return_ty);
+        for _ in 0..opaque_types.len() {
+            predicates.spans.push(span);
+        }
+        predicates.predicates.extend(opaque_types);
     }
 
     let predicates = fcx.normalize_associated_types_in(span, &predicates);
 
     debug!("check_where_clauses: predicates={:?}", predicates.predicates);
-    let wf_obligations = predicates
-        .predicates
-        .iter()
-        .flat_map(|p| traits::wf::predicate_obligations(fcx, fcx.param_env, fcx.body_id, p, span));
+    assert_eq!(predicates.predicates.len(), predicates.spans.len());
+    let wf_obligations =
+        predicates.predicates.iter().zip(predicates.spans.iter()).flat_map(|(p, sp)| {
+            traits::wf::predicate_obligations(fcx, fcx.param_env, fcx.body_id, p, *sp)
+        });
 
     for obligation in wf_obligations.chain(default_obligations) {
         debug!("next obligation cause: {:?}", obligation.cause);
@@ -609,23 +788,28 @@ fn check_fn_or_method<'fcx, 'tcx>(
     fcx: &FnCtxt<'fcx, 'tcx>,
     span: Span,
     sig: ty::PolyFnSig<'tcx>,
+    hir_sig: &hir::FnSig<'_>,
     def_id: DefId,
     implied_bounds: &mut Vec<Ty<'tcx>>,
 ) {
     let sig = fcx.normalize_associated_types_in(span, &sig);
     let sig = fcx.tcx.liberate_late_bound_regions(def_id, &sig);
 
-    for input_ty in sig.inputs() {
+    for (input_ty, span) in sig.inputs().iter().zip(hir_sig.decl.inputs.iter().map(|t| t.span)) {
         fcx.register_wf_obligation(&input_ty, span, ObligationCauseCode::MiscObligation);
     }
     implied_bounds.extend(sig.inputs());
 
-    fcx.register_wf_obligation(sig.output(), span, ObligationCauseCode::ReturnType);
+    fcx.register_wf_obligation(
+        sig.output(),
+        hir_sig.decl.output.span(),
+        ObligationCauseCode::ReturnType,
+    );
 
     // FIXME(#25759) return types should not be implied bounds
     implied_bounds.push(sig.output());
 
-    check_where_clauses(tcx, fcx, span, def_id, Some(sig.output()));
+    check_where_clauses(tcx, fcx, span, def_id, Some((sig.output(), hir_sig.decl.output.span())));
 }
 
 /// Checks "defining uses" of opaque `impl Trait` types to ensure that they meet the restrictions
diff --git a/src/librustc_typeck/check/writeback.rs b/src/librustc_typeck/check/writeback.rs
index b4798fb67f..380e256c9f 100644
--- a/src/librustc_typeck/check/writeback.rs
+++ b/src/librustc_typeck/check/writeback.rs
@@ -5,8 +5,6 @@
 use crate::check::FnCtxt;
 
 use rustc::hir::map::Map;
-use rustc::infer::error_reporting::TypeAnnotationNeeded::E0282;
-use rustc::infer::InferCtxt;
 use rustc::ty::adjustment::{Adjust, Adjustment, PointerCast};
 use rustc::ty::fold::{TypeFoldable, TypeFolder};
 use rustc::ty::{self, Ty, TyCtxt};
@@ -14,6 +12,8 @@ use rustc_data_structures::sync::Lrc;
 use rustc_hir as hir;
 use rustc_hir::def_id::{DefId, DefIdSet, DefIndex};
 use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
+use rustc_infer::infer::error_reporting::TypeAnnotationNeeded::E0282;
+use rustc_infer::infer::InferCtxt;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
 
@@ -426,7 +426,8 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
     fn visit_opaque_types(&mut self, span: Span) {
         for (&def_id, opaque_defn) in self.fcx.opaque_types.borrow().iter() {
             let hir_id = self.tcx().hir().as_local_hir_id(def_id).unwrap();
-            let instantiated_ty = self.resolve(&opaque_defn.concrete_ty, &hir_id);
+            let instantiated_ty =
+                self.tcx().erase_regions(&self.resolve(&opaque_defn.concrete_ty, &hir_id));
 
             debug_assert!(!instantiated_ty.has_escaping_bound_vars());
 
@@ -444,7 +445,7 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
             // figures out the concrete type with `U`, but the stored type is with `T`.
             let definition_ty = self.fcx.infer_opaque_definition_from_instantiation(
                 def_id,
-                opaque_defn,
+                opaque_defn.substs,
                 instantiated_ty,
                 span,
             );
diff --git a/src/librustc_typeck/check_unused.rs b/src/librustc_typeck/check_unused.rs
index ec098c1d89..3517e09133 100644
--- a/src/librustc_typeck/check_unused.rs
+++ b/src/librustc_typeck/check_unused.rs
@@ -1,5 +1,6 @@
 use crate::lint;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_errors::Applicability;
 use rustc_hir as hir;
@@ -7,7 +8,6 @@ use rustc_hir::def_id::{DefId, DefIdSet, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 use rustc_hir::print::visibility_qualified;
 use rustc_span::Span;
-use syntax::ast;
 
 pub fn check_crate(tcx: TyCtxt<'_>) {
     let mut used_trait_imports = DefIdSet::default();
@@ -55,12 +55,14 @@ impl CheckVisitor<'tcx> {
             return;
         }
 
-        let msg = if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
-            format!("unused import: `{}`", snippet)
-        } else {
-            "unused import".to_owned()
-        };
-        self.tcx.lint_hir(lint::builtin::UNUSED_IMPORTS, id, span, &msg);
+        self.tcx.struct_span_lint_hir(lint::builtin::UNUSED_IMPORTS, id, span, |lint| {
+            let msg = if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span) {
+                format!("unused import: `{}`", snippet)
+            } else {
+                "unused import".to_owned()
+            };
+            lint.build(&msg).emit();
+        });
     }
 }
 
@@ -121,23 +123,23 @@ fn unused_crates_lint(tcx: TyCtxt<'_>) {
         // We do this in any edition.
         if extern_crate.warn_if_unused {
             if let Some(&span) = unused_extern_crates.get(&extern_crate.def_id) {
-                let msg = "unused extern crate";
-
-                // Removal suggestion span needs to include attributes (Issue #54400)
-                let span_with_attrs = tcx
-                    .get_attrs(extern_crate.def_id)
-                    .iter()
-                    .map(|attr| attr.span)
-                    .fold(span, |acc, attr_span| acc.to(attr_span));
-
-                tcx.struct_span_lint_hir(lint, id, span, msg)
-                    .span_suggestion_short(
-                        span_with_attrs,
-                        "remove it",
-                        String::new(),
-                        Applicability::MachineApplicable,
-                    )
-                    .emit();
+                tcx.struct_span_lint_hir(lint, id, span, |lint| {
+                    // Removal suggestion span needs to include attributes (Issue #54400)
+                    let span_with_attrs = tcx
+                        .get_attrs(extern_crate.def_id)
+                        .iter()
+                        .map(|attr| attr.span)
+                        .fold(span, |acc, attr_span| acc.to(attr_span));
+
+                    lint.build("unused extern crate")
+                        .span_suggestion_short(
+                            span_with_attrs,
+                            "remove it",
+                            String::new(),
+                            Applicability::MachineApplicable,
+                        )
+                        .emit();
+                });
                 continue;
             }
         }
@@ -168,23 +170,26 @@ fn unused_crates_lint(tcx: TyCtxt<'_>) {
         if !tcx.get_attrs(extern_crate.def_id).is_empty() {
             continue;
         }
-
-        // Otherwise, we can convert it into a `use` of some kind.
-        let msg = "`extern crate` is not idiomatic in the new edition";
-        let help = format!("convert it to a `{}`", visibility_qualified(&item.vis, "use"));
-        let base_replacement = match extern_crate.orig_name {
-            Some(orig_name) => format!("use {} as {};", orig_name, item.ident.name),
-            None => format!("use {};", item.ident.name),
-        };
-        let replacement = visibility_qualified(&item.vis, base_replacement);
-        tcx.struct_span_lint_hir(lint, id, extern_crate.span, msg)
-            .span_suggestion_short(
-                extern_crate.span,
-                &help,
-                replacement,
-                Applicability::MachineApplicable,
-            )
-            .emit();
+        tcx.struct_span_lint_hir(lint, id, extern_crate.span, |lint| {
+            // Otherwise, we can convert it into a `use` of some kind.
+            let base_replacement = match extern_crate.orig_name {
+                Some(orig_name) => format!("use {} as {};", orig_name, item.ident.name),
+                None => format!("use {};", item.ident.name),
+            };
+
+            let replacement = visibility_qualified(&item.vis, base_replacement);
+            let msg = "`extern crate` is not idiomatic in the new edition";
+            let help = format!("convert it to a `{}`", visibility_qualified(&item.vis, "use"));
+
+            lint.build(msg)
+                .span_suggestion_short(
+                    extern_crate.span,
+                    &help,
+                    replacement,
+                    Applicability::MachineApplicable,
+                )
+                .emit();
+        })
     }
 }
 
diff --git a/src/librustc_typeck/coherence/builtin.rs b/src/librustc_typeck/coherence/builtin.rs
index 79a006a898..aa39a191b3 100644
--- a/src/librustc_typeck/coherence/builtin.rs
+++ b/src/librustc_typeck/coherence/builtin.rs
@@ -1,14 +1,8 @@
 //! Check properties that are required by built-in traits and set
 //! up data structures required by type-checking/codegen.
 
-use rustc::infer;
-use rustc::infer::outlives::env::OutlivesEnvironment;
-use rustc::infer::SuppressRegionErrors;
 use rustc::middle::lang_items::UnsizeTraitLangItem;
 use rustc::middle::region;
-use rustc::traits::misc::{can_type_implement_copy, CopyImplementationError};
-use rustc::traits::predicate_for_trait_def;
-use rustc::traits::{self, ObligationCause, TraitEngine};
 use rustc::ty::adjustment::CoerceUnsizedInfo;
 use rustc::ty::TypeFoldable;
 use rustc::ty::{self, Ty, TyCtxt};
@@ -16,16 +10,20 @@ use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_hir::ItemKind;
+use rustc_infer::infer;
+use rustc_infer::infer::outlives::env::OutlivesEnvironment;
+use rustc_infer::infer::{SuppressRegionErrors, TyCtxtInferExt};
+use rustc_infer::traits::misc::{can_type_implement_copy, CopyImplementationError};
+use rustc_infer::traits::predicate_for_trait_def;
+use rustc_infer::traits::{self, ObligationCause, TraitEngine};
 
 pub fn check_trait(tcx: TyCtxt<'_>, trait_def_id: DefId) {
+    let lang_items = tcx.lang_items();
     Checker { tcx, trait_def_id }
-        .check(tcx.lang_items().drop_trait(), visit_implementation_of_drop)
-        .check(tcx.lang_items().copy_trait(), visit_implementation_of_copy)
-        .check(tcx.lang_items().coerce_unsized_trait(), visit_implementation_of_coerce_unsized)
-        .check(
-            tcx.lang_items().dispatch_from_dyn_trait(),
-            visit_implementation_of_dispatch_from_dyn,
-        );
+        .check(lang_items.drop_trait(), visit_implementation_of_drop)
+        .check(lang_items.copy_trait(), visit_implementation_of_copy)
+        .check(lang_items.coerce_unsized_trait(), visit_implementation_of_coerce_unsized)
+        .check(lang_items.dispatch_from_dyn_trait(), visit_implementation_of_dispatch_from_dyn);
 }
 
 struct Checker<'tcx> {
diff --git a/src/librustc_typeck/coherence/inherent_impls.rs b/src/librustc_typeck/coherence/inherent_impls.rs
index d4c89b7e03..60e5df68b5 100644
--- a/src/librustc_typeck/coherence/inherent_impls.rs
+++ b/src/librustc_typeck/coherence/inherent_impls.rs
@@ -13,8 +13,8 @@ use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
 
+use rustc_ast::ast;
 use rustc_span::Span;
-use syntax::ast;
 
 /// On-demand query: yields a map containing all types mapped to their inherent impls.
 pub fn crate_inherent_impls(tcx: TyCtxt<'_>, crate_num: CrateNum) -> &CrateInherentImpls {
@@ -283,10 +283,10 @@ impl ItemLikeVisitor<'v> for InherentCollect<'tcx> {
                     "no base type found for inherent implementation"
                 )
                 .span_label(ty.span, "impl requires a base type")
-                .note(&format!(
+                .note(
                     "either implement a trait on it or create a newtype \
-                                    to wrap it instead"
-                ))
+                       to wrap it instead",
+                )
                 .emit();
                 return;
             }
diff --git a/src/librustc_typeck/coherence/inherent_impls_overlap.rs b/src/librustc_typeck/coherence/inherent_impls_overlap.rs
index d60c3cfba9..778eee3586 100644
--- a/src/librustc_typeck/coherence/inherent_impls_overlap.rs
+++ b/src/librustc_typeck/coherence/inherent_impls_overlap.rs
@@ -1,10 +1,9 @@
-use crate::namespace::Namespace;
-use rustc::traits::{self, IntercrateMode};
 use rustc::ty::TyCtxt;
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_infer::traits::{self, SkipLeakCheck};
 
 pub fn crate_inherent_impls_overlap_check(tcx: TyCtxt<'_>, crate_num: CrateNum) {
     assert_eq!(crate_num, LOCAL_CRATE);
@@ -17,73 +16,88 @@ struct InherentOverlapChecker<'tcx> {
 }
 
 impl InherentOverlapChecker<'tcx> {
+    /// Checks whether any associated items in impls 1 and 2 share the same identifier and
+    /// namespace.
+    fn impls_have_common_items(&self, impl1: DefId, impl2: DefId) -> bool {
+        let impl_items1 = self.tcx.associated_items(impl1);
+        let impl_items2 = self.tcx.associated_items(impl2);
+
+        for item1 in impl_items1.in_definition_order() {
+            let collision = impl_items2.filter_by_name_unhygienic(item1.ident.name).any(|item2| {
+                // Symbols and namespace match, compare hygienically.
+                item1.kind.namespace() == item2.kind.namespace()
+                    && item1.ident.modern() == item2.ident.modern()
+            });
+
+            if collision {
+                return true;
+            }
+        }
+
+        false
+    }
+
     fn check_for_common_items_in_impls(
         &self,
         impl1: DefId,
         impl2: DefId,
         overlap: traits::OverlapResult<'_>,
     ) {
-        let name_and_namespace = |def_id| {
-            let item = self.tcx.associated_item(def_id);
-            (item.ident.modern(), Namespace::from(item.kind))
-        };
-
-        let impl_items1 = self.tcx.associated_item_def_ids(impl1);
-        let impl_items2 = self.tcx.associated_item_def_ids(impl2);
-
-        for &item1 in &impl_items1[..] {
-            let (name, namespace) = name_and_namespace(item1);
-
-            for &item2 in &impl_items2[..] {
-                if (name, namespace) == name_and_namespace(item2) {
-                    let mut err = struct_span_err!(
-                        self.tcx.sess,
-                        self.tcx.span_of_impl(item1).unwrap(),
-                        E0592,
-                        "duplicate definitions with name `{}`",
-                        name
-                    );
-                    err.span_label(
-                        self.tcx.span_of_impl(item1).unwrap(),
-                        format!("duplicate definitions for `{}`", name),
-                    );
-                    err.span_label(
-                        self.tcx.span_of_impl(item2).unwrap(),
-                        format!("other definition for `{}`", name),
-                    );
-
-                    for cause in &overlap.intercrate_ambiguity_causes {
-                        cause.add_intercrate_ambiguity_hint(&mut err);
-                    }
+        let impl_items1 = self.tcx.associated_items(impl1);
+        let impl_items2 = self.tcx.associated_items(impl2);
 
-                    if overlap.involves_placeholder {
-                        traits::add_placeholder_note(&mut err);
-                    }
+        for item1 in impl_items1.in_definition_order() {
+            let collision = impl_items2.filter_by_name_unhygienic(item1.ident.name).find(|item2| {
+                // Symbols and namespace match, compare hygienically.
+                item1.kind.namespace() == item2.kind.namespace()
+                    && item1.ident.modern() == item2.ident.modern()
+            });
+
+            if let Some(item2) = collision {
+                let name = item1.ident.modern();
+                let mut err = struct_span_err!(
+                    self.tcx.sess,
+                    self.tcx.span_of_impl(item1.def_id).unwrap(),
+                    E0592,
+                    "duplicate definitions with name `{}`",
+                    name
+                );
+                err.span_label(
+                    self.tcx.span_of_impl(item1.def_id).unwrap(),
+                    format!("duplicate definitions for `{}`", name),
+                );
+                err.span_label(
+                    self.tcx.span_of_impl(item2.def_id).unwrap(),
+                    format!("other definition for `{}`", name),
+                );
+
+                for cause in &overlap.intercrate_ambiguity_causes {
+                    cause.add_intercrate_ambiguity_hint(&mut err);
+                }
 
-                    err.emit();
+                if overlap.involves_placeholder {
+                    traits::add_placeholder_note(&mut err);
                 }
+
+                err.emit();
             }
         }
     }
 
-    fn check_for_overlapping_inherent_impls(&self, ty_def_id: DefId) {
-        let impls = self.tcx.inherent_impls(ty_def_id);
-
-        for (i, &impl1_def_id) in impls.iter().enumerate() {
-            for &impl2_def_id in &impls[(i + 1)..] {
-                traits::overlapping_impls(
-                    self.tcx,
-                    impl1_def_id,
-                    impl2_def_id,
-                    IntercrateMode::Issue43355,
-                    |overlap| {
-                        self.check_for_common_items_in_impls(impl1_def_id, impl2_def_id, overlap);
-                        false
-                    },
-                    || true,
-                );
-            }
-        }
+    fn check_for_overlapping_inherent_impls(&self, impl1_def_id: DefId, impl2_def_id: DefId) {
+        traits::overlapping_impls(
+            self.tcx,
+            impl1_def_id,
+            impl2_def_id,
+            // We go ahead and just skip the leak check for
+            // inherent impls without warning.
+            SkipLeakCheck::Yes,
+            |overlap| {
+                self.check_for_common_items_in_impls(impl1_def_id, impl2_def_id, overlap);
+                false
+            },
+            || true,
+        );
     }
 }
 
@@ -94,8 +108,16 @@ impl ItemLikeVisitor<'v> for InherentOverlapChecker<'tcx> {
             | hir::ItemKind::Struct(..)
             | hir::ItemKind::Trait(..)
             | hir::ItemKind::Union(..) => {
-                let type_def_id = self.tcx.hir().local_def_id(item.hir_id);
-                self.check_for_overlapping_inherent_impls(type_def_id);
+                let ty_def_id = self.tcx.hir().local_def_id(item.hir_id);
+                let impls = self.tcx.inherent_impls(ty_def_id);
+
+                for (i, &impl1_def_id) in impls.iter().enumerate() {
+                    for &impl2_def_id in &impls[(i + 1)..] {
+                        if self.impls_have_common_items(impl1_def_id, impl2_def_id) {
+                            self.check_for_overlapping_inherent_impls(impl1_def_id, impl2_def_id);
+                        }
+                    }
+                }
             }
             _ => {}
         }
diff --git a/src/librustc_typeck/coherence/mod.rs b/src/librustc_typeck/coherence/mod.rs
index 5583e3418b..d24ee5f156 100644
--- a/src/librustc_typeck/coherence/mod.rs
+++ b/src/librustc_typeck/coherence/mod.rs
@@ -5,12 +5,12 @@
 // done by the orphan and overlap modules. Then we build up various
 // mappings. That mapping code resides here.
 
-use rustc::traits;
 use rustc::ty::query::Providers;
 use rustc::ty::{self, TyCtxt, TypeFoldable};
 use rustc_errors::struct_span_err;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
-use rustc_hir::HirId;
+use rustc_infer::traits;
+use rustc_span::Span;
 
 mod builtin;
 mod inherent_impls;
@@ -18,37 +18,35 @@ mod inherent_impls_overlap;
 mod orphan;
 mod unsafety;
 
-fn check_impl(tcx: TyCtxt<'_>, hir_id: HirId) {
-    let impl_def_id = tcx.hir().local_def_id(hir_id);
-
-    // If there are no traits, then this implementation must have a
-    // base type.
-
-    if let Some(trait_ref) = tcx.impl_trait_ref(impl_def_id) {
-        debug!(
-            "(checking implementation) adding impl for trait '{:?}', item '{}'",
-            trait_ref,
-            tcx.def_path_str(impl_def_id)
-        );
+/// Obtains the span of just the impl header of `impl_def_id`.
+fn impl_header_span(tcx: TyCtxt<'_>, impl_def_id: DefId) -> Span {
+    tcx.sess.source_map().def_span(tcx.span_of_impl(impl_def_id).unwrap())
+}
 
-        // Skip impls where one of the self type is an error type.
-        // This occurs with e.g., resolve failures (#30589).
-        if trait_ref.references_error() {
-            return;
-        }
+fn check_impl(tcx: TyCtxt<'_>, impl_def_id: DefId, trait_ref: ty::TraitRef<'_>) {
+    debug!(
+        "(checking implementation) adding impl for trait '{:?}', item '{}'",
+        trait_ref,
+        tcx.def_path_str(impl_def_id)
+    );
 
-        enforce_trait_manually_implementable(tcx, impl_def_id, trait_ref.def_id);
-        enforce_empty_impls_for_marker_traits(tcx, impl_def_id, trait_ref.def_id);
+    // Skip impls where one of the self type is an error type.
+    // This occurs with e.g., resolve failures (#30589).
+    if trait_ref.references_error() {
+        return;
     }
+
+    enforce_trait_manually_implementable(tcx, impl_def_id, trait_ref.def_id);
+    enforce_empty_impls_for_marker_traits(tcx, impl_def_id, trait_ref.def_id);
 }
 
 fn enforce_trait_manually_implementable(tcx: TyCtxt<'_>, impl_def_id: DefId, trait_def_id: DefId) {
     let did = Some(trait_def_id);
     let li = tcx.lang_items();
-    let span = tcx.sess.source_map().def_span(tcx.span_of_impl(impl_def_id).unwrap());
 
     // Disallow *all* explicit impls of `Sized` and `Unsize` for now.
     if did == li.sized_trait() {
+        let span = impl_header_span(tcx, impl_def_id);
         struct_span_err!(
             tcx.sess,
             span,
@@ -61,6 +59,7 @@ fn enforce_trait_manually_implementable(tcx: TyCtxt<'_>, impl_def_id: DefId, tra
     }
 
     if did == li.unsize_trait() {
+        let span = impl_header_span(tcx, impl_def_id);
         struct_span_err!(
             tcx.sess,
             span,
@@ -86,6 +85,8 @@ fn enforce_trait_manually_implementable(tcx: TyCtxt<'_>, impl_def_id: DefId, tra
     } else {
         return; // everything OK
     };
+
+    let span = impl_header_span(tcx, impl_def_id);
     struct_span_err!(
         tcx.sess,
         span,
@@ -109,7 +110,7 @@ fn enforce_empty_impls_for_marker_traits(tcx: TyCtxt<'_>, impl_def_id: DefId, tr
         return;
     }
 
-    let span = tcx.sess.source_map().def_span(tcx.span_of_impl(impl_def_id).unwrap());
+    let span = impl_header_span(tcx, impl_def_id);
     struct_span_err!(tcx.sess, span, E0715, "impls for marker traits cannot contain items").emit();
 }
 
@@ -129,12 +130,17 @@ pub fn provide(providers: &mut Providers<'_>) {
 }
 
 fn coherent_trait(tcx: TyCtxt<'_>, def_id: DefId) {
+    // Trigger building the specialization graph for the trait. This will detect and report any
+    // overlap errors.
+    tcx.specialization_graph_of(def_id);
+
     let impls = tcx.hir().trait_impls(def_id);
-    for &impl_id in impls {
-        check_impl(tcx, impl_id);
-    }
-    for &impl_id in impls {
-        check_impl_overlap(tcx, impl_id);
+    for &hir_id in impls {
+        let impl_def_id = tcx.hir().local_def_id(hir_id);
+        let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
+
+        check_impl(tcx, impl_def_id, trait_ref);
+        check_object_overlap(tcx, impl_def_id, trait_ref);
     }
     builtin::check_trait(tcx, def_id);
 }
@@ -152,12 +158,12 @@ pub fn check_coherence(tcx: TyCtxt<'_>) {
     tcx.ensure().crate_inherent_impls_overlap_check(LOCAL_CRATE);
 }
 
-/// Overlap: no two impls for the same trait are implemented for the
-/// same type. Likewise, no two inherent impls for a given type
-/// constructor provide a method with the same name.
-fn check_impl_overlap<'tcx>(tcx: TyCtxt<'tcx>, hir_id: HirId) {
-    let impl_def_id = tcx.hir().local_def_id(hir_id);
-    let trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap();
+/// Checks whether an impl overlaps with the automatic `impl Trait for dyn Trait`.
+fn check_object_overlap<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    impl_def_id: DefId,
+    trait_ref: ty::TraitRef<'tcx>,
+) {
     let trait_def_id = trait_ref.def_id;
 
     if trait_ref.references_error() {
@@ -165,11 +171,7 @@ fn check_impl_overlap<'tcx>(tcx: TyCtxt<'tcx>, hir_id: HirId) {
         return;
     }
 
-    // Trigger building the specialization graph for the trait of this impl.
-    // This will detect any overlap errors.
-    tcx.specialization_graph_of(trait_def_id);
-
-    // check for overlap with the automatic `impl Trait for Trait`
+    // check for overlap with the automatic `impl Trait for dyn Trait`
     if let ty::Dynamic(ref data, ..) = trait_ref.self_ty().kind {
         // This is something like impl Trait1 for Trait2. Illegal
         // if Trait1 is a supertrait of Trait2 or Trait2 is not object safe.
@@ -194,17 +196,17 @@ fn check_impl_overlap<'tcx>(tcx: TyCtxt<'tcx>, hir_id: HirId) {
             } else {
                 let mut supertrait_def_ids = traits::supertrait_def_ids(tcx, component_def_id);
                 if supertrait_def_ids.any(|d| d == trait_def_id) {
-                    let sp = tcx.sess.source_map().def_span(tcx.span_of_impl(impl_def_id).unwrap());
+                    let span = impl_header_span(tcx, impl_def_id);
                     struct_span_err!(
                         tcx.sess,
-                        sp,
+                        span,
                         E0371,
                         "the object type `{}` automatically implements the trait `{}`",
                         trait_ref.self_ty(),
                         tcx.def_path_str(trait_def_id)
                     )
                     .span_label(
-                        sp,
+                        span,
                         format!(
                             "`{}` automatically implements trait `{}`",
                             trait_ref.self_ty(),
diff --git a/src/librustc_typeck/coherence/orphan.rs b/src/librustc_typeck/coherence/orphan.rs
index 8052166647..0a57449357 100644
--- a/src/librustc_typeck/coherence/orphan.rs
+++ b/src/librustc_typeck/coherence/orphan.rs
@@ -1,11 +1,12 @@
 //! Orphan checker: every impl either implements a trait defined in this
 //! crate or pertains to a type defined in this crate.
 
-use rustc::traits;
 use rustc::ty::{self, TyCtxt};
 use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::itemlikevisit::ItemLikeVisitor;
+use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits;
 
 pub fn check(tcx: TyCtxt<'_>) {
     let mut orphan = OrphanChecker { tcx };
@@ -32,8 +33,8 @@ impl ItemLikeVisitor<'v> for OrphanChecker<'tcx> {
             );
             let trait_ref = self.tcx.impl_trait_ref(def_id).unwrap();
             let trait_def_id = trait_ref.def_id;
-            let cm = self.tcx.sess.source_map();
-            let sp = cm.def_span(item.span);
+            let sm = self.tcx.sess.source_map();
+            let sp = sm.def_span(item.span);
             match traits::orphan_check(self.tcx, def_id) {
                 Ok(()) => {}
                 Err(traits::OrphanCheckErr::NonLocalInputType(tys)) => {
@@ -173,7 +174,7 @@ impl ItemLikeVisitor<'v> for OrphanChecker<'tcx> {
             // impl !Send for (A, B) { }
             // ```
             //
-            // This final impl is legal according to the orpan
+            // This final impl is legal according to the orphan
             // rules, but it invalidates the reasoning from
             // `two_foos` above.
             debug!(
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index cdf2304b83..edd5ac4086 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -18,24 +18,25 @@ use crate::astconv::{AstConv, Bounds, SizedByDefault};
 use crate::check::intrinsic::intrinsic_operation_unsafety;
 use crate::constrained_generic_params as cgp;
 use crate::lint;
+use crate::middle::lang_items;
 use crate::middle::resolve_lifetime as rl;
-use crate::middle::weak_lang_items;
 use rustc::hir::map::blocks::FnLikeNode;
 use rustc::hir::map::Map;
 use rustc::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
 use rustc::mir::mono::Linkage;
 use rustc::session::parse::feature_err;
-use rustc::traits;
 use rustc::ty::query::Providers;
-use rustc::ty::subst::GenericArgKind;
 use rustc::ty::subst::{InternalSubsts, Subst};
 use rustc::ty::util::Discr;
 use rustc::ty::util::IntTypeExt;
-use rustc::ty::{self, AdtKind, Const, DefIdTree, ToPolyTraitRef, Ty, TyCtxt, WithConstness};
-use rustc::ty::{ReprOptions, ToPredicate};
+use rustc::ty::{self, AdtKind, Const, ToPolyTraitRef, Ty, TyCtxt};
+use rustc::ty::{ReprOptions, ToPredicate, WithConstness};
+use rustc_ast::ast;
+use rustc_ast::ast::{Ident, MetaItemKind};
+use rustc_attr::{list_contains_name, mark_used, InlineAttr, OptimizeAttr};
 use rustc_data_structures::captures::Captures;
-use rustc_data_structures::fx::FxHashMap;
-use rustc_errors::{struct_span_err, Applicability, StashKey};
+use rustc_data_structures::fx::{FxHashMap, FxHashSet};
+use rustc_errors::{struct_span_err, Applicability};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
@@ -44,9 +45,8 @@ use rustc_hir::{GenericParamKind, Node, Unsafety};
 use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::abi;
-use syntax::ast;
-use syntax::ast::{Ident, MetaItemKind};
-use syntax::attr::{list_contains_name, mark_used, InlineAttr, OptimizeAttr};
+
+mod type_of;
 
 struct OnlySelfBounds(bool);
 
@@ -62,7 +62,7 @@ fn collect_mod_item_types(tcx: TyCtxt<'_>, module_def_id: DefId) {
 
 pub fn provide(providers: &mut Providers<'_>) {
     *providers = Providers {
-        type_of,
+        type_of: type_of::type_of,
         generics_of,
         predicates_of,
         predicates_defined_on,
@@ -76,6 +76,7 @@ pub fn provide(providers: &mut Providers<'_>) {
         impl_polarity,
         is_foreign_item,
         static_mutability,
+        generator_kind,
         codegen_fn_attrs,
         collect_mod_item_types,
         ..*providers
@@ -150,7 +151,7 @@ crate fn placeholder_type_error(
         .unwrap_or(&"ParamName");
 
     let mut sugg: Vec<_> =
-        placeholder_types.iter().map(|sp| (*sp, type_name.to_string())).collect();
+        placeholder_types.iter().map(|sp| (*sp, (*type_name).to_string())).collect();
     if generics.is_empty() {
         sugg.push((span, format!("<{}>", type_name)));
     } else if let Some(arg) = generics.iter().find(|arg| match arg.name {
@@ -159,7 +160,7 @@ crate fn placeholder_type_error(
     }) {
         // Account for `_` already present in cases like `struct S<_>(_);` and suggest
         // `struct S<T>(T);` instead of `struct S<_, T>(T);`.
-        sugg.push((arg.span, format!("{}", type_name)));
+        sugg.push((arg.span, (*type_name).to_string()));
     } else {
         sugg.push((
             generics.iter().last().unwrap().span.shrink_to_hi(),
@@ -276,6 +277,17 @@ impl ItemCtxt<'tcx> {
     pub fn to_ty(&self, ast_ty: &'tcx hir::Ty<'tcx>) -> Ty<'tcx> {
         AstConv::ast_ty_to_ty(self, ast_ty)
     }
+
+    pub fn hir_id(&self) -> hir::HirId {
+        self.tcx
+            .hir()
+            .as_local_hir_id(self.item_def_id)
+            .expect("Non-local call to local provider is_const_fn")
+    }
+
+    pub fn node(&self) -> hir::Node<'tcx> {
+        self.tcx.hir().get(self.hir_id())
+    }
 }
 
 impl AstConv<'tcx> for ItemCtxt<'tcx> {
@@ -287,19 +299,11 @@ impl AstConv<'tcx> for ItemCtxt<'tcx> {
         Some(self.item_def_id)
     }
 
-    fn default_constness_for_trait_bounds(&self) -> ast::Constness {
-        // FIXME: refactor this into a method
-        let hir_id = self
-            .tcx
-            .hir()
-            .as_local_hir_id(self.item_def_id)
-            .expect("Non-local call to local provider is_const_fn");
-
-        let node = self.tcx.hir().get(hir_id);
-        if let Some(fn_like) = FnLikeNode::from_node(node) {
+    fn default_constness_for_trait_bounds(&self) -> hir::Constness {
+        if let Some(fn_like) = FnLikeNode::from_node(self.node()) {
             fn_like.constness()
         } else {
-            ast::Constness::NotConst
+            hir::Constness::NotConst
         }
     }
 
@@ -316,7 +320,7 @@ impl AstConv<'tcx> for ItemCtxt<'tcx> {
     }
 
     fn ty_infer(&self, _: Option<&ty::GenericParamDef>, span: Span) -> Ty<'tcx> {
-        placeholder_type_error(self.tcx(), span, &[], vec![span], false);
+        self.tcx().sess.delay_span_bug(span, "bad placeholder type");
         self.tcx().types.err
     }
 
@@ -350,14 +354,82 @@ impl AstConv<'tcx> for ItemCtxt<'tcx> {
             self.tcx().mk_projection(item_def_id, item_substs)
         } else {
             // There are no late-bound regions; we can just ignore the binder.
-            struct_span_err!(
+            let mut err = struct_span_err!(
                 self.tcx().sess,
                 span,
                 E0212,
                 "cannot extract an associated type from a higher-ranked trait bound \
                  in this context"
-            )
-            .emit();
+            );
+
+            match self.node() {
+                hir::Node::Field(_) | hir::Node::Ctor(_) | hir::Node::Variant(_) => {
+                    let item =
+                        self.tcx.hir().expect_item(self.tcx.hir().get_parent_item(self.hir_id()));
+                    match &item.kind {
+                        hir::ItemKind::Enum(_, generics)
+                        | hir::ItemKind::Struct(_, generics)
+                        | hir::ItemKind::Union(_, generics) => {
+                            let lt_name = get_new_lifetime_name(self.tcx, poly_trait_ref, generics);
+                            let (lt_sp, sugg) = match &generics.params[..] {
+                                [] => (generics.span, format!("<{}>", lt_name)),
+                                [bound, ..] => {
+                                    (bound.span.shrink_to_lo(), format!("{}, ", lt_name))
+                                }
+                            };
+                            let suggestions = vec![
+                                (lt_sp, sugg),
+                                (
+                                    span,
+                                    format!(
+                                        "{}::{}",
+                                        // Replace the existing lifetimes with a new named lifetime.
+                                        self.tcx
+                                            .replace_late_bound_regions(&poly_trait_ref, |_| {
+                                                self.tcx.mk_region(ty::ReEarlyBound(
+                                                    ty::EarlyBoundRegion {
+                                                        def_id: item_def_id,
+                                                        index: 0,
+                                                        name: Symbol::intern(&lt_name),
+                                                    },
+                                                ))
+                                            })
+                                            .0,
+                                        item_segment.ident
+                                    ),
+                                ),
+                            ];
+                            err.multipart_suggestion(
+                                "use a fully qualified path with explicit lifetimes",
+                                suggestions,
+                                Applicability::MaybeIncorrect,
+                            );
+                        }
+                        _ => {}
+                    }
+                }
+                hir::Node::Item(hir::Item { kind: hir::ItemKind::Struct(..), .. })
+                | hir::Node::Item(hir::Item { kind: hir::ItemKind::Enum(..), .. })
+                | hir::Node::Item(hir::Item { kind: hir::ItemKind::Union(..), .. }) => {}
+                hir::Node::Item(_)
+                | hir::Node::ForeignItem(_)
+                | hir::Node::TraitItem(_)
+                | hir::Node::ImplItem(_) => {
+                    err.span_suggestion(
+                        span,
+                        "use a fully qualified path with inferred lifetimes",
+                        format!(
+                            "{}::{}",
+                            // Erase named lt, we want `<A as B<'_>::C`, not `<A as B<'a>::C`.
+                            self.tcx.anonymize_late_bound_regions(&poly_trait_ref).skip_binder(),
+                            item_segment.ident
+                        ),
+                        Applicability::MaybeIncorrect,
+                    );
+                }
+                _ => {}
+            }
+            err.emit();
             self.tcx().types.err
         }
     }
@@ -376,6 +448,43 @@ impl AstConv<'tcx> for ItemCtxt<'tcx> {
     }
 }
 
+/// Synthesize a new lifetime name that doesn't clash with any of the lifetimes already present.
+fn get_new_lifetime_name<'tcx>(
+    tcx: TyCtxt<'tcx>,
+    poly_trait_ref: ty::PolyTraitRef<'tcx>,
+    generics: &hir::Generics<'tcx>,
+) -> String {
+    let existing_lifetimes = tcx
+        .collect_referenced_late_bound_regions(&poly_trait_ref)
+        .into_iter()
+        .filter_map(|lt| {
+            if let ty::BoundRegion::BrNamed(_, name) = lt {
+                Some(name.as_str().to_string())
+            } else {
+                None
+            }
+        })
+        .chain(generics.params.iter().filter_map(|param| {
+            if let hir::GenericParamKind::Lifetime { .. } = &param.kind {
+                Some(param.name.ident().as_str().to_string())
+            } else {
+                None
+            }
+        }))
+        .collect::<FxHashSet<String>>();
+
+    let a_to_z_repeat_n = |n| {
+        (b'a'..=b'z').map(move |c| {
+            let mut s = '\''.to_string();
+            s.extend(std::iter::repeat(char::from(c)).take(n));
+            s
+        })
+    };
+
+    // If all single char lifetime names are present, we wrap around and double the chars.
+    (1..).flat_map(a_to_z_repeat_n).find(|lt| !existing_lifetimes.contains(lt.as_str())).unwrap()
+}
+
 /// Returns the predicates defined on `item_def_id` of the form
 /// `X: Foo` where `X` is the type parameter `def_id`.
 fn type_param_predicates(
@@ -606,13 +715,21 @@ fn convert_trait_item(tcx: TyCtxt<'_>, trait_item_id: hir::HirId) {
     tcx.generics_of(def_id);
 
     match trait_item.kind {
-        hir::TraitItemKind::Const(..)
-        | hir::TraitItemKind::Type(_, Some(_))
-        | hir::TraitItemKind::Method(..) => {
+        hir::TraitItemKind::Method(..) => {
             tcx.type_of(def_id);
-            if let hir::TraitItemKind::Method(..) = trait_item.kind {
-                tcx.fn_sig(def_id);
-            }
+            tcx.fn_sig(def_id);
+        }
+
+        hir::TraitItemKind::Const(.., Some(_)) => {
+            tcx.type_of(def_id);
+        }
+
+        hir::TraitItemKind::Const(..) | hir::TraitItemKind::Type(_, Some(_)) => {
+            tcx.type_of(def_id);
+            // Account for `const C: _;` and `type T = _;`.
+            let mut visitor = PlaceholderHirTyCollector::default();
+            visitor.visit_trait_item(trait_item);
+            placeholder_type_error(tcx, DUMMY_SP, &[], visitor.0, false);
         }
 
         hir::TraitItemKind::Type(_, None) => {}
@@ -626,8 +743,18 @@ fn convert_impl_item(tcx: TyCtxt<'_>, impl_item_id: hir::HirId) {
     tcx.generics_of(def_id);
     tcx.type_of(def_id);
     tcx.predicates_of(def_id);
-    if let hir::ImplItemKind::Method(..) = tcx.hir().expect_impl_item(impl_item_id).kind {
-        tcx.fn_sig(def_id);
+    let impl_item = tcx.hir().expect_impl_item(impl_item_id);
+    match impl_item.kind {
+        hir::ImplItemKind::Method(..) => {
+            tcx.fn_sig(def_id);
+        }
+        hir::ImplItemKind::TyAlias(_) | hir::ImplItemKind::OpaqueTy(_) => {
+            // Account for `type T = _;`
+            let mut visitor = PlaceholderHirTyCollector::default();
+            visitor.visit_impl_item(impl_item);
+            placeholder_type_error(tcx, DUMMY_SP, &[], visitor.0, false);
+        }
+        hir::ImplItemKind::Const(..) => {}
     }
 }
 
@@ -898,7 +1025,7 @@ fn trait_def(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::TraitDef {
             .struct_span_err(
                 item.span,
                 "the `#[rustc_paren_sugar]` attribute is a temporary means of controlling \
-             which traits can use parenthetical notation",
+                 which traits can use parenthetical notation",
             )
             .help("add `#![feature(unboxed_closures)]` to the crate attributes to use it")
             .emit();
@@ -1052,7 +1179,27 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
             Some(tcx.closure_base_def_id(def_id))
         }
         Node::Item(item) => match item.kind {
-            ItemKind::OpaqueTy(hir::OpaqueTy { impl_trait_fn, .. }) => impl_trait_fn,
+            ItemKind::OpaqueTy(hir::OpaqueTy { impl_trait_fn, .. }) => {
+                impl_trait_fn.or_else(|| {
+                    let parent_id = tcx.hir().get_parent_item(hir_id);
+                    if parent_id != hir_id && parent_id != CRATE_HIR_ID {
+                        debug!("generics_of: parent of opaque ty {:?} is {:?}", def_id, parent_id);
+                        // If this 'impl Trait' is nested inside another 'impl Trait'
+                        // (e.g. `impl Foo<MyType = impl Bar<A>>`), we need to use the 'parent'
+                        // 'impl Trait' for its generic parameters, since we can reference them
+                        // from the 'child' 'impl Trait'
+                        if let Node::Item(hir::Item { kind: ItemKind::OpaqueTy(..), .. }) =
+                            tcx.hir().get(parent_id)
+                        {
+                            Some(tcx.hir().local_def_id(parent_id))
+                        } else {
+                            None
+                        }
+                    } else {
+                        None
+                    }
+                })
+            }
             _ => None,
         },
         _ => None,
@@ -1141,7 +1288,7 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
 
     let object_lifetime_defaults = tcx.object_lifetime_defaults(hir_id);
 
-    // Now create the real type parameters.
+    // Now create the real type and const parameters.
     let type_start = own_start - has_self as u32 + params.len() as u32;
     let mut i = 0;
     params.extend(ast_generics.params.iter().filter_map(|param| {
@@ -1149,14 +1296,17 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
             GenericParamKind::Type { ref default, synthetic, .. } => {
                 if !allow_defaults && default.is_some() {
                     if !tcx.features().default_type_parameter_fallback {
-                        tcx.lint_hir(
+                        tcx.struct_span_lint_hir(
                             lint::builtin::INVALID_TYPE_PARAM_DEFAULT,
                             param.hir_id,
                             param.span,
-                            &format!(
-                                "defaults for type parameters are only allowed in \
-                                        `struct`, `enum`, `type`, or `trait` definitions."
-                            ),
+                            |lint| {
+                                lint.build(
+                                    "defaults for type parameters are only allowed in \
+                                            `struct`, `enum`, `type`, or `trait` definitions.",
+                                )
+                                .emit();
+                            },
                         );
                     }
                 }
@@ -1189,7 +1339,7 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
     // and we don't do that for closures.
     if let Node::Expr(&hir::Expr { kind: hir::ExprKind::Closure(.., gen), .. }) = node {
         let dummy_args = if gen.is_some() {
-            &["<yield_ty>", "<return_ty>", "<witness>"][..]
+            &["<resume_ty>", "<yield_ty>", "<return_ty>", "<witness>"][..]
         } else {
             &["<closure_kind>", "<closure_signature>"][..]
         };
@@ -1235,601 +1385,6 @@ fn generics_of(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::Generics {
     })
 }
 
-fn report_assoc_ty_on_inherent_impl(tcx: TyCtxt<'_>, span: Span) {
-    struct_span_err!(
-        tcx.sess,
-        span,
-        E0202,
-        "associated types are not yet supported in inherent impls (see #8995)"
-    )
-    .emit();
-}
-
-fn infer_placeholder_type(
-    tcx: TyCtxt<'_>,
-    def_id: DefId,
-    body_id: hir::BodyId,
-    span: Span,
-    item_ident: Ident,
-) -> Ty<'_> {
-    let ty = tcx.diagnostic_only_typeck_tables_of(def_id).node_type(body_id.hir_id);
-
-    // If this came from a free `const` or `static mut?` item,
-    // then the user may have written e.g. `const A = 42;`.
-    // In this case, the parser has stashed a diagnostic for
-    // us to improve in typeck so we do that now.
-    match tcx.sess.diagnostic().steal_diagnostic(span, StashKey::ItemNoType) {
-        Some(mut err) => {
-            // The parser provided a sub-optimal `HasPlaceholders` suggestion for the type.
-            // We are typeck and have the real type, so remove that and suggest the actual type.
-            err.suggestions.clear();
-            err.span_suggestion(
-                span,
-                "provide a type for the item",
-                format!("{}: {}", item_ident, ty),
-                Applicability::MachineApplicable,
-            )
-            .emit();
-        }
-        None => {
-            let mut diag = bad_placeholder_type(tcx, vec![span]);
-            if ty != tcx.types.err {
-                diag.span_suggestion(
-                    span,
-                    "replace `_` with the correct type",
-                    ty.to_string(),
-                    Applicability::MaybeIncorrect,
-                );
-            }
-            diag.emit();
-        }
-    }
-
-    ty
-}
-
-fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
-    use rustc_hir::*;
-
-    let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
-
-    let icx = ItemCtxt::new(tcx, def_id);
-
-    match tcx.hir().get(hir_id) {
-        Node::TraitItem(item) => match item.kind {
-            TraitItemKind::Method(..) => {
-                let substs = InternalSubsts::identity_for_item(tcx, def_id);
-                tcx.mk_fn_def(def_id, substs)
-            }
-            TraitItemKind::Const(ref ty, body_id) => body_id
-                .and_then(|body_id| {
-                    if is_suggestable_infer_ty(ty) {
-                        Some(infer_placeholder_type(tcx, def_id, body_id, ty.span, item.ident))
-                    } else {
-                        None
-                    }
-                })
-                .unwrap_or_else(|| icx.to_ty(ty)),
-            TraitItemKind::Type(_, Some(ref ty)) => icx.to_ty(ty),
-            TraitItemKind::Type(_, None) => {
-                span_bug!(item.span, "associated type missing default");
-            }
-        },
-
-        Node::ImplItem(item) => match item.kind {
-            ImplItemKind::Method(..) => {
-                let substs = InternalSubsts::identity_for_item(tcx, def_id);
-                tcx.mk_fn_def(def_id, substs)
-            }
-            ImplItemKind::Const(ref ty, body_id) => {
-                if is_suggestable_infer_ty(ty) {
-                    infer_placeholder_type(tcx, def_id, body_id, ty.span, item.ident)
-                } else {
-                    icx.to_ty(ty)
-                }
-            }
-            ImplItemKind::OpaqueTy(_) => {
-                if tcx.impl_trait_ref(tcx.hir().get_parent_did(hir_id)).is_none() {
-                    report_assoc_ty_on_inherent_impl(tcx, item.span);
-                }
-
-                find_opaque_ty_constraints(tcx, def_id)
-            }
-            ImplItemKind::TyAlias(ref ty) => {
-                if tcx.impl_trait_ref(tcx.hir().get_parent_did(hir_id)).is_none() {
-                    report_assoc_ty_on_inherent_impl(tcx, item.span);
-                }
-
-                icx.to_ty(ty)
-            }
-        },
-
-        Node::Item(item) => {
-            match item.kind {
-                ItemKind::Static(ref ty, .., body_id) | ItemKind::Const(ref ty, body_id) => {
-                    if is_suggestable_infer_ty(ty) {
-                        infer_placeholder_type(tcx, def_id, body_id, ty.span, item.ident)
-                    } else {
-                        icx.to_ty(ty)
-                    }
-                }
-                ItemKind::TyAlias(ref self_ty, _) | ItemKind::Impl { ref self_ty, .. } => {
-                    icx.to_ty(self_ty)
-                }
-                ItemKind::Fn(..) => {
-                    let substs = InternalSubsts::identity_for_item(tcx, def_id);
-                    tcx.mk_fn_def(def_id, substs)
-                }
-                ItemKind::Enum(..) | ItemKind::Struct(..) | ItemKind::Union(..) => {
-                    let def = tcx.adt_def(def_id);
-                    let substs = InternalSubsts::identity_for_item(tcx, def_id);
-                    tcx.mk_adt(def, substs)
-                }
-                ItemKind::OpaqueTy(hir::OpaqueTy { impl_trait_fn: None, .. }) => {
-                    find_opaque_ty_constraints(tcx, def_id)
-                }
-                // Opaque types desugared from `impl Trait`.
-                ItemKind::OpaqueTy(hir::OpaqueTy { impl_trait_fn: Some(owner), .. }) => {
-                    tcx.typeck_tables_of(owner)
-                        .concrete_opaque_types
-                        .get(&def_id)
-                        .map(|opaque| opaque.concrete_type)
-                        .unwrap_or_else(|| {
-                            // This can occur if some error in the
-                            // owner fn prevented us from populating
-                            // the `concrete_opaque_types` table.
-                            tcx.sess.delay_span_bug(
-                                DUMMY_SP,
-                                &format!(
-                                    "owner {:?} has no opaque type for {:?} in its tables",
-                                    owner, def_id,
-                                ),
-                            );
-                            tcx.types.err
-                        })
-                }
-                ItemKind::Trait(..)
-                | ItemKind::TraitAlias(..)
-                | ItemKind::Mod(..)
-                | ItemKind::ForeignMod(..)
-                | ItemKind::GlobalAsm(..)
-                | ItemKind::ExternCrate(..)
-                | ItemKind::Use(..) => {
-                    span_bug!(
-                        item.span,
-                        "compute_type_of_item: unexpected item type: {:?}",
-                        item.kind
-                    );
-                }
-            }
-        }
-
-        Node::ForeignItem(foreign_item) => match foreign_item.kind {
-            ForeignItemKind::Fn(..) => {
-                let substs = InternalSubsts::identity_for_item(tcx, def_id);
-                tcx.mk_fn_def(def_id, substs)
-            }
-            ForeignItemKind::Static(ref t, _) => icx.to_ty(t),
-            ForeignItemKind::Type => tcx.mk_foreign(def_id),
-        },
-
-        Node::Ctor(&ref def) | Node::Variant(hir::Variant { data: ref def, .. }) => match *def {
-            VariantData::Unit(..) | VariantData::Struct(..) => {
-                tcx.type_of(tcx.hir().get_parent_did(hir_id))
-            }
-            VariantData::Tuple(..) => {
-                let substs = InternalSubsts::identity_for_item(tcx, def_id);
-                tcx.mk_fn_def(def_id, substs)
-            }
-        },
-
-        Node::Field(field) => icx.to_ty(&field.ty),
-
-        Node::Expr(&hir::Expr { kind: hir::ExprKind::Closure(.., gen), .. }) => {
-            if gen.is_some() {
-                return tcx.typeck_tables_of(def_id).node_type(hir_id);
-            }
-
-            let substs = InternalSubsts::identity_for_item(tcx, def_id);
-            tcx.mk_closure(def_id, substs)
-        }
-
-        Node::AnonConst(_) => {
-            let parent_node = tcx.hir().get(tcx.hir().get_parent_node(hir_id));
-            match parent_node {
-                Node::Ty(&hir::Ty { kind: hir::TyKind::Array(_, ref constant), .. })
-                | Node::Ty(&hir::Ty { kind: hir::TyKind::Typeof(ref constant), .. })
-                | Node::Expr(&hir::Expr { kind: ExprKind::Repeat(_, ref constant), .. })
-                    if constant.hir_id == hir_id =>
-                {
-                    tcx.types.usize
-                }
-
-                Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => {
-                    tcx.adt_def(tcx.hir().get_parent_did(hir_id)).repr.discr_type().to_ty(tcx)
-                }
-
-                Node::Ty(&hir::Ty { kind: hir::TyKind::Path(_), .. })
-                | Node::Expr(&hir::Expr { kind: ExprKind::Struct(..), .. })
-                | Node::Expr(&hir::Expr { kind: ExprKind::Path(_), .. })
-                | Node::TraitRef(..) => {
-                    let path = match parent_node {
-                        Node::Ty(&hir::Ty {
-                            kind: hir::TyKind::Path(QPath::Resolved(_, ref path)),
-                            ..
-                        })
-                        | Node::Expr(&hir::Expr {
-                            kind: ExprKind::Path(QPath::Resolved(_, ref path)),
-                            ..
-                        }) => Some(&**path),
-                        Node::Expr(&hir::Expr { kind: ExprKind::Struct(ref path, ..), .. }) => {
-                            if let QPath::Resolved(_, ref path) = **path {
-                                Some(&**path)
-                            } else {
-                                None
-                            }
-                        }
-                        Node::TraitRef(&hir::TraitRef { ref path, .. }) => Some(&**path),
-                        _ => None,
-                    };
-
-                    if let Some(path) = path {
-                        let arg_index = path
-                            .segments
-                            .iter()
-                            .filter_map(|seg| seg.args.as_ref())
-                            .map(|generic_args| generic_args.args.as_ref())
-                            .find_map(|args| {
-                                args.iter()
-                                    .filter(|arg| arg.is_const())
-                                    .enumerate()
-                                    .filter(|(_, arg)| arg.id() == hir_id)
-                                    .map(|(index, _)| index)
-                                    .next()
-                            })
-                            .unwrap_or_else(|| {
-                                bug!("no arg matching AnonConst in path");
-                            });
-
-                        // We've encountered an `AnonConst` in some path, so we need to
-                        // figure out which generic parameter it corresponds to and return
-                        // the relevant type.
-                        let generics = match path.res {
-                            Res::Def(DefKind::Ctor(..), def_id) => {
-                                tcx.generics_of(tcx.parent(def_id).unwrap())
-                            }
-                            Res::Def(_, def_id) => tcx.generics_of(def_id),
-                            Res::Err => return tcx.types.err,
-                            res => {
-                                tcx.sess.delay_span_bug(
-                                    DUMMY_SP,
-                                    &format!("unexpected const parent path def {:?}", res,),
-                                );
-                                return tcx.types.err;
-                            }
-                        };
-
-                        generics
-                            .params
-                            .iter()
-                            .filter(|param| {
-                                if let ty::GenericParamDefKind::Const = param.kind {
-                                    true
-                                } else {
-                                    false
-                                }
-                            })
-                            .nth(arg_index)
-                            .map(|param| tcx.type_of(param.def_id))
-                            // This is no generic parameter associated with the arg. This is
-                            // probably from an extra arg where one is not needed.
-                            .unwrap_or(tcx.types.err)
-                    } else {
-                        tcx.sess.delay_span_bug(
-                            DUMMY_SP,
-                            &format!("unexpected const parent path {:?}", parent_node,),
-                        );
-                        return tcx.types.err;
-                    }
-                }
-
-                x => {
-                    tcx.sess.delay_span_bug(
-                        DUMMY_SP,
-                        &format!("unexpected const parent in type_of_def_id(): {:?}", x),
-                    );
-                    tcx.types.err
-                }
-            }
-        }
-
-        Node::GenericParam(param) => match &param.kind {
-            hir::GenericParamKind::Type { default: Some(ref ty), .. } => icx.to_ty(ty),
-            hir::GenericParamKind::Const { ty: ref hir_ty, .. } => {
-                let ty = icx.to_ty(hir_ty);
-                if !tcx.features().const_compare_raw_pointers {
-                    let err = match ty.peel_refs().kind {
-                        ty::FnPtr(_) => Some("function pointers"),
-                        ty::RawPtr(_) => Some("raw pointers"),
-                        _ => None,
-                    };
-                    if let Some(unsupported_type) = err {
-                        feature_err(
-                            &tcx.sess.parse_sess,
-                            sym::const_compare_raw_pointers,
-                            hir_ty.span,
-                            &format!(
-                                "using {} as const generic parameters is unstable",
-                                unsupported_type
-                            ),
-                        )
-                        .emit();
-                    };
-                }
-                if traits::search_for_structural_match_violation(param.hir_id, param.span, tcx, ty)
-                    .is_some()
-                {
-                    struct_span_err!(
-                        tcx.sess,
-                        hir_ty.span,
-                        E0741,
-                        "the types of const generic parameters must derive `PartialEq` and `Eq`",
-                    )
-                    .span_label(
-                        hir_ty.span,
-                        format!("`{}` doesn't derive both `PartialEq` and `Eq`", ty),
-                    )
-                    .emit();
-                }
-                ty
-            }
-            x => bug!("unexpected non-type Node::GenericParam: {:?}", x),
-        },
-
-        x => {
-            bug!("unexpected sort of node in type_of_def_id(): {:?}", x);
-        }
-    }
-}
-
-fn find_opaque_ty_constraints(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
-    use rustc_hir::{ImplItem, Item, TraitItem};
-
-    debug!("find_opaque_ty_constraints({:?})", def_id);
-
-    struct ConstraintLocator<'tcx> {
-        tcx: TyCtxt<'tcx>,
-        def_id: DefId,
-        // (first found type span, actual type, mapping from the opaque type's generic
-        // parameters to the concrete type's generic parameters)
-        //
-        // The mapping is an index for each use site of a generic parameter in the concrete type
-        //
-        // The indices index into the generic parameters on the opaque type.
-        found: Option<(Span, Ty<'tcx>, Vec<usize>)>,
-    }
-
-    impl ConstraintLocator<'tcx> {
-        fn check(&mut self, def_id: DefId) {
-            // Don't try to check items that cannot possibly constrain the type.
-            if !self.tcx.has_typeck_tables(def_id) {
-                debug!(
-                    "find_opaque_ty_constraints: no constraint for `{:?}` at `{:?}`: no tables",
-                    self.def_id, def_id,
-                );
-                return;
-            }
-            let ty = self.tcx.typeck_tables_of(def_id).concrete_opaque_types.get(&self.def_id);
-            if let Some(ty::ResolvedOpaqueTy { concrete_type, substs }) = ty {
-                debug!(
-                    "find_opaque_ty_constraints: found constraint for `{:?}` at `{:?}`: {:?}",
-                    self.def_id, def_id, ty,
-                );
-
-                // FIXME(oli-obk): trace the actual span from inference to improve errors.
-                let span = self.tcx.def_span(def_id);
-                // used to quickly look up the position of a generic parameter
-                let mut index_map: FxHashMap<ty::ParamTy, usize> = FxHashMap::default();
-                // Skipping binder is ok, since we only use this to find generic parameters and
-                // their positions.
-                for (idx, subst) in substs.iter().enumerate() {
-                    if let GenericArgKind::Type(ty) = subst.unpack() {
-                        if let ty::Param(p) = ty.kind {
-                            if index_map.insert(p, idx).is_some() {
-                                // There was already an entry for `p`, meaning a generic parameter
-                                // was used twice.
-                                self.tcx.sess.span_err(
-                                    span,
-                                    &format!(
-                                        "defining opaque type use restricts opaque \
-                                         type by using the generic parameter `{}` twice",
-                                        p,
-                                    ),
-                                );
-                                return;
-                            }
-                        } else {
-                            self.tcx.sess.delay_span_bug(
-                                span,
-                                &format!(
-                                    "non-defining opaque ty use in defining scope: {:?}, {:?}",
-                                    concrete_type, substs,
-                                ),
-                            );
-                        }
-                    }
-                }
-                // Compute the index within the opaque type for each generic parameter used in
-                // the concrete type.
-                let indices = concrete_type
-                    .subst(self.tcx, substs)
-                    .walk()
-                    .filter_map(|t| match &t.kind {
-                        ty::Param(p) => Some(*index_map.get(p).unwrap()),
-                        _ => None,
-                    })
-                    .collect();
-                let is_param = |ty: Ty<'_>| match ty.kind {
-                    ty::Param(_) => true,
-                    _ => false,
-                };
-                let bad_substs: Vec<_> = substs
-                    .iter()
-                    .enumerate()
-                    .filter_map(|(i, k)| {
-                        if let GenericArgKind::Type(ty) = k.unpack() { Some((i, ty)) } else { None }
-                    })
-                    .filter(|(_, ty)| !is_param(ty))
-                    .collect();
-
-                if !bad_substs.is_empty() {
-                    let identity_substs = InternalSubsts::identity_for_item(self.tcx, self.def_id);
-                    for (i, bad_subst) in bad_substs {
-                        self.tcx.sess.span_err(
-                            span,
-                            &format!(
-                                "defining opaque type use does not fully define opaque type: \
-                            generic parameter `{}` is specified as concrete type `{}`",
-                                identity_substs.type_at(i),
-                                bad_subst
-                            ),
-                        );
-                    }
-                } else if let Some((prev_span, prev_ty, ref prev_indices)) = self.found {
-                    let mut ty = concrete_type.walk().fuse();
-                    let mut p_ty = prev_ty.walk().fuse();
-                    let iter_eq = (&mut ty).zip(&mut p_ty).all(|(t, p)| match (&t.kind, &p.kind) {
-                        // Type parameters are equal to any other type parameter for the purpose of
-                        // concrete type equality, as it is possible to obtain the same type just
-                        // by passing matching parameters to a function.
-                        (ty::Param(_), ty::Param(_)) => true,
-                        _ => t == p,
-                    });
-                    if !iter_eq || ty.next().is_some() || p_ty.next().is_some() {
-                        debug!("find_opaque_ty_constraints: span={:?}", span);
-                        // Found different concrete types for the opaque type.
-                        let mut err = self.tcx.sess.struct_span_err(
-                            span,
-                            "concrete type differs from previous defining opaque type use",
-                        );
-                        err.span_label(
-                            span,
-                            format!("expected `{}`, got `{}`", prev_ty, concrete_type),
-                        );
-                        err.span_note(prev_span, "previous use here");
-                        err.emit();
-                    } else if indices != *prev_indices {
-                        // Found "same" concrete types, but the generic parameter order differs.
-                        let mut err = self.tcx.sess.struct_span_err(
-                            span,
-                            "concrete type's generic parameters differ from previous defining use",
-                        );
-                        use std::fmt::Write;
-                        let mut s = String::new();
-                        write!(s, "expected [").unwrap();
-                        let list = |s: &mut String, indices: &Vec<usize>| {
-                            let mut indices = indices.iter().cloned();
-                            if let Some(first) = indices.next() {
-                                write!(s, "`{}`", substs[first]).unwrap();
-                                for i in indices {
-                                    write!(s, ", `{}`", substs[i]).unwrap();
-                                }
-                            }
-                        };
-                        list(&mut s, prev_indices);
-                        write!(s, "], got [").unwrap();
-                        list(&mut s, &indices);
-                        write!(s, "]").unwrap();
-                        err.span_label(span, s);
-                        err.span_note(prev_span, "previous use here");
-                        err.emit();
-                    }
-                } else {
-                    self.found = Some((span, concrete_type, indices));
-                }
-            } else {
-                debug!(
-                    "find_opaque_ty_constraints: no constraint for `{:?}` at `{:?}`",
-                    self.def_id, def_id,
-                );
-            }
-        }
-    }
-
-    impl<'tcx> intravisit::Visitor<'tcx> for ConstraintLocator<'tcx> {
-        type Map = Map<'tcx>;
-
-        fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
-            intravisit::NestedVisitorMap::All(&self.tcx.hir())
-        }
-        fn visit_item(&mut self, it: &'tcx Item<'tcx>) {
-            debug!("find_existential_constraints: visiting {:?}", it);
-            let def_id = self.tcx.hir().local_def_id(it.hir_id);
-            // The opaque type itself or its children are not within its reveal scope.
-            if def_id != self.def_id {
-                self.check(def_id);
-                intravisit::walk_item(self, it);
-            }
-        }
-        fn visit_impl_item(&mut self, it: &'tcx ImplItem<'tcx>) {
-            debug!("find_existential_constraints: visiting {:?}", it);
-            let def_id = self.tcx.hir().local_def_id(it.hir_id);
-            // The opaque type itself or its children are not within its reveal scope.
-            if def_id != self.def_id {
-                self.check(def_id);
-                intravisit::walk_impl_item(self, it);
-            }
-        }
-        fn visit_trait_item(&mut self, it: &'tcx TraitItem<'tcx>) {
-            debug!("find_existential_constraints: visiting {:?}", it);
-            let def_id = self.tcx.hir().local_def_id(it.hir_id);
-            self.check(def_id);
-            intravisit::walk_trait_item(self, it);
-        }
-    }
-
-    let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
-    let scope = tcx.hir().get_defining_scope(hir_id);
-    let mut locator = ConstraintLocator { def_id, tcx, found: None };
-
-    debug!("find_opaque_ty_constraints: scope={:?}", scope);
-
-    if scope == hir::CRATE_HIR_ID {
-        intravisit::walk_crate(&mut locator, tcx.hir().krate());
-    } else {
-        debug!("find_opaque_ty_constraints: scope={:?}", tcx.hir().get(scope));
-        match tcx.hir().get(scope) {
-            // We explicitly call `visit_*` methods, instead of using `intravisit::walk_*` methods
-            // This allows our visitor to process the defining item itself, causing
-            // it to pick up any 'sibling' defining uses.
-            //
-            // For example, this code:
-            // ```
-            // fn foo() {
-            //     type Blah = impl Debug;
-            //     let my_closure = || -> Blah { true };
-            // }
-            // ```
-            //
-            // requires us to explicitly process `foo()` in order
-            // to notice the defining usage of `Blah`.
-            Node::Item(ref it) => locator.visit_item(it),
-            Node::ImplItem(ref it) => locator.visit_impl_item(it),
-            Node::TraitItem(ref it) => locator.visit_trait_item(it),
-            other => bug!("{:?} is not a valid scope for an opaque type item", other),
-        }
-    }
-
-    match locator.found {
-        Some((_, ty, _)) => ty,
-        None => {
-            let span = tcx.def_span(def_id);
-            tcx.sess.span_err(span, "could not find defining uses");
-            tcx.types.err
-        }
-    }
-}
-
 fn are_suggestable_generic_args(generic_args: &[hir::GenericArg<'_>]) -> bool {
     generic_args
         .iter()
@@ -1840,7 +1395,7 @@ fn are_suggestable_generic_args(generic_args: &[hir::GenericArg<'_>]) -> bool {
         .any(is_suggestable_infer_ty)
 }
 
-/// Whether `ty` is a type with `_` placeholders that can be infered. Used in diagnostics only to
+/// Whether `ty` is a type with `_` placeholders that can be inferred. Used in diagnostics only to
 /// use inference to provide suggestions for the appropriate type if possible.
 fn is_suggestable_infer_ty(ty: &hir::Ty<'_>) -> bool {
     use hir::TyKind::*;
@@ -1863,8 +1418,8 @@ fn is_suggestable_infer_ty(ty: &hir::Ty<'_>) -> bool {
     }
 }
 
-pub fn get_infer_ret_ty(output: &'hir hir::FunctionRetTy<'hir>) -> Option<&'hir hir::Ty<'hir>> {
-    if let hir::FunctionRetTy::Return(ref ty) = output {
+pub fn get_infer_ret_ty(output: &'hir hir::FnRetTy<'hir>) -> Option<&'hir hir::Ty<'hir>> {
+    if let hir::FnRetTy::Return(ref ty) = output {
         if is_suggestable_infer_ty(ty) {
             return Some(&**ty);
         }
@@ -1912,7 +1467,7 @@ fn fn_sig(tcx: TyCtxt<'_>, def_id: DefId) -> ty::PolyFnSig<'_> {
                     sig.header.unsafety,
                     sig.header.abi,
                     &sig.decl,
-                    &generics.params[..],
+                    &generics,
                     Some(ident.span),
                 ),
             }
@@ -1923,14 +1478,9 @@ fn fn_sig(tcx: TyCtxt<'_>, def_id: DefId) -> ty::PolyFnSig<'_> {
             ident,
             generics,
             ..
-        }) => AstConv::ty_of_fn(
-            &icx,
-            header.unsafety,
-            header.abi,
-            decl,
-            &generics.params[..],
-            Some(ident.span),
-        ),
+        }) => {
+            AstConv::ty_of_fn(&icx, header.unsafety, header.abi, decl, &generics, Some(ident.span))
+        }
 
         ForeignItem(&hir::ForeignItem { kind: ForeignItemKind::Fn(ref fn_decl, _, _), .. }) => {
             let abi = tcx.hir().get_foreign_abi(hir_id);
@@ -2091,7 +1641,6 @@ fn predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericPredicates<'_> {
 /// Returns a list of user-specified type predicates for the definition with ID `def_id`.
 /// N.B., this does not include any implied/inferred constraints.
 fn explicit_predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericPredicates<'_> {
-    use rustc_data_structures::fx::FxHashSet;
     use rustc_hir::*;
 
     debug!("explicit_predicates_of(def_id={:?})", def_id);
@@ -2322,7 +1871,8 @@ fn explicit_predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericPredicat
                         // compiler/tooling bugs from not handling WF predicates.
                     } else {
                         let span = bound_pred.bounded_ty.span;
-                        let predicate = ty::OutlivesPredicate(ty, tcx.mk_region(ty::ReEmpty));
+                        let re_root_empty = tcx.lifetimes.re_root_empty;
+                        let predicate = ty::OutlivesPredicate(ty, re_root_empty);
                         predicates.push((
                             ty::Predicate::TypeOutlives(ty::Binder::dummy(predicate)),
                             span,
@@ -2334,7 +1884,7 @@ fn explicit_predicates_of(tcx: TyCtxt<'_>, def_id: DefId) -> ty::GenericPredicat
                     match bound {
                         &hir::GenericBound::Trait(ref poly_trait_ref, modifier) => {
                             let constness = match modifier {
-                                hir::TraitBoundModifier::MaybeConst => ast::Constness::NotConst,
+                                hir::TraitBoundModifier::MaybeConst => hir::Constness::NotConst,
                                 hir::TraitBoundModifier::None => constness,
                                 hir::TraitBoundModifier::Maybe => bug!("this wasn't handled"),
                             };
@@ -2437,7 +1987,10 @@ fn associated_item_predicates(
                     trait_item.span,
                     &format!("{}-generic associated types are not yet implemented", arg_kind),
                 )
-                .note("for more information, see https://github.com/rust-lang/rust/issues/44265")
+                .note(
+                    "for more information, see issue #44265 \
+                     <https://github.com/rust-lang/rust/issues/44265> for more information",
+                )
                 .emit();
             had_error = true;
         }
@@ -2519,13 +2072,13 @@ fn predicates_from_bound<'tcx>(
     astconv: &dyn AstConv<'tcx>,
     param_ty: Ty<'tcx>,
     bound: &'tcx hir::GenericBound<'tcx>,
-    constness: ast::Constness,
+    constness: hir::Constness,
 ) -> Vec<(ty::Predicate<'tcx>, Span)> {
     match *bound {
         hir::GenericBound::Trait(ref tr, modifier) => {
             let constness = match modifier {
                 hir::TraitBoundModifier::Maybe => return vec![],
-                hir::TraitBoundModifier::MaybeConst => ast::Constness::NotConst,
+                hir::TraitBoundModifier::MaybeConst => hir::Constness::NotConst,
                 hir::TraitBoundModifier::None => constness,
             };
 
@@ -2552,7 +2105,14 @@ fn compute_sig_of_foreign_fn_decl<'tcx>(
     } else {
         hir::Unsafety::Unsafe
     };
-    let fty = AstConv::ty_of_fn(&ItemCtxt::new(tcx, def_id), unsafety, abi, decl, &[], None);
+    let fty = AstConv::ty_of_fn(
+        &ItemCtxt::new(tcx, def_id),
+        unsafety,
+        abi,
+        decl,
+        &hir::Generics::empty(),
+        None,
+    );
 
     // Feature gate SIMD types in FFI, since I am not sure that the
     // ABIs are handled at all correctly. -huonw
@@ -2567,7 +2127,7 @@ fn compute_sig_of_foreign_fn_decl<'tcx>(
                         ast_ty.span,
                         &format!(
                             "use of SIMD type `{}` in FFI is highly experimental and \
-                            may result in invalid code",
+                             may result in invalid code",
                             tcx.hir().hir_to_pretty_string(ast_ty.hir_id)
                         ),
                     )
@@ -2578,7 +2138,7 @@ fn compute_sig_of_foreign_fn_decl<'tcx>(
         for (input, ty) in decl.inputs.iter().zip(*fty.inputs().skip_binder()) {
             check(&input, ty)
         }
-        if let hir::FunctionRetTy::Return(ref ty) = decl.output {
+        if let hir::FnRetTy::Return(ref ty) = decl.output {
             check(&ty, *fty.output().skip_binder())
         }
     }
@@ -2606,6 +2166,17 @@ fn static_mutability(tcx: TyCtxt<'_>, def_id: DefId) -> Option<hir::Mutability>
     }
 }
 
+fn generator_kind(tcx: TyCtxt<'_>, def_id: DefId) -> Option<hir::GeneratorKind> {
+    match tcx.hir().get_if_local(def_id) {
+        Some(Node::Expr(&rustc_hir::Expr {
+            kind: rustc_hir::ExprKind::Closure(_, _, body_id, _, _),
+            ..
+        })) => tcx.hir().body(body_id).generator_kind(),
+        Some(_) => None,
+        _ => bug!("generator_kind applied to non-local def-id {:?}", def_id),
+    }
+}
+
 fn from_target_feature(
     tcx: TyCtxt<'_>,
     id: DefId,
@@ -2655,7 +2226,7 @@ fn from_target_feature(
                         item.span(),
                         format!("`{}` is not valid for this target", feature),
                     );
-                    if feature.starts_with("+") {
+                    if feature.starts_with('+') {
                         let valid = whitelist.contains_key(&feature[1..]);
                         if valid {
                             err.help("consider removing the leading `+` in the feature name");
@@ -2667,7 +2238,7 @@ fn from_target_feature(
             };
 
             // Only allow features whose feature gates have been enabled.
-            let allowed = match feature_gate.as_ref().map(|s| *s) {
+            let allowed = match feature_gate.as_ref().copied() {
                 Some(sym::arm_target_feature) => rust_features.arm_target_feature,
                 Some(sym::aarch64_target_feature) => rust_features.aarch64_target_feature,
                 Some(sym::hexagon_target_feature) => rust_features.hexagon_target_feature,
@@ -2743,6 +2314,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
 
     let mut inline_span = None;
     let mut link_ordinal_span = None;
+    let mut no_sanitize_span = None;
     for attr in attrs.iter() {
         if attr.check_name(sym::cold) {
             codegen_fn_attrs.flags |= CodegenFnAttrFlags::COLD;
@@ -2771,21 +2343,19 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
             codegen_fn_attrs.flags |= CodegenFnAttrFlags::NO_MANGLE;
         } else if attr.check_name(sym::rustc_std_internal_symbol) {
             codegen_fn_attrs.flags |= CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL;
-        } else if attr.check_name(sym::no_debug) {
-            codegen_fn_attrs.flags |= CodegenFnAttrFlags::NO_DEBUG;
         } else if attr.check_name(sym::used) {
             codegen_fn_attrs.flags |= CodegenFnAttrFlags::USED;
         } else if attr.check_name(sym::thread_local) {
             codegen_fn_attrs.flags |= CodegenFnAttrFlags::THREAD_LOCAL;
         } else if attr.check_name(sym::track_caller) {
-            if tcx.fn_sig(id).abi() != abi::Abi::Rust {
+            if tcx.is_closure(id) || tcx.fn_sig(id).abi() != abi::Abi::Rust {
                 struct_span_err!(tcx.sess, attr.span, E0737, "`#[track_caller]` requires Rust ABI")
                     .emit();
             }
             codegen_fn_attrs.flags |= CodegenFnAttrFlags::TRACK_CALLER;
         } else if attr.check_name(sym::export_name) {
             if let Some(s) = attr.value_str() {
-                if s.as_str().contains("\0") {
+                if s.as_str().contains('\0') {
                     // `#[export_name = ...]` will be converted to a null-terminated string,
                     // so it may not contain any null characters.
                     struct_span_err!(
@@ -2799,7 +2369,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
                 codegen_fn_attrs.export_name = Some(s);
             }
         } else if attr.check_name(sym::target_feature) {
-            if tcx.fn_sig(id).unsafety() == Unsafety::Normal {
+            if tcx.is_closure(id) || tcx.fn_sig(id).unsafety() == Unsafety::Normal {
                 let msg = "`#[target_feature(..)]` can only be applied to `unsafe` functions";
                 tcx.sess
                     .struct_span_err(attr.span, msg)
@@ -2832,6 +2402,24 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
             if let ordinal @ Some(_) = check_link_ordinal(tcx, attr) {
                 codegen_fn_attrs.link_ordinal = ordinal;
             }
+        } else if attr.check_name(sym::no_sanitize) {
+            no_sanitize_span = Some(attr.span);
+            if let Some(list) = attr.meta_item_list() {
+                for item in list.iter() {
+                    if item.check_name(sym::address) {
+                        codegen_fn_attrs.flags |= CodegenFnAttrFlags::NO_SANITIZE_ADDRESS;
+                    } else if item.check_name(sym::memory) {
+                        codegen_fn_attrs.flags |= CodegenFnAttrFlags::NO_SANITIZE_MEMORY;
+                    } else if item.check_name(sym::thread) {
+                        codegen_fn_attrs.flags |= CodegenFnAttrFlags::NO_SANITIZE_THREAD;
+                    } else {
+                        tcx.sess
+                            .struct_span_err(item.span(), "invalid argument for `no_sanitize`")
+                            .note("expected one of: `address`, `memory` or `thread`")
+                            .emit();
+                    }
+                }
+            }
         }
     }
 
@@ -2911,8 +2499,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
     // purpose functions as they wouldn't have the right target features
     // enabled. For that reason we also forbid #[inline(always)] as it can't be
     // respected.
-
-    if codegen_fn_attrs.target_features.len() > 0 {
+    if !codegen_fn_attrs.target_features.is_empty() {
         if codegen_fn_attrs.inline == InlineAttr::Always {
             if let Some(span) = inline_span {
                 tcx.sess.span_err(
@@ -2924,6 +2511,24 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
         }
     }
 
+    if codegen_fn_attrs.flags.intersects(CodegenFnAttrFlags::NO_SANITIZE_ANY) {
+        if codegen_fn_attrs.inline == InlineAttr::Always {
+            if let (Some(no_sanitize_span), Some(inline_span)) = (no_sanitize_span, inline_span) {
+                let hir_id = tcx.hir().as_local_hir_id(id).unwrap();
+                tcx.struct_span_lint_hir(
+                    lint::builtin::INLINE_NO_SANITIZE,
+                    hir_id,
+                    no_sanitize_span,
+                    |lint| {
+                        lint.build("`no_sanitize` will have no effect after inlining")
+                            .span_note(inline_span, "inlining requested here")
+                            .emit();
+                    },
+                )
+            }
+        }
+    }
+
     // Weak lang items have the same semantics as "std internal" symbols in the
     // sense that they're preserved through all our LTO passes and only
     // strippable by the linker.
@@ -2932,7 +2537,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
     if tcx.is_weak_lang_item(id) {
         codegen_fn_attrs.flags |= CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL;
     }
-    if let Some(name) = weak_lang_items::link_name(&attrs) {
+    if let Some(name) = lang_items::link_name(&attrs) {
         codegen_fn_attrs.export_name = Some(name);
         codegen_fn_attrs.link_name = Some(name);
     }
@@ -2949,7 +2554,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, id: DefId) -> CodegenFnAttrs {
 }
 
 fn check_link_ordinal(tcx: TyCtxt<'_>, attr: &ast::Attribute) -> Option<usize> {
-    use syntax::ast::{Lit, LitIntType, LitKind};
+    use rustc_ast::ast::{Lit, LitIntType, LitKind};
     let meta_item_list = attr.meta_item_list();
     let meta_item_list: Option<&[ast::NestedMetaItem]> = meta_item_list.as_ref().map(Vec::as_ref);
     let sole_meta_list = match meta_item_list {
diff --git a/src/librustc_typeck/collect/type_of.rs b/src/librustc_typeck/collect/type_of.rs
new file mode 100644
index 0000000000..ec87112b7a
--- /dev/null
+++ b/src/librustc_typeck/collect/type_of.rs
@@ -0,0 +1,661 @@
+use rustc::hir::map::Map;
+use rustc::session::parse::feature_err;
+use rustc::ty::subst::{GenericArgKind, InternalSubsts, Subst};
+use rustc::ty::util::IntTypeExt;
+use rustc::ty::{self, DefIdTree, Ty, TyCtxt, TypeFoldable};
+use rustc_data_structures::fx::FxHashMap;
+use rustc_errors::{struct_span_err, Applicability, StashKey};
+use rustc_hir as hir;
+use rustc_hir::def::{DefKind, Res};
+use rustc_hir::def_id::DefId;
+use rustc_hir::intravisit;
+use rustc_hir::intravisit::Visitor;
+use rustc_hir::Node;
+use rustc_infer::traits;
+use rustc_span::symbol::{sym, Ident};
+use rustc_span::{Span, DUMMY_SP};
+
+use super::ItemCtxt;
+use super::{bad_placeholder_type, is_suggestable_infer_ty};
+
+pub(super) fn type_of(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
+    use rustc_hir::*;
+
+    let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
+
+    let icx = ItemCtxt::new(tcx, def_id);
+
+    match tcx.hir().get(hir_id) {
+        Node::TraitItem(item) => match item.kind {
+            TraitItemKind::Method(..) => {
+                let substs = InternalSubsts::identity_for_item(tcx, def_id);
+                tcx.mk_fn_def(def_id, substs)
+            }
+            TraitItemKind::Const(ref ty, body_id) => body_id
+                .and_then(|body_id| {
+                    if is_suggestable_infer_ty(ty) {
+                        Some(infer_placeholder_type(tcx, def_id, body_id, ty.span, item.ident))
+                    } else {
+                        None
+                    }
+                })
+                .unwrap_or_else(|| icx.to_ty(ty)),
+            TraitItemKind::Type(_, Some(ref ty)) => icx.to_ty(ty),
+            TraitItemKind::Type(_, None) => {
+                span_bug!(item.span, "associated type missing default");
+            }
+        },
+
+        Node::ImplItem(item) => match item.kind {
+            ImplItemKind::Method(..) => {
+                let substs = InternalSubsts::identity_for_item(tcx, def_id);
+                tcx.mk_fn_def(def_id, substs)
+            }
+            ImplItemKind::Const(ref ty, body_id) => {
+                if is_suggestable_infer_ty(ty) {
+                    infer_placeholder_type(tcx, def_id, body_id, ty.span, item.ident)
+                } else {
+                    icx.to_ty(ty)
+                }
+            }
+            ImplItemKind::OpaqueTy(_) => {
+                if tcx.impl_trait_ref(tcx.hir().get_parent_did(hir_id)).is_none() {
+                    report_assoc_ty_on_inherent_impl(tcx, item.span);
+                }
+
+                find_opaque_ty_constraints(tcx, def_id)
+            }
+            ImplItemKind::TyAlias(ref ty) => {
+                if tcx.impl_trait_ref(tcx.hir().get_parent_did(hir_id)).is_none() {
+                    report_assoc_ty_on_inherent_impl(tcx, item.span);
+                }
+
+                icx.to_ty(ty)
+            }
+        },
+
+        Node::Item(item) => {
+            match item.kind {
+                ItemKind::Static(ref ty, .., body_id) | ItemKind::Const(ref ty, body_id) => {
+                    if is_suggestable_infer_ty(ty) {
+                        infer_placeholder_type(tcx, def_id, body_id, ty.span, item.ident)
+                    } else {
+                        icx.to_ty(ty)
+                    }
+                }
+                ItemKind::TyAlias(ref self_ty, _) | ItemKind::Impl { ref self_ty, .. } => {
+                    icx.to_ty(self_ty)
+                }
+                ItemKind::Fn(..) => {
+                    let substs = InternalSubsts::identity_for_item(tcx, def_id);
+                    tcx.mk_fn_def(def_id, substs)
+                }
+                ItemKind::Enum(..) | ItemKind::Struct(..) | ItemKind::Union(..) => {
+                    let def = tcx.adt_def(def_id);
+                    let substs = InternalSubsts::identity_for_item(tcx, def_id);
+                    tcx.mk_adt(def, substs)
+                }
+                ItemKind::OpaqueTy(OpaqueTy { impl_trait_fn: None, .. }) => {
+                    find_opaque_ty_constraints(tcx, def_id)
+                }
+                // Opaque types desugared from `impl Trait`.
+                ItemKind::OpaqueTy(OpaqueTy { impl_trait_fn: Some(owner), origin, .. }) => {
+                    let concrete_types = match origin {
+                        OpaqueTyOrigin::FnReturn | OpaqueTyOrigin::AsyncFn => {
+                            &tcx.mir_borrowck(owner).concrete_opaque_types
+                        }
+                        OpaqueTyOrigin::Misc => {
+                            // We shouldn't leak borrowck results through impl trait in bindings.
+                            // For example, we shouldn't be able to tell if `x` in
+                            // `let x: impl Sized + 'a = &()` has type `&'static ()` or `&'a ()`.
+                            &tcx.typeck_tables_of(owner).concrete_opaque_types
+                        }
+                        OpaqueTyOrigin::TypeAlias => {
+                            span_bug!(item.span, "Type alias impl trait shouldn't have an owner")
+                        }
+                    };
+                    let concrete_ty = concrete_types
+                        .get(&def_id)
+                        .map(|opaque| opaque.concrete_type)
+                        .unwrap_or_else(|| {
+                            tcx.sess.delay_span_bug(
+                                DUMMY_SP,
+                                &format!(
+                                    "owner {:?} has no opaque type for {:?} in its tables",
+                                    owner, def_id,
+                                ),
+                            );
+                            if tcx.typeck_tables_of(owner).tainted_by_errors {
+                                // Some error in the
+                                // owner fn prevented us from populating
+                                // the `concrete_opaque_types` table.
+                                tcx.types.err
+                            } else {
+                                // We failed to resolve the opaque type or it
+                                // resolves to itself. Return the non-revealed
+                                // type, which should result in E0720.
+                                tcx.mk_opaque(
+                                    def_id,
+                                    InternalSubsts::identity_for_item(tcx, def_id),
+                                )
+                            }
+                        });
+                    debug!("concrete_ty = {:?}", concrete_ty);
+                    if concrete_ty.has_erased_regions() {
+                        // FIXME(impl_trait_in_bindings) Handle this case.
+                        tcx.sess.span_fatal(
+                            item.span,
+                            "lifetimes in impl Trait types in bindings are not currently supported",
+                        );
+                    }
+                    concrete_ty
+                }
+                ItemKind::Trait(..)
+                | ItemKind::TraitAlias(..)
+                | ItemKind::Mod(..)
+                | ItemKind::ForeignMod(..)
+                | ItemKind::GlobalAsm(..)
+                | ItemKind::ExternCrate(..)
+                | ItemKind::Use(..) => {
+                    span_bug!(
+                        item.span,
+                        "compute_type_of_item: unexpected item type: {:?}",
+                        item.kind
+                    );
+                }
+            }
+        }
+
+        Node::ForeignItem(foreign_item) => match foreign_item.kind {
+            ForeignItemKind::Fn(..) => {
+                let substs = InternalSubsts::identity_for_item(tcx, def_id);
+                tcx.mk_fn_def(def_id, substs)
+            }
+            ForeignItemKind::Static(ref t, _) => icx.to_ty(t),
+            ForeignItemKind::Type => tcx.mk_foreign(def_id),
+        },
+
+        Node::Ctor(&ref def) | Node::Variant(Variant { data: ref def, .. }) => match *def {
+            VariantData::Unit(..) | VariantData::Struct(..) => {
+                tcx.type_of(tcx.hir().get_parent_did(hir_id))
+            }
+            VariantData::Tuple(..) => {
+                let substs = InternalSubsts::identity_for_item(tcx, def_id);
+                tcx.mk_fn_def(def_id, substs)
+            }
+        },
+
+        Node::Field(field) => icx.to_ty(&field.ty),
+
+        Node::Expr(&Expr { kind: ExprKind::Closure(.., gen), .. }) => {
+            if gen.is_some() {
+                return tcx.typeck_tables_of(def_id).node_type(hir_id);
+            }
+
+            let substs = InternalSubsts::identity_for_item(tcx, def_id);
+            tcx.mk_closure(def_id, substs)
+        }
+
+        Node::AnonConst(_) => {
+            let parent_node = tcx.hir().get(tcx.hir().get_parent_node(hir_id));
+            match parent_node {
+                Node::Ty(&Ty { kind: TyKind::Array(_, ref constant), .. })
+                | Node::Ty(&Ty { kind: TyKind::Typeof(ref constant), .. })
+                | Node::Expr(&Expr { kind: ExprKind::Repeat(_, ref constant), .. })
+                    if constant.hir_id == hir_id =>
+                {
+                    tcx.types.usize
+                }
+
+                Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => {
+                    tcx.adt_def(tcx.hir().get_parent_did(hir_id)).repr.discr_type().to_ty(tcx)
+                }
+
+                Node::Ty(&Ty { kind: TyKind::Path(_), .. })
+                | Node::Expr(&Expr { kind: ExprKind::Struct(..), .. })
+                | Node::Expr(&Expr { kind: ExprKind::Path(_), .. })
+                | Node::TraitRef(..) => {
+                    let path = match parent_node {
+                        Node::Ty(&Ty {
+                            kind: TyKind::Path(QPath::Resolved(_, ref path)), ..
+                        })
+                        | Node::Expr(&Expr {
+                            kind: ExprKind::Path(QPath::Resolved(_, ref path)),
+                            ..
+                        }) => Some(&**path),
+                        Node::Expr(&Expr { kind: ExprKind::Struct(ref path, ..), .. }) => {
+                            if let QPath::Resolved(_, ref path) = **path {
+                                Some(&**path)
+                            } else {
+                                None
+                            }
+                        }
+                        Node::TraitRef(&TraitRef { ref path, .. }) => Some(&**path),
+                        _ => None,
+                    };
+
+                    if let Some(path) = path {
+                        let arg_index = path
+                            .segments
+                            .iter()
+                            .filter_map(|seg| seg.args.as_ref())
+                            .map(|generic_args| generic_args.args)
+                            .find_map(|args| {
+                                args.iter()
+                                    .filter(|arg| arg.is_const())
+                                    .enumerate()
+                                    .filter(|(_, arg)| arg.id() == hir_id)
+                                    .map(|(index, _)| index)
+                                    .next()
+                            })
+                            .unwrap_or_else(|| {
+                                bug!("no arg matching AnonConst in path");
+                            });
+
+                        // We've encountered an `AnonConst` in some path, so we need to
+                        // figure out which generic parameter it corresponds to and return
+                        // the relevant type.
+                        let generics = match path.res {
+                            Res::Def(DefKind::Ctor(..), def_id) => {
+                                tcx.generics_of(tcx.parent(def_id).unwrap())
+                            }
+                            Res::Def(_, def_id) => tcx.generics_of(def_id),
+                            Res::Err => return tcx.types.err,
+                            res => {
+                                tcx.sess.delay_span_bug(
+                                    DUMMY_SP,
+                                    &format!("unexpected const parent path def {:?}", res,),
+                                );
+                                return tcx.types.err;
+                            }
+                        };
+
+                        generics
+                            .params
+                            .iter()
+                            .filter(|param| {
+                                if let ty::GenericParamDefKind::Const = param.kind {
+                                    true
+                                } else {
+                                    false
+                                }
+                            })
+                            .nth(arg_index)
+                            .map(|param| tcx.type_of(param.def_id))
+                            // This is no generic parameter associated with the arg. This is
+                            // probably from an extra arg where one is not needed.
+                            .unwrap_or(tcx.types.err)
+                    } else {
+                        tcx.sess.delay_span_bug(
+                            DUMMY_SP,
+                            &format!("unexpected const parent path {:?}", parent_node,),
+                        );
+                        return tcx.types.err;
+                    }
+                }
+
+                x => {
+                    tcx.sess.delay_span_bug(
+                        DUMMY_SP,
+                        &format!("unexpected const parent in type_of_def_id(): {:?}", x),
+                    );
+                    tcx.types.err
+                }
+            }
+        }
+
+        Node::GenericParam(param) => match &param.kind {
+            GenericParamKind::Type { default: Some(ref ty), .. } => icx.to_ty(ty),
+            GenericParamKind::Const { ty: ref hir_ty, .. } => {
+                let ty = icx.to_ty(hir_ty);
+                if !tcx.features().const_compare_raw_pointers {
+                    let err = match ty.peel_refs().kind {
+                        ty::FnPtr(_) => Some("function pointers"),
+                        ty::RawPtr(_) => Some("raw pointers"),
+                        _ => None,
+                    };
+                    if let Some(unsupported_type) = err {
+                        feature_err(
+                            &tcx.sess.parse_sess,
+                            sym::const_compare_raw_pointers,
+                            hir_ty.span,
+                            &format!(
+                                "using {} as const generic parameters is unstable",
+                                unsupported_type
+                            ),
+                        )
+                        .emit();
+                    };
+                }
+                if traits::search_for_structural_match_violation(param.hir_id, param.span, tcx, ty)
+                    .is_some()
+                {
+                    struct_span_err!(
+                        tcx.sess,
+                        hir_ty.span,
+                        E0741,
+                        "the types of const generic parameters must derive `PartialEq` and `Eq`",
+                    )
+                    .span_label(
+                        hir_ty.span,
+                        format!("`{}` doesn't derive both `PartialEq` and `Eq`", ty),
+                    )
+                    .emit();
+                }
+                ty
+            }
+            x => bug!("unexpected non-type Node::GenericParam: {:?}", x),
+        },
+
+        x => {
+            bug!("unexpected sort of node in type_of_def_id(): {:?}", x);
+        }
+    }
+}
+
+fn find_opaque_ty_constraints(tcx: TyCtxt<'_>, def_id: DefId) -> Ty<'_> {
+    use rustc_hir::{Expr, ImplItem, Item, TraitItem};
+
+    debug!("find_opaque_ty_constraints({:?})", def_id);
+
+    struct ConstraintLocator<'tcx> {
+        tcx: TyCtxt<'tcx>,
+        def_id: DefId,
+        // (first found type span, actual type, mapping from the opaque type's generic
+        // parameters to the concrete type's generic parameters)
+        //
+        // The mapping is an index for each use site of a generic parameter in the concrete type
+        //
+        // The indices index into the generic parameters on the opaque type.
+        found: Option<(Span, Ty<'tcx>, Vec<usize>)>,
+    }
+
+    impl ConstraintLocator<'_> {
+        fn check(&mut self, def_id: DefId) {
+            // Don't try to check items that cannot possibly constrain the type.
+            if !self.tcx.has_typeck_tables(def_id) {
+                debug!(
+                    "find_opaque_ty_constraints: no constraint for `{:?}` at `{:?}`: no tables",
+                    self.def_id, def_id,
+                );
+                return;
+            }
+            // Calling `mir_borrowck` can lead to cycle errors through
+            // const-checking, avoid calling it if we don't have to.
+            if !self.tcx.typeck_tables_of(def_id).concrete_opaque_types.contains_key(&self.def_id) {
+                debug!(
+                    "find_opaque_ty_constraints: no constraint for `{:?}` at `{:?}`",
+                    self.def_id, def_id,
+                );
+                return;
+            }
+            // Use borrowck to get the type with unerased regions.
+            let ty = self.tcx.mir_borrowck(def_id).concrete_opaque_types.get(&self.def_id);
+            if let Some(ty::ResolvedOpaqueTy { concrete_type, substs }) = ty {
+                debug!(
+                    "find_opaque_ty_constraints: found constraint for `{:?}` at `{:?}`: {:?}",
+                    self.def_id, def_id, ty,
+                );
+
+                // FIXME(oli-obk): trace the actual span from inference to improve errors.
+                let span = self.tcx.def_span(def_id);
+                // used to quickly look up the position of a generic parameter
+                let mut index_map: FxHashMap<ty::ParamTy, usize> = FxHashMap::default();
+                // Skipping binder is ok, since we only use this to find generic parameters and
+                // their positions.
+                for (idx, subst) in substs.iter().enumerate() {
+                    if let GenericArgKind::Type(ty) = subst.unpack() {
+                        if let ty::Param(p) = ty.kind {
+                            if index_map.insert(p, idx).is_some() {
+                                // There was already an entry for `p`, meaning a generic parameter
+                                // was used twice.
+                                self.tcx.sess.span_err(
+                                    span,
+                                    &format!(
+                                        "defining opaque type use restricts opaque \
+                                         type by using the generic parameter `{}` twice",
+                                        p,
+                                    ),
+                                );
+                                return;
+                            }
+                        } else {
+                            self.tcx.sess.delay_span_bug(
+                                span,
+                                &format!(
+                                    "non-defining opaque ty use in defining scope: {:?}, {:?}",
+                                    concrete_type, substs,
+                                ),
+                            );
+                        }
+                    }
+                }
+                // Compute the index within the opaque type for each generic parameter used in
+                // the concrete type.
+                let indices = concrete_type
+                    .subst(self.tcx, substs)
+                    .walk()
+                    .filter_map(|t| match &t.kind {
+                        ty::Param(p) => Some(*index_map.get(p).unwrap()),
+                        _ => None,
+                    })
+                    .collect();
+                let is_param = |ty: Ty<'_>| match ty.kind {
+                    ty::Param(_) => true,
+                    _ => false,
+                };
+                let bad_substs: Vec<_> = substs
+                    .iter()
+                    .enumerate()
+                    .filter_map(|(i, k)| {
+                        if let GenericArgKind::Type(ty) = k.unpack() { Some((i, ty)) } else { None }
+                    })
+                    .filter(|(_, ty)| !is_param(ty))
+                    .collect();
+                if !bad_substs.is_empty() {
+                    let identity_substs = InternalSubsts::identity_for_item(self.tcx, self.def_id);
+                    for (i, bad_subst) in bad_substs {
+                        self.tcx.sess.span_err(
+                            span,
+                            &format!(
+                                "defining opaque type use does not fully define opaque type: \
+                            generic parameter `{}` is specified as concrete type `{}`",
+                                identity_substs.type_at(i),
+                                bad_subst
+                            ),
+                        );
+                    }
+                } else if let Some((prev_span, prev_ty, ref prev_indices)) = self.found {
+                    let mut ty = concrete_type.walk().fuse();
+                    let mut p_ty = prev_ty.walk().fuse();
+                    let iter_eq = (&mut ty).zip(&mut p_ty).all(|(t, p)| match (&t.kind, &p.kind) {
+                        // Type parameters are equal to any other type parameter for the purpose of
+                        // concrete type equality, as it is possible to obtain the same type just
+                        // by passing matching parameters to a function.
+                        (ty::Param(_), ty::Param(_)) => true,
+                        _ => t == p,
+                    });
+                    if !iter_eq || ty.next().is_some() || p_ty.next().is_some() {
+                        debug!("find_opaque_ty_constraints: span={:?}", span);
+                        // Found different concrete types for the opaque type.
+                        let mut err = self.tcx.sess.struct_span_err(
+                            span,
+                            "concrete type differs from previous defining opaque type use",
+                        );
+                        err.span_label(
+                            span,
+                            format!("expected `{}`, got `{}`", prev_ty, concrete_type),
+                        );
+                        err.span_note(prev_span, "previous use here");
+                        err.emit();
+                    } else if indices != *prev_indices {
+                        // Found "same" concrete types, but the generic parameter order differs.
+                        let mut err = self.tcx.sess.struct_span_err(
+                            span,
+                            "concrete type's generic parameters differ from previous defining use",
+                        );
+                        use std::fmt::Write;
+                        let mut s = String::new();
+                        write!(s, "expected [").unwrap();
+                        let list = |s: &mut String, indices: &Vec<usize>| {
+                            let mut indices = indices.iter().cloned();
+                            if let Some(first) = indices.next() {
+                                write!(s, "`{}`", substs[first]).unwrap();
+                                for i in indices {
+                                    write!(s, ", `{}`", substs[i]).unwrap();
+                                }
+                            }
+                        };
+                        list(&mut s, prev_indices);
+                        write!(s, "], got [").unwrap();
+                        list(&mut s, &indices);
+                        write!(s, "]").unwrap();
+                        err.span_label(span, s);
+                        err.span_note(prev_span, "previous use here");
+                        err.emit();
+                    }
+                } else {
+                    self.found = Some((span, concrete_type, indices));
+                }
+            } else {
+                debug!(
+                    "find_opaque_ty_constraints: no constraint for `{:?}` at `{:?}`",
+                    self.def_id, def_id,
+                );
+            }
+        }
+    }
+
+    impl<'tcx> intravisit::Visitor<'tcx> for ConstraintLocator<'tcx> {
+        type Map = Map<'tcx>;
+
+        fn nested_visit_map(&mut self) -> intravisit::NestedVisitorMap<'_, Self::Map> {
+            intravisit::NestedVisitorMap::All(&self.tcx.hir())
+        }
+        fn visit_expr(&mut self, ex: &'tcx Expr<'tcx>) {
+            if let hir::ExprKind::Closure(..) = ex.kind {
+                let def_id = self.tcx.hir().local_def_id(ex.hir_id);
+                self.check(def_id);
+            }
+            intravisit::walk_expr(self, ex);
+        }
+        fn visit_item(&mut self, it: &'tcx Item<'tcx>) {
+            debug!("find_existential_constraints: visiting {:?}", it);
+            let def_id = self.tcx.hir().local_def_id(it.hir_id);
+            // The opaque type itself or its children are not within its reveal scope.
+            if def_id != self.def_id {
+                self.check(def_id);
+                intravisit::walk_item(self, it);
+            }
+        }
+        fn visit_impl_item(&mut self, it: &'tcx ImplItem<'tcx>) {
+            debug!("find_existential_constraints: visiting {:?}", it);
+            let def_id = self.tcx.hir().local_def_id(it.hir_id);
+            // The opaque type itself or its children are not within its reveal scope.
+            if def_id != self.def_id {
+                self.check(def_id);
+                intravisit::walk_impl_item(self, it);
+            }
+        }
+        fn visit_trait_item(&mut self, it: &'tcx TraitItem<'tcx>) {
+            debug!("find_existential_constraints: visiting {:?}", it);
+            let def_id = self.tcx.hir().local_def_id(it.hir_id);
+            self.check(def_id);
+            intravisit::walk_trait_item(self, it);
+        }
+    }
+
+    let hir_id = tcx.hir().as_local_hir_id(def_id).unwrap();
+    let scope = tcx.hir().get_defining_scope(hir_id);
+    let mut locator = ConstraintLocator { def_id, tcx, found: None };
+
+    debug!("find_opaque_ty_constraints: scope={:?}", scope);
+
+    if scope == hir::CRATE_HIR_ID {
+        intravisit::walk_crate(&mut locator, tcx.hir().krate());
+    } else {
+        debug!("find_opaque_ty_constraints: scope={:?}", tcx.hir().get(scope));
+        match tcx.hir().get(scope) {
+            // We explicitly call `visit_*` methods, instead of using `intravisit::walk_*` methods
+            // This allows our visitor to process the defining item itself, causing
+            // it to pick up any 'sibling' defining uses.
+            //
+            // For example, this code:
+            // ```
+            // fn foo() {
+            //     type Blah = impl Debug;
+            //     let my_closure = || -> Blah { true };
+            // }
+            // ```
+            //
+            // requires us to explicitly process `foo()` in order
+            // to notice the defining usage of `Blah`.
+            Node::Item(ref it) => locator.visit_item(it),
+            Node::ImplItem(ref it) => locator.visit_impl_item(it),
+            Node::TraitItem(ref it) => locator.visit_trait_item(it),
+            other => bug!("{:?} is not a valid scope for an opaque type item", other),
+        }
+    }
+
+    match locator.found {
+        Some((_, ty, _)) => ty,
+        None => {
+            let span = tcx.def_span(def_id);
+            tcx.sess.span_err(span, "could not find defining uses");
+            tcx.types.err
+        }
+    }
+}
+
+fn infer_placeholder_type(
+    tcx: TyCtxt<'_>,
+    def_id: DefId,
+    body_id: hir::BodyId,
+    span: Span,
+    item_ident: Ident,
+) -> Ty<'_> {
+    let ty = tcx.diagnostic_only_typeck_tables_of(def_id).node_type(body_id.hir_id);
+
+    // If this came from a free `const` or `static mut?` item,
+    // then the user may have written e.g. `const A = 42;`.
+    // In this case, the parser has stashed a diagnostic for
+    // us to improve in typeck so we do that now.
+    match tcx.sess.diagnostic().steal_diagnostic(span, StashKey::ItemNoType) {
+        Some(mut err) => {
+            // The parser provided a sub-optimal `HasPlaceholders` suggestion for the type.
+            // We are typeck and have the real type, so remove that and suggest the actual type.
+            err.suggestions.clear();
+            err.span_suggestion(
+                span,
+                "provide a type for the item",
+                format!("{}: {}", item_ident, ty),
+                Applicability::MachineApplicable,
+            )
+            .emit();
+        }
+        None => {
+            let mut diag = bad_placeholder_type(tcx, vec![span]);
+            if ty != tcx.types.err {
+                diag.span_suggestion(
+                    span,
+                    "replace `_` with the correct type",
+                    ty.to_string(),
+                    Applicability::MaybeIncorrect,
+                );
+            }
+            diag.emit();
+        }
+    }
+
+    ty
+}
+
+fn report_assoc_ty_on_inherent_impl(tcx: TyCtxt<'_>, span: Span) {
+    struct_span_err!(
+        tcx.sess,
+        span,
+        E0202,
+        "associated types are not yet supported in inherent impls (see #8995)"
+    )
+    .emit();
+}
diff --git a/src/librustc_typeck/expr_use_visitor.rs b/src/librustc_typeck/expr_use_visitor.rs
index 1d3ace933c..6666b16999 100644
--- a/src/librustc_typeck/expr_use_visitor.rs
+++ b/src/librustc_typeck/expr_use_visitor.rs
@@ -7,12 +7,12 @@ pub use self::ConsumeMode::*;
 // Export these here so that Clippy can use them.
 pub use mc::{Place, PlaceBase, Projection};
 
-use rustc::infer::InferCtxt;
 use rustc::ty::{self, adjustment, TyCtxt};
 use rustc_hir as hir;
 use rustc_hir::def::Res;
 use rustc_hir::def_id::DefId;
 use rustc_hir::PatKind;
+use rustc_infer::infer::InferCtxt;
 
 use crate::mem_categorization as mc;
 use rustc_span::Span;
diff --git a/src/librustc_typeck/impl_wf_check.rs b/src/librustc_typeck/impl_wf_check.rs
index e9c18b59da..0a765a1f9c 100644
--- a/src/librustc_typeck/impl_wf_check.rs
+++ b/src/librustc_typeck/impl_wf_check.rs
@@ -120,11 +120,26 @@ fn enforce_impl_params_are_constrained(
     let lifetimes_in_associated_types: FxHashSet<_> = impl_item_refs
         .iter()
         .map(|item_ref| tcx.hir().local_def_id(item_ref.id.hir_id))
-        .filter(|&def_id| {
+        .flat_map(|def_id| {
             let item = tcx.associated_item(def_id);
-            item.kind == ty::AssocKind::Type && item.defaultness.has_value()
+            match item.kind {
+                ty::AssocKind::Type => {
+                    if item.defaultness.has_value() {
+                        cgp::parameters_for(&tcx.type_of(def_id), true)
+                    } else {
+                        Vec::new()
+                    }
+                }
+                ty::AssocKind::OpaqueTy => {
+                    // We don't know which lifetimes appear in the actual
+                    // opaque type, so use all of the lifetimes that appear
+                    // in the type's predicates.
+                    let predicates = tcx.predicates_of(def_id).instantiate_identity(tcx);
+                    cgp::parameters_for(&predicates, true)
+                }
+                ty::AssocKind::Method | ty::AssocKind::Const => Vec::new(),
+            }
         })
-        .flat_map(|def_id| cgp::parameters_for(&tcx.type_of(def_id), true))
         .collect();
 
     for param in &impl_generics.params {
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index 3d27f9191d..c5f339d6b7 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -58,13 +58,10 @@ This API is completely unstable and subject to change.
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
 #![allow(non_camel_case_types)]
 #![feature(bool_to_option)]
-#![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(crate_visibility_modifier)]
-#![feature(exhaustive_patterns)]
 #![feature(in_band_lifetimes)]
 #![feature(nll)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(try_blocks)]
 #![feature(never_type)]
 #![recursion_limit = "256"]
@@ -86,17 +83,14 @@ mod collect;
 mod constrained_generic_params;
 mod impl_wf_check;
 mod mem_categorization;
-mod namespace;
 mod outlives;
 mod structured_errors;
 mod variance;
 
-use rustc::infer::InferOk;
 use rustc::lint;
 use rustc::middle;
 use rustc::session;
 use rustc::session::config::EntryFnType;
-use rustc::traits::{ObligationCause, ObligationCauseCode, TraitEngine, TraitEngineExt};
 use rustc::ty::query::Providers;
 use rustc::ty::subst::SubstsRef;
 use rustc::ty::{self, Ty, TyCtxt};
@@ -106,6 +100,8 @@ use rustc_errors::struct_span_err;
 use rustc_hir as hir;
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_hir::Node;
+use rustc_infer::infer::{InferOk, TyCtxtInferExt};
+use rustc_infer::traits::{ObligationCause, ObligationCauseCode, TraitEngine, TraitEngineExt};
 use rustc_span::{Span, DUMMY_SP};
 use rustc_target::spec::abi::Abi;
 
@@ -380,7 +376,7 @@ pub fn hir_trait_to_predicates<'tcx>(
         &item_cx,
         hir_trait,
         DUMMY_SP,
-        syntax::ast::Constness::NotConst,
+        hir::Constness::NotConst,
         tcx.types.err,
         &mut bounds,
         true,
diff --git a/src/librustc_typeck/mem_categorization.rs b/src/librustc_typeck/mem_categorization.rs
index d3d0aa2e58..a4569a1475 100644
--- a/src/librustc_typeck/mem_categorization.rs
+++ b/src/librustc_typeck/mem_categorization.rs
@@ -48,15 +48,16 @@
 //! result of `*x'`, effectively, where `x'` is a `Categorization::Upvar` reference
 //! tied to `x`. The type of `x'` will be a borrowed pointer.
 
-use rustc::infer::InferCtxt;
 use rustc::ty::adjustment;
 use rustc::ty::fold::TypeFoldable;
 use rustc::ty::{self, Ty, TyCtxt};
+
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::DefId;
 use rustc_hir::PatKind;
+use rustc_infer::infer::InferCtxt;
 use rustc_span::Span;
 
 #[derive(Clone, Debug)]
diff --git a/src/librustc_typeck/namespace.rs b/src/librustc_typeck/namespace.rs
deleted file mode 100644
index 2aa97aa7e6..0000000000
--- a/src/librustc_typeck/namespace.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use rustc::ty;
-use rustc_hir as hir;
-
-// Whether an item exists in the type or value namespace.
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum Namespace {
-    Type,
-    Value,
-}
-
-impl From<ty::AssocKind> for Namespace {
-    fn from(a_kind: ty::AssocKind) -> Self {
-        match a_kind {
-            ty::AssocKind::OpaqueTy | ty::AssocKind::Type => Namespace::Type,
-            ty::AssocKind::Const | ty::AssocKind::Method => Namespace::Value,
-        }
-    }
-}
-
-impl<'a> From<&'a hir::ImplItemKind<'_>> for Namespace {
-    fn from(impl_kind: &'a hir::ImplItemKind<'_>) -> Self {
-        match *impl_kind {
-            hir::ImplItemKind::OpaqueTy(..) | hir::ImplItemKind::TyAlias(..) => Namespace::Type,
-            hir::ImplItemKind::Const(..) | hir::ImplItemKind::Method(..) => Namespace::Value,
-        }
-    }
-}
diff --git a/src/librustc_typeck/outlives/implicit_infer.rs b/src/librustc_typeck/outlives/implicit_infer.rs
index 1645f01a4b..44473fee64 100644
--- a/src/librustc_typeck/outlives/implicit_infer.rs
+++ b/src/librustc_typeck/outlives/implicit_infer.rs
@@ -31,10 +31,10 @@ pub fn infer_predicates<'tcx>(
         predicates_added = false;
 
         let mut visitor = InferVisitor {
-            tcx: tcx,
+            tcx,
             global_inferred_outlives: &mut global_inferred_outlives,
             predicates_added: &mut predicates_added,
-            explicit_map: explicit_map,
+            explicit_map,
         };
 
         // Visit all the crates and infer predicates
@@ -312,6 +312,6 @@ pub fn check_explicit_predicates<'tcx>(
 
         let predicate = outlives_predicate.subst(tcx, substs);
         debug!("predicate = {:?}", &predicate);
-        insert_outlives_predicate(tcx, predicate.0.into(), predicate.1, span, required_predicates);
+        insert_outlives_predicate(tcx, predicate.0, predicate.1, span, required_predicates);
     }
 }
diff --git a/src/librustc_typeck/outlives/mod.rs b/src/librustc_typeck/outlives/mod.rs
index 5198739109..f7b6e0fce5 100644
--- a/src/librustc_typeck/outlives/mod.rs
+++ b/src/librustc_typeck/outlives/mod.rs
@@ -25,7 +25,7 @@ fn inferred_outlives_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[(ty::Predicate
             hir::ItemKind::Struct(..) | hir::ItemKind::Enum(..) | hir::ItemKind::Union(..) => {
                 let crate_map = tcx.inferred_outlives_crate(LOCAL_CRATE);
 
-                let predicates = crate_map.predicates.get(&item_def_id).map(|p| *p).unwrap_or(&[]);
+                let predicates = crate_map.predicates.get(&item_def_id).copied().unwrap_or(&[]);
 
                 if tcx.has_attr(item_def_id, sym::rustc_outlives) {
                     let mut pred: Vec<String> = predicates
diff --git a/src/librustc_typeck/outlives/utils.rs b/src/librustc_typeck/outlives/utils.rs
index 2d7fc9d62e..0cc322f8c2 100644
--- a/src/librustc_typeck/outlives/utils.rs
+++ b/src/librustc_typeck/outlives/utils.rs
@@ -166,7 +166,7 @@ fn is_free_region(tcx: TyCtxt<'_>, region: Region<'_>) -> bool {
         //
         //     struct Bar<T>(<Self as Foo>::Type) where Self: ;
         //     struct Baz<'a>(&'a Self) where Self: ;
-        RegionKind::ReEmpty => false,
+        RegionKind::ReEmpty(_) => false,
 
         // These regions don't appear in types from type declarations:
         RegionKind::ReErased
diff --git a/src/librustc_typeck/variance/constraints.rs b/src/librustc_typeck/variance/constraints.rs
index 5ca961ed34..6f5caea250 100644
--- a/src/librustc_typeck/variance/constraints.rs
+++ b/src/librustc_typeck/variance/constraints.rs
@@ -453,7 +453,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
             | ty::ReScope(..)
             | ty::ReVar(..)
             | ty::RePlaceholder(..)
-            | ty::ReEmpty
+            | ty::ReEmpty(_)
             | ty::ReErased => {
                 // We don't expect to see anything but 'static or bound
                 // regions when visiting member types or method types.
diff --git a/src/librustc_typeck/variance/mod.rs b/src/librustc_typeck/variance/mod.rs
index 27dc03bbbe..ddde11b384 100644
--- a/src/librustc_typeck/variance/mod.rs
+++ b/src/librustc_typeck/variance/mod.rs
@@ -3,7 +3,6 @@
 //!
 //! [rustc guide]: https://rust-lang.github.io/rustc-guide/variance.html
 
-use arena;
 use hir::Node;
 use rustc::ty::query::Providers;
 use rustc::ty::{self, CrateVariancesMap, TyCtxt};
@@ -80,5 +79,5 @@ fn variances_of(tcx: TyCtxt<'_>, item_def_id: DefId) -> &[ty::Variance] {
     // Everything else must be inferred.
 
     let crate_map = tcx.crate_variances(LOCAL_CRATE);
-    crate_map.variances.get(&item_def_id).map(|p| *p).unwrap_or(&[])
+    crate_map.variances.get(&item_def_id).copied().unwrap_or(&[])
 }
diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml
index 74e46b1eae..4af13e4cd5 100644
--- a/src/librustdoc/Cargo.toml
+++ b/src/librustdoc/Cargo.toml
@@ -9,7 +9,7 @@ name = "rustdoc"
 path = "lib.rs"
 
 [dependencies]
-pulldown-cmark = { version = "0.5.3", default-features = false }
+pulldown-cmark = { version = "0.7", default-features = false }
 minifier = "0.0.33"
 rayon = { version = "0.3.0", package = "rustc-rayon" }
 serde = { version = "1.0", features = ["derive"] }
diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs
index 8edd0591c8..407b50382f 100644
--- a/src/librustdoc/clean/auto_trait.rs
+++ b/src/librustdoc/clean/auto_trait.rs
@@ -1,7 +1,7 @@
-use rustc::traits::auto_trait::{self, AutoTraitResult};
 use rustc::ty::{self, Region, RegionVid, TypeFoldable};
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
+use rustc_infer::traits::auto_trait::{self, AutoTraitResult};
 
 use std::fmt::Debug;
 
@@ -493,7 +493,7 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> {
                     // Writing a projection trait bound of the form
                     // <T as Trait>::Name : ?Sized
                     // is illegal, because ?Sized bounds can only
-                    // be written in the (here, nonexistant) definition
+                    // be written in the (here, nonexistent) definition
                     // of the type.
                     // Therefore, we make sure that we never add a ?Sized
                     // bound for projections
diff --git a/src/librustdoc/clean/blanket_impl.rs b/src/librustdoc/clean/blanket_impl.rs
index 18ebd25450..4a1e2570d0 100644
--- a/src/librustdoc/clean/blanket_impl.rs
+++ b/src/librustdoc/clean/blanket_impl.rs
@@ -1,9 +1,9 @@
-use rustc::infer::InferOk;
-use rustc::traits;
 use rustc::ty::subst::Subst;
 use rustc::ty::{ToPredicate, WithConstness};
 use rustc_hir as hir;
 use rustc_hir::def_id::LOCAL_CRATE;
+use rustc_infer::infer::{InferOk, TyCtxtInferExt};
+use rustc_infer::traits;
 use rustc_span::DUMMY_SP;
 
 use super::*;
@@ -87,7 +87,6 @@ impl<'a, 'tcx> BlanketImplFinder<'a, 'tcx> {
                     .cx
                     .tcx
                     .provided_trait_methods(trait_def_id)
-                    .into_iter()
                     .map(|meth| meth.ident.to_string())
                     .collect();
 
@@ -115,6 +114,7 @@ impl<'a, 'tcx> BlanketImplFinder<'a, 'tcx> {
                             .cx
                             .tcx
                             .associated_items(impl_def_id)
+                            .in_definition_order()
                             .collect::<Vec<_>>()
                             .clean(self.cx),
                         polarity: None,
diff --git a/src/librustdoc/clean/cfg.rs b/src/librustdoc/clean/cfg.rs
index 84e6ff648a..775d600fc3 100644
--- a/src/librustdoc/clean/cfg.rs
+++ b/src/librustdoc/clean/cfg.rs
@@ -7,10 +7,10 @@ use std::fmt::{self, Write};
 use std::mem;
 use std::ops;
 
+use rustc_ast::ast::{LitKind, MetaItem, MetaItemKind, NestedMetaItem};
 use rustc_feature::Features;
+use rustc_session::parse::ParseSess;
 use rustc_span::symbol::{sym, Symbol};
-use syntax::ast::{LitKind, MetaItem, MetaItemKind, NestedMetaItem};
-use syntax::sess::ParseSess;
 
 use rustc_span::Span;
 
diff --git a/src/librustdoc/clean/cfg/tests.rs b/src/librustdoc/clean/cfg/tests.rs
index d090bf3250..3b26742e71 100644
--- a/src/librustdoc/clean/cfg/tests.rs
+++ b/src/librustdoc/clean/cfg/tests.rs
@@ -1,10 +1,10 @@
 use super::*;
 
+use rustc_ast::ast::*;
+use rustc_ast::attr;
+use rustc_ast::with_default_globals;
 use rustc_span::symbol::Symbol;
 use rustc_span::DUMMY_SP;
-use syntax::ast::*;
-use syntax::attr;
-use syntax::with_default_globals;
 
 fn word_cfg(s: &str) -> Cfg {
     Cfg::Cfg(Symbol::intern(s), None)
diff --git a/src/librustdoc/clean/inline.rs b/src/librustdoc/clean/inline.rs
index 8a6abe036d..7cb870ae70 100644
--- a/src/librustdoc/clean/inline.rs
+++ b/src/librustdoc/clean/inline.rs
@@ -3,6 +3,7 @@
 use std::iter::once;
 
 use rustc::ty;
+use rustc_ast::ast;
 use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};
@@ -13,7 +14,6 @@ use rustc_mir::const_eval::is_min_const_fn;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::symbol::sym;
 use rustc_span::Span;
-use syntax::ast;
 
 use crate::clean::{self, GetDefId, ToSource, TypeKind};
 use crate::core::DocContext;
@@ -190,13 +190,14 @@ pub fn record_extern_fqn(cx: &DocContext<'_>, did: DefId, kind: clean::TypeKind)
 }
 
 pub fn build_external_trait(cx: &DocContext<'_>, did: DefId) -> clean::Trait {
+    let trait_items =
+        cx.tcx.associated_items(did).in_definition_order().map(|item| item.clean(cx)).collect();
+
     let auto_trait = cx.tcx.trait_def(did).has_auto_impl;
-    let trait_items = cx.tcx.associated_items(did).map(|item| item.clean(cx)).collect();
     let predicates = cx.tcx.predicates_of(did);
     let generics = (cx.tcx.generics_of(did), predicates).clean(cx);
     let generics = filter_non_trait_generics(did, generics);
     let (generics, supertrait_bounds) = separate_supertrait_bounds(generics);
-    let is_spotlight = load_attrs(cx, did).clean(cx).has_doc_flag(sym::spotlight);
     let is_auto = cx.tcx.trait_is_auto(did);
     clean::Trait {
         auto: auto_trait,
@@ -204,7 +205,6 @@ pub fn build_external_trait(cx: &DocContext<'_>, did: DefId) -> clean::Trait {
         generics,
         items: trait_items,
         bounds: supertrait_bounds,
-        is_spotlight,
         is_auto,
     }
 }
@@ -376,6 +376,7 @@ pub fn build_impl(
     } else {
         (
             tcx.associated_items(did)
+                .in_definition_order()
                 .filter_map(|item| {
                     if associated_trait.is_some() || item.vis == ty::Visibility::Public {
                         Some(item.clean(cx))
@@ -401,9 +402,7 @@ pub fn build_impl(
 
     let provided = trait_
         .def_id()
-        .map(|did| {
-            tcx.provided_trait_methods(did).into_iter().map(|meth| meth.ident.to_string()).collect()
-        })
+        .map(|did| tcx.provided_trait_methods(did).map(|meth| meth.ident.to_string()).collect())
         .unwrap_or_default();
 
     debug!("build_impl: impl {:?} for {:?}", trait_.def_id(), for_.def_id());
@@ -445,12 +444,41 @@ fn build_module(cx: &DocContext<'_>, did: DefId, visited: &mut FxHashSet<DefId>)
         // two namespaces, so the target may be listed twice. Make sure we only
         // visit each node at most once.
         for &item in cx.tcx.item_children(did).iter() {
-            let def_id = item.res.def_id();
             if item.vis == ty::Visibility::Public {
-                if did == def_id || !visited.insert(def_id) {
-                    continue;
+                if let Some(def_id) = item.res.mod_def_id() {
+                    if did == def_id || !visited.insert(def_id) {
+                        continue;
+                    }
                 }
-                if let Some(i) = try_inline(cx, item.res, item.ident.name, None, visited) {
+                if let Res::PrimTy(p) = item.res {
+                    // Primitive types can't be inlined so generate an import instead.
+                    items.push(clean::Item {
+                        name: None,
+                        attrs: clean::Attributes::default(),
+                        source: clean::Span::empty(),
+                        def_id: cx.tcx.hir().local_def_id_from_node_id(ast::CRATE_NODE_ID),
+                        visibility: clean::Public,
+                        stability: None,
+                        deprecation: None,
+                        inner: clean::ImportItem(clean::Import::Simple(
+                            item.ident.to_string(),
+                            clean::ImportSource {
+                                path: clean::Path {
+                                    global: false,
+                                    res: item.res,
+                                    segments: vec![clean::PathSegment {
+                                        name: clean::PrimitiveType::from(p).as_str().to_string(),
+                                        args: clean::GenericArgs::AngleBracketed {
+                                            args: Vec::new(),
+                                            bindings: Vec::new(),
+                                        },
+                                    }],
+                                },
+                                did: None,
+                            },
+                        )),
+                    });
+                } else if let Some(i) = try_inline(cx, item.res, item.ident.name, None, visited) {
                     items.extend(i)
                 }
             }
diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index 281306cc0c..b28f189992 100644
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -9,25 +9,25 @@ mod simplify;
 pub mod types;
 pub mod utils;
 
-use rustc::infer::region_constraints::{Constraint, RegionConstraintData};
 use rustc::middle::lang_items;
 use rustc::middle::resolve_lifetime as rl;
 use rustc::middle::stability;
 use rustc::ty::fold::TypeFolder;
 use rustc::ty::subst::InternalSubsts;
 use rustc::ty::{self, AdtKind, Lift, Ty, TyCtxt};
+use rustc_ast::ast::{self, Ident};
+use rustc_attr as attr;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};
 use rustc_hir::def_id::{CrateNum, DefId, CRATE_DEF_INDEX};
 use rustc_index::vec::{Idx, IndexVec};
+use rustc_infer::infer::region_constraints::{Constraint, RegionConstraintData};
 use rustc_mir::const_eval::is_min_const_fn;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{self, Pos};
 use rustc_typeck::hir_ty_to_ty;
-use syntax::ast::{self, Ident};
-use syntax::attr;
 
 use std::collections::hash_map::Entry;
 use std::default::Default;
@@ -43,14 +43,14 @@ use utils::*;
 
 pub use utils::{get_auto_trait_and_blanket_impls, krate, register_res};
 
-pub use self::types::FunctionRetTy::*;
+pub use self::types::FnRetTy::*;
 pub use self::types::ItemEnum::*;
 pub use self::types::SelfTy::*;
 pub use self::types::Type::*;
 pub use self::types::Visibility::{Inherited, Public};
 pub use self::types::*;
 
-const FN_OUTPUT_NAME: &'static str = "Output";
+const FN_OUTPUT_NAME: &str = "Output";
 
 pub trait Clean<T> {
     fn clean(&self, cx: &DocContext<'_>) -> T;
@@ -263,9 +263,9 @@ impl Clean<Item> for doctree::Module<'_> {
         // determine if we should display the inner contents or
         // the outer `mod` item for the source code.
         let whence = {
-            let cm = cx.sess().source_map();
-            let outer = cm.lookup_char_pos(self.where_outer.lo());
-            let inner = cm.lookup_char_pos(self.where_inner.lo());
+            let sm = cx.sess().source_map();
+            let outer = sm.lookup_char_pos(self.where_outer.lo());
+            let inner = sm.lookup_char_pos(self.where_inner.lo());
             if outer.file.start_pos == inner.file.start_pos {
                 // mod foo { ... }
                 self.where_outer
@@ -398,7 +398,7 @@ impl Clean<Lifetime> for hir::GenericParam<'_> {
     fn clean(&self, _: &DocContext<'_>) -> Lifetime {
         match self.kind {
             hir::GenericParamKind::Lifetime { .. } => {
-                if self.bounds.len() > 0 {
+                if !self.bounds.is_empty() {
                     let mut bounds = self.bounds.iter().map(|bound| match bound {
                         hir::GenericBound::Outlives(lt) => lt,
                         _ => panic!(),
@@ -447,7 +447,7 @@ impl Clean<Option<Lifetime>> for ty::RegionKind {
             | ty::ReScope(..)
             | ty::ReVar(..)
             | ty::RePlaceholder(..)
-            | ty::ReEmpty
+            | ty::ReEmpty(_)
             | ty::ReClosureBound(_)
             | ty::ReErased => {
                 debug!("cannot clean region {:?}", self);
@@ -521,7 +521,7 @@ impl<'tcx> Clean<Option<WherePredicate>>
         let ty::OutlivesPredicate(ref a, ref b) = *self;
 
         match (a, b) {
-            (ty::ReEmpty, ty::ReEmpty) => {
+            (ty::ReEmpty(_), ty::ReEmpty(_)) => {
                 return None;
             }
             _ => {}
@@ -539,7 +539,7 @@ impl<'tcx> Clean<Option<WherePredicate>> for ty::OutlivesPredicate<Ty<'tcx>, ty:
         let ty::OutlivesPredicate(ref ty, ref lt) = *self;
 
         match lt {
-            ty::ReEmpty => return None,
+            ty::ReEmpty(_) => return None,
             _ => {}
         }
 
@@ -607,7 +607,7 @@ impl Clean<GenericParamDef> for hir::GenericParam<'_> {
     fn clean(&self, cx: &DocContext<'_>) -> GenericParamDef {
         let (name, kind) = match self.kind {
             hir::GenericParamKind::Lifetime { .. } => {
-                let name = if self.bounds.len() > 0 {
+                let name = if !self.bounds.is_empty() {
                     let mut bounds = self.bounds.iter().map(|bound| match bound {
                         hir::GenericBound::Outlives(lt) => lt,
                         _ => panic!(),
@@ -1001,8 +1001,8 @@ impl<'tcx> Clean<FnDecl> for (DefId, ty::PolyFnSig<'tcx>) {
     }
 }
 
-impl Clean<FunctionRetTy> for hir::FunctionRetTy<'_> {
-    fn clean(&self, cx: &DocContext<'_>) -> FunctionRetTy {
+impl Clean<FnRetTy> for hir::FnRetTy<'_> {
+    fn clean(&self, cx: &DocContext<'_>) -> FnRetTy {
         match *self {
             Self::Return(ref typ) => Return(typ.clean(cx)),
             Self::DefaultReturn(..) => DefaultReturn,
@@ -1013,7 +1013,6 @@ impl Clean<FunctionRetTy> for hir::FunctionRetTy<'_> {
 impl Clean<Item> for doctree::Trait<'_> {
     fn clean(&self, cx: &DocContext<'_>) -> Item {
         let attrs = self.attrs.clean(cx);
-        let is_spotlight = attrs.has_doc_flag(sym::spotlight);
         Item {
             name: Some(self.name.clean(cx)),
             attrs,
@@ -1028,7 +1027,6 @@ impl Clean<Item> for doctree::Trait<'_> {
                 items: self.items.iter().map(|ti| ti.clean(cx)).collect(),
                 generics: self.generics.clean(cx),
                 bounds: self.bounds.clean(cx),
-                is_spotlight,
                 is_auto: self.is_auto.clean(cx),
             }),
         }
@@ -1332,7 +1330,9 @@ impl Clean<Type> for hir::Ty<'_> {
             TyKind::Array(ref ty, ref length) => {
                 let def_id = cx.tcx.hir().local_def_id(length.hir_id);
                 let length = match cx.tcx.const_eval_poly(def_id) {
-                    Ok(length) => print_const(cx, length),
+                    Ok(length) => {
+                        print_const(cx, ty::Const::from_value(cx.tcx, length, cx.tcx.types.usize))
+                    }
                     Err(_) => cx
                         .sess()
                         .source_map()
@@ -1915,10 +1915,10 @@ impl Clean<Span> for rustc_span::Span {
             return Span::empty();
         }
 
-        let cm = cx.sess().source_map();
-        let filename = cm.span_to_filename(*self);
-        let lo = cm.lookup_char_pos(self.lo());
-        let hi = cm.lookup_char_pos(self.hi());
+        let sm = cx.sess().source_map();
+        let filename = sm.span_to_filename(*self);
+        let lo = sm.lookup_char_pos(self.lo());
+        let hi = sm.lookup_char_pos(self.hi());
         Span {
             filename,
             loline: lo.line,
@@ -2108,11 +2108,7 @@ impl Clean<Vec<Item>> for doctree::Impl<'_> {
         let provided: FxHashSet<String> = trait_
             .def_id()
             .map(|did| {
-                cx.tcx
-                    .provided_trait_methods(did)
-                    .into_iter()
-                    .map(|meth| meth.ident.to_string())
-                    .collect()
+                cx.tcx.provided_trait_methods(did).map(|meth| meth.ident.to_string()).collect()
             })
             .unwrap_or_default();
 
@@ -2390,9 +2386,9 @@ impl Clean<TypeBindingKind> for hir::TypeBindingKind<'_> {
             hir::TypeBindingKind::Equality { ref ty } => {
                 TypeBindingKind::Equality { ty: ty.clean(cx) }
             }
-            hir::TypeBindingKind::Constraint { ref bounds } => TypeBindingKind::Constraint {
-                bounds: bounds.into_iter().map(|b| b.clean(cx)).collect(),
-            },
+            hir::TypeBindingKind::Constraint { ref bounds } => {
+                TypeBindingKind::Constraint { bounds: bounds.iter().map(|b| b.clean(cx)).collect() }
+            }
         }
     }
 }
diff --git a/src/librustdoc/clean/types.rs b/src/librustdoc/clean/types.rs
index 79a078ca7a..b1aa094204 100644
--- a/src/librustdoc/clean/types.rs
+++ b/src/librustdoc/clean/types.rs
@@ -11,6 +11,9 @@ use std::{slice, vec};
 use rustc::middle::lang_items;
 use rustc::middle::stability;
 use rustc::ty::layout::VariantIdx;
+use rustc_ast::ast::{self, AttrStyle, Ident};
+use rustc_ast::attr;
+use rustc_ast::util::comments::strip_doc_comment_decoration;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def::Res;
@@ -22,9 +25,6 @@ use rustc_span::source_map::DUMMY_SP;
 use rustc_span::symbol::{sym, Symbol};
 use rustc_span::{self, FileName};
 use rustc_target::spec::abi::Abi;
-use syntax::ast::{self, AttrStyle, Ident};
-use syntax::attr;
-use syntax::util::comments::strip_doc_comment_decoration;
 
 use crate::clean::cfg::Cfg;
 use crate::clean::external_path;
@@ -35,7 +35,7 @@ use crate::doctree;
 use crate::html::item_type::ItemType;
 use crate::html::render::{cache, ExternalLocation};
 
-use self::FunctionRetTy::*;
+use self::FnRetTy::*;
 use self::ItemEnum::*;
 use self::SelfTy::*;
 use self::Type::*;
@@ -201,7 +201,7 @@ impl Item {
                 classes.push("deprecated");
             }
 
-            if classes.len() != 0 { Some(classes.join(" ")) } else { None }
+            if !classes.is_empty() { Some(classes.join(" ")) } else { None }
         })
     }
 
@@ -421,7 +421,7 @@ pub struct Attributes {
 impl Attributes {
     /// Extracts the content from an attribute `#[doc(cfg(content))]`.
     pub fn extract_cfg(mi: &ast::MetaItem) -> Option<&ast::MetaItem> {
-        use syntax::ast::NestedMetaItem::MetaItem;
+        use rustc_ast::ast::NestedMetaItem::MetaItem;
 
         if let ast::MetaItemKind::List(ref nmis) = mi.kind {
             if nmis.len() == 1 {
@@ -565,8 +565,7 @@ impl Attributes {
 
         let inner_docs = attrs
             .iter()
-            .filter(|a| a.doc_str().is_some())
-            .next()
+            .find(|a| a.doc_str().is_some())
             .map_or(true, |a| a.style == AttrStyle::Inner);
 
         Attributes {
@@ -862,7 +861,7 @@ pub struct Function {
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub struct FnDecl {
     pub inputs: Arguments,
-    pub output: FunctionRetTy,
+    pub output: FnRetTy,
     pub c_variadic: bool,
     pub attrs: Attributes,
 }
@@ -881,12 +880,12 @@ impl FnDecl {
     ///
     /// This function will panic if the return type does not match the expected sugaring for async
     /// functions.
-    pub fn sugared_async_return_type(&self) -> FunctionRetTy {
+    pub fn sugared_async_return_type(&self) -> FnRetTy {
         match &self.output {
-            FunctionRetTy::Return(Type::ImplTrait(bounds)) => match &bounds[0] {
+            FnRetTy::Return(Type::ImplTrait(bounds)) => match &bounds[0] {
                 GenericBound::TraitBound(PolyTrait { trait_, .. }, ..) => {
                     let bindings = trait_.bindings().unwrap();
-                    FunctionRetTy::Return(bindings[0].ty().clone())
+                    FnRetTy::Return(bindings[0].ty().clone())
                 }
                 _ => panic!("unexpected desugaring of async function"),
             },
@@ -931,12 +930,12 @@ impl Argument {
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
-pub enum FunctionRetTy {
+pub enum FnRetTy {
     Return(Type),
     DefaultReturn,
 }
 
-impl GetDefId for FunctionRetTy {
+impl GetDefId for FnRetTy {
     fn def_id(&self) -> Option<DefId> {
         match *self {
             Return(ref ty) => ty.def_id(),
@@ -952,7 +951,6 @@ pub struct Trait {
     pub items: Vec<Item>,
     pub generics: Generics,
     pub bounds: Vec<GenericBound>,
-    pub is_spotlight: bool,
     pub is_auto: bool,
 }
 
@@ -1290,6 +1288,19 @@ impl From<ast::FloatTy> for PrimitiveType {
     }
 }
 
+impl From<hir::PrimTy> for PrimitiveType {
+    fn from(prim_ty: hir::PrimTy) -> PrimitiveType {
+        match prim_ty {
+            hir::PrimTy::Int(int_ty) => int_ty.into(),
+            hir::PrimTy::Uint(uint_ty) => uint_ty.into(),
+            hir::PrimTy::Float(float_ty) => float_ty.into(),
+            hir::PrimTy::Str => PrimitiveType::Str,
+            hir::PrimTy::Bool => PrimitiveType::Bool,
+            hir::PrimTy::Char => PrimitiveType::Char,
+        }
+    }
+}
+
 #[derive(Clone, PartialEq, Eq, Debug)]
 pub enum Visibility {
     Public,
diff --git a/src/librustdoc/clean/utils.rs b/src/librustdoc/clean/utils.rs
index 07381eddea..21e3d24cc9 100644
--- a/src/librustdoc/clean/utils.rs
+++ b/src/librustdoc/clean/utils.rs
@@ -1,7 +1,7 @@
 use crate::clean::auto_trait::AutoTraitFinder;
 use crate::clean::blanket_impl::BlanketImplFinder;
 use crate::clean::{
-    inline, Clean, Crate, Deprecation, ExternalCrate, FnDecl, FunctionRetTy, Generic, GenericArg,
+    inline, Clean, Crate, Deprecation, ExternalCrate, FnDecl, FnRetTy, Generic, GenericArg,
     GenericArgs, GenericBound, Generics, GetDefId, ImportSource, Item, ItemEnum, MacroKind, Path,
     PathSegment, Primitive, PrimitiveType, ResolvedPath, Span, Stability, Type, TypeBinding,
     TypeKind, Visibility, WherePredicate,
@@ -16,7 +16,6 @@ use rustc_data_structures::fx::FxHashSet;
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
-use rustc_span;
 use rustc_span::symbol::{kw, sym, Symbol};
 use std::mem;
 
@@ -39,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();
@@ -122,9 +121,7 @@ pub fn external_generic_args(
     let args: Vec<_> = substs
         .iter()
         .filter_map(|kind| match kind.unpack() {
-            GenericArgKind::Lifetime(lt) => {
-                lt.clean(cx).and_then(|lt| Some(GenericArg::Lifetime(lt)))
-            }
+            GenericArgKind::Lifetime(lt) => lt.clean(cx).map(|lt| GenericArg::Lifetime(lt)),
             GenericArgKind::Type(_) if skip_self => {
                 skip_self = false;
                 None
@@ -139,7 +136,7 @@ pub fn external_generic_args(
 
     match trait_did {
         // Attempt to sugar an external path like Fn<(A, B,), C> to Fn(A, B) -> C
-        Some(did) if cx.tcx.lang_items().fn_trait_kind(did).is_some() => {
+        Some(did) if cx.tcx.fn_trait_kind_from_lang_item(did).is_some() => {
             assert!(ty_kind.is_some());
             let inputs = match ty_kind {
                 Some(ty::Tuple(ref tys)) => tys.iter().map(|t| t.expect_ty().clean(cx)).collect(),
@@ -274,7 +271,7 @@ pub fn get_all_types(
     }
 
     let ret_types = match decl.output {
-        FunctionRetTy::Return(ref return_type) => {
+        FnRetTy::Return(ref return_type) => {
             let mut ret = get_real_types(generics, &return_type, cx, 0);
             if ret.is_empty() {
                 ret.insert(return_type.clone());
@@ -458,7 +455,7 @@ pub fn name_from_pat(p: &hir::Pat) -> String {
     }
 }
 
-pub fn print_const(cx: &DocContext<'_>, n: &ty::Const<'_>) -> String {
+pub fn print_const(cx: &DocContext<'_>, n: &'tcx ty::Const<'_>) -> String {
     match n.val {
         ty::ConstKind::Unevaluated(def_id, _, promoted) => {
             let mut s = if let Some(hir_id) = cx.tcx.hir().as_local_hir_id(def_id) {
@@ -488,15 +485,18 @@ pub fn print_const(cx: &DocContext<'_>, n: &ty::Const<'_>) -> String {
 }
 
 pub fn print_evaluated_const(cx: &DocContext<'_>, def_id: DefId) -> Option<String> {
-    let value =
-        cx.tcx.const_eval_poly(def_id).ok().and_then(|value| match (value.val, &value.ty.kind) {
-            (_, ty::Ref(..)) => None,
-            (ty::ConstKind::Value(ConstValue::Scalar(_)), ty::Adt(_, _)) => None,
-            (ty::ConstKind::Value(ConstValue::Scalar(_)), _) => {
-                Some(print_const_with_custom_print_scalar(cx, value))
+    let value = cx.tcx.const_eval_poly(def_id).ok().and_then(|val| {
+        let ty = cx.tcx.type_of(def_id);
+        match (val, &ty.kind) {
+            (_, &ty::Ref(..)) => None,
+            (ConstValue::Scalar(_), &ty::Adt(_, _)) => None,
+            (ConstValue::Scalar(_), _) => {
+                let const_ = ty::Const::from_value(cx.tcx, val, ty);
+                Some(print_const_with_custom_print_scalar(cx, const_))
             }
             _ => None,
-        });
+        }
+    });
 
     value
 }
@@ -570,14 +570,7 @@ pub fn resolve_type(cx: &DocContext<'_>, path: Path, id: hir::HirId) -> Type {
     }
 
     let is_generic = match path.res {
-        Res::PrimTy(p) => match p {
-            hir::PrimTy::Str => return Primitive(PrimitiveType::Str),
-            hir::PrimTy::Bool => return Primitive(PrimitiveType::Bool),
-            hir::PrimTy::Char => return Primitive(PrimitiveType::Char),
-            hir::PrimTy::Int(int_ty) => return Primitive(int_ty.into()),
-            hir::PrimTy::Uint(uint_ty) => return Primitive(uint_ty.into()),
-            hir::PrimTy::Float(float_ty) => return Primitive(float_ty.into()),
-        },
+        Res::PrimTy(p) => return Primitive(PrimitiveType::from(p)),
         Res::SelfTy(..) if path.segments.len() == 1 => {
             return Generic(kw::SelfUpper.to_string());
         }
diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 22f5d0dc2c..33b3e80037 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -3,7 +3,6 @@ use std::ffi::OsStr;
 use std::fmt;
 use std::path::PathBuf;
 
-use getopts;
 use rustc::lint::Level;
 use rustc::session;
 use rustc::session::config::{
@@ -13,7 +12,6 @@ use rustc::session::config::{
 use rustc::session::config::{parse_crate_types_from_list, parse_externs, CrateType};
 use rustc::session::config::{CodegenOptions, DebuggingOptions, ErrorOutputType, Externs};
 use rustc::session::search_paths::SearchPath;
-use rustc_driver;
 use rustc_span::edition::{Edition, DEFAULT_EDITION};
 use rustc_target::spec::TargetTriple;
 
@@ -572,7 +570,10 @@ fn check_deprecated_options(matches: &getopts::Matches, diag: &rustc_errors::Han
         if matches.opt_present(flag) {
             let mut err =
                 diag.struct_warn(&format!("the '{}' flag is considered deprecated", flag));
-            err.warn("please see https://github.com/rust-lang/rust/issues/44136");
+            err.warn(
+                "see issue #44136 <https://github.com/rust-lang/rust/issues/44136> \
+                 for more information",
+            );
 
             if *flag == "no-defaults" {
                 err.help("you may want to use --document-private-items");
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 1c0e0b3bf4..8bc34e949f 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -11,17 +11,16 @@ use rustc_hir::def::Namespace::TypeNS;
 use rustc_hir::def_id::{CrateNum, DefId, DefIndex, LOCAL_CRATE};
 use rustc_hir::HirId;
 use rustc_interface::interface;
-use rustc_lint;
 use rustc_resolve as resolve;
 use rustc_session::lint;
 
+use rustc_ast::ast::CRATE_NODE_ID;
+use rustc_attr as attr;
 use rustc_errors::emitter::{Emitter, EmitterWriter};
 use rustc_errors::json::JsonEmitter;
 use rustc_span::source_map;
 use rustc_span::symbol::sym;
 use rustc_span::DUMMY_SP;
-use syntax::ast::CRATE_NODE_ID;
-use syntax::attr;
 
 use rustc_data_structures::sync::{self, Lrc};
 use std::cell::RefCell;
@@ -178,7 +177,7 @@ pub fn new_handler(
             Box::new(
                 EmitterWriter::stderr(
                     color_config,
-                    source_map.map(|cm| cm as _),
+                    source_map.map(|sm| sm as _),
                     short,
                     debugging_opts.teach,
                     debugging_opts.terminal_width,
@@ -284,7 +283,7 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
         .filter_map(|lint| {
             // We don't want to whitelist *all* lints so let's
             // ignore those ones.
-            if whitelisted_lints.iter().any(|l| &lint.name == l) {
+            if whitelisted_lints.iter().any(|l| lint.name == l) {
                 None
             } else {
                 Some((lint::LintId::of(lint), lint::Allow))
@@ -417,7 +416,10 @@ pub fn run_core(options: RustdocOptions) -> (clean::Crate, RenderInfo, RenderOpt
                                                          considered deprecated",
                         name
                     ));
-                    msg.warn("please see https://github.com/rust-lang/rust/issues/44136");
+                    msg.warn(
+                        "see issue #44136 <https://github.com/rust-lang/rust/issues/44136> \
+                         for more information",
+                    );
 
                     if name == "no_default_passes" {
                         msg.help("you may want to use `#![doc(document_private_items)]`");
diff --git a/src/librustdoc/docfs.rs b/src/librustdoc/docfs.rs
index ecc394a2bc..9c9a00295c 100644
--- a/src/librustdoc/docfs.rs
+++ b/src/librustdoc/docfs.rs
@@ -90,14 +90,14 @@ impl DocFS {
             let sender = self.errors.sender.clone().unwrap();
             rayon::spawn(move || match fs::write(&path, &contents) {
                 Ok(_) => {
-                    sender
-                        .send(None)
-                        .expect(&format!("failed to send error on \"{}\"", path.display()));
+                    sender.send(None).unwrap_or_else(|_| {
+                        panic!("failed to send error on \"{}\"", path.display())
+                    });
                 }
                 Err(e) => {
-                    sender
-                        .send(Some(format!("\"{}\": {}", path.display(), e)))
-                        .expect(&format!("failed to send non-error on \"{}\"", path.display()));
+                    sender.send(Some(format!("\"{}\": {}", path.display(), e))).unwrap_or_else(
+                        |_| panic!("failed to send non-error on \"{}\"", path.display()),
+                    );
                 }
             });
             Ok(())
diff --git a/src/librustdoc/doctree.rs b/src/librustdoc/doctree.rs
index 218674b757..41b8e66d26 100644
--- a/src/librustdoc/doctree.rs
+++ b/src/librustdoc/doctree.rs
@@ -2,10 +2,10 @@
 //! manner (and with prettier names) before cleaning.
 pub use self::StructType::*;
 
+use rustc_ast::ast;
+use rustc_ast::ast::Name;
 use rustc_span::hygiene::MacroKind;
 use rustc_span::{self, Span};
-use syntax::ast;
-use syntax::ast::Name;
 
 use rustc_hir as hir;
 use rustc_hir::def_id::CrateNum;
@@ -44,7 +44,7 @@ impl Module<'hir> {
         vis: &'hir hir::Visibility<'hir>,
     ) -> Module<'hir> {
         Module {
-            name: name,
+            name,
             id: hir::CRATE_HIR_ID,
             vis,
             where_outer: rustc_span::DUMMY_SP,
@@ -203,7 +203,7 @@ pub struct Impl<'hir> {
     pub unsafety: hir::Unsafety,
     pub polarity: hir::ImplPolarity,
     pub defaultness: hir::Defaultness,
-    pub constness: ast::Constness,
+    pub constness: hir::Constness,
     pub generics: &'hir hir::Generics<'hir>,
     pub trait_: &'hir Option<hir::TraitRef<'hir>>,
     pub for_: &'hir hir::Ty<'hir>,
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
index 79923fc3d3..e60ff37fd2 100644
--- a/src/librustdoc/html/format.rs
+++ b/src/librustdoc/html/format.rs
@@ -63,22 +63,10 @@ impl Buffer {
         Buffer { for_html: false, buffer: String::new() }
     }
 
-    crate fn is_empty(&self) -> bool {
-        self.buffer.is_empty()
-    }
-
     crate fn into_inner(self) -> String {
         self.buffer
     }
 
-    crate fn insert_str(&mut self, idx: usize, s: &str) {
-        self.buffer.insert_str(idx, s);
-    }
-
-    crate fn push_str(&mut self, s: &str) {
-        self.buffer.push_str(s);
-    }
-
     // Intended for consumption by write! and writeln! (std::fmt) but without
     // the fmt::Result return type imposed by fmt::Write (and avoiding the trait
     // import).
@@ -933,7 +921,7 @@ impl clean::Arguments {
     }
 }
 
-impl clean::FunctionRetTy {
+impl clean::FnRetTy {
     crate fn print(&self) -> impl fmt::Display + '_ {
         display_fn(move |f| match self {
             clean::Return(clean::Tuple(tys)) if tys.is_empty() => Ok(()),
@@ -1171,11 +1159,14 @@ impl clean::ImportSource {
         display_fn(move |f| match self.did {
             Some(did) => resolved_path(f, did, &self.path, true, false),
             _ => {
-                for (i, seg) in self.path.segments.iter().enumerate() {
-                    if i > 0 {
-                        write!(f, "::")?
-                    }
-                    write!(f, "{}", seg.name)?;
+                for seg in &self.path.segments[..self.path.segments.len() - 1] {
+                    write!(f, "{}::", seg.name)?;
+                }
+                let name = self.path.last_name();
+                if let hir::def::Res::PrimTy(p) = self.path.res {
+                    primitive_link(f, PrimitiveType::from(p), name)?;
+                } else {
+                    write!(f, "{}", name)?;
                 }
                 Ok(())
             }
diff --git a/src/librustdoc/html/highlight.rs b/src/librustdoc/html/highlight.rs
index 5bea1b5614..02f1947c99 100644
--- 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.
@@ -11,18 +11,18 @@ use std::fmt::Display;
 use std::io;
 use std::io::prelude::*;
 
+use rustc_ast::token::{self, Token};
 use rustc_parse::lexer;
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::SourceMap;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{FileName, Span};
-use syntax::sess::ParseSess;
-use syntax::token::{self, Token};
 
 /// Highlights `src`, returning the HTML output.
 pub fn render_with_highlighting(
     src: &str,
     class: Option<&str>,
-    extension: Option<&str>,
+    playground_button: Option<&str>,
     tooltip: Option<(&str, &str)>,
 ) -> String {
     debug!("highlighting: ================\n{}\n==============", src);
@@ -38,11 +38,11 @@ pub fn render_with_highlighting(
     }
 
     let sess = ParseSess::with_silent_emitter();
-    let fm = sess
+    let sf = sess
         .source_map()
         .new_source_file(FileName::Custom(String::from("rustdoc-highlighting")), src.to_owned());
     let highlight_result = rustc_driver::catch_fatal_errors(|| {
-        let lexer = lexer::StringReader::new(&sess, fm, None);
+        let lexer = lexer::StringReader::new(&sess, sf, None);
         let mut classifier = Classifier::new(lexer, sess.source_map());
 
         let mut highlighted_source = vec![];
@@ -58,10 +58,7 @@ pub fn render_with_highlighting(
         Ok(highlighted_source) => {
             write_header(class, &mut out).unwrap();
             write!(out, "{}", highlighted_source).unwrap();
-            if let Some(extension) = extension {
-                write!(out, "{}", extension).unwrap();
-            }
-            write_footer(&mut out).unwrap();
+            write_footer(&mut out, playground_button).unwrap();
         }
         Err(()) => {
             // If errors are encountered while trying to highlight, just emit
@@ -138,7 +135,7 @@ trait Writer {
     fn string<T: Display>(&mut self, text: T, klass: Class) -> io::Result<()>;
 }
 
-// Implement `Writer` for anthing that can be written to, this just implements
+// Implement `Writer` for anything that can be written to, this just implements
 // the default rustdoc behaviour.
 impl<U: Write> Writer for U {
     fn string<T: Display>(&mut self, text: T, klass: Class) -> io::Result<()> {
@@ -433,6 +430,6 @@ fn write_header(class: Option<&str>, out: &mut dyn Write) -> io::Result<()> {
     write!(out, "<div class=\"example-wrap\"><pre class=\"rust {}\">\n", class.unwrap_or(""))
 }
 
-fn write_footer(out: &mut dyn Write) -> io::Result<()> {
-    write!(out, "</pre></div>\n")
+fn write_footer(out: &mut dyn Write, playground_button: Option<&str>) -> io::Result<()> {
+    write!(out, "</pre>{}</div>\n", if let Some(button) = playground_button { button } else { "" })
 }
diff --git a/src/librustdoc/html/item_type.rs b/src/librustdoc/html/item_type.rs
index 4a0f4e5a4c..0b2b0cdc18 100644
--- a/src/librustdoc/html/item_type.rs
+++ b/src/librustdoc/html/item_type.rs
@@ -62,7 +62,7 @@ impl<'a> From<&'a clean::Item> for ItemType {
     fn from(item: &'a clean::Item) -> ItemType {
         let inner = match item.inner {
             clean::StrippedItem(box ref item) => item,
-            ref inner @ _ => inner,
+            ref inner => inner,
         };
 
         match *inner {
@@ -194,7 +194,7 @@ impl fmt::Display for ItemType {
     }
 }
 
-pub const NAMESPACE_TYPE: &'static str = "t";
-pub const NAMESPACE_VALUE: &'static str = "v";
-pub const NAMESPACE_MACRO: &'static str = "m";
-pub const NAMESPACE_KEYWORD: &'static str = "k";
+pub const NAMESPACE_TYPE: &str = "t";
+pub const NAMESPACE_VALUE: &str = "v";
+pub const NAMESPACE_MACRO: &str = "m";
+pub const NAMESPACE_KEYWORD: &str = "k";
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index c87964af02..42529a6682 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -33,7 +33,7 @@ use crate::html::highlight;
 use crate::html::toc::TocBuilder;
 use crate::test;
 
-use pulldown_cmark::{html, CowStr, Event, Options, Parser, Tag};
+use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, Options, Parser, Tag};
 
 #[cfg(test)]
 mod tests;
@@ -189,10 +189,15 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'_, 'a, I> {
         let compile_fail;
         let ignore;
         let edition;
-        if let Some(Event::Start(Tag::CodeBlock(lang))) = event {
-            let parse_result = LangString::parse(&lang, self.check_error_codes, false);
+        if let Some(Event::Start(Tag::CodeBlock(kind))) = event {
+            let parse_result = match kind {
+                CodeBlockKind::Fenced(ref lang) => {
+                    LangString::parse(&lang, self.check_error_codes, false)
+                }
+                CodeBlockKind::Indented => LangString::all_false(),
+            };
             if !parse_result.rust {
-                return Some(Event::Start(Tag::CodeBlock(lang)));
+                return Some(Event::Start(Tag::CodeBlock(kind)));
             }
             compile_fail = parse_result.compile_fail;
             ignore = parse_result.ignore;
@@ -291,7 +296,7 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'_, 'a, I> {
                         ""
                     }
                 )),
-                playground_button.as_ref().map(String::as_str),
+                playground_button.as_deref(),
                 Some((s1.as_str(), s2)),
             ));
             Some(Event::Html(s.into()))
@@ -310,7 +315,7 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'_, 'a, I> {
                         ""
                     }
                 )),
-                playground_button.as_ref().map(String::as_str),
+                playground_button.as_deref(),
                 None,
             ));
             Some(Event::Html(s.into()))
@@ -370,11 +375,11 @@ impl<'a, 'b, 'ids, I: Iterator<Item = Event<'a>>> Iterator for HeadingLinks<'a,
         }
 
         let event = self.inner.next();
-        if let Some(Event::Start(Tag::Header(level))) = event {
+        if let Some(Event::Start(Tag::Heading(level))) = event {
             let mut id = String::new();
             for event in &mut self.inner {
                 match &event {
-                    Event::End(Tag::Header(..)) => break,
+                    Event::End(Tag::Heading(..)) => break,
                     Event::Text(text) | Event::Code(text) => {
                         id.extend(text.chars().filter_map(slugify));
                     }
@@ -391,10 +396,10 @@ impl<'a, 'b, 'ids, I: Iterator<Item = Event<'a>>> Iterator for HeadingLinks<'a,
                 let mut html_header = String::new();
                 html::push_html(&mut html_header, self.buf.iter().cloned());
                 let sec = builder.push(level as u32, html_header, id.clone());
-                self.buf.push_front(Event::InlineHtml(format!("{} ", sec).into()));
+                self.buf.push_front(Event::Html(format!("{} ", sec).into()));
             }
 
-            self.buf.push_back(Event::InlineHtml(format!("</a></h{}>", level).into()));
+            self.buf.push_back(Event::Html(format!("</a></h{}>", level).into()));
 
             let start_tags = format!(
                 "<h{level} id=\"{id}\" class=\"section-header\">\
@@ -402,7 +407,7 @@ impl<'a, 'b, 'ids, I: Iterator<Item = Event<'a>>> Iterator for HeadingLinks<'a,
                 id = id,
                 level = level
             );
-            return Some(Event::InlineHtml(start_tags.into()));
+            return Some(Event::Html(start_tags.into()));
         }
         event
     }
@@ -460,7 +465,7 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for SummaryLine<'a, I> {
                 }
                 _ => true,
             };
-            return if is_allowed_tag == false {
+            return if !is_allowed_tag {
                 if is_start {
                     Some(Event::Start(Tag::Paragraph))
                 } else {
@@ -556,40 +561,44 @@ pub fn find_testable_code<T: test::Tester>(
     error_codes: ErrorCodes,
     enable_per_target_ignores: bool,
 ) {
-    let mut parser = Parser::new(doc);
+    let mut parser = Parser::new(doc).into_offset_iter();
     let mut prev_offset = 0;
     let mut nb_lines = 0;
     let mut register_header = None;
-    while let Some(event) = parser.next() {
+    while let Some((event, offset)) = parser.next() {
         match event {
-            Event::Start(Tag::CodeBlock(s)) => {
-                let offset = parser.get_offset();
-
-                let block_info = if s.is_empty() {
-                    LangString::all_false()
-                } else {
-                    LangString::parse(&*s, error_codes, enable_per_target_ignores)
+            Event::Start(Tag::CodeBlock(kind)) => {
+                let block_info = match kind {
+                    CodeBlockKind::Fenced(ref lang) => {
+                        if lang.is_empty() {
+                            LangString::all_false()
+                        } else {
+                            LangString::parse(lang, error_codes, enable_per_target_ignores)
+                        }
+                    }
+                    CodeBlockKind::Indented => LangString::all_false(),
                 };
                 if !block_info.rust {
                     continue;
                 }
+
                 let mut test_s = String::new();
 
-                while let Some(Event::Text(s)) = parser.next() {
+                while let Some((Event::Text(s), _)) = parser.next() {
                     test_s.push_str(&s);
                 }
-
                 let text = test_s
                     .lines()
                     .map(|l| map_line(l).for_code())
                     .collect::<Vec<Cow<'_, str>>>()
                     .join("\n");
-                nb_lines += doc[prev_offset..offset].lines().count();
-                let line = tests.get_line() + nb_lines;
+
+                nb_lines += doc[prev_offset..offset.start].lines().count();
+                let line = tests.get_line() + nb_lines + 1;
                 tests.add_test(text, block_info, line);
-                prev_offset = offset;
+                prev_offset = offset.start;
             }
-            Event::Start(Tag::Header(level)) => {
+            Event::Start(Tag::Heading(level)) => {
                 register_header = Some(level as u32);
             }
             Event::Text(ref s) if register_header.is_some() => {
@@ -662,7 +671,7 @@ impl LangString {
                 "" => {}
                 "should_panic" => {
                     data.should_panic = true;
-                    seen_rust_tags = seen_other_tags == false;
+                    seen_rust_tags = !seen_other_tags;
                 }
                 "no_run" => {
                     data.no_run = true;
@@ -698,7 +707,7 @@ impl LangString {
                 x if x.starts_with("edition") => {
                     data.edition = x[7..].parse::<Edition>().ok();
                 }
-                x if allow_error_code_check && x.starts_with("E") && x.len() == 5 => {
+                x if allow_error_code_check && x.starts_with('E') && x.len() == 5 => {
                     if x[1..].parse::<u32>().is_ok() {
                         data.error_codes.push(x.to_owned());
                         seen_rust_tags = !seen_other_tags || seen_rust_tags;
@@ -729,7 +738,7 @@ impl Markdown<'_> {
             return String::new();
         }
         let replacer = |_: &str, s: &str| {
-            if let Some(&(_, ref replace)) = links.into_iter().find(|link| &*link.0 == s) {
+            if let Some(&(_, ref replace)) = links.iter().find(|link| &*link.0 == s) {
                 Some((replace.clone(), s.to_owned()))
             } else {
                 None
@@ -783,7 +792,7 @@ impl MarkdownHtml<'_> {
 
         // Treat inline HTML as plain text.
         let p = p.map(|event| match event {
-            Event::Html(text) | Event::InlineHtml(text) => Event::Text(text),
+            Event::Html(text) => Event::Text(text),
             _ => event,
         });
 
@@ -807,7 +816,7 @@ impl MarkdownSummaryLine<'_> {
         }
 
         let replacer = |_: &str, s: &str| {
-            if let Some(&(_, ref replace)) = links.into_iter().find(|link| &*link.0 == s) {
+            if let Some(&(_, ref replace)) = links.iter().find(|link| &*link.0 == s) {
                 Some((replace.clone(), s.to_owned()))
             } else {
                 None
@@ -842,10 +851,10 @@ pub fn plain_summary_line(md: &str) -> String {
             let next_event = next_event.unwrap();
             let (ret, is_in) = match next_event {
                 Event::Start(Tag::Paragraph) => (None, 1),
-                Event::Start(Tag::Header(_)) => (None, 1),
+                Event::Start(Tag::Heading(_)) => (None, 1),
                 Event::Code(code) => (Some(format!("`{}`", code)), 0),
                 Event::Text(ref s) if self.is_in > 0 => (Some(s.as_ref().to_owned()), 0),
-                Event::End(Tag::Paragraph) | Event::End(Tag::Header(_)) => (None, -1),
+                Event::End(Tag::Paragraph) | Event::End(Tag::Heading(_)) => (None, -1),
                 _ => (None, 0),
             };
             if is_in > 0 || (is_in < 0 && self.is_in > 0) {
@@ -860,12 +869,8 @@ pub fn plain_summary_line(md: &str) -> String {
         }
     }
     let mut s = String::with_capacity(md.len() * 3 / 2);
-    let mut p = ParserWrapper { inner: Parser::new(md), is_in: 0, is_first: true };
-    while let Some(t) = p.next() {
-        if !t.is_empty() {
-            s.push_str(&t);
-        }
-    }
+    let p = ParserWrapper { inner: Parser::new(md), is_in: 0, is_first: true };
+    p.into_iter().filter(|t| !t.is_empty()).for_each(|i| s.push_str(&i));
     s
 }
 
@@ -940,68 +945,79 @@ crate fn rust_code_blocks(md: &str) -> Vec<RustCodeBlock> {
         return code_blocks;
     }
 
-    let mut p = Parser::new_ext(md, opts());
-
-    let mut code_block_start = 0;
-    let mut code_start = 0;
-    let mut is_fenced = false;
-    let mut previous_offset = 0;
-    let mut in_rust_code_block = false;
-    while let Some(event) = p.next() {
-        let offset = p.get_offset();
+    let mut p = Parser::new_ext(md, opts()).into_offset_iter();
 
+    while let Some((event, offset)) = p.next() {
         match event {
             Event::Start(Tag::CodeBlock(syntax)) => {
-                let lang_string = if syntax.is_empty() {
-                    LangString::all_false()
-                } else {
-                    LangString::parse(&*syntax, ErrorCodes::Yes, false)
-                };
-
-                if lang_string.rust {
-                    in_rust_code_block = true;
-
-                    code_start = offset;
-                    code_block_start = match md[previous_offset..offset].find("```") {
-                        Some(fence_idx) => {
-                            is_fenced = true;
-                            previous_offset + fence_idx
+                let (syntax, code_start, code_end, range, is_fenced) = match syntax {
+                    CodeBlockKind::Fenced(syntax) => {
+                        let syntax = syntax.as_ref();
+                        let lang_string = if syntax.is_empty() {
+                            LangString::all_false()
+                        } else {
+                            LangString::parse(&*syntax, ErrorCodes::Yes, false)
+                        };
+                        if !lang_string.rust {
+                            continue;
                         }
-                        None => {
-                            is_fenced = false;
-                            offset
+                        let syntax = if syntax.is_empty() { None } else { Some(syntax.to_owned()) };
+                        let (code_start, mut code_end) = match p.next() {
+                            Some((Event::Text(_), offset)) => (offset.start, offset.end),
+                            Some((_, sub_offset)) => {
+                                let code = Range { start: sub_offset.start, end: sub_offset.start };
+                                code_blocks.push(RustCodeBlock {
+                                    is_fenced: true,
+                                    range: offset,
+                                    code,
+                                    syntax,
+                                });
+                                continue;
+                            }
+                            None => {
+                                let code = Range { start: offset.end, end: offset.end };
+                                code_blocks.push(RustCodeBlock {
+                                    is_fenced: true,
+                                    range: offset,
+                                    code,
+                                    syntax,
+                                });
+                                continue;
+                            }
+                        };
+                        while let Some((Event::Text(_), offset)) = p.next() {
+                            code_end = offset.end;
                         }
-                    };
-                }
-            }
-            Event::End(Tag::CodeBlock(syntax)) if in_rust_code_block => {
-                in_rust_code_block = false;
-
-                let code_block_end = if is_fenced {
-                    let fence_str = &md[previous_offset..offset].chars().rev().collect::<String>();
-                    fence_str
-                        .find("```")
-                        .map(|fence_idx| offset - fence_idx)
-                        .unwrap_or_else(|| offset)
-                } else if md.as_bytes().get(offset).map(|b| *b == b'\n').unwrap_or_default() {
-                    offset - 1
-                } else {
-                    offset
+                        (syntax, code_start, code_end, offset, true)
+                    }
+                    CodeBlockKind::Indented => {
+                        // The ending of the offset goes too far sometime so we reduce it by one in
+                        // these cases.
+                        if offset.end > offset.start
+                            && md.get(offset.end..=offset.end) == Some(&"\n")
+                        {
+                            (
+                                None,
+                                offset.start,
+                                offset.end,
+                                Range { start: offset.start, end: offset.end - 1 },
+                                false,
+                            )
+                        } else {
+                            (None, offset.start, offset.end, offset, false)
+                        }
+                    }
                 };
 
-                let code_end = if is_fenced { previous_offset } else { code_block_end };
-
                 code_blocks.push(RustCodeBlock {
                     is_fenced,
-                    range: Range { start: code_block_start, end: code_block_end },
+                    range,
                     code: Range { start: code_start, end: code_end },
-                    syntax: if !syntax.is_empty() { Some(syntax.into_string()) } else { None },
+                    syntax,
                 });
             }
             _ => (),
         }
-
-        previous_offset = offset;
     }
 
     code_blocks
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index c73960fe33..6063ad0938 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -44,6 +44,8 @@ use std::sync::Arc;
 
 use rustc::middle::privacy::AccessLevels;
 use rustc::middle::stability;
+use rustc_ast::ast;
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::flock;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_feature::UnstableFeatures;
@@ -56,8 +58,6 @@ use rustc_span::source_map::FileName;
 use rustc_span::symbol::{sym, Symbol};
 use serde::ser::SerializeSeq;
 use serde::{Serialize, Serializer};
-use syntax::ast;
-use syntax::print::pprust;
 
 use crate::clean::{self, AttributesExt, Deprecation, GetDefId, SelfTy};
 use crate::config::RenderOptions;
@@ -73,8 +73,6 @@ use crate::html::markdown::{self, ErrorCodes, IdMap, Markdown, MarkdownHtml, Mar
 use crate::html::sources;
 use crate::html::{highlight, layout, static_files};
 
-use minifier;
-
 #[cfg(test)]
 mod tests;
 
@@ -88,7 +86,7 @@ pub type NameDoc = (String, Option<String>);
 
 crate fn ensure_trailing_slash(v: &str) -> impl fmt::Display + '_ {
     crate::html::format::display_fn(move |f| {
-        if !v.ends_with("/") && !v.is_empty() { write!(f, "{}/", v) } else { write!(f, "{}", v) }
+        if !v.ends_with('/') && !v.is_empty() { write!(f, "{}/", v) } else { write!(f, "{}", v) }
     })
 }
 
@@ -1315,7 +1313,8 @@ impl Context {
                          <p>Version {}</p>\
                      </div>\
                      <a id='all-types' href='index.html'><p>Back to index</p></a>",
-                crate_name, version
+                crate_name,
+                Escape(version),
             )
         } else {
             String::new()
@@ -2326,7 +2325,7 @@ fn item_function(w: &mut Buffer, cx: &Context, it: &clean::Item, f: &clean::Func
         f.generics.print()
     )
     .len();
-    write!(w, "{}<pre class='rust fn'>", render_spotlight_traits(it));
+    write!(w, "<pre class='rust fn'>");
     render_attributes(w, it, false);
     write!(
         w,
@@ -2529,13 +2528,7 @@ fn item_trait(w: &mut Buffer, cx: &Context, it: &clean::Item, t: &clean::Trait)
         let item_type = m.type_();
         let id = cx.derive_id(format!("{}.{}", item_type, name));
         let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
-        write!(
-            w,
-            "<h3 id='{id}' class='method'>{extra}<code id='{ns_id}'>",
-            extra = render_spotlight_traits(m),
-            id = id,
-            ns_id = ns_id
-        );
+        write!(w, "<h3 id='{id}' class='method'><code id='{ns_id}'>", id = id, ns_id = ns_id);
         render_assoc_item(w, m, AssocItemLink::Anchor(Some(&id)), ItemType::Impl);
         write!(w, "</code>");
         render_stability_since(w, m, t);
@@ -2728,7 +2721,7 @@ fn naive_assoc_href(it: &clean::Item, link: AssocItemLink<'_>) -> String {
     let name = it.name.as_ref().unwrap();
     let ty = match it.type_() {
         Typedef | AssocType => AssocType,
-        s @ _ => s,
+        s => s,
     };
 
     let anchor = format!("#{}.{}", ty, name);
@@ -2785,7 +2778,7 @@ fn assoc_type(
 
 fn render_stability_since_raw(w: &mut Buffer, ver: Option<&str>, containing_ver: Option<&str>) {
     if let Some(v) = ver {
-        if containing_ver != ver && v.len() > 0 {
+        if containing_ver != ver && !v.is_empty() {
             write!(w, "<span class='since' title='Stable since Rust version {0}'>{0}</span>", v)
         }
     }
@@ -3145,13 +3138,13 @@ fn render_attribute(attr: &ast::MetaItem) -> Option<String> {
             .filter_map(|attr| attr.meta_item().and_then(|mi| render_attribute(mi)))
             .collect();
 
-        if display.len() > 0 { Some(format!("{}({})", path, display.join(", "))) } else { None }
+        if !display.is_empty() { Some(format!("{}({})", path, display.join(", "))) } else { None }
     } else {
         None
     }
 }
 
-const ATTRIBUTE_WHITELIST: &'static [Symbol] = &[
+const ATTRIBUTE_WHITELIST: &[Symbol] = &[
     sym::export_name,
     sym::lang,
     sym::link_section,
@@ -3180,7 +3173,7 @@ fn render_attributes(w: &mut Buffer, it: &clean::Item, top: bool) {
             attrs.push_str(&format!("#[{}]\n", s));
         }
     }
-    if attrs.len() > 0 {
+    if !attrs.is_empty() {
         write!(
             w,
             "<span class=\"docblock attributes{}\">{}</span>",
@@ -3521,76 +3514,6 @@ fn should_render_item(item: &clean::Item, deref_mut_: bool) -> bool {
     }
 }
 
-fn render_spotlight_traits(item: &clean::Item) -> String {
-    match item.inner {
-        clean::FunctionItem(clean::Function { ref decl, .. })
-        | clean::TyMethodItem(clean::TyMethod { ref decl, .. })
-        | clean::MethodItem(clean::Method { ref decl, .. })
-        | clean::ForeignFunctionItem(clean::Function { ref decl, .. }) => spotlight_decl(decl),
-        _ => String::new(),
-    }
-}
-
-fn spotlight_decl(decl: &clean::FnDecl) -> String {
-    let mut out = Buffer::html();
-    let mut trait_ = String::new();
-
-    if let Some(did) = decl.output.def_id() {
-        let c = cache();
-        if let Some(impls) = c.impls.get(&did) {
-            for i in impls {
-                let impl_ = i.inner_impl();
-                if impl_.trait_.def_id().map_or(false, |d| c.traits[&d].is_spotlight) {
-                    if out.is_empty() {
-                        out.push_str(&format!(
-                            "<h3 class=\"important\">Important traits for {}</h3>\
-                                      <code class=\"content\">",
-                            impl_.for_.print()
-                        ));
-                        trait_.push_str(&impl_.for_.print().to_string());
-                    }
-
-                    //use the "where" class here to make it small
-                    out.push_str(&format!(
-                        "<span class=\"where fmt-newline\">{}</span>",
-                        impl_.print()
-                    ));
-                    let t_did = impl_.trait_.def_id().unwrap();
-                    for it in &impl_.items {
-                        if let clean::TypedefItem(ref tydef, _) = it.inner {
-                            out.push_str("<span class=\"where fmt-newline\">    ");
-                            assoc_type(
-                                &mut out,
-                                it,
-                                &[],
-                                Some(&tydef.type_),
-                                AssocItemLink::GotoSource(t_did, &FxHashSet::default()),
-                                "",
-                            );
-                            out.push_str(";</span>");
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    if !out.is_empty() {
-        out.insert_str(
-            0,
-            &format!(
-                "<div class=\"important-traits\"><div class='tooltip'>ⓘ\
-                                    <span class='tooltiptext'>Important traits for {}</span></div>\
-                                    <div class=\"content hidden\">",
-                trait_
-            ),
-        );
-        out.push_str("</code></div></div>");
-    }
-
-    out.into_inner()
-}
-
 fn render_impl(
     w: &mut Buffer,
     cx: &Context,
@@ -3602,7 +3525,7 @@ fn render_impl(
     use_absolute: Option<bool>,
     is_on_foreign_type: bool,
     show_default_items: bool,
-    // This argument is used to reference same type with different pathes to avoid duplication
+    // This argument is used to reference same type with different paths to avoid duplication
     // in documentation pages for trait with automatic implementations like "Send" and "Sync".
     aliases: &[String],
 ) {
@@ -3629,14 +3552,7 @@ fn render_impl(
                 for it in &i.inner_impl().items {
                     if let clean::TypedefItem(ref tydef, _) = it.inner {
                         write!(w, "<span class=\"where fmt-newline\">  ");
-                        assoc_type(
-                            w,
-                            it,
-                            &vec![],
-                            Some(&tydef.type_),
-                            AssocItemLink::Anchor(None),
-                            "",
-                        );
+                        assoc_type(w, it, &[], Some(&tydef.type_), AssocItemLink::Anchor(None), "");
                         write!(w, ";</span>");
                     }
                 }
@@ -3704,14 +3620,13 @@ fn render_impl(
                 (true, " hidden")
             };
         match item.inner {
-            clean::MethodItem(clean::Method { ref decl, .. })
-            | clean::TyMethodItem(clean::TyMethod { ref decl, .. }) => {
+            clean::MethodItem(clean::Method { .. })
+            | clean::TyMethodItem(clean::TyMethod { .. }) => {
                 // Only render when the method is not static or we allow static methods
                 if render_method_item {
                     let id = cx.derive_id(format!("{}.{}", item_type, name));
                     let ns_id = cx.derive_id(format!("{}.{}", name, item_type.name_space()));
                     write!(w, "<h4 id='{}' class=\"{}{}\">", id, item_type, extra_class);
-                    write!(w, "{}", spotlight_decl(decl));
                     write!(w, "<code id='{}'>", ns_id);
                     render_assoc_item(w, item, link.anchor(&id), ItemType::Impl);
                     write!(w, "</code>");
@@ -3983,7 +3898,7 @@ fn print_sidebar(cx: &Context, it: &clean::Item, buffer: &mut Buffer) {
                 "<div class='block version'>\
                     <p>Version {}</p>\
                     </div>",
-                version
+                Escape(version)
             );
         }
     }
@@ -4058,7 +3973,7 @@ fn get_next_url(used_links: &mut FxHashSet<String>, url: String) -> String {
         return url;
     }
     let mut add = 1;
-    while used_links.insert(format!("{}-{}", url, add)) == false {
+    while !used_links.insert(format!("{}-{}", url, add)) {
         add += 1;
     }
     format!("{}-{}", url, add)
@@ -4618,7 +4533,7 @@ fn item_keyword(w: &mut Buffer, cx: &Context, it: &clean::Item) {
     document(w, cx, it)
 }
 
-crate const BASIC_KEYWORDS: &'static str = "rust, rustlang, rust-lang";
+crate const BASIC_KEYWORDS: &str = "rust, rustlang, rust-lang";
 
 fn make_item_keywords(it: &clean::Item) -> String {
     format!("{}, {}", BASIC_KEYWORDS, it.name.as_ref().unwrap())
diff --git a/src/librustdoc/html/render/cache.rs b/src/librustdoc/html/render/cache.rs
index f1f83acdda..a0a35e4ce4 100644
--- a/src/librustdoc/html/render/cache.rs
+++ b/src/librustdoc/html/render/cache.rs
@@ -43,7 +43,7 @@ crate struct Cache {
     /// found on that implementation.
     pub impls: FxHashMap<DefId, Vec<Impl>>,
 
-    /// Maintains a mapping of local crate `NodeId`s to the fully qualified name
+    /// Maintains a mapping of local crate `DefId`s to the fully qualified name
     /// and "short type description" of that node. This is used when generating
     /// URLs when a type is being linked to. External paths are not located in
     /// this map because the `External` type itself has all the information
@@ -358,6 +358,7 @@ impl DocFolder for Cache {
             | clean::ForeignTypeItem
             | clean::MacroItem(..)
             | clean::ProcMacroItem(..)
+            | clean::VariantItem(..)
                 if !self.stripped_mod =>
             {
                 // Re-exported items mean that the same id can show up twice
@@ -373,13 +374,6 @@ impl DocFolder for Cache {
                 }
                 self.add_aliases(&item);
             }
-            // Link variants to their parent enum because pages aren't emitted
-            // for each variant.
-            clean::VariantItem(..) if !self.stripped_mod => {
-                let mut stack = self.stack.clone();
-                stack.pop();
-                self.paths.insert(item.def_id, (stack, ItemType::Enum));
-            }
 
             clean::PrimitiveItem(..) => {
                 self.add_aliases(&item);
@@ -396,7 +390,8 @@ impl DocFolder for Cache {
             | clean::EnumItem(..)
             | clean::ForeignTypeItem
             | clean::StructItem(..)
-            | clean::UnionItem(..) => {
+            | clean::UnionItem(..)
+            | clean::VariantItem(..) => {
                 self.parent_stack.push(item.def_id);
                 self.parent_is_trait_impl = false;
                 true
@@ -539,7 +534,7 @@ fn extern_location(
 
     if let Some(url) = extern_url {
         let mut url = url.to_string();
-        if !url.ends_with("/") {
+        if !url.ends_with('/') {
             url.push('/');
         }
         return Remote(url);
@@ -553,7 +548,7 @@ fn extern_location(
         .filter_map(|a| a.value_str())
         .map(|url| {
             let mut url = url.to_string();
-            if !url.ends_with("/") {
+            if !url.ends_with('/') {
                 url.push('/')
             }
             Remote(url)
@@ -564,7 +559,7 @@ fn extern_location(
 
 /// Builds the search index from the collected metadata
 fn build_index(krate: &clean::Crate, cache: &mut Cache) -> String {
-    let mut nodeid_to_pathid = FxHashMap::default();
+    let mut defid_to_pathid = FxHashMap::default();
     let mut crate_items = Vec::with_capacity(cache.search_index.len());
     let mut crate_paths = vec![];
 
@@ -586,21 +581,21 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> String {
         }
     }
 
-    // Reduce `NodeId` in paths into smaller sequential numbers,
+    // Reduce `DefId` in paths into smaller sequential numbers,
     // and prune the paths that do not appear in the index.
     let mut lastpath = String::new();
     let mut lastpathid = 0usize;
 
     for item in search_index {
-        item.parent_idx = item.parent.map(|nodeid| {
-            if nodeid_to_pathid.contains_key(&nodeid) {
-                *nodeid_to_pathid.get(&nodeid).expect("no pathid")
+        item.parent_idx = item.parent.map(|defid| {
+            if defid_to_pathid.contains_key(&defid) {
+                *defid_to_pathid.get(&defid).expect("no pathid")
             } else {
                 let pathid = lastpathid;
-                nodeid_to_pathid.insert(nodeid, pathid);
+                defid_to_pathid.insert(defid, pathid);
                 lastpathid += 1;
 
-                let &(ref fqp, short) = paths.get(&nodeid).unwrap();
+                let &(ref fqp, short) = paths.get(&defid).unwrap();
                 crate_paths.push((short, fqp.last().unwrap().clone()));
                 pathid
             }
@@ -675,7 +670,7 @@ fn get_index_type_name(clean_type: &clean::Type, accept_generic: bool) -> Option
     match *clean_type {
         clean::ResolvedPath { ref path, .. } => {
             let segments = &path.segments;
-            let path_segment = segments.into_iter().last().unwrap_or_else(|| panic!(
+            let path_segment = segments.iter().last().unwrap_or_else(|| panic!(
                 "get_index_type_name(clean_type: {:?}, accept_generic: {:?}) had length zero path",
                 clean_type, accept_generic
             ));
diff --git a/src/librustdoc/html/static/brush.svg b/src/librustdoc/html/static/brush.svg
index 072264a640..ea266e856a 100644
--- a/src/librustdoc/html/static/brush.svg
+++ b/src/librustdoc/html/static/brush.svg
@@ -1 +1 @@
-<?xml version="1.0" ?><svg height="1792" viewBox="0 0 1792 1792" width="1792" xmlns="http://www.w3.org/2000/svg"><path d="M1615 0q70 0 122.5 46.5t52.5 116.5q0 63-45 151-332 629-465 752-97 91-218 91-126 0-216.5-92.5t-90.5-219.5q0-128 92-212l638-579q59-54 130-54zm-909 1034q39 76 106.5 130t150.5 76l1 71q4 213-129.5 347t-348.5 134q-123 0-218-46.5t-152.5-127.5-86.5-183-29-220q7 5 41 30t62 44.5 59 36.5 46 17q41 0 55-37 25-66 57.5-112.5t69.5-76 88-47.5 103-25.5 125-10.5z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="1792" height="1792" viewBox="0 0 1792 1792"><path d="M1615 0q70 0 122.5 46.5t52.5 116.5q0 63-45 151-332 629-465 752-97 91-218 91-126 0-216.5-92.5t-90.5-219.5q0-128 92-212l638-579q59-54 130-54zm-909 1034q39 76 106.5 130t150.5 76l1 71q4 213-129.5 347t-348.5 134q-123 0-218-46.5t-152.5-127.5-86.5-183-29-220q7 5 41 30t62 44.5 59 36.5 46 17q41 0 55-37 25-66 57.5-112.5t69.5-76 88-47.5 103-25.5 125-10.5z"/></svg>
\ No newline at end of file
diff --git a/src/librustdoc/html/static/down-arrow.svg b/src/librustdoc/html/static/down-arrow.svg
index c0f59f0c36..35437e77a7 100644
--- a/src/librustdoc/html/static/down-arrow.svg
+++ b/src/librustdoc/html/static/down-arrow.svg
@@ -1 +1 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg height="128px" id="Layer_1" style="enable-background:new 0 0 128 128;" version="1.1" viewBox="-30 -20 176 176" width="128px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><line style="fill:none;stroke:#2F3435;stroke-width:12;stroke-linecap:square;stroke-miterlimit:10;" x1="111" x2="64" y1="40.5" y2="87.499"/><line style="fill:none;stroke:#2F3435;stroke-width:12;stroke-linecap:square;stroke-miterlimit:10;" x1="64" x2="17" y1="87.499" y2="40.5"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" width="128" height="128" enable-background="new 0 0 128 128" version="1.1" viewBox="-30 -20 176 176" xml:space="preserve"><g><line x1="111" x2="64" y1="40.5" y2="87.499" fill="none" stroke="#2F3435" stroke-linecap="square" stroke-miterlimit="10" stroke-width="12"/><line x1="64" x2="17" y1="87.499" y2="40.5" fill="none" stroke="#2F3435" stroke-linecap="square" stroke-miterlimit="10" stroke-width="12"/></g></svg>
\ No newline at end of file
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js
index 44fd8b929f..a799aed698 100644
--- a/src/librustdoc/html/static/main.js
+++ b/src/librustdoc/html/static/main.js
@@ -341,7 +341,6 @@ function getSearchElement() {
     function handleEscape(ev) {
         var help = getHelpElement();
         var search = getSearchElement();
-        hideModal();
         if (hasClass(help, "hidden") === false) {
             displayHelp(false, ev, help);
         } else if (hasClass(search, "hidden") === false) {
@@ -373,7 +372,6 @@ function getSearchElement() {
             case "s":
             case "S":
                 displayHelp(false, ev);
-                hideModal();
                 ev.preventDefault();
                 focusSearchBar();
                 break;
@@ -386,7 +384,6 @@ function getSearchElement() {
 
             case "?":
                 if (ev.shiftKey) {
-                    hideModal();
                     displayHelp(true, ev);
                 }
                 break;
@@ -1364,14 +1361,15 @@ function getSearchElement() {
             var href;
             var type = itemTypes[item.ty];
             var name = item.name;
+            var path = item.path;
 
             if (type === "mod") {
-                displayPath = item.path + "::";
-                href = rootPath + item.path.replace(/::/g, "/") + "/" +
+                displayPath = path + "::";
+                href = rootPath + path.replace(/::/g, "/") + "/" +
                        name + "/index.html";
             } else if (type === "primitive" || type === "keyword") {
                 displayPath = "";
-                href = rootPath + item.path.replace(/::/g, "/") +
+                href = rootPath + path.replace(/::/g, "/") +
                        "/" + type + "." + name + ".html";
             } else if (type === "externcrate") {
                 displayPath = "";
@@ -1380,14 +1378,27 @@ function getSearchElement() {
                 var myparent = item.parent;
                 var anchor = "#" + type + "." + name;
                 var parentType = itemTypes[myparent.ty];
+                var pageType = parentType;
+                var pageName = myparent.name;
+
                 if (parentType === "primitive") {
                     displayPath = myparent.name + "::";
+                } else if (type === "structfield" && parentType === "variant") {
+                    // Structfields belonging to variants are special: the
+                    // final path element is the enum name.
+                    var splitPath = item.path.split("::");
+                    var enumName = splitPath.pop();
+                    path = splitPath.join("::");
+                    displayPath = path + "::" + enumName + "::" + myparent.name + "::";
+                    anchor = "#variant." + myparent.name + ".field." + name;
+                    pageType = "enum";
+                    pageName = enumName;
                 } else {
-                    displayPath = item.path + "::" + myparent.name + "::";
+                    displayPath = path + "::" + myparent.name + "::";
                 }
-                href = rootPath + item.path.replace(/::/g, "/") +
-                       "/" + parentType +
-                       "." + myparent.name +
+                href = rootPath + path.replace(/::/g, "/") +
+                       "/" + pageType +
+                       "." + pageName +
                        ".html" + anchor;
             } else {
                 displayPath = item.path + "::";
@@ -1668,7 +1679,7 @@ function getSearchElement() {
                 //              (String) name]
                 var paths = rawSearchIndex[crate].p;
 
-                // convert `paths` into an object form
+                // convert `rawPaths` entries into object form
                 var len = paths.length;
                 for (i = 0; i < len; ++i) {
                     paths[i] = {ty: paths[i][0], name: paths[i][1]};
@@ -2490,31 +2501,6 @@ function getSearchElement() {
         lineNumbersFunc(e);
     });
 
-    function showModal(content) {
-        var modal = document.createElement("div");
-        modal.id = "important";
-        addClass(modal, "modal");
-        modal.innerHTML = "<div class=\"modal-content\"><div class=\"close\" id=\"modal-close\">✕" +
-                          "</div><div class=\"whiter\"></div><span class=\"docblock\">" + content +
-                          "</span></div>";
-        document.getElementsByTagName("body")[0].appendChild(modal);
-        document.getElementById("modal-close").onclick = hideModal;
-        modal.onclick = hideModal;
-    }
-
-    function hideModal() {
-        var modal = document.getElementById("important");
-        if (modal) {
-            modal.parentNode.removeChild(modal);
-        }
-    }
-
-    onEachLazy(document.getElementsByClassName("important-traits"), function(e) {
-        e.onclick = function() {
-            showModal(e.lastElementChild.innerHTML);
-        };
-    });
-
     // In the search display, allows to switch between tabs.
     function printTab(nb) {
         if (nb === 0 || nb === 1 || nb === 2) {
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
index a91fdb7a10..f05db6c218 100644
--- a/src/librustdoc/html/static/rustdoc.css
+++ b/src/librustdoc/html/static/rustdoc.css
@@ -136,19 +136,16 @@ summary {
 	outline: none;
 }
 
-code, pre {
+code, pre, a.test-arrow {
 	font-family: "Source Code Pro", monospace;
 }
 .docblock code, .docblock-short code {
 	border-radius: 3px;
 	padding: 0 0.1em;
 }
-.docblock pre code, .docblock-short pre code, .docblock code.spotlight {
+.docblock pre code, .docblock-short pre code {
 	padding: 0;
 }
-.docblock code.spotlight :last-child {
-	padding-bottom: 0.6em;
-}
 pre {
 	padding: 14px;
 }
@@ -305,6 +302,7 @@ nav.sub {
 .rustdoc:not(.source) .example-wrap {
 	display: inline-flex;
 	margin-bottom: 10px;
+	position: relative;
 }
 
 .example-wrap {
@@ -502,7 +500,7 @@ h4 > code, h3 > code, .invisible > code {
 	font-size: 0.8em;
 }
 
-.content .methods > div:not(.important-traits) {
+.content .methods > div {
 	margin-left: 40px;
 	margin-bottom: 15px;
 }
@@ -878,6 +876,7 @@ a.test-arrow {
 	font-size: 130%;
 	top: 5px;
 	right: 5px;
+	z-index: 1;
 }
 a.test-arrow:hover{
 	text-decoration: none;
@@ -1070,7 +1069,7 @@ h3 > .collapse-toggle, h4 > .collapse-toggle {
 	border-style: solid;
 }
 
-.important-traits .tooltip .tooltiptext {
+.tooltip .tooltiptext {
 	border: 1px solid;
 }
 
@@ -1115,17 +1114,6 @@ pre.rust {
 	font-size: 16px;
 }
 
-.important-traits {
-	cursor: pointer;
-	z-index: 2;
-}
-
-h4 > .important-traits {
-	position: absolute;
-	left: -44px;
-	top: 2px;
-}
-
 #all-types {
 	text-align: center;
 	border: 1px solid;
@@ -1352,12 +1340,6 @@ h4 > .important-traits {
 		z-index: 1;
 	}
 
-	h4 > .important-traits {
-		position: absolute;
-		left: -22px;
-		top: 24px;
-	}
-
 	#titles > div > div.count {
 		float: left;
 		width: 100%;
@@ -1460,82 +1442,12 @@ h4 > .important-traits {
 	}
 }
 
-.modal {
-	position: fixed;
-	width: 100vw;
-	height: 100vh;
-	z-index: 10000;
-	top: 0;
-	left: 0;
-}
-
-.modal-content {
-	display: block;
-	max-width: 60%;
-	min-width: 200px;
-	padding: 8px;
-	top: 40%;
-	position: absolute;
-	left: 50%;
-	transform: translate(-50%, -40%);
-	border: 1px solid;
-	border-radius: 4px;
-	border-top-right-radius: 0;
-}
-
-.modal-content > .docblock {
-	margin: 0;
-}
-
 h3.important {
 	margin: 0;
 	margin-bottom: 13px;
 	font-size: 19px;
 }
 
-.modal-content > .docblock > code.content {
-	margin: 0;
-	padding: 0;
-	font-size: 20px;
-}
-
-.modal-content > .close {
-	position: absolute;
-	font-weight: 900;
-	right: -25px;
-	top: -1px;
-	font-size: 18px;
-	width: 25px;
-	padding-right: 2px;
-	border-top-right-radius: 5px;
-	border-bottom-right-radius: 5px;
-	text-align: center;
-	border: 1px solid;
-	border-right: 0;
-	cursor: pointer;
-}
-
-.modal-content > .whiter {
-	height: 25px;
-	position: absolute;
-	width: 3px;
-	right: -2px;
-	top: 0px;
-}
-
-#main > div.important-traits {
-	position: absolute;
-	left: -24px;
-	margin-top: 16px;
-}
-
-.content > .methods > .method > div.important-traits {
-	position: absolute;
-	font-weight: 400;
-	left: -42px;
-	margin-top: 2px;
-}
-
 kbd {
 	display: inline-block;
 	padding: 3px 5px;
diff --git a/src/librustdoc/html/static/themes/dark.css b/src/librustdoc/html/static/themes/dark.css
index 9a0e7bbabc..e7041d54c6 100644
--- a/src/librustdoc/html/static/themes/dark.css
+++ b/src/librustdoc/html/static/themes/dark.css
@@ -298,12 +298,6 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	border-color: transparent black transparent transparent;
 }
 
-.important-traits .tooltip .tooltiptext {
-	background-color: white;
-	color: black;
-	border-color: black;
-}
-
 #titles > div:not(.selected) {
 	background-color: #252525;
 	border-top-color: #252525;
@@ -317,33 +311,6 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	color: #888;
 }
 
-.modal {
-	background-color: rgba(0,0,0,0.3);
-}
-
-.modal-content {
-	background-color: #272727;
-	border-color: #999;
-}
-
-.modal-content > .close {
-	background-color: #272727;
-	border-color: #999;
-}
-
-.modal-content > .close:hover {
-	background-color: #ff1f1f;
-	color: white;
-}
-
-.modal-content > .whiter {
-	background-color: #272727;
-}
-
-.modal-content > .close:hover + .whiter {
-	background-color: #ff1f1f;
-}
-
 @media (max-width: 700px) {
 	.sidebar-menu {
 		background-color: #505050;
diff --git a/src/librustdoc/html/static/themes/light.css b/src/librustdoc/html/static/themes/light.css
index ca8ea1c456..a1efef6701 100644
--- a/src/librustdoc/html/static/themes/light.css
+++ b/src/librustdoc/html/static/themes/light.css
@@ -292,12 +292,6 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	border-color: transparent black transparent transparent;
 }
 
-.important-traits .tooltip .tooltiptext {
-	background-color: white;
-	color: black;
-	border-color: black;
-}
-
 #titles > div:not(.selected) {
 	background-color: #e6e6e6;
 	border-top-color: #e6e6e6;
@@ -311,33 +305,6 @@ pre.ignore:hover, .information:hover + pre.ignore {
 	color: #888;
 }
 
-.modal {
-	background-color: rgba(0,0,0,0.3);
-}
-
-.modal-content {
-	background-color: #eee;
-	border-color: #999;
-}
-
-.modal-content > .close {
-	background-color: #eee;
-	border-color: #999;
-}
-
-.modal-content > .close:hover {
-	background-color: #ff1f1f;
-	color: white;
-}
-
-.modal-content > .whiter {
-	background-color: #eee;
-}
-
-.modal-content > .close:hover + .whiter {
-	background-color: #ff1f1f;
-}
-
 @media (max-width: 700px) {
 	.sidebar-menu {
 		background-color: #F1F1F1;
diff --git a/src/librustdoc/html/static/wheel.svg b/src/librustdoc/html/static/wheel.svg
index 44381a401a..01da3b24c7 100644
--- a/src/librustdoc/html/static/wheel.svg
+++ b/src/librustdoc/html/static/wheel.svg
@@ -1 +1 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 27.434 29.5" height="29.5px" id="Capa_1" version="1.1" viewBox="0 0 27.434 29.5" width="27.434px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M27.315,18.389c-0.165-0.604-0.509-1.113-0.981-1.459c-0.042-0.144-0.083-0.429-0.015-0.761l0.037-0.177v-0.182V14.8   c0-1.247-0.006-1.277-0.048-1.472c-0.076-0.354-0.035-0.653,0.007-0.803c0.477-0.346,0.828-0.861,0.996-1.476   c0.261-0.956,0.076-2.091-0.508-3.114l-0.591-1.032c-0.746-1.307-1.965-2.119-3.182-2.119c-0.378,0-0.75,0.081-1.085,0.235   c-0.198-0.025-0.554-0.15-0.855-0.389l-0.103-0.082l-0.114-0.065l-1.857-1.067L18.92,3.36l-0.105-0.044   c-0.376-0.154-0.658-0.41-0.768-0.556C17.918,1.172,16.349,0,14.296,0H13.14c-2.043,0-3.608,1.154-3.749,2.721   C9.277,2.862,8.999,3.104,8.633,3.25l-0.1,0.039L8.439,3.341L6.495,4.406L6.363,4.479L6.245,4.573   C5.936,4.82,5.596,4.944,5.416,4.977c-0.314-0.139-0.66-0.21-1.011-0.21c-1.198,0-2.411,0.819-3.165,2.139L0.65,7.938   c-0.412,0.72-0.642,1.521-0.644,2.258c-0.003,0.952,0.362,1.756,1.013,2.256c0.034,0.155,0.061,0.448-0.016,0.786   c-0.038,0.168-0.062,0.28-0.062,1.563c0,1.148,0,1.148,0.015,1.262l0.009,0.073l0.017,0.073c0.073,0.346,0.045,0.643,0.011,0.802   C0.348,17.512-0.01,18.314,0,19.268c0.008,0.729,0.238,1.523,0.648,2.242l0.589,1.031c0.761,1.331,1.967,2.159,3.15,2.159   c0.324,0,0.645-0.064,0.938-0.187c0.167,0.038,0.492,0.156,0.813,0.416l0.11,0.088l0.124,0.07l2.045,1.156l0.102,0.057l0.107,0.043   c0.364,0.147,0.646,0.381,0.766,0.521c0.164,1.52,1.719,2.634,3.745,2.634h1.155c2.037,0,3.598-1.134,3.747-2.675   c0.117-0.145,0.401-0.393,0.774-0.549l0.111-0.047l0.105-0.062l1.96-1.159l0.105-0.062l0.097-0.075   c0.309-0.246,0.651-0.371,0.832-0.402c0.313,0.138,0.662,0.212,1.016,0.212c1.199,0,2.412-0.82,3.166-2.139l0.59-1.032   C27.387,20.48,27.575,19.342,27.315,18.389z M25.274,20.635l-0.59,1.032c-0.438,0.765-1.104,1.251-1.639,1.251   c-0.133,0-0.258-0.029-0.369-0.094c-0.15-0.086-0.346-0.127-0.566-0.127c-0.596,0-1.383,0.295-2.01,0.796l-1.96,1.157   c-1.016,0.425-1.846,1.291-1.846,1.929s-0.898,1.159-1.998,1.159H13.14c-1.1,0-1.998-0.514-1.998-1.141s-0.834-1.477-1.854-1.888   l-2.046-1.157c-0.636-0.511-1.425-0.814-2.006-0.814c-0.202,0-0.379,0.037-0.516,0.115c-0.101,0.057-0.214,0.084-0.333,0.084   c-0.518,0-1.179-0.498-1.62-1.271l-0.591-1.032c-0.545-0.954-0.556-1.983-0.024-2.286c0.532-0.305,0.78-1.432,0.551-2.506   c0,0,0-0.003,0-1.042c0-1.088,0.021-1.18,0.021-1.18c0.238-1.072-0.01-2.203-0.552-2.513C1.631,10.8,1.634,9.765,2.18,8.812   L2.769,7.78c0.438-0.766,1.103-1.251,1.636-1.251c0.131,0,0.255,0.029,0.365,0.092C4.92,6.707,5.114,6.747,5.334,6.747   c0.596,0,1.38-0.296,2.007-0.795l1.944-1.065c1.021-0.407,1.856-1.277,1.856-1.933c0-0.656,0.898-1.192,1.998-1.192h1.156V1.761   c1.1,0,1.998,0.545,1.998,1.211c0,0.667,0.832,1.554,1.849,1.973L20,6.013c0.618,0.489,1.401,0.775,2.012,0.775   c0.24,0,0.454-0.045,0.62-0.139c0.122-0.069,0.259-0.102,0.403-0.102c0.551,0,1.221,0.476,1.653,1.231l0.59,1.032   c0.544,0.953,0.518,2.004-0.062,2.334c-0.577,0.331-0.859,1.48-0.627,2.554c0,0,0.01,0.042,0.01,1.103c0,1.012,0,1.012,0,1.012   c-0.218,1.049,0.068,2.174,0.636,2.498C25.802,18.635,25.819,19.68,25.274,20.635z"/><path d="M13.61,7.611c-3.913,0-7.084,3.173-7.084,7.085c0,3.914,3.171,7.085,7.084,7.085s7.085-3.172,7.085-7.085   C20.695,10.784,17.523,7.611,13.61,7.611z M13.61,20.02c-2.936,0-5.323-2.388-5.323-5.323c0-2.935,2.388-5.323,5.323-5.323   s5.324,2.388,5.324,5.323C18.934,17.632,16.546,20.02,13.61,20.02z"/><path d="M13.682,9.908c-2.602,0-4.718,2.116-4.718,4.718c0,2.601,2.116,4.716,4.718,4.716c2.601,0,4.717-2.115,4.717-4.716   C18.399,12.024,16.283,9.908,13.682,9.908z M13.682,17.581c-1.633,0-2.956-1.323-2.956-2.955s1.323-2.956,2.956-2.956   c1.632,0,2.956,1.324,2.956,2.956S15.314,17.581,13.682,17.581z"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Capa_1" width="27.434" height="29.5" enable-background="new 0 0 27.434 29.5" version="1.1" viewBox="0 0 27.434 29.5" xml:space="preserve"><g><path d="M27.315,18.389c-0.165-0.604-0.509-1.113-0.981-1.459c-0.042-0.144-0.083-0.429-0.015-0.761l0.037-0.177v-0.182V14.8 c0-1.247-0.006-1.277-0.048-1.472c-0.076-0.354-0.035-0.653,0.007-0.803c0.477-0.346,0.828-0.861,0.996-1.476 c0.261-0.956,0.076-2.091-0.508-3.114l-0.591-1.032c-0.746-1.307-1.965-2.119-3.182-2.119c-0.378,0-0.75,0.081-1.085,0.235 c-0.198-0.025-0.554-0.15-0.855-0.389l-0.103-0.082l-0.114-0.065l-1.857-1.067L18.92,3.36l-0.105-0.044 c-0.376-0.154-0.658-0.41-0.768-0.556C17.918,1.172,16.349,0,14.296,0H13.14c-2.043,0-3.608,1.154-3.749,2.721 C9.277,2.862,8.999,3.104,8.633,3.25l-0.1,0.039L8.439,3.341L6.495,4.406L6.363,4.479L6.245,4.573 C5.936,4.82,5.596,4.944,5.416,4.977c-0.314-0.139-0.66-0.21-1.011-0.21c-1.198,0-2.411,0.819-3.165,2.139L0.65,7.938 c-0.412,0.72-0.642,1.521-0.644,2.258c-0.003,0.952,0.362,1.756,1.013,2.256c0.034,0.155,0.061,0.448-0.016,0.786 c-0.038,0.168-0.062,0.28-0.062,1.563c0,1.148,0,1.148,0.015,1.262l0.009,0.073l0.017,0.073c0.073,0.346,0.045,0.643,0.011,0.802 C0.348,17.512-0.01,18.314,0,19.268c0.008,0.729,0.238,1.523,0.648,2.242l0.589,1.031c0.761,1.331,1.967,2.159,3.15,2.159 c0.324,0,0.645-0.064,0.938-0.187c0.167,0.038,0.492,0.156,0.813,0.416l0.11,0.088l0.124,0.07l2.045,1.156l0.102,0.057l0.107,0.043 c0.364,0.147,0.646,0.381,0.766,0.521c0.164,1.52,1.719,2.634,3.745,2.634h1.155c2.037,0,3.598-1.134,3.747-2.675 c0.117-0.145,0.401-0.393,0.774-0.549l0.111-0.047l0.105-0.062l1.96-1.159l0.105-0.062l0.097-0.075 c0.309-0.246,0.651-0.371,0.832-0.402c0.313,0.138,0.662,0.212,1.016,0.212c1.199,0,2.412-0.82,3.166-2.139l0.59-1.032 C27.387,20.48,27.575,19.342,27.315,18.389z M25.274,20.635l-0.59,1.032c-0.438,0.765-1.104,1.251-1.639,1.251 c-0.133,0-0.258-0.029-0.369-0.094c-0.15-0.086-0.346-0.127-0.566-0.127c-0.596,0-1.383,0.295-2.01,0.796l-1.96,1.157 c-1.016,0.425-1.846,1.291-1.846,1.929s-0.898,1.159-1.998,1.159H13.14c-1.1,0-1.998-0.514-1.998-1.141s-0.834-1.477-1.854-1.888 l-2.046-1.157c-0.636-0.511-1.425-0.814-2.006-0.814c-0.202,0-0.379,0.037-0.516,0.115c-0.101,0.057-0.214,0.084-0.333,0.084 c-0.518,0-1.179-0.498-1.62-1.271l-0.591-1.032c-0.545-0.954-0.556-1.983-0.024-2.286c0.532-0.305,0.78-1.432,0.551-2.506 c0,0,0-0.003,0-1.042c0-1.088,0.021-1.18,0.021-1.18c0.238-1.072-0.01-2.203-0.552-2.513C1.631,10.8,1.634,9.765,2.18,8.812 L2.769,7.78c0.438-0.766,1.103-1.251,1.636-1.251c0.131,0,0.255,0.029,0.365,0.092C4.92,6.707,5.114,6.747,5.334,6.747 c0.596,0,1.38-0.296,2.007-0.795l1.944-1.065c1.021-0.407,1.856-1.277,1.856-1.933c0-0.656,0.898-1.192,1.998-1.192h1.156V1.761 c1.1,0,1.998,0.545,1.998,1.211c0,0.667,0.832,1.554,1.849,1.973L20,6.013c0.618,0.489,1.401,0.775,2.012,0.775 c0.24,0,0.454-0.045,0.62-0.139c0.122-0.069,0.259-0.102,0.403-0.102c0.551,0,1.221,0.476,1.653,1.231l0.59,1.032 c0.544,0.953,0.518,2.004-0.062,2.334c-0.577,0.331-0.859,1.48-0.627,2.554c0,0,0.01,0.042,0.01,1.103c0,1.012,0,1.012,0,1.012 c-0.218,1.049,0.068,2.174,0.636,2.498C25.802,18.635,25.819,19.68,25.274,20.635z"/><path d="M13.61,7.611c-3.913,0-7.084,3.173-7.084,7.085c0,3.914,3.171,7.085,7.084,7.085s7.085-3.172,7.085-7.085 C20.695,10.784,17.523,7.611,13.61,7.611z M13.61,20.02c-2.936,0-5.323-2.388-5.323-5.323c0-2.935,2.388-5.323,5.323-5.323 s5.324,2.388,5.324,5.323C18.934,17.632,16.546,20.02,13.61,20.02z"/><path d="M13.682,9.908c-2.602,0-4.718,2.116-4.718,4.718c0,2.601,2.116,4.716,4.718,4.716c2.601,0,4.717-2.115,4.717-4.716 C18.399,12.024,16.283,9.908,13.682,9.908z M13.682,17.581c-1.633,0-2.956-1.323-2.956-2.955s1.323-2.956,2.956-2.956 c1.632,0,2.956,1.324,2.956,2.956S15.314,17.581,13.682,17.581z"/></g></svg>
\ No newline at end of file
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 403c8d0160..4ea14ab907 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -3,24 +3,23 @@
     html_playground_url = "https://play.rust-lang.org/"
 )]
 #![feature(rustc_private)]
-#![feature(arbitrary_self_types)]
 #![feature(box_patterns)]
 #![feature(box_syntax)]
 #![feature(in_band_lifetimes)]
 #![feature(nll)]
-#![feature(set_stdio)]
 #![feature(test)]
 #![feature(vec_remove_item)]
 #![feature(ptr_offset_from)]
 #![feature(crate_visibility_modifier)]
-#![feature(drain_filter)]
 #![feature(never_type)]
-#![feature(unicode_internals)]
 #![recursion_limit = "256"]
 
 extern crate env_logger;
 extern crate getopts;
 extern crate rustc;
+extern crate rustc_ast;
+extern crate rustc_ast_pretty;
+extern crate rustc_attr;
 extern crate rustc_data_structures;
 extern crate rustc_driver;
 extern crate rustc_errors;
@@ -28,6 +27,7 @@ extern crate rustc_expand;
 extern crate rustc_feature;
 extern crate rustc_hir;
 extern crate rustc_index;
+extern crate rustc_infer;
 extern crate rustc_interface;
 extern crate rustc_lexer;
 extern crate rustc_lint;
@@ -39,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/markdown.rs b/src/librustdoc/markdown.rs
index 912a40722b..a41fdd2ff1 100644
--- a/src/librustdoc/markdown.rs
+++ b/src/librustdoc/markdown.rs
@@ -5,7 +5,6 @@ use std::path::PathBuf;
 use rustc_feature::UnstableFeatures;
 use rustc_span::edition::Edition;
 use rustc_span::source_map::DUMMY_SP;
-use testing;
 
 use crate::config::{Options, RenderOptions};
 use crate::externalfiles::{load_string, LoadStringError};
@@ -20,7 +19,7 @@ fn extract_leading_metadata(s: &str) -> (Vec<&str>, &str) {
     let mut count = 0;
 
     for line in s.lines() {
-        if line.starts_with("# ") || line.starts_with("%") {
+        if line.starts_with("# ") || line.starts_with('%') {
             // trim the whitespace after the symbol
             metadata.push(line[1..].trim_start());
             count += line.len() + 1;
diff --git a/src/librustdoc/passes/calculate_doc_coverage.rs b/src/librustdoc/passes/calculate_doc_coverage.rs
index 7ed531c920..d4a7f3313a 100644
--- a/src/librustdoc/passes/calculate_doc_coverage.rs
+++ b/src/librustdoc/passes/calculate_doc_coverage.rs
@@ -3,9 +3,9 @@ use crate::core::DocContext;
 use crate::fold::{self, DocFolder};
 use crate::passes::Pass;
 
+use rustc_ast::attr;
 use rustc_span::symbol::sym;
 use rustc_span::FileName;
-use syntax::attr;
 
 use std::collections::BTreeMap;
 use std::ops;
diff --git a/src/librustdoc/passes/check_code_block_syntax.rs b/src/librustdoc/passes/check_code_block_syntax.rs
index 2903fd9dcd..3e0ff0b3d9 100644
--- a/src/librustdoc/passes/check_code_block_syntax.rs
+++ b/src/librustdoc/passes/check_code_block_syntax.rs
@@ -1,10 +1,10 @@
+use rustc_ast::token;
 use rustc_data_structures::sync::{Lock, Lrc};
 use rustc_errors::{emitter::Emitter, Applicability, Diagnostic, Handler};
 use rustc_parse::lexer::StringReader as Lexer;
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::{FilePathMapping, SourceMap};
 use rustc_span::{FileName, InnerSpan};
-use syntax::sess::ParseSess;
-use syntax::token;
 
 use crate::clean;
 use crate::core::DocContext;
@@ -32,9 +32,9 @@ impl<'a, 'tcx> SyntaxChecker<'a, 'tcx> {
 
         let emitter = BufferEmitter { messages: Lrc::clone(&buffered_messages) };
 
-        let cm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
+        let sm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
         let handler = Handler::with_emitter(false, None, Box::new(emitter));
-        let sess = ParseSess::with_span_handler(handler, cm);
+        let sess = ParseSess::with_span_handler(handler, sm);
         let source_file = sess.source_map().new_source_file(
             FileName::Custom(String::from("doctest")),
             dox[code_block.code].to_owned(),
diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs
index 50d5f70f48..7aa90d6678 100644
--- a/src/librustdoc/passes/collect_intra_doc_links.rs
+++ b/src/librustdoc/passes/collect_intra_doc_links.rs
@@ -1,5 +1,6 @@
 use rustc::lint;
 use rustc::ty;
+use rustc_ast::ast::{self, Ident};
 use rustc_errors::Applicability;
 use rustc_expand::base::SyntaxExtensionKind;
 use rustc_feature::UnstableFeatures;
@@ -13,8 +14,6 @@ use rustc_hir::def_id::DefId;
 use rustc_resolve::ParentScope;
 use rustc_span::symbol::Symbol;
 use rustc_span::DUMMY_SP;
-use syntax;
-use syntax::ast::{self, Ident};
 
 use std::ops::Range;
 
@@ -61,7 +60,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
         &self,
         path_str: &str,
         current_item: &Option<String>,
-        module_id: syntax::ast::NodeId,
+        module_id: rustc_ast::ast::NodeId,
     ) -> Result<(Res, Option<String>), ErrorKind> {
         let cx = self.cx;
 
@@ -96,7 +95,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
                     .tcx
                     .inherent_impls(did)
                     .iter()
-                    .flat_map(|imp| cx.tcx.associated_items(*imp))
+                    .flat_map(|imp| cx.tcx.associated_items(*imp).in_definition_order())
                     .any(|item| item.ident.name == variant_name)
                 {
                     return Err(ErrorKind::ResolutionFailure);
@@ -207,7 +206,8 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
                 return cx
                     .tcx
                     .associated_items(did)
-                    .find(|item| item.ident.name == item_name)
+                    .filter_by_name_unhygienic(item_name)
+                    .next()
                     .and_then(|item| match item.kind {
                         ty::AssocKind::Method => Some("method"),
                         _ => None,
@@ -234,7 +234,7 @@ impl<'a, 'tcx> LinkCollector<'a, 'tcx> {
                         .tcx
                         .inherent_impls(did)
                         .iter()
-                        .flat_map(|imp| cx.tcx.associated_items(*imp))
+                        .flat_map(|imp| cx.tcx.associated_items(*imp).in_definition_order())
                         .find(|item| item.ident.name == item_name);
                     if let Some(item) = item {
                         let out = match item.kind {
@@ -348,7 +348,7 @@ impl<'a, 'tcx> DocFolder for LinkCollector<'a, 'tcx> {
         let parent_node = self.cx.as_local_hir_id(item.def_id).and_then(|hir_id| {
             // FIXME: this fails hard for impls in non-module scope, but is necessary for the
             // current `resolve()` implementation.
-            match self.cx.tcx.hir().get_module_parent_node(hir_id) {
+            match self.cx.as_local_hir_id(self.cx.tcx.parent_module(hir_id)).unwrap() {
                 id if id != hir_id => Some(id),
                 _ => None,
             }
@@ -669,39 +669,43 @@ fn build_diagnostic(
     let attrs = &item.attrs;
     let sp = span_of_attrs(attrs).unwrap_or(item.source.span());
 
-    let mut diag = cx.tcx.struct_span_lint_hir(
+    cx.tcx.struct_span_lint_hir(
         lint::builtin::INTRA_DOC_LINK_RESOLUTION_FAILURE,
         hir_id,
         sp,
-        &format!("`[{}]` {}", path_str, err_msg),
+        |lint| {
+            let mut diag = lint.build(&format!("`[{}]` {}", path_str, err_msg));
+            if let Some(link_range) = link_range {
+                if let Some(sp) = super::source_span_for_markdown_range(cx, dox, &link_range, attrs)
+                {
+                    diag.set_span(sp);
+                    diag.span_label(sp, short_err_msg);
+                } else {
+                    // blah blah blah\nblah\nblah [blah] blah blah\nblah blah
+                    //                       ^     ~~~~
+                    //                       |     link_range
+                    //                       last_new_line_offset
+                    let last_new_line_offset =
+                        dox[..link_range.start].rfind('\n').map_or(0, |n| n + 1);
+                    let line = dox[last_new_line_offset..].lines().next().unwrap_or("");
+
+                    // Print the line containing the `link_range` and manually mark it with '^'s.
+                    diag.note(&format!(
+                        "the link appears in this line:\n\n{line}\n\
+                         {indicator: <before$}{indicator:^<found$}",
+                        line = line,
+                        indicator = "",
+                        before = link_range.start - last_new_line_offset,
+                        found = link_range.len(),
+                    ));
+                }
+            };
+            if let Some(help_msg) = help_msg {
+                diag.help(help_msg);
+            }
+            diag.emit();
+        },
     );
-    if let Some(link_range) = link_range {
-        if let Some(sp) = super::source_span_for_markdown_range(cx, dox, &link_range, attrs) {
-            diag.set_span(sp);
-            diag.span_label(sp, short_err_msg);
-        } else {
-            // blah blah blah\nblah\nblah [blah] blah blah\nblah blah
-            //                       ^     ~~~~
-            //                       |     link_range
-            //                       last_new_line_offset
-            let last_new_line_offset = dox[..link_range.start].rfind('\n').map_or(0, |n| n + 1);
-            let line = dox[last_new_line_offset..].lines().next().unwrap_or("");
-
-            // Print the line containing the `link_range` and manually mark it with '^'s.
-            diag.note(&format!(
-                "the link appears in this line:\n\n{line}\n\
-                 {indicator: <before$}{indicator:^<found$}",
-                line = line,
-                indicator = "",
-                before = link_range.start - last_new_line_offset,
-                found = link_range.len(),
-            ));
-        }
-    };
-    if let Some(help_msg) = help_msg {
-        diag.help(help_msg);
-    }
-    diag.emit();
 }
 
 /// Reports a resolution failure diagnostic.
@@ -766,105 +770,108 @@ fn ambiguity_error(
     let attrs = &item.attrs;
     let sp = span_of_attrs(attrs).unwrap_or(item.source.span());
 
-    let mut msg = format!("`{}` is ", path_str);
-
-    let candidates = [TypeNS, ValueNS, MacroNS]
-        .iter()
-        .filter_map(|&ns| candidates[ns].map(|res| (res, ns)))
-        .collect::<Vec<_>>();
-    match candidates.as_slice() {
-        [(first_def, _), (second_def, _)] => {
-            msg += &format!(
-                "both {} {} and {} {}",
-                first_def.article(),
-                first_def.descr(),
-                second_def.article(),
-                second_def.descr(),
-            );
-        }
-        _ => {
-            let mut candidates = candidates.iter().peekable();
-            while let Some((res, _)) = candidates.next() {
-                if candidates.peek().is_some() {
-                    msg += &format!("{} {}, ", res.article(), res.descr());
-                } else {
-                    msg += &format!("and {} {}", res.article(), res.descr());
-                }
-            }
-        }
-    }
-
-    let mut diag = cx.tcx.struct_span_lint_hir(
+    cx.tcx.struct_span_lint_hir(
         lint::builtin::INTRA_DOC_LINK_RESOLUTION_FAILURE,
         hir_id,
         sp,
-        &msg,
-    );
+        |lint| {
+            let mut msg = format!("`{}` is ", path_str);
 
-    if let Some(link_range) = link_range {
-        if let Some(sp) = super::source_span_for_markdown_range(cx, dox, &link_range, attrs) {
-            diag.set_span(sp);
-            diag.span_label(sp, "ambiguous link");
-
-            for (res, ns) in candidates {
-                let (action, mut suggestion) = match res {
-                    Res::Def(DefKind::Method, _) | Res::Def(DefKind::Fn, _) => {
-                        ("add parentheses", format!("{}()", path_str))
-                    }
-                    Res::Def(DefKind::Macro(..), _) => {
-                        ("add an exclamation mark", format!("{}!", path_str))
+            let candidates = [TypeNS, ValueNS, MacroNS]
+                .iter()
+                .filter_map(|&ns| candidates[ns].map(|res| (res, ns)))
+                .collect::<Vec<_>>();
+            match candidates.as_slice() {
+                [(first_def, _), (second_def, _)] => {
+                    msg += &format!(
+                        "both {} {} and {} {}",
+                        first_def.article(),
+                        first_def.descr(),
+                        second_def.article(),
+                        second_def.descr(),
+                    );
+                }
+                _ => {
+                    let mut candidates = candidates.iter().peekable();
+                    while let Some((res, _)) = candidates.next() {
+                        if candidates.peek().is_some() {
+                            msg += &format!("{} {}, ", res.article(), res.descr());
+                        } else {
+                            msg += &format!("and {} {}", res.article(), res.descr());
+                        }
                     }
-                    _ => {
-                        let type_ = match (res, ns) {
-                            (Res::Def(DefKind::Const, _), _) => "const",
-                            (Res::Def(DefKind::Static, _), _) => "static",
-                            (Res::Def(DefKind::Struct, _), _) => "struct",
-                            (Res::Def(DefKind::Enum, _), _) => "enum",
-                            (Res::Def(DefKind::Union, _), _) => "union",
-                            (Res::Def(DefKind::Trait, _), _) => "trait",
-                            (Res::Def(DefKind::Mod, _), _) => "module",
-                            (_, TypeNS) => "type",
-                            (_, ValueNS) => "value",
-                            (_, MacroNS) => "macro",
+                }
+            }
+
+            let mut diag = lint.build(&msg);
+
+            if let Some(link_range) = link_range {
+                if let Some(sp) = super::source_span_for_markdown_range(cx, dox, &link_range, attrs)
+                {
+                    diag.set_span(sp);
+                    diag.span_label(sp, "ambiguous link");
+
+                    for (res, ns) in candidates {
+                        let (action, mut suggestion) = match res {
+                            Res::Def(DefKind::Method, _) | Res::Def(DefKind::Fn, _) => {
+                                ("add parentheses", format!("{}()", path_str))
+                            }
+                            Res::Def(DefKind::Macro(..), _) => {
+                                ("add an exclamation mark", format!("{}!", path_str))
+                            }
+                            _ => {
+                                let type_ = match (res, ns) {
+                                    (Res::Def(DefKind::Const, _), _) => "const",
+                                    (Res::Def(DefKind::Static, _), _) => "static",
+                                    (Res::Def(DefKind::Struct, _), _) => "struct",
+                                    (Res::Def(DefKind::Enum, _), _) => "enum",
+                                    (Res::Def(DefKind::Union, _), _) => "union",
+                                    (Res::Def(DefKind::Trait, _), _) => "trait",
+                                    (Res::Def(DefKind::Mod, _), _) => "module",
+                                    (_, TypeNS) => "type",
+                                    (_, ValueNS) => "value",
+                                    (_, MacroNS) => "macro",
+                                };
+
+                                // FIXME: if this is an implied shortcut link, it's bad style to suggest `@`
+                                ("prefix with the item type", format!("{}@{}", type_, path_str))
+                            }
                         };
 
-                        // FIXME: if this is an implied shortcut link, it's bad style to suggest `@`
-                        ("prefix with the item type", format!("{}@{}", type_, path_str))
-                    }
-                };
+                        if dox.bytes().nth(link_range.start) == Some(b'`') {
+                            suggestion = format!("`{}`", suggestion);
+                        }
 
-                if dox.bytes().nth(link_range.start) == Some(b'`') {
-                    suggestion = format!("`{}`", suggestion);
+                        diag.span_suggestion(
+                            sp,
+                            &format!("to link to the {}, {}", res.descr(), action),
+                            suggestion,
+                            Applicability::MaybeIncorrect,
+                        );
+                    }
+                } else {
+                    // blah blah blah\nblah\nblah [blah] blah blah\nblah blah
+                    //                       ^     ~~~~
+                    //                       |     link_range
+                    //                       last_new_line_offset
+                    let last_new_line_offset =
+                        dox[..link_range.start].rfind('\n').map_or(0, |n| n + 1);
+                    let line = dox[last_new_line_offset..].lines().next().unwrap_or("");
+
+                    // Print the line containing the `link_range` and manually mark it with '^'s.
+                    diag.note(&format!(
+                        "the link appears in this line:\n\n{line}\n\
+                         {indicator: <before$}{indicator:^<found$}",
+                        line = line,
+                        indicator = "",
+                        before = link_range.start - last_new_line_offset,
+                        found = link_range.len(),
+                    ));
                 }
-
-                diag.span_suggestion(
-                    sp,
-                    &format!("to link to the {}, {}", res.descr(), action),
-                    suggestion,
-                    Applicability::MaybeIncorrect,
-                );
             }
-        } else {
-            // blah blah blah\nblah\nblah [blah] blah blah\nblah blah
-            //                       ^     ~~~~
-            //                       |     link_range
-            //                       last_new_line_offset
-            let last_new_line_offset = dox[..link_range.start].rfind('\n').map_or(0, |n| n + 1);
-            let line = dox[last_new_line_offset..].lines().next().unwrap_or("");
-
-            // Print the line containing the `link_range` and manually mark it with '^'s.
-            diag.note(&format!(
-                "the link appears in this line:\n\n{line}\n\
-                 {indicator: <before$}{indicator:^<found$}",
-                line = line,
-                indicator = "",
-                before = link_range.start - last_new_line_offset,
-                found = link_range.len(),
-            ));
-        }
-    }
-
-    diag.emit();
+            diag.emit();
+        },
+    );
 }
 
 /// Given an enum variant's res, return the res of its enum and the associated fragment.
@@ -889,20 +896,20 @@ fn handle_variant(
 }
 
 const PRIMITIVES: &[(&str, Res)] = &[
-    ("u8", Res::PrimTy(hir::PrimTy::Uint(syntax::ast::UintTy::U8))),
-    ("u16", Res::PrimTy(hir::PrimTy::Uint(syntax::ast::UintTy::U16))),
-    ("u32", Res::PrimTy(hir::PrimTy::Uint(syntax::ast::UintTy::U32))),
-    ("u64", Res::PrimTy(hir::PrimTy::Uint(syntax::ast::UintTy::U64))),
-    ("u128", Res::PrimTy(hir::PrimTy::Uint(syntax::ast::UintTy::U128))),
-    ("usize", Res::PrimTy(hir::PrimTy::Uint(syntax::ast::UintTy::Usize))),
-    ("i8", Res::PrimTy(hir::PrimTy::Int(syntax::ast::IntTy::I8))),
-    ("i16", Res::PrimTy(hir::PrimTy::Int(syntax::ast::IntTy::I16))),
-    ("i32", Res::PrimTy(hir::PrimTy::Int(syntax::ast::IntTy::I32))),
-    ("i64", Res::PrimTy(hir::PrimTy::Int(syntax::ast::IntTy::I64))),
-    ("i128", Res::PrimTy(hir::PrimTy::Int(syntax::ast::IntTy::I128))),
-    ("isize", Res::PrimTy(hir::PrimTy::Int(syntax::ast::IntTy::Isize))),
-    ("f32", Res::PrimTy(hir::PrimTy::Float(syntax::ast::FloatTy::F32))),
-    ("f64", Res::PrimTy(hir::PrimTy::Float(syntax::ast::FloatTy::F64))),
+    ("u8", Res::PrimTy(hir::PrimTy::Uint(rustc_ast::ast::UintTy::U8))),
+    ("u16", Res::PrimTy(hir::PrimTy::Uint(rustc_ast::ast::UintTy::U16))),
+    ("u32", Res::PrimTy(hir::PrimTy::Uint(rustc_ast::ast::UintTy::U32))),
+    ("u64", Res::PrimTy(hir::PrimTy::Uint(rustc_ast::ast::UintTy::U64))),
+    ("u128", Res::PrimTy(hir::PrimTy::Uint(rustc_ast::ast::UintTy::U128))),
+    ("usize", Res::PrimTy(hir::PrimTy::Uint(rustc_ast::ast::UintTy::Usize))),
+    ("i8", Res::PrimTy(hir::PrimTy::Int(rustc_ast::ast::IntTy::I8))),
+    ("i16", Res::PrimTy(hir::PrimTy::Int(rustc_ast::ast::IntTy::I16))),
+    ("i32", Res::PrimTy(hir::PrimTy::Int(rustc_ast::ast::IntTy::I32))),
+    ("i64", Res::PrimTy(hir::PrimTy::Int(rustc_ast::ast::IntTy::I64))),
+    ("i128", Res::PrimTy(hir::PrimTy::Int(rustc_ast::ast::IntTy::I128))),
+    ("isize", Res::PrimTy(hir::PrimTy::Int(rustc_ast::ast::IntTy::Isize))),
+    ("f32", Res::PrimTy(hir::PrimTy::Float(rustc_ast::ast::FloatTy::F32))),
+    ("f64", Res::PrimTy(hir::PrimTy::Float(rustc_ast::ast::FloatTy::F64))),
     ("str", Res::PrimTy(hir::PrimTy::Str)),
     ("bool", Res::PrimTy(hir::PrimTy::Bool)),
     ("char", Res::PrimTy(hir::PrimTy::Char)),
diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs
index 355ea15223..71cff637c1 100644
--- a/src/librustdoc/passes/mod.rs
+++ b/src/librustdoc/passes/mod.rs
@@ -340,26 +340,21 @@ pub fn look_for_tests<'tcx>(
 
     find_testable_code(&dox, &mut tests, ErrorCodes::No, false);
 
-    if check_missing_code == true && tests.found_tests == 0 {
+    if check_missing_code && tests.found_tests == 0 {
         let sp = span_of_attrs(&item.attrs).unwrap_or(item.source.span());
-        let mut diag = cx.tcx.struct_span_lint_hir(
-            lint::builtin::MISSING_DOC_CODE_EXAMPLES,
-            hir_id,
-            sp,
-            "missing code example in this documentation",
-        );
-        diag.emit();
-    } else if check_missing_code == false
+        cx.tcx.struct_span_lint_hir(lint::builtin::MISSING_DOC_CODE_EXAMPLES, hir_id, sp, |lint| {
+            lint.build("missing code example in this documentation").emit()
+        });
+    } else if !check_missing_code
         && tests.found_tests > 0
         && !cx.renderinfo.borrow().access_levels.is_public(item.def_id)
     {
-        let mut diag = cx.tcx.struct_span_lint_hir(
+        cx.tcx.struct_span_lint_hir(
             lint::builtin::PRIVATE_DOC_TESTS,
             hir_id,
             span_of_attrs(&item.attrs).unwrap_or(item.source.span()),
-            "documentation test in private item",
+            |lint| lint.build("documentation test in private item").emit(),
         );
-        diag.emit();
     }
 }
 
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index d89dc2adaf..b63dbbf80d 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -1,6 +1,8 @@
 use rustc::hir::map::Map;
 use rustc::session::{self, config, DiagnosticOutput};
 use rustc::util::common::ErrorReported;
+use rustc_ast::ast;
+use rustc_ast::with_globals;
 use rustc_data_structures::sync::Lrc;
 use rustc_feature::UnstableFeatures;
 use rustc_hir as hir;
@@ -17,10 +19,7 @@ use std::panic;
 use std::path::PathBuf;
 use std::process::{self, Command, Stdio};
 use std::str;
-use syntax::ast;
-use syntax::with_globals;
 use tempfile::Builder as TempFileBuilder;
-use testing;
 
 use crate::clean::Attributes;
 use crate::config::Options;
@@ -88,7 +87,7 @@ pub fn run(options: Options) -> i32 {
         compiler.enter(|queries| {
             let lower_to_hir = queries.lower_to_hir()?;
 
-            let mut opts = scrape_test_config(lower_to_hir.peek().0.krate());
+            let mut opts = scrape_test_config(lower_to_hir.peek().0);
             opts.display_warnings |= options.display_warnings;
             let enable_per_target_ignores = options.enable_per_target_ignores;
             let mut collector = Collector::new(
@@ -108,7 +107,7 @@ pub fn run(options: Options) -> i32 {
                 let mut hir_collector = HirCollector {
                     sess: compiler.session(),
                     collector: &mut collector,
-                    map: tcx.hir(),
+                    map: *tcx.hir(),
                     codes: ErrorCodes::from(
                         compiler.session().opts.unstable_features.is_nightly_build(),
                     ),
@@ -141,7 +140,7 @@ pub fn run(options: Options) -> i32 {
 
 // Look for `#![doc(test(no_crate_inject))]`, used by crates in the std facade.
 fn scrape_test_config(krate: &::rustc_hir::Crate) -> TestOptions {
-    use syntax::print::pprust;
+    use rustc_ast_pretty::pprust;
 
     let mut opts =
         TestOptions { no_crate_inject: false, display_warnings: false, attrs: Vec::new() };
@@ -282,7 +281,7 @@ fn run_test(
     for debugging_option_str in &options.debugging_options_strs {
         compiler.arg("-Z").arg(&debugging_option_str);
     }
-    if no_run {
+    if no_run && !compile_fail {
         compiler.arg("--emit=metadata");
     }
     compiler.arg("--target").arg(target.to_string());
@@ -388,27 +387,27 @@ pub fn make_test(
     prog.push_str(&crate_attrs);
     prog.push_str(&crates);
 
-    // Uses libsyntax to parse the doctest and find if there's a main fn and the extern
+    // Uses librustc_ast to parse the doctest and find if there's a main fn and the extern
     // crate already is included.
     let result = rustc_driver::catch_fatal_errors(|| {
         with_globals(edition, || {
             use rustc_errors::emitter::EmitterWriter;
             use rustc_errors::Handler;
             use rustc_parse::maybe_new_parser_from_source_str;
+            use rustc_session::parse::ParseSess;
             use rustc_span::source_map::FilePathMapping;
-            use syntax::sess::ParseSess;
 
             let filename = FileName::anon_source_code(s);
-            let source = crates + &everything_else;
+            let source = crates + everything_else;
 
             // Any errors in parsing should also appear when the doctest is compiled for real, so just
-            // send all the errors that libsyntax emits directly into a `Sink` instead of stderr.
-            let cm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
+            // send all the errors that librustc_ast emits directly into a `Sink` instead of stderr.
+            let sm = Lrc::new(SourceMap::new(FilePathMapping::empty()));
             let emitter =
                 EmitterWriter::new(box io::sink(), None, false, false, false, None, false);
             // FIXME(misdreavus): pass `-Z treat-err-as-bug` to the doctest parser
             let handler = Handler::with_emitter(false, None, box emitter);
-            let sess = ParseSess::with_span_handler(handler, cm);
+            let sess = ParseSess::with_span_handler(handler, sm);
 
             let mut found_main = false;
             let mut found_extern_crate = cratename.is_none();
diff --git a/src/librustdoc/theme.rs b/src/librustdoc/theme.rs
index af1c50acb0..a8a571e7c5 100644
--- a/src/librustdoc/theme.rs
+++ b/src/librustdoc/theme.rs
@@ -179,20 +179,23 @@ fn get_previous_positions(events: &[Events], mut pos: usize) -> Vec<usize> {
 }
 
 fn build_rule(v: &[u8], positions: &[usize]) -> String {
-    positions
-        .chunks(2)
-        .map(|x| ::std::str::from_utf8(&v[x[0]..x[1]]).unwrap_or(""))
-        .collect::<String>()
-        .trim()
-        .replace("\n", " ")
-        .replace("/", "")
-        .replace("\t", " ")
-        .replace("{", "")
-        .replace("}", "")
-        .split(' ')
-        .filter(|s| s.len() > 0)
-        .collect::<Vec<&str>>()
-        .join(" ")
+    minifier::css::minify(
+        &positions
+            .chunks(2)
+            .map(|x| ::std::str::from_utf8(&v[x[0]..x[1]]).unwrap_or(""))
+            .collect::<String>()
+            .trim()
+            .replace("\n", " ")
+            .replace("/", "")
+            .replace("\t", " ")
+            .replace("{", "")
+            .replace("}", "")
+            .split(' ')
+            .filter(|s| !s.is_empty())
+            .collect::<Vec<&str>>()
+            .join(" "),
+    )
+    .unwrap_or_else(|_| String::new())
 }
 
 fn inner(v: &[u8], events: &[Events], pos: &mut usize) -> FxHashSet<CssPath> {
@@ -250,9 +253,9 @@ pub fn get_differences(against: &CssPath, other: &CssPath, v: &mut Vec<String>)
                     break;
                 }
             }
-            if found == false {
+            if !found {
                 v.push(format!("  Missing \"{}\" rule", child.name));
-            } else if found_working == false {
+            } else if !found_working {
                 v.extend(tmp.iter().cloned());
             }
         }
diff --git a/src/librustdoc/theme/tests.rs b/src/librustdoc/theme/tests.rs
index 9ead1d2800..b924215733 100644
--- a/src/librustdoc/theme/tests.rs
+++ b/src/librustdoc/theme/tests.rs
@@ -102,3 +102,16 @@ fn check_invalid_css() {
     let events = load_css_events(b"*");
     assert_eq!(events.len(), 0);
 }
+
+#[test]
+fn test_with_minification() {
+    let text = include_str!("../html/static/themes/dark.css");
+    let minified = minifier::css::minify(&text).expect("CSS minification failed");
+
+    let against = load_css_paths(text.as_bytes());
+    let other = load_css_paths(minified.as_bytes());
+
+    let mut ret = Vec::new();
+    get_differences(&against, &other, &mut ret);
+    assert!(ret.is_empty());
+}
diff --git a/src/librustdoc/visit_ast.rs b/src/librustdoc/visit_ast.rs
index d3d45cccca..8f2f88d08b 100644
--- a/src/librustdoc/visit_ast.rs
+++ b/src/librustdoc/visit_ast.rs
@@ -3,6 +3,7 @@
 
 use rustc::middle::privacy::AccessLevel;
 use rustc::ty::TyCtxt;
+use rustc_ast::ast;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_hir as hir;
 use rustc_hir::def::{DefKind, Res};
@@ -12,7 +13,6 @@ use rustc_span::hygiene::MacroKind;
 use rustc_span::source_map::Spanned;
 use rustc_span::symbol::{kw, sym};
 use rustc_span::{self, Span};
-use syntax::ast;
 
 use std::mem;
 
diff --git a/src/libserialize/leb128.rs b/src/libserialize/leb128.rs
index b8242f7154..1fe6a309e9 100644
--- a/src/libserialize/leb128.rs
+++ b/src/libserialize/leb128.rs
@@ -1,46 +1,14 @@
-#[inline]
-pub fn write_to_vec(vec: &mut Vec<u8>, byte: u8) {
-    vec.push(byte);
-}
-
-#[cfg(target_pointer_width = "32")]
-const USIZE_LEB128_SIZE: usize = 5;
-#[cfg(target_pointer_width = "64")]
-const USIZE_LEB128_SIZE: usize = 10;
-
-macro_rules! leb128_size {
-    (u16) => {
-        3
-    };
-    (u32) => {
-        5
-    };
-    (u64) => {
-        10
-    };
-    (u128) => {
-        19
-    };
-    (usize) => {
-        USIZE_LEB128_SIZE
-    };
-}
-
 macro_rules! impl_write_unsigned_leb128 {
     ($fn_name:ident, $int_ty:ident) => {
         #[inline]
         pub fn $fn_name(out: &mut Vec<u8>, mut value: $int_ty) {
-            for _ in 0..leb128_size!($int_ty) {
-                let mut byte = (value & 0x7F) as u8;
-                value >>= 7;
-                if value != 0 {
-                    byte |= 0x80;
-                }
-
-                write_to_vec(out, byte);
-
-                if value == 0 {
+            loop {
+                if value < 0x80 {
+                    out.push(value as u8);
                     break;
+                } else {
+                    out.push(((value & 0x7f) | 0x80) as u8);
+                    value >>= 7;
                 }
             }
         }
@@ -57,24 +25,20 @@ macro_rules! impl_read_unsigned_leb128 {
     ($fn_name:ident, $int_ty:ident) => {
         #[inline]
         pub fn $fn_name(slice: &[u8]) -> ($int_ty, usize) {
-            let mut result: $int_ty = 0;
+            let mut result = 0;
             let mut shift = 0;
             let mut position = 0;
-
-            for _ in 0..leb128_size!($int_ty) {
-                let byte = unsafe { *slice.get_unchecked(position) };
+            loop {
+                let byte = slice[position];
                 position += 1;
-                result |= ((byte & 0x7F) as $int_ty) << shift;
                 if (byte & 0x80) == 0 {
-                    break;
+                    result |= (byte as $int_ty) << shift;
+                    return (result, position);
+                } else {
+                    result |= ((byte & 0x7F) as $int_ty) << shift;
                 }
                 shift += 7;
             }
-
-            // Do a single bounds check at the end instead of for every byte.
-            assert!(position <= slice.len());
-
-            (result, position)
         }
     };
 }
@@ -116,7 +80,7 @@ where
 
 #[inline]
 pub fn write_signed_leb128(out: &mut Vec<u8>, value: i128) {
-    write_signed_leb128_to(value, |v| write_to_vec(out, v))
+    write_signed_leb128_to(value, |v| out.push(v))
 }
 
 #[inline]
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 280fb078f7..b990e71bef 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -10,7 +10,6 @@ Core encoding and decoding interfaces.
     test(attr(allow(unused_variables), deny(warnings)))
 )]
 #![feature(box_syntax)]
-#![feature(core_intrinsics)]
 #![feature(specialization)]
 #![feature(never_type)]
 #![feature(nll)]
diff --git a/src/libserialize/opaque.rs b/src/libserialize/opaque.rs
index e808d98199..39f3abb752 100644
--- a/src/libserialize/opaque.rs
+++ b/src/libserialize/opaque.rs
@@ -192,7 +192,7 @@ impl<'a> Decoder<'a> {
 }
 
 macro_rules! read_uleb128 {
-    ($dec:expr, $t:ty, $fun:ident) => {{
+    ($dec:expr, $fun:ident) => {{
         let (value, bytes_read) = leb128::$fun(&$dec.data[$dec.position..]);
         $dec.position += bytes_read;
         Ok(value)
@@ -217,22 +217,22 @@ impl<'a> serialize::Decoder for Decoder<'a> {
 
     #[inline]
     fn read_u128(&mut self) -> Result<u128, Self::Error> {
-        read_uleb128!(self, u128, read_u128_leb128)
+        read_uleb128!(self, read_u128_leb128)
     }
 
     #[inline]
     fn read_u64(&mut self) -> Result<u64, Self::Error> {
-        read_uleb128!(self, u64, read_u64_leb128)
+        read_uleb128!(self, read_u64_leb128)
     }
 
     #[inline]
     fn read_u32(&mut self) -> Result<u32, Self::Error> {
-        read_uleb128!(self, u32, read_u32_leb128)
+        read_uleb128!(self, read_u32_leb128)
     }
 
     #[inline]
     fn read_u16(&mut self) -> Result<u16, Self::Error> {
-        read_uleb128!(self, u16, read_u16_leb128)
+        read_uleb128!(self, read_u16_leb128)
     }
 
     #[inline]
@@ -244,7 +244,7 @@ impl<'a> serialize::Decoder for Decoder<'a> {
 
     #[inline]
     fn read_usize(&mut self) -> Result<usize, Self::Error> {
-        read_uleb128!(self, usize, read_usize_leb128)
+        read_uleb128!(self, read_usize_leb128)
     }
 
     #[inline]
diff --git a/src/libserialize/serialize.rs b/src/libserialize/serialize.rs
index 19283ffc43..8c6548cd3c 100644
--- a/src/libserialize/serialize.rs
+++ b/src/libserialize/serialize.rs
@@ -36,6 +36,7 @@ pub trait Encoder {
     fn emit_str(&mut self, v: &str) -> Result<(), Self::Error>;
 
     // Compound types:
+    #[inline]
     fn emit_enum<F>(&mut self, _name: &str, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -57,6 +58,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_enum_variant_arg<F>(&mut self, _a_idx: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -89,6 +91,7 @@ pub trait Encoder {
         self.emit_enum_variant_arg(f_idx, f)
     }
 
+    #[inline]
     fn emit_struct<F>(&mut self, _name: &str, _len: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -96,6 +99,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_struct_field<F>(
         &mut self,
         _f_name: &str,
@@ -108,6 +112,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_tuple<F>(&mut self, _len: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -115,6 +120,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_tuple_arg<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -164,6 +170,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_seq_elt<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -179,6 +186,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_map_elt_key<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -186,6 +194,7 @@ pub trait Encoder {
         f(self)
     }
 
+    #[inline]
     fn emit_map_elt_val<F>(&mut self, _idx: usize, f: F) -> Result<(), Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<(), Self::Error>,
@@ -218,6 +227,7 @@ pub trait Decoder {
     fn read_str(&mut self) -> Result<Cow<'_, str>, Self::Error>;
 
     // Compound types:
+    #[inline]
     fn read_enum<T, F>(&mut self, _name: &str, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -225,6 +235,7 @@ pub trait Decoder {
         f(self)
     }
 
+    #[inline]
     fn read_enum_variant<T, F>(&mut self, _names: &[&str], mut f: F) -> Result<T, Self::Error>
     where
         F: FnMut(&mut Self, usize) -> Result<T, Self::Error>,
@@ -233,6 +244,7 @@ pub trait Decoder {
         f(self, disr)
     }
 
+    #[inline]
     fn read_enum_variant_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -259,6 +271,7 @@ pub trait Decoder {
         self.read_enum_variant_arg(f_idx, f)
     }
 
+    #[inline]
     fn read_struct<T, F>(&mut self, _s_name: &str, _len: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -266,6 +279,7 @@ pub trait Decoder {
         f(self)
     }
 
+    #[inline]
     fn read_struct_field<T, F>(
         &mut self,
         _f_name: &str,
@@ -278,6 +292,7 @@ pub trait Decoder {
         f(self)
     }
 
+    #[inline]
     fn read_tuple<T, F>(&mut self, _len: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -285,6 +300,7 @@ pub trait Decoder {
         f(self)
     }
 
+    #[inline]
     fn read_tuple_arg<T, F>(&mut self, _a_idx: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -328,6 +344,7 @@ pub trait Decoder {
         f(self, len)
     }
 
+    #[inline]
     fn read_seq_elt<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -343,6 +360,7 @@ pub trait Decoder {
         f(self, len)
     }
 
+    #[inline]
     fn read_map_elt_key<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
@@ -350,6 +368,7 @@ pub trait Decoder {
         f(self)
     }
 
+    #[inline]
     fn read_map_elt_val<T, F>(&mut self, _idx: usize, f: F) -> Result<T, Self::Error>
     where
         F: FnOnce(&mut Self) -> Result<T, Self::Error>,
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index c9ff93eac0..b147aa55b2 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -27,7 +27,7 @@ hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-de
 
 [dependencies.backtrace_rs]
 package = "backtrace"
-version = "0.3.37"
+version = "0.3.44"
 default-features = false # without the libstd `backtrace` feature, stub out everything
 features = [ "rustc-dep-of-std" ] # enable build support for integrating into libstd
 
diff --git a/src/libstd/alloc.rs b/src/libstd/alloc.rs
index 7fd55af169..25f3ddcbeb 100644
--- a/src/libstd/alloc.rs
+++ b/src/libstd/alloc.rs
@@ -133,22 +133,41 @@ pub use alloc_crate::alloc::*;
 #[derive(Debug, Default, Copy, Clone)]
 pub struct System;
 
-// The Alloc impl just forwards to the GlobalAlloc impl, which is in `std::sys::*::alloc`.
+// The AllocRef impl checks the layout size to be non-zero and forwards to the GlobalAlloc impl,
+// which is in `std::sys::*::alloc`.
 #[unstable(feature = "allocator_api", issue = "32838")]
-unsafe impl Alloc for System {
+unsafe impl AllocRef for System {
     #[inline]
-    unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
-        NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr)
+    fn alloc(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
+        if layout.size() == 0 {
+            Ok((layout.dangling(), 0))
+        } else {
+            unsafe {
+                NonNull::new(GlobalAlloc::alloc(self, layout))
+                    .ok_or(AllocErr)
+                    .map(|p| (p, layout.size()))
+            }
+        }
     }
 
     #[inline]
-    unsafe fn alloc_zeroed(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
-        NonNull::new(GlobalAlloc::alloc_zeroed(self, layout)).ok_or(AllocErr)
+    fn alloc_zeroed(&mut self, layout: Layout) -> Result<(NonNull<u8>, usize), AllocErr> {
+        if layout.size() == 0 {
+            Ok((layout.dangling(), 0))
+        } else {
+            unsafe {
+                NonNull::new(GlobalAlloc::alloc_zeroed(self, layout))
+                    .ok_or(AllocErr)
+                    .map(|p| (p, layout.size()))
+            }
+        }
     }
 
     #[inline]
     unsafe fn dealloc(&mut self, ptr: NonNull<u8>, layout: Layout) {
-        GlobalAlloc::dealloc(self, ptr.as_ptr(), layout)
+        if layout.size() != 0 {
+            GlobalAlloc::dealloc(self, ptr.as_ptr(), layout)
+        }
     }
 
     #[inline]
@@ -157,8 +176,18 @@ unsafe impl Alloc for System {
         ptr: NonNull<u8>,
         layout: Layout,
         new_size: usize,
-    ) -> Result<NonNull<u8>, AllocErr> {
-        NonNull::new(GlobalAlloc::realloc(self, ptr.as_ptr(), layout, new_size)).ok_or(AllocErr)
+    ) -> Result<(NonNull<u8>, usize), AllocErr> {
+        match (layout.size(), new_size) {
+            (0, 0) => Ok((layout.dangling(), 0)),
+            (0, _) => self.alloc(Layout::from_size_align_unchecked(new_size, layout.align())),
+            (_, 0) => {
+                self.dealloc(ptr, layout);
+                Ok((layout.dangling(), 0))
+            }
+            (_, _) => NonNull::new(GlobalAlloc::realloc(self, ptr.as_ptr(), layout, new_size))
+                .ok_or(AllocErr)
+                .map(|p| (p, new_size)),
+        }
     }
 }
 
diff --git a/src/libstd/backtrace.rs b/src/libstd/backtrace.rs
index 5ba1c94025..97db0ff379 100644
--- a/src/libstd/backtrace.rs
+++ b/src/libstd/backtrace.rs
@@ -159,6 +159,69 @@ enum BytesOrWide {
     Wide(Vec<u16>),
 }
 
+impl fmt::Debug for Backtrace {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let mut capture = match &self.inner {
+            Inner::Unsupported => return fmt.write_str("unsupported backtrace"),
+            Inner::Disabled => return fmt.write_str("disabled backtrace"),
+            Inner::Captured(c) => c.lock().unwrap(),
+        };
+        capture.resolve();
+
+        let frames = &capture.frames[capture.actual_start..];
+
+        write!(fmt, "Backtrace ")?;
+
+        let mut dbg = fmt.debug_list();
+
+        for frame in frames {
+            if frame.frame.ip().is_null() {
+                continue;
+            }
+
+            dbg.entries(&frame.symbols);
+        }
+
+        dbg.finish()
+    }
+}
+
+impl fmt::Debug for BacktraceSymbol {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(fmt, "{{ ")?;
+
+        if let Some(fn_name) = self.name.as_ref().map(|b| backtrace::SymbolName::new(b)) {
+            write!(fmt, "fn: \"{:#}\"", fn_name)?;
+        } else {
+            write!(fmt, "fn: \"<unknown>\"")?;
+        }
+
+        if let Some(fname) = self.filename.as_ref() {
+            write!(fmt, ", file: {:?}", fname)?;
+        }
+
+        if let Some(line) = self.lineno.as_ref() {
+            write!(fmt, ", line: {:?}", line)?;
+        }
+
+        write!(fmt, " }}")
+    }
+}
+
+impl fmt::Debug for BytesOrWide {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
+        output_filename(
+            fmt,
+            match self {
+                BytesOrWide::Bytes(w) => BytesOrWideString::Bytes(w),
+                BytesOrWide::Wide(w) => BytesOrWideString::Wide(w),
+            },
+            backtrace::PrintFmt::Short,
+            crate::env::current_dir().as_ref().ok(),
+        )
+    }
+}
+
 impl Backtrace {
     /// Returns whether backtrace captures are enabled through environment
     /// variables.
@@ -241,7 +304,7 @@ impl Backtrace {
         // If no frames came out assume that this is an unsupported platform
         // since `backtrace` doesn't provide a way of learning this right now,
         // and this should be a good enough approximation.
-        let inner = if frames.len() == 0 {
+        let inner = if frames.is_empty() {
             Inner::Unsupported
         } else {
             Inner::Captured(Mutex::new(Capture {
@@ -267,12 +330,6 @@ impl Backtrace {
 }
 
 impl fmt::Display for Backtrace {
-    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
-        fmt::Debug::fmt(self, fmt)
-    }
-}
-
-impl fmt::Debug for Backtrace {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut capture = match &self.inner {
             Inner::Unsupported => return fmt.write_str("unsupported backtrace"),
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
index fdc587ba5d..44f8e8bd17 100644
--- a/src/libstd/collections/hash/map.rs
+++ b/src/libstd/collections/hash/map.rs
@@ -203,7 +203,7 @@ pub struct HashMap<K, V, S = RandomState> {
     base: base::HashMap<K, V, S>,
 }
 
-impl<K: Hash + Eq, V> HashMap<K, V, RandomState> {
+impl<K, V> HashMap<K, V, RandomState> {
     /// Creates an empty `HashMap`.
     ///
     /// The hash map is initially created with a capacity of 0, so it will not allocate until it
@@ -240,6 +240,59 @@ impl<K: Hash + Eq, V> HashMap<K, V, RandomState> {
 }
 
 impl<K, V, S> HashMap<K, V, S> {
+    /// Creates an empty `HashMap` which will use the given hash builder to hash
+    /// keys.
+    ///
+    /// The created map has the default initial capacity.
+    ///
+    /// Warning: `hash_builder` is normally randomly generated, and
+    /// is designed to allow HashMaps to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    /// use std::collections::hash_map::RandomState;
+    ///
+    /// let s = RandomState::new();
+    /// let mut map = HashMap::with_hasher(s);
+    /// map.insert(1, 2);
+    /// ```
+    #[inline]
+    #[stable(feature = "hashmap_build_hasher", since = "1.7.0")]
+    pub fn with_hasher(hash_builder: S) -> HashMap<K, V, S> {
+        HashMap { base: base::HashMap::with_hasher(hash_builder) }
+    }
+
+    /// Creates an empty `HashMap` with the specified capacity, using `hash_builder`
+    /// to hash the keys.
+    ///
+    /// The hash map will be able to hold at least `capacity` elements without
+    /// reallocating. If `capacity` is 0, the hash map will not allocate.
+    ///
+    /// Warning: `hash_builder` is normally randomly generated, and
+    /// is designed to allow HashMaps to be resistant to attacks that
+    /// cause many collisions and very poor performance. Setting it
+    /// manually using this function can expose a DoS attack vector.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::collections::HashMap;
+    /// use std::collections::hash_map::RandomState;
+    ///
+    /// let s = RandomState::new();
+    /// let mut map = HashMap::with_capacity_and_hasher(10, s);
+    /// map.insert(1, 2);
+    /// ```
+    #[inline]
+    #[stable(feature = "hashmap_build_hasher", since = "1.7.0")]
+    pub fn with_capacity_and_hasher(capacity: usize, hash_builder: S) -> HashMap<K, V, S> {
+        HashMap { base: base::HashMap::with_capacity_and_hasher(capacity, hash_builder) }
+    }
+
     /// Returns the number of elements the map can hold without reallocating.
     ///
     /// This number is a lower bound; the `HashMap<K, V>` might be able to hold
@@ -457,65 +510,6 @@ impl<K, V, S> HashMap<K, V, S> {
     pub fn clear(&mut self) {
         self.base.clear();
     }
-}
-
-impl<K, V, S> HashMap<K, V, S>
-where
-    K: Eq + Hash,
-    S: BuildHasher,
-{
-    /// Creates an empty `HashMap` which will use the given hash builder to hash
-    /// keys.
-    ///
-    /// The created map has the default initial capacity.
-    ///
-    /// Warning: `hash_builder` is normally randomly generated, and
-    /// is designed to allow HashMaps to be resistant to attacks that
-    /// cause many collisions and very poor performance. Setting it
-    /// manually using this function can expose a DoS attack vector.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::collections::HashMap;
-    /// use std::collections::hash_map::RandomState;
-    ///
-    /// let s = RandomState::new();
-    /// let mut map = HashMap::with_hasher(s);
-    /// map.insert(1, 2);
-    /// ```
-    #[inline]
-    #[stable(feature = "hashmap_build_hasher", since = "1.7.0")]
-    pub fn with_hasher(hash_builder: S) -> HashMap<K, V, S> {
-        HashMap { base: base::HashMap::with_hasher(hash_builder) }
-    }
-
-    /// Creates an empty `HashMap` with the specified capacity, using `hash_builder`
-    /// to hash the keys.
-    ///
-    /// The hash map will be able to hold at least `capacity` elements without
-    /// reallocating. If `capacity` is 0, the hash map will not allocate.
-    ///
-    /// Warning: `hash_builder` is normally randomly generated, and
-    /// is designed to allow HashMaps to be resistant to attacks that
-    /// cause many collisions and very poor performance. Setting it
-    /// manually using this function can expose a DoS attack vector.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use std::collections::HashMap;
-    /// use std::collections::hash_map::RandomState;
-    ///
-    /// let s = RandomState::new();
-    /// let mut map = HashMap::with_capacity_and_hasher(10, s);
-    /// map.insert(1, 2);
-    /// ```
-    #[inline]
-    #[stable(feature = "hashmap_build_hasher", since = "1.7.0")]
-    pub fn with_capacity_and_hasher(capacity: usize, hash_builder: S) -> HashMap<K, V, S> {
-        HashMap { base: base::HashMap::with_capacity_and_hasher(capacity, hash_builder) }
-    }
 
     /// Returns a reference to the map's [`BuildHasher`].
     ///
@@ -536,7 +530,13 @@ where
     pub fn hasher(&self) -> &S {
         self.base.hasher()
     }
+}
 
+impl<K, V, S> HashMap<K, V, S>
+where
+    K: Eq + Hash,
+    S: BuildHasher,
+{
     /// Reserves capacity for at least `additional` more elements to be inserted
     /// in the `HashMap`. The collection may reserve more space to avoid
     /// frequent reallocations.
@@ -984,9 +984,8 @@ where
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<K, V, S> Debug for HashMap<K, V, S>
 where
-    K: Eq + Hash + Debug,
+    K: Debug,
     V: Debug,
-    S: BuildHasher,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_map().entries(self.iter()).finish()
@@ -996,8 +995,7 @@ where
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<K, V, S> Default for HashMap<K, V, S>
 where
-    K: Eq + Hash,
-    S: BuildHasher + Default,
+    S: Default,
 {
     /// Creates an empty `HashMap<K, V, S>`, with the `Default` value for the hasher.
     #[inline]
@@ -2463,7 +2461,7 @@ impl RandomState {
         KEYS.with(|keys| {
             let (k0, k1) = keys.get();
             keys.set((k0.wrapping_add(1), k1));
-            RandomState { k0: k0, k1: k1 }
+            RandomState { k0, k1 }
         })
     }
 }
diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs
index b48700fb94..1ad99f0370 100644
--- a/src/libstd/collections/hash/set.rs
+++ b/src/libstd/collections/hash/set.rs
@@ -110,7 +110,7 @@ pub struct HashSet<T, S = RandomState> {
     map: HashMap<T, (), S>,
 }
 
-impl<T: Hash + Eq> HashSet<T, RandomState> {
+impl<T> HashSet<T, RandomState> {
     /// Creates an empty `HashSet`.
     ///
     /// The hash set is initially created with a capacity of 0, so it will not allocate until it
@@ -261,13 +261,7 @@ impl<T, S> HashSet<T, S> {
     pub fn clear(&mut self) {
         self.map.clear()
     }
-}
 
-impl<T, S> HashSet<T, S>
-where
-    T: Eq + Hash,
-    S: BuildHasher,
-{
     /// Creates a new empty hash set which will use the given hasher to hash
     /// keys.
     ///
@@ -340,7 +334,13 @@ where
     pub fn hasher(&self) -> &S {
         self.map.hasher()
     }
+}
 
+impl<T, S> HashSet<T, S>
+where
+    T: Eq + Hash,
+    S: BuildHasher,
+{
     /// Reserves capacity for at least `additional` more elements to be inserted
     /// in the `HashSet`. The collection may reserve more space to avoid
     /// frequent reallocations.
@@ -928,8 +928,7 @@ where
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T, S> fmt::Debug for HashSet<T, S>
 where
-    T: Eq + Hash + fmt::Debug,
-    S: BuildHasher,
+    T: fmt::Debug,
 {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_set().entries(self.iter()).finish()
@@ -977,8 +976,7 @@ where
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<T, S> Default for HashSet<T, S>
 where
-    T: Eq + Hash,
-    S: BuildHasher + Default,
+    S: Default,
 {
     /// Creates an empty `HashSet<T, S>` with the `Default` value for the hasher.
     #[inline]
diff --git a/src/libstd/f32.rs b/src/libstd/f32.rs
index 941ea6a767..20425aea8d 100644
--- a/src/libstd/f32.rs
+++ b/src/libstd/f32.rs
@@ -4,6 +4,9 @@
 //! *[See also the `f32` primitive type](../../std/primitive.f32.html).*
 //!
 //! Mathematically significant numbers are provided in the `consts` sub-module.
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![allow(missing_docs)]
diff --git a/src/libstd/f64.rs b/src/libstd/f64.rs
index d89b38e1a0..a1128a589a 100644
--- a/src/libstd/f64.rs
+++ b/src/libstd/f64.rs
@@ -4,6 +4,9 @@
 //! *[See also the `f64` primitive type](../../std/primitive.f64.html).*
 //!
 //! Mathematically significant numbers are provided in the `consts` sub-module.
+//!
+//! Although using these constants won’t cause compilation warnings,
+//! new code should use the associated constants directly on the primitive type.
 
 #![stable(feature = "rust1", since = "1.0.0")]
 #![allow(missing_docs)]
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 700e015b08..04eaba515f 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -6,6 +6,7 @@ use crate::fmt::{self, Write};
 use crate::io;
 use crate::mem;
 use crate::memchr;
+use crate::num::NonZeroU8;
 use crate::ops;
 use crate::os::raw::c_char;
 use crate::ptr;
@@ -741,6 +742,32 @@ impl From<Box<CStr>> for CString {
     }
 }
 
+#[stable(feature = "cstring_from_vec_of_nonzerou8", since = "1.43.0")]
+impl From<Vec<NonZeroU8>> for CString {
+    /// Converts a [`Vec`]`<`[`NonZeroU8`]`>` into a [`CString`] without
+    /// copying nor checking for inner null bytes.
+    ///
+    /// [`CString`]: ../ffi/struct.CString.html
+    /// [`NonZeroU8`]: ../num/struct.NonZeroU8.html
+    /// [`Vec`]: ../vec/struct.Vec.html
+    #[inline]
+    fn from(v: Vec<NonZeroU8>) -> CString {
+        unsafe {
+            // Transmute `Vec<NonZeroU8>` to `Vec<u8>`.
+            let v: Vec<u8> = {
+                // Safety:
+                //   - transmuting between `NonZeroU8` and `u8` is sound;
+                //   - `alloc::Layout<NonZeroU8> == alloc::Layout<u8>`.
+                let (ptr, len, cap): (*mut NonZeroU8, _, _) = Vec::into_raw_parts(v);
+                Vec::from_raw_parts(ptr.cast::<u8>(), len, cap)
+            };
+            // Safety: `v` cannot contain null bytes, given the type-level
+            // invariant of `NonZeroU8`.
+            CString::from_vec_unchecked(v)
+        }
+    }
+}
+
 #[stable(feature = "more_box_slice_clone", since = "1.29.0")]
 impl Clone for Box<CStr> {
     #[inline]
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index cff7bbe5ef..e20fcfafa2 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -407,7 +407,7 @@ impl File {
     ///
     /// It is equivalent to `OpenOptions::new()` but allows you to write more
     /// readable code. Instead of `OpenOptions::new().read(true).open("foo.txt")`
-    /// you can write `File::with_options().read(true).open("foo.txt"). This
+    /// you can write `File::with_options().read(true).open("foo.txt")`. This
     /// also avoids the need to import `OpenOptions`.
     ///
     /// See the [`OpenOptions::new`] function for more details.
@@ -844,10 +844,7 @@ impl OpenOptions {
         self
     }
 
-    /// Sets the option for creating a new file.
-    ///
-    /// This option indicates whether a new file will be created if the file
-    /// does not yet already exist.
+    /// Sets the option to create a new file, or open it if it already exists.
     ///
     /// In order for the file to be created, [`write`] or [`append`] access must
     /// be used.
@@ -868,11 +865,10 @@ impl OpenOptions {
         self
     }
 
-    /// Sets the option to always create a new file.
+    /// Sets the option to create a new file, failing if it already exists.
     ///
-    /// This option indicates whether a new file will be created.
-    /// No file is allowed to exist at the target location, also no (dangling)
-    /// symlink.
+    /// No file is allowed to exist at the target location, also no (dangling) symlink. In this
+    /// way, if the call succeeds, the file returned is guaranteed to be new.
     ///
     /// This option is useful because it is atomic. Otherwise between checking
     /// whether a file exists and creating a new one, the file may have been
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index 9c7422c2b2..7b1beb1ecd 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -16,9 +16,10 @@ pub use core::future::*;
 ///
 /// This function returns a `GenFuture` underneath, but hides it in `impl Trait` to give
 /// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`).
+// This is `const` to avoid extra errors after we recover from `const async fn`
 #[doc(hidden)]
 #[unstable(feature = "gen_future", issue = "50547")]
-pub fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T::Return> {
+pub const fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T::Return> {
     GenFuture(x)
 }
 
@@ -40,7 +41,10 @@ impl<T: Generator<Yield = ()>> Future for GenFuture<T> {
         // Safe because we're !Unpin + !Drop mapping to a ?Unpin value
         let gen = unsafe { Pin::map_unchecked_mut(self, |s| &mut s.0) };
         let _guard = unsafe { set_task_context(cx) };
-        match gen.resume() {
+        match gen.resume(
+            #[cfg(not(bootstrap))]
+            (),
+        ) {
             GeneratorState::Yielded(()) => Poll::Pending,
             GeneratorState::Complete(x) => Poll::Ready(x),
         }
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs
index 9e6849ba5b..8862226adb 100644
--- a/src/libstd/io/buffered.rs
+++ b/src/libstd/io/buffered.rs
@@ -179,6 +179,30 @@ impl<R> BufReader<R> {
         &self.buf[self.pos..self.cap]
     }
 
+    /// Returns the number of bytes the internal buffer can hold at once.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// #![feature(buffered_io_capacity)]
+    /// use std::io::{BufReader, BufRead};
+    /// use std::fs::File;
+    ///
+    /// fn main() -> std::io::Result<()> {
+    ///     let f = File::open("log.txt")?;
+    ///     let mut reader = BufReader::new(f);
+    ///
+    ///     let capacity = reader.capacity();
+    ///     let buffer = reader.fill_buf()?;
+    ///     assert!(buffer.len() <= capacity);
+    ///     Ok(())
+    /// }
+    /// ```
+    #[unstable(feature = "buffered_io_capacity", issue = "68833")]
+    pub fn capacity(&self) -> usize {
+        self.buf.len()
+    }
+
     /// Unwraps this `BufReader<R>`, returning the underlying reader.
     ///
     /// Note that any leftover data in the internal buffer is lost. Therefore,
@@ -576,6 +600,27 @@ impl<W: Write> BufWriter<W> {
         &self.buf
     }
 
+    /// Returns the number of bytes the internal buffer can hold without flushing.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// #![feature(buffered_io_capacity)]
+    /// use std::io::BufWriter;
+    /// use std::net::TcpStream;
+    ///
+    /// let buf_writer = BufWriter::new(TcpStream::connect("127.0.0.1:34254").unwrap());
+    ///
+    /// // Check the capacity of the inner buffer
+    /// let capacity = buf_writer.capacity();
+    /// // Calculate how many bytes can be written without flushing
+    /// let without_flush = capacity - buf_writer.buffer().len();
+    /// ```
+    #[unstable(feature = "buffered_io_capacity", issue = "68833")]
+    pub fn capacity(&self) -> usize {
+        self.buf.capacity()
+    }
+
     /// Unwraps this `BufWriter<W>`, returning the underlying writer.
     ///
     /// The buffer is written out before returning the writer.
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs
index 9787cbb556..f36aa1846a 100644
--- a/src/libstd/io/cursor.rs
+++ b/src/libstd/io/cursor.rs
@@ -96,7 +96,7 @@ impl<T> Cursor<T> {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn new(inner: T) -> Cursor<T> {
-        Cursor { pos: 0, inner: inner }
+        Cursor { pos: 0, inner }
     }
 
     /// Consumes this cursor, returning the underlying value.
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 95c8934b3d..420d6ea589 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -371,7 +371,7 @@ where
     F: FnMut(&R) -> usize,
 {
     let start_len = buf.len();
-    let mut g = Guard { len: buf.len(), buf: buf };
+    let mut g = Guard { len: buf.len(), buf };
     let ret;
     loop {
         if g.len == g.buf.len() {
@@ -497,7 +497,6 @@ where
 /// [`&str`]: ../../std/primitive.str.html
 /// [slice]: ../../std/primitive.slice.html
 #[stable(feature = "rust1", since = "1.0.0")]
-#[doc(spotlight)]
 pub trait Read {
     /// Pull some bytes from this source into the specified buffer, returning
     /// how many bytes were read.
@@ -939,7 +938,7 @@ pub trait Read {
     where
         Self: Sized,
     {
-        Take { inner: self, limit: limit }
+        Take { inner: self, limit }
     }
 }
 
@@ -1228,7 +1227,6 @@ impl Initializer {
 ///
 /// [`write_all`]: #method.write_all
 #[stable(feature = "rust1", since = "1.0.0")]
-#[doc(spotlight)]
 pub trait Write {
     /// Write a buffer into this writer, returning how many bytes were written.
     ///
@@ -1327,6 +1325,8 @@ pub trait Write {
     /// not of [`ErrorKind::Interrupted`] kind generated from this method will be
     /// returned.
     ///
+    /// If the buffer contains no data, this will never call [`write`].
+    ///
     /// # Errors
     ///
     /// This function will return the first error of
@@ -2394,9 +2394,9 @@ impl<B: BufRead> Iterator for Lines<B> {
         match self.buf.read_line(&mut buf) {
             Ok(0) => None,
             Ok(_n) => {
-                if buf.ends_with("\n") {
+                if buf.ends_with('\n') {
                     buf.pop();
-                    if buf.ends_with("\r") {
+                    if buf.ends_with('\r') {
                         buf.pop();
                     }
                 }
diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs
index 6add644dcc..d410faca30 100644
--- a/src/libstd/io/stdio.rs
+++ b/src/libstd/io/stdio.rs
@@ -302,7 +302,7 @@ impl Stdin {
         StdinLock { inner: self.inner.lock().unwrap_or_else(|e| e.into_inner()) }
     }
 
-    /// Locks this handle and reads a line of input into the specified buffer.
+    /// Locks this handle and reads a line of input, appending it to the specified buffer.
     ///
     /// For detailed semantics of this method, see the documentation on
     /// [`BufRead::read_line`].
diff --git a/src/libstd/keyword_docs.rs b/src/libstd/keyword_docs.rs
index 5c7ee9bded..3c69c1160d 100644
--- a/src/libstd/keyword_docs.rs
+++ b/src/libstd/keyword_docs.rs
@@ -895,6 +895,15 @@ mod mod_keyword {}
 /// // x is no longer available
 /// ```
 ///
+/// `move` is also valid before an async block.
+///
+/// ```rust
+/// let capture = "hello";
+/// let block = async move {
+///     println!("rust says {} from async block", capture);
+/// };
+/// ```
+///
 /// For more information on the `move` keyword, see the [closure]'s section
 /// of the Rust book or the [threads] section
 ///
@@ -1100,10 +1109,28 @@ mod trait_keyword {}
 //
 /// A value of type [`bool`] representing logical **true**.
 ///
-/// The documentation for this keyword is [not yet complete]. Pull requests welcome!
+/// Logically `true` is not equal to [`false`].
+///
+/// ## Control structures that check for **true**
+///
+/// Several of Rust's control structures will check for a `bool` condition evaluating to **true**.
+///
+///   * The condition in an [`if`] expression must be of type `bool`.
+///     Whenever that condition evaluates to **true**, the `if` expression takes
+///     on the value of the first block. If however, the condition evaluates
+///     to `false`, the expression takes on value of the `else` block if there is one.
+///
+///   * [`while`] is another control flow construct expecting a `bool`-typed condition.
+///     As long as the condition evaluates to **true**, the `while` loop will continually
+///     evaluate its associated block.
 ///
+///   * [`match`] arms can have guard clauses on them.
+///
+/// [`if`]: keyword.if.html
+/// [`while`]: keyword.while.html
+/// [`match`]: ../reference/expressions/match-expr.html#match-guards
+/// [`false`]: keyword.false.html
 /// [`bool`]: primitive.bool.html
-/// [not yet complete]: https://github.com/rust-lang/rust/issues/34601
 mod true_keyword {}
 
 #[doc(keyword = "type")]
@@ -1186,12 +1213,33 @@ mod await_keyword {}
 
 #[doc(keyword = "dyn")]
 //
-/// Name the type of a [trait object].
+/// `dyn` is a prefix of a [trait object]'s type.
 ///
-/// The documentation for this keyword is [not yet complete]. Pull requests welcome!
+/// The `dyn` keyword is used to highlight that calls to methods on the associated `Trait`
+/// are dynamically dispatched. To use the trait this way, it must be 'object safe'.
+///
+/// Unlike generic parameters or `impl Trait`, the compiler does not know the concrete type that
+/// is being passed. That is, the type has been [erased].
+/// As such, a `dyn Trait` reference contains _two_ pointers.
+/// One pointer goes to the data (e.g., an instance of a struct).
+/// Another pointer goes to a map of method call names to function pointers
+/// (known as a virtual method table or vtable).
+///
+/// At run-time, when a method needs to be called on the `dyn Trait`, the vtable is consulted to get
+/// the function pointer and then that function pointer is called.
+///
+/// ## Trade-offs
+///
+/// The above indirection is the additional runtime cost of calling a function on a `dyn Trait`.
+/// Methods called by dynamic dispatch generally cannot be inlined by the compiler.
+///
+/// However, `dyn Trait` is likely to produce smaller code than `impl Trait` / generic parameters as
+/// the method won't be duplicated for each concrete type.
+///
+/// Read more about `object safety` and [trait object]s.
 ///
 /// [trait object]: ../book/ch17-02-trait-objects.html
-/// [not yet complete]: https://github.com/rust-lang/rust/issues/34601
+/// [erased]: https://en.wikipedia.org/wiki/Type_erasure
 mod dyn_keyword {}
 
 #[doc(keyword = "union")]
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index dc93ac9048..231908ddda 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -163,11 +163,11 @@
 //! [`Iterator`]: iter/trait.Iterator.html
 //! [`Mutex`]: sync/struct.Mutex.html
 //! [`Option<T>`]: option/enum.Option.html
-//! [`Rc`]: rc/index.html
+//! [`Rc`]: rc/struct.Rc.html
 //! [`RefCell`]: cell/struct.RefCell.html
 //! [`Result<T, E>`]: result/enum.Result.html
 //! [`String`]: string/struct.String.html
-//! [`Vec<T>`]: vec/index.html
+//! [`Vec<T>`]: vec/struct.Vec.html
 //! [array]: primitive.array.html
 //! [slice]: primitive.slice.html
 //! [`atomic`]: sync/atomic/index.html
@@ -233,11 +233,11 @@
 #![feature(allocator_internals)]
 #![feature(allow_internal_unsafe)]
 #![feature(allow_internal_unstable)]
-#![feature(atomic_mut_ptr)]
 #![feature(arbitrary_self_types)]
 #![feature(array_error_internals)]
 #![feature(asm)]
 #![feature(associated_type_bounds)]
+#![feature(atomic_mut_ptr)]
 #![feature(box_syntax)]
 #![feature(c_variadic)]
 #![feature(cfg_target_has_atomic)]
@@ -255,7 +255,6 @@
 #![feature(doc_cfg)]
 #![feature(doc_keyword)]
 #![feature(doc_masked)]
-#![feature(doc_spotlight)]
 #![feature(dropck_eyepatch)]
 #![feature(duration_constants)]
 #![feature(exact_size_is_empty)]
@@ -293,7 +292,6 @@
 #![feature(shrink_to)]
 #![feature(slice_concat_ext)]
 #![feature(slice_internals)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
 #![feature(specialization)]
 #![feature(staged_api)]
 #![feature(std_internals)]
@@ -309,6 +307,7 @@
 #![feature(unboxed_closures)]
 #![feature(untagged_unions)]
 #![feature(unwind_attributes)]
+#![feature(vec_into_raw_parts)]
 // NB: the above list is sorted to minimize merge conflicts.
 #![default_lib_allocator]
 
@@ -334,12 +333,6 @@ extern crate libc;
 #[allow(unused_extern_crates)]
 extern crate unwind;
 
-// Only needed for now for the `std_detect` module until that crate changes to
-// use `cfg_if::cfg_if!`
-#[macro_use]
-#[cfg(not(test))]
-extern crate cfg_if;
-
 // During testing, this crate is not actually the "real" std library, but rather
 // it links to the real std library, which was compiled from this same source
 // code. So any lang items std defines are conditionally excluded (or else they
@@ -556,6 +549,9 @@ pub use core::{
     trace_macros,
 };
 
+#[stable(feature = "core_primitive", since = "1.43.0")]
+pub use core::primitive;
+
 // Include a number of private modules that exist solely to provide
 // the rustdoc documentation for primitive types. Using `include!`
 // because rustdoc only looks for these modules at the crate level.
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 18fb0f8768..7fd7de56f4 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -4,27 +4,6 @@
 //! library. Each macro is available for use when linking against the standard
 //! library.
 
-#[cfg(bootstrap)]
-#[doc(include = "../libcore/macros/panic.md")]
-#[macro_export]
-#[stable(feature = "rust1", since = "1.0.0")]
-#[allow_internal_unstable(libstd_sys_internals)]
-macro_rules! panic {
-    () => ({
-        $crate::panic!("explicit panic")
-    });
-    ($msg:expr) => ({
-        $crate::rt::begin_panic($msg, &($crate::file!(), $crate::line!(), $crate::column!()))
-    });
-    ($msg:expr,) => ({
-        $crate::panic!($msg)
-    });
-    ($fmt:expr, $($arg:tt)+) => ({
-        $crate::rt::begin_panic_fmt(&$crate::format_args!($fmt, $($arg)+))
-    });
-}
-
-#[cfg(not(bootstrap))]
 #[doc(include = "../libcore/macros/panic.md")]
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -206,7 +185,7 @@ macro_rules! eprintln {
 /// builds or when debugging in release mode is significantly faster.
 ///
 /// Note that the macro is intended as a debugging tool and therefore you
-/// should avoid having uses of it in version control for longer periods.
+/// should avoid having uses of it in version control for long periods.
 /// Use cases involving debug output that should be added to version control
 /// are better served by macros such as [`debug!`] from the [`log`] crate.
 ///
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index a59d7f0263..57cba6b1f7 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -901,7 +901,7 @@ impl ToSocketAddrs for str {
     type Iter = vec::IntoIter<SocketAddr>;
     fn to_socket_addrs(&self) -> io::Result<vec::IntoIter<SocketAddr>> {
         // try to parse as a regular SocketAddr first
-        if let Some(addr) = self.parse().ok() {
+        if let Ok(addr) = self.parse() {
             return Ok(vec![addr].into_iter());
         }
 
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
index 6410a4f2b6..edc28033c9 100644
--- a/src/libstd/net/ip.rs
+++ b/src/libstd/net/ip.rs
@@ -651,7 +651,7 @@ impl Ipv4Addr {
 
     /// Returns [`true`] if this address is reserved by IANA for future use. [IETF RFC 1112]
     /// defines the block of reserved addresses as `240.0.0.0/4`. This range normally includes the
-    /// broadcast address `255.255.255.255`, but this implementation explicitely excludes it, since
+    /// broadcast address `255.255.255.255`, but this implementation explicitly excludes it, since
     /// it is obviously not reserved for future use.
     ///
     /// [IETF RFC 1112]: https://tools.ietf.org/html/rfc1112
@@ -813,6 +813,20 @@ impl fmt::Display for IpAddr {
 
 #[stable(feature = "ip_from_ip", since = "1.16.0")]
 impl From<Ipv4Addr> for IpAddr {
+    /// Copies this address to a new `IpAddr::V4`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::net::{IpAddr, Ipv4Addr};
+    ///
+    /// let addr = Ipv4Addr::new(127, 0, 0, 1);
+    ///
+    /// assert_eq!(
+    ///     IpAddr::V4(addr),
+    ///     IpAddr::from(addr)
+    /// )
+    /// ```
     fn from(ipv4: Ipv4Addr) -> IpAddr {
         IpAddr::V4(ipv4)
     }
@@ -820,6 +834,20 @@ impl From<Ipv4Addr> for IpAddr {
 
 #[stable(feature = "ip_from_ip", since = "1.16.0")]
 impl From<Ipv6Addr> for IpAddr {
+    /// Copies this address to a new `IpAddr::V6`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::net::{IpAddr, Ipv6Addr};
+    ///
+    /// let addr = Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff);
+    ///
+    /// assert_eq!(
+    ///     IpAddr::V6(addr),
+    ///     IpAddr::from(addr)
+    /// );
+    /// ```
     fn from(ipv6: Ipv6Addr) -> IpAddr {
         IpAddr::V6(ipv6)
     }
@@ -975,6 +1003,8 @@ impl From<u32> for Ipv4Addr {
 
 #[stable(feature = "from_slice_v4", since = "1.9.0")]
 impl From<[u8; 4]> for Ipv4Addr {
+    /// Creates an `Ipv4Addr` from a four element byte array.
+    ///
     /// # Examples
     ///
     /// ```
@@ -1734,6 +1764,27 @@ impl From<u128> for Ipv6Addr {
 
 #[stable(feature = "ipv6_from_octets", since = "1.9.0")]
 impl From<[u8; 16]> for Ipv6Addr {
+    /// Creates an `Ipv6Addr` from a sixteen element byte array.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::net::Ipv6Addr;
+    ///
+    /// let addr = Ipv6Addr::from([
+    ///     25u8, 24u8, 23u8, 22u8, 21u8, 20u8, 19u8, 18u8,
+    ///     17u8, 16u8, 15u8, 14u8, 13u8, 12u8, 11u8, 10u8,
+    /// ]);
+    /// assert_eq!(
+    ///     Ipv6Addr::new(
+    ///         0x1918, 0x1716,
+    ///         0x1514, 0x1312,
+    ///         0x1110, 0x0f0e,
+    ///         0x0d0c, 0x0b0a
+    ///     ),
+    ///     addr
+    /// );
+    /// ```
     fn from(octets: [u8; 16]) -> Ipv6Addr {
         let inner = c::in6_addr { s6_addr: octets };
         Ipv6Addr::from_inner(inner)
@@ -1742,6 +1793,27 @@ impl From<[u8; 16]> for Ipv6Addr {
 
 #[stable(feature = "ipv6_from_segments", since = "1.16.0")]
 impl From<[u16; 8]> for Ipv6Addr {
+    /// Creates an `Ipv6Addr` from an eight element 16-bit array.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::net::Ipv6Addr;
+    ///
+    /// let addr = Ipv6Addr::from([
+    ///     525u16, 524u16, 523u16, 522u16,
+    ///     521u16, 520u16, 519u16, 518u16,
+    /// ]);
+    /// assert_eq!(
+    ///     Ipv6Addr::new(
+    ///         0x20d, 0x20c,
+    ///         0x20b, 0x20a,
+    ///         0x209, 0x208,
+    ///         0x207, 0x206
+    ///     ),
+    ///     addr
+    /// );
+    /// ```
     fn from(segments: [u16; 8]) -> Ipv6Addr {
         let [a, b, c, d, e, f, g, h] = segments;
         Ipv6Addr::new(a, b, c, d, e, f, g, h)
diff --git a/src/libstd/net/parser.rs b/src/libstd/net/parser.rs
index 868a7e261c..3f38ee5471 100644
--- a/src/libstd/net/parser.rs
+++ b/src/libstd/net/parser.rs
@@ -206,7 +206,7 @@ impl<'a> Parser<'a> {
         }
 
         // read `::` if previous code parsed less than 8 groups
-        if !self.read_given_char(':').is_some() || !self.read_given_char(':').is_some() {
+        if self.read_given_char(':').is_none() || self.read_given_char(':').is_none() {
             return None;
         }
 
diff --git a/src/libstd/os/linux/fs.rs b/src/libstd/os/linux/fs.rs
index dd71201b50..d22b44a066 100644
--- a/src/libstd/os/linux/fs.rs
+++ b/src/libstd/os/linux/fs.rs
@@ -34,7 +34,7 @@ pub trait MetadataExt {
     /// }
     /// ```
     #[stable(feature = "metadata_ext", since = "1.1.0")]
-    #[rustc_deprecated(since = "1.8.0", reason = "other methods of this trait are now prefered")]
+    #[rustc_deprecated(since = "1.8.0", reason = "other methods of this trait are now preferred")]
     #[allow(deprecated)]
     fn as_raw_stat(&self) -> &raw::stat;
 
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index fee7ace92e..8b12aaaa7e 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -286,11 +286,9 @@ pub unsafe fn r#try<R, F: FnOnce() -> R>(f: F) -> Result<R, Box<dyn Any + Send>>
     );
 
     return if r == 0 {
-        debug_assert!(update_panic_count(0) == 0);
         Ok(ManuallyDrop::into_inner(data.r))
     } else {
         update_panic_count(-1);
-        debug_assert!(update_panic_count(0) == 0);
         Err(mem::transmute(raw::TraitObject {
             data: any_data as *mut _,
             vtable: any_vtable as *mut _,
@@ -391,7 +389,7 @@ pub fn begin_panic_handler(info: &PanicInfo<'_>) -> ! {
 #[cfg_attr(not(feature = "panic_immediate_abort"), inline(never))]
 #[cold]
 #[track_caller]
-pub fn begin_panic<M: Any + Send>(msg: M, #[cfg(bootstrap)] _: &(&str, u32, u32)) -> ! {
+pub fn begin_panic<M: Any + Send>(msg: M) -> ! {
     if cfg!(feature = "panic_immediate_abort") {
         unsafe { intrinsics::abort() }
     }
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index a703cb748e..b8361d3e82 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -2011,7 +2011,7 @@ impl Path {
     #[stable(feature = "rust1", since = "1.0.0")]
     pub fn file_name(&self) -> Option<&OsStr> {
         self.components().next_back().and_then(|p| match p {
-            Component::Normal(p) => Some(p.as_ref()),
+            Component::Normal(p) => Some(p),
             _ => None,
         })
     }
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index d4b41e11c0..adad90f56d 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -771,7 +771,7 @@ mod prim_tuple {}
 #[doc(primitive = "f32")]
 /// The 32-bit floating point type.
 ///
-/// *[See also the `std::f32` module](f32/index.html).*
+/// *[See also the `std::f32::consts` module](f32/consts/index.html).*
 ///
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_f32 {}
@@ -780,7 +780,7 @@ mod prim_f32 {}
 //
 /// The 64-bit floating point type.
 ///
-/// *[See also the `std::f64` module](f64/index.html).*
+/// *[See also the `std::f64::consts` module](f64/consts/index.html).*
 ///
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_f64 {}
@@ -788,80 +788,60 @@ mod prim_f64 {}
 #[doc(primitive = "i8")]
 //
 /// The 8-bit signed integer type.
-///
-/// *[See also the `std::i8` module](i8/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_i8 {}
 
 #[doc(primitive = "i16")]
 //
 /// The 16-bit signed integer type.
-///
-/// *[See also the `std::i16` module](i16/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_i16 {}
 
 #[doc(primitive = "i32")]
 //
 /// The 32-bit signed integer type.
-///
-/// *[See also the `std::i32` module](i32/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_i32 {}
 
 #[doc(primitive = "i64")]
 //
 /// The 64-bit signed integer type.
-///
-/// *[See also the `std::i64` module](i64/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_i64 {}
 
 #[doc(primitive = "i128")]
 //
 /// The 128-bit signed integer type.
-///
-/// *[See also the `std::i128` module](i128/index.html).*
 #[stable(feature = "i128", since = "1.26.0")]
 mod prim_i128 {}
 
 #[doc(primitive = "u8")]
 //
 /// The 8-bit unsigned integer type.
-///
-/// *[See also the `std::u8` module](u8/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_u8 {}
 
 #[doc(primitive = "u16")]
 //
 /// The 16-bit unsigned integer type.
-///
-/// *[See also the `std::u16` module](u16/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_u16 {}
 
 #[doc(primitive = "u32")]
 //
 /// The 32-bit unsigned integer type.
-///
-/// *[See also the `std::u32` module](u32/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_u32 {}
 
 #[doc(primitive = "u64")]
 //
 /// The 64-bit unsigned integer type.
-///
-/// *[See also the `std::u64` module](u64/index.html).*
 #[stable(feature = "rust1", since = "1.0.0")]
 mod prim_u64 {}
 
 #[doc(primitive = "u128")]
 //
 /// The 128-bit unsigned integer type.
-///
-/// *[See also the `std::u128` module](u128/index.html).*
 #[stable(feature = "i128", since = "1.26.0")]
 mod prim_u128 {}
 
@@ -869,8 +849,6 @@ mod prim_u128 {}
 //
 /// The pointer-sized signed integer type.
 ///
-/// *[See also the `std::isize` module](isize/index.html).*
-///
 /// The size of this primitive is how many bytes it takes to reference any
 /// location in memory. For example, on a 32 bit target, this is 4 bytes
 /// and on a 64 bit target, this is 8 bytes.
@@ -881,8 +859,6 @@ mod prim_isize {}
 //
 /// The pointer-sized unsigned integer type.
 ///
-/// *[See also the `std::usize` module](usize/index.html).*
-///
 /// The size of this primitive is how many bytes it takes to reference any
 /// location in memory. For example, on a 32 bit target, this is 4 bytes
 /// and on a 64 bit target, this is 8 bytes.
diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs
index c51aa7619d..0274268f69 100644
--- a/src/libstd/sync/mpsc/spsc_queue.rs
+++ b/src/libstd/sync/mpsc/spsc_queue.rs
@@ -40,7 +40,7 @@ struct Consumer<T, Addition> {
     tail: UnsafeCell<*mut Node<T>>, // where to pop from
     tail_prev: AtomicPtr<Node<T>>,  // where to pop from
     cache_bound: usize,             // maximum cache size
-    cached_nodes: AtomicUsize,      // number of nodes marked as cachable
+    cached_nodes: AtomicUsize,      // number of nodes marked as cacheable
     addition: Addition,
 }
 
diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs
index 6eeddc2851..0cb16b19d7 100644
--- a/src/libstd/sync/mutex.rs
+++ b/src/libstd/sync/mutex.rs
@@ -416,7 +416,7 @@ impl<T: ?Sized + fmt::Debug> fmt::Debug for Mutex<T> {
 
 impl<'mutex, T: ?Sized> MutexGuard<'mutex, T> {
     unsafe fn new(lock: &'mutex Mutex<T>) -> LockResult<MutexGuard<'mutex, T>> {
-        poison::map_result(lock.poison.borrow(), |guard| MutexGuard { lock: lock, poison: guard })
+        poison::map_result(lock.poison.borrow(), |guard| MutexGuard { lock, poison: guard })
     }
 }
 
diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs
index 61c4d0c2db..1e6b6c430b 100644
--- a/src/libstd/sync/once.rs
+++ b/src/libstd/sync/once.rs
@@ -331,14 +331,14 @@ impl Once {
     ///   * `call_once` was called, but has not yet completed,
     ///   * the `Once` instance is poisoned
     ///
-    /// It is also possible that immediately after `is_completed`
-    /// returns false, some other thread finishes executing
-    /// `call_once`.
+    /// This function returning `false` does not mean that `Once` has not been
+    /// executed. For example, it may have been executed in the time between
+    /// when `is_completed` starts executing and when it returns, in which case
+    /// the `false` return value would be stale (but still permissible).
     ///
     /// # Examples
     ///
     /// ```
-    /// #![feature(once_is_completed)]
     /// use std::sync::Once;
     ///
     /// static INIT: Once = Once::new();
@@ -351,7 +351,6 @@ impl Once {
     /// ```
     ///
     /// ```
-    /// #![feature(once_is_completed)]
     /// use std::sync::Once;
     /// use std::thread;
     ///
@@ -364,7 +363,7 @@ impl Once {
     /// assert!(handle.join().is_err());
     /// assert_eq!(INIT.is_completed(), false);
     /// ```
-    #[unstable(feature = "once_is_completed", issue = "54890")]
+    #[stable(feature = "once_is_completed", since = "1.43.0")]
     #[inline]
     pub fn is_completed(&self) -> bool {
         // An `Acquire` load is enough because that makes all the initialization
diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs
index fdd29af858..50f54dbf14 100644
--- a/src/libstd/sync/rwlock.rs
+++ b/src/libstd/sync/rwlock.rs
@@ -465,16 +465,13 @@ impl<T> From<T> for RwLock<T> {
 
 impl<'rwlock, T: ?Sized> RwLockReadGuard<'rwlock, T> {
     unsafe fn new(lock: &'rwlock RwLock<T>) -> LockResult<RwLockReadGuard<'rwlock, T>> {
-        poison::map_result(lock.poison.borrow(), |_| RwLockReadGuard { lock: lock })
+        poison::map_result(lock.poison.borrow(), |_| RwLockReadGuard { lock })
     }
 }
 
 impl<'rwlock, T: ?Sized> RwLockWriteGuard<'rwlock, T> {
     unsafe fn new(lock: &'rwlock RwLock<T>) -> LockResult<RwLockWriteGuard<'rwlock, T>> {
-        poison::map_result(lock.poison.borrow(), |guard| RwLockWriteGuard {
-            lock: lock,
-            poison: guard,
-        })
+        poison::map_result(lock.poison.borrow(), |guard| RwLockWriteGuard { lock, poison: guard })
     }
 }
 
diff --git a/src/libstd/sys/sgx/abi/entry.S b/src/libstd/sys/sgx/abi/entry.S
index a3e059e813..1f06c9da3a 100644
--- a/src/libstd/sys/sgx/abi/entry.S
+++ b/src/libstd/sys/sgx/abi/entry.S
@@ -30,6 +30,14 @@ IMAGE_BASE:
 
 /*  We can store a bunch of data in the gap between MXCSR and the XSAVE header */
 
+/* MXCSR initialization value for ABI */
+.Lmxcsr_init:
+    .int 0x1f80
+
+/* x87 FPU control word initialization value for ABI */
+.Lfpucw_init:
+    .int 0x037f
+
 /*  The following symbols point at read-only data that will be filled in by the */
 /*  post-linker. */
 
@@ -134,6 +142,20 @@ elf_entry:
     ud2                               /* should not be reached  */
 /*  end elf_entry */
 
+/* This code needs to be called *after* the enclave stack has been setup. */
+/* There are 3 places where this needs to happen, so this is put in a macro. */
+.macro entry_sanitize_final
+/*  Sanitize rflags received from user */
+/*    - DF flag: x86-64 ABI requires DF to be unset at function entry/exit */
+/*    - AC flag: AEX on misaligned memory accesses leaks side channel info */
+    pushfq
+    andq $~0x40400, (%rsp)
+    popfq
+/*  check for abort */
+    bt $0,.Laborted(%rip)
+    jc .Lreentry_panic
+.endm
+
 .text
 .global sgx_entry
 .type sgx_entry,function
@@ -150,25 +172,18 @@ sgx_entry:
     stmxcsr %gs:tcsls_user_mxcsr
     fnstcw %gs:tcsls_user_fcw
 
-/*  reset user state */
-/*    - DF flag: x86-64 ABI requires DF to be unset at function entry/exit */
-/*    - AC flag: AEX on misaligned memory accesses leaks side channel info */
-    pushfq
-    andq $~0x40400, (%rsp)
-    popfq
-
 /*  check for debug buffer pointer */
     testb  $0xff,DEBUG(%rip)
     jz .Lskip_debug_init
     mov %r10,%gs:tcsls_debug_panic_buf_ptr
 .Lskip_debug_init:
-/*  check for abort */
-    bt $0,.Laborted(%rip)
-    jc .Lreentry_panic
 /*  check if returning from usercall */
     mov %gs:tcsls_last_rsp,%r11
     test %r11,%r11
     jnz .Lusercall_ret
+/*  reset user state */
+    ldmxcsr .Lmxcsr_init(%rip)
+    fldcw .Lfpucw_init(%rip)
 /*  setup stack */
     mov %gs:tcsls_tos,%rsp /*  initially, RSP is not set to the correct value */
                            /*  here. This is fixed below under "adjust stack". */
@@ -179,6 +194,7 @@ sgx_entry:
     lea IMAGE_BASE(%rip),%rax
     add %rax,%rsp
     mov %rsp,%gs:tcsls_tos
+    entry_sanitize_final
 /*  call tcs_init */
 /*  store caller-saved registers in callee-saved registers */
     mov %rdi,%rbx
@@ -194,7 +210,10 @@ sgx_entry:
     mov %r13,%rdx
     mov %r14,%r8
     mov %r15,%r9
+    jmp .Lafter_init
 .Lskip_init:
+    entry_sanitize_final
+.Lafter_init:
 /*  call into main entry point */
     load_tcsls_flag_secondary_bool cx /* RCX = entry() argument: secondary: bool */
     call entry /* RDI, RSI, RDX, R8, R9 passed in from userspace */
@@ -295,6 +314,7 @@ usercall:
     ldmxcsr (%rsp)
     fldcw 4(%rsp)
     add $8, %rsp
+    entry_sanitize_final
     pop %rbx
     pop %rbp
     pop %r12
diff --git a/src/libstd/sys/sgx/abi/usercalls/alloc.rs b/src/libstd/sys/sgx/abi/usercalls/alloc.rs
index b54c115a2b..76a9b427b3 100644
--- a/src/libstd/sys/sgx/abi/usercalls/alloc.rs
+++ b/src/libstd/sys/sgx/abi/usercalls/alloc.rs
@@ -151,7 +151,7 @@ unsafe impl<T: UserSafeSized> UserSafe for [T] {
 /// It is also possible to obtain a mutable reference `&mut UserRef<T>`. Unlike
 /// regular mutable references, these are not exclusive. Userspace may always
 /// write to the backing memory at any time, so it can't be assumed that there
-/// the pointed-to memory is uniquely borrowed. The two different refence types
+/// the pointed-to memory is uniquely borrowed. The two different reference types
 /// are used solely to indicate intent: a mutable reference is for writing to
 /// user memory, an immutable reference for reading from user memory.
 #[unstable(feature = "sgx_platform", issue = "56975")]
diff --git a/src/libstd/sys/sgx/args.rs b/src/libstd/sys/sgx/args.rs
index b47a48e752..5a53695a84 100644
--- a/src/libstd/sys/sgx/args.rs
+++ b/src/libstd/sys/sgx/args.rs
@@ -22,12 +22,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8) {
     }
 }
 
-pub unsafe fn cleanup() {
-    let args = ARGS.swap(0, Ordering::Relaxed);
-    if args != 0 {
-        drop(Box::<ArgsStore>::from_raw(args as _))
-    }
-}
+pub unsafe fn cleanup() {}
 
 pub fn args() -> Args {
     let args = unsafe { (ARGS.load(Ordering::Relaxed) as *const ArgsStore).as_ref() };
diff --git a/src/libstd/sys/sgx/rwlock.rs b/src/libstd/sys/sgx/rwlock.rs
index fda2bb504d..722b4f5e0b 100644
--- a/src/libstd/sys/sgx/rwlock.rs
+++ b/src/libstd/sys/sgx/rwlock.rs
@@ -10,10 +10,10 @@ pub struct RWLock {
     writer: SpinMutex<WaitVariable<bool>>,
 }
 
-// Below is to check at compile time, that RWLock has size of 128 bytes.
+// Check at compile time that RWLock size matches C definition (see test_c_rwlock_initializer below)
 #[allow(dead_code)]
 unsafe fn rw_lock_size_assert(r: RWLock) {
-    mem::transmute::<RWLock, [u8; 128]>(r);
+    mem::transmute::<RWLock, [u8; 144]>(r);
 }
 
 impl RWLock {
@@ -210,15 +210,17 @@ mod tests {
     // be changed too.
     #[test]
     fn test_c_rwlock_initializer() {
+        #[rustfmt::skip]
         const RWLOCK_INIT: &[u8] = &[
-            0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-            0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x00 */ 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x10 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x20 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x30 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x40 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x50 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x60 */ 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x70 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+            /* 0x80 */ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
         ];
 
         #[inline(never)]
@@ -239,7 +241,7 @@ mod tests {
             zero_stack();
             let mut init = MaybeUninit::<RWLock>::zeroed();
             rwlock_new(&mut init);
-            assert_eq!(mem::transmute::<_, [u8; 128]>(init.assume_init()).as_slice(), RWLOCK_INIT)
+            assert_eq!(mem::transmute::<_, [u8; 144]>(init.assume_init()).as_slice(), RWLOCK_INIT)
         };
     }
 }
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs
index 06876cb061..fbcb006ecd 100644
--- a/src/libstd/sys/unix/mod.rs
+++ b/src/libstd/sys/unix/mod.rs
@@ -156,7 +156,7 @@ where
 
 // On Unix-like platforms, libc::abort will unregister signal handlers
 // including the SIGABRT handler, preventing the abort from being blocked, and
-// fclose streams, with the side effect of flushing them so libc bufferred
+// fclose streams, with the side effect of flushing them so libc buffered
 // output will be printed.  Additionally the shell will generally print a more
 // understandable error message like "Abort trap" rather than "Illegal
 // instruction" that intrinsics::abort would cause, as intrinsics::abort is
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs
index 79b0dc0297..b37675e0a0 100644
--- a/src/libstd/sys/unix/net.rs
+++ b/src/libstd/sys/unix/net.rs
@@ -280,7 +280,7 @@ impl Socket {
                 };
                 let mut timeout = libc::timeval {
                     tv_sec: secs,
-                    tv_usec: (dur.subsec_nanos() / 1000) as libc::suseconds_t,
+                    tv_usec: dur.subsec_micros() as libc::suseconds_t,
                 };
                 if timeout.tv_sec == 0 && timeout.tv_usec == 0 {
                     timeout.tv_usec = 1;
diff --git a/src/libstd/sys/unix/process/process_common.rs b/src/libstd/sys/unix/process/process_common.rs
index e66d6fdc56..859da691ad 100644
--- a/src/libstd/sys/unix/process/process_common.rs
+++ b/src/libstd/sys/unix/process/process_common.rs
@@ -19,9 +19,9 @@ cfg_if::cfg_if! {
     if #[cfg(target_os = "fuchsia")] {
         // fuchsia doesn't have /dev/null
     } else if #[cfg(target_os = "redox")] {
-        const DEV_NULL: &'static str = "null:\0";
+        const DEV_NULL: &str = "null:\0";
     } else {
-        const DEV_NULL: &'static str = "/dev/null\0";
+        const DEV_NULL: &str = "/dev/null\0";
     }
 }
 
@@ -287,9 +287,7 @@ impl CStringArray {
 
 fn construct_envp(env: BTreeMap<OsString, OsString>, saw_nul: &mut bool) -> CStringArray {
     let mut result = CStringArray::with_capacity(env.len());
-    for (k, v) in env {
-        let mut k: OsString = k.into();
-
+    for (mut k, v) in env {
         // Reserve additional space for '=' and null terminator
         k.reserve_exact(v.len() + 2);
         k.push("=");
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs
index 528fe321ef..9e8be55075 100644
--- a/src/libstd/sys/unix/stack_overflow.rs
+++ b/src/libstd/sys/unix/stack_overflow.rs
@@ -13,6 +13,10 @@ impl Handler {
     pub unsafe fn new() -> Handler {
         make_handler()
     }
+
+    fn null() -> Handler {
+        Handler { _data: crate::ptr::null_mut() }
+    }
 }
 
 impl Drop for Handler {
@@ -108,13 +112,20 @@ mod imp {
     }
 
     static mut MAIN_ALTSTACK: *mut libc::c_void = ptr::null_mut();
+    static mut NEED_ALTSTACK: bool = false;
 
     pub unsafe fn init() {
         let mut action: sigaction = mem::zeroed();
-        action.sa_flags = SA_SIGINFO | SA_ONSTACK;
-        action.sa_sigaction = signal_handler as sighandler_t;
-        sigaction(SIGSEGV, &action, ptr::null_mut());
-        sigaction(SIGBUS, &action, ptr::null_mut());
+        for &signal in &[SIGSEGV, SIGBUS] {
+            sigaction(signal, ptr::null_mut(), &mut action);
+            // Configure our signal handler if one is not already set.
+            if action.sa_sigaction == SIG_DFL {
+                action.sa_flags = SA_SIGINFO | SA_ONSTACK;
+                action.sa_sigaction = signal_handler as sighandler_t;
+                sigaction(signal, &action, ptr::null_mut());
+                NEED_ALTSTACK = true;
+            }
+        }
 
         let handler = make_handler();
         MAIN_ALTSTACK = handler._data;
@@ -152,6 +163,9 @@ mod imp {
     }
 
     pub unsafe fn make_handler() -> Handler {
+        if !NEED_ALTSTACK {
+            return Handler::null();
+        }
         let mut stack = mem::zeroed();
         sigaltstack(ptr::null(), &mut stack);
         // Configure alternate signal stack, if one is not already set.
@@ -160,7 +174,7 @@ mod imp {
             sigaltstack(&stack, ptr::null_mut());
             Handler { _data: stack.ss_sp as *mut libc::c_void }
         } else {
-            Handler { _data: ptr::null_mut() }
+            Handler::null()
         }
     }
 
@@ -191,14 +205,12 @@ mod imp {
     target_os = "openbsd"
 )))]
 mod imp {
-    use crate::ptr;
-
     pub unsafe fn init() {}
 
     pub unsafe fn cleanup() {}
 
     pub unsafe fn make_handler() -> super::Handler {
-        super::Handler { _data: ptr::null_mut() }
+        super::Handler::null()
     }
 
     pub unsafe fn drop_handler(_handler: &mut super::Handler) {}
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
index a5b34eeec2..674d4c7113 100644
--- a/src/libstd/sys/unix/thread.rs
+++ b/src/libstd/sys/unix/thread.rs
@@ -255,8 +255,9 @@ pub mod guard {
 
     #[cfg(target_os = "macos")]
     unsafe fn get_stack_start() -> Option<*mut libc::c_void> {
-        let stackaddr = libc::pthread_get_stackaddr_np(libc::pthread_self()) as usize
-            - libc::pthread_get_stacksize_np(libc::pthread_self());
+        let th = libc::pthread_self();
+        let stackaddr =
+            libc::pthread_get_stackaddr_np(th) as usize - libc::pthread_get_stacksize_np(th);
         Some(stackaddr as *mut libc::c_void)
     }
 
@@ -426,8 +427,8 @@ pub mod guard {
 }
 
 // glibc >= 2.15 has a __pthread_get_minstack() function that returns
-// PTHREAD_STACK_MIN plus however many bytes are needed for thread-local
-// storage.  We need that information to avoid blowing up when a small stack
+// PTHREAD_STACK_MIN plus bytes needed for thread-local storage.
+// We need that information to avoid blowing up when a small stack
 // is created in an application with big thread-local storage requirements.
 // See #6233 for rationale and details.
 #[cfg(target_os = "linux")]
diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs
index 2310441997..6707f790ca 100644
--- a/src/libstd/sys/unix/time.rs
+++ b/src/libstd/sys/unix/time.rs
@@ -282,7 +282,6 @@ mod inner {
             (cfg!(target_os = "linux") && cfg!(target_arch = "x86_64"))
                 || (cfg!(target_os = "linux") && cfg!(target_arch = "x86"))
                 || cfg!(target_os = "fuchsia")
-                || false // last clause, used so `||` is always trailing above
         }
 
         pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> {
diff --git a/src/libstd/sys/vxworks/mod.rs b/src/libstd/sys/vxworks/mod.rs
index 12bbfa1d4e..e23191c943 100644
--- a/src/libstd/sys/vxworks/mod.rs
+++ b/src/libstd/sys/vxworks/mod.rs
@@ -103,7 +103,7 @@ where
 
 // On Unix-like platforms, libc::abort will unregister signal handlers
 // including the SIGABRT handler, preventing the abort from being blocked, and
-// fclose streams, with the side effect of flushing them so libc bufferred
+// fclose streams, with the side effect of flushing them so libc buffered
 // output will be printed.  Additionally the shell will generally print a more
 // understandable error message like "Abort trap" rather than "Illegal
 // instruction" that intrinsics::abort would cause, as intrinsics::abort is
diff --git a/src/libstd/sys/wasi/fd.rs b/src/libstd/sys/wasi/fd.rs
index 00327c1743..8458ded5db 100644
--- a/src/libstd/sys/wasi/fd.rs
+++ b/src/libstd/sys/wasi/fd.rs
@@ -13,19 +13,15 @@ pub struct WasiFd {
 fn iovec<'a>(a: &'a mut [IoSliceMut<'_>]) -> &'a [wasi::Iovec] {
     assert_eq!(mem::size_of::<IoSliceMut<'_>>(), mem::size_of::<wasi::Iovec>());
     assert_eq!(mem::align_of::<IoSliceMut<'_>>(), mem::align_of::<wasi::Iovec>());
-    /// SAFETY: `IoSliceMut` and `IoVec` have exactly the same memory layout
-    unsafe {
-        mem::transmute(a)
-    }
+    // SAFETY: `IoSliceMut` and `IoVec` have exactly the same memory layout
+    unsafe { mem::transmute(a) }
 }
 
 fn ciovec<'a>(a: &'a [IoSlice<'_>]) -> &'a [wasi::Ciovec] {
     assert_eq!(mem::size_of::<IoSlice<'_>>(), mem::size_of::<wasi::Ciovec>());
     assert_eq!(mem::align_of::<IoSlice<'_>>(), mem::align_of::<wasi::Ciovec>());
-    /// SAFETY: `IoSlice` and `CIoVec` have exactly the same memory layout
-    unsafe {
-        mem::transmute(a)
-    }
+    // SAFETY: `IoSlice` and `CIoVec` have exactly the same memory layout
+    unsafe { mem::transmute(a) }
 }
 
 impl WasiFd {
diff --git a/src/libstd/sys/wasi/fs.rs b/src/libstd/sys/wasi/fs.rs
index 04bfdf67e1..a11f61fdd6 100644
--- a/src/libstd/sys/wasi/fs.rs
+++ b/src/libstd/sys/wasi/fs.rs
@@ -12,7 +12,6 @@ use crate::sys::time::SystemTime;
 use crate::sys::unsupported;
 use crate::sys_common::FromInner;
 
-pub use crate::sys_common::fs::copy;
 pub use crate::sys_common::fs::remove_dir_all;
 
 pub struct File {
@@ -647,3 +646,12 @@ fn open_parent(p: &Path) -> io::Result<(ManuallyDrop<WasiFd>, PathBuf)> {
 pub fn osstr2str(f: &OsStr) -> io::Result<&str> {
     f.to_str().ok_or_else(|| io::Error::new(io::ErrorKind::Other, "input must be utf-8"))
 }
+
+pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
+    use crate::fs::File;
+
+    let mut reader = File::open(from)?;
+    let mut writer = File::create(to)?;
+
+    io::copy(&mut reader, &mut writer)
+}
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
index 191add2c31..289ee07bab 100644
--- a/src/libstd/sys_common/backtrace.rs
+++ b/src/libstd/sys_common/backtrace.rs
@@ -70,6 +70,7 @@ unsafe fn _print_fmt(fmt: &mut fmt::Formatter<'_>, print_fmt: PrintFmt) -> fmt::
     let mut print_path = move |fmt: &mut fmt::Formatter<'_>, bows: BytesOrWideString<'_>| {
         output_filename(fmt, bows, print_fmt, cwd.as_ref())
     };
+    write!(fmt, "stack backtrace:\n")?;
     let mut bt_fmt = BacktraceFmt::new(fmt, print_fmt, &mut print_path);
     bt_fmt.add_context()?;
     let mut idx = 0;
diff --git a/src/libstd/tests/run-time-detect.rs b/src/libstd/tests/run-time-detect.rs
index e39cc1eed5..2e6d1bc8ef 100644
--- a/src/libstd/tests/run-time-detect.rs
+++ b/src/libstd/tests/run-time-detect.rs
@@ -6,6 +6,7 @@
         all(target_arch = "aarch64", any(target_os = "linux", target_os = "android")),
         all(target_arch = "powerpc", target_os = "linux"),
         all(target_arch = "powerpc64", target_os = "linux"),
+        any(target_arch = "x86", target_arch = "x86_64"),
     ),
     feature(stdsimd)
 )]
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index 5bc8fe5ae6..c36e78b1d0 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -76,7 +76,7 @@ pub use core::time::Duration;
 /// [QueryPerformanceCounter]: https://docs.microsoft.com/en-us/windows/win32/api/profileapi/nf-profileapi-queryperformancecounter
 /// [`insecure_time` usercall]: https://edp.fortanix.com/docs/api/fortanix_sgx_abi/struct.Usercalls.html#method.insecure_time
 /// [timekeeping in SGX]: https://edp.fortanix.com/docs/concepts/rust-std/#codestdtimecode
-/// [__wasi_clock_time_get (Monotonic Clock)]: https://github.com/CraneStation/wasmtime/blob/master/docs/WASI-api.md#clock_time_get
+/// [__wasi_clock_time_get (Monotonic Clock)]: https://github.com/WebAssembly/WASI/blob/master/phases/snapshot/docs.md#clock_time_get
 /// [clock_gettime (Monotonic Clock)]: https://linux.die.net/man/3/clock_gettime
 /// [mach_absolute_time]: https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/KernelProgramming/services/services.html
 /// [clock_time_get (Monotonic Clock)]: https://nuxi.nl/cloudabi/#clock_time_get
@@ -157,7 +157,7 @@ pub struct Instant(time::Instant);
 /// [timekeeping in SGX]: https://edp.fortanix.com/docs/concepts/rust-std/#codestdtimecode
 /// [gettimeofday]: http://man7.org/linux/man-pages/man2/gettimeofday.2.html
 /// [clock_gettime (Realtime Clock)]: https://linux.die.net/man/3/clock_gettime
-/// [__wasi_clock_time_get (Realtime Clock)]: https://github.com/CraneStation/wasmtime/blob/master/docs/WASI-api.md#clock_time_get
+/// [__wasi_clock_time_get (Realtime Clock)]: https://github.com/WebAssembly/WASI/blob/master/phases/snapshot/docs.md#clock_time_get
 /// [GetSystemTimeAsFileTime]: https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemtimeasfiletime
 ///
 /// **Disclaimer:** These system calls might change over time.
@@ -284,7 +284,7 @@ impl Instant {
     }
 
     /// Returns the amount of time elapsed from another instant to this one,
-    /// or zero duration if that instant is earlier than this one.
+    /// or zero duration if that instant is later than this one.
     ///
     /// # Examples
     ///
diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml
deleted file mode 100644
index 2e647d2a1e..0000000000
--- a/src/libsyntax/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-[package]
-authors = ["The Rust Project Developers"]
-name = "syntax"
-version = "0.0.0"
-edition = "2018"
-
-[lib]
-name = "syntax"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-rustc_serialize = { path = "../libserialize", package = "serialize" }
-log = "0.4"
-scoped-tls = "1.0"
-rustc_errors = { path = "../librustc_errors" }
-rustc_span = { path = "../librustc_span" }
-rustc_data_structures = { path = "../librustc_data_structures" }
-rustc_feature = { path = "../librustc_feature" }
-rustc_index = { path = "../librustc_index" }
-rustc_lexer = { path = "../librustc_lexer" }
-rustc_macros = { path = "../librustc_macros" }
-smallvec = { version = "1.0", features = ["union", "may_dangle"] }
-rustc_session = { path = "../librustc_session" }
diff --git a/src/libsyntax/README.md b/src/libsyntax/README.md
deleted file mode 100644
index daa252ef45..0000000000
--- a/src/libsyntax/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-The `syntax` crate contains those things concerned purely with syntax
-– that is, the AST ("abstract syntax tree"), parser, pretty-printer,
-lexer, macro expander, and utilities for traversing ASTs.
-
-For more information about how these things work in rustc, see the
-rustc guide:
-
-- [Parsing](https://rust-lang.github.io/rustc-guide/the-parser.html)
-- [Macro Expansion](https://rust-lang.github.io/rustc-guide/macro-expansion.html)
diff --git a/src/libsyntax/attr/builtin.rs b/src/libsyntax/attr/builtin.rs
deleted file mode 100644
index 6cfe4f2de1..0000000000
--- a/src/libsyntax/attr/builtin.rs
+++ /dev/null
@@ -1,1032 +0,0 @@
-//! Parsing and validation of builtin attributes
-
-use super::{mark_used, MetaItemKind};
-use crate::ast::{self, Attribute, MetaItem, NestedMetaItem};
-use crate::print::pprust;
-use crate::sess::{feature_err, ParseSess};
-
-use rustc_errors::{struct_span_err, Applicability, Handler};
-use rustc_feature::{find_gated_cfg, is_builtin_attr_name, Features, GatedCfg};
-use rustc_macros::HashStable_Generic;
-use rustc_span::hygiene::Transparency;
-use rustc_span::{symbol::sym, symbol::Symbol, Span};
-use std::num::NonZeroU32;
-
-pub fn is_builtin_attr(attr: &Attribute) -> bool {
-    attr.is_doc_comment() || attr.ident().filter(|ident| is_builtin_attr_name(ident.name)).is_some()
-}
-
-enum AttrError {
-    MultipleItem(String),
-    UnknownMetaItem(String, &'static [&'static str]),
-    MissingSince,
-    MissingFeature,
-    MultipleStabilityLevels,
-    UnsupportedLiteral(&'static str, /* is_bytestr */ bool),
-}
-
-fn handle_errors(sess: &ParseSess, span: Span, error: AttrError) {
-    let diag = &sess.span_diagnostic;
-    match error {
-        AttrError::MultipleItem(item) => {
-            struct_span_err!(diag, span, E0538, "multiple '{}' items", item).emit();
-        }
-        AttrError::UnknownMetaItem(item, expected) => {
-            let expected = expected.iter().map(|name| format!("`{}`", name)).collect::<Vec<_>>();
-            struct_span_err!(diag, span, E0541, "unknown meta item '{}'", item)
-                .span_label(span, format!("expected one of {}", expected.join(", ")))
-                .emit();
-        }
-        AttrError::MissingSince => struct_span_err!(diag, span, E0542, "missing 'since'").emit(),
-        AttrError::MissingFeature => {
-            struct_span_err!(diag, span, E0546, "missing 'feature'").emit();
-        }
-        AttrError::MultipleStabilityLevels => {
-            struct_span_err!(diag, span, E0544, "multiple stability levels").emit();
-        }
-        AttrError::UnsupportedLiteral(msg, is_bytestr) => {
-            let mut err = struct_span_err!(diag, span, E0565, "{}", msg);
-            if is_bytestr {
-                if let Ok(lint_str) = sess.source_map().span_to_snippet(span) {
-                    err.span_suggestion(
-                        span,
-                        "consider removing the prefix",
-                        format!("{}", &lint_str[1..]),
-                        Applicability::MaybeIncorrect,
-                    );
-                }
-            }
-            err.emit();
-        }
-    }
-}
-
-#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable)]
-pub enum InlineAttr {
-    None,
-    Hint,
-    Always,
-    Never,
-}
-
-#[derive(Clone, RustcEncodable, RustcDecodable)]
-pub enum OptimizeAttr {
-    None,
-    Speed,
-    Size,
-}
-
-#[derive(Copy, Clone, PartialEq)]
-pub enum UnwindAttr {
-    Allowed,
-    Aborts,
-}
-
-/// Determine what `#[unwind]` attribute is present in `attrs`, if any.
-pub fn find_unwind_attr(diagnostic: Option<&Handler>, attrs: &[Attribute]) -> Option<UnwindAttr> {
-    attrs.iter().fold(None, |ia, attr| {
-        if attr.check_name(sym::unwind) {
-            if let Some(meta) = attr.meta() {
-                if let MetaItemKind::List(items) = meta.kind {
-                    if items.len() == 1 {
-                        if items[0].check_name(sym::allowed) {
-                            return Some(UnwindAttr::Allowed);
-                        } else if items[0].check_name(sym::aborts) {
-                            return Some(UnwindAttr::Aborts);
-                        }
-                    }
-
-                    diagnostic.map(|d| {
-                        struct_span_err!(d, attr.span, E0633, "malformed `unwind` attribute input")
-                            .span_label(attr.span, "invalid argument")
-                            .span_suggestions(
-                                attr.span,
-                                "the allowed arguments are `allowed` and `aborts`",
-                                (vec!["allowed", "aborts"])
-                                    .into_iter()
-                                    .map(|s| format!("#[unwind({})]", s)),
-                                Applicability::MachineApplicable,
-                            )
-                            .emit();
-                    });
-                }
-            }
-        }
-
-        ia
-    })
-}
-
-/// Represents the #[stable], #[unstable], #[rustc_deprecated] attributes.
-#[derive(
-    RustcEncodable,
-    RustcDecodable,
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Eq,
-    Hash,
-    HashStable_Generic
-)]
-pub struct Stability {
-    pub level: StabilityLevel,
-    pub feature: Symbol,
-    pub rustc_depr: Option<RustcDeprecation>,
-}
-
-/// Represents the #[rustc_const_unstable] and #[rustc_const_stable] attributes.
-#[derive(
-    RustcEncodable,
-    RustcDecodable,
-    Copy,
-    Clone,
-    Debug,
-    PartialEq,
-    Eq,
-    Hash,
-    HashStable_Generic
-)]
-pub struct ConstStability {
-    pub level: StabilityLevel,
-    pub feature: Symbol,
-    /// whether the function has a `#[rustc_promotable]` attribute
-    pub promotable: bool,
-    /// whether the function has a `#[rustc_allow_const_fn_ptr]` attribute
-    pub allow_const_fn_ptr: bool,
-}
-
-/// The available stability levels.
-#[derive(
-    RustcEncodable,
-    RustcDecodable,
-    PartialEq,
-    PartialOrd,
-    Copy,
-    Clone,
-    Debug,
-    Eq,
-    Hash,
-    HashStable_Generic
-)]
-pub enum StabilityLevel {
-    // Reason for the current stability level and the relevant rust-lang issue
-    Unstable { reason: Option<Symbol>, issue: Option<NonZeroU32>, is_soft: bool },
-    Stable { since: Symbol },
-}
-
-impl StabilityLevel {
-    pub fn is_unstable(&self) -> bool {
-        if let StabilityLevel::Unstable { .. } = *self { true } else { false }
-    }
-    pub fn is_stable(&self) -> bool {
-        if let StabilityLevel::Stable { .. } = *self { true } else { false }
-    }
-}
-
-#[derive(
-    RustcEncodable,
-    RustcDecodable,
-    PartialEq,
-    PartialOrd,
-    Copy,
-    Clone,
-    Debug,
-    Eq,
-    Hash,
-    HashStable_Generic
-)]
-pub struct RustcDeprecation {
-    pub since: Symbol,
-    pub reason: Symbol,
-    /// A text snippet used to completely replace any use of the deprecated item in an expression.
-    pub suggestion: Option<Symbol>,
-}
-
-/// Checks if `attrs` contains an attribute like `#![feature(feature_name)]`.
-/// This will not perform any "sanity checks" on the form of the attributes.
-pub fn contains_feature_attr(attrs: &[Attribute], feature_name: Symbol) -> bool {
-    attrs.iter().any(|item| {
-        item.check_name(sym::feature)
-            && item
-                .meta_item_list()
-                .map(|list| list.iter().any(|mi| mi.is_word() && mi.check_name(feature_name)))
-                .unwrap_or(false)
-    })
-}
-
-/// Collects stability info from all stability attributes in `attrs`.
-/// Returns `None` if no stability attributes are found.
-pub fn find_stability(
-    sess: &ParseSess,
-    attrs: &[Attribute],
-    item_sp: Span,
-) -> (Option<Stability>, Option<ConstStability>) {
-    find_stability_generic(sess, attrs.iter(), item_sp)
-}
-
-fn find_stability_generic<'a, I>(
-    sess: &ParseSess,
-    attrs_iter: I,
-    item_sp: Span,
-) -> (Option<Stability>, Option<ConstStability>)
-where
-    I: Iterator<Item = &'a Attribute>,
-{
-    use StabilityLevel::*;
-
-    let mut stab: Option<Stability> = None;
-    let mut rustc_depr: Option<RustcDeprecation> = None;
-    let mut const_stab: Option<ConstStability> = None;
-    let mut promotable = false;
-    let mut allow_const_fn_ptr = false;
-    let diagnostic = &sess.span_diagnostic;
-
-    'outer: for attr in attrs_iter {
-        if ![
-            sym::rustc_deprecated,
-            sym::rustc_const_unstable,
-            sym::rustc_const_stable,
-            sym::unstable,
-            sym::stable,
-            sym::rustc_promotable,
-            sym::rustc_allow_const_fn_ptr,
-        ]
-        .iter()
-        .any(|&s| attr.has_name(s))
-        {
-            continue; // not a stability level
-        }
-
-        mark_used(attr);
-
-        let meta = attr.meta();
-
-        if attr.has_name(sym::rustc_promotable) {
-            promotable = true;
-        }
-        if attr.has_name(sym::rustc_allow_const_fn_ptr) {
-            allow_const_fn_ptr = true;
-        }
-        // attributes with data
-        else if let Some(MetaItem { kind: MetaItemKind::List(ref metas), .. }) = meta {
-            let meta = meta.as_ref().unwrap();
-            let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
-                if item.is_some() {
-                    handle_errors(
-                        sess,
-                        meta.span,
-                        AttrError::MultipleItem(pprust::path_to_string(&meta.path)),
-                    );
-                    return false;
-                }
-                if let Some(v) = meta.value_str() {
-                    *item = Some(v);
-                    true
-                } else {
-                    struct_span_err!(diagnostic, meta.span, E0539, "incorrect meta item").emit();
-                    false
-                }
-            };
-
-            macro_rules! get_meta {
-                ($($name:ident),+) => {
-                    $(
-                        let mut $name = None;
-                    )+
-                    for meta in metas {
-                        if let Some(mi) = meta.meta_item() {
-                            match mi.name_or_empty() {
-                                $(
-                                    sym::$name => if !get(mi, &mut $name) { continue 'outer },
-                                )+
-                                _ => {
-                                    let expected = &[ $( stringify!($name) ),+ ];
-                                    handle_errors(
-                                        sess,
-                                        mi.span,
-                                        AttrError::UnknownMetaItem(
-                                            pprust::path_to_string(&mi.path),
-                                            expected,
-                                        ),
-                                    );
-                                    continue 'outer
-                                }
-                            }
-                        } else {
-                            handle_errors(
-                                sess,
-                                meta.span(),
-                                AttrError::UnsupportedLiteral(
-                                    "unsupported literal",
-                                    false,
-                                ),
-                            );
-                            continue 'outer
-                        }
-                    }
-                }
-            }
-
-            let meta_name = meta.name_or_empty();
-            match meta_name {
-                sym::rustc_deprecated => {
-                    if rustc_depr.is_some() {
-                        struct_span_err!(
-                            diagnostic,
-                            item_sp,
-                            E0540,
-                            "multiple rustc_deprecated attributes"
-                        )
-                        .emit();
-                        continue 'outer;
-                    }
-
-                    get_meta!(since, reason, suggestion);
-
-                    match (since, reason) {
-                        (Some(since), Some(reason)) => {
-                            rustc_depr = Some(RustcDeprecation { since, reason, suggestion })
-                        }
-                        (None, _) => {
-                            handle_errors(sess, attr.span, AttrError::MissingSince);
-                            continue;
-                        }
-                        _ => {
-                            struct_span_err!(diagnostic, attr.span, E0543, "missing 'reason'")
-                                .emit();
-                            continue;
-                        }
-                    }
-                }
-                sym::rustc_const_unstable | sym::unstable => {
-                    if meta_name == sym::unstable && stab.is_some() {
-                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
-                        break;
-                    } else if meta_name == sym::rustc_const_unstable && const_stab.is_some() {
-                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
-                        break;
-                    }
-
-                    let mut feature = None;
-                    let mut reason = None;
-                    let mut issue = None;
-                    let mut is_soft = false;
-                    for meta in metas {
-                        if let Some(mi) = meta.meta_item() {
-                            match mi.name_or_empty() {
-                                sym::feature => {
-                                    if !get(mi, &mut feature) {
-                                        continue 'outer;
-                                    }
-                                }
-                                sym::reason => {
-                                    if !get(mi, &mut reason) {
-                                        continue 'outer;
-                                    }
-                                }
-                                sym::issue => {
-                                    if !get(mi, &mut issue) {
-                                        continue 'outer;
-                                    }
-                                }
-                                sym::soft => {
-                                    if !mi.is_word() {
-                                        let msg = "`soft` should not have any arguments";
-                                        sess.span_diagnostic.span_err(mi.span, msg);
-                                    }
-                                    is_soft = true;
-                                }
-                                _ => {
-                                    handle_errors(
-                                        sess,
-                                        meta.span(),
-                                        AttrError::UnknownMetaItem(
-                                            pprust::path_to_string(&mi.path),
-                                            &["feature", "reason", "issue", "soft"],
-                                        ),
-                                    );
-                                    continue 'outer;
-                                }
-                            }
-                        } else {
-                            handle_errors(
-                                sess,
-                                meta.span(),
-                                AttrError::UnsupportedLiteral("unsupported literal", false),
-                            );
-                            continue 'outer;
-                        }
-                    }
-
-                    match (feature, reason, issue) {
-                        (Some(feature), reason, Some(issue)) => {
-                            let issue = match &*issue.as_str() {
-                                "none" => None,
-                                issue => {
-                                    if let Ok(num) = issue.parse() {
-                                        // FIXME(rossmacarthur): disallow 0
-                                        // Disallowing this requires updates to some submodules
-                                        NonZeroU32::new(num)
-                                    } else {
-                                        struct_span_err!(
-                                            diagnostic,
-                                            attr.span,
-                                            E0545,
-                                            "incorrect 'issue'"
-                                        )
-                                        .emit();
-                                        continue;
-                                    }
-                                }
-                            };
-                            let level = Unstable { reason, issue, is_soft };
-                            if sym::unstable == meta_name {
-                                stab = Some(Stability { level, feature, rustc_depr: None });
-                            } else {
-                                const_stab = Some(ConstStability {
-                                    level,
-                                    feature,
-                                    promotable: false,
-                                    allow_const_fn_ptr: false,
-                                });
-                            }
-                        }
-                        (None, _, _) => {
-                            handle_errors(sess, attr.span, AttrError::MissingFeature);
-                            continue;
-                        }
-                        _ => {
-                            struct_span_err!(diagnostic, attr.span, E0547, "missing 'issue'")
-                                .emit();
-                            continue;
-                        }
-                    }
-                }
-                sym::rustc_const_stable | sym::stable => {
-                    if meta_name == sym::stable && stab.is_some() {
-                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
-                        break;
-                    } else if meta_name == sym::rustc_const_stable && const_stab.is_some() {
-                        handle_errors(sess, attr.span, AttrError::MultipleStabilityLevels);
-                        break;
-                    }
-
-                    let mut feature = None;
-                    let mut since = None;
-                    for meta in metas {
-                        match meta {
-                            NestedMetaItem::MetaItem(mi) => match mi.name_or_empty() {
-                                sym::feature => {
-                                    if !get(mi, &mut feature) {
-                                        continue 'outer;
-                                    }
-                                }
-                                sym::since => {
-                                    if !get(mi, &mut since) {
-                                        continue 'outer;
-                                    }
-                                }
-                                _ => {
-                                    handle_errors(
-                                        sess,
-                                        meta.span(),
-                                        AttrError::UnknownMetaItem(
-                                            pprust::path_to_string(&mi.path),
-                                            &["since", "note"],
-                                        ),
-                                    );
-                                    continue 'outer;
-                                }
-                            },
-                            NestedMetaItem::Literal(lit) => {
-                                handle_errors(
-                                    sess,
-                                    lit.span,
-                                    AttrError::UnsupportedLiteral("unsupported literal", false),
-                                );
-                                continue 'outer;
-                            }
-                        }
-                    }
-
-                    match (feature, since) {
-                        (Some(feature), Some(since)) => {
-                            let level = Stable { since };
-                            if sym::stable == meta_name {
-                                stab = Some(Stability { level, feature, rustc_depr: None });
-                            } else {
-                                const_stab = Some(ConstStability {
-                                    level,
-                                    feature,
-                                    promotable: false,
-                                    allow_const_fn_ptr: false,
-                                });
-                            }
-                        }
-                        (None, _) => {
-                            handle_errors(sess, attr.span, AttrError::MissingFeature);
-                            continue;
-                        }
-                        _ => {
-                            handle_errors(sess, attr.span, AttrError::MissingSince);
-                            continue;
-                        }
-                    }
-                }
-                _ => unreachable!(),
-            }
-        }
-    }
-
-    // Merge the deprecation info into the stability info
-    if let Some(rustc_depr) = rustc_depr {
-        if let Some(ref mut stab) = stab {
-            stab.rustc_depr = Some(rustc_depr);
-        } else {
-            struct_span_err!(
-                diagnostic,
-                item_sp,
-                E0549,
-                "rustc_deprecated attribute must be paired with \
-                       either stable or unstable attribute"
-            )
-            .emit();
-        }
-    }
-
-    // Merge the const-unstable info into the stability info
-    if promotable || allow_const_fn_ptr {
-        if let Some(ref mut stab) = const_stab {
-            stab.promotable = promotable;
-            stab.allow_const_fn_ptr = allow_const_fn_ptr;
-        } else {
-            struct_span_err!(
-                diagnostic,
-                item_sp,
-                E0717,
-                "rustc_promotable and rustc_allow_const_fn_ptr attributes \
-                      must be paired with either a rustc_const_unstable or a rustc_const_stable \
-                      attribute"
-            )
-            .emit();
-        }
-    }
-
-    (stab, const_stab)
-}
-
-pub fn find_crate_name(attrs: &[Attribute]) -> Option<Symbol> {
-    super::first_attr_value_str_by_name(attrs, sym::crate_name)
-}
-
-/// Tests if a cfg-pattern matches the cfg set
-pub fn cfg_matches(cfg: &ast::MetaItem, sess: &ParseSess, features: Option<&Features>) -> bool {
-    eval_condition(cfg, sess, &mut |cfg| {
-        let gate = find_gated_cfg(|sym| cfg.check_name(sym));
-        if let (Some(feats), Some(gated_cfg)) = (features, gate) {
-            gate_cfg(&gated_cfg, cfg.span, sess, feats);
-        }
-        let error = |span, msg| {
-            sess.span_diagnostic.span_err(span, msg);
-            true
-        };
-        if cfg.path.segments.len() != 1 {
-            return error(cfg.path.span, "`cfg` predicate key must be an identifier");
-        }
-        match &cfg.kind {
-            MetaItemKind::List(..) => {
-                error(cfg.span, "unexpected parentheses after `cfg` predicate key")
-            }
-            MetaItemKind::NameValue(lit) if !lit.kind.is_str() => {
-                handle_errors(
-                    sess,
-                    lit.span,
-                    AttrError::UnsupportedLiteral(
-                        "literal in `cfg` predicate value must be a string",
-                        lit.kind.is_bytestr(),
-                    ),
-                );
-                true
-            }
-            MetaItemKind::NameValue(..) | MetaItemKind::Word => {
-                let ident = cfg.ident().expect("multi-segment cfg predicate");
-                sess.config.contains(&(ident.name, cfg.value_str()))
-            }
-        }
-    })
-}
-
-fn gate_cfg(gated_cfg: &GatedCfg, cfg_span: Span, sess: &ParseSess, features: &Features) {
-    let (cfg, feature, has_feature) = gated_cfg;
-    if !has_feature(features) && !cfg_span.allows_unstable(*feature) {
-        let explain = format!("`cfg({})` is experimental and subject to change", cfg);
-        feature_err(sess, *feature, cfg_span, &explain).emit()
-    }
-}
-
-/// Evaluate a cfg-like condition (with `any` and `all`), using `eval` to
-/// evaluate individual items.
-pub fn eval_condition(
-    cfg: &ast::MetaItem,
-    sess: &ParseSess,
-    eval: &mut impl FnMut(&ast::MetaItem) -> bool,
-) -> bool {
-    match cfg.kind {
-        ast::MetaItemKind::List(ref mis) => {
-            for mi in mis.iter() {
-                if !mi.is_meta_item() {
-                    handle_errors(
-                        sess,
-                        mi.span(),
-                        AttrError::UnsupportedLiteral("unsupported literal", false),
-                    );
-                    return false;
-                }
-            }
-
-            // The unwraps below may look dangerous, but we've already asserted
-            // that they won't fail with the loop above.
-            match cfg.name_or_empty() {
-                sym::any => {
-                    mis.iter().any(|mi| eval_condition(mi.meta_item().unwrap(), sess, eval))
-                }
-                sym::all => {
-                    mis.iter().all(|mi| eval_condition(mi.meta_item().unwrap(), sess, eval))
-                }
-                sym::not => {
-                    if mis.len() != 1 {
-                        struct_span_err!(
-                            sess.span_diagnostic,
-                            cfg.span,
-                            E0536,
-                            "expected 1 cfg-pattern"
-                        )
-                        .emit();
-                        return false;
-                    }
-
-                    !eval_condition(mis[0].meta_item().unwrap(), sess, eval)
-                }
-                _ => {
-                    struct_span_err!(
-                        sess.span_diagnostic,
-                        cfg.span,
-                        E0537,
-                        "invalid predicate `{}`",
-                        pprust::path_to_string(&cfg.path)
-                    )
-                    .emit();
-                    false
-                }
-            }
-        }
-        ast::MetaItemKind::Word | ast::MetaItemKind::NameValue(..) => eval(cfg),
-    }
-}
-
-#[derive(RustcEncodable, RustcDecodable, Clone, HashStable_Generic)]
-pub struct Deprecation {
-    pub since: Option<Symbol>,
-    pub note: Option<Symbol>,
-}
-
-/// Finds the deprecation attribute. `None` if none exists.
-pub fn find_deprecation(
-    sess: &ParseSess,
-    attrs: &[Attribute],
-    item_sp: Span,
-) -> Option<Deprecation> {
-    find_deprecation_generic(sess, attrs.iter(), item_sp)
-}
-
-fn find_deprecation_generic<'a, I>(
-    sess: &ParseSess,
-    attrs_iter: I,
-    item_sp: Span,
-) -> Option<Deprecation>
-where
-    I: Iterator<Item = &'a Attribute>,
-{
-    let mut depr: Option<Deprecation> = None;
-    let diagnostic = &sess.span_diagnostic;
-
-    'outer: for attr in attrs_iter {
-        if !attr.check_name(sym::deprecated) {
-            continue;
-        }
-
-        if depr.is_some() {
-            struct_span_err!(diagnostic, item_sp, E0550, "multiple deprecated attributes").emit();
-            break;
-        }
-
-        let meta = match attr.meta() {
-            Some(meta) => meta,
-            None => continue,
-        };
-        depr = match &meta.kind {
-            MetaItemKind::Word => Some(Deprecation { since: None, note: None }),
-            MetaItemKind::NameValue(..) => {
-                meta.value_str().map(|note| Deprecation { since: None, note: Some(note) })
-            }
-            MetaItemKind::List(list) => {
-                let get = |meta: &MetaItem, item: &mut Option<Symbol>| {
-                    if item.is_some() {
-                        handle_errors(
-                            sess,
-                            meta.span,
-                            AttrError::MultipleItem(pprust::path_to_string(&meta.path)),
-                        );
-                        return false;
-                    }
-                    if let Some(v) = meta.value_str() {
-                        *item = Some(v);
-                        true
-                    } else {
-                        if let Some(lit) = meta.name_value_literal() {
-                            handle_errors(
-                                sess,
-                                lit.span,
-                                AttrError::UnsupportedLiteral(
-                                    "literal in `deprecated` \
-                                    value must be a string",
-                                    lit.kind.is_bytestr(),
-                                ),
-                            );
-                        } else {
-                            struct_span_err!(diagnostic, meta.span, E0551, "incorrect meta item")
-                                .emit();
-                        }
-
-                        false
-                    }
-                };
-
-                let mut since = None;
-                let mut note = None;
-                for meta in list {
-                    match meta {
-                        NestedMetaItem::MetaItem(mi) => match mi.name_or_empty() {
-                            sym::since => {
-                                if !get(mi, &mut since) {
-                                    continue 'outer;
-                                }
-                            }
-                            sym::note => {
-                                if !get(mi, &mut note) {
-                                    continue 'outer;
-                                }
-                            }
-                            _ => {
-                                handle_errors(
-                                    sess,
-                                    meta.span(),
-                                    AttrError::UnknownMetaItem(
-                                        pprust::path_to_string(&mi.path),
-                                        &["since", "note"],
-                                    ),
-                                );
-                                continue 'outer;
-                            }
-                        },
-                        NestedMetaItem::Literal(lit) => {
-                            handle_errors(
-                                sess,
-                                lit.span,
-                                AttrError::UnsupportedLiteral(
-                                    "item in `deprecated` must be a key/value pair",
-                                    false,
-                                ),
-                            );
-                            continue 'outer;
-                        }
-                    }
-                }
-
-                Some(Deprecation { since, note })
-            }
-        };
-    }
-
-    depr
-}
-
-#[derive(PartialEq, Debug, RustcEncodable, RustcDecodable, Copy, Clone)]
-pub enum ReprAttr {
-    ReprInt(IntType),
-    ReprC,
-    ReprPacked(u32),
-    ReprSimd,
-    ReprTransparent,
-    ReprAlign(u32),
-}
-
-#[derive(Eq, PartialEq, Debug, RustcEncodable, RustcDecodable, Copy, Clone, HashStable_Generic)]
-pub enum IntType {
-    SignedInt(ast::IntTy),
-    UnsignedInt(ast::UintTy),
-}
-
-impl IntType {
-    #[inline]
-    pub fn is_signed(self) -> bool {
-        use IntType::*;
-
-        match self {
-            SignedInt(..) => true,
-            UnsignedInt(..) => false,
-        }
-    }
-}
-
-/// Parse #[repr(...)] forms.
-///
-/// Valid repr contents: any of the primitive integral type names (see
-/// `int_type_of_word`, below) to specify enum discriminant type; `C`, to use
-/// the same discriminant size that the corresponding C enum would or C
-/// structure layout, `packed` to remove padding, and `transparent` to elegate representation
-/// concerns to the only non-ZST field.
-pub fn find_repr_attrs(sess: &ParseSess, attr: &Attribute) -> Vec<ReprAttr> {
-    use ReprAttr::*;
-
-    let mut acc = Vec::new();
-    let diagnostic = &sess.span_diagnostic;
-    if attr.has_name(sym::repr) {
-        if let Some(items) = attr.meta_item_list() {
-            mark_used(attr);
-            for item in items {
-                if !item.is_meta_item() {
-                    handle_errors(
-                        sess,
-                        item.span(),
-                        AttrError::UnsupportedLiteral(
-                            "meta item in `repr` must be an identifier",
-                            false,
-                        ),
-                    );
-                    continue;
-                }
-
-                let mut recognised = false;
-                if item.is_word() {
-                    let hint = match item.name_or_empty() {
-                        sym::C => Some(ReprC),
-                        sym::packed => Some(ReprPacked(1)),
-                        sym::simd => Some(ReprSimd),
-                        sym::transparent => Some(ReprTransparent),
-                        name => int_type_of_word(name).map(ReprInt),
-                    };
-
-                    if let Some(h) = hint {
-                        recognised = true;
-                        acc.push(h);
-                    }
-                } else if let Some((name, value)) = item.name_value_literal() {
-                    let parse_alignment = |node: &ast::LitKind| -> Result<u32, &'static str> {
-                        if let ast::LitKind::Int(literal, ast::LitIntType::Unsuffixed) = node {
-                            if literal.is_power_of_two() {
-                                // rustc::ty::layout::Align restricts align to <= 2^29
-                                if *literal <= 1 << 29 {
-                                    Ok(*literal as u32)
-                                } else {
-                                    Err("larger than 2^29")
-                                }
-                            } else {
-                                Err("not a power of two")
-                            }
-                        } else {
-                            Err("not an unsuffixed integer")
-                        }
-                    };
-
-                    let mut literal_error = None;
-                    if name == sym::align {
-                        recognised = true;
-                        match parse_alignment(&value.kind) {
-                            Ok(literal) => acc.push(ReprAlign(literal)),
-                            Err(message) => literal_error = Some(message),
-                        };
-                    } else if name == sym::packed {
-                        recognised = true;
-                        match parse_alignment(&value.kind) {
-                            Ok(literal) => acc.push(ReprPacked(literal)),
-                            Err(message) => literal_error = Some(message),
-                        };
-                    }
-                    if let Some(literal_error) = literal_error {
-                        struct_span_err!(
-                            diagnostic,
-                            item.span(),
-                            E0589,
-                            "invalid `repr(align)` attribute: {}",
-                            literal_error
-                        )
-                        .emit();
-                    }
-                } else {
-                    if let Some(meta_item) = item.meta_item() {
-                        if meta_item.check_name(sym::align) {
-                            if let MetaItemKind::NameValue(ref value) = meta_item.kind {
-                                recognised = true;
-                                let mut err = struct_span_err!(
-                                    diagnostic,
-                                    item.span(),
-                                    E0693,
-                                    "incorrect `repr(align)` attribute format"
-                                );
-                                match value.kind {
-                                    ast::LitKind::Int(int, ast::LitIntType::Unsuffixed) => {
-                                        err.span_suggestion(
-                                            item.span(),
-                                            "use parentheses instead",
-                                            format!("align({})", int),
-                                            Applicability::MachineApplicable,
-                                        );
-                                    }
-                                    ast::LitKind::Str(s, _) => {
-                                        err.span_suggestion(
-                                            item.span(),
-                                            "use parentheses instead",
-                                            format!("align({})", s),
-                                            Applicability::MachineApplicable,
-                                        );
-                                    }
-                                    _ => {}
-                                }
-                                err.emit();
-                            }
-                        }
-                    }
-                }
-                if !recognised {
-                    // Not a word we recognize
-                    struct_span_err!(
-                        diagnostic,
-                        item.span(),
-                        E0552,
-                        "unrecognized representation hint"
-                    )
-                    .emit();
-                }
-            }
-        }
-    }
-    acc
-}
-
-fn int_type_of_word(s: Symbol) -> Option<IntType> {
-    use IntType::*;
-
-    match s {
-        sym::i8 => Some(SignedInt(ast::IntTy::I8)),
-        sym::u8 => Some(UnsignedInt(ast::UintTy::U8)),
-        sym::i16 => Some(SignedInt(ast::IntTy::I16)),
-        sym::u16 => Some(UnsignedInt(ast::UintTy::U16)),
-        sym::i32 => Some(SignedInt(ast::IntTy::I32)),
-        sym::u32 => Some(UnsignedInt(ast::UintTy::U32)),
-        sym::i64 => Some(SignedInt(ast::IntTy::I64)),
-        sym::u64 => Some(UnsignedInt(ast::UintTy::U64)),
-        sym::i128 => Some(SignedInt(ast::IntTy::I128)),
-        sym::u128 => Some(UnsignedInt(ast::UintTy::U128)),
-        sym::isize => Some(SignedInt(ast::IntTy::Isize)),
-        sym::usize => Some(UnsignedInt(ast::UintTy::Usize)),
-        _ => None,
-    }
-}
-
-pub enum TransparencyError {
-    UnknownTransparency(Symbol, Span),
-    MultipleTransparencyAttrs(Span, Span),
-}
-
-pub fn find_transparency(
-    attrs: &[Attribute],
-    is_legacy: bool,
-) -> (Transparency, Option<TransparencyError>) {
-    let mut transparency = None;
-    let mut error = None;
-    for attr in attrs {
-        if attr.check_name(sym::rustc_macro_transparency) {
-            if let Some((_, old_span)) = transparency {
-                error = Some(TransparencyError::MultipleTransparencyAttrs(old_span, attr.span));
-                break;
-            } else if let Some(value) = attr.value_str() {
-                transparency = Some((
-                    match &*value.as_str() {
-                        "transparent" => Transparency::Transparent,
-                        "semitransparent" => Transparency::SemiTransparent,
-                        "opaque" => Transparency::Opaque,
-                        _ => {
-                            error = Some(TransparencyError::UnknownTransparency(value, attr.span));
-                            continue;
-                        }
-                    },
-                    attr.span,
-                ));
-            }
-        }
-    }
-    let fallback = if is_legacy { Transparency::SemiTransparent } else { Transparency::Opaque };
-    (transparency.map_or(fallback, |t| t.0), error)
-}
diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs
deleted file mode 100644
index ec05dab451..0000000000
--- a/src/libsyntax/attr/mod.rs
+++ /dev/null
@@ -1,737 +0,0 @@
-//! Functions dealing with attributes and meta items.
-
-mod builtin;
-
-pub use crate::ast::Attribute;
-pub use builtin::*;
-pub use IntType::*;
-pub use ReprAttr::*;
-pub use StabilityLevel::*;
-
-use crate::ast;
-use crate::ast::{AttrId, AttrItem, AttrKind, AttrStyle, AttrVec, Ident, Name, Path, PathSegment};
-use crate::ast::{Expr, GenericParam, Item, Lit, LitKind, Local, Stmt, StmtKind};
-use crate::ast::{MacArgs, MacDelimiter, MetaItem, MetaItemKind, NestedMetaItem};
-use crate::mut_visit::visit_clobber;
-use crate::ptr::P;
-use crate::token::{self, Token};
-use crate::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndJoint};
-use crate::GLOBALS;
-
-use rustc_span::source_map::{BytePos, Spanned};
-use rustc_span::symbol::{sym, Symbol};
-use rustc_span::Span;
-
-use log::debug;
-use std::iter;
-use std::ops::DerefMut;
-
-pub fn mark_used(attr: &Attribute) {
-    debug!("marking {:?} as used", attr);
-    GLOBALS.with(|globals| {
-        globals.used_attrs.lock().insert(attr.id);
-    });
-}
-
-pub fn is_used(attr: &Attribute) -> bool {
-    GLOBALS.with(|globals| globals.used_attrs.lock().contains(attr.id))
-}
-
-pub fn mark_known(attr: &Attribute) {
-    debug!("marking {:?} as known", attr);
-    GLOBALS.with(|globals| {
-        globals.known_attrs.lock().insert(attr.id);
-    });
-}
-
-pub fn is_known(attr: &Attribute) -> bool {
-    GLOBALS.with(|globals| globals.known_attrs.lock().contains(attr.id))
-}
-
-pub fn is_known_lint_tool(m_item: Ident) -> bool {
-    [sym::clippy, sym::rustc].contains(&m_item.name)
-}
-
-impl NestedMetaItem {
-    /// Returns the `MetaItem` if `self` is a `NestedMetaItem::MetaItem`.
-    pub fn meta_item(&self) -> Option<&MetaItem> {
-        match *self {
-            NestedMetaItem::MetaItem(ref item) => Some(item),
-            _ => None,
-        }
-    }
-
-    /// Returns the `Lit` if `self` is a `NestedMetaItem::Literal`s.
-    pub fn literal(&self) -> Option<&Lit> {
-        match *self {
-            NestedMetaItem::Literal(ref lit) => Some(lit),
-            _ => None,
-        }
-    }
-
-    /// Returns `true` if this list item is a MetaItem with a name of `name`.
-    pub fn check_name(&self, name: Symbol) -> bool {
-        self.meta_item().map_or(false, |meta_item| meta_item.check_name(name))
-    }
-
-    /// For a single-segment meta item, returns its name; otherwise, returns `None`.
-    pub fn ident(&self) -> Option<Ident> {
-        self.meta_item().and_then(|meta_item| meta_item.ident())
-    }
-    pub fn name_or_empty(&self) -> Symbol {
-        self.ident().unwrap_or(Ident::invalid()).name
-    }
-
-    /// Gets the string value if `self` is a `MetaItem` and the `MetaItem` is a
-    /// `MetaItemKind::NameValue` variant containing a string, otherwise `None`.
-    pub fn value_str(&self) -> Option<Symbol> {
-        self.meta_item().and_then(|meta_item| meta_item.value_str())
-    }
-
-    /// Returns a name and single literal value tuple of the `MetaItem`.
-    pub fn name_value_literal(&self) -> Option<(Name, &Lit)> {
-        self.meta_item().and_then(|meta_item| {
-            meta_item.meta_item_list().and_then(|meta_item_list| {
-                if meta_item_list.len() == 1 {
-                    if let Some(ident) = meta_item.ident() {
-                        if let Some(lit) = meta_item_list[0].literal() {
-                            return Some((ident.name, lit));
-                        }
-                    }
-                }
-                None
-            })
-        })
-    }
-
-    /// Gets a list of inner meta items from a list `MetaItem` type.
-    pub fn meta_item_list(&self) -> Option<&[NestedMetaItem]> {
-        self.meta_item().and_then(|meta_item| meta_item.meta_item_list())
-    }
-
-    /// Returns `true` if the variant is `MetaItem`.
-    pub fn is_meta_item(&self) -> bool {
-        self.meta_item().is_some()
-    }
-
-    /// Returns `true` if the variant is `Literal`.
-    pub fn is_literal(&self) -> bool {
-        self.literal().is_some()
-    }
-
-    /// Returns `true` if `self` is a `MetaItem` and the meta item is a word.
-    pub fn is_word(&self) -> bool {
-        self.meta_item().map_or(false, |meta_item| meta_item.is_word())
-    }
-
-    /// Returns `true` if `self` is a `MetaItem` and the meta item is a `ValueString`.
-    pub fn is_value_str(&self) -> bool {
-        self.value_str().is_some()
-    }
-
-    /// Returns `true` if `self` is a `MetaItem` and the meta item is a list.
-    pub fn is_meta_item_list(&self) -> bool {
-        self.meta_item_list().is_some()
-    }
-}
-
-impl Attribute {
-    pub fn has_name(&self, name: Symbol) -> bool {
-        match self.kind {
-            AttrKind::Normal(ref item) => item.path == name,
-            AttrKind::DocComment(_) => false,
-        }
-    }
-
-    /// Returns `true` if the attribute's path matches the argument. If it matches, then the
-    /// attribute is marked as used.
-    pub fn check_name(&self, name: Symbol) -> bool {
-        let matches = self.has_name(name);
-        if matches {
-            mark_used(self);
-        }
-        matches
-    }
-
-    /// For a single-segment attribute, returns its name; otherwise, returns `None`.
-    pub fn ident(&self) -> Option<Ident> {
-        match self.kind {
-            AttrKind::Normal(ref item) => {
-                if item.path.segments.len() == 1 {
-                    Some(item.path.segments[0].ident)
-                } else {
-                    None
-                }
-            }
-            AttrKind::DocComment(_) => None,
-        }
-    }
-    pub fn name_or_empty(&self) -> Symbol {
-        self.ident().unwrap_or(Ident::invalid()).name
-    }
-
-    pub fn value_str(&self) -> Option<Symbol> {
-        match self.kind {
-            AttrKind::Normal(ref item) => item.meta(self.span).and_then(|meta| meta.value_str()),
-            AttrKind::DocComment(..) => None,
-        }
-    }
-
-    pub fn meta_item_list(&self) -> Option<Vec<NestedMetaItem>> {
-        match self.kind {
-            AttrKind::Normal(ref item) => match item.meta(self.span) {
-                Some(MetaItem { kind: MetaItemKind::List(list), .. }) => Some(list),
-                _ => None,
-            },
-            AttrKind::DocComment(_) => None,
-        }
-    }
-
-    pub fn is_word(&self) -> bool {
-        if let AttrKind::Normal(item) = &self.kind {
-            matches!(item.args, MacArgs::Empty)
-        } else {
-            false
-        }
-    }
-
-    pub fn is_meta_item_list(&self) -> bool {
-        self.meta_item_list().is_some()
-    }
-
-    /// Indicates if the attribute is a `ValueString`.
-    pub fn is_value_str(&self) -> bool {
-        self.value_str().is_some()
-    }
-}
-
-impl MetaItem {
-    /// For a single-segment meta item, returns its name; otherwise, returns `None`.
-    pub fn ident(&self) -> Option<Ident> {
-        if self.path.segments.len() == 1 { Some(self.path.segments[0].ident) } else { None }
-    }
-    pub fn name_or_empty(&self) -> Symbol {
-        self.ident().unwrap_or(Ident::invalid()).name
-    }
-
-    // Example:
-    //     #[attribute(name = "value")]
-    //                 ^^^^^^^^^^^^^^
-    pub fn name_value_literal(&self) -> Option<&Lit> {
-        match &self.kind {
-            MetaItemKind::NameValue(v) => Some(v),
-            _ => None,
-        }
-    }
-
-    pub fn value_str(&self) -> Option<Symbol> {
-        match self.kind {
-            MetaItemKind::NameValue(ref v) => match v.kind {
-                LitKind::Str(ref s, _) => Some(*s),
-                _ => None,
-            },
-            _ => None,
-        }
-    }
-
-    pub fn meta_item_list(&self) -> Option<&[NestedMetaItem]> {
-        match self.kind {
-            MetaItemKind::List(ref l) => Some(&l[..]),
-            _ => None,
-        }
-    }
-
-    pub fn is_word(&self) -> bool {
-        match self.kind {
-            MetaItemKind::Word => true,
-            _ => false,
-        }
-    }
-
-    pub fn check_name(&self, name: Symbol) -> bool {
-        self.path == name
-    }
-
-    pub fn is_value_str(&self) -> bool {
-        self.value_str().is_some()
-    }
-
-    pub fn is_meta_item_list(&self) -> bool {
-        self.meta_item_list().is_some()
-    }
-}
-
-impl AttrItem {
-    pub fn meta(&self, span: Span) -> Option<MetaItem> {
-        Some(MetaItem {
-            path: self.path.clone(),
-            kind: MetaItemKind::from_mac_args(&self.args)?,
-            span,
-        })
-    }
-}
-
-impl Attribute {
-    pub fn is_doc_comment(&self) -> bool {
-        match self.kind {
-            AttrKind::Normal(_) => false,
-            AttrKind::DocComment(_) => true,
-        }
-    }
-
-    pub fn doc_str(&self) -> Option<Symbol> {
-        match self.kind {
-            AttrKind::DocComment(symbol) => Some(symbol),
-            AttrKind::Normal(ref item) if item.path == sym::doc => {
-                item.meta(self.span).and_then(|meta| meta.value_str())
-            }
-            _ => None,
-        }
-    }
-
-    pub fn get_normal_item(&self) -> &AttrItem {
-        match self.kind {
-            AttrKind::Normal(ref item) => item,
-            AttrKind::DocComment(_) => panic!("unexpected doc comment"),
-        }
-    }
-
-    pub fn unwrap_normal_item(self) -> AttrItem {
-        match self.kind {
-            AttrKind::Normal(item) => item,
-            AttrKind::DocComment(_) => panic!("unexpected doc comment"),
-        }
-    }
-
-    /// Extracts the MetaItem from inside this Attribute.
-    pub fn meta(&self) -> Option<MetaItem> {
-        match self.kind {
-            AttrKind::Normal(ref item) => item.meta(self.span),
-            AttrKind::DocComment(..) => None,
-        }
-    }
-}
-
-/* Constructors */
-
-pub fn mk_name_value_item_str(ident: Ident, str: Symbol, str_span: Span) -> MetaItem {
-    let lit_kind = LitKind::Str(str, ast::StrStyle::Cooked);
-    mk_name_value_item(ident, lit_kind, str_span)
-}
-
-pub fn mk_name_value_item(ident: Ident, lit_kind: LitKind, lit_span: Span) -> MetaItem {
-    let lit = Lit::from_lit_kind(lit_kind, lit_span);
-    let span = ident.span.to(lit_span);
-    MetaItem { path: Path::from_ident(ident), span, kind: MetaItemKind::NameValue(lit) }
-}
-
-pub fn mk_list_item(ident: Ident, items: Vec<NestedMetaItem>) -> MetaItem {
-    MetaItem { path: Path::from_ident(ident), span: ident.span, kind: MetaItemKind::List(items) }
-}
-
-pub fn mk_word_item(ident: Ident) -> MetaItem {
-    MetaItem { path: Path::from_ident(ident), span: ident.span, kind: MetaItemKind::Word }
-}
-
-pub fn mk_nested_word_item(ident: Ident) -> NestedMetaItem {
-    NestedMetaItem::MetaItem(mk_word_item(ident))
-}
-
-crate fn mk_attr_id() -> AttrId {
-    use std::sync::atomic::AtomicUsize;
-    use std::sync::atomic::Ordering;
-
-    static NEXT_ATTR_ID: AtomicUsize = AtomicUsize::new(0);
-
-    let id = NEXT_ATTR_ID.fetch_add(1, Ordering::SeqCst);
-    assert!(id != ::std::usize::MAX);
-    AttrId(id)
-}
-
-pub fn mk_attr(style: AttrStyle, path: Path, args: MacArgs, span: Span) -> Attribute {
-    mk_attr_from_item(style, AttrItem { path, args }, span)
-}
-
-pub fn mk_attr_from_item(style: AttrStyle, item: AttrItem, span: Span) -> Attribute {
-    Attribute { kind: AttrKind::Normal(item), id: mk_attr_id(), style, span }
-}
-
-/// Returns an inner attribute with the given value and span.
-pub fn mk_attr_inner(item: MetaItem) -> Attribute {
-    mk_attr(AttrStyle::Inner, item.path, item.kind.mac_args(item.span), item.span)
-}
-
-/// Returns an outer attribute with the given value and span.
-pub fn mk_attr_outer(item: MetaItem) -> Attribute {
-    mk_attr(AttrStyle::Outer, item.path, item.kind.mac_args(item.span), item.span)
-}
-
-pub fn mk_doc_comment(style: AttrStyle, comment: Symbol, span: Span) -> Attribute {
-    Attribute { kind: AttrKind::DocComment(comment), id: mk_attr_id(), style, span }
-}
-
-pub fn list_contains_name(items: &[NestedMetaItem], name: Symbol) -> bool {
-    items.iter().any(|item| item.check_name(name))
-}
-
-pub fn contains_name(attrs: &[Attribute], name: Symbol) -> bool {
-    attrs.iter().any(|item| item.check_name(name))
-}
-
-pub fn find_by_name(attrs: &[Attribute], name: Symbol) -> Option<&Attribute> {
-    attrs.iter().find(|attr| attr.check_name(name))
-}
-
-pub fn allow_internal_unstable<'a>(
-    attrs: &[Attribute],
-    span_diagnostic: &'a rustc_errors::Handler,
-) -> Option<impl Iterator<Item = Symbol> + 'a> {
-    find_by_name(attrs, sym::allow_internal_unstable).and_then(|attr| {
-        attr.meta_item_list()
-            .or_else(|| {
-                span_diagnostic
-                    .span_err(attr.span, "allow_internal_unstable expects list of feature names");
-                None
-            })
-            .map(|features| {
-                features.into_iter().filter_map(move |it| {
-                    let name = it.ident().map(|ident| ident.name);
-                    if name.is_none() {
-                        span_diagnostic
-                            .span_err(it.span(), "`allow_internal_unstable` expects feature names")
-                    }
-                    name
-                })
-            })
-    })
-}
-
-pub fn filter_by_name(attrs: &[Attribute], name: Symbol) -> impl Iterator<Item = &Attribute> {
-    attrs.iter().filter(move |attr| attr.check_name(name))
-}
-
-pub fn first_attr_value_str_by_name(attrs: &[Attribute], name: Symbol) -> Option<Symbol> {
-    attrs.iter().find(|at| at.check_name(name)).and_then(|at| at.value_str())
-}
-
-impl MetaItem {
-    fn token_trees_and_joints(&self) -> Vec<TreeAndJoint> {
-        let mut idents = vec![];
-        let mut last_pos = BytePos(0 as u32);
-        for (i, segment) in self.path.segments.iter().enumerate() {
-            let is_first = i == 0;
-            if !is_first {
-                let mod_sep_span =
-                    Span::new(last_pos, segment.ident.span.lo(), segment.ident.span.ctxt());
-                idents.push(TokenTree::token(token::ModSep, mod_sep_span).into());
-            }
-            idents.push(TokenTree::Token(Token::from_ast_ident(segment.ident)).into());
-            last_pos = segment.ident.span.hi();
-        }
-        idents.extend(self.kind.token_trees_and_joints(self.span));
-        idents
-    }
-
-    fn from_tokens<I>(tokens: &mut iter::Peekable<I>) -> Option<MetaItem>
-    where
-        I: Iterator<Item = TokenTree>,
-    {
-        // FIXME: Share code with `parse_path`.
-        let path = match tokens.next() {
-            Some(TokenTree::Token(Token { kind: kind @ token::Ident(..), span }))
-            | Some(TokenTree::Token(Token { kind: kind @ token::ModSep, span })) => 'arm: {
-                let mut segments = if let token::Ident(name, _) = kind {
-                    if let Some(TokenTree::Token(Token { kind: token::ModSep, .. })) = tokens.peek()
-                    {
-                        tokens.next();
-                        vec![PathSegment::from_ident(Ident::new(name, span))]
-                    } else {
-                        break 'arm Path::from_ident(Ident::new(name, span));
-                    }
-                } else {
-                    vec![PathSegment::path_root(span)]
-                };
-                loop {
-                    if let Some(TokenTree::Token(Token { kind: token::Ident(name, _), span })) =
-                        tokens.next()
-                    {
-                        segments.push(PathSegment::from_ident(Ident::new(name, span)));
-                    } else {
-                        return None;
-                    }
-                    if let Some(TokenTree::Token(Token { kind: token::ModSep, .. })) = tokens.peek()
-                    {
-                        tokens.next();
-                    } else {
-                        break;
-                    }
-                }
-                let span = span.with_hi(segments.last().unwrap().ident.span.hi());
-                Path { span, segments }
-            }
-            Some(TokenTree::Token(Token { kind: token::Interpolated(nt), .. })) => match *nt {
-                token::Nonterminal::NtIdent(ident, _) => Path::from_ident(ident),
-                token::Nonterminal::NtMeta(ref item) => return item.meta(item.path.span),
-                token::Nonterminal::NtPath(ref path) => path.clone(),
-                _ => return None,
-            },
-            _ => return None,
-        };
-        let list_closing_paren_pos = tokens.peek().map(|tt| tt.span().hi());
-        let kind = MetaItemKind::from_tokens(tokens)?;
-        let hi = match kind {
-            MetaItemKind::NameValue(ref lit) => lit.span.hi(),
-            MetaItemKind::List(..) => list_closing_paren_pos.unwrap_or(path.span.hi()),
-            _ => path.span.hi(),
-        };
-        let span = path.span.with_hi(hi);
-        Some(MetaItem { path, kind, span })
-    }
-}
-
-impl MetaItemKind {
-    pub fn mac_args(&self, span: Span) -> MacArgs {
-        match self {
-            MetaItemKind::Word => MacArgs::Empty,
-            MetaItemKind::NameValue(lit) => MacArgs::Eq(span, lit.token_tree().into()),
-            MetaItemKind::List(list) => {
-                let mut tts = Vec::new();
-                for (i, item) in list.iter().enumerate() {
-                    if i > 0 {
-                        tts.push(TokenTree::token(token::Comma, span).into());
-                    }
-                    tts.extend(item.token_trees_and_joints())
-                }
-                MacArgs::Delimited(
-                    DelimSpan::from_single(span),
-                    MacDelimiter::Parenthesis,
-                    TokenStream::new(tts),
-                )
-            }
-        }
-    }
-
-    fn token_trees_and_joints(&self, span: Span) -> Vec<TreeAndJoint> {
-        match *self {
-            MetaItemKind::Word => vec![],
-            MetaItemKind::NameValue(ref lit) => {
-                vec![TokenTree::token(token::Eq, span).into(), lit.token_tree().into()]
-            }
-            MetaItemKind::List(ref list) => {
-                let mut tokens = Vec::new();
-                for (i, item) in list.iter().enumerate() {
-                    if i > 0 {
-                        tokens.push(TokenTree::token(token::Comma, span).into());
-                    }
-                    tokens.extend(item.token_trees_and_joints())
-                }
-                vec![
-                    TokenTree::Delimited(
-                        DelimSpan::from_single(span),
-                        token::Paren,
-                        TokenStream::new(tokens).into(),
-                    )
-                    .into(),
-                ]
-            }
-        }
-    }
-
-    fn list_from_tokens(tokens: TokenStream) -> Option<MetaItemKind> {
-        let mut tokens = tokens.into_trees().peekable();
-        let mut result = Vec::new();
-        while let Some(..) = tokens.peek() {
-            let item = NestedMetaItem::from_tokens(&mut tokens)?;
-            result.push(item);
-            match tokens.next() {
-                None | Some(TokenTree::Token(Token { kind: token::Comma, .. })) => {}
-                _ => return None,
-            }
-        }
-        Some(MetaItemKind::List(result))
-    }
-
-    fn name_value_from_tokens(
-        tokens: &mut impl Iterator<Item = TokenTree>,
-    ) -> Option<MetaItemKind> {
-        match tokens.next() {
-            Some(TokenTree::Token(token)) => {
-                Lit::from_token(&token).ok().map(MetaItemKind::NameValue)
-            }
-            _ => None,
-        }
-    }
-
-    fn from_mac_args(args: &MacArgs) -> Option<MetaItemKind> {
-        match args {
-            MacArgs::Delimited(_, MacDelimiter::Parenthesis, tokens) => {
-                MetaItemKind::list_from_tokens(tokens.clone())
-            }
-            MacArgs::Delimited(..) => None,
-            MacArgs::Eq(_, tokens) => {
-                assert!(tokens.len() == 1);
-                MetaItemKind::name_value_from_tokens(&mut tokens.trees())
-            }
-            MacArgs::Empty => Some(MetaItemKind::Word),
-        }
-    }
-
-    fn from_tokens(
-        tokens: &mut iter::Peekable<impl Iterator<Item = TokenTree>>,
-    ) -> Option<MetaItemKind> {
-        match tokens.peek() {
-            Some(TokenTree::Delimited(_, token::Paren, inner_tokens)) => {
-                let inner_tokens = inner_tokens.clone();
-                tokens.next();
-                MetaItemKind::list_from_tokens(inner_tokens)
-            }
-            Some(TokenTree::Delimited(..)) => None,
-            Some(TokenTree::Token(Token { kind: token::Eq, .. })) => {
-                tokens.next();
-                MetaItemKind::name_value_from_tokens(tokens)
-            }
-            _ => Some(MetaItemKind::Word),
-        }
-    }
-}
-
-impl NestedMetaItem {
-    pub fn span(&self) -> Span {
-        match *self {
-            NestedMetaItem::MetaItem(ref item) => item.span,
-            NestedMetaItem::Literal(ref lit) => lit.span,
-        }
-    }
-
-    fn token_trees_and_joints(&self) -> Vec<TreeAndJoint> {
-        match *self {
-            NestedMetaItem::MetaItem(ref item) => item.token_trees_and_joints(),
-            NestedMetaItem::Literal(ref lit) => vec![lit.token_tree().into()],
-        }
-    }
-
-    fn from_tokens<I>(tokens: &mut iter::Peekable<I>) -> Option<NestedMetaItem>
-    where
-        I: Iterator<Item = TokenTree>,
-    {
-        if let Some(TokenTree::Token(token)) = tokens.peek() {
-            if let Ok(lit) = Lit::from_token(token) {
-                tokens.next();
-                return Some(NestedMetaItem::Literal(lit));
-            }
-        }
-
-        MetaItem::from_tokens(tokens).map(NestedMetaItem::MetaItem)
-    }
-}
-
-pub trait HasAttrs: Sized {
-    fn attrs(&self) -> &[ast::Attribute];
-    fn visit_attrs<F: FnOnce(&mut Vec<ast::Attribute>)>(&mut self, f: F);
-}
-
-impl<T: HasAttrs> HasAttrs for Spanned<T> {
-    fn attrs(&self) -> &[ast::Attribute] {
-        self.node.attrs()
-    }
-    fn visit_attrs<F: FnOnce(&mut Vec<ast::Attribute>)>(&mut self, f: F) {
-        self.node.visit_attrs(f);
-    }
-}
-
-impl HasAttrs for Vec<Attribute> {
-    fn attrs(&self) -> &[Attribute] {
-        self
-    }
-    fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
-        f(self)
-    }
-}
-
-impl HasAttrs for AttrVec {
-    fn attrs(&self) -> &[Attribute] {
-        self
-    }
-    fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
-        visit_clobber(self, |this| {
-            let mut vec = this.into();
-            f(&mut vec);
-            vec.into()
-        });
-    }
-}
-
-impl<T: HasAttrs + 'static> HasAttrs for P<T> {
-    fn attrs(&self) -> &[Attribute] {
-        (**self).attrs()
-    }
-    fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
-        (**self).visit_attrs(f);
-    }
-}
-
-impl HasAttrs for StmtKind {
-    fn attrs(&self) -> &[Attribute] {
-        match *self {
-            StmtKind::Local(ref local) => local.attrs(),
-            StmtKind::Item(..) => &[],
-            StmtKind::Expr(ref expr) | StmtKind::Semi(ref expr) => expr.attrs(),
-            StmtKind::Mac(ref mac) => {
-                let (_, _, ref attrs) = **mac;
-                attrs.attrs()
-            }
-        }
-    }
-
-    fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
-        match self {
-            StmtKind::Local(local) => local.visit_attrs(f),
-            StmtKind::Item(..) => {}
-            StmtKind::Expr(expr) => expr.visit_attrs(f),
-            StmtKind::Semi(expr) => expr.visit_attrs(f),
-            StmtKind::Mac(mac) => {
-                let (_mac, _style, attrs) = mac.deref_mut();
-                attrs.visit_attrs(f);
-            }
-        }
-    }
-}
-
-impl HasAttrs for Stmt {
-    fn attrs(&self) -> &[ast::Attribute] {
-        self.kind.attrs()
-    }
-
-    fn visit_attrs<F: FnOnce(&mut Vec<ast::Attribute>)>(&mut self, f: F) {
-        self.kind.visit_attrs(f);
-    }
-}
-
-impl HasAttrs for GenericParam {
-    fn attrs(&self) -> &[ast::Attribute] {
-        &self.attrs
-    }
-
-    fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
-        self.attrs.visit_attrs(f);
-    }
-}
-
-macro_rules! derive_has_attrs {
-    ($($ty:path),*) => { $(
-        impl HasAttrs for $ty {
-            fn attrs(&self) -> &[Attribute] {
-                &self.attrs
-            }
-
-            fn visit_attrs<F: FnOnce(&mut Vec<Attribute>)>(&mut self, f: F) {
-                self.attrs.visit_attrs(f);
-            }
-        }
-    )* }
-}
-
-derive_has_attrs! {
-    Item, Expr, Local, ast::ForeignItem, ast::StructField, ast::AssocItem, ast::Arm,
-    ast::Field, ast::FieldPat, ast::Variant, ast::Param
-}
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
deleted file mode 100644
index b0c2aa3dbb..0000000000
--- a/src/libsyntax/lib.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-//! The Rust parser and macro expander.
-//!
-//! # Note
-//!
-//! This API is completely unstable and subject to change.
-
-#![doc(html_root_url = "https://doc.rust-lang.org/nightly/", test(attr(deny(warnings))))]
-#![feature(bool_to_option)]
-#![feature(box_syntax)]
-#![feature(const_fn)] // For the `transmute` in `P::new`
-#![feature(const_transmute)]
-#![feature(crate_visibility_modifier)]
-#![feature(label_break_value)]
-#![feature(nll)]
-#![feature(try_trait)]
-#![cfg_attr(bootstrap, feature(slice_patterns))]
-#![feature(unicode_internals)]
-#![recursion_limit = "256"]
-
-use ast::AttrId;
-use rustc_data_structures::sync::Lock;
-use rustc_index::bit_set::GrowableBitSet;
-use rustc_span::edition::{Edition, DEFAULT_EDITION};
-
-#[macro_export]
-macro_rules! unwrap_or {
-    ($opt:expr, $default:expr) => {
-        match $opt {
-            Some(x) => x,
-            None => $default,
-        }
-    };
-}
-
-pub struct Globals {
-    used_attrs: Lock<GrowableBitSet<AttrId>>,
-    known_attrs: Lock<GrowableBitSet<AttrId>>,
-    rustc_span_globals: rustc_span::Globals,
-}
-
-impl Globals {
-    fn new(edition: Edition) -> Globals {
-        Globals {
-            // We have no idea how many attributes there will be, so just
-            // initiate the vectors with 0 bits. We'll grow them as necessary.
-            used_attrs: Lock::new(GrowableBitSet::new_empty()),
-            known_attrs: Lock::new(GrowableBitSet::new_empty()),
-            rustc_span_globals: rustc_span::Globals::new(edition),
-        }
-    }
-}
-
-pub fn with_globals<R>(edition: Edition, f: impl FnOnce() -> R) -> R {
-    let globals = Globals::new(edition);
-    GLOBALS.set(&globals, || rustc_span::GLOBALS.set(&globals.rustc_span_globals, f))
-}
-
-pub fn with_default_globals<R>(f: impl FnOnce() -> R) -> R {
-    with_globals(DEFAULT_EDITION, f)
-}
-
-scoped_tls::scoped_thread_local!(pub static GLOBALS: Globals);
-
-pub mod util {
-    pub mod classify;
-    pub mod comments;
-    pub mod lev_distance;
-    pub mod literal;
-    pub mod map_in_place;
-    pub mod node_count;
-    pub mod parser;
-}
-
-pub mod ast;
-pub mod attr;
-pub mod entry;
-pub mod expand;
-pub mod mut_visit;
-pub mod ptr;
-pub use rustc_session::parse as sess;
-pub mod token;
-pub mod tokenstream;
-pub mod visit;
-
-pub mod print {
-    mod helpers;
-    pub mod pp;
-    pub mod pprust;
-}
-
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
-
-/// Requirements for a `StableHashingContext` to be used in this crate.
-/// This is a hack to allow using the `HashStable_Generic` derive macro
-/// instead of implementing everything in librustc.
-pub trait HashStableContext: rustc_span::HashStableContext {
-    fn hash_attr(&mut self, _: &ast::Attribute, hasher: &mut StableHasher);
-}
-
-impl<AstCtx: crate::HashStableContext> HashStable<AstCtx> for ast::Attribute {
-    fn hash_stable(&self, hcx: &mut AstCtx, hasher: &mut StableHasher) {
-        hcx.hash_attr(self, hasher)
-    }
-}
diff --git a/src/libtest/cli.rs b/src/libtest/cli.rs
index edff8bea0f..5317063b80 100644
--- a/src/libtest/cli.rs
+++ b/src/libtest/cli.rs
@@ -1,6 +1,5 @@
 //! Module converting command-line arguments into test configuration.
 
-use getopts;
 use std::env;
 use std::path::PathBuf;
 
@@ -274,7 +273,7 @@ fn parse_opts_impl(matches: getopts::Matches) -> OptRes {
     Ok(test_opts)
 }
 
-// FIXME: Copied from libsyntax until linkage errors are resolved. Issue #47566
+// FIXME: Copied from librustc_ast until linkage errors are resolved. Issue #47566
 fn is_nightly() -> bool {
     // Whether this is a feature-staged build, i.e., on the beta or stable channel
     let disable_unstable_features = option_env!("CFG_DISABLE_UNSTABLE_FEATURES").is_some();
@@ -284,7 +283,7 @@ fn is_nightly() -> bool {
     bootstrap || !disable_unstable_features
 }
 
-// Gets the CLI options assotiated with `report-time` feature.
+// Gets the CLI options associated with `report-time` feature.
 fn get_time_options(
     matches: &getopts::Matches,
     allow_unstable: bool,
diff --git a/src/libtest/console.rs b/src/libtest/console.rs
index ebdfb16294..149c9202e6 100644
--- a/src/libtest/console.rs
+++ b/src/libtest/console.rs
@@ -4,8 +4,6 @@ use std::fs::File;
 use std::io;
 use std::io::prelude::Write;
 
-use term;
-
 use super::{
     bench::fmt_bench_samples,
     cli::TestOpts,
diff --git a/src/libtest/formatters/json.rs b/src/libtest/formatters/json.rs
index 863cad9f9d..9ebc991d63 100644
--- a/src/libtest/formatters/json.rs
+++ b/src/libtest/formatters/json.rs
@@ -80,7 +80,7 @@ impl<T: Write> OutputFormatter for JsonFormatter<T> {
         state: &ConsoleTestState,
     ) -> io::Result<()> {
         let display_stdout = state.options.display_output || *result != TestResult::TrOk;
-        let stdout = if display_stdout && stdout.len() > 0 {
+        let stdout = if display_stdout && !stdout.is_empty() {
             Some(String::from_utf8_lossy(stdout))
         } else {
             None
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index e99473177e..55f9df9caa 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -13,7 +13,7 @@
 // running tests while providing a base that other test frameworks may
 // build off of.
 
-// N.B., this is also specified in this crate's Cargo.toml, but libsyntax contains logic specific to
+// N.B., this is also specified in this crate's Cargo.toml, but librustc_ast contains logic specific to
 // this crate, which relies on this attribute (rather than the value of `--crate-name` passed by
 // cargo) to detect this crate.
 
@@ -63,8 +63,7 @@ use std::{
     env, io,
     io::prelude::Write,
     panic::{self, catch_unwind, AssertUnwindSafe, PanicInfo},
-    process,
-    process::{Command, Termination},
+    process::{self, Command, Termination},
     sync::mpsc::{channel, Sender},
     sync::{Arc, Mutex},
     thread,
@@ -97,7 +96,7 @@ use time::TestExecTime;
 // Process exit code to be used to indicate test failures.
 const ERROR_EXIT_CODE: i32 = 101;
 
-const SECONDARY_TEST_INVOKER_VAR: &'static str = "__RUST_TEST_INVOKE";
+const SECONDARY_TEST_INVOKER_VAR: &str = "__RUST_TEST_INVOKE";
 
 // The default console test runner. It accepts the command line
 // arguments and a vector of test_descs.
@@ -159,7 +158,7 @@ pub fn test_main_static_abort(tests: &[&TestDescAndFn]) {
             .filter(|test| test.desc.name.as_slice() == name)
             .map(make_owned_test)
             .next()
-            .expect(&format!("couldn't find a test with the provided name '{}'", name));
+            .unwrap_or_else(|| panic!("couldn't find a test with the provided name '{}'", name));
         let TestDescAndFn { desc, testfn } = test;
         let testfn = match testfn {
             StaticTestFn(f) => f,
@@ -457,9 +456,13 @@ pub fn run_test(
                 monitor_ch,
                 opts.time,
             ),
-            RunStrategy::SpawnPrimary => {
-                spawn_test_subprocess(desc, opts.time.is_some(), monitor_ch, opts.time)
-            }
+            RunStrategy::SpawnPrimary => spawn_test_subprocess(
+                desc,
+                opts.nocapture,
+                opts.time.is_some(),
+                monitor_ch,
+                opts.time,
+            ),
         };
 
         // If the platform is single-threaded we're just going to run
@@ -558,6 +561,7 @@ fn run_test_in_process(
 
 fn spawn_test_subprocess(
     desc: TestDesc,
+    nocapture: bool,
     report_time: bool,
     monitor_ch: Sender<CompletedTest>,
     time_opts: Option<time::TestTimeOptions>,
@@ -566,11 +570,15 @@ fn spawn_test_subprocess(
         let args = env::args().collect::<Vec<_>>();
         let current_exe = &args[0];
 
+        let mut command = Command::new(current_exe);
+        command.env(SECONDARY_TEST_INVOKER_VAR, desc.name.as_slice());
+        if nocapture {
+            command.stdout(process::Stdio::inherit());
+            command.stderr(process::Stdio::inherit());
+        }
+
         let start = report_time.then(Instant::now);
-        let output = match Command::new(current_exe)
-            .env(SECONDARY_TEST_INVOKER_VAR, desc.name.as_slice())
-            .output()
-        {
+        let output = match command.output() {
             Ok(out) => out,
             Err(e) => {
                 let err = format!("Failed to spawn {} as child for test: {:?}", args[0], e);
diff --git a/src/libtest/options.rs b/src/libtest/options.rs
index 7db164c269..8e7bd8de92 100644
--- a/src/libtest/options.rs
+++ b/src/libtest/options.rs
@@ -41,7 +41,7 @@ pub enum OutputFormat {
     Json,
 }
 
-/// Whether ignored test should be runned or not
+/// Whether ignored test should be run or not
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum RunIgnored {
     Yes,
diff --git a/src/libtest/test_result.rs b/src/libtest/test_result.rs
index bfa572c887..465f3f8f99 100644
--- a/src/libtest/test_result.rs
+++ b/src/libtest/test_result.rs
@@ -27,7 +27,7 @@ pub enum TestResult {
 unsafe impl Send for TestResult {}
 
 /// Creates a `TestResult` depending on the raw result of test execution
-/// and assotiated data.
+/// and associated data.
 pub fn calc_result<'a>(
     desc: &TestDesc,
     task_result: Result<(), &'a (dyn Any + 'static + Send)>,
@@ -40,7 +40,7 @@ pub fn calc_result<'a>(
             let maybe_panic_str = err
                 .downcast_ref::<String>()
                 .map(|e| &**e)
-                .or_else(|| err.downcast_ref::<&'static str>().map(|e| *e));
+                .or_else(|| err.downcast_ref::<&'static str>().copied());
 
             if maybe_panic_str.map(|e| e.contains(msg)).unwrap_or(false) {
                 TestResult::TrOk
diff --git a/src/rustllvm/ArchiveWrapper.cpp b/src/rustllvm/ArchiveWrapper.cpp
index 678d787571..93704638f8 100644
--- a/src/rustllvm/ArchiveWrapper.cpp
+++ b/src/rustllvm/ArchiveWrapper.cpp
@@ -38,6 +38,7 @@ enum class LLVMRustArchiveKind {
   Other,
   GNU,
   BSD,
+  DARWIN,
   COFF,
 };
 
@@ -47,6 +48,8 @@ static Archive::Kind fromRust(LLVMRustArchiveKind Kind) {
     return Archive::K_GNU;
   case LLVMRustArchiveKind::BSD:
     return Archive::K_BSD;
+  case LLVMRustArchiveKind::DARWIN:
+    return Archive::K_DARWIN;
   case LLVMRustArchiveKind::COFF:
     return Archive::K_COFF;
   default:
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
index eaa845a279..90d24d2073 100644
--- a/src/rustllvm/PassWrapper.cpp
+++ b/src/rustllvm/PassWrapper.cpp
@@ -12,6 +12,11 @@
 #include "llvm/IR/AutoUpgrade.h"
 #include "llvm/IR/AssemblyAnnotationWriter.h"
 #include "llvm/IR/IntrinsicInst.h"
+#include "llvm/IR/Verifier.h"
+#include "llvm/Passes/PassBuilder.h"
+#if LLVM_VERSION_GE(9, 0)
+#include "llvm/Passes/StandardInstrumentations.h"
+#endif
 #include "llvm/Support/CBindingWrapping.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Host.h"
@@ -26,14 +31,18 @@
 #include "llvm/Transforms/Instrumentation.h"
 #if LLVM_VERSION_GE(9, 0)
 #include "llvm/Transforms/Instrumentation/AddressSanitizer.h"
+#include "llvm/Support/TimeProfiler.h"
 #endif
 #if LLVM_VERSION_GE(8, 0)
 #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h"
 #include "llvm/Transforms/Instrumentation/MemorySanitizer.h"
 #endif
+#if LLVM_VERSION_GE(9, 0)
+#include "llvm/Transforms/Utils/CanonicalizeAliases.h"
+#endif
+#include "llvm/Transforms/Utils/NameAnonGlobals.h"
 
 using namespace llvm;
-using namespace llvm::legacy;
 
 typedef struct LLVMOpaquePass *LLVMPassRef;
 typedef struct LLVMOpaqueTargetMachine *LLVMTargetMachineRef;
@@ -57,6 +66,23 @@ extern "C" void LLVMInitializePasses() {
   initializeTarget(Registry);
 }
 
+extern "C" void LLVMTimeTraceProfilerInitialize() {
+#if LLVM_VERSION_GE(9, 0)
+  timeTraceProfilerInitialize();
+#endif
+}
+
+extern "C" void LLVMTimeTraceProfilerFinish(const char* FileName) {
+#if LLVM_VERSION_GE(9, 0)
+  StringRef FN(FileName);
+  std::error_code EC;
+  raw_fd_ostream OS(FN, EC, sys::fs::CD_CreateAlways);
+
+  timeTraceProfilerWrite(OS);
+  timeTraceProfilerCleanup();
+#endif
+}
+
 enum class LLVMRustPassKind {
   Other,
   Function,
@@ -87,8 +113,9 @@ extern "C" LLVMPassRef LLVMRustFindAndCreatePass(const char *PassName) {
 
 extern "C" LLVMPassRef LLVMRustCreateAddressSanitizerFunctionPass(bool Recover) {
   const bool CompileKernel = false;
+  const bool UseAfterScope = true;
 
-  return wrap(createAddressSanitizerFunctionPass(CompileKernel, Recover));
+  return wrap(createAddressSanitizerFunctionPass(CompileKernel, Recover, UseAfterScope));
 }
 
 extern "C" LLVMPassRef LLVMRustCreateModuleAddressSanitizerPass(bool Recover) {
@@ -295,6 +322,34 @@ static CodeGenOpt::Level fromRust(LLVMRustCodeGenOptLevel Level) {
   }
 }
 
+enum class LLVMRustPassBuilderOptLevel {
+  O0,
+  O1,
+  O2,
+  O3,
+  Os,
+  Oz,
+};
+
+static PassBuilder::OptimizationLevel fromRust(LLVMRustPassBuilderOptLevel Level) {
+  switch (Level) {
+  case LLVMRustPassBuilderOptLevel::O0:
+    return PassBuilder::O0;
+  case LLVMRustPassBuilderOptLevel::O1:
+    return PassBuilder::O1;
+  case LLVMRustPassBuilderOptLevel::O2:
+    return PassBuilder::O2;
+  case LLVMRustPassBuilderOptLevel::O3:
+    return PassBuilder::O3;
+  case LLVMRustPassBuilderOptLevel::Os:
+    return PassBuilder::Os;
+  case LLVMRustPassBuilderOptLevel::Oz:
+    return PassBuilder::Oz;
+  default:
+    report_fatal_error("Bad PassBuilderOptLevel.");
+  }
+}
+
 enum class LLVMRustRelocMode {
   Default,
   Static,
@@ -585,6 +640,283 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target, LLVMPassManagerRef PMR,
   return LLVMRustResult::Success;
 }
 
+extern "C" typedef void (*LLVMRustSelfProfileBeforePassCallback)(void*, // LlvmSelfProfiler
+                                                      const char*,      // pass name
+                                                      const char*);     // IR name
+extern "C" typedef void (*LLVMRustSelfProfileAfterPassCallback)(void*); // LlvmSelfProfiler
+
+#if LLVM_VERSION_GE(9, 0)
+
+std::string LLVMRustwrappedIrGetName(const llvm::Any &WrappedIr) {
+  if (any_isa<const Module *>(WrappedIr))
+    return any_cast<const Module *>(WrappedIr)->getName().str();
+  if (any_isa<const Function *>(WrappedIr))
+    return any_cast<const Function *>(WrappedIr)->getName().str();
+  if (any_isa<const Loop *>(WrappedIr))
+    return any_cast<const Loop *>(WrappedIr)->getName().str();
+  if (any_isa<const LazyCallGraph::SCC *>(WrappedIr))
+    return any_cast<const LazyCallGraph::SCC *>(WrappedIr)->getName();
+  return "<UNKNOWN>";
+}
+
+
+void LLVMSelfProfileInitializeCallbacks(
+    PassInstrumentationCallbacks& PIC, void* LlvmSelfProfiler,
+    LLVMRustSelfProfileBeforePassCallback BeforePassCallback,
+    LLVMRustSelfProfileAfterPassCallback AfterPassCallback) {
+  PIC.registerBeforePassCallback([LlvmSelfProfiler, BeforePassCallback](
+                                     StringRef Pass, llvm::Any Ir) {
+    std::string PassName = Pass.str();
+    std::string IrName = LLVMRustwrappedIrGetName(Ir);
+    BeforePassCallback(LlvmSelfProfiler, PassName.c_str(), IrName.c_str());
+    return true;
+  });
+
+  PIC.registerAfterPassCallback(
+      [LlvmSelfProfiler, AfterPassCallback](StringRef Pass, llvm::Any Ir) {
+        AfterPassCallback(LlvmSelfProfiler);
+      });
+
+  PIC.registerAfterPassInvalidatedCallback(
+      [LlvmSelfProfiler, AfterPassCallback](StringRef Pass) {
+        AfterPassCallback(LlvmSelfProfiler);
+      });
+
+  PIC.registerBeforeAnalysisCallback([LlvmSelfProfiler, BeforePassCallback](
+                                         StringRef Pass, llvm::Any Ir) {
+    std::string PassName = Pass.str();
+    std::string IrName = LLVMRustwrappedIrGetName(Ir);
+    BeforePassCallback(LlvmSelfProfiler, PassName.c_str(), IrName.c_str());
+  });
+
+  PIC.registerAfterAnalysisCallback(
+      [LlvmSelfProfiler, AfterPassCallback](StringRef Pass, llvm::Any Ir) {
+        AfterPassCallback(LlvmSelfProfiler);
+      });
+}
+#endif
+
+enum class LLVMRustOptStage {
+  PreLinkNoLTO,
+  PreLinkThinLTO,
+  PreLinkFatLTO,
+  ThinLTO,
+  FatLTO,
+};
+
+struct LLVMRustSanitizerOptions {
+  bool SanitizeMemory;
+  bool SanitizeThread;
+  bool SanitizeAddress;
+  bool SanitizeRecover;
+  int SanitizeMemoryTrackOrigins;
+};
+
+extern "C" void
+LLVMRustOptimizeWithNewPassManager(
+    LLVMModuleRef ModuleRef,
+    LLVMTargetMachineRef TMRef,
+    LLVMRustPassBuilderOptLevel OptLevelRust,
+    LLVMRustOptStage OptStage,
+    bool NoPrepopulatePasses, bool VerifyIR, bool UseThinLTOBuffers,
+    bool MergeFunctions, bool UnrollLoops, bool SLPVectorize, bool LoopVectorize,
+    bool DisableSimplifyLibCalls,
+    LLVMRustSanitizerOptions *SanitizerOptions,
+    const char *PGOGenPath, const char *PGOUsePath,
+    void* LlvmSelfProfiler,
+    LLVMRustSelfProfileBeforePassCallback BeforePassCallback,
+    LLVMRustSelfProfileAfterPassCallback AfterPassCallback) {
+#if LLVM_VERSION_GE(9, 0)
+  Module *TheModule = unwrap(ModuleRef);
+  TargetMachine *TM = unwrap(TMRef);
+  PassBuilder::OptimizationLevel OptLevel = fromRust(OptLevelRust);
+
+  // FIXME: MergeFunctions is not supported by NewPM yet.
+  (void) MergeFunctions;
+
+  PipelineTuningOptions PTO;
+  PTO.LoopUnrolling = UnrollLoops;
+  PTO.LoopInterleaving = UnrollLoops;
+  PTO.LoopVectorization = LoopVectorize;
+  PTO.SLPVectorization = SLPVectorize;
+
+  PassInstrumentationCallbacks PIC;
+  StandardInstrumentations SI;
+  SI.registerCallbacks(PIC);
+
+  if (LlvmSelfProfiler){
+    LLVMSelfProfileInitializeCallbacks(PIC,LlvmSelfProfiler,BeforePassCallback,AfterPassCallback);
+  }
+
+  Optional<PGOOptions> PGOOpt;
+  if (PGOGenPath) {
+    assert(!PGOUsePath);
+    PGOOpt = PGOOptions(PGOGenPath, "", "", PGOOptions::IRInstr);
+  } else if (PGOUsePath) {
+    assert(!PGOGenPath);
+    PGOOpt = PGOOptions(PGOUsePath, "", "", PGOOptions::IRUse);
+  }
+
+  PassBuilder PB(TM, PTO, PGOOpt, &PIC);
+
+  // FIXME: We may want to expose this as an option.
+  bool DebugPassManager = false;
+  LoopAnalysisManager LAM(DebugPassManager);
+  FunctionAnalysisManager FAM(DebugPassManager);
+  CGSCCAnalysisManager CGAM(DebugPassManager);
+  ModuleAnalysisManager MAM(DebugPassManager);
+
+  FAM.registerPass([&] { return PB.buildDefaultAAPipeline(); });
+
+  Triple TargetTriple(TheModule->getTargetTriple());
+  std::unique_ptr<TargetLibraryInfoImpl> TLII(new TargetLibraryInfoImpl(TargetTriple));
+  if (DisableSimplifyLibCalls)
+    TLII->disableAllFunctions();
+  FAM.registerPass([&] { return TargetLibraryAnalysis(*TLII); });
+
+  PB.registerModuleAnalyses(MAM);
+  PB.registerCGSCCAnalyses(CGAM);
+  PB.registerFunctionAnalyses(FAM);
+  PB.registerLoopAnalyses(LAM);
+  PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
+
+  // We manually collect pipeline callbacks so we can apply them at O0, where the
+  // PassBuilder does not create a pipeline.
+  std::vector<std::function<void(ModulePassManager &)>> PipelineStartEPCallbacks;
+  std::vector<std::function<void(FunctionPassManager &, PassBuilder::OptimizationLevel)>>
+      OptimizerLastEPCallbacks;
+
+  if (VerifyIR) {
+    PipelineStartEPCallbacks.push_back([VerifyIR](ModulePassManager &MPM) {
+        MPM.addPass(VerifierPass());
+    });
+  }
+
+  if (SanitizerOptions) {
+    if (SanitizerOptions->SanitizeMemory) {
+      MemorySanitizerOptions Options(
+          SanitizerOptions->SanitizeMemoryTrackOrigins,
+          SanitizerOptions->SanitizeRecover,
+          /*CompileKernel=*/false);
+#if LLVM_VERSION_GE(10, 0)
+      PipelineStartEPCallbacks.push_back([Options](ModulePassManager &MPM) {
+        MPM.addPass(MemorySanitizerPass(Options));
+      });
+#endif
+      OptimizerLastEPCallbacks.push_back(
+        [Options](FunctionPassManager &FPM, PassBuilder::OptimizationLevel Level) {
+          FPM.addPass(MemorySanitizerPass(Options));
+        }
+      );
+    }
+
+    if (SanitizerOptions->SanitizeThread) {
+#if LLVM_VERSION_GE(10, 0)
+      PipelineStartEPCallbacks.push_back([](ModulePassManager &MPM) {
+        MPM.addPass(ThreadSanitizerPass());
+      });
+#endif
+      OptimizerLastEPCallbacks.push_back(
+        [](FunctionPassManager &FPM, PassBuilder::OptimizationLevel Level) {
+          FPM.addPass(ThreadSanitizerPass());
+        }
+      );
+    }
+
+    if (SanitizerOptions->SanitizeAddress) {
+      PipelineStartEPCallbacks.push_back([&](ModulePassManager &MPM) {
+        MPM.addPass(RequireAnalysisPass<ASanGlobalsMetadataAnalysis, Module>());
+      });
+      OptimizerLastEPCallbacks.push_back(
+        [SanitizerOptions](FunctionPassManager &FPM, PassBuilder::OptimizationLevel Level) {
+          FPM.addPass(AddressSanitizerPass(
+              /*CompileKernel=*/false, SanitizerOptions->SanitizeRecover,
+              /*UseAfterScope=*/true));
+        }
+      );
+      PipelineStartEPCallbacks.push_back(
+        [SanitizerOptions](ModulePassManager &MPM) {
+          MPM.addPass(ModuleAddressSanitizerPass(
+              /*CompileKernel=*/false, SanitizerOptions->SanitizeRecover));
+        }
+      );
+    }
+  }
+
+  ModulePassManager MPM(DebugPassManager);
+  if (!NoPrepopulatePasses) {
+    if (OptLevel == PassBuilder::O0) {
+      for (const auto &C : PipelineStartEPCallbacks)
+        C(MPM);
+
+      if (!OptimizerLastEPCallbacks.empty()) {
+        FunctionPassManager FPM(DebugPassManager);
+        for (const auto &C : OptimizerLastEPCallbacks)
+          C(FPM, OptLevel);
+        MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
+      }
+
+      MPM.addPass(AlwaysInlinerPass(/*InsertLifetimeIntrinsics=*/false));
+
+#if LLVM_VERSION_GE(10, 0)
+      if (PGOOpt) {
+        PB.addPGOInstrPassesForO0(
+            MPM, DebugPassManager, PGOOpt->Action == PGOOptions::IRInstr,
+            /*IsCS=*/false, PGOOpt->ProfileFile, PGOOpt->ProfileRemappingFile);
+      }
+#endif
+    } else {
+      for (const auto &C : PipelineStartEPCallbacks)
+        PB.registerPipelineStartEPCallback(C);
+      if (OptStage != LLVMRustOptStage::PreLinkThinLTO) {
+        for (const auto &C : OptimizerLastEPCallbacks)
+          PB.registerOptimizerLastEPCallback(C);
+      }
+
+      switch (OptStage) {
+      case LLVMRustOptStage::PreLinkNoLTO:
+        MPM = PB.buildPerModuleDefaultPipeline(OptLevel, DebugPassManager);
+        break;
+      case LLVMRustOptStage::PreLinkThinLTO:
+        MPM = PB.buildThinLTOPreLinkDefaultPipeline(OptLevel, DebugPassManager);
+        if (!OptimizerLastEPCallbacks.empty()) {
+          FunctionPassManager FPM(DebugPassManager);
+          for (const auto &C : OptimizerLastEPCallbacks)
+            C(FPM, OptLevel);
+          MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM)));
+        }
+        break;
+      case LLVMRustOptStage::PreLinkFatLTO:
+        MPM = PB.buildLTOPreLinkDefaultPipeline(OptLevel, DebugPassManager);
+        break;
+      case LLVMRustOptStage::ThinLTO:
+        // FIXME: Does it make sense to pass the ModuleSummaryIndex?
+        // It only seems to be needed for C++ specific optimizations.
+        MPM = PB.buildThinLTODefaultPipeline(OptLevel, DebugPassManager, nullptr);
+        break;
+      case LLVMRustOptStage::FatLTO:
+        MPM = PB.buildLTODefaultPipeline(OptLevel, DebugPassManager, nullptr);
+        break;
+      }
+    }
+  }
+
+  if (UseThinLTOBuffers) {
+    MPM.addPass(CanonicalizeAliasesPass());
+    MPM.addPass(NameAnonGlobalPass());
+  }
+
+  // Upgrade all calls to old intrinsics first.
+  for (Module::iterator I = TheModule->begin(), E = TheModule->end(); I != E;)
+    UpgradeCallsToIntrinsic(&*I++); // must be post-increment, as we remove
+
+  MPM.run(*TheModule, MAM);
+#else
+  // The new pass manager has been available for a long time,
+  // but we don't bother supporting it on old LLVM versions.
+  report_fatal_error("New pass manager only supported since LLVM 9");
+#endif
+}
 
 // Callback to demangle function name
 // Parameters:
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 46e467011b..aeddd4cfb9 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -665,20 +665,24 @@ extern "C" void LLVMRustDIBuilderFinalize(LLVMRustDIBuilderRef Builder) {
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateCompileUnit(
     LLVMRustDIBuilderRef Builder, unsigned Lang, LLVMMetadataRef FileRef,
-    const char *Producer, bool isOptimized, const char *Flags,
-    unsigned RuntimeVer, const char *SplitName,
+    const char *Producer, size_t ProducerLen, bool isOptimized,
+    const char *Flags, unsigned RuntimeVer,
+    const char *SplitName, size_t SplitNameLen,
     LLVMRustDebugEmissionKind Kind) {
   auto *File = unwrapDI<DIFile>(FileRef);
 
-  return wrap(Builder->createCompileUnit(Lang, File, Producer, isOptimized,
-                                         Flags, RuntimeVer, SplitName,
+  return wrap(Builder->createCompileUnit(Lang, File, StringRef(Producer, ProducerLen),
+                                         isOptimized, Flags, RuntimeVer,
+                                         StringRef(SplitName, SplitNameLen),
                                          fromRust(Kind)));
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderCreateFile(LLVMRustDIBuilderRef Builder, const char *Filename,
-                            const char *Directory) {
-  return wrap(Builder->createFile(Filename, Directory));
+extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFile(
+    LLVMRustDIBuilderRef Builder,
+    const char *Filename, size_t FilenameLen,
+    const char *Directory, size_t DirectoryLen) {
+  return wrap(Builder->createFile(StringRef(Filename, FilenameLen),
+                                  StringRef(Directory, DirectoryLen)));
 }
 
 extern "C" LLVMMetadataRef
@@ -690,8 +694,10 @@ LLVMRustDIBuilderCreateSubroutineType(LLVMRustDIBuilderRef Builder,
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
-    const char *LinkageName, LLVMMetadataRef File, unsigned LineNo,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
+    const char *LinkageName, size_t LinkageNameLen,
+    LLVMMetadataRef File, unsigned LineNo,
     LLVMMetadataRef Ty, unsigned ScopeLine, LLVMRustDIFlags Flags,
     LLVMRustDISPFlags SPFlags, LLVMValueRef Fn, LLVMMetadataRef TParam,
     LLVMMetadataRef Decl) {
@@ -705,8 +711,11 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
     llvmFlags |= DINode::DIFlags::FlagMainSubprogram;
 #endif
   DISubprogram *Sub = Builder->createFunction(
-      unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File),
-      LineNo, unwrapDI<DISubroutineType>(Ty), ScopeLine, llvmFlags,
+      unwrapDI<DIScope>(Scope),
+      StringRef(Name, NameLen),
+      StringRef(LinkageName, LinkageNameLen),
+      unwrapDI<DIFile>(File), LineNo,
+      unwrapDI<DISubroutineType>(Ty), ScopeLine, llvmFlags,
       llvmSPFlags, TParams, unwrapDIPtr<DISubprogram>(Decl));
 #else
   bool IsLocalToUnit = isSet(SPFlags & LLVMRustDISPFlags::SPFlagLocalToUnit);
@@ -716,8 +725,11 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
   if (isSet(SPFlags & LLVMRustDISPFlags::SPFlagMainSubprogram))
     llvmFlags |= DINode::DIFlags::FlagMainSubprogram;
   DISubprogram *Sub = Builder->createFunction(
-      unwrapDI<DIScope>(Scope), Name, LinkageName, unwrapDI<DIFile>(File),
-      LineNo, unwrapDI<DISubroutineType>(Ty), IsLocalToUnit, IsDefinition,
+      unwrapDI<DIScope>(Scope),
+      StringRef(Name, NameLen),
+      StringRef(LinkageName, LinkageNameLen),
+      unwrapDI<DIFile>(File), LineNo,
+      unwrapDI<DISubroutineType>(Ty), IsLocalToUnit, IsDefinition,
       ScopeLine, llvmFlags, IsOptimized, TParams,
       unwrapDIPtr<DISubprogram>(Decl));
 #endif
@@ -725,53 +737,59 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateFunction(
   return wrap(Sub);
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderCreateBasicType(LLVMRustDIBuilderRef Builder, const char *Name,
-                                 uint64_t SizeInBits, uint32_t AlignInBits,
-                                 unsigned Encoding) {
-  return wrap(Builder->createBasicType(Name, SizeInBits, Encoding));
+extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateBasicType(
+    LLVMRustDIBuilderRef Builder, const char *Name, size_t NameLen,
+    uint64_t SizeInBits, uint32_t AlignInBits, unsigned Encoding) {
+  return wrap(Builder->createBasicType(StringRef(Name, NameLen), SizeInBits, Encoding));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreatePointerType(
     LLVMRustDIBuilderRef Builder, LLVMMetadataRef PointeeTy,
-    uint64_t SizeInBits, uint32_t AlignInBits, const char *Name) {
+    uint64_t SizeInBits, uint32_t AlignInBits, unsigned AddressSpace,
+    const char *Name, size_t NameLen) {
   return wrap(Builder->createPointerType(unwrapDI<DIType>(PointeeTy),
                                          SizeInBits, AlignInBits,
-                                         /* DWARFAddressSpace */ None,
-                                         Name));
+                                         AddressSpace,
+                                         StringRef(Name, NameLen)));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStructType(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
     LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits,
     uint32_t AlignInBits, LLVMRustDIFlags Flags,
     LLVMMetadataRef DerivedFrom, LLVMMetadataRef Elements,
     unsigned RunTimeLang, LLVMMetadataRef VTableHolder,
-    const char *UniqueId) {
+    const char *UniqueId, size_t UniqueIdLen) {
   return wrap(Builder->createStructType(
-      unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber,
+      unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen),
+      unwrapDI<DIFile>(File), LineNumber,
       SizeInBits, AlignInBits, fromRust(Flags), unwrapDI<DIType>(DerivedFrom),
       DINodeArray(unwrapDI<MDTuple>(Elements)), RunTimeLang,
-      unwrapDI<DIType>(VTableHolder), UniqueId));
+      unwrapDI<DIType>(VTableHolder), StringRef(UniqueId, UniqueIdLen)));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariantPart(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
     LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits,
     uint32_t AlignInBits, LLVMRustDIFlags Flags, LLVMMetadataRef Discriminator,
-    LLVMMetadataRef Elements, const char *UniqueId) {
+    LLVMMetadataRef Elements, const char *UniqueId, size_t UniqueIdLen) {
   return wrap(Builder->createVariantPart(
-      unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber,
+      unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen),
+      unwrapDI<DIFile>(File), LineNumber,
       SizeInBits, AlignInBits, fromRust(Flags), unwrapDI<DIDerivedType>(Discriminator),
-      DINodeArray(unwrapDI<MDTuple>(Elements)), UniqueId));
+      DINodeArray(unwrapDI<MDTuple>(Elements)), StringRef(UniqueId, UniqueIdLen)));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateMemberType(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
     LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits,
     uint32_t AlignInBits, uint64_t OffsetInBits, LLVMRustDIFlags Flags,
     LLVMMetadataRef Ty) {
-  return wrap(Builder->createMemberType(unwrapDI<DIDescriptor>(Scope), Name,
+  return wrap(Builder->createMemberType(unwrapDI<DIDescriptor>(Scope),
+                                        StringRef(Name, NameLen),
                                         unwrapDI<DIFile>(File), LineNo,
                                         SizeInBits, AlignInBits, OffsetInBits,
                                         fromRust(Flags), unwrapDI<DIType>(Ty)));
@@ -779,14 +797,15 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateMemberType(
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariantMemberType(
     LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
-    const char *Name, LLVMMetadataRef File, unsigned LineNo, uint64_t SizeInBits,
-    uint32_t AlignInBits, uint64_t OffsetInBits, LLVMValueRef Discriminant,
+    const char *Name, size_t NameLen, LLVMMetadataRef File, unsigned LineNo,
+    uint64_t SizeInBits, uint32_t AlignInBits, uint64_t OffsetInBits, LLVMValueRef Discriminant,
     LLVMRustDIFlags Flags, LLVMMetadataRef Ty) {
   llvm::ConstantInt* D = nullptr;
   if (Discriminant) {
     D = unwrap<llvm::ConstantInt>(Discriminant);
   }
-  return wrap(Builder->createVariantMemberType(unwrapDI<DIDescriptor>(Scope), Name,
+  return wrap(Builder->createVariantMemberType(unwrapDI<DIDescriptor>(Scope),
+                                               StringRef(Name, NameLen),
                                                unwrapDI<DIFile>(File), LineNo,
                                                SizeInBits, AlignInBits, OffsetInBits, D,
                                                fromRust(Flags), unwrapDI<DIType>(Ty)));
@@ -808,8 +827,10 @@ LLVMRustDIBuilderCreateLexicalBlockFile(LLVMRustDIBuilderRef Builder,
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Context, const char *Name,
-    const char *LinkageName, LLVMMetadataRef File, unsigned LineNo,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Context,
+    const char *Name, size_t NameLen,
+    const char *LinkageName, size_t LinkageNameLen,
+    LLVMMetadataRef File, unsigned LineNo,
     LLVMMetadataRef Ty, bool IsLocalToUnit, LLVMValueRef V,
     LLVMMetadataRef Decl = nullptr, uint32_t AlignInBits = 0) {
   llvm::GlobalVariable *InitVal = cast<llvm::GlobalVariable>(unwrap(V));
@@ -825,7 +846,8 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
   }
 
   llvm::DIGlobalVariableExpression *VarExpr = Builder->createGlobalVariableExpression(
-      unwrapDI<DIDescriptor>(Context), Name, LinkageName,
+      unwrapDI<DIDescriptor>(Context), StringRef(Name, NameLen),
+      StringRef(LinkageName, LinkageNameLen),
       unwrapDI<DIFile>(File), LineNo, unwrapDI<DIType>(Ty), IsLocalToUnit,
 #if LLVM_VERSION_GE(10, 0)
       /* isDefined */ true,
@@ -843,17 +865,20 @@ extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateStaticVariable(
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateVariable(
     LLVMRustDIBuilderRef Builder, unsigned Tag, LLVMMetadataRef Scope,
-    const char *Name, LLVMMetadataRef File, unsigned LineNo,
+    const char *Name, size_t NameLen,
+    LLVMMetadataRef File, unsigned LineNo,
     LLVMMetadataRef Ty, bool AlwaysPreserve, LLVMRustDIFlags Flags,
     unsigned ArgNo, uint32_t AlignInBits) {
   if (Tag == 0x100) { // DW_TAG_auto_variable
     return wrap(Builder->createAutoVariable(
-        unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNo,
+        unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen),
+        unwrapDI<DIFile>(File), LineNo,
         unwrapDI<DIType>(Ty), AlwaysPreserve, fromRust(Flags), AlignInBits));
   } else {
     return wrap(Builder->createParameterVariable(
-        unwrapDI<DIDescriptor>(Scope), Name, ArgNo, unwrapDI<DIFile>(File),
-        LineNo, unwrapDI<DIType>(Ty), AlwaysPreserve, fromRust(Flags)));
+        unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen), ArgNo,
+        unwrapDI<DIFile>(File), LineNo,
+        unwrapDI<DIType>(Ty), AlwaysPreserve, fromRust(Flags)));
   }
 }
 
@@ -891,50 +916,53 @@ extern "C" LLVMValueRef LLVMRustDIBuilderInsertDeclareAtEnd(
       unwrap(InsertAtEnd)));
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderCreateEnumerator(LLVMRustDIBuilderRef Builder,
-                                  const char *Name, uint64_t Val) {
-  return wrap(Builder->createEnumerator(Name, Val));
+extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerator(
+    LLVMRustDIBuilderRef Builder, const char *Name, size_t NameLen,
+    int64_t Value, bool IsUnsigned) {
+  return wrap(Builder->createEnumerator(StringRef(Name, NameLen), Value, IsUnsigned));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateEnumerationType(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
     LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits,
     uint32_t AlignInBits, LLVMMetadataRef Elements,
     LLVMMetadataRef ClassTy, bool IsScoped) {
   return wrap(Builder->createEnumerationType(
-      unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber,
+      unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen),
+      unwrapDI<DIFile>(File), LineNumber,
       SizeInBits, AlignInBits, DINodeArray(unwrapDI<MDTuple>(Elements)),
       unwrapDI<DIType>(ClassTy), "", IsScoped));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateUnionType(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
     LLVMMetadataRef File, unsigned LineNumber, uint64_t SizeInBits,
     uint32_t AlignInBits, LLVMRustDIFlags Flags, LLVMMetadataRef Elements,
-    unsigned RunTimeLang, const char *UniqueId) {
+    unsigned RunTimeLang, const char *UniqueId, size_t UniqueIdLen) {
   return wrap(Builder->createUnionType(
-      unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIFile>(File), LineNumber,
-      SizeInBits, AlignInBits, fromRust(Flags),
-      DINodeArray(unwrapDI<MDTuple>(Elements)), RunTimeLang, UniqueId));
+      unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen), unwrapDI<DIFile>(File),
+      LineNumber, SizeInBits, AlignInBits, fromRust(Flags),
+      DINodeArray(unwrapDI<MDTuple>(Elements)), RunTimeLang,
+      StringRef(UniqueId, UniqueIdLen)));
 }
 
 extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateTemplateTypeParameter(
-    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope, const char *Name,
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen,
     LLVMMetadataRef Ty, LLVMMetadataRef File, unsigned LineNo,
     unsigned ColumnNo) {
   return wrap(Builder->createTemplateTypeParameter(
-      unwrapDI<DIDescriptor>(Scope), Name, unwrapDI<DIType>(Ty)));
+      unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen), unwrapDI<DIType>(Ty)));
 }
 
-extern "C" LLVMMetadataRef
-LLVMRustDIBuilderCreateNameSpace(LLVMRustDIBuilderRef Builder,
-                                 LLVMMetadataRef Scope, const char *Name,
-                                 LLVMMetadataRef File, unsigned LineNo) {
+extern "C" LLVMMetadataRef LLVMRustDIBuilderCreateNameSpace(
+    LLVMRustDIBuilderRef Builder, LLVMMetadataRef Scope,
+    const char *Name, size_t NameLen, bool ExportSymbols) {
   return wrap(Builder->createNameSpace(
-      unwrapDI<DIDescriptor>(Scope), Name,
-      false // ExportSymbols (only relevant for C++ anonymous namespaces)
-      ));
+      unwrapDI<DIDescriptor>(Scope), StringRef(Name, NameLen), ExportSymbols
+  ));
 }
 
 extern "C" void
@@ -1296,6 +1324,14 @@ extern "C" LLVMValueRef LLVMRustBuildMemMove(LLVMBuilderRef B,
 #endif
 }
 
+extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B,
+                                            LLVMValueRef Dst, unsigned DstAlign,
+                                            LLVMValueRef Val,
+                                            LLVMValueRef Size, bool IsVolatile) {
+  return wrap(unwrap(B)->CreateMemSet(
+      unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile));
+}
+
 extern "C" LLVMValueRef
 LLVMRustBuildInvoke(LLVMBuilderRef B, LLVMValueRef Fn, LLVMValueRef *Args,
                     unsigned NumArgs, LLVMBasicBlockRef Then,
diff --git a/src/stage0.txt b/src/stage0.txt
index f25838ea82..e8759d9fbc 100644
--- a/src/stage0.txt
+++ b/src/stage0.txt
@@ -12,14 +12,15 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2020-02-27
-rustc: 1.41.1
-cargo: 0.42.0
+date: 2020-03-12
+rustc: 1.42.0
+cargo: 0.43.0
 
-# We use a nightly rustfmt to format the source because it solves some bootstrapping
-# issues with use of new syntax in this repo. If you're looking at the beta/stable branch, this key should be omitted,
-# as we don't want to depend on rustfmt from nightly there.
-#rustfmt: nightly-2019-12-18
+# We use a nightly rustfmt to format the source because it solves some
+# bootstrapping issues with use of new syntax in this repo. If you're looking at
+# the beta/stable branch, this key should be omitted, as we don't want to depend
+# on rustfmt from nightly there.
+#rustfmt: nightly-2020-01-31
 
 # When making a stable release the process currently looks like:
 #
diff --git a/src/stdarch/.github/workflows/main.yml b/src/stdarch/.github/workflows/main.yml
new file mode 100644
index 0000000000..c5ef15004c
--- /dev/null
+++ b/src/stdarch/.github/workflows/main.yml
@@ -0,0 +1,209 @@
+name: CI
+on:
+  push:
+    branches:
+    - auto
+    - try
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  style:
+    name: Check Style
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install Rust
+      run: rustup update nightly && rustup default nightly
+    - run: ci/style.sh
+
+  docs:
+    name: Build Documentation
+    needs: [style]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install Rust
+      run: rustup update nightly && rustup default nightly
+    - run: ci/dox.sh
+      env:
+        CI: 1
+    - name: Publish documentation
+      run: |
+        cd target/doc
+        git init
+        git add .
+        git -c user.name='ci' -c user.email='ci' commit -m init
+        git push -f -q https://git:${{ secrets.github_token }}@github.com/${{ github.repository }} HEAD:gh-pages
+      if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
+
+  verify:
+    name: Automatic intrinsic verification
+    needs: [style]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install Rust
+      run: rustup update nightly && rustup default nightly
+    - run: cargo test --manifest-path crates/stdarch-verify/Cargo.toml
+
+  env_override:
+    name: Env Override
+    needs: [style]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Install Rust
+      run: rustup update nightly && rustup default nightly
+    - run: RUST_STD_DETECT_UNSTABLE=avx cargo test --features=std_detect_env_override --manifest-path crates/std_detect/Cargo.toml env_override_no_avx
+
+  test:
+    needs: [style]
+    name: Test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        target:
+        # Dockers that are run through docker on linux
+        - i686-unknown-linux-gnu
+        - x86_64-unknown-linux-gnu
+        - x86_64-unknown-linux-gnu-emulated
+        - arm-unknown-linux-gnueabihf
+        - armv7-unknown-linux-gnueabihf
+        - aarch64-unknown-linux-gnu
+        - powerpc64le-unknown-linux-gnu
+        - mips-unknown-linux-gnu
+        - mips64-unknown-linux-gnuabi64
+        - mips64el-unknown-linux-gnuabi64
+        - s390x-unknown-linux-gnu
+        - wasm32-unknown-unknown
+        - i586-unknown-linux-gnu
+        - x86_64-linux-android
+        - arm-linux-androideabi
+        - mipsel-unknown-linux-musl
+        - aarch64-linux-android
+        - nvptx64-nvidia-cuda
+        - thumbv6m-none-eabi
+        - thumbv7m-none-eabi
+        - thumbv7em-none-eabi
+        - thumbv7em-none-eabihf
+
+        # macOS targets
+        - x86_64-apple-darwin
+        # FIXME: gh-actions build environment doesn't have linker support
+        # - i686-apple-darwin
+
+        # Windows targets
+        - x86_64-pc-windows-msvc
+        # FIXME: Disassembly not implemented for the # following targets:
+        # - x86_64-pc-windows-gnu:
+        # - i686-pc-windows-gnu:
+        # - i686-pc-windows-msvc:
+
+        include:
+        - target: i686-unknown-linux-gnu
+          os: ubuntu-latest
+        - target: x86_64-unknown-linux-gnu
+          os: ubuntu-latest
+        - target: x86_64-unknown-linux-gnu-emulated
+          os: ubuntu-latest
+          test_everything: true
+          rustflags: --cfg stdarch_intel_sde
+        - target: arm-unknown-linux-gnueabihf
+          os: ubuntu-latest
+        - target: armv7-unknown-linux-gnueabihf
+          os: ubuntu-latest
+          rustflags: -C target-feature=+neon
+        - target: mips-unknown-linux-gnu
+          os: ubuntu-latest
+          norun: true
+        - target: mips64-unknown-linux-gnuabi64
+          os: ubuntu-latest
+          norun: true
+        - target: mips64el-unknown-linux-gnuabi64
+          os: ubuntu-latest
+          norun: true
+        - target: powerpc64le-unknown-linux-gnu
+          os: ubuntu-latest
+          disable_assert_instr: true
+        - target: s390x-unknown-linux-gnu
+          os: ubuntu-latest
+        - target: wasm32-unknown-unknown
+          os: ubuntu-latest
+        - target: aarch64-unknown-linux-gnu
+          os: ubuntu-latest
+        - target: x86_64-apple-darwin
+          os: macos-latest
+        - target: x86_64-pc-windows-msvc
+          os: windows-latest
+        - target: i586-unknown-linux-gnu
+          os: ubuntu-latest
+        - target: x86_64-linux-android
+          os: ubuntu-latest
+          disable_assert_instr: 1
+        - target: arm-linux-androideabi
+          os: ubuntu-latest
+          disable_assert_instr: 1
+        - target: mipsel-unknown-linux-musl
+          os: ubuntu-latest
+          norun: 1
+        - target: aarch64-linux-android
+          os: ubuntu-latest
+          disable_assert_instr: 1
+        - target: nvptx64-nvidia-cuda
+          os: ubuntu-latest
+        - target: thumbv6m-none-eabi
+          os: ubuntu-latest
+        - target: thumbv7m-none-eabi
+          os: ubuntu-latest
+        - target: thumbv7em-none-eabi
+          os: ubuntu-latest
+        - target: thumbv7em-none-eabihf
+          os: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Install Rust (rustup)
+      run: |
+        rustup update nightly --no-self-update
+        rustup default nightly
+      if: matrix.os != 'macos-latest'
+    - name: Install Rust (macos)
+      run: |
+        curl https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly
+        echo "##[add-path]$HOME/.cargo/bin"
+        rustup update nightly --no-self-update
+        rustup default nightly
+      if: matrix.os == 'macos-latest'
+    - run: |
+        rustup default nightly
+        rustup target add ${{ matrix.target }}
+      if: "!endsWith(matrix.target, 'emulated')"
+    - run: cargo generate-lockfile
+
+    # Configure some env vars based on matrix configuration
+    - run: echo "##[set-env name=NORUN]1"
+      if: matrix.norun != '' || startsWith(matrix.target, 'thumb') || matrix.target == 'nvptx64-nvidia-cuda'
+    - run: echo "##[set-env name=STDARCH_TEST_EVERYTHING]1"
+      if: matrix.test_everything != ''
+    - run: echo "##[set-env name=RUSTFLAGS]${{ matrix.rustflags }}"
+      if: matrix.rustflags != ''
+    - run: echo "##[set-env name=STDARCH_DISABLE_ASSERT_INSTR]1"
+      if: matrix.disable_assert_instr != ''
+    - run: echo "##[set-env name=NOSTD]1"
+      if: startsWith(matrix.target, 'thumb') || matrix.target == 'nvptx64-nvidia-cuda'
+
+    # Windows & OSX go straight to `run.sh` ...
+    - run: ./ci/run.sh
+      shell: bash
+      if: matrix.os != 'ubuntu-latest' || startsWith(matrix.target, 'thumb')
+      env:
+        TARGET: ${{ matrix.target }}
+
+    # ... while Linux goes to `run-docker.sh`
+    - run: ./ci/run-docker.sh ${{ matrix.target }}
+      shell: bash
+      if: "matrix.os == 'ubuntu-latest' && !startsWith(matrix.target, 'thumb')"
+      env:
+        TARGET: ${{ matrix.target }}
diff --git a/src/stdarch/QUESTIONS.md b/src/stdarch/QUESTIONS.md
deleted file mode 100644
index bc04ea051c..0000000000
--- a/src/stdarch/QUESTIONS.md
+++ /dev/null
@@ -1,31 +0,0 @@
-This program emits `psllw` instead of `pslliw` instruction. `pslliw` should be
-usable here since `imm8` is a constant:
-
-```rust
-extern crate stdarch;
-
-use std::env;
-use stdarch as s;
-
-fn main() {
-    let imm8: i32 = env::args().nth(1).unwrap().parse().unwrap();
-    let a = s::i16x8::new(imm8 as i16, 0, 0, 0, 0, 0, 0, 0);
-    println!("{:?}", s::_mm_slli_epi16(a, 4));
-}
-```
-
----
-
-LLVM types the `count` parameter in `_mm_sll_epi16` as `i16x8`, but the right
-type is probably `i64x2`.
-
----
-
-What is the deal with the ucomi f64 comparison functions in SSE2? Clang's
-headers indicate some specific behavior with NAN, but I can't seem to reproduce
-it. Intel's official docs are very vague.
-
----
-
-`_mm256_blendv_pd` takes a mask parameter with type `f64x4`, but the
-documentation seems to indicate that it is a bit vector. What's going on?
diff --git a/src/stdarch/README.md b/src/stdarch/README.md
index 77079ac5ae..490ca6fe79 100644
--- a/src/stdarch/README.md
+++ b/src/stdarch/README.md
@@ -1,7 +1,8 @@
 stdarch - Rust's standard library SIMD components
 =======
 
-[![Azure Pipelines Status]][azure]
+[![Actions Status](https://github.com/rust-lang/stdarch/workflows/CI/badge.svg)](https://github.com/rust-lang/stdarch/actions)
+
 
 # Crates
 
@@ -29,8 +30,6 @@ To do a release of the `core_arch` and `std_detect` crates,
   https://github.com/rust-lang/cargo/issues/4242),
 * publish the crates.
 
-[azure]: https://dev.azure.com/rust-lang2/stdarch/_build/latest?definitionId=2&branchName=auto
-[Azure Pipelines Status]: https://dev.azure.com/rust-lang2/stdarch/_apis/build/status/rust-lang.stdarch?branchName=auto
 [core_arch_crate_badge]: https://img.shields.io/crates/v/core_arch.svg
 [core_arch_crate_link]: https://crates.io/crates/core_arch
 [core_arch_docs_badge]: https://docs.rs/core_arch/badge.svg
diff --git a/src/stdarch/ci/azure-install-rust.yml b/src/stdarch/ci/azure-install-rust.yml
deleted file mode 100644
index feb06588f3..0000000000
--- a/src/stdarch/ci/azure-install-rust.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-steps:
-  - bash: |
-      set -ex
-      toolchain=$TOOLCHAIN
-      if [ "$toolchain" = "" ]; then
-        toolchain=nightly
-      fi
-      if command -v rustup; then
-        rustup update $toolchain
-        rustup default $toolchain
-      else
-        curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $toolchain
-        echo "##vso[task.prependpath]$HOME/.cargo/bin"
-      fi
-    displayName: Install rust (unix)
-    condition: ne( variables['Agent.OS'], 'Windows_NT' )
-  - script: |
-      @echo on
-      if not defined TOOLCHAIN set TOOLCHAIN=nightly
-      rustup update %TOOLCHAIN%-%TARGET%
-      rustup default %TOOLCHAIN%-%TARGET%
-    displayName: Install rust (windows)
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-  - script: |
-      set -ex
-      if [ -n "${TARGET}" ] && [ "${TARGET}" != "x86_64-unknown-linux-gnu-emulated" ]; then
-        rustup target add $TARGET
-      fi
-    condition: ne( variables['Agent.OS'], 'Windows_NT' )
-    displayName: Install target (unix)
-  - script: |
-      @echo on
-      if defined TARGET rustup target add %TARGET%
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-    displayName: Install target (windows)
-  - script: |
-      @echo on
-      if "%ARCH%" == "i686" choco install mingw --x86 --force
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-    displayName: Install MinGW32 (windows)
-  - bash: |
-      set -ex
-      gcc -print-search-dirs
-      find "C:\ProgramData\Chocolatey" -name "crt2*"
-      find "C:\ProgramData\Chocolatey" -name "dllcrt2*"
-      find "C:\ProgramData\Chocolatey" -name "libmsvcrt*"
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )	
-    displayName: Find GCC libraries (windows)
-  - bash: |
-      set -ex
-      if [[ -n ${ARCH_BITS} ]]; then
-        for i in crt2.o dllcrt2.o libmsvcrt.a ; do
-          cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw${ARCH_BITS}/${ARCH}-w64-mingw32/lib/$i" "`rustc --print sysroot`/lib/rustlib/${TARGET}/lib"
-        done
-      fi
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )	
-    displayName: Fix MinGW (windows)
-  - bash: |
-        set -ex
-        rustc -Vv
-        cargo -V
-        rustup -Vv
-        rustup show
-        which rustc
-        which cargo
-        which rustup
-    displayName: Query rust and cargo versions
-  - script: |
-      @echo on
-      where gcc
-    condition: eq( variables['Agent.OS'], 'Windows_NT' )
-    displayName: Query gcc path
-  - bash: |
-      set -ex
-      cargo generate-lockfile
-    displayName: Generate lockfiles
diff --git a/src/stdarch/ci/azure.yml b/src/stdarch/ci/azure.yml
deleted file mode 100644
index bb8f220956..0000000000
--- a/src/stdarch/ci/azure.yml
+++ /dev/null
@@ -1,221 +0,0 @@
-variables:
-  - group: secrets
-resources:
-  repositories:
-    - repository: rustinfra
-      type: github
-      name: rust-lang/simpleinfra
-      endpoint: gnzlbg
-trigger: ["auto", "try"]
-pr: ["master"]
-
-jobs:
-  - job: DockerLinux0
-    dependsOn: StyleAndDocs
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - template: azure-install-rust.yml
-      - bash: |
-          if [ "${NO_DOCKER}" = "1" ]; then
-              ci/run.sh $TARGET
-          else
-              ci/run-docker.sh $TARGET
-          fi
-        displayName: Execute run-docker.sh
-    strategy:
-      matrix:
-        i686-unknown-linux-gnu:
-          TARGET: i686-unknown-linux-gnu
-        x86_64-unknown-linux-gnu:
-          TARGET: x86_64-unknown-linux-gnu
-        x86_64-unknown-linux-gnu-emulated:
-          TARGET: x86_64-unknown-linux-gnu-emulated
-          STDARCH_TEST_EVERYTHING: 1
-          RUSTFLAGS: --cfg stdarch_intel_sde
-        arm-unknown-linux-gnueabihf:
-          TARGET: arm-unknown-linux-gnueabihf
-        armv7-unknown-linux-gnueabihf:
-          TARGET: armv7-unknown-linux-gnueabihf
-          RUSTFLAGS: -C target-feature=+neon
-        aarch64-unknown-linux-gnu:
-          TARGET: aarch64-unknown-linux-gnu
-        mips-unknown-linux-gnu:
-          TARGET: mips-unknown-linux-gnu
-          NORUN: 1
-        mips64-unknown-linux-gnuabi64:
-          TARGET: mips64-unknown-linux-gnuabi64
-          NORUN: 1
-        mips64el-unknown-linux-gnuabi64:
-          TARGET: mips64el-unknown-linux-gnuabi64
-          NORUN: 1
-        powerpc64le-unknown-linux-gnu:
-          TARGET: powerpc64le-unknown-linux-gnu
-          STDARCH_DISABLE_ASSERT_INSTR: 1
-        s390x-unknown-linux-gnu:
-          TARGET: s390x-unknown-linux-gnu
-        wasm32-unknown-unknown:
-          TARGET: wasm32-unknown-unknown
-
-  - job: DockerLinux1
-    dependsOn: DockerLinux0
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - template: azure-install-rust.yml
-      - bash: |
-          if [ "${NO_DOCKER}" = "1" ]; then
-              ci/run.sh $TARGET
-          else
-              ci/run-docker.sh $TARGET
-          fi
-        displayName: Execute run-docker.sh
-    strategy:
-      matrix:
-        i586-unknown-linux-gnu:
-          TARGET: i586-unknown-linux-gnu
-        x86_64-linux-android:
-          TARGET: x86_64-linux-android
-          STDARCH_DISABLE_ASSERT_INSTR: 1
-        arm-linux-androideabi:
-          TARGET: arm-linux-androideabi
-          STDARCH_DISABLE_ASSERT_INSTR: 1
-        mipsel-unknown-linux-musl:
-          TARGET: mipsel-unknown-linux-musl
-          NORUN: 1
-        aarch64-linux-android:
-          TARGET: aarch64-linux-android
-          STDARCH_DISABLE_ASSERT_INSTR: 1
-        #powerpc-unknown-linux-gnu:
-        #  TARGET: powerpc-unknown-linux-gnu
-        #  STDARCH_DISABLE_ASSERT_INSTR: 1
-        #powerpc64-unknown-linux-gnu:
-        #  TARGET: powerpc64-unknown-linux-gnu
-        #  STDARCH_DISABLE_ASSERT_INSTR: 1
-        nvptx64-nvidia-cuda:
-          TARGET: nvptx64-nvidia-cuda
-          NORUN: 1
-          NOSTD: 1
-        thumbv6m-none-eabi:
-          TARGET: thumbv6m-none-eabi
-          NORUN: 1
-          NOSTD: 1
-          NO_DOCKER: 1
-        thumbv7m-none-eabi:
-          TARGET: thumbv7m-none-eabi
-          NORUN: 1
-          NOSTD: 1
-          NO_DOCKER: 1
-        thumbv7em-none-eabi:
-          TARGET: thumbv7em-none-eabi
-          NORUN: 1
-          NOSTD: 1
-          NO_DOCKER: 1
-        thumbv7em-none-eabihf:
-          TARGET: thumbv7em-none-eabihf
-          NORUN: 1
-          NOSTD: 1
-          NO_DOCKER: 1
-
-  - job: DockerOSX64
-    pool:
-      vmImage: macos-10.14
-    steps:
-      - template: azure-install-rust.yml
-      - bash: sh ./ci/run.sh $TARGET
-        displayName: Execute run.sh
-    strategy:
-      matrix:
-        x86_64-apple-darwin:
-          TARGET: x86_64-apple-darwin
-          NO_DOCKER: 1
-
-  - job: DockerOSX32
-    pool:
-      vmImage: macos-10.13
-    steps:
-      - template: azure-install-rust.yml
-      - bash: sh ./ci/run.sh $TARGET
-        displayName: Execute run.sh
-    strategy:
-      matrix:
-        i686-apple-darwin:
-          TARGET: i686-apple-darwin
-          NO_DOCKER: 1
-
-  - job: Windows
-    pool:
-      vmImage: vs2017-win2016
-    steps:
-      - template: azure-install-rust.yml
-      - bash: sh ./ci/run.sh $TARGET
-        displayName: Execute run.sh
-    strategy:
-      matrix:
-        x86_64-pc-windows-msvc:
-          TARGET: x86_64-pc-windows-msvc
-        # FIXME:
-        # Disassembly no implemented for the
-        # following targets:
-        # x86_64-pc-windows-gnu:
-        #  TARGET: x86_64-pc-windows-gnu
-        #i686-pc-windows-gnu:
-        #  TARGET: i686-pc-windows-gnu
-        #i686-pc-windows-msvc:
-        #  TARGET: i686-pc-windows-msvc
-    
-  - job: StyleAndDocs
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - template: azure-install-rust.yml
-      - script: sh ci/style.sh
-        displayName: Check style
-      - script: sh ci/dox.sh
-        displayName: Generate documentation
-      - template: azure-configs/static-websites.yml@rustinfra
-        parameters:
-          deploy_dir: target/doc
-    variables:
-      CI: 1
-
-  - job: AutomaticVerification
-    dependsOn: StyleAndDocs
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - template: azure-install-rust.yml
-      - script: cargo test --manifest-path crates/stdarch-verify/Cargo.toml
-        displayName: Automatic verification  
-
-#  - job: GameBoyAdvance
-#    dependsOn: StyleAndDocs
-#    pool:
-#      vmImage: ubuntu-16.04
-#    steps:
-#      - template: azure-install-rust.yml
-#      - script: rustup component add rust-src
-#        displayName: Add rust-src
-#      - script: (test -x $HOME/.cargo/bin/cargo-xbuild || cargo install cargo-xbuild)
-#        displayName: Add cargo-xbuild
-      # Obtain the devkitPro tools, using `target/` as a temp directory. This
-      # is required because we need to use their linker. `lld` uses the `BLX`
-      # instruction, which was not available in thumb state code until ARMv5.
-#      - script: |
-#          mkdir -p target
-#          cd target
-#          wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb
-#          sudo dpkg -i devkitpro-pacman.deb
-#          sudo dkp-pacman -Sy
-#          sudo dkp-pacman -Syu
-#          sudo dkp-pacman -S -v --noconfirm gba-tools devkitARM
-#          export PATH="$PATH:/opt/devkitpro/devkitARM/bin"
-#          export PATH="$PATH:/opt/devkitpro/tools/bin"
-#          cd ..
-#          # Pull the target spec up into the current directory and then build
-#          mv ci/gba.json gba.json
-#          cargo xbuild -p core_arch --target gba.json
-#    variables:
-#      NORUN: 1
-#      NOSTD: 1
-#      NO_DOCKER: 1
diff --git a/src/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile b/src/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile
index 40ac50675b..7488662ef2 100644
--- a/src/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile
+++ b/src/stdarch/ci/docker/mipsel-unknown-linux-musl/Dockerfile
@@ -16,10 +16,10 @@ RUN mkdir /toolchain
 
 # Note that this originally came from:
 # https://downloads.openwrt.org/snapshots/trunk/malta/generic/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2
-RUN curl -L https://s3-us-west-1.amazonaws.com/rust-lang-ci2/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
+RUN curl -L https://ci-mirrors.rust-lang.org/libc/OpenWrt-Toolchain-malta-le_gcc-5.3.0_musl-1.1.15.Linux-x86_64.tar.bz2 | \
       tar xjf - -C /toolchain --strip-components=2
 
 ENV PATH=$PATH:/rust/bin:/toolchain/bin \
     CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
     CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_LINKER=mipsel-openwrt-linux-gcc \
-    CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mipsel -L /toolchain"
\ No newline at end of file
+    CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_MUSL_RUNNER="qemu-mipsel -L /toolchain"
diff --git a/src/stdarch/ci/dox.sh b/src/stdarch/ci/dox.sh
index 641e3717d7..e70a32b2db 100755
--- a/src/stdarch/ci/dox.sh
+++ b/src/stdarch/ci/dox.sh
@@ -30,11 +30,13 @@ dox() {
 
   rustdoc --verbose --target "${target}" \
           -o "target/doc/${arch}" crates/core_arch/src/lib.rs \
+          --edition=2018 \
           --crate-name core_arch \
           --library-path "target/${target}/debug/deps" \
           --cfg core_arch_docs
   rustdoc --verbose --target "${target}" \
           -o "target/doc/${arch}" crates/std_detect/src/lib.rs \
+          --edition=2018 \
           --crate-name std_detect \
           --library-path "target/${target}/debug/deps" \
           --extern cfg_if="$(ls target/"${target}"/debug/deps/libcfg_if-*.rlib)" \
diff --git a/src/stdarch/ci/style.sh b/src/stdarch/ci/style.sh
old mode 100644
new mode 100755
index 4718aab5b3..8f81883f3f
--- a/src/stdarch/ci/style.sh
+++ b/src/stdarch/ci/style.sh
@@ -8,10 +8,10 @@ if rustup component add rustfmt-preview ; then
     cargo fmt --all -- --check
 fi
 
-if rustup component add clippy-preview ; then
-    cargo clippy -V
-    cargo clippy --all -- -D clippy::pedantic
-fi
+# if rustup component add clippy-preview ; then
+#     cargo clippy -V
+#     cargo clippy --all -- -D clippy::pedantic
+# fi
 
 if shellcheck --version ; then
     shellcheck -e SC2103 ci/*.sh
diff --git a/src/stdarch/crates/assert-instr-macro/Cargo.toml b/src/stdarch/crates/assert-instr-macro/Cargo.toml
index 0bf8b5faa0..eeefca2540 100644
--- a/src/stdarch/crates/assert-instr-macro/Cargo.toml
+++ b/src/stdarch/crates/assert-instr-macro/Cargo.toml
@@ -8,6 +8,6 @@ proc-macro = true
 test = false
 
 [dependencies]
-proc-macro2 = { version = "0.4", features = ["nightly"] }
-quote = "0.6"
-syn = { version = "0.15", features = ["full"] }
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full"] }
diff --git a/src/stdarch/crates/assert-instr-macro/src/lib.rs b/src/stdarch/crates/assert-instr-macro/src/lib.rs
index 0e73960584..8198aebc20 100644
--- a/src/stdarch/crates/assert-instr-macro/src/lib.rs
+++ b/src/stdarch/crates/assert-instr-macro/src/lib.rs
@@ -36,7 +36,7 @@ pub fn assert_instr(
     };
 
     let instr = &invoc.instr;
-    let name = &func.ident;
+    let name = &func.sig.ident;
 
     // Disable assert_instr for x86 targets compiled with avx enabled, which
     // causes LLVM to generate different intrinsics that the ones we are
@@ -62,21 +62,21 @@ pub fn assert_instr(
     );
     let mut inputs = Vec::new();
     let mut input_vals = Vec::new();
-    let ret = &func.decl.output;
-    for arg in func.decl.inputs.iter() {
+    let ret = &func.sig.output;
+    for arg in func.sig.inputs.iter() {
         let capture = match *arg {
-            syn::FnArg::Captured(ref c) => c,
+            syn::FnArg::Typed(ref c) => c,
             ref v => panic!(
                 "arguments must not have patterns: `{:?}`",
                 v.clone().into_token_stream()
             ),
         };
-        let ident = match capture.pat {
+        let ident = match *capture.pat {
             syn::Pat::Ident(ref i) => &i.ident,
             _ => panic!("must have bare arguments"),
         };
-        if let Some(&(_, ref tts)) = invoc.args.iter().find(|a| *ident == a.0) {
-            input_vals.push(quote! { #tts });
+        if let Some(&(_, ref tokens)) = invoc.args.iter().find(|a| *ident == a.0) {
+            input_vals.push(quote! { #tokens });
         } else {
             inputs.push(capture);
             input_vals.push(quote! { #ident });
@@ -91,7 +91,6 @@ pub fn assert_instr(
                 .segments
                 .first()
                 .expect("attr.path.segments.first() failed")
-                .value()
                 .ident
                 .to_string()
                 .starts_with("target")
@@ -131,7 +130,7 @@ pub fn assert_instr(
         }
     };
 
-    let tts: TokenStream = quote! {
+    let tokens: TokenStream = quote! {
         #[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]
         #[cfg_attr(not(target_arch = "wasm32"), test)]
         #[allow(non_snake_case)]
@@ -148,13 +147,16 @@ pub fn assert_instr(
         }
     };
     // why? necessary now to get tests to work?
-    let tts: TokenStream = tts.to_string().parse().expect("cannot parse tokenstream");
+    let tokens: TokenStream = tokens
+        .to_string()
+        .parse()
+        .expect("cannot parse tokenstream");
 
-    let tts: TokenStream = quote! {
+    let tokens: TokenStream = quote! {
         #item
-        #tts
+        #tokens
     };
-    tts.into()
+    tokens.into()
 }
 
 struct Invoc {
@@ -163,7 +165,7 @@ struct Invoc {
 }
 
 impl syn::parse::Parse for Invoc {
-    fn parse(input: syn::parse::ParseStream) -> syn::parse::Result<Self> {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
         use syn::{ext::IdentExt, Token};
 
         let mut instr = String::new();
diff --git a/src/stdarch/crates/core_arch/Cargo.toml b/src/stdarch/crates/core_arch/Cargo.toml
index 77c988e480..72d89b0168 100644
--- a/src/stdarch/crates/core_arch/Cargo.toml
+++ b/src/stdarch/crates/core_arch/Cargo.toml
@@ -18,7 +18,6 @@ build = "build.rs"
 edition = "2018"
 
 [badges]
-azure-devops = { project = "stdarch", pipeline = "rust-lang2.stdarch"  }
 is-it-maintained-issue-resolution = { repository = "rust-lang/stdarch" }
 is-it-maintained-open-issues = { repository = "rust-lang/stdarch" }
 maintenance = { status = "experimental" }
diff --git a/src/stdarch/crates/core_arch/README.md b/src/stdarch/crates/core_arch/README.md
index 52eb80955b..1f53db4c4f 100644
--- a/src/stdarch/crates/core_arch/README.md
+++ b/src/stdarch/crates/core_arch/README.md
@@ -1,7 +1,7 @@
 `core::arch` - Rust's core library architecture-specific intrinsics
 =======
 
-[![Azure Pipelines Status]][azure] [![core_arch_crate_badge]][core_arch_crate_link] [![core_arch_docs_badge]][core_arch_docs_link]
+[![core_arch_crate_badge]][core_arch_crate_link] [![core_arch_docs_badge]][core_arch_docs_link]
 
 
 The `core::arch` module implements architecture-dependent intrinsics (e.g. SIMD).
@@ -62,8 +62,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in `core_arch` by you, as defined in the Apache-2.0 license,
 shall be dual licensed as above, without any additional terms or conditions.
 
-[azure]: https://dev.azure.com/rust-lang2/stdarch/_build/latest?definitionId=2&branchName=auto
-[Azure Pipelines Status]: https://dev.azure.com/rust-lang2/stdarch/_apis/build/status/rust-lang.stdarch?branchName=auto
 [core_arch_crate_badge]: https://img.shields.io/crates/v/core_arch.svg
 [core_arch_crate_link]: https://crates.io/crates/core_arch
 [core_arch_docs_badge]: https://docs.rs/core_arch/badge.svg
diff --git a/src/stdarch/crates/core_arch/rustfmt.toml b/src/stdarch/crates/core_arch/rustfmt.toml
new file mode 100644
index 0000000000..4ae742ba8d
--- /dev/null
+++ b/src/stdarch/crates/core_arch/rustfmt.toml
@@ -0,0 +1,3 @@
+ignore = [
+    "src/simd.rs",
+]
diff --git a/src/stdarch/crates/core_arch/src/arm/neon.rs b/src/stdarch/crates/core_arch/src/arm/neon.rs
index dbf86a6abb..237bdaeb02 100644
--- a/src/stdarch/crates/core_arch/src/arm/neon.rs
+++ b/src/stdarch/crates/core_arch/src/arm/neon.rs
@@ -1,6 +1,8 @@
 //! ARMv7 NEON intrinsics
 
-use crate::{core_arch::simd_llvm::*, mem::transmute};
+use crate::core_arch::simd_llvm::*;
+#[cfg(target_arch = "arm")]
+use crate::mem::transmute;
 #[cfg(test)]
 use stdarch_test::assert_instr;
 
diff --git a/src/stdarch/crates/core_arch/src/mips/msa.rs b/src/stdarch/crates/core_arch/src/mips/msa.rs
index f93bcdbae7..29009b5d7c 100644
--- a/src/stdarch/crates/core_arch/src/mips/msa.rs
+++ b/src/stdarch/crates/core_arch/src/mips/msa.rs
@@ -13531,7 +13531,7 @@ mod tests {
     #[simd_test(enable = "msa")]
     unsafe fn test_msa_frint_w() {
         #[rustfmt::skip]
-        let a = f32x4::new(2.6, -2.7, 1.3, -1.7);;
+        let a = f32x4::new(2.6, -2.7, 1.3, -1.7);
         #[rustfmt::skip]
         let r = f32x4::new(3.0, -3.0, 1.0, -2.0);
 
@@ -13551,7 +13551,7 @@ mod tests {
     #[simd_test(enable = "msa")]
     unsafe fn test_msa_frcp_w() {
         #[rustfmt::skip]
-        let a = f32x4::new(2.6, -2.7, 1.3, -1.7);;
+        let a = f32x4::new(2.6, -2.7, 1.3, -1.7);
         #[rustfmt::skip]
         let r = f32x4::new(
             0.3846154, -0.37037036, 
@@ -13574,7 +13574,7 @@ mod tests {
     #[simd_test(enable = "msa")]
     unsafe fn test_msa_frsqrt_w() {
         #[rustfmt::skip]
-        let a = f32x4::new(2.6, 2.7, 1.3, 1.7);;
+        let a = f32x4::new(2.6, 2.7, 1.3, 1.7);
         #[rustfmt::skip]
         let r = f32x4::new(
             0.6201737, 0.6085806, 
diff --git a/src/stdarch/crates/core_arch/src/simd.rs b/src/stdarch/crates/core_arch/src/simd.rs
index b86a5ff288..746f084641 100644
--- a/src/stdarch/crates/core_arch/src/simd.rs
+++ b/src/stdarch/crates/core_arch/src/simd.rs
@@ -1,6 +1,5 @@
 //! Internal `#[repr(simd)]` types
 
-#![rustfmt::skip]
 #![allow(non_camel_case_types)]
 
 macro_rules! simd_ty {
diff --git a/src/stdarch/crates/core_arch/src/simd_llvm.rs b/src/stdarch/crates/core_arch/src/simd_llvm.rs
index 7f18ca8f0f..02934f7cb8 100644
--- a/src/stdarch/crates/core_arch/src/simd_llvm.rs
+++ b/src/stdarch/crates/core_arch/src/simd_llvm.rs
@@ -3,6 +3,7 @@
 //! TODO: should use `link_llvm_intrinsic` instead: issue #112
 
 extern "platform-intrinsic" {
+    //pub fn simd_select_bitmask
     pub fn simd_eq<T, U>(x: T, y: T) -> U;
     pub fn simd_ne<T, U>(x: T, y: T) -> U;
     pub fn simd_lt<T, U>(x: T, y: T) -> U;
@@ -10,16 +11,27 @@ extern "platform-intrinsic" {
     pub fn simd_gt<T, U>(x: T, y: T) -> U;
     pub fn simd_ge<T, U>(x: T, y: T) -> U;
 
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle2<T, U>(x: T, y: T, idx: [u32; 2]) -> U;
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle4<T, U>(x: T, y: T, idx: [u32; 4]) -> U;
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle8<T, U>(x: T, y: T, idx: [u32; 8]) -> U;
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle16<T, U>(x: T, y: T, idx: [u32; 16]) -> U;
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle32<T, U>(x: T, y: T, idx: [u32; 32]) -> U;
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle64<T, U>(x: T, y: T, idx: [u32; 64]) -> U;
+    #[rustc_args_required_const(2)]
     pub fn simd_shuffle128<T, U>(x: T, y: T, idx: [u32; 128]) -> U;
 
+    #[rustc_const_unstable(feature = "const_simd_insert", issue = "none")]
     pub fn simd_insert<T, U>(x: T, idx: u32, val: U) -> T;
+    #[rustc_const_unstable(feature = "const_simd_extract", issue = "none")]
     pub fn simd_extract<T, U>(x: T, idx: u32) -> U;
+    //pub fn simd_select
+    pub fn simd_bitmask<T, U>(x: T) -> U;
 
     pub fn simd_cast<T, U>(x: T) -> U;
 
@@ -33,6 +45,12 @@ extern "platform-intrinsic" {
     pub fn simd_or<T>(x: T, y: T) -> T;
     pub fn simd_xor<T>(x: T, y: T) -> T;
 
+    pub fn simd_saturating_add<T>(x: T, y: T) -> T;
+    pub fn simd_saturating_sub<T>(x: T, y: T) -> T;
+
+    pub fn simd_gather<T, U, V>(values: T, pointers: U, mask: V) -> T;
+    pub fn simd_scatter<T, U, V>(values: T, pointers: U, mask: V);
+
     pub fn simd_reduce_add_unordered<T, U>(x: T) -> U;
     pub fn simd_reduce_mul_unordered<T, U>(x: T) -> U;
     pub fn simd_reduce_add_ordered<T, U>(x: T, acc: U) -> U;
@@ -54,5 +72,17 @@ extern "platform-intrinsic" {
     pub fn simd_fmax<T>(a: T, b: T) -> T;
 
     pub fn simd_fsqrt<T>(a: T) -> T;
+    pub fn simd_fsin<T>(a: T) -> T;
+    pub fn simd_fcos<T>(a: T) -> T;
+    pub fn simd_fabs<T>(a: T) -> T;
+    pub fn simd_floor<T>(a: T) -> T;
+    pub fn simd_ceil<T>(a: T) -> T;
+    pub fn simd_fexp<T>(a: T) -> T;
+    pub fn simd_fexp2<T>(a: T) -> T;
+    pub fn simd_flog10<T>(a: T) -> T;
+    pub fn simd_flog2<T>(a: T) -> T;
+    pub fn simd_flog<T>(a: T) -> T;
+    //pub fn simd_fpowi
+    //pub fn simd_fpow
     pub fn simd_fma<T>(a: T, b: T, c: T) -> T;
 }
diff --git a/src/stdarch/crates/core_arch/src/wasm32/simd128.rs b/src/stdarch/crates/core_arch/src/wasm32/simd128.rs
index 99d02a0a44..c7377e23a2 100644
--- a/src/stdarch/crates/core_arch/src/wasm32/simd128.rs
+++ b/src/stdarch/crates/core_arch/src/wasm32/simd128.rs
@@ -24,7 +24,7 @@ types! {
 }
 
 #[allow(non_camel_case_types)]
-#[unstable(feature = "stdimd_internal", issue = "0")]
+#[unstable(feature = "stdimd_internal", issue = "none")]
 pub(crate) trait v128Ext: Sized {
     fn as_v128(self) -> v128;
 
diff --git a/src/stdarch/crates/core_arch/src/x86/avx.rs b/src/stdarch/crates/core_arch/src/x86/avx.rs
index 90867e4ad7..68896e0aad 100644
--- a/src/stdarch/crates/core_arch/src/x86/avx.rs
+++ b/src/stdarch/crates/core_arch/src/x86/avx.rs
@@ -255,7 +255,7 @@ pub unsafe fn _mm256_andnot_ps(a: __m256, b: __m256) -> __m256 {
 #[cfg_attr(test, assert_instr(vmaxpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_max_pd(a: __m256d, b: __m256d) -> __m256d {
-    maxpd256(a, b)
+    simd_fmax(a, b)
 }
 
 /// Compares packed single-precision (32-bit) floating-point elements in `a`
@@ -267,7 +267,7 @@ pub unsafe fn _mm256_max_pd(a: __m256d, b: __m256d) -> __m256d {
 #[cfg_attr(test, assert_instr(vmaxps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_max_ps(a: __m256, b: __m256) -> __m256 {
-    maxps256(a, b)
+    simd_fmax(a, b)
 }
 
 /// Compares packed double-precision (64-bit) floating-point elements
@@ -279,7 +279,7 @@ pub unsafe fn _mm256_max_ps(a: __m256, b: __m256) -> __m256 {
 #[cfg_attr(test, assert_instr(vminpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_min_pd(a: __m256d, b: __m256d) -> __m256d {
-    minpd256(a, b)
+    simd_fmin(a, b)
 }
 
 /// Compares packed single-precision (32-bit) floating-point elements in `a`
@@ -291,7 +291,7 @@ pub unsafe fn _mm256_min_pd(a: __m256d, b: __m256d) -> __m256d {
 #[cfg_attr(test, assert_instr(vminps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_min_ps(a: __m256, b: __m256) -> __m256 {
-    minps256(a, b)
+    simd_fmin(a, b)
 }
 
 /// Multiplies packed double-precision (64-bit) floating-point elements
@@ -426,7 +426,7 @@ pub unsafe fn _mm256_round_pd(a: __m256d, b: i32) -> __m256d {
 #[cfg_attr(test, assert_instr(vroundpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_ceil_pd(a: __m256d) -> __m256d {
-    roundpd256(a, 0x02)
+    simd_ceil(a)
 }
 
 /// Rounds packed double-precision (64-bit) floating point elements in `a`
@@ -438,7 +438,7 @@ pub unsafe fn _mm256_ceil_pd(a: __m256d) -> __m256d {
 #[cfg_attr(test, assert_instr(vroundpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_floor_pd(a: __m256d) -> __m256d {
-    roundpd256(a, 0x01)
+    simd_floor(a)
 }
 
 /// Rounds packed single-precision (32-bit) floating point elements in `a`
@@ -477,7 +477,7 @@ pub unsafe fn _mm256_round_ps(a: __m256, b: i32) -> __m256 {
 #[cfg_attr(test, assert_instr(vroundps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_ceil_ps(a: __m256) -> __m256 {
-    roundps256(a, 0x02)
+    simd_ceil(a)
 }
 
 /// Rounds packed single-precision (32-bit) floating point elements in `a`
@@ -489,7 +489,7 @@ pub unsafe fn _mm256_ceil_ps(a: __m256) -> __m256 {
 #[cfg_attr(test, assert_instr(vroundps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_floor_ps(a: __m256) -> __m256 {
-    roundps256(a, 0x01)
+    simd_floor(a)
 }
 
 /// Returns the square root of packed single-precision (32-bit) floating point
@@ -513,7 +513,7 @@ pub unsafe fn _mm256_sqrt_ps(a: __m256) -> __m256 {
 #[cfg_attr(test, assert_instr(vsqrtpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_sqrt_pd(a: __m256d) -> __m256d {
-    sqrtpd256(a)
+    simd_fsqrt(a)
 }
 
 /// Blends packed double-precision (64-bit) floating-point elements from
@@ -3166,20 +3166,10 @@ extern "C" {
     fn addsubpd256(a: __m256d, b: __m256d) -> __m256d;
     #[link_name = "llvm.x86.avx.addsub.ps.256"]
     fn addsubps256(a: __m256, b: __m256) -> __m256;
-    #[link_name = "llvm.x86.avx.max.pd.256"]
-    fn maxpd256(a: __m256d, b: __m256d) -> __m256d;
-    #[link_name = "llvm.x86.avx.max.ps.256"]
-    fn maxps256(a: __m256, b: __m256) -> __m256;
-    #[link_name = "llvm.x86.avx.min.pd.256"]
-    fn minpd256(a: __m256d, b: __m256d) -> __m256d;
-    #[link_name = "llvm.x86.avx.min.ps.256"]
-    fn minps256(a: __m256, b: __m256) -> __m256;
     #[link_name = "llvm.x86.avx.round.pd.256"]
     fn roundpd256(a: __m256d, b: i32) -> __m256d;
     #[link_name = "llvm.x86.avx.round.ps.256"]
     fn roundps256(a: __m256, b: i32) -> __m256;
-    #[link_name = "llvm.x86.avx.sqrt.pd.256"]
-    fn sqrtpd256(a: __m256d) -> __m256d;
     #[link_name = "llvm.x86.avx.sqrt.ps.256"]
     fn sqrtps256(a: __m256) -> __m256;
     #[link_name = "llvm.x86.avx.blendv.pd.256"]
diff --git a/src/stdarch/crates/core_arch/src/x86/avx2.rs b/src/stdarch/crates/core_arch/src/x86/avx2.rs
index e137f0ce59..193e1ca3ae 100644
--- a/src/stdarch/crates/core_arch/src/x86/avx2.rs
+++ b/src/stdarch/crates/core_arch/src/x86/avx2.rs
@@ -111,7 +111,7 @@ pub unsafe fn _mm256_add_epi8(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpaddsb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_adds_epi8(a: __m256i, b: __m256i) -> __m256i {
-    transmute(paddsb(a.as_i8x32(), b.as_i8x32()))
+    transmute(simd_saturating_add(a.as_i8x32(), b.as_i8x32()))
 }
 
 /// Adds packed 16-bit integers in `a` and `b` using saturation.
@@ -122,7 +122,7 @@ pub unsafe fn _mm256_adds_epi8(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpaddsw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_adds_epi16(a: __m256i, b: __m256i) -> __m256i {
-    transmute(paddsw(a.as_i16x16(), b.as_i16x16()))
+    transmute(simd_saturating_add(a.as_i16x16(), b.as_i16x16()))
 }
 
 /// Adds packed unsigned 8-bit integers in `a` and `b` using saturation.
@@ -133,7 +133,7 @@ pub unsafe fn _mm256_adds_epi16(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpaddusb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_adds_epu8(a: __m256i, b: __m256i) -> __m256i {
-    transmute(paddusb(a.as_u8x32(), b.as_u8x32()))
+    transmute(simd_saturating_add(a.as_u8x32(), b.as_u8x32()))
 }
 
 /// Adds packed unsigned 16-bit integers in `a` and `b` using saturation.
@@ -144,7 +144,7 @@ pub unsafe fn _mm256_adds_epu8(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpaddusw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_adds_epu16(a: __m256i, b: __m256i) -> __m256i {
-    transmute(paddusw(a.as_u16x16(), b.as_u16x16()))
+    transmute(simd_saturating_add(a.as_u16x16(), b.as_u16x16()))
 }
 
 /// Concatenates pairs of 16-byte blocks in `a` and `b` into a 32-byte temporary
@@ -3331,7 +3331,7 @@ pub unsafe fn _mm256_sub_epi8(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpsubsw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_subs_epi16(a: __m256i, b: __m256i) -> __m256i {
-    transmute(psubsw(a.as_i16x16(), b.as_i16x16()))
+    transmute(simd_saturating_sub(a.as_i16x16(), b.as_i16x16()))
 }
 
 /// Subtract packed 8-bit integers in `b` from packed 8-bit integers in
@@ -3343,7 +3343,7 @@ pub unsafe fn _mm256_subs_epi16(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpsubsb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_subs_epi8(a: __m256i, b: __m256i) -> __m256i {
-    transmute(psubsb(a.as_i8x32(), b.as_i8x32()))
+    transmute(simd_saturating_sub(a.as_i8x32(), b.as_i8x32()))
 }
 
 /// Subtract packed unsigned 16-bit integers in `b` from packed 16-bit
@@ -3355,7 +3355,7 @@ pub unsafe fn _mm256_subs_epi8(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpsubusw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_subs_epu16(a: __m256i, b: __m256i) -> __m256i {
-    transmute(psubusw(a.as_u16x16(), b.as_u16x16()))
+    transmute(simd_saturating_sub(a.as_u16x16(), b.as_u16x16()))
 }
 
 /// Subtract packed unsigned 8-bit integers in `b` from packed 8-bit
@@ -3367,7 +3367,7 @@ pub unsafe fn _mm256_subs_epu16(a: __m256i, b: __m256i) -> __m256i {
 #[cfg_attr(test, assert_instr(vpsubusb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_subs_epu8(a: __m256i, b: __m256i) -> __m256i {
-    transmute(psubusb(a.as_u8x32(), b.as_u8x32()))
+    transmute(simd_saturating_sub(a.as_u8x32(), b.as_u8x32()))
 }
 
 /// Unpacks and interleave 8-bit integers from the high half of each
@@ -3807,14 +3807,6 @@ extern "C" {
     fn pabsw(a: i16x16) -> u16x16;
     #[link_name = "llvm.x86.avx2.pabs.d"]
     fn pabsd(a: i32x8) -> u32x8;
-    #[link_name = "llvm.x86.avx2.padds.b"]
-    fn paddsb(a: i8x32, b: i8x32) -> i8x32;
-    #[link_name = "llvm.x86.avx2.padds.w"]
-    fn paddsw(a: i16x16, b: i16x16) -> i16x16;
-    #[link_name = "llvm.x86.avx2.paddus.b"]
-    fn paddusb(a: u8x32, b: u8x32) -> u8x32;
-    #[link_name = "llvm.x86.avx2.paddus.w"]
-    fn paddusw(a: u16x16, b: u16x16) -> u16x16;
     #[link_name = "llvm.x86.avx2.pavg.b"]
     fn pavgb(a: u8x32, b: u8x32) -> u8x32;
     #[link_name = "llvm.x86.avx2.pavg.w"]
@@ -3959,14 +3951,6 @@ extern "C" {
     fn psrlvq(a: i64x2, count: i64x2) -> i64x2;
     #[link_name = "llvm.x86.avx2.psrlv.q.256"]
     fn psrlvq256(a: i64x4, count: i64x4) -> i64x4;
-    #[link_name = "llvm.x86.avx2.psubs.b"]
-    fn psubsb(a: i8x32, b: i8x32) -> i8x32;
-    #[link_name = "llvm.x86.avx2.psubs.w"]
-    fn psubsw(a: i16x16, b: i16x16) -> i16x16;
-    #[link_name = "llvm.x86.avx2.psubus.b"]
-    fn psubusb(a: u8x32, b: u8x32) -> u8x32;
-    #[link_name = "llvm.x86.avx2.psubus.w"]
-    fn psubusw(a: u16x16, b: u16x16) -> u16x16;
     #[link_name = "llvm.x86.avx2.pshuf.b"]
     fn pshufb(a: u8x32, b: u8x32) -> u8x32;
     #[link_name = "llvm.x86.avx2.permd"]
diff --git a/src/stdarch/crates/core_arch/src/x86/bswap.rs b/src/stdarch/crates/core_arch/src/x86/bswap.rs
index 20e3aa6fc3..fcaad26fb6 100644
--- a/src/stdarch/crates/core_arch/src/x86/bswap.rs
+++ b/src/stdarch/crates/core_arch/src/x86/bswap.rs
@@ -11,13 +11,7 @@ use stdarch_test::assert_instr;
 #[cfg_attr(test, assert_instr(bswap))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _bswap(x: i32) -> i32 {
-    bswap_i32(x)
-}
-
-#[allow(improper_ctypes)]
-extern "C" {
-    #[link_name = "llvm.bswap.i32"]
-    fn bswap_i32(x: i32) -> i32;
+    x.swap_bytes()
 }
 
 #[cfg(test)]
diff --git a/src/stdarch/crates/core_arch/src/x86/fma.rs b/src/stdarch/crates/core_arch/src/x86/fma.rs
index 48abe9f49a..f3dda6d527 100644
--- a/src/stdarch/crates/core_arch/src/x86/fma.rs
+++ b/src/stdarch/crates/core_arch/src/x86/fma.rs
@@ -18,6 +18,7 @@
 //! [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
 //! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
 
+use crate::core_arch::simd_llvm::simd_fma;
 use crate::core_arch::x86::*;
 
 #[cfg(test)]
@@ -32,7 +33,7 @@ use stdarch_test::assert_instr;
 #[cfg_attr(test, assert_instr(vfmadd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_fmadd_pd(a: __m128d, b: __m128d, c: __m128d) -> __m128d {
-    vfmaddpd(a, b, c)
+    simd_fma(a, b, c)
 }
 
 /// Multiplies packed double-precision (64-bit) floating-point elements in `a`
@@ -44,7 +45,7 @@ pub unsafe fn _mm_fmadd_pd(a: __m128d, b: __m128d, c: __m128d) -> __m128d {
 #[cfg_attr(test, assert_instr(vfmadd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_fmadd_pd(a: __m256d, b: __m256d, c: __m256d) -> __m256d {
-    vfmaddpd256(a, b, c)
+    simd_fma(a, b, c)
 }
 
 /// Multiplies packed single-precision (32-bit) floating-point elements in `a`
@@ -56,7 +57,7 @@ pub unsafe fn _mm256_fmadd_pd(a: __m256d, b: __m256d, c: __m256d) -> __m256d {
 #[cfg_attr(test, assert_instr(vfmadd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_fmadd_ps(a: __m128, b: __m128, c: __m128) -> __m128 {
-    vfmaddps(a, b, c)
+    simd_fma(a, b, c)
 }
 
 /// Multiplies packed single-precision (32-bit) floating-point elements in `a`
@@ -68,7 +69,7 @@ pub unsafe fn _mm_fmadd_ps(a: __m128, b: __m128, c: __m128) -> __m128 {
 #[cfg_attr(test, assert_instr(vfmadd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm256_fmadd_ps(a: __m256, b: __m256, c: __m256) -> __m256 {
-    vfmaddps256(a, b, c)
+    simd_fma(a, b, c)
 }
 
 /// Multiplies the lower double-precision (64-bit) floating-point elements in
@@ -439,14 +440,6 @@ pub unsafe fn _mm_fnmsub_ss(a: __m128, b: __m128, c: __m128) -> __m128 {
 
 #[allow(improper_ctypes)]
 extern "C" {
-    #[link_name = "llvm.x86.fma.vfmadd.pd"]
-    fn vfmaddpd(a: __m128d, b: __m128d, c: __m128d) -> __m128d;
-    #[link_name = "llvm.x86.fma.vfmadd.pd.256"]
-    fn vfmaddpd256(a: __m256d, b: __m256d, c: __m256d) -> __m256d;
-    #[link_name = "llvm.x86.fma.vfmadd.ps"]
-    fn vfmaddps(a: __m128, b: __m128, c: __m128) -> __m128;
-    #[link_name = "llvm.x86.fma.vfmadd.ps.256"]
-    fn vfmaddps256(a: __m256, b: __m256, c: __m256) -> __m256;
     #[link_name = "llvm.x86.fma.vfmadd.sd"]
     fn vfmaddsd(a: __m128d, b: __m128d, c: __m128d) -> __m128d;
     #[link_name = "llvm.x86.fma.vfmadd.ss"]
diff --git a/src/stdarch/crates/core_arch/src/x86/mod.rs b/src/stdarch/crates/core_arch/src/x86/mod.rs
index 68965ad93d..78a3e23179 100644
--- a/src/stdarch/crates/core_arch/src/x86/mod.rs
+++ b/src/stdarch/crates/core_arch/src/x86/mod.rs
@@ -352,7 +352,50 @@ mod test;
 pub use self::test::*;
 
 #[allow(non_camel_case_types)]
-#[unstable(feature = "stdimd_internal", issue = "0")]
+#[unstable(feature = "stdimd_internal", issue = "none")]
+pub(crate) trait m64Ext: Sized {
+    fn as_m64(self) -> __m64;
+
+    #[inline]
+    fn as_u8x8(self) -> crate::core_arch::simd::u8x8 {
+        unsafe { transmute(self.as_m64()) }
+    }
+
+    #[inline]
+    fn as_u16x4(self) -> crate::core_arch::simd::u16x4 {
+        unsafe { transmute(self.as_m64()) }
+    }
+
+    #[inline]
+    fn as_u32x2(self) -> crate::core_arch::simd::u32x2 {
+        unsafe { transmute(self.as_m64()) }
+    }
+
+    #[inline]
+    fn as_i8x8(self) -> crate::core_arch::simd::i8x8 {
+        unsafe { transmute(self.as_m64()) }
+    }
+
+    #[inline]
+    fn as_i16x4(self) -> crate::core_arch::simd::i16x4 {
+        unsafe { transmute(self.as_m64()) }
+    }
+
+    #[inline]
+    fn as_i32x2(self) -> crate::core_arch::simd::i32x2 {
+        unsafe { transmute(self.as_m64()) }
+    }
+}
+
+impl m64Ext for __m64 {
+    #[inline]
+    fn as_m64(self) -> Self {
+        self
+    }
+}
+
+#[allow(non_camel_case_types)]
+#[unstable(feature = "stdimd_internal", issue = "none")]
 pub(crate) trait m128iExt: Sized {
     fn as_m128i(self) -> __m128i;
 
@@ -405,7 +448,7 @@ impl m128iExt for __m128i {
 }
 
 #[allow(non_camel_case_types)]
-#[unstable(feature = "stdimd_internal", issue = "0")]
+#[unstable(feature = "stdimd_internal", issue = "none")]
 pub(crate) trait m256iExt: Sized {
     fn as_m256i(self) -> __m256i;
 
@@ -458,7 +501,7 @@ impl m256iExt for __m256i {
 }
 
 #[allow(non_camel_case_types)]
-#[unstable(feature = "stdimd_internal", issue = "0")]
+#[unstable(feature = "stdimd_internal", issue = "none")]
 pub(crate) trait m512iExt: Sized {
     fn as_m512i(self) -> __m512i;
 
diff --git a/src/stdarch/crates/core_arch/src/x86/sse.rs b/src/stdarch/crates/core_arch/src/x86/sse.rs
index 1dcb94ef3b..b07971c500 100644
--- a/src/stdarch/crates/core_arch/src/x86/sse.rs
+++ b/src/stdarch/crates/core_arch/src/x86/sse.rs
@@ -194,6 +194,7 @@ pub unsafe fn _mm_min_ss(a: __m128, b: __m128) -> __m128 {
 #[cfg_attr(test, assert_instr(minps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_min_ps(a: __m128, b: __m128) -> __m128 {
+    // See the `test_mm_min_ps` test why this can't be implemented using `simd_fmin`.
     minps(a, b)
 }
 
@@ -219,6 +220,7 @@ pub unsafe fn _mm_max_ss(a: __m128, b: __m128) -> __m128 {
 #[cfg_attr(test, assert_instr(maxps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_max_ps(a: __m128, b: __m128) -> __m128 {
+    // See the `test_mm_min_ps` test why this can't be implemented using `simd_fmax`.
     maxps(a, b)
 }
 
@@ -2618,6 +2620,21 @@ mod tests {
         let b = _mm_setr_ps(-100.0, 20.0, 0.0, -5.0);
         let r = _mm_min_ps(a, b);
         assert_eq_m128(r, _mm_setr_ps(-100.0, 5.0, 0.0, -10.0));
+
+        // `_mm_min_ps` can **not** be implemented using the `simd_min` rust intrinsic. `simd_min`
+        // is lowered by the llvm codegen backend to `llvm.minnum.v*` llvm intrinsic. This intrinsic
+        // doesn't specify how -0.0 is handled. Unfortunately it happens to behave different from
+        // the `minps` x86 instruction on x86. The `llvm.minnum.v*` llvm intrinsic equals
+        // `r1` to `a` and `r2` to `b`.
+        let a = _mm_setr_ps(-0.0, 0.0, 0.0, 0.0);
+        let b = _mm_setr_ps(0.0, 0.0, 0.0, 0.0);
+        let r1: [u8; 16] = transmute(_mm_min_ps(a, b));
+        let r2: [u8; 16] = transmute(_mm_min_ps(b, a));
+        let a: [u8; 16] = transmute(a);
+        let b: [u8; 16] = transmute(b);
+        assert_eq!(r1, b);
+        assert_eq!(r2, a);
+        assert_ne!(a, b); // sanity check that -0.0 is actually present
     }
 
     #[simd_test(enable = "sse")]
diff --git a/src/stdarch/crates/core_arch/src/x86/sse2.rs b/src/stdarch/crates/core_arch/src/x86/sse2.rs
index 5df06c8194..3e738e3352 100644
--- a/src/stdarch/crates/core_arch/src/x86/sse2.rs
+++ b/src/stdarch/crates/core_arch/src/x86/sse2.rs
@@ -121,7 +121,7 @@ pub unsafe fn _mm_add_epi64(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(paddsb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_adds_epi8(a: __m128i, b: __m128i) -> __m128i {
-    transmute(paddsb(a.as_i8x16(), b.as_i8x16()))
+    transmute(simd_saturating_add(a.as_i8x16(), b.as_i8x16()))
 }
 
 /// Adds packed 16-bit integers in `a` and `b` using saturation.
@@ -132,7 +132,7 @@ pub unsafe fn _mm_adds_epi8(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(paddsw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_adds_epi16(a: __m128i, b: __m128i) -> __m128i {
-    transmute(paddsw(a.as_i16x8(), b.as_i16x8()))
+    transmute(simd_saturating_add(a.as_i16x8(), b.as_i16x8()))
 }
 
 /// Adds packed unsigned 8-bit integers in `a` and `b` using saturation.
@@ -143,7 +143,7 @@ pub unsafe fn _mm_adds_epi16(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(paddusb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_adds_epu8(a: __m128i, b: __m128i) -> __m128i {
-    transmute(paddsub(a.as_u8x16(), b.as_u8x16()))
+    transmute(simd_saturating_add(a.as_u8x16(), b.as_u8x16()))
 }
 
 /// Adds packed unsigned 16-bit integers in `a` and `b` using saturation.
@@ -154,7 +154,7 @@ pub unsafe fn _mm_adds_epu8(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(paddusw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_adds_epu16(a: __m128i, b: __m128i) -> __m128i {
-    transmute(paddsuw(a.as_u16x8(), b.as_u16x8()))
+    transmute(simd_saturating_add(a.as_u16x8(), b.as_u16x8()))
 }
 
 /// Averages packed unsigned 8-bit integers in `a` and `b`.
@@ -367,7 +367,7 @@ pub unsafe fn _mm_sub_epi64(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(psubsb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_subs_epi8(a: __m128i, b: __m128i) -> __m128i {
-    transmute(psubsb(a.as_i8x16(), b.as_i8x16()))
+    transmute(simd_saturating_sub(a.as_i8x16(), b.as_i8x16()))
 }
 
 /// Subtract packed 16-bit integers in `b` from packed 16-bit integers in `a`
@@ -379,7 +379,7 @@ pub unsafe fn _mm_subs_epi8(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(psubsw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_subs_epi16(a: __m128i, b: __m128i) -> __m128i {
-    transmute(psubsw(a.as_i16x8(), b.as_i16x8()))
+    transmute(simd_saturating_sub(a.as_i16x8(), b.as_i16x8()))
 }
 
 /// Subtract packed unsigned 8-bit integers in `b` from packed unsigned 8-bit
@@ -391,7 +391,7 @@ pub unsafe fn _mm_subs_epi16(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(psubusb))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_subs_epu8(a: __m128i, b: __m128i) -> __m128i {
-    transmute(psubusb(a.as_u8x16(), b.as_u8x16()))
+    transmute(simd_saturating_sub(a.as_u8x16(), b.as_u8x16()))
 }
 
 /// Subtract packed unsigned 16-bit integers in `b` from packed unsigned 16-bit
@@ -403,7 +403,7 @@ pub unsafe fn _mm_subs_epu8(a: __m128i, b: __m128i) -> __m128i {
 #[cfg_attr(test, assert_instr(psubusw))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_subs_epu16(a: __m128i, b: __m128i) -> __m128i {
-    transmute(psubusw(a.as_u16x8(), b.as_u16x8()))
+    transmute(simd_saturating_sub(a.as_u16x8(), b.as_u16x8()))
 }
 
 /// Shifts `a` left by `imm8` bytes while shifting in zeros.
@@ -1823,7 +1823,7 @@ pub unsafe fn _mm_sqrt_sd(a: __m128d, b: __m128d) -> __m128d {
 #[cfg_attr(test, assert_instr(sqrtpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_sqrt_pd(a: __m128d) -> __m128d {
-    sqrtpd(a)
+    simd_fsqrt(a)
 }
 
 /// Returns a new vector with the low element of `a` replaced by subtracting the
@@ -3021,14 +3021,6 @@ extern "C" {
     fn lfence();
     #[link_name = "llvm.x86.sse2.mfence"]
     fn mfence();
-    #[link_name = "llvm.x86.sse2.padds.b"]
-    fn paddsb(a: i8x16, b: i8x16) -> i8x16;
-    #[link_name = "llvm.x86.sse2.padds.w"]
-    fn paddsw(a: i16x8, b: i16x8) -> i16x8;
-    #[link_name = "llvm.x86.sse2.paddus.b"]
-    fn paddsub(a: u8x16, b: u8x16) -> u8x16;
-    #[link_name = "llvm.x86.sse2.paddus.w"]
-    fn paddsuw(a: u16x8, b: u16x8) -> u16x8;
     #[link_name = "llvm.x86.sse2.pavg.b"]
     fn pavgb(a: u8x16, b: u8x16) -> u8x16;
     #[link_name = "llvm.x86.sse2.pavg.w"]
@@ -3051,14 +3043,6 @@ extern "C" {
     fn pmuludq(a: u32x4, b: u32x4) -> u64x2;
     #[link_name = "llvm.x86.sse2.psad.bw"]
     fn psadbw(a: u8x16, b: u8x16) -> u64x2;
-    #[link_name = "llvm.x86.sse2.psubs.b"]
-    fn psubsb(a: i8x16, b: i8x16) -> i8x16;
-    #[link_name = "llvm.x86.sse2.psubs.w"]
-    fn psubsw(a: i16x8, b: i16x8) -> i16x8;
-    #[link_name = "llvm.x86.sse2.psubus.b"]
-    fn psubusb(a: u8x16, b: u8x16) -> u8x16;
-    #[link_name = "llvm.x86.sse2.psubus.w"]
-    fn psubusw(a: u16x8, b: u16x8) -> u16x8;
     #[link_name = "llvm.x86.sse2.pslli.w"]
     fn pslliw(a: i16x8, imm8: i32) -> i16x8;
     #[link_name = "llvm.x86.sse2.psll.w"]
diff --git a/src/stdarch/crates/core_arch/src/x86/sse41.rs b/src/stdarch/crates/core_arch/src/x86/sse41.rs
index f861629671..19ba1a847a 100644
--- a/src/stdarch/crates/core_arch/src/x86/sse41.rs
+++ b/src/stdarch/crates/core_arch/src/x86/sse41.rs
@@ -35,20 +35,20 @@ pub const _MM_FROUND_NO_EXC: i32 = 0x08;
 pub const _MM_FROUND_NINT: i32 = 0x00;
 /// round down and do not suppress exceptions
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub const _MM_FROUND_FLOOR: i32 = (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_NEG_INF);
+pub const _MM_FROUND_FLOOR: i32 = _MM_FROUND_RAISE_EXC | _MM_FROUND_TO_NEG_INF;
 /// round up and do not suppress exceptions
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub const _MM_FROUND_CEIL: i32 = (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_POS_INF);
+pub const _MM_FROUND_CEIL: i32 = _MM_FROUND_RAISE_EXC | _MM_FROUND_TO_POS_INF;
 /// truncate and do not suppress exceptions
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub const _MM_FROUND_TRUNC: i32 = (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_ZERO);
+pub const _MM_FROUND_TRUNC: i32 = _MM_FROUND_RAISE_EXC | _MM_FROUND_TO_ZERO;
 /// use MXCSR.RC and do not suppress exceptions; see
 /// `vendor::_MM_SET_ROUNDING_MODE`
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub const _MM_FROUND_RINT: i32 = (_MM_FROUND_RAISE_EXC | _MM_FROUND_CUR_DIRECTION);
+pub const _MM_FROUND_RINT: i32 = _MM_FROUND_RAISE_EXC | _MM_FROUND_CUR_DIRECTION;
 /// use MXCSR.RC and suppress exceptions; see `vendor::_MM_SET_ROUNDING_MODE`
 #[stable(feature = "simd_x86", since = "1.27.0")]
-pub const _MM_FROUND_NEARBYINT: i32 = (_MM_FROUND_NO_EXC | _MM_FROUND_CUR_DIRECTION);
+pub const _MM_FROUND_NEARBYINT: i32 = _MM_FROUND_NO_EXC | _MM_FROUND_CUR_DIRECTION;
 
 /// Blend packed 8-bit integers from `a` and `b` using `mask`
 ///
@@ -601,7 +601,7 @@ pub unsafe fn _mm_dp_ps(a: __m128, b: __m128, imm8: i32) -> __m128 {
 #[cfg_attr(test, assert_instr(roundpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_floor_pd(a: __m128d) -> __m128d {
-    roundpd(a, _MM_FROUND_FLOOR)
+    simd_floor(a)
 }
 
 /// Round the packed single-precision (32-bit) floating-point elements in `a`
@@ -614,7 +614,7 @@ pub unsafe fn _mm_floor_pd(a: __m128d) -> __m128d {
 #[cfg_attr(test, assert_instr(roundps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_floor_ps(a: __m128) -> __m128 {
-    roundps(a, _MM_FROUND_FLOOR)
+    simd_floor(a)
 }
 
 /// Round the lower double-precision (64-bit) floating-point element in `b`
@@ -657,7 +657,7 @@ pub unsafe fn _mm_floor_ss(a: __m128, b: __m128) -> __m128 {
 #[cfg_attr(test, assert_instr(roundpd))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_ceil_pd(a: __m128d) -> __m128d {
-    roundpd(a, _MM_FROUND_CEIL)
+    simd_ceil(a)
 }
 
 /// Round the packed single-precision (32-bit) floating-point elements in `a`
@@ -670,7 +670,7 @@ pub unsafe fn _mm_ceil_pd(a: __m128d) -> __m128d {
 #[cfg_attr(test, assert_instr(roundps))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _mm_ceil_ps(a: __m128) -> __m128 {
-    roundps(a, _MM_FROUND_CEIL)
+    simd_ceil(a)
 }
 
 /// Round the lower double-precision (64-bit) floating-point element in `b`
diff --git a/src/stdarch/crates/core_arch/src/x86_64/bswap.rs b/src/stdarch/crates/core_arch/src/x86_64/bswap.rs
index 9e8e76d4f7..90a209ce30 100644
--- a/src/stdarch/crates/core_arch/src/x86_64/bswap.rs
+++ b/src/stdarch/crates/core_arch/src/x86_64/bswap.rs
@@ -12,13 +12,7 @@ use stdarch_test::assert_instr;
 #[cfg_attr(test, assert_instr(bswap))]
 #[stable(feature = "simd_x86", since = "1.27.0")]
 pub unsafe fn _bswap64(x: i64) -> i64 {
-    bswap_i64(x)
-}
-
-#[allow(improper_ctypes)]
-extern "C" {
-    #[link_name = "llvm.bswap.i64"]
-    fn bswap_i64(x: i64) -> i64;
+    x.swap_bytes()
 }
 
 #[cfg(test)]
diff --git a/src/stdarch/crates/core_arch/tests/cpu-detection.rs b/src/stdarch/crates/core_arch/tests/cpu-detection.rs
index 07b56c616d..e17050d8ca 100644
--- a/src/stdarch/crates/core_arch/tests/cpu-detection.rs
+++ b/src/stdarch/crates/core_arch/tests/cpu-detection.rs
@@ -30,6 +30,23 @@ fn x86_all() {
         "avx512_vpopcntdq {:?}",
         is_x86_feature_detected!("avx512vpopcntdq")
     );
+    println!("avx512vbmi2 {:?}", is_x86_feature_detected!("avx512vbmi2"));
+    println!("avx512gfni {:?}", is_x86_feature_detected!("avx512gfni"));
+    println!("avx512vaes {:?}", is_x86_feature_detected!("avx512vaes"));
+    println!(
+        "avx512vpclmulqdq {:?}",
+        is_x86_feature_detected!("avx512vpclmulqdq")
+    );
+    println!("avx512vnni {:?}", is_x86_feature_detected!("avx512vnni"));
+    println!(
+        "avx512bitalg {:?}",
+        is_x86_feature_detected!("avx512bitalg")
+    );
+    println!("avx512bf16 {:?}", is_x86_feature_detected!("avx512bf16"));
+    println!(
+        "avx512vp2intersect {:?}",
+        is_x86_feature_detected!("avx512vp2intersect")
+    );
     println!("f16c: {:?}", is_x86_feature_detected!("f16c"));
     println!("fma: {:?}", is_x86_feature_detected!("fma"));
     println!("abm: {:?}", is_x86_feature_detected!("abm"));
diff --git a/src/stdarch/crates/simd-test-macro/Cargo.toml b/src/stdarch/crates/simd-test-macro/Cargo.toml
index 3373e3e289..039fe8c768 100644
--- a/src/stdarch/crates/simd-test-macro/Cargo.toml
+++ b/src/stdarch/crates/simd-test-macro/Cargo.toml
@@ -8,5 +8,5 @@ proc-macro = true
 test = false
 
 [dependencies]
-proc-macro2 = { version = "0.4", features = ["nightly"] }
-quote = "0.6"
+proc-macro2 = "1.0"
+quote = "1.0"
diff --git a/src/stdarch/crates/std_detect/Cargo.toml b/src/stdarch/crates/std_detect/Cargo.toml
index acfcc116f4..252e42c569 100644
--- a/src/stdarch/crates/std_detect/Cargo.toml
+++ b/src/stdarch/crates/std_detect/Cargo.toml
@@ -14,17 +14,16 @@ readme = "README.md"
 keywords = ["std", "run-time", "feature", "detection"]
 categories = ["hardware-support"]
 license = "MIT/Apache-2.0"
-edition = "2015"
+edition = "2018"
 
 [badges]
-azure-devops = { project = "stdarch", pipeline = "rust-lang2.stdarch"  }
 is-it-maintained-issue-resolution = { repository = "rust-lang/stdarch" }
 is-it-maintained-open-issues = { repository = "rust-lang/stdarch" }
 maintenance = { status = "experimental" }
 
 [dependencies]
 libc = { version = "0.2", optional = true, default-features = false }
-cfg-if = "0.1"
+cfg-if = "0.1.10"
 
 [dev-dependencies]
 auxv = "0.3.3"
@@ -33,4 +32,5 @@ cupid = "0.6.0"
 [features]
 default = [ "std_detect_dlsym_getauxval", "std_detect_file_io" ]
 std_detect_file_io = []
-std_detect_dlsym_getauxval = [ "libc" ]
\ No newline at end of file
+std_detect_dlsym_getauxval = [ "libc" ]
+std_detect_env_override = []
diff --git a/src/stdarch/crates/std_detect/README.md b/src/stdarch/crates/std_detect/README.md
index df66dc64b2..bb26c34719 100644
--- a/src/stdarch/crates/std_detect/README.md
+++ b/src/stdarch/crates/std_detect/README.md
@@ -1,7 +1,7 @@
 `std::detect` - Rust's standard library run-time CPU feature detection
 =======
 
-[![Azure Pipelines Status]][azure] [![std_detect_crate_badge]][std_detect_crate_link] [![std_detect_docs_badge]][std_detect_docs_link]
+[![std_detect_crate_badge]][std_detect_crate_link] [![std_detect_docs_badge]][std_detect_docs_link]
 
 
 The private `std::detect` module implements run-time feature detection in Rust's
@@ -75,8 +75,6 @@ Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in `std_detect` by you, as defined in the Apache-2.0 license,
 shall be dual licensed as above, without any additional terms or conditions.
 
-[azure]: https://dev.azure.com/rust-lang2/stdarch/_build/latest?definitionId=2&branchName=auto
-[Azure Pipelines Status]: https://dev.azure.com/rust-lang2/stdarch/_apis/build/status/rust-lang.stdarch?branchName=auto
 [std_detect_crate_badge]: https://img.shields.io/crates/v/std_detect.svg
 [std_detect_crate_link]: https://crates.io/crates/std_detect
 [std_detect_docs_badge]: https://docs.rs/std_detect/badge.svg
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/aarch64.rs b/src/stdarch/crates/std_detect/src/detect/arch/aarch64.rs
index ebae2bd285..154207e5ad 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/aarch64.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/aarch64.rs
@@ -1,106 +1,36 @@
 //! Aarch64 run-time features.
 
-/// Checks if `aarch64` feature is enabled.
-#[macro_export]
-#[unstable(feature = "stdsimd", issue = "27731")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_aarch64_feature_detected {
-    ("neon") => {
-        // FIXME: this should be removed once we rename Aarch64 neon to asimd
-        cfg!(target_feature = "neon") ||
-            $crate::detect::check_for($crate::detect::Feature::asimd)
-    };
-    ("asimd") => {
-        cfg!(target_feature = "neon") ||
-            $crate::detect::check_for($crate::detect::Feature::asimd)
-    };
-    ("pmull") => {
-        cfg!(target_feature = "pmull") ||
-            $crate::detect::check_for($crate::detect::Feature::pmull)
-    };
-    ("fp") => {
-        cfg!(target_feature = "fp") ||
-            $crate::detect::check_for($crate::detect::Feature::fp)
-    };
-    ("fp16") => {
-        cfg!(target_feature = "fp16") ||
-            $crate::detect::check_for($crate::detect::Feature::fp16)
-    };
-    ("sve") => {
-        cfg!(target_feature = "sve") ||
-            $crate::detect::check_for($crate::detect::Feature::sve)
-    };
-    ("crc") => {
-        cfg!(target_feature = "crc") ||
-            $crate::detect::check_for($crate::detect::Feature::crc)
-    };
-    ("crypto") => {
-        cfg!(target_feature = "crypto") ||
-            $crate::detect::check_for($crate::detect::Feature::crypto)
-    };
-    ("lse") => {
-        cfg!(target_feature = "lse") ||
-            $crate::detect::check_for($crate::detect::Feature::lse)
-    };
-    ("rdm") => {
-        cfg!(target_feature = "rdm") ||
-            $crate::detect::check_for($crate::detect::Feature::rdm)
-    };
-    ("rcpc") => {
-        cfg!(target_feature = "rcpc") ||
-            $crate::detect::check_for($crate::detect::Feature::rcpc)
-    };
-    ("dotprod") => {
-        cfg!(target_feature = "dotprod") ||
-            $crate::detect::check_for($crate::detect::Feature::dotprod)
-    };
-    ("ras") => {
-        compile_error!("\"ras\" feature cannot be detected at run-time")
-    };
-    ("v8.1a") => {
-        compile_error!("\"v8.1a\" feature cannot be detected at run-time")
-    };
-    ("v8.2a") => {
-        compile_error!("\"v8.2a\" feature cannot be detected at run-time")
-    };
-    ("v8.3a") => {
-        compile_error!("\"v8.3a\" feature cannot be detected at run-time")
-    };
-    ($t:tt,) => {
-        is_aarch64_feature_detected!($t);
-    };
-    ($t:tt) => { compile_error!(concat!("unknown aarch64 target feature: ", $t)) };
-}
-
-/// ARM Aarch64 CPU Feature enum. Each variant denotes a position in a bitset
-/// for a particular feature.
-///
-/// PLEASE: do not use this, it is an implementation detail subject to change.
-#[doc(hidden)]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: aarch64;
+    @MACRO_NAME: is_aarch64_feature_detected;
+    @MACRO_ATTRS:
+    /// Checks if `aarch64` feature is enabled.
+    #[unstable(feature = "stdsimd", issue = "27731")]
+    @BIND_FEATURE_NAME: "asimd"; "neon";
+    @NO_RUNTIME_DETECTION: "ras";
+    @NO_RUNTIME_DETECTION: "v8.1a";
+    @NO_RUNTIME_DETECTION: "v8.2a";
+    @NO_RUNTIME_DETECTION: "v8.3a";
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] asimd: "neon";
     /// ARM Advanced SIMD (ASIMD)
-    asimd,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] pmull: "pmull";
     /// Polynomial Multiply
-    pmull,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] fp: "fp";
     /// Floating point support
-    fp,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] fp16: "fp16";
     /// Half-float support.
-    fp16,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] sve: "sve";
     /// Scalable Vector Extension (SVE)
-    sve,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] crc: "crc";
     /// CRC32 (Cyclic Redundancy Check)
-    crc,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] crypto: "crypto";
     /// Crypto: AES + PMULL + SHA1 + SHA2
-    crypto,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] lse: "lse";
     /// Atomics (Large System Extension)
-    lse,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] rdm: "rdm";
     /// Rounding Double Multiply (ASIMDRDM)
-    rdm,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] rcpc: "rcpc";
     /// Release consistent Processor consistent (RcPc)
-    rcpc,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] dotprod: "dotprod";
     /// Vector Dot-Product (ASIMDDP)
-    dotprod,
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/arm.rs b/src/stdarch/crates/std_detect/src/detect/arch/arm.rs
index b2626bf292..96978b7009 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/arm.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/arm.rs
@@ -1,39 +1,19 @@
 //! Run-time feature detection on ARM Aarch32.
 
-/// Checks if `arm` feature is enabled.
-#[macro_export]
-#[unstable(feature = "stdsimd", issue = "27731")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_arm_feature_detected {
-    ("neon") => {
-        cfg!(target_feature = "neon") ||
-            $crate::detect::check_for($crate::detect::Feature::neon)
-    };
-    ("pmull") => {
-        cfg!(target_feature = "pmull") ||
-            $crate::detect::check_for($crate::detect::Feature::pmull)
-    };
-    ("v7") => { compile_error!("\"v7\" feature cannot be detected at run-time") };
-    ("vfp2") => { compile_error!("\"vfp2\" feature cannot be detected at run-time") };
-    ("vfp3") => { compile_error!("\"vfp3\" feature cannot be detected at run-time") };
-    ("vfp4") => { compile_error!("\"vfp4\" feature cannot be detected at run-time") };
-    ($t:tt,) => {
-        is_arm_feature_detected!($t);
-    };
-    ($t:tt) => { compile_error!(concat!("unknown arm target feature: ", $t)) };
-}
-
-/// ARM CPU Feature enum. Each variant denotes a position in a bitset for a
-/// particular feature.
-///
-/// PLEASE: do not use this, it is an implementation detail subject to change.
-#[doc(hidden)]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: arm;
+    @MACRO_NAME: is_arm_feature_detected;
+    @MACRO_ATTRS:
+    /// Checks if `arm` feature is enabled.
+    #[unstable(feature = "stdsimd", issue = "27731")]
+    @NO_RUNTIME_DETECTION: "v7";
+    @NO_RUNTIME_DETECTION: "vfp2";
+    @NO_RUNTIME_DETECTION: "vfp3";
+    @NO_RUNTIME_DETECTION: "vfp4";
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] neon: "neon";
     /// ARM Advanced SIMD (NEON) - Aarch32
-    neon,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] pmull: "pmull";
     /// Polynomial Multiply
-    pmull,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] crc: "crc";
+    /// CRC32 (Cyclic Redundancy Check)
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/mips.rs b/src/stdarch/crates/std_detect/src/detect/arch/mips.rs
index f4381b811c..ada81b83ec 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/mips.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/mips.rs
@@ -1,29 +1,11 @@
 //! Run-time feature detection on MIPS.
 
-/// Checks if `mips` feature is enabled.
-#[macro_export]
-#[unstable(feature = "stdsimd", issue = "27731")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_mips_feature_detected {
-    ("msa") => {
-        cfg!(target_feature = "msa") ||
-            $crate::detect::check_for($crate::detect::Feature::msa)
-    };
-    ($t:tt,) => {
-        is_mips_feature_detected!($t);
-    };
-    ($t:tt) => { compile_error!(concat!("unknown mips target feature: ", $t)) };
-}
-
-/// MIPS CPU Feature enum. Each variant denotes a position in a bitset for a
-/// particular feature.
-///
-/// PLEASE: do not use this, it is an implementation detail subject to change.
-#[doc(hidden)]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: mips;
+    @MACRO_NAME: is_mips_feature_detected;
+    @MACRO_ATTRS:
+    /// Checks if `mips` feature is enabled.
+    #[unstable(feature = "stdsimd", issue = "27731")]
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] msa: "msa";
     /// MIPS SIMD Architecture (MSA)
-    msa,
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/mips64.rs b/src/stdarch/crates/std_detect/src/detect/arch/mips64.rs
index 2663bc68ba..6a0bb159ba 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/mips64.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/mips64.rs
@@ -1,29 +1,11 @@
 //! Run-time feature detection on MIPS64.
 
-/// Checks if `mips64` feature is enabled.
-#[macro_export]
-#[unstable(feature = "stdsimd", issue = "27731")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_mips64_feature_detected {
-    ("msa") => {
-        cfg!(target_feature = "msa") ||
-            $crate::detect::check_for($crate::detect::Feature::msa)
-    };
-    ($t:tt,) => {
-        is_mips64_feature_detected!($t);
-    };
-    ($t:tt) => { compile_error!(concat!("unknown mips64 target feature: ", $t)) };
-}
-
-/// MIPS64 CPU Feature enum. Each variant denotes a position in a bitset
-/// for a particular feature.
-///
-/// PLEASE: do not use this, it is an implementation detail subject to change.
-#[doc(hidden)]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: mips64;
+    @MACRO_NAME: is_mips64_feature_detected;
+    @MACRO_ATTRS:
+    /// Checks if `mips64` feature is enabled.
+    #[unstable(feature = "stdsimd", issue = "27731")]
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] msa: "msa";
     /// MIPS SIMD Architecture (MSA)
-    msa,
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/powerpc.rs b/src/stdarch/crates/std_detect/src/detect/arch/powerpc.rs
index a342dc1aac..44bd7f337f 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/powerpc.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/powerpc.rs
@@ -1,42 +1,15 @@
 //! Run-time feature detection on PowerPC.
 
-/// Checks if `powerpc` feature is enabled.
-#[macro_export]
-#[unstable(feature = "stdsimd", issue = "27731")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_powerpc_feature_detected {
-    ("altivec") => {
-        cfg!(target_feature = "altivec") ||
-            $crate::detect::check_for($crate::detect::Feature::altivec)
-    };
-    ("vsx") => {
-        cfg!(target_feature = "vsx") ||
-            $crate::detect::check_for($crate::detect::Feature::vsx)
-    };
-    ("power8") => {
-        cfg!(target_feature = "power8") ||
-            $crate::detect::check_for($crate::detect::Feature::power8)
-    };
-    ($t:tt,) => {
-        is_powerpc_feature_detected!($t);
-    };
-    ($t:tt) => { compile_error!(concat!("unknown powerpc target feature: ", $t)) };
-}
-
-
-/// PowerPC CPU Feature enum. Each variant denotes a position in a bitset
-/// for a particular feature.
-///
-/// PLEASE: do not use this, it is an implementation detail subject to change.
-#[doc(hidden)]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: powerpc;
+    @MACRO_NAME: is_powerpc_feature_detected;
+    @MACRO_ATTRS:
+    /// Checks if `powerpc` feature is enabled.
+    #[unstable(feature = "stdsimd", issue = "27731")]
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] altivec: "altivec";
     /// Altivec
-    altivec,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] vsx: "vsx";
     /// VSX
-    vsx,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] power8: "power8";
     /// Power8
-    power8,
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/powerpc64.rs b/src/stdarch/crates/std_detect/src/detect/arch/powerpc64.rs
index 2e82c56925..17e4d958bf 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/powerpc64.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/powerpc64.rs
@@ -1,42 +1,15 @@
 //! Run-time feature detection on PowerPC64.
 
-/// Checks if `powerpc64` feature is enabled.
-#[macro_export]
-#[unstable(feature = "stdsimd", issue = "27731")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_powerpc64_feature_detected {
-    ("altivec") => {
-        cfg!(target_feature = "altivec") ||
-            $crate::detect::check_for($crate::detect::Feature::altivec)
-    };
-    ("vsx") => {
-        cfg!(target_feature = "vsx") ||
-            $crate::detect::check_for($crate::detect::Feature::vsx)
-    };
-    ("power8") => {
-        cfg!(target_feature = "power8") ||
-            $crate::detect::check_for($crate::detect::Feature::power8)
-    };
-    ($t:tt,) => {
-        is_powerpc64_feature_detected!($t);
-    };
-    ($t:tt) => { compile_error!(concat!("unknown powerpc64 target feature: ", $t)) };
-}
-
-
-/// PowerPC64 CPU Feature enum. Each variant denotes a position in a bitset
-/// for a particular feature.
-///
-/// PLEASE: do not use this, it is an implementation detail subject to change.
-#[doc(hidden)]
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: powerpc64;
+    @MACRO_NAME: is_powerpc64_feature_detected;
+    @MACRO_ATTRS:
+    /// Checks if `powerpc` feature is enabled.
+    #[unstable(feature = "stdsimd", issue = "27731")]
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] altivec: "altivec";
     /// Altivec
-    altivec,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] vsx: "vsx";
     /// VSX
-    vsx,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] power8: "power8";
     /// Power8
-    power8,
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/arch/x86.rs b/src/stdarch/crates/std_detect/src/detect/arch/x86.rs
index 50d5cfa87c..578910054e 100644
--- a/src/stdarch/crates/std_detect/src/detect/arch/x86.rs
+++ b/src/stdarch/crates/std_detect/src/detect/arch/x86.rs
@@ -15,334 +15,174 @@
 //! in a global `AtomicUsize` variable. The query is performed by just checking
 //! whether the feature bit in this global variable is set or cleared.
 
-/// A macro to test at *runtime* whether a CPU feature is available on
-/// x86/x86-64 platforms.
-///
-/// This macro is provided in the standard library and will detect at runtime
-/// whether the specified CPU feature is detected. This does **not** resolve at
-/// compile time unless the specified feature is already enabled for the entire
-/// crate. Runtime detection currently relies mostly on the `cpuid` instruction.
-///
-/// This macro only takes one argument which is a string literal of the feature
-/// being tested for. The feature names supported are the lowercase versions of
-/// the ones defined by Intel in [their documentation][docs].
-///
-/// ## Supported arguments
-///
-/// This macro supports the same names that `#[target_feature]` supports. Unlike
-/// `#[target_feature]`, however, this macro does not support names separated
-/// with a comma. Instead testing for multiple features must be done through
-/// separate macro invocations for now.
-///
-/// Supported arguments are:
-///
-/// * `"aes"`
-/// * `"pclmulqdq"`
-/// * `"rdrand"`
-/// * `"rdseed"`
-/// * `"tsc"`
-/// * `"mmx"`
-/// * `"sse"`
-/// * `"sse2"`
-/// * `"sse3"`
-/// * `"ssse3"`
-/// * `"sse4.1"`
-/// * `"sse4.2"`
-/// * `"sse4a"`
-/// * `"sha"`
-/// * `"avx"`
-/// * `"avx2"`
-/// * `"avx512f"`
-/// * `"avx512cd"`
-/// * `"avx512er"`
-/// * `"avx512pf"`
-/// * `"avx512bw"`
-/// * `"avx512dq"`
-/// * `"avx512vl"`
-/// * `"avx512ifma"`
-/// * `"avx512vbmi"`
-/// * `"avx512vpopcntdq"`
-/// * `"f16c"`
-/// * `"fma"`
-/// * `"bmi1"`
-/// * `"bmi2"`
-/// * `"abm"`
-/// * `"lzcnt"`
-/// * `"tbm"`
-/// * `"popcnt"`
-/// * `"fxsr"`
-/// * `"xsave"`
-/// * `"xsaveopt"`
-/// * `"xsaves"`
-/// * `"xsavec"`
-/// * `"adx"`
-/// * `"rtm"`
-///
-/// [docs]: https://software.intel.com/sites/landingpage/IntrinsicsGuide
-#[macro_export]
-#[stable(feature = "simd_x86", since = "1.27.0")]
-#[allow_internal_unstable(stdsimd_internal,stdsimd)]
-macro_rules! is_x86_feature_detected {
-    ("aes") => {
-        cfg!(target_feature = "aes") || $crate::detect::check_for(
-            $crate::detect::Feature::aes)  };
-    ("pclmulqdq") => {
-        cfg!(target_feature = "pclmulqdq") || $crate::detect::check_for(
-            $crate::detect::Feature::pclmulqdq)  };
-    ("rdrand") => {
-        cfg!(target_feature = "rdrand") || $crate::detect::check_for(
-            $crate::detect::Feature::rdrand)  };
-    ("rdseed") => {
-        cfg!(target_feature = "rdseed") || $crate::detect::check_for(
-            $crate::detect::Feature::rdseed)  };
-    ("tsc") => {
-        cfg!(target_feature = "tsc") || $crate::detect::check_for(
-            $crate::detect::Feature::tsc)  };
-    ("mmx") => {
-        cfg!(target_feature = "mmx") || $crate::detect::check_for(
-            $crate::detect::Feature::mmx)  };
-    ("sse") => {
-        cfg!(target_feature = "sse") || $crate::detect::check_for(
-            $crate::detect::Feature::sse)  };
-    ("sse2") => {
-        cfg!(target_feature = "sse2") || $crate::detect::check_for(
-            $crate::detect::Feature::sse2)
-    };
-    ("sse3") => {
-        cfg!(target_feature = "sse3") || $crate::detect::check_for(
-            $crate::detect::Feature::sse3)
-    };
-    ("ssse3") => {
-        cfg!(target_feature = "ssse3") || $crate::detect::check_for(
-            $crate::detect::Feature::ssse3)
-    };
-    ("sse4.1") => {
-        cfg!(target_feature = "sse4.1") || $crate::detect::check_for(
-            $crate::detect::Feature::sse4_1)
-    };
-    ("sse4.2") => {
-        cfg!(target_feature = "sse4.2") || $crate::detect::check_for(
-            $crate::detect::Feature::sse4_2)
-    };
-    ("sse4a") => {
-        cfg!(target_feature = "sse4a") || $crate::detect::check_for(
-            $crate::detect::Feature::sse4a)
-    };
-    ("sha") => {
-        cfg!(target_feature = "sha") || $crate::detect::check_for(
-            $crate::detect::Feature::sha)
-    };
-    ("avx") => {
-        cfg!(target_feature = "avx") || $crate::detect::check_for(
-            $crate::detect::Feature::avx)
-    };
-    ("avx2") => {
-        cfg!(target_feature = "avx2") || $crate::detect::check_for(
-            $crate::detect::Feature::avx2)
-    };
-    ("avx512f") => {
-        cfg!(target_feature = "avx512f") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512f)
-    };
-    ("avx512cd") => {
-        cfg!(target_feature = "avx512cd") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512cd)
-    };
-    ("avx512er") => {
-        cfg!(target_feature = "avx512er") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512er)
-    };
-    ("avx512pf") => {
-        cfg!(target_feature = "avx512pf") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512pf)
-    };
-    ("avx512bw") => {
-        cfg!(target_feature = "avx512bw") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512bw)
-    };
-    ("avx512dq") => {
-        cfg!(target_feature = "avx512dq") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512dq)
-    };
-    ("avx512vl") => {
-        cfg!(target_Feature = "avx512vl") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512vl)
-    };
-    ("avx512ifma") => {
-        cfg!(target_feature = "avx512ifma") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512_ifma)
-    };
-    ("avx512vbmi") => {
-        cfg!(target_feature = "avx512vbmi") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512_vbmi)
-    };
-    ("avx512vpopcntdq") => {
-        cfg!(target_feature = "avx512vpopcntdq") || $crate::detect::check_for(
-            $crate::detect::Feature::avx512_vpopcntdq)
-    };
-    ("f16c") => {
-        cfg!(target_feature = "f16c") || $crate::detect::check_for(
-            $crate::detect::Feature::f16c)
-    };
-    ("fma") => {
-        cfg!(target_feature = "fma") || $crate::detect::check_for(
-            $crate::detect::Feature::fma)
-    };
-    ("bmi1") => {
-        cfg!(target_feature = "bmi1") || $crate::detect::check_for(
-            $crate::detect::Feature::bmi)
-    };
-    ("bmi2") => {
-        cfg!(target_feature = "bmi2") || $crate::detect::check_for(
-            $crate::detect::Feature::bmi2)
-    };
-    ("abm") => {
-        cfg!(target_feature = "abm") || $crate::detect::check_for(
-            $crate::detect::Feature::abm)
-    };
-    ("lzcnt") => {
-        cfg!(target_feature = "lzcnt") || $crate::detect::check_for(
-            $crate::detect::Feature::abm)
-    };
-    ("tbm") => {
-        cfg!(target_feature = "tbm") || $crate::detect::check_for(
-            $crate::detect::Feature::tbm)
-    };
-    ("popcnt") => {
-        cfg!(target_feature = "popcnt") || $crate::detect::check_for(
-            $crate::detect::Feature::popcnt)
-    };
-    ("fxsr") => {
-        cfg!(target_feature = "fxsr") || $crate::detect::check_for(
-            $crate::detect::Feature::fxsr)
-    };
-    ("xsave") => {
-        cfg!(target_feature = "xsave") || $crate::detect::check_for(
-            $crate::detect::Feature::xsave)
-    };
-    ("xsaveopt") => {
-        cfg!(target_feature = "xsaveopt") || $crate::detect::check_for(
-            $crate::detect::Feature::xsaveopt)
-    };
-    ("xsaves") => {
-        cfg!(target_feature = "xsaves") || $crate::detect::check_for(
-            $crate::detect::Feature::xsaves)
-    };
-    ("xsavec") => {
-        cfg!(target_feature = "xsavec") || $crate::detect::check_for(
-            $crate::detect::Feature::xsavec)
-    };
-    ("cmpxchg16b") => {
-        cfg!(target_feature = "cmpxchg16b") || $crate::detect::check_for(
-            $crate::detect::Feature::cmpxchg16b)
-    };
-    ("adx") => {
-        cfg!(target_feature = "adx") || $crate::detect::check_for(
-            $crate::detect::Feature::adx)
-    };
-    ("rtm") => {
-        cfg!(target_feature = "rtm") || $crate::detect::check_for(
-            $crate::detect::Feature::rtm)
-    };
-    ($t:tt,) => {
-        is_x86_feature_detected!($t);
-    };
-    ($t:tt) => {
-        compile_error!(concat!("unknown target feature: ", $t))
-    };
-}
-
-/// X86 CPU Feature enum. Each variant denotes a position in a bitset for a
-/// particular feature.
-///
-/// This is an unstable implementation detail subject to change.
-#[allow(non_camel_case_types)]
-#[repr(u8)]
-#[doc(hidden)]
-#[unstable(feature = "stdsimd_internal", issue = "0")]
-pub enum Feature {
+features! {
+    @TARGET: x86;
+    @MACRO_NAME: is_x86_feature_detected;
+    @MACRO_ATTRS:
+    /// A macro to test at *runtime* whether a CPU feature is available on
+    /// x86/x86-64 platforms.
+    ///
+    /// This macro is provided in the standard library and will detect at runtime
+    /// whether the specified CPU feature is detected. This does **not** resolve at
+    /// compile time unless the specified feature is already enabled for the entire
+    /// crate. Runtime detection currently relies mostly on the `cpuid` instruction.
+    ///
+    /// This macro only takes one argument which is a string literal of the feature
+    /// being tested for. The feature names supported are the lowercase versions of
+    /// the ones defined by Intel in [their documentation][docs].
+    ///
+    /// ## Supported arguments
+    ///
+    /// This macro supports the same names that `#[target_feature]` supports. Unlike
+    /// `#[target_feature]`, however, this macro does not support names separated
+    /// with a comma. Instead testing for multiple features must be done through
+    /// separate macro invocations for now.
+    ///
+    /// Supported arguments are:
+    ///
+    /// * `"aes"`
+    /// * `"pclmulqdq"`
+    /// * `"rdrand"`
+    /// * `"rdseed"`
+    /// * `"tsc"`
+    /// * `"mmx"`
+    /// * `"sse"`
+    /// * `"sse2"`
+    /// * `"sse3"`
+    /// * `"ssse3"`
+    /// * `"sse4.1"`
+    /// * `"sse4.2"`
+    /// * `"sse4a"`
+    /// * `"sha"`
+    /// * `"avx"`
+    /// * `"avx2"`
+    /// * `"avx512f"`
+    /// * `"avx512cd"`
+    /// * `"avx512er"`
+    /// * `"avx512pf"`
+    /// * `"avx512bw"`
+    /// * `"avx512dq"`
+    /// * `"avx512vl"`
+    /// * `"avx512ifma"`
+    /// * `"avx512vbmi"`
+    /// * `"avx512vpopcntdq"`
+    /// * `"fma"`
+    /// * `"bmi1"`
+    /// * `"bmi2"`
+    /// * `"abm"`
+    /// * `"lzcnt"`
+    /// * `"tbm"`
+    /// * `"popcnt"`
+    /// * `"fxsr"`
+    /// * `"xsave"`
+    /// * `"xsaveopt"`
+    /// * `"xsaves"`
+    /// * `"xsavec"`
+    ///
+    /// [docs]: https://software.intel.com/sites/landingpage/IntrinsicsGuide
+    #[stable(feature = "simd_x86", since = "1.27.0")]
+    @BIND_FEATURE_NAME: "abm"; "lzcnt"; // abm is a synonym for lzcnt
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] aes: "aes";
     /// AES (Advanced Encryption Standard New Instructions AES-NI)
-    aes,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] pclmulqdq: "pclmulqdq";
     /// CLMUL (Carry-less Multiplication)
-    pclmulqdq,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")]  rdrand: "rdrand";
     /// RDRAND
-    rdrand,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] rdseed: "rdseed";
     /// RDSEED
-    rdseed,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] tsc: "tsc";
     /// TSC (Time Stamp Counter)
-    tsc,
-    /// MMX
-    mmx,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] mmx: "mmx";
+    /// MMX (MultiMedia eXtensions)
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sse: "sse";
     /// SSE (Streaming SIMD Extensions)
-    sse,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sse2: "sse2";
     /// SSE2 (Streaming SIMD Extensions 2)
-    sse2,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sse3: "sse3";
     /// SSE3 (Streaming SIMD Extensions 3)
-    sse3,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] ssse3: "ssse3";
     /// SSSE3 (Supplemental Streaming SIMD Extensions 3)
-    ssse3,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sse4_1: "sse4.1";
     /// SSE4.1 (Streaming SIMD Extensions 4.1)
-    sse4_1,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sse4_2: "sse4.2";
     /// SSE4.2 (Streaming SIMD Extensions 4.2)
-    sse4_2,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sse4a: "sse4a";
     /// SSE4a (Streaming SIMD Extensions 4a)
-    sse4a,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] sha: "sha";
     /// SHA
-    sha,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx: "avx";
     /// AVX (Advanced Vector Extensions)
-    avx,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx2: "avx2";
     /// AVX2 (Advanced Vector Extensions 2)
-    avx2,
+    // Detection for the AVX-512 features below was accidentally stabilized in
+    // Rust 1.27.0, even though the corresponding intrinsics are still unstable
+    // or unimplemeted. There are stable callers who rely on detection support,
+    // e.g. to call AVX-512 C code via FFI.
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512f: "avx512f" ;
     /// AVX-512 F (Foundation)
-    avx512f,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512cd: "avx512cd" ;
     /// AVX-512 CD (Conflict Detection Instructions)
-    avx512cd,
-    /// AVX-512 ER (Exponential and Reciprocal Instructions)
-    avx512er,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512er: "avx512er";
+    /// AVX-512 ER (Expo nential and Reciprocal Instructions)
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512pf: "avx512pf";
     /// AVX-512 PF (Prefetch Instructions)
-    avx512pf,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512bw: "avx512bw";
     /// AVX-512 BW (Byte and Word Instructions)
-    avx512bw,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512dq: "avx512dq";
     /// AVX-512 DQ (Doubleword and Quadword)
-    avx512dq,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] avx512vl: "avx512vl";
     /// AVX-512 VL (Vector Length Extensions)
-    avx512vl,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512ifma: "avx512ifma";
     /// AVX-512 IFMA (Integer Fused Multiply Add)
-    avx512_ifma,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vbmi: "avx512vbmi";
     /// AVX-512 VBMI (Vector Byte Manipulation Instructions)
-    avx512_vbmi,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vpopcntdq: "avx512vpopcntdq";
     /// AVX-512 VPOPCNTDQ (Vector Population Count Doubleword and
     /// Quadword)
-    avx512_vpopcntdq,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vbmi2: "avx512vbmi2";
+    /// AVX-512 VBMI2 (Additional byte, word, dword and qword capabilities)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512gfni: "avx512gfni";
+    /// AVX-512 GFNI (Galois Field New Instruction)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vaes: "avx512vaes";
+    /// AVX-512 VAES (Vector AES instruction)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vpclmulqdq: "avx512vpclmulqdq";
+    /// AVX-512 VPCLMULQDQ (Vector PCLMULQDQ instructions)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vnni: "avx512vnni";
+    /// AVX-512 VNNI (Vector Neural Network Instructions)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512bitalg: "avx512bitalg";
+    /// AVX-512 BITALG (Support for VPOPCNT[B,W] and VPSHUFBITQMB)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512bf16: "avx512bf16";
+    /// AVX-512 BF16 (BFLOAT16 instructions)
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] avx512vp2intersect: "avx512vp2intersect";
+    /// AVX-512 P2INTERSECT
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] f16c: "f16c";
     /// F16C (Conversions between IEEE-754 `binary16` and `binary32` formats)
-    f16c,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] fma: "fma";
     /// FMA (Fused Multiply Add)
-    fma,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] bmi1: "bmi1" ;
     /// BMI1 (Bit Manipulation Instructions 1)
-    bmi,
-    /// BMI1 (Bit Manipulation Instructions 2)
-    bmi2,
-    /// ABM (Advanced Bit Manipulation) on AMD / LZCNT (Leading Zero
-    /// Count) on Intel
-    abm,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] bmi2: "bmi2" ;
+    /// BMI2 (Bit Manipulation Instructions 2)
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] lzcnt: "lzcnt";
+    /// ABM (Advanced Bit Manipulation) / LZCNT (Leading Zero Count)
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] tbm: "tbm";
     /// TBM (Trailing Bit Manipulation)
-    tbm,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] popcnt: "popcnt";
     /// POPCNT (Population Count)
-    popcnt,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] fxsr: "fxsr";
     /// FXSR (Floating-point context fast save and restor)
-    fxsr,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] xsave: "xsave";
     /// XSAVE (Save Processor Extended States)
-    xsave,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] xsaveopt: "xsaveopt";
     /// XSAVEOPT (Save Processor Extended States Optimized)
-    xsaveopt,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] xsaves: "xsaves";
     /// XSAVES (Save Processor Extended States Supervisor)
-    xsaves,
+    @FEATURE: #[stable(feature = "simd_x86", since = "1.27.0")] xsavec: "xsavec";
     /// XSAVEC (Save Processor Extended States Compacted)
-    xsavec,
-    /// CMPXCH16B, a 16-byte compare-and-swap instruction
-    cmpxchg16b,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] cmpxchg16b: "cmpxchg16b";
+    /// CMPXCH16B (16-byte compare-and-swap instruction)
+    @FEATURE: #[stable(feature = "simd_x86_adx", since = "1.33.0")] adx: "adx";
     /// ADX, Intel ADX (Multi-Precision Add-Carry Instruction Extensions)
-    adx,
+    @FEATURE: #[unstable(feature = "stdsimd", issue = "27731")] rtm: "rtm";
     /// RTM, Intel (Restricted Transactional Memory)
-    rtm,
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/cache.rs b/src/stdarch/crates/std_detect/src/detect/cache.rs
index 92bc4b58d1..d421037f69 100644
--- a/src/stdarch/crates/std_detect/src/detect/cache.rs
+++ b/src/stdarch/crates/std_detect/src/detect/cache.rs
@@ -5,11 +5,7 @@
 
 use crate::sync::atomic::Ordering;
 
-#[cfg(target_pointer_width = "64")]
-use crate::sync::atomic::AtomicU64;
-
-#[cfg(target_pointer_width = "32")]
-use crate::sync::atomic::AtomicU32;
+use crate::sync::atomic::AtomicUsize;
 
 /// Sets the `bit` of `x`.
 #[inline]
@@ -23,8 +19,14 @@ const fn test_bit(x: u64, bit: u32) -> bool {
     x & (1 << bit) != 0
 }
 
+/// Unset the `bit of `x`.
+#[inline]
+const fn unset_bit(x: u64, bit: u32) -> u64 {
+    x & !(1 << bit)
+}
+
 /// Maximum number of features that can be cached.
-const CACHE_CAPACITY: u32 = 63;
+const CACHE_CAPACITY: u32 = 62;
 
 /// This type is used to initialize the cache
 #[derive(Copy, Clone)]
@@ -37,13 +39,13 @@ impl Default for Initializer {
     }
 }
 
+// NOTE: the `debug_assert!` would catch that we do not add more Features than
+// the one fitting our cache.
 impl Initializer {
     /// Tests the `bit` of the cache.
     #[allow(dead_code)]
     #[inline]
     pub(crate) fn test(self, bit: u32) -> bool {
-        // FIXME: this way of making sure that the cache is large enough is
-        // brittle.
         debug_assert!(
             bit < CACHE_CAPACITY,
             "too many features, time to increase the cache size!"
@@ -54,8 +56,6 @@ impl Initializer {
     /// Sets the `bit` of the cache.
     #[inline]
     pub(crate) fn set(&mut self, bit: u32) {
-        // FIXME: this way of making sure that the cache is large enough is
-        // brittle.
         debug_assert!(
             bit < CACHE_CAPACITY,
             "too many features, time to increase the cache size!"
@@ -63,85 +63,85 @@ impl Initializer {
         let v = self.0;
         self.0 = set_bit(v, bit);
     }
+
+    /// Unsets the `bit` of the cache.
+    #[inline]
+    pub(crate) fn unset(&mut self, bit: u32) {
+        debug_assert!(
+            bit < CACHE_CAPACITY,
+            "too many features, time to increase the cache size!"
+        );
+        let v = self.0;
+        self.0 = unset_bit(v, bit);
+    }
 }
 
 /// This global variable is a cache of the features supported by the CPU.
-static CACHE: Cache = Cache::uninitialized();
+// Note: on x64, we only use the first slot
+static CACHE: [Cache; 2] = [Cache::uninitialized(), Cache::uninitialized()];
 
-/// Feature cache with capacity for `CACHE_CAPACITY` features.
+/// Feature cache with capacity for `usize::max_value() - 1` features.
 ///
 /// Note: the last feature bit is used to represent an
 /// uninitialized cache.
-#[cfg(target_pointer_width = "64")]
-struct Cache(AtomicU64);
+///
+/// Note: we can use `Relaxed` atomic operations, because we are only interested
+/// in the effects of operations on a single memory location. That is, we only
+/// need "modification order", and not the full-blown "happens before". However,
+/// we use `SeqCst` just to be on the safe side.
+struct Cache(AtomicUsize);
 
-#[cfg(target_pointer_width = "64")]
-#[allow(clippy::use_self)]
 impl Cache {
+    const CAPACITY: u32 = (core::mem::size_of::<usize>() * 8 - 1) as u32;
+    const MASK: usize = (1 << Cache::CAPACITY) - 1;
+
     /// Creates an uninitialized cache.
     #[allow(clippy::declare_interior_mutable_const)]
     const fn uninitialized() -> Self {
-        Cache(AtomicU64::new(u64::max_value()))
+        Cache(AtomicUsize::new(usize::max_value()))
     }
     /// Is the cache uninitialized?
     #[inline]
     pub(crate) fn is_uninitialized(&self) -> bool {
-        self.0.load(Ordering::Relaxed) == u64::max_value()
+        self.0.load(Ordering::SeqCst) == usize::max_value()
     }
 
     /// Is the `bit` in the cache set?
     #[inline]
     pub(crate) fn test(&self, bit: u32) -> bool {
-        test_bit(CACHE.0.load(Ordering::Relaxed), bit)
+        test_bit(self.0.load(Ordering::SeqCst) as u64, bit)
     }
 
     /// Initializes the cache.
     #[inline]
-    pub(crate) fn initialize(&self, value: Initializer) {
-        self.0.store(value.0, Ordering::Relaxed);
+    fn initialize(&self, value: usize) {
+        self.0.store(value, Ordering::SeqCst);
     }
 }
 
-/// Feature cache with capacity for `CACHE_CAPACITY` features.
-///
-/// Note: the last feature bit is used to represent an
-/// uninitialized cache.
-#[cfg(target_pointer_width = "32")]
-struct Cache(AtomicU32, AtomicU32);
-
-#[cfg(target_pointer_width = "32")]
-impl Cache {
-    /// Creates an uninitialized cache.
-    const fn uninitialized() -> Self {
-        Cache(
-            AtomicU32::new(u32::max_value()),
-            AtomicU32::new(u32::max_value()),
-        )
-    }
-    /// Is the cache uninitialized?
-    #[inline]
-    pub(crate) fn is_uninitialized(&self) -> bool {
-        self.1.load(Ordering::Relaxed) == u32::max_value()
-    }
-
-    /// Is the `bit` in the cache set?
-    #[inline]
-    pub(crate) fn test(&self, bit: u32) -> bool {
-        if bit < 32 {
-            test_bit(CACHE.0.load(Ordering::Relaxed) as u64, bit)
-        } else {
-            test_bit(CACHE.1.load(Ordering::Relaxed) as u64, bit - 32)
+cfg_if::cfg_if! {
+    if #[cfg(feature = "std_detect_env_override")] {
+        #[inline(never)]
+        fn initialize(mut value: Initializer) {
+            if let Ok(disable) = crate::env::var("RUST_STD_DETECT_UNSTABLE") {
+                for v in disable.split(" ") {
+                    let _ = super::Feature::from_str(v).map(|v| value.unset(v as u32));
+                }
+            }
+            do_initialize(value);
+        }
+    } else {
+        #[inline]
+        fn initialize(value: Initializer) {
+            do_initialize(value);
         }
     }
+}
 
-    /// Initializes the cache.
-    #[inline]
-    pub(crate) fn initialize(&self, value: Initializer) {
-        let lo: u32 = value.0 as u32;
-        let hi: u32 = (value.0 >> 32) as u32;
-        self.0.store(lo, Ordering::Relaxed);
-        self.1.store(hi, Ordering::Relaxed);
-    }
+#[inline]
+fn do_initialize(value: Initializer) {
+    CACHE[0].initialize((value.0) as usize & Cache::MASK);
+    CACHE[1].initialize((value.0 >> Cache::CAPACITY) as usize & Cache::MASK);
 }
 
 /// Tests the `bit` of the storage. If the storage has not been initialized,
@@ -152,13 +152,23 @@ impl Cache {
 ///
 /// It uses the `Feature` variant to index into this variable as a bitset. If
 /// the bit is set, the feature is enabled, and otherwise it is disabled.
+///
+/// If the feature `std_detect_env_override` is enabled looks for the env
+/// variable `RUST_STD_DETECT_UNSTABLE` and uses its its content to disable
+/// Features that would had been otherwise detected.
 #[inline]
 pub(crate) fn test<F>(bit: u32, f: F) -> bool
 where
     F: FnOnce() -> Initializer,
 {
-    if CACHE.is_uninitialized() {
-        CACHE.initialize(f());
+    let (bit, idx) = if bit < Cache::CAPACITY {
+        (bit, 0)
+    } else {
+        (bit - Cache::CAPACITY, 1)
+    };
+
+    if CACHE[idx].is_uninitialized() {
+        initialize(f())
     }
-    CACHE.test(bit)
+    CACHE[idx].test(bit)
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/macros.rs b/src/stdarch/crates/std_detect/src/detect/macros.rs
new file mode 100644
index 0000000000..b9dbf9184e
--- /dev/null
+++ b/src/stdarch/crates/std_detect/src/detect/macros.rs
@@ -0,0 +1,103 @@
+#[allow(unused)]
+macro_rules! features {
+    (
+      @TARGET: $target:ident;
+      @MACRO_NAME: $macro_name:ident;
+      @MACRO_ATTRS: $(#[$macro_attrs:meta])*
+      $(@BIND_FEATURE_NAME: $bind_feature:tt; $feature_impl:tt; )*
+      $(@NO_RUNTIME_DETECTION: $nort_feature:tt; )*
+      $(@FEATURE: #[$stability_attr:meta] $feature:ident: $feature_lit:tt; $(#[$feature_comment:meta])*)*
+    ) => {
+        #[macro_export]
+        $(#[$macro_attrs])*
+        #[allow_internal_unstable(stdsimd_internal)]
+        macro_rules! $macro_name {
+            $(
+                ($feature_lit) => {
+                    $crate::detect::__is_feature_detected::$feature()
+                };
+            )*
+            $(
+                ($bind_feature) => { $macro_name!($feature_impl); };
+            )*
+            $(
+                ($nort_feature) => {
+                    compile_error!(
+                        concat!(
+                            stringify!(nort_feature),
+                            " feature cannot be detected at run-time"
+                        )
+                    )
+                };
+            )*
+            ($t:tt,) => {
+                    $macro_name!($t);
+            };
+            ($t:tt) => {
+                compile_error!(
+                    concat!(
+                        concat!("unknown ", stringify!($target)),
+                        concat!(" target feature: ", $t)
+                    )
+                )
+            };
+        }
+
+        /// Each variant denotes a position in a bitset for a particular feature.
+        ///
+        /// PLEASE: do not use this, it is an implementation detail subject
+        /// to change.
+        #[doc(hidden)]
+        #[allow(non_camel_case_types)]
+        #[derive(Copy, Clone)]
+        #[repr(u8)]
+        #[unstable(feature = "stdsimd_internal", issue = "none")]
+        pub(crate) enum Feature {
+            $(
+                $(#[$feature_comment])*
+                $feature,
+            )*
+
+            // Do not add variants after last:
+            _last
+        }
+
+        impl Feature {
+            pub(crate) fn to_str(self) -> &'static str {
+                match self {
+                    $(Feature::$feature => $feature_lit,)*
+                    Feature::_last => unreachable!(),
+                }
+            }
+            #[cfg(feature = "std_detect_env_override")]
+            pub(crate) fn from_str(s: &str) -> Result<Feature, ()> {
+                match s {
+                    $($feature_lit => Ok(Feature::$feature),)*
+                    _ => Err(())
+                }
+            }
+        }
+
+        /// Each function performs run-time feature detection for a single
+        /// feature. This allow us to use stability attributes on a per feature
+        /// basis.
+        ///
+        /// PLEASE: do not use this, it is an implementation detail subject
+        /// to change.
+        #[doc(hidden)]
+        pub mod __is_feature_detected {
+            $(
+
+                /// PLEASE: do not use this, it is an implementation detail
+                /// subject to change.
+                #[inline]
+                #[doc(hidden)]
+                #[$stability_attr]
+                pub fn $feature() -> bool {
+                    cfg!(target_feature = $feature_lit) ||
+                        $crate::detect::check_for($crate::detect::Feature::$feature)
+                }
+            )*
+        }
+    };
+}
diff --git a/src/stdarch/crates/std_detect/src/detect/mod.rs b/src/stdarch/crates/std_detect/src/detect/mod.rs
index 80207daad8..e8cce6e5dc 100644
--- a/src/stdarch/crates/std_detect/src/detect/mod.rs
+++ b/src/stdarch/crates/std_detect/src/detect/mod.rs
@@ -17,9 +17,14 @@
 //! due to security concerns (x86 is the big exception). These functions are
 //! implemented in the `os/{target_os}.rs` modules.
 
+use cfg_if::cfg_if;
+
 #[macro_use]
 mod error_macros;
 
+#[macro_use]
+mod macros;
+
 cfg_if! {
     if #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] {
         #[path = "arch/x86.rs"]
@@ -52,13 +57,29 @@ cfg_if! {
     } else {
         // Unimplemented architecture:
         mod arch {
-            pub enum Feature {
+            #[doc(hidden)]
+            pub(crate) enum Feature {
                 Null
             }
+            #[doc(hidden)]
+            pub mod __is_feature_detected {}
+
+            impl Feature {
+                #[doc(hidden)]
+                pub(crate) fn from_str(_s: &str) -> Result<Feature, ()> { Err(()) }
+                #[doc(hidden)]
+                pub(crate) fn to_str(self) -> &'static str { "" }
+            }
         }
     }
 }
-pub use self::arch::Feature;
+
+// This module needs to be public because the `is_{arch}_feature_detected!`
+// macros expand calls to items within it in user crates.
+#[doc(hidden)]
+pub use self::arch::__is_feature_detected;
+
+pub(crate) use self::arch::Feature;
 
 mod bit;
 mod cache;
@@ -85,9 +106,45 @@ cfg_if! {
         mod aarch64;
         #[path = "os/freebsd/mod.rs"]
         mod os;
+    } else if #[cfg(all(target_os = "windows", target_arch = "aarch64"))] {
+        #[path = "os/windows/aarch64.rs"]
+        mod os;
     } else {
         #[path = "os/other.rs"]
         mod os;
     }
 }
-pub use self::os::check_for;
+
+/// Performs run-time feature detection.
+#[inline]
+fn check_for(x: Feature) -> bool {
+    cache::test(x as u32, self::os::detect_features)
+}
+
+/// Returns an `Iterator<Item=(&'static str, bool)>` where
+/// `Item.0` is the feature name, and `Item.1` is a `bool` which
+/// is `true` if the feature is supported by the host and `false` otherwise.
+#[unstable(feature = "stdsimd", issue = "27731")]
+pub fn features() -> impl Iterator<Item = (&'static str, bool)> {
+    cfg_if! {
+        if #[cfg(any(
+            target_arch = "x86",
+            target_arch = "x86_64",
+            target_arch = "arm",
+            target_arch = "aarch64",
+            target_arch = "powerpc",
+            target_arch = "powerpc64",
+            target_arch = "mips",
+            target_arch = "mips64",
+        ))] {
+            (0_u8..Feature::_last as u8).map(|discriminant: u8| {
+                let f: Feature = unsafe { crate::mem::transmute(discriminant) };
+                let name: &'static str = f.to_str();
+                let enabled: bool = check_for(f);
+                (name, enabled)
+            })
+        } else {
+            None.into_iter()
+        }
+    }
+}
diff --git a/src/stdarch/crates/std_detect/src/detect/os/aarch64.rs b/src/stdarch/crates/std_detect/src/detect/os/aarch64.rs
index dfb8c87707..9adc938a26 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/aarch64.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/aarch64.rs
@@ -16,7 +16,7 @@
 //! - [Zircon implementation](https://fuchsia.googlesource.com/zircon/+/master/kernel/arch/arm64/feature.cpp)
 //! - [Linux documentation](https://www.kernel.org/doc/Documentation/arm64/cpu-feature-registers.txt)
 
-use crate::detect::{Feature, cache};
+use crate::detect::{cache, Feature};
 
 /// Try to read the features from the system registers.
 ///
@@ -33,7 +33,9 @@ pub(crate) fn detect_features() -> cache::Initializer {
 
         // ID_AA64ISAR0_EL1 - Instruction Set Attribute Register 0
         let aa64isar0: u64;
-        unsafe { asm!("mrs $0, ID_AA64ISAR0_EL1" : "=r"(aa64isar0)); }
+        unsafe {
+            asm!("mrs $0, ID_AA64ISAR0_EL1" : "=r"(aa64isar0));
+        }
 
         let aes = bits_shift(aa64isar0, 7, 4) >= 1;
         let pmull = bits_shift(aa64isar0, 7, 4) >= 2;
@@ -47,7 +49,9 @@ pub(crate) fn detect_features() -> cache::Initializer {
 
         // ID_AA64PFR0_EL1 - Processor Feature Register 0
         let aa64pfr0: u64;
-        unsafe { asm!("mrs $0, ID_AA64PFR0_EL1" : "=r"(aa64pfr0)); }
+        unsafe {
+            asm!("mrs $0, ID_AA64PFR0_EL1" : "=r"(aa64pfr0));
+        }
 
         let fp = bits_shift(aa64pfr0, 19, 16) < 0xF;
         let fphp = bits_shift(aa64pfr0, 19, 16) >= 1;
@@ -60,12 +64,17 @@ pub(crate) fn detect_features() -> cache::Initializer {
         enable_feature(Feature::asimd, fp && asimd && (!fphp | asimdhp));
         // SIMD extensions require SIMD support:
         enable_feature(Feature::rdm, asimd && bits_shift(aa64isar0, 31, 28) >= 1);
-        enable_feature(Feature::dotprod, asimd && bits_shift(aa64isar0, 47, 44) >= 1);
+        enable_feature(
+            Feature::dotprod,
+            asimd && bits_shift(aa64isar0, 47, 44) >= 1,
+        );
         enable_feature(Feature::sve, asimd && bits_shift(aa64pfr0, 35, 32) >= 1);
 
         // ID_AA64ISAR1_EL1 - Instruction Set Attribute Register 1
         let aa64isar1: u64;
-        unsafe { asm!("mrs $0, ID_AA64ISAR1_EL1" : "=r"(aa64isar1)); }
+        unsafe {
+            asm!("mrs $0, ID_AA64ISAR1_EL1" : "=r"(aa64isar1));
+        }
 
         enable_feature(Feature::rcpc, bits_shift(aa64isar1, 23, 20) >= 1);
     }
diff --git a/src/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs b/src/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
index 910d2f33b3..e5df9ba4c9 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/freebsd/aarch64.rs
@@ -1,13 +1,6 @@
 //! Run-time feature detection for Aarch64 on FreeBSD.
 
-use crate::detect::{Feature, cache};
-use super::super::aarch64::detect_features;
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+pub use super::super::aarch64::detect_features;
 
 #[cfg(test)]
 mod tests {
diff --git a/src/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs b/src/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs
index e13847dcbd..4c9d763b44 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/freebsd/arm.rs
@@ -1,16 +1,10 @@
 //! Run-time feature detection for ARM on FreeBSD
 
-use crate::detect::{Feature, cache};
-use super::{auxvec};
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+use super::auxvec;
+use crate::detect::{cache, Feature};
 
 /// Try to read the features from the auxiliary vector
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
     let enable_feature = |value: &mut cache::Initializer, f, enable| {
         if enable {
diff --git a/src/stdarch/crates/std_detect/src/detect/os/freebsd/auxvec.rs b/src/stdarch/crates/std_detect/src/detect/os/freebsd/auxvec.rs
index a2bac76760..c595ec459b 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/freebsd/auxvec.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/freebsd/auxvec.rs
@@ -44,13 +44,13 @@ pub(crate) fn auxv() -> Result<AuxVec, ()> {
 fn archauxv(key: usize) -> Result<usize, ()> {
     use crate::mem;
 
-    #[derive (Copy, Clone)]
+    #[derive(Copy, Clone)]
     #[repr(C)]
     pub struct Elf_Auxinfo {
         pub a_type: usize,
         pub a_un: unnamed,
     }
-    #[derive (Copy, Clone)]
+    #[derive(Copy, Clone)]
     #[repr(C)]
     pub union unnamed {
         pub a_val: libc::c_long,
@@ -58,22 +58,30 @@ fn archauxv(key: usize) -> Result<usize, ()> {
         pub a_fcn: Option<unsafe extern "C" fn() -> ()>,
     }
 
-    let mut auxv: [Elf_Auxinfo; 27] =
-        [Elf_Auxinfo{a_type: 0, a_un: unnamed{a_val: 0,},}; 27];
+    let mut auxv: [Elf_Auxinfo; 27] = [Elf_Auxinfo {
+        a_type: 0,
+        a_un: unnamed { a_val: 0 },
+    }; 27];
 
     let mut len: libc::c_uint = mem::size_of_val(&auxv) as libc::c_uint;
 
     unsafe {
-        let mut mib = [libc::CTL_KERN, libc::KERN_PROC, libc::KERN_PROC_AUXV, libc::getpid()];
-    
-        let ret = libc::sysctl(mib.as_mut_ptr(),
-                       mib.len() as u32,
-                       &mut auxv as *mut _ as *mut _,
-                       &mut len as *mut _ as *mut _,
-                       0 as *mut libc::c_void,
-                       0,
-                );
-    
+        let mut mib = [
+            libc::CTL_KERN,
+            libc::KERN_PROC,
+            libc::KERN_PROC_AUXV,
+            libc::getpid(),
+        ];
+
+        let ret = libc::sysctl(
+            mib.as_mut_ptr(),
+            mib.len() as u32,
+            &mut auxv as *mut _ as *mut _,
+            &mut len as *mut _ as *mut _,
+            0 as *mut libc::c_void,
+            0,
+        );
+
         if ret != -1 {
             for i in 0..auxv.len() {
                 if auxv[i].a_type == key {
diff --git a/src/stdarch/crates/std_detect/src/detect/os/freebsd/mod.rs b/src/stdarch/crates/std_detect/src/detect/os/freebsd/mod.rs
index 1a5338a355..4321bce74d 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/freebsd/mod.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/freebsd/mod.rs
@@ -2,7 +2,7 @@
 
 mod auxvec;
 
-cfg_if! {
+cfg_if::cfg_if! {
     if #[cfg(target_arch = "aarch64")] {
         mod aarch64;
         pub use self::aarch64::check_for;
diff --git a/src/stdarch/crates/std_detect/src/detect/os/freebsd/powerpc.rs b/src/stdarch/crates/std_detect/src/detect/os/freebsd/powerpc.rs
index c7f761d4d6..6bfab631a9 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/freebsd/powerpc.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/freebsd/powerpc.rs
@@ -1,15 +1,9 @@
 //! Run-time feature detection for PowerPC on FreeBSD.
 
-use crate::detect::{Feature, cache};
-use super::{auxvec};
+use super::auxvec;
+use crate::detect::{cache, Feature};
 
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
-
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
     let enable_feature = |value: &mut cache::Initializer, f, enable| {
         if enable {
diff --git a/src/stdarch/crates/std_detect/src/detect/os/linux/aarch64.rs b/src/stdarch/crates/std_detect/src/detect/os/linux/aarch64.rs
index f7dc0f0222..b1b68f763e 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/linux/aarch64.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/linux/aarch64.rs
@@ -1,17 +1,11 @@
 //! Run-time feature detection for Aarch64 on Linux.
 
-use crate::detect::{Feature, cache, bit};
 use super::{auxvec, cpuinfo};
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+use crate::detect::{bit, cache, Feature};
 
 /// Try to read the features from the auxiliary vector, and if that fails, try
 /// to read them from /proc/cpuinfo.
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     if let Ok(auxv) = auxvec::auxv() {
         let hwcap: AtHwcap = auxv.into();
         return hwcap.cache();
@@ -27,16 +21,16 @@ fn detect_features() -> cache::Initializer {
 ///
 /// [hwcap]: https://github.com/torvalds/linux/blob/master/arch/arm64/include/uapi/asm/hwcap.h
 struct AtHwcap {
-    fp: bool, // 0
+    fp: bool,    // 0
     asimd: bool, // 1
     // evtstrm: bool, // 2
-    aes: bool, // 3
-    pmull: bool, // 4
-    sha1: bool, // 5
-    sha2: bool, // 6
-    crc32: bool, // 7
+    aes: bool,     // 3
+    pmull: bool,   // 4
+    sha1: bool,    // 5
+    sha2: bool,    // 6
+    crc32: bool,   // 7
     atomics: bool, // 8
-    fphp: bool, // 9
+    fphp: bool,    // 9
     asimdhp: bool, // 10
     // cpuid: bool, // 11
     asimdrdm: bool, // 12
@@ -150,7 +144,10 @@ impl AtHwcap {
             enable_feature(Feature::sve, self.sve && asimd);
 
             // Crypto is specified as AES + PMULL + SHA1 + SHA2 per LLVM/hosts.cpp
-            enable_feature(Feature::crypto, self.aes && self.pmull && self.sha1 && self.sha2);
+            enable_feature(
+                Feature::crypto,
+                self.aes && self.pmull && self.sha1 && self.sha2,
+            );
         }
         value
     }
diff --git a/src/stdarch/crates/std_detect/src/detect/os/linux/arm.rs b/src/stdarch/crates/std_detect/src/detect/os/linux/arm.rs
index 0d58a847cd..f55bc30b84 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/linux/arm.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/linux/arm.rs
@@ -1,17 +1,11 @@
 //! Run-time feature detection for ARM on Linux.
 
-use crate::detect::{Feature, cache, bit};
 use super::{auxvec, cpuinfo};
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+use crate::detect::{bit, cache, Feature};
 
 /// Try to read the features from the auxiliary vector, and if that fails, try
 /// to read them from /proc/cpuinfo.
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
     let enable_feature = |value: &mut cache::Initializer, f, enable| {
         if enable {
@@ -21,17 +15,22 @@ fn detect_features() -> cache::Initializer {
 
     // The values are part of the platform-specific [asm/hwcap.h][hwcap]
     //
-    // [hwcap]: https://github.com/torvalds/linux/blob/master/arch/arm64/include/uapi/asm/hwcap.h
+    // [hwcap]: https://github.com/torvalds/linux/blob/master/arch/arm/include/uapi/asm/hwcap.h
     if let Ok(auxv) = auxvec::auxv() {
         enable_feature(&mut value, Feature::neon, bit::test(auxv.hwcap, 12));
         enable_feature(&mut value, Feature::pmull, bit::test(auxv.hwcap2, 1));
+        enable_feature(&mut value, Feature::crc, bit::test(auxv.hwcap2, 4));
         return value;
     }
 
     if let Ok(c) = cpuinfo::CpuInfo::new() {
-        enable_feature(&mut value, Feature::neon, c.field("Features").has("neon") &&
-            !has_broken_neon(&c));
+        enable_feature(
+            &mut value,
+            Feature::neon,
+            c.field("Features").has("neon") && !has_broken_neon(&c),
+        );
         enable_feature(&mut value, Feature::pmull, c.field("Features").has("pmull"));
+        enable_feature(&mut value, Feature::crc, c.field("Features").has("crc32"));
         return value;
     }
     value
diff --git a/src/stdarch/crates/std_detect/src/detect/os/linux/auxvec.rs b/src/stdarch/crates/std_detect/src/detect/os/linux/auxvec.rs
index 07b6432eaf..6ebae67fbf 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/linux/auxvec.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/linux/auxvec.rs
@@ -51,12 +51,12 @@ pub(crate) struct AuxVec {
 /// [auxvec_h]: https://github.com/torvalds/linux/blob/master/include/uapi/linux/auxvec.h
 /// [auxv_docs]: https://docs.rs/auxv/0.3.3/auxv/
 pub(crate) fn auxv() -> Result<AuxVec, ()> {
-    #[cfg(feature = "std_detect_dlsym_getauxval")] {
+    #[cfg(feature = "std_detect_dlsym_getauxval")]
+    {
         // Try to call a dynamically-linked getauxval function.
         if let Ok(hwcap) = getauxval(AT_HWCAP) {
             // Targets with only AT_HWCAP:
-            #[cfg(any(target_arch = "aarch64", target_arch = "mips",
-                      target_arch = "mips64"))]
+            #[cfg(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64"))]
             {
                 if hwcap != 0 {
                     return Ok(AuxVec { hwcap });
@@ -74,22 +74,24 @@ pub(crate) fn auxv() -> Result<AuxVec, ()> {
             }
             drop(hwcap);
         }
-        #[cfg(feature = "std_detect_file_io")] {
+        #[cfg(feature = "std_detect_file_io")]
+        {
             // If calling getauxval fails, try to read the auxiliary vector from
             // its file:
             auxv_from_file("/proc/self/auxv")
         }
-        #[cfg(not(feature = "std_detect_file_io"))] {
+        #[cfg(not(feature = "std_detect_file_io"))]
+        {
             Err(())
         }
     }
 
-    #[cfg(not(feature = "std_detect_dlsym_getauxval"))] {
+    #[cfg(not(feature = "std_detect_dlsym_getauxval"))]
+    {
         let hwcap = unsafe { ffi_getauxval(AT_HWCAP) };
 
         // Targets with only AT_HWCAP:
-        #[cfg(any(target_arch = "aarch64", target_arch = "mips",
-                  target_arch = "mips64"))]
+        #[cfg(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64"))]
         {
             if hwcap != 0 {
                 return Ok(AuxVec { hwcap });
@@ -115,10 +117,7 @@ fn getauxval(key: usize) -> Result<usize, ()> {
     use libc;
     pub type F = unsafe extern "C" fn(usize) -> usize;
     unsafe {
-        let ptr = libc::dlsym(
-            libc::RTLD_DEFAULT,
-            "getauxval\0".as_ptr() as *const _,
-        );
+        let ptr = libc::dlsym(libc::RTLD_DEFAULT, "getauxval\0".as_ptr() as *const _);
         if ptr.is_null() {
             return Err(());
         }
@@ -141,8 +140,7 @@ fn auxv_from_file(file: &str) -> Result<AuxVec, ()> {
     // 2*32 `usize` elements is enough to read the whole vector.
     let mut buf = [0_usize; 64];
     {
-        let raw: &mut [u8; 64 * mem::size_of::<usize>()] =
-            unsafe { mem::transmute(&mut buf) };
+        let raw: &mut [u8; 64 * mem::size_of::<usize>()] = unsafe { mem::transmute(&mut buf) };
         file.read(raw).map_err(|_| ())?;
     }
     auxv_from_buf(&buf)
@@ -153,8 +151,7 @@ fn auxv_from_file(file: &str) -> Result<AuxVec, ()> {
 #[cfg(feature = "std_detect_file_io")]
 fn auxv_from_buf(buf: &[usize; 64]) -> Result<AuxVec, ()> {
     // Targets with only AT_HWCAP:
-    #[cfg(any(target_arch = "aarch64", target_arch = "mips",
-              target_arch = "mips64"))]
+    #[cfg(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64"))]
     {
         for el in buf.chunks(2) {
             match el[0] {
@@ -193,8 +190,8 @@ mod tests {
     // using the auxv crate.
     #[cfg(feature = "std_detect_file_io")]
     fn auxv_crate_getprocfs(key: usize) -> Option<usize> {
-        use self::auxv_crate::AuxvType;
         use self::auxv_crate::procfs::search_procfs_auxv;
+        use self::auxv_crate::AuxvType;
         let k = key as AuxvType;
         match search_procfs_auxv(&[k]) {
             Ok(v) => Some(v[&k] as usize),
@@ -206,8 +203,8 @@ mod tests {
     // using the auxv crate.
     #[cfg(not(any(target_arch = "mips", target_arch = "mips64")))]
     fn auxv_crate_getauxval(key: usize) -> Option<usize> {
-        use self::auxv_crate::AuxvType;
         use self::auxv_crate::getauxval::Getauxval;
+        use self::auxv_crate::AuxvType;
         let q = auxv_crate::getauxval::NativeGetauxval {};
         match q.getauxval(key as AuxvType) {
             Ok(v) => Some(v as usize),
diff --git a/src/stdarch/crates/std_detect/src/detect/os/linux/cpuinfo.rs b/src/stdarch/crates/std_detect/src/detect/os/linux/cpuinfo.rs
index b316857853..f76c48a4b1 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/linux/cpuinfo.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/linux/cpuinfo.rs
@@ -2,7 +2,7 @@
 #![cfg_attr(not(target_arch = "arm"), allow(dead_code))]
 
 extern crate std;
-use self::std::{prelude::v1::*, fs::File, io, io::Read};
+use self::std::{fs::File, io, io::Read, prelude::v1::*};
 
 /// cpuinfo
 pub(crate) struct CpuInfo {
@@ -150,8 +150,7 @@ power management:
         assert!(!cpuinfo.field("flags").has("avx"));
     }
 
-    const ARM_CORTEX_A53: &str =
-        r"Processor   : AArch64 Processor rev 3 (aarch64)
+    const ARM_CORTEX_A53: &str = r"Processor   : AArch64 Processor rev 3 (aarch64)
         processor   : 0
         processor   : 1
         processor   : 2
diff --git a/src/stdarch/crates/std_detect/src/detect/os/linux/mips.rs b/src/stdarch/crates/std_detect/src/detect/os/linux/mips.rs
index c0a5fb2e5d..9c030f41a0 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/linux/mips.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/linux/mips.rs
@@ -1,17 +1,11 @@
 //! Run-time feature detection for MIPS on Linux.
 
-use crate::detect::{Feature, cache, bit};
 use super::auxvec;
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+use crate::detect::{bit, cache, Feature};
 
 /// Try to read the features from the auxiliary vector, and if that fails, try
 /// to read them from `/proc/cpuinfo`.
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
     let enable_feature = |value: &mut cache::Initializer, f, enable| {
         if enable {
diff --git a/src/stdarch/crates/std_detect/src/detect/os/linux/powerpc.rs b/src/stdarch/crates/std_detect/src/detect/os/linux/powerpc.rs
index 1c08a58443..97afe49fe5 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/linux/powerpc.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/linux/powerpc.rs
@@ -1,17 +1,11 @@
 //! Run-time feature detection for PowerPC on Linux.
 
-use crate::detect::{Feature, cache};
 use super::{auxvec, cpuinfo};
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+use crate::detect::{cache, Feature};
 
 /// Try to read the features from the auxiliary vector, and if that fails, try
 /// to read them from /proc/cpuinfo.
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
     let enable_feature = |value: &mut cache::Initializer, f, enable| {
         if enable {
diff --git a/src/stdarch/crates/std_detect/src/detect/os/other.rs b/src/stdarch/crates/std_detect/src/detect/os/other.rs
index 23e399ea79..bf7be87f07 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/other.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/other.rs
@@ -1,9 +1,7 @@
 //! Other operating systems
 
-use crate::detect::Feature;
+use crate::detect::cache;
 
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(_x: Feature) -> bool {
-    false
+pub(crate) fn detect_features() -> cache::Initializer {
+    cache::Initializer::default()
 }
diff --git a/src/stdarch/crates/std_detect/src/detect/os/windows/aarch64.rs b/src/stdarch/crates/std_detect/src/detect/os/windows/aarch64.rs
new file mode 100644
index 0000000000..3c5edfb44a
--- /dev/null
+++ b/src/stdarch/crates/std_detect/src/detect/os/windows/aarch64.rs
@@ -0,0 +1,55 @@
+//! Run-time feature detection for Aarch64 on Windows.
+
+use crate::detect::{cache, Feature};
+
+/// Try to read the features using IsProcessorFeaturePresent.
+pub(crate) fn detect_features() -> cache::Initializer {
+    type DWORD = u32;
+    type BOOL = i32;
+
+    const FALSE: BOOL = 0;
+    // The following Microsoft documents isn't updated for aarch64.
+    // https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-isprocessorfeaturepresent
+    // These are defined in winnt.h of Windows SDK
+    const PF_ARM_NEON_INSTRUCTIONS_AVAILABLE: u32 = 19;
+    const PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE: u32 = 30;
+    const PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE: u32 = 31;
+
+    extern "system" {
+        pub fn IsProcessorFeaturePresent(ProcessorFeature: DWORD) -> BOOL;
+    }
+
+    let mut value = cache::Initializer::default();
+    {
+        let mut enable_feature = |f, enable| {
+            if enable {
+                value.set(f as u32);
+            }
+        };
+
+        // Some features such Feature::fp may be supported on current CPU,
+        // but no way to detect it by OS API.
+        // Also, we require unsafe block for the extern "system" calls.
+        unsafe {
+            enable_feature(
+                Feature::asimd,
+                IsProcessorFeaturePresent(PF_ARM_NEON_INSTRUCTIONS_AVAILABLE) != FALSE,
+            );
+            enable_feature(
+                Feature::crc,
+                IsProcessorFeaturePresent(PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE) != FALSE,
+            );
+            // PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE means aes, sha1, sha2 and
+            // pmull support
+            enable_feature(
+                Feature::crypto,
+                IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) != FALSE,
+            );
+            enable_feature(
+                Feature::pmull,
+                IsProcessorFeaturePresent(PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE) != FALSE,
+            );
+        }
+    }
+    value
+}
diff --git a/src/stdarch/crates/std_detect/src/detect/os/x86.rs b/src/stdarch/crates/std_detect/src/detect/os/x86.rs
index 9257b8a4be..436fb00f06 100644
--- a/src/stdarch/crates/std_detect/src/detect/os/x86.rs
+++ b/src/stdarch/crates/std_detect/src/detect/os/x86.rs
@@ -7,13 +7,7 @@ use crate::arch::x86_64::*;
 
 use crate::mem;
 
-use crate::detect::{Feature, cache, bit};
-
-/// Performs run-time feature detection.
-#[inline]
-pub fn check_for(x: Feature) -> bool {
-    cache::test(x as u32, detect_features)
-}
+use crate::detect::{bit, cache, Feature};
 
 /// Run-time feature detection on x86 works by using the CPUID instruction.
 ///
@@ -31,7 +25,7 @@ pub fn check_for(x: Feature) -> bool {
 /// [intel64_ref]: http://www.intel.de/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.pdf
 /// [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
 #[allow(clippy::similar_names)]
-fn detect_features() -> cache::Initializer {
+pub(crate) fn detect_features() -> cache::Initializer {
     let mut value = cache::Initializer::default();
 
     // If the x86 CPU does not support the CPUID instruction then it is too
@@ -79,8 +73,7 @@ fn detect_features() -> cache::Initializer {
 
     // EAX = 7, ECX = 0: Queries "Extended Features";
     // Contains information about bmi,bmi2, and avx2 support.
-    let (extended_features_ebx, extended_features_ecx) = if max_basic_leaf >= 7
-    {
+    let (extended_features_ebx, extended_features_ecx) = if max_basic_leaf >= 7 {
         let CpuidResult { ebx, ecx, .. } = unsafe { __cpuid(0x0000_0007_u32) };
         (ebx, ecx)
     } else {
@@ -132,7 +125,7 @@ fn detect_features() -> cache::Initializer {
         enable(proc_info_edx, 26, Feature::sse2);
         enable(extended_features_ebx, 29, Feature::sha);
 
-        enable(extended_features_ebx, 3, Feature::bmi);
+        enable(extended_features_ebx, 3, Feature::bmi1);
         enable(extended_features_ebx, 8, Feature::bmi2);
 
         // `XSAVE` and `AVX` support:
@@ -209,18 +202,22 @@ fn detect_features() -> cache::Initializer {
                     if os_avx512_support {
                         enable(extended_features_ebx, 16, Feature::avx512f);
                         enable(extended_features_ebx, 17, Feature::avx512dq);
-                        enable(extended_features_ebx, 21, Feature::avx512_ifma);
+                        enable(extended_features_ebx, 21, Feature::avx512ifma);
                         enable(extended_features_ebx, 26, Feature::avx512pf);
                         enable(extended_features_ebx, 27, Feature::avx512er);
                         enable(extended_features_ebx, 28, Feature::avx512cd);
                         enable(extended_features_ebx, 30, Feature::avx512bw);
                         enable(extended_features_ebx, 31, Feature::avx512vl);
-                        enable(extended_features_ecx, 1, Feature::avx512_vbmi);
-                        enable(
-                            extended_features_ecx,
-                            14,
-                            Feature::avx512_vpopcntdq,
-                        );
+                        enable(extended_features_ecx, 1, Feature::avx512vbmi);
+                        enable(extended_features_ecx, 5, Feature::avx512bf16);
+                        enable(extended_features_ecx, 6, Feature::avx512vbmi2);
+                        enable(extended_features_ecx, 8, Feature::avx512gfni);
+                        enable(extended_features_ecx, 8, Feature::avx512vp2intersect);
+                        enable(extended_features_ecx, 9, Feature::avx512vaes);
+                        enable(extended_features_ecx, 10, Feature::avx512vpclmulqdq);
+                        enable(extended_features_ecx, 11, Feature::avx512vnni);
+                        enable(extended_features_ecx, 12, Feature::avx512bitalg);
+                        enable(extended_features_ecx, 14, Feature::avx512vpopcntdq);
                     }
                 }
             }
@@ -233,7 +230,8 @@ fn detect_features() -> cache::Initializer {
         //
         // The `is_x86_feature_detected!("lzcnt")` macro then
         // internally maps to Feature::abm.
-        enable(extended_proc_info_ecx, 5, Feature::abm);
+        enable(extended_proc_info_ecx, 5, Feature::lzcnt);
+
         // As Hygon Dhyana originates from AMD technology and shares most of the architecture with
         // AMD's family 17h, but with different CPU Vendor ID("HygonGenuine")/Family series
         // number(Family 18h).
@@ -253,123 +251,3 @@ fn detect_features() -> cache::Initializer {
 
     value
 }
-
-#[cfg(test)]
-mod tests {
-    extern crate cupid;
-
-    #[test]
-    fn dump() {
-        println!("aes: {:?}", is_x86_feature_detected!("aes"));
-        println!("pclmulqdq: {:?}", is_x86_feature_detected!("pclmulqdq"));
-        println!("rdrand: {:?}", is_x86_feature_detected!("rdrand"));
-        println!("rdseed: {:?}", is_x86_feature_detected!("rdseed"));
-        println!("tsc: {:?}", is_x86_feature_detected!("tsc"));
-        println!("sse: {:?}", is_x86_feature_detected!("sse"));
-        println!("sse2: {:?}", is_x86_feature_detected!("sse2"));
-        println!("sse3: {:?}", is_x86_feature_detected!("sse3"));
-        println!("ssse3: {:?}", is_x86_feature_detected!("ssse3"));
-        println!("sse4.1: {:?}", is_x86_feature_detected!("sse4.1"));
-        println!("sse4.2: {:?}", is_x86_feature_detected!("sse4.2"));
-        println!("sse4a: {:?}", is_x86_feature_detected!("sse4a"));
-        println!("sha: {:?}", is_x86_feature_detected!("sha"));
-        println!("avx: {:?}", is_x86_feature_detected!("avx"));
-        println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
-        println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
-        println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
-        println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
-        println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
-        println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
-        println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
-        println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
-        println!("avx512_ifma {:?}", is_x86_feature_detected!("avx512ifma"));
-        println!("avx512_vbmi {:?}", is_x86_feature_detected!("avx512vbmi"));
-        println!(
-            "avx512_vpopcntdq {:?}",
-            is_x86_feature_detected!("avx512vpopcntdq")
-        );
-        println!("fma: {:?}", is_x86_feature_detected!("fma"));
-        println!("abm: {:?}", is_x86_feature_detected!("abm"));
-        println!("bmi: {:?}", is_x86_feature_detected!("bmi1"));
-        println!("bmi2: {:?}", is_x86_feature_detected!("bmi2"));
-        println!("tbm: {:?}", is_x86_feature_detected!("tbm"));
-        println!("popcnt: {:?}", is_x86_feature_detected!("popcnt"));
-        println!("lzcnt: {:?}", is_x86_feature_detected!("lzcnt"));
-        println!("fxsr: {:?}", is_x86_feature_detected!("fxsr"));
-        println!("xsave: {:?}", is_x86_feature_detected!("xsave"));
-        println!("xsaveopt: {:?}", is_x86_feature_detected!("xsaveopt"));
-        println!("xsaves: {:?}", is_x86_feature_detected!("xsaves"));
-        println!("xsavec: {:?}", is_x86_feature_detected!("xsavec"));
-        println!("cmpxchg16b: {:?}", is_x86_feature_detected!("cmpxchg16b"));
-        println!("adx: {:?}", is_x86_feature_detected!("adx"));
-        println!("rtm: {:?}", is_x86_feature_detected!("rtm"));
-    }
-
-    #[test]
-    fn compare_with_cupid() {
-        let information = cupid::master().unwrap();
-        assert_eq!(is_x86_feature_detected!("aes"), information.aesni());
-        assert_eq!(is_x86_feature_detected!("pclmulqdq"), information.pclmulqdq());
-        assert_eq!(is_x86_feature_detected!("rdrand"), information.rdrand());
-        assert_eq!(is_x86_feature_detected!("rdseed"), information.rdseed());
-        assert_eq!(is_x86_feature_detected!("tsc"), information.tsc());
-        assert_eq!(is_x86_feature_detected!("sse"), information.sse());
-        assert_eq!(is_x86_feature_detected!("sse2"), information.sse2());
-        assert_eq!(is_x86_feature_detected!("sse3"), information.sse3());
-        assert_eq!(is_x86_feature_detected!("ssse3"), information.ssse3());
-        assert_eq!(is_x86_feature_detected!("sse4.1"), information.sse4_1());
-        assert_eq!(is_x86_feature_detected!("sse4.2"), information.sse4_2());
-        assert_eq!(is_x86_feature_detected!("sse4a"), information.sse4a());
-        assert_eq!(is_x86_feature_detected!("sha"), information.sha());
-        assert_eq!(is_x86_feature_detected!("avx"), information.avx());
-        assert_eq!(is_x86_feature_detected!("avx2"), information.avx2());
-        assert_eq!(is_x86_feature_detected!("avx512f"), information.avx512f());
-        assert_eq!(is_x86_feature_detected!("avx512cd"), information.avx512cd());
-        assert_eq!(is_x86_feature_detected!("avx512er"), information.avx512er());
-        assert_eq!(is_x86_feature_detected!("avx512pf"), information.avx512pf());
-        assert_eq!(is_x86_feature_detected!("avx512bw"), information.avx512bw());
-        assert_eq!(is_x86_feature_detected!("avx512dq"), information.avx512dq());
-        assert_eq!(is_x86_feature_detected!("avx512vl"), information.avx512vl());
-        assert_eq!(
-            is_x86_feature_detected!("avx512ifma"),
-            information.avx512_ifma()
-        );
-        assert_eq!(
-            is_x86_feature_detected!("avx512vbmi"),
-            information.avx512_vbmi()
-        );
-        assert_eq!(
-            is_x86_feature_detected!("avx512vpopcntdq"),
-            information.avx512_vpopcntdq()
-        );
-        assert_eq!(is_x86_feature_detected!("fma"), information.fma());
-        assert_eq!(is_x86_feature_detected!("bmi1"), information.bmi1());
-        assert_eq!(is_x86_feature_detected!("bmi2"), information.bmi2());
-        assert_eq!(is_x86_feature_detected!("popcnt"), information.popcnt());
-        assert_eq!(is_x86_feature_detected!("abm"), information.lzcnt());
-        assert_eq!(is_x86_feature_detected!("tbm"), information.tbm());
-        assert_eq!(is_x86_feature_detected!("lzcnt"), information.lzcnt());
-        assert_eq!(is_x86_feature_detected!("xsave"), information.xsave());
-        assert_eq!(is_x86_feature_detected!("xsaveopt"), information.xsaveopt());
-        assert_eq!(
-            is_x86_feature_detected!("xsavec"),
-            information.xsavec_and_xrstor()
-        );
-        assert_eq!(
-            is_x86_feature_detected!("xsaves"),
-            information.xsaves_xrstors_and_ia32_xss()
-        );
-        assert_eq!(
-            is_x86_feature_detected!("cmpxchg16b"),
-            information.cmpxchg16b(),
-        );
-        assert_eq!(
-            is_x86_feature_detected!("adx"),
-            information.adx(),
-        );
-        assert_eq!(
-            is_x86_feature_detected!("rtm"),
-            information.rtm(),
-        );
-    }
-}
diff --git a/src/stdarch/crates/std_detect/src/lib.rs b/src/stdarch/crates/std_detect/src/lib.rs
index 7737719c3b..88a00e40aa 100644
--- a/src/stdarch/crates/std_detect/src/lib.rs
+++ b/src/stdarch/crates/std_detect/src/lib.rs
@@ -20,16 +20,13 @@
 #![cfg_attr(test, allow(unused_imports))]
 #![no_std]
 
-#[macro_use]
-extern crate cfg_if;
-
-cfg_if! {
-    if #[cfg(feature = "std_detect_file_io")] {
+cfg_if::cfg_if! {
+    if #[cfg(any(feature = "std_detect_file_io", feature = "std_detect_env_override"))] {
         #[cfg_attr(test, macro_use(println))]
         extern crate std;
 
         #[allow(unused_imports)]
-        use std::{arch, fs, io, mem, sync};
+        use std::{arch, env, fs, io, mem, sync};
     } else {
         #[cfg(test)]
         #[macro_use(println)]
diff --git a/src/stdarch/crates/std_detect/tests/cpu-detection.rs b/src/stdarch/crates/std_detect/tests/cpu-detection.rs
index d0c9901c4c..9be40542c9 100644
--- a/src/stdarch/crates/std_detect/tests/cpu-detection.rs
+++ b/src/stdarch/crates/std_detect/tests/cpu-detection.rs
@@ -1,7 +1,6 @@
 #![feature(stdsimd)]
 #![allow(clippy::option_unwrap_used, clippy::use_debug, clippy::print_stdout)]
-
-#[cfg(any(
+#![cfg(any(
     target_arch = "arm",
     target_arch = "aarch64",
     target_arch = "x86",
@@ -9,14 +8,23 @@
     target_arch = "powerpc",
     target_arch = "powerpc64"
 ))]
+
 #[macro_use]
 extern crate std_detect;
 
+#[test]
+fn all() {
+    for (f, e) in std_detect::detect::features() {
+        println!("{}: {}", f, e);
+    }
+}
+
 #[test]
 #[cfg(all(target_arch = "arm", any(target_os = "linux", target_os = "android")))]
 fn arm_linux() {
     println!("neon: {}", is_arm_feature_detected!("neon"));
     println!("pmull: {}", is_arm_feature_detected!("pmull"));
+    println!("crc: {}", is_arm_feature_detected!("crc"));
 }
 
 #[test]
@@ -73,19 +81,36 @@ fn x86_all() {
     println!("sha: {:?}", is_x86_feature_detected!("sha"));
     println!("avx: {:?}", is_x86_feature_detected!("avx"));
     println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
-    println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
-    println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
-    println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
-    println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
-    println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
-    println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
-    println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
-    println!("avx512_ifma {:?}", is_x86_feature_detected!("avx512ifma"));
-    println!("avx512_vbmi {:?}", is_x86_feature_detected!("avx512vbmi"));
+    println!("avx512f: {:?}", is_x86_feature_detected!("avx512f"));
+    println!("avx512cd: {:?}", is_x86_feature_detected!("avx512cd"));
+    println!("avx512er: {:?}", is_x86_feature_detected!("avx512er"));
+    println!("avx512pf: {:?}", is_x86_feature_detected!("avx512pf"));
+    println!("avx512bw: {:?}", is_x86_feature_detected!("avx512bw"));
+    println!("avx512dq: {:?}", is_x86_feature_detected!("avx512dq"));
+    println!("avx512vl: {:?}", is_x86_feature_detected!("avx512vl"));
+    println!("avx512ifma: {:?}", is_x86_feature_detected!("avx512ifma"));
+    println!("avx512vbmi: {:?}", is_x86_feature_detected!("avx512vbmi"));
     println!(
-        "avx512_vpopcntdq {:?}",
+        "avx512vpopcntdq: {:?}",
         is_x86_feature_detected!("avx512vpopcntdq")
     );
+    println!("avx512vbmi2 {:?}", is_x86_feature_detected!("avx512vbmi2"));
+    println!("avx512gfni {:?}", is_x86_feature_detected!("avx512gfni"));
+    println!("avx512vaes {:?}", is_x86_feature_detected!("avx512vaes"));
+    println!(
+        "avx512vpclmulqdq {:?}",
+        is_x86_feature_detected!("avx512vpclmulqdq")
+    );
+    println!("avx512vnni {:?}", is_x86_feature_detected!("avx512vnni"));
+    println!(
+        "avx512bitalg {:?}",
+        is_x86_feature_detected!("avx512bitalg")
+    );
+    println!("avx512bf16 {:?}", is_x86_feature_detected!("avx512bf16"));
+    println!(
+        "avx512vp2intersect {:?}",
+        is_x86_feature_detected!("avx512vp2intersect")
+    );
     println!("f16c: {:?}", is_x86_feature_detected!("f16c"));
     println!("fma: {:?}", is_x86_feature_detected!("fma"));
     println!("bmi1: {:?}", is_x86_feature_detected!("bmi1"));
diff --git a/src/stdarch/crates/std_detect/tests/x86-specific.rs b/src/stdarch/crates/std_detect/tests/x86-specific.rs
new file mode 100644
index 0000000000..d4182644bc
--- /dev/null
+++ b/src/stdarch/crates/std_detect/tests/x86-specific.rs
@@ -0,0 +1,158 @@
+#![feature(stdsimd)]
+#![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+
+extern crate cupid;
+#[macro_use]
+extern crate std_detect;
+
+#[test]
+fn dump() {
+    println!("aes: {:?}", is_x86_feature_detected!("aes"));
+    println!("pclmulqdq: {:?}", is_x86_feature_detected!("pclmulqdq"));
+    println!("rdrand: {:?}", is_x86_feature_detected!("rdrand"));
+    println!("rdseed: {:?}", is_x86_feature_detected!("rdseed"));
+    println!("tsc: {:?}", is_x86_feature_detected!("tsc"));
+    println!("sse: {:?}", is_x86_feature_detected!("sse"));
+    println!("sse2: {:?}", is_x86_feature_detected!("sse2"));
+    println!("sse3: {:?}", is_x86_feature_detected!("sse3"));
+    println!("ssse3: {:?}", is_x86_feature_detected!("ssse3"));
+    println!("sse4.1: {:?}", is_x86_feature_detected!("sse4.1"));
+    println!("sse4.2: {:?}", is_x86_feature_detected!("sse4.2"));
+    println!("sse4a: {:?}", is_x86_feature_detected!("sse4a"));
+    println!("sha: {:?}", is_x86_feature_detected!("sha"));
+    println!("avx: {:?}", is_x86_feature_detected!("avx"));
+    println!("avx2: {:?}", is_x86_feature_detected!("avx2"));
+    println!("avx512f {:?}", is_x86_feature_detected!("avx512f"));
+    println!("avx512cd {:?}", is_x86_feature_detected!("avx512cd"));
+    println!("avx512er {:?}", is_x86_feature_detected!("avx512er"));
+    println!("avx512pf {:?}", is_x86_feature_detected!("avx512pf"));
+    println!("avx512bw {:?}", is_x86_feature_detected!("avx512bw"));
+    println!("avx512dq {:?}", is_x86_feature_detected!("avx512dq"));
+    println!("avx512vl {:?}", is_x86_feature_detected!("avx512vl"));
+    println!("avx512_ifma {:?}", is_x86_feature_detected!("avx512ifma"));
+    println!("avx512_vbmi {:?}", is_x86_feature_detected!("avx512vbmi"));
+    println!(
+        "avx512_vpopcntdq {:?}",
+        is_x86_feature_detected!("avx512vpopcntdq")
+    );
+    println!("avx512vbmi2 {:?}", is_x86_feature_detected!("avx512vbmi2"));
+    println!("avx512gfni {:?}", is_x86_feature_detected!("avx512gfni"));
+    println!("avx512vaes {:?}", is_x86_feature_detected!("avx512vaes"));
+    println!(
+        "avx512vpclmulqdq {:?}",
+        is_x86_feature_detected!("avx512vpclmulqdq")
+    );
+    println!("avx512vnni {:?}", is_x86_feature_detected!("avx512vnni"));
+    println!(
+        "avx512bitalg {:?}",
+        is_x86_feature_detected!("avx512bitalg")
+    );
+    println!("avx512bf16 {:?}", is_x86_feature_detected!("avx512bf16"));
+    println!(
+        "avx512vp2intersect {:?}",
+        is_x86_feature_detected!("avx512vp2intersect")
+    );
+    println!("fma: {:?}", is_x86_feature_detected!("fma"));
+    println!("abm: {:?}", is_x86_feature_detected!("abm"));
+    println!("bmi: {:?}", is_x86_feature_detected!("bmi1"));
+    println!("bmi2: {:?}", is_x86_feature_detected!("bmi2"));
+    println!("tbm: {:?}", is_x86_feature_detected!("tbm"));
+    println!("popcnt: {:?}", is_x86_feature_detected!("popcnt"));
+    println!("lzcnt: {:?}", is_x86_feature_detected!("lzcnt"));
+    println!("fxsr: {:?}", is_x86_feature_detected!("fxsr"));
+    println!("xsave: {:?}", is_x86_feature_detected!("xsave"));
+    println!("xsaveopt: {:?}", is_x86_feature_detected!("xsaveopt"));
+    println!("xsaves: {:?}", is_x86_feature_detected!("xsaves"));
+    println!("xsavec: {:?}", is_x86_feature_detected!("xsavec"));
+    println!("cmpxchg16b: {:?}", is_x86_feature_detected!("cmpxchg16b"));
+    println!("adx: {:?}", is_x86_feature_detected!("adx"));
+    println!("rtm: {:?}", is_x86_feature_detected!("rtm"));
+}
+
+#[cfg(feature = "std_detect_env_override")]
+#[test]
+fn env_override_no_avx() {
+    if let Ok(disable) = std::env::var("RUST_STD_DETECT_UNSTABLE") {
+        let information = cupid::master().unwrap();
+        for d in disable.split(" ") {
+            match d {
+                "avx" => {
+                    if information.avx() {
+                        assert_ne!(is_x86_feature_detected!("avx"), information.avx())
+                    }
+                }
+                "avx2" => {
+                    if information.avx2() {
+                        assert_ne!(is_x86_feature_detected!("avx2"), information.avx2())
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+}
+
+#[test]
+fn compare_with_cupid() {
+    let information = cupid::master().unwrap();
+    assert_eq!(is_x86_feature_detected!("aes"), information.aesni());
+    assert_eq!(
+        is_x86_feature_detected!("pclmulqdq"),
+        information.pclmulqdq()
+    );
+    assert_eq!(is_x86_feature_detected!("rdrand"), information.rdrand());
+    assert_eq!(is_x86_feature_detected!("rdseed"), information.rdseed());
+    assert_eq!(is_x86_feature_detected!("tsc"), information.tsc());
+    assert_eq!(is_x86_feature_detected!("sse"), information.sse());
+    assert_eq!(is_x86_feature_detected!("sse2"), information.sse2());
+    assert_eq!(is_x86_feature_detected!("sse3"), information.sse3());
+    assert_eq!(is_x86_feature_detected!("ssse3"), information.ssse3());
+    assert_eq!(is_x86_feature_detected!("sse4.1"), information.sse4_1());
+    assert_eq!(is_x86_feature_detected!("sse4.2"), information.sse4_2());
+    assert_eq!(is_x86_feature_detected!("sse4a"), information.sse4a());
+    assert_eq!(is_x86_feature_detected!("sha"), information.sha());
+    assert_eq!(is_x86_feature_detected!("avx"), information.avx());
+    assert_eq!(is_x86_feature_detected!("avx2"), information.avx2());
+    assert_eq!(is_x86_feature_detected!("avx512f"), information.avx512f());
+    assert_eq!(is_x86_feature_detected!("avx512cd"), information.avx512cd());
+    assert_eq!(is_x86_feature_detected!("avx512er"), information.avx512er());
+    assert_eq!(is_x86_feature_detected!("avx512pf"), information.avx512pf());
+    assert_eq!(is_x86_feature_detected!("avx512bw"), information.avx512bw());
+    assert_eq!(is_x86_feature_detected!("avx512dq"), information.avx512dq());
+    assert_eq!(is_x86_feature_detected!("avx512vl"), information.avx512vl());
+    assert_eq!(
+        is_x86_feature_detected!("avx512ifma"),
+        information.avx512_ifma()
+    );
+    assert_eq!(
+        is_x86_feature_detected!("avx512vbmi"),
+        information.avx512_vbmi()
+    );
+    assert_eq!(
+        is_x86_feature_detected!("avx512vpopcntdq"),
+        information.avx512_vpopcntdq()
+    );
+    assert_eq!(is_x86_feature_detected!("fma"), information.fma());
+    assert_eq!(is_x86_feature_detected!("bmi1"), information.bmi1());
+    assert_eq!(is_x86_feature_detected!("bmi2"), information.bmi2());
+    assert_eq!(is_x86_feature_detected!("popcnt"), information.popcnt());
+    assert_eq!(is_x86_feature_detected!("abm"), information.lzcnt());
+    assert_eq!(is_x86_feature_detected!("tbm"), information.tbm());
+    assert_eq!(is_x86_feature_detected!("lzcnt"), information.lzcnt());
+    assert_eq!(is_x86_feature_detected!("xsave"), information.xsave());
+    assert_eq!(is_x86_feature_detected!("xsaveopt"), information.xsaveopt());
+    assert_eq!(
+        is_x86_feature_detected!("xsavec"),
+        information.xsavec_and_xrstor()
+    );
+    assert_eq!(
+        is_x86_feature_detected!("xsaves"),
+        information.xsaves_xrstors_and_ia32_xss()
+    );
+    assert_eq!(
+        is_x86_feature_detected!("cmpxchg16b"),
+        information.cmpxchg16b(),
+    );
+    assert_eq!(is_x86_feature_detected!("adx"), information.adx(),);
+    assert_eq!(is_x86_feature_detected!("rtm"), information.rtm(),);
+}
diff --git a/src/stdarch/crates/stdarch-test/src/disassembly.rs b/src/stdarch/crates/stdarch-test/src/disassembly.rs
index 0decd889d2..d82b07d0a8 100644
--- a/src/stdarch/crates/stdarch-test/src/disassembly.rs
+++ b/src/stdarch/crates/stdarch-test/src/disassembly.rs
@@ -1,7 +1,7 @@
 //! Disassembly calling function for most targets.
 
-use std::{env, collections::HashSet, process::Command, str};
 use crate::Function;
+use std::{collections::HashSet, env, process::Command, str};
 
 // Extracts the "shim" name from the `symbol`.
 fn normalize(mut symbol: &str) -> String {
@@ -38,63 +38,56 @@ fn normalize(mut symbol: &str) -> String {
 pub(crate) fn disassemble_myself() -> HashSet<Function> {
     let me = env::current_exe().expect("failed to get current exe");
 
-    let disassembly = if cfg!(target_arch = "x86_64")
-        && cfg!(target_os = "windows")
-        && cfg!(target_env = "msvc")
-    {
-        let mut cmd = cc::windows_registry::find(
-            "x86_64-pc-windows-msvc",
-            "dumpbin.exe",
-        ).expect("failed to find `dumpbin` tool");
-        let output = cmd
-            .arg("/DISASM")
-            .arg(&me)
-            .output()
-            .expect("failed to execute dumpbin");
-        println!(
-            "{}\n{}",
-            output.status,
-            String::from_utf8_lossy(&output.stderr)
-        );
-        assert!(output.status.success());
-        // Windows does not return valid UTF-8 output:
-        String::from_utf8_lossy(Vec::leak(output.stdout))
-    } else if cfg!(target_os = "windows") {
-        panic!("disassembly unimplemented")
-    } else if cfg!(target_os = "macos") {
-        let output = Command::new("otool")
-            .arg("-vt")
-            .arg(&me)
-            .output()
-            .expect("failed to execute otool");
-        println!(
-            "{}\n{}",
-            output.status,
-            String::from_utf8_lossy(&output.stderr)
-        );
-        assert!(output.status.success());
-
-        String::from_utf8_lossy(Vec::leak(output.stdout))
-    } else {
-        let objdump =
-            env::var("OBJDUMP").unwrap_or_else(|_| "objdump".to_string());
-        let output = Command::new(objdump.clone())
-            .arg("--disassemble")
-            .arg(&me)
-            .output()
-            .unwrap_or_else(|_| panic!(
-                "failed to execute objdump. OBJDUMP={}",
-                objdump
-            ));
-        println!(
-            "{}\n{}",
-            output.status,
-            String::from_utf8_lossy(&output.stderr)
-        );
-        assert!(output.status.success());
-
-        String::from_utf8_lossy(Vec::leak(output.stdout))
-    };
+    let disassembly =
+        if cfg!(target_arch = "x86_64") && cfg!(target_os = "windows") && cfg!(target_env = "msvc")
+        {
+            let mut cmd = cc::windows_registry::find("x86_64-pc-windows-msvc", "dumpbin.exe")
+                .expect("failed to find `dumpbin` tool");
+            let output = cmd
+                .arg("/DISASM")
+                .arg(&me)
+                .output()
+                .expect("failed to execute dumpbin");
+            println!(
+                "{}\n{}",
+                output.status,
+                String::from_utf8_lossy(&output.stderr)
+            );
+            assert!(output.status.success());
+            // Windows does not return valid UTF-8 output:
+            String::from_utf8_lossy(Vec::leak(output.stdout))
+        } else if cfg!(target_os = "windows") {
+            panic!("disassembly unimplemented")
+        } else if cfg!(target_os = "macos") {
+            let output = Command::new("otool")
+                .arg("-vt")
+                .arg(&me)
+                .output()
+                .expect("failed to execute otool");
+            println!(
+                "{}\n{}",
+                output.status,
+                String::from_utf8_lossy(&output.stderr)
+            );
+            assert!(output.status.success());
+
+            String::from_utf8_lossy(Vec::leak(output.stdout))
+        } else {
+            let objdump = env::var("OBJDUMP").unwrap_or_else(|_| "objdump".to_string());
+            let output = Command::new(objdump.clone())
+                .arg("--disassemble")
+                .arg(&me)
+                .output()
+                .unwrap_or_else(|_| panic!("failed to execute objdump. OBJDUMP={}", objdump));
+            println!(
+                "{}\n{}",
+                output.status,
+                String::from_utf8_lossy(&output.stderr)
+            );
+            assert!(output.status.success());
+
+            String::from_utf8_lossy(Vec::leak(output.stdout))
+        };
 
     parse(&disassembly)
 }
@@ -102,7 +95,10 @@ pub(crate) fn disassemble_myself() -> HashSet<Function> {
 fn parse(output: &str) -> HashSet<Function> {
     let mut lines = output.lines();
 
-    println!("First 100 lines of the disassembly input containing {} lines:", lines.clone().count());
+    println!(
+        "First 100 lines of the disassembly input containing {} lines:",
+        lines.clone().count()
+    );
     for line in output.lines().take(100) {
         println!("{}", line);
     }
@@ -111,7 +107,7 @@ fn parse(output: &str) -> HashSet<Function> {
     let mut cached_header = None;
     while let Some(header) = cached_header.take().or_else(|| lines.next()) {
         if !header.ends_with(':') || !header.contains("stdarch_test_shim") {
-            continue
+            continue;
         }
         eprintln!("header: {}", header);
         let symbol = normalize(header);
@@ -146,9 +142,8 @@ fn parse(output: &str) -> HashSet<Function> {
                 instruction
                     .split_whitespace()
                     .skip(1)
-                    .skip_while(|s| {
-                        s.len() == 2 && usize::from_str_radix(s, 16).is_ok()
-                    }).map(std::string::ToString::to_string)
+                    .skip_while(|s| s.len() == 2 && usize::from_str_radix(s, 16).is_ok())
+                    .map(std::string::ToString::to_string)
                     .skip_while(|s| *s == "lock") // skip x86-specific prefix
                     .collect::<Vec<String>>()
             } else {
@@ -156,20 +151,16 @@ fn parse(output: &str) -> HashSet<Function> {
                 // Each line of instructions should look like:
                 //
                 //      $rel_offset: ab cd ef 00    $instruction...
-                let expected_len
-                    = if cfg!(target_arch = "arm") || cfg!(target_arch = "aarch64") {
-                        8
-                    } else {
-                        2
-                    };
+                let expected_len = if cfg!(target_arch = "arm") || cfg!(target_arch = "aarch64") {
+                    8
+                } else {
+                    2
+                };
 
                 instruction
                     .split_whitespace()
                     .skip(1)
-                    .skip_while(|s| {
-                        s.len() == expected_len
-                            && usize::from_str_radix(s, 16).is_ok()
-                    })
+                    .skip_while(|s| s.len() == expected_len && usize::from_str_radix(s, 16).is_ok())
                     .skip_while(|s| *s == "lock") // skip x86-specific prefix
                     .map(std::string::ToString::to_string)
                     .collect::<Vec<String>>()
@@ -178,7 +169,7 @@ fn parse(output: &str) -> HashSet<Function> {
         }
         let function = Function {
             name: symbol,
-            instrs: instructions
+            instrs: instructions,
         };
         assert!(functions.insert(function));
     }
diff --git a/src/stdarch/crates/stdarch-test/src/lib.rs b/src/stdarch/crates/stdarch-test/src/lib.rs
index 75843048e7..4e25d2a02d 100644
--- a/src/stdarch/crates/stdarch-test/src/lib.rs
+++ b/src/stdarch/crates/stdarch-test/src/lib.rs
@@ -3,7 +3,6 @@
 //! This basically just disassembles the current executable and then parses the
 //! output once globally and then provides the `assert` function which makes
 //! assertions about the disassembly of a function.
-#![feature(const_str_as_bytes)]
 #![feature(const_transmute)]
 #![feature(vec_leak)]
 #![allow(clippy::missing_docs_in_private_items, clippy::print_stdout)]
@@ -91,7 +90,7 @@ pub fn assert(_fnptr: usize, fnname: &str, expected: &str) {
 
     // Look for `expected` as the first part of any instruction in this
     // function, e.g., tzcntl in tzcntl %rax,%rax.
-    let found = instrs.iter().any(|s| s.contains(expected));
+    let found = instrs.iter().any(|s| s.starts_with(expected));
 
     // Look for `call` instructions in the disassembly to detect whether
     // inlining failed: all intrinsics are `#[inline(always)]`, so
diff --git a/src/stdarch/crates/stdarch-test/src/wasm.rs b/src/stdarch/crates/stdarch-test/src/wasm.rs
index b31051bc68..fc4ced6282 100644
--- a/src/stdarch/crates/stdarch-test/src/wasm.rs
+++ b/src/stdarch/crates/stdarch-test/src/wasm.rs
@@ -42,8 +42,7 @@ pub(crate) fn disassemble_myself() -> HashSet<Function> {
     args.push(&js_shim.display().to_string().into());
     args.push(&"--enable-simd".into());
     let opts = js_sys::Object::new();
-    js_sys::Reflect::set(&opts, &"maxBuffer".into(), &(200 * 1024 * 1024).into())
-        .unwrap();
+    js_sys::Reflect::set(&opts, &"maxBuffer".into(), &(200 * 1024 * 1024).into()).unwrap();
     let output = exec_file_sync("wasm2wat", &args, &opts).to_string();
 
     let mut ret: HashSet<Function> = HashSet::new();
diff --git a/src/stdarch/crates/stdarch-verify/Cargo.toml b/src/stdarch/crates/stdarch-verify/Cargo.toml
index 1414b11007..6362e3d57f 100644
--- a/src/stdarch/crates/stdarch-verify/Cargo.toml
+++ b/src/stdarch/crates/stdarch-verify/Cargo.toml
@@ -5,9 +5,9 @@ authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
 
 [dependencies]
-proc-macro2 = "0.4"
-quote = "0.6"
-syn = { version = "0.15", features = ["full"] }
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full"] }
 
 [lib]
 proc-macro = true
diff --git a/src/stdarch/crates/stdarch-verify/src/lib.rs b/src/stdarch/crates/stdarch-verify/src/lib.rs
index b7569fe5a2..d71623c7f3 100644
--- a/src/stdarch/crates/stdarch-verify/src/lib.rs
+++ b/src/stdarch/crates/stdarch-verify/src/lib.rs
@@ -6,7 +6,6 @@ extern crate quote;
 extern crate syn;
 
 use proc_macro::TokenStream;
-use proc_macro2::Span;
 use std::{fs::File, io::Read, path::Path};
 use syn::ext::IdentExt;
 
@@ -57,7 +56,7 @@ fn functions(input: TokenStream, dirs: &[&str]) -> TokenStream {
 
     let mut tests = std::collections::HashSet::<String>::new();
     for f in &functions {
-        let id = format!("{}", f.0.ident);
+        let id = format!("{}", f.0.sig.ident);
         if id.starts_with("test_") {
             tests.insert(id);
         }
@@ -66,7 +65,7 @@ fn functions(input: TokenStream, dirs: &[&str]) -> TokenStream {
 
     functions.retain(|&(ref f, _)| {
         if let syn::Visibility::Public(_) = f.vis {
-            if f.unsafety.is_some() {
+            if f.sig.unsafety.is_some() {
                 return true;
             }
         }
@@ -79,17 +78,17 @@ fn functions(input: TokenStream, dirs: &[&str]) -> TokenStream {
     let functions = functions
         .iter()
         .map(|&(ref f, path)| {
-            let name = &f.ident;
+            let name = &f.sig.ident;
             // println!("{}", name);
             let mut arguments = Vec::new();
-            for input in f.decl.inputs.iter() {
+            for input in f.sig.inputs.iter() {
                 let ty = match *input {
-                    syn::FnArg::Captured(ref c) => &c.ty,
+                    syn::FnArg::Typed(ref c) => &c.ty,
                     _ => panic!("invalid argument on {}", name),
                 };
                 arguments.push(to_type(ty));
             }
-            let ret = match f.decl.output {
+            let ret = match f.sig.output {
                 syn::ReturnType::Default => quote! { None },
                 syn::ReturnType::Type(_, ref t) => {
                     let ty = to_type(t);
@@ -261,20 +260,13 @@ fn extract_path_ident(path: &syn::Path) -> syn::Ident {
     if path.segments.len() != 1 {
         panic!("unsupported path that needs name resolution")
     }
-    match path
-        .segments
-        .first()
-        .expect("segment not found")
-        .value()
-        .arguments
-    {
+    match path.segments.first().expect("segment not found").arguments {
         syn::PathArguments::None => {}
         _ => panic!("unsupported path that has path arguments"),
     }
     path.segments
         .first()
         .expect("segment not found")
-        .value()
         .ident
         .clone()
 }
@@ -318,7 +310,7 @@ fn find_instrs(attrs: &[syn::Attribute]) -> Vec<String> {
     // TODO: should probably just reuse `Invoc` from the `assert-instr-macro`
     // crate.
     impl syn::parse::Parse for AssertInstr {
-        fn parse(content: syn::parse::ParseStream) -> syn::parse::Result<Self> {
+        fn parse(content: syn::parse::ParseStream) -> syn::Result<Self> {
             let input;
             parenthesized!(input in content);
             let _ = input.parse::<syn::Meta>()?;
@@ -352,9 +344,9 @@ fn find_instrs(attrs: &[syn::Attribute]) -> Vec<String> {
 
     attrs
         .iter()
-        .filter(|a| a.path == syn::Ident::new("cfg_attr", Span::call_site()).into())
+        .filter(|a| a.path.is_ident("cfg_attr"))
         .filter_map(|a| {
-            syn::parse2::<AssertInstr>(a.tts.clone())
+            syn::parse2::<AssertInstr>(a.tokens.clone())
                 .ok()
                 .map(|a| a.instr)
         })
@@ -365,9 +357,9 @@ fn find_target_feature(attrs: &[syn::Attribute]) -> Option<syn::Lit> {
     attrs
         .iter()
         .flat_map(|a| {
-            if let Some(a) = a.interpret_meta() {
+            if let Ok(a) = a.parse_meta() {
                 if let syn::Meta::List(i) = a {
-                    if i.ident == "target_feature" {
+                    if i.path.is_ident("target_feature") {
                         return i.nested;
                     }
                 }
@@ -376,10 +368,10 @@ fn find_target_feature(attrs: &[syn::Attribute]) -> Option<syn::Lit> {
         })
         .filter_map(|nested| match nested {
             syn::NestedMeta::Meta(m) => Some(m),
-            syn::NestedMeta::Literal(_) => None,
+            syn::NestedMeta::Lit(_) => None,
         })
         .find_map(|m| match m {
-            syn::Meta::NameValue(ref i) if i.ident == "enable" => Some(i.clone().lit),
+            syn::Meta::NameValue(ref i) if i.path.is_ident("enable") => Some(i.clone().lit),
             _ => None,
         })
 }
@@ -389,7 +381,7 @@ fn find_required_const(attrs: &[syn::Attribute]) -> Vec<usize> {
         .iter()
         .flat_map(|a| {
             if a.path.segments[0].ident == "rustc_args_required_const" {
-                syn::parse::<RustcArgsRequiredConst>(a.tts.clone().into())
+                syn::parse::<RustcArgsRequiredConst>(a.tokens.clone().into())
                     .unwrap()
                     .args
             } else {
@@ -404,14 +396,16 @@ struct RustcArgsRequiredConst {
 }
 
 impl syn::parse::Parse for RustcArgsRequiredConst {
-    #[allow(clippy::cast_possible_truncation)]
-    fn parse(input: syn::parse::ParseStream) -> syn::parse::Result<Self> {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
         let content;
         parenthesized!(content in input);
         let list =
             syn::punctuated::Punctuated::<syn::LitInt, Token![,]>::parse_terminated(&content)?;
         Ok(Self {
-            args: list.into_iter().map(|a| a.value() as usize).collect(),
+            args: list
+                .into_iter()
+                .map(|a| a.base10_parse::<usize>())
+                .collect::<syn::Result<_>>()?,
         })
     }
 }
diff --git a/src/test/auxiliary/rust_test_helpers.c b/src/test/auxiliary/rust_test_helpers.c
index b95b0ca1a8..897c940149 100644
--- a/src/test/auxiliary/rust_test_helpers.c
+++ b/src/test/auxiliary/rust_test_helpers.c
@@ -168,6 +168,18 @@ struct floats {
     double c;
 };
 
+struct char_char_double {
+    uint8_t a;
+    uint8_t b;
+    double c;
+};
+
+struct char_char_float {
+    uint8_t a;
+    uint8_t b;
+    float c;
+};
+
 struct quad
 rust_dbg_abi_1(struct quad q) {
     struct quad qq = { q.c + 1,
@@ -185,6 +197,23 @@ rust_dbg_abi_2(struct floats f) {
     return ff;
 }
 
+struct char_char_double
+rust_dbg_abi_3(struct char_char_double a) {
+    struct char_char_double ccd = { a.a + 1,
+                                    a.b - 1,
+                                    a.c + 1.0 };
+    return ccd;
+}
+
+struct char_char_float
+rust_dbg_abi_4(struct char_char_float a) {
+    struct char_char_float ccd = { a.a + 1,
+                                   a.b - 1,
+                                   a.c + 1.0 };
+    return ccd;
+}
+
+
 int
 rust_dbg_static_mut = 3;
 
@@ -300,3 +329,87 @@ __int128 sub(__int128 a, __int128 b) {
 }
 
 #endif
+
+#define OPTION_TAG_NONE (0)
+#define OPTION_TAG_SOME (1)
+
+struct U8TaggedEnumOptionU64 {
+    uint8_t tag;
+    union {
+        uint64_t some;
+    };
+};
+
+struct U8TaggedEnumOptionU64
+rust_dbg_new_some_u64(uint64_t some) {
+    struct U8TaggedEnumOptionU64 r = {
+        .tag = OPTION_TAG_SOME,
+        .some = some,
+    };
+    return r;
+}
+
+struct U8TaggedEnumOptionU64
+rust_dbg_new_none_u64(void) {
+    struct U8TaggedEnumOptionU64 r = {
+        .tag = OPTION_TAG_NONE,
+    };
+    return r;
+}
+
+int32_t
+rust_dbg_unpack_option_u64(struct U8TaggedEnumOptionU64 o, uint64_t *into) {
+    assert(into);
+    switch (o.tag) {
+    case OPTION_TAG_SOME:
+        *into = o.some;
+        return 1;
+    case OPTION_TAG_NONE:
+        return 0;
+    default:
+        assert(0 && "unexpected tag");
+    }
+}
+
+struct U8TaggedEnumOptionU64U64 {
+    uint8_t tag;
+    union {
+        struct {
+            uint64_t a;
+            uint64_t b;
+        } some;
+    };
+};
+
+struct U8TaggedEnumOptionU64U64
+rust_dbg_new_some_u64u64(uint64_t a, uint64_t b) {
+    struct U8TaggedEnumOptionU64U64 r = {
+        .tag = OPTION_TAG_SOME,
+        .some = { .a = a, .b = b },
+    };
+    return r;
+}
+
+struct U8TaggedEnumOptionU64U64
+rust_dbg_new_none_u64u64(void) {
+    struct U8TaggedEnumOptionU64U64 r = {
+        .tag = OPTION_TAG_NONE,
+    };
+    return r;
+}
+
+int32_t
+rust_dbg_unpack_option_u64u64(struct U8TaggedEnumOptionU64U64 o, uint64_t *a, uint64_t *b) {
+    assert(a);
+    assert(b);
+    switch (o.tag) {
+    case OPTION_TAG_SOME:
+        *a = o.some.a;
+        *b = o.some.b;
+        return 1;
+    case OPTION_TAG_NONE:
+        return 0;
+    default:
+        assert(0 && "unexpected tag");
+    }
+}
diff --git a/src/test/codegen-units/partitioning/extern-drop-glue.rs b/src/test/codegen-units/partitioning/extern-drop-glue.rs
index f85ae0c077..662519067d 100644
--- a/src/test/codegen-units/partitioning/extern-drop-glue.rs
+++ b/src/test/codegen-units/partitioning/extern-drop-glue.rs
@@ -2,23 +2,23 @@
 
 // We specify -Z incremental here because we want to test the partitioning for
 // incremental compilation
+// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
 // compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/extern-drop-glue
-// compile-flags:-Zinline-in-all-cgus
+// compile-flags:-Zinline-in-all-cgus -Copt-level=0
 
 #![allow(dead_code)]
-#![crate_type="rlib"]
+#![crate_type = "rlib"]
 
 // aux-build:cgu_extern_drop_glue.rs
 extern crate cgu_extern_drop_glue;
 
-//~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<cgu_extern_drop_glue::Struct[0]> @@ extern_drop_glue[Internal] extern_drop_glue-mod1[Internal]
+//~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<cgu_extern_drop_glue::Struct[0]> @@ extern_drop_glue-fallback.cgu[External]
 
 struct LocalStruct(cgu_extern_drop_glue::Struct);
 
 //~ MONO_ITEM fn extern_drop_glue::user[0] @@ extern_drop_glue[External]
-pub fn user()
-{
-    //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<extern_drop_glue::LocalStruct[0]> @@ extern_drop_glue[Internal]
+pub fn user() {
+    //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<extern_drop_glue::LocalStruct[0]> @@ extern_drop_glue-fallback.cgu[External]
     let _ = LocalStruct(cgu_extern_drop_glue::Struct(0));
 }
 
@@ -28,9 +28,8 @@ pub mod mod1 {
     struct LocalStruct(cgu_extern_drop_glue::Struct);
 
     //~ MONO_ITEM fn extern_drop_glue::mod1[0]::user[0] @@ extern_drop_glue-mod1[External]
-    pub fn user()
-    {
-        //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<extern_drop_glue::mod1[0]::LocalStruct[0]> @@ extern_drop_glue-mod1[Internal]
+    pub fn user() {
+        //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<extern_drop_glue::mod1[0]::LocalStruct[0]> @@ extern_drop_glue-fallback.cgu[External]
         let _ = LocalStruct(cgu_extern_drop_glue::Struct(0));
     }
 }
diff --git a/src/test/codegen-units/partitioning/local-drop-glue.rs b/src/test/codegen-units/partitioning/local-drop-glue.rs
index 366af4d4c3..14a50bf579 100644
--- a/src/test/codegen-units/partitioning/local-drop-glue.rs
+++ b/src/test/codegen-units/partitioning/local-drop-glue.rs
@@ -1,54 +1,45 @@
 // ignore-tidy-linelength
 // We specify -Z incremental here because we want to test the partitioning for
 // incremental compilation
+// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
 // compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-drop-glue
-// compile-flags:-Zinline-in-all-cgus
+// compile-flags:-Zinline-in-all-cgus -Copt-level=0
 
 #![allow(dead_code)]
-#![crate_type="rlib"]
+#![crate_type = "rlib"]
 
-//~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<local_drop_glue::Struct[0]> @@ local_drop_glue[Internal] local_drop_glue-mod1[Internal]
+//~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<local_drop_glue::Struct[0]> @@ local_drop_glue-fallback.cgu[External]
 struct Struct {
-    _a: u32
+    _a: u32,
 }
 
 impl Drop for Struct {
-    //~ MONO_ITEM fn local_drop_glue::{{impl}}[0]::drop[0] @@ local_drop_glue[External]
+    //~ MONO_ITEM fn local_drop_glue::{{impl}}[0]::drop[0] @@ local_drop_glue-fallback.cgu[External]
     fn drop(&mut self) {}
 }
 
-//~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<local_drop_glue::Outer[0]> @@ local_drop_glue[Internal]
+//~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<local_drop_glue::Outer[0]> @@ local_drop_glue-fallback.cgu[External]
 struct Outer {
-    _a: Struct
+    _a: Struct,
 }
 
 //~ MONO_ITEM fn local_drop_glue::user[0] @@ local_drop_glue[External]
-pub fn user()
-{
-    let _ = Outer {
-        _a: Struct {
-            _a: 0
-        }
-    };
+pub fn user() {
+    let _ = Outer { _a: Struct { _a: 0 } };
 }
 
-pub mod mod1
-{
+pub mod mod1 {
     use super::Struct;
 
-    //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<local_drop_glue::mod1[0]::Struct2[0]> @@ local_drop_glue-mod1[Internal]
+    //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<local_drop_glue::mod1[0]::Struct2[0]> @@ local_drop_glue-fallback.cgu[External]
     struct Struct2 {
         _a: Struct,
-        //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<(u32, local_drop_glue::Struct[0])> @@ local_drop_glue-mod1[Internal]
+        //~ MONO_ITEM fn core::ptr[0]::drop_in_place[0]<(u32, local_drop_glue::Struct[0])> @@ local_drop_glue-fallback.cgu[Internal]
         _b: (u32, Struct),
     }
 
     //~ MONO_ITEM fn local_drop_glue::mod1[0]::user[0] @@ local_drop_glue-mod1[External]
-    pub fn user()
-    {
-        let _ = Struct2 {
-            _a: Struct { _a: 0 },
-            _b: (0, Struct { _a: 0 }),
-        };
+    pub fn user() {
+        let _ = Struct2 { _a: Struct { _a: 0 }, _b: (0, Struct { _a: 0 }) };
     }
 }
diff --git a/src/test/codegen/cfguard_checks.rs b/src/test/codegen/cfguard_checks.rs
new file mode 100644
index 0000000000..40a7353eac
--- /dev/null
+++ b/src/test/codegen/cfguard_checks.rs
@@ -0,0 +1,10 @@
+// compile-flags: -Z control_flow_guard=checks
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the module flag cfguard=2 is present
+// CHECK: !"cfguard", i32 2
diff --git a/src/test/codegen/cfguard_disabled.rs b/src/test/codegen/cfguard_disabled.rs
new file mode 100644
index 0000000000..d1747931e1
--- /dev/null
+++ b/src/test/codegen/cfguard_disabled.rs
@@ -0,0 +1,10 @@
+// compile-flags: -Z control_flow_guard=disabled
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the module flag cfguard is not present
+// CHECK-NOT: !"cfguard"
diff --git a/src/test/codegen/cfguard_nochecks.rs b/src/test/codegen/cfguard_nochecks.rs
new file mode 100644
index 0000000000..c5d7afbae2
--- /dev/null
+++ b/src/test/codegen/cfguard_nochecks.rs
@@ -0,0 +1,10 @@
+// compile-flags: -Z control_flow_guard=nochecks
+
+#![crate_type = "lib"]
+
+// A basic test function.
+pub fn test() {
+}
+
+// Ensure the module flag cfguard=1 is present
+// CHECK: !"cfguard", i32 1
diff --git a/src/test/codegen/enum-discriminant-value.rs b/src/test/codegen/enum-discriminant-value.rs
new file mode 100644
index 0000000000..f9da987765
--- /dev/null
+++ b/src/test/codegen/enum-discriminant-value.rs
@@ -0,0 +1,27 @@
+// Verify that DIEnumerator uses isUnsigned flag when appropriate.
+//
+// compile-flags: -g -C no-prepopulate-passes
+
+#[repr(i64)]
+pub enum I64 {
+    I64Min = std::i64::MIN,
+    I64Max = std::i64::MAX,
+}
+
+#[repr(u64)]
+pub enum U64 {
+    U64Min = std::u64::MIN,
+    U64Max = std::u64::MAX,
+}
+
+fn main() {
+    let _a = I64::I64Min;
+    let _b = I64::I64Max;
+    let _c = U64::U64Min;
+    let _d = U64::U64Max;
+}
+
+// CHECK: !DIEnumerator(name: "I64Min", value: -9223372036854775808)
+// CHECK: !DIEnumerator(name: "I64Max", value: 9223372036854775807)
+// CHECK: !DIEnumerator(name: "U64Min", value: 0, isUnsigned: true)
+// CHECK: !DIEnumerator(name: "U64Max", value: 18446744073709551615, isUnsigned: true)
diff --git a/src/test/codegen/issue-45222.rs b/src/test/codegen/issue-45222.rs
index 7aadc8a095..e9b05e648b 100644
--- a/src/test/codegen/issue-45222.rs
+++ b/src/test/codegen/issue-45222.rs
@@ -25,28 +25,30 @@ pub fn check_foo2() -> u64 {
 }
 
 // Simplified example of #45222
-
-fn triangle_inc(n: u64) -> u64 {
-    let mut count = 0;
-    for j in 0 ..= n {
-        count += j;
-    }
-    count
-}
-
-// CHECK-LABEL: @check_triangle_inc
-#[no_mangle]
-pub fn check_triangle_inc() -> u64 {
-    // CHECK: ret i64 5000050000
-    triangle_inc(100000)
-}
+//
+// Temporarily disabled in #68835 to fix a soundness hole.
+//
+// fn triangle_inc(n: u64) -> u64 {
+//     let mut count = 0;
+//     for j in 0 ..= n {
+//         count += j;
+//     }
+//     count
+// }
+//
+// // COMMENTEDCHECK-LABEL: @check_triangle_inc
+// #[no_mangle]
+// pub fn check_triangle_inc() -> u64 {
+//     // COMMENTEDCHECK: ret i64 5000050000
+//     triangle_inc(100000)
+// }
 
 // Demo in #48012
 
 fn foo3r(n: u64) -> u64 {
     let mut count = 0;
     (0..n).for_each(|_| {
-        (0 ..= n).rev().for_each(|j| {
+        (0..=n).rev().for_each(|j| {
             count += j;
         })
     });
diff --git a/src/test/codegen/issue-56927.rs b/src/test/codegen/issue-56927.rs
index 0544ff86aa..d502673e2f 100644
--- a/src/test/codegen/issue-56927.rs
+++ b/src/test/codegen/issue-56927.rs
@@ -23,7 +23,7 @@ pub fn test1(s: &mut S) {
 
 // CHECK-LABEL: @test2
 // CHECK: store i32 4, i32* %{{.+}}, align 4
-#[allow(const_err)]
+#[allow(unconditional_panic)]
 #[no_mangle]
 pub fn test2(s: &mut S) {
     s.arr[usize::MAX / 4 + 1] = 4;
diff --git a/src/test/codegen/naked-functions.rs b/src/test/codegen/naked-functions.rs
index 5050ed1499..493c1b9f0b 100644
--- a/src/test/codegen/naked-functions.rs
+++ b/src/test/codegen/naked-functions.rs
@@ -1,5 +1,3 @@
-// ignore-tidy-linelength
-
 // compile-flags: -C no-prepopulate-passes
 
 #![crate_type = "lib"]
@@ -61,19 +59,19 @@ pub fn naked_recursive() {
 
     naked_empty();
 
-    // CHECK-NEXT: %{{[0-9]+}} = call i{{[0-9]+}} @naked_with_return()
+    // CHECK-NEXT: %_4 = call i{{[0-9]+}} @naked_with_return()
 
     // FIXME(#39685) Avoid one block per call.
     // CHECK-NEXT: br label %bb2
     // CHECK: bb2:
 
-    // CHECK-NEXT: %{{[0-9]+}} = call i{{[0-9]+}} @naked_with_args_and_return(i{{[0-9]+}} %{{[0-9]+}})
+    // CHECK-NEXT: %_3 = call i{{[0-9]+}} @naked_with_args_and_return(i{{[0-9]+}} %_4)
 
     // FIXME(#39685) Avoid one block per call.
     // CHECK-NEXT: br label %bb3
     // CHECK: bb3:
 
-    // CHECK-NEXT: call void @naked_with_args(i{{[0-9]+}} %{{[0-9]+}})
+    // CHECK-NEXT: call void @naked_with_args(i{{[0-9]+}} %_3)
 
     // FIXME(#39685) Avoid one block per call.
     // CHECK-NEXT: br label %bb4
diff --git a/src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs b/src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
new file mode 100644
index 0000000000..f0f052fe5c
--- /dev/null
+++ b/src/test/codegen/riscv-abi/riscv64-lp64-lp64f-lp64d-abi.rs
@@ -0,0 +1,181 @@
+// ignore-tidy-linelength
+// compile-flags: -C no-prepopulate-passes
+// only-riscv64
+// only-linux
+#![crate_type = "lib"]
+#![allow(improper_ctypes)]
+
+// CHECK: define void @f_void()
+#[no_mangle]
+pub extern "C" fn f_void() {}
+
+// CHECK: define zeroext i1 @f_scalar_0(i1 zeroext %a)
+#[no_mangle]
+pub extern "C" fn f_scalar_0(a: bool) -> bool {
+    a
+}
+
+// CHECK: define signext i8 @f_scalar_1(i8 signext %x)
+#[no_mangle]
+pub extern "C" fn f_scalar_1(x: i8) -> i8 {
+    x
+}
+
+// CHECK: define zeroext i8 @f_scalar_2(i8 zeroext %x)
+#[no_mangle]
+pub extern "C" fn f_scalar_2(x: u8) -> u8 {
+    x
+}
+
+// CHECK: define signext i32 @f_scalar_3(i32 signext %x)
+#[no_mangle]
+pub extern "C" fn f_scalar_3(x: i32) -> u32 {
+    x as u32
+}
+
+// CHECK: define i64 @f_scalar_4(i64 %x)
+#[no_mangle]
+pub extern "C" fn f_scalar_4(x: i64) -> i64 {
+    x
+}
+
+// CHECK: define float @f_fp_scalar_1(float)
+#[no_mangle]
+pub extern "C" fn f_fp_scalar_1(x: f32) -> f32 {
+    x
+}
+// CHECK: define double @f_fp_scalar_2(double)
+#[no_mangle]
+pub extern "C" fn f_fp_scalar_2(x: f64) -> f64 {
+    x
+}
+
+#[repr(C)]
+pub struct Empty {}
+
+// CHECK: define void @f_agg_empty_struct()
+#[no_mangle]
+pub extern "C" fn f_agg_empty_struct(e: Empty) -> Empty {
+    e
+}
+
+#[repr(C)]
+pub struct Tiny {
+    a: u16,
+    b: u16,
+    c: u16,
+    d: u16,
+}
+
+// CHECK: define void @f_agg_tiny(i64)
+#[no_mangle]
+pub extern "C" fn f_agg_tiny(mut e: Tiny) {
+    e.a += e.b;
+    e.c += e.d;
+}
+
+// CHECK: define i64 @f_agg_tiny_ret()
+#[no_mangle]
+pub extern "C" fn f_agg_tiny_ret() -> Tiny {
+    Tiny { a: 1, b: 2, c: 3, d: 4 }
+}
+
+#[repr(C)]
+pub struct Small {
+    a: i64,
+    b: *mut i64,
+}
+
+// CHECK: define void @f_agg_small([2 x i64])
+#[no_mangle]
+pub extern "C" fn f_agg_small(mut x: Small) {
+    x.a += unsafe { *x.b };
+    x.b = &mut x.a;
+}
+
+// CHECK: define [2 x i64] @f_agg_small_ret()
+#[no_mangle]
+pub extern "C" fn f_agg_small_ret() -> Small {
+    Small { a: 1, b: core::ptr::null_mut() }
+}
+
+#[repr(C)]
+pub struct SmallAligned {
+    a: i128,
+}
+
+// CHECK: define void @f_agg_small_aligned(i128)
+#[no_mangle]
+pub extern "C" fn f_agg_small_aligned(mut x: SmallAligned) {
+    x.a += x.a;
+}
+
+#[repr(C)]
+pub struct Large {
+    a: i64,
+    b: i64,
+    c: i64,
+    d: i64,
+}
+
+// CHECK: define void @f_agg_large(%Large* {{.*}}%x)
+#[no_mangle]
+pub extern "C" fn f_agg_large(mut x: Large) {
+    x.a = x.b + x.c + x.d;
+}
+
+// CHECK: define void @f_agg_large_ret(%Large* {{.*}}sret{{.*}}, i32 signext %i, i8 signext %j)
+#[no_mangle]
+pub extern "C" fn f_agg_large_ret(i: i32, j: i8) -> Large {
+    Large { a: 1, b: 2, c: 3, d: 4 }
+}
+
+// CHECK: define void @f_scalar_stack_1(i64, [2 x i64], i128, %Large* {{.*}}%d, i8 zeroext %e, i8 signext %f, i8 %g, i8 %h)
+#[no_mangle]
+pub extern "C" fn f_scalar_stack_1(
+    a: Tiny,
+    b: Small,
+    c: SmallAligned,
+    d: Large,
+    e: u8,
+    f: i8,
+    g: u8,
+    h: i8,
+) {
+}
+
+// CHECK: define void @f_scalar_stack_2(%Large* {{.*}}sret{{.*}}, i64 %a, i128, i128, i64 %d, i8 zeroext %e, i8 %f, i8 %g)
+#[no_mangle]
+pub extern "C" fn f_scalar_stack_2(
+    a: u64,
+    b: SmallAligned,
+    c: SmallAligned,
+    d: u64,
+    e: u8,
+    f: i8,
+    g: u8,
+) -> Large {
+    Large { a: a as i64, b: e as i64, c: f as i64, d: g as i64 }
+}
+
+extern "C" {
+    fn f_va_callee(_: i32, ...) -> i32;
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn f_va_caller() {
+    // CHECK: call signext i32 (i32, ...) @f_va_callee(i32 signext 1, i32 signext 2, i64 3, double {{.*}}, double {{.*}}, i64 {{.*}}, [2 x i64] {{.*}}, i128 {{.*}}, %Large* {{.*}})
+    f_va_callee(
+        1,
+        2i32,
+        3i64,
+        4.0f64,
+        5.0f64,
+        Tiny { a: 1, b: 2, c: 3, d: 4 },
+        Small { a: 10, b: core::ptr::null_mut() },
+        SmallAligned { a: 11 },
+        Large { a: 12, b: 13, c: 14, d: 15 },
+    );
+    // CHECK: call signext i32 (i32, ...) @f_va_callee(i32 signext 1, i32 signext 2, i32 signext 3, i32 signext 4, i128 {{.*}}, i32 signext 6, i32 signext 7, i32 8, i32 9)
+    f_va_callee(1, 2i32, 3i32, 4i32, SmallAligned { a: 5 }, 6i32, 7i32, 8i32, 9i32);
+}
diff --git a/src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs b/src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs
new file mode 100644
index 0000000000..66a3b9e495
--- /dev/null
+++ b/src/test/codegen/riscv-abi/riscv64-lp64d-abi.rs
@@ -0,0 +1,293 @@
+// ignore-tidy-linelength
+// compile-flags: -C no-prepopulate-passes
+// only-riscv64
+// only-linux
+#![crate_type = "lib"]
+
+// CHECK: define void @f_fpr_tracking(double, double, double, double, double, double, double, double, i8 zeroext %i)
+#[no_mangle]
+pub extern "C" fn f_fpr_tracking(
+    a: f64,
+    b: f64,
+    c: f64,
+    d: f64,
+    e: f64,
+    f: f64,
+    g: f64,
+    h: f64,
+    i: u8,
+) {
+}
+
+#[repr(C)]
+pub struct Double {
+    f: f64,
+}
+
+#[repr(C)]
+pub struct DoubleDouble {
+    f: f64,
+    g: f64,
+}
+
+#[repr(C)]
+pub struct DoubleFloat {
+    f: f64,
+    g: f32,
+}
+
+// CHECK: define void @f_double_s_arg(double)
+#[no_mangle]
+pub extern "C" fn f_double_s_arg(a: Double) {}
+
+// CHECK: define double @f_ret_double_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_s() -> Double {
+    Double { f: 1. }
+}
+
+// CHECK: define void @f_double_double_s_arg({ double, double })
+#[no_mangle]
+pub extern "C" fn f_double_double_s_arg(a: DoubleDouble) {}
+
+// CHECK: define { double, double } @f_ret_double_double_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_double_s() -> DoubleDouble {
+    DoubleDouble { f: 1., g: 2. }
+}
+
+// CHECK: define void @f_double_float_s_arg({ double, float })
+#[no_mangle]
+pub extern "C" fn f_double_float_s_arg(a: DoubleFloat) {}
+
+// CHECK: define { double, float } @f_ret_double_float_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_float_s() -> DoubleFloat {
+    DoubleFloat { f: 1., g: 2. }
+}
+
+// CHECK: define void @f_double_double_s_arg_insufficient_fprs(double, double, double, double, double, double, double, [2 x i64])
+#[no_mangle]
+pub extern "C" fn f_double_double_s_arg_insufficient_fprs(
+    a: f64,
+    b: f64,
+    c: f64,
+    d: f64,
+    e: f64,
+    f: f64,
+    g: f64,
+    h: DoubleDouble,
+) {
+}
+
+#[repr(C)]
+pub struct DoubleInt8 {
+    f: f64,
+    i: i8,
+}
+
+#[repr(C)]
+pub struct DoubleUInt8 {
+    f: f64,
+    i: u8,
+}
+
+#[repr(C)]
+pub struct DoubleInt32 {
+    f: f64,
+    i: i32,
+}
+
+#[repr(C)]
+pub struct DoubleInt64 {
+    f: f64,
+    i: i64,
+}
+
+// CHECK: define void @f_double_int8_s_arg({ double, i8 })
+#[no_mangle]
+pub extern "C" fn f_double_int8_s_arg(a: DoubleInt8) {}
+
+// CHECK: define { double, i8 } @f_ret_double_int8_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_int8_s() -> DoubleInt8 {
+    DoubleInt8 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_double_int32_s_arg({ double, i32 })
+#[no_mangle]
+pub extern "C" fn f_double_int32_s_arg(a: DoubleInt32) {}
+
+// CHECK: define { double, i32 } @f_ret_double_int32_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_int32_s() -> DoubleInt32 {
+    DoubleInt32 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_double_uint8_s_arg({ double, i8 })
+#[no_mangle]
+pub extern "C" fn f_double_uint8_s_arg(a: DoubleUInt8) {}
+
+// CHECK: define { double, i8 } @f_ret_double_uint8_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_uint8_s() -> DoubleUInt8 {
+    DoubleUInt8 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_double_int64_s_arg({ double, i64 })
+#[no_mangle]
+pub extern "C" fn f_double_int64_s_arg(a: DoubleInt64) {}
+
+// CHECK: define { double, i64 } @f_ret_double_int64_s()
+#[no_mangle]
+pub extern "C" fn f_ret_double_int64_s() -> DoubleInt64 {
+    DoubleInt64 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_double_int8_s_arg_insufficient_gprs(i32 signext %a, i32 signext %b, i32 signext %c, i32 signext %d, i32 signext %e, i32 signext %f, i32 signext %g, i32 signext %h, [2 x i64])
+#[no_mangle]
+pub extern "C" fn f_double_int8_s_arg_insufficient_gprs(
+    a: i32,
+    b: i32,
+    c: i32,
+    d: i32,
+    e: i32,
+    f: i32,
+    g: i32,
+    h: i32,
+    i: DoubleInt8,
+) {
+}
+
+// CHECK: define void @f_struct_double_int8_insufficient_fprs(float, double, double, double, double, double, double, double, [2 x i64])
+#[no_mangle]
+pub extern "C" fn f_struct_double_int8_insufficient_fprs(
+    a: f32,
+    b: f64,
+    c: f64,
+    d: f64,
+    e: f64,
+    f: f64,
+    g: f64,
+    h: f64,
+    i: DoubleInt8,
+) {
+}
+
+#[repr(C)]
+pub struct DoubleArr1 {
+    a: [f64; 1],
+}
+
+// CHECK: define void @f_doublearr1_s_arg(double)
+#[no_mangle]
+pub extern "C" fn f_doublearr1_s_arg(a: DoubleArr1) {}
+
+// CHECK: define double @f_ret_doublearr1_s()
+#[no_mangle]
+pub extern "C" fn f_ret_doublearr1_s() -> DoubleArr1 {
+    DoubleArr1 { a: [1.] }
+}
+
+#[repr(C)]
+pub struct DoubleArr2 {
+    a: [f64; 2],
+}
+
+// CHECK: define void @f_doublearr2_s_arg({ double, double })
+#[no_mangle]
+pub extern "C" fn f_doublearr2_s_arg(a: DoubleArr2) {}
+
+// CHECK: define { double, double } @f_ret_doublearr2_s()
+#[no_mangle]
+pub extern "C" fn f_ret_doublearr2_s() -> DoubleArr2 {
+    DoubleArr2 { a: [1., 2.] }
+}
+
+#[repr(C)]
+pub struct Tricky1 {
+    f: [f64; 1],
+}
+
+#[repr(C)]
+pub struct DoubleArr2Tricky1 {
+    g: [Tricky1; 2],
+}
+
+// CHECK: define void @f_doublearr2_tricky1_s_arg({ double, double })
+#[no_mangle]
+pub extern "C" fn f_doublearr2_tricky1_s_arg(a: DoubleArr2Tricky1) {}
+
+// CHECK: define { double, double } @f_ret_doublearr2_tricky1_s()
+#[no_mangle]
+pub extern "C" fn f_ret_doublearr2_tricky1_s() -> DoubleArr2Tricky1 {
+    DoubleArr2Tricky1 { g: [Tricky1 { f: [1.] }, Tricky1 { f: [2.] }] }
+}
+
+#[repr(C)]
+pub struct EmptyStruct {}
+
+#[repr(C)]
+pub struct DoubleArr2Tricky2 {
+    s: EmptyStruct,
+    g: [Tricky1; 2],
+}
+
+// CHECK: define void @f_doublearr2_tricky2_s_arg({ double, double })
+#[no_mangle]
+pub extern "C" fn f_doublearr2_tricky2_s_arg(a: DoubleArr2Tricky2) {}
+
+// CHECK: define { double, double } @f_ret_doublearr2_tricky2_s()
+#[no_mangle]
+pub extern "C" fn f_ret_doublearr2_tricky2_s() -> DoubleArr2Tricky2 {
+    DoubleArr2Tricky2 { s: EmptyStruct {}, g: [Tricky1 { f: [1.] }, Tricky1 { f: [2.] }] }
+}
+
+#[repr(C)]
+pub struct IntDoubleInt {
+    a: i32,
+    b: f64,
+    c: i32,
+}
+
+// CHECK: define void @f_int_double_int_s_arg(%IntDoubleInt* {{.*}}%a)
+#[no_mangle]
+pub extern "C" fn f_int_double_int_s_arg(a: IntDoubleInt) {}
+
+// CHECK: define void @f_ret_int_double_int_s(%IntDoubleInt* {{.*}}sret
+#[no_mangle]
+pub extern "C" fn f_ret_int_double_int_s() -> IntDoubleInt {
+    IntDoubleInt { a: 1, b: 2., c: 3 }
+}
+
+#[repr(C)]
+pub struct CharCharDouble {
+    a: u8,
+    b: u8,
+    c: f64,
+}
+
+// CHECK: define void @f_char_char_double_s_arg([2 x i64])
+#[no_mangle]
+pub extern "C" fn f_char_char_double_s_arg(a: CharCharDouble) {}
+
+// CHECK: define [2 x i64] @f_ret_char_char_double_s()
+#[no_mangle]
+pub extern "C" fn f_ret_char_char_double_s() -> CharCharDouble {
+    CharCharDouble { a: 1, b: 2, c: 3. }
+}
+
+#[repr(C)]
+pub union DoubleU {
+    a: f64,
+}
+
+// CHECK: define void @f_double_u_arg(i64)
+#[no_mangle]
+pub extern "C" fn f_double_u_arg(a: DoubleU) {}
+
+// CHECK: define i64 @f_ret_double_u()
+#[no_mangle]
+pub extern "C" fn f_ret_double_u() -> DoubleU {
+    unsafe { DoubleU { a: 1. } }
+}
diff --git a/src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs b/src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
new file mode 100644
index 0000000000..d843331f42
--- /dev/null
+++ b/src/test/codegen/riscv-abi/riscv64-lp64f-lp64d-abi.rs
@@ -0,0 +1,277 @@
+// ignore-tidy-linelength
+// compile-flags: -C no-prepopulate-passes
+// only-riscv64
+// only-linux
+#![crate_type = "lib"]
+
+// CHECK: define void @f_fpr_tracking(float, float, float, float, float, float, float, float, i8 zeroext %i)
+#[no_mangle]
+pub extern "C" fn f_fpr_tracking(
+    a: f32,
+    b: f32,
+    c: f32,
+    d: f32,
+    e: f32,
+    f: f32,
+    g: f32,
+    h: f32,
+    i: u8,
+) {
+}
+
+#[repr(C)]
+pub struct Float {
+    f: f32,
+}
+
+#[repr(C)]
+pub struct FloatFloat {
+    f: f32,
+    g: f32,
+}
+
+// CHECK: define void @f_float_s_arg(float)
+#[no_mangle]
+pub extern "C" fn f_float_s_arg(a: Float) {}
+
+// CHECK: define float @f_ret_float_s()
+#[no_mangle]
+pub extern "C" fn f_ret_float_s() -> Float {
+    Float { f: 1. }
+}
+
+// CHECK: define void @f_float_float_s_arg({ float, float })
+#[no_mangle]
+pub extern "C" fn f_float_float_s_arg(a: FloatFloat) {}
+
+// CHECK: define { float, float } @f_ret_float_float_s()
+#[no_mangle]
+pub extern "C" fn f_ret_float_float_s() -> FloatFloat {
+    FloatFloat { f: 1., g: 2. }
+}
+
+// CHECK: define void @f_float_float_s_arg_insufficient_fprs(float, float, float, float, float, float, float, i64)
+#[no_mangle]
+pub extern "C" fn f_float_float_s_arg_insufficient_fprs(
+    a: f32,
+    b: f32,
+    c: f32,
+    d: f32,
+    e: f32,
+    f: f32,
+    g: f32,
+    h: FloatFloat,
+) {
+}
+
+#[repr(C)]
+pub struct FloatInt8 {
+    f: f32,
+    i: i8,
+}
+
+#[repr(C)]
+pub struct FloatUInt8 {
+    f: f32,
+    i: u8,
+}
+
+#[repr(C)]
+pub struct FloatInt32 {
+    f: f32,
+    i: i32,
+}
+
+#[repr(C)]
+pub struct FloatInt64 {
+    f: f32,
+    i: i64,
+}
+
+// CHECK: define void @f_float_int8_s_arg({ float, i8 })
+#[no_mangle]
+pub extern "C" fn f_float_int8_s_arg(a: FloatInt8) {}
+
+// CHECK: define { float, i8 } @f_ret_float_int8_s()
+#[no_mangle]
+pub extern "C" fn f_ret_float_int8_s() -> FloatInt8 {
+    FloatInt8 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_float_int32_s_arg({ float, i32 })
+#[no_mangle]
+pub extern "C" fn f_float_int32_s_arg(a: FloatInt32) {}
+
+// CHECK: define { float, i32 } @f_ret_float_int32_s()
+#[no_mangle]
+pub extern "C" fn f_ret_float_int32_s() -> FloatInt32 {
+    FloatInt32 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_float_uint8_s_arg({ float, i8 })
+#[no_mangle]
+pub extern "C" fn f_float_uint8_s_arg(a: FloatUInt8) {}
+
+// CHECK: define { float, i8 } @f_ret_float_uint8_s()
+#[no_mangle]
+pub extern "C" fn f_ret_float_uint8_s() -> FloatUInt8 {
+    FloatUInt8 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_float_int64_s_arg({ float, i64 })
+#[no_mangle]
+pub extern "C" fn f_float_int64_s_arg(a: FloatInt64) {}
+
+// CHECK: define { float, i64 } @f_ret_float_int64_s()
+#[no_mangle]
+pub extern "C" fn f_ret_float_int64_s() -> FloatInt64 {
+    FloatInt64 { f: 1., i: 2 }
+}
+
+// CHECK: define void @f_float_int8_s_arg_insufficient_gprs(i32 signext %a, i32 signext %b, i32 signext %c, i32 signext %d, i32 signext %e, i32 signext %f, i32 signext %g, i32 signext %h, i64)
+#[no_mangle]
+pub extern "C" fn f_float_int8_s_arg_insufficient_gprs(
+    a: i32,
+    b: i32,
+    c: i32,
+    d: i32,
+    e: i32,
+    f: i32,
+    g: i32,
+    h: i32,
+    i: FloatInt8,
+) {
+}
+
+// CHECK: define void @f_struct_float_int8_insufficient_fprs(float, float, float, float, float, float, float, float, i64)
+#[no_mangle]
+pub extern "C" fn f_struct_float_int8_insufficient_fprs(
+    a: f32,
+    b: f32,
+    c: f32,
+    d: f32,
+    e: f32,
+    f: f32,
+    g: f32,
+    h: f32,
+    i: FloatInt8,
+) {
+}
+
+#[repr(C)]
+pub struct FloatArr1 {
+    a: [f32; 1],
+}
+
+// CHECK: define void @f_floatarr1_s_arg(float)
+#[no_mangle]
+pub extern "C" fn f_floatarr1_s_arg(a: FloatArr1) {}
+
+// CHECK: define float @f_ret_floatarr1_s()
+#[no_mangle]
+pub extern "C" fn f_ret_floatarr1_s() -> FloatArr1 {
+    FloatArr1 { a: [1.] }
+}
+
+#[repr(C)]
+pub struct FloatArr2 {
+    a: [f32; 2],
+}
+
+// CHECK: define void @f_floatarr2_s_arg({ float, float })
+#[no_mangle]
+pub extern "C" fn f_floatarr2_s_arg(a: FloatArr2) {}
+
+// CHECK: define { float, float } @f_ret_floatarr2_s()
+#[no_mangle]
+pub extern "C" fn f_ret_floatarr2_s() -> FloatArr2 {
+    FloatArr2 { a: [1., 2.] }
+}
+
+#[repr(C)]
+pub struct Tricky1 {
+    f: [f32; 1],
+}
+
+#[repr(C)]
+pub struct FloatArr2Tricky1 {
+    g: [Tricky1; 2],
+}
+
+// CHECK: define void @f_floatarr2_tricky1_s_arg({ float, float })
+#[no_mangle]
+pub extern "C" fn f_floatarr2_tricky1_s_arg(a: FloatArr2Tricky1) {}
+
+// CHECK: define { float, float } @f_ret_floatarr2_tricky1_s()
+#[no_mangle]
+pub extern "C" fn f_ret_floatarr2_tricky1_s() -> FloatArr2Tricky1 {
+    FloatArr2Tricky1 { g: [Tricky1 { f: [1.] }, Tricky1 { f: [2.] }] }
+}
+
+#[repr(C)]
+pub struct EmptyStruct {}
+
+#[repr(C)]
+pub struct FloatArr2Tricky2 {
+    s: EmptyStruct,
+    g: [Tricky1; 2],
+}
+
+// CHECK: define void @f_floatarr2_tricky2_s_arg({ float, float })
+#[no_mangle]
+pub extern "C" fn f_floatarr2_tricky2_s_arg(a: FloatArr2Tricky2) {}
+
+// CHECK: define { float, float } @f_ret_floatarr2_tricky2_s()
+#[no_mangle]
+pub extern "C" fn f_ret_floatarr2_tricky2_s() -> FloatArr2Tricky2 {
+    FloatArr2Tricky2 { s: EmptyStruct {}, g: [Tricky1 { f: [1.] }, Tricky1 { f: [2.] }] }
+}
+
+#[repr(C)]
+pub struct IntFloatInt {
+    a: i32,
+    b: f32,
+    c: i32,
+}
+
+// CHECK: define void @f_int_float_int_s_arg([2 x i64])
+#[no_mangle]
+pub extern "C" fn f_int_float_int_s_arg(a: IntFloatInt) {}
+
+// CHECK: define [2 x i64] @f_ret_int_float_int_s()
+#[no_mangle]
+pub extern "C" fn f_ret_int_float_int_s() -> IntFloatInt {
+    IntFloatInt { a: 1, b: 2., c: 3 }
+}
+
+#[repr(C)]
+pub struct CharCharFloat {
+    a: u8,
+    b: u8,
+    c: f32,
+}
+
+// CHECK: define void @f_char_char_float_s_arg(i64)
+#[no_mangle]
+pub extern "C" fn f_char_char_float_s_arg(a: CharCharFloat) {}
+
+// CHECK: define i64 @f_ret_char_char_float_s()
+#[no_mangle]
+pub extern "C" fn f_ret_char_char_float_s() -> CharCharFloat {
+    CharCharFloat { a: 1, b: 2, c: 3. }
+}
+
+#[repr(C)]
+pub union FloatU {
+    a: f32,
+}
+
+// CHECK: define void @f_float_u_arg(i64)
+#[no_mangle]
+pub extern "C" fn f_float_u_arg(a: FloatU) {}
+
+// CHECK: define i64 @f_ret_float_u()
+#[no_mangle]
+pub extern "C" fn f_ret_float_u() -> FloatU {
+    unsafe { FloatU { a: 1. } }
+}
diff --git a/src/test/codegen/sanitizer-memory-track-orgins.rs b/src/test/codegen/sanitizer-memory-track-orgins.rs
index 1fd496b35d..8ea41c5d44 100644
--- a/src/test/codegen/sanitizer-memory-track-orgins.rs
+++ b/src/test/codegen/sanitizer-memory-track-orgins.rs
@@ -15,10 +15,10 @@
 #![crate_type="lib"]
 
 // MSAN-0-NOT: @__msan_track_origins
-// MSAN-1:     @__msan_track_origins = weak_odr local_unnamed_addr constant i32 1
-// MSAN-2:     @__msan_track_origins = weak_odr local_unnamed_addr constant i32 2
-// MSAN-1-LTO: @__msan_track_origins = weak_odr local_unnamed_addr constant i32 1
-// MSAN-2-LTO: @__msan_track_origins = weak_odr local_unnamed_addr constant i32 2
+// MSAN-1:     @__msan_track_origins = weak_odr {{.*}}constant i32 1
+// MSAN-2:     @__msan_track_origins = weak_odr {{.*}}constant i32 2
+// MSAN-1-LTO: @__msan_track_origins = weak_odr {{.*}}constant i32 1
+// MSAN-2-LTO: @__msan_track_origins = weak_odr {{.*}}constant i32 2
 //
 // MSAN-0-LABEL: define void @copy(
 // MSAN-1-LABEL: define void @copy(
diff --git a/src/test/codegen/sanitizer-no-sanitize-inlining.rs b/src/test/codegen/sanitizer-no-sanitize-inlining.rs
new file mode 100644
index 0000000000..d96e76618d
--- /dev/null
+++ b/src/test/codegen/sanitizer-no-sanitize-inlining.rs
@@ -0,0 +1,32 @@
+// Verifies that no_sanitize attribute prevents inlining when
+// given sanitizer is enabled, but has no effect on inlining otherwise.
+//
+// needs-sanitizer-support
+// only-x86_64
+//
+// revisions: ASAN LSAN
+//
+//[ASAN] compile-flags: -Zsanitizer=address -C opt-level=3 -Z mir-opt-level=3
+//[LSAN] compile-flags: -Zsanitizer=leak    -C opt-level=3 -Z mir-opt-level=3
+
+#![crate_type="lib"]
+#![feature(no_sanitize)]
+
+// ASAN-LABEL: define void @test
+// ASAN:         tail call fastcc void @random_inline
+// ASAN:       }
+//
+// LSAN-LABEL: define void @test
+// LSAN-NO:      call
+// LSAN:       }
+#[no_mangle]
+pub fn test(n: &mut u32) {
+    random_inline(n);
+}
+
+#[no_sanitize(address)]
+#[inline]
+#[no_mangle]
+pub fn random_inline(n: &mut u32) {
+    *n = 42;
+}
diff --git a/src/test/codegen/sanitizer-no-sanitize.rs b/src/test/codegen/sanitizer-no-sanitize.rs
new file mode 100644
index 0000000000..dfceb28c8d
--- /dev/null
+++ b/src/test/codegen/sanitizer-no-sanitize.rs
@@ -0,0 +1,29 @@
+// Verifies that no_sanitze attribute can be used to
+// selectively disable sanitizer instrumentation.
+//
+// needs-sanitizer-support
+// compile-flags: -Zsanitizer=address
+
+#![crate_type="lib"]
+#![feature(no_sanitize)]
+
+// CHECK-LABEL: ; sanitizer_no_sanitize::unsanitized
+// CHECK-NEXT:  ; Function Attrs:
+// CHECK-NOT:   sanitize_address
+// CHECK:       start:
+// CHECK-NOT:   call void @__asan_report_load
+// CHECK:       }
+#[no_sanitize(address)]
+pub fn unsanitized(b: &mut u8) -> u8 {
+    *b
+}
+
+// CHECK-LABEL: ; sanitizer_no_sanitize::sanitized
+// CHECK-NEXT:  ; Function Attrs:
+// CHECK:       sanitize_address
+// CHECK:       start:
+// CHECK:       call void @__asan_report_load
+// CHECK:       }
+pub fn sanitized(b: &mut u8) -> u8 {
+    *b
+}
diff --git a/src/test/codegen/sanitizer-recover.rs b/src/test/codegen/sanitizer-recover.rs
index 9a583725b0..05b4ab5653 100644
--- a/src/test/codegen/sanitizer-recover.rs
+++ b/src/test/codegen/sanitizer-recover.rs
@@ -14,8 +14,8 @@
 //[MSAN-RECOVER-LTO] compile-flags: -Zsanitizer=memory  -Zsanitizer-recover=memory -C lto=fat
 //
 // MSAN-NOT:         @__msan_keep_going
-// MSAN-RECOVER:     @__msan_keep_going = weak_odr {{.*}} constant i32 1
-// MSAN-RECOVER-LTO: @__msan_keep_going = weak_odr {{.*}} constant i32 1
+// MSAN-RECOVER:     @__msan_keep_going = weak_odr {{.*}}constant i32 1
+// MSAN-RECOVER-LTO: @__msan_keep_going = weak_odr {{.*}}constant i32 1
 
 // ASAN-LABEL: define i32 @penguin(
 // ASAN:         call void @__asan_report_load4(i64 %0)
diff --git a/src/test/compile-fail/chalkify/chalk_initial_program.rs b/src/test/compile-fail/chalkify/chalk_initial_program.rs
deleted file mode 100644
index df25bad622..0000000000
--- a/src/test/compile-fail/chalkify/chalk_initial_program.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// compile-flags: -Z chalk
-
-trait Foo { }
-
-impl Foo for i32 { }
-
-impl Foo for u32 { }
-
-fn gimme<F: Foo>() { }
-
-// Note: this also tests that `std::process::Termination` is implemented for `()`.
-fn main() {
-    gimme::<i32>();
-    gimme::<u32>();
-    gimme::<f32>(); //~ERROR the trait bound `f32: Foo` is not satisfied
-}
diff --git a/src/test/compile-fail/chalkify/generic_impls.rs b/src/test/compile-fail/chalkify/generic_impls.rs
deleted file mode 100644
index d70c6f8055..0000000000
--- a/src/test/compile-fail/chalkify/generic_impls.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// compile-flags: -Z chalk
-
-trait Foo { }
-
-impl<T> Foo for (T, u32) { }
-
-fn gimme<F: Foo>() { }
-
-fn foo<T>() {
-    gimme::<(T, u32)>();
-    gimme::<(Option<T>, u32)>();
-    gimme::<(Option<T>, f32)>(); //~ ERROR
-}
-
-fn main() {
-    gimme::<(i32, u32)>();
-    gimme::<(i32, f32)>(); //~ ERROR
-}
diff --git a/src/test/compile-fail/chalkify/impl_wf.rs b/src/test/compile-fail/chalkify/impl_wf.rs
deleted file mode 100644
index 6bb4cf86e7..0000000000
--- a/src/test/compile-fail/chalkify/impl_wf.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// compile-flags: -Z chalk
-
-trait Foo: Sized { }
-
-trait Bar {
-    type Item: Foo;
-}
-
-impl Foo for i32 { }
-
-impl Foo for str { }
-//~^ ERROR the size for values of type `str` cannot be known at compilation time
-
-// Implicit `T: Sized` bound.
-impl<T> Foo for Option<T> { }
-
-impl Bar for () {
-    type Item = i32;
-}
-
-impl<T> Bar for Option<T> {
-    type Item = Option<T>;
-}
-
-impl Bar for f32 {
-//~^ ERROR the trait bound `f32: Foo` is not satisfied
-    type Item = f32;
-    //~^ ERROR the trait bound `f32: Foo` is not satisfied
-}
-
-trait Baz<U: ?Sized> where U: Foo { }
-
-impl Baz<i32> for i32 { }
-
-impl Baz<f32> for f32 { }
-//~^ ERROR the trait bound `f32: Foo` is not satisfied
-
-fn main() {
-}
diff --git a/src/test/compile-fail/chalkify/recursive_where_clause_on_type.rs b/src/test/compile-fail/chalkify/recursive_where_clause_on_type.rs
deleted file mode 100644
index 861f86e616..0000000000
--- a/src/test/compile-fail/chalkify/recursive_where_clause_on_type.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// compile-flags: -Z chalk
-
-#![feature(trivial_bounds)]
-
-trait Bar {
-    fn foo();
-}
-trait Foo: Bar { }
-
-struct S where S: Foo;
-
-impl Foo for S {
-}
-
-fn bar<T: Bar>() {
-    T::foo();
-}
-
-fn foo<T: Foo>() {
-    bar::<T>()
-}
-
-fn main() {
-    // For some reason, the error is duplicated...
-
-    foo::<S>() //~ ERROR the type `S` is not well-formed (chalk)
-    //~^ ERROR the type `S` is not well-formed (chalk)
-}
diff --git a/src/test/compile-fail/chalkify/type_wf.rs b/src/test/compile-fail/chalkify/type_wf.rs
deleted file mode 100644
index d1aa975ddc..0000000000
--- a/src/test/compile-fail/chalkify/type_wf.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// compile-flags: -Z chalk
-
-trait Foo { }
-
-struct S<T: Foo> {
-    x: T,
-}
-
-impl Foo for i32 { }
-impl<T> Foo for Option<T> { }
-
-fn main() {
-    let s = S {
-       x: 5,
-    };
-
-    let s = S { //~ ERROR the trait bound `{float}: Foo` is not satisfied
-        x: 5.0,
-    };
-
-    let s = S {
-        x: Some(5.0),
-    };
-}
diff --git a/src/test/compile-fail/consts/const-err3.rs b/src/test/compile-fail/consts/const-err3.rs
deleted file mode 100644
index fc10824f0c..0000000000
--- a/src/test/compile-fail/consts/const-err3.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-#![feature(rustc_attrs)]
-#![deny(const_err)]
-
-fn black_box<T>(_: T) {
-    unimplemented!()
-}
-
-fn main() {
-    let b = 200u8 + 200u8 + 200u8;
-    //~^ ERROR const_err
-    let c = 200u8 * 4;
-    //~^ ERROR const_err
-    let d = 42u8 - (42u8 + 1);
-    //~^ ERROR const_err
-    let _e = [5u8][1];
-    //~^ ERROR const_err
-    black_box(b);
-    black_box(c);
-    black_box(d);
-}
diff --git a/src/test/debuginfo/empty-string.rs b/src/test/debuginfo/empty-string.rs
index 8c5f67a660..bc4fac3183 100644
--- a/src/test/debuginfo/empty-string.rs
+++ b/src/test/debuginfo/empty-string.rs
@@ -2,6 +2,7 @@
 // ignore-android: FIXME(#10381)
 // compile-flags:-g
 // min-gdb-version: 7.7
+// ignore-gdb-version: 7.11.90 - 8.0.9
 // min-lldb-version: 310
 
 // === GDB TESTS ===================================================================================
diff --git a/src/test/debuginfo/generator-locals.rs b/src/test/debuginfo/generator-locals.rs
index 59dbfecc39..fd46c1a8b4 100644
--- a/src/test/debuginfo/generator-locals.rs
+++ b/src/test/debuginfo/generator-locals.rs
@@ -78,9 +78,9 @@ fn main() {
         _zzz(); // #break
         a = c;
     };
-    Pin::new(&mut b).resume();
-    Pin::new(&mut b).resume();
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
+    Pin::new(&mut b).resume(());
+    Pin::new(&mut b).resume(());
     _zzz(); // #break
 }
 
diff --git a/src/test/debuginfo/generator-objects.rs b/src/test/debuginfo/generator-objects.rs
index bfa7a05cad..f19a3c71dd 100644
--- a/src/test/debuginfo/generator-objects.rs
+++ b/src/test/debuginfo/generator-objects.rs
@@ -57,11 +57,11 @@ fn main() {
         println!("{} {} {}", a, c, d);
     };
     _zzz(); // #break
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
     _zzz(); // #break
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
     _zzz(); // #break
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
     _zzz(); // #break
 }
 
diff --git a/src/test/debuginfo/issue-12886.rs b/src/test/debuginfo/issue-12886.rs
index 892f7d9485..389221cbbf 100644
--- a/src/test/debuginfo/issue-12886.rs
+++ b/src/test/debuginfo/issue-12886.rs
@@ -6,7 +6,7 @@
 
 // gdb-command:run
 // gdb-command:next
-// gdb-check:[...]25[...]s
+// gdb-check:[...]24[...]let s = Some(5).unwrap(); // #break
 // gdb-command:continue
 
 #![feature(omit_gdb_pretty_printer_section)]
diff --git a/src/test/debuginfo/issue-57822.rs b/src/test/debuginfo/issue-57822.rs
index f18e41db0e..4de88e9dae 100644
--- a/src/test/debuginfo/issue-57822.rs
+++ b/src/test/debuginfo/issue-57822.rs
@@ -45,7 +45,7 @@ fn main() {
         yield;
     };
     let mut b = move || {
-        Pin::new(&mut a).resume();
+        Pin::new(&mut a).resume(());
         yield;
     };
 
diff --git a/src/test/debuginfo/no-debug-attribute.rs b/src/test/debuginfo/no-debug-attribute.rs
deleted file mode 100644
index db9ac4af62..0000000000
--- a/src/test/debuginfo/no-debug-attribute.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// ignore-lldb
-
-// compile-flags:-g
-
-// gdb-command:run
-
-// gdb-command:info locals
-// gdb-check:No locals.
-// gdb-command:continue
-
-// gdb-command:info locals
-// gdb-check:abc = 10
-// gdb-command:continue
-
-#![allow(unused_variables)]
-#![feature(no_debug)]
-#![feature(omit_gdb_pretty_printer_section)]
-#![omit_gdb_pretty_printer_section]
-
-#[inline(never)]
-fn id<T>(x: T) -> T {x}
-
-fn function_with_debuginfo() {
-    let abc = 10_usize;
-    id(abc); // #break
-}
-
-#[no_debug]
-fn function_without_debuginfo() {
-    let abc = -57i32;
-    id(abc); // #break
-}
-
-fn main() {
-    function_without_debuginfo();
-    function_with_debuginfo();
-}
diff --git a/src/test/incremental/const-generics/issue-68477.rs b/src/test/incremental/const-generics/issue-68477.rs
new file mode 100644
index 0000000000..925931bc4a
--- /dev/null
+++ b/src/test/incremental/const-generics/issue-68477.rs
@@ -0,0 +1,23 @@
+// edition:2018
+// revisions:rpass1
+#![feature(const_generics)]
+
+const FOO: usize = 1;
+
+struct Container<T> {
+    val: std::marker::PhantomData<T>,
+    blah: [(); FOO]
+}
+
+async fn dummy() {}
+
+async fn foo() {
+    let a: Container<&'static ()>;
+    dummy().await;
+}
+
+fn is_send<T: Send>(_: T) {}
+
+fn main() {
+    is_send(foo());
+}
diff --git a/src/test/incremental/crate_hash_reorder.rs b/src/test/incremental/crate_hash_reorder.rs
index 5aba2a6703..6e06e67b66 100644
--- a/src/test/incremental/crate_hash_reorder.rs
+++ b/src/test/incremental/crate_hash_reorder.rs
@@ -7,11 +7,9 @@
 
 // Check that reordering otherwise identical items is not considered a
 // change at all.
-#[rustc_clean(label="Krate", cfg="rpass2")]
-
+#[rustc_clean(label = "hir_crate", cfg = "rpass2")]
 // But removing an item, naturally, is.
-#[rustc_dirty(label="Krate", cfg="rpass3")]
-
+#[rustc_dirty(label = "hir_crate", cfg = "rpass3")]
 #[cfg(rpass1)]
 pub struct X {
     pub x: u32,
@@ -26,4 +24,4 @@ pub struct X {
     pub x: u32,
 }
 
-pub fn main() { }
+pub fn main() {}
diff --git a/src/test/incremental/cyclic-trait-hierarchy.rs b/src/test/incremental/cyclic-trait-hierarchy.rs
index 27287d06d5..03bb5eea76 100644
--- a/src/test/incremental/cyclic-trait-hierarchy.rs
+++ b/src/test/incremental/cyclic-trait-hierarchy.rs
@@ -1,4 +1,4 @@
-// Adapated from rust-lang/rust#58813
+// Adapted from rust-lang/rust#58813
 
 // revisions: rpass1 cfail2
 
diff --git a/src/test/incremental/issue-38222.rs b/src/test/incremental/issue-38222.rs
index df08661c15..20d4d4200b 100644
--- a/src/test/incremental/issue-38222.rs
+++ b/src/test/incremental/issue-38222.rs
@@ -1,18 +1,14 @@
-// Test that debuginfo does not introduce a dependency edge to the Krate
+// Test that debuginfo does not introduce a dependency edge to the hir_crate
 // dep-node.
 
 // revisions:rpass1 rpass2
 // compile-flags: -Z query-dep-graph
 
-
 #![feature(rustc_attrs)]
-
-
-#![rustc_partition_reused(module="issue_38222-mod1", cfg="rpass2")]
-
-// If codegen had added a dependency edge to the Krate dep-node, nothing would
+#![rustc_partition_reused(module = "issue_38222-mod1", cfg = "rpass2")]
+// If codegen had added a dependency edge to the hir_crate dep-node, nothing would
 // be re-used, so checking that this module was re-used is sufficient.
-#![rustc_partition_reused(module="issue_38222", cfg="rpass2")]
+#![rustc_partition_reused(module = "issue_38222", cfg = "rpass2")]
 
 //[rpass1] compile-flags: -C debuginfo=1
 //[rpass2] compile-flags: -C debuginfo=1
diff --git a/src/test/incremental/issue-62649-path-collisions-happen.rs b/src/test/incremental/issue-62649-path-collisions-happen.rs
new file mode 100644
index 0000000000..ee81be76ba
--- /dev/null
+++ b/src/test/incremental/issue-62649-path-collisions-happen.rs
@@ -0,0 +1,13 @@
+// revisions: rpass1 rpass2
+
+#[cfg(rpass1)]
+pub trait Something {
+    fn foo();
+}
+
+#[cfg(rpass2)]
+pub struct Something {
+    pub foo: u8,
+}
+
+fn main() {}
diff --git a/src/test/incremental/krate-inherent.rs b/src/test/incremental/krate-inherent.rs
index 6e791eacdf..2c04e11052 100644
--- a/src/test/incremental/krate-inherent.rs
+++ b/src/test/incremental/krate-inherent.rs
@@ -4,20 +4,20 @@
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
-#![rustc_partition_reused(module="krate_inherent-x", cfg="cfail2")]
+#![rustc_partition_reused(module = "krate_inherent-x", cfg = "cfail2")]
 #![crate_type = "rlib"]
 
 pub mod x {
     pub struct Foo;
     impl Foo {
-        pub fn foo(&self) { }
+        pub fn foo(&self) {}
     }
 
     pub fn method() {
         let x: Foo = Foo;
-        x.foo(); // inherent methods used to add an edge from Krate
+        x.foo(); // inherent methods used to add an edge from hir_crate
     }
 }
 
 #[cfg(cfail1)]
-pub fn bar() { } // remove this unrelated fn in cfail2, which should not affect `x::method`
+pub fn bar() {} // remove this unrelated fn in cfail2, which should not affect `x::method`
diff --git a/src/test/incremental/krate-inlined.rs b/src/test/incremental/krate-inlined.rs
index dfb18166ae..6b1db74a37 100644
--- a/src/test/incremental/krate-inlined.rs
+++ b/src/test/incremental/krate-inlined.rs
@@ -1,5 +1,5 @@
 // Regr. test that using HIR inlined from another krate does *not* add
-// a dependency from the local Krate node. We can't easily test that
+// a dependency from the local hir_crate node. We can't easily test that
 // directly anymore, so now we test that we get reuse.
 
 // revisions: rpass1 rpass2
@@ -7,7 +7,7 @@
 
 #![allow(warnings)]
 #![feature(rustc_attrs)]
-#![rustc_partition_reused(module="krate_inlined-x", cfg="rpass2")]
+#![rustc_partition_reused(module = "krate_inlined-x", cfg = "rpass2")]
 
 fn main() {
     x::method();
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs b/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs
new file mode 100644
index 0000000000..4d48a5f0ac
--- /dev/null
+++ b/src/test/incremental/thinlto/cgu_invalidated_when_export_added.rs
@@ -0,0 +1,26 @@
+// revisions: cfail1 cfail2
+// build-pass
+
+// rust-lang/rust#69798:
+//
+// This is analgous to cgu_invalidated_when_import_added, but it covers a
+// problem uncovered where a change to the *export* set caused a link failure
+// when reusing post-LTO optimized object code.
+
+pub struct Foo {}
+impl Drop for Foo {
+    fn drop(&mut self) {
+        println!("Dropping Foo");
+    }
+}
+#[no_mangle]
+pub extern "C" fn run() {
+    thread_local! { pub static FOO : Foo = Foo { } ; }
+
+    #[cfg(cfail2)]
+    {
+        FOO.with(|_f| ())
+    }
+}
+
+pub fn main() { run() }
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs b/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs
new file mode 100644
index 0000000000..e85b4856f3
--- /dev/null
+++ b/src/test/incremental/thinlto/cgu_invalidated_when_export_removed.rs
@@ -0,0 +1,26 @@
+// revisions: cfail1 cfail2
+// build-pass
+
+// rust-lang/rust#69798:
+//
+// This is analgous to cgu_invalidated_when_export_added, but it covers the
+// other direction. This is analogous to cgu_invalidated_when_import_added: we
+// include it, because it may uncover bugs in variant implementation strategies.
+
+pub struct Foo {}
+impl Drop for Foo {
+    fn drop(&mut self) {
+        println!("Dropping Foo");
+    }
+}
+#[no_mangle]
+pub extern "C" fn run() {
+    thread_local! { pub static FOO : Foo = Foo { } ; }
+
+    #[cfg(cfail1)]
+    {
+        FOO.with(|_f| ())
+    }
+}
+
+pub fn main() { run() }
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs b/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs
index 42168dd273..9c17c8745f 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs
+++ b/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs
@@ -4,7 +4,7 @@
 
 // rust-lang/rust#59535:
 //
-// This is analgous to cgu_invalidated_when_import_removed.rs, but it covers
+// This is analogous to cgu_invalidated_when_import_removed.rs, but it covers
 // the other direction:
 //
 // We start with a call-graph like `[A] -> [B -> D] [C]` (where the letters are
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs b/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
index 19ce7b3e14..1214e37f98 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
+++ b/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
@@ -41,7 +41,7 @@ mod foo {
     // In cfail2, ThinLTO decides that foo() does not get inlined into main, and
     // instead bar() gets inlined into foo(). But faulty logic in our incr.
     // ThinLTO implementation thought that `main()` is unchanged and thus reused
-    // the object file still containing a call to the now non-existant bar().
+    // the object file still containing a call to the now non-existent bar().
     pub fn foo(){
         bar()
     }
diff --git a/src/test/incremental/warnings-reemitted.rs b/src/test/incremental/warnings-reemitted.rs
index 5fc8939582..0eac2a1d57 100644
--- a/src/test/incremental/warnings-reemitted.rs
+++ b/src/test/incremental/warnings-reemitted.rs
@@ -2,8 +2,8 @@
 // compile-flags: -Coverflow-checks=on
 // build-pass (FIXME(62277): could be check-pass?)
 
-#![warn(const_err)]
+#![warn(arithmetic_overflow)]
 
 fn main() {
-    let _ = 255u8 + 1; //~ WARNING attempt to add with overflow
+    let _ = 255u8 + 1; //~ WARNING operation will overflow
 }
diff --git a/src/test/mir-opt/const_prop/discriminant.rs b/src/test/mir-opt/const_prop/discriminant.rs
index 07bbd9202b..667d21fc14 100644
--- a/src/test/mir-opt/const_prop/discriminant.rs
+++ b/src/test/mir-opt/const_prop/discriminant.rs
@@ -10,18 +10,18 @@ fn main() {
 //      ...
 //      _3 = std::option::Option::<bool>::Some(const true,);
 //      _4 = discriminant(_3);
-//      switchInt(move _4) -> [1isize: bb3, otherwise: bb2];
+//      switchInt(move _4) -> [1isize: bb2, otherwise: bb1];
 //  }
 //  bb1: {
-//      _2 = const 42i32;
+//      _2 = const 10i32;
 //      goto -> bb4;
 //  }
 //  bb2: {
-//      _2 = const 10i32;
-//      goto -> bb4;
+//      switchInt(((_3 as Some).0: bool)) -> [false: bb1, otherwise: bb3];
 //  }
 //  bb3: {
-//      switchInt(((_3 as Some).0: bool)) -> [false: bb2, otherwise: bb1];
+//      _2 = const 42i32;
+//      goto -> bb4;
 //  }
 //  bb4: {
 //      _1 = Add(move _2, const 0i32);
@@ -33,18 +33,18 @@ fn main() {
 //      ...
 //      _3 = const Scalar(0x01) : std::option::Option<bool>;
 //      _4 = const 1isize;
-//      switchInt(const 1isize) -> [1isize: bb3, otherwise: bb2];
+//      switchInt(const 1isize) -> [1isize: bb2, otherwise: bb1];
 //  }
 //  bb1: {
-//      _2 = const 42i32;
+//      _2 = const 10i32;
 //      goto -> bb4;
 //  }
 //  bb2: {
-//      _2 = const 10i32;
-//      goto -> bb4;
+//      switchInt(const true) -> [false: bb1, otherwise: bb3];
 //  }
 //  bb3: {
-//      switchInt(const true) -> [false: bb2, otherwise: bb1];
+//      _2 = const 42i32;
+//      goto -> bb4;
 //  }
 //  bb4: {
 //      _1 = Add(move _2, const 0i32);
diff --git a/src/test/mir-opt/exponential-or.rs b/src/test/mir-opt/exponential-or.rs
new file mode 100644
index 0000000000..4c23582e1f
--- /dev/null
+++ b/src/test/mir-opt/exponential-or.rs
@@ -0,0 +1,76 @@
+// Test that simple or-patterns don't get expanded to exponentially large CFGs
+
+// ignore-tidy-linelength
+
+#![feature(or_patterns)]
+
+fn match_tuple(x: (u32, bool, Option<i32>, u32)) -> u32 {
+    match x {
+        (y @ (1 | 4), true | false, Some(1 | 8) | None, z @ (6..=9 | 13..=16)) => y ^ z,
+        _ => 0,
+    }
+}
+
+fn main() {}
+
+// END RUST SOURCE
+
+// START rustc.match_tuple.SimplifyCfg-initial.after.mir
+// scope 1 {
+//     debug y => _7;
+//     debug z => _8;
+// }
+// bb0: {
+//     FakeRead(ForMatchedPlace, _1);
+//     switchInt((_1.0: u32)) -> [1u32: bb2, 4u32: bb2, otherwise: bb1];
+// }
+// bb1: {
+//     _0 = const 0u32;
+//     goto -> bb10;
+// }
+// bb2: {
+//     _2 = discriminant((_1.2: std::option::Option<i32>));
+//     switchInt(move _2) -> [0isize: bb4, 1isize: bb3, otherwise: bb1];
+// }
+// bb3: {
+//     switchInt((((_1.2: std::option::Option<i32>) as Some).0: i32)) -> [1i32: bb4, 8i32: bb4, otherwise: bb1];
+// }
+// bb4: {
+//     _5 = Le(const 6u32, (_1.3: u32));
+//     switchInt(move _5) -> [false: bb6, otherwise: bb5];
+// }
+// bb5: {
+//     _6 = Le((_1.3: u32), const 9u32);
+//     switchInt(move _6) -> [false: bb6, otherwise: bb8];
+// }
+// bb6: {
+//     _3 = Le(const 13u32, (_1.3: u32));
+//     switchInt(move _3) -> [false: bb1, otherwise: bb7];
+// }
+// bb7: {
+//     _4 = Le((_1.3: u32), const 16u32);
+//     switchInt(move _4) -> [false: bb1, otherwise: bb8];
+// }
+// bb8: {
+//     falseEdges -> [real: bb9, imaginary: bb1];
+// }
+// bb9: {
+//     StorageLive(_7);
+//     _7 = (_1.0: u32);
+//     StorageLive(_8);
+//     _8 = (_1.3: u32);
+//     StorageLive(_9);
+//     _9 = _7;
+//     StorageLive(_10);
+//     _10 = _8;
+//     _0 = BitXor(move _9, move _10);
+//     StorageDead(_10);
+//     StorageDead(_9);
+//     StorageDead(_8);
+//     StorageDead(_7);
+//     goto -> bb10;
+// }
+// bb10: {
+//     return;
+// }
+// END rustc.match_tuple.SimplifyCfg-initial.after.mir
diff --git a/src/test/mir-opt/generator-drop-cleanup.rs b/src/test/mir-opt/generator-drop-cleanup.rs
index f97e1ba6c8..278dc49c92 100644
--- a/src/test/mir-opt/generator-drop-cleanup.rs
+++ b/src/test/mir-opt/generator-drop-cleanup.rs
@@ -13,12 +13,12 @@ fn main() {
 
 // START rustc.main-{{closure}}.generator_drop.0.mir
 // bb0: {
-//     _5 = discriminant((*_1));
-//     switchInt(move _5) -> [0u32: bb4, 3u32: bb7, otherwise: bb8];
+//     _7 = discriminant((*_1));
+//     switchInt(move _7) -> [0u32: bb4, 3u32: bb7, otherwise: bb8];
 // }
 // bb1: {
+//     StorageDead(_4);
 //     StorageDead(_3);
-//     StorageDead(_2);
 //     goto -> bb5;
 // }
 // bb2: {
@@ -37,8 +37,8 @@ fn main() {
 //     goto -> bb3;
 // }
 // bb7: {
-//     StorageLive(_2);
 //     StorageLive(_3);
+//     StorageLive(_4);
 //     goto -> bb1;
 // }
 // bb8: {
diff --git a/src/test/mir-opt/generator-storage-dead-unwind.rs b/src/test/mir-opt/generator-storage-dead-unwind.rs
index ecce0a08c7..82b216a99c 100644
--- a/src/test/mir-opt/generator-storage-dead-unwind.rs
+++ b/src/test/mir-opt/generator-storage-dead-unwind.rs
@@ -31,81 +31,81 @@ fn main() {
 
 // START rustc.main-{{closure}}.StateTransform.before.mir
 // ...
-// let _2: Foo;
+// let _3: Foo;
 // ...
-// let mut _7: Foo;
+// let mut _8: Foo;
 // ...
-// let mut _9: Bar;
+// let mut _10: Bar;
 // scope 1 {
-//     debug a => _2;
-//     let _3: Bar;
+//     debug a => _3;
+//     let _4: Bar;
 //     scope 2 {
-//         debug b => _3;
+//         debug b => _4;
 //     }
 // }
 // bb0: {
-//     StorageLive(_2);
-//     _2 = Foo(const 5i32,);
 //     StorageLive(_3);
-//     _3 = Bar(const 6i32,);
+//     _3 = Foo(const 5i32,);
+//     StorageLive(_4);
+//     _4 = Bar(const 6i32,);
 //     ...
-//     _1 = suspend(move _5) -> [resume: bb2, drop: bb4];
+//     _5 = yield(move _6) -> [resume: bb2, drop: bb4];
 // }
 // bb1 (cleanup): {
 //     resume;
 // }
 // bb2: {
 //     ...
-//     StorageLive(_6);
 //     StorageLive(_7);
-//     _7 = move _2;
-//     _6 = const take::<Foo>(move _7) -> [return: bb7, unwind: bb9];
+//     StorageLive(_8);
+//     _8 = move _3;
+//     _7 = const take::<Foo>(move _8) -> [return: bb7, unwind: bb9];
 // }
 // bb3 (cleanup): {
-//     StorageDead(_2);
+//     StorageDead(_3);
 //     drop(_1) -> bb1;
 // }
 // bb4: {
 //     ...
-//     StorageDead(_3);
-//     drop(_2) -> [return: bb5, unwind: bb3];
+//     StorageDead(_4);
+//     drop(_3) -> [return: bb5, unwind: bb3];
 // }
 // bb5: {
-//     StorageDead(_2);
+//     StorageDead(_3);
 //     drop(_1) -> [return: bb6, unwind: bb1];
 // }
 // bb6: {
 //     generator_drop;
 // }
 // bb7: {
+//     StorageDead(_8);
 //     StorageDead(_7);
-//     StorageDead(_6);
-//     StorageLive(_8);
 //     StorageLive(_9);
-//     _9 = move _3;
-//     _8 = const take::<Bar>(move _9) -> [return: bb10, unwind: bb11];
+//     StorageLive(_10);
+//     _10 = move _4;
+//     _9 = const take::<Bar>(move _10) -> [return: bb10, unwind: bb11];
 // }
 // bb8 (cleanup): {
+//     StorageDead(_4);
 //     StorageDead(_3);
-//     StorageDead(_2);
 //     drop(_1) -> bb1;
 // }
 // bb9 (cleanup): {
+//     StorageDead(_8);
 //     StorageDead(_7);
-//     StorageDead(_6);
 //     goto -> bb8;
 // }
 // bb10: {
+//     StorageDead(_10);
 //     StorageDead(_9);
-//     StorageDead(_8);
 //     ...
+//     StorageDead(_4);
 //     StorageDead(_3);
-//     StorageDead(_2);
 //     drop(_1) -> [return: bb12, unwind: bb1];
 // }
 // bb11 (cleanup): {
+//     StorageDead(_10);
 //     StorageDead(_9);
-//     StorageDead(_8);
 //     goto -> bb8;
 // }
 // bb12: {
diff --git a/src/test/mir-opt/issue-62289.rs b/src/test/mir-opt/issue-62289.rs
index a3b517e9bc..8e619ffdf8 100644
--- a/src/test/mir-opt/issue-62289.rs
+++ b/src/test/mir-opt/issue-62289.rs
@@ -32,47 +32,47 @@ fn main() {
 //     bb2: {
 //         StorageDead(_4);
 //         _5 = discriminant(_3);
-//         switchInt(move _5) -> [0isize: bb10, 1isize: bb5, otherwise: bb4];
+//         switchInt(move _5) -> [0isize: bb4, 1isize: bb6, otherwise: bb5];
 //     }
 //     bb3 (cleanup): {
 //         drop(_2) -> bb1;
 //     }
 //     bb4: {
-//         unreachable;
+//         StorageLive(_10);
+//         _10 = ((_3 as Ok).0: u32);
+//         (*_2) = _10;
+//         StorageDead(_10);
+//         _1 = move _2;
+//         drop(_2) -> [return: bb12, unwind: bb11];
 //     }
 //     bb5: {
+//         unreachable;
+//     }
+//     bb6: {
 //         StorageLive(_6);
 //         _6 = ((_3 as Err).0: std::option::NoneError);
 //         StorageLive(_8);
 //         StorageLive(_9);
 //         _9 = _6;
-//         _8 = const <std::option::NoneError as std::convert::From<std::option::NoneError>>::from(move _9) -> [return: bb7, unwind: bb3];
+//         _8 = const <std::option::NoneError as std::convert::From<std::option::NoneError>>::from(move _9) -> [return: bb8, unwind: bb3];
 //     }
-//     bb6: {
+//     bb7: {
 //         return;
 //     }
-//     bb7: {
+//     bb8: {
 //         StorageDead(_9);
-//         _0 = const <std::option::Option<std::boxed::Box<u32>> as std::ops::Try>::from_error(move _8) -> [return: bb8, unwind: bb3];
+//         _0 = const <std::option::Option<std::boxed::Box<u32>> as std::ops::Try>::from_error(move _8) -> [return: bb9, unwind: bb3];
 //     }
-//     bb8: {
+//     bb9: {
 //         StorageDead(_8);
 //         StorageDead(_6);
-//         drop(_2) -> bb9;
+//         drop(_2) -> bb10;
 //     }
-//     bb9: {
+//     bb10: {
 //         StorageDead(_2);
 //         StorageDead(_1);
 //         StorageDead(_3);
-//         goto -> bb6;
-//     }
-//     bb10: {
-//         StorageLive(_10);
-//         _10 = ((_3 as Ok).0: u32);
-//         (*_2) = _10;
-//         StorageDead(_10);
-//         _1 = move _2;
-//         drop(_2) -> [return: bb12, unwind: bb11];
+//         goto -> bb7;
 //     }
 //     bb11 (cleanup): {
 //         drop(_1) -> bb1;
@@ -85,7 +85,7 @@ fn main() {
 //     bb13: {
 //         StorageDead(_1);
 //         StorageDead(_3);
-//         goto -> bb6;
+//         goto -> bb7;
 //     }
 // }
 // END rustc.test.ElaborateDrops.before.mir
diff --git a/src/test/mir-opt/match-arm-scopes.rs b/src/test/mir-opt/match-arm-scopes.rs
index 4412a16e74..7afc3bbd6f 100644
--- a/src/test/mir-opt/match-arm-scopes.rs
+++ b/src/test/mir-opt/match-arm-scopes.rs
@@ -28,10 +28,7 @@ const CASES: &[(bool, bool, bool, i32)] = &[
 
 fn main() {
     for &(cond, items_1, items_2, result) in CASES {
-        assert_eq!(
-            complicated_match(cond, (items_1, items_2, String::new())),
-            result,
-        );
+        assert_eq!(complicated_match(cond, (items_1, items_2, String::new())), result,);
     }
 }
 
@@ -64,31 +61,38 @@ fn main() {
 // }
 // bb0: {
 //     FakeRead(ForMatchedPlace, _2);
-//     switchInt((_2.0: bool)) -> [false: bb2, otherwise: bb5];
+//     switchInt((_2.0: bool)) -> [false: bb2, otherwise: bb3];
 // }
 // bb1 (cleanup): {
 //     resume;
 // }
-// bb2: {
-//     falseEdges -> [real: bb8, imaginary: bb3];
+// bb2: {                               // pre-binding for arm 1 first pattern
+//     falseEdges -> [real: bb9, imaginary: bb4];
 // }
 // bb3: {
-//     falseEdges -> [real: bb17, imaginary: bb4];
+//     switchInt((_2.1: bool)) -> [false: bb4, otherwise: bb5];
 // }
-// bb4: {
-//     falseEdges -> [real: bb25, imaginary: bb26];
+// bb4: {                               // pre-binding for arm 1 second pattern
+//     falseEdges -> [real: bb18, imaginary: bb6];
 // }
 // bb5: {
-//     switchInt((_2.1: bool)) -> [false: bb3, otherwise: bb6];
+//     switchInt((_2.0: bool)) -> [false: bb7, otherwise: bb6];
 // }
-// bb6: {
-//     switchInt((_2.0: bool)) -> [false: bb26, otherwise: bb4];
+// bb6: {                               // pre-binding for arm 2 first pattern
+//     falseEdges -> [real: bb26, imaginary: bb7];
 // }
-// bb7: {                               // arm 1
+// bb7: {                               // bindings for arm 2 - second pattern
+//     StorageLive(_15);
+//     _15 = (_2.1: bool);
+//     StorageLive(_16);
+//     _16 = move (_2.2: std::string::String);
+//     goto -> bb25;
+// }
+// bb8: {                               // arm 1
 //     _0 = const 1i32;
-//     drop(_7) -> [return: bb23, unwind: bb13];
+//     drop(_7) -> [return: bb24, unwind: bb14];
 // }
-// bb8: {                               // guard - first time
+// bb9: {                               // guard - first time
 //     StorageLive(_6);
 //     _6 = &(_2.1: bool);
 //     StorageLive(_8);
@@ -99,34 +103,34 @@ fn main() {
 //     StorageLive(_10);
 //     _10 = _1;
 //     FakeRead(ForMatchedPlace, _10);
-//     switchInt(_10) -> [false: bb10, otherwise: bb9];
+//     switchInt(_10) -> [false: bb11, otherwise: bb10];
 // }
-// bb9: {
-//     falseEdges -> [real: bb11, imaginary: bb10];
+// bb10: {
+//     falseEdges -> [real: bb12, imaginary: bb11];
 // }
-// bb10: {                              // `else` block - first time
+// bb11: {                              // `else` block - first time
 //     _9 = (*_6);
 //     StorageDead(_10);
-//     switchInt(move _9) -> [false: bb16, otherwise: bb15];
+//     switchInt(move _9) -> [false: bb17, otherwise: bb16];
 // }
-// bb11: {                              // `return 3` - first time
+// bb12: {                              // `return 3` - first time
 //     _0 = const 3i32;
 //     StorageDead(_10);
 //     StorageDead(_9);
 //     StorageDead(_8);
 //     StorageDead(_6);
-//     goto -> bb14;
+//     goto -> bb15;
 // }
-// bb12: {
+// bb13: {
 //     return;
 // }
-// bb13 (cleanup): {
+// bb14 (cleanup): {
 //     drop(_2) -> bb1;
 // }
-// bb14: {
-//     drop(_2) -> [return: bb12, unwind: bb1];
-// }
 // bb15: {
+//     drop(_2) -> [return: bb13, unwind: bb1];
+// }
+// bb16: {
 //     StorageDead(_9);
 //     FakeRead(ForMatchGuard, _3);
 //     FakeRead(ForMatchGuard, _4);
@@ -136,15 +140,15 @@ fn main() {
 //     _5 = (_2.1: bool);
 //     StorageLive(_7);
 //     _7 = move (_2.2: std::string::String);
-//     goto -> bb7;
+//     goto -> bb8;
 // }
-// bb16: {                              // guard otherwise case - first time
+// bb17: {                              // guard otherwise case - first time
 //     StorageDead(_9);
 //     StorageDead(_8);
 //     StorageDead(_6);
-//     falseEdges -> [real: bb5, imaginary: bb3];
+//     falseEdges -> [real: bb3, imaginary: bb4];
 // }
-// bb17: {                              // guard - second time
+// bb18: {                              // guard - second time
 //     StorageLive(_6);
 //     _6 = &(_2.0: bool);
 //     StorageLive(_8);
@@ -155,25 +159,25 @@ fn main() {
 //     StorageLive(_13);
 //     _13 = _1;
 //     FakeRead(ForMatchedPlace, _13);
-//     switchInt(_13) -> [false: bb19, otherwise: bb18];
+//     switchInt(_13) -> [false: bb20, otherwise: bb19];
 // }
-// bb18: {
-//     falseEdges -> [real: bb20, imaginary: bb19];
+// bb19: {
+//     falseEdges -> [real: bb21, imaginary: bb20];
 // }
-// bb19: {                              // `else` block - second time
+// bb20: {                              // `else` block - second time
 //     _12 = (*_6);
 //     StorageDead(_13);
-//     switchInt(move _12) -> [false: bb22, otherwise: bb21];
+//     switchInt(move _12) -> [false: bb23, otherwise: bb22];
 // }
-// bb20: {
+// bb21: {
 //     _0 = const 3i32;
 //     StorageDead(_13);
 //     StorageDead(_12);
 //     StorageDead(_8);
 //     StorageDead(_6);
-//     goto -> bb14;
+//     goto -> bb15;
 // }
-// bb21: {                              // bindings for arm 1
+// bb22: {                              // bindings for arm 1
 //     StorageDead(_12);
 //     FakeRead(ForMatchGuard, _3);
 //     FakeRead(ForMatchGuard, _4);
@@ -183,46 +187,40 @@ fn main() {
 //     _5 = (_2.0: bool);
 //     StorageLive(_7);
 //     _7 = move (_2.2: std::string::String);
-//     goto -> bb7;
+//     goto -> bb8;
 // }
-// bb22: {                              // Guard otherwise case - second time
+// bb23: {                              // Guard otherwise case - second time
 //     StorageDead(_12);
 //     StorageDead(_8);
 //     StorageDead(_6);
-//     falseEdges -> [real: bb6, imaginary: bb4];
+//     falseEdges -> [real: bb5, imaginary: bb6];
 // }
-// bb23: {                              // rest of arm 1
+// bb24: {                              // rest of arm 1
 //     StorageDead(_7);
 //     StorageDead(_5);
 //     StorageDead(_8);
 //     StorageDead(_6);
 //     goto -> bb28;
 // }
-// bb24: {                              // arm 2
+// bb25: {                              // arm 2
 //     _0 = const 2i32;
-//     drop(_16) -> [return: bb27, unwind: bb13];
+//     drop(_16) -> [return: bb27, unwind: bb14];
 // }
-// bb25: {                              // bindings for arm 2 - first pattern
+// bb26: {                              // bindings for arm 2 - first pattern
 //     StorageLive(_15);
 //     _15 = (_2.1: bool);
 //     StorageLive(_16);
 //     _16 = move (_2.2: std::string::String);
-//     goto -> bb24;
-// }
-// bb26: {                              // bindings for arm 2 - second pattern
-//     StorageLive(_15);
-//     _15 = (_2.1: bool);
-//     StorageLive(_16);
-//     _16 = move (_2.2: std::string::String);
-//     goto -> bb24;
+//     goto -> bb25;
 // }
+
 // bb27: {                              // rest of arm 2
 //     StorageDead(_16);
 //     StorageDead(_15);
 //     goto -> bb28;
 // }
 // bb28: {
-//     drop(_2) -> [return: bb12, unwind: bb1];
+//     drop(_2) -> [return: bb13, unwind: bb1];
 // }
 // END rustc.complicated_match.SimplifyCfg-initial.after.mir
 // START rustc.complicated_match.ElaborateDrops.after.mir
diff --git a/src/test/mir-opt/match_false_edges.rs b/src/test/mir-opt/match_false_edges.rs
index 2c20c35e4a..237828d902 100644
--- a/src/test/mir-opt/match_false_edges.rs
+++ b/src/test/mir-opt/match_false_edges.rs
@@ -4,7 +4,7 @@ fn guard() -> bool {
     false
 }
 
-fn guard2(_:i32) -> bool {
+fn guard2(_: i32) -> bool {
     true
 }
 
@@ -45,20 +45,20 @@ fn main() {
 //      _2 = std::option::Option::<i32>::Some(const 42i32,);
 //      FakeRead(ForMatchedPlace, _2);
 //      _3 = discriminant(_2);
-//      switchInt(move _3) -> [0isize: bb4, 1isize: bb2, otherwise: bb5];
+//      switchInt(move _3) -> [0isize: bb2, 1isize: bb3, otherwise: bb5];
 //  }
 //  bb1 (cleanup): {
 //      resume;
 //  }
-//  bb2: {
-//      falseEdges -> [real: bb6, imaginary: bb3]; //pre_binding1
+//  bb2: {  // pre_binding3 and arm3
+//      _1 = (const 3i32, const 3i32);
+//      goto -> bb11;
 //  }
 //  bb3: {
-//      falseEdges -> [real: bb10, imaginary: bb4]; //pre_binding2
+//      falseEdges -> [real: bb6, imaginary: bb4]; //pre_binding1
 //  }
-//  bb4: { //pre_binding3 and arm3
-//      _1 = (const 3i32, const 3i32);
-//      goto -> bb11;
+//  bb4: {
+//      falseEdges -> [real: bb10, imaginary: bb2]; //pre_binding2
 //  }
 //  bb5: {
 //      unreachable;
@@ -91,7 +91,7 @@ fn main() {
 //  bb9: { // to pre_binding2
 //      StorageDead(_7);
 //      StorageDead(_6);
-//      goto -> bb3;
+//      goto -> bb4;
 //  }
 //  bb10: { // arm2
 //      StorageLive(_9);
@@ -103,7 +103,7 @@ fn main() {
 //      StorageDead(_9);
 //      goto -> bb11;
 //  }
-//  bb11: { // arm3
+//  bb11: {
 //      StorageDead(_2);
 //      StorageDead(_1);
 //      _0 = ();
@@ -117,31 +117,41 @@ fn main() {
 //      _2 = std::option::Option::<i32>::Some(const 42i32,);
 //      FakeRead(ForMatchedPlace, _2);
 //      _3 = discriminant(_2);
-//      switchInt(move _3) -> [0isize: bb3, 1isize: bb2, otherwise: bb4];
+//      switchInt(move _3) -> [0isize: bb2, 1isize: bb3, otherwise: bb5];
 //  }
 //  bb1 (cleanup): {
 //      resume;
 //  }
-//  bb2: {
-//      falseEdges -> [real: bb5, imaginary: bb3];
+//  bb2: { // pre_binding2
+//      falseEdges -> [real: bb10, imaginary: bb4];
 //  }
-//  bb3: {
-//      falseEdges -> [real: bb9, imaginary: bb10];
+//  bb3: { // pre_binding1
+//      falseEdges -> [real: bb6, imaginary: bb2];
 //  }
-//  bb4: { // to arm3 (can skip 2 since this is `Some`)
+//  bb4: { // binding3 and arm3
+//      StorageLive(_9);
+//      _9 = ((_2 as Some).0: i32);
+//      StorageLive(_10);
+//      _10 = _9;
+//      _1 = (const 2i32, move _10);
+//      StorageDead(_10);
+//      StorageDead(_9);
+//      goto -> bb11;
+//  }
+//  bb5: {
 //      unreachable;
 //  }
-//  bb5: { // binding1 and guard
+//  bb6: {
 //      StorageLive(_6);
 //      _6 = &((_2 as Some).0: i32);
 //      _4 = &shallow _2;
 //      StorageLive(_7);
-//      _7 = const guard() -> [return: bb6, unwind: bb1];
+//      _7 = const guard() -> [return: bb7, unwind: bb1];
 //  }
-//  bb6: { // end of guard
-//      switchInt(move _7) -> [false: bb8, otherwise: bb7];
+//  bb7: { // end of guard
+//      switchInt(move _7) -> [false: bb9, otherwise: bb8];
 //  }
-//  bb7: {
+//  bb8: {
 //      StorageDead(_7);
 //      FakeRead(ForMatchGuard, _4);
 //      FakeRead(ForGuardBinding, _6);
@@ -155,25 +165,15 @@ fn main() {
 //      StorageDead(_6);
 //      goto -> bb11;
 //  }
-//  bb8: { // to pre_binding3 (can skip 2 since this is `Some`)
+//  bb9: { // to pre_binding3 (can skip 2 since this is `Some`)
 //      StorageDead(_7);
 //      StorageDead(_6);
-//      falseEdges -> [real: bb10, imaginary: bb3];
+//      falseEdges -> [real: bb4, imaginary: bb2];
 //  }
-//  bb9: { // arm2
+//  bb10: { // arm2
 //      _1 = (const 3i32, const 3i32);
 //      goto -> bb11;
 //  }
-//  bb10: { // binding3 and arm3
-//      StorageLive(_9);
-//      _9 = ((_2 as Some).0: i32);
-//      StorageLive(_10);
-//      _10 = _9;
-//      _1 = (const 2i32, move _10);
-//      StorageDead(_10);
-//      StorageDead(_9);
-//      goto -> bb11;
-//  }
 //  bb11: {
 //      StorageDead(_2);
 //      StorageDead(_1);
@@ -188,31 +188,38 @@ fn main() {
 //      _2 = std::option::Option::<i32>::Some(const 1i32,);
 //      FakeRead(ForMatchedPlace, _2);
 //      _4 = discriminant(_2);
-//      switchInt(move _4) -> [1isize: bb2, otherwise: bb3];
+//      switchInt(move _4) -> [1isize: bb3, otherwise: bb2];
 //  }
 //  bb1 (cleanup): {
 //      resume;
 //  }
 //  bb2: {
-//      falseEdges -> [real: bb5, imaginary: bb3];
+//      falseEdges -> [real: bb10, imaginary: bb5];
 //  }
 //  bb3: {
-//      falseEdges -> [real: bb9, imaginary: bb4];
+//      falseEdges -> [real: bb6, imaginary: bb2];
 //  }
 //  bb4: {
-//      falseEdges -> [real: bb10, imaginary: bb14];
+//      StorageLive(_14);
+//      _14 = _2;
+//      _1 = const 4i32;
+//      StorageDead(_14);
+//      goto -> bb15;
 //  }
 //  bb5: {
+//      falseEdges -> [real: bb11, imaginary: bb4];
+//  }
+//  bb6: { //end of guard1
 //      StorageLive(_7);
 //      _7 = &((_2 as Some).0: i32);
 //      _5 = &shallow _2;
 //      StorageLive(_8);
-//      _8 = const guard() -> [return: bb6, unwind: bb1];
-//  }
-//  bb6: { //end of guard1
-//      switchInt(move _8) -> [false: bb8, otherwise: bb7];
+//      _8 = const guard() -> [return: bb7, unwind: bb1];
 //  }
 //  bb7: {
+//      switchInt(move _8) -> [false: bb9, otherwise: bb8];
+//  }
+//  bb8: {
 //      StorageDead(_8);
 //      FakeRead(ForMatchGuard, _5);
 //      FakeRead(ForGuardBinding, _7);
@@ -223,32 +230,32 @@ fn main() {
 //      StorageDead(_7);
 //      goto -> bb15;
 //  }
-//  bb8: {
+//  bb9: {
 //      StorageDead(_8);
 //      StorageDead(_7);
-//      falseEdges -> [real: bb3, imaginary: bb3];
+//      falseEdges -> [real: bb2, imaginary: bb2];
 //  }
-//  bb9: { // binding2 & arm2
+//  bb10: {  // binding2 & arm2
 //      StorageLive(_9);
 //      _9 = _2;
 //      _1 = const 2i32;
 //      StorageDead(_9);
 //      goto -> bb15;
 //  }
-//  bb10: { // binding3: Some(y) if guard2(y)
+//  bb11: { // binding3: Some(y) if guard2(y)
 //      StorageLive(_11);
 //      _11 = &((_2 as Some).0: i32);
 //      _5 = &shallow _2;
 //      StorageLive(_12);
 //      StorageLive(_13);
 //      _13 = (*_11);
-//      _12 = const guard2(move _13) -> [return: bb11, unwind: bb1];
+//      _12 = const guard2(move _13) -> [return: bb12, unwind: bb1];
 //  }
-//  bb11: { // end of guard2
+//  bb12: { // end of guard2
 //      StorageDead(_13);
-//      switchInt(move _12) -> [false: bb13, otherwise: bb12];
+//      switchInt(move _12) -> [false: bb14, otherwise: bb13];
 //  }
-//  bb12: { // binding4 & arm4
+//  bb13: { // binding4 & arm4
 //      StorageDead(_12);
 //      FakeRead(ForMatchGuard, _5);
 //      FakeRead(ForGuardBinding, _11);
@@ -259,17 +266,10 @@ fn main() {
 //      StorageDead(_11);
 //      goto -> bb15;
 //  }
-//  bb13: {
+//  bb14: {
 //      StorageDead(_12);
 //      StorageDead(_11);
-//      falseEdges -> [real: bb14, imaginary: bb14];
-//  }
-//  bb14: {
-//      StorageLive(_14);
-//      _14 = _2;
-//      _1 = const 4i32;
-//      StorageDead(_14);
-//      goto -> bb15;
+//      falseEdges -> [real: bb4, imaginary: bb4];
 //  }
 //  bb15: {
 //      StorageDead(_2);
diff --git a/src/test/mir-opt/match_test.rs b/src/test/mir-opt/match_test.rs
index 1ca75b1004..5ee3e1447d 100644
--- a/src/test/mir-opt/match_test.rs
+++ b/src/test/mir-opt/match_test.rs
@@ -20,35 +20,35 @@ fn main() {
 // START rustc.main.SimplifyCfg-initial.after.mir
 //    bb0: {
 //        ...
-//        switchInt(move _6) -> [false: bb6, otherwise: bb5];
+//        switchInt(move _6) -> [false: bb4, otherwise: bb1];
 //    }
 //    bb1: {
-//        falseEdges -> [real: bb9, imaginary: bb2];
+//        _7 = Lt(_1, const 10i32);
+//        switchInt(move _7) -> [false: bb4, otherwise: bb2];
 //    }
 //    bb2: {
-//        falseEdges -> [real: bb12, imaginary: bb3];
+//        falseEdges -> [real: bb9, imaginary: bb6];
 //    }
 //    bb3: {
-//        falseEdges -> [real: bb13, imaginary: bb4];
-//    }
-//    bb4: {
 //        _3 = const 3i32;
 //        goto -> bb14;
 //    }
+//    bb4: {
+//        _4 = Le(const 10i32, _1);
+//        switchInt(move _4) -> [false: bb7, otherwise: bb5];
+//    }
 //    bb5: {
-//        _7 = Lt(_1, const 10i32);
-//        switchInt(move _7) -> [false: bb6, otherwise: bb1];
+//        _5 = Le(_1, const 20i32);
+//        switchInt(move _5) -> [false: bb7, otherwise: bb6];
 //    }
 //    bb6: {
-//        _4 = Le(const 10i32, _1);
-//        switchInt(move _4) -> [false: bb8, otherwise: bb7];
+//        falseEdges -> [real: bb12, imaginary: bb8];
 //    }
 //    bb7: {
-//        _5 = Le(_1, const 20i32);
-//        switchInt(move _5) -> [false: bb8, otherwise: bb2];
+//        switchInt(_1) -> [-1i32: bb8, otherwise: bb3];
 //    }
 //    bb8: {
-//        switchInt(_1) -> [-1i32: bb3, otherwise: bb4];
+//        falseEdges -> [real: bb13, imaginary: bb3];
 //    }
 //    bb9: {
 //        _8 = &shallow _1;
@@ -64,7 +64,7 @@ fn main() {
 //    }
 //    bb11: {
 //        StorageDead(_9);
-//        falseEdges -> [real: bb4, imaginary: bb2];
+//        falseEdges -> [real: bb3, imaginary: bb6];
 //    }
 //    bb12: {
 //        _3 = const 1i32;
diff --git a/src/test/mir-opt/remove_fake_borrows.rs b/src/test/mir-opt/remove_fake_borrows.rs
index 965897ad54..294fe247c3 100644
--- a/src/test/mir-opt/remove_fake_borrows.rs
+++ b/src/test/mir-opt/remove_fake_borrows.rs
@@ -19,17 +19,17 @@ fn main() {
 // bb0: {
 //     FakeRead(ForMatchedPlace, _1);
 //     _3 = discriminant(_1);
-//     switchInt(move _3) -> [1isize: bb3, otherwise: bb2];
+//     switchInt(move _3) -> [1isize: bb2, otherwise: bb1];
 // }
 // bb1: {
-//     goto -> bb4;
-// }
-// bb2: {
 //     _0 = const 1i32;
 //     goto -> bb7;
 // }
+// bb2: {
+//     switchInt((*(*((_1 as Some).0: &'<empty> &'<empty> i32)))) -> [0i32: bb3, otherwise: bb1];
+// }
 // bb3: {
-//     switchInt((*(*((_1 as Some).0: &'<empty> &'<empty> i32)))) -> [0i32: bb1, otherwise: bb2];
+//     goto -> bb4;
 // }
 // bb4: {
 //     _4 = &shallow _1;
@@ -51,7 +51,7 @@ fn main() {
 // }
 // bb6: {
 //     StorageDead(_8);
-//     goto -> bb2;
+//     goto -> bb1;
 // }
 // bb7: {
 //     return;
@@ -65,17 +65,17 @@ fn main() {
 // bb0: {
 //     nop;
 //     _3 = discriminant(_1);
-//     switchInt(move _3) -> [1isize: bb3, otherwise: bb2];
+//     switchInt(move _3) -> [1isize: bb2, otherwise: bb1];
 // }
 // bb1: {
-//     goto -> bb4;
-// }
-// bb2: {
 //     _0 = const 1i32;
 //     goto -> bb7;
 // }
+// bb2: {
+//     switchInt((*(*((_1 as Some).0: &'<empty> &'<empty> i32)))) -> [0i32: bb3, otherwise: bb1];
+// }
 // bb3: {
-//     switchInt((*(*((_1 as Some).0: &'<empty> &'<empty> i32)))) -> [0i32: bb1, otherwise: bb2];
+//     goto -> bb4;
 // }
 // bb4: {
 //     nop;
@@ -97,7 +97,7 @@ fn main() {
 // }
 // bb6: {
 //     StorageDead(_8);
-//     goto -> bb2;
+//     goto -> bb1;
 // }
 // bb7: {
 //     return;
diff --git a/src/test/mir-opt/simplify_try.rs b/src/test/mir-opt/simplify_try.rs
index d85eff45b4..abac66d95c 100644
--- a/src/test/mir-opt/simplify_try.rs
+++ b/src/test/mir-opt/simplify_try.rs
@@ -47,22 +47,22 @@ fn main() {
 //     }
 //     bb0: {
 //         _5 = discriminant(_1);
-//         switchInt(move _5) -> [0isize: bb3, otherwise: bb1];
+//         switchInt(move _5) -> [0isize: bb1, otherwise: bb2];
 //     }
 //     bb1: {
+//         _10 = ((_1 as Ok).0: u32);
+//         ((_0 as Ok).0: u32) = move _10;
+//         discriminant(_0) = 0;
+//         goto -> bb3;
+//     }
+//     bb2: {
 //         _6 = ((_1 as Err).0: i32);
 //         ((_0 as Err).0: i32) = move _6;
 //         discriminant(_0) = 1;
-//         goto -> bb2;
-//     }
-//     bb2: {
-//         return;
+//         goto -> bb3;
 //     }
 //     bb3: {
-//         _10 = ((_1 as Ok).0: u32);
-//         ((_0 as Ok).0: u32) = move _10;
-//         discriminant(_0) = 0;
-//         goto -> bb2;
+//         return;
 //     }
 // }
 // END rustc.try_identity.SimplifyArmIdentity.before.mir
@@ -106,22 +106,22 @@ fn main() {
 //     }
 //     bb0: {
 //         _5 = discriminant(_1);
-//         switchInt(move _5) -> [0isize: bb3, otherwise: bb1];
+//         switchInt(move _5) -> [0isize: bb1, otherwise: bb2];
 //     }
 //     bb1: {
 //         _0 = move _1;
 //         nop;
 //         nop;
-//         goto -> bb2;
+//         goto -> bb3;
 //     }
 //     bb2: {
-//         return;
-//     }
-//     bb3: {
 //         _0 = move _1;
 //         nop;
 //         nop;
-//         goto -> bb2;
+//         goto -> bb3;
+//     }
+//     bb3: {
+//         return;
 //     }
 // }
 // END rustc.try_identity.SimplifyArmIdentity.after.mir
@@ -165,16 +165,16 @@ fn main() {
 //     }
 //     bb0: {
 //         _5 = discriminant(_1);
-//         goto -> bb2;
+//         goto -> bb1;
 //     }
 //     bb1: {
-//         return;
-//     }
-//     bb2: {
 //         _0 = move _1;
 //         nop;
 //         nop;
-//         goto -> bb1;
+//         goto -> bb2;
+//     }
+//     bb2: {
+//         return;
 //     }
 // }
 // END rustc.try_identity.SimplifyBranchSame.after.mir
diff --git a/src/test/pretty/gat-bounds.rs b/src/test/pretty/gat-bounds.rs
new file mode 100644
index 0000000000..789e4bc80a
--- /dev/null
+++ b/src/test/pretty/gat-bounds.rs
@@ -0,0 +1,16 @@
+// Check that associated types print generic parameters and where clauses.
+// See issue #67509.
+
+// pretty-compare-only
+
+#![feature(generic_associated_types)]
+
+trait X {
+    type Y<T>: Trait where Self: Sized;
+}
+
+impl X for () {
+    type Y<T> where Self: Sized = u32;
+}
+
+fn main() { }
diff --git a/src/test/pretty/if-attr.rs b/src/test/pretty/if-attr.rs
new file mode 100644
index 0000000000..652604fc7f
--- /dev/null
+++ b/src/test/pretty/if-attr.rs
@@ -0,0 +1,37 @@
+// pp-exact
+
+#[cfg(FALSE)]
+fn simple_attr() {
+
+    #[attr]
+    if true { }
+
+    #[allow_warnings]
+    if true { }
+}
+
+#[cfg(FALSE)]
+fn if_else_chain() {
+
+    #[first_attr]
+    if true { } else if false { } else { }
+}
+
+#[cfg(FALSE)]
+fn if_let() {
+
+    #[attr]
+    if let Some(_) = Some(true) { }
+}
+
+#[cfg(FALSE)]
+fn let_attr_if() {
+    let _ = #[attr] if let _ = 0 { };
+    let _ = #[attr] if true { };
+
+    let _ = #[attr] if let _ = 0 { } else { };
+    let _ = #[attr] if true { } else { };
+}
+
+
+fn main() { }
diff --git a/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs b/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs
new file mode 100644
index 0000000000..643ca761aa
--- /dev/null
+++ b/src/test/pretty/issue-68710-field-attr-proc-mac-lost.rs
@@ -0,0 +1,16 @@
+// pp-exact
+
+fn main() { }
+
+struct C {
+    field: u8,
+}
+
+#[allow()]
+const C: C =
+    C{
+      #[cfg(debug_assertions)]
+      field: 0,
+
+      #[cfg(not (debug_assertions))]
+      field: 1,};
diff --git a/src/test/pretty/nested-item-vis-defaultness.rs b/src/test/pretty/nested-item-vis-defaultness.rs
new file mode 100644
index 0000000000..0a3f2a10c8
--- /dev/null
+++ b/src/test/pretty/nested-item-vis-defaultness.rs
@@ -0,0 +1,47 @@
+// Check that nested items have their visibility and `default`nesses in the right order.
+
+// pp-exact
+
+fn main() { }
+
+#[cfg(FALSE)]
+extern "C" {
+    static X: u8 ;
+    type X;
+    fn foo();
+    pub static X: u8 ;
+    pub type X;
+    pub fn foo();
+}
+
+#[cfg(FALSE)]
+trait T {
+    const X: u8 ;
+    type X;
+    fn foo();
+    default const X: u8 ;
+    default type X;
+    default fn foo();
+    pub const X: u8 ;
+    pub type X;
+    pub fn foo();
+    pub default const X: u8 ;
+    pub default type X;
+    pub default fn foo();
+}
+
+#[cfg(FALSE)]
+impl T for S {
+    const X: u8 ;
+    type X;
+    fn foo();
+    default const X: u8 ;
+    default type X;
+    default fn foo();
+    pub const X: u8 ;
+    pub type X;
+    pub fn foo();
+    pub default const X: u8 ;
+    pub default type X;
+    pub default fn foo();
+}
diff --git a/src/test/pretty/trait-inner-attr.rs b/src/test/pretty/trait-inner-attr.rs
new file mode 100644
index 0000000000..bb4fb1459b
--- /dev/null
+++ b/src/test/pretty/trait-inner-attr.rs
@@ -0,0 +1,7 @@
+// pp-exact
+
+trait Foo {
+    #![allow(bar)]
+}
+
+fn main() { }
diff --git a/src/test/run-fail/generator-resume-after-panic.rs b/src/test/run-fail/generator-resume-after-panic.rs
index 910b4903bf..1a7c2e8062 100644
--- a/src/test/run-fail/generator-resume-after-panic.rs
+++ b/src/test/run-fail/generator-resume-after-panic.rs
@@ -16,7 +16,7 @@ fn main() {
         yield;
     };
     panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        let x = Pin::new(&mut g).resume();
+        let x = Pin::new(&mut g).resume(());
     }));
-    Pin::new(&mut g).resume();
+    Pin::new(&mut g).resume(());
 }
diff --git a/src/test/run-fail/mir_indexing_oob_1.rs b/src/test/run-fail/mir_indexing_oob_1.rs
index 0ae0320b12..1cd53e309e 100644
--- a/src/test/run-fail/mir_indexing_oob_1.rs
+++ b/src/test/run-fail/mir_indexing_oob_1.rs
@@ -2,7 +2,7 @@
 
 const C: [u32; 5] = [0; 5];
 
-#[allow(const_err)]
+#[allow(unconditional_panic)]
 fn test() -> u32 {
     C[10]
 }
diff --git a/src/test/run-fail/mir_indexing_oob_2.rs b/src/test/run-fail/mir_indexing_oob_2.rs
index a7a1177260..64b260993c 100644
--- a/src/test/run-fail/mir_indexing_oob_2.rs
+++ b/src/test/run-fail/mir_indexing_oob_2.rs
@@ -2,7 +2,7 @@
 
 const C: &'static [u8; 5] = b"hello";
 
-#[allow(const_err)]
+#[allow(unconditional_panic)]
 fn test() -> u8 {
     C[10]
 }
diff --git a/src/test/run-fail/mir_indexing_oob_3.rs b/src/test/run-fail/mir_indexing_oob_3.rs
index 188460fff7..3688088439 100644
--- a/src/test/run-fail/mir_indexing_oob_3.rs
+++ b/src/test/run-fail/mir_indexing_oob_3.rs
@@ -2,7 +2,7 @@
 
 const C: &'static [u8; 5] = b"hello";
 
-#[allow(const_err)]
+#[allow(unconditional_panic)]
 fn mir() -> u8 {
     C[10]
 }
diff --git a/src/test/run-fail/overflowing-add.rs b/src/test/run-fail/overflowing-add.rs
index 24602aced9..5ca91314d9 100644
--- a/src/test/run-fail/overflowing-add.rs
+++ b/src/test/run-fail/overflowing-add.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to add with overflow'
 // compile-flags: -C debug-assertions
 
-#![allow(const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _x = 200u8 + 200u8 + 200u8;
diff --git a/src/test/run-fail/overflowing-lsh-1.rs b/src/test/run-fail/overflowing-lsh-1.rs
index 37fbf01e48..977cfea0fe 100644
--- a/src/test/run-fail/overflowing-lsh-1.rs
+++ b/src/test/run-fail/overflowing-lsh-1.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-lsh-2.rs b/src/test/run-fail/overflowing-lsh-2.rs
index 7b0b37dfed..3517dacde3 100644
--- a/src/test/run-fail/overflowing-lsh-2.rs
+++ b/src/test/run-fail/overflowing-lsh-2.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-lsh-3.rs b/src/test/run-fail/overflowing-lsh-3.rs
index 1768a8e6d3..4a575c3fa7 100644
--- a/src/test/run-fail/overflowing-lsh-3.rs
+++ b/src/test/run-fail/overflowing-lsh-3.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-lsh-4.rs b/src/test/run-fail/overflowing-lsh-4.rs
index ec304b4144..0d3912ce13 100644
--- a/src/test/run-fail/overflowing-lsh-4.rs
+++ b/src/test/run-fail/overflowing-lsh-4.rs
@@ -4,7 +4,7 @@
 // This function is checking that our automatic truncation does not
 // sidestep the overflow checking.
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-mul.rs b/src/test/run-fail/overflowing-mul.rs
index 48110365a8..2dfc9bb5ae 100644
--- a/src/test/run-fail/overflowing-mul.rs
+++ b/src/test/run-fail/overflowing-mul.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow'
 // compile-flags: -C debug-assertions
 
-#![allow(const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let x = 200u8 * 4;
diff --git a/src/test/run-fail/overflowing-neg.rs b/src/test/run-fail/overflowing-neg.rs
index c4afd74241..f512aa35be 100644
--- a/src/test/run-fail/overflowing-neg.rs
+++ b/src/test/run-fail/overflowing-neg.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to negate with overflow'
 // compile-flags: -C debug-assertions
 
-#![allow(const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _x = -std::i8::MIN;
diff --git a/src/test/run-fail/overflowing-rsh-1.rs b/src/test/run-fail/overflowing-rsh-1.rs
index 14514540c0..4592b2b626 100644
--- a/src/test/run-fail/overflowing-rsh-1.rs
+++ b/src/test/run-fail/overflowing-rsh-1.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-rsh-2.rs b/src/test/run-fail/overflowing-rsh-2.rs
index 83dcbd13d2..066267b770 100644
--- a/src/test/run-fail/overflowing-rsh-2.rs
+++ b/src/test/run-fail/overflowing-rsh-2.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-rsh-3.rs b/src/test/run-fail/overflowing-rsh-3.rs
index 3521c05065..67e7848286 100644
--- a/src/test/run-fail/overflowing-rsh-3.rs
+++ b/src/test/run-fail/overflowing-rsh-3.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-rsh-4.rs b/src/test/run-fail/overflowing-rsh-4.rs
index ed1191849e..1877d5c968 100644
--- a/src/test/run-fail/overflowing-rsh-4.rs
+++ b/src/test/run-fail/overflowing-rsh-4.rs
@@ -4,7 +4,7 @@
 // This function is checking that our (type-based) automatic
 // truncation does not sidestep the overflow checking.
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-rsh-5.rs b/src/test/run-fail/overflowing-rsh-5.rs
index 58dfc5710a..20ef324a82 100644
--- a/src/test/run-fail/overflowing-rsh-5.rs
+++ b/src/test/run-fail/overflowing-rsh-5.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-rsh-6.rs b/src/test/run-fail/overflowing-rsh-6.rs
index c2fec5e486..589a98bab0 100644
--- a/src/test/run-fail/overflowing-rsh-6.rs
+++ b/src/test/run-fail/overflowing-rsh-6.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
-#![warn(exceeding_bitshifts)]
+#![warn(arithmetic_overflow)]
 #![warn(const_err)]
 #![feature(const_indexing)]
 
diff --git a/src/test/run-fail/overflowing-sub.rs b/src/test/run-fail/overflowing-sub.rs
index e3b111dd2b..fb096c3195 100644
--- a/src/test/run-fail/overflowing-sub.rs
+++ b/src/test/run-fail/overflowing-sub.rs
@@ -1,7 +1,7 @@
 // error-pattern:thread 'main' panicked at 'attempt to subtract with overflow'
 // compile-flags: -C debug-assertions
 
-#![allow(const_err)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _x = 42u8 - (42u8 + 1);
diff --git a/src/test/run-fail/promoted_div_by_zero.rs b/src/test/run-fail/promoted_div_by_zero.rs
index 3fe51a19c2..dc6719ce02 100644
--- a/src/test/run-fail/promoted_div_by_zero.rs
+++ b/src/test/run-fail/promoted_div_by_zero.rs
@@ -1,4 +1,4 @@
-#![allow(const_err)]
+#![allow(unconditional_panic, const_err)]
 
 // error-pattern: attempt to divide by zero
 
diff --git a/src/test/run-fail/promoted_overflow.rs b/src/test/run-fail/promoted_overflow.rs
index 139bf54095..3c42da4b1d 100644
--- a/src/test/run-fail/promoted_overflow.rs
+++ b/src/test/run-fail/promoted_overflow.rs
@@ -1,4 +1,4 @@
-#![allow(const_err)]
+#![allow(arithmetic_overflow)]
 
 // error-pattern: overflow
 // compile-flags: -C overflow-checks=yes
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile b/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile
new file mode 100644
index 0000000000..5b5d620efe
--- /dev/null
+++ b/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile
@@ -0,0 +1,7 @@
+-include ../tools.mk
+
+all:
+	$(RUSTC) --crate-type=staticlib nonclike.rs
+	$(CC) test.c $(call STATICLIB,nonclike) $(call OUT_EXE,test) \
+		$(EXTRACFLAGS) $(EXTRACXXFLAGS)
+	$(call RUN,test)
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs b/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
new file mode 100644
index 0000000000..57c2c6127e
--- /dev/null
+++ b/src/test/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
@@ -0,0 +1,31 @@
+#[repr(C, u8)]
+pub enum TT {
+    AA(u64, u64),
+    BB,
+}
+
+#[no_mangle]
+pub extern "C" fn tt_add(a: TT, b: TT) -> u64 {
+    match (a, b) {
+        (TT::AA(a1, b1), TT::AA(a2, b2)) => a1 + a2 + b1 + b2,
+        (TT::AA(a1, b1), TT::BB) => a1 + b1,
+        (TT::BB, TT::AA(a1, b1)) => a1 + b1,
+        _ => 0,
+    }
+}
+
+#[repr(C, u8)]
+pub enum T {
+    A(u64),
+    B,
+}
+
+#[no_mangle]
+pub extern "C" fn t_add(a: T, b: T) -> u64 {
+    match (a, b) {
+        (T::A(a), T::A(b)) => a + b,
+        (T::A(a), T::B) => a,
+        (T::B, T::A(b)) => b,
+        _ => 0,
+    }
+}
diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c b/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
new file mode 100644
index 0000000000..0a1621e49f
--- /dev/null
+++ b/src/test/run-make-fulldeps/arguments-non-c-like-enum/test.c
@@ -0,0 +1,66 @@
+#include <stdint.h>
+#include <assert.h>
+
+#include <stdio.h>
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum TT`
+ * type in nonclike.rs . */
+enum TT_Tag {
+  AA,
+  BB,
+};
+typedef uint8_t TT_Tag;
+
+typedef struct {
+  uint64_t _0;
+  uint64_t _1;
+} AA_Body;
+
+typedef struct {
+  TT_Tag tag;
+  union {
+    AA_Body aa;
+  };
+} TT;
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum T` type
+ * in nonclike.rs . */
+enum T_Tag {
+  A,
+  B,
+};
+typedef uint8_t T_Tag;
+
+typedef struct {
+  uint64_t _0;
+} A_Body;
+
+typedef struct {
+  T_Tag tag;
+  union {
+    A_Body a;
+  };
+} T;
+
+/* These symbols are defined by the Rust staticlib built from
+ * nonclike.rs. */
+extern uint64_t t_add(T a, T b);
+extern uint64_t tt_add(TT a, TT b);
+
+int main(int argc, char *argv[]) {
+  (void)argc; (void)argv;
+
+  /* This example works. */
+  TT xx = { .tag = AA, .aa = { ._0 = 1, ._1 = 2 } };
+  TT yy = { .tag = AA, .aa = { ._0 = 10, ._1 = 20 } };
+  uint64_t rr = tt_add(xx, yy);
+  assert(33 == rr);
+
+  /* This one used to return an incorrect result (see issue #68190). */
+  T x = { .tag = A, .a = { ._0 = 1 } };
+  T y = { .tag = A, .a = { ._0 = 10 } };
+  uint64_t r = t_add(x, y);
+  assert(11 == r);
+
+  return 0;
+}
diff --git a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
index 84bcd220ae..07ef2424cc 100644
--- a/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
+++ b/src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs
@@ -71,18 +71,28 @@ impl CodegenBackend for TheBackend {
         Box::new(tcx.crate_name(LOCAL_CRATE) as Symbol)
     }
 
-    fn join_codegen_and_link(
+    fn join_codegen(
         &self,
         ongoing_codegen: Box<dyn Any>,
-        sess: &Session,
+        _sess: &Session,
         _dep_graph: &DepGraph,
+    ) -> Result<Box<dyn Any>, ErrorReported> {
+        let crate_name = ongoing_codegen.downcast::<Symbol>()
+            .expect("in join_codegen: ongoing_codegen is not a Symbol");
+        Ok(crate_name)
+    }
+
+    fn link(
+        &self,
+        sess: &Session,
+        codegen_results: Box<dyn Any>,
         outputs: &OutputFilenames,
     ) -> Result<(), ErrorReported> {
         use std::io::Write;
         use rustc::session::config::CrateType;
         use rustc_codegen_utils::link::out_filename;
-        let crate_name = ongoing_codegen.downcast::<Symbol>()
-            .expect("in join_codegen_and_link: ongoing_codegen is not a Symbol");
+        let crate_name = codegen_results.downcast::<Symbol>()
+            .expect("in link: codegen_results is not a Symbol");
         for &crate_type in sess.opts.crate_types.iter() {
             if crate_type != CrateType::Rlib {
                 sess.fatal(&format!("Crate type is {:?}", crate_type));
diff --git a/src/test/run-make-fulldeps/issue-69368/Makefile b/src/test/run-make-fulldeps/issue-69368/Makefile
new file mode 100644
index 0000000000..dbb044d8f5
--- /dev/null
+++ b/src/test/run-make-fulldeps/issue-69368/Makefile
@@ -0,0 +1,18 @@
+-include ../tools.mk
+
+# Test that previously triggered a linker failure with root cause
+# similar to one found in the issue #69368.
+#
+# The crate that provides oom lang item is missing some other lang
+# items. Necessary to prevent the use of start-group / end-group.
+#
+# The weak lang items are defined in a separate compilation units,
+# so that linker could omit them if not used.
+#
+# The crates that need those weak lang items are dependencies of
+# crates that provide them.
+
+all:
+	$(RUSTC) a.rs
+	$(RUSTC) b.rs
+	$(RUSTC) c.rs
diff --git a/src/test/run-make-fulldeps/issue-69368/a.rs b/src/test/run-make-fulldeps/issue-69368/a.rs
new file mode 100644
index 0000000000..726db87463
--- /dev/null
+++ b/src/test/run-make-fulldeps/issue-69368/a.rs
@@ -0,0 +1,16 @@
+#![crate_type = "rlib"]
+#![feature(lang_items)]
+#![feature(panic_unwind)]
+#![no_std]
+
+extern crate panic_unwind;
+
+#[panic_handler]
+pub fn panic_handler(_: &core::panic::PanicInfo) -> ! {
+    loop {}
+}
+
+#[no_mangle]
+extern "C" fn __rust_drop_panic() -> ! {
+    loop {}
+}
diff --git a/src/test/run-make-fulldeps/issue-69368/b.rs b/src/test/run-make-fulldeps/issue-69368/b.rs
new file mode 100644
index 0000000000..4d6af02665
--- /dev/null
+++ b/src/test/run-make-fulldeps/issue-69368/b.rs
@@ -0,0 +1,8 @@
+#![crate_type = "rlib"]
+#![feature(alloc_error_handler)]
+#![no_std]
+
+#[alloc_error_handler]
+pub fn error_handler(_: core::alloc::Layout) -> ! {
+    panic!();
+}
diff --git a/src/test/run-make-fulldeps/issue-69368/c.rs b/src/test/run-make-fulldeps/issue-69368/c.rs
new file mode 100644
index 0000000000..729c4249a0
--- /dev/null
+++ b/src/test/run-make-fulldeps/issue-69368/c.rs
@@ -0,0 +1,34 @@
+#![crate_type = "bin"]
+#![feature(start)]
+#![no_std]
+
+extern crate alloc;
+extern crate a;
+extern crate b;
+
+use alloc::vec::Vec;
+use core::alloc::*;
+
+struct Allocator;
+
+unsafe impl GlobalAlloc for Allocator {
+    unsafe fn alloc(&self, _: Layout) -> *mut u8 {
+        loop {}
+    }
+
+    unsafe fn dealloc(&self, _: *mut u8, _: Layout) {
+        loop {}
+    }
+}
+
+#[global_allocator]
+static ALLOCATOR: Allocator = Allocator;
+
+#[start]
+fn main(argc: isize, _argv: *const *const u8) -> isize {
+    let mut v = Vec::new();
+    for i in 0..argc {
+        v.push(i);
+    }
+    v.iter().sum()
+}
diff --git a/src/test/run-make-fulldeps/min-global-align/min_global_align.rs b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
index ce86d202c6..d9851a2f79 100644
--- a/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
+++ b/src/test/run-make-fulldeps/min-global-align/min_global_align.rs
@@ -1,5 +1,5 @@
 #![feature(no_core, lang_items)]
-#![crate_type="rlib"]
+#![crate_type = "rlib"]
 #![no_core]
 
 pub static STATIC_BOOL: bool = true;
@@ -9,7 +9,6 @@ pub static mut STATIC_MUT_BOOL: bool = true;
 const CONST_BOOL: bool = true;
 pub static CONST_BOOL_REF: &'static bool = &CONST_BOOL;
 
-
 #[lang = "sized"]
 trait Sized {}
 
@@ -19,10 +18,13 @@ trait Copy {}
 #[lang = "freeze"]
 trait Freeze {}
 
+// No `UnsafeCell`, so everything is `Freeze`.
+impl<T: ?Sized> Freeze for T {}
+
 #[lang = "sync"]
 trait Sync {}
 impl Sync for bool {}
 impl Sync for &'static bool {}
 
-#[lang="drop_in_place"]
-pub unsafe fn drop_in_place<T: ?Sized>(_: *mut T) { }
+#[lang = "drop_in_place"]
+pub unsafe fn drop_in_place<T: ?Sized>(_: *mut T) {}
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile
new file mode 100644
index 0000000000..f3d9357865
--- /dev/null
+++ b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile
@@ -0,0 +1,5 @@
+-include ../tools.mk
+
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) nonclike.rs -L$(TMPDIR) -ltest
+	$(call RUN,nonclike)
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
new file mode 100644
index 0000000000..517286a868
--- /dev/null
+++ b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs
@@ -0,0 +1,21 @@
+#[repr(C, u8)]
+pub enum TT {
+    AA(u64, u64),
+    BB,
+}
+
+#[repr(C,u8)]
+pub enum T {
+    A(u64),
+    B,
+}
+
+extern "C" {
+    pub fn t_add(a: T, b: T) -> u64;
+    pub fn tt_add(a: TT, b: TT) -> u64;
+}
+
+fn main() {
+    assert_eq!(33, unsafe { tt_add(TT::AA(1,2), TT::AA(10,20)) });
+    assert_eq!(11, unsafe { t_add(T::A(1), T::A(10)) });
+}
diff --git a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
new file mode 100644
index 0000000000..99511b2530
--- /dev/null
+++ b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c
@@ -0,0 +1,85 @@
+#include <stdint.h>
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum TT`
+ * type in nonclike.rs . */
+enum TT_Tag {
+  AA,
+  BB,
+};
+typedef uint8_t TT_Tag;
+
+typedef struct {
+  uint64_t _0;
+  uint64_t _1;
+} AA_Body;
+
+typedef struct {
+  TT_Tag tag;
+  union {
+    AA_Body aa;
+  };
+} TT;
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum T` type
+ * in nonclike.rs . */
+enum T_Tag {
+  A,
+  B,
+};
+typedef uint8_t T_Tag;
+
+typedef struct {
+  uint64_t _0;
+} A_Body;
+
+typedef struct {
+  T_Tag tag;
+  union {
+    A_Body a;
+  };
+} T;
+
+uint64_t tt_add(TT a, TT b) {
+  if (a.tag == AA && b.tag == AA) {
+    return a.aa._0 + a.aa._1 + b.aa._0 + b.aa._1;
+  } else if (a.tag == AA) {
+    return a.aa._0 + a.aa._1;
+  } else if (b.tag == BB) {
+    return b.aa._0 + b.aa._1;
+  } else {
+    return 0;
+  }
+}
+
+uint64_t t_add(T a, T b) {
+  if (a.tag == A && b.tag == A) {
+    return a.a._0 + b.a._0;
+  } else if (a.tag == AA) {
+    return a.a._0;
+  } else if (b.tag == BB) {
+    return b.a._0;
+  } else {
+    return 0;
+  }
+}
+
+TT tt_new(uint64_t a, uint64_t b) {
+  TT tt = {
+    .tag = AA,
+    .aa = {
+      ._0 = a,
+      ._1 = b,
+    },
+  };
+  return tt;
+}
+
+T t_new(uint64_t a) {
+  T t = {
+    .tag = A,
+    .a = {
+      ._0 = a,
+    },
+  };
+  return t;
+}
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile
new file mode 100644
index 0000000000..f3d9357865
--- /dev/null
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile
@@ -0,0 +1,5 @@
+-include ../tools.mk
+
+all: $(call NATIVE_STATICLIB,test)
+	$(RUSTC) nonclike.rs -L$(TMPDIR) -ltest
+	$(call RUN,nonclike)
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
new file mode 100644
index 0000000000..ea22a2a56e
--- /dev/null
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs
@@ -0,0 +1,31 @@
+#[repr(C, u8)]
+pub enum TT {
+    AA(u64, u64),
+    BB,
+}
+
+#[repr(C,u8)]
+pub enum T {
+    A(u64),
+    B,
+}
+
+extern "C" {
+    pub fn t_new(a: u64) -> T;
+    pub fn tt_new(a: u64, b: u64) -> TT;
+}
+
+fn main() {
+    if let TT::AA(a, b) = unsafe { tt_new(10, 11) } {
+        assert_eq!(10, a);
+        assert_eq!(11, b);
+    } else {
+        panic!("expected TT::AA");
+    }
+
+    if let T::A(a) = unsafe { t_new(10) } {
+        assert_eq!(10, a);
+    } else {
+        panic!("expected T::A");
+    }
+}
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/test.c b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
new file mode 100644
index 0000000000..3ad135bab4
--- /dev/null
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/test.c
@@ -0,0 +1,61 @@
+#include <stdint.h>
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum TT`
+ * type in nonclike.rs . */
+enum TT_Tag {
+  AA,
+  BB,
+};
+typedef uint8_t TT_Tag;
+
+typedef struct {
+  uint64_t _0;
+  uint64_t _1;
+} AA_Body;
+
+typedef struct {
+  TT_Tag tag;
+  union {
+    AA_Body aa;
+  };
+} TT;
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum T` type
+ * in nonclike.rs . */
+enum T_Tag {
+  A,
+  B,
+};
+typedef uint8_t T_Tag;
+
+typedef struct {
+  uint64_t _0;
+} A_Body;
+
+typedef struct {
+  T_Tag tag;
+  union {
+    A_Body a;
+  };
+} T;
+
+TT tt_new(uint64_t a, uint64_t b) {
+  TT tt = {
+    .tag = AA,
+    .aa = {
+      ._0 = a,
+      ._1 = b,
+    },
+  };
+  return tt;
+}
+
+T t_new(uint64_t a) {
+  T t = {
+    .tag = A,
+    .a = {
+      ._0 = a,
+    },
+  };
+  return t;
+}
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile b/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile
new file mode 100644
index 0000000000..5b5d620efe
--- /dev/null
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile
@@ -0,0 +1,7 @@
+-include ../tools.mk
+
+all:
+	$(RUSTC) --crate-type=staticlib nonclike.rs
+	$(CC) test.c $(call STATICLIB,nonclike) $(call OUT_EXE,test) \
+		$(EXTRACFLAGS) $(EXTRACXXFLAGS)
+	$(call RUN,test)
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs b/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
new file mode 100644
index 0000000000..de529cf641
--- /dev/null
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum/nonclike.rs
@@ -0,0 +1,21 @@
+#[repr(C, u8)]
+pub enum TT {
+    AA(u64, u64),
+    BB,
+}
+
+#[no_mangle]
+pub extern "C" fn tt_new(a: u64, b: u64) -> TT {
+    TT::AA(a, b)
+}
+
+#[repr(C,u8)]
+pub enum T {
+    A(u64),
+    B,
+}
+
+#[no_mangle]
+pub extern "C" fn t_new(a: u64) -> T {
+    T::A(a)
+}
diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/test.c b/src/test/run-make-fulldeps/return-non-c-like-enum/test.c
new file mode 100644
index 0000000000..afadd3c10c
--- /dev/null
+++ b/src/test/run-make-fulldeps/return-non-c-like-enum/test.c
@@ -0,0 +1,63 @@
+#include <stdint.h>
+#include <assert.h>
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum TT`
+ * type in nonclike.rs . */
+enum TT_Tag {
+  AA,
+  BB,
+};
+typedef uint8_t TT_Tag;
+
+typedef struct {
+  uint64_t _0;
+  uint64_t _1;
+} AA_Body;
+
+typedef struct {
+  TT_Tag tag;
+  union {
+    AA_Body aa;
+  };
+} TT;
+
+/* This is the code generated by cbindgen 0.12.1 for the `enum T` type
+ * in nonclike.rs . */
+enum T_Tag {
+  A,
+  B,
+};
+typedef uint8_t T_Tag;
+
+typedef struct {
+  uint64_t _0;
+} A_Body;
+
+typedef struct {
+  T_Tag tag;
+  union {
+    A_Body a;
+  };
+} T;
+
+/* These symbols are defined by the Rust staticlib built from
+ * nonclike.rs. */
+extern TT tt_new(uint64_t a, uint64_t b);
+extern T t_new(uint64_t v);
+
+int main(int argc, char *argv[]) {
+  (void)argc; (void)argv;
+
+  /* This example works. */
+  TT tt = tt_new(10, 20);
+  assert(AA == tt.tag);
+  assert(10 == tt.aa._0);
+  assert(20 == tt.aa._1);
+
+  /* This one used to segfault (see issue #68190). */
+  T t = t_new(10);
+  assert(A == t.tag);
+  assert(10 == t.a._0);
+
+  return 0;
+}
diff --git a/src/test/run-make/wasm-stringify-ints-small/Makefile b/src/test/run-make/wasm-stringify-ints-small/Makefile
index 26de6a0c68..01e1c6b0ce 100644
--- a/src/test/run-make/wasm-stringify-ints-small/Makefile
+++ b/src/test/run-make/wasm-stringify-ints-small/Makefile
@@ -4,7 +4,7 @@ ifeq ($(TARGET),wasm32-unknown-unknown)
 all:
 	$(RUSTC) foo.rs -C lto -O --target wasm32-unknown-unknown
 	wc -c < $(TMPDIR)/foo.wasm
-	[ "`wc -c < $(TMPDIR)/foo.wasm`" -lt "20500" ]
+	[ "`wc -c < $(TMPDIR)/foo.wasm`" -lt "25000" ]
 else
 all:
 endif
diff --git a/src/test/rustdoc-js/struct-like-variant.js b/src/test/rustdoc-js/struct-like-variant.js
new file mode 100644
index 0000000000..f6deea51e7
--- /dev/null
+++ b/src/test/rustdoc-js/struct-like-variant.js
@@ -0,0 +1,7 @@
+const QUERY = 'name';
+
+const EXPECTED = {
+    'others': [
+        { 'path': 'struct_like_variant::Enum::Bar', 'name': 'name', 'desc': 'This is a name.' },
+    ],
+};
diff --git a/src/test/rustdoc-js/struct-like-variant.rs b/src/test/rustdoc-js/struct-like-variant.rs
new file mode 100644
index 0000000000..2f52a319ab
--- /dev/null
+++ b/src/test/rustdoc-js/struct-like-variant.rs
@@ -0,0 +1,8 @@
+#![crate_name = "struct_like_variant"]
+
+pub enum Enum {
+    Bar {
+        /// This is a name.
+        name: String
+    }
+}
diff --git a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
index b432bfbf20..bc21cfd47c 100644
--- a/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
+++ b/src/test/rustdoc-ui/deny-intra-link-resolution-failure.stderr
@@ -4,7 +4,7 @@ error: `[v2]` cannot be resolved, ignoring it.
 LL | /// [v2]
    |      ^^ cannot be resolved, ignoring
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deny-intra-link-resolution-failure.rs:1:9
    |
 LL | #![deny(intra_doc_link_resolution_failure)]
diff --git a/src/test/rustdoc-ui/deny-missing-docs-crate.stderr b/src/test/rustdoc-ui/deny-missing-docs-crate.stderr
index 9cd50d2676..f0a13b70b9 100644
--- a/src/test/rustdoc-ui/deny-missing-docs-crate.stderr
+++ b/src/test/rustdoc-ui/deny-missing-docs-crate.stderr
@@ -6,7 +6,7 @@ LL | |
 LL | | pub struct Foo;
    | |_______________^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deny-missing-docs-crate.rs:1:9
    |
 LL | #![deny(missing_docs)]
diff --git a/src/test/rustdoc-ui/deny-missing-docs-macro.stderr b/src/test/rustdoc-ui/deny-missing-docs-macro.stderr
index ef15bf05d5..a564006e74 100644
--- a/src/test/rustdoc-ui/deny-missing-docs-macro.stderr
+++ b/src/test/rustdoc-ui/deny-missing-docs-macro.stderr
@@ -4,7 +4,7 @@ error: missing documentation for macro
 LL | macro_rules! foo {
    | ^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deny-missing-docs-macro.rs:3:9
    |
 LL | #![deny(missing_docs)]
diff --git a/src/test/rustdoc-ui/deprecated-attrs.stderr b/src/test/rustdoc-ui/deprecated-attrs.stderr
index 5bd62d60b4..61228034a6 100644
--- a/src/test/rustdoc-ui/deprecated-attrs.stderr
+++ b/src/test/rustdoc-ui/deprecated-attrs.stderr
@@ -1,9 +1,9 @@
 warning: the `#![doc(no_default_passes)]` attribute is considered deprecated
    |
-   = warning: please see https://github.com/rust-lang/rust/issues/44136
+   = warning: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
    = help: you may want to use `#![doc(document_private_items)]`
 
 warning: the `#![doc(passes = "...")]` attribute is considered deprecated
    |
-   = warning: please see https://github.com/rust-lang/rust/issues/44136
+   = warning: see issue #44136 <https://github.com/rust-lang/rust/issues/44136> for more information
 
diff --git a/src/test/rustdoc-ui/doc-without-codeblock.stderr b/src/test/rustdoc-ui/doc-without-codeblock.stderr
index bf65fcf19a..f2b2328322 100644
--- a/src/test/rustdoc-ui/doc-without-codeblock.stderr
+++ b/src/test/rustdoc-ui/doc-without-codeblock.stderr
@@ -10,7 +10,7 @@ LL | |     pub fn bar() {}
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/doc-without-codeblock.rs:1:9
    |
 LL | #![deny(missing_doc_code_examples)]
diff --git a/src/test/rustdoc-ui/intra-doc-alias-ice.stderr b/src/test/rustdoc-ui/intra-doc-alias-ice.stderr
index d4d3e5fea3..cf26675163 100644
--- a/src/test/rustdoc-ui/intra-doc-alias-ice.stderr
+++ b/src/test/rustdoc-ui/intra-doc-alias-ice.stderr
@@ -4,7 +4,7 @@ error: `[TypeAlias::hoge]` cannot be resolved, ignoring it.
 LL | /// [broken cross-reference](TypeAlias::hoge)
    |                              ^^^^^^^^^^^^^^^ cannot be resolved, ignoring
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/intra-doc-alias-ice.rs:1:9
    |
 LL | #![deny(intra_doc_link_resolution_failure)]
diff --git a/src/test/rustdoc-ui/intra-link-span-ice-55723.stderr b/src/test/rustdoc-ui/intra-link-span-ice-55723.stderr
index edd5b8b92f..ce31eb3a8a 100644
--- a/src/test/rustdoc-ui/intra-link-span-ice-55723.stderr
+++ b/src/test/rustdoc-ui/intra-link-span-ice-55723.stderr
@@ -4,7 +4,7 @@ error: `[i]` cannot be resolved, ignoring it.
 LL | /// （arr[i]）
    |           ^ cannot be resolved, ignoring
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/intra-link-span-ice-55723.rs:1:9
    |
 LL | #![deny(intra_doc_link_resolution_failure)]
diff --git a/src/test/rustdoc-ui/intra-links-ambiguity.stderr b/src/test/rustdoc-ui/intra-links-ambiguity.stderr
index 9ee3ff57fb..7b9821b3d0 100644
--- a/src/test/rustdoc-ui/intra-links-ambiguity.stderr
+++ b/src/test/rustdoc-ui/intra-links-ambiguity.stderr
@@ -4,7 +4,7 @@ error: `ambiguous` is both a struct and a function
 LL | /// [`ambiguous`] is ambiguous.
    |      ^^^^^^^^^^^ ambiguous link
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/intra-links-ambiguity.rs:1:9
    |
 LL | #![deny(intra_doc_link_resolution_failure)]
diff --git a/src/test/rustdoc-ui/intra-links-anchors.stderr b/src/test/rustdoc-ui/intra-links-anchors.stderr
index 5fead8e4c3..11dee5547d 100644
--- a/src/test/rustdoc-ui/intra-links-anchors.stderr
+++ b/src/test/rustdoc-ui/intra-links-anchors.stderr
@@ -4,7 +4,7 @@ error: `[Foo::f#hola]` has an issue with the link anchor.
 LL | /// Or maybe [Foo::f#hola].
    |               ^^^^^^^^^^^ struct fields cannot be followed by anchors
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/intra-links-anchors.rs:1:9
    |
 LL | #![deny(intra_doc_link_resolution_failure)]
diff --git a/src/test/rustdoc-ui/intra-links-warning.stderr b/src/test/rustdoc-ui/intra-links-warning.stderr
index 5f1c9cfbc3..91b1fff5a3 100644
--- a/src/test/rustdoc-ui/intra-links-warning.stderr
+++ b/src/test/rustdoc-ui/intra-links-warning.stderr
@@ -175,4 +175,5 @@ LL | f!("Foo\nbar [BarF] bar\nbaz");
            bar [BarF] bar
                 ^^^^
    = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/rustdoc-ui/lint-group.stderr b/src/test/rustdoc-ui/lint-group.stderr
index dca98cf58d..852c9120e0 100644
--- a/src/test/rustdoc-ui/lint-group.stderr
+++ b/src/test/rustdoc-ui/lint-group.stderr
@@ -8,7 +8,7 @@ LL | | /// println!("sup");
 LL | | /// ```
    | |_______^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group.rs:7:9
    |
 LL | #![deny(rustdoc)]
@@ -21,7 +21,7 @@ error: `[error]` cannot be resolved, ignoring it.
 LL | /// what up, let's make an [error]
    |                             ^^^^^ cannot be resolved, ignoring
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group.rs:7:9
    |
 LL | #![deny(rustdoc)]
@@ -35,7 +35,7 @@ error: missing code example in this documentation
 LL | /// wait, this doesn't have a doctest?
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group.rs:7:9
    |
 LL | #![deny(rustdoc)]
diff --git a/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr b/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr
index 179dba17c6..3fcfc1808e 100644
--- a/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr
+++ b/src/test/rustdoc-ui/lint-missing-doc-code-example.stderr
@@ -5,7 +5,7 @@ LL | / mod module1 {
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-missing-doc-code-example.rs:2:9
    |
 LL | #![deny(missing_doc_code_examples)]
diff --git a/src/test/rustdoc-ui/private-item-doc-test.stderr b/src/test/rustdoc-ui/private-item-doc-test.stderr
index 8abbdb31ec..70b6638b23 100644
--- a/src/test/rustdoc-ui/private-item-doc-test.stderr
+++ b/src/test/rustdoc-ui/private-item-doc-test.stderr
@@ -8,7 +8,7 @@ LL | |     /// assert!(false);
 LL | |     /// ```
    | |___________^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/private-item-doc-test.rs:1:9
    |
 LL | #![deny(private_doc_tests)]
diff --git a/src/test/rustdoc/auxiliary/primitive-reexport.rs b/src/test/rustdoc/auxiliary/primitive-reexport.rs
new file mode 100644
index 0000000000..b2e9fa43b3
--- /dev/null
+++ b/src/test/rustdoc/auxiliary/primitive-reexport.rs
@@ -0,0 +1,8 @@
+// compile-flags: --emit metadata --crate-type lib --edition 2018
+
+#![crate_name = "foo"]
+
+pub mod bar {
+    pub use bool;
+    pub use char as my_char;
+}
diff --git a/src/test/rustdoc/comment-in-doctest.rs b/src/test/rustdoc/comment-in-doctest.rs
index e4e41bc7ce..5691d17356 100644
--- a/src/test/rustdoc/comment-in-doctest.rs
+++ b/src/test/rustdoc/comment-in-doctest.rs
@@ -1,7 +1,7 @@
 // compile-flags:--test
 
 // comments, both doc comments and regular ones, used to trick rustdoc's doctest parser into
-// thinking that everything after it was part of the regular program. combined with the libsyntax
+// thinking that everything after it was part of the regular program. combined with the librustc_ast
 // parser loop failing to detect the manual main function, it would wrap everything in `fn main`,
 // which would cause the doctest to fail as the "extern crate" declaration was no longer valid.
 // oddly enough, it would pass in 2018 if a crate was in the extern prelude. see
diff --git a/src/test/rustdoc/crate-version-escape.rs b/src/test/rustdoc/crate-version-escape.rs
new file mode 100644
index 0000000000..2f91eea339
--- /dev/null
+++ b/src/test/rustdoc/crate-version-escape.rs
@@ -0,0 +1,6 @@
+// compile-flags: --crate-version=<script>alert("hi")</script> -Z unstable-options
+
+#![crate_name = "foo"]
+
+// @has 'foo/index.html' '//div[@class="block version"]/p' 'Version <script>alert("hi")</script>'
+// @has 'foo/all.html' '//div[@class="block version"]/p' 'Version <script>alert("hi")</script>'
diff --git a/src/test/rustdoc/doc-spotlight.rs b/src/test/rustdoc/doc-spotlight.rs
deleted file mode 100644
index ddd46c3c21..0000000000
--- a/src/test/rustdoc/doc-spotlight.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-#![feature(doc_spotlight)]
-
-pub struct Wrapper<T> {
-    inner: T,
-}
-
-impl<T: SomeTrait> SomeTrait for Wrapper<T> {}
-
-#[doc(spotlight)]
-pub trait SomeTrait {
-    // @has doc_spotlight/trait.SomeTrait.html
-    // @has - '//code[@class="content"]' 'impl<T: SomeTrait> SomeTrait for Wrapper<T>'
-    fn wrap_me(self) -> Wrapper<Self> where Self: Sized {
-        Wrapper {
-            inner: self,
-        }
-    }
-}
-
-pub struct SomeStruct;
-impl SomeTrait for SomeStruct {}
-
-impl SomeStruct {
-    // @has doc_spotlight/struct.SomeStruct.html
-    // @has - '//code[@class="content"]' 'impl SomeTrait for SomeStruct'
-    // @has - '//code[@class="content"]' 'impl<T: SomeTrait> SomeTrait for Wrapper<T>'
-    pub fn new() -> SomeStruct {
-        SomeStruct
-    }
-}
-
-// @has doc_spotlight/fn.bare_fn.html
-// @has - '//code[@class="content"]' 'impl SomeTrait for SomeStruct'
-pub fn bare_fn() -> SomeStruct {
-    SomeStruct
-}
diff --git a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs b/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
index 37465ccf1c..d8e5746f3f 100644
--- a/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
+++ b/src/test/rustdoc/inline_cross/auxiliary/proc_macro.rs
@@ -9,6 +9,19 @@ extern crate proc_macro;
 
 use proc_macro::TokenStream;
 
+macro_rules! make_attr_macro {
+    ($name:ident) => {
+        /// Generated doc comment
+        #[proc_macro_attribute]
+        pub fn $name(args: TokenStream, input: TokenStream) -> TokenStream {
+            panic!()
+        }
+    }
+}
+
+make_attr_macro!(first_attr);
+make_attr_macro!(second_attr);
+
 /// a proc-macro that swallows its input and does nothing.
 #[proc_macro]
 pub fn some_proc_macro(_input: TokenStream) -> TokenStream {
diff --git a/src/test/rustdoc/inline_cross/proc_macro.rs b/src/test/rustdoc/inline_cross/proc_macro.rs
index 3dc8de3fe5..532a295c0f 100644
--- a/src/test/rustdoc/inline_cross/proc_macro.rs
+++ b/src/test/rustdoc/inline_cross/proc_macro.rs
@@ -26,3 +26,11 @@ pub use some_macros::some_proc_attr;
 // @has proc_macro/derive.SomeDerive.html
 // @has - 'a derive attribute that adds nothing to its input.'
 pub use some_macros::SomeDerive;
+
+// @has proc_macro/attr.first_attr.html
+// @has - 'Generated doc comment'
+pub use some_macros::first_attr;
+
+// @has proc_macro/attr.second_attr.html
+// @has - 'Generated doc comment'
+pub use some_macros::second_attr;
diff --git a/src/test/rustdoc/primitive-reexport.rs b/src/test/rustdoc/primitive-reexport.rs
new file mode 100644
index 0000000000..de18360d40
--- /dev/null
+++ b/src/test/rustdoc/primitive-reexport.rs
@@ -0,0 +1,28 @@
+// aux-build: primitive-reexport.rs
+// compile-flags:--extern foo --edition 2018
+
+#![crate_name = "bar"]
+
+// @has bar/p/index.html
+// @has - '//code' 'pub use bool;'
+// @has - '//code/a[@href="https://doc.rust-lang.org/nightly/std/primitive.bool.html"]' 'bool'
+// @has - '//code' 'pub use char as my_char;'
+// @has - '//code/a[@href="https://doc.rust-lang.org/nightly/std/primitive.char.html"]' 'char'
+pub mod p {
+    pub use foo::bar::*;
+}
+
+// @has bar/baz/index.html
+// @has - '//code' 'pub use bool;'
+// @has - '//code/a[@href="https://doc.rust-lang.org/nightly/std/primitive.bool.html"]' 'bool'
+// @has - '//code' 'pub use char as my_char;'
+// @has - '//code/a[@href="https://doc.rust-lang.org/nightly/std/primitive.char.html"]' 'char'
+pub use foo::bar as baz;
+
+// @has bar/index.html
+// @has - '//code' 'pub use str;'
+// @has - '//code/a[@href="https://doc.rust-lang.org/nightly/std/primitive.str.html"]' 'str'
+// @has - '//code' 'pub use i32 as my_i32;'
+// @has - '//code/a[@href="https://doc.rust-lang.org/nightly/std/primitive.i32.html"]' 'i32'
+pub use str;
+pub use i32 as my_i32;
diff --git a/src/test/rustdoc/show-const-contents.rs b/src/test/rustdoc/show-const-contents.rs
index e84f6e52c7..064c026e6a 100644
--- a/src/test/rustdoc/show-const-contents.rs
+++ b/src/test/rustdoc/show-const-contents.rs
@@ -47,9 +47,9 @@ pub struct MyTypeWithStr(&'static str);
 // @!has show_const_contents/constant.MY_TYPE_WITH_STR.html '; //'
 pub const MY_TYPE_WITH_STR: MyTypeWithStr = MyTypeWithStr("show this");
 
-// @has show_const_contents/constant.EPSILON.html '1.1920929e-7f32;'
-// @!has show_const_contents/constant.EPSILON.html '; //'
-pub use std::f32::EPSILON;
+// @has show_const_contents/constant.PI.html '= 3.14159265358979323846264338327950288f32;'
+// @has show_const_contents/constant.PI.html '; // 3.14159274f32'
+pub use std::f32::consts::PI;
 
 // @has show_const_contents/constant.MAX.html '= i32::max_value(); // 2_147_483_647i32'
 pub use std::i32::MAX;
diff --git a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
index 725c350fe4..1b6a38acb1 100644
--- a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
@@ -1,20 +1,23 @@
 #![feature(box_syntax, plugin, plugin_registrar, rustc_private)]
 #![crate_type = "dylib"]
 
+extern crate rustc_ast_pretty;
 extern crate rustc_driver;
 extern crate rustc_hir;
-#[macro_use] extern crate rustc_lint;
-#[macro_use] extern crate rustc_session;
+#[macro_use]
+extern crate rustc_lint;
+#[macro_use]
+extern crate rustc_session;
 extern crate rustc_span;
-extern crate syntax;
+extern crate rustc_ast;
 
-use rustc_hir::intravisit;
+use rustc_ast_pretty::pprust;
+use rustc_driver::plugin::Registry;
 use rustc_hir as hir;
+use rustc_hir::intravisit;
 use rustc_hir::Node;
-use rustc_lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
-use rustc_driver::plugin::Registry;
+use rustc_lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_span::source_map;
-use syntax::print::pprust;
 
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {
@@ -31,14 +34,15 @@ declare_lint! {
 declare_lint_pass!(MissingWhitelistedAttrPass => [MISSING_WHITELISTED_ATTR]);
 
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingWhitelistedAttrPass {
-    fn check_fn(&mut self,
-                cx: &LateContext<'a, 'tcx>,
-                _: intravisit::FnKind<'tcx>,
-                _: &'tcx hir::FnDecl,
-                _: &'tcx hir::Body,
-                span: source_map::Span,
-                id: hir::HirId) {
-
+    fn check_fn(
+        &mut self,
+        cx: &LateContext<'a, 'tcx>,
+        _: intravisit::FnKind<'tcx>,
+        _: &'tcx hir::FnDecl,
+        _: &'tcx hir::Body,
+        span: source_map::Span,
+        id: hir::HirId,
+    ) {
         let item = match cx.tcx.hir().get(id) {
             Node::Item(item) => item,
             _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id)),
@@ -46,8 +50,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingWhitelistedAttrPass {
 
         let whitelisted = |attr| pprust::attribute_to_string(attr).contains("whitelisted_attr");
         if !item.attrs.iter().any(whitelisted) {
-            cx.span_lint(MISSING_WHITELISTED_ATTR, span,
-                         "Missing 'whitelisted_attr' attribute");
+            cx.lint(MISSING_WHITELISTED_ATTR, |lint| {
+                lint.build("Missing 'whitelisted_attr' attribute").set_span(span).emit()
+            });
         }
     }
 }
diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
index 98963a180c..4936bdb1ec 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
@@ -5,14 +5,16 @@
 extern crate rustc_driver;
 extern crate rustc_hir;
 extern crate rustc_span;
-#[macro_use] extern crate rustc_lint;
-#[macro_use] extern crate rustc_session;
-extern crate syntax;
+#[macro_use]
+extern crate rustc_lint;
+#[macro_use]
+extern crate rustc_session;
+extern crate rustc_ast;
 
-use rustc_lint::{LateContext, LintContext, LintPass, LateLintPass};
 use rustc_driver::plugin::Registry;
+use rustc_lint::{LateContext, LateLintPass, LintContext, LintPass};
 use rustc_span::symbol::Symbol;
-use syntax::attr;
+use rustc_ast::attr;
 
 macro_rules! fake_lint_pass {
     ($struct:ident, $($attr:expr),*) => {
@@ -28,8 +30,10 @@ macro_rules! fake_lint_pass {
             fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) {
                 $(
                     if !attr::contains_name(&krate.attrs, $attr) {
-                        cx.span_lint(CRATE_NOT_OKAY, krate.span,
-                                     &format!("crate is not marked with #![{}]", $attr));
+                        cx.lint(CRATE_NOT_OKAY, |lint| {
+                             let msg = format!("crate is not marked with #![{}]", $attr);
+                             lint.build(&msg).set_span(krate.span).emit()
+                        });
                     }
                 )*
             }
diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
index 589477da62..32b7ed9dfe 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
@@ -5,15 +5,17 @@
 
 extern crate rustc_driver;
 extern crate rustc_hir;
-#[macro_use] extern crate rustc_lint;
-#[macro_use] extern crate rustc_session;
+#[macro_use]
+extern crate rustc_lint;
+#[macro_use]
+extern crate rustc_session;
 extern crate rustc_span;
-extern crate syntax;
+extern crate rustc_ast;
 
-use rustc_lint::{LateContext, LintContext, LintPass, LateLintPass, LintArray};
 use rustc_driver::plugin::Registry;
+use rustc_lint::{LateContext, LateLintPass, LintArray, LintContext, LintPass};
 use rustc_span::symbol::Symbol;
-use syntax::attr;
+use rustc_ast::attr;
 
 declare_lint! {
     CRATE_NOT_OKAY,
@@ -26,8 +28,11 @@ declare_lint_pass!(Pass => [CRATE_NOT_OKAY]);
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
     fn check_crate(&mut self, cx: &LateContext, krate: &rustc_hir::Crate) {
         if !attr::contains_name(&krate.attrs, Symbol::intern("crate_okay")) {
-            cx.span_lint(CRATE_NOT_OKAY, krate.span,
-                         "crate is not marked with #![crate_okay]");
+            cx.lint(CRATE_NOT_OKAY, |lint| {
+                lint.build("crate is not marked with #![crate_okay]")
+                    .set_span(krate.span)
+                    .emit()
+            });
         }
     }
 }
diff --git a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
index 2cc288c21e..5a8eaa63db 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
@@ -6,11 +6,13 @@
 // Load rustc as a plugin to get macros.
 extern crate rustc_driver;
 extern crate rustc_hir;
-#[macro_use] extern crate rustc_lint;
-#[macro_use] extern crate rustc_session;
+#[macro_use]
+extern crate rustc_lint;
+#[macro_use]
+extern crate rustc_session;
 
-use rustc_lint::{LateContext, LintContext, LintPass, LateLintPass, LintArray, LintId};
 use rustc_driver::plugin::Registry;
+use rustc_lint::{LateContext, LateLintPass, LintArray, LintContext, LintId, LintPass};
 
 declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
 
@@ -21,8 +23,12 @@ declare_lint_pass!(Pass => [TEST_LINT, PLEASE_LINT]);
 impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
     fn check_item(&mut self, cx: &LateContext, it: &rustc_hir::Item) {
         match &*it.ident.as_str() {
-            "lintme" => cx.span_lint(TEST_LINT, it.span, "item is named 'lintme'"),
-            "pleaselintme" => cx.span_lint(PLEASE_LINT, it.span, "item is named 'pleaselintme'"),
+            "lintme" => cx.lint(TEST_LINT, |lint| {
+                lint.build("item is named 'lintme'").set_span(it.span).emit()
+            }),
+            "pleaselintme" => cx.lint(PLEASE_LINT, |lint| {
+                lint.build("item is named 'pleaselintme'").set_span(it.span).emit()
+            }),
             _ => {}
         }
     }
@@ -32,6 +38,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
 pub fn plugin_registrar(reg: &mut Registry) {
     reg.lint_store.register_lints(&[&TEST_LINT, &PLEASE_LINT]);
     reg.lint_store.register_late_pass(|| box Pass);
-    reg.lint_store.register_group(true, "lint_me", None,
-        vec![LintId::of(&TEST_LINT), LintId::of(&PLEASE_LINT)]);
+    reg.lint_store.register_group(
+        true,
+        "lint_me",
+        None,
+        vec![LintId::of(&TEST_LINT), LintId::of(&PLEASE_LINT)],
+    );
 }
diff --git a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
index c704701cc4..bb2a4d0373 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
@@ -3,16 +3,18 @@
 #![feature(plugin_registrar)]
 #![feature(box_syntax, rustc_private)]
 
-extern crate syntax;
+extern crate rustc_ast;
 
 // Load rustc as a plugin to get macros
 extern crate rustc_driver;
-#[macro_use] extern crate rustc_lint;
-#[macro_use] extern crate rustc_session;
+#[macro_use]
+extern crate rustc_lint;
+#[macro_use]
+extern crate rustc_session;
 
-use rustc_lint::{EarlyContext, LintContext, LintPass, EarlyLintPass, LintArray};
 use rustc_driver::plugin::Registry;
-use syntax::ast;
+use rustc_lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass};
+use rustc_ast::ast;
 declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
 
 declare_lint_pass!(Pass => [TEST_LINT]);
@@ -20,7 +22,9 @@ declare_lint_pass!(Pass => [TEST_LINT]);
 impl EarlyLintPass for Pass {
     fn check_item(&mut self, cx: &EarlyContext, it: &ast::Item) {
         if it.ident.name.as_str() == "lintme" {
-            cx.span_lint(TEST_LINT, it.span, "item is named 'lintme'");
+            cx.lint(TEST_LINT, |lint| {
+                lint.build("item is named 'lintme'").set_span(it.span).emit()
+            });
         }
     }
 }
diff --git a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
index fa545ddc2b..8c517e2bb5 100644
--- a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
@@ -1,16 +1,18 @@
 #![feature(plugin_registrar)]
 #![feature(box_syntax, rustc_private)]
 
-extern crate syntax;
+extern crate rustc_ast;
 
 // Load rustc as a plugin to get macros
 extern crate rustc_driver;
-#[macro_use] extern crate rustc_lint;
-#[macro_use] extern crate rustc_session;
+#[macro_use]
+extern crate rustc_lint;
+#[macro_use]
+extern crate rustc_session;
 
-use rustc_lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass, LintId};
 use rustc_driver::plugin::Registry;
-use syntax::ast;
+use rustc_lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintId, LintPass};
+use rustc_ast::ast;
 declare_tool_lint!(pub clippy::TEST_LINT, Warn, "Warn about stuff");
 declare_tool_lint!(
     /// Some docs
@@ -30,10 +32,14 @@ declare_lint_pass!(Pass => [TEST_LINT, TEST_GROUP, TEST_RUSTC_TOOL_LINT]);
 impl EarlyLintPass for Pass {
     fn check_item(&mut self, cx: &EarlyContext, it: &ast::Item) {
         if it.ident.name.as_str() == "lintme" {
-            cx.span_lint(TEST_LINT, it.span, "item is named 'lintme'");
+            cx.lint(TEST_LINT, |lint| {
+                lint.build("item is named 'lintme'").set_span(it.span).emit()
+            });
         }
         if it.ident.name.as_str() == "lintmetoo" {
-            cx.span_lint(TEST_GROUP, it.span, "item is named 'lintmetoo'");
+            cx.lint(TEST_GROUP, |lint| {
+                lint.build("item is named 'lintmetoo'").set_span(it.span).emit()
+            });
         }
     }
 }
@@ -42,6 +48,10 @@ impl EarlyLintPass for Pass {
 pub fn plugin_registrar(reg: &mut Registry) {
     reg.lint_store.register_lints(&[&TEST_RUSTC_TOOL_LINT, &TEST_LINT, &TEST_GROUP]);
     reg.lint_store.register_early_pass(|| box Pass);
-    reg.lint_store.register_group(true, "clippy::group", Some("clippy_group"),
-        vec![LintId::of(&TEST_LINT), LintId::of(&TEST_GROUP)]);
+    reg.lint_store.register_group(
+        true,
+        "clippy::group",
+        Some("clippy_group"),
+        vec![LintId::of(&TEST_LINT), LintId::of(&TEST_GROUP)],
+    );
 }
diff --git a/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs b/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
index fa136fd54c..56a560acbb 100644
--- a/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
@@ -4,7 +4,7 @@
 #![crate_type = "proc-macro"]
 #![feature(rustc_private)]
 
-extern crate syntax;
+extern crate rustc_ast;
 extern crate rustc;
 extern crate rustc_driver;
 extern crate proc_macro;
diff --git a/src/test/ui-fulldeps/feature-gate-plugin.stderr b/src/test/ui-fulldeps/feature-gate-plugin.stderr
index c922325c34..02c569073e 100644
--- a/src/test/ui-fulldeps/feature-gate-plugin.stderr
+++ b/src/test/ui-fulldeps/feature-gate-plugin.stderr
@@ -4,7 +4,7 @@ error[E0658]: compiler plugins are deprecated
 LL | #![plugin(empty_plugin)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29597
+   = note: see issue #29597 <https://github.com/rust-lang/rust/issues/29597> for more information
    = help: add `#![feature(plugin)]` to the crate attributes to enable
 
 warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
diff --git a/src/test/ui-fulldeps/gated-plugin.stderr b/src/test/ui-fulldeps/gated-plugin.stderr
index c35863e6bc..df2de40a8c 100644
--- a/src/test/ui-fulldeps/gated-plugin.stderr
+++ b/src/test/ui-fulldeps/gated-plugin.stderr
@@ -4,7 +4,7 @@ error[E0658]: compiler plugins are deprecated
 LL | #![plugin(empty_plugin)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29597
+   = note: see issue #29597 <https://github.com/rust-lang/rust/issues/29597> for more information
    = help: add `#![feature(plugin)]` to the crate attributes to enable
 
 warning: use of deprecated attribute `plugin`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
diff --git a/src/test/ui-fulldeps/hash-stable-is-unstable.stderr b/src/test/ui-fulldeps/hash-stable-is-unstable.stderr
index e2dc0c3be7..bc5e2d8937 100644
--- a/src/test/ui-fulldeps/hash-stable-is-unstable.stderr
+++ b/src/test/ui-fulldeps/hash-stable-is-unstable.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | extern crate rustc_data_structures;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | extern crate rustc;
    | ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -22,7 +22,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | extern crate rustc_macros;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -31,7 +31,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | use rustc_macros::HashStable;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
@@ -40,8 +40,9 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | #[derive(HashStable)]
    |          ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui-fulldeps/internal-lints/default_hash_types.stderr b/src/test/ui-fulldeps/internal-lints/default_hash_types.stderr
index c1762d3132..4f78f51b67 100644
--- a/src/test/ui-fulldeps/internal-lints/default_hash_types.stderr
+++ b/src/test/ui-fulldeps/internal-lints/default_hash_types.stderr
@@ -4,7 +4,7 @@ error: Prefer FxHashMap over HashMap, it has better performance
 LL |     let _map: HashMap<String, String> = HashMap::default();
    |               ^^^^^^^ help: use: `FxHashMap`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/default_hash_types.rs:10:8
    |
 LL | #[deny(rustc::default_hash_types)]
diff --git a/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr b/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr
index 39ac0019aa..fe920dba39 100644
--- a/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr
+++ b/src/test/ui-fulldeps/internal-lints/lint_pass_impl_without_macro.stderr
@@ -4,7 +4,7 @@ error: implementing `LintPass` by hand
 LL | impl LintPass for Foo {
    |      ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint_pass_impl_without_macro.rs:4:9
    |
 LL | #![deny(rustc::lint_pass_impl_without_macro)]
@@ -21,6 +21,7 @@ LL | custom_lint_pass_macro!();
    | -------------------------- in this macro invocation
    |
    = help: try using `declare_lint_pass!` or `impl_lint_pass!` instead
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui-fulldeps/internal-lints/pass_ty_by_ref.stderr b/src/test/ui-fulldeps/internal-lints/pass_ty_by_ref.stderr
index d2ed6b6a19..2751a37f74 100644
--- a/src/test/ui-fulldeps/internal-lints/pass_ty_by_ref.stderr
+++ b/src/test/ui-fulldeps/internal-lints/pass_ty_by_ref.stderr
@@ -4,7 +4,7 @@ error: passing `Ty<'_>` by reference
 LL |     ty_ref: &Ty<'_>,
    |             ^^^^^^^ help: try passing by value: `Ty<'_>`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/pass_ty_by_ref.rs:4:9
    |
 LL | #![deny(rustc::ty_pass_by_reference)]
diff --git a/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr b/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr
index 72c23f8cd3..59732cd84e 100644
--- a/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr
+++ b/src/test/ui-fulldeps/internal-lints/qualified_ty_ty_ctxt.stderr
@@ -4,7 +4,7 @@ error: usage of qualified `ty::Ty<'_>`
 LL |     ty_q: ty::Ty<'_>,
    |           ^^^^^^^^^^ help: try using it unqualified: `Ty<'_>`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/qualified_ty_ty_ctxt.rs:4:9
    |
 LL | #![deny(rustc::usage_of_qualified_ty)]
diff --git a/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.stderr b/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.stderr
index 28c837adac..ee9f1ff10f 100644
--- a/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.stderr
+++ b/src/test/ui-fulldeps/internal-lints/ty_tykind_usage.stderr
@@ -4,7 +4,7 @@ error: usage of `ty::TyKind::<kind>`
 LL |     let kind = TyKind::Bool;
    |                ^^^^^^ help: try using ty::<kind> directly: `ty`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/ty_tykind_usage.rs:9:8
    |
 LL | #[deny(rustc::usage_of_ty_tykind)]
diff --git a/src/test/ui-fulldeps/lint-group-denied-lint-allowed.rs b/src/test/ui-fulldeps/lint-group-denied-lint-allowed.rs
new file mode 100644
index 0000000000..7498745f20
--- /dev/null
+++ b/src/test/ui-fulldeps/lint-group-denied-lint-allowed.rs
@@ -0,0 +1,7 @@
+// aux-build:lint-group-plugin-test.rs
+// check-pass
+// compile-flags: -D unused -A unused-variables
+
+fn main() {
+    let x = 1;
+}
diff --git a/src/test/ui-fulldeps/lint-plugin-deny-attr.stderr b/src/test/ui-fulldeps/lint-plugin-deny-attr.stderr
index c611023e54..a0081b15f5 100644
--- a/src/test/ui-fulldeps/lint-plugin-deny-attr.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-deny-attr.stderr
@@ -12,7 +12,7 @@ error: item is named 'lintme'
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-plugin-deny-attr.rs:7:9
    |
 LL | #![deny(test_lint)]
diff --git a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
index f93a0a0de5..df92bc70a7 100644
--- a/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
@@ -30,7 +30,7 @@ error: item is named 'lintme'
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-plugin-forbid-attrs.rs:7:11
    |
 LL | #![forbid(test_lint)]
diff --git a/src/test/ui-fulldeps/lint-tool-test.stderr b/src/test/ui-fulldeps/lint-tool-test.stderr
index 809b9ac162..31d25652d5 100644
--- a/src/test/ui-fulldeps/lint-tool-test.stderr
+++ b/src/test/ui-fulldeps/lint-tool-test.stderr
@@ -70,7 +70,7 @@ error: item is named 'lintme'
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-tool-test.rs:13:9
    |
 LL | #![deny(clippy_group)]
@@ -83,7 +83,7 @@ error: item is named 'lintmetoo'
 LL |     fn lintmetoo() { }
    |     ^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-tool-test.rs:13:9
    |
 LL | #![deny(clippy_group)]
diff --git a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
index 2b4a9fb21e..1046355a34 100644
--- a/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
+++ b/src/test/ui-fulldeps/mod_dir_path_canonicalized.rs
@@ -1,23 +1,24 @@
 // run-pass
-// Testing that a libsyntax can parse modules with canonicalized base path
+// Testing that a librustc_ast can parse modules with canonicalized base path
 // ignore-cross-compile
 
 #![feature(rustc_private)]
 
-extern crate syntax;
+extern crate rustc_ast;
 extern crate rustc_parse;
+extern crate rustc_session;
 extern crate rustc_span;
 
 use rustc_parse::new_parser_from_file;
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::FilePathMapping;
 use std::path::Path;
-use syntax::sess::ParseSess;
 
 #[path = "mod_dir_simple/test.rs"]
 mod gravy;
 
 pub fn main() {
-    syntax::with_default_globals(|| parse());
+    rustc_ast::with_default_globals(|| parse());
 
     assert_eq!(gravy::foo(), 10);
 }
diff --git a/src/test/ui-fulldeps/pathless-extern-unstable.stderr b/src/test/ui-fulldeps/pathless-extern-unstable.stderr
index edc3b1c58b..09f1e600b2 100644
--- a/src/test/ui-fulldeps/pathless-extern-unstable.stderr
+++ b/src/test/ui-fulldeps/pathless-extern-unstable.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | pub use rustc;
    |         ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui-fulldeps/plugin-as-extern-crate.rs b/src/test/ui-fulldeps/plugin-as-extern-crate.rs
index f231efc0a9..4d26e08d81 100644
--- a/src/test/ui-fulldeps/plugin-as-extern-crate.rs
+++ b/src/test/ui-fulldeps/plugin-as-extern-crate.rs
@@ -3,7 +3,7 @@
 // ignore-cross-compile
 //
 // empty_plugin will not compile on a cross-compiled target because
-// libsyntax is not compiled for it.
+// librustc_ast is not compiled for it.
 
 extern crate empty_plugin; // OK, plugin crates are still crates
 
diff --git a/src/test/ui-fulldeps/pprust-expr-roundtrip.rs b/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
index 04d1054e28..365ae301c0 100644
--- a/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
+++ b/src/test/ui-fulldeps/pprust-expr-roundtrip.rs
@@ -19,20 +19,22 @@
 
 #![feature(rustc_private)]
 
+extern crate rustc_ast_pretty;
 extern crate rustc_data_structures;
-extern crate syntax;
+extern crate rustc_ast;
 extern crate rustc_parse;
+extern crate rustc_session;
 extern crate rustc_span;
 
+use rustc_ast_pretty::pprust;
 use rustc_data_structures::thin_vec::ThinVec;
 use rustc_parse::new_parser_from_source_str;
+use rustc_session::parse::ParseSess;
 use rustc_span::source_map::{Spanned, DUMMY_SP, FileName};
 use rustc_span::source_map::FilePathMapping;
-use syntax::ast::*;
-use syntax::sess::ParseSess;
-use syntax::mut_visit::{self, MutVisitor, visit_clobber};
-use syntax::print::pprust;
-use syntax::ptr::P;
+use rustc_ast::ast::*;
+use rustc_ast::mut_visit::{self, MutVisitor, visit_clobber};
+use rustc_ast::ptr::P;
 
 fn parse_expr(ps: &ParseSess, src: &str) -> Option<P<Expr>> {
     let src_as_string = src.to_string();
@@ -115,11 +117,11 @@ fn iter_exprs(depth: usize, f: &mut dyn FnMut(P<Expr>)) {
             11 => {
                 let decl = P(FnDecl {
                     inputs: vec![],
-                    output: FunctionRetTy::Default(DUMMY_SP),
+                    output: FnRetTy::Default(DUMMY_SP),
                 });
                 iter_exprs(depth - 1, &mut |e| g(
                         ExprKind::Closure(CaptureBy::Value,
-                                          IsAsync::NotAsync,
+                                          Async::No,
                                           Movability::Movable,
                                           decl.clone(),
                                           e,
@@ -203,7 +205,7 @@ impl MutVisitor for AddParens {
 }
 
 fn main() {
-    syntax::with_default_globals(|| run());
+    rustc_ast::with_default_globals(|| run());
 }
 
 fn run() {
diff --git a/src/test/ui/abi/abi-sysv64-arg-passing.rs b/src/test/ui/abi/abi-sysv64-arg-passing.rs
index d40006eb9b..c87353b93a 100644
--- a/src/test/ui/abi/abi-sysv64-arg-passing.rs
+++ b/src/test/ui/abi/abi-sysv64-arg-passing.rs
@@ -92,6 +92,18 @@ mod tests {
     #[derive(Copy, Clone)]
     pub struct Floats { a: f64, b: u8, c: f64 }
 
+    #[repr(C, u8)]
+    pub enum U8TaggedEnumOptionU64U64 {
+        None,
+        Some(u64,u64),
+    }
+
+    #[repr(C, u8)]
+    pub enum U8TaggedEnumOptionU64 {
+        None,
+        Some(u64),
+    }
+
     #[link(name = "rust_test_helpers", kind = "static")]
     extern "sysv64" {
         pub fn rust_int8_to_int32(_: i8) -> i32;
@@ -125,6 +137,16 @@ mod tests {
         ) -> f32;
         pub fn rust_dbg_abi_1(q: Quad) -> Quad;
         pub fn rust_dbg_abi_2(f: Floats) -> Floats;
+        pub fn rust_dbg_new_some_u64u64(a: u64, b: u64) -> U8TaggedEnumOptionU64U64;
+        pub fn rust_dbg_new_none_u64u64() -> U8TaggedEnumOptionU64U64;
+        pub fn rust_dbg_unpack_option_u64u64(
+            o: U8TaggedEnumOptionU64U64,
+            a: *mut u64,
+            b: *mut u64,
+        ) -> i32;
+        pub fn rust_dbg_new_some_u64(some: u64) -> U8TaggedEnumOptionU64;
+        pub fn rust_dbg_new_none_u64() -> U8TaggedEnumOptionU64;
+        pub fn rust_dbg_unpack_option_u64(o: U8TaggedEnumOptionU64, v: *mut u64) -> i32;
     }
 
     pub fn cabi_int_widening() {
@@ -336,6 +358,63 @@ mod tests {
         test1();
         test2();
     }
+
+    pub fn enum_passing_and_return_pair() {
+        let some_u64u64 = unsafe { rust_dbg_new_some_u64u64(10, 20) };
+        if let U8TaggedEnumOptionU64U64::Some(a, b) = some_u64u64 {
+            assert_eq!(10, a);
+            assert_eq!(20, b);
+        } else {
+            panic!("unexpected none");
+        }
+
+        let none_u64u64 = unsafe { rust_dbg_new_none_u64u64() };
+        if let U8TaggedEnumOptionU64U64::Some(_,_) = none_u64u64 {
+            panic!("unexpected some");
+        }
+
+        let mut a: u64 = 0;
+        let mut b: u64 = 0;
+        let r = unsafe {
+            rust_dbg_unpack_option_u64u64(some_u64u64, &mut a as *mut _, &mut b as *mut _)
+        };
+        assert_eq!(1, r);
+        assert_eq!(10, a);
+        assert_eq!(20, b);
+
+        let mut a: u64 = 0;
+        let mut b: u64 = 0;
+        let r = unsafe {
+            rust_dbg_unpack_option_u64u64(none_u64u64, &mut a as *mut _, &mut b as *mut _)
+        };
+        assert_eq!(0, r);
+        assert_eq!(0, a);
+        assert_eq!(0, b);
+    }
+
+    pub fn enum_passing_and_return() {
+        let some_u64 = unsafe { rust_dbg_new_some_u64(10) };
+        if let U8TaggedEnumOptionU64::Some(v) = some_u64 {
+            assert_eq!(10, v);
+        } else {
+            panic!("unexpected none");
+        }
+
+        let none_u64 = unsafe { rust_dbg_new_none_u64() };
+        if let U8TaggedEnumOptionU64::Some(_) = none_u64 {
+            panic!("unexpected some");
+        }
+
+        let mut target: u64 = 0;
+        let r = unsafe { rust_dbg_unpack_option_u64(some_u64, &mut target as *mut _) };
+        assert_eq!(1, r);
+        assert_eq!(10, target);
+
+        let mut target: u64 = 0;
+        let r = unsafe { rust_dbg_unpack_option_u64(none_u64, &mut target as *mut _) };
+        assert_eq!(0, r);
+        assert_eq!(0, target);
+    }
 }
 
 #[cfg(target_arch = "x86_64")]
@@ -359,6 +438,8 @@ fn main() {
     issue_28676();
     issue_62350();
     struct_return();
+    enum_passing_and_return_pair();
+    enum_passing_and_return();
 }
 
 #[cfg(not(target_arch = "x86_64"))]
diff --git a/src/test/ui/abi/struct-enums/struct-return.rs b/src/test/ui/abi/struct-enums/struct-return.rs
index 5930fc4acb..a3e70bbdb0 100644
--- a/src/test/ui/abi/struct-enums/struct-return.rs
+++ b/src/test/ui/abi/struct-enums/struct-return.rs
@@ -10,13 +10,23 @@ pub struct Quad { a: u64, b: u64, c: u64, d: u64 }
 #[derive(Copy, Clone)]
 pub struct Floats { a: f64, b: u8, c: f64 }
 
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct CharCharDouble { a: u8, b: u8, c: f64 }
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+pub struct CharCharFloat { a: u8, b: u8, c: f32 }
+
 mod rustrt {
-    use super::{Floats, Quad};
+    use super::{Floats, Quad, CharCharDouble, CharCharFloat};
 
     #[link(name = "rust_test_helpers", kind = "static")]
     extern {
         pub fn rust_dbg_abi_1(q: Quad) -> Quad;
         pub fn rust_dbg_abi_2(f: Floats) -> Floats;
+        pub fn rust_dbg_abi_3(a: CharCharDouble) -> CharCharDouble;
+        pub fn rust_dbg_abi_4(a: CharCharFloat) -> CharCharFloat;
     }
 }
 
@@ -58,7 +68,47 @@ fn test2() {
 fn test2() {
 }
 
+#[cfg(target_pointer_width = "64")]
+fn test3() {
+    unsafe {
+        let a = CharCharDouble {
+            a: 1,
+            b: 2,
+            c: 3.,
+        };
+        let b = rustrt::rust_dbg_abi_3(a);
+        println!("a: {}", b.a);
+        println!("b: {}", b.b);
+        println!("c: {}", b.c);
+        assert_eq!(b.a, a.a + 1);
+        assert_eq!(b.b, a.b - 1);
+        assert_eq!(b.c, a.c + 1.0);
+    }
+}
+
+#[cfg(target_pointer_width = "32")]
+fn test3() {}
+
+fn test4() {
+    unsafe {
+        let a = CharCharFloat {
+            a: 1,
+            b: 2,
+            c: 3.,
+        };
+        let b = rustrt::rust_dbg_abi_4(a);
+        println!("a: {}", b.a);
+        println!("b: {}", b.b);
+        println!("c: {}", b.c);
+        assert_eq!(b.a, a.a + 1);
+        assert_eq!(b.b, a.b - 1);
+        assert_eq!(b.c, a.c + 1.0);
+    }
+}
+
 pub fn main() {
     test1();
     test2();
+    test3();
+    test4();
 }
diff --git a/src/test/ui/allocator-alloc-one.rs b/src/test/ui/allocator-alloc-one.rs
deleted file mode 100644
index 312d5f13b1..0000000000
--- a/src/test/ui/allocator-alloc-one.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-pass
-
-#![allow(stable_features)]
-
-#![feature(allocator_api, nonnull)]
-
-use std::alloc::{Alloc, Global, Layout, handle_alloc_error};
-
-fn main() {
-    unsafe {
-        let ptr = Global.alloc_one::<i32>().unwrap_or_else(|_| {
-            handle_alloc_error(Layout::new::<i32>())
-        });
-        *ptr.as_ptr() = 4;
-        assert_eq!(*ptr.as_ptr(), 4);
-        Global.dealloc_one(ptr);
-    }
-}
diff --git a/src/test/ui/allocator/custom.rs b/src/test/ui/allocator/custom.rs
index 71f72ae46c..c275db14b4 100644
--- a/src/test/ui/allocator/custom.rs
+++ b/src/test/ui/allocator/custom.rs
@@ -7,7 +7,7 @@
 
 extern crate helper;
 
-use std::alloc::{self, Global, Alloc, System, Layout};
+use std::alloc::{self, Global, AllocRef, System, Layout};
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 static HITS: AtomicUsize = AtomicUsize::new(0);
@@ -37,7 +37,7 @@ fn main() {
     unsafe {
         let layout = Layout::from_size_align(4, 2).unwrap();
 
-        let ptr = Global.alloc(layout.clone()).unwrap();
+        let (ptr, _) = Global.alloc(layout.clone()).unwrap();
         helper::work_with(&ptr);
         assert_eq!(HITS.load(Ordering::SeqCst), n + 1);
         Global.dealloc(ptr, layout.clone());
@@ -49,7 +49,7 @@ fn main() {
         drop(s);
         assert_eq!(HITS.load(Ordering::SeqCst), n + 4);
 
-        let ptr = System.alloc(layout.clone()).unwrap();
+        let (ptr, _) = System.alloc(layout.clone()).unwrap();
         assert_eq!(HITS.load(Ordering::SeqCst), n + 4);
         helper::work_with(&ptr);
         System.dealloc(ptr, layout);
diff --git a/src/test/ui/allocator/not-an-allocator.stderr b/src/test/ui/allocator/not-an-allocator.stderr
index dd2cf36ff1..0d52a23c1f 100644
--- a/src/test/ui/allocator/not-an-allocator.stderr
+++ b/src/test/ui/allocator/not-an-allocator.stderr
@@ -5,6 +5,7 @@ LL | static A: usize = 0;
    | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize`
    |
    = note: required by `std::alloc::GlobalAlloc::alloc`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied
   --> $DIR/not-an-allocator.rs:2:1
@@ -13,6 +14,7 @@ LL | static A: usize = 0;
    | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize`
    |
    = note: required by `std::alloc::GlobalAlloc::dealloc`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied
   --> $DIR/not-an-allocator.rs:2:1
@@ -21,6 +23,7 @@ LL | static A: usize = 0;
    | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize`
    |
    = note: required by `std::alloc::GlobalAlloc::realloc`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `usize: std::alloc::GlobalAlloc` is not satisfied
   --> $DIR/not-an-allocator.rs:2:1
@@ -29,6 +32,7 @@ LL | static A: usize = 0;
    | ^^^^^^^^^^^^^^^^^^^^ the trait `std::alloc::GlobalAlloc` is not implemented for `usize`
    |
    = note: required by `std::alloc::GlobalAlloc::alloc_zeroed`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/allocator/two-allocators.stderr b/src/test/ui/allocator/two-allocators.stderr
index 35d9f0f42f..1b46825c54 100644
--- a/src/test/ui/allocator/two-allocators.stderr
+++ b/src/test/ui/allocator/two-allocators.stderr
@@ -2,10 +2,12 @@ error: cannot define multiple global allocators
   --> $DIR/two-allocators.rs:6:1
    |
 LL | static A: System = System;
-   | -------------------------- previous global allocator is defined here
+   | -------------------------- previous global allocator defined here
 LL | #[global_allocator]
 LL | static B: System = System;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot define a new global allocator
+   |
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/allocator/xcrate-use.rs b/src/test/ui/allocator/xcrate-use.rs
index 039c70e77b..e4746d1a7e 100644
--- a/src/test/ui/allocator/xcrate-use.rs
+++ b/src/test/ui/allocator/xcrate-use.rs
@@ -9,7 +9,7 @@
 extern crate custom;
 extern crate helper;
 
-use std::alloc::{Global, Alloc, System, Layout};
+use std::alloc::{Global, AllocRef, System, Layout};
 use std::sync::atomic::{Ordering, AtomicUsize};
 
 #[global_allocator]
@@ -20,13 +20,13 @@ fn main() {
         let n = GLOBAL.0.load(Ordering::SeqCst);
         let layout = Layout::from_size_align(4, 2).unwrap();
 
-        let ptr = Global.alloc(layout.clone()).unwrap();
+        let (ptr, _) = Global.alloc(layout.clone()).unwrap();
         helper::work_with(&ptr);
         assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 1);
         Global.dealloc(ptr, layout.clone());
         assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 2);
 
-        let ptr = System.alloc(layout.clone()).unwrap();
+        let (ptr, _) = System.alloc(layout.clone()).unwrap();
         assert_eq!(GLOBAL.0.load(Ordering::SeqCst), n + 2);
         helper::work_with(&ptr);
         System.dealloc(ptr, layout);
diff --git a/src/test/ui/anon-params-deprecated.stderr b/src/test/ui/anon-params-deprecated.stderr
index 8e4fa70d34..4520559845 100644
--- a/src/test/ui/anon-params-deprecated.stderr
+++ b/src/test/ui/anon-params-deprecated.stderr
@@ -4,7 +4,7 @@ warning: anonymous parameters are deprecated and will be removed in the next edi
 LL |     fn foo(i32);
    |            ^^^ help: try naming the parameter or explicitly ignoring it: `_: i32`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/anon-params-deprecated.rs:1:9
    |
 LL | #![warn(anonymous_parameters)]
diff --git a/src/test/ui/arg-count-mismatch.rs b/src/test/ui/arg-count-mismatch.rs
index cf7487069c..18926f5daf 100644
--- a/src/test/ui/arg-count-mismatch.rs
+++ b/src/test/ui/arg-count-mismatch.rs
@@ -1,4 +1,4 @@
-// error-pattern: parameters were supplied
+// error-pattern: arguments were supplied
 
 fn f(x: isize) { }
 
diff --git a/src/test/ui/arg-count-mismatch.stderr b/src/test/ui/arg-count-mismatch.stderr
index 44f1604136..7bc06134a6 100644
--- a/src/test/ui/arg-count-mismatch.stderr
+++ b/src/test/ui/arg-count-mismatch.stderr
@@ -1,11 +1,13 @@
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/arg-count-mismatch.rs:5:28
    |
 LL | fn f(x: isize) { }
    | -------------- defined here
 LL | 
 LL | fn main() { let i: (); i = f(); }
-   |                            ^^^ expected 1 parameter
+   |                            ^-- supplied 0 arguments
+   |                            |
+   |                            expected 1 argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/asm/issue-62046.rs b/src/test/ui/asm/issue-62046.rs
new file mode 100644
index 0000000000..105dadd5fd
--- /dev/null
+++ b/src/test/ui/asm/issue-62046.rs
@@ -0,0 +1,11 @@
+// build-fail
+// ignore-emscripten no asm! support
+
+#![feature(asm)]
+
+fn main() {
+    unsafe {
+        asm!("nop" : "+r"("r15"));
+        //~^ malformed inline assembly
+    }
+}
diff --git a/src/test/ui/asm/issue-62046.stderr b/src/test/ui/asm/issue-62046.stderr
new file mode 100644
index 0000000000..a38a300548
--- /dev/null
+++ b/src/test/ui/asm/issue-62046.stderr
@@ -0,0 +1,11 @@
+error[E0668]: malformed inline assembly
+  --> $DIR/issue-62046.rs:8:9
+   |
+LL |         asm!("nop" : "+r"("r15"));
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0668`.
diff --git a/src/test/ui/assign-to-method.rs b/src/test/ui/assign-to-method.rs
deleted file mode 100644
index 95f066c382..0000000000
--- a/src/test/ui/assign-to-method.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-struct Cat {
-  meows : usize,
-
-  how_hungry : isize,
-}
-
-impl Cat {
-    pub fn speak(&self) { self.meows += 1; }
-}
-
-fn cat(in_x : usize, in_y : isize) -> Cat {
-    Cat {
-        meows: in_x,
-        how_hungry: in_y
-    }
-}
-
-fn main() {
-  let nyan : Cat = cat(52, 99);
-  nyan.speak = || println!("meow"); //~ ERROR attempted to take value of method
-  nyan.speak += || println!("meow"); //~ ERROR attempted to take value of method
-}
diff --git a/src/test/ui/assign-to-method.stderr b/src/test/ui/assign-to-method.stderr
deleted file mode 100644
index feceadb672..0000000000
--- a/src/test/ui/assign-to-method.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-error[E0615]: attempted to take value of method `speak` on type `Cat`
-  --> $DIR/assign-to-method.rs:20:8
-   |
-LL |   nyan.speak = || println!("meow");
-   |        ^^^^^
-   |
-   = help: methods are immutable and cannot be assigned to
-
-error[E0615]: attempted to take value of method `speak` on type `Cat`
-  --> $DIR/assign-to-method.rs:21:8
-   |
-LL |   nyan.speak += || println!("meow");
-   |        ^^^^^
-   |
-   = help: methods are immutable and cannot be assigned to
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0615`.
diff --git a/src/test/ui/associated-const/associated-const-dead-code.stderr b/src/test/ui/associated-const/associated-const-dead-code.stderr
index 8c6d76bbdf..172aed733f 100644
--- a/src/test/ui/associated-const/associated-const-dead-code.stderr
+++ b/src/test/ui/associated-const/associated-const-dead-code.stderr
@@ -4,7 +4,7 @@ error: associated const is never used: `BAR`
 LL |     const BAR: u32 = 1;
    |     ^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/associated-const-dead-code.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/associated-const/associated-const-in-trait.stderr b/src/test/ui/associated-const/associated-const-in-trait.stderr
index a5d7fc5b70..a8a8d01ed7 100644
--- a/src/test/ui/associated-const/associated-const-in-trait.stderr
+++ b/src/test/ui/associated-const/associated-const-in-trait.stderr
@@ -1,11 +1,15 @@
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/associated-const-in-trait.rs:9:6
    |
+LL | trait Trait {
+   |       ----- this trait cannot be made into an object...
 LL |     const N: usize;
-   |           - the trait cannot contain associated consts like `N`
+   |           - ...because it contains this associated `const`
 ...
 LL | impl dyn Trait {
    |      ^^^^^^^^^ the trait `Trait` cannot be made into an object
+   |
+   = help: consider moving `N` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-const/associated-const-no-item.stderr b/src/test/ui/associated-const/associated-const-no-item.stderr
index d96cf67b87..fe27da5ac6 100644
--- a/src/test/ui/associated-const/associated-const-no-item.stderr
+++ b/src/test/ui/associated-const/associated-const-no-item.stderr
@@ -5,8 +5,11 @@ LL | const X: i32 = <i32>::ID;
    |                       ^^ associated item not found in `i32`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `ID`, perhaps you need to implement it:
-           candidate #1: `Foo`
+note: `Foo` defines an item `ID`, perhaps you need to implement it
+  --> $DIR/associated-const-no-item.rs:1:1
+   |
+LL | trait Foo {
+   | ^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr
index c258892057..ec60db47f4 100644
--- a/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr
+++ b/src/test/ui/associated-const/associated-const-type-parameter-arrays-2.stderr
@@ -4,10 +4,14 @@ error[E0277]: the trait bound `A: Foo` is not satisfied
 LL |     const Y: usize;
    |     --------------- required by `Foo::Y`
 ...
-LL | pub fn test<A: Foo, B: Foo>() {
-   |             -- help: consider further restricting this bound: `A: Foo +`
 LL |     let _array = [4; <A as Foo>::Y];
    |                      ^^^^^^^^^^^^^ the trait `Foo` is not implemented for `A`
+   |
+help: consider further restricting this bound with `+ Foo`
+  --> $DIR/associated-const-type-parameter-arrays-2.rs:15:16
+   |
+LL | pub fn test<A: Foo, B: Foo>() {
+   |                ^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr b/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr
index f6c8e99e27..3d38deb5a8 100644
--- a/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr
+++ b/src/test/ui/associated-const/associated-const-type-parameter-arrays.stderr
@@ -4,10 +4,14 @@ error[E0277]: the trait bound `A: Foo` is not satisfied
 LL |     const Y: usize;
    |     --------------- required by `Foo::Y`
 ...
-LL | pub fn test<A: Foo, B: Foo>() {
-   |             -- help: consider further restricting this bound: `A: Foo +`
 LL |     let _array: [u32; <A as Foo>::Y];
    |                       ^^^^^^^^^^^^^ the trait `Foo` is not implemented for `A`
+   |
+help: consider further restricting this bound with `+ Foo`
+  --> $DIR/associated-const-type-parameter-arrays.rs:15:16
+   |
+LL | pub fn test<A: Foo, B: Foo>() {
+   |                ^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.rs b/src/test/ui/associated-const/defaults-cyclic-fail.rs
new file mode 100644
index 0000000000..9b899ee316
--- /dev/null
+++ b/src/test/ui/associated-const/defaults-cyclic-fail.rs
@@ -0,0 +1,17 @@
+// build-fail
+
+// Cyclic assoc. const defaults don't error unless *used*
+trait Tr {
+    const A: u8 = Self::B;
+    //~^ ERROR cycle detected when const-evaluating + checking `Tr::A`
+
+    const B: u8 = Self::A;
+}
+
+// This impl is *allowed* unless its assoc. consts are used
+impl Tr for () {}
+
+fn main() {
+    // This triggers the cycle error
+    assert_eq!(<() as Tr>::A, 0);
+}
diff --git a/src/test/ui/associated-const/defaults-cyclic-fail.stderr b/src/test/ui/associated-const/defaults-cyclic-fail.stderr
new file mode 100644
index 0000000000..940182d4aa
--- /dev/null
+++ b/src/test/ui/associated-const/defaults-cyclic-fail.stderr
@@ -0,0 +1,31 @@
+error[E0391]: cycle detected when const-evaluating + checking `Tr::A`
+  --> $DIR/defaults-cyclic-fail.rs:5:5
+   |
+LL |     const A: u8 = Self::B;
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: ...which requires const-evaluating `Tr::A`...
+  --> $DIR/defaults-cyclic-fail.rs:5:19
+   |
+LL |     const A: u8 = Self::B;
+   |                   ^^^^^^^
+note: ...which requires const-evaluating + checking `Tr::B`...
+  --> $DIR/defaults-cyclic-fail.rs:8:5
+   |
+LL |     const B: u8 = Self::A;
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires const-evaluating `Tr::B`...
+  --> $DIR/defaults-cyclic-fail.rs:8:19
+   |
+LL |     const B: u8 = Self::A;
+   |                   ^^^^^^^
+   = note: ...which again requires const-evaluating + checking `Tr::A`, completing the cycle
+note: cycle used when const-evaluating `main`
+  --> $DIR/defaults-cyclic-fail.rs:16:16
+   |
+LL |     assert_eq!(<() as Tr>::A, 0);
+   |                ^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0391`.
diff --git a/src/test/ui/associated-const/defaults-cyclic-pass.rs b/src/test/ui/associated-const/defaults-cyclic-pass.rs
new file mode 100644
index 0000000000..82105f25f9
--- /dev/null
+++ b/src/test/ui/associated-const/defaults-cyclic-pass.rs
@@ -0,0 +1,36 @@
+// run-pass
+
+// Cyclic assoc. const defaults don't error unless *used*
+trait Tr {
+    const A: u8 = Self::B;
+    const B: u8 = Self::A;
+}
+
+// This impl is *allowed* unless its assoc. consts are used, matching the
+// behavior without defaults.
+impl Tr for () {}
+
+// Overriding either constant breaks the cycle
+impl Tr for u8 {
+    const A: u8 = 42;
+}
+
+impl Tr for u16 {
+    const B: u8 = 0;
+}
+
+impl Tr for u32 {
+    const A: u8 = 100;
+    const B: u8 = 123;
+}
+
+fn main() {
+    assert_eq!(<u8 as Tr>::A, 42);
+    assert_eq!(<u8 as Tr>::B, 42);
+
+    assert_eq!(<u16 as Tr>::A, 0);
+    assert_eq!(<u16 as Tr>::B, 0);
+
+    assert_eq!(<u32 as Tr>::A, 100);
+    assert_eq!(<u32 as Tr>::B, 123);
+}
diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.rs b/src/test/ui/associated-const/defaults-not-assumed-fail.rs
new file mode 100644
index 0000000000..d7a48cbd63
--- /dev/null
+++ b/src/test/ui/associated-const/defaults-not-assumed-fail.rs
@@ -0,0 +1,45 @@
+// build-fail
+
+trait Tr {
+    const A: u8 = 255;
+
+    // This should not be a constant evaluation error (overflow). The value of
+    // `Self::A` must not be assumed to hold inside the trait.
+    const B: u8 = Self::A + 1;
+    //~^ ERROR any use of this value will cause an error
+}
+
+// An impl that doesn't override any constant will NOT cause a const eval error
+// just because it's defined, but only if the bad constant is used anywhere.
+// This matches the behavior without defaults.
+impl Tr for () {}
+
+// An impl that overrides either constant with a suitable value will be fine.
+impl Tr for u8 {
+    const A: u8 = 254;
+}
+
+impl Tr for u16 {
+    const B: u8 = 0;
+}
+
+impl Tr for u32 {
+    const A: u8 = 254;
+    const B: u8 = 0;
+}
+
+fn main() {
+    assert_eq!(<() as Tr>::A, 255);
+    assert_eq!(<() as Tr>::B, 0);    // causes the error above
+    //~^ ERROR evaluation of constant expression failed
+    //~| ERROR erroneous constant used
+
+    assert_eq!(<u8 as Tr>::A, 254);
+    assert_eq!(<u8 as Tr>::B, 255);
+
+    assert_eq!(<u16 as Tr>::A, 255);
+    assert_eq!(<u16 as Tr>::B, 0);
+
+    assert_eq!(<u32 as Tr>::A, 254);
+    assert_eq!(<u32 as Tr>::B, 0);
+}
diff --git a/src/test/ui/associated-const/defaults-not-assumed-fail.stderr b/src/test/ui/associated-const/defaults-not-assumed-fail.stderr
new file mode 100644
index 0000000000..fe3721a910
--- /dev/null
+++ b/src/test/ui/associated-const/defaults-not-assumed-fail.stderr
@@ -0,0 +1,31 @@
+error: any use of this value will cause an error
+  --> $DIR/defaults-not-assumed-fail.rs:8:19
+   |
+LL |     const B: u8 = Self::A + 1;
+   |     --------------^^^^^^^^^^^-
+   |                   |
+   |                   attempt to add with overflow
+   |
+   = note: `#[deny(const_err)]` on by default
+
+error[E0080]: evaluation of constant expression failed
+  --> $DIR/defaults-not-assumed-fail.rs:33:5
+   |
+LL |     assert_eq!(<() as Tr>::B, 0);    // causes the error above
+   |     ^^^^^^^^^^^-------------^^^^^
+   |                |
+   |                referenced constant has errors
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: erroneous constant used
+  --> $DIR/defaults-not-assumed-fail.rs:33:5
+   |
+LL |     assert_eq!(<() as Tr>::B, 0);    // causes the error above
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ referenced constant has errors
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/associated-const/defaults-not-assumed-pass.rs b/src/test/ui/associated-const/defaults-not-assumed-pass.rs
new file mode 100644
index 0000000000..c08e05c8a3
--- /dev/null
+++ b/src/test/ui/associated-const/defaults-not-assumed-pass.rs
@@ -0,0 +1,42 @@
+// run-pass
+
+trait Tr {
+    const A: u8 = 255;
+
+    // This should not be a constant evaluation error (overflow). The value of
+    // `Self::A` must not be assumed to hold inside the trait.
+    const B: u8 = Self::A + 1;
+}
+
+// An impl that doesn't override any constant will NOT cause a const eval error
+// just because it's defined, but only if the bad constant is used anywhere.
+// This matches the behavior without defaults.
+impl Tr for () {}
+
+// An impl that overrides either constant with a suitable value will be fine.
+impl Tr for u8 {
+    const A: u8 = 254;
+}
+
+impl Tr for u16 {
+    const B: u8 = 0;
+}
+
+impl Tr for u32 {
+    const A: u8 = 254;
+    const B: u8 = 0;
+}
+
+fn main() {
+    assert_eq!(<() as Tr>::A, 255);
+    //assert_eq!(<() as Tr>::B, 0);  // using this is an error
+
+    assert_eq!(<u8 as Tr>::A, 254);
+    assert_eq!(<u8 as Tr>::B, 255);
+
+    assert_eq!(<u16 as Tr>::A, 255);
+    assert_eq!(<u16 as Tr>::B, 0);
+
+    assert_eq!(<u32 as Tr>::A, 254);
+    assert_eq!(<u32 as Tr>::B, 0);
+}
diff --git a/src/test/ui/associated-item/associated-item-duplicate-bounds.rs b/src/test/ui/associated-item/associated-item-duplicate-bounds.rs
new file mode 100644
index 0000000000..bec922b072
--- /dev/null
+++ b/src/test/ui/associated-item/associated-item-duplicate-bounds.rs
@@ -0,0 +1,11 @@
+trait Adapter {
+    const LINKS: usize;
+}
+
+struct Foo<A: Adapter> {
+    adapter: A,
+    links: [u32; A::LINKS], // Shouldn't suggest bounds already there.
+    //~^ ERROR: no associated item named `LINKS` found
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-item/associated-item-duplicate-bounds.stderr b/src/test/ui/associated-item/associated-item-duplicate-bounds.stderr
new file mode 100644
index 0000000000..ff1ad4c006
--- /dev/null
+++ b/src/test/ui/associated-item/associated-item-duplicate-bounds.stderr
@@ -0,0 +1,11 @@
+error[E0599]: no associated item named `LINKS` found for type parameter `A` in the current scope
+  --> $DIR/associated-item-duplicate-bounds.rs:7:21
+   |
+LL |     links: [u32; A::LINKS], // Shouldn't suggest bounds already there.
+   |                     ^^^^^ associated item not found in `A`
+   |
+   = help: items from traits can only be used if the type parameter is bounded by the trait
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/associated-item/issue-48027.stderr b/src/test/ui/associated-item/issue-48027.stderr
index ddabd55289..62a380732a 100644
--- a/src/test/ui/associated-item/issue-48027.stderr
+++ b/src/test/ui/associated-item/issue-48027.stderr
@@ -1,11 +1,15 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/issue-48027.rs:6:6
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     const X: usize;
-   |           - the trait cannot contain associated consts like `X`
+   |           - ...because it contains this associated `const`
 ...
 LL | impl dyn Bar {}
    |      ^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `X` to another trait
 
 error[E0283]: type annotations needed
   --> $DIR/issue-48027.rs:3:32
diff --git a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs b/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
index 78704a9b51..3db5e468b3 100644
--- a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
+++ b/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // ignore-tidy-linelength
 
 // NOTE: rustc cannot currently handle bounds of the form `for<'a> <Foo as Bar<'a>>::Assoc: Baz`.
diff --git a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr b/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
index 9f6a73cfe3..efd5a92a4f 100644
--- a/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
+++ b/src/test/ui/associated-type-bounds/bad-bounds-on-assoc-in-trait.stderr
@@ -1,5 +1,5 @@
 error[E0277]: `<L1 as Lam<&'a u8>>::App` doesn't implement `std::fmt::Debug`
-  --> $DIR/bad-bounds-on-assoc-in-trait.rs:32:6
+  --> $DIR/bad-bounds-on-assoc-in-trait.rs:31:6
    |
 LL | impl Case1 for S1 {
    |      ^^^^^ `<L1 as Lam<&'a u8>>::App` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
@@ -7,76 +7,49 @@ LL | impl Case1 for S1 {
    = help: the trait `for<'a> std::fmt::Debug` is not implemented for `<L1 as Lam<&'a u8>>::App`
 
 error[E0277]: `<<T as Case1>::C as std::iter::Iterator>::Item` is not an iterator
-  --> $DIR/bad-bounds-on-assoc-in-trait.rs:37:1
+  --> $DIR/bad-bounds-on-assoc-in-trait.rs:36:20
    |
-LL |   fn assume_case1<T: Case1>() {
-   |   ^                          - help: consider further restricting the associated type: `where <<T as Case1>::C as std::iter::Iterator>::Item: std::iter::Iterator`
-   |  _|
-   | |
-LL | |
-LL | |
-LL | |
-...  |
-LL | |     assert_c::<_, _, _, T::C>();
-LL | | }
-   | |_^ `<<T as Case1>::C as std::iter::Iterator>::Item` is not an iterator
+LL | fn assume_case1<T: Case1>() {
+   |                    ^^^^^   - help: consider further restricting the associated type: `where <<T as Case1>::C as std::iter::Iterator>::Item: std::iter::Iterator`
+   |                    |
+   |                    `<<T as Case1>::C as std::iter::Iterator>::Item` is not an iterator
    |
    = help: the trait `std::iter::Iterator` is not implemented for `<<T as Case1>::C as std::iter::Iterator>::Item`
 
 error[E0277]: `<<T as Case1>::C as std::iter::Iterator>::Item` cannot be sent between threads safely
-  --> $DIR/bad-bounds-on-assoc-in-trait.rs:37:1
+  --> $DIR/bad-bounds-on-assoc-in-trait.rs:36:20
    |
-LL |   trait Case1 {
-   |   ----------- required by `Case1`
+LL | trait Case1 {
+   | ----------- required by `Case1`
 ...
-LL |   fn assume_case1<T: Case1>() {
-   |   ^                          - help: consider further restricting the associated type: `where <<T as Case1>::C as std::iter::Iterator>::Item: std::marker::Send`
-   |  _|
-   | |
-LL | |
-LL | |
-LL | |
-...  |
-LL | |     assert_c::<_, _, _, T::C>();
-LL | | }
-   | |_^ `<<T as Case1>::C as std::iter::Iterator>::Item` cannot be sent between threads safely
+LL | fn assume_case1<T: Case1>() {
+   |                    ^^^^^   - help: consider further restricting the associated type: `where <<T as Case1>::C as std::iter::Iterator>::Item: std::marker::Send`
+   |                    |
+   |                    `<<T as Case1>::C as std::iter::Iterator>::Item` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `<<T as Case1>::C as std::iter::Iterator>::Item`
 
 error[E0277]: `<<T as Case1>::C as std::iter::Iterator>::Item` cannot be shared between threads safely
-  --> $DIR/bad-bounds-on-assoc-in-trait.rs:37:1
+  --> $DIR/bad-bounds-on-assoc-in-trait.rs:36:20
    |
-LL |   trait Case1 {
-   |   ----------- required by `Case1`
+LL | trait Case1 {
+   | ----------- required by `Case1`
 ...
-LL |   fn assume_case1<T: Case1>() {
-   |   ^                          - help: consider further restricting the associated type: `where <<T as Case1>::C as std::iter::Iterator>::Item: std::marker::Sync`
-   |  _|
-   | |
-LL | |
-LL | |
-LL | |
-...  |
-LL | |     assert_c::<_, _, _, T::C>();
-LL | | }
-   | |_^ `<<T as Case1>::C as std::iter::Iterator>::Item` cannot be shared between threads safely
+LL | fn assume_case1<T: Case1>() {
+   |                    ^^^^^   - help: consider further restricting the associated type: `where <<T as Case1>::C as std::iter::Iterator>::Item: std::marker::Sync`
+   |                    |
+   |                    `<<T as Case1>::C as std::iter::Iterator>::Item` cannot be shared between threads safely
    |
    = help: the trait `std::marker::Sync` is not implemented for `<<T as Case1>::C as std::iter::Iterator>::Item`
 
 error[E0277]: `<_ as Lam<&'a u8>>::App` doesn't implement `std::fmt::Debug`
-  --> $DIR/bad-bounds-on-assoc-in-trait.rs:37:1
+  --> $DIR/bad-bounds-on-assoc-in-trait.rs:36:20
    |
-LL |   trait Case1 {
-   |   ----------- required by `Case1`
+LL | trait Case1 {
+   | ----------- required by `Case1`
 ...
-LL | / fn assume_case1<T: Case1>() {
-LL | |
-LL | |
-LL | |
-...  |
-LL | |     assert_c::<_, _, _, T::C>();
-LL | | }
-   | |_^ `<_ as Lam<&'a u8>>::App` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+LL | fn assume_case1<T: Case1>() {
+   |                    ^^^^^ `<_ as Lam<&'a u8>>::App` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
    |
    = help: the trait `for<'a> std::fmt::Debug` is not implemented for `<_ as Lam<&'a u8>>::App`
 
diff --git a/src/test/ui/associated-type-bounds/duplicate.rs b/src/test/ui/associated-type-bounds/duplicate.rs
index 65ca017e2f..f8d230da36 100644
--- a/src/test/ui/associated-type-bounds/duplicate.rs
+++ b/src/test/ui/associated-type-bounds/duplicate.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // ignore-tidy-linelength
 
 #![feature(associated_type_bounds)]
diff --git a/src/test/ui/associated-type-bounds/duplicate.stderr b/src/test/ui/associated-type-bounds/duplicate.stderr
index defa62994e..82b2d32d09 100644
--- a/src/test/ui/associated-type-bounds/duplicate.stderr
+++ b/src/test/ui/associated-type-bounds/duplicate.stderr
@@ -1,5 +1,5 @@
 warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
-  --> $DIR/duplicate.rs:6:12
+  --> $DIR/duplicate.rs:5:12
    |
 LL | #![feature(impl_trait_in_bindings)]
    |            ^^^^^^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | #![feature(impl_trait_in_bindings)]
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:11:36
+  --> $DIR/duplicate.rs:10:36
    |
 LL | struct SI1<T: Iterator<Item: Copy, Item: Send>> { f: T }
    |                        ----------  ^^^^^^^^^^ re-bound here
@@ -15,7 +15,7 @@ LL | struct SI1<T: Iterator<Item: Copy, Item: Send>> { f: T }
    |                        `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:13:36
+  --> $DIR/duplicate.rs:12:36
    |
 LL | struct SI2<T: Iterator<Item: Copy, Item: Copy>> { f: T }
    |                        ----------  ^^^^^^^^^^ re-bound here
@@ -23,7 +23,7 @@ LL | struct SI2<T: Iterator<Item: Copy, Item: Copy>> { f: T }
    |                        `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:15:39
+  --> $DIR/duplicate.rs:14:39
    |
 LL | struct SI3<T: Iterator<Item: 'static, Item: 'static>> { f: T }
    |                        -------------  ^^^^^^^^^^^^^ re-bound here
@@ -31,7 +31,7 @@ LL | struct SI3<T: Iterator<Item: 'static, Item: 'static>> { f: T }
    |                        `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:17:45
+  --> $DIR/duplicate.rs:16:45
    |
 LL | struct SW1<T> where T: Iterator<Item: Copy, Item: Send> { f: T }
    |                                 ----------  ^^^^^^^^^^ re-bound here
@@ -39,7 +39,7 @@ LL | struct SW1<T> where T: Iterator<Item: Copy, Item: Send> { f: T }
    |                                 `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:19:45
+  --> $DIR/duplicate.rs:18:45
    |
 LL | struct SW2<T> where T: Iterator<Item: Copy, Item: Copy> { f: T }
    |                                 ----------  ^^^^^^^^^^ re-bound here
@@ -47,7 +47,7 @@ LL | struct SW2<T> where T: Iterator<Item: Copy, Item: Copy> { f: T }
    |                                 `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:21:48
+  --> $DIR/duplicate.rs:20:48
    |
 LL | struct SW3<T> where T: Iterator<Item: 'static, Item: 'static> { f: T }
    |                                 -------------  ^^^^^^^^^^^^^ re-bound here
@@ -55,7 +55,7 @@ LL | struct SW3<T> where T: Iterator<Item: 'static, Item: 'static> { f: T }
    |                                 `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:24:34
+  --> $DIR/duplicate.rs:23:34
    |
 LL | enum EI1<T: Iterator<Item: Copy, Item: Send>> { V(T) }
    |                      ----------  ^^^^^^^^^^ re-bound here
@@ -63,7 +63,7 @@ LL | enum EI1<T: Iterator<Item: Copy, Item: Send>> { V(T) }
    |                      `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:26:34
+  --> $DIR/duplicate.rs:25:34
    |
 LL | enum EI2<T: Iterator<Item: Copy, Item: Copy>> { V(T) }
    |                      ----------  ^^^^^^^^^^ re-bound here
@@ -71,7 +71,7 @@ LL | enum EI2<T: Iterator<Item: Copy, Item: Copy>> { V(T) }
    |                      `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:28:37
+  --> $DIR/duplicate.rs:27:37
    |
 LL | enum EI3<T: Iterator<Item: 'static, Item: 'static>> { V(T) }
    |                      -------------  ^^^^^^^^^^^^^ re-bound here
@@ -79,7 +79,7 @@ LL | enum EI3<T: Iterator<Item: 'static, Item: 'static>> { V(T) }
    |                      `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:30:43
+  --> $DIR/duplicate.rs:29:43
    |
 LL | enum EW1<T> where T: Iterator<Item: Copy, Item: Send> { V(T) }
    |                               ----------  ^^^^^^^^^^ re-bound here
@@ -87,7 +87,7 @@ LL | enum EW1<T> where T: Iterator<Item: Copy, Item: Send> { V(T) }
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:32:43
+  --> $DIR/duplicate.rs:31:43
    |
 LL | enum EW2<T> where T: Iterator<Item: Copy, Item: Copy> { V(T) }
    |                               ----------  ^^^^^^^^^^ re-bound here
@@ -95,7 +95,7 @@ LL | enum EW2<T> where T: Iterator<Item: Copy, Item: Copy> { V(T) }
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:34:46
+  --> $DIR/duplicate.rs:33:46
    |
 LL | enum EW3<T> where T: Iterator<Item: 'static, Item: 'static> { V(T) }
    |                               -------------  ^^^^^^^^^^^^^ re-bound here
@@ -103,7 +103,7 @@ LL | enum EW3<T> where T: Iterator<Item: 'static, Item: 'static> { V(T) }
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:37:35
+  --> $DIR/duplicate.rs:36:35
    |
 LL | union UI1<T: Iterator<Item: Copy, Item: Send>> { f: T }
    |                       ----------  ^^^^^^^^^^ re-bound here
@@ -111,7 +111,7 @@ LL | union UI1<T: Iterator<Item: Copy, Item: Send>> { f: T }
    |                       `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:39:35
+  --> $DIR/duplicate.rs:38:35
    |
 LL | union UI2<T: Iterator<Item: Copy, Item: Copy>> { f: T }
    |                       ----------  ^^^^^^^^^^ re-bound here
@@ -119,7 +119,7 @@ LL | union UI2<T: Iterator<Item: Copy, Item: Copy>> { f: T }
    |                       `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:41:38
+  --> $DIR/duplicate.rs:40:38
    |
 LL | union UI3<T: Iterator<Item: 'static, Item: 'static>> { f: T }
    |                       -------------  ^^^^^^^^^^^^^ re-bound here
@@ -127,7 +127,7 @@ LL | union UI3<T: Iterator<Item: 'static, Item: 'static>> { f: T }
    |                       `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:43:44
+  --> $DIR/duplicate.rs:42:44
    |
 LL | union UW1<T> where T: Iterator<Item: Copy, Item: Send> { f: T }
    |                                ----------  ^^^^^^^^^^ re-bound here
@@ -135,7 +135,7 @@ LL | union UW1<T> where T: Iterator<Item: Copy, Item: Send> { f: T }
    |                                `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:45:44
+  --> $DIR/duplicate.rs:44:44
    |
 LL | union UW2<T> where T: Iterator<Item: Copy, Item: Copy> { f: T }
    |                                ----------  ^^^^^^^^^^ re-bound here
@@ -143,7 +143,7 @@ LL | union UW2<T> where T: Iterator<Item: Copy, Item: Copy> { f: T }
    |                                `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:47:47
+  --> $DIR/duplicate.rs:46:47
    |
 LL | union UW3<T> where T: Iterator<Item: 'static, Item: 'static> { f: T }
    |                                -------------  ^^^^^^^^^^^^^ re-bound here
@@ -151,7 +151,7 @@ LL | union UW3<T> where T: Iterator<Item: 'static, Item: 'static> { f: T }
    |                                `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:50:32
+  --> $DIR/duplicate.rs:49:32
    |
 LL | fn FI1<T: Iterator<Item: Copy, Item: Send>>() {}
    |                    ----------  ^^^^^^^^^^ re-bound here
@@ -159,7 +159,7 @@ LL | fn FI1<T: Iterator<Item: Copy, Item: Send>>() {}
    |                    `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:52:32
+  --> $DIR/duplicate.rs:51:32
    |
 LL | fn FI2<T: Iterator<Item: Copy, Item: Copy>>() {}
    |                    ----------  ^^^^^^^^^^ re-bound here
@@ -167,7 +167,7 @@ LL | fn FI2<T: Iterator<Item: Copy, Item: Copy>>() {}
    |                    `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:54:35
+  --> $DIR/duplicate.rs:53:35
    |
 LL | fn FI3<T: Iterator<Item: 'static, Item: 'static>>() {}
    |                    -------------  ^^^^^^^^^^^^^ re-bound here
@@ -175,7 +175,7 @@ LL | fn FI3<T: Iterator<Item: 'static, Item: 'static>>() {}
    |                    `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:56:43
+  --> $DIR/duplicate.rs:55:43
    |
 LL | fn FW1<T>() where T: Iterator<Item: Copy, Item: Send> {}
    |                               ----------  ^^^^^^^^^^ re-bound here
@@ -183,7 +183,7 @@ LL | fn FW1<T>() where T: Iterator<Item: Copy, Item: Send> {}
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:58:43
+  --> $DIR/duplicate.rs:57:43
    |
 LL | fn FW2<T>() where T: Iterator<Item: Copy, Item: Copy> {}
    |                               ----------  ^^^^^^^^^^ re-bound here
@@ -191,7 +191,7 @@ LL | fn FW2<T>() where T: Iterator<Item: Copy, Item: Copy> {}
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:60:46
+  --> $DIR/duplicate.rs:59:46
    |
 LL | fn FW3<T>() where T: Iterator<Item: 'static, Item: 'static> {}
    |                               -------------  ^^^^^^^^^^^^^ re-bound here
@@ -199,7 +199,7 @@ LL | fn FW3<T>() where T: Iterator<Item: 'static, Item: 'static> {}
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:69:40
+  --> $DIR/duplicate.rs:68:40
    |
 LL | fn FAPIT1(_: impl Iterator<Item: Copy, Item: Send>) {}
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -207,7 +207,7 @@ LL | fn FAPIT1(_: impl Iterator<Item: Copy, Item: Send>) {}
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:71:40
+  --> $DIR/duplicate.rs:70:40
    |
 LL | fn FAPIT2(_: impl Iterator<Item: Copy, Item: Copy>) {}
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -215,7 +215,7 @@ LL | fn FAPIT2(_: impl Iterator<Item: Copy, Item: Copy>) {}
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:73:43
+  --> $DIR/duplicate.rs:72:43
    |
 LL | fn FAPIT3(_: impl Iterator<Item: 'static, Item: 'static>) {}
    |                            -------------  ^^^^^^^^^^^^^ re-bound here
@@ -223,7 +223,7 @@ LL | fn FAPIT3(_: impl Iterator<Item: 'static, Item: 'static>) {}
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:63:42
+  --> $DIR/duplicate.rs:62:42
    |
 LL | fn FRPIT1() -> impl Iterator<Item: Copy, Item: Send> { iter::empty() }
    |                              ----------  ^^^^^^^^^^ re-bound here
@@ -231,7 +231,7 @@ LL | fn FRPIT1() -> impl Iterator<Item: Copy, Item: Send> { iter::empty() }
    |                              `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:65:42
+  --> $DIR/duplicate.rs:64:42
    |
 LL | fn FRPIT2() -> impl Iterator<Item: Copy, Item: Copy> { iter::empty() }
    |                              ----------  ^^^^^^^^^^ re-bound here
@@ -239,7 +239,7 @@ LL | fn FRPIT2() -> impl Iterator<Item: Copy, Item: Copy> { iter::empty() }
    |                              `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:67:45
+  --> $DIR/duplicate.rs:66:45
    |
 LL | fn FRPIT3() -> impl Iterator<Item: 'static, Item: 'static> { iter::empty() }
    |                              -------------  ^^^^^^^^^^^^^ re-bound here
@@ -247,7 +247,7 @@ LL | fn FRPIT3() -> impl Iterator<Item: 'static, Item: 'static> { iter::empty()
    |                              `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:76:39
+  --> $DIR/duplicate.rs:75:39
    |
 LL | const CIT1: impl Iterator<Item: Copy, Item: Send> = iter::empty();
    |                           ----------  ^^^^^^^^^^ re-bound here
@@ -255,7 +255,7 @@ LL | const CIT1: impl Iterator<Item: Copy, Item: Send> = iter::empty();
    |                           `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:78:39
+  --> $DIR/duplicate.rs:77:39
    |
 LL | const CIT2: impl Iterator<Item: Copy, Item: Copy> = iter::empty();
    |                           ----------  ^^^^^^^^^^ re-bound here
@@ -263,7 +263,7 @@ LL | const CIT2: impl Iterator<Item: Copy, Item: Copy> = iter::empty();
    |                           `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:80:42
+  --> $DIR/duplicate.rs:79:42
    |
 LL | const CIT3: impl Iterator<Item: 'static, Item: 'static> = iter::empty();
    |                           -------------  ^^^^^^^^^^^^^ re-bound here
@@ -271,7 +271,7 @@ LL | const CIT3: impl Iterator<Item: 'static, Item: 'static> = iter::empty();
    |                           `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:82:40
+  --> $DIR/duplicate.rs:81:40
    |
 LL | static SIT1: impl Iterator<Item: Copy, Item: Send> = iter::empty();
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -279,7 +279,7 @@ LL | static SIT1: impl Iterator<Item: Copy, Item: Send> = iter::empty();
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:84:40
+  --> $DIR/duplicate.rs:83:40
    |
 LL | static SIT2: impl Iterator<Item: Copy, Item: Copy> = iter::empty();
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -287,7 +287,7 @@ LL | static SIT2: impl Iterator<Item: Copy, Item: Copy> = iter::empty();
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:86:43
+  --> $DIR/duplicate.rs:85:43
    |
 LL | static SIT3: impl Iterator<Item: 'static, Item: 'static> = iter::empty();
    |                            -------------  ^^^^^^^^^^^^^ re-bound here
@@ -295,7 +295,7 @@ LL | static SIT3: impl Iterator<Item: 'static, Item: 'static> = iter::empty();
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:89:46
+  --> $DIR/duplicate.rs:88:46
    |
 LL | fn lit1() { let _: impl Iterator<Item: Copy, Item: Send> = iter::empty(); }
    |                                  ----------  ^^^^^^^^^^ re-bound here
@@ -303,7 +303,7 @@ LL | fn lit1() { let _: impl Iterator<Item: Copy, Item: Send> = iter::empty(); }
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:91:46
+  --> $DIR/duplicate.rs:90:46
    |
 LL | fn lit2() { let _: impl Iterator<Item: Copy, Item: Copy> = iter::empty(); }
    |                                  ----------  ^^^^^^^^^^ re-bound here
@@ -311,7 +311,7 @@ LL | fn lit2() { let _: impl Iterator<Item: Copy, Item: Copy> = iter::empty(); }
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:93:49
+  --> $DIR/duplicate.rs:92:49
    |
 LL | fn lit3() { let _: impl Iterator<Item: 'static, Item: 'static> = iter::empty(); }
    |                                  -------------  ^^^^^^^^^^^^^ re-bound here
@@ -319,7 +319,7 @@ LL | fn lit3() { let _: impl Iterator<Item: 'static, Item: 'static> = iter::empt
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:96:35
+  --> $DIR/duplicate.rs:95:35
    |
 LL | type TAI1<T: Iterator<Item: Copy, Item: Send>> = T;
    |                       ----------  ^^^^^^^^^^ re-bound here
@@ -327,7 +327,7 @@ LL | type TAI1<T: Iterator<Item: Copy, Item: Send>> = T;
    |                       `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:98:35
+  --> $DIR/duplicate.rs:97:35
    |
 LL | type TAI2<T: Iterator<Item: Copy, Item: Copy>> = T;
    |                       ----------  ^^^^^^^^^^ re-bound here
@@ -335,7 +335,7 @@ LL | type TAI2<T: Iterator<Item: Copy, Item: Copy>> = T;
    |                       `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:100:38
+  --> $DIR/duplicate.rs:99:38
    |
 LL | type TAI3<T: Iterator<Item: 'static, Item: 'static>> = T;
    |                       -------------  ^^^^^^^^^^^^^ re-bound here
@@ -343,7 +343,7 @@ LL | type TAI3<T: Iterator<Item: 'static, Item: 'static>> = T;
    |                       `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:102:44
+  --> $DIR/duplicate.rs:101:44
    |
 LL | type TAW1<T> where T: Iterator<Item: Copy, Item: Send> = T;
    |                                ----------  ^^^^^^^^^^ re-bound here
@@ -351,7 +351,7 @@ LL | type TAW1<T> where T: Iterator<Item: Copy, Item: Send> = T;
    |                                `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:104:44
+  --> $DIR/duplicate.rs:103:44
    |
 LL | type TAW2<T> where T: Iterator<Item: Copy, Item: Copy> = T;
    |                                ----------  ^^^^^^^^^^ re-bound here
@@ -359,7 +359,7 @@ LL | type TAW2<T> where T: Iterator<Item: Copy, Item: Copy> = T;
    |                                `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:106:47
+  --> $DIR/duplicate.rs:105:47
    |
 LL | type TAW3<T> where T: Iterator<Item: 'static, Item: 'static> = T;
    |                                -------------  ^^^^^^^^^^^^^ re-bound here
@@ -367,13 +367,13 @@ LL | type TAW3<T> where T: Iterator<Item: 'static, Item: 'static> = T;
    |                                `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:109:1
+  --> $DIR/duplicate.rs:108:1
    |
 LL | type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:109:36
+  --> $DIR/duplicate.rs:108:36
    |
 LL | type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
    |                        ----------  ^^^^^^^^^^ re-bound here
@@ -381,13 +381,13 @@ LL | type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
    |                        `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:114:1
+  --> $DIR/duplicate.rs:113:1
    |
 LL | type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:114:36
+  --> $DIR/duplicate.rs:113:36
    |
 LL | type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
    |                        ----------  ^^^^^^^^^^ re-bound here
@@ -395,13 +395,13 @@ LL | type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
    |                        `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:119:1
+  --> $DIR/duplicate.rs:118:1
    |
 LL | type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:119:39
+  --> $DIR/duplicate.rs:118:39
    |
 LL | type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
    |                        -------------  ^^^^^^^^^^^^^ re-bound here
@@ -409,13 +409,13 @@ LL | type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
    |                        `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:124:1
+  --> $DIR/duplicate.rs:123:1
    |
 LL | type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:124:40
+  --> $DIR/duplicate.rs:123:40
    |
 LL | type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -423,13 +423,13 @@ LL | type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
    |                            `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:129:1
+  --> $DIR/duplicate.rs:128:1
    |
 LL | type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:129:40
+  --> $DIR/duplicate.rs:128:40
    |
 LL | type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -437,13 +437,13 @@ LL | type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
    |                            `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:134:1
+  --> $DIR/duplicate.rs:133:1
    |
 LL | type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:134:43
+  --> $DIR/duplicate.rs:133:43
    |
 LL | type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
    |                            -------------  ^^^^^^^^^^^^^ re-bound here
@@ -451,7 +451,7 @@ LL | type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:140:36
+  --> $DIR/duplicate.rs:139:36
    |
 LL | trait TRI1<T: Iterator<Item: Copy, Item: Send>> {}
    |                        ----------  ^^^^^^^^^^ re-bound here
@@ -459,7 +459,7 @@ LL | trait TRI1<T: Iterator<Item: Copy, Item: Send>> {}
    |                        `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:142:36
+  --> $DIR/duplicate.rs:141:36
    |
 LL | trait TRI2<T: Iterator<Item: Copy, Item: Copy>> {}
    |                        ----------  ^^^^^^^^^^ re-bound here
@@ -467,7 +467,7 @@ LL | trait TRI2<T: Iterator<Item: Copy, Item: Copy>> {}
    |                        `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:144:39
+  --> $DIR/duplicate.rs:143:39
    |
 LL | trait TRI3<T: Iterator<Item: 'static, Item: 'static>> {}
    |                        -------------  ^^^^^^^^^^^^^ re-bound here
@@ -475,7 +475,7 @@ LL | trait TRI3<T: Iterator<Item: 'static, Item: 'static>> {}
    |                        `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:146:34
+  --> $DIR/duplicate.rs:145:34
    |
 LL | trait TRS1: Iterator<Item: Copy, Item: Send> {}
    |                      ----------  ^^^^^^^^^^ re-bound here
@@ -483,7 +483,7 @@ LL | trait TRS1: Iterator<Item: Copy, Item: Send> {}
    |                      `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:148:34
+  --> $DIR/duplicate.rs:147:34
    |
 LL | trait TRS2: Iterator<Item: Copy, Item: Copy> {}
    |                      ----------  ^^^^^^^^^^ re-bound here
@@ -491,7 +491,7 @@ LL | trait TRS2: Iterator<Item: Copy, Item: Copy> {}
    |                      `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:150:37
+  --> $DIR/duplicate.rs:149:37
    |
 LL | trait TRS3: Iterator<Item: 'static, Item: 'static> {}
    |                      -------------  ^^^^^^^^^^^^^ re-bound here
@@ -499,7 +499,7 @@ LL | trait TRS3: Iterator<Item: 'static, Item: 'static> {}
    |                      `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:152:45
+  --> $DIR/duplicate.rs:151:45
    |
 LL | trait TRW1<T> where T: Iterator<Item: Copy, Item: Send> {}
    |                                 ----------  ^^^^^^^^^^ re-bound here
@@ -507,7 +507,7 @@ LL | trait TRW1<T> where T: Iterator<Item: Copy, Item: Send> {}
    |                                 `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:154:45
+  --> $DIR/duplicate.rs:153:45
    |
 LL | trait TRW2<T> where T: Iterator<Item: Copy, Item: Copy> {}
    |                                 ----------  ^^^^^^^^^^ re-bound here
@@ -515,7 +515,7 @@ LL | trait TRW2<T> where T: Iterator<Item: Copy, Item: Copy> {}
    |                                 `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:156:48
+  --> $DIR/duplicate.rs:155:48
    |
 LL | trait TRW3<T> where T: Iterator<Item: 'static, Item: 'static> {}
    |                                 -------------  ^^^^^^^^^^^^^ re-bound here
@@ -523,7 +523,7 @@ LL | trait TRW3<T> where T: Iterator<Item: 'static, Item: 'static> {}
    |                                 `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:158:46
+  --> $DIR/duplicate.rs:157:46
    |
 LL | trait TRSW1 where Self: Iterator<Item: Copy, Item: Send> {}
    |                                  ----------  ^^^^^^^^^^ re-bound here
@@ -531,7 +531,7 @@ LL | trait TRSW1 where Self: Iterator<Item: Copy, Item: Send> {}
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:158:46
+  --> $DIR/duplicate.rs:157:46
    |
 LL | trait TRSW1 where Self: Iterator<Item: Copy, Item: Send> {}
    |                                  ----------  ^^^^^^^^^^ re-bound here
@@ -539,7 +539,7 @@ LL | trait TRSW1 where Self: Iterator<Item: Copy, Item: Send> {}
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:161:46
+  --> $DIR/duplicate.rs:160:46
    |
 LL | trait TRSW2 where Self: Iterator<Item: Copy, Item: Copy> {}
    |                                  ----------  ^^^^^^^^^^ re-bound here
@@ -547,7 +547,7 @@ LL | trait TRSW2 where Self: Iterator<Item: Copy, Item: Copy> {}
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:161:46
+  --> $DIR/duplicate.rs:160:46
    |
 LL | trait TRSW2 where Self: Iterator<Item: Copy, Item: Copy> {}
    |                                  ----------  ^^^^^^^^^^ re-bound here
@@ -555,7 +555,7 @@ LL | trait TRSW2 where Self: Iterator<Item: Copy, Item: Copy> {}
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:164:49
+  --> $DIR/duplicate.rs:163:49
    |
 LL | trait TRSW3 where Self: Iterator<Item: 'static, Item: 'static> {}
    |                                  -------------  ^^^^^^^^^^^^^ re-bound here
@@ -563,7 +563,7 @@ LL | trait TRSW3 where Self: Iterator<Item: 'static, Item: 'static> {}
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:164:49
+  --> $DIR/duplicate.rs:163:49
    |
 LL | trait TRSW3 where Self: Iterator<Item: 'static, Item: 'static> {}
    |                                  -------------  ^^^^^^^^^^^^^ re-bound here
@@ -571,7 +571,7 @@ LL | trait TRSW3 where Self: Iterator<Item: 'static, Item: 'static> {}
    |                                  `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:167:43
+  --> $DIR/duplicate.rs:166:43
    |
 LL | trait TRA1 { type A: Iterator<Item: Copy, Item: Send>; }
    |                               ----------  ^^^^^^^^^^ re-bound here
@@ -579,7 +579,7 @@ LL | trait TRA1 { type A: Iterator<Item: Copy, Item: Send>; }
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:169:43
+  --> $DIR/duplicate.rs:168:43
    |
 LL | trait TRA2 { type A: Iterator<Item: Copy, Item: Copy>; }
    |                               ----------  ^^^^^^^^^^ re-bound here
@@ -587,7 +587,7 @@ LL | trait TRA2 { type A: Iterator<Item: Copy, Item: Copy>; }
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:171:46
+  --> $DIR/duplicate.rs:170:46
    |
 LL | trait TRA3 { type A: Iterator<Item: 'static, Item: 'static>; }
    |                               -------------  ^^^^^^^^^^^^^ re-bound here
@@ -595,7 +595,7 @@ LL | trait TRA3 { type A: Iterator<Item: 'static, Item: 'static>; }
    |                               `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:174:40
+  --> $DIR/duplicate.rs:173:40
    |
 LL | type TADyn1 = dyn Iterator<Item: Copy, Item: Send>;
    |                            ----------  ^^^^^^^^^^ re-bound here
@@ -603,7 +603,7 @@ LL | type TADyn1 = dyn Iterator<Item: Copy, Item: Send>;
    |                            `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:178:44
+  --> $DIR/duplicate.rs:177:44
    |
 LL | type TADyn2 = Box<dyn Iterator<Item: Copy, Item: Copy>>;
    |                                ----------  ^^^^^^^^^^ re-bound here
@@ -611,7 +611,7 @@ LL | type TADyn2 = Box<dyn Iterator<Item: Copy, Item: Copy>>;
    |                                `Item` bound here first
 
 error[E0719]: the value of the associated type `Item` (from trait `std::iter::Iterator`) is already specified
-  --> $DIR/duplicate.rs:182:43
+  --> $DIR/duplicate.rs:181:43
    |
 LL | type TADyn3 = dyn Iterator<Item: 'static, Item: 'static>;
    |                            -------------  ^^^^^^^^^^^^^ re-bound here
@@ -619,112 +619,113 @@ LL | type TADyn3 = dyn Iterator<Item: 'static, Item: 'static>;
    |                            `Item` bound here first
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:109:24
+  --> $DIR/duplicate.rs:108:24
    |
 LL | type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
    |                        ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:109:36
+  --> $DIR/duplicate.rs:108:36
    |
 LL | type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
    |                                    ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:114:24
+  --> $DIR/duplicate.rs:113:24
    |
 LL | type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
    |                        ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:114:36
+  --> $DIR/duplicate.rs:113:36
    |
 LL | type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
    |                                    ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:119:24
+  --> $DIR/duplicate.rs:118:24
    |
 LL | type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
    |                        ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:119:39
+  --> $DIR/duplicate.rs:118:39
    |
 LL | type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
    |                                       ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:124:28
+  --> $DIR/duplicate.rs:123:28
    |
 LL | type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
    |                            ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:124:40
+  --> $DIR/duplicate.rs:123:40
    |
 LL | type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
    |                                        ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:129:28
+  --> $DIR/duplicate.rs:128:28
    |
 LL | type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
    |                            ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:129:40
+  --> $DIR/duplicate.rs:128:40
    |
 LL | type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
    |                                        ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:134:28
+  --> $DIR/duplicate.rs:133:28
    |
 LL | type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
    |                            ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:134:43
+  --> $DIR/duplicate.rs:133:43
    |
 LL | type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
    |                                           ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:174:28
+  --> $DIR/duplicate.rs:173:28
    |
 LL | type TADyn1 = dyn Iterator<Item: Copy, Item: Send>;
    |                            ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:174:40
+  --> $DIR/duplicate.rs:173:40
    |
 LL | type TADyn1 = dyn Iterator<Item: Copy, Item: Send>;
    |                                        ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:178:32
+  --> $DIR/duplicate.rs:177:32
    |
 LL | type TADyn2 = Box<dyn Iterator<Item: Copy, Item: Copy>>;
    |                                ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:178:44
+  --> $DIR/duplicate.rs:177:44
    |
 LL | type TADyn2 = Box<dyn Iterator<Item: Copy, Item: Copy>>;
    |                                            ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:182:28
+  --> $DIR/duplicate.rs:181:28
    |
 LL | type TADyn3 = dyn Iterator<Item: 'static, Item: 'static>;
    |                            ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/duplicate.rs:182:43
+  --> $DIR/duplicate.rs:181:43
    |
 LL | type TADyn3 = dyn Iterator<Item: 'static, Item: 'static>;
    |                                           ^^^^^^^^^^^^^
 
 error: aborting due to 96 previous errors
 
+For more information about this error, try `rustc --explain E0719`.
diff --git a/src/test/ui/associated-type-bounds/implied-region-constraints.nll.stderr b/src/test/ui/associated-type-bounds/implied-region-constraints.nll.stderr
index b8c54b13d8..cddce8777e 100644
--- a/src/test/ui/associated-type-bounds/implied-region-constraints.nll.stderr
+++ b/src/test/ui/associated-type-bounds/implied-region-constraints.nll.stderr
@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/implied-region-constraints.rs:19:56
+  --> $DIR/implied-region-constraints.rs:17:56
    |
 LL | fn _bad_st<'a, 'b, T>(x: St<'a, 'b, T>)
    |            --  -- lifetime `'b` defined here
@@ -12,7 +12,7 @@ LL |     let _failure_proves_not_implied_outlives_region_b: &'b T = &x.f0;
    = help: consider adding the following bound: `'a: 'b`
 
 error: lifetime may not live long enough
-  --> $DIR/implied-region-constraints.rs:40:64
+  --> $DIR/implied-region-constraints.rs:38:64
    |
 LL | fn _bad_en7<'a, 'b, T>(x: En7<'a, 'b, T>)
    |             --  -- lifetime `'b` defined here
diff --git a/src/test/ui/associated-type-bounds/implied-region-constraints.rs b/src/test/ui/associated-type-bounds/implied-region-constraints.rs
index 4dbaab50a6..ccad947f7f 100644
--- a/src/test/ui/associated-type-bounds/implied-region-constraints.rs
+++ b/src/test/ui/associated-type-bounds/implied-region-constraints.rs
@@ -1,5 +1,3 @@
-// compile-fail
-
 #![feature(associated_type_bounds)]
 
 trait Tr1 { type As1; }
diff --git a/src/test/ui/associated-type-bounds/implied-region-constraints.stderr b/src/test/ui/associated-type-bounds/implied-region-constraints.stderr
index 60c6e8a80f..c338e38d28 100644
--- a/src/test/ui/associated-type-bounds/implied-region-constraints.stderr
+++ b/src/test/ui/associated-type-bounds/implied-region-constraints.stderr
@@ -1,5 +1,5 @@
 error[E0623]: lifetime mismatch
-  --> $DIR/implied-region-constraints.rs:19:64
+  --> $DIR/implied-region-constraints.rs:17:64
    |
 LL | fn _bad_st<'a, 'b, T>(x: St<'a, 'b, T>)
    |                          ------------- this type is declared with multiple lifetimes...
@@ -8,7 +8,7 @@ LL |     let _failure_proves_not_implied_outlives_region_b: &'b T = &x.f0;
    |                                                                ^^^^^ ...but data with one lifetime flows into the other here
 
 error[E0623]: lifetime mismatch
-  --> $DIR/implied-region-constraints.rs:40:72
+  --> $DIR/implied-region-constraints.rs:38:72
    |
 LL | fn _bad_en7<'a, 'b, T>(x: En7<'a, 'b, T>)
    |                           -------------- this type is declared with multiple lifetimes...
diff --git a/src/test/ui/associated-type-bounds/inside-adt.rs b/src/test/ui/associated-type-bounds/inside-adt.rs
index 59ce9496d2..b74c03829b 100644
--- a/src/test/ui/associated-type-bounds/inside-adt.rs
+++ b/src/test/ui/associated-type-bounds/inside-adt.rs
@@ -1,4 +1,3 @@
-// compile-fail
 #![feature(associated_type_bounds)]
 #![feature(untagged_unions)]
 
diff --git a/src/test/ui/associated-type-bounds/inside-adt.stderr b/src/test/ui/associated-type-bounds/inside-adt.stderr
index 9c4d03e900..a532bb0c76 100644
--- a/src/test/ui/associated-type-bounds/inside-adt.stderr
+++ b/src/test/ui/associated-type-bounds/inside-adt.stderr
@@ -1,107 +1,107 @@
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:5:29
+  --> $DIR/inside-adt.rs:4:29
    |
 LL | struct S1 { f: dyn Iterator<Item: Copy> }
    |                             ^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:8:33
+  --> $DIR/inside-adt.rs:7:33
    |
 LL | struct S2 { f: Box<dyn Iterator<Item: Copy>> }
    |                                 ^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:11:29
+  --> $DIR/inside-adt.rs:10:29
    |
 LL | struct S3 { f: dyn Iterator<Item: 'static> }
    |                             ^^^^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:15:26
+  --> $DIR/inside-adt.rs:14:26
    |
 LL | enum E1 { V(dyn Iterator<Item: Copy>) }
    |                          ^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:18:30
+  --> $DIR/inside-adt.rs:17:30
    |
 LL | enum E2 { V(Box<dyn Iterator<Item: Copy>>) }
    |                              ^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:21:26
+  --> $DIR/inside-adt.rs:20:26
    |
 LL | enum E3 { V(dyn Iterator<Item: 'static>) }
    |                          ^^^^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:25:28
+  --> $DIR/inside-adt.rs:24:28
    |
 LL | union U1 { f: dyn Iterator<Item: Copy> }
    |                            ^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:28:32
+  --> $DIR/inside-adt.rs:27:32
    |
 LL | union U2 { f: Box<dyn Iterator<Item: Copy>> }
    |                                ^^^^^^^^^^
 
 error: associated type bounds are not allowed within structs, enums, or unions
-  --> $DIR/inside-adt.rs:31:28
+  --> $DIR/inside-adt.rs:30:28
    |
 LL | union U3 { f: dyn Iterator<Item: 'static> }
    |                            ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:5:29
+  --> $DIR/inside-adt.rs:4:29
    |
 LL | struct S1 { f: dyn Iterator<Item: Copy> }
    |                             ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:8:33
+  --> $DIR/inside-adt.rs:7:33
    |
 LL | struct S2 { f: Box<dyn Iterator<Item: Copy>> }
    |                                 ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:11:29
+  --> $DIR/inside-adt.rs:10:29
    |
 LL | struct S3 { f: dyn Iterator<Item: 'static> }
    |                             ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:15:26
+  --> $DIR/inside-adt.rs:14:26
    |
 LL | enum E1 { V(dyn Iterator<Item: Copy>) }
    |                          ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:18:30
+  --> $DIR/inside-adt.rs:17:30
    |
 LL | enum E2 { V(Box<dyn Iterator<Item: Copy>>) }
    |                              ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:21:26
+  --> $DIR/inside-adt.rs:20:26
    |
 LL | enum E3 { V(dyn Iterator<Item: 'static>) }
    |                          ^^^^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:25:28
+  --> $DIR/inside-adt.rs:24:28
    |
 LL | union U1 { f: dyn Iterator<Item: Copy> }
    |                            ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:28:32
+  --> $DIR/inside-adt.rs:27:32
    |
 LL | union U2 { f: Box<dyn Iterator<Item: Copy>> }
    |                                ^^^^^^^^^^
 
 error: could not find defining uses
-  --> $DIR/inside-adt.rs:31:28
+  --> $DIR/inside-adt.rs:30:28
    |
 LL | union U3 { f: dyn Iterator<Item: 'static> }
    |                            ^^^^^^^^^^^^^
diff --git a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr
index c60d5f8f2c..8d0cd57fad 100644
--- a/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr
+++ b/src/test/ui/associated-type/associated-type-projection-from-multiple-supertraits.stderr
@@ -4,7 +4,7 @@ error: equality constraints are not yet supported in `where` clauses
 LL | fn dent_object_2<COLOR>(c: dyn BoxCar) where <dyn BoxCar as Vehicle>::Color = COLOR {
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not supported
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/20041
+   = note: see issue #20041 <https://github.com/rust-lang/rust/issues/20041> for more information
 
 error[E0221]: ambiguous associated type `Color` in bounds of `C`
   --> $DIR/associated-type-projection-from-multiple-supertraits.rs:19:32
diff --git a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr
index 0b8b7fab13..bac663dfea 100644
--- a/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr
+++ b/src/test/ui/associated-types/associated-types-invalid-trait-ref-issue-18865.stderr
@@ -1,10 +1,14 @@
 error[E0277]: the trait bound `T: Foo<usize>` is not satisfied
   --> $DIR/associated-types-invalid-trait-ref-issue-18865.rs:10:12
    |
-LL | fn f<T:Foo<isize>>(t: &T) {
-   |      -- help: consider further restricting this bound: `T: Foo<usize> +`
 LL |     let u: <T as Foo<usize>>::Bar = t.get_bar();
    |            ^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo<usize>` is not implemented for `T`
+   |
+help: consider further restricting this bound with `+ Foo<usize>`
+  --> $DIR/associated-types-invalid-trait-ref-issue-18865.rs:9:8
+   |
+LL | fn f<T:Foo<isize>>(t: &T) {
+   |        ^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr b/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr
index 7819832291..770845167c 100644
--- a/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr
+++ b/src/test/ui/associated-types/associated-types-no-suitable-bound.stderr
@@ -2,10 +2,13 @@ error[E0277]: the trait bound `T: Get` is not satisfied
   --> $DIR/associated-types-no-suitable-bound.rs:11:5
    |
 LL |     fn uhoh<T>(foo: <T as Get>::Value) {}
-   |     ^^^^^^^^-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |     |       |
-   |     |       help: consider restricting this bound: `T: Get`
-   |     the trait `Get` is not implemented for `T`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Get` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: Get`
+  --> $DIR/associated-types-no-suitable-bound.rs:11:13
+   |
+LL |     fn uhoh<T>(foo: <T as Get>::Value) {}
+   |             ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-types/associated-types-overridden-binding.stderr b/src/test/ui/associated-types/associated-types-overridden-binding.stderr
index 069da955b6..9e10ed7b72 100644
--- a/src/test/ui/associated-types/associated-types-overridden-binding.stderr
+++ b/src/test/ui/associated-types/associated-types-overridden-binding.stderr
@@ -1,20 +1,20 @@
 error[E0284]: type annotations needed
-  --> $DIR/associated-types-overridden-binding.rs:4:1
+  --> $DIR/associated-types-overridden-binding.rs:4:12
    |
 LL | trait Foo: Iterator<Item = i32> {}
    | ------------------------------- required by `Foo`
 LL | trait Bar: Foo<Item = u32> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
+   |            ^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
    |
    = note: cannot resolve `<Self as std::iter::Iterator>::Item == i32`
 
 error[E0284]: type annotations needed
-  --> $DIR/associated-types-overridden-binding.rs:7:1
+  --> $DIR/associated-types-overridden-binding.rs:7:21
    |
 LL | trait I32Iterator = Iterator<Item = i32>;
    | ----------------------------------------- required by `I32Iterator`
 LL | trait U32Iterator = I32Iterator<Item = u32>;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
+   |                     ^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `Self`
    |
    = note: cannot resolve `<Self as std::iter::Iterator>::Item == i32`
 
diff --git a/src/test/ui/associated-types/associated-types-overridden-default.rs b/src/test/ui/associated-types/associated-types-overridden-default.rs
index 629fc7a766..3e12c92289 100644
--- a/src/test/ui/associated-types/associated-types-overridden-default.rs
+++ b/src/test/ui/associated-types/associated-types-overridden-default.rs
@@ -1,3 +1,8 @@
+// check-pass
+
+// Before RFC 2532, overriding one assoc. type default required overriding all
+// provided defaults.
+
 #![feature(associated_type_defaults)]
 
 pub trait Tr {
@@ -9,7 +14,9 @@ pub trait Tr {
 
 impl Tr for () {
     type Assoc = ();
-    //~^ ERROR need to be reimplemented as `Assoc` was overridden: `Assoc2`, `C`, `foo`
 }
 
-fn main() {}
+fn main() {
+    let _: <() as Tr>::Assoc = ();
+    let _: <() as Tr>::Assoc2 = ();
+}
diff --git a/src/test/ui/associated-types/associated-types-overridden-default.stderr b/src/test/ui/associated-types/associated-types-overridden-default.stderr
deleted file mode 100644
index 79fb9a613c..0000000000
--- a/src/test/ui/associated-types/associated-types-overridden-default.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0399]: the following trait items need to be reimplemented as `Assoc` was overridden: `Assoc2`, `C`, `foo`
-  --> $DIR/associated-types-overridden-default.rs:11:5
-   |
-LL |     type Assoc = ();
-   |     ^^^^^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0399`.
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed
new file mode 100644
index 0000000000..760d2b433c
--- /dev/null
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.fixed
@@ -0,0 +1,37 @@
+#![allow(dead_code, unused_variables)]
+// run-rustfix
+// Check projection of an associated type out of a higher-ranked trait-bound
+// in the context of a function signature.
+
+pub trait Foo<T> {
+    type A;
+
+    fn get(&self, t: T) -> Self::A;
+}
+
+fn foo2<I : for<'x> Foo<&'x isize>>(
+    x: <I as Foo<&isize>>::A)
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
+{
+    // This case is illegal because we have to instantiate `'x`, and
+    // we don't know what region to instantiate it with.
+    //
+    // This could perhaps be made equivalent to the examples below,
+    // specifically for fn signatures.
+}
+
+fn foo3<I : for<'x> Foo<&'x isize>>(
+    x: <I as Foo<&isize>>::A)
+{
+    // OK, in this case we spelled out the precise regions involved, though we left one of
+    // them anonymous.
+}
+
+fn foo4<'a, I : for<'x> Foo<&'x isize>>(
+    x: <I as Foo<&'a isize>>::A)
+{
+    // OK, in this case we spelled out the precise regions involved.
+}
+
+
+pub fn main() {}
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs
index bf13c410cc..6eb584ea64 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code, unused_variables)]
+// run-rustfix
 // Check projection of an associated type out of a higher-ranked trait-bound
 // in the context of a function signature.
 
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr
index 09f4f99703..f2137f6866 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-fn.stderr
@@ -1,8 +1,8 @@
 error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context
-  --> $DIR/associated-types-project-from-hrtb-in-fn.rs:11:8
+  --> $DIR/associated-types-project-from-hrtb-in-fn.rs:13:8
    |
 LL |     x: I::A)
-   |        ^^^^
+   |        ^^^^ help: use a fully qualified path with inferred lifetimes: `<I as Foo<&isize>>::A`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs
index 20f11ecf63..58f186d777 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.rs
@@ -7,19 +7,33 @@ pub trait Foo<T> {
     fn get(&self, t: T) -> Self::A;
 }
 
-struct SomeStruct<I : for<'x> Foo<&'x isize>> {
+struct SomeStruct<I: for<'x> Foo<&'x isize>> {
     field: I::A
     //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
 }
 
+enum SomeEnum<'b, I: for<'a> Foo<&'a isize>> {
+    TupleVariant(I::A),
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
+    StructVariant { field: I::A },
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
+    OkVariant(&'b usize),
+}
+
 // FIXME(eddyb) This one doesn't even compile because of the unsupported syntax.
 
 // struct AnotherStruct<I : for<'x> Foo<&'x isize>> {
 //     field: <I as for<'y> Foo<&'y isize>>::A
 // }
 
-struct YetAnotherStruct<'a, I : for<'x> Foo<&'x isize>> {
-    field: <I as Foo<&'a isize>>::A
+struct YetAnotherStruct<'a, I: for<'x> Foo<&'x isize>> {
+    field: <I as Foo<&'a isize>>::A,
+}
+
+struct Why<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, 'k, 'n, 'o, 'p, 'q, 'r, 's, 't, 'u, 'v, 'w, 'x,
+    'y, 'z, 'aa, I: for<'l, 'm> Foo<&'l &'m isize>> {
+    field: I::A,
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
 }
 
 pub fn main() {}
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr
index 189b19461f..e3fd2860eb 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-struct.stderr
@@ -3,6 +3,51 @@ error[E0212]: cannot extract an associated type from a higher-ranked trait bound
    |
 LL |     field: I::A
    |            ^^^^
+   |
+help: use a fully qualified path with explicit lifetimes
+   |
+LL | struct SomeStruct<'a, I: for<'x> Foo<&'x isize>> {
+LL |     field: <I as Foo<&'a isize>>::A
+   |
+
+error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context
+  --> $DIR/associated-types-project-from-hrtb-in-struct.rs:16:18
+   |
+LL |     TupleVariant(I::A),
+   |                  ^^^^
+   |
+help: use a fully qualified path with explicit lifetimes
+   |
+LL | enum SomeEnum<'c, 'b, I: for<'a> Foo<&'a isize>> {
+LL |     TupleVariant(<I as Foo<&'c isize>>::A),
+   |
+
+error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context
+  --> $DIR/associated-types-project-from-hrtb-in-struct.rs:18:28
+   |
+LL |     StructVariant { field: I::A },
+   |                            ^^^^
+   |
+help: use a fully qualified path with explicit lifetimes
+   |
+LL | enum SomeEnum<'c, 'b, I: for<'a> Foo<&'a isize>> {
+LL |     TupleVariant(I::A),
+LL |
+LL |     StructVariant { field: <I as Foo<&'c isize>>::A },
+   |
+
+error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context
+  --> $DIR/associated-types-project-from-hrtb-in-struct.rs:35:12
+   |
+LL |     field: I::A,
+   |            ^^^^
+   |
+help: use a fully qualified path with explicit lifetimes
+   |
+LL | struct Why<'bb, 'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, 'k, 'n, 'o, 'p, 'q, 'r, 's, 't, 'u, 'v, 'w, 'x,
+LL |     'y, 'z, 'aa, I: for<'l, 'm> Foo<&'l &'m isize>> {
+LL |     field: <I as Foo<&'bb &'bb isize>>::A,
+   |
 
-error: aborting due to previous error
+error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed
new file mode 100644
index 0000000000..acf32bccbe
--- /dev/null
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.fixed
@@ -0,0 +1,38 @@
+#![allow(dead_code)]
+// run-rustfix
+// Check projection of an associated type out of a higher-ranked trait-bound
+// in the context of a method definition in a trait.
+
+pub trait Foo<T> {
+    type A;
+
+    fn get(&self, t: T) -> Self::A;
+}
+
+trait SomeTrait<I : for<'x> Foo<&'x isize>> {
+    fn some_method(&self, arg: <I as Foo<&isize>>::A);
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
+}
+
+trait AnotherTrait<I : for<'x> Foo<&'x isize>> {
+    fn some_method(&self, arg: <I as Foo<&isize>>::A);
+}
+
+trait YetAnotherTrait<I : for<'x> Foo<&'x isize>> {
+    fn some_method<'a>(&self, arg: <I as Foo<&'a isize>>::A);
+}
+
+trait Banana<'a> {
+    type Assoc: Default;
+}
+
+struct Peach<X>(std::marker::PhantomData<X>);
+
+impl<X: for<'a> Banana<'a>> Peach<X> {
+    fn mango(&self) -> <X as Banana<'_>>::Assoc {
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
+        Default::default()
+    }
+}
+
+pub fn main() {}
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs
index cb52c2b4f1..a249f89685 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.rs
@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+// run-rustfix
 // Check projection of an associated type out of a higher-ranked trait-bound
 // in the context of a method definition in a trait.
 
@@ -20,4 +22,17 @@ trait YetAnotherTrait<I : for<'x> Foo<&'x isize>> {
     fn some_method<'a>(&self, arg: <I as Foo<&'a isize>>::A);
 }
 
+trait Banana<'a> {
+    type Assoc: Default;
+}
+
+struct Peach<X>(std::marker::PhantomData<X>);
+
+impl<X: for<'a> Banana<'a>> Peach<X> {
+    fn mango(&self) -> X::Assoc {
+    //~^ ERROR cannot extract an associated type from a higher-ranked trait bound in this context
+        Default::default()
+    }
+}
+
 pub fn main() {}
diff --git a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
index e1c169028c..a37fec2449 100644
--- a/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
+++ b/src/test/ui/associated-types/associated-types-project-from-hrtb-in-trait-method.stderr
@@ -1,8 +1,14 @@
 error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context
-  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:11:32
+  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:13:32
    |
 LL |     fn some_method(&self, arg: I::A);
-   |                                ^^^^
+   |                                ^^^^ help: use a fully qualified path with inferred lifetimes: `<I as Foo<&isize>>::A`
 
-error: aborting due to previous error
+error[E0212]: cannot extract an associated type from a higher-ranked trait bound in this context
+  --> $DIR/associated-types-project-from-hrtb-in-trait-method.rs:32:24
+   |
+LL |     fn mango(&self) -> X::Assoc {
+   |                        ^^^^^^^^ help: use a fully qualified path with inferred lifetimes: `<X as Banana<'_>>::Assoc`
+
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-1.rs b/src/test/ui/associated-types/defaults-cyclic-fail-1.rs
new file mode 100644
index 0000000000..71ac914ef5
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-cyclic-fail-1.rs
@@ -0,0 +1,45 @@
+#![feature(associated_type_defaults)]
+
+// Having a cycle in assoc. type defaults is okay...
+trait Tr {
+    type A = Self::B;
+    type B = Self::A;
+}
+
+// ...but is an error in any impl that doesn't override at least one of the defaults
+impl Tr for () {}
+//~^ ERROR overflow evaluating the requirement
+
+// As soon as at least one is redefined, it works:
+impl Tr for u8 {
+    type A = u8;
+}
+
+impl Tr for u16 {
+    type B = ();
+}
+
+impl Tr for u32 {
+    type A = ();
+    type B = u8;
+}
+
+// ...but only if this actually breaks the cycle
+impl Tr for bool {
+//~^ ERROR overflow evaluating the requirement
+    type A = Box<Self::B>;
+    //~^ ERROR overflow evaluating the requirement
+}
+// (the error is shown twice for some reason)
+
+impl Tr for usize {
+//~^ ERROR overflow evaluating the requirement
+    type B = &'static Self::A;
+    //~^ ERROR overflow evaluating the requirement
+}
+
+fn main() {
+    // We don't check that the types project correctly because the cycle errors stop compilation
+    // before `main` is type-checked.
+    // `defaults-cyclic-pass-1.rs` does this.
+}
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-1.stderr b/src/test/ui/associated-types/defaults-cyclic-fail-1.stderr
new file mode 100644
index 0000000000..6a8526f6aa
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-cyclic-fail-1.stderr
@@ -0,0 +1,33 @@
+error[E0275]: overflow evaluating the requirement `<() as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-1.rs:10:6
+   |
+LL | impl Tr for () {}
+   |      ^^
+
+error[E0275]: overflow evaluating the requirement `<bool as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-1.rs:28:6
+   |
+LL | impl Tr for bool {
+   |      ^^
+
+error[E0275]: overflow evaluating the requirement `<usize as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-1.rs:35:6
+   |
+LL | impl Tr for usize {
+   |      ^^
+
+error[E0275]: overflow evaluating the requirement `<bool as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-1.rs:30:5
+   |
+LL |     type A = Box<Self::B>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0275]: overflow evaluating the requirement `<usize as Tr>::A`
+  --> $DIR/defaults-cyclic-fail-1.rs:37:5
+   |
+LL |     type B = &'static Self::A;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 5 previous errors
+
+For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-2.rs b/src/test/ui/associated-types/defaults-cyclic-fail-2.rs
new file mode 100644
index 0000000000..05091e3f49
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-cyclic-fail-2.rs
@@ -0,0 +1,47 @@
+#![feature(associated_type_defaults)]
+
+// A more complex version of `defaults-cyclic-fail-1.rs`, with non-trivial defaults.
+
+// Having a cycle in assoc. type defaults is okay...
+trait Tr {
+    type A = Vec<Self::B>;
+    type B = Box<Self::A>;
+}
+
+// ...but is an error in any impl that doesn't override at least one of the defaults
+impl Tr for () {}
+//~^ ERROR overflow evaluating the requirement
+
+// As soon as at least one is redefined, it works:
+impl Tr for u8 {
+    type A = u8;
+}
+
+impl Tr for u16 {
+    type B = ();
+}
+
+impl Tr for u32 {
+    type A = ();
+    type B = u8;
+}
+
+// ...but only if this actually breaks the cycle
+impl Tr for bool {
+//~^ ERROR overflow evaluating the requirement
+    type A = Box<Self::B>;
+    //~^ ERROR overflow evaluating the requirement
+}
+// (the error is shown twice for some reason)
+
+impl Tr for usize {
+//~^ ERROR overflow evaluating the requirement
+    type B = &'static Self::A;
+    //~^ ERROR overflow evaluating the requirement
+}
+
+fn main() {
+    // We don't check that the types project correctly because the cycle errors stop compilation
+    // before `main` is type-checked.
+    // `defaults-cyclic-pass-2.rs` does this.
+}
diff --git a/src/test/ui/associated-types/defaults-cyclic-fail-2.stderr b/src/test/ui/associated-types/defaults-cyclic-fail-2.stderr
new file mode 100644
index 0000000000..78772df963
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-cyclic-fail-2.stderr
@@ -0,0 +1,33 @@
+error[E0275]: overflow evaluating the requirement `<() as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-2.rs:12:6
+   |
+LL | impl Tr for () {}
+   |      ^^
+
+error[E0275]: overflow evaluating the requirement `<bool as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-2.rs:30:6
+   |
+LL | impl Tr for bool {
+   |      ^^
+
+error[E0275]: overflow evaluating the requirement `<usize as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-2.rs:37:6
+   |
+LL | impl Tr for usize {
+   |      ^^
+
+error[E0275]: overflow evaluating the requirement `<bool as Tr>::B`
+  --> $DIR/defaults-cyclic-fail-2.rs:32:5
+   |
+LL |     type A = Box<Self::B>;
+   |     ^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0275]: overflow evaluating the requirement `<usize as Tr>::A`
+  --> $DIR/defaults-cyclic-fail-2.rs:39:5
+   |
+LL |     type B = &'static Self::A;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 5 previous errors
+
+For more information about this error, try `rustc --explain E0275`.
diff --git a/src/test/ui/associated-types/defaults-cyclic-pass-1.rs b/src/test/ui/associated-types/defaults-cyclic-pass-1.rs
new file mode 100644
index 0000000000..97c6e5bade
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-cyclic-pass-1.rs
@@ -0,0 +1,56 @@
+// check-pass
+
+#![feature(associated_type_defaults)]
+
+// Having a cycle in assoc. type defaults is okay, as long as there's no impl
+// that retains it.
+trait Tr {
+    type A = Self::B;
+    type B = Self::A;
+
+    fn f();
+}
+
+// An impl has to break the cycle to be accepted.
+impl Tr for u8 {
+    type A = u8;
+
+    fn f() {
+        // Check that the type propagates as expected (seen from inside the impl)
+        let _: Self::A = 0u8;
+        let _: Self::B = 0u8;
+    }
+}
+
+impl Tr for String {
+    type B = ();
+
+    fn f() {
+        // Check that the type propagates as expected (seen from inside the impl)
+        let _: Self::A = ();
+        let _: Self::B = ();
+    }
+}
+
+impl Tr for () {
+    type A = Vec<()>;
+    type B = u8;
+
+    fn f() {
+        // Check that the type propagates as expected (seen from inside the impl)
+        let _: Self::A = Vec::<()>::new();
+        let _: Self::B = 0u8;
+    }
+}
+
+fn main() {
+    // Check that both impls now have the right types (seen from outside the impls)
+    let _: <u8 as Tr>::A = 0u8;
+    let _: <u8 as Tr>::B = 0u8;
+
+    let _: <String as Tr>::A = ();
+    let _: <String as Tr>::B = ();
+
+    let _: <() as Tr>::A = Vec::<()>::new();
+    let _: <() as Tr>::B = 0u8;
+}
diff --git a/src/test/ui/associated-types/defaults-cyclic-pass-2.rs b/src/test/ui/associated-types/defaults-cyclic-pass-2.rs
new file mode 100644
index 0000000000..69315a0221
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-cyclic-pass-2.rs
@@ -0,0 +1,56 @@
+// check-pass
+
+#![feature(associated_type_defaults)]
+
+// Having a cycle in assoc. type defaults is okay, as long as there's no impl
+// that retains it.
+trait Tr {
+    type A = Vec<Self::B>;
+    type B = Box<Self::A>;
+
+    fn f();
+}
+
+// An impl has to break the cycle to be accepted.
+impl Tr for u8 {
+    type A = u8;
+
+    fn f() {
+        // Check that the type propagates as expected (seen from inside the impl)
+        let _: Self::A = 0u8;
+        let _: Self::B = Box::new(0u8);
+    }
+}
+
+impl Tr for String {
+    type B = ();
+
+    fn f() {
+        // Check that the type propagates as expected (seen from inside the impl)
+        let _: Self::A = Vec::<()>::new();
+        let _: Self::B = ();
+    }
+}
+
+impl Tr for () {
+    type A = Vec<()>;
+    type B = u8;
+
+    fn f() {
+        // Check that the type propagates as expected (seen from inside the impl)
+        let _: Self::A = Vec::<()>::new();
+        let _: Self::B = 0u8;
+    }
+}
+
+fn main() {
+    // Check that both impls now have the right types (seen from outside the impls)
+    let _: <u8 as Tr>::A = 0u8;
+    let _: <u8 as Tr>::B = Box::new(0u8);
+
+    let _: <String as Tr>::A = Vec::<()>::new();
+    let _: <String as Tr>::B = ();
+
+    let _: <() as Tr>::A = Vec::<()>::new();
+    let _: <() as Tr>::B = 0u8;
+}
diff --git a/src/test/ui/associated-types/defaults-in-other-trait-items-pass.rs b/src/test/ui/associated-types/defaults-in-other-trait-items-pass.rs
new file mode 100644
index 0000000000..a3bfcd8efe
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-in-other-trait-items-pass.rs
@@ -0,0 +1,37 @@
+// check-pass
+
+#![feature(associated_type_defaults)]
+
+trait Tr {
+    type Item = u8;
+    type Container = Vec<Self::Item>;
+}
+
+impl Tr for () {}
+
+impl Tr for u16 {
+    type Item = u16;
+}
+
+impl Tr for String {
+    type Container = String;
+}
+
+impl Tr for usize {
+    type Item = u32;
+    type Container = Vec<()>;
+}
+
+fn main() {
+    let _container: <() as Tr>::Container = Vec::<u8>::new();
+    let _item: <() as Tr>::Item = 0u8;
+
+    let _container: <u16 as Tr>::Container = Vec::<u16>::new();
+    let _item: <u16 as Tr>::Item = 0u16;
+
+    let _container: <String as Tr>::Container = String::new();
+    let _item: <String as Tr>::Item = 0u8;
+
+    let _container: <usize as Tr>::Container = Vec::<()>::new();
+    let _item: <usize as Tr>::Item = 0u32;
+}
diff --git a/src/test/ui/associated-types/defaults-in-other-trait-items.rs b/src/test/ui/associated-types/defaults-in-other-trait-items.rs
new file mode 100644
index 0000000000..9f2e8aca47
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-in-other-trait-items.rs
@@ -0,0 +1,50 @@
+#![feature(associated_type_defaults)]
+
+// Associated type defaults may not be assumed inside the trait defining them.
+// ie. they only resolve to `<Self as Tr>::A`, not the actual type `()`
+trait Tr {
+    type A = ();
+
+    fn f(p: Self::A) {
+        let () = p;
+        //~^ ERROR mismatched types
+        //~| NOTE expected associated type, found `()`
+        //~| NOTE expected associated type `<Self as Tr>::A`
+        //~| NOTE consider constraining the associated type
+        //~| NOTE for more information, visit
+    }
+}
+
+// An impl that doesn't override the type *can* assume the default.
+impl Tr for () {
+    fn f(p: Self::A) {
+        let () = p;
+    }
+}
+
+impl Tr for u8 {
+    type A = ();
+
+    fn f(p: Self::A) {
+        let () = p;
+    }
+}
+
+trait AssocConst {
+    type Ty = u8;
+
+    // Assoc. consts also cannot assume that default types hold
+    const C: Self::Ty = 0u8;
+    //~^ ERROR mismatched types
+    //~| NOTE expected associated type, found `u8`
+    //~| NOTE expected associated type `<Self as AssocConst>::Ty`
+    //~| NOTE consider constraining the associated type
+    //~| NOTE for more information, visit
+}
+
+// An impl can, however
+impl AssocConst for () {
+    const C: Self::Ty = 0u8;
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/defaults-in-other-trait-items.stderr b/src/test/ui/associated-types/defaults-in-other-trait-items.stderr
new file mode 100644
index 0000000000..9ecfe49c2b
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-in-other-trait-items.stderr
@@ -0,0 +1,25 @@
+error[E0308]: mismatched types
+  --> $DIR/defaults-in-other-trait-items.rs:9:13
+   |
+LL |         let () = p;
+   |             ^^ expected associated type, found `()`
+   |
+   = note: expected associated type `<Self as Tr>::A`
+                    found unit type `()`
+   = note: consider constraining the associated type `<Self as Tr>::A` to `()` or calling a method that returns `<Self as Tr>::A`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-in-other-trait-items.rs:37:25
+   |
+LL |     const C: Self::Ty = 0u8;
+   |                         ^^^ expected associated type, found `u8`
+   |
+   = note: expected associated type `<Self as AssocConst>::Ty`
+                         found type `u8`
+   = note: consider constraining the associated type `<Self as AssocConst>::Ty` to `u8` or calling a method that returns `<Self as AssocConst>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/associated-types/defaults-mixed.rs b/src/test/ui/associated-types/defaults-mixed.rs
new file mode 100644
index 0000000000..c91b8de39f
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-mixed.rs
@@ -0,0 +1,34 @@
+#![feature(associated_type_defaults)]
+
+// Tests that a trait with one defaulted and one non-defaulted assoc. type behaves properly.
+
+trait Trait {
+    type Foo = u8;
+    type Bar;
+}
+
+// `Bar` must be specified
+impl Trait for () {}
+//~^ error: not all trait items implemented, missing: `Bar`
+
+impl Trait for bool {
+//~^ error: not all trait items implemented, missing: `Bar`
+    type Foo = ();
+}
+
+impl Trait for u8 {
+    type Bar = ();
+}
+
+impl Trait for u16 {
+    type Foo = String;
+    type Bar = bool;
+}
+
+fn main() {
+    let _: <u8 as Trait>::Foo = 0u8;
+    let _: <u8 as Trait>::Bar = ();
+
+    let _: <u16 as Trait>::Foo = String::new();
+    let _: <u16 as Trait>::Bar = true;
+}
diff --git a/src/test/ui/associated-types/defaults-mixed.stderr b/src/test/ui/associated-types/defaults-mixed.stderr
new file mode 100644
index 0000000000..69ddd5f232
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-mixed.stderr
@@ -0,0 +1,21 @@
+error[E0046]: not all trait items implemented, missing: `Bar`
+  --> $DIR/defaults-mixed.rs:11:1
+   |
+LL |     type Bar;
+   |     --------- `Bar` from trait
+...
+LL | impl Trait for () {}
+   | ^^^^^^^^^^^^^^^^^ missing `Bar` in implementation
+
+error[E0046]: not all trait items implemented, missing: `Bar`
+  --> $DIR/defaults-mixed.rs:14:1
+   |
+LL |     type Bar;
+   |     --------- `Bar` from trait
+...
+LL | impl Trait for bool {
+   | ^^^^^^^^^^^^^^^^^^^ missing `Bar` in implementation
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0046`.
diff --git a/src/test/ui/associated-types/defaults-specialization.rs b/src/test/ui/associated-types/defaults-specialization.rs
new file mode 100644
index 0000000000..d0ed718b83
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-specialization.rs
@@ -0,0 +1,95 @@
+//! Tests the interaction of associated type defaults and specialization.
+
+#![feature(associated_type_defaults, specialization)]
+
+trait Tr {
+    type Ty = u8;
+
+    fn make() -> Self::Ty {
+        0u8
+        //~^ error: mismatched types
+    }
+}
+
+struct A<T>(T);
+// In a `default impl`, assoc. types are defaulted as well,
+// so their values can't be assumed.
+default impl<T> Tr for A<T> {
+    fn make() -> u8 { 0 }
+    //~^ ERROR method `make` has an incompatible type for trait
+}
+
+struct A2<T>(T);
+// ...same, but in the method body
+default impl<T> Tr for A2<T> {
+    fn make() -> Self::Ty { 0u8 }
+    //~^ ERROR mismatched types
+}
+
+struct B<T>(T);
+// Explicitly defaulting the type does the same.
+impl<T> Tr for B<T> {
+    default type Ty = bool;
+
+    fn make() -> bool { true }
+    //~^ ERROR method `make` has an incompatible type for trait
+}
+
+struct B2<T>(T);
+// ...same, but in the method body
+impl<T> Tr for B2<T> {
+    default type Ty = bool;
+
+    fn make() -> Self::Ty { true }
+    //~^ ERROR mismatched types
+}
+
+struct C<T>(T);
+// Only the method is defaulted, so this is fine.
+impl<T> Tr for C<T> {
+    type Ty = bool;
+
+    default fn make() -> bool { true }
+}
+
+// Defaulted method *can* assume the type, if the default is kept.
+struct D<T>(T);
+impl<T> Tr for D<T> {
+    default fn make() -> u8 { 0 }
+}
+
+impl Tr for D<bool> {
+    fn make() -> u8 { 255 }
+}
+
+struct E<T>(T);
+impl<T> Tr for E<T> {
+    default type Ty = bool;
+    default fn make() -> Self::Ty { panic!(); }
+}
+
+// This impl specializes and sets `Ty`, it can rely on `Ty=String`.
+impl Tr for E<bool> {
+    type Ty = String;
+
+    fn make() -> String { String::new() }
+}
+
+fn main() {
+    // Test that we can assume the right set of assoc. types from outside the impl
+
+    // This is a `default impl`, which does *not* mean that `A`/`A2` actually implement the trait.
+    // cf. https://github.com/rust-lang/rust/issues/48515
+    //let _: <A<()> as Tr>::Ty = 0u8;
+    //let _: <A2<()> as Tr>::Ty = 0u8;
+
+    let _: <B<()> as Tr>::Ty = 0u8;   //~ error: mismatched types
+    let _: <B<()> as Tr>::Ty = true;  //~ error: mismatched types
+    let _: <B2<()> as Tr>::Ty = 0u8;  //~ error: mismatched types
+    let _: <B2<()> as Tr>::Ty = true; //~ error: mismatched types
+
+    let _: <C<()> as Tr>::Ty = true;
+
+    let _: <D<()> as Tr>::Ty = 0u8;
+    let _: <D<bool> as Tr>::Ty = 0u8;
+}
diff --git a/src/test/ui/associated-types/defaults-specialization.stderr b/src/test/ui/associated-types/defaults-specialization.stderr
new file mode 100644
index 0000000000..1dd536ec63
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-specialization.stderr
@@ -0,0 +1,123 @@
+error[E0053]: method `make` has an incompatible type for trait
+  --> $DIR/defaults-specialization.rs:18:18
+   |
+LL |     fn make() -> Self::Ty {
+   |                  -------- type in trait
+...
+LL |     fn make() -> u8 { 0 }
+   |                  ^^ expected associated type, found `u8`
+   |
+   = note: expected fn pointer `fn() -> <A<T> as Tr>::Ty`
+              found fn pointer `fn() -> u8`
+   = note: consider constraining the associated type `<A<T> as Tr>::Ty` to `u8` or calling a method that returns `<A<T> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0053]: method `make` has an incompatible type for trait
+  --> $DIR/defaults-specialization.rs:34:18
+   |
+LL |     fn make() -> Self::Ty {
+   |                  -------- type in trait
+...
+LL |     fn make() -> bool { true }
+   |                  ^^^^ expected associated type, found `bool`
+   |
+   = note: expected fn pointer `fn() -> <B<T> as Tr>::Ty`
+              found fn pointer `fn() -> bool`
+   = note: consider constraining the associated type `<B<T> as Tr>::Ty` to `bool` or calling a method that returns `<B<T> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:9:9
+   |
+LL |     fn make() -> Self::Ty {
+   |                  -------- expected `<Self as Tr>::Ty` because of return type
+LL |         0u8
+   |         ^^^ expected associated type, found `u8`
+   |
+   = note: expected associated type `<Self as Tr>::Ty`
+                         found type `u8`
+   = note: consider constraining the associated type `<Self as Tr>::Ty` to `u8` or calling a method that returns `<Self as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:25:29
+   |
+LL |     fn make() -> Self::Ty { 0u8 }
+   |                  --------   ^^^ expected associated type, found `u8`
+   |                  |
+   |                  expected `<A2<T> as Tr>::Ty` because of return type
+   |
+   = note: expected associated type `<A2<T> as Tr>::Ty`
+                         found type `u8`
+   = note: consider constraining the associated type `<A2<T> as Tr>::Ty` to `u8` or calling a method that returns `<A2<T> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:43:29
+   |
+LL |     fn make() -> Self::Ty { true }
+   |                  --------   ^^^^ expected associated type, found `bool`
+   |                  |
+   |                  expected `<B2<T> as Tr>::Ty` because of return type
+   |
+   = note: expected associated type `<B2<T> as Tr>::Ty`
+                         found type `bool`
+   = note: consider constraining the associated type `<B2<T> as Tr>::Ty` to `bool` or calling a method that returns `<B2<T> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:86:32
+   |
+LL |     let _: <B<()> as Tr>::Ty = 0u8;
+   |            -----------------   ^^^ expected associated type, found `u8`
+   |            |
+   |            expected due to this
+   |
+   = note: expected associated type `<B<()> as Tr>::Ty`
+                         found type `u8`
+   = note: consider constraining the associated type `<B<()> as Tr>::Ty` to `u8` or calling a method that returns `<B<()> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:87:32
+   |
+LL |     let _: <B<()> as Tr>::Ty = true;
+   |            -----------------   ^^^^ expected associated type, found `bool`
+   |            |
+   |            expected due to this
+   |
+   = note: expected associated type `<B<()> as Tr>::Ty`
+                         found type `bool`
+   = note: consider constraining the associated type `<B<()> as Tr>::Ty` to `bool` or calling a method that returns `<B<()> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:88:33
+   |
+LL |     let _: <B2<()> as Tr>::Ty = 0u8;
+   |            ------------------   ^^^ expected associated type, found `u8`
+   |            |
+   |            expected due to this
+   |
+   = note: expected associated type `<B2<()> as Tr>::Ty`
+                         found type `u8`
+   = note: consider constraining the associated type `<B2<()> as Tr>::Ty` to `u8` or calling a method that returns `<B2<()> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error[E0308]: mismatched types
+  --> $DIR/defaults-specialization.rs:89:33
+   |
+LL |     let _: <B2<()> as Tr>::Ty = true;
+   |            ------------------   ^^^^ expected associated type, found `bool`
+   |            |
+   |            expected due to this
+   |
+   = note: expected associated type `<B2<()> as Tr>::Ty`
+                         found type `bool`
+   = note: consider constraining the associated type `<B2<()> as Tr>::Ty` to `bool` or calling a method that returns `<B2<()> as Tr>::Ty`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error: aborting due to 9 previous errors
+
+Some errors have detailed explanations: E0053, E0308.
+For more information about an error, try `rustc --explain E0053`.
diff --git a/src/test/ui/associated-types/defaults-suitability.rs b/src/test/ui/associated-types/defaults-suitability.rs
new file mode 100644
index 0000000000..2be01cba10
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-suitability.rs
@@ -0,0 +1,106 @@
+//! Checks that associated type defaults are properly validated.
+//!
+//! This means:
+//! * Default types are wfchecked
+//! * Default types are checked against where clauses on the assoc. type
+//!   (eg. `type Assoc: Clone = NotClone`), and also against where clauses on
+//!   the trait itself when possible
+
+#![feature(associated_type_defaults)]
+
+struct NotClone;
+
+// Assoc. type bounds must hold for the default type
+trait Tr {
+    type Ty: Clone = NotClone;
+    //~^ ERROR the trait bound `NotClone: std::clone::Clone` is not satisfied
+}
+
+// Where-clauses defined on the trait must also be considered
+trait Tr2 where Self::Ty: Clone {
+    //~^ ERROR the trait bound `NotClone: std::clone::Clone` is not satisfied
+    type Ty = NotClone;
+}
+
+// Independent of where-clauses (there are none here), default types must always be wf
+trait Tr3 {
+    type Ty = Vec<[u8]>;
+    //~^ ERROR the size for values of type `[u8]` cannot be known at compilation time
+}
+
+// Involved type parameters must fulfill all bounds required by defaults that mention them
+trait Foo<T> {
+    type Bar: Clone = Vec<T>;
+    //~^ ERROR the trait bound `T: std::clone::Clone` is not satisfied
+}
+
+trait Bar: Sized {
+    // `(): Foo<Self>` might hold for some possible impls but not all.
+    type Assoc: Foo<Self> = ();
+    //~^ ERROR the trait bound `(): Foo<Self>` is not satisfied
+}
+
+trait IsU8<T> {}
+impl<T> IsU8<u8> for T {}
+
+// Test that mentioning the assoc. type inside where clauses works
+trait C where
+    Vec<Self::Assoc>: Clone,
+    Self::Assoc: IsU8<Self::Assoc>,
+    bool: IsU8<Self::Assoc>,
+{
+    type Assoc = u8;
+}
+
+// Test that we get all expected errors if that default is unsuitable
+trait D where
+    Vec<Self::Assoc>: Clone,
+    //~^ ERROR the trait bound `NotClone: std::clone::Clone` is not satisfied
+    Self::Assoc: IsU8<Self::Assoc>,
+    //~^ ERROR the trait bound `NotClone: IsU8<NotClone>` is not satisfied
+    bool: IsU8<Self::Assoc>,
+    //~^ ERROR the trait bound `bool: IsU8<NotClone>` is not satisfied
+{
+    type Assoc = NotClone;
+}
+
+// Test behavior of the check when defaults refer to other defaults:
+
+// Shallow substitution rejects this trait since `Baz` isn't guaranteed to be
+// `Clone`.
+trait Foo2<T> {
+    type Bar: Clone = Vec<Self::Baz>;
+    //~^ ERROR the trait bound `<Self as Foo2<T>>::Baz: std::clone::Clone` is not satisfied
+    type Baz = T;
+}
+
+// Adding a `T: Clone` bound doesn't help since the requirement doesn't see `T`
+// because of the shallow substitution. If we did a deep substitution instead,
+// this would be accepted.
+trait Foo25<T: Clone> {
+    type Bar: Clone = Vec<Self::Baz>;
+    //~^ ERROR the trait bound `<Self as Foo25<T>>::Baz: std::clone::Clone` is not satisfied
+    type Baz = T;
+}
+
+// Adding the `Baz: Clone` bound isn't enough since the default is type
+// parameter `T`, which also might not be `Clone`.
+trait Foo3<T> where
+    Self::Bar: Clone,
+    Self::Baz: Clone,
+    //~^ ERROR the trait bound `T: std::clone::Clone` is not satisfied
+{
+    type Bar = Vec<Self::Baz>;
+    type Baz = T;
+}
+
+// This one finally works, with `Clone` bounds on all assoc. types and the type
+// parameter.
+trait Foo4<T> where
+    T: Clone,
+{
+    type Bar: Clone = Vec<Self::Baz>;
+    type Baz: Clone = T;
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/defaults-suitability.stderr b/src/test/ui/associated-types/defaults-suitability.stderr
new file mode 100644
index 0000000000..60e1821b30
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-suitability.stderr
@@ -0,0 +1,140 @@
+error[E0277]: the trait bound `NotClone: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:15:14
+   |
+LL | trait Tr {
+   | -------- required by `Tr`
+LL |     type Ty: Clone = NotClone;
+   |              ^^^^^ the trait `std::clone::Clone` is not implemented for `NotClone`
+
+error[E0277]: the trait bound `NotClone: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:20:27
+   |
+LL | trait Tr2 where Self::Ty: Clone {
+   | --------------------------^^^^^
+   | |                         |
+   | |                         the trait `std::clone::Clone` is not implemented for `NotClone`
+   | required by `Tr2`
+
+error[E0277]: the trait bound `T: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:33:15
+   |
+LL | trait Foo<T> {
+   | ------------ required by `Foo`
+LL |     type Bar: Clone = Vec<T>;
+   |               ^^^^^ the trait `std::clone::Clone` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::clone::Clone`
+  --> $DIR/defaults-suitability.rs:32:11
+   |
+LL | trait Foo<T> {
+   |           ^
+   = note: required because of the requirements on the impl of `std::clone::Clone` for `std::vec::Vec<T>`
+
+error[E0277]: the trait bound `(): Foo<Self>` is not satisfied
+  --> $DIR/defaults-suitability.rs:39:17
+   |
+LL | trait Bar: Sized {
+   | ---------------- required by `Bar`
+LL |     // `(): Foo<Self>` might hold for some possible impls but not all.
+LL |     type Assoc: Foo<Self> = ();
+   |                 ^^^^^^^^^ the trait `Foo<Self>` is not implemented for `()`
+
+error[E0277]: the trait bound `NotClone: IsU8<NotClone>` is not satisfied
+  --> $DIR/defaults-suitability.rs:59:18
+   |
+LL | / trait D where
+LL | |     Vec<Self::Assoc>: Clone,
+LL | |
+LL | |     Self::Assoc: IsU8<Self::Assoc>,
+   | |                  ^^^^^^^^^^^^^^^^^ the trait `IsU8<NotClone>` is not implemented for `NotClone`
+...  |
+LL | |     type Assoc = NotClone;
+LL | | }
+   | |_- required by `D`
+
+error[E0277]: the trait bound `bool: IsU8<NotClone>` is not satisfied
+  --> $DIR/defaults-suitability.rs:61:11
+   |
+LL | / trait D where
+LL | |     Vec<Self::Assoc>: Clone,
+LL | |
+LL | |     Self::Assoc: IsU8<Self::Assoc>,
+LL | |
+LL | |     bool: IsU8<Self::Assoc>,
+   | |           ^^^^^^^^^^^^^^^^^ the trait `IsU8<NotClone>` is not implemented for `bool`
+...  |
+LL | |     type Assoc = NotClone;
+LL | | }
+   | |_- required by `D`
+
+error[E0277]: the trait bound `NotClone: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:57:23
+   |
+LL | / trait D where
+LL | |     Vec<Self::Assoc>: Clone,
+   | |                       ^^^^^ the trait `std::clone::Clone` is not implemented for `NotClone`
+LL | |
+LL | |     Self::Assoc: IsU8<Self::Assoc>,
+...  |
+LL | |     type Assoc = NotClone;
+LL | | }
+   | |_- required by `D`
+   |
+   = note: required because of the requirements on the impl of `std::clone::Clone` for `std::vec::Vec<NotClone>`
+
+error[E0277]: the trait bound `<Self as Foo2<T>>::Baz: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:72:15
+   |
+LL | trait Foo2<T> {
+   | -------------- help: consider further restricting the associated type: `where <Self as Foo2<T>>::Baz: std::clone::Clone`
+   | |
+   | required by `Foo2`
+LL |     type Bar: Clone = Vec<Self::Baz>;
+   |               ^^^^^ the trait `std::clone::Clone` is not implemented for `<Self as Foo2<T>>::Baz`
+   |
+   = note: required because of the requirements on the impl of `std::clone::Clone` for `std::vec::Vec<<Self as Foo2<T>>::Baz>`
+
+error[E0277]: the trait bound `<Self as Foo25<T>>::Baz: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:81:15
+   |
+LL | trait Foo25<T: Clone> {
+   | ---------------------- help: consider further restricting the associated type: `where <Self as Foo25<T>>::Baz: std::clone::Clone`
+   | |
+   | required by `Foo25`
+LL |     type Bar: Clone = Vec<Self::Baz>;
+   |               ^^^^^ the trait `std::clone::Clone` is not implemented for `<Self as Foo25<T>>::Baz`
+   |
+   = note: required because of the requirements on the impl of `std::clone::Clone` for `std::vec::Vec<<Self as Foo25<T>>::Baz>`
+
+error[E0277]: the trait bound `T: std::clone::Clone` is not satisfied
+  --> $DIR/defaults-suitability.rs:90:16
+   |
+LL | / trait Foo3<T> where
+LL | |     Self::Bar: Clone,
+LL | |     Self::Baz: Clone,
+   | |                ^^^^^ the trait `std::clone::Clone` is not implemented for `T`
+LL | |
+...  |
+LL | |     type Baz = T;
+LL | | }
+   | |_- required by `Foo3`
+   |
+help: consider restricting this type parameter with `where T: std::clone::Clone`
+  --> $DIR/defaults-suitability.rs:88:12
+   |
+LL | trait Foo3<T> where
+   |            ^
+
+error[E0277]: the size for values of type `[u8]` cannot be known at compilation time
+  --> $DIR/defaults-suitability.rs:27:5
+   |
+LL |     type Ty = Vec<[u8]>;
+   |     ^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `std::marker::Sized` is not implemented for `[u8]`
+   = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
+   = note: required by `std::vec::Vec`
+
+error: aborting due to 11 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-1.rs b/src/test/ui/associated-types/defaults-unsound-62211-1.rs
new file mode 100644
index 0000000000..c8b4734d6e
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-unsound-62211-1.rs
@@ -0,0 +1,63 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/62211
+//!
+//! The old implementation of defaults did not check whether the provided
+//! default actually fulfills all bounds on the assoc. type, leading to
+//! unsoundness, demonstrated here as a use-after-free.
+//!
+//! Note that the underlying cause of this is still not yet fixed.
+//! See: https://github.com/rust-lang/rust/issues/33017
+
+#![feature(associated_type_defaults)]
+
+use std::{
+    fmt::Display,
+    ops::{AddAssign, Deref}
+};
+
+
+trait UncheckedCopy: Sized {
+    // This Output is said to be Copy. Yet we default to Self
+    // and it's accepted, not knowing if Self ineed is Copy
+    type Output: Copy
+    //~^ ERROR the trait bound `Self: std::marker::Copy` is not satisfied
+    + Deref<Target = str>
+    //~^ ERROR the trait bound `Self: std::ops::Deref` is not satisfied
+    + AddAssign<&'static str>
+    //~^ ERROR cannot add-assign `&'static str` to `Self`
+    + From<Self>
+    + Display = Self;
+    //~^ ERROR `Self` doesn't implement `std::fmt::Display`
+
+    // We said the Output type was Copy, so we can Copy it freely!
+    fn unchecked_copy(other: &Self::Output) -> Self::Output {
+        (*other)
+    }
+
+    fn make_origin(s: Self) -> Self::Output {
+        s.into()
+    }
+}
+
+impl<T> UncheckedCopy for T {}
+//~^ ERROR `T` doesn't implement `std::fmt::Display`
+//~| ERROR the trait bound `T: std::ops::Deref` is not satisfied
+//~| ERROR cannot add-assign `&'static str` to `T`
+//~| ERROR the trait bound `T: std::marker::Copy` is not satisfied
+
+fn bug<T: UncheckedCopy>(origin: T) {
+    let origin = T::make_origin(origin);
+    let mut copy = T::unchecked_copy(&origin);
+
+    // assert we indeed have 2 strings pointing to the same buffer.
+    assert_eq!(origin.as_ptr(), copy.as_ptr());
+
+    // Drop the origin. Any use of `copy` is UB.
+    drop(origin);
+
+    copy += "This is invalid!";
+    println!("{}", copy);
+}
+
+fn main() {
+    bug(String::from("hello!"));
+}
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-1.stderr b/src/test/ui/associated-types/defaults-unsound-62211-1.stderr
new file mode 100644
index 0000000000..9c4a126013
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-unsound-62211-1.stderr
@@ -0,0 +1,95 @@
+error[E0277]: the trait bound `Self: std::marker::Copy` is not satisfied
+  --> $DIR/defaults-unsound-62211-1.rs:21:18
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     type Output: Copy
+   |                  ^^^^ the trait `std::marker::Copy` is not implemented for `Self`
+
+error[E0277]: cannot add-assign `&'static str` to `Self`
+  --> $DIR/defaults-unsound-62211-1.rs:25:7
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     + AddAssign<&'static str>
+   |       ^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `Self += &'static str`
+   |
+   = help: the trait `std::ops::AddAssign<&'static str>` is not implemented for `Self`
+
+error[E0277]: the trait bound `Self: std::ops::Deref` is not satisfied
+  --> $DIR/defaults-unsound-62211-1.rs:23:7
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     + Deref<Target = str>
+   |       ^^^^^^^^^^^^^^^^^^^ the trait `std::ops::Deref` is not implemented for `Self`
+
+error[E0277]: `Self` doesn't implement `std::fmt::Display`
+  --> $DIR/defaults-unsound-62211-1.rs:28:7
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     + Display = Self;
+   |       ^^^^^^^ `Self` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `Self`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+
+error[E0277]: `T` doesn't implement `std::fmt::Display`
+  --> $DIR/defaults-unsound-62211-1.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ `T` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `T`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+help: consider restricting this type parameter with `T: std::fmt::Display`
+  --> $DIR/defaults-unsound-62211-1.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error[E0277]: the trait bound `T: std::ops::Deref` is not satisfied
+  --> $DIR/defaults-unsound-62211-1.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ the trait `std::ops::Deref` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::ops::Deref`
+  --> $DIR/defaults-unsound-62211-1.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error[E0277]: cannot add-assign `&'static str` to `T`
+  --> $DIR/defaults-unsound-62211-1.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ no implementation for `T += &'static str`
+   |
+   = help: the trait `std::ops::AddAssign<&'static str>` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::ops::AddAssign<&'static str>`
+  --> $DIR/defaults-unsound-62211-1.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
+  --> $DIR/defaults-unsound-62211-1.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/defaults-unsound-62211-1.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error: aborting due to 8 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-2.rs b/src/test/ui/associated-types/defaults-unsound-62211-2.rs
new file mode 100644
index 0000000000..aa343e759a
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-unsound-62211-2.rs
@@ -0,0 +1,63 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/62211
+//!
+//! The old implementation of defaults did not check whether the provided
+//! default actually fulfills all bounds on the assoc. type, leading to
+//! unsoundness and ICEs, the latter being demonstrated here.
+//!
+//! Note that the underlying cause of this is still not yet fixed.
+//! See: https://github.com/rust-lang/rust/issues/33017
+
+#![feature(associated_type_defaults)]
+
+use std::{
+    fmt::Display,
+    ops::{AddAssign, Deref}
+};
+
+
+trait UncheckedCopy: Sized {
+    // This Output is said to be Copy. Yet we default to Self
+    // and it's accepted, not knowing if Self ineed is Copy
+    type Output: Copy
+    //~^ ERROR the trait bound `Self: std::marker::Copy` is not satisfied
+    + Deref<Target = str>
+    //~^ ERROR the trait bound `Self: std::ops::Deref` is not satisfied
+    + AddAssign<&'static str>
+    //~^ ERROR cannot add-assign `&'static str` to `Self`
+    + From<Self>
+    + Display = Self;
+    //~^ ERROR `Self` doesn't implement `std::fmt::Display`
+
+    // We said the Output type was Copy, so we can Copy it freely!
+    fn unchecked_copy(other: &Self::Output) -> Self::Output {
+        (*other)
+    }
+
+    fn make_origin(s: Self) -> Self::Output {
+        s.into()
+    }
+}
+
+impl<T> UncheckedCopy for T {}
+//~^ ERROR `T` doesn't implement `std::fmt::Display`
+//~| ERROR the trait bound `T: std::ops::Deref` is not satisfied
+//~| ERROR cannot add-assign `&'static str` to `T`
+//~| ERROR the trait bound `T: std::marker::Copy` is not satisfied
+
+fn bug<T: UncheckedCopy>(origin: T) {
+    let origin = T::make_origin(origin);
+    let mut copy = T::unchecked_copy(&origin);
+
+    // assert we indeed have 2 strings pointing to the same buffer.
+    assert_eq!(origin.as_ptr(), copy.as_ptr());
+
+    // Drop the origin. Any use of `copy` is UB.
+    drop(origin);
+
+    copy += "This is invalid!";
+    println!("{}", copy);
+}
+
+fn main() {
+    bug(());
+}
diff --git a/src/test/ui/associated-types/defaults-unsound-62211-2.stderr b/src/test/ui/associated-types/defaults-unsound-62211-2.stderr
new file mode 100644
index 0000000000..4602fbc99f
--- /dev/null
+++ b/src/test/ui/associated-types/defaults-unsound-62211-2.stderr
@@ -0,0 +1,95 @@
+error[E0277]: the trait bound `Self: std::marker::Copy` is not satisfied
+  --> $DIR/defaults-unsound-62211-2.rs:21:18
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     type Output: Copy
+   |                  ^^^^ the trait `std::marker::Copy` is not implemented for `Self`
+
+error[E0277]: cannot add-assign `&'static str` to `Self`
+  --> $DIR/defaults-unsound-62211-2.rs:25:7
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     + AddAssign<&'static str>
+   |       ^^^^^^^^^^^^^^^^^^^^^^^ no implementation for `Self += &'static str`
+   |
+   = help: the trait `std::ops::AddAssign<&'static str>` is not implemented for `Self`
+
+error[E0277]: the trait bound `Self: std::ops::Deref` is not satisfied
+  --> $DIR/defaults-unsound-62211-2.rs:23:7
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     + Deref<Target = str>
+   |       ^^^^^^^^^^^^^^^^^^^ the trait `std::ops::Deref` is not implemented for `Self`
+
+error[E0277]: `Self` doesn't implement `std::fmt::Display`
+  --> $DIR/defaults-unsound-62211-2.rs:28:7
+   |
+LL | trait UncheckedCopy: Sized {
+   | -------------------------- required by `UncheckedCopy`
+...
+LL |     + Display = Self;
+   |       ^^^^^^^ `Self` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `Self`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+
+error[E0277]: `T` doesn't implement `std::fmt::Display`
+  --> $DIR/defaults-unsound-62211-2.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ `T` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `T`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+help: consider restricting this type parameter with `T: std::fmt::Display`
+  --> $DIR/defaults-unsound-62211-2.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error[E0277]: the trait bound `T: std::ops::Deref` is not satisfied
+  --> $DIR/defaults-unsound-62211-2.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ the trait `std::ops::Deref` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::ops::Deref`
+  --> $DIR/defaults-unsound-62211-2.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error[E0277]: cannot add-assign `&'static str` to `T`
+  --> $DIR/defaults-unsound-62211-2.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ no implementation for `T += &'static str`
+   |
+   = help: the trait `std::ops::AddAssign<&'static str>` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::ops::AddAssign<&'static str>`
+  --> $DIR/defaults-unsound-62211-2.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
+  --> $DIR/defaults-unsound-62211-2.rs:41:9
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |         ^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/defaults-unsound-62211-2.rs:41:6
+   |
+LL | impl<T> UncheckedCopy for T {}
+   |      ^
+
+error: aborting due to 8 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/issue-26681.rs b/src/test/ui/associated-types/issue-26681.rs
new file mode 100644
index 0000000000..a0a8c86d94
--- /dev/null
+++ b/src/test/ui/associated-types/issue-26681.rs
@@ -0,0 +1,20 @@
+#![feature(associated_type_defaults)]
+
+// This is a partial regression test for #26681, which used to fail to resolve
+// `Self` in the assoc. constant, and now fails with a type mismatch because
+// `Self::Fv` cannot be assumed to equal `u8` inside the trait.
+
+trait Foo {
+    type Bar;
+}
+
+impl Foo for u8 {
+    type Bar = ();
+}
+
+trait Baz {
+    type Fv: Foo = u8;
+    const C: <Self::Fv as Foo>::Bar = 6665;  //~ error: mismatched types
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/issue-26681.stderr b/src/test/ui/associated-types/issue-26681.stderr
new file mode 100644
index 0000000000..da10933df9
--- /dev/null
+++ b/src/test/ui/associated-types/issue-26681.stderr
@@ -0,0 +1,14 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-26681.rs:17:39
+   |
+LL |     const C: <Self::Fv as Foo>::Bar = 6665;
+   |                                       ^^^^ expected associated type, found integer
+   |
+   = note: expected associated type `<<Self as Baz>::Fv as Foo>::Bar`
+                         found type `{integer}`
+   = note: consider constraining the associated type `<<Self as Baz>::Fv as Foo>::Bar` to `{integer}` or calling a method that returns `<<Self as Baz>::Fv as Foo>::Bar`
+   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/associated-types/issue-32350.rs b/src/test/ui/associated-types/issue-32350.rs
new file mode 100644
index 0000000000..bda21eb0e0
--- /dev/null
+++ b/src/test/ui/associated-types/issue-32350.rs
@@ -0,0 +1,29 @@
+// check-pass
+
+// This is another instance of the "normalizations don't work" issue with
+// defaulted associated types.
+
+#![feature(associated_type_defaults)]
+
+pub trait Emitter<'a> {
+    type Ctxt: 'a;
+    type CtxtBrw: 'a = &'a Self::Ctxt;
+
+    fn get_cx(&'a self) -> Self::CtxtBrw;
+}
+
+struct MyCtxt;
+
+struct MyEmitter {
+    ctxt: MyCtxt
+}
+
+impl <'a> Emitter<'a> for MyEmitter {
+    type Ctxt = MyCtxt;
+
+    fn get_cx(&'a self) -> &'a MyCtxt {
+        &self.ctxt
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/issue-41868.rs b/src/test/ui/associated-types/issue-41868.rs
new file mode 100644
index 0000000000..52bbd1f5d2
--- /dev/null
+++ b/src/test/ui/associated-types/issue-41868.rs
@@ -0,0 +1,23 @@
+// check-pass
+
+// Defaulted assoc. types should normalize properly in impls that don't
+// override them.
+
+#![feature(associated_type_defaults)]
+
+pub struct Foo;
+
+pub trait CanDecode: Sized {
+    type Output = Self;
+    fn read(rdr: &mut Foo) -> Option<Self::Output>;
+}
+
+impl CanDecode for u8 {
+    fn read(rdr: &mut Foo) -> Option<Self::Output> { Some(42) }
+}
+
+impl CanDecode for u16 {
+    fn read(rdr: &mut Foo) -> Option<u16> { Some(17) }
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/issue-43924.rs b/src/test/ui/associated-types/issue-43924.rs
new file mode 100644
index 0000000000..26f1183c6b
--- /dev/null
+++ b/src/test/ui/associated-types/issue-43924.rs
@@ -0,0 +1,15 @@
+#![feature(associated_type_defaults)]
+
+// This used to cause an ICE because assoc. type defaults weren't properly
+// type-checked.
+
+trait Foo<T: Default + ToString> {
+    type Out: Default + ToString + ?Sized = dyn ToString;  //~ error: not satisfied
+}
+
+impl Foo<u32> for () {}  //~ error: not satisfied
+impl Foo<u64> for () {}  //~ error: not satisfied
+
+fn main() {
+    assert_eq!(<() as Foo<u32>>::Out::default().to_string(), "false");
+}
diff --git a/src/test/ui/associated-types/issue-43924.stderr b/src/test/ui/associated-types/issue-43924.stderr
new file mode 100644
index 0000000000..75a5b3f355
--- /dev/null
+++ b/src/test/ui/associated-types/issue-43924.stderr
@@ -0,0 +1,23 @@
+error[E0277]: the trait bound `(dyn std::string::ToString + 'static): std::default::Default` is not satisfied
+  --> $DIR/issue-43924.rs:7:15
+   |
+LL | trait Foo<T: Default + ToString> {
+   | -------------------------------- required by `Foo`
+LL |     type Out: Default + ToString + ?Sized = dyn ToString;
+   |               ^^^^^^^ the trait `std::default::Default` is not implemented for `(dyn std::string::ToString + 'static)`
+
+error[E0277]: the trait bound `(dyn std::string::ToString + 'static): std::default::Default` is not satisfied
+  --> $DIR/issue-43924.rs:10:6
+   |
+LL | impl Foo<u32> for () {}
+   |      ^^^^^^^^ the trait `std::default::Default` is not implemented for `(dyn std::string::ToString + 'static)`
+
+error[E0277]: the trait bound `(dyn std::string::ToString + 'static): std::default::Default` is not satisfied
+  --> $DIR/issue-43924.rs:11:6
+   |
+LL | impl Foo<u64> for () {}
+   |      ^^^^^^^^ the trait `std::default::Default` is not implemented for `(dyn std::string::ToString + 'static)`
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/issue-47385.rs b/src/test/ui/associated-types/issue-47385.rs
new file mode 100644
index 0000000000..d43d674e9c
--- /dev/null
+++ b/src/test/ui/associated-types/issue-47385.rs
@@ -0,0 +1,16 @@
+// check-pass
+
+#![feature(associated_type_defaults)]
+
+pub struct Foo;
+
+pub trait Bar: From<<Self as Bar>::Input> {
+    type Input = Self;
+}
+
+impl Bar for Foo {
+    // Will compile with explicit type:
+    // type Input = Self;
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/issue-54182-1.rs b/src/test/ui/associated-types/issue-54182-1.rs
new file mode 100644
index 0000000000..1a1e98cbac
--- /dev/null
+++ b/src/test/ui/associated-types/issue-54182-1.rs
@@ -0,0 +1,92 @@
+// run-pass
+
+// Tests that the return type of trait methods is correctly normalized when
+// checking that a method in an impl matches the trait definition when the
+// return type involves a defaulted associated type.
+// ie. the trait has a method with return type `-> Self::R`, and `type R = ()`,
+// but the impl leaves out the return type (resulting in `()`).
+// Note that specialization is not involved in this test; no items in
+// implementations may be overridden. If they were, the normalization wouldn't
+// happen.
+
+#![feature(associated_type_defaults)]
+
+macro_rules! overload {
+    ($a:expr, $b:expr) => {
+        overload::overload2($a, $b)
+    };
+    ($a:expr, $b:expr, $c:expr) => {
+        overload::overload3($a, $b, $c)
+    }
+}
+
+fn main() {
+    let () = overload!(42, true);
+
+    let r: f32 = overload!("Hello world", 13.0);
+    assert_eq!(r, 13.0);
+
+    let () = overload!(42, true, 42.5);
+
+    let r: i32 = overload!("Hello world", 13.0, 42);
+    assert_eq!(r, 42);
+}
+
+mod overload {
+    /// This trait has an assoc. type defaulting to `()`, and a required method returning a value
+    /// of that assoc. type.
+    pub trait Overload {
+        // type R;
+        type R = ();
+        fn overload(self) -> Self::R;
+    }
+
+    // overloads for 2 args
+    impl Overload for (i32, bool) {
+        // type R = ();
+
+        /// This function has no return type specified, and so defaults to `()`.
+        ///
+        /// This should work, but didn't, until RFC 2532 was implemented.
+        fn overload(self) /*-> Self::R*/ {
+            let (a, b) = self; // destructure args
+            println!("i32 and bool {:?}", (a, b));
+        }
+    }
+    impl<'a> Overload for (&'a str, f32) {
+        type R = f32;
+        fn overload(self) -> Self::R {
+            let (a, b) = self; // destructure args
+            println!("&str and f32 {:?}", (a, b));
+            b
+        }
+    }
+
+    // overloads for 3 args
+    impl Overload for (i32, bool, f32) {
+        // type R = ();
+        fn overload(self) /*-> Self::R*/ {
+            let (a, b, c) = self; // destructure args
+            println!("i32 and bool and f32 {:?}", (a, b, c));
+        }
+    }
+    impl<'a> Overload for (&'a str, f32, i32) {
+        type R = i32;
+        fn overload(self) -> Self::R {
+            let (a, b, c) = self; // destructure args
+            println!("&str and f32 and i32: {:?}", (a, b, c));
+            c
+        }
+    }
+
+    // overloads for more args
+    // ...
+
+    pub fn overload2<R, A, B>(a: A, b: B) -> R where (A, B): Overload<R = R> {
+        (a, b).overload()
+    }
+
+    pub fn overload3<R, A, B, C>(a: A, b: B, c: C) -> R where (A, B, C): Overload<R = R> {
+        (a, b, c).overload()
+    }
+}
diff --git a/src/test/ui/associated-types/issue-54182-2.rs b/src/test/ui/associated-types/issue-54182-2.rs
new file mode 100644
index 0000000000..c88c766313
--- /dev/null
+++ b/src/test/ui/associated-types/issue-54182-2.rs
@@ -0,0 +1,19 @@
+// check-pass
+
+// Before RFC 2532, normalizing a defaulted assoc. type didn't work at all,
+// unless the impl in question overrides that type, which makes the default
+// pointless.
+
+#![feature(associated_type_defaults)]
+
+trait Tr {
+    type Assoc = ();
+}
+
+impl Tr for () {}
+
+fn f(thing: <() as Tr>::Assoc) {
+    let c: () = thing;
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/issue-63593.rs b/src/test/ui/associated-types/issue-63593.rs
new file mode 100644
index 0000000000..8dbc24c067
--- /dev/null
+++ b/src/test/ui/associated-types/issue-63593.rs
@@ -0,0 +1,13 @@
+#![feature(associated_type_defaults)]
+
+// Tests that `Self` is not assumed to implement `Sized` when used as an
+// associated type default.
+
+trait Inner<S> {}
+
+trait MyTrait {
+    type This = Self;  //~ error: size for values of type `Self` cannot be known
+    fn something<I: Inner<Self::This>>(i: I);
+}
+
+fn main() {}
diff --git a/src/test/ui/associated-types/issue-63593.stderr b/src/test/ui/associated-types/issue-63593.stderr
new file mode 100644
index 0000000000..c27800f5a3
--- /dev/null
+++ b/src/test/ui/associated-types/issue-63593.stderr
@@ -0,0 +1,14 @@
+error[E0277]: the size for values of type `Self` cannot be known at compilation time
+  --> $DIR/issue-63593.rs:9:5
+   |
+LL | trait MyTrait {
+   | ------------- required by `MyTrait`
+LL |     type This = Self;
+   |     ^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `std::marker::Sized` is not implemented for `Self`
+   = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/issue-65774-1.rs b/src/test/ui/associated-types/issue-65774-1.rs
new file mode 100644
index 0000000000..0ffd6cc2cf
--- /dev/null
+++ b/src/test/ui/associated-types/issue-65774-1.rs
@@ -0,0 +1,58 @@
+#![feature(associated_type_defaults)]
+
+trait MyDisplay { fn method(&self) { } }
+
+impl<'a, T: MyDisplay> MyDisplay for &'a mut T { }
+
+struct T;
+
+trait MPU {
+    type MpuConfig: MyDisplay = T;
+    //~^ ERROR the trait bound `T: MyDisplay` is not satisfied
+}
+
+struct S;
+
+impl MPU for S { }
+//~^ ERROR the trait bound `T: MyDisplay` is not satisfied
+
+trait MyWrite {
+    fn my_write(&self, _: &dyn MyDisplay) { }
+}
+
+trait ProcessType {
+    fn process_detail_fmt(&self, _: &mut dyn MyWrite);
+}
+
+struct Process;
+
+impl ProcessType for Process {
+    fn process_detail_fmt(&self, writer: &mut dyn MyWrite)
+    {
+
+        let mut val: Option<<S as MPU>::MpuConfig> = None;
+        let valref: &mut <S as MPU>::MpuConfig = val.as_mut().unwrap();
+
+        // // This causes a different ICE (but its similar if you squint right):
+        // //
+        // // `Unimplemented` selecting `Binder(<T as MyDisplay>)` during codegen
+        //
+        // writer.my_write(valref)
+
+        // This one causes the ICE:
+        // FulfillmentError(Obligation(predicate=Binder(TraitPredicate(<T as MyDisplay>)),
+        // depth=1),Unimplemented)
+        let closure = |config: &mut <S as MPU>::MpuConfig| writer.my_write(&config);
+        closure(valref);
+    }
+}
+
+fn create() -> &'static dyn ProcessType {
+    let input: Option<&mut Process> = None;
+    let process: &mut Process = input.unwrap();
+    process
+}
+
+pub fn main() {
+    create();
+}
diff --git a/src/test/ui/associated-types/issue-65774-1.stderr b/src/test/ui/associated-types/issue-65774-1.stderr
new file mode 100644
index 0000000000..559136be70
--- /dev/null
+++ b/src/test/ui/associated-types/issue-65774-1.stderr
@@ -0,0 +1,17 @@
+error[E0277]: the trait bound `T: MyDisplay` is not satisfied
+  --> $DIR/issue-65774-1.rs:10:21
+   |
+LL | trait MPU {
+   | --------- required by `MPU`
+LL |     type MpuConfig: MyDisplay = T;
+   |                     ^^^^^^^^^ the trait `MyDisplay` is not implemented for `T`
+
+error[E0277]: the trait bound `T: MyDisplay` is not satisfied
+  --> $DIR/issue-65774-1.rs:16:6
+   |
+LL | impl MPU for S { }
+   |      ^^^ the trait `MyDisplay` is not implemented for `T`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/associated-types/issue-65774-2.rs b/src/test/ui/associated-types/issue-65774-2.rs
new file mode 100644
index 0000000000..31e203a81d
--- /dev/null
+++ b/src/test/ui/associated-types/issue-65774-2.rs
@@ -0,0 +1,58 @@
+#![feature(associated_type_defaults)]
+
+trait MyDisplay { fn method(&self) { } }
+
+impl<'a, T: MyDisplay> MyDisplay for &'a mut T { }
+
+struct T;
+
+trait MPU {
+    type MpuConfig: MyDisplay = T;
+    //~^ ERROR the trait bound `T: MyDisplay` is not satisfied
+}
+
+struct S;
+
+impl MPU for S { }
+//~^ ERROR the trait bound `T: MyDisplay` is not satisfied
+
+trait MyWrite {
+    fn my_write(&self, _: &dyn MyDisplay) { }
+}
+
+trait ProcessType {
+    fn process_detail_fmt(&self, _: &mut dyn MyWrite);
+}
+
+struct Process;
+
+impl ProcessType for Process {
+    fn process_detail_fmt(&self, writer: &mut dyn MyWrite)
+    {
+
+        let mut val: Option<<S as MPU>::MpuConfig> = None;
+        let valref: &mut <S as MPU>::MpuConfig = val.as_mut().unwrap();
+
+        // // This causes a different ICE (but its similar if you squint right):
+        // //
+        // // `Unimplemented` selecting `Binder(<T as MyDisplay>)` during codegen
+        //
+        writer.my_write(valref)
+
+        // This one causes the ICE:
+        // FulfillmentError(Obligation(predicate=Binder(TraitPredicate(<T as MyDisplay>)),
+        // depth=1),Unimplemented)
+        /*let closure = |config: &mut <S as MPU>::MpuConfig| writer.my_write(&config);
+        closure(valref);*/
+    }
+}
+
+fn create() -> &'static dyn ProcessType {
+    let input: Option<&mut Process> = None;
+    let process: &mut Process = input.unwrap();
+    process
+}
+
+pub fn main() {
+    create();
+}
diff --git a/src/test/ui/associated-types/issue-65774-2.stderr b/src/test/ui/associated-types/issue-65774-2.stderr
new file mode 100644
index 0000000000..cb51596422
--- /dev/null
+++ b/src/test/ui/associated-types/issue-65774-2.stderr
@@ -0,0 +1,17 @@
+error[E0277]: the trait bound `T: MyDisplay` is not satisfied
+  --> $DIR/issue-65774-2.rs:10:21
+   |
+LL | trait MPU {
+   | --------- required by `MPU`
+LL |     type MpuConfig: MyDisplay = T;
+   |                     ^^^^^^^^^ the trait `MyDisplay` is not implemented for `T`
+
+error[E0277]: the trait bound `T: MyDisplay` is not satisfied
+  --> $DIR/issue-65774-2.rs:16:6
+   |
+LL | impl MPU for S { }
+   |      ^^^ the trait `MyDisplay` is not implemented for `T`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/ast-json/ast-json-output.stdout b/src/test/ui/ast-json/ast-json-output.stdout
index b299fc5584..35e418696f 100644
--- a/src/test/ui/ast-json/ast-json-output.stdout
+++ b/src/test/ui/ast-json/ast-json-output.stdout
@@ -1 +1 @@
-{"module":{"inner":{"lo":0,"hi":0},"items":[{"attrs":[],"id":0,"span":{"lo":0,"hi":0},"vis":{"node":"Inherited","span":{"lo":0,"hi":0}},"ident":{"name":"core","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":{"_field0":[[{"variant":"Token","fields":[{"kind":{"variant":"Ident","fields":["extern",false]},"span":{"lo":0,"hi":0}}]},"NonJoint"],[{"variant":"Token","fields":[{"kind":{"variant":"Ident","fields":["crate",false]},"span":{"lo":0,"hi":0}}]},"NonJoint"],[{"variant":"Token","fields":[{"kind":{"variant":"Ident","fields":["core",false]},"span":{"lo":0,"hi":0}}]},"NonJoint"],[{"variant":"Token","fields":[{"kind":"Semi","span":{"lo":0,"hi":0}}]},"NonJoint"]]}}],"inline":true},"attrs":[],"span":{"lo":0,"hi":0}}
+{"module":{"inner":{"lo":0,"hi":0},"items":[{"attrs":[],"id":0,"span":{"lo":0,"hi":0},"vis":{"node":"Inherited","span":{"lo":0,"hi":0}},"ident":{"name":"core","span":{"lo":0,"hi":0}},"kind":{"variant":"ExternCrate","fields":[null]},"tokens":{"_field0":[[{"variant":"Token","fields":[{"kind":{"variant":"Ident","fields":["extern",false]},"span":{"lo":0,"hi":0}}]},"NonJoint"],[{"variant":"Token","fields":[{"kind":{"variant":"Ident","fields":["crate",false]},"span":{"lo":0,"hi":0}}]},"NonJoint"],[{"variant":"Token","fields":[{"kind":{"variant":"Ident","fields":["core",false]},"span":{"lo":0,"hi":0}}]},"NonJoint"],[{"variant":"Token","fields":[{"kind":"Semi","span":{"lo":0,"hi":0}}]},"NonJoint"]]}}],"inline":true},"attrs":[],"span":{"lo":0,"hi":0},"proc_macros":[]}
diff --git a/src/test/ui/async-await/async-fn-nonsend.rs b/src/test/ui/async-await/async-fn-nonsend.rs
index ceeebbca51..845941200f 100644
--- a/src/test/ui/async-await/async-fn-nonsend.rs
+++ b/src/test/ui/async-await/async-fn-nonsend.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // edition:2018
 // compile-flags: --crate-type lib
 
diff --git a/src/test/ui/async-await/async-fn-nonsend.stderr b/src/test/ui/async-await/async-fn-nonsend.stderr
index 105fd23ecf..3a2c42b383 100644
--- a/src/test/ui/async-await/async-fn-nonsend.stderr
+++ b/src/test/ui/async-await/async-fn-nonsend.stderr
@@ -1,5 +1,5 @@
 error: future cannot be sent between threads safely
-  --> $DIR/async-fn-nonsend.rs:50:5
+  --> $DIR/async-fn-nonsend.rs:49:5
    |
 LL | fn assert_send(_: impl Send) {}
    |    -----------         ---- required by this bound in `assert_send`
@@ -9,7 +9,7 @@ LL |     assert_send(local_dropped_before_await());
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
 note: future is not `Send` as this value is used across an await
-  --> $DIR/async-fn-nonsend.rs:25:5
+  --> $DIR/async-fn-nonsend.rs:24:5
    |
 LL |     let x = non_send();
    |         - has type `impl std::fmt::Debug`
@@ -20,7 +20,7 @@ LL | }
    | - `x` is later dropped here
 
 error: future cannot be sent between threads safely
-  --> $DIR/async-fn-nonsend.rs:52:5
+  --> $DIR/async-fn-nonsend.rs:51:5
    |
 LL | fn assert_send(_: impl Send) {}
    |    -----------         ---- required by this bound in `assert_send`
@@ -30,7 +30,7 @@ LL |     assert_send(non_send_temporary_in_match());
    |
    = help: within `impl std::future::Future`, the trait `std::marker::Send` is not implemented for `std::rc::Rc<()>`
 note: future is not `Send` as this value is used across an await
-  --> $DIR/async-fn-nonsend.rs:34:20
+  --> $DIR/async-fn-nonsend.rs:33:20
    |
 LL |     match Some(non_send()) {
    |                ---------- has type `impl std::fmt::Debug`
@@ -41,7 +41,7 @@ LL | }
    | - `non_send()` is later dropped here
 
 error: future cannot be sent between threads safely
-  --> $DIR/async-fn-nonsend.rs:54:5
+  --> $DIR/async-fn-nonsend.rs:53:5
    |
 LL | fn assert_send(_: impl Send) {}
    |    -----------         ---- required by this bound in `assert_send`
@@ -51,7 +51,7 @@ LL |     assert_send(non_sync_with_method_call());
    |
    = help: the trait `std::marker::Send` is not implemented for `dyn std::fmt::Write`
 note: future is not `Send` as this value is used across an await
-  --> $DIR/async-fn-nonsend.rs:43:9
+  --> $DIR/async-fn-nonsend.rs:42:9
    |
 LL |     let f: &mut std::fmt::Formatter = panic!();
    |         - has type `&mut std::fmt::Formatter<'_>`
diff --git a/src/test/ui/async-await/async-trait-fn.rs b/src/test/ui/async-await/async-trait-fn.rs
index 786100e916..f0403b7662 100644
--- a/src/test/ui/async-await/async-trait-fn.rs
+++ b/src/test/ui/async-await/async-trait-fn.rs
@@ -1,7 +1,7 @@
 // edition:2018
 trait T {
-    async fn foo() {} //~ ERROR trait fns cannot be declared `async`
-    async fn bar(&self) {} //~ ERROR trait fns cannot be declared `async`
+    async fn foo() {} //~ ERROR functions in traits cannot be declared `async`
+    async fn bar(&self) {} //~ ERROR functions in traits cannot be declared `async`
 }
 
 fn main() {}
diff --git a/src/test/ui/async-await/async-trait-fn.stderr b/src/test/ui/async-await/async-trait-fn.stderr
index 9acfa2cc06..6080b2815e 100644
--- a/src/test/ui/async-await/async-trait-fn.stderr
+++ b/src/test/ui/async-await/async-trait-fn.stderr
@@ -1,17 +1,21 @@
-error[E0706]: trait fns cannot be declared `async`
+error[E0706]: functions in traits cannot be declared `async`
   --> $DIR/async-trait-fn.rs:3:5
    |
 LL |     async fn foo() {}
-   |     ^^^^^^^^^^^^^^^^^
+   |     -----^^^^^^^^^^^^
+   |     |
+   |     `async` because of this
    |
    = note: `async` trait functions are not currently supported
    = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
 
-error[E0706]: trait fns cannot be declared `async`
+error[E0706]: functions in traits cannot be declared `async`
   --> $DIR/async-trait-fn.rs:4:5
    |
 LL |     async fn bar(&self) {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^
+   |     -----^^^^^^^^^^^^^^^^^
+   |     |
+   |     `async` because of this
    |
    = note: `async` trait functions are not currently supported
    = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr b/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr
index f1a22cda51..474c09d79d 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr
+++ b/src/test/ui/async-await/await-keyword/2015-edition-error-various-positions.stderr
@@ -4,7 +4,7 @@ error: `await` is a keyword in the 2018 edition
 LL |     pub mod await {
    |             ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/2015-edition-error-various-positions.rs:2:9
    |
 LL | #![deny(keyword_idents)]
diff --git a/src/test/ui/async-await/await-keyword/2015-edition-warning.stderr b/src/test/ui/async-await/await-keyword/2015-edition-warning.stderr
index d9ae1b9a16..0c558eb12f 100644
--- a/src/test/ui/async-await/await-keyword/2015-edition-warning.stderr
+++ b/src/test/ui/async-await/await-keyword/2015-edition-warning.stderr
@@ -4,7 +4,7 @@ error: `await` is a keyword in the 2018 edition
 LL |     pub mod await {
    |             ^^^^^ help: you can use a raw identifier to stay compatible: `r#await`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/2015-edition-warning.rs:4:9
    |
 LL | #![deny(keyword_idents)]
diff --git a/src/test/ui/async-await/dont-print-desugared-async.stderr b/src/test/ui/async-await/dont-print-desugared-async.stderr
index 2bf1e77f09..d80467c7fa 100644
--- a/src/test/ui/async-await/dont-print-desugared-async.stderr
+++ b/src/test/ui/async-await/dont-print-desugared-async.stderr
@@ -2,10 +2,7 @@ error[E0596]: cannot borrow data in a `&` reference as mutable
   --> $DIR/dont-print-desugared-async.rs:5:20
    |
 LL | async fn async_fn(&ref mut s: &[i32]) {}
-   |                   -^^^^^^^^^
-   |                   ||
-   |                   |cannot borrow as mutable through `&` reference
-   |                   help: consider changing this to be a mutable reference: `&mut ref mut s`
+   |                    ^^^^^^^^^ cannot borrow as mutable through `&` reference
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.rs b/src/test/ui/async-await/edition-deny-async-fns-2015.rs
index c85896150c..5d2d186137 100644
--- a/src/test/ui/async-await/edition-deny-async-fns-2015.rs
+++ b/src/test/ui/async-await/edition-deny-async-fns-2015.rs
@@ -16,7 +16,7 @@ impl Foo {
 
 trait Bar {
     async fn foo() {} //~ ERROR `async fn` is not permitted in the 2015 edition
-                      //~^ ERROR trait fns cannot be declared `async`
+                      //~^ ERROR functions in traits cannot be declared `async`
 }
 
 fn main() {
diff --git a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr b/src/test/ui/async-await/edition-deny-async-fns-2015.stderr
index bb09ee9a93..f3d982801b 100644
--- a/src/test/ui/async-await/edition-deny-async-fns-2015.stderr
+++ b/src/test/ui/async-await/edition-deny-async-fns-2015.stderr
@@ -3,60 +3,98 @@ error[E0670]: `async fn` is not permitted in the 2015 edition
    |
 LL | async fn foo() {}
    | ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:5:12
    |
 LL | fn baz() { async fn foo() {} }
    |            ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:7:1
    |
 LL | async fn async_baz() {
    | ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:8:5
    |
 LL |     async fn bar() {}
    |     ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:14:5
    |
 LL |     async fn foo() {}
    |     ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:18:5
    |
 LL |     async fn foo() {}
    |     ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:36:9
    |
 LL |         async fn bar() {}
    |         ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:26:9
    |
 LL |         async fn foo() {}
    |         ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
 error[E0670]: `async fn` is not permitted in the 2015 edition
   --> $DIR/edition-deny-async-fns-2015.rs:31:13
    |
 LL |             async fn bar() {}
    |             ^^^^^
+   |
+   = note: to use `async fn`, switch to Rust 2018
+   = help: set `edition = "2018"` in `Cargo.toml`
+   = note: for more on editions, read https://doc.rust-lang.org/edition-guide
 
-error[E0706]: trait fns cannot be declared `async`
+error[E0706]: functions in traits cannot be declared `async`
   --> $DIR/edition-deny-async-fns-2015.rs:18:5
    |
 LL |     async fn foo() {}
-   |     ^^^^^^^^^^^^^^^^^
+   |     -----^^^^^^^^^^^^
+   |     |
+   |     `async` because of this
    |
    = note: `async` trait functions are not currently supported
    = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
diff --git a/src/test/ui/async-await/feature-async-closure.stderr b/src/test/ui/async-await/feature-async-closure.stderr
index c3a8c92149..ba851ba7d2 100644
--- a/src/test/ui/async-await/feature-async-closure.stderr
+++ b/src/test/ui/async-await/feature-async-closure.stderr
@@ -4,7 +4,7 @@ error[E0658]: async closures are unstable
 LL |     let _ = async || {};
    |             ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/62290
+   = note: see issue #62290 <https://github.com/rust-lang/rust/issues/62290> for more information
    = help: add `#![feature(async_closure)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/async-await/issue-54239-private-type-triggers-lint.rs b/src/test/ui/async-await/issue-54239-private-type-triggers-lint.rs
new file mode 100644
index 0000000000..16cf7ad52e
--- /dev/null
+++ b/src/test/ui/async-await/issue-54239-private-type-triggers-lint.rs
@@ -0,0 +1,17 @@
+// Regression test for #54239, shouldn't trigger lint.
+// check-pass
+// edition:2018
+
+#![deny(missing_debug_implementations)]
+
+struct DontLookAtMe(i32);
+
+async fn secret() -> DontLookAtMe {
+    DontLookAtMe(41)
+}
+
+pub async fn looking() -> i32 { // Shouldn't trigger lint here.
+    secret().await.0
+}
+
+fn main() {}
diff --git a/src/test/ui/async-await/issues/issue-62097.nll.stderr b/src/test/ui/async-await/issues/issue-62097.nll.stderr
index 0c64f90cb9..f72c645bf8 100644
--- a/src/test/ui/async-await/issues/issue-62097.nll.stderr
+++ b/src/test/ui/async-await/issues/issue-62097.nll.stderr
@@ -16,13 +16,13 @@ help: to force the closure to take ownership of `self` (and any other referenced
 LL |         foo(move || self.bar()).await;
    |             ^^^^^^^
 
-error[E0521]: borrowed data escapes outside of function
+error[E0521]: borrowed data escapes outside of method
   --> $DIR/issue-62097.rs:13:9
    |
 LL |     pub async fn run_dummy_fn(&self) {
-   |                               ----- `self` is a reference that is only valid in the function body
+   |                               ----- `self` is a reference that is only valid in the method body
 LL |         foo(|| self.bar()).await;
-   |         ^^^^^^^^^^^^^^^^^^ `self` escapes the function body here
+   |         ^^^^^^^^^^^^^^^^^^ `self` escapes the method body here
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/async-await/issues/issue-63388-1.nll.stderr b/src/test/ui/async-await/issues/issue-63388-1.nll.stderr
index 4ae3971e90..696f79ec40 100644
--- a/src/test/ui/async-await/issues/issue-63388-1.nll.stderr
+++ b/src/test/ui/async-await/issues/issue-63388-1.nll.stderr
@@ -1,11 +1,3 @@
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/issue-63388-1.rs:12:10
-   |
-LL |     ) -> &dyn Foo
-   |          ^^^^^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#22r
-
 error: lifetime may not live long enough
   --> $DIR/issue-63388-1.rs:13:5
    |
@@ -17,8 +9,7 @@ LL |       ) -> &dyn Foo
 LL | /     {
 LL | |         foo
 LL | |     }
-   | |_____^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
+   | |_____^ method was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/async-await/issues/issue-63388-2.nll.stderr b/src/test/ui/async-await/issues/issue-63388-2.nll.stderr
index 7781af89de..6edb9e63d4 100644
--- a/src/test/ui/async-await/issues/issue-63388-2.nll.stderr
+++ b/src/test/ui/async-await/issues/issue-63388-2.nll.stderr
@@ -1,6 +1,8 @@
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-63388-2.rs:12:10
    |
+LL |         foo: &dyn Foo, bar: &'a dyn Foo
+   |              --------       -----------
 LL |     ) -> &dyn Foo
    |          ^ help: consider using the named lifetime: `&'a`
    |
diff --git a/src/test/ui/async-await/issues/issue-63388-2.stderr b/src/test/ui/async-await/issues/issue-63388-2.stderr
index 7e45d588c6..9f51ced9c3 100644
--- a/src/test/ui/async-await/issues/issue-63388-2.stderr
+++ b/src/test/ui/async-await/issues/issue-63388-2.stderr
@@ -1,6 +1,8 @@
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-63388-2.rs:12:10
    |
+LL |         foo: &dyn Foo, bar: &'a dyn Foo
+   |              --------       -----------
 LL |     ) -> &dyn Foo
    |          ^ help: consider using the named lifetime: `&'a`
    |
diff --git a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs b/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
index 23e3483e01..9fc5667d68 100644
--- a/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
+++ b/src/test/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs
@@ -19,7 +19,7 @@ fn main() {
     let mut g = || {
         yield;
     };
-    Pin::new(&mut g).resume(); // Yields once.
-    Pin::new(&mut g).resume(); // Completes here.
-    Pin::new(&mut g).resume(); // Panics here.
+    Pin::new(&mut g).resume(()); // Yields once.
+    Pin::new(&mut g).resume(()); // Completes here.
+    Pin::new(&mut g).resume(()); // Panics here.
 }
diff --git a/src/test/ui/async-await/no-async-const.rs b/src/test/ui/async-await/no-async-const.rs
index 44f02d1a7b..963460c118 100644
--- a/src/test/ui/async-await/no-async-const.rs
+++ b/src/test/ui/async-await/no-async-const.rs
@@ -1,6 +1,5 @@
-// compile-fail
 // edition:2018
 // compile-flags: --crate-type lib
 
 pub async const fn x() {}
-//~^ ERROR expected one of `fn` or `unsafe`, found keyword `const`
+//~^ ERROR expected one of `extern`, `fn`, or `unsafe`, found keyword `const`
diff --git a/src/test/ui/async-await/no-async-const.stderr b/src/test/ui/async-await/no-async-const.stderr
index 05cdbff0bf..e324a77187 100644
--- a/src/test/ui/async-await/no-async-const.stderr
+++ b/src/test/ui/async-await/no-async-const.stderr
@@ -1,8 +1,8 @@
-error: expected one of `fn` or `unsafe`, found keyword `const`
-  --> $DIR/no-async-const.rs:5:11
+error: expected one of `extern`, `fn`, or `unsafe`, found keyword `const`
+  --> $DIR/no-async-const.rs:4:11
    |
 LL | pub async const fn x() {}
-   |           ^^^^^ expected one of `fn` or `unsafe`
+   |           ^^^^^ expected one of `extern`, `fn`, or `unsafe`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/async-await/no-const-async.rs b/src/test/ui/async-await/no-const-async.rs
index ef7edf8504..57a9f175ca 100644
--- a/src/test/ui/async-await/no-const-async.rs
+++ b/src/test/ui/async-await/no-const-async.rs
@@ -1,7 +1,6 @@
-// compile-fail
 // edition:2018
 // compile-flags: --crate-type lib
 
 pub const async fn x() {}
-//~^ ERROR expected identifier, found keyword `async`
-//~^^ expected `:`, found keyword `fn`
+//~^ ERROR functions cannot be both `const` and `async`
+//~| ERROR `impl Trait` in const fn is unstable
diff --git a/src/test/ui/async-await/no-const-async.stderr b/src/test/ui/async-await/no-const-async.stderr
index 7ed822a5cd..07559cd240 100644
--- a/src/test/ui/async-await/no-const-async.stderr
+++ b/src/test/ui/async-await/no-const-async.stderr
@@ -1,14 +1,21 @@
-error: expected identifier, found keyword `async`
-  --> $DIR/no-const-async.rs:5:11
+error: functions cannot be both `const` and `async`
+  --> $DIR/no-const-async.rs:4:1
    |
 LL | pub const async fn x() {}
-   |           ^^^^^ expected identifier, found keyword
+   | ^^^^-----^-----^^^^^^^^^^
+   |     |     |
+   |     |     `async` because of this
+   |     `const` because of this
 
-error: expected `:`, found keyword `fn`
-  --> $DIR/no-const-async.rs:5:17
+error[E0723]: `impl Trait` in const fn is unstable
+  --> $DIR/no-const-async.rs:4:24
    |
 LL | pub const async fn x() {}
-   |                 ^^ expected `:`
+   |                        ^
+   |
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
+   = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0723`.
diff --git a/src/test/ui/async-await/no-move-across-await-struct.rs b/src/test/ui/async-await/no-move-across-await-struct.rs
index bef477bd25..51c9a42b3f 100644
--- a/src/test/ui/async-await/no-move-across-await-struct.rs
+++ b/src/test/ui/async-await/no-move-across-await-struct.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // edition:2018
 // compile-flags: --crate-type lib
 
diff --git a/src/test/ui/async-await/no-move-across-await-struct.stderr b/src/test/ui/async-await/no-move-across-await-struct.stderr
index 88f147b8d9..adfae09925 100644
--- a/src/test/ui/async-await/no-move-across-await-struct.stderr
+++ b/src/test/ui/async-await/no-move-across-await-struct.stderr
@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `s.x`
-  --> $DIR/no-move-across-await-struct.rs:8:5
+  --> $DIR/no-move-across-await-struct.rs:7:5
    |
 LL |     needs_vec(s.x).await;
    |               --- value moved here
diff --git a/src/test/ui/async-await/no-move-across-await-tuple.rs b/src/test/ui/async-await/no-move-across-await-tuple.rs
index 565cbd7d5f..a656332698 100644
--- a/src/test/ui/async-await/no-move-across-await-tuple.rs
+++ b/src/test/ui/async-await/no-move-across-await-tuple.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // edition:2018
 // compile-flags: --crate-type lib
 
diff --git a/src/test/ui/async-await/no-move-across-await-tuple.stderr b/src/test/ui/async-await/no-move-across-await-tuple.stderr
index fe98ecd599..a60fd9361a 100644
--- a/src/test/ui/async-await/no-move-across-await-tuple.stderr
+++ b/src/test/ui/async-await/no-move-across-await-tuple.stderr
@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `x.1`
-  --> $DIR/no-move-across-await-tuple.rs:9:5
+  --> $DIR/no-move-across-await-tuple.rs:8:5
    |
 LL |     drop(x.1);
    |          --- value moved here
diff --git a/src/test/ui/async-await/no-non-guaranteed-initialization.rs b/src/test/ui/async-await/no-non-guaranteed-initialization.rs
index 6a34209d55..24070fe330 100644
--- a/src/test/ui/async-await/no-non-guaranteed-initialization.rs
+++ b/src/test/ui/async-await/no-non-guaranteed-initialization.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // edition:2018
 // compile-flags: --crate-type lib
 
diff --git a/src/test/ui/async-await/no-non-guaranteed-initialization.stderr b/src/test/ui/async-await/no-non-guaranteed-initialization.stderr
index b9aa9924bb..f5991f4bcc 100644
--- a/src/test/ui/async-await/no-non-guaranteed-initialization.stderr
+++ b/src/test/ui/async-await/no-non-guaranteed-initialization.stderr
@@ -1,5 +1,5 @@
 error[E0381]: use of possibly-uninitialized variable: `y`
-  --> $DIR/no-non-guaranteed-initialization.rs:10:5
+  --> $DIR/no-non-guaranteed-initialization.rs:9:5
    |
 LL |     y
    |     ^ use of possibly-uninitialized `y`
diff --git a/src/test/ui/async-await/no-unsafe-async.rs b/src/test/ui/async-await/no-unsafe-async.rs
index 1ac1bdffda..f40154e16f 100644
--- a/src/test/ui/async-await/no-unsafe-async.rs
+++ b/src/test/ui/async-await/no-unsafe-async.rs
@@ -8,4 +8,4 @@ impl S {
 }
 
 #[cfg(FALSE)]
-unsafe async fn f() {} //~ ERROR expected one of `extern`, `fn`, or `{`, found keyword `async`
+unsafe async fn f() {} //~ ERROR expected one of `extern` or `fn`, found keyword `async`
diff --git a/src/test/ui/async-await/no-unsafe-async.stderr b/src/test/ui/async-await/no-unsafe-async.stderr
index bbeb342784..c97b4ff0f4 100644
--- a/src/test/ui/async-await/no-unsafe-async.stderr
+++ b/src/test/ui/async-await/no-unsafe-async.stderr
@@ -1,14 +1,19 @@
 error: expected one of `extern` or `fn`, found keyword `async`
   --> $DIR/no-unsafe-async.rs:7:12
    |
+LL | impl S {
+   |        - while parsing this item list starting here
+LL |     #[cfg(FALSE)]
 LL |     unsafe async fn g() {}
    |            ^^^^^ expected one of `extern` or `fn`
+LL | }
+   | - the item list ends here
 
-error: expected one of `extern`, `fn`, or `{`, found keyword `async`
+error: expected one of `extern` or `fn`, found keyword `async`
   --> $DIR/no-unsafe-async.rs:11:8
    |
 LL | unsafe async fn f() {}
-   |        ^^^^^ expected one of `extern`, `fn`, or `{`
+   |        ^^^^^ expected one of `extern` or `fn`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/async-await/unreachable-lint-1.stderr b/src/test/ui/async-await/unreachable-lint-1.stderr
index 382581bf94..e932578896 100644
--- a/src/test/ui/async-await/unreachable-lint-1.stderr
+++ b/src/test/ui/async-await/unreachable-lint-1.stderr
@@ -6,7 +6,7 @@ LL |     return; bar().await;
    |     |
    |     any code following this expression is unreachable
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-lint-1.rs:2:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/async-await/unused-lifetime.stderr b/src/test/ui/async-await/unused-lifetime.stderr
index 885cdc04cf..2a7a12a364 100644
--- a/src/test/ui/async-await/unused-lifetime.stderr
+++ b/src/test/ui/async-await/unused-lifetime.stderr
@@ -4,7 +4,7 @@ error: lifetime parameter `'a` never used
 LL | pub async fn func_with_unused_lifetime<'a>(s: &'a str) {
    |                                        ^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-lifetime.rs:7:9
    |
 LL | #![deny(unused_lifetimes)]
diff --git a/src/test/ui/attributes/register-attr-tool-import.rs b/src/test/ui/attributes/register-attr-tool-import.rs
index e01dc4dfa4..d3502c71f2 100644
--- a/src/test/ui/attributes/register-attr-tool-import.rs
+++ b/src/test/ui/attributes/register-attr-tool-import.rs
@@ -1,4 +1,6 @@
 // edition:2018
+// compile-flags: -Zsave-analysis
+// ~^ Also regression test for #69588
 
 #![feature(register_attr)]
 #![feature(register_tool)]
diff --git a/src/test/ui/attributes/register-attr-tool-import.stderr b/src/test/ui/attributes/register-attr-tool-import.stderr
index 59f5a8620a..90b7e169a2 100644
--- a/src/test/ui/attributes/register-attr-tool-import.stderr
+++ b/src/test/ui/attributes/register-attr-tool-import.stderr
@@ -1,35 +1,35 @@
 error: cannot use an explicitly registered attribute through an import
-  --> $DIR/register-attr-tool-import.rs:12:3
+  --> $DIR/register-attr-tool-import.rs:14:3
    |
 LL | #[renamed_attr]
    |   ^^^^^^^^^^^^
    |
 note: the explicitly registered attribute imported here
-  --> $DIR/register-attr-tool-import.rs:9:5
+  --> $DIR/register-attr-tool-import.rs:11:5
    |
 LL | use attr as renamed_attr; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: cannot use a tool module through an import
-  --> $DIR/register-attr-tool-import.rs:13:3
+  --> $DIR/register-attr-tool-import.rs:15:3
    |
 LL | #[renamed_tool::attr]
    |   ^^^^^^^^^^^^
    |
 note: the tool module imported here
-  --> $DIR/register-attr-tool-import.rs:10:5
+  --> $DIR/register-attr-tool-import.rs:12:5
    |
 LL | use tool as renamed_tool; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
 
 error: cannot use a tool module through an import
-  --> $DIR/register-attr-tool-import.rs:13:3
+  --> $DIR/register-attr-tool-import.rs:15:3
    |
 LL | #[renamed_tool::attr]
    |   ^^^^^^^^^^^^
    |
 note: the tool module imported here
-  --> $DIR/register-attr-tool-import.rs:10:5
+  --> $DIR/register-attr-tool-import.rs:12:5
    |
 LL | use tool as renamed_tool; // OK
    |     ^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/attributes/register-attr-tool-unused.stderr b/src/test/ui/attributes/register-attr-tool-unused.stderr
index 0756c572c3..85a4fa4a74 100644
--- a/src/test/ui/attributes/register-attr-tool-unused.stderr
+++ b/src/test/ui/attributes/register-attr-tool-unused.stderr
@@ -4,7 +4,7 @@ error: unused attribute
 LL | #[register_attr(attr)]
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/register-attr-tool-unused.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/auto-ref-slice-plus-ref.stderr b/src/test/ui/auto-ref-slice-plus-ref.stderr
index a0739a7a90..50ca5cad4b 100644
--- a/src/test/ui/auto-ref-slice-plus-ref.stderr
+++ b/src/test/ui/auto-ref-slice-plus-ref.stderr
@@ -5,8 +5,11 @@ LL |     a.test_mut();
    |       ^^^^^^^^ help: there is a method with a similar name: `get_mut`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `test_mut`, perhaps you need to implement it:
-           candidate #1: `MyIter`
+note: `MyIter` defines an item `test_mut`, perhaps you need to implement it
+  --> $DIR/auto-ref-slice-plus-ref.rs:14:1
+   |
+LL | trait MyIter {
+   | ^^^^^^^^^^^^
 
 error[E0599]: no method named `test` found for struct `std::vec::Vec<{integer}>` in the current scope
   --> $DIR/auto-ref-slice-plus-ref.rs:8:7
@@ -15,8 +18,11 @@ LL |     a.test();
    |       ^^^^ method not found in `std::vec::Vec<{integer}>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `test`, perhaps you need to implement it:
-           candidate #1: `MyIter`
+note: `MyIter` defines an item `test`, perhaps you need to implement it
+  --> $DIR/auto-ref-slice-plus-ref.rs:14:1
+   |
+LL | trait MyIter {
+   | ^^^^^^^^^^^^
 
 error[E0599]: no method named `test` found for array `[{integer}; 1]` in the current scope
   --> $DIR/auto-ref-slice-plus-ref.rs:10:11
@@ -25,8 +31,11 @@ LL |     ([1]).test();
    |           ^^^^ method not found in `[{integer}; 1]`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `test`, perhaps you need to implement it:
-           candidate #1: `MyIter`
+note: `MyIter` defines an item `test`, perhaps you need to implement it
+  --> $DIR/auto-ref-slice-plus-ref.rs:14:1
+   |
+LL | trait MyIter {
+   | ^^^^^^^^^^^^
 
 error[E0599]: no method named `test` found for reference `&[{integer}; 1]` in the current scope
   --> $DIR/auto-ref-slice-plus-ref.rs:11:12
@@ -35,8 +44,11 @@ LL |     (&[1]).test();
    |            ^^^^ method not found in `&[{integer}; 1]`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `test`, perhaps you need to implement it:
-           candidate #1: `MyIter`
+note: `MyIter` defines an item `test`, perhaps you need to implement it
+  --> $DIR/auto-ref-slice-plus-ref.rs:14:1
+   |
+LL | trait MyIter {
+   | ^^^^^^^^^^^^
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/autoderef-full-lval.stderr b/src/test/ui/autoderef-full-lval.stderr
index e2870ef806..f094388794 100644
--- a/src/test/ui/autoderef-full-lval.stderr
+++ b/src/test/ui/autoderef-full-lval.stderr
@@ -5,8 +5,6 @@ LL |     let z: isize = a.x + b.y;
    |                    --- ^ --- std::boxed::Box<isize>
    |                    |
    |                    std::boxed::Box<isize>
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `std::boxed::Box<isize>`
 
 error[E0369]: cannot add `std::boxed::Box<isize>` to `std::boxed::Box<isize>`
   --> $DIR/autoderef-full-lval.rs:21:33
@@ -15,8 +13,6 @@ LL |     let answer: isize = forty.a + two.a;
    |                         ------- ^ ----- std::boxed::Box<isize>
    |                         |
    |                         std::boxed::Box<isize>
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `std::boxed::Box<isize>`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/bad/bad-lint-cap2.stderr b/src/test/ui/bad/bad-lint-cap2.stderr
index 75e257893f..3f3affe5a9 100644
--- a/src/test/ui/bad/bad-lint-cap2.stderr
+++ b/src/test/ui/bad/bad-lint-cap2.stderr
@@ -4,7 +4,7 @@ error: unused import: `std::option`
 LL | use std::option;
    |     ^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/bad-lint-cap2.rs:4:9
    |
 LL | #![deny(warnings)]
diff --git a/src/test/ui/bad/bad-lint-cap3.stderr b/src/test/ui/bad/bad-lint-cap3.stderr
index 96b40c98c0..a4e399b1fa 100644
--- a/src/test/ui/bad/bad-lint-cap3.stderr
+++ b/src/test/ui/bad/bad-lint-cap3.stderr
@@ -4,7 +4,7 @@ warning: unused import: `std::option`
 LL | use std::option;
    |     ^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/bad-lint-cap3.rs:5:9
    |
 LL | #![deny(warnings)]
diff --git a/src/test/ui/bad/bad-method-typaram-kind.stderr b/src/test/ui/bad/bad-method-typaram-kind.stderr
index 740667f146..9732363221 100644
--- a/src/test/ui/bad/bad-method-typaram-kind.stderr
+++ b/src/test/ui/bad/bad-method-typaram-kind.stderr
@@ -1,12 +1,15 @@
 error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/bad-method-typaram-kind.rs:2:7
    |
-LL | fn foo<T:'static>() {
-   |        -- help: consider further restricting this bound: `T: std::marker::Send +`
 LL |     1.bar::<T>();
    |       ^^^ `T` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/bad-method-typaram-kind.rs:1:10
+   |
+LL | fn foo<T:'static>() {
+   |          ^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs
deleted file mode 100644
index 238f2d958c..0000000000
--- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-struct X { x: (), }
-
-impl Drop for X {
-    fn drop(&mut self) {
-        println!("destructor runs");
-    }
-}
-
-fn main() {
-    let x = Some((X { x: () }, X { x: () }));
-    match x {
-        Some((ref _y, _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => panic!()
-    }
-}
diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr
deleted file mode 100644
index ff00aa8caa..0000000000
--- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-2.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-2.rs:12:23
-   |
-LL |         Some((ref _y, _z)) => { },
-   |               ------  ^^ by-move pattern here
-   |               |
-   |               by-ref pattern here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs
deleted file mode 100644
index e8357e9178..0000000000
--- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-struct X { x: (), }
-
-impl Drop for X {
-    fn drop(&mut self) {
-        println!("destructor runs");
-    }
-}
-
-enum DoubleOption<T,U> { Some2(T,U), None2 }
-
-fn main() {
-    let x = DoubleOption::Some2(X { x: () }, X { x: () });
-    match x {
-        DoubleOption::Some2(ref _y, _z) => { },
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern
-        DoubleOption::None2 => panic!()
-    }
-}
diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr
deleted file mode 100644
index 3e8358da35..0000000000
--- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-3.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-3.rs:14:37
-   |
-LL |         DoubleOption::Some2(ref _y, _z) => { },
-   |                             ------  ^^ by-move pattern here
-   |                             |
-   |                             by-ref pattern here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs
deleted file mode 100644
index 41dafd2b5b..0000000000
--- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-struct X { x: (), }
-
-impl Drop for X {
-    fn drop(&mut self) {
-        println!("destructor runs");
-    }
-}
-
-fn main() {
-    let x = Some((X { x: () }, X { x: () }));
-    match x {
-        Some((_y, ref _z)) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => panic!()
-    }
-}
diff --git a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr b/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr
deleted file mode 100644
index 00e0c70d64..0000000000
--- a/src/test/ui/bind-by-move/bind-by-move-neither-can-live-while-the-other-survives-4.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-4.rs:12:15
-   |
-LL |         Some((_y, ref _z)) => { },
-   |               ^^  ------ by-ref pattern here
-   |               |
-   |               by-move pattern here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/binop/binop-bitxor-str.stderr b/src/test/ui/binop/binop-bitxor-str.stderr
index 9a0d301d86..18c1ce0ff0 100644
--- a/src/test/ui/binop/binop-bitxor-str.stderr
+++ b/src/test/ui/binop/binop-bitxor-str.stderr
@@ -5,8 +5,6 @@ LL | fn main() { let x = "a".to_string() ^ "b".to_string(); }
    |                     --------------- ^ --------------- std::string::String
    |                     |
    |                     std::string::String
-   |
-   = note: an implementation of `std::ops::BitXor` might be missing for `std::string::String`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/binop/binop-consume-args.stderr b/src/test/ui/binop/binop-consume-args.stderr
index 876e984ecb..3fe7c9cbff 100644
--- a/src/test/ui/binop/binop-consume-args.stderr
+++ b/src/test/ui/binop/binop-consume-args.stderr
@@ -2,251 +2,331 @@ error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:7:10
    |
 LL | fn add<A: Add<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs + rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:5:11
+   |
+LL | fn add<A: Add<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:8:10
    |
 LL | fn add<A: Add<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs + rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:5:30
+   |
+LL | fn add<A: Add<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:13:10
    |
 LL | fn sub<A: Sub<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs - rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:11:11
+   |
+LL | fn sub<A: Sub<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:14:10
    |
 LL | fn sub<A: Sub<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs - rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:11:30
+   |
+LL | fn sub<A: Sub<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:19:10
    |
 LL | fn mul<A: Mul<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs * rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:17:11
+   |
+LL | fn mul<A: Mul<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:20:10
    |
 LL | fn mul<A: Mul<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs * rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:17:30
+   |
+LL | fn mul<A: Mul<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:25:10
    |
 LL | fn div<A: Div<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs / rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:23:11
+   |
+LL | fn div<A: Div<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:26:10
    |
 LL | fn div<A: Div<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs / rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:23:30
+   |
+LL | fn div<A: Div<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:31:10
    |
 LL | fn rem<A: Rem<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs % rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:29:11
+   |
+LL | fn rem<A: Rem<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:32:10
    |
 LL | fn rem<A: Rem<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs % rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:29:30
+   |
+LL | fn rem<A: Rem<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:37:10
    |
 LL | fn bitand<A: BitAnd<B, Output=()>, B>(lhs: A, rhs: B) {
-   |           --                          --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |           |
-   |           help: consider further restricting this bound: `A: Copy +`
+   |                                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs & rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:35:14
+   |
+LL | fn bitand<A: BitAnd<B, Output=()>, B>(lhs: A, rhs: B) {
+   |              ^^^^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:38:10
    |
 LL | fn bitand<A: BitAnd<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                                    -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                                    |
-   |                                    help: consider restricting this bound: `B: Copy`
+   |                                               --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs & rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:35:36
+   |
+LL | fn bitand<A: BitAnd<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                                    ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:43:10
    |
 LL | fn bitor<A: BitOr<B, Output=()>, B>(lhs: A, rhs: B) {
-   |          --                         --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |          |
-   |          help: consider further restricting this bound: `A: Copy +`
+   |                                     --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs | rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:41:13
+   |
+LL | fn bitor<A: BitOr<B, Output=()>, B>(lhs: A, rhs: B) {
+   |             ^^^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:44:10
    |
 LL | fn bitor<A: BitOr<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                                  -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                                  |
-   |                                  help: consider restricting this bound: `B: Copy`
+   |                                             --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs | rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:41:34
+   |
+LL | fn bitor<A: BitOr<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                                  ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:49:10
    |
 LL | fn bitxor<A: BitXor<B, Output=()>, B>(lhs: A, rhs: B) {
-   |           --                          --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |           |
-   |           help: consider further restricting this bound: `A: Copy +`
+   |                                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs ^ rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:47:14
+   |
+LL | fn bitxor<A: BitXor<B, Output=()>, B>(lhs: A, rhs: B) {
+   |              ^^^^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:50:10
    |
 LL | fn bitxor<A: BitXor<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                                    -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                                    |
-   |                                    help: consider restricting this bound: `B: Copy`
+   |                                               --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs ^ rhs;
    |           --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:47:36
+   |
+LL | fn bitxor<A: BitXor<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                                    ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:55:10
    |
 LL | fn shl<A: Shl<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs << rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:53:11
+   |
+LL | fn shl<A: Shl<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:56:10
    |
 LL | fn shl<A: Shl<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs << rhs;
    |            --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:53:30
+   |
+LL | fn shl<A: Shl<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error[E0382]: use of moved value: `lhs`
   --> $DIR/binop-consume-args.rs:61:10
    |
 LL | fn shr<A: Shr<B, Output=()>, B>(lhs: A, rhs: B) {
-   |        --                       --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `A: Copy +`
+   |                                 --- move occurs because `lhs` has type `A`, which does not implement the `Copy` trait
 LL |     lhs >> rhs;
    |     --- value moved here
 LL |     drop(lhs);
    |          ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-consume-args.rs:59:11
+   |
+LL | fn shr<A: Shr<B, Output=()>, B>(lhs: A, rhs: B) {
+   |           ^^^^^^^^^^^^^^^^^
 
 error[E0382]: use of moved value: `rhs`
   --> $DIR/binop-consume-args.rs:62:10
    |
 LL | fn shr<A: Shr<B, Output=()>, B>(lhs: A, rhs: B) {
-   |                              -          --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
-   |                              |
-   |                              help: consider restricting this bound: `B: Copy`
+   |                                         --- move occurs because `rhs` has type `B`, which does not implement the `Copy` trait
 LL |     lhs >> rhs;
    |            --- value moved here
 LL |     drop(lhs);
 LL |     drop(rhs);
    |          ^^^ value used here after move
+   |
+help: consider restricting this type parameter with `B: Copy`
+  --> $DIR/binop-consume-args.rs:59:30
+   |
+LL | fn shr<A: Shr<B, Output=()>, B>(lhs: A, rhs: B) {
+   |                              ^
 
 error: aborting due to 20 previous errors
 
diff --git a/src/test/ui/binop/binop-move-semantics.stderr b/src/test/ui/binop/binop-move-semantics.stderr
index 7552dc6697..31b594eeab 100644
--- a/src/test/ui/binop/binop-move-semantics.stderr
+++ b/src/test/ui/binop/binop-move-semantics.stderr
@@ -2,27 +2,35 @@ error[E0382]: use of moved value: `x`
   --> $DIR/binop-move-semantics.rs:8:5
    |
 LL | fn double_move<T: Add<Output=()>>(x: T) {
-   |                --                 - move occurs because `x` has type `T`, which does not implement the `Copy` trait
-   |                |
-   |                help: consider further restricting this bound: `T: Copy +`
+   |                                   - move occurs because `x` has type `T`, which does not implement the `Copy` trait
 LL |     x
    |     - value moved here
 LL |     +
 LL |     x;
    |     ^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-move-semantics.rs:5:19
+   |
+LL | fn double_move<T: Add<Output=()>>(x: T) {
+   |                   ^^^^^^^^^^^^^^
 
 error[E0382]: borrow of moved value: `x`
   --> $DIR/binop-move-semantics.rs:14:5
    |
 LL | fn move_then_borrow<T: Add<Output=()> + Clone>(x: T) {
-   |                     --                         - move occurs because `x` has type `T`, which does not implement the `Copy` trait
-   |                     |
-   |                     help: consider further restricting this bound: `T: Copy +`
+   |                                                - move occurs because `x` has type `T`, which does not implement the `Copy` trait
 LL |     x
    |     - value moved here
 LL |     +
 LL |     x.clone();
    |     ^ value borrowed here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/binop-move-semantics.rs:11:24
+   |
+LL | fn move_then_borrow<T: Add<Output=()> + Clone>(x: T) {
+   |                        ^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0505]: cannot move out of `x` because it is borrowed
   --> $DIR/binop-move-semantics.rs:21:5
diff --git a/src/test/ui/binop/binop-mul-bool.stderr b/src/test/ui/binop/binop-mul-bool.stderr
index ade2202558..859c44a859 100644
--- a/src/test/ui/binop/binop-mul-bool.stderr
+++ b/src/test/ui/binop/binop-mul-bool.stderr
@@ -5,8 +5,6 @@ LL | fn main() { let x = true * false; }
    |                     ---- ^ ----- bool
    |                     |
    |                     bool
-   |
-   = note: an implementation of `std::ops::Mul` might be missing for `bool`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/binop/binop-typeck.stderr b/src/test/ui/binop/binop-typeck.stderr
index ebf82079ef..42d9108199 100644
--- a/src/test/ui/binop/binop-typeck.stderr
+++ b/src/test/ui/binop/binop-typeck.stderr
@@ -5,8 +5,6 @@ LL |     let z = x + y;
    |             - ^ - {integer}
    |             |
    |             bool
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `bool`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/blind/blind-item-block-middle.stderr b/src/test/ui/blind/blind-item-block-middle.stderr
index 264e7fc8e7..d8d15615d7 100644
--- a/src/test/ui/blind/blind-item-block-middle.stderr
+++ b/src/test/ui/blind/blind-item-block-middle.stderr
@@ -1,8 +1,15 @@
 error[E0308]: mismatched types
   --> $DIR/blind-item-block-middle.rs:6:9
    |
+LL | mod foo { pub struct bar; }
+   |           --------------- unit struct defined here
+...
 LL |     let bar = 5;
-   |         ^^^ expected integer, found struct `foo::bar`
+   |         ^^^
+   |         |
+   |         expected integer, found struct `foo::bar`
+   |         `bar` is interpreted as a unit struct, not a new binding
+   |         help: introduce a new binding instead: `other_bar`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/block-expr-precedence.stderr b/src/test/ui/block-expr-precedence.stderr
index 1307b5d6dd..decee1f2f1 100644
--- a/src/test/ui/block-expr-precedence.stderr
+++ b/src/test/ui/block-expr-precedence.stderr
@@ -4,5 +4,5 @@ warning: unnecessary trailing semicolons
 LL |   if (true) { 12; };;; -num;
    |                     ^^ help: remove these semicolons
    |
-   = note: `#[warn(redundant_semicolon)]` on by default
+   = note: `#[warn(redundant_semicolons)]` on by default
 
diff --git a/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs b/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs
new file mode 100644
index 0000000000..b67d494866
--- /dev/null
+++ b/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs
@@ -0,0 +1,224 @@
+// Tests using a combination of pattern features has the expected borrow checking behavior
+#![feature(bindings_after_at)]
+#![feature(or_patterns)]
+#![feature(box_patterns)]
+
+#![feature(move_ref_pattern)]
+
+enum Test {
+    Foo,
+    Bar,
+    _Baz,
+}
+
+// bindings_after_at + slice_patterns
+
+fn bindings_after_at_slice_patterns_move_binding(x: [String; 4]) {
+    match x {
+        a @ [.., _] => (),
+        _ => (),
+    };
+
+    &x;
+    //~^ ERROR borrow of moved value
+}
+
+fn bindings_after_at_slice_patterns_borrows_binding_mut(mut x: [String; 4]) {
+    let r = match x {
+        ref mut foo @ [.., _] => Some(foo),
+        _ => None,
+    };
+
+    &x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_slice_patterns_borrows_slice_mut1(mut x: [String; 4]) {
+    let r = match x {
+        ref foo @ [.., ref mut bar] => (),
+        //~^ ERROR cannot borrow
+        _ => (),
+    };
+
+    drop(r);
+}
+
+fn bindings_after_at_slice_patterns_borrows_slice_mut2(mut x: [String; 4]) {
+    let r = match x {
+        [ref foo @ .., ref bar] => Some(foo),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_slice_patterns_borrows_both(mut x: [String; 4]) {
+    let r = match x {
+        ref foo @ [.., ref bar] => Some(foo),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+// bindings_after_at + or_patterns
+
+fn bindings_after_at_or_patterns_move(x: Option<Test>) {
+    match x {
+        foo @ Some(Test::Foo | Test::Bar) => (),
+        _ => (),
+    }
+
+    &x;
+    //~^ ERROR borrow of moved value
+}
+
+fn bindings_after_at_or_patterns_borrows(mut x: Option<Test>) {
+    let r = match x {
+        ref foo @ Some(Test::Foo | Test::Bar) => Some(foo),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_or_patterns_borrows_mut(mut x: Option<Test>) {
+    let r = match x {
+        ref mut foo @ Some(Test::Foo | Test::Bar) => Some(foo),
+        _ => None,
+    };
+
+    &x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+// bindings_after_at + box_patterns
+
+fn bindings_after_at_box_patterns_borrows_both(mut x: Option<Box<String>>) {
+    let r = match x {
+        ref foo @ Some(box ref s) => Some(foo),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_box_patterns_borrows_mut(mut x: Option<Box<String>>) {
+    match x {
+        ref foo @ Some(box ref mut s) => (),
+        //~^ ERROR cannot borrow
+        _ => (),
+    };
+}
+
+// bindings_after_at + slice_patterns + or_patterns
+
+fn bindings_after_at_slice_patterns_or_patterns_moves(x: [Option<Test>; 4]) {
+    match x {
+        a @ [.., Some(Test::Foo | Test::Bar)] => (),
+        _ => (),
+    };
+
+    &x;
+    //~^ ERROR borrow of moved value
+}
+
+fn bindings_after_at_slice_patterns_or_patterns_borrows_binding(mut x: [Option<Test>; 4]) {
+    let r = match x {
+        ref a @ [ref b @ .., Some(Test::Foo | Test::Bar)] => Some(a),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_slice_patterns_or_patterns_borrows_slice(mut x: [Option<Test>; 4]) {
+    let r = match x {
+        ref a @ [ref b @ .., Some(Test::Foo | Test::Bar)] => Some(b),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+// bindings_after_at + slice_patterns + box_patterns
+
+fn bindings_after_at_slice_patterns_box_patterns_borrows(mut x: [Option<Box<String>>; 4]) {
+    let r = match x {
+        [_, ref a @ Some(box ref b), ..] => Some(a),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+// bindings_after_at + slice_patterns + or_patterns + box_patterns
+
+fn bindings_after_at_slice_patterns_or_patterns_box_patterns_borrows(
+    mut x: [Option<Box<Test>>; 4]
+) {
+    let r = match x {
+        [_, ref a @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_slice_patterns_or_patterns_box_patterns_borrows_mut(
+    mut x: [Option<Box<Test>>; 4]
+) {
+    let r = match x {
+        [_, ref mut a @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
+        _ => None,
+    };
+
+    &x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn bindings_after_at_slice_patterns_or_patterns_box_patterns_borrows_binding(
+    mut x: [Option<Box<Test>>; 4]
+) {
+    let r = match x {
+        ref a @ [_, ref b @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
+        _ => None,
+    };
+
+    &mut x;
+    //~^ ERROR cannot borrow
+
+    drop(r);
+}
+
+fn main() {}
diff --git a/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr b/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr
new file mode 100644
index 0000000000..35ed2763c2
--- /dev/null
+++ b/src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr
@@ -0,0 +1,208 @@
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:40:9
+   |
+LL |         ref foo @ [.., ref mut bar] => (),
+   |         -------^^^^^^^^-----------^
+   |         |              |
+   |         |              mutable borrow, by `bar`, occurs here
+   |         immutable borrow, by `foo`, occurs here
+
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:124:9
+   |
+LL |         ref foo @ Some(box ref mut s) => (),
+   |         -------^^^^^^^^^^^^---------^
+   |         |                  |
+   |         |                  mutable borrow, by `s`, occurs here
+   |         immutable borrow, by `foo`, occurs here
+
+error[E0382]: borrow of moved value: `x`
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:22:5
+   |
+LL | fn bindings_after_at_slice_patterns_move_binding(x: [String; 4]) {
+   |                                                  - move occurs because `x` has type `[std::string::String; 4]`, which does not implement the `Copy` trait
+LL |     match x {
+LL |         a @ [.., _] => (),
+   |         ----------- value moved here
+...
+LL |     &x;
+   |     ^^ value borrowed here after move
+
+error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:32:5
+   |
+LL |         ref mut foo @ [.., _] => Some(foo),
+   |         --------------------- mutable borrow occurs here
+...
+LL |     &x;
+   |     ^^ immutable borrow occurs here
+...
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:54:5
+   |
+LL |         [ref foo @ .., ref bar] => Some(foo),
+   |          ------------ immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:66:5
+   |
+LL |         ref foo @ [.., ref bar] => Some(foo),
+   |         ----------------------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0382]: borrow of moved value: `x`
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:80:5
+   |
+LL | fn bindings_after_at_or_patterns_move(x: Option<Test>) {
+   |                                       - move occurs because `x` has type `std::option::Option<Test>`, which does not implement the `Copy` trait
+LL |     match x {
+LL |         foo @ Some(Test::Foo | Test::Bar) => (),
+   |         ---------------------------------
+   |         |
+   |         value moved here
+   |         value moved here
+...
+LL |     &x;
+   |     ^^ value borrowed here after move
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:90:5
+   |
+LL |         ref foo @ Some(Test::Foo | Test::Bar) => Some(foo),
+   |         ------------------------------------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:102:5
+   |
+LL |         ref mut foo @ Some(Test::Foo | Test::Bar) => Some(foo),
+   |         ----------------------------------------- mutable borrow occurs here
+...
+LL |     &x;
+   |     ^^ immutable borrow occurs here
+...
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:116:5
+   |
+LL |         ref foo @ Some(box ref s) => Some(foo),
+   |         ------------------------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0382]: borrow of moved value: `x`
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:138:5
+   |
+LL | fn bindings_after_at_slice_patterns_or_patterns_moves(x: [Option<Test>; 4]) {
+   |                                                       - move occurs because `x` has type `[std::option::Option<Test>; 4]`, which does not implement the `Copy` trait
+LL |     match x {
+LL |         a @ [.., Some(Test::Foo | Test::Bar)] => (),
+   |         -------------------------------------
+   |         |
+   |         value moved here
+   |         value moved here
+...
+LL |     &x;
+   |     ^^ value borrowed here after move
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:148:5
+   |
+LL |         ref a @ [ref b @ .., Some(Test::Foo | Test::Bar)] => Some(a),
+   |         ------------------------------------------------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:160:5
+   |
+LL |         ref a @ [ref b @ .., Some(Test::Foo | Test::Bar)] => Some(b),
+   |                  ---------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:174:5
+   |
+LL |         [_, ref a @ Some(box ref b), ..] => Some(a),
+   |             ----------------------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:190:5
+   |
+LL |         [_, ref a @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
+   |             ------------------------------------------- immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:204:5
+   |
+LL |         [_, ref mut a @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
+   |             ----------------------------------------------- mutable borrow occurs here
+...
+LL |     &x;
+   |     ^^ immutable borrow occurs here
+...
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
+  --> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:218:5
+   |
+LL |         ref a @ [_, ref b @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
+   |         ------------------------------------------------------------ immutable borrow occurs here
+...
+LL |     &mut x;
+   |     ^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error: aborting due to 17 previous errors
+
+Some errors have detailed explanations: E0382, E0502.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs b/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs
new file mode 100644
index 0000000000..57198cb95e
--- /dev/null
+++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.rs
@@ -0,0 +1,14 @@
+#![feature(unboxed_closures)]
+
+// Tests that we can't assign to or mutably borrow upvars from `Fn`
+// closures (issue #17780)
+
+fn main() {}
+
+fn bar() -> impl Fn() -> usize {
+    let mut x = 0;
+    move || {
+        x += 1; //~ ERROR cannot assign
+        x
+    }
+}
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr b/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr
new file mode 100644
index 0000000000..003c40d277
--- /dev/null
+++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation-impl-trait.stderr
@@ -0,0 +1,16 @@
+error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
+  --> $DIR/borrow-immutable-upvar-mutation-impl-trait.rs:11:9
+   |
+LL |   fn bar() -> impl Fn() -> usize {
+   |      ---      ------------------ change this to return `FnMut` instead of `Fn`
+LL |       let mut x = 0;
+LL | /     move || {
+LL | |         x += 1;
+   | |         ^^^^^^ cannot assign
+LL | |         x
+LL | |     }
+   | |_____- in this closure
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs
index fed8bc95b6..e2f016614b 100644
--- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs
+++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.rs
@@ -3,10 +3,16 @@
 // Tests that we can't assign to or mutably borrow upvars from `Fn`
 // closures (issue #17780)
 
-fn set(x: &mut usize) { *x = 5; }
+fn set(x: &mut usize) {
+    *x = 5;
+}
 
-fn to_fn<A,F:Fn<A>>(f: F) -> F { f }
-fn to_fn_mut<A,F:FnMut<A>>(f: F) -> F { f }
+fn to_fn<A, F: Fn<A>>(f: F) -> F {
+    f
+}
+fn to_fn_mut<A, F: FnMut<A>>(f: F) -> F {
+    f
+}
 
 fn main() {
     // By-ref captures
@@ -18,7 +24,10 @@ fn main() {
         let _g = to_fn(|| set(&mut y)); //~ ERROR cannot borrow
 
         let mut z = 0;
-        let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); }); //~ ERROR cannot assign
+        let _h = to_fn_mut(|| {
+            set(&mut z);
+            to_fn(|| z = 42); //~ ERROR cannot assign
+        });
     }
 
     // By-value captures
@@ -30,6 +39,18 @@ fn main() {
         let _g = to_fn(move || set(&mut y)); //~ ERROR cannot borrow
 
         let mut z = 0;
-        let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); }); //~ ERROR cannot assign
+        let _h = to_fn_mut(move || {
+            set(&mut z);
+            to_fn(move || z = 42);
+            //~^ ERROR cannot assign
+        });
     }
 }
+
+fn foo() -> Box<dyn Fn() -> usize> {
+    let mut x = 0;
+    Box::new(move || {
+        x += 1; //~ ERROR cannot assign
+        x
+    })
+}
diff --git a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr
index 097e4c7506..a28cb7431e 100644
--- a/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr
+++ b/src/test/ui/borrowck/borrow-immutable-upvar-mutation.stderr
@@ -1,76 +1,84 @@
 error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
-  --> $DIR/borrow-immutable-upvar-mutation.rs:15:27
+  --> $DIR/borrow-immutable-upvar-mutation.rs:21:27
    |
+LL | fn to_fn<A, F: Fn<A>>(f: F) -> F {
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |         let _f = to_fn(|| x = 42);
-   |                           ^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-immutable-upvar-mutation.rs:15:24
-   |
-LL |         let _f = to_fn(|| x = 42);
-   |                        ^^^^^^^^^
+   |                  -----    ^^^^^^ cannot assign
+   |                  |
+   |                  expects `Fn` instead of `FnMut`
 
 error[E0596]: cannot borrow `y` as mutable, as it is a captured variable in a `Fn` closure
-  --> $DIR/borrow-immutable-upvar-mutation.rs:18:31
-   |
-LL |         let _g = to_fn(|| set(&mut y));
-   |                               ^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-immutable-upvar-mutation.rs:18:24
+  --> $DIR/borrow-immutable-upvar-mutation.rs:24:31
    |
+LL | fn to_fn<A, F: Fn<A>>(f: F) -> F {
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |         let _g = to_fn(|| set(&mut y));
-   |                        ^^^^^^^^^^^^^^
+   |                  -----        ^^^^^^ cannot borrow as mutable
+   |                  |
+   |                  expects `Fn` instead of `FnMut`
 
 error[E0594]: cannot assign to `z`, as it is a captured variable in a `Fn` closure
-  --> $DIR/borrow-immutable-upvar-mutation.rs:21:55
-   |
-LL |         let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); });
-   |                                                       ^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-immutable-upvar-mutation.rs:21:52
-   |
-LL |         let _h = to_fn_mut(|| { set(&mut z); to_fn(|| z = 42); });
-   |                                                    ^^^^^^^^^
+  --> $DIR/borrow-immutable-upvar-mutation.rs:29:22
+   |
+LL | fn to_fn<A, F: Fn<A>>(f: F) -> F {
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
+LL |             to_fn(|| z = 42);
+   |             -----    ^^^^^^ cannot assign
+   |             |
+   |             expects `Fn` instead of `FnMut`
 
 error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
-  --> $DIR/borrow-immutable-upvar-mutation.rs:27:32
-   |
-LL |         let _f = to_fn(move || x = 42);
-   |                                ^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-immutable-upvar-mutation.rs:27:24
+  --> $DIR/borrow-immutable-upvar-mutation.rs:36:32
    |
+LL | fn to_fn<A, F: Fn<A>>(f: F) -> F {
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |         let _f = to_fn(move || x = 42);
-   |                        ^^^^^^^^^^^^^^
+   |                  -----         ^^^^^^ cannot assign
+   |                  |
+   |                  expects `Fn` instead of `FnMut`
 
 error[E0596]: cannot borrow `y` as mutable, as it is a captured variable in a `Fn` closure
-  --> $DIR/borrow-immutable-upvar-mutation.rs:30:36
-   |
-LL |         let _g = to_fn(move || set(&mut y));
-   |                                    ^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-immutable-upvar-mutation.rs:30:24
+  --> $DIR/borrow-immutable-upvar-mutation.rs:39:36
    |
+LL | fn to_fn<A, F: Fn<A>>(f: F) -> F {
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |         let _g = to_fn(move || set(&mut y));
-   |                        ^^^^^^^^^^^^^^^^^^^
+   |                  -----             ^^^^^^ cannot borrow as mutable
+   |                  |
+   |                  expects `Fn` instead of `FnMut`
 
 error[E0594]: cannot assign to `z`, as it is a captured variable in a `Fn` closure
-  --> $DIR/borrow-immutable-upvar-mutation.rs:33:65
-   |
-LL |         let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); });
-   |                                                                 ^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-immutable-upvar-mutation.rs:33:57
-   |
-LL |         let _h = to_fn_mut(move || { set(&mut z); to_fn(move || z = 42); });
-   |                                                         ^^^^^^^^^^^^^^
+  --> $DIR/borrow-immutable-upvar-mutation.rs:44:27
+   |
+LL | fn to_fn<A, F: Fn<A>>(f: F) -> F {
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
+LL |             to_fn(move || z = 42);
+   |             -----         ^^^^^^ cannot assign
+   |             |
+   |             expects `Fn` instead of `FnMut`
+
+error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
+  --> $DIR/borrow-immutable-upvar-mutation.rs:53:9
+   |
+LL |   fn foo() -> Box<dyn Fn() -> usize> {
+   |      ---      ---------------------- change this to return `FnMut` instead of `Fn`
+LL |       let mut x = 0;
+LL |       Box::new(move || {
+   |  ______________-
+LL | |         x += 1;
+   | |         ^^^^^^ cannot assign
+LL | |         x
+LL | |     })
+   | |_____- in this closure
 
-error: aborting due to 6 previous errors
+error: aborting due to 7 previous errors
 
 Some errors have detailed explanations: E0594, E0596.
 For more information about an error, try `rustc --explain E0594`.
diff --git a/src/test/ui/borrowck/borrow-raw-address-of-mutability.stderr b/src/test/ui/borrowck/borrow-raw-address-of-mutability.stderr
index cf01c362d5..44dde0fd80 100644
--- a/src/test/ui/borrowck/borrow-raw-address-of-mutability.stderr
+++ b/src/test/ui/borrowck/borrow-raw-address-of-mutability.stderr
@@ -27,32 +27,32 @@ LL |     f();
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-raw-address-of-mutability.rs:29:17
    |
-LL |         let y = &raw mut x;
-   |                 ^^^^^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-raw-address-of-mutability.rs:28:21
-   |
+LL |   fn make_fn<F: Fn()>(f: F) -> F { f }
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |       let f = make_fn(|| {
-   |  _____________________^
+   |  _____________-------_-
+   | |             |
+   | |             expects `Fn` instead of `FnMut`
 LL | |         let y = &raw mut x;
+   | |                 ^^^^^^^^^^ cannot borrow as mutable
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/borrow-raw-address-of-mutability.rs:37:17
    |
-LL |         let y = &raw mut x;
-   |                 ^^^^^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/borrow-raw-address-of-mutability.rs:36:21
-   |
+LL |   fn make_fn<F: Fn()>(f: F) -> F { f }
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |       let f = make_fn(move || {
-   |  _____________________^
+   |  _____________-------_-
+   | |             |
+   | |             expects `Fn` instead of `FnMut`
 LL | |         let y = &raw mut x;
+   | |                 ^^^^^^^^^^ cannot borrow as mutable
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr
index 1dd18c12fc..bdb073cdcb 100644
--- a/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr
+++ b/src/test/ui/borrowck/borrowck-borrowed-uniq-rvalue-2.stderr
@@ -9,7 +9,7 @@ LL |     x.x[0];
    |     ------ borrow later used here
    |
    = note: consider using a `let` binding to create a longer lived value
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs
index a6f3905beb..51f2ff75da 100644
--- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs
+++ b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs
@@ -9,8 +9,8 @@
 // borrowck=migrate`.
 
 // revisions: zflag edition
-// [zflag]compile-flags: -Z borrowck=migrate
-// [edition]edition:2018
+//[zflag]compile-flags: -Z borrowck=migrate
+//[edition]edition:2018
 
 #![feature(nll)]
 
diff --git a/src/test/ui/borrowck/borrowck-unboxed-closures.stderr b/src/test/ui/borrowck/borrowck-unboxed-closures.stderr
index 5cd0471cd0..33a0b0286d 100644
--- a/src/test/ui/borrowck/borrowck-unboxed-closures.stderr
+++ b/src/test/ui/borrowck/borrowck-unboxed-closures.stderr
@@ -20,13 +20,17 @@ error[E0382]: use of moved value: `f`
   --> $DIR/borrowck-unboxed-closures.rs:12:5
    |
 LL | fn c<F:FnOnce(isize, isize) -> isize>(f: F) {
-   |      --                               - move occurs because `f` has type `F`, which does not implement the `Copy` trait
-   |      |
-   |      help: consider further restricting this bound: `F: Copy +`
+   |                                       - move occurs because `f` has type `F`, which does not implement the `Copy` trait
 LL |     f(1, 2);
    |     - value moved here
 LL |     f(1, 2);
    |     ^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/borrowck-unboxed-closures.rs:10:8
+   |
+LL | fn c<F:FnOnce(isize, isize) -> isize>(f: F) {
+   |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/borrowck/issue-45983.nll.stderr b/src/test/ui/borrowck/issue-45983.nll.stderr
index 49d6c2473f..51bb4dee67 100644
--- a/src/test/ui/borrowck/issue-45983.nll.stderr
+++ b/src/test/ui/borrowck/issue-45983.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/issue-45983.rs:20:18
    |
 LL |     let x = None;
-   |         - `x` is declared here, outside of the closure body
+   |         - `x` declared here, outside of the closure body
 LL |     give_any(|y| x = Some(y));
    |               -  ^^^^^^^^^^^ `y` escapes the closure body here
    |               |
diff --git a/src/test/ui/borrowck/issue-64453.stderr b/src/test/ui/borrowck/issue-64453.stderr
index 0b66426aa2..48859fb676 100644
--- a/src/test/ui/borrowck/issue-64453.stderr
+++ b/src/test/ui/borrowck/issue-64453.stderr
@@ -4,9 +4,9 @@ error[E0658]: `match` is not allowed in a `static`
 LL | static settings_dir: String = format!("");
    |                               ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/borrowck/issue-7573.nll.stderr b/src/test/ui/borrowck/issue-7573.nll.stderr
index 0da715bbdb..20afecfe5d 100644
--- a/src/test/ui/borrowck/issue-7573.nll.stderr
+++ b/src/test/ui/borrowck/issue-7573.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/issue-7573.rs:21:9
    |
 LL |     let mut lines_to_use: Vec<&CrateId> = Vec::new();
-   |         ---------------- `lines_to_use` is declared here, outside of the closure body
+   |         ---------------- `lines_to_use` declared here, outside of the closure body
 LL |
 LL |     let push_id = |installed_id: &CrateId| {
    |                    ------------ `installed_id` is a reference that is only valid in the closure body
diff --git a/src/test/ui/borrowck/move-error-snippets.stderr b/src/test/ui/borrowck/move-error-snippets.stderr
index 77463c4859..58a90b2fca 100644
--- a/src/test/ui/borrowck/move-error-snippets.stderr
+++ b/src/test/ui/borrowck/move-error-snippets.stderr
@@ -1,14 +1,18 @@
 error[E0507]: cannot move out of static item `D`
-  --> $DIR/move-error-snippets.rs:16:18
+  --> $DIR/move-error-snippets-ext.rs:5:17
    |
-LL | | #[macro_use]
-   | |__________________^ move occurs because `D` has type `A`, which does not implement the `Copy` trait
-...
-LL |               aaa!(D);
-   |  __________________^
-...
-LL |   sss!();
-   |   ------- in this macro invocation
+LL |         let a = $c;
+   |                 ^^
+   |                 |
+   |                 move occurs because `D` has type `A`, which does not implement the `Copy` trait
+   |                 help: consider borrowing here: `&$c`
+   | 
+  ::: $DIR/move-error-snippets.rs:21:1
+   |
+LL | sss!();
+   | ------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/borrowck/mutability-errors.stderr b/src/test/ui/borrowck/mutability-errors.stderr
index 72547a4035..5361ebe391 100644
--- a/src/test/ui/borrowck/mutability-errors.stderr
+++ b/src/test/ui/borrowck/mutability-errors.stderr
@@ -119,146 +119,146 @@ LL |     &mut (*f()).0;
 error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
   --> $DIR/mutability-errors.rs:40:9
    |
-LL |         x = (1,);
-   |         ^^^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:39:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
+   | |         ^^^^^^^^ cannot assign
 LL | |         x.0 = 1;
 LL | |         &mut x;
 LL | |         &mut x.0;
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0594]: cannot assign to `x.0`, as `Fn` closures cannot mutate their captured variables
   --> $DIR/mutability-errors.rs:41:9
    |
-LL |         x.0 = 1;
-   |         ^^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:39:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
 LL | |         x.0 = 1;
+   | |         ^^^^^^^ cannot assign
 LL | |         &mut x;
 LL | |         &mut x.0;
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/mutability-errors.rs:42:9
    |
-LL |         &mut x;
-   |         ^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:39:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
 LL | |         x.0 = 1;
 LL | |         &mut x;
+   | |         ^^^^^^ cannot borrow as mutable
 LL | |         &mut x.0;
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0596]: cannot borrow `x.0` as mutable, as `Fn` closures cannot mutate their captured variables
   --> $DIR/mutability-errors.rs:43:9
    |
-LL |         &mut x.0;
-   |         ^^^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:39:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
 LL | |         x.0 = 1;
 LL | |         &mut x;
 LL | |         &mut x.0;
+   | |         ^^^^^^^^ cannot borrow as mutable
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
   --> $DIR/mutability-errors.rs:46:9
    |
-LL |         x = (1,);
-   |         ^^^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:45:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
+   | |         ^^^^^^^^ cannot assign
 LL | |         x.0 = 1;
 LL | |         &mut x;
 LL | |         &mut x.0;
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0594]: cannot assign to `x.0`, as `Fn` closures cannot mutate their captured variables
   --> $DIR/mutability-errors.rs:47:9
    |
-LL |         x.0 = 1;
-   |         ^^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:45:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
 LL | |         x.0 = 1;
+   | |         ^^^^^^^ cannot assign
 LL | |         &mut x;
 LL | |         &mut x.0;
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/mutability-errors.rs:48:9
    |
-LL |         &mut x;
-   |         ^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:45:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
 LL | |         x.0 = 1;
 LL | |         &mut x;
+   | |         ^^^^^^ cannot borrow as mutable
 LL | |         &mut x.0;
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0596]: cannot borrow `x.0` as mutable, as `Fn` closures cannot mutate their captured variables
   --> $DIR/mutability-errors.rs:49:9
    |
-LL |         &mut x.0;
-   |         ^^^^^^^^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/mutability-errors.rs:45:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         x = (1,);
 LL | |         x.0 = 1;
 LL | |         &mut x;
 LL | |         &mut x.0;
+   | |         ^^^^^^^^ cannot borrow as mutable
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/mutability-errors.rs:54:5
diff --git a/src/test/ui/borrowck/or-patterns.rs b/src/test/ui/borrowck/or-patterns.rs
new file mode 100644
index 0000000000..5b31e2d76a
--- /dev/null
+++ b/src/test/ui/borrowck/or-patterns.rs
@@ -0,0 +1,64 @@
+// Test that borrow check considers all choices in an or pattern, even the
+// unreachable ones.
+
+#![feature(or_patterns)]
+
+fn or_pattern_moves_all(x: ((String, String),)) {
+    match x {
+        ((y, _) | (_, y),) => (),
+    }
+    &x.0 .0;
+    //~^ ERROR borrow of moved value
+    &x.0 .1;
+    //~^ ERROR borrow of moved value
+}
+
+fn or_pattern_borrows_all(mut x: ((String, String),)) {
+    let r = match x {
+        ((ref y, _) | (_, ref y),) => y,
+    };
+    &mut x.0 .0;
+    //~^ ERROR cannot borrow
+    &mut x.0 .1;
+    //~^ ERROR cannot borrow
+    drop(r);
+}
+
+fn or_pattern_borrows_all_mut(mut x: ((String, String),)) {
+    let r = match x {
+        ((ref mut y, _) | (_, ref mut y),) => y,
+    };
+    &x.0 .0;
+    //~^ ERROR cannot borrow
+    &x.0 .1;
+    //~^ ERROR cannot borrow
+    drop(r);
+}
+
+fn let_or_pattern_moves_all(x: ((String, String),)) {
+    let ((y, _) | (_, y),) = x;
+    &x.0 .0;
+    //~^ ERROR borrow of moved value
+    &x.0 .1;
+    //~^ ERROR borrow of moved value
+}
+
+fn let_or_pattern_borrows_all(mut x: ((String, String),)) {
+    let ((ref r, _) | (_, ref r),) = x;
+    &mut x.0 .0;
+    //~^ ERROR cannot borrow
+    &mut x.0 .1;
+    //~^ ERROR cannot borrow
+    drop(r);
+}
+
+fn let_or_pattern_borrows_all_mut(mut x: ((String, String),)) {
+    let ((ref mut r, _) | (_, ref mut r),) = x;
+    &x.0 .0;
+    //~^ ERROR cannot borrow
+    &x.0 .1;
+    //~^ ERROR cannot borrow
+    drop(r);
+}
+
+fn main() {}
diff --git a/src/test/ui/borrowck/or-patterns.stderr b/src/test/ui/borrowck/or-patterns.stderr
new file mode 100644
index 0000000000..d3f3544426
--- /dev/null
+++ b/src/test/ui/borrowck/or-patterns.stderr
@@ -0,0 +1,141 @@
+error[E0382]: borrow of moved value: `x.0.0`
+  --> $DIR/or-patterns.rs:10:5
+   |
+LL |         ((y, _) | (_, y),) => (),
+   |           - value moved here
+LL |     }
+LL |     &x.0 .0;
+   |     ^^^^^^^ value borrowed here after move
+   |
+   = note: move occurs because `x.0.0` has type `std::string::String`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value: `x.0.1`
+  --> $DIR/or-patterns.rs:12:5
+   |
+LL |         ((y, _) | (_, y),) => (),
+   |                       - value moved here
+...
+LL |     &x.0 .1;
+   |     ^^^^^^^ value borrowed here after move
+   |
+   = note: move occurs because `x.0.1` has type `std::string::String`, which does not implement the `Copy` trait
+
+error[E0502]: cannot borrow `x.0.0` as mutable because it is also borrowed as immutable
+  --> $DIR/or-patterns.rs:20:5
+   |
+LL |         ((ref y, _) | (_, ref y),) => y,
+   |           ----- immutable borrow occurs here
+LL |     };
+LL |     &mut x.0 .0;
+   |     ^^^^^^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x.0.1` as mutable because it is also borrowed as immutable
+  --> $DIR/or-patterns.rs:22:5
+   |
+LL |         ((ref y, _) | (_, ref y),) => y,
+   |                           ----- immutable borrow occurs here
+...
+LL |     &mut x.0 .1;
+   |     ^^^^^^^^^^^ mutable borrow occurs here
+LL |
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x.0.0` as immutable because it is also borrowed as mutable
+  --> $DIR/or-patterns.rs:31:5
+   |
+LL |         ((ref mut y, _) | (_, ref mut y),) => y,
+   |           --------- mutable borrow occurs here
+LL |     };
+LL |     &x.0 .0;
+   |     ^^^^^^^ immutable borrow occurs here
+...
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error[E0502]: cannot borrow `x.0.1` as immutable because it is also borrowed as mutable
+  --> $DIR/or-patterns.rs:33:5
+   |
+LL |         ((ref mut y, _) | (_, ref mut y),) => y,
+   |                               --------- mutable borrow occurs here
+...
+LL |     &x.0 .1;
+   |     ^^^^^^^ immutable borrow occurs here
+LL |
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error[E0382]: borrow of moved value: `x.0.0`
+  --> $DIR/or-patterns.rs:40:5
+   |
+LL |     let ((y, _) | (_, y),) = x;
+   |           - value moved here
+LL |     &x.0 .0;
+   |     ^^^^^^^ value borrowed here after move
+   |
+   = note: move occurs because `x.0.0` has type `std::string::String`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value: `x.0.1`
+  --> $DIR/or-patterns.rs:42:5
+   |
+LL |     let ((y, _) | (_, y),) = x;
+   |                       - value moved here
+...
+LL |     &x.0 .1;
+   |     ^^^^^^^ value borrowed here after move
+   |
+   = note: move occurs because `x.0.1` has type `std::string::String`, which does not implement the `Copy` trait
+
+error[E0502]: cannot borrow `x.0.0` as mutable because it is also borrowed as immutable
+  --> $DIR/or-patterns.rs:48:5
+   |
+LL |     let ((ref r, _) | (_, ref r),) = x;
+   |           ----- immutable borrow occurs here
+LL |     &mut x.0 .0;
+   |     ^^^^^^^^^^^ mutable borrow occurs here
+...
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x.0.1` as mutable because it is also borrowed as immutable
+  --> $DIR/or-patterns.rs:50:5
+   |
+LL |     let ((ref r, _) | (_, ref r),) = x;
+   |                           ----- immutable borrow occurs here
+...
+LL |     &mut x.0 .1;
+   |     ^^^^^^^^^^^ mutable borrow occurs here
+LL |
+LL |     drop(r);
+   |          - immutable borrow later used here
+
+error[E0502]: cannot borrow `x.0.0` as immutable because it is also borrowed as mutable
+  --> $DIR/or-patterns.rs:57:5
+   |
+LL |     let ((ref mut r, _) | (_, ref mut r),) = x;
+   |           --------- mutable borrow occurs here
+LL |     &x.0 .0;
+   |     ^^^^^^^ immutable borrow occurs here
+...
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error[E0502]: cannot borrow `x.0.1` as immutable because it is also borrowed as mutable
+  --> $DIR/or-patterns.rs:59:5
+   |
+LL |     let ((ref mut r, _) | (_, ref mut r),) = x;
+   |                               --------- mutable borrow occurs here
+...
+LL |     &x.0 .1;
+   |     ^^^^^^^ immutable borrow occurs here
+LL |
+LL |     drop(r);
+   |          - mutable borrow later used here
+
+error: aborting due to 12 previous errors
+
+Some errors have detailed explanations: E0382, E0502.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr
index 4797a9d456..68a0fe0b4f 100644
--- a/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr
+++ b/src/test/ui/borrowck/regions-escape-bound-fn-2.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-escape-bound-fn-2.rs:8:18
    |
 LL |     let mut x = None;
-   |         ----- `x` is declared here, outside of the closure body
+   |         ----- `x` declared here, outside of the closure body
 LL |     with_int(|y| x = Some(y));
    |               -  ^^^^^^^^^^^ `y` escapes the closure body here
    |               |
diff --git a/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr b/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr
index 2b3a9816e4..d304de92c7 100644
--- a/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr
+++ b/src/test/ui/borrowck/regions-escape-bound-fn.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-escape-bound-fn.rs:8:18
    |
 LL |     let mut x: Option<&isize> = None;
-   |         ----- `x` is declared here, outside of the closure body
+   |         ----- `x` declared here, outside of the closure body
 LL |     with_int(|y| x = Some(y));
    |               -  ^^^^^^^^^^^ `y` escapes the closure body here
    |               |
diff --git a/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr b/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr
index 8ceefd2534..d9931302f7 100644
--- a/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr
+++ b/src/test/ui/borrowck/regions-escape-unboxed-closure.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-escape-unboxed-closure.rs:6:23
    |
 LL |     let mut x: Option<&isize> = None;
-   |         ----- `x` is declared here, outside of the closure body
+   |         ----- `x` declared here, outside of the closure body
 LL |     with_int(&mut |y| x = Some(y));
    |                    -  ^^^^^^^^^^^ `y` escapes the closure body here
    |                    |
diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr b/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr
index baf122df5e..21ae25c16b 100644
--- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr
+++ b/src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr
@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `*f` as mutable more than once at a time
-  --> $DIR/two-phase-nonrecv-autoref.rs:58:11
+  --> $DIR/two-phase-nonrecv-autoref.rs:51:11
    |
 LL |         f(f(10));
    |         - ^ second mutable borrow occurs here
@@ -8,7 +8,7 @@ LL |         f(f(10));
    |         first borrow later used by call
 
 error[E0382]: use of moved value: `f`
-  --> $DIR/two-phase-nonrecv-autoref.rs:66:11
+  --> $DIR/two-phase-nonrecv-autoref.rs:59:11
    |
 LL |     fn twice_ten_so<F: FnOnce(i32) -> i32>(f: Box<F>) {
    |                                            - move occurs because `f` has type `std::boxed::Box<F>`, which does not implement the `Copy` trait
@@ -18,7 +18,7 @@ LL |         f(f(10));
    |         value moved here
 
 error[E0499]: cannot borrow `*f` as mutable more than once at a time
-  --> $DIR/two-phase-nonrecv-autoref.rs:72:11
+  --> $DIR/two-phase-nonrecv-autoref.rs:65:11
    |
 LL |         f(f(10));
    |         - ^ second mutable borrow occurs here
@@ -27,7 +27,7 @@ LL |         f(f(10));
    |         first borrow later used by call
 
 error[E0382]: use of moved value: `f`
-  --> $DIR/two-phase-nonrecv-autoref.rs:80:11
+  --> $DIR/two-phase-nonrecv-autoref.rs:73:11
    |
 LL |     fn twice_ten_oo(f: Box<dyn FnOnce(i32) -> i32>) {
    |                     - move occurs because `f` has type `std::boxed::Box<dyn std::ops::FnOnce(i32) -> i32>`, which does not implement the `Copy` trait
@@ -37,7 +37,7 @@ LL |         f(f(10));
    |         value moved here
 
 error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/two-phase-nonrecv-autoref.rs:119:27
+  --> $DIR/two-phase-nonrecv-autoref.rs:112:27
    |
 LL |     double_access(&mut a, &a);
    |     ------------- ------  ^^ immutable borrow occurs here
@@ -46,7 +46,7 @@ LL |     double_access(&mut a, &a);
    |     mutable borrow later used by call
 
 error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable
-  --> $DIR/two-phase-nonrecv-autoref.rs:145:7
+  --> $DIR/two-phase-nonrecv-autoref.rs:138:7
    |
 LL |     i[i[3]] = 4;
    |     --^----
@@ -56,7 +56,7 @@ LL |     i[i[3]] = 4;
    |     mutable borrow later used here
 
 error[E0502]: cannot borrow `i` as immutable because it is also borrowed as mutable
-  --> $DIR/two-phase-nonrecv-autoref.rs:150:7
+  --> $DIR/two-phase-nonrecv-autoref.rs:143:7
    |
 LL |     i[i[3]] = i[4];
    |     --^----
diff --git a/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs b/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs
index b29664e3d8..918c7a1be1 100644
--- a/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs
+++ b/src/test/ui/borrowck/two-phase-nonrecv-autoref.rs
@@ -13,13 +13,6 @@
 // receivers (namely, in many cases demonstrated below, the error
 // would not arise).
 
-// (If we revise the compiler or this test so that the g2p revision
-// passes, turn the `rustc_attrs` feature back on and tag the `fn
-// main` with `#[rustc_error]` so that this remains a valid
-// compile-fail test.)
-//
-// #![feature(rustc_attrs)]
-
 use std::ops::{Index, IndexMut};
 
 fn foo(x: &mut u32, y: u32) {
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr
index 77fbfb37ad..85779e5343 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-future-compat-lint.stderr
@@ -9,7 +9,7 @@ LL |         v.push(shared.len());
    |         |
    |         mutable borrow occurs here
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/two-phase-reservation-sharing-interference-future-compat-lint.rs:18:13
    |
 LL |     #![warn(mutable_borrow_reservation_conflict)]
@@ -28,7 +28,7 @@ LL |         v.push(shared.len());
    |         |
    |         mutable borrow occurs here
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/two-phase-reservation-sharing-interference-future-compat-lint.rs:31:13
    |
 LL |     #![deny(mutable_borrow_reservation_conflict)]
diff --git a/src/test/ui/bound-suggestions.fixed b/src/test/ui/bound-suggestions.fixed
new file mode 100644
index 0000000000..c77421c97e
--- /dev/null
+++ b/src/test/ui/bound-suggestions.fixed
@@ -0,0 +1,39 @@
+// run-rustfix
+
+#[allow(dead_code)]
+fn test_impl(t: impl Sized + std::fmt::Debug) {
+    println!("{:?}", t);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_no_bounds<T: std::fmt::Debug>(t: T) {
+    println!("{:?}", t);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_one_bound<T: std::fmt::Debug +  Sized>(t: T) {
+    println!("{:?}", t);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_no_bounds_where<X, Y>(x: X, y: Y) where X: std::fmt::Debug, Y: std::fmt::Debug {
+    println!("{:?} {:?}", x, y);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_one_bound_where<X>(x: X) where X: std::fmt::Debug + Sized {
+    println!("{:?}", x);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_many_bounds_where<X>(x: X) where X: Sized, X: Sized, X: std::fmt::Debug {
+    println!("{:?}", x);
+    //~^ ERROR doesn't implement
+}
+
+pub fn main() { }
diff --git a/src/test/ui/bound-suggestions.rs b/src/test/ui/bound-suggestions.rs
new file mode 100644
index 0000000000..605a6df838
--- /dev/null
+++ b/src/test/ui/bound-suggestions.rs
@@ -0,0 +1,39 @@
+// run-rustfix
+
+#[allow(dead_code)]
+fn test_impl(t: impl Sized) {
+    println!("{:?}", t);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_no_bounds<T>(t: T) {
+    println!("{:?}", t);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_one_bound<T: Sized>(t: T) {
+    println!("{:?}", t);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_no_bounds_where<X, Y>(x: X, y: Y) where X: std::fmt::Debug {
+    println!("{:?} {:?}", x, y);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_one_bound_where<X>(x: X) where X: Sized {
+    println!("{:?}", x);
+    //~^ ERROR doesn't implement
+}
+
+#[allow(dead_code)]
+fn test_many_bounds_where<X>(x: X) where X: Sized, X: Sized {
+    println!("{:?}", x);
+    //~^ ERROR doesn't implement
+}
+
+pub fn main() { }
diff --git a/src/test/ui/bound-suggestions.stderr b/src/test/ui/bound-suggestions.stderr
new file mode 100644
index 0000000000..1e85c2bf36
--- /dev/null
+++ b/src/test/ui/bound-suggestions.stderr
@@ -0,0 +1,93 @@
+error[E0277]: `impl Sized` doesn't implement `std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:5:22
+   |
+LL |     println!("{:?}", t);
+   |                      ^ `impl Sized` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `impl Sized`
+help: consider further restricting this bound with `+ std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:4:17
+   |
+LL | fn test_impl(t: impl Sized) {
+   |                 ^^^^^^^^^^
+   = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `T` doesn't implement `std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:11:22
+   |
+LL |     println!("{:?}", t);
+   |                      ^ `T` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:10:19
+   |
+LL | fn test_no_bounds<T>(t: T) {
+   |                   ^
+   = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `T` doesn't implement `std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:17:22
+   |
+LL |     println!("{:?}", t);
+   |                      ^ `T` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `T`
+help: consider further restricting this bound with `+ std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:16:22
+   |
+LL | fn test_one_bound<T: Sized>(t: T) {
+   |                      ^^^^^
+   = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `Y` doesn't implement `std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:23:30
+   |
+LL |     println!("{:?} {:?}", x, y);
+   |                              ^ `Y` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `Y`
+help: consider restricting this type parameter with `where Y: std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:22:28
+   |
+LL | fn test_no_bounds_where<X, Y>(x: X, y: Y) where X: std::fmt::Debug {
+   |                            ^
+   = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `X` doesn't implement `std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:29:22
+   |
+LL |     println!("{:?}", x);
+   |                      ^ `X` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `X`
+help: consider further restricting this bound with `+ std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:28:40
+   |
+LL | fn test_one_bound_where<X>(x: X) where X: Sized {
+   |                                        ^^^^^^^^
+   = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0277]: `X` doesn't implement `std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:35:22
+   |
+LL |     println!("{:?}", x);
+   |                      ^ `X` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
+   |
+   = help: the trait `std::fmt::Debug` is not implemented for `X`
+help: consider further restricting this type parameter with `where X: std::fmt::Debug`
+  --> $DIR/bound-suggestions.rs:34:27
+   |
+LL | fn test_many_bounds_where<X>(x: X) where X: Sized, X: Sized {
+   |                           ^
+   = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 6 previous errors
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr
index 5be6ab05d6..a38705c834 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-double-superkind.stderr
@@ -2,22 +2,28 @@ error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/builtin-superkinds-double-superkind.rs:6:24
    |
 LL | impl <T: Sync+'static> Foo for (T,) { }
-   |       --               ^^^ `T` cannot be sent between threads safely
-   |       |
-   |       help: consider further restricting this bound: `T: std::marker::Send +`
+   |                        ^^^ `T` cannot be sent between threads safely
    |
    = help: within `(T,)`, the trait `std::marker::Send` is not implemented for `T`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/builtin-superkinds-double-superkind.rs:6:10
+   |
+LL | impl <T: Sync+'static> Foo for (T,) { }
+   |          ^^^^^^^^^^^^
    = note: required because it appears within the type `(T,)`
 
 error[E0277]: `T` cannot be shared between threads safely
   --> $DIR/builtin-superkinds-double-superkind.rs:9:16
    |
 LL | impl <T: Send> Foo for (T,T) { }
-   |       --       ^^^ `T` cannot be shared between threads safely
-   |       |
-   |       help: consider further restricting this bound: `T: std::marker::Sync +`
+   |                ^^^ `T` cannot be shared between threads safely
    |
    = help: within `(T, T)`, the trait `std::marker::Sync` is not implemented for `T`
+help: consider further restricting this bound with `+ std::marker::Sync`
+  --> $DIR/builtin-superkinds-double-superkind.rs:9:10
+   |
+LL | impl <T: Send> Foo for (T,T) { }
+   |          ^^^^
    = note: required because it appears within the type `(T, T)`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
index 8cce9bfdf5..f379d97bd7 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-in-metadata.stderr
@@ -2,11 +2,14 @@ error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/builtin-superkinds-in-metadata.rs:13:23
    |
 LL | impl <T:Sync+'static> RequiresRequiresShareAndSend for X<T> { }
-   |       --              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `T` cannot be sent between threads safely
-   |       |
-   |       help: consider further restricting this bound: `T: std::marker::Send +`
+   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `T` cannot be sent between threads safely
    |
    = help: within `X<T>`, the trait `std::marker::Send` is not implemented for `T`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/builtin-superkinds-in-metadata.rs:13:9
+   |
+LL | impl <T:Sync+'static> RequiresRequiresShareAndSend for X<T> { }
+   |         ^^^^^^^^^^^^
    = note: required because it appears within the type `X<T>`
 
 error: aborting due to previous error
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr
index 2fdb3836dd..999a5839ba 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-self-type.stderr
@@ -4,7 +4,7 @@ error[E0310]: the parameter type `T` may not live long enough
 LL | impl <T: Sync> Foo for T { }
    |       --       ^^^
    |       |
-   |       help: consider adding an explicit lifetime bound `T: 'static`...
+   |       help: consider adding an explicit lifetime bound...: `T: 'static +`
    |
 note: ...so that the type `T` will meet its required lifetime bounds
   --> $DIR/builtin-superkinds-self-type.rs:10:16
diff --git a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr
index 4381a5b868..996f39bfb6 100644
--- a/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr
+++ b/src/test/ui/builtin-superkinds/builtin-superkinds-typaram-not-send.stderr
@@ -2,11 +2,14 @@ error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/builtin-superkinds-typaram-not-send.rs:5:24
    |
 LL | impl <T: Sync+'static> Foo for T { }
-   |       --               ^^^ `T` cannot be sent between threads safely
-   |       |
-   |       help: consider further restricting this bound: `T: std::marker::Send +`
+   |                        ^^^ `T` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/builtin-superkinds-typaram-not-send.rs:5:10
+   |
+LL | impl <T: Sync+'static> Foo for T { }
+   |          ^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/c-variadic/variadic-ffi-1.rs b/src/test/ui/c-variadic/variadic-ffi-1.rs
index 6a3ff24b67..e7197a9d16 100644
--- a/src/test/ui/c-variadic/variadic-ffi-1.rs
+++ b/src/test/ui/c-variadic/variadic-ffi-1.rs
@@ -13,8 +13,8 @@ extern "C" fn bar(f: isize, x: u8) {}
 
 fn main() {
     unsafe {
-        foo();  //~ ERROR this function takes at least 2 parameters but 0 parameters were supplied
-        foo(1); //~ ERROR this function takes at least 2 parameters but 1 parameter was supplied
+        foo();  //~ ERROR this function takes at least 2 arguments but 0 arguments were supplied
+        foo(1); //~ ERROR this function takes at least 2 arguments but 1 argument was supplied
 
         let x: unsafe extern "C" fn(f: isize, x: u8) = foo; //~ ERROR mismatched types
         let y: extern "C" fn(f: isize, x: u8, ...) = bar; //~ ERROR mismatched types
diff --git a/src/test/ui/c-variadic/variadic-ffi-1.stderr b/src/test/ui/c-variadic/variadic-ffi-1.stderr
index 05d839a0c5..318b8aabaf 100644
--- a/src/test/ui/c-variadic/variadic-ffi-1.stderr
+++ b/src/test/ui/c-variadic/variadic-ffi-1.stderr
@@ -4,23 +4,27 @@ error[E0045]: C-variadic function must have C or cdecl calling convention
 LL |     fn printf(_: *const u8, ...);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ C-variadics require C or cdecl calling convention
 
-error[E0060]: this function takes at least 2 parameters but 0 parameters were supplied
+error[E0060]: this function takes at least 2 arguments but 0 arguments were supplied
   --> $DIR/variadic-ffi-1.rs:16:9
    |
 LL |     fn foo(f: isize, x: u8, ...);
    |     ----------------------------- defined here
 ...
 LL |         foo();
-   |         ^^^^^ expected at least 2 parameters
+   |         ^^^-- supplied 0 arguments
+   |         |
+   |         expected at least 2 arguments
 
-error[E0060]: this function takes at least 2 parameters but 1 parameter was supplied
+error[E0060]: this function takes at least 2 arguments but 1 argument was supplied
   --> $DIR/variadic-ffi-1.rs:17:9
    |
 LL |     fn foo(f: isize, x: u8, ...);
    |     ----------------------------- defined here
 ...
 LL |         foo(1);
-   |         ^^^^^^ expected at least 2 parameters
+   |         ^^^ - supplied 1 argument
+   |         |
+   |         expected at least 2 arguments
 
 error[E0308]: mismatched types
   --> $DIR/variadic-ffi-1.rs:19:56
diff --git a/src/test/ui/cast-char.stderr b/src/test/ui/cast-char.stderr
index 1729e5cbf0..211937c9d6 100644
--- a/src/test/ui/cast-char.stderr
+++ b/src/test/ui/cast-char.stderr
@@ -4,7 +4,7 @@ error: only `u8` can be cast into `char`
 LL |     const XYZ: char = 0x1F888 as char;
    |                       ^^^^^^^^^^^^^^^ help: use a `char` literal instead: `'\u{1F888}'`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cast-char.rs:1:9
    |
 LL | #![deny(overflowing_literals)]
diff --git a/src/test/ui/cast/cast-ptr-to-int-const.stderr b/src/test/ui/cast/cast-ptr-to-int-const.stderr
index 140661738d..f523b14a98 100644
--- a/src/test/ui/cast/cast-ptr-to-int-const.stderr
+++ b/src/test/ui/cast/cast-ptr-to-int-const.stderr
@@ -4,7 +4,7 @@ error[E0658]: casting pointers to integers in constants is unstable
 LL |         main as u32
    |         ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error[E0658]: casting pointers to integers in constants is unstable
@@ -13,7 +13,7 @@ error[E0658]: casting pointers to integers in constants is unstable
 LL |         &Y as *const u32 as u32
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/chalkify/builtin-copy-clone.rs b/src/test/ui/chalkify/builtin-copy-clone.rs
deleted file mode 100644
index d403514b55..0000000000
--- a/src/test/ui/chalkify/builtin-copy-clone.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-// Test that `Clone` is correctly implemented for builtin types.
-
-#[derive(Copy, Clone)]
-struct S(i32);
-
-fn test_clone<T: Clone>(arg: T) {
-    let _ = arg.clone();
-}
-
-fn test_copy<T: Copy>(arg: T) {
-    let _ = arg;
-    let _ = arg;
-}
-
-fn test_copy_clone<T: Copy + Clone>(arg: T) {
-    test_copy(arg);
-    test_clone(arg);
-}
-
-fn foo() { }
-
-fn main() {
-    test_copy_clone(foo);
-    let f: fn() = foo;
-    test_copy_clone(f);
-    // FIXME: add closures when they're considered WF
-    test_copy_clone([1; 56]);
-    test_copy_clone((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1));
-    test_copy_clone((1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, true, 'a', 1.1));
-    test_copy_clone(());
-    test_copy_clone(((1, 1), (1, 1, 1), (1.1, 1, 1, 'a'), ()));
-
-    let a = (
-        (S(1), S(0)),
-        (
-            (S(0), S(0), S(1)),
-            S(0)
-        )
-    );
-    test_copy_clone(a);
-}
diff --git a/src/test/ui/chalkify/inherent_impl.rs b/src/test/ui/chalkify/inherent_impl.rs
deleted file mode 100644
index 44e120c1ee..0000000000
--- a/src/test/ui/chalkify/inherent_impl.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-trait Foo { }
-
-impl Foo for i32 { }
-
-struct S<T: Foo> {
-    x: T,
-}
-
-fn only_foo<T: Foo>(_x: &T) { }
-
-impl<T> S<T> {
-    // Test that we have the correct environment inside an inherent method.
-    fn dummy_foo(&self) {
-        only_foo(&self.x)
-    }
-}
-
-trait Bar { }
-impl Bar for u32 { }
-
-fn only_bar<T: Bar>() { }
-
-impl<T> S<T> {
-    // Test that the environment of `dummy_bar` adds up with the environment
-    // of the inherent impl.
-    fn dummy_bar<U: Bar>(&self) {
-        only_foo(&self.x);
-        only_bar::<U>();
-    }
-}
-
-fn main() {
-    let s = S {
-        x: 5,
-    };
-
-    s.dummy_foo();
-    s.dummy_bar::<u32>();
-}
diff --git a/src/test/ui/chalkify/lower_env1.rs b/src/test/ui/chalkify/lower_env1.rs
deleted file mode 100644
index afb6bddbf2..0000000000
--- a/src/test/ui/chalkify/lower_env1.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#![feature(rustc_attrs)]
-#![allow(dead_code)]
-
-trait Foo { }
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-trait Bar where Self: Foo { }
-
-#[rustc_dump_env_program_clauses] //~ ERROR program clause dump
-fn bar<T: Bar + ?Sized>() {
-}
-
-fn main() {
-}
diff --git a/src/test/ui/chalkify/lower_env1.stderr b/src/test/ui/chalkify/lower_env1.stderr
deleted file mode 100644
index bc426e0707..0000000000
--- a/src/test/ui/chalkify/lower_env1.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_env1.rs:6:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<Self> { FromEnv(Self: Foo) :- FromEnv(Self: Bar). }
-   = note: forall<Self> { Implemented(Self: Bar) :- FromEnv(Self: Bar). }
-   = note: forall<Self> { WellFormed(Self: Bar) :- Implemented(Self: Bar), WellFormed(Self: Foo). }
-
-error: program clause dump
-  --> $DIR/lower_env1.rs:9:1
-   |
-LL | #[rustc_dump_env_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<Self> { FromEnv(Self: Foo) :- FromEnv(Self: Bar). }
-   = note: forall<Self> { Implemented(Self: Bar) :- FromEnv(Self: Bar). }
-   = note: forall<Self> { Implemented(Self: Foo) :- FromEnv(Self: Foo). }
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/chalkify/lower_env2.rs b/src/test/ui/chalkify/lower_env2.rs
deleted file mode 100644
index a067575a9c..0000000000
--- a/src/test/ui/chalkify/lower_env2.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![feature(rustc_attrs)]
-#![allow(dead_code)]
-
-trait Foo { }
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-struct S<'a, T: ?Sized> where T: Foo {
-    data: &'a T,
-}
-
-#[rustc_dump_env_program_clauses] //~ ERROR program clause dump
-fn bar<T: Foo>(_x: S<'_, T>) { // note that we have an implicit `T: Sized` bound
-}
-
-fn main() {
-}
diff --git a/src/test/ui/chalkify/lower_env2.stderr b/src/test/ui/chalkify/lower_env2.stderr
deleted file mode 100644
index 613a568a85..0000000000
--- a/src/test/ui/chalkify/lower_env2.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_env2.rs:6:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<'a, T> { FromEnv(T: Foo) :- FromEnv(S<'a, T>). }
-   = note: forall<'a, T> { TypeOutlives(T: 'a) :- FromEnv(S<'a, T>). }
-   = note: forall<'a, T> { WellFormed(S<'a, T>) :- WellFormed(T: Foo), TypeOutlives(T: 'a). }
-
-error: program clause dump
-  --> $DIR/lower_env2.rs:11:1
-   |
-LL | #[rustc_dump_env_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<'a, T> { FromEnv(T: Foo) :- FromEnv(S<'a, T>). }
-   = note: forall<'a, T> { TypeOutlives(T: 'a) :- FromEnv(S<'a, T>). }
-   = note: forall<Self> { Implemented(Self: Foo) :- FromEnv(Self: Foo). }
-   = note: forall<Self> { Implemented(Self: std::marker::Sized) :- FromEnv(Self: std::marker::Sized). }
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/chalkify/lower_env3.rs b/src/test/ui/chalkify/lower_env3.rs
deleted file mode 100644
index 61ed3cbb27..0000000000
--- a/src/test/ui/chalkify/lower_env3.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-#![feature(rustc_attrs)]
-#![allow(dead_code)]
-
-trait Foo {
-    #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
-    fn foo(&self);
-}
-
-impl<T> Foo for T where T: Clone {
-    #[rustc_dump_env_program_clauses] //~ ERROR program clause dump
-    fn foo(&self) {
-    }
-}
-
-fn main() {
-}
diff --git a/src/test/ui/chalkify/lower_env3.stderr b/src/test/ui/chalkify/lower_env3.stderr
deleted file mode 100644
index a1fc83bfea..0000000000
--- a/src/test/ui/chalkify/lower_env3.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_env3.rs:5:5
-   |
-LL |     #[rustc_dump_env_program_clauses]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<Self> { Implemented(Self: Foo) :- FromEnv(Self: Foo). }
-
-error: program clause dump
-  --> $DIR/lower_env3.rs:10:5
-   |
-LL |     #[rustc_dump_env_program_clauses]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<Self> { FromEnv(Self: std::marker::Sized) :- FromEnv(Self: std::clone::Clone). }
-   = note: forall<Self> { Implemented(Self: std::clone::Clone) :- FromEnv(Self: std::clone::Clone). }
-   = note: forall<Self> { Implemented(Self: std::marker::Sized) :- FromEnv(Self: std::marker::Sized). }
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/chalkify/lower_impl.rs b/src/test/ui/chalkify/lower_impl.rs
deleted file mode 100644
index 1bd44a9f49..0000000000
--- a/src/test/ui/chalkify/lower_impl.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-#![feature(rustc_attrs)]
-
-trait Foo { }
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-impl<T: 'static> Foo for T where T: Iterator<Item = i32> { }
-
-trait Bar {
-    type Assoc;
-}
-
-impl<T> Bar for T where T: Iterator<Item = i32> {
-    #[rustc_dump_program_clauses] //~ ERROR program clause dump
-    type Assoc = Vec<T>;
-}
-
-fn main() {
-    println!("hello");
-}
diff --git a/src/test/ui/chalkify/lower_impl.stderr b/src/test/ui/chalkify/lower_impl.stderr
deleted file mode 100644
index d6827fbff3..0000000000
--- a/src/test/ui/chalkify/lower_impl.stderr
+++ /dev/null
@@ -1,18 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_impl.rs:5:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<T> { Implemented(T: Foo) :- ProjectionEq(<T as std::iter::Iterator>::Item == i32), TypeOutlives(T: 'static), Implemented(T: std::iter::Iterator), Implemented(T: std::marker::Sized). }
-
-error: program clause dump
-  --> $DIR/lower_impl.rs:13:5
-   |
-LL |     #[rustc_dump_program_clauses]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<T> { Normalize(<T as Bar>::Assoc -> std::vec::Vec<T>) :- Implemented(T: Bar). }
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/chalkify/lower_struct.rs b/src/test/ui/chalkify/lower_struct.rs
deleted file mode 100644
index aecccea5c1..0000000000
--- a/src/test/ui/chalkify/lower_struct.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(rustc_attrs)]
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-struct Foo<'a, T> where Box<T>: Clone {
-    _x: std::marker::PhantomData<&'a T>,
-}
-
-fn main() { }
diff --git a/src/test/ui/chalkify/lower_struct.stderr b/src/test/ui/chalkify/lower_struct.stderr
deleted file mode 100644
index 0331c2fca1..0000000000
--- a/src/test/ui/chalkify/lower_struct.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_struct.rs:3:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<'a, T> { FromEnv(T: std::marker::Sized) :- FromEnv(Foo<'a, T>). }
-   = note: forall<'a, T> { FromEnv(std::boxed::Box<T>: std::clone::Clone) :- FromEnv(Foo<'a, T>). }
-   = note: forall<'a, T> { TypeOutlives(T: 'a) :- FromEnv(Foo<'a, T>). }
-   = note: forall<'a, T> { WellFormed(Foo<'a, T>) :- WellFormed(T: std::marker::Sized), WellFormed(std::boxed::Box<T>: std::clone::Clone), TypeOutlives(T: 'a). }
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/chalkify/lower_trait.rs b/src/test/ui/chalkify/lower_trait.rs
deleted file mode 100644
index 0e1956022f..0000000000
--- a/src/test/ui/chalkify/lower_trait.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![feature(rustc_attrs)]
-
-trait Bar { }
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-trait Foo<S, T: ?Sized> {
-    #[rustc_dump_program_clauses] //~ ERROR program clause dump
-    type Assoc: Bar + ?Sized;
-}
-
-fn main() {
-    println!("hello");
-}
diff --git a/src/test/ui/chalkify/lower_trait.stderr b/src/test/ui/chalkify/lower_trait.stderr
deleted file mode 100644
index ed3bded398..0000000000
--- a/src/test/ui/chalkify/lower_trait.stderr
+++ /dev/null
@@ -1,24 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_trait.rs:5:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<Self, S, T> { FromEnv(<Self as Foo<S, T>>::Assoc: Bar) :- FromEnv(Self: Foo<S, T>). }
-   = note: forall<Self, S, T> { FromEnv(S: std::marker::Sized) :- FromEnv(Self: Foo<S, T>). }
-   = note: forall<Self, S, T> { Implemented(Self: Foo<S, T>) :- FromEnv(Self: Foo<S, T>). }
-   = note: forall<Self, S, T> { WellFormed(Self: Foo<S, T>) :- Implemented(Self: Foo<S, T>), WellFormed(S: std::marker::Sized), WellFormed(<Self as Foo<S, T>>::Assoc: Bar). }
-
-error: program clause dump
-  --> $DIR/lower_trait.rs:7:5
-   |
-LL |     #[rustc_dump_program_clauses]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<Self, S, T, ^3> { ProjectionEq(<Self as Foo<S, T>>::Assoc == ^3) :- Normalize(<Self as Foo<S, T>>::Assoc -> ^3). }
-   = note: forall<Self, S, T> { FromEnv(Self: Foo<S, T>) :- FromEnv(Unnormalized(<Self as Foo<S, T>>::Assoc)). }
-   = note: forall<Self, S, T> { ProjectionEq(<Self as Foo<S, T>>::Assoc == Unnormalized(<Self as Foo<S, T>>::Assoc)). }
-   = note: forall<Self, S, T> { WellFormed(Unnormalized(<Self as Foo<S, T>>::Assoc)) :- WellFormed(Self: Foo<S, T>). }
-
-error: aborting due to 2 previous errors
-
diff --git a/src/test/ui/chalkify/lower_trait_higher_rank.rs b/src/test/ui/chalkify/lower_trait_higher_rank.rs
deleted file mode 100644
index 715f09632b..0000000000
--- a/src/test/ui/chalkify/lower_trait_higher_rank.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![feature(rustc_attrs)]
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-trait Foo<F: ?Sized> where for<'a> F: Fn(&'a (u8, u16)) -> &'a u8
-{
-}
-
-fn main() {
-    println!("hello");
-}
diff --git a/src/test/ui/chalkify/lower_trait_higher_rank.stderr b/src/test/ui/chalkify/lower_trait_higher_rank.stderr
deleted file mode 100644
index 79bbc9fa6b..0000000000
--- a/src/test/ui/chalkify/lower_trait_higher_rank.stderr
+++ /dev/null
@@ -1,13 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_trait_higher_rank.rs:3:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<'a, Self, F> { FromEnv(F: std::ops::Fn<(&'a (u8, u16),)>) :- FromEnv(Self: Foo<F>). }
-   = note: forall<'a, Self, F> { ProjectionEq(<F as std::ops::FnOnce<(&'a (u8, u16),)>>::Output == &'a u8) :- FromEnv(Self: Foo<F>). }
-   = note: forall<Self, F> { Implemented(Self: Foo<F>) :- FromEnv(Self: Foo<F>). }
-   = note: forall<Self, F> { WellFormed(Self: Foo<F>) :- Implemented(Self: Foo<F>), forall<'a> { WellFormed(F: std::ops::Fn<(&'a (u8, u16),)>) }, forall<'a> { ProjectionEq(<F as std::ops::FnOnce<(&'a (u8, u16),)>>::Output == &'a u8) }. }
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/chalkify/lower_trait_where_clause.rs b/src/test/ui/chalkify/lower_trait_where_clause.rs
deleted file mode 100644
index 78fa39f1dc..0000000000
--- a/src/test/ui/chalkify/lower_trait_where_clause.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-#![feature(rustc_attrs)]
-
-use std::borrow::Borrow;
-
-#[rustc_dump_program_clauses] //~ ERROR program clause dump
-trait Foo<'a, 'b, T, U>
-where
-    T: Borrow<U> + ?Sized,
-    U: ?Sized + 'b,
-    'a: 'b,
-    Box<T>:, // NOTE(#53696) this checks an empty list of bounds.
-{
-}
-
-fn main() {
-    println!("hello");
-}
diff --git a/src/test/ui/chalkify/lower_trait_where_clause.stderr b/src/test/ui/chalkify/lower_trait_where_clause.stderr
deleted file mode 100644
index 408f3712a7..0000000000
--- a/src/test/ui/chalkify/lower_trait_where_clause.stderr
+++ /dev/null
@@ -1,15 +0,0 @@
-error: program clause dump
-  --> $DIR/lower_trait_where_clause.rs:5:1
-   |
-LL | #[rustc_dump_program_clauses]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: forall<'a, 'b, Self, T, U> { FromEnv(T: std::borrow::Borrow<U>) :- FromEnv(Self: Foo<'a, 'b, T, U>). }
-   = note: forall<'a, 'b, Self, T, U> { Implemented(Self: Foo<'a, 'b, T, U>) :- FromEnv(Self: Foo<'a, 'b, T, U>). }
-   = note: forall<'a, 'b, Self, T, U> { RegionOutlives('a: 'b) :- FromEnv(Self: Foo<'a, 'b, T, U>). }
-   = note: forall<'a, 'b, Self, T, U> { TypeOutlives(U: 'b) :- FromEnv(Self: Foo<'a, 'b, T, U>). }
-   = note: forall<'a, 'b, Self, T, U> { TypeOutlives(std::boxed::Box<T>: '<empty>) :- FromEnv(Self: Foo<'a, 'b, T, U>). }
-   = note: forall<'a, 'b, Self, T, U> { WellFormed(Self: Foo<'a, 'b, T, U>) :- Implemented(Self: Foo<'a, 'b, T, U>), WellFormed(T: std::borrow::Borrow<U>), TypeOutlives(U: 'b), RegionOutlives('a: 'b), TypeOutlives(std::boxed::Box<T>: '<empty>). }
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/chalkify/projection.rs b/src/test/ui/chalkify/projection.rs
deleted file mode 100644
index d6a8dd7a4a..0000000000
--- a/src/test/ui/chalkify/projection.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-trait Foo { }
-
-trait Bar {
-    type Item: Foo;
-}
-
-impl Foo for i32 { }
-impl Bar for i32 {
-    type Item = i32;
-}
-
-fn only_foo<T: Foo>() { }
-
-fn only_bar<T: Bar>() {
-    // `T` implements `Bar` hence `<T as Bar>::Item` must also implement `Bar`
-    only_foo::<T::Item>()
-}
-
-fn main() {
-    only_bar::<i32>();
-    only_foo::<<i32 as Bar>::Item>();
-}
diff --git a/src/test/ui/chalkify/super_trait.rs b/src/test/ui/chalkify/super_trait.rs
deleted file mode 100644
index eeff9fd9b8..0000000000
--- a/src/test/ui/chalkify/super_trait.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-trait Foo { }
-trait Bar: Foo { }
-
-impl Foo for i32 { }
-impl Bar for i32 { }
-
-fn only_foo<T: Foo>() { }
-
-fn only_bar<T: Bar>() {
-    // `T` implements `Bar` hence `T` must also implement `Foo`
-    only_foo::<T>()
-}
-
-fn main() {
-    only_bar::<i32>()
-}
diff --git a/src/test/ui/chalkify/trait_implied_bound.rs b/src/test/ui/chalkify/trait_implied_bound.rs
deleted file mode 100644
index 8a2e1cf599..0000000000
--- a/src/test/ui/chalkify/trait_implied_bound.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-trait Foo { }
-trait Bar<U> where U: Foo { }
-
-impl Foo for i32 { }
-impl Bar<i32> for i32 { }
-
-fn only_foo<T: Foo>() { }
-
-fn only_bar<U, T: Bar<U>>() {
-    only_foo::<U>()
-}
-
-fn main() {
-    only_bar::<i32, i32>()
-}
diff --git a/src/test/ui/chalkify/type_implied_bound.rs b/src/test/ui/chalkify/type_implied_bound.rs
deleted file mode 100644
index 8673f5319b..0000000000
--- a/src/test/ui/chalkify/type_implied_bound.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-trait Eq { }
-trait Hash: Eq { }
-
-impl Eq for i32 { }
-impl Hash for i32 { }
-
-struct Set<T: Hash> {
-    _x: T,
-}
-
-fn only_eq<T: Eq>() { }
-
-fn take_a_set<T>(_: &Set<T>) {
-    // `Set<T>` is an input type of `take_a_set`, hence we know that
-    // `T` must implement `Hash`, and we know in turn that `T` must
-    // implement `Eq`.
-    only_eq::<T>()
-}
-
-fn main() {
-    let set = Set {
-        _x: 5,
-    };
-
-    take_a_set(&set);
-}
diff --git a/src/test/ui/chalkify/type_inference.rs b/src/test/ui/chalkify/type_inference.rs
deleted file mode 100644
index 62a53ec031..0000000000
--- a/src/test/ui/chalkify/type_inference.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-// compile-flags: -Z chalk
-
-trait Foo { }
-impl Foo for i32 { }
-
-trait Bar { }
-impl Bar for i32 { }
-impl Bar for u32 { }
-
-fn only_foo<T: Foo>(_x: T) { }
-
-fn only_bar<T: Bar>(_x: T) { }
-
-fn main() {
-    let x = 5.0;
-
-    // The only type which implements `Foo` is `i32`, so the chalk trait solver
-    // is expecting a variable of type `i32`. This behavior differs from the
-    // old-style trait solver. I guess this will change, that's why I'm
-    // adding that test.
-    only_foo(x); //~ ERROR mismatched types
-
-    // Here we have two solutions so we get back the behavior of the old-style
-    // trait solver.
-    only_bar(x); //~ ERROR the trait bound `{float}: Bar` is not satisfied
-}
diff --git a/src/test/ui/chalkify/type_inference.stderr b/src/test/ui/chalkify/type_inference.stderr
deleted file mode 100644
index b8152caf3d..0000000000
--- a/src/test/ui/chalkify/type_inference.stderr
+++ /dev/null
@@ -1,23 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/type_inference.rs:21:14
-   |
-LL |     only_foo(x);
-   |              ^ expected `i32`, found floating-point number
-
-error[E0277]: the trait bound `{float}: Bar` is not satisfied
-  --> $DIR/type_inference.rs:25:5
-   |
-LL | fn only_bar<T: Bar>(_x: T) { }
-   |    --------    --- required by this bound in `only_bar`
-...
-LL |     only_bar(x);
-   |     ^^^^^^^^ the trait `Bar` is not implemented for `{float}`
-   |
-   = help: the following implementations were found:
-             <i32 as Bar>
-             <u32 as Bar>
-
-error: aborting due to 2 previous errors
-
-Some errors have detailed explanations: E0277, E0308.
-For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/check-static-immutable-mut-slices.stderr b/src/test/ui/check-static-immutable-mut-slices.stderr
index 39da824ede..66fe8646e1 100644
--- a/src/test/ui/check-static-immutable-mut-slices.stderr
+++ b/src/test/ui/check-static-immutable-mut-slices.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static TEST: &'static mut [isize] = &mut [];
    |                                     ^^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr
index 3c8f637e13..b4135af7d7 100644
--- a/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr
+++ b/src/test/ui/closures/closure-bounds-cant-promote-superkind-in-struct.stderr
@@ -1,19 +1,18 @@
 error[E0277]: `F` cannot be sent between threads safely
-  --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:5:1
+  --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:5:22
    |
-LL |   struct X<F> where F: FnOnce() + 'static + Send {
-   |   ---------------------------------------------- required by `X`
+LL | struct X<F> where F: FnOnce() + 'static + Send {
+   | ---------------------------------------------- required by `X`
 ...
-LL |   fn foo<F>(blk: F) -> X<F> where F: FnOnce() + 'static {
-   |   ^                                                    - help: consider further restricting type parameter `F`: `, F: std::marker::Send`
-   |  _|
-   | |
-LL | |
-LL | |     return X { field: blk };
-LL | | }
-   | |_^ `F` cannot be sent between threads safely
+LL | fn foo<F>(blk: F) -> X<F> where F: FnOnce() + 'static {
+   |                      ^^^^ `F` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `F`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/closure-bounds-cant-promote-superkind-in-struct.rs:5:33
+   |
+LL | fn foo<F>(blk: F) -> X<F> where F: FnOnce() + 'static {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/closure-bounds-subtype.stderr b/src/test/ui/closures/closure-bounds-subtype.stderr
index 05d5bb1e8d..47504de814 100644
--- a/src/test/ui/closures/closure-bounds-subtype.stderr
+++ b/src/test/ui/closures/closure-bounds-subtype.stderr
@@ -4,13 +4,15 @@ error[E0277]: `F` cannot be shared between threads safely
 LL | fn take_const_owned<F>(_: F) where F: FnOnce() + Sync + Send {
    |    ----------------                              ---- required by this bound in `take_const_owned`
 ...
-LL | fn give_owned<F>(f: F) where F: FnOnce() + Send {
-   |                                                - help: consider further restricting type parameter `F`: `, F: std::marker::Sync`
-LL |     take_any(f);
 LL |     take_const_owned(f);
    |                      ^ `F` cannot be shared between threads safely
    |
    = help: the trait `std::marker::Sync` is not implemented for `F`
+help: consider further restricting this bound with `+ std::marker::Sync`
+  --> $DIR/closure-bounds-subtype.rs:11:30
+   |
+LL | fn give_owned<F>(f: F) where F: FnOnce() + Send {
+   |                              ^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr
index f816f27a89..d7d716ed4c 100644
--- a/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr
+++ b/src/test/ui/closures/closure-expected-type/expect-region-supply-region.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/expect-region-supply-region.rs:18:9
    |
 LL |     let mut f: Option<&u32> = None;
-   |         ----- `f` is declared here, outside of the closure body
+   |         ----- `f` declared here, outside of the closure body
 LL |     closure_expecting_bound(|x| {
    |                              - `x` is a reference that is only valid in the closure body
 LL |         f = Some(x);
@@ -12,7 +12,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/expect-region-supply-region.rs:28:9
    |
 LL |     let mut f: Option<&u32> = None;
-   |         ----- `f` is declared here, outside of the closure body
+   |         ----- `f` declared here, outside of the closure body
 LL |     closure_expecting_bound(|x: &u32| {
    |                              - `x` is a reference that is only valid in the closure body
 LL |         f = Some(x);
diff --git a/src/test/ui/closures/deeply-nested_closures.rs b/src/test/ui/closures/deeply-nested_closures.rs
new file mode 100644
index 0000000000..a02684ee1d
--- /dev/null
+++ b/src/test/ui/closures/deeply-nested_closures.rs
@@ -0,0 +1,23 @@
+// Check that this can be compiled in a reasonable time.
+
+// build-pass
+
+fn main() {
+    // 96 nested closures
+    let x = ();
+    || || || || || || || ||
+    || || || || || || || ||
+    || || || || || || || ||
+    || || || || || || || ||
+
+    || || || || || || || ||
+    || || || || || || || ||
+    || || || || || || || ||
+    || || || || || || || ||
+
+    || || || || || || || ||
+    || || || || || || || ||
+    || || || || || || || ||
+    || || || || || || || ||
+    [&(), &x];
+}
diff --git a/src/test/ui/closures/issue-52437.stderr b/src/test/ui/closures/issue-52437.stderr
index 4d13a80e4c..b9225e55fe 100644
--- a/src/test/ui/closures/issue-52437.stderr
+++ b/src/test/ui/closures/issue-52437.stderr
@@ -10,7 +10,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     [(); &(&'static: loop { |x| {}; }) as *const _ as usize]
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0282]: type annotations needed
diff --git a/src/test/ui/closures/issue-67123.stderr b/src/test/ui/closures/issue-67123.stderr
index b2e875b801..f14478d727 100644
--- a/src/test/ui/closures/issue-67123.stderr
+++ b/src/test/ui/closures/issue-67123.stderr
@@ -1,13 +1,16 @@
 error[E0382]: use of moved value: `t`
   --> $DIR/issue-67123.rs:2:13
    |
-LL | fn foo<T>(t: T) {
-   |        - help: consider restricting this bound: `T: Copy`
 LL |     || { t; t; };
    |          -  ^ value used here after move
    |          |
    |          value moved here
    |
+help: consider restricting this type parameter with `T: Copy`
+  --> $DIR/issue-67123.rs:1:8
+   |
+LL | fn foo<T>(t: T) {
+   |        ^
    = note: move occurs because `t` has type `T`, which does not implement the `Copy` trait
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr
index 17d4df2a22..96d7b07b0e 100644
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ b/src/test/ui/codemap_tests/bad-format-args.stderr
@@ -4,7 +4,7 @@ error: requires at least a format string argument
 LL |     format!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected token: `,`
   --> $DIR/bad-format-args.rs:3:16
diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/src/test/ui/codemap_tests/issue-28308.stderr
index d44c157003..f8820b9efe 100644
--- a/src/test/ui/codemap_tests/issue-28308.stderr
+++ b/src/test/ui/codemap_tests/issue-28308.stderr
@@ -3,6 +3,8 @@ error[E0600]: cannot apply unary operator `!` to type `&'static str`
    |
 LL |     assert!("foo");
    |     ^^^^^^^^^^^^^^^ cannot apply unary operator `!`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs
index 66d0958e4c..b4f5f9ef56 100644
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs
+++ b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.rs
@@ -1,6 +1,7 @@
 #![feature(optin_builtin_traits)]
-#![feature(overlapping_marker_traits)]
+#![feature(marker_trait_attr)]
 
+#[marker]
 trait MyTrait {}
 
 struct TestType<T>(::std::marker::PhantomData<T>);
@@ -8,11 +9,11 @@ struct TestType<T>(::std::marker::PhantomData<T>);
 unsafe impl<T: MyTrait+'static> Send for TestType<T> {}
 
 impl<T: MyTrait> !Send for TestType<T> {}
-//~^ ERROR E0119
+//~^ ERROR conflicting implementations
 
 unsafe impl<T:'static> Send for TestType<T> {}
+//~^ ERROR conflicting implementations
 
 impl !Send for TestType<i32> {}
-//~^ ERROR E0119
 
 fn main() {}
diff --git a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
index 0a8bbc4bc5..25d3d3ee99 100644
--- a/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
+++ b/src/test/ui/coherence/coherence-conflicting-negative-trait-impl.stderr
@@ -1,5 +1,5 @@
 error[E0119]: conflicting implementations of trait `std::marker::Send` for type `TestType<_>`:
-  --> $DIR/coherence-conflicting-negative-trait-impl.rs:10:1
+  --> $DIR/coherence-conflicting-negative-trait-impl.rs:11:1
    |
 LL | unsafe impl<T: MyTrait+'static> Send for TestType<T> {}
    | ---------------------------------------------------- first implementation here
@@ -7,14 +7,14 @@ LL |
 LL | impl<T: MyTrait> !Send for TestType<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<_>`
 
-error[E0119]: conflicting implementations of trait `std::marker::Send` for type `TestType<i32>`:
-  --> $DIR/coherence-conflicting-negative-trait-impl.rs:15:1
+error[E0119]: conflicting implementations of trait `std::marker::Send` for type `TestType<_>`:
+  --> $DIR/coherence-conflicting-negative-trait-impl.rs:14:1
    |
+LL | unsafe impl<T: MyTrait+'static> Send for TestType<T> {}
+   | ---------------------------------------------------- first implementation here
+...
 LL | unsafe impl<T:'static> Send for TestType<T> {}
-   | ------------------------------------------- first implementation here
-LL | 
-LL | impl !Send for TestType<i32> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<i32>`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `TestType<_>`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
index ed6be60de4..85ed360a1f 100644
--- a/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
+++ b/src/test/ui/coherence/coherence-impl-trait-for-trait-object-safe.stderr
@@ -2,9 +2,13 @@ error[E0038]: the trait `NotObjectSafe` cannot be made into an object
   --> $DIR/coherence-impl-trait-for-trait-object-safe.rs:7:6
    |
 LL | trait NotObjectSafe { fn eq(&self, other: Self); }
-   |                          -- method `eq` references the `Self` type in its parameters or return type
+   |       -------------                       ---- ...because method `eq` references the `Self` type in this parameter
+   |       |
+   |       this trait cannot be made into an object...
 LL | impl NotObjectSafe for dyn NotObjectSafe { }
    |      ^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
+   |
+   = help: consider moving `eq` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-impls-send.rs b/src/test/ui/coherence/coherence-impls-send.rs
index b2a9c5be65..7898dc9831 100644
--- a/src/test/ui/coherence/coherence-impls-send.rs
+++ b/src/test/ui/coherence/coherence-impls-send.rs
@@ -1,5 +1,4 @@
 #![feature(optin_builtin_traits)]
-#![feature(overlapping_marker_traits)]
 
 use std::marker::Copy;
 
@@ -24,7 +23,8 @@ unsafe impl Send for [MyType] {}
 //~^ ERROR E0117
 
 unsafe impl Send for &'static [NotSync] {}
-//~^ ERROR E0117
+//~^ ERROR conflicting implementations of trait
+//~| ERROR only traits defined in the current crate
 
 fn main() {
 }
diff --git a/src/test/ui/coherence/coherence-impls-send.stderr b/src/test/ui/coherence/coherence-impls-send.stderr
index a5b3c7657b..dbfc968332 100644
--- a/src/test/ui/coherence/coherence-impls-send.stderr
+++ b/src/test/ui/coherence/coherence-impls-send.stderr
@@ -1,5 +1,16 @@
+error[E0119]: conflicting implementations of trait `std::marker::Send` for type `&[NotSync]`:
+  --> $DIR/coherence-impls-send.rs:25:1
+   |
+LL | unsafe impl Send for &'static [NotSync] {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: conflicting implementation in crate `core`:
+           - impl<T> std::marker::Send for &T
+             where T: std::marker::Sync, T: ?Sized;
+   = note: upstream crates may add a new impl of trait `std::marker::Sync` for type `[NotSync]` in future versions
+
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/coherence-impls-send.rs:17:1
+  --> $DIR/coherence-impls-send.rs:16:1
    |
 LL | unsafe impl Send for (MyType, MyType) {}
    | ^^^^^^^^^^^^^^^^^^^^^----------------
@@ -10,13 +21,13 @@ LL | unsafe impl Send for (MyType, MyType) {}
    = note: define and implement a trait or new type instead
 
 error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static NotSync`
-  --> $DIR/coherence-impls-send.rs:20:1
+  --> $DIR/coherence-impls-send.rs:19:1
    |
 LL | unsafe impl Send for &'static NotSync {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/coherence-impls-send.rs:23:1
+  --> $DIR/coherence-impls-send.rs:22:1
    |
 LL | unsafe impl Send for [MyType] {}
    | ^^^^^^^^^^^^^^^^^^^^^--------
@@ -27,7 +38,7 @@ LL | unsafe impl Send for [MyType] {}
    = note: define and implement a trait or new type instead
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
-  --> $DIR/coherence-impls-send.rs:26:1
+  --> $DIR/coherence-impls-send.rs:25:1
    |
 LL | unsafe impl Send for &'static [NotSync] {}
    | ^^^^^^^^^^^^^^^^^^^^^------------------
@@ -37,7 +48,7 @@ LL | unsafe impl Send for &'static [NotSync] {}
    |
    = note: define and implement a trait or new type instead
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0117, E0321.
+Some errors have detailed explanations: E0117, E0119, E0321.
 For more information about an error, try `rustc --explain E0117`.
diff --git a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
index e5cc298a43..71f997c54c 100644
--- a/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
+++ b/src/test/ui/coherence/coherence-inherited-assoc-ty-cycle-err.stderr
@@ -1,10 +1,10 @@
-error[E0391]: cycle detected when processing `Trait`
+error[E0391]: cycle detected when building specialization graph of trait `Trait`
   --> $DIR/coherence-inherited-assoc-ty-cycle-err.rs:8:1
    |
 LL | trait Trait<T> { type Assoc; }
    | ^^^^^^^^^^^^^^
    |
-   = note: ...which again requires processing `Trait`, completing the cycle
+   = note: ...which again requires building specialization graph of trait `Trait`, completing the cycle
 note: cycle used when coherence checking all impls of trait `Trait`
   --> $DIR/coherence-inherited-assoc-ty-cycle-err.rs:8:1
    |
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr b/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr
new file mode 100644
index 0000000000..6ea0b89be7
--- /dev/null
+++ b/src/test/ui/coherence/coherence-inherited-subtyping.old.stderr
@@ -0,0 +1,14 @@
+error[E0592]: duplicate definitions with name `method1`
+  --> $DIR/coherence-inherited-subtyping.rs:14:5
+   |
+LL |     fn method1(&self) {}
+   |     ^^^^^^^^^^^^^^^^^^^^ duplicate definitions for `method1`
+...
+LL |     fn method1(&self) {}
+   |     -------------------- other definition for `method1`
+   |
+   = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr b/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr
new file mode 100644
index 0000000000..6ea0b89be7
--- /dev/null
+++ b/src/test/ui/coherence/coherence-inherited-subtyping.re.stderr
@@ -0,0 +1,14 @@
+error[E0592]: duplicate definitions with name `method1`
+  --> $DIR/coherence-inherited-subtyping.rs:14:5
+   |
+LL |     fn method1(&self) {}
+   |     ^^^^^^^^^^^^^^^^^^^^ duplicate definitions for `method1`
+...
+LL |     fn method1(&self) {}
+   |     -------------------- other definition for `method1`
+   |
+   = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0592`.
diff --git a/src/test/ui/coherence/coherence-inherited-subtyping.rs b/src/test/ui/coherence/coherence-inherited-subtyping.rs
new file mode 100644
index 0000000000..8587eb7795
--- /dev/null
+++ b/src/test/ui/coherence/coherence-inherited-subtyping.rs
@@ -0,0 +1,21 @@
+// Test that two distinct impls which match subtypes of one another
+// yield coherence errors (or not) depending on the variance.
+//
+// Note: This scenario is currently accepted, but as part of the
+// universe transition (#56105) may eventually become an error.
+
+// revisions: old re
+
+struct Foo<T> {
+    t: T,
+}
+
+impl Foo<for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8> {
+    fn method1(&self) {} //~ ERROR duplicate definitions with name `method1`
+}
+
+impl Foo<for<'a> fn(&'a u8, &'a u8) -> &'a u8> {
+    fn method1(&self) {}
+}
+
+fn main() {}
diff --git a/src/test/ui/coherence/coherence-negative-impls-safe.stderr b/src/test/ui/coherence/coherence-negative-impls-safe.stderr
index c47c9d25e3..4db66af678 100644
--- a/src/test/ui/coherence/coherence-negative-impls-safe.stderr
+++ b/src/test/ui/coherence/coherence-negative-impls-safe.stderr
@@ -2,7 +2,9 @@ error[E0198]: negative impls cannot be unsafe
   --> $DIR/coherence-negative-impls-safe.rs:7:1
    |
 LL | unsafe impl !Send for TestType {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ------^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | unsafe because of this
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/coherence/coherence-subtyping.old.stderr b/src/test/ui/coherence/coherence-subtyping.old.stderr
new file mode 100644
index 0000000000..76f5cc1b78
--- /dev/null
+++ b/src/test/ui/coherence/coherence-subtyping.old.stderr
@@ -0,0 +1,14 @@
+warning: conflicting implementations of trait `TheTrait` for type `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`:
+  --> $DIR/coherence-subtyping.rs:16:1
+   |
+LL | impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {}
+   | ---------------------------------------------------------- first implementation here
+LL | 
+LL | impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
+   |
+   = note: `#[warn(coherence_leak_check)]` on by default
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
+   = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
+
diff --git a/src/test/ui/coherence/coherence-subtyping.re.stderr b/src/test/ui/coherence/coherence-subtyping.re.stderr
new file mode 100644
index 0000000000..76f5cc1b78
--- /dev/null
+++ b/src/test/ui/coherence/coherence-subtyping.re.stderr
@@ -0,0 +1,14 @@
+warning: conflicting implementations of trait `TheTrait` for type `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`:
+  --> $DIR/coherence-subtyping.rs:16:1
+   |
+LL | impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {}
+   | ---------------------------------------------------------- first implementation here
+LL | 
+LL | impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
+   |
+   = note: `#[warn(coherence_leak_check)]` on by default
+   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
+   = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
+
diff --git a/src/test/ui/coherence/coherence-subtyping.rs b/src/test/ui/coherence/coherence-subtyping.rs
index a742bf2884..f5c1d92411 100644
--- a/src/test/ui/coherence/coherence-subtyping.rs
+++ b/src/test/ui/coherence/coherence-subtyping.rs
@@ -5,16 +5,19 @@
 // universe transition (#56105) may eventually become an error.
 
 // revisions: old re
-// build-pass (FIXME(62277): could be check-pass?)
+// check-pass
 
 trait TheTrait {
-    fn foo(&self) { }
+    fn foo(&self) {}
 }
 
-impl TheTrait for for<'a,'b> fn(&'a u8, &'b u8) -> &'a u8 {
-}
+impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {}
 
 impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
+    //[re]~^ WARNING conflicting implementation
+    //[re]~^^ WARNING this was previously accepted by the compiler but is being phased out
+    //[old]~^^^ WARNING conflicting implementation
+    //[old]~^^^^ WARNING this was previously accepted by the compiler but is being phased out
 }
 
-fn main() { }
+fn main() {}
diff --git a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr b/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
index 7b77701ee1..4997ca4db2 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-crate-2.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[no_core]` attribute is an experimental feature
 LL | #![cfg_attr(broken, no_core)]
    |                     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29639
+   = note: see issue #29639 <https://github.com/rust-lang/rust/issues/29639> for more information
    = help: add `#![feature(no_core)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr b/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
index 046defd556..67cb6530e3 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
@@ -4,7 +4,7 @@ error: unused attribute
 LL | #[cfg_attr(FALSE,)]
    | ^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cfg-attr-empty-is-unused.rs:5:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
index ab7e1eb960..c8762d15d9 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-1.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[no_core]` attribute is an experimental feature
 LL | #![cfg_attr(broken, no_core, no_std)]
    |                     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29639
+   = note: see issue #29639 <https://github.com/rust-lang/rust/issues/29639> for more information
    = help: add `#![feature(no_core)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
index 8126affbd3..e75b1c5b4c 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-invalid-2.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[no_core]` attribute is an experimental feature
 LL | #![cfg_attr(broken, no_std, no_core)]
    |                             ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29639
+   = note: see issue #29639 <https://github.com/rust-lang/rust/issues/29639> for more information
    = help: add `#![feature(no_core)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
index f55671f6bb..d2c613845a 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
@@ -30,7 +30,7 @@ warning: unused `MustUseDeprecated` that must be used
 LL |     MustUseDeprecated::new();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cfg-attr-multi-true.rs:7:9
    |
 LL | #![warn(unused_must_use)]
diff --git a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr b/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
index 5bfe9e902d..44063dd1d6 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-syntax-validation.stderr
@@ -60,6 +60,8 @@ LL |         #[cfg(feature = $expr)]
 ...
 LL | generate_s10!(concat!("nonexistent"));
    | -------------------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 10 previous errors
 
diff --git a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
index ef434ec826..330ce2bd2e 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr
@@ -6,6 +6,8 @@ LL |         #[cfg_attr(all(), unknown)]
 ...
 LL | foo!();
    | ------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.rs b/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.rs
index 7fa059583f..8397d204f3 100644
--- a/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.rs
+++ b/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.rs
@@ -6,7 +6,6 @@ pub fn no_debug() {
 pub fn no_hash() {
     use std::collections::HashSet;
     let mut set = HashSet::new();
-    //~^ ERROR arrays only have std trait implementations for lengths 0..=32
     set.insert([0_usize; 33]);
     //~^ ERROR arrays only have std trait implementations for lengths 0..=32
 }
diff --git a/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.stderr b/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.stderr
index d885c98dcb..c03377d74e 100644
--- a/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.stderr
+++ b/src/test/ui/const-generics/array-impls/core-traits-no-impls-length-33.stderr
@@ -6,46 +6,34 @@ LL |     println!("{:?}", [0_usize; 33]);
    |
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `[usize; 33]`
    = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/core-traits-no-impls-length-33.rs:10:16
+  --> $DIR/core-traits-no-impls-length-33.rs:9:16
    |
 LL |     set.insert([0_usize; 33]);
    |                ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[usize; 33]`
    |
    = note: required because of the requirements on the impl of `std::cmp::Eq` for `[usize; 33]`
 
-error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/core-traits-no-impls-length-33.rs:8:19
-   |
-LL |     let mut set = HashSet::new();
-   |                   ^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[usize; 33]`
-   |
-   = note: required because of the requirements on the impl of `std::cmp::Eq` for `[usize; 33]`
-   = note: required by `std::collections::HashSet::<T>::new`
-
 error[E0369]: binary operation `==` cannot be applied to type `[usize; 33]`
-  --> $DIR/core-traits-no-impls-length-33.rs:15:19
+  --> $DIR/core-traits-no-impls-length-33.rs:14:19
    |
 LL |     [0_usize; 33] == [1_usize; 33]
    |     ------------- ^^ ------------- [usize; 33]
    |     |
    |     [usize; 33]
-   |
-   = note: an implementation of `std::cmp::PartialEq` might be missing for `[usize; 33]`
 
 error[E0369]: binary operation `<` cannot be applied to type `[usize; 33]`
-  --> $DIR/core-traits-no-impls-length-33.rs:20:19
+  --> $DIR/core-traits-no-impls-length-33.rs:19:19
    |
 LL |     [0_usize; 33] < [1_usize; 33]
    |     ------------- ^ ------------- [usize; 33]
    |     |
    |     [usize; 33]
-   |
-   = note: an implementation of `std::cmp::PartialOrd` might be missing for `[usize; 33]`
 
 error[E0277]: the trait bound `&[usize; 33]: std::iter::IntoIterator` is not satisfied
-  --> $DIR/core-traits-no-impls-length-33.rs:25:14
+  --> $DIR/core-traits-no-impls-length-33.rs:24:14
    |
 LL |     for _ in &[0_usize; 33] {
    |              ^^^^^^^^^^^^^^ the trait `std::iter::IntoIterator` is not implemented for `&[usize; 33]`
@@ -57,7 +45,7 @@ LL |     for _ in &[0_usize; 33] {
              <&'a mut [T] as std::iter::IntoIterator>
    = note: required by `std::iter::IntoIterator::into_iter`
 
-error: aborting due to 6 previous errors
+error: aborting due to 5 previous errors
 
 Some errors have detailed explanations: E0277, E0369.
 For more information about an error, try `rustc --explain E0277`.
diff --git a/src/test/ui/const-generics/array-impls/into-iter-no-impls-length-33.stderr b/src/test/ui/const-generics/array-impls/into-iter-no-impls-length-33.stderr
index 4869f48363..b39a160b52 100644
--- a/src/test/ui/const-generics/array-impls/into-iter-no-impls-length-33.stderr
+++ b/src/test/ui/const-generics/array-impls/into-iter-no-impls-length-33.stderr
@@ -1,8 +1,8 @@
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:12:5
+  --> $DIR/into-iter-no-impls-length-33.rs:12:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
@@ -19,10 +19,10 @@ LL |     IntoIter::new([0i32; 33])
    = note: the return type of a function must have a statically known size
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:18:5
+  --> $DIR/into-iter-no-impls-length-33.rs:18:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
@@ -39,10 +39,10 @@ LL |     IntoIter::new([0i32; 33])
    = note: the return type of a function must have a statically known size
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:24:5
+  --> $DIR/into-iter-no-impls-length-33.rs:24:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
@@ -59,10 +59,10 @@ LL |     IntoIter::new([0i32; 33])
    = note: the return type of a function must have a statically known size
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:30:5
+  --> $DIR/into-iter-no-impls-length-33.rs:30:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
@@ -79,10 +79,10 @@ LL |     IntoIter::new([0i32; 33])
    = note: the return type of a function must have a statically known size
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:36:5
+  --> $DIR/into-iter-no-impls-length-33.rs:36:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
@@ -99,10 +99,10 @@ LL |     IntoIter::new([0i32; 33])
    = note: the return type of a function must have a statically known size
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:42:5
+  --> $DIR/into-iter-no-impls-length-33.rs:42:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
@@ -119,10 +119,10 @@ LL |     IntoIter::new([0i32; 33])
    = note: the return type of a function must have a statically known size
 
 error[E0277]: arrays only have std trait implementations for lengths 0..=32
-  --> $DIR/into-iter-no-impls-length-33.rs:48:5
+  --> $DIR/into-iter-no-impls-length-33.rs:48:19
    |
 LL |     IntoIter::new([0i32; 33])
-   |     ^^^^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
+   |                   ^^^^^^^^^^ the trait `std::array::LengthAtMost32` is not implemented for `[i32; 33]`
    |
    = note: required by `std::array::IntoIter::<T, N>::new`
 
diff --git a/src/test/ui/const-generics/broken-mir-2.stderr b/src/test/ui/const-generics/broken-mir-2.stderr
index b72bc6a46a..7d95b46790 100644
--- a/src/test/ui/const-generics/broken-mir-2.stderr
+++ b/src/test/ui/const-generics/broken-mir-2.stderr
@@ -15,6 +15,7 @@ LL | struct S<T: Debug, const N: usize>([T; N]);
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `[T; _]`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&[T; _]`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/const-generics/const-arg-type-arg-misordered.rs b/src/test/ui/const-generics/const-arg-type-arg-misordered.rs
new file mode 100644
index 0000000000..f024eb6a95
--- /dev/null
+++ b/src/test/ui/const-generics/const-arg-type-arg-misordered.rs
@@ -0,0 +1,10 @@
+#![feature(const_generics)]
+//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
+
+type Array<T, const N: usize> = [T; N];
+
+fn foo<const N: usize>() -> Array<N, ()> { //~ ERROR constant provided when a type was expected
+    unimplemented!()
+}
+
+fn main() {}
diff --git a/src/test/ui/const-generics/const-arg-type-arg-misordered.stderr b/src/test/ui/const-generics/const-arg-type-arg-misordered.stderr
new file mode 100644
index 0000000000..150a6011c2
--- /dev/null
+++ b/src/test/ui/const-generics/const-arg-type-arg-misordered.stderr
@@ -0,0 +1,19 @@
+warning: the feature `const_generics` is incomplete and may cause the compiler to crash
+  --> $DIR/const-arg-type-arg-misordered.rs:1:12
+   |
+LL | #![feature(const_generics)]
+   |            ^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(incomplete_features)]` on by default
+
+error[E0747]: constant provided when a type was expected
+  --> $DIR/const-arg-type-arg-misordered.rs:6:35
+   |
+LL | fn foo<const N: usize>() -> Array<N, ()> {
+   |                                   ^
+   |
+   = note: type arguments must be provided before constant arguments
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0747`.
diff --git a/src/test/ui/const-generics/const-fn-with-const-param.rs b/src/test/ui/const-generics/const-fn-with-const-param.rs
index f36bf3875c..e9e236be55 100644
--- a/src/test/ui/const-generics/const-fn-with-const-param.rs
+++ b/src/test/ui/const-generics/const-fn-with-const-param.rs
@@ -2,7 +2,7 @@
 //~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
 
 const fn const_u32_identity<const X: u32>() -> u32 {
-    //~^ ERROR const parameters are not permitted in `const fn`
+    //~^ ERROR const parameters are not permitted in const functions
     X
 }
 
diff --git a/src/test/ui/const-generics/const-fn-with-const-param.stderr b/src/test/ui/const-generics/const-fn-with-const-param.stderr
index 3437ed33d0..ca31d69536 100644
--- a/src/test/ui/const-generics/const-fn-with-const-param.stderr
+++ b/src/test/ui/const-generics/const-fn-with-const-param.stderr
@@ -1,7 +1,11 @@
-error: const parameters are not permitted in `const fn`
+error: const parameters are not permitted in const functions
   --> $DIR/const-fn-with-const-param.rs:4:1
    |
-LL | / const fn const_u32_identity<const X: u32>() -> u32 {
+LL |   const fn const_u32_identity<const X: u32>() -> u32 {
+   |   ^----
+   |   |
+   |  _`const` because of this
+   | |
 LL | |
 LL | |     X
 LL | | }
diff --git a/src/test/ui/const-generics/const-param-after-const-literal-arg.rs b/src/test/ui/const-generics/const-param-after-const-literal-arg.rs
new file mode 100644
index 0000000000..19c4120eb2
--- /dev/null
+++ b/src/test/ui/const-generics/const-param-after-const-literal-arg.rs
@@ -0,0 +1,10 @@
+// check-pass
+
+#![allow(incomplete_features)]
+#![feature(const_generics)]
+
+struct Foo<const A: usize, const B: usize>;
+
+impl<const A: usize> Foo<1, A> {} // ok
+
+fn main() {}
diff --git a/src/test/ui/const-generics/const-param-before-other-params.rs b/src/test/ui/const-generics/const-param-before-other-params.rs
index 5bdbfd8ff1..756e961ce9 100644
--- a/src/test/ui/const-generics/const-param-before-other-params.rs
+++ b/src/test/ui/const-generics/const-param-before-other-params.rs
@@ -1,3 +1,4 @@
+#![allow(incomplete_features)]
 #![feature(const_generics)]
 
 fn bar<const X: (), 'a>(_: &'a ()) {
diff --git a/src/test/ui/const-generics/const-param-before-other-params.stderr b/src/test/ui/const-generics/const-param-before-other-params.stderr
index 87622f7e50..9b18b8c79e 100644
--- a/src/test/ui/const-generics/const-param-before-other-params.stderr
+++ b/src/test/ui/const-generics/const-param-before-other-params.stderr
@@ -1,11 +1,11 @@
 error: lifetime parameters must be declared prior to const parameters
-  --> $DIR/const-param-before-other-params.rs:3:21
+  --> $DIR/const-param-before-other-params.rs:4:21
    |
 LL | fn bar<const X: (), 'a>(_: &'a ()) {
    |       --------------^^- help: reorder the parameters: lifetimes, then types, then consts: `<'a, const X: ()>`
 
 error: type parameters must be declared prior to const parameters
-  --> $DIR/const-param-before-other-params.rs:7:21
+  --> $DIR/const-param-before-other-params.rs:8:21
    |
 LL | fn foo<const X: (), T>(_: &T) {
    |       --------------^- help: reorder the parameters: lifetimes, then types, then consts: `<T, const X: ()>`
diff --git a/src/test/ui/const-generics/const-param-elided-lifetime.stderr b/src/test/ui/const-generics/const-param-elided-lifetime.stderr
index 93133c507f..6841d1fdf3 100644
--- a/src/test/ui/const-generics/const-param-elided-lifetime.stderr
+++ b/src/test/ui/const-generics/const-param-elided-lifetime.stderr
@@ -38,3 +38,4 @@ LL | #![feature(const_generics)]
 
 error: aborting due to 5 previous errors
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/const-generics/const-param-in-trait-ungated.stderr b/src/test/ui/const-generics/const-param-in-trait-ungated.stderr
index cfb1f8b581..bdae6bc362 100644
--- a/src/test/ui/const-generics/const-param-in-trait-ungated.stderr
+++ b/src/test/ui/const-generics/const-param-in-trait-ungated.stderr
@@ -4,7 +4,7 @@ error[E0658]: const generics are unstable
 LL | trait Trait<const T: ()> {}
    |                   ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
index a2872ab982..14ade3f33f 100644
--- a/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
+++ b/src/test/ui/const-generics/const-param-type-depends-on-type-param-ungated.stderr
@@ -4,7 +4,7 @@ error[E0658]: const generics are unstable
 LL | struct B<T, const N: T>(PhantomData<[T; N]>);
    |                   ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error[E0741]: the types of const generic parameters must derive `PartialEq` and `Eq`
diff --git a/src/test/ui/const-generics/const-parameter-uppercase-lint.stderr b/src/test/ui/const-generics/const-parameter-uppercase-lint.stderr
index 32cf8d8a01..3fb7c8c48b 100644
--- a/src/test/ui/const-generics/const-parameter-uppercase-lint.stderr
+++ b/src/test/ui/const-generics/const-parameter-uppercase-lint.stderr
@@ -12,7 +12,7 @@ error: const parameter `x` should have an upper case name
 LL | fn noop<const x: u32>() {
    |               ^ help: convert the identifier to upper case (notice the capitalization): `X`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-parameter-uppercase-lint.rs:4:9
    |
 LL | #![deny(non_upper_case_globals)]
diff --git a/src/test/ui/const-generics/derive-debug-array-wrapper.stderr b/src/test/ui/const-generics/derive-debug-array-wrapper.stderr
index 08a9037a20..c4aef4c9d4 100644
--- a/src/test/ui/const-generics/derive-debug-array-wrapper.stderr
+++ b/src/test/ui/const-generics/derive-debug-array-wrapper.stderr
@@ -15,6 +15,7 @@ LL |     a: [u32; N],
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `[u32; _]`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&[u32; _]`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/const-generics/issues/issue-60263.stderr b/src/test/ui/const-generics/issues/issue-60263.stderr
index fe7b6fdb19..7b50c442d2 100644
--- a/src/test/ui/const-generics/issues/issue-60263.stderr
+++ b/src/test/ui/const-generics/issues/issue-60263.stderr
@@ -4,7 +4,7 @@ error[E0658]: const generics are unstable
 LL | struct B<const I: u8>;
    |                ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/const-generics/issues/issue-65675.rs b/src/test/ui/const-generics/issues/issue-65675.rs
deleted file mode 100644
index 3ca527313f..0000000000
--- a/src/test/ui/const-generics/issues/issue-65675.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// run-pass
-// compile-flags: -Z chalk
-
-#![feature(const_generics)]
-//~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
-
-pub struct Foo<T, const N: usize>([T; N]);
-impl<T, const N: usize> Foo<T, {N}> {}
-
-fn main() {}
diff --git a/src/test/ui/const-generics/issues/issue-65675.stderr b/src/test/ui/const-generics/issues/issue-65675.stderr
deleted file mode 100644
index 60b388e627..0000000000
--- a/src/test/ui/const-generics/issues/issue-65675.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: the feature `const_generics` is incomplete and may cause the compiler to crash
-  --> $DIR/issue-65675.rs:4:12
-   |
-LL | #![feature(const_generics)]
-   |            ^^^^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
diff --git a/src/test/ui/consts/array-literal-index-oob.rs b/src/test/ui/consts/array-literal-index-oob.rs
index af63d1f75a..492afa9372 100644
--- a/src/test/ui/consts/array-literal-index-oob.rs
+++ b/src/test/ui/consts/array-literal-index-oob.rs
@@ -1,11 +1,11 @@
 // build-pass
 // ignore-pass (emit codegen-time warnings and verify that they are indeed warnings and not errors)
 
-#![warn(const_err)]
+#![warn(const_err, unconditional_panic)]
 
 fn main() {
     &{ [1, 2, 3][4] };
-    //~^ WARN index out of bounds
+    //~^ WARN operation will panic
     //~| WARN reaching this expression at runtime will panic or abort
     //~| WARN erroneous constant used [const_err]
 }
diff --git a/src/test/ui/consts/array-literal-index-oob.stderr b/src/test/ui/consts/array-literal-index-oob.stderr
index e93aa32478..6e0e7fedb7 100644
--- a/src/test/ui/consts/array-literal-index-oob.stderr
+++ b/src/test/ui/consts/array-literal-index-oob.stderr
@@ -1,14 +1,14 @@
-warning: index out of bounds: the len is 3 but the index is 4
+warning: this operation will panic at runtime
   --> $DIR/array-literal-index-oob.rs:7:8
    |
 LL |     &{ [1, 2, 3][4] };
-   |        ^^^^^^^^^^^^
+   |        ^^^^^^^^^^^^ index out of bounds: the len is 3 but the index is 4
    |
-note: lint level defined here
-  --> $DIR/array-literal-index-oob.rs:4:9
+note: the lint level is defined here
+  --> $DIR/array-literal-index-oob.rs:4:20
    |
-LL | #![warn(const_err)]
-   |         ^^^^^^^^^
+LL | #![warn(const_err, unconditional_panic)]
+   |                    ^^^^^^^^^^^^^^^^^^^
 
 warning: reaching this expression at runtime will panic or abort
   --> $DIR/array-literal-index-oob.rs:7:8
@@ -17,6 +17,12 @@ LL |     &{ [1, 2, 3][4] };
    |     ---^^^^^^^^^^^^--
    |        |
    |        indexing out of bounds: the len is 3 but the index is 4
+   |
+note: the lint level is defined here
+  --> $DIR/array-literal-index-oob.rs:4:9
+   |
+LL | #![warn(const_err, unconditional_panic)]
+   |         ^^^^^^^^^
 
 warning: erroneous constant used
   --> $DIR/array-literal-index-oob.rs:7:5
diff --git a/src/test/ui/consts/ascii_ctype.rs b/src/test/ui/consts/ascii_ctype.rs
new file mode 100644
index 0000000000..25b270ee49
--- /dev/null
+++ b/src/test/ui/consts/ascii_ctype.rs
@@ -0,0 +1,55 @@
+// run-pass
+
+#![feature(const_ascii_ctype_on_intrinsics)]
+
+macro_rules! suite {
+    ( $( $fn:ident => [$a:ident, $A:ident, $nine:ident, $dot:ident, $space:ident]; )* ) => {
+        $(
+            mod $fn {
+                const CHAR_A_LOWER: bool = 'a'.$fn();
+                const CHAR_A_UPPER: bool = 'A'.$fn();
+                const CHAR_NINE: bool = '9'.$fn();
+                const CHAR_DOT: bool = '.'.$fn();
+                const CHAR_SPACE: bool = ' '.$fn();
+
+                const U8_A_LOWER: bool = b'a'.$fn();
+                const U8_A_UPPER: bool = b'A'.$fn();
+                const U8_NINE: bool = b'9'.$fn();
+                const U8_DOT: bool = b'.'.$fn();
+                const U8_SPACE: bool = b' '.$fn();
+
+                pub fn run() {
+                    assert_eq!(CHAR_A_LOWER, $a);
+                    assert_eq!(CHAR_A_UPPER, $A);
+                    assert_eq!(CHAR_NINE, $nine);
+                    assert_eq!(CHAR_DOT, $dot);
+                    assert_eq!(CHAR_SPACE, $space);
+
+                    assert_eq!(U8_A_LOWER, $a);
+                    assert_eq!(U8_A_UPPER, $A);
+                    assert_eq!(U8_NINE, $nine);
+                    assert_eq!(U8_DOT, $dot);
+                    assert_eq!(U8_SPACE, $space);
+                }
+            }
+        )*
+
+        fn main() {
+            $( $fn::run(); )*
+        }
+    }
+}
+
+suite! {
+    //                        'a'    'A'    '9'    '.'    ' '
+    is_ascii_alphabetic   => [true,  true,  false, false, false];
+    is_ascii_uppercase    => [false, true,  false, false, false];
+    is_ascii_lowercase    => [true,  false, false, false, false];
+    is_ascii_alphanumeric => [true,  true,  true,  false, false];
+    is_ascii_digit        => [false, false, true,  false, false];
+    is_ascii_hexdigit     => [true,  true,  true,  false, false];
+    is_ascii_punctuation  => [false, false, false, true,  false];
+    is_ascii_graphic      => [true,  true,  true,  true,  false];
+    is_ascii_whitespace   => [false, false, false, false, true];
+    is_ascii_control      => [false, false, false, false, false];
+}
diff --git a/src/test/ui/consts/assoc_const_generic_impl.stderr b/src/test/ui/consts/assoc_const_generic_impl.stderr
index 4b13f52e76..104197fa17 100644
--- a/src/test/ui/consts/assoc_const_generic_impl.stderr
+++ b/src/test/ui/consts/assoc_const_generic_impl.stderr
@@ -6,7 +6,7 @@ LL |     const I_AM_ZERO_SIZED: ()  = [()][std::mem::size_of::<Self>()];
    |                                  |
    |                                  index out of bounds: the len is 1 but the index is 4
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/assoc_const_generic_impl.rs:3:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-address-of-mut.stderr b/src/test/ui/consts/const-address-of-mut.stderr
index 15f2296c42..1d9a325b0c 100644
--- a/src/test/ui/consts/const-address-of-mut.stderr
+++ b/src/test/ui/consts/const-address-of-mut.stderr
@@ -4,7 +4,7 @@ error[E0658]: `&raw mut` is not allowed in constants
 LL | const A: () = { let mut x = 2; &raw mut x; };
    |                                ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: `&raw mut` is not allowed in statics
@@ -13,7 +13,7 @@ error[E0658]: `&raw mut` is not allowed in statics
 LL | static B: () = { let mut x = 2; &raw mut x; };
    |                                 ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: `&raw mut` is not allowed in statics
@@ -22,7 +22,7 @@ error[E0658]: `&raw mut` is not allowed in statics
 LL | static mut C: () = { let mut x = 2; &raw mut x; };
    |                                     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: `&raw mut` is not allowed in constant functions
@@ -31,7 +31,7 @@ error[E0658]: `&raw mut` is not allowed in constant functions
 LL |     let y = &raw mut x;
    |             ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/consts/const-deref-ptr.stderr b/src/test/ui/consts/const-deref-ptr.stderr
index 6bfb9ee73e..61fcb52431 100644
--- a/src/test/ui/consts/const-deref-ptr.stderr
+++ b/src/test/ui/consts/const-deref-ptr.stderr
@@ -4,7 +4,7 @@ error[E0658]: dereferencing raw pointers in statics is unstable
 LL |     static C: u64 = unsafe {*(0xdeadbeef as *const u64)};
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/const-err-early.stderr b/src/test/ui/consts/const-err-early.stderr
index 9b0ef94a5b..b78ac38d7e 100644
--- a/src/test/ui/consts/const-err-early.stderr
+++ b/src/test/ui/consts/const-err-early.stderr
@@ -6,7 +6,7 @@ LL | pub const A: i8 = -std::i8::MIN;
    |                   |
    |                   attempt to negate with overflow
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-err-early.rs:1:9
    |
 LL | #![deny(const_err)]
diff --git a/src/test/ui/consts/const-err-multi.stderr b/src/test/ui/consts/const-err-multi.stderr
index c647f13fc7..65427b8a1b 100644
--- a/src/test/ui/consts/const-err-multi.stderr
+++ b/src/test/ui/consts/const-err-multi.stderr
@@ -6,7 +6,7 @@ LL | pub const A: i8 = -std::i8::MIN;
    |                   |
    |                   attempt to negate with overflow
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-err-multi.rs:1:9
    |
 LL | #![deny(const_err)]
diff --git a/src/test/ui/consts/const-err.rs b/src/test/ui/consts/const-err.rs
index b204f705a9..d1c5f4f3f3 100644
--- a/src/test/ui/consts/const-err.rs
+++ b/src/test/ui/consts/const-err.rs
@@ -1,7 +1,7 @@
 // build-fail
 // compile-flags: -Zforce-overflow-checks=on
 
-#![allow(exceeding_bitshifts)]
+#![allow(arithmetic_overflow)]
 #![warn(const_err)]
 
 fn black_box<T>(_: T) {
diff --git a/src/test/ui/consts/const-err.stderr b/src/test/ui/consts/const-err.stderr
index 495b221d7d..069521e6e4 100644
--- a/src/test/ui/consts/const-err.stderr
+++ b/src/test/ui/consts/const-err.stderr
@@ -6,7 +6,7 @@ LL | const FOO: u8 = [5u8][1];
    |                 |
    |                 index out of bounds: the len is 1 but the index is 1
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-err.rs:5:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-err2.noopt.stderr b/src/test/ui/consts/const-err2.noopt.stderr
new file mode 100644
index 0000000000..5aeeec4bd1
--- /dev/null
+++ b/src/test/ui/consts/const-err2.noopt.stderr
@@ -0,0 +1,48 @@
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:19:13
+   |
+LL |     let a = -std::i8::MIN;
+   |             ^^^^^^^^^^^^^ attempt to negate with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:21:18
+   |
+LL |     let a_i128 = -std::i128::MIN;
+   |                  ^^^^^^^^^^^^^^^ attempt to negate with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:23:13
+   |
+LL |     let b = 200u8 + 200u8 + 200u8;
+   |             ^^^^^^^^^^^^^ attempt to add with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:25:18
+   |
+LL |     let b_i128 = std::i128::MIN - std::i128::MAX;
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:27:13
+   |
+LL |     let c = 200u8 * 4;
+   |             ^^^^^^^^^ attempt to multiply with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:29:13
+   |
+LL |     let d = 42u8 - (42u8 + 1);
+   |             ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/const-err2.rs:31:14
+   |
+LL |     let _e = [5u8][1];
+   |              ^^^^^^^^ index out of bounds: the len is 1 but the index is 1
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: aborting due to 7 previous errors
+
diff --git a/src/test/ui/consts/const-err2.opt.stderr b/src/test/ui/consts/const-err2.opt.stderr
new file mode 100644
index 0000000000..5aeeec4bd1
--- /dev/null
+++ b/src/test/ui/consts/const-err2.opt.stderr
@@ -0,0 +1,48 @@
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:19:13
+   |
+LL |     let a = -std::i8::MIN;
+   |             ^^^^^^^^^^^^^ attempt to negate with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:21:18
+   |
+LL |     let a_i128 = -std::i128::MIN;
+   |                  ^^^^^^^^^^^^^^^ attempt to negate with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:23:13
+   |
+LL |     let b = 200u8 + 200u8 + 200u8;
+   |             ^^^^^^^^^^^^^ attempt to add with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:25:18
+   |
+LL |     let b_i128 = std::i128::MIN - std::i128::MAX;
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:27:13
+   |
+LL |     let c = 200u8 * 4;
+   |             ^^^^^^^^^ attempt to multiply with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:29:13
+   |
+LL |     let d = 42u8 - (42u8 + 1);
+   |             ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/const-err2.rs:31:14
+   |
+LL |     let _e = [5u8][1];
+   |              ^^^^^^^^ index out of bounds: the len is 1 but the index is 1
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: aborting due to 7 previous errors
+
diff --git a/src/test/ui/consts/const-err2.opt_with_overflow_checks.stderr b/src/test/ui/consts/const-err2.opt_with_overflow_checks.stderr
new file mode 100644
index 0000000000..5aeeec4bd1
--- /dev/null
+++ b/src/test/ui/consts/const-err2.opt_with_overflow_checks.stderr
@@ -0,0 +1,48 @@
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:19:13
+   |
+LL |     let a = -std::i8::MIN;
+   |             ^^^^^^^^^^^^^ attempt to negate with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:21:18
+   |
+LL |     let a_i128 = -std::i128::MIN;
+   |                  ^^^^^^^^^^^^^^^ attempt to negate with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:23:13
+   |
+LL |     let b = 200u8 + 200u8 + 200u8;
+   |             ^^^^^^^^^^^^^ attempt to add with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:25:18
+   |
+LL |     let b_i128 = std::i128::MIN - std::i128::MAX;
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:27:13
+   |
+LL |     let c = 200u8 * 4;
+   |             ^^^^^^^^^ attempt to multiply with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/const-err2.rs:29:13
+   |
+LL |     let d = 42u8 - (42u8 + 1);
+   |             ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/const-err2.rs:31:14
+   |
+LL |     let _e = [5u8][1];
+   |              ^^^^^^^^ index out of bounds: the len is 1 but the index is 1
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: aborting due to 7 previous errors
+
diff --git a/src/test/ui/consts/const-err2.rs b/src/test/ui/consts/const-err2.rs
index 351dfd2e0f..2c6a987180 100644
--- a/src/test/ui/consts/const-err2.rs
+++ b/src/test/ui/consts/const-err2.rs
@@ -2,13 +2,14 @@
 // optimized compilation and unoptimized compilation and thus would
 // lead to different lints being emitted
 
+// revisions: noopt opt opt_with_overflow_checks
+//[noopt]compile-flags: -C opt-level=0
+//[opt]compile-flags: -O
+//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+
 // build-fail
-// compile-flags: -O
 
 #![feature(rustc_attrs)]
-#![allow(exceeding_bitshifts)]
-
-#![deny(const_err)]
 
 fn black_box<T>(_: T) {
     unimplemented!()
@@ -16,17 +17,23 @@ fn black_box<T>(_: T) {
 
 fn main() {
     let a = -std::i8::MIN;
-    //~^ ERROR const_err
+    //~^ ERROR arithmetic operation will overflow
+    let a_i128 = -std::i128::MIN;
+    //~^ ERROR arithmetic operation will overflow
     let b = 200u8 + 200u8 + 200u8;
-    //~^ ERROR const_err
+    //~^ ERROR arithmetic operation will overflow
+    let b_i128 = std::i128::MIN - std::i128::MAX;
+    //~^ ERROR arithmetic operation will overflow
     let c = 200u8 * 4;
-    //~^ ERROR const_err
+    //~^ ERROR arithmetic operation will overflow
     let d = 42u8 - (42u8 + 1);
-    //~^ ERROR const_err
+    //~^ ERROR arithmetic operation will overflow
     let _e = [5u8][1];
-    //~^ ERROR index out of bounds
+    //~^ ERROR operation will panic
     black_box(a);
+    black_box(a_i128);
     black_box(b);
+    black_box(b_i128);
     black_box(c);
     black_box(d);
 }
diff --git a/src/test/ui/consts/const-err2.stderr b/src/test/ui/consts/const-err2.stderr
deleted file mode 100644
index 2ca1019d49..0000000000
--- a/src/test/ui/consts/const-err2.stderr
+++ /dev/null
@@ -1,38 +0,0 @@
-error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:18:13
-   |
-LL |     let a = -std::i8::MIN;
-   |             ^^^^^^^^^^^^^ attempt to negate with overflow
-   |
-note: lint level defined here
-  --> $DIR/const-err2.rs:11:9
-   |
-LL | #![deny(const_err)]
-   |         ^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:20:13
-   |
-LL |     let b = 200u8 + 200u8 + 200u8;
-   |             ^^^^^^^^^^^^^ attempt to add with overflow
-
-error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:22:13
-   |
-LL |     let c = 200u8 * 4;
-   |             ^^^^^^^^^ attempt to multiply with overflow
-
-error: this expression will panic at runtime
-  --> $DIR/const-err2.rs:24:13
-   |
-LL |     let d = 42u8 - (42u8 + 1);
-   |             ^^^^^^^^^^^^^^^^^ attempt to subtract with overflow
-
-error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/const-err2.rs:26:14
-   |
-LL |     let _e = [5u8][1];
-   |              ^^^^^^^^
-
-error: aborting due to 5 previous errors
-
diff --git a/src/test/ui/consts/const-err3.rs b/src/test/ui/consts/const-err3.rs
deleted file mode 100644
index ab3823efd3..0000000000
--- a/src/test/ui/consts/const-err3.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// needed because negating int::MIN will behave differently between
-// optimized compilation and unoptimized compilation and thus would
-// lead to different lints being emitted
-
-// build-fail
-// compile-flags: -C overflow-checks=on -O
-
-#![feature(rustc_attrs)]
-#![allow(exceeding_bitshifts)]
-
-#![deny(const_err)]
-
-fn black_box<T>(_: T) {
-    unimplemented!()
-}
-
-fn main() {
-    let a = -std::i8::MIN;
-    //~^ ERROR const_err
-    let b = 200u8 + 200u8 + 200u8;
-    //~^ ERROR const_err
-    let c = 200u8 * 4;
-    //~^ ERROR const_err
-    let d = 42u8 - (42u8 + 1);
-    //~^ ERROR const_err
-    let _e = [5u8][1];
-    //~^ ERROR const_err
-    black_box(a);
-    black_box(b);
-    black_box(c);
-    black_box(d);
-}
diff --git a/src/test/ui/consts/const-err3.stderr b/src/test/ui/consts/const-err3.stderr
deleted file mode 100644
index c374637bec..0000000000
--- a/src/test/ui/consts/const-err3.stderr
+++ /dev/null
@@ -1,38 +0,0 @@
-error: attempt to negate with overflow
-  --> $DIR/const-err3.rs:18:13
-   |
-LL |     let a = -std::i8::MIN;
-   |             ^^^^^^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/const-err3.rs:11:9
-   |
-LL | #![deny(const_err)]
-   |         ^^^^^^^^^
-
-error: attempt to add with overflow
-  --> $DIR/const-err3.rs:20:13
-   |
-LL |     let b = 200u8 + 200u8 + 200u8;
-   |             ^^^^^^^^^^^^^
-
-error: attempt to multiply with overflow
-  --> $DIR/const-err3.rs:22:13
-   |
-LL |     let c = 200u8 * 4;
-   |             ^^^^^^^^^
-
-error: attempt to subtract with overflow
-  --> $DIR/const-err3.rs:24:13
-   |
-LL |     let d = 42u8 - (42u8 + 1);
-   |             ^^^^^^^^^^^^^^^^^
-
-error: index out of bounds: the len is 1 but the index is 1
-  --> $DIR/const-err3.rs:26:14
-   |
-LL |     let _e = [5u8][1];
-   |              ^^^^^^^^
-
-error: aborting due to 5 previous errors
-
diff --git a/src/test/ui/consts/const-eval/conditional_array_execution.stderr b/src/test/ui/consts/const-eval/conditional_array_execution.stderr
index b5f5f84cf3..c72a1ed40c 100644
--- a/src/test/ui/consts/const-eval/conditional_array_execution.stderr
+++ b/src/test/ui/consts/const-eval/conditional_array_execution.stderr
@@ -6,7 +6,7 @@ LL | const FOO: u32 = [X - Y, Y - X][(X < Y) as usize];
    |                   |
    |                   attempt to subtract with overflow
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/conditional_array_execution.rs:3:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2.stderr
index 419b3d52db..6f82300557 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2.stderr
+++ b/src/test/ui/consts/const-eval/const-eval-overflow2.stderr
@@ -8,7 +8,7 @@ LL | |      i8::MIN - 1,
 LL | |      );
    | |_______-
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-eval-overflow2.rs:8:9
    |
 LL | #![deny(const_err)]
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr
index 2cfd34c9fc..f9a4e5aa96 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr
+++ b/src/test/ui/consts/const-eval/const-eval-overflow2b.stderr
@@ -8,7 +8,7 @@ LL | |      i8::MAX + 1,
 LL | |      );
    | |_______-
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-eval-overflow2b.rs:8:9
    |
 LL | #![deny(const_err)]
diff --git a/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr b/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr
index 5e63286c59..6b90617802 100644
--- a/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr
+++ b/src/test/ui/consts/const-eval/const-eval-overflow2c.stderr
@@ -8,7 +8,7 @@ LL | |      i8::MIN * 2,
 LL | |      );
    | |_______-
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const-eval-overflow2c.rs:8:9
    |
 LL | #![deny(const_err)]
diff --git a/src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr b/src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr
index f99505c309..4c3ebece0a 100644
--- a/src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr
+++ b/src/test/ui/consts/const-eval/const_fn_ptr_fail2.stderr
@@ -12,7 +12,7 @@ LL |     assert_eq!(Y, 4);
    |                |
    |                referenced constant has errors
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0080]: evaluation of constant expression failed
   --> $DIR/const_fn_ptr_fail2.rs:22:5
@@ -22,7 +22,7 @@ LL |     assert_eq!(Z, 4);
    |                |
    |                referenced constant has errors
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/const-eval/const_panic.stderr b/src/test/ui/consts/const-eval/const_panic.stderr
index 1b006c69cf..679d8f280c 100644
--- a/src/test/ui/consts/const-eval/const_panic.stderr
+++ b/src/test/ui/consts/const-eval/const_panic.stderr
@@ -7,7 +7,7 @@ LL | pub const Z: () = panic!("cheese");
    |                   the evaluated program panicked at 'cheese', $DIR/const_panic.rs:4:19
    |
    = note: `#[deny(const_err)]` on by default
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/const_panic.rs:7:19
@@ -17,7 +17,7 @@ LL | pub const Y: () = unreachable!();
    |                   |
    |                   the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic.rs:7:19
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/const_panic.rs:10:19
@@ -27,7 +27,7 @@ LL | pub const X: () = unimplemented!();
    |                   |
    |                   the evaluated program panicked at 'not implemented', $DIR/const_panic.rs:10:19
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore.stderr b/src/test/ui/consts/const-eval/const_panic_libcore.stderr
index abc844e984..2abf158aad 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore.stderr
+++ b/src/test/ui/consts/const-eval/const_panic_libcore.stderr
@@ -7,7 +7,7 @@ LL | const Z: () = panic!("cheese");
    |               the evaluated program panicked at 'cheese', $DIR/const_panic_libcore.rs:5:15
    |
    = note: `#[deny(const_err)]` on by default
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/const_panic_libcore.rs:8:15
@@ -17,7 +17,7 @@ LL | const Y: () = unreachable!();
    |               |
    |               the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore.rs:8:15
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/const_panic_libcore.rs:11:15
@@ -27,7 +27,7 @@ LL | const X: () = unimplemented!();
    |               |
    |               the evaluated program panicked at 'not implemented', $DIR/const_panic_libcore.rs:11:15
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
index 24ddefe01b..c5887ff8c5 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
+++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
@@ -7,7 +7,7 @@ LL | const Z: () = panic!("cheese");
    |               the evaluated program panicked at 'cheese', $DIR/const_panic_libcore_main.rs:9:15
    |
    = note: `#[deny(const_err)]` on by default
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/const_panic_libcore_main.rs:12:15
@@ -17,7 +17,7 @@ LL | const Y: () = unreachable!();
    |               |
    |               the evaluated program panicked at 'internal error: entered unreachable code', $DIR/const_panic_libcore_main.rs:12:15
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/const_panic_libcore_main.rs:15:15
@@ -27,7 +27,7 @@ LL | const X: () = unimplemented!();
    |               |
    |               the evaluated program panicked at 'not implemented', $DIR/const_panic_libcore_main.rs:15:15
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/consts/const-eval/dangling.rs b/src/test/ui/consts/const-eval/dangling.rs
index b5d72d46f2..c6b8e8eb61 100644
--- a/src/test/ui/consts/const-eval/dangling.rs
+++ b/src/test/ui/consts/const-eval/dangling.rs
@@ -6,7 +6,7 @@ use std::{mem, usize};
 const TEST: () = { unsafe { //~ NOTE
     let slice: *const [u8] = mem::transmute((1usize, usize::MAX));
     let _val = &*slice; //~ ERROR: any use of this value will cause an error
-    //~^ NOTE: total size is bigger than largest supported object
+    //~^ NOTE: slice is bigger than largest supported object
     //~^^ on by default
 } };
 
diff --git a/src/test/ui/consts/const-eval/dangling.stderr b/src/test/ui/consts/const-eval/dangling.stderr
index 286de08009..b9ddc93b03 100644
--- a/src/test/ui/consts/const-eval/dangling.stderr
+++ b/src/test/ui/consts/const-eval/dangling.stderr
@@ -4,7 +4,7 @@ error: any use of this value will cause an error
 LL | / const TEST: () = { unsafe {
 LL | |     let slice: *const [u8] = mem::transmute((1usize, usize::MAX));
 LL | |     let _val = &*slice;
-   | |                ^^^^^^^ invalid slice: total size is bigger than largest supported object
+   | |                ^^^^^^^ invalid metadata in wide pointer: slice is bigger than largest supported object
 LL | |
 LL | |
 LL | | } };
diff --git a/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr
index 6899b7b82c..4c8492b22f 100644
--- a/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr
+++ b/src/test/ui/consts/const-eval/feature-gate-const_fn_union.stderr
@@ -4,7 +4,7 @@ error[E0658]: unions in const fn are unstable
 LL |     Foo { u }.i
    |     ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51909
+   = note: see issue #51909 <https://github.com/rust-lang/rust/issues/51909> for more information
    = help: add `#![feature(const_fn_union)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr
index ac0ff7025d..56746c04f5 100644
--- a/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr
+++ b/src/test/ui/consts/const-eval/feature-gate-const_panic.stderr
@@ -4,9 +4,9 @@ error[E0658]: panicking in constants is unstable
 LL | const Z: () = panic!("cheese");
    |               ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51999
+   = note: see issue #51999 <https://github.com/rust-lang/rust/issues/51999> for more information
    = help: add `#![feature(const_panic)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: panicking in constants is unstable
   --> $DIR/feature-gate-const_panic.rs:9:15
@@ -14,9 +14,9 @@ error[E0658]: panicking in constants is unstable
 LL | const X: () = unimplemented!();
    |               ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51999
+   = note: see issue #51999 <https://github.com/rust-lang/rust/issues/51999> for more information
    = help: add `#![feature(const_panic)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: panicking in constants is unstable
   --> $DIR/feature-gate-const_panic.rs:6:15
@@ -24,9 +24,9 @@ error[E0658]: panicking in constants is unstable
 LL | const Y: () = unreachable!();
    |               ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51999
+   = note: see issue #51999 <https://github.com/rust-lang/rust/issues/51999> for more information
    = help: add `#![feature(const_panic)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr b/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr
index e664a4aab3..8fadfabe41 100644
--- a/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr
+++ b/src/test/ui/consts/const-eval/index-out-of-bounds-never-type.stderr
@@ -6,7 +6,7 @@ LL |     const VOID: ! = { let x = 0 * std::mem::size_of::<T>(); [][x] };
    |                                                             |
    |                                                             index out of bounds: the len is 0 but the index is 0
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/index-out-of-bounds-never-type.rs:4:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs
index 6d6bb94d4d..608e6e112a 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs
+++ b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.rs
@@ -2,5 +2,5 @@
 
 fn main() {
     let array = [std::env::args().len()];
-    array[1]; //~ ERROR index out of bounds
+    array[1]; //~ ERROR operation will panic
 }
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
index 9519ccd3c2..4188efd021 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
+++ b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
@@ -1,10 +1,10 @@
-error: index out of bounds: the len is 1 but the index is 1
+error: this operation will panic at runtime
   --> $DIR/index_out_of_bounds_propagated.rs:5:5
    |
 LL |     array[1];
-   |     ^^^^^^^^
+   |     ^^^^^^^^ index out of bounds: the len is 1 but the index is 1
    |
-   = note: `#[deny(const_err)]` on by default
+   = note: `#[deny(unconditional_panic)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-eval/infinite_loop.stderr b/src/test/ui/consts/const-eval/infinite_loop.stderr
index ed3c66db2c..e04c31cf39 100644
--- a/src/test/ui/consts/const-eval/infinite_loop.stderr
+++ b/src/test/ui/consts/const-eval/infinite_loop.stderr
@@ -9,7 +9,7 @@ LL | |
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
@@ -19,7 +19,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |             n = if n % 2 == 0 { n/2 } else { 3*n + 1 };
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 warning: Constant evaluating a complex constant, this might take some time
diff --git a/src/test/ui/consts/const-eval/issue-43197.stderr b/src/test/ui/consts/const-eval/issue-43197.stderr
index 23b54d954c..668d061b79 100644
--- a/src/test/ui/consts/const-eval/issue-43197.stderr
+++ b/src/test/ui/consts/const-eval/issue-43197.stderr
@@ -6,7 +6,7 @@ LL |     const X: u32 = 0 - 1;
    |                    |
    |                    attempt to subtract with overflow
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-43197.rs:3:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-eval/issue-52442.stderr b/src/test/ui/consts/const-eval/issue-52442.stderr
index c8ac4b1a76..eda2dbf0b6 100644
--- a/src/test/ui/consts/const-eval/issue-52442.stderr
+++ b/src/test/ui/consts/const-eval/issue-52442.stderr
@@ -4,7 +4,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     [();  { &loop { break } as *const _ as usize } ];
    |              ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: casting pointers to integers in constants is unstable
@@ -13,7 +13,7 @@ error[E0658]: casting pointers to integers in constants is unstable
 LL |     [();  { &loop { break } as *const _ as usize } ];
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error[E0080]: evaluation of constant value failed
diff --git a/src/test/ui/consts/const-eval/issue-52475.stderr b/src/test/ui/consts/const-eval/issue-52475.stderr
index 7c0c735f9a..31d87925b2 100644
--- a/src/test/ui/consts/const-eval/issue-52475.stderr
+++ b/src/test/ui/consts/const-eval/issue-52475.stderr
@@ -8,7 +8,7 @@ LL | |             x = &0; // Materialize a new AllocId
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
diff --git a/src/test/ui/consts/const-eval/issue-62272.stderr b/src/test/ui/consts/const-eval/issue-62272.stderr
index a02bbe557c..380f68bee0 100644
--- a/src/test/ui/consts/const-eval/issue-62272.stderr
+++ b/src/test/ui/consts/const-eval/issue-62272.stderr
@@ -4,7 +4,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL | const FOO: () = loop { break; };
    |                 ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const`
@@ -13,7 +13,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     [FOO; { let x; loop { x = 5; break; } x }];
    |                    ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/const-eval/issue-65394.stderr b/src/test/ui/consts/const-eval/issue-65394.stderr
index 54b3507334..d85a1a1a3c 100644
--- a/src/test/ui/consts/const-eval/issue-65394.stderr
+++ b/src/test/ui/consts/const-eval/issue-65394.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL |     let r = &mut x;
    |             ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0493]: destructors cannot be evaluated at compile-time
diff --git a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr
index d1ad2261dc..b47f6d5f84 100644
--- a/src/test/ui/consts/const-eval/match-test-ptr-null.stderr
+++ b/src/test/ui/consts/const-eval/match-test-ptr-null.stderr
@@ -10,7 +10,7 @@ LL | |             n => n,
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: casting pointers to integers in constants is unstable
@@ -19,7 +19,7 @@ error[E0658]: casting pointers to integers in constants is unstable
 LL |         match &1 as *const i32 as usize {
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error[E0080]: evaluation of constant value failed
diff --git a/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr b/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
index 575c3648b7..ea4eba89eb 100644
--- a/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
+++ b/src/test/ui/consts/const-eval/panic-assoc-never-type.stderr
@@ -6,12 +6,12 @@ LL |     const VOID: ! = panic!();
    |                     |
    |                     the evaluated program panicked at 'explicit panic', $DIR/panic-assoc-never-type.rs:11:21
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/panic-assoc-never-type.rs:4:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
-   = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0080]: erroneous constant used
   --> $DIR/panic-assoc-never-type.rs:16:13
diff --git a/src/test/ui/consts/const-eval/panic-never-type.stderr b/src/test/ui/consts/const-eval/panic-never-type.stderr
index 4d1686a8d8..28333c511d 100644
--- a/src/test/ui/consts/const-eval/panic-never-type.stderr
+++ b/src/test/ui/consts/const-eval/panic-never-type.stderr
@@ -6,12 +6,12 @@ LL | const VOID: ! = panic!();
    |                 |
    |                 the evaluated program panicked at 'explicit panic', $DIR/panic-never-type.rs:8:17
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/panic-never-type.rs:4:9
    |
 LL | #![warn(const_err)]
    |         ^^^^^^^^^
-   = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0080]: erroneous constant used
   --> $DIR/panic-never-type.rs:12:13
diff --git a/src/test/ui/consts/const-eval/promoted_errors.noopt.stderr b/src/test/ui/consts/const-eval/promoted_errors.noopt.stderr
new file mode 100644
index 0000000000..94c1593240
--- /dev/null
+++ b/src/test/ui/consts/const-eval/promoted_errors.noopt.stderr
@@ -0,0 +1,78 @@
+warning: this arithmetic operation will overflow
+  --> $DIR/promoted_errors.rs:12:20
+   |
+LL |     println!("{}", 0u32 - 1);
+   |                    ^^^^^^^^ attempt to subtract with overflow
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:20
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |                    ^^^^^^^^^^^^^^^^^^^
+
+warning: this arithmetic operation will overflow
+  --> $DIR/promoted_errors.rs:14:14
+   |
+LL |     let _x = 0u32 - 1;
+   |              ^^^^^^^^ attempt to subtract with overflow
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ attempt to divide by zero
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:41
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |                                         ^^^^^^^^^^^^^^^^^^^
+
+warning: reaching this expression at runtime will panic or abort
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ dividing by zero
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:9
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |         ^^^^^^^^^
+
+warning: erroneous constant used
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ referenced constant has errors
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:20:14
+   |
+LL |     let _x = 1 / (1 - 1);
+   |              ^^^^^^^^^^^ attempt to divide by zero
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ attempt to divide by zero
+
+warning: reaching this expression at runtime will panic or abort
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ dividing by zero
+
+warning: erroneous constant used
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ referenced constant has errors
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:26:14
+   |
+LL |     let _x = 1 / (false as u32);
+   |              ^^^^^^^^^^^^^^^^^^ attempt to divide by zero
+
diff --git a/src/test/ui/consts/const-eval/promoted_errors.opt.stderr b/src/test/ui/consts/const-eval/promoted_errors.opt.stderr
new file mode 100644
index 0000000000..034dea0656
--- /dev/null
+++ b/src/test/ui/consts/const-eval/promoted_errors.opt.stderr
@@ -0,0 +1,72 @@
+warning: this arithmetic operation will overflow
+  --> $DIR/promoted_errors.rs:14:14
+   |
+LL |     let _x = 0u32 - 1;
+   |              ^^^^^^^^ attempt to subtract with overflow
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:20
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |                    ^^^^^^^^^^^^^^^^^^^
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ attempt to divide by zero
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:41
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |                                         ^^^^^^^^^^^^^^^^^^^
+
+warning: reaching this expression at runtime will panic or abort
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ dividing by zero
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:9
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |         ^^^^^^^^^
+
+warning: erroneous constant used
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ referenced constant has errors
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:20:14
+   |
+LL |     let _x = 1 / (1 - 1);
+   |              ^^^^^^^^^^^ attempt to divide by zero
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ attempt to divide by zero
+
+warning: reaching this expression at runtime will panic or abort
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ dividing by zero
+
+warning: erroneous constant used
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ referenced constant has errors
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:26:14
+   |
+LL |     let _x = 1 / (false as u32);
+   |              ^^^^^^^^^^^^^^^^^^ attempt to divide by zero
+
diff --git a/src/test/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr b/src/test/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr
new file mode 100644
index 0000000000..94c1593240
--- /dev/null
+++ b/src/test/ui/consts/const-eval/promoted_errors.opt_with_overflow_checks.stderr
@@ -0,0 +1,78 @@
+warning: this arithmetic operation will overflow
+  --> $DIR/promoted_errors.rs:12:20
+   |
+LL |     println!("{}", 0u32 - 1);
+   |                    ^^^^^^^^ attempt to subtract with overflow
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:20
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |                    ^^^^^^^^^^^^^^^^^^^
+
+warning: this arithmetic operation will overflow
+  --> $DIR/promoted_errors.rs:14:14
+   |
+LL |     let _x = 0u32 - 1;
+   |              ^^^^^^^^ attempt to subtract with overflow
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ attempt to divide by zero
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:41
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |                                         ^^^^^^^^^^^^^^^^^^^
+
+warning: reaching this expression at runtime will panic or abort
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ dividing by zero
+   |
+note: the lint level is defined here
+  --> $DIR/promoted_errors.rs:9:9
+   |
+LL | #![warn(const_err, arithmetic_overflow, unconditional_panic)]
+   |         ^^^^^^^^^
+
+warning: erroneous constant used
+  --> $DIR/promoted_errors.rs:16:20
+   |
+LL |     println!("{}", 1 / (1 - 1));
+   |                    ^^^^^^^^^^^ referenced constant has errors
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:20:14
+   |
+LL |     let _x = 1 / (1 - 1);
+   |              ^^^^^^^^^^^ attempt to divide by zero
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ attempt to divide by zero
+
+warning: reaching this expression at runtime will panic or abort
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ dividing by zero
+
+warning: erroneous constant used
+  --> $DIR/promoted_errors.rs:22:20
+   |
+LL |     println!("{}", 1 / (false as u32));
+   |                    ^^^^^^^^^^^^^^^^^^ referenced constant has errors
+
+warning: this operation will panic at runtime
+  --> $DIR/promoted_errors.rs:26:14
+   |
+LL |     let _x = 1 / (false as u32);
+   |              ^^^^^^^^^^^^^^^^^^ attempt to divide by zero
+
diff --git a/src/test/ui/consts/const-eval/promoted_errors.rs b/src/test/ui/consts/const-eval/promoted_errors.rs
index 22f863fb15..3ab6ce2847 100644
--- a/src/test/ui/consts/const-eval/promoted_errors.rs
+++ b/src/test/ui/consts/const-eval/promoted_errors.rs
@@ -1,23 +1,28 @@
+// revisions: noopt opt opt_with_overflow_checks
+//[noopt]compile-flags: -C opt-level=0
+//[opt]compile-flags: -O
+//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+
 // build-pass
 // ignore-pass (emit codegen-time warnings and verify that they are indeed warnings and not errors)
-// compile-flags: -O
 
-#![warn(const_err)]
+#![warn(const_err, arithmetic_overflow, unconditional_panic)]
 
 fn main() {
     println!("{}", 0u32 - 1);
+    //[opt_with_overflow_checks,noopt]~^ WARN [arithmetic_overflow]
     let _x = 0u32 - 1;
-    //~^ WARN const_err
+    //~^ WARN [arithmetic_overflow]
     println!("{}", 1 / (1 - 1));
-    //~^ WARN attempt to divide by zero [const_err]
-    //~| WARN const_err
+    //~^ WARN [unconditional_panic]
+    //~| WARN panic or abort [const_err]
     //~| WARN erroneous constant used [const_err]
     let _x = 1 / (1 - 1);
-    //~^ WARN const_err
+    //~^ WARN [unconditional_panic]
     println!("{}", 1 / (false as u32));
-    //~^ WARN attempt to divide by zero [const_err]
-    //~| WARN const_err
+    //~^ WARN [unconditional_panic]
+    //~| WARN panic or abort [const_err]
     //~| WARN erroneous constant used [const_err]
     let _x = 1 / (false as u32);
-    //~^ WARN const_err
+    //~^ WARN [unconditional_panic]
 }
diff --git a/src/test/ui/consts/const-eval/promoted_errors.stderr b/src/test/ui/consts/const-eval/promoted_errors.stderr
deleted file mode 100644
index b4330deb3e..0000000000
--- a/src/test/ui/consts/const-eval/promoted_errors.stderr
+++ /dev/null
@@ -1,60 +0,0 @@
-warning: this expression will panic at runtime
-  --> $DIR/promoted_errors.rs:9:14
-   |
-LL |     let _x = 0u32 - 1;
-   |              ^^^^^^^^ attempt to subtract with overflow
-   |
-note: lint level defined here
-  --> $DIR/promoted_errors.rs:5:9
-   |
-LL | #![warn(const_err)]
-   |         ^^^^^^^^^
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors.rs:11:20
-   |
-LL |     println!("{}", 1 / (1 - 1));
-   |                    ^^^^^^^^^^^
-
-warning: reaching this expression at runtime will panic or abort
-  --> $DIR/promoted_errors.rs:11:20
-   |
-LL |     println!("{}", 1 / (1 - 1));
-   |                    ^^^^^^^^^^^ dividing by zero
-
-warning: erroneous constant used
-  --> $DIR/promoted_errors.rs:11:20
-   |
-LL |     println!("{}", 1 / (1 - 1));
-   |                    ^^^^^^^^^^^ referenced constant has errors
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors.rs:15:14
-   |
-LL |     let _x = 1 / (1 - 1);
-   |              ^^^^^^^^^^^
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors.rs:17:20
-   |
-LL |     println!("{}", 1 / (false as u32));
-   |                    ^^^^^^^^^^^^^^^^^^
-
-warning: reaching this expression at runtime will panic or abort
-  --> $DIR/promoted_errors.rs:17:20
-   |
-LL |     println!("{}", 1 / (false as u32));
-   |                    ^^^^^^^^^^^^^^^^^^ dividing by zero
-
-warning: erroneous constant used
-  --> $DIR/promoted_errors.rs:17:20
-   |
-LL |     println!("{}", 1 / (false as u32));
-   |                    ^^^^^^^^^^^^^^^^^^ referenced constant has errors
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors.rs:21:14
-   |
-LL |     let _x = 1 / (false as u32);
-   |              ^^^^^^^^^^^^^^^^^^
-
diff --git a/src/test/ui/consts/const-eval/promoted_errors2.rs b/src/test/ui/consts/const-eval/promoted_errors2.rs
deleted file mode 100644
index 62c77f76d9..0000000000
--- a/src/test/ui/consts/const-eval/promoted_errors2.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// build-pass
-// ignore-pass (emit codegen-time warnings and verify that they are indeed warnings and not errors)
-// compile-flags: -C overflow-checks=on -O
-
-#![warn(const_err)]
-
-fn main() {
-    println!("{}", 0u32 - 1);
-    //~^ WARN attempt to subtract with overflow
-    let _x = 0u32 - 1;
-    //~^ WARN attempt to subtract with overflow
-    println!("{}", 1 / (1 - 1));
-    //~^ WARN attempt to divide by zero [const_err]
-    //~| WARN const_err
-    //~| WARN erroneous constant used [const_err]
-    let _x = 1 / (1 - 1);
-    //~^ WARN const_err
-    println!("{}", 1 / (false as u32));
-    //~^ WARN attempt to divide by zero [const_err]
-    //~| WARN const_err
-    //~| WARN erroneous constant used [const_err]
-    let _x = 1 / (false as u32);
-    //~^ WARN const_err
-}
diff --git a/src/test/ui/consts/const-eval/promoted_errors2.stderr b/src/test/ui/consts/const-eval/promoted_errors2.stderr
deleted file mode 100644
index a4dad295ed..0000000000
--- a/src/test/ui/consts/const-eval/promoted_errors2.stderr
+++ /dev/null
@@ -1,66 +0,0 @@
-warning: attempt to subtract with overflow
-  --> $DIR/promoted_errors2.rs:8:20
-   |
-LL |     println!("{}", 0u32 - 1);
-   |                    ^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/promoted_errors2.rs:5:9
-   |
-LL | #![warn(const_err)]
-   |         ^^^^^^^^^
-
-warning: attempt to subtract with overflow
-  --> $DIR/promoted_errors2.rs:10:14
-   |
-LL |     let _x = 0u32 - 1;
-   |              ^^^^^^^^
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors2.rs:12:20
-   |
-LL |     println!("{}", 1 / (1 - 1));
-   |                    ^^^^^^^^^^^
-
-warning: reaching this expression at runtime will panic or abort
-  --> $DIR/promoted_errors2.rs:12:20
-   |
-LL |     println!("{}", 1 / (1 - 1));
-   |                    ^^^^^^^^^^^ dividing by zero
-
-warning: erroneous constant used
-  --> $DIR/promoted_errors2.rs:12:20
-   |
-LL |     println!("{}", 1 / (1 - 1));
-   |                    ^^^^^^^^^^^ referenced constant has errors
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors2.rs:16:14
-   |
-LL |     let _x = 1 / (1 - 1);
-   |              ^^^^^^^^^^^
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors2.rs:18:20
-   |
-LL |     println!("{}", 1 / (false as u32));
-   |                    ^^^^^^^^^^^^^^^^^^
-
-warning: reaching this expression at runtime will panic or abort
-  --> $DIR/promoted_errors2.rs:18:20
-   |
-LL |     println!("{}", 1 / (false as u32));
-   |                    ^^^^^^^^^^^^^^^^^^ dividing by zero
-
-warning: erroneous constant used
-  --> $DIR/promoted_errors2.rs:18:20
-   |
-LL |     println!("{}", 1 / (false as u32));
-   |                    ^^^^^^^^^^^^^^^^^^ referenced constant has errors
-
-warning: attempt to divide by zero
-  --> $DIR/promoted_errors2.rs:22:14
-   |
-LL |     let _x = 1 / (false as u32);
-   |              ^^^^^^^^^^^^^^^^^^
-
diff --git a/src/test/ui/consts/const-eval/pub_const_err.stderr b/src/test/ui/consts/const-eval/pub_const_err.stderr
index bd262b69da..ded2df4e01 100644
--- a/src/test/ui/consts/const-eval/pub_const_err.stderr
+++ b/src/test/ui/consts/const-eval/pub_const_err.stderr
@@ -6,7 +6,7 @@ LL | pub const Z: u32 = 0 - 1;
    |                    |
    |                    attempt to subtract with overflow
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/pub_const_err.rs:2:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-eval/pub_const_err_bin.stderr b/src/test/ui/consts/const-eval/pub_const_err_bin.stderr
index 866d1753ed..570a8e4931 100644
--- a/src/test/ui/consts/const-eval/pub_const_err_bin.stderr
+++ b/src/test/ui/consts/const-eval/pub_const_err_bin.stderr
@@ -6,7 +6,7 @@ LL | pub const Z: u32 = 0 - 1;
    |                    |
    |                    attempt to subtract with overflow
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/pub_const_err_bin.rs:2:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/const-eval/transmute-const.stderr b/src/test/ui/consts/const-eval/transmute-const.stderr
index 47f89fccf7..e93a6887ba 100644
--- a/src/test/ui/consts/const-eval/transmute-const.stderr
+++ b/src/test/ui/consts/const-eval/transmute-const.stderr
@@ -2,7 +2,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/transmute-const.rs:5:1
    |
 LL | static FOO: bool = unsafe { mem::transmute(3u8) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3, but expected something less or equal to 1
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3, but expected a boolean
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-eval/ub-enum.rs b/src/test/ui/consts/const-eval/ub-enum.rs
index 483285aa4e..1922d59891 100644
--- a/src/test/ui/consts/const-eval/ub-enum.rs
+++ b/src/test/ui/consts/const-eval/ub-enum.rs
@@ -1,34 +1,36 @@
+#![feature(const_transmute, never_type)]
 #![allow(const_err)] // make sure we cannot allow away the errors tested here
 
+use std::mem;
 
 #[repr(transparent)]
 #[derive(Copy, Clone)]
 struct Wrap<T>(T);
 
+#[derive(Copy, Clone)]
+enum Never {}
+
+// # simple enum with discriminant 0
+
 #[repr(usize)]
 #[derive(Copy, Clone)]
 enum Enum {
     A = 0,
 }
-#[repr(C)]
-union TransmuteEnum {
-    in1: &'static u8,
-    in2: usize,
-    out1: Enum,
-    out2: Wrap<Enum>,
-}
 
-const GOOD_ENUM: Enum = unsafe { TransmuteEnum { in2: 0 }.out1 };
+const GOOD_ENUM: Enum = unsafe { mem::transmute(0usize) };
 
-const BAD_ENUM: Enum = unsafe { TransmuteEnum { in2: 1 }.out1 };
+const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
 //~^ ERROR is undefined behavior
 
-const BAD_ENUM_PTR: Enum = unsafe { TransmuteEnum { in1: &1 }.out1 };
+const BAD_ENUM_PTR: Enum = unsafe { mem::transmute(&1) };
 //~^ ERROR is undefined behavior
 
-const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { TransmuteEnum { in1: &1 }.out2 };
+const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { mem::transmute(&1) };
 //~^ ERROR is undefined behavior
 
+// # simple enum with discriminant 2
+
 // (Potentially) invalid enum discriminant
 #[repr(usize)]
 #[derive(Copy, Clone)]
@@ -36,39 +38,58 @@ enum Enum2 {
     A = 2,
 }
 
-#[repr(C)]
-union TransmuteEnum2 {
-    in1: usize,
-    in2: &'static u8,
-    in3: (),
-    out1: Enum2,
-    out2: Wrap<Enum2>, // something wrapping the enum so that we test layout first, not enum
-    out3: Option<Enum2>,
-}
-const BAD_ENUM2: Enum2 = unsafe { TransmuteEnum2 { in1: 0 }.out1 };
+const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
 //~^ ERROR is undefined behavior
-const BAD_ENUM2_PTR: Enum2 = unsafe { TransmuteEnum2 { in2: &0 }.out1 };
+const BAD_ENUM2_PTR: Enum2 = unsafe { mem::transmute(&0) };
 //~^ ERROR is undefined behavior
-const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { TransmuteEnum2 { in2: &0 }.out2 };
+// something wrapping the enum so that we test layout first, not enum
+const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { mem::transmute(&0) };
 //~^ ERROR is undefined behavior
 
 // Undef enum discriminant.
-const BAD_ENUM2_UNDEF : Enum2 = unsafe { TransmuteEnum2 { in3: () }.out1 };
+#[repr(C)]
+union MaybeUninit<T: Copy> {
+    uninit: (),
+    init: T,
+}
+const BAD_ENUM2_UNDEF : Enum2 = unsafe { MaybeUninit { uninit: () }.init };
 //~^ ERROR is undefined behavior
 
 // Pointer value in an enum with a niche that is not just 0.
-const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { TransmuteEnum2 { in2: &0 }.out3 };
+const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
 //~^ ERROR is undefined behavior
 
+// # valid discriminant for uninhabited variant
+
+// An enum with 3 variants of which some are uninhabited -- so the uninhabited variants *do*
+// have a discriminant.
+enum UninhDiscriminant {
+    A,
+    B(!),
+    C,
+    D(Never),
+}
+
+const GOOD_INHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(0u8) }; // variant A
+const GOOD_INHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(2u8) }; // variant C
+
+const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
+//~^ ERROR is undefined behavior
+const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
+//~^ ERROR is undefined behavior
+
+// # other
+
 // Invalid enum field content (mostly to test printing of paths for enum tuple
 // variants and tuples).
-#[repr(C)]
-union TransmuteChar {
-    a: u32,
-    b: char,
-}
 // Need to create something which does not clash with enum layout optimizations.
-const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { TransmuteChar { a: !0 }.b }));
+const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
+//~^ ERROR is undefined behavior
+
+// All variants are uninhabited but also have data.
+const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(1u64) };
+//~^ ERROR is undefined behavior
+const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(1u64) };
 //~^ ERROR is undefined behavior
 
 fn main() {
diff --git a/src/test/ui/consts/const-eval/ub-enum.stderr b/src/test/ui/consts/const-eval/ub-enum.stderr
index 8ebc9dbec8..10a3d2fa1a 100644
--- a/src/test/ui/consts/const-eval/ub-enum.stderr
+++ b/src/test/ui/consts/const-eval/ub-enum.stderr
@@ -1,75 +1,107 @@
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-enum.rs:23:1
    |
-LL | const BAD_ENUM: Enum = unsafe { TransmuteEnum { in2: 1 }.out1 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 1, but expected a valid enum discriminant
+LL | const BAD_ENUM: Enum = unsafe { mem::transmute(1usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 1, but expected a valid enum discriminant
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-enum.rs:26:1
    |
-LL | const BAD_ENUM_PTR: Enum = unsafe { TransmuteEnum { in1: &1 }.out1 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected a valid enum discriminant
+LL | const BAD_ENUM_PTR: Enum = unsafe { mem::transmute(&1) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .<enum-tag>, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-enum.rs:29:1
    |
-LL | const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { TransmuteEnum { in1: &1 }.out2 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected something that cannot possibly fail to be equal to 0
+LL | const BAD_ENUM_WRAPPED: Wrap<Enum> = unsafe { mem::transmute(&1) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .0.<enum-tag>, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:48:1
+  --> $DIR/ub-enum.rs:41:1
    |
-LL | const BAD_ENUM2: Enum2 = unsafe { TransmuteEnum2 { in1: 0 }.out1 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 0, but expected a valid enum discriminant
+LL | const BAD_ENUM2: Enum2 = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 0, but expected a valid enum discriminant
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:50:1
+  --> $DIR/ub-enum.rs:43:1
    |
-LL | const BAD_ENUM2_PTR: Enum2 = unsafe { TransmuteEnum2 { in2: &0 }.out1 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected a valid enum discriminant
+LL | const BAD_ENUM2_PTR: Enum2 = unsafe { mem::transmute(&0) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .<enum-tag>, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:52:1
+  --> $DIR/ub-enum.rs:46:1
    |
-LL | const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { TransmuteEnum2 { in2: &0 }.out2 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected something that cannot possibly fail to be equal to 2
+LL | const BAD_ENUM2_WRAPPED: Wrap<Enum2> = unsafe { mem::transmute(&0) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .0.<enum-tag>, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:56:1
+  --> $DIR/ub-enum.rs:55:1
    |
-LL | const BAD_ENUM2_UNDEF : Enum2 = unsafe { TransmuteEnum2 { in3: () }.out1 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized bytes, but expected a valid enum discriminant
+LL | const BAD_ENUM2_UNDEF : Enum2 = unsafe { MaybeUninit { uninit: () }.init };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized bytes at .<enum-tag>, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:60:1
+  --> $DIR/ub-enum.rs:59:1
    |
-LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { TransmuteEnum2 { in2: &0 }.out3 };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected a valid enum discriminant
+LL | const BAD_ENUM2_OPTION_PTR: Option<Enum2> = unsafe { mem::transmute(&0) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .<enum-tag>, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-enum.rs:71:1
+  --> $DIR/ub-enum.rs:76:1
    |
-LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { TransmuteChar { a: !0 }.b }));
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 4294967295 at .<downcast-variant(Some)>.0.1, but expected something less or equal to 1114111
+LL | const BAD_UNINHABITED_VARIANT1: UninhDiscriminant = unsafe { mem::transmute(1u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of the never type `!` at .<enum-variant(B)>.0
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
-error: aborting due to 9 previous errors
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-enum.rs:78:1
+   |
+LL | const BAD_UNINHABITED_VARIANT2: UninhDiscriminant = unsafe { mem::transmute(3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of uninhabited type Never at .<enum-variant(D)>.0
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-enum.rs:86:1
+   |
+LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute(!0u32) }));
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 4294967295 at .<enum-variant(Some)>.0.1, but expected a valid unicode codepoint
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-enum.rs:90:1
+   |
+LL | const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(1u64) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of the never type `!` at .<enum-variant(Err)>.0.1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-enum.rs:92:1
+   |
+LL | const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(1u64) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of uninhabited type Never at .<enum-variant(Err)>.0.1
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error: aborting due to 13 previous errors
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/ub-nonnull.rs b/src/test/ui/consts/const-eval/ub-nonnull.rs
index 8ce64ced7d..1f46b6c98a 100644
--- a/src/test/ui/consts/const-eval/ub-nonnull.rs
+++ b/src/test/ui/consts/const-eval/ub-nonnull.rs
@@ -25,11 +25,11 @@ const NULL_USIZE: NonZeroUsize = unsafe { mem::transmute(0usize) };
 //~^ ERROR it is undefined behavior to use this value
 
 #[repr(C)]
-union Transmute {
+union MaybeUninit<T: Copy> {
     uninit: (),
-    out: NonZeroU8,
+    init: T,
 }
-const UNINIT: NonZeroU8 = unsafe { Transmute { uninit: () }.out };
+const UNINIT: NonZeroU8 = unsafe { MaybeUninit { uninit: () }.init };
 //~^ ERROR it is undefined behavior to use this value
 
 // Also test other uses of rustc_layout_scalar_valid_range_start
diff --git a/src/test/ui/consts/const-eval/ub-nonnull.stderr b/src/test/ui/consts/const-eval/ub-nonnull.stderr
index c2446d1404..edfc7ac837 100644
--- a/src/test/ui/consts/const-eval/ub-nonnull.stderr
+++ b/src/test/ui/consts/const-eval/ub-nonnull.stderr
@@ -18,7 +18,7 @@ LL | |     mem::transmute(out_of_bounds_ptr)
 LL | | } };
    | |____-
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/ub-nonnull.rs:14:8
    |
 LL | #[deny(const_err)] // this triggers a `const_err` so validation does not even happen
@@ -43,8 +43,8 @@ LL | const NULL_USIZE: NonZeroUsize = unsafe { mem::transmute(0usize) };
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-nonnull.rs:32:1
    |
-LL | const UNINIT: NonZeroU8 = unsafe { Transmute { uninit: () }.out };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized bytes, but expected something greater or equal to 1
+LL | const UNINIT: NonZeroU8 = unsafe { MaybeUninit { uninit: () }.init };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized bytes at .0, but expected initialized plain (non-pointer) bytes
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-eval/ub-ref.rs b/src/test/ui/consts/const-eval/ub-ref.rs
index 03ac12c8b1..562ec99111 100644
--- a/src/test/ui/consts/const-eval/ub-ref.rs
+++ b/src/test/ui/consts/const-eval/ub-ref.rs
@@ -6,11 +6,18 @@ use std::mem;
 
 const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
 //~^ ERROR it is undefined behavior to use this value
-//~^^ type validation failed: encountered unaligned reference (required 2 byte alignment but found 1)
+//~^^ type validation failed: encountered an unaligned reference (required 2 byte alignment but found 1)
+
+const UNALIGNED_BOX: Box<u16> = unsafe { mem::transmute(&[0u8; 4]) };
+//~^ ERROR it is undefined behavior to use this value
+//~^^ type validation failed: encountered an unaligned box (required 2 byte alignment but found 1)
 
 const NULL: &u16 = unsafe { mem::transmute(0usize) };
 //~^ ERROR it is undefined behavior to use this value
 
+const NULL_BOX: Box<u16> = unsafe { mem::transmute(0usize) };
+//~^ ERROR it is undefined behavior to use this value
+
 // It is very important that we reject this: We do promote `&(4 * REF_AS_USIZE)`,
 // but that would fail to compile; so we ended up breaking user code that would
 // have worked fine had we not promoted.
@@ -20,7 +27,13 @@ const REF_AS_USIZE: usize = unsafe { mem::transmute(&0) };
 const REF_AS_USIZE_SLICE: &[usize] = &[unsafe { mem::transmute(&0) }];
 //~^ ERROR it is undefined behavior to use this value
 
+const REF_AS_USIZE_BOX_SLICE: Box<[usize]> = unsafe { mem::transmute::<&[usize], _>(&[mem::transmute(&0)]) };
+//~^ ERROR it is undefined behavior to use this value
+
 const USIZE_AS_REF: &'static u8 = unsafe { mem::transmute(1337usize) };
 //~^ ERROR it is undefined behavior to use this value
 
+const USIZE_AS_BOX: Box<u8> = unsafe { mem::transmute(1337usize) };
+//~^ ERROR it is undefined behavior to use this value
+
 fn main() {}
diff --git a/src/test/ui/consts/const-eval/ub-ref.stderr b/src/test/ui/consts/const-eval/ub-ref.stderr
index 01bde413c0..fb3df8ace4 100644
--- a/src/test/ui/consts/const-eval/ub-ref.stderr
+++ b/src/test/ui/consts/const-eval/ub-ref.stderr
@@ -2,20 +2,36 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-ref.rs:7:1
    |
 LL | const UNALIGNED: &u16 = unsafe { mem::transmute(&[0u8; 4]) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered unaligned reference (required 2 byte alignment but found 1)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered an unaligned reference (required 2 byte alignment but found 1)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-ref.rs:11:1
    |
+LL | const UNALIGNED_BOX: Box<u16> = unsafe { mem::transmute(&[0u8; 4]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered an unaligned box (required 2 byte alignment but found 1)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref.rs:15:1
+   |
 LL | const NULL: &u16 = unsafe { mem::transmute(0usize) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 0, but expected something greater or equal to 1
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a NULL reference
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref.rs:18:1
+   |
+LL | const NULL_BOX: Box<u16> = unsafe { mem::transmute(0usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a NULL box
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-ref.rs:17:1
+  --> $DIR/ub-ref.rs:24:1
    |
 LL | const REF_AS_USIZE: usize = unsafe { mem::transmute(&0) };
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer, but expected initialized plain (non-pointer) bytes
@@ -23,7 +39,7 @@ LL | const REF_AS_USIZE: usize = unsafe { mem::transmute(&0) };
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-ref.rs:20:1
+  --> $DIR/ub-ref.rs:27:1
    |
 LL | const REF_AS_USIZE_SLICE: &[usize] = &[unsafe { mem::transmute(&0) }];
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .<deref>, but expected plain (non-pointer) bytes
@@ -31,13 +47,29 @@ LL | const REF_AS_USIZE_SLICE: &[usize] = &[unsafe { mem::transmute(&0) }];
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-ref.rs:23:1
+  --> $DIR/ub-ref.rs:30:1
+   |
+LL | const REF_AS_USIZE_BOX_SLICE: Box<[usize]> = unsafe { mem::transmute::<&[usize], _>(&[mem::transmute(&0)]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a pointer at .<deref>, but expected plain (non-pointer) bytes
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref.rs:33:1
    |
 LL | const USIZE_AS_REF: &'static u8 = unsafe { mem::transmute(1337usize) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling reference (created from integer)
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a dangling reference (created from integer)
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-ref.rs:36:1
+   |
+LL | const USIZE_AS_BOX: Box<u8> = unsafe { mem::transmute(1337usize) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a dangling box (created from integer)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
-error: aborting due to 5 previous errors
+error: aborting due to 9 previous errors
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/ub-uninhabit.rs b/src/test/ui/consts/const-eval/ub-uninhabit.rs
index d2745d71bd..e7350ae271 100644
--- a/src/test/ui/consts/const-eval/ub-uninhabit.rs
+++ b/src/test/ui/consts/const-eval/ub-uninhabit.rs
@@ -7,18 +7,18 @@ use std::mem;
 enum Bar {}
 
 #[repr(C)]
-union TransmuteUnion<A: Clone + Copy, B: Clone + Copy> {
-    a: A,
-    b: B,
+union MaybeUninit<T: Copy> {
+    uninit: (),
+    init: T,
 }
 
-const BAD_BAD_BAD: Bar = unsafe { (TransmuteUnion::<(), Bar> { a: () }).b };
+const BAD_BAD_BAD: Bar = unsafe { MaybeUninit { uninit: () }.init };
 //~^ ERROR it is undefined behavior to use this value
 
 const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
 //~^ ERROR it is undefined behavior to use this value
 
-const BAD_BAD_ARRAY: [Bar; 1] = unsafe { (TransmuteUnion::<(), [Bar; 1]> { a: () }).b };
+const BAD_BAD_ARRAY: [Bar; 1] = unsafe { MaybeUninit { uninit: () }.init };
 //~^ ERROR it is undefined behavior to use this value
 
 fn main() {}
diff --git a/src/test/ui/consts/const-eval/ub-uninhabit.stderr b/src/test/ui/consts/const-eval/ub-uninhabit.stderr
index 3877f3cab6..8ce4279a8b 100644
--- a/src/test/ui/consts/const-eval/ub-uninhabit.stderr
+++ b/src/test/ui/consts/const-eval/ub-uninhabit.stderr
@@ -1,8 +1,8 @@
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-uninhabit.rs:15:1
    |
-LL | const BAD_BAD_BAD: Bar = unsafe { (TransmuteUnion::<(), Bar> { a: () }).b };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type
+LL | const BAD_BAD_BAD: Bar = unsafe { MaybeUninit { uninit: () }.init };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of uninhabited type Bar
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
@@ -10,15 +10,15 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-uninhabit.rs:18:1
    |
 LL | const BAD_BAD_REF: &Bar = unsafe { mem::transmute(1usize) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type at .<deref>
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of uninhabited type Bar at .<deref>
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/ub-uninhabit.rs:21:1
    |
-LL | const BAD_BAD_ARRAY: [Bar; 1] = unsafe { (TransmuteUnion::<(), [Bar; 1]> { a: () }).b };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type
+LL | const BAD_BAD_ARRAY: [Bar; 1] = unsafe { MaybeUninit { uninit: () }.init };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of uninhabited type Bar at [0]
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-eval/ub-upvars.stderr b/src/test/ui/consts/const-eval/ub-upvars.stderr
index ea6ab3ae5b..972c9eb38c 100644
--- a/src/test/ui/consts/const-eval/ub-upvars.stderr
+++ b/src/test/ui/consts/const-eval/ub-upvars.stderr
@@ -6,7 +6,7 @@ LL | |     let bad_ref: &'static u16 = unsafe { mem::transmute(0usize) };
 LL | |     let another_var = 13;
 LL | |     move || { let _ = bad_ref; let _ = another_var; }
 LL | | };
-   | |__^ type validation failed: encountered 0 at .<deref>.<dyn-downcast>.<closure-var(bad_ref)>, but expected something greater or equal to 1
+   | |__^ type validation failed: encountered a NULL reference at .<deref>.<dyn-downcast>.<captured-var(bad_ref)>
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-eval/ub-wide-ptr.rs b/src/test/ui/consts/const-eval/ub-wide-ptr.rs
index a5c2a57c6c..2d48309b72 100644
--- a/src/test/ui/consts/const-eval/ub-wide-ptr.rs
+++ b/src/test/ui/consts/const-eval/ub-wide-ptr.rs
@@ -1,72 +1,18 @@
 // ignore-tidy-linelength
+#![feature(const_transmute)]
 #![allow(unused)]
 #![allow(const_err)] // make sure we cannot allow away the errors tested here
 
+use std::mem;
+
 // normalize-stderr-test "offset \d+" -> "offset N"
 // normalize-stderr-test "allocation \d+" -> "allocation N"
 // normalize-stderr-test "size \d+" -> "size N"
 
 #[repr(C)]
-union BoolTransmute {
-  val: u8,
-  bl: bool,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct SliceRepr {
-    ptr: *const u8,
-    len: usize,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct BadSliceRepr {
-    ptr: *const u8,
-    len: &'static u8,
-}
-
-#[repr(C)]
-union SliceTransmute {
-    repr: SliceRepr,
-    bad: BadSliceRepr,
-    addr: usize,
-    slice: &'static [u8],
-    raw_slice: *const [u8],
-    str: &'static str,
-    my_str: &'static MyStr,
-    my_slice: &'static MySliceBool,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct DynRepr {
-    ptr: *const u8,
-    vtable: *const u8,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct DynRepr2 {
-    ptr: *const u8,
-    vtable: *const u64,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct BadDynRepr {
-    ptr: *const u8,
-    vtable: usize,
-}
-
-#[repr(C)]
-union DynTransmute {
-    repr: DynRepr,
-    repr2: DynRepr2,
-    bad: BadDynRepr,
-    addr: usize,
-    rust: &'static dyn Trait,
-    raw_rust: *const dyn Trait,
+union MaybeUninit<T: Copy> {
+    uninit: (),
+    init: T,
 }
 
 trait Trait {}
@@ -81,90 +27,103 @@ type MySliceBool = MySlice<[bool]>;
 
 // # str
 // OK
-const STR_VALID: &str = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 1 } }.str};
+const STR_VALID: &str = unsafe { mem::transmute((&42u8, 1usize)) };
 // bad str
-const STR_TOO_LONG: &str = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.str};
+const STR_TOO_LONG: &str = unsafe { mem::transmute((&42u8, 999usize)) };
+//~^ ERROR it is undefined behavior to use this value
+const NESTED_STR_MUCH_TOO_LONG: (&str,) = (unsafe { mem::transmute((&42, usize::MAX)) },);
 //~^ ERROR it is undefined behavior to use this value
 // bad str
-const STR_LENGTH_PTR: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.str};
+const STR_LENGTH_PTR: &str = unsafe { mem::transmute((&42u8, &3)) };
 //~^ ERROR it is undefined behavior to use this value
 // bad str in user-defined unsized type
-const MY_STR_LENGTH_PTR: &MyStr = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.my_str};
+const MY_STR_LENGTH_PTR: &MyStr = unsafe { mem::transmute((&42u8, &3)) };
+//~^ ERROR it is undefined behavior to use this value
+const MY_STR_MUCH_TOO_LONG: &MyStr = unsafe { mem::transmute((&42u8, usize::MAX)) };
 //~^ ERROR it is undefined behavior to use this value
 
 // invalid UTF-8
-const STR_NO_UTF8: &str = unsafe { SliceTransmute { slice: &[0xFF] }.str };
+const STR_NO_UTF8: &str = unsafe { mem::transmute::<&[u8], _>(&[0xFF]) };
 //~^ ERROR it is undefined behavior to use this value
 // invalid UTF-8 in user-defined str-like
-const MYSTR_NO_UTF8: &MyStr = unsafe { SliceTransmute { slice: &[0xFF] }.my_str };
+const MYSTR_NO_UTF8: &MyStr = unsafe { mem::transmute::<&[u8], _>(&[0xFF]) };
 //~^ ERROR it is undefined behavior to use this value
 
 // # slice
 // OK
-const SLICE_VALID: &[u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 1 } }.slice};
+const SLICE_VALID: &[u8] = unsafe { mem::transmute((&42u8, 1usize)) };
 // bad slice: length uninit
-const SLICE_LENGTH_UNINIT: &[u8] = unsafe { SliceTransmute { addr: 42 }.slice};
+const SLICE_LENGTH_UNINIT: &[u8] = unsafe {
 //~^ ERROR it is undefined behavior to use this value
+    let uninit_len = MaybeUninit::<usize> { uninit: () };
+    mem::transmute((42, uninit_len))
+};
 // bad slice: length too big
-const SLICE_TOO_LONG: &[u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.slice};
+const SLICE_TOO_LONG: &[u8] = unsafe { mem::transmute((&42u8, 999usize)) };
 //~^ ERROR it is undefined behavior to use this value
 // bad slice: length not an int
-const SLICE_LENGTH_PTR: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.slice};
+const SLICE_LENGTH_PTR: &[u8] = unsafe { mem::transmute((&42u8, &3)) };
+//~^ ERROR it is undefined behavior to use this value
+// bad slice box: length too big
+const SLICE_TOO_LONG_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, 999usize)) };
+//~^ ERROR it is undefined behavior to use this value
+// bad slice box: length not an int
+const SLICE_LENGTH_PTR_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, &3)) };
 //~^ ERROR it is undefined behavior to use this value
 
 // bad data *inside* the slice
-const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { BoolTransmute { val: 3 }.bl }];
+const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
 //~^ ERROR it is undefined behavior to use this value
 
 // good MySliceBool
 const MYSLICE_GOOD: &MySliceBool = &MySlice(true, [false]);
 // bad: sized field is not okay
-const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { BoolTransmute { val: 3 }.bl }, [false]);
+const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
 //~^ ERROR it is undefined behavior to use this value
 // bad: unsized part is not okay
-const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { BoolTransmute { val: 3 }.bl }]);
+const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
 //~^ ERROR it is undefined behavior to use this value
 
 // # raw slice
-const RAW_SLICE_VALID: *const [u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 1 } }.raw_slice}; // ok
-const RAW_SLICE_TOO_LONG: *const [u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.raw_slice}; // ok because raw
-const RAW_SLICE_MUCH_TOO_LONG: *const [u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: usize::max_value() } }.raw_slice}; // ok because raw
-const RAW_SLICE_LENGTH_UNINIT: *const [u8] = unsafe { SliceTransmute { addr: 42 }.raw_slice};
+const RAW_SLICE_VALID: *const [u8] = unsafe { mem::transmute((&42u8, 1usize)) }; // ok
+const RAW_SLICE_TOO_LONG: *const [u8] = unsafe { mem::transmute((&42u8, 999usize)) }; // ok because raw
+const RAW_SLICE_MUCH_TOO_LONG: *const [u8] = unsafe { mem::transmute((&42u8, usize::MAX)) }; // ok because raw
+const RAW_SLICE_LENGTH_UNINIT: *const [u8] = unsafe {
 //~^ ERROR it is undefined behavior to use this value
+    let uninit_len = MaybeUninit::<usize> { uninit: () };
+    mem::transmute((42, uninit_len))
+};
 
 // # trait object
 // bad trait object
-const TRAIT_OBJ_SHORT_VTABLE_1: &dyn Trait = unsafe { DynTransmute { repr: DynRepr { ptr: &92, vtable: &3 } }.rust};
+const TRAIT_OBJ_SHORT_VTABLE_1: &dyn Trait = unsafe { mem::transmute((&92u8, &3u8)) };
 //~^ ERROR it is undefined behavior to use this value
 // bad trait object
-const TRAIT_OBJ_SHORT_VTABLE_2: &dyn Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust};
+const TRAIT_OBJ_SHORT_VTABLE_2: &dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
 //~^ ERROR it is undefined behavior to use this value
 // bad trait object
-const TRAIT_OBJ_INT_VTABLE: &dyn Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 3 } }.rust};
+const TRAIT_OBJ_INT_VTABLE: &dyn Trait = unsafe { mem::transmute((&92u8, 4usize)) };
 //~^ ERROR it is undefined behavior to use this value
 
 // bad data *inside* the trait object
-const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = &unsafe { BoolTransmute { val: 3 }.bl };
+const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) };
 //~^ ERROR it is undefined behavior to use this value
 
 // # raw trait object
-const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 0 } }.raw_rust};
+const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { mem::transmute((&92u8, 0usize)) };
 //~^ ERROR it is undefined behavior to use this value
-const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.raw_rust};
+const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
 //~^ ERROR it is undefined behavior to use this value
-const RAW_TRAIT_OBJ_CONTENT_INVALID: *const dyn Trait = &unsafe { BoolTransmute { val: 3 }.bl } as *const _; // ok because raw
+const RAW_TRAIT_OBJ_CONTENT_INVALID: *const dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) } as *const dyn Trait; // ok because raw
 
 // Const eval fails for these, so they need to be statics to error.
 static mut RAW_TRAIT_OBJ_VTABLE_NULL_THROUGH_REF: *const dyn Trait = unsafe {
-    DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 0 } }.rust
+    mem::transmute::<_, &dyn Trait>((&92u8, 0usize))
     //~^ ERROR could not evaluate static initializer
 };
 static mut RAW_TRAIT_OBJ_VTABLE_INVALID_THROUGH_REF: *const dyn Trait = unsafe {
-    DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust
+    mem::transmute::<_, &dyn Trait>((&92u8, &3u64))
     //~^ ERROR could not evaluate static initializer
 };
 
-fn main() {
-    let _ = RAW_TRAIT_OBJ_VTABLE_NULL;
-    let _ = RAW_TRAIT_OBJ_VTABLE_INVALID;
-}
+fn main() {}
diff --git a/src/test/ui/consts/const-eval/ub-wide-ptr.stderr b/src/test/ui/consts/const-eval/ub-wide-ptr.stderr
index ce57d680dc..a562c64b12 100644
--- a/src/test/ui/consts/const-eval/ub-wide-ptr.stderr
+++ b/src/test/ui/consts/const-eval/ub-wide-ptr.stderr
@@ -1,159 +1,199 @@
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:86:1
+  --> $DIR/ub-wide-ptr.rs:32:1
    |
-LL | const STR_TOO_LONG: &str = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.str};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling reference (not entirely in bounds)
+LL | const STR_TOO_LONG: &str = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a dangling reference (not entirely in bounds)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:89:1
+  --> $DIR/ub-wide-ptr.rs:34:1
    |
-LL | const STR_LENGTH_PTR: &str = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.str};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
+LL | const NESTED_STR_MUCH_TOO_LONG: (&str,) = (unsafe { mem::transmute((&42, usize::MAX)) },);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered invalid reference metadata: slice is bigger than largest supported object at .0
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:92:1
+  --> $DIR/ub-wide-ptr.rs:37:1
    |
-LL | const MY_STR_LENGTH_PTR: &MyStr = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.my_str};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
+LL | const STR_LENGTH_PTR: &str = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:96:1
+  --> $DIR/ub-wide-ptr.rs:40:1
    |
-LL | const STR_NO_UTF8: &str = unsafe { SliceTransmute { slice: &[0xFF] }.str };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized or non-UTF-8 data in str at .<deref>
+LL | const MY_STR_LENGTH_PTR: &MyStr = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:99:1
+  --> $DIR/ub-wide-ptr.rs:42:1
    |
-LL | const MYSTR_NO_UTF8: &MyStr = unsafe { SliceTransmute { slice: &[0xFF] }.my_str };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized or non-UTF-8 data in str at .<deref>.0
+LL | const MY_STR_MUCH_TOO_LONG: &MyStr = unsafe { mem::transmute((&42u8, usize::MAX)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered invalid reference metadata: slice is bigger than largest supported object
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:106:1
+  --> $DIR/ub-wide-ptr.rs:46:1
    |
-LL | const SLICE_LENGTH_UNINIT: &[u8] = unsafe { SliceTransmute { addr: 42 }.slice};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered undefined pointer
+LL | const STR_NO_UTF8: &str = unsafe { mem::transmute::<&[u8], _>(&[0xFF]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized or non-UTF-8 data in str at .<deref>
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:109:1
+  --> $DIR/ub-wide-ptr.rs:49:1
+   |
+LL | const MYSTR_NO_UTF8: &MyStr = unsafe { mem::transmute::<&[u8], _>(&[0xFF]) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered uninitialized or non-UTF-8 data in str at .<deref>.0
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:56:1
+   |
+LL | / const SLICE_LENGTH_UNINIT: &[u8] = unsafe {
+LL | |
+LL | |     let uninit_len = MaybeUninit::<usize> { uninit: () };
+LL | |     mem::transmute((42, uninit_len))
+LL | | };
+   | |__^ type validation failed: encountered undefined pointer
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:62:1
    |
-LL | const SLICE_TOO_LONG: &[u8] = unsafe { SliceTransmute { repr: SliceRepr { ptr: &42, len: 999 } }.slice};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling reference (not entirely in bounds)
+LL | const SLICE_TOO_LONG: &[u8] = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a dangling reference (not entirely in bounds)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:112:1
+  --> $DIR/ub-wide-ptr.rs:65:1
    |
-LL | const SLICE_LENGTH_PTR: &[u8] = unsafe { SliceTransmute { bad: BadSliceRepr { ptr: &42, len: &3 } }.slice};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
+LL | const SLICE_LENGTH_PTR: &[u8] = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:116:1
+  --> $DIR/ub-wide-ptr.rs:68:1
    |
-LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { BoolTransmute { val: 3 }.bl }];
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>[0], but expected something less or equal to 1
+LL | const SLICE_TOO_LONG_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, 999usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a dangling box (not entirely in bounds)
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:122:1
+  --> $DIR/ub-wide-ptr.rs:71:1
    |
-LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { BoolTransmute { val: 3 }.bl }, [false]);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>.0, but expected something less or equal to 1
+LL | const SLICE_LENGTH_PTR_BOX: Box<[u8]> = unsafe { mem::transmute((&42u8, &3)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered non-integer slice length in wide pointer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:125:1
+  --> $DIR/ub-wide-ptr.rs:75:1
    |
-LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { BoolTransmute { val: 3 }.bl }]);
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>.1[0], but expected something less or equal to 1
+LL | const SLICE_CONTENT_INVALID: &[bool] = &[unsafe { mem::transmute(3u8) }];
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>[0], but expected a boolean
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:132:1
+  --> $DIR/ub-wide-ptr.rs:81:1
    |
-LL | const RAW_SLICE_LENGTH_UNINIT: *const [u8] = unsafe { SliceTransmute { addr: 42 }.raw_slice};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered undefined pointer
+LL | const MYSLICE_PREFIX_BAD: &MySliceBool = &MySlice(unsafe { mem::transmute(3u8) }, [false]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>.0, but expected a boolean
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:137:1
+  --> $DIR/ub-wide-ptr.rs:84:1
    |
-LL | const TRAIT_OBJ_SHORT_VTABLE_1: &dyn Trait = unsafe { DynTransmute { repr: DynRepr { ptr: &92, vtable: &3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+LL | const MYSLICE_SUFFIX_BAD: &MySliceBool = &MySlice(true, [unsafe { mem::transmute(3u8) }]);
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>.1[0], but expected a boolean
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:140:1
+  --> $DIR/ub-wide-ptr.rs:91:1
    |
-LL | const TRAIT_OBJ_SHORT_VTABLE_2: &dyn Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+LL | / const RAW_SLICE_LENGTH_UNINIT: *const [u8] = unsafe {
+LL | |
+LL | |     let uninit_len = MaybeUninit::<usize> { uninit: () };
+LL | |     mem::transmute((42, uninit_len))
+LL | | };
+   | |__^ type validation failed: encountered undefined pointer
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:143:1
+  --> $DIR/ub-wide-ptr.rs:99:1
+   |
+LL | const TRAIT_OBJ_SHORT_VTABLE_1: &dyn Trait = unsafe { mem::transmute((&92u8, &3u8)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:102:1
    |
-LL | const TRAIT_OBJ_INT_VTABLE: &dyn Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 3 } }.rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+LL | const TRAIT_OBJ_SHORT_VTABLE_2: &dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:147:1
+  --> $DIR/ub-wide-ptr.rs:105:1
+   |
+LL | const TRAIT_OBJ_INT_VTABLE: &dyn Trait = unsafe { mem::transmute((&92u8, 4usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/ub-wide-ptr.rs:109:1
    |
-LL | const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = &unsafe { BoolTransmute { val: 3 }.bl };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>.<dyn-downcast>, but expected something less or equal to 1
+LL | const TRAIT_OBJ_CONTENT_INVALID: &dyn Trait = unsafe { mem::transmute::<_, &bool>(&3u8) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 3 at .<deref>.<dyn-downcast>, but expected a boolean
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:151:1
+  --> $DIR/ub-wide-ptr.rs:113:1
    |
-LL | const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 0 } }.raw_rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+LL | const RAW_TRAIT_OBJ_VTABLE_NULL: *const dyn Trait = unsafe { mem::transmute((&92u8, 0usize)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: it is undefined behavior to use this value
-  --> $DIR/ub-wide-ptr.rs:153:1
+  --> $DIR/ub-wide-ptr.rs:115:1
    |
-LL | const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.raw_rust};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
+LL | const RAW_TRAIT_OBJ_VTABLE_INVALID: *const dyn Trait = unsafe { mem::transmute((&92u8, &3u64)) };
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered dangling or unaligned vtable pointer in wide pointer or too small vtable
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
 error[E0080]: could not evaluate static initializer
-  --> $DIR/ub-wide-ptr.rs:159:5
+  --> $DIR/ub-wide-ptr.rs:121:5
    |
-LL |     DynTransmute { bad: BadDynRepr { ptr: &92, vtable: 0 } }.rust
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid use of NULL pointer
+LL |     mem::transmute::<_, &dyn Trait>((&92u8, 0usize))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid use of NULL pointer
 
 error[E0080]: could not evaluate static initializer
-  --> $DIR/ub-wide-ptr.rs:163:5
+  --> $DIR/ub-wide-ptr.rs:125:5
    |
-LL |     DynTransmute { repr2: DynRepr2 { ptr: &92, vtable: &3 } }.rust
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Memory access failed: pointer must be in-bounds at offset N, but is outside bounds of allocation N which has size N
+LL |     mem::transmute::<_, &dyn Trait>((&92u8, &3u64))
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Memory access failed: pointer must be in-bounds at offset N, but is outside bounds of allocation N which has size N
 
-error: aborting due to 20 previous errors
+error: aborting due to 24 previous errors
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/const-eval/union-ub.stderr b/src/test/ui/consts/const-eval/union-ub.stderr
index fa67bc0d8e..9d90d6e854 100644
--- a/src/test/ui/consts/const-eval/union-ub.stderr
+++ b/src/test/ui/consts/const-eval/union-ub.stderr
@@ -2,7 +2,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/union-ub.rs:31:1
    |
 LL | const BAD_BOOL: bool = unsafe { DummyUnion { u8: 42 }.bool};
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 42, but expected something less or equal to 1
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered 42, but expected a boolean
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.stderr b/src/test/ui/consts/const-eval/validate_uninhabited_zsts.stderr
index 51e80bb8b1..d0e35615da 100644
--- a/src/test/ui/consts/const-eval/validate_uninhabited_zsts.stderr
+++ b/src/test/ui/consts/const-eval/validate_uninhabited_zsts.stderr
@@ -10,7 +10,7 @@ LL |     unsafe { std::mem::transmute(()) }
 LL | const FOO: [Empty; 3] = [foo(); 3];
    | -----------------------------------
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/validate_uninhabited_zsts.rs:13:8
    |
 LL | #[warn(const_err)]
@@ -20,7 +20,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/validate_uninhabited_zsts.rs:17:1
    |
 LL | const BAR: [Empty; 3] = [unsafe { std::mem::transmute(()) }; 3];
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of uninhabited type Empty at [0]
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr b/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr
index eed279ecf7..7f6af051e1 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr
+++ b/src/test/ui/consts/const-extern-fn/const-extern-fn-call-extern-fn.stderr
@@ -4,7 +4,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const reg
 LL |         regular_in_block();
    |         ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const regular` is not stable as `const fn`
@@ -13,7 +13,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const reg
 LL |         regular();
    |         ^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr b/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr
index 0ab1ddd8d5..f520bd3584 100644
--- a/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr
+++ b/src/test/ui/consts/const-extern-fn/const-extern-fn-min-const-fn.stderr
@@ -4,7 +4,7 @@ error[E0723]: unsizing casts are not allowed in const fn
 LL | const extern fn unsize(x: &[u8; 3]) -> &[u8] { x }
    |                                                ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
@@ -13,7 +13,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const unsafe extern "C" fn closure() -> fn() { || {} }
    |                                         ^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int, `bool` and `char` operations are stable in const fn
@@ -22,7 +22,7 @@ error[E0723]: only int, `bool` and `char` operations are stable in const fn
 LL | const unsafe extern fn use_float() { 1.0 + 1.0; }
    |                                      ^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: casting pointers to ints is unstable in const fn
@@ -31,7 +31,7 @@ error[E0723]: casting pointers to ints is unstable in const fn
 LL | const extern "C" fn ptr_cast(val: *const u8) { val as usize; }
    |                                                ^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs b/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs
index d39f2c1fe2..5667d55352 100644
--- a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs
+++ b/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.rs
@@ -1,12 +1,10 @@
 // Check that `const extern fn` and `const unsafe extern fn` are feature-gated.
 
-#[cfg(FALSE)] const extern fn foo1() {} //~ ERROR `const extern fn` definitions are unstable
-#[cfg(FALSE)] const extern "C" fn foo2() {} //~ ERROR `const extern fn` definitions are unstable
-#[cfg(FALSE)] const extern "Rust" fn foo3() {} //~ ERROR `const extern fn` definitions are unstable
-#[cfg(FALSE)] const unsafe extern fn bar1() {} //~ ERROR `const extern fn` definitions are unstable
-#[cfg(FALSE)] const unsafe extern "C" fn bar2() {}
-//~^ ERROR `const extern fn` definitions are unstable
-#[cfg(FALSE)] const unsafe extern "Rust" fn bar3() {}
-//~^ ERROR `const extern fn` definitions are unstable
+const extern fn foo1() {} //~ ERROR `const extern fn` definitions are unstable
+const extern "C" fn foo2() {} //~ ERROR `const extern fn` definitions are unstable
+const extern "Rust" fn foo3() {} //~ ERROR `const extern fn` definitions are unstable
+const unsafe extern fn bar1() {} //~ ERROR `const extern fn` definitions are unstable
+const unsafe extern "C" fn bar2() {} //~ ERROR `const extern fn` definitions are unstable
+const unsafe extern "Rust" fn bar3() {} //~ ERROR `const extern fn` definitions are unstable
 
 fn main() {}
diff --git a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr b/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
index f138620ffe..bd5940a3fd 100644
--- a/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
+++ b/src/test/ui/consts/const-extern-fn/feature-gate-const_extern_fn.stderr
@@ -1,55 +1,55 @@
 error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/feature-gate-const_extern_fn.rs:3:15
+  --> $DIR/feature-gate-const_extern_fn.rs:3:1
    |
-LL | #[cfg(FALSE)] const extern fn foo1() {}
-   |               ^^^^^^^^^^^^
+LL | const extern fn foo1() {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
    = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
 
 error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/feature-gate-const_extern_fn.rs:4:15
+  --> $DIR/feature-gate-const_extern_fn.rs:4:1
    |
-LL | #[cfg(FALSE)] const extern "C" fn foo2() {}
-   |               ^^^^^^^^^^^^
+LL | const extern "C" fn foo2() {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
    = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
 
 error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/feature-gate-const_extern_fn.rs:5:15
+  --> $DIR/feature-gate-const_extern_fn.rs:5:1
    |
-LL | #[cfg(FALSE)] const extern "Rust" fn foo3() {}
-   |               ^^^^^^^^^^^^
+LL | const extern "Rust" fn foo3() {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
    = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
 
 error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/feature-gate-const_extern_fn.rs:6:15
+  --> $DIR/feature-gate-const_extern_fn.rs:6:1
    |
-LL | #[cfg(FALSE)] const unsafe extern fn bar1() {}
-   |               ^^^^^^^^^^^^^^^^^^^
+LL | const unsafe extern fn bar1() {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
    = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
 
 error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/feature-gate-const_extern_fn.rs:7:15
+  --> $DIR/feature-gate-const_extern_fn.rs:7:1
    |
-LL | #[cfg(FALSE)] const unsafe extern "C" fn bar2() {}
-   |               ^^^^^^^^^^^^^^^^^^^
+LL | const unsafe extern "C" fn bar2() {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
    = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
 
 error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/feature-gate-const_extern_fn.rs:9:15
+  --> $DIR/feature-gate-const_extern_fn.rs:8:1
    |
-LL | #[cfg(FALSE)] const unsafe extern "Rust" fn bar3() {}
-   |               ^^^^^^^^^^^^^^^^^^^
+LL | const unsafe extern "Rust" fn bar3() {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
+   = note: see issue #64926 <https://github.com/rust-lang/rust/issues/64926> for more information
    = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs b/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs
index 1886bfccb4..6f575d055a 100644
--- a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs
+++ b/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.rs
@@ -4,5 +4,4 @@ fn main() {}
 fn container() {
     const extern "Rust" PUT_ANYTHING_YOU_WANT_HERE bug() -> usize { 1 }
     //~^ ERROR expected `fn`
-    //~| ERROR `const extern fn` definitions are unstable
 }
diff --git a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr b/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr
index cf71ed4d59..ec415ec9d0 100644
--- a/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr
+++ b/src/test/ui/consts/const-extern-fn/issue-68062-const-extern-fns-dont-need-fn-specifier.stderr
@@ -4,15 +4,5 @@ error: expected `fn`, found `PUT_ANYTHING_YOU_WANT_HERE`
 LL |     const extern "Rust" PUT_ANYTHING_YOU_WANT_HERE bug() -> usize { 1 }
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `fn`
 
-error[E0658]: `const extern fn` definitions are unstable
-  --> $DIR/issue-68062-const-extern-fns-dont-need-fn-specifier.rs:5:5
-   |
-LL |     const extern "Rust" PUT_ANYTHING_YOU_WANT_HERE bug() -> usize { 1 }
-   |     ^^^^^^^^^^^^
-   |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64926
-   = help: add `#![feature(const_extern_fn)]` to the crate attributes to enable
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/consts/const-external-macro-const-err.stderr b/src/test/ui/consts/const-external-macro-const-err.stderr
index 237c4d792c..06a630d82d 100644
--- a/src/test/ui/consts/const-external-macro-const-err.stderr
+++ b/src/test/ui/consts/const-external-macro-const-err.stderr
@@ -5,7 +5,7 @@ LL |     static_assert!(2 + 2 == 5);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ index out of bounds: the len is 1 but the index is 1
    |
    = note: `#[deny(const_err)]` on by default
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-fn-mismatch.rs b/src/test/ui/consts/const-fn-mismatch.rs
index 5bd274fe66..d4cfba6460 100644
--- a/src/test/ui/consts/const-fn-mismatch.rs
+++ b/src/test/ui/consts/const-fn-mismatch.rs
@@ -10,8 +10,10 @@ trait Foo {
 }
 
 impl Foo for u32 {
-    const fn f() -> u32 { 22 }
-    //~^ ERROR trait fns cannot be declared const
+    const fn f() -> u32 {
+        //~^ ERROR functions in traits cannot be declared const
+        22
+    }
 }
 
-fn main() { }
+fn main() {}
diff --git a/src/test/ui/consts/const-fn-mismatch.stderr b/src/test/ui/consts/const-fn-mismatch.stderr
index 03bb7c6e8d..0f4ce010fe 100644
--- a/src/test/ui/consts/const-fn-mismatch.stderr
+++ b/src/test/ui/consts/const-fn-mismatch.stderr
@@ -1,8 +1,8 @@
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/const-fn-mismatch.rs:13:5
    |
-LL |     const fn f() -> u32 { 22 }
-   |     ^^^^^ trait fns cannot be const
+LL |     const fn f() -> u32 {
+   |     ^^^^^ functions in traits cannot be const
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-fn-not-in-trait.rs b/src/test/ui/consts/const-fn-not-in-trait.rs
index 3975c22c56..1006d85468 100644
--- a/src/test/ui/consts/const-fn-not-in-trait.rs
+++ b/src/test/ui/consts/const-fn-not-in-trait.rs
@@ -5,9 +5,11 @@
 
 trait Foo {
     const fn f() -> u32;
-    //~^ ERROR trait fns cannot be declared const
-    const fn g() -> u32 { 0 }
-    //~^ ERROR trait fns cannot be declared const
+    //~^ ERROR functions in traits cannot be declared const
+    const fn g() -> u32 {
+        //~^ ERROR functions in traits cannot be declared const
+        0
+    }
 }
 
-fn main() { }
+fn main() {}
diff --git a/src/test/ui/consts/const-fn-not-in-trait.stderr b/src/test/ui/consts/const-fn-not-in-trait.stderr
index 6821a6c2bc..12ce306603 100644
--- a/src/test/ui/consts/const-fn-not-in-trait.stderr
+++ b/src/test/ui/consts/const-fn-not-in-trait.stderr
@@ -1,14 +1,14 @@
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/const-fn-not-in-trait.rs:7:5
    |
 LL |     const fn f() -> u32;
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/const-fn-not-in-trait.rs:9:5
    |
-LL |     const fn g() -> u32 { 0 }
-   |     ^^^^^ trait fns cannot be const
+LL |     const fn g() -> u32 {
+   |     ^^^^^ functions in traits cannot be const
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/const-int-arithmetic-overflow.rs b/src/test/ui/consts/const-int-arithmetic-overflow.rs
new file mode 100644
index 0000000000..99bbeaafda
--- /dev/null
+++ b/src/test/ui/consts/const-int-arithmetic-overflow.rs
@@ -0,0 +1,26 @@
+// run-pass
+// compile-flags: -O
+#![allow(const_err)]
+
+// Make sure arithmetic unary/binary ops actually return the right result, even when overflowing.
+// We have to put them in `const fn` and turn on optimizations to avoid overflow checks.
+
+const fn add(x: i8, y: i8) -> i8 { x+y }
+const fn sub(x: i8, y: i8) -> i8 { x-y }
+const fn mul(x: i8, y: i8) -> i8 { x*y }
+// div and rem are always checked, so we cannot test their result in case of overflow.
+const fn neg(x: i8) -> i8 { -x }
+
+fn main() {
+    const ADD_OFLOW: i8 = add(100, 100);
+    assert_eq!(ADD_OFLOW, -56);
+
+    const SUB_OFLOW: i8 = sub(100, -100);
+    assert_eq!(SUB_OFLOW, -56);
+
+    const MUL_OFLOW: i8 = mul(-100, -2);
+    assert_eq!(MUL_OFLOW, -56);
+
+    const NEG_OFLOW: i8 = neg(-128);
+    assert_eq!(NEG_OFLOW, -128);
+}
diff --git a/src/test/ui/consts/const-int-arithmetic.rs b/src/test/ui/consts/const-int-arithmetic.rs
new file mode 100644
index 0000000000..2c3421b7a8
--- /dev/null
+++ b/src/test/ui/consts/const-int-arithmetic.rs
@@ -0,0 +1,147 @@
+// run-pass
+
+#![feature(saturating_neg)]
+#![feature(const_checked_int_methods)]
+#![feature(const_euclidean_int_methods)]
+#![feature(const_overflowing_int_methods)]
+#![feature(const_saturating_int_methods)]
+#![feature(const_wrapping_int_methods)]
+
+use std::{i8, i128};
+
+macro_rules! suite {
+    ($(
+        $fn:ident -> $ty:ty { $( $label:ident : $expr:expr, $result:expr; )* }
+    )*) => { $(
+        fn $fn() {
+            $(
+                const $label: $ty = $expr;
+                assert_eq!($label, $result);
+            )*
+        }
+    )* }
+}
+
+suite!(
+    checked -> Option<i8> {
+        // `const_checked_int_methods`
+        C1: 5i8.checked_add(2), Some(7);
+        C2: 127i8.checked_add(2), None;
+
+        C3: 5i8.checked_sub(2), Some(3);
+        C4: (-127i8).checked_sub(2), None;
+
+        C5: 1i8.checked_mul(3), Some(3);
+        C6: 5i8.checked_mul(122), None;
+        C7: (-127i8).checked_mul(-99), None;
+
+        C8: (i8::min_value() + 1).checked_div(-1), Some(127);
+        C9: i8::min_value().checked_div(-1), None;
+        C10: 1i8.checked_div(0), None;
+
+        C11: 5i8.checked_rem(2), Some(1);
+        C12: 5i8.checked_rem(0), None;
+        C13: i8::MIN.checked_rem(-1), None;
+
+        C14: 5i8.checked_neg(), Some(-5);
+        C15: i8::MIN.checked_neg(), None;
+
+        C16: 0x1i8.checked_shl(4), Some(0x10);
+        C17: 0x1i8.checked_shl(129), None;
+
+        C18: 0x10i8.checked_shr(4), Some(0x1);
+        C19: 0x10i8.checked_shr(128), None;
+
+
+        C20: (-5i8).checked_abs(), Some(5);
+        C21: i8::MIN.checked_abs(), None;
+
+        // `const_euclidean_int_methods`
+        C22: (i8::min_value() + 1).checked_div_euclid(-1), Some(127);
+        C23: i8::min_value().checked_div_euclid(-1), None;
+        C24: (1i8).checked_div_euclid(0), None;
+
+        C25: 5i8.checked_rem_euclid(2), Some(1);
+        C26: 5i8.checked_rem_euclid(0), None;
+        C27: i8::MIN.checked_rem_euclid(-1), None;
+    }
+    checked_i128 -> Option<i128> {
+        CHK_ADD_I128: i128::MAX.checked_add(1), None;
+        CHK_MUL_I128: i128::MIN.checked_mul(-1), None;
+    }
+
+    saturating_and_wrapping -> i8 {
+        // `const_saturating_int_methods`
+        C28: 100i8.saturating_add(1), 101;
+        C29: i8::max_value().saturating_add(100), i8::max_value();
+        C30: i8::min_value().saturating_add(-1), i8::min_value();
+
+        C31: 100i8.saturating_sub(127), -27;
+        C32: i8::min_value().saturating_sub(100), i8::min_value();
+        C33: i8::max_value().saturating_sub(-1), i8::max_value();
+
+        C34: 10i8.saturating_mul(12), 120;
+        C35: i8::MAX.saturating_mul(10), i8::MAX;
+        C36: i8::MIN.saturating_mul(10), i8::MIN;
+
+        C37: 100i8.saturating_neg(), -100;
+        C38: (-100i8).saturating_neg(), 100;
+        C39: i8::min_value().saturating_neg(), i8::max_value();
+        C40: i8::max_value().saturating_neg(), i8::min_value() + 1;
+
+        C57: 100i8.saturating_abs(), 100;
+        C58: (-100i8).saturating_abs(), 100;
+        C59: i8::min_value().saturating_abs(), i8::max_value();
+        C60: (i8::min_value() + 1).saturating_abs(), i8::max_value();
+
+        // `const_wrapping_int_methods`
+        C41: 100i8.wrapping_div(10), 10;
+        C42: (-128i8).wrapping_div(-1), -128;
+
+        C43: 100i8.wrapping_rem(10), 0;
+        C44: (-128i8).wrapping_rem(-1), 0;
+
+        // `const_euclidean_int_methods`
+        C45: 100i8.wrapping_div_euclid(10), 10;
+        C46: (-128i8).wrapping_div_euclid(-1), -128;
+
+        C47: 100i8.wrapping_rem_euclid(10), 0;
+        C48: (-128i8).wrapping_rem_euclid(-1), 0;
+    }
+    saturating_and_wrapping_i128 -> i128 {
+        SAT_ADD_I128: i128::MAX.saturating_add(1), i128::MAX;
+        SAT_MUL_I128: i128::MAX.saturating_mul(2), i128::MAX;
+
+        WRP_ADD_I128: i128::MAX.wrapping_add(1), i128::MIN;
+        WRP_MUL_I128: i128::MAX.wrapping_mul(3), i128::MAX-2;
+    }
+
+    overflowing -> (i8, bool) {
+        // `const_overflowing_int_methods`
+        C49: 5i8.overflowing_div(2), (2, false);
+        C50: i8::MIN.overflowing_div(-1), (i8::MIN, true);
+
+        C51: 5i8.overflowing_rem(2), (1, false);
+        C52: i8::MIN.overflowing_rem(-1), (0, true);
+
+        // `const_euclidean_int_methods`
+        C53: 5i8.overflowing_div_euclid(2), (2, false);
+        C54: i8::MIN.overflowing_div_euclid(-1), (i8::MIN, true);
+
+        C55: 5i8.overflowing_rem_euclid(2), (1, false);
+        C56: i8::MIN.overflowing_rem_euclid(-1), (0, true);
+    }
+    overflowing_i128 -> (i128, bool) {
+        OFL_ADD_I128: i128::MAX.overflowing_add(1), (i128::MIN, true);
+        OFL_MUL_I128: i128::MAX.overflowing_mul(3), (i128::MAX-2, true);
+    }
+);
+
+fn main() {
+   checked();
+   checked_i128();
+   saturating_and_wrapping();
+   saturating_and_wrapping_i128();
+   overflowing();
+   overflowing_i128();
+}
diff --git a/src/test/ui/consts/const-int-pow-rpass.rs b/src/test/ui/consts/const-int-pow-rpass.rs
index 8e84a90060..b0fba19455 100644
--- a/src/test/ui/consts/const-int-pow-rpass.rs
+++ b/src/test/ui/consts/const-int-pow-rpass.rs
@@ -1,11 +1,48 @@
 // run-pass
 
+#![feature(const_int_pow)]
+#![feature(wrapping_next_power_of_two)]
+
 const IS_POWER_OF_TWO_A: bool = 0u32.is_power_of_two();
 const IS_POWER_OF_TWO_B: bool = 32u32.is_power_of_two();
 const IS_POWER_OF_TWO_C: bool = 33u32.is_power_of_two();
 
+const POW: u8 = 3u8.pow(5);
+
+const CHECKED_POW_OK: Option<u8> = 3u8.checked_pow(5);
+const CHECKED_POW_OVERFLOW: Option<u8> = 3u8.checked_pow(6);
+
+const WRAPPING_POW: u8 = 3u8.wrapping_pow(6);
+const OVERFLOWING_POW: (u8, bool) = 3u8.overflowing_pow(6);
+const SATURATING_POW: u8 = 3u8.saturating_pow(6);
+
+const NEXT_POWER_OF_TWO: u32 = 3u32.next_power_of_two();
+
+const CHECKED_NEXT_POWER_OF_TWO_OK: Option<u32> = 3u32.checked_next_power_of_two();
+const CHECKED_NEXT_POWER_OF_TWO_OVERFLOW: Option<u32> =
+    u32::max_value().checked_next_power_of_two();
+
+const WRAPPING_NEXT_POWER_OF_TWO: u32 =
+    u32::max_value().wrapping_next_power_of_two();
+
 fn main() {
     assert!(!IS_POWER_OF_TWO_A);
     assert!(IS_POWER_OF_TWO_B);
     assert!(!IS_POWER_OF_TWO_C);
+
+    assert_eq!(POW, 243);
+
+    assert_eq!(CHECKED_POW_OK, Some(243));
+    assert_eq!(CHECKED_POW_OVERFLOW, None);
+
+    assert_eq!(WRAPPING_POW, 217);
+    assert_eq!(OVERFLOWING_POW, (217, true));
+    assert_eq!(SATURATING_POW, u8::max_value());
+
+    assert_eq!(NEXT_POWER_OF_TWO, 4);
+
+    assert_eq!(CHECKED_NEXT_POWER_OF_TWO_OK, Some(4));
+    assert_eq!(CHECKED_NEXT_POWER_OF_TWO_OVERFLOW, None);
+
+    assert_eq!(WRAPPING_NEXT_POWER_OF_TWO, 0);
 }
diff --git a/src/test/ui/consts/const-int-unchecked.rs b/src/test/ui/consts/const-int-unchecked.rs
index 8ee029b6cc..fb09f62854 100644
--- a/src/test/ui/consts/const-int-unchecked.rs
+++ b/src/test/ui/consts/const-int-unchecked.rs
@@ -1,4 +1,5 @@
 #![feature(core_intrinsics)]
+#![feature(const_int_unchecked_arith)]
 
 use std::intrinsics;
 
@@ -117,4 +118,25 @@ const SHR_I64_NEG_RANDOM: i64 = unsafe { intrinsics::unchecked_shr(5_i64, -30) }
 const SHR_I128_NEG_RANDOM: i128 = unsafe { intrinsics::unchecked_shr(5_i128, -93) };
 //~^ ERROR any use of this value will cause an error
 
+// Other arithmetic functions:
+
+const _: u16 = unsafe { std::intrinsics::unchecked_add(40000u16, 30000) };
+//~^ ERROR any use of this value will cause an error
+
+const _: u32 = unsafe { std::intrinsics::unchecked_sub(14u32, 22) };
+//~^ ERROR any use of this value will cause an error
+
+const _: u16 = unsafe { std::intrinsics::unchecked_mul(300u16, 250u16) };
+//~^ ERROR any use of this value will cause an error
+
+const _: i32 = unsafe { std::intrinsics::unchecked_div(1, 0) };
+//~^ ERROR any use of this value will cause an error
+const _: i32 = unsafe { std::intrinsics::unchecked_div(i32::min_value(), -1) };
+//~^ ERROR any use of this value will cause an error
+
+const _: i32 = unsafe { std::intrinsics::unchecked_rem(1, 0) };
+//~^ ERROR any use of this value will cause an error
+const _: i32 = unsafe { std::intrinsics::unchecked_rem(i32::min_value(), -1) };
+//~^ ERROR any use of this value will cause an error
+
 fn main() {}
diff --git a/src/test/ui/consts/const-int-unchecked.stderr b/src/test/ui/consts/const-int-unchecked.stderr
index d569c6a201..bf31e0b073 100644
--- a/src/test/ui/consts/const-int-unchecked.stderr
+++ b/src/test/ui/consts/const-int-unchecked.stderr
@@ -1,5 +1,5 @@
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:14:29
+  --> $DIR/const-int-unchecked.rs:15:29
    |
 LL | const SHL_U8: u8 = unsafe { intrinsics::unchecked_shl(5_u8, 8) };
    | ----------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -9,7 +9,7 @@ LL | const SHL_U8: u8 = unsafe { intrinsics::unchecked_shl(5_u8, 8) };
    = note: `#[deny(const_err)]` on by default
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:16:31
+  --> $DIR/const-int-unchecked.rs:17:31
    |
 LL | const SHL_U16: u16 = unsafe { intrinsics::unchecked_shl(5_u16, 16) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -17,7 +17,7 @@ LL | const SHL_U16: u16 = unsafe { intrinsics::unchecked_shl(5_u16, 16) };
    |                               Overflowing shift by 16 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:18:31
+  --> $DIR/const-int-unchecked.rs:19:31
    |
 LL | const SHL_U32: u32 = unsafe { intrinsics::unchecked_shl(5_u32, 32) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -25,7 +25,7 @@ LL | const SHL_U32: u32 = unsafe { intrinsics::unchecked_shl(5_u32, 32) };
    |                               Overflowing shift by 32 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:20:31
+  --> $DIR/const-int-unchecked.rs:21:31
    |
 LL | const SHL_U64: u64 = unsafe { intrinsics::unchecked_shl(5_u64, 64) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -33,7 +33,7 @@ LL | const SHL_U64: u64 = unsafe { intrinsics::unchecked_shl(5_u64, 64) };
    |                               Overflowing shift by 64 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:22:33
+  --> $DIR/const-int-unchecked.rs:23:33
    |
 LL | const SHL_U128: u128 = unsafe { intrinsics::unchecked_shl(5_u128, 128) };
    | --------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -41,7 +41,7 @@ LL | const SHL_U128: u128 = unsafe { intrinsics::unchecked_shl(5_u128, 128) };
    |                                 Overflowing shift by 128 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:27:29
+  --> $DIR/const-int-unchecked.rs:28:29
    |
 LL | const SHL_I8: i8 = unsafe { intrinsics::unchecked_shl(5_i8, 8) };
    | ----------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -49,7 +49,7 @@ LL | const SHL_I8: i8 = unsafe { intrinsics::unchecked_shl(5_i8, 8) };
    |                             Overflowing shift by 8 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:29:31
+  --> $DIR/const-int-unchecked.rs:30:31
    |
 LL | const SHL_I16: i16 = unsafe { intrinsics::unchecked_shl(5_16, 16) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -57,7 +57,7 @@ LL | const SHL_I16: i16 = unsafe { intrinsics::unchecked_shl(5_16, 16) };
    |                               Overflowing shift by 16 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:31:31
+  --> $DIR/const-int-unchecked.rs:32:31
    |
 LL | const SHL_I32: i32 = unsafe { intrinsics::unchecked_shl(5_i32, 32) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -65,7 +65,7 @@ LL | const SHL_I32: i32 = unsafe { intrinsics::unchecked_shl(5_i32, 32) };
    |                               Overflowing shift by 32 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:33:31
+  --> $DIR/const-int-unchecked.rs:34:31
    |
 LL | const SHL_I64: i64 = unsafe { intrinsics::unchecked_shl(5_i64, 64) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -73,7 +73,7 @@ LL | const SHL_I64: i64 = unsafe { intrinsics::unchecked_shl(5_i64, 64) };
    |                               Overflowing shift by 64 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:35:33
+  --> $DIR/const-int-unchecked.rs:36:33
    |
 LL | const SHL_I128: i128 = unsafe { intrinsics::unchecked_shl(5_i128, 128) };
    | --------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -81,7 +81,7 @@ LL | const SHL_I128: i128 = unsafe { intrinsics::unchecked_shl(5_i128, 128) };
    |                                 Overflowing shift by 128 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:40:33
+  --> $DIR/const-int-unchecked.rs:41:33
    |
 LL | const SHL_I8_NEG: i8 = unsafe { intrinsics::unchecked_shl(5_i8, -1) };
    | --------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -89,7 +89,7 @@ LL | const SHL_I8_NEG: i8 = unsafe { intrinsics::unchecked_shl(5_i8, -1) };
    |                                 Overflowing shift by 255 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:42:35
+  --> $DIR/const-int-unchecked.rs:43:35
    |
 LL | const SHL_I16_NEG: i16 = unsafe { intrinsics::unchecked_shl(5_16, -1) };
    | ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -97,7 +97,7 @@ LL | const SHL_I16_NEG: i16 = unsafe { intrinsics::unchecked_shl(5_16, -1) };
    |                                   Overflowing shift by 65535 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:44:35
+  --> $DIR/const-int-unchecked.rs:45:35
    |
 LL | const SHL_I32_NEG: i32 = unsafe { intrinsics::unchecked_shl(5_i32, -1) };
    | ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -105,7 +105,7 @@ LL | const SHL_I32_NEG: i32 = unsafe { intrinsics::unchecked_shl(5_i32, -1) };
    |                                   Overflowing shift by 4294967295 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:46:35
+  --> $DIR/const-int-unchecked.rs:47:35
    |
 LL | const SHL_I64_NEG: i64 = unsafe { intrinsics::unchecked_shl(5_i64, -1) };
    | ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -113,7 +113,7 @@ LL | const SHL_I64_NEG: i64 = unsafe { intrinsics::unchecked_shl(5_i64, -1) };
    |                                   Overflowing shift by 18446744073709551615 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:48:37
+  --> $DIR/const-int-unchecked.rs:49:37
    |
 LL | const SHL_I128_NEG: i128 = unsafe { intrinsics::unchecked_shl(5_i128, -1) };
    | ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -121,7 +121,7 @@ LL | const SHL_I128_NEG: i128 = unsafe { intrinsics::unchecked_shl(5_i128, -1) }
    |                                     Overflowing shift by 340282366920938463463374607431768211455 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:54:40
+  --> $DIR/const-int-unchecked.rs:55:40
    |
 LL | const SHL_I8_NEG_RANDOM: i8 = unsafe { intrinsics::unchecked_shl(5_i8, -6) };
    | ---------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -129,7 +129,7 @@ LL | const SHL_I8_NEG_RANDOM: i8 = unsafe { intrinsics::unchecked_shl(5_i8, -6)
    |                                        Overflowing shift by 250 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:56:42
+  --> $DIR/const-int-unchecked.rs:57:42
    |
 LL | const SHL_I16_NEG_RANDOM: i16 = unsafe { intrinsics::unchecked_shl(5_16, -13) };
    | -----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -137,7 +137,7 @@ LL | const SHL_I16_NEG_RANDOM: i16 = unsafe { intrinsics::unchecked_shl(5_16, -1
    |                                          Overflowing shift by 65523 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:58:42
+  --> $DIR/const-int-unchecked.rs:59:42
    |
 LL | const SHL_I32_NEG_RANDOM: i32 = unsafe { intrinsics::unchecked_shl(5_i32, -25) };
    | -----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -145,7 +145,7 @@ LL | const SHL_I32_NEG_RANDOM: i32 = unsafe { intrinsics::unchecked_shl(5_i32, -
    |                                          Overflowing shift by 4294967271 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:60:42
+  --> $DIR/const-int-unchecked.rs:61:42
    |
 LL | const SHL_I64_NEG_RANDOM: i64 = unsafe { intrinsics::unchecked_shl(5_i64, -30) };
    | -----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -153,7 +153,7 @@ LL | const SHL_I64_NEG_RANDOM: i64 = unsafe { intrinsics::unchecked_shl(5_i64, -
    |                                          Overflowing shift by 18446744073709551586 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:62:44
+  --> $DIR/const-int-unchecked.rs:63:44
    |
 LL | const SHL_I128_NEG_RANDOM: i128 = unsafe { intrinsics::unchecked_shl(5_i128, -93) };
    | -------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -161,7 +161,7 @@ LL | const SHL_I128_NEG_RANDOM: i128 = unsafe { intrinsics::unchecked_shl(5_i128
    |                                            Overflowing shift by 340282366920938463463374607431768211363 in `unchecked_shl`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:69:29
+  --> $DIR/const-int-unchecked.rs:70:29
    |
 LL | const SHR_U8: u8 = unsafe { intrinsics::unchecked_shr(5_u8, 8) };
    | ----------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -169,7 +169,7 @@ LL | const SHR_U8: u8 = unsafe { intrinsics::unchecked_shr(5_u8, 8) };
    |                             Overflowing shift by 8 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:71:31
+  --> $DIR/const-int-unchecked.rs:72:31
    |
 LL | const SHR_U16: u16 = unsafe { intrinsics::unchecked_shr(5_u16, 16) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -177,7 +177,7 @@ LL | const SHR_U16: u16 = unsafe { intrinsics::unchecked_shr(5_u16, 16) };
    |                               Overflowing shift by 16 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:73:31
+  --> $DIR/const-int-unchecked.rs:74:31
    |
 LL | const SHR_U32: u32 = unsafe { intrinsics::unchecked_shr(5_u32, 32) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -185,7 +185,7 @@ LL | const SHR_U32: u32 = unsafe { intrinsics::unchecked_shr(5_u32, 32) };
    |                               Overflowing shift by 32 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:75:31
+  --> $DIR/const-int-unchecked.rs:76:31
    |
 LL | const SHR_U64: u64 = unsafe { intrinsics::unchecked_shr(5_u64, 64) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -193,7 +193,7 @@ LL | const SHR_U64: u64 = unsafe { intrinsics::unchecked_shr(5_u64, 64) };
    |                               Overflowing shift by 64 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:77:33
+  --> $DIR/const-int-unchecked.rs:78:33
    |
 LL | const SHR_U128: u128 = unsafe { intrinsics::unchecked_shr(5_u128, 128) };
    | --------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -201,7 +201,7 @@ LL | const SHR_U128: u128 = unsafe { intrinsics::unchecked_shr(5_u128, 128) };
    |                                 Overflowing shift by 128 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:82:29
+  --> $DIR/const-int-unchecked.rs:83:29
    |
 LL | const SHR_I8: i8 = unsafe { intrinsics::unchecked_shr(5_i8, 8) };
    | ----------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -209,7 +209,7 @@ LL | const SHR_I8: i8 = unsafe { intrinsics::unchecked_shr(5_i8, 8) };
    |                             Overflowing shift by 8 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:84:31
+  --> $DIR/const-int-unchecked.rs:85:31
    |
 LL | const SHR_I16: i16 = unsafe { intrinsics::unchecked_shr(5_16, 16) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -217,7 +217,7 @@ LL | const SHR_I16: i16 = unsafe { intrinsics::unchecked_shr(5_16, 16) };
    |                               Overflowing shift by 16 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:86:31
+  --> $DIR/const-int-unchecked.rs:87:31
    |
 LL | const SHR_I32: i32 = unsafe { intrinsics::unchecked_shr(5_i32, 32) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -225,7 +225,7 @@ LL | const SHR_I32: i32 = unsafe { intrinsics::unchecked_shr(5_i32, 32) };
    |                               Overflowing shift by 32 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:88:31
+  --> $DIR/const-int-unchecked.rs:89:31
    |
 LL | const SHR_I64: i64 = unsafe { intrinsics::unchecked_shr(5_i64, 64) };
    | ------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -233,7 +233,7 @@ LL | const SHR_I64: i64 = unsafe { intrinsics::unchecked_shr(5_i64, 64) };
    |                               Overflowing shift by 64 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:90:33
+  --> $DIR/const-int-unchecked.rs:91:33
    |
 LL | const SHR_I128: i128 = unsafe { intrinsics::unchecked_shr(5_i128, 128) };
    | --------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -241,7 +241,7 @@ LL | const SHR_I128: i128 = unsafe { intrinsics::unchecked_shr(5_i128, 128) };
    |                                 Overflowing shift by 128 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:95:33
+  --> $DIR/const-int-unchecked.rs:96:33
    |
 LL | const SHR_I8_NEG: i8 = unsafe { intrinsics::unchecked_shr(5_i8, -1) };
    | --------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -249,7 +249,7 @@ LL | const SHR_I8_NEG: i8 = unsafe { intrinsics::unchecked_shr(5_i8, -1) };
    |                                 Overflowing shift by 255 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:97:35
+  --> $DIR/const-int-unchecked.rs:98:35
    |
 LL | const SHR_I16_NEG: i16 = unsafe { intrinsics::unchecked_shr(5_16, -1) };
    | ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -257,7 +257,7 @@ LL | const SHR_I16_NEG: i16 = unsafe { intrinsics::unchecked_shr(5_16, -1) };
    |                                   Overflowing shift by 65535 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:99:35
+  --> $DIR/const-int-unchecked.rs:100:35
    |
 LL | const SHR_I32_NEG: i32 = unsafe { intrinsics::unchecked_shr(5_i32, -1) };
    | ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -265,7 +265,7 @@ LL | const SHR_I32_NEG: i32 = unsafe { intrinsics::unchecked_shr(5_i32, -1) };
    |                                   Overflowing shift by 4294967295 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:101:35
+  --> $DIR/const-int-unchecked.rs:102:35
    |
 LL | const SHR_I64_NEG: i64 = unsafe { intrinsics::unchecked_shr(5_i64, -1) };
    | ----------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -273,7 +273,7 @@ LL | const SHR_I64_NEG: i64 = unsafe { intrinsics::unchecked_shr(5_i64, -1) };
    |                                   Overflowing shift by 18446744073709551615 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:103:37
+  --> $DIR/const-int-unchecked.rs:104:37
    |
 LL | const SHR_I128_NEG: i128 = unsafe { intrinsics::unchecked_shr(5_i128, -1) };
    | ------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -281,7 +281,7 @@ LL | const SHR_I128_NEG: i128 = unsafe { intrinsics::unchecked_shr(5_i128, -1) }
    |                                     Overflowing shift by 340282366920938463463374607431768211455 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:109:40
+  --> $DIR/const-int-unchecked.rs:110:40
    |
 LL | const SHR_I8_NEG_RANDOM: i8 = unsafe { intrinsics::unchecked_shr(5_i8, -6) };
    | ---------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -289,7 +289,7 @@ LL | const SHR_I8_NEG_RANDOM: i8 = unsafe { intrinsics::unchecked_shr(5_i8, -6)
    |                                        Overflowing shift by 250 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:111:42
+  --> $DIR/const-int-unchecked.rs:112:42
    |
 LL | const SHR_I16_NEG_RANDOM: i16 = unsafe { intrinsics::unchecked_shr(5_16, -13) };
    | -----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -297,7 +297,7 @@ LL | const SHR_I16_NEG_RANDOM: i16 = unsafe { intrinsics::unchecked_shr(5_16, -1
    |                                          Overflowing shift by 65523 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:113:42
+  --> $DIR/const-int-unchecked.rs:114:42
    |
 LL | const SHR_I32_NEG_RANDOM: i32 = unsafe { intrinsics::unchecked_shr(5_i32, -25) };
    | -----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -305,7 +305,7 @@ LL | const SHR_I32_NEG_RANDOM: i32 = unsafe { intrinsics::unchecked_shr(5_i32, -
    |                                          Overflowing shift by 4294967271 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:115:42
+  --> $DIR/const-int-unchecked.rs:116:42
    |
 LL | const SHR_I64_NEG_RANDOM: i64 = unsafe { intrinsics::unchecked_shr(5_i64, -30) };
    | -----------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
@@ -313,12 +313,68 @@ LL | const SHR_I64_NEG_RANDOM: i64 = unsafe { intrinsics::unchecked_shr(5_i64, -
    |                                          Overflowing shift by 18446744073709551586 in `unchecked_shr`
 
 error: any use of this value will cause an error
-  --> $DIR/const-int-unchecked.rs:117:44
+  --> $DIR/const-int-unchecked.rs:118:44
    |
 LL | const SHR_I128_NEG_RANDOM: i128 = unsafe { intrinsics::unchecked_shr(5_i128, -93) };
    | -------------------------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
    |                                            |
    |                                            Overflowing shift by 340282366920938463463374607431768211363 in `unchecked_shr`
 
-error: aborting due to 40 previous errors
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:123:25
+   |
+LL | const _: u16 = unsafe { std::intrinsics::unchecked_add(40000u16, 30000) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         Overflow executing `unchecked_add`
+
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:126:25
+   |
+LL | const _: u32 = unsafe { std::intrinsics::unchecked_sub(14u32, 22) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         Overflow executing `unchecked_sub`
+
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:129:25
+   |
+LL | const _: u16 = unsafe { std::intrinsics::unchecked_mul(300u16, 250u16) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         Overflow executing `unchecked_mul`
+
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:132:25
+   |
+LL | const _: i32 = unsafe { std::intrinsics::unchecked_div(1, 0) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         dividing by zero
+
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:134:25
+   |
+LL | const _: i32 = unsafe { std::intrinsics::unchecked_div(i32::min_value(), -1) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         Overflow executing `unchecked_div`
+
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:137:25
+   |
+LL | const _: i32 = unsafe { std::intrinsics::unchecked_rem(1, 0) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         calculating the remainder with a divisor of zero
+
+error: any use of this value will cause an error
+  --> $DIR/const-int-unchecked.rs:139:25
+   |
+LL | const _: i32 = unsafe { std::intrinsics::unchecked_rem(i32::min_value(), -1) };
+   | ------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^---
+   |                         |
+   |                         Overflow executing `unchecked_rem`
+
+error: aborting due to 47 previous errors
 
diff --git a/src/test/ui/consts/const-labeled-break.stderr b/src/test/ui/consts/const-labeled-break.stderr
index 1282008fb6..ac845df227 100644
--- a/src/test/ui/consts/const-labeled-break.stderr
+++ b/src/test/ui/consts/const-labeled-break.stderr
@@ -4,7 +4,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL | const CRASH: () = 'a: while break 'a {};
    |                   ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
diff --git a/src/test/ui/consts/const-match-pattern-arm.stderr b/src/test/ui/consts/const-match-pattern-arm.stderr
index 4e7713f142..412e1609cc 100644
--- a/src/test/ui/consts/const-match-pattern-arm.stderr
+++ b/src/test/ui/consts/const-match-pattern-arm.stderr
@@ -8,7 +8,7 @@ LL | |     _ => false
 LL | | };
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -20,7 +20,7 @@ LL | |         _ => false
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/const-multi-ref.stderr b/src/test/ui/consts/const-multi-ref.stderr
index 0809c77c1b..e01dd4e574 100644
--- a/src/test/ui/consts/const-multi-ref.stderr
+++ b/src/test/ui/consts/const-multi-ref.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL |     let p = &mut a;
    |             ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead
diff --git a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr b/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
index 4fae119f02..83e050c7a5 100644
--- a/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
+++ b/src/test/ui/consts/const-mut-refs/feature-gate-const_mut_refs.stderr
@@ -4,7 +4,7 @@ error[E0723]: mutable references in const fn are unstable
 LL | const fn foo(x: &mut i32) -> i32 {
    |              ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/const-nonzero.rs b/src/test/ui/consts/const-nonzero.rs
index 6db3d1b333..2160bad480 100644
--- a/src/test/ui/consts/const-nonzero.rs
+++ b/src/test/ui/consts/const-nonzero.rs
@@ -1,9 +1,18 @@
-// build-pass (FIXME(62277): could be check-pass?)
+// run-pass
+
+#![feature(const_nonzero_int_methods)]
 
 use std::num::NonZeroU8;
 
 const X: NonZeroU8 = unsafe { NonZeroU8::new_unchecked(5) };
 const Y: u8 = X.get();
 
+const ZERO: Option<NonZeroU8> = NonZeroU8::new(0);
+const ONE: Option<NonZeroU8> = NonZeroU8::new(1);
+
 fn main() {
+    assert_eq!(Y, 5);
+
+    assert!(ZERO.is_none());
+    assert_eq!(ONE.unwrap().get(), 1);
 }
diff --git a/src/test/ui/consts/const-points-to-static.stderr b/src/test/ui/consts/const-points-to-static.stderr
index 8949358e29..f2ca7ff782 100644
--- a/src/test/ui/consts/const-points-to-static.stderr
+++ b/src/test/ui/consts/const-points-to-static.stderr
@@ -8,7 +8,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/const-points-to-static.rs:5:1
    |
 LL | const TEST: &u8 = &MY_STATIC;
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ constant accesses static
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a reference pointing to a static variable
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/const-prop-ice.rs b/src/test/ui/consts/const-prop-ice.rs
index 8682d2ee90..5bffe02062 100644
--- a/src/test/ui/consts/const-prop-ice.rs
+++ b/src/test/ui/consts/const-prop-ice.rs
@@ -1,5 +1,5 @@
 // build-fail
 
 fn main() {
-    [0; 3][3u64 as usize]; //~ ERROR the len is 3 but the index is 3
+    [0; 3][3u64 as usize]; //~ ERROR this operation will panic at runtime
 }
diff --git a/src/test/ui/consts/const-prop-ice.stderr b/src/test/ui/consts/const-prop-ice.stderr
index 65502a4ff7..7bb4acb235 100644
--- a/src/test/ui/consts/const-prop-ice.stderr
+++ b/src/test/ui/consts/const-prop-ice.stderr
@@ -1,10 +1,10 @@
-error: index out of bounds: the len is 3 but the index is 3
+error: this operation will panic at runtime
   --> $DIR/const-prop-ice.rs:4:5
    |
 LL |     [0; 3][3u64 as usize];
-   |     ^^^^^^^^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^ index out of bounds: the len is 3 but the index is 3
    |
-   = note: `#[deny(const_err)]` on by default
+   = note: `#[deny(unconditional_panic)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-prop-ice2.rs b/src/test/ui/consts/const-prop-ice2.rs
index 6a73483026..d533e394c0 100644
--- a/src/test/ui/consts/const-prop-ice2.rs
+++ b/src/test/ui/consts/const-prop-ice2.rs
@@ -3,5 +3,5 @@
 fn main() {
     enum Enum { One=1 }
     let xs=[0;1 as usize];
-    println!("{}", xs[Enum::One as usize]); //~ ERROR the len is 1 but the index is 1
+    println!("{}", xs[Enum::One as usize]); //~ ERROR this operation will panic at runtime
 }
diff --git a/src/test/ui/consts/const-prop-ice2.stderr b/src/test/ui/consts/const-prop-ice2.stderr
index cbb8fde80f..73405eca34 100644
--- a/src/test/ui/consts/const-prop-ice2.stderr
+++ b/src/test/ui/consts/const-prop-ice2.stderr
@@ -1,10 +1,10 @@
-error: index out of bounds: the len is 1 but the index is 1
+error: this operation will panic at runtime
   --> $DIR/const-prop-ice2.rs:6:20
    |
 LL |     println!("{}", xs[Enum::One as usize]);
-   |                    ^^^^^^^^^^^^^^^^^^^^^^
+   |                    ^^^^^^^^^^^^^^^^^^^^^^ index out of bounds: the len is 1 but the index is 1
    |
-   = note: `#[deny(const_err)]` on by default
+   = note: `#[deny(unconditional_panic)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const_let_assign3.stderr b/src/test/ui/consts/const_let_assign3.stderr
index 7852874944..5e2a85cc03 100644
--- a/src/test/ui/consts/const_let_assign3.stderr
+++ b/src/test/ui/consts/const_let_assign3.stderr
@@ -10,7 +10,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL |     s.foo(3);
    |     ^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: references in constants may only refer to immutable values
@@ -19,7 +19,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL |     let y = &mut x;
    |             ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0019]: constant contains unimplemented expression type
diff --git a/src/test/ui/consts/const_let_eq.rs b/src/test/ui/consts/const_let_eq.rs
index a2364c392f..818819f9ff 100644
--- a/src/test/ui/consts/const_let_eq.rs
+++ b/src/test/ui/consts/const_let_eq.rs
@@ -5,6 +5,7 @@ struct Bar<T> { x: T }
 struct W(u32);
 struct A { a: u32 }
 
+#[allow(redundant_semicolons)]
 const fn basics((a,): (u32,)) -> u32 {
     // Deferred assignment:
     let b: u32;
diff --git a/src/test/ui/consts/const_let_eq_float.rs b/src/test/ui/consts/const_let_eq_float.rs
index 0c927a0484..bc0ef26eb2 100644
--- a/src/test/ui/consts/const_let_eq_float.rs
+++ b/src/test/ui/consts/const_let_eq_float.rs
@@ -7,6 +7,7 @@ struct Bar<T> { x: T }
 struct W(f32);
 struct A { a: f32 }
 
+#[allow(redundant_semicolons)]
 const fn basics((a,): (f32,)) -> f32 {
     // Deferred assignment:
     let b: f32;
diff --git a/src/test/ui/consts/const_let_refutable.rs b/src/test/ui/consts/const_let_refutable.rs
index d48d5945e7..e49d476739 100644
--- a/src/test/ui/consts/const_let_refutable.rs
+++ b/src/test/ui/consts/const_let_refutable.rs
@@ -1,7 +1,7 @@
 fn main() {}
 
-const fn slice([a, b]: &[i32]) -> i32 { //~ ERROR refutable pattern in function argument
-    a + b //~ ERROR can only call other `const fn` within a `const fn`
-    //~^ ERROR use of possibly-uninitialized variable: `a`
-    //~| ERROR use of possibly-uninitialized variable: `b`
+const fn slice(&[a, b]: &[i32]) -> i32 {
+    //~^ ERROR refutable pattern in function argument
+    //~| ERROR loops and conditional expressions are not stable in const fn
+    a + b
 }
diff --git a/src/test/ui/consts/const_let_refutable.stderr b/src/test/ui/consts/const_let_refutable.stderr
index 9acb4ad9cb..0ba79e5f71 100644
--- a/src/test/ui/consts/const_let_refutable.stderr
+++ b/src/test/ui/consts/const_let_refutable.stderr
@@ -1,31 +1,19 @@
 error[E0005]: refutable pattern in function argument: `&[]`, `&[_]` and `&[_, _, _, ..]` not covered
   --> $DIR/const_let_refutable.rs:3:16
    |
-LL | const fn slice([a, b]: &[i32]) -> i32 {
-   |                ^^^^^^ patterns `&[]`, `&[_]` and `&[_, _, _, ..]` not covered
+LL | const fn slice(&[a, b]: &[i32]) -> i32 {
+   |                ^^^^^^^ patterns `&[]`, `&[_]` and `&[_, _, _, ..]` not covered
 
-error[E0723]: can only call other `const fn` within a `const fn`, but `const <&i32 as std::ops::Add>::add` is not stable as `const fn`
-  --> $DIR/const_let_refutable.rs:4:5
+error[E0723]: loops and conditional expressions are not stable in const fn
+  --> $DIR/const_let_refutable.rs:3:17
    |
-LL |     a + b
-   |     ^^^^^
+LL | const fn slice(&[a, b]: &[i32]) -> i32 {
+   |                 ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
-error[E0381]: use of possibly-uninitialized variable: `a`
-  --> $DIR/const_let_refutable.rs:4:5
-   |
-LL |     a + b
-   |     ^ use of possibly-uninitialized `a`
-
-error[E0381]: use of possibly-uninitialized variable: `b`
-  --> $DIR/const_let_refutable.rs:4:9
-   |
-LL |     a + b
-   |         ^ use of possibly-uninitialized `b`
-
-error: aborting due to 4 previous errors
+error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0005, E0381, E0723.
+Some errors have detailed explanations: E0005, E0723.
 For more information about an error, try `rustc --explain E0005`.
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs b/src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs
new file mode 100644
index 0000000000..4ed908312f
--- /dev/null
+++ b/src/test/ui/consts/const_limit/const_eval_limit_not_reached.rs
@@ -0,0 +1,15 @@
+// check-pass
+#![feature(const_eval_limit)]
+#![const_eval_limit="1000"]
+
+const CONSTANT: usize = limit();
+
+fn main() {
+    assert_eq!(CONSTANT, 1764);
+}
+
+const fn limit() -> usize {
+    let x = 42;
+
+    x * 42
+}
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_overflow.rs b/src/test/ui/consts/const_limit/const_eval_limit_overflow.rs
new file mode 100644
index 0000000000..1c49593cd5
--- /dev/null
+++ b/src/test/ui/consts/const_limit/const_eval_limit_overflow.rs
@@ -0,0 +1,15 @@
+#![feature(const_eval_limit)]
+#![const_eval_limit="18_446_744_073_709_551_615"]
+//~^ ERROR `limit` must be a non-negative integer
+
+const CONSTANT: usize = limit();
+
+fn main() {
+    assert_eq!(CONSTANT, 1764);
+}
+
+const fn limit() -> usize {
+    let x = 42;
+
+    x * 42
+}
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_overflow.stderr b/src/test/ui/consts/const_limit/const_eval_limit_overflow.stderr
new file mode 100644
index 0000000000..7f5d5e6cd4
--- /dev/null
+++ b/src/test/ui/consts/const_limit/const_eval_limit_overflow.stderr
@@ -0,0 +1,10 @@
+error: `limit` must be a non-negative integer
+  --> $DIR/const_eval_limit_overflow.rs:2:1
+   |
+LL | #![const_eval_limit="18_446_744_073_709_551_615"]
+   | ^^^^^^^^^^^^^^^^^^^^----------------------------^
+   |                     |
+   |                     not a valid integer
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_reached.rs b/src/test/ui/consts/const_limit/const_eval_limit_reached.rs
new file mode 100644
index 0000000000..d962398d41
--- /dev/null
+++ b/src/test/ui/consts/const_limit/const_eval_limit_reached.rs
@@ -0,0 +1,21 @@
+// ignore-tidy-linelength
+// only-x86_64
+// check-pass
+// NOTE: We always compile this test with -Copt-level=0 because higher opt-levels
+//       optimize away the const function
+// compile-flags:-Copt-level=0
+#![feature(const_eval_limit)]
+#![const_eval_limit="2"]
+
+const CONSTANT: usize = limit();
+//~^ WARNING Constant evaluating a complex constant, this might take some time
+
+fn main() {
+    assert_eq!(CONSTANT, 1764);
+}
+
+const fn limit() -> usize { //~ WARNING Constant evaluating a complex constant, this might take some time
+    let x = 42;
+
+    x * 42
+}
diff --git a/src/test/ui/consts/const_limit/const_eval_limit_reached.stderr b/src/test/ui/consts/const_limit/const_eval_limit_reached.stderr
new file mode 100644
index 0000000000..e0871ff718
--- /dev/null
+++ b/src/test/ui/consts/const_limit/const_eval_limit_reached.stderr
@@ -0,0 +1,16 @@
+warning: Constant evaluating a complex constant, this might take some time
+  --> $DIR/const_eval_limit_reached.rs:17:1
+   |
+LL | / const fn limit() -> usize {
+LL | |     let x = 42;
+LL | |
+LL | |     x * 42
+LL | | }
+   | |_^
+
+warning: Constant evaluating a complex constant, this might take some time
+  --> $DIR/const_eval_limit_reached.rs:10:1
+   |
+LL | const CONSTANT: usize = limit();
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.rs b/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.rs
new file mode 100644
index 0000000000..61119d7511
--- /dev/null
+++ b/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.rs
@@ -0,0 +1,14 @@
+#![const_eval_limit="42"]
+//~^ ERROR the `#[const_eval_limit]` attribute is an experimental feature [E0658]
+
+const CONSTANT: usize = limit();
+
+fn main() {
+    assert_eq!(CONSTANT, 1764);
+}
+
+const fn limit() -> usize {
+    let x = 42;
+
+    x * 42
+}
diff --git a/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.stderr b/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.stderr
new file mode 100644
index 0000000000..5bd29c7dfd
--- /dev/null
+++ b/src/test/ui/consts/const_limit/feature-gate-const_eval_limit.stderr
@@ -0,0 +1,12 @@
+error[E0658]: the `#[const_eval_limit]` attribute is an experimental feature
+  --> $DIR/feature-gate-const_eval_limit.rs:1:1
+   |
+LL | #![const_eval_limit="42"]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #67217 <https://github.com/rust-lang/rust/issues/67217> for more information
+   = help: add `#![feature(const_eval_limit)]` to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/consts/const_short_circuit.stderr b/src/test/ui/consts/const_short_circuit.stderr
index 0a6536c883..b020382af0 100644
--- a/src/test/ui/consts/const_short_circuit.stderr
+++ b/src/test/ui/consts/const_short_circuit.stderr
@@ -4,7 +4,7 @@ error: new features like let bindings are not permitted in constants which also
 LL |     let mut x = true && false;
    |         ^^^^^
    |
-note: use of `&&` operator here does not actually short circuit due to the const evaluator presently not being able to do control flow. See https://github.com/rust-lang/rust/issues/49146 for more information.
+note: use of `&&` operator here does not actually short circuit due to the const evaluator presently not being able to do control flow. See issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information.
   --> $DIR/const_short_circuit.rs:4:22
    |
 LL |     let mut x = true && false;
@@ -16,7 +16,7 @@ error: new features like let bindings are not permitted in constants which also
 LL |     let x = true && false;
    |         ^
    |
-note: use of `&&` operator here does not actually short circuit due to the const evaluator presently not being able to do control flow. See https://github.com/rust-lang/rust/issues/49146 for more information.
+note: use of `&&` operator here does not actually short circuit due to the const evaluator presently not being able to do control flow. See issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information.
   --> $DIR/const_short_circuit.rs:9:18
    |
 LL |     let x = true && false;
diff --git a/src/test/ui/consts/control-flow/assert.both.stderr b/src/test/ui/consts/control-flow/assert.both.stderr
index 44769175f0..7dd60cfb54 100644
--- a/src/test/ui/consts/control-flow/assert.both.stderr
+++ b/src/test/ui/consts/control-flow/assert.both.stderr
@@ -7,7 +7,7 @@ LL | const _: () = assert!(false);
    |               the evaluated program panicked at 'assertion failed: false', $DIR/assert.rs:12:15
    |
    = note: `#[deny(const_err)]` on by default
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/control-flow/assert.if_match.stderr b/src/test/ui/consts/control-flow/assert.if_match.stderr
index 9c8963f6c7..466fb7c3ec 100644
--- a/src/test/ui/consts/control-flow/assert.if_match.stderr
+++ b/src/test/ui/consts/control-flow/assert.if_match.stderr
@@ -4,9 +4,9 @@ error[E0658]: panicking in constants is unstable
 LL | const _: () = assert!(true);
    |               ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51999
+   = note: see issue #51999 <https://github.com/rust-lang/rust/issues/51999> for more information
    = help: add `#![feature(const_panic)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: panicking in constants is unstable
   --> $DIR/assert.rs:12:15
@@ -14,9 +14,9 @@ error[E0658]: panicking in constants is unstable
 LL | const _: () = assert!(false);
    |               ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51999
+   = note: see issue #51999 <https://github.com/rust-lang/rust/issues/51999> for more information
    = help: add `#![feature(const_panic)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/control-flow/assert.panic.stderr b/src/test/ui/consts/control-flow/assert.panic.stderr
index 11550bf801..eafbdd84cc 100644
--- a/src/test/ui/consts/control-flow/assert.panic.stderr
+++ b/src/test/ui/consts/control-flow/assert.panic.stderr
@@ -4,8 +4,9 @@ error[E0658]: `if` is not allowed in a `const`
 LL | const _: () = assert!(true);
    |               ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: `if` is not allowed in a `const`
   --> $DIR/assert.rs:12:15
@@ -13,8 +14,9 @@ error[E0658]: `if` is not allowed in a `const`
 LL | const _: () = assert!(false);
    |               ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/control-flow/assert.stock.stderr b/src/test/ui/consts/control-flow/assert.stock.stderr
index 11550bf801..eafbdd84cc 100644
--- a/src/test/ui/consts/control-flow/assert.stock.stderr
+++ b/src/test/ui/consts/control-flow/assert.stock.stderr
@@ -4,8 +4,9 @@ error[E0658]: `if` is not allowed in a `const`
 LL | const _: () = assert!(true);
    |               ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: `if` is not allowed in a `const`
   --> $DIR/assert.rs:12:15
@@ -13,8 +14,9 @@ error[E0658]: `if` is not allowed in a `const`
 LL | const _: () = assert!(false);
    |               ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/control-flow/feature-gate-const-if-match.stock.stderr b/src/test/ui/consts/control-flow/feature-gate-const-if-match.stock.stderr
index d3c6a51923..ca087b8588 100644
--- a/src/test/ui/consts/control-flow/feature-gate-const-if-match.stock.stderr
+++ b/src/test/ui/consts/control-flow/feature-gate-const-if-match.stock.stderr
@@ -9,7 +9,7 @@ LL | |     6
 LL | | };
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -23,7 +23,7 @@ LL | |     1
 LL | | };
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -37,7 +37,7 @@ LL | |     _ => 0,
 LL | | };
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `static`
@@ -46,7 +46,7 @@ error[E0658]: `if` is not allowed in a `static`
 LL |     let x = if true { 0 } else { 1 };
    |             ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `static`
@@ -55,7 +55,7 @@ error[E0658]: `match` is not allowed in a `static`
 LL |     let x = match x { 0 => 1, _ => 0 };
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `static`
@@ -64,7 +64,7 @@ error[E0658]: `if` is not allowed in a `static`
 LL |     if let Some(x) = Some(x) { x } else { 1 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `static mut`
@@ -73,7 +73,7 @@ error[E0658]: `if` is not allowed in a `static mut`
 LL |     let x = if true { 0 } else { 1 };
    |             ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `static mut`
@@ -82,7 +82,7 @@ error[E0658]: `match` is not allowed in a `static mut`
 LL |     let x = match x { 0 => 1, _ => 0 };
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `static mut`
@@ -91,7 +91,7 @@ error[E0658]: `if` is not allowed in a `static mut`
 LL |     if let Some(x) = Some(x) { x } else { 1 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const fn`
@@ -100,7 +100,7 @@ error[E0658]: `if` is not allowed in a `const fn`
 LL |     if true { 5 } else { 6 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const fn`
@@ -113,7 +113,7 @@ LL | |         1
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const fn`
@@ -126,7 +126,7 @@ LL | |         _ => 0
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const fn`
@@ -135,7 +135,7 @@ error[E0658]: `if` is not allowed in a `const fn`
 LL |         let x = if y { 0 } else { 1 };
    |                 ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const fn`
@@ -144,7 +144,7 @@ error[E0658]: `match` is not allowed in a `const fn`
 LL |         let x = match x { 0 => 1, _ => 0 };
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const fn`
@@ -153,7 +153,7 @@ error[E0658]: `if` is not allowed in a `const fn`
 LL |         if let Some(x) = Some(x) { x } else { 1 }
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -162,7 +162,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |         let x = if false { 0 } else { 1 };
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -171,7 +171,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |         let x = match x { 0 => 1, _ => 0 };
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -180,7 +180,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |         if let Some(x) = Some(x) { x } else { 1 }
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -189,7 +189,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |     const IF: i32 = if true { 5 } else { 6 };
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -198,7 +198,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |     const IF_LET: i32 = if let Some(true) = None { 5 } else { 6 };
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -207,7 +207,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |     const MATCH: i32 = match 0 { 1 => 2, _ => 0 };
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -216,7 +216,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |     const IF: i32 = if true { 5 } else { 6 };
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -225,7 +225,7 @@ error[E0658]: `if` is not allowed in a `const`
 LL |     const IF_LET: i32 = if let Some(true) = None { 5 } else { 6 };
    |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -234,7 +234,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |     const MATCH: i32 = match 0 { 1 => 2, _ => 0 };
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0019]: constant contains unimplemented expression type
diff --git a/src/test/ui/consts/control-flow/issue-46843.stock.stderr b/src/test/ui/consts/control-flow/issue-46843.stock.stderr
index b6f38f8ed9..e4650da207 100644
--- a/src/test/ui/consts/control-flow/issue-46843.stock.stderr
+++ b/src/test/ui/consts/control-flow/issue-46843.stock.stderr
@@ -10,7 +10,7 @@ LL | |     Thing::That => 0
 LL | | };
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/control-flow/issue-50577.if_match.stderr b/src/test/ui/consts/control-flow/issue-50577.if_match.stderr
index 6771224e6c..831360d565 100644
--- a/src/test/ui/consts/control-flow/issue-50577.if_match.stderr
+++ b/src/test/ui/consts/control-flow/issue-50577.if_match.stderr
@@ -9,7 +9,7 @@ LL |         Drop = assert_eq!(1, 1)
    |
    = note: `if` expressions without `else` evaluate to `()`
    = help: consider adding an `else` block that evaluates to the expected type
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/control-flow/issue-50577.stock.stderr b/src/test/ui/consts/control-flow/issue-50577.stock.stderr
index 7d637f5aa9..9d0d2831d9 100644
--- a/src/test/ui/consts/control-flow/issue-50577.stock.stderr
+++ b/src/test/ui/consts/control-flow/issue-50577.stock.stderr
@@ -4,9 +4,9 @@ error[E0658]: `match` is not allowed in a `const`
 LL |         Drop = assert_eq!(1, 1)
    |                ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: `if` is not allowed in a `const`
   --> $DIR/issue-50577.rs:7:16
@@ -14,9 +14,9 @@ error[E0658]: `if` is not allowed in a `const`
 LL |         Drop = assert_eq!(1, 1)
    |                ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: `match` is not allowed in a `const`
   --> $DIR/issue-50577.rs:7:16
@@ -24,9 +24,9 @@ error[E0658]: `match` is not allowed in a `const`
 LL |         Drop = assert_eq!(1, 1)
    |                ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0317]: `if` may be missing an `else` clause
   --> $DIR/issue-50577.rs:7:16
@@ -39,7 +39,7 @@ LL |         Drop = assert_eq!(1, 1)
    |
    = note: `if` expressions without `else` evaluate to `()`
    = help: consider adding an `else` block that evaluates to the expected type
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/consts/control-flow/loop.if_match.stderr b/src/test/ui/consts/control-flow/loop.if_match.stderr
index e01081638e..e8ff3624b7 100644
--- a/src/test/ui/consts/control-flow/loop.if_match.stderr
+++ b/src/test/ui/consts/control-flow/loop.if_match.stderr
@@ -4,7 +4,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL | const _: () = loop {};
    |               ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `static`
@@ -13,7 +13,7 @@ error[E0658]: `loop` is not allowed in a `static`
 LL | static FOO: i32 = loop { break 4; };
    |                   ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const fn`
@@ -22,7 +22,7 @@ error[E0658]: `loop` is not allowed in a `const fn`
 LL |     loop {}
    |     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const fn`
@@ -31,7 +31,7 @@ error[E0658]: `loop` is not allowed in a `const fn`
 LL |         loop {}
    |         ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -40,7 +40,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |         while false {}
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -51,7 +51,7 @@ LL | |         x += 1;
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -62,7 +62,7 @@ LL | |         x += 1;
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0744]: `for` is not allowed in a `const`
@@ -92,7 +92,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const`
@@ -106,7 +106,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -115,7 +115,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     while let None = Some(x) { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -124,7 +124,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     while let None = Some(x) { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const`
@@ -133,7 +133,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     const BAR: i32 = loop { break 4; };
    |                      ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const`
@@ -142,7 +142,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     const BAR: i32 = loop { break 4; };
    |                      ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error: aborting due to 15 previous errors
diff --git a/src/test/ui/consts/control-flow/loop.loop_.stderr b/src/test/ui/consts/control-flow/loop.loop_.stderr
index cf871c9a78..3d739f4d2b 100644
--- a/src/test/ui/consts/control-flow/loop.loop_.stderr
+++ b/src/test/ui/consts/control-flow/loop.loop_.stderr
@@ -4,7 +4,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |         while false {}
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
    = note: `#![feature(const_loop)]` alone is not sufficient, since this loop expression contains an implicit conditional
 
@@ -16,7 +16,7 @@ LL | |         x += 1;
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
    = note: `#![feature(const_loop)]` alone is not sufficient, since this loop expression contains an implicit conditional
 
@@ -28,7 +28,7 @@ LL | |         x += 1;
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
    = note: `#![feature(const_loop)]` alone is not sufficient, since this loop expression contains an implicit conditional
 
@@ -56,7 +56,7 @@ LL | |             break;
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -67,7 +67,7 @@ LL | |             break;
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -76,7 +76,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     while let None = Some(x) { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
    = note: `#![feature(const_loop)]` alone is not sufficient, since this loop expression contains an implicit conditional
 
@@ -86,7 +86,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     while let None = Some(x) { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
    = note: `#![feature(const_loop)]` alone is not sufficient, since this loop expression contains an implicit conditional
 
diff --git a/src/test/ui/consts/control-flow/loop.stock.stderr b/src/test/ui/consts/control-flow/loop.stock.stderr
index e3687cf12a..987ced9655 100644
--- a/src/test/ui/consts/control-flow/loop.stock.stderr
+++ b/src/test/ui/consts/control-flow/loop.stock.stderr
@@ -4,7 +4,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL | const _: () = loop {};
    |               ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `static`
@@ -13,7 +13,7 @@ error[E0658]: `loop` is not allowed in a `static`
 LL | static FOO: i32 = loop { break 4; };
    |                   ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const fn`
@@ -22,7 +22,7 @@ error[E0658]: `loop` is not allowed in a `const fn`
 LL |     loop {}
    |     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const fn`
@@ -31,7 +31,7 @@ error[E0658]: `loop` is not allowed in a `const fn`
 LL |         loop {}
    |         ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -40,7 +40,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |         while false {}
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
@@ -52,7 +52,7 @@ LL | |         x += 1;
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
@@ -64,7 +64,7 @@ LL | |         x += 1;
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
@@ -95,7 +95,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -106,7 +106,7 @@ LL | |             break;
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const`
@@ -120,7 +120,7 @@ LL | |         }
 LL | |     }
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `if` is not allowed in a `const`
@@ -131,7 +131,7 @@ LL | |             break;
 LL | |         }
    | |_________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `while` is not allowed in a `const`
@@ -140,7 +140,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     while let None = Some(x) { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
@@ -150,7 +150,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     while let None = Some(x) { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
@@ -160,7 +160,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     const BAR: i32 = loop { break 4; };
    |                      ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error[E0658]: `loop` is not allowed in a `const`
@@ -169,7 +169,7 @@ error[E0658]: `loop` is not allowed in a `const`
 LL |     const BAR: i32 = loop { break 4; };
    |                      ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error: aborting due to 17 previous errors
diff --git a/src/test/ui/consts/control-flow/short-circuit.stock.stderr b/src/test/ui/consts/control-flow/short-circuit.stock.stderr
index cf0de92959..f32f248af4 100644
--- a/src/test/ui/consts/control-flow/short-circuit.stock.stderr
+++ b/src/test/ui/consts/control-flow/short-circuit.stock.stderr
@@ -7,7 +7,7 @@ LL | const _: bool = true || panic!();
    |                         the evaluated program panicked at 'explicit panic', $DIR/short-circuit.rs:10:25
    |
    = note: `#[deny(const_err)]` on by default
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: any use of this value will cause an error
   --> $DIR/short-circuit.rs:11:26
@@ -17,7 +17,7 @@ LL | const _: bool = false && panic!();
    |                          |
    |                          the evaluated program panicked at 'explicit panic', $DIR/short-circuit.rs:11:26
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/consts/enum-discr-type-err.stderr b/src/test/ui/consts/enum-discr-type-err.stderr
index 9935f88e5b..492b79e2e6 100644
--- a/src/test/ui/consts/enum-discr-type-err.stderr
+++ b/src/test/ui/consts/enum-discr-type-err.stderr
@@ -10,6 +10,7 @@ LL | |     B = T,
 LL | | }
    | |_- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you can convert an `i32` to `isize` and panic if the converted value wouldn't fit
    |
 LL |             $( $v = $s::V.try_into().unwrap(), )*
@@ -27,6 +28,7 @@ LL | |     B = T,
 LL | | }
    | |_- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you can convert an `i32` to `isize` and panic if the converted value wouldn't fit
    |
 LL |             $( $v = $s::V.try_into().unwrap(), )*
diff --git a/src/test/ui/consts/is_ascii.rs b/src/test/ui/consts/is_ascii.rs
new file mode 100644
index 0000000000..d8424549f9
--- /dev/null
+++ b/src/test/ui/consts/is_ascii.rs
@@ -0,0 +1,15 @@
+// run-pass
+
+static X: bool = 'a'.is_ascii();
+static Y: bool = 'ä'.is_ascii();
+
+static BX: bool = b'a'.is_ascii();
+static BY: bool = 192u8.is_ascii();
+
+fn main() {
+    assert!(X);
+    assert!(!Y);
+
+    assert!(BX);
+    assert!(!BY);
+}
diff --git a/src/test/ui/consts/issue-63952.rs b/src/test/ui/consts/issue-63952.rs
new file mode 100644
index 0000000000..35cbc7003f
--- /dev/null
+++ b/src/test/ui/consts/issue-63952.rs
@@ -0,0 +1,28 @@
+// Regression test for #63952, shouldn't hang.
+
+use std::usize;
+
+#[repr(C)]
+#[derive(Copy, Clone)]
+struct SliceRepr {
+    ptr: *const u8,
+    len: usize,
+}
+
+union SliceTransmute {
+    repr: SliceRepr,
+    slice: &'static [u8],
+}
+
+// bad slice: length too big to even exist anywhere
+const SLICE_WAY_TOO_LONG: &[u8] = unsafe { //~ ERROR: it is undefined behavior to use this value
+    SliceTransmute {
+        repr: SliceRepr {
+            ptr: &42,
+            len: usize::MAX,
+        },
+    }
+    .slice
+};
+
+fn main() {}
diff --git a/src/test/ui/consts/issue-63952.stderr b/src/test/ui/consts/issue-63952.stderr
new file mode 100644
index 0000000000..5e85be45b1
--- /dev/null
+++ b/src/test/ui/consts/issue-63952.stderr
@@ -0,0 +1,17 @@
+error[E0080]: it is undefined behavior to use this value
+  --> $DIR/issue-63952.rs:18:1
+   |
+LL | / const SLICE_WAY_TOO_LONG: &[u8] = unsafe {
+LL | |     SliceTransmute {
+LL | |         repr: SliceRepr {
+LL | |             ptr: &42,
+...  |
+LL | |     .slice
+LL | | };
+   | |__^ type validation failed: encountered invalid reference metadata: slice is bigger than largest supported object
+   |
+   = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0080`.
diff --git a/src/test/ui/consts/issue-64059-2.rs b/src/test/ui/consts/issue-64059-2.rs
deleted file mode 100644
index 38911c3dcf..0000000000
--- a/src/test/ui/consts/issue-64059-2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// compile-flags: -C overflow-checks=on -O
-// run-pass
-
-fn main() {
-    let _ = -(-0.0);
-}
diff --git a/src/test/ui/consts/issue-64059.rs b/src/test/ui/consts/issue-64059.rs
index c4c895fef6..02c8b72503 100644
--- a/src/test/ui/consts/issue-64059.rs
+++ b/src/test/ui/consts/issue-64059.rs
@@ -1,3 +1,8 @@
+// revisions: noopt opt opt_with_overflow_checks
+//[noopt]compile-flags: -C opt-level=0
+//[opt]compile-flags: -O
+//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+
 // run-pass
 
 fn main() {
diff --git a/src/test/ui/consts/issue-68684.rs b/src/test/ui/consts/issue-68684.rs
new file mode 100644
index 0000000000..c98f199b60
--- /dev/null
+++ b/src/test/ui/consts/issue-68684.rs
@@ -0,0 +1,15 @@
+// check-pass
+
+enum _Enum {
+    A(),
+}
+
+type _E = _Enum;
+
+const fn _a() -> _Enum {
+    _E::A()
+}
+
+const _A: _Enum = _a();
+
+fn main() {}
diff --git a/src/test/ui/consts/issue-69020.noopt.stderr b/src/test/ui/consts/issue-69020.noopt.stderr
new file mode 100644
index 0000000000..c48a106ef4
--- /dev/null
+++ b/src/test/ui/consts/issue-69020.noopt.stderr
@@ -0,0 +1,30 @@
+error: this arithmetic operation will overflow
+  --> $DIR/issue-69020.rs:21:22
+   |
+LL |     const NEG: i32 = -i32::MIN + T::NEG;
+   |                      ^^^^^^^^^ attempt to negate with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-69020.rs:23:22
+   |
+LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
+   |                      ^^^^^^^^^^^^ attempt to add with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-69020.rs:25:22
+   |
+LL |     const DIV: i32 = (1/0) + T::DIV;
+   |                      ^^^^^ attempt to divide by zero
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: this operation will panic at runtime
+  --> $DIR/issue-69020.rs:27:22
+   |
+LL |     const OOB: i32 = [1][1] + T::OOB;
+   |                      ^^^^^^ index out of bounds: the len is 1 but the index is 1
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/consts/issue-69020.opt.stderr b/src/test/ui/consts/issue-69020.opt.stderr
new file mode 100644
index 0000000000..c48a106ef4
--- /dev/null
+++ b/src/test/ui/consts/issue-69020.opt.stderr
@@ -0,0 +1,30 @@
+error: this arithmetic operation will overflow
+  --> $DIR/issue-69020.rs:21:22
+   |
+LL |     const NEG: i32 = -i32::MIN + T::NEG;
+   |                      ^^^^^^^^^ attempt to negate with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-69020.rs:23:22
+   |
+LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
+   |                      ^^^^^^^^^^^^ attempt to add with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-69020.rs:25:22
+   |
+LL |     const DIV: i32 = (1/0) + T::DIV;
+   |                      ^^^^^ attempt to divide by zero
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: this operation will panic at runtime
+  --> $DIR/issue-69020.rs:27:22
+   |
+LL |     const OOB: i32 = [1][1] + T::OOB;
+   |                      ^^^^^^ index out of bounds: the len is 1 but the index is 1
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/consts/issue-69020.opt_with_overflow_checks.stderr b/src/test/ui/consts/issue-69020.opt_with_overflow_checks.stderr
new file mode 100644
index 0000000000..c48a106ef4
--- /dev/null
+++ b/src/test/ui/consts/issue-69020.opt_with_overflow_checks.stderr
@@ -0,0 +1,30 @@
+error: this arithmetic operation will overflow
+  --> $DIR/issue-69020.rs:21:22
+   |
+LL |     const NEG: i32 = -i32::MIN + T::NEG;
+   |                      ^^^^^^^^^ attempt to negate with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-69020.rs:23:22
+   |
+LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
+   |                      ^^^^^^^^^^^^ attempt to add with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-69020.rs:25:22
+   |
+LL |     const DIV: i32 = (1/0) + T::DIV;
+   |                      ^^^^^ attempt to divide by zero
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: this operation will panic at runtime
+  --> $DIR/issue-69020.rs:27:22
+   |
+LL |     const OOB: i32 = [1][1] + T::OOB;
+   |                      ^^^^^^ index out of bounds: the len is 1 but the index is 1
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/consts/issue-69020.rs b/src/test/ui/consts/issue-69020.rs
new file mode 100644
index 0000000000..e079feb04d
--- /dev/null
+++ b/src/test/ui/consts/issue-69020.rs
@@ -0,0 +1,29 @@
+// revisions: noopt opt opt_with_overflow_checks
+//[noopt]compile-flags: -C opt-level=0
+//[opt]compile-flags: -O
+//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+
+#![crate_type="lib"]
+
+use std::i32;
+
+pub trait Foo {
+    const NEG: i32;
+    const ADD: i32;
+    const DIV: i32;
+    const OOB: i32;
+}
+
+// These constants cannot be evaluated already (they depend on `T::N`), so
+// they can just be linted like normal run-time code.  But codegen works
+// a bit different in const context, so this test makes sure that we still catch overflow.
+impl<T: Foo> Foo for Vec<T> {
+    const NEG: i32 = -i32::MIN + T::NEG;
+    //~^ ERROR arithmetic operation will overflow
+    const ADD: i32 = (i32::MAX+1) + T::ADD;
+    //~^ ERROR arithmetic operation will overflow
+    const DIV: i32 = (1/0) + T::DIV;
+    //~^ ERROR operation will panic
+    const OOB: i32 = [1][1] + T::OOB;
+    //~^ ERROR operation will panic
+}
diff --git a/src/test/ui/consts/issue-69312.rs b/src/test/ui/consts/issue-69312.rs
new file mode 100644
index 0000000000..413c675207
--- /dev/null
+++ b/src/test/ui/consts/issue-69312.rs
@@ -0,0 +1,10 @@
+// build-pass
+
+// Verify that the compiler doesn't ICE during const prop while evaluating the index operation.
+
+#![allow(unconditional_panic)]
+
+fn main() {
+    let cols = [0u32; 0];
+    cols[0];
+}
diff --git a/src/test/ui/consts/min_const_fn/address_of.stderr b/src/test/ui/consts/min_const_fn/address_of.stderr
index 3554b8112b..4d9d1d7928 100644
--- a/src/test/ui/consts/min_const_fn/address_of.stderr
+++ b/src/test/ui/consts/min_const_fn/address_of.stderr
@@ -4,7 +4,7 @@ error[E0658]: `&raw mut` is not allowed in constant functions
 LL |     let b = &raw mut a;
    |             ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: `&raw mut` is not allowed in constant functions
@@ -13,7 +13,7 @@ error[E0658]: `&raw mut` is not allowed in constant functions
 LL |         let b = &raw mut a;
    |                 ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr
index 0ede4229ad..9a14bcc2f7 100644
--- a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr
+++ b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr
@@ -4,7 +4,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const fn error(_: fn()) {}
    |                ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr_feature_gate.stderr b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr_feature_gate.stderr
index 70a10d9a0c..7794cc7583 100644
--- a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr_feature_gate.stderr
+++ b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr_feature_gate.stderr
@@ -4,7 +4,6 @@ error[E0658]: internal implementation detail
 LL | #[rustc_allow_const_fn_ptr]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr b/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr
index ecfd30e7b4..39b223062e 100644
--- a/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr
+++ b/src/test/ui/consts/min_const_fn/bad_const_fn_body_ice.stderr
@@ -4,9 +4,9 @@ error[E0723]: heap allocations are not allowed in const fn
 LL |     vec![1, 2, 3]
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/min_const_fn/cast_errors.stderr b/src/test/ui/consts/min_const_fn/cast_errors.stderr
index 9919c17a04..a6a05b522a 100644
--- a/src/test/ui/consts/min_const_fn/cast_errors.stderr
+++ b/src/test/ui/consts/min_const_fn/cast_errors.stderr
@@ -4,7 +4,7 @@ error[E0723]: unsizing casts are not allowed in const fn
 LL | const fn unsize(x: &[u8; 3]) -> &[u8] { x }
    |                                         ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
@@ -13,7 +13,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const fn closure() -> fn() { || {} }
    |                       ^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
@@ -22,7 +22,7 @@ error[E0723]: function pointers in const fn are unstable
 LL |     (|| {}) as fn();
    |     ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
@@ -31,7 +31,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const fn reify(f: fn()) -> unsafe fn() { f }
    |                            ^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
@@ -40,7 +40,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const fn reify2() { main as unsafe fn(); }
    |                     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/consts/min_const_fn/cmp_fn_pointers.stderr b/src/test/ui/consts/min_const_fn/cmp_fn_pointers.stderr
index 82ed1d4522..74e5228d0d 100644
--- a/src/test/ui/consts/min_const_fn/cmp_fn_pointers.stderr
+++ b/src/test/ui/consts/min_const_fn/cmp_fn_pointers.stderr
@@ -4,7 +4,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const fn cmp(x: fn(), y: fn()) -> bool {
    |              ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/min_const_fn/loop_ice.stderr b/src/test/ui/consts/min_const_fn/loop_ice.stderr
index 58d1d42113..f48b7396e7 100644
--- a/src/test/ui/consts/min_const_fn/loop_ice.stderr
+++ b/src/test/ui/consts/min_const_fn/loop_ice.stderr
@@ -4,7 +4,7 @@ error[E0658]: `loop` is not allowed in a `const fn`
 LL |     loop {}
    |     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn.rs b/src/test/ui/consts/min_const_fn/min_const_fn.rs
index c3436d4840..557439f394 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn.rs
+++ b/src/test/ui/consts/min_const_fn/min_const_fn.rs
@@ -123,12 +123,9 @@ impl<T: Sync + Sized> Foo<T> {
 }
 
 struct AlanTuring<T>(T);
-const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> { AlanTuring(0) }
-//~^ ERROR `impl Trait` in const fn is unstable
 const fn no_apit2(_x: AlanTuring<impl std::fmt::Debug>) {}
 //~^ ERROR trait bounds other than `Sized`
 const fn no_apit(_x: impl std::fmt::Debug) {} //~ ERROR trait bounds other than `Sized`
-const fn no_rpit() -> impl std::fmt::Debug {} //~ ERROR `impl Trait` in const fn is unstable
 const fn no_dyn_trait(_x: &dyn std::fmt::Debug) {} //~ ERROR trait bounds other than `Sized`
 const fn no_dyn_trait_ret() -> &'static dyn std::fmt::Debug { &() }
 //~^ ERROR trait bounds other than `Sized`
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn.stderr b/src/test/ui/consts/min_const_fn/min_const_fn.stderr
index cb1663ed22..512b343011 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn.stderr
@@ -10,7 +10,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     const fn get_mut(&mut self) -> &mut T { &mut self.0 }
    |                                    ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0493]: destructors cannot be evaluated at compile-time
@@ -25,7 +25,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     const fn get_mut_lt(&'a mut self) -> &mut T { &mut self.0 }
    |                                          ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0493]: destructors cannot be evaluated at compile-time
@@ -40,7 +40,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     const fn get_mut_s(&mut self) -> &mut T { &mut self.0 }
    |                                      ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: mutable references in const fn are unstable
@@ -49,7 +49,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     const fn get_mut_sq(&mut self) -> &mut T { &mut self.0 }
    |                                       ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
@@ -58,7 +58,7 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL | const fn foo11<T: std::fmt::Display>(t: T) -> T { t }
    |                ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
@@ -67,7 +67,7 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL | const fn foo11_2<T: Send>(t: T) -> T { t }
    |                  ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int, `bool` and `char` operations are stable in const fn
@@ -76,7 +76,7 @@ error[E0723]: only int, `bool` and `char` operations are stable in const fn
 LL | const fn foo19(f: f32) -> f32 { f * 2.0 }
    |                                 ^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int, `bool` and `char` operations are stable in const fn
@@ -85,7 +85,7 @@ error[E0723]: only int, `bool` and `char` operations are stable in const fn
 LL | const fn foo19_2(f: f32) -> f32 { 2.0 - f }
    |                                   ^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int and `bool` operations are stable in const fn
@@ -94,7 +94,7 @@ error[E0723]: only int and `bool` operations are stable in const fn
 LL | const fn foo19_3(f: f32) -> f32 { -f }
    |                                   ^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int, `bool` and `char` operations are stable in const fn
@@ -103,7 +103,7 @@ error[E0723]: only int, `bool` and `char` operations are stable in const fn
 LL | const fn foo19_4(f: f32, g: f32) -> f32 { f / g }
    |                                           ^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: cannot access `static` items in const fn
@@ -112,7 +112,7 @@ error[E0723]: cannot access `static` items in const fn
 LL | const fn foo25() -> u32 { BAR }
    |                           ^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: cannot access `static` items in const fn
@@ -121,7 +121,7 @@ error[E0723]: cannot access `static` items in const fn
 LL | const fn foo26() -> &'static u32 { &BAR }
    |                                     ^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: casting pointers to ints is unstable in const fn
@@ -130,7 +130,7 @@ error[E0723]: casting pointers to ints is unstable in const fn
 LL | const fn foo30(x: *const u32) -> usize { x as usize }
    |                                          ^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: casting pointers to ints is unstable in const fn
@@ -139,7 +139,7 @@ error[E0723]: casting pointers to ints is unstable in const fn
 LL | const fn foo30_with_unsafe(x: *const u32) -> usize { unsafe { x as usize } }
    |                                                               ^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: casting pointers to ints is unstable in const fn
@@ -148,7 +148,7 @@ error[E0723]: casting pointers to ints is unstable in const fn
 LL | const fn foo30_2(x: *mut u32) -> usize { x as usize }
    |                                          ^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: casting pointers to ints is unstable in const fn
@@ -157,7 +157,7 @@ error[E0723]: casting pointers to ints is unstable in const fn
 LL | const fn foo30_2_with_unsafe(x: *mut u32) -> usize { unsafe { x as usize } }
    |                                                               ^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: loops and conditional expressions are not stable in const fn
@@ -166,7 +166,7 @@ error[E0723]: loops and conditional expressions are not stable in const fn
 LL | const fn foo36(a: bool, b: bool) -> bool { a && b }
    |                                            ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: loops and conditional expressions are not stable in const fn
@@ -175,7 +175,7 @@ error[E0723]: loops and conditional expressions are not stable in const fn
 LL | const fn foo37(a: bool, b: bool) -> bool { a || b }
    |                                            ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: mutable references in const fn are unstable
@@ -184,7 +184,7 @@ error[E0723]: mutable references in const fn are unstable
 LL | const fn inc(x: &mut i32) { *x += 1 }
    |              ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
@@ -193,7 +193,7 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL | impl<T: std::fmt::Debug> Foo<T> {
    |      ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
@@ -202,7 +202,7 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL | impl<T: std::fmt::Debug + Sized> Foo<T> {
    |      ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
@@ -211,91 +211,73 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL | impl<T: Sync + Sized> Foo<T> {
    |      ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
-   = help: add `#![feature(const_fn)]` to the crate attributes to enable
-
-error[E0723]: `impl Trait` in const fn is unstable
-  --> $DIR/min_const_fn.rs:126:24
-   |
-LL | const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> { AlanTuring(0) }
-   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
-  --> $DIR/min_const_fn.rs:128:34
+  --> $DIR/min_const_fn.rs:126:34
    |
 LL | const fn no_apit2(_x: AlanTuring<impl std::fmt::Debug>) {}
    |                                  ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
-  --> $DIR/min_const_fn.rs:130:22
+  --> $DIR/min_const_fn.rs:128:22
    |
 LL | const fn no_apit(_x: impl std::fmt::Debug) {}
    |                      ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
-   = help: add `#![feature(const_fn)]` to the crate attributes to enable
-
-error[E0723]: `impl Trait` in const fn is unstable
-  --> $DIR/min_const_fn.rs:131:23
-   |
-LL | const fn no_rpit() -> impl std::fmt::Debug {}
-   |                       ^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
-  --> $DIR/min_const_fn.rs:132:23
+  --> $DIR/min_const_fn.rs:129:23
    |
 LL | const fn no_dyn_trait(_x: &dyn std::fmt::Debug) {}
    |                       ^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
-  --> $DIR/min_const_fn.rs:133:32
+  --> $DIR/min_const_fn.rs:130:32
    |
 LL | const fn no_dyn_trait_ret() -> &'static dyn std::fmt::Debug { &() }
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
-  --> $DIR/min_const_fn.rs:138:41
+  --> $DIR/min_const_fn.rs:135:41
    |
 LL | const fn really_no_traits_i_mean_it() { (&() as &dyn std::fmt::Debug, ()).1 }
    |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
-  --> $DIR/min_const_fn.rs:141:21
+  --> $DIR/min_const_fn.rs:138:21
    |
 LL | const fn no_fn_ptrs(_x: fn()) {}
    |                     ^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
-  --> $DIR/min_const_fn.rs:143:27
+  --> $DIR/min_const_fn.rs:140:27
    |
 LL | const fn no_fn_ptrs2() -> fn() { fn foo() {} foo }
    |                           ^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
-error: aborting due to 34 previous errors
+error: aborting due to 32 previous errors
 
 Some errors have detailed explanations: E0493, E0723.
 For more information about an error, try `rustc --explain E0493`.
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_dyn.stderr b/src/test/ui/consts/min_const_fn/min_const_fn_dyn.stderr
index e20b4f9dcb..17e171c2fc 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_dyn.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_dyn.stderr
@@ -4,7 +4,7 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL |     x.0.field;
    |     ^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: trait bounds other than `Sized` on const fn parameters are unstable
@@ -13,7 +13,7 @@ error[E0723]: trait bounds other than `Sized` on const fn parameters are unstabl
 LL | const fn no_inner_dyn_trait_ret() -> Hide { Hide(HasDyn { field: &0 }) }
    |                                                                  ^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_fn_ptr.stderr b/src/test/ui/consts/min_const_fn/min_const_fn_fn_ptr.stderr
index 085ad1aad3..58acbb5339 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_fn_ptr.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_fn_ptr.stderr
@@ -4,7 +4,7 @@ error[E0723]: function pointers in const fn are unstable
 LL |     x.0.field;
    |     ^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: function pointers in const fn are unstable
@@ -13,7 +13,7 @@ error[E0723]: function pointers in const fn are unstable
 LL | const fn no_inner_dyn_trait_ret() -> Hide { Hide(HasPtr { field }) }
    |                                                           ^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs
new file mode 100644
index 0000000000..9cc9b69ac0
--- /dev/null
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs
@@ -0,0 +1,9 @@
+struct AlanTuring<T>(T);
+const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> {
+    //~^ ERROR `impl Trait` in const fn is unstable
+    AlanTuring(0)
+}
+
+const fn no_rpit() -> impl std::fmt::Debug {} //~ ERROR `impl Trait` in const fn is unstable
+
+fn main() {}
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr
new file mode 100644
index 0000000000..a62a340332
--- /dev/null
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr
@@ -0,0 +1,21 @@
+error[E0723]: `impl Trait` in const fn is unstable
+  --> $DIR/min_const_fn_impl_trait.rs:2:24
+   |
+LL | const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> {
+   |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
+   = help: add `#![feature(const_fn)]` to the crate attributes to enable
+
+error[E0723]: `impl Trait` in const fn is unstable
+  --> $DIR/min_const_fn_impl_trait.rs:7:23
+   |
+LL | const fn no_rpit() -> impl std::fmt::Debug {}
+   |                       ^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
+   = help: add `#![feature(const_fn)]` to the crate attributes to enable
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0723`.
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr b/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
index 1da9b41aa5..b82ae40d68 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.stderr
@@ -4,7 +4,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const fn bar() -> u32 { foo() }
    |                         ^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const foo2` is not stable as `const fn`
@@ -13,7 +13,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const fn bar2() -> u32 { foo2() }
    |                          ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int, `bool` and `char` operations are stable in const fn
@@ -22,7 +22,7 @@ error[E0723]: only int, `bool` and `char` operations are stable in const fn
 LL | const fn bar3() -> u32 { (5f32 + 6f32) as u32 }
    |                          ^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const foo2_gated` is not stable as `const fn`
@@ -31,7 +31,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const fn bar2_gated() -> u32 { foo2_gated() }
    |                                ^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr b/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr
index 2a4c627438..97b0a778d2 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_unsafe_bad.stderr
@@ -4,7 +4,7 @@ error[E0658]: dereferencing raw pointers in constant functions is unstable
 LL | const fn bad_const_fn_deref_raw(x: *mut usize) -> &'static usize { unsafe { &*x } }
    |                                                                             ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error[E0658]: dereferencing raw pointers in constant functions is unstable
@@ -13,7 +13,7 @@ error[E0658]: dereferencing raw pointers in constant functions is unstable
 LL | const unsafe fn bad_const_unsafe_deref_raw(x: *mut usize) -> usize { *x }
    |                                                                      ^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error[E0658]: dereferencing raw pointers in constant functions is unstable
@@ -22,7 +22,7 @@ error[E0658]: dereferencing raw pointers in constant functions is unstable
 LL | const unsafe fn bad_const_unsafe_deref_raw_ref(x: *mut usize) -> &'static usize { &*x }
    |                                                                                   ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error[E0723]: accessing union fields is unstable
@@ -31,7 +31,7 @@ error[E0723]: accessing union fields is unstable
 LL |     Foo { x: () }.y
    |     ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block
diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
index ae92602d45..00975a80b2 100644
--- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.stderr
@@ -4,7 +4,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const unsafe fn bar() -> u32 { unsafe { foo() } }
    |                                         ^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const foo2` is not stable as `const fn`
@@ -13,7 +13,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const unsafe fn bar2() -> u32 { unsafe { foo2() } }
    |                                          ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: only int, `bool` and `char` operations are stable in const fn
@@ -22,7 +22,7 @@ error[E0723]: only int, `bool` and `char` operations are stable in const fn
 LL | const unsafe fn bar3() -> u32 { (5f32 + 6f32) as u32 }
    |                                 ^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const foo2_gated` is not stable as `const fn`
@@ -31,7 +31,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const unsafe fn bar2_gated() -> u32 { unsafe { foo2_gated() } }
    |                                                ^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
index a0db74cfad..5014eed06f 100644
--- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.stderr
@@ -4,7 +4,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const unsafe fn bar() -> u32 { foo() }
    |                                ^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const foo2` is not stable as `const fn`
@@ -13,7 +13,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const unsafe fn bar2() -> u32 { foo2() }
    |                                 ^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: can only call other `const fn` within a `const fn`, but `const foo2_gated` is not stable as `const fn`
@@ -22,7 +22,7 @@ error[E0723]: can only call other `const fn` within a `const fn`, but `const foo
 LL | const unsafe fn bar2_gated() -> u32 { foo2_gated() }
    |                                       ^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/consts/min_const_fn/mutable_borrow.stderr b/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
index 7c121be0d5..f5a3c168a8 100644
--- a/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
+++ b/src/test/ui/consts/min_const_fn/mutable_borrow.stderr
@@ -4,7 +4,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     let b = &mut a;
    |         ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: mutable references in const fn are unstable
@@ -13,7 +13,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |         let b = &mut a;
    |             ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/consts/miri_unleashed/const_refers_to_static.stderr b/src/test/ui/consts/miri_unleashed/const_refers_to_static.stderr
index 243efbbaa7..ad777cfe8e 100644
--- a/src/test/ui/consts/miri_unleashed/const_refers_to_static.stderr
+++ b/src/test/ui/consts/miri_unleashed/const_refers_to_static.stderr
@@ -48,7 +48,7 @@ LL | |     static FOO: AtomicUsize = AtomicUsize::new(0);
 LL | |     unsafe { &*(&FOO as *const _ as *const usize) }
 LL | |
 LL | | };
-   | |__^ constant accesses static
+   | |__^ type validation failed: encountered a reference pointing to a static variable
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
@@ -64,7 +64,7 @@ LL | |
 LL | | };
    | |__-
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/const_refers_to_static.rs:2:9
    |
 LL | #![warn(const_err)]
@@ -97,7 +97,7 @@ LL | |     static FOO: usize = 0;
 LL | |     &FOO
 LL | |
 LL | | };
-   | |__^ constant accesses static
+   | |__^ type validation failed: encountered a reference pointing to a static variable
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/consts/miri_unleashed/mutable_const.stderr b/src/test/ui/consts/miri_unleashed/mutable_const.stderr
index 9daca765c7..86f2778470 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_const.stderr
+++ b/src/test/ui/consts/miri_unleashed/mutable_const.stderr
@@ -16,7 +16,7 @@ LL | |     }
 LL | | };
    | |__-
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/mutable_const.rs:5:9
    |
 LL | #![deny(const_err)]
diff --git a/src/test/ui/consts/miri_unleashed/mutable_const2.stderr b/src/test/ui/consts/miri_unleashed/mutable_const2.stderr
index a316d8f169..3eb8e0ec18 100644
--- a/src/test/ui/consts/miri_unleashed/mutable_const2.stderr
+++ b/src/test/ui/consts/miri_unleashed/mutable_const2.stderr
@@ -10,7 +10,7 @@ error: internal compiler error: mutable allocation in constant
 LL | const MUTABLE_BEHIND_RAW: *mut i32 = &UnsafeCell::new(42) as *const _ as *mut _;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-thread 'rustc' panicked at 'no errors encountered even though `delay_span_bug` issued', src/librustc_errors/lib.rs:357:17
+thread 'rustc' panicked at 'no errors encountered even though `delay_span_bug` issued', src/librustc_errors/lib.rs:355:17
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 
 error: internal compiler error: unexpected panic
diff --git a/src/test/ui/consts/miri_unleashed/non_const_fn.stderr b/src/test/ui/consts/miri_unleashed/non_const_fn.stderr
index 6a7df858fe..dcd37345fd 100644
--- a/src/test/ui/consts/miri_unleashed/non_const_fn.stderr
+++ b/src/test/ui/consts/miri_unleashed/non_const_fn.stderr
@@ -12,7 +12,7 @@ LL | const C: () = foo();
    |               |
    |               calling non-const function `foo`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/non_const_fn.rs:4:9
    |
 LL | #![warn(const_err)]
diff --git a/src/test/ui/consts/projection_qualif.mut_refs.stderr b/src/test/ui/consts/projection_qualif.mut_refs.stderr
index 23538777c9..0945a23f3b 100644
--- a/src/test/ui/consts/projection_qualif.mut_refs.stderr
+++ b/src/test/ui/consts/projection_qualif.mut_refs.stderr
@@ -4,7 +4,7 @@ error[E0658]: dereferencing raw pointers in constants is unstable
 LL |         unsafe { *b = 5; }
    |                  ^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/consts/projection_qualif.stock.stderr b/src/test/ui/consts/projection_qualif.stock.stderr
index 472d260745..75625a4bd1 100644
--- a/src/test/ui/consts/projection_qualif.stock.stderr
+++ b/src/test/ui/consts/projection_qualif.stock.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL |         let b: *mut u32 = &mut a;
    |                           ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: dereferencing raw pointers in constants is unstable
@@ -13,7 +13,7 @@ error[E0658]: dereferencing raw pointers in constants is unstable
 LL |         unsafe { *b = 5; }
    |                  ^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error[E0019]: constant contains unimplemented expression type
diff --git a/src/test/ui/consts/static_mut_containing_mut_ref2.stock.stderr b/src/test/ui/consts/static_mut_containing_mut_ref2.stock.stderr
index 430cef94dc..c70431886e 100644
--- a/src/test/ui/consts/static_mut_containing_mut_ref2.stock.stderr
+++ b/src/test/ui/consts/static_mut_containing_mut_ref2.stock.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | pub static mut STDERR_BUFFER: () = unsafe { *(&mut STDERR_BUFFER_SPACE) = 42; };
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0019]: static contains unimplemented expression type
diff --git a/src/test/ui/consts/std/char.rs b/src/test/ui/consts/std/char.rs
deleted file mode 100644
index fe79059a2e..0000000000
--- a/src/test/ui/consts/std/char.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// run-pass
-
-static X: bool = 'a'.is_ascii();
-static Y: bool = 'ä'.is_ascii();
-
-fn main() {
-    assert!(X);
-    assert!(!Y);
-}
diff --git a/src/test/ui/consts/too_generic_eval_ice.stderr b/src/test/ui/consts/too_generic_eval_ice.stderr
index 599d1d79e7..8836de0023 100644
--- a/src/test/ui/consts/too_generic_eval_ice.stderr
+++ b/src/test/ui/consts/too_generic_eval_ice.stderr
@@ -8,8 +8,8 @@ LL |         [5; Self::HOST_SIZE] == [6; 0]
    |                   ^^^^^^^^^ associated item not found in `Foo<A, B>`
    |
    = note: the method `HOST_SIZE` exists but the following trait bounds were not satisfied:
-           `A : std::marker::Sized`
-           `B : std::marker::Sized`
+           `A: std::marker::Sized`
+           `B: std::marker::Sized`
 
 error[E0277]: the size for values of type `A` cannot be known at compilation time
   --> $DIR/too_generic_eval_ice.rs:7:13
@@ -18,7 +18,7 @@ LL | pub struct Foo<A, B>(A, B);
    | --------------------------- required by `Foo`
 LL | 
 LL | impl<A, B> Foo<A, B> {
-   |      - help: consider restricting this bound: `A: std::marker::Sized`
+   |      - this type parameter needs to be `std::marker::Sized`
 ...
 LL |         [5; Self::HOST_SIZE] == [6; 0]
    |             ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
@@ -33,7 +33,7 @@ LL | pub struct Foo<A, B>(A, B);
    | --------------------------- required by `Foo`
 LL | 
 LL | impl<A, B> Foo<A, B> {
-   |         - help: consider restricting this bound: `B: std::marker::Sized`
+   |         - this type parameter needs to be `std::marker::Sized`
 ...
 LL |         [5; Self::HOST_SIZE] == [6; 0]
    |             ^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
diff --git a/src/test/ui/consts/validate_never_arrays.stderr b/src/test/ui/consts/validate_never_arrays.stderr
index cb995b8216..77f0a2ebd4 100644
--- a/src/test/ui/consts/validate_never_arrays.stderr
+++ b/src/test/ui/consts/validate_never_arrays.stderr
@@ -2,7 +2,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/validate_never_arrays.rs:3:1
    |
 LL | const _: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type at .<deref>
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of the never type `!` at .<deref>[0]
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
@@ -10,7 +10,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/validate_never_arrays.rs:6:1
    |
 LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 1]) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type at .<deref>[0]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of the never type `!` at .<deref>[0]
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
@@ -18,7 +18,7 @@ error[E0080]: it is undefined behavior to use this value
   --> $DIR/validate_never_arrays.rs:7:1
    |
 LL | const _: &[!] = unsafe { &*(1_usize as *const [!; 42]) };
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of an uninhabited type at .<deref>[0]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type validation failed: encountered a value of the never type `!` at .<deref>[0]
    |
    = note: The rules on what exactly is undefined behavior aren't clear, so this check might be overzealous. Please open an issue on the rustc repository if you believe it should not be considered undefined behavior.
 
diff --git a/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr b/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr
index b6ebe0ff1f..9f58f16c1a 100644
--- a/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr
+++ b/src/test/ui/cross/cross-crate-macro-backtrace/main.stderr
@@ -4,7 +4,7 @@ error: 1 positional argument in format string, but no arguments were given
 LL |     myprintln!("{}");
    |     ^^^^^^^^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/cross/cross-file-errors/main.stderr b/src/test/ui/cross/cross-file-errors/main.stderr
index 7fd91eb1d6..f9101d8a58 100644
--- a/src/test/ui/cross/cross-file-errors/main.stderr
+++ b/src/test/ui/cross/cross-file-errors/main.stderr
@@ -8,6 +8,8 @@ LL |         _
    |
 LL |     underscore!();
    |     -------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/custom_test_frameworks/mismatch.stderr b/src/test/ui/custom_test_frameworks/mismatch.stderr
index 9e2688c639..420ddbc3de 100644
--- a/src/test/ui/custom_test_frameworks/mismatch.stderr
+++ b/src/test/ui/custom_test_frameworks/mismatch.stderr
@@ -5,6 +5,7 @@ LL | fn wrong_kind(){}
    | ^^^^^^^^^^^^^^^^^ the trait `example_runner::Testable` is not implemented for `test::TestDescAndFn`
    |
    = note: required for the cast to the object type `dyn example_runner::Testable`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/definition-reachable/nested-fn.rs b/src/test/ui/definition-reachable/nested-fn.rs
index b596ba8936..b665b049f3 100644
--- a/src/test/ui/definition-reachable/nested-fn.rs
+++ b/src/test/ui/definition-reachable/nested-fn.rs
@@ -1,4 +1,4 @@
-// Check that functions visible to macros through paths with >2 segements are
+// Check that functions visible to macros through paths with >2 segments are
 // considered reachable
 
 // aux-build:field-method-macro.rs
diff --git a/src/test/ui/dep-graph/dep-graph-variance-alias.rs b/src/test/ui/dep-graph/dep-graph-variance-alias.rs
index 9564568730..927ea55977 100644
--- a/src/test/ui/dep-graph/dep-graph-variance-alias.rs
+++ b/src/test/ui/dep-graph/dep-graph-variance-alias.rs
@@ -6,17 +6,16 @@
 #![feature(rustc_attrs)]
 #![allow(dead_code)]
 #![allow(unused_variables)]
-
-fn main() { }
+#![rustc_if_this_changed(hir_crate)]
+fn main() {}
 
 struct Foo<T> {
-    f: T
+    f: T,
 }
 
-#[rustc_if_this_changed(Krate)]
 type TypeAlias<T> = Foo<T>;
 
 #[rustc_then_this_would_need(variances_of)] //~ ERROR OK
 struct Use<T> {
-    x: TypeAlias<T>
+    x: TypeAlias<T>,
 }
diff --git a/src/test/ui/dep-graph/dep-graph-variance-alias.stderr b/src/test/ui/dep-graph/dep-graph-variance-alias.stderr
index 554ff455a2..2422cb9bb2 100644
--- a/src/test/ui/dep-graph/dep-graph-variance-alias.stderr
+++ b/src/test/ui/dep-graph/dep-graph-variance-alias.stderr
@@ -1,5 +1,5 @@
 error: OK
-  --> $DIR/dep-graph-variance-alias.rs:19:1
+  --> $DIR/dep-graph-variance-alias.rs:18:1
    |
 LL | #[rustc_then_this_would_need(variances_of)]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/deprecation/deprecation-lint-2.stderr b/src/test/ui/deprecation/deprecation-lint-2.stderr
index f90ca79860..65152a2f9a 100644
--- a/src/test/ui/deprecation/deprecation-lint-2.stderr
+++ b/src/test/ui/deprecation/deprecation-lint-2.stderr
@@ -4,12 +4,12 @@ error: use of deprecated item 'deprecation_lint::deprecated': text
 LL |     macro_test!();
    |     ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deprecation-lint-2.rs:4:9
    |
 LL | #![deny(deprecated)]
    |         ^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/deprecation/deprecation-lint-3.stderr b/src/test/ui/deprecation/deprecation-lint-3.stderr
index fb90a63b0f..b450f74d7f 100644
--- a/src/test/ui/deprecation/deprecation-lint-3.stderr
+++ b/src/test/ui/deprecation/deprecation-lint-3.stderr
@@ -4,12 +4,12 @@ error: use of deprecated item 'deprecation_lint::deprecated_text': text
 LL |     macro_test_arg_nested!(deprecated_text);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deprecation-lint-3.rs:4:9
    |
 LL | #![deny(deprecated)]
    |         ^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/deprecation/deprecation-lint-nested.stderr b/src/test/ui/deprecation/deprecation-lint-nested.stderr
index 206e12cfb3..b71f90014f 100644
--- a/src/test/ui/deprecation/deprecation-lint-nested.stderr
+++ b/src/test/ui/deprecation/deprecation-lint-nested.stderr
@@ -4,7 +4,7 @@ error: use of deprecated item 'loud::DeprecatedType'
 LL |     struct Foo(DeprecatedType);
    |                ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deprecation-lint-nested.rs:1:9
    |
 LL | #![deny(deprecated)]
diff --git a/src/test/ui/deprecation/deprecation-lint.stderr b/src/test/ui/deprecation/deprecation-lint.stderr
index ffbcb25975..362a901d77 100644
--- a/src/test/ui/deprecation/deprecation-lint.stderr
+++ b/src/test/ui/deprecation/deprecation-lint.stderr
@@ -4,7 +4,7 @@ error: use of deprecated item 'deprecation_lint::deprecated': text
 LL |         deprecated();
    |         ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deprecation-lint.rs:4:9
    |
 LL | #![deny(deprecated)]
diff --git a/src/test/ui/deprecation/rustc_deprecation-in-future.stderr b/src/test/ui/deprecation/rustc_deprecation-in-future.stderr
index 4bbe79b55b..4aff11ad66 100644
--- a/src/test/ui/deprecation/rustc_deprecation-in-future.stderr
+++ b/src/test/ui/deprecation/rustc_deprecation-in-future.stderr
@@ -4,7 +4,7 @@ error: use of item 'S' that will be deprecated in future version 99.99.99: effec
 LL |     let _ = S;
    |             ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/rustc_deprecation-in-future.rs:3:9
    |
 LL | #![deny(deprecated_in_future)]
diff --git a/src/test/ui/deprecation/suggestion.stderr b/src/test/ui/deprecation/suggestion.stderr
index 6aaabfe957..b60d420b54 100644
--- a/src/test/ui/deprecation/suggestion.stderr
+++ b/src/test/ui/deprecation/suggestion.stderr
@@ -4,7 +4,7 @@ error: use of deprecated item 'Foo::deprecated': replaced by `replacement`
 LL |     foo.deprecated();
    |         ^^^^^^^^^^ help: replace the use of the deprecated item: `replacement`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/suggestion.rs:7:9
    |
 LL | #![deny(deprecated)]
diff --git a/src/test/ui/deref-suggestion.stderr b/src/test/ui/deref-suggestion.stderr
index 226f6fb620..89fd7aae3b 100644
--- a/src/test/ui/deref-suggestion.stderr
+++ b/src/test/ui/deref-suggestion.stderr
@@ -42,6 +42,8 @@ LL |     ($x:expr) => { &$x }
 ...
 LL |     foo3(borrow!(0));
    |          ---------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
   --> $DIR/deref-suggestion.rs:36:5
@@ -49,7 +51,7 @@ error[E0308]: mismatched types
 LL |     assert_eq!(3i32, &3i32);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `&i32`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
   --> $DIR/deref-suggestion.rs:39:17
diff --git a/src/test/ui/derives/derive-assoc-type-not-impl.stderr b/src/test/ui/derives/derive-assoc-type-not-impl.stderr
index 2083a1d652..c4c85773fb 100644
--- a/src/test/ui/derives/derive-assoc-type-not-impl.stderr
+++ b/src/test/ui/derives/derive-assoc-type-not-impl.stderr
@@ -2,13 +2,20 @@ error[E0599]: no method named `clone` found for struct `Bar<NotClone>` in the cu
   --> $DIR/derive-assoc-type-not-impl.rs:18:30
    |
 LL | struct Bar<T: Foo> {
-   | ------------------ method `clone` not found for this
+   | ------------------
+   | |
+   | method `clone` not found for this
+   | doesn't satisfy `Bar<NotClone>: std::clone::Clone`
+...
+LL | struct NotClone;
+   | ---------------- doesn't satisfy `NotClone: std::clone::Clone`
 ...
 LL |     Bar::<NotClone> { x: 1 }.clone();
    |                              ^^^^^ method not found in `Bar<NotClone>`
    |
    = note: the method `clone` exists but the following trait bounds were not satisfied:
-           `Bar<NotClone> : std::clone::Clone`
+           `NotClone: std::clone::Clone`
+           which is required by `Bar<NotClone>: std::clone::Clone`
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `clone`, perhaps you need to implement it:
            candidate #1: `std::clone::Clone`
diff --git a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr
index 5ddc5b5708..8ef2d3d302 100644
--- a/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-Clone-enum-struct-variant.stderr
@@ -5,6 +5,7 @@ LL |      x: Error
    |      ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `Error`
    |
    = note: required by `std::clone::Clone::clone`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Clone-enum.stderr b/src/test/ui/derives/derives-span-Clone-enum.stderr
index 80ef9238f4..8c740733e2 100644
--- a/src/test/ui/derives/derives-span-Clone-enum.stderr
+++ b/src/test/ui/derives/derives-span-Clone-enum.stderr
@@ -5,6 +5,7 @@ LL |      Error
    |      ^^^^^ the trait `std::clone::Clone` is not implemented for `Error`
    |
    = note: required by `std::clone::Clone::clone`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Clone-struct.stderr b/src/test/ui/derives/derives-span-Clone-struct.stderr
index 17f3925107..75a59fbf03 100644
--- a/src/test/ui/derives/derives-span-Clone-struct.stderr
+++ b/src/test/ui/derives/derives-span-Clone-struct.stderr
@@ -5,6 +5,7 @@ LL |     x: Error
    |     ^^^^^^^^ the trait `std::clone::Clone` is not implemented for `Error`
    |
    = note: required by `std::clone::Clone::clone`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr b/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr
index e98212f361..1860c5f2ff 100644
--- a/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-Clone-tuple-struct.stderr
@@ -5,6 +5,7 @@ LL |     Error
    |     ^^^^^ the trait `std::clone::Clone` is not implemented for `Error`
    |
    = note: required by `std::clone::Clone::clone`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr
index 233c4c5498..ab3c5ef3c1 100644
--- a/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-Debug-enum-struct-variant.stderr
@@ -8,6 +8,7 @@ LL |      x: Error
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Error`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Debug-enum.stderr b/src/test/ui/derives/derives-span-Debug-enum.stderr
index fbda3980cf..e0a76d5251 100644
--- a/src/test/ui/derives/derives-span-Debug-enum.stderr
+++ b/src/test/ui/derives/derives-span-Debug-enum.stderr
@@ -8,6 +8,7 @@ LL |      Error
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Error`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Debug-struct.stderr b/src/test/ui/derives/derives-span-Debug-struct.stderr
index b56d223b34..2f5cba09e4 100644
--- a/src/test/ui/derives/derives-span-Debug-struct.stderr
+++ b/src/test/ui/derives/derives-span-Debug-struct.stderr
@@ -8,6 +8,7 @@ LL |     x: Error
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Error`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr b/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr
index 76dd6e31e6..58ec131d54 100644
--- a/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-Debug-tuple-struct.stderr
@@ -8,6 +8,7 @@ LL |     Error
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&Error`
    = note: required for the cast to the object type `dyn std::fmt::Debug`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Default-struct.stderr b/src/test/ui/derives/derives-span-Default-struct.stderr
index 784be7fede..b97dda719a 100644
--- a/src/test/ui/derives/derives-span-Default-struct.stderr
+++ b/src/test/ui/derives/derives-span-Default-struct.stderr
@@ -5,6 +5,7 @@ LL |     x: Error
    |     ^^^^^^^^ the trait `std::default::Default` is not implemented for `Error`
    |
    = note: required by `std::default::Default::default`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr b/src/test/ui/derives/derives-span-Default-tuple-struct.stderr
index a93fa058f8..d976891f41 100644
--- a/src/test/ui/derives/derives-span-Default-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-Default-tuple-struct.stderr
@@ -5,6 +5,7 @@ LL |     Error
    |     ^^^^^ the trait `std::default::Default` is not implemented for `Error`
    |
    = note: required by `std::default::Default::default`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr
index bad0ce31f7..f886c29c4d 100644
--- a/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-Eq-enum-struct-variant.stderr
@@ -5,6 +5,7 @@ LL |      x: Error
    |      ^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`
    |
    = note: required by `std::cmp::AssertParamIsEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Eq-enum.stderr b/src/test/ui/derives/derives-span-Eq-enum.stderr
index a7cc19d4c0..0b5470138a 100644
--- a/src/test/ui/derives/derives-span-Eq-enum.stderr
+++ b/src/test/ui/derives/derives-span-Eq-enum.stderr
@@ -5,6 +5,7 @@ LL |      Error
    |      ^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`
    |
    = note: required by `std::cmp::AssertParamIsEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Eq-struct.stderr b/src/test/ui/derives/derives-span-Eq-struct.stderr
index 10631cb12b..76904d6723 100644
--- a/src/test/ui/derives/derives-span-Eq-struct.stderr
+++ b/src/test/ui/derives/derives-span-Eq-struct.stderr
@@ -5,6 +5,7 @@ LL |     x: Error
    |     ^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`
    |
    = note: required by `std::cmp::AssertParamIsEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr b/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr
index 117ed62cf7..ff94b989d2 100644
--- a/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-Eq-tuple-struct.stderr
@@ -5,6 +5,7 @@ LL |     Error
    |     ^^^^^ the trait `std::cmp::Eq` is not implemented for `Error`
    |
    = note: required by `std::cmp::AssertParamIsEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr
index 00b033004e..889c725c84 100644
--- a/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-Hash-enum-struct-variant.stderr
@@ -8,6 +8,8 @@ LL |      x: Error
    |
 LL |     fn hash<H: Hasher>(&self, state: &mut H);
    |             - required by this bound in `std::hash::Hash::hash`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Hash-enum.stderr b/src/test/ui/derives/derives-span-Hash-enum.stderr
index 004cabf207..70b8a85d10 100644
--- a/src/test/ui/derives/derives-span-Hash-enum.stderr
+++ b/src/test/ui/derives/derives-span-Hash-enum.stderr
@@ -8,6 +8,8 @@ LL |      Error
    |
 LL |     fn hash<H: Hasher>(&self, state: &mut H);
    |             - required by this bound in `std::hash::Hash::hash`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Hash-struct.stderr b/src/test/ui/derives/derives-span-Hash-struct.stderr
index 27b8ff3d11..61897392a7 100644
--- a/src/test/ui/derives/derives-span-Hash-struct.stderr
+++ b/src/test/ui/derives/derives-span-Hash-struct.stderr
@@ -8,6 +8,8 @@ LL |     x: Error
    |
 LL |     fn hash<H: Hasher>(&self, state: &mut H);
    |             - required by this bound in `std::hash::Hash::hash`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr
index f1142bc503..fb929ad985 100644
--- a/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-Hash-tuple-struct.stderr
@@ -8,6 +8,8 @@ LL |     Error
    |
 LL |     fn hash<H: Hasher>(&self, state: &mut H);
    |             - required by this bound in `std::hash::Hash::hash`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr
index 1d9d1332b5..7e73392fd5 100644
--- a/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-Ord-enum-struct-variant.stderr
@@ -5,6 +5,7 @@ LL |      x: Error
    |      ^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `Error`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Ord-enum.stderr b/src/test/ui/derives/derives-span-Ord-enum.stderr
index acc8b0c694..68df309e04 100644
--- a/src/test/ui/derives/derives-span-Ord-enum.stderr
+++ b/src/test/ui/derives/derives-span-Ord-enum.stderr
@@ -5,6 +5,7 @@ LL |      Error
    |      ^^^^^ the trait `std::cmp::Ord` is not implemented for `Error`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Ord-struct.stderr b/src/test/ui/derives/derives-span-Ord-struct.stderr
index e4dcf29545..5e1ed33509 100644
--- a/src/test/ui/derives/derives-span-Ord-struct.stderr
+++ b/src/test/ui/derives/derives-span-Ord-struct.stderr
@@ -5,6 +5,7 @@ LL |     x: Error
    |     ^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `Error`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr b/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr
index c21dfc26cb..d9692e5643 100644
--- a/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-Ord-tuple-struct.stderr
@@ -5,6 +5,7 @@ LL |     Error
    |     ^^^^^ the trait `std::cmp::Ord` is not implemented for `Error`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
index eb4b1c84a6..c669636c85 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-PartialEq-enum-struct-variant.stderr
@@ -5,6 +5,7 @@ LL |      x: Error
    |      ^^^^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0369]: binary operation `!=` cannot be applied to type `Error`
   --> $DIR/derives-span-PartialEq-enum-struct-variant.rs:13:6
@@ -13,6 +14,7 @@ LL |      x: Error
    |      ^^^^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialEq-enum.stderr b/src/test/ui/derives/derives-span-PartialEq-enum.stderr
index b63e374d89..ff98edea4d 100644
--- a/src/test/ui/derives/derives-span-PartialEq-enum.stderr
+++ b/src/test/ui/derives/derives-span-PartialEq-enum.stderr
@@ -5,6 +5,7 @@ LL |      Error
    |      ^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0369]: binary operation `!=` cannot be applied to type `Error`
   --> $DIR/derives-span-PartialEq-enum.rs:13:6
@@ -13,6 +14,7 @@ LL |      Error
    |      ^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialEq-struct.stderr b/src/test/ui/derives/derives-span-PartialEq-struct.stderr
index a147f40963..200b8e2d50 100644
--- a/src/test/ui/derives/derives-span-PartialEq-struct.stderr
+++ b/src/test/ui/derives/derives-span-PartialEq-struct.stderr
@@ -5,6 +5,7 @@ LL |     x: Error
    |     ^^^^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0369]: binary operation `!=` cannot be applied to type `Error`
   --> $DIR/derives-span-PartialEq-struct.rs:12:5
@@ -13,6 +14,7 @@ LL |     x: Error
    |     ^^^^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr
index fefbf5f9ec..9e3d1309c2 100644
--- a/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-PartialEq-tuple-struct.stderr
@@ -5,6 +5,7 @@ LL |     Error
    |     ^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0369]: binary operation `!=` cannot be applied to type `Error`
   --> $DIR/derives-span-PartialEq-tuple-struct.rs:12:5
@@ -13,6 +14,7 @@ LL |     Error
    |     ^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `Error`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
index 80b896f4f0..6433d1f5e2 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
+++ b/src/test/ui/derives/derives-span-PartialOrd-enum-struct-variant.stderr
@@ -6,6 +6,7 @@ LL |      x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:13:6
@@ -15,6 +16,7 @@ LL |      x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:13:6
@@ -24,6 +26,7 @@ LL |      x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:13:6
@@ -33,6 +36,7 @@ LL |      x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum-struct-variant.rs:13:6
@@ -42,6 +46,7 @@ LL |      x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr b/src/test/ui/derives/derives-span-PartialOrd-enum.stderr
index f12038fb86..b1be7dd05f 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-enum.stderr
+++ b/src/test/ui/derives/derives-span-PartialOrd-enum.stderr
@@ -6,6 +6,7 @@ LL |      Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum.rs:13:6
@@ -15,6 +16,7 @@ LL |      Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum.rs:13:6
@@ -24,6 +26,7 @@ LL |      Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum.rs:13:6
@@ -33,6 +36,7 @@ LL |      Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-enum.rs:13:6
@@ -42,6 +46,7 @@ LL |      Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr b/src/test/ui/derives/derives-span-PartialOrd-struct.stderr
index dbb014752e..064c91fd7d 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-struct.stderr
+++ b/src/test/ui/derives/derives-span-PartialOrd-struct.stderr
@@ -6,6 +6,7 @@ LL |     x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-struct.rs:12:5
@@ -15,6 +16,7 @@ LL |     x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-struct.rs:12:5
@@ -24,6 +26,7 @@ LL |     x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-struct.rs:12:5
@@ -33,6 +36,7 @@ LL |     x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-struct.rs:12:5
@@ -42,6 +46,7 @@ LL |     x: Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
index f6f1694bbf..5b627022cc 100644
--- a/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
+++ b/src/test/ui/derives/derives-span-PartialOrd-tuple-struct.stderr
@@ -6,6 +6,7 @@ LL |     Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-tuple-struct.rs:12:5
@@ -15,6 +16,7 @@ LL |     Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-tuple-struct.rs:12:5
@@ -24,6 +26,7 @@ LL |     Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-tuple-struct.rs:12:5
@@ -33,6 +36,7 @@ LL |     Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Error` with `Error`
   --> $DIR/derives-span-PartialOrd-tuple-struct.rs:12:5
@@ -42,6 +46,7 @@ LL |     Error
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Error`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/derives/deriving-meta-empty-trait-list.stderr b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr
index b5d3670b5f..1fd7d58c86 100644
--- a/src/test/ui/derives/deriving-meta-empty-trait-list.stderr
+++ b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr
@@ -4,7 +4,7 @@ error: unused attribute
 LL | #[derive()]
    | ^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deriving-meta-empty-trait-list.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr b/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr
index 3b480f00df..d4995c1d50 100644
--- a/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr
+++ b/src/test/ui/derives/deriving-no-inner-impl-error-message.stderr
@@ -5,6 +5,7 @@ LL |     x: NoCloneOrEq
    |     ^^^^^^^^^^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `NoCloneOrEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0369]: binary operation `!=` cannot be applied to type `NoCloneOrEq`
   --> $DIR/deriving-no-inner-impl-error-message.rs:5:5
@@ -13,6 +14,7 @@ LL |     x: NoCloneOrEq
    |     ^^^^^^^^^^^^^^
    |
    = note: an implementation of `std::cmp::PartialEq` might be missing for `NoCloneOrEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `NoCloneOrEq: std::clone::Clone` is not satisfied
   --> $DIR/deriving-no-inner-impl-error-message.rs:10:5
@@ -21,6 +23,7 @@ LL |     x: NoCloneOrEq
    |     ^^^^^^^^^^^^^^ the trait `std::clone::Clone` is not implemented for `NoCloneOrEq`
    |
    = note: required by `std::clone::Clone::clone`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/derives/deriving-with-repr-packed.stderr b/src/test/ui/derives/deriving-with-repr-packed.stderr
index 8093c58a67..d739257c8d 100644
--- a/src/test/ui/derives/deriving-with-repr-packed.stderr
+++ b/src/test/ui/derives/deriving-with-repr-packed.stderr
@@ -4,13 +4,14 @@ error: `#[derive]` can't be used on a `#[repr(packed)]` struct with type or cons
 LL | #[derive(Copy, Clone, PartialEq, Eq)]
    |                ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deriving-with-repr-packed.rs:1:9
    |
 LL | #![deny(safe_packed_borrows)]
    |         ^^^^^^^^^^^^^^^^^^^
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[derive]` can't be used on a `#[repr(packed)]` struct with type or const parameters (error E0133)
   --> $DIR/deriving-with-repr-packed.rs:8:23
@@ -20,6 +21,7 @@ LL | #[derive(Copy, Clone, PartialEq, Eq)]
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[derive]` can't be used on a `#[repr(packed)]` struct that does not derive Copy (error E0133)
   --> $DIR/deriving-with-repr-packed.rs:16:10
@@ -29,6 +31,7 @@ LL | #[derive(PartialEq, Eq)]
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `#[derive]` can't be used on a `#[repr(packed)]` struct that does not derive Copy (error E0133)
   --> $DIR/deriving-with-repr-packed.rs:25:10
@@ -38,6 +41,7 @@ LL | #[derive(PartialEq)]
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #46043 <https://github.com/rust-lang/rust/issues/46043>
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/destructure-trait-ref.stderr b/src/test/ui/destructure-trait-ref.stderr
index f99bf2ffdc..1382cf643a 100644
--- a/src/test/ui/destructure-trait-ref.stderr
+++ b/src/test/ui/destructure-trait-ref.stderr
@@ -20,7 +20,7 @@ error[E0308]: mismatched types
   --> $DIR/destructure-trait-ref.rs:32:10
    |
 LL |     let &&x = &1isize as &dyn T;
-   |          ^^
+   |          ^^   ----------------- this expression has type `&dyn T`
    |          |
    |          expected trait object `dyn T`, found reference
    |          help: you can probably remove the explicit borrow: `x`
@@ -32,7 +32,7 @@ error[E0308]: mismatched types
   --> $DIR/destructure-trait-ref.rs:36:11
    |
 LL |     let &&&x = &(&1isize as &dyn T);
-   |           ^^
+   |           ^^   -------------------- this expression has type `&&dyn T`
    |           |
    |           expected trait object `dyn T`, found reference
    |           help: you can probably remove the explicit borrow: `x`
diff --git a/src/test/ui/destructuring-assignment/note-unsupported.stderr b/src/test/ui/destructuring-assignment/note-unsupported.stderr
index a6805c32a6..d4e25930d2 100644
--- a/src/test/ui/destructuring-assignment/note-unsupported.stderr
+++ b/src/test/ui/destructuring-assignment/note-unsupported.stderr
@@ -16,8 +16,6 @@ LL |     (a, b) += (3, 4);
    |     ------^^^^^^^^^^
    |     |
    |     cannot use `+=` on type `({integer}, {integer})`
-   |
-   = note: an implementation of `std::ops::AddAssign` might be missing for `({integer}, {integer})`
 
 error[E0067]: invalid left-hand side of assignment
   --> $DIR/note-unsupported.rs:7:12
@@ -48,8 +46,6 @@ LL |     [a, b] += [3, 4];
    |     ------^^^^^^^^^^
    |     |
    |     cannot use `+=` on type `[{integer}; 2]`
-   |
-   = note: an implementation of `std::ops::AddAssign` might be missing for `[{integer}; 2]`
 
 error[E0067]: invalid left-hand side of assignment
   --> $DIR/note-unsupported.rs:11:12
diff --git a/src/test/ui/did_you_mean/bad-assoc-expr.stderr b/src/test/ui/did_you_mean/bad-assoc-expr.stderr
index 2024564b91..fe3fb43730 100644
--- a/src/test/ui/did_you_mean/bad-assoc-expr.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-expr.stderr
@@ -54,6 +54,8 @@ LL |     ($ty: ty) => ($ty::clone(&0))
 ...
 LL |     expr!(u8);
    |     ---------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/did_you_mean/bad-assoc-pat.stderr b/src/test/ui/did_you_mean/bad-assoc-pat.stderr
index 3f1946b94f..924a5d7564 100644
--- a/src/test/ui/did_you_mean/bad-assoc-pat.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-pat.stderr
@@ -36,6 +36,8 @@ LL |     ($ty: ty) => ($ty::AssocItem)
 ...
 LL |         pat!(u8) => {}
    |         -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no associated item named `AssocItem` found for slice `[u8]` in the current scope
   --> $DIR/bad-assoc-pat.rs:3:15
@@ -69,6 +71,8 @@ LL |     ($ty: ty) => ($ty::AssocItem)
 ...
 LL |         pat!(u8) => {}
    |         -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no associated item named `AssocItem` found for type `u8` in the current scope
   --> $DIR/bad-assoc-pat.rs:32:16
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.rs b/src/test/ui/did_you_mean/bad-assoc-ty.rs
index f02931eeb6..e66b432ede 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.rs
+++ b/src/test/ui/did_you_mean/bad-assoc-ty.rs
@@ -17,7 +17,6 @@ type D = (u8, u8)::AssocTy;
 type E = _::AssocTy;
 //~^ ERROR missing angle brackets in associated item path
 //~| ERROR the type placeholder `_` is not allowed within types on item signatures
-//~| ERROR the type placeholder `_` is not allowed within types on item signatures
 
 type F = &'static (u8)::AssocTy;
 //~^ ERROR missing angle brackets in associated item path
@@ -46,4 +45,40 @@ type I = ty!()::AssocTy;
 //~^ ERROR missing angle brackets in associated item path
 //~| ERROR ambiguous associated type
 
+trait K<A, B> {}
+fn foo<X: K<_, _>>(x: X) {}
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn bar<F>(_: F) where F: Fn() -> _ {}
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn baz<F: Fn() -> _>(_: F) {}
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+struct L<F>(F) where F: Fn() -> _;
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+struct M<F> where F: Fn() -> _ {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    a: F,
+}
+enum N<F> where F: Fn() -> _ {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    Foo(F),
+}
+
+union O<F> where F: Fn() -> _ {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+//~| ERROR unions with non-`Copy` fields are unstable
+    foo: F,
+}
+
+trait P<F> where F: Fn() -> _ {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
+
+trait Q {
+    fn foo<F>(_: F) where F: Fn() -> _ {}
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
+
 fn main() {}
diff --git a/src/test/ui/did_you_mean/bad-assoc-ty.stderr b/src/test/ui/did_you_mean/bad-assoc-ty.stderr
index 4fdd407bff..875c02bae4 100644
--- a/src/test/ui/did_you_mean/bad-assoc-ty.stderr
+++ b/src/test/ui/did_you_mean/bad-assoc-ty.stderr
@@ -29,31 +29,46 @@ LL | type E = _::AssocTy;
    |          ^^^^^^^^^^ help: try: `<_>::AssocTy`
 
 error: missing angle brackets in associated item path
-  --> $DIR/bad-assoc-ty.rs:22:19
+  --> $DIR/bad-assoc-ty.rs:21:19
    |
 LL | type F = &'static (u8)::AssocTy;
    |                   ^^^^^^^^^^^^^ help: try: `<(u8)>::AssocTy`
 
 error: missing angle brackets in associated item path
-  --> $DIR/bad-assoc-ty.rs:28:10
+  --> $DIR/bad-assoc-ty.rs:27:10
    |
 LL | type G = dyn 'static + (Send)::AssocTy;
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `<dyn 'static + (Send)>::AssocTy`
 
 error: missing angle brackets in associated item path
-  --> $DIR/bad-assoc-ty.rs:45:10
+  --> $DIR/bad-assoc-ty.rs:44:10
    |
 LL | type I = ty!()::AssocTy;
    |          ^^^^^^^^^^^^^^ help: try: `<ty!()>::AssocTy`
 
 error: missing angle brackets in associated item path
-  --> $DIR/bad-assoc-ty.rs:38:19
+  --> $DIR/bad-assoc-ty.rs:37:19
    |
 LL |     ($ty: ty) => ($ty::AssocTy);
    |                   ^^^^^^^^^^^^ help: try: `<$ty>::AssocTy`
 ...
 LL | type J = ty!(u8);
    |          ------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0658]: unions with non-`Copy` fields are unstable
+  --> $DIR/bad-assoc-ty.rs:69:1
+   |
+LL | / union O<F> where F: Fn() -> _ {
+LL | |
+LL | |
+LL | |     foo: F,
+LL | | }
+   | |_^
+   |
+   = note: see issue #55149 <https://github.com/rust-lang/rust/issues/55149> for more information
+   = help: add `#![feature(untagged_unions)]` to the crate attributes to enable
 
 error[E0223]: ambiguous associated type
   --> $DIR/bad-assoc-ty.rs:1:10
@@ -85,46 +100,143 @@ error[E0121]: the type placeholder `_` is not allowed within types on item signa
 LL | type E = _::AssocTy;
    |          ^ not allowed in type signatures
 
-error[E0121]: the type placeholder `_` is not allowed within types on item signatures
-  --> $DIR/bad-assoc-ty.rs:17:10
-   |
-LL | type E = _::AssocTy;
-   |          ^ not allowed in type signatures
-
 error[E0223]: ambiguous associated type
-  --> $DIR/bad-assoc-ty.rs:22:19
+  --> $DIR/bad-assoc-ty.rs:21:19
    |
 LL | type F = &'static (u8)::AssocTy;
    |                   ^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
 
 error[E0223]: ambiguous associated type
-  --> $DIR/bad-assoc-ty.rs:28:10
+  --> $DIR/bad-assoc-ty.rs:27:10
    |
 LL | type G = dyn 'static + (Send)::AssocTy;
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(dyn std::marker::Send + 'static) as Trait>::AssocTy`
 
 error[E0223]: ambiguous associated type
-  --> $DIR/bad-assoc-ty.rs:34:10
+  --> $DIR/bad-assoc-ty.rs:33:10
    |
 LL | type H = Fn(u8) -> (u8)::Output;
    |          ^^^^^^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<(dyn std::ops::Fn(u8) -> u8 + 'static) as Trait>::Output`
 
 error[E0223]: ambiguous associated type
-  --> $DIR/bad-assoc-ty.rs:38:19
+  --> $DIR/bad-assoc-ty.rs:37:19
    |
 LL |     ($ty: ty) => ($ty::AssocTy);
    |                   ^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
 ...
 LL | type J = ty!(u8);
    |          ------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0223]: ambiguous associated type
-  --> $DIR/bad-assoc-ty.rs:45:10
+  --> $DIR/bad-assoc-ty.rs:44:10
    |
 LL | type I = ty!()::AssocTy;
    |          ^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u8 as Trait>::AssocTy`
 
-error: aborting due to 20 previous errors
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:49:13
+   |
+LL | fn foo<X: K<_, _>>(x: X) {}
+   |             ^  ^ not allowed in type signatures
+   |             |
+   |             not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn foo<X, T: K<T, T>>(x: X) {}
+   |         ^^^    ^  ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:52:34
+   |
+LL | fn bar<F>(_: F) where F: Fn() -> _ {}
+   |                                  ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn bar<F, T>(_: F) where F: Fn() -> T {}
+   |         ^^^                         ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:55:19
+   |
+LL | fn baz<F: Fn() -> _>(_: F) {}
+   |                   ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn baz<F, T: Fn() -> T>(_: F) {}
+   |         ^^^          ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:58:33
+   |
+LL | struct L<F>(F) where F: Fn() -> _;
+   |                                 ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | struct L<F, T>(F) where F: Fn() -> T;
+   |           ^^^                      ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:60:30
+   |
+LL | struct M<F> where F: Fn() -> _ {
+   |                              ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | struct M<F, T> where F: Fn() -> T {
+   |           ^^^                   ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:64:28
+   |
+LL | enum N<F> where F: Fn() -> _ {
+   |                            ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | enum N<F, T> where F: Fn() -> T {
+   |         ^^^                   ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:69:29
+   |
+LL | union O<F> where F: Fn() -> _ {
+   |                             ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | union O<F, T> where F: Fn() -> T {
+   |          ^^^                   ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:75:29
+   |
+LL | trait P<F> where F: Fn() -> _ {
+   |                             ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | trait P<F, T> where F: Fn() -> T {
+   |          ^^^                   ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/bad-assoc-ty.rs:80:38
+   |
+LL |     fn foo<F>(_: F) where F: Fn() -> _ {}
+   |                                      ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn foo<F, T>(_: F) where F: Fn() -> T {}
+   |             ^^^                         ^
+
+error: aborting due to 29 previous errors
 
-Some errors have detailed explanations: E0121, E0223.
+Some errors have detailed explanations: E0121, E0223, E0658.
 For more information about an error, try `rustc --explain E0121`.
diff --git a/src/test/ui/did_you_mean/issue-40006.rs b/src/test/ui/did_you_mean/issue-40006.rs
index 60633c6930..74f304d81a 100644
--- a/src/test/ui/did_you_mean/issue-40006.rs
+++ b/src/test/ui/did_you_mean/issue-40006.rs
@@ -1,28 +1,28 @@
-impl dyn A { //~ ERROR missing
+impl dyn A {
     Y
-}
+} //~ ERROR expected one of `!` or `::`, found `}`
 
 struct S;
 
-trait X { //~ ERROR missing
-    X() {}
+trait X {
+    X() {} //~ ERROR expected one of `!` or `::`, found `(`
     fn xxx() { ### }
     L = M;
     Z = { 2 + 3 };
     ::Y ();
 }
 
-trait A { //~ ERROR missing
-    X() {}
+trait A {
+    X() {} //~ ERROR expected one of `!` or `::`, found `(`
 }
 trait B {
     fn xxx() { ### } //~ ERROR expected
 }
-trait C { //~ ERROR missing `fn`, `type`, or `const` for associated-item declaration
-    L = M;
+trait C {
+    L = M; //~ ERROR expected one of `!` or `::`, found `=`
 }
-trait D { //~ ERROR missing `fn`, `type`, or `const` for associated-item declaration
-    Z = { 2 + 3 };
+trait D {
+    Z = { 2 + 3 }; //~ ERROR expected one of `!` or `::`, found `=`
 }
 trait E {
     ::Y (); //~ ERROR expected one of
diff --git a/src/test/ui/did_you_mean/issue-40006.stderr b/src/test/ui/did_you_mean/issue-40006.stderr
index 072e61f6a3..613d7eee59 100644
--- a/src/test/ui/did_you_mean/issue-40006.stderr
+++ b/src/test/ui/did_you_mean/issue-40006.stderr
@@ -1,26 +1,36 @@
-error: missing `fn`, `type`, or `const` for associated-item declaration
-  --> $DIR/issue-40006.rs:1:13
+error: expected one of `!` or `::`, found `}`
+  --> $DIR/issue-40006.rs:3:1
    |
-LL |   impl dyn A {
-   |  _____________^
-LL | |     Y
-   | |____^ missing `fn`, `type`, or `const`
+LL | impl dyn A {
+   |            - while parsing this item list starting here
+LL |     Y
+   |      - expected one of `!` or `::`
+LL | }
+   | ^
+   | |
+   | unexpected token
+   | the item list ends here
 
-error: missing `fn`, `type`, or `const` for associated-item declaration
-  --> $DIR/issue-40006.rs:7:10
+error: expected one of `!` or `::`, found `(`
+  --> $DIR/issue-40006.rs:8:6
    |
-LL |   trait X {
-   |  __________^
-LL | |     X() {}
-   | |____^ missing `fn`, `type`, or `const`
+LL | trait X {
+   |         - while parsing this item list starting here
+LL |     X() {}
+   |      ^ expected one of `!` or `::`
+...
+LL | }
+   | - the item list ends here
 
-error: missing `fn`, `type`, or `const` for associated-item declaration
-  --> $DIR/issue-40006.rs:15:10
+error: expected one of `!` or `::`, found `(`
+  --> $DIR/issue-40006.rs:16:6
    |
-LL |   trait A {
-   |  __________^
-LL | |     X() {}
-   | |____^ missing `fn`, `type`, or `const`
+LL | trait A {
+   |         - while parsing this item list starting here
+LL |     X() {}
+   |      ^ expected one of `!` or `::`
+LL | }
+   | - the item list ends here
 
 error: expected `[`, found `#`
   --> $DIR/issue-40006.rs:19:17
@@ -28,33 +38,51 @@ error: expected `[`, found `#`
 LL |     fn xxx() { ### }
    |                 ^ expected `[`
 
-error: missing `fn`, `type`, or `const` for associated-item declaration
-  --> $DIR/issue-40006.rs:21:10
+error: expected one of `!` or `::`, found `=`
+  --> $DIR/issue-40006.rs:22:7
    |
-LL |   trait C {
-   |  __________^
-LL | |     L = M;
-   | |____^ missing `fn`, `type`, or `const`
+LL | trait C {
+   |         - while parsing this item list starting here
+LL |     L = M;
+   |       ^ expected one of `!` or `::`
+LL | }
+   | - the item list ends here
 
-error: missing `fn`, `type`, or `const` for associated-item declaration
-  --> $DIR/issue-40006.rs:24:10
+error: expected one of `!` or `::`, found `=`
+  --> $DIR/issue-40006.rs:25:7
    |
-LL |   trait D {
-   |  __________^
-LL | |     Z = { 2 + 3 };
-   | |____^ missing `fn`, `type`, or `const`
+LL | trait D {
+   |         - while parsing this item list starting here
+LL |     Z = { 2 + 3 };
+   |       ^ expected one of `!` or `::`
+LL | }
+   | - the item list ends here
 
 error: expected one of `!` or `::`, found `(`
   --> $DIR/issue-40006.rs:28:9
    |
+LL | trait E {
+   |         - while parsing this item list starting here
 LL |     ::Y ();
    |         ^ expected one of `!` or `::`
+LL | }
+   | - the item list ends here
 
-error: missing `fn`, `type`, or `const` for associated-item declaration
+error: missing `fn` for method definition
   --> $DIR/issue-40006.rs:32:8
    |
+LL | impl S {
+   |        - while parsing this item list starting here
 LL |     pub hello_method(&self) {
-   |        ^ missing `fn`, `type`, or `const`
+   |        ^
+...
+LL | }
+   | - the item list ends here
+   |
+help: add `fn` here to parse `hello_method` as a public method
+   |
+LL |     pub fn hello_method(&self) {
+   |         ^^
 
 error[E0599]: no method named `hello_method` found for struct `S` in the current scope
   --> $DIR/issue-40006.rs:38:7
diff --git a/src/test/ui/did_you_mean/recursion_limit.stderr b/src/test/ui/did_you_mean/recursion_limit.stderr
index b05b92bf1e..fc14b7fa5b 100644
--- a/src/test/ui/did_you_mean/recursion_limit.stderr
+++ b/src/test/ui/did_you_mean/recursion_limit.stderr
@@ -7,7 +7,7 @@ LL | fn is_send<T:Send>() { }
 LL |     is_send::<A>();
    |     ^^^^^^^^^^^^
    |
-   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate (`recursion_limit`)
    = note: required because it appears within the type `I`
    = note: required because it appears within the type `H`
    = note: required because it appears within the type `G`
diff --git a/src/test/ui/did_you_mean/recursion_limit_deref.stderr b/src/test/ui/did_you_mean/recursion_limit_deref.stderr
index fdbb5af9b3..e8d11530b0 100644
--- a/src/test/ui/did_you_mean/recursion_limit_deref.stderr
+++ b/src/test/ui/did_you_mean/recursion_limit_deref.stderr
@@ -4,7 +4,7 @@ error[E0055]: reached the recursion limit while auto-dereferencing `I`
 LL |     let x: &Bottom = &t;
    |                      ^^ deref recursion limit reached
    |
-   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate (`recursion_limit_deref`)
 
 error[E0308]: mismatched types
   --> $DIR/recursion_limit_deref.rs:50:22
diff --git a/src/test/ui/did_you_mean/recursion_limit_macro.stderr b/src/test/ui/did_you_mean/recursion_limit_macro.stderr
index 1cc5905160..4935c698f2 100644
--- a/src/test/ui/did_you_mean/recursion_limit_macro.stderr
+++ b/src/test/ui/did_you_mean/recursion_limit_macro.stderr
@@ -7,7 +7,8 @@ LL |     ($t:tt $($tail:tt)*) => { recurse!($($tail)*) };
 LL |     recurse!(0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9);
    |     -------------------------------------------------- in this macro invocation
    |
-   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate (`recursion_limit_macro`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
index 8c6c33b118..333754891c 100644
--- a/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
+++ b/src/test/ui/did_you_mean/trait-object-reference-without-parens-suggestion.stderr
@@ -16,7 +16,7 @@ error[E0038]: the trait `std::marker::Copy` cannot be made into an object
 LL |     let _: &Copy + 'static;
    |            ^^^^^ the trait `std::marker::Copy` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
+   = note: the trait cannot be made into an object because it requires `Self: Sized`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/directory_ownership/macro-expanded-mod.rs b/src/test/ui/directory_ownership/macro-expanded-mod.rs
index 9752a64162..376c1a9cd6 100644
--- a/src/test/ui/directory_ownership/macro-expanded-mod.rs
+++ b/src/test/ui/directory_ownership/macro-expanded-mod.rs
@@ -1,7 +1,7 @@
 // Test that macro-expanded non-inline modules behave correctly
 
 macro_rules! mod_decl {
-    ($i:ident) => { mod $i; }
+    ($i:ident) => { mod $i; } //~ ERROR Cannot declare a non-inline module inside a block
 }
 
 mod macro_expanded_mod_helper {
@@ -10,5 +10,4 @@ mod macro_expanded_mod_helper {
 
 fn main() {
     mod_decl!(foo);
-    //~^ ERROR Cannot declare a non-inline module inside a block
 }
diff --git a/src/test/ui/directory_ownership/macro-expanded-mod.stderr b/src/test/ui/directory_ownership/macro-expanded-mod.stderr
index 620a00f89b..c7780c869d 100644
--- a/src/test/ui/directory_ownership/macro-expanded-mod.stderr
+++ b/src/test/ui/directory_ownership/macro-expanded-mod.stderr
@@ -1,8 +1,13 @@
 error: Cannot declare a non-inline module inside a block unless it has a path attribute
-  --> $DIR/macro-expanded-mod.rs:12:15
+  --> $DIR/macro-expanded-mod.rs:4:25
    |
+LL |     ($i:ident) => { mod $i; }
+   |                         ^^
+...
 LL |     mod_decl!(foo);
-   |               ^^^
+   |     --------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
index 55261a5e6a..2aad57dee7 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
+++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword-2.stderr
@@ -6,6 +6,8 @@ LL |         use a::$crate::b;
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0432]: unresolved import `a::$crate`
   --> $DIR/dollar-crate-is-keyword-2.rs:5:13
@@ -15,6 +17,8 @@ LL |         use a::$crate;
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: `$crate` in paths can only be used in start position
   --> $DIR/dollar-crate-is-keyword-2.rs:7:21
@@ -24,6 +28,8 @@ LL |         type A = a::$crate;
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr
index f5a5f13f91..d424bd2f28 100644
--- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr
+++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr
@@ -6,6 +6,8 @@ LL |             struct $crate {}
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected identifier, found reserved identifier `$crate`
   --> $DIR/dollar-crate-is-keyword.rs:10:23
@@ -15,6 +17,8 @@ LL |         use $crate as $crate;
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `$crate` may not be imported
   --> $DIR/dollar-crate-is-keyword.rs:9:9
@@ -24,6 +28,8 @@ LL |         use $crate;
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `$crate` may not be imported
   --> $DIR/dollar-crate-is-keyword.rs:10:9
@@ -33,6 +39,8 @@ LL |         use $crate as $crate;
 ...
 LL | m!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/drop/dynamic-drop-async.rs b/src/test/ui/drop/dynamic-drop-async.rs
index 30a8960594..88d36ab6aa 100644
--- a/src/test/ui/drop/dynamic-drop-async.rs
+++ b/src/test/ui/drop/dynamic-drop-async.rs
@@ -7,6 +7,8 @@
 // edition:2018
 // ignore-wasm32-bare compiled with panic=abort by default
 
+#![feature(move_ref_pattern)]
+
 #![allow(unused)]
 
 use std::{
@@ -227,6 +229,12 @@ async fn subslice_pattern_reassign(a: Rc<Allocator>) {
     a.alloc().await;
 }
 
+async fn move_ref_pattern(a: Rc<Allocator>) {
+    let mut tup = (a.alloc().await, a.alloc().await, a.alloc().await, a.alloc().await);
+    let (ref _a, ref mut _b, _c, mut _d) = tup;
+    a.alloc().await;
+}
+
 fn run_test<F, G>(cx: &mut Context<'_>, ref f: F)
 where
     F: Fn(Rc<Allocator>) -> G,
@@ -322,4 +330,6 @@ fn main() {
     run_test(context, |a| subslice_pattern_from_end_with_drop(a, false, true));
     run_test(context, |a| subslice_pattern_from_end_with_drop(a, false, false));
     run_test(context, |a| subslice_pattern_reassign(a));
+
+    run_test(context, |a| move_ref_pattern(a));
 }
diff --git a/src/test/ui/drop/dynamic-drop.rs b/src/test/ui/drop/dynamic-drop.rs
index b4406204a5..d31736f142 100644
--- a/src/test/ui/drop/dynamic-drop.rs
+++ b/src/test/ui/drop/dynamic-drop.rs
@@ -2,6 +2,8 @@
 // ignore-wasm32-bare compiled with panic=abort by default
 
 #![feature(generators, generator_trait, untagged_unions)]
+#![feature(move_ref_pattern)]
+#![feature(bindings_after_at)]
 
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
@@ -184,7 +186,7 @@ fn generator(a: &Allocator, run_count: usize) {
          );
     };
     for _ in 0..run_count {
-        Pin::new(&mut gen).resume();
+        Pin::new(&mut gen).resume(());
     }
 }
 
@@ -290,6 +292,49 @@ fn subslice_mixed_min_lengths(a: &Allocator, c: i32) {
     }
 }
 
+fn bindings_after_at_dynamic_init_move(a: &Allocator, c: bool) {
+    let foo = if c { Some(a.alloc()) } else { None };
+    let _x;
+
+    if let bar @ Some(_) = foo {
+        _x = bar;
+    }
+}
+
+fn bindings_after_at_dynamic_init_ref(a: &Allocator, c: bool) {
+    let foo = if c { Some(a.alloc()) } else { None };
+    let _x;
+
+    if let bar @ Some(_baz) = &foo {
+        _x = bar;
+    }
+}
+
+fn bindings_after_at_dynamic_drop_move(a: &Allocator, c: bool) {
+    let foo = if c { Some(a.alloc()) } else { None };
+
+    if let bar @ Some(_) = foo {
+        bar
+    } else {
+        None
+    };
+}
+
+fn bindings_after_at_dynamic_drop_ref(a: &Allocator, c: bool) {
+    let foo = if c { Some(a.alloc()) } else { None };
+
+    if let bar @ Some(_baz) = &foo {
+        bar
+    } else {
+        &None
+    };
+}
+
+fn move_ref_pattern(a: &Allocator) {
+    let mut tup = (a.alloc(), a.alloc(), a.alloc(), a.alloc());
+    let (ref _a, ref mut _b, _c, mut _d) = tup;
+}
+
 fn panic_after_return(a: &Allocator) -> Ptr<'_> {
     // Panic in the drop of `p` or `q` can leak
     let exceptions = vec![8, 9];
@@ -453,6 +498,8 @@ fn main() {
     run_test(|a| subslice_mixed_min_lengths(a, 6));
     run_test(|a| subslice_mixed_min_lengths(a, 7));
 
+    run_test(|a| move_ref_pattern(a));
+
     run_test(|a| {
         panic_after_return(a);
     });
@@ -463,5 +510,14 @@ fn main() {
     run_test(|a| panic_after_init_temp(a));
     run_test(|a| panic_after_init_by_loop(a));
 
+    run_test(|a| bindings_after_at_dynamic_init_move(a, true));
+    run_test(|a| bindings_after_at_dynamic_init_move(a, false));
+    run_test(|a| bindings_after_at_dynamic_init_ref(a, true));
+    run_test(|a| bindings_after_at_dynamic_init_ref(a, false));
+    run_test(|a| bindings_after_at_dynamic_drop_move(a, true));
+    run_test(|a| bindings_after_at_dynamic_drop_move(a, false));
+    run_test(|a| bindings_after_at_dynamic_drop_ref(a, true));
+    run_test(|a| bindings_after_at_dynamic_drop_ref(a, false));
+
     run_test_nopanic(|a| union1(a));
 }
diff --git a/src/test/ui/dst/dst-object-from-unsized-type.stderr b/src/test/ui/dst/dst-object-from-unsized-type.stderr
index 40db575eab..80d188bf2f 100644
--- a/src/test/ui/dst/dst-object-from-unsized-type.stderr
+++ b/src/test/ui/dst/dst-object-from-unsized-type.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
   --> $DIR/dst-object-from-unsized-type.rs:8:23
    |
 LL | fn test1<T: ?Sized + Foo>(t: &T) {
-   |          -- help: consider further restricting this bound: `T: std::marker::Sized +`
+   |          - this type parameter needs to be `std::marker::Sized`
 LL |     let u: &dyn Foo = t;
    |                       ^ doesn't have a size known at compile-time
    |
@@ -14,7 +14,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
   --> $DIR/dst-object-from-unsized-type.rs:13:23
    |
 LL | fn test2<T: ?Sized + Foo>(t: &T) {
-   |          -- help: consider further restricting this bound: `T: std::marker::Sized +`
+   |          - this type parameter needs to be `std::marker::Sized`
 LL |     let v: &dyn Foo = t as &dyn Foo;
    |                       ^ doesn't have a size known at compile-time
    |
diff --git a/src/test/ui/duplicate/dupe-symbols-7.rs b/src/test/ui/duplicate/dupe-symbols-7.rs
index 89a32c6162..633ca4c318 100644
--- a/src/test/ui/duplicate/dupe-symbols-7.rs
+++ b/src/test/ui/duplicate/dupe-symbols-7.rs
@@ -1,7 +1,7 @@
 // build-fail
 
 //
-// error-pattern: entry symbol `main` defined multiple times
+// error-pattern: entry symbol `main` declared multiple times
 
 // FIXME https://github.com/rust-lang/rust/issues/59774
 // normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
diff --git a/src/test/ui/duplicate/dupe-symbols-7.stderr b/src/test/ui/duplicate/dupe-symbols-7.stderr
index 608ae27110..2ea5521e09 100644
--- a/src/test/ui/duplicate/dupe-symbols-7.stderr
+++ b/src/test/ui/duplicate/dupe-symbols-7.stderr
@@ -1,4 +1,4 @@
-error: entry symbol `main` defined multiple times
+error: entry symbol `main` declared multiple times
   --> $DIR/dupe-symbols-7.rs:12:1
    |
 LL | fn main(){}
diff --git a/src/test/ui/duplicate/dupe-symbols-8.rs b/src/test/ui/duplicate/dupe-symbols-8.rs
new file mode 100644
index 0000000000..ce7fa24a9f
--- /dev/null
+++ b/src/test/ui/duplicate/dupe-symbols-8.rs
@@ -0,0 +1,12 @@
+// build-fail
+// error-pattern: entry symbol `main` declared multiple times
+//
+// See #67946.
+
+#![allow(warnings)]
+fn main() {
+    extern "Rust" {
+     fn main();
+    }
+    unsafe { main(); }
+}
diff --git a/src/test/ui/duplicate/dupe-symbols-8.stderr b/src/test/ui/duplicate/dupe-symbols-8.stderr
new file mode 100644
index 0000000000..f001201b8d
--- /dev/null
+++ b/src/test/ui/duplicate/dupe-symbols-8.stderr
@@ -0,0 +1,15 @@
+error: entry symbol `main` declared multiple times
+  --> $DIR/dupe-symbols-8.rs:7:1
+   |
+LL | / fn main() {
+LL | |     extern "Rust" {
+LL | |      fn main();
+LL | |     }
+LL | |     unsafe { main(); }
+LL | | }
+   | |_^
+   |
+   = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/duplicate_entry_error.stderr b/src/test/ui/duplicate_entry_error.stderr
index 46b137b2cf..2d52ea3f6c 100644
--- a/src/test/ui/duplicate_entry_error.stderr
+++ b/src/test/ui/duplicate_entry_error.stderr
@@ -7,7 +7,7 @@ LL | |     loop {}
 LL | | }
    | |_^
    |
-   = note: first defined in crate `std` (which `duplicate_entry_error` depends on)
+   = note: the lang item is first defined in crate `std` (which `duplicate_entry_error` depends on)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr b/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr
index 361727733b..32f06b62bb 100644
--- a/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr
+++ b/src/test/ui/dyn-keyword/dyn-2015-edition-keyword-ident-lint.stderr
@@ -4,7 +4,7 @@ error: `dyn` is a keyword in the 2018 edition
 LL |     pub mod dyn {
    |             ^^^ help: you can use a raw identifier to stay compatible: `r#dyn`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/dyn-2015-edition-keyword-ident-lint.rs:10:9
    |
 LL | #![deny(keyword_idents)]
diff --git a/src/test/ui/editions/edition-extern-crate-allowed.stderr b/src/test/ui/editions/edition-extern-crate-allowed.stderr
index 45b46794be..dd39847d49 100644
--- a/src/test/ui/editions/edition-extern-crate-allowed.stderr
+++ b/src/test/ui/editions/edition-extern-crate-allowed.stderr
@@ -4,7 +4,7 @@ warning: unused extern crate
 LL | extern crate edition_extern_crate_allowed;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-extern-crate-allowed.rs:5:9
    |
 LL | #![warn(rust_2018_idioms)]
diff --git a/src/test/ui/editions/edition-imports-2015.stderr b/src/test/ui/editions/edition-imports-2015.stderr
index 4aba5323cc..ec8b88ecba 100644
--- a/src/test/ui/editions/edition-imports-2015.stderr
+++ b/src/test/ui/editions/edition-imports-2015.stderr
@@ -4,7 +4,7 @@ error: cannot glob-import all possible crates
 LL |     gen_glob!();
    |     ^^^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/editions/edition-imports-2018.stderr b/src/test/ui/editions/edition-imports-2018.stderr
index 6ef49b6256..087d2e3395 100644
--- a/src/test/ui/editions/edition-imports-2018.stderr
+++ b/src/test/ui/editions/edition-imports-2018.stderr
@@ -4,7 +4,7 @@ error: cannot glob-import all possible crates
 LL |     gen_glob!();
    |     ^^^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr b/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr
index e6d0f18a67..56cbd882cc 100644
--- a/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr
+++ b/src/test/ui/editions/edition-imports-virtual-2015-gated.stderr
@@ -4,7 +4,7 @@ error[E0432]: unresolved import `E`
 LL |     gen_gated!();
    |     ^^^^^^^^^^^^^ could not find `E` in `{{root}}`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr b/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr
index 04a70cf983..f44f81fce7 100644
--- a/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr
+++ b/src/test/ui/editions/edition-keywords-2015-2018-expansion.stderr
@@ -4,7 +4,7 @@ error: expected identifier, found keyword `async`
 LL |     produces_async! {}
    |     ^^^^^^^^^^^^^^^^^^ expected identifier, found keyword
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you can escape reserved keywords to use them as identifiers
    |
 LL | () => (pub fn r#async () { })
diff --git a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr b/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr
index fb12051eed..a8fc58fc0c 100644
--- a/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr
+++ b/src/test/ui/editions/edition-keywords-2018-2018-expansion.stderr
@@ -4,7 +4,7 @@ error: expected identifier, found keyword `async`
 LL |     produces_async! {}
    |     ^^^^^^^^^^^^^^^^^^ expected identifier, found keyword
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you can escape reserved keywords to use them as identifiers
    |
 LL | () => (pub fn r#async () { })
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
index 6a8861ba67..1df582ee06 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
+++ b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
@@ -4,7 +4,7 @@ error: type annotations needed
 LL |     let _ = y.is_null();
    |               ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-raw-pointer-method-2015.rs:5:8
    |
 LL | #[deny(warnings)]
diff --git a/src/test/ui/elide-errors-on-mismatched-tuple.stderr b/src/test/ui/elide-errors-on-mismatched-tuple.stderr
index 122c71bebc..e0537ff6fa 100644
--- a/src/test/ui/elide-errors-on-mismatched-tuple.stderr
+++ b/src/test/ui/elide-errors-on-mismatched-tuple.stderr
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
   --> $DIR/elide-errors-on-mismatched-tuple.rs:14:9
    |
 LL |     let (a, b, c) = (A::new(), A::new()); // This tuple is 2 elements, should be three
-   |         ^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
+   |         ^^^^^^^^^   -------------------- this expression has type `(A, A)`
+   |         |
+   |         expected a tuple with 2 elements, found one with 3 elements
    |
    = note: expected tuple `(A, A)`
               found tuple `(_, _, _)`
diff --git a/src/test/ui/empty/empty-never-array.rs b/src/test/ui/empty/empty-never-array.rs
index f0ecea42f3..01b99134a4 100644
--- a/src/test/ui/empty/empty-never-array.rs
+++ b/src/test/ui/empty/empty-never-array.rs
@@ -10,7 +10,6 @@ fn transmute<T, U>(t: T) -> U {
     let Helper::U(u) = Helper::T(t, []);
     //~^ ERROR refutable pattern in local binding: `T(_, _)` not covered
     u
-    //~^ ERROR use of possibly-uninitialized variable: `u`
 }
 
 fn main() {
diff --git a/src/test/ui/empty/empty-never-array.stderr b/src/test/ui/empty/empty-never-array.stderr
index d865b59f0b..a4ffceea4c 100644
--- a/src/test/ui/empty/empty-never-array.stderr
+++ b/src/test/ui/empty/empty-never-array.stderr
@@ -19,13 +19,6 @@ help: you might want to use `if let` to ignore the variant that isn't matched
 LL |     if let Helper::U(u) = Helper::T(t, []) { /* */ }
    |
 
-error[E0381]: use of possibly-uninitialized variable: `u`
-  --> $DIR/empty-never-array.rs:12:5
-   |
-LL |     u
-   |     ^ use of possibly-uninitialized `u`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors have detailed explanations: E0005, E0381.
-For more information about an error, try `rustc --explain E0005`.
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/enable-unstable-lib-feature.stderr b/src/test/ui/enable-unstable-lib-feature.stderr
index d5b8c0efaa..bb4e928ad1 100644
--- a/src/test/ui/enable-unstable-lib-feature.stderr
+++ b/src/test/ui/enable-unstable-lib-feature.stderr
@@ -4,7 +4,7 @@ error: function `BOGUS` should have a snake case name
 LL | pub fn BOGUS() { }
    |        ^^^^^ help: convert the identifier to snake case: `bogus`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/enable-unstable-lib-feature.rs:6:9
    |
 LL | #![deny(non_snake_case)] // To trigger a hard error
diff --git a/src/test/ui/enum-discriminant/feature-gate-arbitrary_enum_discriminant.stderr b/src/test/ui/enum-discriminant/feature-gate-arbitrary_enum_discriminant.stderr
index afd7bda49f..b5f61e6e99 100644
--- a/src/test/ui/enum-discriminant/feature-gate-arbitrary_enum_discriminant.stderr
+++ b/src/test/ui/enum-discriminant/feature-gate-arbitrary_enum_discriminant.stderr
@@ -4,7 +4,7 @@ error[E0658]: discriminants on non-unit variants are experimental
 LL |   Tuple() = 2,
    |             ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/60553
+   = note: see issue #60553 <https://github.com/rust-lang/rust/issues/60553> for more information
    = help: add `#![feature(arbitrary_enum_discriminant)]` to the crate attributes to enable
 
 error[E0658]: discriminants on non-unit variants are experimental
@@ -13,7 +13,7 @@ error[E0658]: discriminants on non-unit variants are experimental
 LL |   Struct{} = 3,
    |              ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/60553
+   = note: see issue #60553 <https://github.com/rust-lang/rust/issues/60553> for more information
    = help: add `#![feature(arbitrary_enum_discriminant)]` to the crate attributes to enable
 
 error[E0658]: custom discriminant values are not allowed in enums with tuple or struct variants
@@ -28,7 +28,7 @@ LL |
 LL |   Struct{} = 3,
    |   ------------ struct variant defined here
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/60553
+   = note: see issue #60553 <https://github.com/rust-lang/rust/issues/60553> for more information
    = help: add `#![feature(arbitrary_enum_discriminant)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/enum/enum-discrim-too-small2.stderr b/src/test/ui/enum/enum-discrim-too-small2.stderr
index f7220044ba..3aa88df29f 100644
--- a/src/test/ui/enum/enum-discrim-too-small2.stderr
+++ b/src/test/ui/enum/enum-discrim-too-small2.stderr
@@ -4,7 +4,7 @@ error: literal out of range for `i8`
 LL |     Ci8 = 223,
    |           ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/enum-discrim-too-small2.rs:1:9
    |
 LL | #![deny(overflowing_literals)]
diff --git a/src/test/ui/enum/enum-size-variance.stderr b/src/test/ui/enum/enum-size-variance.stderr
index 1ebd9b6806..cf8321d5f3 100644
--- a/src/test/ui/enum/enum-size-variance.stderr
+++ b/src/test/ui/enum/enum-size-variance.stderr
@@ -4,7 +4,7 @@ warning: enum variant is more than three times larger (32 bytes) than the next l
 LL |     L(i64, i64, i64, i64),
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/enum-size-variance.rs:3:9
    |
 LL | #![warn(variant_size_differences)]
diff --git a/src/test/ui/error-codes/E0001.stderr b/src/test/ui/error-codes/E0001.stderr
index 9923451518..577c49032d 100644
--- a/src/test/ui/error-codes/E0001.stderr
+++ b/src/test/ui/error-codes/E0001.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         _ => {/* ... */}
    |         ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/E0001.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/error-codes/E0009.rs b/src/test/ui/error-codes/E0009.rs
deleted file mode 100644
index 0610d03cfe..0000000000
--- a/src/test/ui/error-codes/E0009.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    struct X { x: (), }
-    let x = Some((X { x: () }, X { x: () }));
-    match x {
-        Some((y, ref z)) => {},
-        //~^ ERROR E0009
-        None => panic!()
-    }
-}
diff --git a/src/test/ui/error-codes/E0009.stderr b/src/test/ui/error-codes/E0009.stderr
deleted file mode 100644
index 446a436d64..0000000000
--- a/src/test/ui/error-codes/E0009.stderr
+++ /dev/null
@@ -1,11 +0,0 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/E0009.rs:5:15
-   |
-LL |         Some((y, ref z)) => {},
-   |               ^  ----- by-ref pattern here
-   |               |
-   |               by-move pattern here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr
index 9a87195a9d..2e687c18ed 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/src/test/ui/error-codes/E0017.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL | const CR: &'static mut i32 = &mut C;
    |                              ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0019]: static contains unimplemented expression type
@@ -19,7 +19,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                       ^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0596]: cannot borrow immutable static item `X` as mutable
@@ -34,7 +34,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static CONST_REF: &'static mut i32 = &mut C;
    |                                      ^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0658]: references in statics may only refer to immutable values
@@ -43,7 +43,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static STATIC_MUT_REF: &'static mut i32 = unsafe { &mut M };
    |                                                    ^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/error-codes/E0033-teach.stderr b/src/test/ui/error-codes/E0033-teach.stderr
index 80f3d4441b..f323a99045 100644
--- a/src/test/ui/error-codes/E0033-teach.stderr
+++ b/src/test/ui/error-codes/E0033-teach.stderr
@@ -7,11 +7,18 @@ LL |     let trait_obj: &dyn SomeTrait = SomeTrait;
 error[E0038]: the trait `SomeTrait` cannot be made into an object
   --> $DIR/E0033-teach.rs:8:20
    |
+LL | trait SomeTrait {
+   |       --------- this trait cannot be made into an object...
 LL |     fn foo();
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL |     let trait_obj: &dyn SomeTrait = SomeTrait;
    |                    ^^^^^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Sized;
+   |              ^^^^^^^^^^^^^^^^^
 
 error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
   --> $DIR/E0033-teach.rs:12:9
diff --git a/src/test/ui/error-codes/E0033.stderr b/src/test/ui/error-codes/E0033.stderr
index c2843796cc..84481ff16c 100644
--- a/src/test/ui/error-codes/E0033.stderr
+++ b/src/test/ui/error-codes/E0033.stderr
@@ -7,11 +7,18 @@ LL |     let trait_obj: &dyn SomeTrait = SomeTrait;
 error[E0038]: the trait `SomeTrait` cannot be made into an object
   --> $DIR/E0033.rs:6:20
    |
+LL | trait SomeTrait {
+   |       --------- this trait cannot be made into an object...
 LL |     fn foo();
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL |     let trait_obj: &dyn SomeTrait = SomeTrait;
    |                    ^^^^^^^^^^^^^^ the trait `SomeTrait` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Sized;
+   |              ^^^^^^^^^^^^^^^^^
 
 error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
   --> $DIR/E0033.rs:10:9
diff --git a/src/test/ui/error-codes/E0038.stderr b/src/test/ui/error-codes/E0038.stderr
index 5c4d6d53c4..638e924b0e 100644
--- a/src/test/ui/error-codes/E0038.stderr
+++ b/src/test/ui/error-codes/E0038.stderr
@@ -1,11 +1,15 @@
 error[E0038]: the trait `Trait` cannot be made into an object
-  --> $DIR/E0038.rs:5:1
+  --> $DIR/E0038.rs:5:16
    |
+LL | trait Trait {
+   |       ----- this trait cannot be made into an object...
 LL |     fn foo(&self) -> Self;
-   |        --- method `foo` references the `Self` type in its parameters or return type
+   |                      ---- ...because method `foo` references the `Self` type in its return type
 ...
 LL | fn call_foo(x: Box<dyn Trait>) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` cannot be made into an object
+   |                ^^^^^^^^^^^^^^ the trait `Trait` cannot be made into an object
+   |
+   = help: consider moving `foo` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0055.stderr b/src/test/ui/error-codes/E0055.stderr
index d06566ffbe..01411e585a 100644
--- a/src/test/ui/error-codes/E0055.stderr
+++ b/src/test/ui/error-codes/E0055.stderr
@@ -4,7 +4,7 @@ error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
 LL |     ref_foo.foo();
    |             ^^^ deref recursion limit reached
    |
-   = help: consider adding a `#![recursion_limit="10"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="10"]` attribute to your crate (`E0055`)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr
index 6b5890cac3..31579e2828 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/src/test/ui/error-codes/E0057.stderr
@@ -1,14 +1,18 @@
-error[E0057]: this function takes 1 parameter but 0 parameters were supplied
+error[E0057]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/E0057.rs:3:13
    |
 LL |     let a = f();
-   |             ^^^ expected 1 parameter
+   |             ^-- supplied 0 arguments
+   |             |
+   |             expected 1 argument
 
-error[E0057]: this function takes 1 parameter but 2 parameters were supplied
+error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/E0057.rs:5:13
    |
 LL |     let c = f(2, 3);
-   |             ^^^^^^^ expected 1 parameter
+   |             ^ -  - supplied 2 arguments
+   |             |
+   |             expected 1 argument
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/error-codes/E0060.rs b/src/test/ui/error-codes/E0060.rs
index 2bb490fb3e..941eb2a210 100644
--- a/src/test/ui/error-codes/E0060.rs
+++ b/src/test/ui/error-codes/E0060.rs
@@ -5,5 +5,5 @@ extern "C" {
 fn main() {
     unsafe { printf(); }
     //~^ ERROR E0060
-    //~| expected at least 1 parameter
+    //~| expected at least 1 argument
 }
diff --git a/src/test/ui/error-codes/E0060.stderr b/src/test/ui/error-codes/E0060.stderr
index 8a2e7d1a72..a600592c6c 100644
--- a/src/test/ui/error-codes/E0060.stderr
+++ b/src/test/ui/error-codes/E0060.stderr
@@ -1,11 +1,13 @@
-error[E0060]: this function takes at least 1 parameter but 0 parameters were supplied
+error[E0060]: this function takes at least 1 argument but 0 arguments were supplied
   --> $DIR/E0060.rs:6:14
    |
 LL |     fn printf(_: *const u8, ...) -> u32;
    |     ------------------------------------ defined here
 ...
 LL |     unsafe { printf(); }
-   |              ^^^^^^^^ expected at least 1 parameter
+   |              ^^^^^^-- supplied 0 arguments
+   |              |
+   |              expected at least 1 argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0061.rs b/src/test/ui/error-codes/E0061.rs
index e64ea36ac9..c7b5fe4310 100644
--- a/src/test/ui/error-codes/E0061.rs
+++ b/src/test/ui/error-codes/E0061.rs
@@ -5,9 +5,9 @@ fn f2(a: u16) {}
 fn main() {
     f(0);
     //~^ ERROR E0061
-    //~| expected 2 parameters
+    //~| expected 2 arguments
 
     f2();
     //~^ ERROR E0061
-    //~| expected 1 parameter
+    //~| expected 1 argument
 }
diff --git a/src/test/ui/error-codes/E0061.stderr b/src/test/ui/error-codes/E0061.stderr
index 73103241f7..dfefa0df31 100644
--- a/src/test/ui/error-codes/E0061.stderr
+++ b/src/test/ui/error-codes/E0061.stderr
@@ -1,20 +1,24 @@
-error[E0061]: this function takes 2 parameters but 1 parameter was supplied
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
   --> $DIR/E0061.rs:6:5
    |
 LL | fn f(a: u16, b: &str) {}
    | --------------------- defined here
 ...
 LL |     f(0);
-   |     ^^^^ expected 2 parameters
+   |     ^ - supplied 1 argument
+   |     |
+   |     expected 2 arguments
 
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/E0061.rs:10:5
    |
 LL | fn f2(a: u16) {}
    | ------------- defined here
 ...
 LL |     f2();
-   |     ^^^^ expected 1 parameter
+   |     ^^-- supplied 0 arguments
+   |     |
+   |     expected 1 argument
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr
index 526503798b..fad8270fd5 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/src/test/ui/error-codes/E0067.stderr
@@ -5,8 +5,6 @@ LL |     LinkedList::new() += 1;
    |     -----------------^^^^^
    |     |
    |     cannot use `+=` on type `std::collections::LinkedList<_>`
-   |
-   = note: an implementation of `std::ops::AddAssign` might be missing for `std::collections::LinkedList<_>`
 
 error[E0067]: invalid left-hand side of assignment
   --> $DIR/E0067.rs:4:23
diff --git a/src/test/ui/error-codes/E0106.stderr b/src/test/ui/error-codes/E0106.stderr
index e01e0a6f54..a23bcbfd71 100644
--- a/src/test/ui/error-codes/E0106.stderr
+++ b/src/test/ui/error-codes/E0106.stderr
@@ -6,8 +6,8 @@ LL |     x: &bool,
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct Foo<'lifetime> {
-LL |     x: &'lifetime bool,
+LL | struct Foo<'a> {
+LL |     x: &'a bool,
    |
 
 error[E0106]: missing lifetime specifier
@@ -18,9 +18,9 @@ LL |     B(&bool),
    |
 help: consider introducing a named lifetime parameter
    |
-LL | enum Bar<'lifetime> {
+LL | enum Bar<'a> {
 LL |     A(u8),
-LL |     B(&'lifetime bool),
+LL |     B(&'a bool),
    |
 
 error[E0106]: missing lifetime specifier
@@ -31,8 +31,8 @@ LL | type MyStr = &str;
    |
 help: consider introducing a named lifetime parameter
    |
-LL | type MyStr<'lifetime> = &'lifetime str;
-   |           ^^^^^^^^^^^   ^^^^^^^^^^
+LL | type MyStr<'a> = &'a str;
+   |           ^^^^   ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/E0106.rs:17:10
@@ -42,8 +42,8 @@ LL |     baz: Baz,
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct Quux<'lifetime> {
-LL |     baz: Baz<'lifetime>,
+LL | struct Quux<'a> {
+LL |     baz: Baz<'a>,
    |
 
 error[E0106]: missing lifetime specifiers
diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr
index c41a043015..29981991ee 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/src/test/ui/error-codes/E0152.stderr
@@ -4,7 +4,7 @@ error[E0152]: found duplicate lang item `arc`
 LL | struct Foo;
    | ^^^^^^^^^^^
    |
-   = note: first defined in crate `alloc` (which `std` depends on)
+   = note: the lang item is first defined in crate `alloc` (which `std` depends on)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr
index b4128b9560..591ea29ff8 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/src/test/ui/error-codes/E0184.stderr
@@ -3,6 +3,8 @@ error[E0184]: the trait `Copy` may not be implemented for this type; the type ha
    |
 LL | #[derive(Copy)]
    |          ^^^^ Copy not allowed on types with destructors
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr
index bb7b6474d3..51ed9c83bc 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/src/test/ui/error-codes/E0197.stderr
@@ -2,7 +2,9 @@ error[E0197]: inherent impls cannot be unsafe
   --> $DIR/E0197.rs:3:1
    |
 LL | unsafe impl Foo { }
-   | ^^^^^^^^^^^^^^^^^^^
+   | ------^^^^^^^^^^^^^
+   | |
+   | unsafe because of this
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr
index 0d3706336a..90e8b4abd1 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/src/test/ui/error-codes/E0198.stderr
@@ -2,7 +2,9 @@ error[E0198]: negative impls cannot be unsafe
   --> $DIR/E0198.rs:5:1
    |
 LL | unsafe impl !Send for Foo { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ------^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | unsafe because of this
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr
index f607a9fbbf..c551a00096 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/src/test/ui/error-codes/E0275.stderr
@@ -1,13 +1,13 @@
 error[E0275]: overflow evaluating the requirement `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: Foo`
-  --> $DIR/E0275.rs:5:1
+  --> $DIR/E0275.rs:5:33
    |
 LL | trait Foo {}
    | --------- required by `Foo`
 ...
 LL | impl<T> Foo for T where Bar<T>: Foo {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                                 ^^^
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`E0275`)
    = note: required because of the requirements on the impl of `Foo` for `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
    = note: required because of the requirements on the impl of `Foo` for `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
    = note: required because of the requirements on the impl of `Foo` for `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr
index 986307d3f1..52822ebdd9 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/src/test/ui/error-codes/E0388.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL | const CR: &'static mut i32 = &mut C;
    |                              ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0019]: static contains unimplemented expression type
@@ -19,7 +19,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                       ^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0596]: cannot borrow immutable static item `X` as mutable
@@ -34,7 +34,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static CONST_REF: &'static mut i32 = &mut C;
    |                                      ^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/error-codes/E0395.stderr b/src/test/ui/error-codes/E0395.stderr
index a4580f1cb2..20c8622f33 100644
--- a/src/test/ui/error-codes/E0395.stderr
+++ b/src/test/ui/error-codes/E0395.stderr
@@ -4,7 +4,7 @@ error[E0658]: comparing raw pointers inside static
 LL | static BAZ: bool = unsafe { (&FOO as *const i32) == (&BAR as *const i32) };
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53020
+   = note: see issue #53020 <https://github.com/rust-lang/rust/issues/53020> for more information
    = help: add `#![feature(const_compare_raw_pointers)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0396.stderr b/src/test/ui/error-codes/E0396.stderr
index f0aa739a69..7d2544f939 100644
--- a/src/test/ui/error-codes/E0396.stderr
+++ b/src/test/ui/error-codes/E0396.stderr
@@ -4,7 +4,7 @@ error[E0658]: dereferencing raw pointers in constants is unstable
 LL | const VALUE: u8 = unsafe { *REG_ADDR };
    |                            ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51911
+   = note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
    = help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr
index 9c3ca87ed7..d19ebfd15a 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/src/test/ui/error-codes/E0637.stderr
@@ -18,3 +18,4 @@ LL | impl<'a: '_> Bar<'a> {
 
 error: aborting due to 3 previous errors
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr
index 1cb81c8d77..4563b0e219 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/src/test/ui/error-codes/E0658.stderr
@@ -6,7 +6,7 @@ LL | |     Bar(u64),
 LL | | }
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/56071
+   = note: see issue #56071 <https://github.com/rust-lang/rust/issues/56071> for more information
    = help: add `#![feature(repr128)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0665.stderr b/src/test/ui/error-codes/E0665.stderr
index 2c2b498e39..3cb69492eb 100644
--- a/src/test/ui/error-codes/E0665.stderr
+++ b/src/test/ui/error-codes/E0665.stderr
@@ -3,6 +3,8 @@ error[E0665]: `Default` cannot be derived for enums, only structs
    |
 LL | #[derive(Default)]
    |          ^^^^^^^
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0719.stderr b/src/test/ui/error-codes/E0719.stderr
index a046fbfc3d..0e4bbf083b 100644
--- a/src/test/ui/error-codes/E0719.stderr
+++ b/src/test/ui/error-codes/E0719.stderr
@@ -16,3 +16,4 @@ LL | fn test() -> Box<dyn Iterator<Item = (), Item = Unit>> {
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0719`.
diff --git a/src/test/ui/error-festival.stderr b/src/test/ui/error-festival.stderr
index 9b69b37336..fb5290bf64 100644
--- a/src/test/ui/error-festival.stderr
+++ b/src/test/ui/error-festival.stderr
@@ -23,8 +23,6 @@ LL |     x += 2;
    |     -^^^^^
    |     |
    |     cannot use `+=` on type `&str`
-   |
-   = note: an implementation of `std::ops::AddAssign` might be missing for `&str`
 
 error[E0599]: no method named `z` found for reference `&str` in the current scope
   --> $DIR/error-festival.rs:16:7
diff --git a/src/test/ui/exclusive-drop-and-copy.stderr b/src/test/ui/exclusive-drop-and-copy.stderr
index 9983aac4f9..f1e725ec34 100644
--- a/src/test/ui/exclusive-drop-and-copy.stderr
+++ b/src/test/ui/exclusive-drop-and-copy.stderr
@@ -3,12 +3,16 @@ error[E0184]: the trait `Copy` may not be implemented for this type; the type ha
    |
 LL | #[derive(Copy, Clone)]
    |          ^^^^ Copy not allowed on types with destructors
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
   --> $DIR/exclusive-drop-and-copy.rs:10:10
    |
 LL | #[derive(Copy, Clone)]
    |          ^^^^ Copy not allowed on types with destructors
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/explain.stdout b/src/test/ui/explain.stdout
index 9ea56271f5..c50c46ee56 100644
--- a/src/test/ui/explain.stdout
+++ b/src/test/ui/explain.stdout
@@ -46,7 +46,7 @@ This pattern should be rewritten. There are a few possible ways to do this:
 
 - change the original fn declaration to match the expected signature,
   and do the cast in the fn body (the preferred option)
-- cast the fn item fo a fn pointer before calling transmute, as shown here:
+- cast the fn item of a fn pointer before calling transmute, as shown here:
 
     ```
     let f: extern "C" fn(*mut i32) = transmute(foo as extern "C" fn(_));
diff --git a/src/test/ui/explore-issue-38412.stderr b/src/test/ui/explore-issue-38412.stderr
index 547874cefd..4c80989951 100644
--- a/src/test/ui/explore-issue-38412.stderr
+++ b/src/test/ui/explore-issue-38412.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     let Record { a_stable_pub: _, a_unstable_declared_pub: _, a_unstable_undeclared_pub: _, .. } =
    |                                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'unstable_undeclared'
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     r.a_unstable_undeclared_pub;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0616]: field `b_crate` of struct `pub_and_stability::Record` is private
@@ -40,7 +40,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     t.2;
    |     ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0616]: field `3` of struct `pub_and_stability::Tuple` is private
@@ -67,7 +67,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     r.unstable_undeclared_trait_method();
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'unstable_undeclared'
@@ -76,7 +76,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     r.unstable_undeclared();
    |       ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0624]: method `pub_crate` is private
@@ -103,7 +103,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     t.unstable_undeclared_trait_method();
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'unstable_undeclared'
@@ -112,7 +112,7 @@ error[E0658]: use of unstable library feature 'unstable_undeclared'
 LL |     t.unstable_undeclared();
    |       ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38412
+   = note: see issue #38412 <https://github.com/rust-lang/rust/issues/38412> for more information
    = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable
 
 error[E0624]: method `pub_crate` is private
diff --git a/src/test/ui/expr_attr_paren_order.stderr b/src/test/ui/expr_attr_paren_order.stderr
index 57a9350c08..c6b373e3f1 100644
--- a/src/test/ui/expr_attr_paren_order.stderr
+++ b/src/test/ui/expr_attr_paren_order.stderr
@@ -4,7 +4,7 @@ error: variable `X` should have a snake case name
 LL |             let X = 0;
    |                 ^ help: convert the identifier to snake case (notice the capitalization): `x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_attr_paren_order.rs:17:17
    |
 LL |         #![deny(non_snake_case)]
diff --git a/src/test/ui/extern-flag/public-and-private.stderr b/src/test/ui/extern-flag/public-and-private.stderr
index 72f1bb2d26..94c7deaa80 100644
--- a/src/test/ui/extern-flag/public-and-private.stderr
+++ b/src/test/ui/extern-flag/public-and-private.stderr
@@ -4,7 +4,7 @@ error: type `somedep::S` from private dependency 'somedep' in public interface
 LL |     pub field: somedep::S,
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/public-and-private.rs:5:9
    |
 LL | #![deny(exported_private_dependencies)]
diff --git a/src/test/ui/extern/extern-const.stderr b/src/test/ui/extern/extern-const.stderr
index 258202b690..7f67adbdb1 100644
--- a/src/test/ui/extern/extern-const.stderr
+++ b/src/test/ui/extern/extern-const.stderr
@@ -1,8 +1,12 @@
 error: extern items cannot be `const`
-  --> $DIR/extern-const.rs:16:5
+  --> $DIR/extern-const.rs:16:11
    |
 LL |     const rust_dbg_static_mut: libc::c_int;
-   |     ^^^^^ help: try using a static value: `static`
+   |     ------^^^^^^^^^^^^^^^^^^^
+   |     |
+   |     help: try using a static value: `static`
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/extern/extern-ffi-fn-with-body.rs b/src/test/ui/extern/extern-ffi-fn-with-body.rs
index 4cf563514e..ef234e8afd 100644
--- a/src/test/ui/extern/extern-ffi-fn-with-body.rs
+++ b/src/test/ui/extern/extern-ffi-fn-with-body.rs
@@ -1,5 +1,5 @@
 extern "C" {
-    fn foo() -> i32 { //~ ERROR incorrect `fn` inside `extern` block
+    fn foo() -> i32 { //~ ERROR incorrect function inside `extern` block
         return 0;
     }
 }
diff --git a/src/test/ui/extern/extern-ffi-fn-with-body.stderr b/src/test/ui/extern/extern-ffi-fn-with-body.stderr
index 4ac3ce1f93..079c9cecd8 100644
--- a/src/test/ui/extern/extern-ffi-fn-with-body.stderr
+++ b/src/test/ui/extern/extern-ffi-fn-with-body.stderr
@@ -1,17 +1,17 @@
-error: incorrect `fn` inside `extern` block
+error: incorrect function inside `extern` block
   --> $DIR/extern-ffi-fn-with-body.rs:2:8
    |
 LL |   extern "C" {
-   |   ------ `extern` blocks define existing foreign functions and `fn`s inside of them cannot have a body
+   |   ---------- `extern` blocks define existing foreign functions and functions inside of them cannot have a body
 LL |       fn foo() -> i32 {
    |  ________^^^__________-
    | |        |
-   | |        can't have a body
+   | |        cannot have a body
 LL | |         return 0;
 LL | |     }
-   | |_____- this body is invalid here
+   | |_____- help: remove the invalid body: `;`
    |
-   = help: you might have meant to write a function accessible through ffi, which can be done by writing `extern fn` outside of the `extern` block
+   = help: you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block
    = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
 
 error: aborting due to previous error
diff --git a/src/test/ui/extern/extern-types-unsized.stderr b/src/test/ui/extern/extern-types-unsized.stderr
index 0417186eed..0c9165fd95 100644
--- a/src/test/ui/extern/extern-types-unsized.stderr
+++ b/src/test/ui/extern/extern-types-unsized.stderr
@@ -2,7 +2,9 @@ error[E0277]: the size for values of type `A` cannot be known at compilation tim
   --> $DIR/extern-types-unsized.rs:22:20
    |
 LL | fn assert_sized<T>() { }
-   |    ------------ - required by this bound in `assert_sized`
+   |    ------------ -- help: consider relaxing the implicit `Sized` restriction: `: ?Sized`
+   |                 |
+   |                 required by this bound in `assert_sized`
 ...
 LL |     assert_sized::<A>();
    |                    ^ doesn't have a size known at compile-time
diff --git a/src/test/ui/feature-gate-optimize_attribute.stderr b/src/test/ui/feature-gate-optimize_attribute.stderr
index 3e3ad71c34..50ce6427e8 100644
--- a/src/test/ui/feature-gate-optimize_attribute.stderr
+++ b/src/test/ui/feature-gate-optimize_attribute.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[optimize]` attribute is an experimental feature
 LL | #[optimize(size)]
    | ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54882
+   = note: see issue #54882 <https://github.com/rust-lang/rust/issues/54882> for more information
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
 error[E0658]: the `#[optimize]` attribute is an experimental feature
@@ -13,7 +13,7 @@ error[E0658]: the `#[optimize]` attribute is an experimental feature
 LL | #[optimize(speed)]
    | ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54882
+   = note: see issue #54882 <https://github.com/rust-lang/rust/issues/54882> for more information
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
 error[E0658]: the `#[optimize]` attribute is an experimental feature
@@ -22,7 +22,7 @@ error[E0658]: the `#[optimize]` attribute is an experimental feature
 LL | #[optimize(banana)]
    | ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54882
+   = note: see issue #54882 <https://github.com/rust-lang/rust/issues/54882> for more information
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
 error[E0658]: the `#[optimize]` attribute is an experimental feature
@@ -31,7 +31,7 @@ error[E0658]: the `#[optimize]` attribute is an experimental feature
 LL | #[optimize(size)]
    | ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54882
+   = note: see issue #54882 <https://github.com/rust-lang/rust/issues/54882> for more information
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
 error[E0658]: the `#[optimize]` attribute is an experimental feature
@@ -40,7 +40,7 @@ error[E0658]: the `#[optimize]` attribute is an experimental feature
 LL | #![optimize(speed)]
    | ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54882
+   = note: see issue #54882 <https://github.com/rust-lang/rust/issues/54882> for more information
    = help: add `#![feature(optimize_attribute)]` to the crate attributes to enable
 
 error[E0722]: invalid argument
diff --git a/src/test/ui/feature-gate/feature-gate-c_variadic.stderr b/src/test/ui/feature-gate/feature-gate-c_variadic.stderr
index a446b10548..7b3af8d994 100644
--- a/src/test/ui/feature-gate/feature-gate-c_variadic.stderr
+++ b/src/test/ui/feature-gate/feature-gate-c_variadic.stderr
@@ -4,7 +4,7 @@ error[E0658]: C-variadic functions are unstable
 LL | pub unsafe extern "C" fn test(_: i32, ap: ...) { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44930
+   = note: see issue #44930 <https://github.com/rust-lang/rust/issues/44930> for more information
    = help: add `#![feature(c_variadic)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
index cfff4c36a6..d96a48cde9 100644
--- a/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
+++ b/src/test/ui/feature-gate/feature-gate-static-nobundle-2.stderr
@@ -1,6 +1,6 @@
 error[E0658]: kind="static-nobundle" is unstable
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/37403
+   = note: see issue #37403 <https://github.com/rust-lang/rust/issues/37403> for more information
    = help: add `#![feature(static_nobundle)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
index da7d8f9bee..96c87a675a 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
@@ -4,7 +4,7 @@ warning: unknown lint: `x5400`
 LL | #![warn(x5400)]
    |         ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-43106-gating-of-builtin-attrs.rs:36:28
    |
 LL | #![warn(unused_attributes, unknown_lints)]
@@ -250,7 +250,7 @@ warning: unused attribute
 LL |     #[macro_use] fn f() { }
    |     ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-43106-gating-of-builtin-attrs.rs:36:9
    |
 LL | #![warn(unused_attributes, unknown_lints)]
diff --git a/src/test/ui/feature-gate/rustc-private.stderr b/src/test/ui/feature-gate/rustc-private.stderr
index be32071814..1a8536d37d 100644
--- a/src/test/ui/feature-gate/rustc-private.stderr
+++ b/src/test/ui/feature-gate/rustc-private.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL | extern crate libc;
    | ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs b/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs
index c8ad0d13a1..bffe43262e 100644
--- a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs
+++ b/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.rs
@@ -4,10 +4,10 @@
 #![stable(feature = "stable_test_feature", since = "1.0.0")]
 
 #[unstable(feature = "unstable_test_feature", issue = "0")]
-fn unstable_issue_0() {}
+fn unstable_issue_0() {} //~^ ERROR `issue` must be a non-zero numeric string or "none"
 
 #[unstable(feature = "unstable_test_feature", issue = "none")]
 fn unstable_issue_none() {}
 
-#[unstable(feature = "unstable_test_feature", issue = "something")] //~ ERROR incorrect 'issue'
-fn unstable_issue_not_allowed() {}
+#[unstable(feature = "unstable_test_feature", issue = "something")]
+fn unstable_issue_not_allowed() {} //~^ ERROR `issue` must be a non-zero numeric string or "none"
diff --git a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr b/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr
index 10bd6f373d..7bbaf92fc6 100644
--- a/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr
+++ b/src/test/ui/feature-gate/unstable-attribute-allow-issue-0.stderr
@@ -1,8 +1,18 @@
-error[E0545]: incorrect 'issue'
-  --> $DIR/unstable-attribute-allow-issue-0.rs:12:1
+error[E0545]: `issue` must be a non-zero numeric string or "none"
+  --> $DIR/unstable-attribute-allow-issue-0.rs:6:47
+   |
+LL | #[unstable(feature = "unstable_test_feature", issue = "0")]
+   |                                               ^^^^^^^^---
+   |                                                       |
+   |                                                       `issue` must not be "0", use "none" instead
+
+error[E0545]: `issue` must be a non-zero numeric string or "none"
+  --> $DIR/unstable-attribute-allow-issue-0.rs:12:47
    |
 LL | #[unstable(feature = "unstable_test_feature", issue = "something")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                                               ^^^^^^^^-----------
+   |                                                       |
+   |                                                       invalid digit found in string
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr
index d58a2d91b2..493b57f430 100644
--- a/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr
+++ b/src/test/ui/feature-gates/feature-gate-abi-msp430-interrupt.stderr
@@ -4,7 +4,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL | extern "msp430-interrupt" fn foo() {}
    |        ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-abi.stderr b/src/test/ui/feature-gates/feature-gate-abi.stderr
index 6db6cb49ce..50cd8bc68a 100644
--- a/src/test/ui/feature-gates/feature-gate-abi.stderr
+++ b/src/test/ui/feature-gates/feature-gate-abi.stderr
@@ -12,7 +12,7 @@ error[E0658]: platform intrinsics are experimental and possibly buggy
 LL | extern "platform-intrinsic" fn f2() {}
    |        ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -29,7 +29,7 @@ error[E0658]: rust-call ABI is subject to change
 LL | extern "rust-call" fn f4() {}
    |        ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -38,7 +38,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL | extern "msp430-interrupt" fn f5() {}
    |        ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -47,7 +47,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL | extern "ptx-kernel" fn f6() {}
    |        ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -56,7 +56,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL | extern "x86-interrupt" fn f7() {}
    |        ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -73,7 +73,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL | extern "amdgpu-kernel" fn f9() {}
    |        ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -82,7 +82,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL | extern "efiapi" fn f10() {}
    |        ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error[E0658]: intrinsics are subject to change
@@ -99,7 +99,7 @@ error[E0658]: platform intrinsics are experimental and possibly buggy
 LL |     extern "platform-intrinsic" fn m2();
    |            ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -116,7 +116,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn m4();
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -125,7 +125,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL |     extern "msp430-interrupt" fn m5();
    |            ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -134,7 +134,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL |     extern "ptx-kernel" fn m6();
    |            ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -143,7 +143,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL |     extern "x86-interrupt" fn m7();
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -160,7 +160,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL |     extern "amdgpu-kernel" fn m9();
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -169,7 +169,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL |     extern "efiapi" fn m10();
    |            ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -186,7 +186,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn dm4() {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -195,7 +195,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL |     extern "msp430-interrupt" fn dm5() {}
    |            ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -204,7 +204,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL |     extern "ptx-kernel" fn dm6() {}
    |            ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -213,7 +213,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL |     extern "x86-interrupt" fn dm7() {}
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -230,7 +230,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL |     extern "amdgpu-kernel" fn dm9() {}
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -239,7 +239,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL |     extern "efiapi" fn dm10() {}
    |            ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error[E0658]: intrinsics are subject to change
@@ -256,7 +256,7 @@ error[E0658]: platform intrinsics are experimental and possibly buggy
 LL |     extern "platform-intrinsic" fn m2() {}
    |            ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -273,7 +273,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn m4() {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -282,7 +282,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL |     extern "msp430-interrupt" fn m5() {}
    |            ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -291,7 +291,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL |     extern "ptx-kernel" fn m6() {}
    |            ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -300,7 +300,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL |     extern "x86-interrupt" fn m7() {}
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -317,7 +317,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL |     extern "amdgpu-kernel" fn m9() {}
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -326,7 +326,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL |     extern "efiapi" fn m10() {}
    |            ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error[E0658]: intrinsics are subject to change
@@ -343,7 +343,7 @@ error[E0658]: platform intrinsics are experimental and possibly buggy
 LL |     extern "platform-intrinsic" fn im2() {}
    |            ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -360,7 +360,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn im4() {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -369,7 +369,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL |     extern "msp430-interrupt" fn im5() {}
    |            ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -378,7 +378,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL |     extern "ptx-kernel" fn im6() {}
    |            ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -387,7 +387,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL |     extern "x86-interrupt" fn im7() {}
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -404,7 +404,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL |     extern "amdgpu-kernel" fn im9() {}
    |            ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -413,7 +413,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL |     extern "efiapi" fn im10() {}
    |            ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error[E0658]: intrinsics are subject to change
@@ -430,7 +430,7 @@ error[E0658]: platform intrinsics are experimental and possibly buggy
 LL | type A2 = extern "platform-intrinsic" fn();
    |                  ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -447,7 +447,7 @@ error[E0658]: rust-call ABI is subject to change
 LL | type A4 = extern "rust-call" fn();
    |                  ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -456,7 +456,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL | type A5 = extern "msp430-interrupt" fn();
    |                  ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -465,7 +465,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL | type A6 = extern "ptx-kernel" fn ();
    |                  ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -474,7 +474,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL | type A7 = extern "x86-interrupt" fn();
    |                  ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -491,7 +491,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL | type A9 = extern "amdgpu-kernel" fn();
    |                  ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -500,7 +500,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL | type A10 = extern "efiapi" fn();
    |                   ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error[E0658]: intrinsics are subject to change
@@ -517,7 +517,7 @@ error[E0658]: platform intrinsics are experimental and possibly buggy
 LL | extern "platform-intrinsic" {}
    |        ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(platform_intrinsics)]` to the crate attributes to enable
 
 error[E0658]: vectorcall is experimental and subject to change
@@ -534,7 +534,7 @@ error[E0658]: rust-call ABI is subject to change
 LL | extern "rust-call" {}
    |        ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: msp430-interrupt ABI is experimental and subject to change
@@ -543,7 +543,7 @@ error[E0658]: msp430-interrupt ABI is experimental and subject to change
 LL | extern "msp430-interrupt" {}
    |        ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38487
+   = note: see issue #38487 <https://github.com/rust-lang/rust/issues/38487> for more information
    = help: add `#![feature(abi_msp430_interrupt)]` to the crate attributes to enable
 
 error[E0658]: PTX ABIs are experimental and subject to change
@@ -552,7 +552,7 @@ error[E0658]: PTX ABIs are experimental and subject to change
 LL | extern "ptx-kernel" {}
    |        ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/38788
+   = note: see issue #38788 <https://github.com/rust-lang/rust/issues/38788> for more information
    = help: add `#![feature(abi_ptx)]` to the crate attributes to enable
 
 error[E0658]: x86-interrupt ABI is experimental and subject to change
@@ -561,7 +561,7 @@ error[E0658]: x86-interrupt ABI is experimental and subject to change
 LL | extern "x86-interrupt" {}
    |        ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/40180
+   = note: see issue #40180 <https://github.com/rust-lang/rust/issues/40180> for more information
    = help: add `#![feature(abi_x86_interrupt)]` to the crate attributes to enable
 
 error[E0658]: thiscall is experimental and subject to change
@@ -578,7 +578,7 @@ error[E0658]: amdgpu-kernel ABI is experimental and subject to change
 LL | extern "amdgpu-kernel" {}
    |        ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51575
+   = note: see issue #51575 <https://github.com/rust-lang/rust/issues/51575> for more information
    = help: add `#![feature(abi_amdgpu_kernel)]` to the crate attributes to enable
 
 error[E0658]: efiapi ABI is experimental and subject to change
@@ -587,7 +587,7 @@ error[E0658]: efiapi ABI is experimental and subject to change
 LL | extern "efiapi" {}
    |        ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65815
+   = note: see issue #65815 <https://github.com/rust-lang/rust/issues/65815> for more information
    = help: add `#![feature(abi_efiapi)]` to the crate attributes to enable
 
 error: intrinsic must be in `extern "rust-intrinsic" { ... }` block
diff --git a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr
index 79e44bf0d8..03f31e53f4 100644
--- a/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr
+++ b/src/test/ui/feature-gates/feature-gate-alloc-error-handler.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[alloc_error_handler]` attribute is an experimental feature
 LL | #[alloc_error_handler]
    | ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51540
+   = note: see issue #51540 <https://github.com/rust-lang/rust/issues/51540> for more information
    = help: add `#![feature(alloc_error_handler)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr
index 72f5642e72..89c99b89ca 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr
+++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unsafe-nested-macro.stderr
@@ -8,6 +8,7 @@ LL | bar!();
    | ------- in this macro invocation
    |
    = help: add `#![feature(allow_internal_unsafe)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr
index 7100594336..935b95668e 100644
--- a/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr
+++ b/src/test/ui/feature-gates/feature-gate-allow-internal-unstable-nested-macro.stderr
@@ -8,6 +8,7 @@ LL | bar!();
    | ------- in this macro invocation
    |
    = help: add `#![feature(allow_internal_unstable)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/feature-gates/feature-gate-allow_fail.stderr b/src/test/ui/feature-gates/feature-gate-allow_fail.stderr
index 0f60a2de3a..76115fb969 100644
--- a/src/test/ui/feature-gates/feature-gate-allow_fail.stderr
+++ b/src/test/ui/feature-gates/feature-gate-allow_fail.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[allow_fail]` attribute is an experimental feature
 LL | #[allow_fail]
    | ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/46488
+   = note: see issue #46488 <https://github.com/rust-lang/rust/issues/46488> for more information
    = help: add `#![feature(allow_fail)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr
index a70bf1f199..f5d74d7a84 100644
--- a/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr
+++ b/src/test/ui/feature-gates/feature-gate-arbitrary-self-types.stderr
@@ -4,7 +4,7 @@ error[E0658]: `Ptr<Self>` cannot be used as the type of `self` without the `arbi
 LL |     fn foo(self: Ptr<Self>);
    |                  ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
@@ -14,7 +14,7 @@ error[E0658]: `Ptr<Bar>` cannot be used as the type of `self` without the `arbit
 LL |     fn foo(self: Ptr<Self>) {}
    |                  ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
@@ -24,7 +24,7 @@ error[E0658]: `std::boxed::Box<Ptr<Bar>>` cannot be used as the type of `self` w
 LL |     fn bar(self: Box<Ptr<Self>>) {}
    |                  ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
diff --git a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr
index 0f8863b871..a80f9befca 100644
--- a/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr
+++ b/src/test/ui/feature-gates/feature-gate-arbitrary_self_types-raw-pointer.stderr
@@ -4,7 +4,7 @@ error[E0658]: `*const Self` cannot be used as the type of `self` without the `ar
 LL |     fn bar(self: *const Self);
    |                  ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
@@ -14,7 +14,7 @@ error[E0658]: `*const Foo` cannot be used as the type of `self` without the `arb
 LL |     fn foo(self: *const Self) {}
    |                  ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
@@ -24,7 +24,7 @@ error[E0658]: `*const ()` cannot be used as the type of `self` without the `arbi
 LL |     fn bar(self: *const Self) {}
    |                  ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
diff --git a/src/test/ui/feature-gates/feature-gate-asm.stderr b/src/test/ui/feature-gates/feature-gate-asm.stderr
index bfa4c87bed..265d38f83f 100644
--- a/src/test/ui/feature-gates/feature-gate-asm.stderr
+++ b/src/test/ui/feature-gates/feature-gate-asm.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'asm': inline assembly is not stab
 LL |         asm!("");
    |         ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29722
+   = note: see issue #29722 <https://github.com/rust-lang/rust/issues/29722> for more information
    = help: add `#![feature(asm)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-asm2.stderr b/src/test/ui/feature-gates/feature-gate-asm2.stderr
index 7519cad9a9..7ea7bdac44 100644
--- a/src/test/ui/feature-gates/feature-gate-asm2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-asm2.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'asm': inline assembly is not stab
 LL |         println!("{:?}", asm!(""));
    |                          ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29722
+   = note: see issue #29722 <https://github.com/rust-lang/rust/issues/29722> for more information
    = help: add `#![feature(asm)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr
index 6d3f40c807..9edad61532 100644
--- a/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr
+++ b/src/test/ui/feature-gates/feature-gate-assoc-type-defaults.stderr
@@ -4,7 +4,7 @@ error[E0658]: associated type defaults are unstable
 LL |     type Bar = u8;
    |     ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29661
+   = note: see issue #29661 <https://github.com/rust-lang/rust/issues/29661> for more information
    = help: add `#![feature(associated_type_defaults)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-associated_type_bounds.stderr b/src/test/ui/feature-gates/feature-gate-associated_type_bounds.stderr
index 84af2a0163..bfa59d83c8 100644
--- a/src/test/ui/feature-gates/feature-gate-associated_type_bounds.stderr
+++ b/src/test/ui/feature-gates/feature-gate-associated_type_bounds.stderr
@@ -4,7 +4,7 @@ error[E0658]: associated type bounds are unstable
 LL |     type A: Iterator<Item: Copy>;
    |                      ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -13,7 +13,7 @@ error[E0658]: associated type bounds are unstable
 LL |     type B: Iterator<Item: 'static>;
    |                      ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -22,7 +22,7 @@ error[E0658]: associated type bounds are unstable
 LL | struct _St1<T: Tr1<As1: Tr2>> {
    |                    ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -31,7 +31,7 @@ error[E0658]: associated type bounds are unstable
 LL | enum _En1<T: Tr1<As1: Tr2>> {
    |                  ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -40,7 +40,7 @@ error[E0658]: associated type bounds are unstable
 LL | union _Un1<T: Tr1<As1: Tr2>> {
    |                   ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -49,7 +49,7 @@ error[E0658]: associated type bounds are unstable
 LL | type _TaWhere1<T> where T: Iterator<Item: Copy> = T;
    |                                     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -58,7 +58,7 @@ error[E0658]: associated type bounds are unstable
 LL | fn _apit(_: impl Tr1<As1: Copy>) {}
    |                      ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -67,7 +67,7 @@ error[E0658]: associated type bounds are unstable
 LL | fn _apit_dyn(_: &dyn Tr1<As1: Copy>) {}
    |                          ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -76,7 +76,7 @@ error[E0658]: associated type bounds are unstable
 LL | fn _rpit() -> impl Tr1<As1: Copy> { S1 }
    |                        ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -85,7 +85,7 @@ error[E0658]: associated type bounds are unstable
 LL | fn _rpit_dyn() -> Box<dyn Tr1<As1: Copy>> { Box::new(S1) }
    |                               ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -94,7 +94,7 @@ error[E0658]: associated type bounds are unstable
 LL | const _cdef: impl Tr1<As1: Copy> = S1;
    |                       ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -103,7 +103,7 @@ error[E0658]: associated type bounds are unstable
 LL | static _sdef: impl Tr1<As1: Copy> = S1;
    |                        ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0658]: associated type bounds are unstable
@@ -112,7 +112,7 @@ error[E0658]: associated type bounds are unstable
 LL |     let _: impl Tr1<As1: Copy> = S1;
    |                     ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52662
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
    = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
 
 error[E0562]: `impl Trait` not allowed outside of function and inherent method return types
diff --git a/src/test/ui/feature-gates/feature-gate-box-expr.stderr b/src/test/ui/feature-gates/feature-gate-box-expr.stderr
index 1f243b2367..af864b25f1 100644
--- a/src/test/ui/feature-gates/feature-gate-box-expr.stderr
+++ b/src/test/ui/feature-gates/feature-gate-box-expr.stderr
@@ -4,7 +4,7 @@ error[E0658]: box expression syntax is experimental; you can call `Box::new` ins
 LL |     let x = box 'c';
    |             ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49733
+   = note: see issue #49733 <https://github.com/rust-lang/rust/issues/49733> for more information
    = help: add `#![feature(box_syntax)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-box_patterns.stderr b/src/test/ui/feature-gates/feature-gate-box_patterns.stderr
index d2dafe93a8..601ec46a44 100644
--- a/src/test/ui/feature-gates/feature-gate-box_patterns.stderr
+++ b/src/test/ui/feature-gates/feature-gate-box_patterns.stderr
@@ -4,7 +4,7 @@ error[E0658]: box pattern syntax is experimental
 LL |     let box x = Box::new('c');
    |         ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29641
+   = note: see issue #29641 <https://github.com/rust-lang/rust/issues/29641> for more information
    = help: add `#![feature(box_patterns)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-box_syntax.stderr b/src/test/ui/feature-gates/feature-gate-box_syntax.stderr
index 61b0534d2d..dcf8eeed7c 100644
--- a/src/test/ui/feature-gates/feature-gate-box_syntax.stderr
+++ b/src/test/ui/feature-gates/feature-gate-box_syntax.stderr
@@ -4,7 +4,7 @@ error[E0658]: box expression syntax is experimental; you can call `Box::new` ins
 LL |     let x = box 3;
    |             ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49733
+   = note: see issue #49733 <https://github.com/rust-lang/rust/issues/49733> for more information
    = help: add `#![feature(box_syntax)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
index 1765bc7809..6132c53087 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
+++ b/src/test/ui/feature-gates/feature-gate-cfg-target-has-atomic.stderr
@@ -4,7 +4,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "8")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -13,7 +13,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "8")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -22,7 +22,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "16")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -31,7 +31,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "16")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -40,7 +40,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "32")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -49,7 +49,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "32")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -58,7 +58,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "64")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -67,7 +67,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "64")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -76,7 +76,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "128")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -85,7 +85,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "128")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -94,7 +94,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "ptr")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -103,7 +103,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL | #[cfg(target_has_atomic = "ptr")]
    |       ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -112,7 +112,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL |     cfg!(target_has_atomic = "8");
    |          ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -121,7 +121,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL |     cfg!(target_has_atomic = "16");
    |          ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -130,7 +130,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL |     cfg!(target_has_atomic = "32");
    |          ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -139,7 +139,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL |     cfg!(target_has_atomic = "64");
    |          ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -148,7 +148,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL |     cfg!(target_has_atomic = "128");
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
@@ -157,7 +157,7 @@ error[E0658]: `cfg(target_has_atomic)` is experimental and subject to change
 LL |     cfg!(target_has_atomic = "ptr");
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32976
+   = note: see issue #32976 <https://github.com/rust-lang/rust/issues/32976> for more information
    = help: add `#![feature(cfg_target_has_atomic)]` to the crate attributes to enable
 
 error: aborting due to 18 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr
index 5765449310..af59c71414 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr
+++ b/src/test/ui/feature-gates/feature-gate-cfg-target-thread-local.stderr
@@ -4,7 +4,7 @@ error[E0658]: `cfg(target_thread_local)` is experimental and subject to change
 LL |     #[cfg_attr(target_thread_local, thread_local)]
    |                ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29594
+   = note: see issue #29594 <https://github.com/rust-lang/rust/issues/29594> for more information
    = help: add `#![feature(cfg_target_thread_local)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-cfg_sanitize.stderr b/src/test/ui/feature-gates/feature-gate-cfg_sanitize.stderr
index f67a0d83bd..8088585da8 100644
--- a/src/test/ui/feature-gates/feature-gate-cfg_sanitize.stderr
+++ b/src/test/ui/feature-gates/feature-gate-cfg_sanitize.stderr
@@ -4,7 +4,7 @@ error[E0658]: `cfg(sanitize)` is experimental and subject to change
 LL | #[cfg(not(sanitize = "thread"))]
    |           ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/39699
+   = note: see issue #39699 <https://github.com/rust-lang/rust/issues/39699> for more information
    = help: add `#![feature(cfg_sanitize)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents.stderr
index 8639f622cd..0454fd4945 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents.stderr
+++ b/src/test/ui/feature-gates/feature-gate-concat_idents.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` i
 LL |     let a = concat_idents!(X, Y_1);
    |             ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29599
+   = note: see issue #29599 <https://github.com/rust-lang/rust/issues/29599> for more information
    = help: add `#![feature(concat_idents)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` is not stable enough for use and is subject to change
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` i
 LL |     let b = concat_idents!(X, Y_2);
    |             ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29599
+   = note: see issue #29599 <https://github.com/rust-lang/rust/issues/29599> for more information
    = help: add `#![feature(concat_idents)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr
index 14519622c0..32c37806a8 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-concat_idents2.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` i
 LL |     concat_idents!(a, b);
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29599
+   = note: see issue #29599 <https://github.com/rust-lang/rust/issues/29599> for more information
    = help: add `#![feature(concat_idents)]` to the crate attributes to enable
 
 error[E0425]: cannot find value `ab` in this scope
@@ -12,6 +12,8 @@ error[E0425]: cannot find value `ab` in this scope
    |
 LL |     concat_idents!(a, b);
    |     ^^^^^^^^^^^^^^^^^^^^^ not found in this scope
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr b/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr
index afe6acb253..1316107a3d 100644
--- a/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr
+++ b/src/test/ui/feature-gates/feature-gate-concat_idents3.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` i
 LL |     assert_eq!(10, concat_idents!(X, Y_1));
    |                    ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29599
+   = note: see issue #29599 <https://github.com/rust-lang/rust/issues/29599> for more information
    = help: add `#![feature(concat_idents)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` is not stable enough for use and is subject to change
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` i
 LL |     assert_eq!(20, concat_idents!(X, Y_2));
    |                    ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29599
+   = note: see issue #29599 <https://github.com/rust-lang/rust/issues/29599> for more information
    = help: add `#![feature(concat_idents)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-const_fn.rs b/src/test/ui/feature-gates/feature-gate-const_fn.rs
index f46d1dc13d..691c367aeb 100644
--- a/src/test/ui/feature-gates/feature-gate-const_fn.rs
+++ b/src/test/ui/feature-gates/feature-gate-const_fn.rs
@@ -4,13 +4,13 @@ const fn foo() -> usize { 0 } // ok
 
 trait Foo {
     const fn foo() -> u32; //~ ERROR const fn is unstable
-                           //~| ERROR trait fns cannot be declared const
+                           //~| ERROR functions in traits cannot be declared const
     const fn bar() -> u32 { 0 } //~ ERROR const fn is unstable
-                                //~| ERROR trait fns cannot be declared const
+                                //~| ERROR functions in traits cannot be declared const
 }
 
 impl Foo for u32 {
-    const fn foo() -> u32 { 0 } //~ ERROR trait fns cannot be declared const
+    const fn foo() -> u32 { 0 } //~ ERROR functions in traits cannot be declared const
 }
 
 trait Bar {}
diff --git a/src/test/ui/feature-gates/feature-gate-const_fn.stderr b/src/test/ui/feature-gates/feature-gate-const_fn.stderr
index c5c39cc200..843e563013 100644
--- a/src/test/ui/feature-gates/feature-gate-const_fn.stderr
+++ b/src/test/ui/feature-gates/feature-gate-const_fn.stderr
@@ -1,20 +1,20 @@
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/feature-gate-const_fn.rs:6:5
    |
 LL |     const fn foo() -> u32;
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/feature-gate-const_fn.rs:8:5
    |
 LL |     const fn bar() -> u32 { 0 }
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/feature-gate-const_fn.rs:13:5
    |
 LL |     const fn foo() -> u32 { 0 }
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
 error[E0658]: const fn is unstable
   --> $DIR/feature-gate-const_fn.rs:6:5
@@ -22,7 +22,7 @@ error[E0658]: const fn is unstable
 LL |     const fn foo() -> u32;
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0658]: const fn is unstable
@@ -31,7 +31,7 @@ error[E0658]: const fn is unstable
 LL |     const fn bar() -> u32 { 0 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr b/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr
index 935f84b916..dc7ef55e7a 100644
--- a/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr
+++ b/src/test/ui/feature-gates/feature-gate-const_generics-ptr.stderr
@@ -4,7 +4,7 @@ error[E0658]: const generics are unstable
 LL | struct ConstFn<const F: fn()>;
    |                      ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error[E0658]: const generics are unstable
@@ -13,7 +13,7 @@ error[E0658]: const generics are unstable
 LL | struct ConstPtr<const P: *const u32>;
    |                       ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error[E0658]: using function pointers as const generic parameters is unstable
@@ -22,7 +22,7 @@ error[E0658]: using function pointers as const generic parameters is unstable
 LL | struct ConstFn<const F: fn()>;
    |                         ^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53020
+   = note: see issue #53020 <https://github.com/rust-lang/rust/issues/53020> for more information
    = help: add `#![feature(const_compare_raw_pointers)]` to the crate attributes to enable
 
 error[E0658]: using raw pointers as const generic parameters is unstable
@@ -31,7 +31,7 @@ error[E0658]: using raw pointers as const generic parameters is unstable
 LL | struct ConstPtr<const P: *const u32>;
    |                          ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53020
+   = note: see issue #53020 <https://github.com/rust-lang/rust/issues/53020> for more information
    = help: add `#![feature(const_compare_raw_pointers)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-const_generics.stderr b/src/test/ui/feature-gates/feature-gate-const_generics.stderr
index 468e9c31d3..02aa1f5a4d 100644
--- a/src/test/ui/feature-gates/feature-gate-const_generics.stderr
+++ b/src/test/ui/feature-gates/feature-gate-const_generics.stderr
@@ -4,7 +4,7 @@ error[E0658]: const generics are unstable
 LL | fn foo<const X: ()>() {}
    |              ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error[E0658]: const generics are unstable
@@ -13,7 +13,7 @@ error[E0658]: const generics are unstable
 LL | struct Foo<const X: usize>([(); X]);
    |                  ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44580
+   = note: see issue #44580 <https://github.com/rust-lang/rust/issues/44580> for more information
    = help: add `#![feature(const_generics)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-const_in_array_repeat_expressions.stderr b/src/test/ui/feature-gates/feature-gate-const_in_array_repeat_expressions.stderr
index 08d9ada884..632afb24aa 100644
--- a/src/test/ui/feature-gates/feature-gate-const_in_array_repeat_expressions.stderr
+++ b/src/test/ui/feature-gates/feature-gate-const_in_array_repeat_expressions.stderr
@@ -7,7 +7,7 @@ LL |     let arr: [Option<String>; 2] = [None::<String>; 2];
    = help: the following implementations were found:
              <std::option::Option<T> as std::marker::Copy>
    = note: the `Copy` trait is required because the repeated element will be copied
-   = note: this array initializer can be evaluated at compile-time, for more information, see issue https://github.com/rust-lang/rust/issues/49147
+   = note: this array initializer can be evaluated at compile-time, see issue #48147 <https://github.com/rust-lang/rust/issues/49147> for more information
    = help: add `#![feature(const_in_array_repeat_expressions)]` to the crate attributes to enable
 
 error[E0277]: the trait bound `std::option::Option<std::string::String>: std::marker::Copy` is not satisfied
diff --git a/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr
index 1e061eced3..969606375c 100644
--- a/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr
+++ b/src/test/ui/feature-gates/feature-gate-crate_visibility_modifier.stderr
@@ -4,7 +4,7 @@ error[E0658]: `crate` visibility modifier is experimental
 LL | crate struct Bender {
    | ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53120
+   = note: see issue #53120 <https://github.com/rust-lang/rust/issues/53120> for more information
    = help: add `#![feature(crate_visibility_modifier)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr b/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
index 38304e7f3f..b65b009a34 100644
--- a/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
+++ b/src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'custom_test_frameworks': custom t
 LL | #[test_case]
    |   ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/50297
+   = note: see issue #50297 <https://github.com/rust-lang/rust/issues/50297> for more information
    = help: add `#![feature(custom_test_frameworks)]` to the crate attributes to enable
 
 error[E0658]: custom test frameworks are an unstable feature
@@ -13,7 +13,7 @@ error[E0658]: custom test frameworks are an unstable feature
 LL | #![test_runner(main)]
    | ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/50297
+   = note: see issue #50297 <https://github.com/rust-lang/rust/issues/50297> for more information
    = help: add `#![feature(custom_test_frameworks)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-decl_macro.stderr b/src/test/ui/feature-gates/feature-gate-decl_macro.stderr
index 905a1b1531..800caf2523 100644
--- a/src/test/ui/feature-gates/feature-gate-decl_macro.stderr
+++ b/src/test/ui/feature-gates/feature-gate-decl_macro.stderr
@@ -4,7 +4,7 @@ error[E0658]: `macro` is experimental
 LL | macro m() {}
    | ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/39412
+   = note: see issue #39412 <https://github.com/rust-lang/rust/issues/39412> for more information
    = help: add `#![feature(decl_macro)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-doc_alias.stderr b/src/test/ui/feature-gates/feature-gate-doc_alias.stderr
index 540b1f5ccb..f66d1602ba 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_alias.stderr
+++ b/src/test/ui/feature-gates/feature-gate-doc_alias.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[doc(alias)]` is experimental
 LL | #[doc(alias = "foo")]
    | ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/50146
+   = note: see issue #50146 <https://github.com/rust-lang/rust/issues/50146> for more information
    = help: add `#![feature(doc_alias)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr b/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr
index eaa908d003..fe88e08c12 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr
+++ b/src/test/ui/feature-gates/feature-gate-doc_cfg.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[doc(cfg)]` is experimental
 LL | #[doc(cfg(unix))]
    | ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/43781
+   = note: see issue #43781 <https://github.com/rust-lang/rust/issues/43781> for more information
    = help: add `#![feature(doc_cfg)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr b/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr
index 15a41d9ffa..c5dc7d537f 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr
+++ b/src/test/ui/feature-gates/feature-gate-doc_keyword.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[doc(keyword)]` is experimental
 LL | #[doc(keyword = "match")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51315
+   = note: see issue #51315 <https://github.com/rust-lang/rust/issues/51315> for more information
    = help: add `#![feature(doc_keyword)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-doc_masked.stderr b/src/test/ui/feature-gates/feature-gate-doc_masked.stderr
index 0d334fab41..80522b6eee 100644
--- a/src/test/ui/feature-gates/feature-gate-doc_masked.stderr
+++ b/src/test/ui/feature-gates/feature-gate-doc_masked.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[doc(masked)]` is experimental
 LL | #[doc(masked)]
    | ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44027
+   = note: see issue #44027 <https://github.com/rust-lang/rust/issues/44027> for more information
    = help: add `#![feature(doc_masked)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs b/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs
deleted file mode 100644
index 452b45b344..0000000000
--- a/src/test/ui/feature-gates/feature-gate-doc_spotlight.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#[doc(spotlight)] //~ ERROR: `#[doc(spotlight)]` is experimental
-trait SomeTrait {}
-
-fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr b/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr
deleted file mode 100644
index 16532e4433..0000000000
--- a/src/test/ui/feature-gates/feature-gate-doc_spotlight.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: `#[doc(spotlight)]` is experimental
-  --> $DIR/feature-gate-doc_spotlight.rs:1:1
-   |
-LL | #[doc(spotlight)]
-   | ^^^^^^^^^^^^^^^^^
-   |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/45040
-   = help: add `#![feature(doc_spotlight)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr
index ee20408d17..6d7f4844a9 100644
--- a/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr
+++ b/src/test/ui/feature-gates/feature-gate-exclusive-range-pattern.stderr
@@ -4,7 +4,7 @@ error[E0658]: exclusive range pattern syntax is experimental
 LL |         0 .. 3 => {}
    |         ^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/37854
+   = note: see issue #37854 <https://github.com/rust-lang/rust/issues/37854> for more information
    = help: add `#![feature(exclusive_range_pattern)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-extern_types.stderr b/src/test/ui/feature-gates/feature-gate-extern_types.stderr
index f82c64f9ca..923fae400a 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_types.stderr
+++ b/src/test/ui/feature-gates/feature-gate-extern_types.stderr
@@ -4,7 +4,7 @@ error[E0658]: extern types are experimental
 LL |     type T;
    |     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/43467
+   = note: see issue #43467 <https://github.com/rust-lang/rust/issues/43467> for more information
    = help: add `#![feature(extern_types)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-external_doc.stderr b/src/test/ui/feature-gates/feature-gate-external_doc.stderr
index 0534018403..bd2aefe90c 100644
--- a/src/test/ui/feature-gates/feature-gate-external_doc.stderr
+++ b/src/test/ui/feature-gates/feature-gate-external_doc.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[doc(include)]` is experimental
 LL | #[doc(include="asdf.md")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44732
+   = note: see issue #44732 <https://github.com/rust-lang/rust/issues/44732> for more information
    = help: add `#![feature(external_doc)]` to the crate attributes to enable
 
 error[E0658]: `#[doc(include)]` is experimental
@@ -13,7 +13,7 @@ error[E0658]: `#[doc(include)]` is experimental
 LL | #[doc(include="asdf.md")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44732
+   = note: see issue #44732 <https://github.com/rust-lang/rust/issues/44732> for more information
    = help: add `#![feature(external_doc)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-feature-gate.stderr b/src/test/ui/feature-gates/feature-gate-feature-gate.stderr
index d79404263e..ad97741dae 100644
--- a/src/test/ui/feature-gates/feature-gate-feature-gate.stderr
+++ b/src/test/ui/feature-gates/feature-gate-feature-gate.stderr
@@ -4,7 +4,7 @@ error: unstable feature
 LL | #![feature(intrinsics)]
    |            ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/feature-gate-feature-gate.rs:1:11
    |
 LL | #![forbid(unstable_features)]
diff --git a/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr b/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr
index b452db86bb..3585355ab7 100644
--- a/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr
+++ b/src/test/ui/feature-gates/feature-gate-ffi_returns_twice.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[ffi_returns_twice]` attribute is an experimental feature
 LL |     #[ffi_returns_twice]
    |     ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/58314
+   = note: see issue #58314 <https://github.com/rust-lang/rust/issues/58314> for more information
    = help: add `#![feature(ffi_returns_twice)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-fundamental.stderr b/src/test/ui/feature-gates/feature-gate-fundamental.stderr
index 409148484c..1ae8d9128b 100644
--- a/src/test/ui/feature-gates/feature-gate-fundamental.stderr
+++ b/src/test/ui/feature-gates/feature-gate-fundamental.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[fundamental]` attribute is an experimental feature
 LL | #[fundamental]
    | ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29635
+   = note: see issue #29635 <https://github.com/rust-lang/rust/issues/29635> for more information
    = help: add `#![feature(fundamental)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-generators.stderr b/src/test/ui/feature-gates/feature-gate-generators.stderr
index 4adc21efc6..dfea178a63 100644
--- a/src/test/ui/feature-gates/feature-gate-generators.stderr
+++ b/src/test/ui/feature-gates/feature-gate-generators.stderr
@@ -4,7 +4,7 @@ error[E0658]: yield syntax is experimental
 LL |     yield true;
    |     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/43122
+   = note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
    = help: add `#![feature(generators)]` to the crate attributes to enable
 
 error[E0658]: yield syntax is experimental
@@ -13,7 +13,7 @@ error[E0658]: yield syntax is experimental
 LL |     yield;
    |     ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/43122
+   = note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
    = help: add `#![feature(generators)]` to the crate attributes to enable
 
 error[E0658]: yield syntax is experimental
@@ -22,7 +22,7 @@ error[E0658]: yield syntax is experimental
 LL |     yield 0;
    |     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/43122
+   = note: see issue #43122 <https://github.com/rust-lang/rust/issues/43122> for more information
    = help: add `#![feature(generators)]` to the crate attributes to enable
 
 error[E0627]: yield expression outside of generator literal
diff --git a/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr b/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr
index ab17c9a28a..a0e06cb2b6 100644
--- a/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr
+++ b/src/test/ui/feature-gates/feature-gate-generic_associated_types.stderr
@@ -4,7 +4,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Pointer<T>: Deref<Target = T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: generic associated types are unstable
@@ -13,7 +13,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Pointer2<T>: Deref<Target = T> where T: Clone, U: Clone;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: where clauses on associated types are unstable
@@ -22,7 +22,7 @@ error[E0658]: where clauses on associated types are unstable
 LL |     type Pointer2<T>: Deref<Target = T> where T: Clone, U: Clone;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: generic associated types are unstable
@@ -31,7 +31,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Pointer<Usize> = Box<Usize>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: generic associated types are unstable
@@ -40,7 +40,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Pointer2<U32> = Box<U32>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: where clauses on associated types are unstable
@@ -49,7 +49,7 @@ error[E0658]: where clauses on associated types are unstable
 LL |     type Assoc where Self: Sized;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: where clauses on associated types are unstable
@@ -58,7 +58,7 @@ error[E0658]: where clauses on associated types are unstable
 LL |     type Assoc where Self: Sized = Foo;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error: type-generic associated types are not yet implemented
@@ -67,7 +67,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Pointer<T>: Deref<Target = T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/feature-gate-generic_associated_types.rs:7:5
@@ -75,7 +75,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Pointer2<T>: Deref<Target = T> where T: Clone, U: Clone;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/feature-gates/feature-gate-global_asm.stderr b/src/test/ui/feature-gates/feature-gate-global_asm.stderr
index 733b8d08f7..e07fbf00d5 100644
--- a/src/test/ui/feature-gates/feature-gate-global_asm.stderr
+++ b/src/test/ui/feature-gates/feature-gate-global_asm.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'global_asm': `global_asm!` is not
 LL | global_asm!("");
    | ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/35119
+   = note: see issue #35119 <https://github.com/rust-lang/rust/issues/35119> for more information
    = help: add `#![feature(global_asm)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr
index 689a375734..fbc4e8abc4 100644
--- a/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr
+++ b/src/test/ui/feature-gates/feature-gate-infer_static_outlives_requirements.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `U` may not live long enough
   --> $DIR/feature-gate-infer_static_outlives_requirements.rs:5:5
    |
 LL | struct Foo<U> {
-   |            - help: consider adding an explicit lifetime bound `U: 'static`...
+   |            - help: consider adding an explicit lifetime bound...: `U: 'static`
 LL |     bar: Bar<U>
    |     ^^^^^^^^^^^
    |
diff --git a/src/test/ui/feature-gates/feature-gate-is_sorted.stderr b/src/test/ui/feature-gates/feature-gate-is_sorted.stderr
index 11b2b3e740..ccac827076 100644
--- a/src/test/ui/feature-gates/feature-gate-is_sorted.stderr
+++ b/src/test/ui/feature-gates/feature-gate-is_sorted.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'is_sorted': new API
 LL |     assert!([1, 2, 2, 9].iter().is_sorted());
    |                                 ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53485
+   = note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
    = help: add `#![feature(is_sorted)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'is_sorted': new API
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'is_sorted': new API
 LL |     assert!(![-2i32, -1, 0, 3].iter().is_sorted_by_key(|n| n.abs()));
    |                                       ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53485
+   = note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
    = help: add `#![feature(is_sorted)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'is_sorted': new API
@@ -22,7 +22,7 @@ error[E0658]: use of unstable library feature 'is_sorted': new API
 LL |     assert!([1, 2, 2, 9].is_sorted());
    |                          ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53485
+   = note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
    = help: add `#![feature(is_sorted)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'is_sorted': new API
@@ -31,7 +31,7 @@ error[E0658]: use of unstable library feature 'is_sorted': new API
 LL |     assert!(![-2i32, -1, 0, 3].is_sorted_by_key(|n| n.abs()));
    |                                ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53485
+   = note: see issue #53485 <https://github.com/rust-lang/rust/issues/53485> for more information
    = help: add `#![feature(is_sorted)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-label_break_value.stderr b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr
index a417e0eec2..4b43fdc593 100644
--- a/src/test/ui/feature-gates/feature-gate-label_break_value.stderr
+++ b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr
@@ -4,7 +4,7 @@ error[E0658]: labels on blocks are unstable
 LL |     'a: {
    |     ^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/48594
+   = note: see issue #48594 <https://github.com/rust-lang/rust/issues/48594> for more information
    = help: add `#![feature(label_break_value)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-link_args.stderr b/src/test/ui/feature-gates/feature-gate-link_args.stderr
index bd690b3f89..c75f762b90 100644
--- a/src/test/ui/feature-gates/feature-gate-link_args.stderr
+++ b/src/test/ui/feature-gates/feature-gate-link_args.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `link_args` attribute is experimental and not portable across
 LL | #[link_args = "-l expected_use_case"]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29596
+   = note: see issue #29596 <https://github.com/rust-lang/rust/issues/29596> for more information
    = help: add `#![feature(link_args)]` to the crate attributes to enable
 
 error[E0658]: the `link_args` attribute is experimental and not portable across platforms, it is recommended to use `#[link(name = "foo")] instead
@@ -13,7 +13,7 @@ error[E0658]: the `link_args` attribute is experimental and not portable across
 LL | #[link_args = "-l unexected_use_on_non_extern_item"]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29596
+   = note: see issue #29596 <https://github.com/rust-lang/rust/issues/29596> for more information
    = help: add `#![feature(link_args)]` to the crate attributes to enable
 
 error[E0658]: the `link_args` attribute is experimental and not portable across platforms, it is recommended to use `#[link(name = "foo")] instead
@@ -22,7 +22,7 @@ error[E0658]: the `link_args` attribute is experimental and not portable across
 LL | #![link_args = "-l unexpected_use_as_inner_attr_on_mod"]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29596
+   = note: see issue #29596 <https://github.com/rust-lang/rust/issues/29596> for more information
    = help: add `#![feature(link_args)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
index f6c5061546..10b151ffa7 100644
--- a/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
+++ b/src/test/ui/feature-gates/feature-gate-link_cfg.stderr
@@ -4,7 +4,7 @@ error[E0658]: is unstable
 LL | #[link(name = "foo", cfg(foo))]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/37406
+   = note: see issue #37406 <https://github.com/rust-lang/rust/issues/37406> for more information
    = help: add `#![feature(link_cfg)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr
index 6c8e76d269..6bce5b823f 100644
--- a/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr
+++ b/src/test/ui/feature-gates/feature-gate-link_llvm_intrinsics.stderr
@@ -4,7 +4,7 @@ error[E0658]: linking to LLVM intrinsics is experimental
 LL |     fn sqrt(x: f32) -> f32;
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29602
+   = note: see issue #29602 <https://github.com/rust-lang/rust/issues/29602> for more information
    = help: add `#![feature(link_llvm_intrinsics)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-linkage.stderr b/src/test/ui/feature-gates/feature-gate-linkage.stderr
index d3f2aa6ba8..3e5b79bfd4 100644
--- a/src/test/ui/feature-gates/feature-gate-linkage.stderr
+++ b/src/test/ui/feature-gates/feature-gate-linkage.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `linkage` attribute is experimental and not portable across pl
 LL |     #[linkage = "extern_weak"] static foo: isize;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29603
+   = note: see issue #29603 <https://github.com/rust-lang/rust/issues/29603> for more information
    = help: add `#![feature(linkage)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-lint-reasons.stderr b/src/test/ui/feature-gates/feature-gate-lint-reasons.stderr
index 08ba9d0d3a..a7d5ea6b93 100644
--- a/src/test/ui/feature-gates/feature-gate-lint-reasons.stderr
+++ b/src/test/ui/feature-gates/feature-gate-lint-reasons.stderr
@@ -4,7 +4,7 @@ error[E0658]: lint reasons are experimental
 LL | #![warn(nonstandard_style, reason = "the standard should be respected")]
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54503
+   = note: see issue #54503 <https://github.com/rust-lang/rust/issues/54503> for more information
    = help: add `#![feature(lint_reasons)]` to the crate attributes to enable
 
 error[E0658]: lint reasons are experimental
@@ -13,7 +13,7 @@ error[E0658]: lint reasons are experimental
 LL | #![warn(nonstandard_style, reason = "the standard should be respected")]
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54503
+   = note: see issue #54503 <https://github.com/rust-lang/rust/issues/54503> for more information
    = help: add `#![feature(lint_reasons)]` to the crate attributes to enable
 
 error[E0658]: lint reasons are experimental
@@ -22,7 +22,7 @@ error[E0658]: lint reasons are experimental
 LL | #![warn(nonstandard_style, reason = "the standard should be respected")]
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54503
+   = note: see issue #54503 <https://github.com/rust-lang/rust/issues/54503> for more information
    = help: add `#![feature(lint_reasons)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax.stderr b/src/test/ui/feature-gates/feature-gate-log_syntax.stderr
index fa57c20ecd..fdc1c85534 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax.stderr
+++ b/src/test/ui/feature-gates/feature-gate-log_syntax.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'log_syntax': `log_syntax!` is not
 LL |     log_syntax!()
    |     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(log_syntax)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr b/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr
index 81daee0b49..6deb4a46cd 100644
--- a/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr
+++ b/src/test/ui/feature-gates/feature-gate-log_syntax2.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'log_syntax': `log_syntax!` is not
 LL |     println!("{:?}", log_syntax!());
    |                      ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(log_syntax)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-main.stderr b/src/test/ui/feature-gates/feature-gate-main.stderr
index 513758e030..f0ef3b38c6 100644
--- a/src/test/ui/feature-gates/feature-gate-main.stderr
+++ b/src/test/ui/feature-gates/feature-gate-main.stderr
@@ -4,7 +4,7 @@ error[E0658]: declaration of a non-standard `#[main]` function may change over t
 LL | fn foo() {}
    | ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29634
+   = note: see issue #29634 <https://github.com/rust-lang/rust/issues/29634> for more information
    = help: add `#![feature(main)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr b/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr
index 304c081c5a..e3c3756fd2 100644
--- a/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr
+++ b/src/test/ui/feature-gates/feature-gate-marker_trait_attr.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[marker]` attribute is an experimental feature
 LL | #[marker] trait ExplicitMarker {}
    | ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29864
+   = note: see issue #29864 <https://github.com/rust-lang/rust/issues/29864> for more information
    = help: add `#![feature(marker_trait_attr)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr
index b344d73757..d47a76a50e 100644
--- a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr
+++ b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr
@@ -4,7 +4,7 @@ error[E0658]: `may_dangle` has unstable semantics and may be removed in the futu
 LL | unsafe impl<#[may_dangle] A> Drop for Pt<A> {
    |             ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/34761
+   = note: see issue #34761 <https://github.com/rust-lang/rust/issues/34761> for more information
    = help: add `#![feature(dropck_eyepatch)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-member-constraints.rs b/src/test/ui/feature-gates/feature-gate-member-constraints.rs
index 293a93352e..f6a92b0d0b 100644
--- a/src/test/ui/feature-gates/feature-gate-member-constraints.rs
+++ b/src/test/ui/feature-gates/feature-gate-member-constraints.rs
@@ -1,9 +1,10 @@
-trait Trait<'a, 'b> { }
+trait Trait<'a, 'b> {}
 impl<T> Trait<'_, '_> for T {}
 
 fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Trait<'a, 'b> {
     //~^ ERROR ambiguous lifetime bound
+    //~| ERROR ambiguous lifetime bound
     (x, y)
 }
 
-fn main() { }
+fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-member-constraints.stderr b/src/test/ui/feature-gates/feature-gate-member-constraints.stderr
index 3745d5e1c5..c2ec7ae16a 100644
--- a/src/test/ui/feature-gates/feature-gate-member-constraints.stderr
+++ b/src/test/ui/feature-gates/feature-gate-member-constraints.stderr
@@ -6,5 +6,13 @@ LL | fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Trait<'a, 'b> {
    |
    = help: add #![feature(member_constraints)] to the crate attributes to enable
 
-error: aborting due to previous error
+error: ambiguous lifetime bound in `impl Trait`
+  --> $DIR/feature-gate-member-constraints.rs:4:43
+   |
+LL | fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Trait<'a, 'b> {
+   |                                           ^^^^^^^^^^^^^^^^^^ the elided lifetimes here do not outlive one another
+   |
+   = help: add #![feature(member_constraints)] to the crate attributes to enable
+
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/feature-gates/feature-gate-min_const_fn.rs b/src/test/ui/feature-gates/feature-gate-min_const_fn.rs
index 669631df2a..5a01e053ed 100644
--- a/src/test/ui/feature-gates/feature-gate-min_const_fn.rs
+++ b/src/test/ui/feature-gates/feature-gate-min_const_fn.rs
@@ -4,13 +4,13 @@ const fn foo() -> usize { 0 } // stabilized
 
 trait Foo {
     const fn foo() -> u32; //~ ERROR const fn is unstable
-                           //~| ERROR trait fns cannot be declared const
+                           //~| ERROR functions in traits cannot be declared const
     const fn bar() -> u32 { 0 } //~ ERROR const fn is unstable
-                                //~| ERROR trait fns cannot be declared const
+                                //~| ERROR functions in traits cannot be declared const
 }
 
 impl Foo for u32 {
-    const fn foo() -> u32 { 0 } //~ ERROR trait fns cannot be declared const
+    const fn foo() -> u32 { 0 } //~ ERROR functions in traits cannot be declared const
 }
 
 trait Bar {}
diff --git a/src/test/ui/feature-gates/feature-gate-min_const_fn.stderr b/src/test/ui/feature-gates/feature-gate-min_const_fn.stderr
index 98c9e2b0c9..56a882e30f 100644
--- a/src/test/ui/feature-gates/feature-gate-min_const_fn.stderr
+++ b/src/test/ui/feature-gates/feature-gate-min_const_fn.stderr
@@ -1,20 +1,20 @@
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/feature-gate-min_const_fn.rs:6:5
    |
 LL |     const fn foo() -> u32;
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/feature-gate-min_const_fn.rs:8:5
    |
 LL |     const fn bar() -> u32 { 0 }
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/feature-gate-min_const_fn.rs:13:5
    |
 LL |     const fn foo() -> u32 { 0 }
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
 error[E0658]: const fn is unstable
   --> $DIR/feature-gate-min_const_fn.rs:6:5
@@ -22,7 +22,7 @@ error[E0658]: const fn is unstable
 LL |     const fn foo() -> u32;
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0658]: const fn is unstable
@@ -31,7 +31,7 @@ error[E0658]: const fn is unstable
 LL |     const fn bar() -> u32 { 0 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-naked_functions.stderr b/src/test/ui/feature-gates/feature-gate-naked_functions.stderr
index d4041f4ecd..e24dde5429 100644
--- a/src/test/ui/feature-gates/feature-gate-naked_functions.stderr
+++ b/src/test/ui/feature-gates/feature-gate-naked_functions.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[naked]` attribute is an experimental feature
 LL | #[naked]
    | ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32408
+   = note: see issue #32408 <https://github.com/rust-lang/rust/issues/32408> for more information
    = help: add `#![feature(naked_functions)]` to the crate attributes to enable
 
 error[E0658]: the `#[naked]` attribute is an experimental feature
@@ -13,7 +13,7 @@ error[E0658]: the `#[naked]` attribute is an experimental feature
 LL | #[naked]
    | ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32408
+   = note: see issue #32408 <https://github.com/rust-lang/rust/issues/32408> for more information
    = help: add `#![feature(naked_functions)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-never_type.stderr b/src/test/ui/feature-gates/feature-gate-never_type.stderr
index 216615731e..0a59cae9c8 100644
--- a/src/test/ui/feature-gates/feature-gate-never_type.stderr
+++ b/src/test/ui/feature-gates/feature-gate-never_type.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `!` type is experimental
 LL | type Ma = (u32, !, i32);
    |                 ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/35121
+   = note: see issue #35121 <https://github.com/rust-lang/rust/issues/35121> for more information
    = help: add `#![feature(never_type)]` to the crate attributes to enable
 
 error[E0658]: the `!` type is experimental
@@ -13,7 +13,7 @@ error[E0658]: the `!` type is experimental
 LL | type Meeshka = Vec<!>;
    |                    ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/35121
+   = note: see issue #35121 <https://github.com/rust-lang/rust/issues/35121> for more information
    = help: add `#![feature(never_type)]` to the crate attributes to enable
 
 error[E0658]: the `!` type is experimental
@@ -22,7 +22,7 @@ error[E0658]: the `!` type is experimental
 LL | type Mow = &'static fn(!) -> !;
    |                        ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/35121
+   = note: see issue #35121 <https://github.com/rust-lang/rust/issues/35121> for more information
    = help: add `#![feature(never_type)]` to the crate attributes to enable
 
 error[E0658]: the `!` type is experimental
@@ -31,7 +31,7 @@ error[E0658]: the `!` type is experimental
 LL | type Skwoz = &'static mut !;
    |                           ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/35121
+   = note: see issue #35121 <https://github.com/rust-lang/rust/issues/35121> for more information
    = help: add `#![feature(never_type)]` to the crate attributes to enable
 
 error[E0658]: the `!` type is experimental
@@ -40,7 +40,7 @@ error[E0658]: the `!` type is experimental
 LL |     type Wub = !;
    |                ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/35121
+   = note: see issue #35121 <https://github.com/rust-lang/rust/issues/35121> for more information
    = help: add `#![feature(never_type)]` to the crate attributes to enable
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-no-debug-2.rs b/src/test/ui/feature-gates/feature-gate-no-debug-2.rs
deleted file mode 100644
index b399bd2cc0..0000000000
--- a/src/test/ui/feature-gates/feature-gate-no-debug-2.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#![deny(deprecated)]
-#![feature(no_debug)]
-
-#[no_debug] //~ ERROR use of deprecated attribute `no_debug`
-fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr b/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr
deleted file mode 100644
index 1f8f114d7d..0000000000
--- a/src/test/ui/feature-gates/feature-gate-no-debug-2.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error: use of deprecated attribute `no_debug`: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand. See https://github.com/rust-lang/rust/issues/29721
-  --> $DIR/feature-gate-no-debug-2.rs:4:1
-   |
-LL | #[no_debug]
-   | ^^^^^^^^^^^ help: remove this attribute
-   |
-note: lint level defined here
-  --> $DIR/feature-gate-no-debug-2.rs:1:9
-   |
-LL | #![deny(deprecated)]
-   |         ^^^^^^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/feature-gates/feature-gate-no-debug.rs b/src/test/ui/feature-gates/feature-gate-no-debug.rs
deleted file mode 100644
index a472c4c766..0000000000
--- a/src/test/ui/feature-gates/feature-gate-no-debug.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-#![allow(deprecated)]
-
-#[no_debug] //~ ERROR the `#[no_debug]` attribute was
-fn main() {}
diff --git a/src/test/ui/feature-gates/feature-gate-no-debug.stderr b/src/test/ui/feature-gates/feature-gate-no-debug.stderr
deleted file mode 100644
index 7d5af0802c..0000000000
--- a/src/test/ui/feature-gates/feature-gate-no-debug.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0658]: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand
-  --> $DIR/feature-gate-no-debug.rs:3:1
-   |
-LL | #[no_debug]
-   | ^^^^^^^^^^^
-   |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29721
-   = help: add `#![feature(no_debug)]` to the crate attributes to enable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gates/feature-gate-no_core.stderr b/src/test/ui/feature-gates/feature-gate-no_core.stderr
index a80b3cbba2..8430a9ec6a 100644
--- a/src/test/ui/feature-gates/feature-gate-no_core.stderr
+++ b/src/test/ui/feature-gates/feature-gate-no_core.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[no_core]` attribute is an experimental feature
 LL | #![no_core]
    | ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29639
+   = note: see issue #29639 <https://github.com/rust-lang/rust/issues/29639> for more information
    = help: add `#![feature(no_core)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-no_sanitize.rs b/src/test/ui/feature-gates/feature-gate-no_sanitize.rs
new file mode 100644
index 0000000000..66a9263e13
--- /dev/null
+++ b/src/test/ui/feature-gates/feature-gate-no_sanitize.rs
@@ -0,0 +1,4 @@
+#[no_sanitize(address)]
+//~^ the `#[no_sanitize]` attribute is an experimental feature
+fn main() {
+}
diff --git a/src/test/ui/feature-gates/feature-gate-no_sanitize.stderr b/src/test/ui/feature-gates/feature-gate-no_sanitize.stderr
new file mode 100644
index 0000000000..3993357006
--- /dev/null
+++ b/src/test/ui/feature-gates/feature-gate-no_sanitize.stderr
@@ -0,0 +1,12 @@
+error[E0658]: the `#[no_sanitize]` attribute is an experimental feature
+  --> $DIR/feature-gate-no_sanitize.rs:1:1
+   |
+LL | #[no_sanitize(address)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #39699 <https://github.com/rust-lang/rust/issues/39699> for more information
+   = help: add `#![feature(no_sanitize)]` to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr
index 02d21c90fe..e9392ace4c 100644
--- a/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr
+++ b/src/test/ui/feature-gates/feature-gate-non_ascii_idents.stderr
@@ -4,7 +4,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL | extern crate core as bäz;
    |                      ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -13,7 +13,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL | use föö::bar;
    |     ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -22,7 +22,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL | mod föö {
    |     ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -31,7 +31,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL | fn bär(
    |    ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -40,7 +40,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     bäz: isize
    |     ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -49,7 +49,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     let _ö: isize;
    |         ^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -58,7 +58,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |         (_ä, _) => {}
    |          ^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -67,7 +67,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL | struct Föö {
    |        ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -76,7 +76,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     föö: isize
    |     ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -85,7 +85,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL | enum Bär {
    |      ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -94,7 +94,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     Bäz {
    |     ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -103,7 +103,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |         qüx: isize
    |         ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -112,7 +112,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     fn qüx();
    |        ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error: aborting due to 13 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr b/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
index 54e64e2fc1..c66bbb0c50 100644
--- a/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
+++ b/src/test/ui/feature-gates/feature-gate-object_safe_for_dispatch.stderr
@@ -1,45 +1,66 @@
 error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
-  --> $DIR/feature-gate-object_safe_for_dispatch.rs:18:1
+  --> $DIR/feature-gate-object_safe_for_dispatch.rs:18:38
    |
+LL | trait NonObjectSafe1: Sized {}
+   |       --------------  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL | fn takes_non_object_safe_ref<T>(obj: &dyn NonObjectSafe1) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object
-   |
-   = note: the trait cannot require that `Self : Sized`
+   |                                      ^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe1` cannot be made into an object
 
 error[E0038]: the trait `NonObjectSafe2` cannot be made into an object
-  --> $DIR/feature-gate-object_safe_for_dispatch.rs:22:1
+  --> $DIR/feature-gate-object_safe_for_dispatch.rs:22:36
    |
+LL | trait NonObjectSafe2 {
+   |       -------------- this trait cannot be made into an object...
 LL |     fn static_fn() {}
-   |        --------- associated function `static_fn` has no `self` parameter
+   |        --------- ...because associated function `static_fn` has no `self` parameter
 ...
 LL | fn return_non_object_safe_ref() -> &'static dyn NonObjectSafe2 {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe2` cannot be made into an object
+   |                                    ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe2` cannot be made into an object
+   |
+help: consider turning `static_fn` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn static_fn() where Self: Sized {}
+   |                    ^^^^^^^^^^^^^^^^^
 
 error[E0038]: the trait `NonObjectSafe3` cannot be made into an object
-  --> $DIR/feature-gate-object_safe_for_dispatch.rs:27:1
+  --> $DIR/feature-gate-object_safe_for_dispatch.rs:27:35
    |
+LL | trait NonObjectSafe3 {
+   |       -------------- this trait cannot be made into an object...
 LL |     fn foo<T>(&self);
-   |        --- method `foo` has generic type parameters
+   |        --- ...because method `foo` has generic type parameters
 ...
 LL | fn takes_non_object_safe_box(obj: Box<dyn NonObjectSafe3>) {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe3` cannot be made into an object
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe3` cannot be made into an object
+   |
+   = help: consider moving `foo` to another trait
 
 error[E0038]: the trait `NonObjectSafe4` cannot be made into an object
-  --> $DIR/feature-gate-object_safe_for_dispatch.rs:31:1
+  --> $DIR/feature-gate-object_safe_for_dispatch.rs:31:35
    |
+LL | trait NonObjectSafe4 {
+   |       -------------- this trait cannot be made into an object...
 LL |     fn foo(&self, &Self);
-   |        --- method `foo` references the `Self` type in its parameters or return type
+   |                   ----- ...because method `foo` references the `Self` type in this parameter
 ...
 LL | fn return_non_object_safe_rc() -> std::rc::Rc<dyn NonObjectSafe4> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe4` cannot be made into an object
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NonObjectSafe4` cannot be made into an object
+   |
+   = help: consider moving `foo` to another trait
 
 error[E0038]: the trait `NonObjectSafe1` cannot be made into an object
   --> $DIR/feature-gate-object_safe_for_dispatch.rs:38:6
    |
+LL | trait NonObjectSafe1: Sized {}
+   |       --------------  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL | impl Trait for dyn NonObjectSafe1 {}
    |      ^^^^^ the trait `NonObjectSafe1` cannot be made into an object
-   |
-   = note: the trait cannot require that `Self : Sized`
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr
index 0c3dd451b2..d29c373a33 100644
--- a/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr
+++ b/src/test/ui/feature-gates/feature-gate-optin-builtin-traits.stderr
@@ -4,7 +4,7 @@ error[E0658]: auto traits are experimental and possibly buggy
 LL | auto trait AutoDummyTrait {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/13231
+   = note: see issue #13231 <https://github.com/rust-lang/rust/issues/13231> for more information
    = help: add `#![feature(optin_builtin_traits)]` to the crate attributes to enable
 
 error[E0658]: negative trait bounds are not yet fully implemented; use marker types for now
@@ -13,7 +13,7 @@ error[E0658]: negative trait bounds are not yet fully implemented; use marker ty
 LL | impl !AutoDummyTrait for DummyStruct {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/13231
+   = note: see issue #13231 <https://github.com/rust-lang/rust/issues/13231> for more information
    = help: add `#![feature(optin_builtin_traits)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr b/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr
index 4856cf7c3f..0847d77a85 100644
--- a/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr
+++ b/src/test/ui/feature-gates/feature-gate-plugin_registrar.stderr
@@ -4,7 +4,7 @@ error[E0658]: compiler plugins are experimental and possibly buggy
 LL | pub fn registrar() {}
    | ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29597
+   = note: see issue #29597 <https://github.com/rust-lang/rust/issues/29597> for more information
    = help: add `#![feature(plugin_registrar)]` to the crate attributes to enable
 
 error[E0658]: compiler plugins are deprecated
@@ -13,7 +13,7 @@ error[E0658]: compiler plugins are deprecated
 LL | #[plugin_registrar]
    | ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29597
+   = note: see issue #29597 <https://github.com/rust-lang/rust/issues/29597> for more information
    = help: add `#![feature(plugin_registrar)]` to the crate attributes to enable
 
 warning: use of deprecated attribute `plugin_registrar`: compiler plugins are deprecated. See https://github.com/rust-lang/rust/pull/64675
diff --git a/src/test/ui/feature-gates/feature-gate-register_attr.stderr b/src/test/ui/feature-gates/feature-gate-register_attr.stderr
index 3965d481d9..8ca3845d28 100644
--- a/src/test/ui/feature-gates/feature-gate-register_attr.stderr
+++ b/src/test/ui/feature-gates/feature-gate-register_attr.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[register_attr]` attribute is an experimental feature
 LL | #![register_attr(attr)]
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/66080
+   = note: see issue #66080 <https://github.com/rust-lang/rust/issues/66080> for more information
    = help: add `#![feature(register_attr)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-register_tool.stderr b/src/test/ui/feature-gates/feature-gate-register_tool.stderr
index 177342aed9..9ffaaa8de7 100644
--- a/src/test/ui/feature-gates/feature-gate-register_tool.stderr
+++ b/src/test/ui/feature-gates/feature-gate-register_tool.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[register_tool]` attribute is an experimental feature
 LL | #![register_tool(tool)]
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/66079
+   = note: see issue #66079 <https://github.com/rust-lang/rust/issues/66079> for more information
    = help: add `#![feature(register_tool)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-repr-simd.stderr b/src/test/ui/feature-gates/feature-gate-repr-simd.stderr
index 013bad069d..ae44b80206 100644
--- a/src/test/ui/feature-gates/feature-gate-repr-simd.stderr
+++ b/src/test/ui/feature-gates/feature-gate-repr-simd.stderr
@@ -4,7 +4,7 @@ error[E0658]: SIMD types are experimental and possibly buggy
 LL | #[repr(simd)]
    | ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(repr_simd)]` to the crate attributes to enable
 
 error[E0658]: SIMD types are experimental and possibly buggy
@@ -13,7 +13,7 @@ error[E0658]: SIMD types are experimental and possibly buggy
 LL | #[repr(simd)]
    | ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(repr_simd)]` to the crate attributes to enable
 
 error[E0566]: conflicting representation hints
diff --git a/src/test/ui/feature-gates/feature-gate-repr128.stderr b/src/test/ui/feature-gates/feature-gate-repr128.stderr
index e108d74e9c..3eb005acc3 100644
--- a/src/test/ui/feature-gates/feature-gate-repr128.stderr
+++ b/src/test/ui/feature-gates/feature-gate-repr128.stderr
@@ -6,7 +6,7 @@ LL | |     A(u64)
 LL | | }
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/56071
+   = note: see issue #56071 <https://github.com/rust-lang/rust/issues/56071> for more information
    = help: add `#![feature(repr128)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
index e9dd0867fc..82dec1fd4c 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
+++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs-1.stderr
@@ -4,7 +4,6 @@ error[E0658]: the `#[rustc_variance]` attribute is just used for rustc unit test
 LL | #[rustc_variance]
    | ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error[E0658]: the `#[rustc_error]` attribute is just used for rustc unit tests and will never be stable
@@ -13,7 +12,6 @@ error[E0658]: the `#[rustc_error]` attribute is just used for rustc unit tests a
 LL | #[rustc_error]
    | ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error[E0658]: the `#[rustc_nonnull_optimization_guaranteed]` attribute is just used to enable niche optimizations in libcore and will never be stable
@@ -22,7 +20,6 @@ error[E0658]: the `#[rustc_nonnull_optimization_guaranteed]` attribute is just u
 LL | #[rustc_nonnull_optimization_guaranteed]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr
index d6fdab2b04..1e039f17a0 100644
--- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr
+++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr
@@ -4,7 +4,6 @@ error[E0658]: attributes starting with `rustc` are reserved for use by the `rust
 LL | #[rustc::unknown]
    |   ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: expected attribute, found macro `rustc::unknown`
@@ -19,7 +18,6 @@ error[E0658]: attributes starting with `rustc` are reserved for use by the `rust
 LL | #[unknown::rustc]
    |            ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: expected attribute, found macro `unknown::rustc`
@@ -34,7 +32,6 @@ error[E0658]: attributes starting with `rustc` are reserved for use by the `rust
 LL | #[rustc_unknown]
    |   ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: cannot find attribute `rustc_unknown` in this scope
@@ -49,7 +46,6 @@ error[E0658]: the `#[rustc_dummy]` attribute is just used for rustc unit tests a
 LL | #[rustc_dummy]
    | ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: aborting due to 7 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-simd.stderr b/src/test/ui/feature-gates/feature-gate-simd.stderr
index b72ac1e493..6e0e0b2703 100644
--- a/src/test/ui/feature-gates/feature-gate-simd.stderr
+++ b/src/test/ui/feature-gates/feature-gate-simd.stderr
@@ -4,7 +4,7 @@ error[E0658]: SIMD types are experimental and possibly buggy
 LL | #[repr(simd)]
    | ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(repr_simd)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-start.stderr b/src/test/ui/feature-gates/feature-gate-start.stderr
index f42e42ea03..eec9d1a292 100644
--- a/src/test/ui/feature-gates/feature-gate-start.stderr
+++ b/src/test/ui/feature-gates/feature-gate-start.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[start]` functions are experimental and their signature may chan
 LL | fn foo(_: isize, _: *const *const u8) -> isize { 0 }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29633
+   = note: see issue #29633 <https://github.com/rust-lang/rust/issues/29633> for more information
    = help: add `#![feature(start)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
index cc0d426d6c..773ad8ff21 100644
--- a/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
+++ b/src/test/ui/feature-gates/feature-gate-static-nobundle.stderr
@@ -4,7 +4,7 @@ error[E0658]: kind="static-nobundle" is unstable
 LL | #[link(name="foo", kind="static-nobundle")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/37403
+   = note: see issue #37403 <https://github.com/rust-lang/rust/issues/37403> for more information
    = help: add `#![feature(static_nobundle)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr
index 70c70638ea..57ffaed78f 100644
--- a/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr
+++ b/src/test/ui/feature-gates/feature-gate-stmt_expr_attributes.stderr
@@ -4,7 +4,7 @@ error[E0658]: attributes on expressions are experimental
 LL | const X: i32 = #[allow(dead_code)] 8;
    |                ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-thread_local.stderr b/src/test/ui/feature-gates/feature-gate-thread_local.stderr
index 9f154d9bc5..6352e90870 100644
--- a/src/test/ui/feature-gates/feature-gate-thread_local.stderr
+++ b/src/test/ui/feature-gates/feature-gate-thread_local.stderr
@@ -4,7 +4,7 @@ error[E0658]: `#[thread_local]` is an experimental feature, and does not current
 LL | #[thread_local]
    | ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29594
+   = note: see issue #29594 <https://github.com/rust-lang/rust/issues/29594> for more information
    = help: add `#![feature(thread_local)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-trace_macros.stderr b/src/test/ui/feature-gates/feature-gate-trace_macros.stderr
index cca0818752..3978d4111b 100644
--- a/src/test/ui/feature-gates/feature-gate-trace_macros.stderr
+++ b/src/test/ui/feature-gates/feature-gate-trace_macros.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'trace_macros': `trace_macros` is
 LL |     trace_macros!(true);
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(trace_macros)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-track_caller.stderr b/src/test/ui/feature-gates/feature-gate-track_caller.stderr
index b890019ee4..8ceab50161 100644
--- a/src/test/ui/feature-gates/feature-gate-track_caller.stderr
+++ b/src/test/ui/feature-gates/feature-gate-track_caller.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[track_caller]` attribute is an experimental feature
 LL | #[track_caller]
    | ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/47809
+   = note: see issue #47809 <https://github.com/rust-lang/rust/issues/47809> for more information
    = help: add `#![feature(track_caller)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-trait-alias.stderr b/src/test/ui/feature-gates/feature-gate-trait-alias.stderr
index 9250e27d15..41cd6dbd8b 100644
--- a/src/test/ui/feature-gates/feature-gate-trait-alias.stderr
+++ b/src/test/ui/feature-gates/feature-gate-trait-alias.stderr
@@ -4,7 +4,7 @@ error[E0658]: trait aliases are experimental
 LL | trait Foo = Default;
    | ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/41517
+   = note: see issue #41517 <https://github.com/rust-lang/rust/issues/41517> for more information
    = help: add `#![feature(trait_alias)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-transparent_unions.stderr b/src/test/ui/feature-gates/feature-gate-transparent_unions.stderr
index 356950d064..65c8fe0522 100644
--- a/src/test/ui/feature-gates/feature-gate-transparent_unions.stderr
+++ b/src/test/ui/feature-gates/feature-gate-transparent_unions.stderr
@@ -4,7 +4,7 @@ error[E0658]: transparent unions are unstable
 LL | union OkButUnstableUnion {
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/60405
+   = note: see issue #60405 <https://github.com/rust-lang/rust/issues/60405> for more information
    = help: add `#![feature(transparent_unions)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-try_blocks.stderr b/src/test/ui/feature-gates/feature-gate-try_blocks.stderr
index 565f3610a2..022409f955 100644
--- a/src/test/ui/feature-gates/feature-gate-try_blocks.stderr
+++ b/src/test/ui/feature-gates/feature-gate-try_blocks.stderr
@@ -8,7 +8,7 @@ LL | |         x
 LL | |     };
    | |_____^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/31436
+   = note: see issue #31436 <https://github.com/rust-lang/rust/issues/31436> for more information
    = help: add `#![feature(try_blocks)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-try_reserve.stderr b/src/test/ui/feature-gates/feature-gate-try_reserve.stderr
index 5bd9dffa7f..4da9a23a1b 100644
--- a/src/test/ui/feature-gates/feature-gate-try_reserve.stderr
+++ b/src/test/ui/feature-gates/feature-gate-try_reserve.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'try_reserve': new API
 LL |     v.try_reserve(10);
    |       ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/48043
+   = note: see issue #48043 <https://github.com/rust-lang/rust/issues/48043> for more information
    = help: add `#![feature(try_reserve)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-type_alias_impl_trait.stderr b/src/test/ui/feature-gates/feature-gate-type_alias_impl_trait.stderr
index 1f61473c9d..55cd2984ab 100644
--- a/src/test/ui/feature-gates/feature-gate-type_alias_impl_trait.stderr
+++ b/src/test/ui/feature-gates/feature-gate-type_alias_impl_trait.stderr
@@ -4,7 +4,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type Foo = impl Debug;
    |            ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -13,7 +13,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Baa = impl Debug;
    |                ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: associated type defaults are unstable
@@ -22,7 +22,7 @@ error[E0658]: associated type defaults are unstable
 LL |     type Assoc = impl Debug;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29661
+   = note: see issue #29661 <https://github.com/rust-lang/rust/issues/29661> for more information
    = help: add `#![feature(associated_type_defaults)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -31,7 +31,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Assoc = impl Debug;
    |                  ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -40,7 +40,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type NestedFree = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                        ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -49,7 +49,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type NestedFree = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                                     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -58,7 +58,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type NestedFree = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -67,7 +67,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type NestedFree = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                                                                      ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -76,7 +76,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Baa = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -85,7 +85,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Baa = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                                  ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -94,7 +94,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Baa = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -103,7 +103,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Baa = (Vec<impl Debug>, impl Debug, impl Iterator<Item = impl Debug>);
    |                                                                   ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0562]: `impl Trait` not allowed outside of function and inherent method return types
diff --git a/src/test/ui/feature-gates/feature-gate-type_ascription.stderr b/src/test/ui/feature-gates/feature-gate-type_ascription.stderr
index 83f95529f0..615d5b9a1e 100644
--- a/src/test/ui/feature-gates/feature-gate-type_ascription.stderr
+++ b/src/test/ui/feature-gates/feature-gate-type_ascription.stderr
@@ -4,7 +4,7 @@ error[E0658]: type ascription is experimental
 LL |     let a = 10: u8;
    |             ^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
    = help: add `#![feature(type_ascription)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr
index 4addd16649..892020332d 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-manual-impls.stderr
@@ -4,7 +4,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn call(self, args: ()) -> () {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: rust-call ABI is subject to change
@@ -13,7 +13,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn call_once(self, args: ()) -> () {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: rust-call ABI is subject to change
@@ -22,7 +22,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn call_mut(&self, args: ()) -> () {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: rust-call ABI is subject to change
@@ -31,7 +31,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn call_once(&self, args: ()) -> () {}
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change
@@ -40,7 +40,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL | impl Fn<()> for Foo {
    |      ^^^^^^ help: use parenthetical notation instead: `Fn() -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0229]: associated type bindings are not allowed here
@@ -55,7 +55,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL | impl FnMut<()> for Bar {
    |      ^^^^^^^^^ help: use parenthetical notation instead: `FnMut() -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change
@@ -64,7 +64,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL | impl FnOnce<()> for Baz {
    |      ^^^^^^^^^^ help: use parenthetical notation instead: `FnOnce() -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error: aborting due to 8 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr
index ee3ba665ce..c61382c64f 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-method-calls.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'fn_traits'
 LL |     f.call(());
    |       ^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(fn_traits)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'fn_traits'
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'fn_traits'
 LL |     f.call_mut(());
    |       ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(fn_traits)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'fn_traits'
@@ -22,7 +22,7 @@ error[E0658]: use of unstable library feature 'fn_traits'
 LL |     f.call_once(());
    |       ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(fn_traits)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr
index f7cb1ab641..50eaeecde3 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures-ufcs-calls.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'fn_traits'
 LL |     Fn::call(&f, ());
    |     ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(fn_traits)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'fn_traits'
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'fn_traits'
 LL |     FnMut::call_mut(&mut f, ());
    |     ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(fn_traits)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'fn_traits'
@@ -22,7 +22,7 @@ error[E0658]: use of unstable library feature 'fn_traits'
 LL |     FnOnce::call_once(f, ());
    |     ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(fn_traits)]` to the crate attributes to enable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr b/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr
index 005ff06e68..feda2fe49f 100644
--- a/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unboxed-closures.stderr
@@ -4,7 +4,7 @@ error[E0658]: rust-call ABI is subject to change
 LL |     extern "rust-call" fn call_once(self, (a, b): (u32, u32)) -> u32 {
    |            ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change
@@ -13,7 +13,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL | impl FnOnce<(u32, u32)> for Test {
    |      ^^^^^^^^^^^^^^^^^^ help: use parenthetical notation instead: `FnOnce(u32, u32) -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr
index d4c62399e9..bea6cee0a8 100644
--- a/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unsized_tuple_coercion.stderr
@@ -4,7 +4,7 @@ error[E0658]: unsized tuple coercion is not stable enough for use and is subject
 LL |     let _ : &(dyn Send,) = &((),);
    |                            ^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/42877
+   = note: see issue #42877 <https://github.com/rust-lang/rust/issues/42877> for more information
    = help: add `#![feature(unsized_tuple_coercion)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr b/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr
index 2182b3a313..3a123ea1c9 100644
--- a/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr
+++ b/src/test/ui/feature-gates/feature-gate-untagged_unions.stderr
@@ -6,7 +6,7 @@ LL | |     a: String,
 LL | | }
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55149
+   = note: see issue #55149 <https://github.com/rust-lang/rust/issues/55149> for more information
    = help: add `#![feature(untagged_unions)]` to the crate attributes to enable
 
 error[E0658]: unions with non-`Copy` fields are unstable
@@ -17,7 +17,7 @@ LL | |     a: T,
 LL | | }
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55149
+   = note: see issue #55149 <https://github.com/rust-lang/rust/issues/55149> for more information
    = help: add `#![feature(untagged_unions)]` to the crate attributes to enable
 
 error[E0658]: unions with `Drop` implementations are unstable
@@ -28,7 +28,7 @@ LL | |     a: u8,
 LL | | }
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55149
+   = note: see issue #55149 <https://github.com/rust-lang/rust/issues/55149> for more information
    = help: add `#![feature(untagged_unions)]` to the crate attributes to enable
 
 error[E0740]: unions may not contain fields that need dropping
diff --git a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
index 97365c34d0..8e7895555c 100644
--- a/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
+++ b/src/test/ui/feature-gates/feature-gate-unwind-attributes.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[unwind]` attribute is an experimental feature
 LL |     #[unwind(allowed)]
    |     ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/58760
+   = note: see issue #58760 <https://github.com/rust-lang/rust/issues/58760> for more information
    = help: add `#![feature(unwind_attributes)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/fmt/send-sync.stderr b/src/test/ui/fmt/send-sync.stderr
index be6e41afaf..c8439764ef 100644
--- a/src/test/ui/fmt/send-sync.stderr
+++ b/src/test/ui/fmt/send-sync.stderr
@@ -1,34 +1,30 @@
-error[E0277]: `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely
+error[E0277]: `core::fmt::Opaque` cannot be shared between threads safely
   --> $DIR/send-sync.rs:8:5
    |
 LL | fn send<T: Send>(_: T) {}
    |    ----    ---- required by this bound in `send`
 ...
 LL |     send(format_args!("{:?}", c));
-   |     ^^^^ `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely
+   |     ^^^^ `core::fmt::Opaque` cannot be shared between threads safely
    |
-   = help: within `[std::fmt::ArgumentV1<'_>]`, the trait `std::marker::Sync` is not implemented for `*mut (dyn std::ops::Fn() + 'static)`
-   = note: required because it appears within the type `std::marker::PhantomData<*mut (dyn std::ops::Fn() + 'static)>`
-   = note: required because it appears within the type `core::fmt::Void`
-   = note: required because it appears within the type `&core::fmt::Void`
+   = help: within `[std::fmt::ArgumentV1<'_>]`, the trait `std::marker::Sync` is not implemented for `core::fmt::Opaque`
+   = note: required because it appears within the type `&core::fmt::Opaque`
    = note: required because it appears within the type `std::fmt::ArgumentV1<'_>`
    = note: required because it appears within the type `[std::fmt::ArgumentV1<'_>]`
    = note: required because of the requirements on the impl of `std::marker::Send` for `&[std::fmt::ArgumentV1<'_>]`
    = note: required because it appears within the type `std::fmt::Arguments<'_>`
 
-error[E0277]: `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely
+error[E0277]: `core::fmt::Opaque` cannot be shared between threads safely
   --> $DIR/send-sync.rs:9:5
    |
 LL | fn sync<T: Sync>(_: T) {}
    |    ----    ---- required by this bound in `sync`
 ...
 LL |     sync(format_args!("{:?}", c));
-   |     ^^^^ `*mut (dyn std::ops::Fn() + 'static)` cannot be shared between threads safely
+   |     ^^^^ `core::fmt::Opaque` cannot be shared between threads safely
    |
-   = help: within `std::fmt::Arguments<'_>`, the trait `std::marker::Sync` is not implemented for `*mut (dyn std::ops::Fn() + 'static)`
-   = note: required because it appears within the type `std::marker::PhantomData<*mut (dyn std::ops::Fn() + 'static)>`
-   = note: required because it appears within the type `core::fmt::Void`
-   = note: required because it appears within the type `&core::fmt::Void`
+   = help: within `std::fmt::Arguments<'_>`, the trait `std::marker::Sync` is not implemented for `core::fmt::Opaque`
+   = note: required because it appears within the type `&core::fmt::Opaque`
    = note: required because it appears within the type `std::fmt::ArgumentV1<'_>`
    = note: required because it appears within the type `[std::fmt::ArgumentV1<'_>]`
    = note: required because it appears within the type `&[std::fmt::ArgumentV1<'_>]`
diff --git a/src/test/ui/fn/fn-closure-mutable-capture.rs b/src/test/ui/fn/fn-closure-mutable-capture.rs
index 81376af091..0e427b9cf3 100644
--- a/src/test/ui/fn/fn-closure-mutable-capture.rs
+++ b/src/test/ui/fn/fn-closure-mutable-capture.rs
@@ -1,11 +1,11 @@
-pub fn bar<F: Fn()>(_f: F) {}
+pub fn bar<F: Fn()>(_f: F) {} //~ NOTE change this to accept `FnMut` instead of `Fn`
 
 pub fn foo() {
     let mut x = 0;
     bar(move || x = 1);
     //~^ ERROR cannot assign to `x`, as it is a captured variable in a `Fn` closure
     //~| NOTE cannot assign
-    //~| HELP consider changing this to accept closures that implement `FnMut`
+    //~| NOTE expects `Fn` instead of `FnMut`
 }
 
 fn main() {}
diff --git a/src/test/ui/fn/fn-closure-mutable-capture.stderr b/src/test/ui/fn/fn-closure-mutable-capture.stderr
index f7ab56da8d..d23c363ae1 100644
--- a/src/test/ui/fn/fn-closure-mutable-capture.stderr
+++ b/src/test/ui/fn/fn-closure-mutable-capture.stderr
@@ -1,14 +1,13 @@
 error[E0594]: cannot assign to `x`, as it is a captured variable in a `Fn` closure
   --> $DIR/fn-closure-mutable-capture.rs:5:17
    |
+LL | pub fn bar<F: Fn()>(_f: F) {}
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |     bar(move || x = 1);
-   |                 ^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/fn-closure-mutable-capture.rs:5:9
-   |
-LL |     bar(move || x = 1);
-   |         ^^^^^^^^^^^^^
+   |     ---         ^^^^^ cannot assign
+   |     |
+   |     expects `Fn` instead of `FnMut`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/fn_must_use.stderr b/src/test/ui/fn_must_use.stderr
index 5a1a4e36e0..64f865e5b7 100644
--- a/src/test/ui/fn_must_use.stderr
+++ b/src/test/ui/fn_must_use.stderr
@@ -4,7 +4,7 @@ warning: unused return value of `need_to_use_this_value` that must be used
 LL |     need_to_use_this_value();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/fn_must_use.rs:3:9
    |
 LL | #![warn(unused_must_use)]
diff --git a/src/test/ui/for/for-loop-type-error.stderr b/src/test/ui/for/for-loop-type-error.stderr
index 0ed26384f4..c93a3b9b25 100644
--- a/src/test/ui/for/for-loop-type-error.stderr
+++ b/src/test/ui/for/for-loop-type-error.stderr
@@ -5,8 +5,6 @@ LL |     let x = () + ();
    |             -- ^ -- ()
    |             |
    |             ()
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `()`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/future-incompatible-lint-group.stderr b/src/test/ui/future-incompatible-lint-group.stderr
index 1d958e5bfe..a19051e8bc 100644
--- a/src/test/ui/future-incompatible-lint-group.stderr
+++ b/src/test/ui/future-incompatible-lint-group.stderr
@@ -4,7 +4,7 @@ error: anonymous parameters are deprecated and will be removed in the next editi
 LL |     fn f(u8) {}
    |          ^^ help: try naming the parameter or explicitly ignoring it: `_: u8`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/future-incompatible-lint-group.rs:1:9
    |
 LL | #![deny(future_incompatible)]
diff --git a/src/test/ui/generator-yielding-or-returning-itself.rs b/src/test/ui/generator-yielding-or-returning-itself.rs
index fd52667981..30788e3c18 100644
--- a/src/test/ui/generator-yielding-or-returning-itself.rs
+++ b/src/test/ui/generator-yielding-or-returning-itself.rs
@@ -13,7 +13,7 @@ pub fn want_cyclic_generator_return<T>(_: T)
 
 fn supply_cyclic_generator_return() {
     want_cyclic_generator_return(|| {
-        //~^ ERROR closure/generator type that references itself
+        //~^ ERROR type mismatch
         if false { yield None.unwrap(); }
         None.unwrap()
     })
diff --git a/src/test/ui/generator-yielding-or-returning-itself.stderr b/src/test/ui/generator-yielding-or-returning-itself.stderr
index c9a71e0385..fc8064d822 100644
--- a/src/test/ui/generator-yielding-or-returning-itself.stderr
+++ b/src/test/ui/generator-yielding-or-returning-itself.stderr
@@ -1,17 +1,18 @@
-error[E0644]: closure/generator type that references itself
-  --> $DIR/generator-yielding-or-returning-itself.rs:15:34
+error[E0271]: type mismatch resolving `<[generator@$DIR/generator-yielding-or-returning-itself.rs:15:34: 19:6 _] as std::ops::Generator>::Return == [generator@$DIR/generator-yielding-or-returning-itself.rs:15:34: 19:6 _]`
+  --> $DIR/generator-yielding-or-returning-itself.rs:15:5
    |
-LL |       want_cyclic_generator_return(|| {
-   |  __________________________________^
-LL | |
-LL | |         if false { yield None.unwrap(); }
-LL | |         None.unwrap()
-LL | |     })
-   | |_____^ cyclic type of infinite size
+LL | pub fn want_cyclic_generator_return<T>(_: T)
+   |        ----------------------------
+LL |     where T: Generator<Yield = (), Return = T>
+   |                                    ---------- required by this bound in `want_cyclic_generator_return`
+...
+LL |     want_cyclic_generator_return(|| {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cyclic type of infinite size
    |
    = note: closures cannot capture themselves or take themselves as argument;
            this error may be the result of a recent compiler bug-fix,
-           see https://github.com/rust-lang/rust/issues/46062 for more details
+           see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
+           for more information
 
 error[E0271]: type mismatch resolving `<[generator@$DIR/generator-yielding-or-returning-itself.rs:28:33: 32:6 _] as std::ops::Generator>::Yield == [generator@$DIR/generator-yielding-or-returning-itself.rs:28:33: 32:6 _]`
   --> $DIR/generator-yielding-or-returning-itself.rs:28:5
@@ -26,9 +27,9 @@ LL |     want_cyclic_generator_yield(|| {
    |
    = note: closures cannot capture themselves or take themselves as argument;
            this error may be the result of a recent compiler bug-fix,
-           see https://github.com/rust-lang/rust/issues/46062 for more details
+           see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
+           for more information
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0271, E0644.
-For more information about an error, try `rustc --explain E0271`.
+For more information about this error, try `rustc --explain E0271`.
diff --git a/src/test/ui/generator/async-generator-issue-67158.stderr b/src/test/ui/generator/async-generator-issue-67158.stderr
index c2ea55c1e7..7270d188e8 100644
--- a/src/test/ui/generator/async-generator-issue-67158.stderr
+++ b/src/test/ui/generator/async-generator-issue-67158.stderr
@@ -6,3 +6,4 @@ LL |     async { yield print!(":C") };
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0727`.
diff --git a/src/test/ui/generator/auxiliary/xcrate-reachable.rs b/src/test/ui/generator/auxiliary/xcrate-reachable.rs
index 33337f8038..2dd5ea6752 100644
--- a/src/test/ui/generator/auxiliary/xcrate-reachable.rs
+++ b/src/test/ui/generator/auxiliary/xcrate-reachable.rs
@@ -6,7 +6,7 @@ fn msg() -> u32 {
     0
 }
 
-pub fn foo() -> impl Generator<Yield=(), Return=u32> {
+pub fn foo() -> impl Generator<(), Yield=(), Return=u32> {
     || {
         yield;
         return msg();
diff --git a/src/test/ui/generator/auxiliary/xcrate.rs b/src/test/ui/generator/auxiliary/xcrate.rs
index 613c495832..d07abd0918 100644
--- a/src/test/ui/generator/auxiliary/xcrate.rs
+++ b/src/test/ui/generator/auxiliary/xcrate.rs
@@ -3,7 +3,7 @@
 use std::marker::Unpin;
 use std::ops::Generator;
 
-pub fn foo() -> impl Generator<Yield = (), Return = ()> {
+pub fn foo() -> impl Generator<(), Yield = (), Return = ()> {
     || {
         if false {
             yield;
@@ -11,7 +11,7 @@ pub fn foo() -> impl Generator<Yield = (), Return = ()> {
     }
 }
 
-pub fn bar<T: 'static>(t: T) -> Box<Generator<Yield = T, Return = ()> + Unpin> {
+pub fn bar<T: 'static>(t: T) -> Box<Generator<(), Yield = T, Return = ()> + Unpin> {
     Box::new(|| {
         yield t;
     })
diff --git a/src/test/ui/generator/borrowing.rs b/src/test/ui/generator/borrowing.rs
index 6234b73804..d36592583c 100644
--- a/src/test/ui/generator/borrowing.rs
+++ b/src/test/ui/generator/borrowing.rs
@@ -6,7 +6,7 @@ use std::pin::Pin;
 fn main() {
     let _b = {
         let a = 3;
-        Pin::new(&mut || yield &a).resume()
+        Pin::new(&mut || yield &a).resume(())
         //~^ ERROR: `a` does not live long enough
     };
 
diff --git a/src/test/ui/generator/borrowing.stderr b/src/test/ui/generator/borrowing.stderr
index 3d58873f82..83987e1983 100644
--- a/src/test/ui/generator/borrowing.stderr
+++ b/src/test/ui/generator/borrowing.stderr
@@ -1,7 +1,7 @@
 error[E0597]: `a` does not live long enough
   --> $DIR/borrowing.rs:9:33
    |
-LL |         Pin::new(&mut || yield &a).resume()
+LL |         Pin::new(&mut || yield &a).resume(())
    |                       ----------^
    |                       |         |
    |                       |         borrowed value does not live long enough
diff --git a/src/test/ui/generator/conditional-drop.rs b/src/test/ui/generator/conditional-drop.rs
index 907f7a3c06..990d94e6ef 100644
--- a/src/test/ui/generator/conditional-drop.rs
+++ b/src/test/ui/generator/conditional-drop.rs
@@ -35,9 +35,9 @@ fn t1() {
     };
 
     let n = A.load(Ordering::SeqCst);
-    Pin::new(&mut a).resume();
+    Pin::new(&mut a).resume(());
     assert_eq!(A.load(Ordering::SeqCst), n + 1);
-    Pin::new(&mut a).resume();
+    Pin::new(&mut a).resume(());
     assert_eq!(A.load(Ordering::SeqCst), n + 1);
 }
 
@@ -51,8 +51,8 @@ fn t2() {
     };
 
     let n = A.load(Ordering::SeqCst);
-    Pin::new(&mut a).resume();
+    Pin::new(&mut a).resume(());
     assert_eq!(A.load(Ordering::SeqCst), n);
-    Pin::new(&mut a).resume();
+    Pin::new(&mut a).resume(());
     assert_eq!(A.load(Ordering::SeqCst), n + 1);
 }
diff --git a/src/test/ui/generator/control-flow.rs b/src/test/ui/generator/control-flow.rs
index df70e013bd..9d4c217b76 100644
--- a/src/test/ui/generator/control-flow.rs
+++ b/src/test/ui/generator/control-flow.rs
@@ -7,10 +7,10 @@ use std::ops::{GeneratorState, Generator};
 use std::pin::Pin;
 
 fn finish<T>(mut amt: usize, mut t: T) -> T::Return
-    where T: Generator<Yield = ()> + Unpin,
+    where T: Generator<(), Yield = ()> + Unpin,
 {
     loop {
-        match Pin::new(&mut t).resume() {
+        match Pin::new(&mut t).resume(()) {
             GeneratorState::Yielded(()) => amt = amt.checked_sub(1).unwrap(),
             GeneratorState::Complete(ret) => {
                 assert_eq!(amt, 0);
diff --git a/src/test/ui/generator/drop-and-replace.rs b/src/test/ui/generator/drop-and-replace.rs
index bb33502815..a9a50a122a 100644
--- a/src/test/ui/generator/drop-and-replace.rs
+++ b/src/test/ui/generator/drop-and-replace.rs
@@ -37,7 +37,7 @@ fn main() {
     };
 
     loop {
-        match Pin::new(&mut a).resume() {
+        match Pin::new(&mut a).resume(()) {
             GeneratorState::Complete(()) => break,
             _ => (),
         }
diff --git a/src/test/ui/generator/drop-env.rs b/src/test/ui/generator/drop-env.rs
index ac4e066562..7ba7118810 100644
--- a/src/test/ui/generator/drop-env.rs
+++ b/src/test/ui/generator/drop-env.rs
@@ -30,7 +30,7 @@ fn t1() {
     };
 
     let n = A.load(Ordering::SeqCst);
-    drop(Pin::new(&mut foo).resume());
+    drop(Pin::new(&mut foo).resume(()));
     assert_eq!(A.load(Ordering::SeqCst), n);
     drop(foo);
     assert_eq!(A.load(Ordering::SeqCst), n + 1);
@@ -43,7 +43,7 @@ fn t2() {
     };
 
     let n = A.load(Ordering::SeqCst);
-    drop(Pin::new(&mut foo).resume());
+    drop(Pin::new(&mut foo).resume(()));
     assert_eq!(A.load(Ordering::SeqCst), n + 1);
     drop(foo);
     assert_eq!(A.load(Ordering::SeqCst), n + 1);
diff --git a/src/test/ui/generator/dropck-resume.rs b/src/test/ui/generator/dropck-resume.rs
new file mode 100644
index 0000000000..4c18077f33
--- /dev/null
+++ b/src/test/ui/generator/dropck-resume.rs
@@ -0,0 +1,33 @@
+#![feature(generators, generator_trait)]
+
+use std::ops::{Generator, GeneratorState};
+use std::pin::Pin;
+
+struct SetToNone<'a: 'b, 'b>(&'b mut Option<&'a i32>);
+
+impl<'a, 'b> Drop for SetToNone<'a, 'b> {
+    fn drop(&mut self) {
+        *self.0 = None;
+    }
+}
+
+fn drop_using_generator() -> i32 {
+    let mut y = Some(&0);
+    let z = &mut y;
+    let r;
+    {
+        let mut g = move |r| {
+            let _s = SetToNone(r);
+            yield;
+        };
+        let mut g = Pin::new(&mut g);
+        g.as_mut().resume(z);
+        r = y.as_ref().unwrap();
+        //~^ ERROR cannot borrow `y` as immutable because it is also borrowed as mutable
+    }
+    **r
+}
+
+fn main() {
+    println!("{}", drop_using_generator());
+}
diff --git a/src/test/ui/generator/dropck-resume.stderr b/src/test/ui/generator/dropck-resume.stderr
new file mode 100644
index 0000000000..ecf92e7e3a
--- /dev/null
+++ b/src/test/ui/generator/dropck-resume.stderr
@@ -0,0 +1,15 @@
+error[E0502]: cannot borrow `y` as immutable because it is also borrowed as mutable
+  --> $DIR/dropck-resume.rs:25:13
+   |
+LL |     let z = &mut y;
+   |             ------ mutable borrow occurs here
+...
+LL |         r = y.as_ref().unwrap();
+   |             ^ immutable borrow occurs here
+LL |
+LL |     }
+   |     - mutable borrow might be used here, when `g` is dropped and runs the destructor for generator
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0502`.
diff --git a/src/test/ui/generator/dropck.rs b/src/test/ui/generator/dropck.rs
index 65c61fbaac..da00b230d9 100644
--- a/src/test/ui/generator/dropck.rs
+++ b/src/test/ui/generator/dropck.rs
@@ -15,6 +15,6 @@ fn main() {
         let _d = ref_.take(); //~ ERROR `ref_` does not live long enough
         yield;
     };
-    Pin::new(&mut gen).resume();
+    Pin::new(&mut gen).resume(());
     // drops the RefCell and then the Ref, leading to use-after-free
 }
diff --git a/src/test/ui/generator/generator-region-requirements.rs b/src/test/ui/generator/generator-region-requirements.rs
index 41cb339f45..5f0a6bb09b 100644
--- a/src/test/ui/generator/generator-region-requirements.rs
+++ b/src/test/ui/generator/generator-region-requirements.rs
@@ -8,7 +8,7 @@ fn dangle(x: &mut i32) -> &'static mut i32 {
         x
     };
     loop {
-        match Pin::new(&mut g).resume() {
+        match Pin::new(&mut g).resume(()) {
             GeneratorState::Complete(c) => return c,
             //~^ ERROR explicit lifetime required
             GeneratorState::Yielded(_) => (),
diff --git a/src/test/ui/generator/issue-44197.rs b/src/test/ui/generator/issue-44197.rs
index 6efaff50c1..389b9d1396 100644
--- a/src/test/ui/generator/issue-44197.rs
+++ b/src/test/ui/generator/issue-44197.rs
@@ -2,14 +2,14 @@
 
 #![feature(generators, generator_trait)]
 
-use std::ops::{ Generator, GeneratorState };
+use std::ops::{Generator, GeneratorState};
 use std::pin::Pin;
 
 fn foo(_: &str) -> String {
     String::new()
 }
 
-fn bar(baz: String) -> impl Generator<Yield = String, Return = ()> {
+fn bar(baz: String) -> impl Generator<(), Yield = String, Return = ()> {
     move || {
         yield foo(&baz);
     }
@@ -19,7 +19,7 @@ fn foo2(_: &str) -> Result<String, ()> {
     Err(())
 }
 
-fn bar2(baz: String) -> impl Generator<Yield = String, Return = ()> {
+fn bar2(baz: String) -> impl Generator<(), Yield = String, Return = ()> {
     move || {
         if let Ok(quux) = foo2(&baz) {
             yield quux;
@@ -28,6 +28,9 @@ fn bar2(baz: String) -> impl Generator<Yield = String, Return = ()> {
 }
 
 fn main() {
-    assert_eq!(Pin::new(&mut bar(String::new())).resume(), GeneratorState::Yielded(String::new()));
-    assert_eq!(Pin::new(&mut bar2(String::new())).resume(), GeneratorState::Complete(()));
+    assert_eq!(
+        Pin::new(&mut bar(String::new())).resume(()),
+        GeneratorState::Yielded(String::new())
+    );
+    assert_eq!(Pin::new(&mut bar2(String::new())).resume(()), GeneratorState::Complete(()));
 }
diff --git a/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs b/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs
index e3d1902934..187c374021 100644
--- a/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs
+++ b/src/test/ui/generator/issue-61442-stmt-expr-with-drop.rs
@@ -18,12 +18,12 @@ fn drop_and_yield() {
         String::new();
         yield;
     };
-    Box::pin(x).as_mut().resume();
+    Box::pin(x).as_mut().resume(());
     let y = static || {
         String::new();
         yield;
     };
-    Box::pin(y).as_mut().resume();
+    Box::pin(y).as_mut().resume(());
 }
 
 fn main() {
diff --git a/src/test/ui/generator/issue-64620-yield-array-element.rs b/src/test/ui/generator/issue-64620-yield-array-element.rs
new file mode 100644
index 0000000000..2cbe8f5161
--- /dev/null
+++ b/src/test/ui/generator/issue-64620-yield-array-element.rs
@@ -0,0 +1,9 @@
+// Regression test for #64620
+
+#![feature(generators)]
+
+pub fn crash(arr: [usize; 1]) {
+    yield arr[0]; //~ ERROR: yield expression outside of generator literal
+}
+
+fn main() {}
diff --git a/src/test/ui/generator/issue-64620-yield-array-element.stderr b/src/test/ui/generator/issue-64620-yield-array-element.stderr
new file mode 100644
index 0000000000..48383c2ed0
--- /dev/null
+++ b/src/test/ui/generator/issue-64620-yield-array-element.stderr
@@ -0,0 +1,9 @@
+error[E0627]: yield expression outside of generator literal
+  --> $DIR/issue-64620-yield-array-element.rs:6:5
+   |
+LL |     yield arr[0];
+   |     ^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0627`.
diff --git a/src/test/ui/generator/issue-69017.rs b/src/test/ui/generator/issue-69017.rs
new file mode 100644
index 0000000000..511deb60e4
--- /dev/null
+++ b/src/test/ui/generator/issue-69017.rs
@@ -0,0 +1,18 @@
+// This issue reproduces an ICE on compile
+// Fails on 2020-02-08 nightly
+// regressed commit: https://github.com/rust-lang/rust/commit/f8fd4624474a68bd26694eff3536b9f3a127b2d3
+//
+// check-pass
+
+#![feature(generator_trait)]
+#![feature(generators)]
+
+use std::ops::Generator;
+
+fn gen() -> impl Generator<usize> {
+    |_: usize| {
+        println!("-> {}", yield);
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/generator/issue-69039.rs b/src/test/ui/generator/issue-69039.rs
new file mode 100644
index 0000000000..60004f3b0a
--- /dev/null
+++ b/src/test/ui/generator/issue-69039.rs
@@ -0,0 +1,30 @@
+// run-pass
+
+#![feature(generators, generator_trait)]
+
+use std::ops::{Generator, GeneratorState};
+
+fn my_scenario() -> impl Generator<String, Yield = &'static str, Return = String> {
+    |_arg: String| {
+        let my_name = yield "What is your name?";
+        let my_mood = yield "How are you feeling?";
+        format!("{} is {}", my_name.trim(), my_mood.trim())
+    }
+}
+
+fn main() {
+    let mut my_session = Box::pin(my_scenario());
+
+    assert_eq!(
+        my_session.as_mut().resume("_arg".to_string()),
+        GeneratorState::Yielded("What is your name?")
+    );
+    assert_eq!(
+        my_session.as_mut().resume("Your Name".to_string()),
+        GeneratorState::Yielded("How are you feeling?")
+    );
+    assert_eq!(
+        my_session.as_mut().resume("Sensory Organs".to_string()),
+        GeneratorState::Complete("Your Name is Sensory Organs".to_string())
+    );
+}
diff --git a/src/test/ui/generator/iterator-count.rs b/src/test/ui/generator/iterator-count.rs
index ac7e122dd5..90eefe02f6 100644
--- a/src/test/ui/generator/iterator-count.rs
+++ b/src/test/ui/generator/iterator-count.rs
@@ -10,18 +10,18 @@ struct W<T>(T);
 
 // This impl isn't safe in general, but the generator used in this test is movable
 // so it won't cause problems.
-impl<T: Generator<Return = ()> + Unpin> Iterator for W<T> {
+impl<T: Generator<(), Return = ()> + Unpin> Iterator for W<T> {
     type Item = T::Yield;
 
     fn next(&mut self) -> Option<Self::Item> {
-        match Pin::new(&mut self.0).resume() {
+        match Pin::new(&mut self.0).resume(()) {
             GeneratorState::Complete(..) => None,
             GeneratorState::Yielded(v) => Some(v),
         }
     }
 }
 
-fn test() -> impl Generator<Return=(), Yield=u8> + Unpin {
+fn test() -> impl Generator<(), Return=(), Yield=u8> + Unpin {
     || {
         for i in 1..6 {
             yield i
diff --git a/src/test/ui/generator/live-upvar-across-yield.rs b/src/test/ui/generator/live-upvar-across-yield.rs
index a1064165b2..6a2e42a557 100644
--- a/src/test/ui/generator/live-upvar-across-yield.rs
+++ b/src/test/ui/generator/live-upvar-across-yield.rs
@@ -10,5 +10,5 @@ fn main() {
     let mut a = || {
         b(yield);
     };
-    Pin::new(&mut a).resume();
+    Pin::new(&mut a).resume(());
 }
diff --git a/src/test/ui/generator/nested_generators.rs b/src/test/ui/generator/nested_generators.rs
index b56cce1dc4..45519150ee 100644
--- a/src/test/ui/generator/nested_generators.rs
+++ b/src/test/ui/generator/nested_generators.rs
@@ -11,7 +11,7 @@ fn main() {
             yield 2;
         };
 
-        match Pin::new(&mut sub_generator).resume() {
+        match Pin::new(&mut sub_generator).resume(()) {
             GeneratorState::Yielded(x) => {
                 yield x;
             }
diff --git a/src/test/ui/generator/no-parameters-on-generators.rs b/src/test/ui/generator/no-parameters-on-generators.rs
deleted file mode 100644
index 6b5a557933..0000000000
--- a/src/test/ui/generator/no-parameters-on-generators.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![feature(generators)]
-
-fn main() {
-    let gen = |start| { //~ ERROR generators cannot have explicit parameters
-        //~^ ERROR type inside generator must be known in this context
-        yield;
-    };
-}
diff --git a/src/test/ui/generator/no-parameters-on-generators.stderr b/src/test/ui/generator/no-parameters-on-generators.stderr
deleted file mode 100644
index 5e8e043a39..0000000000
--- a/src/test/ui/generator/no-parameters-on-generators.stderr
+++ /dev/null
@@ -1,21 +0,0 @@
-error[E0628]: generators cannot have explicit parameters
-  --> $DIR/no-parameters-on-generators.rs:4:15
-   |
-LL |     let gen = |start| {
-   |               ^^^^^^^
-
-error[E0698]: type inside generator must be known in this context
-  --> $DIR/no-parameters-on-generators.rs:4:16
-   |
-LL |     let gen = |start| {
-   |                ^^^^^ cannot infer type
-   |
-note: the type is part of the generator because of this `yield`
-  --> $DIR/no-parameters-on-generators.rs:6:9
-   |
-LL |         yield;
-   |         ^^^^^
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0698`.
diff --git a/src/test/ui/generator/not-send-sync.stderr b/src/test/ui/generator/not-send-sync.stderr
index 18d9012b3a..0ac1d189b7 100644
--- a/src/test/ui/generator/not-send-sync.stderr
+++ b/src/test/ui/generator/not-send-sync.stderr
@@ -20,7 +20,7 @@ LL |     fn assert_sync<T: Sync>(_: T) {}
 LL |     assert_sync(|| {
    |     ^^^^^^^^^^^ future returned by `main` is not `Sync`
    |
-   = help: within `[generator@$DIR/not-send-sync.rs:9:17: 13:6 {std::cell::Cell<i32>, (), ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell<i32>`
+   = help: within `[generator@$DIR/not-send-sync.rs:9:17: 13:6 {std::cell::Cell<i32>, ()}]`, the trait `std::marker::Sync` is not implemented for `std::cell::Cell<i32>`
 note: future is not `Sync` as this value is used across an yield
   --> $DIR/not-send-sync.rs:12:9
    |
diff --git a/src/test/ui/generator/panic-drops-resume.rs b/src/test/ui/generator/panic-drops-resume.rs
new file mode 100644
index 0000000000..29f4788b27
--- /dev/null
+++ b/src/test/ui/generator/panic-drops-resume.rs
@@ -0,0 +1,37 @@
+//! Tests that panics inside a generator will correctly drop the initial resume argument.
+
+// run-pass
+// ignore-wasm       no unwind support
+// ignore-emscripten no unwind support
+
+#![feature(generators, generator_trait)]
+
+use std::ops::Generator;
+use std::panic::{catch_unwind, AssertUnwindSafe};
+use std::pin::Pin;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+static DROP: AtomicUsize = AtomicUsize::new(0);
+
+struct Dropper {}
+
+impl Drop for Dropper {
+    fn drop(&mut self) {
+        DROP.fetch_add(1, Ordering::SeqCst);
+    }
+}
+
+fn main() {
+    let mut gen = |_arg| {
+        if true {
+            panic!();
+        }
+        yield ();
+    };
+    let mut gen = Pin::new(&mut gen);
+
+    assert_eq!(DROP.load(Ordering::Acquire), 0);
+    let res = catch_unwind(AssertUnwindSafe(|| gen.as_mut().resume(Dropper {})));
+    assert!(res.is_err());
+    assert_eq!(DROP.load(Ordering::Acquire), 1);
+}
diff --git a/src/test/ui/generator/panic-drops.rs b/src/test/ui/generator/panic-drops.rs
index f88687858f..c9a201725a 100644
--- a/src/test/ui/generator/panic-drops.rs
+++ b/src/test/ui/generator/panic-drops.rs
@@ -35,7 +35,7 @@ fn main() {
 
     assert_eq!(A.load(Ordering::SeqCst), 0);
     let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        Pin::new(&mut foo).resume()
+        Pin::new(&mut foo).resume(())
     }));
     assert!(res.is_err());
     assert_eq!(A.load(Ordering::SeqCst), 1);
@@ -50,7 +50,7 @@ fn main() {
 
     assert_eq!(A.load(Ordering::SeqCst), 1);
     let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        Pin::new(&mut foo).resume()
+        Pin::new(&mut foo).resume(())
     }));
     assert!(res.is_err());
     assert_eq!(A.load(Ordering::SeqCst), 1);
diff --git a/src/test/ui/generator/panic-safe.rs b/src/test/ui/generator/panic-safe.rs
index 5f6778674d..500a3c9c29 100644
--- a/src/test/ui/generator/panic-safe.rs
+++ b/src/test/ui/generator/panic-safe.rs
@@ -17,13 +17,13 @@ fn main() {
     };
 
     let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-        Pin::new(&mut foo).resume()
+        Pin::new(&mut foo).resume(())
     }));
     assert!(res.is_err());
 
     for _ in 0..10 {
         let res = panic::catch_unwind(panic::AssertUnwindSafe(|| {
-            Pin::new(&mut foo).resume()
+            Pin::new(&mut foo).resume(())
         }));
         assert!(res.is_err());
     }
diff --git a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
index de533e4d5f..9986220218 100644
--- a/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
+++ b/src/test/ui/generator/ref-escapes-but-not-over-yield.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of generator
   --> $DIR/ref-escapes-but-not-over-yield.rs:11:9
    |
 LL |     let mut a = &3;
-   |         ----- `a` is declared here, outside of the generator body
+   |         ----- `a` declared here, outside of the generator body
 ...
 LL |         a = &b;
    |         ^^^^--
diff --git a/src/test/ui/generator/resume-after-return.rs b/src/test/ui/generator/resume-after-return.rs
index 71a68ff684..efed08bd47 100644
--- a/src/test/ui/generator/resume-after-return.rs
+++ b/src/test/ui/generator/resume-after-return.rs
@@ -16,12 +16,12 @@ fn main() {
         yield;
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
 
-    match panic::catch_unwind(move || Pin::new(&mut foo).resume()) {
+    match panic::catch_unwind(move || Pin::new(&mut foo).resume(())) {
         Ok(_) => panic!("generator successfully resumed"),
         Err(_) => {}
     }
diff --git a/src/test/ui/generator/resume-arg-late-bound.rs b/src/test/ui/generator/resume-arg-late-bound.rs
new file mode 100644
index 0000000000..87b1f1a065
--- /dev/null
+++ b/src/test/ui/generator/resume-arg-late-bound.rs
@@ -0,0 +1,17 @@
+//! Tests that we cannot produce a generator that accepts a resume argument
+//! with any lifetime and then stores it across a `yield`.
+
+#![feature(generators, generator_trait)]
+
+use std::ops::Generator;
+
+fn test(a: impl for<'a> Generator<&'a mut bool>) {}
+
+fn main() {
+    let gen = |arg: &mut bool| {
+        yield ();
+        *arg = true;
+    };
+    test(gen);
+    //~^ ERROR type mismatch in function arguments
+}
diff --git a/src/test/ui/generator/resume-arg-late-bound.stderr b/src/test/ui/generator/resume-arg-late-bound.stderr
new file mode 100644
index 0000000000..7719d5123f
--- /dev/null
+++ b/src/test/ui/generator/resume-arg-late-bound.stderr
@@ -0,0 +1,15 @@
+error[E0631]: type mismatch in function arguments
+  --> $DIR/resume-arg-late-bound.rs:15:10
+   |
+LL | fn test(a: impl for<'a> Generator<&'a mut bool>) {}
+   |    ----         ------------------------------- required by this bound in `test`
+...
+LL |     test(gen);
+   |          ^^^
+   |          |
+   |          expected signature of `for<'a> fn(&'a mut bool) -> _`
+   |          found signature of `fn(&mut bool) -> _`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0631`.
diff --git a/src/test/ui/generator/resume-live-across-yield.rs b/src/test/ui/generator/resume-live-across-yield.rs
new file mode 100644
index 0000000000..4c4cf117a5
--- /dev/null
+++ b/src/test/ui/generator/resume-live-across-yield.rs
@@ -0,0 +1,45 @@
+// run-pass
+
+#![feature(generators, generator_trait)]
+
+use std::ops::{Generator, GeneratorState};
+use std::pin::Pin;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+static DROP: AtomicUsize = AtomicUsize::new(0);
+
+#[derive(PartialEq, Eq, Debug)]
+struct Dropper(String);
+
+impl Drop for Dropper {
+    fn drop(&mut self) {
+        DROP.fetch_add(1, Ordering::SeqCst);
+    }
+}
+
+fn main() {
+    let mut g = |mut _d| {
+        _d = yield;
+        _d
+    };
+
+    let mut g = Pin::new(&mut g);
+
+    assert_eq!(
+        g.as_mut().resume(Dropper(String::from("Hello world!"))),
+        GeneratorState::Yielded(())
+    );
+    assert_eq!(DROP.load(Ordering::Acquire), 0);
+    match g.as_mut().resume(Dropper(String::from("Number Two"))) {
+        GeneratorState::Complete(dropper) => {
+            assert_eq!(DROP.load(Ordering::Acquire), 1);
+            assert_eq!(dropper.0, "Number Two");
+            drop(dropper);
+            assert_eq!(DROP.load(Ordering::Acquire), 2);
+        }
+        _ => unreachable!(),
+    }
+
+    drop(g);
+    assert_eq!(DROP.load(Ordering::Acquire), 2);
+}
diff --git a/src/test/ui/generator/retain-resume-ref.rs b/src/test/ui/generator/retain-resume-ref.rs
new file mode 100644
index 0000000000..0606ea71cd
--- /dev/null
+++ b/src/test/ui/generator/retain-resume-ref.rs
@@ -0,0 +1,25 @@
+//! This test ensures that a mutable reference cannot be passed as a resume argument twice.
+
+#![feature(generators, generator_trait)]
+
+use std::marker::Unpin;
+use std::ops::{
+    Generator,
+    GeneratorState::{self, *},
+};
+use std::pin::Pin;
+
+fn main() {
+    let mut thing = String::from("hello");
+
+    let mut gen = |r| {
+        if false {
+            yield r;
+        }
+    };
+
+    let mut gen = Pin::new(&mut gen);
+    gen.as_mut().resume(&mut thing);
+    gen.as_mut().resume(&mut thing);
+    //~^ cannot borrow `thing` as mutable more than once at a time
+}
diff --git a/src/test/ui/generator/retain-resume-ref.stderr b/src/test/ui/generator/retain-resume-ref.stderr
new file mode 100644
index 0000000000..bc715c7030
--- /dev/null
+++ b/src/test/ui/generator/retain-resume-ref.stderr
@@ -0,0 +1,14 @@
+error[E0499]: cannot borrow `thing` as mutable more than once at a time
+  --> $DIR/retain-resume-ref.rs:23:25
+   |
+LL |     gen.as_mut().resume(&mut thing);
+   |                         ---------- first mutable borrow occurs here
+LL |     gen.as_mut().resume(&mut thing);
+   |                         ^^^^^^^^^^ second mutable borrow occurs here
+LL |
+LL | }
+   | - first borrow might be used here, when `gen` is dropped and runs the destructor for generator
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/generator/sized-yield.rs b/src/test/ui/generator/sized-yield.rs
index f64849b314..c6dd738d6a 100644
--- a/src/test/ui/generator/sized-yield.rs
+++ b/src/test/ui/generator/sized-yield.rs
@@ -9,6 +9,6 @@ fn main() {
    //~^ ERROR the size for values of type
        yield s[..];
    };
-   Pin::new(&mut gen).resume();
+   Pin::new(&mut gen).resume(());
    //~^ ERROR the size for values of type
 }
diff --git a/src/test/ui/generator/sized-yield.stderr b/src/test/ui/generator/sized-yield.stderr
index c2caac7ebe..79aeec2ec0 100644
--- a/src/test/ui/generator/sized-yield.stderr
+++ b/src/test/ui/generator/sized-yield.stderr
@@ -15,7 +15,7 @@ LL | |    };
 error[E0277]: the size for values of type `str` cannot be known at compilation time
   --> $DIR/sized-yield.rs:12:23
    |
-LL |    Pin::new(&mut gen).resume();
+LL |    Pin::new(&mut gen).resume(());
    |                       ^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `str`
diff --git a/src/test/ui/generator/smoke-resume-args.rs b/src/test/ui/generator/smoke-resume-args.rs
new file mode 100644
index 0000000000..32f3ee32d7
--- /dev/null
+++ b/src/test/ui/generator/smoke-resume-args.rs
@@ -0,0 +1,97 @@
+// run-pass
+
+#![feature(generators, generator_trait)]
+
+use std::fmt::Debug;
+use std::marker::Unpin;
+use std::ops::{
+    Generator,
+    GeneratorState::{self, *},
+};
+use std::pin::Pin;
+use std::sync::atomic::{AtomicUsize, Ordering};
+
+fn drain<G: Generator<R, Yield = Y> + Unpin, R, Y>(
+    gen: &mut G,
+    inout: Vec<(R, GeneratorState<Y, G::Return>)>,
+) where
+    Y: Debug + PartialEq,
+    G::Return: Debug + PartialEq,
+{
+    let mut gen = Pin::new(gen);
+
+    for (input, out) in inout {
+        assert_eq!(gen.as_mut().resume(input), out);
+    }
+}
+
+static DROPS: AtomicUsize = AtomicUsize::new(0);
+
+#[derive(Debug, PartialEq)]
+struct DropMe;
+
+impl Drop for DropMe {
+    fn drop(&mut self) {
+        DROPS.fetch_add(1, Ordering::SeqCst);
+    }
+}
+
+fn expect_drops<T>(expected_drops: usize, f: impl FnOnce() -> T) -> T {
+    DROPS.store(0, Ordering::SeqCst);
+
+    let res = f();
+
+    let actual_drops = DROPS.load(Ordering::SeqCst);
+    assert_eq!(actual_drops, expected_drops);
+    res
+}
+
+fn main() {
+    drain(
+        &mut |mut b| {
+            while b != 0 {
+                b = yield (b + 1);
+            }
+            -1
+        },
+        vec![(1, Yielded(2)), (-45, Yielded(-44)), (500, Yielded(501)), (0, Complete(-1))],
+    );
+
+    expect_drops(2, || drain(&mut |a| yield a, vec![(DropMe, Yielded(DropMe))]));
+
+    expect_drops(6, || {
+        drain(
+            &mut |a| yield yield a,
+            vec![(DropMe, Yielded(DropMe)), (DropMe, Yielded(DropMe)), (DropMe, Complete(DropMe))],
+        )
+    });
+
+    #[allow(unreachable_code)]
+    expect_drops(2, || drain(&mut |a| yield return a, vec![(DropMe, Complete(DropMe))]));
+
+    expect_drops(2, || {
+        drain(
+            &mut |a: DropMe| {
+                if false { yield () } else { a }
+            },
+            vec![(DropMe, Complete(DropMe))],
+        )
+    });
+
+    expect_drops(4, || {
+        drain(
+            #[allow(unused_assignments, unused_variables)]
+            &mut |mut a: DropMe| {
+                a = yield;
+                a = yield;
+                a = yield;
+            },
+            vec![
+                (DropMe, Yielded(())),
+                (DropMe, Yielded(())),
+                (DropMe, Yielded(())),
+                (DropMe, Complete(())),
+            ],
+        )
+    });
+}
diff --git a/src/test/ui/generator/smoke.rs b/src/test/ui/generator/smoke.rs
index 533f239908..9289710b34 100644
--- a/src/test/ui/generator/smoke.rs
+++ b/src/test/ui/generator/smoke.rs
@@ -17,7 +17,7 @@ fn simple() {
         }
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
@@ -33,7 +33,7 @@ fn return_capture() {
         a
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
@@ -45,11 +45,11 @@ fn simple_yield() {
         yield;
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Yielded(()) => {}
         s => panic!("bad state: {:?}", s),
     }
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
@@ -62,11 +62,11 @@ fn yield_capture() {
         yield b;
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Yielded(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
@@ -79,11 +79,11 @@ fn simple_yield_value() {
         return String::from("foo")
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Yielded(ref s) if *s == "bar" => {}
         s => panic!("bad state: {:?}", s),
     }
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
@@ -97,11 +97,11 @@ fn return_after_yield() {
         return a
     };
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Yielded(()) => {}
         s => panic!("bad state: {:?}", s),
     }
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(ref s) if *s == "foo" => {}
         s => panic!("bad state: {:?}", s),
     }
@@ -149,11 +149,11 @@ fn send_and_sync() {
 fn send_over_threads() {
     let mut foo = || { yield };
     thread::spawn(move || {
-        match Pin::new(&mut foo).resume() {
+        match Pin::new(&mut foo).resume(()) {
             GeneratorState::Yielded(()) => {}
             s => panic!("bad state: {:?}", s),
         }
-        match Pin::new(&mut foo).resume() {
+        match Pin::new(&mut foo).resume(()) {
             GeneratorState::Complete(()) => {}
             s => panic!("bad state: {:?}", s),
         }
@@ -162,11 +162,11 @@ fn send_over_threads() {
     let a = String::from("a");
     let mut foo = || { yield a };
     thread::spawn(move || {
-        match Pin::new(&mut foo).resume() {
+        match Pin::new(&mut foo).resume(()) {
             GeneratorState::Yielded(ref s) if *s == "a" => {}
             s => panic!("bad state: {:?}", s),
         }
-        match Pin::new(&mut foo).resume() {
+        match Pin::new(&mut foo).resume(()) {
             GeneratorState::Complete(()) => {}
             s => panic!("bad state: {:?}", s),
         }
diff --git a/src/test/ui/generator/static-generators.rs b/src/test/ui/generator/static-generators.rs
index 965d3c61c2..3980766c42 100644
--- a/src/test/ui/generator/static-generators.rs
+++ b/src/test/ui/generator/static-generators.rs
@@ -15,6 +15,6 @@ fn main() {
     // Safety: We shadow the original generator variable so have no safe API to
     // move it after this point.
     let mut generator = unsafe { Pin::new_unchecked(&mut generator) };
-    assert_eq!(generator.as_mut().resume(), GeneratorState::Yielded(()));
-    assert_eq!(generator.as_mut().resume(), GeneratorState::Complete(()));
+    assert_eq!(generator.as_mut().resume(()), GeneratorState::Yielded(()));
+    assert_eq!(generator.as_mut().resume(()), GeneratorState::Complete(()));
 }
diff --git a/src/test/ui/generator/static-not-unpin.rs b/src/test/ui/generator/static-not-unpin.rs
index b271e982fb..cfcb94737b 100644
--- a/src/test/ui/generator/static-not-unpin.rs
+++ b/src/test/ui/generator/static-not-unpin.rs
@@ -11,5 +11,5 @@ fn main() {
     let mut generator = static || {
         yield;
     };
-    assert_unpin(generator); //~ ERROR std::marker::Unpin` is not satisfied
+    assert_unpin(generator); //~ ERROR E0277
 }
diff --git a/src/test/ui/generator/static-not-unpin.stderr b/src/test/ui/generator/static-not-unpin.stderr
index f2b1078e2b..6512d67319 100644
--- a/src/test/ui/generator/static-not-unpin.stderr
+++ b/src/test/ui/generator/static-not-unpin.stderr
@@ -1,4 +1,4 @@
-error[E0277]: the trait bound `[static generator@$DIR/static-not-unpin.rs:11:25: 13:6 _]: std::marker::Unpin` is not satisfied
+error[E0277]: `[static generator@$DIR/static-not-unpin.rs:11:25: 13:6 _]` cannot be unpinned
   --> $DIR/static-not-unpin.rs:14:18
    |
 LL | fn assert_unpin<T: Unpin>(_: T) {
diff --git a/src/test/ui/generator/too-many-parameters.rs b/src/test/ui/generator/too-many-parameters.rs
new file mode 100644
index 0000000000..7a353ea298
--- /dev/null
+++ b/src/test/ui/generator/too-many-parameters.rs
@@ -0,0 +1,8 @@
+#![feature(generators)]
+
+fn main() {
+    |(), ()| {
+        //~^ error: too many parameters for a generator
+        yield;
+    };
+}
diff --git a/src/test/ui/generator/too-many-parameters.stderr b/src/test/ui/generator/too-many-parameters.stderr
new file mode 100644
index 0000000000..a297ee43de
--- /dev/null
+++ b/src/test/ui/generator/too-many-parameters.stderr
@@ -0,0 +1,8 @@
+error[E0628]: too many parameters for a generator (expected 0 or 1 parameters)
+  --> $DIR/too-many-parameters.rs:4:5
+   |
+LL |     |(), ()| {
+   |     ^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/generator/type-mismatch-error.rs b/src/test/ui/generator/type-mismatch-error.rs
new file mode 100644
index 0000000000..d39c788a84
--- /dev/null
+++ b/src/test/ui/generator/type-mismatch-error.rs
@@ -0,0 +1,22 @@
+//! Test that we get the expected type mismatch error instead of "closure is expected to take 0
+//! arguments" (which got introduced after implementing resume arguments).
+
+#![feature(generators, generator_trait)]
+
+use std::ops::Generator;
+
+fn f<G: Generator>(_: G, _: G::Return) {}
+
+fn main() {
+    f(
+        |a: u8| {
+            if false {
+                yield ();
+            } else {
+                a
+                //~^ error: `if` and `else` have incompatible types
+            }
+        },
+        0u8,
+    );
+}
diff --git a/src/test/ui/generator/type-mismatch-error.stderr b/src/test/ui/generator/type-mismatch-error.stderr
new file mode 100644
index 0000000000..8f5949533e
--- /dev/null
+++ b/src/test/ui/generator/type-mismatch-error.stderr
@@ -0,0 +1,19 @@
+error[E0308]: `if` and `else` have incompatible types
+  --> $DIR/type-mismatch-error.rs:16:17
+   |
+LL | /             if false {
+LL | |                 yield ();
+   | |                 ---------
+   | |                 |       |
+   | |                 |       help: consider removing this semicolon
+   | |                 expected because of this
+LL | |             } else {
+LL | |                 a
+   | |                 ^ expected `()`, found `u8`
+LL | |
+LL | |             }
+   | |_____________- `if` and `else` have incompatible types
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.rs b/src/test/ui/generator/type-mismatch-signature-deduction.rs
index b9c6bc5d07..7774ff48f5 100644
--- a/src/test/ui/generator/type-mismatch-signature-deduction.rs
+++ b/src/test/ui/generator/type-mismatch-signature-deduction.rs
@@ -2,15 +2,15 @@
 
 use std::ops::Generator;
 
-fn foo() -> impl Generator<Return = i32> {
+fn foo() -> impl Generator<Return = i32> { //~ ERROR type mismatch
     || {
         if false {
-            return Ok(6); //~ ERROR mismatched types [E0308]
+            return Ok(6);
         }
 
         yield ();
 
-        5
+        5 //~ ERROR mismatched types [E0308]
     }
 }
 
diff --git a/src/test/ui/generator/type-mismatch-signature-deduction.stderr b/src/test/ui/generator/type-mismatch-signature-deduction.stderr
index 8606ecd33d..8de77798ff 100644
--- a/src/test/ui/generator/type-mismatch-signature-deduction.stderr
+++ b/src/test/ui/generator/type-mismatch-signature-deduction.stderr
@@ -1,12 +1,23 @@
 error[E0308]: mismatched types
-  --> $DIR/type-mismatch-signature-deduction.rs:8:20
+  --> $DIR/type-mismatch-signature-deduction.rs:13:9
    |
-LL |             return Ok(6);
-   |                    ^^^^^ expected `i32`, found enum `std::result::Result`
+LL |         5
+   |         ^ expected enum `std::result::Result`, found integer
    |
-   = note: expected type `i32`
-              found enum `std::result::Result<{integer}, _>`
+   = note: expected type `std::result::Result<{integer}, _>`
+              found type `{integer}`
 
-error: aborting due to previous error
+error[E0271]: type mismatch resolving `<[generator@$DIR/type-mismatch-signature-deduction.rs:6:5: 14:6 _] as std::ops::Generator>::Return == i32`
+  --> $DIR/type-mismatch-signature-deduction.rs:5:13
+   |
+LL | fn foo() -> impl Generator<Return = i32> {
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected enum `std::result::Result`, found `i32`
+   |
+   = note: expected enum `std::result::Result<{integer}, _>`
+              found type `i32`
+   = note: the return type of a function must have a statically known size
+
+error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0308`.
+Some errors have detailed explanations: E0271, E0308.
+For more information about an error, try `rustc --explain E0271`.
diff --git a/src/test/ui/generator/xcrate-reachable.rs b/src/test/ui/generator/xcrate-reachable.rs
index 9483ad7395..1b1cff3387 100644
--- a/src/test/ui/generator/xcrate-reachable.rs
+++ b/src/test/ui/generator/xcrate-reachable.rs
@@ -10,5 +10,5 @@ use std::ops::Generator;
 use std::pin::Pin;
 
 fn main() {
-    Pin::new(&mut foo::foo()).resume();
+    Pin::new(&mut foo::foo()).resume(());
 }
diff --git a/src/test/ui/generator/xcrate.rs b/src/test/ui/generator/xcrate.rs
index febf5c3583..40986bbeb6 100644
--- a/src/test/ui/generator/xcrate.rs
+++ b/src/test/ui/generator/xcrate.rs
@@ -12,18 +12,18 @@ use std::pin::Pin;
 fn main() {
     let mut foo = xcrate::foo();
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
 
     let mut foo = xcrate::bar(3);
 
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Yielded(3) => {}
         s => panic!("bad state: {:?}", s),
     }
-    match Pin::new(&mut foo).resume() {
+    match Pin::new(&mut foo).resume(()) {
         GeneratorState::Complete(()) => {}
         s => panic!("bad state: {:?}", s),
     }
diff --git a/src/test/ui/generator/yield-while-iterating.rs b/src/test/ui/generator/yield-while-iterating.rs
index e42781d127..985e5d8bdc 100644
--- a/src/test/ui/generator/yield-while-iterating.rs
+++ b/src/test/ui/generator/yield-while-iterating.rs
@@ -43,7 +43,7 @@ fn yield_during_iter_borrowed_slice_3() {
             yield p;
         }
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn yield_during_iter_borrowed_slice_4() {
@@ -56,7 +56,7 @@ fn yield_during_iter_borrowed_slice_4() {
         }
     };
     println!("{}", x[0]); //~ ERROR
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn yield_during_range_iter() {
@@ -69,7 +69,7 @@ fn yield_during_range_iter() {
             yield x;
         }
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn main() { }
diff --git a/src/test/ui/generator/yield-while-iterating.stderr b/src/test/ui/generator/yield-while-iterating.stderr
index 6a96b25b19..b656347523 100644
--- a/src/test/ui/generator/yield-while-iterating.stderr
+++ b/src/test/ui/generator/yield-while-iterating.stderr
@@ -16,7 +16,7 @@ LL |         for p in &mut x {
 ...
 LL |     println!("{}", x[0]);
    |                    ^ immutable borrow occurs here
-LL |     Pin::new(&mut b).resume();
+LL |     Pin::new(&mut b).resume(());
    |              ------ mutable borrow later used here
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/generator/yield-while-local-borrowed.rs b/src/test/ui/generator/yield-while-local-borrowed.rs
index b643bbf337..061a64dbc3 100644
--- a/src/test/ui/generator/yield-while-local-borrowed.rs
+++ b/src/test/ui/generator/yield-while-local-borrowed.rs
@@ -15,7 +15,7 @@ fn borrow_local_inline() {
         yield();
         println!("{}", a);
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn borrow_local_inline_done() {
@@ -26,7 +26,7 @@ fn borrow_local_inline_done() {
         }
         yield();
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn borrow_local() {
@@ -43,7 +43,7 @@ fn borrow_local() {
             println!("{}", b);
         }
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn main() { }
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.rs b/src/test/ui/generator/yield-while-ref-reborrowed.rs
index f54a4f468f..a03ef945dd 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.rs
+++ b/src/test/ui/generator/yield-while-ref-reborrowed.rs
@@ -12,7 +12,7 @@ fn reborrow_shared_ref(x: &i32) {
         yield();
         println!("{}", a);
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn reborrow_mutable_ref(x: &mut i32) {
@@ -23,7 +23,7 @@ fn reborrow_mutable_ref(x: &mut i32) {
         yield();
         println!("{}", a);
     };
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn reborrow_mutable_ref_2(x: &mut i32) {
@@ -34,7 +34,7 @@ fn reborrow_mutable_ref_2(x: &mut i32) {
         println!("{}", a);
     };
     println!("{}", x); //~ ERROR
-    Pin::new(&mut b).resume();
+    Pin::new(&mut b).resume(());
 }
 
 fn main() { }
diff --git a/src/test/ui/generator/yield-while-ref-reborrowed.stderr b/src/test/ui/generator/yield-while-ref-reborrowed.stderr
index 4c37cd3517..fd885660d0 100644
--- a/src/test/ui/generator/yield-while-ref-reborrowed.stderr
+++ b/src/test/ui/generator/yield-while-ref-reborrowed.stderr
@@ -8,7 +8,7 @@ LL |         let a = &mut *x;
 ...
 LL |     println!("{}", x);
    |                    ^ second borrow occurs here
-LL |     Pin::new(&mut b).resume();
+LL |     Pin::new(&mut b).resume(());
    |              ------ first borrow later used here
 
 error: aborting due to previous error
diff --git a/src/test/ui/generic-associated-types/collections.stderr b/src/test/ui/generic-associated-types/collections.stderr
index e99ae78f71..fb06d5e49a 100644
--- a/src/test/ui/generic-associated-types/collections.stderr
+++ b/src/test/ui/generic-associated-types/collections.stderr
@@ -5,7 +5,7 @@ LL | /     type Sibling<U>: Collection<U> =
 LL | |         <<Self as Collection<T>>::Family as CollectionFamily>::Member<U>;
    | |_________________________________________________________________________^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/collections.rs:25:5
@@ -13,7 +13,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Member<T>: Collection<T, Family = Self>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/generic-associated-types/empty_generics.stderr b/src/test/ui/generic-associated-types/empty_generics.stderr
index d3acad4783..bd5708d814 100644
--- a/src/test/ui/generic-associated-types/empty_generics.stderr
+++ b/src/test/ui/generic-associated-types/empty_generics.stderr
@@ -1,8 +1,13 @@
 error: expected one of `>`, `const`, identifier, or lifetime, found `,`
   --> $DIR/empty_generics.rs:5:14
    |
+LL | trait Foo {
+   |           - while parsing this item list starting here
 LL |     type Bar<,>;
    |              ^ expected one of `>`, `const`, identifier, or lifetime
+LL |
+LL | }
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature-2.stderr b/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature-2.stderr
index a7d280d635..f3da27775a 100644
--- a/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature-2.stderr
+++ b/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature-2.stderr
@@ -4,7 +4,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Item<T>;
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0658]: generic associated types are unstable
@@ -13,7 +13,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Item<T> = T;
    |     ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error: type-generic associated types are not yet implemented
@@ -22,7 +22,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Item<T>;
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature.stderr b/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature.stderr
index 9031071ff6..ec36886f7b 100644
--- a/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature.stderr
+++ b/src/test/ui/generic-associated-types/gat-dont-ice-on-absent-feature.stderr
@@ -4,7 +4,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Item<'b> = &'b Foo;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error[E0195]: lifetime parameters or bounds on type `Item` do not match the trait declaration
diff --git a/src/test/ui/generic-associated-types/generic-associated-types-where.stderr b/src/test/ui/generic-associated-types/generic-associated-types-where.stderr
index 2144a5e7d9..fb29b377a1 100644
--- a/src/test/ui/generic-associated-types/generic-associated-types-where.stderr
+++ b/src/test/ui/generic-associated-types/generic-associated-types-where.stderr
@@ -4,7 +4,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Assoc2<T> where T: Display;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/generic-associated-types-where.rs:13:5
@@ -12,7 +12,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Assoc3<T>;
    |     ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/generic-associated-types-where.rs:15:5
@@ -20,7 +20,7 @@ error: type-generic associated types are not yet implemented
 LL |     type WithDefault<'a, T: Debug + 'a> = dyn Iterator<Item=T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/generic-associated-types/impl_bounds.stderr b/src/test/ui/generic-associated-types/impl_bounds.stderr
index ca2350ff75..486b538045 100644
--- a/src/test/ui/generic-associated-types/impl_bounds.stderr
+++ b/src/test/ui/generic-associated-types/impl_bounds.stderr
@@ -31,12 +31,14 @@ LL |     type B<'a, 'b> where 'b: 'a = (&'a(), &'b ());
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/impl_bounds.rs:19:5
    |
-LL | impl<T> Foo for Fooy<T> {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-...
 LL |     type C where Self: Copy = String;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
    |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/impl_bounds.rs:14:6
+   |
+LL | impl<T> Foo for Fooy<T> {
+   |      ^
    = note: required because of the requirements on the impl of `std::marker::Copy` for `Fooy<T>`
    = note: the requirement `Fooy<T>: std::marker::Copy` appears on the associated impl type but not on the corresponding associated trait type
 
diff --git a/src/test/ui/generic-associated-types/issue-47206-where-clause.stderr b/src/test/ui/generic-associated-types/issue-47206-where-clause.stderr
index 52207d759b..c9c1a4753b 100644
--- a/src/test/ui/generic-associated-types/issue-47206-where-clause.stderr
+++ b/src/test/ui/generic-associated-types/issue-47206-where-clause.stderr
@@ -4,7 +4,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Assoc3<T>;
    |     ^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs b/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs
index 60466d0bcd..1a79dbf227 100644
--- a/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs
+++ b/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.rs
@@ -4,8 +4,8 @@
 // FIXME(generic-associated-types) Investigate why this doesn't compile.
 
 trait Iterator {
-    //~^ ERROR the requirement `for<'a> <Self as Iterator>::Item<'a>: 'a` is not satisfied
     type Item<'a>: 'a;
+    //~^ ERROR the requirement `for<'a> <Self as Iterator>::Item<'a>: 'a` is not satisfied
 }
 
 fn main() {}
diff --git a/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.stderr b/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.stderr
index 4dc69cdd1d..6874239623 100644
--- a/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.stderr
+++ b/src/test/ui/generic-associated-types/issue-62326-parameter-out-of-range.stderr
@@ -1,15 +1,10 @@
 error[E0280]: the requirement `for<'a> <Self as Iterator>::Item<'a>: 'a` is not satisfied
-  --> $DIR/issue-62326-parameter-out-of-range.rs:6:1
+  --> $DIR/issue-62326-parameter-out-of-range.rs:7:20
    |
-LL |   trait Iterator {
-   |   ^-------------
-   |   |
-   |  _required by `Iterator`
-   | |
-LL | |
-LL | |     type Item<'a>: 'a;
-LL | | }
-   | |_^
+LL | trait Iterator {
+   | -------------- required by `Iterator`
+LL |     type Item<'a>: 'a;
+   |                    ^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/issue-67424.stderr b/src/test/ui/generic-associated-types/issue-67424.stderr
index 59ff8ac0a3..8b08c71759 100644
--- a/src/test/ui/generic-associated-types/issue-67424.stderr
+++ b/src/test/ui/generic-associated-types/issue-67424.stderr
@@ -4,7 +4,7 @@ error[E0658]: generic associated types are unstable
 LL |     type Type1<B>: Trait1<A=B>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
    = help: add `#![feature(generic_associated_types)]` to the crate attributes to enable
 
 error: type-generic associated types are not yet implemented
@@ -13,7 +13,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Type1<B>: Trait1<A=B>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/generic-associated-types/issue-68653.rs b/src/test/ui/generic-associated-types/issue-68653.rs
new file mode 100644
index 0000000000..01f4c95639
--- /dev/null
+++ b/src/test/ui/generic-associated-types/issue-68653.rs
@@ -0,0 +1,16 @@
+// A regression test for #68653, which was fixed by #68938.
+
+// check-pass
+
+#![allow(incomplete_features)]
+#![feature(generic_associated_types)]
+
+trait Fun {
+    type F<'a: 'a>;
+}
+
+impl <T> Fun for T {
+    type F<'a> = Self;
+}
+
+fn main() {}
diff --git a/src/test/ui/generic-associated-types/iterable.stderr b/src/test/ui/generic-associated-types/iterable.stderr
index d0d75f3cc6..ccb1c9bcc7 100644
--- a/src/test/ui/generic-associated-types/iterable.stderr
+++ b/src/test/ui/generic-associated-types/iterable.stderr
@@ -25,16 +25,13 @@ LL |     type Item<'a> where T: 'a = <std::slice::Iter<'a, T> as Iterator>::Item
    = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
 
 error[E0271]: type mismatch resolving `for<'a> <<std::vec::Vec<T> as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <std::vec::Vec<T> as Iterable>::Item<'a>`
-  --> $DIR/iterable.rs:19:5
+  --> $DIR/iterable.rs:19:30
    |
-LL |   trait Iterable {
-   |   -------------- required by `Iterable`
+LL | trait Iterable {
+   | -------------- required by `Iterable`
 ...
-LL | /     fn iter<'a>(&'a self) -> Self::Iter<'a> {
-LL | |
-LL | |         self.iter()
-LL | |     }
-   | |_____^ expected associated type, found reference
+LL |     fn iter<'a>(&'a self) -> Self::Iter<'a> {
+   |                              ^^^^^^^^^^^^^^ expected associated type, found reference
    |
    = note: expected associated type `<std::vec::Vec<T> as Iterable>::Item<'_>`
                     found reference `&T`
@@ -42,16 +39,13 @@ LL | |     }
    = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
 
 error[E0271]: type mismatch resolving `for<'a> <<[T] as Iterable>::Iter<'a> as std::iter::Iterator>::Item == <[T] as Iterable>::Item<'a>`
-  --> $DIR/iterable.rs:31:5
+  --> $DIR/iterable.rs:31:30
    |
-LL |   trait Iterable {
-   |   -------------- required by `Iterable`
+LL | trait Iterable {
+   | -------------- required by `Iterable`
 ...
-LL | /     fn iter<'a>(&'a self) -> Self::Iter<'a> {
-LL | |
-LL | |         self.iter()
-LL | |     }
-   | |_____^ expected associated type, found reference
+LL |     fn iter<'a>(&'a self) -> Self::Iter<'a> {
+   |                              ^^^^^^^^^^^^^^ expected associated type, found reference
    |
    = note: expected associated type `<[T] as Iterable>::Item<'_>`
                     found reference `&T`
diff --git a/src/test/ui/generic-associated-types/parameter_number_and_kind.stderr b/src/test/ui/generic-associated-types/parameter_number_and_kind.stderr
index 6b5683611a..028ab72f48 100644
--- a/src/test/ui/generic-associated-types/parameter_number_and_kind.stderr
+++ b/src/test/ui/generic-associated-types/parameter_number_and_kind.stderr
@@ -4,7 +4,7 @@ error: type-generic associated types are not yet implemented
 LL |     type D<T>;
    |     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/parameter_number_and_kind.rs:11:5
@@ -12,7 +12,7 @@ error: type-generic associated types are not yet implemented
 LL |     type E<'a, T>;
    |     ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/parameter_number_and_kind.rs:14:5
@@ -20,7 +20,7 @@ error: type-generic associated types are not yet implemented
 LL |     type FOk<T> = Self::E<'static, T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/parameter_number_and_kind.rs:19:5
@@ -28,7 +28,7 @@ error: type-generic associated types are not yet implemented
 LL |     type FErr2<T> = Self::E<'static, T, u32>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error[E0107]: wrong number of lifetime arguments: expected 1, found 2
   --> $DIR/parameter_number_and_kind.rs:16:35
diff --git a/src/test/ui/generic-associated-types/pointer_family.stderr b/src/test/ui/generic-associated-types/pointer_family.stderr
index 2a784f8b9d..83fe992fcb 100644
--- a/src/test/ui/generic-associated-types/pointer_family.stderr
+++ b/src/test/ui/generic-associated-types/pointer_family.stderr
@@ -4,7 +4,7 @@ error: type-generic associated types are not yet implemented
 LL |     type Pointer<T>: Deref<Target = T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/generic-associated-types/shadowing.rs b/src/test/ui/generic-associated-types/shadowing.rs
index 7277c0d87c..5c308948bd 100644
--- a/src/test/ui/generic-associated-types/shadowing.rs
+++ b/src/test/ui/generic-associated-types/shadowing.rs
@@ -2,8 +2,8 @@
 #![feature(generic_associated_types)]
 
 trait Shadow<'a> {
-    //FIXME(#44265): The lifetime parameter shadowing should cause an error.
     type Bar<'a>;
+    //~^ ERROR lifetime name `'a` shadows a lifetime name that is already in scope
 }
 
 trait NoShadow<'a> {
@@ -11,8 +11,8 @@ trait NoShadow<'a> {
 }
 
 impl<'a> NoShadow<'a> for &'a u32 {
-    //FIXME(#44265): The lifetime parameter shadowing should cause an error.
     type Bar<'a> = i32;
+    //~^ ERROR lifetime name `'a` shadows a lifetime name that is already in scope
 }
 
 trait ShadowT<T> {
diff --git a/src/test/ui/generic-associated-types/shadowing.stderr b/src/test/ui/generic-associated-types/shadowing.stderr
index 50c12e822e..2d9a0d6fce 100644
--- a/src/test/ui/generic-associated-types/shadowing.stderr
+++ b/src/test/ui/generic-associated-types/shadowing.stderr
@@ -14,13 +14,29 @@ LL | impl<T> NoShadowT<T> for Option<T> {
 LL |     type Bar<T> = i32;
    |              ^ already used
 
+error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope
+  --> $DIR/shadowing.rs:5:14
+   |
+LL | trait Shadow<'a> {
+   |              -- first declared here
+LL |     type Bar<'a>;
+   |              ^^ lifetime 'a already in scope
+
+error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scope
+  --> $DIR/shadowing.rs:14:14
+   |
+LL | impl<'a> NoShadow<'a> for &'a u32 {
+   |      -- first declared here
+LL |     type Bar<'a> = i32;
+   |              ^^ lifetime 'a already in scope
+
 error: type-generic associated types are not yet implemented
   --> $DIR/shadowing.rs:19:5
    |
 LL |     type Bar<T>;
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
 error: type-generic associated types are not yet implemented
   --> $DIR/shadowing.rs:25:5
@@ -28,8 +44,9 @@ error: type-generic associated types are not yet implemented
 LL |     type Bar<U>; // OK
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44265
+   = note: for more information, see issue #44265 <https://github.com/rust-lang/rust/issues/44265> for more information
 
-error: aborting due to 4 previous errors
+error: aborting due to 6 previous errors
 
-For more information about this error, try `rustc --explain E0403`.
+Some errors have detailed explanations: E0403, E0496.
+For more information about an error, try `rustc --explain E0403`.
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.rs b/src/test/ui/generic/generic-arg-mismatch-recover.rs
index f4e15fbebc..3e5e2e601f 100644
--- a/src/test/ui/generic/generic-arg-mismatch-recover.rs
+++ b/src/test/ui/generic/generic-arg-mismatch-recover.rs
@@ -4,7 +4,6 @@ struct Bar<'a>(&'a ());
 
 fn main() {
     Foo::<'static, 'static, ()>(&0); //~ ERROR wrong number of lifetime arguments
-    //~^ ERROR mismatched types
 
     Bar::<'static, 'static, ()>(&()); //~ ERROR wrong number of lifetime arguments
     //~^ ERROR wrong number of type arguments
diff --git a/src/test/ui/generic/generic-arg-mismatch-recover.stderr b/src/test/ui/generic/generic-arg-mismatch-recover.stderr
index 4b86212e48..99adb35268 100644
--- a/src/test/ui/generic/generic-arg-mismatch-recover.stderr
+++ b/src/test/ui/generic/generic-arg-mismatch-recover.stderr
@@ -4,28 +4,18 @@ error[E0107]: wrong number of lifetime arguments: expected 1, found 2
 LL |     Foo::<'static, 'static, ()>(&0);
    |                    ^^^^^^^ unexpected lifetime argument
 
-error[E0308]: mismatched types
-  --> $DIR/generic-arg-mismatch-recover.rs:6:33
-   |
-LL |     Foo::<'static, 'static, ()>(&0);
-   |                                 ^^ expected `()`, found integer
-   |
-   = note: expected reference `&'static ()`
-              found reference `&{integer}`
-
 error[E0107]: wrong number of lifetime arguments: expected 1, found 2
-  --> $DIR/generic-arg-mismatch-recover.rs:9:20
+  --> $DIR/generic-arg-mismatch-recover.rs:8:20
    |
 LL |     Bar::<'static, 'static, ()>(&());
    |                    ^^^^^^^ unexpected lifetime argument
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
-  --> $DIR/generic-arg-mismatch-recover.rs:9:29
+  --> $DIR/generic-arg-mismatch-recover.rs:8:29
    |
 LL |     Bar::<'static, 'static, ()>(&());
    |                             ^^ unexpected type argument
 
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0107, E0308.
-For more information about an error, try `rustc --explain E0107`.
+For more information about this error, try `rustc --explain E0107`.
diff --git a/src/test/ui/generic/generic-extern-lifetime.stderr b/src/test/ui/generic/generic-extern-lifetime.stderr
index 39372c9315..72951aea4a 100644
--- a/src/test/ui/generic/generic-extern-lifetime.stderr
+++ b/src/test/ui/generic/generic-extern-lifetime.stderr
@@ -9,12 +9,24 @@ error[E0261]: use of undeclared lifetime name `'a`
    |
 LL |    pub fn life4<'b>(x: for<'c> fn(&'a i32));
    |                                    ^^ undeclared lifetime
+   |
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the type lifetime-generic with a new `'a` lifetime
+   |
+LL |    pub fn life4<'b>(x: for<'c, 'a> fn(&'a i32));
+   |                              ^^^^
 
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/generic-extern-lifetime.rs:11:38
    |
 LL |    pub fn life7<'b>() -> for<'c> fn(&'a i32);
    |                                      ^^ undeclared lifetime
+   |
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the type lifetime-generic with a new `'a` lifetime
+   |
+LL |    pub fn life7<'b>() -> for<'c, 'a> fn(&'a i32);
+   |                                ^^^^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/generic/generic-no-mangle.stderr b/src/test/ui/generic/generic-no-mangle.stderr
index f055a3ab83..ab2ad541e8 100644
--- a/src/test/ui/generic/generic-no-mangle.stderr
+++ b/src/test/ui/generic/generic-no-mangle.stderr
@@ -6,7 +6,7 @@ LL | #[no_mangle]
 LL | pub fn foo<T>() {}
    | ^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/generic-no-mangle.rs:1:9
    |
 LL | #![deny(no_mangle_generic_items)]
diff --git a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr b/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
index 8720288b53..9f410c0dbb 100644
--- a/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
+++ b/src/test/ui/generics/issue-65285-incorrect-explicit-lifetime-name-needed.stderr
@@ -18,4 +18,5 @@ LL | fn bar<'b, L: X<&'b Nested<i32>>>(){}
 
 error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0106`.
+Some errors have detailed explanations: E0106, E0637.
+For more information about an error, try `rustc --explain E0106`.
diff --git a/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns.stderr b/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns.stderr
index 99db339cf7..62d54463a4 100644
--- a/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns.stderr
+++ b/src/test/ui/half-open-range-patterns/feature-gate-half-open-range-patterns.stderr
@@ -26,7 +26,7 @@ error[E0658]: half-open range patterns are unstable
 LL |     if let ..=5 = 0 {}
    |            ^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67264
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
    = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable
 
 error[E0658]: half-open range patterns are unstable
@@ -35,7 +35,7 @@ error[E0658]: half-open range patterns are unstable
 LL |     if let ...5 = 0 {}
    |            ^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67264
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
    = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable
 
 error[E0658]: half-open range patterns are unstable
@@ -44,7 +44,7 @@ error[E0658]: half-open range patterns are unstable
 LL |     if let ..5 = 0 {}
    |            ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67264
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
    = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable
 
 error[E0658]: half-open range patterns are unstable
@@ -53,7 +53,7 @@ error[E0658]: half-open range patterns are unstable
 LL |     if let 5.. = 0 {}
    |            ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67264
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
    = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable
 
 error[E0658]: half-open range patterns are unstable
@@ -62,7 +62,7 @@ error[E0658]: half-open range patterns are unstable
 LL |     if let 5..= = 0 {}
    |            ^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67264
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
    = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable
 
 error[E0658]: half-open range patterns are unstable
@@ -71,7 +71,7 @@ error[E0658]: half-open range patterns are unstable
 LL |     if let 5... = 0 {}
    |            ^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67264
+   = note: see issue #67264 <https://github.com/rust-lang/rust/issues/67264> for more information
    = help: add `#![feature(half_open_range_patterns)]` to the crate attributes to enable
 
 error: aborting due to 9 previous errors
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr b/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr
index ba2e7ea8b5..3a9c918cd3 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr
+++ b/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-dotdotdot-bad-syntax.stderr
@@ -30,6 +30,8 @@ LL |             let ...$e;
 ...
 LL |     mac!(0);
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr b/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr
index 2bdb8ea576..871c9b57e5 100644
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr
+++ b/src/test/ui/half-open-range-patterns/half-open-range-pats-inclusive-no-end.stderr
@@ -40,6 +40,7 @@ LL |     mac!(0);
    |     -------- in this macro invocation
    |
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0586]: inclusive range with no end
   --> $DIR/half-open-range-pats-inclusive-no-end.rs:21:19
@@ -51,6 +52,7 @@ LL |     mac!(0);
    |     -------- in this macro invocation
    |
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr
index c8521a54e6..b91798fa12 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_ret_a_vs_bound_a_ret_a.stderr
@@ -10,6 +10,7 @@ LL | |                                             for<'a>    fn(&'a u32, &'a u3
    |
    = note: expected enum `std::option::Option<for<'a, 'b> fn(&'a u32, &'b u32) -> &'a u32>`
               found enum `std::option::Option<for<'a> fn(&'a u32, &'a u32) -> &'a u32>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr
index 3ad802c545..45f53d4fe9 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_b_vs_bound_a.stderr
@@ -10,6 +10,7 @@ LL | |                                 for<'a>    fn(&'a u32, &'a u32)) }
    |
    = note: expected enum `std::option::Option<for<'a, 'b> fn(&'a u32, &'b u32)>`
               found enum `std::option::Option<for<'a> fn(&'a u32, &'a u32)>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
index 3d09633367..c3e4f6d2ed 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_a_vs_free_x.stderr
@@ -10,6 +10,7 @@ LL | |                              fn(&'x u32)) }
    |
    = note: expected enum `std::option::Option<for<'a> fn(&'a u32)>`
               found enum `std::option::Option<fn(&'x u32)>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr
index 8b623a4c0b..4d7b86027f 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_b_vs_bound_co_a.stderr
@@ -10,6 +10,7 @@ LL | |                                       for<'a>    fn(Co<'a>, Co<'a>)) }
    |
    = note: expected enum `std::option::Option<for<'a, 'b> fn(Co<'a>, Co<'b>)>`
               found enum `std::option::Option<for<'a> fn(Co<'a>, Co<'a>)>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr
index f12bff6969..7f0a4197dd 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_co_a_co_b_ret_contra_a.stderr
@@ -10,6 +10,7 @@ LL | |                                         for<'a>    fn(Co<'a>, Co<'a>) ->
    |
    = note: expected enum `std::option::Option<for<'a, 'b> fn(Co<'a>, Co<'b>) -> Contra<'a>>`
               found enum `std::option::Option<for<'a> fn(Co<'a>, Co<'a>) -> Contra<'a>>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr
index 37ba44cf2e..c12e543a44 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_contra_a_contra_b_ret_co_a.stderr
@@ -10,6 +10,7 @@ LL | |                                             for<'a>    fn(Contra<'a>, Con
    |
    = note: expected enum `std::option::Option<for<'a, 'b> fn(Contra<'a>, Contra<'b>) -> Co<'a>>`
               found enum `std::option::Option<for<'a> fn(Contra<'a>, Contra<'a>) -> Co<'a>>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr
index a00bbea6d1..460356856b 100644
--- a/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.bound_inv_a_b_vs_bound_inv_a.stderr
@@ -10,6 +10,7 @@ LL | |                                         for<'a>    fn(Inv<'a>, Inv<'a>))
    |
    = note: expected enum `std::option::Option<for<'a, 'b> fn(Inv<'a>, Inv<'b>)>`
               found enum `std::option::Option<for<'a> fn(Inv<'a>, Inv<'a>)>`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr
index 9b0c987c05..6b5e7a5a63 100644
--- a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.nll.stderr
@@ -13,6 +13,7 @@ LL | |                                     fn(Inv<'y>)) }
    | |__________________________________________________- in this macro invocation
    |
    = help: consider adding the following bound: `'x: 'y`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: lifetime may not live long enough
   --> $DIR/hr-subtype.rs:39:13
@@ -29,6 +30,7 @@ LL | |                                     fn(Inv<'y>)) }
    | |__________________________________________________- in this macro invocation
    |
    = help: consider adding the following bound: `'x: 'y`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr
index 561f351917..fc3643306e 100644
--- a/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.free_inv_x_vs_free_inv_y.stderr
@@ -28,6 +28,7 @@ LL |           fn subtype<'x,'y:'x,'z:'y>() {
 LL | / check! { free_inv_x_vs_free_inv_y: (fn(Inv<'x>),
 LL | |                                     fn(Inv<'y>)) }
    | |__________________________________________________- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
   --> $DIR/hr-subtype.rs:39:26
@@ -59,6 +60,7 @@ LL |           fn supertype<'x,'y:'x,'z:'y>() {
 LL | / check! { free_inv_x_vs_free_inv_y: (fn(Inv<'x>),
 LL | |                                     fn(Inv<'y>)) }
    | |__________________________________________________- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr
index 48558fad00..7c0770924d 100644
--- a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.nll.stderr
@@ -13,6 +13,7 @@ LL | |                             fn(&'y u32)) }
    | |__________________________________________- in this macro invocation
    |
    = help: consider adding the following bound: `'x: 'y`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr
index 082627050b..0dde27788f 100644
--- a/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr
+++ b/src/test/ui/hr-subtype/hr-subtype.free_x_vs_free_y.stderr
@@ -28,6 +28,7 @@ LL |           fn supertype<'x,'y:'x,'z:'y>() {
 LL | / check! { free_x_vs_free_y: (fn(&'x u32),
 LL | |                             fn(&'y u32)) }
    | |__________________________________________- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr
index 5c38f47b36..6307a9b380 100644
--- a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr
+++ b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits-transitive.stderr
@@ -6,11 +6,14 @@ LL | fn want_bar_for_any_ccx<B>(b: &B)
 LL |     where B : for<'ccx> Bar<'ccx>
    |               ------------------- required by this bound in `want_bar_for_any_ccx`
 ...
-LL |     where B : Qux
-   |                  - help: consider further restricting type parameter `B`: `, B: for<'ccx> Bar<'ccx>`
-...
 LL |     want_bar_for_any_ccx(b);
    |                          ^ the trait `for<'ccx> Bar<'ccx>` is not implemented for `B`
+   |
+help: consider further restricting this bound with `+ for<'ccx> Bar<'ccx>`
+  --> $DIR/hrtb-higher-ranker-supertraits-transitive.rs:44:11
+   |
+LL |     where B : Qux
+   |           ^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr
index 768bc6c718..762c7c05f7 100644
--- a/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr
+++ b/src/test/ui/hrtb/hrtb-higher-ranker-supertraits.stderr
@@ -1,9 +1,6 @@
 error[E0277]: the trait bound `for<'tcx> F: Foo<'tcx>` is not satisfied
   --> $DIR/hrtb-higher-ranker-supertraits.rs:18:26
    |
-LL |     where F : Foo<'x>
-   |                      - help: consider further restricting type parameter `F`: `, F: for<'tcx> Foo<'tcx>`
-...
 LL |     want_foo_for_any_tcx(f);
    |                          ^ the trait `for<'tcx> Foo<'tcx>` is not implemented for `F`
 ...
@@ -11,13 +8,16 @@ LL | fn want_foo_for_any_tcx<F>(f: &F)
    |    --------------------
 LL |     where F : for<'tcx> Foo<'tcx>
    |               ------------------- required by this bound in `want_foo_for_any_tcx`
+   |
+help: consider further restricting this bound with `+ for<'tcx> Foo<'tcx>`
+  --> $DIR/hrtb-higher-ranker-supertraits.rs:15:11
+   |
+LL |     where F : Foo<'x>
+   |           ^^^^^^^^^^^
 
 error[E0277]: the trait bound `for<'ccx> B: Bar<'ccx>` is not satisfied
   --> $DIR/hrtb-higher-ranker-supertraits.rs:35:26
    |
-LL |     where B : Bar<'x>
-   |                      - help: consider further restricting type parameter `B`: `, B: for<'ccx> Bar<'ccx>`
-...
 LL |     want_bar_for_any_ccx(b);
    |                          ^ the trait `for<'ccx> Bar<'ccx>` is not implemented for `B`
 ...
@@ -25,6 +25,12 @@ LL | fn want_bar_for_any_ccx<B>(b: &B)
    |    --------------------
 LL |     where B : for<'ccx> Bar<'ccx>
    |               ------------------- required by this bound in `want_bar_for_any_ccx`
+   |
+help: consider further restricting this bound with `+ for<'ccx> Bar<'ccx>`
+  --> $DIR/hrtb-higher-ranker-supertraits.rs:29:11
+   |
+LL |     where B : Bar<'x>
+   |           ^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/hrtb/issue-58451.rs b/src/test/ui/hrtb/issue-58451.rs
index 229e505767..f36d549e47 100644
--- a/src/test/ui/hrtb/issue-58451.rs
+++ b/src/test/ui/hrtb/issue-58451.rs
@@ -9,5 +9,5 @@ where
 {}
 
 fn main() {
-    f(&[f()]); //~ ERROR this function takes 1 parameter
+    f(&[f()]); //~ ERROR this function takes 1 argument
 }
diff --git a/src/test/ui/hrtb/issue-58451.stderr b/src/test/ui/hrtb/issue-58451.stderr
index 4648c0182b..c0915808bf 100644
--- a/src/test/ui/hrtb/issue-58451.stderr
+++ b/src/test/ui/hrtb/issue-58451.stderr
@@ -1,4 +1,4 @@
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/issue-58451.rs:12:9
    |
 LL | / fn f<I>(i: I)
@@ -9,7 +9,9 @@ LL | | {}
    | |__- defined here
 ...
 LL |       f(&[f()]);
-   |           ^^^ expected 1 parameter
+   |           ^-- supplied 0 arguments
+   |           |
+   |           expected 1 argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/huge-array-simple-32.rs b/src/test/ui/huge-array-simple-32.rs
index 3e574dfa07..2290e3d5e7 100644
--- a/src/test/ui/huge-array-simple-32.rs
+++ b/src/test/ui/huge-array-simple-32.rs
@@ -4,7 +4,7 @@
 // FIXME https://github.com/rust-lang/rust/issues/59774
 // normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
 // normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
-#![allow(exceeding_bitshifts)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _fat: [u8; (1<<31)+(1<<15)] = //~ ERROR too big for the current architecture
diff --git a/src/test/ui/huge-array-simple-64.rs b/src/test/ui/huge-array-simple-64.rs
index d4c9330128..02c961fc5f 100644
--- a/src/test/ui/huge-array-simple-64.rs
+++ b/src/test/ui/huge-array-simple-64.rs
@@ -4,7 +4,7 @@
 // FIXME https://github.com/rust-lang/rust/issues/59774
 // normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
 // normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
-#![allow(exceeding_bitshifts)]
+#![allow(arithmetic_overflow)]
 
 fn main() {
     let _fat: [u8; (1<<61)+(1<<31)] = //~ ERROR too big for the current architecture
diff --git a/src/test/ui/hygiene/assoc_item_ctxt.stderr b/src/test/ui/hygiene/assoc_item_ctxt.stderr
index 0d1c73eef0..dec1bd62ca 100644
--- a/src/test/ui/hygiene/assoc_item_ctxt.stderr
+++ b/src/test/ui/hygiene/assoc_item_ctxt.stderr
@@ -6,6 +6,8 @@ LL |             fn method() {}
 ...
 LL |     mac_trait_impl!();
    |     ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0046]: not all trait items implemented, missing: `method`
   --> $DIR/assoc_item_ctxt.rs:34:9
@@ -18,6 +20,8 @@ LL |         impl Tr for u8 {
 ...
 LL |     mac_trait_impl!();
    |     ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/hygiene/assoc_ty_bindings.rs b/src/test/ui/hygiene/assoc_ty_bindings.rs
index 93cf7591a0..0567beab9b 100644
--- a/src/test/ui/hygiene/assoc_ty_bindings.rs
+++ b/src/test/ui/hygiene/assoc_ty_bindings.rs
@@ -12,8 +12,8 @@ trait Derived: Base {
 }
 
 macro mac() {
-    type A = Base<AssocTy = u8>;
-    type B = Derived<AssocTy = u8>;
+    type A = dyn Base<AssocTy = u8>;
+    type B = dyn Derived<AssocTy = u8>;
 
     impl Base for u8 {
         type AssocTy = u8;
diff --git a/src/test/ui/hygiene/duplicate_lifetimes.stderr b/src/test/ui/hygiene/duplicate_lifetimes.stderr
index 7aaea6ff24..04f5bed5e0 100644
--- a/src/test/ui/hygiene/duplicate_lifetimes.stderr
+++ b/src/test/ui/hygiene/duplicate_lifetimes.stderr
@@ -9,6 +9,8 @@ LL | m!('a);
    | |  |
    | |  previous declaration here
    | in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0263]: lifetime name `'a` declared twice in the same scope
   --> $DIR/duplicate_lifetimes.rs:13:14
@@ -21,6 +23,8 @@ LL | n!('a);
    | |  |
    | |  previous declaration here
    | in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr b/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr
index 65133eb1e1..b9e05c84a8 100644
--- a/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr
+++ b/src/test/ui/hygiene/extern-prelude-from-opaque-fail.stderr
@@ -15,6 +15,8 @@ LL |         use my_core;
 ...
 LL | a!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: use of undeclared type or module `my_core`
   --> $DIR/extern-prelude-from-opaque-fail.rs:11:18
@@ -24,6 +26,8 @@ LL |         fn f() { my_core::mem::drop(0); }
 ...
 LL | a!();
    | ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: use of undeclared type or module `my_core`
   --> $DIR/extern-prelude-from-opaque-fail.rs:24:14
diff --git a/src/test/ui/hygiene/fields-definition.stderr b/src/test/ui/hygiene/fields-definition.stderr
index a30650d88e..fd8846bb13 100644
--- a/src/test/ui/hygiene/fields-definition.stderr
+++ b/src/test/ui/hygiene/fields-definition.stderr
@@ -1,13 +1,15 @@
 error[E0124]: field `a` is already declared
-  --> $DIR/fields-definition.rs:14:17
+  --> $DIR/fields-definition.rs:14:13
    |
 LL |             a: u8,
    |             ----- `a` first declared here
 LL |             $a: u8,
-   |                 ^^ field already declared
+   |             ^^^^^^ field already declared
 ...
 LL | legacy!(a);
    | ----------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hygiene/fields-move.stderr b/src/test/ui/hygiene/fields-move.stderr
index 562f60e31b..5ce786dce8 100644
--- a/src/test/ui/hygiene/fields-move.stderr
+++ b/src/test/ui/hygiene/fields-move.stderr
@@ -10,6 +10,7 @@ LL |     assert_two_copies(copy_legacy!(foo), foo.x);
    |                       ----------------- in this macro invocation
    |
    = note: move occurs because `foo.x` has type `NonCopy`, which does not implement the `Copy` trait
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0382]: use of moved value: `foo.x`
   --> $DIR/fields-move.rs:28:42
diff --git a/src/test/ui/hygiene/fields.stderr b/src/test/ui/hygiene/fields.stderr
index 20ea4e9106..89deef4920 100644
--- a/src/test/ui/hygiene/fields.stderr
+++ b/src/test/ui/hygiene/fields.stderr
@@ -6,6 +6,8 @@ LL |         let s = S { x: 0 };
 ...
 LL |     let s = foo::m!(S, x);
    |             ------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `foo::S` is private
   --> $DIR/fields.rs:16:17
@@ -15,6 +17,8 @@ LL |         let _ = s.x;
 ...
 LL |     let s = foo::m!(S, x);
    |             ------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `foo::T` is private
   --> $DIR/fields.rs:18:17
@@ -24,6 +28,8 @@ LL |         let t = T(0);
 ...
 LL |     let s = foo::m!(S, x);
    |             ------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `foo::T` is private
   --> $DIR/fields.rs:19:17
@@ -33,6 +39,8 @@ LL |         let _ = t.0;
 ...
 LL |     let s = foo::m!(S, x);
    |             ------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/hygiene/generate-mod.stderr b/src/test/ui/hygiene/generate-mod.stderr
index 5e2c56d4bf..073e1527b2 100644
--- a/src/test/ui/hygiene/generate-mod.stderr
+++ b/src/test/ui/hygiene/generate-mod.stderr
@@ -18,6 +18,8 @@ LL |         type A = FromOutside;
 ...
 LL |     genmod_transparent!();
    |     ---------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Outer` in this scope
   --> $DIR/generate-mod.rs:20:22
@@ -27,6 +29,8 @@ LL |         type Inner = Outer;
 ...
 LL |     genmod_transparent!();
    |     ---------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:28:18
@@ -36,6 +40,8 @@ LL |         type A = FromOutside;
 ...
 LL |     genmod_legacy!();
    |     ----------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Outer` in this scope
   --> $DIR/generate-mod.rs:29:22
@@ -45,6 +51,8 @@ LL |         type Inner = Outer;
 ...
 LL |     genmod_legacy!();
    |     ----------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/hygiene/globs.stderr b/src/test/ui/hygiene/globs.stderr
index f9fbf295ae..153ad8cbec 100644
--- a/src/test/ui/hygiene/globs.stderr
+++ b/src/test/ui/hygiene/globs.stderr
@@ -22,6 +22,7 @@ LL | |         f();
 LL | |     }
    | |_____- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: possible candidates are found in other modules, you can import them into scope
    |
 LL | use bar::g;
@@ -42,6 +43,7 @@ LL |         n!(f);
    |
    = note: possible candidate is found in another module, you can import it into scope:
            foo::f
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find function `f` in this scope
   --> $DIR/globs.rs:65:17
@@ -54,6 +56,7 @@ LL |                 f
    |
    = note: possible candidate is found in another module, you can import it into scope:
            foo::f
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/hygiene/hygienic-label-1.stderr b/src/test/ui/hygiene/hygienic-label-1.stderr
index d61c0687c1..60df494e13 100644
--- a/src/test/ui/hygiene/hygienic-label-1.stderr
+++ b/src/test/ui/hygiene/hygienic-label-1.stderr
@@ -6,6 +6,8 @@ LL |     () => { break 'x; }
 ...
 LL |     'x: loop { foo!() }
    |                ------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hygiene/hygienic-label-3.stderr b/src/test/ui/hygiene/hygienic-label-3.stderr
index 0c4173a61a..dbec71fcaa 100644
--- a/src/test/ui/hygiene/hygienic-label-3.stderr
+++ b/src/test/ui/hygiene/hygienic-label-3.stderr
@@ -6,6 +6,8 @@ LL |     () => { break 'x; }
 ...
 LL |         foo!()
    |         ------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hygiene/hygienic-labels-in-let.stderr b/src/test/ui/hygiene/hygienic-labels-in-let.stderr
index 4acb34f2dc..7c82a08753 100644
--- a/src/test/ui/hygiene/hygienic-labels-in-let.stderr
+++ b/src/test/ui/hygiene/hygienic-labels-in-let.stderr
@@ -9,6 +9,8 @@ LL |         'x: loop {
 LL |             // this 'x should refer to the outer loop, lexically
 LL |             loop_x!(break 'x);
    |             ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:64:9
@@ -39,6 +41,8 @@ LL |         'x: loop {
 ...
 LL |             loop_x!(break 'x);
    |             ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:16:9
@@ -51,6 +55,8 @@ LL |         'x: loop { $e }
 ...
 LL |             loop_x!(break 'x);
    |             ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:16:9
@@ -63,6 +69,8 @@ LL |         'x: for _ in 0..1 {
 ...
 LL |             loop_x!(break 'x);
    |             ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:76:9
@@ -111,6 +119,8 @@ LL |         'x: loop {
 ...
 LL |             while_true!(break 'x);
    |             ---------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:27:9
@@ -123,6 +133,8 @@ LL |         'x: while 1 + 1 == 2 { $e }
 ...
 LL |             while_true!(break 'x);
    |             ---------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:27:9
@@ -135,6 +147,8 @@ LL |         'x: for _ in 0..1 {
 ...
 LL |             while_true!(break 'x);
    |             ---------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:27:9
@@ -147,6 +161,8 @@ LL |         'x: while 1 + 1 == 2 { $e }
 ...
 LL |             while_true!(break 'x);
    |             ---------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:27:9
@@ -159,6 +175,8 @@ LL |         'x: for _ in 0..1 {
 ...
 LL |             while_true!(break 'x);
    |             ---------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:90:9
@@ -225,6 +243,8 @@ LL |         'x: loop {
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:39:9
@@ -237,6 +257,8 @@ LL |         'x: for _ in 0..1 { $e }
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:39:9
@@ -249,6 +271,8 @@ LL |         'x: for _ in 0..1 {
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:39:9
@@ -261,6 +285,8 @@ LL |         'x: for _ in 0..1 { $e }
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:39:9
@@ -273,6 +299,8 @@ LL |         'x: for _ in 0..1 {
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:39:9
@@ -285,6 +313,8 @@ LL |         'x: for _ in 0..1 { $e }
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels-in-let.rs:39:9
@@ -297,4 +327,6 @@ LL |         'x: for _ in 0..1 {
 ...
 LL |             run_once!(continue 'x);
    |             ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/hygiene/hygienic-labels.stderr b/src/test/ui/hygiene/hygienic-labels.stderr
index 0833825940..960da15ef3 100644
--- a/src/test/ui/hygiene/hygienic-labels.stderr
+++ b/src/test/ui/hygiene/hygienic-labels.stderr
@@ -9,6 +9,8 @@ LL |     'x: for _ in 0..1 {
 LL |         // this 'x should refer to the outer loop, lexically
 LL |         loop_x!(break 'x);
    |         ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:54:5
@@ -39,6 +41,8 @@ LL |     'x: for _ in 0..1 {
 ...
 LL |         loop_x!(break 'x);
    |         ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:13:9
@@ -51,6 +55,8 @@ LL |         'x: loop { $e }
 ...
 LL |         loop_x!(break 'x);
    |         ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:13:9
@@ -63,6 +69,8 @@ LL |     'x: loop {
 ...
 LL |         loop_x!(break 'x);
    |         ------------------ in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:63:5
@@ -111,6 +119,8 @@ LL |     'x: for _ in 0..1 {
 ...
 LL |         while_x!(break 'x);
    |         ------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:38:9
@@ -123,6 +133,8 @@ LL |         'x: while 1 + 1 == 2 { $e }
 ...
 LL |         while_x!(break 'x);
    |         ------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:38:9
@@ -135,6 +147,8 @@ LL |     'x: loop {
 ...
 LL |         while_x!(break 'x);
    |         ------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:38:9
@@ -147,6 +161,8 @@ LL |         'x: while 1 + 1 == 2 { $e }
 ...
 LL |         while_x!(break 'x);
    |         ------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:38:9
@@ -159,6 +175,8 @@ LL |     'x: while 1 + 1 == 2 {
 ...
 LL |         while_x!(break 'x);
    |         ------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:73:5
@@ -225,6 +243,8 @@ LL |     'x: for _ in 0..1 {
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:24:9
@@ -237,6 +257,8 @@ LL |         'x: for _ in 0..1 { $e }
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:24:9
@@ -249,6 +271,8 @@ LL |     'x: loop {
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:24:9
@@ -261,6 +285,8 @@ LL |         'x: for _ in 0..1 { $e }
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:24:9
@@ -273,6 +299,8 @@ LL |     'x: while 1 + 1 == 2 {
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:24:9
@@ -285,6 +313,8 @@ LL |         'x: while 1 + 1 == 2 { $e }
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: label name `'x` shadows a label name that is already in scope
   --> $DIR/hygienic-labels.rs:24:9
@@ -297,4 +327,6 @@ LL |     'x: for _ in 0..1 {
 ...
 LL |         run_once!(continue 'x);
    |         ----------------------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/hygiene/impl_items.stderr b/src/test/ui/hygiene/impl_items.stderr
index 418c2c73ba..85ee9f4cbf 100644
--- a/src/test/ui/hygiene/impl_items.stderr
+++ b/src/test/ui/hygiene/impl_items.stderr
@@ -6,6 +6,8 @@ LL |         let _: () = S.f();
 ...
 LL |     foo::m!();
    |     ---------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hygiene/intercrate.stderr b/src/test/ui/hygiene/intercrate.stderr
index 30a5570b2a..3912ca337f 100644
--- a/src/test/ui/hygiene/intercrate.stderr
+++ b/src/test/ui/hygiene/intercrate.stderr
@@ -4,7 +4,7 @@ error: type `fn() -> u32 {intercrate::foo::bar::f}` is private
 LL |     assert_eq!(intercrate::foo::m!(), 1);
    |                ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr
index 5d75f5034b..986671c781 100644
--- a/src/test/ui/hygiene/no_implicit_prelude.stderr
+++ b/src/test/ui/hygiene/no_implicit_prelude.stderr
@@ -4,7 +4,7 @@ error: cannot find macro `panic` in this scope
 LL |         assert_eq!(0, 0);
    |         ^^^^^^^^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: use of undeclared type or module `Vec`
   --> $DIR/no_implicit_prelude.rs:11:9
@@ -14,6 +14,8 @@ LL |     fn f() { ::bar::m!(); }
 ...
 LL |         Vec::new();
    |         ^^^ use of undeclared type or module `Vec`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no method named `clone` found for unit type `()` in the current scope
   --> $DIR/no_implicit_prelude.rs:12:12
@@ -27,6 +29,7 @@ LL |         ().clone()
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use std::clone::Clone;`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/hygiene/privacy-early.stderr b/src/test/ui/hygiene/privacy-early.stderr
index 60e50e05fc..afc94bf79f 100644
--- a/src/test/ui/hygiene/privacy-early.stderr
+++ b/src/test/ui/hygiene/privacy-early.stderr
@@ -15,6 +15,7 @@ LL |         use f as g;
 ...
 LL |     foo::m!();
    |     ---------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/hygiene/trait_items.stderr b/src/test/ui/hygiene/trait_items.stderr
index 8e3609292a..d24336883e 100644
--- a/src/test/ui/hygiene/trait_items.stderr
+++ b/src/test/ui/hygiene/trait_items.stderr
@@ -10,6 +10,7 @@ LL |     pub macro m() { ().f() }
    = help: items from traits can only be used if the trait is in scope
    = note: the following trait is implemented but not in scope; perhaps add a `use` for it:
            `use foo::T;`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/if-attrs/bad-cfg.rs b/src/test/ui/if-attrs/bad-cfg.rs
new file mode 100644
index 0000000000..3f84929a00
--- /dev/null
+++ b/src/test/ui/if-attrs/bad-cfg.rs
@@ -0,0 +1,5 @@
+#![feature(stmt_expr_attributes)]
+
+fn main() {
+    let _ = #[cfg(FALSE)] if true {}; //~ ERROR removing an expression
+}
diff --git a/src/test/ui/if-attrs/bad-cfg.stderr b/src/test/ui/if-attrs/bad-cfg.stderr
new file mode 100644
index 0000000000..8a2890886a
--- /dev/null
+++ b/src/test/ui/if-attrs/bad-cfg.stderr
@@ -0,0 +1,8 @@
+error: removing an expression is not supported in this position
+  --> $DIR/bad-cfg.rs:4:13
+   |
+LL |     let _ = #[cfg(FALSE)] if true {};
+   |             ^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/if-attrs/builtin-if-attr.rs b/src/test/ui/if-attrs/builtin-if-attr.rs
new file mode 100644
index 0000000000..7e29066150
--- /dev/null
+++ b/src/test/ui/if-attrs/builtin-if-attr.rs
@@ -0,0 +1,12 @@
+// check-pass
+
+fn main() {
+    #[allow(unused_variables)]
+    if true {
+        let a = 1;
+    } else if false {
+        let b = 1;
+    } else {
+        let c = 1;
+    }
+}
diff --git a/src/test/ui/if-attrs/cfg-false-if-attr.rs b/src/test/ui/if-attrs/cfg-false-if-attr.rs
new file mode 100644
index 0000000000..1f77a1bb34
--- /dev/null
+++ b/src/test/ui/if-attrs/cfg-false-if-attr.rs
@@ -0,0 +1,43 @@
+// check-pass
+
+#[cfg(FALSE)]
+fn simple_attr() {
+    #[attr] if true {}
+    #[allow_warnings] if true {}
+}
+
+#[cfg(FALSE)]
+fn if_else_chain() {
+    #[first_attr] if true {
+    } else if false {
+    } else {
+    }
+}
+
+#[cfg(FALSE)]
+fn if_let() {
+    #[attr] if let Some(_) = Some(true) {}
+}
+
+fn bar() {
+    #[cfg(FALSE)]
+    if true {
+        let x: () = true; // Should not error due to the #[cfg(FALSE)]
+    }
+
+    #[cfg_attr(not(unset_attr), cfg(FALSE))]
+    if true {
+        let a: () = true; // Should not error due to the applied #[cfg(FALSE)]
+    }
+}
+
+macro_rules! custom_macro {
+    ($expr:expr) => {}
+}
+
+custom_macro! {
+    #[attr] if true {}
+}
+
+
+fn main() {}
diff --git a/src/test/ui/if-attrs/else-attrs.rs b/src/test/ui/if-attrs/else-attrs.rs
new file mode 100644
index 0000000000..4394b2100c
--- /dev/null
+++ b/src/test/ui/if-attrs/else-attrs.rs
@@ -0,0 +1,25 @@
+#[cfg(FALSE)]
+fn if_else_parse_error() {
+    if true {
+    } #[attr] else if false { //~ ERROR expected
+    }
+}
+
+#[cfg(FALSE)]
+fn else_attr_ifparse_error() {
+    if true {
+    } else #[attr] if false { //~ ERROR expected
+    } else {
+    }
+}
+
+#[cfg(FALSE)]
+fn else_parse_error() {
+    if true {
+    } else if false {
+    } #[attr] else { //~ ERROR expected
+    }
+}
+
+fn main() {
+}
diff --git a/src/test/ui/if-attrs/else-attrs.stderr b/src/test/ui/if-attrs/else-attrs.stderr
new file mode 100644
index 0000000000..af25b6abc0
--- /dev/null
+++ b/src/test/ui/if-attrs/else-attrs.stderr
@@ -0,0 +1,27 @@
+error: expected expression, found keyword `else`
+  --> $DIR/else-attrs.rs:4:15
+   |
+LL |     } #[attr] else if false {
+   |               ^^^^ expected expression
+
+error: expected `{`, found `#`
+  --> $DIR/else-attrs.rs:11:12
+   |
+LL |     } else #[attr] if false {
+   |            ^ expected `{`
+   |
+help: try placing this code inside a block
+   |
+LL |     } else #[attr] { if false {
+LL |     } else {
+LL |     } }
+   |
+
+error: expected expression, found keyword `else`
+  --> $DIR/else-attrs.rs:20:15
+   |
+LL |     } #[attr] else {
+   |               ^^^^ expected expression
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/if-attrs/gate-whole-expr.rs b/src/test/ui/if-attrs/gate-whole-expr.rs
new file mode 100644
index 0000000000..63772d54b5
--- /dev/null
+++ b/src/test/ui/if-attrs/gate-whole-expr.rs
@@ -0,0 +1,15 @@
+// run-pass
+
+fn main() {
+    let x = 1;
+
+    #[cfg(FALSE)]
+    if false {
+        x = 2;
+    } else if true {
+        x = 3;
+    } else {
+        x = 4;
+    }
+    assert_eq!(x, 1);
+}
diff --git a/src/test/ui/if-attrs/let-chains-attr.rs b/src/test/ui/if-attrs/let-chains-attr.rs
new file mode 100644
index 0000000000..5237a9ff39
--- /dev/null
+++ b/src/test/ui/if-attrs/let-chains-attr.rs
@@ -0,0 +1,13 @@
+// check-pass
+
+#![feature(let_chains)] //~ WARN the feature `let_chains` is incomplete
+
+#[cfg(FALSE)]
+fn foo() {
+    #[attr]
+    if let Some(_) = Some(true) && let Ok(_) = Ok(1) {
+    } else if let Some(false) = Some(true) {
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/if-attrs/let-chains-attr.stderr b/src/test/ui/if-attrs/let-chains-attr.stderr
new file mode 100644
index 0000000000..a6c91bb920
--- /dev/null
+++ b/src/test/ui/if-attrs/let-chains-attr.stderr
@@ -0,0 +1,8 @@
+warning: the feature `let_chains` is incomplete and may cause the compiler to crash
+  --> $DIR/let-chains-attr.rs:3:12
+   |
+LL | #![feature(let_chains)]
+   |            ^^^^^^^^^^
+   |
+   = note: `#[warn(incomplete_features)]` on by default
+
diff --git a/src/test/ui/if-attrs/stmt-expr-gated.rs b/src/test/ui/if-attrs/stmt-expr-gated.rs
new file mode 100644
index 0000000000..38599c8e67
--- /dev/null
+++ b/src/test/ui/if-attrs/stmt-expr-gated.rs
@@ -0,0 +1,6 @@
+fn main() {
+    let _ = #[deny(warnings)] if true { //~ ERROR attributes on expressions
+    } else if false {
+    } else {
+    };
+}
diff --git a/src/test/ui/if-attrs/stmt-expr-gated.stderr b/src/test/ui/if-attrs/stmt-expr-gated.stderr
new file mode 100644
index 0000000000..47dac39a9a
--- /dev/null
+++ b/src/test/ui/if-attrs/stmt-expr-gated.stderr
@@ -0,0 +1,12 @@
+error[E0658]: attributes on expressions are experimental
+  --> $DIR/stmt-expr-gated.rs:2:13
+   |
+LL |     let _ = #[deny(warnings)] if true {
+   |             ^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
+   = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/if/if-let.stderr b/src/test/ui/if/if-let.stderr
index 570a64e999..ad4aefb6e5 100644
--- a/src/test/ui/if/if-let.stderr
+++ b/src/test/ui/if/if-let.stderr
@@ -10,6 +10,7 @@ LL | |     });
    | |_______- in this macro invocation
    |
    = note: `#[warn(irrefutable_let_patterns)]` on by default
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: irrefutable if-let pattern
   --> $DIR/if-let.rs:6:13
@@ -21,6 +22,8 @@ LL | /     bar!(a, 1, {
 LL | |         println!("irrefutable pattern");
 LL | |     });
    | |_______- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: irrefutable if-let pattern
   --> $DIR/if-let.rs:26:5
diff --git a/src/test/ui/if/ifmt-bad-arg.stderr b/src/test/ui/if/ifmt-bad-arg.stderr
index c024094dd5..3e5f5a6374 100644
--- a/src/test/ui/if/ifmt-bad-arg.stderr
+++ b/src/test/ui/if/ifmt-bad-arg.stderr
@@ -300,6 +300,7 @@ LL |     println!("{} {:.*} {}", 1, 3.2, 4);
    |
    = note: expected reference `&usize`
               found reference `&{float}`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
   --> $DIR/ifmt-bad-arg.rs:81:35
@@ -309,6 +310,7 @@ LL |     println!("{} {:07$.*} {}", 1, 3.2, 4);
    |
    = note: expected reference `&usize`
               found reference `&{float}`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 36 previous errors
 
diff --git a/src/test/ui/if/ifmt-bad-format-args.stderr b/src/test/ui/if/ifmt-bad-format-args.stderr
index 23252b6b5f..8bb0d40629 100644
--- a/src/test/ui/if/ifmt-bad-format-args.stderr
+++ b/src/test/ui/if/ifmt-bad-format-args.stderr
@@ -3,6 +3,8 @@ error: requires at least a format string argument
    |
 LL |     format_args!();
    |     ^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: format argument must be a string literal
   --> $DIR/ifmt-bad-format-args.rs:3:18
diff --git a/src/test/ui/if/ifmt-unimpl.stderr b/src/test/ui/if/ifmt-unimpl.stderr
index 7a7e4b34d2..a142896ada 100644
--- a/src/test/ui/if/ifmt-unimpl.stderr
+++ b/src/test/ui/if/ifmt-unimpl.stderr
@@ -6,6 +6,7 @@ LL |     format!("{:X}", "3");
    |
    = note: required because of the requirements on the impl of `std::fmt::UpperHex` for `&str`
    = note: required by `std::fmt::UpperHex::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/ifmt.rs b/src/test/ui/ifmt.rs
index 1a070843cc..27ab3d6b7a 100644
--- a/src/test/ui/ifmt.rs
+++ b/src/test/ui/ifmt.rs
@@ -99,7 +99,6 @@ pub fn main() {
     let a: &dyn fmt::Debug = &1;
     t!(format!("{:?}", a), "1");
 
-
     // Formatting strings and their arguments
     t!(format!("{}", "a"), "a");
     t!(format!("{:4}", "a"), "a   ");
@@ -187,10 +186,6 @@ pub fn main() {
     // Ergonomic format_args!
     t!(format!("{0:x} {0:X}", 15), "f F");
     t!(format!("{0:x} {0:X} {}", 15), "f F 15");
-    // NOTE: For now the longer test cases must not be followed immediately by
-    // >1 empty lines, or the pretty printer will break. Since no one wants to
-    // touch the current pretty printer (#751), we have no choice but to work
-    // around it. Some of the following test cases are also affected.
     t!(format!("{:x}{0:X}{a:x}{:X}{1:x}{a:X}", 13, 14, a=15), "dDfEeF");
     t!(format!("{a:x} {a:X}", a=15), "f F");
 
@@ -201,7 +196,6 @@ pub fn main() {
     t!(format!("{a:.*} {0} {:.*}", 4, 3, "efgh", a="abcdef"), "abcd 4 efg");
     t!(format!("{:.a$} {a} {a:#x}", "aaaaaa", a=2), "aa 2 0x2");
 
-
     // Test that pointers don't get truncated.
     {
         let val = usize::MAX;
diff --git a/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr b/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr
index 14c53f9066..211a3286cc 100644
--- a/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr
+++ b/src/test/ui/impl-header-lifetime-elision/assoc-type.stderr
@@ -6,8 +6,8 @@ LL |     type Output = &i32;
    |
 help: consider introducing a named lifetime parameter
    |
-LL |     type Output<'lifetime> = &'lifetime i32;
-   |                ^^^^^^^^^^^   ^^^^^^^^^^
+LL |     type Output<'a> = &'a i32;
+   |                ^^^^   ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/assoc-type.rs:16:20
@@ -17,8 +17,8 @@ LL |     type Output = &'_ i32;
    |
 help: consider introducing a named lifetime parameter
    |
-LL |     type Output<'lifetime> = &'lifetime i32;
-   |                ^^^^^^^^^^^    ^^^^^^^^^
+LL |     type Output<'a> = &'a i32;
+   |                ^^^^    ^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/impl-trait/auto-trait-leak.stderr b/src/test/ui/impl-trait/auto-trait-leak.stderr
index 0ebaac8945..3d60cbff32 100644
--- a/src/test/ui/impl-trait/auto-trait-leak.stderr
+++ b/src/test/ui/impl-trait/auto-trait-leak.stderr
@@ -4,9 +4,34 @@ error[E0391]: cycle detected when processing `cycle1::{{opaque}}#0`
 LL | fn cycle1() -> impl Clone {
    |                ^^^^^^^^^^
    |
+note: ...which requires borrow-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires processing `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires processing `cycle1`...
   --> $DIR/auto-trait-leak.rs:12:1
    |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires unsafety-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires building MIR for...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires type-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
 LL | fn cycle1() -> impl Clone {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which requires evaluating trait selection obligation `impl std::clone::Clone: std::marker::Send`...
@@ -15,9 +40,34 @@ note: ...which requires processing `cycle2::{{opaque}}#0`...
    |
 LL | fn cycle2() -> impl Clone {
    |                ^^^^^^^^^^
+note: ...which requires borrow-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires processing `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires processing `cycle2`...
   --> $DIR/auto-trait-leak.rs:22:1
    |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires unsafety-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires building MIR for...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires type-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
 LL | fn cycle2() -> impl Clone {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which requires evaluating trait selection obligation `impl std::clone::Clone: std::marker::Send`...
@@ -40,9 +90,34 @@ error[E0391]: cycle detected when processing `cycle1::{{opaque}}#0`
 LL | fn cycle1() -> impl Clone {
    |                ^^^^^^^^^^
    |
+note: ...which requires borrow-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires processing `cycle1`...
   --> $DIR/auto-trait-leak.rs:12:1
    |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires processing `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires unsafety-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires building MIR for...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires type-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
 LL | fn cycle1() -> impl Clone {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which requires evaluating trait selection obligation `impl std::clone::Clone: std::marker::Send`...
@@ -51,9 +126,34 @@ note: ...which requires processing `cycle2::{{opaque}}#0`...
    |
 LL | fn cycle2() -> impl Clone {
    |                ^^^^^^^^^^
+note: ...which requires borrow-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires processing `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires processing `cycle2`...
   --> $DIR/auto-trait-leak.rs:22:1
    |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires unsafety-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires building MIR for...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires type-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
 LL | fn cycle2() -> impl Clone {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which again requires processing `cycle1::{{opaque}}#0`, completing the cycle
@@ -75,9 +175,34 @@ error[E0391]: cycle detected when processing `cycle1::{{opaque}}#0`
 LL | fn cycle1() -> impl Clone {
    |                ^^^^^^^^^^
    |
+note: ...which requires borrow-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires processing `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires processing `cycle1`...
   --> $DIR/auto-trait-leak.rs:12:1
    |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires unsafety-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires building MIR for...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
+LL | fn cycle1() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires type-checking `cycle1`...
+  --> $DIR/auto-trait-leak.rs:12:1
+   |
 LL | fn cycle1() -> impl Clone {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which requires evaluating trait selection obligation `impl std::clone::Clone: std::marker::Send`...
@@ -86,9 +211,34 @@ note: ...which requires processing `cycle2::{{opaque}}#0`...
    |
 LL | fn cycle2() -> impl Clone {
    |                ^^^^^^^^^^
+note: ...which requires borrow-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...which requires processing `cycle2`...
   --> $DIR/auto-trait-leak.rs:22:1
    |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires processing `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires unsafety-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires building MIR for...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
+LL | fn cycle2() -> impl Clone {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^
+note: ...which requires type-checking `cycle2`...
+  --> $DIR/auto-trait-leak.rs:22:1
+   |
 LL | fn cycle2() -> impl Clone {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: ...which again requires processing `cycle1::{{opaque}}#0`, completing the cycle
diff --git a/src/test/ui/impl-trait/bound-normalization-fail.rs b/src/test/ui/impl-trait/bound-normalization-fail.rs
index 235c1f80ef..5bf3ec733f 100644
--- a/src/test/ui/impl-trait/bound-normalization-fail.rs
+++ b/src/test/ui/impl-trait/bound-normalization-fail.rs
@@ -1,4 +1,3 @@
-// compile-fail
 // ignore-tidy-linelength
 // edition:2018
 
diff --git a/src/test/ui/impl-trait/bound-normalization-fail.stderr b/src/test/ui/impl-trait/bound-normalization-fail.stderr
index fc4cddd021..22ba8342ff 100644
--- a/src/test/ui/impl-trait/bound-normalization-fail.stderr
+++ b/src/test/ui/impl-trait/bound-normalization-fail.stderr
@@ -1,5 +1,5 @@
 warning: the feature `impl_trait_in_bindings` is incomplete and may cause the compiler to crash
-  --> $DIR/bound-normalization-fail.rs:5:12
+  --> $DIR/bound-normalization-fail.rs:4:12
    |
 LL | #![feature(impl_trait_in_bindings)]
    |            ^^^^^^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | #![feature(impl_trait_in_bindings)]
    = note: `#[warn(incomplete_features)]` on by default
 
 error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as impl_trait::Trait>::Assoc`
-  --> $DIR/bound-normalization-fail.rs:28:32
+  --> $DIR/bound-normalization-fail.rs:27:32
    |
 LL |     fn foo_fail<T: Trait>() -> impl FooLike<Output=T::Assoc> {
    |                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found associated type
@@ -19,13 +19,13 @@ LL |     fn foo_fail<T: Trait>() -> impl FooLike<Output=T::Assoc> {
    = note: the return type of a function must have a statically known size
 
 error: `impl Trait` return type cannot contain a projection or `Self` that references lifetimes from a parent scope
-  --> $DIR/bound-normalization-fail.rs:44:41
+  --> $DIR/bound-normalization-fail.rs:43:41
    |
 LL |     fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output=T::Assoc> {
    |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0271]: type mismatch resolving `<Foo<()> as FooLike>::Output == <T as lifetimes::Trait<'static>>::Assoc`
-  --> $DIR/bound-normalization-fail.rs:44:41
+  --> $DIR/bound-normalization-fail.rs:43:41
    |
 LL |     fn foo2_fail<'a, T: Trait<'a>>() -> impl FooLike<Output=T::Assoc> {
    |                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `()`, found associated type
diff --git a/src/test/ui/impl-trait/equal-hidden-lifetimes.rs b/src/test/ui/impl-trait/equal-hidden-lifetimes.rs
new file mode 100644
index 0000000000..79db88828b
--- /dev/null
+++ b/src/test/ui/impl-trait/equal-hidden-lifetimes.rs
@@ -0,0 +1,49 @@
+// Test that we consider equal regions when checking for hidden regions in
+// opaque types
+
+// check-pass
+
+// `'a == 'static` so `&'a i32` is fine as the return type
+fn equal_regions_static<'a: 'static>(x: &'a i32) -> impl Sized {
+    //~^ WARNING unnecessary lifetime parameter `'a`
+    x
+}
+
+// `'a == 'b` so `&'b i32` is fine as the return type
+fn equal_regions<'a: 'b, 'b: 'a>(x: &'b i32) -> impl Sized + 'a {
+    let y: &'a i32 = x;
+    let z: &'b i32 = y;
+    x
+}
+
+// `'a == 'b` so `&'a i32` is fine as the return type
+fn equal_regions_rev<'a: 'b, 'b: 'a>(x: &'a i32) -> impl Sized + 'b {
+    let y: &'a i32 = x;
+    let z: &'b i32 = y;
+    x
+}
+
+// `'a == 'b` so `*mut &'b i32` is fine as the return type
+fn equal_regions_inv<'a: 'b, 'b: 'a>(x: *mut &'b i32) -> impl Sized + 'a {
+    let y: *mut &'a i32 = x;
+    let z: *mut &'b i32 = y;
+    x
+}
+
+// `'a == 'b` so `*mut &'a i32` is fine as the return type
+fn equal_regions_inv_rev<'a: 'b, 'b: 'a>(x: *mut &'a i32) -> impl Sized + 'b {
+    let y: *mut &'a i32 = x;
+    let z: *mut &'b i32 = y;
+    x
+}
+
+// Should be able to infer `fn(&'static ())` as the return type.
+fn contravariant_lub<'a, 'b: 'a, 'c: 'a, 'd: 'b + 'c>(
+    x: fn(&'b ()),
+    y: fn(&'c ()),
+    c: bool,
+) -> impl Sized + 'a {
+    if c { x } else { y }
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/equal-hidden-lifetimes.stderr b/src/test/ui/impl-trait/equal-hidden-lifetimes.stderr
new file mode 100644
index 0000000000..eb064b4e14
--- /dev/null
+++ b/src/test/ui/impl-trait/equal-hidden-lifetimes.stderr
@@ -0,0 +1,8 @@
+warning: unnecessary lifetime parameter `'a`
+  --> $DIR/equal-hidden-lifetimes.rs:7:25
+   |
+LL | fn equal_regions_static<'a: 'static>(x: &'a i32) -> impl Sized {
+   |                         ^^^^^^^^^^^
+   |
+   = help: you can use the `'static` lifetime directly, in place of `'a`
+
diff --git a/src/test/ui/impl-trait/issue-55872-1.stderr b/src/test/ui/impl-trait/issue-55872-1.stderr
index 0d8ee61b5b..d62b8b1c25 100644
--- a/src/test/ui/impl-trait/issue-55872-1.stderr
+++ b/src/test/ui/impl-trait/issue-55872-1.stderr
@@ -1,11 +1,14 @@
 error[E0277]: the trait bound `S: std::marker::Copy` is not satisfied in `(S, T)`
   --> $DIR/issue-55872-1.rs:12:5
    |
-LL | impl<S: Default> Bar for S {
-   |      -- help: consider further restricting this bound: `S: std::marker::Copy +`
 LL |     type E = impl Copy;
    |     ^^^^^^^^^^^^^^^^^^^ within `(S, T)`, the trait `std::marker::Copy` is not implemented for `S`
    |
+help: consider further restricting this bound with `+ std::marker::Copy`
+  --> $DIR/issue-55872-1.rs:11:9
+   |
+LL | impl<S: Default> Bar for S {
+   |         ^^^^^^^
    = note: required because it appears within the type `(S, T)`
    = note: the return type of a function must have a statically known size
 
@@ -14,10 +17,12 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied in `(S, T)
    |
 LL |     type E = impl Copy;
    |     ^^^^^^^^^^^^^^^^^^^ within `(S, T)`, the trait `std::marker::Copy` is not implemented for `T`
-...
-LL |     fn foo<T: Default>() -> Self::E {
-   |            -- help: consider further restricting this bound: `T: std::marker::Copy +`
    |
+help: consider further restricting this bound with `+ std::marker::Copy`
+  --> $DIR/issue-55872-1.rs:16:15
+   |
+LL |     fn foo<T: Default>() -> Self::E {
+   |               ^^^^^^^
    = note: required because it appears within the type `(S, T)`
    = note: the return type of a function must have a statically known size
 
diff --git a/src/test/ui/impl-trait/issue-57200.rs b/src/test/ui/impl-trait/issue-57200.rs
new file mode 100644
index 0000000000..e0c71d1ac9
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-57200.rs
@@ -0,0 +1,15 @@
+// Regression test for #57200
+// FIXME: The error is temporary hack, we'll revisit here at some point.
+
+#![feature(impl_trait_in_bindings)]
+#![allow(incomplete_features)]
+
+fn bug<'a, 'b, T>()
+where
+    'a: 'b,
+{
+    let f: impl Fn(&'a T) -> &'b T = |x| x;
+    //~^ ERROR: lifetimes in impl Trait types in bindings are not currently supported
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/issue-57200.stderr b/src/test/ui/impl-trait/issue-57200.stderr
new file mode 100644
index 0000000000..b44f332d58
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-57200.stderr
@@ -0,0 +1,8 @@
+error: lifetimes in impl Trait types in bindings are not currently supported
+  --> $DIR/issue-57200.rs:11:12
+   |
+LL |     let f: impl Fn(&'a T) -> &'b T = |x| x;
+   |            ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/impl-trait/issue-57201.rs b/src/test/ui/impl-trait/issue-57201.rs
new file mode 100644
index 0000000000..c1a98d8897
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-57201.rs
@@ -0,0 +1,15 @@
+// Regression test for #57201
+// FIXME: The error is temporary hack, we'll revisit here at some point.
+
+#![feature(impl_trait_in_bindings)]
+#![allow(incomplete_features)]
+
+fn bug<'a, 'b, T>()
+where
+    'a: 'b,
+{
+    let f: &impl Fn(&'a T) -> &'b T = &|x| x;
+    //~^ ERROR: lifetimes in impl Trait types in bindings are not currently supported
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/issue-57201.stderr b/src/test/ui/impl-trait/issue-57201.stderr
new file mode 100644
index 0000000000..462b17bf45
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-57201.stderr
@@ -0,0 +1,8 @@
+error: lifetimes in impl Trait types in bindings are not currently supported
+  --> $DIR/issue-57201.rs:11:13
+   |
+LL |     let f: &impl Fn(&'a T) -> &'b T = &|x| x;
+   |             ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/impl-trait/issue-60473.rs b/src/test/ui/impl-trait/issue-60473.rs
new file mode 100644
index 0000000000..50cf0c8c6d
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-60473.rs
@@ -0,0 +1,17 @@
+// Regression test for #60473
+
+#![feature(impl_trait_in_bindings)]
+#![allow(incomplete_features)]
+
+struct A<'a>(&'a ());
+
+trait Trait<T> {
+}
+
+impl<T> Trait<T> for () {
+}
+
+fn main() {
+    let x: impl Trait<A> = (); // FIXME: The error doesn't seem correct.
+    //~^ ERROR: opaque type expands to a recursive type
+}
diff --git a/src/test/ui/impl-trait/issue-60473.stderr b/src/test/ui/impl-trait/issue-60473.stderr
new file mode 100644
index 0000000000..2d95be4e52
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-60473.stderr
@@ -0,0 +1,11 @@
+error[E0720]: opaque type expands to a recursive type
+  --> $DIR/issue-60473.rs:15:12
+   |
+LL |     let x: impl Trait<A> = (); // FIXME: The error doesn't seem correct.
+   |            ^^^^^^^^^^^^^ expands to a recursive type
+   |
+   = note: type resolves to itself
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0720`.
diff --git a/src/test/ui/impl-trait/issue-67166.rs b/src/test/ui/impl-trait/issue-67166.rs
new file mode 100644
index 0000000000..de7433a9bf
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-67166.rs
@@ -0,0 +1,11 @@
+// Regression test for #67166
+
+#![feature(impl_trait_in_bindings)]
+#![allow(incomplete_features)]
+
+pub fn run() {
+    let _foo: Box<impl Copy + '_> = Box::new(()); // FIXME: The error doesn't much make sense.
+    //~^ ERROR: opaque type expands to a recursive type
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/issue-67166.stderr b/src/test/ui/impl-trait/issue-67166.stderr
new file mode 100644
index 0000000000..56cba3cff0
--- /dev/null
+++ b/src/test/ui/impl-trait/issue-67166.stderr
@@ -0,0 +1,11 @@
+error[E0720]: opaque type expands to a recursive type
+  --> $DIR/issue-67166.rs:7:19
+   |
+LL |     let _foo: Box<impl Copy + '_> = Box::new(()); // FIXME: The error doesn't much make sense.
+   |                   ^^^^^^^^^^^^^^ expands to a recursive type
+   |
+   = note: type resolves to itself
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0720`.
diff --git a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr b/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
index 5741797547..64cce056a2 100644
--- a/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
+++ b/src/test/ui/impl-trait/issues/issue-21659-show-relevant-trait-impls-3.stderr
@@ -8,8 +8,11 @@ LL |     f1.foo(1usize);
    |        ^^^ method not found in `Bar`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `foo`, perhaps you need to implement it:
-           candidate #1: `Foo`
+note: `Foo` defines an item `foo`, perhaps you need to implement it
+  --> $DIR/issue-21659-show-relevant-trait-impls-3.rs:1:1
+   |
+LL | trait Foo<A> {
+   | ^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.rs b/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.rs
new file mode 100644
index 0000000000..96d891b2cf
--- /dev/null
+++ b/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.rs
@@ -0,0 +1,29 @@
+// compile-flags:-Zborrowck=mir
+
+#![feature(member_constraints)]
+#![feature(type_alias_impl_trait)]
+
+#[derive(Clone)]
+struct CopyIfEq<T, U>(T, U);
+
+impl<T: Copy> Copy for CopyIfEq<T, T> {}
+
+type E<'a, 'b> = impl Sized;
+
+fn foo<'a: 'b, 'b, 'c>(x: &'static i32, mut y: &'a i32) -> E<'b, 'c> {
+    //~^ ERROR hidden type for `impl Trait` captures lifetime that does not appear in bounds
+    let v = CopyIfEq::<*mut _, *mut _>(&mut { x }, &mut y);
+
+    // This assignment requires that `x` and `y` have the same type due to the
+    // `Copy` impl. The reason why we are using a copy to create a constraint
+    // is that only borrow checking (not regionck in type checking) enforces
+    // this bound.
+    let u = v;
+    let _: *mut &'a i32 = u.1;
+    unsafe {
+        let _: &'b i32 = *u.0;
+    }
+    u.0
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr b/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr
new file mode 100644
index 0000000000..59105f1180
--- /dev/null
+++ b/src/test/ui/impl-trait/multiple-lifetimes/error-handling-2.stderr
@@ -0,0 +1,15 @@
+error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
+  --> $DIR/error-handling-2.rs:13:60
+   |
+LL | fn foo<'a: 'b, 'b, 'c>(x: &'static i32, mut y: &'a i32) -> E<'b, 'c> {
+   |                                                            ^^^^^^^^^
+   |
+note: hidden type `*mut &'a i32` captures the lifetime `'a` as defined on the function body at 13:8
+  --> $DIR/error-handling-2.rs:13:8
+   |
+LL | fn foo<'a: 'b, 'b, 'c>(x: &'static i32, mut y: &'a i32) -> E<'b, 'c> {
+   |        ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.rs b/src/test/ui/impl-trait/multiple-lifetimes/error-handling.rs
index b226cf058a..8d02d63509 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.rs
+++ b/src/test/ui/impl-trait/multiple-lifetimes/error-handling.rs
@@ -11,11 +11,18 @@ impl<T: Copy> Copy for CopyIfEq<T, T> {}
 type E<'a, 'b> = impl Sized;
 
 fn foo<'a, 'b, 'c>(x: &'static i32, mut y: &'a i32) -> E<'b, 'c> {
-    //~^ ERROR lifetime may not live long enough
-    let v = CopyIfEq::<*mut _, *mut _>(&mut {x}, &mut y);
+    let v = CopyIfEq::<*mut _, *mut _>(&mut { x }, &mut y);
+
+    // This assignment requires that `x` and `y` have the same type due to the
+    // `Copy` impl. The reason why we are using a copy to create a constraint
+    // is that only borrow checking (not regionck in type checking) enforces
+    // this bound.
     let u = v;
     let _: *mut &'a i32 = u.1;
-    unsafe { let _: &'b i32 = *u.0; }
+    unsafe {
+        let _: &'b i32 = *u.0;
+        //~^ ERROR lifetime may not live long enough
+    }
     u.0
 }
 
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr b/src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr
index 5957ecbdc5..6ce3aaf49e 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr
+++ b/src/test/ui/impl-trait/multiple-lifetimes/error-handling.stderr
@@ -1,14 +1,15 @@
 error: lifetime may not live long enough
-  --> $DIR/error-handling.rs:13:56
+  --> $DIR/error-handling.rs:23:16
    |
 LL | fn foo<'a, 'b, 'c>(x: &'static i32, mut y: &'a i32) -> E<'b, 'c> {
-   |        -- lifetime `'a` defined here                   ^^^^^^^^^ opaque type requires that `'a` must outlive `'static`
-   |
-   = help: consider replacing `'a` with `'static`
-help: to allow this `impl Trait` to capture borrowed data with lifetime `'a`, add `'a` as a bound
-   |
-LL | type E<'a, 'b> = impl Sized + 'a;
-   |
+   |        --  -- lifetime `'b` defined here
+   |        |
+   |        lifetime `'a` defined here
+...
+LL |         let _: &'b i32 = *u.0;
+   |                ^^^^^^^ type annotation requires that `'a` must outlive `'b`
+   |
+   = help: consider adding the following bound: `'a: 'b`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.nll.stderr b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.nll.stderr
index a255c48ec6..5bfc446f6a 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.nll.stderr
+++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unrelated.nll.stderr
@@ -3,6 +3,8 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
    |
 LL | fn upper_bounds<'a, 'b, 'c, 'd, 'e>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'d, 'e>
    |                                                                          ^^^^^^^^^^^^^^^^^^
+   |
+   = note: hidden type `Ordinary<'_>` captures lifetime '_#8r
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.nll.stderr b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.nll.stderr
index af42ed1c5c..7291eee7b9 100644
--- a/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.nll.stderr
+++ b/src/test/ui/impl-trait/multiple-lifetimes/ordinary-bounds-unsuited.nll.stderr
@@ -3,6 +3,8 @@ error[E0700]: hidden type for `impl Trait` captures lifetime that does not appea
    |
 LL | fn upper_bounds<'a, 'b>(a: Ordinary<'a>, b: Ordinary<'b>) -> impl Trait<'a, 'b>
    |                                                              ^^^^^^^^^^^^^^^^^^
+   |
+   = note: hidden type `Ordinary<'_>` captures lifetime '_#5r
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs
index 1c3b5ac761..00f3490991 100644
--- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs
+++ b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.rs
@@ -12,7 +12,7 @@ impl<'a> LifetimeTrait<'a> for &'a i32 {}
 fn with_bound<'a>(x: &'a i32) -> impl LifetimeTrait<'a> + 'static { x }
 //~^ ERROR cannot infer an appropriate lifetime
 
-// Tests that a closure type contianing 'b cannot be returned from a type where
+// Tests that a closure type containing 'b cannot be returned from a type where
 // only 'a was expected.
 fn move_lifetime_into_fn<'a, 'b>(x: &'a u32, y: &'b u32) -> impl Fn(&'a u32) {
     //~^ ERROR lifetime mismatch
diff --git a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr
index 7f92e709af..cffa5ee8f1 100644
--- a/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr
+++ b/src/test/ui/impl-trait/must_outlive_least_region_or_bound.stderr
@@ -67,7 +67,7 @@ error[E0310]: the parameter type `T` may not live long enough
 LL | fn ty_param_wont_outlive_static<T:Debug>(x: T) -> impl Debug + 'static {
    |                                 --                ^^^^^^^^^^^^^^^^^^^^
    |                                 |
-   |                                 help: consider adding an explicit lifetime bound `T: 'static`...
+   |                                 help: consider adding an explicit lifetime bound...: `T: 'static +`
    |
 note: ...so that the type `T` will meet its required lifetime bounds
   --> $DIR/must_outlive_least_region_or_bound.rs:22:51
diff --git a/src/test/ui/impl-trait/nested-return-type.rs b/src/test/ui/impl-trait/nested-return-type.rs
new file mode 100644
index 0000000000..7d7a084b89
--- /dev/null
+++ b/src/test/ui/impl-trait/nested-return-type.rs
@@ -0,0 +1,16 @@
+// Check that nested impl Trait items work in functions with generic parameters.
+// check-pass
+
+trait Captures<'a> {}
+
+impl<T> Captures<'_> for T {}
+
+fn nested_assoc_type<'a: 'a, T>() -> impl Iterator<Item = impl Sized> {
+    [1].iter()
+}
+
+fn nested_assoc_lifetime<'a: 'a, T>() -> impl Iterator<Item = impl Captures<'a>> {
+    [1].iter()
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
index da25617e18..c0ca341385 100644
--- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr
+++ b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
@@ -126,8 +126,11 @@ LL |     1u64.method2();
    |          ^^^^^^^ method not found in `u64`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `method2`, perhaps you need to implement it:
-           candidate #1: `foo::Bar`
+note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
+  --> $DIR/no-method-suggested-traits.rs:8:5
+   |
+LL |     pub trait Bar {
+   |     ^^^^^^^^^^^^^
 
 error[E0599]: no method named `method2` found for struct `std::rc::Rc<&mut std::boxed::Box<&u64>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:47:44
@@ -136,8 +139,11 @@ LL |     std::rc::Rc::new(&mut Box::new(&1u64)).method2();
    |                                            ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&u64>>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `method2`, perhaps you need to implement it:
-           candidate #1: `foo::Bar`
+note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
+  --> $DIR/no-method-suggested-traits.rs:8:5
+   |
+LL |     pub trait Bar {
+   |     ^^^^^^^^^^^^^
 
 error[E0599]: no method named `method2` found for struct `no_method_suggested_traits::Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:50:37
@@ -146,8 +152,11 @@ LL |     no_method_suggested_traits::Foo.method2();
    |                                     ^^^^^^^ method not found in `no_method_suggested_traits::Foo`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `method2`, perhaps you need to implement it:
-           candidate #1: `foo::Bar`
+note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
+  --> $DIR/no-method-suggested-traits.rs:8:5
+   |
+LL |     pub trait Bar {
+   |     ^^^^^^^^^^^^^
 
 error[E0599]: no method named `method2` found for struct `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:52:71
@@ -156,8 +165,11 @@ LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).metho
    |                                                                       ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `method2`, perhaps you need to implement it:
-           candidate #1: `foo::Bar`
+note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
+  --> $DIR/no-method-suggested-traits.rs:8:5
+   |
+LL |     pub trait Bar {
+   |     ^^^^^^^^^^^^^
 
 error[E0599]: no method named `method2` found for enum `no_method_suggested_traits::Bar` in the current scope
   --> $DIR/no-method-suggested-traits.rs:54:40
@@ -166,8 +178,11 @@ LL |     no_method_suggested_traits::Bar::X.method2();
    |                                        ^^^^^^^ method not found in `no_method_suggested_traits::Bar`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `method2`, perhaps you need to implement it:
-           candidate #1: `foo::Bar`
+note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
+  --> $DIR/no-method-suggested-traits.rs:8:5
+   |
+LL |     pub trait Bar {
+   |     ^^^^^^^^^^^^^
 
 error[E0599]: no method named `method2` found for struct `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:56:74
@@ -176,8 +191,11 @@ LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).me
    |                                                                          ^^^^^^^ method not found in `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `method2`, perhaps you need to implement it:
-           candidate #1: `foo::Bar`
+note: `foo::Bar` defines an item `method2`, perhaps you need to implement it
+  --> $DIR/no-method-suggested-traits.rs:8:5
+   |
+LL |     pub trait Bar {
+   |     ^^^^^^^^^^^^^
 
 error[E0599]: no method named `method3` found for struct `Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:59:9
diff --git a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr b/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr
index 0c8d267c13..9df5188bbd 100644
--- a/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr
+++ b/src/test/ui/impl-trait/object-unsafe-trait-in-return-position-dyn-trait.stderr
@@ -1,20 +1,34 @@
 error[E0038]: the trait `NotObjectSafe` cannot be made into an object
-  --> $DIR/object-unsafe-trait-in-return-position-dyn-trait.rs:21:1
+  --> $DIR/object-unsafe-trait-in-return-position-dyn-trait.rs:21:13
    |
+LL | trait NotObjectSafe {
+   |       ------------- this trait cannot be made into an object...
 LL |     fn foo() -> Self;
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL | fn car() -> dyn NotObjectSafe {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
+   |             ^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() -> Self where Self: Sized;
+   |                      ^^^^^^^^^^^^^^^^^
 
 error[E0038]: the trait `NotObjectSafe` cannot be made into an object
-  --> $DIR/object-unsafe-trait-in-return-position-dyn-trait.rs:28:1
+  --> $DIR/object-unsafe-trait-in-return-position-dyn-trait.rs:28:13
    |
+LL | trait NotObjectSafe {
+   |       ------------- this trait cannot be made into an object...
 LL |     fn foo() -> Self;
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL | fn cat() -> Box<dyn NotObjectSafe> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
+   |             ^^^^^^^^^^^^^^^^^^^^^^ the trait `NotObjectSafe` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() -> Self where Self: Sized;
+   |                      ^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs b/src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs
index 2b4f5e0975..3cc5374409 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs
+++ b/src/test/ui/impl-trait/recursive-impl-trait-type-direct.rs
@@ -1,6 +1,9 @@
 // Test that an `impl Trait` type that expands to itself is an error.
 
-fn test() -> impl Sized { //~ ERROR E0720
+#![allow(unconditional_recursion)]
+
+fn test() -> impl Sized {
+    //~^ ERROR E0720
     test()
 }
 
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-direct.stderr b/src/test/ui/impl-trait/recursive-impl-trait-type-direct.stderr
index 1b5dbd814a..5a95e2969d 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-direct.stderr
+++ b/src/test/ui/impl-trait/recursive-impl-trait-type-direct.stderr
@@ -1,5 +1,5 @@
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-direct.rs:3:14
+  --> $DIR/recursive-impl-trait-type-direct.rs:5:14
    |
 LL | fn test() -> impl Sized {
    |              ^^^^^^^^^^ expands to a recursive type
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs b/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs
index 2428b560b7..e3c621f0c5 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs
+++ b/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.rs
@@ -2,59 +2,75 @@
 // otherwise forbidden.
 
 #![feature(generators)]
+#![allow(unconditional_recursion)]
 
-fn option(i: i32) -> impl Sized { //~ ERROR
-    if i < 0 {
-        None
-    } else {
-        Some((option(i - 1), i))
-    }
+fn option(i: i32) -> impl Sized {
+    //~^ ERROR
+    if i < 0 { None } else { Some((option(i - 1), i)) }
 }
 
-fn tuple() -> impl Sized { //~ ERROR
+fn tuple() -> impl Sized {
+    //~^ ERROR
     (tuple(),)
 }
 
-fn array() -> impl Sized { //~ ERROR
+fn array() -> impl Sized {
+    //~^ ERROR
     [array()]
 }
 
-fn ptr() -> impl Sized { //~ ERROR
+fn ptr() -> impl Sized {
+    //~^ ERROR
     &ptr() as *const _
 }
 
-fn fn_ptr() -> impl Sized { //~ ERROR
+fn fn_ptr() -> impl Sized {
+    //~^ ERROR
     fn_ptr as fn() -> _
 }
 
-fn closure_capture() -> impl Sized { //~ ERROR
+fn closure_capture() -> impl Sized {
+    //~^ ERROR
     let x = closure_capture();
-    move || { x; }
+    move || {
+        x;
+    }
 }
 
-fn closure_ref_capture() -> impl Sized { //~ ERROR
+fn closure_ref_capture() -> impl Sized {
+    //~^ ERROR
     let x = closure_ref_capture();
-    move || { &x; }
+    move || {
+        &x;
+    }
 }
 
-fn closure_sig() -> impl Sized { //~ ERROR
+fn closure_sig() -> impl Sized {
+    //~^ ERROR
     || closure_sig()
 }
 
-fn generator_sig() -> impl Sized { //~ ERROR
+fn generator_sig() -> impl Sized {
+    //~^ ERROR
     || generator_sig()
 }
 
-fn generator_capture() -> impl Sized { //~ ERROR
+fn generator_capture() -> impl Sized {
+    //~^ ERROR
     let x = generator_capture();
-    move || { yield; x; }
+    move || {
+        yield;
+        x;
+    }
 }
 
-fn substs_change<T>() -> impl Sized { //~ ERROR
+fn substs_change<T: 'static>() -> impl Sized {
+    //~^ ERROR
     (substs_change::<&T>(),)
 }
 
-fn generator_hold() -> impl Sized { //~ ERROR
+fn generator_hold() -> impl Sized {
+    //~^ ERROR
     move || {
         let x = generator_hold();
         yield;
@@ -62,15 +78,18 @@ fn generator_hold() -> impl Sized { //~ ERROR
     }
 }
 
-fn use_fn_ptr() -> impl Sized { // OK, error already reported
+fn use_fn_ptr() -> impl Sized {
+    // OK, error already reported
     fn_ptr()
 }
 
-fn mutual_recursion() -> impl Sync { //~ ERROR
+fn mutual_recursion() -> impl Sync {
+    //~^ ERROR
     mutual_recursion_b()
 }
 
-fn mutual_recursion_b() -> impl Sized { //~ ERROR
+fn mutual_recursion_b() -> impl Sized {
+    //~^ ERROR
     mutual_recursion()
 }
 
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr b/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr
index 15a028f60a..6573b00870 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr
+++ b/src/test/ui/impl-trait/recursive-impl-trait-type-indirect.stderr
@@ -1,5 +1,5 @@
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:6:22
+  --> $DIR/recursive-impl-trait-type-indirect.rs:7:22
    |
 LL | fn option(i: i32) -> impl Sized {
    |                      ^^^^^^^^^^ expands to a recursive type
@@ -7,7 +7,7 @@ LL | fn option(i: i32) -> impl Sized {
    = note: expanded type is `std::option::Option<(impl Sized, i32)>`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:14:15
+  --> $DIR/recursive-impl-trait-type-indirect.rs:12:15
    |
 LL | fn tuple() -> impl Sized {
    |               ^^^^^^^^^^ expands to a recursive type
@@ -15,7 +15,7 @@ LL | fn tuple() -> impl Sized {
    = note: expanded type is `(impl Sized,)`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:18:15
+  --> $DIR/recursive-impl-trait-type-indirect.rs:17:15
    |
 LL | fn array() -> impl Sized {
    |               ^^^^^^^^^^ expands to a recursive type
@@ -31,7 +31,7 @@ LL | fn ptr() -> impl Sized {
    = note: expanded type is `*const impl Sized`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:26:16
+  --> $DIR/recursive-impl-trait-type-indirect.rs:27:16
    |
 LL | fn fn_ptr() -> impl Sized {
    |                ^^^^^^^^^^ expands to a recursive type
@@ -39,63 +39,63 @@ LL | fn fn_ptr() -> impl Sized {
    = note: expanded type is `fn() -> impl Sized`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:30:25
+  --> $DIR/recursive-impl-trait-type-indirect.rs:32:25
    |
 LL | fn closure_capture() -> impl Sized {
    |                         ^^^^^^^^^^ expands to a recursive type
    |
-   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:32:5: 32:19 x:impl Sized]`
+   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:35:5: 37:6 x:impl Sized]`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:35:29
+  --> $DIR/recursive-impl-trait-type-indirect.rs:40:29
    |
 LL | fn closure_ref_capture() -> impl Sized {
    |                             ^^^^^^^^^^ expands to a recursive type
    |
-   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:37:5: 37:20 x:impl Sized]`
+   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:43:5: 45:6 x:impl Sized]`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:40:21
+  --> $DIR/recursive-impl-trait-type-indirect.rs:48:21
    |
 LL | fn closure_sig() -> impl Sized {
    |                     ^^^^^^^^^^ expands to a recursive type
    |
-   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:41:5: 41:21]`
+   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:50:5: 50:21]`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:44:23
+  --> $DIR/recursive-impl-trait-type-indirect.rs:53:23
    |
 LL | fn generator_sig() -> impl Sized {
    |                       ^^^^^^^^^^ expands to a recursive type
    |
-   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:45:5: 45:23]`
+   = note: expanded type is `[closure@$DIR/recursive-impl-trait-type-indirect.rs:55:5: 55:23]`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:48:27
+  --> $DIR/recursive-impl-trait-type-indirect.rs:58:27
    |
 LL | fn generator_capture() -> impl Sized {
    |                           ^^^^^^^^^^ expands to a recursive type
    |
-   = note: expanded type is `[generator@$DIR/recursive-impl-trait-type-indirect.rs:50:5: 50:26 x:impl Sized {(), ()}]`
+   = note: expanded type is `[generator@$DIR/recursive-impl-trait-type-indirect.rs:61:5: 64:6 x:impl Sized {()}]`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:53:26
+  --> $DIR/recursive-impl-trait-type-indirect.rs:67:35
    |
-LL | fn substs_change<T>() -> impl Sized {
-   |                          ^^^^^^^^^^ expands to a recursive type
+LL | fn substs_change<T: 'static>() -> impl Sized {
+   |                                   ^^^^^^^^^^ expands to a recursive type
    |
    = note: expanded type is `(impl Sized,)`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:57:24
+  --> $DIR/recursive-impl-trait-type-indirect.rs:72:24
    |
 LL | fn generator_hold() -> impl Sized {
    |                        ^^^^^^^^^^ expands to a recursive type
    |
-   = note: expanded type is `[generator@$DIR/recursive-impl-trait-type-indirect.rs:58:5: 62:6 {impl Sized, (), ()}]`
+   = note: expanded type is `[generator@$DIR/recursive-impl-trait-type-indirect.rs:74:5: 78:6 {impl Sized, ()}]`
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:69:26
+  --> $DIR/recursive-impl-trait-type-indirect.rs:86:26
    |
 LL | fn mutual_recursion() -> impl Sync {
    |                          ^^^^^^^^^ expands to a recursive type
@@ -103,7 +103,7 @@ LL | fn mutual_recursion() -> impl Sync {
    = note: type resolves to itself
 
 error[E0720]: opaque type expands to a recursive type
-  --> $DIR/recursive-impl-trait-type-indirect.rs:73:28
+  --> $DIR/recursive-impl-trait-type-indirect.rs:91:28
    |
 LL | fn mutual_recursion_b() -> impl Sized {
    |                            ^^^^^^^^^^ expands to a recursive type
diff --git a/src/test/ui/impl-trait/trait_type.stderr b/src/test/ui/impl-trait/trait_type.stderr
index d95b62e469..748bc639a0 100644
--- a/src/test/ui/impl-trait/trait_type.stderr
+++ b/src/test/ui/impl-trait/trait_type.stderr
@@ -29,7 +29,7 @@ error[E0046]: not all trait items implemented, missing: `fmt`
 LL | impl std::fmt::Display for MyType4 {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
    |
-   = help: implement the missing item: `fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { unimplemented!() }`
+   = help: implement the missing item: `fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { todo!() }`
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/impl-trait/type_parameters_captured.stderr b/src/test/ui/impl-trait/type_parameters_captured.stderr
index 708b479ab1..34f0f7f1d7 100644
--- a/src/test/ui/impl-trait/type_parameters_captured.stderr
+++ b/src/test/ui/impl-trait/type_parameters_captured.stderr
@@ -4,7 +4,7 @@ error[E0310]: the parameter type `T` may not live long enough
 LL | fn foo<T>(x: T) -> impl Any + 'static {
    |        -           ^^^^^^^^^^^^^^^^^^
    |        |
-   |        help: consider adding an explicit lifetime bound `T: 'static`...
+   |        help: consider adding an explicit lifetime bound...: `T: 'static`
    |
 note: ...so that the type `T` will meet its required lifetime bounds
   --> $DIR/type_parameters_captured.rs:7:20
diff --git a/src/test/ui/impl-trait/unsafety-checking-cycle.rs b/src/test/ui/impl-trait/unsafety-checking-cycle.rs
new file mode 100644
index 0000000000..4a5831c5b7
--- /dev/null
+++ b/src/test/ui/impl-trait/unsafety-checking-cycle.rs
@@ -0,0 +1,32 @@
+// Ensure that we don't get a cycle error from trying to determine whether an
+// opaque type implements `Freeze` in safety checking, when it doesn't matter.
+
+// check-pass
+
+#![feature(rustc_attrs)]
+
+struct AnyValue<T>(T);
+
+// No need to check for `Freeze` here, there's no
+// `rustc_layout_scalar_valid_range_start` involved.
+fn not_restricted(c: bool) -> impl Sized {
+    if c {
+        let x = AnyValue(not_restricted(false));
+        &x.0;
+    }
+    2u32
+}
+
+#[rustc_layout_scalar_valid_range_start(1)]
+struct NonZero<T>(T);
+
+// No need to check for `Freeze` here, we're not borrowing the field.
+fn not_field(c: bool) -> impl Sized {
+    if c {
+        let x = unsafe { NonZero(not_field(false)) };
+        &x;
+    }
+    5u32
+}
+
+fn main() {}
diff --git a/src/test/ui/impl-trait/where-allowed.stderr b/src/test/ui/impl-trait/where-allowed.stderr
index e5d2feff51..5d9ae6a030 100644
--- a/src/test/ui/impl-trait/where-allowed.stderr
+++ b/src/test/ui/impl-trait/where-allowed.stderr
@@ -22,7 +22,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Out = impl Debug;
    |                ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -31,7 +31,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type InTypeAlias<R> = impl Debug;
    |                       ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` in type aliases is unstable
@@ -40,7 +40,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL | type InReturnInTypeAlias<R> = fn() -> impl Debug;
    |                                       ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0562]: `impl Trait` not allowed outside of function and inherent method return types
diff --git a/src/test/ui/imports/extern-crate-used.stderr b/src/test/ui/imports/extern-crate-used.stderr
index 397bfa0290..1b9a2e4720 100644
--- a/src/test/ui/imports/extern-crate-used.stderr
+++ b/src/test/ui/imports/extern-crate-used.stderr
@@ -4,7 +4,7 @@ error: unused extern crate
 LL | extern crate core;
    | ^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/extern-crate-used.rs:6:9
    |
 LL | #![deny(unused_extern_crates)]
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr b/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
index e067432b39..f7544306d3 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
+++ b/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr
@@ -6,6 +6,8 @@ LL |         extern crate std as non_existent;
 ...
 LL | define_std_as_non_existent!();
    | ------------------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0433]: failed to resolve: use of undeclared type or module `two_macros`
   --> $DIR/extern-prelude-extern-crate-fail.rs:10:9
diff --git a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr b/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr
index 245013a4ea..e344d05914 100644
--- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr
+++ b/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr
@@ -6,6 +6,8 @@ LL |         extern crate std as core;
 ...
 LL | define_other_core!();
    | --------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `Vec` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/extern-prelude-extern-crate-restricted-shadowing.rs:17:9
@@ -26,6 +28,7 @@ note: `Vec` could also refer to the struct defined here
    |
 LL | pub use crate::vec::Vec;
    |         ^^^^^^^^^^^^^^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/imports/import-crate-var.stderr b/src/test/ui/imports/import-crate-var.stderr
index 85f15ad464..6bc2d15b2f 100644
--- a/src/test/ui/imports/import-crate-var.stderr
+++ b/src/test/ui/imports/import-crate-var.stderr
@@ -4,7 +4,7 @@ error: `$crate` may not be imported
 LL |     m!();
    |     ^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/imports/import-prefix-macro-1.stderr b/src/test/ui/imports/import-prefix-macro-1.stderr
index 6c12a366b7..2ecc519e71 100644
--- a/src/test/ui/imports/import-prefix-macro-1.stderr
+++ b/src/test/ui/imports/import-prefix-macro-1.stderr
@@ -6,6 +6,8 @@ LL |     ($p: path) => (use $p {S, Z});
 ...
 LL | import! { a::b::c }
    | ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/imports/import-prefix-macro-2.stderr b/src/test/ui/imports/import-prefix-macro-2.stderr
index 8428dce272..80317a3494 100644
--- a/src/test/ui/imports/import-prefix-macro-2.stderr
+++ b/src/test/ui/imports/import-prefix-macro-2.stderr
@@ -6,6 +6,8 @@ LL |     ($p: path) => (use ::$p {S, Z});
 ...
 LL | import! { a::b::c }
    | ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-1.stderr b/src/test/ui/imports/local-modularized-tricky-fail-1.stderr
index c9498fed6a..ea720c8b87 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-1.stderr
+++ b/src/test/ui/imports/local-modularized-tricky-fail-1.stderr
@@ -20,6 +20,7 @@ note: `exported` could also refer to the macro imported here
 LL | use inner1::*;
    |     ^^^^^^^^^
    = help: consider adding an explicit import of `exported` to disambiguate
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `exported` is ambiguous (glob import vs macro-expanded name in the same module during import/macro resolution)
   --> $DIR/local-modularized-tricky-fail-1.rs:28:1
@@ -43,6 +44,7 @@ note: `exported` could also refer to the macro imported here
 LL | use inner1::*;
    |     ^^^^^^^^^
    = help: consider adding an explicit import of `exported` to disambiguate
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `panic` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/local-modularized-tricky-fail-1.rs:36:5
@@ -62,6 +64,7 @@ LL | |     }
 LL |       define_panic!();
    |       ---------------- in this macro invocation
    = help: use `crate::panic` to refer to this macro unambiguously
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `include` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/local-modularized-tricky-fail-1.rs:47:1
@@ -81,6 +84,7 @@ LL | |     }
 LL |       define_include!();
    |       ------------------ in this macro invocation
    = help: use `crate::include` to refer to this macro unambiguously
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr b/src/test/ui/imports/local-modularized-tricky-fail-2.stderr
index 92a836cadf..714c04add5 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr
+++ b/src/test/ui/imports/local-modularized-tricky-fail-2.stderr
@@ -7,8 +7,9 @@ LL | exported!();
 LL |                 () => ( struct Б; )
    |                                ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: non-ascii idents are not fully supported
   --> $DIR/local-modularized-tricky-fail-2.rs:36:24
@@ -19,8 +20,9 @@ LL |     panic!();
 LL |         () => ( struct Г; )
    |                        ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: non-ascii idents are not fully supported
   --> $DIR/local-modularized-tricky-fail-2.rs:46:24
@@ -31,8 +33,9 @@ LL | include!();
 LL |         () => ( struct Д; )
    |                        ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-3.stderr b/src/test/ui/imports/local-modularized-tricky-fail-3.stderr
index 5272d2a319..4494a88a5c 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-3.stderr
+++ b/src/test/ui/imports/local-modularized-tricky-fail-3.stderr
@@ -17,6 +17,7 @@ LL | |     }
 ...
 LL |   define_exported!();
    |   ------------------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: macro-expanded `macro_export` macros from the current crate cannot be referred to by absolute paths
   --> $DIR/local-modularized-tricky-fail-3.rs:19:5
@@ -36,6 +37,7 @@ LL | |     }
 ...
 LL |   define_exported!();
    |   ------------------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/imports/reexports.stderr b/src/test/ui/imports/reexports.stderr
index b173884080..7b0d63574e 100644
--- a/src/test/ui/imports/reexports.stderr
+++ b/src/test/ui/imports/reexports.stderr
@@ -40,7 +40,7 @@ warning: glob import doesn't reexport anything because no candidate is public en
 LL |         pub use super::*;
    |                 ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/reexports.rs:1:9
    |
 LL | #![warn(unused_imports)]
diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/src/test/ui/imports/shadow_builtin_macros.stderr
index 2f2ab20cdf..413ead8c25 100644
--- a/src/test/ui/imports/shadow_builtin_macros.stderr
+++ b/src/test/ui/imports/shadow_builtin_macros.stderr
@@ -28,6 +28,7 @@ LL |         macro_rules! panic { () => {} }
 LL |     } }
 LL |     m!();
    |     ----- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `n` is ambiguous (glob import vs any other name from outer scope during import/macro resolution)
   --> $DIR/shadow_builtin_macros.rs:49:5
diff --git a/src/test/ui/imports/unresolved-imports-used.stderr b/src/test/ui/imports/unresolved-imports-used.stderr
index d7280d2583..69765b9227 100644
--- a/src/test/ui/imports/unresolved-imports-used.stderr
+++ b/src/test/ui/imports/unresolved-imports-used.stderr
@@ -52,7 +52,7 @@ error: unused import: `qux::quy`
 LL | use qux::quy;
    |     ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unresolved-imports-used.rs:2:9
    |
 LL | #![deny(unused_imports)]
diff --git a/src/test/ui/imports/unused-macro-use.stderr b/src/test/ui/imports/unused-macro-use.stderr
index b7fb532c67..7137a90e45 100644
--- a/src/test/ui/imports/unused-macro-use.stderr
+++ b/src/test/ui/imports/unused-macro-use.stderr
@@ -4,7 +4,7 @@ error: unused `#[macro_use]` import
 LL | #[macro_use]
    | ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-macro-use.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/imports/unused.stderr b/src/test/ui/imports/unused.stderr
index 0366b52ef6..08128d7942 100644
--- a/src/test/ui/imports/unused.stderr
+++ b/src/test/ui/imports/unused.stderr
@@ -4,7 +4,7 @@ error: unused import: `super::f`
 LL |         pub(super) use super::f;
    |                        ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed
index 29c570daef..2998f05efb 100644
--- a/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed
+++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.fixed
@@ -3,7 +3,7 @@
 
 #![allow(unused)]
 #![deny(elided_lifetimes_in_paths)]
-//~^ NOTE lint level defined here
+//~^ NOTE the lint level is defined here
 
 use std::cell::{RefCell, Ref};
 
diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs
index e59c9b4367..b729a15a29 100644
--- a/src/test/ui/in-band-lifetimes/elided-lifetimes.rs
+++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.rs
@@ -3,7 +3,7 @@
 
 #![allow(unused)]
 #![deny(elided_lifetimes_in_paths)]
-//~^ NOTE lint level defined here
+//~^ NOTE the lint level is defined here
 
 use std::cell::{RefCell, Ref};
 
diff --git a/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr b/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr
index 5c50d7e2aa..6eddd9c411 100644
--- a/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr
+++ b/src/test/ui/in-band-lifetimes/elided-lifetimes.stderr
@@ -4,7 +4,7 @@ error: hidden lifetime parameters in types are deprecated
 LL | fn foo(x: &Foo) {
    |            ^^^- help: indicate the anonymous lifetime: `<'_>`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/elided-lifetimes.rs:5:9
    |
 LL | #![deny(elided_lifetimes_in_paths)]
@@ -36,6 +36,8 @@ LL |         fn $fn_name(gift: &str) -> $type_name {
 ...
 LL | autowrapper!(Autowrapped, autowrap_gift, 'a);
    | --------------------------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hidden lifetime parameters in types are deprecated
   --> $DIR/elided-lifetimes.rs:78:18
@@ -51,6 +53,8 @@ LL |         Ref<($($types),*)>
 ...
 LL |     let yellow: anytuple_ref_ty!(bool, &str) = laughter.borrow();
    |                 ---------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/in-band-lifetimes/issue-61124-anon-lifetime-in-struct-declaration.stderr b/src/test/ui/in-band-lifetimes/issue-61124-anon-lifetime-in-struct-declaration.stderr
index 5f101a24c1..f2a4150632 100644
--- a/src/test/ui/in-band-lifetimes/issue-61124-anon-lifetime-in-struct-declaration.stderr
+++ b/src/test/ui/in-band-lifetimes/issue-61124-anon-lifetime-in-struct-declaration.stderr
@@ -6,8 +6,8 @@ LL | struct Heartbreak(Betrayal);
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct Heartbreak<'lifetime>(Betrayal<'lifetime>);
-   |                  ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^
+LL | struct Heartbreak<'a>(Betrayal<'a>);
+   |                  ^^^^ ^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
index bfb20ade03..a43b49041e 100644
--- a/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
+++ b/src/test/ui/in-band-lifetimes/no_introducing_in_band_in_locals.stderr
@@ -11,6 +11,16 @@ error[E0261]: use of undeclared lifetime name `'test`
    |
 LL |     let y: fn(&'test u32) = foo2;
    |                ^^^^^ undeclared lifetime
+   |
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider introducing lifetime `'test` here
+   |
+LL | fn bar<'test>() {
+   |       ^^^^^^^
+help: consider making the type lifetime-generic with a new `'test` lifetime
+   |
+LL |     let y: for<'test> fn(&'test u32) = foo2;
+   |            ^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/include-macros/mismatched-types.stderr b/src/test/ui/include-macros/mismatched-types.stderr
index efe1f58a6f..d035df8e5d 100644
--- a/src/test/ui/include-macros/mismatched-types.stderr
+++ b/src/test/ui/include-macros/mismatched-types.stderr
@@ -8,6 +8,7 @@ LL |     let b: &[u8] = include_str!("file.txt");
    |
    = note: expected reference `&[u8]`
               found reference `&'static str`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
   --> $DIR/mismatched-types.rs:3:19
@@ -19,6 +20,7 @@ LL |     let s: &str = include_bytes!("file.txt");
    |
    = note: expected reference `&str`
               found reference `&'static [u8; 0]`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/inference/infer-binary-operand-behind-reference.rs b/src/test/ui/inference/infer-binary-operand-behind-reference.rs
new file mode 100644
index 0000000000..0c0a3171ee
--- /dev/null
+++ b/src/test/ui/inference/infer-binary-operand-behind-reference.rs
@@ -0,0 +1,30 @@
+// check-pass
+
+fn main() {
+    // Test that we can infer the type of binary operands when
+    // references are involved, on various types and operators.
+    let _: u8 = 0 + 0;
+    let _: u8 = 0 + &0;
+    let _: u8 = &0 + 0;
+    let _: u8 = &0 + &0;
+
+    let _: f32 = 0.0 + 0.0;
+    let _: f32 = 0.0 + &0.0;
+    let _: f32 = &0.0 + 0.0;
+    let _: f32 = &0.0 + &0.0;
+
+    let _: u8 = 0 << 0;
+    let _: u8 = 0 << &0;
+    let _: u8 = &0 << 0;
+    let _: u8 = &0 << &0;
+
+    // Test type inference when variable types are indirectly inferred.
+    let a = 22;
+    let _: usize = a + &44;
+
+    // When we have no expected type, the types of the operands is the default type.
+    let _ = 0 + 0;
+    let _ = 0 + &0;
+    let _ = &0 + 0;
+    let _ = &0 + &0;
+}
diff --git a/src/test/ui/inference/inference_unstable_forced.stderr b/src/test/ui/inference/inference_unstable_forced.stderr
index 79a0b60b0a..a1c4cd851c 100644
--- a/src/test/ui/inference/inference_unstable_forced.stderr
+++ b/src/test/ui/inference/inference_unstable_forced.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'ipu_flatten'
 LL |     assert_eq!('x'.ipu_flatten(), 0);
    |                    ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/99999
+   = note: see issue #99999 <https://github.com/rust-lang/rust/issues/99999> for more information
    = help: add `#![feature(ipu_flatten)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/infinite/infinite-autoderef.stderr b/src/test/ui/infinite/infinite-autoderef.stderr
index 8c59fbd530..e7d90f00d2 100644
--- a/src/test/ui/infinite/infinite-autoderef.stderr
+++ b/src/test/ui/infinite/infinite-autoderef.stderr
@@ -13,7 +13,7 @@ error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
 LL |     Foo.foo;
    |     ^^^^^^^ deref recursion limit reached
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`infinite_autoderef`)
 
 error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
   --> $DIR/infinite-autoderef.rs:25:9
@@ -21,7 +21,7 @@ error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
 LL |     Foo.foo;
    |         ^^^ deref recursion limit reached
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`infinite_autoderef`)
 
 error[E0609]: no field `foo` on type `Foo`
   --> $DIR/infinite-autoderef.rs:25:9
@@ -35,7 +35,7 @@ error[E0055]: reached the recursion limit while auto-dereferencing `Foo`
 LL |     Foo.bar();
    |         ^^^ deref recursion limit reached
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`infinite_autoderef`)
 
 error[E0599]: no method named `bar` found for struct `Foo` in the current scope
   --> $DIR/infinite-autoderef.rs:26:9
diff --git a/src/test/ui/infinite/infinite-macro-expansion.stderr b/src/test/ui/infinite/infinite-macro-expansion.stderr
index 159312e5c1..c9254915d0 100644
--- a/src/test/ui/infinite/infinite-macro-expansion.stderr
+++ b/src/test/ui/infinite/infinite-macro-expansion.stderr
@@ -7,7 +7,8 @@ LL |     () => (recursive!())
 LL |     recursive!()
    |     ------------ in this macro invocation
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`infinite_macro_expansion`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/inline-asm-bad-constraint.stderr b/src/test/ui/inline-asm-bad-constraint.stderr
index f38bfb2af1..2647e337b9 100644
--- a/src/test/ui/inline-asm-bad-constraint.stderr
+++ b/src/test/ui/inline-asm-bad-constraint.stderr
@@ -3,18 +3,24 @@ error[E0668]: malformed inline assembly
    |
 LL |         asm!("" :"={rax"(rax))
    |         ^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0668]: malformed inline assembly
   --> $DIR/inline-asm-bad-constraint.rs:30:9
    |
 LL |         asm!("callq $0" : : "0"(foo))
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0668]: malformed inline assembly
   --> $DIR/inline-asm-bad-constraint.rs:37:9
    |
 LL |         asm!("addb $1, $0" : "={rax}"((0i32, rax)));
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/internal/internal-unstable-const.stderr b/src/test/ui/internal/internal-unstable-const.stderr
index 58bbe798b0..b2d97b981b 100644
--- a/src/test/ui/internal/internal-unstable-const.stderr
+++ b/src/test/ui/internal/internal-unstable-const.stderr
@@ -4,7 +4,7 @@ error[E0723]: loops and conditional expressions are not stable in const fn
 LL |     if true { 4 } else { 5 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/internal/internal-unstable-noallow.stderr b/src/test/ui/internal/internal-unstable-noallow.stderr
index 5a3a235615..ede8e5437f 100644
--- a/src/test/ui/internal/internal-unstable-noallow.stderr
+++ b/src/test/ui/internal/internal-unstable-noallow.stderr
@@ -5,7 +5,7 @@ LL |     call_unstable_noallow!();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: add `#![feature(function)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: use of unstable library feature 'struct_field'
   --> $DIR/internal-unstable-noallow.rs:18:5
@@ -14,7 +14,7 @@ LL |     construct_unstable_noallow!(0);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: add `#![feature(struct_field)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: use of unstable library feature 'method'
   --> $DIR/internal-unstable-noallow.rs:20:35
@@ -23,7 +23,7 @@ LL |     |x: internal_unstable::Foo| { call_method_noallow!(x) };
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: add `#![feature(method)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0658]: use of unstable library feature 'struct2_field'
   --> $DIR/internal-unstable-noallow.rs:22:35
@@ -32,7 +32,7 @@ LL |     |x: internal_unstable::Bar| { access_field_noallow!(x) };
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: add `#![feature(struct2_field)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/internal/internal-unstable.stderr b/src/test/ui/internal/internal-unstable.stderr
index 2c9d146921..2c6bf42ae8 100644
--- a/src/test/ui/internal/internal-unstable.stderr
+++ b/src/test/ui/internal/internal-unstable.stderr
@@ -40,6 +40,7 @@ LL |     bar!(internal_unstable::unstable());
    |     ------------------------------------ in this macro invocation
    |
    = help: add `#![feature(function)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.rs b/src/test/ui/invalid-self-argument/bare-fn-start.rs
index a003a01941..7c580bc5a5 100644
--- a/src/test/ui/invalid-self-argument/bare-fn-start.rs
+++ b/src/test/ui/invalid-self-argument/bare-fn-start.rs
@@ -1,6 +1,6 @@
 fn a(&self) { }
-//~^ ERROR unexpected `self` parameter in function
-//~| NOTE not valid as function parameter
-//~| NOTE `self` is only valid as the first parameter of an associated function
+//~^ ERROR `self` parameter is only allowed in associated functions
+//~| NOTE not semantically valid as function parameter
+//~| NOTE associated functions are those in `impl` or `trait` definitions
 
 fn main() { }
diff --git a/src/test/ui/invalid-self-argument/bare-fn-start.stderr b/src/test/ui/invalid-self-argument/bare-fn-start.stderr
index 23de650209..37753e61f5 100644
--- a/src/test/ui/invalid-self-argument/bare-fn-start.stderr
+++ b/src/test/ui/invalid-self-argument/bare-fn-start.stderr
@@ -1,10 +1,10 @@
-error: unexpected `self` parameter in function
+error: `self` parameter is only allowed in associated functions
   --> $DIR/bare-fn-start.rs:1:6
    |
 LL | fn a(&self) { }
-   |      ^^^^^ not valid as function parameter
+   |      ^^^^^ not semantically valid as function parameter
    |
-   = note: `self` is only valid as the first parameter of an associated function
+   = note: associated functions are those in `impl` or `trait` definitions
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/invalid-self-argument/bare-fn.rs b/src/test/ui/invalid-self-argument/bare-fn.rs
index 73d68e8b7a..342bdc31a7 100644
--- a/src/test/ui/invalid-self-argument/bare-fn.rs
+++ b/src/test/ui/invalid-self-argument/bare-fn.rs
@@ -1,6 +1,5 @@
 fn b(foo: u32, &mut self) { }
 //~^ ERROR unexpected `self` parameter in function
-//~| NOTE not valid as function parameter
-//~| NOTE `self` is only valid as the first parameter of an associated function
+//~| NOTE must be the first parameter of an associated function
 
 fn main() { }
diff --git a/src/test/ui/invalid-self-argument/bare-fn.stderr b/src/test/ui/invalid-self-argument/bare-fn.stderr
index 601a51bb4a..ff2217b5e8 100644
--- a/src/test/ui/invalid-self-argument/bare-fn.stderr
+++ b/src/test/ui/invalid-self-argument/bare-fn.stderr
@@ -2,9 +2,7 @@ error: unexpected `self` parameter in function
   --> $DIR/bare-fn.rs:1:16
    |
 LL | fn b(foo: u32, &mut self) { }
-   |                ^^^^^^^^^ not valid as function parameter
-   |
-   = note: `self` is only valid as the first parameter of an associated function
+   |                ^^^^^^^^^ must be the first parameter of an associated function
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/invalid-self-argument/trait-fn.rs b/src/test/ui/invalid-self-argument/trait-fn.rs
index 1e8220d7b4..5ccea58956 100644
--- a/src/test/ui/invalid-self-argument/trait-fn.rs
+++ b/src/test/ui/invalid-self-argument/trait-fn.rs
@@ -3,7 +3,7 @@ struct Foo {}
 impl Foo {
     fn c(foo: u32, self) {}
     //~^ ERROR unexpected `self` parameter in function
-    //~| NOTE must be the first associated function parameter
+    //~| NOTE must be the first parameter of an associated function
 
     fn good(&mut self, foo: u32) {}
 }
diff --git a/src/test/ui/invalid-self-argument/trait-fn.stderr b/src/test/ui/invalid-self-argument/trait-fn.stderr
index 96a2251c03..b9887af962 100644
--- a/src/test/ui/invalid-self-argument/trait-fn.stderr
+++ b/src/test/ui/invalid-self-argument/trait-fn.stderr
@@ -2,7 +2,7 @@ error: unexpected `self` parameter in function
   --> $DIR/trait-fn.rs:4:20
    |
 LL |     fn c(foo: u32, self) {}
-   |                    ^^^^ must be the first associated function parameter
+   |                    ^^^^ must be the first parameter of an associated function
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/invalid/invalid-no-sanitize.rs b/src/test/ui/invalid/invalid-no-sanitize.rs
new file mode 100644
index 0000000000..b52e3cc83f
--- /dev/null
+++ b/src/test/ui/invalid/invalid-no-sanitize.rs
@@ -0,0 +1,5 @@
+#![feature(no_sanitize)]
+
+#[no_sanitize(brontosaurus)] //~ ERROR invalid argument
+fn main() {
+}
diff --git a/src/test/ui/invalid/invalid-no-sanitize.stderr b/src/test/ui/invalid/invalid-no-sanitize.stderr
new file mode 100644
index 0000000000..e9983e5fbd
--- /dev/null
+++ b/src/test/ui/invalid/invalid-no-sanitize.stderr
@@ -0,0 +1,10 @@
+error: invalid argument for `no_sanitize`
+  --> $DIR/invalid-no-sanitize.rs:3:15
+   |
+LL | #[no_sanitize(brontosaurus)]
+   |               ^^^^^^^^^^^^
+   |
+   = note: expected one of: `address`, `memory` or `thread`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/invalid/invalid-plugin-attr.stderr b/src/test/ui/invalid/invalid-plugin-attr.stderr
index 0d7315dd88..9d07eafcc8 100644
--- a/src/test/ui/invalid/invalid-plugin-attr.stderr
+++ b/src/test/ui/invalid/invalid-plugin-attr.stderr
@@ -12,7 +12,7 @@ error: unused attribute
 LL | #[plugin(bla)]
    | ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/invalid-plugin-attr.rs:1:9
    |
 LL | #![deny(unused_attributes)]
diff --git a/src/test/ui/issues/auxiliary/issue-51798.rs b/src/test/ui/issues/auxiliary/issue-51798.rs
new file mode 100644
index 0000000000..fef5213db9
--- /dev/null
+++ b/src/test/ui/issues/auxiliary/issue-51798.rs
@@ -0,0 +1,3 @@
+#![crate_type = "lib"]
+
+pub fn vec() -> Vec<u8> { vec![] }
diff --git a/src/test/ui/issues/auxiliary/issue-69725.rs b/src/test/ui/issues/auxiliary/issue-69725.rs
new file mode 100644
index 0000000000..13606e498e
--- /dev/null
+++ b/src/test/ui/issues/auxiliary/issue-69725.rs
@@ -0,0 +1,8 @@
+#[derive(Clone)]
+pub struct Struct<A>(A);
+
+impl<A> Struct<A> {
+    pub fn new() -> Self {
+        todo!()
+    }
+}
diff --git a/src/test/ui/issues/issue-10656.stderr b/src/test/ui/issues/issue-10656.stderr
index 818457f507..2e91a598dc 100644
--- a/src/test/ui/issues/issue-10656.stderr
+++ b/src/test/ui/issues/issue-10656.stderr
@@ -5,7 +5,7 @@ LL | / #![deny(missing_docs)]
 LL | | #![crate_type="lib"]
    | |____________________^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-10656.rs:1:9
    |
 LL | #![deny(missing_docs)]
diff --git a/src/test/ui/issues/issue-12116.stderr b/src/test/ui/issues/issue-12116.stderr
index 10db4f1c03..4d162eb77e 100644
--- a/src/test/ui/issues/issue-12116.stderr
+++ b/src/test/ui/issues/issue-12116.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         &IntList::Cons(val, box IntList::Nil)  => IntList::Cons(val, box IntList::Nil),
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-12116.rs:5:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-12369.stderr b/src/test/ui/issues/issue-12369.stderr
index 754b94bab7..aab2be78c9 100644
--- a/src/test/ui/issues/issue-12369.stderr
+++ b/src/test/ui/issues/issue-12369.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         &[10,a, ref rest @ ..] => 10
    |         ^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-12369.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-12552.stderr b/src/test/ui/issues/issue-12552.stderr
index 60c4cceac5..45fede4410 100644
--- a/src/test/ui/issues/issue-12552.stderr
+++ b/src/test/ui/issues/issue-12552.stderr
@@ -12,6 +12,9 @@ LL |     Some(k) => match k {
 error[E0308]: mismatched types
   --> $DIR/issue-12552.rs:9:5
    |
+LL |   match t {
+   |         - this expression has type `std::result::Result<_, {integer}>`
+...
 LL |     None => ()
    |     ^^^^ expected enum `std::result::Result`, found enum `std::option::Option`
    |
diff --git a/src/test/ui/issues/issue-12567.stderr b/src/test/ui/issues/issue-12567.stderr
index 2a88d8f052..3ce659ccd1 100644
--- a/src/test/ui/issues/issue-12567.stderr
+++ b/src/test/ui/issues/issue-12567.stderr
@@ -8,7 +8,7 @@ LL |         (&[], &[hd, ..]) | (&[hd, ..], &[])
    |                 -- data moved here
 LL |             => println!("one empty"),
 LL |         (&[hd1, ..], &[hd2, ..])
-   |                        --- ...and here
+   |            --- ...and here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
 
@@ -22,7 +22,7 @@ LL |         (&[], &[hd, ..]) | (&[hd, ..], &[])
    |                 -- data moved here
 LL |             => println!("one empty"),
 LL |         (&[hd1, ..], &[hd2, ..])
-   |            --- ...and here
+   |                        --- ...and here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
 
diff --git a/src/test/ui/issues/issue-12997-2.stderr b/src/test/ui/issues/issue-12997-2.stderr
index 01f8e34883..04464896e9 100644
--- a/src/test/ui/issues/issue-12997-2.stderr
+++ b/src/test/ui/issues/issue-12997-2.stderr
@@ -3,6 +3,8 @@ error[E0308]: mismatched types
    |
 LL | fn bar(x: isize) { }
    | ^^^^^^^^^^^^^^^^^^^^ expected `isize`, found `&mut test::Bencher`
+   |
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-13446.stderr b/src/test/ui/issues/issue-13446.stderr
index 13c35dd84f..71d3bfe339 100644
--- a/src/test/ui/issues/issue-13446.stderr
+++ b/src/test/ui/issues/issue-13446.stderr
@@ -6,7 +6,7 @@ LL | static VEC: [u32; 256] = vec![];
    |
    = note: expected array `[u32; 256]`
              found struct `std::vec::Vec<_>`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-13727.stderr b/src/test/ui/issues/issue-13727.stderr
index 4d10665162..07ca56a566 100644
--- a/src/test/ui/issues/issue-13727.stderr
+++ b/src/test/ui/issues/issue-13727.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |     512 => print!("0b1111\n"),
    |     ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-13727.rs:2:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-14091-2.stderr b/src/test/ui/issues/issue-14091-2.stderr
index 2d6e9567d2..499ebe977e 100644
--- a/src/test/ui/issues/issue-14091-2.stderr
+++ b/src/test/ui/issues/issue-14091-2.stderr
@@ -5,6 +5,7 @@ LL |     assert!(x, x);
    |     ^^^^^^^^^^^^^^ cannot apply unary operator `!`
    |
    = note: an implementation of `std::ops::Not` might be missing for `BytePos`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-14221.stderr b/src/test/ui/issues/issue-14221.stderr
index 9864c0840d..63680f6ca5 100644
--- a/src/test/ui/issues/issue-14221.stderr
+++ b/src/test/ui/issues/issue-14221.stderr
@@ -21,7 +21,7 @@ LL |
 LL |             B => "B",
    |             ^ unreachable pattern
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-14221.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-14309.stderr b/src/test/ui/issues/issue-14309.stderr
index f598e1f9e2..799991f7ee 100644
--- a/src/test/ui/issues/issue-14309.stderr
+++ b/src/test/ui/issues/issue-14309.stderr
@@ -4,14 +4,14 @@ error: `extern` block uses type `A`, which is not FFI-safe
 LL |     fn foo(x: A);
    |               ^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-14309.rs:1:9
    |
 LL | #![deny(improper_ctypes)]
    |         ^^^^^^^^^^^^^^^
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/issue-14309.rs:4:1
    |
 LL | / struct A {
@@ -27,7 +27,7 @@ LL |     fn bar(x: B);
    |
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/issue-14309.rs:4:1
    |
 LL | / struct A {
@@ -43,7 +43,7 @@ LL |     fn qux(x: A2);
    |
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/issue-14309.rs:4:1
    |
 LL | / struct A {
@@ -59,7 +59,7 @@ LL |     fn quux(x: B2);
    |
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/issue-14309.rs:4:1
    |
 LL | / struct A {
@@ -75,7 +75,7 @@ LL |     fn fred(x: D);
    |
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/issue-14309.rs:4:1
    |
 LL | / struct A {
diff --git a/src/test/ui/issues/issue-14915.stderr b/src/test/ui/issues/issue-14915.stderr
index 00b9909af5..3c34a8a346 100644
--- a/src/test/ui/issues/issue-14915.stderr
+++ b/src/test/ui/issues/issue-14915.stderr
@@ -5,8 +5,6 @@ LL |     println!("{}", x + 1);
    |                    - ^ - {integer}
    |                    |
    |                    std::boxed::Box<isize>
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `std::boxed::Box<isize>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-15167.stderr b/src/test/ui/issues/issue-15167.stderr
index 1c488bf6fb..fff28b0c3a 100644
--- a/src/test/ui/issues/issue-15167.stderr
+++ b/src/test/ui/issues/issue-15167.stderr
@@ -6,6 +6,8 @@ LL | macro_rules! f { () => (n) }
 ...
 LL |         println!("{}", f!());
    |                        ---- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `n` in this scope
   --> $DIR/issue-15167.rs:3:25
@@ -15,6 +17,8 @@ LL | macro_rules! f { () => (n) }
 ...
 LL |         println!("{}", f!());
    |                        ---- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `n` in this scope
   --> $DIR/issue-15167.rs:3:25
@@ -24,6 +28,8 @@ LL | macro_rules! f { () => (n) }
 ...
 LL |         println!("{}", f!());
    |                        ---- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `n` in this scope
   --> $DIR/issue-15167.rs:3:25
@@ -33,6 +39,8 @@ LL | macro_rules! f { () => (n) }
 ...
 LL |         println!("{}", f!());
    |                        ---- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/issues/issue-15381.rs b/src/test/ui/issues/issue-15381.rs
index 5307153cb4..392fb1b24d 100644
--- a/src/test/ui/issues/issue-15381.rs
+++ b/src/test/ui/issues/issue-15381.rs
@@ -4,6 +4,5 @@ fn main() {
     for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
         //~^ ERROR refutable pattern in `for` loop binding: `&[]`, `&[_]`, `&[_, _]` and 1 more not
         println!("y={}", y);
-        //~^ ERROR borrow of possibly-uninitialized variable: `y`
     }
 }
diff --git a/src/test/ui/issues/issue-15381.stderr b/src/test/ui/issues/issue-15381.stderr
index 47a0d514ad..35f46ab572 100644
--- a/src/test/ui/issues/issue-15381.stderr
+++ b/src/test/ui/issues/issue-15381.stderr
@@ -4,13 +4,6 @@ error[E0005]: refutable pattern in `for` loop binding: `&[]`, `&[_]`, `&[_, _]`
 LL |     for &[x,y,z] in values.chunks(3).filter(|&xs| xs.len() == 3) {
    |         ^^^^^^^^ patterns `&[]`, `&[_]`, `&[_, _]` and 1 more not covered
 
-error[E0381]: borrow of possibly-uninitialized variable: `y`
-  --> $DIR/issue-15381.rs:6:26
-   |
-LL |         println!("y={}", y);
-   |                          ^ use of possibly-uninitialized `y`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors have detailed explanations: E0005, E0381.
-For more information about an error, try `rustc --explain E0005`.
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/issues/issue-16098.stderr b/src/test/ui/issues/issue-16098.stderr
index 2b9657d462..077c720a9c 100644
--- a/src/test/ui/issues/issue-16098.stderr
+++ b/src/test/ui/issues/issue-16098.stderr
@@ -7,7 +7,8 @@ LL |             $n + prob1!($n - 1);
 LL |     println!("Problem 1: {}", prob1!(1000));
    |                               ------------ in this macro invocation
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`issue_16098`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-16250.stderr b/src/test/ui/issues/issue-16250.stderr
index 5686ac3774..45f854f93e 100644
--- a/src/test/ui/issues/issue-16250.stderr
+++ b/src/test/ui/issues/issue-16250.stderr
@@ -4,7 +4,7 @@ error: `extern` block uses type `Foo`, which is not FFI-safe
 LL |     pub fn foo(x: (Foo));
    |                    ^^^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-16250.rs:1:9
    |
 LL | #![deny(warnings)]
@@ -12,7 +12,7 @@ LL | #![deny(warnings)]
    = note: `#[deny(improper_ctypes)]` implied by `#[deny(warnings)]`
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/issue-16250.rs:3:1
    |
 LL | pub struct Foo;
diff --git a/src/test/ui/issues/issue-16683.nll.stderr b/src/test/ui/issues/issue-16683.nll.stderr
index ea6b69d1a7..f76e7a4e44 100644
--- a/src/test/ui/issues/issue-16683.nll.stderr
+++ b/src/test/ui/issues/issue-16683.nll.stderr
@@ -1,10 +1,10 @@
-error[E0521]: borrowed data escapes outside of function
+error[E0521]: borrowed data escapes outside of method
   --> $DIR/issue-16683.rs:4:9
    |
 LL |     fn b(&self) {
-   |          ----- `self` is a reference that is only valid in the function body
+   |          ----- `self` is a reference that is only valid in the method body
 LL |         self.a();
-   |         ^^^^^^^^ `self` escapes the function body here
+   |         ^^^^^^^^ `self` escapes the method body here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-16939.stderr b/src/test/ui/issues/issue-16939.stderr
index 5df2119c14..103f56fa04 100644
--- a/src/test/ui/issues/issue-16939.stderr
+++ b/src/test/ui/issues/issue-16939.stderr
@@ -1,8 +1,10 @@
-error[E0057]: this function takes 0 parameters but 1 parameter was supplied
+error[E0057]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/issue-16939.rs:5:9
    |
 LL |     |t| f(t);
-   |         ^^^^ expected 0 parameters
+   |         ^ - supplied 1 argument
+   |         |
+   |         expected 0 arguments
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-16966.stderr b/src/test/ui/issues/issue-16966.stderr
index 49a12cc200..30932a375b 100644
--- a/src/test/ui/issues/issue-16966.stderr
+++ b/src/test/ui/issues/issue-16966.stderr
@@ -4,7 +4,7 @@ error[E0282]: type annotations needed
 LL |     panic!(std::default::Default::default());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `M` declared on the function `begin_panic`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-17337.stderr b/src/test/ui/issues/issue-17337.stderr
index 8973afb806..4a8116b1ff 100644
--- a/src/test/ui/issues/issue-17337.stderr
+++ b/src/test/ui/issues/issue-17337.stderr
@@ -4,7 +4,7 @@ error: use of deprecated item 'Foo::foo': text
 LL |     .foo();
    |      ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-17337.rs:2:9
    |
 LL | #![deny(deprecated)]
diff --git a/src/test/ui/issues/issue-17458.stderr b/src/test/ui/issues/issue-17458.stderr
index bb667e7b7d..68e86ea21b 100644
--- a/src/test/ui/issues/issue-17458.stderr
+++ b/src/test/ui/issues/issue-17458.stderr
@@ -4,7 +4,7 @@ error[E0658]: casting pointers to integers in statics is unstable
 LL | static X: usize = unsafe { core::ptr::null::<usize>() as usize };
    |                            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-17718-const-bad-values.stderr b/src/test/ui/issues/issue-17718-const-bad-values.stderr
index e45d8b6c74..688efcdd02 100644
--- a/src/test/ui/issues/issue-17718-const-bad-values.stderr
+++ b/src/test/ui/issues/issue-17718-const-bad-values.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL | const C1: &'static mut [usize] = &mut [];
    |                                  ^^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0013]: constants cannot refer to statics
@@ -29,7 +29,7 @@ error[E0658]: references in constants may only refer to immutable values
 LL | const C2: &'static mut usize = unsafe { &mut S };
    |                                         ^^^^^^ constants require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/issues/issue-17718-const-naming.stderr b/src/test/ui/issues/issue-17718-const-naming.stderr
index e320c436f5..4c0aa0553e 100644
--- a/src/test/ui/issues/issue-17718-const-naming.stderr
+++ b/src/test/ui/issues/issue-17718-const-naming.stderr
@@ -4,7 +4,7 @@ error: constant item is never used: `foo`
 LL | const foo: isize = 3;
    | ^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-17718-const-naming.rs:2:9
    |
 LL | #![deny(warnings)]
@@ -17,7 +17,7 @@ error: constant `foo` should have an upper case name
 LL | const foo: isize = 3;
    |       ^^^ help: convert the identifier to upper case (notice the capitalization): `FOO`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-17718-const-naming.rs:2:9
    |
 LL | #![deny(warnings)]
diff --git a/src/test/ui/issues/issue-17758.nll.stderr b/src/test/ui/issues/issue-17758.nll.stderr
index b9dc9da368..92e21f4dc1 100644
--- a/src/test/ui/issues/issue-17758.nll.stderr
+++ b/src/test/ui/issues/issue-17758.nll.stderr
@@ -1,10 +1,10 @@
-error[E0521]: borrowed data escapes outside of function
+error[E0521]: borrowed data escapes outside of method
   --> $DIR/issue-17758.rs:7:9
    |
 LL |     fn bar(&self) {
-   |            ----- `self` is a reference that is only valid in the function body
+   |            ----- `self` is a reference that is only valid in the method body
 LL |         self.foo();
-   |         ^^^^^^^^^^ `self` escapes the function body here
+   |         ^^^^^^^^^^ `self` escapes the method body here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-17999.stderr b/src/test/ui/issues/issue-17999.stderr
index b9ae03356e..448208ef03 100644
--- a/src/test/ui/issues/issue-17999.stderr
+++ b/src/test/ui/issues/issue-17999.stderr
@@ -4,7 +4,7 @@ error: unused variable: `x`
 LL |         let x = ();
    |             ^ help: consider prefixing with an underscore: `_x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-17999.rs:1:9
    |
 LL | #![deny(unused_variables)]
diff --git a/src/test/ui/issues/issue-18294.stderr b/src/test/ui/issues/issue-18294.stderr
index 7d6ef5eee0..52df558bfc 100644
--- a/src/test/ui/issues/issue-18294.stderr
+++ b/src/test/ui/issues/issue-18294.stderr
@@ -4,7 +4,7 @@ error[E0658]: casting pointers to integers in constants is unstable
 LL |     const Y: usize = unsafe { &X as *const u32 as usize };
    |                               ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-18400.stderr b/src/test/ui/issues/issue-18400.stderr
index 85cfa5663f..57067ad517 100644
--- a/src/test/ui/issues/issue-18400.stderr
+++ b/src/test/ui/issues/issue-18400.stderr
@@ -4,7 +4,7 @@ error[E0275]: overflow evaluating the requirement `_: std::marker::Sized`
 LL |     0.contains(bits);
    |       ^^^^^^^^
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`issue_18400`)
    = note: required because of the requirements on the impl of `Set<&[_]>` for `{integer}`
    = note: required because of the requirements on the impl of `Set<&[&[_]]>` for `{integer}`
    = note: required because of the requirements on the impl of `Set<&[&[&[_]]]>` for `{integer}`
diff --git a/src/test/ui/issues/issue-18819.stderr b/src/test/ui/issues/issue-18819.stderr
index 41e8470ecd..a952c9b46c 100644
--- a/src/test/ui/issues/issue-18819.stderr
+++ b/src/test/ui/issues/issue-18819.stderr
@@ -1,11 +1,13 @@
-error[E0061]: this function takes 2 parameters but 1 parameter was supplied
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
   --> $DIR/issue-18819.rs:16:5
    |
 LL | fn print_x(_: &dyn Foo<Item=bool>, extra: &str) {
    | ----------------------------------------------- defined here
 ...
 LL |     print_x(X);
-   |     ^^^^^^^^^^ expected 2 parameters
+   |     ^^^^^^^ - supplied 1 argument
+   |     |
+   |     expected 2 arguments
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-18919.stderr b/src/test/ui/issues/issue-18919.stderr
index 87528652bd..c8b9045efe 100644
--- a/src/test/ui/issues/issue-18919.stderr
+++ b/src/test/ui/issues/issue-18919.stderr
@@ -1,10 +1,8 @@
 error[E0277]: the size for values of type `dyn for<'r> std::ops::Fn(&'r isize) -> isize` cannot be known at compilation time
-  --> $DIR/issue-18919.rs:3:1
+  --> $DIR/issue-18919.rs:3:15
    |
-LL | / fn ho_func(f: Option<FuncType>) {
-LL | |
-LL | | }
-   | |_^ doesn't have a size known at compile-time
+LL | fn ho_func(f: Option<FuncType>) {
+   |               ^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `dyn for<'r> std::ops::Fn(&'r isize) -> isize`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-18959.stderr b/src/test/ui/issues/issue-18959.stderr
index d5e7092801..b3ba7aecad 100644
--- a/src/test/ui/issues/issue-18959.stderr
+++ b/src/test/ui/issues/issue-18959.stderr
@@ -1,11 +1,15 @@
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/issue-18959.rs:11:1
+  --> $DIR/issue-18959.rs:11:11
    |
 LL | pub trait Foo { fn foo<T>(&self, ext_thing: &T); }
-   |                    --- method `foo` has generic type parameters
+   |                    --- ...because method `foo` has generic type parameters
+LL | pub trait Bar: Foo { }
+   |           --- this trait cannot be made into an object...
 ...
 LL | fn foo(b: &dyn Bar) {
-   | ^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
+   |           ^^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `foo` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-19380.stderr b/src/test/ui/issues/issue-19380.stderr
index 92bfdf1f26..0a080171a7 100644
--- a/src/test/ui/issues/issue-19380.stderr
+++ b/src/test/ui/issues/issue-19380.stderr
@@ -1,11 +1,18 @@
 error[E0038]: the trait `Qiz` cannot be made into an object
   --> $DIR/issue-19380.rs:11:3
    |
+LL | trait Qiz {
+   |       --- this trait cannot be made into an object...
 LL |   fn qiz();
-   |      --- associated function `qiz` has no `self` parameter
+   |      --- ...because associated function `qiz` has no `self` parameter
 ...
 LL |   foos: &'static [&'static (dyn Qiz + 'static)]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Qiz` cannot be made into an object
+   |
+help: consider turning `qiz` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |   fn qiz() where Self: Sized;
+   |            ^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-19538.stderr b/src/test/ui/issues/issue-19538.stderr
index 83c03b514d..b6033e47b1 100644
--- a/src/test/ui/issues/issue-19538.stderr
+++ b/src/test/ui/issues/issue-19538.stderr
@@ -2,20 +2,29 @@ error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/issue-19538.rs:17:15
    |
 LL |     fn foo<T>(&self, val: T);
-   |        --- method `foo` has generic type parameters
+   |        --- ...because method `foo` has generic type parameters
+...
+LL | trait Bar: Foo { }
+   |       --- this trait cannot be made into an object...
 ...
 LL |     let test: &mut dyn Bar = &mut thing;
    |               ^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `foo` to another trait
 
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/issue-19538.rs:17:30
    |
 LL |     fn foo<T>(&self, val: T);
-   |        --- method `foo` has generic type parameters
+   |        --- ...because method `foo` has generic type parameters
+...
+LL | trait Bar: Foo { }
+   |       --- this trait cannot be made into an object...
 ...
 LL |     let test: &mut dyn Bar = &mut thing;
    |                              ^^^^^^^^^^ the trait `Bar` cannot be made into an object
    |
+   = help: consider moving `foo` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&mut dyn Bar>` for `&mut Thing`
    = note: required by cast to type `&mut dyn Bar`
 
diff --git a/src/test/ui/issues/issue-19707.stderr b/src/test/ui/issues/issue-19707.stderr
index 8a627bc0bd..337f2f971e 100644
--- a/src/test/ui/issues/issue-19707.stderr
+++ b/src/test/ui/issues/issue-19707.stderr
@@ -2,25 +2,35 @@ error[E0106]: missing lifetime specifier
   --> $DIR/issue-19707.rs:3:28
    |
 LL | type Foo = fn(&u8, &u8) -> &u8;
-   |                            ^ expected named lifetime parameter
+   |               ---  ---     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the type lifetime-generic with a new `'a` lifetime
+   |
+LL | type Foo = for<'a> fn(&'a u8, &'a u8) -> &'a u8;
+   |            ^^^^^^^    ^^^^^^  ^^^^^^     ^^^
 help: consider introducing a named lifetime parameter
    |
-LL | type Foo<'lifetime> = fn(&u8, &u8) -> &'lifetime u8;
-   |         ^^^^^^^^^^^                   ^^^^^^^^^^
+LL | type Foo<'a> = fn(&'a u8, &'a u8) -> &'a u8;
+   |         ^^^^      ^^^^^^  ^^^^^^     ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-19707.rs:5:27
    |
 LL | fn bar<F: Fn(&u8, &u8) -> &u8>(f: &F) {}
-   |                           ^ expected named lifetime parameter
+   |              ---  ---     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the bound lifetime-generic with a new `'a` lifetime
+   |
+LL | fn bar<F: for<'a> Fn(&'a u8, &'a u8) -> &'a u8>(f: &F) {}
+   |           ^^^^^^^    ^^^^^^  ^^^^^^     ^^^
 help: consider introducing a named lifetime parameter
    |
-LL | fn bar<'lifetime, F: Fn(&u8, &u8) -> &'lifetime u8>(f: &F) {}
-   |        ^^^^^^^^^^                    ^^^^^^^^^^
+LL | fn bar<'a, F: Fn(&'a u8, &'a u8) -> &'a u8>(f: &F) {}
+   |        ^^^       ^^^^^^  ^^^^^^     ^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-20005.rs b/src/test/ui/issues/issue-20005.rs
index 6d63c9e5b6..36350bff10 100644
--- a/src/test/ui/issues/issue-20005.rs
+++ b/src/test/ui/issues/issue-20005.rs
@@ -5,9 +5,9 @@ trait From<Src> {
 }
 
 trait To {
-    fn to<Dst>(  //~ ERROR the size for values of type
+    fn to<Dst>(
         self
-    ) -> <Dst as From<Self>>::Result where Dst: From<Self> {
+    ) -> <Dst as From<Self>>::Result where Dst: From<Self> { //~ ERROR the size for values of type
         From::from(self)
     }
 }
diff --git a/src/test/ui/issues/issue-20005.stderr b/src/test/ui/issues/issue-20005.stderr
index 31376f2d1b..529571a6b7 100644
--- a/src/test/ui/issues/issue-20005.stderr
+++ b/src/test/ui/issues/issue-20005.stderr
@@ -1,16 +1,13 @@
 error[E0277]: the size for values of type `Self` cannot be known at compilation time
-  --> $DIR/issue-20005.rs:8:5
+  --> $DIR/issue-20005.rs:10:49
    |
-LL |   trait From<Src> {
-   |   --------------- required by `From`
+LL | trait From<Src> {
+   | --------------- required by `From`
 ...
-LL | /     fn to<Dst>(
-LL | |         self
-LL | |     ) -> <Dst as From<Self>>::Result where Dst: From<Self> {
-   | |                                                           - help: consider further restricting `Self`: `, Self: std::marker::Sized`
-LL | |         From::from(self)
-LL | |     }
-   | |_____^ doesn't have a size known at compile-time
+LL |     ) -> <Dst as From<Self>>::Result where Dst: From<Self> {
+   |                                                 ^^^^^^^^^^- help: consider further restricting `Self`: `, Self: std::marker::Sized`
+   |                                                 |
+   |                                                 doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `Self`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-20313.stderr b/src/test/ui/issues/issue-20313.stderr
index a3fa7ebba8..7a0b344a5a 100644
--- a/src/test/ui/issues/issue-20313.stderr
+++ b/src/test/ui/issues/issue-20313.stderr
@@ -4,7 +4,7 @@ error[E0658]: linking to LLVM intrinsics is experimental
 LL |     fn sqrt(x: f32) -> f32;
    |     ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29602
+   = note: see issue #29602 <https://github.com/rust-lang/rust/issues/29602> for more information
    = help: add `#![feature(link_llvm_intrinsics)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-20413.rs b/src/test/ui/issues/issue-20413.rs
index 7eb6d5c0ec..19ef52af65 100644
--- a/src/test/ui/issues/issue-20413.rs
+++ b/src/test/ui/issues/issue-20413.rs
@@ -6,9 +6,9 @@ struct NoData<T>;
 //~^ ERROR: parameter `T` is never used
 
 impl<T> Foo for T where NoData<T>: Foo {
-//~^ ERROR: overflow evaluating the requirement
-  fn answer(self) {
   //~^ ERROR: overflow evaluating the requirement
+  //~| ERROR: overflow evaluating the requirement
+  fn answer(self) {
     let val: NoData<T> = NoData;
   }
 }
diff --git a/src/test/ui/issues/issue-20413.stderr b/src/test/ui/issues/issue-20413.stderr
index 6ecb4e736a..84e64ff74a 100644
--- a/src/test/ui/issues/issue-20413.stderr
+++ b/src/test/ui/issues/issue-20413.stderr
@@ -7,21 +7,15 @@ LL | struct NoData<T>;
    = help: consider removing `T`, referring to it in a field, or using a marker such as `std::marker::PhantomData`
 
 error[E0275]: overflow evaluating the requirement `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: Foo`
-  --> $DIR/issue-20413.rs:8:1
+  --> $DIR/issue-20413.rs:8:36
    |
-LL |   trait Foo {
-   |   --------- required by `Foo`
+LL | trait Foo {
+   | --------- required by `Foo`
 ...
-LL | / impl<T> Foo for T where NoData<T>: Foo {
-LL | |
-LL | |   fn answer(self) {
-LL | |
-LL | |     let val: NoData<T> = NoData;
-LL | |   }
-LL | | }
-   | |_^
+LL | impl<T> Foo for T where NoData<T>: Foo {
+   |                                    ^^^
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`issue_20413`)
    = note: required because of the requirements on the impl of `Foo` for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
    = note: required because of the requirements on the impl of `Foo` for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
    = note: required because of the requirements on the impl of `Foo` for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
@@ -151,18 +145,15 @@ LL | | }
    = note: required because of the requirements on the impl of `Foo` for `NoData<T>`
 
 error[E0275]: overflow evaluating the requirement `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: Foo`
-  --> $DIR/issue-20413.rs:10:3
+  --> $DIR/issue-20413.rs:8:36
    |
-LL |   trait Foo {
-   |   --------- required by `Foo`
+LL | trait Foo {
+   | --------- required by `Foo`
 ...
-LL | /   fn answer(self) {
-LL | |
-LL | |     let val: NoData<T> = NoData;
-LL | |   }
-   | |___^
+LL | impl<T> Foo for T where NoData<T>: Foo {
+   |                                    ^^^
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`issue_20413`)
    = note: required because of the requirements on the impl of `Foo` for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
    = note: required because of the requirements on the impl of `Foo` for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
    = note: required because of the requirements on the impl of `Foo` for `NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<NoData<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
diff --git a/src/test/ui/issues/issue-20433.stderr b/src/test/ui/issues/issue-20433.stderr
index f7cb28edd6..abd2290952 100644
--- a/src/test/ui/issues/issue-20433.stderr
+++ b/src/test/ui/issues/issue-20433.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the size for values of type `[i32]` cannot be known at compilation time
-  --> $DIR/issue-20433.rs:6:5
+  --> $DIR/issue-20433.rs:6:18
    |
 LL |     fn iceman(c: Vec<[i32]>) {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |                  ^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `[i32]`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-20692.rs b/src/test/ui/issues/issue-20692.rs
index 2a05bba7b1..1cb2d8c730 100644
--- a/src/test/ui/issues/issue-20692.rs
+++ b/src/test/ui/issues/issue-20692.rs
@@ -1,4 +1,4 @@
-trait Array: Sized {}
+trait Array: Sized + Copy {}
 
 fn f<T: Array>(x: &T) {
     let _ = x
diff --git a/src/test/ui/issues/issue-20692.stderr b/src/test/ui/issues/issue-20692.stderr
index 06c83f65be..ca2611e0f9 100644
--- a/src/test/ui/issues/issue-20692.stderr
+++ b/src/test/ui/issues/issue-20692.stderr
@@ -1,18 +1,27 @@
 error[E0038]: the trait `Array` cannot be made into an object
   --> $DIR/issue-20692.rs:7:5
    |
+LL | trait Array: Sized + Copy {}
+   |       -----  -----   ---- ...because it requires `Self: Sized`
+   |       |      |
+   |       |      ...because it requires `Self: Sized`
+   |       this trait cannot be made into an object...
+...
 LL |     &dyn Array;
    |     ^^^^^^^^^^ the trait `Array` cannot be made into an object
-   |
-   = note: the trait cannot require that `Self : Sized`
 
 error[E0038]: the trait `Array` cannot be made into an object
   --> $DIR/issue-20692.rs:4:13
    |
+LL | trait Array: Sized + Copy {}
+   |       -----  -----   ---- ...because it requires `Self: Sized`
+   |       |      |
+   |       |      ...because it requires `Self: Sized`
+   |       this trait cannot be made into an object...
+...
 LL |     let _ = x
    |             ^ the trait `Array` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Array>` for `&T`
    = note: required by cast to type `&dyn Array`
 
diff --git a/src/test/ui/issues/issue-20831-debruijn.stderr b/src/test/ui/issues/issue-20831-debruijn.stderr
index a4ea1cd983..a785a956ca 100644
--- a/src/test/ui/issues/issue-20831-debruijn.stderr
+++ b/src/test/ui/issues/issue-20831-debruijn.stderr
@@ -61,16 +61,10 @@ LL | |     }
    | |_____^
 
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
-  --> $DIR/issue-20831-debruijn.rs:28:5
+  --> $DIR/issue-20831-debruijn.rs:28:33
    |
-LL | /     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
-LL | |         // Not obvious, but there is an implicit lifetime here -------^
-LL | |
-LL | |
-...  |
-LL | |         self.sub = t;
-LL | |     }
-   | |_____^
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 28:5...
   --> $DIR/issue-20831-debruijn.rs:28:5
@@ -89,30 +83,18 @@ note: ...but the lifetime must also be valid for the lifetime `'a` as defined on
 LL | impl<'a> Publisher<'a> for MyStruct<'a> {
    |      ^^
 note: ...so that the types are compatible
-  --> $DIR/issue-20831-debruijn.rs:28:5
+  --> $DIR/issue-20831-debruijn.rs:28:33
    |
-LL | /     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
-LL | |         // Not obvious, but there is an implicit lifetime here -------^
-LL | |
-LL | |
-...  |
-LL | |         self.sub = t;
-LL | |     }
-   | |_____^
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: expected  `Publisher<'_>`
               found  `Publisher<'_>`
 
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
-  --> $DIR/issue-20831-debruijn.rs:28:5
+  --> $DIR/issue-20831-debruijn.rs:28:33
    |
-LL | /     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
-LL | |         // Not obvious, but there is an implicit lifetime here -------^
-LL | |
-LL | |
-...  |
-LL | |         self.sub = t;
-LL | |     }
-   | |_____^
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the method body at 28:5...
   --> $DIR/issue-20831-debruijn.rs:28:5
@@ -131,16 +113,10 @@ note: ...but the lifetime must also be valid for the lifetime `'a` as defined on
 LL | impl<'a> Publisher<'a> for MyStruct<'a> {
    |      ^^
 note: ...so that the types are compatible
-  --> $DIR/issue-20831-debruijn.rs:28:5
+  --> $DIR/issue-20831-debruijn.rs:28:33
    |
-LL | /     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
-LL | |         // Not obvious, but there is an implicit lifetime here -------^
-LL | |
-LL | |
-...  |
-LL | |         self.sub = t;
-LL | |     }
-   | |_____^
+LL |     fn subscribe(&mut self, t : Box<dyn Subscriber<Input=<Self as Publisher>::Output> + 'a>) {
+   |                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = note: expected  `Publisher<'_>`
               found  `Publisher<'_>`
 
diff --git a/src/test/ui/issues/issue-21160.stderr b/src/test/ui/issues/issue-21160.stderr
index a7bb4fc512..a24dc8a259 100644
--- a/src/test/ui/issues/issue-21160.stderr
+++ b/src/test/ui/issues/issue-21160.stderr
@@ -8,6 +8,8 @@ LL | struct Foo(Bar);
    |
 LL |     fn hash<H: Hasher>(&self, state: &mut H);
    |             - required by this bound in `std::hash::Hash::hash`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-2150.stderr b/src/test/ui/issues/issue-2150.stderr
index 6e102ecb62..f1cb3890a7 100644
--- a/src/test/ui/issues/issue-2150.stderr
+++ b/src/test/ui/issues/issue-2150.stderr
@@ -6,12 +6,11 @@ LL |     panic!();
 LL |     for x in &v { i += 1; }
    |     ^^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-2150.rs:1:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-21596.stderr b/src/test/ui/issues/issue-21596.stderr
index efde16167b..3e0a532b2b 100644
--- a/src/test/ui/issues/issue-21596.stderr
+++ b/src/test/ui/issues/issue-21596.stderr
@@ -7,7 +7,8 @@ LL |     println!("{}", z.to_string());
    = note: try using `<*const T>::as_ref()` to get a reference to the type behind the pointer: https://doc.rust-lang.org/std/primitive.pointer.html#method.as_ref
    = note: using `<*const T>::as_ref()` on a pointer which is unaligned or points to invalid or uninitialized memory is undefined behavior
    = note: the method `to_string` exists but the following trait bounds were not satisfied:
-           `*const u8 : std::string::ToString`
+           `*const u8: std::fmt::Display`
+           which is required by `*const u8: std::string::ToString`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-21600.stderr b/src/test/ui/issues/issue-21600.stderr
index 9c534809db..84c7106e89 100644
--- a/src/test/ui/issues/issue-21600.stderr
+++ b/src/test/ui/issues/issue-21600.stderr
@@ -1,34 +1,33 @@
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/issue-21600.rs:14:20
    |
+LL | fn call_it<F>(f: F) where F: Fn() { f(); }
+   |                  - change this to accept `FnMut` instead of `Fn`
+...
 LL |         call_it(|| x.gen_mut());
-   |                    ^ cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/issue-21600.rs:14:17
-   |
-LL |         call_it(|| x.gen_mut());
-   |                 ^^^^^^^^^^^^^^
+   |         -------    ^ cannot borrow as mutable
+   |         |
+   |         expects `Fn` instead of `FnMut`
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/issue-21600.rs:14:17
    |
-LL |         call_it(|| x.gen_mut());
-   |                 ^^ - mutable borrow occurs due to use of `x` in closure
-   |                 |
-   |                 cannot borrow as mutable
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/issue-21600.rs:12:13
-   |
+LL |   fn call_it<F>(f: F) where F: Fn() { f(); }
+   |                    - change this to accept `FnMut` instead of `Fn`
+...
 LL |       call_it(|| {
-   |  _____________^
+   |  _____-------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         call_it(|| x.gen());
 LL | |         call_it(|| x.gen_mut());
+   | |                 ^^ - mutable borrow occurs due to use of `x` in closure
+   | |                 |
+   | |                 cannot borrow as mutable
 LL | |
 LL | |
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-21837.stderr b/src/test/ui/issues/issue-21837.stderr
index 50fdf2d618..cfc294b5fa 100644
--- a/src/test/ui/issues/issue-21837.stderr
+++ b/src/test/ui/issues/issue-21837.stderr
@@ -5,9 +5,13 @@ LL | pub struct Foo<T: Bound>(T);
    | ---------------------------- required by `Foo`
 ...
 LL | impl<T> Trait2 for Foo<T> {}
-   |      -  ^^^^^^ the trait `Bound` is not implemented for `T`
-   |      |
-   |      help: consider restricting this bound: `T: Bound`
+   |         ^^^^^^ the trait `Bound` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: Bound`
+  --> $DIR/issue-21837.rs:8:6
+   |
+LL | impl<T> Trait2 for Foo<T> {}
+   |      ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-21974.rs b/src/test/ui/issues/issue-21974.rs
index 0cbe38d6ec..f7c659be14 100644
--- a/src/test/ui/issues/issue-21974.rs
+++ b/src/test/ui/issues/issue-21974.rs
@@ -7,8 +7,8 @@ trait Foo {
     fn foo(self);
 }
 
-fn foo<'a,'b,T>(x: &'a T, y: &'b T) //~ ERROR type annotations needed
-    where &'a T : Foo,
+fn foo<'a,'b,T>(x: &'a T, y: &'b T)
+    where &'a T : Foo, //~ ERROR type annotations needed
           &'b T : Foo
 {
     x.foo();
diff --git a/src/test/ui/issues/issue-21974.stderr b/src/test/ui/issues/issue-21974.stderr
index b1536bd8dd..1982349906 100644
--- a/src/test/ui/issues/issue-21974.stderr
+++ b/src/test/ui/issues/issue-21974.stderr
@@ -1,17 +1,11 @@
 error[E0283]: type annotations needed
-  --> $DIR/issue-21974.rs:10:1
+  --> $DIR/issue-21974.rs:11:19
    |
-LL |   trait Foo {
-   |   --------- required by `Foo`
+LL | trait Foo {
+   | --------- required by `Foo`
 ...
-LL | / fn foo<'a,'b,T>(x: &'a T, y: &'b T)
-LL | |     where &'a T : Foo,
-LL | |           &'b T : Foo
-LL | | {
-LL | |     x.foo();
-LL | |     y.foo();
-LL | | }
-   | |_^ cannot infer type for reference `&'a T`
+LL |     where &'a T : Foo,
+   |                   ^^^ cannot infer type for reference `&'a T`
    |
    = note: cannot resolve `&'a T: Foo`
 
diff --git a/src/test/ui/issues/issue-22599.stderr b/src/test/ui/issues/issue-22599.stderr
index 12234293ac..9c3b2cbe6c 100644
--- a/src/test/ui/issues/issue-22599.stderr
+++ b/src/test/ui/issues/issue-22599.stderr
@@ -4,7 +4,7 @@ error: unused variable: `a`
 LL |     v = match 0 { a => 0 };
    |                   ^ help: consider prefixing with an underscore: `_a`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-22599.rs:1:9
    |
 LL | #![deny(unused_variables)]
diff --git a/src/test/ui/issues/issue-22644.stderr b/src/test/ui/issues/issue-22644.stderr
index 2bddcc2ba5..1be26949b2 100644
--- a/src/test/ui/issues/issue-22644.stderr
+++ b/src/test/ui/issues/issue-22644.stderr
@@ -94,7 +94,7 @@ LL |     println!("{}", a: &mut 4);
    |                     tried to parse a type due to this type ascription
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/issues/issue-22777.rs b/src/test/ui/issues/issue-22777.rs
index a31f059408..486683d12d 100644
--- a/src/test/ui/issues/issue-22777.rs
+++ b/src/test/ui/issues/issue-22777.rs
@@ -1,5 +1,5 @@
 // check-pass
-// This test is reduced from libsyntax.  It is just checking that we
+// This test is reduced from librustc_ast.  It is just checking that we
 // can successfully deal with a "deep" structure, which the drop-check
 // was hitting a recursion limit on at one point.
 
diff --git a/src/test/ui/issues/issue-22933-3.rs b/src/test/ui/issues/issue-22933-3.rs
deleted file mode 100644
index fbcce4b834..0000000000
--- a/src/test/ui/issues/issue-22933-3.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-const FOO: [u32; u8::MIN as usize] = [];
-//~^ ERROR no associated item named `MIN` found
-
-fn main() {}
diff --git a/src/test/ui/issues/issue-22933-3.stderr b/src/test/ui/issues/issue-22933-3.stderr
deleted file mode 100644
index 72bca3b040..0000000000
--- a/src/test/ui/issues/issue-22933-3.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0599]: no associated item named `MIN` found for type `u8` in the current scope
-  --> $DIR/issue-22933-3.rs:1:22
-   |
-LL | const FOO: [u32; u8::MIN as usize] = [];
-   |                      ^^^ associated item not found in `u8`
-   |
-help: you are looking for the module in `std`, not the primitive type
-   |
-LL | const FOO: [u32; std::u8::MIN as usize] = [];
-   |                  ^^^^^^^^^^^^
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issues/issue-23024.stderr b/src/test/ui/issues/issue-23024.stderr
index 1c6dd28ce5..f9403cd077 100644
--- a/src/test/ui/issues/issue-23024.stderr
+++ b/src/test/ui/issues/issue-23024.stderr
@@ -4,7 +4,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL |     println!("{:?}",(vfnfer[0] as dyn Fn)(3));
    |                                       ^^ help: use parenthetical notation instead: `Fn() -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0107]: wrong number of type arguments: expected 1, found 0
diff --git a/src/test/ui/issues/issue-23122-2.stderr b/src/test/ui/issues/issue-23122-2.stderr
index d2c1421e29..7625e30498 100644
--- a/src/test/ui/issues/issue-23122-2.stderr
+++ b/src/test/ui/issues/issue-23122-2.stderr
@@ -4,7 +4,7 @@ error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 LL | impl<T: Next> Next for GetNext<T> {
    |               ^^^^
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`issue_23122_2`)
    = note: required because of the requirements on the impl of `Next` for `GetNext<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next>`
 
 error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next: std::marker::Sized`
@@ -13,7 +13,7 @@ error[E0275]: overflow evaluating the requirement `<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 LL |     type Next = <GetNext<T::Next> as Next>::Next;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate (`issue_23122_2`)
    = note: required because of the requirements on the impl of `Next` for `GetNext<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<T as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next as Next>::Next>`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/issues/issue-23281.stderr b/src/test/ui/issues/issue-23281.stderr
index f1def47458..68a90c6d80 100644
--- a/src/test/ui/issues/issue-23281.stderr
+++ b/src/test/ui/issues/issue-23281.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the size for values of type `(dyn std::ops::Fn() + 'static)` cannot be known at compilation time
-  --> $DIR/issue-23281.rs:4:5
+  --> $DIR/issue-23281.rs:4:27
    |
 LL |     pub fn function(funs: Vec<dyn Fn() -> ()>) {}
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |                           ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `(dyn std::ops::Fn() + 'static)`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-24204.stderr b/src/test/ui/issues/issue-24204.stderr
index 3eb1f1b4f6..2a714861da 100644
--- a/src/test/ui/issues/issue-24204.stderr
+++ b/src/test/ui/issues/issue-24204.stderr
@@ -1,11 +1,11 @@
 error[E0271]: type mismatch resolving `<<T as Trait>::A as MultiDispatch<i32>>::O == T`
-  --> $DIR/issue-24204.rs:14:1
+  --> $DIR/issue-24204.rs:14:12
    |
 LL | trait Trait: Sized {
    | ------------------ required by `Trait`
 ...
 LL | fn test<T: Trait<B=i32>>(b: i32) -> T where T::A: MultiDispatch<i32> { T::new(b) }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected type parameter `T`, found associated type
+   |            ^^^^^^^^^^^^ expected type parameter `T`, found associated type
    |
    = note: expected type parameter `T`
              found associated type `<<T as Trait>::A as MultiDispatch<i32>>::O`
diff --git a/src/test/ui/issues/issue-24363.stderr b/src/test/ui/issues/issue-24363.stderr
index a60fb24ec1..16537e21ae 100644
--- a/src/test/ui/issues/issue-24363.stderr
+++ b/src/test/ui/issues/issue-24363.stderr
@@ -11,8 +11,6 @@ LL |         ()+()
    |         --^-- ()
    |         |
    |         ()
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `()`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-24424.stderr b/src/test/ui/issues/issue-24424.stderr
index 8f0850328b..538d44c3b2 100644
--- a/src/test/ui/issues/issue-24424.stderr
+++ b/src/test/ui/issues/issue-24424.stderr
@@ -1,11 +1,11 @@
 error[E0283]: type annotations needed
-  --> $DIR/issue-24424.rs:4:1
+  --> $DIR/issue-24424.rs:4:57
    |
 LL | trait Trait0<'l0>  {}
    | ----------------- required by `Trait0`
 LL | 
 LL | impl <'l0, 'l1, T0> Trait1<'l0, T0> for bool where T0 : Trait0<'l0>, T0 : Trait0<'l1> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type for type parameter `T0`
+   |                                                         ^^^^^^^^^^^ cannot infer type for type parameter `T0`
    |
    = note: cannot resolve `T0: Trait0<'l0>`
 
diff --git a/src/test/ui/issues/issue-25385.stderr b/src/test/ui/issues/issue-25385.stderr
index ab4db7e42a..2ed48356e9 100644
--- a/src/test/ui/issues/issue-25385.stderr
+++ b/src/test/ui/issues/issue-25385.stderr
@@ -6,6 +6,8 @@ LL |     ($e:expr) => { $e.foo() }
 ...
 LL |     foo!(a);
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no method named `foo` found for type `i32` in the current scope
   --> $DIR/issue-25385.rs:10:15
diff --git a/src/test/ui/issues/issue-25386.stderr b/src/test/ui/issues/issue-25386.stderr
index eabb139b97..76a4a5a493 100644
--- a/src/test/ui/issues/issue-25386.stderr
+++ b/src/test/ui/issues/issue-25386.stderr
@@ -6,6 +6,8 @@ LL |         (*$var.c_object).$member.is_some()
 ...
 LL |     println!("{}", check_ptr_exist!(item, name));
    |                    ---------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0616]: field `name` of struct `stuff::CObj` is private
   --> $DIR/issue-25386.rs:19:9
@@ -15,6 +17,8 @@ LL |         (*$var.c_object).$member.is_some()
 ...
 LL |     println!("{}", check_ptr_exist!(item, name));
    |                    ---------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-25439.stderr b/src/test/ui/issues/issue-25439.stderr
index 9b04148313..325c28c15e 100644
--- a/src/test/ui/issues/issue-25439.stderr
+++ b/src/test/ui/issues/issue-25439.stderr
@@ -6,7 +6,8 @@ LL |     fix(|_, x| x);
    |
    = note: closures cannot capture themselves or take themselves as argument;
            this error may be the result of a recent compiler bug-fix,
-           see https://github.com/rust-lang/rust/issues/46062 for more details
+           see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
+           for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-25793.stderr b/src/test/ui/issues/issue-25793.stderr
index daea9cd8cd..9d66ba3aae 100644
--- a/src/test/ui/issues/issue-25793.stderr
+++ b/src/test/ui/issues/issue-25793.stderr
@@ -10,6 +10,8 @@ LL |         r.get_size(width!(self))
    |           -------- ------------ in this macro invocation
    |           |
    |           borrow later used by call
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-25826.stderr b/src/test/ui/issues/issue-25826.stderr
index 84d5aeef63..3a5a6b509b 100644
--- a/src/test/ui/issues/issue-25826.stderr
+++ b/src/test/ui/issues/issue-25826.stderr
@@ -4,7 +4,7 @@ error[E0658]: comparing raw pointers inside constant
 LL |     const A: bool = unsafe { id::<u8> as *const () < id::<u16> as *const () };
    |                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53020
+   = note: see issue #53020 <https://github.com/rust-lang/rust/issues/53020> for more information
    = help: add `#![feature(const_compare_raw_pointers)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-26056.stderr b/src/test/ui/issues/issue-26056.stderr
index 9c4cf0b18a..be438ef9ac 100644
--- a/src/test/ui/issues/issue-26056.stderr
+++ b/src/test/ui/issues/issue-26056.stderr
@@ -1,10 +1,13 @@
 error[E0038]: the trait `Map` cannot be made into an object
   --> $DIR/issue-26056.rs:20:13
    |
+LL | trait Map: MapLookup<<Self as Map>::Key> {
+   |       ---  ----------------------------- ...because it uses `Self` as a type parameter in this
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |         as &dyn Map<Key=u32,MapValue=u32>;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Map` cannot be made into an object
-   |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-26093.stderr b/src/test/ui/issues/issue-26093.stderr
index c96228b518..204786c65c 100644
--- a/src/test/ui/issues/issue-26093.stderr
+++ b/src/test/ui/issues/issue-26093.stderr
@@ -9,6 +9,8 @@ LL |     not_a_place!(99);
    |     |            |
    |     |            cannot assign to this expression
    |     in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0067]: invalid left-hand side of assignment
   --> $DIR/issue-26093.rs:5:16
@@ -21,6 +23,8 @@ LL |     not_a_place!(99);
    |     |            |
    |     |            cannot assign to this expression
    |     in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-26094.rs b/src/test/ui/issues/issue-26094.rs
index b943384985..78fb0491d8 100644
--- a/src/test/ui/issues/issue-26094.rs
+++ b/src/test/ui/issues/issue-26094.rs
@@ -1,13 +1,13 @@
 macro_rules! some_macro {
     ($other: expr) => ({
-        $other(None)
-        //~^ this function takes 0 parameters but 1 parameter was supplied
+        $other(None) //~ NOTE supplied 1 argument
     })
 }
 
-fn some_function() {}
+fn some_function() {} //~ NOTE defined here
 
 fn main() {
     some_macro!(some_function);
-    //~^ in this expansion of some_macro!
+    //~^ ERROR this function takes 0 arguments but 1 argument was supplied
+    //~| NOTE expected 0 arguments
 }
diff --git a/src/test/ui/issues/issue-26094.stderr b/src/test/ui/issues/issue-26094.stderr
index 36b2d3d074..2038d88bf4 100644
--- a/src/test/ui/issues/issue-26094.stderr
+++ b/src/test/ui/issues/issue-26094.stderr
@@ -1,14 +1,14 @@
-error[E0061]: this function takes 0 parameters but 1 parameter was supplied
-  --> $DIR/issue-26094.rs:3:9
+error[E0061]: this function takes 0 arguments but 1 argument was supplied
+  --> $DIR/issue-26094.rs:10:17
    |
 LL |         $other(None)
-   |         ^^^^^^^^^^^^ expected 0 parameters
+   |                ---- supplied 1 argument
 ...
 LL | fn some_function() {}
    | ------------------ defined here
 ...
 LL |     some_macro!(some_function);
-   |     --------------------------- in this macro invocation
+   |                 ^^^^^^^^^^^^^ expected 0 arguments
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-26459.rs b/src/test/ui/issues/issue-26459.rs
index 79791e0e06..2ba05a0a47 100644
--- a/src/test/ui/issues/issue-26459.rs
+++ b/src/test/ui/issues/issue-26459.rs
@@ -1,3 +1,5 @@
+// compile-flags: -Zsave-analysis
+
 fn main() {
     match 'a' {
         char{ch} => true
diff --git a/src/test/ui/issues/issue-26459.stderr b/src/test/ui/issues/issue-26459.stderr
index 187369263a..9f594990c6 100644
--- a/src/test/ui/issues/issue-26459.stderr
+++ b/src/test/ui/issues/issue-26459.stderr
@@ -1,5 +1,5 @@
 error[E0574]: expected struct, variant or union type, found builtin type `char`
-  --> $DIR/issue-26459.rs:3:9
+  --> $DIR/issue-26459.rs:5:9
    |
 LL |         char{ch} => true
    |         ^^^^ not a struct, variant or union type
diff --git a/src/test/ui/issues/issue-26638.stderr b/src/test/ui/issues/issue-26638.stderr
index 85d5d9cc42..1d8fbdc63c 100644
--- a/src/test/ui/issues/issue-26638.stderr
+++ b/src/test/ui/issues/issue-26638.stderr
@@ -2,13 +2,13 @@ error[E0106]: missing lifetime specifier
   --> $DIR/issue-26638.rs:1:62
    |
 LL | fn parse_type(iter: Box<dyn Iterator<Item=&str>+'static>) -> &str { iter.next() }
-   |                                                              ^ expected named lifetime parameter
+   |                     ------------------------------------     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `iter`'s 2 lifetimes it is borrowed from
 help: consider introducing a named lifetime parameter
    |
-LL | fn parse_type<'lifetime>(iter: Box<dyn Iterator<Item=&str>+'static>) -> &'lifetime str { iter.next() }
-   |              ^^^^^^^^^^^                                                ^^^^^^^^^^
+LL | fn parse_type<'a>(iter: Box<dyn Iterator<Item=&str>+'static>) -> &'a str { iter.next() }
+   |              ^^^^                                                ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-26638.rs:4:40
diff --git a/src/test/ui/issues/issue-27060-2.stderr b/src/test/ui/issues/issue-27060-2.stderr
index 553041c510..1ddea73e00 100644
--- a/src/test/ui/issues/issue-27060-2.stderr
+++ b/src/test/ui/issues/issue-27060-2.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
   --> $DIR/issue-27060-2.rs:3:5
    |
 LL | pub struct Bad<T: ?Sized> {
-   |                -- help: consider further restricting this bound: `T: std::marker::Sized +`
+   |                - this type parameter needs to be `std::marker::Sized`
 LL |     data: T,
    |     ^^^^^^^ doesn't have a size known at compile-time
    |
diff --git a/src/test/ui/issues/issue-27060.stderr b/src/test/ui/issues/issue-27060.stderr
index bc44c1a4ac..6bf6348631 100644
--- a/src/test/ui/issues/issue-27060.stderr
+++ b/src/test/ui/issues/issue-27060.stderr
@@ -4,7 +4,7 @@ error: borrow of packed field is unsafe and requires unsafe function or block (e
 LL |     let _ = &good.data;
    |             ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-27060.rs:13:8
    |
 LL | #[deny(safe_packed_borrows)]
diff --git a/src/test/ui/issues/issue-27340.stderr b/src/test/ui/issues/issue-27340.stderr
index 05b213b293..f2c659083f 100644
--- a/src/test/ui/issues/issue-27340.stderr
+++ b/src/test/ui/issues/issue-27340.stderr
@@ -6,6 +6,8 @@ LL | #[derive(Copy, Clone)]
 LL |
 LL | struct Bar(Foo);
    |            --- this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-27592.stderr b/src/test/ui/issues/issue-27592.stderr
index c8649d82d7..cf59016ded 100644
--- a/src/test/ui/issues/issue-27592.stderr
+++ b/src/test/ui/issues/issue-27592.stderr
@@ -6,12 +6,16 @@ LL |     write(|| format_args!("{}", String::from("Hello world")));
    |              |                  |
    |              |                  temporary value created here
    |              returns a value referencing data owned by the current function
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0515]: cannot return reference to temporary value
   --> $DIR/issue-27592.rs:16:14
    |
 LL |     write(|| format_args!("{}", String::from("Hello world")));
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ returns a reference to data owned by the current function
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-27942.stderr b/src/test/ui/issues/issue-27942.stderr
index d290b17616..6ce0fa37a8 100644
--- a/src/test/ui/issues/issue-27942.stderr
+++ b/src/test/ui/issues/issue-27942.stderr
@@ -1,8 +1,8 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-27942.rs:5:5
+  --> $DIR/issue-27942.rs:5:25
    |
 LL |     fn select(&self) -> BufferViewHandle<R>;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
+   |                         ^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
    = note: expected type `Resources<'_>`
               found type `Resources<'a>`
@@ -18,10 +18,10 @@ LL | pub trait Buffer<'a, R: Resources<'a>> {
    |                  ^^
 
 error[E0308]: mismatched types
-  --> $DIR/issue-27942.rs:5:5
+  --> $DIR/issue-27942.rs:5:25
    |
 LL |     fn select(&self) -> BufferViewHandle<R>;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lifetime mismatch
+   |                         ^^^^^^^^^^^^^^^^^^^ lifetime mismatch
    |
    = note: expected type `Resources<'_>`
               found type `Resources<'a>`
diff --git a/src/test/ui/issues/issue-28576.stderr b/src/test/ui/issues/issue-28576.stderr
index 3249d76e69..658199003c 100644
--- a/src/test/ui/issues/issue-28576.stderr
+++ b/src/test/ui/issues/issue-28576.stderr
@@ -1,11 +1,16 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/issue-28576.rs:7:12
    |
+LL |   pub trait Bar: Foo<Assoc=()> {
+   |             ---  -------------
+   |             |    |   |
+   |             |    |   ...because it uses `Self` as a type parameter in this
+   |             |    ...because it uses `Self` as a type parameter in this
+   |             this trait cannot be made into an object...
+LL |       fn new(&self, b: &
 LL | /            dyn Bar
 LL | |               <Assoc=()>
    | |________________________^ the trait `Bar` cannot be made into an object
-   |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-29084.stderr b/src/test/ui/issues/issue-29084.stderr
index 3e7ea745ce..bc22e93713 100644
--- a/src/test/ui/issues/issue-29084.stderr
+++ b/src/test/ui/issues/issue-29084.stderr
@@ -6,6 +6,8 @@ LL |         bar(&mut $d);
 ...
 LL |     foo!(0u8);
    |     ---------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-30240-b.stderr b/src/test/ui/issues/issue-30240-b.stderr
index e0dd4794db..59d64bc256 100644
--- a/src/test/ui/issues/issue-30240-b.stderr
+++ b/src/test/ui/issues/issue-30240-b.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         "hello" => {}
    |         ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-30240-b.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-30255.stderr b/src/test/ui/issues/issue-30255.stderr
index c940227764..ab43d4a3c6 100644
--- a/src/test/ui/issues/issue-30255.stderr
+++ b/src/test/ui/issues/issue-30255.stderr
@@ -2,37 +2,37 @@ error[E0106]: missing lifetime specifier
   --> $DIR/issue-30255.rs:9:24
    |
 LL | fn f(a: &S, b: i32) -> &i32 {
-   |                        ^ expected named lifetime parameter
+   |         --             ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `a`'s 2 lifetimes it is borrowed from
 help: consider introducing a named lifetime parameter
    |
-LL | fn f<'lifetime>(a: &S, b: i32) -> &'lifetime i32 {
-   |     ^^^^^^^^^^^                   ^^^^^^^^^^
+LL | fn f<'a>(a: &'a S, b: i32) -> &'a i32 {
+   |     ^^^^    ^^^^^             ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-30255.rs:14:34
    |
 LL | fn g(a: &S, b: bool, c: &i32) -> &i32 {
-   |                                  ^ expected named lifetime parameter
+   |         --              ----     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from one of `a`'s 2 lifetimes or `c`
 help: consider introducing a named lifetime parameter
    |
-LL | fn g<'lifetime>(a: &S, b: bool, c: &i32) -> &'lifetime i32 {
-   |     ^^^^^^^^^^^                             ^^^^^^^^^^
+LL | fn g<'a>(a: &'a S, b: bool, c: &'a i32) -> &'a i32 {
+   |     ^^^^    ^^^^^              ^^^^^^^     ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/issue-30255.rs:19:44
    |
 LL | fn h(a: &bool, b: bool, c: &S, d: &i32) -> &i32 {
-   |                                            ^ expected named lifetime parameter
+   |         -----              --     ----     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `a`, one of `c`'s 2 lifetimes, or `d`
 help: consider introducing a named lifetime parameter
    |
-LL | fn h<'lifetime>(a: &bool, b: bool, c: &S, d: &i32) -> &'lifetime i32 {
-   |     ^^^^^^^^^^^                                       ^^^^^^^^^^
+LL | fn h<'a>(a: &'a bool, b: bool, c: &'a S, d: &'a i32) -> &'a i32 {
+   |     ^^^^    ^^^^^^^^              ^^^^^     ^^^^^^^     ^^^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-30302.stderr b/src/test/ui/issues/issue-30302.stderr
index ac1b5235f4..770ed3d4f0 100644
--- a/src/test/ui/issues/issue-30302.stderr
+++ b/src/test/ui/issues/issue-30302.stderr
@@ -15,7 +15,7 @@ LL |
 LL |         _ => false
    |         ^ unreachable pattern
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-30302.rs:4:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-3044.rs b/src/test/ui/issues/issue-3044.rs
index 26db04b69b..81d76a90eb 100644
--- a/src/test/ui/issues/issue-3044.rs
+++ b/src/test/ui/issues/issue-3044.rs
@@ -2,5 +2,5 @@ fn main() {
     let needlesArr: Vec<char> = vec!['a', 'f'];
     needlesArr.iter().fold(|x, y| {
     });
-    //~^^ ERROR this function takes 2 parameters but 1 parameter was supplied
+    //~^^ ERROR this function takes 2 arguments but 1 argument was supplied
 }
diff --git a/src/test/ui/issues/issue-3044.stderr b/src/test/ui/issues/issue-3044.stderr
index 35a85b604b..d2c010659e 100644
--- a/src/test/ui/issues/issue-3044.stderr
+++ b/src/test/ui/issues/issue-3044.stderr
@@ -1,8 +1,12 @@
-error[E0061]: this function takes 2 parameters but 1 parameter was supplied
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
   --> $DIR/issue-3044.rs:3:23
    |
-LL |     needlesArr.iter().fold(|x, y| {
-   |                       ^^^^ expected 2 parameters
+LL |       needlesArr.iter().fold(|x, y| {
+   |  _______________________^^^^_-
+   | |                       |
+   | |                       expected 2 arguments
+LL | |     });
+   | |_____- supplied 1 argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-30730.stderr b/src/test/ui/issues/issue-30730.stderr
index fcbab77b00..b299e99a3a 100644
--- a/src/test/ui/issues/issue-30730.stderr
+++ b/src/test/ui/issues/issue-30730.stderr
@@ -4,7 +4,7 @@ error: unused import: `std::thread`
 LL | use std::thread;
    |     ^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-30730.rs:2:9
    |
 LL | #![deny(warnings)]
diff --git a/src/test/ui/issues/issue-31011.stderr b/src/test/ui/issues/issue-31011.stderr
index c7618e0835..deaf490466 100644
--- a/src/test/ui/issues/issue-31011.stderr
+++ b/src/test/ui/issues/issue-31011.stderr
@@ -9,6 +9,8 @@ LL | fn wrap<T>(context: &T) -> ()
 LL | {
 LL |     log!(context, "entered wrapper");
    |     --------------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-31076.stderr b/src/test/ui/issues/issue-31076.stderr
index 5d65734cd2..4c0e1cf7eb 100644
--- a/src/test/ui/issues/issue-31076.stderr
+++ b/src/test/ui/issues/issue-31076.stderr
@@ -5,8 +5,6 @@ LL |     let x = 5 + 6;
    |             - ^ - {integer}
    |             |
    |             {integer}
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `{integer}`
 
 error[E0369]: cannot add `i32` to `i32`
   --> $DIR/issue-31076.rs:15:18
@@ -15,8 +13,6 @@ LL |     let y = 5i32 + 6i32;
    |             ---- ^ ---- i32
    |             |
    |             i32
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `i32`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-31173.rs b/src/test/ui/issues/issue-31173.rs
index 2619531838..25be266c52 100644
--- a/src/test/ui/issues/issue-31173.rs
+++ b/src/test/ui/issues/issue-31173.rs
@@ -1,3 +1,7 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
 use std::vec::IntoIter;
 
 pub fn get_tok(it: &mut IntoIter<u8>) {
diff --git a/src/test/ui/issues/issue-31173.stderr b/src/test/ui/issues/issue-31173.stderr
index a614b96ac1..20bfdeea4b 100644
--- a/src/test/ui/issues/issue-31173.stderr
+++ b/src/test/ui/issues/issue-31173.stderr
@@ -1,5 +1,5 @@
-error[E0271]: type mismatch resolving `<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]> as std::iter::Iterator>::Item == &_`
-  --> $DIR/issue-31173.rs:10:10
+error[E0271]: type mismatch resolving `<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]> as std::iter::Iterator>::Item == &_`
+  --> $DIR/issue-31173.rs:14:10
    |
 LL |         .cloned()
    |          ^^^^^^ expected `u8`, found reference
@@ -7,15 +7,25 @@ LL |         .cloned()
    = note:   expected type `u8`
            found reference `&_`
 
-error[E0599]: no method named `collect` found for struct `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>>` in the current scope
-  --> $DIR/issue-31173.rs:14:10
+error[E0599]: no method named `collect` found for struct `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]>>` in the current scope
+  --> $DIR/issue-31173.rs:18:10
    |
 LL |         .collect();
-   |          ^^^^^^^ method not found in `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>>`
+   |          ^^^^^^^ method not found in `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]>>`
+   | 
+  ::: $SRC_DIR/libcore/iter/adapters/mod.rs:LL:COL
+   |
+LL | pub struct Cloned<I> {
+   | -------------------- doesn't satisfy `_: std::iter::Iterator`
+...
+LL | pub struct TakeWhile<I, P> {
+   | -------------------------- doesn't satisfy `<_ as std::iter::Iterator>::Item = &_`
    |
    = note: the method `collect` exists but the following trait bounds were not satisfied:
-           `&mut std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>> : std::iter::Iterator`
-           `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:6:39: 9:6 found_e:_]>> : std::iter::Iterator`
+           `<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]> as std::iter::Iterator>::Item = &_`
+           which is required by `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]>>: std::iter::Iterator`
+           `std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]>>: std::iter::Iterator`
+           which is required by `&mut std::iter::Cloned<std::iter::TakeWhile<&mut std::vec::IntoIter<u8>, [closure@$DIR/issue-31173.rs:10:39: 13:6 found_e:_]>>: std::iter::Iterator`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-31221.stderr b/src/test/ui/issues/issue-31221.stderr
index 0f3b4ba7d9..7d34914445 100644
--- a/src/test/ui/issues/issue-31221.stderr
+++ b/src/test/ui/issues/issue-31221.stderr
@@ -6,7 +6,7 @@ LL |         Var3 => (),
 LL |         Var2 => (),
    |         ^^^^ unreachable pattern
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-31221.rs:4:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-32655.stderr b/src/test/ui/issues/issue-32655.stderr
index ca085b25c2..5d5ad8aed9 100644
--- a/src/test/ui/issues/issue-32655.stderr
+++ b/src/test/ui/issues/issue-32655.stderr
@@ -6,6 +6,8 @@ LL |         #[derive_Clone]
 ...
 LL | foo!();
    | ------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: cannot find attribute `derive_Clone` in this scope
   --> $DIR/issue-32655.rs:15:7
diff --git a/src/test/ui/issues/issue-32782.stderr b/src/test/ui/issues/issue-32782.stderr
index 029826f09a..3d74897aab 100644
--- a/src/test/ui/issues/issue-32782.stderr
+++ b/src/test/ui/issues/issue-32782.stderr
@@ -8,6 +8,7 @@ LL | foo!();
    | ------- in this macro invocation
    |
    = help: add `#![feature(allow_internal_unstable)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-32829.stderr b/src/test/ui/issues/issue-32829.stderr
index b620abbf43..48e0880d5e 100644
--- a/src/test/ui/issues/issue-32829.stderr
+++ b/src/test/ui/issues/issue-32829.stderr
@@ -4,9 +4,9 @@ error[E0658]: panicking in statics is unstable
 LL | static S : u64 = { { panic!("foo"); 0 } };
    |                      ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51999
+   = note: see issue #51999 <https://github.com/rust-lang/rust/issues/51999> for more information
    = help: add `#![feature(const_panic)]` to the crate attributes to enable
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-32950.stderr b/src/test/ui/issues/issue-32950.stderr
index 3cdf35af1d..06a6ebd970 100644
--- a/src/test/ui/issues/issue-32950.stderr
+++ b/src/test/ui/issues/issue-32950.stderr
@@ -9,6 +9,8 @@ error[E0412]: cannot find type `FooBar` in this scope
    |
 LL |     concat_idents!(Foo, Bar)
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-33140-traitobject-crate.stderr b/src/test/ui/issues/issue-33140-traitobject-crate.stderr
index f31ea9391a..efa77f5ceb 100644
--- a/src/test/ui/issues/issue-33140-traitobject-crate.stderr
+++ b/src/test/ui/issues/issue-33140-traitobject-crate.stderr
@@ -6,7 +6,7 @@ LL | unsafe impl Trait for dyn (::std::marker::Send) + Sync { }
 LL | unsafe impl Trait for dyn (::std::marker::Send) + Send + Sync { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + std::marker::Sync + 'static)`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-33140-traitobject-crate.rs:3:9
    |
 LL | #![warn(order_dependent_trait_objects)]
diff --git a/src/test/ui/issues/issue-3344.stderr b/src/test/ui/issues/issue-3344.stderr
index 271fbb6c87..723e03d452 100644
--- a/src/test/ui/issues/issue-3344.stderr
+++ b/src/test/ui/issues/issue-3344.stderr
@@ -4,7 +4,7 @@ error[E0046]: not all trait items implemented, missing: `partial_cmp`
 LL | impl PartialOrd for Thing {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^ missing `partial_cmp` in implementation
    |
-   = help: implement the missing item: `fn partial_cmp(&self, _: &Rhs) -> std::option::Option<std::cmp::Ordering> { unimplemented!() }`
+   = help: implement the missing item: `fn partial_cmp(&self, _: &Rhs) -> std::option::Option<std::cmp::Ordering> { todo!() }`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-33504.stderr b/src/test/ui/issues/issue-33504.stderr
index 522df6a07c..1e61178f42 100644
--- a/src/test/ui/issues/issue-33504.stderr
+++ b/src/test/ui/issues/issue-33504.stderr
@@ -1,8 +1,15 @@
 error[E0308]: mismatched types
   --> $DIR/issue-33504.rs:7:13
    |
+LL | struct Test;
+   | ------------ unit struct defined here
+...
 LL |         let Test = 1;
-   |             ^^^^ expected integer, found struct `Test`
+   |             ^^^^
+   |             |
+   |             expected integer, found struct `Test`
+   |             `Test` is interpreted as a unit struct, not a new binding
+   |             help: introduce a new binding instead: `other_test`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-34229.stderr b/src/test/ui/issues/issue-34229.stderr
index 9e1734899b..cd9be6ab72 100644
--- a/src/test/ui/issues/issue-34229.stderr
+++ b/src/test/ui/issues/issue-34229.stderr
@@ -6,6 +6,7 @@ LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Comparable`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Comparable` with `Comparable`
   --> $DIR/issue-34229.rs:2:46
@@ -15,6 +16,7 @@ LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Comparable`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Comparable` with `Comparable`
   --> $DIR/issue-34229.rs:2:46
@@ -24,6 +26,7 @@ LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Comparable`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Comparable` with `Comparable`
   --> $DIR/issue-34229.rs:2:46
@@ -33,6 +36,7 @@ LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Comparable`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `Comparable` with `Comparable`
   --> $DIR/issue-34229.rs:2:46
@@ -42,6 +46,7 @@ LL | #[derive(PartialEq, PartialOrd)] struct Nope(Comparable);
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `Comparable`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/issues/issue-34255-1.stderr b/src/test/ui/issues/issue-34255-1.stderr
index acb093b514..c8bad3b3bb 100644
--- a/src/test/ui/issues/issue-34255-1.stderr
+++ b/src/test/ui/issues/issue-34255-1.stderr
@@ -7,7 +7,7 @@ LL |     Test::Drill(field: 42);
    |                      tried to parse a type due to this type ascription
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-34334.stderr b/src/test/ui/issues/issue-34334.stderr
index c52ea4ef9d..c68b271807 100644
--- a/src/test/ui/issues/issue-34334.stderr
+++ b/src/test/ui/issues/issue-34334.stderr
@@ -33,7 +33,7 @@ LL |     let sr: Vec<(u32, _, _) = vec![];
    |
    = note: expected type `bool`
             found struct `std::vec::Vec<_>`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0070]: invalid left-hand side of assignment
   --> $DIR/issue-34334.rs:2:29
diff --git a/src/test/ui/issues/issue-34721.stderr b/src/test/ui/issues/issue-34721.stderr
index 3002b07e8c..5c51d04444 100644
--- a/src/test/ui/issues/issue-34721.stderr
+++ b/src/test/ui/issues/issue-34721.stderr
@@ -2,9 +2,7 @@ error[E0382]: use of moved value: `x`
   --> $DIR/issue-34721.rs:27:9
    |
 LL |     pub fn baz<T: Foo>(x: T) -> T {
-   |                --      - move occurs because `x` has type `T`, which does not implement the `Copy` trait
-   |                |
-   |                help: consider further restricting this bound: `T: Copy +`
+   |                        - move occurs because `x` has type `T`, which does not implement the `Copy` trait
 LL |         if 0 == 1 {
 LL |             bar::bar(x.zero())
    |                      - value moved here
@@ -14,6 +12,12 @@ LL |             x.zero()
 LL |         };
 LL |         x.zero()
    |         ^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/issue-34721.rs:21:19
+   |
+LL |     pub fn baz<T: Foo>(x: T) -> T {
+   |                   ^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-35668.stderr b/src/test/ui/issues/issue-35668.stderr
index 9d5796a5ee..98e8e6366b 100644
--- a/src/test/ui/issues/issue-35668.stderr
+++ b/src/test/ui/issues/issue-35668.stderr
@@ -5,8 +5,6 @@ LL |     a.iter().map(|a| a*a)
    |                      -^- &T
    |                      |
    |                      &T
-   |
-   = note: an implementation of `std::ops::Mul` might be missing for `&T`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-35677.stderr b/src/test/ui/issues/issue-35677.stderr
index a998f95d30..978221e502 100644
--- a/src/test/ui/issues/issue-35677.stderr
+++ b/src/test/ui/issues/issue-35677.stderr
@@ -5,8 +5,8 @@ LL |     this.is_subset(other)
    |          ^^^^^^^^^ method not found in `&std::collections::HashSet<T>`
    |
    = note: the method `is_subset` exists but the following trait bounds were not satisfied:
-           `T : std::cmp::Eq`
-           `T : std::hash::Hash`
+           `T: std::cmp::Eq`
+           `T: std::hash::Hash`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-35976.stderr b/src/test/ui/issues/issue-35976.stderr
index 99b243a077..f9b9b7dbd3 100644
--- a/src/test/ui/issues/issue-35976.stderr
+++ b/src/test/ui/issues/issue-35976.stderr
@@ -1,6 +1,9 @@
 error: the `wait` method cannot be invoked on a trait object
   --> $DIR/issue-35976.rs:14:9
    |
+LL |         fn wait(&self) where Self: Sized;
+   |                                    ----- this has a `Sized` requirement
+...
 LL |     arg.wait();
    |         ^^^^
    |
diff --git a/src/test/ui/issues/issue-37026.stderr b/src/test/ui/issues/issue-37026.stderr
index 361369e68b..f0285730c5 100644
--- a/src/test/ui/issues/issue-37026.stderr
+++ b/src/test/ui/issues/issue-37026.stderr
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
   --> $DIR/issue-37026.rs:6:9
    |
 LL |     let empty_struct::XEmpty2 = ();
-   |         ^^^^^^^^^^^^^^^^^^^^^ expected `()`, found struct `empty_struct::XEmpty2`
+   |         ^^^^^^^^^^^^^^^^^^^^^   -- this expression has type `()`
+   |         |
+   |         expected `()`, found struct `empty_struct::XEmpty2`
 
 error[E0308]: mismatched types
   --> $DIR/issue-37026.rs:7:9
diff --git a/src/test/ui/issues/issue-37515.stderr b/src/test/ui/issues/issue-37515.stderr
index f084095969..1aafa512d8 100644
--- a/src/test/ui/issues/issue-37515.stderr
+++ b/src/test/ui/issues/issue-37515.stderr
@@ -4,7 +4,7 @@ warning: type alias is never used: `Z`
 LL | type Z = dyn for<'x> Send;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-37515.rs:3:9
    |
 LL | #![warn(unused)]
diff --git a/src/test/ui/issues/issue-37550.stderr b/src/test/ui/issues/issue-37550.stderr
index c1523e911f..35da625801 100644
--- a/src/test/ui/issues/issue-37550.stderr
+++ b/src/test/ui/issues/issue-37550.stderr
@@ -4,7 +4,7 @@ error[E0723]: function pointers in const fn are unstable
 LL |     let x = || t;
    |         ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-3763.rs b/src/test/ui/issues/issue-3763.rs
index 5d17a30ab3..3494df37fe 100644
--- a/src/test/ui/issues/issue-3763.rs
+++ b/src/test/ui/issues/issue-3763.rs
@@ -1,3 +1,6 @@
+// compile-flags: -Zsave-analysis
+// Also regression test for #69416
+
 mod my_mod {
     pub struct MyStruct {
         priv_field: isize
diff --git a/src/test/ui/issues/issue-3763.stderr b/src/test/ui/issues/issue-3763.stderr
index 50169286b1..873f69d390 100644
--- a/src/test/ui/issues/issue-3763.stderr
+++ b/src/test/ui/issues/issue-3763.stderr
@@ -1,29 +1,29 @@
 error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private
-  --> $DIR/issue-3763.rs:15:19
+  --> $DIR/issue-3763.rs:18:19
    |
 LL |     let _woohoo = (&my_struct).priv_field;
    |                   ^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private
-  --> $DIR/issue-3763.rs:18:19
+  --> $DIR/issue-3763.rs:21:19
    |
 LL |     let _woohoo = (Box::new(my_struct)).priv_field;
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0624]: method `happyfun` is private
-  --> $DIR/issue-3763.rs:21:18
+  --> $DIR/issue-3763.rs:24:18
    |
 LL |     (&my_struct).happyfun();
    |                  ^^^^^^^^
 
 error[E0624]: method `happyfun` is private
-  --> $DIR/issue-3763.rs:23:27
+  --> $DIR/issue-3763.rs:26:27
    |
 LL |     (Box::new(my_struct)).happyfun();
    |                           ^^^^^^^^
 
 error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private
-  --> $DIR/issue-3763.rs:24:16
+  --> $DIR/issue-3763.rs:27:16
    |
 LL |     let nope = my_struct.priv_field;
    |                ^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/issues/issue-37887.stderr b/src/test/ui/issues/issue-37887.stderr
index 6ef5359f98..944d544098 100644
--- a/src/test/ui/issues/issue-37887.stderr
+++ b/src/test/ui/issues/issue-37887.stderr
@@ -10,7 +10,7 @@ error[E0658]: use of unstable library feature 'rustc_private': this crate is bei
 LL |     extern crate libc;
    |     ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27812
+   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
    = help: add `#![feature(rustc_private)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/issues/issue-38404.stderr b/src/test/ui/issues/issue-38404.stderr
index d18a26b3a7..50c5195dc9 100644
--- a/src/test/ui/issues/issue-38404.stderr
+++ b/src/test/ui/issues/issue-38404.stderr
@@ -1,10 +1,12 @@
 error[E0038]: the trait `B` cannot be made into an object
   --> $DIR/issue-38404.rs:3:15
    |
+LL | trait A<T>: std::ops::Add<Self> + Sized {}
+   |             ------------------- ...because it uses `Self` as a type parameter in this
+LL | trait B<T>: A<T> {}
+   |       - this trait cannot be made into an object...
 LL | trait C<T>: A<dyn B<T, Output=usize>> {}
    |               ^^^^^^^^^^^^^^^^^^^^^^ the trait `B` cannot be made into an object
-   |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-38604.stderr b/src/test/ui/issues/issue-38604.stderr
index 8b923a2c6b..2bba50e1f4 100644
--- a/src/test/ui/issues/issue-38604.stderr
+++ b/src/test/ui/issues/issue-38604.stderr
@@ -1,18 +1,25 @@
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/issue-38604.rs:14:13
    |
+LL | trait Foo where u32: Q<Self> {
+   |       ---            ------- ...because it uses `Self` as a type parameter in this
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let _f: Box<dyn Foo> =
    |             ^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
-   |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
 
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/issue-38604.rs:15:9
    |
+LL | trait Foo where u32: Q<Self> {
+   |       ---            ------- ...because it uses `Self` as a type parameter in this
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |         Box::new(());
    |         ^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
    |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<dyn Foo>>` for `std::boxed::Box<()>`
    = note: required by cast to type `std::boxed::Box<dyn Foo>`
 
diff --git a/src/test/ui/issues/issue-38821.stderr b/src/test/ui/issues/issue-38821.stderr
index 0687fc940d..e355094261 100644
--- a/src/test/ui/issues/issue-38821.stderr
+++ b/src/test/ui/issues/issue-38821.stderr
@@ -5,6 +5,7 @@ LL | #[derive(Debug, Copy, Clone)]
    |                 ^^^^ the trait `NotNull` is not implemented for `<Col as Expression>::SqlType`
    |
    = note: required because of the requirements on the impl of `IntoNullable` for `<Col as Expression>::SqlType`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-38940.stderr b/src/test/ui/issues/issue-38940.stderr
index f60387f841..36117278fd 100644
--- a/src/test/ui/issues/issue-38940.stderr
+++ b/src/test/ui/issues/issue-38940.stderr
@@ -4,7 +4,7 @@ error[E0055]: reached the recursion limit while auto-dereferencing `I`
 LL |     let x: &Bottom = &t;
    |                      ^^ deref recursion limit reached
    |
-   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="20"]` attribute to your crate (`issue_38940`)
 
 error[E0308]: mismatched types
   --> $DIR/issue-38940.rs:43:22
diff --git a/src/test/ui/issues/issue-38954.stderr b/src/test/ui/issues/issue-38954.stderr
index a74d6353c3..d3168ef9e4 100644
--- a/src/test/ui/issues/issue-38954.stderr
+++ b/src/test/ui/issues/issue-38954.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the size for values of type `str` cannot be known at compilation time
-  --> $DIR/issue-38954.rs:1:23
+  --> $DIR/issue-38954.rs:1:10
    |
 LL | fn _test(ref _p: str) {}
-   |                       ^ doesn't have a size known at compile-time
+   |          ^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `str`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-39559.stderr b/src/test/ui/issues/issue-39559.stderr
index 0554b232c2..5e8d487f41 100644
--- a/src/test/ui/issues/issue-39559.stderr
+++ b/src/test/ui/issues/issue-39559.stderr
@@ -5,10 +5,6 @@ LL |     entries: [T; D::dim()],
    |                     ^^^ function or associated item not found in `D`
    |
    = help: items from traits can only be used if the type parameter is bounded by the trait
-help: the following trait defines an item `dim`, perhaps you need to restrict type parameter `D` with it:
-   |
-LL | pub struct Vector<T, D: Dim + Dim> {
-   |                      ^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-39616.rs b/src/test/ui/issues/issue-39616.rs
index 3d8e28e5c2..428856a36b 100644
--- a/src/test/ui/issues/issue-39616.rs
+++ b/src/test/ui/issues/issue-39616.rs
@@ -1,5 +1,4 @@
 fn foo(a: [0; 1]) {} //~ ERROR expected type, found `0`
-//~| ERROR expected one of `)`, `,`, `->`, `where`, or `{`, found `]`
-// FIXME(jseyfried): avoid emitting the second error (preexisting)
+//~| ERROR expected `;` or `{`, found `]`
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-39616.stderr b/src/test/ui/issues/issue-39616.stderr
index 74e94eda51..ced5827466 100644
--- a/src/test/ui/issues/issue-39616.stderr
+++ b/src/test/ui/issues/issue-39616.stderr
@@ -4,11 +4,11 @@ error: expected type, found `0`
 LL | fn foo(a: [0; 1]) {}
    |            ^ expected type
 
-error: expected one of `)`, `,`, `->`, `where`, or `{`, found `]`
+error: expected `;` or `{`, found `]`
   --> $DIR/issue-39616.rs:1:16
    |
 LL | fn foo(a: [0; 1]) {}
-   |                ^ expected one of `)`, `,`, `->`, `where`, or `{`
+   |                ^ expected `;` or `{`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-39848.rs b/src/test/ui/issues/issue-39848.rs
index 5d1db7be85..1964d73998 100644
--- a/src/test/ui/issues/issue-39848.rs
+++ b/src/test/ui/issues/issue-39848.rs
@@ -1,10 +1,9 @@
 macro_rules! get_opt {
     ($tgt:expr, $field:ident) => {
-        if $tgt.has_$field() {}
+        if $tgt.has_$field() {} //~ ERROR expected `{`, found `foo`
     }
 }
 
 fn main() {
     get_opt!(bar, foo);
-    //~^ ERROR expected `{`, found `foo`
 }
diff --git a/src/test/ui/issues/issue-39848.stderr b/src/test/ui/issues/issue-39848.stderr
index 11b145d6e0..0250c6b1fd 100644
--- a/src/test/ui/issues/issue-39848.stderr
+++ b/src/test/ui/issues/issue-39848.stderr
@@ -1,13 +1,17 @@
 error: expected `{`, found `foo`
-  --> $DIR/issue-39848.rs:8:19
+  --> $DIR/issue-39848.rs:3:21
    |
 LL |         if $tgt.has_$field() {}
-   |         --                -- help: try placing this code inside a block: `{ () }`
-   |         |
+   |         --          ^^^^^^--
+   |         |           |
+   |         |           expected `{`
+   |         |           help: try placing this code inside a block: `{ $field() }`
    |         this `if` expression has a condition, but no block
 ...
 LL |     get_opt!(bar, foo);
-   |                   ^^^ expected `{`
+   |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-40610.stderr b/src/test/ui/issues/issue-40610.stderr
index 95f45c168e..b4e302dfff 100644
--- a/src/test/ui/issues/issue-40610.stderr
+++ b/src/test/ui/issues/issue-40610.stderr
@@ -5,8 +5,6 @@ LL |     () + f(&[1.0]);
    |     -- ^ --------- ()
    |     |
    |     ()
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `()`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-41229-ref-str.stderr b/src/test/ui/issues/issue-41229-ref-str.stderr
index bcca911c5a..9d854e4be9 100644
--- a/src/test/ui/issues/issue-41229-ref-str.stderr
+++ b/src/test/ui/issues/issue-41229-ref-str.stderr
@@ -1,8 +1,8 @@
 error[E0277]: the size for values of type `str` cannot be known at compilation time
-  --> $DIR/issue-41229-ref-str.rs:1:28
+  --> $DIR/issue-41229-ref-str.rs:1:16
    |
 LL | pub fn example(ref s: str) {}
-   |                            ^ doesn't have a size known at compile-time
+   |                ^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `str`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-41255.stderr b/src/test/ui/issues/issue-41255.stderr
index 1ff58153c8..b6e57afcd1 100644
--- a/src/test/ui/issues/issue-41255.stderr
+++ b/src/test/ui/issues/issue-41255.stderr
@@ -4,7 +4,7 @@ error: floating-point types cannot be used in patterns
 LL |         5.0 => {},
    |         ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-41255.rs:6:11
    |
 LL | #![forbid(illegal_floating_point_literal_pattern)]
diff --git a/src/test/ui/issues/issue-41394.stderr b/src/test/ui/issues/issue-41394.stderr
index 3f60ea4bbf..47a24547d4 100644
--- a/src/test/ui/issues/issue-41394.stderr
+++ b/src/test/ui/issues/issue-41394.stderr
@@ -5,8 +5,6 @@ LL |     A = "" + 1
    |         -- ^ - {integer}
    |         |
    |         &str
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `&str`
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/issue-41394.rs:7:9
diff --git a/src/test/ui/issues/issue-42312.stderr b/src/test/ui/issues/issue-42312.stderr
index 6688203147..915bfffd6d 100644
--- a/src/test/ui/issues/issue-42312.stderr
+++ b/src/test/ui/issues/issue-42312.stderr
@@ -1,10 +1,10 @@
 error[E0277]: the size for values of type `<Self as std::ops::Deref>::Target` cannot be known at compilation time
-  --> $DIR/issue-42312.rs:4:29
+  --> $DIR/issue-42312.rs:4:12
    |
 LL |     fn baz(_: Self::Target) where Self: Deref {}
-   |                             ^                - help: consider further restricting the associated type: `, <Self as std::ops::Deref>::Target: std::marker::Sized`
-   |                             |
-   |                             doesn't have a size known at compile-time
+   |            ^                                 - help: consider further restricting the associated type: `, <Self as std::ops::Deref>::Target: std::marker::Sized`
+   |            |
+   |            doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `<Self as std::ops::Deref>::Target`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
@@ -12,10 +12,10 @@ LL |     fn baz(_: Self::Target) where Self: Deref {}
    = help: unsized locals are gated as an unstable feature
 
 error[E0277]: the size for values of type `(dyn std::string::ToString + 'static)` cannot be known at compilation time
-  --> $DIR/issue-42312.rs:8:27
+  --> $DIR/issue-42312.rs:8:10
    |
 LL | pub fn f(_: dyn ToString) {}
-   |                           ^ doesn't have a size known at compile-time
+   |          ^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `(dyn std::string::ToString + 'static)`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/issues/issue-42954.stderr b/src/test/ui/issues/issue-42954.stderr
index 8c35088a1b..840cceea7b 100644
--- a/src/test/ui/issues/issue-42954.stderr
+++ b/src/test/ui/issues/issue-42954.stderr
@@ -9,6 +9,8 @@ LL |         $i as u32 < 0
 ...
 LL |     is_plainly_printable!(c);
    |     ------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-43784-associated-type.stderr b/src/test/ui/issues/issue-43784-associated-type.stderr
index 393b012f5f..2f50a53f26 100644
--- a/src/test/ui/issues/issue-43784-associated-type.stderr
+++ b/src/test/ui/issues/issue-43784-associated-type.stderr
@@ -5,12 +5,15 @@ LL |     type Assoc: Partial<Self>;
    |          ----- associated type defined here
 ...
 LL | impl<T> Complete for T {
-   | ----------------------
-   | |    |
-   | |    help: consider restricting this bound: `T: std::marker::Copy`
-   | in this `impl` item
+   | ---------------------- in this `impl` item
 LL |     type Assoc = T;
    |     ^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/issue-43784-associated-type.rs:13:6
+   |
+LL | impl<T> Complete for T {
+   |      ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-43784-supertrait.stderr b/src/test/ui/issues/issue-43784-supertrait.stderr
index 5ac32041bc..1795db32a5 100644
--- a/src/test/ui/issues/issue-43784-supertrait.stderr
+++ b/src/test/ui/issues/issue-43784-supertrait.stderr
@@ -2,9 +2,13 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/issue-43784-supertrait.rs:8:9
    |
 LL | impl<T> Complete for T {}
-   |      -  ^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
-   |      |
-   |      help: consider restricting this bound: `T: std::marker::Copy`
+   |         ^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/issue-43784-supertrait.rs:8:6
+   |
+LL | impl<T> Complete for T {}
+   |      ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-44406.stderr b/src/test/ui/issues/issue-44406.stderr
index a98d833969..701c32d623 100644
--- a/src/test/ui/issues/issue-44406.stderr
+++ b/src/test/ui/issues/issue-44406.stderr
@@ -19,7 +19,7 @@ LL |     foo!(true);
    |          ^^^^ expected type
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr
index 71fbba562c..321698e763 100644
--- a/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr
+++ b/src/test/ui/issues/issue-45107-unnecessary-unsafe-in-closure.stderr
@@ -7,7 +7,7 @@ LL |         let f = |v: &mut Vec<_>| {
 LL |             unsafe {
    |             ^^^^^^ unnecessary `unsafe` block
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:1:8
    |
 LL | #[deny(unused_unsafe)]
diff --git a/src/test/ui/issues/issue-46576.stderr b/src/test/ui/issues/issue-46576.stderr
index 4b66219dd3..1e5e730ee6 100644
--- a/src/test/ui/issues/issue-46576.stderr
+++ b/src/test/ui/issues/issue-46576.stderr
@@ -4,7 +4,7 @@ error: unused import: `BufRead`
 LL | use std::io::{BufRead, BufReader, Read};
    |               ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-46576.rs:4:9
    |
 LL | #![deny(unused_imports)]
diff --git a/src/test/ui/issues/issue-46604.stderr b/src/test/ui/issues/issue-46604.stderr
index 32c7ecbf72..771e368a35 100644
--- a/src/test/ui/issues/issue-46604.stderr
+++ b/src/test/ui/issues/issue-46604.stderr
@@ -4,7 +4,7 @@ error[E0658]: references in statics may only refer to immutable values
 LL | static buf: &mut [u8] = &mut [1u8,2,3,4,5,7];
    |                         ^^^^^^^^^^^^^^^^^^^^ statics require immutable values
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/57349
+   = note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
    = help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
 
 error[E0594]: cannot assign to `buf[_]`, as `buf` is an immutable static item
diff --git a/src/test/ui/issues/issue-48131.stderr b/src/test/ui/issues/issue-48131.stderr
index 6df065b980..5acc4f16e9 100644
--- a/src/test/ui/issues/issue-48131.stderr
+++ b/src/test/ui/issues/issue-48131.stderr
@@ -4,7 +4,7 @@ error: unnecessary `unsafe` block
 LL |         unsafe { /* unnecessary */ }
    |         ^^^^^^ unnecessary `unsafe` block
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-48131.rs:3:9
    |
 LL | #![deny(unused_unsafe)]
diff --git a/src/test/ui/issues/issue-48364.stderr b/src/test/ui/issues/issue-48364.stderr
index e5bb9298cd..5ccede308a 100644
--- a/src/test/ui/issues/issue-48364.stderr
+++ b/src/test/ui/issues/issue-48364.stderr
@@ -6,6 +6,7 @@ LL |     b"".starts_with(stringify!(foo))
    |
    = note: expected reference `&[u8]`
               found reference `&'static str`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-48728.stderr b/src/test/ui/issues/issue-48728.stderr
index 84c10d8fbc..a0698c2079 100644
--- a/src/test/ui/issues/issue-48728.stderr
+++ b/src/test/ui/issues/issue-48728.stderr
@@ -8,6 +8,7 @@ LL | impl<T: Clone + ?Sized> Clone for Node<[T]> {
    | ------------------------------------------- first implementation here
    |
    = note: upstream crates may add a new impl of trait `std::clone::Clone` for type `[_]` in future versions
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-4935.rs b/src/test/ui/issues/issue-4935.rs
index 3b258c3568..b342bbb1b8 100644
--- a/src/test/ui/issues/issue-4935.rs
+++ b/src/test/ui/issues/issue-4935.rs
@@ -3,4 +3,4 @@
 fn foo(a: usize) {}
 //~^ defined here
 fn main() { foo(5, 6) }
-//~^ ERROR this function takes 1 parameter but 2 parameters were supplied
+//~^ ERROR this function takes 1 argument but 2 arguments were supplied
diff --git a/src/test/ui/issues/issue-4935.stderr b/src/test/ui/issues/issue-4935.stderr
index a99581fdca..0cc686e1cf 100644
--- a/src/test/ui/issues/issue-4935.stderr
+++ b/src/test/ui/issues/issue-4935.stderr
@@ -1,11 +1,13 @@
-error[E0061]: this function takes 1 parameter but 2 parameters were supplied
+error[E0061]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/issue-4935.rs:5:13
    |
 LL | fn foo(a: usize) {}
    | ---------------- defined here
 LL |
 LL | fn main() { foo(5, 6) }
-   |             ^^^^^^^^^ expected 1 parameter
+   |             ^^^ -  - supplied 2 arguments
+   |             |
+   |             expected 1 argument
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-4968.stderr b/src/test/ui/issues/issue-4968.stderr
index 35435d0e61..5451cf4235 100644
--- a/src/test/ui/issues/issue-4968.stderr
+++ b/src/test/ui/issues/issue-4968.stderr
@@ -1,8 +1,15 @@
 error[E0308]: mismatched types
   --> $DIR/issue-4968.rs:5:16
    |
+LL | const A: (isize,isize) = (4,2);
+   | ------------------------------- constant defined here
+LL | fn main() {
 LL |     match 42 { A => () }
-   |                ^ expected integer, found tuple
+   |                ^
+   |                |
+   |                expected integer, found tuple
+   |                `A` is interpreted as a constant, not a new binding
+   |                help: introduce a new binding instead: `other_a`
    |
    = note: expected type `{integer}`
              found tuple `(isize, isize)`
diff --git a/src/test/ui/issues/issue-49934.rs b/src/test/ui/issues/issue-49934.rs
index 262f4931d4..5b253750db 100644
--- a/src/test/ui/issues/issue-49934.rs
+++ b/src/test/ui/issues/issue-49934.rs
@@ -1,7 +1,7 @@
 // check-pass
 
 #![feature(stmt_expr_attributes)]
-#![warn(unused_attributes)] //~ NOTE lint level defined here
+#![warn(unused_attributes)] //~ NOTE the lint level is defined here
 
 fn main() {
     // fold_stmt (Item)
diff --git a/src/test/ui/issues/issue-49934.stderr b/src/test/ui/issues/issue-49934.stderr
index dbec379e3c..64bf5214e6 100644
--- a/src/test/ui/issues/issue-49934.stderr
+++ b/src/test/ui/issues/issue-49934.stderr
@@ -12,7 +12,7 @@ warning: unused attribute
 LL |     #[derive(Debug)]
    |     ^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-49934.rs:4:9
    |
 LL | #![warn(unused_attributes)]
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
index f91f6e891e..5db521536a 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref.stderr
@@ -5,7 +5,8 @@ LL |     let _result = &Some(42).as_deref();
    |                             ^^^^^^^^ help: there is a method with a similar name: `as_ref`
    |
    = note: the method `as_deref` exists but the following trait bounds were not satisfied:
-           `{integer} : std::ops::Deref`
+           `{integer}: std::ops::Deref`
+           `<{integer} as std::ops::Deref>::Target = _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
index 583236345c..f2133c8c84 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/option-as_deref_mut.stderr
@@ -5,7 +5,8 @@ LL |     let _result = &mut Some(42).as_deref_mut();
    |                                 ^^^^^^^^^^^^ method not found in `std::option::Option<{integer}>`
    |
    = note: the method `as_deref_mut` exists but the following trait bounds were not satisfied:
-           `{integer} : std::ops::DerefMut`
+           `{integer}: std::ops::DerefMut`
+           `<{integer} as std::ops::Deref>::Target = _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
index fae11fe62b..2dfc6d5375 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref.stderr
@@ -5,7 +5,8 @@ LL |     let _result = &Ok(42).as_deref();
    |                           ^^^^^^^^ help: there is a method with a similar name: `as_ref`
    |
    = note: the method `as_deref` exists but the following trait bounds were not satisfied:
-           `{integer} : std::ops::Deref`
+           `{integer}: std::ops::Deref`
+           `<{integer} as std::ops::Deref>::Target = _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_err.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_err.stderr
index 1d98361c46..1d65c57e5e 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_err.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_err.stderr
@@ -5,7 +5,8 @@ LL |     let _result = &Err(41).as_deref_err();
    |                            ^^^^^^^^^^^^ help: there is a method with a similar name: `as_deref_mut`
    |
    = note: the method `as_deref_err` exists but the following trait bounds were not satisfied:
-           `{integer} : std::ops::Deref`
+           `{integer}: std::ops::Deref`
+           `<{integer} as std::ops::Deref>::Target = _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
index 2c6231fb3b..2f4bf0c94b 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut.stderr
@@ -5,7 +5,8 @@ LL |     let _result = &mut Ok(42).as_deref_mut();
    |                               ^^^^^^^^^^^^ help: there is a method with a similar name: `as_deref_err`
    |
    = note: the method `as_deref_mut` exists but the following trait bounds were not satisfied:
-           `{integer} : std::ops::DerefMut`
+           `{integer}: std::ops::DerefMut`
+           `<{integer} as std::ops::Deref>::Target = _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut_err.stderr b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut_err.stderr
index 950a050ea9..b76d36c804 100644
--- a/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut_err.stderr
+++ b/src/test/ui/issues/issue-50264-inner-deref-trait/result-as_deref_mut_err.stderr
@@ -5,7 +5,8 @@ LL |     let _result = &mut Err(41).as_deref_mut_err();
    |                                ^^^^^^^^^^^^^^^^ help: there is a method with a similar name: `as_deref_mut`
    |
    = note: the method `as_deref_mut_err` exists but the following trait bounds were not satisfied:
-           `{integer} : std::ops::DerefMut`
+           `{integer}: std::ops::DerefMut`
+           `<{integer} as std::ops::Deref>::Target = _`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-50480.stderr b/src/test/ui/issues/issue-50480.stderr
index 2b92664d57..dfcac12817 100644
--- a/src/test/ui/issues/issue-50480.stderr
+++ b/src/test/ui/issues/issue-50480.stderr
@@ -29,6 +29,8 @@ LL | struct Foo(NotDefined, <i32 as Iterator>::Item, Vec<i32>, String);
    |                                                 --------  ------ this field does not implement `Copy`
    |                                                 |
    |                                                 this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/issues/issue-50781.stderr b/src/test/ui/issues/issue-50781.stderr
index 02475ea97e..03e3a7f227 100644
--- a/src/test/ui/issues/issue-50781.stderr
+++ b/src/test/ui/issues/issue-50781.stderr
@@ -1,17 +1,19 @@
 error: the trait `X` cannot be made into an object
   --> $DIR/issue-50781.rs:6:8
    |
+LL | trait X {
+   |       - this trait cannot be made into an object...
 LL |     fn foo(&self) where Self: Trait;
-   |        ^^^
+   |        ^^^ ...because method `foo` references the `Self` type in its `where` clause
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-50781.rs:1:9
    |
 LL | #![deny(where_clauses_object_safety)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #51443 <https://github.com/rust-lang/rust/issues/51443>
-   = note: method `foo` references the `Self` type in where clauses
+   = help: consider moving `foo` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-5100.stderr b/src/test/ui/issues/issue-5100.stderr
index c47e868943..a89980964c 100644
--- a/src/test/ui/issues/issue-5100.stderr
+++ b/src/test/ui/issues/issue-5100.stderr
@@ -1,6 +1,11 @@
 error[E0308]: mismatched types
   --> $DIR/issue-5100.rs:8:9
    |
+LL | enum A { B, C }
+   |          - unit variant defined here
+...
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
 LL |         A::B => (),
    |         ^^^^ expected tuple, found enum `A`
    |
@@ -10,6 +15,8 @@ LL |         A::B => (),
 error[E0308]: mismatched types
   --> $DIR/issue-5100.rs:17:9
    |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
 LL |         (true, false, false) => ()
    |         ^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
    |
@@ -19,6 +26,8 @@ LL |         (true, false, false) => ()
 error[E0308]: mismatched types
   --> $DIR/issue-5100.rs:25:9
    |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
 LL |         (true, false, false) => ()
    |         ^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 3 elements
    |
@@ -39,6 +48,8 @@ LL |         box (true, false) => ()
 error[E0308]: mismatched types
   --> $DIR/issue-5100.rs:40:9
    |
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
 LL |         &(true, false) => ()
    |         ^^^^^^^^^^^^^^ expected tuple, found reference
    |
diff --git a/src/test/ui/issues/issue-5153.stderr b/src/test/ui/issues/issue-5153.stderr
index 4680c8b131..93aaf4b9d8 100644
--- a/src/test/ui/issues/issue-5153.stderr
+++ b/src/test/ui/issues/issue-5153.stderr
@@ -1,12 +1,11 @@
 error[E0599]: no method named `foo` found for reference `&dyn Foo` in the current scope
   --> $DIR/issue-5153.rs:10:27
    |
+LL |     fn foo(self: Box<Self>);
+   |                  --------- the method might not be found because of this arbitrary self type
+...
 LL |     (&5isize as &dyn Foo).foo();
    |                           ^^^ method not found in `&dyn Foo`
-   |
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `foo`, perhaps you need to implement it:
-           candidate #1: `Foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-51714.stderr b/src/test/ui/issues/issue-51714.stderr
index c3b880200f..6960308504 100644
--- a/src/test/ui/issues/issue-51714.stderr
+++ b/src/test/ui/issues/issue-51714.stderr
@@ -4,7 +4,7 @@ error[E0658]: `while` is not allowed in a `const`
 LL |     [(); return while let Some(n) = Some(0) {}];
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/52000
+   = note: see issue #52000 <https://github.com/rust-lang/rust/issues/52000> for more information
    = help: add `#![feature(const_loop)]` to the crate attributes to enable
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
diff --git a/src/test/ui/issues/issue-51798.rs b/src/test/ui/issues/issue-51798.rs
new file mode 100644
index 0000000000..b075809e93
--- /dev/null
+++ b/src/test/ui/issues/issue-51798.rs
@@ -0,0 +1,14 @@
+// edition:2018
+// aux-build:issue-51798.rs
+// check-pass
+
+extern crate issue_51798;
+
+mod server {
+    fn f() {
+        let mut v = issue_51798::vec();
+        v.clear();
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/issues/issue-51848.stderr b/src/test/ui/issues/issue-51848.stderr
index 31faaab614..051c4d7f42 100644
--- a/src/test/ui/issues/issue-51848.stderr
+++ b/src/test/ui/issues/issue-51848.stderr
@@ -10,6 +10,7 @@ LL |     macro_with_error!();
    |     -------------------- in this macro invocation
    |
    = note: if you intended to print `{`, you can escape it using `{{`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: invalid format string: unmatched `}` found
   --> $DIR/issue-51848.rs:18:15
diff --git a/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr b/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr
index 68ee537541..0108a37e8f 100644
--- a/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr
+++ b/src/test/ui/issues/issue-52023-array-size-pointer-cast.stderr
@@ -4,7 +4,7 @@ error[E0658]: casting pointers to integers in constants is unstable
 LL |     let _ = [0; (&0 as *const i32) as usize];
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/51910
+   = note: see issue #51910 <https://github.com/rust-lang/rust/issues/51910> for more information
    = help: add `#![feature(const_raw_ptr_to_usize_cast)]` to the crate attributes to enable
 
 error[E0080]: evaluation of constant value failed
diff --git a/src/test/ui/issues/issue-53251.stderr b/src/test/ui/issues/issue-53251.stderr
index 21e41574a4..cd5030f761 100644
--- a/src/test/ui/issues/issue-53251.stderr
+++ b/src/test/ui/issues/issue-53251.stderr
@@ -6,6 +6,8 @@ LL |                 S::f::<i64>();
 ...
 LL | impl_add!(a b);
    | --------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
   --> $DIR/issue-53251.rs:11:24
@@ -15,6 +17,8 @@ LL |                 S::f::<i64>();
 ...
 LL | impl_add!(a b);
    | --------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-53840.rs b/src/test/ui/issues/issue-53840.rs
deleted file mode 100644
index e854d24ab9..0000000000
--- a/src/test/ui/issues/issue-53840.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-enum E {
-    Foo(String, String, String),
-}
-
-struct Bar {
-    a: String,
-    b: String,
-}
-
-fn main() {
-    let bar = Bar { a: "1".to_string(), b: "2".to_string() };
-    match E::Foo("".into(), "".into(), "".into()) {
-        E::Foo(a, b, ref c) => {}
-//~^ ERROR cannot bind by-move and by-ref in the same pattern
-    }
-    match bar {
-        Bar {a, ref b} => {}
-//~^ ERROR cannot bind by-move and by-ref in the same pattern
-    }
-}
diff --git a/src/test/ui/issues/issue-53840.stderr b/src/test/ui/issues/issue-53840.stderr
deleted file mode 100644
index 9cb034e759..0000000000
--- a/src/test/ui/issues/issue-53840.stderr
+++ /dev/null
@@ -1,20 +0,0 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/issue-53840.rs:13:16
-   |
-LL |         E::Foo(a, b, ref c) => {}
-   |                ^  ^  ----- by-ref pattern here
-   |                |  |
-   |                |  by-move pattern here
-   |                by-move pattern here
-
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/issue-53840.rs:17:14
-   |
-LL |         Bar {a, ref b} => {}
-   |              ^  ----- by-ref pattern here
-   |              |
-   |              by-move pattern here
-
-error: aborting due to 2 previous errors
-
-For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/issues/issue-54348.rs b/src/test/ui/issues/issue-54348.rs
index fd9a9e024a..5c38d7c42f 100644
--- a/src/test/ui/issues/issue-54348.rs
+++ b/src/test/ui/issues/issue-54348.rs
@@ -2,6 +2,6 @@
 
 fn main() {
     [1][0u64 as usize];
-    [1][1.5 as usize]; //~ ERROR index out of bounds
-    [1][1u64 as usize]; //~ ERROR index out of bounds
+    [1][1.5 as usize]; //~ ERROR operation will panic
+    [1][1u64 as usize]; //~ ERROR operation will panic
 }
diff --git a/src/test/ui/issues/issue-54348.stderr b/src/test/ui/issues/issue-54348.stderr
index 7619cd7437..6b67125e36 100644
--- a/src/test/ui/issues/issue-54348.stderr
+++ b/src/test/ui/issues/issue-54348.stderr
@@ -1,16 +1,16 @@
-error: index out of bounds: the len is 1 but the index is 1
+error: this operation will panic at runtime
   --> $DIR/issue-54348.rs:5:5
    |
 LL |     [1][1.5 as usize];
-   |     ^^^^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^ index out of bounds: the len is 1 but the index is 1
    |
-   = note: `#[deny(const_err)]` on by default
+   = note: `#[deny(unconditional_panic)]` on by default
 
-error: index out of bounds: the len is 1 but the index is 1
+error: this operation will panic at runtime
   --> $DIR/issue-54348.rs:6:5
    |
 LL |     [1][1u64 as usize];
-   |     ^^^^^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^ index out of bounds: the len is 1 but the index is 1
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-54954.rs b/src/test/ui/issues/issue-54954.rs
index 9e9f92ed9a..3d6355f5c5 100644
--- a/src/test/ui/issues/issue-54954.rs
+++ b/src/test/ui/issues/issue-54954.rs
@@ -5,7 +5,7 @@ const ARR_LEN: usize = Tt::const_val::<[i8; 123]>();
 
 trait Tt {
     const fn const_val<T: Sized>() -> usize {
-    //~^ ERROR trait fns cannot be declared const
+        //~^ ERROR functions in traits cannot be declared const
         core::mem::size_of::<T>()
     }
 }
diff --git a/src/test/ui/issues/issue-54954.stderr b/src/test/ui/issues/issue-54954.stderr
index d99a5772e8..4967b82216 100644
--- a/src/test/ui/issues/issue-54954.stderr
+++ b/src/test/ui/issues/issue-54954.stderr
@@ -1,8 +1,8 @@
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/issue-54954.rs:7:5
    |
 LL |     const fn const_val<T: Sized>() -> usize {
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
 error[E0283]: type annotations needed
   --> $DIR/issue-54954.rs:3:24
diff --git a/src/test/ui/issues/issue-55511.stderr b/src/test/ui/issues/issue-55511.stderr
index e094256f5c..91b81ba694 100644
--- a/src/test/ui/issues/issue-55511.stderr
+++ b/src/test/ui/issues/issue-55511.stderr
@@ -4,7 +4,7 @@ warning: to use a constant of type `std::cell::Cell` in a pattern, `std::cell::C
 LL |         <() as Foo<'static>>::C => { }
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-55511.rs:1:9
    |
 LL | #![warn(indirect_structural_match)]
diff --git a/src/test/ui/issues/issue-56411.stderr b/src/test/ui/issues/issue-56411.stderr
index 1f38c70a11..3ac8dc548a 100644
--- a/src/test/ui/issues/issue-56411.stderr
+++ b/src/test/ui/issues/issue-56411.stderr
@@ -13,6 +13,7 @@ LL | import!(("issue-56411-aux.rs", issue_56411_aux));
    | ------------------------------------------------- in this macro invocation
    |
    = note: `issue_56411_aux` must be defined only once in the type namespace of this module
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0365]: `issue_56411_aux` is private, and cannot be re-exported
   --> $DIR/issue-56411.rs:6:21
@@ -24,6 +25,7 @@ LL | import!(("issue-56411-aux.rs", issue_56411_aux));
    | ------------------------------------------------- in this macro invocation
    |
    = note: consider declaring type or module `issue_56411_aux` with `pub`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-56685.stderr b/src/test/ui/issues/issue-56685.stderr
index 30fedbe165..2cef3126b9 100644
--- a/src/test/ui/issues/issue-56685.stderr
+++ b/src/test/ui/issues/issue-56685.stderr
@@ -4,7 +4,7 @@ error: unused variable: `x`
 LL |         E::A(x) | E::B(x) => {}
    |              ^         ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-56685.rs:2:9
    |
 LL | #![deny(unused_variables)]
diff --git a/src/test/ui/issues/issue-57362-1.stderr b/src/test/ui/issues/issue-57362-1.stderr
index ad596db13c..5c611cd43d 100644
--- a/src/test/ui/issues/issue-57362-1.stderr
+++ b/src/test/ui/issues/issue-57362-1.stderr
@@ -6,8 +6,11 @@ LL |     a.f();
    |
    = note: `a` is a function, perhaps you wish to call it
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `f`, perhaps you need to implement it:
-           candidate #1: `Trait`
+note: `Trait` defines an item `f`, perhaps you need to implement it
+  --> $DIR/issue-57362-1.rs:8:1
+   |
+LL | trait Trait {
+   | ^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-57362-2.stderr b/src/test/ui/issues/issue-57362-2.stderr
index 3528084f6c..2edc009746 100644
--- a/src/test/ui/issues/issue-57362-2.stderr
+++ b/src/test/ui/issues/issue-57362-2.stderr
@@ -5,8 +5,11 @@ LL |     let x = <fn (&())>::make_g();
    |                         ^^^^^^ function or associated item not found in `for<'r> fn(&'r ())`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `make_g`, perhaps you need to implement it:
-           candidate #1: `X`
+note: `X` defines an item `make_g`, perhaps you need to implement it
+  --> $DIR/issue-57362-2.rs:8:1
+   |
+LL | trait X {
+   | ^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-57472.stderr b/src/test/ui/issues/issue-57472.stderr
index b6dd7e2494..26efdf6dba 100644
--- a/src/test/ui/issues/issue-57472.stderr
+++ b/src/test/ui/issues/issue-57472.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |             Punned { bar: [_], .. } => println!("bar"),
    |             ^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-57472.rs:2:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/issues/issue-58856-1.stderr b/src/test/ui/issues/issue-58856-1.stderr
index 0ea6b01754..a8db8e8b41 100644
--- a/src/test/ui/issues/issue-58856-1.stderr
+++ b/src/test/ui/issues/issue-58856-1.stderr
@@ -9,8 +9,14 @@ LL |     fn b(self>
 error: expected `;` or `{`, found `>`
   --> $DIR/issue-58856-1.rs:3:14
    |
+LL | impl A {
+   |        - while parsing this item list starting here
+LL |
 LL |     fn b(self>
    |              ^ expected `;` or `{`
+...
+LL | }
+   | - the item list ends here
 
 error[E0412]: cannot find type `A` in this scope
   --> $DIR/issue-58856-1.rs:1:6
diff --git a/src/test/ui/issues/issue-58856-2.rs b/src/test/ui/issues/issue-58856-2.rs
index 745f0300bd..9356d57b0e 100644
--- a/src/test/ui/issues/issue-58856-2.rs
+++ b/src/test/ui/issues/issue-58856-2.rs
@@ -9,6 +9,6 @@ impl Howness for () {
         Empty
     }
 }
-//~^ ERROR expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`,
+//~^ ERROR non-item in item list
 
 fn main() {}
diff --git a/src/test/ui/issues/issue-58856-2.stderr b/src/test/ui/issues/issue-58856-2.stderr
index 01d70d861e..303b5eacc3 100644
--- a/src/test/ui/issues/issue-58856-2.stderr
+++ b/src/test/ui/issues/issue-58856-2.stderr
@@ -7,13 +7,17 @@ LL |     fn how_are_you(&self -> Empty {
    |                   |     help: `)` may belong here
    |                   unclosed delimiter
 
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found `)`
+error: non-item in item list
   --> $DIR/issue-58856-2.rs:11:1
    |
-LL |     }
-   |      - expected one of 10 possible tokens
+LL | impl Howness for () {
+   |                     - item list starts here
+...
 LL | }
-   | ^ unexpected token
+   | ^
+   | |
+   | non-item starts here
+   | item list ends here
 
 error[E0407]: method `how_are_you` is not a member of trait `Howness`
   --> $DIR/issue-58856-2.rs:6:5
diff --git a/src/test/ui/issues/issue-59488.stderr b/src/test/ui/issues/issue-59488.stderr
index 35ada71a1f..58f1376b19 100644
--- a/src/test/ui/issues/issue-59488.stderr
+++ b/src/test/ui/issues/issue-59488.stderr
@@ -58,8 +58,6 @@ LL |     foo > bar;
    |     --- ^ --- fn(i64) -> i64 {bar}
    |     |
    |     fn() -> i32 {foo}
-   |
-   = note: an implementation of `std::cmp::PartialOrd` might be missing for `fn() -> i32 {foo}`
 
 error[E0308]: mismatched types
   --> $DIR/issue-59488.rs:25:11
@@ -79,8 +77,7 @@ LL |     assert_eq!(Foo::Bar, i);
    |     fn(usize) -> Foo {Foo::Bar}
    |     fn(usize) -> Foo {Foo::Bar}
    |
-   = note: an implementation of `std::cmp::PartialEq` might be missing for `fn(usize) -> Foo {Foo::Bar}`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: `fn(usize) -> Foo {Foo::Bar}` doesn't implement `std::fmt::Debug`
   --> $DIR/issue-59488.rs:30:5
@@ -91,7 +88,7 @@ LL |     assert_eq!(Foo::Bar, i);
    = help: the trait `std::fmt::Debug` is not implemented for `fn(usize) -> Foo {Foo::Bar}`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&fn(usize) -> Foo {Foo::Bar}`
    = note: required by `std::fmt::Debug::fmt`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: `fn(usize) -> Foo {Foo::Bar}` doesn't implement `std::fmt::Debug`
   --> $DIR/issue-59488.rs:30:5
@@ -102,7 +99,7 @@ LL |     assert_eq!(Foo::Bar, i);
    = help: the trait `std::fmt::Debug` is not implemented for `fn(usize) -> Foo {Foo::Bar}`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&fn(usize) -> Foo {Foo::Bar}`
    = note: required by `std::fmt::Debug::fmt`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 10 previous errors
 
diff --git a/src/test/ui/issues/issue-59896.stderr b/src/test/ui/issues/issue-59896.stderr
index ef78f27fa6..95b7938ae0 100644
--- a/src/test/ui/issues/issue-59896.stderr
+++ b/src/test/ui/issues/issue-59896.stderr
@@ -7,7 +7,7 @@ LL | struct S;
 LL |     use S;
    |         ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-59896.rs:1:9
    |
 LL | #![deny(unused_imports)]
diff --git a/src/test/ui/issues/issue-60075.rs b/src/test/ui/issues/issue-60075.rs
index 7d3fc83786..e89d78ee8a 100644
--- a/src/test/ui/issues/issue-60075.rs
+++ b/src/test/ui/issues/issue-60075.rs
@@ -4,8 +4,8 @@ trait T {
     fn qux() -> Option<usize> {
         let _ = if true {
         });
-//~^ ERROR expected one of `async`
-//~| ERROR expected one of `.`, `;`, `?`, `else`, or an operator, found `}`
-//~| ERROR expected identifier, found `;`
+//~^ ERROR non-item in item list
+//~| ERROR mismatched closing delimiter: `)`
+//~| ERROR expected one of `.`, `;`
         Some(4)
     }
diff --git a/src/test/ui/issues/issue-60075.stderr b/src/test/ui/issues/issue-60075.stderr
index e8ef981f51..e3b7f4ad42 100644
--- a/src/test/ui/issues/issue-60075.stderr
+++ b/src/test/ui/issues/issue-60075.stderr
@@ -4,20 +4,26 @@ error: expected one of `.`, `;`, `?`, `else`, or an operator, found `}`
 LL |         });
    |          ^ expected one of `.`, `;`, `?`, `else`, or an operator
 
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found `;`
+error: non-item in item list
   --> $DIR/issue-60075.rs:6:11
    |
-LL |     fn qux() -> Option<usize> {
-   |                               - unclosed delimiter
-LL |         let _ = if true {
+LL | trait T {
+   |         - item list starts here
+...
 LL |         });
-   |           ^ help: `}` may belong here
+   |           ^ non-item starts here
+...
+LL |     }
+   |     - item list ends here
 
-error: expected identifier, found `;`
-  --> $DIR/issue-60075.rs:6:11
+error: mismatched closing delimiter: `)`
+  --> $DIR/issue-60075.rs:6:10
    |
+LL |     fn qux() -> Option<usize> {
+   |                               - unclosed delimiter
+LL |         let _ = if true {
 LL |         });
-   |           ^ expected identifier
+   |          ^ mismatched closing delimiter
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-60622.stderr b/src/test/ui/issues/issue-60622.stderr
index da0ae1541b..79cb6cfc35 100644
--- a/src/test/ui/issues/issue-60622.stderr
+++ b/src/test/ui/issues/issue-60622.stderr
@@ -7,7 +7,7 @@ LL |     fn a(&self) {}
 LL |     b.a::<'_, T>();
    |           ^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-60622.rs:3:9
    |
 LL | #![deny(warnings)]
diff --git a/src/test/ui/issues/issue-6596-1.rs b/src/test/ui/issues/issue-6596-1.rs
index 5da5445134..25f1d65007 100644
--- a/src/test/ui/issues/issue-6596-1.rs
+++ b/src/test/ui/issues/issue-6596-1.rs
@@ -1,7 +1,7 @@
 macro_rules! e {
     ($inp:ident) => (
         $nonexistent
-        //~^ ERROR unknown macro variable `nonexistent`
+        //~^ ERROR expected expression, found `$`
     );
 }
 
diff --git a/src/test/ui/issues/issue-6596-1.stderr b/src/test/ui/issues/issue-6596-1.stderr
index 2a4ece2f24..216fe6472a 100644
--- a/src/test/ui/issues/issue-6596-1.stderr
+++ b/src/test/ui/issues/issue-6596-1.stderr
@@ -1,11 +1,13 @@
-error: unknown macro variable `nonexistent`
+error: expected expression, found `$`
   --> $DIR/issue-6596-1.rs:3:9
    |
 LL |         $nonexistent
-   |         ^^^^^^^^^^^^ unknown macro variable
+   |         ^^^^^^^^^^^^ expected expression
 ...
 LL |     e!(foo);
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-6596-2.rs b/src/test/ui/issues/issue-6596-2.rs
index b19700efe5..8f7c98d9a6 100644
--- a/src/test/ui/issues/issue-6596-2.rs
+++ b/src/test/ui/issues/issue-6596-2.rs
@@ -3,7 +3,7 @@
 macro_rules! g {
     ($inp:ident) => (
         { $inp $nonexistent }
-        //~^ ERROR unknown macro variable `nonexistent`
+        //~^ ERROR expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `$`
     );
 }
 
diff --git a/src/test/ui/issues/issue-6596-2.stderr b/src/test/ui/issues/issue-6596-2.stderr
index 20fbe0fab0..3d13c64f76 100644
--- a/src/test/ui/issues/issue-6596-2.stderr
+++ b/src/test/ui/issues/issue-6596-2.stderr
@@ -1,11 +1,13 @@
-error: unknown macro variable `nonexistent`
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `$`
   --> $DIR/issue-6596-2.rs:5:16
    |
 LL |         { $inp $nonexistent }
-   |                ^^^^^^^^^^^^ unknown macro variable
+   |                ^^^^^^^^^^^^ expected one of 8 possible tokens
 ...
 LL |     g!(foo);
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-6804.stderr b/src/test/ui/issues/issue-6804.stderr
index f4188dc356..c7411e27c2 100644
--- a/src/test/ui/issues/issue-6804.stderr
+++ b/src/test/ui/issues/issue-6804.stderr
@@ -4,7 +4,7 @@ error: floating-point types cannot be used in patterns
 LL |         NAN => {},
    |         ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-6804.rs:4:9
    |
 LL | #![deny(illegal_floating_point_literal_pattern)]
diff --git a/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr b/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr
index 8d1a03ac20..78760efd8d 100644
--- a/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr
+++ b/src/test/ui/issues/issue-68091-unicode-ident-after-if.stderr
@@ -12,6 +12,8 @@ LL |         $($c)ö* {}
 ...
 LL |     x!(if);
    |     ------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-68696-catch-during-unwind.rs b/src/test/ui/issues/issue-68696-catch-during-unwind.rs
new file mode 100644
index 0000000000..d042bed225
--- /dev/null
+++ b/src/test/ui/issues/issue-68696-catch-during-unwind.rs
@@ -0,0 +1,26 @@
+// Checks that catch_unwind can be used if unwinding is already in progress.
+// Used to fail when standard library had been compiled with debug assertions,
+// due to incorrect assumption that a current thread is not panicking when
+// entering the catch_unwind.
+//
+// run-pass
+// ignore-wasm       no panic support
+// ignore-emscripten no panic support
+
+use std::panic::catch_unwind;
+
+#[derive(Default)]
+struct Guard;
+
+impl Drop for Guard {
+    fn drop(&mut self) {
+        let _ = catch_unwind(|| {});
+    }
+}
+
+fn main() {
+    let _ = catch_unwind(|| {
+        let _guard = Guard::default();
+        panic!();
+    });
+}
diff --git a/src/test/ui/issues/issue-69306.rs b/src/test/ui/issues/issue-69306.rs
new file mode 100644
index 0000000000..85d60952ac
--- /dev/null
+++ b/src/test/ui/issues/issue-69306.rs
@@ -0,0 +1,45 @@
+fn main() {}
+
+struct S0<T>(T);
+impl<T> S0<T> {
+    const C: S0<u8> = Self(0);
+    //~^ ERROR mismatched types
+    //~| ERROR mismatched types
+
+    fn foo() {
+        Self(0);
+        //~^ ERROR mismatched types
+    }
+}
+
+// Testing normalization.
+trait Fun {
+    type Out;
+}
+impl<T> Fun for S0<T> {
+    type Out = Self;
+}
+trait Foo<T> {
+    fn foo();
+}
+impl<T> Foo<T> for <S0<T> as Fun>::Out {
+    fn foo() {
+        Self(0); //~ ERROR mismatched types
+    }
+}
+
+struct S1<T, U>(T, U);
+impl<T> S1<T, u8> {
+    const C: S1<u8, u8> = Self(0, 1);
+    //~^ ERROR mismatched types
+    //~| ERROR mismatched types
+}
+
+struct S2<T>(T);
+impl<T> S2<T> {
+    fn map<U>(x: U) -> S2<U> {
+        Self(x)
+        //~^ ERROR mismatched types
+        //~| ERROR mismatched types
+    }
+}
diff --git a/src/test/ui/issues/issue-69306.stderr b/src/test/ui/issues/issue-69306.stderr
new file mode 100644
index 0000000000..a2a42739ca
--- /dev/null
+++ b/src/test/ui/issues/issue-69306.stderr
@@ -0,0 +1,115 @@
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:5:28
+   |
+LL | impl<T> S0<T> {
+   |      - this type parameter
+LL |     const C: S0<u8> = Self(0);
+   |                            ^ expected type parameter `T`, found integer
+   |
+   = note: expected type parameter `T`
+                        found type `{integer}`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:5:23
+   |
+LL | impl<T> S0<T> {
+   |      - this type parameter
+LL |     const C: S0<u8> = Self(0);
+   |                       ^^^^^^^ expected `u8`, found type parameter `T`
+   |
+   = note: expected struct `S0<u8>`
+              found struct `S0<T>`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:10:14
+   |
+LL | impl<T> S0<T> {
+   |      - this type parameter
+...
+LL |         Self(0);
+   |              ^ expected type parameter `T`, found integer
+   |
+   = note: expected type parameter `T`
+                        found type `{integer}`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:27:14
+   |
+LL | impl<T> Foo<T> for <S0<T> as Fun>::Out {
+   |      - this type parameter
+LL |     fn foo() {
+LL |         Self(0);
+   |              ^ expected type parameter `T`, found integer
+   |
+   = note: expected type parameter `T`
+                        found type `{integer}`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:33:32
+   |
+LL | impl<T> S1<T, u8> {
+   |      - this type parameter
+LL |     const C: S1<u8, u8> = Self(0, 1);
+   |                                ^ expected type parameter `T`, found integer
+   |
+   = note: expected type parameter `T`
+                        found type `{integer}`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:33:27
+   |
+LL | impl<T> S1<T, u8> {
+   |      - this type parameter
+LL |     const C: S1<u8, u8> = Self(0, 1);
+   |                           ^^^^^^^^^^ expected `u8`, found type parameter `T`
+   |
+   = note: expected struct `S1<u8, _>`
+              found struct `S1<T, _>`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:41:14
+   |
+LL | impl<T> S2<T> {
+   |      - expected type parameter
+LL |     fn map<U>(x: U) -> S2<U> {
+   |            - found type parameter
+LL |         Self(x)
+   |              ^ expected type parameter `T`, found type parameter `U`
+   |
+   = note: expected type parameter `T`
+              found type parameter `U`
+   = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error[E0308]: mismatched types
+  --> $DIR/issue-69306.rs:41:9
+   |
+LL | impl<T> S2<T> {
+   |      - found type parameter
+LL |     fn map<U>(x: U) -> S2<U> {
+   |            -           ----- expected `S2<U>` because of return type
+   |            |
+   |            expected type parameter
+LL |         Self(x)
+   |         ^^^^^^^ expected type parameter `U`, found type parameter `T`
+   |
+   = note: expected struct `S2<U>`
+              found struct `S2<T>`
+   = note: a type parameter was expected, but a different one was found; you might be missing a type parameter or trait bound
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error: aborting due to 8 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/issues/issue-69396-const-no-type-in-macro.stderr b/src/test/ui/issues/issue-69396-const-no-type-in-macro.stderr
index c12ce166ef..1af5368d2b 100644
--- a/src/test/ui/issues/issue-69396-const-no-type-in-macro.stderr
+++ b/src/test/ui/issues/issue-69396-const-no-type-in-macro.stderr
@@ -14,6 +14,7 @@ LL | | }
    | |_- in this macro invocation
    |
    = note: `A` must be defined only once in the value namespace of this module
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: missing type for `const` item
   --> $DIR/issue-69396-const-no-type-in-macro.rs:4:19
@@ -26,6 +27,8 @@ LL | |     len;
 LL | |     is_empty;
 LL | | }
    | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
   --> $DIR/issue-69396-const-no-type-in-macro.rs:4:19
@@ -41,6 +44,8 @@ LL | |     len;
 LL | |     is_empty;
 LL | | }
    | |_- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.rs b/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.rs
new file mode 100644
index 0000000000..2c5257ce06
--- /dev/null
+++ b/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.rs
@@ -0,0 +1,22 @@
+trait TraitA {
+    const VALUE: usize;
+}
+
+struct A;
+impl TraitA for A {
+  const VALUE: usize = 0;
+}
+
+trait TraitB {
+    type MyA: TraitA;
+    const VALUE: usize = Self::MyA::VALUE;
+}
+
+struct B;
+impl TraitB for B { //~ ERROR not all trait items implemented, missing: `MyA`
+    type M   = A; //~ ERROR type `M` is not a member of trait `TraitB`
+}
+
+fn main() {
+    let _ = [0; B::VALUE];
+}
diff --git a/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.stderr b/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.stderr
new file mode 100644
index 0000000000..8ae0f8b804
--- /dev/null
+++ b/src/test/ui/issues/issue-69602-type-err-during-codegen-ice.stderr
@@ -0,0 +1,19 @@
+error[E0437]: type `M` is not a member of trait `TraitB`
+  --> $DIR/issue-69602-type-err-during-codegen-ice.rs:17:5
+   |
+LL |     type M   = A;
+   |     ^^^^^^^^^^^^^ not a member of trait `TraitB`
+
+error[E0046]: not all trait items implemented, missing: `MyA`
+  --> $DIR/issue-69602-type-err-during-codegen-ice.rs:16:1
+   |
+LL |     type MyA: TraitA;
+   |     ----------------- `MyA` from trait
+...
+LL | impl TraitB for B {
+   | ^^^^^^^^^^^^^^^^^ missing `MyA` in implementation
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0046, E0437.
+For more information about an error, try `rustc --explain E0046`.
diff --git a/src/test/ui/issues/issue-69725.rs b/src/test/ui/issues/issue-69725.rs
new file mode 100644
index 0000000000..b8130b41f2
--- /dev/null
+++ b/src/test/ui/issues/issue-69725.rs
@@ -0,0 +1,11 @@
+// aux-build:issue-69725.rs
+
+extern crate issue_69725;
+use issue_69725::Struct;
+
+fn crash<A>() {
+    let _ = Struct::<A>::new().clone();
+    //~^ ERROR: no method named `clone` found
+}
+
+fn main() {}
diff --git a/src/test/ui/issues/issue-69725.stderr b/src/test/ui/issues/issue-69725.stderr
new file mode 100644
index 0000000000..667383e072
--- /dev/null
+++ b/src/test/ui/issues/issue-69725.stderr
@@ -0,0 +1,18 @@
+error[E0599]: no method named `clone` found for struct `issue_69725::Struct<A>` in the current scope
+  --> $DIR/issue-69725.rs:7:32
+   |
+LL |     let _ = Struct::<A>::new().clone();
+   |                                ^^^^^ method not found in `issue_69725::Struct<A>`
+   | 
+  ::: $DIR/auxiliary/issue-69725.rs:2:1
+   |
+LL | pub struct Struct<A>(A);
+   | ------------------------ doesn't satisfy `issue_69725::Struct<A>: std::clone::Clone`
+   |
+   = note: the method `clone` exists but the following trait bounds were not satisfied:
+           `A: std::clone::Clone`
+           which is required by `issue_69725::Struct<A>: std::clone::Clone`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/issues/issue-7246.stderr b/src/test/ui/issues/issue-7246.stderr
index a11ce1654c..bb0221ecb8 100644
--- a/src/test/ui/issues/issue-7246.stderr
+++ b/src/test/ui/issues/issue-7246.stderr
@@ -6,7 +6,7 @@ LL |     return;
 LL |     if *ptr::null() {};
    |     ^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-7246.rs:1:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/issues/issue-7867.stderr b/src/test/ui/issues/issue-7867.stderr
index 58e82facf8..0d3121d604 100644
--- a/src/test/ui/issues/issue-7867.stderr
+++ b/src/test/ui/issues/issue-7867.stderr
@@ -1,6 +1,11 @@
 error[E0308]: mismatched types
   --> $DIR/issue-7867.rs:7:9
    |
+LL | enum A { B, C }
+   |          - unit variant defined here
+...
+LL |     match (true, false) {
+   |           ------------- this expression has type `(bool, bool)`
 LL |         A::B => (),
    |         ^^^^ expected tuple, found enum `A`
    |
diff --git a/src/test/ui/issues/issue-8460-const.noopt.stderr b/src/test/ui/issues/issue-8460-const.noopt.stderr
new file mode 100644
index 0000000000..3556ec0824
--- /dev/null
+++ b/src/test/ui/issues/issue-8460-const.noopt.stderr
@@ -0,0 +1,150 @@
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:14:36
+   |
+LL |     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^^ attempt to divide with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:16:36
+   |
+LL |     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:18:36
+   |
+LL |     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:20:36
+   |
+LL |     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:22:36
+   |
+LL |     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:24:36
+   |
+LL |     assert!(thread::spawn(move|| { i128::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:26:36
+   |
+LL |     assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
+   |                                    ^^^^^^^^^^ attempt to divide by zero
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:28:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
+   |                                    ^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:30:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:32:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:34:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:36:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i128 / 0; }).join().is_err());
+   |                                    ^^^^^^^^^ attempt to divide by zero
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:38:36
+   |
+LL |     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:40:36
+   |
+LL |     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:42:36
+   |
+LL |     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:44:36
+   |
+LL |     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:46:36
+   |
+LL |     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:48:36
+   |
+LL |     assert!(thread::spawn(move|| { i128::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:50:36
+   |
+LL |     assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
+   |                                    ^^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:52:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
+   |                                    ^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:54:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:56:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:58:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:60:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i128 % 0; }).join().is_err());
+   |                                    ^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: aborting due to 24 previous errors
+
diff --git a/src/test/ui/issues/issue-8460-const.opt.stderr b/src/test/ui/issues/issue-8460-const.opt.stderr
new file mode 100644
index 0000000000..3556ec0824
--- /dev/null
+++ b/src/test/ui/issues/issue-8460-const.opt.stderr
@@ -0,0 +1,150 @@
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:14:36
+   |
+LL |     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^^ attempt to divide with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:16:36
+   |
+LL |     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:18:36
+   |
+LL |     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:20:36
+   |
+LL |     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:22:36
+   |
+LL |     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:24:36
+   |
+LL |     assert!(thread::spawn(move|| { i128::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:26:36
+   |
+LL |     assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
+   |                                    ^^^^^^^^^^ attempt to divide by zero
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:28:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
+   |                                    ^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:30:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:32:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:34:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:36:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i128 / 0; }).join().is_err());
+   |                                    ^^^^^^^^^ attempt to divide by zero
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:38:36
+   |
+LL |     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:40:36
+   |
+LL |     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:42:36
+   |
+LL |     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:44:36
+   |
+LL |     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:46:36
+   |
+LL |     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:48:36
+   |
+LL |     assert!(thread::spawn(move|| { i128::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:50:36
+   |
+LL |     assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
+   |                                    ^^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:52:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
+   |                                    ^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:54:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:56:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:58:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:60:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i128 % 0; }).join().is_err());
+   |                                    ^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: aborting due to 24 previous errors
+
diff --git a/src/test/ui/issues/issue-8460-const.opt_with_overflow_checks.stderr b/src/test/ui/issues/issue-8460-const.opt_with_overflow_checks.stderr
new file mode 100644
index 0000000000..3556ec0824
--- /dev/null
+++ b/src/test/ui/issues/issue-8460-const.opt_with_overflow_checks.stderr
@@ -0,0 +1,150 @@
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:14:36
+   |
+LL |     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^^ attempt to divide with overflow
+   |
+   = note: `#[deny(arithmetic_overflow)]` on by default
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:16:36
+   |
+LL |     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:18:36
+   |
+LL |     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:20:36
+   |
+LL |     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:22:36
+   |
+LL |     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:24:36
+   |
+LL |     assert!(thread::spawn(move|| { i128::MIN / -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^ attempt to divide with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:26:36
+   |
+LL |     assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
+   |                                    ^^^^^^^^^^ attempt to divide by zero
+   |
+   = note: `#[deny(unconditional_panic)]` on by default
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:28:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
+   |                                    ^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:30:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:32:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:34:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to divide by zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:36:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i128 / 0; }).join().is_err());
+   |                                    ^^^^^^^^^ attempt to divide by zero
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:38:36
+   |
+LL |     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:40:36
+   |
+LL |     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:42:36
+   |
+LL |     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:44:36
+   |
+LL |     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:46:36
+   |
+LL |     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/issue-8460-const.rs:48:36
+   |
+LL |     assert!(thread::spawn(move|| { i128::MIN % -1; }).join().is_err());
+   |                                    ^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:50:36
+   |
+LL |     assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
+   |                                    ^^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:52:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
+   |                                    ^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:54:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:56:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:58:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
+   |                                    ^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: this operation will panic at runtime
+  --> $DIR/issue-8460-const.rs:60:36
+   |
+LL |     assert!(thread::spawn(move|| { 1i128 % 0; }).join().is_err());
+   |                                    ^^^^^^^^^ attempt to calculate the remainder with a divisor of zero
+
+error: aborting due to 24 previous errors
+
diff --git a/src/test/ui/issues/issue-8460-const.rs b/src/test/ui/issues/issue-8460-const.rs
index c18a0d4d6c..53005e46d2 100644
--- a/src/test/ui/issues/issue-8460-const.rs
+++ b/src/test/ui/issues/issue-8460-const.rs
@@ -1,60 +1,62 @@
+// revisions: noopt opt opt_with_overflow_checks
+//[noopt]compile-flags: -C opt-level=0
+//[opt]compile-flags: -O
+//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+
 // build-fail
-// compile-flags: -O
 
 #![deny(const_err)]
 
-use std::{isize, i8, i16, i32, i64};
+use std::{isize, i8, i16, i32, i64, i128};
 use std::thread;
 
 fn main() {
     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
+    assert!(thread::spawn(move|| { i128::MIN / -1; }).join().is_err());
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
+    //~^ ERROR operation will panic
+    assert!(thread::spawn(move|| { 1i128 / 0; }).join().is_err());
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    //~| ERROR this expression will panic at runtime
+    //~^ ERROR arithmetic operation will overflow
+    assert!(thread::spawn(move|| { i128::MIN % -1; }).join().is_err());
+    //~^ ERROR arithmetic operation will overflow
     assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
+    //~^ ERROR operation will panic
     assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
+    //~^ ERROR operation will panic
+    assert!(thread::spawn(move|| { 1i128 % 0; }).join().is_err());
+    //~^ ERROR operation will panic
 }
diff --git a/src/test/ui/issues/issue-8460-const.stderr b/src/test/ui/issues/issue-8460-const.stderr
deleted file mode 100644
index 170747f840..0000000000
--- a/src/test/ui/issues/issue-8460-const.stderr
+++ /dev/null
@@ -1,188 +0,0 @@
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const.rs:10:36
-   |
-LL |     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/issue-8460-const.rs:4:9
-   |
-LL | #![deny(const_err)]
-   |         ^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:10:36
-   |
-LL |     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^^^ attempt to divide with overflow
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const.rs:13:36
-   |
-LL |     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:13:36
-   |
-LL |     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^ attempt to divide with overflow
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const.rs:16:36
-   |
-LL |     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:16:36
-   |
-LL |     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const.rs:19:36
-   |
-LL |     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:19:36
-   |
-LL |     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const.rs:22:36
-   |
-LL |     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:22:36
-   |
-LL |     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^ attempt to divide with overflow
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const.rs:25:36
-   |
-LL |     assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
-   |                                    ^^^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const.rs:27:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
-   |                                    ^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const.rs:29:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const.rs:31:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const.rs:33:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const.rs:35:36
-   |
-LL |     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:35:36
-   |
-LL |     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const.rs:38:36
-   |
-LL |     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:38:36
-   |
-LL |     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const.rs:41:36
-   |
-LL |     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:41:36
-   |
-LL |     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const.rs:44:36
-   |
-LL |     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:44:36
-   |
-LL |     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const.rs:47:36
-   |
-LL |     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: this expression will panic at runtime
-  --> $DIR/issue-8460-const.rs:47:36
-   |
-LL |     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^ attempt to calculate the remainder with overflow
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const.rs:50:36
-   |
-LL |     assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
-   |                                    ^^^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const.rs:52:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
-   |                                    ^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const.rs:54:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const.rs:56:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const.rs:58:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: aborting due to 30 previous errors
-
diff --git a/src/test/ui/issues/issue-8460-const2.rs b/src/test/ui/issues/issue-8460-const2.rs
deleted file mode 100644
index 0ca850abc1..0000000000
--- a/src/test/ui/issues/issue-8460-const2.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// build-fail
-// compile-flags: -C overflow-checks=on -O
-
-#![deny(const_err)]
-
-use std::{isize, i8, i16, i32, i64};
-use std::thread;
-
-fn main() {
-    assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
-    //~^ ERROR attempt to divide with overflow
-    assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
-    //~^ ERROR attempt to divide by zero
-    assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with overflow
-    assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-    assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
-    //~^ ERROR attempt to calculate the remainder with a divisor of zero
-}
diff --git a/src/test/ui/issues/issue-8460-const2.stderr b/src/test/ui/issues/issue-8460-const2.stderr
deleted file mode 100644
index 6ad186fb21..0000000000
--- a/src/test/ui/issues/issue-8460-const2.stderr
+++ /dev/null
@@ -1,128 +0,0 @@
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const2.rs:10:36
-   |
-LL |     assert!(thread::spawn(move|| { isize::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/issue-8460-const2.rs:4:9
-   |
-LL | #![deny(const_err)]
-   |         ^^^^^^^^^
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const2.rs:12:36
-   |
-LL |     assert!(thread::spawn(move|| { i8::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const2.rs:14:36
-   |
-LL |     assert!(thread::spawn(move|| { i16::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const2.rs:16:36
-   |
-LL |     assert!(thread::spawn(move|| { i32::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: attempt to divide with overflow
-  --> $DIR/issue-8460-const2.rs:18:36
-   |
-LL |     assert!(thread::spawn(move|| { i64::MIN / -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const2.rs:20:36
-   |
-LL |     assert!(thread::spawn(move|| { 1isize / 0; }).join().is_err());
-   |                                    ^^^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const2.rs:22:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i8 / 0; }).join().is_err());
-   |                                    ^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const2.rs:24:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i16 / 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const2.rs:26:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i32 / 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to divide by zero
-  --> $DIR/issue-8460-const2.rs:28:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i64 / 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const2.rs:30:36
-   |
-LL |     assert!(thread::spawn(move|| { isize::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^^^
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const2.rs:32:36
-   |
-LL |     assert!(thread::spawn(move|| { i8::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const2.rs:34:36
-   |
-LL |     assert!(thread::spawn(move|| { i16::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const2.rs:36:36
-   |
-LL |     assert!(thread::spawn(move|| { i32::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: attempt to calculate the remainder with overflow
-  --> $DIR/issue-8460-const2.rs:38:36
-   |
-LL |     assert!(thread::spawn(move|| { i64::MIN % -1; }).join().is_err());
-   |                                    ^^^^^^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const2.rs:40:36
-   |
-LL |     assert!(thread::spawn(move|| { 1isize % 0; }).join().is_err());
-   |                                    ^^^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const2.rs:42:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i8 % 0; }).join().is_err());
-   |                                    ^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const2.rs:44:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i16 % 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const2.rs:46:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i32 % 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: attempt to calculate the remainder with a divisor of zero
-  --> $DIR/issue-8460-const2.rs:48:36
-   |
-LL |     assert!(thread::spawn(move|| { 1i64 % 0; }).join().is_err());
-   |                                    ^^^^^^^^
-
-error: aborting due to 20 previous errors
-
diff --git a/src/test/ui/json-short.stderr b/src/test/ui/json-short.stderr
index 226343b1b8..60c2582b11 100644
--- a/src/test/ui/json-short.stderr
+++ b/src/test/ui/json-short.stderr
@@ -8,8 +8,10 @@ fn main() {
 }
 ```
 
-If you don't know the basics of Rust, you can go look to the Rust Book to get
-started: https://doc.rust-lang.org/book/
+If you don't know the basics of Rust, you can look at the
+[Rust Book][rust-book] to get started.
+
+[rust-book]: https://doc.rust-lang.org/book/
 "},"level":"error","spans":[{"file_name":"$DIR/json-short.rs","byte_start":62,"byte_end":62,"line_start":1,"line_end":1,"column_start":63,"column_end":63,"is_primary":true,"text":[{"text":"// compile-flags: --json=diagnostic-short --error-format=json","highlight_start":63,"highlight_end":63}],"label":"consider adding a `main` function to `$DIR/json-short.rs`","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"$DIR/json-short.rs:1:63: error[E0601]: `main` function not found in crate `json_short`
 "}
 {"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error
diff --git a/src/test/ui/kindck/kindck-impl-type-params.nll.stderr b/src/test/ui/kindck/kindck-impl-type-params.nll.stderr
index 82efa83990..593f55a517 100644
--- a/src/test/ui/kindck/kindck-impl-type-params.nll.stderr
+++ b/src/test/ui/kindck/kindck-impl-type-params.nll.stderr
@@ -1,50 +1,58 @@
 error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/kindck-impl-type-params.rs:18:13
    |
-LL | fn f<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Send`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a = &t as &dyn Gettable<T>;
    |             ^^ `T` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Send`
+  --> $DIR/kindck-impl-type-params.rs:16:6
+   |
+LL | fn f<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/kindck-impl-type-params.rs:18:13
    |
-LL | fn f<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a = &t as &dyn Gettable<T>;
    |             ^^ the trait `std::marker::Copy` is not implemented for `T`
    |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/kindck-impl-type-params.rs:16:6
+   |
+LL | fn f<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
 error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/kindck-impl-type-params.rs:25:31
    |
-LL | fn g<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Send`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a: &dyn Gettable<T> = &t;
    |                               ^^ `T` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Send`
+  --> $DIR/kindck-impl-type-params.rs:23:6
+   |
+LL | fn g<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/kindck-impl-type-params.rs:25:31
    |
-LL | fn g<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a: &dyn Gettable<T> = &t;
    |                               ^^ the trait `std::marker::Copy` is not implemented for `T`
    |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/kindck-impl-type-params.rs:23:6
+   |
+LL | fn g<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
diff --git a/src/test/ui/kindck/kindck-impl-type-params.stderr b/src/test/ui/kindck/kindck-impl-type-params.stderr
index 2075fdd311..42318623b4 100644
--- a/src/test/ui/kindck/kindck-impl-type-params.stderr
+++ b/src/test/ui/kindck/kindck-impl-type-params.stderr
@@ -1,50 +1,58 @@
 error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/kindck-impl-type-params.rs:18:13
    |
-LL | fn f<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Send`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a = &t as &dyn Gettable<T>;
    |             ^^ `T` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Send`
+  --> $DIR/kindck-impl-type-params.rs:16:6
+   |
+LL | fn f<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/kindck-impl-type-params.rs:18:13
    |
-LL | fn f<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a = &t as &dyn Gettable<T>;
    |             ^^ the trait `std::marker::Copy` is not implemented for `T`
    |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/kindck-impl-type-params.rs:16:6
+   |
+LL | fn f<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
 error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/kindck-impl-type-params.rs:25:31
    |
-LL | fn g<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Send`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a: &dyn Gettable<T> = &t;
    |                               ^^ `T` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Send`
+  --> $DIR/kindck-impl-type-params.rs:23:6
+   |
+LL | fn g<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
   --> $DIR/kindck-impl-type-params.rs:25:31
    |
-LL | fn g<T>(val: T) {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     let t: S<T> = S(marker::PhantomData);
 LL |     let a: &dyn Gettable<T> = &t;
    |                               ^^ the trait `std::marker::Copy` is not implemented for `T`
    |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/kindck-impl-type-params.rs:23:6
+   |
+LL | fn g<T>(val: T) {
+   |      ^
    = note: required because of the requirements on the impl of `Gettable<T>` for `S<T>`
    = note: required for the cast to the object type `dyn Gettable<T>`
 
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr b/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr
index da1a7a7520..2a9fd13be5 100644
--- a/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr
+++ b/src/test/ui/kindck/kindck-inherited-copy-bound.curr.stderr
@@ -12,18 +12,25 @@ LL |     take_param(&x);
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/kindck-inherited-copy-bound.rs:28:19
    |
+LL | trait Foo : Copy {
+   |       ---   ---- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let z = &x as &dyn Foo;
    |                   ^^^^^^^^ the trait `Foo` cannot be made into an object
-   |
-   = note: the trait cannot require that `Self : Sized`
 
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/kindck-inherited-copy-bound.rs:28:13
    |
+LL | trait Foo : Copy {
+   |       ---   ---- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let z = &x as &dyn Foo;
    |             ^^ the trait `Foo` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Foo>` for `&std::boxed::Box<{integer}>`
    = note: required by cast to type `&dyn Foo`
 
diff --git a/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr b/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
index f272f829ba..6227ada4dc 100644
--- a/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
+++ b/src/test/ui/kindck/kindck-inherited-copy-bound.object_safe_for_dispatch.stderr
@@ -12,10 +12,14 @@ LL |     take_param(&x);
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/kindck-inherited-copy-bound.rs:28:13
    |
+LL | trait Foo : Copy {
+   |       ---   ---- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let z = &x as &dyn Foo;
    |             ^^ the trait `Foo` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Foo>` for `&std::boxed::Box<i32>`
    = note: required by cast to type `&dyn Foo`
 
diff --git a/src/test/ui/label/label_break_value_illegal_uses.rs b/src/test/ui/label/label_break_value_illegal_uses.rs
index 81cb177438..9d4c72410a 100644
--- a/src/test/ui/label/label_break_value_illegal_uses.rs
+++ b/src/test/ui/label/label_break_value_illegal_uses.rs
@@ -3,7 +3,7 @@
 // These are forbidden occurrences of label-break-value
 
 fn labeled_unsafe() {
-    unsafe 'b: {} //~ ERROR expected one of `extern`, `fn`, or `{`
+    unsafe 'b: {} //~ ERROR expected `{`, found `'b`
 }
 
 fn labeled_if() {
diff --git a/src/test/ui/label/label_break_value_illegal_uses.stderr b/src/test/ui/label/label_break_value_illegal_uses.stderr
index 46b53c65b4..fd8850dd8d 100644
--- a/src/test/ui/label/label_break_value_illegal_uses.stderr
+++ b/src/test/ui/label/label_break_value_illegal_uses.stderr
@@ -1,8 +1,8 @@
-error: expected one of `extern`, `fn`, or `{`, found `'b`
+error: expected `{`, found `'b`
   --> $DIR/label_break_value_illegal_uses.rs:6:12
    |
 LL |     unsafe 'b: {}
-   |            ^^ expected one of `extern`, `fn`, or `{`
+   |            ^^ expected `{`
 
 error: expected `{`, found `'b`
   --> $DIR/label_break_value_illegal_uses.rs:10:13
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs b/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
index 1c70624e4a..7eecd99dc0 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
+++ b/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.rs
@@ -20,7 +20,7 @@ pub struct Middle {
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type TestMiddle = Middle;
-//~^ ERROR homogeneous_aggregate: Homogeneous
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous
 
 #[repr(C)]
 pub struct Final {
@@ -31,6 +31,6 @@ pub struct Final {
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type TestFinal = Final;
-//~^ ERROR homogeneous_aggregate: Homogeneous
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous
 
 fn main() { }
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr b/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
index 0d44260635..cd3fb5ca5e 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
+++ b/src/test/ui/layout/homogeneous-aggr-zero-sized-c-struct.stderr
@@ -1,10 +1,10 @@
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-c-struct.rs:22:1
    |
 LL | pub type TestMiddle = Middle;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-c-struct.rs:33:1
    |
 LL | pub type TestFinal = Final;
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
index 4b429412ae..ec2c9b7022 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
+++ b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.rs
@@ -52,22 +52,22 @@ pub struct WithEmptyRustEnum {
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type Test1 = BaseCase;
-//~^ ERROR homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type Test2 = WithPhantomData;
-//~^ ERROR homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type Test3 = WithEmptyRustStruct;
-//~^ ERROR homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type Test4 = WithTransitivelyEmptyRustStruct;
-//~^ ERROR homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
 
 #[rustc_layout(homogeneous_aggregate)]
 pub type Test5 = WithEmptyRustEnum;
-//~^ ERROR homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
 
 fn main() { }
diff --git a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
index be04ba3e7f..ec2b08bf02 100644
--- a/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
+++ b/src/test/ui/layout/homogeneous-aggr-zero-sized-repr-rust.stderr
@@ -1,28 +1,28 @@
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:54:1
    |
 LL | pub type Test1 = BaseCase;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:58:1
    |
 LL | pub type Test2 = WithPhantomData;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:62:1
    |
 LL | pub type Test3 = WithEmptyRustStruct;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:66:1
    |
 LL | pub type Test4 = WithTransitivelyEmptyRustStruct;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/homogeneous-aggr-zero-sized-repr-rust.rs:70:1
    |
 LL | pub type Test5 = WithEmptyRustEnum;
diff --git a/src/test/ui/layout/unsafe-cell-hides-niche.rs b/src/test/ui/layout/unsafe-cell-hides-niche.rs
new file mode 100644
index 0000000000..4ca3f7a1aa
--- /dev/null
+++ b/src/test/ui/layout/unsafe-cell-hides-niche.rs
@@ -0,0 +1,32 @@
+// For rust-lang/rust#68303: the contents of `UnsafeCell<T>` cannot
+// participate in the niche-optimization for enum discriminants. This
+// test checks that an `Option<UnsafeCell<NonZeroU32>>` has the same
+// size in memory as an `Option<UnsafeCell<u32>>` (namely, 8 bytes).
+
+// run-pass
+
+#![feature(no_niche)]
+
+use std::cell::UnsafeCell;
+use std::mem::size_of;
+use std::num::NonZeroU32 as N32;
+
+struct Wrapper<T>(T);
+
+#[repr(transparent)]
+struct Transparent<T>(T);
+
+#[repr(no_niche)]
+struct NoNiche<T>(T);
+
+fn main() {
+    assert_eq!(size_of::<Option<Wrapper<u32>>>(),     8);
+    assert_eq!(size_of::<Option<Wrapper<N32>>>(),     4);
+    assert_eq!(size_of::<Option<Transparent<u32>>>(), 8);
+    assert_eq!(size_of::<Option<Transparent<N32>>>(), 4);
+    assert_eq!(size_of::<Option<NoNiche<u32>>>(),     8);
+    assert_eq!(size_of::<Option<NoNiche<N32>>>(),     8);
+
+    assert_eq!(size_of::<Option<UnsafeCell<u32>>>(),  8);
+    assert_eq!(size_of::<Option<UnsafeCell<N32>>>(),  8);
+}
diff --git a/src/test/ui/layout/zero-sized-array-union.rs b/src/test/ui/layout/zero-sized-array-union.rs
index 68b218249e..1a662ba446 100644
--- a/src/test/ui/layout/zero-sized-array-union.rs
+++ b/src/test/ui/layout/zero-sized-array-union.rs
@@ -57,7 +57,7 @@ struct Baz1 {
 
 #[rustc_layout(homogeneous_aggregate)]
 type TestBaz1 = Baz1;
-//~^ ERROR homogeneous_aggregate: Homogeneous
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous
 
 #[repr(C)]
 struct Baz2 {
@@ -68,7 +68,7 @@ struct Baz2 {
 
 #[rustc_layout(homogeneous_aggregate)]
 type TestBaz2 = Baz2;
-//~^ ERROR homogeneous_aggregate: Homogeneous
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous
 
 #[repr(C)]
 struct Baz3 {
@@ -79,7 +79,7 @@ struct Baz3 {
 
 #[rustc_layout(homogeneous_aggregate)]
 type TestBaz3 = Baz3;
-//~^ ERROR homogeneous_aggregate: Homogeneous
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous
 
 #[repr(C)]
 struct Baz4 {
@@ -90,6 +90,6 @@ struct Baz4 {
 
 #[rustc_layout(homogeneous_aggregate)]
 type TestBaz4 = Baz4;
-//~^ ERROR homogeneous_aggregate: Homogeneous
+//~^ ERROR homogeneous_aggregate: Ok(Homogeneous
 
 fn main() { }
diff --git a/src/test/ui/layout/zero-sized-array-union.stderr b/src/test/ui/layout/zero-sized-array-union.stderr
index 1bb31aaf7b..43b1588266 100644
--- a/src/test/ui/layout/zero-sized-array-union.stderr
+++ b/src/test/ui/layout/zero-sized-array-union.stderr
@@ -1,22 +1,22 @@
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/zero-sized-array-union.rs:59:1
    |
 LL | type TestBaz1 = Baz1;
    | ^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/zero-sized-array-union.rs:70:1
    |
 LL | type TestBaz2 = Baz2;
    | ^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/zero-sized-array-union.rs:81:1
    |
 LL | type TestBaz3 = Baz3;
    | ^^^^^^^^^^^^^^^^^^^^^
 
-error: homogeneous_aggregate: Homogeneous(Reg { kind: Float, size: Size { raw: 4 } })
+error: homogeneous_aggregate: Ok(Homogeneous(Reg { kind: Float, size: Size { raw: 4 } }))
   --> $DIR/zero-sized-array-union.rs:92:1
    |
 LL | type TestBaz4 = Baz4;
diff --git a/src/test/ui/lifetime_starts_expressions.stderr b/src/test/ui/lifetime_starts_expressions.stderr
index a2b4f114b9..0d7980d60d 100644
--- a/src/test/ui/lifetime_starts_expressions.stderr
+++ b/src/test/ui/lifetime_starts_expressions.stderr
@@ -18,7 +18,7 @@ LL |     loop { break 'label: loop { break 'label 42; }; }
    |                        tried to parse a type due to this type ascription
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
index 0e2fc0a0fe..2cb6e62e41 100644
--- a/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
+++ b/src/test/ui/lifetimes/borrowck-let-suggestion.stderr
@@ -10,7 +10,7 @@ LL |     x.use_mut();
    |     - borrow later used here
    |
    = note: consider using a `let` binding to create a longer lived value
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
index 7b823f012b..e60c461743 100644
--- a/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
+++ b/src/test/ui/lifetimes/lifetime-doesnt-live-long-enough.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/lifetime-doesnt-live-long-enough.rs:19:5
    |
 LL | struct Foo<T> {
-   |            - help: consider adding an explicit lifetime bound `T: 'static`...
+   |            - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     foo: &'static T
    |     ^^^^^^^^^^^^^^^
    |
@@ -13,87 +13,71 @@ LL |     foo: &'static T
    |     ^^^^^^^^^^^^^^^
 
 error[E0309]: the parameter type `K` may not live long enough
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:24:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:24:19
    |
 LL | trait X<K>: Sized {
-   |         - help: consider adding an explicit lifetime bound `K: 'a`...
+   |         - help: consider adding an explicit lifetime bound...: `K: 'a`
 LL |     fn foo<'a, L: X<&'a Nested<K>>>();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                   ^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'a Nested<K>` does not outlive the data it points at
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:24:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:24:19
    |
 LL |     fn foo<'a, L: X<&'a Nested<K>>>();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                   ^^^^^^^^^^^^^^^^
 
 error[E0309]: the parameter type `Self` may not live long enough
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:28:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:28:19
    |
 LL |     fn bar<'a, L: X<&'a Nested<Self>>>();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                   ^^^^^^^^^^^^^^^^^^^
    |
    = help: consider adding an explicit lifetime bound `Self: 'a`...
 note: ...so that the reference type `&'a Nested<Self>` does not outlive the data it points at
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:28:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:28:19
    |
 LL |     fn bar<'a, L: X<&'a Nested<Self>>>();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                   ^^^^^^^^^^^^^^^^^^^
 
 error[E0309]: the parameter type `L` may not live long enough
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:32:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:32:22
    |
-LL |       fn baz<'a, L, M: X<&'a Nested<L>>>() {
-   |       ^          - help: consider adding an explicit lifetime bound `L: 'a`...
-   |  _____|
-   | |
-LL | |
-LL | |     }
-   | |_____^
+LL |     fn baz<'a, L, M: X<&'a Nested<L>>>() {
+   |                -     ^^^^^^^^^^^^^^^^
+   |                |
+   |                help: consider adding an explicit lifetime bound...: `L: 'a`
    |
 note: ...so that the reference type `&'a Nested<L>` does not outlive the data it points at
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:32:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:32:22
    |
-LL | /     fn baz<'a, L, M: X<&'a Nested<L>>>() {
-LL | |
-LL | |     }
-   | |_____^
+LL |     fn baz<'a, L, M: X<&'a Nested<L>>>() {
+   |                      ^^^^^^^^^^^^^^^^
 
 error[E0309]: the parameter type `K` may not live long enough
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:41:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:41:33
    |
-LL |   impl<K> Nested<K> {
-   |        - help: consider adding an explicit lifetime bound `K: 'a`...
-LL | /     fn generic_in_parent<'a, L: X<&'a Nested<K>>>() {
-LL | |
-LL | |     }
-   | |_____^
+LL | impl<K> Nested<K> {
+   |      - help: consider adding an explicit lifetime bound...: `K: 'a`
+LL |     fn generic_in_parent<'a, L: X<&'a Nested<K>>>() {
+   |                                 ^^^^^^^^^^^^^^^^
    |
 note: ...so that the reference type `&'a Nested<K>` does not outlive the data it points at
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:41:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:41:33
    |
-LL | /     fn generic_in_parent<'a, L: X<&'a Nested<K>>>() {
-LL | |
-LL | |     }
-   | |_____^
+LL |     fn generic_in_parent<'a, L: X<&'a Nested<K>>>() {
+   |                                 ^^^^^^^^^^^^^^^^
 
 error[E0309]: the parameter type `M` may not live long enough
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:44:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:44:36
    |
-LL |       fn generic_in_child<'a, 'b, L: X<&'a Nested<M>>, M: 'b>() {
-   |       ^                                                -- help: consider adding an explicit lifetime bound `M: 'a`...
-   |  _____|
-   | |
-LL | |
-LL | |     }
-   | |_____^
+LL |     fn generic_in_child<'a, 'b, L: X<&'a Nested<M>>, M: 'b>() {
+   |                                    ^^^^^^^^^^^^^^^^  -- help: consider adding an explicit lifetime bound...: `M: 'a +`
    |
 note: ...so that the reference type `&'a Nested<M>` does not outlive the data it points at
-  --> $DIR/lifetime-doesnt-live-long-enough.rs:44:5
+  --> $DIR/lifetime-doesnt-live-long-enough.rs:44:36
    |
-LL | /     fn generic_in_child<'a, 'b, L: X<&'a Nested<M>>, M: 'b>() {
-LL | |
-LL | |     }
-   | |_____^
+LL |     fn generic_in_child<'a, 'b, L: X<&'a Nested<M>>, M: 'b>() {
+   |                                    ^^^^^^^^^^^^^^^^
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
index 1d5eeac23f..461c1832e9 100644
--- a/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
+++ b/src/test/ui/lifetimes/lifetime-elision-return-type-requires-explicit-lifetime.stderr
@@ -10,25 +10,25 @@ error[E0106]: missing lifetime specifier
   --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:7:33
    |
 LL | fn g(_x: &isize, _y: &isize) -> &isize {
-   |                                 ^ expected named lifetime parameter
+   |          ------      ------     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `_x` or `_y`
 help: consider introducing a named lifetime parameter
    |
-LL | fn g<'lifetime>(_x: &isize, _y: &isize) -> &'lifetime isize {
-   |     ^^^^^^^^^^^                            ^^^^^^^^^^
+LL | fn g<'a>(_x: &'a isize, _y: &'a isize) -> &'a isize {
+   |     ^^^^     ^^^^^^^^^      ^^^^^^^^^     ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:17:19
    |
 LL | fn h(_x: &Foo) -> &isize {
-   |                   ^ expected named lifetime parameter
+   |          ----     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `_x`'s 2 lifetimes it is borrowed from
 help: consider introducing a named lifetime parameter
    |
-LL | fn h<'lifetime>(_x: &Foo) -> &'lifetime isize {
-   |     ^^^^^^^^^^^              ^^^^^^^^^^
+LL | fn h<'a>(_x: &'a Foo) -> &'a isize {
+   |     ^^^^     ^^^^^^^     ^^^
 
 error[E0106]: missing lifetime specifier
   --> $DIR/lifetime-elision-return-type-requires-explicit-lifetime.rs:21:20
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr
index fc9093bb2e..291edc505c 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-if-else-using-impl.nll.stderr
@@ -7,7 +7,7 @@ LL |     fn foo<'a>(x: &i32, y: &'a i32) -> &'a i32 {
    |            lifetime `'a` defined here
 LL | 
 LL |         if x > y { x } else { y }
-   |                    ^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
+   |                    ^ method was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr
index 3384c24da8..15ee58574e 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-return-type-is-anon.nll.stderr
@@ -7,7 +7,7 @@ LL |   fn foo<'a>(&self, x: &'a i32) -> &i32 {
    |          lifetime `'a` defined here
 LL | 
 LL |     x
-   |     ^ function was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
+   |     ^ method was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr
index 5ef29076e0..a27a91e38f 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex1-return-one-existing-name-self-is-anon.nll.stderr
@@ -7,7 +7,7 @@ LL |     fn foo<'a>(&self, x: &'a Foo) -> &'a Foo {
    |            lifetime `'a` defined here
 LL | 
 LL |         if true { x } else { self }
-   |                              ^^^^ function was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
+   |                              ^^^^ method was supposed to return data with lifetime `'a` but it is returning data with lifetime `'1`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr
index 2990ab8682..c1fcab2409 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex1b-return-no-names-if-else.stderr
@@ -2,13 +2,13 @@ error[E0106]: missing lifetime specifier
   --> $DIR/ex1b-return-no-names-if-else.rs:1:29
    |
 LL | fn foo(x: &i32, y: &i32) -> &i32 {
-   |                             ^ expected named lifetime parameter
+   |           ----     ----     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `x` or `y`
 help: consider introducing a named lifetime parameter
    |
-LL | fn foo<'lifetime>(x: &i32, y: &i32) -> &'lifetime i32 {
-   |       ^^^^^^^^^^^                      ^^^^^^^^^^
+LL | fn foo<'a>(x: &'a i32, y: &'a i32) -> &'a i32 {
+   |       ^^^^    ^^^^^^^     ^^^^^^^     ^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr
index 1c258ad98b..5f922d8560 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-return-type-is-anon.nll.stderr
@@ -6,7 +6,7 @@ LL |   fn foo<'a>(&self, x: &i32) -> &i32 {
    |              |
    |              let's call the lifetime of this reference `'2`
 LL |     x
-   |     ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |     ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr
index ffe39fdd8c..91d7597c87 100644
--- a/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr
+++ b/src/test/ui/lifetimes/lifetime-errors/ex3-both-anon-regions-self-is-anon.nll.stderr
@@ -6,7 +6,7 @@ LL |     fn foo<'a>(&self, x: &Foo) -> &Foo {
    |                |
    |                let's call the lifetime of this reference `'2`
 LL |         if true { x } else { self }
-   |                   ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |                   ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/linkage-attr/linkage4.stderr b/src/test/ui/linkage-attr/linkage4.stderr
index b46941067a..30d4d2b7bb 100644
--- a/src/test/ui/linkage-attr/linkage4.stderr
+++ b/src/test/ui/linkage-attr/linkage4.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `linkage` attribute is experimental and not portable across pl
 LL | #[linkage = "external"]
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29603
+   = note: see issue #29603 <https://github.com/rust-lang/rust/issues/29603> for more information
    = help: add `#![feature(linkage)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/lint/dead-code/basic.stderr b/src/test/ui/lint/dead-code/basic.stderr
index 194398e5a0..f7b9b9c613 100644
--- a/src/test/ui/lint/dead-code/basic.stderr
+++ b/src/test/ui/lint/dead-code/basic.stderr
@@ -4,7 +4,7 @@ error: function is never used: `foo`
 LL | fn foo() {
    |    ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/basic.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/empty-unused-enum.stderr b/src/test/ui/lint/dead-code/empty-unused-enum.stderr
index 44b0a8f613..ed9a7ccd14 100644
--- a/src/test/ui/lint/dead-code/empty-unused-enum.stderr
+++ b/src/test/ui/lint/dead-code/empty-unused-enum.stderr
@@ -4,7 +4,7 @@ error: enum is never used: `E`
 LL | enum E {}
    |      ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/empty-unused-enum.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/lint/dead-code/impl-trait.stderr b/src/test/ui/lint/dead-code/impl-trait.stderr
index f2a78cc65e..09b6d08eb8 100644
--- a/src/test/ui/lint/dead-code/impl-trait.stderr
+++ b/src/test/ui/lint/dead-code/impl-trait.stderr
@@ -4,7 +4,7 @@ error: type alias is never used: `Unused`
 LL | type Unused = ();
    | ^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/impl-trait.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-1.stderr b/src/test/ui/lint/dead-code/lint-dead-code-1.stderr
index bac46a2e84..0a08aa6da9 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-1.stderr
+++ b/src/test/ui/lint/dead-code/lint-dead-code-1.stderr
@@ -4,7 +4,7 @@ error: struct is never constructed: `Bar`
 LL |     pub struct Bar;
    |                ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-dead-code-1.rs:5:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-2.stderr b/src/test/ui/lint/dead-code/lint-dead-code-2.stderr
index a578a76d9a..b01ba57f98 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-2.stderr
+++ b/src/test/ui/lint/dead-code/lint-dead-code-2.stderr
@@ -4,7 +4,7 @@ error: function is never used: `dead_fn`
 LL | fn dead_fn() {}
    |    ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-dead-code-2.rs:2:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-3.stderr b/src/test/ui/lint/dead-code/lint-dead-code-3.stderr
index 569196fffd..aab25c481e 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-3.stderr
+++ b/src/test/ui/lint/dead-code/lint-dead-code-3.stderr
@@ -4,7 +4,7 @@ error: struct is never constructed: `Foo`
 LL | struct Foo;
    |        ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-dead-code-3.rs:3:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-4.stderr b/src/test/ui/lint/dead-code/lint-dead-code-4.stderr
index cc00fa4e42..3905d1a06b 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-4.stderr
+++ b/src/test/ui/lint/dead-code/lint-dead-code-4.stderr
@@ -4,7 +4,7 @@ error: field is never read: `b`
 LL |     b: bool,
    |     ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-dead-code-4.rs:3:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/lint-dead-code-5.stderr b/src/test/ui/lint/dead-code/lint-dead-code-5.stderr
index 9670d8e7a3..c0de469102 100644
--- a/src/test/ui/lint/dead-code/lint-dead-code-5.stderr
+++ b/src/test/ui/lint/dead-code/lint-dead-code-5.stderr
@@ -4,7 +4,7 @@ error: variant is never constructed: `Variant2`
 LL |     Variant2
    |     ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-dead-code-5.rs:2:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/newline-span.stderr b/src/test/ui/lint/dead-code/newline-span.stderr
index c5d0d60506..fd74405f2b 100644
--- a/src/test/ui/lint/dead-code/newline-span.stderr
+++ b/src/test/ui/lint/dead-code/newline-span.stderr
@@ -4,7 +4,7 @@ error: function is never used: `unused`
 LL | fn unused() {
    |    ^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/newline-span.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/type-alias.stderr b/src/test/ui/lint/dead-code/type-alias.stderr
index 82df23bd94..b2acd5d421 100644
--- a/src/test/ui/lint/dead-code/type-alias.stderr
+++ b/src/test/ui/lint/dead-code/type-alias.stderr
@@ -4,7 +4,7 @@ error: type alias is never used: `Unused`
 LL | type Unused = u8;
    | ^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/type-alias.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/unused-enum.stderr b/src/test/ui/lint/dead-code/unused-enum.stderr
index 142c2ccb99..9f368fdd2f 100644
--- a/src/test/ui/lint/dead-code/unused-enum.stderr
+++ b/src/test/ui/lint/dead-code/unused-enum.stderr
@@ -4,7 +4,7 @@ error: struct is never constructed: `F`
 LL | struct F;
    |        ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-enum.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/lint/dead-code/unused-struct-variant.stderr b/src/test/ui/lint/dead-code/unused-struct-variant.stderr
index 0037592e3d..b93d6d4ac1 100644
--- a/src/test/ui/lint/dead-code/unused-struct-variant.stderr
+++ b/src/test/ui/lint/dead-code/unused-struct-variant.stderr
@@ -4,7 +4,7 @@ error: variant is never constructed: `Bar`
 LL |     Bar(B),
    |     ^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-struct-variant.rs:1:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/lint/dead-code/unused-variant.stderr b/src/test/ui/lint/dead-code/unused-variant.stderr
index 2167b9d910..a547f5af4b 100644
--- a/src/test/ui/lint/dead-code/unused-variant.stderr
+++ b/src/test/ui/lint/dead-code/unused-variant.stderr
@@ -4,7 +4,7 @@ error: variant is never constructed: `Variant1`
 LL |     Variant1,
    |     ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-variant.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/dead-code/with-core-crate.stderr b/src/test/ui/lint/dead-code/with-core-crate.stderr
index 0b6ab67d9b..2c63e60d67 100644
--- a/src/test/ui/lint/dead-code/with-core-crate.stderr
+++ b/src/test/ui/lint/dead-code/with-core-crate.stderr
@@ -4,7 +4,7 @@ error: function is never used: `foo`
 LL | fn foo() {
    |    ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/with-core-crate.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr b/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
index 7ad92a4bc5..f576862613 100644
--- a/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
+++ b/src/test/ui/lint/inclusive-range-pattern-syntax.stderr
@@ -4,7 +4,7 @@ warning: `...` range patterns are deprecated
 LL |         1...2 => {}
    |          ^^^ help: use `..=` for an inclusive range
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/inclusive-range-pattern-syntax.rs:4:9
    |
 LL | #![warn(ellipsis_inclusive_range_patterns)]
diff --git a/src/test/ui/lint/inline-trait-and-foreign-items.stderr b/src/test/ui/lint/inline-trait-and-foreign-items.stderr
index 6c94f88f13..5f386ea045 100644
--- a/src/test/ui/lint/inline-trait-and-foreign-items.stderr
+++ b/src/test/ui/lint/inline-trait-and-foreign-items.stderr
@@ -20,13 +20,13 @@ warning: `#[inline]` is ignored on constants
 LL |     #[inline]
    |     ^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/inline-trait-and-foreign-items.rs:4:9
    |
 LL | #![warn(unused_attributes)]
    |         ^^^^^^^^^^^^^^^^^
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #65833 <https://github.com/rust-lang/rust/issues/65833>
+   = note: see issue #65833 <https://github.com/rust-lang/rust/issues/65833> for more information
 
 error[E0518]: attribute should be applied to function or closure
   --> $DIR/inline-trait-and-foreign-items.rs:11:5
@@ -43,7 +43,7 @@ LL |     #[inline]
    |     ^^^^^^^^^
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #65833 <https://github.com/rust-lang/rust/issues/65833>
+   = note: see issue #65833 <https://github.com/rust-lang/rust/issues/65833> for more information
 
 error[E0518]: attribute should be applied to function or closure
   --> $DIR/inline-trait-and-foreign-items.rs:22:5
diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
index 0e18abc03f..b07474bb48 100644
--- a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
+++ b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
@@ -4,7 +4,7 @@ warning: unused variable: `i_think_continually`
 LL |     let i_think_continually = 2;
    |         ^^^^^^^^^^^^^^^^^^^ help: consider prefixing with an underscore: `_i_think_continually`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:5:9
    |
 LL | #![warn(unused)] // UI tests pass `-A unused` (#43896)
@@ -49,7 +49,7 @@ warning: value assigned to `hours_are_suns` is never read
 LL |         hours_are_suns = false;
    |         ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:5:9
    |
 LL | #![warn(unused)] // UI tests pass `-A unused` (#43896)
@@ -107,7 +107,7 @@ LL |     let mut mut_unused_var = 1;
    |         |
    |         help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:5:9
    |
 LL | #![warn(unused)] // UI tests pass `-A unused` (#43896)
diff --git a/src/test/ui/lint/issue-54180-unused-ref-field.stderr b/src/test/ui/lint/issue-54180-unused-ref-field.stderr
index 817d9a46e8..840ecc0ce0 100644
--- a/src/test/ui/lint/issue-54180-unused-ref-field.stderr
+++ b/src/test/ui/lint/issue-54180-unused-ref-field.stderr
@@ -6,7 +6,7 @@ LL |         E::Variant { ref field } => (),
    |                      |
    |                      help: try ignoring the field: `field: _`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-54180-unused-ref-field.rs:3:9
    |
 LL | #![deny(unused)]
diff --git a/src/test/ui/lint/issue-54538-unused-parens-lint.rs b/src/test/ui/lint/issue-54538-unused-parens-lint.rs
index 7dcbdd0863..f3d2d1bb58 100644
--- a/src/test/ui/lint/issue-54538-unused-parens-lint.rs
+++ b/src/test/ui/lint/issue-54538-unused-parens-lint.rs
@@ -1,7 +1,6 @@
 #![feature(box_patterns, stmt_expr_attributes)]
 
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete
 
 #![allow(ellipsis_inclusive_range_patterns)]
 #![allow(unreachable_patterns)]
diff --git a/src/test/ui/lint/issue-54538-unused-parens-lint.stderr b/src/test/ui/lint/issue-54538-unused-parens-lint.stderr
index 675dd4f07d..b31ad95b19 100644
--- a/src/test/ui/lint/issue-54538-unused-parens-lint.stderr
+++ b/src/test/ui/lint/issue-54538-unused-parens-lint.stderr
@@ -1,157 +1,149 @@
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/issue-54538-unused-parens-lint.rs:3:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:12:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:11:9
    |
 LL |     let (a) = 0;
    |         ^^^ help: remove these parentheses
    |
-note: lint level defined here
-  --> $DIR/issue-54538-unused-parens-lint.rs:9:9
+note: the lint level is defined here
+  --> $DIR/issue-54538-unused-parens-lint.rs:8:9
    |
 LL | #![deny(unused_parens)]
    |         ^^^^^^^^^^^^^
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:13:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:12:9
    |
 LL |     for (a) in 0..1 {}
    |         ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:14:12
+  --> $DIR/issue-54538-unused-parens-lint.rs:13:12
    |
 LL |     if let (a) = 0 {}
    |            ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:15:15
+  --> $DIR/issue-54538-unused-parens-lint.rs:14:15
    |
 LL |     while let (a) = 0 {}
    |               ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:16:12
+  --> $DIR/issue-54538-unused-parens-lint.rs:15:12
    |
 LL |     fn foo((a): u8) {}
    |            ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:17:14
+  --> $DIR/issue-54538-unused-parens-lint.rs:16:14
    |
 LL |     let _ = |(a): u8| 0;
    |              ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:45:12
+  --> $DIR/issue-54538-unused-parens-lint.rs:44:12
    |
 LL |     if let (0 | 1) = 0 {}
    |            ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:46:13
+  --> $DIR/issue-54538-unused-parens-lint.rs:45:13
    |
 LL |     if let ((0 | 1),) = (0,) {}
    |             ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:47:13
+  --> $DIR/issue-54538-unused-parens-lint.rs:46:13
    |
 LL |     if let [(0 | 1)] = [0] {}
    |             ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:48:16
+  --> $DIR/issue-54538-unused-parens-lint.rs:47:16
    |
 LL |     if let 0 | (1 | 2) = 0 {}
    |                ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:50:15
+  --> $DIR/issue-54538-unused-parens-lint.rs:49:15
    |
 LL |     if let TS((0 | 1)) = TS(0) {}
    |               ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:52:20
+  --> $DIR/issue-54538-unused-parens-lint.rs:51:20
    |
 LL |     if let NS { f: (0 | 1) } = (NS { f: 0 }) {}
    |                    ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:62:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:61:9
    |
 LL |         (_) => {}
    |         ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:63:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:62:9
    |
 LL |         (y) => {}
    |         ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:64:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:63:9
    |
 LL |         (ref r) => {}
    |         ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:65:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:64:9
    |
 LL |         (e @ 1...2) => {}
    |         ^^^^^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:71:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:70:9
    |
 LL |         (e @ &(1...2)) => {}
    |         ^^^^^^^^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:72:10
+  --> $DIR/issue-54538-unused-parens-lint.rs:71:10
    |
 LL |         &(_) => {}
    |          ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:83:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:82:9
    |
 LL |         (_) => {}
    |         ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:84:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:83:9
    |
 LL |         (y) => {}
    |         ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:85:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:84:9
    |
 LL |         (ref r) => {}
    |         ^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:86:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:85:9
    |
 LL |         (e @ 1..=2) => {}
    |         ^^^^^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:92:9
+  --> $DIR/issue-54538-unused-parens-lint.rs:91:9
    |
 LL |         (e @ &(1..=2)) => {}
    |         ^^^^^^^^^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around pattern
-  --> $DIR/issue-54538-unused-parens-lint.rs:93:10
+  --> $DIR/issue-54538-unused-parens-lint.rs:92:10
    |
 LL |         &(_) => {}
    |          ^^^ help: remove these parentheses
diff --git a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr b/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
index 68956f21e8..09dc3640f9 100644
--- a/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
+++ b/src/test/ui/lint/issue-66362-no-snake-case-warning-for-field-puns.stderr
@@ -4,7 +4,7 @@ error: structure field `lowerCamelCaseName` should have a snake case name
 LL |         lowerCamelCaseName: bool,
    |         ^^^^^^^^^^^^^^^^^^ help: convert the identifier to snake case: `lower_camel_case_name`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-66362-no-snake-case-warning-for-field-puns.rs:1:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lint-attr-non-item-node.stderr b/src/test/ui/lint/lint-attr-non-item-node.stderr
index 0d428c256e..5835791409 100644
--- a/src/test/ui/lint/lint-attr-non-item-node.stderr
+++ b/src/test/ui/lint/lint-attr-non-item-node.stderr
@@ -6,7 +6,7 @@ LL |         break;
 LL |         "unreachable";
    |         ^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-attr-non-item-node.rs:4:12
    |
 LL |     #[deny(unreachable_code)]
diff --git a/src/test/ui/lint/lint-change-warnings.stderr b/src/test/ui/lint/lint-change-warnings.stderr
index 336cb7ea84..0926dada05 100644
--- a/src/test/ui/lint/lint-change-warnings.stderr
+++ b/src/test/ui/lint/lint-change-warnings.stderr
@@ -4,7 +4,7 @@ error: denote infinite loops with `loop { ... }`
 LL |     while true {}
    |     ^^^^^^^^^^ help: use `loop`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-change-warnings.rs:1:9
    |
 LL | #![deny(warnings)]
@@ -25,7 +25,7 @@ error: denote infinite loops with `loop { ... }`
 LL |     while true {}
    |     ^^^^^^^^^^ help: use `loop`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-change-warnings.rs:18:10
    |
 LL | #[forbid(warnings)]
diff --git a/src/test/ui/lint/lint-ctypes-enum.stderr b/src/test/ui/lint/lint-ctypes-enum.stderr
index 81939e6ee2..297ac2237a 100644
--- a/src/test/ui/lint/lint-ctypes-enum.stderr
+++ b/src/test/ui/lint/lint-ctypes-enum.stderr
@@ -4,14 +4,14 @@ error: `extern` block uses type `U`, which is not FFI-safe
 LL |    fn uf(x: U);
    |             ^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-ctypes-enum.rs:3:9
    |
 LL | #![deny(improper_ctypes)]
    |         ^^^^^^^^^^^^^^^
    = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
    = note: enum has no representation hint
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes-enum.rs:9:1
    |
 LL | enum U { A }
@@ -25,7 +25,7 @@ LL |    fn bf(x: B);
    |
    = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
    = note: enum has no representation hint
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes-enum.rs:10:1
    |
 LL | enum B { C, D }
@@ -39,7 +39,7 @@ LL |    fn tf(x: T);
    |
    = help: consider adding a `#[repr(C)]`, `#[repr(transparent)]`, or integer `#[repr(...)]` attribute to this enum
    = note: enum has no representation hint
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes-enum.rs:11:1
    |
 LL | enum T { E, F, G }
diff --git a/src/test/ui/lint/lint-ctypes.stderr b/src/test/ui/lint/lint-ctypes.stderr
index e6bb49afb8..9821f858d9 100644
--- a/src/test/ui/lint/lint-ctypes.stderr
+++ b/src/test/ui/lint/lint-ctypes.stderr
@@ -4,14 +4,14 @@ error: `extern` block uses type `Foo`, which is not FFI-safe
 LL |     pub fn ptr_type1(size: *const Foo);
    |                            ^^^^^^^^^^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-ctypes.rs:4:9
    |
 LL | #![deny(improper_ctypes)]
    |         ^^^^^^^^^^^^^^^
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes.rs:24:1
    |
 LL | pub struct Foo;
@@ -25,7 +25,7 @@ LL |     pub fn ptr_type2(size: *const Foo);
    |
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
    = note: this struct has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes.rs:24:1
    |
 LL | pub struct Foo;
@@ -117,7 +117,7 @@ LL |     pub fn zero_size(p: ZeroSize);
    |
    = help: consider adding a member to this struct
    = note: this struct has no fields
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes.rs:20:1
    |
 LL | pub struct ZeroSize;
@@ -130,7 +130,7 @@ LL |     pub fn zero_size_phantom(p: ZeroSizeWithPhantomData);
    |                                 ^^^^^^^^^^^^^^^^^^^^^^^ not FFI-safe
    |
    = note: composed only of `PhantomData`
-note: type defined here
+note: the type is defined here
   --> $DIR/lint-ctypes.rs:43:1
    |
 LL | pub struct ZeroSizeWithPhantomData(::std::marker::PhantomData<i32>);
diff --git a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr
index 020591ccff..ccb139e0ed 100644
--- a/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr
+++ b/src/test/ui/lint/lint-directives-on-use-items-issue-10534.stderr
@@ -4,7 +4,7 @@ error: unused import: `a::x`
 LL |     use a::x;
    |         ^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-directives-on-use-items-issue-10534.rs:1:9
    |
 LL | #![deny(unused_imports)]
@@ -16,7 +16,7 @@ error: unused import: `a::y`
 LL |     use a::y;
    |         ^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-directives-on-use-items-issue-10534.rs:20:12
    |
 LL |     #[deny(unused_imports)]
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr b/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr
new file mode 100644
index 0000000000..ce9b02b6d8
--- /dev/null
+++ b/src/test/ui/lint/lint-exceeding-bitshifts.noopt.stderr
@@ -0,0 +1,146 @@
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:22:13
+   |
+LL |     let _ = x << 42;
+   |             ^^^^^^^ attempt to shift left with overflow
+   |
+note: the lint level is defined here
+  --> $DIR/lint-exceeding-bitshifts.rs:9:9
+   |
+LL | #![deny(arithmetic_overflow, const_err)]
+   |         ^^^^^^^^^^^^^^^^^^^
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:27:15
+   |
+LL |       let n = 1u8 << 8;
+   |               ^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:29:15
+   |
+LL |       let n = 1u16 << 16;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:31:15
+   |
+LL |       let n = 1u32 << 32;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:33:15
+   |
+LL |       let n = 1u64 << 64;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:35:15
+   |
+LL |       let n = 1i8 << 8;
+   |               ^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:37:15
+   |
+LL |       let n = 1i16 << 16;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:39:15
+   |
+LL |       let n = 1i32 << 32;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:41:15
+   |
+LL |       let n = 1i64 << 64;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:44:15
+   |
+LL |       let n = 1u8 >> 8;
+   |               ^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:46:15
+   |
+LL |       let n = 1u16 >> 16;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:48:15
+   |
+LL |       let n = 1u32 >> 32;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:50:15
+   |
+LL |       let n = 1u64 >> 64;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:52:15
+   |
+LL |       let n = 1i8 >> 8;
+   |               ^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:54:15
+   |
+LL |       let n = 1i16 >> 16;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:56:15
+   |
+LL |       let n = 1i32 >> 32;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:58:15
+   |
+LL |       let n = 1i64 >> 64;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:62:15
+   |
+LL |       let n = n << 8;
+   |               ^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:64:15
+   |
+LL |       let n = 1u8 << -8;
+   |               ^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:69:15
+   |
+LL |       let n = 1u8 << (4+4);
+   |               ^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:71:15
+   |
+LL |       let n = 1i64 >> [64][0];
+   |               ^^^^^^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:77:15
+   |
+LL |       let n = 1_isize << BITS;
+   |               ^^^^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:78:15
+   |
+LL |       let n = 1_usize << BITS;
+   |               ^^^^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: aborting due to 23 previous errors
+
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr b/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr
new file mode 100644
index 0000000000..ce9b02b6d8
--- /dev/null
+++ b/src/test/ui/lint/lint-exceeding-bitshifts.opt.stderr
@@ -0,0 +1,146 @@
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:22:13
+   |
+LL |     let _ = x << 42;
+   |             ^^^^^^^ attempt to shift left with overflow
+   |
+note: the lint level is defined here
+  --> $DIR/lint-exceeding-bitshifts.rs:9:9
+   |
+LL | #![deny(arithmetic_overflow, const_err)]
+   |         ^^^^^^^^^^^^^^^^^^^
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:27:15
+   |
+LL |       let n = 1u8 << 8;
+   |               ^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:29:15
+   |
+LL |       let n = 1u16 << 16;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:31:15
+   |
+LL |       let n = 1u32 << 32;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:33:15
+   |
+LL |       let n = 1u64 << 64;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:35:15
+   |
+LL |       let n = 1i8 << 8;
+   |               ^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:37:15
+   |
+LL |       let n = 1i16 << 16;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:39:15
+   |
+LL |       let n = 1i32 << 32;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:41:15
+   |
+LL |       let n = 1i64 << 64;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:44:15
+   |
+LL |       let n = 1u8 >> 8;
+   |               ^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:46:15
+   |
+LL |       let n = 1u16 >> 16;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:48:15
+   |
+LL |       let n = 1u32 >> 32;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:50:15
+   |
+LL |       let n = 1u64 >> 64;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:52:15
+   |
+LL |       let n = 1i8 >> 8;
+   |               ^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:54:15
+   |
+LL |       let n = 1i16 >> 16;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:56:15
+   |
+LL |       let n = 1i32 >> 32;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:58:15
+   |
+LL |       let n = 1i64 >> 64;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:62:15
+   |
+LL |       let n = n << 8;
+   |               ^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:64:15
+   |
+LL |       let n = 1u8 << -8;
+   |               ^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:69:15
+   |
+LL |       let n = 1u8 << (4+4);
+   |               ^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:71:15
+   |
+LL |       let n = 1i64 >> [64][0];
+   |               ^^^^^^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:77:15
+   |
+LL |       let n = 1_isize << BITS;
+   |               ^^^^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:78:15
+   |
+LL |       let n = 1_usize << BITS;
+   |               ^^^^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: aborting due to 23 previous errors
+
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr b/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
new file mode 100644
index 0000000000..ce9b02b6d8
--- /dev/null
+++ b/src/test/ui/lint/lint-exceeding-bitshifts.opt_with_overflow_checks.stderr
@@ -0,0 +1,146 @@
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:22:13
+   |
+LL |     let _ = x << 42;
+   |             ^^^^^^^ attempt to shift left with overflow
+   |
+note: the lint level is defined here
+  --> $DIR/lint-exceeding-bitshifts.rs:9:9
+   |
+LL | #![deny(arithmetic_overflow, const_err)]
+   |         ^^^^^^^^^^^^^^^^^^^
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:27:15
+   |
+LL |       let n = 1u8 << 8;
+   |               ^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:29:15
+   |
+LL |       let n = 1u16 << 16;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:31:15
+   |
+LL |       let n = 1u32 << 32;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:33:15
+   |
+LL |       let n = 1u64 << 64;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:35:15
+   |
+LL |       let n = 1i8 << 8;
+   |               ^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:37:15
+   |
+LL |       let n = 1i16 << 16;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:39:15
+   |
+LL |       let n = 1i32 << 32;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:41:15
+   |
+LL |       let n = 1i64 << 64;
+   |               ^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:44:15
+   |
+LL |       let n = 1u8 >> 8;
+   |               ^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:46:15
+   |
+LL |       let n = 1u16 >> 16;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:48:15
+   |
+LL |       let n = 1u32 >> 32;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:50:15
+   |
+LL |       let n = 1u64 >> 64;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:52:15
+   |
+LL |       let n = 1i8 >> 8;
+   |               ^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:54:15
+   |
+LL |       let n = 1i16 >> 16;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:56:15
+   |
+LL |       let n = 1i32 >> 32;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:58:15
+   |
+LL |       let n = 1i64 >> 64;
+   |               ^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:62:15
+   |
+LL |       let n = n << 8;
+   |               ^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:64:15
+   |
+LL |       let n = 1u8 << -8;
+   |               ^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:69:15
+   |
+LL |       let n = 1u8 << (4+4);
+   |               ^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:71:15
+   |
+LL |       let n = 1i64 >> [64][0];
+   |               ^^^^^^^^^^^^^^^ attempt to shift right with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:77:15
+   |
+LL |       let n = 1_isize << BITS;
+   |               ^^^^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: this arithmetic operation will overflow
+  --> $DIR/lint-exceeding-bitshifts.rs:78:15
+   |
+LL |       let n = 1_usize << BITS;
+   |               ^^^^^^^^^^^^^^^ attempt to shift left with overflow
+
+error: aborting due to 23 previous errors
+
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.rs b/src/test/ui/lint/lint-exceeding-bitshifts.rs
index 121e5b796b..7deee5320a 100644
--- a/src/test/ui/lint/lint-exceeding-bitshifts.rs
+++ b/src/test/ui/lint/lint-exceeding-bitshifts.rs
@@ -1,50 +1,79 @@
+// revisions: noopt opt opt_with_overflow_checks
+//[noopt]compile-flags: -C opt-level=0
+//[opt]compile-flags: -O
+//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
+
 // build-fail
-// compile-flags: -O
 
-#![deny(exceeding_bitshifts, const_err)]
+#![crate_type="lib"]
+#![deny(arithmetic_overflow, const_err)]
 #![allow(unused_variables)]
 #![allow(dead_code)]
 
-fn main() {
+pub trait Foo {
+    const N: i32;
+}
+
+impl<T: Foo> Foo for Vec<T> {
+    const N: i32 = T::N << 42; // FIXME this should warn
+}
+
+pub fn foo(x: i32) {
+    let _ = x << 42; //~ ERROR: arithmetic operation will overflow
+}
+
+pub fn main() {
       let n = 1u8 << 7;
-      let n = 1u8 << 8;   //~ ERROR: attempt to shift left with overflow
+      let n = 1u8 << 8;   //~ ERROR: arithmetic operation will overflow
       let n = 1u16 << 15;
-      let n = 1u16 << 16; //~ ERROR: attempt to shift left with overflow
+      let n = 1u16 << 16; //~ ERROR: arithmetic operation will overflow
       let n = 1u32 << 31;
-      let n = 1u32 << 32; //~ ERROR: attempt to shift left with overflow
+      let n = 1u32 << 32; //~ ERROR: arithmetic operation will overflow
       let n = 1u64 << 63;
-      let n = 1u64 << 64; //~ ERROR: attempt to shift left with overflow
+      let n = 1u64 << 64; //~ ERROR: arithmetic operation will overflow
       let n = 1i8 << 7;
-      let n = 1i8 << 8;   //~ ERROR: attempt to shift left with overflow
+      let n = 1i8 << 8;   //~ ERROR: arithmetic operation will overflow
       let n = 1i16 << 15;
-      let n = 1i16 << 16; //~ ERROR: attempt to shift left with overflow
+      let n = 1i16 << 16; //~ ERROR: arithmetic operation will overflow
       let n = 1i32 << 31;
-      let n = 1i32 << 32; //~ ERROR: attempt to shift left with overflow
+      let n = 1i32 << 32; //~ ERROR: arithmetic operation will overflow
       let n = 1i64 << 63;
-      let n = 1i64 << 64; //~ ERROR: attempt to shift left with overflow
+      let n = 1i64 << 64; //~ ERROR: arithmetic operation will overflow
 
       let n = 1u8 >> 7;
-      let n = 1u8 >> 8;   //~ ERROR: attempt to shift right with overflow
+      let n = 1u8 >> 8;   //~ ERROR: arithmetic operation will overflow
       let n = 1u16 >> 15;
-      let n = 1u16 >> 16; //~ ERROR: attempt to shift right with overflow
+      let n = 1u16 >> 16; //~ ERROR: arithmetic operation will overflow
       let n = 1u32 >> 31;
-      let n = 1u32 >> 32; //~ ERROR: attempt to shift right with overflow
+      let n = 1u32 >> 32; //~ ERROR: arithmetic operation will overflow
       let n = 1u64 >> 63;
-      let n = 1u64 >> 64; //~ ERROR: attempt to shift right with overflow
+      let n = 1u64 >> 64; //~ ERROR: arithmetic operation will overflow
       let n = 1i8 >> 7;
-      let n = 1i8 >> 8;   //~ ERROR: attempt to shift right with overflow
+      let n = 1i8 >> 8;   //~ ERROR: arithmetic operation will overflow
       let n = 1i16 >> 15;
-      let n = 1i16 >> 16; //~ ERROR: attempt to shift right with overflow
+      let n = 1i16 >> 16; //~ ERROR: arithmetic operation will overflow
       let n = 1i32 >> 31;
-      let n = 1i32 >> 32; //~ ERROR: attempt to shift right with overflow
+      let n = 1i32 >> 32; //~ ERROR: arithmetic operation will overflow
       let n = 1i64 >> 63;
-      let n = 1i64 >> 64; //~ ERROR: attempt to shift right with overflow
+      let n = 1i64 >> 64; //~ ERROR: arithmetic operation will overflow
 
       let n = 1u8;
       let n = n << 7;
-      let n = n << 8; //~ ERROR: attempt to shift left with overflow
+      let n = n << 8; //~ ERROR: arithmetic operation will overflow
 
-      let n = 1u8 << -8; //~ ERROR: attempt to shift left with overflow
+      let n = 1u8 << -8; //~ ERROR: arithmetic operation will overflow
 
       let n = 1i8<<(1isize+-1);
+
+      let n = 1u8 << (4+3);
+      let n = 1u8 << (4+4); //~ ERROR: arithmetic operation will overflow
+      let n = 1i64 >> [63][0];
+      let n = 1i64 >> [64][0]; //~ ERROR: arithmetic operation will overflow
+
+      #[cfg(target_pointer_width = "32")]
+      const BITS: usize = 32;
+      #[cfg(target_pointer_width = "64")]
+      const BITS: usize = 64;
+      let n = 1_isize << BITS; //~ ERROR: arithmetic operation will overflow
+      let n = 1_usize << BITS; //~ ERROR: arithmetic operation will overflow
 }
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts.stderr b/src/test/ui/lint/lint-exceeding-bitshifts.stderr
deleted file mode 100644
index 203cb74153..0000000000
--- a/src/test/ui/lint/lint-exceeding-bitshifts.stderr
+++ /dev/null
@@ -1,116 +0,0 @@
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:10:15
-   |
-LL |       let n = 1u8 << 8;
-   |               ^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/lint-exceeding-bitshifts.rs:4:9
-   |
-LL | #![deny(exceeding_bitshifts, const_err)]
-   |         ^^^^^^^^^^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:12:15
-   |
-LL |       let n = 1u16 << 16;
-   |               ^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:14:15
-   |
-LL |       let n = 1u32 << 32;
-   |               ^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:16:15
-   |
-LL |       let n = 1u64 << 64;
-   |               ^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:18:15
-   |
-LL |       let n = 1i8 << 8;
-   |               ^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:20:15
-   |
-LL |       let n = 1i16 << 16;
-   |               ^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:22:15
-   |
-LL |       let n = 1i32 << 32;
-   |               ^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:24:15
-   |
-LL |       let n = 1i64 << 64;
-   |               ^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:27:15
-   |
-LL |       let n = 1u8 >> 8;
-   |               ^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:29:15
-   |
-LL |       let n = 1u16 >> 16;
-   |               ^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:31:15
-   |
-LL |       let n = 1u32 >> 32;
-   |               ^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:33:15
-   |
-LL |       let n = 1u64 >> 64;
-   |               ^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:35:15
-   |
-LL |       let n = 1i8 >> 8;
-   |               ^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:37:15
-   |
-LL |       let n = 1i16 >> 16;
-   |               ^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:39:15
-   |
-LL |       let n = 1i32 >> 32;
-   |               ^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:41:15
-   |
-LL |       let n = 1i64 >> 64;
-   |               ^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:45:15
-   |
-LL |       let n = n << 8;
-   |               ^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts.rs:47:15
-   |
-LL |       let n = 1u8 << -8;
-   |               ^^^^^^^^^
-
-error: aborting due to 18 previous errors
-
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts2.rs b/src/test/ui/lint/lint-exceeding-bitshifts2.rs
deleted file mode 100644
index 2a7cbc10f7..0000000000
--- a/src/test/ui/lint/lint-exceeding-bitshifts2.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// build-fail
-// compile-flags: -O
-
-#![deny(exceeding_bitshifts, const_err)]
-#![allow(unused_variables)]
-#![allow(dead_code)]
-
-fn main() {
-      let n = 1u8 << (4+3);
-      let n = 1u8 << (4+4); //~ ERROR: attempt to shift left with overflow
-      let n = 1i64 >> [63][0];
-      let n = 1i64 >> [64][0]; //~ ERROR: attempt to shift right with overflow
-
-      #[cfg(target_pointer_width = "32")]
-      const BITS: usize = 32;
-      #[cfg(target_pointer_width = "64")]
-      const BITS: usize = 64;
-      let n = 1_isize << BITS; //~ ERROR: attempt to shift left with overflow
-      let n = 1_usize << BITS; //~ ERROR: attempt to shift left with overflow
-}
diff --git a/src/test/ui/lint/lint-exceeding-bitshifts2.stderr b/src/test/ui/lint/lint-exceeding-bitshifts2.stderr
deleted file mode 100644
index 49ac54ab83..0000000000
--- a/src/test/ui/lint/lint-exceeding-bitshifts2.stderr
+++ /dev/null
@@ -1,32 +0,0 @@
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts2.rs:10:15
-   |
-LL |       let n = 1u8 << (4+4);
-   |               ^^^^^^^^^^^^
-   |
-note: lint level defined here
-  --> $DIR/lint-exceeding-bitshifts2.rs:4:9
-   |
-LL | #![deny(exceeding_bitshifts, const_err)]
-   |         ^^^^^^^^^^^^^^^^^^^
-
-error: attempt to shift right with overflow
-  --> $DIR/lint-exceeding-bitshifts2.rs:12:15
-   |
-LL |       let n = 1i64 >> [64][0];
-   |               ^^^^^^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts2.rs:18:15
-   |
-LL |       let n = 1_isize << BITS;
-   |               ^^^^^^^^^^^^^^^
-
-error: attempt to shift left with overflow
-  --> $DIR/lint-exceeding-bitshifts2.rs:19:15
-   |
-LL |       let n = 1_usize << BITS;
-   |               ^^^^^^^^^^^^^^^
-
-error: aborting due to 4 previous errors
-
diff --git a/src/test/ui/lint/lint-forbid-internal-unsafe.stderr b/src/test/ui/lint/lint-forbid-internal-unsafe.stderr
index 59dab11968..e31c003985 100644
--- a/src/test/ui/lint/lint-forbid-internal-unsafe.stderr
+++ b/src/test/ui/lint/lint-forbid-internal-unsafe.stderr
@@ -4,7 +4,7 @@ error: `allow_internal_unsafe` allows defining macros using unsafe without trigg
 LL | #[allow_internal_unsafe]
    | ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-forbid-internal-unsafe.rs:1:11
    |
 LL | #![forbid(unsafe_code)]
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr
index 1cc973d32c..4ba49bf1ba 100644
--- a/src/test/ui/lint/lint-group-nonstandard-style.stderr
+++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr
@@ -4,7 +4,7 @@ warning: type `snake_case` should have an upper camel case name
 LL |         struct snake_case;
    |                ^^^^^^^^^^ help: convert the identifier to upper camel case: `SnakeCase`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group-nonstandard-style.rs:18:17
    |
 LL |         #![warn(nonstandard_style)]
@@ -17,7 +17,7 @@ error: function `CamelCase` should have a snake case name
 LL | fn CamelCase() {}
    |    ^^^^^^^^^ help: convert the identifier to snake case: `camel_case`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group-nonstandard-style.rs:1:9
    |
 LL | #![deny(nonstandard_style)]
@@ -30,7 +30,7 @@ error: function `CamelCase` should have a snake case name
 LL |         fn CamelCase() {}
    |            ^^^^^^^^^ help: convert the identifier to snake case: `camel_case`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group-nonstandard-style.rs:10:14
    |
 LL |     #[forbid(nonstandard_style)]
@@ -43,7 +43,7 @@ error: static variable `bad` should have an upper case name
 LL |         static bad: isize = 1;
    |                ^^^ help: convert the identifier to upper case: `BAD`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group-nonstandard-style.rs:10:14
    |
 LL |     #[forbid(nonstandard_style)]
@@ -56,7 +56,7 @@ warning: function `CamelCase` should have a snake case name
 LL |         fn CamelCase() {}
    |            ^^^^^^^^^ help: convert the identifier to snake case: `camel_case`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-group-nonstandard-style.rs:18:17
    |
 LL |         #![warn(nonstandard_style)]
diff --git a/src/test/ui/lint/lint-impl-fn.stderr b/src/test/ui/lint/lint-impl-fn.stderr
index 2c9a264287..24ec9c7e4f 100644
--- a/src/test/ui/lint/lint-impl-fn.stderr
+++ b/src/test/ui/lint/lint-impl-fn.stderr
@@ -4,7 +4,7 @@ error: denote infinite loops with `loop { ... }`
 LL |     fn bar(&self) { while true {} }
    |                     ^^^^^^^^^^ help: use `loop`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-impl-fn.rs:9:12
    |
 LL |     #[deny(while_true)]
@@ -16,7 +16,7 @@ error: denote infinite loops with `loop { ... }`
 LL |         fn foo(&self) { while true {} }
    |                         ^^^^^^^^^^ help: use `loop`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-impl-fn.rs:13:8
    |
 LL | #[deny(while_true)]
@@ -28,7 +28,7 @@ error: denote infinite loops with `loop { ... }`
 LL |     while true {}
    |     ^^^^^^^^^^ help: use `loop`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-impl-fn.rs:25:8
    |
 LL | #[deny(while_true)]
diff --git a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr b/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
index d95510ccd2..8780fac05b 100644
--- a/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
+++ b/src/test/ui/lint/lint-lowercase-static-const-pattern.stderr
@@ -4,7 +4,7 @@ error: constant in pattern `a` should have an upper case name
 LL |         (0, a) => 0,
    |             ^ help: convert the identifier to upper case: `A`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-lowercase-static-const-pattern.rs:4:9
    |
 LL | #![deny(non_upper_case_globals)]
diff --git a/src/test/ui/lint/lint-match-arms.rs b/src/test/ui/lint/lint-match-arms.rs
index 2c471a6105..5c2ccc60e1 100644
--- a/src/test/ui/lint/lint-match-arms.rs
+++ b/src/test/ui/lint/lint-match-arms.rs
@@ -1,7 +1,7 @@
 fn deny_on_arm() {
     match 0 {
         #[deny(unused_variables)]
-        //~^ NOTE lint level defined here
+        //~^ NOTE the lint level is defined here
         y => (),
         //~^ ERROR unused variable
     }
diff --git a/src/test/ui/lint/lint-match-arms.stderr b/src/test/ui/lint/lint-match-arms.stderr
index e4e3adab0a..b124971f90 100644
--- a/src/test/ui/lint/lint-match-arms.stderr
+++ b/src/test/ui/lint/lint-match-arms.stderr
@@ -4,7 +4,7 @@ error: unused variable: `y`
 LL |         y => (),
    |         ^ help: consider prefixing with an underscore: `_y`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-match-arms.rs:3:16
    |
 LL |         #[deny(unused_variables)]
diff --git a/src/test/ui/lint/lint-misplaced-attr.stderr b/src/test/ui/lint/lint-misplaced-attr.stderr
index cd4a89f91c..3a7ca2f83a 100644
--- a/src/test/ui/lint/lint-misplaced-attr.stderr
+++ b/src/test/ui/lint/lint-misplaced-attr.stderr
@@ -4,7 +4,7 @@ error: unused attribute
 LL |     #![crate_type = "bin"]
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-misplaced-attr.rs:4:9
    |
 LL | #![deny(unused_attributes)]
diff --git a/src/test/ui/lint/lint-missing-copy-implementations.stderr b/src/test/ui/lint/lint-missing-copy-implementations.stderr
index 7b6674e71b..e5f5ce20d1 100644
--- a/src/test/ui/lint/lint-missing-copy-implementations.stderr
+++ b/src/test/ui/lint/lint-missing-copy-implementations.stderr
@@ -6,7 +6,7 @@ LL | |         pub field: i32
 LL | |     }
    | |_____^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-missing-copy-implementations.rs:3:9
    |
 LL | #![deny(missing_copy_implementations)]
diff --git a/src/test/ui/lint/lint-missing-doc.rs b/src/test/ui/lint/lint-missing-doc.rs
index a2466d28fb..77f9a3770a 100644
--- a/src/test/ui/lint/lint-missing-doc.rs
+++ b/src/test/ui/lint/lint-missing-doc.rs
@@ -60,7 +60,7 @@ pub trait D {
 }
 
 /// dox
-pub trait E {
+pub trait E: Sized {
     type AssociatedType; //~ ERROR: missing documentation for an associated type
     type AssociatedTypeDef = Self; //~ ERROR: missing documentation for an associated type
 
diff --git a/src/test/ui/lint/lint-missing-doc.stderr b/src/test/ui/lint/lint-missing-doc.stderr
index 3532c9315d..a18a97e5f7 100644
--- a/src/test/ui/lint/lint-missing-doc.stderr
+++ b/src/test/ui/lint/lint-missing-doc.stderr
@@ -4,7 +4,7 @@ error: missing documentation for a type alias
 LL | pub type PubTypedef = String;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-missing-doc.rs:3:9
    |
 LL | #![deny(missing_docs)]
diff --git a/src/test/ui/lint/lint-non-camel-case-types.stderr b/src/test/ui/lint/lint-non-camel-case-types.stderr
index f82eefed43..875380b5da 100644
--- a/src/test/ui/lint/lint-non-camel-case-types.stderr
+++ b/src/test/ui/lint/lint-non-camel-case-types.stderr
@@ -4,7 +4,7 @@ error: type `ONE_TWO_THREE` should have an upper camel case name
 LL | struct ONE_TWO_THREE;
    |        ^^^^^^^^^^^^^ help: convert the identifier to upper camel case: `OneTwoThree`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-camel-case-types.rs:1:11
    |
 LL | #![forbid(non_camel_case_types)]
diff --git a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr b/src/test/ui/lint/lint-non-snake-case-crate-2.stderr
index f3303191a0..e295112932 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate-2.stderr
+++ b/src/test/ui/lint/lint-non-snake-case-crate-2.stderr
@@ -1,6 +1,6 @@
 error: crate `NonSnakeCase` should have a snake case name
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-snake-case-crate-2.rs:4:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lint-non-snake-case-crate.stderr b/src/test/ui/lint/lint-non-snake-case-crate.stderr
index 5cfd60a76e..da6b89c1e0 100644
--- a/src/test/ui/lint/lint-non-snake-case-crate.stderr
+++ b/src/test/ui/lint/lint-non-snake-case-crate.stderr
@@ -4,7 +4,7 @@ error: crate `NonSnakeCase` should have a snake case name
 LL | #![crate_name = "NonSnakeCase"]
    |                  ^^^^^^^^^^^^ help: convert the identifier to snake case: `non_snake_case`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-snake-case-crate.rs:3:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lint-non-snake-case-functions.stderr b/src/test/ui/lint/lint-non-snake-case-functions.stderr
index c5eca89deb..f6ac6b99b6 100644
--- a/src/test/ui/lint/lint-non-snake-case-functions.stderr
+++ b/src/test/ui/lint/lint-non-snake-case-functions.stderr
@@ -4,7 +4,7 @@ error: method `Foo_Method` should have a snake case name
 LL |     fn Foo_Method() {}
    |        ^^^^^^^^^^ help: convert the identifier to snake case: `foo_method`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-snake-case-functions.rs:1:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr b/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr
index d638626495..d4fe26a43c 100644
--- a/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr
+++ b/src/test/ui/lint/lint-non-snake-case-lifetimes.stderr
@@ -4,7 +4,7 @@ error: lifetime `'FooBar` should have a snake case name
 LL | fn f<'FooBar>(
    |      ^^^^^^^ help: convert the identifier to snake case: `'foo_bar`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-snake-case-lifetimes.rs:1:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lint-non-snake-case-modules.stderr b/src/test/ui/lint/lint-non-snake-case-modules.stderr
index 847c43e1b0..c8b997c870 100644
--- a/src/test/ui/lint/lint-non-snake-case-modules.stderr
+++ b/src/test/ui/lint/lint-non-snake-case-modules.stderr
@@ -4,7 +4,7 @@ error: module `FooBar` should have a snake case name
 LL | mod FooBar {
    |     ^^^^^^ help: convert the identifier to snake case: `foo_bar`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-snake-case-modules.rs:1:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr b/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
index 2185d5a0ab..411ff51aad 100644
--- a/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
+++ b/src/test/ui/lint/lint-non-uppercase-associated-const.stderr
@@ -4,7 +4,7 @@ error: associated constant `not_upper` should have an upper case name
 LL |     const not_upper: bool = true;
    |           ^^^^^^^^^ help: convert the identifier to upper case: `NOT_UPPER`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-uppercase-associated-const.rs:1:9
    |
 LL | #![deny(non_upper_case_globals)]
diff --git a/src/test/ui/lint/lint-non-uppercase-statics.stderr b/src/test/ui/lint/lint-non-uppercase-statics.stderr
index ceb83d08f2..c6fd0a6e0d 100644
--- a/src/test/ui/lint/lint-non-uppercase-statics.stderr
+++ b/src/test/ui/lint/lint-non-uppercase-statics.stderr
@@ -4,7 +4,7 @@ error: static variable `foo` should have an upper case name
 LL | static foo: isize = 1;
    |        ^^^ help: convert the identifier to upper case (notice the capitalization): `FOO`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-uppercase-statics.rs:1:11
    |
 LL | #![forbid(non_upper_case_globals)]
diff --git a/src/test/ui/lint/lint-owned-heap-memory.stderr b/src/test/ui/lint/lint-owned-heap-memory.stderr
index c61b3d3155..2c6b47e494 100644
--- a/src/test/ui/lint/lint-owned-heap-memory.stderr
+++ b/src/test/ui/lint/lint-owned-heap-memory.stderr
@@ -4,7 +4,7 @@ error: type uses owned (Box type) pointers: std::boxed::Box<isize>
 LL |     x: Box<isize>
    |     ^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-owned-heap-memory.rs:2:11
    |
 LL | #![forbid(box_pointers)]
diff --git a/src/test/ui/lint/lint-qualification.stderr b/src/test/ui/lint/lint-qualification.stderr
index 125aeb3db0..149a782d97 100644
--- a/src/test/ui/lint/lint-qualification.stderr
+++ b/src/test/ui/lint/lint-qualification.stderr
@@ -4,7 +4,7 @@ error: unnecessary qualification
 LL |     foo::bar();
    |     ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-qualification.rs:1:9
    |
 LL | #![deny(unused_qualifications)]
diff --git a/src/test/ui/lint/lint-range-endpoint-overflow.stderr b/src/test/ui/lint/lint-range-endpoint-overflow.stderr
index 939451d6bc..dff61e022e 100644
--- a/src/test/ui/lint/lint-range-endpoint-overflow.stderr
+++ b/src/test/ui/lint/lint-range-endpoint-overflow.stderr
@@ -4,7 +4,7 @@ error: range endpoint is out of range for `u8`
 LL |     let range_a = 0..256;
    |                   ^^^^^^ help: use an inclusive range instead: `0..=255`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-range-endpoint-overflow.rs:1:9
    |
 LL | #![deny(overflowing_literals)]
diff --git a/src/test/ui/lint/lint-removed-allow.stderr b/src/test/ui/lint/lint-removed-allow.stderr
index 32af7389b6..5ab95c89b9 100644
--- a/src/test/ui/lint/lint-removed-allow.stderr
+++ b/src/test/ui/lint/lint-removed-allow.stderr
@@ -4,7 +4,7 @@ error: unused variable: `unused`
 LL | fn main() { let unused = (); }
    |                 ^^^^^^ help: consider prefixing with an underscore: `_unused`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-removed-allow.rs:7:8
    |
 LL | #[deny(unused_variables)]
diff --git a/src/test/ui/lint/lint-removed-cmdline.stderr b/src/test/ui/lint/lint-removed-cmdline.stderr
index b4ab5f5ee6..a9ebd3e327 100644
--- a/src/test/ui/lint/lint-removed-cmdline.stderr
+++ b/src/test/ui/lint/lint-removed-cmdline.stderr
@@ -20,7 +20,7 @@ error: unused variable: `unused`
 LL | fn main() { let unused = (); }
    |                 ^^^^^^ help: consider prefixing with an underscore: `_unused`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-removed-cmdline.rs:11:8
    |
 LL | #[deny(warnings)]
diff --git a/src/test/ui/lint/lint-removed.stderr b/src/test/ui/lint/lint-removed.stderr
index 060ba31bce..2c043392f0 100644
--- a/src/test/ui/lint/lint-removed.stderr
+++ b/src/test/ui/lint/lint-removed.stderr
@@ -12,7 +12,7 @@ error: unused variable: `unused`
 LL | fn main() { let unused = (); }
    |                 ^^^^^^ help: consider prefixing with an underscore: `_unused`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-removed.rs:7:8
    |
 LL | #[deny(unused_variables)]
diff --git a/src/test/ui/lint/lint-renamed-allow.stderr b/src/test/ui/lint/lint-renamed-allow.stderr
index 1d984cb828..9da74f61b7 100644
--- a/src/test/ui/lint/lint-renamed-allow.stderr
+++ b/src/test/ui/lint/lint-renamed-allow.stderr
@@ -4,7 +4,7 @@ error: unused variable: `unused`
 LL | fn main() { let unused = (); }
    |                 ^^^^^^ help: consider prefixing with an underscore: `_unused`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-renamed-allow.rs:7:8
    |
 LL | #[deny(unused)]
diff --git a/src/test/ui/lint/lint-renamed-cmdline.stderr b/src/test/ui/lint/lint-renamed-cmdline.stderr
index 6401d9b77e..235215598a 100644
--- a/src/test/ui/lint/lint-renamed-cmdline.stderr
+++ b/src/test/ui/lint/lint-renamed-cmdline.stderr
@@ -20,7 +20,7 @@ error: unused variable: `unused`
 LL | fn main() { let unused = (); }
    |                 ^^^^^^ help: consider prefixing with an underscore: `_unused`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-renamed-cmdline.rs:7:8
    |
 LL | #[deny(unused)]
diff --git a/src/test/ui/lint/lint-renamed.stderr b/src/test/ui/lint/lint-renamed.stderr
index ba8eadf23a..dc43f2e4c4 100644
--- a/src/test/ui/lint/lint-renamed.stderr
+++ b/src/test/ui/lint/lint-renamed.stderr
@@ -12,7 +12,7 @@ error: unused variable: `unused`
 LL | fn main() { let unused = (); }
    |                 ^^^^^^ help: consider prefixing with an underscore: `_unused`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-renamed.rs:3:8
    |
 LL | #[deny(unused)]
diff --git a/src/test/ui/lint/lint-shorthand-field.stderr b/src/test/ui/lint/lint-shorthand-field.stderr
index 5c9b21ffdc..2d1ca30f99 100644
--- a/src/test/ui/lint/lint-shorthand-field.stderr
+++ b/src/test/ui/lint/lint-shorthand-field.stderr
@@ -4,7 +4,7 @@ error: the `x:` in this pattern is redundant
 LL |             x: x,
    |             ^^^^ help: use shorthand field pattern: `x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-shorthand-field.rs:4:9
    |
 LL | #![deny(non_shorthand_field_patterns)]
diff --git a/src/test/ui/lint/lint-stability-deprecated.stderr b/src/test/ui/lint/lint-stability-deprecated.stderr
index 650373c90b..734c6093e2 100644
--- a/src/test/ui/lint/lint-stability-deprecated.stderr
+++ b/src/test/ui/lint/lint-stability-deprecated.stderr
@@ -4,7 +4,7 @@ warning: use of deprecated item 'lint_stability::deprecated': text
 LL |         deprecated();
    |         ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-stability-deprecated.rs:7:9
    |
 LL | #![warn(deprecated)]
diff --git a/src/test/ui/lint/lint-stability-fields-deprecated.stderr b/src/test/ui/lint/lint-stability-fields-deprecated.stderr
index 488be75ae5..5210fb690e 100644
--- a/src/test/ui/lint/lint-stability-fields-deprecated.stderr
+++ b/src/test/ui/lint/lint-stability-fields-deprecated.stderr
@@ -4,7 +4,7 @@ error: use of deprecated item 'cross_crate::lint_stability_fields::Deprecated':
 LL |         let x = Deprecated {
    |                 ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-stability-fields-deprecated.rs:3:9
    |
 LL | #![deny(deprecated)]
diff --git a/src/test/ui/lint/lint-stability2.stderr b/src/test/ui/lint/lint-stability2.stderr
index 6599da564f..a14bf2ec8c 100644
--- a/src/test/ui/lint/lint-stability2.stderr
+++ b/src/test/ui/lint/lint-stability2.stderr
@@ -4,12 +4,12 @@ error: use of deprecated item 'lint_stability::deprecated': text
 LL |     macro_test!();
    |     ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-stability2.rs:4:9
    |
 LL | #![deny(deprecated)]
    |         ^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-stability3.stderr b/src/test/ui/lint/lint-stability3.stderr
index 84274e6406..858ac12612 100644
--- a/src/test/ui/lint/lint-stability3.stderr
+++ b/src/test/ui/lint/lint-stability3.stderr
@@ -4,12 +4,12 @@ error: use of deprecated item 'lint_stability::deprecated_text': text
 LL |     macro_test_arg_nested!(deprecated_text);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-stability3.rs:4:9
    |
 LL | #![deny(deprecated)]
    |         ^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-type-limits2.stderr b/src/test/ui/lint/lint-type-limits2.stderr
index 0b3d292856..bf510823b5 100644
--- a/src/test/ui/lint/lint-type-limits2.stderr
+++ b/src/test/ui/lint/lint-type-limits2.stderr
@@ -12,7 +12,7 @@ warning: literal out of range for `i8`
 LL |     128 > bar()
    |     ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-type-limits2.rs:2:9
    |
 LL | #![warn(overflowing_literals)]
diff --git a/src/test/ui/lint/lint-type-limits3.stderr b/src/test/ui/lint/lint-type-limits3.stderr
index 70cd9c859e..00441f99e6 100644
--- a/src/test/ui/lint/lint-type-limits3.stderr
+++ b/src/test/ui/lint/lint-type-limits3.stderr
@@ -12,7 +12,7 @@ warning: literal out of range for `i8`
 LL |     while 200 != i {
    |           ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-type-limits3.rs:2:9
    |
 LL | #![warn(overflowing_literals)]
diff --git a/src/test/ui/lint/lint-type-overflow.stderr b/src/test/ui/lint/lint-type-overflow.stderr
index 6fcd9b58b2..ec15313158 100644
--- a/src/test/ui/lint/lint-type-overflow.stderr
+++ b/src/test/ui/lint/lint-type-overflow.stderr
@@ -4,7 +4,7 @@ error: literal out of range for `u8`
 LL |     let x1: u8 = 256;
    |                  ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-type-overflow.rs:1:9
    |
 LL | #![deny(overflowing_literals)]
diff --git a/src/test/ui/lint/lint-type-overflow2.stderr b/src/test/ui/lint/lint-type-overflow2.stderr
index 761b095464..dfc691ab91 100644
--- a/src/test/ui/lint/lint-type-overflow2.stderr
+++ b/src/test/ui/lint/lint-type-overflow2.stderr
@@ -4,7 +4,7 @@ error: literal out of range for `i8`
 LL |     let x2: i8 = --128;
    |                    ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-type-overflow2.rs:3:9
    |
 LL | #![deny(overflowing_literals)]
diff --git a/src/test/ui/lint/lint-unconditional-recursion.stderr b/src/test/ui/lint/lint-unconditional-recursion.stderr
index 5d2e8201b1..1770d71e2e 100644
--- a/src/test/ui/lint/lint-unconditional-recursion.stderr
+++ b/src/test/ui/lint/lint-unconditional-recursion.stderr
@@ -6,7 +6,7 @@ LL | fn foo() {
 LL |     foo();
    |     ----- recursive call site
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unconditional-recursion.rs:1:9
    |
 LL | #![deny(unconditional_recursion)]
diff --git a/src/test/ui/lint/lint-unknown-lint.stderr b/src/test/ui/lint/lint-unknown-lint.stderr
index b3ba6e31bc..3a102769e8 100644
--- a/src/test/ui/lint/lint-unknown-lint.stderr
+++ b/src/test/ui/lint/lint-unknown-lint.stderr
@@ -4,7 +4,7 @@ error: unknown lint: `not_a_real_lint`
 LL | #![allow(not_a_real_lint)]
    |          ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unknown-lint.rs:1:9
    |
 LL | #![deny(unknown_lints)]
diff --git a/src/test/ui/lint/lint-unnecessary-import-braces.stderr b/src/test/ui/lint/lint-unnecessary-import-braces.stderr
index 41e274bc54..2d289404de 100644
--- a/src/test/ui/lint/lint-unnecessary-import-braces.stderr
+++ b/src/test/ui/lint/lint-unnecessary-import-braces.stderr
@@ -4,7 +4,7 @@ error: braces around A is unnecessary
 LL | use test::{A};
    | ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unnecessary-import-braces.rs:1:9
    |
 LL | #![deny(unused_import_braces)]
diff --git a/src/test/ui/lint/lint-unnecessary-parens.rs b/src/test/ui/lint/lint-unnecessary-parens.rs
index 4e8339a8e6..5ce1f57608 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.rs
+++ b/src/test/ui/lint/lint-unnecessary-parens.rs
@@ -38,6 +38,9 @@ macro_rules! baz {
     }
 }
 
+const CONST_ITEM: usize = (10); //~ ERROR unnecessary parentheses around assigned value
+static STATIC_ITEM: usize = (10); //~ ERROR unnecessary parentheses around assigned value
+
 fn main() {
     foo();
     bar((true)); //~ ERROR unnecessary parentheses around function argument
diff --git a/src/test/ui/lint/lint-unnecessary-parens.stderr b/src/test/ui/lint/lint-unnecessary-parens.stderr
index ea58220d20..8858c95327 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.stderr
+++ b/src/test/ui/lint/lint-unnecessary-parens.stderr
@@ -4,7 +4,7 @@ error: unnecessary parentheses around `return` value
 LL |     return (1);
    |            ^^^ help: remove these parentheses
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unnecessary-parens.rs:1:9
    |
 LL | #![deny(unused_parens)]
@@ -34,26 +34,38 @@ error: unnecessary parentheses around block return value
 LL |     (5)
    |     ^^^ help: remove these parentheses
 
+error: unnecessary parentheses around assigned value
+  --> $DIR/lint-unnecessary-parens.rs:41:27
+   |
+LL | const CONST_ITEM: usize = (10);
+   |                           ^^^^ help: remove these parentheses
+
+error: unnecessary parentheses around assigned value
+  --> $DIR/lint-unnecessary-parens.rs:42:29
+   |
+LL | static STATIC_ITEM: usize = (10);
+   |                             ^^^^ help: remove these parentheses
+
 error: unnecessary parentheses around function argument
-  --> $DIR/lint-unnecessary-parens.rs:43:9
+  --> $DIR/lint-unnecessary-parens.rs:46:9
    |
 LL |     bar((true));
    |         ^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around `if` condition
-  --> $DIR/lint-unnecessary-parens.rs:45:8
+  --> $DIR/lint-unnecessary-parens.rs:48:8
    |
 LL |     if (true) {}
    |        ^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around `while` condition
-  --> $DIR/lint-unnecessary-parens.rs:46:11
+  --> $DIR/lint-unnecessary-parens.rs:49:11
    |
 LL |     while (true) {}
    |           ^^^^^^ help: remove these parentheses
 
 warning: denote infinite loops with `loop { ... }`
-  --> $DIR/lint-unnecessary-parens.rs:46:5
+  --> $DIR/lint-unnecessary-parens.rs:49:5
    |
 LL |     while (true) {}
    |     ^^^^^^^^^^^^ help: use `loop`
@@ -61,46 +73,46 @@ LL |     while (true) {}
    = note: `#[warn(while_true)]` on by default
 
 error: unnecessary parentheses around `match` head expression
-  --> $DIR/lint-unnecessary-parens.rs:48:11
+  --> $DIR/lint-unnecessary-parens.rs:51:11
    |
 LL |     match (true) {
    |           ^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around `let` head expression
-  --> $DIR/lint-unnecessary-parens.rs:51:16
+  --> $DIR/lint-unnecessary-parens.rs:54:16
    |
 LL |     if let 1 = (1) {}
    |                ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around `let` head expression
-  --> $DIR/lint-unnecessary-parens.rs:52:19
+  --> $DIR/lint-unnecessary-parens.rs:55:19
    |
 LL |     while let 1 = (2) {}
    |                   ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around method argument
-  --> $DIR/lint-unnecessary-parens.rs:66:24
+  --> $DIR/lint-unnecessary-parens.rs:69:24
    |
 LL |     X { y: false }.foo((true));
    |                        ^^^^^^ help: remove these parentheses
 
 error: unnecessary parentheses around assigned value
-  --> $DIR/lint-unnecessary-parens.rs:68:18
+  --> $DIR/lint-unnecessary-parens.rs:71:18
    |
 LL |     let mut _a = (0);
    |                  ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around assigned value
-  --> $DIR/lint-unnecessary-parens.rs:69:10
+  --> $DIR/lint-unnecessary-parens.rs:72:10
    |
 LL |     _a = (0);
    |          ^^^ help: remove these parentheses
 
 error: unnecessary parentheses around assigned value
-  --> $DIR/lint-unnecessary-parens.rs:70:11
+  --> $DIR/lint-unnecessary-parens.rs:73:11
    |
 LL |     _a += (1);
    |           ^^^ help: remove these parentheses
 
-error: aborting due to 15 previous errors
+error: aborting due to 17 previous errors
 
diff --git a/src/test/ui/lint/lint-unsafe-code.stderr b/src/test/ui/lint/lint-unsafe-code.stderr
index 96ad0c3369..0b2b9fab39 100644
--- a/src/test/ui/lint/lint-unsafe-code.stderr
+++ b/src/test/ui/lint/lint-unsafe-code.stderr
@@ -4,7 +4,7 @@ error: declaration of an `unsafe` function
 LL | unsafe fn baz() {}
    | ^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unsafe-code.rs:3:9
    |
 LL | #![deny(unsafe_code)]
@@ -90,6 +90,8 @@ LL |         unsafe {}
 ...
 LL |     unsafe_in_macro!()
    |     ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 14 previous errors
 
diff --git a/src/test/ui/lint/lint-unused-extern-crate.stderr b/src/test/ui/lint/lint-unused-extern-crate.stderr
index aa4a8dad24..46d8f3beea 100644
--- a/src/test/ui/lint/lint-unused-extern-crate.stderr
+++ b/src/test/ui/lint/lint-unused-extern-crate.stderr
@@ -4,7 +4,7 @@ error: unused extern crate
 LL | extern crate lint_unused_extern_crate5;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-extern-crate.rs:7:9
    |
 LL | #![deny(unused_extern_crates)]
diff --git a/src/test/ui/lint/lint-unused-imports.stderr b/src/test/ui/lint/lint-unused-imports.stderr
index 96d71a228a..0574ca4569 100644
--- a/src/test/ui/lint/lint-unused-imports.stderr
+++ b/src/test/ui/lint/lint-unused-imports.stderr
@@ -4,7 +4,7 @@ error: unused import: `std::fmt::{}`
 LL | use std::fmt::{};
    |     ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-imports.rs:1:9
    |
 LL | #![deny(unused_imports)]
diff --git a/src/test/ui/lint/lint-unused-mut-self.stderr b/src/test/ui/lint/lint-unused-mut-self.stderr
index b5f6b717dc..16ad4758b9 100644
--- a/src/test/ui/lint/lint-unused-mut-self.stderr
+++ b/src/test/ui/lint/lint-unused-mut-self.stderr
@@ -6,7 +6,7 @@ LL |     fn foo(mut self) {}
    |            |
    |            help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-mut-self.rs:4:9
    |
 LL | #![deny(unused_mut)]
diff --git a/src/test/ui/lint/lint-unused-mut-variables.rs b/src/test/ui/lint/lint-unused-mut-variables.rs
index dd8dbda6d4..5c7ed9d521 100644
--- a/src/test/ui/lint/lint-unused-mut-variables.rs
+++ b/src/test/ui/lint/lint-unused-mut-variables.rs
@@ -2,17 +2,17 @@
 
 // Exercise the unused_mut attribute in some positive and negative cases
 
-#![deny(unused_mut)]
+#![warn(unused_mut)]
 #![feature(async_closure, raw_ref_op)]
 
 async fn baz_async(
     mut a: i32,
-    //~^ ERROR: variable does not need to be mutable
+    //~^ WARN: variable does not need to be mutable
     #[allow(unused_mut)] mut b: i32,
 ) {}
 fn baz(
     mut a: i32,
-    //~^ ERROR: variable does not need to be mutable
+    //~^ WARN: variable does not need to be mutable
     #[allow(unused_mut)] mut b: i32,
     #[allow(unused_mut)] (mut c, d): (i32, i32)
 ) {}
@@ -21,13 +21,13 @@ struct RefStruct {}
 impl RefStruct {
     async fn baz_async(
         mut a: i32,
-        //~^ ERROR: variable does not need to be mutable
+        //~^ WARN: variable does not need to be mutable
         #[allow(unused_mut)] mut b: i32,
     ) {}
     fn baz(
         &self,
         mut a: i32,
-        //~^ ERROR: variable does not need to be mutable
+        //~^ WARN: variable does not need to be mutable
         #[allow(unused_mut)] mut b: i32,
         #[allow(unused_mut)] (mut c, d): (i32, i32)
     ) {}
@@ -37,7 +37,7 @@ trait RefTrait {
     fn baz(
         &self,
         mut a: i32,
-        //~^ ERROR: variable does not need to be mutable
+        //~^ WARN: variable does not need to be mutable
         #[allow(unused_mut)] mut b: i32,
         #[allow(unused_mut)] (mut c, d): (i32, i32)
     ) {}
@@ -46,7 +46,7 @@ impl RefTrait for () {
     fn baz(
         &self,
         mut a: i32,
-        //~^ ERROR: variable does not need to be mutable
+        //~^ WARN: variable does not need to be mutable
         #[allow(unused_mut)] mut b: i32,
         #[allow(unused_mut)] (mut c, d): (i32, i32)
     ) {}
@@ -55,32 +55,32 @@ impl RefTrait for () {
 fn main() {
     let _ = async move |
         mut a: i32,
-        //~^ ERROR: variable does not need to be mutable
+        //~^ WARN: variable does not need to be mutable
         #[allow(unused_mut)] mut b: i32,
     | {};
     let _ = |
         mut a: i32,
-        //~^ ERROR: variable does not need to be mutable
+        //~^ WARN: variable does not need to be mutable
         #[allow(unused_mut)] mut b: i32,
         #[allow(unused_mut)] (mut c, d): (i32, i32)
     | {};
 
     // negative cases
-    let mut a = 3; //~ ERROR: variable does not need to be mutable
+    let mut a = 3; //~ WARN: variable does not need to be mutable
 
-    let mut a = 2; //~ ERROR: variable does not need to be mutable
+    let mut a = 2; //~ WARN: variable does not need to be mutable
 
-    let mut b = 3; //~ ERROR: variable does not need to be mutable
+    let mut b = 3; //~ WARN: variable does not need to be mutable
 
-    let mut a = vec![3]; //~ ERROR: variable does not need to be mutable
+    let mut a = vec![3]; //~ WARN: variable does not need to be mutable
 
-    let (mut a, b) = (1, 2); //~ ERROR: variable does not need to be mutable
+    let (mut a, b) = (1, 2); //~ WARN: variable does not need to be mutable
 
-    let mut a; //~ ERROR: variable does not need to be mutable
+    let mut a; //~ WARN: variable does not need to be mutable
 
     a = 3;
 
-    let mut b; //~ ERROR: variable does not need to be mutable
+    let mut b; //~ WARN: variable does not need to be mutable
 
     if true {
         b = 3;
@@ -89,11 +89,11 @@ fn main() {
     }
 
     match 30 {
-        mut x => {} //~ ERROR: variable does not need to be mutable
+        mut x => {} //~ WARN: variable does not need to be mutable
 
     }
     match (30, 2) {
-      (mut x, 1) | //~ ERROR: variable does not need to be mutable
+      (mut x, 1) | //~ WARN: variable does not need to be mutable
 
       (mut x, 2) |
       (mut x, 3) => {
@@ -101,20 +101,20 @@ fn main() {
       _ => {}
     }
 
-    let x = |mut y: isize| 10; //~ ERROR: variable does not need to be mutable
+    let x = |mut y: isize| 10; //~ WARN: variable does not need to be mutable
 
-    fn what(mut foo: isize) {} //~ ERROR: variable does not need to be mutable
+    fn what(mut foo: isize) {} //~ WARN: variable does not need to be mutable
 
 
-    let mut a = &mut 5; //~ ERROR: variable does not need to be mutable
+    let mut a = &mut 5; //~ WARN: variable does not need to be mutable
 
     *a = 4;
 
     let mut a = 5;
-    let mut b = (&mut a,); //~ ERROR: variable does not need to be mutable
+    let mut b = (&mut a,); //~ WARN: variable does not need to be mutable
     *b.0 = 4;
 
-    let mut x = &mut 1; //~ ERROR: variable does not need to be mutable
+    let mut x = &mut 1; //~ WARN: variable does not need to be mutable
 
     let mut f = || {
       *x += 1;
@@ -122,11 +122,11 @@ fn main() {
     f();
 
     fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] {
-        &mut arg[..] //~^ ERROR: variable does not need to be mutable
+        &mut arg[..] //~^ WARN: variable does not need to be mutable
 
     }
 
-    let mut v : &mut Vec<()> = &mut vec![]; //~ ERROR: variable does not need to be mutable
+    let mut v : &mut Vec<()> = &mut vec![]; //~ WARN: variable does not need to be mutable
 
     v.push(());
 
@@ -181,7 +181,7 @@ fn main() {
     let mut raw_address_of_mut = 1; // OK
     let mut_ptr = &raw mut raw_address_of_mut;
 
-    let mut raw_address_of_const = 1; //~ ERROR: variable does not need to be mutable
+    let mut raw_address_of_const = 1; //~ WARN: variable does not need to be mutable
     let const_ptr = &raw const raw_address_of_const;
 }
 
diff --git a/src/test/ui/lint/lint-unused-mut-variables.stderr b/src/test/ui/lint/lint-unused-mut-variables.stderr
index c1ab0ab33d..b56b3c7569 100644
--- a/src/test/ui/lint/lint-unused-mut-variables.stderr
+++ b/src/test/ui/lint/lint-unused-mut-variables.stderr
@@ -1,4 +1,4 @@
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:9:5
    |
 LL |     mut a: i32,
@@ -6,21 +6,13 @@ LL |     mut a: i32,
    |     |
    |     help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-mut-variables.rs:5:9
    |
-LL | #![deny(unused_mut)]
+LL | #![warn(unused_mut)]
    |         ^^^^^^^^^^
 
-error: variable does not need to be mutable
-  --> $DIR/lint-unused-mut-variables.rs:14:5
-   |
-LL |     mut a: i32,
-   |     ----^
-   |     |
-   |     help: remove this `mut`
-
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:23:9
    |
 LL |         mut a: i32,
@@ -28,7 +20,15 @@ LL |         mut a: i32,
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
+  --> $DIR/lint-unused-mut-variables.rs:14:5
+   |
+LL |     mut a: i32,
+   |     ----^
+   |     |
+   |     help: remove this `mut`
+
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:29:9
    |
 LL |         mut a: i32,
@@ -36,7 +36,7 @@ LL |         mut a: i32,
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:39:9
    |
 LL |         mut a: i32,
@@ -44,7 +44,7 @@ LL |         mut a: i32,
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:48:9
    |
 LL |         mut a: i32,
@@ -52,7 +52,7 @@ LL |         mut a: i32,
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:57:9
    |
 LL |         mut a: i32,
@@ -60,7 +60,7 @@ LL |         mut a: i32,
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:62:9
    |
 LL |         mut a: i32,
@@ -68,7 +68,7 @@ LL |         mut a: i32,
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:104:14
    |
 LL |     let x = |mut y: isize| 10;
@@ -76,7 +76,7 @@ LL |     let x = |mut y: isize| 10;
    |              |
    |              help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:69:9
    |
 LL |     let mut a = 3;
@@ -84,7 +84,7 @@ LL |     let mut a = 3;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:71:9
    |
 LL |     let mut a = 2;
@@ -92,7 +92,7 @@ LL |     let mut a = 2;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:73:9
    |
 LL |     let mut b = 3;
@@ -100,7 +100,7 @@ LL |     let mut b = 3;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:75:9
    |
 LL |     let mut a = vec![3];
@@ -108,7 +108,7 @@ LL |     let mut a = vec![3];
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:77:10
    |
 LL |     let (mut a, b) = (1, 2);
@@ -116,7 +116,7 @@ LL |     let (mut a, b) = (1, 2);
    |          |
    |          help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:79:9
    |
 LL |     let mut a;
@@ -124,7 +124,7 @@ LL |     let mut a;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:83:9
    |
 LL |     let mut b;
@@ -132,7 +132,7 @@ LL |     let mut b;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:92:9
    |
 LL |         mut x => {}
@@ -140,7 +140,7 @@ LL |         mut x => {}
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:96:8
    |
 LL |       (mut x, 1) |
@@ -148,7 +148,7 @@ LL |       (mut x, 1) |
    |        |
    |        help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:109:9
    |
 LL |     let mut a = &mut 5;
@@ -156,7 +156,7 @@ LL |     let mut a = &mut 5;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:114:9
    |
 LL |     let mut b = (&mut a,);
@@ -164,7 +164,7 @@ LL |     let mut b = (&mut a,);
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:117:9
    |
 LL |     let mut x = &mut 1;
@@ -172,7 +172,7 @@ LL |     let mut x = &mut 1;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:129:9
    |
 LL |     let mut v : &mut Vec<()> = &mut vec![];
@@ -180,7 +180,7 @@ LL |     let mut v : &mut Vec<()> = &mut vec![];
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:184:9
    |
 LL |     let mut raw_address_of_const = 1;
@@ -188,7 +188,7 @@ LL |     let mut raw_address_of_const = 1;
    |         |
    |         help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:106:13
    |
 LL |     fn what(mut foo: isize) {}
@@ -196,7 +196,7 @@ LL |     fn what(mut foo: isize) {}
    |             |
    |             help: remove this `mut`
 
-error: variable does not need to be mutable
+warning: variable does not need to be mutable
   --> $DIR/lint-unused-mut-variables.rs:124:20
    |
 LL |     fn mut_ref_arg(mut arg : &mut [u8]) -> &mut [u8] {
@@ -212,11 +212,11 @@ LL |     let mut b = vec![2];
    |         |
    |         help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-mut-variables.rs:198:8
    |
 LL | #[deny(unused_mut)]
    |        ^^^^^^^^^^
 
-error: aborting due to 26 previous errors
+error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-unused-variables.stderr b/src/test/ui/lint/lint-unused-variables.stderr
index f8419bf506..57389f8d12 100644
--- a/src/test/ui/lint/lint-unused-variables.stderr
+++ b/src/test/ui/lint/lint-unused-variables.stderr
@@ -4,7 +4,7 @@ error: unused variable: `a`
 LL |     a: i32,
    |     ^ help: consider prefixing with an underscore: `_a`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-variables.rs:5:9
    |
 LL | #![deny(unused_variables)]
diff --git a/src/test/ui/lint/lint-uppercase-variables.stderr b/src/test/ui/lint/lint-uppercase-variables.stderr
index a38f3e7626..7c2497758d 100644
--- a/src/test/ui/lint/lint-uppercase-variables.stderr
+++ b/src/test/ui/lint/lint-uppercase-variables.stderr
@@ -24,7 +24,7 @@ warning: unused variable: `Foo`
 LL |         Foo => {}
    |         ^^^ help: consider prefixing with an underscore: `_Foo`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-uppercase-variables.rs:1:9
    |
 LL | #![warn(unused)]
@@ -49,7 +49,7 @@ error: structure field `X` should have a snake case name
 LL |     X: usize
    |     ^ help: convert the identifier to snake case (notice the capitalization): `x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-uppercase-variables.rs:3:9
    |
 LL | #![deny(non_snake_case)]
diff --git a/src/test/ui/lint/lints-in-foreign-macros.stderr b/src/test/ui/lint/lints-in-foreign-macros.stderr
index 3fc3c2281f..207d85a89c 100644
--- a/src/test/ui/lint/lints-in-foreign-macros.stderr
+++ b/src/test/ui/lint/lints-in-foreign-macros.stderr
@@ -7,11 +7,12 @@ LL |     () => {use std::string::ToString;}
 LL | mod a { foo!(); }
    |         ------- in this macro invocation
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lints-in-foreign-macros.rs:4:9
    |
 LL | #![warn(unused_imports)]
    |         ^^^^^^^^^^^^^^
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: unused import: `std::string::ToString`
   --> $DIR/lints-in-foreign-macros.rs:16:18
@@ -37,7 +38,7 @@ LL | |
 LL | | fn main() {}
    | |____________^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lints-in-foreign-macros.rs:5:9
    |
 LL | #![warn(missing_docs)]
diff --git a/src/test/ui/lint/must-use-ops.stderr b/src/test/ui/lint/must-use-ops.stderr
index febb4c193e..4490d4afbd 100644
--- a/src/test/ui/lint/must-use-ops.stderr
+++ b/src/test/ui/lint/must-use-ops.stderr
@@ -4,7 +4,7 @@ warning: unused comparison that must be used
 LL |     val == 1;
    |     ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/must-use-ops.rs:5:9
    |
 LL | #![warn(unused_must_use)]
diff --git a/src/test/ui/lint/must_use-array.stderr b/src/test/ui/lint/must_use-array.stderr
index a6dbd8e93d..c42223b519 100644
--- a/src/test/ui/lint/must_use-array.stderr
+++ b/src/test/ui/lint/must_use-array.stderr
@@ -4,7 +4,7 @@ error: unused array of `S` that must be used
 LL |     singleton();
    |     ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/must_use-array.rs:1:9
    |
 LL | #![deny(unused_must_use)]
diff --git a/src/test/ui/lint/must_use-trait.stderr b/src/test/ui/lint/must_use-trait.stderr
index be74362e29..11555d8082 100644
--- a/src/test/ui/lint/must_use-trait.stderr
+++ b/src/test/ui/lint/must_use-trait.stderr
@@ -4,7 +4,7 @@ error: unused implementer of `Critical` that must be used
 LL |     get_critical();
    |     ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/must_use-trait.rs:1:9
    |
 LL | #![deny(unused_must_use)]
diff --git a/src/test/ui/lint/must_use-tuple.stderr b/src/test/ui/lint/must_use-tuple.stderr
index 45d2a439e5..de3c6f46c6 100644
--- a/src/test/ui/lint/must_use-tuple.stderr
+++ b/src/test/ui/lint/must_use-tuple.stderr
@@ -4,7 +4,7 @@ error: unused `std::result::Result` in tuple element 0 that must be used
 LL |     (Ok::<(), ()>(()),);
    |      ^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/must_use-tuple.rs:1:9
    |
 LL | #![deny(unused_must_use)]
diff --git a/src/test/ui/lint/must_use-unit.stderr b/src/test/ui/lint/must_use-unit.stderr
index 0a9939b201..7f25a19350 100644
--- a/src/test/ui/lint/must_use-unit.stderr
+++ b/src/test/ui/lint/must_use-unit.stderr
@@ -4,7 +4,7 @@ error: unused return value of `foo` that must be used
 LL |     foo();
    |     ^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/must_use-unit.rs:2:9
    |
 LL | #![deny(unused_must_use)]
diff --git a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr b/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
index 136d564d1a..712095e320 100644
--- a/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
+++ b/src/test/ui/lint/opaque-ty-ffi-unsafe.stderr
@@ -4,7 +4,7 @@ error: `extern` block uses type `A`, which is not FFI-safe
 LL |     pub fn a(_: A);
    |                 ^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/opaque-ty-ffi-unsafe.rs:3:9
    |
 LL | #![deny(improper_ctypes)]
diff --git a/src/test/ui/lint/reasons.rs b/src/test/ui/lint/reasons.rs
index 4722e85673..34cac4968a 100644
--- a/src/test/ui/lint/reasons.rs
+++ b/src/test/ui/lint/reasons.rs
@@ -3,11 +3,11 @@
 #![feature(lint_reasons)]
 
 #![warn(elided_lifetimes_in_paths,
-        //~^ NOTE lint level defined here
+        //~^ NOTE the lint level is defined here
         reason = "explicit anonymous lifetimes aid reasoning about ownership")]
 #![warn(
     nonstandard_style,
-    //~^ NOTE lint level defined here
+    //~^ NOTE the lint level is defined here
     reason = r#"people shouldn't have to change their usual style habits
 to contribute to our project"#
 )]
diff --git a/src/test/ui/lint/reasons.stderr b/src/test/ui/lint/reasons.stderr
index 139b3f13fd..30bb8daf48 100644
--- a/src/test/ui/lint/reasons.stderr
+++ b/src/test/ui/lint/reasons.stderr
@@ -5,7 +5,7 @@ LL |     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
    |                             ^^^^^^^^^^^^^^- help: indicate the anonymous lifetime: `<'_>`
    |
    = note: explicit anonymous lifetimes aid reasoning about ownership
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/reasons.rs:5:9
    |
 LL | #![warn(elided_lifetimes_in_paths,
@@ -19,7 +19,7 @@ LL |     let Social_exchange_psychology = CheaterDetectionMechanism {};
    |
    = note: people shouldn't have to change their usual style habits
            to contribute to our project
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/reasons.rs:9:5
    |
 LL |     nonstandard_style,
diff --git a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs b/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
index f207b23573..08a5c6c2b6 100644
--- a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
+++ b/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.rs
@@ -1,6 +1,6 @@
 // aux-build:redundant-semi-proc-macro-def.rs
 
-#![deny(redundant_semicolon)]
+#![deny(redundant_semicolons)]
 extern crate redundant_semi_proc_macro;
 use redundant_semi_proc_macro::should_preserve_spans;
 
diff --git a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr b/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
index 2160df51a8..a79fba9bf3 100644
--- a/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
+++ b/src/test/ui/lint/redundant-semicolon/redundant-semi-proc-macro.stderr
@@ -1,15 +1,15 @@
-TokenStream [Ident { ident: "fn", span: #0 bytes(197..199) }, Ident { ident: "span_preservation", span: #0 bytes(200..217) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(217..219) }, Group { delimiter: Brace, stream: TokenStream [Ident { ident: "let", span: #0 bytes(227..230) }, Ident { ident: "tst", span: #0 bytes(231..234) }, Punct { ch: '=', spacing: Alone, span: #0 bytes(235..236) }, Literal { lit: Lit { kind: Integer, symbol: "123", suffix: None }, span: Span { lo: BytePos(237), hi: BytePos(240), ctxt: #0 } }, Punct { ch: ';', spacing: Joint, span: #0 bytes(240..241) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(241..242) }, Ident { ident: "match", span: #0 bytes(288..293) }, Ident { ident: "tst", span: #0 bytes(294..297) }, Group { delimiter: Brace, stream: TokenStream [Literal { lit: Lit { kind: Integer, symbol: "123", suffix: None }, span: Span { lo: BytePos(482), hi: BytePos(485), ctxt: #0 } }, Punct { ch: '=', spacing: Joint, span: #0 bytes(486..488) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(486..488) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(489..491) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(491..492) }, Ident { ident: "_", span: #0 bytes(501..502) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(503..505) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(503..505) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(506..508) }], span: #0 bytes(298..514) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(514..515) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(515..516) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(516..517) }], span: #0 bytes(221..561) }]
+TokenStream [Ident { ident: "fn", span: #0 bytes(198..200) }, Ident { ident: "span_preservation", span: #0 bytes(201..218) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(218..220) }, Group { delimiter: Brace, stream: TokenStream [Ident { ident: "let", span: #0 bytes(228..231) }, Ident { ident: "tst", span: #0 bytes(232..235) }, Punct { ch: '=', spacing: Alone, span: #0 bytes(236..237) }, Literal { lit: Lit { kind: Integer, symbol: "123", suffix: None }, span: Span { lo: BytePos(238), hi: BytePos(241), ctxt: #0 } }, Punct { ch: ';', spacing: Joint, span: #0 bytes(241..242) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(242..243) }, Ident { ident: "match", span: #0 bytes(289..294) }, Ident { ident: "tst", span: #0 bytes(295..298) }, Group { delimiter: Brace, stream: TokenStream [Literal { lit: Lit { kind: Integer, symbol: "123", suffix: None }, span: Span { lo: BytePos(483), hi: BytePos(486), ctxt: #0 } }, Punct { ch: '=', spacing: Joint, span: #0 bytes(487..489) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(487..489) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(490..492) }, Punct { ch: ',', spacing: Alone, span: #0 bytes(492..493) }, Ident { ident: "_", span: #0 bytes(502..503) }, Punct { ch: '=', spacing: Joint, span: #0 bytes(504..506) }, Punct { ch: '>', spacing: Alone, span: #0 bytes(504..506) }, Group { delimiter: Parenthesis, stream: TokenStream [], span: #0 bytes(507..509) }], span: #0 bytes(299..515) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(515..516) }, Punct { ch: ';', spacing: Joint, span: #0 bytes(516..517) }, Punct { ch: ';', spacing: Alone, span: #0 bytes(517..518) }], span: #0 bytes(222..562) }]
 error: unnecessary trailing semicolon
   --> $DIR/redundant-semi-proc-macro.rs:9:19
    |
 LL |     let tst = 123;;
    |                   ^ help: remove this semicolon
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/redundant-semi-proc-macro.rs:3:9
    |
-LL | #![deny(redundant_semicolon)]
-   |         ^^^^^^^^^^^^^^^^^^^
+LL | #![deny(redundant_semicolons)]
+   |         ^^^^^^^^^^^^^^^^^^^^
 
 error: unnecessary trailing semicolons
   --> $DIR/redundant-semi-proc-macro.rs:16:7
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr b/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
index 56925846e9..6c9f0866c0 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
+++ b/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-non-ascii-idents.stderr
@@ -4,7 +4,7 @@ error: identifier contains non-ASCII characters
 LL | const חלודה: usize = 2;
    |       ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-non-ascii-idents.rs:2:9
    |
 LL | #![deny(non_ascii_idents)]
diff --git a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr b/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
index 4580d25665..b270bd1f05 100644
--- a/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
+++ b/src/test/ui/lint/rfc-2457-non-ascii-idents/lint-uncommon-codepoints.stderr
@@ -4,7 +4,7 @@ error: identifier contains uncommon Unicode codepoints
 LL | const µ: f64 = 0.000001;
    |       ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-uncommon-codepoints.rs:2:9
    |
 LL | #![deny(uncommon_codepoints)]
diff --git a/src/test/ui/lint/suggestions.rs b/src/test/ui/lint/suggestions.rs
index 29297d08dc..518b5f211e 100644
--- a/src/test/ui/lint/suggestions.rs
+++ b/src/test/ui/lint/suggestions.rs
@@ -1,7 +1,6 @@
 // ignore-tidy-tab
 
 #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896
-#![feature(no_debug)]
 
 #[no_mangle] const DISCOVERY: usize = 1;
 //~^ ERROR const items should never be `#[no_mangle]`
@@ -39,9 +38,6 @@ struct Equinox {
     warp_factor: f32,
 }
 
-#[no_debug] // should suggest removal of deprecated attribute
-//~^ WARN deprecated
-//~| HELP remove this attribute
 fn main() {
     while true {
     //~^ WARN denote infinite loops
diff --git a/src/test/ui/lint/suggestions.stderr b/src/test/ui/lint/suggestions.stderr
index e42ee0fa64..0ef5d72609 100644
--- a/src/test/ui/lint/suggestions.stderr
+++ b/src/test/ui/lint/suggestions.stderr
@@ -1,5 +1,5 @@
 warning: denote infinite loops with `loop { ... }`
-  --> $DIR/suggestions.rs:46:5
+  --> $DIR/suggestions.rs:42:5
    |
 LL |     while true {
    |     ^^^^^^^^^^ help: use `loop`
@@ -7,41 +7,33 @@ LL |     while true {
    = note: `#[warn(while_true)]` on by default
 
 warning: unnecessary parentheses around assigned value
-  --> $DIR/suggestions.rs:49:31
+  --> $DIR/suggestions.rs:45:31
    |
 LL |         let mut registry_no = (format!("NX-{}", 74205));
    |                               ^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/suggestions.rs:3:21
    |
 LL | #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896
    |                     ^^^^^^^^^^^^^
 
-warning: use of deprecated attribute `no_debug`: the `#[no_debug]` attribute was an experimental feature that has been deprecated due to lack of demand. See https://github.com/rust-lang/rust/issues/29721
-  --> $DIR/suggestions.rs:42:1
-   |
-LL | #[no_debug] // should suggest removal of deprecated attribute
-   | ^^^^^^^^^^^ help: remove this attribute
-   |
-   = note: `#[warn(deprecated)]` on by default
-
 warning: variable does not need to be mutable
-  --> $DIR/suggestions.rs:49:13
+  --> $DIR/suggestions.rs:45:13
    |
 LL |         let mut registry_no = (format!("NX-{}", 74205));
    |             ----^^^^^^^^^^^
    |             |
    |             help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/suggestions.rs:3:9
    |
 LL | #![warn(unused_mut, unused_parens)] // UI tests pass `-A unused`—see Issue #43896
    |         ^^^^^^^^^^
 
 warning: variable does not need to be mutable
-  --> $DIR/suggestions.rs:55:13
+  --> $DIR/suggestions.rs:51:13
    |
 LL |            let mut
    |   _____________^
@@ -53,7 +45,7 @@ LL | ||             b = 1;
    |               help: remove this `mut`
 
 error: const items should never be `#[no_mangle]`
-  --> $DIR/suggestions.rs:6:14
+  --> $DIR/suggestions.rs:5:14
    |
 LL | #[no_mangle] const DISCOVERY: usize = 1;
    |              -----^^^^^^^^^^^^^^^^^^^^^^
@@ -63,7 +55,7 @@ LL | #[no_mangle] const DISCOVERY: usize = 1;
    = note: `#[deny(no_mangle_const_items)]` on by default
 
 warning: functions generic over types or consts must be mangled
-  --> $DIR/suggestions.rs:12:1
+  --> $DIR/suggestions.rs:11:1
    |
 LL | #[no_mangle]
    | ------------ help: remove this attribute
@@ -74,7 +66,7 @@ LL | pub fn defiant<T>(_t: T) {}
    = note: `#[warn(no_mangle_generic_items)]` on by default
 
 warning: the `warp_factor:` in this pattern is redundant
-  --> $DIR/suggestions.rs:61:23
+  --> $DIR/suggestions.rs:57:23
    |
 LL |             Equinox { warp_factor: warp_factor } => {}
    |                       ^^^^^^^^^^^^^^^^^^^^^^^^ help: use shorthand field pattern: `warp_factor`
@@ -82,7 +74,7 @@ LL |             Equinox { warp_factor: warp_factor } => {}
    = note: `#[warn(non_shorthand_field_patterns)]` on by default
 
 error: const items should never be `#[no_mangle]`
-  --> $DIR/suggestions.rs:22:18
+  --> $DIR/suggestions.rs:21:18
    |
 LL |     #[no_mangle] pub const DAUNTLESS: bool = true;
    |                  ---------^^^^^^^^^^^^^^^^^^^^^^^^
@@ -90,7 +82,7 @@ LL |     #[no_mangle] pub const DAUNTLESS: bool = true;
    |                  help: try a static value: `pub static`
 
 warning: functions generic over types or consts must be mangled
-  --> $DIR/suggestions.rs:25:18
+  --> $DIR/suggestions.rs:24:18
    |
 LL |     #[no_mangle] pub fn val_jean<T>() {}
    |     ------------ ^^^^^^^^^^^^^^^^^^^^^^^
@@ -98,7 +90,7 @@ LL |     #[no_mangle] pub fn val_jean<T>() {}
    |     help: remove this attribute
 
 error: const items should never be `#[no_mangle]`
-  --> $DIR/suggestions.rs:30:18
+  --> $DIR/suggestions.rs:29:18
    |
 LL |     #[no_mangle] pub(crate) const VETAR: bool = true;
    |                  ----------------^^^^^^^^^^^^^^^^^^^^
@@ -106,7 +98,7 @@ LL |     #[no_mangle] pub(crate) const VETAR: bool = true;
    |                  help: try a static value: `pub static`
 
 warning: functions generic over types or consts must be mangled
-  --> $DIR/suggestions.rs:33:18
+  --> $DIR/suggestions.rs:32:18
    |
 LL |     #[no_mangle] pub(crate) fn crossfield<T>() {}
    |     ------------ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/lint/test-inner-fn.stderr b/src/test/ui/lint/test-inner-fn.stderr
index bf476a45f7..a8974e1cf9 100644
--- a/src/test/ui/lint/test-inner-fn.stderr
+++ b/src/test/ui/lint/test-inner-fn.stderr
@@ -5,12 +5,15 @@ LL |     #[test]
    |     ^^^^^^^
    |
    = note: requested on the command line with `-D unnameable-test-items`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: cannot test inner items
   --> $DIR/test-inner-fn.rs:13:9
    |
 LL |         #[test]
    |         ^^^^^^^
+   |
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr b/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr
index c1a4b393cd..f7c42acb34 100644
--- a/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr
+++ b/src/test/ui/lint/trivial-casts-featuring-type-ascription.stderr
@@ -4,7 +4,7 @@ error: trivial numeric cast: `i32` as `i32`
 LL |     let lugubrious = 12i32 as i32;
    |                      ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial-casts-featuring-type-ascription.rs:1:24
    |
 LL | #![deny(trivial_casts, trivial_numeric_casts)]
@@ -17,7 +17,7 @@ error: trivial cast: `&u32` as `*const u32`
 LL |     let _ = haunted as *const u32;
    |             ^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial-casts-featuring-type-ascription.rs:1:9
    |
 LL | #![deny(trivial_casts, trivial_numeric_casts)]
diff --git a/src/test/ui/lint/trivial-casts.stderr b/src/test/ui/lint/trivial-casts.stderr
index f411db1ab0..1544f553ce 100644
--- a/src/test/ui/lint/trivial-casts.stderr
+++ b/src/test/ui/lint/trivial-casts.stderr
@@ -4,7 +4,7 @@ error: trivial numeric cast: `i32` as `i32`
 LL |     let lugubrious = 12i32 as i32;
    |                      ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial-casts.rs:1:24
    |
 LL | #![deny(trivial_casts, trivial_numeric_casts)]
@@ -17,7 +17,7 @@ error: trivial cast: `&u32` as `*const u32`
 LL |     let _ = haunted as *const u32;
    |             ^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial-casts.rs:1:9
    |
 LL | #![deny(trivial_casts, trivial_numeric_casts)]
diff --git a/src/test/ui/lint/type-overflow.stderr b/src/test/ui/lint/type-overflow.stderr
index dabfb876fb..2432eb78b8 100644
--- a/src/test/ui/lint/type-overflow.stderr
+++ b/src/test/ui/lint/type-overflow.stderr
@@ -4,7 +4,7 @@ warning: literal out of range for `i8`
 LL |     let error = 255i8;
    |                 ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/type-overflow.rs:2:9
    |
 LL | #![warn(overflowing_literals)]
diff --git a/src/test/ui/lint/uninitialized-zeroed.stderr b/src/test/ui/lint/uninitialized-zeroed.stderr
index 169e77c8fa..6d669184de 100644
--- a/src/test/ui/lint/uninitialized-zeroed.stderr
+++ b/src/test/ui/lint/uninitialized-zeroed.stderr
@@ -7,7 +7,7 @@ LL |         let _val: &'static T = mem::zeroed();
    |                                this code causes undefined behavior when executed
    |                                help: use `MaybeUninit<T>` instead, and only call `assume_init` after initialization is done
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/uninitialized-zeroed.rs:7:9
    |
 LL | #![deny(invalid_value)]
diff --git a/src/test/ui/lint/unreachable_pub-pub_crate.stderr b/src/test/ui/lint/unreachable_pub-pub_crate.stderr
index da21c2ac4a..fd3f2dbc07 100644
--- a/src/test/ui/lint/unreachable_pub-pub_crate.stderr
+++ b/src/test/ui/lint/unreachable_pub-pub_crate.stderr
@@ -6,7 +6,7 @@ LL |     pub use std::fmt;
    |     |
    |     help: consider restricting its visibility: `pub(crate)`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable_pub-pub_crate.rs:10:9
    |
 LL | #![warn(unreachable_pub)]
@@ -132,6 +132,7 @@ LL |     define_empty_struct_with_visibility!(pub, Fluorine);
    |     in this macro invocation
    |
    = help: or consider exporting it for use by other crates
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: unreachable `pub` item
   --> $DIR/unreachable_pub-pub_crate.rs:45:9
diff --git a/src/test/ui/lint/unreachable_pub.stderr b/src/test/ui/lint/unreachable_pub.stderr
index 2cb27a770e..ad687a4b54 100644
--- a/src/test/ui/lint/unreachable_pub.stderr
+++ b/src/test/ui/lint/unreachable_pub.stderr
@@ -6,7 +6,7 @@ LL |     pub use std::fmt;
    |     |
    |     help: consider restricting its visibility: `crate`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable_pub.rs:6:9
    |
 LL | #![warn(unreachable_pub)]
@@ -132,6 +132,7 @@ LL |     define_empty_struct_with_visibility!(pub, Fluorine);
    |     in this macro invocation
    |
    = help: or consider exporting it for use by other crates
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: unreachable `pub` item
   --> $DIR/unreachable_pub.rs:41:9
diff --git a/src/test/ui/lint/unused_import_warning_issue_45268.stderr b/src/test/ui/lint/unused_import_warning_issue_45268.stderr
index 7392e99f7a..1d6338572f 100644
--- a/src/test/ui/lint/unused_import_warning_issue_45268.stderr
+++ b/src/test/ui/lint/unused_import_warning_issue_45268.stderr
@@ -4,7 +4,7 @@ warning: unused import: `test::Unused`
 LL | use test::Unused;   // This is really unused, so warning is OK
    |     ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused_import_warning_issue_45268.rs:3:9
    |
 LL | #![warn(unused_imports)] // Warning explanation here, it's OK
diff --git a/src/test/ui/lint/unused_labels.stderr b/src/test/ui/lint/unused_labels.stderr
index 08f8548e04..809aad2468 100644
--- a/src/test/ui/lint/unused_labels.stderr
+++ b/src/test/ui/lint/unused_labels.stderr
@@ -4,7 +4,7 @@ warning: unused label
 LL |     'unused_while_label: while 0 == 0 {
    |     ^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused_labels.rs:8:9
    |
 LL | #![warn(unused_labels)]
diff --git a/src/test/ui/lint/unused_parens_json_suggestion.stderr b/src/test/ui/lint/unused_parens_json_suggestion.stderr
index c503c10080..09f0fc9003 100644
--- a/src/test/ui/lint/unused_parens_json_suggestion.stderr
+++ b/src/test/ui/lint/unused_parens_json_suggestion.stderr
@@ -4,7 +4,7 @@
 LL |     let _a = (1 / (2 + 3));
    |              ^^^^^^^^^^^^^ help: remove these parentheses
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused_parens_json_suggestion.rs:10:9
    |
 LL | #![deny(unused_parens)]
diff --git a/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr b/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr
index 873f105435..c3bf77a3a6 100644
--- a/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr
+++ b/src/test/ui/lint/unused_parens_remove_json_suggestion.stderr
@@ -4,7 +4,7 @@
 LL |     if (_b) {
    |        ^^^^ help: remove these parentheses
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused_parens_remove_json_suggestion.rs:10:9
    |
 LL | #![deny(unused_parens)]
diff --git a/src/test/ui/lint/use-redundant.stderr b/src/test/ui/lint/use-redundant.stderr
index fbd9f81f18..85a5cce4dd 100644
--- a/src/test/ui/lint/use-redundant.stderr
+++ b/src/test/ui/lint/use-redundant.stderr
@@ -4,7 +4,7 @@ warning: unused import: `m1::*`
 LL | use m1::*;
    |     ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/use-redundant.rs:2:9
    |
 LL | #![warn(unused_imports)]
diff --git a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr b/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
index 006cc6c80a..843db8ce81 100644
--- a/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
+++ b/src/test/ui/lint/warn-unused-inline-on-fn-prototypes.stderr
@@ -4,7 +4,7 @@ error: `#[inline]` is ignored on function prototypes
 LL |     #[inline]
    |     ^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/warn-unused-inline-on-fn-prototypes.rs:1:9
    |
 LL | #![deny(unused_attributes)]
diff --git a/src/test/ui/liveness/liveness-dead.stderr b/src/test/ui/liveness/liveness-dead.stderr
index d054b1d497..12680ab115 100644
--- a/src/test/ui/liveness/liveness-dead.stderr
+++ b/src/test/ui/liveness/liveness-dead.stderr
@@ -4,7 +4,7 @@ error: value assigned to `x` is never read
 LL |     let mut x: isize = 3;
    |             ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/liveness-dead.rs:2:9
    |
 LL | #![deny(unused_assignments)]
diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
index 6b4de6618c..ae63bad841 100644
--- a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
+++ b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
@@ -9,6 +9,8 @@ LL | macro_rules! test { () => { fn foo() -> i32 { 1; } } }
 ...
 LL |     test!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
   --> $DIR/liveness-return-last-stmt-semi.rs:7:19
diff --git a/src/test/ui/liveness/liveness-unused.stderr b/src/test/ui/liveness/liveness-unused.stderr
index 6ea20081e5..7adb6a3295 100644
--- a/src/test/ui/liveness/liveness-unused.stderr
+++ b/src/test/ui/liveness/liveness-unused.stderr
@@ -6,7 +6,7 @@ LL |         continue;
 LL |         drop(*x as i32);
    |         ^^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/liveness-unused.rs:1:9
    |
 LL | #![warn(unused)]
@@ -19,7 +19,7 @@ error: unused variable: `x`
 LL | fn f1(x: isize) {
    |       ^ help: consider prefixing with an underscore: `_x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/liveness-unused.rs:2:9
    |
 LL | #![deny(unused_variables)]
@@ -57,7 +57,7 @@ error: value assigned to `x` is never read
 LL |     x += 4;
    |     ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/liveness-unused.rs:3:9
    |
 LL | #![deny(unused_assignments)]
diff --git a/src/test/ui/macro_backtrace/main.-Zmacro-backtrace.stderr b/src/test/ui/macro_backtrace/main.-Zmacro-backtrace.stderr
new file mode 100644
index 0000000000..41ed545cf1
--- /dev/null
+++ b/src/test/ui/macro_backtrace/main.-Zmacro-backtrace.stderr
@@ -0,0 +1,78 @@
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
+  --> $DIR/main.rs:10:20
+   |
+LL | / macro_rules! pong {
+LL | |     () => { syntax error };
+   | |                    ^^^^^ expected one of 8 possible tokens
+LL | | }
+   | |_- in this expansion of `pong!`
+...
+LL |       pong!();
+   |       -------- in this macro invocation
+
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
+  --> $DIR/main.rs:10:20
+   |
+LL | / macro_rules! pong {
+LL | |     () => { syntax error };
+   | |                    ^^^^^ expected one of 8 possible tokens
+LL | | }
+   | |_- in this expansion of `pong!`
+...
+LL |       ping!();
+   |       -------- in this macro invocation
+   | 
+  ::: <::ping::ping macros>:1:1
+   |
+LL |   () => { pong ! () ; }
+   |   ---------------------
+   |   |       |
+   |   |       in this macro invocation
+   |   in this expansion of `ping!`
+
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
+  --> $DIR/main.rs:10:20
+   |
+LL | / macro_rules! pong {
+LL | |     () => { syntax error };
+   | |                    ^^^^^ expected one of 8 possible tokens
+LL | | }
+   | |_- in this expansion of `pong!` (#5)
+...
+LL |       deep!();
+   |       -------- in this macro invocation (#1)
+   | 
+  ::: <::ping::deep macros>:1:1
+   |
+LL |   () => { foo ! () ; }
+   |   --------------------
+   |   |       |
+   |   |       in this macro invocation (#2)
+   |   in this expansion of `deep!` (#1)
+   | 
+  ::: <::ping::foo macros>:1:1
+   |
+LL |   () => { bar ! () ; }
+   |   --------------------
+   |   |       |
+   |   |       in this macro invocation (#3)
+   |   in this expansion of `foo!` (#2)
+   | 
+  ::: <::ping::bar macros>:1:1
+   |
+LL |   () => { ping ! () ; }
+   |   ---------------------
+   |   |       |
+   |   |       in this macro invocation (#4)
+   |   in this expansion of `bar!` (#3)
+   | 
+  ::: <::ping::ping macros>:1:1
+   |
+LL |   () => { pong ! () ; }
+   |   ---------------------
+   |   |       |
+   |   |       in this macro invocation (#5)
+   |   in this expansion of `ping!` (#4)
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/macro_backtrace/main.default.stderr b/src/test/ui/macro_backtrace/main.default.stderr
new file mode 100644
index 0000000000..fac76fd608
--- /dev/null
+++ b/src/test/ui/macro_backtrace/main.default.stderr
@@ -0,0 +1,35 @@
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
+  --> $DIR/main.rs:10:20
+   |
+LL |     () => { syntax error };
+   |                    ^^^^^ expected one of 8 possible tokens
+...
+LL |     pong!();
+   |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
+  --> $DIR/main.rs:10:20
+   |
+LL |     () => { syntax error };
+   |                    ^^^^^ expected one of 8 possible tokens
+...
+LL |     ping!();
+   |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
+  --> $DIR/main.rs:10:20
+   |
+LL |     () => { syntax error };
+   |                    ^^^^^ expected one of 8 possible tokens
+...
+LL |     deep!();
+   |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/macro_backtrace/main.rs b/src/test/ui/macro_backtrace/main.rs
index 8fcd497f87..6cee3b4cd9 100644
--- a/src/test/ui/macro_backtrace/main.rs
+++ b/src/test/ui/macro_backtrace/main.rs
@@ -1,6 +1,7 @@
 // Test that the macro backtrace facility works
 // aux-build:ping.rs
-// compile-flags: -Z external-macro-backtrace
+// revisions: default -Zmacro-backtrace
+//[-Zmacro-backtrace] compile-flags: -Z macro-backtrace
 
 #[macro_use] extern crate ping;
 
diff --git a/src/test/ui/macro_backtrace/main.stderr b/src/test/ui/macro_backtrace/main.stderr
deleted file mode 100644
index c4950e0fdf..0000000000
--- a/src/test/ui/macro_backtrace/main.stderr
+++ /dev/null
@@ -1,78 +0,0 @@
-error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:9:20
-   |
-LL | / macro_rules! pong {
-LL | |     () => { syntax error };
-   | |                    ^^^^^ expected one of 8 possible tokens
-LL | | }
-   | |_- in this expansion of `pong!`
-...
-LL |       pong!();
-   |       -------- in this macro invocation
-
-error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:9:20
-   |
-LL | / macro_rules! pong {
-LL | |     () => { syntax error };
-   | |                    ^^^^^ expected one of 8 possible tokens
-LL | | }
-   | |_- in this expansion of `pong!`
-...
-LL |       ping!();
-   |       -------- in this macro invocation
-   | 
-  ::: <::ping::ping macros>:1:1
-   |
-LL |   () => { pong ! () ; }
-   |   ---------------------
-   |   |       |
-   |   |       in this macro invocation
-   |   in this expansion of `ping!`
-
-error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `error`
-  --> $DIR/main.rs:9:20
-   |
-LL | / macro_rules! pong {
-LL | |     () => { syntax error };
-   | |                    ^^^^^ expected one of 8 possible tokens
-LL | | }
-   | |_- in this expansion of `pong!` (#5)
-...
-LL |       deep!();
-   |       -------- in this macro invocation (#1)
-   | 
-  ::: <::ping::deep macros>:1:1
-   |
-LL |   () => { foo ! () ; }
-   |   --------------------
-   |   |       |
-   |   |       in this macro invocation (#2)
-   |   in this expansion of `deep!` (#1)
-   | 
-  ::: <::ping::foo macros>:1:1
-   |
-LL |   () => { bar ! () ; }
-   |   --------------------
-   |   |       |
-   |   |       in this macro invocation (#3)
-   |   in this expansion of `foo!` (#2)
-   | 
-  ::: <::ping::bar macros>:1:1
-   |
-LL |   () => { ping ! () ; }
-   |   ---------------------
-   |   |       |
-   |   |       in this macro invocation (#4)
-   |   in this expansion of `bar!` (#3)
-   | 
-  ::: <::ping::ping macros>:1:1
-   |
-LL |   () => { pong ! () ; }
-   |   ---------------------
-   |   |       |
-   |   |       in this macro invocation (#5)
-   |   in this expansion of `ping!` (#4)
-
-error: aborting due to 3 previous errors
-
diff --git a/src/test/ui/macros/assert-trailing-junk.rs b/src/test/ui/macros/assert-trailing-junk.rs
index 676ae05bf0..cd7faf9bf8 100644
--- a/src/test/ui/macros/assert-trailing-junk.rs
+++ b/src/test/ui/macros/assert-trailing-junk.rs
@@ -13,12 +13,12 @@ fn main() {
     //~^ ERROR no rules expected
 
     assert!(true "whatever" blah);
-    //~^ WARN unexpected string literal
+    //~^ ERROR unexpected string literal
     //~^^ ERROR no rules expected
 
     assert!(true;);
-    //~^ WARN macro requires an expression
+    //~^ ERROR macro requires an expression
 
     assert!(false || true "error message");
-    //~^ WARN unexpected string literal
+    //~^ ERROR unexpected string literal
 }
diff --git a/src/test/ui/macros/assert-trailing-junk.stderr b/src/test/ui/macros/assert-trailing-junk.stderr
index 4d18a531a8..84a6768b3f 100644
--- a/src/test/ui/macros/assert-trailing-junk.stderr
+++ b/src/test/ui/macros/assert-trailing-junk.stderr
@@ -18,15 +18,13 @@ LL |     assert!(true, "whatever" blah);
    |                             |
    |                             help: missing comma here
 
-warning: unexpected string literal
+error: unexpected string literal
   --> $DIR/assert-trailing-junk.rs:15:18
    |
 LL |     assert!(true "whatever" blah);
    |                 -^^^^^^^^^^
    |                 |
    |                 help: try adding a comma
-   |
-   = note: this is going to be an error in the future
 
 error: no rules expected the token `blah`
   --> $DIR/assert-trailing-junk.rs:15:29
@@ -36,25 +34,21 @@ LL |     assert!(true "whatever" blah);
    |                            |
    |                            help: missing comma here
 
-warning: macro requires an expression as an argument
+error: macro requires an expression as an argument
   --> $DIR/assert-trailing-junk.rs:19:5
    |
 LL |     assert!(true;);
    |     ^^^^^^^^^^^^-^^
    |                 |
    |                 help: try removing semicolon
-   |
-   = note: this is going to be an error in the future
 
-warning: unexpected string literal
+error: unexpected string literal
   --> $DIR/assert-trailing-junk.rs:22:27
    |
 LL |     assert!(false || true "error message");
    |                          -^^^^^^^^^^^^^^^
    |                          |
    |                          help: try adding a comma
-   |
-   = note: this is going to be an error in the future
 
-error: aborting due to 4 previous errors
+error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/macros/assert.stderr b/src/test/ui/macros/assert.stderr
index fa604506b9..8aa7c33185 100644
--- a/src/test/ui/macros/assert.stderr
+++ b/src/test/ui/macros/assert.stderr
@@ -16,7 +16,7 @@ error: macro requires a boolean expression as an argument
 LL |     debug_assert!();
    |     ^^^^^^^^^^^^^^^^ boolean expression required
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected expression, found keyword `struct`
   --> $DIR/assert.rs:5:19
diff --git a/src/test/ui/macros/cfg.stderr b/src/test/ui/macros/cfg.stderr
index 0fdb62922a..bbfc5e27fe 100644
--- a/src/test/ui/macros/cfg.stderr
+++ b/src/test/ui/macros/cfg.stderr
@@ -3,6 +3,8 @@ error: macro requires a cfg-pattern as an argument
    |
 LL |     cfg!();
    |     ^^^^^^^ cfg-pattern required
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected identifier, found `123`
   --> $DIR/cfg.rs:3:10
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr b/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
index 0e2fb4c8af..5943a25257 100644
--- a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
+++ b/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
@@ -12,6 +12,7 @@ LL | |     }
 LL |       format_args!(hang!());
    |                    ------- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you might be missing a string literal to format with
    |
 LL |     format_args!("{}", hang!());
diff --git a/src/test/ui/macros/format-parse-errors.stderr b/src/test/ui/macros/format-parse-errors.stderr
index 02b704299f..66cffbfa18 100644
--- a/src/test/ui/macros/format-parse-errors.stderr
+++ b/src/test/ui/macros/format-parse-errors.stderr
@@ -4,7 +4,7 @@ error: requires at least a format string argument
 LL |     format!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected expression, found keyword `struct`
   --> $DIR/format-parse-errors.rs:5:13
diff --git a/src/test/ui/macros/issue-54441.rs b/src/test/ui/macros/issue-54441.rs
index afdf76b7b5..b24d7e1f6b 100644
--- a/src/test/ui/macros/issue-54441.rs
+++ b/src/test/ui/macros/issue-54441.rs
@@ -1,6 +1,6 @@
 macro_rules! m {
     () => {
-        let //~ ERROR expected
+        let //~ ERROR macro expansion ignores token `let` and any following
     };
 }
 
diff --git a/src/test/ui/macros/issue-54441.stderr b/src/test/ui/macros/issue-54441.stderr
index 1139ef06a1..752916e665 100644
--- a/src/test/ui/macros/issue-54441.stderr
+++ b/src/test/ui/macros/issue-54441.stderr
@@ -1,11 +1,13 @@
-error: expected one of `crate`, `fn`, `pub`, `static`, or `type`, found keyword `let`
+error: macro expansion ignores token `let` and any following
   --> $DIR/issue-54441.rs:3:9
    |
 LL |         let
-   |         ^^^ expected one of `crate`, `fn`, `pub`, `static`, or `type`
+   |         ^^^
 ...
 LL |     m!();
-   |     ----- in this macro invocation
+   |     ----- caused by the macro expansion here
+   |
+   = note: the usage of `m!` is likely invalid in foreign item context
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/issue-61053-different-kleene.stderr b/src/test/ui/macros/issue-61053-different-kleene.stderr
index 86474822a0..aa8bac13b6 100644
--- a/src/test/ui/macros/issue-61053-different-kleene.stderr
+++ b/src/test/ui/macros/issue-61053-different-kleene.stderr
@@ -4,7 +4,7 @@ error: meta-variable repeats with different Kleene operator
 LL |     ( $( $i:ident = $($j:ident),+ );* ) => { $( $( $i = $j; )* )* };
    |                                 - expected repetition   ^^   - conflicting repetition
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-61053-different-kleene.rs:1:9
    |
 LL | #![deny(meta_variable_misuse)]
diff --git a/src/test/ui/macros/issue-61053-duplicate-binder.stderr b/src/test/ui/macros/issue-61053-duplicate-binder.stderr
index fbd67b6c1e..5a2af45d07 100644
--- a/src/test/ui/macros/issue-61053-duplicate-binder.stderr
+++ b/src/test/ui/macros/issue-61053-duplicate-binder.stderr
@@ -6,7 +6,7 @@ LL |             ($x:tt $x:tt) => { $x };
    |              |
    |              previous declaration
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-61053-duplicate-binder.rs:1:9
    |
 LL | #![deny(meta_variable_misuse)]
diff --git a/src/test/ui/macros/issue-61053-missing-repetition.stderr b/src/test/ui/macros/issue-61053-missing-repetition.stderr
index 6f89e276c1..738f711f04 100644
--- a/src/test/ui/macros/issue-61053-missing-repetition.stderr
+++ b/src/test/ui/macros/issue-61053-missing-repetition.stderr
@@ -6,7 +6,7 @@ LL |     ($( $i:ident = $($j:ident),+ );*) => { $( $i = $j; )* };
    |                                |
    |                                expected repetition
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-61053-missing-repetition.rs:1:9
    |
 LL | #![deny(meta_variable_misuse)]
diff --git a/src/test/ui/macros/issue-61053-unbound.stderr b/src/test/ui/macros/issue-61053-unbound.stderr
index 0fc0a7e283..0d64effc96 100644
--- a/src/test/ui/macros/issue-61053-unbound.stderr
+++ b/src/test/ui/macros/issue-61053-unbound.stderr
@@ -4,7 +4,7 @@ error: unknown macro variable `k`
 LL |     ($( $i:ident = $($j:ident),+ );*) => { $( $( $i = $k; )+ )* };
    |                                                       ^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-61053-unbound.rs:1:9
    |
 LL | #![deny(meta_variable_misuse)]
diff --git a/src/test/ui/macros/issue-68060.rs b/src/test/ui/macros/issue-68060.rs
new file mode 100644
index 0000000000..85ebd66b66
--- /dev/null
+++ b/src/test/ui/macros/issue-68060.rs
@@ -0,0 +1,16 @@
+// build-fail
+
+#![feature(track_caller)]
+
+fn main() {
+    (0..)
+        .map(
+            #[target_feature(enable = "")]
+            //~^ ERROR: the feature named `` is not valid for this target
+            //~| ERROR: `#[target_feature(..)]` can only be applied to `unsafe` functions
+            #[track_caller]
+            //~^ ERROR: `#[track_caller]` requires Rust ABI
+            |_| (),
+        )
+        .next();
+}
diff --git a/src/test/ui/macros/issue-68060.stderr b/src/test/ui/macros/issue-68060.stderr
new file mode 100644
index 0000000000..230867410d
--- /dev/null
+++ b/src/test/ui/macros/issue-68060.stderr
@@ -0,0 +1,24 @@
+error: `#[target_feature(..)]` can only be applied to `unsafe` functions
+  --> $DIR/issue-68060.rs:8:13
+   |
+LL |             #[target_feature(enable = "")]
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can only be applied to `unsafe` functions
+...
+LL |             |_| (),
+   |             ------ not an `unsafe` function
+
+error: the feature named `` is not valid for this target
+  --> $DIR/issue-68060.rs:8:30
+   |
+LL |             #[target_feature(enable = "")]
+   |                              ^^^^^^^^^^^ `` is not valid for this target
+
+error[E0737]: `#[track_caller]` requires Rust ABI
+  --> $DIR/issue-68060.rs:11:13
+   |
+LL |             #[track_caller]
+   |             ^^^^^^^^^^^^^^^
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0737`.
diff --git a/src/test/ui/macros/issue-70446.rs b/src/test/ui/macros/issue-70446.rs
new file mode 100644
index 0000000000..407094d55f
--- /dev/null
+++ b/src/test/ui/macros/issue-70446.rs
@@ -0,0 +1,13 @@
+// check-pass
+
+macro_rules! foo {
+    ($(: $p:path)? $(: $l:lifetime)? ) => { bar! {$(: $p)? $(: $l)? } };
+}
+
+macro_rules! bar {
+    ($(: $p:path)? $(: $l:lifetime)? ) => {};
+}
+
+foo! {: 'a }
+
+fn main() {}
diff --git a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
index 85dee9f24f..2ce565936f 100644
--- a/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
+++ b/src/test/ui/macros/macro-backtrace-invalid-internals.stderr
@@ -6,6 +6,8 @@ LL |           1.fake()
 ...
 LL |     fake_method_stmt!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
   --> $DIR/macro-backtrace-invalid-internals.rs:11:13
@@ -15,6 +17,8 @@ LL |           1.fake
 ...
 LL |     fake_field_stmt!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
   --> $DIR/macro-backtrace-invalid-internals.rs:17:15
@@ -24,6 +28,8 @@ LL |           (1).0
 ...
 LL |     fake_anon_field_stmt!();
    |     ------------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0689]: can't call method `neg` on ambiguous numeric type `{float}`
   --> $DIR/macro-backtrace-invalid-internals.rs:41:15
@@ -34,6 +40,7 @@ LL |           2.0.neg()
 LL |     real_method_stmt!();
    |     -------------------- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you must specify a concrete type for this numeric value, like `f32`
    |
 LL |           2.0_f32.neg()
@@ -47,6 +54,8 @@ LL |           1.fake()
 ...
 LL |     let _ = fake_method_expr!();
    |             ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
   --> $DIR/macro-backtrace-invalid-internals.rs:29:13
@@ -56,6 +65,8 @@ LL |           1.fake
 ...
 LL |     let _ = fake_field_expr!();
    |             ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
   --> $DIR/macro-backtrace-invalid-internals.rs:35:15
@@ -65,6 +76,8 @@ LL |           (1).0
 ...
 LL |     let _ = fake_anon_field_expr!();
    |             ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0689]: can't call method `neg` on ambiguous numeric type `{float}`
   --> $DIR/macro-backtrace-invalid-internals.rs:47:15
@@ -75,6 +88,7 @@ LL |           2.0.neg()
 LL |     let _ = real_method_expr!();
    |             ------------------- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you must specify a concrete type for this numeric value, like `f32`
    |
 LL |           2.0_f32.neg()
diff --git a/src/test/ui/macros/macro-backtrace-nested.stderr b/src/test/ui/macros/macro-backtrace-nested.stderr
index 501f525a05..8d36638336 100644
--- a/src/test/ui/macros/macro-backtrace-nested.stderr
+++ b/src/test/ui/macros/macro-backtrace-nested.stderr
@@ -6,6 +6,8 @@ LL |     () => (fake)
 ...
 LL |     1 + call_nested_expr!();
    |         ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `fake` in this scope
   --> $DIR/macro-backtrace-nested.rs:5:12
@@ -15,6 +17,8 @@ LL |     () => (fake)
 ...
 LL |     call_nested_expr_sum!();
    |     ------------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/macros/macro-backtrace-println.stderr b/src/test/ui/macros/macro-backtrace-println.stderr
index 209ff09aea..b4194a833a 100644
--- a/src/test/ui/macros/macro-backtrace-println.stderr
+++ b/src/test/ui/macros/macro-backtrace-println.stderr
@@ -6,6 +6,8 @@ LL |     ($fmt:expr) => (myprint!(concat!($fmt, "\n")));
 ...
 LL |     myprintln!("{}");
    |     ----------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/macro-context.stderr b/src/test/ui/macros/macro-context.stderr
index 2a0779190f..2e71211068 100644
--- a/src/test/ui/macros/macro-context.stderr
+++ b/src/test/ui/macros/macro-context.stderr
@@ -39,6 +39,8 @@ LL |     () => ( i ; typeof );
 ...
 LL |     m!();
    |     ----- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/macros/macro-lifetime-used-with-labels.stderr b/src/test/ui/macros/macro-lifetime-used-with-labels.stderr
index 05418d9bdd..162b337bbe 100644
--- a/src/test/ui/macros/macro-lifetime-used-with-labels.stderr
+++ b/src/test/ui/macros/macro-lifetime-used-with-labels.stderr
@@ -8,4 +8,6 @@ LL |     'b: loop {
    |     -- first declared here
 LL |         br2!('b);
    |         --------- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/macros/macro-local-data-key-priv.stderr b/src/test/ui/macros/macro-local-data-key-priv.stderr
index 72994d1652..c53a09aad5 100644
--- a/src/test/ui/macros/macro-local-data-key-priv.stderr
+++ b/src/test/ui/macros/macro-local-data-key-priv.stderr
@@ -9,7 +9,7 @@ note: the constant `baz` is defined here
    |
 LL |     thread_local!(static baz: f64 = 0.0);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/macro-shadowing.stderr b/src/test/ui/macros/macro-shadowing.stderr
index 033e12a31a..461e71471f 100644
--- a/src/test/ui/macros/macro-shadowing.stderr
+++ b/src/test/ui/macros/macro-shadowing.stderr
@@ -8,6 +8,7 @@ LL | m1!();
    | ------ in this macro invocation
    |
    = note: macro-expanded `#[macro_use]`s may not shadow existing macros (see RFC 1560)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `foo` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/macro-shadowing.rs:17:1
@@ -28,6 +29,7 @@ note: `foo` could also refer to the macro defined here
    |
 LL | macro_rules! foo { () => {} }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/macros/macro-use-all-and-none.stderr b/src/test/ui/macros/macro-use-all-and-none.stderr
index e7de7e7ad0..cbabf0672f 100644
--- a/src/test/ui/macros/macro-use-all-and-none.stderr
+++ b/src/test/ui/macros/macro-use-all-and-none.stderr
@@ -4,7 +4,7 @@ warning: unused attribute
 LL | #[macro_use()]
    | ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/macro-use-all-and-none.rs:4:9
    |
 LL | #![warn(unused_attributes)]
diff --git a/src/test/ui/macros/macros-nonfatal-errors.stderr b/src/test/ui/macros/macros-nonfatal-errors.stderr
index d29e6b4d46..1ab6b79a61 100644
--- a/src/test/ui/macros/macros-nonfatal-errors.stderr
+++ b/src/test/ui/macros/macros-nonfatal-errors.stderr
@@ -3,6 +3,8 @@ error[E0665]: `Default` cannot be derived for enums, only structs
    |
 LL | #[derive(Default)]
    |          ^^^^^^^
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: inline assembly must be a string literal
   --> $DIR/macros-nonfatal-errors.rs:13:10
@@ -68,6 +70,8 @@ error: couldn't read $DIR/i'd be quite surprised if a file with this name existe
    |
 LL |     include_str!("i'd be quite surprised if a file with this name existed");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: argument must be a string literal
   --> $DIR/macros-nonfatal-errors.rs:28:20
@@ -80,6 +84,8 @@ error: couldn't read $DIR/i'd be quite surprised if a file with this name existe
    |
 LL |     include_bytes!("i'd be quite surprised if a file with this name existed");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trace_macros! accepts only `true` or `false`
   --> $DIR/macros-nonfatal-errors.rs:31:5
diff --git a/src/test/ui/macros/must-use-in-macro-55516.stderr b/src/test/ui/macros/must-use-in-macro-55516.stderr
index 302c8aa7e6..e3649e32d7 100644
--- a/src/test/ui/macros/must-use-in-macro-55516.stderr
+++ b/src/test/ui/macros/must-use-in-macro-55516.stderr
@@ -6,5 +6,5 @@ LL |     write!(&mut example, "{}", 42);
    |
    = note: `-W unused-must-use` implied by `-W unused`
    = note: this `Result` may be an `Err` variant, which should be handled
-   = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/macros/nonterminal-matching.stderr b/src/test/ui/macros/nonterminal-matching.stderr
index 93cc97d458..9521322f5c 100644
--- a/src/test/ui/macros/nonterminal-matching.stderr
+++ b/src/test/ui/macros/nonterminal-matching.stderr
@@ -9,6 +9,8 @@ LL |     n!(a $nt_item b);
 ...
 LL | complex_nonterminal!(enum E {});
    | -------------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/restricted-shadowing-legacy.stderr b/src/test/ui/macros/restricted-shadowing-legacy.stderr
index 8378286bda..662266013d 100644
--- a/src/test/ui/macros/restricted-shadowing-legacy.stderr
+++ b/src/test/ui/macros/restricted-shadowing-legacy.stderr
@@ -23,6 +23,7 @@ LL |         macro_rules! m { () => {} }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:139:42
@@ -49,6 +50,7 @@ LL |         macro_rules! m { () => {} }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:148:9
@@ -75,6 +77,7 @@ LL |         macro_rules! m { () => {} }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:164:9
@@ -101,6 +104,7 @@ LL |         macro_rules! m { () => { Wrong } }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:180:13
@@ -127,6 +131,7 @@ LL |         macro_rules! m { () => { Wrong } }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:218:42
@@ -153,6 +158,7 @@ LL |         macro_rules! m { () => { Wrong } }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:232:9
@@ -179,6 +185,7 @@ LL |             macro_rules! m { () => {} }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-legacy.rs:262:42
@@ -205,6 +212,7 @@ LL |             macro_rules! m { () => {} }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/macros/restricted-shadowing-modern.stderr b/src/test/ui/macros/restricted-shadowing-modern.stderr
index 12075d42b9..609f0b6b18 100644
--- a/src/test/ui/macros/restricted-shadowing-modern.stderr
+++ b/src/test/ui/macros/restricted-shadowing-modern.stderr
@@ -23,6 +23,7 @@ LL |         macro m() {}
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-modern.rs:147:33
@@ -49,6 +50,7 @@ LL |         macro m() {}
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-modern.rs:156:13
@@ -75,6 +77,7 @@ LL |         macro m() {}
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-modern.rs:172:13
@@ -101,6 +104,7 @@ LL |         macro m() { Wrong }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-modern.rs:190:17
@@ -127,6 +131,7 @@ LL |         macro m() { Wrong }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `m` is ambiguous (macro-expanded name vs less macro-expanded name from outer scope during import/macro resolution)
   --> $DIR/restricted-shadowing-modern.rs:233:33
@@ -153,6 +158,7 @@ LL |         macro m() { Wrong }
 ...
 LL | include!();
    | ----------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/macros/same-sequence-span.stderr b/src/test/ui/macros/same-sequence-span.stderr
index 896f579765..65b67a9423 100644
--- a/src/test/ui/macros/same-sequence-span.stderr
+++ b/src/test/ui/macros/same-sequence-span.stderr
@@ -28,17 +28,16 @@ LL | | fn main() {}
 ...  |
    |
    = note: allowed there are: `=>`, `,` or `;`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `$x:expr` may be followed by `=`, which is not allowed for `expr` fragments
   --> $DIR/same-sequence-span.rs:19:1
    |
 LL | proc_macro_sequence::make_foo!();
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   | |
-   | not allowed after `expr` fragments
-   | in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not allowed after `expr` fragments
    |
    = note: allowed there are: `=>`, `,` or `;`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/macros/span-covering-argument-1.stderr b/src/test/ui/macros/span-covering-argument-1.stderr
index 2ac881107b..efb8f61e46 100644
--- a/src/test/ui/macros/span-covering-argument-1.stderr
+++ b/src/test/ui/macros/span-covering-argument-1.stderr
@@ -8,6 +8,8 @@ LL |             *&mut $s = 0;
 ...
 LL |     bad!(foo whatever);
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/trace_faulty_macros.stderr b/src/test/ui/macros/trace_faulty_macros.stderr
index 4e86daffb6..a18e22e07f 100644
--- a/src/test/ui/macros/trace_faulty_macros.stderr
+++ b/src/test/ui/macros/trace_faulty_macros.stderr
@@ -9,6 +9,8 @@ LL |         my_faulty_macro!(bcd);
 ...
 LL |     my_faulty_macro!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: trace_macro
   --> $DIR/trace_faulty_macros.rs:33:5
@@ -29,7 +31,8 @@ LL |         my_recursive_macro!();
 LL |     my_recursive_macro!();
    |     ---------------------- in this macro invocation
    |
-   = help: consider adding a `#![recursion_limit="8"]` attribute to your crate
+   = help: consider adding a `#![recursion_limit="8"]` attribute to your crate (`trace_faulty_macros`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 note: trace_macro
   --> $DIR/trace_faulty_macros.rs:34:5
diff --git a/src/test/ui/malformed/malformed-derive-entry.stderr b/src/test/ui/malformed/malformed-derive-entry.stderr
index 1f1ee39b04..ddc75c905a 100644
--- a/src/test/ui/malformed/malformed-derive-entry.stderr
+++ b/src/test/ui/malformed/malformed-derive-entry.stderr
@@ -21,12 +21,16 @@ error[E0277]: the trait bound `Test1: std::clone::Clone` is not satisfied
    |
 LL | #[derive(Copy(Bad))]
    |          ^^^^ the trait `std::clone::Clone` is not implemented for `Test1`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Test2: std::clone::Clone` is not satisfied
   --> $DIR/malformed-derive-entry.rs:6:10
    |
 LL | #[derive(Copy="bad")]
    |          ^^^^ the trait `std::clone::Clone` is not implemented for `Test2`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/malformed/malformed-interpolated.stderr b/src/test/ui/malformed/malformed-interpolated.stderr
index 6f6ad4508b..d1be82cf7b 100644
--- a/src/test/ui/malformed/malformed-interpolated.stderr
+++ b/src/test/ui/malformed/malformed-interpolated.stderr
@@ -14,6 +14,8 @@ LL |         #[rustc_dummy = $expr]
 ...
 LL | check!(-0); // ERROR, see above
    | ----------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unexpected token: `0 + 0`
   --> $DIR/malformed-interpolated.rs:5:25
@@ -23,6 +25,8 @@ LL |         #[rustc_dummy = $expr]
 ...
 LL | check!(0 + 0); // ERROR, see above
    | -------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/match/match-arm-resolving-to-never.stderr b/src/test/ui/match/match-arm-resolving-to-never.stderr
index 3a723de9f6..686fbd0baa 100644
--- a/src/test/ui/match/match-arm-resolving-to-never.stderr
+++ b/src/test/ui/match/match-arm-resolving-to-never.stderr
@@ -12,8 +12,6 @@ LL | |         E::F => "",
    | |                 ^^ expected integer, found `&str`
 LL | |     };
    | |_____- `match` arms have incompatible types
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/match/match-ill-type2.stderr b/src/test/ui/match/match-ill-type2.stderr
index 1cf61ebad4..5078f03d60 100644
--- a/src/test/ui/match/match-ill-type2.stderr
+++ b/src/test/ui/match/match-ill-type2.stderr
@@ -1,6 +1,9 @@
 error[E0308]: mismatched types
   --> $DIR/match-ill-type2.rs:4:9
    |
+LL |     match 1i32 {
+   |           ---- this expression has type `i32`
+LL |         1i32 => 1,
 LL |         2u32 => 1,
    |         ^^^^ expected `i32`, found `u32`
 
diff --git a/src/test/ui/match/match-no-arms-unreachable-after.stderr b/src/test/ui/match/match-no-arms-unreachable-after.stderr
index 66e5c91ad2..a0a3697266 100644
--- a/src/test/ui/match/match-no-arms-unreachable-after.stderr
+++ b/src/test/ui/match/match-no-arms-unreachable-after.stderr
@@ -6,7 +6,7 @@ LL |     match v { }
 LL |     let x = 2;
    |     ^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-no-arms-unreachable-after.rs:2:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/match/match-tag-nullary.stderr b/src/test/ui/match/match-tag-nullary.stderr
index 4b6260b219..723c7fa92b 100644
--- a/src/test/ui/match/match-tag-nullary.stderr
+++ b/src/test/ui/match/match-tag-nullary.stderr
@@ -1,8 +1,13 @@
 error[E0308]: mismatched types
   --> $DIR/match-tag-nullary.rs:4:40
    |
+LL | enum B { B }
+   |          - unit variant defined here
+LL | 
 LL | fn main() { let x: A = A::A; match x { B::B => { } } }
-   |                                        ^^^^ expected enum `A`, found enum `B`
+   |                                    -   ^^^^ expected enum `A`, found enum `B`
+   |                                    |
+   |                                    this expression has type `A`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/methods/assign-to-method.rs b/src/test/ui/methods/assign-to-method.rs
new file mode 100644
index 0000000000..85beaee8df
--- /dev/null
+++ b/src/test/ui/methods/assign-to-method.rs
@@ -0,0 +1,24 @@
+// compile-flags: -Zsave-analysis
+// Also regression test for #69409
+
+struct Cat {
+    meows : usize,
+    how_hungry : isize,
+}
+
+impl Cat {
+    pub fn speak(&self) { self.meows += 1; }
+}
+
+fn cat(in_x : usize, in_y : isize) -> Cat {
+    Cat {
+        meows: in_x,
+        how_hungry: in_y
+    }
+}
+
+fn main() {
+    let nyan : Cat = cat(52, 99);
+    nyan.speak = || println!("meow"); //~ ERROR attempted to take value of method
+    nyan.speak += || println!("meow"); //~ ERROR attempted to take value of method
+}
diff --git a/src/test/ui/methods/assign-to-method.stderr b/src/test/ui/methods/assign-to-method.stderr
new file mode 100644
index 0000000000..c0dd529b68
--- /dev/null
+++ b/src/test/ui/methods/assign-to-method.stderr
@@ -0,0 +1,19 @@
+error[E0615]: attempted to take value of method `speak` on type `Cat`
+  --> $DIR/assign-to-method.rs:22:10
+   |
+LL |     nyan.speak = || println!("meow");
+   |          ^^^^^
+   |
+   = help: methods are immutable and cannot be assigned to
+
+error[E0615]: attempted to take value of method `speak` on type `Cat`
+  --> $DIR/assign-to-method.rs:23:10
+   |
+LL |     nyan.speak += || println!("meow");
+   |          ^^^^^
+   |
+   = help: methods are immutable and cannot be assigned to
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0615`.
diff --git a/src/test/ui/methods/method-call-err-msg.rs b/src/test/ui/methods/method-call-err-msg.rs
index 5ff4b41266..9bfacc7bab 100644
--- a/src/test/ui/methods/method-call-err-msg.rs
+++ b/src/test/ui/methods/method-call-err-msg.rs
@@ -5,16 +5,18 @@ impl Foo {
     fn zero(self) -> Foo { self }
     fn one(self, _: isize) -> Foo { self }
     fn two(self, _: isize, _: isize) -> Foo { self }
+    fn three<T>(self, _: T, _: T, _: T) -> Foo { self }
 }
 
 fn main() {
     let x = Foo;
-    x.zero(0)   //~ ERROR this function takes 0 parameters but 1 parameter was supplied
-     .one()     //~ ERROR this function takes 1 parameter but 0 parameters were supplied
-     .two(0);   //~ ERROR this function takes 2 parameters but 1 parameter was supplied
+    x.zero(0)   //~ ERROR this function takes 0 arguments but 1 argument was supplied
+     .one()     //~ ERROR this function takes 1 argument but 0 arguments were supplied
+     .two(0);   //~ ERROR this function takes 2 arguments but 1 argument was supplied
 
     let y = Foo;
     y.zero()
      .take()    //~ ERROR no method named `take` found
      .one(0);
+    y.three::<usize>(); //~ ERROR this function takes 3 arguments but 0 arguments were supplied
 }
diff --git a/src/test/ui/methods/method-call-err-msg.stderr b/src/test/ui/methods/method-call-err-msg.stderr
index 7efdd91708..4678642dd6 100644
--- a/src/test/ui/methods/method-call-err-msg.stderr
+++ b/src/test/ui/methods/method-call-err-msg.stderr
@@ -1,47 +1,67 @@
-error[E0061]: this function takes 0 parameters but 1 parameter was supplied
-  --> $DIR/method-call-err-msg.rs:12:7
+error[E0061]: this function takes 0 arguments but 1 argument was supplied
+  --> $DIR/method-call-err-msg.rs:13:7
    |
 LL |     fn zero(self) -> Foo { self }
    |     -------------------- defined here
 ...
 LL |     x.zero(0)
-   |       ^^^^ expected 0 parameters
+   |       ^^^^ - supplied 1 argument
+   |       |
+   |       expected 0 arguments
 
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
-  --> $DIR/method-call-err-msg.rs:13:7
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
+  --> $DIR/method-call-err-msg.rs:14:7
    |
 LL |     fn one(self, _: isize) -> Foo { self }
    |     ----------------------------- defined here
 ...
 LL |      .one()
-   |       ^^^ expected 1 parameter
+   |       ^^^- supplied 0 arguments
+   |       |
+   |       expected 1 argument
 
-error[E0061]: this function takes 2 parameters but 1 parameter was supplied
-  --> $DIR/method-call-err-msg.rs:14:7
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
+  --> $DIR/method-call-err-msg.rs:15:7
    |
 LL |     fn two(self, _: isize, _: isize) -> Foo { self }
    |     --------------------------------------- defined here
 ...
 LL |      .two(0);
-   |       ^^^ expected 2 parameters
+   |       ^^^ - supplied 1 argument
+   |       |
+   |       expected 2 arguments
 
 error[E0599]: no method named `take` found for struct `Foo` in the current scope
-  --> $DIR/method-call-err-msg.rs:18:7
+  --> $DIR/method-call-err-msg.rs:19:7
    |
 LL | pub struct Foo;
-   | --------------- method `take` not found for this
+   | ---------------
+   | |
+   | method `take` not found for this
+   | doesn't satisfy `Foo: std::iter::Iterator`
 ...
 LL |      .take()
    |       ^^^^ method not found in `Foo`
    |
    = note: the method `take` exists but the following trait bounds were not satisfied:
-           `&mut Foo : std::iter::Iterator`
+           `Foo: std::iter::Iterator`
+           which is required by `&mut Foo: std::iter::Iterator`
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following traits define an item `take`, perhaps you need to implement one of them:
-           candidate #1: `std::io::Read`
-           candidate #2: `std::iter::Iterator`
+   = note: the following trait defines an item `take`, perhaps you need to implement it:
+           candidate #1: `std::iter::Iterator`
+
+error[E0061]: this function takes 3 arguments but 0 arguments were supplied
+  --> $DIR/method-call-err-msg.rs:21:7
+   |
+LL |     fn three<T>(self, _: T, _: T, _: T) -> Foo { self }
+   |     ------------------------------------------ defined here
+...
+LL |     y.three::<usize>();
+   |       ^^^^^--------- supplied 0 arguments
+   |       |
+   |       expected 3 arguments
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
 
 Some errors have detailed explanations: E0061, E0599.
 For more information about an error, try `rustc --explain E0061`.
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr b/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr
index b510a08ae3..9e07d5ea31 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr
+++ b/src/test/ui/methods/method-call-lifetime-args-lint-fail.stderr
@@ -7,7 +7,7 @@ LL |     fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {}
 LL |     S.late::<'static>(&0, &0);
    |              ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/method-call-lifetime-args-lint-fail.rs:1:9
    |
 LL | #![deny(late_bound_lifetime_arguments)]
diff --git a/src/test/ui/methods/method-call-lifetime-args-lint.stderr b/src/test/ui/methods/method-call-lifetime-args-lint.stderr
index eb1d4fe2e5..f31f510a3a 100644
--- a/src/test/ui/methods/method-call-lifetime-args-lint.stderr
+++ b/src/test/ui/methods/method-call-lifetime-args-lint.stderr
@@ -7,7 +7,7 @@ LL |     fn late<'a, 'b>(self, _: &'a u8, _: &'b u8) {}
 LL |     S.late::<'static>(&0, &0);
    |              ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/method-call-lifetime-args-lint.rs:1:9
    |
 LL | #![deny(late_bound_lifetime_arguments)]
diff --git a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr b/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr
index d9e250882e..10950834ad 100644
--- a/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr
+++ b/src/test/ui/methods/method-on-ambiguous-numeric-type.stderr
@@ -46,8 +46,6 @@ LL |     mac!(bar);
    |     ---------- you must specify a type for this binding, like `i32`
 LL |     bar.pow(2);
    |         ^^^
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/minus-string.stderr b/src/test/ui/minus-string.stderr
index 9177082cf0..3fbec7c89c 100644
--- a/src/test/ui/minus-string.stderr
+++ b/src/test/ui/minus-string.stderr
@@ -3,8 +3,6 @@ error[E0600]: cannot apply unary operator `-` to type `std::string::String`
    |
 LL | fn main() { -"foo".to_string(); }
    |             ^^^^^^^^^^^^^^^^^^ cannot apply unary operator `-`
-   |
-   = note: an implementation of `std::ops::Neg` might be missing for `std::string::String`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/mir-dataflow/indirect-mutation-offset.rs b/src/test/ui/mir-dataflow/indirect-mutation-offset.rs
index 8087a3e139..caa307e269 100644
--- a/src/test/ui/mir-dataflow/indirect-mutation-offset.rs
+++ b/src/test/ui/mir-dataflow/indirect-mutation-offset.rs
@@ -1,5 +1,12 @@
 // compile-flags: -Zunleash-the-miri-inside-of-you
 
+// This test demonstrates a shortcoming of the `MaybeMutBorrowedLocals` analysis. It does not
+// handle code that takes a reference to one field of a struct, then use pointer arithmetic to
+// transform it to another field of that same struct that may have interior mutability. For now,
+// this is UB, but this may change in the future. See [rust-lang/unsafe-code-guidelines#134].
+//
+// [rust-lang/unsafe-code-guidelines#134]: https://github.com/rust-lang/unsafe-code-guidelines/issues/134
+
 #![feature(core_intrinsics, rustc_attrs, const_raw_ptr_deref)]
 
 use std::cell::UnsafeCell;
diff --git a/src/test/ui/mir-dataflow/indirect-mutation-offset.stderr b/src/test/ui/mir-dataflow/indirect-mutation-offset.stderr
index 0ae9a40c96..8d3548ecec 100644
--- a/src/test/ui/mir-dataflow/indirect-mutation-offset.stderr
+++ b/src/test/ui/mir-dataflow/indirect-mutation-offset.stderr
@@ -1,5 +1,5 @@
 error: rustc_peek: bit not set
-  --> $DIR/indirect-mutation-offset.rs:34:14
+  --> $DIR/indirect-mutation-offset.rs:41:14
    |
 LL |     unsafe { rustc_peek(x) };
    |              ^^^^^^^^^^^^^
diff --git a/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs b/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
new file mode 100644
index 0000000000..23cc114880
--- /dev/null
+++ b/src/test/ui/mir/mir-inlining/var-debuginfo-issue-67586.rs
@@ -0,0 +1,11 @@
+// run-pass
+// compile-flags: -Z mir-opt-level=2 -C opt-level=0 -C debuginfo=2
+
+#[inline(never)]
+pub fn foo(bar: usize) -> usize {
+    std::convert::identity(bar)
+}
+
+fn main() {
+    foo(0);
+}
diff --git a/src/test/ui/mir/mir_assign_eval_order.rs b/src/test/ui/mir/mir_assign_eval_order.rs
index 1594421b0b..799bf7f3a1 100644
--- a/src/test/ui/mir/mir_assign_eval_order.rs
+++ b/src/test/ui/mir/mir_assign_eval_order.rs
@@ -12,7 +12,7 @@ fn evaluate_reborrow_before_assign() {
     let y = &mut &2;
     let z = &3;
     // There's an implicit reborrow of `x` on the right-hand side of the
-    // assignement. Note that writing an explicit reborrow would not show this
+    // assignment. Note that writing an explicit reborrow would not show this
     // bug, as now there would be two reborrows on the right-hand side and at
     // least one of them would happen before the left-hand side is evaluated.
     *{ x = z; &mut *y } = x;
diff --git a/src/test/ui/mir/mir_raw_fat_ptr.rs b/src/test/ui/mir/mir_raw_fat_ptr.rs
index 6583852aa9..aa2b499b02 100644
--- a/src/test/ui/mir/mir_raw_fat_ptr.rs
+++ b/src/test/ui/mir/mir_raw_fat_ptr.rs
@@ -1,6 +1,7 @@
 // run-pass
 // check raw fat pointer ops in mir
 // FIXME: please improve this when we get monomorphization support
+#![feature(raw_ref_op)]
 
 use std::mem;
 
@@ -104,7 +105,7 @@ impl<T> Foo for T {
 
 struct S<T:?Sized>(u32, T);
 
-fn main() {
+fn main_ref() {
     let array = [0,1,2,3,4];
     let array2 = [5,6,7,8,9];
 
@@ -156,3 +157,59 @@ fn main() {
     assert!(simple_eq(&0u8 as *const _, &0u8 as *const _));
     assert!(!simple_eq(&0u8 as *const _, &1u8 as *const _));
 }
+
+// similar to above, but using &raw
+fn main_raw() {
+    let array = [0,1,2,3,4];
+    let array2 = [5,6,7,8,9];
+
+    // fat ptr comparison: addr then extra
+
+    // check ordering for arrays
+    let mut ptrs: Vec<*const [u8]> = vec![
+        &raw const array[0..0], &raw const array[0..1], &raw const array, &raw const array[1..]
+    ];
+
+    let array_addr = &raw const array as *const u8 as usize;
+    let array2_addr = &raw const array2 as *const u8 as usize;
+    if array2_addr < array_addr {
+        ptrs.insert(0, &raw const array2);
+    } else {
+        ptrs.push(&raw const array2);
+    }
+    assert_inorder(&ptrs, compare_au8);
+
+    let u8_ = (0u8, 1u8);
+    let u32_ = (4u32, 5u32);
+
+    // check ordering for ptrs
+    let buf: &mut [*const dyn Foo] = &mut [
+        &raw const u8_, &raw const u8_.0,
+        &raw const u32_, &raw const u32_.0,
+    ];
+    buf.sort_by(|u,v| {
+        let u : [*const (); 2] = unsafe { mem::transmute(*u) };
+        let v : [*const (); 2] = unsafe { mem::transmute(*v) };
+        u.cmp(&v)
+    });
+    assert_inorder(buf, compare_foo);
+
+    // check ordering for structs containing arrays
+    let ss: (S<[u8; 2]>,
+             S<[u8; 3]>,
+             S<[u8; 2]>) = (
+        S(7, [8, 9]),
+        S(10, [11, 12, 13]),
+        S(4, [5, 6])
+    );
+    assert_inorder(&[
+        &raw const ss.0 as *const S<[u8]>,
+        &raw const ss.1 as *const S<[u8]>,
+        &raw const ss.2 as *const S<[u8]>
+            ], compare_su8);
+}
+
+fn main() {
+    main_ref();
+    main_raw();
+}
diff --git a/src/test/ui/mismatched_types/E0409.stderr b/src/test/ui/mismatched_types/E0409.stderr
index 2306fb3527..ef03b67b1b 100644
--- a/src/test/ui/mismatched_types/E0409.stderr
+++ b/src/test/ui/mismatched_types/E0409.stderr
@@ -1,4 +1,4 @@
-error[E0409]: variable `y` is bound in inconsistent ways within the same match arm
+error[E0409]: variable `y` is bound inconsistently across alternatives separated by `|`
   --> $DIR/E0409.rs:5:23
    |
 LL |         (0, ref y) | (y, 0) => {}
@@ -12,7 +12,11 @@ error[E0308]: mismatched types
 LL |     match x {
    |           - this expression has type `({integer}, {integer})`
 LL |         (0, ref y) | (y, 0) => {}
-   |                       ^ expected `&{integer}`, found integer
+   |             -----     ^ expected `&{integer}`, found integer
+   |             |
+   |             first introduced with type `&{integer}` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/mismatched_types/const-fn-in-trait.stderr b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
index ec1f36bf08..817582df27 100644
--- a/src/test/ui/mismatched_types/const-fn-in-trait.stderr
+++ b/src/test/ui/mismatched_types/const-fn-in-trait.stderr
@@ -1,14 +1,14 @@
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/const-fn-in-trait.rs:7:5
    |
 LL |     const fn g();
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
-error[E0379]: trait fns cannot be declared const
+error[E0379]: functions in traits cannot be declared const
   --> $DIR/const-fn-in-trait.rs:11:5
    |
 LL |     const fn f() -> u32 { 22 }
-   |     ^^^^^ trait fns cannot be const
+   |     ^^^^^ functions in traits cannot be const
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/mismatched_types/issue-26480.stderr b/src/test/ui/mismatched_types/issue-26480.stderr
index d4dcb9a39a..69a9d03e47 100644
--- a/src/test/ui/mismatched_types/issue-26480.stderr
+++ b/src/test/ui/mismatched_types/issue-26480.stderr
@@ -7,6 +7,7 @@ LL |                   $arr.len() * size_of($arr[0]));
 LL |     write!(hello);
    |     -------------- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: you can convert an `usize` to `u64` and panic if the converted value wouldn't fit
    |
 LL |                   ($arr.len() * size_of($arr[0])).try_into().unwrap());
@@ -22,6 +23,7 @@ LL |     cast!(2);
    |     --------- in this macro invocation
    |
    = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/mismatched_types/issue-36053-2.rs b/src/test/ui/mismatched_types/issue-36053-2.rs
index 9035e3380b..36211b4ce7 100644
--- a/src/test/ui/mismatched_types/issue-36053-2.rs
+++ b/src/test/ui/mismatched_types/issue-36053-2.rs
@@ -1,3 +1,7 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
 // Regression test for #36053. ICE was caused due to obligations
 // being added to a special, dedicated fulfillment cx during
 // a probe.
diff --git a/src/test/ui/mismatched_types/issue-36053-2.stderr b/src/test/ui/mismatched_types/issue-36053-2.stderr
index f8d677b99d..f8c0470172 100644
--- a/src/test/ui/mismatched_types/issue-36053-2.stderr
+++ b/src/test/ui/mismatched_types/issue-36053-2.stderr
@@ -1,15 +1,27 @@
-error[E0599]: no method named `count` found for struct `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]>` in the current scope
-  --> $DIR/issue-36053-2.rs:7:55
+error[E0599]: no method named `count` found for struct `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:11:39: 11:53]>` in the current scope
+  --> $DIR/issue-36053-2.rs:11:55
    |
 LL |     once::<&str>("str").fuse().filter(|a: &str| true).count();
-   |                                                       ^^^^^ method not found in `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]>`
+   |                                       --------------  ^^^^^ method not found in `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:11:39: 11:53]>`
+   |                                       |
+   |                                       doesn't satisfy `<_ as std::ops::FnOnce<(&&str,)>>::Output = bool`
+   |                                       doesn't satisfy `_: std::ops::FnMut<(&&str,)>`
+   | 
+  ::: $SRC_DIR/libcore/iter/adapters/mod.rs:LL:COL
+   |
+LL | pub struct Filter<I, P> {
+   | ----------------------- doesn't satisfy `_: std::iter::Iterator`
    |
    = note: the method `count` exists but the following trait bounds were not satisfied:
-           `&mut std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]> : std::iter::Iterator`
-           `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:7:39: 7:53]> : std::iter::Iterator`
+           `<[closure@$DIR/issue-36053-2.rs:11:39: 11:53] as std::ops::FnOnce<(&&str,)>>::Output = bool`
+           which is required by `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:11:39: 11:53]>: std::iter::Iterator`
+           `[closure@$DIR/issue-36053-2.rs:11:39: 11:53]: std::ops::FnMut<(&&str,)>`
+           which is required by `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:11:39: 11:53]>: std::iter::Iterator`
+           `std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:11:39: 11:53]>: std::iter::Iterator`
+           which is required by `&mut std::iter::Filter<std::iter::Fuse<std::iter::Once<&str>>, [closure@$DIR/issue-36053-2.rs:11:39: 11:53]>: std::iter::Iterator`
 
 error[E0631]: type mismatch in closure arguments
-  --> $DIR/issue-36053-2.rs:7:32
+  --> $DIR/issue-36053-2.rs:11:32
    |
 LL |     once::<&str>("str").fuse().filter(|a: &str| true).count();
    |                                ^^^^^^ -------------- found signature of `for<'r> fn(&'r str) -> _`
diff --git a/src/test/ui/mismatched_types/issue-38371.stderr b/src/test/ui/mismatched_types/issue-38371.stderr
index 802a2fef6b..c2bce30587 100644
--- a/src/test/ui/mismatched_types/issue-38371.stderr
+++ b/src/test/ui/mismatched_types/issue-38371.stderr
@@ -3,7 +3,8 @@ error[E0308]: mismatched types
    |
 LL | fn foo(&foo: Foo) {
    |        ^^^^------
-   |        |
+   |        |     |
+   |        |     expected due to this
    |        expected struct `Foo`, found reference
    |        help: did you mean `foo`: `&Foo`
    |
@@ -14,7 +15,7 @@ error[E0308]: mismatched types
   --> $DIR/issue-38371.rs:18:9
    |
 LL | fn agh(&&bar: &u32) {
-   |         ^^^^
+   |         ^^^^  ---- expected due to this
    |         |
    |         expected `u32`, found reference
    |         help: you can probably remove the explicit borrow: `bar`
@@ -26,7 +27,9 @@ error[E0308]: mismatched types
   --> $DIR/issue-38371.rs:21:8
    |
 LL | fn bgh(&&bar: u32) {
-   |        ^^^^^ expected `u32`, found reference
+   |        ^^^^^  --- expected due to this
+   |        |
+   |        expected `u32`, found reference
    |
    = note:   expected type `u32`
            found reference `&_`
diff --git a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
index bbfb000505..5ab191b927 100644
--- a/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
+++ b/src/test/ui/mismatched_types/method-help-unsatisfied-bound.stderr
@@ -1,11 +1,14 @@
 error[E0599]: no method named `unwrap` found for enum `std::result::Result<(), Foo>` in the current scope
   --> $DIR/method-help-unsatisfied-bound.rs:5:7
    |
+LL | struct Foo;
+   | ----------- doesn't satisfy `Foo: std::fmt::Debug`
+...
 LL |     a.unwrap();
    |       ^^^^^^ method not found in `std::result::Result<(), Foo>`
    |
    = note: the method `unwrap` exists but the following trait bounds were not satisfied:
-           `Foo : std::fmt::Debug`
+           `Foo: std::fmt::Debug`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.rs b/src/test/ui/mismatched_types/overloaded-calls-bad.rs
index 73e74a97f0..902a6ec81d 100644
--- a/src/test/ui/mismatched_types/overloaded-calls-bad.rs
+++ b/src/test/ui/mismatched_types/overloaded-calls-bad.rs
@@ -27,7 +27,7 @@ fn main() {
     };
     let ans = s("what");    //~ ERROR mismatched types
     let ans = s();
-    //~^ ERROR this function takes 1 parameter but 0 parameters were supplied
+    //~^ ERROR this function takes 1 argument but 0 arguments were supplied
     let ans = s("burma", "shave");
-    //~^ ERROR this function takes 1 parameter but 2 parameters were supplied
+    //~^ ERROR this function takes 1 argument but 2 arguments were supplied
 }
diff --git a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr b/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
index 5a5dd05626..706e25529b 100644
--- a/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
+++ b/src/test/ui/mismatched_types/overloaded-calls-bad.stderr
@@ -4,17 +4,21 @@ error[E0308]: mismatched types
 LL |     let ans = s("what");
    |                 ^^^^^^ expected `isize`, found `&str`
 
-error[E0057]: this function takes 1 parameter but 0 parameters were supplied
+error[E0057]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/overloaded-calls-bad.rs:29:15
    |
 LL |     let ans = s();
-   |               ^^^ expected 1 parameter
+   |               ^-- supplied 0 arguments
+   |               |
+   |               expected 1 argument
 
-error[E0057]: this function takes 1 parameter but 2 parameters were supplied
+error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/overloaded-calls-bad.rs:31:15
    |
 LL |     let ans = s("burma", "shave");
-   |               ^^^^^^^^^^^^^^^^^^^ expected 1 parameter
+   |               ^ -------  ------- supplied 2 arguments
+   |               |
+   |               expected 1 argument
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/missing/missing-items/m2.stderr b/src/test/ui/missing/missing-items/m2.stderr
index f8243528d7..094782099f 100644
--- a/src/test/ui/missing/missing-items/m2.stderr
+++ b/src/test/ui/missing/missing-items/m2.stderr
@@ -6,7 +6,7 @@ LL | impl m1::X for X {
    |
    = help: implement the missing item: `const CONSTANT: u32 = 42;`
    = help: implement the missing item: `type Type = Type;`
-   = help: implement the missing item: `fn method(&self, _: std::string::String) -> <Self as m1::X>::Type { unimplemented!() }`
+   = help: implement the missing item: `fn method(&self, _: std::string::String) -> <Self as m1::X>::Type { todo!() }`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/missing/missing-semicolon-warning.rs b/src/test/ui/missing/missing-semicolon-warning.rs
deleted file mode 100644
index d962a52139..0000000000
--- a/src/test/ui/missing/missing-semicolon-warning.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// build-pass (FIXME(62277): could be check-pass?)
-#![allow(unused)]
-
-macro_rules! m {
-    ($($e1:expr),*; $($e2:expr),*) => {
-        $( let x = $e1 )*; //~ WARN expected `;`
-        $( println!("{}", $e2) )*; //~ WARN expected `;`
-    }
-}
-
-
-fn main() { m!(0, 0; 0, 0); }
diff --git a/src/test/ui/missing/missing-semicolon-warning.stderr b/src/test/ui/missing/missing-semicolon-warning.stderr
deleted file mode 100644
index b4001aba28..0000000000
--- a/src/test/ui/missing/missing-semicolon-warning.stderr
+++ /dev/null
@@ -1,22 +0,0 @@
-warning: expected `;`, found keyword `let`
-  --> $DIR/missing-semicolon-warning.rs:6:12
-   |
-LL |         $( let x = $e1 )*;
-   |            ^^^
-...
-LL | fn main() { m!(0, 0; 0, 0); }
-   |             --------------- in this macro invocation
-   |
-   = note: this was erroneously allowed and will become a hard error in a future release
-
-warning: expected `;`, found `println`
-  --> $DIR/missing-semicolon-warning.rs:7:12
-   |
-LL |         $( println!("{}", $e2) )*;
-   |            ^^^^^^^
-...
-LL | fn main() { m!(0, 0; 0, 0); }
-   |             --------------- in this macro invocation
-   |
-   = note: this was erroneously allowed and will become a hard error in a future release
-
diff --git a/src/test/ui/missing_debug_impls.rs b/src/test/ui/missing_debug_impls.rs
index ff919292ae..72fcba5158 100644
--- a/src/test/ui/missing_debug_impls.rs
+++ b/src/test/ui/missing_debug_impls.rs
@@ -4,7 +4,7 @@
 
 use std::fmt;
 
-pub enum A {} //~ ERROR type does not implement `fmt::Debug`
+pub enum A {} //~ ERROR type does not implement `std::fmt::Debug`
 
 #[derive(Debug)]
 pub enum B {}
@@ -17,7 +17,7 @@ impl fmt::Debug for C {
     }
 }
 
-pub struct Foo; //~ ERROR type does not implement `fmt::Debug`
+pub struct Foo; //~ ERROR type does not implement `std::fmt::Debug`
 
 #[derive(Debug)]
 pub struct Bar;
diff --git a/src/test/ui/missing_debug_impls.stderr b/src/test/ui/missing_debug_impls.stderr
index b953058778..51c65589b0 100644
--- a/src/test/ui/missing_debug_impls.stderr
+++ b/src/test/ui/missing_debug_impls.stderr
@@ -1,16 +1,16 @@
-error: type does not implement `fmt::Debug`; consider adding `#[derive(Debug)]` or a manual implementation
+error: type does not implement `std::fmt::Debug`; consider adding `#[derive(Debug)]` or a manual implementation
   --> $DIR/missing_debug_impls.rs:7:1
    |
 LL | pub enum A {}
    | ^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/missing_debug_impls.rs:2:9
    |
 LL | #![deny(missing_debug_implementations)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: type does not implement `fmt::Debug`; consider adding `#[derive(Debug)]` or a manual implementation
+error: type does not implement `std::fmt::Debug`; consider adding `#[derive(Debug)]` or a manual implementation
   --> $DIR/missing_debug_impls.rs:20:1
    |
 LL | pub struct Foo;
diff --git a/src/test/ui/moves/move-out-of-slice-2.rs b/src/test/ui/moves/move-out-of-slice-2.rs
index e460246193..5c1a61eb37 100644
--- a/src/test/ui/moves/move-out-of-slice-2.rs
+++ b/src/test/ui/moves/move-out-of-slice-2.rs
@@ -1,4 +1,4 @@
-#![feature(slice_patterns, unsized_locals)]
+#![feature(unsized_locals)]
 
 struct A;
 #[derive(Clone, Copy)]
diff --git a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr
index ead2cceebf..552273b8ba 100644
--- a/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr
+++ b/src/test/ui/moves/moves-based-on-type-no-recursive-stack-closure.stderr
@@ -11,13 +11,17 @@ error[E0382]: borrow of moved value: `f`
   --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:32:5
    |
 LL | fn conspirator<F>(mut f: F) where F: FnMut(&mut R, bool) {
-   |                   -----                                 - help: consider further restricting type parameter `F`: `, F: Copy`
-   |                   |
-   |                   move occurs because `f` has type `F`, which does not implement the `Copy` trait
+   |                   ----- move occurs because `f` has type `F`, which does not implement the `Copy` trait
 LL |     let mut r = R {c: Box::new(f)};
    |                                - value moved here
 LL |     f(&mut r, false)
    |     ^ value borrowed here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/moves-based-on-type-no-recursive-stack-closure.rs:30:35
+   |
+LL | fn conspirator<F>(mut f: F) where F: FnMut(&mut R, bool) {
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/mut/mut-pattern-mismatched.stderr b/src/test/ui/mut/mut-pattern-mismatched.stderr
index ccc8ac1278..cad1cef515 100644
--- a/src/test/ui/mut/mut-pattern-mismatched.stderr
+++ b/src/test/ui/mut/mut-pattern-mismatched.stderr
@@ -3,6 +3,9 @@ error[E0308]: mismatched types
    |
 LL |      let &_
    |          ^^ types differ in mutability
+...
+LL |         = foo;
+   |           --- this expression has type `&mut {integer}`
    |
    = note: expected mutable reference `&mut {integer}`
                       found reference `&_`
@@ -12,6 +15,9 @@ error[E0308]: mismatched types
    |
 LL |     let &mut _
    |         ^^^^^^ types differ in mutability
+...
+LL |          = bar;
+   |            --- this expression has type `&{integer}`
    |
    = note:      expected reference `&{integer}`
            found mutable reference `&mut _`
diff --git a/src/test/ui/never_type/defaulted-never-note.stderr b/src/test/ui/never_type/defaulted-never-note.stderr
index 28c9da059e..046d0c5fa1 100644
--- a/src/test/ui/never_type/defaulted-never-note.stderr
+++ b/src/test/ui/never_type/defaulted-never-note.stderr
@@ -7,7 +7,7 @@ LL | fn foo<T: ImplementedForUnitButNotNever>(_t: T) {}
 LL |     foo(_x);
    |     ^^^ the trait `ImplementedForUnitButNotNever` is not implemented for `!`
    |
-   = note: the trait is implemented for `()`. Possibly this error has been caused by changes to Rust's type-inference algorithm (see: https://github.com/rust-lang/rust/issues/48950 for more info). Consider whether you meant to use the type `()` here instead.
+   = note: the trait is implemented for `()`. Possibly this error has been caused by changes to Rust's type-inference algorithm (see issue #48950 <https://github.com/rust-lang/rust/issues/48950> for more information). Consider whether you meant to use the type `()` here instead.
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/never_type/feature-gate-never_type_fallback.stderr b/src/test/ui/never_type/feature-gate-never_type_fallback.stderr
index 08e16f4693..c652faafad 100644
--- a/src/test/ui/never_type/feature-gate-never_type_fallback.stderr
+++ b/src/test/ui/never_type/feature-gate-never_type_fallback.stderr
@@ -8,7 +8,6 @@ LL |     panic!()
    |     -------- this returned value is of type `!`
    |
    = note: the return type of a function must have a statically known size
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/never_type/issue-2149.stderr b/src/test/ui/never_type/issue-2149.stderr
index 9645244751..3cdd6372ec 100644
--- a/src/test/ui/never_type/issue-2149.stderr
+++ b/src/test/ui/never_type/issue-2149.stderr
@@ -13,8 +13,11 @@ LL |     ["hi"].bind(|x| [x] );
    |            ^^^^ method not found in `[&str; 1]`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `bind`, perhaps you need to implement it:
-           candidate #1: `VecMonad`
+note: `VecMonad` defines an item `bind`, perhaps you need to implement it
+  --> $DIR/issue-2149.rs:1:1
+   |
+LL | trait VecMonad<A> {
+   | ^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/never_type/never-assign-dead-code.stderr b/src/test/ui/never_type/never-assign-dead-code.stderr
index 1860150fa8..6002f8e1eb 100644
--- a/src/test/ui/never_type/never-assign-dead-code.stderr
+++ b/src/test/ui/never_type/never-assign-dead-code.stderr
@@ -6,13 +6,12 @@ LL |     let x: ! = panic!("aah");
 LL |     drop(x);
    |     ^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/never-assign-dead-code.rs:6:9
    |
 LL | #![warn(unused)]
    |         ^^^^^^
    = note: `#[warn(unreachable_code)]` implied by `#[warn(unused)]`
-   = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 warning: unreachable call
   --> $DIR/never-assign-dead-code.rs:10:5
@@ -28,7 +27,7 @@ warning: unused variable: `x`
 LL |     let x: ! = panic!("aah");
    |         ^ help: consider prefixing with an underscore: `_x`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/never-assign-dead-code.rs:6:9
    |
 LL | #![warn(unused)]
diff --git a/src/test/ui/nll/capture-mut-ref.stderr b/src/test/ui/nll/capture-mut-ref.stderr
index 883b2d05a7..95d8e874a6 100644
--- a/src/test/ui/nll/capture-mut-ref.stderr
+++ b/src/test/ui/nll/capture-mut-ref.stderr
@@ -6,7 +6,7 @@ LL |     let mut x = &mut 0;
    |         |
    |         help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/capture-mut-ref.rs:4:9
    |
 LL | #![deny(unused_mut)]
diff --git a/src/test/ui/nll/closure-captures.stderr b/src/test/ui/nll/closure-captures.stderr
index b8f5cc8650..dd5f32ef4f 100644
--- a/src/test/ui/nll/closure-captures.stderr
+++ b/src/test/ui/nll/closure-captures.stderr
@@ -37,36 +37,36 @@ LL |         x = 1;
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/closure-captures.rs:27:9
    |
-LL |         ||
-   |         ^^ cannot borrow as mutable
-LL |          x = 1;}
-   |          - mutable borrow occurs due to use of `x` in closure
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/closure-captures.rs:26:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         ||
+   | |         ^^ cannot borrow as mutable
 LL | |          x = 1;}
-   | |________________^
+   | |__________-_____- in this closure
+   |            |
+   |            mutable borrow occurs due to use of `x` in closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/closure-captures.rs:31:9
    |
-LL |         ||
-   |         ^^ cannot borrow as mutable
-LL |     x = 1;});
-   |     - mutable borrow occurs due to use of `x` in closure
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/closure-captures.rs:30:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         ||
+   | |         ^^ cannot borrow as mutable
 LL | |     x = 1;});
-   | |___________^
+   | |_____-_____- in this closure
+   |       |
+   |       mutable borrow occurs due to use of `x` in closure
 
 error[E0594]: cannot assign to `x`, as it is not declared as mutable
   --> $DIR/closure-captures.rs:39:10
@@ -80,19 +80,19 @@ LL |          x = 1;}
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/closure-captures.rs:38:9
    |
-LL |         ||
-   |         ^^ cannot borrow as mutable
-LL |          x = 1;}
-   |          - mutable borrow occurs due to use of `x` in closure
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/closure-captures.rs:37:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         ||
+   | |         ^^ cannot borrow as mutable
 LL | |          x = 1;}
-   | |________________^
+   | |__________-_____- in this closure
+   |            |
+   |            mutable borrow occurs due to use of `x` in closure
 
 error[E0594]: cannot assign to `x`, as it is not declared as mutable
   --> $DIR/closure-captures.rs:43:5
@@ -106,53 +106,53 @@ LL |     x = 1;});
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/closure-captures.rs:42:9
    |
-LL |         ||
-   |         ^^ cannot borrow as mutable
-LL |     x = 1;});
-   |     - mutable borrow occurs due to use of `x` in closure
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/closure-captures.rs:41:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         ||
+   | |         ^^ cannot borrow as mutable
 LL | |     x = 1;});
-   | |___________^
+   | |_____-_____- in this closure
+   |       |
+   |       mutable borrow occurs due to use of `x` in closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/closure-captures.rs:48:9
    |
-LL |         ||
-   |         ^^ cannot borrow as mutable
-LL |         *x = 1;});
-   |          - mutable borrow occurs due to use of `x` in closure
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/closure-captures.rs:47:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(|| {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         ||
+   | |         ^^ cannot borrow as mutable
 LL | |         *x = 1;});
-   | |________________^
+   | |__________-_____- in this closure
+   |            |
+   |            mutable borrow occurs due to use of `x` in closure
 
 error[E0596]: cannot borrow `x` as mutable, as it is a captured variable in a `Fn` closure
   --> $DIR/closure-captures.rs:51:9
    |
-LL |         ||
-   |         ^^ cannot borrow as mutable
-LL |         *x = 1;});
-   |          - mutable borrow occurs due to use of `x` in closure
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/closure-captures.rs:50:12
-   |
+LL |   fn fn_ref<F: Fn()>(f: F) -> F { f }
+   |                         - change this to accept `FnMut` instead of `Fn`
+...
 LL |       fn_ref(move || {
-   |  ____________^
+   |  _____------_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         ||
+   | |         ^^ cannot borrow as mutable
 LL | |         *x = 1;});
-   | |________________^
+   | |__________-_____- in this closure
+   |            |
+   |            mutable borrow occurs due to use of `x` in closure
 
 error: aborting due to 12 previous errors
 
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
index 708e50de57..f5723ba5da 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-comparing-against-free.stderr
@@ -19,7 +19,7 @@ error[E0521]: borrowed data escapes outside of closure
 LL |     foo(cell, |cell_a, cell_x| {
    |                ------  ------ `cell_x` is a reference that is only valid in the closure body
    |                |
-   |                `cell_a` is declared here, outside of the closure body
+   |                `cell_a` declared here, outside of the closure body
 LL |         cell_a.set(cell_x.get()); // forces 'x: 'a, error in closure
    |         ^^^^^^^^^^^^^^^^^^^^^^^^ `cell_x` escapes the closure body here
 
diff --git a/src/test/ui/nll/dont-print-desugared.stderr b/src/test/ui/nll/dont-print-desugared.stderr
index 45d7cbcdfb..88773def8b 100644
--- a/src/test/ui/nll/dont-print-desugared.stderr
+++ b/src/test/ui/nll/dont-print-desugared.stderr
@@ -2,10 +2,7 @@ error[E0596]: cannot borrow data in a `&` reference as mutable
   --> $DIR/dont-print-desugared.rs:4:10
    |
 LL |     for &ref mut x in s {}
-   |         -^^^^^^^^^
-   |         ||
-   |         |cannot borrow as mutable through `&` reference
-   |         help: consider changing this to be a mutable reference: `&mut ref mut x`
+   |          ^^^^^^^^^ cannot borrow as mutable through `&` reference
 
 error[E0597]: `y` does not live long enough
   --> $DIR/dont-print-desugared.rs:17:16
diff --git a/src/test/ui/nll/issue-54556-used-vs-unused-tails.rs b/src/test/ui/nll/issue-54556-used-vs-unused-tails.rs
index 0d96767a05..a111acca66 100644
--- a/src/test/ui/nll/issue-54556-used-vs-unused-tails.rs
+++ b/src/test/ui/nll/issue-54556-used-vs-unused-tails.rs
@@ -1,4 +1,4 @@
-// Ths test case is exploring the space of how blocs with tail
+// This test case is exploring the space of how blocks with tail
 // expressions and statements can be composed, trying to keep each
 // case on one line so that we can compare them via a vertical scan
 // with the human eye.
diff --git a/src/test/ui/nll/issue-55850.rs b/src/test/ui/nll/issue-55850.rs
index a8f7299f89..e6279bd028 100644
--- a/src/test/ui/nll/issue-55850.rs
+++ b/src/test/ui/nll/issue-55850.rs
@@ -15,7 +15,7 @@ where
     type Item = G::Yield;
 
     fn next(&mut self) -> Option<Self::Item> {
-        match Pin::new(&mut self.0).resume() {
+        match Pin::new(&mut self.0).resume(()) {
             Yielded(y) => Some(y),
             _ => None
         }
diff --git a/src/test/ui/nll/issue-61424.stderr b/src/test/ui/nll/issue-61424.stderr
index ae336b2fe1..41dd7254d7 100644
--- a/src/test/ui/nll/issue-61424.stderr
+++ b/src/test/ui/nll/issue-61424.stderr
@@ -6,7 +6,7 @@ LL |     let mut x;
    |         |
    |         help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-61424.rs:1:9
    |
 LL | #![deny(unused_mut)]
diff --git a/src/test/ui/nll/outlives-suggestion-simple.rs b/src/test/ui/nll/outlives-suggestion-simple.rs
index 91a7a1d71e..ee5a80ae64 100644
--- a/src/test/ui/nll/outlives-suggestion-simple.rs
+++ b/src/test/ui/nll/outlives-suggestion-simple.rs
@@ -70,7 +70,7 @@ pub struct Foo2<'a> {
 impl<'a> Foo2<'a> {
     // should not produce outlives suggestions to name 'self
     fn get_bar(&self) -> Bar2 {
-        Bar2::new(&self) //~ERROR borrowed data escapes outside of function
+        Bar2::new(&self) //~ERROR borrowed data escapes outside of method
     }
 }
 
diff --git a/src/test/ui/nll/outlives-suggestion-simple.stderr b/src/test/ui/nll/outlives-suggestion-simple.stderr
index f7603e29d4..cf55603cd7 100644
--- a/src/test/ui/nll/outlives-suggestion-simple.stderr
+++ b/src/test/ui/nll/outlives-suggestion-simple.stderr
@@ -93,16 +93,16 @@ LL |         self.x
    |
    = help: consider adding the following bound: `'b: 'a`
 
-error[E0521]: borrowed data escapes outside of function
+error[E0521]: borrowed data escapes outside of method
   --> $DIR/outlives-suggestion-simple.rs:73:9
    |
 LL |     fn get_bar(&self) -> Bar2 {
    |                -----
    |                |
-   |                `self` is declared here, outside of the function body
-   |                `self` is a reference that is only valid in the function body
+   |                `self` declared here, outside of the method body
+   |                `self` is a reference that is only valid in the method body
 LL |         Bar2::new(&self)
-   |         ^^^^^^^^^^^^^^^^ `self` escapes the function body here
+   |         ^^^^^^^^^^^^^^^^ `self` escapes the method body here
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
index 20edfb3393..2f18f600b7 100644
--- a/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
+++ b/src/test/ui/nll/ty-outlives/projection-two-region-trait-bound-closure.rs
@@ -36,7 +36,7 @@ where
     T: Anything<'b, 'c>,
 {
     with_signature(cell, t, |cell, t| require(cell, t));
-    //~^ ERROR associated type `<T as Anything<'_#5r, '_#6r>>::AssocType` may not live long enough
+    //~^ ERROR may not live long enough
 }
 
 #[rustc_regions]
@@ -46,7 +46,7 @@ where
     'a: 'a,
 {
     with_signature(cell, t, |cell, t| require(cell, t));
-    //~^ ERROR associated type `<T as Anything<'_#6r, '_#7r>>::AssocType` may not live long enough
+    //~^ ERROR may not live long enough
 }
 
 #[rustc_regions]
diff --git a/src/test/ui/nll/unused-mut-issue-50343.stderr b/src/test/ui/nll/unused-mut-issue-50343.stderr
index 261d678db6..c86981a8df 100644
--- a/src/test/ui/nll/unused-mut-issue-50343.stderr
+++ b/src/test/ui/nll/unused-mut-issue-50343.stderr
@@ -6,7 +6,7 @@ LL |     vec![(42, 22)].iter().map(|(mut x, _y)| ()).count();
    |                                 |
    |                                 help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-mut-issue-50343.rs:1:9
    |
 LL | #![deny(unused_mut)]
diff --git a/src/test/ui/nll/user-annotations/type-annotation-with-hrtb.rs b/src/test/ui/nll/user-annotations/type-annotation-with-hrtb.rs
new file mode 100644
index 0000000000..1f7c060386
--- /dev/null
+++ b/src/test/ui/nll/user-annotations/type-annotation-with-hrtb.rs
@@ -0,0 +1,33 @@
+// Regression test for issue #69490
+
+// check-pass
+
+pub trait Trait<T> {
+    const S: &'static str;
+}
+
+impl<T> Trait<()> for T
+where
+    T: for<'a> Trait<&'a ()>,
+{
+    // Use of `T::S` here caused an ICE
+    const S: &'static str = T::S;
+}
+
+// Some similar cases that didn't ICE:
+
+impl<'a, T> Trait<()> for (T,)
+where
+    T: Trait<&'a ()>,
+{
+    const S: &'static str = T::S;
+}
+
+impl<T> Trait<()> for [T; 1]
+where
+    T: Trait<for<'a> fn(&'a ())>,
+{
+    const S: &'static str = T::S;
+}
+
+fn main() {}
diff --git a/src/test/ui/no-patterns-in-args-2.rs b/src/test/ui/no-patterns-in-args-2.rs
index ccf57478b4..85b7fc5cdb 100644
--- a/src/test/ui/no-patterns-in-args-2.rs
+++ b/src/test/ui/no-patterns-in-args-2.rs
@@ -1,9 +1,9 @@
 #![deny(patterns_in_fns_without_body)]
 
 trait Tr {
-    fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in methods without bodies
+    fn f1(mut arg: u8); //~ ERROR patterns aren't allowed in functions without bodies
                         //~^ WARN was previously accepted
-    fn f2(&arg: u8); //~ ERROR patterns aren't allowed in methods without bodies
+    fn f2(&arg: u8); //~ ERROR patterns aren't allowed in functions without bodies
     fn g1(arg: u8); // OK
     fn g2(_: u8); // OK
     #[allow(anonymous_parameters)]
diff --git a/src/test/ui/no-patterns-in-args-2.stderr b/src/test/ui/no-patterns-in-args-2.stderr
index ec7d2d9f0d..21f4439d89 100644
--- a/src/test/ui/no-patterns-in-args-2.stderr
+++ b/src/test/ui/no-patterns-in-args-2.stderr
@@ -1,16 +1,16 @@
-error[E0642]: patterns aren't allowed in methods without bodies
+error[E0642]: patterns aren't allowed in functions without bodies
   --> $DIR/no-patterns-in-args-2.rs:6:11
    |
 LL |     fn f2(&arg: u8);
-   |           ^^^^
+   |           ^^^^ pattern not allowed in function without body
 
-error: patterns aren't allowed in methods without bodies
+error: patterns aren't allowed in functions without bodies
   --> $DIR/no-patterns-in-args-2.rs:4:11
    |
 LL |     fn f1(mut arg: u8);
    |           ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/no-patterns-in-args-2.rs:1:9
    |
 LL | #![deny(patterns_in_fns_without_body)]
diff --git a/src/test/ui/no-patterns-in-args-macro.rs b/src/test/ui/no-patterns-in-args-macro.rs
index 59cb994539..b5109f9c28 100644
--- a/src/test/ui/no-patterns-in-args-macro.rs
+++ b/src/test/ui/no-patterns-in-args-macro.rs
@@ -6,10 +6,10 @@ macro_rules! m {
 
         type A = fn($pat: u8);
 
-        extern {
+        extern "C" {
             fn foreign_fn($pat: u8);
         }
-    }
+    };
 }
 
 mod good_pat {
@@ -20,7 +20,7 @@ mod bad_pat {
     m!((bad, pat));
     //~^ ERROR patterns aren't allowed in function pointer types
     //~| ERROR patterns aren't allowed in foreign function declarations
-    //~| ERROR patterns aren't allowed in methods without bodies
+    //~| ERROR patterns aren't allowed in functions without bodies
 }
 
 fn main() {}
diff --git a/src/test/ui/no-patterns-in-args-macro.stderr b/src/test/ui/no-patterns-in-args-macro.stderr
index f21df68d5a..0016c7953f 100644
--- a/src/test/ui/no-patterns-in-args-macro.stderr
+++ b/src/test/ui/no-patterns-in-args-macro.stderr
@@ -1,8 +1,8 @@
-error[E0642]: patterns aren't allowed in methods without bodies
+error[E0642]: patterns aren't allowed in functions without bodies
   --> $DIR/no-patterns-in-args-macro.rs:20:8
    |
 LL |     m!((bad, pat));
-   |        ^^^^^^^^^^
+   |        ^^^^^^^^^^ pattern not allowed in function without body
 
 error[E0561]: patterns aren't allowed in function pointer types
   --> $DIR/no-patterns-in-args-macro.rs:20:8
diff --git a/src/test/ui/not-enough-arguments.rs b/src/test/ui/not-enough-arguments.rs
index 309283ed7f..631bb1dd27 100644
--- a/src/test/ui/not-enough-arguments.rs
+++ b/src/test/ui/not-enough-arguments.rs
@@ -8,5 +8,5 @@ fn foo(a: isize, b: isize, c: isize, d:isize) {
 
 fn main() {
   foo(1, 2, 3);
-  //~^ ERROR this function takes 4 parameters but 3
+  //~^ ERROR this function takes 4 arguments but 3
 }
diff --git a/src/test/ui/not-enough-arguments.stderr b/src/test/ui/not-enough-arguments.stderr
index c1ee43ea90..f2b57f7140 100644
--- a/src/test/ui/not-enough-arguments.stderr
+++ b/src/test/ui/not-enough-arguments.stderr
@@ -1,11 +1,13 @@
-error[E0061]: this function takes 4 parameters but 3 parameters were supplied
+error[E0061]: this function takes 4 arguments but 3 arguments were supplied
   --> $DIR/not-enough-arguments.rs:10:3
    |
 LL | fn foo(a: isize, b: isize, c: isize, d:isize) {
    | --------------------------------------------- defined here
 ...
 LL |   foo(1, 2, 3);
-   |   ^^^^^^^^^^^^ expected 4 parameters
+   |   ^^^ -  -  - supplied 3 arguments
+   |   |
+   |   expected 4 arguments
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-pointer-types.stderr b/src/test/ui/object-pointer-types.stderr
index 855894b449..021aa8670f 100644
--- a/src/test/ui/object-pointer-types.stderr
+++ b/src/test/ui/object-pointer-types.stderr
@@ -1,22 +1,20 @@
 error[E0599]: no method named `owned` found for reference `&dyn Foo` in the current scope
   --> $DIR/object-pointer-types.rs:11:7
    |
+LL |     fn owned(self: Box<Self>);
+   |                    --------- the method might not be found because of this arbitrary self type
+...
 LL |     x.owned();
    |       ^^^^^ method not found in `&dyn Foo`
-   |
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `owned`, perhaps you need to implement it:
-           candidate #1: `Foo`
 
 error[E0599]: no method named `owned` found for mutable reference `&mut dyn Foo` in the current scope
   --> $DIR/object-pointer-types.rs:17:7
    |
+LL |     fn owned(self: Box<Self>);
+   |                    --------- the method might not be found because of this arbitrary self type
+...
 LL |     x.owned();
    |       ^^^^^ method not found in `&mut dyn Foo`
-   |
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `owned`, perhaps you need to implement it:
-           candidate #1: `Foo`
 
 error[E0599]: no method named `managed` found for struct `std::boxed::Box<(dyn Foo + 'static)>` in the current scope
   --> $DIR/object-pointer-types.rs:23:7
diff --git a/src/test/ui/object-safety/object-safety-associated-consts.curr.stderr b/src/test/ui/object-safety/object-safety-associated-consts.curr.stderr
index 67ef7a62f1..890acde35c 100644
--- a/src/test/ui/object-safety/object-safety-associated-consts.curr.stderr
+++ b/src/test/ui/object-safety/object-safety-associated-consts.curr.stderr
@@ -1,11 +1,15 @@
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/object-safety-associated-consts.rs:12:1
+  --> $DIR/object-safety-associated-consts.rs:12:30
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     const X: usize;
-   |           - the trait cannot contain associated consts like `X`
+   |           - ...because it contains this associated `const`
 ...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
+   |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `X` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr
index 20993a680b..e2a95d95a1 100644
--- a/src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr
+++ b/src/test/ui/object-safety/object-safety-associated-consts.object_safe_for_dispatch.stderr
@@ -1,12 +1,15 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-associated-consts.rs:14:5
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     const X: usize;
-   |           - the trait cannot contain associated consts like `X`
+   |           - ...because it contains this associated `const`
 ...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
    |
+   = help: consider moving `X` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Bar>` for `&T`
    = note: required by cast to type `&dyn Bar`
 
diff --git a/src/test/ui/object-safety/object-safety-generics.curr.stderr b/src/test/ui/object-safety/object-safety-generics.curr.stderr
index 8ae9236a5c..9e70abbd32 100644
--- a/src/test/ui/object-safety/object-safety-generics.curr.stderr
+++ b/src/test/ui/object-safety/object-safety-generics.curr.stderr
@@ -1,20 +1,28 @@
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/object-safety-generics.rs:18:1
+  --> $DIR/object-safety-generics.rs:18:30
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     fn bar<T>(&self, t: T);
-   |        --- method `bar` has generic type parameters
+   |        --- ...because method `bar` has generic type parameters
 ...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
+   |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `bar` to another trait
 
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/object-safety-generics.rs:24:1
+  --> $DIR/object-safety-generics.rs:24:39
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     fn bar<T>(&self, t: T);
-   |        --- method `bar` has generic type parameters
+   |        --- ...because method `bar` has generic type parameters
 ...
 LL | fn make_bar_explicit<T:Bar>(t: &T) -> &dyn Bar {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
+   |                                       ^^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `bar` to another trait
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr
index d3d8d36888..7443d38470 100644
--- a/src/test/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr
+++ b/src/test/ui/object-safety/object-safety-generics.object_safe_for_dispatch.stderr
@@ -1,24 +1,30 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-generics.rs:20:5
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     fn bar<T>(&self, t: T);
-   |        --- method `bar` has generic type parameters
+   |        --- ...because method `bar` has generic type parameters
 ...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
    |
+   = help: consider moving `bar` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Bar>` for `&T`
    = note: required by cast to type `&dyn Bar`
 
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-generics.rs:26:5
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     fn bar<T>(&self, t: T);
-   |        --- method `bar` has generic type parameters
+   |        --- ...because method `bar` has generic type parameters
 ...
 LL |     t as &dyn Bar
    |     ^ the trait `Bar` cannot be made into an object
    |
+   = help: consider moving `bar` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Bar>` for `&T`
    = note: required by cast to type `&dyn Bar`
 
diff --git a/src/test/ui/object-safety/object-safety-issue-22040.stderr b/src/test/ui/object-safety/object-safety-issue-22040.stderr
index 1f5c472ddc..fe9ca5b6fa 100644
--- a/src/test/ui/object-safety/object-safety-issue-22040.stderr
+++ b/src/test/ui/object-safety/object-safety-issue-22040.stderr
@@ -1,10 +1,13 @@
 error[E0038]: the trait `Expr` cannot be made into an object
   --> $DIR/object-safety-issue-22040.rs:12:23
    |
+LL | trait Expr: Debug + PartialEq {
+   |       ----          --------- ...because it uses `Self` as a type parameter in this
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     elements: Vec<Box<dyn Expr + 'x>>,
    |                       ^^^^^^^^^^^^^ the trait `Expr` cannot be made into an object
-   |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.curr.stderr b/src/test/ui/object-safety/object-safety-mentions-Self.curr.stderr
index 297cd87618..4dbb27b425 100644
--- a/src/test/ui/object-safety/object-safety-mentions-Self.curr.stderr
+++ b/src/test/ui/object-safety/object-safety-mentions-Self.curr.stderr
@@ -1,20 +1,28 @@
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/object-safety-mentions-Self.rs:22:1
+  --> $DIR/object-safety-mentions-Self.rs:22:30
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     fn bar(&self, x: &Self);
-   |        --- method `bar` references the `Self` type in its parameters or return type
+   |                      ----- ...because method `bar` references the `Self` type in this parameter
 ...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
+   |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
+   |
+   = help: consider moving `bar` to another trait
 
 error[E0038]: the trait `Baz` cannot be made into an object
-  --> $DIR/object-safety-mentions-Self.rs:28:1
+  --> $DIR/object-safety-mentions-Self.rs:28:30
    |
+LL | trait Baz {
+   |       --- this trait cannot be made into an object...
 LL |     fn baz(&self) -> Self;
-   |        --- method `baz` references the `Self` type in its parameters or return type
+   |                      ---- ...because method `baz` references the `Self` type in its return type
 ...
 LL | fn make_baz<T:Baz>(t: &T) -> &dyn Baz {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Baz` cannot be made into an object
+   |                              ^^^^^^^^ the trait `Baz` cannot be made into an object
+   |
+   = help: consider moving `baz` to another trait
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr
index 03b2b8da07..89b273fb8a 100644
--- a/src/test/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr
+++ b/src/test/ui/object-safety/object-safety-mentions-Self.object_safe_for_dispatch.stderr
@@ -1,24 +1,30 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-mentions-Self.rs:24:5
    |
+LL | trait Bar {
+   |       --- this trait cannot be made into an object...
 LL |     fn bar(&self, x: &Self);
-   |        --- method `bar` references the `Self` type in its parameters or return type
+   |                      ----- ...because method `bar` references the `Self` type in this parameter
 ...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
    |
+   = help: consider moving `bar` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Bar>` for `&T`
    = note: required by cast to type `&dyn Bar`
 
 error[E0038]: the trait `Baz` cannot be made into an object
   --> $DIR/object-safety-mentions-Self.rs:30:5
    |
+LL | trait Baz {
+   |       --- this trait cannot be made into an object...
 LL |     fn baz(&self) -> Self;
-   |        --- method `baz` references the `Self` type in its parameters or return type
+   |                      ---- ...because method `baz` references the `Self` type in its return type
 ...
 LL |     t
    |     ^ the trait `Baz` cannot be made into an object
    |
+   = help: consider moving `baz` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Baz>` for `&T`
    = note: required by cast to type `&dyn Baz`
 
diff --git a/src/test/ui/object-safety/object-safety-no-static.curr.stderr b/src/test/ui/object-safety/object-safety-no-static.curr.stderr
index 1641ce5777..f878cf8b46 100644
--- a/src/test/ui/object-safety/object-safety-no-static.curr.stderr
+++ b/src/test/ui/object-safety/object-safety-no-static.curr.stderr
@@ -1,11 +1,18 @@
 error[E0038]: the trait `Foo` cannot be made into an object
-  --> $DIR/object-safety-no-static.rs:12:1
+  --> $DIR/object-safety-no-static.rs:12:18
    |
+LL | trait Foo {
+   |       --- this trait cannot be made into an object...
 LL |     fn foo() {}
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL | fn diverges() -> Box<dyn Foo> {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
+   |                  ^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Sized {}
+   |              ^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr
index 91a9285b63..de56843962 100644
--- a/src/test/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr
+++ b/src/test/ui/object-safety/object-safety-no-static.object_safe_for_dispatch.stderr
@@ -1,14 +1,20 @@
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/object-safety-no-static.rs:22:27
    |
+LL | trait Foo {
+   |       --- this trait cannot be made into an object...
 LL |     fn foo() {}
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL |     let b: Box<dyn Foo> = Box::new(Bar);
    |                           ^^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
    |
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<dyn Foo>>` for `std::boxed::Box<Bar>`
    = note: required by cast to type `std::boxed::Box<dyn Foo>`
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Sized {}
+   |              ^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-safety/object-safety-sized-2.curr.stderr b/src/test/ui/object-safety/object-safety-sized-2.curr.stderr
index 1e1d2bf64c..2f605d8e90 100644
--- a/src/test/ui/object-safety/object-safety-sized-2.curr.stderr
+++ b/src/test/ui/object-safety/object-safety-sized-2.curr.stderr
@@ -1,10 +1,13 @@
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/object-safety-sized-2.rs:14:1
+  --> $DIR/object-safety-sized-2.rs:14:30
    |
+LL | trait Bar
+   |       --- this trait cannot be made into an object...
+LL |     where Self : Sized
+   |                  ----- ...because it requires `Self: Sized`
+...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
-   |
-   = note: the trait cannot require that `Self : Sized`
+   |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
index 06ecfd019c..2f1f06f4cf 100644
--- a/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
+++ b/src/test/ui/object-safety/object-safety-sized-2.object_safe_for_dispatch.stderr
@@ -1,10 +1,14 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-sized-2.rs:16:5
    |
+LL | trait Bar
+   |       --- this trait cannot be made into an object...
+LL |     where Self : Sized
+   |                  ----- ...because it requires `Self: Sized`
+...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Bar>` for `&T`
    = note: required by cast to type `&dyn Bar`
 
diff --git a/src/test/ui/object-safety/object-safety-sized.curr.stderr b/src/test/ui/object-safety/object-safety-sized.curr.stderr
index 1a67e79e83..54f65c43d9 100644
--- a/src/test/ui/object-safety/object-safety-sized.curr.stderr
+++ b/src/test/ui/object-safety/object-safety-sized.curr.stderr
@@ -1,10 +1,13 @@
 error[E0038]: the trait `Bar` cannot be made into an object
-  --> $DIR/object-safety-sized.rs:12:1
+  --> $DIR/object-safety-sized.rs:12:30
    |
+LL | trait Bar : Sized {
+   |       ---   ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL | fn make_bar<T:Bar>(t: &T) -> &dyn Bar {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Bar` cannot be made into an object
-   |
-   = note: the trait cannot require that `Self : Sized`
+   |                              ^^^^^^^^ the trait `Bar` cannot be made into an object
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr b/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
index 3d88dfc40e..58c2b77214 100644
--- a/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
+++ b/src/test/ui/object-safety/object-safety-sized.object_safe_for_dispatch.stderr
@@ -1,10 +1,14 @@
 error[E0038]: the trait `Bar` cannot be made into an object
   --> $DIR/object-safety-sized.rs:14:5
    |
+LL | trait Bar : Sized {
+   |       ---   ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     t
    |     ^ the trait `Bar` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Bar>` for `&T`
    = note: required by cast to type `&dyn Bar`
 
diff --git a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr
index 8ae8983270..ef7f6bacd1 100644
--- a/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr
+++ b/src/test/ui/object-safety/object-safety-supertrait-mentions-Self.stderr
@@ -1,10 +1,13 @@
 error[E0038]: the trait `Baz` cannot be made into an object
   --> $DIR/object-safety-supertrait-mentions-Self.rs:15:31
    |
+LL | trait Baz : Bar<Self> {
+   |       ---   --------- ...because it uses `Self` as a type parameter in this
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL | fn make_baz<T:Baz>(t: &T) -> &dyn Baz {
    |                               ^^^^^^^ the trait `Baz` cannot be made into an object
-   |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.stderr b/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.stderr
index ec1eaff52b..a4b33963fb 100644
--- a/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.stderr
+++ b/src/test/ui/on-unimplemented/feature-gate-on-unimplemented.stderr
@@ -4,7 +4,6 @@ error[E0658]: this is an internal attribute that will never be stable
 LL | #[rustc_on_unimplemented = "test error `{Self}` with `{Bar}`"]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/on-unimplemented/no-debug.stderr b/src/test/ui/on-unimplemented/no-debug.stderr
index cbb41263a8..4f9d428546 100644
--- a/src/test/ui/on-unimplemented/no-debug.stderr
+++ b/src/test/ui/on-unimplemented/no-debug.stderr
@@ -7,6 +7,7 @@ LL |     println!("{:?} {:?}", Foo, Bar);
    = help: the trait `std::fmt::Debug` is not implemented for `Foo`
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
    = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: `no_debug::Bar` doesn't implement `std::fmt::Debug`
   --> $DIR/no-debug.rs:10:32
@@ -16,6 +17,7 @@ LL |     println!("{:?} {:?}", Foo, Bar);
    |
    = help: the trait `std::fmt::Debug` is not implemented for `no_debug::Bar`
    = note: required by `std::fmt::Debug::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: `Foo` doesn't implement `std::fmt::Display`
   --> $DIR/no-debug.rs:11:23
@@ -26,6 +28,7 @@ LL |     println!("{} {}", Foo, Bar);
    = help: the trait `std::fmt::Display` is not implemented for `Foo`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
    = note: required by `std::fmt::Display::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: `no_debug::Bar` doesn't implement `std::fmt::Display`
   --> $DIR/no-debug.rs:11:28
@@ -36,6 +39,7 @@ LL |     println!("{} {}", Foo, Bar);
    = help: the trait `std::fmt::Display` is not implemented for `no_debug::Bar`
    = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
    = note: required by `std::fmt::Display::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/once-cant-call-twice-on-heap.stderr b/src/test/ui/once-cant-call-twice-on-heap.stderr
index fd99806021..d4884469ce 100644
--- a/src/test/ui/once-cant-call-twice-on-heap.stderr
+++ b/src/test/ui/once-cant-call-twice-on-heap.stderr
@@ -2,13 +2,17 @@ error[E0382]: use of moved value: `blk`
   --> $DIR/once-cant-call-twice-on-heap.rs:9:5
    |
 LL | fn foo<F:FnOnce()>(blk: F) {
-   |        --          --- move occurs because `blk` has type `F`, which does not implement the `Copy` trait
-   |        |
-   |        help: consider further restricting this bound: `F: Copy +`
+   |                    --- move occurs because `blk` has type `F`, which does not implement the `Copy` trait
 LL |     blk();
    |     --- value moved here
 LL |     blk();
    |     ^^^ value used here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/once-cant-call-twice-on-heap.rs:7:10
+   |
+LL | fn foo<F:FnOnce()>(blk: F) {
+   |          ^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/or-patterns/already-bound-name.rs b/src/test/ui/or-patterns/already-bound-name.rs
index 3ebf59c643..726e17b7ec 100644
--- a/src/test/ui/or-patterns/already-bound-name.rs
+++ b/src/test/ui/or-patterns/already-bound-name.rs
@@ -2,7 +2,6 @@
 // correctly accounts for or-patterns.
 
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete
 
 enum E<T> { A(T, T), B(T) }
 
diff --git a/src/test/ui/or-patterns/already-bound-name.stderr b/src/test/ui/or-patterns/already-bound-name.stderr
index 948c91370d..97933ca122 100644
--- a/src/test/ui/or-patterns/already-bound-name.stderr
+++ b/src/test/ui/or-patterns/already-bound-name.stderr
@@ -1,105 +1,99 @@
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:12:13
+  --> $DIR/already-bound-name.rs:11:13
    |
 LL |     let (a, a) = (0, 1); // Standard duplication without an or-pattern.
    |             ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:15:15
+  --> $DIR/already-bound-name.rs:14:15
    |
 LL |     let (a, A(a, _) | B(a)) = (0, A(1, 2));
    |               ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:15:25
+  --> $DIR/already-bound-name.rs:14:25
    |
 LL |     let (a, A(a, _) | B(a)) = (0, A(1, 2));
    |                         ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:19:26
+  --> $DIR/already-bound-name.rs:18:26
    |
 LL |     let (A(a, _) | B(a), a) = (A(0, 1), 2);
    |                          ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:22:14
+  --> $DIR/already-bound-name.rs:21:14
    |
 LL |     let A(a, a) | B(a) = A(0, 1);
    |              ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:25:21
+  --> $DIR/already-bound-name.rs:24:21
    |
 LL |     let B(a) | A(a, a) = A(0, 1);
    |                     ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:29:21
+  --> $DIR/already-bound-name.rs:28:21
    |
 LL |         B(a) | A(a, a) => {} // Let's ensure `match` has no funny business.
    |                     ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:33:36
+  --> $DIR/already-bound-name.rs:32:36
    |
 LL |     let B(A(a, _) | B(a)) | A(a, A(a, _) | B(a)) = B(B(1));
    |                                    ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:33:46
+  --> $DIR/already-bound-name.rs:32:46
    |
 LL |     let B(A(a, _) | B(a)) | A(a, A(a, _) | B(a)) = B(B(1));
    |                                              ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:38:36
+  --> $DIR/already-bound-name.rs:37:36
    |
 LL |     let B(_) | A(A(a, _) | B(a), A(a, _) | B(a)) = B(B(1));
    |                                    ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:38:46
+  --> $DIR/already-bound-name.rs:37:46
    |
 LL |     let B(_) | A(A(a, _) | B(a), A(a, _) | B(a)) = B(B(1));
    |                                              ^ used in a pattern more than once
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/already-bound-name.rs:38:9
+  --> $DIR/already-bound-name.rs:37:9
    |
 LL |     let B(_) | A(A(a, _) | B(a), A(a, _) | B(a)) = B(B(1));
    |         ^^^^ pattern doesn't bind `a`        - variable not in all patterns
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:43:49
+  --> $DIR/already-bound-name.rs:42:49
    |
 LL |     let B(A(a, _) | B(a)) | A(A(a, _) | B(a), A(a, _) | B(a)) = B(B(1));
    |                                                 ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/already-bound-name.rs:43:59
+  --> $DIR/already-bound-name.rs:42:59
    |
 LL |     let B(A(a, _) | B(a)) | A(A(a, _) | B(a), A(a, _) | B(a)) = B(B(1));
    |                                                           ^ used in a pattern more than once
 
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/already-bound-name.rs:4:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
 error[E0308]: mismatched types
-  --> $DIR/already-bound-name.rs:33:31
+  --> $DIR/already-bound-name.rs:32:31
    |
 LL |     let B(A(a, _) | B(a)) | A(a, A(a, _) | B(a)) = B(B(1));
-   |                               ^                    ------- this expression has type `E<E<{integer}>>`
-   |                               |
-   |                               expected integer, found enum `E`
+   |             -                 ^                    ------- this expression has type `E<E<{integer}>>`
+   |             |                 |
+   |             |                 expected integer, found enum `E`
+   |             first introduced with type `{integer}` here
    |
    = note: expected type `{integer}`
               found type `E<{integer}>`
+   = note: a binding must have the same type in all alternatives
 
 error: aborting due to 15 previous errors
 
diff --git a/src/test/ui/or-patterns/basic-switch.rs b/src/test/ui/or-patterns/basic-switch.rs
new file mode 100644
index 0000000000..6daa9d9255
--- /dev/null
+++ b/src/test/ui/or-patterns/basic-switch.rs
@@ -0,0 +1,33 @@
+// Test basic or-patterns when the target pattern type will be lowered to a
+// `Switch` (an `enum`).
+
+// run-pass
+
+#![feature(or_patterns)]
+
+#[derive(Debug)]
+enum Test {
+    Foo,
+    Bar,
+    Baz,
+    Qux,
+}
+
+fn test(x: Option<Test>) -> bool {
+    match x {
+        // most simple case
+        Some(Test::Bar | Test::Qux) => true,
+        // wild case
+        Some(_) => false,
+        // empty case
+        None => false,
+    }
+}
+
+fn main() {
+    assert!(!test(Some(Test::Foo)));
+    assert!(test(Some(Test::Bar)));
+    assert!(!test(Some(Test::Baz)));
+    assert!(test(Some(Test::Qux)));
+    assert!(!test(None))
+}
diff --git a/src/test/ui/or-patterns/basic-switchint.rs b/src/test/ui/or-patterns/basic-switchint.rs
new file mode 100644
index 0000000000..c5a6d894ea
--- /dev/null
+++ b/src/test/ui/or-patterns/basic-switchint.rs
@@ -0,0 +1,54 @@
+// Test basic or-patterns when the target pattern type will be lowered to
+// a `SwitchInt`. This will happen when the target type is an integer.
+
+// run-pass
+
+#![feature(or_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+#[derive(Debug)]
+enum Foo {
+    One(usize),
+    Two(usize, usize),
+}
+
+fn test_foo(x: Foo) -> MatchArm {
+    match x {
+        // normal pattern.
+        Foo::One(0) | Foo::One(1) | Foo::One(2) => MatchArm::Arm(0),
+        // most simple or-pattern.
+        Foo::One(42 | 255) => MatchArm::Arm(1),
+        // multiple or-patterns for one structure.
+        Foo::Two(42 | 255, 1024 | 2048) => MatchArm::Arm(2),
+        // mix of pattern types in one or-pattern (range).
+        Foo::One(100 | 110..=120 | 210..=220) => MatchArm::Arm(3),
+        // multiple or-patterns with wild.
+        Foo::Two(0..=10 | 100..=110, 0 | _) => MatchArm::Arm(4),
+        // wild
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    // `Foo` tests.
+    assert_eq!(test_foo(Foo::One(0)), MatchArm::Arm(0));
+    assert_eq!(test_foo(Foo::One(42)), MatchArm::Arm(1));
+    assert_eq!(test_foo(Foo::One(43)), MatchArm::Wild);
+    assert_eq!(test_foo(Foo::One(255)), MatchArm::Arm(1));
+    assert_eq!(test_foo(Foo::One(256)), MatchArm::Wild);
+    assert_eq!(test_foo(Foo::Two(42, 1023)), MatchArm::Wild);
+    assert_eq!(test_foo(Foo::Two(255, 2048)), MatchArm::Arm(2));
+    assert_eq!(test_foo(Foo::One(100)), MatchArm::Arm(3));
+    assert_eq!(test_foo(Foo::One(115)), MatchArm::Arm(3));
+    assert_eq!(test_foo(Foo::One(105)), MatchArm::Wild);
+    assert_eq!(test_foo(Foo::One(215)), MatchArm::Arm(3));
+    assert_eq!(test_foo(Foo::One(121)), MatchArm::Wild);
+    assert_eq!(test_foo(Foo::Two(0, 42)), MatchArm::Arm(4));
+    assert_eq!(test_foo(Foo::Two(100, 0)), MatchArm::Arm(4));
+    assert_eq!(test_foo(Foo::Two(42, 0)), MatchArm::Wild);
+}
diff --git a/src/test/ui/or-patterns/bindings-runpass-1.rs b/src/test/ui/or-patterns/bindings-runpass-1.rs
new file mode 100644
index 0000000000..0087167af7
--- /dev/null
+++ b/src/test/ui/or-patterns/bindings-runpass-1.rs
@@ -0,0 +1,25 @@
+// run-pass
+
+#![feature(or_patterns)]
+
+fn two_bindings(x: &((bool, bool), u8)) -> u8 {
+    match x {
+        &((true, y) | (y, true), z @ (0 | 4)) => (y as u8) + z,
+        _ => 20,
+    }
+}
+
+fn main() {
+    assert_eq!(two_bindings(&((false, false), 0)), 20);
+    assert_eq!(two_bindings(&((false, true), 0)), 0);
+    assert_eq!(two_bindings(&((true, false), 0)), 0);
+    assert_eq!(two_bindings(&((true, true), 0)), 1);
+    assert_eq!(two_bindings(&((false, false), 4)), 20);
+    assert_eq!(two_bindings(&((false, true), 4)), 4);
+    assert_eq!(two_bindings(&((true, false), 4)), 4);
+    assert_eq!(two_bindings(&((true, true), 4)), 5);
+    assert_eq!(two_bindings(&((false, false), 3)), 20);
+    assert_eq!(two_bindings(&((false, true), 3)), 20);
+    assert_eq!(two_bindings(&((true, false), 3)), 20);
+    assert_eq!(two_bindings(&((true, true), 3)), 20);
+}
diff --git a/src/test/ui/or-patterns/bindings-runpass-2.rs b/src/test/ui/or-patterns/bindings-runpass-2.rs
new file mode 100644
index 0000000000..0e1eb7b2e0
--- /dev/null
+++ b/src/test/ui/or-patterns/bindings-runpass-2.rs
@@ -0,0 +1,32 @@
+// run-pass
+
+#![feature(or_patterns)]
+
+fn or_at(x: Result<u32, u32>) -> u32 {
+    match x {
+        Ok(x @ 4) | Err(x @ (6 | 8)) => x,
+        Ok(x @ 1 | x @ 2) => x,
+        Err(x @ (0..=10 | 30..=40)) if x % 2 == 0 => x + 100,
+        Err(x @ 0..=40) => x + 200,
+        _ => 500,
+    }
+}
+
+fn main() {
+    assert_eq!(or_at(Ok(1)), 1);
+    assert_eq!(or_at(Ok(2)), 2);
+    assert_eq!(or_at(Ok(3)), 500);
+    assert_eq!(or_at(Ok(4)), 4);
+    assert_eq!(or_at(Ok(5)), 500);
+    assert_eq!(or_at(Ok(6)), 500);
+    assert_eq!(or_at(Err(1)), 201);
+    assert_eq!(or_at(Err(2)), 102);
+    assert_eq!(or_at(Err(3)), 203);
+    assert_eq!(or_at(Err(4)), 104);
+    assert_eq!(or_at(Err(5)), 205);
+    assert_eq!(or_at(Err(6)), 6);
+    assert_eq!(or_at(Err(7)), 207);
+    assert_eq!(or_at(Err(8)), 8);
+    assert_eq!(or_at(Err(20)), 220);
+    assert_eq!(or_at(Err(50)), 500);
+}
diff --git a/src/test/ui/or-patterns/box-patterns.rs b/src/test/ui/or-patterns/box-patterns.rs
new file mode 100644
index 0000000000..aafd479938
--- /dev/null
+++ b/src/test/ui/or-patterns/box-patterns.rs
@@ -0,0 +1,37 @@
+// Test or-patterns with box-patterns
+
+// run-pass
+
+#![feature(or_patterns)]
+#![feature(box_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+#[derive(Debug)]
+enum Test {
+    Foo,
+    Bar,
+    Baz,
+    Qux,
+}
+
+fn test(x: Option<Box<Test>>) -> MatchArm {
+    match x {
+        Some(box Test::Foo | box Test::Bar) => MatchArm::Arm(0),
+        Some(box Test::Baz) => MatchArm::Arm(1),
+        Some(_) => MatchArm::Arm(2),
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    assert_eq!(test(Some(Box::new(Test::Foo))), MatchArm::Arm(0));
+    assert_eq!(test(Some(Box::new(Test::Bar))), MatchArm::Arm(0));
+    assert_eq!(test(Some(Box::new(Test::Baz))), MatchArm::Arm(1));
+    assert_eq!(test(Some(Box::new(Test::Qux))), MatchArm::Arm(2));
+    assert_eq!(test(None), MatchArm::Wild);
+}
diff --git a/src/test/ui/or-patterns/consistent-bindings.rs b/src/test/ui/or-patterns/consistent-bindings.rs
index 0eb539dca4..3ee57978bb 100644
--- a/src/test/ui/or-patterns/consistent-bindings.rs
+++ b/src/test/ui/or-patterns/consistent-bindings.rs
@@ -2,8 +2,9 @@
 
 // edition:2018
 
+// check-pass
+
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete
 
 fn main() {
     // One level:
@@ -12,35 +13,29 @@ fn main() {
     let Ok(ref mut a) | Err(ref mut a) = Ok(0);
 
     // Two levels:
-    enum Tri<S, T, U> { V1(S), V2(T), V3(U) }
+    enum Tri<S, T, U> {
+        V1(S),
+        V2(T),
+        V3(U),
+    }
     use Tri::*;
 
-    let Ok((V1(a) | V2(a) | V3(a), b)) | Err(Ok((a, b)) | Err((a, b)))
-        : Result<_, Result<_, _>>
-        = Ok((V1(1), 1));
+    let Ok((V1(a) | V2(a) | V3(a), b)) | Err(Ok((a, b)) | Err((a, b))): Result<_, Result<_, _>> =
+        Ok((V1(1), 1));
 
-    let Ok((V1(a) | V2(a) | V3(a), ref b)) | Err(Ok((a, ref b)) | Err((a, ref b)))
-        : Result<_, Result<_, _>>
-        = Ok((V1(1), 1));
+    let Ok((V1(a) | V2(a) | V3(a), ref b)) | Err(Ok((a, ref b)) | Err((a, ref b))): Result<
+        _,
+        Result<_, _>,
+    > = Ok((V1(1), 1));
 
     // Three levels:
     let (
-            a,
-            Err((ref mut b, ref c, d)) |
-            Ok((
-                Ok(
-                    V1((ref c, d)) |
-                    V2((d, ref c)) |
-                    V3((ref c, Ok((_, d)) | Err((d, _))))
-                ) |
-                Err((ref c, d)),
-                ref mut b
-            ))
-        ) =
-        (1, Ok((Ok(V3((1, Ok((1, 1))))), 1)));
-
-    // FIXME(or_patterns; Centril | dlrobertson): remove this line below and
-    // change this test to check-pass once MIR can handle or-patterns with bindings.
-    let () = 0;
-    //~^ ERROR mismatched types
+        a,
+        Err((ref mut b, ref c, d))
+        | Ok((
+            Ok(V1((ref c, d)) | V2((d, ref c)) | V3((ref c, Ok((_, d)) | Err((d, _)))))
+            | Err((ref c, d)),
+            ref mut b,
+        )),
+    ): (_, Result<_, _>) = (1, Ok((Ok(V3((1, Ok::<_, (i32, i32)>((1, 1))))), 1)));
 }
diff --git a/src/test/ui/or-patterns/consistent-bindings.stderr b/src/test/ui/or-patterns/consistent-bindings.stderr
deleted file mode 100644
index 433a02dfb3..0000000000
--- a/src/test/ui/or-patterns/consistent-bindings.stderr
+++ /dev/null
@@ -1,17 +0,0 @@
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/consistent-bindings.rs:5:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
-error[E0308]: mismatched types
-  --> $DIR/consistent-bindings.rs:44:9
-   |
-LL |     let () = 0;
-   |         ^^ expected integer, found `()`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs b/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs
index 8b0be2e7a6..c8bc4a2a8d 100644
--- a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs
+++ b/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.rs
@@ -1,23 +1,15 @@
 #![feature(or_patterns)]
-
-#![allow(incomplete_features)]
 #![deny(unreachable_patterns)]
 
-// We wrap patterns in a tuple because top-level or-patterns are special-cased for now.
+// We wrap patterns in a tuple because top-level or-patterns were special-cased.
 fn main() {
-    // Get the fatal error out of the way
-    match (0u8,) {
-        (0 | _,) => {}
-        //~^ ERROR or-patterns are not fully implemented yet
-    }
-
     match (0u8, 0u8) {
         //~^ ERROR non-exhaustive patterns: `(2u8..=std::u8::MAX, _)`
         (0 | 1, 2 | 3) => {}
     }
     match ((0u8,),) {
         //~^ ERROR non-exhaustive patterns: `((4u8..=std::u8::MAX))`
-        ((0 | 1,) | (2 | 3,),) => {},
+        ((0 | 1,) | (2 | 3,),) => {}
     }
     match (Some(0u8),) {
         //~^ ERROR non-exhaustive patterns: `(Some(2u8..=std::u8::MAX))`
diff --git a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr b/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
index e6aa157d27..3ba26de10d 100644
--- a/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
+++ b/src/test/ui/or-patterns/exhaustiveness-non-exhaustive.stderr
@@ -1,5 +1,5 @@
 error[E0004]: non-exhaustive patterns: `(2u8..=std::u8::MAX, _)` not covered
-  --> $DIR/exhaustiveness-non-exhaustive.rs:14:11
+  --> $DIR/exhaustiveness-non-exhaustive.rs:6:11
    |
 LL |     match (0u8, 0u8) {
    |           ^^^^^^^^^^ pattern `(2u8..=std::u8::MAX, _)` not covered
@@ -7,7 +7,7 @@ LL |     match (0u8, 0u8) {
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
 
 error[E0004]: non-exhaustive patterns: `((4u8..=std::u8::MAX))` not covered
-  --> $DIR/exhaustiveness-non-exhaustive.rs:18:11
+  --> $DIR/exhaustiveness-non-exhaustive.rs:10:11
    |
 LL |     match ((0u8,),) {
    |           ^^^^^^^^^ pattern `((4u8..=std::u8::MAX))` not covered
@@ -15,19 +15,13 @@ LL |     match ((0u8,),) {
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
 
 error[E0004]: non-exhaustive patterns: `(Some(2u8..=std::u8::MAX))` not covered
-  --> $DIR/exhaustiveness-non-exhaustive.rs:22:11
+  --> $DIR/exhaustiveness-non-exhaustive.rs:14:11
    |
 LL |     match (Some(0u8),) {
    |           ^^^^^^^^^^^^ pattern `(Some(2u8..=std::u8::MAX))` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
 
-error: or-patterns are not fully implemented yet
-  --> $DIR/exhaustiveness-non-exhaustive.rs:10:10
-   |
-LL |         (0 | _,) => {}
-   |          ^^^^^
-
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
 
 For more information about this error, try `rustc --explain E0004`.
diff --git a/src/test/ui/or-patterns/exhaustiveness-pass.rs b/src/test/ui/or-patterns/exhaustiveness-pass.rs
index f0dc3447f3..8dcf8792f6 100644
--- a/src/test/ui/or-patterns/exhaustiveness-pass.rs
+++ b/src/test/ui/or-patterns/exhaustiveness-pass.rs
@@ -1,16 +1,10 @@
 #![feature(or_patterns)]
-
-#![allow(incomplete_features)]
 #![deny(unreachable_patterns)]
 
-// We wrap patterns in a tuple because top-level or-patterns are special-cased for now.
-fn main() {
-    // Get the fatal error out of the way
-    match (0,) {
-        (0 | _,) => {}
-        //~^ ERROR or-patterns are not fully implemented yet
-    }
+// check-pass
 
+// We wrap patterns in a tuple because top-level or-patterns were special-cased.
+fn main() {
     match (0,) {
         (1 | 2,) => {}
         _ => {}
@@ -27,11 +21,11 @@ fn main() {
         (Some(2..=255),) => {}
     }
     match ((0,),) {
-        ((0 | 1,) | (2 | 3,),) => {},
-        ((_,),) => {},
+        ((0 | 1,) | (2 | 3,),) => {}
+        ((_,),) => {}
     }
     match (&[0u8][..],) {
-        ([] | [0 | 1..=255] | [_, ..],) => {},
+        ([] | [0 | 1..=255] | [_, ..],) => {}
     }
 
     match ((0, 0),) {
diff --git a/src/test/ui/or-patterns/exhaustiveness-pass.stderr b/src/test/ui/or-patterns/exhaustiveness-pass.stderr
deleted file mode 100644
index 1f4278c4b8..0000000000
--- a/src/test/ui/or-patterns/exhaustiveness-pass.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: or-patterns are not fully implemented yet
-  --> $DIR/exhaustiveness-pass.rs:10:10
-   |
-LL |         (0 | _,) => {}
-   |          ^^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
index 81bc1176f5..44bae282d8 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
+++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.rs
@@ -1,16 +1,8 @@
 #![feature(or_patterns)]
-
-#![allow(incomplete_features)]
 #![deny(unreachable_patterns)]
 
-// We wrap patterns in a tuple because top-level or-patterns are special-cased for now.
+// We wrap patterns in a tuple because top-level or-patterns were special-cased.
 fn main() {
-    // Get the fatal error out of the way
-    match (0u8,) {
-        (0 | _,) => {}
-        //~^ ERROR or-patterns are not fully implemented yet
-    }
-
     match (0u8,) {
         (1 | 2,) => {}
         (1,) => {} //~ ERROR unreachable pattern
@@ -29,9 +21,9 @@ fn main() {
     }
     match (0u8, 0u8) {
         (1 | 2, 3 | 4) => {}
-        (1, 3) => {} //~ ERROR unreachable pattern
-        (1, 4) => {} //~ ERROR unreachable pattern
-        (2, 4) => {} //~ ERROR unreachable pattern
+        (1, 3) => {}     //~ ERROR unreachable pattern
+        (1, 4) => {}     //~ ERROR unreachable pattern
+        (2, 4) => {}     //~ ERROR unreachable pattern
         (2 | 1, 4) => {} //~ ERROR unreachable pattern
         (1, 5 | 6) => {}
         (1, 4 | 5) => {} //~ ERROR unreachable pattern
@@ -40,18 +32,17 @@ fn main() {
     match (Some(0u8),) {
         (None | Some(1 | 2),) => {}
         (Some(1),) => {} //~ ERROR unreachable pattern
-        (None,) => {} //~ ERROR unreachable pattern
+        (None,) => {}    //~ ERROR unreachable pattern
         _ => {}
     }
     match ((0u8,),) {
-        ((1 | 2,) | (3 | 4,),) => {},
-        ((1..=4,),) => {}, //~ ERROR unreachable pattern
-        _ => {},
+        ((1 | 2,) | (3 | 4,),) => {}
+        ((1..=4,),) => {} //~ ERROR unreachable pattern
+        _ => {}
     }
 
     match (0,) {
-        (1
-         | 1,) => {} //~ ERROR unreachable
+        (1 | 1,) => {} //~ ERROR unreachable
         _ => {}
     }
     match [0; 2] {
diff --git a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
index 87f69a484b..bef6f8270b 100644
--- a/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
+++ b/src/test/ui/or-patterns/exhaustiveness-unreachable-pattern.stderr
@@ -1,110 +1,104 @@
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:16:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:8:9
    |
 LL |         (1,) => {}
    |         ^^^^
    |
-note: lint level defined here
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:4:9
+note: the lint level is defined here
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:2:9
    |
 LL | #![deny(unreachable_patterns)]
    |         ^^^^^^^^^^^^^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:21:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:13:9
    |
 LL |         (2,) => {}
    |         ^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:27:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:19:9
    |
 LL |         (1 | 2,) => {}
    |         ^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:32:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:24:9
    |
 LL |         (1, 3) => {}
    |         ^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:33:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:25:9
    |
 LL |         (1, 4) => {}
    |         ^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:34:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:26:9
    |
 LL |         (2, 4) => {}
    |         ^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:35:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:27:9
    |
 LL |         (2 | 1, 4) => {}
    |         ^^^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:37:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:29:9
    |
 LL |         (1, 4 | 5) => {}
    |         ^^^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:42:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:34:9
    |
 LL |         (Some(1),) => {}
    |         ^^^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:43:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:35:9
    |
 LL |         (None,) => {}
    |         ^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:48:9
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:40:9
    |
-LL |         ((1..=4,),) => {},
+LL |         ((1..=4,),) => {}
    |         ^^^^^^^^^^^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:54:12
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:45:14
    |
-LL |          | 1,) => {}
-   |            ^
+LL |         (1 | 1,) => {}
+   |              ^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:61:15
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:52:15
    |
 LL |             | 0] => {}
    |               ^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:59:15
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:50:15
    |
 LL |             | 0
    |               ^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:69:10
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:60:10
    |
 LL |         [1
    |          ^
 
 error: unreachable pattern
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:75:14
+  --> $DIR/exhaustiveness-unreachable-pattern.rs:66:14
    |
 LL |         Some(0
    |              ^
 
-error: or-patterns are not fully implemented yet
-  --> $DIR/exhaustiveness-unreachable-pattern.rs:10:10
-   |
-LL |         (0 | _,) => {}
-   |          ^^^^^
-
-error: aborting due to 17 previous errors
+error: aborting due to 16 previous errors
 
diff --git a/src/test/ui/or-patterns/feature-gate-const-fn.rs b/src/test/ui/or-patterns/feature-gate-const-fn.rs
index d73dcf2666..2ef5537db6 100644
--- a/src/test/ui/or-patterns/feature-gate-const-fn.rs
+++ b/src/test/ui/or-patterns/feature-gate-const-fn.rs
@@ -1,5 +1,4 @@
 #![feature(or_patterns)]
-#![allow(incomplete_features)]
 
 const fn foo((Ok(a) | Err(a)): Result<i32, i32>) {
     //~^ ERROR or-pattern is not allowed in a `const fn`
@@ -31,6 +30,8 @@ fn main() {
         let x = Ok(3);
         let Ok(y) | Err(y) = x;
         //~^ ERROR or-pattern is not allowed in a `const`
+        //~| ERROR constant contains unimplemented expression type
+        //~| ERROR constant contains unimplemented expression type
         2
     }];
 }
diff --git a/src/test/ui/or-patterns/feature-gate-const-fn.stderr b/src/test/ui/or-patterns/feature-gate-const-fn.stderr
index 26143d2f19..38233a944c 100644
--- a/src/test/ui/or-patterns/feature-gate-const-fn.stderr
+++ b/src/test/ui/or-patterns/feature-gate-const-fn.stderr
@@ -1,57 +1,70 @@
 error[E0658]: or-pattern is not allowed in a `const fn`
-  --> $DIR/feature-gate-const-fn.rs:4:15
+  --> $DIR/feature-gate-const-fn.rs:3:15
    |
 LL | const fn foo((Ok(a) | Err(a)): Result<i32, i32>) {
    |               ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: or-pattern is not allowed in a `const fn`
-  --> $DIR/feature-gate-const-fn.rs:7:9
+  --> $DIR/feature-gate-const-fn.rs:6:9
    |
 LL |     let Ok(y) | Err(y) = x;
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: or-pattern is not allowed in a `const`
-  --> $DIR/feature-gate-const-fn.rs:13:9
+  --> $DIR/feature-gate-const-fn.rs:12:9
    |
 LL |     let Ok(y) | Err(y) = x;
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: or-pattern is not allowed in a `static`
-  --> $DIR/feature-gate-const-fn.rs:19:9
+  --> $DIR/feature-gate-const-fn.rs:18:9
    |
 LL |     let Ok(y) | Err(y) = x;
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: or-pattern is not allowed in a `static mut`
-  --> $DIR/feature-gate-const-fn.rs:25:9
+  --> $DIR/feature-gate-const-fn.rs:24:9
    |
 LL |     let Ok(y) | Err(y) = x;
    |         ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: or-pattern is not allowed in a `const`
-  --> $DIR/feature-gate-const-fn.rs:32:13
+  --> $DIR/feature-gate-const-fn.rs:31:13
    |
 LL |         let Ok(y) | Err(y) = x;
    |             ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
-error: aborting due to 6 previous errors
+error[E0019]: constant contains unimplemented expression type
+  --> $DIR/feature-gate-const-fn.rs:31:25
+   |
+LL |         let Ok(y) | Err(y) = x;
+   |                         ^
+
+error[E0019]: constant contains unimplemented expression type
+  --> $DIR/feature-gate-const-fn.rs:31:16
+   |
+LL |         let Ok(y) | Err(y) = x;
+   |                ^
+
+error: aborting due to 8 previous errors
 
-For more information about this error, try `rustc --explain E0658`.
+Some errors have detailed explanations: E0019, E0658.
+For more information about an error, try `rustc --explain E0019`.
diff --git a/src/test/ui/or-patterns/feature-gate-or_patterns-leading-for.stderr b/src/test/ui/or-patterns/feature-gate-or_patterns-leading-for.stderr
index f520409e8b..abcee43553 100644
--- a/src/test/ui/or-patterns/feature-gate-or_patterns-leading-for.stderr
+++ b/src/test/ui/or-patterns/feature-gate-or_patterns-leading-for.stderr
@@ -4,7 +4,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     for | A in 0 {}
    |         ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/or-patterns/feature-gate-or_patterns-leading-let.stderr b/src/test/ui/or-patterns/feature-gate-or_patterns-leading-let.stderr
index 30fd6a1a95..499f60dd54 100644
--- a/src/test/ui/or-patterns/feature-gate-or_patterns-leading-let.stderr
+++ b/src/test/ui/or-patterns/feature-gate-or_patterns-leading-let.stderr
@@ -4,7 +4,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let | A;
    |         ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/or-patterns/feature-gate-or_patterns.stderr b/src/test/ui/or-patterns/feature-gate-or_patterns.stderr
index aae6644dac..a9e43a4575 100644
--- a/src/test/ui/or-patterns/feature-gate-or_patterns.stderr
+++ b/src/test/ui/or-patterns/feature-gate-or_patterns.stderr
@@ -4,7 +4,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |         Some(0 | 1 | 2) => {}
    |              ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -13,7 +13,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let | A | B;
    |           ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -22,7 +22,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let A | B;
    |         ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -31,7 +31,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     for | A | B in 0 {}
    |           ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -40,7 +40,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     for A | B in 0 {}
    |         ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -49,7 +49,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     fn fun((A | B): _) {}
    |             ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -58,7 +58,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let _ = |(A | B): u8| ();
    |               ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -67,7 +67,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let (A | B);
    |          ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -76,7 +76,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let (A | B,);
    |          ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -85,7 +85,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let A(B | C);
    |           ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -94,7 +94,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let E::V(B | C);
    |              ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -103,7 +103,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let S { f1: B | C, f2 };
    |                 ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -112,7 +112,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let E::V { f1: B | C, f2 };
    |                    ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -121,7 +121,7 @@ error[E0658]: or-patterns syntax is experimental
 LL |     let [A | B];
    |          ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -130,7 +130,7 @@ error[E0658]: or-patterns syntax is experimental
 LL | accept_pat!((p | q));
    |              ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -139,7 +139,7 @@ error[E0658]: or-patterns syntax is experimental
 LL | accept_pat!((p | q,));
    |              ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -148,7 +148,7 @@ error[E0658]: or-patterns syntax is experimental
 LL | accept_pat!(TS(p | q));
    |                ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -157,7 +157,7 @@ error[E0658]: or-patterns syntax is experimental
 LL | accept_pat!(NS { f: p | q });
    |                     ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error[E0658]: or-patterns syntax is experimental
@@ -166,7 +166,7 @@ error[E0658]: or-patterns syntax is experimental
 LL | accept_pat!([p | q]);
    |              ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54883
+   = note: see issue #54883 <https://github.com/rust-lang/rust/issues/54883> for more information
    = help: add `#![feature(or_patterns)]` to the crate attributes to enable
 
 error: aborting due to 19 previous errors
diff --git a/src/test/ui/or-patterns/for-loop.rs b/src/test/ui/or-patterns/for-loop.rs
new file mode 100644
index 0000000000..b79af6c402
--- /dev/null
+++ b/src/test/ui/or-patterns/for-loop.rs
@@ -0,0 +1,18 @@
+// Check that or patterns are lowered correctly in `for` loops.
+// run-pass
+
+#![feature(or_patterns)]
+
+fn main() {
+    let v = vec![Ok(2), Err(3), Ok(5)];
+    let mut w = Vec::new();
+    for &(Ok(i) | Err(i)) in &v {
+        w.push(i);
+    }
+    let mut u = Vec::new();
+    for Ok(i) | Err(i) in v {
+        u.push(i);
+    }
+    assert_eq!(w, [2, 3, 5]);
+    assert_eq!(u, [2, 3, 5]);
+}
diff --git a/src/test/ui/or-patterns/if-let-while-let.rs b/src/test/ui/or-patterns/if-let-while-let.rs
new file mode 100644
index 0000000000..9256360b29
--- /dev/null
+++ b/src/test/ui/or-patterns/if-let-while-let.rs
@@ -0,0 +1,22 @@
+// Check that or patterns are lowered correctly in `if let` and `while let` expressions.
+// run-pass
+
+#![feature(or_patterns)]
+
+fn main() {
+    let mut opt = Some(3);
+    let mut w = Vec::new();
+    while let Some(ref mut val @ (3 | 4 | 6)) = opt {
+        w.push(*val);
+        *val += 1;
+    }
+    assert_eq!(w, [3, 4]);
+    if let &(None | Some(6 | 7)) = &opt {
+        unreachable!();
+    }
+    if let Some(x @ (4 | 5 | 6)) = opt {
+        assert_eq!(x, 5);
+    } else {
+        unreachable!();
+    }
+}
diff --git a/src/test/ui/or-patterns/inconsistent-modes.rs b/src/test/ui/or-patterns/inconsistent-modes.rs
index 44836893ea..fd5cb01ab4 100644
--- a/src/test/ui/or-patterns/inconsistent-modes.rs
+++ b/src/test/ui/or-patterns/inconsistent-modes.rs
@@ -1,28 +1,26 @@
 // This test ensures that or patterns require binding mode consistency across arms.
 
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete
-
 #![allow(non_camel_case_types)]
 fn main() {
     // One level:
     let Ok(a) | Err(ref a): Result<&u8, u8> = Ok(&0);
-    //~^ ERROR variable `a` is bound in inconsistent ways
+    //~^ ERROR variable `a` is bound inconsistently
     let Ok(ref mut a) | Err(a): Result<u8, &mut u8> = Ok(0);
-    //~^ ERROR variable `a` is bound in inconsistent ways
+    //~^ ERROR variable `a` is bound inconsistently
     let Ok(ref a) | Err(ref mut a): Result<&u8, &mut u8> = Ok(&0);
-    //~^ ERROR variable `a` is bound in inconsistent ways
+    //~^ ERROR variable `a` is bound inconsistently
     //~| ERROR mismatched types
     let Ok((ref a, b)) | Err((ref mut a, ref b)) = Ok((0, &0));
-    //~^ ERROR variable `a` is bound in inconsistent ways
-    //~| ERROR variable `b` is bound in inconsistent ways
+    //~^ ERROR variable `a` is bound inconsistently
+    //~| ERROR variable `b` is bound inconsistently
     //~| ERROR mismatched types
 
     // Two levels:
     let Ok(Ok(a) | Err(a)) | Err(ref a) = Err(0);
-    //~^ ERROR variable `a` is bound in inconsistent ways
+    //~^ ERROR variable `a` is bound inconsistently
 
     // Three levels:
-    let Ok([ Ok((Ok(ref a) | Err(a),)) | Err(a) ]) | Err(a) = Err(&1);
-    //~^ ERROR variable `a` is bound in inconsistent ways
+    let Ok([Ok((Ok(ref a) | Err(a),)) | Err(a)]) | Err(a) = Err(&1);
+    //~^ ERROR variable `a` is bound inconsistently
 }
diff --git a/src/test/ui/or-patterns/inconsistent-modes.stderr b/src/test/ui/or-patterns/inconsistent-modes.stderr
index 7c1638ff94..c5dcef36e0 100644
--- a/src/test/ui/or-patterns/inconsistent-modes.stderr
+++ b/src/test/ui/or-patterns/inconsistent-modes.stderr
@@ -1,82 +1,78 @@
-error[E0409]: variable `a` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:9:25
+error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:7:25
    |
 LL |     let Ok(a) | Err(ref a): Result<&u8, u8> = Ok(&0);
    |            -            ^ bound in different ways
    |            |
    |            first binding
 
-error[E0409]: variable `a` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:11:29
+error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:9:29
    |
 LL |     let Ok(ref mut a) | Err(a): Result<u8, &mut u8> = Ok(0);
    |                    -        ^ bound in different ways
    |                    |
    |                    first binding
 
-error[E0409]: variable `a` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:13:33
+error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:11:33
    |
 LL |     let Ok(ref a) | Err(ref mut a): Result<&u8, &mut u8> = Ok(&0);
    |                - first binding  ^ bound in different ways
 
-error[E0409]: variable `a` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:16:39
+error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:14:39
    |
 LL |     let Ok((ref a, b)) | Err((ref mut a, ref b)) = Ok((0, &0));
    |                 - first binding       ^ bound in different ways
 
-error[E0409]: variable `b` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:16:46
+error[E0409]: variable `b` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:14:46
    |
 LL |     let Ok((ref a, b)) | Err((ref mut a, ref b)) = Ok((0, &0));
    |                    - first binding           ^ bound in different ways
 
-error[E0409]: variable `a` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:22:38
+error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:20:38
    |
 LL |     let Ok(Ok(a) | Err(a)) | Err(ref a) = Err(0);
    |                        -             ^ bound in different ways
    |                        |
    |                        first binding
 
-error[E0409]: variable `a` is bound in inconsistent ways within the same match arm
-  --> $DIR/inconsistent-modes.rs:26:34
+error[E0409]: variable `a` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/inconsistent-modes.rs:24:33
    |
-LL |     let Ok([ Ok((Ok(ref a) | Err(a),)) | Err(a) ]) | Err(a) = Err(&1);
-   |                         -        ^ bound in different ways
-   |                         |
-   |                         first binding
-
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/inconsistent-modes.rs:3:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
+LL |     let Ok([Ok((Ok(ref a) | Err(a),)) | Err(a)]) | Err(a) = Err(&1);
+   |                        -        ^ bound in different ways
+   |                        |
+   |                        first binding
 
 error[E0308]: mismatched types
-  --> $DIR/inconsistent-modes.rs:13:25
+  --> $DIR/inconsistent-modes.rs:11:25
    |
 LL |     let Ok(ref a) | Err(ref mut a): Result<&u8, &mut u8> = Ok(&0);
-   |                         ^^^^^^^^^   -------------------- expected due to this
-   |                         |
-   |                         types differ in mutability
+   |            -----        ^^^^^^^^^   -------------------- expected due to this
+   |            |            |
+   |            |            types differ in mutability
+   |            first introduced with type `&&u8` here
    |
    = note: expected type `&&u8`
               found type `&mut &mut u8`
+   = note: a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/inconsistent-modes.rs:16:31
+  --> $DIR/inconsistent-modes.rs:14:31
    |
 LL |     let Ok((ref a, b)) | Err((ref mut a, ref b)) = Ok((0, &0));
-   |                               ^^^^^^^^^            ----------- this expression has type `std::result::Result<({integer}, &{integer}), (_, _)>`
-   |                               |
-   |                               types differ in mutability
+   |             -----             ^^^^^^^^^            ----------- this expression has type `std::result::Result<({integer}, &{integer}), (_, _)>`
+   |             |                 |
+   |             |                 types differ in mutability
+   |             first introduced with type `&{integer}` here
    |
    = note: expected type `&{integer}`
               found type `&mut _`
+   = note: a binding must have the same type in all alternatives
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs b/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs
new file mode 100644
index 0000000000..0c2ae44e54
--- /dev/null
+++ b/src/test/ui/or-patterns/issue-67514-irrefutable-param.rs
@@ -0,0 +1,11 @@
+// Check that we don't ICE for irrefutable or-patterns in function parameters
+
+// check-pass
+
+#![feature(or_patterns)]
+
+fn foo((Some(_) | None): Option<u32>) {}
+
+fn main() {
+    foo(None);
+}
diff --git a/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs b/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
new file mode 100644
index 0000000000..1a65a1e544
--- /dev/null
+++ b/src/test/ui/or-patterns/issue-68785-irrefutable-param-with-at.rs
@@ -0,0 +1,14 @@
+// check-pass
+
+#![feature(or_patterns)]
+
+enum MyEnum {
+    FirstCase(u8),
+    OtherCase(u16),
+}
+
+fn my_fn(x @ (MyEnum::FirstCase(_) | MyEnum::OtherCase(_)): MyEnum) {}
+
+fn main() {
+    my_fn(MyEnum::FirstCase(0));
+}
diff --git a/src/test/ui/or-patterns/let-pattern.rs b/src/test/ui/or-patterns/let-pattern.rs
new file mode 100644
index 0000000000..07e37412ce
--- /dev/null
+++ b/src/test/ui/or-patterns/let-pattern.rs
@@ -0,0 +1,19 @@
+#![feature(or_patterns)]
+
+// run-pass
+
+fn or_pat_let(x: Result<u32, u32>) -> u32 {
+    let Ok(y) | Err(y) = x;
+    y
+}
+
+fn or_pat_arg((Ok(y) | Err(y)): Result<u32, u32>) -> u32 {
+    y
+}
+
+fn main() {
+    assert_eq!(or_pat_let(Ok(3)), 3);
+    assert_eq!(or_pat_let(Err(5)), 5);
+    assert_eq!(or_pat_arg(Ok(7)), 7);
+    assert_eq!(or_pat_arg(Err(9)), 9);
+}
diff --git a/src/test/ui/or-patterns/missing-bindings.rs b/src/test/ui/or-patterns/missing-bindings.rs
index b065028e7a..67cf52fa8c 100644
--- a/src/test/ui/or-patterns/missing-bindings.rs
+++ b/src/test/ui/or-patterns/missing-bindings.rs
@@ -3,8 +3,6 @@
 // edition:2018
 
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete
-
 #![allow(non_camel_case_types)]
 
 fn main() {}
diff --git a/src/test/ui/or-patterns/missing-bindings.stderr b/src/test/ui/or-patterns/missing-bindings.stderr
index c73af7a42e..57270e4412 100644
--- a/src/test/ui/or-patterns/missing-bindings.stderr
+++ b/src/test/ui/or-patterns/missing-bindings.stderr
@@ -1,5 +1,5 @@
 error[E0408]: variable `beta` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:22:9
+  --> $DIR/missing-bindings.rs:20:9
    |
 LL |     let alpha | beta | charlie = alpha;
    |         ^^^^^   ----   ^^^^^^^ pattern doesn't bind `beta`
@@ -8,7 +8,7 @@ LL |     let alpha | beta | charlie = alpha;
    |         pattern doesn't bind `beta`
 
 error[E0408]: variable `beta` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:24:14
+  --> $DIR/missing-bindings.rs:22:14
    |
 LL |         Some(alpha | beta) => {}
    |              ^^^^^   ---- variable not in all patterns
@@ -16,7 +16,7 @@ LL |         Some(alpha | beta) => {}
    |              pattern doesn't bind `beta`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:36:19
+  --> $DIR/missing-bindings.rs:34:19
    |
 LL |     let A(a, _) | _ = X;
    |           -       ^ pattern doesn't bind `a`
@@ -24,7 +24,7 @@ LL |     let A(a, _) | _ = X;
    |           variable not in all patterns
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:37:9
+  --> $DIR/missing-bindings.rs:35:9
    |
 LL |     let _ | B(a) = X;
    |         ^     - variable not in all patterns
@@ -32,7 +32,7 @@ LL |     let _ | B(a) = X;
    |         pattern doesn't bind `a`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:38:9
+  --> $DIR/missing-bindings.rs:36:9
    |
 LL |     let A(..) | B(a) = X;
    |         ^^^^^     - variable not in all patterns
@@ -40,7 +40,7 @@ LL |     let A(..) | B(a) = X;
    |         pattern doesn't bind `a`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:39:19
+  --> $DIR/missing-bindings.rs:37:19
    |
 LL |     let A(a, _) | B(_) = X;
    |           -       ^^^^ pattern doesn't bind `a`
@@ -48,7 +48,7 @@ LL |     let A(a, _) | B(_) = X;
    |           variable not in all patterns
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:40:19
+  --> $DIR/missing-bindings.rs:38:19
    |
 LL |     let A(_, a) | B(_) = X;
    |              -    ^^^^ pattern doesn't bind `a`
@@ -56,7 +56,7 @@ LL |     let A(_, a) | B(_) = X;
    |              variable not in all patterns
 
 error[E0408]: variable `b` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:41:19
+  --> $DIR/missing-bindings.rs:39:19
    |
 LL |     let A(a, b) | B(a) = X;
    |              -    ^^^^ pattern doesn't bind `b`
@@ -64,7 +64,7 @@ LL |     let A(a, b) | B(a) = X;
    |              variable not in all patterns
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:45:9
+  --> $DIR/missing-bindings.rs:43:9
    |
 LL |     let A(A(..) | B(_), _) | B(a) = Y;
    |         ^^^^^^^^^^^^^^^^^^     - variable not in all patterns
@@ -72,7 +72,7 @@ LL |     let A(A(..) | B(_), _) | B(a) = Y;
    |         pattern doesn't bind `a`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:46:11
+  --> $DIR/missing-bindings.rs:44:11
    |
 LL |     let A(A(..) | B(a), _) | B(A(a, _) | B(a)) = Y;
    |           ^^^^^     - variable not in all patterns
@@ -80,7 +80,7 @@ LL |     let A(A(..) | B(a), _) | B(A(a, _) | B(a)) = Y;
    |           pattern doesn't bind `a`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:21
+  --> $DIR/missing-bindings.rs:46:21
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |             -       ^^^^ pattern doesn't bind `a`
@@ -88,7 +88,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |             variable not in all patterns
 
 error[E0408]: variable `b` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:21
+  --> $DIR/missing-bindings.rs:46:21
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                -    ^^^^ pattern doesn't bind `b`
@@ -96,7 +96,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                variable not in all patterns
 
 error[E0408]: variable `c` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:11
+  --> $DIR/missing-bindings.rs:46:11
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |           ^^^^^^^     - variable not in all patterns
@@ -104,7 +104,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |           pattern doesn't bind `c`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:32
+  --> $DIR/missing-bindings.rs:46:32
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |             -                  ^^^^ pattern doesn't bind `a`
@@ -112,7 +112,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |             variable not in all patterns
 
 error[E0408]: variable `b` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:32
+  --> $DIR/missing-bindings.rs:46:32
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                -               ^^^^ pattern doesn't bind `b`
@@ -120,7 +120,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                variable not in all patterns
 
 error[E0408]: variable `c` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:32
+  --> $DIR/missing-bindings.rs:46:32
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                       -        ^^^^ pattern doesn't bind `c`
@@ -128,7 +128,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                       variable not in all patterns
 
 error[E0408]: variable `d` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:32
+  --> $DIR/missing-bindings.rs:46:32
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                           -    ^^^^ pattern doesn't bind `d`
@@ -136,7 +136,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |                           variable not in all patterns
 
 error[E0408]: variable `e` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:48:9
+  --> $DIR/missing-bindings.rs:46:9
    |
 LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |         ^^^^^^^^^^^^^^^^^^^^     - variable not in all patterns
@@ -144,7 +144,7 @@ LL |     let A(A(a, b) | B(c), d) | B(e) = Y;
    |         pattern doesn't bind `e`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:64:29
+  --> $DIR/missing-bindings.rs:62:29
    |
 LL |                     Ok(a) | Err(_),
    |                        -    ^^^^^^ pattern doesn't bind `a`
@@ -152,7 +152,7 @@ LL |                     Ok(a) | Err(_),
    |                        variable not in all patterns
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:72:21
+  --> $DIR/missing-bindings.rs:70:21
    |
 LL |                     A(_, a) |
    |                          - variable not in all patterns
@@ -160,7 +160,7 @@ LL |                     B(b),
    |                     ^^^^ pattern doesn't bind `a`
 
 error[E0408]: variable `b` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:71:21
+  --> $DIR/missing-bindings.rs:69:21
    |
 LL |                     A(_, a) |
    |                     ^^^^^^^ pattern doesn't bind `b`
@@ -168,7 +168,7 @@ LL |                     B(b),
    |                       - variable not in all patterns
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:75:17
+  --> $DIR/missing-bindings.rs:73:17
    |
 LL |                     A(_, a) |
    |                          - variable not in all patterns
@@ -177,7 +177,7 @@ LL |                 B(_)
    |                 ^^^^ pattern doesn't bind `a`
 
 error[E0408]: variable `b` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:75:17
+  --> $DIR/missing-bindings.rs:73:17
    |
 LL |                     B(b),
    |                       - variable not in all patterns
@@ -186,7 +186,7 @@ LL |                 B(_)
    |                 ^^^^ pattern doesn't bind `b`
 
 error[E0408]: variable `a` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:79:13
+  --> $DIR/missing-bindings.rs:77:13
    |
 LL |                 B(Ok(a) | Err(a))
    |                               - variable not in all patterns
@@ -198,7 +198,7 @@ LL |             V3(c),
    |             ^^^^^ pattern doesn't bind `a`
 
 error[E0408]: variable `b` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:60:13
+  --> $DIR/missing-bindings.rs:58:13
    |
 LL | /             V1(
 LL | |
@@ -216,7 +216,7 @@ LL |               V3(c),
    |               ^^^^^ pattern doesn't bind `b`
 
 error[E0408]: variable `c` is not bound in all patterns
-  --> $DIR/missing-bindings.rs:60:13
+  --> $DIR/missing-bindings.rs:58:13
    |
 LL | /             V1(
 LL | |
@@ -237,14 +237,6 @@ LL | |             ) |
 LL |               V3(c),
    |                  - variable not in all patterns
 
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/missing-bindings.rs:5:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
 error: aborting due to 26 previous errors
 
 For more information about this error, try `rustc --explain E0408`.
diff --git a/src/test/ui/or-patterns/mix-with-wild.rs b/src/test/ui/or-patterns/mix-with-wild.rs
new file mode 100644
index 0000000000..37f20df1b3
--- /dev/null
+++ b/src/test/ui/or-patterns/mix-with-wild.rs
@@ -0,0 +1,19 @@
+// Test that an or-pattern works with a wild pattern. This tests two things:
+//
+//  1) The Wild pattern should cause the pattern to always succeed.
+//  2) or-patterns should work with simplifyable patterns.
+
+// run-pass
+#![feature(or_patterns)]
+
+pub fn test(x: Option<usize>) -> bool {
+    match x {
+        Some(0 | _) => true,
+        _ => false,
+    }
+}
+
+fn main() {
+    assert!(test(Some(42)));
+    assert!(!test(None));
+}
diff --git a/src/test/ui/or-patterns/multiple-pattern-typo.rs b/src/test/ui/or-patterns/multiple-pattern-typo.rs
index e308c0adb4..702c957374 100644
--- a/src/test/ui/or-patterns/multiple-pattern-typo.rs
+++ b/src/test/ui/or-patterns/multiple-pattern-typo.rs
@@ -1,5 +1,4 @@
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete and may cause the compiler to crash
 
 fn main() {
     let x = 3;
diff --git a/src/test/ui/or-patterns/multiple-pattern-typo.stderr b/src/test/ui/or-patterns/multiple-pattern-typo.stderr
index c71c760b1e..cb32068ec0 100644
--- a/src/test/ui/or-patterns/multiple-pattern-typo.stderr
+++ b/src/test/ui/or-patterns/multiple-pattern-typo.stderr
@@ -1,5 +1,5 @@
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:8:15
+  --> $DIR/multiple-pattern-typo.rs:7:15
    |
 LL |         1 | 2 || 3 => (),
    |         -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
@@ -7,7 +7,7 @@ LL |         1 | 2 || 3 => (),
    |         while parsing this or-pattern starting here
 
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:13:16
+  --> $DIR/multiple-pattern-typo.rs:12:16
    |
 LL |         (1 | 2 || 3) => (),
    |          -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
@@ -15,7 +15,7 @@ LL |         (1 | 2 || 3) => (),
    |          while parsing this or-pattern starting here
 
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:18:16
+  --> $DIR/multiple-pattern-typo.rs:17:16
    |
 LL |         (1 | 2 || 3,) => (),
    |          -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
@@ -23,7 +23,7 @@ LL |         (1 | 2 || 3,) => (),
    |          while parsing this or-pattern starting here
 
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:25:18
+  --> $DIR/multiple-pattern-typo.rs:24:18
    |
 LL |         TS(1 | 2 || 3) => (),
    |            -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
@@ -31,7 +31,7 @@ LL |         TS(1 | 2 || 3) => (),
    |            while parsing this or-pattern starting here
 
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:32:23
+  --> $DIR/multiple-pattern-typo.rs:31:23
    |
 LL |         NS { f: 1 | 2 || 3 } => (),
    |                 -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
@@ -39,7 +39,7 @@ LL |         NS { f: 1 | 2 || 3 } => (),
    |                 while parsing this or-pattern starting here
 
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:37:16
+  --> $DIR/multiple-pattern-typo.rs:36:16
    |
 LL |         [1 | 2 || 3] => (),
    |          -     ^^ help: use a single `|` to separate multiple alternative patterns: `|`
@@ -47,18 +47,10 @@ LL |         [1 | 2 || 3] => (),
    |          while parsing this or-pattern starting here
 
 error: unexpected token `||` after pattern
-  --> $DIR/multiple-pattern-typo.rs:42:9
+  --> $DIR/multiple-pattern-typo.rs:41:9
    |
 LL |         || 1 | 2 | 3 => (),
    |         ^^ help: use a single `|` to separate multiple alternative patterns: `|`
 
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/multiple-pattern-typo.rs:1:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/or-patterns/or-pattern-mismatch.rs b/src/test/ui/or-patterns/or-pattern-mismatch.rs
deleted file mode 100644
index 973954bca5..0000000000
--- a/src/test/ui/or-patterns/or-pattern-mismatch.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-enum Blah { A(isize, isize, usize), B(isize, isize) }
-
-fn main() { match Blah::A(1, 1, 2) { Blah::A(_, x, y) | Blah::B(x, y) => { } } }
-//~^ ERROR mismatched types
diff --git a/src/test/ui/or-patterns/or-pattern-mismatch.stderr b/src/test/ui/or-patterns/or-pattern-mismatch.stderr
deleted file mode 100644
index bc288e0625..0000000000
--- a/src/test/ui/or-patterns/or-pattern-mismatch.stderr
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/or-pattern-mismatch.rs:3:68
-   |
-LL | fn main() { match Blah::A(1, 1, 2) { Blah::A(_, x, y) | Blah::B(x, y) => { } } }
-   |                   ---------------- this expression has type `Blah` ^ expected `usize`, found `isize`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
new file mode 100644
index 0000000000..5ec7dc6962
--- /dev/null
+++ b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.rs
@@ -0,0 +1,68 @@
+// Here we test type checking of bindings when combined with or-patterns.
+// Specifically, we ensure that introducing bindings of different types result in type errors.
+
+#![feature(or_patterns)]
+
+fn main() {
+    enum Blah {
+        A(isize, isize, usize),
+        B(isize, isize),
+    }
+
+    match Blah::A(1, 1, 2) {
+        Blah::A(_, x, y) | Blah::B(x, y) => {} //~ ERROR mismatched types
+    }
+
+    match Some(Blah::A(1, 1, 2)) {
+        Some(Blah::A(_, x, y) | Blah::B(x, y)) => {} //~ ERROR mismatched types
+    }
+
+    match (0u8, 1u16) {
+        (x, y) | (y, x) => {} //~ ERROR mismatched types
+                              //~^ ERROR mismatched types
+    }
+
+    match Some((0u8, Some((1u16, 2u32)))) {
+        Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
+        //~^ ERROR mismatched types
+        //~| ERROR mismatched types
+        //~| ERROR mismatched types
+        //~| ERROR mismatched types
+        _ => {}
+    }
+
+    if let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2) {
+        //~^ ERROR mismatched types
+    }
+
+    if let Some(Blah::A(_, x, y) | Blah::B(x, y)) = Some(Blah::A(1, 1, 2)) {
+        //~^ ERROR mismatched types
+    }
+
+    if let (x, y) | (y, x) = (0u8, 1u16) {
+        //~^ ERROR mismatched types
+        //~| ERROR mismatched types
+    }
+
+    if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
+        //~^ ERROR mismatched types
+        //~| ERROR mismatched types
+        //~| ERROR mismatched types
+        //~| ERROR mismatched types
+    = Some((0u8, Some((1u16, 2u32))))
+    {}
+
+    let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2);
+    //~^ ERROR mismatched types
+
+    let (x, y) | (y, x) = (0u8, 1u16);
+    //~^ ERROR mismatched types
+    //~| ERROR mismatched types
+
+    fn f1((Blah::A(_, x, y) | Blah::B(x, y)): Blah) {}
+    //~^ ERROR mismatched types
+
+    fn f2(((x, y) | (y, x)): (u8, u16)) {}
+    //~^ ERROR mismatched types
+    //~| ERROR mismatched types
+}
diff --git a/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
new file mode 100644
index 0000000000..1dabb7c975
--- /dev/null
+++ b/src/test/ui/or-patterns/or-patterns-binding-type-mismatch.stderr
@@ -0,0 +1,257 @@
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:13:39
+   |
+LL |     match Blah::A(1, 1, 2) {
+   |           ---------------- this expression has type `main::Blah`
+LL |         Blah::A(_, x, y) | Blah::B(x, y) => {}
+   |                       -               ^ expected `usize`, found `isize`
+   |                       |
+   |                       first introduced with type `usize` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:17:44
+   |
+LL |     match Some(Blah::A(1, 1, 2)) {
+   |           ---------------------- this expression has type `std::option::Option<main::Blah>`
+LL |         Some(Blah::A(_, x, y) | Blah::B(x, y)) => {}
+   |                            -               ^ expected `usize`, found `isize`
+   |                            |
+   |                            first introduced with type `usize` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:21:19
+   |
+LL |     match (0u8, 1u16) {
+   |           ----------- this expression has type `(u8, u16)`
+LL |         (x, y) | (y, x) => {}
+   |             -     ^ expected `u16`, found `u8`
+   |             |
+   |             first introduced with type `u16` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:21:22
+   |
+LL |     match (0u8, 1u16) {
+   |           ----------- this expression has type `(u8, u16)`
+LL |         (x, y) | (y, x) => {}
+   |          -           ^ expected `u8`, found `u16`
+   |          |
+   |          first introduced with type `u8` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:41
+   |
+LL |     match Some((0u8, Some((1u16, 2u32)))) {
+   |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
+   |                        -                ^ expected `u16`, found `u8`
+   |                        |
+   |                        first introduced with type `u16` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:50
+   |
+LL |     match Some((0u8, Some((1u16, 2u32)))) {
+   |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
+   |               -                                  ^ expected `u8`, found `u16`
+   |               |
+   |               first introduced with type `u8` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:59
+   |
+LL |     match Some((0u8, Some((1u16, 2u32)))) {
+   |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
+   |                           -                               ^ expected `u32`, found `u16`
+   |                           |
+   |                           first introduced with type `u32` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:26:62
+   |
+LL |     match Some((0u8, Some((1u16, 2u32)))) {
+   |           ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+LL |         Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x)))) => {}
+   |               - first introduced with type `u8` here         ^ expected `u8`, found `u32`
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:34:42
+   |
+LL |     if let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2) {
+   |                          -               ^    ---------------- this expression has type `main::Blah`
+   |                          |               |
+   |                          |               expected `usize`, found `isize`
+   |                          first introduced with type `usize` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:38:47
+   |
+LL |     if let Some(Blah::A(_, x, y) | Blah::B(x, y)) = Some(Blah::A(1, 1, 2)) {
+   |                               -               ^     ---------------------- this expression has type `std::option::Option<main::Blah>`
+   |                               |               |
+   |                               |               expected `usize`, found `isize`
+   |                               first introduced with type `usize` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:42:22
+   |
+LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
+   |                -     ^       ----------- this expression has type `(u8, u16)`
+   |                |     |
+   |                |     expected `u16`, found `u8`
+   |                first introduced with type `u16` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:42:25
+   |
+LL |     if let (x, y) | (y, x) = (0u8, 1u16) {
+   |             -           ^    ----------- this expression has type `(u8, u16)`
+   |             |           |
+   |             |           expected `u8`, found `u16`
+   |             first introduced with type `u8` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:44
+   |
+LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
+   |                           -                ^ expected `u16`, found `u8`
+   |                           |
+   |                           first introduced with type `u16` here
+...
+LL |     = Some((0u8, Some((1u16, 2u32))))
+   |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:53
+   |
+LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
+   |                  -                                  ^ expected `u8`, found `u16`
+   |                  |
+   |                  first introduced with type `u8` here
+...
+LL |     = Some((0u8, Some((1u16, 2u32))))
+   |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:62
+   |
+LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
+   |                              -                               ^ expected `u32`, found `u16`
+   |                              |
+   |                              first introduced with type `u32` here
+...
+LL |     = Some((0u8, Some((1u16, 2u32))))
+   |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:47:65
+   |
+LL |     if let Some((x, Some((y, z)))) | Some((y, Some((x, z) | (z, x))))
+   |                  - first introduced with type `u8` here         ^ expected `u8`, found `u32`
+...
+LL |     = Some((0u8, Some((1u16, 2u32))))
+   |       ------------------------------- this expression has type `std::option::Option<(u8, std::option::Option<(u16, u32)>)>`
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:55:39
+   |
+LL |     let Blah::A(_, x, y) | Blah::B(x, y) = Blah::A(1, 1, 2);
+   |                       -               ^    ---------------- this expression has type `main::Blah`
+   |                       |               |
+   |                       |               expected `usize`, found `isize`
+   |                       first introduced with type `usize` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:58:19
+   |
+LL |     let (x, y) | (y, x) = (0u8, 1u16);
+   |             -     ^       ----------- this expression has type `(u8, u16)`
+   |             |     |
+   |             |     expected `u16`, found `u8`
+   |             first introduced with type `u16` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:58:22
+   |
+LL |     let (x, y) | (y, x) = (0u8, 1u16);
+   |          -           ^    ----------- this expression has type `(u8, u16)`
+   |          |           |
+   |          |           expected `u8`, found `u16`
+   |          first introduced with type `u8` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:62:42
+   |
+LL |     fn f1((Blah::A(_, x, y) | Blah::B(x, y)): Blah) {}
+   |                          -               ^    ---- expected due to this
+   |                          |               |
+   |                          |               expected `usize`, found `isize`
+   |                          first introduced with type `usize` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:65:22
+   |
+LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
+   |                -     ^       --------- expected due to this
+   |                |     |
+   |                |     expected `u16`, found `u8`
+   |                first introduced with type `u16` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error[E0308]: mismatched types
+  --> $DIR/or-patterns-binding-type-mismatch.rs:65:25
+   |
+LL |     fn f2(((x, y) | (y, x)): (u8, u16)) {}
+   |             -           ^    --------- expected due to this
+   |             |           |
+   |             |           expected `u8`, found `u16`
+   |             first introduced with type `u8` here
+   |
+   = note: a binding must have the same type in all alternatives
+
+error: aborting due to 22 previous errors
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs b/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs
new file mode 100644
index 0000000000..3b6047c7be
--- /dev/null
+++ b/src/test/ui/or-patterns/or-patterns-default-binding-modes.rs
@@ -0,0 +1,132 @@
+// Test that or-patterns are pass-through with respect to default binding modes.
+
+// check-pass
+
+#![feature(or_patterns)]
+#![allow(irrefutable_let_patterns)]
+
+fn main() {
+    // A regression test for a mistake we made at one point:
+    match &1 {
+        e @ &(1..=2) | e @ &(3..=4) => {}
+        _ => {}
+    }
+
+    match &0 {
+        0 | &1 => {}
+        _ => {}
+    }
+
+    type R<'a> = &'a Result<u8, u8>;
+
+    let res: R<'_> = &Ok(0);
+
+    match res {
+        // Alternatives propagate expected type / binding mode independently.
+        Ok(mut x) | &Err(mut x) => drop::<u8>(x),
+    }
+    match res {
+        &(Ok(x) | Err(x)) => drop::<u8>(x),
+    }
+    match res {
+        Ok(x) | Err(x) => drop::<&u8>(x),
+    }
+    if let Ok(mut x) | &Err(mut x) = res {
+        drop::<u8>(x);
+    }
+    if let &(Ok(x) | Err(x)) = res {
+        drop::<u8>(x);
+    }
+    let Ok(mut x) | &Err(mut x) = res;
+    drop::<u8>(x);
+    let &(Ok(x) | Err(x)) = res;
+    drop::<u8>(x);
+    let Ok(x) | Err(x) = res;
+    drop::<&u8>(x);
+    for Ok(mut x) | &Err(mut x) in std::iter::once(res) {
+        drop::<u8>(x);
+    }
+    for &(Ok(x) | Err(x)) in std::iter::once(res) {
+        drop::<u8>(x);
+    }
+    for Ok(x) | Err(x) in std::iter::once(res) {
+        drop::<&u8>(x);
+    }
+    fn f1((Ok(mut x) | &Err(mut x)): R<'_>) {
+        drop::<u8>(x);
+    }
+    fn f2(&(Ok(x) | Err(x)): R<'_>) {
+        drop::<u8>(x);
+    }
+    fn f3((Ok(x) | Err(x)): R<'_>) {
+        drop::<&u8>(x);
+    }
+
+    // Wrap inside another type (a product for a simplity with irrefutable contexts).
+    #[derive(Copy, Clone)]
+    struct Wrap<T>(T);
+    let wres = Wrap(res);
+
+    match wres {
+        Wrap(Ok(mut x) | &Err(mut x)) => drop::<u8>(x),
+    }
+    match wres {
+        Wrap(&(Ok(x) | Err(x))) => drop::<u8>(x),
+    }
+    match wres {
+        Wrap(Ok(x) | Err(x)) => drop::<&u8>(x),
+    }
+    if let Wrap(Ok(mut x) | &Err(mut x)) = wres {
+        drop::<u8>(x);
+    }
+    if let Wrap(&(Ok(x) | Err(x))) = wres {
+        drop::<u8>(x);
+    }
+    if let Wrap(Ok(x) | Err(x)) = wres {
+        drop::<&u8>(x);
+    }
+    let Wrap(Ok(mut x) | &Err(mut x)) = wres;
+    drop::<u8>(x);
+    let Wrap(&(Ok(x) | Err(x))) = wres;
+    drop::<u8>(x);
+    let Wrap(Ok(x) | Err(x)) = wres;
+    drop::<&u8>(x);
+    for Wrap(Ok(mut x) | &Err(mut x)) in std::iter::once(wres) {
+        drop::<u8>(x);
+    }
+    for Wrap(&(Ok(x) | Err(x))) in std::iter::once(wres) {
+        drop::<u8>(x);
+    }
+    for Wrap(Ok(x) | Err(x)) in std::iter::once(wres) {
+        drop::<&u8>(x);
+    }
+    fn fw1(Wrap(Ok(mut x) | &Err(mut x)): Wrap<R<'_>>) {
+        drop::<u8>(x);
+    }
+    fn fw2(Wrap(&(Ok(x) | Err(x))): Wrap<R<'_>>) {
+        drop::<u8>(x);
+    }
+    fn fw3(Wrap(Ok(x) | Err(x)): Wrap<R<'_>>) {
+        drop::<&u8>(x);
+    }
+
+    // Nest some more:
+
+    enum Tri<P> {
+        A(P),
+        B(P),
+        C(P),
+    }
+
+    let tri = &Tri::A(&Ok(0));
+    let Tri::A(Ok(mut x) | Err(mut x))
+    | Tri::B(&Ok(mut x) | Err(mut x))
+    | &Tri::C(Ok(mut x) | Err(mut x)) = tri;
+    drop::<u8>(x);
+
+    match tri {
+        Tri::A(Ok(mut x) | Err(mut x))
+        | Tri::B(&Ok(mut x) | Err(mut x))
+        | &Tri::C(Ok(mut x) | Err(mut x)) => drop::<u8>(x),
+    }
+}
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs b/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs
index ce6836f30f..d232200565 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs
+++ b/src/test/ui/or-patterns/or-patterns-syntactic-fail.rs
@@ -2,7 +2,6 @@
 // This is not a semantic test. We only test parsing.
 
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete and may cause the compiler to crash
 
 fn main() {}
 
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr b/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr
index e77d92e8b0..6cbb59dc22 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr
+++ b/src/test/ui/or-patterns/or-patterns-syntactic-fail.stderr
@@ -1,53 +1,53 @@
 error: an or-pattern parameter must be wrapped in parenthesis
-  --> $DIR/or-patterns-syntactic-fail.rs:28:13
+  --> $DIR/or-patterns-syntactic-fail.rs:27:13
    |
 LL |     fn fun1(A | B: E) {}
    |             ^^^^^ help: wrap the pattern in parenthesis: `(A | B)`
 
 error: a leading `|` is not allowed in a parameter pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:30:13
+  --> $DIR/or-patterns-syntactic-fail.rs:29:13
    |
 LL |     fn fun2(| A | B: E) {}
    |             ^ help: remove the `|`
 
 error: an or-pattern parameter must be wrapped in parenthesis
-  --> $DIR/or-patterns-syntactic-fail.rs:30:15
+  --> $DIR/or-patterns-syntactic-fail.rs:29:15
    |
 LL |     fn fun2(| A | B: E) {}
    |               ^^^^^ help: wrap the pattern in parenthesis: `(A | B)`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:41:11
+  --> $DIR/or-patterns-syntactic-fail.rs:40:11
    |
 LL |     let ( | A | B) = E::A;
    |           ^ help: remove the `|`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:42:11
+  --> $DIR/or-patterns-syntactic-fail.rs:41:11
    |
 LL |     let ( | A | B,) = (E::B,);
    |           ^ help: remove the `|`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:43:11
+  --> $DIR/or-patterns-syntactic-fail.rs:42:11
    |
 LL |     let [ | A | B ] = [E::A];
    |           ^ help: remove the `|`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:44:13
+  --> $DIR/or-patterns-syntactic-fail.rs:43:13
    |
 LL |     let TS( | A | B );
    |             ^ help: remove the `|`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:45:17
+  --> $DIR/or-patterns-syntactic-fail.rs:44:17
    |
 LL |     let NS { f: | A | B };
    |                 ^ help: remove the `|`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:47:11
+  --> $DIR/or-patterns-syntactic-fail.rs:46:11
    |
 LL |     let ( || A | B) = E::A;
    |           ^^ help: remove the `||`
@@ -55,7 +55,7 @@ LL |     let ( || A | B) = E::A;
    = note: alternatives in or-patterns are separated with `|`, not `||`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:48:11
+  --> $DIR/or-patterns-syntactic-fail.rs:47:11
    |
 LL |     let [ || A | B ] = [E::A];
    |           ^^ help: remove the `||`
@@ -63,7 +63,7 @@ LL |     let [ || A | B ] = [E::A];
    = note: alternatives in or-patterns are separated with `|`, not `||`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:49:13
+  --> $DIR/or-patterns-syntactic-fail.rs:48:13
    |
 LL |     let TS( || A | B );
    |             ^^ help: remove the `||`
@@ -71,7 +71,7 @@ LL |     let TS( || A | B );
    = note: alternatives in or-patterns are separated with `|`, not `||`
 
 error: a leading `|` is only allowed in a top-level pattern
-  --> $DIR/or-patterns-syntactic-fail.rs:50:17
+  --> $DIR/or-patterns-syntactic-fail.rs:49:17
    |
 LL |     let NS { f: || A | B };
    |                 ^^ help: remove the `||`
@@ -79,7 +79,7 @@ LL |     let NS { f: || A | B };
    = note: alternatives in or-patterns are separated with `|`, not `||`
 
 error: no rules expected the token `|`
-  --> $DIR/or-patterns-syntactic-fail.rs:14:15
+  --> $DIR/or-patterns-syntactic-fail.rs:13:15
    |
 LL | macro_rules! accept_pat {
    | ----------------------- when calling this macro
@@ -88,7 +88,7 @@ LL | accept_pat!(p | q);
    |               ^ no rules expected this token in macro call
 
 error: no rules expected the token `|`
-  --> $DIR/or-patterns-syntactic-fail.rs:15:13
+  --> $DIR/or-patterns-syntactic-fail.rs:14:13
    |
 LL | macro_rules! accept_pat {
    | ----------------------- when calling this macro
@@ -96,16 +96,8 @@ LL | macro_rules! accept_pat {
 LL | accept_pat!(| p | q);
    |             ^ no rules expected this token in macro call
 
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/or-patterns-syntactic-fail.rs:4:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
 error[E0369]: no implementation for `E | ()`
-  --> $DIR/or-patterns-syntactic-fail.rs:24:22
+  --> $DIR/or-patterns-syntactic-fail.rs:23:22
    |
 LL |     let _ = |A | B: E| ();
    |                  ----^ -- ()
@@ -115,7 +107,7 @@ LL |     let _ = |A | B: E| ();
    = note: an implementation of `std::ops::BitOr` might be missing for `E`
 
 error[E0308]: mismatched types
-  --> $DIR/or-patterns-syntactic-fail.rs:52:36
+  --> $DIR/or-patterns-syntactic-fail.rs:51:36
    |
 LL |     let recovery_witness: String = 0;
    |                           ------   ^
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs b/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs
index 73c1477c28..5fe72caf9c 100644
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs
+++ b/src/test/ui/or-patterns/or-patterns-syntactic-pass.rs
@@ -3,7 +3,7 @@
 
 // check-pass
 
-#![feature(or_patterns)] //~ WARNING the feature `or_patterns` is incomplete
+#![feature(or_patterns)]
 
 fn main() {}
 
diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr b/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr
deleted file mode 100644
index 3145a2e9f2..0000000000
--- a/src/test/ui/or-patterns/or-patterns-syntactic-pass.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/or-patterns-syntactic-pass.rs:6:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
diff --git a/src/test/ui/or-patterns/search-via-bindings.rs b/src/test/ui/or-patterns/search-via-bindings.rs
new file mode 100644
index 0000000000..eb127b881c
--- /dev/null
+++ b/src/test/ui/or-patterns/search-via-bindings.rs
@@ -0,0 +1,66 @@
+// Check that we expand multiple or-patterns from left to right.
+
+// run-pass
+
+#![feature(or_patterns)]
+#![allow(unreachable_patterns)] // FIXME(or-patterns) this shouldn't trigger
+
+fn search(target: (bool, bool, bool)) -> u32 {
+    let x = ((false, true), (false, true), (false, true));
+    let mut guard_count = 0;
+    match x {
+        ((a, _) | (_, a), (b @ _, _) | (_, b @ _), (c @ false, _) | (_, c @ true))
+            if {
+                guard_count += 1;
+                (a, b, c) == target
+            } =>
+        {
+            guard_count
+        }
+        _ => unreachable!(),
+    }
+}
+
+// Equivalent to the above code, but hopefully easier to understand.
+fn search_old_style(target: (bool, bool, bool)) -> u32 {
+    let x = ((false, true), (false, true), (false, true));
+    let mut guard_count = 0;
+    match x {
+        ((a, _), (b @ _, _), (c @ false, _))
+        | ((a, _), (b @ _, _), (_, c @ true))
+        | ((a, _), (_, b @ _), (c @ false, _))
+        | ((a, _), (_, b @ _), (_, c @ true))
+        | ((_, a), (b @ _, _), (c @ false, _))
+        | ((_, a), (b @ _, _), (_, c @ true))
+        | ((_, a), (_, b @ _), (c @ false, _))
+        | ((_, a), (_, b @ _), (_, c @ true))
+            if {
+                guard_count += 1;
+                (a, b, c) == target
+            } =>
+        {
+            guard_count
+        }
+        _ => unreachable!(),
+    }
+}
+
+fn main() {
+    assert_eq!(search((false, false, false)), 1);
+    assert_eq!(search((false, false, true)), 2);
+    assert_eq!(search((false, true, false)), 3);
+    assert_eq!(search((false, true, true)), 4);
+    assert_eq!(search((true, false, false)), 5);
+    assert_eq!(search((true, false, true)), 6);
+    assert_eq!(search((true, true, false)), 7);
+    assert_eq!(search((true, true, true)), 8);
+
+    assert_eq!(search_old_style((false, false, false)), 1);
+    assert_eq!(search_old_style((false, false, true)), 2);
+    assert_eq!(search_old_style((false, true, false)), 3);
+    assert_eq!(search_old_style((false, true, true)), 4);
+    assert_eq!(search_old_style((true, false, false)), 5);
+    assert_eq!(search_old_style((true, false, true)), 6);
+    assert_eq!(search_old_style((true, true, false)), 7);
+    assert_eq!(search_old_style((true, true, true)), 8);
+}
diff --git a/src/test/ui/or-patterns/slice-patterns.rs b/src/test/ui/or-patterns/slice-patterns.rs
new file mode 100644
index 0000000000..05c907e824
--- /dev/null
+++ b/src/test/ui/or-patterns/slice-patterns.rs
@@ -0,0 +1,53 @@
+// Test or-patterns with slice-patterns
+
+// run-pass
+
+#![feature(or_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+#[derive(Debug)]
+enum Test {
+    Foo,
+    Bar,
+    Baz,
+    Qux,
+}
+
+fn test(foo: &[Option<Test>]) -> MatchArm {
+    match foo {
+        [.., Some(Test::Qux | Test::Foo)] => MatchArm::Arm(0),
+        [Some(Test::Foo), .., Some(Test::Baz | Test::Bar)] => MatchArm::Arm(1),
+        [.., Some(Test::Bar | Test::Baz), _] => MatchArm::Arm(2),
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    let foo = vec![
+        Some(Test::Foo),
+        Some(Test::Bar),
+        Some(Test::Baz),
+        Some(Test::Qux),
+    ];
+
+    // path 1a
+    assert_eq!(test(&foo), MatchArm::Arm(0));
+    // path 1b
+    assert_eq!(test(&[Some(Test::Bar), Some(Test::Foo)]), MatchArm::Arm(0));
+    // path 2a
+    assert_eq!(test(&foo[..3]), MatchArm::Arm(1));
+    // path 2b
+    assert_eq!(test(&[Some(Test::Foo), Some(Test::Foo), Some(Test::Bar)]), MatchArm::Arm(1));
+    // path 3a
+    assert_eq!(test(&foo[1..3]), MatchArm::Arm(2));
+    // path 3b
+    assert_eq!(test(&[Some(Test::Bar), Some(Test::Baz), Some(Test::Baz), Some(Test::Bar)]),
+        MatchArm::Arm(2));
+    // path 4
+    assert_eq!(test(&foo[4..]), MatchArm::Wild);
+}
diff --git a/src/test/ui/or-patterns/struct-like.rs b/src/test/ui/or-patterns/struct-like.rs
new file mode 100644
index 0000000000..3794a8b6c1
--- /dev/null
+++ b/src/test/ui/or-patterns/struct-like.rs
@@ -0,0 +1,42 @@
+// run-pass
+
+#![feature(or_patterns)]
+
+#[derive(Debug)]
+enum Other {
+    One,
+    Two,
+    Three,
+}
+
+#[derive(Debug)]
+enum Test {
+    Foo { first: usize, second: usize },
+    Bar { other: Option<Other> },
+    Baz,
+}
+
+fn test(x: Option<Test>) -> bool {
+    match x {
+        Some(
+            Test::Foo { first: 1024 | 2048, second: 2048 | 4096 }
+            | Test::Bar { other: Some(Other::One | Other::Two) },
+        ) => true,
+        // wild case
+        Some(_) => false,
+        // empty case
+        None => false,
+    }
+}
+
+fn main() {
+    assert!(test(Some(Test::Foo { first: 1024, second: 4096 })));
+    assert!(!test(Some(Test::Foo { first: 2048, second: 8192 })));
+    assert!(!test(Some(Test::Foo { first: 42, second: 2048 })));
+    assert!(test(Some(Test::Bar { other: Some(Other::One) })));
+    assert!(test(Some(Test::Bar { other: Some(Other::Two) })));
+    assert!(!test(Some(Test::Bar { other: Some(Other::Three) })));
+    assert!(!test(Some(Test::Bar { other: None })));
+    assert!(!test(Some(Test::Baz)));
+    assert!(!test(None));
+}
diff --git a/src/test/ui/out-of-order-shadowing.stderr b/src/test/ui/out-of-order-shadowing.stderr
index 2a120dee48..b414f9230b 100644
--- a/src/test/ui/out-of-order-shadowing.stderr
+++ b/src/test/ui/out-of-order-shadowing.stderr
@@ -14,7 +14,7 @@ note: `bar` could also refer to the macro defined here
    |
 LL | macro_rules! bar { () => {} }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/overlap-doesnt-conflict-with-specialization.rs b/src/test/ui/overlap-doesnt-conflict-with-specialization.rs
index 3d4069f368..dd09d68367 100644
--- a/src/test/ui/overlap-doesnt-conflict-with-specialization.rs
+++ b/src/test/ui/overlap-doesnt-conflict-with-specialization.rs
@@ -1,8 +1,9 @@
 // run-pass
 
-#![feature(overlapping_marker_traits)]
+#![feature(marker_trait_attr)]
 #![feature(specialization)]
 
+#[marker]
 trait MyMarker {}
 
 impl<T> MyMarker for T {}
diff --git a/src/test/ui/overlap-marker-trait.rs b/src/test/ui/overlap-marker-trait.rs
deleted file mode 100644
index bf39d9c903..0000000000
--- a/src/test/ui/overlap-marker-trait.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Test for RFC 1268: we allow overlapping impls of marker traits,
-// that is, traits without items. In this case, a type `T` is
-// `MyMarker` if it is either `Debug` or `Display`. This test just
-// checks that we don't consider **all** types to be `MyMarker`.  See
-// also the companion test in
-// `run-pass/overlap-permitted-for-marker-traits.rs`.
-
-#![feature(overlapping_marker_traits)]
-#![feature(optin_builtin_traits)]
-
-use std::fmt::{Debug, Display};
-
-trait Marker {}
-
-impl<T: Debug> Marker for T {}
-impl<T: Display> Marker for T {}
-
-fn is_marker<T: Marker>() { }
-
-struct NotDebugOrDisplay;
-
-fn main() {
-    // Debug && Display:
-    is_marker::<i32>();
-
-    // Debug && !Display:
-    is_marker::<Vec<i32>>();
-
-    // !Debug && !Display
-    is_marker::<NotDebugOrDisplay>(); //~ ERROR
-}
diff --git a/src/test/ui/overlap-marker-trait.stderr b/src/test/ui/overlap-marker-trait.stderr
deleted file mode 100644
index 15ebcd17b0..0000000000
--- a/src/test/ui/overlap-marker-trait.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0277]: the trait bound `NotDebugOrDisplay: Marker` is not satisfied
-  --> $DIR/overlap-marker-trait.rs:30:17
-   |
-LL | fn is_marker<T: Marker>() { }
-   |    ---------    ------ required by this bound in `is_marker`
-...
-LL |     is_marker::<NotDebugOrDisplay>();
-   |                 ^^^^^^^^^^^^^^^^^ the trait `Marker` is not implemented for `NotDebugOrDisplay`
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/panic-handler/panic-handler-duplicate.stderr b/src/test/ui/panic-handler/panic-handler-duplicate.stderr
index 9999e32764..8603ef91be 100644
--- a/src/test/ui/panic-handler/panic-handler-duplicate.stderr
+++ b/src/test/ui/panic-handler/panic-handler-duplicate.stderr
@@ -6,7 +6,7 @@ LL | |     loop {}
 LL | | }
    | |_^
    |
-note: first defined here
+note: the lang item is first defined here
   --> $DIR/panic-handler-duplicate.rs:10:1
    |
 LL | / fn panic(info: &PanicInfo) -> ! {
diff --git a/src/test/ui/panic-handler/panic-handler-std.stderr b/src/test/ui/panic-handler/panic-handler-std.stderr
index ac56513fd4..f71c28e5aa 100644
--- a/src/test/ui/panic-handler/panic-handler-std.stderr
+++ b/src/test/ui/panic-handler/panic-handler-std.stderr
@@ -6,7 +6,7 @@ LL | |     loop {}
 LL | | }
    | |_^
    |
-   = note: first defined in crate `std` (which `panic_handler_std` depends on)
+   = note: the lang item is first defined in crate `std` (which `panic_handler_std` depends on)
 
 error: argument should be `&PanicInfo`
   --> $DIR/panic-handler-std.rs:7:16
diff --git a/src/test/ui/panic-runtime/needs-gate.stderr b/src/test/ui/panic-runtime/needs-gate.stderr
index ab5d9f8cda..e067ccaebc 100644
--- a/src/test/ui/panic-runtime/needs-gate.stderr
+++ b/src/test/ui/panic-runtime/needs-gate.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[panic_runtime]` attribute is an experimental feature
 LL | #![panic_runtime]
    | ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32837
+   = note: see issue #32837 <https://github.com/rust-lang/rust/issues/32837> for more information
    = help: add `#![feature(panic_runtime)]` to the crate attributes to enable
 
 error[E0658]: the `#[needs_panic_runtime]` attribute is an experimental feature
@@ -13,7 +13,7 @@ error[E0658]: the `#[needs_panic_runtime]` attribute is an experimental feature
 LL | #![needs_panic_runtime]
    | ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/32837
+   = note: see issue #32837 <https://github.com/rust-lang/rust/issues/32837> for more information
    = help: add `#![feature(needs_panic_runtime)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs b/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs
new file mode 100644
index 0000000000..d37ce06c55
--- /dev/null
+++ b/src/test/ui/parser/assoc-const-underscore-semantic-fail.rs
@@ -0,0 +1,17 @@
+// Semantically, an associated constant cannot use `_` as a name.
+
+fn main() {}
+
+const _: () = {
+    pub trait A {
+        const _: () = (); //~ ERROR `const` items in this context need a name
+    }
+    impl A for () {
+        const _: () = (); //~ ERROR `const` items in this context need a name
+        //~^ ERROR const `_` is not a member of trait `A`
+    }
+    struct B;
+    impl B {
+        const _: () = (); //~ ERROR `const` items in this context need a name
+    }
+};
diff --git a/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr b/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr
new file mode 100644
index 0000000000..538bf0ec10
--- /dev/null
+++ b/src/test/ui/parser/assoc-const-underscore-semantic-fail.stderr
@@ -0,0 +1,27 @@
+error: `const` items in this context need a name
+  --> $DIR/assoc-const-underscore-semantic-fail.rs:7:15
+   |
+LL |         const _: () = ();
+   |               ^ `_` is not a valid name for this `const` item
+
+error: `const` items in this context need a name
+  --> $DIR/assoc-const-underscore-semantic-fail.rs:10:15
+   |
+LL |         const _: () = ();
+   |               ^ `_` is not a valid name for this `const` item
+
+error: `const` items in this context need a name
+  --> $DIR/assoc-const-underscore-semantic-fail.rs:15:15
+   |
+LL |         const _: () = ();
+   |               ^ `_` is not a valid name for this `const` item
+
+error[E0438]: const `_` is not a member of trait `A`
+  --> $DIR/assoc-const-underscore-semantic-fail.rs:10:9
+   |
+LL |         const _: () = ();
+   |         ^^^^^^^^^^^^^^^^^ not a member of trait `A`
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0438`.
diff --git a/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs b/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs
new file mode 100644
index 0000000000..60da408c81
--- /dev/null
+++ b/src/test/ui/parser/assoc-const-underscore-syntactic-pass.rs
@@ -0,0 +1,18 @@
+// All constant items (associated or otherwise) may syntactically use `_` as a name.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+const _: () = {
+    pub trait A {
+        const _: () = ();
+    }
+    impl A for () {
+        const _: () = ();
+    }
+    impl dyn A {
+        const _: () = ();
+    }
+};
diff --git a/src/test/ui/parser/assoc-static-semantic-fail.rs b/src/test/ui/parser/assoc-static-semantic-fail.rs
new file mode 100644
index 0000000000..215a292131
--- /dev/null
+++ b/src/test/ui/parser/assoc-static-semantic-fail.rs
@@ -0,0 +1,51 @@
+// Semantically, we do not allow e.g., `static X: u8 = 0;` as an associated item.
+
+#![feature(specialization)]
+
+fn main() {}
+
+struct S;
+impl S {
+    static IA: u8 = 0;
+    //~^ ERROR associated `static` items are not allowed
+    static IB: u8;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR associated constant in `impl` without body
+    default static IC: u8 = 0;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR a static item cannot be `default`
+    pub(crate) default static ID: u8;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR associated constant in `impl` without body
+    //~| ERROR a static item cannot be `default`
+}
+
+trait T {
+    static TA: u8 = 0;
+    //~^ ERROR associated `static` items are not allowed
+    static TB: u8;
+    //~^ ERROR associated `static` items are not allowed
+    default static TC: u8 = 0;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR a static item cannot be `default`
+    pub(crate) default static TD: u8;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR unnecessary visibility qualifier
+    //~| ERROR a static item cannot be `default`
+}
+
+impl T for S {
+    static TA: u8 = 0;
+    //~^ ERROR associated `static` items are not allowed
+    static TB: u8;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR associated constant in `impl` without body
+    default static TC: u8 = 0;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR a static item cannot be `default`
+    pub default static TD: u8;
+    //~^ ERROR associated `static` items are not allowed
+    //~| ERROR associated constant in `impl` without body
+    //~| ERROR unnecessary visibility qualifier
+    //~| ERROR a static item cannot be `default`
+}
diff --git a/src/test/ui/parser/assoc-static-semantic-fail.stderr b/src/test/ui/parser/assoc-static-semantic-fail.stderr
new file mode 100644
index 0000000000..612297c9cd
--- /dev/null
+++ b/src/test/ui/parser/assoc-static-semantic-fail.stderr
@@ -0,0 +1,167 @@
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:9:5
+   |
+LL |     static IA: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:11:5
+   |
+LL |     static IB: u8;
+   |     ^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-semantic-fail.rs:14:5
+   |
+LL |     default static IC: u8 = 0;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:14:5
+   |
+LL |     default static IC: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-semantic-fail.rs:17:16
+   |
+LL |     pub(crate) default static ID: u8;
+   |                ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:17:5
+   |
+LL |     pub(crate) default static ID: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:24:5
+   |
+LL |     static TA: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:26:5
+   |
+LL |     static TB: u8;
+   |     ^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-semantic-fail.rs:28:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:28:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-semantic-fail.rs:31:16
+   |
+LL |     pub(crate) default static TD: u8;
+   |                ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:31:5
+   |
+LL |     pub(crate) default static TD: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:38:5
+   |
+LL |     static TA: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:40:5
+   |
+LL |     static TB: u8;
+   |     ^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-semantic-fail.rs:43:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:43:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-semantic-fail.rs:46:9
+   |
+LL |     pub default static TD: u8;
+   |         ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-semantic-fail.rs:46:5
+   |
+LL |     pub default static TD: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: associated constant in `impl` without body
+  --> $DIR/assoc-static-semantic-fail.rs:11:5
+   |
+LL |     static IB: u8;
+   |     ^^^^^^^^^^^^^-
+   |                  |
+   |                  help: provide a definition for the constant: `= <expr>;`
+
+error: associated constant in `impl` without body
+  --> $DIR/assoc-static-semantic-fail.rs:17:5
+   |
+LL |     pub(crate) default static ID: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
+   |                                     |
+   |                                     help: provide a definition for the constant: `= <expr>;`
+
+error[E0449]: unnecessary visibility qualifier
+  --> $DIR/assoc-static-semantic-fail.rs:31:5
+   |
+LL |     pub(crate) default static TD: u8;
+   |     ^^^^^^^^^^
+
+error: associated constant in `impl` without body
+  --> $DIR/assoc-static-semantic-fail.rs:40:5
+   |
+LL |     static TB: u8;
+   |     ^^^^^^^^^^^^^-
+   |                  |
+   |                  help: provide a definition for the constant: `= <expr>;`
+
+error: associated constant in `impl` without body
+  --> $DIR/assoc-static-semantic-fail.rs:46:5
+   |
+LL |     pub default static TD: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^-
+   |                              |
+   |                              help: provide a definition for the constant: `= <expr>;`
+
+error[E0449]: unnecessary visibility qualifier
+  --> $DIR/assoc-static-semantic-fail.rs:46:5
+   |
+LL |     pub default static TD: u8;
+   |     ^^^ `pub` not permitted here because it's implied
+
+error: aborting due to 24 previous errors
+
+For more information about this error, try `rustc --explain E0449`.
diff --git a/src/test/ui/parser/assoc-static-syntactic-fail.rs b/src/test/ui/parser/assoc-static-syntactic-fail.rs
new file mode 100644
index 0000000000..492f2ea16e
--- /dev/null
+++ b/src/test/ui/parser/assoc-static-syntactic-fail.rs
@@ -0,0 +1,33 @@
+// Syntactically, we do allow e.g., `static X: u8 = 0;` as an associated item.
+
+fn main() {}
+
+#[cfg(FALSE)]
+impl S {
+    static IA: u8 = 0; //~ ERROR associated `static` items are not allowed
+    static IB: u8; //~ ERROR associated `static` items are not allowed
+    default static IC: u8 = 0; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+    pub(crate) default static ID: u8; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+}
+
+#[cfg(FALSE)]
+trait T {
+    static TA: u8 = 0; //~ ERROR associated `static` items are not allowed
+    static TB: u8; //~ ERROR associated `static` items are not allowed
+    default static TC: u8 = 0; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+    pub(crate) default static TD: u8; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+}
+
+#[cfg(FALSE)]
+impl T for S {
+    static TA: u8 = 0; //~ ERROR associated `static` items are not allowed
+    static TB: u8; //~ ERROR associated `static` items are not allowed
+    default static TC: u8 = 0; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+    pub default static TD: u8; //~ ERROR associated `static` items are not allowed
+    //~^ ERROR a static item cannot be `default`
+}
diff --git a/src/test/ui/parser/assoc-static-syntactic-fail.stderr b/src/test/ui/parser/assoc-static-syntactic-fail.stderr
new file mode 100644
index 0000000000..e972361451
--- /dev/null
+++ b/src/test/ui/parser/assoc-static-syntactic-fail.stderr
@@ -0,0 +1,122 @@
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:7:5
+   |
+LL |     static IA: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:8:5
+   |
+LL |     static IB: u8;
+   |     ^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-syntactic-fail.rs:9:5
+   |
+LL |     default static IC: u8 = 0;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:9:5
+   |
+LL |     default static IC: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-syntactic-fail.rs:11:16
+   |
+LL |     pub(crate) default static ID: u8;
+   |                ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:11:5
+   |
+LL |     pub(crate) default static ID: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:17:5
+   |
+LL |     static TA: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:18:5
+   |
+LL |     static TB: u8;
+   |     ^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-syntactic-fail.rs:19:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:19:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-syntactic-fail.rs:21:16
+   |
+LL |     pub(crate) default static TD: u8;
+   |                ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:21:5
+   |
+LL |     pub(crate) default static TD: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:27:5
+   |
+LL |     static TA: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:28:5
+   |
+LL |     static TB: u8;
+   |     ^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-syntactic-fail.rs:29:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:29:5
+   |
+LL |     default static TC: u8 = 0;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/assoc-static-syntactic-fail.rs:31:9
+   |
+LL |     pub default static TD: u8;
+   |         ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/assoc-static-syntactic-fail.rs:31:5
+   |
+LL |     pub default static TD: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 18 previous errors
+
diff --git a/src/test/ui/parser/attr-before-eof.stderr b/src/test/ui/parser/attr-before-eof.stderr
index eb5daf8498..a2acb94372 100644
--- a/src/test/ui/parser/attr-before-eof.stderr
+++ b/src/test/ui/parser/attr-before-eof.stderr
@@ -1,8 +1,8 @@
 error: expected item after attributes
-  --> $DIR/attr-before-eof.rs:3:16
+  --> $DIR/attr-before-eof.rs:3:1
    |
 LL | #[derive(Debug)]
-   |                ^
+   | ^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/attr-dangling-in-fn.stderr b/src/test/ui/parser/attr-dangling-in-fn.stderr
index 71488d2e5c..b1bb3ab3b1 100644
--- a/src/test/ui/parser/attr-dangling-in-fn.stderr
+++ b/src/test/ui/parser/attr-dangling-in-fn.stderr
@@ -1,8 +1,8 @@
 error: expected statement after outer attribute
-  --> $DIR/attr-dangling-in-fn.rs:5:1
+  --> $DIR/attr-dangling-in-fn.rs:4:3
    |
-LL | }
-   | ^
+LL |   #[foo = "bar"]
+   |   ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/attr-dangling-in-mod.stderr b/src/test/ui/parser/attr-dangling-in-mod.stderr
index d896b61ce4..1c892eac08 100644
--- a/src/test/ui/parser/attr-dangling-in-mod.stderr
+++ b/src/test/ui/parser/attr-dangling-in-mod.stderr
@@ -1,8 +1,8 @@
 error: expected item after attributes
-  --> $DIR/attr-dangling-in-mod.rs:6:14
+  --> $DIR/attr-dangling-in-mod.rs:6:1
    |
 LL | #[foo = "bar"]
-   |              ^
+   | ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs b/src/test/ui/parser/attr-stmt-expr-attr-bad.rs
index 118bff8144..f3980a5964 100644
--- a/src/test/ui/parser/attr-stmt-expr-attr-bad.rs
+++ b/src/test/ui/parser/attr-stmt-expr-attr-bad.rs
@@ -38,8 +38,6 @@ fn main() {}
 //~^ ERROR an inner attribute is not permitted in this context
 #[cfg(FALSE)] fn e() { let _ = #[attr] &mut #![attr] 0; }
 //~^ ERROR an inner attribute is not permitted in this context
-#[cfg(FALSE)] fn e() { let _ = #[attr] if 0 {}; }
-//~^ ERROR attributes are not yet allowed on `if` expressions
 #[cfg(FALSE)] fn e() { let _ = if 0 #[attr] {}; }
 //~^ ERROR expected `{`, found `#`
 #[cfg(FALSE)] fn e() { let _ = if 0 {#![attr]}; }
@@ -51,14 +49,11 @@ fn main() {}
 #[cfg(FALSE)] fn e() { let _ = if 0 {} else {#![attr]}; }
 //~^ ERROR an inner attribute is not permitted in this context
 #[cfg(FALSE)] fn e() { let _ = if 0 {} else #[attr] if 0 {}; }
-//~^ ERROR attributes are not yet allowed on `if` expressions
-//~| ERROR expected `{`, found `#`
+//~^ ERROR expected `{`, found `#`
 #[cfg(FALSE)] fn e() { let _ = if 0 {} else if 0 #[attr] {}; }
 //~^ ERROR expected `{`, found `#`
 #[cfg(FALSE)] fn e() { let _ = if 0 {} else if 0 {#![attr]}; }
 //~^ ERROR an inner attribute is not permitted in this context
-#[cfg(FALSE)] fn e() { let _ = #[attr] if let _ = 0 {}; }
-//~^ ERROR attributes are not yet allowed on `if` expressions
 #[cfg(FALSE)] fn e() { let _ = if let _ = 0 #[attr] {}; }
 //~^ ERROR expected `{`, found `#`
 #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {#![attr]}; }
@@ -70,8 +65,7 @@ fn main() {}
 #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else {#![attr]}; }
 //~^ ERROR an inner attribute is not permitted in this context
 #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else #[attr] if let _ = 0 {}; }
-//~^ ERROR attributes are not yet allowed on `if` expressions
-//~| ERROR expected `{`, found `#`
+//~^ ERROR expected `{`, found `#`
 #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else if let _ = 0 #[attr] {}; }
 //~^ ERROR expected `{`, found `#`
 #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else if let _ = 0 {#![attr]}; }
diff --git a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr b/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr
index 4775b9b7bc..4dcba27cb6 100644
--- a/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr
+++ b/src/test/ui/parser/attr-stmt-expr-attr-bad.stderr
@@ -136,14 +136,8 @@ LL | #[cfg(FALSE)] fn e() { let _ = #[attr] &mut #![attr] 0; }
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
-error: attributes are not yet allowed on `if` expressions
-  --> $DIR/attr-stmt-expr-attr-bad.rs:41:32
-   |
-LL | #[cfg(FALSE)] fn e() { let _ = #[attr] if 0 {}; }
-   |                                ^^^^^^^
-
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:43:37
+  --> $DIR/attr-stmt-expr-attr-bad.rs:41:37
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 #[attr] {}; }
    |                                --   ^       --- help: try placing this code inside a block: `{ {}; }`
@@ -152,7 +146,7 @@ LL | #[cfg(FALSE)] fn e() { let _ = if 0 #[attr] {}; }
    |                                this `if` expression has a condition, but no block
 
 error: an inner attribute is not permitted in this context
-  --> $DIR/attr-stmt-expr-attr-bad.rs:45:38
+  --> $DIR/attr-stmt-expr-attr-bad.rs:43:38
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {#![attr]}; }
    |                                      ^^^^^^^^
@@ -160,13 +154,13 @@ LL | #[cfg(FALSE)] fn e() { let _ = if 0 {#![attr]}; }
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: expected one of `.`, `;`, `?`, `else`, or an operator, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:47:40
+  --> $DIR/attr-stmt-expr-attr-bad.rs:45:40
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} #[attr] else {}; }
    |                                        ^ expected one of `.`, `;`, `?`, `else`, or an operator
 
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:49:45
+  --> $DIR/attr-stmt-expr-attr-bad.rs:47:45
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else #[attr] {}; }
    |                                             ^       --- help: try placing this code inside a block: `{ {}; }`
@@ -174,21 +168,15 @@ LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else #[attr] {}; }
    |                                             expected `{`
 
 error: an inner attribute is not permitted in this context
-  --> $DIR/attr-stmt-expr-attr-bad.rs:51:46
+  --> $DIR/attr-stmt-expr-attr-bad.rs:49:46
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else {#![attr]}; }
    |                                              ^^^^^^^^
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
-error: attributes are not yet allowed on `if` expressions
-  --> $DIR/attr-stmt-expr-attr-bad.rs:53:45
-   |
-LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else #[attr] if 0 {}; }
-   |                                             ^^^^^^^
-
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:53:45
+  --> $DIR/attr-stmt-expr-attr-bad.rs:51:45
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else #[attr] if 0 {}; }
    |                                             ^       -------- help: try placing this code inside a block: `{ if 0 {}; }`
@@ -196,7 +184,7 @@ LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else #[attr] if 0 {}; }
    |                                             expected `{`
 
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:56:50
+  --> $DIR/attr-stmt-expr-attr-bad.rs:53:50
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else if 0 #[attr] {}; }
    |                                             --   ^       --- help: try placing this code inside a block: `{ {}; }`
@@ -205,21 +193,15 @@ LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else if 0 #[attr] {}; }
    |                                             this `if` expression has a condition, but no block
 
 error: an inner attribute is not permitted in this context
-  --> $DIR/attr-stmt-expr-attr-bad.rs:58:51
+  --> $DIR/attr-stmt-expr-attr-bad.rs:55:51
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if 0 {} else if 0 {#![attr]}; }
    |                                                   ^^^^^^^^
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
-error: attributes are not yet allowed on `if` expressions
-  --> $DIR/attr-stmt-expr-attr-bad.rs:60:32
-   |
-LL | #[cfg(FALSE)] fn e() { let _ = #[attr] if let _ = 0 {}; }
-   |                                ^^^^^^^
-
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:62:45
+  --> $DIR/attr-stmt-expr-attr-bad.rs:57:45
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 #[attr] {}; }
    |                                --           ^       --- help: try placing this code inside a block: `{ {}; }`
@@ -228,7 +210,7 @@ LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 #[attr] {}; }
    |                                this `if` expression has a condition, but no block
 
 error: an inner attribute is not permitted in this context
-  --> $DIR/attr-stmt-expr-attr-bad.rs:64:46
+  --> $DIR/attr-stmt-expr-attr-bad.rs:59:46
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {#![attr]}; }
    |                                              ^^^^^^^^
@@ -236,13 +218,13 @@ LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {#![attr]}; }
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: expected one of `.`, `;`, `?`, `else`, or an operator, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:66:48
+  --> $DIR/attr-stmt-expr-attr-bad.rs:61:48
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} #[attr] else {}; }
    |                                                ^ expected one of `.`, `;`, `?`, `else`, or an operator
 
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:68:53
+  --> $DIR/attr-stmt-expr-attr-bad.rs:63:53
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else #[attr] {}; }
    |                                                     ^       --- help: try placing this code inside a block: `{ {}; }`
@@ -250,21 +232,15 @@ LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else #[attr] {}; }
    |                                                     expected `{`
 
 error: an inner attribute is not permitted in this context
-  --> $DIR/attr-stmt-expr-attr-bad.rs:70:54
+  --> $DIR/attr-stmt-expr-attr-bad.rs:65:54
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else {#![attr]}; }
    |                                                      ^^^^^^^^
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
-error: attributes are not yet allowed on `if` expressions
-  --> $DIR/attr-stmt-expr-attr-bad.rs:72:53
-   |
-LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else #[attr] if let _ = 0 {}; }
-   |                                                     ^^^^^^^
-
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:72:53
+  --> $DIR/attr-stmt-expr-attr-bad.rs:67:53
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else #[attr] if let _ = 0 {}; }
    |                                                     ^       ---------------- help: try placing this code inside a block: `{ if let _ = 0 {}; }`
@@ -272,7 +248,7 @@ LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else #[attr] if let _ = 0 {}
    |                                                     expected `{`
 
 error: expected `{`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:75:66
+  --> $DIR/attr-stmt-expr-attr-bad.rs:69:66
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else if let _ = 0 #[attr] {}; }
    |                                                     --           ^       --- help: try placing this code inside a block: `{ {}; }`
@@ -281,7 +257,7 @@ LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else if let _ = 0 #[attr] {}
    |                                                     this `if` expression has a condition, but no block
 
 error: an inner attribute is not permitted in this context
-  --> $DIR/attr-stmt-expr-attr-bad.rs:77:67
+  --> $DIR/attr-stmt-expr-attr-bad.rs:71:67
    |
 LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else if let _ = 0 {#![attr]}; }
    |                                                                   ^^^^^^^^
@@ -289,57 +265,57 @@ LL | #[cfg(FALSE)] fn e() { let _ = if let _ = 0 {} else if let _ = 0 {#![attr]}
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: an inner attribute is not permitted following an outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:80:32
+  --> $DIR/attr-stmt-expr-attr-bad.rs:74:32
    |
 LL | #[cfg(FALSE)] fn s() { #[attr] #![attr] let _ = 0; }
-   |                        ------- ^^^^^^^^ not permitted following an outer attibute
+   |                        ------- ^^^^^^^^ not permitted following an outer attribute
    |                        |
    |                        previous outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: an inner attribute is not permitted following an outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:82:32
+  --> $DIR/attr-stmt-expr-attr-bad.rs:76:32
    |
 LL | #[cfg(FALSE)] fn s() { #[attr] #![attr] 0; }
-   |                        ------- ^^^^^^^^ not permitted following an outer attibute
+   |                        ------- ^^^^^^^^ not permitted following an outer attribute
    |                        |
    |                        previous outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: an inner attribute is not permitted following an outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:84:32
+  --> $DIR/attr-stmt-expr-attr-bad.rs:78:32
    |
 LL | #[cfg(FALSE)] fn s() { #[attr] #![attr] foo!(); }
-   |                        ------- ^^^^^^^^ not permitted following an outer attibute
+   |                        ------- ^^^^^^^^ not permitted following an outer attribute
    |                        |
    |                        previous outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: an inner attribute is not permitted following an outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:86:32
+  --> $DIR/attr-stmt-expr-attr-bad.rs:80:32
    |
 LL | #[cfg(FALSE)] fn s() { #[attr] #![attr] foo![]; }
-   |                        ------- ^^^^^^^^ not permitted following an outer attibute
+   |                        ------- ^^^^^^^^ not permitted following an outer attribute
    |                        |
    |                        previous outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error: an inner attribute is not permitted following an outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:88:32
+  --> $DIR/attr-stmt-expr-attr-bad.rs:82:32
    |
 LL | #[cfg(FALSE)] fn s() { #[attr] #![attr] foo!{}; }
-   |                        ------- ^^^^^^^^ not permitted following an outer attibute
+   |                        ------- ^^^^^^^^ not permitted following an outer attribute
    |                        |
    |                        previous outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
 error[E0586]: inclusive range with no end
-  --> $DIR/attr-stmt-expr-attr-bad.rs:94:35
+  --> $DIR/attr-stmt-expr-attr-bad.rs:88:35
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] 10 => () } }
    |                                   ^^^ help: use `..` instead
@@ -347,13 +323,13 @@ LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] 10 => () } }
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
 
 error: expected one of `=>`, `if`, or `|`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:94:38
+  --> $DIR/attr-stmt-expr-attr-bad.rs:88:38
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] 10 => () } }
    |                                      ^ expected one of `=>`, `if`, or `|`
 
 error[E0586]: inclusive range with no end
-  --> $DIR/attr-stmt-expr-attr-bad.rs:97:35
+  --> $DIR/attr-stmt-expr-attr-bad.rs:91:35
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] -10 => () } }
    |                                   ^^^ help: use `..` instead
@@ -361,19 +337,19 @@ LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] -10 => () } }
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
 
 error: expected one of `=>`, `if`, or `|`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:97:38
+  --> $DIR/attr-stmt-expr-attr-bad.rs:91:38
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] -10 => () } }
    |                                      ^ expected one of `=>`, `if`, or `|`
 
 error: unexpected token: `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:100:39
+  --> $DIR/attr-stmt-expr-attr-bad.rs:94:39
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=-#[attr] 10 => () } }
    |                                       ^
 
 error[E0586]: inclusive range with no end
-  --> $DIR/attr-stmt-expr-attr-bad.rs:102:35
+  --> $DIR/attr-stmt-expr-attr-bad.rs:96:35
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] FOO => () } }
    |                                   ^^^ help: use `..` instead
@@ -381,47 +357,47 @@ LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] FOO => () } }
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
 
 error: expected one of `=>`, `if`, or `|`, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:102:38
+  --> $DIR/attr-stmt-expr-attr-bad.rs:96:38
    |
 LL | #[cfg(FALSE)] fn e() { match 0 { 0..=#[attr] FOO => () } }
    |                                      ^ expected one of `=>`, `if`, or `|`
 
 error: unexpected token: `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:106:34
+  --> $DIR/attr-stmt-expr-attr-bad.rs:100:34
    |
 LL | #[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); }
    |                                  ^
 
 error: expected one of `.`, `;`, `?`, or an operator, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:106:34
+  --> $DIR/attr-stmt-expr-attr-bad.rs:100:34
    |
 LL | #[cfg(FALSE)] fn e() { let _ = x.#![attr]foo(); }
    |                                  ^ expected one of `.`, `;`, `?`, or an operator
 
 error: unexpected token: `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:109:34
+  --> $DIR/attr-stmt-expr-attr-bad.rs:103:34
    |
 LL | #[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); }
    |                                  ^
 
 error: expected one of `.`, `;`, `?`, or an operator, found `#`
-  --> $DIR/attr-stmt-expr-attr-bad.rs:109:34
+  --> $DIR/attr-stmt-expr-attr-bad.rs:103:34
    |
 LL | #[cfg(FALSE)] fn e() { let _ = x.#[attr]foo(); }
    |                                  ^ expected one of `.`, `;`, `?`, or an operator
 
 error: expected statement after outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:114:44
+  --> $DIR/attr-stmt-expr-attr-bad.rs:108:37
    |
 LL | #[cfg(FALSE)] fn e() { { fn foo() { #[attr]; } } }
-   |                                            ^
+   |                                     ^^^^^^^
 
 error: expected statement after outer attribute
-  --> $DIR/attr-stmt-expr-attr-bad.rs:116:45
+  --> $DIR/attr-stmt-expr-attr-bad.rs:110:37
    |
 LL | #[cfg(FALSE)] fn e() { { fn foo() { #[attr] } } }
-   |                                             ^
+   |                                     ^^^^^^^
 
-error: aborting due to 57 previous errors
+error: aborting due to 53 previous errors
 
 For more information about this error, try `rustc --explain E0586`.
diff --git a/src/test/ui/parser/attrs-after-extern-mod.rs b/src/test/ui/parser/attrs-after-extern-mod.rs
index 4bdd16471c..ea899dca7b 100644
--- a/src/test/ui/parser/attrs-after-extern-mod.rs
+++ b/src/test/ui/parser/attrs-after-extern-mod.rs
@@ -1,13 +1,7 @@
-// Constants (static variables) can be used to match in patterns, but mutable
-// statics cannot. This ensures that there's some form of error if this is
-// attempted.
+// Make sure there's an error when given `extern { ... #[attr] }`.
 
-extern crate libc;
+fn main() {}
 
 extern {
-    static mut rust_dbg_static_mut: libc::c_int;
-    pub fn rust_dbg_static_mut_check_four();
     #[cfg(stage37)] //~ ERROR expected item after attributes
 }
-
-pub fn main() {}
diff --git a/src/test/ui/parser/attrs-after-extern-mod.stderr b/src/test/ui/parser/attrs-after-extern-mod.stderr
index cecdab4d63..3862f5c379 100644
--- a/src/test/ui/parser/attrs-after-extern-mod.stderr
+++ b/src/test/ui/parser/attrs-after-extern-mod.stderr
@@ -1,8 +1,12 @@
 error: expected item after attributes
-  --> $DIR/attrs-after-extern-mod.rs:10:19
+  --> $DIR/attrs-after-extern-mod.rs:6:5
    |
+LL | extern {
+   |        - while parsing this item list starting here
 LL |     #[cfg(stage37)]
-   |                   ^
+   |     ^^^^^^^^^^^^^^^
+LL | }
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/bounds-lifetime-where.rs b/src/test/ui/parser/bounds-lifetime-where.rs
index acb04e7859..e60cc153e6 100644
--- a/src/test/ui/parser/bounds-lifetime-where.rs
+++ b/src/test/ui/parser/bounds-lifetime-where.rs
@@ -5,6 +5,6 @@ type A where 'a:, = u8; // OK
 type A where 'a: 'b + 'c = u8; // OK
 type A where = u8; // OK
 type A where 'a: 'b + = u8; // OK
-type A where , = u8; //~ ERROR expected one of `=`, lifetime, or type, found `,`
+type A where , = u8; //~ ERROR expected one of `;`, `=`, lifetime, or type, found `,`
 
 fn main() {}
diff --git a/src/test/ui/parser/bounds-lifetime-where.stderr b/src/test/ui/parser/bounds-lifetime-where.stderr
index 05cebd6d35..950fa46c66 100644
--- a/src/test/ui/parser/bounds-lifetime-where.stderr
+++ b/src/test/ui/parser/bounds-lifetime-where.stderr
@@ -1,8 +1,8 @@
-error: expected one of `=`, lifetime, or type, found `,`
+error: expected one of `;`, `=`, lifetime, or type, found `,`
   --> $DIR/bounds-lifetime-where.rs:8:14
    |
 LL | type A where , = u8;
-   |              ^ expected one of `=`, lifetime, or type
+   |              ^ expected one of `;`, `=`, lifetime, or type
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/default-on-wrong-item-kind.rs b/src/test/ui/parser/default-on-wrong-item-kind.rs
new file mode 100644
index 0000000000..98a95cfa35
--- /dev/null
+++ b/src/test/ui/parser/default-on-wrong-item-kind.rs
@@ -0,0 +1,140 @@
+// Test parsing for `default` where it doesn't belong.
+// Specifically, we are interested in kinds of items or items in certain contexts.
+// Also test item kinds in `extern` blocks and associated contexts which are not allowed there.
+
+fn main() {}
+
+#[cfg(FALSE)]
+mod free_items {
+    default extern crate foo; //~ ERROR an extern crate cannot be `default`
+    default use foo; //~ ERROR a `use` import cannot be `default`
+    default static foo: u8; //~ ERROR a static item cannot be `default`
+    default const foo: u8;
+    default fn foo();
+    default mod foo {} //~ ERROR a module cannot be `default`
+    default extern "C" {} //~ ERROR an extern block cannot be `default`
+    default type foo = u8;
+    default enum foo {} //~ ERROR an enum cannot be `default`
+    default struct foo {} //~ ERROR a struct cannot be `default`
+    default union foo {} //~ ERROR a union cannot be `default`
+    default trait foo {} //~ ERROR a trait cannot be `default`
+    default trait foo = Ord; //~ ERROR a trait alias cannot be `default`
+    default impl foo {}
+    default!();
+    default::foo::bar!();
+    default default!(); //~ ERROR an item macro invocation cannot be `default`
+    default default::foo::bar!(); //~ ERROR an item macro invocation cannot be `default`
+    default macro foo {} //~ ERROR a macro definition cannot be `default`
+    default macro_rules! foo {} //~ ERROR a macro definition cannot be `default`
+}
+
+#[cfg(FALSE)]
+extern "C" {
+    default extern crate foo; //~ ERROR an extern crate cannot be `default`
+    //~^ ERROR extern crate is not supported in `extern` blocks
+    default use foo; //~ ERROR a `use` import cannot be `default`
+    //~^ ERROR `use` import is not supported in `extern` blocks
+    default static foo: u8; //~ ERROR a static item cannot be `default`
+    default const foo: u8;
+    //~^ ERROR extern items cannot be `const`
+    default fn foo();
+    default mod foo {} //~ ERROR a module cannot be `default`
+    //~^ ERROR module is not supported in `extern` blocks
+    default extern "C" {} //~ ERROR an extern block cannot be `default`
+    //~^ ERROR extern block is not supported in `extern` blocks
+    default type foo = u8;
+    default enum foo {} //~ ERROR an enum cannot be `default`
+    //~^ ERROR enum is not supported in `extern` blocks
+    default struct foo {} //~ ERROR a struct cannot be `default`
+    //~^ ERROR struct is not supported in `extern` blocks
+    default union foo {} //~ ERROR a union cannot be `default`
+    //~^ ERROR union is not supported in `extern` blocks
+    default trait foo {} //~ ERROR a trait cannot be `default`
+    //~^ ERROR trait is not supported in `extern` blocks
+    default trait foo = Ord; //~ ERROR a trait alias cannot be `default`
+    //~^ ERROR trait alias is not supported in `extern` blocks
+    default impl foo {}
+    //~^ ERROR implementation is not supported in `extern` blocks
+    default!();
+    default::foo::bar!();
+    default default!(); //~ ERROR an item macro invocation cannot be `default`
+    default default::foo::bar!(); //~ ERROR an item macro invocation cannot be `default`
+    default macro foo {} //~ ERROR a macro definition cannot be `default`
+    //~^ ERROR macro definition is not supported in `extern` blocks
+    default macro_rules! foo {} //~ ERROR a macro definition cannot be `default`
+    //~^ ERROR macro definition is not supported in `extern` blocks
+}
+
+#[cfg(FALSE)]
+impl S {
+    default extern crate foo; //~ ERROR an extern crate cannot be `default`
+    //~^ ERROR extern crate is not supported in `trait`s or `impl`s
+    default use foo; //~ ERROR a `use` import cannot be `default`
+    //~^ ERROR `use` import is not supported in `trait`s or `impl`s
+    default static foo: u8; //~ ERROR a static item cannot be `default`
+    //~^ ERROR associated `static` items are not allowed
+    default const foo: u8;
+    default fn foo();
+    default mod foo {}//~ ERROR a module cannot be `default`
+    //~^ ERROR module is not supported in `trait`s or `impl`s
+    default extern "C" {} //~ ERROR an extern block cannot be `default`
+    //~^ ERROR extern block is not supported in `trait`s or `impl`s
+    default type foo = u8;
+    default enum foo {} //~ ERROR an enum cannot be `default`
+    //~^ ERROR enum is not supported in `trait`s or `impl`s
+    default struct foo {} //~ ERROR a struct cannot be `default`
+    //~^ ERROR struct is not supported in `trait`s or `impl`s
+    default union foo {} //~ ERROR a union cannot be `default`
+    //~^ ERROR union is not supported in `trait`s or `impl`s
+    default trait foo {} //~ ERROR a trait cannot be `default`
+    //~^ ERROR trait is not supported in `trait`s or `impl`s
+    default trait foo = Ord; //~ ERROR a trait alias cannot be `default`
+    //~^ ERROR trait alias is not supported in `trait`s or `impl`s
+    default impl foo {}
+    //~^ ERROR implementation is not supported in `trait`s or `impl`s
+    default!();
+    default::foo::bar!();
+    default default!(); //~ ERROR an item macro invocation cannot be `default`
+    default default::foo::bar!(); //~ ERROR an item macro invocation cannot be `default`
+    default macro foo {} //~ ERROR a macro definition cannot be `default`
+    //~^ ERROR macro definition is not supported in `trait`s or `impl`s
+    default macro_rules! foo {} //~ ERROR a macro definition cannot be `default`
+    //~^ ERROR macro definition is not supported in `trait`s or `impl`s
+}
+
+#[cfg(FALSE)]
+trait T {
+    default extern crate foo; //~ ERROR an extern crate cannot be `default`
+    //~^ ERROR extern crate is not supported in `trait`s or `impl`s
+    default use foo; //~ ERROR a `use` import cannot be `default`
+    //~^ ERROR `use` import is not supported in `trait`s or `impl`s
+    default static foo: u8; //~ ERROR a static item cannot be `default`
+    //~^ ERROR associated `static` items are not allowed
+    default const foo: u8;
+    default fn foo();
+    default mod foo {}//~ ERROR a module cannot be `default`
+    //~^ ERROR module is not supported in `trait`s or `impl`s
+    default extern "C" {} //~ ERROR an extern block cannot be `default`
+    //~^ ERROR extern block is not supported in `trait`s or `impl`s
+    default type foo = u8;
+    default enum foo {} //~ ERROR an enum cannot be `default`
+    //~^ ERROR enum is not supported in `trait`s or `impl`s
+    default struct foo {} //~ ERROR a struct cannot be `default`
+    //~^ ERROR struct is not supported in `trait`s or `impl`s
+    default union foo {} //~ ERROR a union cannot be `default`
+    //~^ ERROR union is not supported in `trait`s or `impl`s
+    default trait foo {} //~ ERROR a trait cannot be `default`
+    //~^ ERROR trait is not supported in `trait`s or `impl`s
+    default trait foo = Ord; //~ ERROR a trait alias cannot be `default`
+    //~^ ERROR trait alias is not supported in `trait`s or `impl`s
+    default impl foo {}
+    //~^ ERROR implementation is not supported in `trait`s or `impl`s
+    default!();
+    default::foo::bar!();
+    default default!(); //~ ERROR an item macro invocation cannot be `default`
+    default default::foo::bar!(); //~ ERROR an item macro invocation cannot be `default`
+    default macro foo {} //~ ERROR a macro definition cannot be `default`
+    //~^ ERROR macro definition is not supported in `trait`s or `impl`s
+    default macro_rules! foo {} //~ ERROR a macro definition cannot be `default`
+    //~^ ERROR macro definition is not supported in `trait`s or `impl`s
+}
diff --git a/src/test/ui/parser/default-on-wrong-item-kind.stderr b/src/test/ui/parser/default-on-wrong-item-kind.stderr
new file mode 100644
index 0000000000..9788bd6472
--- /dev/null
+++ b/src/test/ui/parser/default-on-wrong-item-kind.stderr
@@ -0,0 +1,688 @@
+error: an extern crate cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:9:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a `use` import cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:10:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a static item cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:11:5
+   |
+LL |     default static foo: u8;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a module cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:14:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an extern block cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:15:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an enum cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:17:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a struct cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:18:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a union cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:19:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a trait cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:20:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a trait alias cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:21:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:25:5
+   |
+LL |     default default!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:26:5
+   |
+LL |     default default::foo::bar!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:27:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:28:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an extern crate cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:33:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern crate is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:33:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a `use` import cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:35:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: `use` import is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:35:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:37:5
+   |
+LL |     default static foo: u8;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern items cannot be `const`
+  --> $DIR/default-on-wrong-item-kind.rs:38:19
+   |
+LL |     default const foo: u8;
+   |     --------------^^^
+   |     |
+   |     help: try using a static value: `static`
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: a module cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:41:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: module is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:41:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^^^^^^^^^
+
+error: an extern block cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:43:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern block is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:43:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: an enum cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:46:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: enum is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:46:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^^^^^^^^^^
+
+error: a struct cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:48:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: struct is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:48:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: a union cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:50:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: union is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:50:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a trait cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:52:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: trait is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:52:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a trait alias cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:54:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: trait alias is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:54:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: implementation is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:56:5
+   |
+LL |     default impl foo {}
+   |     ^^^^^^^^^^^^^^^^
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:60:5
+   |
+LL |     default default!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:61:5
+   |
+LL |     default default::foo::bar!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:62:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: macro definition is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:62:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:64:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: macro definition is not supported in `extern` blocks
+  --> $DIR/default-on-wrong-item-kind.rs:64:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: an extern crate cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:70:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern crate is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:70:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a `use` import cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:72:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: `use` import is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:72:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:74:5
+   |
+LL |     default static foo: u8;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/default-on-wrong-item-kind.rs:74:5
+   |
+LL |     default static foo: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a module cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:78:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: module is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:78:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^^^^^^^^^
+
+error: an extern block cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:80:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern block is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:80:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: an enum cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:83:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: enum is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:83:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^^^^^^^^^^
+
+error: a struct cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:85:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: struct is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:85:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: a union cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:87:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: union is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:87:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a trait cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:89:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: trait is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:89:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a trait alias cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:91:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: trait alias is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:91:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: implementation is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:93:5
+   |
+LL |     default impl foo {}
+   |     ^^^^^^^^^^^^^^^^
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:97:5
+   |
+LL |     default default!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:98:5
+   |
+LL |     default default::foo::bar!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:99:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: macro definition is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:99:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:101:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: macro definition is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:101:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: an extern crate cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:107:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern crate is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:107:5
+   |
+LL |     default extern crate foo;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a `use` import cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:109:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: `use` import is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:109:5
+   |
+LL |     default use foo;
+   |     ^^^^^^^^^^^^^^^^
+
+error: a static item cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:111:5
+   |
+LL |     default static foo: u8;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: associated `static` items are not allowed
+  --> $DIR/default-on-wrong-item-kind.rs:111:5
+   |
+LL |     default static foo: u8;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^
+
+error: a module cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:115:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: module is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:115:5
+   |
+LL |     default mod foo {}
+   |     ^^^^^^^^^^^^^^^
+
+error: an extern block cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:117:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: extern block is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:117:5
+   |
+LL |     default extern "C" {}
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: an enum cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:120:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: enum is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:120:5
+   |
+LL |     default enum foo {}
+   |     ^^^^^^^^^^^^^^^^
+
+error: a struct cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:122:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: struct is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:122:5
+   |
+LL |     default struct foo {}
+   |     ^^^^^^^^^^^^^^^^^^
+
+error: a union cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:124:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: union is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:124:5
+   |
+LL |     default union foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a trait cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:126:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: trait is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:126:5
+   |
+LL |     default trait foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a trait alias cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:128:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: trait alias is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:128:5
+   |
+LL |     default trait foo = Ord;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: implementation is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:130:5
+   |
+LL |     default impl foo {}
+   |     ^^^^^^^^^^^^^^^^
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:134:5
+   |
+LL |     default default!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: an item macro invocation cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:135:5
+   |
+LL |     default default::foo::bar!();
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:136:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: macro definition is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:136:5
+   |
+LL |     default macro foo {}
+   |     ^^^^^^^^^^^^^^^^^
+
+error: a macro definition cannot be `default`
+  --> $DIR/default-on-wrong-item-kind.rs:138:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^ `default` because of this
+   |
+   = note: only associated `fn`, `const`, and `type` items can be `default`
+
+error: macro definition is not supported in `trait`s or `impl`s
+  --> $DIR/default-on-wrong-item-kind.rs:138:5
+   |
+LL |     default macro_rules! foo {}
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 95 previous errors
+
diff --git a/src/test/ui/parser/default-unmatched-assoc.rs b/src/test/ui/parser/default-unmatched-assoc.rs
new file mode 100644
index 0000000000..168ea3e76f
--- /dev/null
+++ b/src/test/ui/parser/default-unmatched-assoc.rs
@@ -0,0 +1,16 @@
+fn main() {}
+
+trait Foo {
+    default!(); //~ ERROR cannot find macro `default` in this scope
+    default do
+    //~^ ERROR `default` is not followed by an item
+    //~| ERROR non-item in item list
+}
+
+struct S;
+impl S {
+    default!(); //~ ERROR cannot find macro `default` in this scope
+    default do
+    //~^ ERROR `default` is not followed by an item
+    //~| ERROR non-item in item list
+}
diff --git a/src/test/ui/parser/default-unmatched-assoc.stderr b/src/test/ui/parser/default-unmatched-assoc.stderr
new file mode 100644
index 0000000000..c8d1769cb5
--- /dev/null
+++ b/src/test/ui/parser/default-unmatched-assoc.stderr
@@ -0,0 +1,54 @@
+error: `default` is not followed by an item
+  --> $DIR/default-unmatched-assoc.rs:5:5
+   |
+LL |     default do
+   |     ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: non-item in item list
+  --> $DIR/default-unmatched-assoc.rs:5:13
+   |
+LL | trait Foo {
+   |           - item list starts here
+LL |     default!();
+LL |     default do
+   |             ^^ non-item starts here
+...
+LL | }
+   | - item list ends here
+
+error: `default` is not followed by an item
+  --> $DIR/default-unmatched-assoc.rs:13:5
+   |
+LL |     default do
+   |     ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: non-item in item list
+  --> $DIR/default-unmatched-assoc.rs:13:13
+   |
+LL | impl S {
+   |        - item list starts here
+LL |     default!();
+LL |     default do
+   |             ^^ non-item starts here
+...
+LL | }
+   | - item list ends here
+
+error: cannot find macro `default` in this scope
+  --> $DIR/default-unmatched-assoc.rs:12:5
+   |
+LL |     default!();
+   |     ^^^^^^^
+
+error: cannot find macro `default` in this scope
+  --> $DIR/default-unmatched-assoc.rs:4:5
+   |
+LL |     default!();
+   |     ^^^^^^^
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/parser/default-unmatched-extern.rs b/src/test/ui/parser/default-unmatched-extern.rs
new file mode 100644
index 0000000000..8d0ea590f5
--- /dev/null
+++ b/src/test/ui/parser/default-unmatched-extern.rs
@@ -0,0 +1,8 @@
+fn main() {}
+
+extern "C" {
+    default!(); //~ ERROR cannot find macro `default` in this scope
+    default do
+    //~^ ERROR `default` is not followed by an item
+    //~| ERROR non-item in item list
+}
diff --git a/src/test/ui/parser/default-unmatched-extern.stderr b/src/test/ui/parser/default-unmatched-extern.stderr
new file mode 100644
index 0000000000..bb4efd5163
--- /dev/null
+++ b/src/test/ui/parser/default-unmatched-extern.stderr
@@ -0,0 +1,28 @@
+error: `default` is not followed by an item
+  --> $DIR/default-unmatched-extern.rs:5:5
+   |
+LL |     default do
+   |     ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: non-item in item list
+  --> $DIR/default-unmatched-extern.rs:5:13
+   |
+LL | extern "C" {
+   |            - item list starts here
+LL |     default!();
+LL |     default do
+   |             ^^ non-item starts here
+...
+LL | }
+   | - item list ends here
+
+error: cannot find macro `default` in this scope
+  --> $DIR/default-unmatched-extern.rs:4:5
+   |
+LL |     default!();
+   |     ^^^^^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/default-unmatched.rs b/src/test/ui/parser/default-unmatched.rs
new file mode 100644
index 0000000000..49346e5c63
--- /dev/null
+++ b/src/test/ui/parser/default-unmatched.rs
@@ -0,0 +1,6 @@
+mod foo {
+    default!(); // OK.
+    default do
+    //~^ ERROR `default` is not followed by an item
+    //~| ERROR expected item, found reserved keyword `do`
+}
diff --git a/src/test/ui/parser/default-unmatched.stderr b/src/test/ui/parser/default-unmatched.stderr
new file mode 100644
index 0000000000..331e003f63
--- /dev/null
+++ b/src/test/ui/parser/default-unmatched.stderr
@@ -0,0 +1,16 @@
+error: `default` is not followed by an item
+  --> $DIR/default-unmatched.rs:3:5
+   |
+LL |     default do
+   |     ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: expected item, found reserved keyword `do`
+  --> $DIR/default-unmatched.rs:3:13
+   |
+LL |     default do
+   |             ^^ expected item
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/parser/default.rs b/src/test/ui/parser/default.rs
index 17cd06864b..64ba4b5531 100644
--- a/src/test/ui/parser/default.rs
+++ b/src/test/ui/parser/default.rs
@@ -19,7 +19,9 @@ impl Foo for u16 {
 }
 
 impl Foo for u32 { //~ ERROR not all trait items implemented, missing: `foo`
-    default pub fn foo<T: Default>() -> T { T::default() } //~ ERROR expected one of
+    default pub fn foo<T: Default>() -> T { T::default() }
+    //~^ ERROR `default` is not followed by an item
+    //~| ERROR non-item in item list
 }
 
 fn main() {}
diff --git a/src/test/ui/parser/default.stderr b/src/test/ui/parser/default.stderr
index dde36cf8dd..15c49e8b62 100644
--- a/src/test/ui/parser/default.stderr
+++ b/src/test/ui/parser/default.stderr
@@ -1,8 +1,21 @@
-error: expected one of `async`, `const`, `extern`, `fn`, `type`, or `unsafe`, found keyword `pub`
+error: `default` is not followed by an item
+  --> $DIR/default.rs:22:5
+   |
+LL |     default pub fn foo<T: Default>() -> T { T::default() }
+   |     ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: non-item in item list
   --> $DIR/default.rs:22:13
    |
+LL | impl Foo for u32 {
+   |                  - item list starts here
 LL |     default pub fn foo<T: Default>() -> T { T::default() }
-   |             ^^^ expected one of `async`, `const`, `extern`, `fn`, `type`, or `unsafe`
+   |             ^^^ non-item starts here
+...
+LL | }
+   | - item list ends here
 
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/default.rs:16:5
@@ -19,7 +32,7 @@ LL |     fn foo<T: Default>() -> T;
 LL | impl Foo for u32 {
    | ^^^^^^^^^^^^^^^^ missing `foo` in implementation
 
-error: aborting due to 3 previous errors
+error: aborting due to 4 previous errors
 
 Some errors have detailed explanations: E0046, E0449.
 For more information about an error, try `rustc --explain E0046`.
diff --git a/src/test/ui/parser/doc-before-attr.stderr b/src/test/ui/parser/doc-before-attr.stderr
index 0fae44ce5c..14fd01af2f 100644
--- a/src/test/ui/parser/doc-before-attr.stderr
+++ b/src/test/ui/parser/doc-before-attr.stderr
@@ -1,8 +1,10 @@
 error: expected item after attributes
-  --> $DIR/doc-before-attr.rs:4:16
+  --> $DIR/doc-before-attr.rs:4:1
    |
+LL | /// hi
+   | ------ other attributes here
 LL | #[derive(Debug)]
-   |                ^
+   | ^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/doc-before-extern-rbrace.rs b/src/test/ui/parser/doc-before-extern-rbrace.rs
index 695d4da1dc..040206b80f 100644
--- a/src/test/ui/parser/doc-before-extern-rbrace.rs
+++ b/src/test/ui/parser/doc-before-extern-rbrace.rs
@@ -1,4 +1,6 @@
+fn main() {}
+
 extern {
     /// hi
-    //~^ ERROR expected item after doc comment
+    //~^ ERROR found a documentation comment that doesn't document anything
 }
diff --git a/src/test/ui/parser/doc-before-extern-rbrace.stderr b/src/test/ui/parser/doc-before-extern-rbrace.stderr
index 8cc9c916a7..0edceb268a 100644
--- a/src/test/ui/parser/doc-before-extern-rbrace.stderr
+++ b/src/test/ui/parser/doc-before-extern-rbrace.stderr
@@ -1,8 +1,11 @@
-error: expected item after doc comment
-  --> $DIR/doc-before-extern-rbrace.rs:2:5
+error[E0584]: found a documentation comment that doesn't document anything
+  --> $DIR/doc-before-extern-rbrace.rs:4:5
    |
 LL |     /// hi
    |     ^^^^^^ this doc comment doesn't document anything
+   |
+   = help: doc comments must come before what they document, maybe a comment was intended with `//`?
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0584`.
diff --git a/src/test/ui/parser/doc-before-semi.rs b/src/test/ui/parser/doc-before-semi.rs
index c3f478fe42..405a7e1e2a 100644
--- a/src/test/ui/parser/doc-before-semi.rs
+++ b/src/test/ui/parser/doc-before-semi.rs
@@ -3,6 +3,4 @@ fn main() {
     //~^ ERROR found a documentation comment that doesn't document anything
     //~| HELP maybe a comment was intended
     ;
-    //~^ WARNING unnecessary trailing semicolon
-    //~| HELP remove this semicolon
 }
diff --git a/src/test/ui/parser/doc-before-semi.stderr b/src/test/ui/parser/doc-before-semi.stderr
index b9ac30b09b..e6bade18d0 100644
--- a/src/test/ui/parser/doc-before-semi.stderr
+++ b/src/test/ui/parser/doc-before-semi.stderr
@@ -6,14 +6,6 @@ LL |     /// hi
    |
    = help: doc comments must come before what they document, maybe a comment was intended with `//`?
 
-warning: unnecessary trailing semicolon
-  --> $DIR/doc-before-semi.rs:5:5
-   |
-LL |     ;
-   |     ^ help: remove this semicolon
-   |
-   = note: `#[warn(redundant_semicolon)]` on by default
-
 error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0585`.
diff --git a/src/test/ui/parser/doc-comment-in-stmt.rs b/src/test/ui/parser/doc-comment-in-stmt.rs
new file mode 100644
index 0000000000..b02df13213
--- /dev/null
+++ b/src/test/ui/parser/doc-comment-in-stmt.rs
@@ -0,0 +1,20 @@
+fn foo() -> bool {
+    false
+    //!self.allow_ty_infer()
+    //~^ ERROR found doc comment
+}
+
+fn bar() -> bool {
+    false
+    /*! bar */ //~ ERROR found doc comment
+}
+
+fn baz() -> i32 {
+    1 /** baz */ //~ ERROR found doc comment
+}
+
+fn quux() -> i32 {
+    2 /*! quux */ //~ ERROR found doc comment
+}
+
+fn main() {}
diff --git a/src/test/ui/parser/doc-comment-in-stmt.stderr b/src/test/ui/parser/doc-comment-in-stmt.stderr
new file mode 100644
index 0000000000..5d94d6fe69
--- /dev/null
+++ b/src/test/ui/parser/doc-comment-in-stmt.stderr
@@ -0,0 +1,50 @@
+error: expected one of `.`, `;`, `?`, `}`, or an operator, found doc comment `//!self.allow_ty_infer()`
+  --> $DIR/doc-comment-in-stmt.rs:3:5
+   |
+LL |     false
+   |          - expected one of `.`, `;`, `?`, `}`, or an operator
+LL |     //!self.allow_ty_infer()
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^ unexpected token
+   |
+help: add a space before `!` to use a regular comment
+   |
+LL |     // !self.allow_ty_infer()
+   |     ^^^^
+
+error: expected one of `.`, `;`, `?`, `}`, or an operator, found doc comment `/*! bar */`
+  --> $DIR/doc-comment-in-stmt.rs:9:5
+   |
+LL |     false
+   |          - expected one of `.`, `;`, `?`, `}`, or an operator
+LL |     /*! bar */
+   |     ^^^^^^^^^^ unexpected token
+   |
+help: add a space before `!` to use a regular comment
+   |
+LL |     /* ! bar */
+   |     ^^^^
+
+error: expected one of `.`, `;`, `?`, `}`, or an operator, found doc comment `/** baz */`
+  --> $DIR/doc-comment-in-stmt.rs:13:7
+   |
+LL |     1 /** baz */
+   |       ^^^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
+   |
+help: add a space before `*` to use a regular comment
+   |
+LL |     1 /* * baz */
+   |       ^^^^
+
+error: expected one of `.`, `;`, `?`, `}`, or an operator, found doc comment `/*! quux */`
+  --> $DIR/doc-comment-in-stmt.rs:17:7
+   |
+LL |     2 /*! quux */
+   |       ^^^^^^^^^^^ expected one of `.`, `;`, `?`, `}`, or an operator
+   |
+help: add a space before `!` to use a regular comment
+   |
+LL |     2 /* ! quux */
+   |       ^^^^
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/parser/doc-inside-trait-item.stderr b/src/test/ui/parser/doc-inside-trait-item.stderr
index 261e27b6e0..246255a0a4 100644
--- a/src/test/ui/parser/doc-inside-trait-item.stderr
+++ b/src/test/ui/parser/doc-inside-trait-item.stderr
@@ -2,7 +2,7 @@ error[E0584]: found a documentation comment that doesn't document anything
   --> $DIR/doc-inside-trait-item.rs:3:5
    |
 LL |     /// empty doc
-   |     ^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^ this doc comment doesn't document anything
    |
    = help: doc comments must come before what they document, maybe a comment was intended with `//`?
 
diff --git a/src/test/ui/parser/duplicate-visibility.rs b/src/test/ui/parser/duplicate-visibility.rs
index bb17e97e95..31318ae3a0 100644
--- a/src/test/ui/parser/duplicate-visibility.rs
+++ b/src/test/ui/parser/duplicate-visibility.rs
@@ -1,4 +1,7 @@
-// error-pattern:expected one of `(`, `fn`, `static`, or `type`
+fn main() {}
+
 extern {
     pub pub fn foo();
+    //~^ ERROR visibility `pub` is not followed by an item
+    //~| ERROR non-item in item list
 }
diff --git a/src/test/ui/parser/duplicate-visibility.stderr b/src/test/ui/parser/duplicate-visibility.stderr
index 313e88e812..36b9efd9dc 100644
--- a/src/test/ui/parser/duplicate-visibility.stderr
+++ b/src/test/ui/parser/duplicate-visibility.stderr
@@ -1,8 +1,21 @@
-error: expected one of `(`, `fn`, `static`, or `type`, found keyword `pub`
-  --> $DIR/duplicate-visibility.rs:3:9
+error: visibility `pub` is not followed by an item
+  --> $DIR/duplicate-visibility.rs:4:5
    |
 LL |     pub pub fn foo();
-   |         ^^^ expected one of `(`, `fn`, `static`, or `type`
+   |     ^^^ the visibility
+   |
+   = help: you likely meant to define an item, e.g., `pub fn foo() {}`
+
+error: non-item in item list
+  --> $DIR/duplicate-visibility.rs:4:9
+   |
+LL | extern {
+   |        - item list starts here
+LL |     pub pub fn foo();
+   |         ^^^ non-item starts here
+...
+LL | }
+   | - item list ends here
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs b/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs
index cb23f2c808..4ecb21d26a 100644
--- a/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs
+++ b/src/test/ui/parser/extern-abi-from-mac-literal-frag.rs
@@ -1,7 +1,7 @@
 // check-pass
 
 // In this test we check that the parser accepts an ABI string when it
-// comes from a macro `literal` fragment as opposed to a hardcoded string.
+// comes from a macro `literal` or `expr` fragment as opposed to a hardcoded string.
 
 fn main() {}
 
@@ -17,6 +17,18 @@ macro_rules! abi_from_lit_frag {
     }
 }
 
+macro_rules! abi_from_expr_frag {
+    ($abi:expr) => {
+        extern $abi {
+            fn _import();
+        }
+
+        extern $abi fn _export() {}
+
+        type _PTR = extern $abi fn();
+    };
+}
+
 mod rust {
     abi_from_lit_frag!("Rust");
 }
@@ -24,3 +36,11 @@ mod rust {
 mod c {
     abi_from_lit_frag!("C");
 }
+
+mod rust_expr {
+    abi_from_expr_frag!("Rust");
+}
+
+mod c_expr {
+    abi_from_expr_frag!("C");
+}
diff --git a/src/test/ui/parser/extern-crate-async.rs b/src/test/ui/parser/extern-crate-async.rs
new file mode 100644
index 0000000000..6a54ac7f4a
--- /dev/null
+++ b/src/test/ui/parser/extern-crate-async.rs
@@ -0,0 +1,12 @@
+// Make sure that we don't parse `extern crate async`
+// the front matter of a function leading us astray.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+extern crate async;
+
+#[cfg(FALSE)]
+extern crate async as something_else;
diff --git a/src/test/ui/parser/extern-crate-unexpected-token.rs b/src/test/ui/parser/extern-crate-unexpected-token.rs
index 58b2fa1afd..7687f5e640 100644
--- a/src/test/ui/parser/extern-crate-unexpected-token.rs
+++ b/src/test/ui/parser/extern-crate-unexpected-token.rs
@@ -1 +1 @@
-extern crte foo; //~ ERROR expected one of `crate`, `fn`, or `{`, found `crte`
+extern crte foo; //~ ERROR expected one of `crate` or `{`, found `crte`
diff --git a/src/test/ui/parser/extern-crate-unexpected-token.stderr b/src/test/ui/parser/extern-crate-unexpected-token.stderr
index 0e745dc582..e9d287ac0e 100644
--- a/src/test/ui/parser/extern-crate-unexpected-token.stderr
+++ b/src/test/ui/parser/extern-crate-unexpected-token.stderr
@@ -1,8 +1,8 @@
-error: expected one of `crate`, `fn`, or `{`, found `crte`
+error: expected one of `crate` or `{`, found `crte`
   --> $DIR/extern-crate-unexpected-token.rs:1:8
    |
 LL | extern crte foo;
-   |        ^^^^ expected one of `crate`, `fn`, or `{`
+   |        ^^^^ expected one of `crate` or `{`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/extern-expected-fn-or-brace.rs b/src/test/ui/parser/extern-expected-fn-or-brace.rs
index 907de0d8f9..1dcea17445 100644
--- a/src/test/ui/parser/extern-expected-fn-or-brace.rs
+++ b/src/test/ui/parser/extern-expected-fn-or-brace.rs
@@ -1,4 +1,3 @@
-// Verifies that the expected token errors for `extern crate` are
-// raised
+// Verifies that the expected token errors for `extern crate` are raised.
 
-extern "C" mod foo; //~ERROR expected one of `fn` or `{`, found keyword `mod`
+extern "C" mod foo; //~ERROR expected `{`, found keyword `mod`
diff --git a/src/test/ui/parser/extern-expected-fn-or-brace.stderr b/src/test/ui/parser/extern-expected-fn-or-brace.stderr
index 0ebe9a0d3e..258a2c2680 100644
--- a/src/test/ui/parser/extern-expected-fn-or-brace.stderr
+++ b/src/test/ui/parser/extern-expected-fn-or-brace.stderr
@@ -1,8 +1,8 @@
-error: expected one of `fn` or `{`, found keyword `mod`
-  --> $DIR/extern-expected-fn-or-brace.rs:4:12
+error: expected `{`, found keyword `mod`
+  --> $DIR/extern-expected-fn-or-brace.rs:3:12
    |
 LL | extern "C" mod foo;
-   |            ^^^ expected one of `fn` or `{`
+   |            ^^^ expected `{`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/extern-no-fn.rs b/src/test/ui/parser/extern-no-fn.rs
index c37ddd69ce..d9f35e0eb5 100644
--- a/src/test/ui/parser/extern-no-fn.rs
+++ b/src/test/ui/parser/extern-no-fn.rs
@@ -1,5 +1,5 @@
-extern { //~ ERROR missing `fn`, `type`, or `static` for extern-item declaration
-    f();
+extern {
+    f(); //~ ERROR expected one of `!` or `::`, found `(`
 }
 
 fn main() {
diff --git a/src/test/ui/parser/extern-no-fn.stderr b/src/test/ui/parser/extern-no-fn.stderr
index d2d5e3c468..0151cb4235 100644
--- a/src/test/ui/parser/extern-no-fn.stderr
+++ b/src/test/ui/parser/extern-no-fn.stderr
@@ -1,10 +1,12 @@
-error: missing `fn`, `type`, or `static` for extern-item declaration
-  --> $DIR/extern-no-fn.rs:1:9
+error: expected one of `!` or `::`, found `(`
+  --> $DIR/extern-no-fn.rs:2:6
    |
-LL |   extern {
-   |  _________^
-LL | |     f();
-   | |____^ missing `fn`, `type`, or `static`
+LL | extern {
+   |        - while parsing this item list starting here
+LL |     f();
+   |      ^ expected one of `!` or `::`
+LL | }
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/fn-body-optional-semantic-fail.rs b/src/test/ui/parser/fn-body-optional-semantic-fail.rs
new file mode 100644
index 0000000000..38def05e8f
--- /dev/null
+++ b/src/test/ui/parser/fn-body-optional-semantic-fail.rs
@@ -0,0 +1,27 @@
+// Tests the different rules for `fn` forms requiring the presence or lack of a body.
+
+fn main() {
+    fn f1(); //~ ERROR free function without a body
+    fn f2() {} // OK.
+
+    trait X {
+        fn f1(); // OK.
+        fn f2() {} // OK.
+    }
+
+    struct Y;
+    impl X for Y {
+        fn f1(); //~ ERROR associated function in `impl` without body
+        fn f2() {} // OK.
+    }
+
+    impl Y {
+        fn f3(); //~ ERROR associated function in `impl` without body
+        fn f4() {} // OK.
+    }
+
+    extern {
+        fn f5(); // OK.
+        fn f6() {} //~ ERROR incorrect function inside `extern` block
+    }
+}
diff --git a/src/test/ui/parser/fn-body-optional-semantic-fail.stderr b/src/test/ui/parser/fn-body-optional-semantic-fail.stderr
new file mode 100644
index 0000000000..23ce98fb5d
--- /dev/null
+++ b/src/test/ui/parser/fn-body-optional-semantic-fail.stderr
@@ -0,0 +1,40 @@
+error: free function without a body
+  --> $DIR/fn-body-optional-semantic-fail.rs:4:5
+   |
+LL |     fn f1();
+   |     ^^^^^^^-
+   |            |
+   |            help: provide a definition for the function: `{ <body> }`
+
+error: associated function in `impl` without body
+  --> $DIR/fn-body-optional-semantic-fail.rs:14:9
+   |
+LL |         fn f1();
+   |         ^^^^^^^-
+   |                |
+   |                help: provide a definition for the function: `{ <body> }`
+
+error: associated function in `impl` without body
+  --> $DIR/fn-body-optional-semantic-fail.rs:19:9
+   |
+LL |         fn f3();
+   |         ^^^^^^^-
+   |                |
+   |                help: provide a definition for the function: `{ <body> }`
+
+error: incorrect function inside `extern` block
+  --> $DIR/fn-body-optional-semantic-fail.rs:25:12
+   |
+LL |     extern {
+   |     ------ `extern` blocks define existing foreign functions and functions inside of them cannot have a body
+LL |         fn f5(); // OK.
+LL |         fn f6() {}
+   |            ^^   -- help: remove the invalid body: `;`
+   |            |
+   |            cannot have a body
+   |
+   = help: you might have meant to write a function accessible through FFI, which can be done by writing `extern fn` outside of the `extern` block
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/parser/fn-body-optional-syntactic-pass.rs b/src/test/ui/parser/fn-body-optional-syntactic-pass.rs
new file mode 100644
index 0000000000..e7991c73b4
--- /dev/null
+++ b/src/test/ui/parser/fn-body-optional-syntactic-pass.rs
@@ -0,0 +1,31 @@
+// Ensures that all `fn` forms having or lacking a body are syntactically valid.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+fn syntax() {
+    fn f();
+    fn f() {}
+
+    trait X {
+        fn f();
+        fn f() {}
+    }
+
+    impl X for Y {
+        fn f();
+        fn f() {}
+    }
+
+    impl Y {
+        fn f();
+        fn f() {}
+    }
+
+    extern {
+        fn f();
+        fn f() {}
+    }
+}
diff --git a/src/test/ui/parser/fn-header-semantic-fail.rs b/src/test/ui/parser/fn-header-semantic-fail.rs
new file mode 100644
index 0000000000..c327667f4c
--- /dev/null
+++ b/src/test/ui/parser/fn-header-semantic-fail.rs
@@ -0,0 +1,58 @@
+// Ensures that all `fn` forms can have all the function qualifiers syntactically.
+
+// edition:2018
+
+#![feature(const_extern_fn)]
+#![feature(const_fn)]
+
+fn main() {
+    async fn ff1() {} // OK.
+    unsafe fn ff2() {} // OK.
+    const fn ff3() {} // OK.
+    extern "C" fn ff4() {} // OK.
+    const async unsafe extern "C" fn ff5() {} // OK.
+    //~^ ERROR functions cannot be both `const` and `async`
+
+    trait X {
+        async fn ft1(); //~ ERROR functions in traits cannot be declared `async`
+        unsafe fn ft2(); // OK.
+        const fn ft3(); //~ ERROR functions in traits cannot be declared const
+        extern "C" fn ft4(); // OK.
+        const async unsafe extern "C" fn ft5();
+        //~^ ERROR functions in traits cannot be declared `async`
+        //~| ERROR functions in traits cannot be declared const
+        //~| ERROR functions cannot be both `const` and `async`
+    }
+
+    struct Y;
+    impl X for Y {
+        async fn ft1() {} //~ ERROR functions in traits cannot be declared `async`
+        //~^ ERROR method `ft1` has an incompatible type for trait
+        unsafe fn ft2() {} // OK.
+        const fn ft3() {} //~ ERROR functions in traits cannot be declared const
+        extern "C" fn ft4() {}
+        const async unsafe extern "C" fn ft5() {}
+        //~^ ERROR functions in traits cannot be declared `async`
+        //~| ERROR functions in traits cannot be declared const
+        //~| ERROR method `ft5` has an incompatible type for trait
+        //~| ERROR functions cannot be both `const` and `async`
+    }
+
+    impl Y {
+        async fn fi1() {} // OK.
+        unsafe fn fi2() {} // OK.
+        const fn fi3() {} // OK.
+        extern "C" fn fi4() {} // OK.
+        const async unsafe extern "C" fn fi5() {}
+        //~^ ERROR functions cannot be both `const` and `async`
+    }
+
+    extern {
+        async fn fe1(); //~ ERROR functions in `extern` blocks cannot have qualifiers
+        unsafe fn fe2(); //~ ERROR functions in `extern` blocks cannot have qualifiers
+        const fn fe3(); //~ ERROR functions in `extern` blocks cannot have qualifiers
+        extern "C" fn fe4(); //~ ERROR functions in `extern` blocks cannot have qualifiers
+        const async unsafe extern "C" fn fe5(); //~ ERROR functions in `extern` blocks
+        //~^ ERROR functions cannot be both `const` and `async`
+    }
+}
diff --git a/src/test/ui/parser/fn-header-semantic-fail.stderr b/src/test/ui/parser/fn-header-semantic-fail.stderr
new file mode 100644
index 0000000000..1142cee985
--- /dev/null
+++ b/src/test/ui/parser/fn-header-semantic-fail.stderr
@@ -0,0 +1,201 @@
+error: functions cannot be both `const` and `async`
+  --> $DIR/fn-header-semantic-fail.rs:13:5
+   |
+LL |     const async unsafe extern "C" fn ff5() {} // OK.
+   |     -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |     |     |
+   |     |     `async` because of this
+   |     `const` because of this
+
+error[E0706]: functions in traits cannot be declared `async`
+  --> $DIR/fn-header-semantic-fail.rs:17:9
+   |
+LL |         async fn ft1();
+   |         -----^^^^^^^^^^
+   |         |
+   |         `async` because of this
+   |
+   = note: `async` trait functions are not currently supported
+   = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
+
+error[E0379]: functions in traits cannot be declared const
+  --> $DIR/fn-header-semantic-fail.rs:19:9
+   |
+LL |         const fn ft3();
+   |         ^^^^^ functions in traits cannot be const
+
+error[E0379]: functions in traits cannot be declared const
+  --> $DIR/fn-header-semantic-fail.rs:21:9
+   |
+LL |         const async unsafe extern "C" fn ft5();
+   |         ^^^^^ functions in traits cannot be const
+
+error[E0706]: functions in traits cannot be declared `async`
+  --> $DIR/fn-header-semantic-fail.rs:21:9
+   |
+LL |         const async unsafe extern "C" fn ft5();
+   |         ^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |               |
+   |               `async` because of this
+   |
+   = note: `async` trait functions are not currently supported
+   = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
+
+error: functions cannot be both `const` and `async`
+  --> $DIR/fn-header-semantic-fail.rs:21:9
+   |
+LL |         const async unsafe extern "C" fn ft5();
+   |         -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         |     |
+   |         |     `async` because of this
+   |         `const` because of this
+
+error[E0706]: functions in traits cannot be declared `async`
+  --> $DIR/fn-header-semantic-fail.rs:29:9
+   |
+LL |         async fn ft1() {}
+   |         -----^^^^^^^^^^^^
+   |         |
+   |         `async` because of this
+   |
+   = note: `async` trait functions are not currently supported
+   = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
+
+error[E0379]: functions in traits cannot be declared const
+  --> $DIR/fn-header-semantic-fail.rs:32:9
+   |
+LL |         const fn ft3() {}
+   |         ^^^^^ functions in traits cannot be const
+
+error[E0379]: functions in traits cannot be declared const
+  --> $DIR/fn-header-semantic-fail.rs:34:9
+   |
+LL |         const async unsafe extern "C" fn ft5() {}
+   |         ^^^^^ functions in traits cannot be const
+
+error[E0706]: functions in traits cannot be declared `async`
+  --> $DIR/fn-header-semantic-fail.rs:34:9
+   |
+LL |         const async unsafe extern "C" fn ft5() {}
+   |         ^^^^^^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |               |
+   |               `async` because of this
+   |
+   = note: `async` trait functions are not currently supported
+   = note: consider using the `async-trait` crate: https://crates.io/crates/async-trait
+
+error: functions cannot be both `const` and `async`
+  --> $DIR/fn-header-semantic-fail.rs:34:9
+   |
+LL |         const async unsafe extern "C" fn ft5() {}
+   |         -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         |     |
+   |         |     `async` because of this
+   |         `const` because of this
+
+error: functions cannot be both `const` and `async`
+  --> $DIR/fn-header-semantic-fail.rs:46:9
+   |
+LL |         const async unsafe extern "C" fn fi5() {}
+   |         -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         |     |
+   |         |     `async` because of this
+   |         `const` because of this
+
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/fn-header-semantic-fail.rs:51:18
+   |
+LL |     extern {
+   |     ------ in this `extern` block
+LL |         async fn fe1();
+   |         ---------^^^
+   |         |
+   |         help: remove the qualifiers: `fn`
+
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/fn-header-semantic-fail.rs:52:19
+   |
+LL |     extern {
+   |     ------ in this `extern` block
+LL |         async fn fe1();
+LL |         unsafe fn fe2();
+   |         ----------^^^
+   |         |
+   |         help: remove the qualifiers: `fn`
+
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/fn-header-semantic-fail.rs:53:18
+   |
+LL |     extern {
+   |     ------ in this `extern` block
+...
+LL |         const fn fe3();
+   |         ---------^^^
+   |         |
+   |         help: remove the qualifiers: `fn`
+
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/fn-header-semantic-fail.rs:54:23
+   |
+LL |     extern {
+   |     ------ in this `extern` block
+...
+LL |         extern "C" fn fe4();
+   |         --------------^^^
+   |         |
+   |         help: remove the qualifiers: `fn`
+
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/fn-header-semantic-fail.rs:55:42
+   |
+LL |     extern {
+   |     ------ in this `extern` block
+...
+LL |         const async unsafe extern "C" fn fe5();
+   |         ---------------------------------^^^
+   |         |
+   |         help: remove the qualifiers: `fn`
+
+error: functions cannot be both `const` and `async`
+  --> $DIR/fn-header-semantic-fail.rs:55:9
+   |
+LL |         const async unsafe extern "C" fn fe5();
+   |         -----^-----^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         |     |
+   |         |     `async` because of this
+   |         `const` because of this
+
+error[E0053]: method `ft1` has an incompatible type for trait
+  --> $DIR/fn-header-semantic-fail.rs:29:24
+   |
+LL |         async fn ft1();
+   |                       - type in trait
+...
+LL |         async fn ft1() {}
+   |                        ^
+   |                        |
+   |                        the `Output` of this `async fn`'s found opaque type
+   |                        expected `()`, found opaque type
+   |
+   = note: expected fn pointer `fn()`
+              found fn pointer `fn() -> impl std::future::Future`
+
+error[E0053]: method `ft5` has an incompatible type for trait
+  --> $DIR/fn-header-semantic-fail.rs:34:48
+   |
+LL |         const async unsafe extern "C" fn ft5();
+   |                                               - type in trait
+...
+LL |         const async unsafe extern "C" fn ft5() {}
+   |                                                ^
+   |                                                |
+   |                                                the `Output` of this `async fn`'s found opaque type
+   |                                                expected `()`, found opaque type
+   |
+   = note: expected fn pointer `unsafe extern "C" fn()`
+              found fn pointer `unsafe extern "C" fn() -> impl std::future::Future`
+
+error: aborting due to 20 previous errors
+
+Some errors have detailed explanations: E0053, E0379, E0706.
+For more information about an error, try `rustc --explain E0053`.
diff --git a/src/test/ui/parser/fn-header-syntactic-pass.rs b/src/test/ui/parser/fn-header-syntactic-pass.rs
new file mode 100644
index 0000000000..9e44541993
--- /dev/null
+++ b/src/test/ui/parser/fn-header-syntactic-pass.rs
@@ -0,0 +1,47 @@
+// Ensures that all `fn` forms can have all the function qualifiers syntactically.
+
+// check-pass
+// edition:2018
+
+fn main() {}
+
+#[cfg(FALSE)]
+fn syntax() {
+    async fn f();
+    unsafe fn f();
+    const fn f();
+    extern "C" fn f();
+    const async unsafe extern "C" fn f();
+
+    trait X {
+        async fn f();
+        unsafe fn f();
+        const fn f();
+        extern "C" fn f();
+        const async unsafe extern "C" fn f();
+    }
+
+    impl X for Y {
+        async fn f();
+        unsafe fn f();
+        const fn f();
+        extern "C" fn f();
+        const async unsafe extern "C" fn f();
+    }
+
+    impl Y {
+        async fn f();
+        unsafe fn f();
+        const fn f();
+        extern "C" fn f();
+        const async unsafe extern "C" fn f();
+    }
+
+    extern {
+        async fn f();
+        unsafe fn f();
+        const fn f();
+        extern "C" fn f();
+        const async unsafe extern "C" fn f();
+    }
+}
diff --git a/src/test/ui/parser/foreign-const-semantic-fail.rs b/src/test/ui/parser/foreign-const-semantic-fail.rs
new file mode 100644
index 0000000000..82978e655b
--- /dev/null
+++ b/src/test/ui/parser/foreign-const-semantic-fail.rs
@@ -0,0 +1,9 @@
+fn main() {}
+
+extern {
+    const A: isize;
+    //~^ ERROR extern items cannot be `const`
+    const B: isize = 42;
+    //~^ ERROR extern items cannot be `const`
+    //~| ERROR incorrect `static` inside `extern` block
+}
diff --git a/src/test/ui/parser/foreign-const-semantic-fail.stderr b/src/test/ui/parser/foreign-const-semantic-fail.stderr
new file mode 100644
index 0000000000..f529b3ad87
--- /dev/null
+++ b/src/test/ui/parser/foreign-const-semantic-fail.stderr
@@ -0,0 +1,35 @@
+error: extern items cannot be `const`
+  --> $DIR/foreign-const-semantic-fail.rs:4:11
+   |
+LL |     const A: isize;
+   |     ------^
+   |     |
+   |     help: try using a static value: `static`
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: extern items cannot be `const`
+  --> $DIR/foreign-const-semantic-fail.rs:6:11
+   |
+LL |     const B: isize = 42;
+   |     ------^
+   |     |
+   |     help: try using a static value: `static`
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: incorrect `static` inside `extern` block
+  --> $DIR/foreign-const-semantic-fail.rs:6:11
+   |
+LL | extern {
+   | ------ `extern` blocks define existing foreign statics and statics inside of them cannot have a body
+...
+LL |     const B: isize = 42;
+   |           ^          -- the invalid body
+   |           |
+   |           cannot have a body
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/foreign-const-syntactic-fail.rs b/src/test/ui/parser/foreign-const-syntactic-fail.rs
new file mode 100644
index 0000000000..a78f8b1623
--- /dev/null
+++ b/src/test/ui/parser/foreign-const-syntactic-fail.rs
@@ -0,0 +1,9 @@
+// Syntactically, a `const` item inside an `extern { ... }` block is not allowed.
+
+fn main() {}
+
+#[cfg(FALSE)]
+extern {
+    const A: isize; //~ ERROR extern items cannot be `const`
+    const B: isize = 42; //~ ERROR extern items cannot be `const`
+}
diff --git a/src/test/ui/parser/foreign-const-syntactic-fail.stderr b/src/test/ui/parser/foreign-const-syntactic-fail.stderr
new file mode 100644
index 0000000000..9cf58fa95f
--- /dev/null
+++ b/src/test/ui/parser/foreign-const-syntactic-fail.stderr
@@ -0,0 +1,22 @@
+error: extern items cannot be `const`
+  --> $DIR/foreign-const-syntactic-fail.rs:7:11
+   |
+LL |     const A: isize;
+   |     ------^
+   |     |
+   |     help: try using a static value: `static`
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: extern items cannot be `const`
+  --> $DIR/foreign-const-syntactic-fail.rs:8:11
+   |
+LL |     const B: isize = 42;
+   |     ------^
+   |     |
+   |     help: try using a static value: `static`
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/parser/foreign-static-semantic-fail.rs b/src/test/ui/parser/foreign-static-semantic-fail.rs
new file mode 100644
index 0000000000..9abdf33df9
--- /dev/null
+++ b/src/test/ui/parser/foreign-static-semantic-fail.rs
@@ -0,0 +1,8 @@
+// Syntactically, a foreign static may not have a body.
+
+fn main() {}
+
+extern {
+    static X: u8 = 0; //~ ERROR incorrect `static` inside `extern` block
+    static mut Y: u8 = 0; //~ ERROR incorrect `static` inside `extern` block
+}
diff --git a/src/test/ui/parser/foreign-static-semantic-fail.stderr b/src/test/ui/parser/foreign-static-semantic-fail.stderr
new file mode 100644
index 0000000000..5942e3a944
--- /dev/null
+++ b/src/test/ui/parser/foreign-static-semantic-fail.stderr
@@ -0,0 +1,27 @@
+error: incorrect `static` inside `extern` block
+  --> $DIR/foreign-static-semantic-fail.rs:6:12
+   |
+LL | extern {
+   | ------ `extern` blocks define existing foreign statics and statics inside of them cannot have a body
+LL |     static X: u8 = 0;
+   |            ^       - the invalid body
+   |            |
+   |            cannot have a body
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: incorrect `static` inside `extern` block
+  --> $DIR/foreign-static-semantic-fail.rs:7:16
+   |
+LL | extern {
+   | ------ `extern` blocks define existing foreign statics and statics inside of them cannot have a body
+LL |     static X: u8 = 0;
+LL |     static mut Y: u8 = 0;
+   |                ^       - the invalid body
+   |                |
+   |                cannot have a body
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: aborting due to 2 previous errors
+
diff --git a/src/test/ui/parser/foreign-static-syntactic-pass.rs b/src/test/ui/parser/foreign-static-syntactic-pass.rs
new file mode 100644
index 0000000000..2c805e8a0b
--- /dev/null
+++ b/src/test/ui/parser/foreign-static-syntactic-pass.rs
@@ -0,0 +1,11 @@
+// Syntactically, a foreign static may have a body.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+extern {
+    static X: u8 = 0;
+    static mut Y: u8 = 0;
+}
diff --git a/src/test/ui/parser/foreign-ty-semantic-fail.rs b/src/test/ui/parser/foreign-ty-semantic-fail.rs
new file mode 100644
index 0000000000..96b15232b1
--- /dev/null
+++ b/src/test/ui/parser/foreign-ty-semantic-fail.rs
@@ -0,0 +1,18 @@
+#![feature(extern_types)]
+
+fn main() {}
+
+extern "C" {
+    type A: Ord;
+    //~^ ERROR bounds on `type`s in `extern` blocks have no effect
+    type B<'a> where 'a: 'static;
+    //~^ ERROR `type`s inside `extern` blocks cannot have generic parameters
+    //~| ERROR `type`s inside `extern` blocks cannot have `where` clauses
+    type C<T: Ord> where T: 'static;
+    //~^ ERROR `type`s inside `extern` blocks cannot have generic parameters
+    //~| ERROR `type`s inside `extern` blocks cannot have `where` clauses
+    type D = u8;
+    //~^ ERROR incorrect `type` inside `extern` block
+
+    type E: where;
+}
diff --git a/src/test/ui/parser/foreign-ty-semantic-fail.stderr b/src/test/ui/parser/foreign-ty-semantic-fail.stderr
new file mode 100644
index 0000000000..588e4966aa
--- /dev/null
+++ b/src/test/ui/parser/foreign-ty-semantic-fail.stderr
@@ -0,0 +1,65 @@
+error: bounds on `type`s in `extern` blocks have no effect
+  --> $DIR/foreign-ty-semantic-fail.rs:6:13
+   |
+LL |     type A: Ord;
+   |             ^^^
+
+error: `type`s inside `extern` blocks cannot have generic parameters
+  --> $DIR/foreign-ty-semantic-fail.rs:8:11
+   |
+LL | extern "C" {
+   | ---------- `extern` block begins here
+...
+LL |     type B<'a> where 'a: 'static;
+   |           ^^^^ help: remove the generic parameters
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: `type`s inside `extern` blocks cannot have `where` clauses
+  --> $DIR/foreign-ty-semantic-fail.rs:8:16
+   |
+LL | extern "C" {
+   | ---------- `extern` block begins here
+...
+LL |     type B<'a> where 'a: 'static;
+   |                ^^^^^^^^^^^^^^^^^ help: remove the `where` clause
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: `type`s inside `extern` blocks cannot have generic parameters
+  --> $DIR/foreign-ty-semantic-fail.rs:11:11
+   |
+LL | extern "C" {
+   | ---------- `extern` block begins here
+...
+LL |     type C<T: Ord> where T: 'static;
+   |           ^^^^^^^^ help: remove the generic parameters
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: `type`s inside `extern` blocks cannot have `where` clauses
+  --> $DIR/foreign-ty-semantic-fail.rs:11:20
+   |
+LL | extern "C" {
+   | ---------- `extern` block begins here
+...
+LL |     type C<T: Ord> where T: 'static;
+   |                    ^^^^^^^^^^^^^^^^ help: remove the `where` clause
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: incorrect `type` inside `extern` block
+  --> $DIR/foreign-ty-semantic-fail.rs:14:10
+   |
+LL | extern "C" {
+   | ---------- `extern` blocks define existing foreign types and types inside of them cannot have a body
+...
+LL |     type D = u8;
+   |          ^   -- the invalid body
+   |          |
+   |          cannot have a body
+   |
+   = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/parser/foreign-ty-syntactic-pass.rs b/src/test/ui/parser/foreign-ty-syntactic-pass.rs
new file mode 100644
index 0000000000..a746de1f14
--- /dev/null
+++ b/src/test/ui/parser/foreign-ty-syntactic-pass.rs
@@ -0,0 +1,12 @@
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+extern "C" {
+    type A: Ord;
+    type A<'a> where 'a: 'static;
+    type A<T: Ord> where T: 'static;
+    type A = u8;
+    type A<'a: 'static, T: Ord + 'static>: Eq + PartialEq where T: 'static + Copy = Vec<u8>;
+}
diff --git a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs b/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs
index 9c321c4bd0..fa9c7ababc 100644
--- a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs
+++ b/src/test/ui/parser/impl-item-type-no-body-semantic-fail.rs
@@ -11,11 +11,11 @@ impl X {
     //~| ERROR associated types are not yet supported in inherent impls
     type Z: Ord;
     //~^ ERROR associated type in `impl` without body
-    //~| ERROR bounds on associated `type`s in `impl`s have no effect
+    //~| ERROR bounds on `type`s in `impl`s have no effect
     //~| ERROR associated types are not yet supported in inherent impls
     type W: Ord where Self: Eq;
     //~^ ERROR associated type in `impl` without body
-    //~| ERROR bounds on associated `type`s in `impl`s have no effect
+    //~| ERROR bounds on `type`s in `impl`s have no effect
     //~| ERROR associated types are not yet supported in inherent impls
     type W where Self: Eq;
     //~^ ERROR associated type in `impl` without body
diff --git a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr b/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr
index 65e1981e3a..541d9317c7 100644
--- a/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr
+++ b/src/test/ui/parser/impl-item-type-no-body-semantic-fail.stderr
@@ -14,7 +14,7 @@ LL |     type Z: Ord;
    |                |
    |                help: provide a definition for the type: `= <type>;`
 
-error: bounds on associated `type`s in `impl`s have no effect
+error: bounds on `type`s in `impl`s have no effect
   --> $DIR/impl-item-type-no-body-semantic-fail.rs:12:13
    |
 LL |     type Z: Ord;
@@ -28,7 +28,7 @@ LL |     type W: Ord where Self: Eq;
    |                               |
    |                               help: provide a definition for the type: `= <type>;`
 
-error: bounds on associated `type`s in `impl`s have no effect
+error: bounds on `type`s in `impl`s have no effect
   --> $DIR/impl-item-type-no-body-semantic-fail.rs:16:13
    |
 LL |     type W: Ord where Self: Eq;
diff --git a/src/test/ui/parser/impl-parsing.rs b/src/test/ui/parser/impl-parsing.rs
index 270c8b43df..80ce888557 100644
--- a/src/test/ui/parser/impl-parsing.rs
+++ b/src/test/ui/parser/impl-parsing.rs
@@ -6,4 +6,5 @@ impl Trait .. {} //~ ERROR missing `for` in a trait impl
 impl ?Sized for Type {} //~ ERROR expected a trait, found type
 impl ?Sized for .. {} //~ ERROR expected a trait, found type
 
-default unsafe FAIL //~ ERROR expected `impl`, found `FAIL`
+default unsafe FAIL //~ ERROR expected item, found keyword `unsafe`
+//~^ ERROR `default` is not followed by an item
diff --git a/src/test/ui/parser/impl-parsing.stderr b/src/test/ui/parser/impl-parsing.stderr
index 7c2a7937c5..755addf145 100644
--- a/src/test/ui/parser/impl-parsing.stderr
+++ b/src/test/ui/parser/impl-parsing.stderr
@@ -22,11 +22,19 @@ error: expected a trait, found type
 LL | impl ?Sized for .. {}
    |      ^^^^^^
 
-error: expected `impl`, found `FAIL`
-  --> $DIR/impl-parsing.rs:9:16
+error: `default` is not followed by an item
+  --> $DIR/impl-parsing.rs:9:1
    |
 LL | default unsafe FAIL
-   |                ^^^^ expected `impl`
+   | ^^^^^^^ the `default` qualifier
+   |
+   = note: only `fn`, `const`, `type`, or `impl` items may be prefixed by `default`
+
+error: expected item, found keyword `unsafe`
+  --> $DIR/impl-parsing.rs:9:9
+   |
+LL | default unsafe FAIL
+   |         ^^^^^^ expected item
 
-error: aborting due to 5 previous errors
+error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/parser/inner-attr-after-doc-comment.stderr b/src/test/ui/parser/inner-attr-after-doc-comment.stderr
index b012abc25e..c1e9e7a427 100644
--- a/src/test/ui/parser/inner-attr-after-doc-comment.stderr
+++ b/src/test/ui/parser/inner-attr-after-doc-comment.stderr
@@ -7,7 +7,7 @@ LL | |  */
    | |___- previous doc comment
 LL | 
 LL |   #![recursion_limit="100"]
-   |   ^^^^^^^^^^^^^^^^^^^^^^^^^ not permitted following an outer attibute
+   |   ^^^^^^^^^^^^^^^^^^^^^^^^^ not permitted following an outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
diff --git a/src/test/ui/parser/inner-attr-in-trait-def.rs b/src/test/ui/parser/inner-attr-in-trait-def.rs
new file mode 100644
index 0000000000..8dba6b362c
--- /dev/null
+++ b/src/test/ui/parser/inner-attr-in-trait-def.rs
@@ -0,0 +1,9 @@
+// check-pass
+
+#![deny(non_camel_case_types)]
+
+fn main() {}
+
+trait foo_bar {
+    #![allow(non_camel_case_types)]
+}
diff --git a/src/test/ui/parser/inner-attr.stderr b/src/test/ui/parser/inner-attr.stderr
index 070d9f47d9..e1bf2cca1c 100644
--- a/src/test/ui/parser/inner-attr.stderr
+++ b/src/test/ui/parser/inner-attr.stderr
@@ -5,7 +5,7 @@ LL | #[feature(lang_items)]
    | ---------------------- previous outer attribute
 LL | 
 LL | #![recursion_limit="100"]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^ not permitted following an outer attibute
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^ not permitted following an outer attribute
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.
 
diff --git a/src/test/ui/parser/inverted-parameters.rs b/src/test/ui/parser/inverted-parameters.rs
index d6efc8be07..6f19ee9c7d 100644
--- a/src/test/ui/parser/inverted-parameters.rs
+++ b/src/test/ui/parser/inverted-parameters.rs
@@ -21,6 +21,7 @@ fn pattern((i32, i32) (a, b)) {}
 fn fizz(i32) {}
 //~^ ERROR expected one of `:`, `@`
 //~| HELP if this was a parameter name, give it a type
+//~| HELP if this is a `self` type, give it a parameter name
 //~| HELP if this is a type, explicitly ignore the parameter name
 
 fn missing_colon(quux S) {}
diff --git a/src/test/ui/parser/inverted-parameters.stderr b/src/test/ui/parser/inverted-parameters.stderr
index 51e9087ffc..043ff65f74 100644
--- a/src/test/ui/parser/inverted-parameters.stderr
+++ b/src/test/ui/parser/inverted-parameters.stderr
@@ -35,6 +35,10 @@ LL | fn fizz(i32) {}
    |            ^ expected one of `:`, `@`, or `|`
    |
    = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a `self` type, give it a parameter name
+   |
+LL | fn fizz(self: i32) {}
+   |         ^^^^^^^^^
 help: if this was a parameter name, give it a type
    |
 LL | fn fizz(i32: TypeName) {}
@@ -45,7 +49,7 @@ LL | fn fizz(_: i32) {}
    |         ^^^^^^
 
 error: expected one of `:`, `@`, or `|`, found `S`
-  --> $DIR/inverted-parameters.rs:26:23
+  --> $DIR/inverted-parameters.rs:27:23
    |
 LL | fn missing_colon(quux S) {}
    |                  -----^
diff --git a/src/test/ui/parser/issue-14303-fncall.rs b/src/test/ui/parser/issue-14303-fncall.rs
index 39694198cd..46ece84d69 100644
--- a/src/test/ui/parser/issue-14303-fncall.rs
+++ b/src/test/ui/parser/issue-14303-fncall.rs
@@ -11,7 +11,7 @@ fn foo<'a, 'b>(start: &'a usize, end: &'a usize) {
     let _x = (*start..*end)
         .map(|x| S { a: start, b: end })
         .collect::<Vec<S<_, 'a>>>();
-        //~^ ERROR lifetime arguments must be declared prior to type arguments
+        //~^ ERROR type provided when a lifetime was expected
 }
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-14303-fncall.stderr b/src/test/ui/parser/issue-14303-fncall.stderr
index 8ef9f1a1a6..1095422371 100644
--- a/src/test/ui/parser/issue-14303-fncall.stderr
+++ b/src/test/ui/parser/issue-14303-fncall.stderr
@@ -1,8 +1,11 @@
-error: lifetime arguments must be declared prior to type arguments
-  --> $DIR/issue-14303-fncall.rs:13:29
+error[E0747]: type provided when a lifetime was expected
+  --> $DIR/issue-14303-fncall.rs:13:26
    |
 LL |         .collect::<Vec<S<_, 'a>>>();
-   |                             ^^
+   |                          ^
+   |
+   = note: lifetime arguments must be provided before type arguments
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0747`.
diff --git a/src/test/ui/parser/issue-14303-path.rs b/src/test/ui/parser/issue-14303-path.rs
index 386d19859e..89ef914aba 100644
--- a/src/test/ui/parser/issue-14303-path.rs
+++ b/src/test/ui/parser/issue-14303-path.rs
@@ -8,6 +8,6 @@ mod foo {
 }
 
 fn bar<'a, 'b, 'c, T>(x: foo::X<'a, T, 'b, 'c>) {}
-//~^ ERROR lifetime arguments must be declared prior to type arguments
+//~^ ERROR type provided when a lifetime was expected
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-14303-path.stderr b/src/test/ui/parser/issue-14303-path.stderr
index 19f2995ebe..c1ad2332b5 100644
--- a/src/test/ui/parser/issue-14303-path.stderr
+++ b/src/test/ui/parser/issue-14303-path.stderr
@@ -1,8 +1,11 @@
-error: lifetime arguments must be declared prior to type arguments
-  --> $DIR/issue-14303-path.rs:10:40
+error[E0747]: type provided when a lifetime was expected
+  --> $DIR/issue-14303-path.rs:10:37
    |
 LL | fn bar<'a, 'b, 'c, T>(x: foo::X<'a, T, 'b, 'c>) {}
-   |                                        ^^  ^^
+   |                                     ^
+   |
+   = note: lifetime arguments must be provided before type arguments
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0747`.
diff --git a/src/test/ui/parser/issue-17383.stderr b/src/test/ui/parser/issue-17383.stderr
index 6a25c743e7..265d6e1486 100644
--- a/src/test/ui/parser/issue-17383.stderr
+++ b/src/test/ui/parser/issue-17383.stderr
@@ -7,7 +7,7 @@ LL |
 LL |     B(usize)
    |     -------- tuple variant defined here
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/60553
+   = note: see issue #60553 <https://github.com/rust-lang/rust/issues/60553> for more information
    = help: add `#![feature(arbitrary_enum_discriminant)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/parser/issue-19398.rs b/src/test/ui/parser/issue-19398.rs
index 90221039b4..46eb320a17 100644
--- a/src/test/ui/parser/issue-19398.rs
+++ b/src/test/ui/parser/issue-19398.rs
@@ -1,5 +1,6 @@
 trait T {
-    extern "Rust" unsafe fn foo(); //~ ERROR expected `fn`, found keyword `unsafe`
+    extern "Rust" unsafe fn foo();
+    //~^ ERROR expected `{`, found keyword `unsafe`
 }
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-19398.stderr b/src/test/ui/parser/issue-19398.stderr
index 41ec4f3ced..1da00960ad 100644
--- a/src/test/ui/parser/issue-19398.stderr
+++ b/src/test/ui/parser/issue-19398.stderr
@@ -1,8 +1,13 @@
-error: expected `fn`, found keyword `unsafe`
+error: expected `{`, found keyword `unsafe`
   --> $DIR/issue-19398.rs:2:19
    |
+LL | trait T {
+   |         - while parsing this item list starting here
 LL |     extern "Rust" unsafe fn foo();
-   |                   ^^^^^^ expected `fn`
+   |                   ^^^^^^ expected `{`
+LL |
+LL | }
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-20711-2.rs b/src/test/ui/parser/issue-20711-2.rs
index 0063a33418..168c7e7616 100644
--- a/src/test/ui/parser/issue-20711-2.rs
+++ b/src/test/ui/parser/issue-20711-2.rs
@@ -4,6 +4,7 @@ impl Foo {
     fn foo() {}
 
     #[stable(feature = "rust1", since = "1.0.0")]
-} //~ ERROR expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, or
+    //~^ ERROR expected item after attributes
+}
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-20711-2.stderr b/src/test/ui/parser/issue-20711-2.stderr
index ee484890fa..12b18bbc59 100644
--- a/src/test/ui/parser/issue-20711-2.stderr
+++ b/src/test/ui/parser/issue-20711-2.stderr
@@ -1,10 +1,14 @@
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, or `unsafe`, found `}`
-  --> $DIR/issue-20711-2.rs:7:1
+error: expected item after attributes
+  --> $DIR/issue-20711-2.rs:6:5
    |
+LL | impl Foo {
+   |          - while parsing this item list starting here
+...
 LL |     #[stable(feature = "rust1", since = "1.0.0")]
-   |                                                  - expected one of 9 possible tokens
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
 LL | }
-   | ^ unexpected token
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-20711.rs b/src/test/ui/parser/issue-20711.rs
index dc216167b8..020bb79d6e 100644
--- a/src/test/ui/parser/issue-20711.rs
+++ b/src/test/ui/parser/issue-20711.rs
@@ -2,6 +2,7 @@ struct Foo;
 
 impl Foo {
     #[stable(feature = "rust1", since = "1.0.0")]
-} //~ ERROR expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, or
+    //~^ ERROR expected item after attributes
+}
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-20711.stderr b/src/test/ui/parser/issue-20711.stderr
index 152c9f1c68..4af4b22bee 100644
--- a/src/test/ui/parser/issue-20711.stderr
+++ b/src/test/ui/parser/issue-20711.stderr
@@ -1,10 +1,13 @@
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, or `unsafe`, found `}`
-  --> $DIR/issue-20711.rs:5:1
+error: expected item after attributes
+  --> $DIR/issue-20711.rs:4:5
    |
+LL | impl Foo {
+   |          - while parsing this item list starting here
 LL |     #[stable(feature = "rust1", since = "1.0.0")]
-   |                                                  - expected one of 9 possible tokens
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |
 LL | }
-   | ^ unexpected token
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-21153.rs b/src/test/ui/parser/issue-21153.rs
index 46cd45f28b..bf5fdb1f3c 100644
--- a/src/test/ui/parser/issue-21153.rs
+++ b/src/test/ui/parser/issue-21153.rs
@@ -1,5 +1,6 @@
-trait MyTrait<T>: Iterator { //~ ERROR missing `fn`, `type`, or `const`
+trait MyTrait<T>: Iterator {
     Item = T;
+    //~^ ERROR expected one of `!` or `::`, found `=`
 }
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-21153.stderr b/src/test/ui/parser/issue-21153.stderr
index 6e20a9ce3c..cbfa9ded3c 100644
--- a/src/test/ui/parser/issue-21153.stderr
+++ b/src/test/ui/parser/issue-21153.stderr
@@ -1,10 +1,13 @@
-error: missing `fn`, `type`, or `const` for associated-item declaration
-  --> $DIR/issue-21153.rs:1:29
+error: expected one of `!` or `::`, found `=`
+  --> $DIR/issue-21153.rs:2:10
    |
-LL |   trait MyTrait<T>: Iterator {
-   |  _____________________________^
-LL | |     Item = T;
-   | |____^ missing `fn`, `type`, or `const`
+LL | trait MyTrait<T>: Iterator {
+   |                            - while parsing this item list starting here
+LL |     Item = T;
+   |          ^ expected one of `!` or `::`
+LL |
+LL | }
+   | - the item list ends here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-24780.rs b/src/test/ui/parser/issue-24780.rs
index 799cdd8022..8b46aa2bf2 100644
--- a/src/test/ui/parser/issue-24780.rs
+++ b/src/test/ui/parser/issue-24780.rs
@@ -3,6 +3,6 @@
 // expected one of ..., `>`, ... found `>`
 
 fn foo() -> Vec<usize>> {
-    //~^ ERROR expected one of `!`, `+`, `::`, `where`, or `{`, found `>`
+    //~^ ERROR expected `;` or `{`, found `>`
     Vec::new()
 }
diff --git a/src/test/ui/parser/issue-24780.stderr b/src/test/ui/parser/issue-24780.stderr
index d9470191b2..d65a5f4487 100644
--- a/src/test/ui/parser/issue-24780.stderr
+++ b/src/test/ui/parser/issue-24780.stderr
@@ -1,8 +1,8 @@
-error: expected one of `!`, `+`, `::`, `where`, or `{`, found `>`
+error: expected `;` or `{`, found `>`
   --> $DIR/issue-24780.rs:5:23
    |
 LL | fn foo() -> Vec<usize>> {
-   |                       ^ expected one of `!`, `+`, `::`, `where`, or `{`
+   |                       ^ expected `;` or `{`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-32446.stderr b/src/test/ui/parser/issue-32446.stderr
index 1a97f54160..7515369aaa 100644
--- a/src/test/ui/parser/issue-32446.stderr
+++ b/src/test/ui/parser/issue-32446.stderr
@@ -1,8 +1,11 @@
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found `...`
+error: non-item in item list
   --> $DIR/issue-32446.rs:4:11
    |
 LL | trait T { ... }
-   |           ^^^ expected one of 10 possible tokens
+   |         - ^^^ - item list ends here
+   |         | |
+   |         | non-item starts here
+   |         item list starts here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-35813-postfix-after-cast.rs b/src/test/ui/parser/issue-35813-postfix-after-cast.rs
new file mode 100644
index 0000000000..e725aa5d73
--- /dev/null
+++ b/src/test/ui/parser/issue-35813-postfix-after-cast.rs
@@ -0,0 +1,171 @@
+// edition:2018
+#![crate_type = "lib"]
+#![feature(type_ascription)]
+use std::future::Future;
+use std::pin::Pin;
+
+// This tests the parser for "x as Y[z]". It errors, but we want to give useful
+// errors and parse such that further code gives useful errors.
+pub fn index_after_as_cast() {
+    vec![1, 2, 3] as Vec<i32>[0];
+    //~^ ERROR: casts cannot be followed by indexing
+    vec![1, 2, 3]: Vec<i32>[0];
+    //~^ ERROR: casts cannot be followed by indexing
+}
+
+pub fn index_after_cast_to_index() {
+    (&[0]) as &[i32][0];
+    //~^ ERROR: casts cannot be followed by indexing
+    (&[0i32]): &[i32; 1][0];
+    //~^ ERROR: casts cannot be followed by indexing
+}
+
+pub fn cast_after_cast() {
+    if 5u64 as i32 as u16 == 0u16 {
+
+    }
+    if 5u64: u64: u64 == 0u64 {
+
+    }
+    let _ = 5u64: u64: u64 as u8 as i8 == 9i8;
+    let _ = 0i32: i32: i32;
+    let _ = 0 as i32: i32;
+    let _ = 0i32: i32 as i32;
+    let _ = 0 as i32 as i32;
+    let _ = 0i32: i32: i32 as u32 as i32;
+}
+
+pub fn cast_cast_method_call() {
+    let _ = 0i32: i32: i32.count_ones();
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0 as i32: i32.count_ones();
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0i32: i32 as i32.count_ones();
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0 as i32 as i32.count_ones();
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0i32: i32: i32 as u32 as i32.count_ones();
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0i32: i32.count_ones(): u32;
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0 as i32.count_ones(): u32;
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0i32: i32.count_ones() as u32;
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0 as i32.count_ones() as u32;
+    //~^ ERROR: casts cannot be followed by a method call
+    let _ = 0i32: i32: i32.count_ones() as u32 as i32;
+    //~^ ERROR: casts cannot be followed by a method call
+}
+
+pub fn multiline_error() {
+    let _ = 0
+        as i32
+        .count_ones();
+    //~^^^ ERROR: casts cannot be followed by a method call
+}
+
+// this tests that the precedence for `!x as Y.Z` is still what we expect
+pub fn precedence() {
+    let x: i32 = &vec![1, 2, 3] as &Vec<i32>[0];
+    //~^ ERROR: casts cannot be followed by indexing
+}
+
+pub fn method_calls() {
+    0 as i32.max(0);
+    //~^ ERROR: casts cannot be followed by a method call
+    0: i32.max(0);
+    //~^ ERROR: casts cannot be followed by a method call
+}
+
+pub fn complex() {
+    let _ = format!(
+        "{} and {}",
+        if true { 33 } else { 44 } as i32.max(0),
+        //~^ ERROR: casts cannot be followed by a method call
+        if true { 33 } else { 44 }: i32.max(0)
+        //~^ ERROR: casts cannot be followed by a method call
+    );
+}
+
+pub fn in_condition() {
+    if 5u64 as i32.max(0) == 0 {
+        //~^ ERROR: casts cannot be followed by a method call
+    }
+    if 5u64: u64.max(0) == 0 {
+        //~^ ERROR: casts cannot be followed by a method call
+    }
+}
+
+pub fn inside_block() {
+    let _ = if true {
+        5u64 as u32.max(0) == 0
+        //~^ ERROR: casts cannot be followed by a method call
+    } else { false };
+    let _ = if true {
+        5u64: u64.max(0) == 0
+        //~^ ERROR: casts cannot be followed by a method call
+    } else { false };
+}
+
+static bar: &[i32] = &(&[1,2,3] as &[i32][0..1]);
+//~^ ERROR: casts cannot be followed by indexing
+
+static bar2: &[i32] = &(&[1i32,2,3]: &[i32; 3][0..1]);
+//~^ ERROR: casts cannot be followed by indexing
+
+
+pub fn cast_then_try() -> Result<u64,u64> {
+    Err(0u64) as Result<u64,u64>?;
+    //~^ ERROR: casts cannot be followed by ?
+    Err(0u64): Result<u64,u64>?;
+    //~^ ERROR: casts cannot be followed by ?
+    Ok(1)
+}
+
+
+pub fn cast_then_call() {
+    type F = fn(u8);
+    // type ascription won't actually do [unique drop fn type] -> fn(u8) casts.
+    let drop_ptr = drop as fn(u8);
+    drop as F();
+    //~^ ERROR: parenthesized type parameters may only be used with a `Fn` trait [E0214]
+    drop_ptr: F();
+    //~^ ERROR: parenthesized type parameters may only be used with a `Fn` trait [E0214]
+}
+
+pub fn cast_to_fn_should_work() {
+    let drop_ptr = drop as fn(u8);
+    drop as fn(u8);
+    drop_ptr: fn(u8);
+}
+
+pub fn parens_after_cast_error() {
+    let drop_ptr = drop as fn(u8);
+    drop as fn(u8)(0);
+    //~^ ERROR: casts cannot be followed by a function call
+    drop_ptr: fn(u8)(0);
+    //~^ ERROR: casts cannot be followed by a function call
+}
+
+pub async fn cast_then_await() {
+    Box::pin(noop()) as Pin<Box<dyn Future<Output = ()>>>.await;
+    //~^ ERROR: casts cannot be followed by `.await`
+
+    Box::pin(noop()): Pin<Box<_>>.await;
+    //~^ ERROR: casts cannot be followed by `.await`
+}
+
+pub async fn noop() {}
+
+#[derive(Default)]
+pub struct Foo {
+    pub bar: u32,
+}
+
+pub fn struct_field() {
+    Foo::default() as Foo.bar;
+    //~^ ERROR: cannot be followed by a field access
+    Foo::default(): Foo.bar;
+    //~^ ERROR: cannot be followed by a field access
+}
diff --git a/src/test/ui/parser/issue-35813-postfix-after-cast.stderr b/src/test/ui/parser/issue-35813-postfix-after-cast.stderr
new file mode 100644
index 0000000000..255e9f4092
--- /dev/null
+++ b/src/test/ui/parser/issue-35813-postfix-after-cast.stderr
@@ -0,0 +1,392 @@
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:10:5
+   |
+LL |     vec![1, 2, 3] as Vec<i32>[0];
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (vec![1, 2, 3] as Vec<i32>)[0];
+   |     ^                         ^
+
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:12:5
+   |
+LL |     vec![1, 2, 3]: Vec<i32>[0];
+   |     ^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (vec![1, 2, 3]: Vec<i32>)[0];
+   |     ^                       ^
+
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:17:5
+   |
+LL |     (&[0]) as &[i32][0];
+   |     ^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     ((&[0]) as &[i32])[0];
+   |     ^                ^
+
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:19:5
+   |
+LL |     (&[0i32]): &[i32; 1][0];
+   |     ^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     ((&[0i32]): &[i32; 1])[0];
+   |     ^                    ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:39:13
+   |
+LL |     let _ = 0i32: i32: i32.count_ones();
+   |             ^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0i32: i32: i32).count_ones();
+   |             ^              ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:41:13
+   |
+LL |     let _ = 0 as i32: i32.count_ones();
+   |             ^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0 as i32: i32).count_ones();
+   |             ^             ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:43:13
+   |
+LL |     let _ = 0i32: i32 as i32.count_ones();
+   |             ^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0i32: i32 as i32).count_ones();
+   |             ^                ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:45:13
+   |
+LL |     let _ = 0 as i32 as i32.count_ones();
+   |             ^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0 as i32 as i32).count_ones();
+   |             ^               ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:47:13
+   |
+LL |     let _ = 0i32: i32: i32 as u32 as i32.count_ones();
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0i32: i32: i32 as u32 as i32).count_ones();
+   |             ^                            ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:49:13
+   |
+LL |     let _ = 0i32: i32.count_ones(): u32;
+   |             ^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0i32: i32).count_ones(): u32;
+   |             ^         ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:51:13
+   |
+LL |     let _ = 0 as i32.count_ones(): u32;
+   |             ^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0 as i32).count_ones(): u32;
+   |             ^        ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:53:13
+   |
+LL |     let _ = 0i32: i32.count_ones() as u32;
+   |             ^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0i32: i32).count_ones() as u32;
+   |             ^         ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:55:13
+   |
+LL |     let _ = 0 as i32.count_ones() as u32;
+   |             ^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0 as i32).count_ones() as u32;
+   |             ^        ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:57:13
+   |
+LL |     let _ = 0i32: i32: i32.count_ones() as u32 as i32;
+   |             ^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0i32: i32: i32).count_ones() as u32 as i32;
+   |             ^              ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:62:13
+   |
+LL |       let _ = 0
+   |  _____________^
+LL | |         as i32
+   | |______________^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let _ = (0
+LL |         as i32)
+   |
+
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:70:18
+   |
+LL |     let x: i32 = &vec![1, 2, 3] as &Vec<i32>[0];
+   |                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     let x: i32 = (&vec![1, 2, 3] as &Vec<i32>)[0];
+   |                  ^                           ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:75:5
+   |
+LL |     0 as i32.max(0);
+   |     ^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (0 as i32).max(0);
+   |     ^        ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:77:5
+   |
+LL |     0: i32.max(0);
+   |     ^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (0: i32).max(0);
+   |     ^      ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:92:8
+   |
+LL |     if 5u64 as i32.max(0) == 0 {
+   |        ^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     if (5u64 as i32).max(0) == 0 {
+   |        ^           ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:95:8
+   |
+LL |     if 5u64: u64.max(0) == 0 {
+   |        ^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     if (5u64: u64).max(0) == 0 {
+   |        ^         ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:102:9
+   |
+LL |         5u64 as u32.max(0) == 0
+   |         ^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |         (5u64 as u32).max(0) == 0
+   |         ^           ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:106:9
+   |
+LL |         5u64: u64.max(0) == 0
+   |         ^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |         (5u64: u64).max(0) == 0
+   |         ^         ^
+
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:111:24
+   |
+LL | static bar: &[i32] = &(&[1,2,3] as &[i32][0..1]);
+   |                        ^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL | static bar: &[i32] = &((&[1,2,3] as &[i32])[0..1]);
+   |                        ^                  ^
+
+error: casts cannot be followed by indexing
+  --> $DIR/issue-35813-postfix-after-cast.rs:114:25
+   |
+LL | static bar2: &[i32] = &(&[1i32,2,3]: &[i32; 3][0..1]);
+   |                         ^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL | static bar2: &[i32] = &((&[1i32,2,3]: &[i32; 3])[0..1]);
+   |                         ^                      ^
+
+error: casts cannot be followed by ?
+  --> $DIR/issue-35813-postfix-after-cast.rs:119:5
+   |
+LL |     Err(0u64) as Result<u64,u64>?;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (Err(0u64) as Result<u64,u64>)?;
+   |     ^                            ^
+
+error: casts cannot be followed by ?
+  --> $DIR/issue-35813-postfix-after-cast.rs:121:5
+   |
+LL |     Err(0u64): Result<u64,u64>?;
+   |     ^^^^^^^^^-^^^^^^^^^^^^^^^^
+   |              |
+   |              help: maybe write a path separator here: `::`
+   |
+   = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
+
+error: casts cannot be followed by a function call
+  --> $DIR/issue-35813-postfix-after-cast.rs:145:5
+   |
+LL |     drop as fn(u8)(0);
+   |     ^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (drop as fn(u8))(0);
+   |     ^              ^
+
+error: casts cannot be followed by a function call
+  --> $DIR/issue-35813-postfix-after-cast.rs:147:5
+   |
+LL |     drop_ptr: fn(u8)(0);
+   |     ^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (drop_ptr: fn(u8))(0);
+   |     ^                ^
+
+error: casts cannot be followed by `.await`
+  --> $DIR/issue-35813-postfix-after-cast.rs:152:5
+   |
+LL |     Box::pin(noop()) as Pin<Box<dyn Future<Output = ()>>>.await;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (Box::pin(noop()) as Pin<Box<dyn Future<Output = ()>>>).await;
+   |     ^                                                     ^
+
+error: casts cannot be followed by `.await`
+  --> $DIR/issue-35813-postfix-after-cast.rs:155:5
+   |
+LL |     Box::pin(noop()): Pin<Box<_>>.await;
+   |     ^^^^^^^^^^^^^^^^-^^^^^^^^^^^^
+   |                     |
+   |                     help: maybe write a path separator here: `::`
+   |
+   = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
+
+error: casts cannot be followed by a field access
+  --> $DIR/issue-35813-postfix-after-cast.rs:167:5
+   |
+LL |     Foo::default() as Foo.bar;
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (Foo::default() as Foo).bar;
+   |     ^                     ^
+
+error: casts cannot be followed by a field access
+  --> $DIR/issue-35813-postfix-after-cast.rs:169:5
+   |
+LL |     Foo::default(): Foo.bar;
+   |     ^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |     (Foo::default(): Foo).bar;
+   |     ^                   ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:84:9
+   |
+LL |         if true { 33 } else { 44 } as i32.max(0),
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |         (if true { 33 } else { 44 } as i32).max(0),
+   |         ^                                 ^
+
+error: casts cannot be followed by a method call
+  --> $DIR/issue-35813-postfix-after-cast.rs:86:9
+   |
+LL |         if true { 33 } else { 44 }: i32.max(0)
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+help: try surrounding the expression in parentheses
+   |
+LL |         (if true { 33 } else { 44 }: i32).max(0)
+   |         ^                               ^
+
+error[E0214]: parenthesized type parameters may only be used with a `Fn` trait
+  --> $DIR/issue-35813-postfix-after-cast.rs:131:13
+   |
+LL |     drop as F();
+   |             ^^^ only `Fn` traits may use parentheses
+
+error[E0214]: parenthesized type parameters may only be used with a `Fn` trait
+  --> $DIR/issue-35813-postfix-after-cast.rs:133:15
+   |
+LL |     drop_ptr: F();
+   |               ^^^ only `Fn` traits may use parentheses
+
+error: aborting due to 36 previous errors
+
+For more information about this error, try `rustc --explain E0214`.
diff --git a/src/test/ui/parser/issue-41155.rs b/src/test/ui/parser/issue-41155.rs
index 3c24d2b447..5a7488e6ff 100644
--- a/src/test/ui/parser/issue-41155.rs
+++ b/src/test/ui/parser/issue-41155.rs
@@ -1,7 +1,7 @@
 struct S;
 
 impl S {
-    pub
-} //~ ERROR expected one of
+    pub //~ ERROR visibility `pub` is not followed by an item
+} //~ ERROR non-item in item list
 
 fn main() {}
diff --git a/src/test/ui/parser/issue-41155.stderr b/src/test/ui/parser/issue-41155.stderr
index 0e191eb7e0..8491afae23 100644
--- a/src/test/ui/parser/issue-41155.stderr
+++ b/src/test/ui/parser/issue-41155.stderr
@@ -1,10 +1,22 @@
-error: expected one of `(`, `async`, `const`, `default`, `extern`, `fn`, `type`, or `unsafe`, found `}`
+error: visibility `pub` is not followed by an item
+  --> $DIR/issue-41155.rs:4:5
+   |
+LL |     pub
+   |     ^^^ the visibility
+   |
+   = help: you likely meant to define an item, e.g., `pub fn foo() {}`
+
+error: non-item in item list
   --> $DIR/issue-41155.rs:5:1
    |
+LL | impl S {
+   |        - item list starts here
 LL |     pub
-   |        - expected one of 8 possible tokens
 LL | }
-   | ^ unexpected token
+   | ^
+   | |
+   | non-item starts here
+   | item list ends here
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs b/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
new file mode 100644
index 0000000000..48a679b2d0
--- /dev/null
+++ b/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs
@@ -0,0 +1,44 @@
+fn main() {}
+
+macro_rules! expand_to_enum {
+    () => {
+        enum BadE {}
+        //~^ ERROR enum is not supported in `trait`s or `impl`s
+        //~| ERROR enum is not supported in `trait`s or `impl`s
+        //~| ERROR enum is not supported in `extern` blocks
+    };
+}
+
+macro_rules! mac_impl {
+    ($($i:item)*) => {
+        struct S;
+        impl S { $($i)* }
+    }
+}
+
+mac_impl! {
+    struct BadS; //~ ERROR struct is not supported in `trait`s or `impl`s
+    expand_to_enum!();
+}
+
+macro_rules! mac_trait {
+    ($($i:item)*) => {
+        trait T { $($i)* }
+    }
+}
+
+mac_trait! {
+    struct BadS; //~ ERROR struct is not supported in `trait`s or `impl`s
+    expand_to_enum!();
+}
+
+macro_rules! mac_extern {
+    ($($i:item)*) => {
+        extern "C" { $($i)* }
+    }
+}
+
+mac_extern! {
+    struct BadS; //~ ERROR struct is not supported in `extern` blocks
+    expand_to_enum!();
+}
diff --git a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr b/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
new file mode 100644
index 0000000000..bfd27a1a41
--- /dev/null
+++ b/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.stderr
@@ -0,0 +1,53 @@
+error: struct is not supported in `trait`s or `impl`s
+  --> $DIR/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs:20:5
+   |
+LL |     struct BadS;
+   |     ^^^^^^^^^^^^
+
+error: enum is not supported in `trait`s or `impl`s
+  --> $DIR/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs:5:9
+   |
+LL |         enum BadE {}
+   |         ^^^^^^^^^
+...
+LL |     expand_to_enum!();
+   |     ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: struct is not supported in `trait`s or `impl`s
+  --> $DIR/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs:31:5
+   |
+LL |     struct BadS;
+   |     ^^^^^^^^^^^^
+
+error: enum is not supported in `trait`s or `impl`s
+  --> $DIR/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs:5:9
+   |
+LL |         enum BadE {}
+   |         ^^^^^^^^^
+...
+LL |     expand_to_enum!();
+   |     ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: struct is not supported in `extern` blocks
+  --> $DIR/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs:42:5
+   |
+LL |     struct BadS;
+   |     ^^^^^^^^^^^^
+
+error: enum is not supported in `extern` blocks
+  --> $DIR/issue-48137-macros-cannot-interpolate-impl-items-bad-variants.rs:5:9
+   |
+LL |         enum BadE {}
+   |         ^^^^^^^^^
+...
+LL |     expand_to_enum!();
+   |     ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items.rs b/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items.rs
new file mode 100644
index 0000000000..8592f8a728
--- /dev/null
+++ b/src/test/ui/parser/issue-48137-macros-cannot-interpolate-impl-items.rs
@@ -0,0 +1,34 @@
+// check-pass
+
+fn main() {}
+
+macro_rules! mac_impl {
+    ($i:item) => {
+        struct S;
+        impl S { $i }
+    }
+}
+
+mac_impl! {
+    fn foo() {}
+}
+
+macro_rules! mac_trait {
+    ($i:item) => {
+        trait T { $i }
+    }
+}
+
+mac_trait! {
+    fn foo() {}
+}
+
+macro_rules! mac_extern {
+    ($i:item) => {
+        extern "C" { $i }
+    }
+}
+
+mac_extern! {
+    fn foo();
+}
diff --git a/src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr b/src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr
index 00f6652b31..8a44ee761e 100644
--- a/src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr
+++ b/src/test/ui/parser/issue-58094-missing-right-square-bracket.stderr
@@ -7,10 +7,10 @@ LL | #[Ѕ
    |  unclosed delimiter
 
 error: expected item after attributes
-  --> $DIR/issue-58094-missing-right-square-bracket.rs:4:4
+  --> $DIR/issue-58094-missing-right-square-bracket.rs:4:1
    |
 LL | #[Ѕ
-   |    ^
+   | ^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/parser/issue-62524.stderr b/src/test/ui/parser/issue-62524.stderr
index 3482435cd1..8191c9682c 100644
--- a/src/test/ui/parser/issue-62524.stderr
+++ b/src/test/ui/parser/issue-62524.stderr
@@ -16,9 +16,8 @@ LL | | Ϥ,
    |
 help: change the delimiters to curly braces
    |
-LL | y!{
-LL | Ϥ}
-   |
+LL | y! { /* items */ }
+   |    ^^^^^^^^^^^^^^^
 help: add a semicolon
    |
 LL | Ϥ,;
diff --git a/src/test/ui/parser/issue-62894.rs b/src/test/ui/parser/issue-62894.rs
new file mode 100644
index 0000000000..b9c0bf834d
--- /dev/null
+++ b/src/test/ui/parser/issue-62894.rs
@@ -0,0 +1,7 @@
+// Regression test for #62894, shouldn't crash.
+// error-pattern: this file contains an unclosed delimiter
+// error-pattern: expected one of `(`, `[`, or `{`, found keyword `fn`
+
+fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
+
+fn main() {}
diff --git a/src/test/ui/parser/issue-62894.stderr b/src/test/ui/parser/issue-62894.stderr
new file mode 100644
index 0000000000..6db380f7a7
--- /dev/null
+++ b/src/test/ui/parser/issue-62894.stderr
@@ -0,0 +1,47 @@
+error: this file contains an unclosed delimiter
+  --> $DIR/issue-62894.rs:7:14
+   |
+LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
+   |        -           -                   - unclosed delimiter
+   |        |           |
+   |        |           unclosed delimiter
+   |        unclosed delimiter
+LL | 
+LL | fn main() {}
+   |              ^
+
+error: this file contains an unclosed delimiter
+  --> $DIR/issue-62894.rs:7:14
+   |
+LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
+   |        -           -                   - unclosed delimiter
+   |        |           |
+   |        |           unclosed delimiter
+   |        unclosed delimiter
+LL | 
+LL | fn main() {}
+   |              ^
+
+error: this file contains an unclosed delimiter
+  --> $DIR/issue-62894.rs:7:14
+   |
+LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
+   |        -           -                   - unclosed delimiter
+   |        |           |
+   |        |           unclosed delimiter
+   |        unclosed delimiter
+LL | 
+LL | fn main() {}
+   |              ^
+
+error: expected one of `(`, `[`, or `{`, found keyword `fn`
+  --> $DIR/issue-62894.rs:7:1
+   |
+LL | fn f() { assert_eq!(f(), (), assert_eq!(assert_eq!
+   |                                                   - expected one of `(`, `[`, or `{`
+LL | 
+LL | fn main() {}
+   | ^^ unexpected token
+
+error: aborting due to 4 previous errors
+
diff --git a/src/test/ui/parser/issue-63135.rs b/src/test/ui/parser/issue-63135.rs
index d5f5f1469f..7d46b8904f 100644
--- a/src/test/ui/parser/issue-63135.rs
+++ b/src/test/ui/parser/issue-63135.rs
@@ -1,3 +1,3 @@
-// error-pattern: aborting due to 6 previous errors
+// error-pattern: aborting due to 7 previous errors
 
 fn i(n{...,f #
diff --git a/src/test/ui/parser/issue-63135.stderr b/src/test/ui/parser/issue-63135.stderr
index 462fdf11f4..04afae93be 100644
--- a/src/test/ui/parser/issue-63135.stderr
+++ b/src/test/ui/parser/issue-63135.stderr
@@ -43,5 +43,11 @@ error: expected one of `:` or `|`, found `)`
 LL | fn i(n{...,f #
    |                ^ expected one of `:` or `|`
 
-error: aborting due to 6 previous errors
+error: expected `;` or `{`, found `<eof>`
+  --> $DIR/issue-63135.rs:3:16
+   |
+LL | fn i(n{...,f #
+   |                ^ expected `;` or `{`
+
+error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.stderr b/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.stderr
index dd193d6a86..40599d228b 100644
--- a/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.stderr
+++ b/src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.stderr
@@ -8,6 +8,7 @@ LL |     mac1! { does_not_exist!() }
    |     --------------------------- in this macro invocation
    |
    = note: `mut` may be followed by `variable` and `variable @ pattern`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected identifier, found `does_not_exist!()`
   --> $DIR/issue-65122-mac-invoc-in-mut-patterns.rs:13:17
@@ -17,6 +18,8 @@ LL |         let mut $eval = ();
 ...
 LL |     mac2! { does_not_exist!() }
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `mut` must be followed by a named binding
   --> $DIR/issue-65122-mac-invoc-in-mut-patterns.rs:13:13
@@ -28,6 +31,7 @@ LL |     mac2! { does_not_exist!() }
    |     --------------------------- in this macro invocation
    |
    = note: `mut` may be followed by `variable` and `variable @ pattern`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: cannot find macro `does_not_exist` in this scope
   --> $DIR/issue-65122-mac-invoc-in-mut-patterns.rs:20:13
diff --git a/src/test/ui/parser/issue-6610.stderr b/src/test/ui/parser/issue-6610.stderr
index 22d93bffea..a980420894 100644
--- a/src/test/ui/parser/issue-6610.stderr
+++ b/src/test/ui/parser/issue-6610.stderr
@@ -2,7 +2,11 @@ error: expected `;` or `{`, found `}`
   --> $DIR/issue-6610.rs:1:20
    |
 LL | trait Foo { fn a() }
-   |                    ^ expected `;` or `{`
+   |           -        ^
+   |           |        |
+   |           |        expected `;` or `{`
+   |           |        the item list ends here
+   |           while parsing this item list starting here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/issue-68629.rs b/src/test/ui/parser/issue-68629.rs
new file mode 100644
index 0000000000000000000000000000000000000000..672a31f12c838bf7b2e54e6012354acea5852515
GIT binary patch
literal 336
zcmZvXJx;_x424tY3`jf<5T&Q!A~frragxy{c4RwRRveA9a2G5JXwult``*tuqRpbl
zL$vxB!l<oH=0W(LpS>SPu$kJhQv{p5;*gu@UEo0$&<UY8mJ?wt%`vr=QB;DOI7kvN
zt2$RyUfb5v^90?fm^xyi0DtTxHB*q{&9NOGxbh!gPx!Ks%$)qc%+gL#4qG3%8kN&+
rg+w&6bO!!*z$N^GCTW#pyy(t-|MVQ*y}W<6zUzQVVBcR#Z+W*L$M$$^

literal 0
HcmV?d00001

diff --git a/src/test/ui/parser/issue-68629.stderr b/src/test/ui/parser/issue-68629.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..a7885ecec5647e4c3eece95ce5b4ea25c70273ca
GIT binary patch
literal 1441
zcmds1!A{#i5Y5@&P^qs{Pe^GBsA=L#oO-FmsaH^7vtHvB_D;03Zi*7VjBnvz7~2pB
zh#gRGox{qqy>I5tdo#v+@-a$x?P%%1LHPhm5$M{u80Y2cP~S$taCm~xKY#rmS?1CV
z$CL5V^o!?s5+BM}tfSLYtnuMv;K8S}m95`l7DZ-1e%g<J^pE&o`{BQJ!{coPdJ{~a
z^=B{uQU`y3N9sh*;vIe3lV-b3d((u>GE$oxXmUYW$52j8pmSoAAThZuY%pHR>k?jw
zjr&?B7k2}SO=`nbNA<KLYwe{D64jMWv<CbC7!^u;VuVZun7<3<5*bQ}Dg~n`Ibd!!
zLM2$*kYVnXHVpDeDbHysQqFInz^1U8a&kR-PU7!da^mGE<3eKAO!*oe+N`UeHZg1P
zGLtW2=uEjQBW&8Dy^tg5(&smim2VZ$Y!a+6I(X!KFhVuSjcG7@9#NA;CCLlAPn+pg
z#XnlC9d^>nISMi&()C&hTn4^`b;3YKhczvX0CWw<BtCw{rQM3HYt@{5u<i;;DZL>~
PvGC@PrIJxEPL84np&G4n

literal 0
HcmV?d00001

diff --git a/src/test/ui/parser/issue-68730.rs b/src/test/ui/parser/issue-68730.rs
new file mode 100644
index 0000000000000000000000000000000000000000..b570e9417751b01f67db9a2e4edfa7631400b8d9
GIT binary patch
literal 170
zcmZw7F%E+;3`SvQPT>O(Wv{B9B@y|9EWk#N5$($LxK!!h>Am5Lk$4g{1n2SzZkZRB
zDF}|cXnl+XGqtc~cbGhAms#`>YM#wWE4j{)KM?N?qoa@telESzKxtHIeh(Ljb7j~-
bYP4{L^NNA0?ouc{Q{O}OwZqz7=XHJoQ(ip7

literal 0
HcmV?d00001

diff --git a/src/test/ui/parser/issue-68730.stderr b/src/test/ui/parser/issue-68730.stderr
new file mode 100644
index 0000000000000000000000000000000000000000..090b41d839f82b68c11fe38111b9fda254aa39b0
GIT binary patch
literal 956
zcmd5*O-sW-5bZg?;vIxqNVHa}HH3oTMTi%*H<6^tq*>DLl>M-R^^(7rKjk(DKcH$+
z4=#Jyomuw1d2fc4Vim&5O7coVn^YNa0mBu^5O?;e|Lg%lFvi}+<@KS^+EQ>bIz8?m
zC>;*Nq03_J#WB_(X%`(@beg)U+ptRk_nt?;MHzjIvLntQ8+={Q*-l7p%_Ys3Atq8}
zoD;G#RcU5Oq1)75>|b#%3gNCXnN2jN!r<Hqu_`Iedzdp<8go$*x{-Sylh(m)nM&M<
zne6$PS_9#>hGesaRrFruzbgNzzXj=|pRJ|;L4c-?TC$EyyWSd&9+%{-$ib2}-JFaQ
zA4$ei8+Q;nNz;1cgO#(OAR`v!qhKp@BvInN{k-FMln6f}@j5H%l$8;3hTM{yMhvl3
N^dQ)3w9}+L?*&sNB`*K~

literal 0
HcmV?d00001

diff --git a/src/test/ui/parser/issue-68788-in-trait-item-propagation.rs b/src/test/ui/parser/issue-68788-in-trait-item-propagation.rs
new file mode 100644
index 0000000000..7c3dd1d5a9
--- /dev/null
+++ b/src/test/ui/parser/issue-68788-in-trait-item-propagation.rs
@@ -0,0 +1,21 @@
+// Make sure we don't propagate restrictions on trait impl items to items inside them.
+
+// check-pass
+// edition:2018
+
+fn main() {}
+
+trait X {
+    fn foo();
+}
+
+impl X for () {
+    fn foo() {
+        struct S;
+        impl S {
+            pub const X: u8 = 0;
+            pub const fn bar() {}
+            async fn qux() {}
+        }
+    }
+}
diff --git a/src/test/ui/parser/issue-68890.rs b/src/test/ui/parser/issue-68890.rs
new file mode 100644
index 0000000000..a7c5a5e130
--- /dev/null
+++ b/src/test/ui/parser/issue-68890.rs
@@ -0,0 +1,4 @@
+enum e{A((?'a a+?+l))}
+//~^ ERROR `?` may only modify trait bounds, not lifetime bounds
+//~| ERROR expected one of `)`, `+`, or `,`
+//~| ERROR expected trait bound, not lifetime bound
diff --git a/src/test/ui/parser/issue-68890.stderr b/src/test/ui/parser/issue-68890.stderr
new file mode 100644
index 0000000000..9bb8761b67
--- /dev/null
+++ b/src/test/ui/parser/issue-68890.stderr
@@ -0,0 +1,20 @@
+error: `?` may only modify trait bounds, not lifetime bounds
+  --> $DIR/issue-68890.rs:1:11
+   |
+LL | enum e{A((?'a a+?+l))}
+   |           ^
+
+error: expected one of `)`, `+`, or `,`, found `a`
+  --> $DIR/issue-68890.rs:1:15
+   |
+LL | enum e{A((?'a a+?+l))}
+   |               ^ expected one of `)`, `+`, or `,`
+
+error: expected trait bound, not lifetime bound
+  --> $DIR/issue-68890.rs:1:11
+   |
+LL | enum e{A((?'a a+?+l))}
+   |           ^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/issue-70050-ntliteral-accepts-negated-lit.rs b/src/test/ui/parser/issue-70050-ntliteral-accepts-negated-lit.rs
new file mode 100644
index 0000000000..aca9d9eb0a
--- /dev/null
+++ b/src/test/ui/parser/issue-70050-ntliteral-accepts-negated-lit.rs
@@ -0,0 +1,16 @@
+// check-pass
+
+macro_rules! foo {
+    ($a:literal) => {
+        bar!($a)
+    };
+}
+
+macro_rules! bar {
+    ($b:literal) => {};
+}
+
+fn main() {
+    foo!(-2);
+    bar!(-2);
+}
diff --git a/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.rs b/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.rs
new file mode 100644
index 0000000000..9b6dd7db4b
--- /dev/null
+++ b/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.rs
@@ -0,0 +1,3 @@
+fn main() {
+    expr as fun()(:); //~ ERROR expected expression
+}
diff --git a/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.stderr b/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.stderr
new file mode 100644
index 0000000000..f03c92e1b1
--- /dev/null
+++ b/src/test/ui/parser/issue-70552-ascription-in-parens-after-call.stderr
@@ -0,0 +1,8 @@
+error: expected expression, found `:`
+  --> $DIR/issue-70552-ascription-in-parens-after-call.rs:2:19
+   |
+LL |     expr as fun()(:);
+   |                   ^ expected expression
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs b/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
new file mode 100644
index 0000000000..613b3c9856
--- /dev/null
+++ b/src/test/ui/parser/item-free-const-no-body-semantic-fail.rs
@@ -0,0 +1,7 @@
+// Semantically, a free `const` item cannot omit its body.
+
+fn main() {}
+
+const A: u8; //~ ERROR free constant item without body
+const B; //~ ERROR free constant item without body
+//~^ ERROR missing type for `const` item
diff --git a/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr b/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr
new file mode 100644
index 0000000000..4e97229fa1
--- /dev/null
+++ b/src/test/ui/parser/item-free-const-no-body-semantic-fail.stderr
@@ -0,0 +1,24 @@
+error: free constant item without body
+  --> $DIR/item-free-const-no-body-semantic-fail.rs:5:1
+   |
+LL | const A: u8;
+   | ^^^^^^^^^^^-
+   |            |
+   |            help: provide a definition for the constant: `= <expr>;`
+
+error: free constant item without body
+  --> $DIR/item-free-const-no-body-semantic-fail.rs:6:1
+   |
+LL | const B;
+   | ^^^^^^^-
+   |        |
+   |        help: provide a definition for the constant: `= <expr>;`
+
+error: missing type for `const` item
+  --> $DIR/item-free-const-no-body-semantic-fail.rs:6:7
+   |
+LL | const B;
+   |       ^ help: provide a type for the item: `B: [type error]`
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs b/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs
new file mode 100644
index 0000000000..acfdd3c363
--- /dev/null
+++ b/src/test/ui/parser/item-free-const-no-body-syntactic-pass.rs
@@ -0,0 +1,8 @@
+// Syntactically, a free `const` item can omit its body.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+const X: u8;
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs b/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
new file mode 100644
index 0000000000..780479e3d2
--- /dev/null
+++ b/src/test/ui/parser/item-free-static-no-body-semantic-fail.rs
@@ -0,0 +1,11 @@
+// Semantically, a free `static` item cannot omit its body.
+
+fn main() {}
+
+static A: u8; //~ ERROR free static item without body
+static B; //~ ERROR free static item without body
+//~^ ERROR missing type for `static` item
+
+static mut C: u8; //~ ERROR free static item without body
+static mut D; //~ ERROR free static item without body
+//~^ ERROR missing type for `static mut` item
diff --git a/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr b/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
new file mode 100644
index 0000000000..60b7bb34c6
--- /dev/null
+++ b/src/test/ui/parser/item-free-static-no-body-semantic-fail.stderr
@@ -0,0 +1,46 @@
+error: free static item without body
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:5:1
+   |
+LL | static A: u8;
+   | ^^^^^^^^^^^^-
+   |             |
+   |             help: provide a definition for the static: `= <expr>;`
+
+error: free static item without body
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:6:1
+   |
+LL | static B;
+   | ^^^^^^^^-
+   |         |
+   |         help: provide a definition for the static: `= <expr>;`
+
+error: free static item without body
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:9:1
+   |
+LL | static mut C: u8;
+   | ^^^^^^^^^^^^^^^^-
+   |                 |
+   |                 help: provide a definition for the static: `= <expr>;`
+
+error: free static item without body
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:10:1
+   |
+LL | static mut D;
+   | ^^^^^^^^^^^^-
+   |             |
+   |             help: provide a definition for the static: `= <expr>;`
+
+error: missing type for `static` item
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:6:8
+   |
+LL | static B;
+   |        ^ help: provide a type for the item: `B: [type error]`
+
+error: missing type for `static mut` item
+  --> $DIR/item-free-static-no-body-semantic-fail.rs:10:12
+   |
+LL | static mut D;
+   |            ^ help: provide a type for the item: `D: [type error]`
+
+error: aborting due to 6 previous errors
+
diff --git a/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs b/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs
new file mode 100644
index 0000000000..db0039204d
--- /dev/null
+++ b/src/test/ui/parser/item-free-static-no-body-syntactic-pass.rs
@@ -0,0 +1,8 @@
+// Syntactically, a free `const` item can omit its body.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+static X: u8;
diff --git a/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs b/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs
new file mode 100644
index 0000000000..9db4111fba
--- /dev/null
+++ b/src/test/ui/parser/item-free-type-bounds-semantic-fail.rs
@@ -0,0 +1,20 @@
+fn main() {}
+
+fn semantics() {
+    type A: Ord;
+    //~^ ERROR bounds on `type`s in this context have no effect
+    //~| ERROR free type alias without body
+    type B: Ord = u8;
+    //~^ ERROR bounds on `type`s in this context have no effect
+    type C: Ord where 'static: 'static = u8;
+    //~^ ERROR bounds on `type`s in this context have no effect
+    type D<_T>: Ord;
+    //~^ ERROR bounds on `type`s in this context have no effect
+    //~| ERROR free type alias without body
+    type E<_T>: Ord = u8;
+    //~^ ERROR bounds on `type`s in this context have no effect
+    //~| ERROR type parameter `_T` is unused
+    type F<_T>: Ord where 'static: 'static = u8;
+    //~^ ERROR bounds on `type`s in this context have no effect
+    //~| ERROR type parameter `_T` is unused
+}
diff --git a/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr b/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr
new file mode 100644
index 0000000000..1b08651289
--- /dev/null
+++ b/src/test/ui/parser/item-free-type-bounds-semantic-fail.stderr
@@ -0,0 +1,67 @@
+error: free type alias without body
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:4:5
+   |
+LL |     type A: Ord;
+   |     ^^^^^^^^^^^-
+   |                |
+   |                help: provide a definition for the type: `= <type>;`
+
+error: bounds on `type`s in this context have no effect
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:4:13
+   |
+LL |     type A: Ord;
+   |             ^^^
+
+error: bounds on `type`s in this context have no effect
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:7:13
+   |
+LL |     type B: Ord = u8;
+   |             ^^^
+
+error: bounds on `type`s in this context have no effect
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:9:13
+   |
+LL |     type C: Ord where 'static: 'static = u8;
+   |             ^^^
+
+error: free type alias without body
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:11:5
+   |
+LL |     type D<_T>: Ord;
+   |     ^^^^^^^^^^^^^^^-
+   |                    |
+   |                    help: provide a definition for the type: `= <type>;`
+
+error: bounds on `type`s in this context have no effect
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:11:17
+   |
+LL |     type D<_T>: Ord;
+   |                 ^^^
+
+error: bounds on `type`s in this context have no effect
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:14:17
+   |
+LL |     type E<_T>: Ord = u8;
+   |                 ^^^
+
+error: bounds on `type`s in this context have no effect
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:17:17
+   |
+LL |     type F<_T>: Ord where 'static: 'static = u8;
+   |                 ^^^
+
+error[E0091]: type parameter `_T` is unused
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:14:12
+   |
+LL |     type E<_T>: Ord = u8;
+   |            ^^ unused type parameter
+
+error[E0091]: type parameter `_T` is unused
+  --> $DIR/item-free-type-bounds-semantic-fail.rs:17:12
+   |
+LL |     type F<_T>: Ord where 'static: 'static = u8;
+   |            ^^ unused type parameter
+
+error: aborting due to 10 previous errors
+
+For more information about this error, try `rustc --explain E0091`.
diff --git a/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs b/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs
new file mode 100644
index 0000000000..58fc926d08
--- /dev/null
+++ b/src/test/ui/parser/item-free-type-bounds-syntactic-pass.rs
@@ -0,0 +1,13 @@
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+fn syntax() {
+    type A: Ord;
+    type B: Ord = u8;
+    type C: Ord where 'static: 'static = u8;
+    type D<_T>: Ord;
+    type E<_T>: Ord = u8;
+    type F<_T>: Ord where 'static: 'static = u8;
+}
diff --git a/src/test/ui/parser/macro/issue-37113.stderr b/src/test/ui/parser/macro/issue-37113.stderr
index 7aadc0aa4b..20ee9d35ec 100644
--- a/src/test/ui/parser/macro/issue-37113.stderr
+++ b/src/test/ui/parser/macro/issue-37113.stderr
@@ -6,6 +6,8 @@ LL |             $( $t, )*
 ...
 LL |     test_macro!(String,);
    |     --------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/macro/issue-37234.stderr b/src/test/ui/parser/macro/issue-37234.stderr
index 8cef5ae375..2db0f848f7 100644
--- a/src/test/ui/parser/macro/issue-37234.stderr
+++ b/src/test/ui/parser/macro/issue-37234.stderr
@@ -6,6 +6,8 @@ LL |         let x = 5 "";
 ...
 LL |     failed!();
    |     ---------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/macro/macro-incomplete-parse.stderr b/src/test/ui/parser/macro/macro-incomplete-parse.stderr
index 46cccba74c..c9d220b1a2 100644
--- a/src/test/ui/parser/macro/macro-incomplete-parse.stderr
+++ b/src/test/ui/parser/macro/macro-incomplete-parse.stderr
@@ -17,6 +17,8 @@ LL |     () => ( 1,
 ...
 LL |     ignored_expr!();
    |     ---------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: macro expansion ignores token `,` and any following
   --> $DIR/macro-incomplete-parse.rs:16:14
diff --git a/src/test/ui/parser/macro/pub-item-macro.rs b/src/test/ui/parser/macro/pub-item-macro.rs
index bae90227c6..f5f8a01e6a 100644
--- a/src/test/ui/parser/macro/pub-item-macro.rs
+++ b/src/test/ui/parser/macro/pub-item-macro.rs
@@ -1,12 +1,15 @@
 // Issue #14660
 
-macro_rules! priv_x { () => {
-    static x: u32 = 0;
-}}
+macro_rules! priv_x {
+    () => {
+        static x: u32 = 0;
+    };
+}
 
 macro_rules! pub_x { () => {
     pub priv_x!(); //~ ERROR can't qualify macro invocation with `pub`
-    //~^ HELP try adjusting the macro to put `pub` inside the invocation
+    //~^ HELP remove the visibility
+    //~| HELP try adjusting the macro to put `pub` inside the invocation
 }}
 
 mod foo {
diff --git a/src/test/ui/parser/macro/pub-item-macro.stderr b/src/test/ui/parser/macro/pub-item-macro.stderr
index ae981ac4cb..4ff96532e0 100644
--- a/src/test/ui/parser/macro/pub-item-macro.stderr
+++ b/src/test/ui/parser/macro/pub-item-macro.stderr
@@ -1,28 +1,30 @@
 error: can't qualify macro invocation with `pub`
-  --> $DIR/pub-item-macro.rs:8:5
+  --> $DIR/pub-item-macro.rs:10:5
    |
 LL |     pub priv_x!();
-   |     ^^^
+   |     ^^^ help: remove the visibility
 ...
 LL |     pub_x!();
    |     --------- in this macro invocation
    |
    = help: try adjusting the macro to put `pub` inside the invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0603]: static `x` is private
-  --> $DIR/pub-item-macro.rs:17:23
+  --> $DIR/pub-item-macro.rs:20:23
    |
 LL |     let y: u32 = foo::x;
    |                       ^ this static is private
    |
 note: the static `x` is defined here
-  --> $DIR/pub-item-macro.rs:4:5
+  --> $DIR/pub-item-macro.rs:5:9
    |
-LL |     static x: u32 = 0;
-   |     ^^^^^^^^^^^^^^^^^^
+LL |         static x: u32 = 0;
+   |         ^^^^^^^^^^^^^^^^^^
 ...
 LL |     pub_x!();
    |     --------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/parser/macro/trait-non-item-macros.rs b/src/test/ui/parser/macro/trait-non-item-macros.rs
index 5021886bf9..97fb564bf6 100644
--- a/src/test/ui/parser/macro/trait-non-item-macros.rs
+++ b/src/test/ui/parser/macro/trait-non-item-macros.rs
@@ -1,10 +1,13 @@
 macro_rules! bah {
-    ($a:expr) => ($a)
-    //~^ ERROR expected one of `async`
+    ($a:expr) => {
+        $a
+    }; //~^ ERROR macro expansion ignores token `2` and any following
 }
 
-trait bar {
+trait Bar {
     bah!(2);
 }
 
-fn main() {}
+fn main() {
+    let _recovery_witness: () = 0; //~ ERROR mismatched types
+}
diff --git a/src/test/ui/parser/macro/trait-non-item-macros.stderr b/src/test/ui/parser/macro/trait-non-item-macros.stderr
index 7647ba500e..35e5bfe62f 100644
--- a/src/test/ui/parser/macro/trait-non-item-macros.stderr
+++ b/src/test/ui/parser/macro/trait-non-item-macros.stderr
@@ -1,11 +1,22 @@
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, or `unsafe`, found `2`
-  --> $DIR/trait-non-item-macros.rs:2:19
+error: macro expansion ignores token `2` and any following
+  --> $DIR/trait-non-item-macros.rs:3:9
    |
-LL |     ($a:expr) => ($a)
-   |                   ^^ expected one of 9 possible tokens
+LL |         $a
+   |         ^^
 ...
 LL |     bah!(2);
-   |     -------- in this macro invocation
+   |     -------- caused by the macro expansion here
+   |
+   = note: the usage of `bah!` is likely invalid in trait item context
+
+error[E0308]: mismatched types
+  --> $DIR/trait-non-item-macros.rs:12:33
+   |
+LL |     let _recovery_witness: () = 0;
+   |                            --   ^ expected `()`, found integer
+   |                            |
+   |                            expected due to this
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/mbe_missing_right_paren.stderr b/src/test/ui/parser/mbe_missing_right_paren.stderr
index c5b3cc275c..ec04b937b9 100644
--- a/src/test/ui/parser/mbe_missing_right_paren.stderr
+++ b/src/test/ui/parser/mbe_missing_right_paren.stderr
@@ -14,18 +14,18 @@ LL | macro_rules! abc(ؼ
    |
 help: change the delimiters to curly braces
    |
-LL | macro_rules! abc{ؼ}
-   |                 ^ ^
+LL | macro_rules! abc { /* items */ }
+   |                  ^^^^^^^^^^^^^^^
 help: add a semicolon
    |
 LL | macro_rules! abc(ؼ;
    |                   ^
 
 error: unexpected end of macro invocation
-  --> $DIR/mbe_missing_right_paren.rs:3:1
+  --> $DIR/mbe_missing_right_paren.rs:3:19
    |
 LL | macro_rules! abc(ؼ
-   | ^^^^^^^^^^^^^^^^^^ missing tokens in macro arguments
+   |                   ^ missing tokens in macro arguments
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
index 9f02a7a997..8f46970b1a 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
+++ b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.rs
@@ -1,12 +1,13 @@
+fn main() {}
+
 impl T for () { //~ ERROR cannot find trait `T` in this scope
 
 fn foo(&self) {}
 
-trait T { //~ ERROR expected one of
+trait T { //~ ERROR trait is not supported in `trait`s or `impl`s
     fn foo(&self);
 }
 
-pub(crate) struct Bar<T>();
+pub(crate) struct Bar<T>(); //~ ERROR struct is not supported in `trait`s or `impl`s
 
-fn main() {}
 //~ ERROR this file contains an unclosed delimiter
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
index a23cfeac58..1655a96839 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
+++ b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-impl-trait.stderr
@@ -1,5 +1,5 @@
 error: this file contains an unclosed delimiter
-  --> $DIR/missing-close-brace-in-impl-trait.rs:12:52
+  --> $DIR/missing-close-brace-in-impl-trait.rs:13:52
    |
 LL | impl T for () {
    |               - unclosed delimiter
@@ -7,27 +7,24 @@ LL | impl T for () {
 LL |
    |                                                    ^
 
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found keyword `trait`
-  --> $DIR/missing-close-brace-in-impl-trait.rs:5:1
+error: trait is not supported in `trait`s or `impl`s
+  --> $DIR/missing-close-brace-in-impl-trait.rs:7:1
    |
-LL | impl T for () {
-   |               - unclosed delimiter
-LL | 
-LL | fn foo(&self) {}
-   |                 -
-   |                 |
-   |                 expected one of 10 possible tokens
-   |                 help: `}` may belong here
-LL | 
 LL | trait T {
-   | ^^^^^ unexpected token
+   | ^^^^^^^
+
+error: struct is not supported in `trait`s or `impl`s
+  --> $DIR/missing-close-brace-in-impl-trait.rs:11:1
+   |
+LL | pub(crate) struct Bar<T>();
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0405]: cannot find trait `T` in this scope
-  --> $DIR/missing-close-brace-in-impl-trait.rs:1:6
+  --> $DIR/missing-close-brace-in-impl-trait.rs:3:6
    |
 LL | impl T for () {
    |      ^ not found in this scope
 
-error: aborting due to 3 previous errors
+error: aborting due to 4 previous errors
 
 For more information about this error, try `rustc --explain E0405`.
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
index 5ec5d45bbe..b6932deb5c 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
+++ b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.rs
@@ -1,11 +1,11 @@
 trait T {
-//~^ ERROR `main` function not found in crate `missing_close_brace_in_trait`
     fn foo(&self);
 
 pub(crate) struct Bar<T>();
-//~^ ERROR expected one of
+//~^ ERROR struct is not supported in `trait`s or `impl`s
 
 impl T for Bar<usize> {
+//~^ ERROR implementation is not supported in `trait`s or `impl`s
 fn foo(&self) {}
 }
 
diff --git a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
index 2136401278..43a3883357 100644
--- a/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
+++ b/src/test/ui/parser/mismatched-braces/missing-close-brace-in-trait.stderr
@@ -7,24 +7,17 @@ LL | trait T {
 LL | fn main() {}
    |                                                                 ^
 
-error: expected one of `async`, `const`, `default`, `extern`, `fn`, `type`, or `unsafe`, found keyword `struct`
-  --> $DIR/missing-close-brace-in-trait.rs:5:12
+error: struct is not supported in `trait`s or `impl`s
+  --> $DIR/missing-close-brace-in-trait.rs:4:1
    |
 LL | pub(crate) struct Bar<T>();
-   |            ^^^^^^ expected one of 7 possible tokens
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error[E0601]: `main` function not found in crate `missing_close_brace_in_trait`
-  --> $DIR/missing-close-brace-in-trait.rs:1:1
+error: implementation is not supported in `trait`s or `impl`s
+  --> $DIR/missing-close-brace-in-trait.rs:7:1
    |
-LL | / trait T {
-LL | |
-LL | |     fn foo(&self);
-LL | |
-...  |
-LL | |
-LL | | fn main() {}
-   | |________________________________________________________________^ consider adding a `main` function to `$DIR/missing-close-brace-in-trait.rs`
+LL | impl T for Bar<usize> {
+   | ^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr b/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
index 311f1768d8..f1be5dc5ba 100644
--- a/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
+++ b/src/test/ui/parser/mismatched-delim-brace-empty-block.stderr
@@ -1,14 +1,8 @@
 error: unexpected closing delimiter: `}`
   --> $DIR/mismatched-delim-brace-empty-block.rs:5:1
    |
-LL |   fn main() {
-   |  ___________-
-LL | |
-LL | | }
-   | |_- this block is empty, you might have not meant to close it
-LL |       let _ = ();
-LL |   }
-   |   ^ unexpected closing delimiter
+LL | }
+   | ^ unexpected closing delimiter
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/missing-semicolon.rs b/src/test/ui/parser/missing-semicolon.rs
new file mode 100644
index 0000000000..a24dfa761a
--- /dev/null
+++ b/src/test/ui/parser/missing-semicolon.rs
@@ -0,0 +1,8 @@
+macro_rules! m {
+    ($($e1:expr),*; $($e2:expr),*) => {
+        $( let x = $e1 )*; //~ ERROR expected one of `.`, `;`, `?`, or
+        $( println!("{}", $e2) )*;
+    }
+}
+
+fn main() { m!(0, 0; 0, 0); }
diff --git a/src/test/ui/parser/missing-semicolon.stderr b/src/test/ui/parser/missing-semicolon.stderr
new file mode 100644
index 0000000000..26cb3d13d9
--- /dev/null
+++ b/src/test/ui/parser/missing-semicolon.stderr
@@ -0,0 +1,13 @@
+error: expected one of `.`, `;`, `?`, or an operator, found keyword `let`
+  --> $DIR/missing-semicolon.rs:3:12
+   |
+LL |         $( let x = $e1 )*;
+   |            ^^^ expected one of `.`, `;`, `?`, or an operator
+...
+LL | fn main() { m!(0, 0; 0, 0); }
+   |             --------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/missing_right_paren.rs b/src/test/ui/parser/missing_right_paren.rs
index c35236ce79..810dee9571 100644
--- a/src/test/ui/parser/missing_right_paren.rs
+++ b/src/test/ui/parser/missing_right_paren.rs
@@ -1,3 +1,3 @@
 // ignore-tidy-trailing-newlines
-// error-pattern: aborting due to 3 previous errors
+// error-pattern: aborting due to 4 previous errors
 fn main((ؼ
\ No newline at end of file
diff --git a/src/test/ui/parser/missing_right_paren.stderr b/src/test/ui/parser/missing_right_paren.stderr
index d67e7c8891..c1ceb81a07 100644
--- a/src/test/ui/parser/missing_right_paren.stderr
+++ b/src/test/ui/parser/missing_right_paren.stderr
@@ -22,5 +22,11 @@ error: expected one of `:` or `|`, found `)`
 LL | fn main((ؼ
    |           ^ expected one of `:` or `|`
 
-error: aborting due to 3 previous errors
+error: expected `;` or `{`, found `<eof>`
+  --> $DIR/missing_right_paren.rs:3:11
+   |
+LL | fn main((ؼ
+   |           ^ expected `;` or `{`
+
+error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/parser/mut-patterns.rs b/src/test/ui/parser/mut-patterns.rs
index 66fd5893af..8b83d6ab2f 100644
--- a/src/test/ui/parser/mut-patterns.rs
+++ b/src/test/ui/parser/mut-patterns.rs
@@ -9,6 +9,8 @@ pub fn main() {
     let mut _ = 0; //~ ERROR `mut` must be followed by a named binding
     let mut (_, _) = (0, 0); //~ ERROR `mut` must be followed by a named binding
 
+    let mut (x @ y) = 0; //~ ERROR `mut` must be attached to each individual binding
+
     let mut mut x = 0;
     //~^ ERROR `mut` on a binding may not be repeated
     //~| remove the additional `mut`s
diff --git a/src/test/ui/parser/mut-patterns.stderr b/src/test/ui/parser/mut-patterns.stderr
index a0e290a834..9a6af7394b 100644
--- a/src/test/ui/parser/mut-patterns.stderr
+++ b/src/test/ui/parser/mut-patterns.stderr
@@ -14,14 +14,22 @@ LL |     let mut (_, _) = (0, 0);
    |
    = note: `mut` may be followed by `variable` and `variable @ pattern`
 
+error: `mut` must be attached to each individual binding
+  --> $DIR/mut-patterns.rs:12:9
+   |
+LL |     let mut (x @ y) = 0;
+   |         ^^^^^^^^^^^ help: add `mut` to each binding: `(mut x @ mut y)`
+   |
+   = note: `mut` may be followed by `variable` and `variable @ pattern`
+
 error: `mut` on a binding may not be repeated
-  --> $DIR/mut-patterns.rs:12:13
+  --> $DIR/mut-patterns.rs:14:13
    |
 LL |     let mut mut x = 0;
    |             ^^^ help: remove the additional `mut`s
 
 error: `mut` must be attached to each individual binding
-  --> $DIR/mut-patterns.rs:17:9
+  --> $DIR/mut-patterns.rs:19:9
    |
 LL |     let mut Foo { x: x } = Foo { x: 3 };
    |         ^^^^^^^^^^^^^^^^ help: add `mut` to each binding: `Foo { x: mut x }`
@@ -29,7 +37,7 @@ LL |     let mut Foo { x: x } = Foo { x: 3 };
    = note: `mut` may be followed by `variable` and `variable @ pattern`
 
 error: `mut` must be attached to each individual binding
-  --> $DIR/mut-patterns.rs:21:9
+  --> $DIR/mut-patterns.rs:23:9
    |
 LL |     let mut Foo { x } = Foo { x: 3 };
    |         ^^^^^^^^^^^^^ help: add `mut` to each binding: `Foo { mut x }`
@@ -37,13 +45,13 @@ LL |     let mut Foo { x } = Foo { x: 3 };
    = note: `mut` may be followed by `variable` and `variable @ pattern`
 
 error: `mut` on a binding may not be repeated
-  --> $DIR/mut-patterns.rs:26:13
+  --> $DIR/mut-patterns.rs:28:13
    |
 LL |     let mut mut yield(become, await) = r#yield(0, 0);
    |             ^^^ help: remove the additional `mut`s
 
 error: expected identifier, found reserved keyword `yield`
-  --> $DIR/mut-patterns.rs:26:17
+  --> $DIR/mut-patterns.rs:28:17
    |
 LL |     let mut mut yield(become, await) = r#yield(0, 0);
    |                 ^^^^^ expected identifier, found reserved keyword
@@ -54,7 +62,7 @@ LL |     let mut mut r#yield(become, await) = r#yield(0, 0);
    |                 ^^^^^^^
 
 error: expected identifier, found reserved keyword `become`
-  --> $DIR/mut-patterns.rs:26:23
+  --> $DIR/mut-patterns.rs:28:23
    |
 LL |     let mut mut yield(become, await) = r#yield(0, 0);
    |                       ^^^^^^ expected identifier, found reserved keyword
@@ -65,7 +73,7 @@ LL |     let mut mut yield(r#become, await) = r#yield(0, 0);
    |                       ^^^^^^^^
 
 error: expected identifier, found keyword `await`
-  --> $DIR/mut-patterns.rs:26:31
+  --> $DIR/mut-patterns.rs:28:31
    |
 LL |     let mut mut yield(become, await) = r#yield(0, 0);
    |                               ^^^^^ expected identifier, found keyword
@@ -76,7 +84,7 @@ LL |     let mut mut yield(become, r#await) = r#yield(0, 0);
    |                               ^^^^^^^
 
 error: `mut` must be attached to each individual binding
-  --> $DIR/mut-patterns.rs:26:9
+  --> $DIR/mut-patterns.rs:28:9
    |
 LL |     let mut mut yield(become, await) = r#yield(0, 0);
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add `mut` to each binding: `r#yield(mut r#become, mut r#await)`
@@ -84,7 +92,7 @@ LL |     let mut mut yield(become, await) = r#yield(0, 0);
    = note: `mut` may be followed by `variable` and `variable @ pattern`
 
 error: `mut` must be attached to each individual binding
-  --> $DIR/mut-patterns.rs:35:9
+  --> $DIR/mut-patterns.rs:37:9
    |
 LL |     let mut W(mut a, W(b, W(ref c, W(d, B { box f }))))
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: add `mut` to each binding: `W(mut a, W(mut b, W(ref c, W(mut d, B { box mut f }))))`
@@ -92,13 +100,15 @@ LL |     let mut W(mut a, W(b, W(ref c, W(d, B { box f }))))
    = note: `mut` may be followed by `variable` and `variable @ pattern`
 
 error: expected identifier, found `x`
-  --> $DIR/mut-patterns.rs:42:21
+  --> $DIR/mut-patterns.rs:44:21
    |
 LL |             let mut $p = 0;
    |                     ^^ expected identifier
 ...
 LL |     foo!(x);
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 12 previous errors
+error: aborting due to 13 previous errors
 
diff --git a/src/test/ui/parser/no-const-fn-in-extern-block.rs b/src/test/ui/parser/no-const-fn-in-extern-block.rs
index 29f26389de..4cae703a16 100644
--- a/src/test/ui/parser/no-const-fn-in-extern-block.rs
+++ b/src/test/ui/parser/no-const-fn-in-extern-block.rs
@@ -1,8 +1,8 @@
 extern {
     const fn foo();
-    //~^ ERROR extern items cannot be `const`
+    //~^ ERROR functions in `extern` blocks cannot have qualifiers
     const unsafe fn bar();
-    //~^ ERROR extern items cannot be `const`
+    //~^ ERROR functions in `extern` blocks cannot have qualifiers
 }
 
 fn main() {}
diff --git a/src/test/ui/parser/no-const-fn-in-extern-block.stderr b/src/test/ui/parser/no-const-fn-in-extern-block.stderr
index 5b4663a702..de653987e4 100644
--- a/src/test/ui/parser/no-const-fn-in-extern-block.stderr
+++ b/src/test/ui/parser/no-const-fn-in-extern-block.stderr
@@ -1,14 +1,23 @@
-error: extern items cannot be `const`
-  --> $DIR/no-const-fn-in-extern-block.rs:2:5
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/no-const-fn-in-extern-block.rs:2:14
    |
+LL | extern {
+   | ------ in this `extern` block
 LL |     const fn foo();
-   |     ^^^^^
+   |     ---------^^^
+   |     |
+   |     help: remove the qualifiers: `fn`
 
-error: extern items cannot be `const`
-  --> $DIR/no-const-fn-in-extern-block.rs:4:5
+error: functions in `extern` blocks cannot have qualifiers
+  --> $DIR/no-const-fn-in-extern-block.rs:4:21
    |
+LL | extern {
+   | ------ in this `extern` block
+...
 LL |     const unsafe fn bar();
-   |     ^^^^^
+   |     ----------------^^^
+   |     |
+   |     help: remove the qualifiers: `fn`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/parser/not-a-pred.stderr b/src/test/ui/parser/not-a-pred.stderr
index 90246b92bf..dce54655fa 100644
--- a/src/test/ui/parser/not-a-pred.stderr
+++ b/src/test/ui/parser/not-a-pred.stderr
@@ -1,8 +1,8 @@
-error: expected one of `->`, `where`, or `{`, found `:`
+error: expected `;` or `{`, found `:`
   --> $DIR/not-a-pred.rs:3:26
    |
 LL | fn f(a: isize, b: isize) : lt(a, b) { }
-   |                          ^ expected one of `->`, `where`, or `{`
+   |                          ^ expected `;` or `{`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/omitted-arg-in-item-fn.stderr b/src/test/ui/parser/omitted-arg-in-item-fn.stderr
index c7c76a7f1d..9f138bf84c 100644
--- a/src/test/ui/parser/omitted-arg-in-item-fn.stderr
+++ b/src/test/ui/parser/omitted-arg-in-item-fn.stderr
@@ -5,6 +5,10 @@ LL | fn foo(x) {
    |         ^ expected one of `:`, `@`, or `|`
    |
    = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a `self` type, give it a parameter name
+   |
+LL | fn foo(self: x) {
+   |        ^^^^^^^
 help: if this was a parameter name, give it a type
    |
 LL | fn foo(x: TypeName) {
diff --git a/src/test/ui/parser/pat-lt-bracket-2.stderr b/src/test/ui/parser/pat-lt-bracket-2.stderr
index e51dd57f9c..6db9a4a0f1 100644
--- a/src/test/ui/parser/pat-lt-bracket-2.stderr
+++ b/src/test/ui/parser/pat-lt-bracket-2.stderr
@@ -5,6 +5,10 @@ LL | fn a(B<) {}
    |       ^ expected one of `:`, `@`, or `|`
    |
    = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a `self` type, give it a parameter name
+   |
+LL | fn a(self: B<) {}
+   |      ^^^^^^^
 help: if this is a type, explicitly ignore the parameter name
    |
 LL | fn a(_: B<) {}
diff --git a/src/test/ui/parser/pub-method-macro.rs b/src/test/ui/parser/pub-method-macro.rs
index f04af1a0d6..0183bdcf62 100644
--- a/src/test/ui/parser/pub-method-macro.rs
+++ b/src/test/ui/parser/pub-method-macro.rs
@@ -15,7 +15,8 @@ mod bleh {
 
     impl S {
         pub defn!(f); //~ ERROR can't qualify macro invocation with `pub`
-        //~^ HELP try adjusting the macro to put `pub` inside the invocation
+        //~^ HELP remove the visibility
+        //~| HELP try adjusting the macro to put `pub` inside the invocation
     }
 }
 
diff --git a/src/test/ui/parser/pub-method-macro.stderr b/src/test/ui/parser/pub-method-macro.stderr
index 7b0fe49346..7c7a909267 100644
--- a/src/test/ui/parser/pub-method-macro.stderr
+++ b/src/test/ui/parser/pub-method-macro.stderr
@@ -2,7 +2,7 @@ error: can't qualify macro invocation with `pub`
   --> $DIR/pub-method-macro.rs:17:9
    |
 LL |         pub defn!(f);
-   |         ^^^
+   |         ^^^ help: remove the visibility
    |
    = help: try adjusting the macro to put `pub` inside the invocation
 
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.fixed b/src/test/ui/parser/qualified-path-in-turbofish.fixed
new file mode 100644
index 0000000000..404d2f7762
--- /dev/null
+++ b/src/test/ui/parser/qualified-path-in-turbofish.fixed
@@ -0,0 +1,19 @@
+// run-rustfix
+trait T {
+    type Ty;
+}
+
+struct Impl;
+
+impl T for Impl {
+    type Ty = u32;
+}
+
+fn template<T>() -> i64 {
+    3
+}
+
+fn main() {
+    template::<<Impl as T>::Ty>();
+    //~^ ERROR found single colon before projection in qualified path
+}
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.rs b/src/test/ui/parser/qualified-path-in-turbofish.rs
new file mode 100644
index 0000000000..2f4b2ed348
--- /dev/null
+++ b/src/test/ui/parser/qualified-path-in-turbofish.rs
@@ -0,0 +1,19 @@
+// run-rustfix
+trait T {
+    type Ty;
+}
+
+struct Impl;
+
+impl T for Impl {
+    type Ty = u32;
+}
+
+fn template<T>() -> i64 {
+    3
+}
+
+fn main() {
+    template::<<Impl as T>:Ty>();
+    //~^ ERROR found single colon before projection in qualified path
+}
diff --git a/src/test/ui/parser/qualified-path-in-turbofish.stderr b/src/test/ui/parser/qualified-path-in-turbofish.stderr
new file mode 100644
index 0000000000..8857d2ef30
--- /dev/null
+++ b/src/test/ui/parser/qualified-path-in-turbofish.stderr
@@ -0,0 +1,8 @@
+error: found single colon before projection in qualified path
+  --> $DIR/qualified-path-in-turbofish.rs:17:27
+   |
+LL |     template::<<Impl as T>:Ty>();
+   |                           ^ help: use double colon: `::`
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/parser/raw-byte-string-eof.stderr b/src/test/ui/parser/raw-byte-string-eof.stderr
index 65fa89f2a8..d5f22e2a1a 100644
--- a/src/test/ui/parser/raw-byte-string-eof.stderr
+++ b/src/test/ui/parser/raw-byte-string-eof.stderr
@@ -1,4 +1,4 @@
-error: unterminated raw string
+error[E0748]: unterminated raw string
   --> $DIR/raw-byte-string-eof.rs:2:5
    |
 LL |     br##"a"#;
@@ -8,3 +8,4 @@ LL |     br##"a"#;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0748`.
diff --git a/src/test/ui/parser/raw-str-unterminated.stderr b/src/test/ui/parser/raw-str-unterminated.stderr
index 67792eb91e..077f763f15 100644
--- a/src/test/ui/parser/raw-str-unterminated.stderr
+++ b/src/test/ui/parser/raw-str-unterminated.stderr
@@ -1,4 +1,4 @@
-error: unterminated raw string
+error[E0748]: unterminated raw string
   --> $DIR/raw-str-unterminated.rs:2:5
    |
 LL |     r#" string literal goes on
@@ -8,3 +8,4 @@ LL |     r#" string literal goes on
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0748`.
diff --git a/src/test/ui/parser/raw/raw_string.stderr b/src/test/ui/parser/raw/raw_string.stderr
index 5572511881..0f1d7e4651 100644
--- a/src/test/ui/parser/raw/raw_string.stderr
+++ b/src/test/ui/parser/raw/raw_string.stderr
@@ -1,4 +1,4 @@
-error: unterminated raw string
+error[E0748]: unterminated raw string
   --> $DIR/raw_string.rs:2:13
    |
 LL |     let x = r##"lol"#;
@@ -8,3 +8,4 @@ LL |     let x = r##"lol"#;
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0748`.
diff --git a/src/test/ui/parser/recover-from-bad-variant.stderr b/src/test/ui/parser/recover-from-bad-variant.stderr
index 375e2d5454..0272326c7b 100644
--- a/src/test/ui/parser/recover-from-bad-variant.stderr
+++ b/src/test/ui/parser/recover-from-bad-variant.stderr
@@ -7,7 +7,7 @@ LL |     let x = Enum::Foo(a: 3, b: 4);
    |                        tried to parse a type due to this type ascription
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error[E0532]: expected tuple struct or tuple variant, found struct variant `Enum::Foo`
   --> $DIR/recover-from-bad-variant.rs:10:9
diff --git a/src/test/ui/parser/recover-range-pats.stderr b/src/test/ui/parser/recover-range-pats.stderr
index f43f9bf301..0d4db74f9f 100644
--- a/src/test/ui/parser/recover-range-pats.stderr
+++ b/src/test/ui/parser/recover-range-pats.stderr
@@ -166,6 +166,8 @@ LL |             let ...$e;
 ...
 LL |     mac!(0);
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0586]: inclusive range with no end
   --> $DIR/recover-range-pats.rs:141:19
@@ -177,6 +179,7 @@ LL |     mac!(0);
    |     -------- in this macro invocation
    |
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0586]: inclusive range with no end
   --> $DIR/recover-range-pats.rs:142:19
@@ -188,6 +191,7 @@ LL |     mac!(0);
    |     -------- in this macro invocation
    |
    = note: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `...` range patterns are deprecated
   --> $DIR/recover-range-pats.rs:42:13
@@ -195,7 +199,7 @@ error: `...` range patterns are deprecated
 LL |     if let 0...3 = 0 {}
    |             ^^^ help: use `..=` for an inclusive range
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/recover-range-pats.rs:8:9
    |
 LL | #![deny(ellipsis_inclusive_range_patterns)]
@@ -251,6 +255,8 @@ LL |             let $e1...$e2;
 ...
 LL |     mac2!(0, 1);
    |     ------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0029]: only char and numeric types are allowed in range patterns
   --> $DIR/recover-range-pats.rs:20:12
diff --git a/src/test/ui/parser/recovery-attr-on-if.rs b/src/test/ui/parser/recovery-attr-on-if.rs
deleted file mode 100644
index 0d1f5be7b4..0000000000
--- a/src/test/ui/parser/recovery-attr-on-if.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-fn main() {
-    #[attr] if true {};
-    //~^ ERROR cannot find attribute
-    //~| ERROR attributes are not yet allowed on `if` expressions
-    #[attr] if true {};
-    //~^ ERROR cannot find attribute
-    //~| ERROR attributes are not yet allowed on `if` expressions
-    let _recovery_witness: () = 0; //~ ERROR mismatched types
-}
diff --git a/src/test/ui/parser/recovery-attr-on-if.stderr b/src/test/ui/parser/recovery-attr-on-if.stderr
deleted file mode 100644
index a02846827c..0000000000
--- a/src/test/ui/parser/recovery-attr-on-if.stderr
+++ /dev/null
@@ -1,35 +0,0 @@
-error: attributes are not yet allowed on `if` expressions
-  --> $DIR/recovery-attr-on-if.rs:2:5
-   |
-LL |     #[attr] if true {};
-   |     ^^^^^^^
-
-error: attributes are not yet allowed on `if` expressions
-  --> $DIR/recovery-attr-on-if.rs:5:5
-   |
-LL |     #[attr] if true {};
-   |     ^^^^^^^
-
-error: cannot find attribute `attr` in this scope
-  --> $DIR/recovery-attr-on-if.rs:5:7
-   |
-LL |     #[attr] if true {};
-   |       ^^^^
-
-error: cannot find attribute `attr` in this scope
-  --> $DIR/recovery-attr-on-if.rs:2:7
-   |
-LL |     #[attr] if true {};
-   |       ^^^^
-
-error[E0308]: mismatched types
-  --> $DIR/recovery-attr-on-if.rs:8:33
-   |
-LL |     let _recovery_witness: () = 0;
-   |                            --   ^ expected `()`, found integer
-   |                            |
-   |                            expected due to this
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/parser/removed-syntax-extern-const.rs b/src/test/ui/parser/removed-syntax-extern-const.rs
deleted file mode 100644
index 71c22e62f8..0000000000
--- a/src/test/ui/parser/removed-syntax-extern-const.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-extern {
-    const i: isize;
-    //~^ ERROR extern items cannot be `const`
-}
-
-fn main() {}
diff --git a/src/test/ui/parser/removed-syntax-extern-const.stderr b/src/test/ui/parser/removed-syntax-extern-const.stderr
deleted file mode 100644
index 2bccbd9145..0000000000
--- a/src/test/ui/parser/removed-syntax-extern-const.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: extern items cannot be `const`
-  --> $DIR/removed-syntax-extern-const.rs:2:5
-   |
-LL |     const i: isize;
-   |     ^^^^^ help: try using a static value: `static`
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/parser/removed-syntax-static-fn.rs b/src/test/ui/parser/removed-syntax-static-fn.rs
index 0caddb9855..cd643b874d 100644
--- a/src/test/ui/parser/removed-syntax-static-fn.rs
+++ b/src/test/ui/parser/removed-syntax-static-fn.rs
@@ -2,7 +2,9 @@ struct S;
 
 impl S {
     static fn f() {}
-    //~^ ERROR expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`,
+    //~^ ERROR expected identifier, found keyword `fn`
+    //~| ERROR expected one of `:`, `;`, or `=`
+    //~| ERROR missing type for `static` item
 }
 
 fn main() {}
diff --git a/src/test/ui/parser/removed-syntax-static-fn.stderr b/src/test/ui/parser/removed-syntax-static-fn.stderr
index dfadefee23..04e34dc16a 100644
--- a/src/test/ui/parser/removed-syntax-static-fn.stderr
+++ b/src/test/ui/parser/removed-syntax-static-fn.stderr
@@ -1,10 +1,25 @@
-error: expected one of `async`, `const`, `crate`, `default`, `extern`, `fn`, `pub`, `type`, `unsafe`, or `}`, found keyword `static`
-  --> $DIR/removed-syntax-static-fn.rs:4:5
+error: expected identifier, found keyword `fn`
+  --> $DIR/removed-syntax-static-fn.rs:4:12
+   |
+LL |     static fn f() {}
+   |            ^^ expected identifier, found keyword
+
+error: expected one of `:`, `;`, or `=`, found `f`
+  --> $DIR/removed-syntax-static-fn.rs:4:15
    |
 LL | impl S {
-   |         - expected one of 10 possible tokens
+   |        - while parsing this item list starting here
+LL |     static fn f() {}
+   |               ^ expected one of `:`, `;`, or `=`
+...
+LL | }
+   | - the item list ends here
+
+error: missing type for `static` item
+  --> $DIR/removed-syntax-static-fn.rs:4:12
+   |
 LL |     static fn f() {}
-   |     ^^^^^^ unexpected token
+   |            ^^ help: provide a type for the item: `r#fn: <type>`
 
-error: aborting due to previous error
+error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/parser/removed-syntax-with-1.stderr b/src/test/ui/parser/removed-syntax-with-1.stderr
index 193138d746..c3f747b61b 100644
--- a/src/test/ui/parser/removed-syntax-with-1.stderr
+++ b/src/test/ui/parser/removed-syntax-with-1.stderr
@@ -2,8 +2,9 @@ error: expected one of `,`, `.`, `?`, `}`, or an operator, found `with`
   --> $DIR/removed-syntax-with-1.rs:8:25
    |
 LL |     let b = S { foo: () with a, bar: () };
-   |             -           ^^^^ expected one of `,`, `.`, `?`, `}`, or an operator
-   |             |
+   |             -          -^^^^ expected one of `,`, `.`, `?`, `}`, or an operator
+   |             |          |
+   |             |          help: try adding a comma: `,`
    |             while parsing this struct
 
 error: aborting due to previous error
diff --git a/src/test/ui/parser/self-in-function-arg.stderr b/src/test/ui/parser/self-in-function-arg.stderr
index f58df9b9e7..47d8381b0b 100644
--- a/src/test/ui/parser/self-in-function-arg.stderr
+++ b/src/test/ui/parser/self-in-function-arg.stderr
@@ -2,9 +2,7 @@ error: unexpected `self` parameter in function
   --> $DIR/self-in-function-arg.rs:1:15
    |
 LL | fn foo(x:i32, self: i32) -> i32 { self }
-   |               ^^^^ not valid as function parameter
-   |
-   = note: `self` is only valid as the first parameter of an associated function
+   |               ^^^^ must be the first parameter of an associated function
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/parser/self-param-semantic-fail.rs b/src/test/ui/parser/self-param-semantic-fail.rs
new file mode 100644
index 0000000000..5676971b01
--- /dev/null
+++ b/src/test/ui/parser/self-param-semantic-fail.rs
@@ -0,0 +1,64 @@
+// This test ensures that `self` is semantically rejected
+// in contexts with `FnDecl` but outside of associated `fn`s.
+// FIXME(Centril): For now closures are an exception.
+
+fn main() {}
+
+fn free() {
+    fn f1(self) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f2(mut self) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f3(&self) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f4(&mut self) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f5<'a>(&'a self) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f6<'a>(&'a mut self) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f7(self: u8) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f8(mut self: u8) {}
+    //~^ ERROR `self` parameter is only allowed in associated functions
+}
+
+extern {
+    fn f1(self);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f2(mut self);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    //~| ERROR patterns aren't allowed in
+    fn f3(&self);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f4(&mut self);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f5<'a>(&'a self);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f6<'a>(&'a mut self);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f7(self: u8);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    fn f8(mut self: u8);
+    //~^ ERROR `self` parameter is only allowed in associated functions
+    //~| ERROR patterns aren't allowed in
+}
+
+type X1 = fn(self);
+//~^ ERROR `self` parameter is only allowed in associated functions
+type X2 = fn(mut self);
+//~^ ERROR `self` parameter is only allowed in associated functions
+//~| ERROR patterns aren't allowed in
+type X3 = fn(&self);
+//~^ ERROR `self` parameter is only allowed in associated functions
+type X4 = fn(&mut self);
+//~^ ERROR `self` parameter is only allowed in associated functions
+type X5 = for<'a> fn(&'a self);
+//~^ ERROR `self` parameter is only allowed in associated functions
+type X6 = for<'a> fn(&'a mut self);
+//~^ ERROR `self` parameter is only allowed in associated functions
+type X7 = fn(self: u8);
+//~^ ERROR `self` parameter is only allowed in associated functions
+type X8 = fn(mut self: u8);
+//~^ ERROR `self` parameter is only allowed in associated functions
+//~| ERROR patterns aren't allowed in
diff --git a/src/test/ui/parser/self-param-semantic-fail.stderr b/src/test/ui/parser/self-param-semantic-fail.stderr
new file mode 100644
index 0000000000..e5d6797736
--- /dev/null
+++ b/src/test/ui/parser/self-param-semantic-fail.stderr
@@ -0,0 +1,220 @@
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:8:11
+   |
+LL |     fn f1(self) {}
+   |           ^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:10:11
+   |
+LL |     fn f2(mut self) {}
+   |           ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:12:11
+   |
+LL |     fn f3(&self) {}
+   |           ^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:14:11
+   |
+LL |     fn f4(&mut self) {}
+   |           ^^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:16:15
+   |
+LL |     fn f5<'a>(&'a self) {}
+   |               ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:18:15
+   |
+LL |     fn f6<'a>(&'a mut self) {}
+   |               ^^^^^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:20:11
+   |
+LL |     fn f7(self: u8) {}
+   |           ^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:22:11
+   |
+LL |     fn f8(mut self: u8) {}
+   |           ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:27:11
+   |
+LL |     fn f1(self);
+   |           ^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:29:11
+   |
+LL |     fn f2(mut self);
+   |           ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error[E0130]: patterns aren't allowed in foreign function declarations
+  --> $DIR/self-param-semantic-fail.rs:29:11
+   |
+LL |     fn f2(mut self);
+   |           ^^^^^^^^ pattern not allowed in foreign function
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:32:11
+   |
+LL |     fn f3(&self);
+   |           ^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:34:11
+   |
+LL |     fn f4(&mut self);
+   |           ^^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:36:15
+   |
+LL |     fn f5<'a>(&'a self);
+   |               ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:38:15
+   |
+LL |     fn f6<'a>(&'a mut self);
+   |               ^^^^^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:40:11
+   |
+LL |     fn f7(self: u8);
+   |           ^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:42:11
+   |
+LL |     fn f8(mut self: u8);
+   |           ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error[E0130]: patterns aren't allowed in foreign function declarations
+  --> $DIR/self-param-semantic-fail.rs:42:11
+   |
+LL |     fn f8(mut self: u8);
+   |           ^^^^^^^^ pattern not allowed in foreign function
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:47:14
+   |
+LL | type X1 = fn(self);
+   |              ^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:49:14
+   |
+LL | type X2 = fn(mut self);
+   |              ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error[E0561]: patterns aren't allowed in function pointer types
+  --> $DIR/self-param-semantic-fail.rs:49:14
+   |
+LL | type X2 = fn(mut self);
+   |              ^^^^^^^^
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:52:14
+   |
+LL | type X3 = fn(&self);
+   |              ^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:54:14
+   |
+LL | type X4 = fn(&mut self);
+   |              ^^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:56:22
+   |
+LL | type X5 = for<'a> fn(&'a self);
+   |                      ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:58:22
+   |
+LL | type X6 = for<'a> fn(&'a mut self);
+   |                      ^^^^^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:60:14
+   |
+LL | type X7 = fn(self: u8);
+   |              ^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error: `self` parameter is only allowed in associated functions
+  --> $DIR/self-param-semantic-fail.rs:62:14
+   |
+LL | type X8 = fn(mut self: u8);
+   |              ^^^^^^^^ not semantically valid as function parameter
+   |
+   = note: associated functions are those in `impl` or `trait` definitions
+
+error[E0561]: patterns aren't allowed in function pointer types
+  --> $DIR/self-param-semantic-fail.rs:62:14
+   |
+LL | type X8 = fn(mut self: u8);
+   |              ^^^^^^^^
+
+error: aborting due to 28 previous errors
+
+Some errors have detailed explanations: E0130, E0561.
+For more information about an error, try `rustc --explain E0130`.
diff --git a/src/test/ui/parser/self-param-syntactic-pass.rs b/src/test/ui/parser/self-param-syntactic-pass.rs
new file mode 100644
index 0000000000..9e215e6cdd
--- /dev/null
+++ b/src/test/ui/parser/self-param-syntactic-pass.rs
@@ -0,0 +1,66 @@
+// This test ensures that `self` is syntactically accepted in all places an `FnDecl` is parsed.
+// FIXME(Centril): For now closures are an exception.
+
+// check-pass
+
+fn main() {}
+
+#[cfg(FALSE)]
+fn free() {
+    fn f(self) {}
+    fn f(mut self) {}
+    fn f(&self) {}
+    fn f(&mut self) {}
+    fn f(&'a self) {}
+    fn f(&'a mut self) {}
+    fn f(self: u8) {}
+    fn f(mut self: u8) {}
+}
+
+#[cfg(FALSE)]
+extern {
+    fn f(self);
+    fn f(mut self);
+    fn f(&self);
+    fn f(&mut self);
+    fn f(&'a self);
+    fn f(&'a mut self);
+    fn f(self: u8);
+    fn f(mut self: u8);
+}
+
+#[cfg(FALSE)]
+trait X {
+    fn f(self) {}
+    fn f(mut self) {}
+    fn f(&self) {}
+    fn f(&mut self) {}
+    fn f(&'a self) {}
+    fn f(&'a mut self) {}
+    fn f(self: u8) {}
+    fn f(mut self: u8) {}
+}
+
+#[cfg(FALSE)]
+impl X for Y {
+    fn f(self) {}
+    fn f(mut self) {}
+    fn f(&self) {}
+    fn f(&mut self) {}
+    fn f(&'a self) {}
+    fn f(&'a mut self) {}
+    fn f(self: u8) {}
+    fn f(mut self: u8) {}
+}
+
+#[cfg(FALSE)]
+impl X for Y {
+    type X = fn(self);
+    type X = fn(mut self);
+    type X = fn(&self);
+    type X = fn(&mut self);
+    type X = fn(&'a self);
+    type X = fn(&'a mut self);
+    type X = fn(self: u8);
+    type X = fn(mut self: u8);
+}
diff --git a/src/test/ui/parser/tag-variant-disr-non-nullary.stderr b/src/test/ui/parser/tag-variant-disr-non-nullary.stderr
index 70acc70e09..79f044a067 100644
--- a/src/test/ui/parser/tag-variant-disr-non-nullary.stderr
+++ b/src/test/ui/parser/tag-variant-disr-non-nullary.stderr
@@ -17,7 +17,7 @@ LL |     Other(usize),
 LL |     Other2(usize, usize),
    |     -------------------- tuple variant defined here
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/60553
+   = note: see issue #60553 <https://github.com/rust-lang/rust/issues/60553> for more information
    = help: add `#![feature(arbitrary_enum_discriminant)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr b/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
index 54111df342..6bb946d5b6 100644
--- a/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
+++ b/src/test/ui/parser/trait-item-with-defaultness-fail-semantic.stderr
@@ -2,37 +2,49 @@ error: `default` is only allowed on items in `impl` definitions
   --> $DIR/trait-item-with-defaultness-fail-semantic.rs:6:5
    |
 LL |     default const A: u8;
-   |     ^^^^^^^^^^^^^^^^^^^^
+   |     -------^^^^^^^^^^^^^
+   |     |
+   |     `default` because of this
 
 error: `default` is only allowed on items in `impl` definitions
   --> $DIR/trait-item-with-defaultness-fail-semantic.rs:7:5
    |
 LL |     default const B: u8 = 0;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^
+   |     -------^^^^^^^^^^^^^^^^^
+   |     |
+   |     `default` because of this
 
 error: `default` is only allowed on items in `impl` definitions
   --> $DIR/trait-item-with-defaultness-fail-semantic.rs:8:5
    |
 LL |     default type D;
-   |     ^^^^^^^^^^^^^^^
+   |     -------^^^^^^^^
+   |     |
+   |     `default` because of this
 
 error: `default` is only allowed on items in `impl` definitions
   --> $DIR/trait-item-with-defaultness-fail-semantic.rs:9:5
    |
 LL |     default type C: Ord;
-   |     ^^^^^^^^^^^^^^^^^^^^
+   |     -------^^^^^^^^^^^^^
+   |     |
+   |     `default` because of this
 
 error: `default` is only allowed on items in `impl` definitions
   --> $DIR/trait-item-with-defaultness-fail-semantic.rs:10:5
    |
 LL |     default fn f1();
-   |     ^^^^^^^^^^^^^^^^
+   |     -------^^^^^^^^^
+   |     |
+   |     `default` because of this
 
 error: `default` is only allowed on items in `impl` definitions
   --> $DIR/trait-item-with-defaultness-fail-semantic.rs:11:5
    |
 LL |     default fn f2() {}
-   |     ^^^^^^^^^^^^^^^^^^
+   |     -------^^^^^^^^
+   |     |
+   |     `default` because of this
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/parser/type-parameters-in-field-exprs.rs b/src/test/ui/parser/type-parameters-in-field-exprs.rs
index 6a3b2c1c60..4cd77ebbd8 100644
--- a/src/test/ui/parser/type-parameters-in-field-exprs.rs
+++ b/src/test/ui/parser/type-parameters-in-field-exprs.rs
@@ -9,9 +9,9 @@ fn main() {
         y: 2,
     };
     f.x::<isize>;
-    //~^ ERROR field expressions may not have generic arguments
+    //~^ ERROR field expressions cannot have generic arguments
     f.x::<>;
-    //~^ ERROR field expressions may not have generic arguments
+    //~^ ERROR field expressions cannot have generic arguments
     f.x::();
-    //~^ ERROR field expressions may not have generic arguments
+    //~^ ERROR field expressions cannot have generic arguments
 }
diff --git a/src/test/ui/parser/type-parameters-in-field-exprs.stderr b/src/test/ui/parser/type-parameters-in-field-exprs.stderr
index 306b4754d0..ce7364d353 100644
--- a/src/test/ui/parser/type-parameters-in-field-exprs.stderr
+++ b/src/test/ui/parser/type-parameters-in-field-exprs.stderr
@@ -1,16 +1,16 @@
-error: field expressions may not have generic arguments
+error: field expressions cannot have generic arguments
   --> $DIR/type-parameters-in-field-exprs.rs:11:10
    |
 LL |     f.x::<isize>;
    |          ^^^^^^^
 
-error: field expressions may not have generic arguments
+error: field expressions cannot have generic arguments
   --> $DIR/type-parameters-in-field-exprs.rs:13:10
    |
 LL |     f.x::<>;
    |          ^^
 
-error: field expressions may not have generic arguments
+error: field expressions cannot have generic arguments
   --> $DIR/type-parameters-in-field-exprs.rs:15:7
    |
 LL |     f.x::();
diff --git a/src/test/ui/parser/underscore-suffix-for-string.stderr b/src/test/ui/parser/underscore-suffix-for-string.stderr
index 80d0d1bc83..0a325ae907 100644
--- a/src/test/ui/parser/underscore-suffix-for-string.stderr
+++ b/src/test/ui/parser/underscore-suffix-for-string.stderr
@@ -5,5 +5,5 @@ LL |     let _ = "Foo"_;
    |                  ^
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-   = note: for more information, see issue #42326 <https://github.com/rust-lang/rust/issues/42326>
+   = note: see issue #42326 <https://github.com/rust-lang/rust/issues/42326> for more information
 
diff --git a/src/test/ui/parser/underscore_item_not_const.rs b/src/test/ui/parser/underscore_item_not_const.rs
index 7b0d128f06..c01ac4752e 100644
--- a/src/test/ui/parser/underscore_item_not_const.rs
+++ b/src/test/ui/parser/underscore_item_not_const.rs
@@ -1,18 +1,4 @@
-// Test that various non-const items and associated consts do not permit `_` as a name.
-
-// Associated `const`s:
-
-pub trait A {
-    const _: () = (); //~ ERROR expected identifier, found reserved identifier `_`
-}
-impl A for () {
-    const _: () = (); //~ ERROR expected identifier, found reserved identifier `_`
-}
-impl dyn A {
-    const _: () = (); //~ ERROR expected identifier, found reserved identifier `_`
-}
-
-// Other kinds of items:
+// Test that various non-const items do not syntactically permit `_` as a name.
 
 static _: () = (); //~ ERROR expected identifier, found reserved identifier `_`
 struct _(); //~ ERROR expected identifier, found reserved identifier `_`
diff --git a/src/test/ui/parser/underscore_item_not_const.stderr b/src/test/ui/parser/underscore_item_not_const.stderr
index ebf1ff9ff1..0bc7642dd1 100644
--- a/src/test/ui/parser/underscore_item_not_const.stderr
+++ b/src/test/ui/parser/underscore_item_not_const.stderr
@@ -1,92 +1,74 @@
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:6:11
-   |
-LL |     const _: () = ();
-   |           ^ expected identifier, found reserved identifier
-
-error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:9:11
-   |
-LL |     const _: () = ();
-   |           ^ expected identifier, found reserved identifier
-
-error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:12:11
-   |
-LL |     const _: () = ();
-   |           ^ expected identifier, found reserved identifier
-
-error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:17:8
+  --> $DIR/underscore_item_not_const.rs:3:8
    |
 LL | static _: () = ();
    |        ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:18:8
+  --> $DIR/underscore_item_not_const.rs:4:8
    |
 LL | struct _();
    |        ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:19:6
+  --> $DIR/underscore_item_not_const.rs:5:6
    |
 LL | enum _ {}
    |      ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:20:4
+  --> $DIR/underscore_item_not_const.rs:6:4
    |
 LL | fn _() {}
    |    ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:21:5
+  --> $DIR/underscore_item_not_const.rs:7:5
    |
 LL | mod _ {}
    |     ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:22:6
+  --> $DIR/underscore_item_not_const.rs:8:6
    |
 LL | type _ = ();
    |      ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:23:5
+  --> $DIR/underscore_item_not_const.rs:9:5
    |
 LL | use _;
    |     ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:24:5
+  --> $DIR/underscore_item_not_const.rs:10:5
    |
 LL | use _ as g;
    |     ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:25:7
+  --> $DIR/underscore_item_not_const.rs:11:7
    |
 LL | trait _ {}
    |       ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:26:7
+  --> $DIR/underscore_item_not_const.rs:12:7
    |
 LL | trait _ = Copy;
    |       ^ expected identifier, found reserved identifier
 
 error: expected identifier, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:27:14
+  --> $DIR/underscore_item_not_const.rs:13:14
    |
 LL | macro_rules! _ { () => {} }
    |              ^ expected identifier, found reserved identifier
 
 error: expected one of `!` or `::`, found reserved identifier `_`
-  --> $DIR/underscore_item_not_const.rs:28:7
+  --> $DIR/underscore_item_not_const.rs:14:7
    |
 LL | union _ { f: u8 }
    |       ^ expected one of `!` or `::`
 
-error: aborting due to 15 previous errors
+error: aborting due to 12 previous errors
 
diff --git a/src/test/ui/path-lookahead.stderr b/src/test/ui/path-lookahead.stderr
index caf9e8303e..62b3b507e1 100644
--- a/src/test/ui/path-lookahead.stderr
+++ b/src/test/ui/path-lookahead.stderr
@@ -4,7 +4,7 @@ warning: unnecessary parentheses around `return` value
 LL |   return (<T as ToString>::to_string(&arg));
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove these parentheses
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/path-lookahead.rs:3:9
    |
 LL | #![warn(unused_parens)]
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs b/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs
index 75d7af58e7..c00296c34c 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs
+++ b/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.rs
@@ -3,33 +3,38 @@
 // where one side is by-ref and the other is by-move.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
-struct X { x: () }
+struct X {
+    x: (),
+}
 
 fn main() {
     let x = Some(X { x: () });
     match x {
-        Some(ref _y @ _z) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => panic!()
+        Some(ref _y @ _z) => {} //~ ERROR cannot move out of value because it is borrowed
+        None => panic!(),
     }
 
     let x = Some(X { x: () });
     match x {
-        Some(_z @ ref _y) => { }, //~ ERROR cannot bind by-move with sub-bindings
+        Some(_z @ ref _y) => {}
         //~^ ERROR borrow of moved value
-        None => panic!()
+        //~| ERROR borrow of moved value
+        None => panic!(),
     }
 
     let mut x = Some(X { x: () });
     match x {
-        Some(ref mut _y @ _z) => { }, //~ ERROR cannot bind by-move and by-ref in the same pattern
-        None => panic!()
+        Some(ref mut _y @ _z) => {} //~ ERROR cannot move out of value because it is borrowed
+        None => panic!(),
     }
 
     let mut x = Some(X { x: () });
     match x {
-        Some(_z @ ref mut _y) => { }, //~ ERROR cannot bind by-move with sub-bindings
+        Some(_z @ ref mut _y) => {}
         //~^ ERROR borrow of moved value
-        None => panic!()
+        //~| ERROR borrow of moved value
+        None => panic!(),
     }
 }
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr b/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
index 22d62ff4f0..f2186b9298 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
+++ b/src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr
@@ -1,37 +1,45 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:12:23
+error: cannot move out of value because it is borrowed
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:15:14
    |
-LL |         Some(ref _y @ _z) => { },
-   |              ---------^^
+LL |         Some(ref _y @ _z) => {}
+   |              ------^^^--
    |              |        |
-   |              |        by-move pattern here
-   |              by-ref pattern here
+   |              |        value moved into `_z` here
+   |              value borrowed, by `_y`, here
 
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:18:14
+error: borrow of moved value
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:21:14
    |
-LL |         Some(_z @ ref _y) => { },
-   |              ^^^^^^^^^^^ binds an already bound by-move value by moving it
+LL |         Some(_z @ ref _y) => {}
+   |              --^^^------
+   |              |    |
+   |              |    value borrowed here after move
+   |              value moved into `_z` here
+   |              move occurs because `_z` has type `X` which does not implement the `Copy` trait
 
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:25:27
+error: cannot move out of value because it is borrowed
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:29:14
    |
-LL |         Some(ref mut _y @ _z) => { },
-   |              -------------^^
+LL |         Some(ref mut _y @ _z) => {}
+   |              ----------^^^--
    |              |            |
-   |              |            by-move pattern here
-   |              by-ref pattern here
+   |              |            value moved into `_z` here
+   |              value borrowed, by `_y`, here
 
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:31:14
+error: borrow of moved value
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:35:14
    |
-LL |         Some(_z @ ref mut _y) => { },
-   |              ^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
+LL |         Some(_z @ ref mut _y) => {}
+   |              --^^^----------
+   |              |    |
+   |              |    value borrowed here after move
+   |              value moved into `_z` here
+   |              move occurs because `_z` has type `X` which does not implement the `Copy` trait
 
 error[E0382]: borrow of moved value
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:18:19
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:21:19
    |
-LL |         Some(_z @ ref _y) => { },
+LL |         Some(_z @ ref _y) => {}
    |              -----^^^^^^
    |              |    |
    |              |    value borrowed here after move
@@ -40,9 +48,9 @@ LL |         Some(_z @ ref _y) => { },
    = note: move occurs because value has type `X`, which does not implement the `Copy` trait
 
 error[E0382]: borrow of moved value
-  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:31:19
+  --> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:35:19
    |
-LL |         Some(_z @ ref mut _y) => { },
+LL |         Some(_z @ ref mut _y) => {}
    |              -----^^^^^^^^^^
    |              |    |
    |              |    value borrowed here after move
@@ -52,5 +60,4 @@ LL |         Some(_z @ ref mut _y) => { },
 
 error: aborting due to 6 previous errors
 
-Some errors have detailed explanations: E0007, E0009, E0382.
-For more information about an error, try `rustc --explain E0007`.
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs b/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs
index 86fb04e2ed..7a2e5128b8 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs
+++ b/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.rs
@@ -1,14 +1,14 @@
 // See issue #12534.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 fn main() {}
 
 struct A(Box<u8>);
 
 fn f(a @ A(u): A) -> Box<u8> {
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    //~^ ERROR use of moved value
     drop(a);
     u
 }
diff --git a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr b/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr
index b039708fd3..cfd978e132 100644
--- a/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr
+++ b/src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr
@@ -1,11 +1,5 @@
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/bind-by-move-no-subbindings-fun-param.rs:9:6
-   |
-LL | fn f(a @ A(u): A) -> Box<u8> {
-   |      ^^^^^^^^ binds an already bound by-move value by moving it
-
 error[E0382]: use of moved value
-  --> $DIR/bind-by-move-no-subbindings-fun-param.rs:9:12
+  --> $DIR/bind-by-move-no-subbindings-fun-param.rs:10:12
    |
 LL | fn f(a @ A(u): A) -> Box<u8> {
    |      ------^-
@@ -14,7 +8,6 @@ LL | fn f(a @ A(u): A) -> Box<u8> {
    |      value moved here
    |      move occurs because value has type `A`, which does not implement the `Copy` trait
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors have detailed explanations: E0007, E0382.
-For more information about an error, try `rustc --explain E0007`.
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.rs b/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.rs
index 2cd375da9a..10865b9239 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.rs
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.rs
@@ -1,46 +1,34 @@
 // Test that moving on both sides of an `@` pattern is not allowed.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 fn main() {
     struct U; // Not copy!
 
     // Prevent promotion:
-    fn u() -> U { U }
+    fn u() -> U {
+        U
+    }
 
-    let a @ b = U;
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    let a @ b = U; //~ ERROR use of moved value
 
-    let a @ (b, c) = (U, U);
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    let a @ (b, c) = (U, U); //~ ERROR use of moved value
 
-    let a @ (b, c) = (u(), u());
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    let a @ (b, c) = (u(), u()); //~ ERROR use of moved value
 
     match Ok(U) {
-        a @ Ok(b) | a @ Err(b) => {}
-        //~^ ERROR cannot bind by-move with sub-bindings
-        //~| ERROR use of moved value
-        //~| ERROR cannot bind by-move with sub-bindings
-        //~| ERROR use of moved value
+        a @ Ok(b) | a @ Err(b) => {} //~ ERROR use of moved value
+                                     //~^ ERROR use of moved value
     }
 
-    fn fun(a @ b: U) {}
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    fn fun(a @ b: U) {} //~ ERROR use of moved value
 
     match [u(), u(), u(), u()] {
-        xs @ [a, .., b] => {}
-        //~^ ERROR cannot bind by-move with sub-bindings
-        //~| ERROR use of moved value
+        xs @ [a, .., b] => {} //~ ERROR use of moved value
     }
 
     match [u(), u(), u(), u()] {
-        xs @ [_, ys @ .., _] => {}
-        //~^ ERROR cannot bind by-move with sub-bindings
-        //~| ERROR use of moved value
+        xs @ [_, ys @ .., _] => {} //~ ERROR use of moved value
     }
 }
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr
index 12ebcb72af..56613ee761 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr
@@ -1,53 +1,5 @@
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:11:9
-   |
-LL |     let a @ b = U;
-   |         ^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:15:9
-   |
-LL |     let a @ (b, c) = (U, U);
-   |         ^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:19:9
-   |
-LL |     let a @ (b, c) = (u(), u());
-   |         ^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:24:9
-   |
-LL |         a @ Ok(b) | a @ Err(b) => {}
-   |         ^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:24:21
-   |
-LL |         a @ Ok(b) | a @ Err(b) => {}
-   |                     ^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:36:9
-   |
-LL |         xs @ [a, .., b] => {}
-   |         ^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:42:9
-   |
-LL |         xs @ [_, ys @ .., _] => {}
-   |         ^^^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-move-and-move.rs:31:12
-   |
-LL |     fn fun(a @ b: U) {}
-   |            ^^^^^ binds an already bound by-move value by moving it
-
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:11:13
+  --> $DIR/borrowck-move-and-move.rs:14:13
    |
 LL |     let a @ b = U;
    |         ----^   - move occurs because value has type `main::U`, which does not implement the `Copy` trait
@@ -56,7 +8,7 @@ LL |     let a @ b = U;
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:15:17
+  --> $DIR/borrowck-move-and-move.rs:16:17
    |
 LL |     let a @ (b, c) = (U, U);
    |         --------^-   ------ move occurs because value has type `(main::U, main::U)`, which does not implement the `Copy` trait
@@ -65,7 +17,7 @@ LL |     let a @ (b, c) = (U, U);
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:19:17
+  --> $DIR/borrowck-move-and-move.rs:18:17
    |
 LL |     let a @ (b, c) = (u(), u());
    |         --------^-   ---------- move occurs because value has type `(main::U, main::U)`, which does not implement the `Copy` trait
@@ -74,7 +26,7 @@ LL |     let a @ (b, c) = (u(), u());
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:24:16
+  --> $DIR/borrowck-move-and-move.rs:21:16
    |
 LL |     match Ok(U) {
    |           ----- move occurs because value has type `std::result::Result<main::U, main::U>`, which does not implement the `Copy` trait
@@ -85,7 +37,7 @@ LL |         a @ Ok(b) | a @ Err(b) => {}
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:24:29
+  --> $DIR/borrowck-move-and-move.rs:21:29
    |
 LL |     match Ok(U) {
    |           ----- move occurs because value has type `std::result::Result<main::U, main::U>`, which does not implement the `Copy` trait
@@ -96,7 +48,7 @@ LL |         a @ Ok(b) | a @ Err(b) => {}
    |                     value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:36:22
+  --> $DIR/borrowck-move-and-move.rs:28:22
    |
 LL |     match [u(), u(), u(), u()] {
    |           -------------------- move occurs because value has type `[main::U; 4]`, which does not implement the `Copy` trait
@@ -107,7 +59,7 @@ LL |         xs @ [a, .., b] => {}
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:42:18
+  --> $DIR/borrowck-move-and-move.rs:32:18
    |
 LL |     match [u(), u(), u(), u()] {
    |           -------------------- move occurs because value has type `[main::U; 4]`, which does not implement the `Copy` trait
@@ -118,7 +70,7 @@ LL |         xs @ [_, ys @ .., _] => {}
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-move-and-move.rs:31:16
+  --> $DIR/borrowck-move-and-move.rs:25:16
    |
 LL |     fn fun(a @ b: U) {}
    |            ----^
@@ -127,7 +79,6 @@ LL |     fn fun(a @ b: U) {}
    |            value moved here
    |            move occurs because value has type `main::U`, which does not implement the `Copy` trait
 
-error: aborting due to 16 previous errors
+error: aborting due to 8 previous errors
 
-Some errors have detailed explanations: E0007, E0382.
-For more information about an error, try `rustc --explain E0007`.
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs
index 092bd1133d..271f4bca0f 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box-pass.rs
@@ -3,6 +3,7 @@
 // Test `@` patterns combined with `box` patterns.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 #![feature(box_patterns)]
 
 #[derive(Copy, Clone)]
@@ -72,4 +73,14 @@ fn main() {
         }
         _ => {}
     }
+
+    match Box::new([Ok(c()), Err(nc()), Ok(c())]) {
+        box [Ok(a), ref xs @ .., Err(b)] => {}
+        _ => {}
+    }
+
+    match [Ok(Box::new(c())), Err(Box::new(nc())), Ok(Box::new(c())), Ok(Box::new(c()))] {
+        [Ok(box ref a), ref xs @ .., Err(box b), Err(box ref mut c)] => {}
+        _ => {}
+    }
 }
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs
index 3b2f598dc0..32c638bcbc 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.rs
@@ -1,61 +1,62 @@
 // Test `@` patterns combined with `box` patterns.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 #![feature(box_patterns)]
 
 #[derive(Copy, Clone)]
 struct C;
 
-fn c() -> C { C }
+fn c() -> C {
+    C
+}
 
 struct NC;
 
-fn nc() -> NC { NC }
+fn nc() -> NC {
+    NC
+}
 
 fn main() {
     let a @ box &b = Box::new(&C);
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    //~^ ERROR use of moved value
 
     let a @ box b = Box::new(C);
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    //~^ ERROR use of moved value
 
     fn f1(a @ box &b: Box<&C>) {}
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    //~^ ERROR use of moved value
 
     fn f2(a @ box b: Box<C>) {}
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    //~^ ERROR use of moved value
 
-    match Box::new(C) { a @ box b => {} }
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    match Box::new(C) {
+        a @ box b => {} //~ ERROR use of moved value
+    }
 
-    let ref a @ box b = Box::new(NC); //~ ERROR cannot bind by-move and by-ref in the same pattern
+    let ref a @ box b = Box::new(NC); //~ ERROR cannot move out of value because it is borrowed
 
     let ref a @ box ref mut b = Box::new(nc());
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     let ref a @ box ref mut b = Box::new(NC);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     let ref a @ box ref mut b = Box::new(NC);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     *b = NC;
     let ref a @ box ref mut b = Box::new(NC);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
     *b = NC;
     drop(a);
 
     let ref mut a @ box ref b = Box::new(NC);
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
     //~| ERROR cannot borrow `_` as immutable because it is also borrowed as mutable
     *a = Box::new(NC);
     drop(b);
 
     fn f5(ref mut a @ box ref b: Box<NC>) {
-        //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+        //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
         //~| ERROR cannot borrow `_` as immutable because it is also borrowed as mutable
         *a = Box::new(NC);
         drop(b);
@@ -63,22 +64,10 @@ fn main() {
 
     match Box::new(nc()) {
         ref mut a @ box ref b => {
-            //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+            //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
             //~| ERROR cannot borrow `_` as immutable because it is also borrowed as mutable
             *a = Box::new(NC);
             drop(b);
         }
     }
-
-    match Box::new([Ok(c()), Err(nc()), Ok(c())]) {
-        box [Ok(a), ref xs @ .., Err(b)] => {}
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern
-        _ => {}
-    }
-
-    match [Ok(Box::new(c())), Err(Box::new(nc())), Ok(Box::new(c())), Ok(Box::new(c()))] {
-        [Ok(box ref a), ref xs @ .., Err(box b), Err(box ref mut c)] => {}
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern
-        _ => {}
-    }
 }
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr
index e96c15b0fa..5534d0a75e 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-at-and-box.stderr
@@ -1,125 +1,77 @@
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-at-and-box.rs:16:9
-   |
-LL |     let a @ box &b = Box::new(&C);
-   |         ^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-at-and-box.rs:20:9
-   |
-LL |     let a @ box b = Box::new(C);
-   |         ^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-at-and-box.rs:32:25
-   |
-LL |     match Box::new(C) { a @ box b => {} }
-   |                         ^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/borrowck-pat-at-and-box.rs:36:21
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-at-and-box.rs:37:9
    |
 LL |     let ref a @ box b = Box::new(NC);
-   |         ------------^
+   |         -----^^^^^^^-
    |         |           |
-   |         |           by-move pattern here
-   |         by-ref pattern here
+   |         |           value moved into `b` here
+   |         value borrowed, by `a`, here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-at-and-box.rs:38:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-at-and-box.rs:39:9
    |
 LL |     let ref a @ box ref mut b = Box::new(nc());
    |         -----^^^^^^^---------
    |         |           |
-   |         |           mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |           mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-at-and-box.rs:40:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-at-and-box.rs:41:9
    |
 LL |     let ref a @ box ref mut b = Box::new(NC);
    |         -----^^^^^^^---------
    |         |           |
-   |         |           mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |           mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-at-and-box.rs:42:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-at-and-box.rs:43:9
    |
 LL |     let ref a @ box ref mut b = Box::new(NC);
    |         -----^^^^^^^---------
    |         |           |
-   |         |           mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |           mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-at-and-box.rs:45:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-at-and-box.rs:46:9
    |
 LL |     let ref a @ box ref mut b = Box::new(NC);
    |         -----^^^^^^^---------
    |         |           |
-   |         |           mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |           mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-at-and-box.rs:51:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-at-and-box.rs:52:9
    |
 LL |     let ref mut a @ box ref b = Box::new(NC);
    |         ---------^^^^^^^-----
    |         |               |
-   |         |               immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |               immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-at-and-box.rs:65:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-at-and-box.rs:66:9
    |
 LL |         ref mut a @ box ref b => {
    |         ---------^^^^^^^-----
    |         |               |
-   |         |               immutable borrow occurs here
-   |         mutable borrow occurs here
-
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/borrowck-pat-at-and-box.rs:74:38
-   |
-LL |         box [Ok(a), ref xs @ .., Err(b)] => {}
-   |                     -----------      ^ by-move pattern here
-   |                     |
-   |                     by-ref pattern here
-
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/borrowck-pat-at-and-box.rs:80:46
-   |
-LL |         [Ok(box ref a), ref xs @ .., Err(box b), Err(box ref mut c)] => {}
-   |                 -----   -----------          ^           --------- by-ref pattern here
-   |                 |       |                    |
-   |                 |       |                    by-move pattern here
-   |                 |       by-ref pattern here
-   |                 by-ref pattern here
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-at-and-box.rs:24:11
-   |
-LL |     fn f1(a @ box &b: Box<&C>) {}
-   |           ^^^^^^^^^^ binds an already bound by-move value by moving it
+   |         |               immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-at-and-box.rs:28:11
-   |
-LL |     fn f2(a @ box b: Box<C>) {}
-   |           ^^^^^^^^^ binds an already bound by-move value by moving it
-
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-at-and-box.rs:57:11
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-at-and-box.rs:58:11
    |
 LL |     fn f5(ref mut a @ box ref b: Box<NC>) {
    |           ---------^^^^^^^-----
    |           |               |
-   |           |               immutable borrow occurs here
-   |           mutable borrow occurs here
+   |           |               immutable borrow, by `b`, occurs here
+   |           mutable borrow, by `a`, occurs here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-pat-at-and-box.rs:16:18
+  --> $DIR/borrowck-pat-at-and-box.rs:21:18
    |
 LL |     let a @ box &b = Box::new(&C);
    |         ---------^   ------------ move occurs because value has type `std::boxed::Box<&C>`, which does not implement the `Copy` trait
@@ -128,7 +80,7 @@ LL |     let a @ box &b = Box::new(&C);
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-pat-at-and-box.rs:20:17
+  --> $DIR/borrowck-pat-at-and-box.rs:24:17
    |
 LL |     let a @ box b = Box::new(C);
    |         --------^   ----------- move occurs because value has type `std::boxed::Box<C>`, which does not implement the `Copy` trait
@@ -137,17 +89,18 @@ LL |     let a @ box b = Box::new(C);
    |         value moved here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-pat-at-and-box.rs:32:33
+  --> $DIR/borrowck-pat-at-and-box.rs:34:17
    |
-LL |     match Box::new(C) { a @ box b => {} }
-   |           -----------   --------^
-   |           |             |       |
-   |           |             |       value used here after move
-   |           |             value moved here
-   |           move occurs because value has type `std::boxed::Box<C>`, which does not implement the `Copy` trait
+LL |     match Box::new(C) {
+   |           ----------- move occurs because value has type `std::boxed::Box<C>`, which does not implement the `Copy` trait
+LL |         a @ box b => {}
+   |         --------^
+   |         |       |
+   |         |       value used here after move
+   |         value moved here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-at-and-box.rs:45:21
+  --> $DIR/borrowck-pat-at-and-box.rs:46:21
    |
 LL |     let ref a @ box ref mut b = Box::new(NC);
    |         ------------^^^^^^^^^
@@ -159,7 +112,7 @@ LL |     drop(a);
    |          - immutable borrow later used here
 
 error[E0502]: cannot borrow `_` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-at-and-box.rs:51:25
+  --> $DIR/borrowck-pat-at-and-box.rs:52:25
    |
 LL |     let ref mut a @ box ref b = Box::new(NC);
    |         ----------------^^^^^
@@ -171,7 +124,7 @@ LL |     *a = Box::new(NC);
    |     -- mutable borrow later used here
 
 error[E0502]: cannot borrow `_` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-at-and-box.rs:65:25
+  --> $DIR/borrowck-pat-at-and-box.rs:66:25
    |
 LL |         ref mut a @ box ref b => {
    |         ----------------^^^^^
@@ -183,7 +136,7 @@ LL |             *a = Box::new(NC);
    |             -- mutable borrow later used here
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-pat-at-and-box.rs:24:20
+  --> $DIR/borrowck-pat-at-and-box.rs:27:20
    |
 LL |     fn f1(a @ box &b: Box<&C>) {}
    |           ---------^
@@ -193,7 +146,7 @@ LL |     fn f1(a @ box &b: Box<&C>) {}
    |           move occurs because value has type `std::boxed::Box<&C>`, which does not implement the `Copy` trait
 
 error[E0382]: use of moved value
-  --> $DIR/borrowck-pat-at-and-box.rs:28:19
+  --> $DIR/borrowck-pat-at-and-box.rs:30:19
    |
 LL |     fn f2(a @ box b: Box<C>) {}
    |           --------^
@@ -203,7 +156,7 @@ LL |     fn f2(a @ box b: Box<C>) {}
    |           move occurs because value has type `std::boxed::Box<C>`, which does not implement the `Copy` trait
 
 error[E0502]: cannot borrow `_` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-at-and-box.rs:57:27
+  --> $DIR/borrowck-pat-at-and-box.rs:58:27
    |
 LL |     fn f5(ref mut a @ box ref b: Box<NC>) {
    |           ----------------^^^^^
@@ -214,7 +167,7 @@ LL |     fn f5(ref mut a @ box ref b: Box<NC>) {
 LL |         *a = Box::new(NC);
    |         -- mutable borrow later used here
 
-error: aborting due to 24 previous errors
+error: aborting due to 17 previous errors
 
-Some errors have detailed explanations: E0007, E0009, E0382, E0502.
-For more information about an error, try `rustc --explain E0007`.
+Some errors have detailed explanations: E0382, E0502.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs
new file mode 100644
index 0000000000..1479791719
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.rs
@@ -0,0 +1,10 @@
+// Test that `by_move_binding @ pat_with_by_ref_bindings` is prevented even with promotion.
+// Currently this logic exists in HAIR match checking as opposed to borrowck.
+
+#![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
+
+fn main() {
+    struct U;
+    let a @ ref b = U; //~ ERROR borrow of moved value
+}
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr
new file mode 100644
index 0000000000..54900e958c
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse-promotion.stderr
@@ -0,0 +1,12 @@
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse-promotion.rs:9:9
+   |
+LL |     let a @ ref b = U;
+   |         -^^^-----
+   |         |   |
+   |         |   value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `main::U` which does not implement the `Copy` trait
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs
new file mode 100644
index 0000000000..7d9618c8df
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.rs
@@ -0,0 +1,98 @@
+// Test that `by_move_binding @ pat_with_by_ref_bindings` is prevented.
+
+#![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
+
+fn main() {
+    struct U;
+
+    // Prevent promotion.
+    fn u() -> U {
+        U
+    }
+
+    fn f1(a @ ref b: U) {}
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+
+    fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR use of moved value
+    fn f3(a @ [ref mut b, ref c]: [U; 2]) {}
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+
+    let a @ ref b = U;
+    //~^ ERROR borrow of moved value
+    let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR use of moved value
+    let a @ [ref mut b, ref c] = [U, U];
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    let a @ ref b = u();
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+    //~| ERROR use of moved value
+    let a @ [ref mut b, ref c] = [u(), u()];
+    //~^ ERROR borrow of moved value
+    //~| ERROR borrow of moved value
+
+    match Some(U) {
+        a @ Some(ref b) => {}
+        //~^ ERROR borrow of moved value
+        None => {}
+    }
+    match Some((U, U)) {
+        a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+        //~^ ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR use of moved value
+        None => {}
+    }
+    match Some([U, U]) {
+        mut a @ Some([ref b, ref mut c]) => {}
+        //~^ ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        None => {}
+    }
+    match Some(u()) {
+        a @ Some(ref b) => {}
+        //~^ ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        None => {}
+    }
+    match Some((u(), u())) {
+        a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+        //~^ ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        //~| ERROR use of moved value
+        None => {}
+    }
+    match Some([u(), u()]) {
+        mut a @ Some([ref b, ref mut c]) => {}
+        //~^ ERROR borrow of moved value
+        //~| ERROR borrow of moved value
+        None => {}
+    }
+}
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr
new file mode 100644
index 0000000000..f819e67143
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref-inverse.stderr
@@ -0,0 +1,503 @@
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:29:9
+   |
+LL |     let a @ ref b = U;
+   |         -^^^-----
+   |         |   |
+   |         |   value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:31:9
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+   |         -^^^^^^^^^^^^---------^^^^^^-----^
+   |         |            |              |
+   |         |            |              value borrowed here after move
+   |         |            value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `(main::U, main::U)` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:31:14
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+   |              -----^^^---------
+   |              |       |
+   |              |       value borrowed here after move
+   |              value moved into `b` here
+   |              move occurs because `b` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:31:33
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+   |                                 -^^^-----
+   |                                 |   |
+   |                                 |   value borrowed here after move
+   |                                 value moved into `d` here
+   |                                 move occurs because `d` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:38:9
+   |
+LL |     let a @ [ref mut b, ref c] = [U, U];
+   |         -^^^^---------^^-----^
+   |         |    |          |
+   |         |    |          value borrowed here after move
+   |         |    value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `[main::U; 2]` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:41:9
+   |
+LL |     let a @ ref b = u();
+   |         -^^^-----
+   |         |   |
+   |         |   value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:44:9
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+   |         -^^^^^^^^^^^^---------^^^^^^-----^
+   |         |            |              |
+   |         |            |              value borrowed here after move
+   |         |            value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `(main::U, main::U)` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:44:14
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+   |              -----^^^---------
+   |              |       |
+   |              |       value borrowed here after move
+   |              value moved into `b` here
+   |              move occurs because `b` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:44:33
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+   |                                 -^^^-----
+   |                                 |   |
+   |                                 |   value borrowed here after move
+   |                                 value moved into `d` here
+   |                                 move occurs because `d` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:51:9
+   |
+LL |     let a @ [ref mut b, ref c] = [u(), u()];
+   |         -^^^^---------^^-----^
+   |         |    |          |
+   |         |    |          value borrowed here after move
+   |         |    value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `[main::U; 2]` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:56:9
+   |
+LL |         a @ Some(ref b) => {}
+   |         -^^^^^^^^-----^
+   |         |        |
+   |         |        value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `std::option::Option<main::U>` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:61:9
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |         -^^^^^^^^^^^^^^^^^---------^^^^^^-----^^
+   |         |                 |              |
+   |         |                 |              value borrowed here after move
+   |         |                 value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `std::option::Option<(main::U, main::U)>` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:61:19
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                   -----^^^---------
+   |                   |       |
+   |                   |       value borrowed here after move
+   |                   value moved into `b` here
+   |                   move occurs because `b` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:61:38
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                                      -^^^-----
+   |                                      |   |
+   |                                      |   value borrowed here after move
+   |                                      value moved into `d` here
+   |                                      move occurs because `d` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:71:9
+   |
+LL |         mut a @ Some([ref b, ref mut c]) => {}
+   |         -----^^^^^^^^^-----^^---------^^
+   |         |             |      |
+   |         |             |      value borrowed here after move
+   |         |             value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `std::option::Option<[main::U; 2]>` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:77:9
+   |
+LL |         a @ Some(ref b) => {}
+   |         -^^^^^^^^-----^
+   |         |        |
+   |         |        value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `std::option::Option<main::U>` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:83:9
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |         -^^^^^^^^^^^^^^^^^---------^^^^^^-----^^
+   |         |                 |              |
+   |         |                 |              value borrowed here after move
+   |         |                 value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `std::option::Option<(main::U, main::U)>` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:83:19
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                   -----^^^---------
+   |                   |       |
+   |                   |       value borrowed here after move
+   |                   value moved into `b` here
+   |                   move occurs because `b` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:83:38
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                                      -^^^-----
+   |                                      |   |
+   |                                      |   value borrowed here after move
+   |                                      value moved into `d` here
+   |                                      move occurs because `d` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:93:9
+   |
+LL |         mut a @ Some([ref b, ref mut c]) => {}
+   |         -----^^^^^^^^^-----^^---------^^
+   |         |             |      |
+   |         |             |      value borrowed here after move
+   |         |             value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `std::option::Option<[main::U; 2]>` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:14:11
+   |
+LL |     fn f1(a @ ref b: U) {}
+   |           -^^^-----
+   |           |   |
+   |           |   value borrowed here after move
+   |           value moved into `a` here
+   |           move occurs because `a` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:18:11
+   |
+LL |     fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+   |           -----^^^^^^^^-----^^^^^^^^^^-----^
+   |           |            |              |
+   |           |            |              value borrowed here after move
+   |           |            value borrowed here after move
+   |           value moved into `a` here
+   |           move occurs because `a` has type `(main::U, main::U)` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:18:20
+   |
+LL |     fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+   |                    -^^^-----
+   |                    |   |
+   |                    |   value borrowed here after move
+   |                    value moved into `b` here
+   |                    move occurs because `b` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:18:31
+   |
+LL |     fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+   |                               -----^^^-----
+   |                               |       |
+   |                               |       value borrowed here after move
+   |                               value moved into `d` here
+   |                               move occurs because `d` has type `main::U` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:25:11
+   |
+LL |     fn f3(a @ [ref mut b, ref c]: [U; 2]) {}
+   |           -^^^^---------^^-----^
+   |           |    |          |
+   |           |    |          value borrowed here after move
+   |           |    value borrowed here after move
+   |           value moved into `a` here
+   |           move occurs because `a` has type `[main::U; 2]` which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:31:22
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+   |              --------^^^^^^^^^
+   |              |       |
+   |              |       value borrowed here after move
+   |              value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: use of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:31:33
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+   |         ------------------------^^^^^^^^^-   ------ move occurs because value has type `(main::U, main::U)`, which does not implement the `Copy` trait
+   |         |                       |
+   |         |                       value used here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:31:37
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (U, U);
+   |                                 ----^^^^^
+   |                                 |   |
+   |                                 |   value borrowed here after move
+   |                                 value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:38:25
+   |
+LL |     let a @ [ref mut b, ref c] = [U, U];
+   |         ----------------^^^^^-   ------ move occurs because value has type `[main::U; 2]`, which does not implement the `Copy` trait
+   |         |               |
+   |         |               value borrowed here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:41:13
+   |
+LL |     let a @ ref b = u();
+   |         ----^^^^^   --- move occurs because value has type `main::U`, which does not implement the `Copy` trait
+   |         |   |
+   |         |   value borrowed here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:44:22
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+   |              --------^^^^^^^^^
+   |              |       |
+   |              |       value borrowed here after move
+   |              value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: use of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:44:33
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+   |         ------------------------^^^^^^^^^-   ---------- move occurs because value has type `(main::U, main::U)`, which does not implement the `Copy` trait
+   |         |                       |
+   |         |                       value used here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:44:37
+   |
+LL |     let a @ (mut b @ ref mut c, d @ ref e) = (u(), u());
+   |                                 ----^^^^^
+   |                                 |   |
+   |                                 |   value borrowed here after move
+   |                                 value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:51:25
+   |
+LL |     let a @ [ref mut b, ref c] = [u(), u()];
+   |         ----------------^^^^^-   ---------- move occurs because value has type `[main::U; 2]`, which does not implement the `Copy` trait
+   |         |               |
+   |         |               value borrowed here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:61:27
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                   --------^^^^^^^^^
+   |                   |       |
+   |                   |       value borrowed here after move
+   |                   value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: use of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:61:38
+   |
+LL |     match Some((U, U)) {
+   |           ------------ move occurs because value has type `std::option::Option<(main::U, main::U)>`, which does not implement the `Copy` trait
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |         -----------------------------^^^^^^^^^--
+   |         |                            |
+   |         |                            value used here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:61:42
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                                      ----^^^^^
+   |                                      |   |
+   |                                      |   value borrowed here after move
+   |                                      value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:71:30
+   |
+LL |     match Some([U, U]) {
+   |           ------------ move occurs because value has type `std::option::Option<[main::U; 2]>`, which does not implement the `Copy` trait
+LL |         mut a @ Some([ref b, ref mut c]) => {}
+   |         ---------------------^^^^^^^^^--
+   |         |                    |
+   |         |                    value borrowed here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:77:18
+   |
+LL |     match Some(u()) {
+   |           --------- move occurs because value has type `std::option::Option<main::U>`, which does not implement the `Copy` trait
+LL |         a @ Some(ref b) => {}
+   |         ---------^^^^^-
+   |         |        |
+   |         |        value borrowed here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:83:27
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                   --------^^^^^^^^^
+   |                   |       |
+   |                   |       value borrowed here after move
+   |                   value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: use of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:83:38
+   |
+LL |     match Some((u(), u())) {
+   |           ---------------- move occurs because value has type `std::option::Option<(main::U, main::U)>`, which does not implement the `Copy` trait
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |         -----------------------------^^^^^^^^^--
+   |         |                            |
+   |         |                            value used here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:83:42
+   |
+LL |         a @ Some((mut b @ ref mut c, d @ ref e)) => {}
+   |                                      ----^^^^^
+   |                                      |   |
+   |                                      |   value borrowed here after move
+   |                                      value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:93:30
+   |
+LL |     match Some([u(), u()]) {
+   |           ---------------- move occurs because value has type `std::option::Option<[main::U; 2]>`, which does not implement the `Copy` trait
+LL |         mut a @ Some([ref b, ref mut c]) => {}
+   |         ---------------------^^^^^^^^^--
+   |         |                    |
+   |         |                    value borrowed here after move
+   |         value moved here
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:14:15
+   |
+LL |     fn f1(a @ ref b: U) {}
+   |           ----^^^^^
+   |           |   |
+   |           |   value borrowed here after move
+   |           value moved here
+   |           move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:18:24
+   |
+LL |     fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+   |                    ----^^^^^
+   |                    |   |
+   |                    |   value borrowed here after move
+   |                    value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: use of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:18:31
+   |
+LL |     fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+   |           --------------------^^^^^^^^^^^^^-
+   |           |                   |
+   |           |                   value used here after move
+   |           value moved here
+   |           move occurs because value has type `(main::U, main::U)`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:18:39
+   |
+LL |     fn f2(mut a @ (b @ ref c, mut d @ ref e): (U, U)) {}
+   |                               --------^^^^^
+   |                               |       |
+   |                               |       value borrowed here after move
+   |                               value moved here
+   |
+   = note: move occurs because value has type `main::U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value
+  --> $DIR/borrowck-pat-by-move-and-ref-inverse.rs:25:27
+   |
+LL |     fn f3(a @ [ref mut b, ref c]: [U; 2]) {}
+   |           ----------------^^^^^-
+   |           |               |
+   |           |               value borrowed here after move
+   |           value moved here
+   |           move occurs because value has type `[main::U; 2]`, which does not implement the `Copy` trait
+
+error: aborting due to 48 previous errors
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs
index abe5ed81b7..b7c8c8766c 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.rs
@@ -1,9 +1,74 @@
+// Test that `ref mut? @ pat_with_by_move_bindings` is prevented.
+
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 fn main() {
-    match Some("hi".to_string()) {
-        ref op_string_ref @ Some(s) => {},
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern [E0009]
-        None => {},
+    struct U;
+
+    // Prevent promotion.
+    fn u() -> U {
+        U
+    }
+
+    fn f1(ref a @ b: U) {}
+    //~^ ERROR cannot move out of value because it is borrowed
+    fn f2(ref a @ (ref b @ mut c, ref d @ e): (U, U)) {}
+    //~^ ERROR cannot move out of value because it is borrowed
+    //~| ERROR cannot move out of value because it is borrowed
+    //~| ERROR cannot move out of value because it is borrowed
+    fn f3(ref mut a @ [b, mut c]: [U; 2]) {}
+    //~^ ERROR cannot move out of value because it is borrowed
+
+    let ref a @ b = U;
+    //~^ ERROR cannot move out of value because it is borrowed
+    let ref a @ (ref b @ mut c, ref d @ e) = (U, U);
+    //~^ ERROR cannot move out of value because it is borrowed
+    //~| ERROR cannot move out of value because it is borrowed
+    //~| ERROR cannot move out of value because it is borrowed
+    let ref mut a @ [b, mut c] = [U, U];
+    //~^ ERROR cannot move out of value because it is borrowed
+    let ref a @ b = u();
+    //~^ ERROR cannot move out of value because it is borrowed
+    let ref a @ (ref b @ mut c, ref d @ e) = (u(), u());
+    //~^ ERROR cannot move out of value because it is borrowed
+    //~| ERROR cannot move out of value because it is borrowed
+    //~| ERROR cannot move out of value because it is borrowed
+    let ref mut a @ [b, mut c] = [u(), u()];
+    //~^ ERROR cannot move out of value because it is borrowed
+
+    match Some(U) {
+        ref a @ Some(b) => {}
+        //~^ ERROR cannot move out of value because it is borrowed
+        None => {}
+    }
+    match Some((U, U)) {
+        ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+        //~^ ERROR cannot move out of value because it is borrowed
+        //~| ERROR cannot move out of value because it is borrowed
+        //~| ERROR cannot move out of value because it is borrowed
+        None => {}
+    }
+    match Some([U, U]) {
+        ref mut a @ Some([b, mut c]) => {}
+        //~^ ERROR cannot move out of value because it is borrowed
+        None => {}
+    }
+    match Some(u()) {
+        ref a @ Some(b) => {}
+        //~^ ERROR cannot move out of value because it is borrowed
+        None => {}
+    }
+    match Some((u(), u())) {
+        ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+        //~^ ERROR cannot move out of value because it is borrowed
+        //~| ERROR cannot move out of value because it is borrowed
+        //~| ERROR cannot move out of value because it is borrowed
+        None => {}
+    }
+    match Some([u(), u()]) {
+        ref mut a @ Some([b, mut c]) => {}
+        //~^ ERROR cannot move out of value because it is borrowed
+        None => {}
     }
 }
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr
index 1f70a6c437..e5419efa00 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-by-move-and-ref.stderr
@@ -1,12 +1,237 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/borrowck-pat-by-move-and-ref.rs:5:34
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:23:9
    |
-LL |         ref op_string_ref @ Some(s) => {},
-   |         -------------------------^-
-   |         |                        |
-   |         |                        by-move pattern here
-   |         by-ref pattern here
+LL |     let ref a @ b = U;
+   |         -----^^^-
+   |         |       |
+   |         |       value moved into `b` here
+   |         value borrowed, by `a`, here
 
-error: aborting due to previous error
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:25:9
+   |
+LL |     let ref a @ (ref b @ mut c, ref d @ e) = (U, U);
+   |         -----^^^^^^^^^^^^-----^^^^^^^^^^-^
+   |         |                |              |
+   |         |                |              value moved into `e` here
+   |         |                value moved into `c` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:25:18
+   |
+LL |     let ref a @ (ref b @ mut c, ref d @ e) = (U, U);
+   |                  -----^^^-----
+   |                  |       |
+   |                  |       value moved into `c` here
+   |                  value borrowed, by `b`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:25:33
+   |
+LL |     let ref a @ (ref b @ mut c, ref d @ e) = (U, U);
+   |                                 -----^^^-
+   |                                 |       |
+   |                                 |       value moved into `e` here
+   |                                 value borrowed, by `d`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:29:9
+   |
+LL |     let ref mut a @ [b, mut c] = [U, U];
+   |         ---------^^^^-^^-----^
+   |         |            |  |
+   |         |            |  value moved into `c` here
+   |         |            value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:31:9
+   |
+LL |     let ref a @ b = u();
+   |         -----^^^-
+   |         |       |
+   |         |       value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:33:9
+   |
+LL |     let ref a @ (ref b @ mut c, ref d @ e) = (u(), u());
+   |         -----^^^^^^^^^^^^-----^^^^^^^^^^-^
+   |         |                |              |
+   |         |                |              value moved into `e` here
+   |         |                value moved into `c` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:33:18
+   |
+LL |     let ref a @ (ref b @ mut c, ref d @ e) = (u(), u());
+   |                  -----^^^-----
+   |                  |       |
+   |                  |       value moved into `c` here
+   |                  value borrowed, by `b`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:33:33
+   |
+LL |     let ref a @ (ref b @ mut c, ref d @ e) = (u(), u());
+   |                                 -----^^^-
+   |                                 |       |
+   |                                 |       value moved into `e` here
+   |                                 value borrowed, by `d`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:37:9
+   |
+LL |     let ref mut a @ [b, mut c] = [u(), u()];
+   |         ---------^^^^-^^-----^
+   |         |            |  |
+   |         |            |  value moved into `c` here
+   |         |            value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:41:9
+   |
+LL |         ref a @ Some(b) => {}
+   |         -----^^^^^^^^-^
+   |         |            |
+   |         |            value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:46:9
+   |
+LL |         ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+   |         -----^^^^^^^^^^^^^^^^^-----^^^^^^^^^^-^^
+   |         |                     |              |
+   |         |                     |              value moved into `e` here
+   |         |                     value moved into `c` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:46:23
+   |
+LL |         ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+   |                       -----^^^-----
+   |                       |       |
+   |                       |       value moved into `c` here
+   |                       value borrowed, by `b`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:46:38
+   |
+LL |         ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+   |                                      -----^^^-
+   |                                      |       |
+   |                                      |       value moved into `e` here
+   |                                      value borrowed, by `d`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:53:9
+   |
+LL |         ref mut a @ Some([b, mut c]) => {}
+   |         ---------^^^^^^^^^-^^-----^^
+   |         |                 |  |
+   |         |                 |  value moved into `c` here
+   |         |                 value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:58:9
+   |
+LL |         ref a @ Some(b) => {}
+   |         -----^^^^^^^^-^
+   |         |            |
+   |         |            value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:63:9
+   |
+LL |         ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+   |         -----^^^^^^^^^^^^^^^^^-----^^^^^^^^^^-^^
+   |         |                     |              |
+   |         |                     |              value moved into `e` here
+   |         |                     value moved into `c` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:63:23
+   |
+LL |         ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+   |                       -----^^^-----
+   |                       |       |
+   |                       |       value moved into `c` here
+   |                       value borrowed, by `b`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:63:38
+   |
+LL |         ref a @ Some((ref b @ mut c, ref d @ e)) => {}
+   |                                      -----^^^-
+   |                                      |       |
+   |                                      |       value moved into `e` here
+   |                                      value borrowed, by `d`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:70:9
+   |
+LL |         ref mut a @ Some([b, mut c]) => {}
+   |         ---------^^^^^^^^^-^^-----^^
+   |         |                 |  |
+   |         |                 |  value moved into `c` here
+   |         |                 value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:14:11
+   |
+LL |     fn f1(ref a @ b: U) {}
+   |           -----^^^-
+   |           |       |
+   |           |       value moved into `b` here
+   |           value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:16:11
+   |
+LL |     fn f2(ref a @ (ref b @ mut c, ref d @ e): (U, U)) {}
+   |           -----^^^^^^^^^^^^-----^^^^^^^^^^-^
+   |           |                |              |
+   |           |                |              value moved into `e` here
+   |           |                value moved into `c` here
+   |           value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:16:20
+   |
+LL |     fn f2(ref a @ (ref b @ mut c, ref d @ e): (U, U)) {}
+   |                    -----^^^-----
+   |                    |       |
+   |                    |       value moved into `c` here
+   |                    value borrowed, by `b`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:16:35
+   |
+LL |     fn f2(ref a @ (ref b @ mut c, ref d @ e): (U, U)) {}
+   |                                   -----^^^-
+   |                                   |       |
+   |                                   |       value moved into `e` here
+   |                                   value borrowed, by `d`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-by-move-and-ref.rs:20:11
+   |
+LL |     fn f3(ref mut a @ [b, mut c]: [U; 2]) {}
+   |           ---------^^^^-^^-----^
+   |           |            |  |
+   |           |            |  value moved into `c` here
+   |           |            value moved into `b` here
+   |           value borrowed, by `a`, here
+
+error: aborting due to 25 previous errors
 
-For more information about this error, try `rustc --explain E0009`.
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs
index e8510dfa64..58d4a9b018 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.rs
@@ -1,4 +1,5 @@
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 enum Option<T> {
     None,
@@ -8,7 +9,7 @@ enum Option<T> {
 fn main() {
     match &mut Some(1) {
         ref mut z @ &mut Some(ref a) => {
-        //~^ ERROR cannot borrow `z` as immutable because it is also borrowed as mutable
+        //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
         //~| ERROR cannot borrow `_` as immutable because it is also borrowed as mutable
             **z = None;
             println!("{}", *a);
@@ -22,49 +23,52 @@ fn main() {
     fn u() -> U { U }
 
     fn f1(ref a @ ref mut b: U) {}
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     fn f2(ref mut a @ ref b: U) {}
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
     fn f3(ref a @ [ref b, ref mut mid @ .., ref c]: [U; 4]) {}
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
+    fn f4_also_moved(ref a @ ref mut b @ c: U) {}
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
+    //~| ERROR cannot move out of value because it is borrowed
 
     let ref mut a @ (ref b @ ref mut c) = u(); // sub-in-sub
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
-    //~| ERROR cannot borrow `b` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable more than once at a time
+    //~| ERROR cannot borrow value as mutable because it is also borrowed as immutable
 
     let ref a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     let ref mut a @ ref b = U;
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
     let ref a @ (ref mut b, ref mut c) = (U, U);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     let ref mut a @ (ref b, ref c) = (U, U);
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
 
     let ref mut a @ ref b = u();
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
     //~| ERROR cannot borrow `_` as immutable because it is also borrowed as mutable
     *a = u();
     drop(b);
     let ref a @ ref mut b = u();
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
     *b = u();
     drop(a);
 
     let ref mut a @ ref b = U;
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
     *a = U;
     drop(b);
     let ref a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     *b = U;
     drop(a);
 
     match Ok(U) {
         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) => {
-            //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
-            //~| ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+            //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
+            //~| ERROR cannot borrow value as immutable because it is also borrowed as mutable
             *a = Err(U);
             drop(b);
         }
@@ -72,8 +76,8 @@ fn main() {
 
     match Ok(U) {
         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) => {
-            //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
-            //~| ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+            //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
+            //~| ERROR cannot borrow value as mutable because it is also borrowed as immutable
             //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
             //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
             *b = U;
@@ -83,52 +87,52 @@ fn main() {
 
     match Ok(U) {
         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { *b = U; false } => {}
-        //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
-        //~| ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+        //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
+        //~| ERROR cannot borrow value as mutable because it is also borrowed as immutable
         //~| ERROR cannot assign to `*b`, as it is immutable for the pattern guard
         _ => {}
     }
     match Ok(U) {
         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { *a = Err(U); false } => {}
-        //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
-        //~| ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+        //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
+        //~| ERROR cannot borrow value as immutable because it is also borrowed as mutable
         //~| ERROR cannot assign to `*a`, as it is immutable for the pattern guard
         _ => {}
     }
     match Ok(U) {
         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false } => {}
-        //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
-        //~| ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+        //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
+        //~| ERROR cannot borrow value as mutable because it is also borrowed as immutable
         //~| ERROR cannot move out of `b` in pattern guard
         //~| ERROR cannot move out of `b` in pattern guard
         _ => {}
     }
     match Ok(U) {
         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false } => {}
-        //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
-        //~| ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+        //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
+        //~| ERROR cannot borrow value as immutable because it is also borrowed as mutable
         //~| ERROR cannot move out of `a` in pattern guard
         //~| ERROR cannot move out of `a` in pattern guard
         _ => {}
     }
 
     let ref a @ (ref mut b, ref mut c) = (U, U);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     *b = U;
     *c = U;
 
     let ref a @ (ref mut b, ref mut c) = (U, U);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
     //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
     *b = U;
     drop(a);
 
     let ref a @ (ref mut b, ref mut c) = (U, U);
-    //~^ ERROR cannot borrow `a` as mutable because it is also borrowed as immutable
+    //~^ ERROR cannot borrow value as mutable because it is also borrowed as immutable
     *b = U; //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
     *c = U; //~| ERROR cannot borrow `_` as mutable because it is also borrowed as immutable
     drop(a);
     let ref mut a @ (ref b, ref c) = (U, U);
-    //~^ ERROR cannot borrow `a` as immutable because it is also borrowed as mutable
+    //~^ ERROR cannot borrow value as immutable because it is also borrowed as mutable
 }
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr
index 0d7b703f18..8c6ca888e0 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-and-ref.stderr
@@ -1,282 +1,301 @@
-error: cannot borrow `z` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:10:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:11:9
    |
 LL |         ref mut z @ &mut Some(ref a) => {
    |         ---------^^^^^^^^^^^^^-----^
    |         |                     |
-   |         |                     immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |                     immutable borrow, by `a`, occurs here
+   |         mutable borrow, by `z`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:31:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:35:9
    |
 LL |     let ref mut a @ (ref b @ ref mut c) = u(); // sub-in-sub
    |         ---------^^^^-----------------^
    |         |            |       |
-   |         |            |       another mutable borrow occurs here
-   |         |            also borrowed as immutable here
-   |         first mutable borrow occurs here
+   |         |            |       another mutable borrow, by `c`, occurs here
+   |         |            also borrowed as immutable, by `b`, here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `b` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:31:22
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:35:22
    |
 LL |     let ref mut a @ (ref b @ ref mut c) = u(); // sub-in-sub
    |                      -----^^^---------
    |                      |       |
-   |                      |       mutable borrow occurs here
-   |                      immutable borrow occurs here
+   |                      |       mutable borrow, by `c`, occurs here
+   |                      immutable borrow, by `b`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:35:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:39:9
    |
 LL |     let ref a @ ref mut b = U;
    |         -----^^^---------
    |         |       |
-   |         |       mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |       mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:37:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:41:9
    |
 LL |     let ref mut a @ ref b = U;
    |         ---------^^^-----
    |         |           |
-   |         |           immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |           immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:39:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:43:9
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         -----^^^^---------^^---------^
    |         |        |          |
-   |         |        |          mutable borrow occurs here
-   |         |        mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |        |          mutable borrow, by `c`, occurs here
+   |         |        mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:41:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:45:9
    |
 LL |     let ref mut a @ (ref b, ref c) = (U, U);
    |         ---------^^^^-----^^-----^
    |         |            |      |
-   |         |            |      immutable borrow occurs here
-   |         |            immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |            |      immutable borrow, by `c`, occurs here
+   |         |            immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:44:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:48:9
    |
 LL |     let ref mut a @ ref b = u();
    |         ---------^^^-----
    |         |           |
-   |         |           immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |           immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:49:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:53:9
    |
 LL |     let ref a @ ref mut b = u();
    |         -----^^^---------
    |         |       |
-   |         |       mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |       mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:55:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:59:9
    |
 LL |     let ref mut a @ ref b = U;
    |         ---------^^^-----
    |         |           |
-   |         |           immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |           immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:59:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:63:9
    |
 LL |     let ref a @ ref mut b = U;
    |         -----^^^---------
    |         |       |
-   |         |       mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |       mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:65:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:69:9
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) => {
    |         ---------^^^^^^-----^
    |         |              |
-   |         |              immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |              immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:65:33
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:69:33
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) => {
    |                                 ---------^^^^^^^-----^
    |                                 |               |
-   |                                 |               immutable borrow occurs here
-   |                                 mutable borrow occurs here
+   |                                 |               immutable borrow, by `b`, occurs here
+   |                                 mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:74:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:78:9
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) => {
    |         -----^^^^^^---------^
    |         |          |
-   |         |          mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |          mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:74:33
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:78:33
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) => {
    |                                 -----^^^^^^^---------^
    |                                 |           |
-   |                                 |           mutable borrow occurs here
-   |                                 immutable borrow occurs here
+   |                                 |           mutable borrow, by `b`, occurs here
+   |                                 immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:85:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:89:9
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { *b = U; false } => {}
    |         -----^^^^^^---------^
    |         |          |
-   |         |          mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |          mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:85:33
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:89:33
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { *b = U; false } => {}
    |                                 -----^^^^^^^---------^
    |                                 |           |
-   |                                 |           mutable borrow occurs here
-   |                                 immutable borrow occurs here
+   |                                 |           mutable borrow, by `b`, occurs here
+   |                                 immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:92:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:96:9
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { *a = Err(U); false } => {}
    |         ---------^^^^^^-----^
    |         |              |
-   |         |              immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |              immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:92:33
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:96:33
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { *a = Err(U); false } => {}
    |                                 ---------^^^^^^^-----^
    |                                 |               |
-   |                                 |               immutable borrow occurs here
-   |                                 mutable borrow occurs here
+   |                                 |               immutable borrow, by `b`, occurs here
+   |                                 mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:99:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:103:9
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false } => {}
    |         -----^^^^^^---------^
    |         |          |
-   |         |          mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |          mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:99:33
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:103:33
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false } => {}
    |                                 -----^^^^^^^---------^
    |                                 |           |
-   |                                 |           mutable borrow occurs here
-   |                                 immutable borrow occurs here
+   |                                 |           mutable borrow, by `b`, occurs here
+   |                                 immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:107:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:111:9
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false } => {}
    |         ---------^^^^^^-----^
    |         |              |
-   |         |              immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |              immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:107:33
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:111:33
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false } => {}
    |                                 ---------^^^^^^^-----^
    |                                 |               |
-   |                                 |               immutable borrow occurs here
-   |                                 mutable borrow occurs here
+   |                                 |               immutable borrow, by `b`, occurs here
+   |                                 mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:115:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:119:9
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         -----^^^^---------^^---------^
    |         |        |          |
-   |         |        |          mutable borrow occurs here
-   |         |        mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |        |          mutable borrow, by `c`, occurs here
+   |         |        mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:120:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:124:9
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         -----^^^^---------^^---------^
    |         |        |          |
-   |         |        |          mutable borrow occurs here
-   |         |        mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |        |          mutable borrow, by `c`, occurs here
+   |         |        mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:127:9
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:131:9
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         -----^^^^---------^^---------^
    |         |        |          |
-   |         |        |          mutable borrow occurs here
-   |         |        mutable borrow occurs here
-   |         immutable borrow occurs here
+   |         |        |          mutable borrow, by `c`, occurs here
+   |         |        mutable borrow, by `b`, occurs here
+   |         immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:132:9
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:136:9
    |
 LL |     let ref mut a @ (ref b, ref c) = (U, U);
    |         ---------^^^^-----^^-----^
    |         |            |      |
-   |         |            |      immutable borrow occurs here
-   |         |            immutable borrow occurs here
-   |         mutable borrow occurs here
+   |         |            |      immutable borrow, by `c`, occurs here
+   |         |            immutable borrow, by `b`, occurs here
+   |         mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:24:11
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:25:11
    |
 LL |     fn f1(ref a @ ref mut b: U) {}
    |           -----^^^---------
    |           |       |
-   |           |       mutable borrow occurs here
-   |           immutable borrow occurs here
+   |           |       mutable borrow, by `b`, occurs here
+   |           immutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:26:11
+error: cannot borrow value as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:27:11
    |
 LL |     fn f2(ref mut a @ ref b: U) {}
    |           ---------^^^-----
    |           |           |
-   |           |           immutable borrow occurs here
-   |           mutable borrow occurs here
+   |           |           immutable borrow, by `b`, occurs here
+   |           mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:28:11
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:29:11
    |
 LL |     fn f3(ref a @ [ref b, ref mut mid @ .., ref c]: [U; 4]) {}
    |           -----^^^^^^^^^^^----------------^^^^^^^^
    |           |               |
-   |           |               mutable borrow occurs here
-   |           immutable borrow occurs here
+   |           |               mutable borrow, by `mid`, occurs here
+   |           immutable borrow, by `a`, occurs here
+
+error: cannot borrow value as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:31:22
+   |
+LL |     fn f4_also_moved(ref a @ ref mut b @ c: U) {}
+   |                      -----^^^-------------
+   |                      |       |           |
+   |                      |       |           also moved into `c` here
+   |                      |       mutable borrow, by `b`, occurs here
+   |                      immutable borrow, by `a`, occurs here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:31:30
+   |
+LL |     fn f4_also_moved(ref a @ ref mut b @ c: U) {}
+   |                              ---------^^^-
+   |                              |           |
+   |                              |           value moved into `c` here
+   |                              value borrowed, by `b`, here
 
 error[E0502]: cannot borrow `_` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:10:31
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:11:31
    |
 LL |         ref mut z @ &mut Some(ref a) => {
    |         ----------------------^^^^^-
@@ -288,7 +307,7 @@ LL |             **z = None;
    |             ---------- mutable borrow later used here
 
 error[E0502]: cannot borrow `_` as immutable because it is also borrowed as mutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:44:21
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:48:21
    |
 LL |     let ref mut a @ ref b = u();
    |         ------------^^^^^
@@ -300,7 +319,7 @@ LL |     *a = u();
    |     -------- mutable borrow later used here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:49:17
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:53:17
    |
 LL |     let ref a @ ref mut b = u();
    |         --------^^^^^^^^^
@@ -312,7 +331,7 @@ LL |     drop(a);
    |          - immutable borrow later used here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:74:20
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:78:20
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) => {
    |         -----------^^^^^^^^^-
@@ -324,7 +343,7 @@ LL |             drop(a);
    |                  - immutable borrow later used here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:74:45
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:78:45
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) => {
    |                                 ------------^^^^^^^^^-
@@ -336,7 +355,7 @@ LL |             drop(a);
    |                  - immutable borrow later used here
 
 error[E0594]: cannot assign to `*b`, as it is immutable for the pattern guard
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:85:61
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:89:61
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { *b = U; false } => {}
    |                                                             ^^^^^^ cannot assign
@@ -344,7 +363,7 @@ LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { *b = U; false }
    = note: variables bound in patterns are immutable until the end of the pattern guard
 
 error[E0594]: cannot assign to `*a`, as it is immutable for the pattern guard
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:92:61
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:96:61
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { *a = Err(U); false } => {}
    |                                                             ^^^^^^^^^^^ cannot assign
@@ -352,7 +371,7 @@ LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { *a = Err(U); fa
    = note: variables bound in patterns are immutable until the end of the pattern guard
 
 error[E0507]: cannot move out of `b` in pattern guard
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:99:66
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:103:66
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false } => {}
    |                                                                  ^ move occurs because `b` has type `&mut main::U`, which does not implement the `Copy` trait
@@ -360,7 +379,7 @@ LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false
    = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
 
 error[E0507]: cannot move out of `b` in pattern guard
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:99:66
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:103:66
    |
 LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false } => {}
    |                                                                  ^ move occurs because `b` has type `&mut main::U`, which does not implement the `Copy` trait
@@ -368,7 +387,7 @@ LL |         ref a @ Ok(ref mut b) | ref a @ Err(ref mut b) if { drop(b); false
    = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
 
 error[E0507]: cannot move out of `a` in pattern guard
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:107:66
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:111:66
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false } => {}
    |                                                                  ^ move occurs because `a` has type `&mut std::result::Result<main::U, main::U>`, which does not implement the `Copy` trait
@@ -376,7 +395,7 @@ LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false
    = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
 
 error[E0507]: cannot move out of `a` in pattern guard
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:107:66
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:111:66
    |
 LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false } => {}
    |                                                                  ^ move occurs because `a` has type `&mut std::result::Result<main::U, main::U>`, which does not implement the `Copy` trait
@@ -384,7 +403,7 @@ LL |         ref mut a @ Ok(ref b) | ref mut a @ Err(ref b) if { drop(a); false
    = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:120:18
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:124:18
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         ---------^^^^^^^^^------------
@@ -396,7 +415,7 @@ LL |     drop(a);
    |          - immutable borrow later used here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:120:29
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:124:29
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         --------------------^^^^^^^^^-
@@ -408,7 +427,7 @@ LL |     drop(a);
    |          - immutable borrow later used here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:127:18
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:131:18
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         ---------^^^^^^^^^------------
@@ -420,7 +439,7 @@ LL |     drop(a);
    |          - immutable borrow later used here
 
 error[E0502]: cannot borrow `_` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:127:29
+  --> $DIR/borrowck-pat-ref-mut-and-ref.rs:131:29
    |
 LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
    |         --------------------^^^^^^^^^-
@@ -431,7 +450,7 @@ LL |     let ref a @ (ref mut b, ref mut c) = (U, U);
 LL |     drop(a);
    |          - immutable borrow later used here
 
-error: aborting due to 45 previous errors
+error: aborting due to 47 previous errors
 
 Some errors have detailed explanations: E0502, E0507, E0594.
 For more information about an error, try `rustc --explain E0502`.
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs
index f425b35630..f5c39a7ac5 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.rs
@@ -1,6 +1,7 @@
 // Test that `ref mut x @ ref mut y` and varieties of that are not allowed.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 fn main() {
     struct U;
@@ -8,39 +9,42 @@ fn main() {
     fn u() -> U { U }
 
     fn f1(ref mut a @ ref mut b: U) {}
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
     fn f2(ref mut a @ ref mut b: U) {}
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
     fn f3(
         ref mut a @ [
-        //~^ ERROR cannot borrow `a` as mutable more than once at a time
+        //~^ ERROR cannot borrow value as mutable more than once at a time
             [ref b @ .., _],
             [_, ref mut mid @ ..],
             ..,
             [..],
         ] : [[U; 4]; 5]
     ) {}
+    fn f4_also_moved(ref mut a @ ref mut b @ c: U) {}
+    //~^ ERROR cannot borrow value as mutable more than once at a time
+    //~| ERROR cannot move out of value because it is borrowed
 
     let ref mut a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
     //~| ERROR cannot borrow `_` as mutable more than once at a time
     drop(a);
     let ref mut a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
     drop(b);
     let ref mut a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
 
     let ref mut a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
     //~| ERROR cannot borrow `_` as mutable more than once at a time
     *a = U;
     let ref mut a @ ref mut b = U;
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
     *b = U;
 
     let ref mut a @ (
-    //~^ ERROR cannot borrow `a` as mutable more than once at a time
+    //~^ ERROR cannot borrow value as mutable more than once at a time
         ref mut b,
         [
             ref mut c,
@@ -50,7 +54,7 @@ fn main() {
     ) = (U, [U, U, U]);
 
     let ref mut a @ (
-        //~^ ERROR cannot borrow `a` as mutable more than once at a time
+        //~^ ERROR cannot borrow value as mutable more than once at a time
             ref mut b,
             [
                 ref mut c,
@@ -60,37 +64,37 @@ fn main() {
         ) = (u(), [u(), u(), u()]);
 
     let a @ (ref mut b, ref mut c) = (U, U);
-    //~^ ERROR cannot bind by-move with sub-bindings
+    //~^ ERROR borrow of moved value
     //~| ERROR borrow of moved value
     let mut val = (U, [U, U]);
     let a @ (b, [c, d]) = &mut val; // Same as ^--
-    //~^ ERROR cannot bind by-move with sub-bindings
+    //~^ ERROR borrow of moved value
     //~| ERROR borrow of moved value
 
     let a @ &mut ref mut b = &mut U;
-    //~^ ERROR cannot bind by-move with sub-bindings
+    //~^ ERROR borrow of moved value
     //~| ERROR borrow of moved value
     let a @ &mut (ref mut b, ref mut c) = &mut (U, U);
-    //~^ ERROR cannot bind by-move with sub-bindings
+    //~^ ERROR borrow of moved value
     //~| ERROR borrow of moved value
 
     match Ok(U) {
         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
-            //~^ ERROR cannot borrow `a` as mutable more than once at a time
-            //~| ERROR cannot borrow `a` as mutable more than once at a time
+            //~^ ERROR cannot borrow value as mutable more than once at a time
+            //~| ERROR cannot borrow value as mutable more than once at a time
         }
     }
     match Ok(U) {
         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
-            //~^ ERROR cannot borrow `a` as mutable more than once at a time
-            //~| ERROR cannot borrow `a` as mutable more than once at a time
+            //~^ ERROR cannot borrow value as mutable more than once at a time
+            //~| ERROR cannot borrow value as mutable more than once at a time
             *b = U;
         }
     }
     match Ok(U) {
         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
-            //~^ ERROR cannot borrow `a` as mutable more than once at a time
-            //~| ERROR cannot borrow `a` as mutable more than once at a time
+            //~^ ERROR cannot borrow value as mutable more than once at a time
+            //~| ERROR cannot borrow value as mutable more than once at a time
             //~| ERROR cannot borrow `_` as mutable more than once at a time
             //~| ERROR cannot borrow `_` as mutable more than once at a time
             *a = Err(U);
@@ -101,8 +105,8 @@ fn main() {
     }
     match Ok(U) {
         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
-            //~^ ERROR cannot borrow `a` as mutable more than once at a time
-            //~| ERROR cannot borrow `a` as mutable more than once at a time
+            //~^ ERROR cannot borrow value as mutable more than once at a time
+            //~| ERROR cannot borrow value as mutable more than once at a time
             //~| ERROR cannot borrow `_` as mutable more than once at a time
             //~| ERROR cannot borrow `_` as mutable more than once at a time
             drop(a);
diff --git a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr
index d07ad140cc..e74f227b5e 100644
--- a/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr
+++ b/src/test/ui/pattern/bindings-after-at/borrowck-pat-ref-mut-twice.stderr
@@ -1,226 +1,265 @@
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:24:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:28:9
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ---------^^^---------
    |         |           |
-   |         |           another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |           another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:28:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:32:9
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ---------^^^---------
    |         |           |
-   |         |           another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |           another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:31:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:35:9
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ---------^^^---------
    |         |           |
-   |         |           another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |           another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:34:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:38:9
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ---------^^^---------
    |         |           |
-   |         |           another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |           another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:38:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:42:9
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ---------^^^---------
    |         |           |
-   |         |           another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |           another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:42:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:46:9
    |
 LL |       let ref mut a @ (
    |           ^--------
    |           |
-   |  _________first mutable borrow occurs here
+   |  _________first mutable borrow, by `a`, occurs here
    | |
 LL | |
 LL | |         ref mut b,
-   | |         --------- another mutable borrow occurs here
+   | |         --------- another mutable borrow, by `b`, occurs here
 LL | |         [
 LL | |             ref mut c,
-   | |             --------- another mutable borrow occurs here
+   | |             --------- another mutable borrow, by `c`, occurs here
 LL | |             ref mut d,
-   | |             --------- another mutable borrow occurs here
+   | |             --------- another mutable borrow, by `d`, occurs here
 LL | |             ref e,
-   | |             ----- also borrowed as immutable here
+   | |             ----- also borrowed as immutable, by `e`, here
 LL | |         ]
 LL | |     ) = (U, [U, U, U]);
    | |_____^
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:52:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:56:9
    |
 LL |       let ref mut a @ (
    |           ^--------
    |           |
-   |  _________first mutable borrow occurs here
+   |  _________first mutable borrow, by `a`, occurs here
    | |
 LL | |
 LL | |             ref mut b,
-   | |             --------- another mutable borrow occurs here
+   | |             --------- another mutable borrow, by `b`, occurs here
 LL | |             [
 LL | |                 ref mut c,
-   | |                 --------- another mutable borrow occurs here
+   | |                 --------- another mutable borrow, by `c`, occurs here
 LL | |                 ref mut d,
-   | |                 --------- another mutable borrow occurs here
+   | |                 --------- another mutable borrow, by `d`, occurs here
 LL | |                 ref e,
-   | |                 ----- also borrowed as immutable here
+   | |                 ----- also borrowed as immutable, by `e`, here
 LL | |             ]
 LL | |         ) = (u(), [u(), u(), u()]);
    | |_________^
 
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:62:9
+error: borrow of moved value
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:66:9
    |
 LL |     let a @ (ref mut b, ref mut c) = (U, U);
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:66:9
+   |         -^^^^---------^^---------^
+   |         |    |          |
+   |         |    |          value borrowed here after move
+   |         |    value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `(main::U, main::U)` which does not implement the `Copy` trait
+
+error: borrow of moved value
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:70:9
    |
 LL |     let a @ (b, [c, d]) = &mut val; // Same as ^--
-   |         ^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
+   |         -^^^^-^^^-^^-^^
+   |         |    |   |  |
+   |         |    |   |  value borrowed here after move
+   |         |    |   value borrowed here after move
+   |         |    value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `&mut (main::U, [main::U; 2])` which does not implement the `Copy` trait
 
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:70:9
+error: borrow of moved value
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:74:9
    |
 LL |     let a @ &mut ref mut b = &mut U;
-   |         ^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
+   |         -^^^^^^^^---------
+   |         |        |
+   |         |        value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `&mut main::U` which does not implement the `Copy` trait
 
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:73:9
+error: borrow of moved value
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:77:9
    |
 LL |     let a @ &mut (ref mut b, ref mut c) = &mut (U, U);
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
+   |         -^^^^^^^^^---------^^---------^
+   |         |         |          |
+   |         |         |          value borrowed here after move
+   |         |         value borrowed here after move
+   |         value moved into `a` here
+   |         move occurs because `a` has type `&mut (main::U, main::U)` which does not implement the `Copy` trait
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:78:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:82:9
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |         ---------^^^^^^---------^
    |         |              |
-   |         |              another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |              another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:78:37
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:82:37
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |                                     ---------^^^^^^^---------^
    |                                     |               |
-   |                                     |               another mutable borrow occurs here
-   |                                     first mutable borrow occurs here
+   |                                     |               another mutable borrow, by `b`, occurs here
+   |                                     first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:84:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:88:9
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |         ---------^^^^^^---------^
    |         |              |
-   |         |              another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |              another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:84:37
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:88:37
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |                                     ---------^^^^^^^---------^
    |                                     |               |
-   |                                     |               another mutable borrow occurs here
-   |                                     first mutable borrow occurs here
+   |                                     |               another mutable borrow, by `b`, occurs here
+   |                                     first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:91:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:95:9
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |         ---------^^^^^^---------^
    |         |              |
-   |         |              another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |              another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:91:37
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:95:37
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |                                     ---------^^^^^^^---------^
    |                                     |               |
-   |                                     |               another mutable borrow occurs here
-   |                                     first mutable borrow occurs here
+   |                                     |               another mutable borrow, by `b`, occurs here
+   |                                     first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:103:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:107:9
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |         ---------^^^^^^---------^
    |         |              |
-   |         |              another mutable borrow occurs here
-   |         first mutable borrow occurs here
+   |         |              another mutable borrow, by `b`, occurs here
+   |         first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:103:37
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:107:37
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |                                     ---------^^^^^^^---------^
    |                                     |               |
-   |                                     |               another mutable borrow occurs here
-   |                                     first mutable borrow occurs here
+   |                                     |               another mutable borrow, by `b`, occurs here
+   |                                     first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:10:11
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:11:11
    |
 LL |     fn f1(ref mut a @ ref mut b: U) {}
    |           ---------^^^---------
    |           |           |
-   |           |           another mutable borrow occurs here
-   |           first mutable borrow occurs here
+   |           |           another mutable borrow, by `b`, occurs here
+   |           first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:12:11
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:13:11
    |
 LL |     fn f2(ref mut a @ ref mut b: U) {}
    |           ---------^^^---------
    |           |           |
-   |           |           another mutable borrow occurs here
-   |           first mutable borrow occurs here
+   |           |           another mutable borrow, by `b`, occurs here
+   |           first mutable borrow, by `a`, occurs here
 
-error: cannot borrow `a` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:15:9
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:16:9
    |
 LL |           ref mut a @ [
    |           ^--------
    |           |
-   |  _________first mutable borrow occurs here
+   |  _________first mutable borrow, by `a`, occurs here
    | |
 LL | |
 LL | |             [ref b @ .., _],
-   | |              ---------- also borrowed as immutable here
+   | |              ---------- also borrowed as immutable, by `b`, here
 LL | |             [_, ref mut mid @ ..],
-   | |                 ---------------- another mutable borrow occurs here
+   | |                 ---------------- another mutable borrow, by `mid`, occurs here
 LL | |             ..,
 LL | |             [..],
 LL | |         ] : [[U; 4]; 5]
    | |_________^
 
+error: cannot borrow value as mutable more than once at a time
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:24:22
+   |
+LL |     fn f4_also_moved(ref mut a @ ref mut b @ c: U) {}
+   |                      ---------^^^-------------
+   |                      |           |           |
+   |                      |           |           also moved into `c` here
+   |                      |           another mutable borrow, by `b`, occurs here
+   |                      first mutable borrow, by `a`, occurs here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:24:34
+   |
+LL |     fn f4_also_moved(ref mut a @ ref mut b @ c: U) {}
+   |                                  ---------^^^-
+   |                                  |           |
+   |                                  |           value moved into `c` here
+   |                                  value borrowed, by `b`, here
+
 error[E0499]: cannot borrow `_` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:24:21
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:28:21
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ------------^^^^^^^^^
@@ -232,7 +271,7 @@ LL |     drop(a);
    |          - first borrow later used here
 
 error[E0499]: cannot borrow `_` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:34:21
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:38:21
    |
 LL |     let ref mut a @ ref mut b = U;
    |         ------------^^^^^^^^^
@@ -244,7 +283,7 @@ LL |     *a = U;
    |     ------ first borrow later used here
 
 error[E0382]: borrow of moved value
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:62:25
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:66:25
    |
 LL |     let a @ (ref mut b, ref mut c) = (U, U);
    |         ----------------^^^^^^^^^-   ------ move occurs because value has type `(main::U, main::U)`, which does not implement the `Copy` trait
@@ -253,7 +292,7 @@ LL |     let a @ (ref mut b, ref mut c) = (U, U);
    |         value moved here
 
 error[E0382]: borrow of moved value
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:66:21
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:70:21
    |
 LL |     let a @ (b, [c, d]) = &mut val; // Same as ^--
    |         ------------^--   -------- move occurs because value has type `&mut (main::U, [main::U; 2])`, which does not implement the `Copy` trait
@@ -262,7 +301,7 @@ LL |     let a @ (b, [c, d]) = &mut val; // Same as ^--
    |         value moved here
 
 error[E0382]: borrow of moved value
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:70:18
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:74:18
    |
 LL |     let a @ &mut ref mut b = &mut U;
    |         ---------^^^^^^^^^   ------ move occurs because value has type `&mut main::U`, which does not implement the `Copy` trait
@@ -271,7 +310,7 @@ LL |     let a @ &mut ref mut b = &mut U;
    |         value moved here
 
 error[E0382]: borrow of moved value
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:73:30
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:77:30
    |
 LL |     let a @ &mut (ref mut b, ref mut c) = &mut (U, U);
    |         ---------------------^^^^^^^^^-   ----------- move occurs because value has type `&mut (main::U, main::U)`, which does not implement the `Copy` trait
@@ -280,7 +319,7 @@ LL |     let a @ &mut (ref mut b, ref mut c) = &mut (U, U);
    |         value moved here
 
 error[E0499]: cannot borrow `_` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:91:24
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:95:24
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |         ---------------^^^^^^^^^-
@@ -292,7 +331,7 @@ LL |             *a = Err(U);
    |             ----------- first borrow later used here
 
 error[E0499]: cannot borrow `_` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:91:53
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:95:53
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |                                     ----------------^^^^^^^^^-
@@ -304,7 +343,7 @@ LL |             *a = Err(U);
    |             ----------- first borrow later used here
 
 error[E0499]: cannot borrow `_` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:103:24
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:107:24
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |         ---------------^^^^^^^^^-
@@ -316,7 +355,7 @@ LL |             drop(a);
    |                  - first borrow later used here
 
 error[E0499]: cannot borrow `_` as mutable more than once at a time
-  --> $DIR/borrowck-pat-ref-mut-twice.rs:103:53
+  --> $DIR/borrowck-pat-ref-mut-twice.rs:107:53
    |
 LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
    |                                     ----------------^^^^^^^^^-
@@ -327,7 +366,7 @@ LL |         ref mut a @ Ok(ref mut b) | ref mut a @ Err(ref mut b) => {
 LL |             drop(a);
    |                  - first borrow later used here
 
-error: aborting due to 32 previous errors
+error: aborting due to 34 previous errors
 
-Some errors have detailed explanations: E0007, E0382, E0499.
-For more information about an error, try `rustc --explain E0007`.
+Some errors have detailed explanations: E0382, E0499.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/box-patterns.rs b/src/test/ui/pattern/bindings-after-at/box-patterns.rs
new file mode 100644
index 0000000000..ef9669a6b9
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/box-patterns.rs
@@ -0,0 +1,36 @@
+// Test bindings-after-at with box-patterns
+
+// run-pass
+
+#![feature(bindings_after_at)]
+#![feature(box_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+fn test(x: Option<Box<i32>>) -> MatchArm {
+    match x {
+        ref bar @ Some(box n) if n > 0 => {
+            // bar is a &Option<Box<i32>>
+            assert_eq!(bar, &x);
+
+            MatchArm::Arm(0)
+        },
+        Some(ref bar @ box n) if n < 0 => {
+            // bar is a &Box<i32> here
+            assert_eq!(**bar, n);
+
+            MatchArm::Arm(1)
+        },
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    assert_eq!(test(Some(Box::new(2))), MatchArm::Arm(0));
+    assert_eq!(test(Some(Box::new(-1))), MatchArm::Arm(1));
+    assert_eq!(test(Some(Box::new(0))), MatchArm::Wild);
+}
diff --git a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.rs b/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.rs
index db5aabc7a1..821d4b4296 100644
--- a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.rs
+++ b/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.rs
@@ -1,6 +1,7 @@
 // Test that mixing `Copy` and non-`Copy` types in `@` patterns is forbidden.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 #[derive(Copy, Clone)]
 struct C;
@@ -9,12 +10,9 @@ struct NC<A, B>(A, B);
 
 fn main() {
     let a @ NC(b, c) = NC(C, C);
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
+    //~^ ERROR use of moved value
 
     let a @ NC(b, c @ NC(d, e)) = NC(C, NC(C, C));
-    //~^ ERROR cannot bind by-move with sub-bindings
-    //~| ERROR use of moved value
-    //~| ERROR cannot bind by-move with sub-bindings
+    //~^ ERROR use of moved value
     //~| ERROR use of moved value
 }
diff --git a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr b/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr
index cfc35d6c32..7e89008a60 100644
--- a/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr
+++ b/src/test/ui/pattern/bindings-after-at/copy-and-move-mixed.stderr
@@ -1,23 +1,5 @@
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/copy-and-move-mixed.rs:11:9
-   |
-LL |     let a @ NC(b, c) = NC(C, C);
-   |         ^^^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/copy-and-move-mixed.rs:15:9
-   |
-LL |     let a @ NC(b, c @ NC(d, e)) = NC(C, NC(C, C));
-   |         ^^^^^^^^^^^^^^^^^^^^^^^ binds an already bound by-move value by moving it
-
-error[E0007]: cannot bind by-move with sub-bindings
-  --> $DIR/copy-and-move-mixed.rs:15:19
-   |
-LL |     let a @ NC(b, c @ NC(d, e)) = NC(C, NC(C, C));
-   |                   ^^^^^^^^^^^^ binds an already bound by-move value by moving it
-
 error[E0382]: use of moved value
-  --> $DIR/copy-and-move-mixed.rs:11:19
+  --> $DIR/copy-and-move-mixed.rs:12:19
    |
 LL |     let a @ NC(b, c) = NC(C, C);
    |         ----------^-   -------- move occurs because value has type `NC<C, C>`, which does not implement the `Copy` trait
@@ -45,7 +27,6 @@ LL |     let a @ NC(b, c @ NC(d, e)) = NC(C, NC(C, C));
    |
    = note: move occurs because value has type `NC<C, C>`, which does not implement the `Copy` trait
 
-error: aborting due to 6 previous errors
+error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0007, E0382.
-For more information about an error, try `rustc --explain E0007`.
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs b/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs
index 1127d11414..b40c3e3358 100644
--- a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs
+++ b/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.rs
@@ -8,6 +8,7 @@
 // this would create problems for the generalization aforementioned.
 
 #![feature(bindings_after_at)]
+#![feature(move_ref_pattern)]
 
 fn main() {
     struct NotCopy;
@@ -24,14 +25,26 @@ fn main() {
     let ref a @ b = &NotCopy; // OK
     let _: &&NotCopy = a;
 
-    let ref a @ b = NotCopy; //~ ERROR cannot bind by-move and by-ref in the same pattern
-    let ref mut a @ b = NotCopy; //~ ERROR cannot bind by-move and by-ref in the same pattern
+    let ref a @ b = NotCopy; //~ ERROR cannot move out of value because it is borrowed
+    let _a: &NotCopy = a;
+    let _b: NotCopy = b;
+    let ref mut a @ b = NotCopy; //~ ERROR cannot move out of value because it is borrowed
+    //~^ ERROR cannot move out of `_` because it is borrowed
+    let _a: &NotCopy = a;
+    let _b: NotCopy = b;
     match Ok(NotCopy) {
-        Ok(ref a @ b) | Err(ref a @ b) => {}
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern
+        Ok(ref a @ b) | Err(b @ ref a) => {
+            //~^ ERROR cannot move out of value because it is borrowed
+            //~| ERROR borrow of moved value
+            let _a: &NotCopy = a;
+            let _b: NotCopy = b;
+        }
     }
     match NotCopy {
-        ref a @ b => {}
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern
+        ref a @ b => {
+            //~^ ERROR cannot move out of value because it is borrowed
+            let _a: &NotCopy = a;
+            let _b: NotCopy = b;
+        }
     }
 }
diff --git a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr b/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr
index b6709a8a40..19e815a1ae 100644
--- a/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr
+++ b/src/test/ui/pattern/bindings-after-at/default-binding-modes-both-sides-independent.stderr
@@ -1,41 +1,61 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/default-binding-modes-both-sides-independent.rs:27:17
+error: cannot move out of value because it is borrowed
+  --> $DIR/default-binding-modes-both-sides-independent.rs:28:9
    |
 LL |     let ref a @ b = NotCopy;
-   |         --------^
+   |         -----^^^-
    |         |       |
-   |         |       by-move pattern here
-   |         by-ref pattern here
+   |         |       value moved into `b` here
+   |         value borrowed, by `a`, here
 
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/default-binding-modes-both-sides-independent.rs:28:21
+error: cannot move out of value because it is borrowed
+  --> $DIR/default-binding-modes-both-sides-independent.rs:31:9
    |
 LL |     let ref mut a @ b = NotCopy;
-   |         ------------^
+   |         ---------^^^-
    |         |           |
-   |         |           by-move pattern here
-   |         by-ref pattern here
+   |         |           value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error: cannot move out of value because it is borrowed
+  --> $DIR/default-binding-modes-both-sides-independent.rs:36:12
+   |
+LL |         Ok(ref a @ b) | Err(b @ ref a) => {
+   |            -----^^^-
+   |            |       |
+   |            |       value moved into `b` here
+   |            value borrowed, by `a`, here
 
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/default-binding-modes-both-sides-independent.rs:30:20
+error: borrow of moved value
+  --> $DIR/default-binding-modes-both-sides-independent.rs:36:29
    |
-LL |         Ok(ref a @ b) | Err(ref a @ b) => {}
-   |            --------^        --------^
-   |            |       |        |       |
-   |            |       |        |       by-move pattern here
-   |            |       |        by-ref pattern here
-   |            |       by-move pattern here
-   |            by-ref pattern here
+LL |         Ok(ref a @ b) | Err(b @ ref a) => {
+   |                             -^^^-----
+   |                             |   |
+   |                             |   value borrowed here after move
+   |                             value moved into `b` here
+   |                             move occurs because `b` has type `main::NotCopy` which does not implement the `Copy` trait
 
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/default-binding-modes-both-sides-independent.rs:34:17
+error: cannot move out of value because it is borrowed
+  --> $DIR/default-binding-modes-both-sides-independent.rs:44:9
    |
-LL |         ref a @ b => {}
-   |         --------^
+LL |         ref a @ b => {
+   |         -----^^^-
    |         |       |
-   |         |       by-move pattern here
-   |         by-ref pattern here
+   |         |       value moved into `b` here
+   |         value borrowed, by `a`, here
+
+error[E0505]: cannot move out of `_` because it is borrowed
+  --> $DIR/default-binding-modes-both-sides-independent.rs:31:21
+   |
+LL |     let ref mut a @ b = NotCopy;
+   |         ------------^
+   |         |           |
+   |         |           move out of value occurs here
+   |         borrow of value occurs here
+LL |
+LL |     let _a: &NotCopy = a;
+   |                        - borrow later used here
 
-error: aborting due to 4 previous errors
+error: aborting due to 6 previous errors
 
-For more information about this error, try `rustc --explain E0009`.
+For more information about this error, try `rustc --explain E0505`.
diff --git a/src/test/ui/pattern/bindings-after-at/feature-gate-bindings_after_at.stderr b/src/test/ui/pattern/bindings-after-at/feature-gate-bindings_after_at.stderr
index 5408f6b5fb..b976ef4861 100644
--- a/src/test/ui/pattern/bindings-after-at/feature-gate-bindings_after_at.stderr
+++ b/src/test/ui/pattern/bindings-after-at/feature-gate-bindings_after_at.stderr
@@ -4,7 +4,7 @@ error[E0658]: pattern bindings after an `@` are unstable
 LL |     let x @ y = 0;
    |             ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/65490
+   = note: see issue #65490 <https://github.com/rust-lang/rust/issues/65490> for more information
    = help: add `#![feature(bindings_after_at)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs b/src/test/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs
new file mode 100644
index 0000000000..497d94a3db
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/nested-binding-mode-lint.rs
@@ -0,0 +1,13 @@
+// check-pass
+
+#![feature(bindings_after_at)]
+#![deny(unused_mut)]
+
+fn main() {
+    let mut is_mut @ not_mut = 42;
+    &mut is_mut;
+    &not_mut;
+    let not_mut @ mut is_mut = 42;
+    &mut is_mut;
+    &not_mut;
+}
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs
new file mode 100644
index 0000000000..54f04117f7
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.rs
@@ -0,0 +1,13 @@
+#![feature(bindings_after_at)]
+
+fn main() {
+    let mut is_mut @ not_mut = 42;
+    &mut is_mut;
+    &mut not_mut;
+    //~^ ERROR cannot borrow
+
+    let not_mut @ mut is_mut = 42;
+    &mut is_mut;
+    &mut not_mut;
+    //~^ ERROR cannot borrow
+}
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr
new file mode 100644
index 0000000000..a8d5e4c4c6
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-mut.stderr
@@ -0,0 +1,21 @@
+error[E0596]: cannot borrow `not_mut` as mutable, as it is not declared as mutable
+  --> $DIR/nested-binding-modes-mut.rs:6:5
+   |
+LL |     let mut is_mut @ not_mut = 42;
+   |                      ------- help: consider changing this to be mutable: `mut not_mut`
+LL |     &mut is_mut;
+LL |     &mut not_mut;
+   |     ^^^^^^^^^^^^ cannot borrow as mutable
+
+error[E0596]: cannot borrow `not_mut` as mutable, as it is not declared as mutable
+  --> $DIR/nested-binding-modes-mut.rs:11:5
+   |
+LL |     let not_mut @ mut is_mut = 42;
+   |         -------------------- help: consider changing this to be mutable: `mut not_mut`
+LL |     &mut is_mut;
+LL |     &mut not_mut;
+   |     ^^^^^^^^^^^^ cannot borrow as mutable
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs
new file mode 100644
index 0000000000..d5086aec93
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.rs
@@ -0,0 +1,13 @@
+#![feature(bindings_after_at)]
+
+fn main() {
+    let ref is_ref @ is_val = 42;
+    *is_ref;
+    *is_val;
+    //~^ ERROR cannot be dereferenced
+
+    let is_val @ ref is_ref = 42;
+    *is_ref;
+    *is_val;
+    //~^ ERROR cannot be dereferenced
+}
diff --git a/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr
new file mode 100644
index 0000000000..9cc928d214
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/nested-binding-modes-ref.stderr
@@ -0,0 +1,15 @@
+error[E0614]: type `{integer}` cannot be dereferenced
+  --> $DIR/nested-binding-modes-ref.rs:6:5
+   |
+LL |     *is_val;
+   |     ^^^^^^^
+
+error[E0614]: type `{integer}` cannot be dereferenced
+  --> $DIR/nested-binding-modes-ref.rs:11:5
+   |
+LL |     *is_val;
+   |     ^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0614`.
diff --git a/src/test/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs b/src/test/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs
new file mode 100644
index 0000000000..ca8826f03f
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/or-patterns-box-patterns.rs
@@ -0,0 +1,45 @@
+// Test bindings-after-at with or-patterns and box-patterns
+
+// run-pass
+
+#![feature(bindings_after_at)]
+#![feature(or_patterns)]
+#![feature(box_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+#[derive(Debug, PartialEq)]
+enum Test {
+    Foo,
+    Bar,
+    Baz,
+    Qux,
+}
+
+fn test(foo: Option<Box<Test>>) -> MatchArm {
+    match foo {
+        ref bar @ Some(box Test::Foo | box Test::Bar) => {
+            assert_eq!(bar, &foo);
+
+            MatchArm::Arm(0)
+        },
+        Some(ref bar @ box Test::Baz | ref bar @ box Test::Qux) => {
+            assert!(**bar == Test::Baz || **bar == Test::Qux);
+
+            MatchArm::Arm(1)
+        },
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    assert_eq!(test(Some(Box::new(Test::Foo))), MatchArm::Arm(0));
+    assert_eq!(test(Some(Box::new(Test::Bar))), MatchArm::Arm(0));
+    assert_eq!(test(Some(Box::new(Test::Baz))), MatchArm::Arm(1));
+    assert_eq!(test(Some(Box::new(Test::Qux))), MatchArm::Arm(1));
+    assert_eq!(test(None), MatchArm::Wild);
+}
diff --git a/src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs b/src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
new file mode 100644
index 0000000000..65c2b3741b
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/or-patterns-slice-patterns.rs
@@ -0,0 +1,56 @@
+// Test bindings-after-at with or-patterns and slice-patterns
+
+// run-pass
+
+#![feature(bindings_after_at)]
+#![feature(or_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+#[derive(Debug, PartialEq)]
+enum Test {
+    Foo,
+    Bar,
+    Baz,
+    Qux,
+}
+
+fn test(foo: &[Option<Test>]) -> MatchArm {
+    match foo {
+        bar @ [Some(Test::Foo), .., Some(Test::Qux | Test::Foo)] => {
+            assert_eq!(bar, foo);
+
+            MatchArm::Arm(0)
+        },
+        [.., bar @ Some(Test::Bar | Test::Qux), _] => {
+            assert!(bar == &Some(Test::Bar) || bar == &Some(Test::Qux));
+
+            MatchArm::Arm(1)
+        },
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    let foo = vec![
+        Some(Test::Foo),
+        Some(Test::Bar),
+        Some(Test::Baz),
+        Some(Test::Qux),
+    ];
+
+    // path 1a
+    assert_eq!(test(&foo), MatchArm::Arm(0));
+    // path 1b
+    assert_eq!(test(&[Some(Test::Foo), Some(Test::Bar), Some(Test::Foo)]), MatchArm::Arm(0));
+    // path 2a
+    assert_eq!(test(&foo[..3]), MatchArm::Arm(1));
+    // path 2b
+    assert_eq!(test(&[Some(Test::Bar), Some(Test::Qux), Some(Test::Baz)]), MatchArm::Arm(1));
+    // path 3
+    assert_eq!(test(&foo[1..2]), MatchArm::Wild);
+}
diff --git a/src/test/ui/pattern/bindings-after-at/or-patterns.rs b/src/test/ui/pattern/bindings-after-at/or-patterns.rs
new file mode 100644
index 0000000000..a0e14004ab
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/or-patterns.rs
@@ -0,0 +1,40 @@
+// Test bindings-after-at with or-patterns
+
+// run-pass
+
+#![feature(bindings_after_at)]
+#![feature(or_patterns)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+enum Test {
+    Foo,
+    Bar,
+    Baz,
+    Qux,
+}
+
+fn test(foo: Option<Test>) -> MatchArm {
+    match foo {
+        bar @ Some(Test::Foo | Test::Bar) => {
+            assert!(bar == Some(Test::Foo) || bar == Some(Test::Bar));
+
+            MatchArm::Arm(0)
+        },
+        Some(_) => MatchArm::Arm(1),
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    assert_eq!(test(Some(Test::Foo)), MatchArm::Arm(0));
+    assert_eq!(test(Some(Test::Bar)), MatchArm::Arm(0));
+    assert_eq!(test(Some(Test::Baz)), MatchArm::Arm(1));
+    assert_eq!(test(Some(Test::Qux)), MatchArm::Arm(1));
+    assert_eq!(test(None), MatchArm::Wild);
+}
diff --git a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.rs b/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.rs
index 89ea2d5181..e8b5b492b7 100644
--- a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.rs
+++ b/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.rs
@@ -3,7 +3,6 @@
 
 #![feature(bindings_after_at)]
 #![feature(or_patterns)]
-//~^ WARN the feature `or_patterns` is incomplete and may cause the compiler to crash
 
 fn main() {
     fn f(a @ a @ a: ()) {}
diff --git a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr b/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
index c568d2a3aa..cba17d82e9 100644
--- a/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
+++ b/src/test/ui/pattern/bindings-after-at/pat-at-same-name-both.stderr
@@ -1,71 +1,63 @@
 error[E0415]: identifier `a` is bound more than once in this parameter list
-  --> $DIR/pat-at-same-name-both.rs:9:14
+  --> $DIR/pat-at-same-name-both.rs:8:14
    |
 LL |     fn f(a @ a @ a: ()) {}
    |              ^ used as parameter more than once
 
 error[E0415]: identifier `a` is bound more than once in this parameter list
-  --> $DIR/pat-at-same-name-both.rs:9:18
+  --> $DIR/pat-at-same-name-both.rs:8:18
    |
 LL |     fn f(a @ a @ a: ()) {}
    |                  ^ used as parameter more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:14:20
+  --> $DIR/pat-at-same-name-both.rs:13:20
    |
 LL |         Ok(a @ b @ a)
    |                    ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:16:23
+  --> $DIR/pat-at-same-name-both.rs:15:23
    |
 LL |         | Err(a @ b @ a)
    |                       ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:21:13
+  --> $DIR/pat-at-same-name-both.rs:20:13
    |
 LL |     let a @ a @ a = ();
    |             ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:21:17
+  --> $DIR/pat-at-same-name-both.rs:20:17
    |
 LL |     let a @ a @ a = ();
    |                 ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:24:21
+  --> $DIR/pat-at-same-name-both.rs:23:21
    |
 LL |     let ref a @ ref a = ();
    |                     ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:26:29
+  --> $DIR/pat-at-same-name-both.rs:25:29
    |
 LL |     let ref mut a @ ref mut a = ();
    |                             ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:29:17
+  --> $DIR/pat-at-same-name-both.rs:28:17
    |
 LL |     let a @ (Ok(a) | Err(a)) = Ok(());
    |                 ^ used in a pattern more than once
 
 error[E0416]: identifier `a` is bound more than once in the same pattern
-  --> $DIR/pat-at-same-name-both.rs:29:26
+  --> $DIR/pat-at-same-name-both.rs:28:26
    |
 LL |     let a @ (Ok(a) | Err(a)) = Ok(());
    |                          ^ used in a pattern more than once
 
-warning: the feature `or_patterns` is incomplete and may cause the compiler to crash
-  --> $DIR/pat-at-same-name-both.rs:5:12
-   |
-LL | #![feature(or_patterns)]
-   |            ^^^^^^^^^^^
-   |
-   = note: `#[warn(incomplete_features)]` on by default
-
 error: aborting due to 10 previous errors
 
 Some errors have detailed explanations: E0415, E0416.
diff --git a/src/test/ui/pattern/bindings-after-at/slice-patterns.rs b/src/test/ui/pattern/bindings-after-at/slice-patterns.rs
new file mode 100644
index 0000000000..7e50527af0
--- /dev/null
+++ b/src/test/ui/pattern/bindings-after-at/slice-patterns.rs
@@ -0,0 +1,40 @@
+// Test bindings-after-at with slice-patterns
+
+// run-pass
+
+#![feature(bindings_after_at)]
+
+#[derive(Debug, PartialEq)]
+enum MatchArm {
+    Arm(usize),
+    Wild,
+}
+
+fn test(foo: &[i32]) -> MatchArm {
+    match foo {
+        [bar @ .., n] if n == &5 => {
+            for i in bar {
+                assert!(i < &5);
+            }
+
+            MatchArm::Arm(0)
+        },
+        bar @ [x0, .., xn] => {
+            assert_eq!(x0, &1);
+            assert_eq!(x0, &1);
+            assert_eq!(xn, &4);
+            assert_eq!(bar, &[1, 2, 3, 4]);
+
+            MatchArm::Arm(1)
+        },
+        _ => MatchArm::Wild,
+    }
+}
+
+fn main() {
+    let foo = vec![1, 2, 3, 4, 5];
+
+    assert_eq!(test(&foo), MatchArm::Arm(0));
+    assert_eq!(test(&foo[..4]), MatchArm::Arm(1));
+    assert_eq!(test(&foo[0..1]), MatchArm::Wild);
+}
diff --git a/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr b/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr
index b32cf8cbb0..308a6c7c58 100644
--- a/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr
+++ b/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr
@@ -4,7 +4,7 @@ error: irrefutable if-let pattern
 LL |     if let _ = 5 {}
    |     ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/deny-irrefutable-let-patterns.rs:1:9
    |
 LL | #![deny(irrefutable_let_patterns)]
diff --git a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs b/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs
new file mode 100644
index 0000000000..d2d4e61e04
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern-pass.rs
@@ -0,0 +1,31 @@
+// check-pass
+
+#![feature(move_ref_pattern)]
+
+fn main() {}
+
+struct U;
+
+fn slice() {
+    let mut arr = [U, U, U, U, U, U, U, U];
+    let [ref _x0, _x1, _, mut _x3, .., ref _x6, _x7] = arr;
+    _x3 = U;
+    let [ref mut _x0, _, ref _x2, _, _x4, ref mut _x5, _x6, _] = arr;
+    *_x5 = U;
+    let [_, _, _x2, _, _, _x5, _, _] = arr;
+    *_x0 = U;
+    let [ref _x0, ..] = arr;
+    let [_x0, ..] = arr;
+}
+
+fn tuple() {
+    let mut tup = (U, U, U, U, U);
+    let (ref _x0, mut _x1, ref _x2, ..) = tup;
+    _x1 = U;
+    let (ref mut _x0, _, _, ref _x3, _x4) = tup;
+    let (_, _, _, _x3, _) = tup;
+    *_x0 = U;
+    drop(_x2);
+    drop(tup.2);
+    let (_x0, _, _, ..) = tup;
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs b/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs
new file mode 100644
index 0000000000..3ee008fd84
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.rs
@@ -0,0 +1,50 @@
+#![feature(move_ref_pattern)]
+
+fn main() {}
+
+struct U;
+
+fn slice() {
+    let mut arr = [U, U, U, U, U];
+    let hold_all = &arr;
+    let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr; //~ ERROR cannot move out of `arr[..]`
+    _x1 = U; //~ ERROR cannot assign twice to immutable variable `_x1`
+    drop(hold_all);
+    let [_x0, ..] = arr; //~ ERROR cannot move out of `arr[..]`
+    drop(_x0_hold);
+    let [_, _, ref mut _x2, _x3, mut _x4] = arr;
+    //~^ ERROR cannot borrow `arr[..]` as mutable
+    //~| ERROR cannot move out of `arr[..]` because it is borrowed
+    //~| ERROR cannot move out of `arr[..]` because it is borrowed
+    drop(xs_hold);
+}
+
+fn tuple() {
+    let mut tup = (U, U, U, U);
+    let (ref _x0, _x1, ref _x2, ..) = tup;
+    _x1 = U; //~ ERROR cannot assign twice to immutable variable
+    let _x0_hold = &mut tup.0; //~ ERROR cannot borrow `tup.0` as mutable because it is also
+    let (ref mut _x0_hold, ..) = tup; //~ ERROR cannot borrow `tup.0` as mutable because it is also
+    *_x0 = U; //~ ERROR cannot assign to `*_x0` which is behind a `&` reference
+    *_x2 = U; //~ ERROR cannot assign to `*_x2` which is behind a `&` reference
+    drop(tup.1); //~ ERROR use of moved value: `tup.1`
+    let _x1_hold = &tup.1; //~ ERROR borrow of moved value: `tup.1`
+    let (.., ref mut _x3) = tup;
+    let _x3_hold = &tup.3; //~ ERROR cannot borrow `tup.3` as immutable
+    let _x3_hold = &mut tup.3; //~ ERROR cannot borrow `tup.3` as mutable more
+    let (.., ref mut _x4_hold) = tup; //~ ERROR cannot borrow `tup.3` as mutable more
+    let (.., ref _x4_hold) = tup; //~ ERROR cannot borrow `tup.3` as immutable
+    drop(_x3);
+}
+
+fn closure() {
+    let mut tup = (U, U, U);
+    let c1 = || {
+        let (ref _x0, _x1, _) = tup;
+    };
+    let c2 = || {
+        //~^ ERROR use of moved value
+        let (ref mut _x0, _, _x2) = tup;
+    };
+    drop(c1);
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr b/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
new file mode 100644
index 0000000000..d718ee29cf
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/borrowck-move-ref-pattern.stderr
@@ -0,0 +1,208 @@
+error[E0505]: cannot move out of `arr[..]` because it is borrowed
+  --> $DIR/borrowck-move-ref-pattern.rs:10:24
+   |
+LL |     let hold_all = &arr;
+   |                    ---- borrow of `arr` occurs here
+LL |     let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr;
+   |                        ^^^ move out of `arr[..]` occurs here
+LL |     _x1 = U;
+LL |     drop(hold_all);
+   |          -------- borrow later used here
+
+error[E0384]: cannot assign twice to immutable variable `_x1`
+  --> $DIR/borrowck-move-ref-pattern.rs:11:5
+   |
+LL |     let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr;
+   |                        ---
+   |                        |
+   |                        first assignment to `_x1`
+   |                        help: make this binding mutable: `mut _x1`
+LL |     _x1 = U;
+   |     ^^^^^^^ cannot assign twice to immutable variable
+
+error[E0505]: cannot move out of `arr[..]` because it is borrowed
+  --> $DIR/borrowck-move-ref-pattern.rs:13:10
+   |
+LL |     let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr;
+   |          ------------ borrow of `arr[..]` occurs here
+...
+LL |     let [_x0, ..] = arr;
+   |          ^^^ move out of `arr[..]` occurs here
+LL |     drop(_x0_hold);
+   |          -------- borrow later used here
+
+error[E0502]: cannot borrow `arr[..]` as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-move-ref-pattern.rs:15:16
+   |
+LL |     let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr;
+   |                             ---------------- immutable borrow occurs here
+...
+LL |     let [_, _, ref mut _x2, _x3, mut _x4] = arr;
+   |                ^^^^^^^^^^^ mutable borrow occurs here
+...
+LL |     drop(xs_hold);
+   |          ------- immutable borrow later used here
+
+error[E0505]: cannot move out of `arr[..]` because it is borrowed
+  --> $DIR/borrowck-move-ref-pattern.rs:15:29
+   |
+LL |     let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr;
+   |                             ---------------- borrow of `arr[..]` occurs here
+...
+LL |     let [_, _, ref mut _x2, _x3, mut _x4] = arr;
+   |                             ^^^ move out of `arr[..]` occurs here
+...
+LL |     drop(xs_hold);
+   |          ------- borrow later used here
+
+error[E0505]: cannot move out of `arr[..]` because it is borrowed
+  --> $DIR/borrowck-move-ref-pattern.rs:15:34
+   |
+LL |     let [ref _x0_hold, _x1, ref xs_hold @ ..] = arr;
+   |                             ---------------- borrow of `arr[..]` occurs here
+...
+LL |     let [_, _, ref mut _x2, _x3, mut _x4] = arr;
+   |                                  ^^^^^^^ move out of `arr[..]` occurs here
+...
+LL |     drop(xs_hold);
+   |          ------- borrow later used here
+
+error[E0384]: cannot assign twice to immutable variable `_x1`
+  --> $DIR/borrowck-move-ref-pattern.rs:25:5
+   |
+LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
+   |                   ---
+   |                   |
+   |                   first assignment to `_x1`
+   |                   help: make this binding mutable: `mut _x1`
+LL |     _x1 = U;
+   |     ^^^^^^^ cannot assign twice to immutable variable
+
+error[E0502]: cannot borrow `tup.0` as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-move-ref-pattern.rs:26:20
+   |
+LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
+   |          ------- immutable borrow occurs here
+LL |     _x1 = U;
+LL |     let _x0_hold = &mut tup.0;
+   |                    ^^^^^^^^^^ mutable borrow occurs here
+LL |     let (ref mut _x0_hold, ..) = tup;
+LL |     *_x0 = U;
+   |     -------- immutable borrow later used here
+
+error[E0502]: cannot borrow `tup.0` as mutable because it is also borrowed as immutable
+  --> $DIR/borrowck-move-ref-pattern.rs:27:10
+   |
+LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
+   |          ------- immutable borrow occurs here
+...
+LL |     let (ref mut _x0_hold, ..) = tup;
+   |          ^^^^^^^^^^^^^^^^ mutable borrow occurs here
+LL |     *_x0 = U;
+   |     -------- immutable borrow later used here
+
+error[E0594]: cannot assign to `*_x0` which is behind a `&` reference
+  --> $DIR/borrowck-move-ref-pattern.rs:28:5
+   |
+LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
+   |          ------- help: consider changing this to be a mutable reference: `ref mut _x0`
+...
+LL |     *_x0 = U;
+   |     ^^^^^^^^ `_x0` is a `&` reference, so the data it refers to cannot be written
+
+error[E0594]: cannot assign to `*_x2` which is behind a `&` reference
+  --> $DIR/borrowck-move-ref-pattern.rs:29:5
+   |
+LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
+   |                        ------- help: consider changing this to be a mutable reference: `ref mut _x2`
+...
+LL |     *_x2 = U;
+   |     ^^^^^^^^ `_x2` is a `&` reference, so the data it refers to cannot be written
+
+error[E0382]: use of moved value: `tup.1`
+  --> $DIR/borrowck-move-ref-pattern.rs:30:10
+   |
+LL |     let (ref _x0, _x1, ref _x2, ..) = tup;
+   |                   --- value moved here
+...
+LL |     drop(tup.1);
+   |          ^^^^^ value used here after move
+   |
+   = note: move occurs because `tup.1` has type `U`, which does not implement the `Copy` trait
+
+error[E0382]: borrow of moved value: `tup.1`
+  --> $DIR/borrowck-move-ref-pattern.rs:31:20
+   |
+LL |     drop(tup.1);
+   |          ----- value moved here
+LL |     let _x1_hold = &tup.1;
+   |                    ^^^^^^ value borrowed here after move
+   |
+   = note: move occurs because `tup.1` has type `U`, which does not implement the `Copy` trait
+
+error[E0502]: cannot borrow `tup.3` as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-move-ref-pattern.rs:33:20
+   |
+LL |     let (.., ref mut _x3) = tup;
+   |              ----------- mutable borrow occurs here
+LL |     let _x3_hold = &tup.3;
+   |                    ^^^^^^ immutable borrow occurs here
+...
+LL |     drop(_x3);
+   |          --- mutable borrow later used here
+
+error[E0499]: cannot borrow `tup.3` as mutable more than once at a time
+  --> $DIR/borrowck-move-ref-pattern.rs:34:20
+   |
+LL |     let (.., ref mut _x3) = tup;
+   |              ----------- first mutable borrow occurs here
+LL |     let _x3_hold = &tup.3;
+LL |     let _x3_hold = &mut tup.3;
+   |                    ^^^^^^^^^^ second mutable borrow occurs here
+...
+LL |     drop(_x3);
+   |          --- first borrow later used here
+
+error[E0499]: cannot borrow `tup.3` as mutable more than once at a time
+  --> $DIR/borrowck-move-ref-pattern.rs:35:14
+   |
+LL |     let (.., ref mut _x3) = tup;
+   |              ----------- first mutable borrow occurs here
+...
+LL |     let (.., ref mut _x4_hold) = tup;
+   |              ^^^^^^^^^^^^^^^^ second mutable borrow occurs here
+LL |     let (.., ref _x4_hold) = tup;
+LL |     drop(_x3);
+   |          --- first borrow later used here
+
+error[E0502]: cannot borrow `tup.3` as immutable because it is also borrowed as mutable
+  --> $DIR/borrowck-move-ref-pattern.rs:36:14
+   |
+LL |     let (.., ref mut _x3) = tup;
+   |              ----------- mutable borrow occurs here
+...
+LL |     let (.., ref _x4_hold) = tup;
+   |              ^^^^^^^^^^^^ immutable borrow occurs here
+LL |     drop(_x3);
+   |          --- mutable borrow later used here
+
+error[E0382]: use of moved value: `tup`
+  --> $DIR/borrowck-move-ref-pattern.rs:45:14
+   |
+LL |     let mut tup = (U, U, U);
+   |         ------- move occurs because `tup` has type `(U, U, U)`, which does not implement the `Copy` trait
+LL |     let c1 = || {
+   |              -- value moved into closure here
+LL |         let (ref _x0, _x1, _) = tup;
+   |                                 --- variable moved due to use in closure
+LL |     };
+LL |     let c2 = || {
+   |              ^^ value used here after move
+LL |
+LL |         let (ref mut _x0, _, _x2) = tup;
+   |                                     --- use occurs due to use in closure
+
+error: aborting due to 18 previous errors
+
+Some errors have detailed explanations: E0382, E0384, E0499, E0502, E0505, E0594.
+For more information about an error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs b/src/test/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs
new file mode 100644
index 0000000000..08fb5cd2e1
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/by-move-sub-pat-unreachable.rs
@@ -0,0 +1,15 @@
+// When conflicts between by-move bindings in `by_move_1 @ has_by_move` patterns
+// happen and that code is unreachable according to borrowck, we accept this code.
+// In particular, we want to ensure here that an ICE does not happen, which it did originally.
+
+// check-pass
+
+#![feature(move_ref_pattern)]
+#![feature(bindings_after_at)]
+
+fn main() {
+    return;
+
+    struct S;
+    let a @ (b, c) = (S, S);
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.rs b/src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.rs
new file mode 100644
index 0000000000..fb92eb1ba3
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.rs
@@ -0,0 +1,23 @@
+fn main() {
+    #[derive(Clone)]
+    struct X {
+        x: (),
+    }
+    let mut tup = (X { x: () }, X { x: () });
+    match Some(tup.clone()) {
+        Some((y, ref z)) => {}
+        //~^ ERROR binding by-move and by-ref in the same pattern is unstable
+        None => panic!(),
+    }
+
+    let (ref a, b) = tup.clone();
+    //~^ ERROR binding by-move and by-ref in the same pattern is unstable
+
+    let (a, mut b) = &tup;
+    //~^ ERROR binding by-move and by-ref in the same pattern is unstable
+    //~| ERROR cannot move out of a shared reference
+
+    let (mut a, b) = &mut tup;
+    //~^ ERROR binding by-move and by-ref in the same pattern is unstable
+    //~| ERROR cannot move out of a mutable reference
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.stderr b/src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.stderr
new file mode 100644
index 0000000000..eb5391a95d
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/feature-gate-move_ref_pattern.stderr
@@ -0,0 +1,66 @@
+error[E0658]: binding by-move and by-ref in the same pattern is unstable
+  --> $DIR/feature-gate-move_ref_pattern.rs:8:15
+   |
+LL |         Some((y, ref z)) => {}
+   |               ^  ----- by-ref pattern here
+   |               |
+   |               by-move pattern here
+   |
+   = note: see issue #68354 <https://github.com/rust-lang/rust/issues/68354> for more information
+   = help: add `#![feature(move_ref_pattern)]` to the crate attributes to enable
+
+error[E0658]: binding by-move and by-ref in the same pattern is unstable
+  --> $DIR/feature-gate-move_ref_pattern.rs:13:17
+   |
+LL |     let (ref a, b) = tup.clone();
+   |          -----  ^ by-move pattern here
+   |          |
+   |          by-ref pattern here
+   |
+   = note: see issue #68354 <https://github.com/rust-lang/rust/issues/68354> for more information
+   = help: add `#![feature(move_ref_pattern)]` to the crate attributes to enable
+
+error[E0658]: binding by-move and by-ref in the same pattern is unstable
+  --> $DIR/feature-gate-move_ref_pattern.rs:16:13
+   |
+LL |     let (a, mut b) = &tup;
+   |          -  ^^^^^ by-move pattern here
+   |          |
+   |          by-ref pattern here
+   |
+   = note: see issue #68354 <https://github.com/rust-lang/rust/issues/68354> for more information
+   = help: add `#![feature(move_ref_pattern)]` to the crate attributes to enable
+
+error[E0658]: binding by-move and by-ref in the same pattern is unstable
+  --> $DIR/feature-gate-move_ref_pattern.rs:20:10
+   |
+LL |     let (mut a, b) = &mut tup;
+   |          ^^^^^  - by-ref pattern here
+   |          |
+   |          by-move pattern here
+   |
+   = note: see issue #68354 <https://github.com/rust-lang/rust/issues/68354> for more information
+   = help: add `#![feature(move_ref_pattern)]` to the crate attributes to enable
+
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/feature-gate-move_ref_pattern.rs:16:22
+   |
+LL |     let (a, mut b) = &tup;
+   |             -----    ^^^^
+   |             |
+   |             data moved here
+   |             move occurs because `b` has type `main::X`, which does not implement the `Copy` trait
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/feature-gate-move_ref_pattern.rs:20:22
+   |
+LL |     let (mut a, b) = &mut tup;
+   |          -----       ^^^^^^^^
+   |          |
+   |          data moved here
+   |          move occurs because `a` has type `main::X`, which does not implement the `Copy` trait
+
+error: aborting due to 6 previous errors
+
+Some errors have detailed explanations: E0507, E0658.
+For more information about an error, try `rustc --explain E0507`.
diff --git a/src/test/ui/pattern/move-ref-patterns/issue-53840.rs b/src/test/ui/pattern/move-ref-patterns/issue-53840.rs
new file mode 100644
index 0000000000..ab7d10d9f8
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/issue-53840.rs
@@ -0,0 +1,22 @@
+// check-pass
+
+#![feature(move_ref_pattern)]
+
+enum E {
+    Foo(String, String, String),
+}
+
+struct Bar {
+    a: String,
+    b: String,
+}
+
+fn main() {
+    let bar = Bar { a: "1".to_string(), b: "2".to_string() };
+    match E::Foo("".into(), "".into(), "".into()) {
+        E::Foo(a, b, ref c) => {}
+    }
+    match bar {
+        Bar { a, ref b } => {}
+    }
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs
new file mode 100644
index 0000000000..4c3ca62e16
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.rs
@@ -0,0 +1,122 @@
+#![feature(move_ref_pattern)]
+
+fn main() {
+    struct S; // Not `Copy`.
+
+    let mut tup0 = (S, S);
+    let mut tup1 = (S, S, S);
+    let tup2 = (S, S);
+    let tup3 = (S, S, S);
+    let tup4 = (S, S);
+    let mut arr0 = [S, S, S];
+    let mut arr1 = [S, S, S, S, S];
+    let arr2 = [S, S, S];
+    let arr3 = [S, S, S, S, S];
+
+    // The `mov` bindings require that we capture the scrutinees by-move.
+    let mut closure = || {
+        // Tuples...
+        let (ref mut borrow, mov) = tup0;
+        let (mov, _, ref mut borrow) = tup1;
+        let (ref borrow, mov) = tup2;
+        let (mov, _, ref borrow) = tup3;
+        let (ref borrow, mov) = tup4;
+        // Arrays...
+        let [mov @ .., ref borrow] = arr0;
+        let [_, ref mut borrow @ .., _, mov] = arr1;
+        let [mov @ .., ref borrow] = arr2;
+        let [_, ref borrow @ .., _, mov] = arr3;
+    };
+
+    // Now we try to borrow and move the captures, which should result in errors...
+    // ...for tuples:
+    drop(&tup0); //~ ERROR borrow of moved value: `tup0`
+    drop(&tup1); //~ ERROR borrow of moved value: `tup1`
+    drop(&tup2); //~ ERROR borrow of moved value: `tup2`
+    drop(&tup3); //~ ERROR borrow of moved value: `tup3`
+    // Ostensibly this should compile.
+    // However, because closures don't capture individual fields, which is changed in RFC 2229,
+    // this won't compile because the entire product is moved into the closure.
+    // The same applies to the array patterns below.
+    drop(&tup4.0); //~ ERROR borrow of moved value: `tup4`
+    // ...for arrays:
+    drop(&arr0); //~ ERROR borrow of moved value: `arr0`
+    let [_, mov1, mov2, mov3, _] = &arr1; //~ ERROR borrow of moved value: `arr1`
+    drop(&arr2); //~ ERROR borrow of moved value: `arr2`
+    let [_, mov1, mov2, mov3, _] = &arr3; //~ ERROR borrow of moved value: `arr3`
+
+    // Let's redo ^--- with a `match` + sum type:
+    macro_rules! m {
+        ($p:pat = $s:expr) => {
+            match $s {
+                Some($p) => {}
+                _ => {}
+            }
+        };
+    }
+    let mut tup0: Option<(S, S)> = None;
+    let mut tup1: Option<(S, S, S)> = None;
+    let tup2: Option<(S, S)> = None;
+    let tup3: Option<(S, S, S)> = None;
+    let tup4: Option<(S, S)> = None;
+    let mut arr0: Option<[S; 3]> = None;
+    let mut arr1: Option<[S; 5]> = None;
+    let arr2: Option<[S; 3]> = None;
+    let arr3: Option<[S; 5]> = None;
+    let mut closure = || {
+        m!((ref mut borrow, mov) = tup0);
+        m!((mov, _, ref mut borrow) = tup1);
+        m!((ref borrow, mov) = tup2);
+        m!((mov, _, ref borrow) = tup3);
+        m!((ref borrow, mov) = tup4);
+        m!([mov @ .., ref borrow] = arr0);
+        m!([_, ref mut borrow @ .., _, mov] = arr1);
+        m!([mov @ .., ref borrow] = arr2);
+        m!([_, ref borrow @ .., _, mov] = arr3);
+    };
+    drop(&tup0); //~ ERROR borrow of moved value: `tup0`
+    drop(&tup1); //~ ERROR borrow of moved value: `tup1`
+    drop(&tup2); //~ ERROR borrow of moved value: `tup2`
+    drop(&tup3); //~ ERROR borrow of moved value: `tup3`
+    m!((ref x, _) = &tup4); //~ ERROR borrow of moved value: `tup4`
+    drop(&arr0); //~ ERROR borrow of moved value: `arr0`
+    m!([_, mov1, mov2, mov3, _] = &arr1); //~ ERROR borrow of moved value: `arr1`
+    drop(&arr2); //~ ERROR borrow of moved value: `arr2`
+    m!([_, mov1, mov2, mov3, _] = &arr3); //~ ERROR borrow of moved value: `arr3`
+
+    // Let's redo ^--- with `if let` (which may diverge from `match` in the future):
+    macro_rules! m {
+        ($p:pat = $s:expr) => {
+            if let Some($p) = $s {}
+        };
+    }
+    let mut tup0: Option<(S, S)> = None;
+    let mut tup1: Option<(S, S, S)> = None;
+    let tup2: Option<(S, S)> = None;
+    let tup3: Option<(S, S, S)> = None;
+    let tup4: Option<(S, S)> = None;
+    let mut arr0: Option<[S; 3]> = None;
+    let mut arr1: Option<[S; 5]> = None;
+    let arr2: Option<[S; 3]> = None;
+    let arr3: Option<[S; 5]> = None;
+    let mut closure = || {
+        m!((ref mut borrow, mov) = tup0);
+        m!((mov, _, ref mut borrow) = tup1);
+        m!((ref borrow, mov) = tup2);
+        m!((mov, _, ref borrow) = tup3);
+        m!((ref borrow, mov) = tup4);
+        m!([mov @ .., ref borrow] = arr0);
+        m!([_, ref mut borrow @ .., _, mov] = arr1);
+        m!([mov @ .., ref borrow] = arr2);
+        m!([_, ref borrow @ .., _, mov] = arr3);
+    };
+    drop(&tup0); //~ ERROR borrow of moved value: `tup0`
+    drop(&tup1); //~ ERROR borrow of moved value: `tup1`
+    drop(&tup2); //~ ERROR borrow of moved value: `tup2`
+    drop(&tup3); //~ ERROR borrow of moved value: `tup3`
+    m!((ref x, _) = &tup4); //~ ERROR borrow of moved value: `tup4`
+    drop(&arr0); //~ ERROR borrow of moved value: `arr0`
+    m!([_, mov1, mov2, mov3, _] = &arr1); //~ ERROR borrow of moved value: `arr1`
+    drop(&arr2); //~ ERROR borrow of moved value: `arr2`
+    m!([_, mov1, mov2, mov3, _] = &arr3); //~ ERROR borrow of moved value: `arr3`
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr
new file mode 100644
index 0000000000..9159e3e221
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-inside.stderr
@@ -0,0 +1,404 @@
+error[E0382]: borrow of moved value: `tup0`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:33:10
+   |
+LL |     let mut tup0 = (S, S);
+   |         -------- move occurs because `tup0` has type `(main::S, main::S)`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+LL |         // Tuples...
+LL |         let (ref mut borrow, mov) = tup0;
+   |                                     ---- variable moved due to use in closure
+...
+LL |     drop(&tup0);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup1`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:34:10
+   |
+LL |     let mut tup1 = (S, S, S);
+   |         -------- move occurs because `tup1` has type `(main::S, main::S, main::S)`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let (mov, _, ref mut borrow) = tup1;
+   |                                        ---- variable moved due to use in closure
+...
+LL |     drop(&tup1);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup2`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:35:10
+   |
+LL |     let tup2 = (S, S);
+   |         ---- move occurs because `tup2` has type `(main::S, main::S)`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let (ref borrow, mov) = tup2;
+   |                                 ---- variable moved due to use in closure
+...
+LL |     drop(&tup2);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup3`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:36:10
+   |
+LL |     let tup3 = (S, S, S);
+   |         ---- move occurs because `tup3` has type `(main::S, main::S, main::S)`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let (mov, _, ref borrow) = tup3;
+   |                                    ---- variable moved due to use in closure
+...
+LL |     drop(&tup3);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup4`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:41:10
+   |
+LL |     let tup4 = (S, S);
+   |         ---- move occurs because `tup4` has type `(main::S, main::S)`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let (ref borrow, mov) = tup4;
+   |                                 ---- variable moved due to use in closure
+...
+LL |     drop(&tup4.0);
+   |          ^^^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr0`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:43:10
+   |
+LL |     let mut arr0 = [S, S, S];
+   |         -------- move occurs because `arr0` has type `[main::S; 3]`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let [mov @ .., ref borrow] = arr0;
+   |                                      ---- variable moved due to use in closure
+...
+LL |     drop(&arr0);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr1`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:44:36
+   |
+LL |     let mut arr1 = [S, S, S, S, S];
+   |         -------- move occurs because `arr1` has type `[main::S; 5]`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let [_, ref mut borrow @ .., _, mov] = arr1;
+   |                                                ---- variable moved due to use in closure
+...
+LL |     let [_, mov1, mov2, mov3, _] = &arr1;
+   |                                    ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr2`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:45:10
+   |
+LL |     let arr2 = [S, S, S];
+   |         ---- move occurs because `arr2` has type `[main::S; 3]`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let [mov @ .., ref borrow] = arr2;
+   |                                      ---- variable moved due to use in closure
+...
+LL |     drop(&arr2);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr3`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:46:36
+   |
+LL |     let arr3 = [S, S, S, S, S];
+   |         ---- move occurs because `arr3` has type `[main::S; 5]`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         let [_, ref borrow @ .., _, mov] = arr3;
+   |                                            ---- variable moved due to use in closure
+...
+LL |     let [_, mov1, mov2, mov3, _] = &arr3;
+   |                                    ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup0`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:77:10
+   |
+LL |     let mut tup0: Option<(S, S)> = None;
+   |         -------- move occurs because `tup0` has type `std::option::Option<(main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+LL |         m!((ref mut borrow, mov) = tup0);
+   |                                    ---- variable moved due to use in closure
+...
+LL |     drop(&tup0);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup1`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:78:10
+   |
+LL |     let mut tup1: Option<(S, S, S)> = None;
+   |         -------- move occurs because `tup1` has type `std::option::Option<(main::S, main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+LL |         m!((ref mut borrow, mov) = tup0);
+LL |         m!((mov, _, ref mut borrow) = tup1);
+   |                                       ---- variable moved due to use in closure
+...
+LL |     drop(&tup1);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup2`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:79:10
+   |
+LL |     let tup2: Option<(S, S)> = None;
+   |         ---- move occurs because `tup2` has type `std::option::Option<(main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!((ref borrow, mov) = tup2);
+   |                                ---- variable moved due to use in closure
+...
+LL |     drop(&tup2);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup3`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:80:10
+   |
+LL |     let tup3: Option<(S, S, S)> = None;
+   |         ---- move occurs because `tup3` has type `std::option::Option<(main::S, main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!((mov, _, ref borrow) = tup3);
+   |                                   ---- variable moved due to use in closure
+...
+LL |     drop(&tup3);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup4`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:81:21
+   |
+LL |     let tup4: Option<(S, S)> = None;
+   |         ---- move occurs because `tup4` has type `std::option::Option<(main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!((ref borrow, mov) = tup4);
+   |                                ---- variable moved due to use in closure
+...
+LL |     m!((ref x, _) = &tup4);
+   |                     ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr0`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:82:10
+   |
+LL |     let mut arr0: Option<[S; 3]> = None;
+   |         -------- move occurs because `arr0` has type `std::option::Option<[main::S; 3]>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([mov @ .., ref borrow] = arr0);
+   |                                     ---- variable moved due to use in closure
+...
+LL |     drop(&arr0);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr1`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:83:35
+   |
+LL |     let mut arr1: Option<[S; 5]> = None;
+   |         -------- move occurs because `arr1` has type `std::option::Option<[main::S; 5]>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([_, ref mut borrow @ .., _, mov] = arr1);
+   |                                               ---- variable moved due to use in closure
+...
+LL |     m!([_, mov1, mov2, mov3, _] = &arr1);
+   |                                   ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr2`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:84:10
+   |
+LL |     let arr2: Option<[S; 3]> = None;
+   |         ---- move occurs because `arr2` has type `std::option::Option<[main::S; 3]>`, which does not implement the `Copy` trait
+LL |     let arr3: Option<[S; 5]> = None;
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([mov @ .., ref borrow] = arr2);
+   |                                     ---- variable moved due to use in closure
+...
+LL |     drop(&arr2);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr3`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:85:35
+   |
+LL |     let arr3: Option<[S; 5]> = None;
+   |         ---- move occurs because `arr3` has type `std::option::Option<[main::S; 5]>`, which does not implement the `Copy` trait
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([_, ref borrow @ .., _, mov] = arr3);
+   |                                           ---- variable moved due to use in closure
+...
+LL |     m!([_, mov1, mov2, mov3, _] = &arr3);
+   |                                   ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup0`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:113:10
+   |
+LL |     let mut tup0: Option<(S, S)> = None;
+   |         -------- move occurs because `tup0` has type `std::option::Option<(main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+LL |         m!((ref mut borrow, mov) = tup0);
+   |                                    ---- variable moved due to use in closure
+...
+LL |     drop(&tup0);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup1`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:114:10
+   |
+LL |     let mut tup1: Option<(S, S, S)> = None;
+   |         -------- move occurs because `tup1` has type `std::option::Option<(main::S, main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+LL |         m!((ref mut borrow, mov) = tup0);
+LL |         m!((mov, _, ref mut borrow) = tup1);
+   |                                       ---- variable moved due to use in closure
+...
+LL |     drop(&tup1);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup2`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:115:10
+   |
+LL |     let tup2: Option<(S, S)> = None;
+   |         ---- move occurs because `tup2` has type `std::option::Option<(main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!((ref borrow, mov) = tup2);
+   |                                ---- variable moved due to use in closure
+...
+LL |     drop(&tup2);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup3`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:116:10
+   |
+LL |     let tup3: Option<(S, S, S)> = None;
+   |         ---- move occurs because `tup3` has type `std::option::Option<(main::S, main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!((mov, _, ref borrow) = tup3);
+   |                                   ---- variable moved due to use in closure
+...
+LL |     drop(&tup3);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `tup4`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:117:21
+   |
+LL |     let tup4: Option<(S, S)> = None;
+   |         ---- move occurs because `tup4` has type `std::option::Option<(main::S, main::S)>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!((ref borrow, mov) = tup4);
+   |                                ---- variable moved due to use in closure
+...
+LL |     m!((ref x, _) = &tup4);
+   |                     ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr0`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:118:10
+   |
+LL |     let mut arr0: Option<[S; 3]> = None;
+   |         -------- move occurs because `arr0` has type `std::option::Option<[main::S; 3]>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([mov @ .., ref borrow] = arr0);
+   |                                     ---- variable moved due to use in closure
+...
+LL |     drop(&arr0);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr1`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:119:35
+   |
+LL |     let mut arr1: Option<[S; 5]> = None;
+   |         -------- move occurs because `arr1` has type `std::option::Option<[main::S; 5]>`, which does not implement the `Copy` trait
+...
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([_, ref mut borrow @ .., _, mov] = arr1);
+   |                                               ---- variable moved due to use in closure
+...
+LL |     m!([_, mov1, mov2, mov3, _] = &arr1);
+   |                                   ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr2`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:120:10
+   |
+LL |     let arr2: Option<[S; 3]> = None;
+   |         ---- move occurs because `arr2` has type `std::option::Option<[main::S; 3]>`, which does not implement the `Copy` trait
+LL |     let arr3: Option<[S; 5]> = None;
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([mov @ .., ref borrow] = arr2);
+   |                                     ---- variable moved due to use in closure
+...
+LL |     drop(&arr2);
+   |          ^^^^^ value borrowed here after move
+
+error[E0382]: borrow of moved value: `arr3`
+  --> $DIR/move-ref-patterns-closure-captures-inside.rs:121:35
+   |
+LL |     let arr3: Option<[S; 5]> = None;
+   |         ---- move occurs because `arr3` has type `std::option::Option<[main::S; 5]>`, which does not implement the `Copy` trait
+LL |     let mut closure = || {
+   |                       -- value moved into closure here
+...
+LL |         m!([_, ref borrow @ .., _, mov] = arr3);
+   |                                           ---- variable moved due to use in closure
+...
+LL |     m!([_, mov1, mov2, mov3, _] = &arr3);
+   |                                   ^^^^^ value borrowed here after move
+
+error: aborting due to 27 previous errors
+
+For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs
new file mode 100644
index 0000000000..e1844d36e4
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures-pass.rs
@@ -0,0 +1,30 @@
+// check-pass
+
+#![feature(move_ref_pattern)]
+
+fn main() {
+    struct U;
+    fn accept_fn_once(_: impl FnOnce()) {}
+    fn accept_fn_mut(_: impl FnMut()) {}
+    fn accept_fn(_: impl Fn()) {}
+
+    let mut tup = (U, U, U);
+    let (ref _x0, _x1, ref mut _x2) = tup;
+    let c1 = || {
+        drop::<&U>(_x0);
+        drop::<U>(_x1);
+        drop::<&mut U>(_x2);
+    };
+    accept_fn_once(c1);
+
+    let c2 = || {
+        drop::<&U>(_x0);
+        drop::<&mut U>(_x2);
+    };
+    accept_fn_mut(c2);
+
+    let c3 = || {
+        drop::<&U>(_x0);
+    };
+    accept_fn(c3);
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs
new file mode 100644
index 0000000000..7f1c02c05c
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.rs
@@ -0,0 +1,34 @@
+#![feature(move_ref_pattern)]
+
+fn main() {
+    struct U;
+    fn accept_fn_once(_: &impl FnOnce()) {}
+    fn accept_fn_mut(_: &impl FnMut()) {}
+    fn accept_fn(_: &impl Fn()) {}
+
+    let mut tup = (U, U, U);
+    let (ref _x0, _x1, ref mut _x2) = tup;
+    let c1 = || {
+        //~^ ERROR expected a closure that implements the `FnMut`
+        //~| ERROR expected a closure that implements the `Fn`
+        drop::<&U>(_x0);
+        drop::<U>(_x1);
+        drop::<&mut U>(_x2);
+    };
+    accept_fn_once(&c1);
+    accept_fn_mut(&c1);
+    accept_fn(&c1);
+
+    let c2 = || {
+        //~^ ERROR expected a closure that implements the `Fn`
+        drop::<&U>(_x0);
+        drop::<&mut U>(_x2);
+    };
+    accept_fn_mut(&c2);
+    accept_fn(&c2);
+
+    let c3 = || {
+        drop::<&U>(_x0);
+    };
+    accept_fn(&c3);
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr
new file mode 100644
index 0000000000..ca82353c1c
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-closure-captures.stderr
@@ -0,0 +1,39 @@
+error[E0525]: expected a closure that implements the `FnMut` trait, but this closure only implements `FnOnce`
+  --> $DIR/move-ref-patterns-closure-captures.rs:11:14
+   |
+LL |     let c1 = || {
+   |              ^^ this closure implements `FnOnce`, not `FnMut`
+...
+LL |         drop::<U>(_x1);
+   |                   --- closure is `FnOnce` because it moves the variable `_x1` out of its environment
+...
+LL |     accept_fn_mut(&c1);
+   |     ------------- the requirement to implement `FnMut` derives from here
+
+error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnOnce`
+  --> $DIR/move-ref-patterns-closure-captures.rs:11:14
+   |
+LL |     let c1 = || {
+   |              ^^ this closure implements `FnOnce`, not `Fn`
+...
+LL |         drop::<U>(_x1);
+   |                   --- closure is `FnOnce` because it moves the variable `_x1` out of its environment
+...
+LL |     accept_fn(&c1);
+   |     --------- the requirement to implement `Fn` derives from here
+
+error[E0525]: expected a closure that implements the `Fn` trait, but this closure only implements `FnMut`
+  --> $DIR/move-ref-patterns-closure-captures.rs:22:14
+   |
+LL |     let c2 = || {
+   |              ^^ this closure implements `FnMut`, not `Fn`
+...
+LL |         drop::<&mut U>(_x2);
+   |                        --- closure is `FnMut` because it mutates the variable `_x2` here
+...
+LL |     accept_fn(&c2);
+   |     --------- the requirement to implement `Fn` derives from here
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0525`.
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs
new file mode 100644
index 0000000000..5c51c47d97
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.rs
@@ -0,0 +1,16 @@
+#![feature(move_ref_pattern)]
+
+fn main() {
+    struct U;
+
+    // A tuple is a "non-reference pattern".
+    // A `mut` binding pattern resets the binding mode to by-value.
+
+    let p = (U, U);
+    let (a, mut b) = &p;
+    //~^ ERROR cannot move out of a shared reference
+
+    let mut p = (U, U);
+    let (a, mut b) = &mut p;
+    //~^ ERROR cannot move out of a mutable reference
+}
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr
new file mode 100644
index 0000000000..fe7f71e6c4
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-default-binding-modes.stderr
@@ -0,0 +1,21 @@
+error[E0507]: cannot move out of a shared reference
+  --> $DIR/move-ref-patterns-default-binding-modes.rs:10:22
+   |
+LL |     let (a, mut b) = &p;
+   |             -----    ^^
+   |             |
+   |             data moved here
+   |             move occurs because `b` has type `main::U`, which does not implement the `Copy` trait
+
+error[E0507]: cannot move out of a mutable reference
+  --> $DIR/move-ref-patterns-default-binding-modes.rs:14:22
+   |
+LL |     let (a, mut b) = &mut p;
+   |             -----    ^^^^^^
+   |             |
+   |             data moved here
+   |             move occurs because `b` has type `main::U`, which does not implement the `Copy` trait
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs
new file mode 100644
index 0000000000..c78695390b
--- /dev/null
+++ b/src/test/ui/pattern/move-ref-patterns/move-ref-patterns-dynamic-semantics.rs
@@ -0,0 +1,81 @@
+// run-pass
+
+// This test checks the dynamic semantics and drop order of pattern matching
+// where a product pattern has both a by-move and by-ref binding.
+
+#![feature(move_ref_pattern)]
+
+use std::cell::RefCell;
+use std::rc::Rc;
+
+struct X {
+    x: Box<usize>,
+    d: DropOrderListPtr,
+}
+
+type DropOrderListPtr = Rc<RefCell<Vec<usize>>>;
+
+impl Drop for X {
+    fn drop(&mut self) {
+        self.d.borrow_mut().push(*self.x);
+    }
+}
+
+enum DoubleOption<T, U> {
+    Some2(T, U),
+    _None2,
+}
+
+fn main() {
+    let d: DropOrderListPtr = <_>::default();
+    {
+        let mk = |v| X { x: Box::new(v), d: d.clone() };
+        let check = |a1: &X, a2, b1: &X, b2| {
+            assert_eq!(*a1.x, a2);
+            assert_eq!(*b1.x, b2);
+        };
+
+        let x = DoubleOption::Some2(mk(1), mk(2));
+        match x {
+            DoubleOption::Some2(ref a, b) => check(a, 1, &b, 2),
+            DoubleOption::_None2 => panic!(),
+        }
+        let x = DoubleOption::Some2(mk(3), mk(4));
+        match x {
+            DoubleOption::Some2(a, ref b) => check(&a, 3, b, 4),
+            DoubleOption::_None2 => panic!(),
+        }
+        match DoubleOption::Some2(mk(5), mk(6)) {
+            DoubleOption::Some2(ref a, b) => check(a, 5, &b, 6),
+            DoubleOption::_None2 => panic!(),
+        }
+        match DoubleOption::Some2(mk(7), mk(8)) {
+            DoubleOption::Some2(a, ref b) => check(&a, 7, b, 8),
+            DoubleOption::_None2 => panic!(),
+        }
+        {
+            let (a, ref b) = (mk(9), mk(10));
+            let (ref c, d) = (mk(11), mk(12));
+            check(&a, 9, b, 10);
+            check(c, 11, &d, 12);
+        }
+        fn fun([a, ref mut b, ref xs @ .., ref c, d]: [X; 6]) {
+            assert_eq!(*a.x, 13);
+            assert_eq!(*b.x, 14);
+            assert_eq!(&[*xs[0].x, *xs[1].x], &[15, 16]);
+            assert_eq!(*c.x, 17);
+            assert_eq!(*d.x, 18);
+        }
+        fun([mk(13), mk(14), mk(15), mk(16), mk(17), mk(18)]);
+
+        let lam = |(a, ref b, c, ref mut d): (X, X, X, X)| {
+            assert_eq!(*a.x, 19);
+            assert_eq!(*b.x, 20);
+            assert_eq!(*c.x, 21);
+            assert_eq!(*d.x, 22);
+        };
+        lam((mk(19), mk(20), mk(21), mk(22)));
+    }
+    let expected = [2, 3, 6, 5, 7, 8, 12, 11, 9, 10, 18, 13, 14, 15, 16, 17, 21, 19, 20, 22, 4, 1];
+    assert_eq!(&*d.borrow(), &expected);
+}
diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr
index 95cca38f7d..598b6a3794 100644
--- a/src/test/ui/pattern/pat-tuple-bad-type.stderr
+++ b/src/test/ui/pattern/pat-tuple-bad-type.stderr
@@ -12,6 +12,8 @@ LL |         (..) => {}
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-bad-type.rs:10:9
    |
+LL |     match 0u8 {
+   |           --- this expression has type `u8`
 LL |         (..) => {}
    |         ^^^^ expected `u8`, found `()`
 
diff --git a/src/test/ui/pattern/pat-tuple-overfield.stderr b/src/test/ui/pattern/pat-tuple-overfield.stderr
index 25d02b8627..45b6fd1b4d 100644
--- a/src/test/ui/pattern/pat-tuple-overfield.stderr
+++ b/src/test/ui/pattern/pat-tuple-overfield.stderr
@@ -1,6 +1,8 @@
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-overfield.rs:5:9
    |
+LL |     match (1, 2, 3) {
+   |           --------- this expression has type `({integer}, {integer}, {integer})`
 LL |         (1, 2, 3, 4) => {}
    |         ^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements
    |
@@ -10,6 +12,9 @@ LL |         (1, 2, 3, 4) => {}
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-overfield.rs:6:9
    |
+LL |     match (1, 2, 3) {
+   |           --------- this expression has type `({integer}, {integer}, {integer})`
+LL |         (1, 2, 3, 4) => {}
 LL |         (1, 2, .., 3, 4) => {}
    |         ^^^^^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements
    |
diff --git a/src/test/ui/pattern/pattern-ident-path-generics.stderr b/src/test/ui/pattern/pattern-ident-path-generics.stderr
index 338eb6ff0c..24b5cdf98d 100644
--- a/src/test/ui/pattern/pattern-ident-path-generics.stderr
+++ b/src/test/ui/pattern/pattern-ident-path-generics.stderr
@@ -1,6 +1,8 @@
 error[E0308]: mismatched types
   --> $DIR/pattern-ident-path-generics.rs:3:9
    |
+LL |     match Some("foo") {
+   |           ----------- this expression has type `std::option::Option<&str>`
 LL |         None::<isize> => {}
    |         ^^^^^^^^^^^^^ expected `&str`, found `isize`
    |
diff --git a/src/test/ui/pattern/pattern-tyvar-2.stderr b/src/test/ui/pattern/pattern-tyvar-2.stderr
index bb3e61017d..9566244464 100644
--- a/src/test/ui/pattern/pattern-tyvar-2.stderr
+++ b/src/test/ui/pattern/pattern-tyvar-2.stderr
@@ -5,8 +5,6 @@ LL | fn foo(t: Bar) -> isize { match t { Bar::T1(_, Some(x)) => { return x * 3;
    |                                                                     - ^ - {integer}
    |                                                                     |
    |                                                                     std::vec::Vec<isize>
-   |
-   = note: an implementation of `std::ops::Mul` might be missing for `std::vec::Vec<isize>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/pattern/rest-pat-semantic-disallowed.rs b/src/test/ui/pattern/rest-pat-semantic-disallowed.rs
index 31620216e8..84552f2e73 100644
--- a/src/test/ui/pattern/rest-pat-semantic-disallowed.rs
+++ b/src/test/ui/pattern/rest-pat-semantic-disallowed.rs
@@ -2,7 +2,7 @@
 // outside of slice (+ ident patterns witin those), tuple,
 // and tuple struct patterns and that duplicates are caught in these contexts.
 
-#![feature(slice_patterns, box_patterns)]
+#![feature(box_patterns)]
 
 fn main() {}
 
diff --git a/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr b/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
index be484e3a4d..95f6d53a9d 100644
--- a/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
+++ b/src/test/ui/pattern/rest-pat-semantic-disallowed.stderr
@@ -8,6 +8,7 @@ LL |     let mk_pat!();
    |         --------- in this macro invocation
    |
    = note: only allowed in tuple, tuple struct, and slice patterns
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `..` patterns are not allowed here
   --> $DIR/rest-pat-semantic-disallowed.rs:18:9
diff --git a/src/test/ui/pattern/usefulness/exhaustive_integer_patterns.stderr b/src/test/ui/pattern/usefulness/exhaustive_integer_patterns.stderr
index 0fbeb981ea..5866df5cb1 100644
--- a/src/test/ui/pattern/usefulness/exhaustive_integer_patterns.stderr
+++ b/src/test/ui/pattern/usefulness/exhaustive_integer_patterns.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         200 => {}
    |         ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/exhaustive_integer_patterns.rs:3:9
    |
 LL | #![deny(unreachable_patterns)]
@@ -88,7 +88,7 @@ LL |         0 .. 2 => {}
 LL |         1 ..= 2 => {}
    |         ^^^^^^^ overlapping patterns
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/exhaustive_integer_patterns.rs:4:9
    |
 LL | #![deny(overlapping_patterns)]
diff --git a/src/test/ui/pattern/usefulness/issue-43253.stderr b/src/test/ui/pattern/usefulness/issue-43253.stderr
index cb4a0486ee..cdd3067a67 100644
--- a/src/test/ui/pattern/usefulness/issue-43253.stderr
+++ b/src/test/ui/pattern/usefulness/issue-43253.stderr
@@ -6,7 +6,7 @@ LL |         1..10 => {},
 LL |         9..=10 => {},
    |         ^^^^^^ overlapping patterns
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-43253.rs:4:9
    |
 LL | #![warn(overlapping_patterns)]
@@ -18,7 +18,7 @@ warning: unreachable pattern
 LL |         9 => {},
    |         ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-43253.rs:3:9
    |
 LL | #![warn(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-arm-statics.stderr b/src/test/ui/pattern/usefulness/match-arm-statics.stderr
index 3d9e900a4e..a5dffebf69 100644
--- a/src/test/ui/pattern/usefulness/match-arm-statics.stderr
+++ b/src/test/ui/pattern/usefulness/match-arm-statics.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         (true, true) => ()
    |         ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-arm-statics.rs:2:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-byte-array-patterns.stderr b/src/test/ui/pattern/usefulness/match-byte-array-patterns.stderr
index 09484692fa..0c582be8df 100644
--- a/src/test/ui/pattern/usefulness/match-byte-array-patterns.stderr
+++ b/src/test/ui/pattern/usefulness/match-byte-array-patterns.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         &[0x41, 0x41, 0x41, 0x41] => {}
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-byte-array-patterns.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-empty-exhaustive_patterns.stderr b/src/test/ui/pattern/usefulness/match-empty-exhaustive_patterns.stderr
index f242ecf2da..49c38d2a9d 100644
--- a/src/test/ui/pattern/usefulness/match-empty-exhaustive_patterns.stderr
+++ b/src/test/ui/pattern/usefulness/match-empty-exhaustive_patterns.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         _ => {},
    |         ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-empty-exhaustive_patterns.rs:3:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-range-fail-dominate.stderr b/src/test/ui/pattern/usefulness/match-range-fail-dominate.stderr
index 8412a11366..76a6d1d3ea 100644
--- a/src/test/ui/pattern/usefulness/match-range-fail-dominate.stderr
+++ b/src/test/ui/pattern/usefulness/match-range-fail-dominate.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |       5 ..= 6 => { }
    |       ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-range-fail-dominate.rs:1:9
    |
 LL | #![deny(unreachable_patterns, overlapping_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-ref-ice.stderr b/src/test/ui/pattern/usefulness/match-ref-ice.stderr
index c4bfa0afcc..fad0940baa 100644
--- a/src/test/ui/pattern/usefulness/match-ref-ice.stderr
+++ b/src/test/ui/pattern/usefulness/match-ref-ice.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         [1, 2, 3] => (),
    |         ^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-ref-ice.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-vec-fixed.stderr b/src/test/ui/pattern/usefulness/match-vec-fixed.stderr
index ae2dd87b69..e388a06cb9 100644
--- a/src/test/ui/pattern/usefulness/match-vec-fixed.stderr
+++ b/src/test/ui/pattern/usefulness/match-vec-fixed.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         [_, _, _] => {}
    |         ^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-vec-fixed.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/match-vec-unreachable.stderr b/src/test/ui/pattern/usefulness/match-vec-unreachable.stderr
index e9a751074c..672fd92fb5 100644
--- a/src/test/ui/pattern/usefulness/match-vec-unreachable.stderr
+++ b/src/test/ui/pattern/usefulness/match-vec-unreachable.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         [(1, 2), (2, 3), b] => (),
    |         ^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/match-vec-unreachable.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const-2.stderr b/src/test/ui/pattern/usefulness/slice-pattern-const-2.stderr
index 0c7401269d..cd0cb2e887 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const-2.stderr
+++ b/src/test/ui/pattern/usefulness/slice-pattern-const-2.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         FOO => (),
    |         ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/slice-pattern-const-2.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const-3.stderr b/src/test/ui/pattern/usefulness/slice-pattern-const-3.stderr
index eab4fc3f08..3ba01b9eba 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const-3.stderr
+++ b/src/test/ui/pattern/usefulness/slice-pattern-const-3.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         FOO => (),
    |         ^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/slice-pattern-const-3.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/slice-pattern-const.stderr b/src/test/ui/pattern/usefulness/slice-pattern-const.stderr
index d274d6d7c6..1fffb9fedb 100644
--- a/src/test/ui/pattern/usefulness/slice-pattern-const.stderr
+++ b/src/test/ui/pattern/usefulness/slice-pattern-const.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         [84, 69, 83, 84] => (),
    |         ^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/slice-pattern-const.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/slice-patterns-reachability.stderr b/src/test/ui/pattern/usefulness/slice-patterns-reachability.stderr
index e24d102811..607ffb7659 100644
--- a/src/test/ui/pattern/usefulness/slice-patterns-reachability.stderr
+++ b/src/test/ui/pattern/usefulness/slice-patterns-reachability.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         [true, ..] => {}
    |         ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/slice-patterns-reachability.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/struct-pattern-match-useless.stderr b/src/test/ui/pattern/usefulness/struct-pattern-match-useless.stderr
index 0115fc081a..fbee33de6f 100644
--- a/src/test/ui/pattern/usefulness/struct-pattern-match-useless.stderr
+++ b/src/test/ui/pattern/usefulness/struct-pattern-match-useless.stderr
@@ -6,7 +6,7 @@ LL |         Foo { x: _x, y: _y } => (),
 LL |         Foo { .. } => ()
    |         ^^^^^^^^^^ unreachable pattern
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/struct-pattern-match-useless.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/pattern/usefulness/top-level-alternation.stderr b/src/test/ui/pattern/usefulness/top-level-alternation.stderr
index 7c7c4fc4eb..76bc4f8d09 100644
--- a/src/test/ui/pattern/usefulness/top-level-alternation.stderr
+++ b/src/test/ui/pattern/usefulness/top-level-alternation.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |     while let 0..=2 | 1 = 0 {}
    |                       ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/top-level-alternation.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/phantom-oibit.stderr b/src/test/ui/phantom-oibit.stderr
index 4d9d06b898..7b6b105eb0 100644
--- a/src/test/ui/phantom-oibit.stderr
+++ b/src/test/ui/phantom-oibit.stderr
@@ -3,13 +3,16 @@ error[E0277]: `T` cannot be shared between threads safely
    |
 LL | fn is_zen<T: Zen>(_: T) {}
    |    ------    --- required by this bound in `is_zen`
-LL | 
-LL | fn not_sync<T>(x: Guard<T>) {
-   |             - help: consider restricting this bound: `T: std::marker::Sync`
+...
 LL |     is_zen(x)
    |            ^ `T` cannot be shared between threads safely
    |
    = help: the trait `std::marker::Sync` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Sync`
+  --> $DIR/phantom-oibit.rs:20:13
+   |
+LL | fn not_sync<T>(x: Guard<T>) {
+   |             ^
    = note: required because of the requirements on the impl of `Zen` for `&T`
    = note: required because it appears within the type `std::marker::PhantomData<&T>`
    = note: required because it appears within the type `Guard<'_, T>`
@@ -20,12 +23,15 @@ error[E0277]: `T` cannot be shared between threads safely
 LL | fn is_zen<T: Zen>(_: T) {}
    |    ------    --- required by this bound in `is_zen`
 ...
-LL | fn nested_not_sync<T>(x: Nested<Guard<T>>) {
-   |                    - help: consider restricting this bound: `T: std::marker::Sync`
 LL |     is_zen(x)
    |            ^ `T` cannot be shared between threads safely
    |
    = help: the trait `std::marker::Sync` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Sync`
+  --> $DIR/phantom-oibit.rs:25:20
+   |
+LL | fn nested_not_sync<T>(x: Nested<Guard<T>>) {
+   |                    ^
    = note: required because of the requirements on the impl of `Zen` for `&T`
    = note: required because it appears within the type `std::marker::PhantomData<&T>`
    = note: required because it appears within the type `Guard<'_, T>`
diff --git a/src/test/ui/privacy/associated-item-privacy-inherent.stderr b/src/test/ui/privacy/associated-item-privacy-inherent.stderr
index 6471a7914e..88561568ea 100644
--- a/src/test/ui/privacy/associated-item-privacy-inherent.stderr
+++ b/src/test/ui/privacy/associated-item-privacy-inherent.stderr
@@ -6,6 +6,8 @@ LL |         let value = Pub::method;
 ...
 LL |     priv_nominal::mac!();
    |     --------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `for<'r> fn(&'r priv_nominal::Pub) {priv_nominal::Pub::method}` is private
   --> $DIR/associated-item-privacy-inherent.rs:15:9
@@ -15,6 +17,8 @@ LL |         value;
 ...
 LL |     priv_nominal::mac!();
    |     --------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `for<'r> fn(&'r priv_nominal::Pub) {priv_nominal::Pub::method}` is private
   --> $DIR/associated-item-privacy-inherent.rs:17:13
@@ -24,6 +28,8 @@ LL |         Pub.method();
 ...
 LL |     priv_nominal::mac!();
    |     --------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: associated constant `CONST` is private
   --> $DIR/associated-item-privacy-inherent.rs:19:9
@@ -33,6 +39,8 @@ LL |         Pub::CONST;
 ...
 LL |     priv_nominal::mac!();
    |     --------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_signature::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:37:21
@@ -42,6 +50,8 @@ LL |         let value = Pub::method;
 ...
 LL |     priv_signature::mac!();
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_signature::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:39:9
@@ -51,6 +61,8 @@ LL |         value;
 ...
 LL |     priv_signature::mac!();
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_signature::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:41:13
@@ -60,6 +72,8 @@ LL |         Pub.method(loop {});
 ...
 LL |     priv_signature::mac!();
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:57:21
@@ -69,6 +83,8 @@ LL |         let value = Pub::method::<Priv>;
 ...
 LL |     priv_substs::mac!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:59:9
@@ -78,6 +94,8 @@ LL |         value;
 ...
 LL |     priv_substs::mac!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:61:9
@@ -87,6 +105,8 @@ LL |         Pub.method::<Priv>();
 ...
 LL |     priv_substs::mac!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:80:21
@@ -96,6 +116,8 @@ LL |         let value = <Pub>::method;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:82:9
@@ -105,6 +127,8 @@ LL |         value;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:84:21
@@ -114,6 +138,8 @@ LL |         let value = Pub::method;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:86:9
@@ -123,6 +149,8 @@ LL |         value;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:88:21
@@ -132,6 +160,8 @@ LL |         let value = <Pub>::static_method;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:90:9
@@ -141,6 +171,8 @@ LL |         value;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:92:21
@@ -150,6 +182,8 @@ LL |         let value = Pub::static_method;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:94:9
@@ -159,6 +193,8 @@ LL |         value;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:96:19
@@ -168,6 +204,8 @@ LL |         Pub(Priv).method();
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:99:10
@@ -177,6 +215,8 @@ LL |         <Pub>::CONST;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-inherent.rs:101:9
@@ -186,6 +226,8 @@ LL |         Pub::CONST;
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 21 previous errors
 
diff --git a/src/test/ui/privacy/associated-item-privacy-trait.rs b/src/test/ui/privacy/associated-item-privacy-trait.rs
index b3d42f0959..03347d5b99 100644
--- a/src/test/ui/privacy/associated-item-privacy-trait.rs
+++ b/src/test/ui/privacy/associated-item-privacy-trait.rs
@@ -23,8 +23,7 @@ mod priv_trait {
         <Pub as PrivTr>::CONST;
         //~^ ERROR associated constant `PrivTr::CONST` is private
         let _: <Pub as PrivTr>::AssocTy;
-        //~^ ERROR trait `priv_trait::PrivTr` is private
-        //~| ERROR trait `priv_trait::PrivTr` is private
+        //~^ ERROR associated type `PrivTr::AssocTy` is private
         pub type InSignatureTy = <Pub as PrivTr>::AssocTy;
         //~^ ERROR trait `priv_trait::PrivTr` is private
         pub trait InSignatureTr: PrivTr {}
@@ -116,15 +115,11 @@ mod priv_parent_substs {
         <Priv as PubTr<_>>::CONST;
         //~^ ERROR type `priv_parent_substs::Priv` is private
 
-        let _: <Pub as PubTr>::AssocTy;
-        //~^ ERROR type `priv_parent_substs::Priv` is private
-        //~| ERROR type `priv_parent_substs::Priv` is private
+        let _: <Pub as PubTr>::AssocTy;  // FIXME no longer an error?!
         let _: <Pub as PubTr<_>>::AssocTy;
         //~^ ERROR type `priv_parent_substs::Priv` is private
-        //~| ERROR type `priv_parent_substs::Priv` is private
         let _: <Priv as PubTr<_>>::AssocTy;
         //~^ ERROR type `priv_parent_substs::Priv` is private
-        //~| ERROR type `priv_parent_substs::Priv` is private
 
         pub type InSignatureTy1 = <Pub as PubTr>::AssocTy;
         //~^ ERROR type `priv_parent_substs::Priv` is private
diff --git a/src/test/ui/privacy/associated-item-privacy-trait.stderr b/src/test/ui/privacy/associated-item-privacy-trait.stderr
index 5cf1be8293..db24e425a0 100644
--- a/src/test/ui/privacy/associated-item-privacy-trait.stderr
+++ b/src/test/ui/privacy/associated-item-privacy-trait.stderr
@@ -6,6 +6,8 @@ LL |         let value = <Pub as PrivTr>::method;
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `for<'r> fn(&'r priv_trait::Pub) {<priv_trait::Pub as priv_trait::PrivTr>::method}` is private
   --> $DIR/associated-item-privacy-trait.rs:19:9
@@ -15,6 +17,8 @@ LL |         value;
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `for<'r> fn(&'r Self) {<Self as priv_trait::PrivTr>::method}` is private
   --> $DIR/associated-item-privacy-trait.rs:21:13
@@ -24,6 +28,8 @@ LL |         Pub.method();
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: associated constant `PrivTr::CONST` is private
   --> $DIR/associated-item-privacy-trait.rs:23:9
@@ -33,17 +39,10 @@ LL |         <Pub as PrivTr>::CONST;
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
-
-error: trait `priv_trait::PrivTr` is private
-  --> $DIR/associated-item-privacy-trait.rs:25:13
    |
-LL |         let _: <Pub as PrivTr>::AssocTy;
-   |             ^
-...
-LL |     priv_trait::mac!();
-   |     ------------------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: trait `priv_trait::PrivTr` is private
+error: associated type `PrivTr::AssocTy` is private
   --> $DIR/associated-item-privacy-trait.rs:25:16
    |
 LL |         let _: <Pub as PrivTr>::AssocTy;
@@ -51,267 +50,283 @@ LL |         let _: <Pub as PrivTr>::AssocTy;
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
-  --> $DIR/associated-item-privacy-trait.rs:28:34
+  --> $DIR/associated-item-privacy-trait.rs:27:34
    |
 LL |         pub type InSignatureTy = <Pub as PrivTr>::AssocTy;
    |                                  ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
-  --> $DIR/associated-item-privacy-trait.rs:30:34
+  --> $DIR/associated-item-privacy-trait.rs:29:34
    |
 LL |         pub trait InSignatureTr: PrivTr {}
    |                                  ^^^^^^
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
-  --> $DIR/associated-item-privacy-trait.rs:32:14
+  --> $DIR/associated-item-privacy-trait.rs:31:14
    |
 LL |         impl PrivTr for u8 {}
    |              ^^^^^^
 ...
 LL |     priv_trait::mac!();
    |     ------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_signature::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:49:21
+  --> $DIR/associated-item-privacy-trait.rs:48:21
    |
 LL |         let value = <Pub as PubTr>::method;
    |                     ^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_signature::mac!();
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_signature::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:51:9
+  --> $DIR/associated-item-privacy-trait.rs:50:9
    |
 LL |         value;
    |         ^^^^^
 ...
 LL |     priv_signature::mac!();
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_signature::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:53:13
+  --> $DIR/associated-item-privacy-trait.rs:52:13
    |
 LL |         Pub.method(loop {});
    |             ^^^^^^
 ...
 LL |     priv_signature::mac!();
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:70:21
+  --> $DIR/associated-item-privacy-trait.rs:69:21
    |
 LL |         let value = <Pub as PubTr>::method::<Priv>;
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_substs::mac!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:72:9
+  --> $DIR/associated-item-privacy-trait.rs:71:9
    |
 LL |         value;
    |         ^^^^^
 ...
 LL |     priv_substs::mac!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:74:9
+  --> $DIR/associated-item-privacy-trait.rs:73:9
    |
 LL |         Pub.method::<Priv>();
    |         ^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_substs::mac!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:94:21
+  --> $DIR/associated-item-privacy-trait.rs:93:21
    |
 LL |         let value = <Pub as PubTr>::method;
    |                     ^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:96:9
+  --> $DIR/associated-item-privacy-trait.rs:95:9
    |
 LL |         value;
    |         ^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:98:21
+  --> $DIR/associated-item-privacy-trait.rs:97:21
    |
 LL |         let value = <Pub as PubTr<_>>::method;
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:100:9
+  --> $DIR/associated-item-privacy-trait.rs:99:9
    |
 LL |         value;
    |         ^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:102:9
+  --> $DIR/associated-item-privacy-trait.rs:101:9
    |
 LL |         Pub.method();
    |         ^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:105:21
+  --> $DIR/associated-item-privacy-trait.rs:104:21
    |
 LL |         let value = <Priv as PubTr<_>>::method;
    |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:107:9
+  --> $DIR/associated-item-privacy-trait.rs:106:9
    |
 LL |         value;
    |         ^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:109:9
+  --> $DIR/associated-item-privacy-trait.rs:108:9
    |
 LL |         Priv.method();
    |         ^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:112:9
+  --> $DIR/associated-item-privacy-trait.rs:111:9
    |
 LL |         <Pub as PubTr>::CONST;
    |         ^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:114:9
+  --> $DIR/associated-item-privacy-trait.rs:113:9
    |
 LL |         <Pub as PubTr<_>>::CONST;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:116:9
+  --> $DIR/associated-item-privacy-trait.rs:115:9
    |
 LL |         <Priv as PubTr<_>>::CONST;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
-
-error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:119:13
-   |
-LL |         let _: <Pub as PubTr>::AssocTy;
-   |             ^
-...
-LL |     priv_parent_substs::mac!();
-   |     --------------------------- in this macro invocation
-
-error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:119:16
    |
-LL |         let _: <Pub as PubTr>::AssocTy;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL |     priv_parent_substs::mac!();
-   |     --------------------------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:122:13
+  --> $DIR/associated-item-privacy-trait.rs:119:30
    |
 LL |         let _: <Pub as PubTr<_>>::AssocTy;
-   |             ^
+   |                              ^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
-
-error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:122:16
    |
-LL |         let _: <Pub as PubTr<_>>::AssocTy;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL |     priv_parent_substs::mac!();
-   |     --------------------------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:125:13
+  --> $DIR/associated-item-privacy-trait.rs:121:17
    |
 LL |         let _: <Priv as PubTr<_>>::AssocTy;
-   |             ^
+   |                 ^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
-
-error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:125:16
    |
-LL |         let _: <Priv as PubTr<_>>::AssocTy;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL |     priv_parent_substs::mac!();
-   |     --------------------------- in this macro invocation
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:129:35
+  --> $DIR/associated-item-privacy-trait.rs:124:35
    |
 LL |         pub type InSignatureTy1 = <Pub as PubTr>::AssocTy;
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:131:35
+  --> $DIR/associated-item-privacy-trait.rs:126:35
    |
 LL |         pub type InSignatureTy2 = <Priv as PubTr<Pub>>::AssocTy;
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
-  --> $DIR/associated-item-privacy-trait.rs:133:14
+  --> $DIR/associated-item-privacy-trait.rs:128:14
    |
 LL |         impl PubTr for u8 {}
    |              ^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 35 previous errors
+error: aborting due to 30 previous errors
 
diff --git a/src/test/ui/privacy/associated-item-privacy-type-binding.rs b/src/test/ui/privacy/associated-item-privacy-type-binding.rs
index 591e9df81e..b9c526f515 100644
--- a/src/test/ui/privacy/associated-item-privacy-type-binding.rs
+++ b/src/test/ui/privacy/associated-item-privacy-type-binding.rs
@@ -8,19 +8,19 @@ mod priv_trait {
     pub trait PubTr: PrivTr {}
 
     pub macro mac1() {
-        let _: Box<PubTr<AssocTy = u8>>;
+        let _: Box<dyn PubTr<AssocTy = u8>>;
         //~^ ERROR trait `priv_trait::PrivTr` is private
         //~| ERROR trait `priv_trait::PrivTr` is private
-        type InSignatureTy2 = Box<PubTr<AssocTy = u8>>;
+        type InSignatureTy2 = Box<dyn PubTr<AssocTy = u8>>;
         //~^ ERROR trait `priv_trait::PrivTr` is private
         trait InSignatureTr2: PubTr<AssocTy = u8> {}
         //~^ ERROR trait `priv_trait::PrivTr` is private
     }
     pub macro mac2() {
-        let _: Box<PrivTr<AssocTy = u8>>;
+        let _: Box<dyn PrivTr<AssocTy = u8>>;
         //~^ ERROR trait `priv_trait::PrivTr` is private
         //~| ERROR trait `priv_trait::PrivTr` is private
-        type InSignatureTy1 = Box<PrivTr<AssocTy = u8>>;
+        type InSignatureTy1 = Box<dyn PrivTr<AssocTy = u8>>;
         //~^ ERROR trait `priv_trait::PrivTr` is private
         trait InSignatureTr1: PrivTr<AssocTy = u8> {}
         //~^ ERROR trait `priv_trait::PrivTr` is private
@@ -41,15 +41,15 @@ mod priv_parent_substs {
     pub trait PubTr: PubTrWithParam<Priv> {}
 
     pub macro mac() {
-        let _: Box<PubTrWithParam<AssocTy = u8>>;
+        let _: Box<dyn PubTrWithParam<AssocTy = u8>>;
         //~^ ERROR type `priv_parent_substs::Priv` is private
         //~| ERROR type `priv_parent_substs::Priv` is private
-        let _: Box<PubTr<AssocTy = u8>>;
+        let _: Box<dyn PubTr<AssocTy = u8>>;
         //~^ ERROR type `priv_parent_substs::Priv` is private
         //~| ERROR type `priv_parent_substs::Priv` is private
-        pub type InSignatureTy1 = Box<PubTrWithParam<AssocTy = u8>>;
+        pub type InSignatureTy1 = Box<dyn PubTrWithParam<AssocTy = u8>>;
         //~^ ERROR type `priv_parent_substs::Priv` is private
-        pub type InSignatureTy2 = Box<PubTr<AssocTy = u8>>;
+        pub type InSignatureTy2 = Box<dyn PubTr<AssocTy = u8>>;
         //~^ ERROR type `priv_parent_substs::Priv` is private
         trait InSignatureTr1: PubTrWithParam<AssocTy = u8> {}
         //~^ ERROR type `priv_parent_substs::Priv` is private
diff --git a/src/test/ui/privacy/associated-item-privacy-type-binding.stderr b/src/test/ui/privacy/associated-item-privacy-type-binding.stderr
index 7f6886d7f9..fd8b8cf0db 100644
--- a/src/test/ui/privacy/associated-item-privacy-type-binding.stderr
+++ b/src/test/ui/privacy/associated-item-privacy-type-binding.stderr
@@ -1,29 +1,35 @@
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:11:13
    |
-LL |         let _: Box<PubTr<AssocTy = u8>>;
+LL |         let _: Box<dyn PubTr<AssocTy = u8>>;
    |             ^
 ...
 LL |     priv_trait::mac1!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:11:16
    |
-LL |         let _: Box<PubTr<AssocTy = u8>>;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         let _: Box<dyn PubTr<AssocTy = u8>>;
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_trait::mac1!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:14:31
    |
-LL |         type InSignatureTy2 = Box<PubTr<AssocTy = u8>>;
-   |                               ^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         type InSignatureTy2 = Box<dyn PubTr<AssocTy = u8>>;
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_trait::mac1!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:16:31
@@ -33,33 +39,41 @@ LL |         trait InSignatureTr2: PubTr<AssocTy = u8> {}
 ...
 LL |     priv_trait::mac1!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:20:13
    |
-LL |         let _: Box<PrivTr<AssocTy = u8>>;
+LL |         let _: Box<dyn PrivTr<AssocTy = u8>>;
    |             ^
 ...
 LL |     priv_trait::mac2!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:20:16
    |
-LL |         let _: Box<PrivTr<AssocTy = u8>>;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         let _: Box<dyn PrivTr<AssocTy = u8>>;
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_trait::mac2!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:23:31
    |
-LL |         type InSignatureTy1 = Box<PrivTr<AssocTy = u8>>;
-   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         type InSignatureTy1 = Box<dyn PrivTr<AssocTy = u8>>;
+   |                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_trait::mac2!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `priv_trait::PrivTr` is private
   --> $DIR/associated-item-privacy-type-binding.rs:25:31
@@ -69,60 +83,74 @@ LL |         trait InSignatureTr1: PrivTr<AssocTy = u8> {}
 ...
 LL |     priv_trait::mac2!();
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:44:13
    |
-LL |         let _: Box<PubTrWithParam<AssocTy = u8>>;
+LL |         let _: Box<dyn PubTrWithParam<AssocTy = u8>>;
    |             ^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:44:16
    |
-LL |         let _: Box<PubTrWithParam<AssocTy = u8>>;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         let _: Box<dyn PubTrWithParam<AssocTy = u8>>;
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:47:13
    |
-LL |         let _: Box<PubTr<AssocTy = u8>>;
+LL |         let _: Box<dyn PubTr<AssocTy = u8>>;
    |             ^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:47:16
    |
-LL |         let _: Box<PubTr<AssocTy = u8>>;
-   |                ^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         let _: Box<dyn PubTr<AssocTy = u8>>;
+   |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:50:35
    |
-LL |         pub type InSignatureTy1 = Box<PubTrWithParam<AssocTy = u8>>;
-   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         pub type InSignatureTy1 = Box<dyn PubTrWithParam<AssocTy = u8>>;
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:52:35
    |
-LL |         pub type InSignatureTy2 = Box<PubTr<AssocTy = u8>>;
-   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^
+LL |         pub type InSignatureTy2 = Box<dyn PubTr<AssocTy = u8>>;
+   |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:54:31
@@ -132,6 +160,8 @@ LL |         trait InSignatureTr1: PubTrWithParam<AssocTy = u8> {}
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `priv_parent_substs::Priv` is private
   --> $DIR/associated-item-privacy-type-binding.rs:56:31
@@ -141,6 +171,8 @@ LL |         trait InSignatureTr2: PubTr<AssocTy = u8> {}
 ...
 LL |     priv_parent_substs::mac!();
    |     --------------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 16 previous errors
 
diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.rs b/src/test/ui/privacy/private-in-public-assoc-ty.rs
index ad1052ada6..62faae1f39 100644
--- a/src/test/ui/privacy/private-in-public-assoc-ty.rs
+++ b/src/test/ui/privacy/private-in-public-assoc-ty.rs
@@ -10,6 +10,11 @@ mod m {
     impl PrivTr for Priv {}
     pub trait PubTrAux1<T> {}
     pub trait PubTrAux2 { type A; }
+    impl<T> PubTrAux1<T> for u8 {}
+    impl PubTrAux2 for u8 {
+        type A = Priv;
+        //~^ ERROR private type `m::Priv` in public interface
+    }
 
     // "Private-in-public in associated types is hard error" in RFC 2145
     // applies only to the aliased types, not bounds.
diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.stderr b/src/test/ui/privacy/private-in-public-assoc-ty.stderr
index 3cc551cded..c57073a004 100644
--- a/src/test/ui/privacy/private-in-public-assoc-ty.stderr
+++ b/src/test/ui/privacy/private-in-public-assoc-ty.stderr
@@ -1,5 +1,14 @@
+error[E0446]: private type `m::Priv` in public interface
+  --> $DIR/private-in-public-assoc-ty.rs:15:9
+   |
+LL |     struct Priv;
+   |     - `m::Priv` declared as private
+...
+LL |         type A = Priv;
+   |         ^^^^^^^^^^^^^^ can't leak private type
+
 warning: private trait `m::PrivTr` in public interface (error E0445)
-  --> $DIR/private-in-public-assoc-ty.rs:16:5
+  --> $DIR/private-in-public-assoc-ty.rs:21:5
    |
 LL | /     pub trait PubTr {
 LL | |
@@ -15,7 +24,7 @@ LL | |     }
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
 warning: private type `m::Priv` in public interface (error E0446)
-  --> $DIR/private-in-public-assoc-ty.rs:16:5
+  --> $DIR/private-in-public-assoc-ty.rs:21:5
    |
 LL | /     pub trait PubTr {
 LL | |
@@ -30,7 +39,7 @@ LL | |     }
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
 warning: private type `m::Priv` in public interface (error E0446)
-  --> $DIR/private-in-public-assoc-ty.rs:16:5
+  --> $DIR/private-in-public-assoc-ty.rs:21:5
    |
 LL | /     pub trait PubTr {
 LL | |
@@ -45,7 +54,7 @@ LL | |     }
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
 error[E0446]: private type `m::Priv` in public interface
-  --> $DIR/private-in-public-assoc-ty.rs:27:9
+  --> $DIR/private-in-public-assoc-ty.rs:32:9
    |
 LL |     struct Priv;
    |     - `m::Priv` declared as private
@@ -54,7 +63,7 @@ LL |         type Alias4 = Priv;
    |         ^^^^^^^^^^^^^^^^^^^ can't leak private type
 
 error[E0446]: private type `m::Priv` in public interface
-  --> $DIR/private-in-public-assoc-ty.rs:34:9
+  --> $DIR/private-in-public-assoc-ty.rs:39:9
    |
 LL |     struct Priv;
    |     - `m::Priv` declared as private
@@ -63,7 +72,7 @@ LL |         type Alias1 = Priv;
    |         ^^^^^^^^^^^^^^^^^^^ can't leak private type
 
 error[E0445]: private trait `m::PrivTr` in public interface
-  --> $DIR/private-in-public-assoc-ty.rs:37:9
+  --> $DIR/private-in-public-assoc-ty.rs:42:9
    |
 LL |     trait PrivTr {}
    |     - `m::PrivTr` declared as private
@@ -72,7 +81,7 @@ LL |         type Exist = impl PrivTr;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
 
 error[E0445]: private trait `m::PrivTr` in public interface
-  --> $DIR/private-in-public-assoc-ty.rs:37:9
+  --> $DIR/private-in-public-assoc-ty.rs:42:9
    |
 LL |     trait PrivTr {}
    |     - `m::PrivTr` declared as private
@@ -80,7 +89,7 @@ LL |     trait PrivTr {}
 LL |         type Exist = impl PrivTr;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^ can't leak private trait
 
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
 
 Some errors have detailed explanations: E0445, E0446.
 For more information about an error, try `rustc --explain E0445`.
diff --git a/src/test/ui/privacy/private-in-public-non-principal.stderr b/src/test/ui/privacy/private-in-public-non-principal.stderr
index 4f2a5ea45a..2a41fae43c 100644
--- a/src/test/ui/privacy/private-in-public-non-principal.stderr
+++ b/src/test/ui/privacy/private-in-public-non-principal.stderr
@@ -14,7 +14,7 @@ error: missing documentation for a method
 LL |         pub fn check_doc_lint() {}
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/private-in-public-non-principal.rs:10:8
    |
 LL | #[deny(missing_docs)]
diff --git a/src/test/ui/privacy/private-in-public-warn.stderr b/src/test/ui/privacy/private-in-public-warn.stderr
index 40aa47a724..079331bffd 100644
--- a/src/test/ui/privacy/private-in-public-warn.stderr
+++ b/src/test/ui/privacy/private-in-public-warn.stderr
@@ -4,7 +4,7 @@ error: private type `types::Priv` in public interface (error E0446)
 LL |     pub type Alias = Priv;
    |     ^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/private-in-public-warn.rs:5:9
    |
 LL | #![deny(private_in_public)]
diff --git a/src/test/ui/privacy/private-inferred-type-3.stderr b/src/test/ui/privacy/private-inferred-type-3.stderr
index 61cd847629..376f1334ff 100644
--- a/src/test/ui/privacy/private-inferred-type-3.stderr
+++ b/src/test/ui/privacy/private-inferred-type-3.stderr
@@ -4,7 +4,7 @@ error: type `fn() {ext::priv_fn}` is private
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: static `PRIV_STATIC` is private
   --> $DIR/private-inferred-type-3.rs:16:5
@@ -12,7 +12,7 @@ error: static `PRIV_STATIC` is private
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `ext::PrivEnum` is private
   --> $DIR/private-inferred-type-3.rs:16:5
@@ -20,7 +20,7 @@ error: type `ext::PrivEnum` is private
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `fn() {<u8 as ext::PrivTrait>::method}` is private
   --> $DIR/private-inferred-type-3.rs:16:5
@@ -28,7 +28,7 @@ error: type `fn() {<u8 as ext::PrivTrait>::method}` is private
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct}` is private
   --> $DIR/private-inferred-type-3.rs:16:5
@@ -36,7 +36,7 @@ error: type `fn(u8) -> ext::PrivTupleStruct {ext::PrivTupleStruct}` is private
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct}` is private
   --> $DIR/private-inferred-type-3.rs:16:5
@@ -44,7 +44,7 @@ error: type `fn(u8) -> ext::PubTupleStruct {ext::PubTupleStruct}` is private
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `for<'r> fn(&'r ext::Pub<u8>) {ext::Pub::<u8>::priv_method}` is private
   --> $DIR/private-inferred-type-3.rs:16:5
@@ -52,7 +52,7 @@ error: type `for<'r> fn(&'r ext::Pub<u8>) {ext::Pub::<u8>::priv_method}` is priv
 LL |     ext::m!();
    |     ^^^^^^^^^^
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/privacy/private-inferred-type.stderr b/src/test/ui/privacy/private-inferred-type.stderr
index 4d40b6b7ca..48c83c2186 100644
--- a/src/test/ui/privacy/private-inferred-type.stderr
+++ b/src/test/ui/privacy/private-inferred-type.stderr
@@ -114,6 +114,8 @@ LL |         priv_fn;
 ...
 LL |     m::m!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `m::PrivEnum` is private
   --> $DIR/private-inferred-type.rs:41:9
@@ -123,6 +125,8 @@ LL |         PrivEnum::Variant;
 ...
 LL |     m::m!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `fn() {<u8 as m::PrivTrait>::method}` is private
   --> $DIR/private-inferred-type.rs:43:9
@@ -132,6 +136,8 @@ LL |         <u8 as PrivTrait>::method;
 ...
 LL |     m::m!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `fn(u8) -> m::PrivTupleStruct {m::PrivTupleStruct}` is private
   --> $DIR/private-inferred-type.rs:45:9
@@ -141,6 +147,8 @@ LL |         PrivTupleStruct;
 ...
 LL |     m::m!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `fn(u8) -> m::PubTupleStruct {m::PubTupleStruct}` is private
   --> $DIR/private-inferred-type.rs:47:9
@@ -150,6 +158,8 @@ LL |         PubTupleStruct;
 ...
 LL |     m::m!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: type `for<'r> fn(&'r m::Pub<u8>) {m::Pub::<u8>::priv_method}` is private
   --> $DIR/private-inferred-type.rs:49:18
@@ -159,6 +169,8 @@ LL |         Pub(0u8).priv_method();
 ...
 LL |     m::m!();
    |     -------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: trait `m::Trait` is private
   --> $DIR/private-inferred-type.rs:118:5
diff --git a/src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr b/src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr
index f21b11f5b3..010969c03a 100644
--- a/src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr
+++ b/src/test/ui/privacy/pub-priv-dep/pub-priv1.stderr
@@ -4,7 +4,7 @@ error: type `priv_dep::OtherType` from private dependency 'priv_dep' in public i
 LL |     pub field: OtherType,
    |     ^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/pub-priv1.rs:3:9
    |
 LL | #![deny(exported_private_dependencies)]
diff --git a/src/test/ui/proc-macro/attr-stmt-expr.stderr b/src/test/ui/proc-macro/attr-stmt-expr.stderr
index d931a25dd4..0d6f247cf8 100644
--- a/src/test/ui/proc-macro/attr-stmt-expr.stderr
+++ b/src/test/ui/proc-macro/attr-stmt-expr.stderr
@@ -4,7 +4,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     #[expect_print_expr]
    |     ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -13,7 +13,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     #[expect_expr]
    |     ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/proc-macro/attributes-included.stderr b/src/test/ui/proc-macro/attributes-included.stderr
index 0f74f45e10..27a215de03 100644
--- a/src/test/ui/proc-macro/attributes-included.stderr
+++ b/src/test/ui/proc-macro/attributes-included.stderr
@@ -4,7 +4,7 @@ warning: unused variable: `a`
 LL |     let a: i32 = "foo";
    |         ^ help: consider prefixing with an underscore: `_a`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/attributes-included.rs:4:9
    |
 LL | #![warn(unused)]
diff --git a/src/test/ui/proc-macro/attributes-on-modules-fail.stderr b/src/test/ui/proc-macro/attributes-on-modules-fail.stderr
index 74b9932a91..f0ab107e15 100644
--- a/src/test/ui/proc-macro/attributes-on-modules-fail.stderr
+++ b/src/test/ui/proc-macro/attributes-on-modules-fail.stderr
@@ -10,7 +10,7 @@ error[E0658]: non-inline modules in proc macro input are unstable
 LL | mod module;
    | ^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: non-inline modules in proc macro input are unstable
@@ -19,7 +19,7 @@ error[E0658]: non-inline modules in proc macro input are unstable
 LL |     mod inner;
    |     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: non-inline modules in proc macro input are unstable
@@ -28,7 +28,7 @@ error[E0658]: non-inline modules in proc macro input are unstable
 LL |         mod inner;
    |         ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: non-inline modules in proc macro input are unstable
@@ -37,7 +37,7 @@ error[E0658]: non-inline modules in proc macro input are unstable
 LL |     mod inner;
    |     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0412]: cannot find type `Y` in this scope
diff --git a/src/test/ui/proc-macro/auxiliary/generate-dollar-ident.rs b/src/test/ui/proc-macro/auxiliary/generate-dollar-ident.rs
new file mode 100644
index 0000000000..c9f0664c3a
--- /dev/null
+++ b/src/test/ui/proc-macro/auxiliary/generate-dollar-ident.rs
@@ -0,0 +1,17 @@
+// force-host
+// no-prefer-dynamic
+
+#![feature(proc_macro_hygiene)]
+#![feature(proc_macro_quote)]
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+use proc_macro::*;
+
+#[proc_macro]
+pub fn dollar_ident(input: TokenStream) -> TokenStream {
+    let black_hole = input.into_iter().next().unwrap();
+    quote! {
+        $black_hole!($$var);
+    }
+}
diff --git a/src/test/ui/proc-macro/auxiliary/issue-59191.rs b/src/test/ui/proc-macro/auxiliary/issue-59191.rs
new file mode 100644
index 0000000000..d9ee77067e
--- /dev/null
+++ b/src/test/ui/proc-macro/auxiliary/issue-59191.rs
@@ -0,0 +1,16 @@
+// edition:2018
+// force-host
+// no-prefer-dynamic
+
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+use proc_macro::TokenStream;
+
+#[proc_macro_attribute]
+pub fn no_main(_attrs: TokenStream, _input: TokenStream) -> TokenStream {
+    let new_krate = r#"
+        fn main() {}
+    "#;
+    new_krate.parse().unwrap()
+}
diff --git a/src/test/ui/proc-macro/derive-bad.stderr b/src/test/ui/proc-macro/derive-bad.stderr
index 93908150b6..8667396c98 100644
--- a/src/test/ui/proc-macro/derive-bad.stderr
+++ b/src/test/ui/proc-macro/derive-bad.stderr
@@ -3,6 +3,8 @@ error: expected `:`, found `}`
    |
 LL |     A
    |     ^ expected `:`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: proc-macro derive produced unparseable tokens
   --> $DIR/derive-bad.rs:7:5
diff --git a/src/test/ui/proc-macro/derive-helper-shadowing.stderr b/src/test/ui/proc-macro/derive-helper-shadowing.stderr
index 76434860a4..f82f49aa77 100644
--- a/src/test/ui/proc-macro/derive-helper-shadowing.stderr
+++ b/src/test/ui/proc-macro/derive-helper-shadowing.stderr
@@ -15,6 +15,8 @@ error: cannot find attribute `empty_helper` in this scope
    |
 LL |             #[derive(GenHelperUse)]
    |                      ^^^^^^^^^^^^
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: cannot find attribute `empty_helper` in this scope
   --> $DIR/derive-helper-shadowing.rs:14:11
@@ -24,6 +26,8 @@ LL |         #[empty_helper]
 ...
 LL |             gen_helper_use!();
    |             ------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0659]: `empty_helper` is ambiguous (name vs any other name during import resolution)
   --> $DIR/derive-helper-shadowing.rs:24:13
diff --git a/src/test/ui/proc-macro/dollar-crate.stderr b/src/test/ui/proc-macro/dollar-crate.stderr
index 5d78a8e198..465f242580 100644
--- a/src/test/ui/proc-macro/dollar-crate.stderr
+++ b/src/test/ui/proc-macro/dollar-crate.stderr
@@ -11,6 +11,7 @@ LL |     local!();
    |     --------- in this macro invocation
    |
    = note: `D` must be defined only once in the type namespace of this module
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0428]: the name `D` is defined multiple times
   --> $DIR/dollar-crate.rs:36:5
@@ -22,7 +23,7 @@ LL |     dollar_crate_external::external!();
    |     previous definition of the type `D` here
    |
    = note: `D` must be defined only once in the type namespace of this module
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/proc-macro/expand-to-unstable-2.stderr b/src/test/ui/proc-macro/expand-to-unstable-2.stderr
index 5b6184afac..19144b210a 100644
--- a/src/test/ui/proc-macro/expand-to-unstable-2.stderr
+++ b/src/test/ui/proc-macro/expand-to-unstable-2.stderr
@@ -4,8 +4,8 @@ error[E0658]: attributes starting with `rustc` are reserved for use by the `rust
 LL | #[derive(Unstable)]
    |          ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/proc-macro/expand-to-unstable.stderr b/src/test/ui/proc-macro/expand-to-unstable.stderr
index 6df0076586..fdbf80f9b3 100644
--- a/src/test/ui/proc-macro/expand-to-unstable.stderr
+++ b/src/test/ui/proc-macro/expand-to-unstable.stderr
@@ -5,6 +5,7 @@ LL | #[derive(Unstable)]
    |          ^^^^^^^^
    |
    = help: add `#![feature(core_intrinsics)]` to the crate attributes to enable
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/proc-macro/gen-macro-rules-hygiene.stderr b/src/test/ui/proc-macro/gen-macro-rules-hygiene.stderr
index ecebdfa965..b65fc739e0 100644
--- a/src/test/ui/proc-macro/gen-macro-rules-hygiene.stderr
+++ b/src/test/ui/proc-macro/gen-macro-rules-hygiene.stderr
@@ -6,6 +6,8 @@ LL | gen_macro_rules!();
 ...
 LL |         generated!();
    |         ------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `local_use` in this scope
   --> $DIR/gen-macro-rules-hygiene.rs:12:1
@@ -15,6 +17,8 @@ LL | gen_macro_rules!();
 ...
 LL |         generated!();
    |         ------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `local_def` in this scope
   --> $DIR/gen-macro-rules-hygiene.rs:21:9
diff --git a/src/test/ui/proc-macro/generate-dollar-ident.rs b/src/test/ui/proc-macro/generate-dollar-ident.rs
new file mode 100644
index 0000000000..b838be9fb9
--- /dev/null
+++ b/src/test/ui/proc-macro/generate-dollar-ident.rs
@@ -0,0 +1,18 @@
+// Proc macros can generate token sequence `$ IDENT`
+// without it being recognized as an unknown macro variable.
+
+// check-pass
+// aux-build:generate-dollar-ident.rs
+
+extern crate generate_dollar_ident;
+use generate_dollar_ident::*;
+
+macro_rules! black_hole {
+    ($($tt:tt)*) => {};
+}
+
+black_hole!($var);
+
+dollar_ident!(black_hole);
+
+fn main() {}
diff --git a/src/test/ui/proc-macro/generate-mod.stderr b/src/test/ui/proc-macro/generate-mod.stderr
index fe53fb242f..d239097263 100644
--- a/src/test/ui/proc-macro/generate-mod.stderr
+++ b/src/test/ui/proc-macro/generate-mod.stderr
@@ -2,25 +2,21 @@ error[E0412]: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:9:1
    |
 LL | generate_mod::check!();
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-   | |
-   | not found in this scope
-   | in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
    = note: possible candidate is found in another module, you can import it into scope:
            FromOutside
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Outer` in this scope
   --> $DIR/generate-mod.rs:9:1
    |
 LL | generate_mod::check!();
-   | ^^^^^^^^^^^^^^^^^^^^^^^
-   | |
-   | not found in this scope
-   | in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
    = note: possible candidate is found in another module, you can import it into scope:
            Outer
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:12:1
@@ -30,6 +26,7 @@ LL | #[generate_mod::check_attr]
    |
    = note: possible candidate is found in another module, you can import it into scope:
            FromOutside
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `OuterAttr` in this scope
   --> $DIR/generate-mod.rs:12:1
@@ -39,6 +36,7 @@ LL | #[generate_mod::check_attr]
    |
    = note: possible candidate is found in another module, you can import it into scope:
            OuterAttr
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:16:10
diff --git a/src/test/ui/proc-macro/invalid-punct-ident-4.stderr b/src/test/ui/proc-macro/invalid-punct-ident-4.stderr
index e7764004e8..fe3e55b31b 100644
--- a/src/test/ui/proc-macro/invalid-punct-ident-4.stderr
+++ b/src/test/ui/proc-macro/invalid-punct-ident-4.stderr
@@ -2,10 +2,9 @@ error: unexpected closing delimiter: `)`
   --> $DIR/invalid-punct-ident-4.rs:6:1
    |
 LL | lexer_failure!();
-   | ^^^^^^^^^^^^^^^^^
-   | |
-   | unexpected closing delimiter
-   | in this macro invocation
+   | ^^^^^^^^^^^^^^^^^ unexpected closing delimiter
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: proc macro panicked
   --> $DIR/invalid-punct-ident-4.rs:6:1
diff --git a/src/test/ui/proc-macro/issue-38586.stderr b/src/test/ui/proc-macro/issue-38586.stderr
index 2584e0c62e..4cdca5c8e0 100644
--- a/src/test/ui/proc-macro/issue-38586.stderr
+++ b/src/test/ui/proc-macro/issue-38586.stderr
@@ -3,6 +3,8 @@ error[E0425]: cannot find value `foo` in this scope
    |
 LL | #[derive(A)]
    |          ^ not found in this scope
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/proc-macro/issue-50493.stderr b/src/test/ui/proc-macro/issue-50493.stderr
index 56c7800102..7997786b50 100644
--- a/src/test/ui/proc-macro/issue-50493.stderr
+++ b/src/test/ui/proc-macro/issue-50493.stderr
@@ -9,12 +9,16 @@ error[E0616]: field `field` of struct `Restricted` is private
    |
 LL | #[derive(Derive)]
    |          ^^^^^^
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0616]: field `field` of struct `Restricted` is private
   --> $DIR/issue-50493.rs:6:10
    |
 LL | #[derive(Derive)]
    |          ^^^^^^
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.rs b/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.rs
new file mode 100644
index 0000000000..a59cacb8bd
--- /dev/null
+++ b/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.rs
@@ -0,0 +1,8 @@
+// edition:2018
+// aux-crate:issue_59191=issue-59191.rs
+// Test that using a macro to replace the entire crate tree with a non-'mod' item errors out nicely.
+// `issue_59191::no_main` replaces whatever's passed in with `fn main() {}`.
+#![feature(custom_inner_attributes)]
+//~^ ERROR `main` function not found in crate `issue_59191_replace_root_with_fn` [E0601]
+#![issue_59191::no_main]
+//~^ ERROR expected crate top-level item to be a module after macro expansion, found a function
diff --git a/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.stderr b/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.stderr
new file mode 100644
index 0000000000..5995a4891f
--- /dev/null
+++ b/src/test/ui/proc-macro/issue-59191-replace-root-with-fn.stderr
@@ -0,0 +1,19 @@
+error: expected crate top-level item to be a module after macro expansion, found a function
+  --> $DIR/issue-59191-replace-root-with-fn.rs:7:1
+   |
+LL | #![issue_59191::no_main]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0601]: `main` function not found in crate `issue_59191_replace_root_with_fn`
+  --> $DIR/issue-59191-replace-root-with-fn.rs:5:1
+   |
+LL | / #![feature(custom_inner_attributes)]
+LL | |
+LL | | #![issue_59191::no_main]
+   | |________________________^ consider adding a `main` function to `$DIR/issue-59191-replace-root-with-fn.rs`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0601`.
diff --git a/src/test/ui/proc-macro/item-error.stderr b/src/test/ui/proc-macro/item-error.stderr
index 01eadbe252..27f7639d21 100644
--- a/src/test/ui/proc-macro/item-error.stderr
+++ b/src/test/ui/proc-macro/item-error.stderr
@@ -6,8 +6,8 @@ LL |     a: &u64
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct A<'lifetime> {
-LL |     a: &'lifetime u64
+LL | struct A<'a> {
+LL |     a: &'a u64
    |
 
 error: aborting due to previous error
diff --git a/src/test/ui/proc-macro/lints_in_proc_macros.stderr b/src/test/ui/proc-macro/lints_in_proc_macros.stderr
index f28b8c9fb7..df9d7e1efe 100644
--- a/src/test/ui/proc-macro/lints_in_proc_macros.stderr
+++ b/src/test/ui/proc-macro/lints_in_proc_macros.stderr
@@ -2,10 +2,9 @@ error[E0425]: cannot find value `foobar2` in this scope
   --> $DIR/lints_in_proc_macros.rs:12:5
    |
 LL |     bang_proc_macro2!();
-   |     ^^^^^^^^^^^^^^^^^^^^
-   |     |
-   |     help: a local variable with a similar name exists: `foobar`
-   |     in this macro invocation
+   |     ^^^^^^^^^^^^^^^^^^^^ help: a local variable with a similar name exists: `foobar`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/proc-macro/mixed-site-span.stderr b/src/test/ui/proc-macro/mixed-site-span.stderr
index 54d10fe0d9..c344147ed9 100644
--- a/src/test/ui/proc-macro/mixed-site-span.stderr
+++ b/src/test/ui/proc-macro/mixed-site-span.stderr
@@ -2,19 +2,17 @@ error[E0426]: use of undeclared label `'label_use`
   --> $DIR/mixed-site-span.rs:15:9
    |
 LL |         proc_macro_rules!();
-   |         ^^^^^^^^^^^^^^^^^^^^
-   |         |
-   |         undeclared label `'label_use`
-   |         in this macro invocation
+   |         ^^^^^^^^^^^^^^^^^^^^ undeclared label `'label_use`
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `local_use` in this scope
   --> $DIR/mixed-site-span.rs:15:9
    |
 LL |         proc_macro_rules!();
-   |         ^^^^^^^^^^^^^^^^^^^^
-   |         |
-   |         not found in this scope
-   |         in this macro invocation
+   |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `local_def` in this scope
   --> $DIR/mixed-site-span.rs:19:9
@@ -39,6 +37,7 @@ LL | | }
 LL |   pass_dollar_crate!();
    |   --------------------- in this macro invocation
    |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 help: possible candidate is found in another module, you can import it into scope
    |
 LL | use ItemUse;
diff --git a/src/test/ui/proc-macro/multispan.stderr b/src/test/ui/proc-macro/multispan.stderr
index e7f705c7fe..c9390a04b9 100644
--- a/src/test/ui/proc-macro/multispan.stderr
+++ b/src/test/ui/proc-macro/multispan.stderr
@@ -20,6 +20,7 @@ note: found these 'hi's
    |
 LL |     hello!(hi);
    |            ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hello to you, too!
   --> $DIR/auxiliary/multispan.rs:31:1
@@ -43,6 +44,7 @@ note: found these 'hi's
    |
 LL |     hello!(hi hi);
    |            ^^ ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hello to you, too!
   --> $DIR/auxiliary/multispan.rs:31:1
@@ -66,6 +68,7 @@ note: found these 'hi's
    |
 LL |     hello!(hi hi hi);
    |            ^^ ^^ ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hello to you, too!
   --> $DIR/auxiliary/multispan.rs:31:1
@@ -89,6 +92,7 @@ note: found these 'hi's
    |
 LL |     hello!(hi hey hi yo hi beep beep hi hi);
    |            ^^     ^^    ^^           ^^ ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hello to you, too!
   --> $DIR/auxiliary/multispan.rs:31:1
@@ -112,6 +116,7 @@ note: found these 'hi's
    |
 LL |     hello!(hi there, hi how are you? hi... hi.);
    |            ^^        ^^              ^^    ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hello to you, too!
   --> $DIR/auxiliary/multispan.rs:31:1
@@ -135,6 +140,7 @@ note: found these 'hi's
    |
 LL |     hello!(whoah. hi di hi di ho);
    |                   ^^    ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: hello to you, too!
   --> $DIR/auxiliary/multispan.rs:31:1
@@ -158,6 +164,7 @@ note: found these 'hi's
    |
 LL |     hello!(hi good hi and good bye);
    |            ^^      ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/proc-macro/no-macro-use-attr.stderr b/src/test/ui/proc-macro/no-macro-use-attr.stderr
index 50552ea7db..27943a3f7b 100644
--- a/src/test/ui/proc-macro/no-macro-use-attr.stderr
+++ b/src/test/ui/proc-macro/no-macro-use-attr.stderr
@@ -4,7 +4,7 @@ warning: unused extern crate
 LL | extern crate test_macros;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/no-macro-use-attr.rs:4:9
    |
 LL | #![warn(unused_extern_crates)]
diff --git a/src/test/ui/proc-macro/parent-source-spans.stderr b/src/test/ui/proc-macro/parent-source-spans.stderr
index 9f0fefcfe6..254f87751f 100644
--- a/src/test/ui/proc-macro/parent-source-spans.stderr
+++ b/src/test/ui/proc-macro/parent-source-spans.stderr
@@ -6,6 +6,8 @@ LL |     three!($a, $b);
 ...
 LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: second final: "world"
   --> $DIR/parent-source-spans.rs:19:16
@@ -15,6 +17,8 @@ LL |     three!($a, $b);
 ...
 LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: first parent: "hello"
   --> $DIR/parent-source-spans.rs:13:5
@@ -24,6 +28,8 @@ LL |     two!($a, $b);
 ...
 LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: second parent: "world"
   --> $DIR/parent-source-spans.rs:13:5
@@ -33,6 +39,8 @@ LL |     two!($a, $b);
 ...
 LL |     one!("hello", "world");
    |     ----------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: first grandparent: "hello"
   --> $DIR/parent-source-spans.rs:39:5
@@ -66,6 +74,8 @@ LL |     three!($a, $b);
 ...
 LL |     two!("yay", "rust");
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: second final: "rust"
   --> $DIR/parent-source-spans.rs:19:16
@@ -75,6 +85,8 @@ LL |     three!($a, $b);
 ...
 LL |     two!("yay", "rust");
    |     -------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: first parent: "yay"
   --> $DIR/parent-source-spans.rs:45:5
@@ -137,6 +149,8 @@ LL |     one!("hello", "world");
    |
 LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
    |     --------------------------------------------------- similarly named tuple variant `Ok` defined here
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `ok` in this scope
   --> $DIR/parent-source-spans.rs:32:5
@@ -151,6 +165,8 @@ LL |     two!("yay", "rust");
    |
 LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
    |     --------------------------------------------------- similarly named tuple variant `Ok` defined here
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0425]: cannot find value `ok` in this scope
   --> $DIR/parent-source-spans.rs:32:5
@@ -165,6 +181,8 @@ LL |     three!("hip", "hop");
    |
 LL |     Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
    |     --------------------------------------------------- similarly named tuple variant `Ok` defined here
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 21 previous errors
 
diff --git a/src/test/ui/proc-macro/proc-macro-gates.stderr b/src/test/ui/proc-macro/proc-macro-gates.stderr
index fff96572e3..a94274de9c 100644
--- a/src/test/ui/proc-macro/proc-macro-gates.stderr
+++ b/src/test/ui/proc-macro/proc-macro-gates.stderr
@@ -4,7 +4,7 @@ error[E0658]: non-builtin inner attributes are unstable
 LL |     #![empty_attr]
    |     ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54726
+   = note: see issue #54726 <https://github.com/rust-lang/rust/issues/54726> for more information
    = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable
 
 error[E0658]: non-builtin inner attributes are unstable
@@ -13,7 +13,7 @@ error[E0658]: non-builtin inner attributes are unstable
 LL |     #![empty_attr]
    |     ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54726
+   = note: see issue #54726 <https://github.com/rust-lang/rust/issues/54726> for more information
    = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable
 
 error: key-value macro attributes are not supported
@@ -28,7 +28,7 @@ error[E0658]: custom attributes cannot be applied to statements
 LL |     #[empty_attr]
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: custom attributes cannot be applied to statements
@@ -37,7 +37,7 @@ error[E0658]: custom attributes cannot be applied to statements
 LL |     #[empty_attr]
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: custom attributes cannot be applied to statements
@@ -46,7 +46,7 @@ error[E0658]: custom attributes cannot be applied to statements
 LL |     #[empty_attr]
    |     ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: custom attributes cannot be applied to expressions
@@ -55,7 +55,7 @@ error[E0658]: custom attributes cannot be applied to expressions
 LL |     let _x = #[identity_attr] 2;
    |              ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: custom attributes cannot be applied to expressions
@@ -64,7 +64,7 @@ error[E0658]: custom attributes cannot be applied to expressions
 LL |     let _x = [#[identity_attr] 2];
    |               ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: custom attributes cannot be applied to expressions
@@ -73,7 +73,7 @@ error[E0658]: custom attributes cannot be applied to expressions
 LL |     let _x = #[identity_attr] println!();
    |              ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: procedural macros cannot be expanded to patterns
@@ -82,7 +82,7 @@ error[E0658]: procedural macros cannot be expanded to patterns
 LL |     if let identity!(Some(_x)) = Some(3) {}
    |            ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: procedural macros cannot be expanded to statements
@@ -91,7 +91,7 @@ error[E0658]: procedural macros cannot be expanded to statements
 LL |     empty!(struct S;);
    |     ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: procedural macros cannot be expanded to statements
@@ -100,7 +100,7 @@ error[E0658]: procedural macros cannot be expanded to statements
 LL |     empty!(let _x = 3;);
    |     ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: procedural macros cannot be expanded to expressions
@@ -109,7 +109,7 @@ error[E0658]: procedural macros cannot be expanded to expressions
 LL |     let _x = identity!(3);
    |              ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error[E0658]: procedural macros cannot be expanded to expressions
@@ -118,7 +118,7 @@ error[E0658]: procedural macros cannot be expanded to expressions
 LL |     let _x = [empty!(3)];
    |               ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54727
+   = note: see issue #54727 <https://github.com/rust-lang/rust/issues/54727> for more information
    = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable
 
 error: aborting due to 14 previous errors
diff --git a/src/test/ui/proc-macro/subspan.stderr b/src/test/ui/proc-macro/subspan.stderr
index 06715c197b..c82c2dee67 100644
--- a/src/test/ui/proc-macro/subspan.stderr
+++ b/src/test/ui/proc-macro/subspan.stderr
@@ -2,97 +2,105 @@ error: found 'hi's
   --> $DIR/subspan.rs:11:1
    |
 LL | subspan!("hi");
-   | ^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:11:11
    |
 LL | subspan!("hi");
    |           ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:14:1
    |
 LL | subspan!("hihi");
-   | ^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:14:11
    |
 LL | subspan!("hihi");
    |           ^^^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:17:1
    |
 LL | subspan!("hihihi");
-   | ^^^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:17:11
    |
 LL | subspan!("hihihi");
    |           ^^^^^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:20:1
    |
 LL | subspan!("why I hide? hi!");
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:20:17
    |
 LL | subspan!("why I hide? hi!");
    |                 ^^    ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:21:1
    |
 LL | subspan!("hey, hi, hidy, hidy, hi hi");
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:21:16
    |
 LL | subspan!("hey, hi, hidy, hidy, hi hi");
    |                ^^  ^^    ^^    ^^ ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:22:1
    |
 LL | subspan!("this is a hi, and this is another hi");
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:22:12
    |
 LL | subspan!("this is a hi, and this is another hi");
    |            ^^       ^^       ^^             ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:23:1
    |
 LL | subspan!("how are you this evening");
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:23:24
    |
 LL | subspan!("how are you this evening");
    |                        ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: found 'hi's
   --> $DIR/subspan.rs:24:1
    |
 LL | subspan!("this is highly eradic");
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this macro invocation
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: here
   --> $DIR/subspan.rs:24:12
    |
 LL | subspan!("this is highly eradic");
    |            ^^     ^^
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/proc-macro/three-equals.stderr b/src/test/ui/proc-macro/three-equals.stderr
index 0698b0f475..82c4167262 100644
--- a/src/test/ui/proc-macro/three-equals.stderr
+++ b/src/test/ui/proc-macro/three-equals.stderr
@@ -16,6 +16,7 @@ LL |       three_equals!(==);
    |       ------------------ in this macro invocation
    |
    = help: input must be: `===`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: expected EOF, found `=`.
   --> $DIR/three-equals.rs:18:21
diff --git a/src/test/ui/proc-macro/trait-fn-args-2015.rs b/src/test/ui/proc-macro/trait-fn-args-2015.rs
new file mode 100644
index 0000000000..3a448d4b22
--- /dev/null
+++ b/src/test/ui/proc-macro/trait-fn-args-2015.rs
@@ -0,0 +1,14 @@
+// Unnamed arguments in trait functions can be passed through proc macros on 2015 edition.
+
+// check-pass
+// aux-build:test-macros.rs
+
+#[macro_use]
+extern crate test_macros;
+
+trait Tr {
+    #[identity_attr]
+    fn method(u8);
+}
+
+fn main() {}
diff --git a/src/test/ui/pub/pub-restricted-error-fn.rs b/src/test/ui/pub/pub-restricted-error-fn.rs
index 56ee02f517..fc1aeae2b0 100644
--- a/src/test/ui/pub/pub-restricted-error-fn.rs
+++ b/src/test/ui/pub/pub-restricted-error-fn.rs
@@ -1,3 +1,2 @@
-#![feature(pub_restricted)]
-
-pub(crate) () fn foo() {} //~ unmatched visibility
+pub(crate) () fn foo() {} //~ ERROR visibility `pub(crate)` is not followed by an item
+//~^ ERROR expected item, found `(`
diff --git a/src/test/ui/pub/pub-restricted-error-fn.stderr b/src/test/ui/pub/pub-restricted-error-fn.stderr
index fcff533489..0511a821a7 100644
--- a/src/test/ui/pub/pub-restricted-error-fn.stderr
+++ b/src/test/ui/pub/pub-restricted-error-fn.stderr
@@ -1,8 +1,16 @@
-error: unmatched visibility `pub`
-  --> $DIR/pub-restricted-error-fn.rs:3:10
+error: visibility `pub(crate)` is not followed by an item
+  --> $DIR/pub-restricted-error-fn.rs:1:1
    |
 LL | pub(crate) () fn foo() {}
-   |          ^
+   | ^^^^^^^^^^ the visibility
+   |
+   = help: you likely meant to define an item, e.g., `pub(crate) fn foo() {}`
+
+error: expected item, found `(`
+  --> $DIR/pub-restricted-error-fn.rs:1:12
+   |
+LL | pub(crate) () fn foo() {}
+   |            ^ expected item
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/range/range-inclusive-pattern-precedence.stderr b/src/test/ui/range/range-inclusive-pattern-precedence.stderr
index fb0cf38015..8c4ebd10fc 100644
--- a/src/test/ui/range/range-inclusive-pattern-precedence.stderr
+++ b/src/test/ui/range/range-inclusive-pattern-precedence.stderr
@@ -16,7 +16,7 @@ warning: `...` range patterns are deprecated
 LL |         &0...9 => {}
    |         ^^^^^^ help: use `..=` for an inclusive range: `&(0..=9)`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/range-inclusive-pattern-precedence.rs:9:9
    |
 LL | #![warn(ellipsis_inclusive_range_patterns)]
diff --git a/src/test/ui/range/range_traits-1.stderr b/src/test/ui/range/range_traits-1.stderr
index f60ec23bdb..0e1da3d3f7 100644
--- a/src/test/ui/range/range_traits-1.stderr
+++ b/src/test/ui/range/range_traits-1.stderr
@@ -6,6 +6,7 @@ LL |     a: Range<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::Range<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeTo<usize>` with `std::ops::RangeTo<usize>`
   --> $DIR/range_traits-1.rs:12:5
@@ -15,6 +16,7 @@ LL |     b: RangeTo<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeTo<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFrom<usize>` with `std::ops::RangeFrom<usize>`
   --> $DIR/range_traits-1.rs:19:5
@@ -24,6 +26,7 @@ LL |     c: RangeFrom<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFrom<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFull` with `std::ops::RangeFull`
   --> $DIR/range_traits-1.rs:26:5
@@ -33,6 +36,7 @@ LL |     d: RangeFull,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFull`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeInclusive<usize>` with `std::ops::RangeInclusive<usize>`
   --> $DIR/range_traits-1.rs:33:5
@@ -42,6 +46,7 @@ LL |     e: RangeInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeToInclusive<usize>` with `std::ops::RangeToInclusive<usize>`
   --> $DIR/range_traits-1.rs:40:5
@@ -51,6 +56,7 @@ LL |     f: RangeToInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeToInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::Range<usize>` with `std::ops::Range<usize>`
   --> $DIR/range_traits-1.rs:5:5
@@ -60,6 +66,7 @@ LL |     a: Range<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::Range<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeTo<usize>` with `std::ops::RangeTo<usize>`
   --> $DIR/range_traits-1.rs:12:5
@@ -69,6 +76,7 @@ LL |     b: RangeTo<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeTo<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFrom<usize>` with `std::ops::RangeFrom<usize>`
   --> $DIR/range_traits-1.rs:19:5
@@ -78,6 +86,7 @@ LL |     c: RangeFrom<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFrom<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFull` with `std::ops::RangeFull`
   --> $DIR/range_traits-1.rs:26:5
@@ -87,6 +96,7 @@ LL |     d: RangeFull,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFull`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeInclusive<usize>` with `std::ops::RangeInclusive<usize>`
   --> $DIR/range_traits-1.rs:33:5
@@ -96,6 +106,7 @@ LL |     e: RangeInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeToInclusive<usize>` with `std::ops::RangeToInclusive<usize>`
   --> $DIR/range_traits-1.rs:40:5
@@ -105,6 +116,7 @@ LL |     f: RangeToInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeToInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::Range<usize>` with `std::ops::Range<usize>`
   --> $DIR/range_traits-1.rs:5:5
@@ -114,6 +126,7 @@ LL |     a: Range<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::Range<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeTo<usize>` with `std::ops::RangeTo<usize>`
   --> $DIR/range_traits-1.rs:12:5
@@ -123,6 +136,7 @@ LL |     b: RangeTo<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeTo<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFrom<usize>` with `std::ops::RangeFrom<usize>`
   --> $DIR/range_traits-1.rs:19:5
@@ -132,6 +146,7 @@ LL |     c: RangeFrom<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFrom<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFull` with `std::ops::RangeFull`
   --> $DIR/range_traits-1.rs:26:5
@@ -141,6 +156,7 @@ LL |     d: RangeFull,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFull`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeInclusive<usize>` with `std::ops::RangeInclusive<usize>`
   --> $DIR/range_traits-1.rs:33:5
@@ -150,6 +166,7 @@ LL |     e: RangeInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeToInclusive<usize>` with `std::ops::RangeToInclusive<usize>`
   --> $DIR/range_traits-1.rs:40:5
@@ -159,6 +176,7 @@ LL |     f: RangeToInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeToInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::Range<usize>` with `std::ops::Range<usize>`
   --> $DIR/range_traits-1.rs:5:5
@@ -168,6 +186,7 @@ LL |     a: Range<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::Range<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeTo<usize>` with `std::ops::RangeTo<usize>`
   --> $DIR/range_traits-1.rs:12:5
@@ -177,6 +196,7 @@ LL |     b: RangeTo<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeTo<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFrom<usize>` with `std::ops::RangeFrom<usize>`
   --> $DIR/range_traits-1.rs:19:5
@@ -186,6 +206,7 @@ LL |     c: RangeFrom<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFrom<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFull` with `std::ops::RangeFull`
   --> $DIR/range_traits-1.rs:26:5
@@ -195,6 +216,7 @@ LL |     d: RangeFull,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFull`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeInclusive<usize>` with `std::ops::RangeInclusive<usize>`
   --> $DIR/range_traits-1.rs:33:5
@@ -204,6 +226,7 @@ LL |     e: RangeInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeToInclusive<usize>` with `std::ops::RangeToInclusive<usize>`
   --> $DIR/range_traits-1.rs:40:5
@@ -213,6 +236,7 @@ LL |     f: RangeToInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeToInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::Range<usize>` with `std::ops::Range<usize>`
   --> $DIR/range_traits-1.rs:5:5
@@ -222,6 +246,7 @@ LL |     a: Range<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::Range<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeTo<usize>` with `std::ops::RangeTo<usize>`
   --> $DIR/range_traits-1.rs:12:5
@@ -231,6 +256,7 @@ LL |     b: RangeTo<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeTo<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFrom<usize>` with `std::ops::RangeFrom<usize>`
   --> $DIR/range_traits-1.rs:19:5
@@ -240,6 +266,7 @@ LL |     c: RangeFrom<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFrom<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeFull` with `std::ops::RangeFull`
   --> $DIR/range_traits-1.rs:26:5
@@ -249,6 +276,7 @@ LL |     d: RangeFull,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeFull`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeInclusive<usize>` with `std::ops::RangeInclusive<usize>`
   --> $DIR/range_traits-1.rs:33:5
@@ -258,6 +286,7 @@ LL |     e: RangeInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: can't compare `std::ops::RangeToInclusive<usize>` with `std::ops::RangeToInclusive<usize>`
   --> $DIR/range_traits-1.rs:40:5
@@ -267,6 +296,7 @@ LL |     f: RangeToInclusive<usize>,
    |
    = help: the trait `std::cmp::PartialOrd` is not implemented for `std::ops::RangeToInclusive<usize>`
    = note: required by `std::cmp::PartialOrd::partial_cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `std::ops::Range<usize>: std::cmp::Ord` is not satisfied
   --> $DIR/range_traits-1.rs:5:5
@@ -275,6 +305,7 @@ LL |     a: Range<usize>,
    |     ^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::Range<usize>`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `std::ops::RangeTo<usize>: std::cmp::Ord` is not satisfied
   --> $DIR/range_traits-1.rs:12:5
@@ -283,6 +314,7 @@ LL |     b: RangeTo<usize>,
    |     ^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeTo<usize>`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `std::ops::RangeFrom<usize>: std::cmp::Ord` is not satisfied
   --> $DIR/range_traits-1.rs:19:5
@@ -291,6 +323,7 @@ LL |     c: RangeFrom<usize>,
    |     ^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeFrom<usize>`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `std::ops::RangeFull: std::cmp::Ord` is not satisfied
   --> $DIR/range_traits-1.rs:26:5
@@ -299,6 +332,7 @@ LL |     d: RangeFull,
    |     ^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeFull`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `std::ops::RangeInclusive<usize>: std::cmp::Ord` is not satisfied
   --> $DIR/range_traits-1.rs:33:5
@@ -307,6 +341,7 @@ LL |     e: RangeInclusive<usize>,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeInclusive<usize>`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `std::ops::RangeToInclusive<usize>: std::cmp::Ord` is not satisfied
   --> $DIR/range_traits-1.rs:40:5
@@ -315,6 +350,7 @@ LL |     f: RangeToInclusive<usize>,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::cmp::Ord` is not implemented for `std::ops::RangeToInclusive<usize>`
    |
    = note: required by `std::cmp::Ord::cmp`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 36 previous errors
 
diff --git a/src/test/ui/range/range_traits-2.stderr b/src/test/ui/range/range_traits-2.stderr
index 598a0b3ed0..8a9d15f099 100644
--- a/src/test/ui/range/range_traits-2.stderr
+++ b/src/test/ui/range/range_traits-2.stderr
@@ -5,6 +5,8 @@ LL | #[derive(Copy, Clone)]
    |          ^^^^
 LL | struct R(Range<usize>);
    |          ------------ this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/range/range_traits-3.stderr b/src/test/ui/range/range_traits-3.stderr
index e2713a2bd5..14fda58e1f 100644
--- a/src/test/ui/range/range_traits-3.stderr
+++ b/src/test/ui/range/range_traits-3.stderr
@@ -5,6 +5,8 @@ LL | #[derive(Copy, Clone)]
    |          ^^^^
 LL | struct R(RangeFrom<usize>);
    |          ---------------- this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/range/range_traits-6.stderr b/src/test/ui/range/range_traits-6.stderr
index 226d72ce02..693600cdce 100644
--- a/src/test/ui/range/range_traits-6.stderr
+++ b/src/test/ui/range/range_traits-6.stderr
@@ -5,6 +5,8 @@ LL | #[derive(Copy, Clone)]
    |          ^^^^
 LL | struct R(RangeInclusive<usize>);
    |          --------------------- this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/raw-ref-op/feature-raw-ref-op.stderr b/src/test/ui/raw-ref-op/feature-raw-ref-op.stderr
index cbd413aec7..1e5fd84ff7 100644
--- a/src/test/ui/raw-ref-op/feature-raw-ref-op.stderr
+++ b/src/test/ui/raw-ref-op/feature-raw-ref-op.stderr
@@ -4,7 +4,7 @@ error[E0658]: raw address of syntax is experimental
 LL |     &raw const a;
    |     ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64490
+   = note: see issue #64490 <https://github.com/rust-lang/rust/issues/64490> for more information
    = help: add `#![feature(raw_ref_op)]` to the crate attributes to enable
 
 error[E0658]: raw address of syntax is experimental
@@ -13,7 +13,7 @@ error[E0658]: raw address of syntax is experimental
 LL |     &raw mut a;
    |     ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64490
+   = note: see issue #64490 <https://github.com/rust-lang/rust/issues/64490> for more information
    = help: add `#![feature(raw_ref_op)]` to the crate attributes to enable
 
 error[E0658]: raw address of syntax is experimental
@@ -22,7 +22,7 @@ error[E0658]: raw address of syntax is experimental
 LL |     let x = &raw const y;
    |             ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64490
+   = note: see issue #64490 <https://github.com/rust-lang/rust/issues/64490> for more information
    = help: add `#![feature(raw_ref_op)]` to the crate attributes to enable
 
 error[E0658]: raw address of syntax is experimental
@@ -31,7 +31,7 @@ error[E0658]: raw address of syntax is experimental
 LL |     let x = &raw mut y;
    |             ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64490
+   = note: see issue #64490 <https://github.com/rust-lang/rust/issues/64490> for more information
    = help: add `#![feature(raw_ref_op)]` to the crate attributes to enable
 
 error[E0658]: raw address of syntax is experimental
@@ -40,7 +40,7 @@ error[E0658]: raw address of syntax is experimental
 LL | is_expr!(&raw const a);
    |          ^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64490
+   = note: see issue #64490 <https://github.com/rust-lang/rust/issues/64490> for more information
    = help: add `#![feature(raw_ref_op)]` to the crate attributes to enable
 
 error[E0658]: raw address of syntax is experimental
@@ -49,7 +49,7 @@ error[E0658]: raw address of syntax is experimental
 LL | is_expr!(&raw mut a);
    |          ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/64490
+   = note: see issue #64490 <https://github.com/rust-lang/rust/issues/64490> for more information
    = help: add `#![feature(raw_ref_op)]` to the crate attributes to enable
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/reachable/expr_add.stderr b/src/test/ui/reachable/expr_add.stderr
index 880dea1cc3..692bd20f50 100644
--- a/src/test/ui/reachable/expr_add.stderr
+++ b/src/test/ui/reachable/expr_add.stderr
@@ -7,7 +7,7 @@ LL |     let x = Foo + return;
    |             |     any code following this expression is unreachable
    |             unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_add.rs:3:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_again.stderr b/src/test/ui/reachable/expr_again.stderr
index 9500688424..130fd8535e 100644
--- a/src/test/ui/reachable/expr_again.stderr
+++ b/src/test/ui/reachable/expr_again.stderr
@@ -6,12 +6,12 @@ LL |         continue;
 LL |         println!("hi");
    |         ^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_again.rs:3:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/reachable/expr_array.stderr b/src/test/ui/reachable/expr_array.stderr
index b3138d3c33..e144d7184a 100644
--- a/src/test/ui/reachable/expr_array.stderr
+++ b/src/test/ui/reachable/expr_array.stderr
@@ -6,7 +6,7 @@ LL |     let x: [usize; 2] = [return, 22];
    |                          |
    |                          any code following this expression is unreachable
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_array.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_assign.stderr b/src/test/ui/reachable/expr_assign.stderr
index 3004da0406..c51156b3f4 100644
--- a/src/test/ui/reachable/expr_assign.stderr
+++ b/src/test/ui/reachable/expr_assign.stderr
@@ -7,7 +7,7 @@ LL |     x = return;
    |     |   any code following this expression is unreachable
    |     unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_assign.rs:5:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_block.stderr b/src/test/ui/reachable/expr_block.stderr
index 44baddd1e5..154734b0f6 100644
--- a/src/test/ui/reachable/expr_block.stderr
+++ b/src/test/ui/reachable/expr_block.stderr
@@ -6,7 +6,7 @@ LL |         return;
 LL |         22
    |         ^^ unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_block.rs:4:9
    |
 LL | #![deny(unreachable_code)]
@@ -20,7 +20,7 @@ LL |         return;
 LL |         println!("foo");
    |         ^^^^^^^^^^^^^^^^ unreachable statement
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/reachable/expr_box.stderr b/src/test/ui/reachable/expr_box.stderr
index b01a13e9df..ea6472cbea 100644
--- a/src/test/ui/reachable/expr_box.stderr
+++ b/src/test/ui/reachable/expr_box.stderr
@@ -7,7 +7,7 @@ LL |     let x = box return;
    |             |   any code following this expression is unreachable
    |             unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_box.rs:3:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_call.stderr b/src/test/ui/reachable/expr_call.stderr
index ae8b4dd87b..a5ad9a329f 100644
--- a/src/test/ui/reachable/expr_call.stderr
+++ b/src/test/ui/reachable/expr_call.stderr
@@ -6,7 +6,7 @@ LL |     foo(return, 22);
    |         |
    |         any code following this expression is unreachable
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_call.rs:5:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_cast.stderr b/src/test/ui/reachable/expr_cast.stderr
index 81813d1d71..3aa15bde99 100644
--- a/src/test/ui/reachable/expr_cast.stderr
+++ b/src/test/ui/reachable/expr_cast.stderr
@@ -7,7 +7,7 @@ LL |     let x = {return} as !;
    |             |any code following this expression is unreachable
    |             unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_cast.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_if.stderr b/src/test/ui/reachable/expr_if.stderr
index ccd45ccec6..850570d056 100644
--- a/src/test/ui/reachable/expr_if.stderr
+++ b/src/test/ui/reachable/expr_if.stderr
@@ -9,7 +9,7 @@ LL | |         println!("Hello, world!");
 LL | |     }
    | |_____^ unreachable block in `if` expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_if.rs:4:9
    |
 LL | #![deny(unreachable_code)]
@@ -24,7 +24,7 @@ LL |         return;
 LL |     println!("But I am.");
    |     ^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/reachable/expr_loop.stderr b/src/test/ui/reachable/expr_loop.stderr
index 5f279c9630..fe7d7782ed 100644
--- a/src/test/ui/reachable/expr_loop.stderr
+++ b/src/test/ui/reachable/expr_loop.stderr
@@ -6,12 +6,12 @@ LL |     loop { return; }
 LL |     println!("I am dead.");
    |     ^^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_loop.rs:4:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unreachable statement
   --> $DIR/expr_loop.rs:21:5
@@ -21,7 +21,7 @@ LL |     loop { return; }
 LL |     println!("I am dead.");
    |     ^^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unreachable statement
   --> $DIR/expr_loop.rs:32:5
@@ -31,7 +31,7 @@ LL |     loop { 'middle: loop { loop { break 'middle; } } }
 LL |     println!("I am dead.");
    |     ^^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/reachable/expr_match.stderr b/src/test/ui/reachable/expr_match.stderr
index d39acdc290..a1c396e0c6 100644
--- a/src/test/ui/reachable/expr_match.stderr
+++ b/src/test/ui/reachable/expr_match.stderr
@@ -6,12 +6,12 @@ LL |     match () { () => return }
 LL |     println!("I am dead");
    |     ^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_match.rs:4:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unreachable statement
   --> $DIR/expr_match.rs:19:5
@@ -21,7 +21,7 @@ LL |     match () { () if false => return, () => return }
 LL |     println!("I am dead");
    |     ^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/reachable/expr_method.stderr b/src/test/ui/reachable/expr_method.stderr
index 82a0745f06..41c3b8a390 100644
--- a/src/test/ui/reachable/expr_method.stderr
+++ b/src/test/ui/reachable/expr_method.stderr
@@ -6,7 +6,7 @@ LL |     Foo.foo(return, 22);
    |             |
    |             any code following this expression is unreachable
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_method.rs:5:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_repeat.stderr b/src/test/ui/reachable/expr_repeat.stderr
index 34129936fd..defa870461 100644
--- a/src/test/ui/reachable/expr_repeat.stderr
+++ b/src/test/ui/reachable/expr_repeat.stderr
@@ -7,7 +7,7 @@ LL |     let x: [usize; 2] = [return; 2];
    |                         |any code following this expression is unreachable
    |                         unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_repeat.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_return.stderr b/src/test/ui/reachable/expr_return.stderr
index c0a94746d0..e1bef80aeb 100644
--- a/src/test/ui/reachable/expr_return.stderr
+++ b/src/test/ui/reachable/expr_return.stderr
@@ -7,7 +7,7 @@ LL |     let x = {return {return {return;}}};
    |                      |       any code following this expression is unreachable
    |                      unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_return.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_return_in_macro.stderr b/src/test/ui/reachable/expr_return_in_macro.stderr
index 2bc6a763cf..3c562a7ee6 100644
--- a/src/test/ui/reachable/expr_return_in_macro.stderr
+++ b/src/test/ui/reachable/expr_return_in_macro.stderr
@@ -7,7 +7,7 @@ LL |         return ()
 LL |     return early_return!();
    |     ^^^^^^^^^^^^^^^^^^^^^^ unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_return_in_macro.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_struct.stderr b/src/test/ui/reachable/expr_struct.stderr
index b3ca06eada..36b070456c 100644
--- a/src/test/ui/reachable/expr_struct.stderr
+++ b/src/test/ui/reachable/expr_struct.stderr
@@ -7,7 +7,7 @@ LL |     let x = Foo { a: 22, b: 33, ..return };
    |             |                     any code following this expression is unreachable
    |             unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_struct.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_tup.stderr b/src/test/ui/reachable/expr_tup.stderr
index aaaf6462da..5ea6bf4abf 100644
--- a/src/test/ui/reachable/expr_tup.stderr
+++ b/src/test/ui/reachable/expr_tup.stderr
@@ -6,7 +6,7 @@ LL |     let x: (usize, usize) = (return, 2);
    |                              |
    |                              any code following this expression is unreachable
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_tup.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_type.stderr b/src/test/ui/reachable/expr_type.stderr
index cb6e8d7039..c56c64be72 100644
--- a/src/test/ui/reachable/expr_type.stderr
+++ b/src/test/ui/reachable/expr_type.stderr
@@ -7,7 +7,7 @@ LL |     let x = {return}: !;
    |             |any code following this expression is unreachable
    |             unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_type.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_unary.stderr b/src/test/ui/reachable/expr_unary.stderr
index f5c3564217..063d841c25 100644
--- a/src/test/ui/reachable/expr_unary.stderr
+++ b/src/test/ui/reachable/expr_unary.stderr
@@ -13,7 +13,7 @@ LL |     let x: ! = ! { return; };
    |                |   any code following this expression is unreachable
    |                unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_unary.rs:5:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_while.stderr b/src/test/ui/reachable/expr_while.stderr
index edb1dd2b9b..83354574ea 100644
--- a/src/test/ui/reachable/expr_while.stderr
+++ b/src/test/ui/reachable/expr_while.stderr
@@ -10,7 +10,7 @@ LL | |         println!("Hello, world!");
 LL | |     }
    | |_____^ unreachable block in `while` expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/expr_while.rs:4:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/unreachable-arm.stderr b/src/test/ui/reachable/unreachable-arm.stderr
index 8e65745c7b..1cbea8288d 100644
--- a/src/test/ui/reachable/unreachable-arm.stderr
+++ b/src/test/ui/reachable/unreachable-arm.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         Foo::A(_, 1) => { }
    |         ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-arm.rs:4:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/reachable/unreachable-code.stderr b/src/test/ui/reachable/unreachable-code.stderr
index 184440db5d..4b951263db 100644
--- a/src/test/ui/reachable/unreachable-code.stderr
+++ b/src/test/ui/reachable/unreachable-code.stderr
@@ -7,7 +7,7 @@ LL |
 LL |   let a = 3;
    |   ^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-code.rs:1:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/unreachable-in-call.stderr b/src/test/ui/reachable/unreachable-in-call.stderr
index 1d081d1c76..cdfa79bf89 100644
--- a/src/test/ui/reachable/unreachable-in-call.stderr
+++ b/src/test/ui/reachable/unreachable-in-call.stderr
@@ -6,7 +6,7 @@ LL |     call(diverge(),
 LL |          get_u8());
    |          ^^^^^^^^ unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-in-call.rs:2:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/unreachable-loop-patterns.stderr b/src/test/ui/reachable/unreachable-loop-patterns.stderr
index bb5103320d..680d22862d 100644
--- a/src/test/ui/reachable/unreachable-loop-patterns.stderr
+++ b/src/test/ui/reachable/unreachable-loop-patterns.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |     for _ in unimplemented!() as Void {}
    |         ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-loop-patterns.rs:5:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/reachable/unreachable-try-pattern.stderr b/src/test/ui/reachable/unreachable-try-pattern.stderr
index 707038442a..d141e38231 100644
--- a/src/test/ui/reachable/unreachable-try-pattern.stderr
+++ b/src/test/ui/reachable/unreachable-try-pattern.stderr
@@ -7,7 +7,7 @@ LL |     let y = (match x { Ok(n) => Ok(n as u32), Err(e) => Err(e) })?;
    |                                    unreachable expression
    |                                    any code following this expression is unreachable
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-try-pattern.rs:3:9
    |
 LL | #![warn(unreachable_code)]
@@ -19,7 +19,7 @@ warning: unreachable pattern
 LL |     let y = (match x { Ok(n) => Ok(n as u32), Err(e) => Err(e) })?;
    |                        ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-try-pattern.rs:4:9
    |
 LL | #![warn(unreachable_patterns)]
diff --git a/src/test/ui/reachable/unwarned-match-on-never.stderr b/src/test/ui/reachable/unwarned-match-on-never.stderr
index 6b2fb4a33c..a296d2a055 100644
--- a/src/test/ui/reachable/unwarned-match-on-never.stderr
+++ b/src/test/ui/reachable/unwarned-match-on-never.stderr
@@ -7,7 +7,7 @@ LL |     // But matches in unreachable code are warned.
 LL |     match x {}
    |     ^^^^^^^^^^ unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unwarned-match-on-never.rs:1:9
    |
 LL | #![deny(unreachable_code)]
diff --git a/src/test/ui/realloc-16687.rs b/src/test/ui/realloc-16687.rs
index 69292d241c..eb6224ad1b 100644
--- a/src/test/ui/realloc-16687.rs
+++ b/src/test/ui/realloc-16687.rs
@@ -6,7 +6,7 @@
 
 #![feature(allocator_api)]
 
-use std::alloc::{Global, Alloc, Layout, handle_alloc_error};
+use std::alloc::{Global, AllocRef, Layout, handle_alloc_error};
 use std::ptr::{self, NonNull};
 
 fn main() {
@@ -41,13 +41,13 @@ unsafe fn test_triangle() -> bool {
             println!("allocate({:?})", layout);
         }
 
-        let ret = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
+        let (ptr, _) = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
 
         if PRINT {
-            println!("allocate({:?}) = {:?}", layout, ret);
+            println!("allocate({:?}) = {:?}", layout, ptr);
         }
 
-        ret.cast().as_ptr()
+        ptr.cast().as_ptr()
     }
 
     unsafe fn deallocate(ptr: *mut u8, layout: Layout) {
@@ -63,16 +63,16 @@ unsafe fn test_triangle() -> bool {
             println!("reallocate({:?}, old={:?}, new={:?})", ptr, old, new);
         }
 
-        let ret = Global.realloc(NonNull::new_unchecked(ptr), old, new.size())
+        let (ptr, _) = Global.realloc(NonNull::new_unchecked(ptr), old, new.size())
             .unwrap_or_else(|_| handle_alloc_error(
                 Layout::from_size_align_unchecked(new.size(), old.align())
             ));
 
         if PRINT {
             println!("reallocate({:?}, old={:?}, new={:?}) = {:?}",
-                     ptr, old, new, ret);
+                     ptr, old, new, ptr);
         }
-        ret.cast().as_ptr()
+        ptr.cast().as_ptr()
     }
 
     fn idx_to_size(i: usize) -> usize { (i+1) * 10 }
diff --git a/src/test/ui/recursion/recursion.rs b/src/test/ui/recursion/recursion.rs
index 9d939e1318..bf1eaef367 100644
--- a/src/test/ui/recursion/recursion.rs
+++ b/src/test/ui/recursion/recursion.rs
@@ -1,4 +1,5 @@
 // build-fail
+// compile-flags:-C overflow-checks=off
 
 enum Nil {NilValue}
 struct Cons<T> {head:isize, tail:T}
diff --git a/src/test/ui/recursion/recursion.stderr b/src/test/ui/recursion/recursion.stderr
index 17293720a4..1a65b0e84f 100644
--- a/src/test/ui/recursion/recursion.stderr
+++ b/src/test/ui/recursion/recursion.stderr
@@ -1,5 +1,5 @@
 error: reached the recursion limit while instantiating `test::<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Cons<Nil>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
-  --> $DIR/recursion.rs:14:1
+  --> $DIR/recursion.rs:15:1
    |
 LL | / fn test<T:Dot> (n:isize, i:isize, first:T, second:T) ->isize {
 LL | |   match n {    0 => {first.dot(second)}
diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs b/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs
index f6b317886b..4489303638 100644
--- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs
+++ b/src/test/ui/recursion/recursive-types-are-not-uninhabited.rs
@@ -6,7 +6,6 @@ fn foo(res: Result<u32, &R>) -> u32 {
     let Ok(x) = res;
     //~^ ERROR refutable pattern
     x
-    //~^ ERROR use of possibly-uninitialized variable: `x`
 }
 
 fn main() {
diff --git a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr
index f9ae75b183..aa23aed4b4 100644
--- a/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr
+++ b/src/test/ui/recursion/recursive-types-are-not-uninhabited.stderr
@@ -11,13 +11,6 @@ help: you might want to use `if let` to ignore the variant that isn't matched
 LL |     if let Ok(x) = res { /* */ }
    |
 
-error[E0381]: use of possibly-uninitialized variable: `x`
-  --> $DIR/recursive-types-are-not-uninhabited.rs:8:5
-   |
-LL |     x
-   |     ^ use of possibly-uninitialized `x`
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors have detailed explanations: E0005, E0381.
-For more information about an error, try `rustc --explain E0005`.
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/recursion_limit/empty.rs b/src/test/ui/recursion_limit/empty.rs
new file mode 100644
index 0000000000..31ff9c1e3a
--- /dev/null
+++ b/src/test/ui/recursion_limit/empty.rs
@@ -0,0 +1,6 @@
+// Test the parse error for an empty recursion_limit
+
+#![recursion_limit = ""] //~ ERROR `limit` must be a non-negative integer
+                         //~| `limit` must be a non-negative integer
+
+fn main() {}
diff --git a/src/test/ui/recursion_limit/empty.stderr b/src/test/ui/recursion_limit/empty.stderr
new file mode 100644
index 0000000000..bcd1d27e59
--- /dev/null
+++ b/src/test/ui/recursion_limit/empty.stderr
@@ -0,0 +1,10 @@
+error: `limit` must be a non-negative integer
+  --> $DIR/empty.rs:3:1
+   |
+LL | #![recursion_limit = ""]
+   | ^^^^^^^^^^^^^^^^^^^^^--^
+   |                      |
+   |                      `limit` must be a non-negative integer
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/recursion_limit/invalid_digit.rs b/src/test/ui/recursion_limit/invalid_digit.rs
new file mode 100644
index 0000000000..759d69d0af
--- /dev/null
+++ b/src/test/ui/recursion_limit/invalid_digit.rs
@@ -0,0 +1,6 @@
+// Test the parse error for an invalid digit in recursion_limit
+
+#![recursion_limit = "-100"] //~ ERROR `limit` must be a non-negative integer
+                             //~| not a valid integer
+
+fn main() {}
diff --git a/src/test/ui/recursion_limit/invalid_digit.stderr b/src/test/ui/recursion_limit/invalid_digit.stderr
new file mode 100644
index 0000000000..e6fd6b72a0
--- /dev/null
+++ b/src/test/ui/recursion_limit/invalid_digit.stderr
@@ -0,0 +1,10 @@
+error: `limit` must be a non-negative integer
+  --> $DIR/invalid_digit.rs:3:1
+   |
+LL | #![recursion_limit = "-100"]
+   | ^^^^^^^^^^^^^^^^^^^^^------^
+   |                      |
+   |                      not a valid integer
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/recursion_limit/overflow.rs b/src/test/ui/recursion_limit/overflow.rs
new file mode 100644
index 0000000000..8eee2792b2
--- /dev/null
+++ b/src/test/ui/recursion_limit/overflow.rs
@@ -0,0 +1,7 @@
+// Test the parse error for an overflowing recursion_limit
+
+#![recursion_limit = "999999999999999999999999"]
+//~^ ERROR `limit` must be a non-negative integer
+//~| `limit` is too large
+
+fn main() {}
diff --git a/src/test/ui/recursion_limit/overflow.stderr b/src/test/ui/recursion_limit/overflow.stderr
new file mode 100644
index 0000000000..f6ed76c1eb
--- /dev/null
+++ b/src/test/ui/recursion_limit/overflow.stderr
@@ -0,0 +1,10 @@
+error: `limit` must be a non-negative integer
+  --> $DIR/overflow.rs:3:1
+   |
+LL | #![recursion_limit = "999999999999999999999999"]
+   | ^^^^^^^^^^^^^^^^^^^^^--------------------------^
+   |                      |
+   |                      `limit` is too large
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/recursion_limit/zero.rs b/src/test/ui/recursion_limit/zero.rs
new file mode 100644
index 0000000000..eb95d7babc
--- /dev/null
+++ b/src/test/ui/recursion_limit/zero.rs
@@ -0,0 +1,12 @@
+// Test that a `limit` of 0 is valid
+
+#![recursion_limit = "0"]
+
+macro_rules! test {
+    () => {};
+    ($tt:tt) => { test!(); };
+}
+
+test!(test); //~ ERROR 10:1: 10:13: recursion limit reached while expanding `test!`
+
+fn main() {}
diff --git a/src/test/ui/recursion_limit/zero.stderr b/src/test/ui/recursion_limit/zero.stderr
new file mode 100644
index 0000000000..6358805d89
--- /dev/null
+++ b/src/test/ui/recursion_limit/zero.stderr
@@ -0,0 +1,10 @@
+error: recursion limit reached while expanding `test!`
+  --> $DIR/zero.rs:10:1
+   |
+LL | test!(test);
+   | ^^^^^^^^^^^^
+   |
+   = help: consider adding a `#![recursion_limit="0"]` attribute to your crate (`zero`)
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr
index d352d119a7..92a3942c91 100644
--- a/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr
+++ b/src/test/ui/regions/regions-bounded-method-type-parameters-trait-bound.nll.stderr
@@ -4,7 +4,7 @@ error[E0521]: borrowed data escapes outside of function
 LL | fn caller2<'a,'b,F:Foo<'a>>(a: Inv<'a>, b: Inv<'b>, f: F) {
    |                             -           - `b` is a reference that is only valid in the function body
    |                             |
-   |                             `a` is declared here, outside of the function body
+   |                             `a` declared here, outside of the function body
 LL |     // Here the value provided for 'y is 'b, and hence 'b:'a does not hold.
 LL |     f.method(b);
    |     ^^^^^^^^^^^ `b` escapes the function body here
diff --git a/src/test/ui/regions/regions-close-object-into-object-5.stderr b/src/test/ui/regions/regions-close-object-into-object-5.stderr
index 7c530cec7c..14727000b2 100644
--- a/src/test/ui/regions/regions-close-object-into-object-5.stderr
+++ b/src/test/ui/regions/regions-close-object-into-object-5.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:5
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |     ^^^^^^^^^^
@@ -17,7 +17,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:5
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |     ^^^^^^^^^^^^^^^^^^^^
@@ -32,7 +32,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:9
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |         ^
@@ -47,7 +47,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:9
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |         ^^^^^^
@@ -62,7 +62,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:11
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |           ^^^
@@ -77,7 +77,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:11
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |           ^^^
@@ -92,7 +92,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-object-into-object-5.rs:17:11
    |
 LL | fn f<'a, T, U>(v: Box<A<T>+'static>) -> Box<X+'static> {
-   |          - help: consider adding an explicit lifetime bound `T: 'static`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // oh dear!
 LL |     box B(&*v) as Box<X>
    |           ^^^
diff --git a/src/test/ui/regions/regions-close-over-type-parameter-1.stderr b/src/test/ui/regions/regions-close-over-type-parameter-1.stderr
index 81534b7b77..ed9a604e71 100644
--- a/src/test/ui/regions/regions-close-over-type-parameter-1.stderr
+++ b/src/test/ui/regions/regions-close-over-type-parameter-1.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `A` may not live long enough
   --> $DIR/regions-close-over-type-parameter-1.rs:10:5
    |
 LL | fn make_object1<A:SomeTrait>(v: A) -> Box<dyn SomeTrait + 'static> {
-   |                 -- help: consider adding an explicit lifetime bound `A: 'static`...
+   |                 -- help: consider adding an explicit lifetime bound...: `A: 'static +`
 LL |     box v as Box<dyn SomeTrait + 'static>
    |     ^^^^^
    |
@@ -16,7 +16,7 @@ error[E0310]: the parameter type `A` may not live long enough
   --> $DIR/regions-close-over-type-parameter-1.rs:10:5
    |
 LL | fn make_object1<A:SomeTrait>(v: A) -> Box<dyn SomeTrait + 'static> {
-   |                 -- help: consider adding an explicit lifetime bound `A: 'static`...
+   |                 -- help: consider adding an explicit lifetime bound...: `A: 'static +`
 LL |     box v as Box<dyn SomeTrait + 'static>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
@@ -30,7 +30,7 @@ error[E0309]: the parameter type `A` may not live long enough
   --> $DIR/regions-close-over-type-parameter-1.rs:20:5
    |
 LL | fn make_object3<'a,'b,A:SomeTrait+'a>(v: A) -> Box<dyn SomeTrait + 'b> {
-   |                       -- help: consider adding an explicit lifetime bound `A: 'b`...
+   |                       -- help: consider adding an explicit lifetime bound...: `A: 'b +`
 LL |     box v as Box<dyn SomeTrait + 'b>
    |     ^^^^^
    |
@@ -44,7 +44,7 @@ error[E0309]: the parameter type `A` may not live long enough
   --> $DIR/regions-close-over-type-parameter-1.rs:20:5
    |
 LL | fn make_object3<'a,'b,A:SomeTrait+'a>(v: A) -> Box<dyn SomeTrait + 'b> {
-   |                       -- help: consider adding an explicit lifetime bound `A: 'b`...
+   |                       -- help: consider adding an explicit lifetime bound...: `A: 'b +`
 LL |     box v as Box<dyn SomeTrait + 'b>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
diff --git a/src/test/ui/regions/regions-close-param-into-object.stderr b/src/test/ui/regions/regions-close-param-into-object.stderr
index 7f2c646c12..3b1a89d9ce 100644
--- a/src/test/ui/regions/regions-close-param-into-object.stderr
+++ b/src/test/ui/regions/regions-close-param-into-object.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-param-into-object.rs:6:5
    |
 LL | fn p1<T>(v: T) -> Box<dyn X + 'static>
-   |       - help: consider adding an explicit lifetime bound `T: 'static`...
+   |       - help: consider adding an explicit lifetime bound...: `T: 'static`
 ...
 LL |     Box::new(v)
    |     ^^^^^^^^^^^
@@ -17,7 +17,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-param-into-object.rs:12:5
    |
 LL | fn p2<T>(v: Box<T>) -> Box<dyn X + 'static>
-   |       - help: consider adding an explicit lifetime bound `T: 'static`...
+   |       - help: consider adding an explicit lifetime bound...: `T: 'static`
 ...
 LL |     Box::new(v)
    |     ^^^^^^^^^^^
@@ -32,7 +32,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-param-into-object.rs:18:5
    |
 LL | fn p3<'a,T>(v: T) -> Box<dyn X + 'a>
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 ...
 LL |     Box::new(v)
    |     ^^^^^^^^^^^
@@ -47,7 +47,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-close-param-into-object.rs:24:5
    |
 LL | fn p4<'a,T>(v: Box<T>) -> Box<dyn X + 'a>
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 ...
 LL |     Box::new(v)
    |     ^^^^^^^^^^^
diff --git a/src/test/ui/regions/regions-enum-not-wf.stderr b/src/test/ui/regions/regions-enum-not-wf.stderr
index 8701408566..297fcb088d 100644
--- a/src/test/ui/regions/regions-enum-not-wf.stderr
+++ b/src/test/ui/regions/regions-enum-not-wf.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:18:18
    |
 LL | enum Ref1<'a, T> {
-   |               - help: consider adding an explicit lifetime bound `T: 'a`...
+   |               - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     Ref1Variant1(RequireOutlives<'a, T>)
    |                  ^^^^^^^^^^^^^^^^^^^^^^
    |
@@ -16,7 +16,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:23:25
    |
 LL | enum Ref2<'a, T> {
-   |               - help: consider adding an explicit lifetime bound `T: 'a`...
+   |               - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     Ref2Variant1,
 LL |     Ref2Variant2(isize, RequireOutlives<'a, T>),
    |                         ^^^^^^^^^^^^^^^^^^^^^^
@@ -31,7 +31,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:35:1
    |
 LL |   enum RefDouble<'a, 'b, T> {
-   |   ^                      - help: consider adding an explicit lifetime bound `T: 'b`...
+   |   ^                      - help: consider adding an explicit lifetime bound...: `T: 'b`
    |  _|
    | |
 LL | |     RefDoubleVariant1(&'a RequireOutlives<'b, T>)
@@ -52,7 +52,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:36:23
    |
 LL | enum RefDouble<'a, 'b, T> {
-   |                        - help: consider adding an explicit lifetime bound `T: 'b`...
+   |                        - help: consider adding an explicit lifetime bound...: `T: 'b`
 LL |     RefDoubleVariant1(&'a RequireOutlives<'b, T>)
    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
diff --git a/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr b/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr
index ad555efadf..5ab423d9e2 100644
--- a/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr
+++ b/src/test/ui/regions/regions-free-region-ordering-callee-4.stderr
@@ -1,12 +1,8 @@
 error[E0491]: in type `&'a &'b usize`, reference has a longer lifetime than the data it references
-  --> $DIR/regions-free-region-ordering-callee-4.rs:5:1
+  --> $DIR/regions-free-region-ordering-callee-4.rs:5:68
    |
-LL | / fn ordering4<'a, 'b, F>(a: &'a usize, b: &'b usize, x: F) where F: FnOnce(&'a &'b usize) {
-LL | |
-LL | |     // Do not infer ordering from closure argument types.
-LL | |     let z: Option<&'a &'b usize> = None;
-LL | | }
-   | |_^
+LL | fn ordering4<'a, 'b, F>(a: &'a usize, b: &'b usize, x: F) where F: FnOnce(&'a &'b usize) {
+   |                                                                    ^^^^^^^^^^^^^^^^^^^^^
    |
 note: the pointer is valid for the lifetime `'a` as defined on the function body at 5:14
   --> $DIR/regions-free-region-ordering-callee-4.rs:5:14
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr
index 7fbc1622c3..2f1a4cea8e 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr
+++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-1.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-implied-bounds-projection-gap-1.rs:16:10
    |
 LL | fn func<'x, T:Trait1<'x>>(t: &'x T::Foo)
-   |             -- help: consider adding an explicit lifetime bound `T: 'x`...
+   |             -- help: consider adding an explicit lifetime bound...: `T: 'x +`
 LL | {
 LL |     wf::<&'x T>();
    |          ^^^^^
diff --git a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr b/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr
index c4ca7e9707..6470ebf541 100644
--- a/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr
+++ b/src/test/ui/regions/regions-implied-bounds-projection-gap-hr-1.stderr
@@ -1,11 +1,8 @@
 error[E0491]: in type `&'x (dyn for<'z> Trait1<<T as Trait2<'y, 'z>>::Foo> + 'x)`, reference has a longer lifetime than the data it references
-  --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:1
+  --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:25
    |
-LL | / fn callee<'x, 'y, T>(t: &'x dyn for<'z> Trait1< <T as Trait2<'y, 'z>>::Foo >)
-LL | |
-LL | | {
-LL | | }
-   | |_^
+LL | fn callee<'x, 'y, T>(t: &'x dyn for<'z> Trait1< <T as Trait2<'y, 'z>>::Foo >)
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: the pointer is valid for the lifetime `'x` as defined on the function body at 21:11
   --> $DIR/regions-implied-bounds-projection-gap-hr-1.rs:21:11
diff --git a/src/test/ui/regions/regions-in-enums-anon.stderr b/src/test/ui/regions/regions-in-enums-anon.stderr
index 41655a210b..b3649c5b48 100644
--- a/src/test/ui/regions/regions-in-enums-anon.stderr
+++ b/src/test/ui/regions/regions-in-enums-anon.stderr
@@ -6,8 +6,8 @@ LL |     Bar(&isize)
    |
 help: consider introducing a named lifetime parameter
    |
-LL | enum Foo<'lifetime> {
-LL |     Bar(&'lifetime isize)
+LL | enum Foo<'a> {
+LL |     Bar(&'a isize)
    |
 
 error: aborting due to previous error
diff --git a/src/test/ui/regions/regions-in-structs-anon.stderr b/src/test/ui/regions/regions-in-structs-anon.stderr
index fbe8036880..60a6fb9a0f 100644
--- a/src/test/ui/regions/regions-in-structs-anon.stderr
+++ b/src/test/ui/regions/regions-in-structs-anon.stderr
@@ -6,8 +6,8 @@ LL |     x: &isize
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct Foo<'lifetime> {
-LL |     x: &'lifetime isize
+LL | struct Foo<'a> {
+LL |     x: &'a isize
    |
 
 error: aborting due to previous error
diff --git a/src/test/ui/regions/regions-infer-bound-from-trait.stderr b/src/test/ui/regions/regions-infer-bound-from-trait.stderr
index 382d932e81..a5a0ff52fa 100644
--- a/src/test/ui/regions/regions-infer-bound-from-trait.stderr
+++ b/src/test/ui/regions/regions-infer-bound-from-trait.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `A` may not live long enough
   --> $DIR/regions-infer-bound-from-trait.rs:33:5
    |
 LL | fn bar1<'a,A>(x: Inv<'a>, a: A) {
-   |            - help: consider adding an explicit lifetime bound `A: 'a`...
+   |            - help: consider adding an explicit lifetime bound...: `A: 'a`
 LL |     check_bound(x, a)
    |     ^^^^^^^^^^^
    |
@@ -16,7 +16,7 @@ error[E0309]: the parameter type `A` may not live long enough
   --> $DIR/regions-infer-bound-from-trait.rs:37:5
    |
 LL | fn bar2<'a,'b,A:Is<'b>>(x: Inv<'a>, y: Inv<'b>, a: A) {
-   |               -- help: consider adding an explicit lifetime bound `A: 'a`...
+   |               -- help: consider adding an explicit lifetime bound...: `A: 'a +`
 LL |     check_bound(x, a)
    |     ^^^^^^^^^^^
    |
diff --git a/src/test/ui/regions/regions-mock-codegen.rs b/src/test/ui/regions/regions-mock-codegen.rs
index 521ef3f6a4..fe3a864fe4 100644
--- a/src/test/ui/regions/regions-mock-codegen.rs
+++ b/src/test/ui/regions/regions-mock-codegen.rs
@@ -6,7 +6,7 @@
 
 #![feature(allocator_api)]
 
-use std::alloc::{Alloc, Global, Layout, handle_alloc_error};
+use std::alloc::{AllocRef, Global, Layout, handle_alloc_error};
 use std::ptr::NonNull;
 
 struct arena(());
@@ -24,29 +24,29 @@ struct Ccx {
     x: isize
 }
 
-fn alloc<'a>(_bcx : &'a arena) -> &'a Bcx<'a> {
+fn alloc(_bcx: &arena) -> &Bcx<'_> {
     unsafe {
         let layout = Layout::new::<Bcx>();
-        let ptr = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
+        let (ptr, _) = Global.alloc(layout).unwrap_or_else(|_| handle_alloc_error(layout));
         &*(ptr.as_ptr() as *const _)
     }
 }
 
-fn h<'a>(bcx : &'a Bcx<'a>) -> &'a Bcx<'a> {
+fn h<'a>(bcx: &'a Bcx<'a>) -> &'a Bcx<'a> {
     return alloc(bcx.fcx.arena);
 }
 
-fn g(fcx : &Fcx) {
-    let bcx = Bcx { fcx: fcx };
+fn g(fcx: &Fcx) {
+    let bcx = Bcx { fcx };
     let bcx2 = h(&bcx);
     unsafe {
         Global.dealloc(NonNull::new_unchecked(bcx2 as *const _ as *mut _), Layout::new::<Bcx>());
     }
 }
 
-fn f(ccx : &Ccx) {
+fn f(ccx: &Ccx) {
     let a = arena(());
-    let fcx = Fcx { arena: &a, ccx: ccx };
+    let fcx = Fcx { arena: &a, ccx };
     return g(&fcx);
 }
 
diff --git a/src/test/ui/regions/regions-name-undeclared.stderr b/src/test/ui/regions/regions-name-undeclared.stderr
index 79ebef41dc..eb19a30c52 100644
--- a/src/test/ui/regions/regions-name-undeclared.stderr
+++ b/src/test/ui/regions/regions-name-undeclared.stderr
@@ -88,12 +88,32 @@ error[E0261]: use of undeclared lifetime name `'b`
    |
 LL | ...                   &'b isize,
    |                        ^^ undeclared lifetime
+   |
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider introducing lifetime `'b` here
+   |
+LL | fn fn_types<'b>(a: &'a isize,
+   |            ^^^^
+help: consider making the bound lifetime-generic with a new `'b` lifetime
+   |
+LL |             b: Box<dyn for<'a, 'b> FnOnce(&'a isize,
+   |                              ^^^^
 
 error[E0261]: use of undeclared lifetime name `'b`
   --> $DIR/regions-name-undeclared.rs:45:36
    |
 LL | ...                   &'b isize)>,
    |                        ^^ undeclared lifetime
+   |
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider introducing lifetime `'b` here
+   |
+LL | fn fn_types<'b>(a: &'a isize,
+   |            ^^^^
+help: consider making the bound lifetime-generic with a new `'b` lifetime
+   |
+LL |             b: Box<dyn for<'a, 'b> FnOnce(&'a isize,
+   |                              ^^^^
 
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/regions-name-undeclared.rs:46:17
diff --git a/src/test/ui/regions/regions-nested-fns.nll.stderr b/src/test/ui/regions/regions-nested-fns.nll.stderr
index 305a76815a..9d966486f9 100644
--- a/src/test/ui/regions/regions-nested-fns.nll.stderr
+++ b/src/test/ui/regions/regions-nested-fns.nll.stderr
@@ -2,7 +2,7 @@ error[E0521]: borrowed data escapes outside of closure
   --> $DIR/regions-nested-fns.rs:10:9
    |
 LL |     let mut ay = &y;
-   |         ------ `ay` is declared here, outside of the closure body
+   |         ------ `ay` declared here, outside of the closure body
 LL | 
 LL |     ignore::<Box<dyn for<'z> FnMut(&'z isize)>>(Box::new(|z| {
    |                                                           - `z` is a reference that is only valid in the closure body
diff --git a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
index cc2245f81a..c35516d2c0 100644
--- a/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
+++ b/src/test/ui/regions/regions-normalize-in-where-clause-list.stderr
@@ -67,15 +67,10 @@ LL | | }
               found  `Project<'_, '_>`
 
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
-  --> $DIR/regions-normalize-in-where-clause-list.rs:22:1
+  --> $DIR/regions-normalize-in-where-clause-list.rs:22:4
    |
-LL | / fn bar<'a, 'b>()
-LL | |
-LL | |
-LL | |     where <() as Project<'a, 'b>>::Item : Eq
-LL | | {
-LL | | }
-   | |_^
+LL | fn bar<'a, 'b>()
+   |    ^^^
    |
 note: first, the lifetime cannot outlive the lifetime `'a` as defined on the function body at 22:8...
   --> $DIR/regions-normalize-in-where-clause-list.rs:22:8
@@ -88,15 +83,10 @@ note: ...but the lifetime must also be valid for the lifetime `'b` as defined on
 LL | fn bar<'a, 'b>()
    |            ^^
 note: ...so that the types are compatible
-  --> $DIR/regions-normalize-in-where-clause-list.rs:22:1
+  --> $DIR/regions-normalize-in-where-clause-list.rs:22:4
    |
-LL | / fn bar<'a, 'b>()
-LL | |
-LL | |
-LL | |     where <() as Project<'a, 'b>>::Item : Eq
-LL | | {
-LL | | }
-   | |_^
+LL | fn bar<'a, 'b>()
+   |    ^^^
    = note: expected  `Project<'a, 'b>`
               found  `Project<'_, '_>`
 
diff --git a/src/test/ui/regions/regions-trait-object-1.rs b/src/test/ui/regions/regions-trait-object-1.rs
index 679bf4dd81..e2520d9789 100644
--- a/src/test/ui/regions/regions-trait-object-1.rs
+++ b/src/test/ui/regions/regions-trait-object-1.rs
@@ -1,7 +1,7 @@
 // run-pass
 // This is a regression test for something that only came up while
-// attempting to bootstrap libsyntax; it is adapted from
-// `syntax::ext::tt::generic_extension`.
+// attempting to bootstrap librustc_ast; it is adapted from
+// `rustc_ast::ext::tt::generic_extension`.
 
 
 pub struct E<'a> {
diff --git a/src/test/ui/regions/regions-var-type-out-of-scope.stderr b/src/test/ui/regions/regions-var-type-out-of-scope.stderr
index 146fb8fd81..d957176768 100644
--- a/src/test/ui/regions/regions-var-type-out-of-scope.stderr
+++ b/src/test/ui/regions/regions-var-type-out-of-scope.stderr
@@ -9,7 +9,6 @@ LL |         assert_eq!(*x, 3);
    |         ------------------ borrow later used here
    |
    = note: consider using a `let` binding to create a longer lived value
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/removing-extern-crate.stderr b/src/test/ui/removing-extern-crate.stderr
index 20d5564c16..c86556c89f 100644
--- a/src/test/ui/removing-extern-crate.stderr
+++ b/src/test/ui/removing-extern-crate.stderr
@@ -4,7 +4,7 @@ warning: unused extern crate
 LL | extern crate removing_extern_crate as foo;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/removing-extern-crate.rs:6:9
    |
 LL | #![warn(rust_2018_idioms)]
diff --git a/src/test/ui/repr/feature-gate-no-niche.rs b/src/test/ui/repr/feature-gate-no-niche.rs
new file mode 100644
index 0000000000..8872ee7119
--- /dev/null
+++ b/src/test/ui/repr/feature-gate-no-niche.rs
@@ -0,0 +1,20 @@
+use std::num::NonZeroU8 as N8;
+use std::num::NonZeroU16 as N16;
+
+#[repr(no_niche)]
+pub struct Cloaked(N16);
+//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
+
+#[repr(transparent, no_niche)]
+pub struct Shadowy(N16);
+//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
+
+#[repr(no_niche)]
+pub enum Cloaked1 { _A(N16), }
+//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
+
+#[repr(no_niche)]
+pub enum Cloaked2 { _A(N16), _B(u8, N8) }
+//~^^ ERROR the attribute `repr(no_niche)` is currently unstable [E0658]
+
+fn main() { }
diff --git a/src/test/ui/repr/feature-gate-no-niche.stderr b/src/test/ui/repr/feature-gate-no-niche.stderr
new file mode 100644
index 0000000000..34fd417cc9
--- /dev/null
+++ b/src/test/ui/repr/feature-gate-no-niche.stderr
@@ -0,0 +1,35 @@
+error[E0658]: the attribute `repr(no_niche)` is currently unstable
+  --> $DIR/feature-gate-no-niche.rs:4:8
+   |
+LL | #[repr(no_niche)]
+   |        ^^^^^^^^
+   |
+   = help: add `#![feature(no_niche)]` to the crate attributes to enable
+
+error[E0658]: the attribute `repr(no_niche)` is currently unstable
+  --> $DIR/feature-gate-no-niche.rs:8:21
+   |
+LL | #[repr(transparent, no_niche)]
+   |                     ^^^^^^^^
+   |
+   = help: add `#![feature(no_niche)]` to the crate attributes to enable
+
+error[E0658]: the attribute `repr(no_niche)` is currently unstable
+  --> $DIR/feature-gate-no-niche.rs:12:8
+   |
+LL | #[repr(no_niche)]
+   |        ^^^^^^^^
+   |
+   = help: add `#![feature(no_niche)]` to the crate attributes to enable
+
+error[E0658]: the attribute `repr(no_niche)` is currently unstable
+  --> $DIR/feature-gate-no-niche.rs:16:8
+   |
+LL | #[repr(no_niche)]
+   |        ^^^^^^^^
+   |
+   = help: add `#![feature(no_niche)]` to the crate attributes to enable
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/repr/repr-no-niche-inapplicable-to-unions.rs b/src/test/ui/repr/repr-no-niche-inapplicable-to-unions.rs
new file mode 100644
index 0000000000..308634651a
--- /dev/null
+++ b/src/test/ui/repr/repr-no-niche-inapplicable-to-unions.rs
@@ -0,0 +1,14 @@
+#![feature(no_niche)]
+
+use std::num::NonZeroU8 as N8;
+use std::num::NonZeroU16 as N16;
+
+#[repr(no_niche)]
+pub union Cloaked1 { _A: N16 }
+//~^^ ERROR attribute should be applied to struct or enum [E0517]
+
+#[repr(no_niche)]
+pub union Cloaked2 { _A: N16, _B: (u8, N8) }
+//~^^ ERROR attribute should be applied to struct or enum [E0517]
+
+fn main() { }
diff --git a/src/test/ui/repr/repr-no-niche-inapplicable-to-unions.stderr b/src/test/ui/repr/repr-no-niche-inapplicable-to-unions.stderr
new file mode 100644
index 0000000000..4c542c5f0d
--- /dev/null
+++ b/src/test/ui/repr/repr-no-niche-inapplicable-to-unions.stderr
@@ -0,0 +1,19 @@
+error[E0517]: attribute should be applied to struct or enum
+  --> $DIR/repr-no-niche-inapplicable-to-unions.rs:6:8
+   |
+LL | #[repr(no_niche)]
+   |        ^^^^^^^^
+LL | pub union Cloaked1 { _A: N16 }
+   | ------------------------------ not a struct or enum
+
+error[E0517]: attribute should be applied to struct or enum
+  --> $DIR/repr-no-niche-inapplicable-to-unions.rs:10:8
+   |
+LL | #[repr(no_niche)]
+   |        ^^^^^^^^
+LL | pub union Cloaked2 { _A: N16, _B: (u8, N8) }
+   | -------------------------------------------- not a struct or enum
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0517`.
diff --git a/src/test/ui/repr/repr-no-niche.rs b/src/test/ui/repr/repr-no-niche.rs
new file mode 100644
index 0000000000..a7f0d509af
--- /dev/null
+++ b/src/test/ui/repr/repr-no-niche.rs
@@ -0,0 +1,329 @@
+// run-pass
+
+// This file tests repr(no_niche), which causes an struct/enum to hide
+// any niche space that may exist in its internal state from the
+// context it appears in.
+
+// Here are the axes this test is seeking to cover:
+//
+// repr annotation:
+// visible: (); cloaked: (no_niche); transparent: (transparent); shadowy: (transparent, no_niche)
+//
+// enum vs struct
+//
+// niche-type via type-parameter vs inline declaration
+
+#![feature(decl_macro)]
+#![feature(no_niche)]
+
+use std::mem::size_of;
+use std::num::{NonZeroU8, NonZeroU16};
+
+mod struct_inline {
+    use std::num::NonZeroU16 as N16;
+
+    #[derive(Debug)] pub struct Visible(N16);
+
+    #[repr(no_niche)]
+    #[derive(Debug)] pub struct Cloaked(N16);
+
+    #[repr(transparent)]
+    #[derive(Debug)] pub struct Transparent(N16);
+
+    #[repr(transparent, no_niche)]
+    #[derive(Debug)] pub struct Shadowy(N16);
+}
+
+mod struct_param {
+    #[derive(Debug)] pub struct Visible<T>(T);
+
+    #[repr(no_niche)]
+    #[derive(Debug)] pub struct Cloaked<T>(T);
+
+    #[repr(transparent)]
+    #[derive(Debug)] pub struct Transparent<T>(T);
+
+    #[repr(transparent, no_niche)]
+    #[derive(Debug)] pub struct Shadowy<T>(T);
+}
+
+mod enum_inline {
+    use crate::two_fifty_six_variant_enum;
+    use std::num::{NonZeroU8 as N8, NonZeroU16 as N16};
+
+    #[derive(Debug)] pub enum Visible1 { _A(N16), }
+
+    #[repr(no_niche)]
+    #[derive(Debug)] pub enum Cloaked1 { _A(N16), }
+
+    // (N.B.: transparent enums must be univariant)
+    #[repr(transparent)]
+    #[derive(Debug)] pub enum Transparent { _A(N16), }
+
+    #[repr(transparent, no_niche)]
+    #[derive(Debug)] pub enum Shadowy { _A(N16), }
+
+    // including multivariant enums for completeness. Payload and
+    // number of variants (i.e. discriminant size) have been chosen so
+    // that layout including discriminant is 4 bytes, with no space in
+    // padding to hide another discrimnant from the surrounding
+    // context.
+    //
+    // (Note that multivariant enums cannot usefully expose a niche in
+    // general; this test is relying on that.)
+    two_fifty_six_variant_enum!(Visible2, N8);
+
+    #[repr(no_niche)]
+    two_fifty_six_variant_enum!(Cloaked2, N8);
+}
+
+mod enum_param {
+    use super::two_fifty_six_variant_enum;
+
+    #[derive(Debug)] pub enum Visible1<T> { _A(T), }
+
+    #[repr(no_niche)]
+    #[derive(Debug)] pub enum Cloaked1<T> { _A(T), }
+
+    // (N.B.: transparent enums must be univariant)
+    #[repr(transparent)]
+    #[derive(Debug)] pub enum Transparent<T> { _A(T), }
+
+    #[repr(transparent, no_niche)]
+    #[derive(Debug)] pub enum Shadowy<T> { _A(T), }
+
+    // including multivariant enums for completeness. Same notes apply
+    // here as above (assuming `T` is instantiated with `NonZeroU8`).
+    two_fifty_six_variant_enum!(Visible2<T>);
+
+    #[repr(no_niche)]
+    two_fifty_six_variant_enum!(Cloaked2<T>);
+}
+
+fn main() {
+    // sanity-checks
+    assert_eq!(size_of::<struct_inline::Visible>(),               2);
+    assert_eq!(size_of::<struct_inline::Cloaked>(),               2);
+    assert_eq!(size_of::<struct_inline::Transparent>(),           2);
+    assert_eq!(size_of::<struct_inline::Shadowy>(),               2);
+
+    assert_eq!(size_of::<struct_param::Visible<NonZeroU16>>(), 2);
+    assert_eq!(size_of::<struct_param::Cloaked<NonZeroU16>>(), 2);
+    assert_eq!(size_of::<struct_param::Transparent<NonZeroU16>>(), 2);
+    assert_eq!(size_of::<struct_param::Shadowy<NonZeroU16>>(), 2);
+
+    assert_eq!(size_of::<enum_inline::Visible1>(),    2);
+    assert_eq!(size_of::<enum_inline::Cloaked1>(),    2);
+    assert_eq!(size_of::<enum_inline::Transparent>(), 2); // transparent enums are univariant
+    assert_eq!(size_of::<enum_inline::Shadowy>(),     2);
+    assert_eq!(size_of::<enum_inline::Visible2>(),    4);
+    assert_eq!(size_of::<enum_inline::Cloaked2>(),    4);
+
+    assert_eq!(size_of::<enum_param::Visible1<NonZeroU16>>(),    2);
+    assert_eq!(size_of::<enum_param::Cloaked1<NonZeroU16>>(),    2);
+    assert_eq!(size_of::<enum_param::Transparent<NonZeroU16>>(), 2);
+    assert_eq!(size_of::<enum_param::Shadowy<NonZeroU16>>(),     2);
+    assert_eq!(size_of::<enum_param::Visible2<NonZeroU8>>(),     4);
+    assert_eq!(size_of::<enum_param::Cloaked2<NonZeroU8>>(),     4);
+
+    // now the actual tests of no_niche: how do inputs above compose
+    // with `Option` type constructor. The cases with a `_+2` are the
+    // ones where no_niche fires.
+    assert_eq!(size_of::<Option<struct_inline::Visible>>(),       2);
+    assert_eq!(size_of::<Option<struct_inline::Cloaked>>(),       2+2);
+    assert_eq!(size_of::<Option<struct_inline::Transparent>>(),   2);
+    assert_eq!(size_of::<Option<struct_inline::Shadowy>>(),       2+2);
+
+    assert_eq!(size_of::<Option<struct_param::Visible<NonZeroU16>>>(),     2);
+    assert_eq!(size_of::<Option<struct_param::Cloaked<NonZeroU16>>>(),     2+2);
+    assert_eq!(size_of::<Option<struct_param::Transparent<NonZeroU16>>>(), 2);
+    assert_eq!(size_of::<Option<struct_param::Shadowy<NonZeroU16>>>(),     2+2);
+
+    assert_eq!(size_of::<Option<enum_inline::Visible1>>(),    2);
+    assert_eq!(size_of::<Option<enum_inline::Cloaked1>>(),    2+2);
+    assert_eq!(size_of::<Option<enum_inline::Transparent>>(), 2);
+    assert_eq!(size_of::<Option<enum_inline::Shadowy>>(),     2+2);
+    // cannot use niche of multivariant payload
+    assert_eq!(size_of::<Option<enum_inline::Visible2>>(),    4+2);
+    assert_eq!(size_of::<Option<enum_inline::Cloaked2>>(),    4+2);
+
+    assert_eq!(size_of::<Option<enum_param::Visible1<NonZeroU16>>>(),    2);
+    assert_eq!(size_of::<Option<enum_param::Cloaked1<NonZeroU16>>>(),    2+2);
+    assert_eq!(size_of::<Option<enum_param::Transparent<NonZeroU16>>>(), 2);
+    assert_eq!(size_of::<Option<enum_param::Shadowy<NonZeroU16>>>(),     2+2);
+    // cannot use niche of multivariant payload
+    assert_eq!(size_of::<Option<enum_param::Visible2<NonZeroU8>>>(),    4+2);
+    assert_eq!(size_of::<Option<enum_param::Cloaked2<NonZeroU8>>>(),    4+2);
+}
+
+macro two_fifty_six_variant_enum {
+    ($name:ident<$param:ident>) => {
+        #[derive(Debug)]
+        pub enum $name<$param> {
+            _V00($param, u16), _V01(u16, $param), _V02($param, u16), _V03(u16, $param),
+            _V04($param, u16), _V05(u16, $param), _V06($param, u16), _V07(u16, $param),
+            _V08($param, u16), _V09(u16, $param), _V0a($param, u16), _V0b(u16, $param),
+            _V0c($param, u16), _V0d(u16, $param), _V0e($param, u16), _V0f(u16, $param),
+
+            _V10($param, u16), _V11(u16, $param), _V12($param, u16), _V13(u16, $param),
+            _V14($param, u16), _V15(u16, $param), _V16($param, u16), _V17(u16, $param),
+            _V18($param, u16), _V19(u16, $param), _V1a($param, u16), _V1b(u16, $param),
+            _V1c($param, u16), _V1d(u16, $param), _V1e($param, u16), _V1f(u16, $param),
+
+            _V20($param, u16), _V21(u16, $param), _V22($param, u16), _V23(u16, $param),
+            _V24($param, u16), _V25(u16, $param), _V26($param, u16), _V27(u16, $param),
+            _V28($param, u16), _V29(u16, $param), _V2a($param, u16), _V2b(u16, $param),
+            _V2c($param, u16), _V2d(u16, $param), _V2e($param, u16), _V2f(u16, $param),
+
+            _V30($param, u16), _V31(u16, $param), _V32($param, u16), _V33(u16, $param),
+            _V34($param, u16), _V35(u16, $param), _V36($param, u16), _V37(u16, $param),
+            _V38($param, u16), _V39(u16, $param), _V3a($param, u16), _V3b(u16, $param),
+            _V3c($param, u16), _V3d(u16, $param), _V3e($param, u16), _V3f(u16, $param),
+
+            _V40($param, u16), _V41(u16, $param), _V42($param, u16), _V43(u16, $param),
+            _V44($param, u16), _V45(u16, $param), _V46($param, u16), _V47(u16, $param),
+            _V48($param, u16), _V49(u16, $param), _V4a($param, u16), _V4b(u16, $param),
+            _V4c($param, u16), _V4d(u16, $param), _V4e($param, u16), _V4f(u16, $param),
+
+            _V50($param, u16), _V51(u16, $param), _V52($param, u16), _V53(u16, $param),
+            _V54($param, u16), _V55(u16, $param), _V56($param, u16), _V57(u16, $param),
+            _V58($param, u16), _V59(u16, $param), _V5a($param, u16), _V5b(u16, $param),
+            _V5c($param, u16), _V5d(u16, $param), _V5e($param, u16), _V5f(u16, $param),
+
+            _V60($param, u16), _V61(u16, $param), _V62($param, u16), _V63(u16, $param),
+            _V64($param, u16), _V65(u16, $param), _V66($param, u16), _V67(u16, $param),
+            _V68($param, u16), _V69(u16, $param), _V6a($param, u16), _V6b(u16, $param),
+            _V6c($param, u16), _V6d(u16, $param), _V6e($param, u16), _V6f(u16, $param),
+
+            _V70($param, u16), _V71(u16, $param), _V72($param, u16), _V73(u16, $param),
+            _V74($param, u16), _V75(u16, $param), _V76($param, u16), _V77(u16, $param),
+            _V78($param, u16), _V79(u16, $param), _V7a($param, u16), _V7b(u16, $param),
+            _V7c($param, u16), _V7d(u16, $param), _V7e($param, u16), _V7f(u16, $param),
+
+            _V80($param, u16), _V81(u16, $param), _V82($param, u16), _V83(u16, $param),
+            _V84($param, u16), _V85(u16, $param), _V86($param, u16), _V87(u16, $param),
+            _V88($param, u16), _V89(u16, $param), _V8a($param, u16), _V8b(u16, $param),
+            _V8c($param, u16), _V8d(u16, $param), _V8e($param, u16), _V8f(u16, $param),
+
+            _V90($param, u16), _V91(u16, $param), _V92($param, u16), _V93(u16, $param),
+            _V94($param, u16), _V95(u16, $param), _V96($param, u16), _V97(u16, $param),
+            _V98($param, u16), _V99(u16, $param), _V9a($param, u16), _V9b(u16, $param),
+            _V9c($param, u16), _V9d(u16, $param), _V9e($param, u16), _V9f(u16, $param),
+
+            _Va0($param, u16), _Va1(u16, $param), _Va2($param, u16), _Va3(u16, $param),
+            _Va4($param, u16), _Va5(u16, $param), _Va6($param, u16), _Va7(u16, $param),
+            _Va8($param, u16), _Va9(u16, $param), _Vaa($param, u16), _Vab(u16, $param),
+            _Vac($param, u16), _Vad(u16, $param), _Vae($param, u16), _Vaf(u16, $param),
+
+            _Vb0($param, u16), _Vb1(u16, $param), _Vb2($param, u16), _Vb3(u16, $param),
+            _Vb4($param, u16), _Vb5(u16, $param), _Vb6($param, u16), _Vb7(u16, $param),
+            _Vb8($param, u16), _Vb9(u16, $param), _Vba($param, u16), _Vbb(u16, $param),
+            _Vbc($param, u16), _Vbd(u16, $param), _Vbe($param, u16), _Vbf(u16, $param),
+
+            _Vc0($param, u16), _Vc1(u16, $param), _Vc2($param, u16), _Vc3(u16, $param),
+            _Vc4($param, u16), _Vc5(u16, $param), _Vc6($param, u16), _Vc7(u16, $param),
+            _Vc8($param, u16), _Vc9(u16, $param), _Vca($param, u16), _Vcb(u16, $param),
+            _Vcc($param, u16), _Vcd(u16, $param), _Vce($param, u16), _Vcf(u16, $param),
+
+            _Vd0($param, u16), _Vd1(u16, $param), _Vd2($param, u16), _Vd3(u16, $param),
+            _Vd4($param, u16), _Vd5(u16, $param), _Vd6($param, u16), _Vd7(u16, $param),
+            _Vd8($param, u16), _Vd9(u16, $param), _Vda($param, u16), _Vdb(u16, $param),
+            _Vdc($param, u16), _Vdd(u16, $param), _Vde($param, u16), _Vdf(u16, $param),
+
+            _Ve0($param, u16), _Ve1(u16, $param), _Ve2($param, u16), _Ve3(u16, $param),
+            _Ve4($param, u16), _Ve5(u16, $param), _Ve6($param, u16), _Ve7(u16, $param),
+            _Ve8($param, u16), _Ve9(u16, $param), _Vea($param, u16), _Veb(u16, $param),
+            _Vec($param, u16), _Ved(u16, $param), _Vee($param, u16), _Vef(u16, $param),
+
+            _Vf0($param, u16), _Vf1(u16, $param), _Vf2($param, u16), _Vf3(u16, $param),
+            _Vf4($param, u16), _Vf5(u16, $param), _Vf6($param, u16), _Vf7(u16, $param),
+            _Vf8($param, u16), _Vf9(u16, $param), _Vfa($param, u16), _Vfb(u16, $param),
+            _Vfc($param, u16), _Vfd(u16, $param), _Vfe($param, u16), _Vff(u16, $param),
+        }
+    },
+
+    ($name:ident, $param:ty) => {
+        #[derive(Debug)]
+        pub enum $name {
+            _V00($param, u16), _V01(u16, $param), _V02($param, u16), _V03(u16, $param),
+            _V04($param, u16), _V05(u16, $param), _V06($param, u16), _V07(u16, $param),
+            _V08($param, u16), _V09(u16, $param), _V0a($param, u16), _V0b(u16, $param),
+            _V0c($param, u16), _V0d(u16, $param), _V0e($param, u16), _V0f(u16, $param),
+
+            _V10($param, u16), _V11(u16, $param), _V12($param, u16), _V13(u16, $param),
+            _V14($param, u16), _V15(u16, $param), _V16($param, u16), _V17(u16, $param),
+            _V18($param, u16), _V19(u16, $param), _V1a($param, u16), _V1b(u16, $param),
+            _V1c($param, u16), _V1d(u16, $param), _V1e($param, u16), _V1f(u16, $param),
+
+            _V20($param, u16), _V21(u16, $param), _V22($param, u16), _V23(u16, $param),
+            _V24($param, u16), _V25(u16, $param), _V26($param, u16), _V27(u16, $param),
+            _V28($param, u16), _V29(u16, $param), _V2a($param, u16), _V2b(u16, $param),
+            _V2c($param, u16), _V2d(u16, $param), _V2e($param, u16), _V2f(u16, $param),
+
+            _V30($param, u16), _V31(u16, $param), _V32($param, u16), _V33(u16, $param),
+            _V34($param, u16), _V35(u16, $param), _V36($param, u16), _V37(u16, $param),
+            _V38($param, u16), _V39(u16, $param), _V3a($param, u16), _V3b(u16, $param),
+            _V3c($param, u16), _V3d(u16, $param), _V3e($param, u16), _V3f(u16, $param),
+
+            _V40($param, u16), _V41(u16, $param), _V42($param, u16), _V43(u16, $param),
+            _V44($param, u16), _V45(u16, $param), _V46($param, u16), _V47(u16, $param),
+            _V48($param, u16), _V49(u16, $param), _V4a($param, u16), _V4b(u16, $param),
+            _V4c($param, u16), _V4d(u16, $param), _V4e($param, u16), _V4f(u16, $param),
+
+            _V50($param, u16), _V51(u16, $param), _V52($param, u16), _V53(u16, $param),
+            _V54($param, u16), _V55(u16, $param), _V56($param, u16), _V57(u16, $param),
+            _V58($param, u16), _V59(u16, $param), _V5a($param, u16), _V5b(u16, $param),
+            _V5c($param, u16), _V5d(u16, $param), _V5e($param, u16), _V5f(u16, $param),
+
+            _V60($param, u16), _V61(u16, $param), _V62($param, u16), _V63(u16, $param),
+            _V64($param, u16), _V65(u16, $param), _V66($param, u16), _V67(u16, $param),
+            _V68($param, u16), _V69(u16, $param), _V6a($param, u16), _V6b(u16, $param),
+            _V6c($param, u16), _V6d(u16, $param), _V6e($param, u16), _V6f(u16, $param),
+
+            _V70($param, u16), _V71(u16, $param), _V72($param, u16), _V73(u16, $param),
+            _V74($param, u16), _V75(u16, $param), _V76($param, u16), _V77(u16, $param),
+            _V78($param, u16), _V79(u16, $param), _V7a($param, u16), _V7b(u16, $param),
+            _V7c($param, u16), _V7d(u16, $param), _V7e($param, u16), _V7f(u16, $param),
+
+            _V80($param, u16), _V81(u16, $param), _V82($param, u16), _V83(u16, $param),
+            _V84($param, u16), _V85(u16, $param), _V86($param, u16), _V87(u16, $param),
+            _V88($param, u16), _V89(u16, $param), _V8a($param, u16), _V8b(u16, $param),
+            _V8c($param, u16), _V8d(u16, $param), _V8e($param, u16), _V8f(u16, $param),
+
+            _V90($param, u16), _V91(u16, $param), _V92($param, u16), _V93(u16, $param),
+            _V94($param, u16), _V95(u16, $param), _V96($param, u16), _V97(u16, $param),
+            _V98($param, u16), _V99(u16, $param), _V9a($param, u16), _V9b(u16, $param),
+            _V9c($param, u16), _V9d(u16, $param), _V9e($param, u16), _V9f(u16, $param),
+
+            _Va0($param, u16), _Va1(u16, $param), _Va2($param, u16), _Va3(u16, $param),
+            _Va4($param, u16), _Va5(u16, $param), _Va6($param, u16), _Va7(u16, $param),
+            _Va8($param, u16), _Va9(u16, $param), _Vaa($param, u16), _Vab(u16, $param),
+            _Vac($param, u16), _Vad(u16, $param), _Vae($param, u16), _Vaf(u16, $param),
+
+            _Vb0($param, u16), _Vb1(u16, $param), _Vb2($param, u16), _Vb3(u16, $param),
+            _Vb4($param, u16), _Vb5(u16, $param), _Vb6($param, u16), _Vb7(u16, $param),
+            _Vb8($param, u16), _Vb9(u16, $param), _Vba($param, u16), _Vbb(u16, $param),
+            _Vbc($param, u16), _Vbd(u16, $param), _Vbe($param, u16), _Vbf(u16, $param),
+
+            _Vc0($param, u16), _Vc1(u16, $param), _Vc2($param, u16), _Vc3(u16, $param),
+            _Vc4($param, u16), _Vc5(u16, $param), _Vc6($param, u16), _Vc7(u16, $param),
+            _Vc8($param, u16), _Vc9(u16, $param), _Vca($param, u16), _Vcb(u16, $param),
+            _Vcc($param, u16), _Vcd(u16, $param), _Vce($param, u16), _Vcf(u16, $param),
+
+            _Vd0($param, u16), _Vd1(u16, $param), _Vd2($param, u16), _Vd3(u16, $param),
+            _Vd4($param, u16), _Vd5(u16, $param), _Vd6($param, u16), _Vd7(u16, $param),
+            _Vd8($param, u16), _Vd9(u16, $param), _Vda($param, u16), _Vdb(u16, $param),
+            _Vdc($param, u16), _Vdd(u16, $param), _Vde($param, u16), _Vdf(u16, $param),
+
+            _Ve0($param, u16), _Ve1(u16, $param), _Ve2($param, u16), _Ve3(u16, $param),
+            _Ve4($param, u16), _Ve5(u16, $param), _Ve6($param, u16), _Ve7(u16, $param),
+            _Ve8($param, u16), _Ve9(u16, $param), _Vea($param, u16), _Veb(u16, $param),
+            _Vec($param, u16), _Ved(u16, $param), _Vee($param, u16), _Vef(u16, $param),
+
+            _Vf0($param, u16), _Vf1(u16, $param), _Vf2($param, u16), _Vf3(u16, $param),
+            _Vf4($param, u16), _Vf5(u16, $param), _Vf6($param, u16), _Vf7(u16, $param),
+            _Vf8($param, u16), _Vf9(u16, $param), _Vfa($param, u16), _Vfb(u16, $param),
+            _Vfc($param, u16), _Vfd(u16, $param), _Vfe($param, u16), _Vff(u16, $param),
+        }
+    }
+}
diff --git a/src/test/ui/reserved/reserved-attr-on-macro.stderr b/src/test/ui/reserved/reserved-attr-on-macro.stderr
index 685960588a..c387bba0a1 100644
--- a/src/test/ui/reserved/reserved-attr-on-macro.stderr
+++ b/src/test/ui/reserved/reserved-attr-on-macro.stderr
@@ -4,7 +4,6 @@ error[E0658]: attributes starting with `rustc` are reserved for use by the `rust
 LL | #[rustc_attribute_should_be_reserved]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: cannot determine resolution for the macro `foo`
diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/src/test/ui/resolve/issue-3907-2.stderr
index 63ac11dc8a..d0c278d12d 100644
--- a/src/test/ui/resolve/issue-3907-2.stderr
+++ b/src/test/ui/resolve/issue-3907-2.stderr
@@ -1,10 +1,10 @@
 error[E0038]: the trait `issue_3907::Foo` cannot be made into an object
-  --> $DIR/issue-3907-2.rs:11:1
+  --> $DIR/issue-3907-2.rs:11:12
    |
 LL | fn bar(_x: Foo) {}
-   | ^^^^^^^^^^^^^^^ the trait `issue_3907::Foo` cannot be made into an object
+   |            ^^^ the trait `issue_3907::Foo` cannot be made into an object
    |
-   = note: associated function `bar` has no `self` parameter
+   = note: the trait cannot be made into an object because associated function `bar` has no `self` parameter
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs b/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
new file mode 100644
index 0000000000..4397baea4a
--- /dev/null
+++ b/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
@@ -0,0 +1,6 @@
+fn main() {}
+
+trait Foo {
+    fn fn_with_type_named_same_as_local_in_param(b: b);
+    //~^ ERROR cannot find type `b` in this scope
+}
diff --git a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr b/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
new file mode 100644
index 0000000000..109409d273
--- /dev/null
+++ b/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
@@ -0,0 +1,9 @@
+error[E0412]: cannot find type `b` in this scope
+  --> $DIR/issue-69401-trait-fn-no-body-ty-local.rs:4:53
+   |
+LL |     fn fn_with_type_named_same_as_local_in_param(b: b);
+   |                                                     ^ not found in this scope
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0412`.
diff --git a/src/test/ui/resolve/name-clash-nullary.stderr b/src/test/ui/resolve/name-clash-nullary.stderr
index aeeb0c4519..2de0b6a496 100644
--- a/src/test/ui/resolve/name-clash-nullary.stderr
+++ b/src/test/ui/resolve/name-clash-nullary.stderr
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
   --> $DIR/name-clash-nullary.rs:2:7
    |
 LL |   let None: isize = 42;
-   |       ^^^^ expected `isize`, found enum `std::option::Option`
+   |       ^^^^  ----- expected due to this
+   |       |
+   |       expected `isize`, found enum `std::option::Option`
    |
    = note: expected type `isize`
               found enum `std::option::Option<_>`
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs b/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs
index e9c4e47f88..43e9378b7d 100644
--- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs
+++ b/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs
@@ -1,39 +1,40 @@
 enum Opts {
-    A(isize), B(isize), C(isize)
+    A(isize),
+    B(isize),
+    C(isize),
 }
 
 fn matcher1(x: Opts) {
     match x {
-      Opts::A(ref i) | Opts::B(i) => {}
-      //~^ ERROR variable `i` is bound in inconsistent ways within the same match arm
-      //~^^ ERROR mismatched types
-      Opts::C(_) => {}
+        Opts::A(ref i) | Opts::B(i) => {}
+        //~^ ERROR variable `i` is bound inconsistently
+        //~^^ ERROR mismatched types
+        Opts::C(_) => {}
     }
 }
 
 fn matcher2(x: Opts) {
     match x {
-      Opts::A(ref i) | Opts::B(i) => {}
-      //~^ ERROR variable `i` is bound in inconsistent ways within the same match arm
-      //~^^ ERROR mismatched types
-      Opts::C(_) => {}
+        Opts::A(ref i) | Opts::B(i) => {}
+        //~^ ERROR variable `i` is bound inconsistently
+        //~^^ ERROR mismatched types
+        Opts::C(_) => {}
     }
 }
 
 fn matcher4(x: Opts) {
     match x {
-      Opts::A(ref mut i) | Opts::B(ref i) => {}
-      //~^ ERROR variable `i` is bound in inconsistent ways within the same match arm
-      //~^^ ERROR mismatched types
-      Opts::C(_) => {}
+        Opts::A(ref mut i) | Opts::B(ref i) => {}
+        //~^ ERROR variable `i` is bound inconsistently
+        //~^^ ERROR mismatched types
+        Opts::C(_) => {}
     }
 }
 
-
 fn matcher5(x: Opts) {
     match x {
-      Opts::A(ref i) | Opts::B(ref i) => {}
-      Opts::C(_) => {}
+        Opts::A(ref i) | Opts::B(ref i) => {}
+        Opts::C(_) => {}
     }
 }
 
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr b/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr
index 61d1001ce9..c14dfa3601 100644
--- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr
+++ b/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr
@@ -1,51 +1,62 @@
-error[E0409]: variable `i` is bound in inconsistent ways within the same match arm
-  --> $DIR/resolve-inconsistent-binding-mode.rs:7:32
+error[E0409]: variable `i` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/resolve-inconsistent-binding-mode.rs:9:34
    |
-LL |       Opts::A(ref i) | Opts::B(i) => {}
-   |                   -            ^ bound in different ways
-   |                   |
-   |                   first binding
+LL |         Opts::A(ref i) | Opts::B(i) => {}
+   |                     -            ^ bound in different ways
+   |                     |
+   |                     first binding
 
-error[E0409]: variable `i` is bound in inconsistent ways within the same match arm
-  --> $DIR/resolve-inconsistent-binding-mode.rs:16:32
+error[E0409]: variable `i` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/resolve-inconsistent-binding-mode.rs:18:34
    |
-LL |       Opts::A(ref i) | Opts::B(i) => {}
-   |                   -            ^ bound in different ways
-   |                   |
-   |                   first binding
+LL |         Opts::A(ref i) | Opts::B(i) => {}
+   |                     -            ^ bound in different ways
+   |                     |
+   |                     first binding
 
-error[E0409]: variable `i` is bound in inconsistent ways within the same match arm
-  --> $DIR/resolve-inconsistent-binding-mode.rs:25:40
+error[E0409]: variable `i` is bound inconsistently across alternatives separated by `|`
+  --> $DIR/resolve-inconsistent-binding-mode.rs:27:42
    |
-LL |       Opts::A(ref mut i) | Opts::B(ref i) => {}
-   |                       - first binding  ^ bound in different ways
+LL |         Opts::A(ref mut i) | Opts::B(ref i) => {}
+   |                         - first binding  ^ bound in different ways
 
 error[E0308]: mismatched types
-  --> $DIR/resolve-inconsistent-binding-mode.rs:7:32
+  --> $DIR/resolve-inconsistent-binding-mode.rs:9:34
    |
 LL |     match x {
    |           - this expression has type `Opts`
-LL |       Opts::A(ref i) | Opts::B(i) => {}
-   |                                ^ expected `&isize`, found `isize`
+LL |         Opts::A(ref i) | Opts::B(i) => {}
+   |                 -----            ^ expected `&isize`, found `isize`
+   |                 |
+   |                 first introduced with type `&isize` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/resolve-inconsistent-binding-mode.rs:16:32
+  --> $DIR/resolve-inconsistent-binding-mode.rs:18:34
    |
 LL |     match x {
    |           - this expression has type `Opts`
-LL |       Opts::A(ref i) | Opts::B(i) => {}
-   |                                ^ expected `&isize`, found `isize`
+LL |         Opts::A(ref i) | Opts::B(i) => {}
+   |                 -----            ^ expected `&isize`, found `isize`
+   |                 |
+   |                 first introduced with type `&isize` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
 
 error[E0308]: mismatched types
-  --> $DIR/resolve-inconsistent-binding-mode.rs:25:36
+  --> $DIR/resolve-inconsistent-binding-mode.rs:27:38
    |
 LL |     match x {
    |           - this expression has type `Opts`
-LL |       Opts::A(ref mut i) | Opts::B(ref i) => {}
-   |                                    ^^^^^ types differ in mutability
+LL |         Opts::A(ref mut i) | Opts::B(ref i) => {}
+   |                 ---------            ^^^^^ types differ in mutability
+   |                 |
+   |                 first introduced with type `&mut isize` here
    |
    = note: expected type `&mut isize`
               found type `&isize`
+   = note: in the same arm, a binding must have the same type in all alternatives
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/resolve/resolve-inconsistent-names.rs b/src/test/ui/resolve/resolve-inconsistent-names.rs
index 2fb803c4b2..b9202f556d 100644
--- a/src/test/ui/resolve/resolve-inconsistent-names.rs
+++ b/src/test/ui/resolve/resolve-inconsistent-names.rs
@@ -19,7 +19,7 @@ fn main() {
         (A, B) | (ref B, c) | (c, A) => ()
         //~^ ERROR variable `A` is not bound in all patterns
         //~| ERROR variable `B` is not bound in all patterns
-        //~| ERROR variable `B` is bound in inconsistent ways
+        //~| ERROR variable `B` is bound inconsistently
         //~| ERROR mismatched types
         //~| ERROR variable `c` is not bound in all patterns
         //~| HELP consider making the path in the pattern qualified: `?::A`
diff --git a/src/test/ui/resolve/resolve-inconsistent-names.stderr b/src/test/ui/resolve/resolve-inconsistent-names.stderr
index 5c87f7c684..70e9c2e5bf 100644
--- a/src/test/ui/resolve/resolve-inconsistent-names.stderr
+++ b/src/test/ui/resolve/resolve-inconsistent-names.stderr
@@ -47,7 +47,7 @@ LL |         (A, B) | (ref B, c) | (c, A) => ()
    |         |                variable not in all patterns
    |         pattern doesn't bind `c`
 
-error[E0409]: variable `B` is bound in inconsistent ways within the same match arm
+error[E0409]: variable `B` is bound inconsistently across alternatives separated by `|`
   --> $DIR/resolve-inconsistent-names.rs:19:23
    |
 LL |         (A, B) | (ref B, c) | (c, A) => ()
@@ -89,7 +89,11 @@ error[E0308]: mismatched types
 LL |     match x {
    |           - this expression has type `(E, E)`
 LL |         (A, B) | (ref B, c) | (c, A) => ()
-   |                   ^^^^^ expected enum `E`, found `&E`
+   |             -     ^^^^^ expected enum `E`, found `&E`
+   |             |
+   |             first introduced with type `E` here
+   |
+   = note: in the same arm, a binding must have the same type in all alternatives
 
 error: aborting due to 9 previous errors
 
diff --git a/src/test/ui/resolve/resolve-primitive-fallback.rs b/src/test/ui/resolve/resolve-primitive-fallback.rs
index e5a3d689d2..992bcd7977 100644
--- a/src/test/ui/resolve/resolve-primitive-fallback.rs
+++ b/src/test/ui/resolve/resolve-primitive-fallback.rs
@@ -2,7 +2,7 @@ fn main() {
     // Make sure primitive type fallback doesn't work in value namespace
     std::mem::size_of(u16);
     //~^ ERROR expected value, found builtin type `u16`
-    //~| ERROR this function takes 0 parameters but 1 parameter was supplied
+    //~| ERROR this function takes 0 arguments but 1 argument was supplied
 
     // Make sure primitive type fallback doesn't work with global paths
     let _: ::u8;
diff --git a/src/test/ui/resolve/resolve-primitive-fallback.stderr b/src/test/ui/resolve/resolve-primitive-fallback.stderr
index 92c2a03298..9d381a8a94 100644
--- a/src/test/ui/resolve/resolve-primitive-fallback.stderr
+++ b/src/test/ui/resolve/resolve-primitive-fallback.stderr
@@ -9,12 +9,19 @@ error[E0412]: cannot find type `u8` in the crate root
    |
 LL |     let _: ::u8;
    |              ^^ not found in the crate root
+   |
+help: possible candidate is found in another module, you can import it into scope
+   |
+LL | use std::primitive::u8;
+   |
 
-error[E0061]: this function takes 0 parameters but 1 parameter was supplied
+error[E0061]: this function takes 0 arguments but 1 argument was supplied
   --> $DIR/resolve-primitive-fallback.rs:3:5
    |
 LL |     std::mem::size_of(u16);
-   |     ^^^^^^^^^^^^^^^^^^^^^^ expected 0 parameters
+   |     ^^^^^^^^^^^^^^^^^ --- supplied 1 argument
+   |     |
+   |     expected 0 arguments
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/resolve/typo-suggestion-named-underscore.rs b/src/test/ui/resolve/typo-suggestion-named-underscore.rs
new file mode 100644
index 0000000000..a2b05db035
--- /dev/null
+++ b/src/test/ui/resolve/typo-suggestion-named-underscore.rs
@@ -0,0 +1,14 @@
+const _: () = ();
+
+fn main() {
+    a // Shouldn't suggest underscore
+    //~^ ERROR: cannot find value `a` in this scope
+}
+
+trait Unknown {}
+
+#[allow(unused_imports)]
+use Unknown as _;
+
+fn foo<T: A>(x: T) {} // Shouldn't suggest underscore
+//~^ ERROR: cannot find trait `A` in this scope
diff --git a/src/test/ui/resolve/typo-suggestion-named-underscore.stderr b/src/test/ui/resolve/typo-suggestion-named-underscore.stderr
new file mode 100644
index 0000000000..65d1b084a3
--- /dev/null
+++ b/src/test/ui/resolve/typo-suggestion-named-underscore.stderr
@@ -0,0 +1,16 @@
+error[E0425]: cannot find value `a` in this scope
+  --> $DIR/typo-suggestion-named-underscore.rs:4:5
+   |
+LL |     a // Shouldn't suggest underscore
+   |     ^ not found in this scope
+
+error[E0405]: cannot find trait `A` in this scope
+  --> $DIR/typo-suggestion-named-underscore.rs:13:11
+   |
+LL | fn foo<T: A>(x: T) {} // Shouldn't suggest underscore
+   |           ^ not found in this scope
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0405, E0425.
+For more information about an error, try `rustc --explain E0405`.
diff --git a/src/test/ui/return/return-match-array-const.stderr b/src/test/ui/return/return-match-array-const.stderr
index 8b8e961b72..c475c7de43 100644
--- a/src/test/ui/return/return-match-array-const.stderr
+++ b/src/test/ui/return/return-match-array-const.stderr
@@ -4,7 +4,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |     [(); return match 0 { n => n }];
    |                 ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -13,7 +13,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |     [(); return match 0 { 0 => 0 }];
    |                 ^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -22,7 +22,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |     [(); return match () { 'a' => 0, _ => 0 }];
    |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0572]: return statement outside of function body
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
index ed4f34b527..d4bd760770 100644
--- a/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-test-wrong-type.stderr
@@ -12,6 +12,7 @@ LL |   pub fn assert_test_result<T: Termination>(result: T) {
    |                                ----------- required by this bound in `test::assert_test_result`
    |
    = help: the trait `std::process::Termination` is not implemented for `std::result::Result<f32, std::num::ParseFloatError>`
+   = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2005-default-binding-mode/const.stderr b/src/test/ui/rfc-2005-default-binding-mode/const.stderr
index f25fc300d7..10d30ec1a1 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/const.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/const.stderr
@@ -1,8 +1,17 @@
 error[E0308]: mismatched types
   --> $DIR/const.rs:14:9
    |
+LL | const FOO: Foo = Foo{bar: 5};
+   | ----------------------------- constant defined here
+...
+LL |     match &f {
+   |           -- this expression has type `&Foo`
 LL |         FOO => {},
-   |         ^^^ expected `&Foo`, found struct `Foo`
+   |         ^^^
+   |         |
+   |         expected `&Foo`, found struct `Foo`
+   |         `FOO` is interpreted as a constant, not a new binding
+   |         help: introduce a new binding instead: `other_foo`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.rs b/src/test/ui/rfc-2005-default-binding-mode/for.rs
index 3bf053eb87..aa42c7bb9c 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.rs
+++ b/src/test/ui/rfc-2005-default-binding-mode/for.rs
@@ -1,10 +1,11 @@
+#![feature(move_ref_pattern)]
+
 struct Foo {}
 
 pub fn main() {
-    let mut tups = vec![(Foo{}, Foo{})];
+    let mut tups = vec![(Foo {}, Foo {})];
     // The below desugars to &(ref n, mut m).
     for (n, mut m) in &tups {
-        //~^ ERROR cannot bind by-move and by-ref in the same pattern
-        //~| ERROR cannot move out of a shared reference
+        //~^ ERROR cannot move out of a shared reference
     }
 }
diff --git a/src/test/ui/rfc-2005-default-binding-mode/for.stderr b/src/test/ui/rfc-2005-default-binding-mode/for.stderr
index ebc6ff5d8c..ef62431388 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/for.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/for.stderr
@@ -1,13 +1,5 @@
-error[E0009]: cannot bind by-move and by-ref in the same pattern
-  --> $DIR/for.rs:6:13
-   |
-LL |     for (n, mut m) in &tups {
-   |          -  ^^^^^ by-move pattern here
-   |          |
-   |          by-ref pattern here
-
 error[E0507]: cannot move out of a shared reference
-  --> $DIR/for.rs:6:23
+  --> $DIR/for.rs:8:23
    |
 LL |     for (n, mut m) in &tups {
    |             -----     ^^^^^
@@ -15,7 +7,6 @@ LL |     for (n, mut m) in &tups {
    |             data moved here
    |             move occurs because `m` has type `Foo`, which does not implement the `Copy` trait
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
-Some errors have detailed explanations: E0009, E0507.
-For more information about an error, try `rustc --explain E0009`.
+For more information about this error, try `rustc --explain E0507`.
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
index aa013d4bf3..b4a0d8145c 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
+++ b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.rs
@@ -4,7 +4,7 @@ pub fn main() {
     let x = &Some((3, 3));
     let _: &i32 = match x {
         Some((x, 3)) | &Some((ref x, 5)) => x,
-        //~^ ERROR is bound in inconsistent ways
+        //~^ ERROR is bound inconsistently
         _ => &5i32,
     };
 }
diff --git a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
index ff8dce32b2..e1e1bf7f6d 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/issue-44912-or.stderr
@@ -1,4 +1,4 @@
-error[E0409]: variable `x` is bound in inconsistent ways within the same match arm
+error[E0409]: variable `x` is bound inconsistently across alternatives separated by `|`
   --> $DIR/issue-44912-or.rs:6:35
    |
 LL |         Some((x, 3)) | &Some((ref x, 5)) => x,
diff --git a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
index b0d60c7a4c..6d18a39606 100644
--- a/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
+++ b/src/test/ui/rfc-2005-default-binding-mode/lit.stderr
@@ -1,6 +1,8 @@
 error[E0308]: mismatched types
   --> $DIR/lit.rs:7:13
    |
+LL |     match &s {
+   |           -- this expression has type `&&str`
 LL |             "abc" => true,
    |             ^^^^^ expected `&str`, found `str`
    |
@@ -10,6 +12,8 @@ LL |             "abc" => true,
 error[E0308]: mismatched types
   --> $DIR/lit.rs:16:9
    |
+LL |     match &s {
+   |           -- this expression has type `&&[u8]`
 LL |         b"abc" => true,
    |         ^^^^^^ expected `&[u8]`, found array `[u8; 3]`
    |
diff --git a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr b/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
index 7fbf1157e5..4956226712 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/improper_ctypes/extern_crate_improper.stderr
@@ -4,7 +4,7 @@ error: `extern` block uses type `types::NonExhaustiveEnum`, which is not FFI-saf
 LL |     pub fn non_exhaustive_enum(_: NonExhaustiveEnum);
    |                                   ^^^^^^^^^^^^^^^^^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/extern_crate_improper.rs:2:9
    |
 LL | #![deny(improper_ctypes)]
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
index f2b9983af8..f39e6ee298 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/issue-65157-repeated-match-arm.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         PartiallyInhabitedVariants::Struct { .. } => {},
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-65157-repeated-match-arm.rs:2:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
index e3de94be12..8bfd6e91f4 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         Some(_x) => (),
    |         ^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/patterns_same_crate.rs:1:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs b/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
new file mode 100644
index 0000000000..fe2b92eafd
--- /dev/null
+++ b/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.rs
@@ -0,0 +1,32 @@
+// Ensure that a `#[track_caller]` function, returning `caller_location()`,
+// which coerced (to a function pointer) and called, inside a `const fn`,
+// in turn called, results in the same output irrespective of whether
+// we're in a const or runtime context.
+
+// run-pass
+// compile-flags: -Z unleash-the-miri-inside-of-you
+
+#![feature(core_intrinsics, const_caller_location, track_caller, const_fn)]
+
+type L = &'static std::panic::Location<'static>;
+
+#[track_caller]
+const fn attributed() -> L {
+    std::intrinsics::caller_location()
+}
+
+const fn calling_attributed() -> L {
+    // We need `-Z unleash-the-miri-inside-of-you` for this as we don't have `const fn` pointers.
+    let ptr: fn() -> L = attributed;
+    ptr() //~ WARN skipping const checks
+}
+
+fn main() {
+    const CONSTANT: L = calling_attributed();
+    let runtime = calling_attributed();
+
+    assert_eq!(
+        (runtime.file(), runtime.line(), runtime.column()),
+        (CONSTANT.file(), CONSTANT.line(), CONSTANT.column()),
+    );
+}
diff --git a/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr b/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
new file mode 100644
index 0000000000..fcf0945ed4
--- /dev/null
+++ b/src/test/ui/rfc-2091-track-caller/caller-location-fnptr-rt-ctfe-equiv.stderr
@@ -0,0 +1,6 @@
+warning: skipping const checks
+  --> $DIR/caller-location-fnptr-rt-ctfe-equiv.rs:21:5
+   |
+LL |     ptr()
+   |     ^^^^^
+
diff --git a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr b/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
index b049d8a4ab..c3cfc5a4d9 100644
--- a/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
+++ b/src/test/ui/rfc-2093-infer-outlives/dont-infer-static.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `U` may not live long enough
   --> $DIR/dont-infer-static.rs:8:5
    |
 LL | struct Foo<U> {
-   |            - help: consider adding an explicit lifetime bound `U: 'static`...
+   |            - help: consider adding an explicit lifetime bound...: `U: 'static`
 LL |     bar: Bar<U>
    |     ^^^^^^^^^^^
    |
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr b/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
index 8701408566..297fcb088d 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
+++ b/src/test/ui/rfc-2093-infer-outlives/regions-enum-not-wf.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:18:18
    |
 LL | enum Ref1<'a, T> {
-   |               - help: consider adding an explicit lifetime bound `T: 'a`...
+   |               - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     Ref1Variant1(RequireOutlives<'a, T>)
    |                  ^^^^^^^^^^^^^^^^^^^^^^
    |
@@ -16,7 +16,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:23:25
    |
 LL | enum Ref2<'a, T> {
-   |               - help: consider adding an explicit lifetime bound `T: 'a`...
+   |               - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     Ref2Variant1,
 LL |     Ref2Variant2(isize, RequireOutlives<'a, T>),
    |                         ^^^^^^^^^^^^^^^^^^^^^^
@@ -31,7 +31,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:35:1
    |
 LL |   enum RefDouble<'a, 'b, T> {
-   |   ^                      - help: consider adding an explicit lifetime bound `T: 'b`...
+   |   ^                      - help: consider adding an explicit lifetime bound...: `T: 'b`
    |  _|
    | |
 LL | |     RefDoubleVariant1(&'a RequireOutlives<'b, T>)
@@ -52,7 +52,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-enum-not-wf.rs:36:23
    |
 LL | enum RefDouble<'a, 'b, T> {
-   |                        - help: consider adding an explicit lifetime bound `T: 'b`...
+   |                        - help: consider adding an explicit lifetime bound...: `T: 'b`
 LL |     RefDoubleVariant1(&'a RequireOutlives<'b, T>)
    |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
diff --git a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr b/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
index 825c1015c5..f6658891fa 100644
--- a/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
+++ b/src/test/ui/rfc-2093-infer-outlives/regions-struct-not-wf.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-struct-not-wf.rs:13:5
    |
 LL | impl<'a, T> Trait<'a, T> for usize {
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     type Out = &'a T;
    |     ^^^^^^^^^^^^^^^^^
    |
@@ -16,7 +16,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/regions-struct-not-wf.rs:21:5
    |
 LL | impl<'a, T> Trait<'a, T> for u32 {
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     type Out = RefOk<'a, T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr b/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
index 5f0b3a1d40..5611b5f4ec 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
+++ b/src/test/ui/rfc-2361-dbg-macro/dbg-macro-move-semantics.stderr
@@ -7,8 +7,6 @@ LL |     let _ = dbg!(a);
    |             ------- value moved here
 LL |     let _ = dbg!(a);
    |                  ^ value used here after move
-   |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr b/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
index ecab673953..799a05bf7e 100644
--- a/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
+++ b/src/test/ui/rfc-2361-dbg-macro/dbg-macro-requires-debug.stderr
@@ -8,7 +8,7 @@ LL |     let _: NotDebug = dbg!(NotDebug);
    = note: add `#[derive(Debug)]` or manually implement `std::fmt::Debug`
    = note: required because of the requirements on the impl of `std::fmt::Debug` for `&NotDebug`
    = note: required by `std::fmt::Debug::fmt`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr b/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
index 7170adca60..39874a6c68 100644
--- a/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
+++ b/src/test/ui/rfc-2497-if-let-chains/disallowed-positions.stderr
@@ -519,7 +519,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |         true && let 1 = 1
    |                 ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -528,7 +528,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |         true && let 1 = 1
    |                 ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0658]: `match` is not allowed in a `const`
@@ -537,7 +537,7 @@ error[E0658]: `match` is not allowed in a `const`
 LL |         true && let 1 = 1
    |                 ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/49146
+   = note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
    = help: add `#![feature(const_if_match)]` to the crate attributes to enable
 
 error[E0308]: mismatched types
@@ -560,8 +560,6 @@ error[E0600]: cannot apply unary operator `-` to type `bool`
    |
 LL |     if -let 0 = 0 {}
    |        ^^^^^^^^^^ cannot apply unary operator `-`
-   |
-   = note: an implementation of `std::ops::Neg` might be missing for `bool`
 
 error[E0277]: the `?` operator can only be applied to values that implement `std::ops::Try`
   --> $DIR/disallowed-positions.rs:46:8
@@ -748,8 +746,6 @@ error[E0600]: cannot apply unary operator `-` to type `bool`
    |
 LL |     while -let 0 = 0 {}
    |           ^^^^^^^^^^ cannot apply unary operator `-`
-   |
-   = note: an implementation of `std::ops::Neg` might be missing for `bool`
 
 error[E0277]: the `?` operator can only be applied to values that implement `std::ops::Try`
   --> $DIR/disallowed-positions.rs:110:11
@@ -927,8 +923,6 @@ error[E0600]: cannot apply unary operator `-` to type `bool`
    |
 LL |     -let 0 = 0;
    |     ^^^^^^^^^^ cannot apply unary operator `-`
-   |
-   = note: an implementation of `std::ops::Neg` might be missing for `bool`
 
 error[E0277]: the `?` operator can only be applied to values that implement `std::ops::Try`
   --> $DIR/disallowed-positions.rs:183:5
diff --git a/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr b/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr
index c14a45af40..178e862728 100644
--- a/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr
+++ b/src/test/ui/rfc-2497-if-let-chains/feature-gate.stderr
@@ -13,7 +13,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if (let 0 = 1) {}
    |         ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -22,7 +22,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if (((let 0 = 1))) {}
    |           ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -31,7 +31,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if true && let 0 = 1 {}
    |                ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -40,7 +40,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let 0 = 1 && true {}
    |        ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -49,7 +49,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if (let 0 = 1) && true {}
    |         ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -58,7 +58,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if true && (let 0 = 1) {}
    |                 ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -67,7 +67,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if (let 0 = 1) && (let 0 = 1) {}
    |         ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -76,7 +76,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if (let 0 = 1) && (let 0 = 1) {}
    |                        ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -85,7 +85,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |        ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -94,7 +94,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                     ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -103,7 +103,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                                   ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -112,7 +112,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                                                ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -121,7 +121,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                                                             ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -130,7 +130,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     if let Range { start: _, end: _ } = (true..true) && false {}
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -139,7 +139,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while (let 0 = 1) {}
    |            ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -148,7 +148,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while (((let 0 = 1))) {}
    |              ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -157,7 +157,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while true && let 0 = 1 {}
    |                   ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -166,7 +166,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let 0 = 1 && true {}
    |           ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -175,7 +175,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while (let 0 = 1) && true {}
    |            ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -184,7 +184,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while true && (let 0 = 1) {}
    |                    ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -193,7 +193,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while (let 0 = 1) && (let 0 = 1) {}
    |            ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -202,7 +202,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while (let 0 = 1) && (let 0 = 1) {}
    |                           ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -211,7 +211,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |           ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -220,7 +220,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                        ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -229,7 +229,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                                      ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -238,7 +238,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                                                   ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -247,7 +247,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let 0 = 1 && let 1 = 2 && (let 2 = 3 && let 3 = 4 && let 4 = 5) {}
    |                                                                ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -256,7 +256,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     while let Range { start: _, end: _ } = (true..true) && false {}
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -265,7 +265,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     #[cfg(FALSE)] (let 0 = 1);
    |                    ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -274,7 +274,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     noop_expr!((let 0 = 1));
    |                 ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -283,7 +283,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     use_expr!((let 0 = 1 && 0 == 0));
    |                ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error[E0658]: `let` expressions in this position are experimental
@@ -292,7 +292,7 @@ error[E0658]: `let` expressions in this position are experimental
 LL |     use_expr!((let 0 = 1));
    |                ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/53667
+   = note: see issue #53667 <https://github.com/rust-lang/rust/issues/53667> for more information
    = help: add `#![feature(let_chains)]` to the crate attributes to enable
 
 error: `let` expressions are not supported here
diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr b/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
index 8d9571d09a..82099066a8 100644
--- a/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
+++ b/src/test/ui/rfc-2565-param-attrs/param-attrs-cfg.stderr
@@ -4,7 +4,7 @@ error: unused variable: `a`
 LL |     #[cfg(something)] a: i32,
    |                       ^ help: consider prefixing with an underscore: `_a`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/param-attrs-cfg.rs:5:9
    |
 LL | #![deny(unused_variables)]
diff --git a/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib-2.stderr b/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib-2.stderr
index 0869d7ad48..dbee5f316b 100644
--- a/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib-2.stderr
+++ b/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib-2.stderr
@@ -4,7 +4,7 @@ error[E0658]: the `#[link_ordinal]` attribute is an experimental feature
 LL |     #[link_ordinal(42)]
    |     ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/58713
+   = note: see issue #58713 <https://github.com/rust-lang/rust/issues/58713> for more information
    = help: add `#![feature(raw_dylib)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib.stderr b/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib.stderr
index 0ca9de28be..a69f677954 100644
--- a/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib.stderr
+++ b/src/test/ui/rfc-2627-raw-dylib/feature-gate-raw-dylib.stderr
@@ -4,7 +4,7 @@ error[E0658]: kind="raw-dylib" is unstable
 LL | #[link(name="foo", kind="raw-dylib")]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/58713
+   = note: see issue #58713 <https://github.com/rust-lang/rust/issues/58713> for more information
    = help: add `#![feature(raw_dylib)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs b/src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs
new file mode 100644
index 0000000000..194929fa28
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/assoc-type.rs
@@ -0,0 +1,28 @@
+// ignore-test
+
+// FIXME: This test should fail since, within a const impl of `Foo`, the bound on `Foo::Bar` should
+// require a const impl of `Add` for the associated type.
+
+#![allow(incomplete_features)]
+#![feature(const_trait_impl)]
+#![feature(const_fn)]
+
+struct NonConstAdd(i32);
+
+impl std::ops::Add for NonConstAdd {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self {
+        NonConstAdd(self.0 + rhs.0)
+    }
+}
+
+trait Foo {
+    type Bar: std::ops::Add;
+}
+
+impl const Foo for NonConstAdd {
+    type Bar = NonConstAdd;
+}
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs b/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
new file mode 100644
index 0000000000..8e6ef12810
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.rs
@@ -0,0 +1,30 @@
+#![allow(incomplete_features)]
+#![feature(const_trait_impl)]
+#![feature(const_fn)]
+
+pub trait Plus {
+    fn plus(self, rhs: Self) -> Self;
+}
+
+impl const Plus for i32 {
+    fn plus(self, rhs: Self) -> Self {
+        self + rhs
+    }
+}
+
+impl Plus for u32 {
+    fn plus(self, rhs: Self) -> Self {
+        self + rhs
+    }
+}
+
+pub const fn add_i32(a: i32, b: i32) -> i32 {
+    a.plus(b) // ok
+}
+
+pub const fn add_u32(a: u32, b: u32) -> u32 {
+    a.plus(b)
+    //~^ ERROR calls in constant functions are limited to constant functions
+}
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr b/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
new file mode 100644
index 0000000000..0c320d54c7
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-fail.stderr
@@ -0,0 +1,9 @@
+error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants
+  --> $DIR/call-const-trait-method-fail.rs:26:5
+   |
+LL |     a.plus(b)
+   |     ^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0015`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs b/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
new file mode 100644
index 0000000000..6a2112ea55
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/call-const-trait-method-pass.rs
@@ -0,0 +1,41 @@
+// run-pass
+
+#![allow(incomplete_features)]
+#![feature(const_trait_impl)]
+#![feature(const_fn)]
+
+struct Int(i32);
+
+impl const std::ops::Add for Int {
+    type Output = Int;
+
+    fn add(self, rhs: Self) -> Self {
+        Int(self.0.plus(rhs.0))
+    }
+}
+
+impl const PartialEq for Int {
+    fn eq(&self, rhs: &Self) -> bool {
+        self.0 == rhs.0
+    }
+}
+
+pub trait Plus {
+    fn plus(self, rhs: Self) -> Self;
+}
+
+impl const Plus for i32 {
+    fn plus(self, rhs: Self) -> Self {
+        self + rhs
+    }
+}
+
+pub const fn add_i32(a: i32, b: i32) -> i32 {
+    a.plus(b)
+}
+
+const ADD_INT: Int = Int(1i32) + Int(2i32);
+
+fn main() {
+    assert!(ADD_INT == Int(3i32));
+}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs b/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
new file mode 100644
index 0000000000..e148ad9a0e
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.rs
@@ -0,0 +1,33 @@
+#![allow(incomplete_features)]
+#![feature(const_trait_impl)]
+
+pub struct Int(i32);
+
+impl const std::ops::Add for i32 {
+    //~^ ERROR conflicting implementations of trait
+    //~| ERROR only traits defined in the current crate can be implemented for arbitrary types
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self {
+        self + rhs
+    }
+}
+
+impl std::ops::Add for Int {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self {
+        Int(self.0 + rhs.0)
+    }
+}
+
+impl const std::ops::Add for Int {
+    //~^ ERROR conflicting implementations of trait
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self {
+        Int(self.0 + rhs.0)
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr b/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
new file mode 100644
index 0000000000..b57472d959
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/const-and-non-const-impl.stderr
@@ -0,0 +1,34 @@
+error[E0119]: conflicting implementations of trait `std::ops::Add` for type `i32`:
+  --> $DIR/const-and-non-const-impl.rs:6:1
+   |
+LL | impl const std::ops::Add for i32 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: conflicting implementation in crate `core`:
+           - impl std::ops::Add for i32;
+
+error[E0119]: conflicting implementations of trait `std::ops::Add` for type `Int`:
+  --> $DIR/const-and-non-const-impl.rs:24:1
+   |
+LL | impl std::ops::Add for Int {
+   | -------------------------- first implementation here
+...
+LL | impl const std::ops::Add for Int {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Int`
+
+error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
+  --> $DIR/const-and-non-const-impl.rs:6:1
+   |
+LL | impl const std::ops::Add for i32 {
+   | ^^^^^^^^^^^-------------^^^^^---
+   | |          |                 |
+   | |          |                 `i32` is not defined in the current crate
+   | |          `i32` is not defined in the current crate
+   | impl doesn't use only types from inside the current crate
+   |
+   = note: define and implement a trait or new type instead
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0117, E0119.
+For more information about an error, try `rustc --explain E0117`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs b/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
new file mode 100644
index 0000000000..3278f35bad
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.rs
@@ -0,0 +1,16 @@
+#![allow(incomplete_features)]
+#![feature(const_trait_impl)]
+
+struct S;
+trait T {
+    fn foo();
+}
+
+fn non_const() {}
+
+impl const T for S {
+    fn foo() { non_const() }
+    //~^ ERROR can only call other `const fn`
+}
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr b/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
new file mode 100644
index 0000000000..7fe3a9fd85
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/const-check-fns-in-const-impl.stderr
@@ -0,0 +1,12 @@
+error[E0723]: can only call other `const fn` within a `const fn`, but `const non_const` is not stable as `const fn`
+  --> $DIR/const-check-fns-in-const-impl.rs:12:16
+   |
+LL |     fn foo() { non_const() }
+   |                ^^^^^^^^^^^
+   |
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
+   = help: add `#![feature(const_fn)]` to the crate attributes to enable
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0723`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr b/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr
index fbd3840cb1..a1e1c3249a 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr
+++ b/src/test/ui/rfc-2632-const-trait-impl/const-trait-bound-opt-out/feature-gate.stock.stderr
@@ -4,7 +4,7 @@ error[E0658]: `?const` on trait bounds is experimental
 LL | const fn get_assoc_const<S: ?const T>() -> i32 { <S as T>::CONST }
    |                             ^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67794
+   = note: see issue #67794 <https://github.com/rust-lang/rust/issues/67794> for more information
    = help: add `#![feature(const_trait_bound_opt_out)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr b/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
index b196f9ef57..d1ab99e33e 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
+++ b/src/test/ui/rfc-2632-const-trait-impl/feature-gate.gated.stderr
@@ -1,8 +1,8 @@
-error: const trait impls are not yet implemented
-  --> $DIR/feature-gate.rs:9:1
+error: fatal error triggered by #[rustc_error]
+  --> $DIR/feature-gate.rs:14:1
    |
-LL | impl const T for S {}
-   | ^^^^^^^^^^^^^^^^^^^^^
+LL | fn main() {}
+   | ^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs b/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs
index 49b6c0926c..d977243194 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs
+++ b/src/test/ui/rfc-2632-const-trait-impl/feature-gate.rs
@@ -3,11 +3,12 @@
 
 #![cfg_attr(gated, feature(const_trait_impl))]
 #![allow(incomplete_features)]
+#![feature(rustc_attrs)]
 
 struct S;
 trait T {}
 impl const T for S {}
 //[stock]~^ ERROR const trait impls are experimental
-//[stock,gated]~^^ ERROR const trait impls are not yet implemented
 
-fn main() {}
+#[rustc_error]
+fn main() {} //[gated]~ ERROR fatal error triggered by #[rustc_error]
diff --git a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr b/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
index 093946f859..724090e49c 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
+++ b/src/test/ui/rfc-2632-const-trait-impl/feature-gate.stock.stderr
@@ -1,18 +1,12 @@
 error[E0658]: const trait impls are experimental
-  --> $DIR/feature-gate.rs:9:6
+  --> $DIR/feature-gate.rs:10:6
    |
 LL | impl const T for S {}
    |      ^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/67792
+   = note: see issue #67792 <https://github.com/rust-lang/rust/issues/67792> for more information
    = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
-error: const trait impls are not yet implemented
-  --> $DIR/feature-gate.rs:9:1
-   |
-LL | impl const T for S {}
-   | ^^^^^^^^^^^^^^^^^^^^^
-
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs b/src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs
new file mode 100644
index 0000000000..7829ffe2a3
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/generic-bound.rs
@@ -0,0 +1,32 @@
+// run-pass
+
+#![allow(incomplete_features)]
+#![feature(const_trait_impl)]
+#![feature(const_fn)]
+
+use std::marker::PhantomData;
+
+struct S<T>(PhantomData<T>);
+
+impl<T> Copy for S<T> {}
+impl<T> Clone for S<T> {
+    fn clone(&self) -> Self {
+        S(PhantomData)
+    }
+}
+
+impl<T> const std::ops::Add for S<T> {
+    type Output = Self;
+
+    fn add(self, _: Self) -> Self {
+        S(std::marker::PhantomData)
+    }
+}
+
+const fn twice<T: std::ops::Add>(arg: S<T>) -> S<T> {
+    arg + arg
+}
+
+fn main() {
+    let _ = twice(S(PhantomData::<i32>));
+}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs b/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs
index 7f064c0c53..04123a532b 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs
+++ b/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.rs
@@ -8,10 +8,8 @@ trait T {}
 
 impl const S {}
 //~^ ERROR inherent impls cannot be `const`
-//~| ERROR const trait impls are not yet implemented
 
 impl const T {}
 //~^ ERROR inherent impls cannot be `const`
-//~| ERROR const trait impls are not yet implemented
 
 fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr b/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
index 508c6f4c74..3ea58a3728 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
+++ b/src/test/ui/rfc-2632-const-trait-impl/inherent-impl.stderr
@@ -2,29 +2,21 @@ error: inherent impls cannot be `const`
   --> $DIR/inherent-impl.rs:9:1
    |
 LL | impl const S {}
-   | ^^^^^^^^^^^^^^^
+   | ^^^^^-----^^^^^
+   |      |
+   |      `const` because of this
    |
    = note: only trait implementations may be annotated with `const`
 
 error: inherent impls cannot be `const`
-  --> $DIR/inherent-impl.rs:13:1
+  --> $DIR/inherent-impl.rs:12:1
    |
 LL | impl const T {}
-   | ^^^^^^^^^^^^^^^
+   | ^^^^^-----^^^^^
+   |      |
+   |      `const` because of this
    |
    = note: only trait implementations may be annotated with `const`
 
-error: const trait impls are not yet implemented
-  --> $DIR/inherent-impl.rs:9:1
-   |
-LL | impl const S {}
-   | ^^^^^^^^^^^^^^^
-
-error: const trait impls are not yet implemented
-  --> $DIR/inherent-impl.rs:13:1
-   |
-LL | impl const T {}
-   | ^^^^^^^^^^^^^^^
-
-error: aborting due to 4 previous errors
+error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/rfc-2632-const-trait-impl/stability.rs b/src/test/ui/rfc-2632-const-trait-impl/stability.rs
new file mode 100644
index 0000000000..03a6fb5150
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/stability.rs
@@ -0,0 +1,43 @@
+#![allow(incomplete_features)]
+#![feature(allow_internal_unstable)]
+#![feature(const_add)]
+#![feature(const_trait_impl)]
+#![feature(staged_api)]
+
+pub struct Int(i32);
+
+#[stable(feature = "rust1", since = "1.0.0")]
+#[rustc_const_stable(feature = "rust1", since = "1.0.0")]
+impl const std::ops::Sub for Int {
+    type Output = Self;
+
+    fn sub(self, rhs: Self) -> Self {
+        //~^ ERROR trait methods cannot be stable const fn
+        Int(self.0 - rhs.0)
+    }
+}
+
+#[rustc_const_unstable(feature = "const_add", issue = "none")]
+impl const std::ops::Add for Int {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self {
+        Int(self.0 + rhs.0)
+    }
+}
+
+#[stable(feature = "rust1", since = "1.0.0")]
+#[rustc_const_stable(feature = "rust1", since = "1.0.0")]
+pub const fn foo() -> Int {
+    Int(1i32) + Int(2i32)
+    //~^ ERROR can only call other `const fn` within a `const fn`
+}
+
+// ok
+#[stable(feature = "rust1", since = "1.0.0")]
+#[rustc_const_unstable(feature = "bar", issue = "none")]
+pub const fn bar() -> Int {
+    Int(1i32) + Int(2i32)
+}
+
+fn main() {}
diff --git a/src/test/ui/rfc-2632-const-trait-impl/stability.stderr b/src/test/ui/rfc-2632-const-trait-impl/stability.stderr
new file mode 100644
index 0000000000..1ecff62955
--- /dev/null
+++ b/src/test/ui/rfc-2632-const-trait-impl/stability.stderr
@@ -0,0 +1,24 @@
+error[E0723]: trait methods cannot be stable const fn
+  --> $DIR/stability.rs:14:5
+   |
+LL | /     fn sub(self, rhs: Self) -> Self {
+LL | |
+LL | |         Int(self.0 - rhs.0)
+LL | |     }
+   | |_____^
+   |
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
+   = help: add `#![feature(const_fn)]` to the crate attributes to enable
+
+error[E0723]: can only call other `const fn` within a `const fn`, but `const <Int as std::ops::Add>::add` is not stable as `const fn`
+  --> $DIR/stability.rs:32:5
+   |
+LL |     Int(1i32) + Int(2i32)
+   |     ^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
+   = help: add `#![feature(const_fn)]` to the crate attributes to enable
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0723`.
diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr
index 5281d57606..030deda9af 100644
--- a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr
+++ b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-embedded.stderr
@@ -4,7 +4,7 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
 LL |         WRAP_DOUBLY_INDIRECT_INLINE => { panic!("WRAP_DOUBLY_INDIRECT_INLINE matched itself"); }
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cant-hide-behind-doubly-indirect-embedded.rs:7:9
    |
 LL | #![warn(indirect_structural_match)]
diff --git a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr
index 5d601c2c00..e274d8ed08 100644
--- a/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr
+++ b/src/test/ui/rfc1445/cant-hide-behind-doubly-indirect-param.stderr
@@ -4,7 +4,7 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
 LL |         WRAP_DOUBLY_INDIRECT_PARAM => { panic!("WRAP_DOUBLY_INDIRECT_PARAM matched itself"); }
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cant-hide-behind-doubly-indirect-param.rs:7:9
    |
 LL | #![warn(indirect_structural_match)]
diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr
index 4ac19afa70..067677fbfb 100644
--- a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr
+++ b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-embedded.stderr
@@ -4,7 +4,7 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
 LL |         WRAP_INDIRECT_INLINE => { panic!("WRAP_INDIRECT_INLINE matched itself"); }
    |         ^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cant-hide-behind-indirect-struct-embedded.rs:7:9
    |
 LL | #![warn(indirect_structural_match)]
diff --git a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr
index 4000a47987..31b294f379 100644
--- a/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr
+++ b/src/test/ui/rfc1445/cant-hide-behind-indirect-struct-param.stderr
@@ -4,7 +4,7 @@ warning: to use a constant of type `NoDerive` in a pattern, `NoDerive` must be a
 LL |         WRAP_INDIRECT_PARAM => { panic!("WRAP_INDIRECT_PARAM matched itself"); }
    |         ^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/cant-hide-behind-indirect-struct-param.rs:7:9
    |
 LL | #![warn(indirect_structural_match)]
diff --git a/src/test/ui/rfc1445/feature-gate.no_gate.stderr b/src/test/ui/rfc1445/feature-gate.no_gate.stderr
index 42b81cd430..bd29404791 100644
--- a/src/test/ui/rfc1445/feature-gate.no_gate.stderr
+++ b/src/test/ui/rfc1445/feature-gate.no_gate.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'structural_match'
 LL | impl std::marker::StructuralPartialEq for Foo { }
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/31434
+   = note: see issue #31434 <https://github.com/rust-lang/rust/issues/31434> for more information
    = help: add `#![feature(structural_match)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'structural_match'
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'structural_match'
 LL | impl std::marker::StructuralEq for Foo { }
    |      ^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/31434
+   = note: see issue #31434 <https://github.com/rust-lang/rust/issues/31434> for more information
    = help: add `#![feature(structural_match)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr b/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr
index 0e158c2fda..c495c37f6a 100644
--- a/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr
+++ b/src/test/ui/rfc1445/issue-62307-match-ref-ref-forbidden-without-eq.stderr
@@ -4,7 +4,7 @@ warning: to use a constant of type `B` in a pattern, `B` must be annotated with
 LL |         RR_B1 => { println!("CLAIM RR0: {:?} matches {:?}", RR_B1, RR_B0); }
    |         ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-62307-match-ref-ref-forbidden-without-eq.rs:13:9
    |
 LL | #![warn(indirect_structural_match)]
diff --git a/src/test/ui/rfc1623-2.rs b/src/test/ui/rfc1623-2.rs
new file mode 100644
index 0000000000..35a2ef10c2
--- /dev/null
+++ b/src/test/ui/rfc1623-2.rs
@@ -0,0 +1,13 @@
+#![allow(dead_code)]
+
+fn non_elidable<'a, 'b>(a: &'a u8, b: &'b u8) -> &'a u8 {
+    a
+}
+
+// the boundaries of elision
+static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
+//~^ ERROR missing lifetime specifier [E0106]
+    &(non_elidable as fn(&u8, &u8) -> &u8);
+    //~^ ERROR missing lifetime specifier [E0106]
+
+fn main() {}
diff --git a/src/test/ui/rfc1623-2.stderr b/src/test/ui/rfc1623-2.stderr
new file mode 100644
index 0000000000..732bb61e6e
--- /dev/null
+++ b/src/test/ui/rfc1623-2.stderr
@@ -0,0 +1,29 @@
+error[E0106]: missing lifetime specifier
+  --> $DIR/rfc1623-2.rs:8:42
+   |
+LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
+   |                             ---  ---     ^ expected named lifetime parameter
+   |
+   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the type lifetime-generic with a new `'a` lifetime
+   |
+LL | static NON_ELIDABLE_FN: &for<'a> fn(&'a u8, &'a u8) -> &'a u8 =
+   |                          ^^^^^^^    ^^^^^^  ^^^^^^     ^^^
+
+error[E0106]: missing lifetime specifier
+  --> $DIR/rfc1623-2.rs:10:39
+   |
+LL |     &(non_elidable as fn(&u8, &u8) -> &u8);
+   |                          ---  ---     ^ expected named lifetime parameter
+   |
+   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the type lifetime-generic with a new `'a` lifetime
+   |
+LL |     &(non_elidable as for<'a> fn(&'a u8, &'a u8) -> &'a u8);
+   |                       ^^^^^^^    ^^^^^^  ^^^^^^     ^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/rfc1623.rs b/src/test/ui/rfc1623.rs
index ebb4d56af9..55f5d0b94d 100644
--- a/src/test/ui/rfc1623.rs
+++ b/src/test/ui/rfc1623.rs
@@ -4,11 +4,10 @@ fn non_elidable<'a, 'b>(a: &'a u8, b: &'b u8) -> &'a u8 {
     a
 }
 
-// the boundaries of elision
-static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
-//~^ ERROR missing lifetime specifier [E0106]
-    &(non_elidable as fn(&u8, &u8) -> &u8);
-    //~^ ERROR missing lifetime specifier [E0106]
+// The incorrect case without `for<'a>` is tested for in `rfc1623-2.rs`
+static NON_ELIDABLE_FN: &for<'a> fn(&'a u8, &'a u8) -> &'a u8 =
+    &(non_elidable as for<'a> fn(&'a u8, &'a u8) -> &'a u8);
+
 
 struct SomeStruct<'x, 'y, 'z: 'x> {
     foo: &'x Foo<'z>,
@@ -20,10 +19,12 @@ fn id<T>(t: T) -> T {
     t
 }
 
-static SOME_STRUCT: &SomeStruct = SomeStruct {
+static SOME_STRUCT: &SomeStruct = SomeStruct { //~ ERROR mismatched types
     foo: &Foo { bools: &[false, true] },
     bar: &Bar { bools: &[true, true] },
     f: &id,
+    //~^ ERROR type mismatch in function arguments
+    //~| ERROR type mismatch resolving
 };
 
 // very simple test for a 'static static with default lifetime
diff --git a/src/test/ui/rfc1623.stderr b/src/test/ui/rfc1623.stderr
index 5b665e1814..ca956004ef 100644
--- a/src/test/ui/rfc1623.stderr
+++ b/src/test/ui/rfc1623.stderr
@@ -1,19 +1,46 @@
-error[E0106]: missing lifetime specifier
-  --> $DIR/rfc1623.rs:8:42
+error[E0308]: mismatched types
+  --> $DIR/rfc1623.rs:22:35
    |
-LL | static NON_ELIDABLE_FN: &fn(&u8, &u8) -> &u8 =
-   |                                          ^ expected named lifetime parameter
+LL |   static SOME_STRUCT: &SomeStruct = SomeStruct {
+   |  ___________________________________^
+LL | |     foo: &Foo { bools: &[false, true] },
+LL | |     bar: &Bar { bools: &[true, true] },
+LL | |     f: &id,
+LL | |
+LL | |
+LL | | };
+   | |_^ expected `&SomeStruct<'static, 'static, 'static>`, found struct `SomeStruct`
    |
-   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+help: consider borrowing here
+   |
+LL | static SOME_STRUCT: &SomeStruct = &SomeStruct {
+LL |     foo: &Foo { bools: &[false, true] },
+LL |     bar: &Bar { bools: &[true, true] },
+LL |     f: &id,
+LL |
+LL |
+ ...
+
+error[E0631]: type mismatch in function arguments
+  --> $DIR/rfc1623.rs:25:8
+   |
+LL | fn id<T>(t: T) -> T {
+   | ------------------- found signature of `fn(_) -> _`
+...
+LL |     f: &id,
+   |        ^^^ expected signature of `for<'a, 'b> fn(&'a Foo<'b>) -> _`
+   |
+   = note: required for the cast to the object type `dyn for<'a, 'b> std::ops::Fn(&'a Foo<'b>) -> &'a Foo<'b>`
 
-error[E0106]: missing lifetime specifier
-  --> $DIR/rfc1623.rs:10:39
+error[E0271]: type mismatch resolving `for<'a, 'b> <fn(_) -> _ {id::<_>} as std::ops::FnOnce<(&'a Foo<'b>,)>>::Output == &'a Foo<'b>`
+  --> $DIR/rfc1623.rs:25:8
    |
-LL |     &(non_elidable as fn(&u8, &u8) -> &u8);
-   |                                       ^ expected named lifetime parameter
+LL |     f: &id,
+   |        ^^^ expected bound lifetime parameter 'a, found concrete lifetime
    |
-   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+   = note: required for the cast to the object type `dyn for<'a, 'b> std::ops::Fn(&'a Foo<'b>) -> &'a Foo<'b>`
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0106`.
+Some errors have detailed explanations: E0271, E0308, E0631.
+For more information about an error, try `rustc --explain E0271`.
diff --git a/src/test/ui/rust-2018/async-ident-allowed.stderr b/src/test/ui/rust-2018/async-ident-allowed.stderr
index 2394bff118..43fc3f5e33 100644
--- a/src/test/ui/rust-2018/async-ident-allowed.stderr
+++ b/src/test/ui/rust-2018/async-ident-allowed.stderr
@@ -4,7 +4,7 @@ error: `async` is a keyword in the 2018 edition
 LL |     let async = 3;
    |         ^^^^^ help: you can use a raw identifier to stay compatible: `r#async`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/async-ident-allowed.rs:3:9
    |
 LL | #![deny(rust_2018_compatibility)]
diff --git a/src/test/ui/rust-2018/async-ident.stderr b/src/test/ui/rust-2018/async-ident.stderr
index b149533775..6051c81f77 100644
--- a/src/test/ui/rust-2018/async-ident.stderr
+++ b/src/test/ui/rust-2018/async-ident.stderr
@@ -4,7 +4,7 @@ error: `async` is a keyword in the 2018 edition
 LL | fn async() {}
    |    ^^^^^ help: you can use a raw identifier to stay compatible: `r#async`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/async-ident.rs:2:9
    |
 LL | #![deny(keyword_idents)]
diff --git a/src/test/ui/rust-2018/dyn-keyword.stderr b/src/test/ui/rust-2018/dyn-keyword.stderr
index fa79df49fb..0fe11168c4 100644
--- a/src/test/ui/rust-2018/dyn-keyword.stderr
+++ b/src/test/ui/rust-2018/dyn-keyword.stderr
@@ -4,7 +4,7 @@ error: `dyn` is a keyword in the 2018 edition
 LL |     let dyn = ();
    |         ^^^ help: you can use a raw identifier to stay compatible: `r#dyn`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/dyn-keyword.rs:5:9
    |
 LL | #![deny(keyword_idents)]
diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr
index 412ebe1a9c..0b400786d3 100644
--- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr
+++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr
@@ -4,7 +4,7 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external c
 LL |     let _: <foo::Baz as ::foo::Foo>::Bar = ();
    |                         ^^^^^^^^^^ help: use `crate`: `crate::foo::Foo`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-lint-fully-qualified-paths.rs:4:9
    |
 LL | #![deny(absolute_paths_not_starting_with_crate)]
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr b/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr
index 3515d42260..45bc5dbc44 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr
+++ b/src/test/ui/rust-2018/edition-lint-infer-outlives-multispan.stderr
@@ -4,7 +4,7 @@ error: outlives requirements can be inferred
 LL |     struct TeeOutlivesAyIsDebugBee<'a, 'b, T: 'a + Debug + 'b> {
    |                                               ^^^^^     ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-lint-infer-outlives-multispan.rs:2:9
    |
 LL | #![deny(explicit_outlives_requirements)]
diff --git a/src/test/ui/rust-2018/edition-lint-infer-outlives.stderr b/src/test/ui/rust-2018/edition-lint-infer-outlives.stderr
index cddce94254..faa9f21e38 100644
--- a/src/test/ui/rust-2018/edition-lint-infer-outlives.stderr
+++ b/src/test/ui/rust-2018/edition-lint-infer-outlives.stderr
@@ -4,7 +4,7 @@ error: outlives requirements can be inferred
 LL |     struct TeeOutlivesAy<'a, T: 'a> {
    |                               ^^^^ help: remove this bound
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-lint-infer-outlives.rs:4:9
    |
 LL | #![deny(explicit_outlives_requirements)]
diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr
index 742203e998..d554cc2862 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr
+++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr
@@ -4,7 +4,7 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external c
 LL | use foo::{bar::{baz::{}}};
    |     ^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::foo::{bar::{baz::{}}}`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-lint-nested-empty-paths.rs:4:9
    |
 LL | #![deny(absolute_paths_not_starting_with_crate)]
diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr b/src/test/ui/rust-2018/edition-lint-nested-paths.stderr
index 6cd8e9acd1..040aa4a548 100644
--- a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr
+++ b/src/test/ui/rust-2018/edition-lint-nested-paths.stderr
@@ -4,7 +4,7 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external c
 LL | use foo::{a, b};
    |     ^^^^^^^^^^^ help: use `crate`: `crate::foo::{a, b}`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-lint-nested-paths.rs:4:9
    |
 LL | #![deny(absolute_paths_not_starting_with_crate)]
diff --git a/src/test/ui/rust-2018/edition-lint-paths.stderr b/src/test/ui/rust-2018/edition-lint-paths.stderr
index 4f1904a1f8..dd36d07da5 100644
--- a/src/test/ui/rust-2018/edition-lint-paths.stderr
+++ b/src/test/ui/rust-2018/edition-lint-paths.stderr
@@ -4,7 +4,7 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external c
 LL |     use ::bar::Bar;
    |         ^^^^^^^^^^ help: use `crate`: `crate::bar::Bar`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/edition-lint-paths.rs:5:9
    |
 LL | #![deny(absolute_paths_not_starting_with_crate)]
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
index 12a6110bfb..bb50ec3f57 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
+++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
@@ -4,7 +4,7 @@ error: unused extern crate
 LL | extern crate edition_lint_paths;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/extern-crate-idiomatic-in-2018.rs:9:9
    |
 LL | #![deny(rust_2018_idioms)]
diff --git a/src/test/ui/rust-2018/extern-crate-rename.stderr b/src/test/ui/rust-2018/extern-crate-rename.stderr
index 4e33b1e959..6ea762ed99 100644
--- a/src/test/ui/rust-2018/extern-crate-rename.stderr
+++ b/src/test/ui/rust-2018/extern-crate-rename.stderr
@@ -4,7 +4,7 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external c
 LL | use my_crate::foo;
    |     ^^^^^^^^^^^^^ help: use `crate`: `crate::my_crate::foo`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/extern-crate-rename.rs:8:9
    |
 LL | #![deny(absolute_paths_not_starting_with_crate)]
diff --git a/src/test/ui/rust-2018/extern-crate-submod.stderr b/src/test/ui/rust-2018/extern-crate-submod.stderr
index e0b61dd265..87a0d49267 100644
--- a/src/test/ui/rust-2018/extern-crate-submod.stderr
+++ b/src/test/ui/rust-2018/extern-crate-submod.stderr
@@ -4,7 +4,7 @@ error: absolute paths must start with `self`, `super`, `crate`, or an external c
 LL | use m::edition_lint_paths::foo;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `crate`: `crate::m::edition_lint_paths::foo`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/extern-crate-submod.rs:9:9
    |
 LL | #![deny(absolute_paths_not_starting_with_crate)]
diff --git a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr b/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
index 957a04cd98..2ef97e7f20 100644
--- a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
+++ b/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
@@ -7,7 +7,7 @@ LL | | extern crate edition_lint_paths;
    | |________________________________|
    |                                  help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-54400-unused-extern-crate-attr-span.rs:6:9
    |
 LL | #![deny(rust_2018_idioms)]
diff --git a/src/test/ui/rust-2018/macro-use-warned-against.rs b/src/test/ui/rust-2018/macro-use-warned-against.rs
index 6cd54aa68a..65400163dd 100644
--- a/src/test/ui/rust-2018/macro-use-warned-against.rs
+++ b/src/test/ui/rust-2018/macro-use-warned-against.rs
@@ -4,7 +4,7 @@
 
 #![warn(macro_use_extern_crate, unused)]
 
-#[macro_use] //~ WARN should be replaced at use sites with a `use` statement
+#[macro_use] //~ WARN should be replaced at use sites with a `use` item
 extern crate macro_use_warned_against;
 #[macro_use] //~ WARN unused `#[macro_use]`
 extern crate macro_use_warned_against2;
diff --git a/src/test/ui/rust-2018/macro-use-warned-against.stderr b/src/test/ui/rust-2018/macro-use-warned-against.stderr
index 944b56e957..ef00b86581 100644
--- a/src/test/ui/rust-2018/macro-use-warned-against.stderr
+++ b/src/test/ui/rust-2018/macro-use-warned-against.stderr
@@ -1,10 +1,10 @@
-warning: deprecated `#[macro_use]` directive used to import macros should be replaced at use sites with a `use` statement to import the macro instead
+warning: deprecated `#[macro_use]` attribute used to import macros should be replaced at use sites with a `use` item to import the macro instead
   --> $DIR/macro-use-warned-against.rs:7:1
    |
 LL | #[macro_use]
    | ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/macro-use-warned-against.rs:5:9
    |
 LL | #![warn(macro_use_extern_crate, unused)]
@@ -16,7 +16,7 @@ warning: unused `#[macro_use]` import
 LL | #[macro_use]
    | ^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/macro-use-warned-against.rs:5:33
    |
 LL | #![warn(macro_use_extern_crate, unused)]
diff --git a/src/test/ui/rust-2018/remove-extern-crate.stderr b/src/test/ui/rust-2018/remove-extern-crate.stderr
index 4777565452..8df93c56e9 100644
--- a/src/test/ui/rust-2018/remove-extern-crate.stderr
+++ b/src/test/ui/rust-2018/remove-extern-crate.stderr
@@ -4,7 +4,7 @@ warning: unused extern crate
 LL | extern crate core;
    | ^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/remove-extern-crate.rs:7:9
    |
 LL | #![warn(rust_2018_idioms)]
diff --git a/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr b/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr
index 5add50e87f..30f98d6df9 100644
--- a/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr
+++ b/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr
@@ -4,7 +4,7 @@ warning: absolute paths must start with `self`, `super`, `crate`, or an external
 LL |     #[foo]
    |     ^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/suggestions-not-always-applicable.rs:8:9
    |
 LL | #![warn(rust_2018_compatibility)]
@@ -12,6 +12,7 @@ LL | #![warn(rust_2018_compatibility)]
    = note: `#[warn(absolute_paths_not_starting_with_crate)]` implied by `#[warn(rust_2018_compatibility)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
+   = note: this warning originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: absolute paths must start with `self`, `super`, `crate`, or an external crate name in the 2018 edition
   --> $DIR/suggestions-not-always-applicable.rs:17:5
@@ -21,4 +22,5 @@ LL |     #[foo]
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
+   = note: this warning originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/rust-2018/try-ident.stderr b/src/test/ui/rust-2018/try-ident.stderr
index 29cc68c439..a5cb839ec0 100644
--- a/src/test/ui/rust-2018/try-ident.stderr
+++ b/src/test/ui/rust-2018/try-ident.stderr
@@ -4,7 +4,7 @@ warning: `try` is a keyword in the 2018 edition
 LL |     try();
    |     ^^^ help: you can use a raw identifier to stay compatible: `r#try`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/try-ident.rs:4:9
    |
 LL | #![warn(rust_2018_compatibility)]
diff --git a/src/test/ui/rust-2018/try-macro.stderr b/src/test/ui/rust-2018/try-macro.stderr
index eb65d41506..b92d5048b3 100644
--- a/src/test/ui/rust-2018/try-macro.stderr
+++ b/src/test/ui/rust-2018/try-macro.stderr
@@ -4,7 +4,7 @@ warning: `try` is a keyword in the 2018 edition
 LL |     try!(x);
    |     ^^^ help: you can use a raw identifier to stay compatible: `r#try`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/try-macro.rs:6:9
    |
 LL | #![warn(rust_2018_compatibility)]
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr
index 27b8d0e216..14c2582121 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr
+++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros-nested.stderr
@@ -17,6 +17,7 @@ LL | |             }
 LL |       m!();
    |       ----- in this macro invocation
    = help: use `self::std` to refer to this module unambiguously
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
index 44b34d2682..de7b79de95 100644
--- a/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
+++ b/src/test/ui/rust-2018/uniform-paths/ambiguity-macros.stderr
@@ -17,6 +17,7 @@ LL | |         }
 LL |   m!();
    |   ----- in this macro invocation
    = help: use `crate::std` to refer to this module unambiguously
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/sanitize-inline-always.rs b/src/test/ui/sanitize-inline-always.rs
new file mode 100644
index 0000000000..52dc557818
--- /dev/null
+++ b/src/test/ui/sanitize-inline-always.rs
@@ -0,0 +1,15 @@
+// check-pass
+
+#![feature(no_sanitize)]
+
+#[inline(always)]
+//~^ NOTE inlining requested here
+#[no_sanitize(address)]
+//~^ WARN will have no effect after inlining
+//~| NOTE on by default
+fn x() {
+}
+
+fn main() {
+    x()
+}
diff --git a/src/test/ui/sanitize-inline-always.stderr b/src/test/ui/sanitize-inline-always.stderr
new file mode 100644
index 0000000000..50b9474baa
--- /dev/null
+++ b/src/test/ui/sanitize-inline-always.stderr
@@ -0,0 +1,13 @@
+warning: `no_sanitize` will have no effect after inlining
+  --> $DIR/sanitize-inline-always.rs:7:1
+   |
+LL | #[no_sanitize(address)]
+   | ^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(inline_no_sanitize)]` on by default
+note: inlining requested here
+  --> $DIR/sanitize-inline-always.rs:5:1
+   |
+LL | #[inline(always)]
+   | ^^^^^^^^^^^^^^^^^
+
diff --git a/src/test/ui/sanitize/address.rs b/src/test/ui/sanitize/address.rs
new file mode 100644
index 0000000000..f8650cd86d
--- /dev/null
+++ b/src/test/ui/sanitize/address.rs
@@ -0,0 +1,20 @@
+// needs-sanitizer-support
+// only-x86_64
+//
+// compile-flags: -Z sanitizer=address -O -g
+//
+// run-fail
+// error-pattern: AddressSanitizer: stack-buffer-overflow
+// error-pattern: 'xs' (line 15) <== Memory access at offset
+
+#![feature(test)]
+
+use std::hint::black_box;
+
+fn main() {
+    let xs = [0, 1, 2, 3];
+    // Avoid optimizing everything out.
+    let xs = black_box(xs.as_ptr());
+    let code = unsafe { *xs.offset(4) };
+    std::process::exit(code);
+}
diff --git a/src/test/ui/sanitize/badfree.rs b/src/test/ui/sanitize/badfree.rs
new file mode 100644
index 0000000000..1ca082c8b4
--- /dev/null
+++ b/src/test/ui/sanitize/badfree.rs
@@ -0,0 +1,19 @@
+// needs-sanitizer-support
+// only-x86_64
+//
+// compile-flags: -Z sanitizer=address -O
+//
+// run-fail
+// error-pattern: AddressSanitizer: SEGV
+
+use std::ffi::c_void;
+
+extern "C" {
+    fn free(ptr: *mut c_void);
+}
+
+fn main() {
+    unsafe {
+        free(1 as *mut c_void);
+    }
+}
diff --git a/src/test/ui/sanitize-cfg.rs b/src/test/ui/sanitize/cfg.rs
similarity index 100%
rename from src/test/ui/sanitize-cfg.rs
rename to src/test/ui/sanitize/cfg.rs
diff --git a/src/test/ui/sanitizer-leak.rs b/src/test/ui/sanitize/leak.rs
similarity index 100%
rename from src/test/ui/sanitizer-leak.rs
rename to src/test/ui/sanitize/leak.rs
diff --git a/src/test/ui/sanitizer-memory.rs b/src/test/ui/sanitize/memory.rs
similarity index 100%
rename from src/test/ui/sanitizer-memory.rs
rename to src/test/ui/sanitize/memory.rs
diff --git a/src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs b/src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
new file mode 100644
index 0000000000..d0984bbe65
--- /dev/null
+++ b/src/test/ui/sanitize/new-llvm-pass-manager-thin-lto.rs
@@ -0,0 +1,27 @@
+// Regression test for sanitizer function instrumentation passes not
+// being run when compiling with new LLVM pass manager and ThinLTO.
+// Note: The issue occurred only on non-zero opt-level.
+//
+// min-llvm-version 9.0
+// needs-sanitizer-support
+// only-x86_64
+//
+// no-prefer-dynamic
+// revisions: opt0 opt1
+// compile-flags: -Znew-llvm-pass-manager=yes -Zsanitizer=address -Clto=thin
+//[opt0]compile-flags: -Copt-level=0
+//[opt1]compile-flags: -Copt-level=1
+// run-fail
+// error-pattern: ERROR: AddressSanitizer: stack-use-after-scope
+
+static mut P: *mut usize = std::ptr::null_mut();
+
+fn main() {
+    unsafe {
+        {
+            let mut x = 0;
+            P = &mut x;
+        }
+        std::ptr::write_volatile(P, 123);
+    }
+}
diff --git a/src/test/ui/sanitizer-unsupported-target.rs b/src/test/ui/sanitize/unsupported-target.rs
similarity index 100%
rename from src/test/ui/sanitizer-unsupported-target.rs
rename to src/test/ui/sanitize/unsupported-target.rs
diff --git a/src/test/ui/sanitizer-unsupported-target.stderr b/src/test/ui/sanitize/unsupported-target.stderr
similarity index 100%
rename from src/test/ui/sanitizer-unsupported-target.stderr
rename to src/test/ui/sanitize/unsupported-target.stderr
diff --git a/src/test/ui/sanitize/use-after-scope.rs b/src/test/ui/sanitize/use-after-scope.rs
new file mode 100644
index 0000000000..6a2067e157
--- /dev/null
+++ b/src/test/ui/sanitize/use-after-scope.rs
@@ -0,0 +1,18 @@
+// needs-sanitizer-support
+// only-x86_64
+//
+// compile-flags: -Zsanitizer=address
+// run-fail
+// error-pattern: ERROR: AddressSanitizer: stack-use-after-scope
+
+static mut P: *mut usize = std::ptr::null_mut();
+
+fn main() {
+    unsafe {
+        {
+            let mut x = 0;
+            P = &mut x;
+        }
+        std::ptr::write_volatile(P, 123);
+    }
+}
diff --git a/src/test/ui/sanitizer-address.rs b/src/test/ui/sanitizer-address.rs
deleted file mode 100644
index d27a30a2dc..0000000000
--- a/src/test/ui/sanitizer-address.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// needs-sanitizer-support
-// only-x86_64
-//
-// compile-flags: -Z sanitizer=address -O
-//
-// run-fail
-// error-pattern: AddressSanitizer: stack-buffer-overflow
-// error-pattern: 'xs' <== Memory access at offset
-
-#![feature(test)]
-
-use std::hint::black_box;
-use std::mem;
-
-fn main() {
-    let xs = [0, 1, 2, 3];
-    // Avoid optimizing everything out.
-    let xs = black_box(xs.as_ptr());
-    let code = unsafe { *xs.offset(4) };
-    std::process::exit(code);
-}
diff --git a/src/test/ui/save-analysis/issue-68621.rs b/src/test/ui/save-analysis/issue-68621.rs
new file mode 100644
index 0000000000..96af085c5b
--- /dev/null
+++ b/src/test/ui/save-analysis/issue-68621.rs
@@ -0,0 +1,17 @@
+// compile-flags: -Zsave-analysis
+
+#![feature(type_alias_impl_trait)]
+
+trait Trait {}
+
+trait Service {
+    type Future: Trait;
+}
+
+struct Struct;
+
+impl Service for Struct {
+    type Future = impl Trait; //~ ERROR: could not find defining uses
+}
+
+fn main() {}
diff --git a/src/test/ui/save-analysis/issue-68621.stderr b/src/test/ui/save-analysis/issue-68621.stderr
new file mode 100644
index 0000000000..2c5bbd7782
--- /dev/null
+++ b/src/test/ui/save-analysis/issue-68621.stderr
@@ -0,0 +1,8 @@
+error: could not find defining uses
+  --> $DIR/issue-68621.rs:14:5
+   |
+LL |     type Future = impl Trait;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr b/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
index 653ccb9db9..7948f7e9d6 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
+++ b/src/test/ui/self/arbitrary-self-types-not-object-safe.curr.stderr
@@ -1,8 +1,13 @@
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/arbitrary-self-types-not-object-safe.rs:33:32
    |
+LL | trait Foo {
+   |       --- this trait cannot be made into an object...
 LL |     fn foo(self: &Rc<Self>) -> usize;
-   |        --- method `foo`'s `self` parameter cannot be dispatched on
+   |                  ---------
+   |                  |
+   |                  ...because method `foo`'s `self` parameter cannot be dispatched on
+   |                  help: consider changing method `foo`'s `self` parameter to be `&self`: `&Self`
 ...
 LL |     let x = Rc::new(5usize) as Rc<dyn Foo>;
    |                                ^^^^^^^^^^^ the trait `Foo` cannot be made into an object
@@ -10,8 +15,13 @@ LL |     let x = Rc::new(5usize) as Rc<dyn Foo>;
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/arbitrary-self-types-not-object-safe.rs:33:13
    |
+LL | trait Foo {
+   |       --- this trait cannot be made into an object...
 LL |     fn foo(self: &Rc<Self>) -> usize;
-   |        --- method `foo`'s `self` parameter cannot be dispatched on
+   |                  ---------
+   |                  |
+   |                  ...because method `foo`'s `self` parameter cannot be dispatched on
+   |                  help: consider changing method `foo`'s `self` parameter to be `&self`: `&Self`
 ...
 LL |     let x = Rc::new(5usize) as Rc<dyn Foo>;
    |             ^^^^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
diff --git a/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr b/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
index 33f1fa2e51..74e76b8265 100644
--- a/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
+++ b/src/test/ui/self/arbitrary-self-types-not-object-safe.object_safe_for_dispatch.stderr
@@ -1,8 +1,13 @@
 error[E0038]: the trait `Foo` cannot be made into an object
   --> $DIR/arbitrary-self-types-not-object-safe.rs:33:13
    |
+LL | trait Foo {
+   |       --- this trait cannot be made into an object...
 LL |     fn foo(self: &Rc<Self>) -> usize;
-   |        --- method `foo`'s `self` parameter cannot be dispatched on
+   |                  ---------
+   |                  |
+   |                  ...because method `foo`'s `self` parameter cannot be dispatched on
+   |                  help: consider changing method `foo`'s `self` parameter to be `&self`: `&Self`
 ...
 LL |     let x = Rc::new(5usize) as Rc<dyn Foo>;
    |             ^^^^^^^^^^^^^^^ the trait `Foo` cannot be made into an object
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.nll.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.nll.stderr
index b76966e869..73766c31b9 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.nll.stderr
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.nll.stderr
@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait.rs:8:31
+  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait.rs:6:31
    |
 LL |     fn f(self: Pin<&Self>) -> impl Clone { self }
    |                    -          ^^^^^^^^^^ opaque type requires that `'1` must outlive `'static`
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
index ad8959727c..5054568b18 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.rs
@@ -1,5 +1,3 @@
-// compile-fail
-
 use std::pin::Pin;
 
 struct Foo;
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
index 9f54149951..47ab6fff83 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_impl_trait.stderr
@@ -1,17 +1,17 @@
 error: cannot infer an appropriate lifetime
-  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait.rs:8:44
+  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait.rs:6:44
    |
 LL |     fn f(self: Pin<&Self>) -> impl Clone { self }
    |                               ----------   ^^^^ ...but this borrow...
    |                               |
    |                               this return type evaluates to the `'static` lifetime...
    |
-note: ...can't outlive the anonymous lifetime #1 defined on the method body at 8:5
-  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait.rs:8:5
+note: ...can't outlive the anonymous lifetime #1 defined on the method body at 6:5
+  --> $DIR/arbitrary_self_types_pin_lifetime_impl_trait.rs:6:5
    |
 LL |     fn f(self: Pin<&Self>) -> impl Clone { self }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: you can add a bound to the return type to make it last less than `'static` and match the anonymous lifetime #1 defined on the method body at 8:5
+help: you can add a bound to the return type to make it last less than `'static` and match the anonymous lifetime #1 defined on the method body at 6:5
    |
 LL |     fn f(self: Pin<&Self>) -> impl Clone + '_ { self }
    |                               ^^^^^^^^^^^^^^^
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.nll.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.nll.stderr
index b05940fd27..6afcf24cd3 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.nll.stderr
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch-async.nll.stderr
@@ -1,16 +1,8 @@
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:8:45
-   |
-LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
-   |                                             ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
-
 error: lifetime may not live long enough
   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:8:52
    |
 LL |     async fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
-   |                          -         -               ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |                          -         -               ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
    |                          |         |
    |                          |         let's call the lifetime of this reference `'1`
    |                          let's call the lifetime of this reference `'2`
@@ -19,28 +11,19 @@ error: lifetime may not live long enough
   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:11:75
    |
 LL |     async fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
-   |                          -          -                                     ^^^^^^^^^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |                          -          -                                     ^^^^^^^^^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
    |                          |          |
    |                          |          let's call the lifetime of this reference `'1`
    |                          let's call the lifetime of this reference `'2`
 
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:17:58
-   |
-LL |     async fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
-   |                                                          ^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
-
 error: lifetime may not live long enough
   --> $DIR/arbitrary_self_types_pin_lifetime_mismatch-async.rs:17:64
    |
 LL |     async fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
-   |                  --              -                             ^^^ function was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
+   |                  --              -                             ^^^ method was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
    |                  |               |
    |                  |               let's call the lifetime of this reference `'1`
    |                  lifetime `'a` defined here
 
-error: aborting due to 5 previous errors
+error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.nll.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.nll.stderr
index 8a0f1a804a..a659e44878 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.nll.stderr
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.nll.stderr
@@ -1,26 +1,26 @@
 error: lifetime may not live long enough
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:8:46
+  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:6:46
    |
 LL |     fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
-   |                    -         -               ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |                    -         -               ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
    |                    |         |
    |                    |         let's call the lifetime of this reference `'1`
    |                    let's call the lifetime of this reference `'2`
 
 error: lifetime may not live long enough
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:10:69
+  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:8:69
    |
 LL |     fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
-   |                    -          -                                     ^^^^^^^^^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |                    -          -                                     ^^^^^^^^^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
    |                    |          |
    |                    |          let's call the lifetime of this reference `'1`
    |                    let's call the lifetime of this reference `'2`
 
 error: lifetime may not live long enough
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:15:58
+  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:13:58
    |
 LL |     fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
-   |            --  ---- has type `std::pin::Pin<&'1 Foo>`    ^^^ function was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
+   |            --  ---- has type `std::pin::Pin<&'1 Foo>`    ^^^ method was supposed to return data with lifetime `'1` but it is returning data with lifetime `'a`
    |            |
    |            lifetime `'a` defined here
 
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
index fc5f94201b..8291e44080 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.rs
@@ -1,5 +1,3 @@
-// compile-fail
-
 use std::pin::Pin;
 
 struct Foo;
diff --git a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
index f3a7d14720..6bb7ad7cdc 100644
--- a/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
+++ b/src/test/ui/self/arbitrary_self_types_pin_lifetime_mismatch.stderr
@@ -1,5 +1,5 @@
 error[E0623]: lifetime mismatch
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:8:46
+  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:6:46
    |
 LL |     fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
    |                              ----     ----   ^ ...but data from `f` is returned here
@@ -7,7 +7,7 @@ LL |     fn a(self: Pin<&Foo>, f: &Foo) -> &Foo { f }
    |                              this parameter and the return type are declared with different lifetimes...
 
 error[E0623]: lifetime mismatch
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:10:76
+  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:8:76
    |
 LL |     fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self, f) }
    |                               ----              -----------------          ^ ...but data from `f` is returned here
@@ -15,7 +15,7 @@ LL |     fn c(self: Pin<&Self>, f: &Foo, g: &Foo) -> (Pin<&Foo>, &Foo) { (self,
    |                               this parameter and the return type are declared with different lifetimes...
 
 error[E0623]: lifetime mismatch
-  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:15:58
+  --> $DIR/arbitrary_self_types_pin_lifetime_mismatch.rs:13:58
    |
 LL |     fn bar<'a>(self: Alias<&Self>, arg: &'a ()) -> &() { arg }
    |                                         ------     ---   ^^^ ...but data from `arg` is returned here
diff --git a/src/test/ui/self/elision/lt-ref-self-async.nll.stderr b/src/test/ui/self/elision/lt-ref-self-async.nll.stderr
index 8dd823a220..57d0929c50 100644
--- a/src/test/ui/self/elision/lt-ref-self-async.nll.stderr
+++ b/src/test/ui/self/elision/lt-ref-self-async.nll.stderr
@@ -1,11 +1,3 @@
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/lt-ref-self-async.rs:12:42
-   |
-LL |     async fn ref_self(&self, f: &u32) -> &u32 {
-   |                                          ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#23r
-
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self-async.rs:13:9
    |
@@ -14,15 +6,7 @@ LL |     async fn ref_self(&self, f: &u32) -> &u32 {
    |                       |
    |                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/lt-ref-self-async.rs:18:48
-   |
-LL |     async fn ref_Self(self: &Self, f: &u32) -> &u32 {
-   |                                                ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#23r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self-async.rs:19:9
@@ -32,15 +16,7 @@ LL |     async fn ref_Self(self: &Self, f: &u32) -> &u32 {
    |                             |
    |                             let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/lt-ref-self-async.rs:22:57
-   |
-LL |     async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
-   |                                                         ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#23r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self-async.rs:23:9
@@ -50,15 +26,7 @@ LL |     async fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
    |                                     |
    |                                     let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/lt-ref-self-async.rs:26:57
-   |
-LL |     async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
-   |                                                         ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#23r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self-async.rs:27:9
@@ -68,15 +36,7 @@ LL |     async fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
    |                                     |
    |                                     let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/lt-ref-self-async.rs:30:66
-   |
-LL |     async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
-   |                                                                  ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#23r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self-async.rs:31:9
@@ -86,15 +46,7 @@ LL |     async fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
    |                                             |
    |                                             let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/lt-ref-self-async.rs:34:62
-   |
-LL |     async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
-   |                                                              ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#23r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self-async.rs:35:9
@@ -104,8 +56,7 @@ LL |     async fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
    |                                         |
    |                                         let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
-error: aborting due to 12 previous errors
+error: aborting due to 6 previous errors
 
-For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/self/elision/lt-ref-self.nll.stderr b/src/test/ui/self/elision/lt-ref-self.nll.stderr
index a0c56f2221..b51b5a0ba3 100644
--- a/src/test/ui/self/elision/lt-ref-self.nll.stderr
+++ b/src/test/ui/self/elision/lt-ref-self.nll.stderr
@@ -6,7 +6,7 @@ LL |     fn ref_self(&self, f: &u32) -> &u32 {
    |                 |
    |                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self.rs:17:9
@@ -16,7 +16,7 @@ LL |     fn ref_Self(self: &Self, f: &u32) -> &u32 {
    |                       |
    |                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self.rs:21:9
@@ -26,7 +26,7 @@ LL |     fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self.rs:25:9
@@ -36,7 +36,7 @@ LL |     fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self.rs:29:9
@@ -46,7 +46,7 @@ LL |     fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/lt-ref-self.rs:33:9
@@ -56,7 +56,7 @@ LL |     fn box_pin_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
    |                                   |
    |                                   let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/self/elision/ref-mut-self-async.nll.stderr b/src/test/ui/self/elision/ref-mut-self-async.nll.stderr
index 768f532c18..46e828390b 100644
--- a/src/test/ui/self/elision/ref-mut-self-async.nll.stderr
+++ b/src/test/ui/self/elision/ref-mut-self-async.nll.stderr
@@ -1,11 +1,3 @@
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-self-async.rs:12:46
-   |
-LL |     async fn ref_self(&mut self, f: &u32) -> &u32 {
-   |                                              ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
-
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self-async.rs:13:9
    |
@@ -14,15 +6,7 @@ LL |     async fn ref_self(&mut self, f: &u32) -> &u32 {
    |                       |
    |                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-self-async.rs:18:52
-   |
-LL |     async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
-   |                                                    ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self-async.rs:19:9
@@ -32,15 +16,7 @@ LL |     async fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
    |                             |
    |                             let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-self-async.rs:22:61
-   |
-LL |     async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
-   |                                                             ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self-async.rs:23:9
@@ -50,15 +26,7 @@ LL |     async fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
    |                                     |
    |                                     let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-self-async.rs:26:61
-   |
-LL |     async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
-   |                                                             ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self-async.rs:27:9
@@ -68,15 +36,7 @@ LL |     async fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
    |                                     |
    |                                     let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-self-async.rs:30:70
-   |
-LL |     async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
-   |                                                                      ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self-async.rs:31:9
@@ -86,15 +46,7 @@ LL |     async fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
    |                                             |
    |                                             let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-self-async.rs:34:70
-   |
-LL |     async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
-   |                                                                      ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self-async.rs:35:9
@@ -104,8 +56,7 @@ LL |     async fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
    |                                             |
    |                                             let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
-error: aborting due to 12 previous errors
+error: aborting due to 6 previous errors
 
-For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/self/elision/ref-mut-self.nll.stderr b/src/test/ui/self/elision/ref-mut-self.nll.stderr
index 4e7d7f521d..6c8c030e5f 100644
--- a/src/test/ui/self/elision/ref-mut-self.nll.stderr
+++ b/src/test/ui/self/elision/ref-mut-self.nll.stderr
@@ -6,7 +6,7 @@ LL |     fn ref_self(&mut self, f: &u32) -> &u32 {
    |                 |
    |                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self.rs:17:9
@@ -16,7 +16,7 @@ LL |     fn ref_Self(self: &mut Self, f: &u32) -> &u32 {
    |                       |
    |                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self.rs:21:9
@@ -26,7 +26,7 @@ LL |     fn box_ref_Self(self: Box<&mut Self>, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self.rs:25:9
@@ -36,7 +36,7 @@ LL |     fn pin_ref_Self(self: Pin<&mut Self>, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self.rs:29:9
@@ -46,7 +46,7 @@ LL |     fn box_box_ref_Self(self: Box<Box<&mut Self>>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-self.rs:33:9
@@ -56,7 +56,7 @@ LL |     fn box_pin_ref_Self(self: Box<Pin<&mut Self>>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/self/elision/ref-mut-struct-async.nll.stderr b/src/test/ui/self/elision/ref-mut-struct-async.nll.stderr
index 9e26e411d3..9934080079 100644
--- a/src/test/ui/self/elision/ref-mut-struct-async.nll.stderr
+++ b/src/test/ui/self/elision/ref-mut-struct-async.nll.stderr
@@ -1,11 +1,3 @@
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-struct-async.rs:12:56
-   |
-LL |     async fn ref_Struct(self: &mut Struct, f: &u32) -> &u32 {
-   |                                                        ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
-
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct-async.rs:13:9
    |
@@ -14,15 +6,7 @@ LL |     async fn ref_Struct(self: &mut Struct, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-struct-async.rs:16:65
-   |
-LL |     async fn box_ref_Struct(self: Box<&mut Struct>, f: &u32) -> &u32 {
-   |                                                                 ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct-async.rs:17:9
@@ -32,15 +16,7 @@ LL |     async fn box_ref_Struct(self: Box<&mut Struct>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-struct-async.rs:20:65
-   |
-LL |     async fn pin_ref_Struct(self: Pin<&mut Struct>, f: &u32) -> &u32 {
-   |                                                                 ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct-async.rs:21:9
@@ -50,15 +26,7 @@ LL |     async fn pin_ref_Struct(self: Pin<&mut Struct>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-struct-async.rs:24:74
-   |
-LL |     async fn box_box_ref_Struct(self: Box<Box<&mut Struct>>, f: &u32) -> &u32 {
-   |                                                                          ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct-async.rs:25:9
@@ -68,15 +36,7 @@ LL |     async fn box_box_ref_Struct(self: Box<Box<&mut Struct>>, f: &u32) -> &u
    |                                               |
    |                                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-mut-struct-async.rs:28:74
-   |
-LL |     async fn box_pin_ref_Struct(self: Box<Pin<&mut Struct>>, f: &u32) -> &u32 {
-   |                                                                          ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct-async.rs:29:9
@@ -86,8 +46,7 @@ LL |     async fn box_pin_ref_Struct(self: Box<Pin<&mut Struct>>, f: &u32) -> &u
    |                                               |
    |                                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
-error: aborting due to 10 previous errors
+error: aborting due to 5 previous errors
 
-For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/self/elision/ref-mut-struct.nll.stderr b/src/test/ui/self/elision/ref-mut-struct.nll.stderr
index cec7034cd9..e3886444db 100644
--- a/src/test/ui/self/elision/ref-mut-struct.nll.stderr
+++ b/src/test/ui/self/elision/ref-mut-struct.nll.stderr
@@ -6,7 +6,7 @@ LL |     fn ref_Struct(self: &mut Struct, f: &u32) -> &u32 {
    |                         |
    |                         let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct.rs:15:9
@@ -16,7 +16,7 @@ LL |     fn box_ref_Struct(self: Box<&mut Struct>, f: &u32) -> &u32 {
    |                                 |
    |                                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct.rs:19:9
@@ -26,7 +26,7 @@ LL |     fn pin_ref_Struct(self: Pin<&mut Struct>, f: &u32) -> &u32 {
    |                                 |
    |                                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct.rs:23:9
@@ -36,7 +36,7 @@ LL |     fn box_box_ref_Struct(self: Box<Box<&mut Struct>>, f: &u32) -> &u32 {
    |                                         |
    |                                         let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-mut-struct.rs:27:9
@@ -46,7 +46,7 @@ LL |     fn box_pin_ref_Struct(self: Box<Pin<&mut Struct>>, f: &u32) -> &u32 {
    |                                         |
    |                                         let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/self/elision/ref-self-async.nll.stderr b/src/test/ui/self/elision/ref-self-async.nll.stderr
index 46468b693e..541e495432 100644
--- a/src/test/ui/self/elision/ref-self-async.nll.stderr
+++ b/src/test/ui/self/elision/ref-self-async.nll.stderr
@@ -4,7 +4,7 @@ error[E0658]: `Wrap<&Struct, Struct>` cannot be used as the type of `self` witho
 LL |     async fn wrap_ref_Self_Self(self: Wrap<&Self, Self>, f: &u8) -> &u8 {
    |                                       ^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44874
+   = note: see issue #44874 <https://github.com/rust-lang/rust/issues/44874> for more information
    = help: add `#![feature(arbitrary_self_types)]` to the crate attributes to enable
    = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
 
diff --git a/src/test/ui/self/elision/ref-self.nll.stderr b/src/test/ui/self/elision/ref-self.nll.stderr
index 20045be052..ecac1ce337 100644
--- a/src/test/ui/self/elision/ref-self.nll.stderr
+++ b/src/test/ui/self/elision/ref-self.nll.stderr
@@ -6,7 +6,7 @@ LL |     fn ref_self(&self, f: &u32) -> &u32 {
    |                 |
    |                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-self.rs:27:9
@@ -16,7 +16,7 @@ LL |     fn ref_Self(self: &Self, f: &u32) -> &u32 {
    |                       |
    |                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-self.rs:31:9
@@ -26,7 +26,7 @@ LL |     fn box_ref_Self(self: Box<&Self>, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-self.rs:35:9
@@ -36,7 +36,7 @@ LL |     fn pin_ref_Self(self: Pin<&Self>, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-self.rs:39:9
@@ -46,7 +46,7 @@ LL |     fn box_box_ref_Self(self: Box<Box<&Self>>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-self.rs:43:9
@@ -56,7 +56,7 @@ LL |     fn box_pin_ref_Self(self: Box<Pin<&Self>>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-self.rs:47:9
@@ -66,7 +66,7 @@ LL |     fn wrap_ref_Self_Self(self: Wrap<&Self, Self>, f: &u8) -> &u8 {
    |                                      |
    |                                      let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/self/elision/ref-struct-async.nll.stderr b/src/test/ui/self/elision/ref-struct-async.nll.stderr
index cbf051205e..bcbf79bc03 100644
--- a/src/test/ui/self/elision/ref-struct-async.nll.stderr
+++ b/src/test/ui/self/elision/ref-struct-async.nll.stderr
@@ -1,11 +1,3 @@
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-struct-async.rs:12:52
-   |
-LL |     async fn ref_Struct(self: &Struct, f: &u32) -> &u32 {
-   |                                                    ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
-
 error: lifetime may not live long enough
   --> $DIR/ref-struct-async.rs:13:9
    |
@@ -14,15 +6,7 @@ LL |     async fn ref_Struct(self: &Struct, f: &u32) -> &u32 {
    |                               |
    |                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-struct-async.rs:16:61
-   |
-LL |     async fn box_ref_Struct(self: Box<&Struct>, f: &u32) -> &u32 {
-   |                                                             ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct-async.rs:17:9
@@ -32,15 +16,7 @@ LL |     async fn box_ref_Struct(self: Box<&Struct>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-struct-async.rs:20:61
-   |
-LL |     async fn pin_ref_Struct(self: Pin<&Struct>, f: &u32) -> &u32 {
-   |                                                             ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct-async.rs:21:9
@@ -50,15 +26,7 @@ LL |     async fn pin_ref_Struct(self: Pin<&Struct>, f: &u32) -> &u32 {
    |                                       |
    |                                       let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-struct-async.rs:24:70
-   |
-LL |     async fn box_box_ref_Struct(self: Box<Box<&Struct>>, f: &u32) -> &u32 {
-   |                                                                      ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct-async.rs:25:9
@@ -68,15 +36,7 @@ LL |     async fn box_box_ref_Struct(self: Box<Box<&Struct>>, f: &u32) -> &u32 {
    |                                               |
    |                                               let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
-
-error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
-  --> $DIR/ref-struct-async.rs:28:66
-   |
-LL |     async fn box_pin_Struct(self: Box<Pin<&Struct>>, f: &u32) -> &u32 {
-   |                                                                  ^^^^
-   |
-   = note: hidden type `impl std::future::Future` captures lifetime '_#15r
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct-async.rs:29:9
@@ -86,8 +46,7 @@ LL |     async fn box_pin_Struct(self: Box<Pin<&Struct>>, f: &u32) -> &u32 {
    |                                           |
    |                                           let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
-error: aborting due to 10 previous errors
+error: aborting due to 5 previous errors
 
-For more information about this error, try `rustc --explain E0700`.
diff --git a/src/test/ui/self/elision/ref-struct.nll.stderr b/src/test/ui/self/elision/ref-struct.nll.stderr
index 31bb9f49a6..39e7631f31 100644
--- a/src/test/ui/self/elision/ref-struct.nll.stderr
+++ b/src/test/ui/self/elision/ref-struct.nll.stderr
@@ -6,7 +6,7 @@ LL |     fn ref_Struct(self: &Struct, f: &u32) -> &u32 {
    |                         |
    |                         let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct.rs:15:9
@@ -16,7 +16,7 @@ LL |     fn box_ref_Struct(self: Box<&Struct>, f: &u32) -> &u32 {
    |                                 |
    |                                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct.rs:19:9
@@ -26,7 +26,7 @@ LL |     fn pin_ref_Struct(self: Pin<&Struct>, f: &u32) -> &u32 {
    |                                 |
    |                                 let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct.rs:23:9
@@ -36,7 +36,7 @@ LL |     fn box_box_ref_Struct(self: Box<Box<&Struct>>, f: &u32) -> &u32 {
    |                                         |
    |                                         let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: lifetime may not live long enough
   --> $DIR/ref-struct.rs:27:9
@@ -46,7 +46,7 @@ LL |     fn box_pin_Struct(self: Box<Pin<&Struct>>, f: &u32) -> &u32 {
    |                                     |
    |                                     let's call the lifetime of this reference `'2`
 LL |         f
-   |         ^ function was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
+   |         ^ method was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr b/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
index 28a7b68a68..37873031da 100644
--- a/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
+++ b/src/test/ui/self/point-at-arbitrary-self-type-trait-method.stderr
@@ -2,16 +2,14 @@ error[E0599]: no method named `foo` found for struct `A` in the current scope
   --> $DIR/point-at-arbitrary-self-type-trait-method.rs:9:7
    |
 LL | trait B { fn foo(self: Box<Self>); }
-   |              --- the method is available for `std::boxed::Box<A>` here
+   |              ---       --------- the method might not be found because of this arbitrary self type
+   |              |
+   |              the method is available for `std::boxed::Box<A>` here
 LL | struct A;
    | --------- method `foo` not found for this
 ...
 LL |     A.foo()
    |       ^^^ method not found in `A`
-   |
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `foo`, perhaps you need to implement it:
-           candidate #1: `B`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/self/self-infer.rs b/src/test/ui/self/self-infer.rs
index 77c8052123..0956f2a569 100644
--- a/src/test/ui/self/self-infer.rs
+++ b/src/test/ui/self/self-infer.rs
@@ -2,9 +2,7 @@ struct S;
 
 impl S {
     fn f(self: _) {} //~ERROR the type placeholder `_` is not allowed within types on item sig
-    //~^ ERROR the type placeholder `_` is not allowed within types on item sig
     fn g(self: &_) {} //~ERROR the type placeholder `_` is not allowed within types on item sig
-    //~^ ERROR the type placeholder `_` is not allowed within types on item sig
 }
 
 fn main() {}
diff --git a/src/test/ui/self/self-infer.stderr b/src/test/ui/self/self-infer.stderr
index d6bf8b44d6..1475b212b5 100644
--- a/src/test/ui/self/self-infer.stderr
+++ b/src/test/ui/self/self-infer.stderr
@@ -1,9 +1,3 @@
-error[E0121]: the type placeholder `_` is not allowed within types on item signatures
-  --> $DIR/self-infer.rs:4:16
-   |
-LL |     fn f(self: _) {}
-   |                ^ not allowed in type signatures
-
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
   --> $DIR/self-infer.rs:4:16
    |
@@ -16,13 +10,7 @@ LL |     fn f<T>(self: T) {}
    |         ^^^       ^
 
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
-  --> $DIR/self-infer.rs:6:17
-   |
-LL |     fn g(self: &_) {}
-   |                 ^ not allowed in type signatures
-
-error[E0121]: the type placeholder `_` is not allowed within types on item signatures
-  --> $DIR/self-infer.rs:6:17
+  --> $DIR/self-infer.rs:5:17
    |
 LL |     fn g(self: &_) {}
    |                 ^ not allowed in type signatures
@@ -32,6 +20,6 @@ help: use type parameters instead
 LL |     fn g<T>(self: &T) {}
    |         ^^^        ^
 
-error: aborting due to 4 previous errors
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0121`.
diff --git a/src/test/ui/shadow-bool.rs b/src/test/ui/shadow-bool.rs
new file mode 100644
index 0000000000..f290a329ea
--- /dev/null
+++ b/src/test/ui/shadow-bool.rs
@@ -0,0 +1,18 @@
+// check-pass
+
+mod bar {
+    pub trait QueryId {
+        const SOME_PROPERTY: bool;
+    }
+}
+
+use bar::QueryId;
+
+#[allow(non_camel_case_types)]
+pub struct bool;
+
+impl QueryId for bool {
+    const SOME_PROPERTY: core::primitive::bool = true;
+}
+
+fn main() {}
diff --git a/src/test/ui/single-use-lifetime/fn-types.stderr b/src/test/ui/single-use-lifetime/fn-types.stderr
index bec24be07a..584c889506 100644
--- a/src/test/ui/single-use-lifetime/fn-types.stderr
+++ b/src/test/ui/single-use-lifetime/fn-types.stderr
@@ -6,7 +6,7 @@ LL |   a: for<'a> fn(&'a u32),
    |          |
    |          this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/fn-types.rs:1:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr
index ef118a22cc..b251e8a438 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr
+++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr
@@ -7,7 +7,7 @@ LL | fn a(x: &'a u32, y: &'b u32) {
    |          this lifetime is only used here
    |          help: elide the single-use lifetime
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/one-use-in-fn-argument-in-band.rs:4:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr
index 25aa8bb6fb..f78970ac0a 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr
+++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr
@@ -6,7 +6,7 @@ LL | fn a<'a>(x: &'a u32) {
    |      |
    |      this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/one-use-in-fn-argument.rs:1:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
index 8115a1e640..35fd782e13 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
+++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr
@@ -6,7 +6,7 @@ LL | impl<'f> Foo<'f> {
    |      |
    |      this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/one-use-in-inherent-impl-header.rs:1:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
index 48bd9f1912..10fb40b9d1 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
+++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr
@@ -6,7 +6,7 @@ LL |     fn inherent_a<'a>(&self, data: &'a u32) {
    |                   |
    |                   this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/one-use-in-inherent-method-argument.rs:1:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
index 9c93da4627..da9e253461 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
+++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr
@@ -6,7 +6,7 @@ LL | impl<'f> Foo<'f> {
    |      |
    |      this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/one-use-in-inherent-method-return.rs:1:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
index 047e0591e4..55d11add7b 100644
--- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
+++ b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr
@@ -6,7 +6,7 @@ LL |     fn next<'g>(&'g mut self) -> Option<Self::Item> {
    |             |
    |             this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/one-use-in-trait-method-argument.rs:4:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
index 6f0ba02b50..c16b244faf 100644
--- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
+++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr
@@ -6,7 +6,7 @@ LL | impl<'f> Foo<'f> {
    |      |
    |      this lifetime...
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/two-uses-in-inherent-method-argument-and-return.rs:4:9
    |
 LL | #![deny(single_use_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr b/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr
index b9c3bd8974..59c0164e32 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr
+++ b/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr
@@ -4,7 +4,7 @@ error: lifetime parameter `'a` never used
 LL | fn september<'a>() {}
    |             -^^- help: elide the unused lifetime
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/zero-uses-in-fn.rs:5:9
    |
 LL | #![deny(unused_lifetimes)]
diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr b/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr
index 650a9b4600..b6e42d3e71 100644
--- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr
+++ b/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr
@@ -4,7 +4,7 @@ error: lifetime parameter `'a` never used
 LL | impl<'a> Foo {}
    |     -^^- help: elide the unused lifetime
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/zero-uses-in-impl.rs:3:9
    |
 LL | #![deny(unused_lifetimes)]
diff --git a/src/test/ui/slightly-nice-generic-literal-messages.stderr b/src/test/ui/slightly-nice-generic-literal-messages.stderr
index 61eabed950..14f01f0ebd 100644
--- a/src/test/ui/slightly-nice-generic-literal-messages.stderr
+++ b/src/test/ui/slightly-nice-generic-literal-messages.stderr
@@ -1,6 +1,8 @@
 error[E0308]: mismatched types
   --> $DIR/slightly-nice-generic-literal-messages.rs:7:9
    |
+LL |     match Foo(1.1, marker::PhantomData) {
+   |           ----------------------------- this expression has type `Foo<{float}, _>`
 LL |         1 => {}
    |         ^ expected struct `Foo`, found integer
    |
diff --git a/src/test/ui/span/E0057.stderr b/src/test/ui/span/E0057.stderr
index 6b5890cac3..31579e2828 100644
--- a/src/test/ui/span/E0057.stderr
+++ b/src/test/ui/span/E0057.stderr
@@ -1,14 +1,18 @@
-error[E0057]: this function takes 1 parameter but 0 parameters were supplied
+error[E0057]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/E0057.rs:3:13
    |
 LL |     let a = f();
-   |             ^^^ expected 1 parameter
+   |             ^-- supplied 0 arguments
+   |             |
+   |             expected 1 argument
 
-error[E0057]: this function takes 1 parameter but 2 parameters were supplied
+error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/E0057.rs:5:13
    |
 LL |     let c = f(2, 3);
-   |             ^^^^^^^ expected 1 parameter
+   |             ^ -  - supplied 2 arguments
+   |             |
+   |             expected 1 argument
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/span/E0204.stderr b/src/test/ui/span/E0204.stderr
index 5a981a4a6e..23c9513f9c 100644
--- a/src/test/ui/span/E0204.stderr
+++ b/src/test/ui/span/E0204.stderr
@@ -15,6 +15,8 @@ LL | #[derive(Copy)]
 LL | struct Foo2<'a> {
 LL |     ty: &'a mut bool,
    |     ---------------- this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0204]: the trait `Copy` may not be implemented for this type
   --> $DIR/E0204.rs:17:6
@@ -33,6 +35,8 @@ LL | #[derive(Copy)]
 LL | enum EFoo2<'a> {
 LL |     Bar(&'a mut bool),
    |         ------------ this field does not implement `Copy`
+   |
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/span/coerce-suggestions.stderr b/src/test/ui/span/coerce-suggestions.stderr
index 343644006b..d1960a8aab 100644
--- a/src/test/ui/span/coerce-suggestions.stderr
+++ b/src/test/ui/span/coerce-suggestions.stderr
@@ -49,7 +49,7 @@ error[E0308]: mismatched types
 LL |     s = format!("foo");
    |         ^^^^^^^^^^^^^^ expected `&mut std::string::String`, found struct `std::string::String`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/span/gated-features-attr-spans.stderr b/src/test/ui/span/gated-features-attr-spans.stderr
index e0af720187..c8b8f346b9 100644
--- a/src/test/ui/span/gated-features-attr-spans.stderr
+++ b/src/test/ui/span/gated-features-attr-spans.stderr
@@ -4,7 +4,7 @@ error[E0658]: SIMD types are experimental and possibly buggy
 LL | #[repr(simd)]
    | ^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/27731
+   = note: see issue #27731 <https://github.com/rust-lang/rust/issues/27731> for more information
    = help: add `#![feature(repr_simd)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/impl-wrong-item-for-trait.stderr b/src/test/ui/span/impl-wrong-item-for-trait.stderr
index f23f421edc..cda191522a 100644
--- a/src/test/ui/span/impl-wrong-item-for-trait.stderr
+++ b/src/test/ui/span/impl-wrong-item-for-trait.stderr
@@ -64,7 +64,7 @@ error[E0046]: not all trait items implemented, missing: `fmt`
 LL | impl Debug for FooTypeForMethod {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `fmt` in implementation
    |
-   = help: implement the missing item: `fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { unimplemented!() }`
+   = help: implement the missing item: `fn fmt(&self, _: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> { todo!() }`
 
 error: aborting due to 8 previous errors
 
diff --git a/src/test/ui/span/issue-24690.stderr b/src/test/ui/span/issue-24690.stderr
index b2160e66a7..69d1150abb 100644
--- a/src/test/ui/span/issue-24690.stderr
+++ b/src/test/ui/span/issue-24690.stderr
@@ -4,7 +4,7 @@ warning: unused variable: `theOtherTwo`
 LL |     let theOtherTwo = 2;
    |         ^^^^^^^^^^^ help: consider prefixing with an underscore: `_theOtherTwo`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-24690.rs:8:9
    |
 LL | #![warn(unused)]
diff --git a/src/test/ui/span/issue-33884.stderr b/src/test/ui/span/issue-33884.stderr
index 4f46c4c739..184d9644c8 100644
--- a/src/test/ui/span/issue-33884.stderr
+++ b/src/test/ui/span/issue-33884.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     stream.write_fmt(format!("message received"))
    |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected struct `std::fmt::Arguments`, found struct `std::string::String`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/span/issue-34264.stderr b/src/test/ui/span/issue-34264.stderr
index 56a2686945..116f5ddd5b 100644
--- a/src/test/ui/span/issue-34264.stderr
+++ b/src/test/ui/span/issue-34264.stderr
@@ -5,6 +5,10 @@ LL | fn foo(Option<i32>, String) {}
    |              ^ expected one of `:`, `@`, or `|`
    |
    = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a `self` type, give it a parameter name
+   |
+LL | fn foo(self: Option<i32>, String) {}
+   |        ^^^^^^^^^^^^
 help: if this is a type, explicitly ignore the parameter name
    |
 LL | fn foo(_: Option<i32>, String) {}
@@ -33,6 +37,10 @@ LL | fn bar(x, y: usize) {}
    |         ^ expected one of `:`, `@`, or `|`
    |
    = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a `self` type, give it a parameter name
+   |
+LL | fn bar(self: x, y: usize) {}
+   |        ^^^^^^^
 help: if this was a parameter name, give it a type
    |
 LL | fn bar(x: TypeName, y: usize) {}
@@ -42,14 +50,16 @@ help: if this is a type, explicitly ignore the parameter name
 LL | fn bar(_: x, y: usize) {}
    |        ^^^^
 
-error[E0061]: this function takes 2 parameters but 3 parameters were supplied
+error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/issue-34264.rs:7:5
    |
 LL | fn foo(Option<i32>, String) {}
    | --------------------------- defined here
 ...
 LL |     foo(Some(42), 2, "");
-   |     ^^^^^^^^^^^^^^^^^^^^ expected 2 parameters
+   |     ^^^ --------  -  -- supplied 3 arguments
+   |     |
+   |     expected 2 arguments
 
 error[E0308]: mismatched types
   --> $DIR/issue-34264.rs:8:13
@@ -57,14 +67,16 @@ error[E0308]: mismatched types
 LL |     bar("", "");
    |             ^^ expected `usize`, found `&str`
 
-error[E0061]: this function takes 2 parameters but 3 parameters were supplied
+error[E0061]: this function takes 2 arguments but 3 arguments were supplied
   --> $DIR/issue-34264.rs:10:5
    |
 LL | fn bar(x, y: usize) {}
    | ------------------- defined here
 ...
 LL |     bar(1, 2, 3);
-   |     ^^^^^^^^^^^^ expected 2 parameters
+   |     ^^^ -  -  - supplied 3 arguments
+   |     |
+   |     expected 2 arguments
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr
index 2d3972917d..79b12590fc 100644
--- a/src/test/ui/span/issue-36530.stderr
+++ b/src/test/ui/span/issue-36530.stderr
@@ -4,7 +4,7 @@ error[E0658]: non-builtin inner attributes are unstable
 LL |     #![foo]
    |     ^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/54726
+   = note: see issue #54726 <https://github.com/rust-lang/rust/issues/54726> for more information
    = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/issue-39018.stderr b/src/test/ui/span/issue-39018.stderr
index 8a32561bd0..8caa5bea4a 100644
--- a/src/test/ui/span/issue-39018.stderr
+++ b/src/test/ui/span/issue-39018.stderr
@@ -136,8 +136,6 @@ LL |     let _ = &c + &d;
    |             -- ^ -- &&str
    |             |
    |             &&str
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `&&str`
 
 error[E0369]: cannot add `&str` to `&&str`
   --> $DIR/issue-39018.rs:35:16
@@ -146,8 +144,6 @@ LL |     let _ = &c + d;
    |             -- ^ - &str
    |             |
    |             &&str
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `&&str`
 
 error[E0369]: cannot add `&&str` to `&str`
   --> $DIR/issue-39018.rs:36:15
diff --git a/src/test/ui/span/issue-7575.stderr b/src/test/ui/span/issue-7575.stderr
index eb85be039b..89b36848a2 100644
--- a/src/test/ui/span/issue-7575.stderr
+++ b/src/test/ui/span/issue-7575.stderr
@@ -61,7 +61,10 @@ error[E0599]: no method named `is_str` found for type parameter `T` in the curre
   --> $DIR/issue-7575.rs:70:7
    |
 LL |     t.is_str()
-   |       ^^^^^^ this is an associated function, not a method
+   |     --^^^^^^--
+   |     | |
+   |     | this is an associated function, not a method
+   |     help: disambiguate the method call for the candidate: `ManyImplTrait::is_str(t)`
    |
    = note: found the following associated functions; to be used as methods, functions must have a `self` parameter
 note: the candidate is defined in the trait `ManyImplTrait`
@@ -70,14 +73,6 @@ note: the candidate is defined in the trait `ManyImplTrait`
 LL |     fn is_str() -> bool {
    |     ^^^^^^^^^^^^^^^^^^^
    = help: items from traits can only be used if the type parameter is bounded by the trait
-help: disambiguate the method call for the candidate
-   |
-LL |     ManyImplTrait::is_str(t)
-   |
-help: the following trait defines an item `is_str`, perhaps you need to restrict type parameter `T` with it:
-   |
-LL | fn param_bound<T: ManyImplTrait + ManyImplTrait>(t: T) -> bool {
-   |                ^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/span/lint-unused-unsafe.stderr b/src/test/ui/span/lint-unused-unsafe.stderr
index ac8107990c..c35a334912 100644
--- a/src/test/ui/span/lint-unused-unsafe.stderr
+++ b/src/test/ui/span/lint-unused-unsafe.stderr
@@ -4,7 +4,7 @@ error: unnecessary `unsafe` block
 LL | fn bad1() { unsafe {} }
    |             ^^^^^^ unnecessary `unsafe` block
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/lint-unused-unsafe.rs:4:9
    |
 LL | #![deny(unused_unsafe)]
diff --git a/src/test/ui/span/macro-span-replacement.stderr b/src/test/ui/span/macro-span-replacement.stderr
index 8b65e798b6..721d3b1217 100644
--- a/src/test/ui/span/macro-span-replacement.stderr
+++ b/src/test/ui/span/macro-span-replacement.stderr
@@ -7,10 +7,11 @@ LL |         $b $a;
 LL |     m!(S struct);
    |     ------------- in this macro invocation
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/macro-span-replacement.rs:3:9
    |
 LL | #![warn(unused)]
    |         ^^^^^^
    = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
diff --git a/src/test/ui/span/missing-unit-argument.stderr b/src/test/ui/span/missing-unit-argument.stderr
index 90a96e3f17..f6344fba3d 100644
--- a/src/test/ui/span/missing-unit-argument.stderr
+++ b/src/test/ui/span/missing-unit-argument.stderr
@@ -1,68 +1,72 @@
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:11:33
    |
 LL |     let _: Result<(), String> = Ok();
-   |                                 ^^^^
+   |                                 ^^-- supplied 0 arguments
    |
 help: expected the unit value `()`; create it with empty parentheses
    |
 LL |     let _: Result<(), String> = Ok(());
    |                                    ^^
 
-error[E0061]: this function takes 2 parameters but 0 parameters were supplied
+error[E0061]: this function takes 2 arguments but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:12:5
    |
 LL | fn foo(():(), ():()) {}
    | -------------------- defined here
 ...
 LL |     foo();
-   |     ^^^^^ expected 2 parameters
+   |     ^^^-- supplied 0 arguments
+   |     |
+   |     expected 2 arguments
 
-error[E0061]: this function takes 2 parameters but 1 parameter was supplied
+error[E0061]: this function takes 2 arguments but 1 argument was supplied
   --> $DIR/missing-unit-argument.rs:13:5
    |
 LL | fn foo(():(), ():()) {}
    | -------------------- defined here
 ...
 LL |     foo(());
-   |     ^^^^^^^ expected 2 parameters
+   |     ^^^ -- supplied 1 argument
+   |     |
+   |     expected 2 arguments
 
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:14:5
    |
 LL | fn bar(():()) {}
    | ------------- defined here
 ...
 LL |     bar();
-   |     ^^^^^
+   |     ^^^-- supplied 0 arguments
    |
 help: expected the unit value `()`; create it with empty parentheses
    |
 LL |     bar(());
    |         ^^
 
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:15:7
    |
 LL |     fn baz(self, (): ()) { }
    |     -------------------- defined here
 ...
 LL |     S.baz();
-   |       ^^^
+   |       ^^^- supplied 0 arguments
    |
 help: expected the unit value `()`; create it with empty parentheses
    |
 LL |     S.baz(());
    |           ^^
 
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/missing-unit-argument.rs:16:7
    |
 LL |     fn generic<T>(self, _: T) { }
    |     ------------------------- defined here
 ...
 LL |     S.generic::<()>();
-   |       ^^^^^^^
+   |       ^^^^^^^------ supplied 0 arguments
    |
 help: expected the unit value `()`; create it with empty parentheses
    |
diff --git a/src/test/ui/span/multispan-import-lint.stderr b/src/test/ui/span/multispan-import-lint.stderr
index a54c86cdb0..4faa9e128d 100644
--- a/src/test/ui/span/multispan-import-lint.stderr
+++ b/src/test/ui/span/multispan-import-lint.stderr
@@ -4,7 +4,7 @@ warning: unused imports: `Eq`, `Ord`, `PartialEq`, `PartialOrd`
 LL | use std::cmp::{Eq, Ord, min, PartialEq, PartialOrd};
    |                ^^  ^^^       ^^^^^^^^^  ^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/multispan-import-lint.rs:3:9
    |
 LL | #![warn(unused)]
diff --git a/src/test/ui/span/slice-borrow.stderr b/src/test/ui/span/slice-borrow.stderr
index 84d0c847b7..745936e11e 100644
--- a/src/test/ui/span/slice-borrow.stderr
+++ b/src/test/ui/span/slice-borrow.stderr
@@ -10,7 +10,7 @@ LL |     y.use_ref();
    |     - borrow later used here
    |
    = note: consider using a `let` binding to create a longer lived value
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/span/unused-warning-point-at-identifier.stderr b/src/test/ui/span/unused-warning-point-at-identifier.stderr
index a4715d4ade..f8d38d7b4b 100644
--- a/src/test/ui/span/unused-warning-point-at-identifier.stderr
+++ b/src/test/ui/span/unused-warning-point-at-identifier.stderr
@@ -4,7 +4,7 @@ warning: enum is never used: `Enum`
 LL | enum Enum {
    |      ^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-warning-point-at-identifier.rs:3:9
    |
 LL | #![warn(unused)]
diff --git a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr
index 2cf6c586e4..64e14f5800 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr
+++ b/src/test/ui/specialization/defaultimpl/specialization-feature-gate-default.stderr
@@ -6,7 +6,7 @@ LL | |     fn foo(&self) {}
 LL | | }
    | |_^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/31844
+   = note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
    = help: add `#![feature(specialization)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
index 19809778a5..a55d79ee03 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
+++ b/src/test/ui/specialization/defaultimpl/specialization-trait-not-implemented.stderr
@@ -2,16 +2,22 @@ error[E0599]: no method named `foo_one` found for struct `MyStruct` in the curre
   --> $DIR/specialization-trait-not-implemented.rs:22:29
    |
 LL | struct MyStruct;
-   | ---------------- method `foo_one` not found for this
+   | ----------------
+   | |
+   | method `foo_one` not found for this
+   | doesn't satisfy `MyStruct: Foo`
 ...
 LL |     println!("{}", MyStruct.foo_one());
    |                             ^^^^^^^ method not found in `MyStruct`
    |
    = note: the method `foo_one` exists but the following trait bounds were not satisfied:
-           `MyStruct : Foo`
+           `MyStruct: Foo`
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `foo_one`, perhaps you need to implement it:
-           candidate #1: `Foo`
+note: `Foo` defines an item `foo_one`, perhaps you need to implement it
+  --> $DIR/specialization-trait-not-implemented.rs:7:1
+   |
+LL | trait Foo {
+   | ^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr
index 5275b7b1dd..ee7c002b16 100644
--- a/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr
+++ b/src/test/ui/specialization/defaultimpl/specialization-wfcheck.stderr
@@ -2,9 +2,13 @@ error[E0277]: the trait bound `U: std::cmp::Eq` is not satisfied
   --> $DIR/specialization-wfcheck.rs:7:17
    |
 LL | default impl<U> Foo<'static, U> for () {}
-   |              -  ^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `U`
-   |              |
-   |              help: consider restricting this bound: `U: std::cmp::Eq`
+   |                 ^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `U: std::cmp::Eq`
+  --> $DIR/specialization-wfcheck.rs:7:14
+   |
+LL | default impl<U> Foo<'static, U> for () {}
+   |              ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/specialization/defaultimpl/validation.rs b/src/test/ui/specialization/defaultimpl/validation.rs
index cf5d662805..26b3f1ec41 100644
--- a/src/test/ui/specialization/defaultimpl/validation.rs
+++ b/src/test/ui/specialization/defaultimpl/validation.rs
@@ -4,7 +4,7 @@
 struct S;
 struct Z;
 
-default impl S {} //~ ERROR inherent impls cannot be default
+default impl S {} //~ ERROR inherent impls cannot be `default`
 
 default unsafe impl Send for S {} //~ ERROR impls of auto traits cannot be default
 default impl !Send for Z {} //~ ERROR impls of auto traits cannot be default
diff --git a/src/test/ui/specialization/defaultimpl/validation.stderr b/src/test/ui/specialization/defaultimpl/validation.stderr
index 14a06c3908..03b1ef69ca 100644
--- a/src/test/ui/specialization/defaultimpl/validation.stderr
+++ b/src/test/ui/specialization/defaultimpl/validation.stderr
@@ -1,10 +1,12 @@
-error: inherent impls cannot be default
+error: inherent impls cannot be `default`
   --> $DIR/validation.rs:7:1
    |
 LL | default impl S {}
-   | ^^^^^^^^^^^^^^^^^
+   | -------^^^^^^^
+   | |
+   | `default` because of this
    |
-   = note: only trait implementations may be annotated with default
+   = note: only trait implementations may be annotated with `default`
 
 error: impls of auto traits cannot be default
   --> $DIR/validation.rs:9:1
diff --git a/src/test/ui/specialization/issue-39618.rs b/src/test/ui/specialization/issue-39618.rs
new file mode 100644
index 0000000000..20e81e4359
--- /dev/null
+++ b/src/test/ui/specialization/issue-39618.rs
@@ -0,0 +1,27 @@
+// Regression test for #39618, shouldn't crash.
+// FIXME(JohnTitor): Centril pointed out this looks suspicions, we should revisit here.
+// More context: https://github.com/rust-lang/rust/pull/69192#discussion_r379846796
+
+// check-pass
+
+#![feature(specialization)]
+
+trait Foo {
+    fn foo(&self);
+}
+
+trait Bar {
+    fn bar(&self);
+}
+
+impl<T> Bar for T where T: Foo {
+    fn bar(&self) {}
+}
+
+impl<T> Foo for T where T: Bar {
+    fn foo(&self) {}
+}
+
+impl Foo for u64 {}
+
+fn main() {}
diff --git a/src/test/ui/specialization/soundness/partial_eq_range_inclusive.rs b/src/test/ui/specialization/soundness/partial_eq_range_inclusive.rs
new file mode 100644
index 0000000000..923dec892e
--- /dev/null
+++ b/src/test/ui/specialization/soundness/partial_eq_range_inclusive.rs
@@ -0,0 +1,35 @@
+// run-pass
+
+use std::cell::RefCell;
+use std::cmp::Ordering;
+
+struct Evil<'a, 'b> {
+    values: RefCell<Vec<&'a str>>,
+    to_insert: &'b String,
+}
+
+impl<'a, 'b> PartialEq for Evil<'a, 'b> {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+impl<'a> PartialOrd for Evil<'a, 'a> {
+    fn partial_cmp(&self, _other: &Self) -> Option<Ordering> {
+        self.values.borrow_mut().push(self.to_insert);
+        None
+    }
+}
+
+fn main() {
+    let e;
+    let values;
+    {
+        let to_insert = String::from("Hello, world!");
+        e = Evil { values: RefCell::new(Vec::new()), to_insert: &to_insert };
+        let range = &e..=&e;
+        let _ = range == range;
+        values = e.values;
+    }
+    assert_eq!(*values.borrow(), Vec::<&str>::new());
+}
diff --git a/src/test/ui/specialization/soundness/partial_ord_slice.rs b/src/test/ui/specialization/soundness/partial_ord_slice.rs
new file mode 100644
index 0000000000..b9e80a48d3
--- /dev/null
+++ b/src/test/ui/specialization/soundness/partial_ord_slice.rs
@@ -0,0 +1,42 @@
+// Check that we aren't using unsound specialization in slice comparisons.
+
+// run-pass
+
+use std::cell::Cell;
+use std::cmp::Ordering;
+
+struct Evil<'a, 'b>(Cell<(&'a [i32], &'b [i32])>);
+
+impl PartialEq for Evil<'_, '_> {
+    fn eq(&self, _other: &Self) -> bool {
+        true
+    }
+}
+
+impl Eq for Evil<'_, '_> {}
+
+impl PartialOrd for Evil<'_, '_> {
+    fn partial_cmp(&self, _other: &Self) -> Option<Ordering> {
+        Some(Ordering::Equal)
+    }
+}
+
+impl<'a> Ord for Evil<'a, 'a> {
+    fn cmp(&self, _other: &Self) -> Ordering {
+        let (a, b) = self.0.get();
+        self.0.set((b, a));
+        Ordering::Equal
+    }
+}
+
+fn main() {
+    let x = &[1, 2, 3, 4];
+    let u = {
+        let a = Box::new([7, 8, 9, 10]);
+        let y = [Evil(Cell::new((x, &*a)))];
+        let _ = &y[..] <= &y[..];
+        let [Evil(c)] = y;
+        c.get().0
+    };
+    assert_eq!(u, &[1, 2, 3, 4]);
+}
diff --git a/src/test/ui/specialization/specialization-feature-gate-default.stderr b/src/test/ui/specialization/specialization-feature-gate-default.stderr
index df2ad8a9b2..42dbb200c2 100644
--- a/src/test/ui/specialization/specialization-feature-gate-default.stderr
+++ b/src/test/ui/specialization/specialization-feature-gate-default.stderr
@@ -4,7 +4,7 @@ error[E0658]: specialization is unstable
 LL |     default fn foo(&self) {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/31844
+   = note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
    = help: add `#![feature(specialization)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/stability-attribute/stability-attribute-issue.stderr b/src/test/ui/stability-attribute/stability-attribute-issue.stderr
index 3463e77ec7..df4aec7e5c 100644
--- a/src/test/ui/stability-attribute/stability-attribute-issue.stderr
+++ b/src/test/ui/stability-attribute/stability-attribute-issue.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'unstable_test_feature'
 LL |     unstable();
    |     ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/1
+   = note: see issue #1 <https://github.com/rust-lang/rust/issues/1> for more information
    = help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'unstable_test_feature': message
@@ -13,7 +13,7 @@ error[E0658]: use of unstable library feature 'unstable_test_feature': message
 LL |     unstable_msg();
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/2
+   = note: see issue #2 <https://github.com/rust-lang/rust/issues/2> for more information
    = help: add `#![feature(unstable_test_feature)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs b/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs
index 5a67ca0b0c..de3ea4eaca 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs
+++ b/src/test/ui/stability-attribute/stability-attribute-sanity-2.rs
@@ -10,7 +10,8 @@ fn f1() { }
 #[stable(feature = "a", sinse = "1.0.0")] //~ ERROR unknown meta item 'sinse'
 fn f2() { }
 
-#[unstable(feature = "a", issue = "no")] //~ ERROR incorrect 'issue'
+#[unstable(feature = "a", issue = "no")]
+//~^ ERROR `issue` must be a non-zero numeric string or "none"
 fn f3() { }
 
 fn main() { }
diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr
index d683d08953..3b82619189 100644
--- a/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr
+++ b/src/test/ui/stability-attribute/stability-attribute-sanity-2.stderr
@@ -10,11 +10,13 @@ error[E0541]: unknown meta item 'sinse'
 LL | #[stable(feature = "a", sinse = "1.0.0")]
    |                         ^^^^^^^^^^^^^^^ expected one of `since`, `note`
 
-error[E0545]: incorrect 'issue'
-  --> $DIR/stability-attribute-sanity-2.rs:13:1
+error[E0545]: `issue` must be a non-zero numeric string or "none"
+  --> $DIR/stability-attribute-sanity-2.rs:13:27
    |
 LL | #[unstable(feature = "a", issue = "no")]
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                           ^^^^^^^^----
+   |                                   |
+   |                                   invalid digit found in string
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/stable-features.stderr b/src/test/ui/stable-features.stderr
index 537c3f082e..831b40b861 100644
--- a/src/test/ui/stable-features.stderr
+++ b/src/test/ui/stable-features.stderr
@@ -4,7 +4,7 @@ error: the feature `test_accepted_feature` has been stable since 1.0.0 and no lo
 LL | #![feature(test_accepted_feature)]
    |            ^^^^^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/stable-features.rs:4:9
    |
 LL | #![deny(stable_features)]
diff --git a/src/test/ui/std-backtrace.rs b/src/test/ui/std-backtrace.rs
index d84c493d53..902a2b6f5a 100644
--- a/src/test/ui/std-backtrace.rs
+++ b/src/test/ui/std-backtrace.rs
@@ -16,9 +16,9 @@ use std::str;
 fn main() {
     let args: Vec<String> = env::args().collect();
     if args.len() >= 2 && args[1] == "force" {
-        println!("{}", std::backtrace::Backtrace::force_capture());
+        println!("stack backtrace:\n{}", std::backtrace::Backtrace::force_capture());
     } else if args.len() >= 2 {
-        println!("{}", std::backtrace::Backtrace::capture());
+        println!("stack backtrace:\n{}", std::backtrace::Backtrace::capture());
     } else {
         runtest(&args[0]);
         println!("test ok");
diff --git a/src/test/ui/stmt_expr_attrs_no_feature.stderr b/src/test/ui/stmt_expr_attrs_no_feature.stderr
index b6d0f9ec3d..dc06521fe7 100644
--- a/src/test/ui/stmt_expr_attrs_no_feature.stderr
+++ b/src/test/ui/stmt_expr_attrs_no_feature.stderr
@@ -4,7 +4,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     #[rustfmt::skip]
    |     ^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -13,7 +13,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     fn y(a: [u8; #[rustc_dummy] 5]);
    |                  ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -22,7 +22,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     const Y: u8 = #[rustc_dummy] 5;
    |                   ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -31,7 +31,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     const Y: [u8; #[rustc_dummy] 5];
    |                   ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -40,7 +40,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     field2: [u8; #[rustc_dummy] 5]
    |                  ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -49,7 +49,7 @@ error[E0658]: attributes on expressions are experimental
 LL |     [u8; #[rustc_dummy] 5]
    |          ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -58,7 +58,7 @@ error[E0658]: attributes on expressions are experimental
 LL |         [u8; #[rustc_dummy] 5]
    |              ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -67,7 +67,7 @@ error[E0658]: attributes on expressions are experimental
 LL |         field2: [u8; #[rustc_dummy] 5]
    |                      ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error[E0658]: attributes on expressions are experimental
@@ -76,7 +76,7 @@ error[E0658]: attributes on expressions are experimental
 LL |         6 => #[rustc_dummy] (),
    |              ^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/15701
+   = note: see issue #15701 <https://github.com/rust-lang/rust/issues/15701> for more information
    = help: add `#![feature(stmt_expr_attributes)]` to the crate attributes to enable
 
 error: aborting due to 9 previous errors
diff --git a/src/test/ui/str/str-mut-idx.stderr b/src/test/ui/str/str-mut-idx.stderr
index 3c957970e5..a9ec6b9c02 100644
--- a/src/test/ui/str/str-mut-idx.stderr
+++ b/src/test/ui/str/str-mut-idx.stderr
@@ -2,7 +2,9 @@ error[E0277]: the size for values of type `str` cannot be known at compilation t
   --> $DIR/str-mut-idx.rs:4:15
    |
 LL | fn bot<T>() -> T { loop {} }
-   |    --- - required by this bound in `bot`
+   |    --- -- help: consider relaxing the implicit `Sized` restriction: `: ?Sized`
+   |        |
+   |        required by this bound in `bot`
 ...
 LL |     s[1..2] = bot();
    |               ^^^ doesn't have a size known at compile-time
diff --git a/src/test/ui/suggestions/attribute-typos.stderr b/src/test/ui/suggestions/attribute-typos.stderr
index a094359253..c7c257ba5f 100644
--- a/src/test/ui/suggestions/attribute-typos.stderr
+++ b/src/test/ui/suggestions/attribute-typos.stderr
@@ -4,7 +4,6 @@ error[E0658]: attributes starting with `rustc` are reserved for use by the `rust
 LL | #[rustc_err]
    |   ^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: cannot find attribute `rustc_err` in this scope
diff --git a/src/test/ui/suggestions/const-in-struct-pat.rs b/src/test/ui/suggestions/const-in-struct-pat.rs
new file mode 100644
index 0000000000..1cbba93540
--- /dev/null
+++ b/src/test/ui/suggestions/const-in-struct-pat.rs
@@ -0,0 +1,11 @@
+#[allow(non_camel_case_types)]
+struct foo;
+struct Thing {
+    foo: String,
+}
+
+fn example(t: Thing) {
+    let Thing { foo } = t; //~ ERROR mismatched types
+}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/const-in-struct-pat.stderr b/src/test/ui/suggestions/const-in-struct-pat.stderr
new file mode 100644
index 0000000000..0a010dcab4
--- /dev/null
+++ b/src/test/ui/suggestions/const-in-struct-pat.stderr
@@ -0,0 +1,16 @@
+error[E0308]: mismatched types
+  --> $DIR/const-in-struct-pat.rs:8:17
+   |
+LL | struct foo;
+   | ----------- unit struct defined here
+...
+LL |     let Thing { foo } = t;
+   |                 ^^^     - this expression has type `Thing`
+   |                 |
+   |                 expected struct `std::string::String`, found struct `foo`
+   |                 `foo` is interpreted as a unit struct, not a new binding
+   |                 help: bind the struct field to a different name instead: `foo: other_foo`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr b/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr
index e37edc1dac..b0cef952b2 100644
--- a/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr
+++ b/src/test/ui/suggestions/dont-suggest-deref-inside-macro-issue-58298.stderr
@@ -4,12 +4,9 @@ error[E0308]: mismatched types
 LL | /     intrinsic_match! {
 LL | |         "abc"
 LL | |     };
-   | |      ^
-   | |      |
-   | |______expected `&str`, found struct `std::string::String`
-   |        in this macro invocation
+   | |______^ expected `&str`, found struct `std::string::String`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr
index 1f1211aa19..612fae208c 100644
--- a/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr
+++ b/src/test/ui/suggestions/dont-suggest-ref/duplicate-suggestions.stderr
@@ -65,13 +65,18 @@ LL |     match &(e.clone(), e.clone()) {
    |           ^^^^^^^^^^^^^^^^^^^^^^^
 LL |
 LL |         &(Either::One(_t), Either::Two(_u))
-   |         -----------------------------------
-   |         |             |                |
-   |         |             |                ...and here
-   |         |             data moved here
-   |         help: consider removing the `&`: `(Either::One(_t), Either::Two(_u))`
+   |                       --               -- ...and here
+   |                       |
+   |                       data moved here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the `&`
+   |
+LL |         (Either::One(_t), Either::Two(_u))
+LL |
+LL |
+LL |         | &(Either::Two(_t), Either::One(_u)) => (),
+   |
 
 error[E0507]: cannot move out of a shared reference
   --> $DIR/duplicate-suggestions.rs:70:11
@@ -170,13 +175,18 @@ LL |     match &mut (em.clone(), em.clone()) {
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 LL |
 LL |         &mut (Either::One(_t), Either::Two(_u))
-   |         ---------------------------------------
-   |         |                 |                |
-   |         |                 |                ...and here
-   |         |                 data moved here
-   |         help: consider removing the `&mut`: `(Either::One(_t), Either::Two(_u))`
+   |                           --               -- ...and here
+   |                           |
+   |                           data moved here
    |
    = note: move occurs because these variables have types that don't implement the `Copy` trait
+help: consider removing the `&mut`
+   |
+LL |         (Either::One(_t), Either::Two(_u))
+LL |
+LL |
+LL |         | &mut (Either::Two(_t), Either::One(_u)) => (),
+   |
 
 error[E0507]: cannot move out of a mutable reference
   --> $DIR/duplicate-suggestions.rs:122:11
diff --git a/src/test/ui/suggestions/dont-suggest-ref/simple.stderr b/src/test/ui/suggestions/dont-suggest-ref/simple.stderr
index ac91ac4373..5550e097cf 100644
--- a/src/test/ui/suggestions/dont-suggest-ref/simple.stderr
+++ b/src/test/ui/suggestions/dont-suggest-ref/simple.stderr
@@ -263,11 +263,18 @@ LL |     match r {
    |           ^
 LL |
 LL |         &Either::One(_t)
-   |         ----------------
-   |         |            |
-   |         |            data moved here
-   |         |            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
-   |         help: consider removing the `&`: `Either::One(_t)`
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the `&`
+   |
+LL |         Either::One(_t)
+LL |
+LL |
+LL |         | &Either::Two(_t) => (),
+   |
 
 error[E0507]: cannot move out of `r.0` which is behind a shared reference
   --> $DIR/simple.rs:188:11
@@ -502,11 +509,18 @@ LL |     match &e {
    |           ^^
 LL |
 LL |         &Either::One(_t)
-   |         ----------------
-   |         |            |
-   |         |            data moved here
-   |         |            move occurs because `_t` has type `X`, which does not implement the `Copy` trait
-   |         help: consider removing the `&`: `Either::One(_t)`
+   |                      --
+   |                      |
+   |                      data moved here
+   |                      move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the `&`
+   |
+LL |         Either::One(_t)
+LL |
+LL |
+LL |         | &Either::Two(_t) => (),
+   |
 
 error[E0507]: cannot move out of a shared reference
   --> $DIR/simple.rs:308:11
@@ -571,11 +585,18 @@ LL |     match &mut em {
    |           ^^^^^^^
 LL |
 LL |         &mut Either::One(_t)
-   |         --------------------
-   |         |                |
-   |         |                data moved here
-   |         |                move occurs because `_t` has type `X`, which does not implement the `Copy` trait
-   |         help: consider removing the `&mut`: `Either::One(_t)`
+   |                          --
+   |                          |
+   |                          data moved here
+   |                          move occurs because `_t` has type `X`, which does not implement the `Copy` trait
+   |
+help: consider removing the `&mut`
+   |
+LL |         Either::One(_t)
+LL |
+LL |
+LL |         | &mut Either::Two(_t) => (),
+   |
 
 error[E0507]: cannot move out of a mutable reference
   --> $DIR/simple.rs:343:11
diff --git a/src/test/ui/suggestions/dont-suggest-try_into-in-macros.stderr b/src/test/ui/suggestions/dont-suggest-try_into-in-macros.stderr
index 1f2252f4d4..b1ea100f16 100644
--- a/src/test/ui/suggestions/dont-suggest-try_into-in-macros.stderr
+++ b/src/test/ui/suggestions/dont-suggest-try_into-in-macros.stderr
@@ -4,7 +4,7 @@ error[E0308]: mismatched types
 LL |     assert_eq!(10u64, 10usize);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `u64`, found `usize`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.rs b/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.rs
new file mode 100644
index 0000000000..0a1686eac9
--- /dev/null
+++ b/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.rs
@@ -0,0 +1,29 @@
+// edition:2018
+#![allow(dead_code)]
+use std::future::Future;
+use std::pin::Pin;
+
+type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;
+//   ^^^^^^^^^ This would come from the `futures` crate in real code.
+
+fn foo<F: Future<Output=i32> + Send + 'static>(x: F) -> BoxFuture<'static, i32> {
+    // We could instead use an `async` block, but this way we have no std spans.
+    x //~ ERROR mismatched types
+}
+
+// FIXME: uncomment these once this commit is in Beta and we can rely on `rustc_on_unimplemented`
+//        having filtering for `Self` being a trait.
+//
+// fn bar<F: Future<Output=i32> + Send + 'static>(x: F) -> BoxFuture<'static, i32> {
+//     Box::new(x)
+// }
+//
+// fn baz<F: Future<Output=i32> + Send + 'static>(x: F) -> BoxFuture<'static, i32> {
+//     Pin::new(x)
+// }
+//
+// fn qux<F: Future<Output=i32> + Send + 'static>(x: F) -> BoxFuture<'static, i32> {
+//     Pin::new(Box::new(x))
+// }
+
+fn main() {}
diff --git a/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.stderr b/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.stderr
new file mode 100644
index 0000000000..48d941283b
--- /dev/null
+++ b/src/test/ui/suggestions/expected-boxed-future-isnt-pinned.stderr
@@ -0,0 +1,20 @@
+error[E0308]: mismatched types
+  --> $DIR/expected-boxed-future-isnt-pinned.rs:11:5
+   |
+LL | fn foo<F: Future<Output=i32> + Send + 'static>(x: F) -> BoxFuture<'static, i32> {
+   |        - this type parameter                            ----------------------- expected `std::pin::Pin<std::boxed::Box<(dyn std::future::Future<Output = i32> + std::marker::Send + 'static)>>` because of return type
+LL |     // We could instead use an `async` block, but this way we have no std spans.
+LL |     x
+   |     ^
+   |     |
+   |     expected struct `std::pin::Pin`, found type parameter `F`
+   |     help: you need to pin and box this expression: `Box::pin(x)`
+   |
+   = note:      expected struct `std::pin::Pin<std::boxed::Box<(dyn std::future::Future<Output = i32> + std::marker::Send + 'static)>>`
+           found type parameter `F`
+   = help: type parameters must be constrained to match other types
+   = note: for more information, visit https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0308`.
diff --git a/src/test/ui/suggestions/fn-missing-lifetime-in-item.rs b/src/test/ui/suggestions/fn-missing-lifetime-in-item.rs
new file mode 100644
index 0000000000..dac6610b33
--- /dev/null
+++ b/src/test/ui/suggestions/fn-missing-lifetime-in-item.rs
@@ -0,0 +1,8 @@
+struct S1<F: Fn(&i32, &i32) -> &'a i32>(F); //~ ERROR use of undeclared lifetime name `'a`
+struct S2<F: Fn(&i32, &i32) -> &i32>(F); //~ ERROR missing lifetime specifier
+struct S3<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
+//~^ ERROR binding for associated type `Output` references lifetime `'a`, which does not appear
+struct S4<F: for<'x> Fn(&'x i32, &'x i32) -> &'x i32>(F);
+const C: Option<Box<dyn for<'a> Fn(&usize, &usize) -> &'a usize>> = None;
+//~^ ERROR binding for associated type `Output` references lifetime `'a`, which does not appear
+fn main() {}
diff --git a/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr b/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr
new file mode 100644
index 0000000000..fe9c3445fc
--- /dev/null
+++ b/src/test/ui/suggestions/fn-missing-lifetime-in-item.stderr
@@ -0,0 +1,49 @@
+error[E0261]: use of undeclared lifetime name `'a`
+  --> $DIR/fn-missing-lifetime-in-item.rs:1:33
+   |
+LL | struct S1<F: Fn(&i32, &i32) -> &'a i32>(F);
+   |                                 ^^ undeclared lifetime
+   |
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider introducing lifetime `'a` here
+   |
+LL | struct S1<'a, F: Fn(&i32, &i32) -> &'a i32>(F);
+   |           ^^^
+help: consider making the bound lifetime-generic with a new `'a` lifetime
+   |
+LL | struct S1<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
+   |              ^^^^^^^
+
+error[E0106]: missing lifetime specifier
+  --> $DIR/fn-missing-lifetime-in-item.rs:2:32
+   |
+LL | struct S2<F: Fn(&i32, &i32) -> &i32>(F);
+   |                 ----  ----     ^ expected named lifetime parameter
+   |
+   = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
+   = note: for more information on higher-ranked polymorphism, visit https://doc.rust-lang.org/nomicon/hrtb.html
+help: consider making the bound lifetime-generic with a new `'a` lifetime
+   |
+LL | struct S2<F: for<'a> Fn(&'a i32, &'a i32) -> &'a i32>(F);
+   |              ^^^^^^^    ^^^^^^^  ^^^^^^^     ^^^
+help: consider introducing a named lifetime parameter
+   |
+LL | struct S2<'a, F: Fn(&'a i32, &'a i32) -> &'a i32>(F);
+   |           ^^^       ^^^^^^^  ^^^^^^^     ^^^
+
+error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types
+  --> $DIR/fn-missing-lifetime-in-item.rs:3:40
+   |
+LL | struct S3<F: for<'a> Fn(&i32, &i32) -> &'a i32>(F);
+   |                                        ^^^^^^^
+
+error[E0582]: binding for associated type `Output` references lifetime `'a`, which does not appear in the trait input types
+  --> $DIR/fn-missing-lifetime-in-item.rs:6:55
+   |
+LL | const C: Option<Box<dyn for<'a> Fn(&usize, &usize) -> &'a usize>> = None;
+   |                                                       ^^^^^^^^^
+
+error: aborting due to 4 previous errors
+
+Some errors have detailed explanations: E0106, E0261, E0582.
+For more information about an error, try `rustc --explain E0106`.
diff --git a/src/test/ui/suggestions/imm-ref-trait-object.rs b/src/test/ui/suggestions/imm-ref-trait-object.rs
index 288d6c699f..241dde9fec 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object.rs
+++ b/src/test/ui/suggestions/imm-ref-trait-object.rs
@@ -1,3 +1,8 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
+
 fn test(t: &dyn Iterator<Item=&u64>) -> u64 {
      t.min().unwrap() //~ ERROR the `min` method cannot be invoked on a trait object
 }
diff --git a/src/test/ui/suggestions/imm-ref-trait-object.stderr b/src/test/ui/suggestions/imm-ref-trait-object.stderr
index 9185eaa65c..c5fe6ddb8a 100644
--- a/src/test/ui/suggestions/imm-ref-trait-object.stderr
+++ b/src/test/ui/suggestions/imm-ref-trait-object.stderr
@@ -1,8 +1,13 @@
 error: the `min` method cannot be invoked on a trait object
-  --> $DIR/imm-ref-trait-object.rs:2:8
+  --> $DIR/imm-ref-trait-object.rs:7:8
    |
 LL |      t.min().unwrap()
    |        ^^^
+   | 
+  ::: $SRC_DIR/libcore/iter/traits/iterator.rs:LL:COL
+   |
+LL |         Self: Sized,
+   |               ----- this has a `Sized` requirement
    |
    = note: you need `&mut dyn std::iter::Iterator<Item = &u64>` instead of `&dyn std::iter::Iterator<Item = &u64>`
 
diff --git a/src/test/ui/suggestions/impl-trait-missing-lifetime.rs b/src/test/ui/suggestions/impl-trait-missing-lifetime.rs
new file mode 100644
index 0000000000..22dc448c97
--- /dev/null
+++ b/src/test/ui/suggestions/impl-trait-missing-lifetime.rs
@@ -0,0 +1,2 @@
+fn f(_: impl Iterator<Item = &'_ ()>) {} //~ ERROR missing lifetime specifier
+fn main() {}
diff --git a/src/test/ui/suggestions/impl-trait-missing-lifetime.stderr b/src/test/ui/suggestions/impl-trait-missing-lifetime.stderr
new file mode 100644
index 0000000000..e31f25ab60
--- /dev/null
+++ b/src/test/ui/suggestions/impl-trait-missing-lifetime.stderr
@@ -0,0 +1,14 @@
+error[E0106]: missing lifetime specifier
+  --> $DIR/impl-trait-missing-lifetime.rs:1:31
+   |
+LL | fn f(_: impl Iterator<Item = &'_ ()>) {}
+   |                               ^^ expected named lifetime parameter
+   |
+help: consider introducing a named lifetime parameter
+   |
+LL | fn f<'a>(_: impl Iterator<Item = &'a ()>) {}
+   |     ^^^^                          ^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0106`.
diff --git a/src/test/ui/suggestions/issue-61963.stderr b/src/test/ui/suggestions/issue-61963.stderr
index 46943f4006..0e2eb7616c 100644
--- a/src/test/ui/suggestions/issue-61963.stderr
+++ b/src/test/ui/suggestions/issue-61963.stderr
@@ -4,7 +4,7 @@ error: trait objects without an explicit `dyn` are deprecated
 LL |     bar: Box<Bar>,
    |              ^^^ help: use `dyn`: `dyn Bar`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/issue-61963.rs:3:9
    |
 LL | #![deny(bare_trait_objects)]
diff --git a/src/test/ui/suggestions/issue-64252-self-type.stderr b/src/test/ui/suggestions/issue-64252-self-type.stderr
index 4abffb1ad7..e96db3f1e8 100644
--- a/src/test/ui/suggestions/issue-64252-self-type.stderr
+++ b/src/test/ui/suggestions/issue-64252-self-type.stderr
@@ -5,6 +5,10 @@ LL | pub fn foo(Box<Self>) { }
    |               ^ expected one of `:`, `@`, or `|`
    |
    = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
+help: if this is a `self` type, give it a parameter name
+   |
+LL | pub fn foo(self: Box<Self>) { }
+   |            ^^^^^^^^^
 help: if this is a type, explicitly ignore the parameter name
    |
 LL | pub fn foo(_: Box<Self>) { }
diff --git a/src/test/ui/suggestions/match-ergonomics.stderr b/src/test/ui/suggestions/match-ergonomics.stderr
index abdb754acc..559a2d2955 100644
--- a/src/test/ui/suggestions/match-ergonomics.stderr
+++ b/src/test/ui/suggestions/match-ergonomics.stderr
@@ -1,6 +1,8 @@
 error[E0308]: mismatched types
   --> $DIR/match-ergonomics.rs:4:10
    |
+LL |     match &x[..] {
+   |           ------ this expression has type `&[i32]`
 LL |         [&v] => {},
    |          ^^
    |          |
@@ -25,6 +27,8 @@ LL |         [v] => {},
 error[E0308]: mismatched types
   --> $DIR/match-ergonomics.rs:29:9
    |
+LL |     match y {
+   |           - this expression has type `i32`
 LL |         &v => {},
    |         ^^
    |         |
@@ -38,7 +42,7 @@ error[E0308]: mismatched types
   --> $DIR/match-ergonomics.rs:40:13
    |
 LL |     if let [&v] = &x[..] {}
-   |             ^^
+   |             ^^    ------ this expression has type `&[i32]`
    |             |
    |             expected `i32`, found reference
    |             help: you can probably remove the explicit borrow: `v`
diff --git a/src/test/ui/suggestions/method-missing-parentheses.rs b/src/test/ui/suggestions/method-missing-parentheses.rs
new file mode 100644
index 0000000000..f10bfb56d2
--- /dev/null
+++ b/src/test/ui/suggestions/method-missing-parentheses.rs
@@ -0,0 +1,5 @@
+fn main() {
+    let _ = vec![].into_iter().collect::<usize>;
+    //~^ ERROR attempted to take value of method `collect` on type `std::vec::IntoIter<_>`
+    //~| ERROR field expressions cannot have generic arguments
+}
diff --git a/src/test/ui/suggestions/method-missing-parentheses.stderr b/src/test/ui/suggestions/method-missing-parentheses.stderr
new file mode 100644
index 0000000000..6e4f7a8472
--- /dev/null
+++ b/src/test/ui/suggestions/method-missing-parentheses.stderr
@@ -0,0 +1,17 @@
+error: field expressions cannot have generic arguments
+  --> $DIR/method-missing-parentheses.rs:2:41
+   |
+LL |     let _ = vec![].into_iter().collect::<usize>;
+   |                                         ^^^^^^^
+
+error[E0615]: attempted to take value of method `collect` on type `std::vec::IntoIter<_>`
+  --> $DIR/method-missing-parentheses.rs:2:32
+   |
+LL |     let _ = vec![].into_iter().collect::<usize>;
+   |                                ^^^^^^^---------
+   |                                |
+   |                                help: use parentheses to call the method: `collect::<usize>()`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0615`.
diff --git a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed b/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed
new file mode 100644
index 0000000000..64a1aeae3e
--- /dev/null
+++ b/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.fixed
@@ -0,0 +1,21 @@
+// run-rustfix
+trait TraitB {
+    type Item;
+}
+
+trait TraitA<A> {
+    type Type;
+    fn bar<T>(_: T) -> Self;
+    fn baz<T>(_: T) -> Self where T: TraitB, <T as TraitB>::Item: Copy;
+}
+
+struct S;
+struct Type;
+
+impl TraitA<()> for S { //~ ERROR not all trait items implemented
+fn baz<T>(_: T) -> Self where T: TraitB, <T as TraitB>::Item: std::marker::Copy { todo!() }
+fn bar<T>(_: T) -> Self { todo!() }
+type Type = Type;
+}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs b/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs
new file mode 100644
index 0000000000..c80ede1b2b
--- /dev/null
+++ b/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.rs
@@ -0,0 +1,18 @@
+// run-rustfix
+trait TraitB {
+    type Item;
+}
+
+trait TraitA<A> {
+    type Type;
+    fn bar<T>(_: T) -> Self;
+    fn baz<T>(_: T) -> Self where T: TraitB, <T as TraitB>::Item: Copy;
+}
+
+struct S;
+struct Type;
+
+impl TraitA<()> for S { //~ ERROR not all trait items implemented
+}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr b/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr
new file mode 100644
index 0000000000..ee29a56f3f
--- /dev/null
+++ b/src/test/ui/suggestions/missing-assoc-fn-applicable-suggestions.stderr
@@ -0,0 +1,16 @@
+error[E0046]: not all trait items implemented, missing: `Type`, `bar`, `baz`
+  --> $DIR/missing-assoc-fn-applicable-suggestions.rs:15:1
+   |
+LL |     type Type;
+   |     ---------- `Type` from trait
+LL |     fn bar<T>(_: T) -> Self;
+   |     ------------------------ `bar` from trait
+LL |     fn baz<T>(_: T) -> Self where T: TraitB, <T as TraitB>::Item: Copy;
+   |     ------------------------------------------------------------------- `baz` from trait
+...
+LL | impl TraitA<()> for S {
+   | ^^^^^^^^^^^^^^^^^^^^^ missing `Type`, `bar`, `baz` in implementation
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0046`.
diff --git a/src/test/ui/suggestions/missing-assoc-fn.rs b/src/test/ui/suggestions/missing-assoc-fn.rs
new file mode 100644
index 0000000000..9af8e5a939
--- /dev/null
+++ b/src/test/ui/suggestions/missing-assoc-fn.rs
@@ -0,0 +1,22 @@
+trait TraitB {
+    type Item;
+}
+
+trait TraitA<A> {
+    fn foo<T: TraitB<Item = A>>(_: T) -> Self;
+    fn bar<T>(_: T) -> Self;
+    fn baz<T>(_: T) -> Self where T: TraitB, <T as TraitB>::Item: Copy;
+    fn bat<T: TraitB<Item: Copy>>(_: T) -> Self; //~ ERROR associated type bounds are unstable
+}
+
+struct S;
+
+impl TraitA<()> for S { //~ ERROR not all trait items implemented
+}
+
+use std::iter::FromIterator;
+struct X;
+impl FromIterator<()> for X { //~ ERROR not all trait items implemented
+}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/missing-assoc-fn.stderr b/src/test/ui/suggestions/missing-assoc-fn.stderr
new file mode 100644
index 0000000000..4f75e2b838
--- /dev/null
+++ b/src/test/ui/suggestions/missing-assoc-fn.stderr
@@ -0,0 +1,36 @@
+error[E0658]: associated type bounds are unstable
+  --> $DIR/missing-assoc-fn.rs:9:22
+   |
+LL |     fn bat<T: TraitB<Item: Copy>>(_: T) -> Self;
+   |                      ^^^^^^^^^^
+   |
+   = note: see issue #52662 <https://github.com/rust-lang/rust/issues/52662> for more information
+   = help: add `#![feature(associated_type_bounds)]` to the crate attributes to enable
+
+error[E0046]: not all trait items implemented, missing: `foo`, `bar`, `baz`, `bat`
+  --> $DIR/missing-assoc-fn.rs:14:1
+   |
+LL |     fn foo<T: TraitB<Item = A>>(_: T) -> Self;
+   |     ------------------------------------------ `foo` from trait
+LL |     fn bar<T>(_: T) -> Self;
+   |     ------------------------ `bar` from trait
+LL |     fn baz<T>(_: T) -> Self where T: TraitB, <T as TraitB>::Item: Copy;
+   |     ------------------------------------------------------------------- `baz` from trait
+LL |     fn bat<T: TraitB<Item: Copy>>(_: T) -> Self;
+   |     -------------------------------------------- `bat` from trait
+...
+LL | impl TraitA<()> for S {
+   | ^^^^^^^^^^^^^^^^^^^^^ missing `foo`, `bar`, `baz`, `bat` in implementation
+
+error[E0046]: not all trait items implemented, missing: `from_iter`
+  --> $DIR/missing-assoc-fn.rs:19:1
+   |
+LL | impl FromIterator<()> for X {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `from_iter` in implementation
+   |
+   = help: implement the missing item: `fn from_iter<T>(_: T) -> Self where T: std::iter::IntoIterator, std::iter::IntoIterator::Item = A { todo!() }`
+
+error: aborting due to 3 previous errors
+
+Some errors have detailed explanations: E0046, E0658.
+For more information about an error, try `rustc --explain E0046`.
diff --git a/src/test/ui/suggestions/missing-assoc-type-bound-restriction.stderr b/src/test/ui/suggestions/missing-assoc-type-bound-restriction.stderr
index c6f2e5cda6..31d974ed43 100644
--- a/src/test/ui/suggestions/missing-assoc-type-bound-restriction.stderr
+++ b/src/test/ui/suggestions/missing-assoc-type-bound-restriction.stderr
@@ -1,20 +1,13 @@
 error[E0277]: the trait bound `<T as Parent>::Assoc: Child<A>` is not satisfied
-  --> $DIR/missing-assoc-type-bound-restriction.rs:17:1
+  --> $DIR/missing-assoc-type-bound-restriction.rs:17:19
    |
-LL |   trait Parent {
-   |   ------------ required by `Parent`
+LL | trait Parent {
+   | ------------ required by `Parent`
 ...
-LL |   impl<A, T: Parent<Ty = A>> Parent for ParentWrapper<T> {
-   |   ^                                                     - help: consider further restricting the associated type: `where <T as Parent>::Assoc: Child<A>`
-   |  _|
-   | |
-LL | |
-LL | |     type Ty = A;
-LL | |     type Assoc = ChildWrapper<T::Assoc>;
-LL | |
-LL | |
-LL | | }
-   | |_^ the trait `Child<A>` is not implemented for `<T as Parent>::Assoc`
+LL | impl<A, T: Parent<Ty = A>> Parent for ParentWrapper<T> {
+   |                   ^^^^^^                              - help: consider further restricting the associated type: `where <T as Parent>::Assoc: Child<A>`
+   |                   |
+   |                   the trait `Child<A>` is not implemented for `<T as Parent>::Assoc`
 
 error[E0277]: the trait bound `<T as Parent>::Assoc: Child<A>` is not satisfied
   --> $DIR/missing-assoc-type-bound-restriction.rs:20:5
diff --git a/src/test/ui/suggestions/missing-trait-bounds-for-method-call.rs b/src/test/ui/suggestions/missing-trait-bounds-for-method-call.rs
new file mode 100644
index 0000000000..fefdf149f5
--- /dev/null
+++ b/src/test/ui/suggestions/missing-trait-bounds-for-method-call.rs
@@ -0,0 +1,31 @@
+#[derive(Default, PartialEq)]
+struct Foo<T> {
+    bar: Box<[T]>,
+}
+
+trait Bar {
+    fn foo(&self) {}
+}
+
+impl<T: Default + Bar> Bar for Foo<T> {}
+
+impl<T> Foo<T> {
+    fn bar(&self) {
+        self.foo();
+        //~^ ERROR no method named `foo` found for reference `&Foo<T>` in the current scope
+    }
+}
+
+struct Fin<T> where T: Bar {
+    bar: Box<[T]>,
+}
+
+impl<T: Default + Bar> Bar for Fin<T> {}
+
+impl<T: Bar> Fin<T> {
+    fn bar(&self) {
+        self.foo();
+        //~^ ERROR no method named `foo` found for reference `&Fin<T>` in the current scope
+    }
+}
+fn main() {}
diff --git a/src/test/ui/suggestions/missing-trait-bounds-for-method-call.stderr b/src/test/ui/suggestions/missing-trait-bounds-for-method-call.stderr
new file mode 100644
index 0000000000..c6d94826c0
--- /dev/null
+++ b/src/test/ui/suggestions/missing-trait-bounds-for-method-call.stderr
@@ -0,0 +1,39 @@
+error[E0599]: no method named `foo` found for reference `&Foo<T>` in the current scope
+  --> $DIR/missing-trait-bounds-for-method-call.rs:14:14
+   |
+LL | struct Foo<T> {
+   | ------------- doesn't satisfy `Foo<T>: Bar`
+...
+LL |         self.foo();
+   |              ^^^ method not found in `&Foo<T>`
+   |
+   = note: the method `foo` exists but the following trait bounds were not satisfied:
+           `T: Bar`
+           which is required by `Foo<T>: Bar`
+           `T: std::default::Default`
+           which is required by `Foo<T>: Bar`
+help: consider restricting the type parameters to satisfy the trait bounds
+   |
+LL | struct Foo<T> where T: Bar, T: std::default::Default {
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0599]: no method named `foo` found for reference `&Fin<T>` in the current scope
+  --> $DIR/missing-trait-bounds-for-method-call.rs:27:14
+   |
+LL | struct Fin<T> where T: Bar {
+   | -------------------------- doesn't satisfy `Fin<T>: Bar`
+...
+LL |         self.foo();
+   |              ^^^ method not found in `&Fin<T>`
+   |
+   = note: the method `foo` exists but the following trait bounds were not satisfied:
+           `T: std::default::Default`
+           which is required by `Fin<T>: Bar`
+help: consider restricting the type parameter to satisfy the trait bound
+   |
+LL | struct Fin<T> where T: Bar, T: std::default::Default {
+   |                           ^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0599`.
diff --git a/src/test/ui/suggestions/missing-trait-item.fixed b/src/test/ui/suggestions/missing-trait-item.fixed
index 42f579a665..a1cf359ec9 100644
--- a/src/test/ui/suggestions/missing-trait-item.fixed
+++ b/src/test/ui/suggestions/missing-trait-item.fixed
@@ -7,13 +7,13 @@ trait T {
 
 mod foo {
     use super::T;
-    impl T for () {    fn bar(&self, _: &usize, _: &usize) -> usize { unimplemented!() }
-        unsafe fn foo(_: &usize, _: &usize) -> usize { unimplemented!() }
+    impl T for () {    fn bar(&self, _: &usize, _: &usize) -> usize { todo!() }
+        unsafe fn foo(_: &usize, _: &usize) -> usize { todo!() }
     } //~ ERROR not all trait items
 
     impl T for usize { //~ ERROR not all trait items
-        fn bar(&self, _: &usize, _: &usize) -> usize { unimplemented!() }
-        unsafe fn foo(_: &usize, _: &usize) -> usize { unimplemented!() }
+        fn bar(&self, _: &usize, _: &usize) -> usize { todo!() }
+        unsafe fn foo(_: &usize, _: &usize) -> usize { todo!() }
     }
 }
 
diff --git a/src/test/ui/suggestions/mut-borrow-needed-by-trait.rs b/src/test/ui/suggestions/mut-borrow-needed-by-trait.rs
index f8b8637718..49a37498fd 100644
--- a/src/test/ui/suggestions/mut-borrow-needed-by-trait.rs
+++ b/src/test/ui/suggestions/mut-borrow-needed-by-trait.rs
@@ -1,3 +1,7 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
 use std::env::args;
 use std::fs::File;
 use std::io::{stdout, Write, BufWriter};
diff --git a/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr b/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr
index 2c3c07c19e..e4234cfcd5 100644
--- a/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr
+++ b/src/test/ui/suggestions/mut-borrow-needed-by-trait.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the trait bound `&dyn std::io::Write: std::io::Write` is not satisfied
-  --> $DIR/mut-borrow-needed-by-trait.rs:17:29
+  --> $DIR/mut-borrow-needed-by-trait.rs:21:29
    |
 LL |     let fp = BufWriter::new(fp);
    |                             ^^ the trait `std::io::Write` is not implemented for `&dyn std::io::Write`
@@ -8,7 +8,7 @@ LL |     let fp = BufWriter::new(fp);
    = note: required by `std::io::BufWriter::<W>::new`
 
 error[E0277]: the trait bound `&dyn std::io::Write: std::io::Write` is not satisfied
-  --> $DIR/mut-borrow-needed-by-trait.rs:17:14
+  --> $DIR/mut-borrow-needed-by-trait.rs:21:14
    |
 LL |     let fp = BufWriter::new(fp);
    |              ^^^^^^^^^^^^^^ the trait `std::io::Write` is not implemented for `&dyn std::io::Write`
@@ -17,7 +17,7 @@ LL |     let fp = BufWriter::new(fp);
    = note: required by `std::io::BufWriter`
 
 error[E0277]: the trait bound `&dyn std::io::Write: std::io::Write` is not satisfied
-  --> $DIR/mut-borrow-needed-by-trait.rs:17:14
+  --> $DIR/mut-borrow-needed-by-trait.rs:21:14
    |
 LL |     let fp = BufWriter::new(fp);
    |              ^^^^^^^^^^^^^^^^^^ the trait `std::io::Write` is not implemented for `&dyn std::io::Write`
@@ -26,14 +26,20 @@ LL |     let fp = BufWriter::new(fp);
    = note: required by `std::io::BufWriter`
 
 error[E0599]: no method named `write_fmt` found for struct `std::io::BufWriter<&dyn std::io::Write>` in the current scope
-  --> $DIR/mut-borrow-needed-by-trait.rs:22:5
+  --> $DIR/mut-borrow-needed-by-trait.rs:26:5
    |
 LL |     writeln!(fp, "hello world").unwrap();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ method not found in `std::io::BufWriter<&dyn std::io::Write>`
+   | 
+  ::: $SRC_DIR/libstd/io/buffered.rs:LL:COL
+   |
+LL | pub struct BufWriter<W: Write> {
+   | ------------------------------ doesn't satisfy `_: std::io::Write`
    |
    = note: the method `write_fmt` exists but the following trait bounds were not satisfied:
-           `std::io::BufWriter<&dyn std::io::Write> : std::io::Write`
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+           `&dyn std::io::Write: std::io::Write`
+           which is required by `std::io::BufWriter<&dyn std::io::Write>: std::io::Write`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/suggestions/object-unsafe-trait-references-self.rs b/src/test/ui/suggestions/object-unsafe-trait-references-self.rs
new file mode 100644
index 0000000000..07bf053e99
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-references-self.rs
@@ -0,0 +1,12 @@
+trait Trait {
+    fn baz(&self, _: Self) {}
+    fn bat(&self) -> Self {}
+}
+
+fn bar(x: &dyn Trait) {} //~ ERROR the trait `Trait` cannot be made into an object
+
+trait Other: Sized {}
+
+fn foo(x: &dyn Other) {} //~ ERROR the trait `Other` cannot be made into an object
+
+fn main() {}
diff --git a/src/test/ui/suggestions/object-unsafe-trait-references-self.stderr b/src/test/ui/suggestions/object-unsafe-trait-references-self.stderr
new file mode 100644
index 0000000000..c3cfad70bf
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-references-self.stderr
@@ -0,0 +1,30 @@
+error[E0038]: the trait `Trait` cannot be made into an object
+  --> $DIR/object-unsafe-trait-references-self.rs:6:11
+   |
+LL | trait Trait {
+   |       ----- this trait cannot be made into an object...
+LL |     fn baz(&self, _: Self) {}
+   |                      ---- ...because method `baz` references the `Self` type in this parameter
+LL |     fn bat(&self) -> Self {}
+   |                      ---- ...because method `bat` references the `Self` type in its return type
+...
+LL | fn bar(x: &dyn Trait) {}
+   |           ^^^^^^^^^^ the trait `Trait` cannot be made into an object
+   |
+   = help: consider moving `baz` to another trait
+   = help: consider moving `bat` to another trait
+
+error[E0038]: the trait `Other` cannot be made into an object
+  --> $DIR/object-unsafe-trait-references-self.rs:10:11
+   |
+LL | trait Other: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+LL | 
+LL | fn foo(x: &dyn Other) {}
+   |           ^^^^^^^^^^ the trait `Other` cannot be made into an object
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.rs b/src/test/ui/suggestions/object-unsafe-trait-should-use-self.rs
new file mode 100644
index 0000000000..75f99075eb
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-should-use-self.rs
@@ -0,0 +1,16 @@
+#![allow(bare_trait_objects)]
+trait A: Sized {
+    fn f(a: A) -> A;
+    //~^ ERROR associated item referring to unboxed trait object for its own trait
+    //~| ERROR the trait `A` cannot be made into an object
+}
+trait B {
+    fn f(a: B) -> B;
+    //~^ ERROR associated item referring to unboxed trait object for its own trait
+    //~| ERROR the trait `B` cannot be made into an object
+}
+trait C {
+    fn f(&self, a: C) -> C;
+}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr b/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr
new file mode 100644
index 0000000000..58be59602b
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-should-use-self.stderr
@@ -0,0 +1,54 @@
+error: associated item referring to unboxed trait object for its own trait
+  --> $DIR/object-unsafe-trait-should-use-self.rs:3:13
+   |
+LL | trait A: Sized {
+   |       - in this trait
+LL |     fn f(a: A) -> A;
+   |             ^     ^
+   |
+help: you might have meant to use `Self` to refer to the implementing type
+   |
+LL |     fn f(a: Self) -> Self;
+   |             ^^^^     ^^^^
+
+error[E0038]: the trait `A` cannot be made into an object
+  --> $DIR/object-unsafe-trait-should-use-self.rs:3:13
+   |
+LL | trait A: Sized {
+   |       -  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+LL |     fn f(a: A) -> A;
+   |             ^ the trait `A` cannot be made into an object
+
+error: associated item referring to unboxed trait object for its own trait
+  --> $DIR/object-unsafe-trait-should-use-self.rs:8:13
+   |
+LL | trait B {
+   |       - in this trait
+LL |     fn f(a: B) -> B;
+   |             ^     ^
+   |
+help: you might have meant to use `Self` to refer to the implementing type
+   |
+LL |     fn f(a: Self) -> Self;
+   |             ^^^^     ^^^^
+
+error[E0038]: the trait `B` cannot be made into an object
+  --> $DIR/object-unsafe-trait-should-use-self.rs:8:13
+   |
+LL | trait B {
+   |       - this trait cannot be made into an object...
+LL |     fn f(a: B) -> B;
+   |        -    ^ the trait `B` cannot be made into an object
+   |        |
+   |        ...because associated function `f` has no `self` parameter
+   |
+help: consider turning `f` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn f(a: B) -> B where Self: Sized;
+   |                     ^^^^^^^^^^^^^^^^^
+
+error: aborting due to 4 previous errors
+
+For more information about this error, try `rustc --explain E0038`.
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed b/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed
new file mode 100644
index 0000000000..c4b8960b65
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.fixed
@@ -0,0 +1,13 @@
+// run-rustfix
+#![allow(unused_variables, dead_code)]
+
+trait Trait {
+    fn foo() where Self: Other, Self: Sized, { }
+    fn bar(self: &Self) {} //~ ERROR invalid `self` parameter type
+}
+
+fn bar(x: &dyn Trait) {} //~ ERROR the trait `Trait` cannot be made into an object
+
+trait Other {}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs b/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs
new file mode 100644
index 0000000000..38d9aea16e
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.rs
@@ -0,0 +1,13 @@
+// run-rustfix
+#![allow(unused_variables, dead_code)]
+
+trait Trait {
+    fn foo() where Self: Other, { }
+    fn bar(self: ()) {} //~ ERROR invalid `self` parameter type
+}
+
+fn bar(x: &dyn Trait) {} //~ ERROR the trait `Trait` cannot be made into an object
+
+trait Other {}
+
+fn main() {}
diff --git a/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr b/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr
new file mode 100644
index 0000000000..6466a768ec
--- /dev/null
+++ b/src/test/ui/suggestions/object-unsafe-trait-should-use-where-sized.stderr
@@ -0,0 +1,35 @@
+error[E0038]: the trait `Trait` cannot be made into an object
+  --> $DIR/object-unsafe-trait-should-use-where-sized.rs:9:11
+   |
+LL | trait Trait {
+   |       ----- this trait cannot be made into an object...
+LL |     fn foo() where Self: Other, { }
+   |        --- ...because associated function `foo` has no `self` parameter
+LL |     fn bar(self: ()) {}
+   |                  -- ...because method `bar`'s `self` parameter cannot be dispatched on
+...
+LL | fn bar(x: &dyn Trait) {}
+   |           ^^^^^^^^^^ the trait `Trait` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Other, Self: Sized, { }
+   |                               ^^^^^^^^^^^^^
+help: consider changing method `bar`'s `self` parameter to be `&self`
+   |
+LL |     fn bar(self: &Self) {}
+   |                  ^^^^^
+
+error[E0307]: invalid `self` parameter type: ()
+  --> $DIR/object-unsafe-trait-should-use-where-sized.rs:6:18
+   |
+LL |     fn bar(self: ()) {}
+   |                  ^^
+   |
+   = note: type of `self` must be `Self` or a type that dereferences to it
+   = help: consider changing to `self`, `&self`, `&mut self`, `self: Box<Self>`, `self: Rc<Self>`, `self: Arc<Self>`, or `self: Pin<P>` (where P is one of the previous types except `Self`)
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0038, E0307.
+For more information about an error, try `rustc --explain E0038`.
diff --git a/src/test/ui/suggestions/path-display.stderr b/src/test/ui/suggestions/path-display.stderr
index 39d236af4f..13546cddbd 100644
--- a/src/test/ui/suggestions/path-display.stderr
+++ b/src/test/ui/suggestions/path-display.stderr
@@ -8,6 +8,7 @@ LL |     println!("{}", path);
    = note: call `.display()` or `.to_string_lossy()` to safely print paths, as they may contain non-Unicode data
    = note: required because of the requirements on the impl of `std::fmt::Display` for `&std::path::Path`
    = note: required by `std::fmt::Display::fmt`
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/restrict-type-argument.stderr b/src/test/ui/suggestions/restrict-type-argument.stderr
index d6840ca4d7..4d5cb8907e 100644
--- a/src/test/ui/suggestions/restrict-type-argument.stderr
+++ b/src/test/ui/suggestions/restrict-type-argument.stderr
@@ -3,13 +3,16 @@ error[E0277]: `impl Sync` cannot be sent between threads safely
    |
 LL | fn is_send<T: Send>(val: T) {}
    |    -------    ---- required by this bound in `is_send`
-LL | 
-LL | fn use_impl_sync(val: impl Sync) {
-   |                       --------- help: consider further restricting this bound: `impl Sync + std::marker::Send`
+...
 LL |     is_send(val);
    |             ^^^ `impl Sync` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `impl Sync`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/restrict-type-argument.rs:3:23
+   |
+LL | fn use_impl_sync(val: impl Sync) {
+   |                       ^^^^^^^^^
 
 error[E0277]: `S` cannot be sent between threads safely
   --> $DIR/restrict-type-argument.rs:8:13
@@ -17,12 +20,15 @@ error[E0277]: `S` cannot be sent between threads safely
 LL | fn is_send<T: Send>(val: T) {}
    |    -------    ---- required by this bound in `is_send`
 ...
-LL | fn use_where<S>(val: S) where S: Sync {
-   |                                      - help: consider further restricting type parameter `S`: `, S: std::marker::Send`
 LL |     is_send(val);
    |             ^^^ `S` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `S`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/restrict-type-argument.rs:7:31
+   |
+LL | fn use_where<S>(val: S) where S: Sync {
+   |                               ^^^^^^^
 
 error[E0277]: `S` cannot be sent between threads safely
   --> $DIR/restrict-type-argument.rs:12:13
@@ -30,27 +36,31 @@ error[E0277]: `S` cannot be sent between threads safely
 LL | fn is_send<T: Send>(val: T) {}
    |    -------    ---- required by this bound in `is_send`
 ...
-LL | fn use_bound<S: Sync>(val: S) {
-   |              -- help: consider further restricting this bound: `S: std::marker::Send +`
 LL |     is_send(val);
    |             ^^^ `S` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `S`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/restrict-type-argument.rs:11:17
+   |
+LL | fn use_bound<S: Sync>(val: S) {
+   |                 ^^^^
 
 error[E0277]: `S` cannot be sent between threads safely
   --> $DIR/restrict-type-argument.rs:20:13
    |
-LL |   fn is_send<T: Send>(val: T) {}
-   |      -------    ---- required by this bound in `is_send`
-...
-LL | /     S // Make sure we can synthezise a correct suggestion span for this case
-LL | |     :
-   | |_____- help: consider further restricting this bound: `S: std::marker::Send +`
+LL | fn is_send<T: Send>(val: T) {}
+   |    -------    ---- required by this bound in `is_send`
 ...
-LL |       is_send(val);
-   |               ^^^ `S` cannot be sent between threads safely
+LL |     is_send(val);
+   |             ^^^ `S` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `S`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/restrict-type-argument.rs:18:5
+   |
+LL |     Sync
+   |     ^^^^
 
 error[E0277]: `S` cannot be sent between threads safely
   --> $DIR/restrict-type-argument.rs:24:13
@@ -58,12 +68,15 @@ error[E0277]: `S` cannot be sent between threads safely
 LL | fn is_send<T: Send>(val: T) {}
    |    -------    ---- required by this bound in `is_send`
 ...
-LL | fn use_bound_and_where<S: Sync>(val: S) where S: std::fmt::Debug {
-   |                                                                 - help: consider further restricting type parameter `S`: `, S: std::marker::Send`
 LL |     is_send(val);
    |             ^^^ `S` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `S`
+help: consider further restricting this bound with `+ std::marker::Send`
+  --> $DIR/restrict-type-argument.rs:23:47
+   |
+LL | fn use_bound_and_where<S: Sync>(val: S) where S: std::fmt::Debug {
+   |                                               ^^^^^^^^^^^^^^^^^^
 
 error[E0277]: `S` cannot be sent between threads safely
   --> $DIR/restrict-type-argument.rs:28:13
@@ -71,12 +84,15 @@ error[E0277]: `S` cannot be sent between threads safely
 LL | fn is_send<T: Send>(val: T) {}
    |    -------    ---- required by this bound in `is_send`
 ...
-LL | fn use_unbound<S>(val: S) {
-   |                - help: consider restricting this bound: `S: std::marker::Send`
 LL |     is_send(val);
    |             ^^^ `S` cannot be sent between threads safely
    |
    = help: the trait `std::marker::Send` is not implemented for `S`
+help: consider restricting this type parameter with `S: std::marker::Send`
+  --> $DIR/restrict-type-argument.rs:27:16
+   |
+LL | fn use_unbound<S>(val: S) {
+   |                ^
 
 error: aborting due to 6 previous errors
 
diff --git a/src/test/ui/suggestions/return-without-lifetime.stderr b/src/test/ui/suggestions/return-without-lifetime.stderr
index 7f5ff95938..ce3b1748da 100644
--- a/src/test/ui/suggestions/return-without-lifetime.stderr
+++ b/src/test/ui/suggestions/return-without-lifetime.stderr
@@ -8,7 +8,7 @@ error[E0106]: missing lifetime specifier
   --> $DIR/return-without-lifetime.rs:5:34
    |
 LL | fn func1<'a>(_arg: &'a Thing) -> &() { unimplemented!() }
-   |                                  ^ help: consider using the named lifetime: `&'a`
+   |                    ---------     ^ help: consider using the named lifetime: `&'a`
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `_arg`'s 2 lifetimes it is borrowed from
 
@@ -16,7 +16,7 @@ error[E0106]: missing lifetime specifier
   --> $DIR/return-without-lifetime.rs:7:35
    |
 LL | fn func2<'a>(_arg: &Thing<'a>) -> &() { unimplemented!() }
-   |                                   ^ help: consider using the named lifetime: `&'a`
+   |                    ----------     ^ help: consider using the named lifetime: `&'a`
    |
    = help: this function's return type contains a borrowed value, but the signature does not say which one of `_arg`'s 2 lifetimes it is borrowed from
 
diff --git a/src/test/ui/suggestions/struct-initializer-comma.rs b/src/test/ui/suggestions/struct-initializer-comma.rs
new file mode 100644
index 0000000000..613b976848
--- /dev/null
+++ b/src/test/ui/suggestions/struct-initializer-comma.rs
@@ -0,0 +1,13 @@
+struct Foo {
+    first: bool,
+    second: u8,
+}
+
+fn main() {
+    let a = Foo {
+        //~^ ERROR missing field
+        first: true
+        second: 25
+        //~^ ERROR expected one of
+    };
+}
diff --git a/src/test/ui/suggestions/struct-initializer-comma.stderr b/src/test/ui/suggestions/struct-initializer-comma.stderr
new file mode 100644
index 0000000000..731e8e10ab
--- /dev/null
+++ b/src/test/ui/suggestions/struct-initializer-comma.stderr
@@ -0,0 +1,23 @@
+error: expected one of `,`, `.`, `?`, `}`, or an operator, found `second`
+  --> $DIR/struct-initializer-comma.rs:10:9
+   |
+LL |     let a = Foo {
+   |             --- while parsing this struct
+LL |
+LL |         first: true
+   |                    -
+   |                    |
+   |                    expected one of `,`, `.`, `?`, `}`, or an operator
+   |                    help: try adding a comma: `,`
+LL |         second: 25
+   |         ^^^^^^ unexpected token
+
+error[E0063]: missing field `second` in initializer of `Foo`
+  --> $DIR/struct-initializer-comma.rs:7:13
+   |
+LL |     let a = Foo {
+   |             ^^^ missing `second`
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0063`.
diff --git a/src/test/ui/suggestions/suggest-impl-trait-lifetime.fixed b/src/test/ui/suggestions/suggest-impl-trait-lifetime.fixed
index 8592af1262..589ee1a474 100644
--- a/src/test/ui/suggestions/suggest-impl-trait-lifetime.fixed
+++ b/src/test/ui/suggestions/suggest-impl-trait-lifetime.fixed
@@ -3,7 +3,7 @@
 use std::fmt::Debug;
 
 fn foo(d: impl Debug + 'static) {
-//~^ HELP consider adding an explicit lifetime bound  `'static` to `impl Debug`
+//~^ HELP consider adding an explicit lifetime bound...
     bar(d);
 //~^ ERROR the parameter type `impl Debug` may not live long enough
 //~| NOTE ...so that the type `impl Debug` will meet its required lifetime bounds
diff --git a/src/test/ui/suggestions/suggest-impl-trait-lifetime.rs b/src/test/ui/suggestions/suggest-impl-trait-lifetime.rs
index c67d78ea4c..9a87129fbf 100644
--- a/src/test/ui/suggestions/suggest-impl-trait-lifetime.rs
+++ b/src/test/ui/suggestions/suggest-impl-trait-lifetime.rs
@@ -3,7 +3,7 @@
 use std::fmt::Debug;
 
 fn foo(d: impl Debug) {
-//~^ HELP consider adding an explicit lifetime bound  `'static` to `impl Debug`
+//~^ HELP consider adding an explicit lifetime bound...
     bar(d);
 //~^ ERROR the parameter type `impl Debug` may not live long enough
 //~| NOTE ...so that the type `impl Debug` will meet its required lifetime bounds
diff --git a/src/test/ui/suggestions/suggest-impl-trait-lifetime.stderr b/src/test/ui/suggestions/suggest-impl-trait-lifetime.stderr
index cba231d0e8..b6e6c0bbf3 100644
--- a/src/test/ui/suggestions/suggest-impl-trait-lifetime.stderr
+++ b/src/test/ui/suggestions/suggest-impl-trait-lifetime.stderr
@@ -1,6 +1,9 @@
 error[E0310]: the parameter type `impl Debug` may not live long enough
   --> $DIR/suggest-impl-trait-lifetime.rs:7:5
    |
+LL | fn foo(d: impl Debug) {
+   |           ---------- help: consider adding an explicit lifetime bound...: `impl Debug + 'static`
+LL |
 LL |     bar(d);
    |     ^^^
    |
@@ -9,10 +12,6 @@ note: ...so that the type `impl Debug` will meet its required lifetime bounds
    |
 LL |     bar(d);
    |     ^^^
-help: consider adding an explicit lifetime bound  `'static` to `impl Debug`...
-   |
-LL | fn foo(d: impl Debug + 'static) {
-   |           ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/suggest-move-types.rs b/src/test/ui/suggestions/suggest-move-types.rs
index 890950ea08..6505a97de6 100644
--- a/src/test/ui/suggestions/suggest-move-types.rs
+++ b/src/test/ui/suggestions/suggest-move-types.rs
@@ -33,7 +33,7 @@ struct A<T, M: One<A=(), T>> { //~ ERROR associated type bindings must be declar
 
 struct Al<'a, T, M: OneWithLifetime<A=(), T, 'a>> {
 //~^ ERROR associated type bindings must be declared after generic parameters
-//~^^ ERROR lifetime arguments must be declared prior to type arguments
+//~^^ ERROR type provided when a lifetime was expected
     m: M,
     t: &'a T,
 }
@@ -47,7 +47,7 @@ struct B<T, U, V, M: Three<A=(), B=(), C=(), T, U, V>> { //~ ERROR associated ty
 
 struct Bl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<A=(), B=(), C=(), T, U, V, 'a, 'b, 'c>> {
 //~^ ERROR associated type bindings must be declared after generic parameters
-//~^^ ERROR lifetime arguments must be declared prior to type arguments
+//~^^ ERROR type provided when a lifetime was expected
     m: M,
     t: &'a T,
     u: &'b U,
@@ -63,7 +63,7 @@ struct C<T, U, V, M: Three<T, A=(), B=(), C=(), U, V>> { //~ ERROR associated ty
 
 struct Cl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), C=(), U, 'b, V, 'c>> {
 //~^ ERROR associated type bindings must be declared after generic parameters
-//~^^ ERROR lifetime arguments must be declared prior to type arguments
+//~^^ ERROR lifetime provided when a type was expected
     m: M,
     t: &'a T,
     u: &'b U,
@@ -79,7 +79,7 @@ struct D<T, U, V, M: Three<T, A=(), B=(), U, C=(), V>> { //~ ERROR associated ty
 
 struct Dl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), U, 'b, C=(), V, 'c>> {
 //~^ ERROR associated type bindings must be declared after generic parameters
-//~^^ ERROR lifetime arguments must be declared prior to type arguments
+//~^^ ERROR lifetime provided when a type was expected
     m: M,
     t: &'a T,
     u: &'b U,
diff --git a/src/test/ui/suggestions/suggest-move-types.stderr b/src/test/ui/suggestions/suggest-move-types.stderr
index 552fb78cd3..ac91813f92 100644
--- a/src/test/ui/suggestions/suggest-move-types.stderr
+++ b/src/test/ui/suggestions/suggest-move-types.stderr
@@ -74,29 +74,38 @@ LL | struct Dl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), U, '
    |                                                            |     this associated type binding should be moved after the generic parameters
    |                                                            this associated type binding should be moved after the generic parameters
 
-error: lifetime arguments must be declared prior to type arguments
-  --> $DIR/suggest-move-types.rs:34:46
+error[E0747]: type provided when a lifetime was expected
+  --> $DIR/suggest-move-types.rs:34:43
    |
 LL | struct Al<'a, T, M: OneWithLifetime<A=(), T, 'a>> {
-   |                                              ^^
+   |                                           ^
+   |
+   = note: lifetime arguments must be provided before type arguments
 
-error: lifetime arguments must be declared prior to type arguments
-  --> $DIR/suggest-move-types.rs:48:80
+error[E0747]: type provided when a lifetime was expected
+  --> $DIR/suggest-move-types.rs:48:71
    |
 LL | struct Bl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<A=(), B=(), C=(), T, U, V, 'a, 'b, 'c>> {
-   |                                                                                ^^  ^^  ^^
+   |                                                                       ^
+   |
+   = note: lifetime arguments must be provided before type arguments
 
-error: lifetime arguments must be declared prior to type arguments
+error[E0747]: lifetime provided when a type was expected
   --> $DIR/suggest-move-types.rs:64:56
    |
 LL | struct Cl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), C=(), U, 'b, V, 'c>> {
-   |                                                        ^^                       ^^     ^^
+   |                                                        ^^
+   |
+   = note: type arguments must be provided before lifetime arguments
 
-error: lifetime arguments must be declared prior to type arguments
+error[E0747]: lifetime provided when a type was expected
   --> $DIR/suggest-move-types.rs:80:56
    |
 LL | struct Dl<'a, 'b, 'c, T, U, V, M: ThreeWithLifetime<T, 'a, A=(), B=(), U, 'b, C=(), V, 'c>> {
-   |                                                        ^^                 ^^           ^^
+   |                                                        ^^
+   |
+   = note: type arguments must be provided before lifetime arguments
 
 error: aborting due to 12 previous errors
 
+For more information about this error, try `rustc --explain E0747`.
diff --git a/src/test/ui/suggestions/suggest-remove-refs-1.stderr b/src/test/ui/suggestions/suggest-remove-refs-1.stderr
index bfc313cabd..fcaddd40d2 100644
--- a/src/test/ui/suggestions/suggest-remove-refs-1.stderr
+++ b/src/test/ui/suggestions/suggest-remove-refs-1.stderr
@@ -5,7 +5,7 @@ LL |     for (i, n) in &v.iter().enumerate() {
    |                   -^^^^^^^^^^^^^^^^^^^^
    |                   |
    |                   `&std::iter::Enumerate<std::slice::Iter<'_, {integer}>>` is not an iterator
-   |                   help: consider removing 1 leading `&`-references
+   |                   help: consider removing the leading `&`-reference
    |
    = help: the trait `std::iter::Iterator` is not implemented for `&std::iter::Enumerate<std::slice::Iter<'_, {integer}>>`
    = note: required by `std::iter::IntoIterator::into_iter`
diff --git a/src/test/ui/suggestions/suggest-split-at-mut.rs b/src/test/ui/suggestions/suggest-split-at-mut.rs
new file mode 100644
index 0000000000..d294c20b82
--- /dev/null
+++ b/src/test/ui/suggestions/suggest-split-at-mut.rs
@@ -0,0 +1,8 @@
+fn main() {
+    let mut foo = [1, 2, 3, 4];
+    let a = &mut foo[2];
+    let b = &mut foo[3]; //~ ERROR cannot borrow `foo[_]` as mutable more than once at a time
+    *a = 5;
+    *b = 6;
+    println!("{:?} {:?}", a, b);
+}
diff --git a/src/test/ui/suggestions/suggest-split-at-mut.stderr b/src/test/ui/suggestions/suggest-split-at-mut.stderr
new file mode 100644
index 0000000000..330f012b2a
--- /dev/null
+++ b/src/test/ui/suggestions/suggest-split-at-mut.stderr
@@ -0,0 +1,15 @@
+error[E0499]: cannot borrow `foo[_]` as mutable more than once at a time
+  --> $DIR/suggest-split-at-mut.rs:4:13
+   |
+LL |     let a = &mut foo[2];
+   |             ----------- first mutable borrow occurs here
+LL |     let b = &mut foo[3];
+   |             ^^^^^^^^^^^ second mutable borrow occurs here
+LL |     *a = 5;
+   |     ------ first borrow later used here
+   |
+   = help: consider using `.split_at_mut(position)` or similar method to obtain two mutable non-overlapping sub-slices
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-method.stderr b/src/test/ui/suggestions/type-ascription-instead-of-method.stderr
index 4a8d2f57d8..998129ebd1 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-method.stderr
+++ b/src/test/ui/suggestions/type-ascription-instead-of-method.stderr
@@ -7,7 +7,7 @@ LL |     Box:new("foo".to_string())
    |        help: maybe write a path separator here: `::`
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-path-2.stderr b/src/test/ui/suggestions/type-ascription-instead-of-path-2.stderr
index db793c84cf..0dd1494414 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-path-2.stderr
+++ b/src/test/ui/suggestions/type-ascription-instead-of-path-2.stderr
@@ -7,7 +7,7 @@ LL |     vec![Ok(2)].into_iter().collect:<Result<Vec<_>,_>>()?;
    |                                    help: maybe write a path separator here: `::`
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/type-ascription-instead-of-variant.stderr b/src/test/ui/suggestions/type-ascription-instead-of-variant.stderr
index 7e9a31c06c..5b40e16a51 100644
--- a/src/test/ui/suggestions/type-ascription-instead-of-variant.stderr
+++ b/src/test/ui/suggestions/type-ascription-instead-of-variant.stderr
@@ -7,7 +7,7 @@ LL |     let _ = Option:Some("");
    |                   help: maybe write a path separator here: `::`
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/suggestions/unused-closure-argument.stderr b/src/test/ui/suggestions/unused-closure-argument.stderr
index 5cfdd79659..d83ab08e71 100644
--- a/src/test/ui/suggestions/unused-closure-argument.stderr
+++ b/src/test/ui/suggestions/unused-closure-argument.stderr
@@ -4,7 +4,7 @@ error: unused variable: `x`
 LL |         .map(|Point { x, y }| y)
    |                       ^ help: try ignoring the field: `x: _`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-closure-argument.rs:1:9
    |
 LL | #![deny(unused_variables)]
diff --git a/src/test/ui/suggestions/vec-macro-in-pattern.stderr b/src/test/ui/suggestions/vec-macro-in-pattern.stderr
index 1634fdde7d..f9d0464ac8 100644
--- a/src/test/ui/suggestions/vec-macro-in-pattern.stderr
+++ b/src/test/ui/suggestions/vec-macro-in-pattern.stderr
@@ -10,7 +10,7 @@ LL |         Some(vec![_x]) => (),
    |              help: use a slice pattern here instead: `[_x]`
    |
    = help: for more information, see https://doc.rust-lang.org/edition-guide/rust-2018/slice-patterns.html
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/super-fast-paren-parsing.rs b/src/test/ui/super-fast-paren-parsing.rs
index 60c8db53a8..cb42ff2c64 100644
--- a/src/test/ui/super-fast-paren-parsing.rs
+++ b/src/test/ui/super-fast-paren-parsing.rs
@@ -1,5 +1,6 @@
 // run-pass
 
+#![allow(unused_parens)]
 #![allow(non_upper_case_globals)]
 #![allow(dead_code)]
 // exec-env:RUST_MIN_STACK=16000000
diff --git a/src/test/ui/suppressed-error.stderr b/src/test/ui/suppressed-error.stderr
index 846cd2adcd..c2874ae9a1 100644
--- a/src/test/ui/suppressed-error.stderr
+++ b/src/test/ui/suppressed-error.stderr
@@ -2,7 +2,9 @@ error[E0308]: mismatched types
   --> $DIR/suppressed-error.rs:2:9
    |
 LL |     let (x, y) = ();
-   |         ^^^^^^ expected `()`, found tuple
+   |         ^^^^^^   -- this expression has type `()`
+   |         |
+   |         expected `()`, found tuple
    |
    = note: expected unit type `()`
                   found tuple `(_, _)`
diff --git a/src/test/ui/syntax-trait-polarity-feature-gate.stderr b/src/test/ui/syntax-trait-polarity-feature-gate.stderr
index c546bc4ef7..ed76377278 100644
--- a/src/test/ui/syntax-trait-polarity-feature-gate.stderr
+++ b/src/test/ui/syntax-trait-polarity-feature-gate.stderr
@@ -4,7 +4,7 @@ error[E0658]: negative trait bounds are not yet fully implemented; use marker ty
 LL | impl !Send for TestType {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/13231
+   = note: see issue #13231 <https://github.com/rust-lang/rust/issues/13231> for more information
    = help: add `#![feature(optin_builtin_traits)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/syntax-trait-polarity.stderr b/src/test/ui/syntax-trait-polarity.stderr
index b66db9feed..fef3a65088 100644
--- a/src/test/ui/syntax-trait-polarity.stderr
+++ b/src/test/ui/syntax-trait-polarity.stderr
@@ -8,7 +8,9 @@ error[E0198]: negative impls cannot be unsafe
   --> $DIR/syntax-trait-polarity.rs:12:1
    |
 LL | unsafe impl !Send for TestType {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ------^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | unsafe because of this
 
 error: inherent impls cannot be negative
   --> $DIR/syntax-trait-polarity.rs:19:1
@@ -20,7 +22,9 @@ error[E0198]: negative impls cannot be unsafe
   --> $DIR/syntax-trait-polarity.rs:22:1
    |
 LL | unsafe impl<T> !Send for TestType2<T> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | |
+   | unsafe because of this
 
 error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`)
   --> $DIR/syntax-trait-polarity.rs:14:1
diff --git a/src/test/ui/target-feature/gate.stderr b/src/test/ui/target-feature/gate.stderr
index 423a893e88..848538a4e9 100644
--- a/src/test/ui/target-feature/gate.stderr
+++ b/src/test/ui/target-feature/gate.stderr
@@ -4,7 +4,7 @@ error[E0658]: the target feature `avx512bw` is currently unstable
 LL | #[target_feature(enable = "avx512bw")]
    |                  ^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/44839
+   = note: see issue #44839 <https://github.com/rust-lang/rust/issues/44839> for more information
    = help: add `#![feature(avx512_target_feature)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/test-attrs/test-warns-dead-code.stderr b/src/test/ui/test-attrs/test-warns-dead-code.stderr
index cb118cdb41..d3bcea2951 100644
--- a/src/test/ui/test-attrs/test-warns-dead-code.stderr
+++ b/src/test/ui/test-attrs/test-warns-dead-code.stderr
@@ -4,7 +4,7 @@ error: function is never used: `dead`
 LL | fn dead() {}
    |    ^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/test-warns-dead-code.rs:3:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/test-panic-abort-nocapture.rs b/src/test/ui/test-panic-abort-nocapture.rs
new file mode 100644
index 0000000000..75f7983865
--- /dev/null
+++ b/src/test/ui/test-panic-abort-nocapture.rs
@@ -0,0 +1,39 @@
+// no-prefer-dynamic
+// compile-flags: --test -Cpanic=abort -Zpanic_abort_tests
+// run-flags: --test-threads=1 --nocapture
+// run-fail
+// check-run-results
+// exec-env:RUST_BACKTRACE=0
+
+// ignore-wasm no panic or subprocess support
+// ignore-emscripten no panic or subprocess support
+
+#![cfg(test)]
+
+use std::io::Write;
+
+#[test]
+fn it_works() {
+    println!("about to succeed");
+    assert_eq!(1 + 1, 2);
+}
+
+#[test]
+#[should_panic]
+fn it_panics() {
+    println!("about to panic");
+    assert_eq!(1 + 1, 4);
+}
+
+#[test]
+fn it_fails() {
+    println!("about to fail");
+    assert_eq!(1 + 1, 4);
+}
+
+#[test]
+fn it_writes_to_stdio() {
+    println!("hello, world");
+    writeln!(std::io::stdout(), "testing123").unwrap();
+    writeln!(std::io::stderr(), "testing321").unwrap();
+}
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stderr b/src/test/ui/test-panic-abort-nocapture.run.stderr
new file mode 100644
index 0000000000..37fbe3d3ff
--- /dev/null
+++ b/src/test/ui/test-panic-abort-nocapture.run.stderr
@@ -0,0 +1,9 @@
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `2`,
+ right: `4`', $DIR/test-panic-abort-nocapture.rs:31:5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+thread 'main' panicked at 'assertion failed: `(left == right)`
+  left: `2`,
+ right: `4`', $DIR/test-panic-abort-nocapture.rs:25:5
+note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
+testing321
diff --git a/src/test/ui/test-panic-abort-nocapture.run.stdout b/src/test/ui/test-panic-abort-nocapture.run.stdout
new file mode 100644
index 0000000000..87a246db5e
--- /dev/null
+++ b/src/test/ui/test-panic-abort-nocapture.run.stdout
@@ -0,0 +1,23 @@
+
+running 4 tests
+test it_fails ... about to fail
+FAILED
+test it_panics ... about to panic
+ok
+test it_works ... about to succeed
+ok
+test it_writes_to_stdio ... hello, world
+testing123
+ok
+
+failures:
+
+---- it_fails stdout ----
+---- it_fails stderr ----
+
+
+failures:
+    it_fails
+
+test result: FAILED. 3 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
+
diff --git a/src/test/ui/tool-attributes/diagnostic_item.stderr b/src/test/ui/tool-attributes/diagnostic_item.stderr
index 5432f8dea8..743e4b658c 100644
--- a/src/test/ui/tool-attributes/diagnostic_item.stderr
+++ b/src/test/ui/tool-attributes/diagnostic_item.stderr
@@ -4,7 +4,6 @@ error[E0658]: diagnostic items compiler internal support for linting
 LL | #[rustc_diagnostic_item = "foomp"]
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29642
    = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/tool_lints-fail.stderr b/src/test/ui/tool_lints-fail.stderr
index a61157f21b..16f678144a 100644
--- a/src/test/ui/tool_lints-fail.stderr
+++ b/src/test/ui/tool_lints-fail.stderr
@@ -4,7 +4,7 @@ error: unknown lint: `clippy`
 LL | #![deny(clippy)]
    |         ^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/tool_lints-fail.rs:4:9
    |
 LL | #![deny(unknown_lints)]
diff --git a/src/test/ui/trace_macros-gate.stderr b/src/test/ui/trace_macros-gate.stderr
index 7b95427307..36d7dfdf8f 100644
--- a/src/test/ui/trace_macros-gate.stderr
+++ b/src/test/ui/trace_macros-gate.stderr
@@ -4,7 +4,7 @@ error[E0658]: use of unstable library feature 'trace_macros': `trace_macros` is
 LL |     trace_macros!();
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(trace_macros)]` to the crate attributes to enable
 
 error: trace_macros! accepts only `true` or `false`
@@ -19,7 +19,7 @@ error[E0658]: use of unstable library feature 'trace_macros': `trace_macros` is
 LL |     trace_macros!(true);
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(trace_macros)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'trace_macros': `trace_macros` is not stable enough for use and is subject to change
@@ -28,7 +28,7 @@ error[E0658]: use of unstable library feature 'trace_macros': `trace_macros` is
 LL |     trace_macros!(false);
    |     ^^^^^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(trace_macros)]` to the crate attributes to enable
 
 error[E0658]: use of unstable library feature 'trace_macros': `trace_macros` is not stable enough for use and is subject to change
@@ -40,8 +40,9 @@ LL |         ($x: ident) => { trace_macros!($x) }
 LL |     expando!(true);
    |     --------------- in this macro invocation
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29598
+   = note: see issue #29598 <https://github.com/rust-lang/rust/issues/29598> for more information
    = help: add `#![feature(trace_macros)]` to the crate attributes to enable
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 5 previous errors
 
diff --git a/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs b/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs
new file mode 100644
index 0000000000..86029473b5
--- /dev/null
+++ b/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.rs
@@ -0,0 +1,11 @@
+#![allow(dead_code)]
+#![feature(optin_builtin_traits)]
+
+// Overlapping negative impls for `MyStruct` are not permitted:
+struct MyStruct;
+impl !Send for MyStruct {}
+impl !Send for MyStruct {}
+//~^ ERROR conflicting implementations of trait
+
+fn main() {
+}
diff --git a/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr b/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr
new file mode 100644
index 0000000000..94a0c287f4
--- /dev/null
+++ b/src/test/ui/traits/overlap-not-permitted-for-builtin-trait.stderr
@@ -0,0 +1,11 @@
+error[E0119]: conflicting implementations of trait `std::marker::Send` for type `MyStruct`:
+  --> $DIR/overlap-not-permitted-for-builtin-trait.rs:7:1
+   |
+LL | impl !Send for MyStruct {}
+   | ----------------------- first implementation here
+LL | impl !Send for MyStruct {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `MyStruct`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0119`.
diff --git a/src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs b/src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs
deleted file mode 100644
index bc8dc8dbd0..0000000000
--- a/src/test/ui/traits/overlap-permitted-for-marker-traits-neg.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![feature(overlapping_marker_traits)]
-#![feature(optin_builtin_traits)]
-
-// Overlapping negative impls for `MyStruct` are permitted:
-struct MyStruct;
-impl !Send for MyStruct {}
-impl !Send for MyStruct {}
-
-fn main() {
-}
diff --git a/src/test/ui/traits/overlap-permitted-for-marker-traits.rs b/src/test/ui/traits/overlap-permitted-for-marker-traits.rs
deleted file mode 100644
index 59ec9d5689..0000000000
--- a/src/test/ui/traits/overlap-permitted-for-marker-traits.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// run-pass
-// Tests for RFC 1268: we allow overlapping impls of marker traits,
-// that is, traits without items. In this case, a type `T` is
-// `MyMarker` if it is either `Debug` or `Display`.
-
-#![feature(overlapping_marker_traits)]
-#![feature(optin_builtin_traits)]
-
-use std::fmt::{Debug, Display};
-
-trait MyMarker {}
-
-impl<T: Debug> MyMarker for T {}
-impl<T: Display> MyMarker for T {}
-
-fn foo<T: MyMarker>(t: T) -> T {
-    t
-}
-
-fn main() {
-    // Debug && Display:
-    assert_eq!(1, foo(1));
-    assert_eq!(2.0, foo(2.0));
-
-    // Debug && !Display:
-    assert_eq!(vec![1], foo(vec![1]));
-}
diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs b/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs
index 775278c30c..fa4a309315 100644
--- a/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs
+++ b/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.rs
@@ -1,5 +1,3 @@
-// compile-fail
-
 // check that reservation impls are accounted for in negative reasoning.
 
 #![feature(rustc_attrs)]
diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.stderr b/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.stderr
index 47e141bd04..d76d3a91c8 100644
--- a/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.stderr
+++ b/src/test/ui/traits/reservation-impls/reservation-impl-coherence-conflict.stderr
@@ -1,5 +1,5 @@
 error[E0119]: conflicting implementations of trait `OtherTrait` for type `()`:
-  --> $DIR/reservation-impl-coherence-conflict.rs:13:1
+  --> $DIR/reservation-impl-coherence-conflict.rs:11:1
    |
 LL | impl OtherTrait for () {}
    | ---------------------- first implementation here
diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-no-use.rs b/src/test/ui/traits/reservation-impls/reservation-impl-no-use.rs
index 3391daaabe..65a55d9e20 100644
--- a/src/test/ui/traits/reservation-impls/reservation-impl-no-use.rs
+++ b/src/test/ui/traits/reservation-impls/reservation-impl-no-use.rs
@@ -1,5 +1,3 @@
-// compile-fail
-
 // check that reservation impls can't be used as normal impls in positive reasoning.
 
 #![feature(rustc_attrs)]
diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr b/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr
index 0cd56b978f..794faff884 100644
--- a/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr
+++ b/src/test/ui/traits/reservation-impls/reservation-impl-no-use.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the trait bound `(): MyTrait` is not satisfied
-  --> $DIR/reservation-impl-no-use.rs:12:26
+  --> $DIR/reservation-impl-no-use.rs:10:26
    |
 LL | trait MyTrait { fn foo(&self); }
    |                 -------------- required by `MyTrait::foo`
diff --git a/src/test/ui/traits/trait-alias/trait-alias-object-fail.rs b/src/test/ui/traits/trait-alias/trait-alias-object-fail.rs
index d62fd7e59c..3be8db8663 100644
--- a/src/test/ui/traits/trait-alias/trait-alias-object-fail.rs
+++ b/src/test/ui/traits/trait-alias/trait-alias-object-fail.rs
@@ -1,3 +1,8 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
+
 #![feature(trait_alias)]
 
 trait EqAlias = Eq;
diff --git a/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr b/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr
index 5551b1303b..21818097bd 100644
--- a/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr
+++ b/src/test/ui/traits/trait-alias/trait-alias-object-fail.stderr
@@ -1,13 +1,16 @@
 error[E0038]: the trait `std::cmp::Eq` cannot be made into an object
-  --> $DIR/trait-alias-object-fail.rs:7:13
+  --> $DIR/trait-alias-object-fail.rs:12:13
    |
 LL |     let _: &dyn EqAlias = &123;
    |             ^^^^^^^^^^^ the trait `std::cmp::Eq` cannot be made into an object
+   | 
+  ::: $SRC_DIR/libcore/cmp.rs:LL:COL
    |
-   = note: the trait cannot use `Self` as a type parameter in the supertraits or where-clauses
+LL | pub trait Eq: PartialEq<Self> {
+   |               --------------- the trait cannot be made into an object because it uses `Self` as a type parameter in this
 
 error[E0191]: the value of the associated type `Item` (from trait `std::iter::Iterator`) must be specified
-  --> $DIR/trait-alias-object-fail.rs:9:17
+  --> $DIR/trait-alias-object-fail.rs:14:17
    |
 LL |     let _: &dyn IteratorAlias = &vec![123].into_iter();
    |                 ^^^^^^^^^^^^^ help: specify the associated type: `IteratorAlias<Item = Type>`
diff --git a/src/test/ui/traits/trait-alias/trait-alias-wf.stderr b/src/test/ui/traits/trait-alias/trait-alias-wf.stderr
index 4355a517bd..e7ed16a02a 100644
--- a/src/test/ui/traits/trait-alias/trait-alias-wf.stderr
+++ b/src/test/ui/traits/trait-alias/trait-alias-wf.stderr
@@ -1,13 +1,16 @@
 error[E0277]: the trait bound `T: Foo` is not satisfied
-  --> $DIR/trait-alias-wf.rs:5:1
+  --> $DIR/trait-alias-wf.rs:5:14
    |
 LL | trait A<T: Foo> {}
    | --------------- required by `A`
 LL | trait B<T> = A<T>;
-   | ^^^^^^^^-^^^^^^^^^
-   | |       |
-   | |       help: consider restricting this bound: `T: Foo`
-   | the trait `Foo` is not implemented for `T`
+   |              ^^^^ the trait `Foo` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: Foo`
+  --> $DIR/trait-alias-wf.rs:5:9
+   |
+LL | trait B<T> = A<T>;
+   |         ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr
index 3c68d461f8..a2253021a7 100644
--- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr
+++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-in-fns.stderr
@@ -1,20 +1,20 @@
 error[E0277]: the trait bound `u32: Trait` is not satisfied
-  --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:13:1
+  --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:13:15
    |
 LL | struct Foo<T:Trait> {
    | ------------------- required by `Foo`
 ...
 LL | fn explode(x: Foo<u32>) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `u32`
+   |               ^^^^^^^^ the trait `Trait` is not implemented for `u32`
 
 error[E0277]: the trait bound `f32: Trait` is not satisfied
-  --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:16:1
+  --> $DIR/trait-bounds-on-structs-and-enums-in-fns.rs:16:14
    |
 LL | enum Bar<T:Trait> {
    | ----------------- required by `Bar`
 ...
 LL | fn kaboom(y: Bar<f32>) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `f32`
+   |              ^^^^^^^^ the trait `Trait` is not implemented for `f32`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr
index 2f2c903a45..c5a7746afd 100644
--- a/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr
+++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums-xc.stderr
@@ -1,16 +1,16 @@
 error[E0277]: the trait bound `usize: trait_bounds_on_structs_and_enums_xc::Trait` is not satisfied
-  --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:7:1
+  --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:7:15
    |
 LL | fn explode(x: Foo<usize>) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `usize`
+   |               ^^^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `usize`
    |
    = note: required by `trait_bounds_on_structs_and_enums_xc::Foo`
 
 error[E0277]: the trait bound `f32: trait_bounds_on_structs_and_enums_xc::Trait` is not satisfied
-  --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:10:1
+  --> $DIR/trait-bounds-on-structs-and-enums-xc.rs:10:14
    |
 LL | fn kaboom(y: Bar<f32>) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `f32`
+   |              ^^^^^^^^ the trait `trait_bounds_on_structs_and_enums_xc::Trait` is not implemented for `f32`
    |
    = note: required by `trait_bounds_on_structs_and_enums_xc::Bar`
 
diff --git a/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr b/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr
index 96bbd1f3e4..56a9e3ff54 100644
--- a/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr
+++ b/src/test/ui/traits/trait-bounds-on-structs-and-enums.stderr
@@ -5,9 +5,13 @@ LL | struct Foo<T:Trait> {
    | ------------------- required by `Foo`
 ...
 LL | impl<T> Foo<T> {
-   |      -  ^^^^^^ the trait `Trait` is not implemented for `T`
-   |      |
-   |      help: consider restricting this bound: `T: Trait`
+   |         ^^^^^^ the trait `Trait` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: Trait`
+  --> $DIR/trait-bounds-on-structs-and-enums.rs:13:6
+   |
+LL | impl<T> Foo<T> {
+   |      ^
 
 error[E0277]: the trait bound `isize: Trait` is not satisfied
   --> $DIR/trait-bounds-on-structs-and-enums.rs:19:5
@@ -33,10 +37,14 @@ error[E0277]: the trait bound `U: Trait` is not satisfied
 LL | struct Foo<T:Trait> {
    | ------------------- required by `Foo`
 ...
-LL | struct Badness<U> {
-   |                - help: consider restricting this bound: `U: Trait`
 LL |     b: Foo<U>,
    |     ^^^^^^^^^ the trait `Trait` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `U: Trait`
+  --> $DIR/trait-bounds-on-structs-and-enums.rs:26:16
+   |
+LL | struct Badness<U> {
+   |                ^
 
 error[E0277]: the trait bound `V: Trait` is not satisfied
   --> $DIR/trait-bounds-on-structs-and-enums.rs:31:21
@@ -44,10 +52,14 @@ error[E0277]: the trait bound `V: Trait` is not satisfied
 LL | enum Bar<T:Trait> {
    | ----------------- required by `Bar`
 ...
-LL | enum MoreBadness<V> {
-   |                  - help: consider restricting this bound: `V: Trait`
 LL |     EvenMoreBadness(Bar<V>),
    |                     ^^^^^^ the trait `Trait` is not implemented for `V`
+   |
+help: consider restricting this type parameter with `V: Trait`
+  --> $DIR/trait-bounds-on-structs-and-enums.rs:30:18
+   |
+LL | enum MoreBadness<V> {
+   |                  ^
 
 error[E0277]: the trait bound `i32: Trait` is not satisfied
   --> $DIR/trait-bounds-on-structs-and-enums.rs:35:5
diff --git a/src/test/ui/traits/trait-item-privacy.stderr b/src/test/ui/traits/trait-item-privacy.stderr
index 4df8845de2..2c0591c95f 100644
--- a/src/test/ui/traits/trait-item-privacy.stderr
+++ b/src/test/ui/traits/trait-item-privacy.stderr
@@ -8,8 +8,11 @@ LL |     S.a();
    |       ^ method not found in `S`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `a`, perhaps you need to implement it:
-           candidate #1: `method::A`
+note: `method::A` defines an item `a`, perhaps you need to implement it
+  --> $DIR/trait-item-privacy.rs:6:5
+   |
+LL |     trait A {
+   |     ^^^^^^^
 
 error[E0599]: no method named `b` found for struct `S` in the current scope
   --> $DIR/trait-item-privacy.rs:68:7
@@ -49,8 +52,11 @@ LL |     S::a(&S);
    |        ^ function or associated item not found in `S`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `a`, perhaps you need to implement it:
-           candidate #1: `method::A`
+note: `method::A` defines an item `a`, perhaps you need to implement it
+  --> $DIR/trait-item-privacy.rs:6:5
+   |
+LL |     trait A {
+   |     ^^^^^^^
 
 error[E0599]: no function or associated item named `b` found for struct `S` in the current scope
   --> $DIR/trait-item-privacy.rs:80:8
@@ -83,8 +89,11 @@ LL |     S::A;
    |        ^ associated item not found in `S`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `A`, perhaps you need to implement it:
-           candidate #1: `assoc_const::A`
+note: `assoc_const::A` defines an item `A`, perhaps you need to implement it
+  --> $DIR/trait-item-privacy.rs:24:5
+   |
+LL |     trait A {
+   |     ^^^^^^^
 
 error[E0599]: no associated item named `B` found for struct `S` in the current scope
   --> $DIR/trait-item-privacy.rs:98:8
@@ -111,16 +120,22 @@ error[E0038]: the trait `assoc_const::C` cannot be made into an object
   --> $DIR/trait-item-privacy.rs:101:5
    |
 LL |         const A: u8 = 0;
-   |               - the trait cannot contain associated consts like `A`
+   |               - ...because it contains this associated `const`
 ...
 LL |         const B: u8 = 0;
-   |               - the trait cannot contain associated consts like `B`
+   |               - ...because it contains this associated `const`
 ...
+LL |     pub trait C: A + B {
+   |               - this trait cannot be made into an object...
 LL |         const C: u8 = 0;
-   |               - the trait cannot contain associated consts like `C`
+   |               - ...because it contains this associated `const`
 ...
 LL |     C::A;
    |     ^^^^ the trait `assoc_const::C` cannot be made into an object
+   |
+   = help: consider moving `C` to another trait
+   = help: consider moving `B` to another trait
+   = help: consider moving `A` to another trait
 
 error[E0223]: ambiguous associated type
   --> $DIR/trait-item-privacy.rs:115:12
diff --git a/src/test/ui/traits/trait-object-macro-matcher.stderr b/src/test/ui/traits/trait-object-macro-matcher.stderr
index 6b5effaad9..a8511f63c1 100644
--- a/src/test/ui/traits/trait-object-macro-matcher.stderr
+++ b/src/test/ui/traits/trait-object-macro-matcher.stderr
@@ -10,7 +10,7 @@ error[E0038]: the trait `std::marker::Copy` cannot be made into an object
 LL |     m!(dyn Copy + Send + 'static);
    |        ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
+   = note: the trait cannot be made into an object because it requires `Self: Sized`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/traits/trait-object-safety.stderr b/src/test/ui/traits/trait-object-safety.stderr
index 028e9eedd6..162e9249b8 100644
--- a/src/test/ui/traits/trait-object-safety.stderr
+++ b/src/test/ui/traits/trait-object-safety.stderr
@@ -1,23 +1,36 @@
 error[E0038]: the trait `Tr` cannot be made into an object
   --> $DIR/trait-object-safety.rs:15:22
    |
+LL | trait Tr {
+   |       -- this trait cannot be made into an object...
 LL |     fn foo();
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL |     let _: &dyn Tr = &St;
    |                      ^^^ the trait `Tr` cannot be made into an object
    |
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Tr>` for `&St`
    = note: required by cast to type `&dyn Tr`
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Sized;
+   |              ^^^^^^^^^^^^^^^^^
 
 error[E0038]: the trait `Tr` cannot be made into an object
   --> $DIR/trait-object-safety.rs:15:12
    |
+LL | trait Tr {
+   |       -- this trait cannot be made into an object...
 LL |     fn foo();
-   |        --- associated function `foo` has no `self` parameter
+   |        --- ...because associated function `foo` has no `self` parameter
 ...
 LL |     let _: &dyn Tr = &St;
    |            ^^^^^^^ the trait `Tr` cannot be made into an object
+   |
+help: consider turning `foo` into a method by giving it a `&self` argument or constraining it so it does not apply to trait objects
+   |
+LL |     fn foo() where Self: Sized;
+   |              ^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/traits/trait-object-vs-lifetime.rs b/src/test/ui/traits/trait-object-vs-lifetime.rs
index e0ff734948..e885cd2f68 100644
--- a/src/test/ui/traits/trait-object-vs-lifetime.rs
+++ b/src/test/ui/traits/trait-object-vs-lifetime.rs
@@ -12,6 +12,6 @@ fn main() {
     //~^ ERROR wrong number of lifetime arguments: expected 1, found 2
     //~| ERROR wrong number of type arguments: expected 1, found 0
     let _: S<dyn 'static +, 'static>;
-    //~^ ERROR lifetime arguments must be declared prior to type arguments
+    //~^ ERROR type provided when a lifetime was expected
     //~| ERROR at least one trait is required for an object type
 }
diff --git a/src/test/ui/traits/trait-object-vs-lifetime.stderr b/src/test/ui/traits/trait-object-vs-lifetime.stderr
index be1958770a..04529fb8cf 100644
--- a/src/test/ui/traits/trait-object-vs-lifetime.stderr
+++ b/src/test/ui/traits/trait-object-vs-lifetime.stderr
@@ -1,9 +1,3 @@
-error: lifetime arguments must be declared prior to type arguments
-  --> $DIR/trait-object-vs-lifetime.rs:14:29
-   |
-LL |     let _: S<dyn 'static +, 'static>;
-   |                             ^^^^^^^
-
 error[E0224]: at least one trait is required for an object type
   --> $DIR/trait-object-vs-lifetime.rs:9:23
    |
@@ -28,6 +22,15 @@ error[E0224]: at least one trait is required for an object type
 LL |     let _: S<dyn 'static +, 'static>;
    |              ^^^^^^^^^^^^^
 
+error[E0747]: type provided when a lifetime was expected
+  --> $DIR/trait-object-vs-lifetime.rs:14:14
+   |
+LL |     let _: S<dyn 'static +, 'static>;
+   |              ^^^^^^^^^^^^^
+   |
+   = note: lifetime arguments must be provided before type arguments
+
 error: aborting due to 5 previous errors
 
-For more information about this error, try `rustc --explain E0107`.
+Some errors have detailed explanations: E0107, E0747.
+For more information about an error, try `rustc --explain E0107`.
diff --git a/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr
index 8d7ba36c66..29216f36f5 100644
--- a/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr
+++ b/src/test/ui/traits/trait-resolution-in-overloaded-op.stderr
@@ -5,8 +5,6 @@ LL |     a * b
    |     - ^ - f64
    |     |
    |     &T
-   |
-   = note: an implementation of `std::ops::Mul` might be missing for `&T`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/traits/trait-safety-inherent-impl.stderr b/src/test/ui/traits/trait-safety-inherent-impl.stderr
index 3911261083..c398785d39 100644
--- a/src/test/ui/traits/trait-safety-inherent-impl.stderr
+++ b/src/test/ui/traits/trait-safety-inherent-impl.stderr
@@ -1,7 +1,11 @@
 error[E0197]: inherent impls cannot be unsafe
   --> $DIR/trait-safety-inherent-impl.rs:5:1
    |
-LL | / unsafe impl SomeStruct {
+LL |   unsafe impl SomeStruct {
+   |   ^-----
+   |   |
+   |  _unsafe because of this
+   | |
 LL | |     fn foo(self) { }
 LL | | }
    | |_^
diff --git a/src/test/ui/traits/trait-suggest-where-clause.stderr b/src/test/ui/traits/trait-suggest-where-clause.stderr
index 831dd43929..9680d58b8c 100644
--- a/src/test/ui/traits/trait-suggest-where-clause.stderr
+++ b/src/test/ui/traits/trait-suggest-where-clause.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `U` cannot be known at compilation tim
   --> $DIR/trait-suggest-where-clause.rs:11:20
    |
 LL | fn check<T: Iterator, U: ?Sized>() {
-   |                       -- help: consider further restricting this bound: `U: std::marker::Sized +`
+   |                       - this type parameter needs to be `std::marker::Sized`
 LL |     // suggest a where-clause, if needed
 LL |     mem::size_of::<U>();
    |                    ^ doesn't have a size known at compile-time
@@ -19,7 +19,7 @@ error[E0277]: the size for values of type `U` cannot be known at compilation tim
   --> $DIR/trait-suggest-where-clause.rs:14:5
    |
 LL | fn check<T: Iterator, U: ?Sized>() {
-   |                       -- help: consider further restricting this bound: `U: std::marker::Sized +`
+   |                       - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     mem::size_of::<Misc<U>>();
    |     ^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
diff --git a/src/test/ui/traits/trait-test-2.stderr b/src/test/ui/traits/trait-test-2.stderr
index 9b750d382e..9d1eef5475 100644
--- a/src/test/ui/traits/trait-test-2.stderr
+++ b/src/test/ui/traits/trait-test-2.stderr
@@ -14,24 +14,31 @@ error[E0038]: the trait `bar` cannot be made into an object
   --> $DIR/trait-test-2.rs:11:16
    |
 LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |                ---                    ---- method `blah` has generic type parameters
-   |                |
-   |                method `dup` references the `Self` type in its parameters or return type
+   |       ---                    ----     ---- ...because method `blah` has generic type parameters
+   |       |                      |
+   |       |                      ...because method `dup` references the `Self` type in its return type
+   |       this trait cannot be made into an object...
 ...
 LL |     (box 10 as Box<dyn bar>).dup();
    |                ^^^^^^^^^^^^ the trait `bar` cannot be made into an object
+   |
+   = help: consider moving `dup` to another trait
+   = help: consider moving `blah` to another trait
 
 error[E0038]: the trait `bar` cannot be made into an object
   --> $DIR/trait-test-2.rs:11:6
    |
 LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |                ---                    ---- method `blah` has generic type parameters
-   |                |
-   |                method `dup` references the `Self` type in its parameters or return type
+   |       ---                    ----     ---- ...because method `blah` has generic type parameters
+   |       |                      |
+   |       |                      ...because method `dup` references the `Self` type in its return type
+   |       this trait cannot be made into an object...
 ...
 LL |     (box 10 as Box<dyn bar>).dup();
    |      ^^^^^^ the trait `bar` cannot be made into an object
    |
+   = help: consider moving `dup` to another trait
+   = help: consider moving `blah` to another trait
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<dyn bar>>` for `std::boxed::Box<{integer}>`
    = note: required by cast to type `std::boxed::Box<dyn bar>`
 
diff --git a/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr b/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr
index 85c7a55c31..5b7f32ba1e 100644
--- a/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr
+++ b/src/test/ui/traits/traits-repeated-supertrait-ambig.stderr
@@ -7,10 +7,14 @@ LL |     c.same_as(22)
 error[E0277]: the trait bound `C: CompareTo<i32>` is not satisfied
   --> $DIR/traits-repeated-supertrait-ambig.rs:30:7
    |
-LL | fn with_trait<C:CompareToInts>(c: &C) -> bool {
-   |               -- help: consider further restricting this bound: `C: CompareTo<i32> +`
 LL |     c.same_as(22)
    |       ^^^^^^^ the trait `CompareTo<i32>` is not implemented for `C`
+   |
+help: consider further restricting this bound with `+ CompareTo<i32>`
+  --> $DIR/traits-repeated-supertrait-ambig.rs:29:17
+   |
+LL | fn with_trait<C:CompareToInts>(c: &C) -> bool {
+   |                 ^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `dyn CompareToInts: CompareTo<i32>` is not satisfied
   --> $DIR/traits-repeated-supertrait-ambig.rs:34:5
@@ -27,10 +31,14 @@ error[E0277]: the trait bound `C: CompareTo<i32>` is not satisfied
 LL |     fn same_as(&self, t: T) -> bool;
    |     -------------------------------- required by `CompareTo::same_as`
 ...
-LL | fn with_ufcs2<C:CompareToInts>(c: &C) -> bool {
-   |               -- help: consider further restricting this bound: `C: CompareTo<i32> +`
 LL |     CompareTo::same_as(c, 22)
    |     ^^^^^^^^^^^^^^^^^^ the trait `CompareTo<i32>` is not implemented for `C`
+   |
+help: consider further restricting this bound with `+ CompareTo<i32>`
+  --> $DIR/traits-repeated-supertrait-ambig.rs:37:17
+   |
+LL | fn with_ufcs2<C:CompareToInts>(c: &C) -> bool {
+   |                 ^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `i64: CompareTo<i32>` is not satisfied
   --> $DIR/traits-repeated-supertrait-ambig.rs:42:23
diff --git a/src/test/ui/traits/wf-trait-object-maybe-bound.rs b/src/test/ui/traits/wf-trait-object-maybe-bound.rs
index f24c1301c5..17771e976e 100644
--- a/src/test/ui/traits/wf-trait-object-maybe-bound.rs
+++ b/src/test/ui/traits/wf-trait-object-maybe-bound.rs
@@ -1,5 +1,3 @@
-// compile-fail
-
 // Test that `dyn ... + ?Sized + ...` is okay (though `?Sized` has no effect in trait objects).
 
 trait Foo {}
diff --git a/src/test/ui/traits/wf-trait-object-maybe-bound.stderr b/src/test/ui/traits/wf-trait-object-maybe-bound.stderr
index 11187342d5..4a570efcb5 100644
--- a/src/test/ui/traits/wf-trait-object-maybe-bound.stderr
+++ b/src/test/ui/traits/wf-trait-object-maybe-bound.stderr
@@ -1,29 +1,29 @@
 error: `?Trait` is not permitted in trait object types
-  --> $DIR/wf-trait-object-maybe-bound.rs:7:15
+  --> $DIR/wf-trait-object-maybe-bound.rs:5:15
    |
 LL | type _0 = dyn ?Sized + Foo;
    |               ^^^^^^
 
 error: `?Trait` is not permitted in trait object types
-  --> $DIR/wf-trait-object-maybe-bound.rs:10:21
+  --> $DIR/wf-trait-object-maybe-bound.rs:8:21
    |
 LL | type _1 = dyn Foo + ?Sized;
    |                     ^^^^^^
 
 error: `?Trait` is not permitted in trait object types
-  --> $DIR/wf-trait-object-maybe-bound.rs:13:21
+  --> $DIR/wf-trait-object-maybe-bound.rs:11:21
    |
 LL | type _2 = dyn Foo + ?Sized + ?Sized;
    |                     ^^^^^^
 
 error: `?Trait` is not permitted in trait object types
-  --> $DIR/wf-trait-object-maybe-bound.rs:13:30
+  --> $DIR/wf-trait-object-maybe-bound.rs:11:30
    |
 LL | type _2 = dyn Foo + ?Sized + ?Sized;
    |                              ^^^^^^
 
 error: `?Trait` is not permitted in trait object types
-  --> $DIR/wf-trait-object-maybe-bound.rs:17:15
+  --> $DIR/wf-trait-object-maybe-bound.rs:15:15
    |
 LL | type _3 = dyn ?Sized + Foo;
    |               ^^^^^^
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
index acf309ac60..4e153081d9 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-leak.stderr
@@ -15,8 +15,11 @@ LL |     3i32.test();
    |          ^^^^ method not found in `i32`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `test`, perhaps you need to implement it:
-           candidate #1: `Foo`
+note: `Foo` defines an item `test`, perhaps you need to implement it
+  --> $DIR/trivial-bounds-leak.rs:4:1
+   |
+LL | pub trait Foo {
+   | ^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `i32: Foo` is not satisfied
   --> $DIR/trivial-bounds-leak.rs:25:15
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr b/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr
index 37cf6f89d6..3f2162365d 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-lint.stderr
@@ -4,7 +4,7 @@ error: Trait bound i32: std::marker::Copy does not depend on any type or lifetim
 LL | struct A where i32: Copy;
    |                     ^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial-bounds-lint.rs:3:9
    |
 LL | #![deny(trivial_bounds)]
diff --git a/src/test/ui/trivial_casts.stderr b/src/test/ui/trivial_casts.stderr
index 8fa44372f0..70954f00ba 100644
--- a/src/test/ui/trivial_casts.stderr
+++ b/src/test/ui/trivial_casts.stderr
@@ -4,7 +4,7 @@ error: trivial numeric cast: `i32` as `i32`
 LL |     let _ = 42_i32 as i32;
    |             ^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial_casts.rs:4:24
    |
 LL | #![deny(trivial_casts, trivial_numeric_casts)]
@@ -25,7 +25,7 @@ error: trivial cast: `&u32` as `*const u32`
 LL |     let _ = x as *const u32;
    |             ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/trivial_casts.rs:4:9
    |
 LL | #![deny(trivial_casts, trivial_numeric_casts)]
diff --git a/src/test/ui/try-block/try-block-opt-init.stderr b/src/test/ui/try-block/try-block-opt-init.stderr
index 308906477d..6bae3a8587 100644
--- a/src/test/ui/try-block/try-block-opt-init.stderr
+++ b/src/test/ui/try-block/try-block-opt-init.stderr
@@ -4,7 +4,7 @@ error[E0381]: borrow of possibly-uninitialized variable: `cfg_res`
 LL |     assert_eq!(cfg_res, 5);
    |     ^^^^^^^^^^^^^^^^^^^^^^^ use of possibly-uninitialized `cfg_res`
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr b/src/test/ui/try-block/try-block-unreachable-code-lint.stderr
index 54fed04d40..c883994c87 100644
--- a/src/test/ui/try-block/try-block-unreachable-code-lint.stderr
+++ b/src/test/ui/try-block/try-block-unreachable-code-lint.stderr
@@ -11,7 +11,7 @@ LL | |             }
 LL | |         }
    | |_________^ unreachable expression
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/try-block-unreachable-code-lint.rs:6:9
    |
 LL | #![warn(unreachable_code)]
diff --git a/src/test/ui/tuple/tuple-struct-fields/test2.stderr b/src/test/ui/tuple/tuple-struct-fields/test2.stderr
index 2f1ca2fe0c..d6ea362667 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test2.stderr
+++ b/src/test/ui/tuple/tuple-struct-fields/test2.stderr
@@ -8,6 +8,8 @@ LL |         struct S3(pub $t ());
 ...
 LL |     define_struct! { (foo) }
    |     ------------------------ in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `foo` in this scope
   --> $DIR/test2.rs:11:23
diff --git a/src/test/ui/tuple/tuple-struct-fields/test3.stderr b/src/test/ui/tuple/tuple-struct-fields/test3.stderr
index 5d42fe6ef5..b38513e5a9 100644
--- a/src/test/ui/tuple/tuple-struct-fields/test3.stderr
+++ b/src/test/ui/tuple/tuple-struct-fields/test3.stderr
@@ -8,6 +8,8 @@ LL |         struct S3(pub($t) ());
 ...
 LL |     define_struct! { foo }
    |     ---------------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `foo` in this scope
   --> $DIR/test3.rs:11:22
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs b/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs
index fa3e1a35fc..d012687533 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.rs
@@ -18,6 +18,6 @@ impl E2 {
 }
 
 fn main() {
-    <E>::V(); //~ ERROR this function takes 1 parameter but 0 parameters were supplied
+    <E>::V(); //~ ERROR this function takes 1 argument but 0 arguments were supplied
     let _: u8 = <E2>::V; //~ ERROR mismatched types
 }
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr b/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr
index 95c3a08c04..46e7dd0c51 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-priority-higher-than-other-inherent.stderr
@@ -1,11 +1,13 @@
-error[E0061]: this function takes 1 parameter but 0 parameters were supplied
+error[E0061]: this function takes 1 argument but 0 arguments were supplied
   --> $DIR/enum-variant-priority-higher-than-other-inherent.rs:21:5
    |
 LL |     V(u8)
    |     ----- defined here
 ...
 LL |     <E>::V();
-   |     ^^^^^^^^ expected 1 parameter
+   |     ^^^^^^-- supplied 0 arguments
+   |     |
+   |     expected 1 argument
 
 error[E0308]: mismatched types
   --> $DIR/enum-variant-priority-higher-than-other-inherent.rs:22:17
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs
index 7f69590400..5f3b711b31 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.rs
@@ -32,6 +32,7 @@ impl Tr for E {
     fn f() -> Self::V { 0 }
     //~^ ERROR ambiguous associated item
     //~| WARN this was previously accepted
+    //~| HELP use fully-qualified syntax
 }
 
 fn main() {}
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
index db8767273b..870b1eec48 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
@@ -7,12 +7,12 @@ LL |     fn f() -> Self::V { 0 }
    = note: `#[deny(ambiguous_associated_items)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57644 <https://github.com/rust-lang/rust/issues/57644>
-note: `V` could refer to variant defined here
+note: `V` could refer to the variant defined here
   --> $DIR/enum-variant-priority-lint-ambiguous_associated_items.rs:22:5
    |
 LL |     V
    |     ^
-note: `V` could also refer to associated type defined here
+note: `V` could also refer to the associated type defined here
   --> $DIR/enum-variant-priority-lint-ambiguous_associated_items.rs:26:5
    |
 LL |     type V;
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-const.rs b/src/test/ui/type-alias-impl-trait/assoc-type-const.rs
index 5db677d82e..2907c21c62 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-type-const.rs
+++ b/src/test/ui/type-alias-impl-trait/assoc-type-const.rs
@@ -6,7 +6,7 @@
 #![feature(const_generics)]
 //~^ WARN the feature `const_generics` is incomplete and may cause the compiler to crash
 
-trait UnwrapItemsExt<const C: usize> {
+trait UnwrapItemsExt<'a, const C: usize> {
     type Iter;
     fn unwrap_items(self) -> Self::Iter;
 }
@@ -18,18 +18,16 @@ trait MyTrait<'a, const C: usize> {
     const MY_CONST: usize;
 }
 
-impl<'a, const C: usize> MyTrait<'a, {C}> for MyStruct<{C}> {
+impl<'a, const C: usize> MyTrait<'a, { C }> for MyStruct<{ C }> {
     type MyItem = u8;
     const MY_CONST: usize = C;
 }
 
-impl<'a, I, const C: usize> UnwrapItemsExt<{C}> for I
-where
-{
-    type Iter = impl MyTrait<'a, {C}>;
+impl<'a, I, const C: usize> UnwrapItemsExt<'a, { C }> for I {
+    type Iter = impl MyTrait<'a, { C }>;
 
     fn unwrap_items(self) -> Self::Iter {
-        MyStruct::<{C}> {}
+        MyStruct::<{ C }> {}
     }
 }
 
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs b/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs
new file mode 100644
index 0000000000..3f34b00ec7
--- /dev/null
+++ b/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.rs
@@ -0,0 +1,26 @@
+// Tests that we don't allow unconstrained lifetime parameters in impls when
+// the lifetime is used in an associated opaque type.
+
+#![feature(type_alias_impl_trait)]
+
+trait UnwrapItemsExt {
+    type Iter;
+    fn unwrap_items(self) -> Self::Iter;
+}
+
+struct MyStruct {}
+
+trait MyTrait<'a> {}
+
+impl<'a> MyTrait<'a> for MyStruct {}
+
+impl<'a, I> UnwrapItemsExt for I {
+    //~^ ERROR the lifetime parameter `'a` is not constrained
+    type Iter = impl MyTrait<'a>;
+
+    fn unwrap_items(self) -> Self::Iter {
+        MyStruct {}
+    }
+}
+
+fn main() {}
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr b/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr
new file mode 100644
index 0000000000..e594dc577b
--- /dev/null
+++ b/src/test/ui/type-alias-impl-trait/assoc-type-lifetime-unconstrained.stderr
@@ -0,0 +1,9 @@
+error[E0207]: the lifetime parameter `'a` is not constrained by the impl trait, self type, or predicates
+  --> $DIR/assoc-type-lifetime-unconstrained.rs:17:6
+   |
+LL | impl<'a, I> UnwrapItemsExt for I {
+   |      ^^ unconstrained lifetime parameter
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0207`.
diff --git a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime.rs b/src/test/ui/type-alias-impl-trait/assoc-type-lifetime.rs
index cff1d24494..39f785d8cc 100644
--- a/src/test/ui/type-alias-impl-trait/assoc-type-lifetime.rs
+++ b/src/test/ui/type-alias-impl-trait/assoc-type-lifetime.rs
@@ -4,7 +4,7 @@
 
 #![feature(type_alias_impl_trait)]
 
-trait UnwrapItemsExt {
+trait UnwrapItemsExt<'a> {
     type Iter;
     fn unwrap_items(self) -> Self::Iter;
 }
@@ -15,9 +15,7 @@ trait MyTrait<'a> {}
 
 impl<'a> MyTrait<'a> for MyStruct {}
 
-impl<'a, I> UnwrapItemsExt for I
-where
-{
+impl<'a, I> UnwrapItemsExt<'a> for I {
     type Iter = impl MyTrait<'a>;
 
     fn unwrap_items(self) -> Self::Iter {
diff --git a/src/test/ui/type-alias-impl-trait/bound_reduction2.stderr b/src/test/ui/type-alias-impl-trait/bound_reduction2.stderr
index 1eb4cf2a80..74b858105b 100644
--- a/src/test/ui/type-alias-impl-trait/bound_reduction2.stderr
+++ b/src/test/ui/type-alias-impl-trait/bound_reduction2.stderr
@@ -3,9 +3,12 @@ error[E0277]: the trait bound `T: TraitWithAssoc` is not satisfied
    |
 LL | type Foo<V> = impl Trait<V>;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TraitWithAssoc` is not implemented for `T`
-...
+   |
+help: consider further restricting this bound with `+ TraitWithAssoc`
+  --> $DIR/bound_reduction2.rs:18:21
+   |
 LL | fn foo_desugared<T: TraitWithAssoc>(_: T) -> Foo<T::Assoc> {
-   |                  -- help: consider further restricting this bound: `T: TraitWithAssoc +`
+   |                     ^^^^^^^^^^^^^^
 
 error: defining opaque type use does not fully define opaque type: generic parameter `V` is specified as concrete type `<T as TraitWithAssoc>::Assoc`
   --> $DIR/bound_reduction2.rs:18:1
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr b/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr
index a4d9a67215..08b26b8fc1 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr
+++ b/src/test/ui/type-alias-impl-trait/generic_duplicate_lifetime_param.stderr
@@ -1,10 +1,8 @@
 error: non-defining opaque type use in defining scope
-  --> $DIR/generic_duplicate_lifetime_param.rs:7:1
+  --> $DIR/generic_duplicate_lifetime_param.rs:7:26
    |
-LL | / fn one<'a>(t: &'a ()) -> Two<'a, 'a> {
-LL | |     t
-LL | | }
-   | |_^
+LL | fn one<'a>(t: &'a ()) -> Two<'a, 'a> {
+   |                          ^^^^^^^^^^^
    |
 note: lifetime used multiple times
   --> $DIR/generic_duplicate_lifetime_param.rs:5:10
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs
index 59e7de413a..6cbb3069ec 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs
+++ b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.rs
@@ -7,11 +7,11 @@ fn main() {}
 // test that unused generic parameters are ok
 type Two<T, U> = impl Debug;
 
-fn two<T: Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
+fn two<T: Copy + Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
     (t, t)
 }
 
-fn three<T: Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
-//~^ concrete type differs from previous
+fn three<T: Copy + Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
+    //~^ concrete type differs from previous
     (u, t)
 }
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr
index 66649413d3..7e81d36266 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr
+++ b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use6.stderr
@@ -1,7 +1,7 @@
 error: concrete type differs from previous defining opaque type use
   --> $DIR/generic_duplicate_param_use6.rs:14:1
    |
-LL | / fn three<T: Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
+LL | / fn three<T: Copy + Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
 LL | |
 LL | |     (u, t)
 LL | | }
@@ -10,7 +10,7 @@ LL | | }
 note: previous use here
   --> $DIR/generic_duplicate_param_use6.rs:10:1
    |
-LL | / fn two<T: Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
+LL | / fn two<T: Copy + Debug, U: Debug>(t: T, u: U) -> Two<T, U> {
 LL | |     (t, t)
 LL | | }
    | |_^
diff --git a/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr b/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr
index 5a7f9d74eb..22e2391f83 100644
--- a/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr
+++ b/src/test/ui/type-alias-impl-trait/generic_type_does_not_live_long_enough.stderr
@@ -25,7 +25,7 @@ LL | type WrongGeneric<T> = impl 'static;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ...
 LL | fn wrong_generic<T>(t: T) -> WrongGeneric<T> {
-   |                  - help: consider adding an explicit lifetime bound `T: 'static`...
+   |                  - help: consider adding an explicit lifetime bound...: `T: 'static`
    |
 note: ...so that the type `T` will meet its required lifetime bounds
   --> $DIR/generic_type_does_not_live_long_enough.rs:9:1
diff --git a/src/test/ui/type-alias-impl-trait/generic_underconstrained.stderr b/src/test/ui/type-alias-impl-trait/generic_underconstrained.stderr
index 5f04391d75..299c7eae8d 100644
--- a/src/test/ui/type-alias-impl-trait/generic_underconstrained.stderr
+++ b/src/test/ui/type-alias-impl-trait/generic_underconstrained.stderr
@@ -9,10 +9,12 @@ error[E0277]: the trait bound `T: Trait` is not satisfied
    |
 LL | type Underconstrained<T: Trait> = impl 'static;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `T`
-...
-LL | fn underconstrain<T>(_: T) -> Underconstrained<T> {
-   |                   - help: consider restricting this bound: `T: Trait`
    |
+help: consider restricting this type parameter with `T: Trait`
+  --> $DIR/generic_underconstrained.rs:10:19
+   |
+LL | fn underconstrain<T>(_: T) -> Underconstrained<T> {
+   |                   ^
    = note: the return type of a function must have a statically known size
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/type-alias-impl-trait/generic_underconstrained2.stderr b/src/test/ui/type-alias-impl-trait/generic_underconstrained2.stderr
index 9e8414f9c1..56966a32b4 100644
--- a/src/test/ui/type-alias-impl-trait/generic_underconstrained2.stderr
+++ b/src/test/ui/type-alias-impl-trait/generic_underconstrained2.stderr
@@ -16,12 +16,15 @@ error[E0277]: `U` doesn't implement `std::fmt::Debug`
 LL | type Underconstrained<T: std::fmt::Debug> = impl 'static;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `U` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
 ...
-LL | fn underconstrained<U>(_: U) -> Underconstrained<U> {
-   |                     - help: consider restricting this bound: `U: std::fmt::Debug`
 LL |     5u32
    |     ---- this returned value is of type `u32`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `U`
+help: consider restricting this type parameter with `U: std::fmt::Debug`
+  --> $DIR/generic_underconstrained2.rs:10:21
+   |
+LL | fn underconstrained<U>(_: U) -> Underconstrained<U> {
+   |                     ^
    = note: the return type of a function must have a statically known size
 
 error[E0277]: `V` doesn't implement `std::fmt::Debug`
@@ -30,12 +33,15 @@ error[E0277]: `V` doesn't implement `std::fmt::Debug`
 LL | type Underconstrained2<T: std::fmt::Debug> = impl 'static;
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `V` cannot be formatted using `{:?}` because it doesn't implement `std::fmt::Debug`
 ...
-LL | fn underconstrained2<U, V>(_: U, _: V) -> Underconstrained2<V> {
-   |                         - help: consider restricting this bound: `V: std::fmt::Debug`
 LL |     5u32
    |     ---- this returned value is of type `u32`
    |
    = help: the trait `std::fmt::Debug` is not implemented for `V`
+help: consider restricting this type parameter with `V: std::fmt::Debug`
+  --> $DIR/generic_underconstrained2.rs:19:25
+   |
+LL | fn underconstrained2<U, V>(_: U, _: V) -> Underconstrained2<V> {
+   |                         ^
    = note: the return type of a function must have a statically known size
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs b/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs
index a102d16078..50eeff0b18 100644
--- a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.rs
@@ -7,7 +7,7 @@ use std::fmt::Debug;
 fn main() {
     type Opaque = impl Debug;
     fn _unused() -> Opaque { String::new() }
-    //~^ ERROR: concrete type differs from previous defining opaque type use
     let null = || -> Opaque { 0 };
+    //~^ ERROR: concrete type differs from previous defining opaque type use
     println!("{:?}", null());
 }
diff --git a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr b/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr
index c994eb5986..1333b4c63d 100644
--- a/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr
+++ b/src/test/ui/type-alias-impl-trait/issue-52843-closure-constrain.stderr
@@ -1,20 +1,14 @@
 error: concrete type differs from previous defining opaque type use
-  --> $DIR/issue-52843-closure-constrain.rs:9:5
+  --> $DIR/issue-52843-closure-constrain.rs:10:16
    |
-LL |     fn _unused() -> Opaque { String::new() }
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, got `std::string::String`
+LL |     let null = || -> Opaque { 0 };
+   |                ^^^^^^^^^^^^^^^^^^ expected `std::string::String`, got `i32`
    |
 note: previous use here
-  --> $DIR/issue-52843-closure-constrain.rs:7:1
+  --> $DIR/issue-52843-closure-constrain.rs:9:5
    |
-LL | / fn main() {
-LL | |     type Opaque = impl Debug;
-LL | |     fn _unused() -> Opaque { String::new() }
-LL | |
-LL | |     let null = || -> Opaque { 0 };
-LL | |     println!("{:?}", null());
-LL | | }
-   | |_^
+LL |     fn _unused() -> Opaque { String::new() }
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/type-alias-impl-trait/issue-60371.stderr b/src/test/ui/type-alias-impl-trait/issue-60371.stderr
index cb35706a51..2796c77baa 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60371.stderr
+++ b/src/test/ui/type-alias-impl-trait/issue-60371.stderr
@@ -4,7 +4,7 @@ error[E0658]: `impl Trait` in type aliases is unstable
 LL |     type Item = impl Bug;
    |                 ^^^^^^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/63063
+   = note: see issue #63063 <https://github.com/rust-lang/rust/issues/63063> for more information
    = help: add `#![feature(type_alias_impl_trait)]` to the crate attributes to enable
 
 error[E0277]: the trait bound `(): Bug` is not satisfied
diff --git a/src/test/ui/type-alias-impl-trait/issue-60564.rs b/src/test/ui/type-alias-impl-trait/issue-60564.rs
index 8686100205..73acc92172 100644
--- a/src/test/ui/type-alias-impl-trait/issue-60564.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-60564.rs
@@ -8,7 +8,7 @@ trait IterBits {
 type IterBitsIter<T, E, I> = impl std::iter::Iterator<Item = I>;
 //~^ ERROR could not find defining uses
 
-impl<T, E> IterBits for T
+impl<T: Copy, E> IterBits for T
 where
     T: std::ops::Shr<Output = T>
         + std::ops::BitAnd<T, Output = T>
diff --git a/src/test/ui/type-alias-impl-trait/issue-63279.rs b/src/test/ui/type-alias-impl-trait/issue-63279.rs
index 586ff7a315..b97192a2ae 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63279.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-63279.rs
@@ -1,3 +1,5 @@
+// compile-flags: -Zsave-analysis
+
 #![feature(type_alias_impl_trait)]
 
 type Closure = impl FnOnce(); //~ ERROR: type mismatch resolving
diff --git a/src/test/ui/type-alias-impl-trait/issue-63279.stderr b/src/test/ui/type-alias-impl-trait/issue-63279.stderr
index 053ccee378..bef4d01093 100644
--- a/src/test/ui/type-alias-impl-trait/issue-63279.stderr
+++ b/src/test/ui/type-alias-impl-trait/issue-63279.stderr
@@ -1,5 +1,5 @@
-error[E0271]: type mismatch resolving `<[closure@$DIR/issue-63279.rs:6:5: 6:28] as std::ops::FnOnce<()>>::Output == ()`
-  --> $DIR/issue-63279.rs:3:1
+error[E0271]: type mismatch resolving `<[closure@$DIR/issue-63279.rs:8:5: 8:28] as std::ops::FnOnce<()>>::Output == ()`
+  --> $DIR/issue-63279.rs:5:1
    |
 LL | type Closure = impl FnOnce();
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected opaque type, found `()`
diff --git a/src/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs b/src/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs
index 12eb75ae4c..26d97cea98 100644
--- a/src/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-65679-inst-opaque-ty-from-val-twice.rs
@@ -1,3 +1,4 @@
+// compile-flags: -Zsave-analysis
 // check-pass
 
 #![feature(type_alias_impl_trait)]
diff --git a/src/test/ui/type-alias-impl-trait/issue-65918.rs b/src/test/ui/type-alias-impl-trait/issue-65918.rs
index 97efb85ef6..af6d501092 100644
--- a/src/test/ui/type-alias-impl-trait/issue-65918.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-65918.rs
@@ -1,10 +1,12 @@
+// ignore-test: This now ICEs again.
+
 // build-pass
 
 #![feature(type_alias_impl_trait)]
 
 use std::marker::PhantomData;
 
-/* copied Index and TryFrom for convinience (and simplicity) */
+/* copied Index and TryFrom for convenience (and simplicity) */
 trait MyIndex<T> {
     type O;
     fn my_index(self) -> Self::O;
diff --git a/src/test/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs b/src/test/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs
new file mode 100644
index 0000000000..7da0b04926
--- /dev/null
+++ b/src/test/ui/type-alias-impl-trait/issue-67844-nested-opaque.rs
@@ -0,0 +1,32 @@
+// check-pass
+// Regression test for issue #67844
+// Ensures that we properly handle nested TAIT occurrences
+// with generic parameters
+
+#![feature(type_alias_impl_trait)]
+
+trait WithAssoc { type AssocType; }
+
+trait WithParam<A> {}
+
+type Return<A> = impl WithAssoc<AssocType = impl WithParam<A>>;
+
+struct MyParam;
+impl<A> WithParam<A> for MyParam {}
+
+struct MyStruct;
+
+impl WithAssoc for MyStruct {
+    type AssocType = MyParam;
+}
+
+
+fn my_fun<A>() -> Return<A> {
+    MyStruct
+}
+
+fn my_other_fn<A>() -> impl WithAssoc<AssocType = impl WithParam<A>> {
+    MyStruct
+}
+
+fn main() {}
diff --git a/src/test/ui/type/ascription/issue-47666.stderr b/src/test/ui/type/ascription/issue-47666.stderr
index 648635f0c3..f4c9240ab5 100644
--- a/src/test/ui/type/ascription/issue-47666.stderr
+++ b/src/test/ui/type/ascription/issue-47666.stderr
@@ -10,8 +10,8 @@ LL |     let _ = Option:Some(vec![0, 1]);
    |                   help: maybe write a path separator here: `::`
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/type/ascription/issue-54516.rs b/src/test/ui/type/ascription/issue-54516.rs
index b53bfe5df0..8d6fd2abb6 100644
--- a/src/test/ui/type/ascription/issue-54516.rs
+++ b/src/test/ui/type/ascription/issue-54516.rs
@@ -2,5 +2,7 @@ use std::collections::BTreeMap;
 
 fn main() {
     println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>());
-    //~^ ERROR expected one of
+    //~^ ERROR casts cannot be followed by a function call
+    //~| ERROR expected value, found module `std::mem` [E0423]
+    //~| ERROR cannot find type `size_of` in this scope [E0412]
 }
diff --git a/src/test/ui/type/ascription/issue-54516.stderr b/src/test/ui/type/ascription/issue-54516.stderr
index 47e3c78459..fdf35700ef 100644
--- a/src/test/ui/type/ascription/issue-54516.stderr
+++ b/src/test/ui/type/ascription/issue-54516.stderr
@@ -1,13 +1,31 @@
-error: expected one of `!`, `,`, or `::`, found `(`
-  --> $DIR/issue-54516.rs:4:58
+error: casts cannot be followed by a function call
+  --> $DIR/issue-54516.rs:4:20
    |
 LL |     println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>());
-   |                            -                             ^ expected one of `!`, `,`, or `::`
+   |                    ^^^^^^^^-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |                            |
    |                            help: maybe write a path separator here: `::`
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
-error: aborting due to previous error
+error[E0423]: expected value, found module `std::mem`
+  --> $DIR/issue-54516.rs:4:20
+   |
+LL |     println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>());
+   |                    ^^^^^^^^- help: maybe you meant to write a path separator here: `::`
+   |                    |
+   |                    not a value
+
+error[E0412]: cannot find type `size_of` in this scope
+  --> $DIR/issue-54516.rs:4:29
+   |
+LL |     println!("{}", std::mem:size_of::<BTreeMap<u32, u32>>());
+   |                            -^^^^^^^ not found in this scope
+   |                            |
+   |                            help: maybe you meant to write a path separator here: `::`
+
+error: aborting due to 3 previous errors
 
+Some errors have detailed explanations: E0412, E0423.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/type/ascription/issue-60933.rs b/src/test/ui/type/ascription/issue-60933.rs
index 8fb06c887b..bcf9f88cb4 100644
--- a/src/test/ui/type/ascription/issue-60933.rs
+++ b/src/test/ui/type/ascription/issue-60933.rs
@@ -1,4 +1,6 @@
 fn main() {
     let u: usize = std::mem:size_of::<u32>();
-    //~^ ERROR expected one of
+    //~^ ERROR casts cannot be followed by a function call
+    //~| ERROR expected value, found module `std::mem` [E0423]
+    //~| ERROR cannot find type `size_of` in this scope [E0412]
 }
diff --git a/src/test/ui/type/ascription/issue-60933.stderr b/src/test/ui/type/ascription/issue-60933.stderr
index c47042bbe5..cd9ae8f49f 100644
--- a/src/test/ui/type/ascription/issue-60933.stderr
+++ b/src/test/ui/type/ascription/issue-60933.stderr
@@ -1,13 +1,31 @@
-error: expected one of `!`, `::`, or `;`, found `(`
-  --> $DIR/issue-60933.rs:2:43
+error: casts cannot be followed by a function call
+  --> $DIR/issue-60933.rs:2:20
    |
 LL |     let u: usize = std::mem:size_of::<u32>();
-   |                            -              ^ expected one of `!`, `::`, or `;`
+   |                    ^^^^^^^^-^^^^^^^^^^^^^^
    |                            |
    |                            help: maybe write a path separator here: `::`
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
-error: aborting due to previous error
+error[E0423]: expected value, found module `std::mem`
+  --> $DIR/issue-60933.rs:2:20
+   |
+LL |     let u: usize = std::mem:size_of::<u32>();
+   |                    ^^^^^^^^- help: maybe you meant to write a path separator here: `::`
+   |                    |
+   |                    not a value
+
+error[E0412]: cannot find type `size_of` in this scope
+  --> $DIR/issue-60933.rs:2:29
+   |
+LL |     let u: usize = std::mem:size_of::<u32>();
+   |                            -^^^^^^^ not found in this scope
+   |                            |
+   |                            help: maybe you meant to write a path separator here: `::`
+
+error: aborting due to 3 previous errors
 
+Some errors have detailed explanations: E0412, E0423.
+For more information about an error, try `rustc --explain E0412`.
diff --git a/src/test/ui/type/type-ascription-instead-of-initializer.rs b/src/test/ui/type/type-ascription-instead-of-initializer.rs
index aef25250b1..9f9b6f06bb 100644
--- a/src/test/ui/type/type-ascription-instead-of-initializer.rs
+++ b/src/test/ui/type/type-ascription-instead-of-initializer.rs
@@ -1,4 +1,4 @@
 fn main() {
     let x: Vec::with_capacity(10, 20);  //~ ERROR expected type, found `10`
-    //~^ ERROR this function takes 1 parameter
+    //~^ ERROR this function takes 1 argument
 }
diff --git a/src/test/ui/type/type-ascription-instead-of-initializer.stderr b/src/test/ui/type/type-ascription-instead-of-initializer.stderr
index 3fe676de59..530f77e5ae 100644
--- a/src/test/ui/type/type-ascription-instead-of-initializer.stderr
+++ b/src/test/ui/type/type-ascription-instead-of-initializer.stderr
@@ -7,11 +7,13 @@ LL |     let x: Vec::with_capacity(10, 20);
    |         |help: use `=` if you meant to assign
    |         while parsing the type for `x`
 
-error[E0061]: this function takes 1 parameter but 2 parameters were supplied
+error[E0061]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/type-ascription-instead-of-initializer.rs:2:12
    |
 LL |     let x: Vec::with_capacity(10, 20);
-   |            ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter
+   |            ^^^^^^^^^^^^^^^^^^ --  -- supplied 2 arguments
+   |            |
+   |            expected 1 argument
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
index 8fbcb3969a..521ebcdf19 100644
--- a/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
+++ b/src/test/ui/type/type-ascription-instead-of-statement-end.stderr
@@ -7,7 +7,7 @@ LL |     0;
    |     ^ expected type
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: expected type, found `0`
   --> $DIR/type-ascription-instead-of-statement-end.rs:9:23
@@ -18,7 +18,7 @@ LL |     println!("test"): 0;
    |                     tried to parse a type due to this type ascription
    |
    = note: `#![feature(type_ascription)]` lets you annotate an expression with a type: `<expr>: <type>`
-   = note: for more information, see https://github.com/rust-lang/rust/issues/23416
+   = note: see issue #23416 <https://github.com/rust-lang/rust/issues/23416> for more information
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/type/type-check-defaults.stderr b/src/test/ui/type/type-check-defaults.stderr
index 6f84b37d61..31ee15e074 100644
--- a/src/test/ui/type/type-check-defaults.stderr
+++ b/src/test/ui/type/type-check-defaults.stderr
@@ -47,15 +47,18 @@ LL | trait TraitBound<T:Copy=String> {}
    | required by `TraitBound`
 
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
-  --> $DIR/type-check-defaults.rs:21:1
+  --> $DIR/type-check-defaults.rs:21:25
    |
 LL | trait Super<T: Copy> { }
    | -------------------- required by `Super`
 LL | trait Base<T = String>: Super<T> { }
-   | ^^^^^^^^^^^-^^^^^^^^^^^^^^^^^^^^^^^^
-   | |          |
-   | |          help: consider restricting this bound: `T: std::marker::Copy`
-   | the trait `std::marker::Copy` is not implemented for `T`
+   |                         ^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/type-check-defaults.rs:21:12
+   |
+LL | trait Base<T = String>: Super<T> { }
+   |            ^
 
 error[E0277]: cannot add `u8` to `i32`
   --> $DIR/type-check-defaults.rs:24:66
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr
index 53cc769bae..8162fed2cd 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr
+++ b/src/test/ui/type/type-check/cannot_infer_local_or_vec.stderr
@@ -6,7 +6,7 @@ LL |     let x = vec![];
    |         |
    |         consider giving `x` the explicit type `std::vec::Vec<T>`, where the type parameter `T` is specified
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr
index df7228ce9f..e62565c8f9 100644
--- a/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr
+++ b/src/test/ui/type/type-check/cannot_infer_local_or_vec_in_tuples.stderr
@@ -6,7 +6,7 @@ LL |     let (x, ) = (vec![], );
    |         |
    |         consider giving this pattern the explicit type `(std::vec::Vec<T>,)`, where the type parameter `T` is specified
    |
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/type/type-check/issue-40294.rs b/src/test/ui/type/type-check/issue-40294.rs
index 7e6429ccfb..5493a4e5f1 100644
--- a/src/test/ui/type/type-check/issue-40294.rs
+++ b/src/test/ui/type/type-check/issue-40294.rs
@@ -2,8 +2,8 @@ trait Foo: Sized {
     fn foo(self);
 }
 
-fn foo<'a,'b,T>(x: &'a T, y: &'b T) //~ ERROR type annotations needed
-    where &'a T : Foo,
+fn foo<'a,'b,T>(x: &'a T, y: &'b T)
+    where &'a T : Foo, //~ ERROR type annotations needed
           &'b T : Foo
 {
     x.foo();
diff --git a/src/test/ui/type/type-check/issue-40294.stderr b/src/test/ui/type/type-check/issue-40294.stderr
index 4fc0285509..2c889b6c2c 100644
--- a/src/test/ui/type/type-check/issue-40294.stderr
+++ b/src/test/ui/type/type-check/issue-40294.stderr
@@ -1,17 +1,11 @@
 error[E0283]: type annotations needed
-  --> $DIR/issue-40294.rs:5:1
+  --> $DIR/issue-40294.rs:6:19
    |
-LL |   trait Foo: Sized {
-   |   ---------------- required by `Foo`
+LL | trait Foo: Sized {
+   | ---------------- required by `Foo`
 ...
-LL | / fn foo<'a,'b,T>(x: &'a T, y: &'b T)
-LL | |     where &'a T : Foo,
-LL | |           &'b T : Foo
-LL | | {
-LL | |     x.foo();
-LL | |     y.foo();
-LL | | }
-   | |_^ cannot infer type for reference `&'a T`
+LL |     where &'a T : Foo,
+   |                   ^^^ cannot infer type for reference `&'a T`
    |
    = note: cannot resolve `&'a T: Foo`
 
diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr
index b315fe9df8..539189982a 100644
--- a/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr
+++ b/src/test/ui/type/type-parameter-defaults-referencing-Self-ppaux.stderr
@@ -14,10 +14,14 @@ error[E0038]: the trait `MyAdd` cannot be made into an object
   --> $DIR/type-parameter-defaults-referencing-Self-ppaux.rs:14:18
    |
 LL | trait MyAdd<Rhs=Self> { fn add(&self, other: &Rhs) -> Self; }
-   |                            --- method `add` references the `Self` type in its parameters or return type
+   |       -----                                           ---- ...because method `add` references the `Self` type in its return type
+   |       |
+   |       this trait cannot be made into an object...
 ...
 LL |     let y = x as dyn MyAdd<i32>;
    |                  ^^^^^^^^^^^^^^ the trait `MyAdd` cannot be made into an object
+   |
+   = help: consider moving `add` to another trait
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.rs b/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.rs
index c57e814957..7bf151514c 100644
--- a/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.rs
+++ b/src/test/ui/typeck/issue-52082-type-param-shadows-existing-type.rs
@@ -1,4 +1,4 @@
-// Fix issue 52082: Confusing error if accidentially defining a type paramter with the same name as
+// Fix issue 52082: Confusing error if accidentally defining a type parameter with the same name as
 // an existing type
 //
 // To this end, make sure that when trying to retrieve a field of a (reference to) type parameter,
diff --git a/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr b/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr
index a84aef5fdb..45c9d8be85 100644
--- a/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr
+++ b/src/test/ui/typeck/typeck-default-trait-impl-send-param.stderr
@@ -1,8 +1,6 @@
 error[E0277]: `T` cannot be sent between threads safely
   --> $DIR/typeck-default-trait-impl-send-param.rs:5:15
    |
-LL | fn foo<T>() {
-   |        - help: consider restricting this bound: `T: std::marker::Send`
 LL |     is_send::<T>()
    |               ^ `T` cannot be sent between threads safely
 ...
@@ -10,6 +8,11 @@ LL | fn is_send<T:Send>() {
    |    -------   ---- required by this bound in `is_send`
    |
    = help: the trait `std::marker::Send` is not implemented for `T`
+help: consider restricting this type parameter with `T: std::marker::Send`
+  --> $DIR/typeck-default-trait-impl-send-param.rs:4:8
+   |
+LL | fn foo<T>() {
+   |        ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/typeck/typeck_type_placeholder_item.rs b/src/test/ui/typeck/typeck_type_placeholder_item.rs
new file mode 100644
index 0000000000..5444fc62d8
--- /dev/null
+++ b/src/test/ui/typeck/typeck_type_placeholder_item.rs
@@ -0,0 +1,208 @@
+// Needed for `type Y = impl Trait<_>` and `type B = _;`
+#![feature(type_alias_impl_trait, associated_type_defaults)]
+// This test checks that it is not possible to enable global type
+// inference by using the `_` type placeholder.
+
+fn test() -> _ { 5 }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn test2() -> (_, _) { (5, 5) }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+static TEST3: _ = "test";
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+static TEST4: _ = 145;
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+static TEST5: (_, _) = (1, 2);
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn test6(_: _) { }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn test6_b<T>(_: _, _: T) { }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn test6_c<T, K, L, A, B>(_: _, _: (T, K, L, A, B)) { }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn test7(x: _) { let _x: usize = x; }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn test8(_f: fn() -> _) { }
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+//~| ERROR the type placeholder `_` is not allowed within types on item signatures
+
+struct Test9;
+
+impl Test9 {
+    fn test9(&self) -> _ { () }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn test10(&self, _x : _) { }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
+
+fn test11(x: &usize) -> &_ {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    &x
+}
+
+unsafe fn test12(x: *const usize) -> *const *const _ {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    &x
+}
+
+impl Clone for Test9 {
+    fn clone(&self) -> _ { Test9 }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn clone_from(&mut self, other: _) { *self = Test9; }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
+
+struct Test10 {
+    a: _,
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    b: (_, _),
+}
+
+pub fn main() {
+    static A = 42;
+    //~^ ERROR missing type for `static` item
+    static B: _ = 42;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    static C: Option<_> = Some(42);
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn fn_test() -> _ { 5 }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn fn_test2() -> (_, _) { (5, 5) }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    static FN_TEST3: _ = "test";
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    static FN_TEST4: _ = 145;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    static FN_TEST5: (_, _) = (1, 2);
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn fn_test6(_: _) { }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn fn_test7(x: _) { let _x: usize = x; }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn fn_test8(_f: fn() -> _) { }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    //~| ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    struct FnTest9;
+
+    impl FnTest9 {
+        fn fn_test9(&self) -> _ { () }
+        //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+        fn fn_test10(&self, _x : _) { }
+        //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    }
+
+    impl Clone for FnTest9 {
+        fn clone(&self) -> _ { FnTest9 }
+        //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+        fn clone_from(&mut self, other: _) { *self = FnTest9; }
+        //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    }
+
+    struct FnTest10 {
+        a: _,
+        //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+        b: (_, _),
+    }
+
+    fn fn_test11(_: _) -> (_, _) { panic!() }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    //~| ERROR type annotations needed
+
+    fn fn_test12(x: i32) -> (_, _) { (x, x) }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+    fn fn_test13(x: _) -> (i32, _) { (x, x) }
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
+
+trait T {
+    fn method_test1(&self, x: _);
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    fn method_test2(&self, x: _) -> _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    fn method_test3(&self) -> _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    fn assoc_fn_test1(x: _);
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    fn assoc_fn_test2(x: _) -> _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    fn assoc_fn_test3() -> _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
+
+struct BadStruct<_>(_);
+//~^ ERROR expected identifier, found reserved identifier `_`
+//~| ERROR the type placeholder `_` is not allowed within types on item signatures
+trait BadTrait<_> {}
+//~^ ERROR expected identifier, found reserved identifier `_`
+impl BadTrait<_> for BadStruct<_> {}
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+fn impl_trait() -> impl BadTrait<_> {
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    unimplemented!()
+}
+
+struct BadStruct1<_, _>(_);
+//~^ ERROR expected identifier, found reserved identifier `_`
+//~| ERROR expected identifier, found reserved identifier `_`
+//~| ERROR the name `_` is already used
+//~| ERROR the type placeholder `_` is not allowed within types on item signatures
+struct BadStruct2<_, T>(_, T);
+//~^ ERROR expected identifier, found reserved identifier `_`
+//~| ERROR the type placeholder `_` is not allowed within types on item signatures
+
+type X = Box<_>;
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+
+struct Struct;
+trait Trait<T> {}
+impl Trait<usize> for Struct {}
+type Y = impl Trait<_>;
+//~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+fn foo() -> Y {
+    Struct
+}
+
+trait Qux {
+    type A;
+    type B = _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    const C: _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    const D: _ = 42;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    // type E: _; // FIXME: make the parser propagate the existence of `B`
+}
+impl Qux for Struct {
+    type A = _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    type B = _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    const C: _;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+    //~| ERROR associated constant in `impl` without body
+    const D: _ = 42;
+    //~^ ERROR the type placeholder `_` is not allowed within types on item signatures
+}
diff --git a/src/test/ui/typeck/typeck_type_placeholder_item.stderr b/src/test/ui/typeck/typeck_type_placeholder_item.stderr
new file mode 100644
index 0000000000..db1b91b53a
--- /dev/null
+++ b/src/test/ui/typeck/typeck_type_placeholder_item.stderr
@@ -0,0 +1,608 @@
+error: expected identifier, found reserved identifier `_`
+  --> $DIR/typeck_type_placeholder_item.rs:154:18
+   |
+LL | struct BadStruct<_>(_);
+   |                  ^ expected identifier, found reserved identifier
+
+error: expected identifier, found reserved identifier `_`
+  --> $DIR/typeck_type_placeholder_item.rs:157:16
+   |
+LL | trait BadTrait<_> {}
+   |                ^ expected identifier, found reserved identifier
+
+error: expected identifier, found reserved identifier `_`
+  --> $DIR/typeck_type_placeholder_item.rs:167:19
+   |
+LL | struct BadStruct1<_, _>(_);
+   |                   ^ expected identifier, found reserved identifier
+
+error: expected identifier, found reserved identifier `_`
+  --> $DIR/typeck_type_placeholder_item.rs:167:22
+   |
+LL | struct BadStruct1<_, _>(_);
+   |                      ^ expected identifier, found reserved identifier
+
+error: expected identifier, found reserved identifier `_`
+  --> $DIR/typeck_type_placeholder_item.rs:172:19
+   |
+LL | struct BadStruct2<_, T>(_, T);
+   |                   ^ expected identifier, found reserved identifier
+
+error: associated constant in `impl` without body
+  --> $DIR/typeck_type_placeholder_item.rs:203:5
+   |
+LL |     const C: _;
+   |     ^^^^^^^^^^-
+   |               |
+   |               help: provide a definition for the constant: `= <expr>;`
+
+error[E0403]: the name `_` is already used for a generic parameter in this item's generic parameters
+  --> $DIR/typeck_type_placeholder_item.rs:167:22
+   |
+LL | struct BadStruct1<_, _>(_);
+   |                   -  ^ already used
+   |                   |
+   |                   first use of `_`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:6:14
+   |
+LL | fn test() -> _ { 5 }
+   |              ^
+   |              |
+   |              not allowed in type signatures
+   |              help: replace with the correct return type: `i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:9:16
+   |
+LL | fn test2() -> (_, _) { (5, 5) }
+   |               -^--^-
+   |               ||  |
+   |               ||  not allowed in type signatures
+   |               |not allowed in type signatures
+   |               help: replace with the correct return type: `(i32, i32)`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:12:15
+   |
+LL | static TEST3: _ = "test";
+   |               ^
+   |               |
+   |               not allowed in type signatures
+   |               help: replace `_` with the correct type: `&'static str`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:15:15
+   |
+LL | static TEST4: _ = 145;
+   |               ^
+   |               |
+   |               not allowed in type signatures
+   |               help: replace `_` with the correct type: `i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:18:15
+   |
+LL | static TEST5: (_, _) = (1, 2);
+   |               ^^^^^^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:21:13
+   |
+LL | fn test6(_: _) { }
+   |             ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn test6<T>(_: T) { }
+   |         ^^^    ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:24:18
+   |
+LL | fn test6_b<T>(_: _, _: T) { }
+   |                  ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn test6_b<T, K>(_: K, _: T) { }
+   |             ^^^     ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:27:30
+   |
+LL | fn test6_c<T, K, L, A, B>(_: _, _: (T, K, L, A, B)) { }
+   |                              ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn test6_c<T, K, L, A, B, C>(_: C, _: (T, K, L, A, B)) { }
+   |                         ^^^     ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:30:13
+   |
+LL | fn test7(x: _) { let _x: usize = x; }
+   |             ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn test7<T>(x: T) { let _x: usize = x; }
+   |         ^^^    ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:33:22
+   |
+LL | fn test8(_f: fn() -> _) { }
+   |                      ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:33:22
+   |
+LL | fn test8(_f: fn() -> _) { }
+   |                      ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | fn test8<T>(_f: fn() -> T) { }
+   |         ^^^             ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:47:26
+   |
+LL | fn test11(x: &usize) -> &_ {
+   |                         -^
+   |                         ||
+   |                         |not allowed in type signatures
+   |                         help: replace with the correct return type: `&&usize`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:52:52
+   |
+LL | unsafe fn test12(x: *const usize) -> *const *const _ {
+   |                                      --------------^
+   |                                      |             |
+   |                                      |             not allowed in type signatures
+   |                                      help: replace with the correct return type: `*const *const usize`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:66:8
+   |
+LL |     a: _,
+   |        ^ not allowed in type signatures
+LL |
+LL |     b: (_, _),
+   |         ^  ^ not allowed in type signatures
+   |         |
+   |         not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | struct Test10<T> {
+LL |     a: T,
+LL |
+LL |     b: (T, T),
+   |
+
+error: missing type for `static` item
+  --> $DIR/typeck_type_placeholder_item.rs:72:12
+   |
+LL |     static A = 42;
+   |            ^ help: provide a type for the item: `A: i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:74:15
+   |
+LL |     static B: _ = 42;
+   |               ^
+   |               |
+   |               not allowed in type signatures
+   |               help: replace `_` with the correct type: `i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:76:15
+   |
+LL |     static C: Option<_> = Some(42);
+   |               ^^^^^^^^^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:79:21
+   |
+LL |     fn fn_test() -> _ { 5 }
+   |                     ^
+   |                     |
+   |                     not allowed in type signatures
+   |                     help: replace with the correct return type: `i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:82:23
+   |
+LL |     fn fn_test2() -> (_, _) { (5, 5) }
+   |                      -^--^-
+   |                      ||  |
+   |                      ||  not allowed in type signatures
+   |                      |not allowed in type signatures
+   |                      help: replace with the correct return type: `(i32, i32)`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:85:22
+   |
+LL |     static FN_TEST3: _ = "test";
+   |                      ^
+   |                      |
+   |                      not allowed in type signatures
+   |                      help: replace `_` with the correct type: `&'static str`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:88:22
+   |
+LL |     static FN_TEST4: _ = 145;
+   |                      ^
+   |                      |
+   |                      not allowed in type signatures
+   |                      help: replace `_` with the correct type: `i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:91:22
+   |
+LL |     static FN_TEST5: (_, _) = (1, 2);
+   |                      ^^^^^^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:94:20
+   |
+LL |     fn fn_test6(_: _) { }
+   |                    ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn fn_test6<T>(_: T) { }
+   |                ^^^    ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:97:20
+   |
+LL |     fn fn_test7(x: _) { let _x: usize = x; }
+   |                    ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn fn_test7<T>(x: T) { let _x: usize = x; }
+   |                ^^^    ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:100:29
+   |
+LL |     fn fn_test8(_f: fn() -> _) { }
+   |                             ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:100:29
+   |
+LL |     fn fn_test8(_f: fn() -> _) { }
+   |                             ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn fn_test8<T>(_f: fn() -> T) { }
+   |                ^^^             ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:123:12
+   |
+LL |         a: _,
+   |            ^ not allowed in type signatures
+LL |
+LL |         b: (_, _),
+   |             ^  ^ not allowed in type signatures
+   |             |
+   |             not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     struct FnTest10<T> {
+LL |         a: T,
+LL |
+LL |         b: (T, T),
+   |
+
+error[E0282]: type annotations needed
+  --> $DIR/typeck_type_placeholder_item.rs:128:18
+   |
+LL |     fn fn_test11(_: _) -> (_, _) { panic!() }
+   |                  ^ cannot infer type
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:128:28
+   |
+LL |     fn fn_test11(_: _) -> (_, _) { panic!() }
+   |                            ^  ^ not allowed in type signatures
+   |                            |
+   |                            not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:132:30
+   |
+LL |     fn fn_test12(x: i32) -> (_, _) { (x, x) }
+   |                             -^--^-
+   |                             ||  |
+   |                             ||  not allowed in type signatures
+   |                             |not allowed in type signatures
+   |                             help: replace with the correct return type: `(i32, i32)`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:135:33
+   |
+LL |     fn fn_test13(x: _) -> (i32, _) { (x, x) }
+   |                           ------^-
+   |                           |     |
+   |                           |     not allowed in type signatures
+   |                           help: replace with the correct return type: `(i32, i32)`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:154:21
+   |
+LL | struct BadStruct<_>(_);
+   |                     ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | struct BadStruct<T>(T);
+   |                  ^  ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:159:15
+   |
+LL | impl BadTrait<_> for BadStruct<_> {}
+   |               ^                ^ not allowed in type signatures
+   |               |
+   |               not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | impl<T> BadTrait<T> for BadStruct<T> {}
+   |     ^^^          ^                ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:162:34
+   |
+LL | fn impl_trait() -> impl BadTrait<_> {
+   |                                  ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:167:25
+   |
+LL | struct BadStruct1<_, _>(_);
+   |                         ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | struct BadStruct1<T, _>(T);
+   |                   ^     ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:172:25
+   |
+LL | struct BadStruct2<_, T>(_, T);
+   |                         ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL | struct BadStruct2<K, T>(K, T);
+   |                   ^     ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:176:14
+   |
+LL | type X = Box<_>;
+   |              ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:43:27
+   |
+LL |     fn test10(&self, _x : _) { }
+   |                           ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn test10<T>(&self, _x : T) { }
+   |              ^^^             ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:140:31
+   |
+LL |     fn method_test1(&self, x: _);
+   |                               ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn method_test1<T>(&self, x: T);
+   |                    ^^^           ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:142:31
+   |
+LL |     fn method_test2(&self, x: _) -> _;
+   |                               ^     ^ not allowed in type signatures
+   |                               |
+   |                               not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn method_test2<T>(&self, x: T) -> T;
+   |                    ^^^           ^     ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:144:31
+   |
+LL |     fn method_test3(&self) -> _;
+   |                               ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn method_test3<T>(&self) -> T;
+   |                    ^^^           ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:146:26
+   |
+LL |     fn assoc_fn_test1(x: _);
+   |                          ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn assoc_fn_test1<T>(x: T);
+   |                      ^^^    ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:148:26
+   |
+LL |     fn assoc_fn_test2(x: _) -> _;
+   |                          ^     ^ not allowed in type signatures
+   |                          |
+   |                          not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn assoc_fn_test2<T>(x: T) -> T;
+   |                      ^^^    ^     ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:150:28
+   |
+LL |     fn assoc_fn_test3() -> _;
+   |                            ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn assoc_fn_test3<T>() -> T;
+   |                      ^^^      ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:61:37
+   |
+LL |     fn clone_from(&mut self, other: _) { *self = Test9; }
+   |                                     ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |     fn clone_from<T>(&mut self, other: T) { *self = Test9; }
+   |                  ^^^                   ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:110:34
+   |
+LL |         fn fn_test10(&self, _x : _) { }
+   |                                  ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |         fn fn_test10<T>(&self, _x : T) { }
+   |                     ^^^             ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:118:41
+   |
+LL |         fn clone_from(&mut self, other: _) { *self = FnTest9; }
+   |                                         ^ not allowed in type signatures
+   |
+help: use type parameters instead
+   |
+LL |         fn clone_from<T>(&mut self, other: T) { *self = FnTest9; }
+   |                      ^^^                   ^
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:182:21
+   |
+LL | type Y = impl Trait<_>;
+   |                     ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:190:14
+   |
+LL |     type B = _;
+   |              ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:192:14
+   |
+LL |     const C: _;
+   |              ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:194:14
+   |
+LL |     const D: _ = 42;
+   |              ^
+   |              |
+   |              not allowed in type signatures
+   |              help: replace `_` with the correct type: `i32`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:40:24
+   |
+LL |     fn test9(&self) -> _ { () }
+   |                        ^
+   |                        |
+   |                        not allowed in type signatures
+   |                        help: replace with the correct return type: `()`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:58:24
+   |
+LL |     fn clone(&self) -> _ { Test9 }
+   |                        ^
+   |                        |
+   |                        not allowed in type signatures
+   |                        help: replace with the correct return type: `Test9`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:107:31
+   |
+LL |         fn fn_test9(&self) -> _ { () }
+   |                               ^
+   |                               |
+   |                               not allowed in type signatures
+   |                               help: replace with the correct return type: `()`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:115:28
+   |
+LL |         fn clone(&self) -> _ { FnTest9 }
+   |                            ^
+   |                            |
+   |                            not allowed in type signatures
+   |                            help: replace with the correct return type: `main::FnTest9`
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:199:14
+   |
+LL |     type A = _;
+   |              ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:201:14
+   |
+LL |     type B = _;
+   |              ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:203:14
+   |
+LL |     const C: _;
+   |              ^ not allowed in type signatures
+
+error[E0121]: the type placeholder `_` is not allowed within types on item signatures
+  --> $DIR/typeck_type_placeholder_item.rs:206:14
+   |
+LL |     const D: _ = 42;
+   |              ^
+   |              |
+   |              not allowed in type signatures
+   |              help: replace `_` with the correct type: `i32`
+
+error: aborting due to 66 previous errors
+
+Some errors have detailed explanations: E0121, E0282, E0403.
+For more information about an error, try `rustc --explain E0121`.
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.rs b/src/test/ui/ufcs/ufcs-partially-resolved.rs
index 66d4db3eba..e8c767b13e 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.rs
+++ b/src/test/ui/ufcs/ufcs-partially-resolved.rs
@@ -35,7 +35,7 @@ fn main() {
     <u8 as A>::N::NN; //~ ERROR cannot find associated type `N` in `A`
     let _: <u8 as Tr>::Y::NN; //~ ERROR ambiguous associated type
     let _: <u8 as E>::Y::NN; //~ ERROR expected associated type, found variant `E::Y`
-    <u8 as Tr>::Y::NN; //~ ERROR no associated item named `NN` found
+    <u8 as Tr>::Y::NN; //~ ERROR no associated item named `NN` found for type `u16`
     <u8 as E>::Y::NN; //~ ERROR expected associated type, found variant `E::Y`
 
     let _: <u8 as Tr::N>::NN; //~ ERROR cannot find associated type `NN` in `Tr::N`
@@ -52,5 +52,5 @@ fn main() {
     let _: <u8 as Dr>::Z; //~ ERROR expected associated type, found method `Dr::Z`
     <u8 as Dr>::X; //~ ERROR expected method or associated constant, found associated type `Dr::X`
     let _: <u8 as Dr>::Z::N; //~ ERROR expected associated type, found method `Dr::Z`
-    <u8 as Dr>::X::N; //~ ERROR no associated item named `N` found
+    <u8 as Dr>::X::N; //~ ERROR no associated item named `N` found for type `u16`
 }
diff --git a/src/test/ui/ufcs/ufcs-partially-resolved.stderr b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
index 60ebe8ee05..e5e6ed9fac 100644
--- a/src/test/ui/ufcs/ufcs-partially-resolved.stderr
+++ b/src/test/ui/ufcs/ufcs-partially-resolved.stderr
@@ -205,19 +205,19 @@ error[E0223]: ambiguous associated type
   --> $DIR/ufcs-partially-resolved.rs:36:12
    |
 LL |     let _: <u8 as Tr>::Y::NN;
-   |            ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<<u8 as Tr>::Y as Trait>::NN`
+   |            ^^^^^^^^^^^^^^^^^ help: use fully-qualified syntax: `<u16 as Trait>::NN`
 
-error[E0599]: no associated item named `NN` found for associated type `<u8 as Tr>::Y` in the current scope
+error[E0599]: no associated item named `NN` found for type `u16` in the current scope
   --> $DIR/ufcs-partially-resolved.rs:38:20
    |
 LL |     <u8 as Tr>::Y::NN;
-   |                    ^^ associated item not found in `<u8 as Tr>::Y`
+   |                    ^^ associated item not found in `u16`
 
-error[E0599]: no associated item named `N` found for associated type `<u8 as Dr>::X` in the current scope
+error[E0599]: no associated item named `N` found for type `u16` in the current scope
   --> $DIR/ufcs-partially-resolved.rs:55:20
    |
 LL |     <u8 as Dr>::X::N;
-   |                    ^ associated item not found in `<u8 as Dr>::X`
+   |                    ^ associated item not found in `u16`
 
 error: aborting due to 32 previous errors
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr
index 7ae8caee6f..7af9c57a83 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closure-feature-gate.stderr
@@ -4,7 +4,7 @@ error[E0658]: parenthetical notation is only stable when used with `Fn`-family t
 LL |     let x: Box<dyn Foo(isize)>;
    |                    ^^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error: aborting due to previous error
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr
index 0d3766426b..167479270b 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closure-no-cyclic-sig.stderr
@@ -6,7 +6,8 @@ LL |     g(|_| {  });
    |
    = note: closures cannot capture themselves or take themselves as argument;
            this error may be the result of a recent compiler bug-fix,
-           see https://github.com/rust-lang/rust/issues/46062 for more details
+           see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
+           for more information
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
index 0a028e4491..1719a99d42 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-lifetime-elision.stderr
@@ -2,12 +2,12 @@ error[E0106]: missing lifetime specifier
   --> $DIR/unboxed-closure-sugar-lifetime-elision.rs:26:39
    |
 LL |     let _: dyn Foo(&isize, &usize) -> &usize;
-   |                                       ^ expected named lifetime parameter
+   |                    ------  ------     ^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or argument 2
 help: consider introducing a named lifetime parameter
    |
-LL | fn main<'lifetime>() {
+LL | fn main<'a>() {
 LL |     eq::< dyn for<'a> Foo<(&'a isize,), Output=&'a isize>,
 LL |           dyn Foo(&isize) -> &isize                                   >();
 LL |     eq::< dyn for<'a> Foo<(&'a isize,), Output=(&'a isize, &'a isize)>,
diff --git a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr
index ba9d984e70..9a3bdd2bd5 100644
--- a/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closure-sugar-not-used-on-fn.stderr
@@ -4,7 +4,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL | fn bar1(x: &dyn Fn<(), Output=()>) {
    |                 ^^ help: use parenthetical notation instead: `Fn() -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error[E0658]: the precise format of `Fn`-family traits' type parameters is subject to change
@@ -13,7 +13,7 @@ error[E0658]: the precise format of `Fn`-family traits' type parameters is subje
 LL | fn bar2<T>(x: &T) where T: Fn<()> {
    |                            ^^ help: use parenthetical notation instead: `Fn() -> ()`
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/29625
+   = note: see issue #29625 <https://github.com/rust-lang/rust/issues/29625> for more information
    = help: add `#![feature(unboxed_closures)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr
index 6bba38510b..48ec620d92 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closures-mutate-upvar.stderr
@@ -28,17 +28,17 @@ LL |         n += 1;
 error[E0594]: cannot assign to `n`, as it is a captured variable in a `Fn` closure
   --> $DIR/unboxed-closures-mutate-upvar.rs:53:9
    |
-LL |         n += 1;
-   |         ^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/unboxed-closures-mutate-upvar.rs:52:23
-   |
+LL |   fn to_fn<A,F:Fn<A>>(f: F) -> F { f }
+   |                          - change this to accept `FnMut` instead of `Fn`
+...
 LL |       let mut f = to_fn(move || {
-   |  _______________________^
+   |  _________________-----_-
+   | |                 |
+   | |                 expects `Fn` instead of `FnMut`
 LL | |         n += 1;
+   | |         ^^^^^^ cannot assign
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr
index a38c612e1d..80e84fb7ca 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr
+++ b/src/test/ui/unboxed-closures/unboxed-closures-mutated-upvar-from-fn-closure.stderr
@@ -1,18 +1,18 @@
 error[E0594]: cannot assign to `counter`, as it is a captured variable in a `Fn` closure
   --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:11:9
    |
-LL |         counter += 1;
-   |         ^^^^^^^^^^^^ cannot assign
-   |
-help: consider changing this to accept closures that implement `FnMut`
-  --> $DIR/unboxed-closures-mutated-upvar-from-fn-closure.rs:10:10
-   |
+LL |   fn call<F>(f: F) where F : Fn() {
+   |                 - change this to accept `FnMut` instead of `Fn`
+...
 LL |       call(|| {
-   |  __________^
+   |  _____----_-
+   | |     |
+   | |     expects `Fn` instead of `FnMut`
 LL | |         counter += 1;
+   | |         ^^^^^^^^^^^^ cannot assign
 LL | |
 LL | |     });
-   | |_____^
+   | |_____- in this closure
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs b/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
index 5d1e00d2d3..9c6be50c5c 100644
--- a/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
+++ b/src/test/ui/unboxed-closures/unboxed-closures-unique-type-id.rs
@@ -4,7 +4,7 @@
 //
 //    error: internal compiler error: get_unique_type_id_of_type() -
 //    unexpected type: closure,
-//    Closure(syntax::ast::DefId{krate: 0, node: 66},
+//    Closure(rustc_ast::ast::DefId{krate: 0, node: 66},
 //    ReScope(63))
 //
 // This is a regression test for issue #17021.
diff --git a/src/test/ui/underscore-imports/basic.stderr b/src/test/ui/underscore-imports/basic.stderr
index 9ca60e8e0a..891730dc84 100644
--- a/src/test/ui/underscore-imports/basic.stderr
+++ b/src/test/ui/underscore-imports/basic.stderr
@@ -4,7 +4,7 @@ warning: unused import: `m::Tr1 as _`
 LL |     use m::Tr1 as _;
    |         ^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/basic.rs:4:9
    |
 LL | #![warn(unused_imports, unused_extern_crates)]
diff --git a/src/test/ui/underscore-imports/unused-2018.stderr b/src/test/ui/underscore-imports/unused-2018.stderr
index 861b3f1d4f..2afb9a10e2 100644
--- a/src/test/ui/underscore-imports/unused-2018.stderr
+++ b/src/test/ui/underscore-imports/unused-2018.stderr
@@ -4,7 +4,7 @@ error: unused import: `core::any`
 LL |     use core::any;
    |         ^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-2018.rs:3:9
    |
 LL | #![deny(unused_imports)]
diff --git a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr b/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr
index 04df2e4570..fe242e6a90 100644
--- a/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr
+++ b/src/test/ui/underscore-lifetime/dyn-trait-underscore-in-struct.stderr
@@ -6,8 +6,8 @@ LL |     x: Box<dyn Debug + '_>,
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct Foo<'lifetime> {
-LL |     x: Box<dyn Debug + 'lifetime>,
+LL | struct Foo<'a> {
+LL |     x: Box<dyn Debug + 'a>,
    |
 
 error[E0228]: the lifetime bound for this object type cannot be deduced from context; please supply an explicit bound
diff --git a/src/test/ui/underscore-lifetime/in-binder.stderr b/src/test/ui/underscore-lifetime/in-binder.stderr
index 1b936dd9ae..fcd7eddb57 100644
--- a/src/test/ui/underscore-lifetime/in-binder.stderr
+++ b/src/test/ui/underscore-lifetime/in-binder.stderr
@@ -36,3 +36,4 @@ LL | fn foo<'_>() {
 
 error: aborting due to 6 previous errors
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr b/src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr
index cf820249c8..8d2c82e59e 100644
--- a/src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr
+++ b/src/test/ui/underscore-lifetime/in-fn-return-illegal.stderr
@@ -2,13 +2,13 @@ error[E0106]: missing lifetime specifier
   --> $DIR/in-fn-return-illegal.rs:5:30
    |
 LL | fn foo(x: &u32, y: &u32) -> &'_ u32 { loop { } }
-   |                              ^^ expected named lifetime parameter
+   |           ----     ----      ^^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from `x` or `y`
 help: consider introducing a named lifetime parameter
    |
-LL | fn foo<'lifetime>(x: &u32, y: &u32) -> &'lifetime u32 { loop { } }
-   |       ^^^^^^^^^^^                       ^^^^^^^^^
+LL | fn foo<'a>(x: &'a u32, y: &'a u32) -> &'a u32 { loop { } }
+   |       ^^^^    ^^^^^^^     ^^^^^^^      ^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/underscore-lifetime/in-struct.stderr b/src/test/ui/underscore-lifetime/in-struct.stderr
index e01b39a4b6..4275cc26f7 100644
--- a/src/test/ui/underscore-lifetime/in-struct.stderr
+++ b/src/test/ui/underscore-lifetime/in-struct.stderr
@@ -6,8 +6,8 @@ LL |     x: &'_ u32,
    |
 help: consider introducing a named lifetime parameter
    |
-LL | struct Foo<'lifetime> {
-LL |     x: &'lifetime u32,
+LL | struct Foo<'a> {
+LL |     x: &'a u32,
    |
 
 error[E0106]: missing lifetime specifier
@@ -18,8 +18,8 @@ LL |     Variant(&'_ u32),
    |
 help: consider introducing a named lifetime parameter
    |
-LL | enum Bar<'lifetime> {
-LL |     Variant(&'lifetime u32),
+LL | enum Bar<'a> {
+LL |     Variant(&'a u32),
    |
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr
index 517904ee62..ada4551bae 100644
--- a/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr
+++ b/src/test/ui/underscore-lifetime/underscore-lifetime-binders.stderr
@@ -28,14 +28,15 @@ error[E0106]: missing lifetime specifier
   --> $DIR/underscore-lifetime-binders.rs:16:35
    |
 LL | fn foo2(_: &'_ u8, y: &'_ u8) -> &'_ u8 { y }
-   |                                   ^^ expected named lifetime parameter
+   |            ------     ------      ^^ expected named lifetime parameter
    |
    = help: this function's return type contains a borrowed value, but the signature does not say whether it is borrowed from argument 1 or `y`
 help: consider introducing a named lifetime parameter
    |
-LL | fn foo2<'lifetime>(_: &'_ u8, y: &'_ u8) -> &'lifetime u8 { y }
-   |        ^^^^^^^^^^^                           ^^^^^^^^^
+LL | fn foo2<'a>(_: &'a u8, y: &'a u8) -> &'a u8 { y }
+   |        ^^^^    ^^^^^^     ^^^^^^      ^^
 
 error: aborting due to 5 previous errors
 
-For more information about this error, try `rustc --explain E0106`.
+Some errors have detailed explanations: E0106, E0637.
+For more information about an error, try `rustc --explain E0106`.
diff --git a/src/test/ui/underscore-lifetime/underscore-outlives-bounds.stderr b/src/test/ui/underscore-lifetime/underscore-outlives-bounds.stderr
index 6fa74d4e31..4b38a26f95 100644
--- a/src/test/ui/underscore-lifetime/underscore-outlives-bounds.stderr
+++ b/src/test/ui/underscore-lifetime/underscore-outlives-bounds.stderr
@@ -6,3 +6,4 @@ LL | impl<'b: '_> Foo<'b> for i32 {}
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr
index eec8e4b846..fe726cb49c 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2015.stderr
@@ -6,3 +6,4 @@ LL |     T: WithType<&u32>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr
index eec8e4b846..fe726cb49c 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-ampersand.rust2018.stderr
@@ -6,3 +6,4 @@ LL |     T: WithType<&u32>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr
index d2c3e35204..95939fd6b7 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2015.stderr
@@ -6,3 +6,4 @@ LL |     T: WithRegion<'_>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr
index d2c3e35204..95939fd6b7 100644
--- a/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-inherent-impl-underscore.rust2018.stderr
@@ -6,3 +6,4 @@ LL |     T: WithRegion<'_>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr b/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr
index 586b2b6aea..fbd14de210 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2015.stderr
@@ -6,3 +6,4 @@ LL |     T: WithType<&u32>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr b/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr
index 586b2b6aea..fbd14de210 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-trait-impl-region.rust2018.stderr
@@ -6,3 +6,4 @@ LL |     T: WithType<&u32>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr b/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr
index faabf57a7d..92caff0dcd 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2015.stderr
@@ -6,3 +6,4 @@ LL |     T: WithRegion<'_>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr b/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr
index faabf57a7d..92caff0dcd 100644
--- a/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr
+++ b/src/test/ui/underscore-lifetime/where-clause-trait-impl-underscore.rust2018.stderr
@@ -6,3 +6,4 @@ LL |     T: WithRegion<'_>
 
 error: aborting due to previous error
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/underscore-lifetime/where-clauses.stderr b/src/test/ui/underscore-lifetime/where-clauses.stderr
index 8674a925c1..1a3ea4af7e 100644
--- a/src/test/ui/underscore-lifetime/where-clauses.stderr
+++ b/src/test/ui/underscore-lifetime/where-clauses.stderr
@@ -12,3 +12,4 @@ LL | impl<T: '_> Foo<'static> for Vec<T> {}
 
 error: aborting due to 2 previous errors
 
+For more information about this error, try `rustc --explain E0637`.
diff --git a/src/test/ui/uninhabited/uninhabited-patterns.stderr b/src/test/ui/uninhabited/uninhabited-patterns.stderr
index 3e5329cfb3..655569ad6e 100644
--- a/src/test/ui/uninhabited/uninhabited-patterns.stderr
+++ b/src/test/ui/uninhabited/uninhabited-patterns.stderr
@@ -4,7 +4,7 @@ error: unreachable pattern
 LL |         &[..] => (),
    |         ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/uninhabited-patterns.rs:6:9
    |
 LL | #![deny(unreachable_patterns)]
diff --git a/src/test/ui/union/union-derive-clone.stderr b/src/test/ui/union/union-derive-clone.stderr
index 0ef5753b59..01c8e8471a 100644
--- a/src/test/ui/union/union-derive-clone.stderr
+++ b/src/test/ui/union/union-derive-clone.stderr
@@ -5,21 +5,26 @@ LL | #[derive(Clone)]
    |          ^^^^^ the trait `std::marker::Copy` is not implemented for `U1`
    |
    = note: required by `std::clone::AssertParamIsCopy`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no method named `clone` found for union `U5<CloneNoCopy>` in the current scope
   --> $DIR/union-derive-clone.rs:37:15
    |
 LL | union U5<T> {
-   | ----------- method `clone` not found for this
+   | -----------
+   | |
+   | method `clone` not found for this
+   | doesn't satisfy `U5<CloneNoCopy>: std::clone::Clone`
+...
+LL | struct CloneNoCopy;
+   | ------------------- doesn't satisfy `CloneNoCopy: std::marker::Copy`
 ...
 LL |     let w = u.clone();
    |               ^^^^^ method not found in `U5<CloneNoCopy>`
    |
    = note: the method `clone` exists but the following trait bounds were not satisfied:
-           `U5<CloneNoCopy> : std::clone::Clone`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `clone`, perhaps you need to implement it:
-           candidate #1: `std::clone::Clone`
+           `CloneNoCopy: std::marker::Copy`
+           which is required by `U5<CloneNoCopy>: std::clone::Clone`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/union/union-derive-eq.stderr b/src/test/ui/union/union-derive-eq.stderr
index f63ab1704c..0955c16187 100644
--- a/src/test/ui/union/union-derive-eq.stderr
+++ b/src/test/ui/union/union-derive-eq.stderr
@@ -5,6 +5,7 @@ LL |     a: PartialEqNotEq,
    |     ^^^^^^^^^^^^^^^^^ the trait `std::cmp::Eq` is not implemented for `PartialEqNotEq`
    |
    = note: required by `std::cmp::AssertParamIsEq`
+   = note: this error originates in a derive macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/union/union-fields-1.stderr b/src/test/ui/union/union-fields-1.stderr
index be145c9496..87621cc01b 100644
--- a/src/test/ui/union/union-fields-1.stderr
+++ b/src/test/ui/union/union-fields-1.stderr
@@ -4,7 +4,7 @@ error: field is never read: `c`
 LL |     c: u8,
    |     ^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/union-fields-1.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/union/union-lint-dead-code.stderr b/src/test/ui/union/union-lint-dead-code.stderr
index 5fe26dc253..7de70ec338 100644
--- a/src/test/ui/union/union-lint-dead-code.stderr
+++ b/src/test/ui/union/union-lint-dead-code.stderr
@@ -4,7 +4,7 @@ error: field is never read: `b`
 LL |     b: bool,
    |     ^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/union-lint-dead-code.rs:1:9
    |
 LL | #![deny(dead_code)]
diff --git a/src/test/ui/union/union-repr-c.stderr b/src/test/ui/union/union-repr-c.stderr
index c8bc0380de..ae84cc7811 100644
--- a/src/test/ui/union/union-repr-c.stderr
+++ b/src/test/ui/union/union-repr-c.stderr
@@ -4,14 +4,14 @@ error: `extern` block uses type `W`, which is not FFI-safe
 LL |     static FOREIGN2: W;
    |                      ^ not FFI-safe
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/union-repr-c.rs:2:9
    |
 LL | #![deny(improper_ctypes)]
    |         ^^^^^^^^^^^^^^^
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this union
    = note: this union has unspecified layout
-note: type defined here
+note: the type is defined here
   --> $DIR/union-repr-c.rs:9:1
    |
 LL | / union W {
diff --git a/src/test/ui/union/union-sized-field.stderr b/src/test/ui/union/union-sized-field.stderr
index c9fec1d21d..62dacd064b 100644
--- a/src/test/ui/union/union-sized-field.stderr
+++ b/src/test/ui/union/union-sized-field.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
   --> $DIR/union-sized-field.rs:4:5
    |
 LL | union Foo<T: ?Sized> {
-   |           -- help: consider further restricting this bound: `T: std::marker::Sized +`
+   |           - this type parameter needs to be `std::marker::Sized`
 LL |     value: T,
    |     ^^^^^^^^ doesn't have a size known at compile-time
    |
@@ -14,7 +14,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
   --> $DIR/union-sized-field.rs:9:5
    |
 LL | struct Foo2<T: ?Sized> {
-   |             -- help: consider further restricting this bound: `T: std::marker::Sized +`
+   |             - this type parameter needs to be `std::marker::Sized`
 LL |     value: T,
    |     ^^^^^^^^ doesn't have a size known at compile-time
    |
@@ -26,7 +26,7 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
   --> $DIR/union-sized-field.rs:15:11
    |
 LL | enum Foo3<T: ?Sized> {
-   |           -- help: consider further restricting this bound: `T: std::marker::Sized +`
+   |           - this type parameter needs to be `std::marker::Sized`
 LL |     Value(T),
    |           ^ doesn't have a size known at compile-time
    |
diff --git a/src/test/ui/unique-object-noncopyable.rs b/src/test/ui/unique-object-noncopyable.rs
index dd38a7190a..bedaf27c2d 100644
--- a/src/test/ui/unique-object-noncopyable.rs
+++ b/src/test/ui/unique-object-noncopyable.rs
@@ -1,3 +1,7 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
 #![feature(box_syntax)]
 
 trait Foo {
diff --git a/src/test/ui/unique-object-noncopyable.stderr b/src/test/ui/unique-object-noncopyable.stderr
index 92cda6482c..fb78095224 100644
--- a/src/test/ui/unique-object-noncopyable.stderr
+++ b/src/test/ui/unique-object-noncopyable.stderr
@@ -1,14 +1,25 @@
 error[E0599]: no method named `clone` found for struct `std::boxed::Box<dyn Foo>` in the current scope
-  --> $DIR/unique-object-noncopyable.rs:24:16
+  --> $DIR/unique-object-noncopyable.rs:28:16
    |
+LL | trait Foo {
+   | ---------
+   | |
+   | doesn't satisfy `dyn Foo: std::clone::Clone`
+   | doesn't satisfy `dyn Foo: std::marker::Sized`
+...
 LL |     let _z = y.clone();
    |                ^^^^^ method not found in `std::boxed::Box<dyn Foo>`
+   | 
+  ::: $SRC_DIR/liballoc/boxed.rs:LL:COL
+   |
+LL | pub struct Box<T: ?Sized>(Unique<T>);
+   | ------------------------------------- doesn't satisfy `std::boxed::Box<dyn Foo>: std::clone::Clone`
    |
    = note: the method `clone` exists but the following trait bounds were not satisfied:
-           `std::boxed::Box<dyn Foo> : std::clone::Clone`
-   = help: items from traits can only be used if the trait is implemented and in scope
-   = note: the following trait defines an item `clone`, perhaps you need to implement it:
-           candidate #1: `std::clone::Clone`
+           `dyn Foo: std::marker::Sized`
+           which is required by `std::boxed::Box<dyn Foo>: std::clone::Clone`
+           `dyn Foo: std::clone::Clone`
+           which is required by `std::boxed::Box<dyn Foo>: std::clone::Clone`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unique-pinned-nocopy.rs b/src/test/ui/unique-pinned-nocopy.rs
index 4c30450c70..091b8a4386 100644
--- a/src/test/ui/unique-pinned-nocopy.rs
+++ b/src/test/ui/unique-pinned-nocopy.rs
@@ -1,3 +1,7 @@
+// FIXME: missing sysroot spans (#53081)
+// ignore-i586-unknown-linux-gnu
+// ignore-i586-unknown-linux-musl
+// ignore-i686-unknown-linux-musl
 #[derive(Debug)]
 struct R {
   b: bool,
diff --git a/src/test/ui/unique-pinned-nocopy.stderr b/src/test/ui/unique-pinned-nocopy.stderr
index e5c3eaccbd..ea6575d1d8 100644
--- a/src/test/ui/unique-pinned-nocopy.stderr
+++ b/src/test/ui/unique-pinned-nocopy.stderr
@@ -1,11 +1,20 @@
 error[E0599]: no method named `clone` found for struct `std::boxed::Box<R>` in the current scope
-  --> $DIR/unique-pinned-nocopy.rs:12:16
+  --> $DIR/unique-pinned-nocopy.rs:16:16
    |
+LL | struct R {
+   | -------- doesn't satisfy `R: std::clone::Clone`
+...
 LL |     let _j = i.clone();
    |                ^^^^^ method not found in `std::boxed::Box<R>`
+   | 
+  ::: $SRC_DIR/liballoc/boxed.rs:LL:COL
+   |
+LL | pub struct Box<T: ?Sized>(Unique<T>);
+   | ------------------------------------- doesn't satisfy `std::boxed::Box<R>: std::clone::Clone`
    |
    = note: the method `clone` exists but the following trait bounds were not satisfied:
-           `std::boxed::Box<R> : std::clone::Clone`
+           `R: std::clone::Clone`
+           which is required by `std::boxed::Box<R>: std::clone::Clone`
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `clone`, perhaps you need to implement it:
            candidate #1: `std::clone::Clone`
diff --git a/src/test/ui/unnecessary-extern-crate.stderr b/src/test/ui/unnecessary-extern-crate.stderr
index 1e6d755234..14ba9d052f 100644
--- a/src/test/ui/unnecessary-extern-crate.stderr
+++ b/src/test/ui/unnecessary-extern-crate.stderr
@@ -4,7 +4,7 @@ error: unused extern crate
 LL | extern crate libc;
    | ^^^^^^^^^^^^^^^^^^ help: remove it
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unnecessary-extern-crate.rs:3:9
    |
 LL | #![deny(unused_extern_crates)]
diff --git a/src/test/ui/unop-move-semantics.stderr b/src/test/ui/unop-move-semantics.stderr
index 092c419d7c..ab641c40df 100644
--- a/src/test/ui/unop-move-semantics.stderr
+++ b/src/test/ui/unop-move-semantics.stderr
@@ -2,14 +2,18 @@ error[E0382]: borrow of moved value: `x`
   --> $DIR/unop-move-semantics.rs:8:5
    |
 LL | fn move_then_borrow<T: Not<Output=T> + Clone>(x: T) {
-   |                     --                        - move occurs because `x` has type `T`, which does not implement the `Copy` trait
-   |                     |
-   |                     help: consider further restricting this bound: `T: Copy +`
+   |                                               - move occurs because `x` has type `T`, which does not implement the `Copy` trait
 LL |     !x;
    |      - value moved here
 LL | 
 LL |     x.clone();
    |     ^ value borrowed here after move
+   |
+help: consider further restricting this bound with `+ Copy`
+  --> $DIR/unop-move-semantics.rs:5:24
+   |
+LL | fn move_then_borrow<T: Not<Output=T> + Clone>(x: T) {
+   |                        ^^^^^^^^^^^^^^^^^^^^^
 
 error[E0505]: cannot move out of `x` because it is borrowed
   --> $DIR/unop-move-semantics.rs:15:6
diff --git a/src/test/ui/unop-neg-bool.stderr b/src/test/ui/unop-neg-bool.stderr
index 1827301374..9913747b88 100644
--- a/src/test/ui/unop-neg-bool.stderr
+++ b/src/test/ui/unop-neg-bool.stderr
@@ -3,8 +3,6 @@ error[E0600]: cannot apply unary operator `-` to type `bool`
    |
 LL |     -true;
    |     ^^^^^ cannot apply unary operator `-`
-   |
-   = note: an implementation of `std::ops::Neg` might be missing for `bool`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unreachable-code-ret.stderr b/src/test/ui/unreachable-code-ret.stderr
index c22342ce72..72abb4fc8d 100644
--- a/src/test/ui/unreachable-code-ret.stderr
+++ b/src/test/ui/unreachable-code-ret.stderr
@@ -6,12 +6,12 @@ LL |     return;
 LL |     println!("Paul is dead");
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^ unreachable statement
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unreachable-code-ret.rs:3:9
    |
 LL | #![deny(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
-   = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/unsafe/ranged_ints2_const.stderr b/src/test/ui/unsafe/ranged_ints2_const.stderr
index e99155ee10..d508d07791 100644
--- a/src/test/ui/unsafe/ranged_ints2_const.stderr
+++ b/src/test/ui/unsafe/ranged_ints2_const.stderr
@@ -4,7 +4,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     let y = &mut x.0;
    |         ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0723]: mutable references in const fn are unstable
@@ -13,7 +13,7 @@ error[E0723]: mutable references in const fn are unstable
 LL |     let y = unsafe { &mut x.0 };
    |         ^
    |
-   = note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
+   = note: see issue #57563 <https://github.com/rust-lang/rust/issues/57563> for more information
    = help: add `#![feature(const_fn)]` to the crate attributes to enable
 
 error[E0133]: mutation of layout constrained field is unsafe and requires unsafe function or block
diff --git a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr
index 28b18d50ff..0dba8496ef 100644
--- a/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr
+++ b/src/test/ui/unsafe/unsafe-around-compiler-generated-unsafe.stderr
@@ -4,7 +4,7 @@ error: unnecessary `unsafe` block
 LL |     unsafe { println!("foo"); }
    |     ^^^^^^ unnecessary `unsafe` block
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unsafe-around-compiler-generated-unsafe.rs:3:9
    |
 LL | #![deny(unused_unsafe)]
diff --git a/src/test/ui/unsafe/unsafe-block-without-braces.rs b/src/test/ui/unsafe/unsafe-block-without-braces.rs
index a291eb2eed..4e46116185 100644
--- a/src/test/ui/unsafe/unsafe-block-without-braces.rs
+++ b/src/test/ui/unsafe/unsafe-block-without-braces.rs
@@ -3,4 +3,4 @@ fn main() {
         std::mem::transmute::<f32, u32>(1.0);
     //}
 }
-//~^^^ ERROR expected one of `extern`, `fn`, or `{`, found `std`
+//~^^^ ERROR expected `{`, found `std`
diff --git a/src/test/ui/unsafe/unsafe-block-without-braces.stderr b/src/test/ui/unsafe/unsafe-block-without-braces.stderr
index 637fdeead3..13e0c3681f 100644
--- a/src/test/ui/unsafe/unsafe-block-without-braces.stderr
+++ b/src/test/ui/unsafe/unsafe-block-without-braces.stderr
@@ -1,8 +1,8 @@
-error: expected one of `extern`, `fn`, or `{`, found `std`
+error: expected `{`, found `std`
   --> $DIR/unsafe-block-without-braces.rs:3:9
    |
 LL |     unsafe //{
-   |           - expected one of `extern`, `fn`, or `{`
+   |           - expected `{`
 LL |         std::mem::transmute::<f32, u32>(1.0);
    |         ^^^ unexpected token
 
diff --git a/src/test/ui/unsized-locals/by-value-trait-object-safety.stderr b/src/test/ui/unsized-locals/by-value-trait-object-safety.stderr
index 7e9a2316be..4cd2098eef 100644
--- a/src/test/ui/unsized-locals/by-value-trait-object-safety.stderr
+++ b/src/test/ui/unsized-locals/by-value-trait-object-safety.stderr
@@ -1,6 +1,9 @@
 error: the `foo` method cannot be invoked on a trait object
   --> $DIR/by-value-trait-object-safety.rs:18:7
    |
+LL |     fn foo(self) -> String where Self: Sized;
+   |                                        ----- this has a `Sized` requirement
+...
 LL |     x.foo();
    |       ^^^
 
diff --git a/src/test/ui/unsized/unsized-bare-typaram.stderr b/src/test/ui/unsized/unsized-bare-typaram.stderr
index bd97b0203b..772de23e64 100644
--- a/src/test/ui/unsized/unsized-bare-typaram.stderr
+++ b/src/test/ui/unsized/unsized-bare-typaram.stderr
@@ -4,9 +4,9 @@ error[E0277]: the size for values of type `T` cannot be known at compilation tim
 LL | fn bar<T: Sized>() { }
    |    --- - required by this bound in `bar`
 LL | fn foo<T: ?Sized>() { bar::<T>() }
-   |        --                   ^ doesn't have a size known at compile-time
+   |        -                    ^ doesn't have a size known at compile-time
    |        |
-   |        help: consider further restricting this bound: `T: std::marker::Sized +`
+   |        this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `T`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized/unsized-enum.stderr b/src/test/ui/unsized/unsized-enum.stderr
index 341d3e4cc2..88f7b1f77a 100644
--- a/src/test/ui/unsized/unsized-enum.stderr
+++ b/src/test/ui/unsized/unsized-enum.stderr
@@ -5,9 +5,9 @@ LL | enum Foo<U> { FooSome(U), FooNone }
    | ----------- required by `Foo`
 LL | fn foo1<T>() { not_sized::<Foo<T>>() } // Hunky dory.
 LL | fn foo2<T: ?Sized>() { not_sized::<Foo<T>>() }
-   |         --                         ^^^^^^ doesn't have a size known at compile-time
+   |         -                          ^^^^^^ doesn't have a size known at compile-time
    |         |
-   |         help: consider further restricting this bound: `T: std::marker::Sized +`
+   |         this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `T`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized/unsized-enum2.stderr b/src/test/ui/unsized/unsized-enum2.stderr
index e85b6d662f..bc3b3831f3 100644
--- a/src/test/ui/unsized/unsized-enum2.stderr
+++ b/src/test/ui/unsized/unsized-enum2.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `W` cannot be known at compilation tim
   --> $DIR/unsized-enum2.rs:23:8
    |
 LL | enum E<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized> {
-   |        -- help: consider further restricting this bound: `W: std::marker::Sized +`
+   |        - this type parameter needs to be `std::marker::Sized`
 LL |     // parameter
 LL |     VA(W),
    |        ^ doesn't have a size known at compile-time
@@ -15,7 +15,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized-enum2.rs:25:8
    |
 LL | enum E<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized> {
-   |                   -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |                   - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     VB{x: X},
    |        ^^^^ doesn't have a size known at compile-time
@@ -28,7 +28,7 @@ error[E0277]: the size for values of type `Y` cannot be known at compilation tim
   --> $DIR/unsized-enum2.rs:27:15
    |
 LL | enum E<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized> {
-   |                              -- help: consider further restricting this bound: `Y: std::marker::Sized +`
+   |                              - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     VC(isize, Y),
    |               ^ doesn't have a size known at compile-time
@@ -41,7 +41,7 @@ error[E0277]: the size for values of type `Z` cannot be known at compilation tim
   --> $DIR/unsized-enum2.rs:29:18
    |
 LL | enum E<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized> {
-   |                                         -- help: consider further restricting this bound: `Z: std::marker::Sized +`
+   |                                         - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     VD{u: isize, x: Z},
    |                  ^^^^ doesn't have a size known at compile-time
diff --git a/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr b/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr
index 280b8fd43c..5688ae5b89 100644
--- a/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr
+++ b/src/test/ui/unsized/unsized-inherent-impl-self-type.stderr
@@ -5,9 +5,9 @@ LL | struct S5<Y>(Y);
    | ---------------- required by `S5`
 LL | 
 LL | impl<X: ?Sized> S5<X> {
-   |      --         ^^^^^ doesn't have a size known at compile-time
+   |      -          ^^^^^ doesn't have a size known at compile-time
    |      |
-   |      help: consider further restricting this bound: `X: std::marker::Sized +`
+   |      this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized/unsized-struct.stderr b/src/test/ui/unsized/unsized-struct.stderr
index 2894d5d567..653fb5c1ae 100644
--- a/src/test/ui/unsized/unsized-struct.stderr
+++ b/src/test/ui/unsized/unsized-struct.stderr
@@ -5,9 +5,9 @@ LL | struct Foo<T> { data: T }
    | ------------- required by `Foo`
 LL | fn foo1<T>() { not_sized::<Foo<T>>() } // Hunky dory.
 LL | fn foo2<T: ?Sized>() { not_sized::<Foo<T>>() }
-   |         --                         ^^^^^^ doesn't have a size known at compile-time
+   |         -                          ^^^^^^ doesn't have a size known at compile-time
    |         |
-   |         help: consider further restricting this bound: `T: std::marker::Sized +`
+   |         this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `T`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
@@ -19,9 +19,9 @@ LL | fn is_sized<T:Sized>() { }
    |    -------- - required by this bound in `is_sized`
 ...
 LL | fn bar2<T: ?Sized>() { is_sized::<Bar<T>>() }
-   |         --             ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |         -              ^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |         |
-   |         help: consider further restricting this bound: `T: std::marker::Sized +`
+   |         this type parameter needs to be `std::marker::Sized`
    |
    = help: within `Bar<T>`, the trait `std::marker::Sized` is not implemented for `T`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized/unsized-trait-impl-self-type.stderr b/src/test/ui/unsized/unsized-trait-impl-self-type.stderr
index ba1550439c..3597073e7e 100644
--- a/src/test/ui/unsized/unsized-trait-impl-self-type.stderr
+++ b/src/test/ui/unsized/unsized-trait-impl-self-type.stderr
@@ -5,9 +5,9 @@ LL | struct S5<Y>(Y);
    | ---------------- required by `S5`
 LL | 
 LL | impl<X: ?Sized> T3<X> for S5<X> {
-   |      --         ^^^^^ doesn't have a size known at compile-time
+   |      -          ^^^^^ doesn't have a size known at compile-time
    |      |
-   |      help: consider further restricting this bound: `X: std::marker::Sized +`
+   |      this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr b/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr
index 41371d63f9..b37d9f9d53 100644
--- a/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr
+++ b/src/test/ui/unsized/unsized-trait-impl-trait-arg.stderr
@@ -2,9 +2,9 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized-trait-impl-trait-arg.rs:8:17
    |
 LL | impl<X: ?Sized> T2<X> for S4<X> {
-   |      --         ^^^^^ doesn't have a size known at compile-time
+   |      -          ^^^^^ doesn't have a size known at compile-time
    |      |
-   |      help: consider further restricting this bound: `X: std::marker::Sized +`
+   |      this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized3.stderr b/src/test/ui/unsized3.stderr
index 232296ad09..e97d00fc47 100644
--- a/src/test/ui/unsized3.stderr
+++ b/src/test/ui/unsized3.stderr
@@ -2,12 +2,14 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized3.rs:7:13
    |
 LL | fn f1<X: ?Sized>(x: &X) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     f2::<X>(x);
    |             ^ doesn't have a size known at compile-time
 ...
 LL | fn f2<X>(x: &X) {
-   |    -- - required by this bound in `f2`
+   |    -- -- help: consider relaxing the implicit `Sized` restriction: `: ?Sized`
+   |       |
+   |       required by this bound in `f2`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
@@ -16,12 +18,14 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized3.rs:18:13
    |
 LL | fn f3<X: ?Sized + T>(x: &X) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     f4::<X>(x);
    |             ^ doesn't have a size known at compile-time
 ...
 LL | fn f4<X: T>(x: &X) {
-   |    -- - required by this bound in `f4`
+   |    -- -   - help: consider relaxing the implicit `Sized` restriction: `+  ?Sized`
+   |       |
+   |       required by this bound in `f4`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
@@ -33,7 +37,7 @@ LL | fn f5<Y>(x: &Y) {}
    |    -- - required by this bound in `f5`
 ...
 LL | fn f8<X: ?Sized>(x1: &S<X>, x2: &S<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     f5(x1);
    |        ^^ doesn't have a size known at compile-time
    |
@@ -45,7 +49,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized3.rs:40:8
    |
 LL | fn f9<X: ?Sized>(x1: Box<S<X>>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     f5(&(*x1, 34));
    |        ^^^^^^^^^^ doesn't have a size known at compile-time
    |
@@ -58,7 +62,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized3.rs:45:9
    |
 LL | fn f10<X: ?Sized>(x1: Box<S<X>>) {
-   |        -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |        - this type parameter needs to be `std::marker::Sized`
 LL |     f5(&(32, *x1));
    |         ^^^^^^^^^ doesn't have a size known at compile-time
    |
@@ -75,7 +79,7 @@ LL | fn f5<Y>(x: &Y) {}
    |    -- - required by this bound in `f5`
 ...
 LL | fn f10<X: ?Sized>(x1: Box<S<X>>) {
-   |        -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |        - this type parameter needs to be `std::marker::Sized`
 LL |     f5(&(32, *x1));
    |        ^^^^^^^^^^ doesn't have a size known at compile-time
    |
diff --git a/src/test/ui/unsized5.stderr b/src/test/ui/unsized5.stderr
index bfd3f4aa69..de4da30979 100644
--- a/src/test/ui/unsized5.stderr
+++ b/src/test/ui/unsized5.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized5.rs:4:5
    |
 LL | struct S1<X: ?Sized> {
-   |           -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |           - this type parameter needs to be `std::marker::Sized`
 LL |     f1: X,
    |     ^^^^^ doesn't have a size known at compile-time
    |
@@ -14,7 +14,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized5.rs:10:5
    |
 LL | struct S2<X: ?Sized> {
-   |           -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |           - this type parameter needs to be `std::marker::Sized`
 LL |     f: isize,
 LL |     g: X,
    |     ^^^^ doesn't have a size known at compile-time
@@ -47,7 +47,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized5.rs:25:8
    |
 LL | enum E<X: ?Sized> {
-   |        -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |        - this type parameter needs to be `std::marker::Sized`
 LL |     V1(X, isize),
    |        ^ doesn't have a size known at compile-time
    |
@@ -59,7 +59,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized5.rs:29:8
    |
 LL | enum F<X: ?Sized> {
-   |        -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |        - this type parameter needs to be `std::marker::Sized`
 LL |     V2{f1: X, f: isize},
    |        ^^^^^ doesn't have a size known at compile-time
    |
diff --git a/src/test/ui/unsized6.stderr b/src/test/ui/unsized6.stderr
index 95acd987a5..337afd2ee7 100644
--- a/src/test/ui/unsized6.stderr
+++ b/src/test/ui/unsized6.stderr
@@ -2,7 +2,7 @@ error[E0277]: the size for values of type `Y` cannot be known at compilation tim
   --> $DIR/unsized6.rs:9:9
    |
 LL | fn f1<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized>(x: &X) {
-   |                             -- help: consider further restricting this bound: `Y: std::marker::Sized +`
+   |                             - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let y: Y;
    |         ^ doesn't have a size known at compile-time
@@ -16,7 +16,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:7:12
    |
 LL | fn f1<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized>(x: &X) {
-   |                  -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |                  - this type parameter needs to be `std::marker::Sized`
 LL |     let _: W; // <-- this is OK, no bindings created, no initializer.
 LL |     let _: (isize, (X, isize));
    |            ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
@@ -29,7 +29,7 @@ error[E0277]: the size for values of type `Z` cannot be known at compilation tim
   --> $DIR/unsized6.rs:11:12
    |
 LL | fn f1<W: ?Sized, X: ?Sized, Y: ?Sized, Z: ?Sized>(x: &X) {
-   |                                        -- help: consider further restricting this bound: `Z: std::marker::Sized +`
+   |                                        - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let y: (isize, (Z, usize));
    |            ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
@@ -42,7 +42,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:15:9
    |
 LL | fn f2<X: ?Sized, Y: ?Sized>(x: &X) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     let y: X;
    |         ^ doesn't have a size known at compile-time
    |
@@ -55,7 +55,7 @@ error[E0277]: the size for values of type `Y` cannot be known at compilation tim
   --> $DIR/unsized6.rs:17:12
    |
 LL | fn f2<X: ?Sized, Y: ?Sized>(x: &X) {
-   |                  -- help: consider further restricting this bound: `Y: std::marker::Sized +`
+   |                  - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let y: (isize, (Y, isize));
    |            ^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
@@ -68,7 +68,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:22:9
    |
 LL | fn f3<X: ?Sized>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     let y: X = *x1;
    |         ^ doesn't have a size known at compile-time
    |
@@ -81,7 +81,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:24:9
    |
 LL | fn f3<X: ?Sized>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let y = *x2;
    |         ^ doesn't have a size known at compile-time
@@ -95,7 +95,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:26:10
    |
 LL | fn f3<X: ?Sized>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let (y, z) = (*x3, 4);
    |          ^ doesn't have a size known at compile-time
@@ -109,7 +109,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:30:9
    |
 LL | fn f4<X: ?Sized + T>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 LL |     let y: X = *x1;
    |         ^ doesn't have a size known at compile-time
    |
@@ -122,7 +122,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:32:9
    |
 LL | fn f4<X: ?Sized + T>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let y = *x2;
    |         ^ doesn't have a size known at compile-time
@@ -136,7 +136,7 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:34:10
    |
 LL | fn f4<X: ?Sized + T>(x1: Box<X>, x2: Box<X>, x3: Box<X>) {
-   |       -- help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       - this type parameter needs to be `std::marker::Sized`
 ...
 LL |     let (y, z) = (*x3, 4);
    |          ^ doesn't have a size known at compile-time
@@ -150,9 +150,9 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:38:18
    |
 LL | fn g1<X: ?Sized>(x: X) {}
-   |       --         ^ doesn't have a size known at compile-time
+   |       -          ^ doesn't have a size known at compile-time
    |       |
-   |       help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
@@ -163,9 +163,9 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized6.rs:40:22
    |
 LL | fn g2<X: ?Sized + T>(x: X) {}
-   |       --             ^ doesn't have a size known at compile-time
+   |       -              ^ doesn't have a size known at compile-time
    |       |
-   |       help: consider further restricting this bound: `X: std::marker::Sized +`
+   |       this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unsized7.stderr b/src/test/ui/unsized7.stderr
index c77503a6f8..0f71c5f6f8 100644
--- a/src/test/ui/unsized7.stderr
+++ b/src/test/ui/unsized7.stderr
@@ -2,9 +2,9 @@ error[E0277]: the size for values of type `X` cannot be known at compilation tim
   --> $DIR/unsized7.rs:12:21
    |
 LL | impl<X: ?Sized + T> T1<X> for S3<X> {
-   |      --             ^^^^^ doesn't have a size known at compile-time
+   |      -              ^^^^^ doesn't have a size known at compile-time
    |      |
-   |      help: consider further restricting this bound: `X: std::marker::Sized +`
+   |      this type parameter needs to be `std::marker::Sized`
    |
    = help: the trait `std::marker::Sized` is not implemented for `X`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
diff --git a/src/test/ui/unused/unused-attr.stderr b/src/test/ui/unused/unused-attr.stderr
index 956b870715..fd7412db22 100644
--- a/src/test/ui/unused/unused-attr.stderr
+++ b/src/test/ui/unused/unused-attr.stderr
@@ -4,7 +4,7 @@ error: unused attribute
 LL | #[rustc_dummy]
    | ^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-attr.rs:1:9
    |
 LL | #![deny(unused_attributes)]
diff --git a/src/test/ui/unused/unused-macro-rules.stderr b/src/test/ui/unused/unused-macro-rules.stderr
index 5c0b9f262b..532d933978 100644
--- a/src/test/ui/unused/unused-macro-rules.stderr
+++ b/src/test/ui/unused/unused-macro-rules.stderr
@@ -6,7 +6,7 @@ LL | |     () => {};
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-macro-rules.rs:1:9
    |
 LL | #![deny(unused_macros)]
@@ -22,6 +22,8 @@ LL | |         }
 ...
 LL |   create_macro!();
    |   ---------------- in this macro invocation
+   |
+   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: unused macro definition
   --> $DIR/unused-macro-rules.rs:24:5
@@ -31,7 +33,7 @@ LL | |         () => {};
 LL | |     }
    | |_____^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-macro-rules.rs:23:12
    |
 LL |     #[deny(unused_macros)]
diff --git a/src/test/ui/unused/unused-macro.stderr b/src/test/ui/unused/unused-macro.stderr
index d18fe82564..f5eb76179b 100644
--- a/src/test/ui/unused/unused-macro.stderr
+++ b/src/test/ui/unused/unused-macro.stderr
@@ -6,7 +6,7 @@ LL | |     () => {}
 LL | | }
    | |_^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-macro.rs:2:9
    |
 LL | #![deny(unused_macros)]
@@ -20,7 +20,7 @@ LL | |         () => {}
 LL | |     }
    | |_____^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-macro.rs:14:12
    |
 LL |     #[deny(unused_macros)]
diff --git a/src/test/ui/unused/unused-mut-warning-captured-var.stderr b/src/test/ui/unused/unused-mut-warning-captured-var.stderr
index d5b731406d..39d470e02a 100644
--- a/src/test/ui/unused/unused-mut-warning-captured-var.stderr
+++ b/src/test/ui/unused/unused-mut-warning-captured-var.stderr
@@ -6,7 +6,7 @@ LL |     let mut x = 1;
    |         |
    |         help: remove this `mut`
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-mut-warning-captured-var.rs:1:11
    |
 LL | #![forbid(unused_mut)]
diff --git a/src/test/ui/unused/unused-result.rs b/src/test/ui/unused/unused-result.rs
index 538d30943e..a65e98990d 100644
--- a/src/test/ui/unused/unused-result.rs
+++ b/src/test/ui/unused/unused-result.rs
@@ -1,7 +1,7 @@
 #![allow(dead_code)]
 #![deny(unused_results, unused_must_use)]
-//~^ NOTE: lint level defined here
-//~| NOTE: lint level defined here
+//~^ NOTE: the lint level is defined here
+//~| NOTE: the lint level is defined here
 
 #[must_use]
 enum MustUse { Test }
diff --git a/src/test/ui/unused/unused-result.stderr b/src/test/ui/unused/unused-result.stderr
index e2aee75f3e..1b1dcab3a1 100644
--- a/src/test/ui/unused/unused-result.stderr
+++ b/src/test/ui/unused/unused-result.stderr
@@ -4,7 +4,7 @@ error: unused `MustUse` that must be used
 LL |     foo::<MustUse>();
    |     ^^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-result.rs:2:25
    |
 LL | #![deny(unused_results, unused_must_use)]
@@ -24,7 +24,7 @@ error: unused result
 LL |     foo::<isize>();
    |     ^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/unused-result.rs:2:9
    |
 LL | #![deny(unused_results, unused_must_use)]
diff --git a/src/test/ui/use-module-level-int-consts.rs b/src/test/ui/use-module-level-int-consts.rs
new file mode 100644
index 0000000000..758fb414ea
--- /dev/null
+++ b/src/test/ui/use-module-level-int-consts.rs
@@ -0,0 +1,11 @@
+// run-pass
+
+// Make sure the module level constants are still there and accessible even after
+// the corresponding associated constants have been added, and later stabilized.
+use std::{u16, f32};
+
+fn main() {
+    let _ = u16::MAX;
+    let _ = f32::EPSILON;
+    let _ = std::f64::MANTISSA_DIGITS;
+}
diff --git a/src/test/ui/use/use-nested-groups-unused-imports.stderr b/src/test/ui/use/use-nested-groups-unused-imports.stderr
index c8df6cbc57..987d1dcf5f 100644
--- a/src/test/ui/use/use-nested-groups-unused-imports.stderr
+++ b/src/test/ui/use/use-nested-groups-unused-imports.stderr
@@ -4,7 +4,7 @@ error: unused imports: `*`, `Foo`, `baz::{}`, `foobar::*`
 LL | use foo::{Foo, bar::{baz::{}, foobar::*}, *};
    |           ^^^        ^^^^^^^  ^^^^^^^^^   ^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/use-nested-groups-unused-imports.rs:3:9
    |
 LL | #![deny(unused_imports)]
diff --git a/src/test/ui/useless-comment.stderr b/src/test/ui/useless-comment.stderr
index 925e307963..92817321a8 100644
--- a/src/test/ui/useless-comment.stderr
+++ b/src/test/ui/useless-comment.stderr
@@ -2,17 +2,23 @@ error: unused doc comment
   --> $DIR/useless-comment.rs:9:1
    |
 LL | /// foo
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-LL | mac!();
-   | ------- rustdoc does not generate documentation for macro expansions
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rustdoc does not generate documentation for macros
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/useless-comment.rs:3:9
    |
 LL | #![deny(unused_doc_comments)]
    |         ^^^^^^^^^^^^^^^^^^^
    = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
 
+error: unused doc comment
+  --> $DIR/useless-comment.rs:32:5
+   |
+LL |     /// bar
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rustdoc does not generate documentation for macros
+   |
+   = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
+
 error: unused doc comment
   --> $DIR/useless-comment.rs:13:5
    |
@@ -68,16 +74,6 @@ LL |     #[doc = "bar"]
 LL |     3;
    |     - rustdoc does not generate documentation for expressions
 
-error: unused doc comment
-  --> $DIR/useless-comment.rs:32:5
-   |
-LL |     /// bar
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-LL |     mac!();
-   |     ------- rustdoc does not generate documentation for macro expansions
-   |
-   = help: to document an item produced by a macro, the macro must produce the documentation as part of its expansion
-
 error: unused doc comment
   --> $DIR/useless-comment.rs:35:13
    |
diff --git a/src/test/ui/utf8_idents.stderr b/src/test/ui/utf8_idents.stderr
index 56de63da4f..8defb2c298 100644
--- a/src/test/ui/utf8_idents.stderr
+++ b/src/test/ui/utf8_idents.stderr
@@ -4,7 +4,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     'β,
    |     ^^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -13,7 +13,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     γ
    |     ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -22,7 +22,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     δ: usize
    |     ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 error[E0658]: non-ascii idents are not fully supported
@@ -31,7 +31,7 @@ error[E0658]: non-ascii idents are not fully supported
 LL |     let α = 0.00001f64;
    |         ^
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/55467
+   = note: see issue #55467 <https://github.com/rust-lang/rust/issues/55467> for more information
    = help: add `#![feature(non_ascii_idents)]` to the crate attributes to enable
 
 warning: type parameter `γ` should have an upper camel case name
diff --git a/src/test/ui/variants/variant-size-differences.stderr b/src/test/ui/variants/variant-size-differences.stderr
index c82c253f61..241a757d44 100644
--- a/src/test/ui/variants/variant-size-differences.stderr
+++ b/src/test/ui/variants/variant-size-differences.stderr
@@ -4,7 +4,7 @@ error: enum variant is more than three times larger (1024 bytes) than the next l
 LL |     VBig([u8; 1024]),
    |     ^^^^^^^^^^^^^^^^
    |
-note: lint level defined here
+note: the lint level is defined here
   --> $DIR/variant-size-differences.rs:1:9
    |
 LL | #![deny(variant_size_differences)]
diff --git a/src/test/ui/vec/vec-res-add.stderr b/src/test/ui/vec/vec-res-add.stderr
index 1cc12a222e..2d41583268 100644
--- a/src/test/ui/vec/vec-res-add.stderr
+++ b/src/test/ui/vec/vec-res-add.stderr
@@ -5,8 +5,6 @@ LL |     let k = i + j;
    |             - ^ - std::vec::Vec<R>
    |             |
    |             std::vec::Vec<R>
-   |
-   = note: an implementation of `std::ops::Add` might be missing for `std::vec::Vec<R>`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-array-elem-sized.rs b/src/test/ui/wf/wf-array-elem-sized.rs
index 41c2d3c43e..34bf220342 100644
--- a/src/test/ui/wf/wf-array-elem-sized.rs
+++ b/src/test/ui/wf/wf-array-elem-sized.rs
@@ -1,4 +1,4 @@
-// Check that array elemen types must be Sized. Issue #25692.
+// Check that array element types must be Sized. Issue #25692.
 
 
 #![allow(dead_code)]
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr b/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
index 0b63aef2bc..eefb450155 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
+++ b/src/test/ui/wf/wf-convert-unsafe-trait-obj-box.stderr
@@ -1,30 +1,42 @@
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj-box.rs:16:33
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let t_box: Box<dyn Trait> = Box::new(S);
    |                                 ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<dyn Trait>>` for `std::boxed::Box<S>`
    = note: required by cast to type `std::boxed::Box<dyn Trait>`
 
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj-box.rs:17:15
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     takes_box(Box::new(S));
    |               ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<dyn Trait>>` for `std::boxed::Box<S>`
    = note: required by cast to type `std::boxed::Box<(dyn Trait + 'static)>`
 
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj-box.rs:15:5
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     Box::new(S) as Box<dyn Trait>;
    |     ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<std::boxed::Box<dyn Trait>>` for `std::boxed::Box<S>`
    = note: required by cast to type `std::boxed::Box<dyn Trait>`
 
diff --git a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr b/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr
index 7aeefd731f..5e645382d1 100644
--- a/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr
+++ b/src/test/ui/wf/wf-convert-unsafe-trait-obj.stderr
@@ -1,30 +1,42 @@
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj.rs:16:25
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let t: &dyn Trait = &S;
    |                         ^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Trait>` for `&S`
    = note: required by cast to type `&dyn Trait`
 
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj.rs:17:17
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     takes_trait(&S);
    |                 ^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Trait>` for `&S`
    = note: required by cast to type `&dyn Trait`
 
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-convert-unsafe-trait-obj.rs:15:5
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     &S as &dyn Trait;
    |     ^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Trait>` for `&S`
    = note: required by cast to type `&dyn Trait`
 
diff --git a/src/test/ui/wf/wf-enum-bound.rs b/src/test/ui/wf/wf-enum-bound.rs
index c9eb9d8943..042a2cb09d 100644
--- a/src/test/ui/wf/wf-enum-bound.rs
+++ b/src/test/ui/wf/wf-enum-bound.rs
@@ -6,8 +6,8 @@
 
 trait ExtraCopy<T:Copy> { }
 
-enum SomeEnum<T,U> //~ ERROR E0277
-    where T: ExtraCopy<U>
+enum SomeEnum<T,U>
+    where T: ExtraCopy<U> //~ ERROR E0277
 {
     SomeVariant(T,U)
 }
diff --git a/src/test/ui/wf/wf-enum-bound.stderr b/src/test/ui/wf/wf-enum-bound.stderr
index eaacd6b688..be64ddb975 100644
--- a/src/test/ui/wf/wf-enum-bound.stderr
+++ b/src/test/ui/wf/wf-enum-bound.stderr
@@ -1,16 +1,17 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-enum-bound.rs:9:1
+  --> $DIR/wf-enum-bound.rs:10:14
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
-LL | 
-LL | / enum SomeEnum<T,U>
-LL | |     where T: ExtraCopy<U>
-   | |                          - help: consider further restricting type parameter `U`: `, U: std::marker::Copy`
-LL | | {
-LL | |     SomeVariant(T,U)
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `U`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
+...
+LL |     where T: ExtraCopy<U>
+   |              ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `where U: std::marker::Copy`
+  --> $DIR/wf-enum-bound.rs:9:17
+   |
+LL | enum SomeEnum<T,U>
+   |                 ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
index 52882c460d..40454b33b7 100644
--- a/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
+++ b/src/test/ui/wf/wf-enum-fields-struct-variant.stderr
@@ -4,11 +4,14 @@ error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied
 LL | struct IsCopy<T:Copy> {
    | --------------------- required by `IsCopy`
 ...
-LL | enum AnotherEnum<A> {
-   |                  - help: consider restricting this bound: `A: std::marker::Copy`
-LL |     AnotherVariant {
 LL |         f: IsCopy<A>
    |         ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A`
+   |
+help: consider restricting this type parameter with `A: std::marker::Copy`
+  --> $DIR/wf-enum-fields-struct-variant.rs:11:18
+   |
+LL | enum AnotherEnum<A> {
+   |                  ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-enum-fields.stderr b/src/test/ui/wf/wf-enum-fields.stderr
index 0fea35d68e..e2612add77 100644
--- a/src/test/ui/wf/wf-enum-fields.stderr
+++ b/src/test/ui/wf/wf-enum-fields.stderr
@@ -4,10 +4,14 @@ error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied
 LL | struct IsCopy<T:Copy> {
    | --------------------- required by `IsCopy`
 ...
-LL | enum SomeEnum<A> {
-   |               - help: consider restricting this bound: `A: std::marker::Copy`
 LL |     SomeVariant(IsCopy<A>)
    |                 ^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A`
+   |
+help: consider restricting this type parameter with `A: std::marker::Copy`
+  --> $DIR/wf-enum-fields.rs:11:15
+   |
+LL | enum SomeEnum<A> {
+   |               ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-fn-where-clause.stderr b/src/test/ui/wf/wf-fn-where-clause.stderr
index 9b8b04a7b8..2a4f2df5a8 100644
--- a/src/test/ui/wf/wf-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-fn-where-clause.stderr
@@ -1,34 +1,35 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-fn-where-clause.rs:8:1
+  --> $DIR/wf-fn-where-clause.rs:8:24
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
 LL | 
-LL |   fn foo<T,U>() where T: ExtraCopy<U>
-   |   ^                                  - help: consider further restricting type parameter `U`: `, U: std::marker::Copy`
-   |  _|
-   | |
-LL | | {
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `U`
+LL | fn foo<T,U>() where T: ExtraCopy<U>
+   |                        ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `where U: std::marker::Copy`
+  --> $DIR/wf-fn-where-clause.rs:8:10
+   |
+LL | fn foo<T,U>() where T: ExtraCopy<U>
+   |          ^
 
 error[E0277]: the size for values of type `(dyn std::marker::Copy + 'static)` cannot be known at compilation time
-  --> $DIR/wf-fn-where-clause.rs:12:1
+  --> $DIR/wf-fn-where-clause.rs:12:16
    |
 LL | fn bar() where Vec<dyn Copy>:, {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |                ^^^^^^^^^^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `std::marker::Sized` is not implemented for `(dyn std::marker::Copy + 'static)`
    = note: to learn more, visit <https://doc.rust-lang.org/book/ch19-04-advanced-types.html#dynamically-sized-types-and-the-sized-trait>
    = note: required by `std::vec::Vec`
 
 error[E0038]: the trait `std::marker::Copy` cannot be made into an object
-  --> $DIR/wf-fn-where-clause.rs:12:1
+  --> $DIR/wf-fn-where-clause.rs:12:16
    |
 LL | fn bar() where Vec<dyn Copy>:, {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object
+   |                ^^^^^^^^^^^^^ the trait `std::marker::Copy` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
+   = note: the trait cannot be made into an object because it requires `Self: Sized`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/wf/wf-impl-associated-type-region.stderr b/src/test/ui/wf/wf-impl-associated-type-region.stderr
index 9cc3602530..9942c80eff 100644
--- a/src/test/ui/wf/wf-impl-associated-type-region.stderr
+++ b/src/test/ui/wf/wf-impl-associated-type-region.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/wf-impl-associated-type-region.rs:10:5
    |
 LL | impl<'a, T> Foo<'a> for T {
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     type Bar = &'a T;
    |     ^^^^^^^^^^^^^^^^^
    |
diff --git a/src/test/ui/wf/wf-impl-associated-type-trait.stderr b/src/test/ui/wf/wf-impl-associated-type-trait.stderr
index 6d71670e6a..7774299b39 100644
--- a/src/test/ui/wf/wf-impl-associated-type-trait.stderr
+++ b/src/test/ui/wf/wf-impl-associated-type-trait.stderr
@@ -4,10 +4,14 @@ error[E0277]: the trait bound `T: MyHash` is not satisfied
 LL | pub struct MySet<T:MyHash> {
    | -------------------------- required by `MySet`
 ...
-LL | impl<T> Foo for T {
-   |      - help: consider restricting this bound: `T: MyHash`
 LL |     type Bar = MySet<T>;
    |     ^^^^^^^^^^^^^^^^^^^^ the trait `MyHash` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: MyHash`
+  --> $DIR/wf-impl-associated-type-trait.rs:16:6
+   |
+LL | impl<T> Foo for T {
+   |      ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-arg.stderr b/src/test/ui/wf/wf-in-fn-arg.stderr
index 3798ba1ec6..c1a6657e63 100644
--- a/src/test/ui/wf/wf-in-fn-arg.stderr
+++ b/src/test/ui/wf/wf-in-fn-arg.stderr
@@ -1,16 +1,17 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
-  --> $DIR/wf-in-fn-arg.rs:10:1
+  --> $DIR/wf-in-fn-arg.rs:10:14
    |
-LL |   struct MustBeCopy<T:Copy> {
-   |   ------------------------- required by `MustBeCopy`
+LL | struct MustBeCopy<T:Copy> {
+   | ------------------------- required by `MustBeCopy`
 ...
-LL |   fn bar<T>(_: &MustBeCopy<T>)
-   |   ^      - help: consider restricting this bound: `T: std::marker::Copy`
-   |  _|
-   | |
-LL | | {
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `T`
+LL | fn bar<T>(_: &MustBeCopy<T>)
+   |              ^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-in-fn-arg.rs:10:8
+   |
+LL | fn bar<T>(_: &MustBeCopy<T>)
+   |        ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-ret.stderr b/src/test/ui/wf/wf-in-fn-ret.stderr
index 2e46ce4900..754d64df01 100644
--- a/src/test/ui/wf/wf-in-fn-ret.stderr
+++ b/src/test/ui/wf/wf-in-fn-ret.stderr
@@ -1,16 +1,17 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
-  --> $DIR/wf-in-fn-ret.rs:10:1
+  --> $DIR/wf-in-fn-ret.rs:10:16
    |
-LL |   struct MustBeCopy<T:Copy> {
-   |   ------------------------- required by `MustBeCopy`
+LL | struct MustBeCopy<T:Copy> {
+   | ------------------------- required by `MustBeCopy`
 ...
-LL |   fn bar<T>() -> MustBeCopy<T>
-   |   ^      - help: consider restricting this bound: `T: std::marker::Copy`
-   |  _|
-   | |
-LL | | {
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `T`
+LL | fn bar<T>() -> MustBeCopy<T>
+   |                ^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-in-fn-ret.rs:10:8
+   |
+LL | fn bar<T>() -> MustBeCopy<T>
+   |        ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-type-arg.stderr b/src/test/ui/wf/wf-in-fn-type-arg.stderr
index db4fb9f97f..97a5c0fd91 100644
--- a/src/test/ui/wf/wf-in-fn-type-arg.stderr
+++ b/src/test/ui/wf/wf-in-fn-type-arg.stderr
@@ -4,11 +4,14 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
 LL | struct MustBeCopy<T:Copy> {
    | ------------------------- required by `MustBeCopy`
 ...
-LL | struct Bar<T> {
-   |            - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     // needs T: Copy
 LL |     x: fn(MustBeCopy<T>)
    |     ^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-in-fn-type-arg.rs:7:12
+   |
+LL | struct Bar<T> {
+   |            ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-type-ret.stderr b/src/test/ui/wf/wf-in-fn-type-ret.stderr
index 09f8aa2a20..527b000edf 100644
--- a/src/test/ui/wf/wf-in-fn-type-ret.stderr
+++ b/src/test/ui/wf/wf-in-fn-type-ret.stderr
@@ -4,11 +4,14 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
 LL | struct MustBeCopy<T:Copy> {
    | ------------------------- required by `MustBeCopy`
 ...
-LL | struct Foo<T> {
-   |            - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     // needs T: 'static
 LL |     x: fn() -> MustBeCopy<T>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-in-fn-type-ret.rs:7:12
+   |
+LL | struct Foo<T> {
+   |            ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-fn-type-static.stderr b/src/test/ui/wf/wf-in-fn-type-static.stderr
index 8952c78aac..7dc8f5a966 100644
--- a/src/test/ui/wf/wf-in-fn-type-static.stderr
+++ b/src/test/ui/wf/wf-in-fn-type-static.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/wf-in-fn-type-static.rs:13:5
    |
 LL | struct Foo<T> {
-   |            - help: consider adding an explicit lifetime bound `T: 'static`...
+   |            - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // needs T: 'static
 LL |     x: fn() -> &'static T
    |     ^^^^^^^^^^^^^^^^^^^^^
@@ -17,7 +17,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/wf-in-fn-type-static.rs:18:5
    |
 LL | struct Bar<T> {
-   |            - help: consider adding an explicit lifetime bound `T: 'static`...
+   |            - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // needs T: Copy
 LL |     x: fn(&'static T)
    |     ^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.rs b/src/test/ui/wf/wf-in-fn-where-clause.rs
index 65a1771d41..e55295a3b2 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.rs
+++ b/src/test/ui/wf/wf-in-fn-where-clause.rs
@@ -6,8 +6,8 @@
 trait MustBeCopy<T:Copy> {
 }
 
-fn bar<T,U>() //~ ERROR E0277
-    where T: MustBeCopy<U>
+fn bar<T,U>()
+    where T: MustBeCopy<U> //~ ERROR E0277
 {
 }
 
diff --git a/src/test/ui/wf/wf-in-fn-where-clause.stderr b/src/test/ui/wf/wf-in-fn-where-clause.stderr
index 979802dec4..62c672a21e 100644
--- a/src/test/ui/wf/wf-in-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-in-fn-where-clause.stderr
@@ -1,15 +1,17 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-in-fn-where-clause.rs:9:1
+  --> $DIR/wf-in-fn-where-clause.rs:10:14
    |
-LL |   trait MustBeCopy<T:Copy> {
-   |   ------------------------ required by `MustBeCopy`
+LL | trait MustBeCopy<T:Copy> {
+   | ------------------------ required by `MustBeCopy`
 ...
-LL | / fn bar<T,U>()
-LL | |     where T: MustBeCopy<U>
-   | |                           - help: consider further restricting type parameter `U`: `, U: std::marker::Copy`
-LL | | {
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `U`
+LL |     where T: MustBeCopy<U>
+   |              ^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `where U: std::marker::Copy`
+  --> $DIR/wf-in-fn-where-clause.rs:9:10
+   |
+LL | fn bar<T,U>()
+   |          ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-in-obj-type-static.stderr b/src/test/ui/wf/wf-in-obj-type-static.stderr
index c461da76a2..32c3198d55 100644
--- a/src/test/ui/wf/wf-in-obj-type-static.stderr
+++ b/src/test/ui/wf/wf-in-obj-type-static.stderr
@@ -2,7 +2,7 @@ error[E0310]: the parameter type `T` may not live long enough
   --> $DIR/wf-in-obj-type-static.rs:14:5
    |
 LL | struct Foo<T> {
-   |            - help: consider adding an explicit lifetime bound `T: 'static`...
+   |            - help: consider adding an explicit lifetime bound...: `T: 'static`
 LL |     // needs T: 'static
 LL |     x: dyn Object<&'static T>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/wf/wf-in-obj-type-trait.stderr b/src/test/ui/wf/wf-in-obj-type-trait.stderr
index 2711820d82..1b6438cdc2 100644
--- a/src/test/ui/wf/wf-in-obj-type-trait.stderr
+++ b/src/test/ui/wf/wf-in-obj-type-trait.stderr
@@ -4,11 +4,14 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
 LL | struct MustBeCopy<T:Copy> {
    | ------------------------- required by `MustBeCopy`
 ...
-LL | struct Bar<T> {
-   |            - help: consider restricting this bound: `T: std::marker::Copy`
-LL |     // needs T: Copy
 LL |     x: dyn Object<MustBeCopy<T>>
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-in-obj-type-trait.rs:9:12
+   |
+LL | struct Bar<T> {
+   |            ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
index 21f825ac9e..70337ee40e 100644
--- a/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
+++ b/src/test/ui/wf/wf-inherent-impl-method-where-clause.stderr
@@ -1,14 +1,17 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-inherent-impl-method-where-clause.rs:12:5
+  --> $DIR/wf-inherent-impl-method-where-clause.rs:12:27
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
 ...
-LL |   impl<T,U> Foo<T,U> {
-   |          - help: consider restricting this bound: `U: std::marker::Copy`
-LL | /     fn foo(self) where T: ExtraCopy<U>
-LL | |     {}
-   | |______^ the trait `std::marker::Copy` is not implemented for `U`
+LL |     fn foo(self) where T: ExtraCopy<U>
+   |                           ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `U: std::marker::Copy`
+  --> $DIR/wf-inherent-impl-method-where-clause.rs:11:8
+   |
+LL | impl<T,U> Foo<T,U> {
+   |        ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
index 35b9093381..c26d0ef787 100644
--- a/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
+++ b/src/test/ui/wf/wf-inherent-impl-where-clause.stderr
@@ -1,16 +1,17 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-inherent-impl-where-clause.rs:11:1
+  --> $DIR/wf-inherent-impl-where-clause.rs:11:29
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
 ...
-LL |   impl<T,U> Foo<T,U> where T: ExtraCopy<U>
-   |   ^                                       - help: consider further restricting type parameter `U`: `, U: std::marker::Copy`
-   |  _|
-   | |
-LL | | {
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `U`
+LL | impl<T,U> Foo<T,U> where T: ExtraCopy<U>
+   |                             ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `where U: std::marker::Copy`
+  --> $DIR/wf-inherent-impl-where-clause.rs:11:8
+   |
+LL | impl<T,U> Foo<T,U> where T: ExtraCopy<U>
+   |        ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-object-safe.stderr b/src/test/ui/wf/wf-object-safe.stderr
index 0d8441f87e..8935d76635 100644
--- a/src/test/ui/wf/wf-object-safe.stderr
+++ b/src/test/ui/wf/wf-object-safe.stderr
@@ -1,11 +1,15 @@
 error[E0038]: the trait `A` cannot be made into an object
   --> $DIR/wf-object-safe.rs:9:13
    |
+LL | trait A {
+   |       - this trait cannot be made into an object...
 LL |     fn foo(&self, _x: &Self);
-   |        --- method `foo` references the `Self` type in its parameters or return type
+   |                       ----- ...because method `foo` references the `Self` type in this parameter
 ...
 LL |     let _x: &dyn A;
    |             ^^^^^^ the trait `A` cannot be made into an object
+   |
+   = help: consider moving `foo` to another trait
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
index f1cf514e6b..52786fb3bc 100644
--- a/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
+++ b/src/test/ui/wf/wf-outlives-ty-in-fn-or-trait.stderr
@@ -2,7 +2,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:9:5
    |
 LL | impl<'a, T> Trait<'a, T> for usize {
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     type Out = &'a fn(T);
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
@@ -16,7 +16,7 @@ error[E0309]: the parameter type `T` may not live long enough
   --> $DIR/wf-outlives-ty-in-fn-or-trait.rs:19:5
    |
 LL | impl<'a, T> Trait<'a, T> for u32 {
-   |          - help: consider adding an explicit lifetime bound `T: 'a`...
+   |          - help: consider adding an explicit lifetime bound...: `T: 'a`
 LL |     type Out = &'a dyn Baz<T>;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
diff --git a/src/test/ui/wf/wf-struct-bound.rs b/src/test/ui/wf/wf-struct-bound.rs
index 69be71cd13..6e558ca8ff 100644
--- a/src/test/ui/wf/wf-struct-bound.rs
+++ b/src/test/ui/wf/wf-struct-bound.rs
@@ -6,8 +6,8 @@
 
 trait ExtraCopy<T:Copy> { }
 
-struct SomeStruct<T,U> //~ ERROR E0277
-    where T: ExtraCopy<U>
+struct SomeStruct<T,U>
+    where T: ExtraCopy<U> //~ ERROR E0277
 {
     data: (T,U)
 }
diff --git a/src/test/ui/wf/wf-struct-bound.stderr b/src/test/ui/wf/wf-struct-bound.stderr
index 2155977349..545e4f8709 100644
--- a/src/test/ui/wf/wf-struct-bound.stderr
+++ b/src/test/ui/wf/wf-struct-bound.stderr
@@ -1,16 +1,17 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-struct-bound.rs:9:1
+  --> $DIR/wf-struct-bound.rs:10:14
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
-LL | 
-LL | / struct SomeStruct<T,U>
-LL | |     where T: ExtraCopy<U>
-   | |                          - help: consider further restricting type parameter `U`: `, U: std::marker::Copy`
-LL | | {
-LL | |     data: (T,U)
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `U`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
+...
+LL |     where T: ExtraCopy<U>
+   |              ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `where U: std::marker::Copy`
+  --> $DIR/wf-struct-bound.rs:9:21
+   |
+LL | struct SomeStruct<T,U>
+   |                     ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-struct-field.stderr b/src/test/ui/wf/wf-struct-field.stderr
index 6ac4f1e2da..f0ebdfba2f 100644
--- a/src/test/ui/wf/wf-struct-field.stderr
+++ b/src/test/ui/wf/wf-struct-field.stderr
@@ -4,10 +4,14 @@ error[E0277]: the trait bound `A: std::marker::Copy` is not satisfied
 LL | struct IsCopy<T:Copy> {
    | --------------------- required by `IsCopy`
 ...
-LL | struct SomeStruct<A> {
-   |                   - help: consider restricting this bound: `A: std::marker::Copy`
 LL |     data: IsCopy<A>
    |     ^^^^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `A`
+   |
+help: consider restricting this type parameter with `A: std::marker::Copy`
+  --> $DIR/wf-struct-field.rs:11:19
+   |
+LL | struct SomeStruct<A> {
+   |                   ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.rs b/src/test/ui/wf/wf-trait-associated-type-bound.rs
index 29e305577a..2f20e65e50 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.rs
+++ b/src/test/ui/wf/wf-trait-associated-type-bound.rs
@@ -6,8 +6,8 @@
 
 trait ExtraCopy<T:Copy> { }
 
-trait SomeTrait<T> { //~ ERROR E0277
-    type Type1: ExtraCopy<T>;
+trait SomeTrait<T> {
+    type Type1: ExtraCopy<T>; //~ ERROR E0277
 }
 
 
diff --git a/src/test/ui/wf/wf-trait-associated-type-bound.stderr b/src/test/ui/wf/wf-trait-associated-type-bound.stderr
index af0433fd22..dfccd48656 100644
--- a/src/test/ui/wf/wf-trait-associated-type-bound.stderr
+++ b/src/test/ui/wf/wf-trait-associated-type-bound.stderr
@@ -1,16 +1,17 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
-  --> $DIR/wf-trait-associated-type-bound.rs:9:1
+  --> $DIR/wf-trait-associated-type-bound.rs:10:17
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
-LL | 
-LL |   trait SomeTrait<T> {
-   |   ^               - help: consider restricting this bound: `T: std::marker::Copy`
-   |  _|
-   | |
-LL | |     type Type1: ExtraCopy<T>;
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `T`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
+...
+LL |     type Type1: ExtraCopy<T>;
+   |                 ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-trait-associated-type-bound.rs:9:17
+   |
+LL | trait SomeTrait<T> {
+   |                 ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-bound.rs b/src/test/ui/wf/wf-trait-bound.rs
index d8746ba4d6..62a1eb5b08 100644
--- a/src/test/ui/wf/wf-trait-bound.rs
+++ b/src/test/ui/wf/wf-trait-bound.rs
@@ -6,8 +6,8 @@
 
 trait ExtraCopy<T:Copy> { }
 
-trait SomeTrait<T,U> //~ ERROR E0277
-    where T: ExtraCopy<U>
+trait SomeTrait<T,U>
+    where T: ExtraCopy<U> //~ ERROR E0277
 {
 }
 
diff --git a/src/test/ui/wf/wf-trait-bound.stderr b/src/test/ui/wf/wf-trait-bound.stderr
index 13e2f8f590..31faa14426 100644
--- a/src/test/ui/wf/wf-trait-bound.stderr
+++ b/src/test/ui/wf/wf-trait-bound.stderr
@@ -1,15 +1,17 @@
 error[E0277]: the trait bound `U: std::marker::Copy` is not satisfied
-  --> $DIR/wf-trait-bound.rs:9:1
+  --> $DIR/wf-trait-bound.rs:10:14
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
-LL | 
-LL | / trait SomeTrait<T,U>
-LL | |     where T: ExtraCopy<U>
-   | |                          - help: consider further restricting type parameter `U`: `, U: std::marker::Copy`
-LL | | {
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `U`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
+...
+LL |     where T: ExtraCopy<U>
+   |              ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `U`
+   |
+help: consider restricting this type parameter with `where U: std::marker::Copy`
+  --> $DIR/wf-trait-bound.rs:9:19
+   |
+LL | trait SomeTrait<T,U>
+   |                   ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-default-fn-arg.stderr b/src/test/ui/wf/wf-trait-default-fn-arg.stderr
index 9f3545b9c6..6a97d31cf3 100644
--- a/src/test/ui/wf/wf-trait-default-fn-arg.stderr
+++ b/src/test/ui/wf/wf-trait-default-fn-arg.stderr
@@ -1,18 +1,13 @@
 error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
-  --> $DIR/wf-trait-default-fn-arg.rs:11:5
+  --> $DIR/wf-trait-default-fn-arg.rs:11:22
    |
-LL |   struct Bar<T:Eq+?Sized> { value: Box<T> }
-   |   ----------------------- required by `Bar`
+LL | struct Bar<T:Eq+?Sized> { value: Box<T> }
+   | ----------------------- required by `Bar`
 ...
-LL |       fn bar(&self, x: &Bar<Self>) {
-   |       ^                           - help: consider further restricting `Self`: `where Self: std::cmp::Eq`
-   |  _____|
-   | |
-LL | |
-LL | |         //
-LL | |         // Here, Eq ought to be implemented.
-LL | |     }
-   | |_____^ the trait `std::cmp::Eq` is not implemented for `Self`
+LL |     fn bar(&self, x: &Bar<Self>) {
+   |                      ^^^^^^^^^^ - help: consider further restricting `Self`: `where Self: std::cmp::Eq`
+   |                      |
+   |                      the trait `std::cmp::Eq` is not implemented for `Self`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-default-fn-ret.stderr b/src/test/ui/wf/wf-trait-default-fn-ret.stderr
index e32630a5a4..36c1e48626 100644
--- a/src/test/ui/wf/wf-trait-default-fn-ret.stderr
+++ b/src/test/ui/wf/wf-trait-default-fn-ret.stderr
@@ -1,19 +1,13 @@
 error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
-  --> $DIR/wf-trait-default-fn-ret.rs:11:5
+  --> $DIR/wf-trait-default-fn-ret.rs:11:22
    |
-LL |   struct Bar<T:Eq+?Sized> { value: Box<T> }
-   |   ----------------------- required by `Bar`
+LL | struct Bar<T:Eq+?Sized> { value: Box<T> }
+   | ----------------------- required by `Bar`
 ...
-LL |       fn bar(&self) -> Bar<Self> {
-   |       ^                         - help: consider further restricting `Self`: `where Self: std::cmp::Eq`
-   |  _____|
-   | |
-LL | |
-LL | |         //
-LL | |         // Here, Eq ought to be implemented.
-LL | |         loop { }
-LL | |     }
-   | |_____^ the trait `std::cmp::Eq` is not implemented for `Self`
+LL |     fn bar(&self) -> Bar<Self> {
+   |                      ^^^^^^^^^- help: consider further restricting `Self`: `where Self: std::cmp::Eq`
+   |                      |
+   |                      the trait `std::cmp::Eq` is not implemented for `Self`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
index a443ff1bb6..6b63feaba8 100644
--- a/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-trait-default-fn-where-clause.stderr
@@ -1,18 +1,13 @@
 error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
-  --> $DIR/wf-trait-default-fn-where-clause.rs:11:5
+  --> $DIR/wf-trait-default-fn-where-clause.rs:11:31
    |
-LL |   trait Bar<T:Eq+?Sized> { }
-   |   ---------------------- required by `Bar`
+LL | trait Bar<T:Eq+?Sized> { }
+   | ---------------------- required by `Bar`
 ...
-LL |       fn bar<A>(&self) where A: Bar<Self> {
-   |       ^                                  - help: consider further restricting `Self`: `, Self: std::cmp::Eq`
-   |  _____|
-   | |
-LL | |
-LL | |         //
-LL | |         // Here, Eq ought to be implemented.
-LL | |     }
-   | |_____^ the trait `std::cmp::Eq` is not implemented for `Self`
+LL |     fn bar<A>(&self) where A: Bar<Self> {
+   |                               ^^^^^^^^^- help: consider further restricting `Self`: `, Self: std::cmp::Eq`
+   |                               |
+   |                               the trait `std::cmp::Eq` is not implemented for `Self`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-fn-arg.stderr b/src/test/ui/wf/wf-trait-fn-arg.stderr
index 42a28ee676..69e2ab7291 100644
--- a/src/test/ui/wf/wf-trait-fn-arg.stderr
+++ b/src/test/ui/wf/wf-trait-fn-arg.stderr
@@ -1,14 +1,13 @@
 error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
-  --> $DIR/wf-trait-fn-arg.rs:10:5
+  --> $DIR/wf-trait-fn-arg.rs:10:22
    |
 LL | struct Bar<T:Eq+?Sized> { value: Box<T> }
    | ----------------------- required by `Bar`
 ...
 LL |     fn bar(&self, x: &Bar<Self>);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
-   |     |                           |
-   |     |                           help: consider further restricting `Self`: `where Self: std::cmp::Eq`
-   |     the trait `std::cmp::Eq` is not implemented for `Self`
+   |                      ^^^^^^^^^^ - help: consider further restricting `Self`: `where Self: std::cmp::Eq`
+   |                      |
+   |                      the trait `std::cmp::Eq` is not implemented for `Self`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-fn-ret.stderr b/src/test/ui/wf/wf-trait-fn-ret.stderr
index 7ec4dbe005..bfc6265662 100644
--- a/src/test/ui/wf/wf-trait-fn-ret.stderr
+++ b/src/test/ui/wf/wf-trait-fn-ret.stderr
@@ -1,14 +1,13 @@
 error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
-  --> $DIR/wf-trait-fn-ret.rs:10:5
+  --> $DIR/wf-trait-fn-ret.rs:10:22
    |
 LL | struct Bar<T:Eq+?Sized> { value: Box<T> }
    | ----------------------- required by `Bar`
 ...
 LL |     fn bar(&self) -> &Bar<Self>;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^-
-   |     |                          |
-   |     |                          help: consider further restricting `Self`: `where Self: std::cmp::Eq`
-   |     the trait `std::cmp::Eq` is not implemented for `Self`
+   |                      ^^^^^^^^^^- help: consider further restricting `Self`: `where Self: std::cmp::Eq`
+   |                      |
+   |                      the trait `std::cmp::Eq` is not implemented for `Self`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-fn-where-clause.stderr b/src/test/ui/wf/wf-trait-fn-where-clause.stderr
index 256edb5b2c..ec8f02c9c4 100644
--- a/src/test/ui/wf/wf-trait-fn-where-clause.stderr
+++ b/src/test/ui/wf/wf-trait-fn-where-clause.stderr
@@ -1,14 +1,13 @@
 error[E0277]: the trait bound `Self: std::cmp::Eq` is not satisfied
-  --> $DIR/wf-trait-fn-where-clause.rs:10:5
+  --> $DIR/wf-trait-fn-where-clause.rs:10:49
    |
 LL | struct Bar<T:Eq+?Sized> { value: Box<T> }
    | ----------------------- required by `Bar`
 ...
 LL |     fn bar(&self) where Self: Sized, Bar<Self>: Copy;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
-   |     |                                               |
-   |     |                                               help: consider further restricting `Self`: `, Self: std::cmp::Eq`
-   |     the trait `std::cmp::Eq` is not implemented for `Self`
+   |                                                 ^^^^- help: consider further restricting `Self`: `, Self: std::cmp::Eq`
+   |                                                 |
+   |                                                 the trait `std::cmp::Eq` is not implemented for `Self`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-trait-superbound.stderr b/src/test/ui/wf/wf-trait-superbound.stderr
index a61b8dd3a3..372a5f8ba5 100644
--- a/src/test/ui/wf/wf-trait-superbound.stderr
+++ b/src/test/ui/wf/wf-trait-superbound.stderr
@@ -1,15 +1,17 @@
 error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
-  --> $DIR/wf-trait-superbound.rs:9:1
+  --> $DIR/wf-trait-superbound.rs:9:21
    |
-LL |   trait ExtraCopy<T:Copy> { }
-   |   ----------------------- required by `ExtraCopy`
+LL | trait ExtraCopy<T:Copy> { }
+   | ----------------------- required by `ExtraCopy`
 LL | 
-LL |   trait SomeTrait<T>: ExtraCopy<T> {
-   |   ^               - help: consider restricting this bound: `T: std::marker::Copy`
-   |  _|
-   | |
-LL | | }
-   | |_^ the trait `std::marker::Copy` is not implemented for `T`
+LL | trait SomeTrait<T>: ExtraCopy<T> {
+   |                     ^^^^^^^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/wf-trait-superbound.rs:9:17
+   |
+LL | trait SomeTrait<T>: ExtraCopy<T> {
+   |                 ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr b/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr
index 594fad4138..9319e3382c 100644
--- a/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr
+++ b/src/test/ui/wf/wf-unsafe-trait-obj-match.stderr
@@ -15,20 +15,28 @@ LL | |     }
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-unsafe-trait-obj-match.rs:26:21
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |         Some(()) => &S,
    |                     ^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Trait>` for `&S`
    = note: required by cast to type `&dyn Trait`
 
 error[E0038]: the trait `Trait` cannot be made into an object
   --> $DIR/wf-unsafe-trait-obj-match.rs:25:25
    |
+LL | trait Trait: Sized {}
+   |       -----  ----- ...because it requires `Self: Sized`
+   |       |
+   |       this trait cannot be made into an object...
+...
 LL |     let t: &dyn Trait = match opt() {
    |                         ^^^^^^^^^^^ the trait `Trait` cannot be made into an object
    |
-   = note: the trait cannot require that `Self : Sized`
    = note: required because of the requirements on the impl of `std::ops::CoerceUnsized<&dyn Trait>` for `&R`
    = note: required by cast to type `&dyn Trait`
 
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
index 995b544600..c6f12e7753 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
+++ b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-inherent-impl.stderr
@@ -4,11 +4,14 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
 LL | fn require_copy<T: Copy>(x: T) {}
    |    ------------    ---- required by this bound in `require_copy`
 ...
-LL | impl<T> Foo<T> {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-...
 LL |         require_copy(self.x);
    |                      ^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/where-clause-constraints-are-local-for-inherent-impl.rs:6:6
+   |
+LL | impl<T> Foo<T> {
+   |      ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
index fe575f3a28..95688d6f2e 100644
--- a/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
+++ b/src/test/ui/where-clauses/where-clause-constraints-are-local-for-trait-impl.stderr
@@ -4,11 +4,14 @@ error[E0277]: the trait bound `T: std::marker::Copy` is not satisfied
 LL | fn require_copy<T: Copy>(x: T) {}
    |    ------------    ---- required by this bound in `require_copy`
 ...
-LL | impl<T> Foo<T> for Bar<T> {
-   |      - help: consider restricting this bound: `T: std::marker::Copy`
-...
 LL |         require_copy(self.x);
    |                      ^^^^^^ the trait `std::marker::Copy` is not implemented for `T`
+   |
+help: consider restricting this type parameter with `T: std::marker::Copy`
+  --> $DIR/where-clause-constraints-are-local-for-trait-impl.rs:11:6
+   |
+LL | impl<T> Foo<T> for Bar<T> {
+   |      ^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/where-clauses/where-equality-constraints.stderr b/src/test/ui/where-clauses/where-equality-constraints.stderr
index 54d6ad6a13..9d8fac02ed 100644
--- a/src/test/ui/where-clauses/where-equality-constraints.stderr
+++ b/src/test/ui/where-clauses/where-equality-constraints.stderr
@@ -4,7 +4,7 @@ error: equality constraints are not yet supported in `where` clauses
 LL | fn f() where u8 = u16 {}
    |              ^^^^^^^^ not supported
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/20041
+   = note: see issue #20041 <https://github.com/rust-lang/rust/issues/20041> for more information
 
 error: equality constraints are not yet supported in `where` clauses
   --> $DIR/where-equality-constraints.rs:3:14
@@ -12,7 +12,7 @@ error: equality constraints are not yet supported in `where` clauses
 LL | fn g() where for<'a> &'static (u8,) == u16, {}
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not supported
    |
-   = note: for more information, see https://github.com/rust-lang/rust/issues/20041
+   = note: see issue #20041 <https://github.com/rust-lang/rust/issues/20041> for more information
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/while-let.stderr b/src/test/ui/while-let.stderr
index 09f0d641de..b2f2ec97c1 100644
--- a/src/test/ui/while-let.stderr
+++ b/src/test/ui/while-let.stderr
@@ -10,6 +10,7 @@ LL | |     });
    | |_______- in this macro invocation
    |
    = note: `#[warn(irrefutable_let_patterns)]` on by default
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: irrefutable while-let pattern
   --> $DIR/while-let.rs:7:13
@@ -21,6 +22,8 @@ LL | /     bar!(_a, 1, {
 LL | |         println!("irrefutable pattern");
 LL | |     });
    | |_______- in this macro invocation
+   |
+   = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: irrefutable while-let pattern
   --> $DIR/while-let.rs:27:5
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index 9cc19060cb..64c0298c1f 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -319,7 +319,6 @@ pub struct Config {
     pub ar: String,
     pub linker: Option<String>,
     pub llvm_components: String,
-    pub llvm_cxxflags: String,
 
     /// Path to a NodeJS executable. Used for JS doctests, emscripten and WASM tests
     pub nodejs: Option<String>,
diff --git a/src/tools/compiletest/src/errors.rs b/src/tools/compiletest/src/errors.rs
index c3d699b3e2..8f685fb855 100644
--- a/src/tools/compiletest/src/errors.rs
+++ b/src/tools/compiletest/src/errors.rs
@@ -125,7 +125,7 @@ fn parse_expected(
     let captures = RE.captures(line)?;
 
     match (cfg, captures.name("cfgs")) {
-        // Only error messages that contain our `cfg` betweeen the square brackets apply to us.
+        // Only error messages that contain our `cfg` between the square brackets apply to us.
         (Some(cfg), Some(filter)) if !filter.as_str().split(',').any(|s| s == cfg) => return None,
         (Some(_), Some(_)) => {}
 
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
index 34f9ac037b..2a24a8c3c9 100644
--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
@@ -24,6 +24,7 @@ enum ParsedNameDirective {
 
 /// Properties which must be known very early, before actually running
 /// the test.
+#[derive(Default)]
 pub struct EarlyProps {
     pub ignore: bool,
     pub should_fail: bool,
@@ -34,18 +35,16 @@ pub struct EarlyProps {
 
 impl EarlyProps {
     pub fn from_file(config: &Config, testfile: &Path) -> Self {
-        let mut props = EarlyProps {
-            ignore: false,
-            should_fail: false,
-            aux: Vec::new(),
-            aux_crate: Vec::new(),
-            revisions: vec![],
-        };
+        let file = File::open(testfile).unwrap();
+        Self::from_reader(config, testfile, file)
+    }
 
+    pub fn from_reader<R: Read>(config: &Config, testfile: &Path, rdr: R) -> Self {
+        let mut props = EarlyProps::default();
         let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
         let rustc_has_sanitizer_support = env::var_os("RUSTC_SANITIZER_SUPPORT").is_some();
 
-        iter_header(testfile, None, &mut |ln| {
+        iter_header(testfile, None, rdr, &mut |ln| {
             // we should check if any only-<platform> exists and if it exists
             // and does not matches the current platform, skip the test
             if !props.ignore {
@@ -392,138 +391,143 @@ impl TestProps {
     /// `//[foo]`), then the property is ignored unless `cfg` is
     /// `Some("foo")`.
     fn load_from(&mut self, testfile: &Path, cfg: Option<&str>, config: &Config) {
-        iter_header(testfile, cfg, &mut |ln| {
-            if let Some(ep) = config.parse_error_pattern(ln) {
-                self.error_patterns.push(ep);
-            }
+        if !testfile.is_dir() {
+            let file = File::open(testfile).unwrap();
 
-            if let Some(flags) = config.parse_compile_flags(ln) {
-                self.compile_flags.extend(flags.split_whitespace().map(|s| s.to_owned()));
-            }
+            iter_header(testfile, cfg, file, &mut |ln| {
+                if let Some(ep) = config.parse_error_pattern(ln) {
+                    self.error_patterns.push(ep);
+                }
 
-            if let Some(edition) = config.parse_edition(ln) {
-                self.compile_flags.push(format!("--edition={}", edition));
-            }
+                if let Some(flags) = config.parse_compile_flags(ln) {
+                    self.compile_flags.extend(flags.split_whitespace().map(|s| s.to_owned()));
+                }
 
-            if let Some(r) = config.parse_revisions(ln) {
-                self.revisions.extend(r);
-            }
+                if let Some(edition) = config.parse_edition(ln) {
+                    self.compile_flags.push(format!("--edition={}", edition));
+                }
 
-            if self.run_flags.is_none() {
-                self.run_flags = config.parse_run_flags(ln);
-            }
+                if let Some(r) = config.parse_revisions(ln) {
+                    self.revisions.extend(r);
+                }
 
-            if self.pp_exact.is_none() {
-                self.pp_exact = config.parse_pp_exact(ln, testfile);
-            }
+                if self.run_flags.is_none() {
+                    self.run_flags = config.parse_run_flags(ln);
+                }
 
-            if !self.should_ice {
-                self.should_ice = config.parse_should_ice(ln);
-            }
+                if self.pp_exact.is_none() {
+                    self.pp_exact = config.parse_pp_exact(ln, testfile);
+                }
 
-            if !self.build_aux_docs {
-                self.build_aux_docs = config.parse_build_aux_docs(ln);
-            }
+                if !self.should_ice {
+                    self.should_ice = config.parse_should_ice(ln);
+                }
 
-            if !self.force_host {
-                self.force_host = config.parse_force_host(ln);
-            }
+                if !self.build_aux_docs {
+                    self.build_aux_docs = config.parse_build_aux_docs(ln);
+                }
 
-            if !self.check_stdout {
-                self.check_stdout = config.parse_check_stdout(ln);
-            }
+                if !self.force_host {
+                    self.force_host = config.parse_force_host(ln);
+                }
 
-            if !self.check_run_results {
-                self.check_run_results = config.parse_check_run_results(ln);
-            }
+                if !self.check_stdout {
+                    self.check_stdout = config.parse_check_stdout(ln);
+                }
 
-            if !self.dont_check_compiler_stdout {
-                self.dont_check_compiler_stdout = config.parse_dont_check_compiler_stdout(ln);
-            }
+                if !self.check_run_results {
+                    self.check_run_results = config.parse_check_run_results(ln);
+                }
 
-            if !self.dont_check_compiler_stderr {
-                self.dont_check_compiler_stderr = config.parse_dont_check_compiler_stderr(ln);
-            }
+                if !self.dont_check_compiler_stdout {
+                    self.dont_check_compiler_stdout = config.parse_dont_check_compiler_stdout(ln);
+                }
 
-            if !self.no_prefer_dynamic {
-                self.no_prefer_dynamic = config.parse_no_prefer_dynamic(ln);
-            }
+                if !self.dont_check_compiler_stderr {
+                    self.dont_check_compiler_stderr = config.parse_dont_check_compiler_stderr(ln);
+                }
 
-            if !self.pretty_expanded {
-                self.pretty_expanded = config.parse_pretty_expanded(ln);
-            }
+                if !self.no_prefer_dynamic {
+                    self.no_prefer_dynamic = config.parse_no_prefer_dynamic(ln);
+                }
 
-            if let Some(m) = config.parse_pretty_mode(ln) {
-                self.pretty_mode = m;
-            }
+                if !self.pretty_expanded {
+                    self.pretty_expanded = config.parse_pretty_expanded(ln);
+                }
 
-            if !self.pretty_compare_only {
-                self.pretty_compare_only = config.parse_pretty_compare_only(ln);
-            }
+                if let Some(m) = config.parse_pretty_mode(ln) {
+                    self.pretty_mode = m;
+                }
 
-            if let Some(ab) = config.parse_aux_build(ln) {
-                self.aux_builds.push(ab);
-            }
+                if !self.pretty_compare_only {
+                    self.pretty_compare_only = config.parse_pretty_compare_only(ln);
+                }
 
-            if let Some(ac) = config.parse_aux_crate(ln) {
-                self.aux_crates.push(ac);
-            }
+                if let Some(ab) = config.parse_aux_build(ln) {
+                    self.aux_builds.push(ab);
+                }
 
-            if let Some(ee) = config.parse_env(ln, "exec-env") {
-                self.exec_env.push(ee);
-            }
+                if let Some(ac) = config.parse_aux_crate(ln) {
+                    self.aux_crates.push(ac);
+                }
 
-            if let Some(ee) = config.parse_env(ln, "rustc-env") {
-                self.rustc_env.push(ee);
-            }
+                if let Some(ee) = config.parse_env(ln, "exec-env") {
+                    self.exec_env.push(ee);
+                }
 
-            if let Some(ev) = config.parse_name_value_directive(ln, "unset-rustc-env") {
-                self.unset_rustc_env.push(ev);
-            }
+                if let Some(ee) = config.parse_env(ln, "rustc-env") {
+                    self.rustc_env.push(ee);
+                }
 
-            if let Some(cl) = config.parse_check_line(ln) {
-                self.check_lines.push(cl);
-            }
+                if let Some(ev) = config.parse_name_value_directive(ln, "unset-rustc-env") {
+                    self.unset_rustc_env.push(ev);
+                }
 
-            if let Some(of) = config.parse_forbid_output(ln) {
-                self.forbid_output.push(of);
-            }
+                if let Some(cl) = config.parse_check_line(ln) {
+                    self.check_lines.push(cl);
+                }
 
-            if !self.check_test_line_numbers_match {
-                self.check_test_line_numbers_match = config.parse_check_test_line_numbers_match(ln);
-            }
+                if let Some(of) = config.parse_forbid_output(ln) {
+                    self.forbid_output.push(of);
+                }
 
-            self.update_pass_mode(ln, cfg, config);
-            self.update_fail_mode(ln, config);
+                if !self.check_test_line_numbers_match {
+                    self.check_test_line_numbers_match =
+                        config.parse_check_test_line_numbers_match(ln);
+                }
 
-            if !self.ignore_pass {
-                self.ignore_pass = config.parse_ignore_pass(ln);
-            }
+                self.update_pass_mode(ln, cfg, config);
+                self.update_fail_mode(ln, config);
 
-            if let Some(rule) = config.parse_custom_normalization(ln, "normalize-stdout") {
-                self.normalize_stdout.push(rule);
-            }
-            if let Some(rule) = config.parse_custom_normalization(ln, "normalize-stderr") {
-                self.normalize_stderr.push(rule);
-            }
+                if !self.ignore_pass {
+                    self.ignore_pass = config.parse_ignore_pass(ln);
+                }
 
-            if let Some(code) = config.parse_failure_status(ln) {
-                self.failure_status = code;
-            }
+                if let Some(rule) = config.parse_custom_normalization(ln, "normalize-stdout") {
+                    self.normalize_stdout.push(rule);
+                }
+                if let Some(rule) = config.parse_custom_normalization(ln, "normalize-stderr") {
+                    self.normalize_stderr.push(rule);
+                }
 
-            if !self.run_rustfix {
-                self.run_rustfix = config.parse_run_rustfix(ln);
-            }
+                if let Some(code) = config.parse_failure_status(ln) {
+                    self.failure_status = code;
+                }
 
-            if !self.rustfix_only_machine_applicable {
-                self.rustfix_only_machine_applicable =
-                    config.parse_rustfix_only_machine_applicable(ln);
-            }
+                if !self.run_rustfix {
+                    self.run_rustfix = config.parse_run_rustfix(ln);
+                }
 
-            if self.assembly_output.is_none() {
-                self.assembly_output = config.parse_assembly_output(ln);
-            }
-        });
+                if !self.rustfix_only_machine_applicable {
+                    self.rustfix_only_machine_applicable =
+                        config.parse_rustfix_only_machine_applicable(ln);
+                }
+
+                if self.assembly_output.is_none() {
+                    self.assembly_output = config.parse_assembly_output(ln);
+                }
+            });
+        }
 
         if self.failure_status == -1 {
             self.failure_status = match config.mode {
@@ -550,6 +554,9 @@ impl TestProps {
                 panic!("`{}-fail` header is only supported in UI tests", mode);
             }
         };
+        if config.mode == Mode::Ui && config.parse_name_directive(ln, "compile-fail") {
+            panic!("`compile-fail` header is useless in UI tests");
+        }
         let fail_mode = if config.parse_name_directive(ln, "check-fail") {
             check_ui("check");
             Some(FailMode::Check)
@@ -617,27 +624,29 @@ impl TestProps {
     }
 }
 
-fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut dyn FnMut(&str)) {
+fn iter_header<R: Read>(testfile: &Path, cfg: Option<&str>, rdr: R, it: &mut dyn FnMut(&str)) {
     if testfile.is_dir() {
         return;
     }
 
     let comment = if testfile.to_string_lossy().ends_with(".rs") { "//" } else { "#" };
 
-    // FIXME: would be nice to allow some whitespace between comment and brace :)
-    // It took me like 2 days to debug why compile-flags weren’t taken into account for my test :)
-    let comment_with_brace = comment.to_string() + "[";
+    let mut rdr = BufReader::new(rdr);
+    let mut ln = String::new();
+
+    loop {
+        ln.clear();
+        if rdr.read_line(&mut ln).unwrap() == 0 {
+            break;
+        }
 
-    let rdr = BufReader::new(File::open(testfile).unwrap());
-    for ln in rdr.lines() {
         // Assume that any directives will be found before the first
         // module or function. This doesn't seem to be an optimization
         // with a warm page cache. Maybe with a cold one.
-        let ln = ln.unwrap();
         let ln = ln.trim();
         if ln.starts_with("fn") || ln.starts_with("mod") {
             return;
-        } else if ln.starts_with(&comment_with_brace) {
+        } else if ln.starts_with(comment) && ln[comment.len()..].trim_start().starts_with('[') {
             // A comment like `//[foo]` is specific to revision `foo`
             if let Some(close_brace) = ln.find(']') {
                 let open_brace = ln.find('[').unwrap();
@@ -650,10 +659,7 @@ fn iter_header(testfile: &Path, cfg: Option<&str>, it: &mut dyn FnMut(&str)) {
                     it(ln[(close_brace + 1)..].trim_start());
                 }
             } else {
-                panic!(
-                    "malformed condition directive: expected `{}foo]`, found `{}`",
-                    comment_with_brace, ln
-                )
+                panic!("malformed condition directive: expected `{}[foo]`, found `{}`", comment, ln)
             }
         } else if ln.starts_with(comment) {
             it(ln[comment.len()..].trim_start());
diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs
index 2a1831d5ee..6c478f7e29 100644
--- a/src/tools/compiletest/src/header/tests.rs
+++ b/src/tools/compiletest/src/header/tests.rs
@@ -1,4 +1,7 @@
-use super::*;
+use std::path::Path;
+
+use crate::common::{Config, Debugger};
+use crate::header::{parse_normalization_string, EarlyProps};
 
 #[test]
 fn test_parse_normalization_string() {
@@ -25,3 +28,171 @@ fn test_parse_normalization_string() {
     assert_eq!(first, Some("something (32 bits)".to_owned()));
     assert_eq!(s, " -> \"something ($WORD bits).");
 }
+
+fn config() -> Config {
+    let args = &[
+        "compiletest",
+        "--mode=ui",
+        "--compile-lib-path=",
+        "--run-lib-path=",
+        "--rustc-path=",
+        "--lldb-python=",
+        "--docck-python=",
+        "--src-base=",
+        "--build-base=",
+        "--stage-id=stage2",
+        "--cc=c",
+        "--cxx=c++",
+        "--cflags=",
+        "--llvm-components=",
+        "--android-cross-path=",
+        "--target=x86_64-unknown-linux-gnu",
+    ];
+    let args = args.iter().map(ToString::to_string).collect();
+    crate::parse_config(args)
+}
+
+fn parse_rs(config: &Config, contents: &str) -> EarlyProps {
+    let bytes = contents.as_bytes();
+    EarlyProps::from_reader(config, Path::new("a.rs"), bytes)
+}
+
+fn parse_makefile(config: &Config, contents: &str) -> EarlyProps {
+    let bytes = contents.as_bytes();
+    EarlyProps::from_reader(config, Path::new("Makefile"), bytes)
+}
+
+#[test]
+fn should_fail() {
+    let config = config();
+
+    assert!(!parse_rs(&config, "").should_fail);
+    assert!(parse_rs(&config, "// should-fail").should_fail);
+}
+
+#[test]
+fn revisions() {
+    let config = config();
+
+    assert_eq!(parse_rs(&config, "// revisions: a b c").revisions, vec!["a", "b", "c"],);
+    assert_eq!(
+        parse_makefile(&config, "# revisions: hello there").revisions,
+        vec!["hello", "there"],
+    );
+}
+
+#[test]
+fn aux_build() {
+    let config = config();
+
+    assert_eq!(
+        parse_rs(
+            &config,
+            r"
+        // aux-build: a.rs
+        // aux-build: b.rs
+        "
+        )
+        .aux,
+        vec!["a.rs", "b.rs"],
+    );
+}
+
+#[test]
+fn no_system_llvm() {
+    let mut config = config();
+
+    config.system_llvm = false;
+    assert!(!parse_rs(&config, "// no-system-llvm").ignore);
+
+    config.system_llvm = true;
+    assert!(parse_rs(&config, "// no-system-llvm").ignore);
+}
+
+#[test]
+fn llvm_version() {
+    let mut config = config();
+
+    config.llvm_version = Some("8.1.2-rust".to_owned());
+    assert!(parse_rs(&config, "// min-llvm-version 9.0").ignore);
+
+    config.llvm_version = Some("9.0.1-rust-1.43.0-dev".to_owned());
+    assert!(parse_rs(&config, "// min-llvm-version 9.2").ignore);
+
+    config.llvm_version = Some("9.3.1-rust-1.43.0-dev".to_owned());
+    assert!(!parse_rs(&config, "// min-llvm-version 9.2").ignore);
+
+    // FIXME.
+    // config.llvm_version = Some("10.0.0-rust".to_owned());
+    // assert!(!parse_rs(&config, "// min-llvm-version 9.0").ignore);
+}
+
+#[test]
+fn ignore_target() {
+    let mut config = config();
+    config.target = "x86_64-unknown-linux-gnu".to_owned();
+
+    assert!(parse_rs(&config, "// ignore-x86_64-unknown-linux-gnu").ignore);
+    assert!(parse_rs(&config, "// ignore-x86_64").ignore);
+    assert!(parse_rs(&config, "// ignore-linux").ignore);
+    assert!(parse_rs(&config, "// ignore-gnu").ignore);
+    assert!(parse_rs(&config, "// ignore-64bit").ignore);
+
+    assert!(!parse_rs(&config, "// ignore-i686").ignore);
+    assert!(!parse_rs(&config, "// ignore-windows").ignore);
+    assert!(!parse_rs(&config, "// ignore-msvc").ignore);
+    assert!(!parse_rs(&config, "// ignore-32bit").ignore);
+}
+
+#[test]
+fn only_target() {
+    let mut config = config();
+    config.target = "x86_64-pc-windows-gnu".to_owned();
+
+    assert!(parse_rs(&config, "// only-i686").ignore);
+    assert!(parse_rs(&config, "// only-linux").ignore);
+    assert!(parse_rs(&config, "// only-msvc").ignore);
+    assert!(parse_rs(&config, "// only-32bit").ignore);
+
+    assert!(!parse_rs(&config, "// only-x86_64-pc-windows-gnu").ignore);
+    assert!(!parse_rs(&config, "// only-x86_64").ignore);
+    assert!(!parse_rs(&config, "// only-windows").ignore);
+    assert!(!parse_rs(&config, "// only-gnu").ignore);
+    assert!(!parse_rs(&config, "// only-64bit").ignore);
+}
+
+#[test]
+fn stage() {
+    let mut config = config();
+    config.stage_id = "stage1".to_owned();
+
+    assert!(parse_rs(&config, "// ignore-stage1").ignore);
+    assert!(!parse_rs(&config, "// ignore-stage2").ignore);
+}
+
+#[test]
+fn cross_compile() {
+    let mut config = config();
+    config.host = "x86_64-apple-darwin".to_owned();
+    config.target = "wasm32-unknown-unknown".to_owned();
+    assert!(parse_rs(&config, "// ignore-cross-compile").ignore);
+
+    config.target = config.host.clone();
+    assert!(!parse_rs(&config, "// ignore-cross-compile").ignore);
+}
+
+#[test]
+fn debugger() {
+    let mut config = config();
+    config.debugger = None;
+    assert!(!parse_rs(&config, "// ignore-cdb").ignore);
+
+    config.debugger = Some(Debugger::Cdb);
+    assert!(parse_rs(&config, "// ignore-cdb").ignore);
+
+    config.debugger = Some(Debugger::Gdb);
+    assert!(parse_rs(&config, "// ignore-gdb").ignore);
+
+    config.debugger = Some(Debugger::Lldb);
+    assert!(parse_rs(&config, "// ignore-lldb").ignore);
+}
diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
index 5f8aa01f4f..a61b940398 100644
--- a/src/tools/compiletest/src/main.rs
+++ b/src/tools/compiletest/src/main.rs
@@ -70,7 +70,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
             "",
             "mode",
             "which sort of compile tests to run",
-            "(compile-fail|run-fail|run-pass-valgrind|pretty|debug-info|incremental|mir-opt)",
+            "compile-fail | run-fail | run-pass-valgrind | pretty | debug-info | codegen | rustdoc \
+             codegen-units | incremental | run-make | ui | js-doc-test | mir-opt | assembly",
         )
         .optopt(
             "",
@@ -115,7 +116,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
         .optopt("", "ar", "path to an archiver", "PATH")
         .optopt("", "linker", "path to a linker", "PATH")
         .reqopt("", "llvm-components", "list of LLVM components built in", "LIST")
-        .reqopt("", "llvm-cxxflags", "C++ flags for LLVM", "FLAGS")
         .optopt("", "llvm-bin-dir", "Path to LLVM's `bin` directory", "PATH")
         .optopt("", "nodejs", "the name of nodejs", "PATH")
         .optopt("", "remote-test-client", "path to the remote test client", "PATH")
@@ -239,7 +239,6 @@ pub fn parse_config(args: Vec<String>) -> Config {
         ar: matches.opt_str("ar").unwrap_or("ar".into()),
         linker: matches.opt_str("linker"),
         llvm_components: matches.opt_str("llvm-components").unwrap(),
-        llvm_cxxflags: matches.opt_str("llvm-cxxflags").unwrap(),
         nodejs: matches.opt_str("nodejs"),
     }
 }
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index be66c9ab2d..424bac88c8 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -1478,11 +1478,7 @@ impl<'test> TestCx<'test> {
             WillExecute::No => TargetLocation::ThisDirectory(self.output_base_dir()),
         };
 
-        let mut rustc = self.make_compile_args(&self.testpaths.file, output_file, emit_metadata);
-
-        rustc.arg("-L").arg(&self.aux_output_dir_name());
-
-        match self.config.mode {
+        let allow_unused = match self.config.mode {
             CompileFail | Ui => {
                 // compile-fail and ui tests tend to have tons of unused code as
                 // it's just testing various pieces of the compile, but we don't
@@ -1491,15 +1487,22 @@ impl<'test> TestCx<'test> {
                 // can turn it back on if needed.
                 if !self.is_rustdoc()
                     // Note that we use the local pass mode here as we don't want
-                    // to set unused to allow if we've overriden the pass mode
+                    // to set unused to allow if we've overridden the pass mode
                     // via command line flags.
                     && local_pm != Some(PassMode::Run)
                 {
-                    rustc.args(&["-A", "unused"]);
+                    AllowUnused::Yes
+                } else {
+                    AllowUnused::No
                 }
             }
-            _ => {}
-        }
+            _ => AllowUnused::No,
+        };
+
+        let mut rustc =
+            self.make_compile_args(&self.testpaths.file, output_file, emit_metadata, allow_unused);
+
+        rustc.arg("-L").arg(&self.aux_output_dir_name());
 
         self.compose_and_run_compiler(rustc, None)
     }
@@ -1710,7 +1713,8 @@ impl<'test> TestCx<'test> {
         // Create the directory for the stdout/stderr files.
         create_dir_all(aux_cx.output_base_dir()).unwrap();
         let input_file = &aux_testpaths.file;
-        let mut aux_rustc = aux_cx.make_compile_args(input_file, aux_output, EmitMetadata::No);
+        let mut aux_rustc =
+            aux_cx.make_compile_args(input_file, aux_output, EmitMetadata::No, AllowUnused::No);
 
         let (dylib, crate_type) = if aux_props.no_prefer_dynamic {
             (true, None)
@@ -1819,6 +1823,7 @@ impl<'test> TestCx<'test> {
         input_file: &Path,
         output_file: TargetLocation,
         emit_metadata: EmitMetadata,
+        allow_unused: AllowUnused,
     ) -> Command {
         let is_rustdoc = self.is_rustdoc();
         let mut rustc = if !is_rustdoc {
@@ -1953,6 +1958,10 @@ impl<'test> TestCx<'test> {
             rustc.arg("-Ctarget-feature=-crt-static");
         }
 
+        if let AllowUnused::Yes = allow_unused {
+            rustc.args(&["-A", "unused"]);
+        }
+
         rustc.args(&self.props.compile_flags);
 
         rustc
@@ -2136,7 +2145,8 @@ impl<'test> TestCx<'test> {
 
         let output_file = TargetLocation::ThisDirectory(self.output_base_dir());
         let input_file = &self.testpaths.file;
-        let mut rustc = self.make_compile_args(input_file, output_file, EmitMetadata::No);
+        let mut rustc =
+            self.make_compile_args(input_file, output_file, EmitMetadata::No, AllowUnused::No);
         rustc.arg("-L").arg(aux_dir).arg("--emit=llvm-ir");
 
         self.compose_and_run_compiler(rustc, None)
@@ -2149,7 +2159,8 @@ impl<'test> TestCx<'test> {
 
         let output_file = TargetLocation::ThisFile(output_path.clone());
         let input_file = &self.testpaths.file;
-        let mut rustc = self.make_compile_args(input_file, output_file, EmitMetadata::No);
+        let mut rustc =
+            self.make_compile_args(input_file, output_file, EmitMetadata::No, AllowUnused::No);
 
         rustc.arg("-L").arg(self.aux_output_dir_name());
 
@@ -2651,7 +2662,6 @@ impl<'test> TestCx<'test> {
             .env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path))
             .env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path))
             .env("LLVM_COMPONENTS", &self.config.llvm_components)
-            .env("LLVM_CXXFLAGS", &self.config.llvm_cxxflags)
             // We for sure don't want these tests to run in parallel, so make
             // sure they don't have access to these vars if we run via `make`
             // at the top level
@@ -3001,6 +3011,7 @@ impl<'test> TestCx<'test> {
                 &self.testpaths.file.with_extension(UI_FIXED),
                 TargetLocation::ThisFile(self.make_exe_name()),
                 emit_metadata,
+                AllowUnused::No,
             );
             rustc.arg("-L").arg(&self.aux_output_dir_name());
             let res = self.compose_and_run_compiler(rustc, None);
@@ -3488,6 +3499,11 @@ enum ExpectedLine<T: AsRef<str>> {
     Text(T),
 }
 
+enum AllowUnused {
+    Yes,
+    No,
+}
+
 impl<T> fmt::Debug for ExpectedLine<T>
 where
     T: AsRef<str> + fmt::Debug,
diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs
index 313a303edb..3335816f09 100644
--- a/src/tools/error_index_generator/main.rs
+++ b/src/tools/error_index_generator/main.rs
@@ -2,8 +2,8 @@
 #![deny(warnings)]
 
 extern crate env_logger;
+extern crate rustc_ast;
 extern crate rustc_span;
-extern crate syntax;
 
 use std::cell::RefCell;
 use std::collections::BTreeMap;
@@ -285,7 +285,7 @@ fn parse_args() -> (OutputFormat, PathBuf) {
 fn main() {
     env_logger::init();
     let (format, dst) = parse_args();
-    let result = syntax::with_default_globals(move || main_with_result(format, &dst));
+    let result = rustc_ast::with_default_globals(move || main_with_result(format, &dst));
     if let Err(e) = result {
         panic!("{}", e.to_string());
     }
diff --git a/src/tools/linkchecker/linkcheck.sh b/src/tools/linkchecker/linkcheck.sh
new file mode 100755
index 0000000000..bbccc17e49
--- /dev/null
+++ b/src/tools/linkchecker/linkcheck.sh
@@ -0,0 +1,113 @@
+#!/bin/sh
+#
+# This is a script that can be used in each book's CI to validate links using
+# the same tool as rust-lang/rust.
+#
+# This requires the rust-docs rustup component to be installed in the nightly
+# toolchain.
+#
+# Usage:
+#   ./linkcheck.sh <name-of-book>
+#
+# Options:
+#
+# -i        "Iterative" mode. The script will not clean up after it is done so
+#           you can inspect the result, and re-run more quickly.
+#
+# --all     Check all books. This can help make sure you don't break links
+#           from other books into your book.
+
+set -e
+
+if [ ! -f book.toml ] && [ ! -f src/SUMMARY.md ]
+then
+    echo "Run command in root directory of the book."
+    exit 1
+fi
+
+html_dir="$(rustc +nightly --print sysroot)/share/doc/rust/html"
+
+if [ ! -d "$html_dir" ]
+then
+    echo "HTML docs are missing from sysroot: $html_dir"
+    echo "Make sure the nightly rust-docs rustup component is installed."
+    exit 1
+fi
+
+book_name=""
+# Iterative will avoid cleaning up, so you can quickly run it repeatedly.
+iterative=0
+# If "1", test all books, else only this book.
+all_books=0
+
+while [ "$1" != "" ]
+do
+    case "$1" in
+        -i)
+            iterative=1
+            ;;
+        --all)
+            all_books=1
+            ;;
+        *)
+            if [ -n "$book_name" ]
+            then
+                echo "only one argument allowed"
+                exit 1
+            fi
+            book_name="$1"
+            ;;
+    esac
+    shift
+done
+
+if [ -z "$book_name" ]
+then
+    echo "usage: $0 <name-of-book>"
+    exit 1
+fi
+
+if [ ! -d "$html_dir/$book_name" ]
+then
+    echo "book name \"$book_name\" not found in sysroot \"$html_dir\""
+    exit 1
+fi
+
+if [ "$iterative" = "0" ]
+then
+    echo "Cleaning old directories..."
+    rm -rf linkcheck linkchecker
+fi
+
+if [ ! -e "linkchecker/main.rs" ] || [ "$iterative" = "0" ]
+then
+    echo "Downloading linkchecker source..."
+    mkdir linkchecker
+    curl -o linkchecker/Cargo.toml \
+        https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/Cargo.toml
+    curl -o linkchecker/main.rs \
+        https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/main.rs
+fi
+
+echo "Building book \"$book_name\"..."
+mdbook build
+
+cp -R "$html_dir" linkcheck
+rm -rf "linkcheck/$book_name"
+cp -R book "linkcheck/$book_name"
+
+if [ "$all_books" = "1" ]
+then
+    check_path="linkcheck"
+else
+    check_path="linkcheck/$book_name"
+fi
+echo "Running linkchecker on \"$check_path\"..."
+cargo run --manifest-path=linkchecker/Cargo.toml -- "$check_path"
+
+if [ "$iterative" = "0" ]
+then
+    rm -rf linkcheck linkchecker
+fi
+
+echo "Link check completed successfully!"
diff --git a/src/tools/publish_toolstate.py b/src/tools/publish_toolstate.py
index 61762ae1d9..1a00011965 100755
--- a/src/tools/publish_toolstate.py
+++ b/src/tools/publish_toolstate.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-## This script publishes the new "current" toolstate in the toolstate repo (not to be
-## confused with publishing the test results, which happens in
-## `src/ci/docker/x86_64-gnu-tools/checktools.sh`).
-## It is set as callback for `src/ci/docker/x86_64-gnu-tools/repo.sh` by the CI scripts
-## when a new commit lands on `master` (i.e., after it passed all checks on `auto`).
+# This script publishes the new "current" toolstate in the toolstate repo (not to be
+# confused with publishing the test results, which happens in
+# `src/ci/docker/x86_64-gnu-tools/checktools.sh`).
+# It is set as callback for `src/ci/docker/x86_64-gnu-tools/repo.sh` by the CI scripts
+# when a new commit lands on `master` (i.e., after it passed all checks on `auto`).
 
 from __future__ import print_function
 
@@ -40,8 +40,8 @@ MAINTAINERS = {
         'adamgreig', 'andre-richter', 'jamesmunns', 'korken89',
         'ryankurte', 'thejpster', 'therealprof',
     },
-    'edition-guide': {'ehuss', 'Centril', 'steveklabnik'},
-    'rustc-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'},
+    'edition-guide': {'ehuss', 'steveklabnik'},
+    'rustc-dev-guide': {'mark-i-m', 'spastorino', 'amanjeev', 'JohnTitor'},
 }
 
 REPOS = {
@@ -55,7 +55,7 @@ REPOS = {
     'rust-by-example': 'https://github.com/rust-lang/rust-by-example',
     'embedded-book': 'https://github.com/rust-embedded/book',
     'edition-guide': 'https://github.com/rust-lang/edition-guide',
-    'rustc-guide': 'https://github.com/rust-lang/rustc-guide',
+    'rustc-dev-guide': 'https://github.com/rust-lang/rustc-dev-guide',
 }
 
 
@@ -103,6 +103,7 @@ def validate_maintainers(repo, github_token):
         print("The build will fail due to this.")
         exit(1)
 
+
 def read_current_status(current_commit, path):
     '''Reads build status of `current_commit` from content of `history/*.tsv`
     '''
@@ -113,21 +114,23 @@ def read_current_status(current_commit, path):
                 return json.loads(status)
     return {}
 
+
 def gh_url():
     return os.environ['TOOLSTATE_ISSUES_API_URL']
 
+
 def maybe_delink(message):
     if os.environ.get('TOOLSTATE_SKIP_MENTIONS') is not None:
         return message.replace("@", "")
     return message
 
+
 def issue(
     tool,
     status,
     assignees,
     relevant_pr_number,
     relevant_pr_user,
-    pr_reviewer,
 ):
     # Open an issue about the toolstate failure.
     if status == 'test-fail':
@@ -143,11 +146,11 @@ def issue(
         cc @{}, do you think you would have time to do the follow-up work?
         If so, that would be great!
 
-        cc @{}, the PR reviewer, and nominating for compiler team prioritization.
+        And nominating for compiler team prioritization.
 
         ''').format(
             relevant_pr_number, tool, status_description,
-            REPOS.get(tool), relevant_pr_user, pr_reviewer
+            REPOS.get(tool), relevant_pr_user
         )),
         'title': '`{}` no longer builds after {}'.format(tool, relevant_pr_number),
         'assignees': list(assignees),
@@ -164,6 +167,7 @@ def issue(
     ))
     response.read()
 
+
 def update_latest(
     current_commit,
     relevant_pr_number,
@@ -194,26 +198,26 @@ def update_latest(
         for status in latest:
             tool = status['tool']
             changed = False
-            create_issue_for_status = None # set to the status that caused the issue
+            create_issue_for_status = None  # set to the status that caused the issue
 
             for os, s in current_status.items():
                 old = status[os]
                 new = s.get(tool, old)
                 status[os] = new
-                maintainers = ' '.join('@'+name for name in MAINTAINERS[tool])
+                maintainers = ' '.join('@'+name for name in MAINTAINERS.get(tool, ()))
                 # comparing the strings, but they are ordered appropriately:
                 # "test-pass" > "test-fail" > "build-fail"
                 if new > old:
                     # things got fixed or at least the status quo improved
                     changed = True
-                    message += '🎉 {} on {}: {} → {} (cc {}, @rust-lang/infra).\n' \
+                    message += '🎉 {} on {}: {} → {} (cc {}).\n' \
                         .format(tool, os, old, new, maintainers)
                 elif new < old:
                     # tests or builds are failing and were not failing before
                     changed = True
                     title = '💔 {} on {}: {} → {}' \
                         .format(tool, os, old, new)
-                    message += '{} (cc {}, @rust-lang/infra).\n' \
+                    message += '{} (cc {}).\n' \
                         .format(title, maintainers)
                     # See if we need to create an issue.
                     if tool == 'miri':
@@ -231,7 +235,7 @@ def update_latest(
                 try:
                     issue(
                         tool, create_issue_for_status, MAINTAINERS.get(tool, ''),
-                        relevant_pr_number, relevant_pr_user, pr_reviewer,
+                        relevant_pr_number, relevant_pr_user,
                     )
                 except urllib2.HTTPError as e:
                     # network errors will simply end up not creating an issue, but that's better
diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml
index 327de29037..e6e758dccd 100644
--- a/src/tools/rustbook/Cargo.toml
+++ b/src/tools/rustbook/Cargo.toml
@@ -6,13 +6,14 @@ license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [features]
-linkcheck = ["mdbook-linkcheck", "codespan-reporting"]
+linkcheck = ["mdbook-linkcheck", "codespan-reporting", "codespan"]
 
 [dependencies]
 clap = "2.25.0"
 failure = "0.1"
 mdbook-linkcheck = { version = "0.5.0", optional = true }
 # Keep in sync with mdbook-linkcheck.
+codespan = { version = "0.5", optional = true }
 codespan-reporting = { version = "0.5", optional = true }
 
 
diff --git a/src/tools/rustbook/src/main.rs b/src/tools/rustbook/src/main.rs
index fc28315669..01f324f0c5 100644
--- a/src/tools/rustbook/src/main.rs
+++ b/src/tools/rustbook/src/main.rs
@@ -8,11 +8,6 @@ use clap::{App, AppSettings, ArgMatches, SubCommand};
 use mdbook::errors::Result as Result3;
 use mdbook::MDBook;
 
-#[cfg(feature = "linkcheck")]
-use failure::Error;
-#[cfg(feature = "linkcheck")]
-use mdbook::renderer::RenderContext;
-
 fn main() {
     let d_message = "-d, --dest-dir=[dest-dir]
 'The output directory for your book{n}(Defaults to ./book when omitted)'";
@@ -30,6 +25,11 @@ fn main() {
                 .arg_from_usage(d_message)
                 .arg_from_usage(dir_message),
         )
+        .subcommand(
+            SubCommand::with_name("test")
+                .about("Tests that a book's Rust code samples compile")
+                .arg_from_usage(dir_message),
+        )
         .subcommand(
             SubCommand::with_name("linkcheck")
                 .about("Run linkcheck with mdBook 3")
@@ -41,20 +41,29 @@ fn main() {
     match matches.subcommand() {
         ("build", Some(sub_matches)) => {
             if let Err(e) = build(sub_matches) {
-                eprintln!("Error: {}", e);
-
-                for cause in e.iter().skip(1) {
-                    eprintln!("\tCaused By: {}", cause);
-                }
-
-                ::std::process::exit(101);
+                handle_error(e);
+            }
+        }
+        ("test", Some(sub_matches)) => {
+            if let Err(e) = test(sub_matches) {
+                handle_error(e);
             }
         }
         ("linkcheck", Some(sub_matches)) => {
             #[cfg(feature = "linkcheck")]
             {
-                if let Err(err) = linkcheck(sub_matches) {
-                    eprintln!("Error: {}", err);
+                let (diags, files) = linkcheck(sub_matches).expect("Error while linkchecking.");
+                if !diags.is_empty() {
+                    let color = codespan_reporting::term::termcolor::ColorChoice::Auto;
+                    let mut writer =
+                        codespan_reporting::term::termcolor::StandardStream::stderr(color);
+                    let cfg = codespan_reporting::term::Config::default();
+
+                    for diag in diags {
+                        codespan_reporting::term::emit(&mut writer, &cfg, &files, &diag)
+                            .expect("Unable to emit linkcheck error.");
+                    }
+
                     std::process::exit(101);
                 }
             }
@@ -73,14 +82,57 @@ fn main() {
 }
 
 #[cfg(feature = "linkcheck")]
-pub fn linkcheck(args: &ArgMatches<'_>) -> Result<(), Error> {
+pub fn linkcheck(
+    args: &ArgMatches<'_>,
+) -> Result<(Vec<codespan_reporting::diagnostic::Diagnostic>, codespan::Files), failure::Error> {
+    use mdbook_linkcheck::Reason;
+
     let book_dir = get_book_dir(args);
+    let src_dir = book_dir.join("src");
     let book = MDBook::load(&book_dir).unwrap();
-    let cfg = book.config;
-    let render_ctx = RenderContext::new(&book_dir, book.book, cfg, &book_dir);
-    let cache_file = render_ctx.destination.join("cache.json");
-    let color = codespan_reporting::term::termcolor::ColorChoice::Auto;
-    mdbook_linkcheck::run(&cache_file, color, &render_ctx)
+    let linkck_cfg = mdbook_linkcheck::get_config(&book.config)?;
+    let mut files = codespan::Files::new();
+    let target_files = mdbook_linkcheck::load_files_into_memory(&book.book, &mut files);
+    let cache = mdbook_linkcheck::Cache::default();
+
+    let (links, incomplete) = mdbook_linkcheck::extract_links(target_files, &files);
+
+    let outcome =
+        mdbook_linkcheck::validate(&links, &linkck_cfg, &src_dir, &cache, &files, incomplete)?;
+
+    let mut is_real_error = false;
+
+    for link in outcome.invalid_links.iter() {
+        match &link.reason {
+            Reason::FileNotFound | Reason::TraversesParentDirectories => {
+                is_real_error = true;
+            }
+            Reason::UnsuccessfulServerResponse(status) => {
+                if status.is_client_error() {
+                    is_real_error = true;
+                } else {
+                    eprintln!("Unsuccessful server response for link `{}`", link.link.uri);
+                }
+            }
+            Reason::Client(err) => {
+                if err.is_timeout() {
+                    eprintln!("Timeout for link `{}`", link.link.uri);
+                } else if err.is_server_error() {
+                    eprintln!("Server error for link `{}`", link.link.uri);
+                } else if !err.is_http() {
+                    eprintln!("Non-HTTP-related error for link: {} {}", link.link.uri, err);
+                } else {
+                    is_real_error = true;
+                }
+            }
+        }
+    }
+
+    if is_real_error {
+        Ok((outcome.generate_diagnostics(&files, linkck_cfg.warning_policy), files))
+    } else {
+        Ok((vec![], files))
+    }
 }
 
 // Build command implementation
@@ -100,6 +152,12 @@ pub fn build(args: &ArgMatches<'_>) -> Result3<()> {
     Ok(())
 }
 
+fn test(args: &ArgMatches<'_>) -> Result3<()> {
+    let book_dir = get_book_dir(args);
+    let mut book = MDBook::load(&book_dir)?;
+    book.test(vec![])
+}
+
 fn get_book_dir(args: &ArgMatches<'_>) -> PathBuf {
     if let Some(dir) = args.value_of("dir") {
         // Check if path is relative from current dir, or absolute...
@@ -109,3 +167,13 @@ fn get_book_dir(args: &ArgMatches<'_>) -> PathBuf {
         env::current_dir().unwrap()
     }
 }
+
+fn handle_error(error: mdbook::errors::Error) -> ! {
+    eprintln!("Error: {}", error);
+
+    for cause in error.iter().skip(1) {
+        eprintln!("\tCaused By: {}", cause);
+    }
+
+    ::std::process::exit(101);
+}
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 352c00dbe4..7a20a96130 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -59,6 +59,7 @@ const EXCEPTIONS: &[&str] = &[
     "dunce",              // CC0-1.0 mdbook-linkcheck
     "codespan-reporting", // Apache-2.0 mdbook-linkcheck
     "codespan",           // Apache-2.0 mdbook-linkcheck
+    "crossbeam-channel",  // MIT/Apache-2.0 AND BSD-2-Clause, cargo
 ];
 
 /// Which crates to check against the whitelist?
@@ -167,7 +168,7 @@ const WHITELIST: &[Crate<'_>] = &[
     Crate("termcolor"),
     Crate("terminon"),
     Crate("termion"),
-    Crate("term_size"),
+    Crate("termize"),
     Crate("thread_local"),
     Crate("ucd-util"),
     Crate("unicode-normalization"),
diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs
index 12f93a87cb..d9320e9147 100644
--- a/src/tools/tidy/src/features.rs
+++ b/src/tools/tidy/src/features.rs
@@ -63,20 +63,6 @@ pub struct CollectedFeatures {
 pub fn collect_lib_features(base_src_path: &Path) -> Features {
     let mut lib_features = Features::new();
 
-    // This library feature is defined in the `compiler_builtins` crate, which
-    // has been moved out-of-tree. Now it can no longer be auto-discovered by
-    // `tidy`, because we need to filter out its (submodule) directory. Manually
-    // add it to the set of known library features so we can still generate docs.
-    lib_features.insert(
-        "compiler_builtins_lib".to_owned(),
-        Feature {
-            level: Status::Unstable,
-            since: None,
-            has_gate_test: false,
-            tracking_issue: None,
-        },
-    );
-
     map_lib_features(base_src_path, &mut |res, _, _| {
         if let Ok((name, feature)) = res {
             lib_features.insert(name.to_owned(), feature);
diff --git a/src/tools/tidy/src/lib.rs b/src/tools/tidy/src/lib.rs
index c8c61b6fb5..be1e598d8d 100644
--- a/src/tools/tidy/src/lib.rs
+++ b/src/tools/tidy/src/lib.rs
@@ -58,6 +58,7 @@ fn filter_dirs(path: &Path) -> bool {
         "src/tools/rls",
         "src/tools/rust-installer",
         "src/tools/rustfmt",
+        "src/doc/book",
         // Filter RLS output directories
         "target/rls",
     ];
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index dcd4c9e8ef..349829d872 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -41,7 +41,7 @@ const EXCEPTION_PATHS: &[&str] = &[
     "src/libpanic_unwind",
     "src/libunwind",
     // black_box implementation is LLVM-version specific and it uses
-    // target_os to tell targets with different LLVM-versions appart
+    // target_os to tell targets with different LLVM-versions apart
     // (e.g. `wasm32-unknown-emscripten` vs `wasm32-unknown-unknown`):
     "src/libcore/hint.rs",
     "src/libstd/sys/", // Platform-specific code for std lives here.
@@ -76,7 +76,7 @@ const EXCEPTION_PATHS: &[&str] = &[
     "src/tools",
     "src/librustc",
     "src/librustdoc",
-    "src/libsyntax",
+    "src/librustc_ast",
     "src/bootstrap",
 ];
 
diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs
index 472d66459d..7dfb6224d2 100644
--- a/src/tools/tidy/src/unstable_book.rs
+++ b/src/tools/tidy/src/unstable_book.rs
@@ -1,4 +1,4 @@
-use crate::features::{CollectedFeatures, Feature, Features, Status};
+use crate::features::{CollectedFeatures, Features, Status};
 use std::collections::BTreeSet;
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -73,26 +73,12 @@ fn collect_unstable_book_lib_features_section_file_names(base_src_path: &Path) -
 
 pub fn check(path: &Path, features: CollectedFeatures, bad: &mut bool) {
     let lang_features = features.lang;
-    let mut lib_features = features
+    let lib_features = features
         .lib
         .into_iter()
         .filter(|&(ref name, _)| !lang_features.contains_key(name))
         .collect::<Features>();
 
-    // This library feature is defined in the `compiler_builtins` crate, which
-    // has been moved out-of-tree. Now it can no longer be auto-discovered by
-    // `tidy`, because we need to filter out its (submodule) directory. Manually
-    // add it to the set of known library features so we can still generate docs.
-    lib_features.insert(
-        "compiler_builtins_lib".to_owned(),
-        Feature {
-            level: Status::Unstable,
-            since: None,
-            has_gate_test: false,
-            tracking_issue: None,
-        },
-    );
-
     // Library features
     let unstable_lib_feature_names = collect_unstable_feature_names(&lib_features);
     let unstable_book_lib_features_section_file_names =
diff --git a/src/tools/unicode-table-generator/src/main.rs b/src/tools/unicode-table-generator/src/main.rs
index be8508e397..839d914baa 100644
--- a/src/tools/unicode-table-generator/src/main.rs
+++ b/src/tools/unicode-table-generator/src/main.rs
@@ -147,7 +147,7 @@ fn main() {
         eprintln!("Must provide path to write unicode tables to");
         eprintln!(
             "e.g. {} src/libcore/unicode/unicode_data.rs",
-            std::env::args().nth(0).unwrap_or_default()
+            std::env::args().next().unwrap_or_default()
         );
         std::process::exit(1);
     });
diff --git a/vendor/backtrace/.cargo-checksum.json b/vendor/backtrace/.cargo-checksum.json
index f4112489a7..029dcaee51 100644
--- a/vendor/backtrace/.cargo-checksum.json
+++ b/vendor/backtrace/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.lock":"6aebc6ba02de014c6350f5d95fae16172423ed111da4af1a57d30b8a14af15cd","Cargo.toml":"c0b8643ba1a8c8a9411b50f37d09ab067b51a776dbc2f55e286d74f2b9fe0d24","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"5038903e047ac0287b2a16218109171c99a8b67242bdeaff52db51bd60b68fb0","benches/benchmarks.rs":"ce5763576fa8aeb722d3b8bcdb294d8a31e80e3c5272da25525fdcc392ccc6cc","ci/android-ndk.sh":"89fafa41d08ff477f949bfc163d04d1eb34fdee370f7a695cfba4ef34c164a55","ci/android-sdk.sh":"3269ef90675e8d4c2031e542cd3a55d9e060b2a094105cde982b282185936dda","ci/docker/aarch64-linux-android/Dockerfile":"c97f23fe2892f406d3deb7479c89e1c1dbbdbd0db456ac699f9399852300348d","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"97fa8f20c6899ee36b47371d485b64a2e96b626a2746b5f434c01eae9168b2a1","ci/docker/arm-linux-androideabi/Dockerfile":"3fe712b0927fd8fb05c1f733f0bf0d8a139bfc5a0108ba5515bd6b499976f1ab","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"41133d712ef13f05e67796857db86476b3ed9c6355d5eb56115575b06d739e04","ci/docker/armv7-linux-androideabi/Dockerfile":"39038d17a423683e0af27a050b34dea610729fb0085814ec6c81726a7f52556f","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"2a216244baad705491f249278083994bf68744a2759f51e768b2f92e0da7c360","ci/docker/i586-unknown-linux-gnu/Dockerfile":"ef898c914590d721488ca11e62f3d7c26852346e1612deb0f3e12ab011187109","ci/docker/i686-linux-android/Dockerfile":"9181e5fe5503077652659bc3353c3c21fcf4fc6b03730430fb40d6adc3096079","ci/docker/i686-unknown-linux-gnu/Dockerfile":"ef898c914590d721488ca11e62f3d7c26852346e1612deb0f3e12ab011187109","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"828b657e1748bcd8d331794624d5fc1cd07087a051e507eb9206757985194bf1","ci/docker/x86_64-linux-android/Dockerfile":"074bb2906ba587466490ab9d802eb817b9f23eb54aa095ee53e1a33be5569328","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"0822e270108ec39a6b93721598156031a0469ed680e62ce4acd13bbb1a952b9d","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"e1c202a6831b17e017b4737e80d5b992905895b086bbc06285fc9c337cadbc23","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"2efbba08cc8fff8d2431dde92517df7d122dc754c778820c668f1ac29a885290","ci/run-docker.sh":"c4efad39c65a38c89e90d61a9ef15136903dd4cf01a6ae8079aa005b882d751e","ci/run.sh":"30a3807c195cd86d8b8884e1228cd061aa112b26c54277beebf5108777a36fe9","ci/runtest-android.rs":"be2e49bb296b92a8e3643a6c0a70917fe7b130fa43b71a29c4e7514f45c00e7e","examples/backtrace.rs":"fd6e1cc6c3378ec7d41cd03b2bef187051298dceb01147e71f207dbb8a0c4867","examples/raw.rs":"81fb66bd0f71010f9a954f667d92bf792cfd1ac90fa3a09c362767d866dc8374","src/backtrace/dbghelp.rs":"e1389870f4376538da2aa71264cee00ad1c34b424dba892a04f76bf267997d4a","src/backtrace/libunwind.rs":"8bf3183c251fabafd2c6d78be60c32345c5a819e0c5a13738220449547fc95c7","src/backtrace/mod.rs":"68a864fa0a76803df67c9e0af6213d445b28f675982fa41a5bdbe9bcc2c267c9","src/backtrace/noop.rs":"9d9a93a890cef988b691232d9d1e7d114768ada58e9591345826135cb380f01a","src/backtrace/unix_backtrace.rs":"293c6ac31e9eb8e32dc7d219f4cf5dbeb9b66bdc42dcc949d1de63233dea2666","src/capture.rs":"c7c9f0a55312c9687d43118b69d4416d9c8eac1f7eaeb542807bc5e23bc18ce0","src/dbghelp.rs":"c33788eeef29bb78a1cdd7cf7f3e034b82d3686ba87d76a920692db19b26212b","src/lib.rs":"efcdd67622dd654906ae74b249f7ce785582b29fde2f0da8dea1fb398fd80a48","src/print.rs":"4eb27182e12ad02fb1dba6ee4052c29a1a61b156d0c40b48375a5bab001f2097","src/print/fuchsia.rs":"4620968941adda90cec97d3cdfe06937327cdee5882f1b98bc933efaac68ef7a","src/symbolize/coresymbolication.rs":"f5442333d8c58188fe3c7749783336bd2e096ed9940d77c19ce4295dd592fb0b","src/symbolize/dbghelp.rs":"649d5ff1656e8fd84ab1088bb48054f6ea7cd0c50a09af09f72d562c17e52b6b","src/symbolize/dladdr.rs":"4b420b07f345f7c4e545c43f68d1b2d1f419a9228712097f35eae875b182b349","src/symbolize/dladdr_resolve.rs":"ec3bc5c8462cce48e97136e4867dd08a5f1b0c133e45d511745c1c3197e78405","src/symbolize/gimli.rs":"eaf81e6e0b3394a052219dbce8ec406a0065c989da2c6e379864112b529c92c0","src/symbolize/libbacktrace.rs":"3772ca5c10bb9f79556e170d680bfd904f652338f0055631006df206c2b1de40","src/symbolize/mod.rs":"aec85aee8ff3e00a532f7d1ab8739802d6e2df369aecfe045fe6d8b6a4004c11","src/symbolize/noop.rs":"a8581b117e1065236c12f0a4a4c49f4c1929c4e6a3283f2253bb1fd0c77e4f7a","src/types.rs":"85dac420ee8791281f4cdec78e86be056c84ffecc0e5e5821d91862fc0e23444","src/windows.rs":"d6ae52faf9005251bd0d977fdd363e38f0d56e4c034a5fea3982538f743c6dab","tests/accuracy/auxiliary.rs":"8bcf4a3a15ebed82f878c440910a07866efbc5eacea8b74f482dae297c779226","tests/accuracy/main.rs":"db2870e7fa51df01a5176e59bd87d205d83cad1599f374f273e11baf5efd41bb","tests/concurrent-panics.rs":"7c37df054c57c0c6694265bcaa596c1418a90cce65a569699e1b0c56bcd4bdfa","tests/long_fn_name.rs":"ca2480a72e8d2c02c678f047c202cdec7efafeb2fb32d94a327c669b7c81807a","tests/skip_inner_frames.rs":"b5c9137723c8648da46396c4c631e4b7d9933cac33397ae3da588a4692322212","tests/smoke.rs":"0330093fa76bd83851f2b8efb37330ce1c1c48d2be99313074d9c727491377f7"},"package":"924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea"}
\ No newline at end of file
+{"files":{"Cargo.lock":"8a264a26bbcad48faeef7653a10d5fae821702eb05b858963389dffabdcd5311","Cargo.toml":"ff282205661d93c3f2b6567eeaf820d83a5d141c67382c721620d4204b42ccbc","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"5038903e047ac0287b2a16218109171c99a8b67242bdeaff52db51bd60b68fb0","benches/benchmarks.rs":"ce5763576fa8aeb722d3b8bcdb294d8a31e80e3c5272da25525fdcc392ccc6cc","ci/android-ndk.sh":"89fafa41d08ff477f949bfc163d04d1eb34fdee370f7a695cfba4ef34c164a55","ci/android-sdk.sh":"3269ef90675e8d4c2031e542cd3a55d9e060b2a094105cde982b282185936dda","ci/docker/aarch64-linux-android/Dockerfile":"cb5c55f17fcb0d65713086b8796de070657440cbcb6c2eded34b61b957b7bce8","ci/docker/aarch64-unknown-linux-gnu/Dockerfile":"97fa8f20c6899ee36b47371d485b64a2e96b626a2746b5f434c01eae9168b2a1","ci/docker/arm-linux-androideabi/Dockerfile":"3fe712b0927fd8fb05c1f733f0bf0d8a139bfc5a0108ba5515bd6b499976f1ab","ci/docker/arm-unknown-linux-gnueabihf/Dockerfile":"41133d712ef13f05e67796857db86476b3ed9c6355d5eb56115575b06d739e04","ci/docker/armv7-linux-androideabi/Dockerfile":"10783c6d22e727c38b2483ed5d941aeb8f1099025e263183f1598c604924ffa6","ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile":"2a216244baad705491f249278083994bf68744a2759f51e768b2f92e0da7c360","ci/docker/i586-unknown-linux-gnu/Dockerfile":"ef898c914590d721488ca11e62f3d7c26852346e1612deb0f3e12ab011187109","ci/docker/i686-linux-android/Dockerfile":"1a2119c2119a2213cf22a825166cd7bb75386fa057c7fabb2f572fc1e65f1870","ci/docker/i686-unknown-linux-gnu/Dockerfile":"ef898c914590d721488ca11e62f3d7c26852346e1612deb0f3e12ab011187109","ci/docker/powerpc64-unknown-linux-gnu/Dockerfile":"7cd511302c4624f0ee3944a6f5e4f5f25bb727ba2623d1e6b8f288a4d8cec30c","ci/docker/x86_64-linux-android/Dockerfile":"37f0bdcfed3d9382e09056e1f32351cbf6a901810d58060a4384a42303f2f7a3","ci/docker/x86_64-pc-windows-gnu/Dockerfile":"cbde261d7bcea43059e341363d57a00a83d9ebe4501aca2c1c6ba834e0ea9eb9","ci/docker/x86_64-unknown-linux-gnu/Dockerfile":"e1c202a6831b17e017b4737e80d5b992905895b086bbc06285fc9c337cadbc23","ci/docker/x86_64-unknown-linux-musl/Dockerfile":"2efbba08cc8fff8d2431dde92517df7d122dc754c778820c668f1ac29a885290","ci/run-docker.sh":"c4efad39c65a38c89e90d61a9ef15136903dd4cf01a6ae8079aa005b882d751e","ci/run.sh":"30a3807c195cd86d8b8884e1228cd061aa112b26c54277beebf5108777a36fe9","ci/runtest-android.rs":"be2e49bb296b92a8e3643a6c0a70917fe7b130fa43b71a29c4e7514f45c00e7e","examples/backtrace.rs":"fd6e1cc6c3378ec7d41cd03b2bef187051298dceb01147e71f207dbb8a0c4867","examples/raw.rs":"81fb66bd0f71010f9a954f667d92bf792cfd1ac90fa3a09c362767d866dc8374","src/backtrace/dbghelp.rs":"d5f56dc97d1e7cf2bed05ac6e922ca5be96aaab2f1098601343affd22241fa38","src/backtrace/libunwind.rs":"d006cdb883919d9dd138132216c83398987016264f67c714d07abdbf3383362a","src/backtrace/mod.rs":"8d9c7f5ab5cacc00b766d811fb6a38c57c78b42894c2499cd02ec802bb593b4c","src/backtrace/noop.rs":"9d9a93a890cef988b691232d9d1e7d114768ada58e9591345826135cb380f01a","src/backtrace/unix_backtrace.rs":"293c6ac31e9eb8e32dc7d219f4cf5dbeb9b66bdc42dcc949d1de63233dea2666","src/capture.rs":"c7c9f0a55312c9687d43118b69d4416d9c8eac1f7eaeb542807bc5e23bc18ce0","src/dbghelp.rs":"c33788eeef29bb78a1cdd7cf7f3e034b82d3686ba87d76a920692db19b26212b","src/lib.rs":"881e140db1f7e19bf3eb139881f102801aa9c06344282417b9b1e2c67534466a","src/print.rs":"2e7dbe0aaadb8c7457065773cf4210e863704e80aea12d3d2df163a0a259a258","src/print/fuchsia.rs":"4620968941adda90cec97d3cdfe06937327cdee5882f1b98bc933efaac68ef7a","src/symbolize/coresymbolication.rs":"f5442333d8c58188fe3c7749783336bd2e096ed9940d77c19ce4295dd592fb0b","src/symbolize/dbghelp.rs":"649d5ff1656e8fd84ab1088bb48054f6ea7cd0c50a09af09f72d562c17e52b6b","src/symbolize/dladdr.rs":"4b420b07f345f7c4e545c43f68d1b2d1f419a9228712097f35eae875b182b349","src/symbolize/dladdr_resolve.rs":"ec3bc5c8462cce48e97136e4867dd08a5f1b0c133e45d511745c1c3197e78405","src/symbolize/gimli.rs":"7232bc02c14af59db4296266965d4839c359a08679b9a7f02a55275ff87ac864","src/symbolize/libbacktrace.rs":"d3f18a85fd13c32f949226e2d5cde3c40f60d73d32c46e91bf670cb202cf5f3b","src/symbolize/mod.rs":"4c2bb3a4b39f6c7773a2fb5ea206a109336ca7e60303d86948019624c51beed9","src/symbolize/noop.rs":"a8581b117e1065236c12f0a4a4c49f4c1929c4e6a3283f2253bb1fd0c77e4f7a","src/types.rs":"85dac420ee8791281f4cdec78e86be056c84ffecc0e5e5821d91862fc0e23444","src/windows.rs":"4a025bd064d22134185441859ab5337e31a33d39af212801fd7ada374595fd41","tests/accuracy/auxiliary.rs":"8bcf4a3a15ebed82f878c440910a07866efbc5eacea8b74f482dae297c779226","tests/accuracy/main.rs":"db2870e7fa51df01a5176e59bd87d205d83cad1599f374f273e11baf5efd41bb","tests/concurrent-panics.rs":"7c37df054c57c0c6694265bcaa596c1418a90cce65a569699e1b0c56bcd4bdfa","tests/long_fn_name.rs":"ca2480a72e8d2c02c678f047c202cdec7efafeb2fb32d94a327c669b7c81807a","tests/skip_inner_frames.rs":"b5c9137723c8648da46396c4c631e4b7d9933cac33397ae3da588a4692322212","tests/smoke.rs":"0330093fa76bd83851f2b8efb37330ce1c1c48d2be99313074d9c727491377f7"},"package":"e4036b9bf40f3cf16aba72a3d65e8a520fc4bafcdc7079aea8f848c58c5b5536"}
\ No newline at end of file
diff --git a/vendor/backtrace/Cargo.lock b/vendor/backtrace/Cargo.lock
index 680cf004c1..17736837e5 100644
--- a/vendor/backtrace/Cargo.lock
+++ b/vendor/backtrace/Cargo.lock
@@ -2,41 +2,37 @@
 # It is not intended for manual editing.
 [[package]]
 name = "addr2line"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "intervaltree 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gimli 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "arrayvec"
-version = "0.4.11"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "backtrace"
-version = "0.3.40"
+version = "0.3.44"
 dependencies = [
- "addr2line 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "addr2line 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "cpp_demangle 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cpp_demangle 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "findshlibs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -45,9 +41,9 @@ name = "backtrace-sys"
 version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -58,30 +54,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cc"
-version = "1.0.45"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.8"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "compiler_builtins 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.19"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cpp_demangle"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -95,41 +91,34 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "glob"
-version = "0.2.11"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "goblin"
-version = "0.0.24"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "intervaltree"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -144,7 +133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.62"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -155,7 +144,7 @@ name = "log"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -163,15 +152,10 @@ name = "memmap"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "nodrop"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "plain"
 version = "0.2.3"
@@ -179,34 +163,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.4"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -214,7 +182,7 @@ name = "rustc-demangle"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "compiler_builtins 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -228,67 +196,45 @@ name = "rustc-std-workspace-core"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "scroll"
-version = "0.9.2"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "scroll_derive"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "serde"
-version = "1.0.101"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.101"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "smallvec"
-version = "0.6.10"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -298,29 +244,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.5"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.0"
@@ -346,46 +277,37 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
-"checksum addr2line 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "95b06ae5a8a3bae54910c9029a52f83203ce2001c71b10b1faae3a337fee4ab5"
-"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
+"checksum addr2line 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4e698660ed2d0f625c39bb877332b4269668720e330e2aa3d67bb1187a656a"
+"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8"
 "checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491"
 "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum cc 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc9a35e1f4290eb9e5fc54ba6cf40671ed2a2514c3eeb2b2a908dda2ea5a1be"
-"checksum cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "89431bba4e6b7092fb5fcd00a6f6ca596c55cc26b2f1e6dcdd08a1f4933f66b2"
-"checksum compiler_builtins 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)" = "4e32b9fc11fdb3aefbd0a4761a8d3a2b7419608b759fa14a26525df4ea5deaba"
-"checksum cpp_demangle 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "d30c0c4ba59fc4951d15cce1b9ba3b448a2b5d601964768fe7cd69c09cc69028"
+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum compiler_builtins 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b9975aefa63997ef75ca9cf013ff1bb81487aaa0b622c21053afd3b92979a7af"
+"checksum cpp_demangle 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4115af6f575a7bc82c613e9e0ed7cc36a5e4fc3a8b54920dc0c820823a31a0d6"
 "checksum fallible-iterator 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 "checksum findshlibs 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1260d61e4fe2a6ab845ffdc426a0bd68ffb240b91cf0ec5a8d1170cec535bd8"
-"checksum gimli 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "162d18ae5f2e3b90a993d202f1ba17a5633c2484426f8bcae201f86194bacd00"
-"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
-"checksum goblin 0.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e3fa261d919c1ae9d1e4533c4a2f99e10938603c4208d56c05bec7a872b661b0"
-"checksum intervaltree 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "af39074dd8d5eff756ddea3d8f34c7ae287d4dadb6f29fb1b67ca6b3f5036482"
+"checksum gimli 0.20.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81dd6190aad0f05ddbbf3245c54ed14ca4aa6dd32f22312b70d8f168c3e3e633"
+"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+"checksum goblin 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3081214398d39e4bd7f2c1975f0488ed04614ffdd976c6fc7a0708278552c0da"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
-"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b"
-"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afdc77cc74ec70ed262262942ebb7dac3d479e9e5cfa2da1841c0806f6cdabcc"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
+"checksum proc-macro2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0319972dcae462681daf4da1adeeaa066e3ebd29c69be96c6abb1259d2ee2bcc"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc-std-workspace-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383"
-"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
-"checksum serde_derive 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)" = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
-"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
+"checksum scroll 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "abb2332cb595d33f7edd5700f4cbf94892e680c7f0ae56adab58a35190b66cb1"
+"checksum scroll_derive 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f8584eea9b9ff42825b46faf46a8c24d2cff13ec152fa2a50df788b87c07ee28"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+"checksum syn 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1e4ff033220a41d1a57d8125eab57bf5263783dfdcc18688b1dacc6ce9651ef8"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml
index d0b221a025..f6d81468a4 100644
--- a/vendor/backtrace/Cargo.toml
+++ b/vendor/backtrace/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "backtrace"
-version = "0.3.40"
+version = "0.3.44"
 authors = ["The Rust Project Developers"]
 autoexamples = true
 autotests = true
@@ -55,7 +55,7 @@ name = "concurrent-panics"
 harness = false
 required-features = ["std"]
 [dependencies.addr2line]
-version = "0.10.0"
+version = "0.11.0"
 features = ["std"]
 optional = true
 default-features = false
@@ -65,7 +65,7 @@ version = "0.1.32"
 optional = true
 
 [dependencies.cfg-if]
-version = "0.1.6"
+version = "0.1.10"
 
 [dependencies.compiler_builtins]
 version = "0.1.2"
@@ -86,7 +86,7 @@ version = "0.5.0"
 optional = true
 
 [dependencies.goblin]
-version = "0.0.24"
+version = "0.1.3"
 features = ["elf32", "elf64", "mach32", "mach64", "pe32", "pe64", "std"]
 optional = true
 default-features = false
diff --git a/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile b/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile
index b9026c06cb..81c8208ef3 100644
--- a/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile
+++ b/vendor/backtrace/ci/docker/aarch64-linux-android/Dockerfile
@@ -15,4 +15,4 @@ ENV PATH=$PATH:/android-toolchain/bin
 
 # TODO: run tests in an emulator eventually
 ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
-    CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="true"
+    CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=echo
diff --git a/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile b/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile
index 9696677edb..c73871603a 100644
--- a/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile
+++ b/vendor/backtrace/ci/docker/armv7-linux-androideabi/Dockerfile
@@ -15,4 +15,4 @@ ENV PATH=$PATH:/android-toolchain/bin
 
 # TODO: run tests in an emulator eventually
 ENV CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-gcc \
-    CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER="true"
+    CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_RUNNER=echo
diff --git a/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile b/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile
index c4946ad1d1..ef4752cb37 100644
--- a/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile
+++ b/vendor/backtrace/ci/docker/i686-linux-android/Dockerfile
@@ -15,4 +15,4 @@ ENV PATH=$PATH:/android-toolchain/bin
 
 # TODO: run tests in an emulator eventually
 ENV CARGO_TARGET_I686_LINUX_ANDROID_LINKER=i686-linux-android-gcc \
-    CARGO_TARGET_I686_LINUX_ANDROID_RUNNER="true"
+    CARGO_TARGET_I686_LINUX_ANDROID_RUNNER=echo
diff --git a/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile b/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
index 5e22a9f7ce..b4f5d8a42f 100644
--- a/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
+++ b/vendor/backtrace/ci/docker/powerpc64-unknown-linux-gnu/Dockerfile
@@ -12,5 +12,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_LINKER=powerpc64-linux-gnu-gcc \
     # TODO: should actually run these tests
     #CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER="qemu-ppc64 -L /usr/powerpc64-linux-gnu" \
-    CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER=true \
+    CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_GNU_RUNNER=echo \
     CC=powerpc64-linux-gnu-gcc
diff --git a/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile b/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile
index 6ed4a65db1..7fea8a1634 100644
--- a/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile
+++ b/vendor/backtrace/ci/docker/x86_64-linux-android/Dockerfile
@@ -15,4 +15,4 @@ ENV PATH=$PATH:/android-toolchain/bin
 
 # TODO: run tests in an emulator eventually
 ENV CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-gcc \
-    CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER="true"
+    CARGO_TARGET_X86_64_LINUX_ANDROID_RUNNER=echo
diff --git a/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile b/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile
index 48db21980c..7a8fbf4375 100644
--- a/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile
+++ b/vendor/backtrace/ci/docker/x86_64-pc-windows-gnu/Dockerfile
@@ -6,5 +6,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc-mingw-w64-x86-64
 
 # No need to run tests, we're just testing that it compiles
-ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=true \
+ENV CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=echo \
     CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=x86_64-w64-mingw32-gcc
diff --git a/vendor/backtrace/src/backtrace/dbghelp.rs b/vendor/backtrace/src/backtrace/dbghelp.rs
index a5191551b5..40de1437c1 100644
--- a/vendor/backtrace/src/backtrace/dbghelp.rs
+++ b/vendor/backtrace/src/backtrace/dbghelp.rs
@@ -21,10 +21,10 @@
 
 #![allow(bad_style)]
 
-use core::ffi::c_void;
-use core::mem;
 use crate::dbghelp;
 use crate::windows::*;
+use core::ffi::c_void;
+use core::mem;
 
 #[derive(Clone, Copy)]
 pub enum Frame {
@@ -93,6 +93,34 @@ pub unsafe fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
         Err(()) => return, // oh well...
     };
 
+    // On x86_64 and ARM64 we opt to not use the default `Sym*` functions from
+    // dbghelp for getting the function table and module base. Instead we use
+    // the `RtlLookupFunctionEntry` function in kernel32 which will account for
+    // JIT compiler frames as well. These should be equivalent, but using
+    // `Rtl*` allows us to backtrace through JIT frames.
+    //
+    // Note that `RtlLookupFunctionEntry` only works for in-process backtraces,
+    // but that's all we support anyway, so it all lines up well.
+    cfg_if::cfg_if! {
+        if #[cfg(target_pointer_width = "64")] {
+            use core::ptr;
+
+            unsafe extern "system" fn function_table_access(_process: HANDLE, addr: DWORD64) -> PVOID {
+                let mut base = 0;
+                RtlLookupFunctionEntry(addr, &mut base, ptr::null_mut()).cast()
+            }
+
+            unsafe extern "system" fn get_module_base(_process: HANDLE, addr: DWORD64) -> DWORD64 {
+                let mut base = 0;
+                RtlLookupFunctionEntry(addr, &mut base, ptr::null_mut());
+                base
+            }
+        } else {
+            let function_table_access = dbghelp.SymFunctionTableAccess64();
+            let get_module_base = dbghelp.SymGetModuleBase64();
+        }
+    }
+
     // Attempt to use `StackWalkEx` if we can, but fall back to `StackWalk64`
     // since it's in theory supported on more systems.
     match (*dbghelp.dbghelp()).StackWalkEx() {
@@ -113,8 +141,8 @@ pub unsafe fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
                 frame_ptr,
                 &mut context.0 as *mut CONTEXT as *mut _,
                 None,
-                Some(dbghelp.SymFunctionTableAccess64()),
-                Some(dbghelp.SymGetModuleBase64()),
+                Some(function_table_access),
+                Some(get_module_base),
                 None,
                 0,
             ) == TRUE
@@ -141,8 +169,8 @@ pub unsafe fn trace(cb: &mut FnMut(&super::Frame) -> bool) {
                 frame_ptr,
                 &mut context.0 as *mut CONTEXT as *mut _,
                 None,
-                Some(dbghelp.SymFunctionTableAccess64()),
-                Some(dbghelp.SymGetModuleBase64()),
+                Some(function_table_access),
+                Some(get_module_base),
                 None,
             ) == TRUE
             {
diff --git a/vendor/backtrace/src/backtrace/libunwind.rs b/vendor/backtrace/src/backtrace/libunwind.rs
index 03b531ae0b..21af00c171 100644
--- a/vendor/backtrace/src/backtrace/libunwind.rs
+++ b/vendor/backtrace/src/backtrace/libunwind.rs
@@ -48,9 +48,7 @@ impl Frame {
             Frame::Raw(ctx) => ctx,
             Frame::Cloned { ip, .. } => return ip,
         };
-        unsafe {
-            uw::_Unwind_GetIP(ctx) as *mut c_void
-        }
+        unsafe { uw::_Unwind_GetIP(ctx) as *mut c_void }
     }
 
     pub fn symbol_address(&self) -> *mut c_void {
@@ -87,8 +85,10 @@ impl Clone for Frame {
 pub unsafe fn trace(mut cb: &mut FnMut(&super::Frame) -> bool) {
     uw::_Unwind_Backtrace(trace_fn, &mut cb as *mut _ as *mut _);
 
-    extern fn trace_fn(ctx: *mut uw::_Unwind_Context,
-                       arg: *mut c_void) -> uw::_Unwind_Reason_Code {
+    extern "C" fn trace_fn(
+        ctx: *mut uw::_Unwind_Context,
+        arg: *mut c_void,
+    ) -> uw::_Unwind_Reason_Code {
         let cb = unsafe { &mut *(arg as *mut &mut FnMut(&super::Frame) -> bool) };
         let cx = super::Frame {
             inner: Frame::Raw(ctx),
@@ -136,36 +136,40 @@ mod uw {
     pub enum _Unwind_Context {}
 
     pub type _Unwind_Trace_Fn =
-            extern fn(ctx: *mut _Unwind_Context,
-                      arg: *mut c_void) -> _Unwind_Reason_Code;
+        extern "C" fn(ctx: *mut _Unwind_Context, arg: *mut c_void) -> _Unwind_Reason_Code;
 
-    extern {
+    extern "C" {
         // No native _Unwind_Backtrace on iOS
         #[cfg(not(all(target_os = "ios", target_arch = "arm")))]
-        pub fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
-                                 trace_argument: *mut c_void)
-                    -> _Unwind_Reason_Code;
+        pub fn _Unwind_Backtrace(
+            trace: _Unwind_Trace_Fn,
+            trace_argument: *mut c_void,
+        ) -> _Unwind_Reason_Code;
 
         // available since GCC 4.2.0, should be fine for our purpose
-        #[cfg(all(not(all(target_os = "android", target_arch = "arm")),
-                  not(all(target_os = "freebsd", target_arch = "arm")),
-                  not(all(target_os = "linux", target_arch = "arm"))))]
-        pub fn _Unwind_GetIP(ctx: *mut _Unwind_Context)
-                    -> libc::uintptr_t;
-
-        #[cfg(all(not(target_os = "android"),
-                  not(all(target_os = "freebsd", target_arch = "arm")),
-                  not(all(target_os = "linux", target_arch = "arm"))))]
-        pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void)
-            -> *mut c_void;
+        #[cfg(all(
+            not(all(target_os = "android", target_arch = "arm")),
+            not(all(target_os = "freebsd", target_arch = "arm")),
+            not(all(target_os = "linux", target_arch = "arm"))
+        ))]
+        pub fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t;
+
+        #[cfg(all(
+            not(target_os = "android"),
+            not(all(target_os = "freebsd", target_arch = "arm")),
+            not(all(target_os = "linux", target_arch = "arm"))
+        ))]
+        pub fn _Unwind_FindEnclosingFunction(pc: *mut c_void) -> *mut c_void;
     }
 
     // On android, the function _Unwind_GetIP is a macro, and this is the
     // expansion of the macro. This is all copy/pasted directly from the
     // header file with the definition of _Unwind_GetIP.
-    #[cfg(any(all(target_os = "android", target_arch = "arm"),
-              all(target_os = "freebsd", target_arch = "arm"),
-              all(target_os = "linux", target_arch = "arm")))]
+    #[cfg(any(
+        all(target_os = "android", target_arch = "arm"),
+        all(target_os = "freebsd", target_arch = "arm"),
+        all(target_os = "linux", target_arch = "arm")
+    ))]
     pub unsafe fn _Unwind_GetIP(ctx: *mut _Unwind_Context) -> libc::uintptr_t {
         #[repr(C)]
         enum _Unwind_VRS_Result {
@@ -192,33 +196,36 @@ mod uw {
         }
 
         type _Unwind_Word = libc::c_uint;
-        extern {
-            fn _Unwind_VRS_Get(ctx: *mut _Unwind_Context,
-                               klass: _Unwind_VRS_RegClass,
-                               word: _Unwind_Word,
-                               repr: _Unwind_VRS_DataRepresentation,
-                               data: *mut c_void)
-                -> _Unwind_VRS_Result;
+        extern "C" {
+            fn _Unwind_VRS_Get(
+                ctx: *mut _Unwind_Context,
+                klass: _Unwind_VRS_RegClass,
+                word: _Unwind_Word,
+                repr: _Unwind_VRS_DataRepresentation,
+                data: *mut c_void,
+            ) -> _Unwind_VRS_Result;
         }
 
         let mut val: _Unwind_Word = 0;
         let ptr = &mut val as *mut _Unwind_Word;
-        let _ = _Unwind_VRS_Get(ctx, _Unwind_VRS_RegClass::_UVRSC_CORE, 15,
-                                _Unwind_VRS_DataRepresentation::_UVRSD_UINT32,
-                                ptr as *mut c_void);
+        let _ = _Unwind_VRS_Get(
+            ctx,
+            _Unwind_VRS_RegClass::_UVRSC_CORE,
+            15,
+            _Unwind_VRS_DataRepresentation::_UVRSD_UINT32,
+            ptr as *mut c_void,
+        );
         (val & !1) as libc::uintptr_t
     }
 
     // This function also doesn't exist on Android or ARM/Linux, so make it
     // a no-op
-    #[cfg(any(target_os = "android",
-              all(target_os = "freebsd", target_arch = "arm"),
-              all(target_os = "linux", target_arch = "arm")))]
-    pub unsafe fn _Unwind_FindEnclosingFunction(pc: *mut c_void)
-        -> *mut c_void
-    {
+    #[cfg(any(
+        target_os = "android",
+        all(target_os = "freebsd", target_arch = "arm"),
+        all(target_os = "linux", target_arch = "arm")
+    ))]
+    pub unsafe fn _Unwind_FindEnclosingFunction(pc: *mut c_void) -> *mut c_void {
         pc
     }
 }
-
-
diff --git a/vendor/backtrace/src/backtrace/mod.rs b/vendor/backtrace/src/backtrace/mod.rs
index 22de9ef134..204974ec46 100644
--- a/vendor/backtrace/src/backtrace/mod.rs
+++ b/vendor/backtrace/src/backtrace/mod.rs
@@ -121,7 +121,10 @@ cfg_if::cfg_if! {
                 not(all(target_os = "ios", target_arch = "arm")),
                 feature = "libunwind",
             ),
-            target_env = "sgx",
+            all(
+                target_env = "sgx",
+                target_vendor = "fortanix",
+            ),
         )
     )] {
         mod libunwind;
diff --git a/vendor/backtrace/src/lib.rs b/vendor/backtrace/src/lib.rs
index 9490312a05..69a283e678 100644
--- a/vendor/backtrace/src/lib.rs
+++ b/vendor/backtrace/src/lib.rs
@@ -65,7 +65,10 @@
 #![doc(html_root_url = "https://docs.rs/backtrace")]
 #![deny(missing_docs)]
 #![no_std]
-#![cfg_attr(all(feature = "std", target_env = "sgx"), feature(sgx_platform))]
+#![cfg_attr(
+    all(feature = "std", target_env = "sgx", target_vendor = "fortanix"),
+    feature(sgx_platform)
+)]
 #![allow(bare_trait_objects)] // TODO: remove when updating to 2018 edition
 #![allow(rust_2018_idioms)] // TODO: remove when updating to 2018 edition
 
diff --git a/vendor/backtrace/src/print.rs b/vendor/backtrace/src/print.rs
index 1289411b6b..bee6717af6 100644
--- a/vendor/backtrace/src/print.rs
+++ b/vendor/backtrace/src/print.rs
@@ -57,7 +57,6 @@ impl<'a, 'b> BacktraceFmt<'a, 'b> {
     /// sumbolicated later, and otherwise this should just be the first method
     /// you call after creating a `BacktraceFmt`.
     pub fn add_context(&mut self) -> fmt::Result {
-        self.fmt.write_str("stack backtrace:\n")?;
         #[cfg(target_os = "fuchsia")]
         fuchsia::print_dso_context(self.fmt)?;
         Ok(())
@@ -196,7 +195,7 @@ impl BacktraceFrameFmt<'_, '_, '_> {
         // To reduce TCB size in Sgx enclave, we do not want to implement symbol
         // resolution functionality.  Rather, we can print the offset of the
         // address here, which could be later mapped to correct function.
-        #[cfg(all(feature = "std", target_env = "sgx"))]
+        #[cfg(all(feature = "std", target_env = "sgx", target_vendor = "fortanix"))]
         {
             let image_base = std::os::fortanix_sgx::mem::image_base();
             frame_ip = usize::wrapping_sub(frame_ip as usize, image_base as _) as _;
diff --git a/vendor/backtrace/src/symbolize/gimli.rs b/vendor/backtrace/src/symbolize/gimli.rs
index c1f4be50e2..1529a90a03 100644
--- a/vendor/backtrace/src/symbolize/gimli.rs
+++ b/vendor/backtrace/src/symbolize/gimli.rs
@@ -11,7 +11,6 @@ use crate::symbolize::ResolveWhat;
 use crate::types::BytesOrWideString;
 use crate::SymbolName;
 use addr2line::gimli;
-use core::convert::TryFrom;
 use core::mem;
 use core::u32;
 use findshlibs::{self, Segment, SharedLibrary};
@@ -83,9 +82,10 @@ fn mmap(path: &Path) -> Option<Mmap> {
 
 cfg_if::cfg_if! {
     if #[cfg(windows)] {
-        use std::cmp;
         use goblin::pe::{self, PE};
         use goblin::strtab::Strtab;
+        use std::cmp;
+        use std::convert::TryFrom;
 
         struct Object<'a> {
             pe: PE<'a>,
@@ -542,14 +542,11 @@ pub unsafe fn resolve(what: ResolveWhat, cb: &mut FnMut(&super::Symbol)) {
             None => return,
         };
         if let Ok(mut frames) = cx.dwarf.find_frames(addr.0 as u64) {
-            while let Ok(Some(mut frame)) = frames.next() {
-                let function = frame.function.take();
-                let name = function.as_ref().and_then(|f| f.raw_name().ok());
-                let name = name.as_ref().map(|n| n.as_bytes());
+            while let Ok(Some(frame)) = frames.next() {
                 cb.call(Symbol::Frame {
                     addr: addr.0 as *mut c_void,
-                    frame,
-                    name,
+                    location: frame.location,
+                    name: frame.function.map(|f| f.name.slice()),
                 });
             }
         }
@@ -605,7 +602,7 @@ pub enum Symbol<'a> {
     /// `addr2line`'s frame internally has all the nitty gritty details.
     Frame {
         addr: *mut c_void,
-        frame: addr2line::Frame<EndianSlice<'a, Endian>>,
+        location: Option<addr2line::Location<'a>>,
         name: Option<&'a [u8]>,
     },
     /// Couldn't find debug information, but we found it in the symbol table of
@@ -639,9 +636,8 @@ impl Symbol<'_> {
     pub fn filename_raw(&self) -> Option<BytesOrWideString> {
         match self {
             Symbol::Dladdr(s) => return s.filename_raw(),
-            Symbol::Frame { frame, .. } => {
-                let location = frame.location.as_ref()?;
-                let file = location.file.as_ref()?;
+            Symbol::Frame { location, .. } => {
+                let file = location.as_ref()?.file?;
                 Some(BytesOrWideString::Bytes(file.as_bytes()))
             }
             Symbol::Symtab { .. } => None,
@@ -651,9 +647,8 @@ impl Symbol<'_> {
     pub fn filename(&self) -> Option<&Path> {
         match self {
             Symbol::Dladdr(s) => return s.filename(),
-            Symbol::Frame { frame, .. } => {
-                let location = frame.location.as_ref()?;
-                let file = location.file.as_ref()?;
+            Symbol::Frame { location, .. } => {
+                let file = location.as_ref()?.file?;
                 Some(Path::new(file))
             }
             Symbol::Symtab { .. } => None,
@@ -663,10 +658,7 @@ impl Symbol<'_> {
     pub fn lineno(&self) -> Option<u32> {
         match self {
             Symbol::Dladdr(s) => return s.lineno(),
-            Symbol::Frame { frame, .. } => {
-                let location = frame.location.as_ref()?;
-                location.line.and_then(|l| u32::try_from(l).ok())
-            }
+            Symbol::Frame { location, .. } => location.as_ref()?.line,
             Symbol::Symtab { .. } => None,
         }
     }
diff --git a/vendor/backtrace/src/symbolize/libbacktrace.rs b/vendor/backtrace/src/symbolize/libbacktrace.rs
index 167ecaf34f..4318789063 100644
--- a/vendor/backtrace/src/symbolize/libbacktrace.rs
+++ b/vendor/backtrace/src/symbolize/libbacktrace.rs
@@ -38,8 +38,8 @@ extern crate backtrace_sys as bt;
 use core::{ptr, slice};
 use libc::{self, c_char, c_int, c_void, uintptr_t};
 
-use crate::symbolize::{ResolveWhat, SymbolName};
 use crate::symbolize::dladdr;
+use crate::symbolize::{ResolveWhat, SymbolName};
 use crate::types::BytesOrWideString;
 
 pub enum Symbol<'a> {
@@ -59,22 +59,22 @@ pub enum Symbol<'a> {
 
 impl Symbol<'_> {
     pub fn name(&self) -> Option<SymbolName> {
-        let symbol = |ptr: *const c_char| {
-            unsafe {
-                if ptr.is_null() {
-                    None
-                } else {
-                    let len = libc::strlen(ptr);
-                    Some(SymbolName::new(slice::from_raw_parts(
-                        ptr as *const u8,
-                        len,
-                    )))
-                }
+        let symbol = |ptr: *const c_char| unsafe {
+            if ptr.is_null() {
+                None
+            } else {
+                let len = libc::strlen(ptr);
+                Some(SymbolName::new(slice::from_raw_parts(
+                    ptr as *const u8,
+                    len,
+                )))
             }
         };
         match *self {
             Symbol::Syminfo { symname, .. } => symbol(symname),
-            Symbol::Pcinfo { function, symname, .. } => {
+            Symbol::Pcinfo {
+                function, symname, ..
+            } => {
                 // If possible prefer the `function` name which comes from
                 // debuginfo and can typically be more accurate for inline
                 // frames for example. If that's not present though fall back to
@@ -85,7 +85,7 @@ impl Symbol<'_> {
                 // isntead of `std::panicking::try::do_call`. It's not really
                 // clear why, but overall the `function` name seems more accurate.
                 if let Some(sym) = symbol(function) {
-                    return Some(sym)
+                    return Some(sym);
                 }
                 symbol(symname)
             }
@@ -382,9 +382,27 @@ unsafe fn init_state() -> *mut bt::backtrace_state {
             }
 
             unsafe fn query_full_name(buf: &mut [i8]) -> Result<&[i8], ()> {
+                let dll = GetModuleHandleA(b"kernel32.dll\0".as_ptr() as *const i8);
+                if dll.is_null() {
+                    return Err(())
+                }
+                let ptrQueryFullProcessImageNameA =
+                    GetProcAddress(dll, b"QueryFullProcessImageNameA\0".as_ptr() as *const _) as usize;
+                if ptrQueryFullProcessImageNameA == 0
+                {
+                    return Err(());
+                }
+                use core::mem;
                 let p1 = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, GetCurrentProcessId());
                 let mut len = buf.len() as u32;
-                let rc = QueryFullProcessImageNameA(p1, 0, buf.as_mut_ptr(), &mut len);
+                let pfnQueryFullProcessImageNameA : extern "system" fn(
+                    hProcess: HANDLE,
+                    dwFlags: DWORD,
+                    lpExeName: LPSTR,
+                    lpdwSize: PDWORD,
+                ) -> BOOL = mem::transmute(ptrQueryFullProcessImageNameA);
+
+                let rc = pfnQueryFullProcessImageNameA(p1, 0, buf.as_mut_ptr(), &mut len);
                 CloseHandle(p1);
 
                 // We want to return a slice that is nul-terminated, so if
@@ -404,10 +422,10 @@ unsafe fn init_state() -> *mut bt::backtrace_state {
             unsafe fn load_filename() -> *const libc::c_char {
                 use libc;
                 use core::mem;
-                
+
                 const N: usize = libc::VX_RTP_NAME_LENGTH as usize + 1;
                 static mut BUF: [libc::c_char; N] = [0; N];
-                
+
                 let mut rtp_desc : libc::RTP_DESC = mem::zeroed();
                 if (libc::rtpInfoGet(0, &mut rtp_desc as *mut libc::RTP_DESC) == 0) {
                     BUF.copy_from_slice(&rtp_desc.pathName);
diff --git a/vendor/backtrace/src/symbolize/mod.rs b/vendor/backtrace/src/symbolize/mod.rs
index 7f8919bc86..36d58769bd 100644
--- a/vendor/backtrace/src/symbolize/mod.rs
+++ b/vendor/backtrace/src/symbolize/mod.rs
@@ -489,7 +489,8 @@ cfg_if::cfg_if! {
     } else if #[cfg(all(feature = "libbacktrace",
                         any(unix, all(windows, not(target_vendor = "uwp"), target_env = "gnu")),
                         not(target_os = "fuchsia"),
-                        not(target_os = "emscripten")))] {
+                        not(target_os = "emscripten"),
+                        not(target_env = "uclibc")))] {
         mod libbacktrace;
         use self::libbacktrace::resolve as resolve_imp;
         use self::libbacktrace::Symbol as SymbolImp;
@@ -497,6 +498,7 @@ cfg_if::cfg_if! {
     } else if #[cfg(all(unix,
                         not(target_os = "emscripten"),
                         not(target_os = "fuchsia"),
+                        not(target_env = "uclibc"),
                         feature = "dladdr"))] {
         mod dladdr_resolve;
         use self::dladdr_resolve::resolve as resolve_imp;
diff --git a/vendor/backtrace/src/windows.rs b/vendor/backtrace/src/windows.rs
index a2305704aa..9672af0d26 100644
--- a/vendor/backtrace/src/windows.rs
+++ b/vendor/backtrace/src/windows.rs
@@ -1,4 +1,4 @@
-//! A module to define the FFI definitions we use on Windows for `dbghelp.dll`
+//! A module to define the FFI definitions we use on Windows for `dbghelp.dll`
 //!
 //! This module uses a custom macro, `ffi!`, to wrap all definitions to
 //! automatically generate tests to assert that our definitions here are the
@@ -15,6 +15,10 @@ cfg_if::cfg_if! {
         pub use self::winapi::HINSTANCE;
         pub use self::winapi::FARPROC;
         pub use self::winapi::LPSECURITY_ATTRIBUTES;
+        #[cfg(target_pointer_width = "64")]
+        pub use self::winapi::PUNWIND_HISTORY_TABLE;
+        #[cfg(target_pointer_width = "64")]
+        pub use self::winapi::PRUNTIME_FUNCTION;
 
         mod winapi {
             pub use winapi::ctypes::*;
@@ -35,6 +39,10 @@ cfg_if::cfg_if! {
         pub type HINSTANCE = *mut c_void;
         pub type FARPROC = *mut c_void;
         pub type LPSECURITY_ATTRIBUTES = *mut c_void;
+        #[cfg(target_pointer_width = "64")]
+        pub type PRUNTIME_FUNCTION = *mut c_void;
+        #[cfg(target_pointer_width = "64")]
+        pub type PUNWIND_HISTORY_TABLE = *mut c_void;
     }
 }
 
@@ -343,6 +351,7 @@ ffi! {
         pub fn RtlCaptureContext(ContextRecord: PCONTEXT) -> ();
         pub fn LoadLibraryA(a: *const i8) -> HMODULE;
         pub fn GetProcAddress(h: HMODULE, name: *const i8) -> FARPROC;
+        pub fn GetModuleHandleA(name: *const i8) -> HMODULE;
         pub fn OpenProcess(
             dwDesiredAccess: DWORD,
             bInheitHandle: BOOL,
@@ -350,12 +359,6 @@ ffi! {
         ) -> HANDLE;
         pub fn GetCurrentProcessId() -> DWORD;
         pub fn CloseHandle(h: HANDLE) -> BOOL;
-        pub fn QueryFullProcessImageNameA(
-            hProcess: HANDLE,
-            dwFlags: DWORD,
-            lpExeName: LPSTR,
-            lpdwSize: PDWORD,
-        ) -> BOOL;
         pub fn CreateFileA(
             lpFileName: LPCSTR,
             dwDesiredAccess: DWORD,
@@ -379,6 +382,17 @@ ffi! {
     }
 }
 
+#[cfg(target_pointer_width = "64")]
+ffi! {
+    extern "system" {
+        pub fn RtlLookupFunctionEntry(
+            ControlPc: DWORD64,
+            ImageBase: PDWORD64,
+            HistoryTable: PUNWIND_HISTORY_TABLE,
+        ) -> PRUNTIME_FUNCTION;
+    }
+}
+
 #[cfg(target_arch = "aarch64")]
 ffi! {
     #[repr(C, align(16))]
diff --git a/vendor/chalk-engine/.cargo-checksum.json b/vendor/chalk-engine/.cargo-checksum.json
deleted file mode 100644
index ae62e5cbae..0000000000
--- a/vendor/chalk-engine/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"66b1a0da7c1526bdf99da77ec3fc5c45d73239815778b0494ebc36db24612206","README.md":"7886661b3dd3a689da97f1125f4c479fd8e7acb42fe42f26f288507f4beee784","src/README.md":"aa1296711d42c1c4f01ac626aae966344b424baf6a2516c1d607b3a7c5434dbe","src/context.rs":"7c4473a18098179e195e13a7bc8f5726a7aa469f07d9b8e1ede0483d1ec6f41f","src/context/prelude.rs":"4102ef647914022f421e32d0fdbe78b05b316507dd3d9a514239ce55fe17f9c9","src/derived.rs":"3c6eb71f6b912af22d1e4eadcd758243dc9cf25503d47e756646f2364eb6d05f","src/fallible.rs":"bd2d743816b0e9bee3111228f929be091d9195c4d9c1f85c118a528bc581be30","src/forest.rs":"f9a4ac702d94fbed27822fe7534c60c0cfaffc9c6fe3cc7f9d4744cf53e21d40","src/hh.rs":"1200b25077550aba07b8dfa0097a5f6587d454619c5174905362e8ea67d26089","src/lib.rs":"43b9157ae19455a5bc08bac73639e65b901b9ab81c7662b0e7e9c1bd18c43a4b","src/logic.rs":"8bb90780defbcc20ebe1ccc3a226fccb5aeed9a582f137ebdfd04ef3cfc54c21","src/simplify.rs":"1b9c132263e6a3fa90f620f4ae21e811e16e1e782ec1753658b5392ed8a31cbe","src/stack.rs":"e5ecf948cac5d53c54f31a8085449d977e0c157f69e61d751dc4e17070cec2d9","src/strand.rs":"431fa6439ab191b652f123455ac9f9223826cd076c8ca46443bd0b5849575086","src/table.rs":"9e3542a411ca4524b710a3747154028a99b2e29cfe51bff535b14aa2089ab17d","src/tables.rs":"6b95a382018d9ff6e8de1f0d81c0683508fe3c26613d2f2c65c3f0eb46152c2c"},"package":"17ec698a6f053a23bfbe646d9f2fde4b02abc19125595270a99e6f44ae0bdd1a"}
\ No newline at end of file
diff --git a/vendor/chalk-engine/Cargo.toml b/vendor/chalk-engine/Cargo.toml
deleted file mode 100644
index 3abd08822b..0000000000
--- a/vendor/chalk-engine/Cargo.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "chalk-engine"
-version = "0.9.0"
-authors = ["Rust Compiler Team", "Chalk developers"]
-description = "Core trait engine from Chalk project"
-readme = "README.md"
-keywords = ["compiler", "traits", "prolog"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/rust-lang-nursery/chalk"
-[dependencies.chalk-macros]
-version = "0.1.0"
-
-[dependencies.rustc-hash]
-version = "1.0.0"
-
-[dependencies.stacker]
-version = "0.1.2"
-optional = true
-
-[features]
-default = ["stack_protection"]
-stack_protection = ["stacker"]
diff --git a/vendor/chalk-engine/README.md b/vendor/chalk-engine/README.md
deleted file mode 100644
index 5190762815..0000000000
--- a/vendor/chalk-engine/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-The core trait solving engine used in Chalk. This engine is meant to
-be reused by rustc. Other projects may of course re-use it too, if you
-have a need, but don't expect much stability in the interface yet.
diff --git a/vendor/chalk-engine/src/README.md b/vendor/chalk-engine/src/README.md
deleted file mode 100644
index 2dc965326d..0000000000
--- a/vendor/chalk-engine/src/README.md
+++ /dev/null
@@ -1,280 +0,0 @@
-# The on-demand SLG solver
-
-## Description of how it works
-
-The basis of the solver is the `Forest` type. A *forest* stores a
-collection of *tables* as well as a *stack*. Each *table* represents
-the stored results of a particular query that is being performed, as
-well as the various *strands*, which are basically suspended
-computations that may be used to find more answers. Tables are
-interdependent: solving one query may require solving others.
-
-### Walkthrough
-
-Perhaps the easiest way to explain how the solver works is to walk
-through an example. Let's imagine that we have the following program:
-
-```rust
-trait Debug { }
-
-struct u32 { }
-impl Debug for u32 { }
-
-struct Rc<T> { }
-impl<T: Debug> Debug for Rc<T> { }
-
-struct Vec<T> { }
-impl<T: Debug> Debug for Vec<T> { }
-```
-
-Now imagine that we want to find answers for the query `exists<T> {
-Rc<T>: Debug }`. The first step would be to u-canonicalize this query; this
-is the act of giving canonical names to all the unbound inference variables based on the 
-order of their left-most appearance, as well as canonicalizing the universes of any
-universally bound names (e.g., the `T` in `forall<T> { ... }`). In this case, there are no
-universally bound names, but the canonical form Q of the query might look something like:
-
-    Rc<?0>: Debug
-    
-where `?0` is a variable in the root universe U0. We would then go and
-look for a table with this as the key: since the forest is empty, this
-lookup will fail, and we will create a new table T0, corresponding to
-the u-canonical goal Q.
-
-**Ignoring negative reasoning and regions.** To start, we'll ignore
-the possibility of negative goals like `not { Foo }`. We'll phase them
-in later, as they bring several complications.
-
-**Creating a table.** When we first create a table, we also initialize
-it with a set of *initial strands*. A "strand" is kind of like a
-"thread" for the solver: it contains a particular way to produce an
-answer. The initial set of strands for a goal like `Rc<?0>: Debug`
-(i.e., a "domain goal") is determined by looking for *clauses* in the
-environment. In Rust, these clauses derive from impls, but also from
-where-clauses that are in scope. In the case of our example, there
-would be three clauses, each coming from the program. Using a
-Prolog-like notation, these look like:
-
-```
-(u32: Debug).
-(Rc<T>: Debug) :- (T: Debug).
-(Vec<T>: Debug) :- (T: Debug).
-```
-
-To create our initial strands, then, we will try to apply each of
-these clauses to our goal of `Rc<?0>: Debug`. The first and third
-clauses are inapplicable because `u32` and `Vec<?0>` cannot be unified
-with `Rc<?0>`. The second clause, however, will work.
-
-**What is a strand?** Let's talk a bit more about what a strand *is*. In the code, a strand
-is the combination of an inference table, an X-clause, and (possibly)
-a selected subgoal from that X-clause. But what is an X-clause
-(`ExClause`, in the code)? An X-clause pulls together a few things:
-
-- The current state of the goal we are trying to prove;
-- A set of subgoals that have yet to be proven;
-- There are also a few things we're ignoring for now:
-  - delayed literals, region constraints
-
-The general form of an X-clause is written much like a Prolog clause,
-but with somewhat different semantics. Since we're ignoring delayed
-literals and region constraints, an X-clause just looks like this:
-
-    G :- L
-    
-where G is a goal and L is a set of subgoals that must be proven.
-(The L stands for *literal* -- when we address negative reasoning, a
-literal will be either a positive or negative subgoal.) The idea is
-that if we are able to prove L then the goal G can be considered true.
-
-In the case of our example, we would wind up creating one strand, with
-an X-clause like so:
-
-    (Rc<?T>: Debug) :- (?T: Debug)
-
-Here, the `?T` refers to one of the inference variables created in the
-inference table that accompanies the strand. (I'll use named variables
-to refer to inference variables, and numbered variables like `?0` to
-refer to variables in a canonicalized goal; in the code, however, they
-are both represented with an index.)
-
-For each strand, we also optionally store a *selected subgoal*. This
-is the subgoal after the turnstile (`:-`) that we are currently trying
-to prove in this strand. Initally, when a strand is first created,
-there is no selected subgoal.
-
-**Activating a strand.** Now that we have created the table T0 and
-initialized it with strands, we have to actually try and produce an
-answer. We do this by invoking the `ensure_answer` operation on the
-table: specifically, we say `ensure_answer(T0, A0)`, meaning "ensure
-that there is a 0th answer".
-
-Remember that tables store not only strands, but also a vector of
-cached answers. The first thing that `ensure_answer` does is to check
-whether answer 0 is in this vector. If so, we can just return
-immediately.  In this case, the vector will be empty, and hence that
-does not apply (this becomes important for cyclic checks later on).
-
-When there is no cached answer, `ensure_answer` will try to produce
-one.  It does this by selecting a strand from the set of active
-strands -- the strands are stored in a `VecDeque` and hence processed
-in a round-robin fashion. Right now, we have only one strand, storing
-the following X-clause with no selected subgoal:
-
-    (Rc<?T>: Debug) :- (?T: Debug)
-
-When we activate the strand, we see that we have no selected subgoal,
-and so we first pick one of the subgoals to process. Here, there is only
-one (`?T: Debug`), so that becomes the selected subgoal, changing
-the state of the strand to:
-
-    (Rc<?T>: Debug) :- selected(?T: Debug, A0)
-    
-Here, we write `selected(L, An)` to indicate that (a) the literal `L`
-is the selected subgoal and (b) which answer `An` we are looking for. We
-start out looking for `A0`.
-
-**Processing the selected subgoal.** Next, we have to try and find an
-answer to this selected goal. To do that, we will u-canonicalize it
-and try to find an associated table. In this case, the u-canonical
-form of the subgoal is `?0: Debug`: we don't have a table yet for
-that, so we can create a new one, T1. As before, we'll initialize T1
-with strands. In this case, there will be three strands, because all
-the program clauses are potentially applicable. Those three strands
-will be:
-
-- `(u32: Debug) :-`, derived from the program clause `(u32: Debug).`.
-  - Note: This strand has no subgoals.
-- `(Vec<?U>: Debug) :- (?U: Debug)`, derived from the `Vec` impl.
-- `(Rc<?U>: Debug) :- (?U: Debug)`, derived from the `Rc` impl.
-
-We can thus summarize the state of the whole forest at this point as
-follows:
-
-```
-Table T0 [Rc<?0>: Debug]
-  Strands:
-    (Rc<?T>: Debug) :- selected(?T: Debug, A0)
-  
-Table T1 [?0: Debug]
-  Strands:
-    (u32: Debug) :-
-    (Vec<?U>: Debug) :- (?U: Debug)
-    (Rc<?V>: Debug) :- (?V: Debug)
-```
-    
-**Delegation between tables.** Now that the active strand from T0 has
-created the table T1, it can try to extract an answer. It does this
-via that same `ensure_answer` operation we saw before. In this case,
-the strand would invoke `ensure_answer(T1, A0)`, since we will start
-with the first answer. This will cause T1 to activate its first
-strand, `u32: Debug :-`.
-
-This strand is somewhat special: it has no subgoals at all. This means
-that the goal is proven. We can therefore add `u32: Debug` to the set
-of *answers* for our table, calling it answer A0 (it is the first
-answer). The strand is then removed from the list of strands.
-
-The state of table T1 is therefore:
-
-```
-Table T1 [?0: Debug]
-  Answers:
-    A0 = [?0 = u32]
-  Strand:
-    (Vec<?U>: Debug) :- (?U: Debug)
-    (Rc<?V>: Debug) :- (?V: Debug)
-```
-
-Note that I am writing out the answer A0 as a substitution that can be
-applied to the table goal; actually, in the code, the goals for each
-X-clause are also represented as substitutions, but in this exposition
-I've chosen to write them as full goals, following NFTD.
-   
-Since we now have an answer, `ensure_answer(T1, A0)` will return `Ok`
-to the table T0, indicating that answer A0 is available. T0 now has
-the job of incorporating that result into its active strand. It does
-this in two ways. First, it creates a new strand that is looking for
-the next possible answer of T1. Next, it incorpoates the answer from
-A0 and removes the subgoal. The resulting state of table T0 is:
-
-```
-Table T0 [Rc<?0>: Debug]
-  Strands:
-    (Rc<?T>: Debug) :- selected(?T: Debug, A1)
-    (Rc<u32>: Debug) :-
-```
-
-We then immediately activate the strand that incorporated the answer
-(the `Rc<u32>: Debug` one). In this case, that strand has no further
-subgoals, so it becomes an answer to the table T0. This answer can
-then be returned up to our caller, and the whole forest goes quiescent
-at this point (remember, we only do enough work to generate *one*
-answer). The ending state of the forest at this point will be:
-
-```
-Table T0 [Rc<?0>: Debug]
-  Answer:
-    A0 = [?0 = u32]
-  Strands:
-    (Rc<?T>: Debug) :- selected(?T: Debug, A1)
-
-Table T1 [?0: Debug]
-  Answers:
-    A0 = [?0 = u32]
-  Strand:
-    (Vec<?U>: Debug) :- (?U: Debug)
-    (Rc<?V>: Debug) :- (?V: Debug)
-```
-
-Here you can see how the forest captures both the answers we have
-created thus far *and* the strands that will let us try to produce
-more answers later on.
-
-## Heritage and acroynms
-
-This solver implements the SLG solving technique, though extended to
-accommodate hereditary harrop (HH) predicates, as well as the needs of
-lazy normalization. 
-
-Its design is kind of a fusion of [MiniKanren] and the following
-papers, which I will refer to as EWFS and NTFD respectively:
-
-> Efficient Top-Down Computation of Queries Under the Well-formed Semantics
-> (Chen, Swift, and Warren; Journal of Logic Programming '95)
-
-> A New Formulation of Tabled resolution With Delay
-> (Swift; EPIA '99)
-
-[MiniKanren]: http://minikanren.org/
-
-In addition, I incorporated extensions from the following papers,
-which I will refer to as SA and RR respectively, that describes how to
-do introduce approximation when processing subgoals and so forth:
-
-> Terminating Evaluation of Logic Programs with Finite Three-Valued Models
-> Riguzzi and Swift; ACM Transactions on Computational Logic 2013
-> (Introduces "subgoal abstraction", hence the name SA)
->
-> Radial Restraint
-> Grosof and Swift; 2013
-
-Another useful paper that gives a kind of high-level overview of
-concepts at play is the following:
-
-> XSB: Extending Prolog with Tabled Logic Programming
-> (Swift and Warren; Theory and Practice of Logic Programming '10)
-
-There are a places where I intentionally diverged from the semantics
-as described in the papers -- e.g. by more aggressively approximating
--- which I marked them with a comment DIVERGENCE. Those places may
-want to be evaluated in the future.
-
-A few other acronyms that I use:
-
-- WAM: Warren abstract machine, an efficient way to evaluate Prolog programs.
-  See <http://wambook.sourceforge.net/>.
-- HH: Hereditary harrop predicates. What Chalk deals in.
-  Popularized by Lambda Prolog.
-
-
diff --git a/vendor/chalk-engine/src/context.rs b/vendor/chalk-engine/src/context.rs
deleted file mode 100644
index 28d9cdf19c..0000000000
--- a/vendor/chalk-engine/src/context.rs
+++ /dev/null
@@ -1,378 +0,0 @@
-use fallible::Fallible;
-use hh::HhGoal;
-use {DelayedLiteral, ExClause, SimplifiedAnswer};
-use std::fmt::Debug;
-use std::hash::Hash;
-
-pub(crate) mod prelude;
-
-/// The "context" in which the SLG solver operates. It defines all the
-/// types that the SLG solver may need to refer to, as well as a few
-/// very simple interconversion methods.
-///
-/// At any given time, the SLG solver may have more than one context
-/// active. First, there is always the *global* context, but when we
-/// are in the midst of pursuing some particular strand, we will
-/// instantiate a second context just for that work, via the
-/// `instantiate_ucanonical_goal` and `instantiate_ex_clause` methods.
-///
-/// In the chalk implementation, these two contexts are mapped to the
-/// same type. But in the rustc implementation, this second context
-/// corresponds to a fresh arena, and data allocated in that second
-/// context will be freed once the work is done. (The "canonicalizing"
-/// steps offer a way to convert data from the inference context back
-/// into the global context.)
-///
-/// FIXME: Clone and Debug bounds are just for easy derive, they are
-/// not actually necessary. But dang are they convenient.
-pub trait Context: Clone + Debug {
-    type CanonicalExClause: Debug;
-
-    /// A map between universes. These are produced when
-    /// u-canonicalizing something; they map canonical results back to
-    /// the universes from the original.
-    type UniverseMap: Clone + Debug;
-
-    /// Extracted from a canonicalized substitution or canonicalized ex clause, this is the type of
-    /// substitution that is fully normalized with respect to inference variables.
-    type InferenceNormalizedSubst: Debug;
-
-    /// A canonicalized `GoalInEnvironment` -- that is, one where all
-    /// free inference variables have been bound into the canonical
-    /// binder. See [the rustc-guide] for more information.
-    ///
-    /// [the rustc-guide]: https://rust-lang-nursery.github.io/rustc-guide/traits-canonicalization.html
-    type CanonicalGoalInEnvironment: Debug;
-
-    /// A u-canonicalized `GoalInEnvironment` -- this is one where the
-    /// free universes are renumbered to consecutive integers starting
-    /// from U1 (but preserving their relative order).
-    type UCanonicalGoalInEnvironment: Debug + Clone + Eq + Hash;
-
-    /// A final solution that is passed back to the user. This is
-    /// completely opaque to the SLG solver; it is produced by
-    /// `make_solution`.
-    type Solution;
-
-    /// Part of an answer: represents a canonicalized substitution,
-    /// combined with region constraints. See [the rustc-guide] for more information.
-    ///
-    /// [the rustc-guide]: https://rust-lang-nursery.github.io/rustc-guide/traits-canonicalization.html#canonicalizing-the-query-result
-    type CanonicalConstrainedSubst: Clone + Debug + Eq + Hash;
-
-    /// Represents a substitution from the "canonical variables" found
-    /// in a canonical goal to specific values.
-    type Substitution: Debug;
-
-    /// Represents a region constraint that will be propagated back
-    /// (but not verified).
-    type RegionConstraint: Debug;
-
-    /// Represents a goal along with an environment.
-    type GoalInEnvironment: Debug + Clone + Eq + Hash;
-
-    /// Represents a set of hypotheses that are assumed to be true.
-    type Environment: Debug + Clone;
-
-    /// Goals correspond to things we can prove.
-    type Goal: Clone + Debug + Eq;
-
-    /// A goal that can be targeted by a program clause. The SLG
-    /// solver treats these opaquely; in contrast, it understands
-    /// "meta" goals like `G1 && G2` and so forth natively.
-    type DomainGoal: Debug;
-
-    /// A "higher-order" goal, quantified over some types and/or
-    /// lifetimes. When you have a quantification, like `forall<T> { G
-    /// }` or `exists<T> { G }`, this represents the `<T> { G }` part.
-    ///
-    /// (In Lambda Prolog, this would be a "lambda predicate", like `T
-    /// \ Goal`).
-    type BindersGoal: Debug;
-
-    /// A term that can be quantified over and unified -- in current
-    /// Chalk, either a type or lifetime.
-    type Parameter: Debug;
-
-    /// A rule like `DomainGoal :- Goal`.
-    ///
-    /// `resolvent_clause` combines a program-clause and a concrete
-    /// goal we are trying to solve to produce an ex-clause.
-    type ProgramClause: Debug;
-
-    /// A vector of program clauses.
-    type ProgramClauses: Debug;
-
-    /// How to relate two kinds when unifying: for example in rustc, we
-    /// may want to unify parameters either for the sub-typing relation or for
-    /// the equality relation.
-    type Variance;
-
-    /// The successful result from unification: contains new subgoals
-    /// and things that can be attached to an ex-clause.
-    type UnificationResult;
-
-    /// Given an environment and a goal, glue them together to create
-    /// a `GoalInEnvironment`.
-    fn goal_in_environment(
-        environment: &Self::Environment,
-        goal: Self::Goal,
-    ) -> Self::GoalInEnvironment;
-}
-
-pub trait ContextOps<C: Context>: Sized + Clone + Debug + AggregateOps<C> {
-    /// True if this is a coinductive goal -- e.g., proving an auto trait.
-    fn is_coinductive(&self, goal: &C::UCanonicalGoalInEnvironment) -> bool;
-
-    /// Create an inference table for processing a new goal and instantiate that goal
-    /// in that context, returning "all the pieces".
-    ///
-    /// More specifically: given a u-canonical goal `arg`, creates a
-    /// new inference table `T` and populates it with the universes
-    /// found in `arg`. Then, creates a substitution `S` that maps
-    /// each bound variable in `arg` to a fresh inference variable
-    /// from T. Returns:
-    ///
-    /// - the table `T`
-    /// - the substitution `S`
-    /// - the environment and goal found by substitution `S` into `arg`
-    fn instantiate_ucanonical_goal<R>(
-        &self,
-        arg: &C::UCanonicalGoalInEnvironment,
-        op: impl WithInstantiatedUCanonicalGoal<C, Output = R>,
-    ) -> R;
-
-    fn instantiate_ex_clause<R>(
-        &self,
-        num_universes: usize,
-        canonical_ex_clause: &C::CanonicalExClause,
-        op: impl WithInstantiatedExClause<C, Output = R>,
-    ) -> R;
-
-    /// Extracts the inner normalized substitution from a canonical ex-clause.
-    fn inference_normalized_subst_from_ex_clause(
-        canon_ex_clause: &C::CanonicalExClause,
-    ) -> &C::InferenceNormalizedSubst;
-
-    /// Extracts the inner normalized substitution from a canonical constraint subst.
-    fn inference_normalized_subst_from_subst(
-        canon_ex_clause: &C::CanonicalConstrainedSubst,
-    ) -> &C::InferenceNormalizedSubst;
-
-    /// True if this solution has no region constraints.
-    fn empty_constraints(ccs: &C::CanonicalConstrainedSubst) -> bool;
-
-    fn canonical(u_canon: &C::UCanonicalGoalInEnvironment) -> &C::CanonicalGoalInEnvironment;
-    fn is_trivial_substitution(u_canon: &C::UCanonicalGoalInEnvironment,
-                               canonical_subst: &C::CanonicalConstrainedSubst) -> bool;
-    fn num_universes(&C::UCanonicalGoalInEnvironment) -> usize;
-
-    /// Convert a goal G *from* the canonical universes *into* our
-    /// local universes. This will yield a goal G' that is the same
-    /// but for the universes of universally quantified names.
-    fn map_goal_from_canonical(
-        &C::UniverseMap,
-        value: &C::CanonicalGoalInEnvironment,
-    ) -> C::CanonicalGoalInEnvironment;
-
-    /// Convert a substitution *from* the canonical universes *into*
-    /// our local universes. This will yield a substitution S' that is
-    /// the same but for the universes of universally quantified
-    /// names.
-    fn map_subst_from_canonical(
-        &C::UniverseMap,
-        value: &C::CanonicalConstrainedSubst,
-    ) -> C::CanonicalConstrainedSubst;
-}
-
-/// Callback trait for `instantiate_ucanonical_goal`. Unlike the other
-/// traits in this file, this is not implemented by the context crate, but rather
-/// by code in this crate.
-///
-/// This basically plays the role of an `FnOnce` -- but unlike an
-/// `FnOnce`, the `with` method is generic.
-pub trait WithInstantiatedUCanonicalGoal<C: Context> {
-    type Output;
-
-    fn with<I: Context>(
-        self,
-        infer: &mut dyn InferenceTable<C, I>,
-        subst: I::Substitution,
-        environment: I::Environment,
-        goal: I::Goal,
-    ) -> Self::Output;
-}
-
-/// Callback trait for `instantiate_ex_clause`. Unlike the other
-/// traits in this file, this is not implemented by the context crate,
-/// but rather by code in this crate.
-///
-/// This basically plays the role of an `FnOnce` -- but unlike an
-/// `FnOnce`, the `with` method is generic.
-pub trait WithInstantiatedExClause<C: Context> {
-    type Output;
-
-    fn with<I: Context>(
-        self,
-        infer: &mut dyn InferenceTable<C, I>,
-        ex_clause: ExClause<I>,
-    ) -> Self::Output;
-}
-
-/// Methods for combining solutions to yield an aggregate solution.
-pub trait AggregateOps<C: Context> {
-    fn make_solution(
-        &self,
-        root_goal: &C::CanonicalGoalInEnvironment,
-        simplified_answers: impl AnswerStream<C>,
-    ) -> Option<C::Solution>;
-}
-
-/// An "inference table" contains the state to support unification and
-/// other operations on terms.
-pub trait InferenceTable<C: Context, I: Context>:
-    ResolventOps<C, I> + TruncateOps<C, I> + UnificationOps<C, I>
-{
-    /// Convert the context's goal type into the `HhGoal` type that
-    /// the SLG solver understands. The expectation is that the
-    /// context's goal type has the same set of variants, but with
-    /// different names and a different setup. If you inspect
-    /// `HhGoal`, you will see that this is a "shallow" or "lazy"
-    /// conversion -- that is, we convert the outermost goal into an
-    /// `HhGoal`, but the goals contained within are left as context
-    /// goals.
-    fn into_hh_goal(&mut self, goal: I::Goal) -> HhGoal<I>;
-
-    // Used by: simplify
-    fn add_clauses(
-        &mut self,
-        env: &I::Environment,
-        clauses: I::ProgramClauses,
-    ) -> I::Environment;
-
-    /// Upcast this domain goal into a more general goal.
-    fn into_goal(&self, domain_goal: I::DomainGoal) -> I::Goal;
-
-    /// Create a "cannot prove" goal (see `HhGoal::CannotProve`).
-    fn cannot_prove(&self) -> I::Goal;
-}
-
-/// Methods for unifying and manipulating terms and binders.
-pub trait UnificationOps<C: Context, I: Context> {
-    /// Returns the set of program clauses that might apply to
-    /// `goal`. (This set can be over-approximated, naturally.)
-    fn program_clauses(
-        &self,
-        environment: &I::Environment,
-        goal: &I::DomainGoal,
-    ) -> Vec<I::ProgramClause>;
-
-    // Used by: simplify
-    fn instantiate_binders_universally(&mut self, arg: &I::BindersGoal) -> I::Goal;
-
-    // Used by: simplify
-    fn instantiate_binders_existentially(&mut self, arg: &I::BindersGoal) -> I::Goal;
-
-    // Used by: logic (but for debugging only)
-    fn debug_ex_clause(&mut self, value: &'v ExClause<I>) -> Box<dyn Debug + 'v>;
-
-    // Used by: logic
-    fn canonicalize_goal(&mut self, value: &I::GoalInEnvironment) -> C::CanonicalGoalInEnvironment;
-
-    // Used by: logic
-    fn canonicalize_ex_clause(&mut self, value: &ExClause<I>) -> C::CanonicalExClause;
-
-    // Used by: logic
-    fn canonicalize_constrained_subst(
-        &mut self,
-        subst: I::Substitution,
-        constraints: Vec<I::RegionConstraint>,
-    ) -> C::CanonicalConstrainedSubst;
-
-    // Used by: logic
-    fn u_canonicalize_goal(
-        &mut self,
-        value: &C::CanonicalGoalInEnvironment,
-    ) -> (C::UCanonicalGoalInEnvironment, C::UniverseMap);
-
-    fn sink_answer_subset(
-        &self,
-        value: &C::CanonicalConstrainedSubst,
-    ) -> I::CanonicalConstrainedSubst;
-
-    fn lift_delayed_literal(
-        &self,
-        value: DelayedLiteral<I>,
-    ) -> DelayedLiteral<C>;
-
-    // Used by: logic
-    fn invert_goal(&mut self, value: &I::GoalInEnvironment) -> Option<I::GoalInEnvironment>;
-
-    // Used by: simplify
-    fn unify_parameters(
-        &mut self,
-        environment: &I::Environment,
-        variance: I::Variance,
-        a: &I::Parameter,
-        b: &I::Parameter,
-    ) -> Fallible<I::UnificationResult>;
-
-    /// Add the residual subgoals as new subgoals of the ex-clause.
-    /// Also add region constraints.
-    fn into_ex_clause(&mut self, result: I::UnificationResult, ex_clause: &mut ExClause<I>);
-}
-
-/// "Truncation" (called "abstraction" in the papers referenced below)
-/// refers to the act of modifying a goal or answer that has become
-/// too large in order to guarantee termination. The SLG solver
-/// doesn't care about the precise truncation function, so long as
-/// it's deterministic and so forth.
-///
-/// Citations:
-///
-/// - Terminating Evaluation of Logic Programs with Finite Three-Valued Models
-///   - Riguzzi and Swift; ACM Transactions on Computational Logic 2013
-/// - Radial Restraint
-///   - Grosof and Swift; 2013
-pub trait TruncateOps<C: Context, I: Context> {
-    /// If `subgoal` is too large, return a truncated variant (else
-    /// return `None`).
-    fn truncate_goal(&mut self, subgoal: &I::GoalInEnvironment) -> Option<I::GoalInEnvironment>;
-
-    /// If `subst` is too large, return a truncated variant (else
-    /// return `None`).
-    fn truncate_answer(&mut self, subst: &I::Substitution) -> Option<I::Substitution>;
-}
-
-pub trait ResolventOps<C: Context, I: Context> {
-    /// Combines the `goal` (instantiated within `infer`) with the
-    /// given program clause to yield the start of a new strand (a
-    /// canonical ex-clause).
-    ///
-    /// The bindings in `infer` are unaffected by this operation.
-    fn resolvent_clause(
-        &mut self,
-        environment: &I::Environment,
-        goal: &I::DomainGoal,
-        subst: &I::Substitution,
-        clause: &I::ProgramClause,
-    ) -> Fallible<C::CanonicalExClause>;
-
-    fn apply_answer_subst(
-        &mut self,
-        ex_clause: ExClause<I>,
-        selected_goal: &I::GoalInEnvironment,
-        answer_table_goal: &C::CanonicalGoalInEnvironment,
-        canonical_answer_subst: &C::CanonicalConstrainedSubst,
-    ) -> Fallible<ExClause<I>>;
-}
-
-pub trait AnswerStream<C: Context> {
-    fn peek_answer(&mut self) -> Option<SimplifiedAnswer<C>>;
-    fn next_answer(&mut self) -> Option<SimplifiedAnswer<C>>;
-
-    /// Invokes `test` with each possible future answer, returning true immediately
-    /// if we find any answer for which `test` returns true.
-    fn any_future_answer(&mut self, test: impl FnMut(&C::InferenceNormalizedSubst) -> bool)
-        -> bool;
-}
diff --git a/vendor/chalk-engine/src/context/prelude.rs b/vendor/chalk-engine/src/context/prelude.rs
deleted file mode 100644
index 4cb85c4717..0000000000
--- a/vendor/chalk-engine/src/context/prelude.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-#![allow(unused_imports)] // rustc bug
-
-pub(crate) use super::Context;
-pub(crate) use super::ContextOps;
-pub(crate) use super::AggregateOps;
-pub(crate) use super::ResolventOps;
-pub(crate) use super::TruncateOps;
-pub(crate) use super::InferenceTable;
diff --git a/vendor/chalk-engine/src/derived.rs b/vendor/chalk-engine/src/derived.rs
deleted file mode 100644
index 37b95ad190..0000000000
--- a/vendor/chalk-engine/src/derived.rs
+++ /dev/null
@@ -1,92 +0,0 @@
-// These impls for PartialEq, Eq, etc are written by hand. This is
-// because the `#[derive()]` would add requirements onto the context
-// object that are not needed.
-
-use std::cmp::{PartialEq, Eq};
-use std::hash::{Hash, Hasher};
-use std::mem;
-use super::*;
-
-impl<C: Context> PartialEq for DelayedLiteralSet<C> {
-    fn eq(&self, other: &Self) -> bool {
-        let DelayedLiteralSet { delayed_literals: a1 } = self;
-        let DelayedLiteralSet { delayed_literals: a2 } = other;
-        a1 == a2
-    }
-}
-
-impl<C: Context> Eq for DelayedLiteralSet<C> {
-}
-
-///////////////////////////////////////////////////////////////////////////
-
-impl<C: Context> PartialEq for DelayedLiteral<C> {
-    fn eq(&self, other: &Self) -> bool {
-        if mem::discriminant(self) != mem::discriminant(other) {
-            return false;
-        }
-
-        match (self, other) {
-            (DelayedLiteral::CannotProve(()), DelayedLiteral::CannotProve(())) =>
-                true,
-
-            (DelayedLiteral::Negative(a1), DelayedLiteral::Negative(a2)) =>
-                a1 == a2,
-
-            (DelayedLiteral::Positive(a1, b1), DelayedLiteral::Positive(a2, b2)) =>
-                a1 == a2 && b1 == b2,
-
-            _ => panic!()
-        }
-    }
-}
-
-impl<C: Context> Eq for DelayedLiteral<C> {
-}
-
-impl<C: Context> Hash for DelayedLiteral<C> {
-    fn hash<H: Hasher>(&self, hasher: &mut H) {
-        mem::discriminant(self).hash(hasher);
-
-        match self {
-            DelayedLiteral::CannotProve(()) => (),
-
-            DelayedLiteral::Negative(a) => {
-                a.hash(hasher);
-            }
-
-            DelayedLiteral::Positive(a, b) => {
-                a.hash(hasher);
-                b.hash(hasher);
-            }
-        }
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////
-
-impl<C: Context> PartialEq for Literal<C> {
-    fn eq(&self, other: &Literal<C>) -> bool {
-        match (self, other) {
-            (Literal::Positive(goal1), Literal::Positive(goal2))
-            | (Literal::Negative(goal1), Literal::Negative(goal2)) => goal1 == goal2,
-
-            _ => false,
-        }
-    }
-}
-
-impl<C: Context> Eq for Literal<C> {
-}
-
-impl<C: Context> Hash for Literal<C> {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        mem::discriminant(self).hash(state);
-        match self {
-            Literal::Positive(goal) | Literal::Negative(goal) => {
-                goal.hash(state);
-            }
-        }
-    }
-}
-
diff --git a/vendor/chalk-engine/src/fallible.rs b/vendor/chalk-engine/src/fallible.rs
deleted file mode 100644
index b54a7af266..0000000000
--- a/vendor/chalk-engine/src/fallible.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-/// Many of our internal operations (e.g., unification) are an attempt
-/// to perform some operation which may not complete.
-pub type Fallible<T> = Result<T, NoSolution>;
-
-/// Indicates that the attempted operation has "no solution" -- i.e.,
-/// cannot be performed.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct NoSolution;
diff --git a/vendor/chalk-engine/src/forest.rs b/vendor/chalk-engine/src/forest.rs
deleted file mode 100644
index 83daebc043..0000000000
--- a/vendor/chalk-engine/src/forest.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use {DepthFirstNumber, SimplifiedAnswer, TableIndex};
-use context::prelude::*;
-use context::AnswerStream;
-use logic::RootSearchFail;
-use stack::{Stack, StackIndex};
-use tables::Tables;
-use table::{Answer, AnswerIndex};
-
-pub struct Forest<C: Context, CO: ContextOps<C>> {
-    #[allow(dead_code)]
-    pub(crate) context: CO,
-    pub(crate) tables: Tables<C>,
-    pub(crate) stack: Stack,
-
-    dfn: DepthFirstNumber,
-}
-
-impl<C: Context, CO: ContextOps<C>> Forest<C, CO> {
-    pub fn new(context: CO) -> Self {
-        Forest {
-            context,
-            tables: Tables::new(),
-            stack: Stack::default(),
-            dfn: DepthFirstNumber::MIN,
-        }
-    }
-
-    // Gets the next depth-first number. This number never decreases.
-    pub(super) fn next_dfn(&mut self) -> DepthFirstNumber {
-        self.dfn.next()
-    }
-
-    /// Finds the first N answers, looping as much as needed to get
-    /// them.
-    ///
-    /// Thanks to subgoal abstraction and so forth, this should always
-    /// terminate.
-    pub fn force_answers(
-        &mut self,
-        goal: C::UCanonicalGoalInEnvironment,
-        num_answers: usize,
-    ) -> Vec<Answer<C>> {
-        let table = self.get_or_create_table_for_ucanonical_goal(goal);
-        let mut answers = Vec::with_capacity(num_answers);
-        for i in 0..num_answers {
-            let i = AnswerIndex::from(i);
-            loop {
-                match self.ensure_root_answer(table, i) {
-                    Ok(()) => break,
-                    Err(RootSearchFail::QuantumExceeded) => continue,
-                    Err(RootSearchFail::NoMoreSolutions) => return answers,
-                }
-            }
-
-            answers.push(self.answer(table, i).clone());
-        }
-
-        answers
-    }
-
-    /// Returns a "solver" for a given goal in the form of an
-    /// iterator. Each time you invoke `next`, it will do the work to
-    /// extract one more answer. These answers are cached in between
-    /// invocations. Invoking `next` fewer times is preferable =)
-    fn iter_answers<'f>(
-        &'f mut self,
-        goal: &C::UCanonicalGoalInEnvironment,
-    ) -> impl AnswerStream<C> + 'f {
-        let table = self.get_or_create_table_for_ucanonical_goal(goal.clone());
-        let answer = AnswerIndex::ZERO;
-        ForestSolver {
-            forest: self,
-            table,
-            answer,
-        }
-    }
-
-    /// Solves a given goal, producing the solution. This will do only
-    /// as much work towards `goal` as it has to (and that works is
-    /// cached for future attempts).
-    pub fn solve(&mut self, goal: &C::UCanonicalGoalInEnvironment) -> Option<C::Solution> {
-        self.context.clone().make_solution(CO::canonical(&goal), self.iter_answers(goal))
-    }
-
-    /// True if all the tables on the stack starting from `depth` and
-    /// continuing until the top of the stack are coinductive.
-    ///
-    /// Example: Given a program like:
-    ///
-    /// ```
-    /// struct Foo { a: Option<Box<Bar>> }
-    /// struct Bar { a: Option<Box<Foo>> }
-    /// trait XXX { }
-    /// impl<T: Send> XXX for T { }
-    /// ```
-    ///
-    /// and then a goal of `Foo: XXX`, we would eventually wind up
-    /// with a stack like this:
-    ///
-    /// | StackIndex | Table Goal  |
-    /// | ---------- | ----------- |
-    /// | 0          | `Foo: XXX`  |
-    /// | 1          | `Foo: Send` |
-    /// | 2          | `Bar: Send` |
-    ///
-    /// Here, the top of the stack is `Bar: Send`. And now we are
-    /// asking `top_of_stack_is_coinductive_from(1)` -- the answer
-    /// would be true, since `Send` is an auto trait, which yields a
-    /// coinductive goal. But `top_of_stack_is_coinductive_from(0)` is
-    /// false, since `XXX` is not an auto trait.
-    pub(super) fn top_of_stack_is_coinductive_from(&self, depth: StackIndex) -> bool {
-        self.stack.top_of_stack_from(depth).all(|d| {
-            let table = self.stack[d].table;
-            self.tables[table].coinductive_goal
-        })
-    }
-
-    /// Useful for testing.
-    pub fn num_cached_answers_for_goal(&mut self, goal: &C::UCanonicalGoalInEnvironment) -> usize {
-        let table = self.get_or_create_table_for_ucanonical_goal(goal.clone());
-        self.tables[table].num_cached_answers()
-    }
-}
-
-struct ForestSolver<'forest, C: Context + 'forest, CO: ContextOps<C> + 'forest> {
-    forest: &'forest mut Forest<C, CO>,
-    table: TableIndex,
-    answer: AnswerIndex,
-}
-
-impl<'forest, C, CO: ContextOps<C>> AnswerStream<C> for ForestSolver<'forest, C, CO>
-where
-    C: Context,
-{
-    fn peek_answer(&mut self) -> Option<SimplifiedAnswer<C>> {
-        loop {
-            match self.forest.ensure_root_answer(self.table, self.answer) {
-                Ok(()) => {
-                    let answer = self.forest.answer(self.table, self.answer);
-
-                    // FIXME(rust-lang-nursery/chalk#79) -- if answer
-                    // has delayed literals, we *should* try to
-                    // simplify here (which might involve forcing
-                    // `table` and its dependencies to completion. But
-                    // instead we'll err on the side of ambiguity for
-                    // now. This will sometimes lose us completeness
-                    // around negative reasoning (we'll give ambig
-                    // when we could have given a concrete yes/no
-                    // answer).
-
-                    let simplified_answer = SimplifiedAnswer {
-                        subst: answer.subst.clone(),
-                        ambiguous: !answer.delayed_literals.is_empty(),
-                    };
-
-                    return Some(simplified_answer);
-                }
-
-                Err(RootSearchFail::NoMoreSolutions) => {
-                    return None;
-                }
-
-                Err(RootSearchFail::QuantumExceeded) => {}
-            }
-        }
-    }
-
-    fn next_answer(&mut self) -> Option<SimplifiedAnswer<C>> {
-        self.peek_answer().map(|answer| {
-            self.answer.increment();
-            answer
-        })
-    }
-
-    fn any_future_answer(
-        &mut self,
-        test: impl FnMut(&C::InferenceNormalizedSubst) -> bool,
-    ) -> bool {
-        self.forest.any_future_answer(self.table, self.answer, test)
-    }
-}
diff --git a/vendor/chalk-engine/src/hh.rs b/vendor/chalk-engine/src/hh.rs
deleted file mode 100644
index 156addbcb1..0000000000
--- a/vendor/chalk-engine/src/hh.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-use context::Context;
-
-#[derive(Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-/// A general goal; this is the full range of questions you can pose to Chalk.
-pub enum HhGoal<C: Context> {
-    /// Introduces a binding at depth 0, shifting other bindings up
-    /// (deBruijn index).
-    ForAll(C::BindersGoal),
-    Exists(C::BindersGoal),
-    Implies(C::ProgramClauses, C::Goal),
-    And(C::Goal, C::Goal),
-    Not(C::Goal),
-    Unify(C::Variance, C::Parameter, C::Parameter),
-    DomainGoal(C::DomainGoal),
-
-    /// Indicates something that cannot be proven to be true or false
-    /// definitively. This can occur with overflow but also with
-    /// unifications of placeholder variables like `forall<X,Y> { X = Y
-    /// }`. Of course, that statement is false, as there exist types
-    /// X, Y where `X = Y` is not true. But we treat it as "cannot
-    /// prove" so that `forall<X,Y> { not { X = Y } }` also winds up
-    /// as cannot prove.
-    CannotProve,
-}
-
diff --git a/vendor/chalk-engine/src/lib.rs b/vendor/chalk-engine/src/lib.rs
deleted file mode 100644
index f2952ad587..0000000000
--- a/vendor/chalk-engine/src/lib.rs
+++ /dev/null
@@ -1,334 +0,0 @@
-//! An alternative solver based around the SLG algorithm, which
-//! implements the well-formed semantics. This algorithm is very
-//! closed based on the description found in the following paper,
-//! which I will refer to in the comments as EWFS:
-//!
-//! > Efficient Top-Down Computation of Queries Under the Well-formed Semantics
-//! > (Chen, Swift, and Warren; Journal of Logic Programming '95)
-//!
-//! However, to understand that paper, I would recommend first
-//! starting with the following paper, which I will refer to in the
-//! comments as NFTD:
-//!
-//! > A New Formulation of Tabled resolution With Delay
-//! > (Swift; EPIA '99)
-//!
-//! In addition, I incorporated extensions from the following papers,
-//! which I will refer to as SA and RR respectively, that
-//! describes how to do introduce approximation when processing
-//! subgoals and so forth:
-//!
-//! > Terminating Evaluation of Logic Programs with Finite Three-Valued Models
-//! > Riguzzi and Swift; ACM Transactions on Computational Logic 2013
-//! > (Introduces "subgoal abstraction", hence the name SA)
-//! >
-//! > Radial Restraint
-//! > Grosof and Swift; 2013
-//!
-//! Another useful paper that gives a kind of high-level overview of
-//! concepts at play is the following, which I will refer to as XSB:
-//!
-//! > XSB: Extending Prolog with Tabled Logic Programming
-//! > (Swift and Warren; Theory and Practice of Logic Programming '10)
-//!
-//! While this code is adapted from the algorithms described in those
-//! papers, it is not the same. For one thing, the approaches there
-//! had to be extended to our context, and in particular to coping
-//! with hereditary harrop predicates and our version of unification
-//! (which produces subgoals). I believe those to be largely faithful
-//! extensions. However, there are some other places where I
-//! intentionally dieverged from the semantics as described in the
-//! papers -- e.g. by more aggressively approximating -- which I
-//! marked them with a comment DIVERGENCE. Those places may want to be
-//! evaluated in the future.
-//!
-//! Glossary of other terms:
-//!
-//! - WAM: Warren abstract machine, an efficient way to evaluate Prolog programs.
-//!   See <http://wambook.sourceforge.net/>.
-//! - HH: Hereditary harrop predicates. What Chalk deals in.
-//!   Popularized by Lambda Prolog.
-
-#![feature(in_band_lifetimes)]
-#![feature(step_trait)]
-#![feature(non_modrs_mods)]
-
-#[macro_use]
-extern crate chalk_macros;
-
-#[cfg(feature = "stack_protection")]
-extern crate stacker;
-
-extern crate rustc_hash;
-
-use context::Context;
-use rustc_hash::FxHashSet;
-use std::cmp::min;
-use std::usize;
-
-pub mod context;
-mod derived;
-pub mod fallible;
-pub mod forest;
-pub mod hh;
-mod logic;
-mod simplify;
-mod stack;
-mod strand;
-mod table;
-mod tables;
-
-index_struct! {
-    pub struct TableIndex { // FIXME: pub b/c Fold
-        value: usize,
-    }
-}
-
-/// The StackIndex identifies the position of a table's goal in the
-/// stack of goals that are actively being processed. Note that once a
-/// table is completely evaluated, it may be popped from the stack,
-/// and hence no longer have a stack index.
-index_struct! {
-    struct StackIndex {
-        value: usize,
-    }
-}
-
-/// The `DepthFirstNumber` (DFN) is a sequential number assigned to
-/// each goal when it is first encountered. The naming (taken from
-/// EWFS) refers to the idea that this number tracks the index of when
-/// we encounter the goal during a depth-first traversal of the proof
-/// tree.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
-struct DepthFirstNumber {
-    value: u64,
-}
-
-/// The paper describes these as `A :- D | G`.
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-pub struct ExClause<C: Context> {
-    /// The substitution which, applied to the goal of our table,
-    /// would yield A.
-    pub subst: C::Substitution,
-
-    /// Delayed literals: things that we depend on negatively,
-    /// but which have not yet been fully evaluated.
-    pub delayed_literals: Vec<DelayedLiteral<C>>,
-
-    /// Region constraints we have accumulated.
-    pub constraints: Vec<C::RegionConstraint>,
-
-    /// Subgoals: literals that must be proven
-    pub subgoals: Vec<Literal<C>>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Hash)]
-struct SimplifiedAnswers<C: Context> {
-    answers: Vec<SimplifiedAnswer<C>>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct SimplifiedAnswer<C: Context> {
-    /// A fully instantiated version of the goal for which the query
-    /// is true (including region constraints).
-    pub subst: C::CanonicalConstrainedSubst,
-
-    /// If this flag is set, then the answer could be neither proven
-    /// nor disproven. In general, the existence of a non-empty set of
-    /// delayed literals simply means the answer's status is UNKNOWN,
-    /// either because the size of the answer exceeded `max_size` or
-    /// because of a negative loop (e.g., `P :- not { P }`).
-    pub ambiguous: bool,
-}
-
-#[derive(Debug)]
-struct DelayedLiteralSets<C: Context>(InnerDelayedLiteralSets<C>);
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-enum InnerDelayedLiteralSets<C: Context> {
-    /// Corresponds to a single, empty set.
-    None,
-
-    /// Some (non-zero) number of non-empty sets.
-    /// Must be a set of sets, but HashSets are not Hash so we manually ensure uniqueness.
-    Some(Vec<DelayedLiteralSet<C>>),
-}
-
-/// A set of delayed literals.
-///
-/// (One might expect delayed literals to always be ground, since
-/// non-ground negative literals result in flounded
-/// executions. However, due to the approximations introduced via RR
-/// to ensure termination, it *is* in fact possible for delayed goals
-/// to contain free variables. For example, what could happen is that
-/// we get back an approximated answer with `Goal::CannotProve` as a
-/// delayed literal, which in turn forces its subgoal to be delayed,
-/// and so forth. Therefore, we store canonicalized goals.)
-#[derive(Clone, Debug, Default)]
-struct DelayedLiteralSet<C: Context> {
-    delayed_literals: FxHashSet<DelayedLiteral<C>>,
-}
-
-#[derive(Clone, Debug)]
-pub enum DelayedLiteral<C: Context> {
-    /// Something which can never be proven nor disproven. Inserted
-    /// when truncation triggers; doesn't arise normally.
-    CannotProve(()),
-
-    /// We are blocked on a negative literal `~G`, where `G` is the
-    /// goal of the given table. Because negative goals must always be
-    /// ground, we don't need any other information.
-    Negative(TableIndex),
-
-    /// We are blocked on a positive literal `Li`; we found a
-    /// **conditional** answer (the `CanonicalConstrainedSubst`) within the
-    /// given table, but we have to come back later and see whether
-    /// that answer turns out to be true.
-    Positive(TableIndex, C::CanonicalConstrainedSubst),
-}
-
-/// Either `A` or `~A`, where `A` is a `Env |- Goal`.
-#[derive(Clone, Debug)]
-pub enum Literal<C: Context> { // FIXME: pub b/c fold
-    Positive(C::GoalInEnvironment),
-    Negative(C::GoalInEnvironment),
-}
-
-/// The `Minimums` structure is used to track the dependencies between
-/// some item E on the evaluation stack. In particular, it tracks
-/// cases where the success of E depends (or may depend) on items
-/// deeper in the stack than E (i.e., with lower DFNs).
-///
-/// `positive` tracks the lowest index on the stack to which we had a
-/// POSITIVE dependency (e.g. `foo(X) :- bar(X)`) -- meaning that in
-/// order for E to succeed, the dependency must succeed. It is
-/// initialized with the index of the predicate on the stack. So
-/// imagine we have a stack like this:
-///
-///     // 0 foo(X)   <-- bottom of stack
-///     // 1 bar(X)
-///     // 2 baz(X)   <-- top of stack
-///
-/// In this case, `positive` would be initially 0, 1, and 2 for `foo`,
-/// `bar`, and `baz` respectively. This reflects the fact that the
-/// answers for `foo(X)` depend on the answers for `foo(X)`. =)
-///
-/// Now imagine that we had a clause `baz(X) :- foo(X)`, inducing a
-/// cycle. In this case, we would update `positive` for `baz(X)` to be
-/// 0, reflecting the fact that its answers depend on the answers for
-/// `foo(X)`. Similarly, the minimum for `bar` would (eventually) be
-/// updated, since it too transitively depends on `foo`. `foo` is
-/// unaffected.
-///
-/// `negative` tracks the lowest index on the stack to which we had a
-/// NEGATIVE dependency (e.g., `foo(X) :- not { bar(X) }`) -- meaning
-/// that for E to succeed, the dependency must fail. This is initially
-/// `usize::MAX`, reflecting the fact that the answers for `foo(X)` do
-/// not depend on `not(foo(X))`. When negative cycles are encountered,
-/// however, this value must be updated.
-#[derive(Copy, Clone, Debug)]
-struct Minimums {
-    positive: DepthFirstNumber,
-    negative: DepthFirstNumber,
-}
-
-impl<C: Context> DelayedLiteralSets<C> {
-    fn singleton(set: DelayedLiteralSet<C>) -> Self {
-        if set.is_empty() {
-            DelayedLiteralSets(InnerDelayedLiteralSets::None)
-        } else {
-            DelayedLiteralSets(InnerDelayedLiteralSets::Some(vec![set]))
-        }
-    }
-
-    /// Inserts the set if it is minimal in the family.
-    /// Returns true iff the set was inserted.
-    fn insert_if_minimal(&mut self, set: &DelayedLiteralSet<C>) -> bool {
-        match self.0 {
-            // The empty set is always minimal.
-            InnerDelayedLiteralSets::None => false,
-            // Are we inserting an empty set?
-            InnerDelayedLiteralSets::Some(_) if set.is_empty() => {
-                self.0 = InnerDelayedLiteralSets::None;
-                true
-            }
-            InnerDelayedLiteralSets::Some(ref mut sets) => {
-                // Look for a subset.
-                if sets.iter().any(|set| set.is_subset(&set)) {
-                    false
-                } else {
-                    // No subset therefore `set` is minimal, discard supersets and insert.
-                    sets.retain(|set| !set.is_subset(set));
-                    sets.push(set.clone());
-                    true
-                }
-            }
-        }
-    }
-}
-
-impl<C: Context> DelayedLiteralSet<C> {
-    fn is_empty(&self) -> bool {
-        self.delayed_literals.is_empty()
-    }
-
-    fn is_subset(&self, other: &DelayedLiteralSet<C>) -> bool {
-        self.delayed_literals
-            .iter()
-            .all(|elem| other.delayed_literals.contains(elem))
-    }
-}
-
-impl Minimums {
-    const MAX: Minimums = Minimums {
-        positive: DepthFirstNumber::MAX,
-        negative: DepthFirstNumber::MAX,
-    };
-
-    /// Update our fields to be the minimum of our current value
-    /// and the values from other.
-    fn take_minimums(&mut self, other: &Minimums) {
-        self.positive = min(self.positive, other.positive);
-        self.negative = min(self.negative, other.negative);
-    }
-
-    fn minimum_of_pos_and_neg(&self) -> DepthFirstNumber {
-        min(self.positive, self.negative)
-    }
-}
-
-impl DepthFirstNumber {
-    const MIN: DepthFirstNumber = DepthFirstNumber { value: 0 };
-    const MAX: DepthFirstNumber = DepthFirstNumber {
-        value: ::std::u64::MAX,
-    };
-
-    fn next(&mut self) -> DepthFirstNumber {
-        let value = self.value;
-        assert!(value < ::std::u64::MAX);
-        self.value += 1;
-        DepthFirstNumber { value }
-    }
-}
-
-/// Because we recurse so deeply, we rely on stacker to
-/// avoid overflowing the stack.
-#[cfg(feature = "stack_protection")]
-fn maybe_grow_stack<F, R>(op: F) -> R
-where
-    F: FnOnce() -> R,
-{
-    // These numbers are somewhat randomly chosen to make tests work
-    // well enough on my system. In particular, because we only test
-    // for growing the stack in `new_clause`, a red zone of 32K was
-    // insufficient to prevent stack overflow. - nikomatsakis
-    stacker::maybe_grow(256 * 1024, 2 * 1024 * 1024, op)
-}
-
-#[cfg(not(feature = "stack_protection"))]
-fn maybe_grow_stack<F, R>(op: F) -> R
-where
-    F: FnOnce() -> R,
-{
-    op()
-}
diff --git a/vendor/chalk-engine/src/logic.rs b/vendor/chalk-engine/src/logic.rs
deleted file mode 100644
index 8117424db9..0000000000
--- a/vendor/chalk-engine/src/logic.rs
+++ /dev/null
@@ -1,1341 +0,0 @@
-use {DelayedLiteral, DelayedLiteralSet, DepthFirstNumber, ExClause, Literal, Minimums,
-            TableIndex};
-use fallible::NoSolution;
-use context::{WithInstantiatedExClause, WithInstantiatedUCanonicalGoal, prelude::*};
-use forest::Forest;
-use hh::HhGoal;
-use stack::StackIndex;
-use strand::{CanonicalStrand, SelectedSubgoal, Strand};
-use table::{Answer, AnswerIndex};
-use rustc_hash::FxHashSet;
-use std::marker::PhantomData;
-use std::mem;
-
-type RootSearchResult<T> = Result<T, RootSearchFail>;
-
-/// The different ways that a *root* search (which potentially pursues
-/// many strands) can fail. A root search is one that begins with an
-/// empty stack.
-///
-/// (This is different from `RecursiveSearchFail` because nothing can
-/// be on the stack, so cycles are ruled out.)
-#[derive(Debug)]
-pub(super) enum RootSearchFail {
-    /// The subgoal we were trying to solve cannot succeed.
-    NoMoreSolutions,
-
-    /// We did not find a solution, but we still have things to try.
-    /// Repeat the request, and we'll give one of those a spin.
-    ///
-    /// (In a purely depth-first-based solver, like Prolog, this
-    /// doesn't appear.)
-    QuantumExceeded,
-}
-
-type RecursiveSearchResult<T> = Result<T, RecursiveSearchFail>;
-
-/// The different ways that a recursive search (which potentially
-/// pursues many strands) can fail -- a "recursive" search is one that
-/// did not start with an empty stack.
-#[derive(Debug)]
-enum RecursiveSearchFail {
-    /// The subgoal we were trying to solve cannot succeed.
-    NoMoreSolutions,
-
-    /// **All** avenues to solve the subgoal we were trying solve
-    /// encountered a cyclic dependency on something higher up in the
-    /// stack. The `Minimums` encodes how high up (and whether
-    /// positive or negative).
-    Cycle(Minimums),
-
-    /// We did not find a solution, but we still have things to try.
-    /// Repeat the request, and we'll give one of those a spin.
-    ///
-    /// (In a purely depth-first-based solver, like Prolog, this
-    /// doesn't appear.)
-    QuantumExceeded,
-}
-
-#[allow(type_alias_bounds)]
-type StrandResult<C: Context, T> = Result<T, StrandFail<C>>;
-
-/// Possible failures from pursuing a particular strand.
-#[derive(Debug)]
-pub(super) enum StrandFail<C: Context> {
-    /// The strand has no solution.
-    NoSolution,
-
-    /// We did not yet figure out a solution; the strand will have
-    /// been rescheduled for later.
-    QuantumExceeded,
-
-    /// The strand hit a cyclic dependency. In this case,
-    /// we return the strand, as well as a `Minimums` struct.
-    Cycle(CanonicalStrand<C>, Minimums),
-}
-
-#[derive(Debug)]
-enum EnsureSuccess {
-    AnswerAvailable,
-    Coinductive,
-}
-
-impl<C: Context, CO: ContextOps<C>> Forest<C, CO> {
-    /// Ensures that answer with the given index is available from the
-    /// given table. This may require activating a strand. Returns
-    /// `Ok(())` if the answer is available and otherwise a
-    /// `RootSearchFail` result.
-    pub(super) fn ensure_root_answer(
-        &mut self,
-        table: TableIndex,
-        answer: AnswerIndex,
-    ) -> RootSearchResult<()> {
-        assert!(self.stack.is_empty());
-
-        match self.ensure_answer_recursively(table, answer) {
-            Ok(EnsureSuccess::AnswerAvailable) => Ok(()),
-            Err(RecursiveSearchFail::NoMoreSolutions) => Err(RootSearchFail::NoMoreSolutions),
-            Err(RecursiveSearchFail::QuantumExceeded) => Err(RootSearchFail::QuantumExceeded),
-
-            // Things involving cycles should be impossible since our
-            // stack was empty on entry:
-            Ok(EnsureSuccess::Coinductive) | Err(RecursiveSearchFail::Cycle(..)) => {
-                panic!("ensure_root_answer: nothing on the stack but cyclic result")
-            }
-        }
-    }
-
-    pub(super) fn any_future_answer(
-        &mut self,
-        table: TableIndex,
-        answer: AnswerIndex,
-        mut test: impl FnMut(&C::InferenceNormalizedSubst) -> bool,
-    ) -> bool {
-        if let Some(answer) = self.tables[table].answer(answer) {
-            info!("answer cached = {:?}", answer);
-            return test(CO::inference_normalized_subst_from_subst(&answer.subst));
-        }
-
-        self.tables[table].strands_mut().any(|strand| {
-            test(CO::inference_normalized_subst_from_ex_clause(&strand.canonical_ex_clause))
-        })
-    }
-
-    /// Ensures that answer with the given index is available from the
-    /// given table. Returns `Ok` if there is an answer:
-    ///
-    /// - `EnsureSuccess::AnswerAvailable` means that the answer is
-    ///   cached in the table (and can be fetched with e.g. `self.answer()`).
-    /// - `EnsureSuccess::Coinductive` means that this was a cyclic
-    ///   request of a coinductive goal and is thus considered true;
-    ///   in this case, the answer is not cached in the table (it is
-    ///   only true in this cyclic context).
-    ///
-    /// This function first attempts to fetch answer that is cached in
-    /// the table. If none is found, then we will if the table is on
-    /// the stack; if so, that constitutes a cycle (producing a new
-    /// result for the table X required producing a new result for the
-    /// table X), and we return a suitable result. Otherwise, we can
-    /// push the table onto the stack and select the next available
-    /// strand -- if none are available, then no more answers are
-    /// possible.
-    fn ensure_answer_recursively(
-        &mut self,
-        table: TableIndex,
-        answer: AnswerIndex,
-    ) -> RecursiveSearchResult<EnsureSuccess> {
-        info_heading!(
-            "ensure_answer_recursively(table={:?}, answer={:?})",
-            table,
-            answer
-        );
-        info!("table goal = {:#?}", self.tables[table].table_goal);
-
-        // First, check for a tabled answer.
-        if self.tables[table].answer(answer).is_some() {
-            info!("answer cached = {:?}", self.tables[table].answer(answer));
-            return Ok(EnsureSuccess::AnswerAvailable);
-        }
-
-        // If no tabled answer is present, we ought to be requesting
-        // the next available index.
-        assert_eq!(self.tables[table].next_answer_index(), answer);
-
-        // Next, check if the table is already active. If so, then we
-        // have a recursive attempt.
-        if let Some(depth) = self.stack.is_active(table) {
-            info!("ensure_answer: cycle detected at depth {:?}", depth);
-
-            if self.top_of_stack_is_coinductive_from(depth) {
-                return Ok(EnsureSuccess::Coinductive);
-            }
-
-            return Err(RecursiveSearchFail::Cycle(Minimums {
-                positive: self.stack[depth].dfn,
-                negative: DepthFirstNumber::MAX,
-            }));
-        }
-
-        let dfn = self.next_dfn();
-        let depth = self.stack.push(table, dfn);
-        let result = self.pursue_next_strand(depth);
-        self.stack.pop(table, depth);
-        info!("ensure_answer: result = {:?}", result);
-        result.map(|()| EnsureSuccess::AnswerAvailable)
-    }
-
-    pub(crate) fn answer(&self, table: TableIndex, answer: AnswerIndex) -> &Answer<C> {
-        self.tables[table].answer(answer).unwrap()
-    }
-
-    /// Selects the next eligible strand from the table at depth
-    /// `depth` and pursues it. If that strand encounters a cycle,
-    /// then this function will loop and keep trying strands until it
-    /// reaches one that did not encounter a cycle; that result is
-    /// propagated.  If all strands return a cycle, then the entire
-    /// subtree is "completed" by invoking `cycle`.
-    fn pursue_next_strand(&mut self, depth: StackIndex) -> RecursiveSearchResult<()> {
-        // This is a bit complicated because this is where we handle cycles.
-        let table = self.stack[depth].table;
-
-        // Strands that encountered a cyclic error.
-        let mut cyclic_strands = vec![];
-
-        // The minimum of all cyclic strands.
-        let mut cyclic_minimums = Minimums::MAX;
-
-        loop {
-            match self.tables[table].pop_next_strand() {
-                Some(canonical_strand) => {
-                    let num_universes = CO::num_universes(&self.tables[table].table_goal);
-                    let result = Self::with_instantiated_strand(
-                        self.context.clone(),
-                        num_universes,
-                        &canonical_strand,
-                        PursueStrand {
-                            forest: self,
-                            depth,
-                        },
-                    );
-                    match result {
-                        Ok(answer) => {
-                            // Now that we produced an answer, these
-                            // cyclic strands need to be retried.
-                            self.tables[table].extend_strands(cyclic_strands);
-                            return Ok(answer);
-                        }
-
-                        Err(StrandFail::NoSolution) | Err(StrandFail::QuantumExceeded) => {
-                            // This strand did not produce an answer,
-                            // but either it (or some other, pending
-                            // strands) may do so in the
-                            // future. Enqueue the cyclic strands to
-                            // be retried after that point.
-                            self.tables[table].extend_strands(cyclic_strands);
-                            return Err(RecursiveSearchFail::QuantumExceeded);
-                        }
-
-                        Err(StrandFail::Cycle(canonical_strand, strand_minimums)) => {
-                            // This strand encountered a cycle. Stash
-                            // it for later and try the next one until
-                            // we know that *all* available strands
-                            // are hitting a cycle.
-                            cyclic_strands.push(canonical_strand);
-                            cyclic_minimums.take_minimums(&strand_minimums);
-                        }
-                    }
-                }
-
-                None => {
-                    // No more strands left to try! That means either we started
-                    // with no strands, or all available strands encountered a cycle.
-
-                    if cyclic_strands.is_empty() {
-                        // We started with no strands!
-                        return Err(RecursiveSearchFail::NoMoreSolutions);
-                    } else {
-                        let c = mem::replace(&mut cyclic_strands, vec![]);
-                        if let Some(err) = self.cycle(depth, c, cyclic_minimums) {
-                            return Err(err);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fn with_instantiated_strand<R>(
-        context: CO,
-        num_universes: usize,
-        canonical_strand: &CanonicalStrand<C>,
-        op: impl WithInstantiatedStrand<C, CO, Output = R>,
-    ) -> R {
-        let CanonicalStrand {
-            canonical_ex_clause,
-            selected_subgoal,
-        } = canonical_strand;
-        return context.instantiate_ex_clause(
-            num_universes,
-            &canonical_ex_clause,
-            With {
-                op,
-                selected_subgoal: selected_subgoal.clone(),
-                ops: PhantomData,
-            },
-        );
-
-        struct With<C: Context, CO: ContextOps<C>, OP: WithInstantiatedStrand<C, CO>> {
-            op: OP,
-            selected_subgoal: Option<SelectedSubgoal<C>>,
-            ops: PhantomData<CO>,
-        }
-
-        impl<C: Context, CO: ContextOps<C>, OP: WithInstantiatedStrand<C, CO>>
-            WithInstantiatedExClause<C> for With<C, CO, OP> {
-            type Output = OP::Output;
-
-            fn with<I: Context>(
-                self,
-                infer: &mut dyn InferenceTable<C, I>,
-                ex_clause: ExClause<I>,
-            ) -> OP::Output {
-                self.op.with(Strand {
-                    infer,
-                    ex_clause,
-                    selected_subgoal: self.selected_subgoal.clone(),
-                })
-            }
-        }
-    }
-
-    fn canonicalize_strand(strand: Strand<'_, C, impl Context>) -> CanonicalStrand<C> {
-        let Strand {
-            infer,
-            ex_clause,
-            selected_subgoal,
-        } = strand;
-        Self::canonicalize_strand_from(&mut *infer, &ex_clause, selected_subgoal)
-    }
-
-    fn canonicalize_strand_from<I: Context>(
-        infer: &mut dyn InferenceTable<C, I>,
-        ex_clause: &ExClause<I>,
-        selected_subgoal: Option<SelectedSubgoal<C>>,
-    ) -> CanonicalStrand<C> {
-        let canonical_ex_clause = infer.canonicalize_ex_clause(&ex_clause);
-        CanonicalStrand {
-            canonical_ex_clause,
-            selected_subgoal,
-        }
-    }
-
-    /// Invoked when all available strands for a table have
-    /// encountered a cycle. In this case, the vector `strands` are
-    /// the set of strands that encountered cycles, and `minimums` is
-    /// the minimum stack depths that they were dependent on.
-    ///
-    /// Returns `None` if we have resolved the cycle and should try to
-    /// pick a strand again. Returns `Some(_)` if the cycle indicates
-    /// an error that we can propagate higher up.
-    fn cycle(
-        &mut self,
-        depth: StackIndex,
-        strands: Vec<CanonicalStrand<C>>,
-        minimums: Minimums,
-    ) -> Option<RecursiveSearchFail> {
-        let table = self.stack[depth].table;
-        assert!(self.tables[table].pop_next_strand().is_none());
-
-        let dfn = self.stack[depth].dfn;
-        if minimums.positive == dfn && minimums.negative == DepthFirstNumber::MAX {
-            // If all the things that we recursively depend on have
-            // positive dependencies on things below us in the stack,
-            // then no more answers are forthcoming. We can clear all
-            // the strands for those things recursively.
-            self.clear_strands_after_cycle(table, strands);
-            Some(RecursiveSearchFail::NoMoreSolutions)
-        } else if minimums.positive >= dfn && minimums.negative >= dfn {
-            let mut visited = FxHashSet::default();
-            visited.insert(table);
-            self.tables[table].extend_strands(strands);
-            self.delay_strands_after_cycle(table, &mut visited);
-            None
-        } else {
-            self.tables[table].extend_strands(strands);
-            Some(RecursiveSearchFail::Cycle(minimums))
-        }
-    }
-
-    /// Invoked after we have determined that every strand in `table`
-    /// encounters a cycle; `strands` is the set of strands (which
-    /// have been moved out of the table). This method then
-    /// recursively clears the active strands from the tables
-    /// referenced in `strands`, since all of them must encounter
-    /// cycles too.
-    fn clear_strands_after_cycle(
-        &mut self,
-        table: TableIndex,
-        strands: impl IntoIterator<Item = CanonicalStrand<C>>,
-    ) {
-        assert!(self.tables[table].pop_next_strand().is_none());
-        for strand in strands {
-            let CanonicalStrand {
-                canonical_ex_clause,
-                selected_subgoal,
-            } = strand;
-            let selected_subgoal = selected_subgoal.unwrap_or_else(|| {
-                panic!(
-                    "clear_strands_after_cycle invoked on strand in table {:?} \
-                     without a selected subgoal: {:?}",
-                    table, canonical_ex_clause,
-                )
-            });
-
-            let strand_table = selected_subgoal.subgoal_table;
-            let strands = self.tables[strand_table].take_strands();
-            self.clear_strands_after_cycle(strand_table, strands);
-        }
-    }
-
-    /// Invoked after we have determined that every strand in `table`
-    /// encounters a cycle, and that some of those cycles involve
-    /// negative edges. In that case, walks all negative edges and
-    /// converts them to delayed literals.
-    fn delay_strands_after_cycle(&mut self, table: TableIndex, visited: &mut FxHashSet<TableIndex>) {
-        let mut tables = vec![];
-
-        let num_universes = CO::num_universes(&self.tables[table].table_goal);
-        for canonical_strand in self.tables[table].strands_mut() {
-            // FIXME if CanonicalExClause were not held abstract, we
-            // could do this in place like we used to (and
-            // `instantiate_strand` could take ownership), since we
-            // don't really need to instantiate here to do this
-            // operation.
-            let (delayed_strand, subgoal_table) = Self::with_instantiated_strand(
-                self.context.clone(),
-                num_universes,
-                canonical_strand,
-                DelayStrandAfterCycle { table },
-            );
-
-            *canonical_strand = delayed_strand;
-
-            if visited.insert(subgoal_table) {
-                tables.push(subgoal_table);
-            }
-        }
-
-        for table in tables {
-            self.delay_strands_after_cycle(table, visited);
-        }
-    }
-
-    fn delay_strand_after_cycle(
-        table: TableIndex,
-        mut strand: Strand<'_, C, impl Context>,
-    ) -> (CanonicalStrand<C>, TableIndex) {
-        let (subgoal_index, subgoal_table) = match &strand.selected_subgoal {
-            Some(selected_subgoal) => (
-                selected_subgoal.subgoal_index,
-                selected_subgoal.subgoal_table,
-            ),
-            None => {
-                panic!(
-                    "delay_strands_after_cycle invoked on strand in table {:?} \
-                     without a selected subgoal: {:?}",
-                    table, strand,
-                );
-            }
-        };
-
-        // Delay negative literals.
-        if let Literal::Negative(_) = strand.ex_clause.subgoals[subgoal_index] {
-            strand.ex_clause.subgoals.remove(subgoal_index);
-            strand
-                .ex_clause
-                .delayed_literals
-                .push(DelayedLiteral::Negative(subgoal_table));
-            strand.selected_subgoal = None;
-        }
-
-        (Self::canonicalize_strand(strand), subgoal_table)
-    }
-
-    /// Pursues `strand` to see if it leads us to a new answer, either
-    /// by selecting a new subgoal or by checking to see if the
-    /// selected subgoal has an answer. `strand` is associated with
-    /// the table on the stack at the given `depth`.
-    fn pursue_strand(
-        &mut self,
-        depth: StackIndex,
-        mut strand: Strand<'_, C, impl Context>,
-    ) -> StrandResult<C, ()> {
-        info_heading!(
-            "pursue_strand(table={:?}, depth={:?}, ex_clause={:#?}, selected_subgoal={:?})",
-            self.stack[depth].table,
-            depth,
-            strand.infer.debug_ex_clause(&strand.ex_clause),
-            strand.selected_subgoal,
-        );
-
-        // If no subgoal has yet been selected, select one.
-        while strand.selected_subgoal.is_none() {
-            if strand.ex_clause.subgoals.len() == 0 {
-                return self.pursue_answer(depth, strand);
-            }
-
-            // For now, we always pick the last subgoal in the
-            // list.
-            //
-            // FIXME(rust-lang-nursery/chalk#80) -- we should be more
-            // selective. For example, we don't want to pick a
-            // negative literal that will flounder, and we don't want
-            // to pick things like `?T: Sized` if we can help it.
-            let subgoal_index = strand.ex_clause.subgoals.len() - 1;
-
-            // Get or create table for this subgoal.
-            match self.get_or_create_table_for_subgoal(
-                &mut *strand.infer,
-                &strand.ex_clause.subgoals[subgoal_index],
-            ) {
-                Some((subgoal_table, universe_map)) => {
-                    strand.selected_subgoal = Some(SelectedSubgoal {
-                        subgoal_index,
-                        subgoal_table,
-                        universe_map,
-                        answer_index: AnswerIndex::ZERO,
-                    });
-                }
-
-                None => {
-                    // If we failed to create a table for the subgoal,
-                    // then the execution has "floundered" (cannot yield
-                    // a complete result). We choose to handle this by
-                    // removing the subgoal and inserting a
-                    // `CannotProve` result. This can only happen with
-                    // ill-formed negative literals or with overflow.
-                    strand.ex_clause.subgoals.remove(subgoal_index);
-                    strand
-                        .ex_clause
-                        .delayed_literals
-                        .push(DelayedLiteral::CannotProve(()));
-                }
-            }
-        }
-
-        // Find the selected subgoal and ask it for the next answer.
-        let selected_subgoal = strand.selected_subgoal.clone().unwrap();
-        match strand.ex_clause.subgoals[selected_subgoal.subgoal_index] {
-            Literal::Positive(_) => self.pursue_positive_subgoal(depth, strand, &selected_subgoal),
-            Literal::Negative(_) => self.pursue_negative_subgoal(depth, strand, &selected_subgoal),
-        }
-    }
-
-    /// Invoked when a strand represents an **answer**. This means
-    /// that the strand has no subgoals left. There are two possibilities:
-    ///
-    /// - the strand may represent an answer we have already found; in
-    ///   that case, we can return `StrandFail::NoSolution`, as this
-    ///   strand led nowhere of interest.
-    /// - the strand may represent a new answer, in which case it is
-    ///   added to the table and `Ok` is returned.
-    fn pursue_answer(
-        &mut self,
-        depth: StackIndex,
-        strand: Strand<'_, C, impl Context>,
-    ) -> StrandResult<C, ()> {
-        let table = self.stack[depth].table;
-        let Strand {
-            infer,
-            ex_clause:
-                ExClause {
-                    subst,
-                    constraints,
-                    delayed_literals,
-                    subgoals,
-                },
-            selected_subgoal: _,
-        } = strand;
-        assert!(subgoals.is_empty());
-
-        let answer_subst = infer.canonicalize_constrained_subst(subst, constraints);
-        debug!("answer: table={:?}, answer_subst={:?}", table, answer_subst);
-
-        let delayed_literals = {
-            let mut delayed_literals: FxHashSet<_> = delayed_literals.into_iter()
-                .map(|dl| infer.lift_delayed_literal(dl))
-                .collect();
-            DelayedLiteralSet { delayed_literals }
-        };
-        debug!("answer: delayed_literals={:?}", delayed_literals);
-
-        let answer = Answer {
-            subst: answer_subst,
-            delayed_literals,
-        };
-
-        // A "trivial" answer is one that is 'just true for all cases'
-        // -- in other words, it gives no information back to the
-        // caller. For example, `Vec<u32>: Sized` is "just true".
-        // Such answers are important because they are the most
-        // general case, and after we provide a trivial answer, no
-        // further answers are useful -- therefore we can clear any
-        // further pending strands (this is a "green cut", in
-        // Prolog parlance).
-        //
-        // This optimization is *crucial* for performance: for
-        // example, `projection_from_env_slow` fails miserably without
-        // it. The reason is that we wind up (thanks to implied bounds)
-        // with a clause like this:
-        //
-        // ```ignore
-        // forall<T> { (<T as SliceExt>::Item: Clone) :- WF(T: SliceExt) }
-        // ```
-        //
-        // we then apply that clause to `!1: Clone`, resulting in the
-        // table goal `!1: Clone :- <?0 as SliceExt>::Item = !1,
-        // WF(?0: SliceExt)`.  This causes us to **enumerate all types
-        // `?0` that where `Slice<?0>` normalizes to `!1` -- this is
-        // an infinite set of types, effectively. Interestingly,
-        // though, we only need one and we are done, because (if you
-        // look) our goal (`!1: Clone`) doesn't have any output
-        // parameters.
-        //
-        // This is actually a kind of general case. Due to Rust's rule
-        // about constrained impl type parameters, generally speaking
-        // when we have some free inference variable (like `?0`)
-        // within our clause, it must appear in the head of the
-        // clause. This means that the values we create for it will
-        // propagate up to the caller, and they will quickly surmise
-        // that there is ambiguity and stop requesting more answers.
-        // Indeed, the only exception to this rule about constrained
-        // type parameters if with associated type projections, as in
-        // the case above!
-        //
-        // (Actually, because of the trivial answer cut off rule, we
-        // never even get to the point of asking the query above in
-        // `projection_from_env_slow`.)
-        //
-        // However, there is one fly in the ointment: answers include
-        // region constraints, and you might imagine that we could
-        // find future answers that are also trivial but with distinct
-        // sets of region constraints. **For this reason, we only
-        // apply this green cut rule if the set of generated
-        // constraints is empty.**
-        //
-        // The limitation on region constraints is quite a drag! We
-        // can probably do better, though: for example, coherence
-        // guarantees that, for any given set of types, only a single
-        // impl ought to be applicable, and that impl can only impose
-        // one set of region constraints. However, it's not quite that
-        // simple, thanks to specialization as well as the possibility
-        // of proving things from the environment (though the latter
-        // is a *bit* suspect; e.g., those things in the environment
-        // must be backed by an impl *eventually*).
-        let is_trivial_answer = {
-            answer.delayed_literals.is_empty()
-                && CO::is_trivial_substitution(&self.tables[table].table_goal, &answer.subst)
-                && CO::empty_constraints(&answer.subst)
-        };
-
-        if self.tables[table].push_answer(answer) {
-            if is_trivial_answer {
-                self.tables[table].take_strands();
-            }
-
-            Ok(())
-        } else {
-            info!("answer: not a new answer, returning StrandFail::NoSolution");
-            Err(StrandFail::NoSolution)
-        }
-    }
-
-    /// Given a subgoal, converts the literal into u-canonical form
-    /// and searches for an existing table. If one is found, it is
-    /// returned, but otherwise a new table is created (and populated
-    /// with its initial set of strands).
-    ///
-    /// Returns `None` if the literal cannot be converted into a table
-    /// -- for example, this can occur when we have selected a
-    /// negative literal with free existential variables, in which
-    /// case the execution is said to "flounder".
-    ///
-    /// In terms of the NFTD paper, creating a new table corresponds
-    /// to the *New Subgoal* step as well as the *Program Clause
-    /// Resolution* steps.
-    fn get_or_create_table_for_subgoal<I: Context>(
-        &mut self,
-        infer: &mut dyn InferenceTable<C, I>,
-        subgoal: &Literal<I>,
-    ) -> Option<(TableIndex, C::UniverseMap)> {
-        debug_heading!("get_or_create_table_for_subgoal(subgoal={:?})", subgoal);
-
-        // Subgoal abstraction:
-        let canonical_subgoal = match subgoal {
-            Literal::Positive(subgoal) => self.abstract_positive_literal(infer, subgoal),
-            Literal::Negative(subgoal) => self.abstract_negative_literal(infer, subgoal)?,
-        };
-
-        debug!("canonical_subgoal={:?}", canonical_subgoal);
-
-        let (ucanonical_subgoal, universe_map) = infer.u_canonicalize_goal(&canonical_subgoal);
-
-        let table = self.get_or_create_table_for_ucanonical_goal(ucanonical_subgoal);
-
-        Some((table, universe_map))
-    }
-
-    /// Given a u-canonical goal, searches for an existing table. If
-    /// one is found, it is returned, but otherwise a new table is
-    /// created (and populated with its initial set of strands).
-    ///
-    /// In terms of the NFTD paper, creating a new table corresponds
-    /// to the *New Subgoal* step as well as the *Program Clause
-    /// Resolution* steps.
-    pub(crate) fn get_or_create_table_for_ucanonical_goal(
-        &mut self,
-        goal: C::UCanonicalGoalInEnvironment,
-    ) -> TableIndex {
-        debug_heading!("get_or_create_table_for_ucanonical_goal({:?})", goal);
-
-        if let Some(table) = self.tables.index_of(&goal) {
-            debug!("found existing table {:?}", table);
-            return table;
-        }
-
-        info_heading!(
-            "creating new table {:?} and goal {:#?}",
-            self.tables.next_index(),
-            goal
-        );
-        let coinductive_goal = self.context.is_coinductive(&goal);
-        let table = self.tables.insert(goal, coinductive_goal);
-        self.push_initial_strands(table);
-        table
-    }
-
-    /// When a table is first created, this function is invoked to
-    /// create the initial set of strands. If the table represents a
-    /// domain goal, these strands are created from the program
-    /// clauses as well as the clauses found in the environment.  If
-    /// the table represents a non-domain goal, such as `for<T> G`
-    /// etc, then `simplify_hh_goal` is invoked to create a strand
-    /// that breaks the goal down.
-    ///
-    /// In terms of the NFTD paper, this corresponds to the *Program
-    /// Clause Resolution* step being applied eagerly, as many times
-    /// as possible.
-    fn push_initial_strands(&mut self, table: TableIndex) {
-        // Instantiate the table goal with fresh inference variables.
-        let table_goal = self.tables[table].table_goal.clone();
-        self.context.clone().instantiate_ucanonical_goal(
-            &table_goal,
-            PushInitialStrandsInstantiated { table, this: self },
-        );
-
-        struct PushInitialStrandsInstantiated<'a, C: Context + 'a, CO: ContextOps<C> + 'a> {
-            table: TableIndex,
-            this: &'a mut Forest<C, CO>,
-        }
-
-        impl<C: Context, CO: ContextOps<C>> WithInstantiatedUCanonicalGoal<C>
-                                                for PushInitialStrandsInstantiated<'a, C, CO> {
-            type Output = ();
-
-            fn with<I: Context>(
-                self,
-                infer: &mut dyn InferenceTable<C, I>,
-                subst: I::Substitution,
-                environment: I::Environment,
-                goal: I::Goal,
-            ) {
-                let PushInitialStrandsInstantiated { table, this } = self;
-                this.push_initial_strands_instantiated(table, infer, subst, environment, goal);
-            }
-        }
-    }
-
-    fn push_initial_strands_instantiated<I: Context>(
-        &mut self,
-        table: TableIndex,
-        infer: &mut dyn InferenceTable<C, I>,
-        subst: I::Substitution,
-        environment: I::Environment,
-        goal: I::Goal,
-    ) {
-        let table_ref = &mut self.tables[table];
-        match infer.into_hh_goal(goal) {
-            HhGoal::DomainGoal(domain_goal) => {
-                let clauses = infer.program_clauses(&environment, &domain_goal);
-                for clause in clauses {
-                    debug!("program clause = {:#?}", clause);
-                    if let Ok(resolvent) =
-                        infer.resolvent_clause(&environment, &domain_goal, &subst, &clause)
-                    {
-                        info!("pushing initial strand with ex-clause: {:#?}", &resolvent,);
-                        table_ref.push_strand(CanonicalStrand {
-                            canonical_ex_clause: resolvent,
-                            selected_subgoal: None,
-                        });
-                    }
-                }
-            }
-
-            hh_goal => {
-                // `canonical_goal` is an HH goal. We can simplify it
-                // into a series of *literals*, all of which must be
-                // true. Thus, in EWFS terms, we are effectively
-                // creating a single child of the `A :- A` goal that
-                // is like `A :- B, C, D` where B, C, and D are the
-                // simplified subgoals. You can think of this as
-                // applying built-in "meta program clauses" that
-                // reduce HH goals into Domain goals.
-                if let Ok(ex_clause) =
-                    Self::simplify_hh_goal(&mut *infer, subst, &environment, hh_goal)
-                {
-                    info!(
-                        "pushing initial strand with ex-clause: {:#?}",
-                        infer.debug_ex_clause(&ex_clause),
-                    );
-                    table_ref.push_strand(Self::canonicalize_strand(Strand {
-                        infer,
-                        ex_clause,
-                        selected_subgoal: None,
-                    }));
-                }
-            }
-        }
-    }
-
-    /// Given a selected positive subgoal, applies the subgoal
-    /// abstraction function to yield the canonical form that will be
-    /// used to pick a table. Typically, this abstraction has no
-    /// effect, and hence we are simply returning the canonical form
-    /// of `subgoal`, but if the subgoal is getting too big, we may
-    /// truncate the goal to ensure termination.
-    ///
-    /// This technique is described in the SA paper.
-    fn abstract_positive_literal<I: Context>(
-        &mut self,
-        infer: &mut dyn InferenceTable<C, I>,
-        subgoal: &I::GoalInEnvironment,
-    ) -> C::CanonicalGoalInEnvironment {
-        // Subgoal abstraction: Rather than looking up the table for
-        // `selected_goal` directly, first apply the truncation
-        // function. This may introduce fresh variables, making the
-        // goal that we are looking up more general, and forcing us to
-        // reuse an existing table. For example, if we had a selected
-        // goal of
-        //
-        //     // Vec<Vec<Vec<Vec<i32>>>>: Sized
-        //
-        // we might now produce a truncated goal of
-        //
-        //     // Vec<Vec<?T>>: Sized
-        //
-        // Obviously, the answer we are looking for -- if it exists -- will be
-        // found amongst the answers of this new, truncated goal.
-        //
-        // Subtle point: Note that the **selected goal** remains
-        // unchanged and will be carried over into the "pending
-        // clause" for the positive link on the new subgoal. This
-        // means that if our new, truncated subgoal produces
-        // irrelevant answers (e.g., `Vec<Vec<u32>>: Sized`), they
-        // will fail to unify with our selected goal, producing no
-        // resolvent.
-        match infer.truncate_goal(subgoal) {
-            None => infer.canonicalize_goal(subgoal),
-            Some(truncated_subgoal) => {
-                debug!("truncated={:?}", truncated_subgoal);
-                infer.canonicalize_goal(&truncated_subgoal)
-            }
-        }
-    }
-
-    /// Given a selected negative subgoal, the subgoal is "inverted"
-    /// (see `InferenceTable<C, I>::invert`) and then potentially truncated
-    /// (see `abstract_positive_literal`). The result subgoal is
-    /// canonicalized. In some cases, this may return `None` and hence
-    /// fail to yield a useful result, for example if free existential
-    /// variables appear in `subgoal` (in which case the execution is
-    /// said to "flounder").
-    fn abstract_negative_literal<I: Context>(
-        &mut self,
-        infer: &mut dyn InferenceTable<C, I>,
-        subgoal: &I::GoalInEnvironment,
-    ) -> Option<C::CanonicalGoalInEnvironment> {
-        // First, we have to check that the selected negative literal
-        // is ground, and invert any universally quantified variables.
-        //
-        // DIVERGENCE -- In the RR paper, to ensure completeness, they
-        // permit non-ground negative literals, but only consider
-        // them to succeed when the target table has no answers at
-        // all. This is equivalent inverting those free existentials
-        // into universals, as discussed in the comments of
-        // `invert`. This is clearly *sound*, but the completeness is
-        // a subtle point. In particular, it can cause **us** to reach
-        // false conclusions, because e.g. given a program like
-        // (selected left-to-right):
-        //
-        //     not { ?T: Copy }, ?T = Vec<u32>
-        //
-        // we would select `not { ?T: Copy }` first. For this goal to
-        // succeed we would require that -- effectively -- `forall<T>
-        // { not { T: Copy } }`, which clearly doesn't hold. (In the
-        // terms of RR, we would require that the table for `?T: Copy`
-        // has failed before we can continue.)
-        //
-        // In the RR paper, this is acceptable because they assume all
-        // of their input programs are both **normal** (negative
-        // literals are selected after positive ones) and **safe**
-        // (all free variables in negative literals occur in positive
-        // literals). It is plausible for us to guarantee "normal"
-        // form, we can reorder clauses as we need. I suspect we can
-        // guarantee safety too, but I have to think about it.
-        //
-        // For now, we opt for the safer route of terming such
-        // executions as floundering, because I think our use of
-        // negative goals is sufficiently limited we can get away with
-        // it. The practical effect is that we will judge more
-        // executions as floundering than we ought to (i.e., where we
-        // could instead generate an (imprecise) result). As you can
-        // see a bit later, we also diverge in some other aspects that
-        // affect completeness when it comes to subgoal abstraction.
-        let inverted_subgoal = infer.invert_goal(subgoal)?;
-
-        // DIVERGENCE
-        //
-        // If the negative subgoal has grown so large that we would have
-        // to truncate it, we currently just abort the computation
-        // entirely. This is not necessary -- the SA paper makes no
-        // such distinction, for example, and applies truncation equally
-        // for positive/negative literals. However, there are some complications
-        // that arise that I do not wish to deal with right now.
-        //
-        // Let's work through an example to show you what I
-        // mean. Imagine we have this (negative) selected literal;
-        // hence `selected_subgoal` will just be the inner part:
-        //
-        //     // not { Vec<Vec<Vec<Vec<i32>>>>: Sized }
-        //     //       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-        //     //       `selected_goal`
-        //
-        // (In this case, the `inverted_subgoal` would be the same,
-        // since there are no free universal variables.)
-        //
-        // If truncation **doesn't apply**, we would go and lookup the
-        // table for the selected goal (`Vec<Vec<..>>: Sized`) and see
-        // whether it has any answers. If it does, and they are
-        // definite, then this negative literal is false. We don't
-        // really care even how many answers there are and so forth
-        // (if the goal is ground, as in this case, there can be at
-        // most one definite answer, but if there are universals, then
-        // the inverted goal would have variables; even so, a single
-        // definite answer suffices to show that the `not { .. }` goal
-        // is false).
-        //
-        // Truncation muddies the water, because the table may
-        // generate answers that are not relevant to our original,
-        // untracted literal.  Suppose that we truncate the selected
-        // goal to:
-        //
-        //     // Vec<Vec<T>: Sized
-        //
-        // Clearly this table will have some solutions that don't
-        // apply to us.  e.g., `Vec<Vec<u32>>: Sized` is a solution to
-        // this table, but that doesn't imply that `not {
-        // Vec<Vec<Vec<..>>>: Sized }` is false.
-        //
-        // This can be made to work -- we carry along the original
-        // selected goal when we establish links between tables, and
-        // we could use that to screen the resulting answers. (There
-        // are some further complications around the fact that
-        // selected goal may contain universally quantified free
-        // variables that have been inverted, as discussed in the
-        // prior paragraph above.) I just didn't feel like dealing
-        // with it yet.
-        match infer.truncate_goal(&inverted_subgoal) {
-            Some(_) => None,
-            None => Some(infer.canonicalize_goal(&inverted_subgoal)),
-        }
-    }
-
-    /// Invoked when we have selected a positive literal, created its
-    /// table, and selected a particular answer index N we are looking
-    /// for. Searches for that answer. If we find one, we can do two things:
-    ///
-    /// - create a new strand with the same selected subgoal, but searching for the
-    ///   answer with index N+1
-    /// - use the answer to resolve our selected literal and select the next subgoal
-    ///   in this strand to pursue
-    ///
-    /// When an answer is found, that corresponds to *Positive Return*
-    /// from the NFTD paper.
-    fn pursue_positive_subgoal(
-        &mut self,
-        depth: StackIndex,
-        mut strand: Strand<'_, C, impl Context>,
-        selected_subgoal: &SelectedSubgoal<C>,
-    ) -> StrandResult<C, ()> {
-        let table = self.stack[depth].table;
-        let SelectedSubgoal {
-            subgoal_index,
-            subgoal_table,
-            answer_index,
-            ref universe_map,
-        } = *selected_subgoal;
-
-        match self.ensure_answer_recursively(subgoal_table, answer_index) {
-            Ok(EnsureSuccess::AnswerAvailable) => {
-                // The given answer is available; we'll process it below.
-            }
-            Ok(EnsureSuccess::Coinductive) => {
-                // This is a co-inductive cycle. That is, this table
-                // appears somewhere higher on the stack, and has now
-                // recursively requested an answer for itself. That
-                // means that our subgoal is unconditionally true, so
-                // we can drop it and pursue the next thing.
-                assert!(
-                    self.tables[table].coinductive_goal
-                        && self.tables[subgoal_table].coinductive_goal
-                );
-                let Strand {
-                    infer,
-                    mut ex_clause,
-                    selected_subgoal: _,
-                } = strand;
-                ex_clause.subgoals.remove(subgoal_index);
-                return self.pursue_strand_recursively(
-                    depth,
-                    Strand {
-                        infer,
-                        ex_clause,
-                        selected_subgoal: None,
-                    },
-                );
-            }
-            Err(RecursiveSearchFail::NoMoreSolutions) => {
-                info!("pursue_positive_subgoal: no more solutions");
-                return Err(StrandFail::NoSolution);
-            }
-            Err(RecursiveSearchFail::QuantumExceeded) => {
-                // We'll have to revisit this strand later
-                info!("pursue_positive_subgoal: quantum exceeded");
-                self.tables[table].push_strand(Self::canonicalize_strand(strand));
-                return Err(StrandFail::QuantumExceeded);
-            }
-            Err(RecursiveSearchFail::Cycle(minimums)) => {
-                info!(
-                    "pursue_positive_subgoal: cycle with minimums {:?}",
-                    minimums
-                );
-                let canonical_strand = Self::canonicalize_strand(strand);
-                return Err(StrandFail::Cycle(canonical_strand, minimums));
-            }
-        }
-
-        // Whichever way this particular answer turns out, there may
-        // yet be *more* answers. Enqueue that alternative for later.
-        self.push_strand_pursuing_next_answer(depth, &mut strand, selected_subgoal);
-
-        // OK, let's follow *this* answer and see where it leads.
-        let Strand {
-            infer,
-            mut ex_clause,
-            selected_subgoal: _,
-        } = strand;
-        let subgoal = match ex_clause.subgoals.remove(subgoal_index) {
-            Literal::Positive(g) => g,
-            Literal::Negative(g) => panic!(
-                "pursue_positive_subgoal invoked with negative selected literal: {:?}",
-                g
-            ),
-        };
-
-        let table_goal = &CO::map_goal_from_canonical(&universe_map,
-                                                     &CO::canonical(&self.tables[subgoal_table].table_goal));
-        let answer_subst =
-            &CO::map_subst_from_canonical(&universe_map, &self.answer(subgoal_table, answer_index).subst);
-        match infer.apply_answer_subst(ex_clause, &subgoal, table_goal, answer_subst) {
-            Ok(mut ex_clause) => {
-                // If the answer had delayed literals, we have to
-                // ensure that `ex_clause` is also delayed. This is
-                // the SLG FACTOR operation, though NFTD just makes it
-                // part of computing the SLG resolvent.
-                {
-                    let answer = self.answer(subgoal_table, answer_index);
-                    if !answer.delayed_literals.is_empty() {
-                        ex_clause.delayed_literals.push(DelayedLiteral::Positive(
-                            subgoal_table,
-                            infer.sink_answer_subset(&answer.subst),
-                        ));
-                    }
-                }
-
-                // Apply answer abstraction.
-                let ex_clause = self.truncate_returned(ex_clause, &mut *infer);
-
-                self.pursue_strand_recursively(
-                    depth,
-                    Strand {
-                        infer,
-                        ex_clause,
-                        selected_subgoal: None,
-                    },
-                )
-            }
-
-            // This answer led nowhere. Give up for now, but of course
-            // there may still be other strands to pursue, so return
-            // `QuantumExceeded`.
-            Err(NoSolution) => {
-                info!("pursue_positive_subgoal: answer not unifiable -> NoSolution");
-                Err(StrandFail::NoSolution)
-            }
-        }
-    }
-
-    /// Used whenever we process an answer (whether new or cached) on
-    /// a positive edge (the SLG POSITIVE RETURN operation). Truncates
-    /// the resolvent (or factor) if it has grown too large.
-    fn truncate_returned<I: Context>(
-        &self,
-        ex_clause: ExClause<I>,
-        infer: &mut dyn InferenceTable<C, I>,
-    ) -> ExClause<I> {
-        // DIVERGENCE
-        //
-        // In the original RR paper, truncation is only applied
-        // when the result of resolution is a new answer (i.e.,
-        // `ex_clause.subgoals.is_empty()`).  I've chosen to be
-        // more aggressive here, precisely because or our extended
-        // semantics for unification. In particular, unification
-        // can insert new goals, so I fear that positive feedback
-        // loops could still run indefinitely in the original
-        // formulation. I would like to revise our unification
-        // mechanism to avoid that problem, in which case this could
-        // be tightened up to be more like the original RR paper.
-        //
-        // Still, I *believe* this more aggressive approx. should
-        // not interfere with any of the properties of the
-        // original paper. In particular, applying truncation only
-        // when the resolvent has no subgoals seems like it is
-        // aimed at giving us more times to eliminate this
-        // ambiguous answer.
-
-        match infer.truncate_answer(&ex_clause.subst) {
-            // No need to truncate? Just propagate the resolvent back.
-            None => ex_clause,
-
-            // Resolvent got too large. Have to introduce approximation.
-            Some(truncated_subst) => {
-                // DIVERGENCE
-                //
-                // In RR, `self.delayed_literals` would be
-                // preserved. I have chosen to drop them. Keeping
-                // them does allow for the possibility of
-                // eliminating this answer if any of them turn out
-                // to be satisfiable. However, it also introduces
-                // an annoying edge case I didn't want to think
-                // about -- one which, interestingly, the paper
-                // did not discuss, which may indicate it is
-                // impossible for some subtle reason. In
-                // particular, a truncated delayed literal has a
-                // sort of inverse semantics. i.e. if we convert
-                // `Foo :- ~Bar(Rc<Rc<u32>>) |` to `Foo :-
-                // ~Bar(Rc<X>), Unknown |`, then this could be
-                // invalidated by an instance of `Bar(Rc<i32>)`,
-                // which is irrelevant to the original
-                // clause. (There is an additional annoyance,
-                // which is that we may not have tried to solve
-                // `Bar(Rc<X>)` at all.)
-
-                ExClause {
-                    subst: truncated_subst,
-                    delayed_literals: vec![DelayedLiteral::CannotProve(())],
-                    constraints: vec![],
-                    subgoals: vec![],
-                }
-            }
-        }
-    }
-
-    // We can recursive arbitrarily deep while pursuing a strand, so
-    // check in case we have to grow the stack.
-    fn pursue_strand_recursively(
-        &mut self,
-        depth: StackIndex,
-        strand: Strand<'_, C, impl Context>,
-    ) -> StrandResult<C, ()> {
-        ::maybe_grow_stack(|| self.pursue_strand(depth, strand))
-    }
-
-    /// Invoked when we have found a successful answer to the given
-    /// table. Queues up a strand to look for the *next* answer from
-    /// that table.
-    fn push_strand_pursuing_next_answer(
-        &mut self,
-        depth: StackIndex,
-        strand: &mut Strand<'_, C, impl Context>,
-        selected_subgoal: &SelectedSubgoal<C>,
-    ) {
-        let table = self.stack[depth].table;
-        let mut selected_subgoal = selected_subgoal.clone();
-        selected_subgoal.answer_index.increment();
-        self.tables[table].push_strand(Self::canonicalize_strand_from(
-            &mut *strand.infer,
-            &strand.ex_clause,
-            Some(selected_subgoal),
-        ));
-    }
-
-    fn pursue_negative_subgoal(
-        &mut self,
-        depth: StackIndex,
-        strand: Strand<'_, C, impl Context>,
-        selected_subgoal: &SelectedSubgoal<C>,
-    ) -> StrandResult<C, ()> {
-        let table = self.stack[depth].table;
-        let SelectedSubgoal {
-            subgoal_index: _,
-            subgoal_table,
-            answer_index,
-            universe_map: _,
-        } = *selected_subgoal;
-
-        // In the match below, we will either (a) return early with an
-        // error or some kind or (b) continue on to pursue this strand
-        // further. We continue onward in the case where we either
-        // proved that `answer_index` does not exist (in which case
-        // the negative literal is true) or if we found a delayed
-        // literal (in which case the negative literal *may* be true).
-        // Before exiting the match, then, we set `delayed_literal` to
-        // either `Some` or `None` depending.
-        let delayed_literal: Option<DelayedLiteral<_>>;
-        match self.ensure_answer_recursively(subgoal_table, answer_index) {
-            Ok(EnsureSuccess::AnswerAvailable) => {
-                if self.answer(subgoal_table, answer_index).is_unconditional() {
-                    // We want to disproval the subgoal, but we
-                    // have an unconditional answer for the subgoal,
-                    // therefore we have failed to disprove it.
-                    info!("pursue_negative_subgoal: found unconditional answer to neg literal -> NoSolution");
-                    return Err(StrandFail::NoSolution);
-                }
-
-                // Got back a conditional answer. We neither succeed
-                // nor fail yet; so what we do is to delay the
-                // selected literal and keep going.
-                //
-                // This corresponds to the Delaying action in NFTD.
-                // It also interesting to compare this with the EWFS
-                // paper; there, when we encounter a delayed cached
-                // answer in `negative_subgoal`, we do not immediately
-                // convert to a delayed literal, but instead simply
-                // stop. However, in EWFS, we *do* add the strand to
-                // the table as a negative pending subgoal, and also
-                // update the link to depend negatively on the
-                // table. Then later, when all pending work from that
-                // table is completed, all negative links are
-                // converted to delays.
-                delayed_literal = Some(DelayedLiteral::Negative(subgoal_table));
-            }
-
-            Ok(EnsureSuccess::Coinductive) => {
-                // This is a co-inductive cycle. That is, this table
-                // appears somewhere higher on the stack, and has now
-                // recursively requested an answer for itself. That
-                // means that our subgoal is unconditionally true, so
-                // our negative goal fails.
-                info!("pursue_negative_subgoal: found coinductive answer to neg literal -> NoSolution");
-                return Err(StrandFail::NoSolution);
-            }
-
-            Err(RecursiveSearchFail::Cycle(minimums)) => {
-                // We depend on `not(subgoal)`. For us to continue,
-                // `subgoal` must be completely evaluated. Therefore,
-                // we depend (negatively) on the minimum link of
-                // `subgoal` as a whole -- it doesn't matter whether
-                // it's pos or neg.
-                let min = minimums.minimum_of_pos_and_neg();
-                info!(
-                    "pursue_negative_subgoal: found neg cycle at depth {:?}",
-                    min
-                );
-                let canonical_strand = Self::canonicalize_strand(strand);
-                return Err(StrandFail::Cycle(
-                    canonical_strand,
-                    Minimums {
-                        positive: self.stack[depth].dfn,
-                        negative: min,
-                    },
-                ));
-            }
-
-            Err(RecursiveSearchFail::NoMoreSolutions) => {
-                // This answer does not exist. Huzzah, happy days are
-                // here again! =) We can just remove this subgoal and continue
-                // with no need for a delayed literal.
-                delayed_literal = None;
-            }
-
-            // Learned nothing yet. Have to try again some other time.
-            Err(RecursiveSearchFail::QuantumExceeded) => {
-                info!("pursue_negative_subgoal: quantum exceeded");
-                self.tables[table].push_strand(Self::canonicalize_strand(strand));
-                return Err(StrandFail::QuantumExceeded);
-            }
-        }
-
-        // We have found that there is at least a *chance* that
-        // `answer_index` of the subgoal is a failure, so let's keep
-        // going. We can just remove the subgoal from the list without
-        // any need to unify things, because the subgoal must be
-        // ground (i). We may need to add a delayed literal, though (ii).
-        let Strand {
-            infer,
-            mut ex_clause,
-            selected_subgoal: _,
-        } = strand;
-        ex_clause.subgoals.remove(selected_subgoal.subgoal_index); // (i)
-        ex_clause.delayed_literals.extend(delayed_literal); // (ii)
-        self.pursue_strand_recursively(
-            depth,
-            Strand {
-                infer,
-                ex_clause,
-                selected_subgoal: None,
-            },
-        )
-    }
-}
-
-trait WithInstantiatedStrand<C: Context, CO: AggregateOps<C>> {
-    type Output;
-
-    fn with(self, strand: Strand<'_, C, impl Context>) -> Self::Output;
-}
-
-struct PursueStrand<'a, C: Context + 'a, CO: ContextOps<C> + 'a> {
-    forest: &'a mut Forest<C, CO>,
-    depth: StackIndex,
-}
-
-impl<C: Context, CO: ContextOps<C>> WithInstantiatedStrand<C, CO> for PursueStrand<'a, C, CO> {
-    type Output = StrandResult<C, ()>;
-
-    fn with(self, strand: Strand<'_, C, impl Context>) -> Self::Output {
-        self.forest.pursue_strand(self.depth, strand)
-    }
-}
-
-struct DelayStrandAfterCycle {
-    table: TableIndex,
-}
-
-impl<C: Context, CO: ContextOps<C>> WithInstantiatedStrand<C, CO> for DelayStrandAfterCycle {
-    type Output = (CanonicalStrand<C>, TableIndex);
-
-    fn with(self, strand: Strand<'_, C, impl Context>) -> Self::Output {
-        <Forest<C, CO>>::delay_strand_after_cycle(self.table, strand)
-    }
-}
diff --git a/vendor/chalk-engine/src/simplify.rs b/vendor/chalk-engine/src/simplify.rs
deleted file mode 100644
index 003591db09..0000000000
--- a/vendor/chalk-engine/src/simplify.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use fallible::Fallible;
-use {ExClause, Literal};
-use forest::Forest;
-use hh::HhGoal;
-use context::prelude::*;
-
-impl<C: Context, CO: ContextOps<C>> Forest<C, CO> {
-    /// Simplifies an HH goal into a series of positive domain goals
-    /// and negative HH goals. This operation may fail if the HH goal
-    /// includes unifications that cannot be completed.
-    pub(super) fn simplify_hh_goal<I: Context>(
-        infer: &mut dyn InferenceTable<C, I>,
-        subst: I::Substitution,
-        initial_environment: &I::Environment,
-        initial_hh_goal: HhGoal<I>,
-    ) -> Fallible<ExClause<I>> {
-        let mut ex_clause = ExClause {
-            subst,
-            delayed_literals: vec![],
-            constraints: vec![],
-            subgoals: vec![],
-        };
-
-        // A stack of higher-level goals to process.
-        let mut pending_goals = vec![(initial_environment.clone(), initial_hh_goal)];
-
-        while let Some((environment, hh_goal)) = pending_goals.pop() {
-            match hh_goal {
-                HhGoal::ForAll(subgoal) => {
-                    let subgoal = infer.instantiate_binders_universally(&subgoal);
-                    pending_goals.push((environment, infer.into_hh_goal(subgoal)));
-                }
-                HhGoal::Exists(subgoal) => {
-                    let subgoal = infer.instantiate_binders_existentially(&subgoal);
-                    pending_goals.push((environment, infer.into_hh_goal(subgoal)))
-                }
-                HhGoal::Implies(wc, subgoal) => {
-                    let new_environment = infer.add_clauses(&environment, wc);
-                    pending_goals.push((new_environment, infer.into_hh_goal(subgoal)));
-                }
-                HhGoal::And(subgoal1, subgoal2) => {
-                    pending_goals.push((environment.clone(), infer.into_hh_goal(subgoal1)));
-                    pending_goals.push((environment, infer.into_hh_goal(subgoal2)));
-                }
-                HhGoal::Not(subgoal) => {
-                    ex_clause
-                        .subgoals
-                        .push(Literal::Negative(I::goal_in_environment(&environment, subgoal)));
-                }
-                HhGoal::Unify(variance, a, b) => {
-                    let result = infer.unify_parameters(&environment, variance, &a, &b)?;
-                    infer.into_ex_clause(result, &mut ex_clause)
-                }
-                HhGoal::DomainGoal(domain_goal) => {
-                    ex_clause
-                        .subgoals
-                        .push(Literal::Positive(I::goal_in_environment(
-                            &environment,
-                            infer.into_goal(domain_goal),
-                        )));
-                }
-                HhGoal::CannotProve => {
-                    // You can think of `CannotProve` as a special
-                    // goal that is only provable if `not {
-                    // CannotProve }`. Trying to prove this, of
-                    // course, will always create a negative cycle and
-                    // hence a delayed literal that cannot be
-                    // resolved.
-                    let goal = infer.cannot_prove();
-                    ex_clause
-                        .subgoals
-                        .push(Literal::Negative(I::goal_in_environment(&environment, goal)));
-                }
-            }
-        }
-
-        Ok(ex_clause)
-    }
-}
diff --git a/vendor/chalk-engine/src/stack.rs b/vendor/chalk-engine/src/stack.rs
deleted file mode 100644
index 8b804e8333..0000000000
--- a/vendor/chalk-engine/src/stack.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-use {DepthFirstNumber, TableIndex};
-use std::ops::{Index, IndexMut, Range};
-
-/// See `Forest`.
-#[derive(Default)]
-pub(crate) struct Stack {
-    /// Stack: as described above, stores the in-progress goals.
-    stack: Vec<StackEntry>,
-}
-
-/// The StackIndex identifies the position of a table's goal in the
-/// stack of goals that are actively being processed. Note that once a
-/// table is completely evaluated, it may be popped from the stack,
-/// and hence no longer have a stack index.
-index_struct! {
-    pub(crate) struct StackIndex {
-        value: usize,
-    }
-}
-
-pub(crate) struct StackEntry {
-    /// The goal G from the stack entry `A :- G` represented here.
-    pub(super) table: TableIndex,
-
-    /// The DFN of this computation.
-    pub(super) dfn: DepthFirstNumber,
-}
-
-impl Stack {
-    pub(super) fn is_empty(&self) -> bool {
-        self.stack.is_empty()
-    }
-
-    /// Searches the stack to see if `table` is active. If so, returns
-    /// its stack index.
-    pub(super) fn is_active(&self, table: TableIndex) -> Option<StackIndex> {
-        self.stack
-            .iter()
-            .enumerate()
-            .filter_map(|(index, stack_entry)| {
-                if stack_entry.table == table {
-                    Some(StackIndex::from(index))
-                } else {
-                    None
-                }
-            })
-            .next()
-    }
-
-    pub(super) fn top_of_stack_from(&self, depth: StackIndex) -> Range<StackIndex> {
-        depth .. StackIndex::from(self.stack.len())
-    }
-
-    pub(super) fn push(&mut self, table: TableIndex, dfn: DepthFirstNumber) -> StackIndex {
-        let old_len = self.stack.len();
-        self.stack.push(StackEntry { table, dfn });
-        StackIndex::from(old_len)
-    }
-
-    pub(super) fn pop(&mut self, table: TableIndex, depth: StackIndex) {
-        assert_eq!(self.stack.len(), depth.value + 1);
-        assert_eq!(self[depth].table, table);
-        self.stack.pop();
-    }
-}
-
-impl Index<StackIndex> for Stack {
-    type Output = StackEntry;
-
-    fn index(&self, index: StackIndex) -> &StackEntry {
-        &self.stack[index.value]
-    }
-}
-
-impl IndexMut<StackIndex> for Stack {
-    fn index_mut(&mut self, index: StackIndex) -> &mut StackEntry {
-        &mut self.stack[index.value]
-    }
-}
diff --git a/vendor/chalk-engine/src/strand.rs b/vendor/chalk-engine/src/strand.rs
deleted file mode 100644
index 39cbb7653a..0000000000
--- a/vendor/chalk-engine/src/strand.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use std::fmt::{Debug, Error, Formatter};
-use {ExClause, TableIndex};
-use context::{Context, InferenceTable};
-use table::AnswerIndex;
-
-#[derive(Debug)]
-pub(crate) struct CanonicalStrand<C: Context> {
-    pub(super) canonical_ex_clause: C::CanonicalExClause,
-
-    /// Index into `ex_clause.subgoals`.
-    pub(crate) selected_subgoal: Option<SelectedSubgoal<C>>,
-}
-
-pub(crate) struct Strand<'table, C: Context + 'table, I: Context + 'table> {
-    pub(crate) infer: &'table mut dyn InferenceTable<C, I>,
-
-    pub(super) ex_clause: ExClause<I>,
-
-    /// Index into `ex_clause.subgoals`.
-    pub(crate) selected_subgoal: Option<SelectedSubgoal<C>>,
-}
-
-#[derive(Clone, Debug)]
-pub(crate) struct SelectedSubgoal<C: Context> {
-    /// The index of the subgoal in `ex_clause.subgoals`
-    pub(crate) subgoal_index: usize,
-
-    /// The index of the table that we created or found for this subgoal
-    pub(super) subgoal_table: TableIndex,
-
-    /// Index of the answer we should request next from the table
-    pub(crate) answer_index: AnswerIndex,
-
-    /// Maps the universes of the subgoal to the canonical universes
-    /// used in the table
-    pub(crate) universe_map: C::UniverseMap,
-}
-
-impl<'table, C: Context, I: Context> Debug for Strand<'table, C, I> {
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), Error> {
-        fmt.debug_struct("Strand")
-            .field("ex_clause", &self.ex_clause)
-            .field("selected_subgoal", &self.selected_subgoal)
-            .finish()
-    }
-}
diff --git a/vendor/chalk-engine/src/table.rs b/vendor/chalk-engine/src/table.rs
deleted file mode 100644
index c0f60701bf..0000000000
--- a/vendor/chalk-engine/src/table.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use {DelayedLiteralSet, DelayedLiteralSets};
-use context::prelude::*;
-use strand::CanonicalStrand;
-use rustc_hash::FxHashMap;
-use std::collections::VecDeque;
-use std::collections::hash_map::Entry;
-use std::mem;
-
-pub(crate) struct Table<C: Context> {
-    /// The goal this table is trying to solve (also the key to look
-    /// it up).
-    pub(crate) table_goal: C::UCanonicalGoalInEnvironment,
-
-    /// A goal is coinductive if it can assume itself to be true, more
-    /// or less. This is true for auto traits.
-    pub(crate) coinductive_goal: bool,
-
-    /// Stores the answers that we have found thus far. When we get a request
-    /// for an answer N, we will first check this vector.
-    answers: Vec<Answer<C>>,
-
-    /// An alternative storage for the answers we have so far, used to
-    /// detect duplicates. Not every answer in `answers` will be
-    /// represented here -- we discard answers from `answers_hash`
-    /// (but not `answers`) when better answers arrive (in particular,
-    /// answers with fewer delayed literals).
-    answers_hash: FxHashMap<C::CanonicalConstrainedSubst, DelayedLiteralSets<C>>,
-
-    /// Stores the active strands that we can "pull on" to find more
-    /// answers.
-    strands: VecDeque<CanonicalStrand<C>>,
-}
-
-index_struct! {
-    pub(crate) struct AnswerIndex {
-        value: usize,
-    }
-}
-
-
-/// An "answer" in the on-demand solver corresponds to a fully solved
-/// goal for a particular table (modulo delayed literals). It contains
-/// a substitution
-#[derive(Clone, Debug)]
-pub struct Answer<C: Context> {
-    pub(crate) subst: C::CanonicalConstrainedSubst,
-    pub(crate) delayed_literals: DelayedLiteralSet<C>,
-}
-
-impl<C: Context> Table<C> {
-    pub(crate) fn new(table_goal: C::UCanonicalGoalInEnvironment, coinductive_goal: bool) -> Table<C> {
-        Table {
-            table_goal,
-            coinductive_goal,
-            answers: Vec::new(),
-            answers_hash: FxHashMap::default(),
-            strands: VecDeque::new(),
-        }
-    }
-
-    pub(crate) fn push_strand(&mut self, strand: CanonicalStrand<C>) {
-        self.strands.push_back(strand);
-    }
-
-    pub(crate) fn extend_strands(&mut self, strands: impl IntoIterator<Item = CanonicalStrand<C>>) {
-        self.strands.extend(strands);
-    }
-
-    pub(crate) fn strands_mut(&mut self) -> impl Iterator<Item = &mut CanonicalStrand<C>> {
-        self.strands.iter_mut()
-    }
-
-    pub(crate) fn take_strands(&mut self) -> VecDeque<CanonicalStrand<C>> {
-        mem::replace(&mut self.strands, VecDeque::new())
-    }
-
-    pub(crate) fn pop_next_strand(&mut self) -> Option<CanonicalStrand<C>> {
-        self.strands.pop_front()
-    }
-
-    /// Adds `answer` to our list of answers, unless it (or some
-    /// better answer) is already present. An answer A is better than
-    /// an answer B if their substitutions are the same, but A has a subset
-    /// of the delayed literals that B does.
-    ///
-    /// Returns true if `answer` was added.
-    pub(super) fn push_answer(&mut self, answer: Answer<C>) -> bool {
-        debug_heading!("push_answer(answer={:?})", answer);
-        debug!(
-            "pre-existing entry: {:?}",
-            self.answers_hash.get(&answer.subst)
-        );
-
-        let added = match self.answers_hash.entry(answer.subst.clone()) {
-            Entry::Vacant(entry) => {
-                entry.insert(DelayedLiteralSets::singleton(answer.delayed_literals.clone()));
-                true
-            }
-
-            Entry::Occupied(mut entry) => {
-                entry.get_mut().insert_if_minimal(&answer.delayed_literals)
-            }
-        };
-
-        info!(
-            "new answer to table with goal {:?}: answer={:?}",
-            self.table_goal, answer,
-        );
-        if added {
-            self.answers.push(answer);
-        }
-        added
-    }
-
-    pub(super) fn answer(&self, index: AnswerIndex) -> Option<&Answer<C>> {
-        self.answers.get(index.value)
-    }
-
-    /// Useful for testing.
-    pub fn num_cached_answers(&self) -> usize {
-        self.answers.len()
-    }
-
-    pub(super) fn next_answer_index(&self) -> AnswerIndex {
-        AnswerIndex::from(self.answers.len())
-    }
-}
-
-impl AnswerIndex {
-    pub(crate) const ZERO: AnswerIndex = AnswerIndex { value: 0 };
-}
-
-impl<C: Context> Answer<C> {
-    /// An "unconditional" answer is one that must be true -- this is
-    /// the case so long as we have no delayed literals.
-    pub(super) fn is_unconditional(&self) -> bool {
-        self.delayed_literals.is_empty()
-    }
-}
diff --git a/vendor/chalk-engine/src/tables.rs b/vendor/chalk-engine/src/tables.rs
deleted file mode 100644
index 072003826c..0000000000
--- a/vendor/chalk-engine/src/tables.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-use TableIndex;
-use context::prelude::*;
-use table::Table;
-use rustc_hash::FxHashMap;
-use std::ops::{Index, IndexMut};
-
-/// See `Forest`.
-pub(crate) struct Tables<C: Context> {
-    /// Maps from a canonical goal to the index of its table.
-    table_indices: FxHashMap<C::UCanonicalGoalInEnvironment, TableIndex>,
-
-    /// Table: as described above, stores the key information for each
-    /// tree in the forest.
-    tables: Vec<Table<C>>,
-}
-
-impl<C: Context> Tables<C> {
-    pub(crate) fn new() -> Tables<C> {
-        Tables {
-            table_indices: FxHashMap::default(),
-            tables: Vec::default(),
-        }
-    }
-
-    /// The index that will be given to the next table to be inserted.
-    pub(super) fn next_index(&self) -> TableIndex {
-        TableIndex {
-            value: self.tables.len(),
-        }
-    }
-
-    pub(super) fn insert(&mut self, goal: C::UCanonicalGoalInEnvironment, coinductive_goal: bool) -> TableIndex {
-        let index = self.next_index();
-        self.tables.push(Table::new(goal.clone(), coinductive_goal));
-        self.table_indices.insert(goal, index);
-        index
-    }
-
-    pub(super) fn index_of(&self, literal: &C::UCanonicalGoalInEnvironment) -> Option<TableIndex> {
-        self.table_indices.get(literal).cloned()
-    }
-}
-
-impl<C: Context> Index<TableIndex> for Tables<C> {
-    type Output = Table<C>;
-
-    fn index(&self, index: TableIndex) -> &Table<C> {
-        &self.tables[index.value]
-    }
-}
-
-impl<C: Context> IndexMut<TableIndex> for Tables<C> {
-    fn index_mut(&mut self, index: TableIndex) -> &mut Table<C> {
-        &mut self.tables[index.value]
-    }
-}
-
-impl<'a, C: Context> IntoIterator for &'a mut Tables<C> {
-    type IntoIter = <&'a mut Vec<Table<C>> as IntoIterator>::IntoIter;
-    type Item = <&'a mut Vec<Table<C>> as IntoIterator>::Item;
-
-    fn into_iter(self) -> Self::IntoIter {
-        IntoIterator::into_iter(&mut self.tables)
-    }
-}
-
diff --git a/vendor/chalk-macros/.cargo-checksum.json b/vendor/chalk-macros/.cargo-checksum.json
deleted file mode 100644
index 37fa55869e..0000000000
--- a/vendor/chalk-macros/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"9089758b064c5f172b5f413ccafe52aa7ee618be691aca9f11f1d891c95aa7df","README.md":"82224a49f1ca7dd015ad3dae6810c7ec3995c3c7a3ab3971c96540646b078db2","src/index.rs":"9ddc3dad27704891e3dc6792cf11b7a09a548d8a5841e0528960e0b1ec0e8bc8","src/lib.rs":"5fb211848d7d167a822fd6e649b9df3d3d527c4b5c5983331ee5f07bf789887c"},"package":"295635afd6853aa9f20baeb7f0204862440c0fe994c5a253d5f479dac41d047e"}
\ No newline at end of file
diff --git a/vendor/chalk-macros/Cargo.toml b/vendor/chalk-macros/Cargo.toml
deleted file mode 100644
index 7295cfa6b6..0000000000
--- a/vendor/chalk-macros/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "chalk-macros"
-version = "0.1.0"
-authors = ["Rust Compiler Team", "Chalk developers"]
-description = "Macros for Chalk"
-readme = "README.md"
-keywords = ["compiler", "traits", "prolog"]
-license = "Apache-2.0/MIT"
-repository = "https://github.com/rust-lang-nursery/chalk"
-[dependencies.lazy_static]
-version = "0.2.2"
diff --git a/vendor/chalk-macros/README.md b/vendor/chalk-macros/README.md
deleted file mode 100644
index ec2f943333..0000000000
--- a/vendor/chalk-macros/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Various macros used within Chalk.
diff --git a/vendor/chalk-macros/src/index.rs b/vendor/chalk-macros/src/index.rs
deleted file mode 100644
index 2e9490290f..0000000000
--- a/vendor/chalk-macros/src/index.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-#[macro_export]
-macro_rules! index_struct {
-    ($v:vis struct $n:ident {
-        $vf:vis value: usize,
-    }) => {
-        #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
-        $v struct $n {
-            $vf value: usize,
-        }
-
-        impl $n {
-            // Not all index structs need this, so allow it to be dead
-            // code.
-            #[allow(dead_code)]
-            $v fn get_and_increment(&mut self) -> Self {
-                let old_value = *self;
-                self.value += 1;
-                old_value
-            }
-
-            #[allow(dead_code)]
-            $v fn increment(&mut self) {
-                self.value += 1;
-            }
-        }
-
-        impl ::std::fmt::Debug for $n {
-            fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> Result<(), ::std::fmt::Error> {
-                write!(fmt, "{}({})", stringify!($n), self.value)
-            }
-        }
-
-        impl ::std::iter::Step for $n {
-            fn steps_between(start: &Self, end: &Self) -> Option<usize> {
-                usize::steps_between(&start.value, &end.value)
-            }
-
-            fn replace_one(&mut self) -> Self {
-                Self {
-                    value: usize::replace_one(&mut self.value),
-                }
-            }
-
-            fn replace_zero(&mut self) -> Self {
-                Self {
-                    value: usize::replace_zero(&mut self.value),
-                }
-            }
-
-            fn add_one(&self) -> Self {
-                Self {
-                    value: usize::add_one(&self.value),
-                }
-            }
-
-            fn sub_one(&self) -> Self {
-                Self {
-                    value: usize::sub_one(&self.value),
-                }
-            }
-
-            fn add_usize(&self, n: usize) -> Option<Self> {
-                usize::add_usize(&self.value, n).map(|value| Self { value })
-            }
-        }
-
-        impl From<usize> for $n {
-            fn from(value: usize) -> Self {
-                Self { value: value }
-            }
-        }
-    }
-}
diff --git a/vendor/chalk-macros/src/lib.rs b/vendor/chalk-macros/src/lib.rs
deleted file mode 100644
index f12e524331..0000000000
--- a/vendor/chalk-macros/src/lib.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-#![feature(crate_visibility_modifier)]
-#![feature(macro_vis_matcher)]
-
-use std::cell::RefCell;
-
-#[macro_use]
-extern crate lazy_static;
-
-#[macro_use]
-mod index;
-
-lazy_static! {
-    pub static ref DEBUG_ENABLED: bool = {
-        use std::env;
-        env::var("CHALK_DEBUG")
-            .ok()
-            .and_then(|s| s.parse::<u32>().ok())
-            .map(|x| x >= 2)
-            .unwrap_or(false)
-    };
-
-    pub static ref INFO_ENABLED: bool = {
-        use std::env;
-        env::var("CHALK_DEBUG")
-            .ok()
-            .and_then(|s| s.parse::<u32>().ok())
-            .map(|x| x >= 1)
-            .unwrap_or(false)
-    };
-}
-
-thread_local! {
-    crate static INDENT: RefCell<Vec<String>> = RefCell::new(vec![]);
-}
-
-// When CHALK_DEBUG is enabled, we only allow this many frames of
-// nested processing, at which point we assume something has gone
-// awry.
-const OVERFLOW_DEPTH: usize = 100;
-
-#[macro_export]
-macro_rules! debug {
-    ($($t:tt)*) => {
-        if *$crate::DEBUG_ENABLED {
-            $crate::dump(&format!($($t)*), "");
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! debug_heading {
-    ($($t:tt)*) => {
-        let _ = &if *$crate::DEBUG_ENABLED {
-            let string = format!($($t)*);
-            $crate::dump(&string, " {");
-            $crate::Indent::new(true, string)
-        } else {
-            $crate::Indent::new(false, String::new())
-        };
-    }
-}
-
-#[macro_export]
-macro_rules! info {
-    ($($t:tt)*) => {
-        if *$crate::INFO_ENABLED {
-            $crate::dump(&format!($($t)*), "");
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! info_heading {
-    ($($t:tt)*) => {
-        let _ = &if *$crate::INFO_ENABLED {
-            let string = format!($($t)*);
-            $crate::dump(&string, " {");
-            $crate::Indent::new(true, string)
-        } else {
-            $crate::Indent::new(false, String::new())
-        };
-    }
-}
-
-pub fn dump(string: &str, suffix: &str) {
-    let indent = INDENT.with(|i| i.borrow().len());
-    let mut first = true;
-    for line in string.lines() {
-        if first {
-            for _ in 0..indent {
-                eprint!(": ");
-            }
-            eprint!("| ");
-        } else {
-            eprintln!();
-            for _ in 0..indent {
-                eprint!(": ");
-            }
-            eprint!(": ");
-        }
-        eprint!("{}", line);
-        first = false;
-    }
-
-    eprintln!("{}", suffix);
-}
-
-pub struct Indent {
-    enabled: bool,
-}
-
-impl Indent {
-    pub fn new(enabled: bool, value: String) -> Self {
-        if enabled {
-            INDENT.with(|i| {
-                i.borrow_mut().push(value);
-                if i.borrow().len() > OVERFLOW_DEPTH {
-                    eprintln!("CHALK_DEBUG OVERFLOW:");
-                    for v in i.borrow().iter().rev() {
-                        eprintln!("- {}", v);
-                    }
-                    panic!("CHALK_DEBUG OVERFLOW")
-                }
-            });
-        }
-        Indent { enabled }
-    }
-}
-
-impl Drop for Indent {
-    fn drop(&mut self) {
-        if self.enabled {
-            INDENT.with(|i| i.borrow_mut().pop().unwrap());
-            dump("}", "");
-        }
-    }
-}
diff --git a/vendor/crossbeam-channel/.cargo-checksum.json b/vendor/crossbeam-channel/.cargo-checksum.json
index a39e37da05..851705b76e 100644
--- a/vendor/crossbeam-channel/.cargo-checksum.json
+++ b/vendor/crossbeam-channel/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"e3f2e919beea9c6641fdd62fa1567cb63a894836c814f3a85b802273909d44c4","Cargo.toml":"120ad305158b75139456a66abb44ef3a191fee44b9b29e209a5bb52e7887cd28","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","LICENSE-THIRD-PARTY":"924a49392dc8304def57586be4ebd69aaf51e16fd245b55b4b69ad2cce6b715a","README.md":"077c5ddbd471d4a21f5b183e415b708e5100fcad8baed335fd4ad5b6f959a8be","examples/fibonacci.rs":"8755bcb9cf05e391d8679fbb51db40ed9692703c3b66341cd1c1e4cca2068874","examples/matching.rs":"1fd35488bf42e1782a339b9691a4e82dcf23ad12502809e33555d46c91739476","examples/stopwatch.rs":"4e90ce134475859a421da0a095baea52a575b03e41fb8fb50cf47446f422ee6e","src/channel.rs":"4d398567823e2e8189de91d67ef58e4b61d1b8d3f1e373da2664ed40ae154717","src/context.rs":"8480d39c053f7533838fdf9cae019d1a5218a146ea071f1a89f2be8f625ef992","src/counter.rs":"3a9c1b0fa94beeabd349789ca94453f0cb3aa67f5d56bc619a7e029956fd3dbf","src/err.rs":"1a9ac9d7f4d5561f9c3e513b2f776782783954efa0bf9428598f3ad9ccb9d5c9","src/flavors/after.rs":"4f761618efe21036145e44f01506bdfbc2524879368ac138600e0feed921a6a7","src/flavors/array.rs":"5155741d55b40715f3c65bf19c106b3f73476f4e77de877b14fb3a2ff53a4631","src/flavors/list.rs":"fef0ae43b96a321961f73e466cdb0aa06afed8597d34bac30795dc14a1908849","src/flavors/mod.rs":"a5af9b6105207e293c0d64928b4486fb1da9bfe0318354c66c8b5069e41ec31f","src/flavors/never.rs":"86e21b4d8b154e5d795cf72c7203a1d16a846c4d670095c8b592c12569f35a98","src/flavors/tick.rs":"3ae19df71310972e7b5fd8cac17d90bff683e1493ed3db26d0d3d329dff133ff","src/flavors/zero.rs":"cae6eb914d36e58810704d7200b1dc90ff6cc03b23a97fa3ac04fbd00f18381a","src/lib.rs":"bc843b55c65d3a20ad1fc56da675e48232af5373339f2e513b4f6d4460e0000d","src/select.rs":"2e1655da701253388949a6e9d6cc30d3f65481d5e071222ede7fba2a9312c0ba","src/select_macro.rs":"e8f3998ab86f54e46acaa48bd6bba9b2e955ed11710d23c46f256295575fd638","src/utils.rs":"ebf230fed429c353f6202fe10c33dcca69a0917a947665a7ee03d230b88a29bf","src/waker.rs":"e85114e43a4db4befadd79b574c2567f3076e460791c2ea6b9588ee824d2c988","tests/after.rs":"9336716edbb6e3145f006e62af59a4e82160ecfb8748fac174b844fb81442d45","tests/array.rs":"1e87f8e2e75dcbaf0dbc75394cfa329c0fd5719db0bdb9ba2aa0cc86b2a18044","tests/golang.rs":"08c13a4fafd25da03809f20965203e4e88bdf936ff53342f2e43430e6603d3fa","tests/iter.rs":"3beaac492a9df39d2eae31d7cdb88f4ee3bd3cb57e2c5c9705811b8ee2abe744","tests/list.rs":"0a664517f3ff49e0885f6c649cbc76f5e5c7a4940096d7a1c98728cbe1655948","tests/mpsc.rs":"d268beb7bcb0be864bdb745585979c97343b82761705907fd90b0ec85f2db7d4","tests/never.rs":"cd455a4c78403d9a96fe0f3a4e968164cca533cc85c96aaa4558987f9b088fcc","tests/ready.rs":"7bc0dd86cd987dcae7db84c9f4379a2421e088b4e5dbdc07affb10c853fc7f55","tests/select.rs":"1ace0bbd2aecf488827d2c16d5d32b47baf00b0a1f7f7470bf9c8e16ddf92dad","tests/select_macro.rs":"d303abb0a3f7ff9bb3b5253951d7d17bfb30e4f77fb66d11c40a063691f9a9ae","tests/thread_locals.rs":"e9d25086d4bc590bacdaf20b5ff0ff3741d3403a413a8b817eaf15f61fb5e644","tests/tick.rs":"011c39a85f1e0427e61e7afc0860cf6dc29d41f7e8be9709684e4ffdc26ef9b8","tests/zero.rs":"983998a52173fba22045fb8390566a59ebb0392834477ab94cac934d637a3231"},"package":"0f0ed1a4de2235cabda8558ff5840bffb97fcb64c97827f354a451307df5f72b"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"8c688bc17a8ebd0ea7460a78e560b509b456a124b8adfa3ddcd57cc6f1eac4db","Cargo.lock":"8bbbbb41b1f372eba9a92f562a39cae80de771af57fc5574f96a925dd1564a83","Cargo.toml":"de0aab14ecfb144c09bab70cfcb8755ef2312cd4c45b3c567f15227f583f0281","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","LICENSE-THIRD-PARTY":"924a49392dc8304def57586be4ebd69aaf51e16fd245b55b4b69ad2cce6b715a","README.md":"7967172d90f7ebc20531d76c5a2bad7be8d81670fbc64abc33be4315d1430757","benches/crossbeam.rs":"baef02dffd58ee4d84d33a4e999254e81fcf45241623cfa6c4b1ef73dbd7479d","examples/fibonacci.rs":"8755bcb9cf05e391d8679fbb51db40ed9692703c3b66341cd1c1e4cca2068874","examples/matching.rs":"a1bdd7d211cf8612d649de3de3e24f56e911bc8d5e95b86b06f412314f9edd6c","examples/stopwatch.rs":"4e90ce134475859a421da0a095baea52a575b03e41fb8fb50cf47446f422ee6e","src/channel.rs":"4483ddf38c4b9b308b81dd156653ccb590524aae1e5ff8efcab6b8f44a8d3dfc","src/context.rs":"48eb848538482aeadd5bafb8fd24695dcf5635243d6f9d3b059a22538ce67014","src/counter.rs":"8b6d4d69db59bc992ddc7ed33f709788c3fab482521bb1adf985f77499506c09","src/err.rs":"80c47848fbfeeabaa83ea49c0928274cd4ae0ced7ebf214a075322fe301f3fa6","src/flavors/after.rs":"4f761618efe21036145e44f01506bdfbc2524879368ac138600e0feed921a6a7","src/flavors/array.rs":"3726a68712c3ba25a325fe91fc74da831d27e22e751d0b8d5dfd9d7022f54e04","src/flavors/list.rs":"969f925ea094d7d4e25b7ff294ea5c9a62cdae17238b41b915ece211def666fe","src/flavors/mod.rs":"a5af9b6105207e293c0d64928b4486fb1da9bfe0318354c66c8b5069e41ec31f","src/flavors/never.rs":"86e21b4d8b154e5d795cf72c7203a1d16a846c4d670095c8b592c12569f35a98","src/flavors/tick.rs":"654e7874805eb37d1fbd81d88ca23697a05eeaaa308b748860b9d2342f9752bd","src/flavors/zero.rs":"a24c2fb547586ab4bf2a09efb8af5264274f7b373749cd259a7dd3c843c8aac5","src/lib.rs":"854539dd0e7519bb3b087269d294930dc1f5b1880a98f5ede9e9d6ac33ea9f21","src/select.rs":"f917459c033f8edbb45f377d6a4af24ffb583583d039182e72252d4af64a8807","src/select_macro.rs":"b1a3d2b9d4c64b48f6b176d2ff8b44c3d754f157ddbe830e8a1e86e4c100e0e9","src/utils.rs":"8b1184222df9047355e6044ad7e3fefd6065a5dda98b968cae45cca5f4b2fb5d","src/waker.rs":"345b551d467389a3a18dc22b351674dfbf288945b984450f607e644faa8a9731","tests/after.rs":"effb341c02f03a45ce09ab7862bc5b191191e0175997c494f988e6daca1ef8af","tests/array.rs":"35cd46fc7310f4206e3bbd81f900c18053a3a22943e221fbb81f9b89505fee46","tests/golang.rs":"9cb210ef2668428f7efb542ff4a8ab4e61f77dd4ff7e39720d63ad0797ff4ec1","tests/iter.rs":"b6df3f21273bb21dfecda47ffc0c296541214cde6bed876a31db5f2410839e83","tests/list.rs":"eb6cfc9a0f02c77df6d6d608fbbe1f82e09901e167b4b86993c49f9d6052a8ee","tests/mpsc.rs":"965e18abbfcdebec09380f8ec9bb62e5556ad2aa0176ed088ce091994c1d2500","tests/never.rs":"cd455a4c78403d9a96fe0f3a4e968164cca533cc85c96aaa4558987f9b088fcc","tests/ready.rs":"b91cebde45a6c46bd2cf16b1fc58b2ec258dcc960cb9f8eb5b4c39b1a144cadc","tests/same_channel.rs":"bd93f72e982f9881235848a4a2da67276feca810ed1e4d22e0e2bda8675cae4a","tests/select.rs":"57558f93834dc1ae1a56fe8d1211536e16015a74c8c7458c653852472c21ddcd","tests/select_macro.rs":"1cd5250d46d6d2e8c0a87ee9b1c0a5d80aac193c3eb0a86877249684e7aabd39","tests/thread_locals.rs":"845f8c8f1a37a14e4235fc9fc20d8b7288fd9fda307c075c0e61e6ab79b33921","tests/tick.rs":"dd4257f1f8de01477d542e20a816eede3b4e2e4dc6fcdf07d554220f0ef8a86f","tests/zero.rs":"088804df377904eca4a985d8f1703f98550e51304d6849bfce143fcd0b69c349"},"package":"acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"}
\ No newline at end of file
diff --git a/vendor/crossbeam-channel/CHANGELOG.md b/vendor/crossbeam-channel/CHANGELOG.md
index 0cffdbc028..8ffd736718 100644
--- a/vendor/crossbeam-channel/CHANGELOG.md
+++ b/vendor/crossbeam-channel/CHANGELOG.md
@@ -1,3 +1,15 @@
+# Version 0.4.0
+
+- Bump the minimum required version to 1.28.
+- Bump `crossbeam-utils` to `0.7`.
+
+# Version 0.3.9
+
+- Fix a bug in reference counting.
+- Optimize `recv_timeout()`.
+- Add `Select::remove()`.
+- Various small improvements, code cleanup, more tests.
+
 # Version 0.3.8
 
 - Bump the minimum required version of `crossbeam-utils`.
diff --git a/vendor/crossbeam-channel/Cargo.lock b/vendor/crossbeam-channel/Cargo.lock
new file mode 100644
index 0000000000..56e149ed20
--- /dev/null
+++ b/vendor/crossbeam-channel/Cargo.lock
@@ -0,0 +1,251 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "arc-swap"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.4.0"
+dependencies = [
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "num_cpus"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "signal-hook"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+ "signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum arc-swap 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a1eca3195b729bbd64e292ef2f5fff6b1c28504fed762ce2b1013dde4d8e92"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum hermit-abi 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8"
+"checksum num_cpus 1.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "155394f924cdddf08149da25bfb932d226b4a593ca7468b08191ff6335941af5"
+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum signal-hook 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f"
+"checksum signal-hook-registry 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1797d48f38f91643908bb14e35e79928f9f4b3cefb2420a564dde0991b4358dc"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/vendor/crossbeam-channel/Cargo.toml b/vendor/crossbeam-channel/Cargo.toml
index 42a078589a..1b4df33f34 100644
--- a/vendor/crossbeam-channel/Cargo.toml
+++ b/vendor/crossbeam-channel/Cargo.toml
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,7 +12,7 @@
 
 [package]
 name = "crossbeam-channel"
-version = "0.3.8"
+version = "0.4.0"
 authors = ["The Crossbeam Project Developers"]
 description = "Multi-producer multi-consumer channels for message passing"
 homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-channel"
@@ -20,13 +20,13 @@ documentation = "https://docs.rs/crossbeam-channel"
 readme = "README.md"
 keywords = ["channel", "mpmc", "select", "golang", "message"]
 categories = ["algorithms", "concurrency", "data-structures"]
-license = "MIT/Apache-2.0"
+license = "MIT/Apache-2.0 AND BSD-2-Clause"
 repository = "https://github.com/crossbeam-rs/crossbeam"
 [dependencies.crossbeam-utils]
-version = "0.6.5"
+version = "0.7"
+[dev-dependencies.num_cpus]
+version = "1.10.0"
 
-[dependencies.smallvec]
-version = "0.6.2"
 [dev-dependencies.rand]
 version = "0.6"
 
diff --git a/vendor/crossbeam-channel/LICENSE-MIT b/vendor/crossbeam-channel/LICENSE-MIT
index 31aa79387f..068d491fd5 100644
--- a/vendor/crossbeam-channel/LICENSE-MIT
+++ b/vendor/crossbeam-channel/LICENSE-MIT
@@ -1,3 +1,7 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 The Crossbeam Project Developers
+
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the
diff --git a/vendor/crossbeam-channel/README.md b/vendor/crossbeam-channel/README.md
index 39f1e21bb6..be2e0b8f32 100644
--- a/vendor/crossbeam-channel/README.md
+++ b/vendor/crossbeam-channel/README.md
@@ -8,8 +8,9 @@ https://github.com/crossbeam-rs/crossbeam-channel)
 https://crates.io/crates/crossbeam-channel)
 [![Documentation](https://docs.rs/crossbeam-channel/badge.svg)](
 https://docs.rs/crossbeam-channel)
-[![Rust 1.26+](https://img.shields.io/badge/rust-1.26+-lightgray.svg)](
+[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
 https://www.rust-lang.org)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
 
 This crate provides multi-producer multi-consumer channels for message passing.
 It is an alternative to [`std::sync::mpsc`] with more features and better performance.
@@ -40,7 +41,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-crossbeam-channel = "0.3"
+crossbeam-channel = "0.4"
 ```
 
 Next, add this to your crate:
@@ -50,6 +51,10 @@ Next, add this to your crate:
 extern crate crossbeam_channel;
 ```
 
+## Compatibility
+
+The minimum supported Rust version is 1.28. Any change to this is considered a breaking change.
+
 ## License
 
 Licensed under either of
diff --git a/vendor/crossbeam-channel/benches/crossbeam.rs b/vendor/crossbeam-channel/benches/crossbeam.rs
new file mode 100644
index 0000000000..4dd956b12c
--- /dev/null
+++ b/vendor/crossbeam-channel/benches/crossbeam.rs
@@ -0,0 +1,715 @@
+#![feature(test)]
+
+extern crate crossbeam_channel;
+extern crate crossbeam_utils;
+extern crate num_cpus;
+extern crate test;
+
+use crossbeam_channel::{bounded, unbounded};
+use crossbeam_utils::thread::scope;
+use test::Bencher;
+
+const TOTAL_STEPS: usize = 40_000;
+
+mod unbounded {
+    use super::*;
+
+    #[bench]
+    fn create(b: &mut Bencher) {
+        b.iter(|| unbounded::<i32>());
+    }
+
+    #[bench]
+    fn oneshot(b: &mut Bencher) {
+        b.iter(|| {
+            let (s, r) = unbounded::<i32>();
+            s.send(0).unwrap();
+            r.recv().unwrap();
+        });
+    }
+
+    #[bench]
+    fn inout(b: &mut Bencher) {
+        let (s, r) = unbounded::<i32>();
+        b.iter(|| {
+            s.send(0).unwrap();
+            r.recv().unwrap();
+        });
+    }
+
+    #[bench]
+    fn par_inout(b: &mut Bencher) {
+        let threads = num_cpus::get();
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = unbounded::<i32>();
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn spsc(b: &mut Bencher) {
+        let steps = TOTAL_STEPS;
+        let (s, r) = unbounded::<i32>();
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            scope.spawn(|_| {
+                while r1.recv().is_ok() {
+                    for i in 0..steps {
+                        s.send(i as i32).unwrap();
+                    }
+                    s2.send(()).unwrap();
+                }
+            });
+
+            b.iter(|| {
+                s1.send(()).unwrap();
+                for _ in 0..steps {
+                    r.recv().unwrap();
+                }
+                r2.recv().unwrap();
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn spmc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = unbounded::<i32>();
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for i in 0..steps * threads {
+                    s.send(i as i32).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpsc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = unbounded::<i32>();
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..steps * threads {
+                    r.recv().unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpmc(b: &mut Bencher) {
+        let threads = num_cpus::get();
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = unbounded::<i32>();
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+}
+
+mod bounded_n {
+    use super::*;
+
+    #[bench]
+    fn spsc(b: &mut Bencher) {
+        let steps = TOTAL_STEPS;
+        let (s, r) = bounded::<i32>(steps);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            scope.spawn(|_| {
+                while r1.recv().is_ok() {
+                    for i in 0..steps {
+                        s.send(i as i32).unwrap();
+                    }
+                    s2.send(()).unwrap();
+                }
+            });
+
+            b.iter(|| {
+                s1.send(()).unwrap();
+                for _ in 0..steps {
+                    r.recv().unwrap();
+                }
+                r2.recv().unwrap();
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn spmc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(steps * threads);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for i in 0..steps * threads {
+                    s.send(i as i32).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpsc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(steps * threads);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..steps * threads {
+                    r.recv().unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn par_inout(b: &mut Bencher) {
+        let threads = num_cpus::get();
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(threads);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpmc(b: &mut Bencher) {
+        let threads = num_cpus::get();
+        assert_eq!(threads % 2, 0);
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(steps * threads);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+}
+
+mod bounded_1 {
+    use super::*;
+
+    #[bench]
+    fn create(b: &mut Bencher) {
+        b.iter(|| bounded::<i32>(1));
+    }
+
+    #[bench]
+    fn oneshot(b: &mut Bencher) {
+        b.iter(|| {
+            let (s, r) = bounded::<i32>(1);
+            s.send(0).unwrap();
+            r.recv().unwrap();
+        });
+    }
+
+    #[bench]
+    fn spsc(b: &mut Bencher) {
+        let steps = TOTAL_STEPS;
+        let (s, r) = bounded::<i32>(1);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            scope.spawn(|_| {
+                while r1.recv().is_ok() {
+                    for i in 0..steps {
+                        s.send(i as i32).unwrap();
+                    }
+                    s2.send(()).unwrap();
+                }
+            });
+
+            b.iter(|| {
+                s1.send(()).unwrap();
+                for _ in 0..steps {
+                    r.recv().unwrap();
+                }
+                r2.recv().unwrap();
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn spmc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(1);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for i in 0..steps * threads {
+                    s.send(i as i32).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpsc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(1);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..steps * threads {
+                    r.recv().unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpmc(b: &mut Bencher) {
+        let threads = num_cpus::get();
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(1);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+}
+
+mod bounded_0 {
+    use super::*;
+
+    #[bench]
+    fn create(b: &mut Bencher) {
+        b.iter(|| bounded::<i32>(0));
+    }
+
+    #[bench]
+    fn spsc(b: &mut Bencher) {
+        let steps = TOTAL_STEPS;
+        let (s, r) = bounded::<i32>(0);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            scope.spawn(|_| {
+                while r1.recv().is_ok() {
+                    for i in 0..steps {
+                        s.send(i as i32).unwrap();
+                    }
+                    s2.send(()).unwrap();
+                }
+            });
+
+            b.iter(|| {
+                s1.send(()).unwrap();
+                for _ in 0..steps {
+                    r.recv().unwrap();
+                }
+                r2.recv().unwrap();
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn spmc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(0);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for i in 0..steps * threads {
+                    s.send(i as i32).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpsc(b: &mut Bencher) {
+        let threads = num_cpus::get() - 1;
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(0);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..steps * threads {
+                    r.recv().unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+
+    #[bench]
+    fn mpmc(b: &mut Bencher) {
+        let threads = num_cpus::get();
+        let steps = TOTAL_STEPS / threads;
+        let (s, r) = bounded::<i32>(0);
+
+        let (s1, r1) = bounded(0);
+        let (s2, r2) = bounded(0);
+        scope(|scope| {
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for i in 0..steps {
+                            s.send(i as i32).unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+            for _ in 0..threads / 2 {
+                scope.spawn(|_| {
+                    while r1.recv().is_ok() {
+                        for _ in 0..steps {
+                            r.recv().unwrap();
+                        }
+                        s2.send(()).unwrap();
+                    }
+                });
+            }
+
+            b.iter(|| {
+                for _ in 0..threads {
+                    s1.send(()).unwrap();
+                }
+                for _ in 0..threads {
+                    r2.recv().unwrap();
+                }
+            });
+            drop(s1);
+        })
+        .unwrap();
+    }
+}
diff --git a/vendor/crossbeam-channel/examples/matching.rs b/vendor/crossbeam-channel/examples/matching.rs
index b765fcef47..4b157ff56c 100644
--- a/vendor/crossbeam-channel/examples/matching.rs
+++ b/vendor/crossbeam-channel/examples/matching.rs
@@ -66,7 +66,8 @@ fn main() {
             let (s, r) = (s.clone(), r.clone());
             scope.spawn(move |_| seek(name, s, r));
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     // Check if there is a pending send operation.
     if let Ok(name) = r.try_recv() {
diff --git a/vendor/crossbeam-channel/src/channel.rs b/vendor/crossbeam-channel/src/channel.rs
index e71b22bccf..bc7908f0f4 100644
--- a/vendor/crossbeam-channel/src/channel.rs
+++ b/vendor/crossbeam-channel/src/channel.rs
@@ -58,10 +58,6 @@ pub fn unbounded<T>() -> (Sender<T>, Receiver<T>) {
 /// A special case is zero-capacity channel, which cannot hold any messages. Instead, send and
 /// receive operations must appear at the same time in order to pair up and pass the message over.
 ///
-/// # Panics
-///
-/// Panics if the capacity is greater than `usize::max_value() / 4`.
-///
 /// # Examples
 ///
 /// A channel of capacity 1:
@@ -390,7 +386,8 @@ impl<T> Sender<T> {
             SenderFlavor::Array(chan) => chan.send(msg, None),
             SenderFlavor::List(chan) => chan.send(msg, None),
             SenderFlavor::Zero(chan) => chan.send(msg, None),
-        }.map_err(|err| match err {
+        }
+        .map_err(|err| match err {
             SendTimeoutError::Disconnected(msg) => SendError(msg),
             SendTimeoutError::Timeout(_) => unreachable!(),
         })
@@ -534,6 +531,30 @@ impl<T> Sender<T> {
             SenderFlavor::Zero(chan) => chan.capacity(),
         }
     }
+
+    /// Returns `true` if senders belong to the same channel.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (s, _) = unbounded::<usize>();
+    ///
+    /// let s2 = s.clone();
+    /// assert!(s.same_channel(&s2));
+    ///
+    /// let (s3, _) = unbounded();
+    /// assert!(!s.same_channel(&s3));
+    /// ```
+    pub fn same_channel(&self, other: &Sender<T>) -> bool {
+        match (&self.flavor, &other.flavor) {
+            (SenderFlavor::Array(ref a), SenderFlavor::Array(ref b)) => a == b,
+            (SenderFlavor::List(ref a), SenderFlavor::List(ref b)) => a == b,
+            (SenderFlavor::Zero(ref a), SenderFlavor::Zero(ref b)) => a == b,
+            _ => false,
+        }
+    }
 }
 
 impl<T> Drop for Sender<T> {
@@ -717,7 +738,8 @@ impl<T> Receiver<T> {
                 }
             }
             ReceiverFlavor::Never(chan) => chan.recv(None),
-        }.map_err(|_| RecvError)
+        }
+        .map_err(|_| RecvError)
     }
 
     /// Waits for a message to be received from the channel, but only for a limited time.
@@ -958,6 +980,33 @@ impl<T> Receiver<T> {
     pub fn try_iter(&self) -> TryIter<T> {
         TryIter { receiver: self }
     }
+
+    /// Returns `true` if receivers belong to the same channel.
+    ///
+    /// # Examples
+    ///
+    /// ```rust
+    /// use crossbeam_channel::unbounded;
+    ///
+    /// let (_, r) = unbounded::<usize>();
+    ///
+    /// let r2 = r.clone();
+    /// assert!(r.same_channel(&r2));
+    ///
+    /// let (_, r3) = unbounded();
+    /// assert!(!r.same_channel(&r3));
+    /// ```
+    pub fn same_channel(&self, other: &Receiver<T>) -> bool {
+        match (&self.flavor, &other.flavor) {
+            (ReceiverFlavor::Array(a), ReceiverFlavor::Array(b)) => a == b,
+            (ReceiverFlavor::List(a), ReceiverFlavor::List(b)) => a == b,
+            (ReceiverFlavor::Zero(a), ReceiverFlavor::Zero(b)) => a == b,
+            (ReceiverFlavor::After(a), ReceiverFlavor::After(b)) => Arc::ptr_eq(a, b),
+            (ReceiverFlavor::Tick(a), ReceiverFlavor::Tick(b)) => Arc::ptr_eq(a, b),
+            (ReceiverFlavor::Never(_), ReceiverFlavor::Never(_)) => true,
+            _ => false,
+        }
+    }
 }
 
 impl<T> Drop for Receiver<T> {
@@ -967,9 +1016,9 @@ impl<T> Drop for Receiver<T> {
                 ReceiverFlavor::Array(chan) => chan.release(|c| c.disconnect()),
                 ReceiverFlavor::List(chan) => chan.release(|c| c.disconnect()),
                 ReceiverFlavor::Zero(chan) => chan.release(|c| c.disconnect()),
-                ReceiverFlavor::After(_) => {},
-                ReceiverFlavor::Tick(_) => {},
-                ReceiverFlavor::Never(_) => {},
+                ReceiverFlavor::After(_) => {}
+                ReceiverFlavor::Tick(_) => {}
+                ReceiverFlavor::Never(_) => {}
             }
         }
     }
diff --git a/vendor/crossbeam-channel/src/context.rs b/vendor/crossbeam-channel/src/context.rs
index cd1613ab6e..c6e5c15db3 100644
--- a/vendor/crossbeam-channel/src/context.rs
+++ b/vendor/crossbeam-channel/src/context.rs
@@ -11,12 +11,13 @@ use crossbeam_utils::Backoff;
 use select::Selected;
 
 /// Thread-local context used in select.
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct Context {
     inner: Arc<Inner>,
 }
 
 /// Inner representation of `Context`.
+#[derive(Debug)]
 struct Inner {
     /// Selected operation.
     select: AtomicUsize,
@@ -58,7 +59,8 @@ impl Context {
                     cell.set(Some(cx));
                     res
                 }
-            }).unwrap_or_else(|_| f(&Context::new()))
+            })
+            .unwrap_or_else(|_| f(&Context::new()))
     }
 
     /// Creates a new `Context`.
diff --git a/vendor/crossbeam-channel/src/counter.rs b/vendor/crossbeam-channel/src/counter.rs
index 1d76480fd2..2eaf067820 100644
--- a/vendor/crossbeam-channel/src/counter.rs
+++ b/vendor/crossbeam-channel/src/counter.rs
@@ -1,4 +1,4 @@
-///! Reference counter for channels.
+//! Reference counter for channels.
 
 use std::isize;
 use std::ops;
@@ -13,8 +13,8 @@ struct Counter<C> {
     /// The number of receivers associated with the channel.
     receivers: AtomicUsize,
 
-    /// If `true`, either the sending or receiving side has been dropped.
-    disconnected: AtomicBool,
+    /// Set to `true` if the last sender or the last receiver reference deallocates the channel.
+    destroy: AtomicBool,
 
     /// The internal channel.
     chan: C,
@@ -25,7 +25,7 @@ pub fn new<C>(chan: C) -> (Sender<C>, Receiver<C>) {
     let counter = Box::into_raw(Box::new(Counter {
         senders: AtomicUsize::new(1),
         receivers: AtomicUsize::new(1),
-        disconnected: AtomicBool::new(false),
+        destroy: AtomicBool::new(false),
         chan,
     }));
     let s = Sender { counter };
@@ -62,12 +62,12 @@ impl<C> Sender<C> {
 
     /// Releases the sender reference.
     ///
-    /// Function `f` will be called if this is the last sender reference.
-    pub unsafe fn release<F: FnOnce(&C)>(&self, f: F) {
+    /// Function `disconnect` will be called if this is the last sender reference.
+    pub unsafe fn release<F: FnOnce(&C) -> bool>(&self, disconnect: F) {
         if self.counter().senders.fetch_sub(1, Ordering::AcqRel) == 1 {
-            f(&self.counter().chan);
+            disconnect(&self.counter().chan);
 
-            if self.counter().disconnected.swap(true, Ordering::AcqRel) {
+            if self.counter().destroy.swap(true, Ordering::AcqRel) {
                 drop(Box::from_raw(self.counter));
             }
         }
@@ -82,6 +82,12 @@ impl<C> ops::Deref for Sender<C> {
     }
 }
 
+impl<C> PartialEq for Sender<C> {
+    fn eq(&self, other: &Sender<C>) -> bool {
+        self.counter == other.counter
+    }
+}
+
 /// The receiving side.
 pub struct Receiver<C> {
     counter: *mut Counter<C>,
@@ -111,12 +117,12 @@ impl<C> Receiver<C> {
 
     /// Releases the receiver reference.
     ///
-    /// Function `f` will be called if this is the last receiver reference.
-    pub unsafe fn release<F: FnOnce(&C)>(&self, f: F) {
+    /// Function `disconnect` will be called if this is the last receiver reference.
+    pub unsafe fn release<F: FnOnce(&C) -> bool>(&self, disconnect: F) {
         if self.counter().receivers.fetch_sub(1, Ordering::AcqRel) == 1 {
-            f(&self.counter().chan);
+            disconnect(&self.counter().chan);
 
-            if self.counter().disconnected.swap(true, Ordering::AcqRel) {
+            if self.counter().destroy.swap(true, Ordering::AcqRel) {
                 drop(Box::from_raw(self.counter));
             }
         }
@@ -130,3 +136,9 @@ impl<C> ops::Deref for Receiver<C> {
         &self.counter().chan
     }
 }
+
+impl<C> PartialEq for Receiver<C> {
+    fn eq(&self, other: &Receiver<C>) -> bool {
+        self.counter == other.counter
+    }
+}
diff --git a/vendor/crossbeam-channel/src/err.rs b/vendor/crossbeam-channel/src/err.rs
index 02c7d44f4e..468ce5cd89 100644
--- a/vendor/crossbeam-channel/src/err.rs
+++ b/vendor/crossbeam-channel/src/err.rs
@@ -132,7 +132,7 @@ impl<T: Send> error::Error for SendError<T> {
         "sending on a disconnected channel"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -183,7 +183,7 @@ impl<T: Send> error::Error for TrySendError<T> {
         }
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -254,7 +254,7 @@ impl<T: Send> error::Error for SendTimeoutError<T> {
         "sending on an empty and disconnected channel"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -317,7 +317,7 @@ impl error::Error for RecvError {
         "receiving on an empty and disconnected channel"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -339,7 +339,7 @@ impl error::Error for TryRecvError {
         }
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -387,7 +387,7 @@ impl error::Error for RecvTimeoutError {
         }
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -429,7 +429,7 @@ impl error::Error for TrySelectError {
         "all operations in select would block"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
@@ -445,7 +445,7 @@ impl error::Error for SelectTimeoutError {
         "timed out waiting on select"
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         None
     }
 }
diff --git a/vendor/crossbeam-channel/src/flavors/array.rs b/vendor/crossbeam-channel/src/flavors/array.rs
index d38dc28e42..1537c0939b 100644
--- a/vendor/crossbeam-channel/src/flavors/array.rs
+++ b/vendor/crossbeam-channel/src/flavors/array.rs
@@ -37,6 +37,7 @@ struct Slot<T> {
 }
 
 /// The token type for the array flavor.
+#[derive(Debug)]
 pub struct ArrayToken {
     /// Slot to read from or write to.
     slot: *const u8,
@@ -99,24 +100,9 @@ pub struct Channel<T> {
 
 impl<T> Channel<T> {
     /// Creates a bounded channel of capacity `cap`.
-    ///
-    /// # Panics
-    ///
-    /// Panics if the capacity is not in the range `1 ..= usize::max_value() / 4`.
     pub fn with_capacity(cap: usize) -> Self {
         assert!(cap > 0, "capacity must be positive");
 
-        // Make sure there are at least two most significant bits: one to encode laps and one more
-        // to indicate that the channel is disconnected. If we can't reserve two bits, then panic.
-        // In that case, the buffer is likely too large to allocate anyway.
-        let cap_limit = usize::max_value() / 4;
-        assert!(
-            cap <= cap_limit,
-            "channel capacity is too large: {} > {}",
-            cap,
-            cap_limit
-        );
-
         // Compute constants `mark_bit` and `one_lap`.
         let mark_bit = (cap + 1).next_power_of_two();
         let one_lap = mark_bit * 2;
@@ -200,10 +186,12 @@ impl<T> Channel<T> {
                 };
 
                 // Try moving the tail.
-                match self
-                    .tail
-                    .compare_exchange_weak(tail, new_tail, Ordering::SeqCst, Ordering::Relaxed)
-                {
+                match self.tail.compare_exchange_weak(
+                    tail,
+                    new_tail,
+                    Ordering::SeqCst,
+                    Ordering::Relaxed,
+                ) {
                     Ok(_) => {
                         // Prepare the token for the follow-up call to `write`.
                         token.array.slot = slot as *const Slot<T> as *const u8;
@@ -280,10 +268,12 @@ impl<T> Channel<T> {
                 };
 
                 // Try moving the head.
-                match self
-                    .head
-                    .compare_exchange_weak(head, new, Ordering::SeqCst, Ordering::Relaxed)
-                {
+                match self.head.compare_exchange_weak(
+                    head,
+                    new,
+                    Ordering::SeqCst,
+                    Ordering::Relaxed,
+                ) {
                     Ok(_) => {
                         // Prepare the token for the follow-up call to `read`.
                         token.array.slot = slot as *const Slot<T> as *const u8;
@@ -370,6 +360,12 @@ impl<T> Channel<T> {
                 }
             }
 
+            if let Some(d) = deadline {
+                if Instant::now() >= d {
+                    return Err(SendTimeoutError::Timeout(msg));
+                }
+            }
+
             Context::with(|cx| {
                 // Prepare for blocking until a receiver wakes us up.
                 let oper = Operation::hook(token);
@@ -391,12 +387,6 @@ impl<T> Channel<T> {
                     Selected::Operation(_) => {}
                 }
             });
-
-            if let Some(d) = deadline {
-                if Instant::now() >= d {
-                    return Err(SendTimeoutError::Timeout(msg));
-                }
-            }
         }
     }
 
@@ -430,6 +420,12 @@ impl<T> Channel<T> {
                 }
             }
 
+            if let Some(d) = deadline {
+                if Instant::now() >= d {
+                    return Err(RecvTimeoutError::Timeout);
+                }
+            }
+
             Context::with(|cx| {
                 // Prepare for blocking until a sender wakes us up.
                 let oper = Operation::hook(token);
@@ -453,12 +449,6 @@ impl<T> Channel<T> {
                     Selected::Operation(_) => {}
                 }
             });
-
-            if let Some(d) = deadline {
-                if Instant::now() >= d {
-                    return Err(RecvTimeoutError::Timeout);
-                }
-            }
         }
     }
 
@@ -492,13 +482,18 @@ impl<T> Channel<T> {
         Some(self.cap)
     }
 
-    /// Disconnects the channel and wakes up all blocked receivers.
-    pub fn disconnect(&self) {
+    /// Disconnects the channel and wakes up all blocked senders and receivers.
+    ///
+    /// Returns `true` if this call disconnected the channel.
+    pub fn disconnect(&self) -> bool {
         let tail = self.tail.fetch_or(self.mark_bit, Ordering::SeqCst);
 
         if tail & self.mark_bit == 0 {
             self.senders.disconnect();
             self.receivers.disconnect();
+            true
+        } else {
+            false
         }
     }
 
diff --git a/vendor/crossbeam-channel/src/flavors/list.rs b/vendor/crossbeam-channel/src/flavors/list.rs
index fae0600597..ae286d3e40 100644
--- a/vendor/crossbeam-channel/src/flavors/list.rs
+++ b/vendor/crossbeam-channel/src/flavors/list.rs
@@ -119,6 +119,7 @@ struct Position<T> {
 }
 
 /// The token type for the list flavor.
+#[derive(Debug)]
 pub struct ListToken {
     /// The block of slots.
     block: *const u8,
@@ -221,7 +222,12 @@ impl<T> Channel<T> {
             if block.is_null() {
                 let new = Box::into_raw(Box::new(Block::<T>::new()));
 
-                if self.tail.block.compare_and_swap(block, new, Ordering::Release) == block {
+                if self
+                    .tail
+                    .block
+                    .compare_and_swap(block, new, Ordering::Release)
+                    == block
+                {
                     self.head.block.store(new, Ordering::Release);
                     block = new;
                 } else {
@@ -235,14 +241,12 @@ impl<T> Channel<T> {
             let new_tail = tail + (1 << SHIFT);
 
             // Try advancing the tail forward.
-            match self.tail.index
-                .compare_exchange_weak(
-                    tail,
-                    new_tail,
-                    Ordering::SeqCst,
-                    Ordering::Acquire,
-                )
-            {
+            match self.tail.index.compare_exchange_weak(
+                tail,
+                new_tail,
+                Ordering::SeqCst,
+                Ordering::Acquire,
+            ) {
                 Ok(_) => unsafe {
                     // If we've reached the end of the block, install the next one.
                     if offset + 1 == BLOCK_CAP {
@@ -255,7 +259,7 @@ impl<T> Channel<T> {
                     token.list.block = block as *const u8;
                     token.list.offset = offset;
                     return true;
-                }
+                },
                 Err(t) => {
                     tail = t;
                     block = self.tail.block.load(Ordering::Acquire);
@@ -337,14 +341,12 @@ impl<T> Channel<T> {
             }
 
             // Try moving the head index forward.
-            match self.head.index
-                .compare_exchange_weak(
-                    head,
-                    new_head,
-                    Ordering::SeqCst,
-                    Ordering::Acquire,
-                )
-            {
+            match self.head.index.compare_exchange_weak(
+                head,
+                new_head,
+                Ordering::SeqCst,
+                Ordering::Acquire,
+            ) {
                 Ok(_) => unsafe {
                     // If we've reached the end of the block, move to the next one.
                     if offset + 1 == BLOCK_CAP {
@@ -361,7 +363,7 @@ impl<T> Channel<T> {
                     token.list.block = block as *const u8;
                     token.list.offset = offset;
                     return true;
-                }
+                },
                 Err(h) => {
                     head = h;
                     block = self.head.block.load(Ordering::Acquire);
@@ -446,6 +448,12 @@ impl<T> Channel<T> {
                 }
             }
 
+            if let Some(d) = deadline {
+                if Instant::now() >= d {
+                    return Err(RecvTimeoutError::Timeout);
+                }
+            }
+
             // Prepare for blocking until a sender wakes us up.
             Context::with(|cx| {
                 let oper = Operation::hook(token);
@@ -469,12 +477,6 @@ impl<T> Channel<T> {
                     Selected::Operation(_) => {}
                 }
             });
-
-            if let Some(d) = deadline {
-                if Instant::now() >= d {
-                    return Err(RecvTimeoutError::Timeout);
-                }
-            }
         }
     }
 
@@ -521,11 +523,16 @@ impl<T> Channel<T> {
     }
 
     /// Disconnects the channel and wakes up all blocked receivers.
-    pub fn disconnect(&self) {
+    ///
+    /// Returns `true` if this call disconnected the channel.
+    pub fn disconnect(&self) -> bool {
         let tail = self.tail.index.fetch_or(MARK_BIT, Ordering::SeqCst);
 
         if tail & MARK_BIT == 0 {
             self.receivers.disconnect();
+            true
+        } else {
+            false
         }
     }
 
diff --git a/vendor/crossbeam-channel/src/flavors/tick.rs b/vendor/crossbeam-channel/src/flavors/tick.rs
index 7418661a79..3933886aee 100644
--- a/vendor/crossbeam-channel/src/flavors/tick.rs
+++ b/vendor/crossbeam-channel/src/flavors/tick.rs
@@ -60,7 +60,7 @@ impl Channel {
         loop {
             // Compute the time to sleep until the next message or the deadline.
             let offset = {
-                let mut delivery_time = self.delivery_time.load();
+                let delivery_time = self.delivery_time.load();
                 let now = Instant::now();
 
                 // Check if we can receive the next message.
diff --git a/vendor/crossbeam-channel/src/flavors/zero.rs b/vendor/crossbeam-channel/src/flavors/zero.rs
index 031bfb8b11..ee1bfc5344 100644
--- a/vendor/crossbeam-channel/src/flavors/zero.rs
+++ b/vendor/crossbeam-channel/src/flavors/zero.rs
@@ -12,7 +12,7 @@ use crossbeam_utils::Backoff;
 use context::Context;
 use err::{RecvTimeoutError, SendTimeoutError, TryRecvError, TrySendError};
 use select::{Operation, SelectHandle, Selected, Token};
-use utils::Mutex;
+use utils::Spinlock;
 use waker::Waker;
 
 /// A pointer to a packet.
@@ -82,7 +82,7 @@ struct Inner {
 /// Zero-capacity channel.
 pub struct Channel<T> {
     /// Inner representation of the channel.
-    inner: Mutex<Inner>,
+    inner: Spinlock<Inner>,
 
     /// Indicates that dropping a `Channel<T>` may drop values of type `T`.
     _marker: PhantomData<T>,
@@ -92,7 +92,7 @@ impl<T> Channel<T> {
     /// Constructs a new zero-capacity channel.
     pub fn new() -> Self {
         Channel {
-            inner: Mutex::new(Inner {
+            inner: Spinlock::new(Inner {
                 senders: Waker::new(),
                 receivers: Waker::new(),
                 is_disconnected: false,
@@ -322,14 +322,19 @@ impl<T> Channel<T> {
         })
     }
 
-    /// Disconnects the channel and wakes up all blocked receivers.
-    pub fn disconnect(&self) {
+    /// Disconnects the channel and wakes up all blocked senders and receivers.
+    ///
+    /// Returns `true` if this call disconnected the channel.
+    pub fn disconnect(&self) -> bool {
         let mut inner = self.inner.lock();
 
         if !inner.is_disconnected {
             inner.is_disconnected = true;
             inner.senders.disconnect();
             inner.receivers.disconnect();
+            true
+        } else {
+            false
         }
     }
 
diff --git a/vendor/crossbeam-channel/src/lib.rs b/vendor/crossbeam-channel/src/lib.rs
index 877378cea4..1d5160056b 100644
--- a/vendor/crossbeam-channel/src/lib.rs
+++ b/vendor/crossbeam-channel/src/lib.rs
@@ -348,7 +348,6 @@
 #![warn(missing_debug_implementations)]
 
 extern crate crossbeam_utils;
-extern crate smallvec;
 
 mod channel;
 mod context;
@@ -360,6 +359,13 @@ mod select_macro;
 mod utils;
 mod waker;
 
+/// Crate internals used by the `select!` macro.
+#[doc(hidden)]
+pub mod internal {
+    pub use select::SelectHandle;
+    pub use select::{select, select_timeout, try_select};
+}
+
 pub use channel::{after, never, tick};
 pub use channel::{bounded, unbounded};
 pub use channel::{IntoIter, Iter, TryIter};
@@ -367,6 +373,6 @@ pub use channel::{Receiver, Sender};
 
 pub use select::{Select, SelectedOperation};
 
-pub use err::{RecvError, RecvTimeoutError, TryRecvError};
 pub use err::{ReadyTimeoutError, SelectTimeoutError, TryReadyError, TrySelectError};
+pub use err::{RecvError, RecvTimeoutError, TryRecvError};
 pub use err::{SendError, SendTimeoutError, TrySendError};
diff --git a/vendor/crossbeam-channel/src/select.rs b/vendor/crossbeam-channel/src/select.rs
index c7a8fa58b2..60c6a45dcb 100644
--- a/vendor/crossbeam-channel/src/select.rs
+++ b/vendor/crossbeam-channel/src/select.rs
@@ -6,7 +6,6 @@ use std::mem;
 use std::time::{Duration, Instant};
 
 use crossbeam_utils::Backoff;
-use smallvec::SmallVec;
 
 use channel::{self, Receiver, Sender};
 use context::Context;
@@ -20,7 +19,7 @@ use utils;
 /// `read` or `write`.
 ///
 /// Each field contains data associated with a specific channel flavor.
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub struct Token {
     pub after: flavors::after::AfterToken,
     pub array: flavors::array::ArrayToken,
@@ -172,7 +171,7 @@ enum Timeout {
 /// Successful receive operations will have to be followed up by `channel::read()` and successful
 /// send operations by `channel::write()`.
 fn run_select(
-    handles: &mut [(&SelectHandle, usize, *const u8)],
+    handles: &mut [(&dyn SelectHandle, usize, *const u8)],
     timeout: Timeout,
 ) -> Option<(Token, usize, *const u8)> {
     if handles.is_empty() {
@@ -221,7 +220,7 @@ fn run_select(
                 registered_count += 1;
 
                 // If registration returns `false`, that means the operation has just become ready.
-                if handle.register(Operation::hook::<&SelectHandle>(handle), cx) {
+                if handle.register(Operation::hook::<&dyn SelectHandle>(handle), cx) {
                     // Try aborting select.
                     sel = match cx.try_select(Selected::Aborted) {
                         Ok(()) => {
@@ -260,7 +259,7 @@ fn run_select(
 
             // Unregister all registered operations.
             for (handle, _, _) in handles.iter_mut().take(registered_count) {
-                handle.unregister(Operation::hook::<&SelectHandle>(handle));
+                handle.unregister(Operation::hook::<&dyn SelectHandle>(handle));
             }
 
             match sel {
@@ -280,7 +279,8 @@ fn run_select(
                     // Find the selected operation.
                     for (handle, i, ptr) in handles.iter_mut() {
                         // Is this the selected operation?
-                        if sel == Selected::Operation(Operation::hook::<&SelectHandle>(handle)) {
+                        if sel == Selected::Operation(Operation::hook::<&dyn SelectHandle>(handle))
+                        {
                             // Try selecting this operation.
                             if handle.accept(&mut token, cx) {
                                 return Some((*i, *ptr));
@@ -319,7 +319,7 @@ fn run_select(
 
 /// Runs until one of the operations becomes ready, potentially blocking the current thread.
 fn run_ready(
-    handles: &mut [(&SelectHandle, usize, *const u8)],
+    handles: &mut [(&dyn SelectHandle, usize, *const u8)],
     timeout: Timeout,
 ) -> Option<usize> {
     if handles.is_empty() {
@@ -376,7 +376,7 @@ fn run_ready(
             // Begin watching all operations.
             for (handle, _, _) in handles.iter_mut() {
                 registered_count += 1;
-                let oper = Operation::hook::<&SelectHandle>(handle);
+                let oper = Operation::hook::<&dyn SelectHandle>(handle);
 
                 // If registration returns `false`, that means the operation has just become ready.
                 if handle.watch(oper, cx) {
@@ -414,7 +414,7 @@ fn run_ready(
 
             // Unwatch all operations.
             for (handle, _, _) in handles.iter_mut().take(registered_count) {
-                handle.unwatch(Operation::hook::<&SelectHandle>(handle));
+                handle.unwatch(Operation::hook::<&dyn SelectHandle>(handle));
             }
 
             match sel {
@@ -423,7 +423,7 @@ fn run_ready(
                 Selected::Disconnected => {}
                 Selected::Operation(_) => {
                     for (handle, i, _) in handles.iter_mut() {
-                        let oper = Operation::hook::<&SelectHandle>(handle);
+                        let oper = Operation::hook::<&dyn SelectHandle>(handle);
                         if sel == Selected::Operation(oper) {
                             return Some(*i);
                         }
@@ -441,6 +441,59 @@ fn run_ready(
     }
 }
 
+/// Attempts to select one of the operations without blocking.
+#[inline]
+pub fn try_select<'a>(
+    handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
+) -> Result<SelectedOperation<'a>, TrySelectError> {
+    match run_select(handles, Timeout::Now) {
+        None => Err(TrySelectError),
+        Some((token, index, ptr)) => Ok(SelectedOperation {
+            token,
+            index,
+            ptr,
+            _marker: PhantomData,
+        }),
+    }
+}
+
+/// Blocks until one of the operations becomes ready and selects it.
+#[inline]
+pub fn select<'a>(
+    handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
+) -> SelectedOperation<'a> {
+    if handles.is_empty() {
+        panic!("no operations have been added to `Select`");
+    }
+
+    let (token, index, ptr) = run_select(handles, Timeout::Never).unwrap();
+    SelectedOperation {
+        token,
+        index,
+        ptr,
+        _marker: PhantomData,
+    }
+}
+
+/// Blocks for a limited time until one of the operations becomes ready and selects it.
+#[inline]
+pub fn select_timeout<'a>(
+    handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
+    timeout: Duration,
+) -> Result<SelectedOperation<'a>, SelectTimeoutError> {
+    let timeout = Timeout::At(Instant::now() + timeout);
+
+    match run_select(handles, timeout) {
+        None => Err(SelectTimeoutError),
+        Some((token, index, ptr)) => Ok(SelectedOperation {
+            token,
+            index,
+            ptr,
+            _marker: PhantomData,
+        }),
+    }
+}
+
 /// Selects from a set of channel operations.
 ///
 /// `Select` allows you to define a set of channel operations, wait until any one of them becomes
@@ -526,7 +579,10 @@ fn run_ready(
 /// [`ready_timeout`]: struct.Select.html#method.ready_timeout
 pub struct Select<'a> {
     /// A list of senders and receivers participating in selection.
-    handles: SmallVec<[(&'a SelectHandle, usize, *const u8); 4]>,
+    handles: Vec<(&'a dyn SelectHandle, usize, *const u8)>,
+
+    /// The next index to assign to an operation.
+    next_index: usize,
 }
 
 unsafe impl<'a> Send for Select<'a> {}
@@ -547,7 +603,8 @@ impl<'a> Select<'a> {
     /// ```
     pub fn new() -> Select<'a> {
         Select {
-            handles: SmallVec::new(),
+            handles: Vec::with_capacity(4),
+            next_index: 0,
         }
     }
 
@@ -567,9 +624,10 @@ impl<'a> Select<'a> {
     /// let index = sel.send(&s);
     /// ```
     pub fn send<T>(&mut self, s: &'a Sender<T>) -> usize {
-        let i = self.handles.len();
+        let i = self.next_index;
         let ptr = s as *const Sender<_> as *const u8;
         self.handles.push((s, i, ptr));
+        self.next_index += 1;
         i
     }
 
@@ -589,12 +647,69 @@ impl<'a> Select<'a> {
     /// let index = sel.recv(&r);
     /// ```
     pub fn recv<T>(&mut self, r: &'a Receiver<T>) -> usize {
-        let i = self.handles.len();
+        let i = self.next_index;
         let ptr = r as *const Receiver<_> as *const u8;
         self.handles.push((r, i, ptr));
+        self.next_index += 1;
         i
     }
 
+    /// Removes a previously added operation.
+    ///
+    /// This is useful when an operation is selected because the channel got disconnected and we
+    /// want to try again to select a different operation instead.
+    ///
+    /// If new operations are added after removing some, the indices of removed operations will not
+    /// be reused.
+    ///
+    /// # Panics
+    ///
+    /// An attempt to remove a non-existing or already removed operation will panic.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use crossbeam_channel::{unbounded, Select};
+    ///
+    /// let (s1, r1) = unbounded::<i32>();
+    /// let (_, r2) = unbounded::<i32>();
+    ///
+    /// let mut sel = Select::new();
+    /// let oper1 = sel.recv(&r1);
+    /// let oper2 = sel.recv(&r2);
+    ///
+    /// // Both operations are initially ready, so a random one will be executed.
+    /// let oper = sel.select();
+    /// assert_eq!(oper.index(), oper2);
+    /// assert!(oper.recv(&r2).is_err());
+    /// sel.remove(oper2);
+    ///
+    /// s1.send(10).unwrap();
+    ///
+    /// let oper = sel.select();
+    /// assert_eq!(oper.index(), oper1);
+    /// assert_eq!(oper.recv(&r1), Ok(10));
+    /// ```
+    pub fn remove(&mut self, index: usize) {
+        assert!(
+            index < self.next_index,
+            "index out of bounds; {} >= {}",
+            index,
+            self.next_index,
+        );
+
+        let i = self
+            .handles
+            .iter()
+            .enumerate()
+            .find(|(_, (_, i, _))| *i == index)
+            .expect("no operation with this index")
+            .0;
+
+        self.handles.swap_remove(i);
+    }
+
     /// Attempts to select one of the operations without blocking.
     ///
     /// If an operation is ready, it is selected and returned. If multiple operations are ready at
@@ -638,15 +753,7 @@ impl<'a> Select<'a> {
     /// }
     /// ```
     pub fn try_select(&mut self) -> Result<SelectedOperation<'a>, TrySelectError> {
-        match run_select(&mut self.handles, Timeout::Now) {
-            None => Err(TrySelectError),
-            Some((token, index, ptr)) => Ok(SelectedOperation {
-                token,
-                index,
-                ptr,
-                _marker: PhantomData,
-            }),
-        }
+        try_select(&mut self.handles)
     }
 
     /// Blocks until one of the operations becomes ready and selects it.
@@ -696,17 +803,7 @@ impl<'a> Select<'a> {
     /// }
     /// ```
     pub fn select(&mut self) -> SelectedOperation<'a> {
-        if self.handles.is_empty() {
-            panic!("no operations have been added to `Select`");
-        }
-
-        let (token, index, ptr) = run_select(&mut self.handles, Timeout::Never).unwrap();
-        SelectedOperation {
-            token,
-            index,
-            ptr,
-            _marker: PhantomData,
-        }
+        select(&mut self.handles)
     }
 
     /// Blocks for a limited time until one of the operations becomes ready and selects it.
@@ -759,17 +856,7 @@ impl<'a> Select<'a> {
         &mut self,
         timeout: Duration,
     ) -> Result<SelectedOperation<'a>, SelectTimeoutError> {
-        let timeout = Timeout::At(Instant::now() + timeout);
-
-        match run_select(&mut self.handles, timeout) {
-            None => Err(SelectTimeoutError),
-            Some((token, index, ptr)) => Ok(SelectedOperation {
-                token,
-                index,
-                ptr,
-                _marker: PhantomData,
-            }),
-        }
+        select_timeout(&mut self.handles, timeout)
     }
 
     /// Attempts to find a ready operation without blocking.
@@ -919,6 +1006,7 @@ impl<'a> Clone for Select<'a> {
     fn clone(&self) -> Select<'a> {
         Select {
             handles: self.handles.clone(),
+            next_index: self.next_index,
         }
     }
 }
diff --git a/vendor/crossbeam-channel/src/select_macro.rs b/vendor/crossbeam-channel/src/select_macro.rs
index f74ae722f3..9aaaa9e935 100644
--- a/vendor/crossbeam-channel/src/select_macro.rs
+++ b/vendor/crossbeam-channel/src/select_macro.rs
@@ -38,9 +38,10 @@ macro_rules! crossbeam_channel_delegate {
 /// 3. `@case`: Parses a single case and verifies its argument list.
 ///
 /// The codegen stage consists of these subparts:
-/// 1. `@init`: Attempts to optimize `select!` away and initializes a `Select`.
-/// 2. `@add`: Adds send/receive operations to the `Select` and starts selection.
-/// 3. `@complete`: Completes the selected send/receive operation.
+/// 1. `@init`: Attempts to optimize `select!` away and initializes the list of handles.
+/// 1. `@count`: Counts the listed cases.
+/// 3. `@add`: Adds send/receive operations to the list of handles and starts selection.
+/// 4. `@complete`: Completes the selected send/receive operation.
 ///
 /// If the parsing stage encounters a syntax error or the codegen stage ends up with too many
 /// cases to process, the macro fails with a compile-time error.
@@ -571,7 +572,7 @@ macro_rules! crossbeam_channel_internal {
     };
     // Print an error if there is an unexpected token after `default`.
     (@case
-        (default $($tail:tt)*)
+        (default $t:tt $($tail:tt)*)
         $cases:tt
         $default:tt
     ) => {
@@ -754,13 +755,17 @@ macro_rules! crossbeam_channel_internal {
     //     }
     // }};
 
-    // Create a `Select` and add operations to it.
+    // Create the list of handles and add operations to it.
     (@init
         ($($cases:tt)*)
         $default:tt
     ) => {{
+        const _LEN: usize = crossbeam_channel_internal!(@count ($($cases)*));
+        let _handle: &$crate::internal::SelectHandle = &$crate::never::<()>();
+
         #[allow(unused_mut)]
-        let mut _sel = $crate::Select::new();
+        let mut _sel = [(_handle, 0, ::std::ptr::null()); _LEN];
+
         crossbeam_channel_internal!(
             @add
             _sel
@@ -785,7 +790,7 @@ macro_rules! crossbeam_channel_internal {
                 (15usize _oper15)
                 (16usize _oper16)
                 (17usize _oper17)
-                (20usize _oper18)
+                (18usize _oper18)
                 (19usize _oper19)
                 (20usize _oper20)
                 (21usize _oper21)
@@ -804,6 +809,14 @@ macro_rules! crossbeam_channel_internal {
         )
     }};
 
+    // Count the listed cases.
+    (@count ()) => {
+        0
+    };
+    (@count ($oper:ident $args:tt -> $res:pat => $body:tt, $($cases:tt)*)) => {
+        1 + crossbeam_channel_internal!(@count ($($cases)*))
+    };
+
     // Run blocking selection.
     (@add
         $sel:ident
@@ -813,7 +826,7 @@ macro_rules! crossbeam_channel_internal {
         $cases:tt
     ) => {{
         let _oper: $crate::SelectedOperation<'_> = {
-            let _oper = $sel.select();
+            let _oper = $crate::internal::select(&mut $sel);
 
             // Erase the lifetime so that `sel` can be dropped early even without NLL.
             #[allow(unsafe_code)]
@@ -836,7 +849,7 @@ macro_rules! crossbeam_channel_internal {
         $cases:tt
     ) => {{
         let _oper: ::std::option::Option<$crate::SelectedOperation<'_>> = {
-            let _oper = $sel.try_select();
+            let _oper = $crate::internal::try_select(&mut $sel);
 
             // Erase the lifetime so that `sel` can be dropped early even without NLL.
             #[allow(unsafe_code)]
@@ -845,7 +858,7 @@ macro_rules! crossbeam_channel_internal {
 
         match _oper {
             None => {
-                ::std::mem::drop($sel);
+                { $sel };
                 $body
             }
             Some(_oper) => {
@@ -867,7 +880,7 @@ macro_rules! crossbeam_channel_internal {
         $cases:tt
     ) => {{
         let _oper: ::std::option::Option<$crate::SelectedOperation<'_>> = {
-            let _oper = $sel.select_timeout($timeout);
+            let _oper = $crate::internal::select_timeout(&mut $sel, $timeout);
 
             // Erase the lifetime so that `sel` can be dropped early even without NLL.
             #[allow(unsafe_code)]
@@ -876,7 +889,7 @@ macro_rules! crossbeam_channel_internal {
 
         match _oper {
             ::std::option::Option::None => {
-                ::std::mem::drop($sel);
+                { $sel };
                 $body
             }
             ::std::option::Option::Some(_oper) => {
@@ -919,7 +932,7 @@ macro_rules! crossbeam_channel_internal {
                     }
                     unbind(_r)
                 };
-                $sel.recv($var);
+                $sel[$i] = ($var, $i, $var as *const $crate::Receiver<_> as *const u8);
 
                 crossbeam_channel_internal!(
                     @add
@@ -952,7 +965,7 @@ macro_rules! crossbeam_channel_internal {
                     }
                     unbind(_s)
                 };
-                $sel.send($var);
+                $sel[$i] = ($var, $i, $var as *const $crate::Sender<_> as *const u8);
 
                 crossbeam_channel_internal!(
                     @add
@@ -974,7 +987,7 @@ macro_rules! crossbeam_channel_internal {
     ) => {{
         if $oper.index() == $i {
             let _res = $oper.recv($r);
-            ::std::mem::drop($sel);
+            { $sel };
 
             let $res = _res;
             $body
@@ -995,7 +1008,7 @@ macro_rules! crossbeam_channel_internal {
     ) => {{
         if $oper.index() == $i {
             let _res = $oper.send($s, $m);
-            ::std::mem::drop($sel);
+            { $sel };
 
             let $res = _res;
             $body
diff --git a/vendor/crossbeam-channel/src/utils.rs b/vendor/crossbeam-channel/src/utils.rs
index c02e565a9d..c6513bc3f8 100644
--- a/vendor/crossbeam-channel/src/utils.rs
+++ b/vendor/crossbeam-channel/src/utils.rs
@@ -61,58 +61,52 @@ pub fn sleep_until(deadline: Option<Instant>) {
     }
 }
 
-/// A simple spinlock-based mutex.
-pub struct Mutex<T> {
+/// A simple spinlock.
+pub struct Spinlock<T> {
     flag: AtomicBool,
     value: UnsafeCell<T>,
 }
 
-impl<T> Mutex<T> {
-    /// Returns a new mutex initialized with `value`.
-    pub fn new(value: T) -> Mutex<T> {
-        Mutex {
+impl<T> Spinlock<T> {
+    /// Returns a new spinlock initialized with `value`.
+    pub fn new(value: T) -> Spinlock<T> {
+        Spinlock {
             flag: AtomicBool::new(false),
             value: UnsafeCell::new(value),
         }
     }
 
-    /// Locks the mutex.
-    pub fn lock(&self) -> MutexGuard<'_, T> {
+    /// Locks the spinlock.
+    pub fn lock(&self) -> SpinlockGuard<'_, T> {
         let backoff = Backoff::new();
         while self.flag.swap(true, Ordering::Acquire) {
             backoff.snooze();
         }
-        MutexGuard {
-            parent: self,
-        }
+        SpinlockGuard { parent: self }
     }
 }
 
-/// A guard holding a mutex locked.
-pub struct MutexGuard<'a, T: 'a> {
-    parent: &'a Mutex<T>,
+/// A guard holding a spinlock locked.
+pub struct SpinlockGuard<'a, T: 'a> {
+    parent: &'a Spinlock<T>,
 }
 
-impl<'a, T> Drop for MutexGuard<'a, T> {
+impl<'a, T> Drop for SpinlockGuard<'a, T> {
     fn drop(&mut self) {
         self.parent.flag.store(false, Ordering::Release);
     }
 }
 
-impl<'a, T> Deref for MutexGuard<'a, T> {
+impl<'a, T> Deref for SpinlockGuard<'a, T> {
     type Target = T;
 
     fn deref(&self) -> &T {
-        unsafe {
-            &*self.parent.value.get()
-        }
+        unsafe { &*self.parent.value.get() }
     }
 }
 
-impl<'a, T> DerefMut for MutexGuard<'a, T> {
+impl<'a, T> DerefMut for SpinlockGuard<'a, T> {
     fn deref_mut(&mut self) -> &mut T {
-        unsafe {
-            &mut *self.parent.value.get()
-        }
+        unsafe { &mut *self.parent.value.get() }
     }
 }
diff --git a/vendor/crossbeam-channel/src/waker.rs b/vendor/crossbeam-channel/src/waker.rs
index d22bc64042..7f3428b7eb 100644
--- a/vendor/crossbeam-channel/src/waker.rs
+++ b/vendor/crossbeam-channel/src/waker.rs
@@ -5,7 +5,7 @@ use std::thread::{self, ThreadId};
 
 use context::Context;
 use select::{Operation, Selected};
-use utils::Mutex;
+use utils::Spinlock;
 
 /// Represents a thread blocked on a specific channel operation.
 pub struct Entry {
@@ -177,7 +177,7 @@ impl Drop for Waker {
 /// This is a simple wrapper around `Waker` that internally uses a mutex for synchronization.
 pub struct SyncWaker {
     /// The inner `Waker`.
-    inner: Mutex<Waker>,
+    inner: Spinlock<Waker>,
 
     /// `true` if the waker is empty.
     is_empty: AtomicBool,
@@ -188,8 +188,8 @@ impl SyncWaker {
     #[inline]
     pub fn new() -> Self {
         SyncWaker {
-            inner: Mutex::new(Waker::new()),
-            is_empty: AtomicBool::new(false),
+            inner: Spinlock::new(Waker::new()),
+            is_empty: AtomicBool::new(true),
         }
     }
 
diff --git a/vendor/crossbeam-channel/tests/after.rs b/vendor/crossbeam-channel/tests/after.rs
index 766706ce13..1137bb1b77 100644
--- a/vendor/crossbeam-channel/tests/after.rs
+++ b/vendor/crossbeam-channel/tests/after.rs
@@ -149,7 +149,8 @@ fn recv_two() {
                 recv(r2) -> _ => {}
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -222,7 +223,8 @@ fn select() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(hits.load(Ordering::SeqCst), COUNT);
 }
@@ -264,7 +266,8 @@ fn ready() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(hits.load(Ordering::SeqCst), COUNT);
 }
@@ -290,7 +293,8 @@ fn stress_clone() {
                     }
                 });
             }
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
diff --git a/vendor/crossbeam-channel/tests/array.rs b/vendor/crossbeam-channel/tests/array.rs
index 80e811fe8c..a6fc8451b1 100644
--- a/vendor/crossbeam-channel/tests/array.rs
+++ b/vendor/crossbeam-channel/tests/array.rs
@@ -5,12 +5,13 @@ extern crate crossbeam_channel;
 extern crate crossbeam_utils;
 extern crate rand;
 
+use std::any::Any;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::thread;
 use std::time::Duration;
 
-use crossbeam_channel::bounded;
+use crossbeam_channel::{bounded, Receiver};
 use crossbeam_channel::{RecvError, RecvTimeoutError, TryRecvError};
 use crossbeam_channel::{SendError, SendTimeoutError, TrySendError};
 use crossbeam_utils::thread::scope;
@@ -97,7 +98,8 @@ fn try_recv() {
             thread::sleep(ms(1000));
             s.send(7).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -119,7 +121,8 @@ fn recv() {
             s.send(8).unwrap();
             s.send(9).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -139,7 +142,8 @@ fn recv_timeout() {
             thread::sleep(ms(1500));
             s.send(7).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -161,7 +165,8 @@ fn try_send() {
             assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
             assert_eq!(r.recv(), Ok(3));
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -184,7 +189,8 @@ fn send() {
             assert_eq!(r.recv(), Ok(8));
             assert_eq!(r.recv(), Ok(9));
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -211,7 +217,8 @@ fn send_timeout() {
             assert_eq!(r.recv(), Ok(2));
             assert_eq!(r.recv(), Ok(4));
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -301,7 +308,8 @@ fn len() {
                 assert!(len <= CAP);
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(s.len(), 0);
     assert_eq!(r.len(), 0);
@@ -320,7 +328,8 @@ fn disconnect_wakes_sender() {
             thread::sleep(ms(1000));
             drop(r);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -335,7 +344,8 @@ fn disconnect_wakes_receiver() {
             thread::sleep(ms(1000));
             drop(s);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -356,7 +366,8 @@ fn spsc() {
                 s.send(i).unwrap();
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -383,7 +394,8 @@ fn mpmc() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     for c in v {
         assert_eq!(c.load(Ordering::SeqCst), THREADS);
@@ -400,7 +412,8 @@ fn stress_oneshot() {
         scope(|scope| {
             scope.spawn(|_| r.recv().unwrap());
             scope.spawn(|_| s.send(0).unwrap());
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -430,7 +443,8 @@ fn stress_iter() {
                 break;
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -466,7 +480,8 @@ fn stress_timeout_two_threads() {
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -505,7 +520,8 @@ fn drops() {
                     s.send(DropCounter).unwrap();
                 }
             });
-        }).unwrap();
+        })
+        .unwrap();
 
         for _ in 0..additional {
             s.send(DropCounter).unwrap();
@@ -534,7 +550,8 @@ fn linearizable() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -602,3 +619,41 @@ fn recv_in_send() {
         send(s, assert_eq!(r.recv(), Ok(()))) -> _ => {}
     }
 }
+
+#[test]
+fn channel_through_channel() {
+    const COUNT: usize = 1000;
+
+    type T = Box<dyn Any + Send>;
+
+    let (s, r) = bounded::<T>(1);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut s = s;
+
+            for _ in 0..COUNT {
+                let (new_s, new_r) = bounded(1);
+                let new_r: T = Box::new(Some(new_r));
+
+                s.send(new_r).unwrap();
+                s = new_s;
+            }
+        });
+
+        scope.spawn(move |_| {
+            let mut r = r;
+
+            for _ in 0..COUNT {
+                r = r
+                    .recv()
+                    .unwrap()
+                    .downcast_mut::<Option<Receiver<T>>>()
+                    .unwrap()
+                    .take()
+                    .unwrap()
+            }
+        });
+    })
+    .unwrap();
+}
diff --git a/vendor/crossbeam-channel/tests/golang.rs b/vendor/crossbeam-channel/tests/golang.rs
index 718f9ca795..be015b28fc 100644
--- a/vendor/crossbeam-channel/tests/golang.rs
+++ b/vendor/crossbeam-channel/tests/golang.rs
@@ -13,12 +13,13 @@
 extern crate crossbeam_channel;
 
 use std::any::Any;
+use std::cell::Cell;
 use std::collections::HashMap;
 use std::sync::{Arc, Condvar, Mutex};
 use std::thread;
 use std::time::Duration;
 
-use crossbeam_channel::{bounded, Receiver, Select, Sender};
+use crossbeam_channel::{bounded, tick, Receiver, Select, Sender};
 
 fn ms(ms: u64) -> Duration {
     Duration::from_millis(ms)
@@ -55,22 +56,12 @@ impl<T> Chan<T> {
     }
 
     fn try_recv(&self) -> Option<T> {
-        let r = self
-            .inner
-            .lock()
-            .unwrap()
-            .r
-            .clone();
+        let r = self.inner.lock().unwrap().r.clone();
         r.try_recv().ok()
     }
 
     fn recv(&self) -> Option<T> {
-        let r = self
-            .inner
-            .lock()
-            .unwrap()
-            .r
-            .clone();
+        let r = self.inner.lock().unwrap().r.clone();
         r.recv().ok()
     }
 
@@ -84,21 +75,11 @@ impl<T> Chan<T> {
     }
 
     fn rx(&self) -> Receiver<T> {
-        self.inner
-            .lock()
-            .unwrap()
-            .r
-            .clone()
+        self.inner.lock().unwrap().r.clone()
     }
 
     fn tx(&self) -> Sender<T> {
-        match self
-            .inner
-            .lock()
-            .unwrap()
-            .s
-            .as_ref()
-        {
+        match self.inner.lock().unwrap().s.as_ref() {
             None => {
                 let (s, r) = bounded(0);
                 std::mem::forget(r);
@@ -333,14 +314,351 @@ mod fifo {
     }
 }
 
+// https://github.com/golang/go/blob/master/test/chan/goroutines.go
+mod goroutines {
+    use super::*;
+
+    fn f(left: Chan<i32>, right: Chan<i32>) {
+        left.send(right.recv().unwrap());
+    }
+
+    #[test]
+    fn main() {
+        let n = 100i32;
+
+        let leftmost = make::<i32>(0);
+        let mut right = leftmost.clone();
+        let mut left = leftmost.clone();
+
+        for _ in 0..n {
+            right = make::<i32>(0);
+            go!(left, right, f(left, right));
+            left = right.clone();
+        }
+
+        go!(right, right.send(1));
+        leftmost.recv().unwrap();
+    }
+}
+
 // https://github.com/golang/go/blob/master/test/chan/nonblock.go
 mod nonblock {
-    // TODO
+    use super::*;
+
+    fn i32receiver(c: Chan<i32>, strobe: Chan<bool>) {
+        if c.recv().unwrap() != 123 {
+            panic!("i32 value");
+        }
+        strobe.send(true);
+    }
+
+    fn i32sender(c: Chan<i32>, strobe: Chan<bool>) {
+        c.send(234);
+        strobe.send(true);
+    }
+
+    fn i64receiver(c: Chan<i64>, strobe: Chan<bool>) {
+        if c.recv().unwrap() != 123456 {
+            panic!("i64 value");
+        }
+        strobe.send(true);
+    }
+
+    fn i64sender(c: Chan<i64>, strobe: Chan<bool>) {
+        c.send(234567);
+        strobe.send(true);
+    }
+
+    fn breceiver(c: Chan<bool>, strobe: Chan<bool>) {
+        if !c.recv().unwrap() {
+            panic!("b value");
+        }
+        strobe.send(true);
+    }
+
+    fn bsender(c: Chan<bool>, strobe: Chan<bool>) {
+        c.send(true);
+        strobe.send(true);
+    }
+
+    fn sreceiver(c: Chan<String>, strobe: Chan<bool>) {
+        if c.recv().unwrap() != "hello" {
+            panic!("x value");
+        }
+        strobe.send(true);
+    }
+
+    fn ssender(c: Chan<String>, strobe: Chan<bool>) {
+        c.send("hello again".to_string());
+        strobe.send(true);
+    }
+
+    const MAX_TRIES: usize = 10000; // Up to 100ms per test.
+
+    #[test]
+    fn main() {
+        let ticker = tick(Duration::new(0, 10_000)); // 10 us
+        let sleep = || {
+            ticker.recv().unwrap();
+            ticker.recv().unwrap();
+            thread::yield_now();
+            thread::yield_now();
+            thread::yield_now();
+        };
+
+        let sync = make::<bool>(0);
+
+        for buffer in 0..2 {
+            let c32 = make::<i32>(buffer);
+            let c64 = make::<i64>(buffer);
+            let cb = make::<bool>(buffer);
+            let cs = make::<String>(buffer);
+
+            select! {
+                recv(c32.rx()) -> _ => panic!("blocked i32sender"),
+                default => {}
+            }
+
+            select! {
+                recv(c64.rx()) -> _ => panic!("blocked i64sender"),
+                default => {}
+            }
+
+            select! {
+                recv(cb.rx()) -> _ => panic!("blocked bsender"),
+                default => {}
+            }
+
+            select! {
+                recv(cs.rx()) -> _ => panic!("blocked ssender"),
+                default => {}
+            }
+
+            go!(c32, sync, i32receiver(c32, sync));
+            let mut try = 0;
+            loop {
+                select! {
+                    send(c32.tx(), 123) -> _ => break,
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("i32receiver buffer={}", buffer);
+                            panic!("fail")
+                        }
+                        sleep();
+                    }
+                }
+            }
+            sync.recv();
+            go!(c32, sync, i32sender(c32, sync));
+            if buffer > 0 {
+                sync.recv();
+            }
+            let mut try = 0;
+            loop {
+                select! {
+                    recv(c32.rx()) -> v => {
+                        if v != Ok(234) {
+                            panic!("i32sender value");
+                        }
+                        break;
+                    }
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("i32sender buffer={}", buffer);
+                            panic!("fail");
+                        }
+                        sleep();
+                    }
+                }
+            }
+            if buffer == 0 {
+                sync.recv();
+            }
+
+            go!(c64, sync, i64receiver(c64, sync));
+            let mut try = 0;
+            loop {
+                select! {
+                    send(c64.tx(), 123456) -> _ => break,
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("i64receiver buffer={}", buffer);
+                            panic!("fail")
+                        }
+                        sleep();
+                    }
+                }
+            }
+            sync.recv();
+            go!(c64, sync, i64sender(c64, sync));
+            if buffer > 0 {
+                sync.recv();
+            }
+            let mut try = 0;
+            loop {
+                select! {
+                    recv(c64.rx()) -> v => {
+                        if v != Ok(234567) {
+                            panic!("i64sender value");
+                        }
+                        break;
+                    }
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("i64sender buffer={}", buffer);
+                            panic!("fail");
+                        }
+                        sleep();
+                    }
+                }
+            }
+            if buffer == 0 {
+                sync.recv();
+            }
+
+            go!(cb, sync, breceiver(cb, sync));
+            let mut try = 0;
+            loop {
+                select! {
+                    send(cb.tx(), true) -> _ => break,
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("breceiver buffer={}", buffer);
+                            panic!("fail")
+                        }
+                        sleep();
+                    }
+                }
+            }
+            sync.recv();
+            go!(cb, sync, bsender(cb, sync));
+            if buffer > 0 {
+                sync.recv();
+            }
+            let mut try = 0;
+            loop {
+                select! {
+                    recv(cb.rx()) -> v => {
+                        if v != Ok(true) {
+                            panic!("bsender value");
+                        }
+                        break;
+                    }
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("bsender buffer={}", buffer);
+                            panic!("fail");
+                        }
+                        sleep();
+                    }
+                }
+            }
+            if buffer == 0 {
+                sync.recv();
+            }
+
+            go!(cs, sync, sreceiver(cs, sync));
+            let mut try = 0;
+            loop {
+                select! {
+                    send(cs.tx(), "hello".to_string()) -> _ => break,
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("sreceiver buffer={}", buffer);
+                            panic!("fail")
+                        }
+                        sleep();
+                    }
+                }
+            }
+            sync.recv();
+            go!(cs, sync, ssender(cs, sync));
+            if buffer > 0 {
+                sync.recv();
+            }
+            let mut try = 0;
+            loop {
+                select! {
+                    recv(cs.rx()) -> v => {
+                        if v != Ok("hello again".to_string()) {
+                            panic!("ssender value");
+                        }
+                        break;
+                    }
+                    default => {
+                        try += 1;
+                        if try > MAX_TRIES {
+                            println!("ssender buffer={}", buffer);
+                            panic!("fail");
+                        }
+                        sleep();
+                    }
+                }
+            }
+            if buffer == 0 {
+                sync.recv();
+            }
+        }
+    }
 }
 
 // https://github.com/golang/go/blob/master/test/chan/select.go
 mod select {
-    // TODO
+    use super::*;
+
+    #[test]
+    fn main() {
+        let shift = Cell::new(0);
+        let counter = Cell::new(0);
+
+        let get_value = || {
+            counter.set(counter.get() + 1);
+            1 << shift.get()
+        };
+
+        let send = |mut a: Option<&Chan<u32>>, mut b: Option<&Chan<u32>>| {
+            let mut i = 0;
+            let never = make::<u32>(0);
+            loop {
+                let nil1 = never.tx();
+                let nil2 = never.tx();
+                let v1 = get_value();
+                let v2 = get_value();
+                select! {
+                    send(a.map(|c| c.tx()).unwrap_or(nil1), v1) -> _ => {
+                        i += 1;
+                        a = None;
+                    }
+                    send(b.map(|c| c.tx()).unwrap_or(nil2), v2) -> _ => {
+                        i += 1;
+                        b = None;
+                    }
+                    default => break,
+                }
+                shift.set(shift.get() + 1);
+            }
+            i
+        };
+
+        let a = make::<u32>(1);
+        let b = make::<u32>(1);
+
+        assert_eq!(send(Some(&a), Some(&b)), 2);
+
+        let av = a.recv().unwrap();
+        let bv = b.recv().unwrap();
+        assert_eq!(av | bv, 3);
+
+        assert_eq!(send(Some(&a), None), 1);
+        assert_eq!(counter.get(), 10);
+    }
 }
 
 // https://github.com/golang/go/blob/master/test/chan/select2.go
@@ -355,17 +673,22 @@ mod select3 {
 
 // https://github.com/golang/go/blob/master/test/chan/select4.go
 mod select4 {
-    // TODO
-}
+    use super::*;
 
-// https://github.com/golang/go/blob/master/test/chan/select5.go
-mod select5 {
-    // TODO
+    #[test]
+    fn main() {
+        let c = make::<i32>(1);
+        let c1 = make::<i32>(0);
+        c.send(42);
+        select! {
+            recv(c1.rx()) -> _ => panic!("BUG"),
+            recv(c.rx()) -> v => assert_eq!(v, Ok(42)),
+        }
+    }
 }
 
 // https://github.com/golang/go/blob/master/test/chan/select6.go
 mod select6 {
-    // TODO
     use super::*;
 
     #[test]
@@ -392,17 +715,117 @@ mod select6 {
 
 // https://github.com/golang/go/blob/master/test/chan/select7.go
 mod select7 {
-    // TODO
+    use super::*;
+
+    fn recv1(c: Chan<i32>) {
+        c.recv().unwrap();
+    }
+
+    fn recv2(c: Chan<i32>) {
+        select! {
+            recv(c.rx()) -> _ => ()
+        }
+    }
+
+    fn recv3(c: Chan<i32>) {
+        let c2 = make::<i32>(1);
+        select! {
+            recv(c.rx()) -> _ => (),
+            recv(c2.rx()) -> _ => ()
+        }
+    }
+
+    fn send1(recv: fn(Chan<i32>)) {
+        let c = make::<i32>(1);
+        go!(c, recv(c));
+        thread::yield_now();
+        c.send(1);
+    }
+
+    fn send2(recv: fn(Chan<i32>)) {
+        let c = make::<i32>(1);
+        go!(c, recv(c));
+        thread::yield_now();
+        select! {
+            send(c.tx(), 1) -> _ => ()
+        }
+    }
+
+    fn send3(recv: fn(Chan<i32>)) {
+        let c = make::<i32>(1);
+        go!(c, recv(c));
+        thread::yield_now();
+        let c2 = make::<i32>(1);
+        select! {
+            send(c.tx(), 1) -> _ => (),
+            send(c2.tx(), 1) -> _ => ()
+        }
+    }
+
+    #[test]
+    fn main() {
+        send1(recv1);
+        send2(recv1);
+        send3(recv1);
+        send1(recv2);
+        send2(recv2);
+        send3(recv2);
+        send1(recv3);
+        send2(recv3);
+        send3(recv3);
+    }
 }
 
 // https://github.com/golang/go/blob/master/test/chan/sieve1.go
 mod sieve1 {
-    // TODO
-}
+    use super::*;
 
-// https://github.com/golang/go/blob/master/test/chan/sieve2.go
-mod sieve2 {
-    // TODO
+    fn generate(ch: Chan<i32>) {
+        let mut i = 2;
+        loop {
+            ch.send(i);
+            i += 1;
+        }
+    }
+
+    fn filter(in_ch: Chan<i32>, out_ch: Chan<i32>, prime: i32) {
+        for i in in_ch {
+            if i % prime != 0 {
+                out_ch.send(i);
+            }
+        }
+    }
+
+    fn sieve(primes: Chan<i32>) {
+        let mut ch = make::<i32>(1);
+        go!(ch, generate(ch));
+        loop {
+            let prime = ch.recv().unwrap();
+            primes.send(prime);
+
+            let ch1 = make::<i32>(1);
+            go!(ch, ch1, prime, filter(ch, ch1, prime));
+            ch = ch1;
+        }
+    }
+
+    #[test]
+    fn main() {
+        let primes = make::<i32>(1);
+        go!(primes, sieve(primes));
+
+        let a = [
+            2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83,
+            89, 97,
+        ];
+        for item in a.iter() {
+            let x = primes.recv().unwrap();
+            if x != *item {
+                println!("{} != {}", x, item);
+                panic!("fail");
+            }
+        }
+    }
 }
 
 // https://github.com/golang/go/blob/master/test/chan/zerosize.go
@@ -866,7 +1289,7 @@ mod chan_test {
     fn test_chan_send_interface() {
         struct Mt;
 
-        let c = make::<Box<Any>>(1);
+        let c = make::<Box<dyn Any>>(1);
         c.send(Box::new(Mt));
 
         select! {
diff --git a/vendor/crossbeam-channel/tests/iter.rs b/vendor/crossbeam-channel/tests/iter.rs
index 68bbd1c087..6acec59c28 100644
--- a/vendor/crossbeam-channel/tests/iter.rs
+++ b/vendor/crossbeam-channel/tests/iter.rs
@@ -25,7 +25,8 @@ fn nested_recv_iter() {
         s.send(2).unwrap();
         drop(s);
         assert_eq!(total_r.recv().unwrap(), 6);
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -52,7 +53,8 @@ fn recv_iter_break() {
         let _ = s.send(2);
         drop(s);
         assert_eq!(count_r.recv().unwrap(), 4);
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -79,7 +81,8 @@ fn recv_try_iter() {
                 break;
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
diff --git a/vendor/crossbeam-channel/tests/list.rs b/vendor/crossbeam-channel/tests/list.rs
index 09d3a4610e..ed1d4c4209 100644
--- a/vendor/crossbeam-channel/tests/list.rs
+++ b/vendor/crossbeam-channel/tests/list.rs
@@ -5,12 +5,13 @@ extern crate crossbeam_channel;
 extern crate crossbeam_utils;
 extern crate rand;
 
+use std::any::Any;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::thread;
 use std::time::Duration;
 
-use crossbeam_channel::unbounded;
+use crossbeam_channel::{unbounded, Receiver};
 use crossbeam_channel::{RecvError, RecvTimeoutError, TryRecvError};
 use crossbeam_channel::{SendError, SendTimeoutError, TrySendError};
 use crossbeam_utils::thread::scope;
@@ -86,7 +87,8 @@ fn try_recv() {
             thread::sleep(ms(1000));
             s.send(7).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -108,7 +110,8 @@ fn recv() {
             s.send(8).unwrap();
             s.send(9).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -128,7 +131,8 @@ fn recv_timeout() {
             thread::sleep(ms(1500));
             s.send(7).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -234,7 +238,8 @@ fn disconnect_wakes_receiver() {
             thread::sleep(ms(1000));
             drop(s);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -255,7 +260,8 @@ fn spsc() {
                 s.send(i).unwrap();
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -282,7 +288,8 @@ fn mpmc() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 
@@ -301,7 +308,8 @@ fn stress_oneshot() {
         scope(|scope| {
             scope.spawn(|_| r.recv().unwrap());
             scope.spawn(|_| s.send(0).unwrap());
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -331,7 +339,8 @@ fn stress_iter() {
                 break;
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -363,7 +372,8 @@ fn stress_timeout_two_threads() {
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -400,7 +410,8 @@ fn drops() {
                     s.send(DropCounter).unwrap();
                 }
             });
-        }).unwrap();
+        })
+        .unwrap();
 
         for _ in 0..additional {
             s.try_send(DropCounter).unwrap();
@@ -429,7 +440,8 @@ fn linearizable() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -486,3 +498,41 @@ fn recv_in_send() {
         send(s, assert_eq!(r.recv(), Ok(()))) -> _ => {}
     }
 }
+
+#[test]
+fn channel_through_channel() {
+    const COUNT: usize = 1000;
+
+    type T = Box<dyn Any + Send>;
+
+    let (s, r) = unbounded::<T>();
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut s = s;
+
+            for _ in 0..COUNT {
+                let (new_s, new_r) = unbounded();
+                let new_r: T = Box::new(Some(new_r));
+
+                s.send(new_r).unwrap();
+                s = new_s;
+            }
+        });
+
+        scope.spawn(move |_| {
+            let mut r = r;
+
+            for _ in 0..COUNT {
+                r = r
+                    .recv()
+                    .unwrap()
+                    .downcast_mut::<Option<Receiver<T>>>()
+                    .unwrap()
+                    .take()
+                    .unwrap()
+            }
+        });
+    })
+    .unwrap();
+}
diff --git a/vendor/crossbeam-channel/tests/mpsc.rs b/vendor/crossbeam-channel/tests/mpsc.rs
index a24a082917..213b9d8b7d 100644
--- a/vendor/crossbeam-channel/tests/mpsc.rs
+++ b/vendor/crossbeam-channel/tests/mpsc.rs
@@ -8,6 +8,8 @@
 //! - Replace `box` syntax with `Box::new`.
 //! - Replace all uses of `Select` with `select!`.
 //! - Change the imports.
+//! - Join all spawned threads.
+//! - Removed assertion from oneshot_multi_thread_send_close_stress tests.
 //!
 //! Source:
 //!   - https://github.com/rust-lang/rust/tree/master/src/libstd/sync/mpsc
@@ -23,6 +25,7 @@ extern crate crossbeam_channel as cc;
 
 use std::sync::mpsc::{RecvError, RecvTimeoutError, TryRecvError};
 use std::sync::mpsc::{SendError, TrySendError};
+use std::thread::JoinHandle;
 use std::time::Duration;
 
 pub struct Sender<T> {
@@ -232,10 +235,11 @@ mod channel_tests {
     #[test]
     fn smoke_threads() {
         let (tx, rx) = channel::<i32>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             tx.send(1).unwrap();
         });
         assert_eq!(rx.recv().unwrap(), 1);
+        t.join().unwrap();
     }
 
     #[test]
@@ -264,20 +268,22 @@ mod channel_tests {
     #[test]
     fn port_gone_concurrent() {
         let (tx, rx) = channel::<i32>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap();
         });
         while tx.send(1).is_ok() {}
+        t.join().unwrap();
     }
 
     #[test]
     fn port_gone_concurrent_shared() {
         let (tx, rx) = channel::<i32>();
         let tx2 = tx.clone();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap();
         });
         while tx.send(1).is_ok() && tx2.send(1).is_ok() {}
+        t.join().unwrap();
     }
 
     #[test]
@@ -299,11 +305,12 @@ mod channel_tests {
     #[test]
     fn chan_gone_concurrent() {
         let (tx, rx) = channel::<i32>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             tx.send(1).unwrap();
             tx.send(1).unwrap();
         });
         while rx.recv().is_ok() {}
+        t.join().unwrap();
     }
 
     #[test]
@@ -336,16 +343,21 @@ mod channel_tests {
             }
         });
 
+        let mut ts = Vec::with_capacity(NTHREADS as usize);
         for _ in 0..NTHREADS {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 for _ in 0..AMT {
                     tx.send(1).unwrap();
                 }
             });
+            ts.push(t);
         }
         drop(tx);
         t.join().ok().unwrap();
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
@@ -422,14 +434,9 @@ mod channel_tests {
 
     #[test]
     fn oneshot_single_thread_recv_chan_close() {
-        // Receiving on a closed chan will panic
-        let res = thread::spawn(move || {
-            let (tx, rx) = channel::<i32>();
-            drop(tx);
-            rx.recv().unwrap();
-        }).join();
-        // What is our res?
-        assert!(res.is_err());
+        let (tx, rx) = channel::<i32>();
+        drop(tx);
+        assert_eq!(rx.recv(), Err(RecvError));
     }
 
     #[test]
@@ -492,108 +499,149 @@ mod channel_tests {
     #[test]
     fn oneshot_multi_task_recv_then_send() {
         let (tx, rx) = channel::<Box<i32>>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             assert!(*rx.recv().unwrap() == 10);
         });
 
         tx.send(Box::new(10)).unwrap();
+        t.join().unwrap();
     }
 
     #[test]
     fn oneshot_multi_task_recv_then_close() {
         let (tx, rx) = channel::<Box<i32>>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             drop(tx);
         });
-        let res = thread::spawn(move || {
-            assert!(*rx.recv().unwrap() == 10);
-        }).join();
-        assert!(res.is_err());
+        thread::spawn(move || {
+            assert_eq!(rx.recv(), Err(RecvError));
+        })
+        .join()
+        .unwrap();
+        t.join().unwrap();
     }
 
     #[test]
     fn oneshot_multi_thread_close_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = channel::<i32>();
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 drop(rx);
             });
+            ts.push(t);
             drop(tx);
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
     fn oneshot_multi_thread_send_close_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(2 * stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = channel::<i32>();
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 drop(rx);
             });
-            let _ = thread::spawn(move || {
-                tx.send(1).unwrap();
-            }).join();
+            ts.push(t);
+            thread::spawn(move || {
+                let _ = tx.send(1);
+            })
+            .join()
+            .unwrap();
+        }
+        for t in ts {
+            t.join().unwrap();
         }
     }
 
     #[test]
     fn oneshot_multi_thread_recv_close_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(2 * stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = channel::<i32>();
-            thread::spawn(move || {
-                let res = thread::spawn(move || {
-                    rx.recv().unwrap();
-                }).join();
-                assert!(res.is_err());
-            });
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 thread::spawn(move || {
+                    assert_eq!(rx.recv(), Err(RecvError));
+                })
+                .join()
+                .unwrap();
+            });
+            ts.push(t);
+            let t2 = thread::spawn(move || {
+                let t = thread::spawn(move || {
                     drop(tx);
                 });
+                t.join().unwrap();
             });
+            ts.push(t2);
+        }
+        for t in ts {
+            t.join().unwrap();
         }
     }
 
     #[test]
     fn oneshot_multi_thread_send_recv_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = channel::<Box<isize>>();
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 tx.send(Box::new(10)).unwrap();
             });
+            ts.push(t);
             assert!(*rx.recv().unwrap() == 10);
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
     fn stream_send_recv_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(2 * stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = channel();
 
-            send(tx, 0);
-            recv(rx, 0);
+            if let Some(t) = send(tx, 0) {
+                ts.push(t);
+            }
+            if let Some(t2) = recv(rx, 0) {
+                ts.push(t2);
+            }
 
-            fn send(tx: Sender<Box<i32>>, i: i32) {
+            fn send(tx: Sender<Box<i32>>, i: i32) -> Option<JoinHandle<()>> {
                 if i == 10 {
-                    return;
+                    return None;
                 }
 
-                thread::spawn(move || {
+                Some(thread::spawn(move || {
                     tx.send(Box::new(i)).unwrap();
                     send(tx, i + 1);
-                });
+                }))
             }
 
-            fn recv(rx: Receiver<Box<i32>>, i: i32) {
+            fn recv(rx: Receiver<Box<i32>>, i: i32) -> Option<JoinHandle<()>> {
                 if i == 10 {
-                    return;
+                    return None;
                 }
 
-                thread::spawn(move || {
+                Some(thread::spawn(move || {
                     assert!(*rx.recv().unwrap() == i);
                     recv(rx, i + 1);
-                });
+                }))
             }
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
@@ -615,7 +663,7 @@ mod channel_tests {
         let stress = stress_factor() + 100;
         let timeout = Duration::from_millis(100);
 
-        thread::spawn(move || {
+        let t = thread::spawn(move || {
             for i in 0..stress {
                 if i % 2 == 0 {
                     thread::sleep(timeout * 2);
@@ -637,6 +685,7 @@ mod channel_tests {
         }
 
         assert_eq!(recv_count, stress);
+        t.join().unwrap()
     }
 
     #[test]
@@ -655,12 +704,14 @@ mod channel_tests {
         let (tx, rx) = channel();
         let stress = stress_factor() + 100;
 
+        let mut ts = Vec::with_capacity(stress);
         for i in 0..stress {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 thread::sleep(Duration::from_millis(i as u64 * 10));
                 tx.send(1usize).unwrap();
             });
+            ts.push(t);
         }
 
         drop(tx);
@@ -678,6 +729,9 @@ mod channel_tests {
         }
 
         assert_eq!(recv_count, stress);
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
@@ -696,11 +750,13 @@ mod channel_tests {
     fn shared_recv_timeout() {
         let (tx, rx) = channel();
         let total = 5;
+        let mut ts = Vec::with_capacity(total);
         for _ in 0..total {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 tx.send(()).unwrap();
             });
+            ts.push(t);
         }
 
         for _ in 0..total {
@@ -713,22 +769,30 @@ mod channel_tests {
         );
         tx.send(()).unwrap();
         assert_eq!(rx.recv_timeout(Duration::from_millis(1)), Ok(()));
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
     fn shared_chan_stress() {
         let (tx, rx) = channel();
         let total = stress_factor() + 100;
+        let mut ts = Vec::with_capacity(total);
         for _ in 0..total {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 tx.send(()).unwrap();
             });
+            ts.push(t);
         }
 
         for _ in 0..total {
             rx.recv().unwrap();
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
@@ -736,7 +800,7 @@ mod channel_tests {
         let (tx, rx) = channel::<i32>();
         let (total_tx, total_rx) = channel::<i32>();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             let mut acc = 0;
             for x in rx.iter() {
                 acc += x;
@@ -749,6 +813,7 @@ mod channel_tests {
         tx.send(2).unwrap();
         drop(tx);
         assert_eq!(total_rx.recv().unwrap(), 6);
+        t.join().unwrap();
     }
 
     #[test]
@@ -756,7 +821,7 @@ mod channel_tests {
         let (tx, rx) = channel::<i32>();
         let (count_tx, count_rx) = channel();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             let mut count = 0;
             for x in rx.iter() {
                 if count >= 3 {
@@ -774,6 +839,7 @@ mod channel_tests {
         let _ = tx.send(2);
         drop(tx);
         assert_eq!(count_rx.recv().unwrap(), 4);
+        t.join().unwrap();
     }
 
     #[test]
@@ -835,7 +901,7 @@ mod channel_tests {
         let (tx1, rx1) = channel::<i32>();
         let (tx2, rx2) = channel::<()>();
         let (tx3, rx3) = channel::<()>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx2.recv().unwrap();
             tx1.send(1).unwrap();
             tx3.send(()).unwrap();
@@ -852,6 +918,7 @@ mod channel_tests {
         tx2.send(()).unwrap();
         rx3.recv().unwrap();
         assert_eq!(rx1.try_recv(), Err(TryRecvError::Disconnected));
+        t.join().unwrap();
     }
 
     // This bug used to end up in a livelock inside of the Receiver destructor
@@ -860,7 +927,7 @@ mod channel_tests {
     fn destroy_upgraded_shared_port_when_sender_still_active() {
         let (tx, rx) = channel();
         let (tx2, rx2) = channel();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap(); // wait on a oneshot
             drop(rx); // destroy a shared
             tx2.send(()).unwrap();
@@ -871,12 +938,13 @@ mod channel_tests {
         }
 
         // upgrade to a shared chan and send a message
-        let t = tx.clone();
+        let tx2 = tx.clone();
         drop(tx);
-        t.send(()).unwrap();
+        tx2.send(()).unwrap();
 
         // wait for the child thread to exit before we exit
         rx2.recv().unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -939,10 +1007,11 @@ mod sync_channel_tests {
     #[test]
     fn smoke_threads() {
         let (tx, rx) = sync_channel::<i32>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             tx.send(1).unwrap();
         });
         assert_eq!(rx.recv().unwrap(), 1);
+        t.join().unwrap();
     }
 
     #[test]
@@ -964,20 +1033,22 @@ mod sync_channel_tests {
     #[test]
     fn port_gone_concurrent() {
         let (tx, rx) = sync_channel::<i32>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap();
         });
         while tx.send(1).is_ok() {}
+        t.join().unwrap();
     }
 
     #[test]
     fn port_gone_concurrent_shared() {
         let (tx, rx) = sync_channel::<i32>(0);
         let tx2 = tx.clone();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap();
         });
         while tx.send(1).is_ok() && tx2.send(1).is_ok() {}
+        t.join().unwrap();
     }
 
     #[test]
@@ -999,17 +1070,18 @@ mod sync_channel_tests {
     #[test]
     fn chan_gone_concurrent() {
         let (tx, rx) = sync_channel::<i32>(0);
-        thread::spawn(move || {
+        let t = thread::spawn(move || {
             tx.send(1).unwrap();
             tx.send(1).unwrap();
         });
         while rx.recv().is_ok() {}
+        t.join().unwrap();
     }
 
     #[test]
     fn stress() {
         let (tx, rx) = sync_channel::<i32>(0);
-        thread::spawn(move || {
+        let t = thread::spawn(move || {
             for _ in 0..10000 {
                 tx.send(1).unwrap();
             }
@@ -1017,13 +1089,14 @@ mod sync_channel_tests {
         for _ in 0..10000 {
             assert_eq!(rx.recv().unwrap(), 1);
         }
+        t.join().unwrap();
     }
 
     #[test]
     fn stress_recv_timeout_two_threads() {
         let (tx, rx) = sync_channel::<i32>(0);
 
-        thread::spawn(move || {
+        let t = thread::spawn(move || {
             for _ in 0..10000 {
                 tx.send(1).unwrap();
             }
@@ -1042,6 +1115,7 @@ mod sync_channel_tests {
         }
 
         assert_eq!(recv_count, 10000);
+        t.join().unwrap();
     }
 
     #[test]
@@ -1051,7 +1125,7 @@ mod sync_channel_tests {
         let (tx, rx) = sync_channel::<i32>(0);
         let (dtx, drx) = sync_channel::<()>(0);
 
-        thread::spawn(move || {
+        let t = thread::spawn(move || {
             let mut recv_count = 0;
             loop {
                 match rx.recv_timeout(Duration::from_millis(10)) {
@@ -1070,18 +1144,24 @@ mod sync_channel_tests {
             dtx.send(()).unwrap();
         });
 
+        let mut ts = Vec::with_capacity(NTHREADS as usize);
         for _ in 0..NTHREADS {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 for _ in 0..AMT {
                     tx.send(1).unwrap();
                 }
             });
+            ts.push(t);
         }
 
         drop(tx);
 
         drx.recv().unwrap();
+        for t in ts {
+            t.join().unwrap();
+        }
+        t.join().unwrap();
     }
 
     #[test]
@@ -1091,7 +1171,7 @@ mod sync_channel_tests {
         let (tx, rx) = sync_channel::<i32>(0);
         let (dtx, drx) = sync_channel::<()>(0);
 
-        thread::spawn(move || {
+        let t = thread::spawn(move || {
             for _ in 0..AMT * NTHREADS {
                 assert_eq!(rx.recv().unwrap(), 1);
             }
@@ -1102,16 +1182,22 @@ mod sync_channel_tests {
             dtx.send(()).unwrap();
         });
 
+        let mut ts = Vec::with_capacity(NTHREADS as usize);
         for _ in 0..NTHREADS {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 for _ in 0..AMT {
                     tx.send(1).unwrap();
                 }
             });
+            ts.push(t);
         }
         drop(tx);
         drx.recv().unwrap();
+        for t in ts {
+            t.join().unwrap();
+        }
+        t.join().unwrap();
     }
 
     #[test]
@@ -1138,14 +1224,9 @@ mod sync_channel_tests {
 
     #[test]
     fn oneshot_single_thread_recv_chan_close() {
-        // Receiving on a closed chan will panic
-        let res = thread::spawn(move || {
-            let (tx, rx) = sync_channel::<i32>(0);
-            drop(tx);
-            rx.recv().unwrap();
-        }).join();
-        // What is our res?
-        assert!(res.is_err());
+        let (tx, rx) = sync_channel::<i32>(0);
+        drop(tx);
+        assert_eq!(rx.recv(), Err(RecvError));
     }
 
     #[test]
@@ -1223,108 +1304,148 @@ mod sync_channel_tests {
     #[test]
     fn oneshot_multi_task_recv_then_send() {
         let (tx, rx) = sync_channel::<Box<i32>>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             assert!(*rx.recv().unwrap() == 10);
         });
 
         tx.send(Box::new(10)).unwrap();
+        t.join().unwrap();
     }
 
     #[test]
     fn oneshot_multi_task_recv_then_close() {
         let (tx, rx) = sync_channel::<Box<i32>>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             drop(tx);
         });
-        let res = thread::spawn(move || {
-            assert!(*rx.recv().unwrap() == 10);
-        }).join();
-        assert!(res.is_err());
+        thread::spawn(move || {
+            assert_eq!(rx.recv(), Err(RecvError));
+        })
+        .join()
+        .unwrap();
+        t.join().unwrap();
     }
 
     #[test]
     fn oneshot_multi_thread_close_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = sync_channel::<i32>(0);
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 drop(rx);
             });
+            ts.push(t);
             drop(tx);
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
     fn oneshot_multi_thread_send_close_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = sync_channel::<i32>(0);
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 drop(rx);
             });
-            let _ = thread::spawn(move || {
-                tx.send(1).unwrap();
-            }).join();
+            ts.push(t);
+            thread::spawn(move || {
+                let _ = tx.send(1);
+            })
+            .join()
+            .unwrap();
+        }
+        for t in ts {
+            t.join().unwrap();
         }
     }
 
     #[test]
     fn oneshot_multi_thread_recv_close_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(2 * stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = sync_channel::<i32>(0);
-            let _t = thread::spawn(move || {
-                let res = thread::spawn(move || {
-                    rx.recv().unwrap();
-                }).join();
-                assert!(res.is_err());
+            let t = thread::spawn(move || {
+                thread::spawn(move || {
+                    assert_eq!(rx.recv(), Err(RecvError));
+                })
+                .join()
+                .unwrap();
             });
-            let _t = thread::spawn(move || {
+            ts.push(t);
+            let t2 = thread::spawn(move || {
                 thread::spawn(move || {
                     drop(tx);
                 });
             });
+            ts.push(t2);
+        }
+        for t in ts {
+            t.join().unwrap();
         }
     }
 
     #[test]
     fn oneshot_multi_thread_send_recv_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = sync_channel::<Box<i32>>(0);
-            let _t = thread::spawn(move || {
+            let t = thread::spawn(move || {
                 tx.send(Box::new(10)).unwrap();
             });
+            ts.push(t);
             assert!(*rx.recv().unwrap() == 10);
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
     fn stream_send_recv_stress() {
-        for _ in 0..stress_factor() {
+        let stress_factor = stress_factor();
+        let mut ts = Vec::with_capacity(2 * stress_factor);
+        for _ in 0..stress_factor {
             let (tx, rx) = sync_channel::<Box<i32>>(0);
 
-            send(tx, 0);
-            recv(rx, 0);
+            if let Some(t) = send(tx, 0) {
+                ts.push(t);
+            }
+            if let Some(t) = recv(rx, 0) {
+                ts.push(t);
+            }
 
-            fn send(tx: SyncSender<Box<i32>>, i: i32) {
+            fn send(tx: SyncSender<Box<i32>>, i: i32) -> Option<JoinHandle<()>> {
                 if i == 10 {
-                    return;
+                    return None;
                 }
 
-                thread::spawn(move || {
+                Some(thread::spawn(move || {
                     tx.send(Box::new(i)).unwrap();
                     send(tx, i + 1);
-                });
+                }))
             }
 
-            fn recv(rx: Receiver<Box<i32>>, i: i32) {
+            fn recv(rx: Receiver<Box<i32>>, i: i32) -> Option<JoinHandle<()>> {
                 if i == 10 {
-                    return;
+                    return None;
                 }
 
-                thread::spawn(move || {
+                Some(thread::spawn(move || {
                     assert!(*rx.recv().unwrap() == i);
                     recv(rx, i + 1);
-                });
+                }))
             }
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
@@ -1343,16 +1464,21 @@ mod sync_channel_tests {
     fn shared_chan_stress() {
         let (tx, rx) = sync_channel(0);
         let total = stress_factor() + 100;
+        let mut ts = Vec::with_capacity(total);
         for _ in 0..total {
             let tx = tx.clone();
-            thread::spawn(move || {
+            let t = thread::spawn(move || {
                 tx.send(()).unwrap();
             });
+            ts.push(t);
         }
 
         for _ in 0..total {
             rx.recv().unwrap();
         }
+        for t in ts {
+            t.join().unwrap();
+        }
     }
 
     #[test]
@@ -1360,7 +1486,7 @@ mod sync_channel_tests {
         let (tx, rx) = sync_channel::<i32>(0);
         let (total_tx, total_rx) = sync_channel::<i32>(0);
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             let mut acc = 0;
             for x in rx.iter() {
                 acc += x;
@@ -1373,6 +1499,7 @@ mod sync_channel_tests {
         tx.send(2).unwrap();
         drop(tx);
         assert_eq!(total_rx.recv().unwrap(), 6);
+        t.join().unwrap();
     }
 
     #[test]
@@ -1380,7 +1507,7 @@ mod sync_channel_tests {
         let (tx, rx) = sync_channel::<i32>(0);
         let (count_tx, count_rx) = sync_channel(0);
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             let mut count = 0;
             for x in rx.iter() {
                 if count >= 3 {
@@ -1398,6 +1525,7 @@ mod sync_channel_tests {
         let _ = tx.try_send(2);
         drop(tx);
         assert_eq!(count_rx.recv().unwrap(), 4);
+        t.join().unwrap();
     }
 
     #[test]
@@ -1405,7 +1533,7 @@ mod sync_channel_tests {
         let (tx1, rx1) = sync_channel::<i32>(1);
         let (tx2, rx2) = sync_channel::<()>(1);
         let (tx3, rx3) = sync_channel::<()>(1);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx2.recv().unwrap();
             tx1.send(1).unwrap();
             tx3.send(()).unwrap();
@@ -1422,6 +1550,7 @@ mod sync_channel_tests {
         tx2.send(()).unwrap();
         rx3.recv().unwrap();
         assert_eq!(rx1.try_recv(), Err(TryRecvError::Disconnected));
+        t.join().unwrap();
     }
 
     // This bug used to end up in a livelock inside of the Receiver destructor
@@ -1430,7 +1559,7 @@ mod sync_channel_tests {
     fn destroy_upgraded_shared_port_when_sender_still_active() {
         let (tx, rx) = sync_channel::<()>(0);
         let (tx2, rx2) = sync_channel::<()>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap(); // wait on a oneshot
             drop(rx); // destroy a shared
             tx2.send(()).unwrap();
@@ -1441,40 +1570,44 @@ mod sync_channel_tests {
         }
 
         // upgrade to a shared chan and send a message
-        let t = tx.clone();
+        let tx2 = tx.clone();
         drop(tx);
-        t.send(()).unwrap();
+        tx2.send(()).unwrap();
 
         // wait for the child thread to exit before we exit
         rx2.recv().unwrap();
+        t.join().unwrap();
     }
 
     #[test]
     fn send1() {
         let (tx, rx) = sync_channel::<i32>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx.recv().unwrap();
         });
         assert_eq!(tx.send(1), Ok(()));
+        t.join().unwrap();
     }
 
     #[test]
     fn send2() {
         let (tx, rx) = sync_channel::<i32>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             drop(rx);
         });
         assert!(tx.send(1).is_err());
+        t.join().unwrap();
     }
 
     #[test]
     fn send3() {
         let (tx, rx) = sync_channel::<i32>(1);
         assert_eq!(tx.send(1), Ok(()));
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             drop(rx);
         });
         assert!(tx.send(1).is_err());
+        t.join().unwrap();
     }
 
     #[test]
@@ -1483,17 +1616,19 @@ mod sync_channel_tests {
         let tx2 = tx.clone();
         let (done, donerx) = channel();
         let done2 = done.clone();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             assert!(tx.send(1).is_err());
             done.send(()).unwrap();
         });
-        let _t = thread::spawn(move || {
+        let t2 = thread::spawn(move || {
             assert!(tx2.send(2).is_err());
             done2.send(()).unwrap();
         });
         drop(rx);
         donerx.recv().unwrap();
         donerx.recv().unwrap();
+        t.join().unwrap();
+        t2.join().unwrap();
     }
 
     #[test]
@@ -1604,7 +1739,7 @@ mod select_tests {
         let (_tx2, rx2) = channel::<i32>();
         let (tx3, rx3) = channel::<i32>();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             for _ in 0..20 {
                 thread::yield_now();
             }
@@ -1624,6 +1759,7 @@ mod select_tests {
             a = rx1.recv() => { assert!(a.is_err()) },
             _b = rx2.recv() => { panic!() }
         }
+        t.join().unwrap();
     }
 
     #[test]
@@ -1632,7 +1768,7 @@ mod select_tests {
         let (tx2, rx2) = channel::<i32>();
         let (tx3, rx3) = channel::<()>();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             for _ in 0..20 {
                 thread::yield_now();
             }
@@ -1652,6 +1788,7 @@ mod select_tests {
         assert_eq!(rx1.try_recv(), Err(TryRecvError::Empty));
         assert_eq!(rx2.try_recv(), Err(TryRecvError::Empty));
         tx3.send(()).unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -1661,7 +1798,7 @@ mod select_tests {
         let (tx2, rx2) = channel::<i32>();
         let (tx3, rx3) = channel::<()>();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             for i in 0..AMT {
                 if i % 2 == 0 {
                     tx1.send(i).unwrap();
@@ -1679,6 +1816,7 @@ mod select_tests {
             }
             tx3.send(()).unwrap();
         }
+        t.join().unwrap();
     }
 
     #[allow(unused_must_use)]
@@ -1688,7 +1826,7 @@ mod select_tests {
         let (_tx2, rx2) = channel::<i32>();
         let (tx3, rx3) = channel::<()>();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx3.recv().unwrap();
             tx1.clone();
             assert_eq!(rx3.try_recv(), Err(TryRecvError::Empty));
@@ -1702,6 +1840,7 @@ mod select_tests {
             _i2 = rx2.recv() => panic!()
         }
         tx3.send(()).unwrap();
+        t.join().unwrap();
     }
 
     #[allow(unused_must_use)]
@@ -1711,7 +1850,7 @@ mod select_tests {
         let (_tx2, rx2) = channel::<i32>();
         let (tx3, rx3) = channel::<()>();
 
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             rx3.recv().unwrap();
             tx1.clone();
             assert_eq!(rx3.try_recv(), Err(TryRecvError::Empty));
@@ -1725,6 +1864,7 @@ mod select_tests {
             _i2 = rx2.recv() => panic!()
         }
         tx3.send(()).unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -1732,7 +1872,7 @@ mod select_tests {
         let (tx1, rx1) = channel::<()>();
         let (tx2, rx2) = channel::<()>();
         let (tx3, rx3) = channel::<()>();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             select! {
                 _ = rx1.recv() => panic!(),
                 _ = rx2.recv() => {}
@@ -1746,6 +1886,7 @@ mod select_tests {
         drop(tx1.clone());
         tx2.send(()).unwrap();
         rx3.recv().unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -1842,7 +1983,7 @@ mod select_tests {
     fn oneshot_data_waiting() {
         let (tx1, rx1) = channel();
         let (tx2, rx2) = channel();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             select! {
                 _n = rx1.recv() => {}
             }
@@ -1854,6 +1995,7 @@ mod select_tests {
         }
         tx1.send(()).unwrap();
         rx2.recv().unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -1864,7 +2006,7 @@ mod select_tests {
         tx1.send(()).unwrap();
         rx1.recv().unwrap();
         rx1.recv().unwrap();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             select! {
                 _n = rx1.recv() => {}
             }
@@ -1876,6 +2018,7 @@ mod select_tests {
         }
         tx1.send(()).unwrap();
         rx2.recv().unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -1885,7 +2028,7 @@ mod select_tests {
         drop(tx1.clone());
         tx1.send(()).unwrap();
         rx1.recv().unwrap();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             select! {
                 _n = rx1.recv() => {}
             }
@@ -1897,6 +2040,7 @@ mod select_tests {
         }
         tx1.send(()).unwrap();
         rx2.recv().unwrap();
+        t.join().unwrap();
     }
 
     #[test]
@@ -1911,7 +2055,7 @@ mod select_tests {
     #[test]
     fn sync2() {
         let (tx, rx) = sync_channel::<i32>(0);
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             for _ in 0..100 {
                 thread::yield_now()
             }
@@ -1920,16 +2064,17 @@ mod select_tests {
         select! {
             n = rx.recv() => { assert_eq!(n.unwrap(), 1); }
         }
+        t.join().unwrap();
     }
 
     #[test]
     fn sync3() {
         let (tx1, rx1) = sync_channel::<i32>(0);
         let (tx2, rx2): (Sender<i32>, Receiver<i32>) = channel();
-        let _t = thread::spawn(move || {
+        let t = thread::spawn(move || {
             tx1.send(1).unwrap();
         });
-        let _t = thread::spawn(move || {
+        let t2 = thread::spawn(move || {
             tx2.send(2).unwrap();
         });
         select! {
@@ -1944,5 +2089,7 @@ mod select_tests {
                 assert_eq!(rx1.recv().unwrap(), 1);
             }
         }
+        t.join().unwrap();
+        t2.join().unwrap();
     }
 }
diff --git a/vendor/crossbeam-channel/tests/ready.rs b/vendor/crossbeam-channel/tests/ready.rs
index 1242eea079..23769b7bd7 100644
--- a/vendor/crossbeam-channel/tests/ready.rs
+++ b/vendor/crossbeam-channel/tests/ready.rs
@@ -79,7 +79,8 @@ fn disconnected() {
         }
 
         r2.recv().unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 
     let mut sel = Select::new();
     sel.recv(&r1);
@@ -101,7 +102,8 @@ fn disconnected() {
             Ok(0) => assert_eq!(r2.try_recv(), Err(TryRecvError::Disconnected)),
             _ => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -164,7 +166,8 @@ fn timeout() {
             Ok(1) => assert_eq!(r2.try_recv(), Ok(2)),
             _ => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     scope(|scope| {
         let (s, r) = unbounded::<i32>();
@@ -183,7 +186,8 @@ fn timeout() {
             Ok(0) => assert_eq!(r.try_recv(), Err(TryRecvError::Disconnected)),
             _ => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -260,7 +264,8 @@ fn unblocks() {
             Ok(1) => assert_eq!(r2.try_recv(), Ok(2)),
             _ => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     scope(|scope| {
         scope.spawn(|_| {
@@ -280,7 +285,8 @@ fn unblocks() {
                 _ => unreachable!(),
             },
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -305,7 +311,8 @@ fn both_ready() {
                 _ => panic!(),
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -335,7 +342,8 @@ fn cloning1() {
         }
 
         s3.send(()).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -359,7 +367,8 @@ fn cloning2() {
         thread::sleep(ms(500));
         drop(s1.clone());
         s2.send(()).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -515,7 +524,8 @@ fn stress_recv() {
                 s3.send(()).unwrap();
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -548,7 +558,8 @@ fn stress_send() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -581,7 +592,8 @@ fn stress_mixed() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -597,7 +609,7 @@ fn stress_timeout_two_threads() {
                     thread::sleep(ms(500));
                 }
 
-                let mut done = false;
+                let done = false;
                 while !done {
                     let mut sel = Select::new();
                     sel.send(&s);
@@ -606,7 +618,7 @@ fn stress_timeout_two_threads() {
                         Ok(0) => {
                             assert!(s.try_send(i).is_ok());
                             break;
-                        },
+                        }
                         Ok(_) => panic!(),
                     }
                 }
@@ -628,13 +640,14 @@ fn stress_timeout_two_threads() {
                         Ok(0) => {
                             assert_eq!(r.try_recv(), Ok(i));
                             done = true;
-                        },
+                        }
                         Ok(_) => panic!(),
                     }
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -660,7 +673,7 @@ fn send_recv_same_channel() {
 fn channel_through_channel() {
     const COUNT: usize = 1000;
 
-    type T = Box<Any + Send>;
+    type T = Box<dyn Any + Send>;
 
     for cap in 1..4 {
         let (s, r) = bounded::<T>(cap);
@@ -671,7 +684,7 @@ fn channel_through_channel() {
 
                 for _ in 0..COUNT {
                     let (new_s, new_r) = bounded(cap);
-                    let mut new_r: T = Box::new(Some(new_r));
+                    let new_r: T = Box::new(Some(new_r));
 
                     {
                         let mut sel = Select::new();
@@ -707,7 +720,8 @@ fn channel_through_channel() {
                     r = new;
                 }
             });
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -818,5 +832,6 @@ fn fairness2() {
             }
         }
         assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 10));
-    }).unwrap();
+    })
+    .unwrap();
 }
diff --git a/vendor/crossbeam-channel/tests/same_channel.rs b/vendor/crossbeam-channel/tests/same_channel.rs
new file mode 100644
index 0000000000..8e34faf448
--- /dev/null
+++ b/vendor/crossbeam-channel/tests/same_channel.rs
@@ -0,0 +1,114 @@
+extern crate crossbeam_channel;
+
+use std::time::Duration;
+
+use crossbeam_channel::{after, bounded, never, tick, unbounded};
+
+fn ms(ms: u64) -> Duration {
+    Duration::from_millis(ms)
+}
+
+#[test]
+fn after_same_channel() {
+    let r = after(ms(50));
+
+    let r2 = r.clone();
+    assert!(r.same_channel(&r2));
+
+    let r3 = after(ms(50));
+    assert!(!r.same_channel(&r3));
+    assert!(!r2.same_channel(&r3));
+
+    let r4 = after(ms(100));
+    assert!(!r.same_channel(&r4));
+    assert!(!r2.same_channel(&r4));
+}
+
+#[test]
+fn array_same_channel() {
+    let (s, r) = bounded::<usize>(1);
+
+    let s2 = s.clone();
+    assert!(s.same_channel(&s2));
+
+    let r2 = r.clone();
+    assert!(r.same_channel(&r2));
+
+    let (s3, r3) = bounded::<usize>(1);
+    assert!(!s.same_channel(&s3));
+    assert!(!s2.same_channel(&s3));
+    assert!(!r.same_channel(&r3));
+    assert!(!r2.same_channel(&r3));
+}
+
+#[test]
+fn list_same_channel() {
+    let (s, r) = unbounded::<usize>();
+
+    let s2 = s.clone();
+    assert!(s.same_channel(&s2));
+
+    let r2 = r.clone();
+    assert!(r.same_channel(&r2));
+
+    let (s3, r3) = unbounded::<usize>();
+    assert!(!s.same_channel(&s3));
+    assert!(!s2.same_channel(&s3));
+    assert!(!r.same_channel(&r3));
+    assert!(!r2.same_channel(&r3));
+}
+
+#[test]
+fn never_same_channel() {
+    let r = never::<usize>();
+
+    let r2 = r.clone();
+    assert!(r.same_channel(&r2));
+
+    // Never channel are always equal to one another.
+    let r3 = never::<usize>();
+    assert!(r.same_channel(&r3));
+    assert!(r2.same_channel(&r3));
+}
+
+#[test]
+fn tick_same_channel() {
+    let r = tick(ms(50));
+
+    let r2 = r.clone();
+    assert!(r.same_channel(&r2));
+
+    let r3 = tick(ms(50));
+    assert!(!r.same_channel(&r3));
+    assert!(!r2.same_channel(&r3));
+
+    let r4 = tick(ms(100));
+    assert!(!r.same_channel(&r4));
+    assert!(!r2.same_channel(&r4));
+}
+
+#[test]
+fn zero_same_channel() {
+    let (s, r) = bounded::<usize>(0);
+
+    let s2 = s.clone();
+    assert!(s.same_channel(&s2));
+
+    let r2 = r.clone();
+    assert!(r.same_channel(&r2));
+
+    let (s3, r3) = bounded::<usize>(0);
+    assert!(!s.same_channel(&s3));
+    assert!(!s2.same_channel(&s3));
+    assert!(!r.same_channel(&r3));
+    assert!(!r2.same_channel(&r3));
+}
+
+#[test]
+fn different_flavors_same_channel() {
+    let (s1, r1) = bounded::<usize>(0);
+    let (s2, r2) = unbounded::<usize>();
+
+    assert!(!s1.same_channel(&s2));
+    assert!(!r1.same_channel(&r2));
+}
diff --git a/vendor/crossbeam-channel/tests/select.rs b/vendor/crossbeam-channel/tests/select.rs
index b8c3e05af9..b18d66d7cd 100644
--- a/vendor/crossbeam-channel/tests/select.rs
+++ b/vendor/crossbeam-channel/tests/select.rs
@@ -98,7 +98,8 @@ fn disconnected() {
         }
 
         r2.recv().unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 
     let mut sel = Select::new();
     let oper1 = sel.recv(&r1);
@@ -129,7 +130,8 @@ fn disconnected() {
                 _ => unreachable!(),
             },
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -226,7 +228,8 @@ fn timeout() {
                 _ => unreachable!(),
             },
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     scope(|scope| {
         let (s, r) = unbounded::<i32>();
@@ -253,7 +256,8 @@ fn timeout() {
             }
             Ok(_) => unreachable!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -353,7 +357,8 @@ fn unblocks() {
                 _ => unreachable!(),
             },
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     scope(|scope| {
         scope.spawn(|_| {
@@ -373,7 +378,8 @@ fn unblocks() {
                 _ => unreachable!(),
             },
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -399,7 +405,8 @@ fn both_ready() {
                 _ => unreachable!(),
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -412,70 +419,66 @@ fn loop_try() {
         let (s_end, r_end) = bounded::<()>(0);
 
         scope(|scope| {
-            scope.spawn(|_| {
-                loop {
-                    let mut done = false;
+            scope.spawn(|_| loop {
+                let mut done = false;
 
-                    let mut sel = Select::new();
-                    let oper1 = sel.send(&s1);
-                    let oper = sel.try_select();
-                    match oper {
-                        Err(_) => {}
-                        Ok(oper) => match oper.index() {
-                            i if i == oper1 => {
-                                let _ = oper.send(&s1, 1);
-                                done = true;
-                            }
-                            _ => unreachable!(),
-                        },
-                    }
-                    if done {
-                        break;
-                    }
+                let mut sel = Select::new();
+                let oper1 = sel.send(&s1);
+                let oper = sel.try_select();
+                match oper {
+                    Err(_) => {}
+                    Ok(oper) => match oper.index() {
+                        i if i == oper1 => {
+                            let _ = oper.send(&s1, 1);
+                            done = true;
+                        }
+                        _ => unreachable!(),
+                    },
+                }
+                if done {
+                    break;
+                }
 
-                    let mut sel = Select::new();
-                    let oper1 = sel.recv(&r_end);
-                    let oper = sel.try_select();
-                    match oper {
-                        Err(_) => {}
-                        Ok(oper) => match oper.index() {
-                            i if i == oper1 => {
-                                let _ = oper.recv(&r_end);
-                                done = true;
-                            }
-                            _ => unreachable!(),
-                        },
-                    }
-                    if done {
-                        break;
-                    }
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r_end);
+                let oper = sel.try_select();
+                match oper {
+                    Err(_) => {}
+                    Ok(oper) => match oper.index() {
+                        i if i == oper1 => {
+                            let _ = oper.recv(&r_end);
+                            done = true;
+                        }
+                        _ => unreachable!(),
+                    },
+                }
+                if done {
+                    break;
                 }
             });
 
-            scope.spawn(|_| {
-                loop {
-                    if let Ok(x) = r2.try_recv() {
-                        assert_eq!(x, 2);
-                        break;
-                    }
+            scope.spawn(|_| loop {
+                if let Ok(x) = r2.try_recv() {
+                    assert_eq!(x, 2);
+                    break;
+                }
 
-                    let mut done = false;
-                    let mut sel = Select::new();
-                    let oper1 = sel.recv(&r_end);
-                    let oper = sel.try_select();
-                    match oper {
-                        Err(_) => {}
-                        Ok(oper) => match oper.index() {
-                            i if i == oper1 => {
-                                let _ = oper.recv(&r_end);
-                                done = true;
-                            }
-                            _ => unreachable!(),
-                        },
-                    }
-                    if done {
-                        break;
-                    }
+                let mut done = false;
+                let mut sel = Select::new();
+                let oper1 = sel.recv(&r_end);
+                let oper = sel.try_select();
+                match oper {
+                    Err(_) => {}
+                    Ok(oper) => match oper.index() {
+                        i if i == oper1 => {
+                            let _ = oper.recv(&r_end);
+                            done = true;
+                        }
+                        _ => unreachable!(),
+                    },
+                }
+                if done {
+                    break;
                 }
             });
 
@@ -497,7 +500,8 @@ fn loop_try() {
 
                 drop(s_end);
             });
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -529,7 +533,8 @@ fn cloning1() {
         }
 
         s3.send(()).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -554,7 +559,8 @@ fn cloning2() {
         thread::sleep(ms(500));
         drop(s1.clone());
         s2.send(()).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -719,7 +725,8 @@ fn stress_recv() {
                 s3.send(()).unwrap();
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -753,7 +760,8 @@ fn stress_send() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -787,7 +795,8 @@ fn stress_mixed() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -803,7 +812,7 @@ fn stress_timeout_two_threads() {
                     thread::sleep(ms(500));
                 }
 
-                let mut done = false;
+                let done = false;
                 while !done {
                     let mut sel = Select::new();
                     let oper1 = sel.send(&s);
@@ -846,7 +855,8 @@ fn stress_timeout_two_threads() {
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -900,7 +910,8 @@ fn matching() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
@@ -926,7 +937,8 @@ fn matching_with_leftover() {
             });
         }
         s.send(!0).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
@@ -935,7 +947,7 @@ fn matching_with_leftover() {
 fn channel_through_channel() {
     const COUNT: usize = 1000;
 
-    type T = Box<Any + Send>;
+    type T = Box<dyn Any + Send>;
 
     for cap in 0..3 {
         let (s, r) = bounded::<T>(cap);
@@ -946,7 +958,7 @@ fn channel_through_channel() {
 
                 for _ in 0..COUNT {
                     let (new_s, new_r) = bounded(cap);
-                    let mut new_r: T = Box::new(Some(new_r));
+                    let new_r: T = Box::new(Some(new_r));
 
                     {
                         let mut sel = Select::new();
@@ -984,7 +996,8 @@ fn channel_through_channel() {
                     r = new;
                 }
             });
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -1035,7 +1048,8 @@ fn linearizable_try() {
 
                 end_r.recv().unwrap();
             }
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -1086,7 +1100,8 @@ fn linearizable_timeout() {
 
                 end_r.recv().unwrap();
             }
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -1191,7 +1206,8 @@ fn fairness2() {
             }
         }
         assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 50));
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1217,7 +1233,8 @@ fn sync_and_clone() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
@@ -1244,7 +1261,8 @@ fn send_and_clone() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
@@ -1281,5 +1299,6 @@ fn reuse() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
diff --git a/vendor/crossbeam-channel/tests/select_macro.rs b/vendor/crossbeam-channel/tests/select_macro.rs
index 3b02e51978..a9cc7fac79 100644
--- a/vendor/crossbeam-channel/tests/select_macro.rs
+++ b/vendor/crossbeam-channel/tests/select_macro.rs
@@ -78,7 +78,8 @@ fn disconnected() {
         }
 
         r2.recv().unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 
     select! {
         recv(r1) -> v => assert!(v.is_err()),
@@ -96,7 +97,8 @@ fn disconnected() {
             recv(r2) -> v => assert!(v.is_err()),
             default(ms(1000)) => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -157,7 +159,8 @@ fn timeout() {
             recv(r2) -> v => assert_eq!(v, Ok(2)),
             default(ms(1000)) => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     scope(|scope| {
         let (s, r) = unbounded::<i32>();
@@ -175,7 +178,8 @@ fn timeout() {
                 }
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -243,7 +247,8 @@ fn unblocks() {
             recv(r2) -> v => assert_eq!(v, Ok(2)),
             default(ms(1000)) => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     scope(|scope| {
         scope.spawn(|_| {
@@ -256,7 +261,8 @@ fn unblocks() {
             send(s2, 2) -> _ => panic!(),
             default(ms(1000)) => panic!(),
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -277,7 +283,8 @@ fn both_ready() {
                 send(s2, 2) -> _ => {},
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -290,31 +297,27 @@ fn loop_try() {
         let (s_end, r_end) = bounded::<()>(0);
 
         scope(|scope| {
-            scope.spawn(|_| {
-                loop {
-                    select! {
-                        send(s1, 1) -> _ => break,
-                        default => {}
-                    }
+            scope.spawn(|_| loop {
+                select! {
+                    send(s1, 1) -> _ => break,
+                    default => {}
+                }
 
-                    select! {
-                        recv(r_end) -> _ => break,
-                        default => {}
-                    }
+                select! {
+                    recv(r_end) -> _ => break,
+                    default => {}
                 }
             });
 
-            scope.spawn(|_| {
-                loop {
-                    if let Ok(x) = r2.try_recv() {
-                        assert_eq!(x, 2);
-                        break;
-                    }
+            scope.spawn(|_| loop {
+                if let Ok(x) = r2.try_recv() {
+                    assert_eq!(x, 2);
+                    break;
+                }
 
-                    select! {
-                        recv(r_end) -> _ => break,
-                        default => {}
-                    }
+                select! {
+                    recv(r_end) -> _ => break,
+                    default => {}
                 }
             });
 
@@ -329,7 +332,8 @@ fn loop_try() {
 
                 drop(s_end);
             });
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -356,7 +360,8 @@ fn cloning1() {
         }
 
         s3.send(()).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -376,7 +381,8 @@ fn cloning2() {
         thread::sleep(ms(500));
         drop(s1.clone());
         s2.send(()).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -510,7 +516,8 @@ fn stress_recv() {
                 s3.send(()).unwrap();
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -539,7 +546,8 @@ fn stress_send() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -568,7 +576,8 @@ fn stress_mixed() {
             }
             s3.send(()).unwrap();
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -610,7 +619,8 @@ fn stress_timeout_two_threads() {
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -645,7 +655,8 @@ fn matching() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
@@ -666,7 +677,8 @@ fn matching_with_leftover() {
             });
         }
         s.send(!0).unwrap();
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(r.try_recv(), Err(TryRecvError::Empty));
 }
@@ -675,7 +687,7 @@ fn matching_with_leftover() {
 fn channel_through_channel() {
     const COUNT: usize = 1000;
 
-    type T = Box<Any + Send>;
+    type T = Box<dyn Any + Send>;
 
     for cap in 0..3 {
         let (s, r) = bounded::<T>(cap);
@@ -686,7 +698,7 @@ fn channel_through_channel() {
 
                 for _ in 0..COUNT {
                     let (new_s, new_r) = bounded(cap);
-                    let mut new_r: T = Box::new(Some(new_r));
+                    let new_r: T = Box::new(Some(new_r));
 
                     select! {
                         send(s, new_r) -> _ => {}
@@ -701,7 +713,7 @@ fn channel_through_channel() {
 
                 for _ in 0..COUNT {
                     r = select! {
-                        recv(r) -> mut msg => {
+                        recv(r) -> msg => {
                             msg.unwrap()
                                 .downcast_mut::<Option<Receiver<T>>>()
                                 .unwrap()
@@ -711,7 +723,8 @@ fn channel_through_channel() {
                     }
                 }
             });
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -754,7 +767,8 @@ fn linearizable_default() {
 
                 end_r.recv().unwrap();
             }
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -797,7 +811,8 @@ fn linearizable_timeout() {
 
                 end_r.recv().unwrap();
             }
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -858,7 +873,8 @@ fn fairness2() {
             }
         }
         assert!(hits.iter().all(|x| x.get() >= COUNT / hits.len() / 50));
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1223,7 +1239,8 @@ fn try_recv() {
                 send(s, 7) -> res => res.unwrap(),
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1259,7 +1276,8 @@ fn recv() {
                 send(s, 9) -> res => res.unwrap(),
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1287,7 +1305,8 @@ fn recv_timeout() {
                 send(s, 7) -> res => res.unwrap(),
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1317,7 +1336,8 @@ fn try_send() {
                 recv(r) -> v => assert_eq!(v, Ok(8)),
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1350,7 +1370,8 @@ fn send() {
                 recv(r) -> v => assert_eq!(v, Ok(9)),
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1378,7 +1399,8 @@ fn send_timeout() {
                 recv(r) -> v => assert_eq!(v, Ok(8)),
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1395,7 +1417,8 @@ fn disconnect_wakes_sender() {
             thread::sleep(ms(1000));
             drop(r);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -1412,5 +1435,6 @@ fn disconnect_wakes_receiver() {
             thread::sleep(ms(1000));
             drop(s);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
diff --git a/vendor/crossbeam-channel/tests/thread_locals.rs b/vendor/crossbeam-channel/tests/thread_locals.rs
index bc4af4d80e..fd319c7284 100644
--- a/vendor/crossbeam-channel/tests/thread_locals.rs
+++ b/vendor/crossbeam-channel/tests/thread_locals.rs
@@ -15,6 +15,7 @@ fn ms(ms: u64) -> Duration {
 }
 
 #[test]
+#[cfg_attr(target_os = "macos", ignore = "TLS is destroyed too early on macOS")]
 fn use_while_exiting() {
     struct Foo;
 
@@ -49,5 +50,6 @@ fn use_while_exiting() {
             thread::sleep(ms(100));
             s.send(()).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
diff --git a/vendor/crossbeam-channel/tests/tick.rs b/vendor/crossbeam-channel/tests/tick.rs
index 3873db87d5..34e55b31bf 100644
--- a/vendor/crossbeam-channel/tests/tick.rs
+++ b/vendor/crossbeam-channel/tests/tick.rs
@@ -178,7 +178,8 @@ fn recv_two() {
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -249,7 +250,8 @@ fn select() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(hits.load(Ordering::SeqCst), 8);
 }
@@ -296,7 +298,8 @@ fn ready() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(hits.load(Ordering::SeqCst), 8);
 }
diff --git a/vendor/crossbeam-channel/tests/zero.rs b/vendor/crossbeam-channel/tests/zero.rs
index cb989e30c4..bd336ee157 100644
--- a/vendor/crossbeam-channel/tests/zero.rs
+++ b/vendor/crossbeam-channel/tests/zero.rs
@@ -5,12 +5,13 @@ extern crate crossbeam_channel;
 extern crate crossbeam_utils;
 extern crate rand;
 
+use std::any::Any;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering;
 use std::thread;
 use std::time::Duration;
 
-use crossbeam_channel::bounded;
+use crossbeam_channel::{bounded, Receiver};
 use crossbeam_channel::{RecvError, RecvTimeoutError, TryRecvError};
 use crossbeam_channel::{SendError, SendTimeoutError, TrySendError};
 use crossbeam_utils::thread::scope;
@@ -48,7 +49,8 @@ fn len_empty_full() {
     scope(|scope| {
         scope.spawn(|_| s.send(0).unwrap());
         scope.spawn(|_| r.recv().unwrap());
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(s.len(), 0);
     assert_eq!(s.is_empty(), true);
@@ -74,7 +76,8 @@ fn try_recv() {
             thread::sleep(ms(1000));
             s.send(7).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -96,7 +99,8 @@ fn recv() {
             s.send(8).unwrap();
             s.send(9).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -116,7 +120,8 @@ fn recv_timeout() {
             thread::sleep(ms(1500));
             s.send(7).unwrap();
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -135,7 +140,8 @@ fn try_send() {
             thread::sleep(ms(1000));
             assert_eq!(r.recv(), Ok(8));
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -156,7 +162,8 @@ fn send() {
             assert_eq!(r.recv(), Ok(8));
             assert_eq!(r.recv(), Ok(9));
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -179,7 +186,8 @@ fn send_timeout() {
             thread::sleep(ms(1500));
             assert_eq!(r.recv(), Ok(8));
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -205,7 +213,8 @@ fn len() {
                 assert_eq!(s.len(), 0);
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 
     assert_eq!(s.len(), 0);
     assert_eq!(r.len(), 0);
@@ -223,7 +232,8 @@ fn disconnect_wakes_sender() {
             thread::sleep(ms(1000));
             drop(r);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -238,7 +248,8 @@ fn disconnect_wakes_receiver() {
             thread::sleep(ms(1000));
             drop(s);
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -259,7 +270,8 @@ fn spsc() {
                 s.send(i).unwrap();
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -286,7 +298,8 @@ fn mpmc() {
                 }
             });
         }
-    }).unwrap();
+    })
+    .unwrap();
 
     for c in v {
         assert_eq!(c.load(Ordering::SeqCst), THREADS);
@@ -303,7 +316,8 @@ fn stress_oneshot() {
         scope(|scope| {
             scope.spawn(|_| r.recv().unwrap());
             scope.spawn(|_| s.send(0).unwrap());
-        }).unwrap();
+        })
+        .unwrap();
     }
 }
 
@@ -333,7 +347,8 @@ fn stress_iter() {
                 break;
             }
         }
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -369,7 +384,8 @@ fn stress_timeout_two_threads() {
                 }
             }
         });
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -405,7 +421,8 @@ fn drops() {
                     s.send(DropCounter).unwrap();
                 }
             });
-        }).unwrap();
+        })
+        .unwrap();
 
         assert_eq!(DROPS.load(Ordering::SeqCst), steps);
         drop(s);
@@ -441,7 +458,8 @@ fn fairness() {
             }
         }
         assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -476,7 +494,8 @@ fn fairness_duplicates() {
             }
         }
         assert!(hits.iter().all(|x| *x >= COUNT / hits.len() / 2));
-    }).unwrap();
+    })
+    .unwrap();
 }
 
 #[test]
@@ -497,5 +516,44 @@ fn recv_in_send() {
         select! {
             send(s, r.recv().unwrap()) -> _ => {}
         }
-    }).unwrap();
+    })
+    .unwrap();
+}
+
+#[test]
+fn channel_through_channel() {
+    const COUNT: usize = 1000;
+
+    type T = Box<dyn Any + Send>;
+
+    let (s, r) = bounded::<T>(0);
+
+    scope(|scope| {
+        scope.spawn(move |_| {
+            let mut s = s;
+
+            for _ in 0..COUNT {
+                let (new_s, new_r) = bounded(0);
+                let new_r: T = Box::new(Some(new_r));
+
+                s.send(new_r).unwrap();
+                s = new_s;
+            }
+        });
+
+        scope.spawn(move |_| {
+            let mut r = r;
+
+            for _ in 0..COUNT {
+                r = r
+                    .recv()
+                    .unwrap()
+                    .downcast_mut::<Option<Receiver<T>>>()
+                    .unwrap()
+                    .take()
+                    .unwrap()
+            }
+        });
+    })
+    .unwrap();
 }
diff --git a/vendor/crossbeam-utils/.cargo-checksum.json b/vendor/crossbeam-utils/.cargo-checksum.json
new file mode 100644
index 0000000000..330718f051
--- /dev/null
+++ b/vendor/crossbeam-utils/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"c728a651e916eeb36060274c25cf28817920caf498eb5a367fecdaebe3139f5b","Cargo.toml":"d72c5990059398ec7a203d13a4fc8c5dd7e1c051199415d33475675acb377f9a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"9010e511423b1159a33c84433d9e6cb8df1d08938e4d6cc8656bcec9bdde0eb8","benches/atomic_cell.rs":"fa38d34ddc593bf0999fd65d95ee349c53a11290fbe7bf24870a7e24754ae2ac","build.rs":"825c47ae19028dc4b28101ec71c04e7e41b8b185f6ecbeacee223596524c86ad","src/atomic/atomic_cell.rs":"609adf6aa30d8685c1f708887a17c19f90f8751400b83d8146d078afb5a31c48","src/atomic/consume.rs":"bfdc7e2d8370a5a3bb1699b6214347c359d66fcc92a2d1345a513676ac91d821","src/atomic/mod.rs":"6c3efec60aee6a2e68dfa6fe3c059beab8429c150459ce5cfc736e8b5f95301e","src/atomic/seq_lock.rs":"4797f76beb0ec3eb363c2d49e9548adc8d042867b1602c1b8ca6269463d84e82","src/atomic/seq_lock_wide.rs":"d27243fae36ae9ff72cbf24defcac4abb2aef3fa11a47f352702708a1eee6a06","src/backoff.rs":"bc9d2afdd070e0746bc48ff2159bf47b0cfaa68ea09f47eaed18ccc32fc87d67","src/cache_padded.rs":"864f210089eddfd130830f5c700115c2f8b974b71659d7e8ef7bd5e09d7e1f96","src/lib.rs":"63096ede0c6ccdee05e910c2cce41da6df283868b658f9aa18c8fba8ac0f901d","src/sync/mod.rs":"4c8ad6ec4601f212791b0b531b46ee5decec2f1d14746aa7f2c18e36c609cd8e","src/sync/parker.rs":"55324bbea5b7c6838a0f8467a5b8a5dbd5526c8e1c7fd4f6d64dad1ab19f9be9","src/sync/sharded_lock.rs":"7a401ba621233732c26cf49324748269359d7bc5dc27e0ec26c9493e9a5ec97d","src/sync/wait_group.rs":"21708bbd46daa98e9f788765a9a4ef3b087a8d1e97a6e9406b4a960c95e44ca0","src/thread.rs":"81f6ee718c5251083024583d351a1713cb6a850c284f68e5fa8a35d2ed4b33ba","tests/atomic_cell.rs":"a3c9e7d5832c92fa7e39710a3dc84b4a906eb93479386fba75ff851dd1c908ae","tests/cache_padded.rs":"02235757a554279dae5053d46314a765059ec036c63a05336353994c2aa344d1","tests/parker.rs":"3e5c4e170cebdd9f815f2b31a2b6a01da753fc03e2b1d8e9b899d009f62c6b83","tests/sharded_lock.rs":"3b42218397f1260bed4e0a229f55da83439c0ec9effbbefc86251c9d208979bb","tests/thread.rs":"4be7b293b5f13d7a158a231ba7f7b086bd8fe19aaf11b1c9a8a6cdf7bba6fdfc","tests/wait_group.rs":"e3d5168581fb511b760f4249ca487b919cffc60ac2b4610a78db99899772dd5b"},"package":"ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"}
\ No newline at end of file
diff --git a/vendor/crossbeam-utils/CHANGELOG.md b/vendor/crossbeam-utils/CHANGELOG.md
new file mode 100644
index 0000000000..160e928881
--- /dev/null
+++ b/vendor/crossbeam-utils/CHANGELOG.md
@@ -0,0 +1,104 @@
+# Version 0.7.0
+
+- Bump the minimum required version to 1.28.
+- Fix breakage with nightly feature due to rust-lang/rust#65214.
+- Apply `#[repr(transparent)]` to `AtomicCell`.
+- Make `AtomicCell::new()` const function at 1.31+.
+
+# Version 0.6.6
+
+- Add `UnwindSafe` and `RefUnwindSafe` impls for `AtomicCell`.
+- Add `AtomicCell::as_ptr()`.
+- Add `AtomicCell::take()`.
+- Fix a bug in `AtomicCell::compare_exchange()` and `AtomicCell::compare_and_swap()`.
+- Various documentation improvements.
+
+# Version 0.6.5
+
+- Rename `Backoff::is_complete()` to `Backoff::is_completed()`.
+
+# Version 0.6.4
+
+- Add `WaitGroup`, `ShardedLock`, and `Backoff`.
+- Add `fetch_*` methods for `AtomicCell<i128>` and `AtomicCell<u128>`.
+- Expand documentation.
+
+# Version 0.6.3
+
+- Add `AtomicCell`.
+- Improve documentation.
+
+# Version 0.6.2
+
+- Add `Parker`.
+- Improve documentation.
+
+# Version 0.6.1
+
+- Fix a soundness bug in `Scope::spawn()`.
+- Remove the `T: 'scope` bound on `ScopedJoinHandle`.
+
+# Version 0.6.0
+
+- Move `AtomicConsume` to `atomic` module.
+- `scope()` returns a `Result` of thread joins.
+- Remove `spawn_unchecked`.
+- Fix a soundness bug due to incorrect lifetimes.
+- Improve documentation.
+- Support nested scoped spawns.
+- Implement `Copy`, `Hash`, `PartialEq`, and `Eq` for `CachePadded`.
+- Add `CachePadded::into_inner()`.
+
+# Version 0.5.0
+
+- Reorganize sub-modules and rename functions.
+
+# Version 0.4.1
+
+- Fix a documentation link.
+
+# Version 0.4.0
+
+- `CachePadded` supports types bigger than 64 bytes.
+- Fix a bug in scoped threads where unitialized memory was being dropped.
+- Minimum required Rust version is now 1.25.
+
+# Version 0.3.2
+
+- Mark `load_consume` with `#[inline]`.
+
+# Version 0.3.1
+
+- `load_consume` on ARM and AArch64.
+
+# Version 0.3.0
+
+- Add `join` for scoped thread API.
+- Add `load_consume` for atomic load-consume memory ordering.
+- Remove `AtomicOption`.
+
+# Version 0.2.2
+
+- Support Rust 1.12.1.
+- Call `T::clone` when cloning a `CachePadded<T>`.
+
+# Version 0.2.1
+
+- Add `use_std` feature.
+
+# Version 0.2.0
+
+- Add `nightly` feature.
+- Use `repr(align(64))` on `CachePadded` with the `nightly` feature.
+- Implement `Drop` for `CachePadded<T>`.
+- Implement `Clone` for `CachePadded<T>`.
+- Implement `From<T>` for `CachePadded<T>`.
+- Implement better `Debug` for `CachePadded<T>`.
+- Write more tests.
+- Add this changelog.
+- Change cache line length to 64 bytes.
+- Remove `ZerosValid`.
+
+# Version 0.1.0
+
+- Old implementation of `CachePadded` from `crossbeam` version 0.3.0
diff --git a/vendor/crossbeam-utils/Cargo.toml b/vendor/crossbeam-utils/Cargo.toml
new file mode 100644
index 0000000000..c16268bf6e
--- /dev/null
+++ b/vendor/crossbeam-utils/Cargo.toml
@@ -0,0 +1,40 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "crossbeam-utils"
+version = "0.7.0"
+authors = ["The Crossbeam Project Developers"]
+description = "Utilities for concurrent programming"
+homepage = "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-utils"
+documentation = "https://docs.rs/crossbeam-utils"
+readme = "README.md"
+keywords = ["scoped", "thread", "atomic", "cache"]
+categories = ["algorithms", "concurrency", "data-structures", "no-std"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/crossbeam-rs/crossbeam"
+[dependencies.cfg-if]
+version = "0.1.2"
+
+[dependencies.lazy_static]
+version = "1.1.0"
+optional = true
+[dev-dependencies.rand]
+version = "0.6"
+[build-dependencies.autocfg]
+version = "0.1.6"
+
+[features]
+alloc = []
+default = ["std"]
+nightly = []
+std = ["lazy_static"]
diff --git a/vendor/lazy_static-0.2.11/LICENSE-APACHE b/vendor/crossbeam-utils/LICENSE-APACHE
similarity index 100%
rename from vendor/lazy_static-0.2.11/LICENSE-APACHE
rename to vendor/crossbeam-utils/LICENSE-APACHE
diff --git a/vendor/crossbeam-utils/LICENSE-MIT b/vendor/crossbeam-utils/LICENSE-MIT
new file mode 100644
index 0000000000..068d491fd5
--- /dev/null
+++ b/vendor/crossbeam-utils/LICENSE-MIT
@@ -0,0 +1,27 @@
+The MIT License (MIT)
+
+Copyright (c) 2019 The Crossbeam Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/vendor/crossbeam-utils/README.md b/vendor/crossbeam-utils/README.md
new file mode 100644
index 0000000000..ffb1ab4248
--- /dev/null
+++ b/vendor/crossbeam-utils/README.md
@@ -0,0 +1,77 @@
+# Crossbeam Utils
+
+[![Build Status](https://travis-ci.org/crossbeam-rs/crossbeam.svg?branch=master)](
+https://travis-ci.org/crossbeam-rs/crossbeam)
+[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](
+https://github.com/crossbeam-rs/crossbeam-utils/tree/master/src)
+[![Cargo](https://img.shields.io/crates/v/crossbeam-utils.svg)](
+https://crates.io/crates/crossbeam-utils)
+[![Documentation](https://docs.rs/crossbeam-utils/badge.svg)](
+https://docs.rs/crossbeam-utils)
+[![Rust 1.28+](https://img.shields.io/badge/rust-1.28+-lightgray.svg)](
+https://www.rust-lang.org)
+[![chat](https://img.shields.io/discord/569610676205781012.svg?logo=discord)](https://discord.gg/BBYwKq)
+
+This crate provides miscellaneous tools for concurrent programming:
+
+#### Atomics
+
+* [`AtomicCell`], a thread-safe mutable memory location.<sup>(no_std)</sup>
+* [`AtomicConsume`], for reading from primitive atomic types with "consume" ordering.<sup>(no_std)</sup>
+
+#### Thread synchronization
+
+* [`Parker`], a thread parking primitive.
+* [`ShardedLock`], a sharded reader-writer lock with fast concurrent reads.
+* [`WaitGroup`], for synchronizing the beginning or end of some computation.
+
+#### Utilities
+
+* [`Backoff`], for exponential backoff in spin loops.<sup>(no_std)</sup>
+* [`CachePadded`], for padding and aligning a value to the length of a cache line.<sup>(no_std)</sup>
+* [`scope`], for spawning threads that borrow local variables from the stack.
+
+*Features marked with <sup>(no_std)</sup> can be used in `no_std` environments.*<br/>
+
+[`AtomicCell`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/atomic/struct.AtomicCell.html
+[`AtomicConsume`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/atomic/trait.AtomicConsume.html
+[`Parker`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/sync/struct.Parker.html
+[`ShardedLock`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/sync/struct.ShardedLock.html
+[`WaitGroup`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/sync/struct.WaitGroup.html
+[`Backoff`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/struct.Backoff.html
+[`CachePadded`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/struct.CachePadded.html
+[`scope`]: https://docs.rs/crossbeam-utils/*/crossbeam_utils/thread/fn.scope.html
+
+## Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+crossbeam-utils = "0.7"
+```
+
+Next, add this to your crate:
+
+```rust
+extern crate crossbeam_utils;
+```
+
+## Compatibility
+
+The minimum supported Rust version is 1.28. Any change to this is considered a breaking change.
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+#### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be
+dual licensed as above, without any additional terms or conditions.
diff --git a/vendor/crossbeam-utils/benches/atomic_cell.rs b/vendor/crossbeam-utils/benches/atomic_cell.rs
new file mode 100644
index 0000000000..8587dba1d9
--- /dev/null
+++ b/vendor/crossbeam-utils/benches/atomic_cell.rs
@@ -0,0 +1,157 @@
+#![feature(test)]
+
+extern crate crossbeam_utils;
+extern crate test;
+
+use std::sync::Barrier;
+
+use crossbeam_utils::atomic::AtomicCell;
+use crossbeam_utils::thread;
+
+#[bench]
+fn load_u8(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0u8);
+    let mut sum = 0;
+    b.iter(|| sum += a.load());
+    test::black_box(sum);
+}
+
+#[bench]
+fn store_u8(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0u8);
+    b.iter(|| a.store(1));
+}
+
+#[bench]
+fn fetch_add_u8(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0u8);
+    b.iter(|| a.fetch_add(1));
+}
+
+#[bench]
+fn compare_and_swap_u8(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0u8);
+    let mut i = 0;
+    b.iter(|| {
+        a.compare_and_swap(i, i.wrapping_add(1));
+        i = i.wrapping_add(1);
+    });
+}
+
+#[bench]
+fn concurrent_load_u8(b: &mut test::Bencher) {
+    const THREADS: usize = 2;
+    const STEPS: usize = 1_000_000;
+
+    let start = Barrier::new(THREADS + 1);
+    let end = Barrier::new(THREADS + 1);
+    let exit = AtomicCell::new(false);
+
+    let a = AtomicCell::new(0u8);
+
+    thread::scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| loop {
+                start.wait();
+
+                let mut sum = 0;
+                for _ in 0..STEPS {
+                    sum += a.load();
+                }
+                test::black_box(sum);
+
+                end.wait();
+                if exit.load() {
+                    break;
+                }
+            });
+        }
+
+        start.wait();
+        end.wait();
+
+        b.iter(|| {
+            start.wait();
+            end.wait();
+        });
+
+        start.wait();
+        exit.store(true);
+        end.wait();
+    })
+    .unwrap();
+}
+
+#[bench]
+fn load_usize(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0usize);
+    let mut sum = 0;
+    b.iter(|| sum += a.load());
+    test::black_box(sum);
+}
+
+#[bench]
+fn store_usize(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0usize);
+    b.iter(|| a.store(1));
+}
+
+#[bench]
+fn fetch_add_usize(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0usize);
+    b.iter(|| a.fetch_add(1));
+}
+
+#[bench]
+fn compare_and_swap_usize(b: &mut test::Bencher) {
+    let a = AtomicCell::new(0usize);
+    let mut i = 0;
+    b.iter(|| {
+        a.compare_and_swap(i, i.wrapping_add(1));
+        i = i.wrapping_add(1);
+    });
+}
+
+#[bench]
+fn concurrent_load_usize(b: &mut test::Bencher) {
+    const THREADS: usize = 2;
+    const STEPS: usize = 1_000_000;
+
+    let start = Barrier::new(THREADS + 1);
+    let end = Barrier::new(THREADS + 1);
+    let exit = AtomicCell::new(false);
+
+    let a = AtomicCell::new(0usize);
+
+    thread::scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| loop {
+                start.wait();
+
+                let mut sum = 0;
+                for _ in 0..STEPS {
+                    sum += a.load();
+                }
+                test::black_box(sum);
+
+                end.wait();
+                if exit.load() {
+                    break;
+                }
+            });
+        }
+
+        start.wait();
+        end.wait();
+
+        b.iter(|| {
+            start.wait();
+            end.wait();
+        });
+
+        start.wait();
+        exit.store(true);
+        end.wait();
+    })
+    .unwrap();
+}
diff --git a/vendor/crossbeam-utils/build.rs b/vendor/crossbeam-utils/build.rs
new file mode 100644
index 0000000000..d451c24b2f
--- /dev/null
+++ b/vendor/crossbeam-utils/build.rs
@@ -0,0 +1,8 @@
+extern crate autocfg;
+
+fn main() {
+    let cfg = autocfg::new();
+    if cfg.probe_rustc_version(1, 31) {
+        println!("cargo:rustc-cfg=has_min_const_fn");
+    }
+}
diff --git a/vendor/crossbeam-utils/src/atomic/atomic_cell.rs b/vendor/crossbeam-utils/src/atomic/atomic_cell.rs
new file mode 100644
index 0000000000..76aae65f8a
--- /dev/null
+++ b/vendor/crossbeam-utils/src/atomic/atomic_cell.rs
@@ -0,0 +1,902 @@
+use core::cell::UnsafeCell;
+use core::fmt;
+use core::mem;
+use core::ptr;
+use core::sync::atomic::{self, AtomicBool, Ordering};
+
+#[cfg(feature = "std")]
+use std::panic::{RefUnwindSafe, UnwindSafe};
+
+use super::seq_lock::SeqLock;
+
+/// A thread-safe mutable memory location.
+///
+/// This type is equivalent to [`Cell`], except it can also be shared among multiple threads.
+///
+/// Operations on `AtomicCell`s use atomic instructions whenever possible, and synchronize using
+/// global locks otherwise. You can call [`AtomicCell::<T>::is_lock_free()`] to check whether
+/// atomic instructions or locks will be used.
+///
+/// Atomic loads use the [`Acquire`] ordering and atomic stores use the [`Release`] ordering.
+///
+/// [`Cell`]: https://doc.rust-lang.org/std/cell/struct.Cell.html
+/// [`AtomicCell::<T>::is_lock_free()`]: struct.AtomicCell.html#method.is_lock_free
+/// [`Acquire`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html#variant.Acquire
+/// [`Release`]: https://doc.rust-lang.org/std/sync/atomic/enum.Ordering.html#variant.Release
+#[repr(transparent)]
+pub struct AtomicCell<T: ?Sized> {
+    /// The inner value.
+    ///
+    /// If this value can be transmuted into a primitive atomic type, it will be treated as such.
+    /// Otherwise, all potentially concurrent operations on this data will be protected by a global
+    /// lock.
+    value: UnsafeCell<T>,
+}
+
+unsafe impl<T: Send> Send for AtomicCell<T> {}
+unsafe impl<T: Send> Sync for AtomicCell<T> {}
+
+#[cfg(feature = "std")]
+impl<T> UnwindSafe for AtomicCell<T> {}
+#[cfg(feature = "std")]
+impl<T> RefUnwindSafe for AtomicCell<T> {}
+
+impl<T> AtomicCell<T> {
+    /// Creates a new atomic cell initialized with `val`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(7);
+    /// ```
+    #[cfg(not(has_min_const_fn))]
+    pub fn new(val: T) -> AtomicCell<T> {
+        AtomicCell {
+            value: UnsafeCell::new(val),
+        }
+    }
+
+    /// Creates a new atomic cell initialized with `val`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(7);
+    /// ```
+    #[cfg(has_min_const_fn)]
+    pub const fn new(val: T) -> AtomicCell<T> {
+        AtomicCell {
+            value: UnsafeCell::new(val),
+        }
+    }
+
+    /// Unwraps the atomic cell and returns its inner value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let mut a = AtomicCell::new(7);
+    /// let v = a.into_inner();
+    ///
+    /// assert_eq!(v, 7);
+    /// ```
+    pub fn into_inner(self) -> T {
+        self.value.into_inner()
+    }
+
+    /// Returns `true` if operations on values of this type are lock-free.
+    ///
+    /// If the compiler or the platform doesn't support the necessary atomic instructions,
+    /// `AtomicCell<T>` will use global locks for every potentially concurrent atomic operation.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// // This type is internally represented as `AtomicUsize` so we can just use atomic
+    /// // operations provided by it.
+    /// assert_eq!(AtomicCell::<usize>::is_lock_free(), true);
+    ///
+    /// // A wrapper struct around `isize`.
+    /// struct Foo {
+    ///     bar: isize,
+    /// }
+    /// // `AtomicCell<Foo>` will be internally represented as `AtomicIsize`.
+    /// assert_eq!(AtomicCell::<Foo>::is_lock_free(), true);
+    ///
+    /// // Operations on zero-sized types are always lock-free.
+    /// assert_eq!(AtomicCell::<()>::is_lock_free(), true);
+    ///
+    /// // Very large types cannot be represented as any of the standard atomic types, so atomic
+    /// // operations on them will have to use global locks for synchronization.
+    /// assert_eq!(AtomicCell::<[u8; 1000]>::is_lock_free(), false);
+    /// ```
+    pub fn is_lock_free() -> bool {
+        atomic_is_lock_free::<T>()
+    }
+
+    /// Stores `val` into the atomic cell.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(7);
+    ///
+    /// assert_eq!(a.load(), 7);
+    /// a.store(8);
+    /// assert_eq!(a.load(), 8);
+    /// ```
+    pub fn store(&self, val: T) {
+        if mem::needs_drop::<T>() {
+            drop(self.swap(val));
+        } else {
+            unsafe {
+                atomic_store(self.value.get(), val);
+            }
+        }
+    }
+
+    /// Stores `val` into the atomic cell and returns the previous value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(7);
+    ///
+    /// assert_eq!(a.load(), 7);
+    /// assert_eq!(a.swap(8), 7);
+    /// assert_eq!(a.load(), 8);
+    /// ```
+    pub fn swap(&self, val: T) -> T {
+        unsafe { atomic_swap(self.value.get(), val) }
+    }
+}
+
+impl<T: ?Sized> AtomicCell<T> {
+    /// Returns a raw pointer to the underlying data in this atomic cell.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let mut a = AtomicCell::new(5);
+    ///
+    /// let ptr = a.as_ptr();
+    /// ```
+    #[inline]
+    pub fn as_ptr(&self) -> *mut T {
+        self.value.get()
+    }
+
+    /// Returns a mutable reference to the inner value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let mut a = AtomicCell::new(7);
+    /// *a.get_mut() += 1;
+    ///
+    /// assert_eq!(a.load(), 8);
+    /// ```
+    #[doc(hidden)]
+    #[deprecated(note = "this method is unsound and will be removed in the next release")]
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.value.get() }
+    }
+}
+
+impl<T: Default> AtomicCell<T> {
+    /// Takes the value of the atomic cell, leaving `Default::default()` in its place.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(5);
+    /// let five = a.take();
+    ///
+    /// assert_eq!(five, 5);
+    /// assert_eq!(a.into_inner(), 0);
+    /// ```
+    pub fn take(&self) -> T {
+        self.swap(Default::default())
+    }
+}
+
+impl<T: Copy> AtomicCell<T> {
+    /// Loads a value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(7);
+    ///
+    /// assert_eq!(a.load(), 7);
+    /// ```
+    pub fn load(&self) -> T {
+        unsafe { atomic_load(self.value.get()) }
+    }
+}
+
+impl<T: Copy + Eq> AtomicCell<T> {
+    /// If the current value equals `current`, stores `new` into the atomic cell.
+    ///
+    /// The return value is always the previous value. If it is equal to `current`, then the value
+    /// was updated.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(1);
+    ///
+    /// assert_eq!(a.compare_and_swap(2, 3), 1);
+    /// assert_eq!(a.load(), 1);
+    ///
+    /// assert_eq!(a.compare_and_swap(1, 2), 1);
+    /// assert_eq!(a.load(), 2);
+    /// ```
+    pub fn compare_and_swap(&self, current: T, new: T) -> T {
+        match self.compare_exchange(current, new) {
+            Ok(v) => v,
+            Err(v) => v,
+        }
+    }
+
+    /// If the current value equals `current`, stores `new` into the atomic cell.
+    ///
+    /// The return value is a result indicating whether the new value was written and containing
+    /// the previous value. On success this value is guaranteed to be equal to `current`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(1);
+    ///
+    /// assert_eq!(a.compare_exchange(2, 3), Err(1));
+    /// assert_eq!(a.load(), 1);
+    ///
+    /// assert_eq!(a.compare_exchange(1, 2), Ok(1));
+    /// assert_eq!(a.load(), 2);
+    /// ```
+    pub fn compare_exchange(&self, current: T, new: T) -> Result<T, T> {
+        unsafe { atomic_compare_exchange_weak(self.value.get(), current, new) }
+    }
+}
+
+macro_rules! impl_arithmetic {
+    ($t:ty, $example:tt) => {
+        impl AtomicCell<$t> {
+            /// Increments the current value by `val` and returns the previous value.
+            ///
+            /// The addition wraps on overflow.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_add(3), 7);
+            /// assert_eq!(a.load(), 10);
+            /// ```
+            #[inline]
+            pub fn fetch_add(&self, val: $t) -> $t {
+                if can_transmute::<$t, atomic::AtomicUsize>() {
+                    let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
+                    a.fetch_add(val as usize, Ordering::AcqRel) as $t
+                } else {
+                    let _guard = lock(self.value.get() as usize).write();
+                    let value = unsafe { &mut *(self.value.get()) };
+                    let old = *value;
+                    *value = value.wrapping_add(val);
+                    old
+                }
+            }
+
+            /// Decrements the current value by `val` and returns the previous value.
+            ///
+            /// The subtraction wraps on overflow.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_sub(3), 7);
+            /// assert_eq!(a.load(), 4);
+            /// ```
+            #[inline]
+            pub fn fetch_sub(&self, val: $t) -> $t {
+                if can_transmute::<$t, atomic::AtomicUsize>() {
+                    let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
+                    a.fetch_sub(val as usize, Ordering::AcqRel) as $t
+                } else {
+                    let _guard = lock(self.value.get() as usize).write();
+                    let value = unsafe { &mut *(self.value.get()) };
+                    let old = *value;
+                    *value = value.wrapping_sub(val);
+                    old
+                }
+            }
+
+            /// Applies bitwise "and" to the current value and returns the previous value.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_and(3), 7);
+            /// assert_eq!(a.load(), 3);
+            /// ```
+            #[inline]
+            pub fn fetch_and(&self, val: $t) -> $t {
+                if can_transmute::<$t, atomic::AtomicUsize>() {
+                    let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
+                    a.fetch_and(val as usize, Ordering::AcqRel) as $t
+                } else {
+                    let _guard = lock(self.value.get() as usize).write();
+                    let value = unsafe { &mut *(self.value.get()) };
+                    let old = *value;
+                    *value &= val;
+                    old
+                }
+            }
+
+            /// Applies bitwise "or" to the current value and returns the previous value.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_or(16), 7);
+            /// assert_eq!(a.load(), 23);
+            /// ```
+            #[inline]
+            pub fn fetch_or(&self, val: $t) -> $t {
+                if can_transmute::<$t, atomic::AtomicUsize>() {
+                    let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
+                    a.fetch_or(val as usize, Ordering::AcqRel) as $t
+                } else {
+                    let _guard = lock(self.value.get() as usize).write();
+                    let value = unsafe { &mut *(self.value.get()) };
+                    let old = *value;
+                    *value |= val;
+                    old
+                }
+            }
+
+            /// Applies bitwise "xor" to the current value and returns the previous value.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_xor(2), 7);
+            /// assert_eq!(a.load(), 5);
+            /// ```
+            #[inline]
+            pub fn fetch_xor(&self, val: $t) -> $t {
+                if can_transmute::<$t, atomic::AtomicUsize>() {
+                    let a = unsafe { &*(self.value.get() as *const atomic::AtomicUsize) };
+                    a.fetch_xor(val as usize, Ordering::AcqRel) as $t
+                } else {
+                    let _guard = lock(self.value.get() as usize).write();
+                    let value = unsafe { &mut *(self.value.get()) };
+                    let old = *value;
+                    *value ^= val;
+                    old
+                }
+            }
+        }
+    };
+    ($t:ty, $atomic:ty, $example:tt) => {
+        impl AtomicCell<$t> {
+            /// Increments the current value by `val` and returns the previous value.
+            ///
+            /// The addition wraps on overflow.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_add(3), 7);
+            /// assert_eq!(a.load(), 10);
+            /// ```
+            #[inline]
+            pub fn fetch_add(&self, val: $t) -> $t {
+                let a = unsafe { &*(self.value.get() as *const $atomic) };
+                a.fetch_add(val, Ordering::AcqRel)
+            }
+
+            /// Decrements the current value by `val` and returns the previous value.
+            ///
+            /// The subtraction wraps on overflow.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_sub(3), 7);
+            /// assert_eq!(a.load(), 4);
+            /// ```
+            #[inline]
+            pub fn fetch_sub(&self, val: $t) -> $t {
+                let a = unsafe { &*(self.value.get() as *const $atomic) };
+                a.fetch_sub(val, Ordering::AcqRel)
+            }
+
+            /// Applies bitwise "and" to the current value and returns the previous value.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_and(3), 7);
+            /// assert_eq!(a.load(), 3);
+            /// ```
+            #[inline]
+            pub fn fetch_and(&self, val: $t) -> $t {
+                let a = unsafe { &*(self.value.get() as *const $atomic) };
+                a.fetch_and(val, Ordering::AcqRel)
+            }
+
+            /// Applies bitwise "or" to the current value and returns the previous value.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_or(16), 7);
+            /// assert_eq!(a.load(), 23);
+            /// ```
+            #[inline]
+            pub fn fetch_or(&self, val: $t) -> $t {
+                let a = unsafe { &*(self.value.get() as *const $atomic) };
+                a.fetch_or(val, Ordering::AcqRel)
+            }
+
+            /// Applies bitwise "xor" to the current value and returns the previous value.
+            ///
+            /// # Examples
+            ///
+            /// ```
+            /// use crossbeam_utils::atomic::AtomicCell;
+            ///
+            #[doc = $example]
+            ///
+            /// assert_eq!(a.fetch_xor(2), 7);
+            /// assert_eq!(a.load(), 5);
+            /// ```
+            #[inline]
+            pub fn fetch_xor(&self, val: $t) -> $t {
+                let a = unsafe { &*(self.value.get() as *const $atomic) };
+                a.fetch_xor(val, Ordering::AcqRel)
+            }
+        }
+    };
+    ($t:ty, $size:tt, $atomic:ty, $example:tt) => {
+        #[cfg(target_has_atomic = $size)]
+        impl_arithmetic!($t, $atomic, $example);
+    };
+}
+
+cfg_if! {
+    if #[cfg(feature = "nightly")] {
+        impl_arithmetic!(u8, "8", atomic::AtomicU8, "let a = AtomicCell::new(7u8);");
+        impl_arithmetic!(i8, "8", atomic::AtomicI8, "let a = AtomicCell::new(7i8);");
+        impl_arithmetic!(u16, "16", atomic::AtomicU16, "let a = AtomicCell::new(7u16);");
+        impl_arithmetic!(i16, "16", atomic::AtomicI16, "let a = AtomicCell::new(7i16);");
+        impl_arithmetic!(u32, "32", atomic::AtomicU32, "let a = AtomicCell::new(7u32);");
+        impl_arithmetic!(i32, "32", atomic::AtomicI32, "let a = AtomicCell::new(7i32);");
+        impl_arithmetic!(u64, "64", atomic::AtomicU64, "let a = AtomicCell::new(7u64);");
+        impl_arithmetic!(i64, "64", atomic::AtomicI64, "let a = AtomicCell::new(7i64);");
+        impl_arithmetic!(u128, "let a = AtomicCell::new(7u128);");
+        impl_arithmetic!(i128, "let a = AtomicCell::new(7i128);");
+    } else {
+        impl_arithmetic!(u8, "let a = AtomicCell::new(7u8);");
+        impl_arithmetic!(i8, "let a = AtomicCell::new(7i8);");
+        impl_arithmetic!(u16, "let a = AtomicCell::new(7u16);");
+        impl_arithmetic!(i16, "let a = AtomicCell::new(7i16);");
+        impl_arithmetic!(u32, "let a = AtomicCell::new(7u32);");
+        impl_arithmetic!(i32, "let a = AtomicCell::new(7i32);");
+        impl_arithmetic!(u64, "let a = AtomicCell::new(7u64);");
+        impl_arithmetic!(i64, "let a = AtomicCell::new(7i64);");
+        impl_arithmetic!(u128, "let a = AtomicCell::new(7u128);");
+        impl_arithmetic!(i128, "let a = AtomicCell::new(7i128);");
+    }
+}
+
+impl_arithmetic!(
+    usize,
+    atomic::AtomicUsize,
+    "let a = AtomicCell::new(7usize);"
+);
+impl_arithmetic!(
+    isize,
+    atomic::AtomicIsize,
+    "let a = AtomicCell::new(7isize);"
+);
+
+impl AtomicCell<bool> {
+    /// Applies logical "and" to the current value and returns the previous value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(true);
+    ///
+    /// assert_eq!(a.fetch_and(true), true);
+    /// assert_eq!(a.load(), true);
+    ///
+    /// assert_eq!(a.fetch_and(false), true);
+    /// assert_eq!(a.load(), false);
+    /// ```
+    #[inline]
+    pub fn fetch_and(&self, val: bool) -> bool {
+        let a = unsafe { &*(self.value.get() as *const AtomicBool) };
+        a.fetch_and(val, Ordering::AcqRel)
+    }
+
+    /// Applies logical "or" to the current value and returns the previous value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(false);
+    ///
+    /// assert_eq!(a.fetch_or(false), false);
+    /// assert_eq!(a.load(), false);
+    ///
+    /// assert_eq!(a.fetch_or(true), false);
+    /// assert_eq!(a.load(), true);
+    /// ```
+    #[inline]
+    pub fn fetch_or(&self, val: bool) -> bool {
+        let a = unsafe { &*(self.value.get() as *const AtomicBool) };
+        a.fetch_or(val, Ordering::AcqRel)
+    }
+
+    /// Applies logical "xor" to the current value and returns the previous value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::atomic::AtomicCell;
+    ///
+    /// let a = AtomicCell::new(true);
+    ///
+    /// assert_eq!(a.fetch_xor(false), true);
+    /// assert_eq!(a.load(), true);
+    ///
+    /// assert_eq!(a.fetch_xor(true), true);
+    /// assert_eq!(a.load(), false);
+    /// ```
+    #[inline]
+    pub fn fetch_xor(&self, val: bool) -> bool {
+        let a = unsafe { &*(self.value.get() as *const AtomicBool) };
+        a.fetch_xor(val, Ordering::AcqRel)
+    }
+}
+
+impl<T: Default> Default for AtomicCell<T> {
+    fn default() -> AtomicCell<T> {
+        AtomicCell::new(T::default())
+    }
+}
+
+impl<T: Copy + fmt::Debug> fmt::Debug for AtomicCell<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("AtomicCell")
+            .field("value", &self.load())
+            .finish()
+    }
+}
+
+/// Returns `true` if values of type `A` can be transmuted into values of type `B`.
+fn can_transmute<A, B>() -> bool {
+    // Sizes must be equal, but alignment of `A` must be greater or equal than that of `B`.
+    mem::size_of::<A>() == mem::size_of::<B>() && mem::align_of::<A>() >= mem::align_of::<B>()
+}
+
+/// Returns a reference to the global lock associated with the `AtomicCell` at address `addr`.
+///
+/// This function is used to protect atomic data which doesn't fit into any of the primitive atomic
+/// types in `std::sync::atomic`. Operations on such atomics must therefore use a global lock.
+///
+/// However, there is not only one global lock but an array of many locks, and one of them is
+/// picked based on the given address. Having many locks reduces contention and improves
+/// scalability.
+#[inline]
+#[must_use]
+fn lock(addr: usize) -> &'static SeqLock {
+    // The number of locks is a prime number because we want to make sure `addr % LEN` gets
+    // dispersed across all locks.
+    //
+    // Note that addresses are always aligned to some power of 2, depending on type `T` in
+    // `AtomicCell<T>`. If `LEN` was an even number, then `addr % LEN` would be an even number,
+    // too, which means only half of the locks would get utilized!
+    //
+    // It is also possible for addresses to accidentally get aligned to a number that is not a
+    // power of 2. Consider this example:
+    //
+    // ```
+    // #[repr(C)]
+    // struct Foo {
+    //     a: AtomicCell<u8>,
+    //     b: u8,
+    //     c: u8,
+    // }
+    // ```
+    //
+    // Now, if we have a slice of type `&[Foo]`, it is possible that field `a` in all items gets
+    // stored at addresses that are multiples of 3. It'd be too bad if `LEN` was divisible by 3.
+    // In order to protect from such cases, we simply choose a large prime number for `LEN`.
+    const LEN: usize = 97;
+
+    const L: SeqLock = SeqLock::INIT;
+
+    static LOCKS: [SeqLock; LEN] = [
+        L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
+        L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
+        L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L, L,
+        L, L, L, L, L, L, L,
+    ];
+
+    // If the modulus is a constant number, the compiler will use crazy math to transform this into
+    // a sequence of cheap arithmetic operations rather than using the slow modulo instruction.
+    &LOCKS[addr % LEN]
+}
+
+/// An atomic `()`.
+///
+/// All operations are noops.
+struct AtomicUnit;
+
+impl AtomicUnit {
+    #[inline]
+    fn load(&self, _order: Ordering) {}
+
+    #[inline]
+    fn store(&self, _val: (), _order: Ordering) {}
+
+    #[inline]
+    fn swap(&self, _val: (), _order: Ordering) {}
+
+    #[inline]
+    fn compare_exchange_weak(
+        &self,
+        _current: (),
+        _new: (),
+        _success: Ordering,
+        _failure: Ordering,
+    ) -> Result<(), ()> {
+        Ok(())
+    }
+}
+
+macro_rules! atomic {
+    // If values of type `$t` can be transmuted into values of the primitive atomic type `$atomic`,
+    // declares variable `$a` of type `$atomic` and executes `$atomic_op`, breaking out of the loop.
+    (@check, $t:ty, $atomic:ty, $a:ident, $atomic_op:expr) => {
+        if can_transmute::<$t, $atomic>() {
+            let $a: &$atomic;
+            break $atomic_op;
+        }
+    };
+
+    // If values of type `$t` can be transmuted into values of a primitive atomic type, declares
+    // variable `$a` of that type and executes `$atomic_op`. Otherwise, just executes
+    // `$fallback_op`.
+    ($t:ty, $a:ident, $atomic_op:expr, $fallback_op:expr) => {
+        loop {
+            atomic!(@check, $t, AtomicUnit, $a, $atomic_op);
+            atomic!(@check, $t, atomic::AtomicUsize, $a, $atomic_op);
+
+            #[cfg(feature = "nightly")]
+            {
+                #[cfg(target_has_atomic = "8")]
+                atomic!(@check, $t, atomic::AtomicU8, $a, $atomic_op);
+                #[cfg(target_has_atomic = "16")]
+                atomic!(@check, $t, atomic::AtomicU16, $a, $atomic_op);
+                #[cfg(target_has_atomic = "32")]
+                atomic!(@check, $t, atomic::AtomicU32, $a, $atomic_op);
+                #[cfg(target_has_atomic = "64")]
+                atomic!(@check, $t, atomic::AtomicU64, $a, $atomic_op);
+            }
+
+            break $fallback_op;
+        }
+    };
+}
+
+/// Returns `true` if operations on `AtomicCell<T>` are lock-free.
+fn atomic_is_lock_free<T>() -> bool {
+    atomic! { T, _a, true, false }
+}
+
+/// Atomically reads data from `src`.
+///
+/// This operation uses the `Acquire` ordering. If possible, an atomic instructions is used, and a
+/// global lock otherwise.
+unsafe fn atomic_load<T>(src: *mut T) -> T
+where
+    T: Copy,
+{
+    atomic! {
+        T, a,
+        {
+            a = &*(src as *const _ as *const _);
+            mem::transmute_copy(&a.load(Ordering::Acquire))
+        },
+        {
+            let lock = lock(src as usize);
+
+            // Try doing an optimistic read first.
+            if let Some(stamp) = lock.optimistic_read() {
+                // We need a volatile read here because other threads might concurrently modify the
+                // value. In theory, data races are *always* UB, even if we use volatile reads and
+                // discard the data when a data race is detected. The proper solution would be to
+                // do atomic reads and atomic writes, but we can't atomically read and write all
+                // kinds of data since `AtomicU8` is not available on stable Rust yet.
+                let val = ptr::read_volatile(src);
+
+                if lock.validate_read(stamp) {
+                    return val;
+                }
+            }
+
+            // Grab a regular write lock so that writers don't starve this load.
+            let guard = lock.write();
+            let val = ptr::read(src);
+            // The value hasn't been changed. Drop the guard without incrementing the stamp.
+            guard.abort();
+            val
+        }
+    }
+}
+
+/// Atomically writes `val` to `dst`.
+///
+/// This operation uses the `Release` ordering. If possible, an atomic instructions is used, and a
+/// global lock otherwise.
+unsafe fn atomic_store<T>(dst: *mut T, val: T) {
+    atomic! {
+        T, a,
+        {
+            a = &*(dst as *const _ as *const _);
+            a.store(mem::transmute_copy(&val), Ordering::Release);
+            mem::forget(val);
+        },
+        {
+            let _guard = lock(dst as usize).write();
+            ptr::write(dst, val);
+        }
+    }
+}
+
+/// Atomically swaps data at `dst` with `val`.
+///
+/// This operation uses the `AcqRel` ordering. If possible, an atomic instructions is used, and a
+/// global lock otherwise.
+unsafe fn atomic_swap<T>(dst: *mut T, val: T) -> T {
+    atomic! {
+        T, a,
+        {
+            a = &*(dst as *const _ as *const _);
+            let res = mem::transmute_copy(&a.swap(mem::transmute_copy(&val), Ordering::AcqRel));
+            mem::forget(val);
+            res
+        },
+        {
+            let _guard = lock(dst as usize).write();
+            ptr::replace(dst, val)
+        }
+    }
+}
+
+/// Atomically compares data at `dst` to `current` and, if equal byte-for-byte, exchanges data at
+/// `dst` with `new`.
+///
+/// Returns the old value on success, or the current value at `dst` on failure.
+///
+/// This operation uses the `AcqRel` ordering. If possible, an atomic instructions is used, and a
+/// global lock otherwise.
+unsafe fn atomic_compare_exchange_weak<T>(dst: *mut T, mut current: T, new: T) -> Result<T, T>
+where
+    T: Copy + Eq,
+{
+    atomic! {
+        T, a,
+        {
+            a = &*(dst as *const _ as *const _);
+            let mut current_raw = mem::transmute_copy(&current);
+            let new_raw = mem::transmute_copy(&new);
+
+            loop {
+                match a.compare_exchange_weak(
+                    current_raw,
+                    new_raw,
+                    Ordering::AcqRel,
+                    Ordering::Acquire,
+                ) {
+                    Ok(_) => break Ok(current),
+                    Err(previous_raw) => {
+                        let previous = mem::transmute_copy(&previous_raw);
+
+                        if !T::eq(&previous, &current) {
+                            break Err(previous);
+                        }
+
+                        // The compare-exchange operation has failed and didn't store `new`. The
+                        // failure is either spurious, or `previous` was semantically equal to
+                        // `current` but not byte-equal. Let's retry with `previous` as the new
+                        // `current`.
+                        current = previous;
+                        current_raw = previous_raw;
+                    }
+                }
+            }
+        },
+        {
+            let guard = lock(dst as usize).write();
+
+            if T::eq(&*dst, &current) {
+                Ok(ptr::replace(dst, new))
+            } else {
+                let val = ptr::read(dst);
+                // The value hasn't been changed. Drop the guard without incrementing the stamp.
+                guard.abort();
+                Err(val)
+            }
+        }
+    }
+}
diff --git a/vendor/crossbeam-utils/src/atomic/consume.rs b/vendor/crossbeam-utils/src/atomic/consume.rs
new file mode 100644
index 0000000000..9be5464fb3
--- /dev/null
+++ b/vendor/crossbeam-utils/src/atomic/consume.rs
@@ -0,0 +1,82 @@
+#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
+use core::sync::atomic::compiler_fence;
+use core::sync::atomic::Ordering;
+
+/// Trait which allows reading from primitive atomic types with "consume" ordering.
+pub trait AtomicConsume {
+    /// Type returned by `load_consume`.
+    type Val;
+
+    /// Loads a value from the atomic using a "consume" memory ordering.
+    ///
+    /// This is similar to the "acquire" ordering, except that an ordering is
+    /// only guaranteed with operations that "depend on" the result of the load.
+    /// However consume loads are usually much faster than acquire loads on
+    /// architectures with a weak memory model since they don't require memory
+    /// fence instructions.
+    ///
+    /// The exact definition of "depend on" is a bit vague, but it works as you
+    /// would expect in practice since a lot of software, especially the Linux
+    /// kernel, rely on this behavior.
+    ///
+    /// This is currently only implemented on ARM and AArch64, where a fence
+    /// can be avoided. On other architectures this will fall back to a simple
+    /// `load(Ordering::Acquire)`.
+    fn load_consume(&self) -> Self::Val;
+}
+
+#[cfg(any(target_arch = "arm", target_arch = "aarch64"))]
+macro_rules! impl_consume {
+    () => {
+        #[inline]
+        fn load_consume(&self) -> Self::Val {
+            let result = self.load(Ordering::Relaxed);
+            compiler_fence(Ordering::Acquire);
+            result
+        }
+    };
+}
+
+#[cfg(not(any(target_arch = "arm", target_arch = "aarch64")))]
+macro_rules! impl_consume {
+    () => {
+        #[inline]
+        fn load_consume(&self) -> Self::Val {
+            self.load(Ordering::Acquire)
+        }
+    };
+}
+
+macro_rules! impl_atomic {
+    ($atomic:ident, $val:ty) => {
+        impl AtomicConsume for ::core::sync::atomic::$atomic {
+            type Val = $val;
+            impl_consume!();
+        }
+    };
+}
+
+impl_atomic!(AtomicBool, bool);
+impl_atomic!(AtomicUsize, usize);
+impl_atomic!(AtomicIsize, isize);
+#[cfg(all(feature = "nightly", target_has_atomic = "8"))]
+impl_atomic!(AtomicU8, u8);
+#[cfg(all(feature = "nightly", target_has_atomic = "8"))]
+impl_atomic!(AtomicI8, i8);
+#[cfg(all(feature = "nightly", target_has_atomic = "16"))]
+impl_atomic!(AtomicU16, u16);
+#[cfg(all(feature = "nightly", target_has_atomic = "16"))]
+impl_atomic!(AtomicI16, i16);
+#[cfg(all(feature = "nightly", target_has_atomic = "32"))]
+impl_atomic!(AtomicU32, u32);
+#[cfg(all(feature = "nightly", target_has_atomic = "32"))]
+impl_atomic!(AtomicI32, i32);
+#[cfg(all(feature = "nightly", target_has_atomic = "64"))]
+impl_atomic!(AtomicU64, u64);
+#[cfg(all(feature = "nightly", target_has_atomic = "64"))]
+impl_atomic!(AtomicI64, i64);
+
+impl<T> AtomicConsume for ::core::sync::atomic::AtomicPtr<T> {
+    type Val = *mut T;
+    impl_consume!();
+}
diff --git a/vendor/crossbeam-utils/src/atomic/mod.rs b/vendor/crossbeam-utils/src/atomic/mod.rs
new file mode 100644
index 0000000000..074b0ca53f
--- /dev/null
+++ b/vendor/crossbeam-utils/src/atomic/mod.rs
@@ -0,0 +1,25 @@
+//! Atomic types.
+
+cfg_if! {
+    // Use "wide" sequence lock if the pointer width <= 32 for preventing its counter against wrap
+    // around.
+    //
+    // We are ignoring too wide architectures (pointer width >= 256), since such a system will not
+    // appear in a conceivable future.
+    //
+    // In narrow architectures (pointer width <= 16), the counter is still <= 32-bit and may be
+    // vulnerable to wrap around. But it's mostly okay, since in such a primitive hardware, the
+    // counter will not be increased that fast.
+    if #[cfg(any(target_pointer_width = "64", target_pointer_width = "128"))] {
+        mod seq_lock;
+    } else {
+        #[path = "seq_lock_wide.rs"]
+        mod seq_lock;
+    }
+}
+
+mod atomic_cell;
+mod consume;
+
+pub use self::atomic_cell::AtomicCell;
+pub use self::consume::AtomicConsume;
diff --git a/vendor/crossbeam-utils/src/atomic/seq_lock.rs b/vendor/crossbeam-utils/src/atomic/seq_lock.rs
new file mode 100644
index 0000000000..533a036b5d
--- /dev/null
+++ b/vendor/crossbeam-utils/src/atomic/seq_lock.rs
@@ -0,0 +1,88 @@
+use core::sync::atomic::{self, AtomicUsize, Ordering};
+
+use Backoff;
+
+/// A simple stamped lock.
+pub struct SeqLock {
+    /// The current state of the lock.
+    ///
+    /// All bits except the least significant one hold the current stamp. When locked, the state
+    /// equals 1 and doesn't contain a valid stamp.
+    state: AtomicUsize,
+}
+
+impl SeqLock {
+    pub const INIT: Self = Self {
+        state: AtomicUsize::new(0),
+    };
+
+    /// If not locked, returns the current stamp.
+    ///
+    /// This method should be called before optimistic reads.
+    #[inline]
+    pub fn optimistic_read(&self) -> Option<usize> {
+        let state = self.state.load(Ordering::Acquire);
+        if state == 1 {
+            None
+        } else {
+            Some(state)
+        }
+    }
+
+    /// Returns `true` if the current stamp is equal to `stamp`.
+    ///
+    /// This method should be called after optimistic reads to check whether they are valid. The
+    /// argument `stamp` should correspond to the one returned by method `optimistic_read`.
+    #[inline]
+    pub fn validate_read(&self, stamp: usize) -> bool {
+        atomic::fence(Ordering::Acquire);
+        self.state.load(Ordering::Relaxed) == stamp
+    }
+
+    /// Grabs the lock for writing.
+    #[inline]
+    pub fn write(&'static self) -> SeqLockWriteGuard {
+        let backoff = Backoff::new();
+        loop {
+            let previous = self.state.swap(1, Ordering::Acquire);
+
+            if previous != 1 {
+                atomic::fence(Ordering::Release);
+
+                return SeqLockWriteGuard {
+                    lock: self,
+                    state: previous,
+                };
+            }
+
+            backoff.snooze();
+        }
+    }
+}
+
+/// An RAII guard that releases the lock and increments the stamp when dropped.
+pub struct SeqLockWriteGuard {
+    /// The parent lock.
+    lock: &'static SeqLock,
+
+    /// The stamp before locking.
+    state: usize,
+}
+
+impl SeqLockWriteGuard {
+    /// Releases the lock without incrementing the stamp.
+    #[inline]
+    pub fn abort(self) {
+        self.lock.state.store(self.state, Ordering::Release);
+    }
+}
+
+impl Drop for SeqLockWriteGuard {
+    #[inline]
+    fn drop(&mut self) {
+        // Release the lock and increment the stamp.
+        self.lock
+            .state
+            .store(self.state.wrapping_add(2), Ordering::Release);
+    }
+}
diff --git a/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs b/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs
new file mode 100644
index 0000000000..090a849bd8
--- /dev/null
+++ b/vendor/crossbeam-utils/src/atomic/seq_lock_wide.rs
@@ -0,0 +1,132 @@
+use core::sync::atomic::{self, AtomicUsize, Ordering};
+
+use Backoff;
+
+/// A simple stamped lock.
+///
+/// The state is represented as two `AtomicUsize`: `state_hi` for high bits and `state_lo` for low
+/// bits.
+pub struct SeqLock {
+    /// The high bits of the current state of the lock.
+    state_hi: AtomicUsize,
+
+    /// The low bits of the current state of the lock.
+    ///
+    /// All bits except the least significant one hold the current stamp. When locked, the state_lo
+    /// equals 1 and doesn't contain a valid stamp.
+    state_lo: AtomicUsize,
+}
+
+impl SeqLock {
+    pub const INIT: Self = Self {
+        state_hi: AtomicUsize::new(0),
+        state_lo: AtomicUsize::new(0),
+    };
+
+    /// If not locked, returns the current stamp.
+    ///
+    /// This method should be called before optimistic reads.
+    #[inline]
+    pub fn optimistic_read(&self) -> Option<(usize, usize)> {
+        // The acquire loads from `state_hi` and `state_lo` synchronize with the release stores in
+        // `SeqLockWriteGuard::drop`.
+        //
+        // As a consequence, we can make sure that (1) all writes within the era of `state_hi - 1`
+        // happens before now; and therefore, (2) if `state_lo` is even, all writes within the
+        // critical section of (`state_hi`, `state_lo`) happens before now.
+        let state_hi = self.state_hi.load(Ordering::Acquire);
+        let state_lo = self.state_lo.load(Ordering::Acquire);
+        if state_lo == 1 {
+            None
+        } else {
+            Some((state_hi, state_lo))
+        }
+    }
+
+    /// Returns `true` if the current stamp is equal to `stamp`.
+    ///
+    /// This method should be called after optimistic reads to check whether they are valid. The
+    /// argument `stamp` should correspond to the one returned by method `optimistic_read`.
+    #[inline]
+    pub fn validate_read(&self, stamp: (usize, usize)) -> bool {
+        // Thanks to the fence, if we're noticing any modification to the data at the critical
+        // section of `(a, b)`, then the critical section's write of 1 to state_lo should be
+        // visible.
+        atomic::fence(Ordering::Acquire);
+
+        // So if `state_lo` coincides with `stamp.1`, then either (1) we're noticing no modification
+        // to the data after the critical section of `(stamp.0, stamp.1)`, or (2) `state_lo` wrapped
+        // around.
+        //
+        // If (2) is the case, the acquire ordering ensures we see the new value of `state_hi`.
+        let state_lo = self.state_lo.load(Ordering::Acquire);
+
+        // If (2) is the case and `state_hi` coincides with `stamp.0`, then `state_hi` also wrapped
+        // around, which we give up to correctly validate the read.
+        let state_hi = self.state_hi.load(Ordering::Relaxed);
+
+        // Except for the case that both `state_hi` and `state_lo` wrapped around, the following
+        // condition implies that we're noticing no modification to the data after the critical
+        // section of `(stamp.0, stamp.1)`.
+        (state_hi, state_lo) == stamp
+    }
+
+    /// Grabs the lock for writing.
+    #[inline]
+    pub fn write(&'static self) -> SeqLockWriteGuard {
+        let backoff = Backoff::new();
+        loop {
+            let previous = self.state_lo.swap(1, Ordering::Acquire);
+
+            if previous != 1 {
+                // To synchronize with the acquire fence in `validate_read` via any modification to
+                // the data at the critical section of `(state_hi, previous)`.
+                atomic::fence(Ordering::Release);
+
+                return SeqLockWriteGuard {
+                    lock: self,
+                    state_lo: previous,
+                };
+            }
+
+            backoff.snooze();
+        }
+    }
+}
+
+/// An RAII guard that releases the lock and increments the stamp when dropped.
+pub struct SeqLockWriteGuard {
+    /// The parent lock.
+    lock: &'static SeqLock,
+
+    /// The stamp before locking.
+    state_lo: usize,
+}
+
+impl SeqLockWriteGuard {
+    /// Releases the lock without incrementing the stamp.
+    #[inline]
+    pub fn abort(self) {
+        self.lock.state_lo.store(self.state_lo, Ordering::Release);
+    }
+}
+
+impl Drop for SeqLockWriteGuard {
+    #[inline]
+    fn drop(&mut self) {
+        let state_lo = self.state_lo.wrapping_add(2);
+
+        // Increase the high bits if the low bits wrap around.
+        //
+        // Release ordering for synchronizing with `optimistic_read`.
+        if state_lo == 0 {
+            let state_hi = self.lock.state_hi.load(Ordering::Relaxed);
+            self.lock.state_hi.store(state_hi.wrapping_add(1), Ordering::Release);
+        }
+
+        // Release the lock and increment the stamp.
+        //
+        // Release ordering for synchronizing with `optimistic_read`.
+        self.lock.state_lo.store(state_lo, Ordering::Release);
+    }
+}
diff --git a/vendor/crossbeam-utils/src/backoff.rs b/vendor/crossbeam-utils/src/backoff.rs
new file mode 100644
index 0000000000..446755bbc7
--- /dev/null
+++ b/vendor/crossbeam-utils/src/backoff.rs
@@ -0,0 +1,292 @@
+use core::cell::Cell;
+use core::fmt;
+use core::sync::atomic;
+
+const SPIN_LIMIT: u32 = 6;
+const YIELD_LIMIT: u32 = 10;
+
+/// Performs exponential backoff in spin loops.
+///
+/// Backing off in spin loops reduces contention and improves overall performance.
+///
+/// This primitive can execute *YIELD* and *PAUSE* instructions, yield the current thread to the OS
+/// scheduler, and tell when is a good time to block the thread using a different synchronization
+/// mechanism. Each step of the back off procedure takes roughly twice as long as the previous
+/// step.
+///
+/// # Examples
+///
+/// Backing off in a lock-free loop:
+///
+/// ```
+/// use crossbeam_utils::Backoff;
+/// use std::sync::atomic::AtomicUsize;
+/// use std::sync::atomic::Ordering::SeqCst;
+///
+/// fn fetch_mul(a: &AtomicUsize, b: usize) -> usize {
+///     let backoff = Backoff::new();
+///     loop {
+///         let val = a.load(SeqCst);
+///         if a.compare_and_swap(val, val.wrapping_mul(b), SeqCst) == val {
+///             return val;
+///         }
+///         backoff.spin();
+///     }
+/// }
+/// ```
+///
+/// Waiting for an [`AtomicBool`] to become `true`:
+///
+/// ```
+/// use crossbeam_utils::Backoff;
+/// use std::sync::atomic::AtomicBool;
+/// use std::sync::atomic::Ordering::SeqCst;
+///
+/// fn spin_wait(ready: &AtomicBool) {
+///     let backoff = Backoff::new();
+///     while !ready.load(SeqCst) {
+///         backoff.snooze();
+///     }
+/// }
+/// ```
+///
+/// Waiting for an [`AtomicBool`] to become `true` and parking the thread after a long wait.
+/// Note that whoever sets the atomic variable to `true` must notify the parked thread by calling
+/// [`unpark()`]:
+///
+/// ```
+/// use crossbeam_utils::Backoff;
+/// use std::sync::atomic::AtomicBool;
+/// use std::sync::atomic::Ordering::SeqCst;
+/// use std::thread;
+///
+/// fn blocking_wait(ready: &AtomicBool) {
+///     let backoff = Backoff::new();
+///     while !ready.load(SeqCst) {
+///         if backoff.is_completed() {
+///             thread::park();
+///         } else {
+///             backoff.snooze();
+///         }
+///     }
+/// }
+/// ```
+///
+/// [`is_completed`]: struct.Backoff.html#method.is_completed
+/// [`std::thread::park()`]: https://doc.rust-lang.org/std/thread/fn.park.html
+/// [`Condvar`]: https://doc.rust-lang.org/std/sync/struct.Condvar.html
+/// [`AtomicBool`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicBool.html
+/// [`unpark()`]: https://doc.rust-lang.org/std/thread/struct.Thread.html#method.unpark
+pub struct Backoff {
+    step: Cell<u32>,
+}
+
+impl Backoff {
+    /// Creates a new `Backoff`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    ///
+    /// let backoff = Backoff::new();
+    /// ```
+    #[inline]
+    pub fn new() -> Self {
+        Backoff { step: Cell::new(0) }
+    }
+
+    /// Resets the `Backoff`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    ///
+    /// let backoff = Backoff::new();
+    /// backoff.reset();
+    /// ```
+    #[inline]
+    pub fn reset(&self) {
+        self.step.set(0);
+    }
+
+    /// Backs off in a lock-free loop.
+    ///
+    /// This method should be used when we need to retry an operation because another thread made
+    /// progress.
+    ///
+    /// The processor may yield using the *YIELD* or *PAUSE* instruction.
+    ///
+    /// # Examples
+    ///
+    /// Backing off in a lock-free loop:
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    /// use std::sync::atomic::AtomicUsize;
+    /// use std::sync::atomic::Ordering::SeqCst;
+    ///
+    /// fn fetch_mul(a: &AtomicUsize, b: usize) -> usize {
+    ///     let backoff = Backoff::new();
+    ///     loop {
+    ///         let val = a.load(SeqCst);
+    ///         if a.compare_and_swap(val, val.wrapping_mul(b), SeqCst) == val {
+    ///             return val;
+    ///         }
+    ///         backoff.spin();
+    ///     }
+    /// }
+    ///
+    /// let a = AtomicUsize::new(7);
+    /// assert_eq!(fetch_mul(&a, 8), 7);
+    /// assert_eq!(a.load(SeqCst), 56);
+    /// ```
+    #[inline]
+    pub fn spin(&self) {
+        for _ in 0..1 << self.step.get().min(SPIN_LIMIT) {
+            atomic::spin_loop_hint();
+        }
+
+        if self.step.get() <= SPIN_LIMIT {
+            self.step.set(self.step.get() + 1);
+        }
+    }
+
+    /// Backs off in a blocking loop.
+    ///
+    /// This method should be used when we need to wait for another thread to make progress.
+    ///
+    /// The processor may yield using the *YIELD* or *PAUSE* instruction and the current thread
+    /// may yield by giving up a timeslice to the OS scheduler.
+    ///
+    /// In `#[no_std]` environments, this method is equivalent to [`spin`].
+    ///
+    /// If possible, use [`is_completed`] to check when it is advised to stop using backoff and
+    /// block the current thread using a different synchronization mechanism instead.
+    ///
+    /// [`spin`]: struct.Backoff.html#method.spin
+    /// [`is_completed`]: struct.Backoff.html#method.is_completed
+    ///
+    /// # Examples
+    ///
+    /// Waiting for an [`AtomicBool`] to become `true`:
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    /// use std::sync::Arc;
+    /// use std::sync::atomic::AtomicBool;
+    /// use std::sync::atomic::Ordering::SeqCst;
+    /// use std::thread;
+    /// use std::time::Duration;
+    ///
+    /// fn spin_wait(ready: &AtomicBool) {
+    ///     let backoff = Backoff::new();
+    ///     while !ready.load(SeqCst) {
+    ///         backoff.snooze();
+    ///     }
+    /// }
+    ///
+    /// let ready = Arc::new(AtomicBool::new(false));
+    /// let ready2 = ready.clone();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_millis(100));
+    ///     ready2.store(true, SeqCst);
+    /// });
+    ///
+    /// assert_eq!(ready.load(SeqCst), false);
+    /// spin_wait(&ready);
+    /// assert_eq!(ready.load(SeqCst), true);
+    /// ```
+    ///
+    /// [`AtomicBool`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicBool.html
+    #[inline]
+    pub fn snooze(&self) {
+        if self.step.get() <= SPIN_LIMIT {
+            for _ in 0..1 << self.step.get() {
+                atomic::spin_loop_hint();
+            }
+        } else {
+            #[cfg(not(feature = "std"))]
+            for _ in 0..1 << self.step.get() {
+                atomic::spin_loop_hint();
+            }
+
+            #[cfg(feature = "std")]
+            ::std::thread::yield_now();
+        }
+
+        if self.step.get() <= YIELD_LIMIT {
+            self.step.set(self.step.get() + 1);
+        }
+    }
+
+    /// Returns `true` if exponential backoff has completed and blocking the thread is advised.
+    ///
+    /// # Examples
+    ///
+    /// Waiting for an [`AtomicBool`] to become `true` and parking the thread after a long wait:
+    ///
+    /// ```
+    /// use crossbeam_utils::Backoff;
+    /// use std::sync::Arc;
+    /// use std::sync::atomic::AtomicBool;
+    /// use std::sync::atomic::Ordering::SeqCst;
+    /// use std::thread;
+    /// use std::time::Duration;
+    ///
+    /// fn blocking_wait(ready: &AtomicBool) {
+    ///     let backoff = Backoff::new();
+    ///     while !ready.load(SeqCst) {
+    ///         if backoff.is_completed() {
+    ///             thread::park();
+    ///         } else {
+    ///             backoff.snooze();
+    ///         }
+    ///     }
+    /// }
+    ///
+    /// let ready = Arc::new(AtomicBool::new(false));
+    /// let ready2 = ready.clone();
+    /// let waiter = thread::current();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_millis(100));
+    ///     ready2.store(true, SeqCst);
+    ///     waiter.unpark();
+    /// });
+    ///
+    /// assert_eq!(ready.load(SeqCst), false);
+    /// blocking_wait(&ready);
+    /// assert_eq!(ready.load(SeqCst), true);
+    /// ```
+    ///
+    /// [`AtomicBool`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicBool.html
+    #[inline]
+    pub fn is_completed(&self) -> bool {
+        self.step.get() > YIELD_LIMIT
+    }
+
+    #[inline]
+    #[doc(hidden)]
+    #[deprecated(note = "use `is_completed` instead")]
+    pub fn is_complete(&self) -> bool {
+        self.is_completed()
+    }
+}
+
+impl fmt::Debug for Backoff {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("Backoff")
+            .field("step", &self.step)
+            .field("is_completed", &self.is_completed())
+            .finish()
+    }
+}
+
+impl Default for Backoff {
+    fn default() -> Backoff {
+        Backoff::new()
+    }
+}
diff --git a/vendor/crossbeam-utils/src/cache_padded.rs b/vendor/crossbeam-utils/src/cache_padded.rs
new file mode 100644
index 0000000000..bb864a4191
--- /dev/null
+++ b/vendor/crossbeam-utils/src/cache_padded.rs
@@ -0,0 +1,131 @@
+use core::fmt;
+use core::ops::{Deref, DerefMut};
+
+/// Pads and aligns a value to the length of a cache line.
+///
+/// In concurrent programming, sometimes it is desirable to make sure commonly accessed pieces of
+/// data are not placed into the same cache line. Updating an atomic value invalides the whole
+/// cache line it belongs to, which makes the next access to the same cache line slower for other
+/// CPU cores. Use `CachePadded` to ensure updating one piece of data doesn't invalidate other
+/// cached data.
+///
+/// # Size and alignment
+///
+/// Cache lines are assumed to be N bytes long, depending on the architecture:
+///
+/// * On x86-64, N = 128.
+/// * On all others, N = 64.
+///
+/// Note that N is just a reasonable guess and is not guaranteed to match the actual cache line
+/// length of the machine the program is running on. On modern Intel architectures, spatial
+/// prefetcher is pulling pairs of 64-byte cache lines at a time, so we pessimistically assume that
+/// cache lines are 128 bytes long.
+///
+/// The size of `CachePadded<T>` is the smallest multiple of N bytes large enough to accommodate
+/// a value of type `T`.
+///
+/// The alignment of `CachePadded<T>` is the maximum of N bytes and the alignment of `T`.
+///
+/// # Examples
+///
+/// Alignment and padding:
+///
+/// ```
+/// use crossbeam_utils::CachePadded;
+///
+/// let array = [CachePadded::new(1i8), CachePadded::new(2i8)];
+/// let addr1 = &*array[0] as *const i8 as usize;
+/// let addr2 = &*array[1] as *const i8 as usize;
+///
+/// assert!(addr2 - addr1 >= 64);
+/// assert_eq!(addr1 % 64, 0);
+/// assert_eq!(addr2 % 64, 0);
+/// ```
+///
+/// When building a concurrent queue with a head and a tail index, it is wise to place them in
+/// different cache lines so that concurrent threads pushing and popping elements don't invalidate
+/// each other's cache lines:
+///
+/// ```
+/// use crossbeam_utils::CachePadded;
+/// use std::sync::atomic::AtomicUsize;
+///
+/// struct Queue<T> {
+///     head: CachePadded<AtomicUsize>,
+///     tail: CachePadded<AtomicUsize>,
+///     buffer: *mut T,
+/// }
+/// ```
+#[derive(Clone, Copy, Default, Hash, PartialEq, Eq)]
+// Starting from Intel's Sandy Bridge, spatial prefetcher is now pulling pairs of 64-byte cache
+// lines at a time, so we have to align to 128 bytes rather than 64.
+//
+// Sources:
+// - https://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
+// - https://github.com/facebook/folly/blob/1b5288e6eea6df074758f877c849b6e73bbb9fbb/folly/lang/Align.h#L107
+#[cfg_attr(target_arch = "x86_64", repr(align(128)))]
+#[cfg_attr(not(target_arch = "x86_64"), repr(align(64)))]
+pub struct CachePadded<T> {
+    value: T,
+}
+
+unsafe impl<T: Send> Send for CachePadded<T> {}
+unsafe impl<T: Sync> Sync for CachePadded<T> {}
+
+impl<T> CachePadded<T> {
+    /// Pads and aligns a value to the length of a cache line.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::CachePadded;
+    ///
+    /// let padded_value = CachePadded::new(1);
+    /// ```
+    pub fn new(t: T) -> CachePadded<T> {
+        CachePadded::<T> { value: t }
+    }
+
+    /// Returns the inner value.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::CachePadded;
+    ///
+    /// let padded_value = CachePadded::new(7);
+    /// let value = padded_value.into_inner();
+    /// assert_eq!(value, 7);
+    /// ```
+    pub fn into_inner(self) -> T {
+        self.value
+    }
+}
+
+impl<T> Deref for CachePadded<T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        &self.value
+    }
+}
+
+impl<T> DerefMut for CachePadded<T> {
+    fn deref_mut(&mut self) -> &mut T {
+        &mut self.value
+    }
+}
+
+impl<T: fmt::Debug> fmt::Debug for CachePadded<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("CachePadded")
+            .field("value", &self.value)
+            .finish()
+    }
+}
+
+impl<T> From<T> for CachePadded<T> {
+    fn from(t: T) -> Self {
+        CachePadded::new(t)
+    }
+}
diff --git a/vendor/crossbeam-utils/src/lib.rs b/vendor/crossbeam-utils/src/lib.rs
new file mode 100644
index 0000000000..06f23beb47
--- /dev/null
+++ b/vendor/crossbeam-utils/src/lib.rs
@@ -0,0 +1,64 @@
+//! Miscellaneous tools for concurrent programming.
+//!
+//! ## Atomics
+//!
+//! * [`AtomicCell`], a thread-safe mutable memory location.
+//! * [`AtomicConsume`], for reading from primitive atomic types with "consume" ordering.
+//!
+//! ## Thread synchronization
+//!
+//! * [`Parker`], a thread parking primitive.
+//! * [`ShardedLock`], a sharded reader-writer lock with fast concurrent reads.
+//! * [`WaitGroup`], for synchronizing the beginning or end of some computation.
+//!
+//! ## Utilities
+//!
+//! * [`Backoff`], for exponential backoff in spin loops.
+//! * [`CachePadded`], for padding and aligning a value to the length of a cache line.
+//! * [`scope`], for spawning threads that borrow local variables from the stack.
+//!
+//! [`AtomicCell`]: atomic/struct.AtomicCell.html
+//! [`AtomicConsume`]: atomic/trait.AtomicConsume.html
+//! [`Parker`]: sync/struct.Parker.html
+//! [`ShardedLock`]: sync/struct.ShardedLock.html
+//! [`WaitGroup`]: sync/struct.WaitGroup.html
+//! [`Backoff`]: struct.Backoff.html
+//! [`CachePadded`]: struct.CachePadded.html
+//! [`scope`]: thread/fn.scope.html
+
+#![warn(missing_docs)]
+#![warn(missing_debug_implementations)]
+#![cfg_attr(not(feature = "std"), no_std)]
+#![cfg_attr(feature = "nightly", feature(cfg_target_has_atomic))]
+
+#[macro_use]
+extern crate cfg_if;
+#[cfg(feature = "std")]
+extern crate core;
+
+cfg_if! {
+    if #[cfg(feature = "alloc")] {
+        extern crate alloc;
+    } else if #[cfg(feature = "std")] {
+        extern crate std as alloc;
+    }
+}
+
+#[cfg_attr(feature = "nightly", cfg(target_has_atomic = "ptr"))]
+pub mod atomic;
+
+mod cache_padded;
+pub use cache_padded::CachePadded;
+
+mod backoff;
+pub use backoff::Backoff;
+
+cfg_if! {
+    if #[cfg(feature = "std")] {
+        #[macro_use]
+        extern crate lazy_static;
+
+        pub mod sync;
+        pub mod thread;
+    }
+}
diff --git a/vendor/crossbeam-utils/src/sync/mod.rs b/vendor/crossbeam-utils/src/sync/mod.rs
new file mode 100644
index 0000000000..31c8ffec4d
--- /dev/null
+++ b/vendor/crossbeam-utils/src/sync/mod.rs
@@ -0,0 +1,17 @@
+//! Thread synchronization primitives.
+//!
+//! * [`Parker`], a thread parking primitive.
+//! * [`ShardedLock`], a sharded reader-writer lock with fast concurrent reads.
+//! * [`WaitGroup`], for synchronizing the beginning or end of some computation.
+//!
+//! [`Parker`]: struct.Parker.html
+//! [`ShardedLock`]: struct.ShardedLock.html
+//! [`WaitGroup`]: struct.WaitGroup.html
+
+mod parker;
+mod sharded_lock;
+mod wait_group;
+
+pub use self::sharded_lock::{ShardedLock, ShardedLockReadGuard, ShardedLockWriteGuard};
+pub use self::parker::{Parker, Unparker};
+pub use self::wait_group::WaitGroup;
diff --git a/vendor/crossbeam-utils/src/sync/parker.rs b/vendor/crossbeam-utils/src/sync/parker.rs
new file mode 100644
index 0000000000..506db8e393
--- /dev/null
+++ b/vendor/crossbeam-utils/src/sync/parker.rs
@@ -0,0 +1,311 @@
+use std::fmt;
+use std::marker::PhantomData;
+use std::sync::{Arc, Condvar, Mutex};
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering::SeqCst;
+use std::time::Duration;
+
+/// A thread parking primitive.
+///
+/// Conceptually, each `Parker` has an associated token which is initially not present:
+///
+/// * The [`park`] method blocks the current thread unless or until the token is available, at
+///   which point it automatically consumes the token. It may also return *spuriously*, without
+///   consuming the token.
+///
+/// * The [`park_timeout`] method works the same as [`park`], but blocks for a specified maximum
+///   time.
+///
+/// * The [`unpark`] method atomically makes the token available if it wasn't already. Because the
+///   token is initially absent, [`unpark`] followed by [`park`] will result in the second call
+///   returning immediately.
+///
+/// In other words, each `Parker` acts a bit like a spinlock that can be locked and unlocked using
+/// [`park`] and [`unpark`].
+///
+/// # Examples
+///
+/// ```
+/// use std::thread;
+/// use std::time::Duration;
+/// use crossbeam_utils::sync::Parker;
+///
+/// let mut p = Parker::new();
+/// let u = p.unparker().clone();
+///
+/// // Make the token available.
+/// u.unpark();
+/// // Wakes up immediately and consumes the token.
+/// p.park();
+///
+/// thread::spawn(move || {
+///     thread::sleep(Duration::from_millis(500));
+///     u.unpark();
+/// });
+///
+/// // Wakes up when `u.unpark()` provides the token, but may also wake up
+/// // spuriously before that without consuming the token.
+/// p.park();
+/// ```
+///
+/// [`park`]: struct.Parker.html#method.park
+/// [`park_timeout`]: struct.Parker.html#method.park_timeout
+/// [`unpark`]: struct.Unparker.html#method.unpark
+pub struct Parker {
+    unparker: Unparker,
+    _marker: PhantomData<*const ()>,
+}
+
+unsafe impl Send for Parker {}
+
+impl Parker {
+    /// Creates a new `Parker`.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::Parker;
+    ///
+    /// let p = Parker::new();
+    /// ```
+    ///
+    pub fn new() -> Parker {
+        Parker {
+            unparker: Unparker {
+                inner: Arc::new(Inner {
+                    state: AtomicUsize::new(EMPTY),
+                    lock: Mutex::new(()),
+                    cvar: Condvar::new(),
+                }),
+            },
+            _marker: PhantomData,
+        }
+    }
+
+    /// Blocks the current thread until the token is made available.
+    ///
+    /// A call to `park` may wake up spuriously without consuming the token, and callers should be
+    /// prepared for this possibility.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::Parker;
+    ///
+    /// let mut p = Parker::new();
+    /// let u = p.unparker().clone();
+    ///
+    /// // Make the token available.
+    /// u.unpark();
+    ///
+    /// // Wakes up immediately and consumes the token.
+    /// p.park();
+    /// ```
+    pub fn park(&self) {
+        self.unparker.inner.park(None);
+    }
+
+    /// Blocks the current thread until the token is made available, but only for a limited time.
+    ///
+    /// A call to `park_timeout` may wake up spuriously without consuming the token, and callers
+    /// should be prepared for this possibility.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::time::Duration;
+    /// use crossbeam_utils::sync::Parker;
+    ///
+    /// let mut p = Parker::new();
+    ///
+    /// // Waits for the token to become available, but will not wait longer than 500 ms.
+    /// p.park_timeout(Duration::from_millis(500));
+    /// ```
+    pub fn park_timeout(&self, timeout: Duration) {
+        self.unparker.inner.park(Some(timeout));
+    }
+
+    /// Returns a reference to an associated [`Unparker`].
+    ///
+    /// The returned [`Unparker`] doesn't have to be used by reference - it can also be cloned.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::Parker;
+    ///
+    /// let mut p = Parker::new();
+    /// let u = p.unparker().clone();
+    ///
+    /// // Make the token available.
+    /// u.unpark();
+    /// // Wakes up immediately and consumes the token.
+    /// p.park();
+    /// ```
+    ///
+    /// [`park`]: struct.Parker.html#method.park
+    /// [`park_timeout`]: struct.Parker.html#method.park_timeout
+    ///
+    /// [`Unparker`]: struct.Unparker.html
+    pub fn unparker(&self) -> &Unparker {
+        &self.unparker
+    }
+}
+
+impl fmt::Debug for Parker {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Parker { .. }")
+    }
+}
+
+/// Unparks a thread parked by the associated [`Parker`].
+///
+/// [`Parker`]: struct.Parker.html
+pub struct Unparker {
+    inner: Arc<Inner>,
+}
+
+unsafe impl Send for Unparker {}
+unsafe impl Sync for Unparker {}
+
+impl Unparker {
+    /// Atomically makes the token available if it is not already.
+    ///
+    /// This method will wake up the thread blocked on [`park`] or [`park_timeout`], if there is
+    /// any.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use std::thread;
+    /// use std::time::Duration;
+    /// use crossbeam_utils::sync::Parker;
+    ///
+    /// let mut p = Parker::new();
+    /// let u = p.unparker().clone();
+    ///
+    /// thread::spawn(move || {
+    ///     thread::sleep(Duration::from_millis(500));
+    ///     u.unpark();
+    /// });
+    ///
+    /// // Wakes up when `u.unpark()` provides the token, but may also wake up
+    /// // spuriously before that without consuming the token.
+    /// p.park();
+    /// ```
+    ///
+    /// [`park`]: struct.Parker.html#method.park
+    /// [`park_timeout`]: struct.Parker.html#method.park_timeout
+    pub fn unpark(&self) {
+        self.inner.unpark()
+    }
+}
+
+impl fmt::Debug for Unparker {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Unparker { .. }")
+    }
+}
+
+impl Clone for Unparker {
+    fn clone(&self) -> Unparker {
+        Unparker {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+const EMPTY: usize = 0;
+const PARKED: usize = 1;
+const NOTIFIED: usize = 2;
+
+struct Inner {
+    state: AtomicUsize,
+    lock: Mutex<()>,
+    cvar: Condvar,
+}
+
+impl Inner {
+    fn park(&self, timeout: Option<Duration>) {
+        // If we were previously notified then we consume this notification and return quickly.
+        if self.state.compare_exchange(NOTIFIED, EMPTY, SeqCst, SeqCst).is_ok() {
+            return;
+        }
+
+        // If the timeout is zero, then there is no need to actually block.
+        if let Some(ref dur) = timeout {
+            if *dur == Duration::from_millis(0) {
+                return;
+            }
+        }
+
+        // Otherwise we need to coordinate going to sleep.
+        let mut m = self.lock.lock().unwrap();
+
+        match self.state.compare_exchange(EMPTY, PARKED, SeqCst, SeqCst) {
+            Ok(_) => {}
+            // Consume this notification to avoid spurious wakeups in the next park.
+            Err(NOTIFIED) => {
+                // We must read `state` here, even though we know it will be `NOTIFIED`. This is
+                // because `unpark` may have been called again since we read `NOTIFIED` in the
+                // `compare_exchange` above. We must perform an acquire operation that synchronizes
+                // with that `unpark` to observe any writes it made before the call to `unpark`. To
+                // do that we must read from the write it made to `state`.
+                let old = self.state.swap(EMPTY, SeqCst);
+                assert_eq!(old, NOTIFIED, "park state changed unexpectedly");
+                return;
+            }
+            Err(n) => panic!("inconsistent park_timeout state: {}", n),
+        }
+
+        match timeout {
+            None => {
+                loop {
+                    // Block the current thread on the conditional variable.
+                    m = self.cvar.wait(m).unwrap();
+
+                    match self.state.compare_exchange(NOTIFIED, EMPTY, SeqCst, SeqCst) {
+                        Ok(_) => return, // got a notification
+                        Err(_) => {} // spurious wakeup, go back to sleep
+                    }
+                }
+            }
+            Some(timeout) => {
+                // Wait with a timeout, and if we spuriously wake up or otherwise wake up from a
+                // notification we just want to unconditionally set `state` back to `EMPTY`, either
+                // consuming a notification or un-flagging ourselves as parked.
+                let (_m, _result) = self.cvar.wait_timeout(m, timeout).unwrap();
+
+                match self.state.swap(EMPTY, SeqCst) {
+                    NOTIFIED => {} // got a notification
+                    PARKED => {} // no notification
+                    n => panic!("inconsistent park_timeout state: {}", n),
+                }
+            }
+        }
+    }
+
+    pub fn unpark(&self) {
+        // To ensure the unparked thread will observe any writes we made before this call, we must
+        // perform a release operation that `park` can synchronize with. To do that we must write
+        // `NOTIFIED` even if `state` is already `NOTIFIED`. That is why this must be a swap rather
+        // than a compare-and-swap that returns if it reads `NOTIFIED` on failure.
+        match self.state.swap(NOTIFIED, SeqCst) {
+            EMPTY => return, // no one was waiting
+            NOTIFIED => return, // already unparked
+            PARKED => {} // gotta go wake someone up
+            _ => panic!("inconsistent state in unpark"),
+        }
+
+        // There is a period between when the parked thread sets `state` to `PARKED` (or last
+        // checked `state` in the case of a spurious wakeup) and when it actually waits on `cvar`.
+        // If we were to notify during this period it would be ignored and then when the parked
+        // thread went to sleep it would never wake up. Fortunately, it has `lock` locked at this
+        // stage so we can acquire `lock` to wait until it is ready to receive the notification.
+        //
+        // Releasing `lock` before the call to `notify_one` means that when the parked thread wakes
+        // it doesn't get woken only to have to wait for us to release `lock`.
+        drop(self.lock.lock().unwrap());
+        self.cvar.notify_one();
+    }
+}
diff --git a/vendor/crossbeam-utils/src/sync/sharded_lock.rs b/vendor/crossbeam-utils/src/sync/sharded_lock.rs
new file mode 100644
index 0000000000..0fbb29175f
--- /dev/null
+++ b/vendor/crossbeam-utils/src/sync/sharded_lock.rs
@@ -0,0 +1,600 @@
+use std::cell::UnsafeCell;
+use std::collections::HashMap;
+use std::fmt;
+use std::marker::PhantomData;
+use std::mem;
+use std::ops::{Deref, DerefMut};
+use std::panic::{RefUnwindSafe, UnwindSafe};
+use std::sync::{Mutex, RwLock, RwLockReadGuard, RwLockWriteGuard};
+use std::sync::{LockResult, PoisonError, TryLockError, TryLockResult};
+use std::thread::{self, ThreadId};
+
+use CachePadded;
+
+/// The number of shards per sharded lock. Must be a power of two.
+const NUM_SHARDS: usize = 8;
+
+/// A shard containing a single reader-writer lock.
+struct Shard {
+    /// The inner reader-writer lock.
+    lock: RwLock<()>,
+
+    /// The write-guard keeping this shard locked.
+    ///
+    /// Write operations will lock each shard and store the guard here. These guards get dropped at
+    /// the same time the big guard is dropped.
+    write_guard: UnsafeCell<Option<RwLockWriteGuard<'static, ()>>>,
+}
+
+/// A sharded reader-writer lock.
+///
+/// This lock is equivalent to [`RwLock`], except read operations are faster and write operations
+/// are slower.
+///
+/// A `ShardedLock` is internally made of a list of *shards*, each being a [`RwLock`] occupying a
+/// single cache line. Read operations will pick one of the shards depending on the current thread
+/// and lock it. Write operations need to lock all shards in succession.
+///
+/// By splitting the lock into shards, concurrent read operations will in most cases choose
+/// different shards and thus update different cache lines, which is good for scalability. However,
+/// write operations need to do more work and are therefore slower than usual.
+///
+/// The priority policy of the lock is dependent on the underlying operating system's
+/// implementation, and this type does not guarantee that any particular policy will be used.
+///
+/// # Poisoning
+///
+/// A `ShardedLock`, like [`RwLock`], will become poisoned on a panic. Note that it may only be
+/// poisoned if a panic occurs while a write operation is in progress. If a panic occurs in any
+/// read operation, the lock will not be poisoned.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::sync::ShardedLock;
+///
+/// let lock = ShardedLock::new(5);
+///
+/// // Any number of read locks can be held at once.
+/// {
+///     let r1 = lock.read().unwrap();
+///     let r2 = lock.read().unwrap();
+///     assert_eq!(*r1, 5);
+///     assert_eq!(*r2, 5);
+/// } // Read locks are dropped at this point.
+///
+/// // However, only one write lock may be held.
+/// {
+///     let mut w = lock.write().unwrap();
+///     *w += 1;
+///     assert_eq!(*w, 6);
+/// } // Write lock is dropped here.
+/// ```
+///
+/// [`RwLock`]: https://doc.rust-lang.org/std/sync/struct.RwLock.html
+pub struct ShardedLock<T: ?Sized> {
+    /// A list of locks protecting the internal data.
+    shards: Box<[CachePadded<Shard>]>,
+
+    /// The internal data.
+    value: UnsafeCell<T>,
+}
+
+unsafe impl<T: ?Sized + Send> Send for ShardedLock<T> {}
+unsafe impl<T: ?Sized + Send + Sync> Sync for ShardedLock<T> {}
+
+impl<T: ?Sized> UnwindSafe for ShardedLock<T> {}
+impl<T: ?Sized> RefUnwindSafe for ShardedLock<T> {}
+
+impl<T> ShardedLock<T> {
+    /// Creates a new sharded reader-writer lock.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(5);
+    /// ```
+    pub fn new(value: T) -> ShardedLock<T> {
+        ShardedLock {
+            shards: (0..NUM_SHARDS)
+                .map(|_| CachePadded::new(Shard {
+                    lock: RwLock::new(()),
+                    write_guard: UnsafeCell::new(None),
+                }))
+                .collect::<Vec<_>>()
+                .into_boxed_slice(),
+            value: UnsafeCell::new(value),
+        }
+    }
+
+    /// Consumes this lock, returning the underlying data.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(String::new());
+    /// {
+    ///     let mut s = lock.write().unwrap();
+    ///     *s = "modified".to_owned();
+    /// }
+    /// assert_eq!(lock.into_inner().unwrap(), "modified");
+    /// ```
+    pub fn into_inner(self) -> LockResult<T> {
+        let is_poisoned = self.is_poisoned();
+        let inner = self.value.into_inner();
+
+        if is_poisoned {
+            Err(PoisonError::new(inner))
+        } else {
+            Ok(inner)
+        }
+    }
+}
+
+impl<T: ?Sized> ShardedLock<T> {
+    /// Returns `true` if the lock is poisoned.
+    ///
+    /// If another thread can still access the lock, it may become poisoned at any time. A `false`
+    /// result should not be trusted without additional synchronization.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    /// use std::sync::Arc;
+    /// use std::thread;
+    ///
+    /// let lock = Arc::new(ShardedLock::new(0));
+    /// let c_lock = lock.clone();
+    ///
+    /// let _ = thread::spawn(move || {
+    ///     let _lock = c_lock.write().unwrap();
+    ///     panic!(); // the lock gets poisoned
+    /// }).join();
+    /// assert_eq!(lock.is_poisoned(), true);
+    /// ```
+    pub fn is_poisoned(&self) -> bool {
+        self.shards[0].lock.is_poisoned()
+    }
+
+    /// Returns a mutable reference to the underlying data.
+    ///
+    /// Since this call borrows the lock mutably, no actual locking needs to take place.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let mut lock = ShardedLock::new(0);
+    /// *lock.get_mut().unwrap() = 10;
+    /// assert_eq!(*lock.read().unwrap(), 10);
+    /// ```
+    pub fn get_mut(&mut self) -> LockResult<&mut T> {
+        let is_poisoned = self.is_poisoned();
+        let inner = unsafe { &mut *self.value.get() };
+
+        if is_poisoned {
+            Err(PoisonError::new(inner))
+        } else {
+            Ok(inner)
+        }
+    }
+
+    /// Attempts to acquire this lock with shared read access.
+    ///
+    /// If the access could not be granted at this time, an error is returned. Otherwise, a guard
+    /// is returned which will release the shared access when it is dropped. This method does not
+    /// provide any guarantees with respect to the ordering of whether contentious readers or
+    /// writers will acquire the lock first.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(1);
+    ///
+    /// match lock.try_read() {
+    ///     Ok(n) => assert_eq!(*n, 1),
+    ///     Err(_) => unreachable!(),
+    /// };
+    /// ```
+    pub fn try_read(&self) -> TryLockResult<ShardedLockReadGuard<T>> {
+        // Take the current thread index and map it to a shard index. Thread indices will tend to
+        // distribute shards among threads equally, thus reducing contention due to read-locking.
+        let current_index = current_index().unwrap_or(0);
+        let shard_index = current_index & (self.shards.len() - 1);
+
+        match self.shards[shard_index].lock.try_read() {
+            Ok(guard) => Ok(ShardedLockReadGuard {
+                lock: self,
+                _guard: guard,
+                _marker: PhantomData,
+            }),
+            Err(TryLockError::Poisoned(err)) => {
+                let guard = ShardedLockReadGuard {
+                    lock: self,
+                    _guard: err.into_inner(),
+                    _marker: PhantomData,
+                };
+                Err(TryLockError::Poisoned(PoisonError::new(guard)))
+            },
+            Err(TryLockError::WouldBlock) => Err(TryLockError::WouldBlock),
+        }
+    }
+
+    /// Locks with shared read access, blocking the current thread until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers which hold the lock.
+    /// There may be other readers currently inside the lock when this method returns. This method
+    /// does not provide any guarantees with respect to the ordering of whether contentious readers
+    /// or writers will acquire the lock first.
+    ///
+    /// Returns a guard which will release the shared access when dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    /// use std::sync::Arc;
+    /// use std::thread;
+    ///
+    /// let lock = Arc::new(ShardedLock::new(1));
+    /// let c_lock = lock.clone();
+    ///
+    /// let n = lock.read().unwrap();
+    /// assert_eq!(*n, 1);
+    ///
+    /// thread::spawn(move || {
+    ///     let r = c_lock.read();
+    ///     assert!(r.is_ok());
+    /// }).join().unwrap();
+    /// ```
+    pub fn read(&self) -> LockResult<ShardedLockReadGuard<T>> {
+        // Take the current thread index and map it to a shard index. Thread indices will tend to
+        // distribute shards among threads equally, thus reducing contention due to read-locking.
+        let current_index = current_index().unwrap_or(0);
+        let shard_index = current_index & (self.shards.len() - 1);
+
+        match self.shards[shard_index].lock.read() {
+            Ok(guard) => Ok(ShardedLockReadGuard {
+                lock: self,
+                _guard: guard,
+                _marker: PhantomData,
+            }),
+            Err(err) => Err(PoisonError::new(ShardedLockReadGuard {
+                lock: self,
+                _guard: err.into_inner(),
+                _marker: PhantomData,
+            })),
+        }
+    }
+
+    /// Attempts to acquire this lock with exclusive write access.
+    ///
+    /// If the access could not be granted at this time, an error is returned. Otherwise, a guard
+    /// is returned which will release the exclusive access when it is dropped. This method does
+    /// not provide any guarantees with respect to the ordering of whether contentious readers or
+    /// writers will acquire the lock first.
+    ///
+    /// This method will return an error if the lock is poisoned. A lock gets poisoned when a write
+    /// operation panics.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(1);
+    ///
+    /// let n = lock.read().unwrap();
+    /// assert_eq!(*n, 1);
+    ///
+    /// assert!(lock.try_write().is_err());
+    /// ```
+    pub fn try_write(&self) -> TryLockResult<ShardedLockWriteGuard<T>> {
+        let mut poisoned = false;
+        let mut blocked = None;
+
+        // Write-lock each shard in succession.
+        for (i, shard) in self.shards.iter().enumerate() {
+            let guard = match shard.lock.try_write() {
+                Ok(guard) => guard,
+                Err(TryLockError::Poisoned(err)) => {
+                    poisoned = true;
+                    err.into_inner()
+                },
+                Err(TryLockError::WouldBlock) => {
+                    blocked = Some(i);
+                    break;
+                }
+            };
+
+            // Store the guard into the shard.
+            unsafe {
+                let guard: RwLockWriteGuard<'static, ()> = mem::transmute(guard);
+                let dest: *mut _ = shard.write_guard.get();
+                *dest = Some(guard);
+            }
+        }
+
+        if let Some(i) = blocked {
+            // Unlock the shards in reverse order of locking.
+            for shard in self.shards[0..i].iter().rev() {
+                unsafe {
+                    let dest: *mut _ = shard.write_guard.get();
+                    let guard = mem::replace(&mut *dest, None);
+                    drop(guard);
+                }
+            }
+            Err(TryLockError::WouldBlock)
+        } else if poisoned {
+            let guard = ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            };
+            Err(TryLockError::Poisoned(PoisonError::new(guard)))
+        } else {
+            Ok(ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            })
+        }
+    }
+
+    /// Locks with exclusive write access, blocking the current thread until it can be acquired.
+    ///
+    /// The calling thread will be blocked until there are no more writers which hold the lock.
+    /// There may be other readers currently inside the lock when this method returns. This method
+    /// does not provide any guarantees with respect to the ordering of whether contentious readers
+    /// or writers will acquire the lock first.
+    ///
+    /// Returns a guard which will release the exclusive access when dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::ShardedLock;
+    ///
+    /// let lock = ShardedLock::new(1);
+    ///
+    /// let mut n = lock.write().unwrap();
+    /// *n = 2;
+    ///
+    /// assert!(lock.try_read().is_err());
+    /// ```
+    pub fn write(&self) -> LockResult<ShardedLockWriteGuard<T>> {
+        let mut poisoned = false;
+
+        // Write-lock each shard in succession.
+        for shard in self.shards.iter() {
+            let guard = match shard.lock.write() {
+                Ok(guard) => guard,
+                Err(err) => {
+                    poisoned = true;
+                    err.into_inner()
+                }
+            };
+
+            // Store the guard into the shard.
+            unsafe {
+                let guard: RwLockWriteGuard<'_, ()> = guard;
+                let guard: RwLockWriteGuard<'static, ()> = mem::transmute(guard);
+                let dest: *mut _ = shard.write_guard.get();
+                *dest = Some(guard);
+            }
+        }
+
+        if poisoned {
+            Err(PoisonError::new(ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            }))
+        } else {
+            Ok(ShardedLockWriteGuard {
+                lock: self,
+                _marker: PhantomData,
+            })
+        }
+    }
+}
+
+impl<T: ?Sized + fmt::Debug> fmt::Debug for ShardedLock<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self.try_read() {
+            Ok(guard) => f.debug_struct("ShardedLock").field("data", &&*guard).finish(),
+            Err(TryLockError::Poisoned(err)) => {
+                f.debug_struct("ShardedLock").field("data", &&**err.get_ref()).finish()
+            },
+            Err(TryLockError::WouldBlock) => {
+                struct LockedPlaceholder;
+                impl fmt::Debug for LockedPlaceholder {
+                    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                        f.write_str("<locked>")
+                    }
+                }
+                f.debug_struct("ShardedLock").field("data", &LockedPlaceholder).finish()
+            }
+        }
+    }
+}
+
+impl<T: Default> Default for ShardedLock<T> {
+    fn default() -> ShardedLock<T> {
+        ShardedLock::new(Default::default())
+    }
+}
+
+impl<T> From<T> for ShardedLock<T> {
+    fn from(t: T) -> Self {
+        ShardedLock::new(t)
+    }
+}
+
+/// A guard used to release the shared read access of a [`ShardedLock`] when dropped.
+///
+/// [`ShardedLock`]: struct.ShardedLock.html
+pub struct ShardedLockReadGuard<'a, T: ?Sized + 'a> {
+    lock: &'a ShardedLock<T>,
+    _guard: RwLockReadGuard<'a, ()>,
+    _marker: PhantomData<RwLockReadGuard<'a, T>>,
+}
+
+unsafe impl<'a, T: ?Sized + Sync> Sync for ShardedLockReadGuard<'a, T> {}
+
+impl<'a, T: ?Sized> Deref for ShardedLockReadGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.lock.value.get() }
+    }
+}
+
+impl<'a, T: fmt::Debug> fmt::Debug for ShardedLockReadGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("ShardedLockReadGuard")
+            .field("lock", &self.lock)
+            .finish()
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for ShardedLockReadGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+/// A guard used to release the exclusive write access of a [`ShardedLock`] when dropped.
+///
+/// [`ShardedLock`]: struct.ShardedLock.html
+pub struct ShardedLockWriteGuard<'a, T: ?Sized + 'a> {
+    lock: &'a ShardedLock<T>,
+    _marker: PhantomData<RwLockWriteGuard<'a, T>>,
+}
+
+unsafe impl<'a, T: ?Sized + Sync> Sync for ShardedLockWriteGuard<'a, T> {}
+
+impl<'a, T: ?Sized> Drop for ShardedLockWriteGuard<'a, T> {
+    fn drop(&mut self) {
+        // Unlock the shards in reverse order of locking.
+        for shard in self.lock.shards.iter().rev() {
+            unsafe {
+                let dest: *mut _ = shard.write_guard.get();
+                let guard = mem::replace(&mut *dest, None);
+                drop(guard);
+            }
+        }
+    }
+}
+
+impl<'a, T: fmt::Debug> fmt::Debug for ShardedLockWriteGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.debug_struct("ShardedLockWriteGuard")
+            .field("lock", &self.lock)
+            .finish()
+    }
+}
+
+impl<'a, T: ?Sized + fmt::Display> fmt::Display for ShardedLockWriteGuard<'a, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        (**self).fmt(f)
+    }
+}
+
+impl<'a, T: ?Sized> Deref for ShardedLockWriteGuard<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.lock.value.get() }
+    }
+}
+
+impl<'a, T: ?Sized> DerefMut for ShardedLockWriteGuard<'a, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.lock.value.get() }
+    }
+}
+
+/// Returns a `usize` that identifies the current thread.
+///
+/// Each thread is associated with an 'index'. While there are no particular guarantees, indices
+/// usually tend to be consecutive numbers between 0 and the number of running threads.
+///
+/// Since this function accesses TLS, `None` might be returned if the current thread's TLS is
+/// tearing down.
+#[inline]
+fn current_index() -> Option<usize> {
+    REGISTRATION.try_with(|reg| reg.index).ok()
+}
+
+/// The global registry keeping track of registered threads and indices.
+struct ThreadIndices {
+    /// Mapping from `ThreadId` to thread index.
+    mapping: HashMap<ThreadId, usize>,
+
+    /// A list of free indices.
+    free_list: Vec<usize>,
+
+    /// The next index to allocate if the free list is empty.
+    next_index: usize,
+}
+
+lazy_static! {
+    static ref THREAD_INDICES: Mutex<ThreadIndices> = Mutex::new(ThreadIndices {
+        mapping: HashMap::new(),
+        free_list: Vec::new(),
+        next_index: 0,
+    });
+}
+
+/// A registration of a thread with an index.
+///
+/// When dropped, unregisters the thread and frees the reserved index.
+struct Registration {
+    index: usize,
+    thread_id: ThreadId,
+}
+
+impl Drop for Registration {
+    fn drop(&mut self) {
+        let mut indices = THREAD_INDICES.lock().unwrap();
+        indices.mapping.remove(&self.thread_id);
+        indices.free_list.push(self.index);
+    }
+}
+
+thread_local! {
+    static REGISTRATION: Registration = {
+        let thread_id = thread::current().id();
+        let mut indices = THREAD_INDICES.lock().unwrap();
+
+        let index = match indices.free_list.pop() {
+            Some(i) => i,
+            None => {
+                let i = indices.next_index;
+                indices.next_index += 1;
+                i
+            }
+        };
+        indices.mapping.insert(thread_id, index);
+
+        Registration {
+            index,
+            thread_id,
+        }
+    };
+}
diff --git a/vendor/crossbeam-utils/src/sync/wait_group.rs b/vendor/crossbeam-utils/src/sync/wait_group.rs
new file mode 100644
index 0000000000..16ddc3091c
--- /dev/null
+++ b/vendor/crossbeam-utils/src/sync/wait_group.rs
@@ -0,0 +1,139 @@
+use std::fmt;
+use std::sync::{Arc, Condvar, Mutex};
+
+/// Enables threads to synchronize the beginning or end of some computation.
+///
+/// # Wait groups vs barriers
+///
+/// `WaitGroup` is very similar to [`Barrier`], but there are a few differences:
+///
+/// * `Barrier` needs to know the number of threads at construction, while `WaitGroup` is cloned to
+///   register more threads.
+///
+/// * A `Barrier` can be reused even after all threads have synchronized, while a `WaitGroup`
+///   synchronizes threads only once.
+///
+/// * All threads wait for others to reach the `Barrier`. With `WaitGroup`, each thread can choose
+///   to either wait for other threads or to continue without blocking.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::sync::WaitGroup;
+/// use std::thread;
+///
+/// // Create a new wait group.
+/// let wg = WaitGroup::new();
+///
+/// for _ in 0..4 {
+///     // Create another reference to the wait group.
+///     let wg = wg.clone();
+///
+///     thread::spawn(move || {
+///         // Do some work.
+///
+///         // Drop the reference to the wait group.
+///         drop(wg);
+///     });
+/// }
+///
+/// // Block until all threads have finished their work.
+/// wg.wait();
+/// ```
+///
+/// [`Barrier`]: https://doc.rust-lang.org/std/sync/struct.Barrier.html
+pub struct WaitGroup {
+    inner: Arc<Inner>,
+}
+
+/// Inner state of a `WaitGroup`.
+struct Inner {
+    cvar: Condvar,
+    count: Mutex<usize>,
+}
+
+impl WaitGroup {
+    /// Creates a new wait group and returns the single reference to it.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::WaitGroup;
+    ///
+    /// let wg = WaitGroup::new();
+    /// ```
+    pub fn new() -> WaitGroup {
+        WaitGroup {
+            inner: Arc::new(Inner {
+                cvar: Condvar::new(),
+                count: Mutex::new(1),
+            }),
+        }
+    }
+
+    /// Drops this reference and waits until all other references are dropped.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::sync::WaitGroup;
+    /// use std::thread;
+    ///
+    /// let wg = WaitGroup::new();
+    ///
+    /// thread::spawn({
+    ///     let wg = wg.clone();
+    ///     move || {
+    ///         // Block until both threads have reached `wait()`.
+    ///         wg.wait();
+    ///     }
+    /// });
+    ///
+    /// // Block until both threads have reached `wait()`.
+    /// wg.wait();
+    /// ```
+    pub fn wait(self) {
+        if *self.inner.count.lock().unwrap() == 1 {
+            return;
+        }
+
+        let inner = self.inner.clone();
+        drop(self);
+
+        let mut count = inner.count.lock().unwrap();
+        while *count > 0 {
+            count = inner.cvar.wait(count).unwrap();
+        }
+    }
+}
+
+impl Drop for WaitGroup {
+    fn drop(&mut self) {
+        let mut count = self.inner.count.lock().unwrap();
+        *count -= 1;
+
+        if *count == 0 {
+            self.inner.cvar.notify_all();
+        }
+    }
+}
+
+impl Clone for WaitGroup {
+    fn clone(&self) -> WaitGroup {
+        let mut count = self.inner.count.lock().unwrap();
+        *count += 1;
+
+        WaitGroup {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
+impl fmt::Debug for WaitGroup {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let count: &usize = &*self.inner.count.lock().unwrap();
+        f.debug_struct("WaitGroup")
+            .field("count", count)
+            .finish()
+    }
+}
diff --git a/vendor/crossbeam-utils/src/thread.rs b/vendor/crossbeam-utils/src/thread.rs
new file mode 100644
index 0000000000..a88c0f101c
--- /dev/null
+++ b/vendor/crossbeam-utils/src/thread.rs
@@ -0,0 +1,529 @@
+//! Threads that can borrow variables from the stack.
+//!
+//! Create a scope when spawned threads need to access variables on the stack:
+//!
+//! ```
+//! use crossbeam_utils::thread;
+//!
+//! let people = vec![
+//!     "Alice".to_string(),
+//!     "Bob".to_string(),
+//!     "Carol".to_string(),
+//! ];
+//!
+//! thread::scope(|s| {
+//!     for person in &people {
+//!         s.spawn(move |_| {
+//!             println!("Hello, {}!", person);
+//!         });
+//!     }
+//! }).unwrap();
+//! ```
+//!
+//! # Why scoped threads?
+//!
+//! Suppose we wanted to re-write the previous example using plain threads:
+//!
+//! ```ignore
+//! use std::thread;
+//!
+//! let people = vec![
+//!     "Alice".to_string(),
+//!     "Bob".to_string(),
+//!     "Carol".to_string(),
+//! ];
+//!
+//! let mut threads = Vec::new();
+//!
+//! for person in &people {
+//!     threads.push(thread::spawn(move |_| {
+//!         println!("Hello, {}!", person);
+//!     }));
+//! }
+//!
+//! for thread in threads {
+//!     thread.join().unwrap();
+//! }
+//! ```
+//!
+//! This doesn't work because the borrow checker complains about `people` not living long enough:
+//!
+//! ```text
+//! error[E0597]: `people` does not live long enough
+//!   --> src/main.rs:12:20
+//!    |
+//! 12 |     for person in &people {
+//!    |                    ^^^^^^ borrowed value does not live long enough
+//! ...
+//! 21 | }
+//!    | - borrowed value only lives until here
+//!    |
+//!    = note: borrowed value must be valid for the static lifetime...
+//! ```
+//!
+//! The problem here is that spawned threads are not allowed to borrow variables on stack because
+//! the compiler cannot prove they will be joined before `people` is destroyed.
+//!
+//! Scoped threads are a mechanism to guarantee to the compiler that spawned threads will be joined
+//! before the scope ends.
+//!
+//! # How scoped threads work
+//!
+//! If a variable is borrowed by a thread, the thread must complete before the variable is
+//! destroyed. Threads spawned using [`std::thread::spawn`] can only borrow variables with the
+//! `'static` lifetime because the borrow checker cannot be sure when the thread will complete.
+//!
+//! A scope creates a clear boundary between variables outside the scope and threads inside the
+//! scope. Whenever a scope spawns a thread, it promises to join the thread before the scope ends.
+//! This way we guarantee to the borrow checker that scoped threads only live within the scope and
+//! can safely access variables outside it.
+//!
+//! # Nesting scoped threads
+//!
+//! Sometimes scoped threads need to spawn more threads within the same scope. This is a little
+//! tricky because argument `s` lives *inside* the invocation of `thread::scope()` and as such
+//! cannot be borrowed by scoped threads:
+//!
+//! ```ignore
+//! use crossbeam_utils::thread;
+//!
+//! thread::scope(|s| {
+//!     s.spawn(|_| {
+//!         // Not going to compile because we're trying to borrow `s`,
+//!         // which lives *inside* the scope! :(
+//!         s.spawn(|_| println!("nested thread"));
+//!     });
+//! });
+//! ```
+//!
+//! Fortunately, there is a solution. Every scoped thread is passed a reference to its scope as an
+//! argument, which can be used for spawning nested threads:
+//!
+//! ```
+//! use crossbeam_utils::thread;
+//!
+//! thread::scope(|s| {
+//!     // Note the `|s|` here.
+//!     s.spawn(|s| {
+//!         // Yay, this works because we're using a fresh argument `s`! :)
+//!         s.spawn(|_| println!("nested thread"));
+//!     });
+//! });
+//! ```
+//!
+//! [`std::thread::spawn`]: https://doc.rust-lang.org/std/thread/fn.spawn.html
+
+use std::fmt;
+use std::io;
+use std::marker::PhantomData;
+use std::mem;
+use std::panic;
+use std::sync::{Arc, Mutex};
+use std::thread;
+
+use sync::WaitGroup;
+
+type SharedVec<T> = Arc<Mutex<Vec<T>>>;
+type SharedOption<T> = Arc<Mutex<Option<T>>>;
+
+/// Creates a new scope for spawning threads.
+///
+/// All child threads that haven't been manually joined will be automatically joined just before
+/// this function invocation ends. If all joined threads have successfully completed, `Ok` is
+/// returned with the return value of `f`. If any of the joined threads has panicked, an `Err` is
+/// returned containing errors from panicked threads.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::thread;
+///
+/// let var = vec![1, 2, 3];
+///
+/// thread::scope(|s| {
+///     s.spawn(|_| {
+///         println!("A child thread borrowing `var`: {:?}", var);
+///     });
+/// }).unwrap();
+/// ```
+pub fn scope<'env, F, R>(f: F) -> thread::Result<R>
+where
+    F: FnOnce(&Scope<'env>) -> R,
+{
+    let wg = WaitGroup::new();
+    let scope = Scope::<'env> {
+        handles: SharedVec::default(),
+        wait_group: wg.clone(),
+        _marker: PhantomData,
+    };
+
+    // Execute the scoped function, but catch any panics.
+    let result = panic::catch_unwind(panic::AssertUnwindSafe(|| f(&scope)));
+
+    // Wait until all nested scopes are dropped.
+    drop(scope.wait_group);
+    wg.wait();
+
+    // Join all remaining spawned threads.
+    let panics: Vec<_> = {
+        let mut handles = scope.handles.lock().unwrap();
+
+        // Filter handles that haven't been joined, join them, and collect errors.
+        let panics = handles
+            .drain(..)
+            .filter_map(|handle| handle.lock().unwrap().take())
+            .filter_map(|handle| handle.join().err())
+            .collect();
+
+        panics
+    };
+
+    // If `f` has panicked, resume unwinding.
+    // If any of the child threads have panicked, return the panic errors.
+    // Otherwise, everything is OK and return the result of `f`.
+    match result {
+        Err(err) => panic::resume_unwind(err),
+        Ok(res) => {
+            if panics.is_empty() {
+                Ok(res)
+            } else {
+                Err(Box::new(panics))
+            }
+        }
+    }
+}
+
+/// A scope for spawning threads.
+pub struct Scope<'env> {
+    /// The list of the thread join handles.
+    handles: SharedVec<SharedOption<thread::JoinHandle<()>>>,
+
+    /// Used to wait until all subscopes all dropped.
+    wait_group: WaitGroup,
+
+    /// Borrows data with invariant lifetime `'env`.
+    _marker: PhantomData<&'env mut &'env ()>,
+}
+
+unsafe impl<'env> Sync for Scope<'env> {}
+
+impl<'env> Scope<'env> {
+    /// Spawns a scoped thread.
+    ///
+    /// This method is similar to the [`spawn`] function in Rust's standard library. The difference
+    /// is that this thread is scoped, meaning it's guaranteed to terminate before the scope exits,
+    /// allowing it to reference variables outside the scope.
+    ///
+    /// The scoped thread is passed a reference to this scope as an argument, which can be used for
+    /// spawning nested threads.
+    ///
+    /// The returned handle can be used to manually join the thread before the scope exits.
+    ///
+    /// [`spawn`]: https://doc.rust-lang.org/std/thread/fn.spawn.html
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle = s.spawn(|_| {
+    ///         println!("A child thread is running");
+    ///         42
+    ///     });
+    ///
+    ///     // Join the thread and retrieve its result.
+    ///     let res = handle.join().unwrap();
+    ///     assert_eq!(res, 42);
+    /// }).unwrap();
+    /// ```
+    pub fn spawn<'scope, F, T>(&'scope self, f: F) -> ScopedJoinHandle<'scope, T>
+    where
+        F: FnOnce(&Scope<'env>) -> T,
+        F: Send + 'env,
+        T: Send + 'env,
+    {
+        self.builder().spawn(f).unwrap()
+    }
+
+    /// Creates a builder that can configure a thread before spawning.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    /// use std::thread::current;
+    ///
+    /// thread::scope(|s| {
+    ///     s.builder()
+    ///         .spawn(|_| println!("A child thread is running"))
+    ///         .unwrap();
+    /// }).unwrap();
+    /// ```
+    pub fn builder<'scope>(&'scope self) -> ScopedThreadBuilder<'scope, 'env> {
+        ScopedThreadBuilder {
+            scope: self,
+            builder: thread::Builder::new(),
+        }
+    }
+}
+
+impl<'env> fmt::Debug for Scope<'env> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("Scope { .. }")
+    }
+}
+
+/// Configures the properties of a new thread.
+///
+/// The two configurable properties are:
+///
+/// - [`name`]: Specifies an [associated name for the thread][naming-threads].
+/// - [`stack_size`]: Specifies the [desired stack size for the thread][stack-size].
+///
+/// The [`spawn`] method will take ownership of the builder and return an [`io::Result`] of the
+/// thread handle with the given configuration.
+///
+/// The [`Scope::spawn`] method uses a builder with default configuration and unwraps its return
+/// value. You may want to use this builder when you want to recover from a failure to launch a
+/// thread.
+///
+/// # Examples
+///
+/// ```
+/// use crossbeam_utils::thread;
+///
+/// thread::scope(|s| {
+///     s.builder()
+///         .spawn(|_| println!("Running a child thread"))
+///         .unwrap();
+/// }).unwrap();
+/// ```
+///
+/// [`name`]: struct.ScopedThreadBuilder.html#method.name
+/// [`stack_size`]: struct.ScopedThreadBuilder.html#method.stack_size
+/// [`spawn`]: struct.ScopedThreadBuilder.html#method.spawn
+/// [`Scope::spawn`]: struct.Scope.html#method.spawn
+/// [`io::Result`]: https://doc.rust-lang.org/std/io/type.Result.html
+/// [naming-threads]: https://doc.rust-lang.org/std/thread/index.html#naming-threads
+/// [stack-size]: https://doc.rust-lang.org/std/thread/index.html#stack-size
+#[derive(Debug)]
+pub struct ScopedThreadBuilder<'scope, 'env: 'scope> {
+    scope: &'scope Scope<'env>,
+    builder: thread::Builder,
+}
+
+impl<'scope, 'env> ScopedThreadBuilder<'scope, 'env> {
+    /// Sets the name for the new thread.
+    ///
+    /// The name must not contain null bytes. For more information about named threads, see
+    /// [here][naming-threads].
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    /// use std::thread::current;
+    ///
+    /// thread::scope(|s| {
+    ///     s.builder()
+    ///         .name("my thread".to_string())
+    ///         .spawn(|_| assert_eq!(current().name(), Some("my thread")))
+    ///         .unwrap();
+    /// }).unwrap();
+    /// ```
+    ///
+    /// [naming-threads]: https://doc.rust-lang.org/std/thread/index.html#naming-threads
+    pub fn name(mut self, name: String) -> ScopedThreadBuilder<'scope, 'env> {
+        self.builder = self.builder.name(name);
+        self
+    }
+
+    /// Sets the size of the stack for the new thread.
+    ///
+    /// The stack size is measured in bytes.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     s.builder()
+    ///         .stack_size(32 * 1024)
+    ///         .spawn(|_| println!("Running a child thread"))
+    ///         .unwrap();
+    /// }).unwrap();
+    /// ```
+    pub fn stack_size(mut self, size: usize) -> ScopedThreadBuilder<'scope, 'env> {
+        self.builder = self.builder.stack_size(size);
+        self
+    }
+
+    /// Spawns a scoped thread with this configuration.
+    ///
+    /// The scoped thread is passed a reference to this scope as an argument, which can be used for
+    /// spawning nested threads.
+    ///
+    /// The returned handle can be used to manually join the thread before the scope exits.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle = s.builder()
+    ///         .spawn(|_| {
+    ///             println!("A child thread is running");
+    ///             42
+    ///         })
+    ///         .unwrap();
+    ///
+    ///     // Join the thread and retrieve its result.
+    ///     let res = handle.join().unwrap();
+    ///     assert_eq!(res, 42);
+    /// }).unwrap();
+    /// ```
+    pub fn spawn<F, T>(self, f: F) -> io::Result<ScopedJoinHandle<'scope, T>>
+    where
+        F: FnOnce(&Scope<'env>) -> T,
+        F: Send + 'env,
+        T: Send + 'env,
+    {
+        // The result of `f` will be stored here.
+        let result = SharedOption::default();
+
+        // Spawn the thread and grab its join handle and thread handle.
+        let (handle, thread) = {
+            let result = Arc::clone(&result);
+
+            // A clone of the scope that will be moved into the new thread.
+            let scope = Scope::<'env> {
+                handles: Arc::clone(&self.scope.handles),
+                wait_group: self.scope.wait_group.clone(),
+                _marker: PhantomData,
+            };
+
+            // Spawn the thread.
+            let handle = {
+                let closure = move || {
+                    // Make sure the scope is inside the closure with the proper `'env` lifetime.
+                    let scope: Scope<'env> = scope;
+
+                    // Run the closure.
+                    let res = f(&scope);
+
+                    // Store the result if the closure didn't panic.
+                    *result.lock().unwrap() = Some(res);
+                };
+
+                // Change the type of `closure` from `FnOnce() -> T` to `FnMut() -> T`.
+                let mut closure = Some(closure);
+                let closure = move || closure.take().unwrap()();
+
+                // Allocate `clsoure` on the heap and erase the `'env` bound.
+                let closure: Box<dyn FnMut() + Send + 'env> = Box::new(closure);
+                let closure: Box<dyn FnMut() + Send + 'static> = unsafe { mem::transmute(closure) };
+
+                // Finally, spawn the closure.
+                let mut closure = closure;
+                self.builder.spawn(move || closure())?
+            };
+
+            let thread = handle.thread().clone();
+            let handle = Arc::new(Mutex::new(Some(handle)));
+            (handle, thread)
+        };
+
+        // Add the handle to the shared list of join handles.
+        self.scope.handles.lock().unwrap().push(Arc::clone(&handle));
+
+        Ok(ScopedJoinHandle {
+            handle,
+            result,
+            thread,
+            _marker: PhantomData,
+        })
+    }
+}
+
+unsafe impl<'scope, T> Send for ScopedJoinHandle<'scope, T> {}
+unsafe impl<'scope, T> Sync for ScopedJoinHandle<'scope, T> {}
+
+/// A handle that can be used to join its scoped thread.
+pub struct ScopedJoinHandle<'scope, T> {
+    /// A join handle to the spawned thread.
+    handle: SharedOption<thread::JoinHandle<()>>,
+
+    /// Holds the result of the inner closure.
+    result: SharedOption<T>,
+
+    /// A handle to the the spawned thread.
+    thread: thread::Thread,
+
+    /// Borrows the parent scope with lifetime `'scope`.
+    _marker: PhantomData<&'scope ()>,
+}
+
+impl<'scope, T> ScopedJoinHandle<'scope, T> {
+    /// Waits for the thread to finish and returns its result.
+    ///
+    /// If the child thread panics, an error is returned.
+    ///
+    /// # Panics
+    ///
+    /// This function may panic on some platforms if a thread attempts to join itself or otherwise
+    /// may create a deadlock with joining threads.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle1 = s.spawn(|_| println!("I'm a happy thread :)"));
+    ///     let handle2 = s.spawn(|_| panic!("I'm a sad thread :("));
+    ///
+    ///     // Join the first thread and verify that it succeeded.
+    ///     let res = handle1.join();
+    ///     assert!(res.is_ok());
+    ///
+    ///     // Join the second thread and verify that it panicked.
+    ///     let res = handle2.join();
+    ///     assert!(res.is_err());
+    /// }).unwrap();
+    /// ```
+    pub fn join(self) -> thread::Result<T> {
+        // Take out the handle. The handle will surely be available because the root scope waits
+        // for nested scopes before joining remaining threads.
+        let handle = self.handle.lock().unwrap().take().unwrap();
+
+        // Join the thread and then take the result out of its inner closure.
+        handle
+            .join()
+            .map(|()| self.result.lock().unwrap().take().unwrap())
+    }
+
+    /// Returns a handle to the underlying thread.
+    ///
+    /// # Examples
+    ///
+    /// ```
+    /// use crossbeam_utils::thread;
+    ///
+    /// thread::scope(|s| {
+    ///     let handle = s.spawn(|_| println!("A child thread is running"));
+    ///     println!("The child thread ID: {:?}", handle.thread().id());
+    /// }).unwrap();
+    /// ```
+    pub fn thread(&self) -> &thread::Thread {
+        &self.thread
+    }
+}
+
+impl<'scope, T> fmt::Debug for ScopedJoinHandle<'scope, T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.pad("ScopedJoinHandle { .. }")
+    }
+}
diff --git a/vendor/crossbeam-utils/tests/atomic_cell.rs b/vendor/crossbeam-utils/tests/atomic_cell.rs
new file mode 100644
index 0000000000..57206aeda1
--- /dev/null
+++ b/vendor/crossbeam-utils/tests/atomic_cell.rs
@@ -0,0 +1,234 @@
+extern crate crossbeam_utils;
+
+use std::sync::atomic::AtomicUsize;
+use std::sync::atomic::Ordering::SeqCst;
+
+use crossbeam_utils::atomic::AtomicCell;
+
+#[test]
+fn is_lock_free() {
+    struct UsizeWrap(usize);
+    struct U8Wrap(bool);
+
+    assert_eq!(AtomicCell::<usize>::is_lock_free(), true);
+    assert_eq!(AtomicCell::<isize>::is_lock_free(), true);
+    assert_eq!(AtomicCell::<UsizeWrap>::is_lock_free(), true);
+
+    assert_eq!(AtomicCell::<u8>::is_lock_free(), cfg!(feature = "nightly"));
+    assert_eq!(
+        AtomicCell::<bool>::is_lock_free(),
+        cfg!(feature = "nightly")
+    );
+    assert_eq!(
+        AtomicCell::<U8Wrap>::is_lock_free(),
+        cfg!(feature = "nightly")
+    );
+}
+
+#[test]
+fn drops_unit() {
+    static CNT: AtomicUsize = AtomicUsize::new(0);
+    CNT.store(0, SeqCst);
+
+    #[derive(Debug, PartialEq, Eq)]
+    struct Foo();
+
+    impl Foo {
+        fn new() -> Foo {
+            CNT.fetch_add(1, SeqCst);
+            Foo()
+        }
+    }
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            CNT.fetch_sub(1, SeqCst);
+        }
+    }
+
+    impl Default for Foo {
+        fn default() -> Foo {
+            Foo::new()
+        }
+    }
+
+    let a = AtomicCell::new(Foo::new());
+
+    assert_eq!(a.swap(Foo::new()), Foo::new());
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    a.store(Foo::new());
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    assert_eq!(a.swap(Foo::default()), Foo::new());
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    drop(a);
+    assert_eq!(CNT.load(SeqCst), 0);
+}
+
+#[test]
+fn drops_u8() {
+    static CNT: AtomicUsize = AtomicUsize::new(0);
+    CNT.store(0, SeqCst);
+
+    #[derive(Debug, PartialEq, Eq)]
+    struct Foo(u8);
+
+    impl Foo {
+        fn new(val: u8) -> Foo {
+            CNT.fetch_add(1, SeqCst);
+            Foo(val)
+        }
+    }
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            CNT.fetch_sub(1, SeqCst);
+        }
+    }
+
+    impl Default for Foo {
+        fn default() -> Foo {
+            Foo::new(0)
+        }
+    }
+
+    let a = AtomicCell::new(Foo::new(5));
+
+    assert_eq!(a.swap(Foo::new(6)), Foo::new(5));
+    assert_eq!(a.swap(Foo::new(1)), Foo::new(6));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    a.store(Foo::new(2));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    assert_eq!(a.swap(Foo::default()), Foo::new(2));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    assert_eq!(a.swap(Foo::default()), Foo::new(0));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    drop(a);
+    assert_eq!(CNT.load(SeqCst), 0);
+}
+
+#[test]
+fn drops_usize() {
+    static CNT: AtomicUsize = AtomicUsize::new(0);
+    CNT.store(0, SeqCst);
+
+    #[derive(Debug, PartialEq, Eq)]
+    struct Foo(usize);
+
+    impl Foo {
+        fn new(val: usize) -> Foo {
+            CNT.fetch_add(1, SeqCst);
+            Foo(val)
+        }
+    }
+
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            CNT.fetch_sub(1, SeqCst);
+        }
+    }
+
+    impl Default for Foo {
+        fn default() -> Foo {
+            Foo::new(0)
+        }
+    }
+
+    let a = AtomicCell::new(Foo::new(5));
+
+    assert_eq!(a.swap(Foo::new(6)), Foo::new(5));
+    assert_eq!(a.swap(Foo::new(1)), Foo::new(6));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    a.store(Foo::new(2));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    assert_eq!(a.swap(Foo::default()), Foo::new(2));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    assert_eq!(a.swap(Foo::default()), Foo::new(0));
+    assert_eq!(CNT.load(SeqCst), 1);
+
+    drop(a);
+    assert_eq!(CNT.load(SeqCst), 0);
+}
+
+#[test]
+fn modular_u8() {
+    #[derive(Clone, Copy, Eq, Debug, Default)]
+    struct Foo(u8);
+
+    impl PartialEq for Foo {
+        fn eq(&self, other: &Foo) -> bool {
+            self.0 % 5 == other.0 % 5
+        }
+    }
+
+    let a = AtomicCell::new(Foo(1));
+
+    assert_eq!(a.load(), Foo(1));
+    assert_eq!(a.swap(Foo(2)), Foo(11));
+    assert_eq!(a.load(), Foo(52));
+
+    a.store(Foo(0));
+    assert_eq!(a.compare_exchange(Foo(0), Foo(5)), Ok(Foo(100)));
+    assert_eq!(a.load().0, 5);
+    assert_eq!(a.compare_exchange(Foo(10), Foo(15)), Ok(Foo(100)));
+    assert_eq!(a.load().0, 15);
+}
+
+#[test]
+fn modular_usize() {
+    #[derive(Clone, Copy, Eq, Debug, Default)]
+    struct Foo(usize);
+
+    impl PartialEq for Foo {
+        fn eq(&self, other: &Foo) -> bool {
+            self.0 % 5 == other.0 % 5
+        }
+    }
+
+    let a = AtomicCell::new(Foo(1));
+
+    assert_eq!(a.load(), Foo(1));
+    assert_eq!(a.swap(Foo(2)), Foo(11));
+    assert_eq!(a.load(), Foo(52));
+
+    a.store(Foo(0));
+    assert_eq!(a.compare_exchange(Foo(0), Foo(5)), Ok(Foo(100)));
+    assert_eq!(a.load().0, 5);
+    assert_eq!(a.compare_exchange(Foo(10), Foo(15)), Ok(Foo(100)));
+    assert_eq!(a.load().0, 15);
+}
+
+#[test]
+fn garbage_padding() {
+    #[derive(Copy, Clone, Eq, PartialEq)]
+    struct Object {
+        a: i64,
+        b: i32,
+    }
+
+    let cell = AtomicCell::new(Object { a: 0, b: 0 });
+    let _garbage = [0xfe, 0xfe, 0xfe, 0xfe, 0xfe]; // Needed
+    let next = Object { a: 0, b: 0 };
+
+    let prev = cell.load();
+    assert!(cell.compare_exchange(prev, next).is_ok());
+    println!();
+}
+
+#[cfg(has_min_const_fn)]
+#[test]
+fn const_atomic_cell_new() {
+    static CELL: AtomicCell<usize> = AtomicCell::new(0);
+
+    CELL.store(1);
+    assert_eq!(CELL.load(), 1);
+}
diff --git a/vendor/crossbeam-utils/tests/cache_padded.rs b/vendor/crossbeam-utils/tests/cache_padded.rs
new file mode 100644
index 0000000000..8ad7d40a4e
--- /dev/null
+++ b/vendor/crossbeam-utils/tests/cache_padded.rs
@@ -0,0 +1,112 @@
+extern crate crossbeam_utils;
+
+use std::cell::Cell;
+use std::mem;
+
+use crossbeam_utils::CachePadded;
+
+#[test]
+fn default() {
+    let x: CachePadded<u64> = Default::default();
+    assert_eq!(*x, 0);
+}
+
+#[test]
+fn store_u64() {
+    let x: CachePadded<u64> = CachePadded::new(17);
+    assert_eq!(*x, 17);
+}
+
+#[test]
+fn store_pair() {
+    let x: CachePadded<(u64, u64)> = CachePadded::new((17, 37));
+    assert_eq!(x.0, 17);
+    assert_eq!(x.1, 37);
+}
+
+#[test]
+fn distance() {
+    let arr = [CachePadded::new(17u8), CachePadded::new(37u8)];
+    let a = &*arr[0] as *const u8;
+    let b = &*arr[1] as *const u8;
+    assert!(unsafe { a.offset(64) } <= b);
+}
+
+#[test]
+fn different_sizes() {
+    CachePadded::new(17u8);
+    CachePadded::new(17u16);
+    CachePadded::new(17u32);
+    CachePadded::new([17u64; 0]);
+    CachePadded::new([17u64; 1]);
+    CachePadded::new([17u64; 2]);
+    CachePadded::new([17u64; 3]);
+    CachePadded::new([17u64; 4]);
+    CachePadded::new([17u64; 5]);
+    CachePadded::new([17u64; 6]);
+    CachePadded::new([17u64; 7]);
+    CachePadded::new([17u64; 8]);
+}
+
+#[test]
+fn large() {
+    let a = [17u64; 9];
+    let b = CachePadded::new(a);
+    assert!(mem::size_of_val(&a) <= mem::size_of_val(&b));
+}
+
+#[test]
+fn debug() {
+    assert_eq!(
+        format!("{:?}", CachePadded::new(17u64)),
+        "CachePadded { value: 17 }"
+    );
+}
+
+#[test]
+fn drops() {
+    let count = Cell::new(0);
+
+    struct Foo<'a>(&'a Cell<usize>);
+
+    impl<'a> Drop for Foo<'a> {
+        fn drop(&mut self) {
+            self.0.set(self.0.get() + 1);
+        }
+    }
+
+    let a = CachePadded::new(Foo(&count));
+    let b = CachePadded::new(Foo(&count));
+
+    assert_eq!(count.get(), 0);
+    drop(a);
+    assert_eq!(count.get(), 1);
+    drop(b);
+    assert_eq!(count.get(), 2);
+}
+
+#[test]
+fn clone() {
+    let a = CachePadded::new(17);
+    let b = a.clone();
+    assert_eq!(*a, *b);
+}
+
+#[test]
+fn runs_custom_clone() {
+    let count = Cell::new(0);
+
+    struct Foo<'a>(&'a Cell<usize>);
+
+    impl<'a> Clone for Foo<'a> {
+        fn clone(&self) -> Foo<'a> {
+            self.0.set(self.0.get() + 1);
+            Foo::<'a>(self.0)
+        }
+    }
+
+    let a = CachePadded::new(Foo(&count));
+    let _ = a.clone();
+
+    assert_eq!(count.get(), 1);
+}
diff --git a/vendor/crossbeam-utils/tests/parker.rs b/vendor/crossbeam-utils/tests/parker.rs
new file mode 100644
index 0000000000..3f4514626a
--- /dev/null
+++ b/vendor/crossbeam-utils/tests/parker.rs
@@ -0,0 +1,43 @@
+extern crate crossbeam_utils;
+
+use std::thread::sleep;
+use std::time::Duration;
+use std::u32;
+
+use crossbeam_utils::sync::Parker;
+use crossbeam_utils::thread;
+
+#[test]
+fn park_timeout_unpark_before() {
+    let p = Parker::new();
+    for _ in 0..10 {
+        p.unparker().unpark();
+        p.park_timeout(Duration::from_millis(u32::MAX as u64));
+    }
+}
+
+#[test]
+fn park_timeout_unpark_not_called() {
+    let p = Parker::new();
+    for _ in 0..10 {
+        p.park_timeout(Duration::from_millis(10));
+    }
+}
+
+#[test]
+fn park_timeout_unpark_called_other_thread() {
+    for _ in 0..10 {
+        let p = Parker::new();
+        let u = p.unparker().clone();
+
+        thread::scope(|scope| {
+            scope.spawn(move |_| {
+                sleep(Duration::from_millis(50));
+                u.unpark();
+            });
+
+            p.park_timeout(Duration::from_millis(u32::MAX as u64));
+        })
+        .unwrap();
+    }
+}
diff --git a/vendor/crossbeam-utils/tests/sharded_lock.rs b/vendor/crossbeam-utils/tests/sharded_lock.rs
new file mode 100644
index 0000000000..c98de79998
--- /dev/null
+++ b/vendor/crossbeam-utils/tests/sharded_lock.rs
@@ -0,0 +1,255 @@
+extern crate crossbeam_utils;
+extern crate rand;
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::mpsc::channel;
+use std::sync::{Arc, TryLockError};
+use std::thread;
+
+use crossbeam_utils::sync::ShardedLock;
+use rand::Rng;
+
+#[derive(Eq, PartialEq, Debug)]
+struct NonCopy(i32);
+
+#[test]
+fn smoke() {
+    let l = ShardedLock::new(());
+    drop(l.read().unwrap());
+    drop(l.write().unwrap());
+    drop((l.read().unwrap(), l.read().unwrap()));
+    drop(l.write().unwrap());
+}
+
+#[test]
+fn frob() {
+    const N: u32 = 10;
+    const M: usize = 1000;
+
+    let r = Arc::new(ShardedLock::new(()));
+
+    let (tx, rx) = channel::<()>();
+    for _ in 0..N {
+        let tx = tx.clone();
+        let r = r.clone();
+        thread::spawn(move || {
+            let mut rng = rand::thread_rng();
+            for _ in 0..M {
+                if rng.gen_bool(1.0 / (N as f64)) {
+                    drop(r.write().unwrap());
+                } else {
+                    drop(r.read().unwrap());
+                }
+            }
+            drop(tx);
+        });
+    }
+    drop(tx);
+    let _ = rx.recv();
+}
+
+#[test]
+fn arc_poison_wr() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.write().unwrap();
+        panic!();
+    })
+    .join();
+    assert!(arc.read().is_err());
+}
+
+#[test]
+fn arc_poison_ww() {
+    let arc = Arc::new(ShardedLock::new(1));
+    assert!(!arc.is_poisoned());
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.write().unwrap();
+        panic!();
+    })
+    .join();
+    assert!(arc.write().is_err());
+    assert!(arc.is_poisoned());
+}
+
+#[test]
+fn arc_no_poison_rr() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.read().unwrap();
+        panic!();
+    })
+    .join();
+    let lock = arc.read().unwrap();
+    assert_eq!(*lock, 1);
+}
+#[test]
+fn arc_no_poison_sl() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _: Result<(), _> = thread::spawn(move || {
+        let _lock = arc2.read().unwrap();
+        panic!()
+    })
+    .join();
+    let lock = arc.write().unwrap();
+    assert_eq!(*lock, 1);
+}
+
+#[test]
+fn arc() {
+    let arc = Arc::new(ShardedLock::new(0));
+    let arc2 = arc.clone();
+    let (tx, rx) = channel();
+
+    thread::spawn(move || {
+        let mut lock = arc2.write().unwrap();
+        for _ in 0..10 {
+            let tmp = *lock;
+            *lock = -1;
+            thread::yield_now();
+            *lock = tmp + 1;
+        }
+        tx.send(()).unwrap();
+    });
+
+    // Readers try to catch the writer in the act
+    let mut children = Vec::new();
+    for _ in 0..5 {
+        let arc3 = arc.clone();
+        children.push(thread::spawn(move || {
+            let lock = arc3.read().unwrap();
+            assert!(*lock >= 0);
+        }));
+    }
+
+    // Wait for children to pass their asserts
+    for r in children {
+        assert!(r.join().is_ok());
+    }
+
+    // Wait for writer to finish
+    rx.recv().unwrap();
+    let lock = arc.read().unwrap();
+    assert_eq!(*lock, 10);
+}
+
+#[test]
+fn arc_access_in_unwind() {
+    let arc = Arc::new(ShardedLock::new(1));
+    let arc2 = arc.clone();
+    let _ = thread::spawn(move || -> () {
+        struct Unwinder {
+            i: Arc<ShardedLock<isize>>,
+        }
+        impl Drop for Unwinder {
+            fn drop(&mut self) {
+                let mut lock = self.i.write().unwrap();
+                *lock += 1;
+            }
+        }
+        let _u = Unwinder { i: arc2 };
+        panic!();
+    })
+    .join();
+    let lock = arc.read().unwrap();
+    assert_eq!(*lock, 2);
+}
+
+#[test]
+fn unsized_type() {
+    let sl: &ShardedLock<[i32]> = &ShardedLock::new([1, 2, 3]);
+    {
+        let b = &mut *sl.write().unwrap();
+        b[0] = 4;
+        b[2] = 5;
+    }
+    let comp: &[i32] = &[4, 2, 5];
+    assert_eq!(&*sl.read().unwrap(), comp);
+}
+
+#[test]
+fn try_write() {
+    let lock = ShardedLock::new(0isize);
+    let read_guard = lock.read().unwrap();
+
+    let write_result = lock.try_write();
+    match write_result {
+        Err(TryLockError::WouldBlock) => (),
+        Ok(_) => assert!(
+            false,
+            "try_write should not succeed while read_guard is in scope"
+        ),
+        Err(_) => assert!(false, "unexpected error"),
+    }
+
+    drop(read_guard);
+}
+
+#[test]
+fn test_into_inner() {
+    let m = ShardedLock::new(NonCopy(10));
+    assert_eq!(m.into_inner().unwrap(), NonCopy(10));
+}
+
+#[test]
+fn test_into_inner_drop() {
+    struct Foo(Arc<AtomicUsize>);
+    impl Drop for Foo {
+        fn drop(&mut self) {
+            self.0.fetch_add(1, Ordering::SeqCst);
+        }
+    }
+    let num_drops = Arc::new(AtomicUsize::new(0));
+    let m = ShardedLock::new(Foo(num_drops.clone()));
+    assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+    {
+        let _inner = m.into_inner().unwrap();
+        assert_eq!(num_drops.load(Ordering::SeqCst), 0);
+    }
+    assert_eq!(num_drops.load(Ordering::SeqCst), 1);
+}
+
+#[test]
+fn test_into_inner_poison() {
+    let m = Arc::new(ShardedLock::new(NonCopy(10)));
+    let m2 = m.clone();
+    let _ = thread::spawn(move || {
+        let _lock = m2.write().unwrap();
+        panic!("test panic in inner thread to poison ShardedLock");
+    })
+    .join();
+
+    assert!(m.is_poisoned());
+    match Arc::try_unwrap(m).unwrap().into_inner() {
+        Err(e) => assert_eq!(e.into_inner(), NonCopy(10)),
+        Ok(x) => panic!("into_inner of poisoned ShardedLock is Ok: {:?}", x),
+    }
+}
+
+#[test]
+fn test_get_mut() {
+    let mut m = ShardedLock::new(NonCopy(10));
+    *m.get_mut().unwrap() = NonCopy(20);
+    assert_eq!(m.into_inner().unwrap(), NonCopy(20));
+}
+
+#[test]
+fn test_get_mut_poison() {
+    let m = Arc::new(ShardedLock::new(NonCopy(10)));
+    let m2 = m.clone();
+    let _ = thread::spawn(move || {
+        let _lock = m2.write().unwrap();
+        panic!("test panic in inner thread to poison ShardedLock");
+    })
+    .join();
+
+    assert!(m.is_poisoned());
+    match Arc::try_unwrap(m).unwrap().get_mut() {
+        Err(e) => assert_eq!(*e.into_inner(), NonCopy(10)),
+        Ok(x) => panic!("get_mut of poisoned ShardedLock is Ok: {:?}", x),
+    }
+}
diff --git a/vendor/crossbeam-utils/tests/thread.rs b/vendor/crossbeam-utils/tests/thread.rs
new file mode 100644
index 0000000000..e55d90fb15
--- /dev/null
+++ b/vendor/crossbeam-utils/tests/thread.rs
@@ -0,0 +1,181 @@
+extern crate crossbeam_utils;
+
+use std::any::Any;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::thread::sleep;
+use std::time::Duration;
+
+use crossbeam_utils::thread;
+
+const THREADS: usize = 10;
+const SMALL_STACK_SIZE: usize = 20;
+
+#[test]
+fn join() {
+    let counter = AtomicUsize::new(0);
+    thread::scope(|scope| {
+        let handle = scope.spawn(|_| {
+            counter.store(1, Ordering::Relaxed);
+        });
+        assert!(handle.join().is_ok());
+
+        let panic_handle = scope.spawn(|_| {
+            panic!("\"My honey is running out!\", said Pooh.");
+        });
+        assert!(panic_handle.join().is_err());
+    })
+    .unwrap();
+
+    // There should be sufficient synchronization.
+    assert_eq!(1, counter.load(Ordering::Relaxed));
+}
+
+#[test]
+fn counter() {
+    let counter = AtomicUsize::new(0);
+    thread::scope(|scope| {
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                counter.fetch_add(1, Ordering::Relaxed);
+            });
+        }
+    })
+    .unwrap();
+
+    assert_eq!(THREADS, counter.load(Ordering::Relaxed));
+}
+
+#[test]
+fn counter_builder() {
+    let counter = AtomicUsize::new(0);
+    thread::scope(|scope| {
+        for i in 0..THREADS {
+            scope
+                .builder()
+                .name(format!("child-{}", i))
+                .stack_size(SMALL_STACK_SIZE)
+                .spawn(|_| {
+                    counter.fetch_add(1, Ordering::Relaxed);
+                })
+                .unwrap();
+        }
+    })
+    .unwrap();
+
+    assert_eq!(THREADS, counter.load(Ordering::Relaxed));
+}
+
+#[test]
+fn counter_panic() {
+    let counter = AtomicUsize::new(0);
+    let result = thread::scope(|scope| {
+        scope.spawn(|_| {
+            panic!("\"My honey is running out!\", said Pooh.");
+        });
+        sleep(Duration::from_millis(100));
+
+        for _ in 0..THREADS {
+            scope.spawn(|_| {
+                counter.fetch_add(1, Ordering::Relaxed);
+            });
+        }
+    });
+
+    assert_eq!(THREADS, counter.load(Ordering::Relaxed));
+    assert!(result.is_err());
+}
+
+#[test]
+fn panic_twice() {
+    let result = thread::scope(|scope| {
+        scope.spawn(|_| {
+            sleep(Duration::from_millis(500));
+            panic!("thread #1");
+        });
+        scope.spawn(|_| {
+            panic!("thread #2");
+        });
+    });
+
+    let err = result.unwrap_err();
+    let vec = err
+        .downcast_ref::<Vec<Box<dyn Any + Send + 'static>>>()
+        .unwrap();
+    assert_eq!(2, vec.len());
+
+    let first = vec[0].downcast_ref::<&str>().unwrap();
+    let second = vec[1].downcast_ref::<&str>().unwrap();
+    assert_eq!("thread #1", *first);
+    assert_eq!("thread #2", *second)
+}
+
+#[test]
+fn panic_many() {
+    let result = thread::scope(|scope| {
+        scope.spawn(|_| panic!("deliberate panic #1"));
+        scope.spawn(|_| panic!("deliberate panic #2"));
+        scope.spawn(|_| panic!("deliberate panic #3"));
+    });
+
+    let err = result.unwrap_err();
+    let vec = err
+        .downcast_ref::<Vec<Box<dyn Any + Send + 'static>>>()
+        .unwrap();
+    assert_eq!(3, vec.len());
+
+    for panic in vec.iter() {
+        let panic = panic.downcast_ref::<&str>().unwrap();
+        assert!(
+            *panic == "deliberate panic #1"
+                || *panic == "deliberate panic #2"
+                || *panic == "deliberate panic #3"
+        );
+    }
+}
+
+#[test]
+fn nesting() {
+    let var = "foo".to_string();
+
+    struct Wrapper<'a> {
+        var: &'a String,
+    }
+
+    impl<'a> Wrapper<'a> {
+        fn recurse(&'a self, scope: &thread::Scope<'a>, depth: usize) {
+            assert_eq!(self.var, "foo");
+
+            if depth > 0 {
+                scope.spawn(move |scope| {
+                    self.recurse(scope, depth - 1);
+                });
+            }
+        }
+    }
+
+    let wrapper = Wrapper { var: &var };
+
+    thread::scope(|scope| {
+        scope.spawn(|scope| {
+            scope.spawn(|scope| {
+                wrapper.recurse(scope, 5);
+            });
+        });
+    })
+    .unwrap();
+}
+
+#[test]
+fn join_nested() {
+    thread::scope(|scope| {
+        scope.spawn(|scope| {
+            let handle = scope.spawn(|_| 7);
+
+            sleep(Duration::from_millis(200));
+            handle.join().unwrap();
+        });
+
+        sleep(Duration::from_millis(100));
+    })
+    .unwrap();
+}
diff --git a/vendor/crossbeam-utils/tests/wait_group.rs b/vendor/crossbeam-utils/tests/wait_group.rs
new file mode 100644
index 0000000000..1aa91997af
--- /dev/null
+++ b/vendor/crossbeam-utils/tests/wait_group.rs
@@ -0,0 +1,66 @@
+extern crate crossbeam_utils;
+
+use std::sync::mpsc;
+use std::thread;
+use std::time::Duration;
+
+use crossbeam_utils::sync::WaitGroup;
+
+const THREADS: usize = 10;
+
+#[test]
+fn wait() {
+    let wg = WaitGroup::new();
+    let (tx, rx) = mpsc::channel();
+
+    for _ in 0..THREADS {
+        let wg = wg.clone();
+        let tx = tx.clone();
+
+        thread::spawn(move || {
+            wg.wait();
+            tx.send(()).unwrap();
+        });
+    }
+
+    thread::sleep(Duration::from_millis(100));
+
+    // At this point, all spawned threads should be blocked, so we shouldn't get anything from the
+    // channel.
+    assert!(rx.try_recv().is_err());
+
+    wg.wait();
+
+    // Now, the wait group is cleared and we should receive messages.
+    for _ in 0..THREADS {
+        rx.recv().unwrap();
+    }
+}
+
+#[test]
+fn wait_and_drop() {
+    let wg = WaitGroup::new();
+    let (tx, rx) = mpsc::channel();
+
+    for _ in 0..THREADS {
+        let wg = wg.clone();
+        let tx = tx.clone();
+
+        thread::spawn(move || {
+            thread::sleep(Duration::from_millis(100));
+            tx.send(()).unwrap();
+            drop(wg);
+        });
+    }
+
+    // At this point, all spawned threads should be sleeping, so we shouldn't get anything from the
+    // channel.
+    assert!(rx.try_recv().is_err());
+
+    wg.wait();
+
+    // Now, the wait group is cleared and we should receive messages.
+    for _ in 0..THREADS {
+        rx.try_recv().unwrap();
+    }
+}
diff --git a/vendor/filetime/.cargo-checksum.json b/vendor/filetime/.cargo-checksum.json
index ab6176548b..83526dac7f 100644
--- a/vendor/filetime/.cargo-checksum.json
+++ b/vendor/filetime/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"3b323403931c075114703f0df4834398a2f88dc6b41f1365d2de06c1a5157792","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"c0d9555ee94f41fc4b6d4194d024414c14be92d6e4b5b835cff37120596f4ed7","appveyor.yml":"3a74394c3e3ef3b2c7d9458f526e47587977e98d026b63f00be29479075ff597","src/lib.rs":"c312c37a1c249a59c6ec31d6670e5c16607a41ba948cd43313f42db213f42a09","src/redox.rs":"96562d89993e370bec863bdde093dceb7595a4f3a1716733f384c20b811780a4","src/unix/linux.rs":"6529e0e2f3927752ea70f935eee1e49f7e70faf3d6c0df4851b2edb07687b531","src/unix/mod.rs":"2bb8b60437ee758d04bd1684f8ac3ccf74577023a0914c12019a0fc1fe6480f3","src/unix/utimensat.rs":"f5a0c83b43b2cc694e20f2375e87e26c10d726438c0e05e21751ddbd74dc8f6e","src/unix/utimes.rs":"9880b06f14a22ec5877bb6d78e1309ce89db2a0a43649f2a88207c9bb8708f36","src/windows.rs":"e24dd697c08c145f6e9bbbba89a8bd59ae787775c350f3637b2394218cd6c900"},"package":"a2df5c1a8c4be27e7707789dc42ae65976e60b394afd293d1419ab915833e646"}
\ No newline at end of file
+{"files":{"Cargo.toml":"38d2ad1aca015ba92e25ef582f762984001ea9121250f764e4760e36066f91d2","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"6cd295d9f4efe412971b1855ecaf7b19ef3956006a652ea205c456a5d33550c1","src/lib.rs":"03539612e5a34e86e0d05d790dc4c225cd63af6487807e50bd85112de9c68827","src/redox.rs":"230fb99efc81ec531d9d79d48b7e1814f1e12e06f5fb9173fc49c8c7155c3e29","src/unix/linux.rs":"061f0f7bd7a41f29b9d24b6487e302d650e9399f0dcc54595211e20ae4945da6","src/unix/macos.rs":"3db414651580a877366d47d997a2f961b5c01104dd0ba07aaaa49884096c8ea2","src/unix/mod.rs":"a8a972e0c24e36a64789d89473dd9ea50024a746dcf703eb3e05859037fe3b01","src/unix/utimensat.rs":"dbb6371ffaf91754afa870aa3ceedc400530a449721d3f6c572a3907c489634d","src/unix/utimes.rs":"ff4c306beda67f81c4b3a7e7fcccf16ad1d3f3a9f9e6fda3fd46515b7bf0ab73","src/wasm.rs":"a82734259846a3349d42da011c1065d21f3981bd20d6eb43495e34808b83af9a","src/windows.rs":"1b4467a183916c08bd1b743e81692229996efcdf6005f8a16d6157f13823d0be"},"package":"1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d"}
\ No newline at end of file
diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml
index 7e0637cc12..c0f11f37c2 100644
--- a/vendor/filetime/Cargo.toml
+++ b/vendor/filetime/Cargo.toml
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -11,8 +11,9 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "filetime"
-version = "0.2.4"
+version = "0.2.8"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 description = "Platform-agnostic accessors of timestamps in File metadata\n"
 homepage = "https://github.com/alexcrichton/filetime"
@@ -22,10 +23,13 @@ keywords = ["timestamp", "mtime"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/alexcrichton/filetime"
 [dependencies.cfg-if]
-version = "0.1"
-[dev-dependencies.tempdir]
-version = "0.3"
+version = "0.1.6"
+[dev-dependencies.tempfile]
+version = "3"
 [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
 version = "0.1"
 [target."cfg(unix)".dependencies.libc]
-version = "0.2"
+version = "0.2.27"
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3"
+features = ["fileapi", "minwindef", "winbase"]
diff --git a/vendor/filetime/README.md b/vendor/filetime/README.md
index 2d1d722366..f85d9679b5 100644
--- a/vendor/filetime/README.md
+++ b/vendor/filetime/README.md
@@ -1,11 +1,8 @@
 # filetime
 
-[![Build Status](https://travis-ci.org/alexcrichton/filetime.svg?branch=master)](https://travis-ci.org/alexcrichton/filetime)
-[![Build status](https://ci.appveyor.com/api/projects/status/9tatexq47i3ee13k?svg=true)](https://ci.appveyor.com/project/alexcrichton/filetime)
-
 [Documentation](https://docs.rs/filetime)
 
-A helper library for inspecting the various timestamps of files in Rust. This
+A helper library for inspecting and setting the various timestamps of files in Rust. This
 library takes into account cross-platform differences in terms of where the
 timestamps are located, what they are called, and how to convert them into a
 platform-independent representation.
@@ -16,6 +13,12 @@ platform-independent representation.
 filetime = "0.2"
 ```
 
+# Advantages over using `std::fs::Metadata`
+
+This library includes the ability to set this data, which std does not.
+
+This library, when built with `RUSTFLAGS=--cfg emulate_second_only_system` set, will return all times rounded down to the second. This emulates the behavior of some file systems, mostly [HFS](https://en.wikipedia.org/wiki/HFS_Plus), allowing debugging on other hardware.
+
 # License
 
 This project is licensed under either of
@@ -30,5 +33,5 @@ at your option.
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
+for inclusion in Filetime by you, as defined in the Apache-2.0 license, shall be
 dual licensed as above, without any additional terms or conditions.
diff --git a/vendor/filetime/appveyor.yml b/vendor/filetime/appveyor.yml
deleted file mode 100644
index 4a6104291e..0000000000
--- a/vendor/filetime/appveyor.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-environment:
-  matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  - TARGET: i686-pc-windows-msvc
-  - TARGET: i686-pc-windows-gnu
-install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
-  - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
-  - SET PATH=%PATH%;C:\MinGW\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo test --verbose --target %TARGET%
diff --git a/vendor/filetime/src/lib.rs b/vendor/filetime/src/lib.rs
index f5f3119654..5ee43737c8 100644
--- a/vendor/filetime/src/lib.rs
+++ b/vendor/filetime/src/lib.rs
@@ -9,7 +9,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! filetime = "0.1"
+//! filetime = "0.2"
 //! ```
 //!
 //! # Usage
@@ -34,22 +34,22 @@
 //! println!("{}", mtime.seconds());
 //! ```
 
-#[macro_use]
-extern crate cfg_if;
-
 use std::fmt;
 use std::fs;
 use std::io;
 use std::path::Path;
 use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-cfg_if! {
+cfg_if::cfg_if! {
     if #[cfg(target_os = "redox")] {
         #[path = "redox.rs"]
         mod imp;
     } else if #[cfg(windows)] {
         #[path = "windows.rs"]
         mod imp;
+    } else if #[cfg(target_arch = "wasm32")] {
+        #[path = "wasm.rs"]
+        mod imp;
     } else {
         #[path = "unix/mod.rs"]
         mod imp;
@@ -72,7 +72,21 @@ impl FileTime {
     ///
     /// Useful for creating the base of a cmp::max chain of times.
     pub fn zero() -> FileTime {
-        FileTime { seconds: 0, nanos: 0 }
+        FileTime {
+            seconds: 0,
+            nanos: 0,
+        }
+    }
+
+    fn emulate_second_only_system(self) -> FileTime {
+        if cfg!(emulate_second_only_system) {
+            FileTime {
+                seconds: self.seconds,
+                nanos: 0,
+            }
+        } else {
+            self
+        }
     }
 
     /// Creates a new instance of `FileTime` with a number of seconds and
@@ -87,9 +101,10 @@ impl FileTime {
     /// instance may not be the same as that passed in.
     pub fn from_unix_time(seconds: i64, nanos: u32) -> FileTime {
         FileTime {
-            seconds: seconds + if cfg!(windows) {11644473600} else {0},
+            seconds: seconds + if cfg!(windows) { 11644473600 } else { 0 },
             nanos,
         }
+        .emulate_second_only_system()
     }
 
     /// Creates a new timestamp from the last modification time listed in the
@@ -98,7 +113,7 @@ impl FileTime {
     /// The returned value corresponds to the `mtime` field of `stat` on Unix
     /// platforms and the `ftLastWriteTime` field on Windows platforms.
     pub fn from_last_modification_time(meta: &fs::Metadata) -> FileTime {
-        imp::from_last_modification_time(meta)
+        imp::from_last_modification_time(meta).emulate_second_only_system()
     }
 
     /// Creates a new timestamp from the last access time listed in the
@@ -107,7 +122,7 @@ impl FileTime {
     /// The returned value corresponds to the `atime` field of `stat` on Unix
     /// platforms and the `ftLastAccessTime` field on Windows platforms.
     pub fn from_last_access_time(meta: &fs::Metadata) -> FileTime {
-        imp::from_last_access_time(meta)
+        imp::from_last_access_time(meta).emulate_second_only_system()
     }
 
     /// Creates a new timestamp from the creation time listed in the specified
@@ -118,7 +133,7 @@ impl FileTime {
     /// that not all Unix platforms have this field available and may return
     /// `None` in some circumstances.
     pub fn from_creation_time(meta: &fs::Metadata) -> Option<FileTime> {
-        imp::from_creation_time(meta)
+        imp::from_creation_time(meta).map(|x| x.emulate_second_only_system())
     }
 
     /// Creates a new timestamp from the given SystemTime.
@@ -133,23 +148,25 @@ impl FileTime {
             UNIX_EPOCH
         };
 
-        time.duration_since(epoch).map(|d| FileTime {
-            seconds: d.as_secs() as i64,
-            nanos: d.subsec_nanos()
-        })
-        .unwrap_or_else(|e| {
-            let until_epoch = e.duration();
-            let (sec_offset, nanos) = if until_epoch.subsec_nanos() == 0 {
-                (0, 0)
-            } else {
-                (-1, 1_000_000_000 - until_epoch.subsec_nanos())
-            };
-
-            FileTime {
-                seconds: -1 * until_epoch.as_secs() as i64 + sec_offset,
-                nanos
-            }
-        })
+        time.duration_since(epoch)
+            .map(|d| FileTime {
+                seconds: d.as_secs() as i64,
+                nanos: d.subsec_nanos(),
+            })
+            .unwrap_or_else(|e| {
+                let until_epoch = e.duration();
+                let (sec_offset, nanos) = if until_epoch.subsec_nanos() == 0 {
+                    (0, 0)
+                } else {
+                    (-1, 1_000_000_000 - until_epoch.subsec_nanos())
+                };
+
+                FileTime {
+                    seconds: -1 * until_epoch.as_secs() as i64 + sec_offset,
+                    nanos,
+                }
+            })
+            .emulate_second_only_system()
     }
 
     /// Returns the whole number of seconds represented by this timestamp.
@@ -157,7 +174,9 @@ impl FileTime {
     /// Note that this value's meaning is **platform specific**. On Unix
     /// platform time stamps are typically relative to January 1, 1970, but on
     /// Windows platforms time stamps are relative to January 1, 1601.
-    pub fn seconds(&self) -> i64 { self.seconds }
+    pub fn seconds(&self) -> i64 {
+        self.seconds
+    }
 
     /// Returns the whole number of seconds represented by this timestamp,
     /// relative to the Unix epoch start of January 1, 1970.
@@ -165,7 +184,7 @@ impl FileTime {
     /// Note that this does not return the same value as `seconds` for Windows
     /// platforms as seconds are relative to a different date there.
     pub fn unix_seconds(&self) -> i64 {
-        self.seconds - if cfg!(windows) {11644473600} else {0}
+        self.seconds - if cfg!(windows) { 11644473600 } else { 0 }
     }
 
     /// Returns the nanosecond precision of this timestamp.
@@ -173,7 +192,9 @@ impl FileTime {
     /// The returned value is always less than one billion and represents a
     /// portion of a second forward from the seconds returned by the `seconds`
     /// method.
-    pub fn nanoseconds(&self) -> u32 { self.nanos }
+    pub fn nanoseconds(&self) -> u32 {
+        self.nanos
+    }
 }
 
 impl fmt::Display for FileTime {
@@ -192,49 +213,97 @@ impl From<SystemTime> for FileTime {
 ///
 /// This function will set the `atime` and `mtime` metadata fields for a file
 /// on the local filesystem, returning any error encountered.
-pub fn set_file_times<P>(p: P, atime: FileTime, mtime: FileTime)
-    -> io::Result<()>
-    where P: AsRef<Path>
+pub fn set_file_times<P>(p: P, atime: FileTime, mtime: FileTime) -> io::Result<()>
+where
+    P: AsRef<Path>,
 {
     imp::set_file_times(p.as_ref(), atime, mtime)
 }
 
+/// Set the last access and modification times for a file handle.
+///
+/// This function will either or both of  the `atime` and `mtime` metadata
+/// fields for a file handle , returning any error encountered. If `None` is
+/// specified then the time won't be updated. If `None` is specified for both
+/// options then no action is taken.
+pub fn set_file_handle_times(
+    f: &fs::File,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+) -> io::Result<()> {
+    imp::set_file_handle_times(f, atime, mtime)
+}
+
 /// Set the last access and modification times for a file on the filesystem.
 /// This function does not follow symlink.
 ///
 /// This function will set the `atime` and `mtime` metadata fields for a file
 /// on the local filesystem, returning any error encountered.
-pub fn set_symlink_file_times<P>(p: P, atime: FileTime, mtime: FileTime)
-    -> io::Result<()>
-    where P: AsRef<Path>
+pub fn set_symlink_file_times<P>(p: P, atime: FileTime, mtime: FileTime) -> io::Result<()>
+where
+    P: AsRef<Path>,
 {
     imp::set_symlink_file_times(p.as_ref(), atime, mtime)
 }
 
+/// Set the last modification time for a file on the filesystem.
+///
+/// This function will set the `mtime` metadata field for a file on the local
+/// filesystem, returning any error encountered.
+///
+/// # Platform support
+///
+/// Where supported this will attempt to issue just one syscall to update only
+/// the `mtime`, but where not supported this may issue one syscall to learn the
+/// existing `atime` so only the `mtime` can be configured.
+pub fn set_file_mtime<P>(p: P, mtime: FileTime) -> io::Result<()>
+where
+    P: AsRef<Path>,
+{
+    imp::set_file_mtime(p.as_ref(), mtime)
+}
+
+/// Set the last access time for a file on the filesystem.
+///
+/// This function will set the `atime` metadata field for a file on the local
+/// filesystem, returning any error encountered.
+///
+/// # Platform support
+///
+/// Where supported this will attempt to issue just one syscall to update only
+/// the `atime`, but where not supported this may issue one syscall to learn the
+/// existing `mtime` so only the `atime` can be configured.
+pub fn set_file_atime<P>(p: P, atime: FileTime) -> io::Result<()>
+where
+    P: AsRef<Path>,
+{
+    imp::set_file_atime(p.as_ref(), atime)
+}
+
 #[cfg(test)]
 mod tests {
-    extern crate tempdir;
-
+    use super::{set_file_handle_times, set_file_times, set_symlink_file_times, FileTime};
+    use std::fs::{self, File};
     use std::io;
     use std::path::Path;
-    use std::fs::{self, File};
-    use self::tempdir::TempDir;
-    use super::{FileTime, set_file_times, set_symlink_file_times};
     use std::time::{Duration, UNIX_EPOCH};
+    use tempfile::Builder;
 
     #[cfg(unix)]
-    fn make_symlink<P,Q>(src: P, dst: Q) -> io::Result<()>
-        where P: AsRef<Path>,
-              Q: AsRef<Path>,
+    fn make_symlink<P, Q>(src: P, dst: Q) -> io::Result<()>
+    where
+        P: AsRef<Path>,
+        Q: AsRef<Path>,
     {
         use std::os::unix::fs::symlink;
         symlink(src, dst)
     }
 
     #[cfg(windows)]
-    fn make_symlink<P,Q>(src: P, dst: Q) -> io::Result<()>
-        where P: AsRef<Path>,
-              Q: AsRef<Path>,
+    fn make_symlink<P, Q>(src: P, dst: Q) -> io::Result<()>
+    where
+        P: AsRef<Path>,
+        Q: AsRef<Path>,
     {
         use std::os::windows::fs::symlink_file;
         symlink_file(src, dst)
@@ -313,52 +382,71 @@ mod tests {
     }
 
     #[test]
-    fn set_file_times_test() {
-        let td = TempDir::new("filetime").unwrap();
+    fn set_file_times_test() -> io::Result<()> {
+        let td = Builder::new().prefix("filetime").tempdir()?;
         let path = td.path().join("foo.txt");
-        File::create(&path).unwrap();
+        let mut f = File::create(&path)?;
 
-        let metadata = fs::metadata(&path).unwrap();
+        let metadata = fs::metadata(&path)?;
         let mtime = FileTime::from_last_modification_time(&metadata);
         let atime = FileTime::from_last_access_time(&metadata);
-        set_file_times(&path, atime, mtime).unwrap();
+        set_file_times(&path, atime, mtime)?;
 
         let new_mtime = FileTime::from_unix_time(10_000, 0);
-        set_file_times(&path, atime, new_mtime).unwrap();
+        set_file_times(&path, atime, new_mtime)?;
 
-        let metadata = fs::metadata(&path).unwrap();
+        let metadata = fs::metadata(&path)?;
         let mtime = FileTime::from_last_modification_time(&metadata);
-        assert_eq!(mtime, new_mtime);
+        assert_eq!(mtime, new_mtime, "modification should be updated");
+
+        // Update just mtime
+        let new_mtime = FileTime::from_unix_time(20_000, 0);
+        set_file_handle_times(&mut f, None, Some(new_mtime))?;
+        let metadata = f.metadata()?;
+        let mtime = FileTime::from_last_modification_time(&metadata);
+        assert_eq!(mtime, new_mtime, "modification time should be updated");
+        let new_atime = FileTime::from_last_access_time(&metadata);
+        assert_eq!(atime, new_atime, "accessed time should not be updated");
+
+        // Update just atime
+        let new_atime = FileTime::from_unix_time(30_000, 0);
+        set_file_handle_times(&mut f, Some(new_atime), None)?;
+        let metadata = f.metadata()?;
+        let mtime = FileTime::from_last_modification_time(&metadata);
+        assert_eq!(mtime, new_mtime, "modification time should not be updated");
+        let atime = FileTime::from_last_access_time(&metadata);
+        assert_eq!(atime, new_atime, "accessed time should be updated");
 
         let spath = td.path().join("bar.txt");
-        make_symlink(&path, &spath).unwrap();
-        let metadata = fs::symlink_metadata(&spath).unwrap();
+        make_symlink(&path, &spath)?;
+        let metadata = fs::symlink_metadata(&spath)?;
         let smtime = FileTime::from_last_modification_time(&metadata);
 
-        set_file_times(&spath, atime, mtime).unwrap();
+        set_file_times(&spath, atime, mtime)?;
 
-        let metadata = fs::metadata(&path).unwrap();
+        let metadata = fs::metadata(&path)?;
         let cur_mtime = FileTime::from_last_modification_time(&metadata);
         assert_eq!(mtime, cur_mtime);
 
-        let metadata = fs::symlink_metadata(&spath).unwrap();
+        let metadata = fs::symlink_metadata(&spath)?;
         let cur_mtime = FileTime::from_last_modification_time(&metadata);
         assert_eq!(smtime, cur_mtime);
 
-        set_file_times(&spath, atime, new_mtime).unwrap();
+        set_file_times(&spath, atime, new_mtime)?;
 
-        let metadata = fs::metadata(&path).unwrap();
+        let metadata = fs::metadata(&path)?;
         let mtime = FileTime::from_last_modification_time(&metadata);
         assert_eq!(mtime, new_mtime);
 
-        let metadata = fs::symlink_metadata(&spath).unwrap();
+        let metadata = fs::symlink_metadata(&spath)?;
         let mtime = FileTime::from_last_modification_time(&metadata);
         assert_eq!(mtime, smtime);
+        Ok(())
     }
 
     #[test]
     fn set_file_times_pre_unix_epoch_test() {
-        let td = TempDir::new("filetime").unwrap();
+        let td = Builder::new().prefix("filetime").tempdir().unwrap();
         let path = td.path().join("foo.txt");
         File::create(&path).unwrap();
 
@@ -378,7 +466,7 @@ mod tests {
     #[test]
     #[cfg(windows)]
     fn set_file_times_pre_windows_epoch_test() {
-        let td = TempDir::new("filetime").unwrap();
+        let td = Builder::new().prefix("filetime").tempdir().unwrap();
         let path = td.path().join("foo.txt");
         File::create(&path).unwrap();
 
@@ -393,7 +481,7 @@ mod tests {
 
     #[test]
     fn set_symlink_file_times_test() {
-        let td = TempDir::new("filetime").unwrap();
+        let td = Builder::new().prefix("filetime").tempdir().unwrap();
         let path = td.path().join("foo.txt");
         File::create(&path).unwrap();
 
@@ -432,4 +520,42 @@ mod tests {
         let mtime = FileTime::from_last_modification_time(&metadata);
         assert_eq!(mtime, new_smtime);
     }
+
+    #[test]
+    fn set_single_time_test() {
+        use super::{set_file_atime, set_file_mtime};
+
+        let td = Builder::new().prefix("filetime").tempdir().unwrap();
+        let path = td.path().join("foo.txt");
+        File::create(&path).unwrap();
+
+        let metadata = fs::metadata(&path).unwrap();
+        let mtime = FileTime::from_last_modification_time(&metadata);
+        let atime = FileTime::from_last_access_time(&metadata);
+        set_file_times(&path, atime, mtime).unwrap();
+
+        let new_mtime = FileTime::from_unix_time(10_000, 0);
+        set_file_mtime(&path, new_mtime).unwrap();
+
+        let metadata = fs::metadata(&path).unwrap();
+        let mtime = FileTime::from_last_modification_time(&metadata);
+        assert_eq!(mtime, new_mtime, "modification time should be updated");
+        assert_eq!(
+            atime,
+            FileTime::from_last_access_time(&metadata),
+            "access time should not be updated",
+        );
+
+        let new_atime = FileTime::from_unix_time(20_000, 0);
+        set_file_atime(&path, new_atime).unwrap();
+
+        let metadata = fs::metadata(&path).unwrap();
+        let atime = FileTime::from_last_access_time(&metadata);
+        assert_eq!(atime, new_atime, "access time should be updated");
+        assert_eq!(
+            mtime,
+            FileTime::from_last_modification_time(&metadata),
+            "modification time should not be updated"
+        );
+    }
 }
diff --git a/vendor/filetime/src/redox.rs b/vendor/filetime/src/redox.rs
index 1fb7f56136..da2408a4c1 100644
--- a/vendor/filetime/src/redox.rs
+++ b/vendor/filetime/src/redox.rs
@@ -1,11 +1,8 @@
-extern crate syscall;
-
-use std::fs;
+use std::fs::{self, File};
 use std::io;
 use std::os::unix::prelude::*;
 use std::path::Path;
-
-use FileTime;
+use crate::FileTime;
 
 pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
     let fd = syscall::open(p.as_os_str().as_bytes(), 0)
@@ -13,6 +10,22 @@ pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<
     set_file_times_redox(fd, atime, mtime)
 }
 
+pub fn set_file_mtime(_p: &Path, _mtime: FileTime) -> io::Result<()> {
+    unimplemented!()
+}
+
+pub fn set_file_atime(_p: &Path, _atime: FileTime) -> io::Result<()> {
+    unimplemented!()
+}
+
+pub fn set_file_handle_times(
+    _f: &File,
+    _atime: Option<FileTime>,
+    _mtime: Option<FileTime>,
+) -> io::Result<()> {
+    unimplemented!()
+}
+
 pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
     let fd = syscall::open(p.as_os_str().as_bytes(), syscall::O_NOFOLLOW)
         .map_err(|err| io::Error::from_raw_os_error(err.errno))?;
@@ -20,7 +33,7 @@ pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io:
 }
 
 fn set_file_times_redox(fd: usize, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    use self::syscall::TimeSpec;
+    use syscall::TimeSpec;
 
     fn to_timespec(ft: &FileTime) -> TimeSpec {
         TimeSpec {
diff --git a/vendor/filetime/src/unix/linux.rs b/vendor/filetime/src/unix/linux.rs
index d378c9e72c..c803e02171 100644
--- a/vendor/filetime/src/unix/linux.rs
+++ b/vendor/filetime/src/unix/linux.rs
@@ -2,61 +2,101 @@
 //! always available so we also fall back to `utimes` if we couldn't find
 //! `utimensat` at runtime.
 
+use crate::FileTime;
+use std::ffi::CString;
+use std::fs;
 use std::io;
-use std::mem;
+use std::os::unix::prelude::*;
 use std::path::Path;
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
-use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT};
-
-use FileTime;
-use super::libc::{self, c_int, c_char, timespec};
+use std::ptr;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::Ordering::SeqCst;
 
 pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    set_times(p, atime, mtime, false)
+    set_times(p, Some(atime), Some(mtime), false)
 }
 
-pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    set_times(p, atime, mtime, true)
+pub fn set_file_mtime(p: &Path, mtime: FileTime) -> io::Result<()> {
+    set_times(p, None, Some(mtime), false)
+}
+
+pub fn set_file_atime(p: &Path, atime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), None, false)
 }
 
-fn set_times(p: &Path, atime: FileTime, mtime: FileTime, symlink: bool) -> io::Result<()> {
-    let flags = if symlink { libc::AT_SYMLINK_NOFOLLOW } else { 0 };
-    let utimes = if symlink { libc::lutimes } else { libc::utimes };
-
-    // Try to use the more-accurate `utimensat` when possible.
-    static INVALID: AtomicBool = ATOMIC_BOOL_INIT;
-    if !INVALID.load(Ordering::SeqCst) {
-        if let Some(f) = utimensat() {
-            // Even when libc has `utimensat`, the kernel may return `ENOSYS`,
-            // and then we'll need to use the `utimes` fallback instead.
-            match super::utimensat(p, atime, mtime, f, flags) {
-                Err(ref e) if e.raw_os_error() == Some(libc::ENOSYS) => {
-                    INVALID.store(true, Ordering::SeqCst);
-                }
-                valid => return valid,
-            }
+pub fn set_file_handle_times(
+    f: &fs::File,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+) -> io::Result<()> {
+    // Attempt to use the `utimensat` syscall, but if it's not supported by the
+    // current kernel then fall back to an older syscall.
+    static INVALID: AtomicBool = AtomicBool::new(false);
+    if !INVALID.load(SeqCst) {
+        let times = [super::to_timespec(&atime), super::to_timespec(&mtime)];
+        let rc = unsafe {
+            libc::syscall(
+                libc::SYS_utimensat,
+                f.as_raw_fd(),
+                ptr::null::<libc::c_char>(),
+                times.as_ptr(),
+                0,
+            )
+        };
+        if rc == 0 {
+            return Ok(());
+        }
+        let err = io::Error::last_os_error();
+        if err.raw_os_error() == Some(libc::ENOSYS) {
+            INVALID.store(true, SeqCst);
+        } else {
+            return Err(err);
         }
     }
 
-    super::utimes(p, atime, mtime, utimes)
+    super::utimes::set_file_handle_times(f, atime, mtime)
 }
 
-fn utimensat() -> Option<unsafe extern fn(c_int, *const c_char, *const timespec, c_int) -> c_int> {
-    static ADDR: AtomicUsize = ATOMIC_USIZE_INIT;
-    unsafe {
-        match ADDR.load(Ordering::SeqCst) {
-            0 => {}
-            1 => return None,
-            n => return Some(mem::transmute(n)),
+pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), Some(mtime), true)
+}
+
+fn set_times(
+    p: &Path,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+    symlink: bool,
+) -> io::Result<()> {
+    let flags = if symlink {
+        libc::AT_SYMLINK_NOFOLLOW
+    } else {
+        0
+    };
+
+    // Same as the `if` statement above.
+    static INVALID: AtomicBool = AtomicBool::new(false);
+    if !INVALID.load(SeqCst) {
+        let p = CString::new(p.as_os_str().as_bytes())?;
+        let times = [super::to_timespec(&atime), super::to_timespec(&mtime)];
+        let rc = unsafe {
+            libc::syscall(
+                libc::SYS_utimensat,
+                libc::AT_FDCWD,
+                p.as_ptr(),
+                times.as_ptr(),
+                flags,
+            )
+        };
+        if rc == 0 {
+            return Ok(());
         }
-        let name = b"utimensat\0";
-        let sym = libc::dlsym(libc::RTLD_DEFAULT, name.as_ptr() as *const _);
-        let (val, ret) = if sym.is_null() {
-            (1, None)
+        let err = io::Error::last_os_error();
+        if err.raw_os_error() == Some(libc::ENOSYS) {
+            INVALID.store(true, SeqCst);
         } else {
-            (sym as usize, Some(mem::transmute(sym)))
-        };
-        ADDR.store(val, Ordering::SeqCst);
-        return ret
+            return Err(err);
+        }
     }
+
+    super::utimes::set_times(p, atime, mtime, symlink)
 }
diff --git a/vendor/filetime/src/unix/macos.rs b/vendor/filetime/src/unix/macos.rs
new file mode 100644
index 0000000000..03029a197e
--- /dev/null
+++ b/vendor/filetime/src/unix/macos.rs
@@ -0,0 +1,110 @@
+//! Beginning with MacOS 10.3, `utimensat` is supported by the MacOS, so here, we check if the symbol exists
+//! and if not, we fallabck to `utimes`.
+use crate::FileTime;
+use libc::{c_char, c_int, timespec};
+use std::ffi::{CString, CStr};
+use std::fs::File;
+use std::os::unix::prelude::*;
+use std::path::Path;
+use std::sync::atomic::Ordering::SeqCst;
+use std::sync::atomic::AtomicUsize;
+use std::{io, mem};
+
+pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), Some(mtime), false)
+}
+
+pub fn set_file_mtime(p: &Path, mtime: FileTime) -> io::Result<()> {
+    set_times(p, None, Some(mtime), false)
+}
+
+pub fn set_file_atime(p: &Path, atime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), None, false)
+}
+
+pub fn set_file_handle_times(
+    f: &File,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+) -> io::Result<()> {
+    // Attempt to use the `futimens` syscall, but if it's not supported by the
+    // current kernel then fall back to an older syscall.
+    if let Some(func) = futimens() {
+        let times = [super::to_timespec(&atime), super::to_timespec(&mtime)];
+        let rc = unsafe { func(f.as_raw_fd(), times.as_ptr()) };
+        if rc == 0 {
+            return Ok(());
+        } else {
+            return Err(io::Error::last_os_error());
+        }
+    }
+
+    super::utimes::set_file_handle_times(f, atime, mtime)
+}
+
+pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), Some(mtime), true)
+}
+
+fn set_times(
+    p: &Path,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+    symlink: bool,
+) -> io::Result<()> {
+    // Attempt to use the `utimensat` syscall, but if it's not supported by the
+    // current kernel then fall back to an older syscall.
+    if let Some(func) = utimensat() {
+        let flags = if symlink {
+            libc::AT_SYMLINK_NOFOLLOW
+        } else {
+            0
+        };
+
+        let p = CString::new(p.as_os_str().as_bytes())?;
+        let times = [super::to_timespec(&atime), super::to_timespec(&mtime)];
+        let rc = unsafe { func(libc::AT_FDCWD, p.as_ptr(), times.as_ptr(), flags) };
+        if rc == 0 {
+            return Ok(());
+        } else {
+            return Err(io::Error::last_os_error());
+        }
+    }
+
+    super::utimes::set_times(p, atime, mtime, symlink)
+}
+
+fn utimensat() -> Option<unsafe extern "C" fn(c_int, *const c_char, *const timespec, c_int) -> c_int>
+{
+    static ADDR: AtomicUsize = AtomicUsize::new(0);
+    unsafe {
+        fetch(&ADDR, CStr::from_bytes_with_nul_unchecked(b"utimensat\0"))
+            .map(|sym| mem::transmute(sym))
+    }
+}
+
+fn futimens() -> Option<unsafe extern "C" fn(c_int, *const timespec) -> c_int> {
+    static ADDR: AtomicUsize = AtomicUsize::new(0);
+    unsafe {
+        fetch(&ADDR, CStr::from_bytes_with_nul_unchecked(b"futimens\0"))
+            .map(|sym| mem::transmute(sym))
+    }
+}
+
+fn fetch(cache: &AtomicUsize, name: &CStr) -> Option<usize> {
+    match cache.load(SeqCst) {
+        0 => {}
+        1 => return None,
+        n => return Some(n),
+    }
+    let sym = unsafe {
+        libc::dlsym(libc::RTLD_DEFAULT, name.as_ptr() as *const _)
+    };
+    let (val, ret) = if sym.is_null() {
+        (1, None)
+    } else {
+        (sym as usize, Some(sym as usize))
+    };
+    cache.store(val, SeqCst);
+    return ret;
+}
diff --git a/vendor/filetime/src/unix/mod.rs b/vendor/filetime/src/unix/mod.rs
index 9c28aa4864..37bf792f67 100644
--- a/vendor/filetime/src/unix/mod.rs
+++ b/vendor/filetime/src/unix/mod.rs
@@ -1,26 +1,22 @@
-extern crate libc;
-
-use std::ffi::CString;
+use crate::FileTime;
+use libc::{time_t, timespec};
 use std::fs;
-use std::io;
 use std::os::unix::prelude::*;
-use std::path::Path;
-
-use self::libc::{c_int, c_char, timeval, time_t, suseconds_t};
-use self::libc::{timespec};
 
-use FileTime;
-
-cfg_if! {
+cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
+        mod utimes;
         mod linux;
         pub use self::linux::*;
-    // netbsd, openbsd and freebsd should use utimensat, but the call is not
-    // in the latest rust libc (0.2.43). as soon as a new version is available
-    // these target_os'es should be added back in.
+    } else if #[cfg(target_os = "macos")] {
+        mod utimes;
+        mod macos;
+        pub use self::macos::*;
     } else if #[cfg(any(target_os = "android",
                         target_os = "solaris",
                         target_os = "emscripten",
+                        target_os = "freebsd",
+                        target_os = "netbsd",
                         target_os = "openbsd"))] {
         mod utimensat;
         pub use self::utimensat::*;
@@ -31,52 +27,26 @@ cfg_if! {
 }
 
 #[allow(dead_code)]
-fn utimes(p: &Path,
-          atime: FileTime,
-          mtime: FileTime,
-          utimes: unsafe extern fn(*const c_char, *const timeval) -> c_int)
-    -> io::Result<()>
-{
-    let times = [to_timeval(&atime), to_timeval(&mtime)];
-    let p = try!(CString::new(p.as_os_str().as_bytes()));
-    return if unsafe { utimes(p.as_ptr() as *const _, times.as_ptr()) == 0 } {
-        Ok(())
-    } else {
-        Err(io::Error::last_os_error())
-    };
-
-    fn to_timeval(ft: &FileTime) -> timeval {
-        timeval {
-            tv_sec: ft.seconds() as time_t,
-            tv_usec: (ft.nanoseconds() / 1000) as suseconds_t,
+fn to_timespec(ft: &Option<FileTime>) -> timespec {
+    cfg_if::cfg_if! {
+        if #[cfg(target_os = "macos")] {
+            // https://github.com/apple/darwin-xnu/blob/a449c6a3b8014d9406c2ddbdc81795da24aa7443/bsd/sys/stat.h#L541
+            const UTIME_OMIT: i64 = -2;
+        } else {
+            const UTIME_OMIT: i64 = 1_073_741_822;
         }
     }
-}
-
-#[allow(dead_code)]
-fn utimensat(p: &Path,
-             atime: FileTime,
-             mtime: FileTime,
-             f: unsafe extern fn(c_int, *const c_char, *const timespec, c_int) -> c_int,
-             flags: c_int)
-    -> io::Result<()>
-{
-    let times = [to_timespec(&atime), to_timespec(&mtime)];
-    let p = try!(CString::new(p.as_os_str().as_bytes()));
-    let rc = unsafe {
-        f(libc::AT_FDCWD, p.as_ptr() as *const _, times.as_ptr(), flags)
-    };
-    return if rc == 0 {
-        Ok(())
-    } else {
-        Err(io::Error::last_os_error())
-    };
 
-    fn to_timespec(ft: &FileTime) -> timespec {
+    if let &Some(ft) = ft {
         timespec {
             tv_sec: ft.seconds() as time_t,
             tv_nsec: ft.nanoseconds() as _,
         }
+    } else {
+        timespec {
+            tv_sec: 0,
+            tv_nsec: UTIME_OMIT as _,
+        }
     }
 }
 
diff --git a/vendor/filetime/src/unix/utimensat.rs b/vendor/filetime/src/unix/utimensat.rs
index 47969fa0f8..42a1ada2c5 100644
--- a/vendor/filetime/src/unix/utimensat.rs
+++ b/vendor/filetime/src/unix/utimensat.rs
@@ -1,13 +1,58 @@
-use std::path::Path;
+use crate::FileTime;
+use std::ffi::CString;
+use std::fs::File;
 use std::io;
-
-use FileTime;
-use super::libc;
+use std::os::unix::prelude::*;
+use std::path::Path;
 
 pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    super::utimensat(p, atime, mtime, libc::utimensat, 0)
+    set_times(p, Some(atime), Some(mtime), false)
+}
+
+pub fn set_file_mtime(p: &Path, mtime: FileTime) -> io::Result<()> {
+    set_times(p, None, Some(mtime), false)
+}
+
+pub fn set_file_atime(p: &Path, atime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), None, false)
+}
+
+pub fn set_file_handle_times(
+    f: &File,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+) -> io::Result<()> {
+    let times = [super::to_timespec(&atime), super::to_timespec(&mtime)];
+    let rc = unsafe { libc::futimens(f.as_raw_fd(), times.as_ptr()) };
+    if rc == 0 {
+        Ok(())
+    } else {
+        Err(io::Error::last_os_error())
+    }
 }
 
 pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    super::utimensat(p, atime, mtime, libc::utimensat, libc::AT_SYMLINK_NOFOLLOW)
+    set_times(p, Some(atime), Some(mtime), false)
+}
+
+fn set_times(
+    p: &Path,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+    symlink: bool,
+) -> io::Result<()> {
+    let flags = if symlink {
+        libc::AT_SYMLINK_NOFOLLOW
+    } else {
+        0
+    };
+
+    let p = CString::new(p.as_os_str().as_bytes())?;
+    let times = [super::to_timespec(&atime), super::to_timespec(&mtime)];
+    let rc = unsafe { libc::utimensat(libc::AT_FDCWD, p.as_ptr(), times.as_ptr(), flags) };
+    if rc == 0 {
+        Ok(())
+    } else {
+        Err(io::Error::last_os_error())
+    }
 }
diff --git a/vendor/filetime/src/unix/utimes.rs b/vendor/filetime/src/unix/utimes.rs
index 6ec12f76b2..c3de5fd871 100644
--- a/vendor/filetime/src/unix/utimes.rs
+++ b/vendor/filetime/src/unix/utimes.rs
@@ -1,13 +1,98 @@
-use std::path::Path;
+use crate::FileTime;
+use std::ffi::CString;
+use std::fs;
 use std::io;
+use std::os::unix::prelude::*;
+use std::path::Path;
 
-use FileTime;
-use super::libc;
-
+#[allow(dead_code)]
 pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    super::utimes(p, atime, mtime, libc::utimes)
+    set_times(p, Some(atime), Some(mtime), false)
+}
+
+#[allow(dead_code)]
+pub fn set_file_mtime(p: &Path, mtime: FileTime) -> io::Result<()> {
+    set_times(p, None, Some(mtime), false)
+}
+
+#[allow(dead_code)]
+pub fn set_file_atime(p: &Path, atime: FileTime) -> io::Result<()> {
+    set_times(p, Some(atime), None, false)
 }
 
+#[allow(dead_code)]
+pub fn set_file_handle_times(
+    f: &fs::File,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+) -> io::Result<()> {
+    let (atime, mtime) = match get_times(atime, mtime, || f.metadata())? {
+        Some(pair) => pair,
+        None => return Ok(()),
+    };
+    let times = [to_timeval(&atime), to_timeval(&mtime)];
+    let rc = unsafe { libc::futimes(f.as_raw_fd(), times.as_ptr()) };
+    return if rc == 0 {
+        Ok(())
+    } else {
+        Err(io::Error::last_os_error())
+    };
+}
+
+fn get_times(
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+    current: impl FnOnce() -> io::Result<fs::Metadata>,
+) -> io::Result<Option<(FileTime, FileTime)>> {
+    let pair = match (atime, mtime) {
+        (Some(a), Some(b)) => (a, b),
+        (None, None) => return Ok(None),
+        (Some(a), None) => {
+            let meta = current()?;
+            (a, FileTime::from_last_modification_time(&meta))
+        }
+        (None, Some(b)) => {
+            let meta = current()?;
+            (FileTime::from_last_access_time(&meta), b)
+        }
+    };
+    Ok(Some(pair))
+}
+
+#[allow(dead_code)]
 pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    super::utimes(p, atime, mtime, libc::lutimes)
+    set_times(p, Some(atime), Some(mtime), true)
+}
+
+pub fn set_times(
+    p: &Path,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+    symlink: bool,
+) -> io::Result<()> {
+    let (atime, mtime) = match get_times(atime, mtime, || p.metadata())? {
+        Some(pair) => pair,
+        None => return Ok(()),
+    };
+    let p = CString::new(p.as_os_str().as_bytes())?;
+    let times = [to_timeval(&atime), to_timeval(&mtime)];
+    let rc = unsafe {
+        if symlink {
+            libc::lutimes(p.as_ptr(), times.as_ptr())
+        } else {
+            libc::utimes(p.as_ptr(), times.as_ptr())
+        }
+    };
+    return if rc == 0 {
+        Ok(())
+    } else {
+        Err(io::Error::last_os_error())
+    };
+}
+
+fn to_timeval(ft: &FileTime) -> libc::timeval {
+    libc::timeval {
+        tv_sec: ft.seconds() as libc::time_t,
+        tv_usec: (ft.nanoseconds() / 1000) as libc::suseconds_t,
+    }
 }
diff --git a/vendor/filetime/src/wasm.rs b/vendor/filetime/src/wasm.rs
new file mode 100644
index 0000000000..4a7a5bbb79
--- /dev/null
+++ b/vendor/filetime/src/wasm.rs
@@ -0,0 +1,40 @@
+use crate::FileTime;
+use std::fs::{self, File};
+use std::io;
+use std::path::Path;
+
+pub fn set_file_times(_p: &Path, _atime: FileTime, _mtime: FileTime) -> io::Result<()> {
+    Err(io::Error::new(io::ErrorKind::Other, "Wasm not implemented"))
+}
+
+pub fn set_symlink_file_times(_p: &Path, _atime: FileTime, _mtime: FileTime) -> io::Result<()> {
+    Err(io::Error::new(io::ErrorKind::Other, "Wasm not implemented"))
+}
+
+pub fn set_file_mtime(_p: &Path, _mtime: FileTime) -> io::Result<()> {
+    Err(io::Error::new(io::ErrorKind::Other, "Wasm not implemented"))
+}
+
+pub fn set_file_atime(_p: &Path, _atime: FileTime) -> io::Result<()> {
+    Err(io::Error::new(io::ErrorKind::Other, "Wasm not implemented"))
+}
+
+pub fn from_last_modification_time(_meta: &fs::Metadata) -> FileTime {
+    unimplemented!()
+}
+
+pub fn from_last_access_time(_meta: &fs::Metadata) -> FileTime {
+    unimplemented!()
+}
+
+pub fn from_creation_time(_meta: &fs::Metadata) -> Option<FileTime> {
+    unimplemented!()
+}
+
+pub fn set_file_handle_times(
+    _f: &File,
+    _atime: Option<FileTime>,
+    _mtime: Option<FileTime>,
+) -> io::Result<()> {
+    Err(io::Error::new(io::ErrorKind::Other, "Wasm not implemented"))
+}
diff --git a/vendor/filetime/src/windows.rs b/vendor/filetime/src/windows.rs
index 16a979cfb2..acd4792fa2 100644
--- a/vendor/filetime/src/windows.rs
+++ b/vendor/filetime/src/windows.rs
@@ -1,53 +1,48 @@
-#![allow(bad_style)]
-
-use std::fs::{self, OpenOptions};
+use crate::FileTime;
+use std::fs::{self, File, OpenOptions};
 use std::io;
 use std::os::windows::prelude::*;
 use std::path::Path;
-
-use FileTime;
+use std::ptr;
+use winapi::shared::minwindef::*;
+use winapi::um::fileapi::*;
+use winapi::um::winbase::*;
 
 pub fn set_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    set_file_times_w(p, atime, mtime, OpenOptions::new())
+    let f = OpenOptions::new().write(true).open(p)?;
+    set_file_handle_times(&f, Some(atime), Some(mtime))
 }
 
-pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
-    use std::os::windows::fs::OpenOptionsExt;
-    const FILE_FLAG_OPEN_REPARSE_POINT: u32 = 0x00200000;
-
-    let mut options = OpenOptions::new();
-    options.custom_flags(FILE_FLAG_OPEN_REPARSE_POINT);
-    set_file_times_w(p, atime, mtime, options)
+pub fn set_file_mtime(p: &Path, mtime: FileTime) -> io::Result<()> {
+    let f = OpenOptions::new().write(true).open(p)?;
+    set_file_handle_times(&f, None, Some(mtime))
 }
 
-pub fn set_file_times_w(p: &Path,
-                        atime: FileTime,
-                        mtime: FileTime,
-                        mut options: OpenOptions) -> io::Result<()> {
-    type BOOL = i32;
-    type HANDLE = *mut u8;
-    type DWORD = u32;
-
-    #[repr(C)]
-    struct FILETIME {
-        dwLowDateTime: u32,
-        dwHighDateTime: u32,
-    }
-
-    extern "system" {
-        fn SetFileTime(hFile: HANDLE,
-                       lpCreationTime: *const FILETIME,
-                       lpLastAccessTime: *const FILETIME,
-                       lpLastWriteTime: *const FILETIME) -> BOOL;
-    }
+pub fn set_file_atime(p: &Path, atime: FileTime) -> io::Result<()> {
+    let f = OpenOptions::new().write(true).open(p)?;
+    set_file_handle_times(&f, Some(atime), None)
+}
 
-    let f = try!(options.write(true).open(p));
-    let atime = to_filetime(&atime);
-    let mtime = to_filetime(&mtime);
+pub fn set_file_handle_times(
+    f: &File,
+    atime: Option<FileTime>,
+    mtime: Option<FileTime>,
+) -> io::Result<()> {
+    let atime = atime.map(to_filetime);
+    let mtime = mtime.map(to_filetime);
     return unsafe {
-        let ret = SetFileTime(f.as_raw_handle() as *mut _,
-                              0 as *const _,
-                              &atime, &mtime);
+        let ret = SetFileTime(
+            f.as_raw_handle() as *mut _,
+            ptr::null(),
+            atime
+                .as_ref()
+                .map(|p| p as *const FILETIME)
+                .unwrap_or(ptr::null()),
+            mtime
+                .as_ref()
+                .map(|p| p as *const FILETIME)
+                .unwrap_or(ptr::null()),
+        );
         if ret != 0 {
             Ok(())
         } else {
@@ -55,9 +50,8 @@ pub fn set_file_times_w(p: &Path,
         }
     };
 
-    fn to_filetime(ft: &FileTime) -> FILETIME {
-        let intervals = ft.seconds() * (1_000_000_000 / 100) +
-                        ((ft.nanoseconds() as i64) / 100);
+    fn to_filetime(ft: FileTime) -> FILETIME {
+        let intervals = ft.seconds() * (1_000_000_000 / 100) + ((ft.nanoseconds() as i64) / 100);
         FILETIME {
             dwLowDateTime: intervals as DWORD,
             dwHighDateTime: (intervals >> 32) as DWORD,
@@ -65,6 +59,16 @@ pub fn set_file_times_w(p: &Path,
     }
 }
 
+pub fn set_symlink_file_times(p: &Path, atime: FileTime, mtime: FileTime) -> io::Result<()> {
+    use std::os::windows::fs::OpenOptionsExt;
+
+    let f = OpenOptions::new()
+        .write(true)
+        .custom_flags(FILE_FLAG_OPEN_REPARSE_POINT)
+        .open(p)?;
+    set_file_handle_times(&f, Some(atime), Some(mtime))
+}
+
 pub fn from_last_modification_time(meta: &fs::Metadata) -> FileTime {
     from_intervals(meta.last_write_time())
 }
diff --git a/vendor/ignore/.cargo-checksum.json b/vendor/ignore/.cargo-checksum.json
index d24053ced4..4ed95a7961 100644
--- a/vendor/ignore/.cargo-checksum.json
+++ b/vendor/ignore/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.lock":"25c22e0685537d911315e4c2a1a50fd1d1853bb65b5f6f0613ff1b520e48f22e","Cargo.toml":"40ecb88b28bdd94507f39da3aca81d132a7016c8974cafacd9573c23d704025f","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"c0af54e110652d9519a0bbb92cebdab956cac1b6638fee313a38c346022f292f","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","examples/walk.rs":"d93675825e3ef9dd45e1a514c69e73aaad6b3803514b074a0b34f22776bed7f7","src/dir.rs":"824e6542acff61b6074eb0bd27245c1e2356646975734acf5eda440c5a70b3de","src/gitignore.rs":"9399e1fc1323db8cfb81fbcd24f3d4eebf0ad25a0cc70937a9a592f4e6305e7c","src/lib.rs":"9144c502e1ea862c7676e49adbe0898f501e15b2dc1b9048b9de380baf4070b1","src/overrides.rs":"b70832b34bc8a63d43ba78ff246a8a56da9d3b7ca0874684d0dd00d89b1170df","src/pathutil.rs":"8d216f7274f150a6f6dde1b607cbbcd943860216b7e10f4c81b29cf5aa744f67","src/types.rs":"3d3d29bfdd2d47e9125e2a89a594893ef14d818c244e31dfb065e183ddd6b6d6","src/walk.rs":"6516708d91e6bd07a5a337a0a3e6731d28e787831a664d59db50b39fa82d12fe","tests/gitignore_matched_path_or_any_parents_tests.gitignore":"3895c935f76a57928cc12284dfff406693b7666c0ffce9b8676c6c1976debe2d","tests/gitignore_matched_path_or_any_parents_tests.rs":"e44a7cc7b5a9fedee6d4d17fdcfb40ffb6f8fb7a8b8ca450d2fecd4612afc692"},"package":"0ec16832258409d571aaef8273f3c3cc5b060d784e159d1a0f3b0017308f84a7"}
\ No newline at end of file
+{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.lock":"e0ba9a0f0a26ef430708487e26bda08f1be12848ca2497d4a3af5d1536313447","Cargo.toml":"663e2d1294398f0fedff29d01246925a1d4b40b79e7151193d53027456709651","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"c0af54e110652d9519a0bbb92cebdab956cac1b6638fee313a38c346022f292f","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","examples/walk.rs":"d93675825e3ef9dd45e1a514c69e73aaad6b3803514b074a0b34f22776bed7f7","src/dir.rs":"b1bb88be5971d0a645ffbad461c570509866cffa6072a062ef26b291573e6cf7","src/gitignore.rs":"890c4fd277dfdc5126c1d8d449d2519b301706ab18782e11b1f5b088361d961a","src/lib.rs":"9144c502e1ea862c7676e49adbe0898f501e15b2dc1b9048b9de380baf4070b1","src/overrides.rs":"b70832b34bc8a63d43ba78ff246a8a56da9d3b7ca0874684d0dd00d89b1170df","src/pathutil.rs":"8d216f7274f150a6f6dde1b607cbbcd943860216b7e10f4c81b29cf5aa744f67","src/types.rs":"5711b835951ddda91f01e066c55276ba0fd17e10898d53f50fab10ba29a05717","src/walk.rs":"c4bb6d1b6ab9f6a8c958aabf777d9dd146ad33b2bc75c9dc9698bfb08929d79e","tests/gitignore_matched_path_or_any_parents_tests.gitignore":"3895c935f76a57928cc12284dfff406693b7666c0ffce9b8676c6c1976debe2d","tests/gitignore_matched_path_or_any_parents_tests.rs":"e44a7cc7b5a9fedee6d4d17fdcfb40ffb6f8fb7a8b8ca450d2fecd4612afc692"},"package":"522daefc3b69036f80c7d2990b28ff9e0471c683bad05ca258e0a01dd22c5a1e"}
\ No newline at end of file
diff --git a/vendor/ignore/Cargo.lock b/vendor/ignore/Cargo.lock
index 7e13fb2bc8..7169b9364f 100644
--- a/vendor/ignore/Cargo.lock
+++ b/vendor/ignore/Cargo.lock
@@ -8,9 +8,14 @@ dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "autocfg"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "bstr"
-version = "0.2.6"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -18,24 +23,25 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -49,31 +55,31 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ignore"
-version = "0.4.10"
+version = "0.4.11"
 dependencies = [
- "crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -81,7 +87,7 @@ name = "log"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -91,18 +97,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex"
-version = "1.2.1"
+version = "1.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -115,10 +121,10 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "0.3.6"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -127,13 +133,13 @@ version = "2.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "winapi"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -150,7 +156,7 @@ name = "winapi-util"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -160,21 +166,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
 "checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-"checksum bstr 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e0a692f1c740e7e821ca71a22cf99b9b2322dfa94d10f71443befb1797b3946a"
-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
-"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+"checksum bstr 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3ede750122d9d1f87919570cb2cccee38c84fbc8c5599b25c289af40625b7030"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
+"checksum crossbeam-channel 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "acec9a3b0b3559f15aee4f90746c4e5e293b701c0f7d3925d24e01645267b68c"
+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26"
-"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f"
+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87"
+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum thread_local 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "88ddf1ad580c7e3d1efff877d972bcc93f995556b9087a5a259630985c88ceab"
 "checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml
index 17f925e1db..7d9f65b659 100644
--- a/vendor/ignore/Cargo.toml
+++ b/vendor/ignore/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "ignore"
-version = "0.4.10"
+version = "0.4.11"
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = "A fast library for efficiently matching ignore files such as `.gitignore`\nagainst file paths.\n"
 homepage = "https://github.com/BurntSushi/ripgrep/tree/master/ignore"
@@ -26,7 +26,7 @@ repository = "https://github.com/BurntSushi/ripgrep/tree/master/ignore"
 name = "ignore"
 bench = false
 [dependencies.crossbeam-channel]
-version = "0.3.6"
+version = "0.4.0"
 
 [dependencies.globset]
 version = "0.4.3"
@@ -47,7 +47,7 @@ version = "1.1"
 version = "1.0.4"
 
 [dependencies.thread_local]
-version = "0.3.6"
+version = "1"
 
 [dependencies.walkdir]
 version = "2.2.7"
diff --git a/vendor/ignore/src/dir.rs b/vendor/ignore/src/dir.rs
index 12201f2260..e4440fc467 100644
--- a/vendor/ignore/src/dir.rs
+++ b/vendor/ignore/src/dir.rs
@@ -14,13 +14,13 @@
 // well.
 
 use std::collections::HashMap;
-use std::ffi::{OsString, OsStr};
+use std::ffi::{OsStr, OsString};
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, RwLock};
 
 use gitignore::{self, Gitignore, GitignoreBuilder};
-use pathutil::{is_hidden, strip_prefix};
 use overrides::{self, Override};
+use pathutil::{is_hidden, strip_prefix};
 use types::{self, Types};
 use walk::DirEntry;
 use {Error, Match, PartialErrorBuilder};
@@ -152,10 +152,7 @@ impl Ignore {
     ///
     /// Note that this can only be called on an `Ignore` matcher with no
     /// parents (i.e., `is_root` returns `true`). This will panic otherwise.
-    pub fn add_parents<P: AsRef<Path>>(
-        &self,
-        path: P,
-    ) -> (Ignore, Option<Error>) {
+    pub fn add_parents<P: AsRef<Path>>(&self, path: P) -> (Ignore, Option<Error>) {
         if !self.0.opts.parents
             && !self.0.opts.git_ignore
             && !self.0.opts.git_exclude
@@ -197,12 +194,11 @@ impl Ignore {
             errs.maybe_push(err);
             igtmp.is_absolute_parent = true;
             igtmp.absolute_base = Some(absolute_base.clone());
-            igtmp.has_git =
-                if self.0.opts.git_ignore {
-                    parent.join(".git").exists()
-                } else {
-                    false
-                };
+            igtmp.has_git = if self.0.opts.git_ignore {
+                parent.join(".git").exists()
+            } else {
+                false
+            };
             ig = Ignore(Arc::new(igtmp));
             compiled.insert(parent.as_os_str().to_os_string(), ig.clone());
         }
@@ -217,10 +213,7 @@ impl Ignore {
     /// returned if it exists.
     ///
     /// Note that all I/O errors are completely ignored.
-    pub fn add_child<P: AsRef<Path>>(
-        &self,
-        dir: P,
-    ) -> (Ignore, Option<Error>) {
+    pub fn add_child<P: AsRef<Path>>(&self, dir: P) -> (Ignore, Option<Error>) {
         let (ig, err) = self.add_child_path(dir.as_ref());
         (Ignore(Arc::new(ig)), err)
     }
@@ -228,64 +221,49 @@ impl Ignore {
     /// Like add_child, but takes a full path and returns an IgnoreInner.
     fn add_child_path(&self, dir: &Path) -> (IgnoreInner, Option<Error>) {
         let mut errs = PartialErrorBuilder::default();
-        let custom_ig_matcher =
-            if self.0.custom_ignore_filenames.is_empty() {
-                Gitignore::empty()
-            } else {
-                let (m, err) =
-                    create_gitignore(
-                        &dir,
-                        &self.0.custom_ignore_filenames,
-                        self.0.opts.ignore_case_insensitive,
-                    );
-                errs.maybe_push(err);
-                m
-            };
-        let ig_matcher =
-            if !self.0.opts.ignore {
-                Gitignore::empty()
-            } else {
-                let (m, err) =
-                    create_gitignore(
-                        &dir,
-                        &[".ignore"],
-                        self.0.opts.ignore_case_insensitive,
-                    );
-                errs.maybe_push(err);
-                m
-            };
-        let gi_matcher =
-            if !self.0.opts.git_ignore {
-                Gitignore::empty()
-            } else {
-                let (m, err) =
-                    create_gitignore(
-                        &dir,
-                        &[".gitignore"],
-                        self.0.opts.ignore_case_insensitive,
-                    );
-                errs.maybe_push(err);
-                m
-            };
-        let gi_exclude_matcher =
-            if !self.0.opts.git_exclude {
-                Gitignore::empty()
-            } else {
-                let (m, err) =
-                    create_gitignore(
-                        &dir,
-                        &[".git/info/exclude"],
-                        self.0.opts.ignore_case_insensitive,
-                    );
-                errs.maybe_push(err);
-                m
-            };
-        let has_git =
-            if self.0.opts.git_ignore {
-                dir.join(".git").exists()
-            } else {
-                false
-            };
+        let custom_ig_matcher = if self.0.custom_ignore_filenames.is_empty() {
+            Gitignore::empty()
+        } else {
+            let (m, err) = create_gitignore(
+                &dir,
+                &self.0.custom_ignore_filenames,
+                self.0.opts.ignore_case_insensitive,
+            );
+            errs.maybe_push(err);
+            m
+        };
+        let ig_matcher = if !self.0.opts.ignore {
+            Gitignore::empty()
+        } else {
+            let (m, err) =
+                create_gitignore(&dir, &[".ignore"], self.0.opts.ignore_case_insensitive);
+            errs.maybe_push(err);
+            m
+        };
+        let gi_matcher = if !self.0.opts.git_ignore {
+            Gitignore::empty()
+        } else {
+            let (m, err) =
+                create_gitignore(&dir, &[".gitignore"], self.0.opts.ignore_case_insensitive);
+            errs.maybe_push(err);
+            m
+        };
+        let gi_exclude_matcher = if !self.0.opts.git_exclude {
+            Gitignore::empty()
+        } else {
+            let (m, err) = create_gitignore(
+                &dir,
+                &[".git/info/exclude"],
+                self.0.opts.ignore_case_insensitive,
+            );
+            errs.maybe_push(err);
+            m
+        };
+        let has_git = if self.0.opts.git_ignore {
+            dir.join(".git").exists()
+        } else {
+            false
+        };
         let ig = IgnoreInner {
             compiled: self.0.compiled.clone(),
             dir: dir.to_path_buf(),
@@ -313,16 +291,16 @@ impl Ignore {
         let has_custom_ignore_files = !self.0.custom_ignore_filenames.is_empty();
         let has_explicit_ignores = !self.0.explicit_ignores.is_empty();
 
-        opts.ignore || opts.git_global || opts.git_ignore
-                    || opts.git_exclude || has_custom_ignore_files
-                    || has_explicit_ignores
+        opts.ignore
+            || opts.git_global
+            || opts.git_ignore
+            || opts.git_exclude
+            || has_custom_ignore_files
+            || has_explicit_ignores
     }
 
     /// Like `matched`, but works with a directory entry instead.
-    pub fn matched_dir_entry<'a>(
-        &'a self,
-        dent: &DirEntry,
-    ) -> Match<IgnoreMatch<'a>> {
+    pub fn matched_dir_entry<'a>(&'a self, dent: &DirEntry) -> Match<IgnoreMatch<'a>> {
         let m = self.matched(dent.path(), dent.is_dir());
         if m.is_none() && self.0.opts.hidden && is_hidden(dent) {
             return Match::Ignore(IgnoreMatch::hidden());
@@ -334,11 +312,7 @@ impl Ignore {
     /// ignored or not.
     ///
     /// The match contains information about its origin.
-    fn matched<'a, P: AsRef<Path>>(
-        &'a self,
-        path: P,
-        is_dir: bool,
-    ) -> Match<IgnoreMatch<'a>> {
+    fn matched<'a, P: AsRef<Path>>(&'a self, path: P, is_dir: bool) -> Match<IgnoreMatch<'a>> {
         // We need to be careful with our path. If it has a leading ./, then
         // strip it because it causes nothing but trouble.
         let mut path = path.as_ref();
@@ -350,9 +324,11 @@ impl Ignore {
         // return that result immediately. Overrides have the highest
         // precedence.
         if !self.0.overrides.is_empty() {
-            let mat =
-                self.0.overrides.matched(path, is_dir)
-                    .map(IgnoreMatch::overrides);
+            let mat = self
+                .0
+                .overrides
+                .matched(path, is_dir)
+                .map(IgnoreMatch::overrides);
             if !mat.is_none() {
                 return mat;
             }
@@ -367,8 +343,7 @@ impl Ignore {
             }
         }
         if !self.0.types.is_empty() {
-            let mat =
-                self.0.types.matched(path, is_dir).map(IgnoreMatch::types);
+            let mat = self.0.types.matched(path, is_dir).map(IgnoreMatch::types);
             if mat.is_ignore() {
                 return mat;
             } else if mat.is_whitelist() {
@@ -380,61 +355,70 @@ impl Ignore {
 
     /// Performs matching only on the ignore files for this directory and
     /// all parent directories.
-    fn matched_ignore<'a>(
-        &'a self,
-        path: &Path,
-        is_dir: bool,
-    ) -> Match<IgnoreMatch<'a>> {
-        let (mut m_custom_ignore, mut m_ignore, mut m_gi, mut m_gi_exclude, mut m_explicit) =
-            (Match::None, Match::None, Match::None, Match::None, Match::None);
+    fn matched_ignore<'a>(&'a self, path: &Path, is_dir: bool) -> Match<IgnoreMatch<'a>> {
+        let (mut m_custom_ignore, mut m_ignore, mut m_gi, mut m_gi_exclude, mut m_explicit) = (
+            Match::None,
+            Match::None,
+            Match::None,
+            Match::None,
+            Match::None,
+        );
         let any_git = self.parents().any(|ig| ig.0.has_git);
         let mut saw_git = false;
         for ig in self.parents().take_while(|ig| !ig.0.is_absolute_parent) {
             if m_custom_ignore.is_none() {
                 m_custom_ignore =
-                    ig.0.custom_ignore_matcher.matched(path, is_dir)
-                      .map(IgnoreMatch::gitignore);
+                    ig.0.custom_ignore_matcher
+                        .matched(path, is_dir)
+                        .map(IgnoreMatch::gitignore);
             }
             if m_ignore.is_none() {
                 m_ignore =
-                    ig.0.ignore_matcher.matched(path, is_dir)
-                      .map(IgnoreMatch::gitignore);
+                    ig.0.ignore_matcher
+                        .matched(path, is_dir)
+                        .map(IgnoreMatch::gitignore);
             }
             if any_git && !saw_git && m_gi.is_none() {
                 m_gi =
-                    ig.0.git_ignore_matcher.matched(path, is_dir)
-                      .map(IgnoreMatch::gitignore);
+                    ig.0.git_ignore_matcher
+                        .matched(path, is_dir)
+                        .map(IgnoreMatch::gitignore);
             }
             if any_git && !saw_git && m_gi_exclude.is_none() {
                 m_gi_exclude =
-                    ig.0.git_exclude_matcher.matched(path, is_dir)
-                      .map(IgnoreMatch::gitignore);
+                    ig.0.git_exclude_matcher
+                        .matched(path, is_dir)
+                        .map(IgnoreMatch::gitignore);
             }
             saw_git = saw_git || ig.0.has_git;
         }
         if self.0.opts.parents {
             if let Some(abs_parent_path) = self.absolute_base() {
                 let path = abs_parent_path.join(path);
-                for ig in self.parents().skip_while(|ig|!ig.0.is_absolute_parent) {
+                for ig in self.parents().skip_while(|ig| !ig.0.is_absolute_parent) {
                     if m_custom_ignore.is_none() {
                         m_custom_ignore =
-                            ig.0.custom_ignore_matcher.matched(&path, is_dir)
-                              .map(IgnoreMatch::gitignore);
+                            ig.0.custom_ignore_matcher
+                                .matched(&path, is_dir)
+                                .map(IgnoreMatch::gitignore);
                     }
                     if m_ignore.is_none() {
                         m_ignore =
-                            ig.0.ignore_matcher.matched(&path, is_dir)
-                              .map(IgnoreMatch::gitignore);
+                            ig.0.ignore_matcher
+                                .matched(&path, is_dir)
+                                .map(IgnoreMatch::gitignore);
                     }
                     if any_git && !saw_git && m_gi.is_none() {
                         m_gi =
-                            ig.0.git_ignore_matcher.matched(&path, is_dir)
-                              .map(IgnoreMatch::gitignore);
+                            ig.0.git_ignore_matcher
+                                .matched(&path, is_dir)
+                                .map(IgnoreMatch::gitignore);
                     }
                     if any_git && !saw_git && m_gi_exclude.is_none() {
                         m_gi_exclude =
-                            ig.0.git_exclude_matcher.matched(&path, is_dir)
-                              .map(IgnoreMatch::gitignore);
+                            ig.0.git_exclude_matcher
+                                .matched(&path, is_dir)
+                                .map(IgnoreMatch::gitignore);
                     }
                     saw_git = saw_git || ig.0.has_git;
                 }
@@ -446,16 +430,21 @@ impl Ignore {
             }
             m_explicit = gi.matched(&path, is_dir).map(IgnoreMatch::gitignore);
         }
-        let m_global =
-            if any_git {
-                self.0.git_global_matcher
-                    .matched(&path, is_dir)
-                    .map(IgnoreMatch::gitignore)
-            } else {
-                Match::None
-            };
+        let m_global = if any_git {
+            self.0
+                .git_global_matcher
+                .matched(&path, is_dir)
+                .map(IgnoreMatch::gitignore)
+        } else {
+            Match::None
+        };
 
-        m_custom_ignore.or(m_ignore).or(m_gi).or(m_gi_exclude).or(m_global).or(m_explicit)
+        m_custom_ignore
+            .or(m_ignore)
+            .or(m_gi)
+            .or(m_gi_exclude)
+            .or(m_global)
+            .or(m_explicit)
     }
 
     /// Returns an iterator over parent ignore matchers, including this one.
@@ -535,20 +524,19 @@ impl IgnoreBuilder {
     /// The matcher returned won't match anything until ignore rules from
     /// directories are added to it.
     pub fn build(&self) -> Ignore {
-        let git_global_matcher =
-            if !self.opts.git_global {
-                Gitignore::empty()
-            } else {
-                let mut builder = GitignoreBuilder::new("");
-                builder
-                    .case_insensitive(self.opts.ignore_case_insensitive)
-                    .unwrap();
-                let (gi, err) = builder.build_global();
-                if let Some(err) = err {
-                    debug!("{}", err);
-                }
-                gi
-            };
+        let git_global_matcher = if !self.opts.git_global {
+            Gitignore::empty()
+        } else {
+            let mut builder = GitignoreBuilder::new("");
+            builder
+                .case_insensitive(self.opts.ignore_case_insensitive)
+                .unwrap();
+            let (gi, err) = builder.build_global();
+            if let Some(err) = err {
+                debug!("{}", err);
+            }
+            gi
+        };
 
         Ignore(Arc::new(IgnoreInner {
             compiled: Arc::new(RwLock::new(HashMap::new())),
@@ -604,9 +592,10 @@ impl IgnoreBuilder {
     /// later names.
     pub fn add_custom_ignore_filename<S: AsRef<OsStr>>(
         &mut self,
-        file_name: S
+        file_name: S,
     ) -> &mut IgnoreBuilder {
-        self.custom_ignore_filenames.push(file_name.as_ref().to_os_string());
+        self.custom_ignore_filenames
+            .push(file_name.as_ref().to_os_string());
         self
     }
 
@@ -678,10 +667,7 @@ impl IgnoreBuilder {
     /// Process ignore files case insensitively
     ///
     /// This is disabled by default.
-    pub fn ignore_case_insensitive(
-        &mut self,
-        yes: bool,
-    ) -> &mut IgnoreBuilder {
+    pub fn ignore_case_insensitive(&mut self, yes: bool) -> &mut IgnoreBuilder {
         self.opts.ignore_case_insensitive = yes;
         self
     }
@@ -742,19 +728,21 @@ mod tests {
         }
     }
 
-    fn tmpdir(prefix: &str) -> TempDir {
+    fn tmpdir() -> TempDir {
         TempDir::new().unwrap()
     }
 
     #[test]
     fn explicit_ignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join("not-an-ignore"), "foo\n!bar");
 
         let (gi, err) = Gitignore::new(td.path().join("not-an-ignore"));
         assert!(err.is_none());
         let (ig, err) = IgnoreBuilder::new()
-            .add_ignore(gi).build().add_child(td.path());
+            .add_ignore(gi)
+            .build()
+            .add_child(td.path());
         assert!(err.is_none());
         assert!(ig.matched("foo", false).is_ignore());
         assert!(ig.matched("bar", false).is_whitelist());
@@ -763,7 +751,7 @@ mod tests {
 
     #[test]
     fn git_exclude() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git/info"));
         wfile(td.path().join(".git/info/exclude"), "foo\n!bar");
 
@@ -776,7 +764,7 @@ mod tests {
 
     #[test]
     fn gitignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         wfile(td.path().join(".gitignore"), "foo\n!bar");
 
@@ -789,7 +777,7 @@ mod tests {
 
     #[test]
     fn gitignore_no_git() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".gitignore"), "foo\n!bar");
 
         let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
@@ -801,7 +789,7 @@ mod tests {
 
     #[test]
     fn ignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".ignore"), "foo\n!bar");
 
         let (ig, err) = IgnoreBuilder::new().build().add_child(td.path());
@@ -813,13 +801,14 @@ mod tests {
 
     #[test]
     fn custom_ignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         let custom_ignore = ".customignore";
         wfile(td.path().join(custom_ignore), "foo\n!bar");
 
         let (ig, err) = IgnoreBuilder::new()
             .add_custom_ignore_filename(custom_ignore)
-            .build().add_child(td.path());
+            .build()
+            .add_child(td.path());
         assert!(err.is_none());
         assert!(ig.matched("foo", false).is_ignore());
         assert!(ig.matched("bar", false).is_whitelist());
@@ -829,14 +818,15 @@ mod tests {
     // Tests that a custom ignore file will override an .ignore.
     #[test]
     fn custom_ignore_over_ignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         let custom_ignore = ".customignore";
         wfile(td.path().join(".ignore"), "foo");
         wfile(td.path().join(custom_ignore), "!foo");
 
         let (ig, err) = IgnoreBuilder::new()
             .add_custom_ignore_filename(custom_ignore)
-            .build().add_child(td.path());
+            .build()
+            .add_child(td.path());
         assert!(err.is_none());
         assert!(ig.matched("foo", false).is_whitelist());
     }
@@ -844,7 +834,7 @@ mod tests {
     // Tests that earlier custom ignore files have lower precedence than later.
     #[test]
     fn custom_ignore_precedence() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         let custom_ignore1 = ".customignore1";
         let custom_ignore2 = ".customignore2";
         wfile(td.path().join(custom_ignore1), "foo");
@@ -853,7 +843,8 @@ mod tests {
         let (ig, err) = IgnoreBuilder::new()
             .add_custom_ignore_filename(custom_ignore1)
             .add_custom_ignore_filename(custom_ignore2)
-            .build().add_child(td.path());
+            .build()
+            .add_child(td.path());
         assert!(err.is_none());
         assert!(ig.matched("foo", false).is_whitelist());
     }
@@ -861,7 +852,7 @@ mod tests {
     // Tests that an .ignore will override a .gitignore.
     #[test]
     fn ignore_over_gitignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".gitignore"), "foo");
         wfile(td.path().join(".ignore"), "!foo");
 
@@ -873,7 +864,7 @@ mod tests {
     // Tests that exclude has lower precedent than both .ignore and .gitignore.
     #[test]
     fn exclude_lowest() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".gitignore"), "!foo");
         wfile(td.path().join(".ignore"), "!bar");
         mkdirp(td.path().join(".git/info"));
@@ -888,7 +879,7 @@ mod tests {
 
     #[test]
     fn errored() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".gitignore"), "{foo");
 
         let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
@@ -897,7 +888,7 @@ mod tests {
 
     #[test]
     fn errored_both() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".gitignore"), "{foo");
         wfile(td.path().join(".ignore"), "{bar");
 
@@ -907,7 +898,7 @@ mod tests {
 
     #[test]
     fn errored_partial() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         wfile(td.path().join(".gitignore"), "{foo\nbar");
 
@@ -918,7 +909,7 @@ mod tests {
 
     #[test]
     fn errored_partial_and_ignore() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         wfile(td.path().join(".gitignore"), "{foo\nbar");
         wfile(td.path().join(".ignore"), "!bar");
 
@@ -929,7 +920,7 @@ mod tests {
 
     #[test]
     fn not_present_empty() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
 
         let (_, err) = IgnoreBuilder::new().build().add_child(td.path());
         assert!(err.is_none());
@@ -939,7 +930,7 @@ mod tests {
     fn stops_at_git_dir() {
         // This tests that .gitignore files beyond a .git barrier aren't
         // matched, but .ignore files are.
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("foo/.git"));
         wfile(td.path().join(".gitignore"), "foo");
@@ -960,7 +951,7 @@ mod tests {
 
     #[test]
     fn absolute_parent() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("foo"));
         wfile(td.path().join(".gitignore"), "bar");
@@ -983,7 +974,7 @@ mod tests {
 
     #[test]
     fn absolute_parent_anchored() {
-        let td = tmpdir("ignore-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("src/llvm"));
         wfile(td.path().join(".gitignore"), "/llvm/\nfoo");
diff --git a/vendor/ignore/src/gitignore.rs b/vendor/ignore/src/gitignore.rs
index b8db42ba2c..e9510dd050 100644
--- a/vendor/ignore/src/gitignore.rs
+++ b/vendor/ignore/src/gitignore.rs
@@ -249,7 +249,7 @@ impl Gitignore {
             return Match::None;
         }
         let path = path.as_ref();
-        let _matches = self.matches.as_ref().unwrap().get_default();
+        let _matches = self.matches.as_ref().unwrap().get_or_default();
         let mut matches = _matches.borrow_mut();
         let candidate = Candidate::new(path);
         self.set.matches_candidate_into(&candidate, &mut *matches);
@@ -537,7 +537,7 @@ impl GitignoreBuilder {
 ///
 /// Note that the file path returned may not exist.
 fn gitconfig_excludes_path() -> Option<PathBuf> {
-    // git supports $HOME/.gitconfig and $XDG_CONFIG_DIR/git/config. Notably,
+    // git supports $HOME/.gitconfig and $XDG_CONFIG_HOME/git/config. Notably,
     // both can be active at the same time, where $HOME/.gitconfig takes
     // precedent. So if $HOME/.gitconfig defines a `core.excludesFile`, then
     // we're done.
@@ -568,7 +568,7 @@ fn gitconfig_home_contents() -> Option<Vec<u8>> {
 }
 
 /// Returns the file contents of git's global config file, if one exists, in
-/// the user's XDG_CONFIG_DIR directory.
+/// the user's XDG_CONFIG_HOME directory.
 fn gitconfig_xdg_contents() -> Option<Vec<u8>> {
     let path = env::var_os("XDG_CONFIG_HOME")
         .and_then(|x| if x.is_empty() { None } else { Some(PathBuf::from(x)) })
diff --git a/vendor/ignore/src/types.rs b/vendor/ignore/src/types.rs
index 07d68e152b..1ff31289b3 100644
--- a/vendor/ignore/src/types.rs
+++ b/vendor/ignore/src/types.rs
@@ -515,7 +515,7 @@ impl Types {
                 return Match::None;
             }
         };
-        let mut matches = self.matches.get_default().borrow_mut();
+        let mut matches = self.matches.get_or_default().borrow_mut();
         self.set.matches_into(name, &mut *matches);
         // The highest precedent match is the last one.
         if let Some(&i) = matches.last() {
diff --git a/vendor/ignore/src/walk.rs b/vendor/ignore/src/walk.rs
index b3e05f0864..e00b29a5b7 100644
--- a/vendor/ignore/src/walk.rs
+++ b/vendor/ignore/src/walk.rs
@@ -4,8 +4,8 @@ use std::fmt;
 use std::fs::{self, FileType, Metadata};
 use std::io;
 use std::path::{Path, PathBuf};
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
+use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 use std::vec;
@@ -182,14 +182,14 @@ impl DirEntryInner {
         match *self {
             Stdin => {
                 let err = Error::Io(io::Error::new(
-                    io::ErrorKind::Other, "<stdin> has no metadata"));
+                    io::ErrorKind::Other,
+                    "<stdin> has no metadata",
+                ));
                 Err(err.with_path("<stdin>"))
             }
-            Walkdir(ref x) => {
-                x.metadata().map_err(|err| {
-                    Error::Io(io::Error::from(err)).with_path(x.path())
-                })
-            }
+            Walkdir(ref x) => x
+                .metadata()
+                .map_err(|err| Error::Io(io::Error::from(err)).with_path(x.path())),
             Raw(ref x) => x.metadata(),
         }
     }
@@ -223,8 +223,8 @@ impl DirEntryInner {
 
     #[cfg(unix)]
     fn ino(&self) -> Option<u64> {
-        use walkdir::DirEntryExt;
         use self::DirEntryInner::*;
+        use walkdir::DirEntryExt;
         match *self {
             Stdin => None,
             Walkdir(ref x) => Some(x.ino()),
@@ -297,7 +297,8 @@ impl DirEntryRaw {
             fs::metadata(&self.path)
         } else {
             Ok(self.metadata.clone())
-        }.map_err(|err| Error::Io(io::Error::from(err)).with_path(&self.path))
+        }
+        .map_err(|err| Error::Io(io::Error::from(err)).with_path(&self.path))
     }
 
     #[cfg(not(windows))]
@@ -306,7 +307,8 @@ impl DirEntryRaw {
             fs::metadata(&self.path)
         } else {
             fs::symlink_metadata(&self.path)
-        }.map_err(|err| Error::Io(io::Error::from(err)).with_path(&self.path))
+        }
+        .map_err(|err| Error::Io(io::Error::from(err)).with_path(&self.path))
     }
 
     fn file_type(&self) -> FileType {
@@ -314,7 +316,9 @@ impl DirEntryRaw {
     }
 
     fn file_name(&self) -> &OsStr {
-        self.path.file_name().unwrap_or_else(|| self.path.as_os_str())
+        self.path
+            .file_name()
+            .unwrap_or_else(|| self.path.as_os_str())
     }
 
     fn depth(&self) -> usize {
@@ -326,10 +330,7 @@ impl DirEntryRaw {
         self.ino
     }
 
-    fn from_entry(
-        depth: usize,
-        ent: &fs::DirEntry,
-    ) -> Result<DirEntryRaw, Error> {
+    fn from_entry(depth: usize, ent: &fs::DirEntry) -> Result<DirEntryRaw, Error> {
         let ty = ent.file_type().map_err(|err| {
             let err = Error::Io(io::Error::from(err)).with_path(ent.path());
             Error::WithDepth {
@@ -387,18 +388,14 @@ impl DirEntryRaw {
         ty: fs::FileType,
     ) -> Result<DirEntryRaw, Error> {
         Err(Error::Io(io::Error::new(
-            io::ErrorKind::Other, "unsupported platform")))
+            io::ErrorKind::Other,
+            "unsupported platform",
+        )))
     }
 
     #[cfg(windows)]
-    fn from_path(
-        depth: usize,
-        pb: PathBuf,
-        link: bool,
-    ) -> Result<DirEntryRaw, Error> {
-        let md = fs::metadata(&pb).map_err(|err| {
-            Error::Io(err).with_path(&pb)
-        })?;
+    fn from_path(depth: usize, pb: PathBuf, link: bool) -> Result<DirEntryRaw, Error> {
+        let md = fs::metadata(&pb).map_err(|err| Error::Io(err).with_path(&pb))?;
         Ok(DirEntryRaw {
             path: pb,
             ty: md.file_type(),
@@ -409,16 +406,10 @@ impl DirEntryRaw {
     }
 
     #[cfg(unix)]
-    fn from_path(
-        depth: usize,
-        pb: PathBuf,
-        link: bool,
-    ) -> Result<DirEntryRaw, Error> {
+    fn from_path(depth: usize, pb: PathBuf, link: bool) -> Result<DirEntryRaw, Error> {
         use std::os::unix::fs::MetadataExt;
 
-        let md = fs::metadata(&pb).map_err(|err| {
-            Error::Io(err).with_path(&pb)
-        })?;
+        let md = fs::metadata(&pb).map_err(|err| Error::Io(err).with_path(&pb))?;
         Ok(DirEntryRaw {
             path: pb,
             ty: md.file_type(),
@@ -430,13 +421,11 @@ impl DirEntryRaw {
 
     // Placeholder implementation to allow compiling on non-standard platforms (e.g. wasm32).
     #[cfg(not(any(windows, unix)))]
-    fn from_path(
-        depth: usize,
-        pb: PathBuf,
-        link: bool,
-    ) -> Result<DirEntryRaw, Error> {
+    fn from_path(depth: usize, pb: PathBuf, link: bool) -> Result<DirEntryRaw, Error> {
         Err(Error::Io(io::Error::new(
-            io::ErrorKind::Other, "unsupported platform")))
+            io::ErrorKind::Other,
+            "unsupported platform",
+        )))
     }
 }
 
@@ -547,33 +536,34 @@ impl WalkBuilder {
         let follow_links = self.follow_links;
         let max_depth = self.max_depth;
         let sorter = self.sorter.clone();
-        let its = self.paths.iter().map(move |p| {
-            if p == Path::new("-") {
-                (p.to_path_buf(), None)
-            } else {
-                let mut wd = WalkDir::new(p);
-                wd = wd.follow_links(follow_links || p.is_file());
-                wd = wd.same_file_system(self.same_file_system);
-                if let Some(max_depth) = max_depth {
-                    wd = wd.max_depth(max_depth);
-                }
-                if let Some(ref sorter) = sorter {
-                    match sorter.clone() {
-                        Sorter::ByName(cmp) => {
-                            wd = wd.sort_by(move |a, b| {
-                                cmp(a.file_name(), b.file_name())
-                            });
-                        }
-                        Sorter::ByPath(cmp) => {
-                            wd = wd.sort_by(move |a, b| {
-                                cmp(a.path(), b.path())
-                            });
+        let its = self
+            .paths
+            .iter()
+            .map(move |p| {
+                if p == Path::new("-") {
+                    (p.to_path_buf(), None)
+                } else {
+                    let mut wd = WalkDir::new(p);
+                    wd = wd.follow_links(follow_links || p.is_file());
+                    wd = wd.same_file_system(self.same_file_system);
+                    if let Some(max_depth) = max_depth {
+                        wd = wd.max_depth(max_depth);
+                    }
+                    if let Some(ref sorter) = sorter {
+                        match sorter.clone() {
+                            Sorter::ByName(cmp) => {
+                                wd = wd.sort_by(move |a, b| cmp(a.file_name(), b.file_name()));
+                            }
+                            Sorter::ByPath(cmp) => {
+                                wd = wd.sort_by(move |a, b| cmp(a.path(), b.path()));
+                            }
                         }
                     }
+                    (p.to_path_buf(), Some(WalkEventIter::from(wd)))
                 }
-                (p.to_path_buf(), Some(WalkEventIter::from(wd)))
-            }
-        }).collect::<Vec<_>>().into_iter();
+            })
+            .collect::<Vec<_>>()
+            .into_iter();
         let ig_root = self.ig_builder.build();
         Walk {
             its: its,
@@ -657,8 +647,12 @@ impl WalkBuilder {
         let mut errs = PartialErrorBuilder::default();
         errs.maybe_push(builder.add(path));
         match builder.build() {
-            Ok(gi) => { self.ig_builder.add_ignore(gi); }
-            Err(err) => { errs.push(err); }
+            Ok(gi) => {
+                self.ig_builder.add_ignore(gi);
+            }
+            Err(err) => {
+                errs.push(err);
+            }
         }
         errs.into_error_option()
     }
@@ -671,7 +665,7 @@ impl WalkBuilder {
     /// later names.
     pub fn add_custom_ignore_filename<S: AsRef<OsStr>>(
         &mut self,
-        file_name: S
+        file_name: S,
     ) -> &mut WalkBuilder {
         self.ig_builder.add_custom_ignore_filename(file_name);
         self
@@ -808,11 +802,9 @@ impl WalkBuilder {
     /// by `sort_by_file_name`.
     ///
     /// Note that this is not used in the parallel iterator.
-    pub fn sort_by_file_path<F>(
-        &mut self,
-        cmp: F,
-    ) -> &mut WalkBuilder
-    where F: Fn(&Path, &Path) -> cmp::Ordering + Send + Sync + 'static
+    pub fn sort_by_file_path<F>(&mut self, cmp: F) -> &mut WalkBuilder
+    where
+        F: Fn(&Path, &Path) -> cmp::Ordering + Send + Sync + 'static,
     {
         self.sorter = Some(Sorter::ByPath(Arc::new(cmp)));
         self
@@ -830,7 +822,8 @@ impl WalkBuilder {
     ///
     /// Note that this is not used in the parallel iterator.
     pub fn sort_by_file_name<F>(&mut self, cmp: F) -> &mut WalkBuilder
-    where F: Fn(&OsStr, &OsStr) -> cmp::Ordering + Send + Sync + 'static
+    where
+        F: Fn(&OsStr, &OsStr) -> cmp::Ordering + Send + Sync + 'static,
     {
         self.sorter = Some(Sorter::ByName(Arc::new(cmp)));
         self
@@ -1011,7 +1004,11 @@ enum WalkEvent {
 
 impl From<WalkDir> for WalkEventIter {
     fn from(it: WalkDir) -> WalkEventIter {
-        WalkEventIter { depth: 0, it: it.into_iter(), next: None }
+        WalkEventIter {
+            depth: 0,
+            it: it.into_iter(),
+            next: None,
+        }
     }
 }
 
@@ -1094,10 +1091,10 @@ impl WalkParallel {
     /// Execute the parallel recursive directory iterator. `mkf` is called
     /// for each thread used for iteration. The function produced by `mkf`
     /// is then in turn called for each visited file path.
-    pub fn run<F>(
-        self,
-        mut mkf: F,
-    ) where F: FnMut() -> Box<dyn FnMut(Result<DirEntry, Error>) -> WalkState + Send + 'static> {
+    pub fn run<F>(self, mut mkf: F)
+    where
+        F: FnMut() -> Box<dyn FnMut(Result<DirEntry, Error>) -> WalkState + Send + 'static>,
+    {
         let mut f = mkf();
         let threads = self.threads();
         // TODO: Figure out how to use a bounded channel here. With an
@@ -1114,30 +1111,16 @@ impl WalkParallel {
         // Note that we only send directories. For files, we send to them the
         // callback directly.
         for path in self.paths {
-            let (dent, root_device) =
-                if path == Path::new("-") {
-                    (DirEntry::new_stdin(), None)
+            let (dent, root_device) = if path == Path::new("-") {
+                (DirEntry::new_stdin(), None)
+            } else {
+                let root_device = if !self.same_file_system {
+                    None
                 } else {
-                    let root_device =
-                        if !self.same_file_system {
-                            None
-                        } else {
-                            match device_num(&path) {
-                                Ok(root_device) => Some(root_device),
-                                Err(err) => {
-                                    let err = Error::Io(err).with_path(path);
-                                    if f(Err(err)).is_quit() {
-                                        return;
-                                    }
-                                    continue;
-                                }
-                            }
-                        };
-                    match DirEntryRaw::from_path(0, path, false) {
-                        Ok(dent) => {
-                            (DirEntry::new_raw(dent, None), root_device)
-                        }
+                    match device_num(&path) {
+                        Ok(root_device) => Some(root_device),
                         Err(err) => {
+                            let err = Error::Io(err).with_path(path);
                             if f(Err(err)).is_quit() {
                                 return;
                             }
@@ -1145,11 +1128,22 @@ impl WalkParallel {
                         }
                     }
                 };
+                match DirEntryRaw::from_path(0, path, false) {
+                    Ok(dent) => (DirEntry::new_raw(dent, None), root_device),
+                    Err(err) => {
+                        if f(Err(err)).is_quit() {
+                            return;
+                        }
+                        continue;
+                    }
+                }
+            };
             tx.send(Message::Work(Work {
                 dent: dent,
                 ignore: self.ig_root.clone(),
                 root_device: root_device,
-            })).unwrap();
+            }))
+            .unwrap();
             any_work = true;
         }
         // ... but there's no need to start workers if we don't need them.
@@ -1341,22 +1335,21 @@ impl Worker {
                     continue;
                 }
             };
-            let descend =
-                if let Some(root_device) = work.root_device {
-                    match is_same_file_system(root_device, work.dent.path()) {
-                        Ok(true) => true,
-                        Ok(false) => false,
-                        Err(err) => {
-                            if (self.f)(Err(err)).is_quit() {
-                                self.quit_now();
-                                return;
-                            }
-                            false
+            let descend = if let Some(root_device) = work.root_device {
+                match is_same_file_system(root_device, work.dent.path()) {
+                    Ok(true) => true,
+                    Ok(false) => false,
+                    Err(err) => {
+                        if (self.f)(Err(err)).is_quit() {
+                            self.quit_now();
+                            return;
                         }
+                        false
                     }
-                } else {
-                    true
-                };
+                }
+            } else {
+                true
+            };
 
             let depth = work.dent.depth();
             match (self.f)(Ok(work.dent)) {
@@ -1374,12 +1367,7 @@ impl Worker {
                 continue;
             }
             for result in readdir {
-                let state = self.run_one(
-                    &work.ignore,
-                    depth + 1,
-                    work.root_device,
-                    result,
-                );
+                let state = self.run_one(&work.ignore, depth + 1, work.root_device, result);
                 if state.is_quit() {
                     self.quit_now();
                     return;
@@ -1444,23 +1432,24 @@ impl Worker {
             }
         }
         let should_skip_path = should_skip_entry(ig, &dent);
-        let should_skip_filesize =
-            if self.max_filesize.is_some() && !dent.is_dir() {
-                skip_filesize(
-                    self.max_filesize.unwrap(),
-                    dent.path(),
-                    &dent.metadata().ok(),
-                )
-            } else {
-                false
-            };
+        let should_skip_filesize = if self.max_filesize.is_some() && !dent.is_dir() {
+            skip_filesize(
+                self.max_filesize.unwrap(),
+                dent.path(),
+                &dent.metadata().ok(),
+            )
+        } else {
+            false
+        };
 
         if !should_skip_path && !should_skip_filesize {
-            self.tx.send(Message::Work(Work {
-                dent: dent,
-                ignore: ig.clone(),
-                root_device: root_device,
-            })).unwrap();
+            self.tx
+                .send(Message::Work(Work {
+                    dent: dent,
+                    ignore: ig.clone(),
+                    root_device: root_device,
+                }))
+                .unwrap();
         }
         WalkState::Continue
     }
@@ -1590,17 +1579,25 @@ fn check_symlink_loop(
     child_depth: usize,
 ) -> Result<(), Error> {
     let hchild = Handle::from_path(child_path).map_err(|err| {
-        Error::from(err).with_path(child_path).with_depth(child_depth)
+        Error::from(err)
+            .with_path(child_path)
+            .with_depth(child_depth)
     })?;
-    for ig in ig_parent.parents().take_while(|ig| !ig.is_absolute_parent()) {
+    for ig in ig_parent
+        .parents()
+        .take_while(|ig| !ig.is_absolute_parent())
+    {
         let h = Handle::from_path(ig.path()).map_err(|err| {
-            Error::from(err).with_path(child_path).with_depth(child_depth)
+            Error::from(err)
+                .with_path(child_path)
+                .with_depth(child_depth)
         })?;
         if hchild == h {
             return Err(Error::Loop {
                 ancestor: ig.path().to_path_buf(),
                 child: child_path.to_path_buf(),
-            }.with_depth(child_depth));
+            }
+            .with_depth(child_depth));
         }
     }
     Ok(())
@@ -1608,14 +1605,10 @@ fn check_symlink_loop(
 
 // Before calling this function, make sure that you ensure that is really
 // necessary as the arguments imply a file stat.
-fn skip_filesize(
-    max_filesize: u64,
-    path: &Path,
-    ent: &Option<Metadata>
-) -> bool {
+fn skip_filesize(max_filesize: u64, path: &Path, ent: &Option<Metadata>) -> bool {
     let filesize = match *ent {
         Some(ref md) => Some(md.len()),
-        None => None
+        None => None,
     };
 
     if let Some(fs) = filesize {
@@ -1630,10 +1623,7 @@ fn skip_filesize(
     }
 }
 
-fn should_skip_entry(
-    ig: &Ignore,
-    dent: &DirEntry,
-) -> bool {
+fn should_skip_entry(ig: &Ignore, dent: &DirEntry) -> bool {
     let m = ig.matched_dir_entry(dent);
     if m.is_ignore() {
         debug!("ignoring {}: {:?}", dent.path().display(), m);
@@ -1695,28 +1685,27 @@ fn path_equals(dent: &DirEntry, handle: &Handle) -> Result<bool, Error> {
 /// Returns true if and only if the given path is on the same device as the
 /// given root device.
 fn is_same_file_system(root_device: u64, path: &Path) -> Result<bool, Error> {
-    let dent_device = device_num(path)
-        .map_err(|err| Error::Io(err).with_path(path))?;
+    let dent_device = device_num(path).map_err(|err| Error::Io(err).with_path(path))?;
     Ok(root_device == dent_device)
 }
 
 #[cfg(unix)]
-fn device_num<P: AsRef<Path>>(path: P)-> io::Result<u64> {
+fn device_num<P: AsRef<Path>>(path: P) -> io::Result<u64> {
     use std::os::unix::fs::MetadataExt;
 
     path.as_ref().metadata().map(|md| md.dev())
 }
 
- #[cfg(windows)]
+#[cfg(windows)]
 fn device_num<P: AsRef<Path>>(path: P) -> io::Result<u64> {
-    use winapi_util::{Handle, file};
+    use winapi_util::{file, Handle};
 
     let h = Handle::from_path_any(path)?;
     file::information(h).map(|info| info.volume_serial_number())
 }
 
 #[cfg(not(any(unix, windows)))]
-fn device_num<P: AsRef<Path>>(_: P)-> io::Result<u64> {
+fn device_num<P: AsRef<Path>>(_: P) -> io::Result<u64> {
     Err(io::Error::new(
         io::ErrorKind::Other,
         "walkdir: same_file_system option not supported on this platform",
@@ -1730,8 +1719,8 @@ mod tests {
     use std::path::Path;
     use std::sync::{Arc, Mutex};
 
-    use tests::TempDir;
     use super::{DirEntry, WalkBuilder, WalkState};
+    use tests::TempDir;
 
     fn wfile<P: AsRef<Path>>(path: P, contents: &str) {
         let mut file = File::create(path).unwrap();
@@ -1778,10 +1767,7 @@ mod tests {
         paths
     }
 
-    fn walk_collect_parallel(
-        prefix: &Path,
-        builder: &WalkBuilder,
-    ) -> Vec<String> {
+    fn walk_collect_parallel(prefix: &Path, builder: &WalkBuilder) -> Vec<String> {
         let mut paths = vec![];
         for dent in walk_collect_entries_parallel(builder) {
             let path = dent.path().strip_prefix(prefix).unwrap();
@@ -1816,15 +1802,11 @@ mod tests {
         paths
     }
 
-    fn tmpdir(prefix: &str) -> TempDir {
+    fn tmpdir() -> TempDir {
         TempDir::new().unwrap()
     }
 
-    fn assert_paths(
-        prefix: &Path,
-        builder: &WalkBuilder,
-        expected: &[&str],
-    ) {
+    fn assert_paths(prefix: &Path, builder: &WalkBuilder, expected: &[&str]) {
         let got = walk_collect(prefix, builder);
         assert_eq!(got, mkpaths(expected), "single threaded");
         let got = walk_collect_parallel(prefix, builder);
@@ -1833,20 +1815,22 @@ mod tests {
 
     #[test]
     fn no_ignores() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join("a/b/c"));
         mkdirp(td.path().join("x/y"));
         wfile(td.path().join("a/b/foo"), "");
         wfile(td.path().join("x/y/foo"), "");
 
-        assert_paths(td.path(), &WalkBuilder::new(td.path()), &[
-            "x", "x/y", "x/y/foo", "a", "a/b", "a/b/foo", "a/b/c",
-        ]);
+        assert_paths(
+            td.path(),
+            &WalkBuilder::new(td.path()),
+            &["x", "x/y", "x/y/foo", "a", "a/b", "a/b/foo", "a/b/c"],
+        );
     }
 
     #[test]
     fn custom_ignore() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         let custom_ignore = ".customignore";
         mkdirp(td.path().join("a"));
         wfile(td.path().join(custom_ignore), "foo");
@@ -1862,7 +1846,7 @@ mod tests {
 
     #[test]
     fn custom_ignore_exclusive_use() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         let custom_ignore = ".customignore";
         mkdirp(td.path().join("a"));
         wfile(td.path().join(custom_ignore), "foo");
@@ -1882,7 +1866,7 @@ mod tests {
 
     #[test]
     fn gitignore() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("a"));
         wfile(td.path().join(".gitignore"), "foo");
@@ -1891,14 +1875,16 @@ mod tests {
         wfile(td.path().join("bar"), "");
         wfile(td.path().join("a/bar"), "");
 
-        assert_paths(td.path(), &WalkBuilder::new(td.path()), &[
-            "bar", "a", "a/bar",
-        ]);
+        assert_paths(
+            td.path(),
+            &WalkBuilder::new(td.path()),
+            &["bar", "a", "a/bar"],
+        );
     }
 
     #[test]
     fn explicit_ignore() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         let igpath = td.path().join(".not-an-ignore");
         mkdirp(td.path().join("a"));
         wfile(&igpath, "foo");
@@ -1914,7 +1900,7 @@ mod tests {
 
     #[test]
     fn explicit_ignore_exclusive_use() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         let igpath = td.path().join(".not-an-ignore");
         mkdirp(td.path().join("a"));
         wfile(&igpath, "foo");
@@ -1926,13 +1912,16 @@ mod tests {
         let mut builder = WalkBuilder::new(td.path());
         builder.standard_filters(false);
         assert!(builder.add_ignore(&igpath).is_none());
-        assert_paths(td.path(), &builder,
-            &[".not-an-ignore", "bar", "a", "a/bar"]);
+        assert_paths(
+            td.path(),
+            &builder,
+            &[".not-an-ignore", "bar", "a", "a/bar"],
+        );
     }
 
     #[test]
     fn gitignore_parent() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join(".git"));
         mkdirp(td.path().join("a"));
         wfile(td.path().join(".gitignore"), "foo");
@@ -1945,7 +1934,7 @@ mod tests {
 
     #[test]
     fn max_depth() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join("a/b/c"));
         wfile(td.path().join("foo"), "");
         wfile(td.path().join("a/foo"), "");
@@ -1953,19 +1942,23 @@ mod tests {
         wfile(td.path().join("a/b/c/foo"), "");
 
         let mut builder = WalkBuilder::new(td.path());
-        assert_paths(td.path(), &builder, &[
-            "a", "a/b", "a/b/c", "foo", "a/foo", "a/b/foo", "a/b/c/foo",
-        ]);
+        assert_paths(
+            td.path(),
+            &builder,
+            &["a", "a/b", "a/b/c", "foo", "a/foo", "a/b/foo", "a/b/c/foo"],
+        );
         assert_paths(td.path(), builder.max_depth(Some(0)), &[]);
         assert_paths(td.path(), builder.max_depth(Some(1)), &["a", "foo"]);
-        assert_paths(td.path(), builder.max_depth(Some(2)), &[
-            "a", "a/b", "foo", "a/foo",
-        ]);
+        assert_paths(
+            td.path(),
+            builder.max_depth(Some(2)),
+            &["a", "a/b", "foo", "a/foo"],
+        );
     }
 
     #[test]
     fn max_filesize() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join("a/b"));
         wfile_size(td.path().join("foo"), 0);
         wfile_size(td.path().join("bar"), 400);
@@ -1975,41 +1968,49 @@ mod tests {
         wfile_size(td.path().join("a/baz"), 200);
 
         let mut builder = WalkBuilder::new(td.path());
-        assert_paths(td.path(), &builder, &[
-            "a", "a/b", "foo", "bar", "baz", "a/foo", "a/bar", "a/baz",
-        ]);
-        assert_paths(td.path(), builder.max_filesize(Some(0)), &[
-            "a", "a/b", "foo"
-        ]);
-        assert_paths(td.path(), builder.max_filesize(Some(500)), &[
-            "a", "a/b", "foo", "bar", "a/bar", "a/baz"
-        ]);
-        assert_paths(td.path(), builder.max_filesize(Some(50000)), &[
-            "a", "a/b", "foo", "bar", "baz", "a/foo", "a/bar", "a/baz",
-        ]);
+        assert_paths(
+            td.path(),
+            &builder,
+            &["a", "a/b", "foo", "bar", "baz", "a/foo", "a/bar", "a/baz"],
+        );
+        assert_paths(
+            td.path(),
+            builder.max_filesize(Some(0)),
+            &["a", "a/b", "foo"],
+        );
+        assert_paths(
+            td.path(),
+            builder.max_filesize(Some(500)),
+            &["a", "a/b", "foo", "bar", "a/bar", "a/baz"],
+        );
+        assert_paths(
+            td.path(),
+            builder.max_filesize(Some(50000)),
+            &["a", "a/b", "foo", "bar", "baz", "a/foo", "a/bar", "a/baz"],
+        );
     }
 
     #[cfg(unix)] // because symlinks on windows are weird
     #[test]
     fn symlinks() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join("a/b"));
         symlink(td.path().join("a/b"), td.path().join("z"));
         wfile(td.path().join("a/b/foo"), "");
 
         let mut builder = WalkBuilder::new(td.path());
-        assert_paths(td.path(), &builder, &[
-            "a", "a/b", "a/b/foo", "z",
-        ]);
-        assert_paths(td.path(), &builder.follow_links(true), &[
-            "a", "a/b", "a/b/foo", "z", "z/foo",
-        ]);
+        assert_paths(td.path(), &builder, &["a", "a/b", "a/b/foo", "z"]);
+        assert_paths(
+            td.path(),
+            &builder.follow_links(true),
+            &["a", "a/b", "a/b/foo", "z", "z/foo"],
+        );
     }
 
     #[cfg(unix)] // because symlinks on windows are weird
     #[test]
     fn first_path_not_symlink() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join("foo"));
 
         let dents = WalkBuilder::new(td.path().join("foo"))
@@ -2020,9 +2021,7 @@ mod tests {
         assert_eq!(1, dents.len());
         assert!(!dents[0].path_is_symlink());
 
-        let dents = walk_collect_entries_parallel(
-            &WalkBuilder::new(td.path().join("foo")),
-        );
+        let dents = walk_collect_entries_parallel(&WalkBuilder::new(td.path().join("foo")));
         assert_eq!(1, dents.len());
         assert!(!dents[0].path_is_symlink());
     }
@@ -2030,17 +2029,13 @@ mod tests {
     #[cfg(unix)] // because symlinks on windows are weird
     #[test]
     fn symlink_loop() {
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         mkdirp(td.path().join("a/b"));
         symlink(td.path().join("a"), td.path().join("a/b/c"));
 
         let mut builder = WalkBuilder::new(td.path());
-        assert_paths(td.path(), &builder, &[
-            "a", "a/b", "a/b/c",
-        ]);
-        assert_paths(td.path(), &builder.follow_links(true), &[
-            "a", "a/b",
-        ]);
+        assert_paths(td.path(), &builder, &["a", "a/b", "a/b/c"]);
+        assert_paths(td.path(), &builder.follow_links(true), &["a", "a/b"]);
     }
 
     // It's a little tricky to test the 'same_file_system' option since
@@ -2060,7 +2055,7 @@ mod tests {
 
         // If our test directory actually isn't a different volume from /sys,
         // then this test is meaningless and we shouldn't run it.
-        let td = tmpdir("walk-test-");
+        let td = tmpdir();
         if device_num(td.path()).unwrap() == device_num("/sys").unwrap() {
             return;
         }
@@ -2074,8 +2069,6 @@ mod tests {
         // completely.
         let mut builder = WalkBuilder::new(td.path());
         builder.follow_links(true).same_file_system(true);
-        assert_paths(td.path(), &builder, &[
-            "same_file", "same_file/alink",
-        ]);
+        assert_paths(td.path(), &builder, &["same_file", "same_file/alink"]);
     }
 }
diff --git a/vendor/kernel32-sys/.cargo-checksum.json b/vendor/kernel32-sys/.cargo-checksum.json
deleted file mode 100644
index 55bf9d9dde..0000000000
--- a/vendor/kernel32-sys/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"79c920ca9323e28acd5f5a80f2ce0ab81aa6227584397a9f742e78dce36a2117","README.md":"00afb50f0a5a7d548e40feb1f09ce8fa678b46e04c9a72d909fa36fb85fb2200","build.rs":"89e77c6e9e79dcd782fd006431b948d093ec4aeda3b69a280ec857077b7f2020","src/lib.rs":"ab0a8a104a6f747f6389a70d26a62e156ab97cc7c8f4daf1de99b820024da993"},"package":"7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"}
\ No newline at end of file
diff --git a/vendor/kernel32-sys/Cargo.toml b/vendor/kernel32-sys/Cargo.toml
deleted file mode 100644
index 5d28426f34..0000000000
--- a/vendor/kernel32-sys/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "kernel32-sys"
-version = "0.2.2"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."
-documentation = "https://retep998.github.io/doc/kernel32/"
-repository = "https://github.com/retep998/winapi-rs"
-readme = "README.md"
-keywords = ["windows", "ffi", "win32"]
-license = "MIT"
-build = "build.rs"
-[lib]
-name = "kernel32"
-[dependencies]
-winapi = { version = "0.2.5", path = "../.." }
-[build-dependencies]
-winapi-build = { version = "0.1.1", path = "../../build" }
diff --git a/vendor/kernel32-sys/README.md b/vendor/kernel32-sys/README.md
deleted file mode 100644
index 07ee5a6d6f..0000000000
--- a/vendor/kernel32-sys/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# kernel32 #
-Contains function definitions for the Windows API library kernel32. See winapi for types and constants.
-
-```toml
-[dependencies]
-kernel32-sys = "0.2.1"
-```
-
-```rust
-extern crate kernel32;
-```
-
-[Documentation](https://retep998.github.io/doc/kernel32/)
diff --git a/vendor/kernel32-sys/build.rs b/vendor/kernel32-sys/build.rs
deleted file mode 100644
index cf323fc2e5..0000000000
--- a/vendor/kernel32-sys/build.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-extern crate build;
-fn main() {
-    build::link("kernel32", false)
-}
diff --git a/vendor/kernel32-sys/src/lib.rs b/vendor/kernel32-sys/src/lib.rs
deleted file mode 100644
index ca7683594c..0000000000
--- a/vendor/kernel32-sys/src/lib.rs
+++ /dev/null
@@ -1,2754 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! FFI bindings to kernel32.
-#![cfg(windows)]
-extern crate winapi;
-use winapi::*;
-extern "system" {
-    pub fn AcquireSRWLockExclusive(SRWLock: PSRWLOCK);
-    pub fn AcquireSRWLockShared(SRWLock: PSRWLOCK);
-    pub fn ActivateActCtx(hActCtx: HANDLE, lpCookie: *mut ULONG_PTR) -> BOOL;
-    pub fn AddAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn AddAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn AddConsoleAliasA(Source: LPSTR, Target: LPSTR, ExeName: LPSTR) -> BOOL;
-    pub fn AddConsoleAliasW(Source: LPWSTR, Target: LPWSTR, ExeName: LPWSTR) -> BOOL;
-    pub fn AddDllDirectory(NewDirectory: PCWSTR) -> DLL_DIRECTORY_COOKIE;
-    pub fn AddIntegrityLabelToBoundaryDescriptor(
-        BoundaryDescriptor: *mut HANDLE, IntegrityLabel: PSID,
-    ) -> BOOL;
-    // pub fn AddLocalAlternateComputerNameA();
-    // pub fn AddLocalAlternateComputerNameW();
-    pub fn AddRefActCtx(hActCtx: HANDLE);
-    pub fn AddResourceAttributeAce(
-        pAcl: PACL, dwAceRevision: DWORD, AceFlags: DWORD, AccessMask: DWORD, pSid: PSID,
-        pAttributeInfo: PCLAIM_SECURITY_ATTRIBUTES_INFORMATION, pReturnLength: PDWORD,
-    ) -> BOOL;
-    pub fn AddSIDToBoundaryDescriptor(BoundaryDescriptor: *mut HANDLE, RequiredSid: PSID) -> BOOL;
-    pub fn AddScopedPolicyIDAce(
-        pAcl: PACL, dwAceRevision: DWORD, AceFlags: DWORD, AccessMask: DWORD, pSid: PSID,
-    ) -> BOOL;
-    pub fn AddSecureMemoryCacheCallback(pfnCallBack: PSECURE_MEMORY_CACHE_CALLBACK) -> BOOL;
-    pub fn AddVectoredContinueHandler(First: ULONG, Handler: PVECTORED_EXCEPTION_HANDLER) -> PVOID;
-    pub fn AddVectoredExceptionHandler(
-        First: ULONG, Handler: PVECTORED_EXCEPTION_HANDLER,
-    ) -> PVOID;
-    pub fn AllocConsole() -> BOOL;
-    pub fn AllocateUserPhysicalPages(
-        hProcess: HANDLE, NumberOfPages: PULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn AllocateUserPhysicalPagesNuma(
-        hProcess: HANDLE, NumberOfPages: PULONG_PTR, PageArray: PULONG_PTR, nndPreferred: DWORD,
-    ) -> BOOL;
-    // pub fn AppXGetOSMaxVersionTested();
-    pub fn ApplicationRecoveryFinished(bSuccess: BOOL);
-    pub fn ApplicationRecoveryInProgress(pbCancelled: PBOOL) -> HRESULT;
-    pub fn AreFileApisANSI() -> BOOL;
-    pub fn AssignProcessToJobObject(hJob: HANDLE, hProcess: HANDLE) -> BOOL;
-    pub fn AttachConsole(dwProcessId: DWORD) -> BOOL;
-    pub fn BackupRead(
-        hFile: HANDLE, lpBuffer: LPBYTE, nNumberOfBytesToRead: DWORD, lpNumberOfBytesRead: LPDWORD,
-        bAbort: BOOL, bProcessSecurity: BOOL, lpContext: *mut LPVOID,
-    ) -> BOOL;
-    pub fn BackupSeek(
-        hFile: HANDLE, dwLowBytesToSeek: DWORD, dwHighBytesToSeek: DWORD,
-        lpdwLowByteSeeked: LPDWORD, lpdwHighByteSeeked: LPDWORD, lpContext: *mut LPVOID,
-    ) -> BOOL;
-    pub fn BackupWrite(
-        hFile: HANDLE, lpBuffer: LPBYTE, nNumberOfBytesToWrite: DWORD,
-        lpNumberOfBytesWritten: LPDWORD, bAbort: BOOL, bProcessSecurity: BOOL,
-        lpContext: *mut LPVOID,
-    ) -> BOOL;
-    // pub fn BaseSetLastNTError();
-    pub fn Beep(dwFreq: DWORD, dwDuration: DWORD) -> BOOL;
-    pub fn BeginUpdateResourceA(pFileName: LPCSTR, bDeleteExistingResources: BOOL) -> HANDLE;
-    pub fn BeginUpdateResourceW(pFileName: LPCWSTR, bDeleteExistingResources: BOOL) -> HANDLE;
-    pub fn BindIoCompletionCallback(
-        FileHandle: HANDLE, Function: LPOVERLAPPED_COMPLETION_ROUTINE, Flags: ULONG,
-    ) -> BOOL;
-    pub fn BuildCommDCBA(lpDef: LPCSTR, lpDCB: LPDCB) -> BOOL;
-    pub fn BuildCommDCBAndTimeoutsA(
-        lpDef: LPCSTR, lpDCB: LPDCB, lpCommTimeouts: LPCOMMTIMEOUTS,
-    ) -> BOOL;
-    pub fn BuildCommDCBAndTimeoutsW(
-        lpDef: LPCWSTR, lpDCB: LPDCB, lpCommTimeouts: LPCOMMTIMEOUTS,
-    ) -> BOOL;
-    pub fn BuildCommDCBW(lpDef: LPCWSTR, lpDCB: LPDCB) -> BOOL;
-    pub fn CallNamedPipeA(
-        lpNamedPipeName: LPCSTR, lpInBuffer: LPVOID, nInBufferSize: DWORD, lpOutBuffer: LPVOID,
-        nOutBufferSize: DWORD, lpBytesRead: LPDWORD, nTimeOut: DWORD,
-    ) -> BOOL;
-    pub fn CallNamedPipeW(
-        lpNamedPipeName: LPCWSTR, lpInBuffer: LPVOID, nInBufferSize: DWORD, lpOutBuffer: LPVOID,
-        nOutBufferSize: DWORD, lpBytesRead: LPDWORD, nTimeOut: DWORD,
-    ) -> BOOL;
-    pub fn CallbackMayRunLong(pci: PTP_CALLBACK_INSTANCE) -> BOOL;
-    pub fn CalloutOnFiberStack(
-        lpFiber: PVOID, lpStartAddress: PFIBER_CALLOUT_ROUTINE, lpParameter: PVOID,
-    ) -> PVOID;
-    pub fn CancelDeviceWakeupRequest(hDevice: HANDLE) -> BOOL;
-    pub fn CancelIo(hFile: HANDLE) -> BOOL;
-    pub fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) -> BOOL;
-    pub fn CancelSynchronousIo(hThread: HANDLE) -> BOOL;
-    pub fn CancelThreadpoolIo(pio: PTP_IO);
-    pub fn CancelTimerQueueTimer(TimerQueue: HANDLE, Timer: HANDLE) -> BOOL;
-    pub fn CancelWaitableTimer(hTimer: HANDLE) -> BOOL;
-    pub fn CeipIsOptedIn() -> BOOL;
-    pub fn ChangeTimerQueueTimer(
-        TimerQueue: HANDLE, Timer: HANDLE, DueTime: ULONG, Period: ULONG,
-    ) -> BOOL;
-    // pub fn CheckElevation();
-    // pub fn CheckElevationEnabled();
-    pub fn CheckNameLegalDOS8Dot3A(
-        lpName: LPCSTR, lpOemName: LPSTR, OemNameSize: DWORD, pbNameContainsSpaces: PBOOL,
-        pbNameLegal: PBOOL,
-    ) -> BOOL;
-    pub fn CheckNameLegalDOS8Dot3W(
-        lpName: LPCWSTR, lpOemName: LPSTR, OemNameSize: DWORD, pbNameContainsSpaces: PBOOL,
-        pbNameLegal: PBOOL,
-    ) -> BOOL;
-    pub fn CheckRemoteDebuggerPresent(hProcess: HANDLE, pbDebuggerPresent: PBOOL) -> BOOL;
-    pub fn CheckTokenCapability(
-        TokenHandle: HANDLE, CapabilitySidToCheck: PSID, HasCapability: PBOOL,
-    ) -> BOOL;
-    pub fn CheckTokenMembershipEx(
-        TokenHandle: HANDLE, SidToCheck: PSID, Flags: DWORD, IsMember: PBOOL,
-    ) -> BOOL;
-    pub fn ClearCommBreak(hFile: HANDLE) -> BOOL;
-    pub fn ClearCommError(hFile: HANDLE, lpErrors: LPDWORD, lpStat: LPCOMSTAT) -> BOOL;
-    pub fn CloseHandle(hObject: HANDLE) -> BOOL;
-    // pub fn ClosePackageInfo();
-    pub fn ClosePrivateNamespace(Handle: HANDLE, Flags: ULONG) -> BOOLEAN;
-    // pub fn CloseState();
-    pub fn CloseThreadpool(ptpp: PTP_POOL);
-    pub fn CloseThreadpoolCleanupGroup(ptpcg: PTP_CLEANUP_GROUP);
-    pub fn CloseThreadpoolCleanupGroupMembers(
-        ptpcg: PTP_CLEANUP_GROUP, fCancelPendingCallbacks: BOOL, pvCleanupContext: PVOID,
-    );
-    pub fn CloseThreadpoolIo(pio: PTP_IO);
-    pub fn CloseThreadpoolTimer(pti: PTP_TIMER);
-    pub fn CloseThreadpoolWait(pwa: PTP_WAIT);
-    pub fn CloseThreadpoolWork(pwk: PTP_WORK);
-    pub fn CommConfigDialogA(lpszName: LPCSTR, hWnd: HWND, lpCC: LPCOMMCONFIG) -> BOOL;
-    pub fn CommConfigDialogW(lpszName: LPCWSTR, hWnd: HWND, lpCC: LPCOMMCONFIG) -> BOOL;
-    pub fn CompareFileTime(lpFileTime1: *const FILETIME, lpFileTime2: *const FILETIME) -> LONG;
-    pub fn CompareStringA(
-        Locale: LCID, dwCmpFlags: DWORD, lpString1: PCNZCH, cchCount1: c_int, lpString2: PCNZCH,
-        cchCount2: c_int,
-    ) -> c_int;
-    pub fn CompareStringEx(
-        lpLocaleName: LPCWSTR, dwCmpFlags: DWORD, lpString1: LPCWCH, cchCount1: c_int,
-        lpString2: LPCWCH, cchCount2: c_int, lpVersionInformation: LPNLSVERSIONINFO,
-        lpReserved: LPVOID, lParam: LPARAM,
-    ) -> c_int;
-    pub fn CompareStringOrdinal(
-        lpString1: LPCWCH, cchCount1: c_int, lpString2: LPCWCH, cchCount2: c_int, bIgnoreCase: BOOL,
-    ) -> c_int;
-    pub fn CompareStringW(
-        Locale: LCID, dwCmpFlags: DWORD, lpString1: PCNZWCH, cchCount1: c_int, lpString2: PCNZWCH,
-        cchCount2: c_int,
-    ) -> c_int;
-    pub fn ConnectNamedPipe(hNamedPipe: HANDLE, lpOverlapped: LPOVERLAPPED) -> BOOL;
-    pub fn ContinueDebugEvent(
-        dwProcessId: DWORD, dwThreadId: DWORD, dwContinueStatus: DWORD,
-    ) -> BOOL;
-    pub fn ConvertDefaultLocale(Locale: LCID) -> LCID;
-    pub fn ConvertFiberToThread() -> BOOL;
-    pub fn ConvertThreadToFiber(lpParameter: LPVOID) -> LPVOID;
-    pub fn ConvertThreadToFiberEx(lpParameter: LPVOID, dwFlags: DWORD) -> LPVOID;
-    pub fn CopyContext(Destination: PCONTEXT, ContextFlags: DWORD, Source: PCONTEXT) -> BOOL;
-    pub fn CopyFile2(
-        pwszExistingFileName: PCWSTR, pwszNewFileName: PCWSTR,
-        pExtendedParameters: *mut COPYFILE2_EXTENDED_PARAMETERS,
-    ) -> HRESULT;
-    pub fn CopyFileA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, bFailIfExists: BOOL
-    ) -> BOOL;
-    pub fn CopyFileExA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD,
-    ) -> BOOL;
-    pub fn CopyFileExW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD,
-    ) -> BOOL;
-    pub fn CopyFileTransactedA(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CopyFileTransactedW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, pbCancel: LPBOOL, dwCopyFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CopyFileW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, bFailIfExists: BOOL
-    ) -> BOOL;
-    pub fn CreateActCtxA(pActCtx: PCACTCTXA) -> HANDLE;
-    pub fn CreateActCtxW(pActCtx: PCACTCTXW) -> HANDLE;
-    pub fn CreateBoundaryDescriptorA(Name: LPCSTR, Flags: ULONG) -> HANDLE;
-    pub fn CreateBoundaryDescriptorW(Name: LPCWSTR, Flags: ULONG) -> HANDLE;
-    pub fn CreateConsoleScreenBuffer(
-        dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: *const SECURITY_ATTRIBUTES, dwFlags: DWORD,
-        lpScreenBufferData: LPVOID,
-    ) -> HANDLE;
-    pub fn CreateDirectoryA(
-        lpPathName: LPCSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateDirectoryExA(
-        lpTemplateDirectory: LPCSTR, lpNewDirectory: LPCSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateDirectoryExW(
-        lpTemplateDirectory: LPCWSTR, lpNewDirectory: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateDirectoryTransactedA(
-        lpTemplateDirectory: LPCSTR, lpNewDirectory: LPCSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CreateDirectoryTransactedW(
-        lpTemplateDirectory: LPCWSTR, lpNewDirectory: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CreateDirectoryW(
-        lpPathName: LPCWSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateEventA(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, bInitialState: BOOL,
-        lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateEventW(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, bInitialState: BOOL,
-        lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateEventExA(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateEventExW(
-        lpEventAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCWSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateFiber(
-        dwStackSize: SIZE_T, lpStartAddress: LPFIBER_START_ROUTINE, lpParameter: LPVOID,
-    ) -> LPVOID;
-    pub fn CreateFiberEx(
-        dwStackCommitSize: SIZE_T, dwStackReserveSize: SIZE_T, dwFlags: DWORD,
-        lpStartAddress: LPFIBER_START_ROUTINE, lpParameter: LPVOID,
-    ) -> LPVOID;
-    pub fn CreateFile2(
-        lpFileName: LPCWSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        dwCreationDisposition: DWORD, pCreateExParams: LPCREATEFILE2_EXTENDED_PARAMETERS,
-    ) -> HANDLE;
-    pub fn CreateFileA(
-        lpFileName: LPCSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE,
-    ) -> HANDLE;
-    pub fn CreateFileMappingA(
-        hFile: HANDLE, lpAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateFileMappingFromApp(
-        hFile: HANDLE, SecurityAttributes: PSECURITY_ATTRIBUTES, PageProtection: ULONG,
-        MaximumSize: ULONG64, Name: PCWSTR,
-    ) -> HANDLE;
-    pub fn CreateFileMappingNumaA(
-        hFile: HANDLE, lpFileMappingAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCSTR, nndPreferred: DWORD,
-    ) -> HANDLE;
-    pub fn CreateFileMappingNumaW(
-        hFile: HANDLE, lpFileMappingAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCWSTR, nndPreferred: DWORD,
-    ) -> HANDLE;
-    pub fn CreateFileMappingW(
-        hFile: HANDLE, lpAttributes: LPSECURITY_ATTRIBUTES, flProtect: DWORD,
-        dwMaximumSizeHigh: DWORD, dwMaximumSizeLow: DWORD, lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateFileTransactedA(
-        lpFileName: LPCSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE, hTransaction: HANDLE,
-        pusMiniVersion: PUSHORT, lpExtendedParameter: PVOID,
-    ) -> HANDLE;
-    pub fn CreateFileTransactedW(
-        lpFileName: LPCWSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE, hTransaction: HANDLE,
-        pusMiniVersion: PUSHORT, lpExtendedParameter: PVOID,
-    ) -> HANDLE;
-    pub fn CreateFileW(
-        lpFileName: LPCWSTR, dwDesiredAccess: DWORD, dwShareMode: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD,
-        dwFlagsAndAttributes: DWORD, hTemplateFile: HANDLE,
-    ) -> HANDLE;
-    pub fn CreateHardLinkA(
-        lpFileName: LPCSTR, lpExistingFileName: LPCSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateHardLinkTransactedA(
-        lpFileName: LPCSTR, lpExistingFileName: LPCSTR, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-        hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn CreateHardLinkTransactedW(
-        lpFileName: LPCWSTR, lpExistingFileName: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES, hTransaction: HANDLE,
-    );
-    pub fn CreateHardLinkW(
-        lpFileName: LPCWSTR, lpExistingFileName: LPCWSTR,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> BOOL;
-    pub fn CreateIoCompletionPort(
-        FileHandle: HANDLE, ExistingCompletionPort: HANDLE, CompletionKey: ULONG_PTR,
-        NumberOfConcurrentThreads: DWORD,
-    ) -> HANDLE;
-    pub fn CreateJobObjectA(lpJobAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCSTR) -> HANDLE;
-    pub fn CreateJobObjectW(lpJobAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCWSTR) -> HANDLE;
-    pub fn CreateJobSet(NumJob: ULONG, UserJobSet: PJOB_SET_ARRAY, Flags: ULONG) -> BOOL;
-    pub fn CreateMailslotA(
-        lpName: LPCSTR, nMaxMessageSize: DWORD, lReadTimeout: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreateMailslotW(
-        lpName: LPCWSTR, nMaxMessageSize: DWORD, lReadTimeout: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreateMemoryResourceNotification(
-        NotificationType: MEMORY_RESOURCE_NOTIFICATION_TYPE,
-    ) -> HANDLE;
-    pub fn CreateMutexA(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, bInitialOwner: BOOL, lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateMutexExA(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateMutexExW(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, lpName: LPCWSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateMutexW(
-        lpMutexAttributes: LPSECURITY_ATTRIBUTES, bInitialOwner: BOOL, lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateNamedPipeA(
-        lpName: LPCSTR, dwOpenMode: DWORD, dwPipeMode: DWORD, nMaxInstances: DWORD,
-        nOutBufferSize: DWORD, nInBufferSize: DWORD, nDefaultTimeOut: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreateNamedPipeW(
-        lpName: LPCWSTR, dwOpenMode: DWORD, dwPipeMode: DWORD, nMaxInstances: DWORD,
-        nOutBufferSize: DWORD, nInBufferSize: DWORD, nDefaultTimeOut: DWORD,
-        lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-    ) -> HANDLE;
-    pub fn CreatePipe(
-        hReadPipe: PHANDLE, hWritePipe: PHANDLE, lpPipeAttributes: LPSECURITY_ATTRIBUTES,
-        nSize: DWORD,
-    ) -> BOOL;
-    pub fn CreatePrivateNamespaceA(
-        lpPrivateNamespaceAttributes: LPSECURITY_ATTRIBUTES, lpBoundaryDescriptor: LPVOID,
-        lpAliasPrefix: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreatePrivateNamespaceW(
-        lpPrivateNamespaceAttributes: LPSECURITY_ATTRIBUTES, lpBoundaryDescriptor: LPVOID,
-        lpAliasPrefix: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateProcessA(
-        lpApplicationName: LPCSTR, lpCommandLine: LPSTR, lpProcessAttributes: LPSECURITY_ATTRIBUTES,
-        lpThreadAttributes: LPSECURITY_ATTRIBUTES, bInheritHandles: BOOL, dwCreationFlags: DWORD,
-        lpEnvironment: LPVOID, lpCurrentDirectory: LPCSTR, lpStartupInfo: LPSTARTUPINFOA,
-        lpProcessInformation: LPPROCESS_INFORMATION,
-    ) -> BOOL;
-    pub fn CreateProcessW(
-        lpApplicationName: LPCWSTR, lpCommandLine: LPWSTR,
-        lpProcessAttributes: LPSECURITY_ATTRIBUTES, lpThreadAttributes: LPSECURITY_ATTRIBUTES,
-        bInheritHandles: BOOL, dwCreationFlags: DWORD, lpEnvironment: LPVOID,
-        lpCurrentDirectory: LPCWSTR, lpStartupInfo: LPSTARTUPINFOW,
-        lpProcessInformation: LPPROCESS_INFORMATION,
-    ) -> BOOL;
-    pub fn CreateRemoteThread(
-        hProcess: HANDLE, lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
-        lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: LPVOID, dwCreationFlags: DWORD,
-        lpThreadId: LPDWORD,
-    ) -> HANDLE;
-    pub fn CreateRemoteThreadEx(
-        hProcess: HANDLE, lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
-        lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: LPVOID, dwCreationFlags: DWORD,
-        lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST, lpThreadId: LPDWORD,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreA(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreExA(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCSTR, dwFlags: DWORD, dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreExW(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCWSTR, dwFlags: DWORD, dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateSemaphoreW(
-        lpSemaphoreAttributes: LPSECURITY_ATTRIBUTES, lInitialCount: LONG, lMaximumCount: LONG,
-        lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn CreateSymbolicLinkA(
-        lpSymlinkFileName: LPCSTR, lpTargetFileName: LPCSTR, dwFlags: DWORD,
-    ) -> BOOLEAN;
-    pub fn CreateSymbolicLinkTransactedA(
-        lpSymlinkFileName: LPCSTR, lpTargetFileName: LPCSTR, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOLEAN;
-    pub fn CreateSymbolicLinkTransactedW(
-        lpSymlinkFileName: LPCWSTR, lpTargetFileName: LPCWSTR, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOLEAN;
-    pub fn CreateSymbolicLinkW(
-        lpSymlinkFileName: LPCWSTR, lpTargetFileName: LPCWSTR, dwFlags: DWORD,
-    ) -> BOOLEAN;
-    pub fn CreateTapePartition(
-        hDevice: HANDLE, dwPartitionMethod: DWORD, dwCount: DWORD, dwSize: DWORD,
-    ) -> DWORD;
-    pub fn CreateThread(
-        lpThreadAttributes: LPSECURITY_ATTRIBUTES, dwStackSize: SIZE_T,
-        lpStartAddress: LPTHREAD_START_ROUTINE, lpParameter: LPVOID, dwCreationFlags: DWORD,
-        lpThreadId: LPDWORD,
-    ) -> HANDLE;
-    pub fn CreateThreadpool(reserved: PVOID) -> PTP_POOL;
-    pub fn CreateThreadpoolCleanupGroup() -> PTP_CLEANUP_GROUP;
-    pub fn CreateThreadpoolIo(
-        fl: HANDLE, pfnio: PTP_WIN32_IO_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_IO;
-    pub fn CreateThreadpoolTimer(
-        pfnti: PTP_TIMER_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_TIMER;
-    pub fn CreateThreadpoolWait(
-        pfnwa: PTP_WAIT_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_WAIT;
-    pub fn CreateThreadpoolWork(
-        pfnwk: PTP_WORK_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> PTP_WORK;
-    pub fn CreateTimerQueue() -> HANDLE;
-    pub fn CreateTimerQueueTimer(
-        phNewTimer: PHANDLE, TimerQueue: HANDLE, Callback: WAITORTIMERCALLBACK, Parameter: PVOID,
-        DueTime: DWORD, Period: DWORD, Flags: ULONG,
-    ) -> BOOL;
-    pub fn CreateToolhelp32Snapshot(dwFlags: DWORD, th32ProcessID: DWORD) -> HANDLE;
-    #[cfg(target_arch = "x86_64")]
-    pub fn CreateUmsCompletionList(UmsCompletionList: *mut PUMS_COMPLETION_LIST) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn CreateUmsThreadContext(lpUmsThread: *mut PUMS_CONTEXT) -> BOOL;
-    pub fn CreateWaitableTimerA(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, lpTimerName: LPCSTR,
-    ) -> HANDLE;
-    pub fn CreateWaitableTimerExA(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, lpTimerName: LPCSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateWaitableTimerExW(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, lpTimerName: LPCWSTR, dwFlags: DWORD,
-        dwDesiredAccess: DWORD,
-    ) -> HANDLE;
-    pub fn CreateWaitableTimerW(
-        lpTimerAttributes: LPSECURITY_ATTRIBUTES, bManualReset: BOOL, lpTimerName: LPCWSTR,
-    ) -> HANDLE;
-    // pub fn CtrlRoutine();
-    pub fn DeactivateActCtx(dwFlags: DWORD, ulCookie: ULONG_PTR) -> BOOL;
-    pub fn DebugActiveProcess(dwProcessId: DWORD) -> BOOL;
-    pub fn DebugActiveProcessStop(dwProcessId: DWORD) -> BOOL;
-    pub fn DebugBreak();
-    pub fn DebugBreakProcess(Process: HANDLE) -> BOOL;
-    pub fn DebugSetProcessKillOnExit(KillOnExit: BOOL) -> BOOL;
-    pub fn DecodePointer(Ptr: PVOID) -> PVOID;
-    pub fn DecodeSystemPointer(Ptr: PVOID) -> PVOID;
-    pub fn DefineDosDeviceA(dwFlags: DWORD, lpDeviceName: LPCSTR, lpTargetPath: LPCSTR) -> BOOL;
-    pub fn DefineDosDeviceW(dwFlags: DWORD, lpDeviceName: LPCWSTR, lpTargetPath: LPCWSTR) -> BOOL;
-    pub fn DelayLoadFailureHook(pszDllName: LPCSTR, pszProcName: LPCSTR) -> FARPROC;
-    pub fn DeleteAtom(nAtom: ATOM) -> ATOM;
-    pub fn DeleteBoundaryDescriptor(BoundaryDescriptor: HANDLE);
-    pub fn DeleteCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn DeleteFiber(lpFiber: LPVOID);
-    pub fn DeleteFileA(lpFileName: LPCSTR) -> BOOL;
-    pub fn DeleteFileTransactedA(lpFileName: LPCSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn DeleteFileTransactedW(lpFileName: LPCWSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn DeleteFileW(lpFileName: LPCWSTR) -> BOOL;
-    pub fn DeleteProcThreadAttributeList(lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST);
-    pub fn DeleteSynchronizationBarrier(lpBarrier: LPSYNCHRONIZATION_BARRIER) -> BOOL;
-    pub fn DeleteTimerQueue(TimerQueue: HANDLE) -> BOOL;
-    pub fn DeleteTimerQueueEx(TimerQueue: HANDLE, CompletionEvent: HANDLE) -> BOOL;
-    pub fn DeleteTimerQueueTimer(
-        TimerQueue: HANDLE, Timer: HANDLE, CompletionEvent: HANDLE,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn DeleteUmsCompletionList(UmsCompletionList: PUMS_COMPLETION_LIST) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn DeleteUmsThreadContext(UmsThread: PUMS_CONTEXT) -> BOOL;
-    pub fn DeleteVolumeMountPointA(lpszVolumeMountPoint: LPCSTR) -> BOOL;
-    pub fn DeleteVolumeMountPointW(lpszVolumeMountPoint: LPCWSTR) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn DequeueUmsCompletionListItems(
-        UmsCompletionList: PUMS_COMPLETION_LIST, WaitTimeOut: DWORD,
-        UmsThreadList: *mut PUMS_CONTEXT,
-    ) -> BOOL;
-    pub fn DeviceIoControl(
-        hDevice: HANDLE, dwIoControlCode: DWORD, lpInBuffer: LPVOID, nInBufferSize: DWORD,
-        lpOutBuffer: LPVOID, nOutBufferSize: DWORD, lpBytesReturned: LPDWORD,
-        lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn DisableThreadLibraryCalls(hLibModule: HMODULE) -> BOOL;
-    pub fn DisableThreadProfiling(PerformanceDataHandle: HANDLE) -> DWORD;
-    pub fn DisassociateCurrentThreadFromCallback(pci: PTP_CALLBACK_INSTANCE);
-    pub fn DisconnectNamedPipe(hNamedPipe: HANDLE) -> BOOL;
-    pub fn DnsHostnameToComputerNameA(
-        Hostname: LPCSTR, ComputerName: LPCSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn DnsHostnameToComputerNameExW(
-        Hostname: LPCWSTR, ComputerName: LPWSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn DnsHostnameToComputerNameW(
-        Hostname: LPCWSTR, ComputerName: LPWSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn DosDateTimeToFileTime(wFatDate: WORD, wFatTime: WORD, lpFileTime: LPFILETIME) -> BOOL;
-    // pub fn DosPathToSessionPathW();
-    pub fn DuplicateHandle(
-        hSourceProcessHandle: HANDLE, hSourceHandle: HANDLE, hTargetProcessHandle: HANDLE,
-        lpTargetHandle: LPHANDLE, dwDesiredAccess: DWORD, bInheritHandle: BOOL, dwOptions: DWORD,
-    ) -> BOOL;
-    pub fn EnableThreadProfiling(
-        ThreadHandle: HANDLE, Flags: DWORD, HardwareCounters: DWORD64,
-        PerformanceDataHandle: *mut HANDLE,
-    ) -> BOOL;
-    pub fn EncodePointer(Ptr: PVOID) -> PVOID;
-    pub fn EncodeSystemPointer(Ptr: PVOID) -> PVOID;
-    pub fn EndUpdateResourceA(hUpdate: HANDLE, fDiscard: BOOL) -> BOOL;
-    pub fn EndUpdateResourceW(hUpdate: HANDLE, fDiscard: BOOL) -> BOOL;
-    pub fn EnterCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn EnterSynchronizationBarrier(
-        lpBarrier: LPSYNCHRONIZATION_BARRIER, dwFlags: DWORD,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn EnterUmsSchedulingMode(SchedulerStartupInfo: PUMS_SCHEDULER_STARTUP_INFO) -> BOOL;
-    pub fn EnumCalendarInfoA(
-        lpCalInfoEnumProc: CALINFO_ENUMPROCA, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoExA(
-        lpCalInfoEnumProcEx: CALINFO_ENUMPROCEXA, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoExEx(
-        pCalInfoEnumProcExEx: CALINFO_ENUMPROCEXEX, lpLocaleName: LPCWSTR, Calendar: CALID,
-        lpReserved: LPCWSTR, CalType: CALTYPE, lParam: LPARAM,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoExW(
-        lpCalInfoEnumProcEx: CALINFO_ENUMPROCEXW, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumCalendarInfoW(
-        lpCalInfoEnumProc: CALINFO_ENUMPROCW, Locale: LCID, Calendar: CALID, CalType: CALTYPE,
-    ) -> BOOL;
-    pub fn EnumDateFormatsA(
-        lpDateFmtEnumProc: DATEFMT_ENUMPROCA, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumDateFormatsExA(
-        lpDateFmtEnumProcEx: DATEFMT_ENUMPROCEXA, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumDateFormatsExEx(
-        lpDateFmtEnumProcExEx: DATEFMT_ENUMPROCEXEX, lpLocaleName: LPCWSTR, dwFlags: DWORD,
-        lParam: LPARAM,
-    ) -> BOOL;
-    pub fn EnumDateFormatsExW(
-        lpDateFmtEnumProcEx: DATEFMT_ENUMPROCEXW, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumDateFormatsW(
-        lpDateFmtEnumProc: DATEFMT_ENUMPROCW, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumLanguageGroupLocalesA(
-        lpLangGroupLocaleEnumProc: LANGGROUPLOCALE_ENUMPROCA, LanguageGroup: LGRPID, dwFlags: DWORD,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumLanguageGroupLocalesW(
-        lpLangGroupLocaleEnumProc: LANGGROUPLOCALE_ENUMPROCW, LanguageGroup: LGRPID, dwFlags: DWORD,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesA(
-        hModule: HMODULE, lpType: LPCSTR, lpName: LPCSTR, lpEnumFunc: ENUMRESLANGPROCA,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesExA(
-        hModule: HMODULE, lpType: LPCSTR, lpName: LPCSTR, lpEnumFunc: ENUMRESLANGPROCA,
-        lParam: LONG_PTR, dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesExW(
-        hModule: HMODULE, lpType: LPCWSTR, lpName: LPCWSTR, lpEnumFunc: ENUMRESLANGPROCW,
-        lParam: LONG_PTR, dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceLanguagesW(
-        hModule: HMODULE, lpType: LPCWSTR, lpName: LPCWSTR, lpEnumFunc: ENUMRESLANGPROCW,
-        lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceNamesA(
-        hModule: HMODULE, lpType: LPCSTR, lpEnumFunc: ENUMRESNAMEPROCA, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceNamesExA(
-        hModule: HMODULE, lpType: LPCSTR, lpEnumFunc: ENUMRESNAMEPROCA, lParam: LONG_PTR,
-        dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceNamesExW(
-        hModule: HMODULE, lpType: LPCWSTR, lpEnumFunc: ENUMRESNAMEPROCW, lParam: LONG_PTR,
-        dwFlags: DWORD, LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceNamesW(
-        hModule: HMODULE, lpType: LPCWSTR, lpEnumFunc: ENUMRESNAMEPROCW, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceTypesA(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCA, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumResourceTypesExA(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCA, lParam: LONG_PTR, dwFlags: DWORD,
-        LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceTypesExW(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCW, lParam: LONG_PTR, dwFlags: DWORD,
-        LangId: LANGID,
-    ) -> BOOL;
-    pub fn EnumResourceTypesW(
-        hModule: HMODULE, lpEnumFunc: ENUMRESTYPEPROCW, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumSystemCodePagesA(lpCodePageEnumProc: CODEPAGE_ENUMPROCA, dwFlags: DWORD) -> BOOL;
-    pub fn EnumSystemCodePagesW(lpCodePageEnumProc: CODEPAGE_ENUMPROCW, dwFlags: DWORD) -> BOOL;
-    pub fn EnumSystemFirmwareTables(
-        FirmwareTableProviderSignature: DWORD, pFirmwareTableEnumBuffer: PVOID, BufferSize: DWORD,
-    ) -> UINT;
-    pub fn EnumSystemGeoID(
-        GeoClass: GEOCLASS, ParentGeoId: GEOID, lpGeoEnumProc: GEO_ENUMPROC,
-    ) -> BOOL;
-    pub fn EnumSystemLanguageGroupsA(
-        lpLanguageGroupEnumProc: LANGUAGEGROUP_ENUMPROCA, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumSystemLanguageGroupsW(
-        lpLanguageGroupEnumProc: LANGUAGEGROUP_ENUMPROCW, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumSystemLocalesA(lpLocaleEnumProc: LOCALE_ENUMPROCA, dwFlags: DWORD) -> BOOL;
-    pub fn EnumSystemLocalesEx(
-        lpLocaleEnumProcEx: LOCALE_ENUMPROCEX, dwFlags: DWORD, lParam: LPARAM, lpReserved: LPVOID,
-    ) -> BOOL;
-    pub fn EnumSystemLocalesW(lpLocaleEnumProc: LOCALE_ENUMPROCW, dwFlags: DWORD) -> BOOL;
-    pub fn EnumTimeFormatsA(
-        lpTimeFmtEnumProc: TIMEFMT_ENUMPROCA, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumTimeFormatsEx(
-        lpTimeFmtEnumProcEx: TIMEFMT_ENUMPROCEX, lpLocaleName: LPCWSTR, dwFlags: DWORD,
-        lParam: LPARAM,
-    ) -> BOOL;
-    pub fn EnumTimeFormatsW(
-        lpTimeFmtEnumProc: TIMEFMT_ENUMPROCW, Locale: LCID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn EnumUILanguagesA(
-        lpUILanguageEnumProc: UILANGUAGE_ENUMPROCA, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    pub fn EnumUILanguagesW(
-        lpUILanguageEnumProc: UILANGUAGE_ENUMPROCW, dwFlags: DWORD, lParam: LONG_PTR,
-    ) -> BOOL;
-    // pub fn EnumerateLocalComputerNamesA();
-    // pub fn EnumerateLocalComputerNamesW();
-    pub fn EraseTape(hDevice: HANDLE, dwEraseType: DWORD, bImmediate: BOOL) -> DWORD;
-    pub fn EscapeCommFunction(hFile: HANDLE, dwFunc: DWORD) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn ExecuteUmsThread(UmsThread: PUMS_CONTEXT) -> BOOL;
-    pub fn ExitProcess(uExitCode: UINT);
-    pub fn ExitThread(dwExitCode: DWORD);
-    pub fn ExpandEnvironmentStringsA(lpSrc: LPCSTR, lpDst: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn ExpandEnvironmentStringsW(lpSrc: LPCWSTR, lpDst: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn FatalAppExitA(uAction: UINT, lpMessageText: LPCSTR);
-    pub fn FatalAppExitW(uAction: UINT, lpMessageText: LPCWSTR);
-    pub fn FatalExit(ExitCode: c_int);
-    pub fn FileTimeToDosDateTime(
-        lpFileTime: *const FILETIME, lpFatDate: LPWORD, lpFatTime: LPWORD,
-    ) -> BOOL;
-    pub fn FileTimeToLocalFileTime(
-        lpFileTime: *const FILETIME, lpLocalFileTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn FileTimeToSystemTime(
-        lpFileTime: *const FILETIME, lpSystemTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn FillConsoleOutputAttribute(
-        hConsoleOutput: HANDLE, wAttribute: WORD, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfAttrsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn FillConsoleOutputCharacterA(
-        hConsoleOutput: HANDLE, cCharacter: CHAR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn FillConsoleOutputCharacterW(
-        hConsoleOutput: HANDLE, cCharacter: WCHAR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn FindActCtxSectionGuid(
-        dwFlags: DWORD, lpExtensionGuid: *const GUID, ulSectionId: ULONG, lpGuidToFind: *const GUID,
-        ReturnedData: PACTCTX_SECTION_KEYED_DATA,
-    ) -> BOOL;
-    pub fn FindActCtxSectionStringA(
-        dwFlags: DWORD, lpExtensionGuid: *const GUID, ulSectionId: ULONG, lpStringToFind: LPCSTR,
-        ReturnedData: PACTCTX_SECTION_KEYED_DATA,
-    ) -> BOOL;
-    pub fn FindActCtxSectionStringW(
-        dwFlags: DWORD, lpExtensionGuid: *const GUID, ulSectionId: ULONG, lpStringToFind: LPCWSTR,
-        ReturnedData: PACTCTX_SECTION_KEYED_DATA,
-    ) -> BOOL;
-    pub fn FindAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn FindAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn FindClose(hFindFile: HANDLE) -> BOOL;
-    pub fn FindCloseChangeNotification(hChangeHandle: HANDLE) -> BOOL;
-    pub fn FindFirstChangeNotificationA(
-        lpPathName: LPCSTR, bWatchSubtree: BOOL, dwNotifyFilter: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstChangeNotificationW(
-        lpPathName: LPCWSTR, bWatchSubtree: BOOL, dwNotifyFilter: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstFileA(lpFileName: LPCSTR, lpFindFileData: LPWIN32_FIND_DATAA) -> HANDLE;
-    pub fn FindFirstFileExA(
-        lpFileName: LPCSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstFileExW(
-        lpFileName: LPCWSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstFileNameTransactedW(
-        lpFileName: LPCWSTR, dwFlags: DWORD, StringLength: LPDWORD, LinkName: PWSTR,
-        hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstFileNameW(
-        lpFileName: LPCWSTR, dwFlags: DWORD, StringLength: LPDWORD, LinkName: PWSTR,
-    ) -> HANDLE;
-    pub fn FindFirstFileTransactedA(
-        lpFileName: LPCSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-        hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstFileTransactedW(
-        lpFileName: LPCWSTR, fInfoLevelId: FINDEX_INFO_LEVELS, lpFindFileData: LPVOID,
-        fSearchOp: FINDEX_SEARCH_OPS, lpSearchFilter: LPVOID, dwAdditionalFlags: DWORD,
-        hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstFileW(lpFileName: LPCWSTR, lpFindFileData: LPWIN32_FIND_DATAW) -> HANDLE;
-    pub fn FindFirstStreamTransactedW(
-        lpFileName: LPCWSTR, InfoLevel: STREAM_INFO_LEVELS, lpFindStreamData: LPVOID,
-        dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> HANDLE;
-    pub fn FindFirstStreamW(
-        lpFileName: LPCWSTR, InfoLevel: STREAM_INFO_LEVELS, lpFindStreamData: LPVOID,
-        dwFlags: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstVolumeA(lpszVolumeName: LPSTR, cchBufferLength: DWORD) -> HANDLE;
-    pub fn FindFirstVolumeMountPointA(
-        lpszRootPathName: LPCSTR, lpszVolumeMountPoint: LPSTR, cchBufferLength: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstVolumeMountPointW(
-        lpszRootPathName: LPCWSTR, lpszVolumeMountPoint: LPWSTR, cchBufferLength: DWORD,
-    ) -> HANDLE;
-    pub fn FindFirstVolumeW(lpszVolumeName: LPWSTR, cchBufferLength: DWORD) -> HANDLE;
-    pub fn FindNLSString(
-        Locale: LCID, dwFindNLSStringFlags: DWORD, lpStringSource: LPCWSTR, cchSource: c_int,
-        lpStringValue: LPCWSTR, cchValue: c_int, pcchFound: LPINT,
-    ) -> c_int;
-    pub fn FindNLSStringEx(
-        lpLocaleName: LPCWSTR, dwFindNLSStringFlags: DWORD, lpStringSource: LPCWSTR,
-        cchSource: c_int, lpStringValue: LPCWSTR, cchValue: c_int, pcchFound: LPINT,
-        lpVersionInformation: LPNLSVERSIONINFO, lpReserved: LPVOID, sortHandle: LPARAM,
-    ) -> c_int;
-    pub fn FindNextChangeNotification(hChangeHandle: HANDLE) -> BOOL;
-    pub fn FindNextFileA(hFindFile: HANDLE, lpFindFileData: LPWIN32_FIND_DATAA) -> BOOL;
-    pub fn FindNextFileNameW(hFindStream: HANDLE, StringLength: LPDWORD, LinkName: PWSTR) -> BOOL;
-    pub fn FindNextFileW(hFindFile: HANDLE, lpFindFileData: LPWIN32_FIND_DATAW) -> BOOL;
-    pub fn FindNextStreamW(hFindStream: HANDLE, lpFindStreamData: LPVOID) -> BOOL;
-    pub fn FindNextVolumeA(
-        hFindVolume: HANDLE, lpszVolumeName: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn FindNextVolumeMountPointA(
-        hFindVolumeMountPoint: HANDLE, lpszVolumeMountPoint: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn FindNextVolumeMountPointW(
-        hFindVolumeMountPoint: HANDLE, lpszVolumeMountPoint: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn FindNextVolumeW(
-        hFindVolume: HANDLE, lpszVolumeName: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    // pub fn FindPackagesByPackageFamily();
-    pub fn FindResourceA(hModule: HMODULE, lpName: LPCSTR, lpType: LPCSTR) -> HRSRC;
-    pub fn FindResourceExA(
-        hModule: HMODULE, lpName: LPCSTR, lpType: LPCSTR, wLanguage: WORD,
-    ) -> HRSRC;
-    pub fn FindResourceExW(
-        hModule: HMODULE, lpName: LPCWSTR, lpType: LPCWSTR, wLanguage: WORD,
-    ) -> HRSRC;
-    pub fn FindResourceW(hModule: HMODULE, lpName: LPCWSTR, lpType: LPCWSTR) -> HRSRC;
-    pub fn FindStringOrdinal(
-        dwFindStringOrdinalFlags: DWORD, lpStringSource: LPCWSTR, cchSource: c_int,
-        lpStringValue: LPCWSTR, cchValue: c_int, bIgnoreCase: BOOL,
-    ) -> c_int;
-    pub fn FindVolumeClose(hFindVolume: HANDLE) -> BOOL;
-    pub fn FindVolumeMountPointClose(hFindVolumeMountPoint: HANDLE) -> BOOL;
-    pub fn FlsAlloc(lpCallback: PFLS_CALLBACK_FUNCTION) -> DWORD;
-    pub fn FlsFree(dwFlsIndex: DWORD) -> BOOL;
-    pub fn FlsGetValue(dwFlsIndex: DWORD) -> PVOID;
-    pub fn FlsSetValue(dwFlsIndex: DWORD, lpFlsData: PVOID) -> BOOL;
-    pub fn FlushConsoleInputBuffer(hConsoleInput: HANDLE) -> BOOL;
-    pub fn FlushFileBuffers(hFile: HANDLE) -> BOOL;
-    pub fn FlushInstructionCache(hProcess: HANDLE, lpBaseAddress: LPCVOID, dwSize: SIZE_T) -> BOOL;
-    pub fn FlushProcessWriteBuffers();
-    pub fn FlushViewOfFile(lpBaseAddress: LPCVOID, dwNumberOfBytesToFlush: SIZE_T) -> BOOL;
-    pub fn FoldStringA(
-        dwMapFlags: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpDestStr: LPSTR, cchDest: c_int,
-    ) -> c_int;
-    pub fn FoldStringW(
-        dwMapFlags: DWORD, lpSrcStr: LPCWCH, cchSrc: c_int, lpDestStr: LPWSTR, cchDest: c_int,
-    ) -> c_int;
-    // pub fn FormatApplicationUserModelId();
-    pub fn FormatMessageA(
-        dwFlags: DWORD, lpSource: LPCVOID, dwMessageId: DWORD, dwLanguageId: DWORD,
-        lpBuffer: LPSTR, nSize: DWORD, Arguments: *mut va_list,
-    ) -> DWORD;
-    pub fn FormatMessageW(
-        dwFlags: DWORD, lpSource: LPCVOID, dwMessageId: DWORD, dwLanguageId: DWORD,
-        lpBuffer: LPWSTR, nSize: DWORD, Arguments: *mut va_list,
-    ) -> DWORD;
-    pub fn FreeConsole() -> BOOL;
-    pub fn FreeEnvironmentStringsA(penv: LPCH) -> BOOL;
-    pub fn FreeEnvironmentStringsW(penv: LPWCH) -> BOOL;
-    pub fn FreeLibrary(hLibModule: HMODULE) -> BOOL;
-    pub fn FreeLibraryAndExitThread(hLibModule: HMODULE, dwExitCode: DWORD);
-    pub fn FreeLibraryWhenCallbackReturns(pci: PTP_CALLBACK_INSTANCE, module: HMODULE);
-    pub fn FreeResource(hResData: HGLOBAL) -> BOOL;
-    pub fn FreeUserPhysicalPages(
-        hProcess: HANDLE, NumberOfPages: PULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn GenerateConsoleCtrlEvent(dwCtrlEvent: DWORD, dwProcessGroupId: DWORD) -> BOOL;
-    pub fn GetACP() -> UINT;
-    pub fn GetActiveProcessorCount(GroupNumber: WORD) -> DWORD;
-    pub fn GetActiveProcessorGroupCount() -> WORD;
-    pub fn GetAppContainerAce(
-        Acl: PACL, StartingAceIndex: DWORD, AppContainerAce: *mut PVOID,
-        AppContainerAceIndex: *mut DWORD,
-    ) -> BOOL;
-    pub fn GetAppContainerNamedObjectPath(
-        Token: HANDLE, AppContainerSid: PSID, ObjectPathLength: ULONG, ObjectPath: LPWSTR,
-        ReturnLength: PULONG,
-    ) -> BOOL;
-    pub fn GetApplicationRecoveryCallback(
-        hProcess: HANDLE, pRecoveryCallback: *mut APPLICATION_RECOVERY_CALLBACK,
-        ppvParameter: *mut PVOID, pdwPingInterval: PDWORD, pdwFlags: PDWORD,
-    ) -> HRESULT;
-    pub fn GetApplicationRestartSettings(
-        hProcess: HANDLE, pwzCommandline: PWSTR, pcchSize: PDWORD, pdwFlags: PDWORD,
-    ) -> HRESULT;
-    // pub fn GetApplicationUserModelId();
-    pub fn GetAtomNameA(nAtom: ATOM, lpBuffer: LPSTR, nSize: c_int) -> UINT;
-    pub fn GetAtomNameW(nAtom: ATOM, lpBuffer: LPWSTR, nSize: c_int) -> UINT;
-    pub fn GetBinaryTypeA(lpApplicationName: LPCSTR, lpBinaryType: LPDWORD) -> BOOL;
-    pub fn GetBinaryTypeW(lpApplicationName: LPCWSTR, lpBinaryType: LPDWORD) -> BOOL;
-    pub fn GetCPInfo(CodePage: UINT, lpCPInfo: LPCPINFO) -> BOOL;
-    pub fn GetCPInfoExA(CodePage: UINT, dwFlags: DWORD, lpCPInfoEx: LPCPINFOEXA) -> BOOL;
-    pub fn GetCPInfoExW(CodePage: UINT, dwFlags: DWORD, lpCPInfoEx: LPCPINFOEXW) -> BOOL;
-    pub fn GetCachedSigningLevel(
-        File: HANDLE, Flags: PULONG, SigningLevel: PULONG, Thumbprint: PUCHAR,
-        ThumbprintSize: PULONG, ThumbprintAlgorithm: PULONG,
-    ) -> BOOL;
-    pub fn GetCalendarInfoA(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPSTR, cchData: c_int,
-        lpValue: LPDWORD,
-    ) -> c_int;
-    pub fn GetCalendarInfoEx(
-        lpLocaleName: LPCWSTR, Calendar: CALID, lpReserved: LPCWSTR, CalType: CALTYPE,
-        lpCalData: LPWSTR, cchData: c_int, lpValue: LPDWORD,
-    ) -> c_int;
-    pub fn GetCalendarInfoW(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPWSTR, cchData: c_int,
-        lpValue: LPDWORD,
-    ) -> c_int;
-    pub fn GetCommConfig(hCommDev: HANDLE, lpCC: LPCOMMCONFIG, lpdwSize: LPDWORD) -> BOOL;
-    pub fn GetCommMask(hFile: HANDLE, lpEvtMask: LPDWORD) -> BOOL;
-    pub fn GetCommModemStatus(hFile: HANDLE, lpModemStat: LPDWORD) -> BOOL;
-    pub fn GetCommProperties(hFile: HANDLE, lpCommProp: LPCOMMPROP) -> BOOL;
-    pub fn GetCommState(hFile: HANDLE, lpDCB: LPDCB) -> BOOL;
-    pub fn GetCommTimeouts(hFile: HANDLE, lpCommTimeouts: LPCOMMTIMEOUTS) -> BOOL;
-    pub fn GetCommandLineA() -> LPSTR;
-    pub fn GetCommandLineW() -> LPWSTR;
-    pub fn GetCompressedFileSizeA(lpFileName: LPCSTR, lpFileSizeHigh: LPDWORD) -> DWORD;
-    pub fn GetCompressedFileSizeTransactedA(
-        lpFileName: LPCSTR, lpFileSizeHigh: LPDWORD, hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetCompressedFileSizeTransactedW(
-        lpFileName: LPCWSTR, lpFileSizeHigh: LPDWORD, hTransaction: HANDLE,
-    );
-    pub fn GetCompressedFileSizeW(lpFileName: LPCWSTR, lpFileSizeHigh: LPDWORD) -> DWORD;
-    pub fn GetComputerNameA(lpBuffer: LPSTR, nSize: LPDWORD) -> BOOL;
-    pub fn GetComputerNameExA(
-        NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn GetComputerNameExW(
-        NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPWSTR, nSize: LPDWORD,
-    ) -> BOOL;
-    pub fn GetComputerNameW(lpBuffer: LPWSTR, nSize: LPDWORD) -> BOOL;
-    pub fn GetConsoleAliasA(
-        Source: LPSTR, TargetBuffer: LPSTR, TargetBufferLength: DWORD, ExeName: LPSTR,
-    ) -> DWORD;
-    pub fn GetConsoleAliasExesA(ExeNameBuffer: LPSTR, ExeNameBufferLength: DWORD) -> DWORD;
-    pub fn GetConsoleAliasExesLengthA() -> DWORD;
-    pub fn GetConsoleAliasExesLengthW() -> DWORD;
-    pub fn GetConsoleAliasExesW(ExeNameBuffer: LPWSTR, ExeNameBufferLength: DWORD) -> DWORD;
-    pub fn GetConsoleAliasW(
-        Source: LPWSTR, TargetBuffer: LPWSTR, TargetBufferLength: DWORD, ExeName: LPWSTR,
-    ) -> DWORD;
-    pub fn GetConsoleAliasesA(
-        AliasBuffer: LPSTR, AliasBufferLength: DWORD, ExeName: LPSTR,
-    ) -> DWORD;
-    pub fn GetConsoleAliasesLengthA(ExeName: LPSTR) -> DWORD;
-    pub fn GetConsoleAliasesLengthW(ExeName: LPWSTR) -> DWORD;
-    pub fn GetConsoleAliasesW(
-        AliasBuffer: LPWSTR, AliasBufferLength: DWORD, ExeName: LPWSTR,
-    ) -> DWORD;
-    pub fn GetConsoleCP() -> UINT;
-    pub fn GetConsoleCursorInfo(
-        hConsoleOutput: HANDLE, lpConsoleCursorInfo: PCONSOLE_CURSOR_INFO,
-    ) -> BOOL;
-    pub fn GetConsoleDisplayMode(lpModeFlags: LPDWORD) -> BOOL;
-    pub fn GetConsoleFontSize(hConsoleOutput: HANDLE, nFont: DWORD) -> COORD;
-    pub fn GetConsoleHistoryInfo(lpConsoleHistoryInfo: PCONSOLE_HISTORY_INFO) -> BOOL;
-    pub fn GetConsoleMode(hConsoleHandle: HANDLE, lpMode: LPDWORD) -> BOOL;
-    pub fn GetConsoleOriginalTitleA(lpConsoleTitle: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleOriginalTitleW(lpConsoleTitle: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleOutputCP() -> UINT;
-    pub fn GetConsoleProcessList(lpdwProcessList: LPDWORD, dwProcessCount: DWORD) -> DWORD;
-    pub fn GetConsoleScreenBufferInfo(
-        hConsoleOutput: HANDLE, lpConsoleScreenBufferInfo: PCONSOLE_SCREEN_BUFFER_INFO,
-    ) -> BOOL;
-    pub fn GetConsoleScreenBufferInfoEx(
-        hConsoleOutput: HANDLE, lpConsoleScreenBufferInfoEx: PCONSOLE_SCREEN_BUFFER_INFOEX,
-    ) -> BOOL;
-    pub fn GetConsoleSelectionInfo(lpConsoleSelectionInfo: PCONSOLE_SELECTION_INFO) -> BOOL;
-    pub fn GetConsoleTitleA(lpConsoleTitle: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleTitleW(lpConsoleTitle: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn GetConsoleWindow() -> HWND;
-    pub fn GetCurrencyFormatA(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCSTR, lpFormat: *const CURRENCYFMTA,
-        lpCurrencyStr: LPSTR, cchCurrency: c_int,
-    ) -> c_int;
-    pub fn GetCurrencyFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const CURRENCYFMTW,
-        lpCurrencyStr: LPWSTR, cchCurrency: c_int,
-    ) -> c_int;
-    pub fn GetCurrencyFormatW(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const CURRENCYFMTW,
-        lpCurrencyStr: LPWSTR, cchCurrency: c_int,
-    ) -> c_int;
-    pub fn GetCurrentActCtx(lphActCtx: *mut HANDLE) -> BOOL;
-    // pub fn GetCurrentApplicationUserModelId();
-    pub fn GetCurrentConsoleFont(
-        hConsoleOutput: HANDLE, bMaximumWindow: BOOL, lpConsoleCurrentFont: PCONSOLE_FONT_INFO,
-    ) -> BOOL;
-    pub fn GetCurrentConsoleFontEx(
-        hConsoleOutput: HANDLE, bMaximumWindow: BOOL, lpConsoleCurrentFontEx: PCONSOLE_FONT_INFOEX,
-    ) -> BOOL;
-    pub fn GetCurrentDirectoryA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetCurrentDirectoryW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    // pub fn GetCurrentPackageFamilyName();
-    // pub fn GetCurrentPackageFullName();
-    // pub fn GetCurrentPackageId();
-    // pub fn GetCurrentPackageInfo();
-    // pub fn GetCurrentPackagePath();
-    pub fn GetCurrentProcess() -> HANDLE;
-    pub fn GetCurrentProcessId() -> DWORD;
-    pub fn GetCurrentProcessorNumber() -> DWORD;
-    pub fn GetCurrentProcessorNumberEx(ProcNumber: PPROCESSOR_NUMBER);
-    pub fn GetCurrentThread() -> HANDLE;
-    pub fn GetCurrentThreadId() -> DWORD;
-    pub fn GetCurrentThreadStackLimits(LowLimit: PULONG_PTR, HighLimit: PULONG_PTR);
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetCurrentUmsThread() -> PUMS_CONTEXT;
-    pub fn GetDateFormatA(
-        Locale: LCID, dwFlags: DWORD, lpDate: *const SYSTEMTIME, lpFormat: LPCSTR, lpDateStr: LPSTR,
-        cchDate: c_int,
-    ) -> c_int;
-    pub fn GetDateFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpDate: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpDateStr: LPWSTR, cchDate: c_int, lpCalendar: LPCWSTR,
-    ) -> c_int;
-    pub fn GetDateFormatW(
-        Locale: LCID, dwFlags: DWORD, lpDate: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpDateStr: LPWSTR, cchDate: c_int,
-    ) -> c_int;
-    pub fn GetDefaultCommConfigA(lpszName: LPCSTR, lpCC: LPCOMMCONFIG, lpdwSize: LPDWORD) -> BOOL;
-    pub fn GetDefaultCommConfigW(lpszName: LPCWSTR, lpCC: LPCOMMCONFIG, lpdwSize: LPDWORD) -> BOOL;
-    pub fn GetDevicePowerState(hDevice: HANDLE, pfOn: *mut BOOL) -> BOOL;
-    pub fn GetDiskFreeSpaceA(
-        lpRootPathName: LPCSTR, lpSectorsPerCluster: LPDWORD, lpBytesPerSector: LPDWORD,
-        lpNumberOfFreeClusters: LPDWORD, lpTotalNumberOfClusters: LPDWORD,
-    ) -> BOOL;
-    pub fn GetDiskFreeSpaceExA(
-        lpDirectoryName: LPCSTR, lpFreeBytesAvailableToCaller: PULARGE_INTEGER,
-        lpTotalNumberOfBytes: PULARGE_INTEGER, lpTotalNumberOfFreeBytes: PULARGE_INTEGER,
-    ) -> BOOL;
-    pub fn GetDiskFreeSpaceExW(
-        lpDirectoryName: LPCWSTR, lpFreeBytesAvailableToCaller: PULARGE_INTEGER,
-        lpTotalNumberOfBytes: PULARGE_INTEGER, lpTotalNumberOfFreeBytes: PULARGE_INTEGER,
-    ) -> BOOL;
-    pub fn GetDiskFreeSpaceW(
-        lpRootPathName: LPCWSTR, lpSectorsPerCluster: LPDWORD, lpBytesPerSector: LPDWORD,
-        lpNumberOfFreeClusters: LPDWORD, lpTotalNumberOfClusters: LPDWORD,
-    ) -> BOOL;
-    pub fn GetDllDirectoryA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetDllDirectoryW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    pub fn GetDriveTypeA(lpRootPathName: LPCSTR) -> UINT;
-    pub fn GetDriveTypeW(lpRootPathName: LPCWSTR) -> UINT;
-    pub fn GetDurationFormat(
-        Locale: LCID, dwFlags: DWORD, lpDuration: *const SYSTEMTIME, ullDuration: ULONGLONG,
-        lpFormat: LPCWSTR, lpDurationStr: LPWSTR, cchDuration: c_int,
-    ) -> c_int;
-    pub fn GetDurationFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpDuration: *const SYSTEMTIME,
-        ullDuration: ULONGLONG, lpFormat: LPCWSTR, lpDurationStr: LPWSTR, cchDuration: c_int,
-    ) -> c_int;
-    pub fn GetDynamicTimeZoneInformation(
-        pTimeZoneInformation: PDYNAMIC_TIME_ZONE_INFORMATION,
-    ) -> DWORD;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn GetEnabledXStateFeatures() -> DWORD64;
-    pub fn GetEnvironmentStrings() -> LPCH;
-    pub fn GetEnvironmentStringsW() -> LPWCH;
-    pub fn GetEnvironmentVariableA(lpName: LPCSTR, lpBuffer: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetEnvironmentVariableW(lpName: LPCWSTR, lpBuffer: LPWSTR, nSize: DWORD) -> DWORD;
-    // pub fn GetEraNameCountedString();
-    pub fn GetErrorMode() -> UINT;
-    pub fn GetExitCodeProcess(hProcess: HANDLE, lpExitCode: LPDWORD) -> BOOL;
-    pub fn GetExitCodeThread(hThread: HANDLE, lpExitCode: LPDWORD) -> BOOL;
-    pub fn GetFileAttributesA(lpFileName: LPCSTR) -> DWORD;
-    pub fn GetFileAttributesExA(
-        lpFileName: LPCSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-    ) -> BOOL;
-    pub fn GetFileAttributesExW(
-        lpFileName: LPCWSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-    ) -> BOOL;
-    pub fn GetFileAttributesTransactedA(
-        lpFileName: LPCSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-        hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn GetFileAttributesTransactedW(
-        lpFileName: LPCWSTR, fInfoLevelId: GET_FILEEX_INFO_LEVELS, lpFileInformation: LPVOID,
-        hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn GetFileAttributesW(lpFileName: LPCWSTR) -> DWORD;
-    pub fn GetFileBandwidthReservation(
-        hFile: HANDLE, lpPeriodMilliseconds: LPDWORD, lpBytesPerPeriod: LPDWORD,
-        pDiscardable: LPBOOL, lpTransferSize: LPDWORD, lpNumOutstandingRequests: LPDWORD,
-    ) -> BOOL;
-    pub fn GetFileInformationByHandle(
-        hFile: HANDLE, lpFileInformation: LPBY_HANDLE_FILE_INFORMATION,
-    ) -> BOOL;
-    pub fn GetFileInformationByHandleEx(
-        hFile: HANDLE, FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, lpFileInformation: LPVOID,
-        dwBufferSize: DWORD,
-    ) -> BOOL;
-    pub fn GetFileMUIInfo(
-        dwFlags: DWORD, pcwszFilePath: PCWSTR, pFileMUIInfo: PFILEMUIINFO,
-        pcbFileMUIInfo: *mut DWORD,
-    ) -> BOOL;
-    pub fn GetFileMUIPath(
-        dwFlags: DWORD, pcwszFilePath: PCWSTR, pwszLanguage: PWSTR, pcchLanguage: PULONG,
-        pwszFileMUIPath: PWSTR, pcchFileMUIPath: PULONG, pululEnumerator: PULONGLONG,
-    ) -> BOOL;
-    pub fn GetFileSize(hFile: HANDLE, lpFileSizeHigh: LPDWORD) -> DWORD;
-    pub fn GetFileSizeEx(hFile: HANDLE, lpFileSize: PLARGE_INTEGER) -> BOOL;
-    pub fn GetFileTime(
-        hFile: HANDLE, lpCreationTime: LPFILETIME, lpLastAccessTime: LPFILETIME,
-        lpLastWriteTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetFileType(hFile: HANDLE) -> DWORD;
-    pub fn GetFinalPathNameByHandleA(
-        hFile: HANDLE, lpszFilePath: LPSTR, cchFilePath: DWORD, dwFlags: DWORD,
-    ) -> DWORD;
-    pub fn GetFinalPathNameByHandleW(
-        hFile: HANDLE, lpszFilePath: LPWSTR, cchFilePath: DWORD, dwFlags: DWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pBuffer: PVOID, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableExA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pBuffer: PVOID, nSize: DWORD, pdwAttribubutes: PDWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableExW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pBuffer: PVOID, nSize: DWORD, pdwAttribubutes: PDWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareEnvironmentVariableW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pBuffer: PVOID, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetFirmwareType(FirmwareType: PFIRMWARE_TYPE) -> BOOL;
-    pub fn GetFullPathNameA(
-        lpFileName: LPCSTR, nBufferLength: DWORD, lpBuffer: LPSTR, lpFilePart: *mut LPSTR,
-    ) -> DWORD;
-    pub fn GetFullPathNameTransactedA(
-        lpFileName: LPCSTR, nBufferLength: DWORD, lpBuffer: LPSTR, lpFilePart: *mut LPSTR,
-        hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetFullPathNameTransactedW(
-        lpFileName: LPCWSTR, nBufferLength: DWORD, lpBuffer: LPWSTR, lpFilePart: *mut LPWSTR,
-        hTransaction: HANDLE,
-    );
-    pub fn GetFullPathNameW(
-        lpFileName: LPCWSTR, nBufferLength: DWORD, lpBuffer: LPWSTR, lpFilePart: *mut LPWSTR,
-    ) -> DWORD;
-    pub fn GetGeoInfoA(
-        Location: GEOID, GeoType: GEOTYPE, lpGeoData: LPSTR, cchData: c_int, LangId: LANGID,
-    ) -> c_int;
-    pub fn GetGeoInfoW(
-        Location: GEOID, GeoType: GEOTYPE, lpGeoData: LPWSTR, cchData: c_int, LangId: LANGID,
-    ) -> c_int;
-    pub fn GetHandleInformation(hObject: HANDLE, lpdwFlags: LPDWORD) -> BOOL;
-    pub fn GetLargePageMinimum() -> SIZE_T;
-    pub fn GetLargestConsoleWindowSize(hConsoleOutput: HANDLE) -> COORD;
-    pub fn GetLastError() -> DWORD;
-    pub fn GetLocalTime(lpSystemTime: LPSYSTEMTIME);
-    pub fn GetLocaleInfoA(
-        Locale: LCID, LCType: LCTYPE, lpLCData: LPSTR, cchData: c_int,
-    ) -> c_int;
-    pub fn GetLocaleInfoEx(
-        lpLocaleName: LPCWSTR, LCType: LCTYPE, lpLCData: LPWSTR, cchData: c_int,
-    ) -> c_int;
-    pub fn GetLocaleInfoW(
-        Locale: LCID, LCType: LCTYPE, lpLCData: LPWSTR, cchData: c_int,
-    ) -> c_int;
-    pub fn GetLogicalDriveStringsA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetLogicalDriveStringsW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    pub fn GetLogicalDrives() -> DWORD;
-    pub fn GetLogicalProcessorInformation(
-        Buffer: PSYSTEM_LOGICAL_PROCESSOR_INFORMATION, ReturnedLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetLogicalProcessorInformationEx(
-        RelationshipType: LOGICAL_PROCESSOR_RELATIONSHIP,
-        Buffer: PSYSTEM_LOGICAL_PROCESSOR_INFORMATION,
-        ReturnedLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetLongPathNameA(lpszShortPath: LPCSTR, lpszLongPath: LPSTR, cchBuffer: DWORD) -> DWORD;
-    pub fn GetLongPathNameTransactedA(
-        lpszShortPath: LPCSTR, lpszLongPath: LPSTR, cchBuffer: DWORD, hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetLongPathNameTransactedW(
-        lpszShortPath: LPCWSTR, lpszLongPath: LPWSTR, cchBuffer: DWORD, hTransaction: HANDLE,
-    ) -> DWORD;
-    pub fn GetLongPathNameW(
-        lpszShortPath: LPCWSTR, lpszLongPath: LPWSTR, cchBuffer: DWORD,
-    ) -> DWORD;
-    pub fn GetMailslotInfo(
-        hMailslot: HANDLE, lpMaxMessageSize: LPDWORD, lpNextSize: LPDWORD, lpMessageCount: LPDWORD,
-        lpReadTimeout: LPDWORD,
-    ) -> BOOL;
-    pub fn GetMaximumProcessorCount(GroupNumber: WORD) -> DWORD;
-    pub fn GetMaximumProcessorGroupCount() -> WORD;
-    pub fn GetMemoryErrorHandlingCapabilities(Capabilities: PULONG) -> BOOL;
-    pub fn GetModuleFileNameA(
-        hModule: HMODULE, lpFilename: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetModuleFileNameW(
-        hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetModuleHandleA(lpModuleName: LPCSTR) -> HMODULE;
-    pub fn GetModuleHandleExA(
-        dwFlags: DWORD, lpModuleName: LPCSTR, phModule: *mut HMODULE,
-    ) -> BOOL;
-    pub fn GetModuleHandleExW(
-        dwFlags: DWORD, lpModuleName: LPCWSTR, phModule: *mut HMODULE,
-    ) -> BOOL;
-    pub fn GetModuleHandleW(lpModuleName: LPCWSTR) -> HMODULE;
-    pub fn GetNLSVersion(
-        Function: NLS_FUNCTION, Locale: LCID, lpVersionInformation: LPNLSVERSIONINFO,
-    ) -> BOOL;
-    pub fn GetNLSVersionEx(
-        function: NLS_FUNCTION, lpLocaleName: LPCWSTR, lpVersionInformation: LPNLSVERSIONINFOEX,
-    ) -> BOOL;
-    // pub fn GetNamedPipeAttribute();
-    pub fn GetNamedPipeClientComputerNameA(
-        Pipe: HANDLE, ClientComputerName: LPSTR, ClientComputerNameLength: ULONG,
-    ) -> BOOL;
-    pub fn GetNamedPipeClientComputerNameW(
-        Pipe: HANDLE, ClientComputerName: LPWSTR, ClientComputerNameLength: ULONG,
-    ) -> BOOL;
-    pub fn GetNamedPipeClientProcessId(Pipe: HANDLE, ClientProcessId: PULONG) -> BOOL;
-    pub fn GetNamedPipeClientSessionId(Pipe: HANDLE, ClientSessionId: PULONG) -> BOOL;
-    pub fn GetNamedPipeHandleStateA(
-        hNamedPipe: HANDLE, lpState: LPDWORD, lpCurInstances: LPDWORD,
-        lpMaxCollectionCount: LPDWORD, lpCollectDataTimeout: LPDWORD, lpUserName: LPSTR,
-        nMaxUserNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetNamedPipeHandleStateW(
-        hNamedPipe: HANDLE, lpState: LPDWORD, lpCurInstances: LPDWORD,
-        lpMaxCollectionCount: LPDWORD, lpCollectDataTimeout: LPDWORD, lpUserName: LPWSTR,
-        nMaxUserNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetNamedPipeInfo(
-        hNamedPipe: HANDLE, lpFlags: LPDWORD, lpOutBufferSize: LPDWORD, lpInBufferSize: LPDWORD,
-        lpMaxInstances: LPDWORD,
-    ) -> BOOL;
-    pub fn GetNamedPipeServerProcessId(Pipe: HANDLE, ServerProcessId: PULONG) -> BOOL;
-    pub fn GetNamedPipeServerSessionId(Pipe: HANDLE, ServerSessionId: PULONG) -> BOOL;
-    pub fn GetNativeSystemInfo(lpSystemInfo: LPSYSTEM_INFO);
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetNextUmsListItem(UmsContext: PUMS_CONTEXT) -> PUMS_CONTEXT;
-    pub fn GetNumaAvailableMemoryNode(Node: UCHAR, AvailableBytes: PULONGLONG) -> BOOL;
-    pub fn GetNumaAvailableMemoryNodeEx(Node: USHORT, AvailableBytes: PULONGLONG) -> BOOL;
-    pub fn GetNumaHighestNodeNumber(HighestNodeNumber: PULONG) -> BOOL;
-    pub fn GetNumaNodeNumberFromHandle(hFile: HANDLE, NodeNumber: PUSHORT) -> BOOL;
-    pub fn GetNumaNodeProcessorMask(Node: UCHAR, ProcessorMask: PULONGLONG) -> BOOL;
-    pub fn GetNumaNodeProcessorMaskEx(Node: USHORT, ProcessorMask: PGROUP_AFFINITY) -> BOOL;
-    pub fn GetNumaProcessorNode(Processor: UCHAR, NodeNumber: PUCHAR) -> BOOL;
-    pub fn GetNumaProcessorNodeEx(Processor: PPROCESSOR_NUMBER, NodeNumber: PUSHORT) -> BOOL;
-    pub fn GetNumaProximityNode(ProximityId: ULONG, NodeNumber: PUCHAR) -> BOOL;
-    pub fn GetNumaProximityNodeEx(ProximityId: ULONG, NodeNumber: PUSHORT) -> BOOL;
-    pub fn GetNumberFormatA(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCSTR, lpFormat: *const NUMBERFMTA,
-        lpNumberStr: LPSTR, cchNumber: c_int,
-    ) -> c_int;
-    pub fn GetNumberFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const NUMBERFMTW,
-        lpNumberStr: LPWSTR, cchNumber: c_int,
-    ) -> c_int;
-    pub fn GetNumberFormatW(
-        Locale: LCID, dwFlags: DWORD, lpValue: LPCWSTR, lpFormat: *const NUMBERFMTW,
-        lpNumberStr: LPWSTR, cchNumber: c_int,
-    ) -> c_int;
-    pub fn GetNumberOfConsoleInputEvents(hConsoleInput: HANDLE, lpNumberOfEvents: LPDWORD) -> BOOL;
-    pub fn GetNumberOfConsoleMouseButtons(lpNumberOfMouseButtons: LPDWORD) -> BOOL;
-    pub fn GetOEMCP() -> UINT;
-    pub fn GetOverlappedResult(
-        hFile: HANDLE, lpOverlapped: LPOVERLAPPED, lpNumberOfBytesTransferred: LPDWORD, bWait: BOOL,
-    ) -> BOOL;
-    pub fn GetOverlappedResultEx(
-        hFile: HANDLE, lpOverlapped: LPOVERLAPPED, lpNumberOfBytesTransferred: LPDWORD,
-        dwMilliseconds: DWORD, bAlertable: BOOL,
-    ) -> BOOL;
-    // pub fn GetPackageApplicationIds();
-    // pub fn GetPackageFamilyName();
-    // pub fn GetPackageFullName();
-    // pub fn GetPackageId();
-    // pub fn GetPackageInfo();
-    // pub fn GetPackagePath();
-    // pub fn GetPackagePathByFullName();
-    // pub fn GetPackagesByPackageFamily();
-    pub fn GetPhysicallyInstalledSystemMemory(TotalMemoryInKilobytes: PULONGLONG) -> BOOL;
-    pub fn GetPriorityClass(hProcess: HANDLE) -> DWORD;
-    pub fn GetPrivateProfileIntA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, nDefault: INT, lpFileName: LPCSTR,
-    ) -> UINT;
-    pub fn GetPrivateProfileIntW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, nDefault: INT, lpFileName: LPCWSTR,
-    ) -> UINT;
-    pub fn GetPrivateProfileSectionA(
-        lpAppName: LPCSTR, lpReturnedString: LPSTR, nSize: DWORD, lpFileName: LPCSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileSectionNamesA(
-        lpszReturnBuffer: LPSTR, nSize: DWORD, lpFileName: LPCSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileSectionNamesW(
-        lpszReturnBuffer: LPWSTR, nSize: DWORD, lpFileName: LPCWSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileSectionW(
-        lpAppName: LPCWSTR, lpReturnedString: LPWSTR, nSize: DWORD, lpFileName: LPCWSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileStringA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, lpDefault: LPCSTR, lpReturnedString: LPSTR,
-        nSize: DWORD, lpFileName: LPCSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileStringW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpDefault: LPCWSTR, lpReturnedString: LPWSTR,
-        nSize: DWORD, lpFileName: LPCWSTR,
-    ) -> DWORD;
-    pub fn GetPrivateProfileStructA(
-        lpszSection: LPCSTR, lpszKey: LPCSTR, lpStruct: LPVOID, uSizeStruct: UINT, szFile: LPCSTR,
-    ) -> BOOL;
-    pub fn GetPrivateProfileStructW(
-        lpszSection: LPCWSTR, lpszKey: LPCWSTR, lpStruct: LPVOID, uSizeStruct: UINT,
-        szFile: LPCWSTR,
-    ) -> BOOL;
-    pub fn GetProcAddress(hModule: HMODULE, lpProcName: LPCSTR) -> FARPROC;
-    pub fn GetProcessAffinityMask(
-        hProcess: HANDLE, lpProcessAffinityMask: PDWORD_PTR, lpSystemAffinityMask: PDWORD_PTR,
-    ) -> BOOL;
-    pub fn GetProcessDEPPolicy(hProcess: HANDLE, lpFlags: LPDWORD, lpPermanent: PBOOL) -> BOOL;
-    pub fn GetProcessGroupAffinity(
-        hProcess: HANDLE, GroupCount: PUSHORT, GroupArray: PUSHORT,
-    ) -> BOOL;
-    pub fn GetProcessHandleCount(hProcess: HANDLE, pdwHandleCount: PDWORD) -> BOOL;
-    pub fn GetProcessHeap() -> HANDLE;
-    pub fn GetProcessHeaps(NumberOfHeaps: DWORD, ProcessHeaps: PHANDLE) -> DWORD;
-    pub fn GetProcessId(Process: HANDLE) -> DWORD;
-    pub fn GetProcessIdOfThread(Thread: HANDLE) -> DWORD;
-    pub fn GetProcessInformation(
-        hProcess: HANDLE, ProcessInformationClass: PROCESS_INFORMATION_CLASS,
-        ProcessInformation: LPVOID, ProcessInformationSize: DWORD,
-    ) -> BOOL;
-    pub fn GetProcessIoCounters(hProcess: HANDLE, lpIoCounters: PIO_COUNTERS) -> BOOL;
-    pub fn GetProcessMitigationPolicy(
-        hProcess: HANDLE, MitigationPolicy: PROCESS_MITIGATION_POLICY, lpBuffer: PVOID,
-        dwLength: SIZE_T,
-    ) -> BOOL;
-    pub fn GetProcessPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetProcessPriorityBoost(hProcess: HANDLE, pDisablePriorityBoost: PBOOL) -> BOOL;
-    pub fn GetProcessShutdownParameters(lpdwLevel: LPDWORD, lpdwFlags: LPDWORD) -> BOOL;
-    pub fn GetProcessTimes(
-        hProcess: HANDLE, lpCreationTime: LPFILETIME, lpExitTime: LPFILETIME,
-        lpKernelTime: LPFILETIME, lpUserTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetProcessVersion(ProcessId: DWORD) -> DWORD;
-    pub fn GetProcessWorkingSetSize(
-        hProcess: HANDLE, lpMinimumWorkingSetSize: PSIZE_T, lpMaximumWorkingSetSize: PSIZE_T,
-    ) -> BOOL;
-    pub fn GetProcessWorkingSetSizeEx(
-        hProcess: HANDLE, lpMinimumWorkingSetSize: PSIZE_T, lpMaximumWorkingSetSize: PSIZE_T,
-        Flags: PDWORD,
-    ) -> BOOL;
-    pub fn GetProcessorSystemCycleTime(
-        Group: USHORT, Buffer: PSYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION, ReturnedLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetProductInfo(
-        dwOSMajorVersion: DWORD, dwOSMinorVersion: DWORD, dwSpMajorVersion: DWORD,
-        dwSpMinorVersion: DWORD, pdwReturnedProductType: PDWORD,
-    ) -> BOOL;
-    pub fn GetProfileIntA(lpAppName: LPCSTR, lpKeyName: LPCSTR, nDefault: INT) -> UINT;
-    pub fn GetProfileIntW(lpAppName: LPCWSTR, lpKeyName: LPCWSTR, nDefault: INT) -> UINT;
-    pub fn GetProfileSectionA(lpAppName: LPCSTR, lpReturnedString: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn GetProfileSectionW(lpAppName: LPCWSTR, lpReturnedString: LPWSTR, nSize: DWORD) -> DWORD;
-    pub fn GetProfileStringA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, lpDefault: LPCSTR, lpReturnedString: LPSTR,
-        nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetProfileStringW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpDefault: LPCWSTR, lpReturnedString: LPWSTR,
-        nSize: DWORD,
-    ) -> DWORD;
-    pub fn GetQueuedCompletionStatus(
-        CompletionPort: HANDLE, lpNumberOfBytesTransferred: LPDWORD, lpCompletionKey: PULONG_PTR,
-        lpOverlapped: *mut LPOVERLAPPED, dwMilliseconds: DWORD,
-    ) -> BOOL;
-    pub fn GetQueuedCompletionStatusEx(
-        CompletionPort: HANDLE, lpCompletionPortEntries: LPOVERLAPPED_ENTRY, ulCount: ULONG,
-        ulNumEntriesRemoved: PULONG, dwMilliseconds: DWORD, fAlertable: BOOL,
-    ) -> BOOL;
-    pub fn GetShortPathNameA(
-        lpszLongPath: LPCSTR, lpszShortPath: LPSTR, cchBuffer: DWORD,
-    ) -> DWORD;
-    pub fn GetShortPathNameW(
-        lpszLongPath: LPCWSTR, lpszShortPath: LPWSTR, cchBuffer: DWORD,
-    ) -> DWORD;
-    // pub fn GetStagedPackagePathByFullName();
-    pub fn GetStartupInfoA(lpStartupInfo: LPSTARTUPINFOA);
-    pub fn GetStartupInfoW(lpStartupInfo: LPSTARTUPINFOW);
-    // pub fn GetStateFolder();
-    pub fn GetStdHandle(nStdHandle: DWORD) -> HANDLE;
-    pub fn GetStringScripts(
-        dwFlags: DWORD, lpString: LPCWSTR, cchString: c_int, lpScripts: LPWSTR, cchScripts: c_int,
-    ) -> c_int;
-    pub fn GetStringTypeA(
-        Locale: LCID, dwInfoType: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    pub fn GetStringTypeExA(
-        Locale: LCID, dwInfoType: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    pub fn GetStringTypeExW(
-        Locale: LCID, dwInfoType: DWORD, lpSrcStr: LPCWCH, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    pub fn GetStringTypeW(
-        dwInfoType: DWORD, lpSrcStr: LPCWCH, cchSrc: c_int, lpCharType: LPWORD,
-    ) -> BOOL;
-    // pub fn GetSystemAppDataKey();
-    pub fn GetSystemDEPPolicy() -> DEP_SYSTEM_POLICY_TYPE;
-    pub fn GetSystemDefaultLCID() -> LCID;
-    pub fn GetSystemDefaultLangID() -> LANGID;
-    pub fn GetSystemDefaultLocaleName(lpLocaleName: LPWSTR, cchLocaleName: c_int) -> c_int;
-    pub fn GetSystemDefaultUILanguage() -> LANGID;
-    pub fn GetSystemDirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemDirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemFileCacheSize(
-        lpMinimumFileCacheSize: PSIZE_T, lpMaximumFileCacheSize: PSIZE_T, lpFlags: PDWORD,
-    ) -> BOOL;
-    pub fn GetSystemFirmwareTable(
-        FirmwareTableProviderSignature: DWORD, FirmwareTableID: DWORD, pFirmwareTableBuffer: PVOID,
-        BufferSize: DWORD,
-    ) -> UINT;
-    pub fn GetSystemInfo(lpSystemInfo: LPSYSTEM_INFO);
-    pub fn GetSystemPowerStatus(lpSystemPowerStatus: LPSYSTEM_POWER_STATUS) -> BOOL;
-    pub fn GetSystemPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetSystemRegistryQuota(pdwQuotaAllowed: PDWORD, pdwQuotaUsed: PDWORD) -> BOOL;
-    pub fn GetSystemTime(lpSystemTime: LPSYSTEMTIME);
-    pub fn GetSystemTimeAdjustment(
-        lpTimeAdjustment: PDWORD, lpTimeIncrement: PDWORD, lpTimeAdjustmentDisabled: PBOOL,
-    ) -> BOOL;
-    pub fn GetSystemTimeAsFileTime(lpSystemTimeAsFileTime: LPFILETIME);
-    pub fn GetSystemTimePreciseAsFileTime(lpSystemTimeAsFileTime: LPFILETIME);
-    pub fn GetSystemTimes(
-        lpIdleTime: LPFILETIME, lpKernelTime: LPFILETIME, lpUserTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetSystemWindowsDirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemWindowsDirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemWow64DirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetSystemWow64DirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetTapeParameters(
-        hDevice: HANDLE, dwOperation: DWORD, lpdwSize: LPDWORD, lpTapeInformation: LPVOID
-    ) -> DWORD;
-    pub fn GetTapePosition(
-        hDevice: HANDLE, dwPositionType: DWORD, lpdwPartition: LPDWORD,
-        lpdwOffsetLow: LPDWORD, lpdwOffsetHigh: LPDWORD
-    ) -> DWORD;
-    pub fn GetTapeStatus(hDevice: HANDLE) -> DWORD;
-    pub fn GetTempFileNameA(
-        lpPathName: LPCSTR, lpPrefixString: LPCSTR, uUnique: UINT, lpTempFileName: LPSTR,
-    ) -> UINT;
-    pub fn GetTempFileNameW(
-        lpPathName: LPCWSTR, lpPrefixString: LPCWSTR, uUnique: UINT, lpTempFileName: LPWSTR,
-    ) -> UINT;
-    pub fn GetTempPathA(nBufferLength: DWORD, lpBuffer: LPSTR) -> DWORD;
-    pub fn GetTempPathW(nBufferLength: DWORD, lpBuffer: LPWSTR) -> DWORD;
-    pub fn GetThreadContext(hThread: HANDLE, lpContext: LPCONTEXT) -> BOOL;
-    pub fn GetThreadErrorMode() -> DWORD;
-    pub fn GetThreadGroupAffinity(hThread: HANDLE, GroupAffinity: PGROUP_AFFINITY) -> BOOL;
-    pub fn GetThreadIOPendingFlag(hThread: HANDLE, lpIOIsPending: PBOOL) -> BOOL;
-    pub fn GetThreadId(Thread: HANDLE) -> DWORD;
-    pub fn GetThreadIdealProcessorEx(hThread: HANDLE, lpIdealProcessor: PPROCESSOR_NUMBER) -> BOOL;
-    pub fn GetThreadInformation(
-        hThread: HANDLE, ThreadInformationClass: THREAD_INFORMATION_CLASS,
-        ThreadInformation: LPVOID, ThreadInformationSize: DWORD,
-    ) -> BOOL;
-    pub fn GetThreadLocale() -> LCID;
-    pub fn GetThreadPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetThreadPriority(hThread: HANDLE) -> c_int;
-    pub fn GetThreadPriorityBoost(hThread: HANDLE, pDisablePriorityBoost: PBOOL) -> BOOL;
-    pub fn GetThreadSelectorEntry(
-        hThread: HANDLE, dwSelector: DWORD, lpSelectorEntry: LPLDT_ENTRY,
-    ) -> BOOL;
-    pub fn GetThreadTimes(
-        hThread: HANDLE, lpCreationTime: LPFILETIME, lpExitTime: LPFILETIME,
-        lpKernelTime: LPFILETIME, lpUserTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn GetThreadUILanguage() -> LANGID;
-    pub fn GetTickCount() -> DWORD;
-    pub fn GetTickCount64() -> ULONGLONG;
-    pub fn GetTimeFormatA(
-        Locale: LCID, dwFlags: DWORD, lpTime: *const SYSTEMTIME, lpFormat: LPCSTR,
-        lpTimeStr: LPSTR, cchTime: c_int,
-    ) -> c_int;
-    pub fn GetTimeFormatEx(
-        lpLocaleName: LPCWSTR, dwFlags: DWORD, lpTime: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpTimeStr: LPWSTR, cchTime: c_int,
-    ) -> c_int;
-    pub fn GetTimeFormatW(
-        Locale: LCID, dwFlags: DWORD, lpTime: *const SYSTEMTIME, lpFormat: LPCWSTR,
-        lpTimeStr: LPWSTR, cchTime: c_int,
-    ) -> c_int;
-    pub fn GetTimeZoneInformation(lpTimeZoneInformation: LPTIME_ZONE_INFORMATION) -> DWORD;
-    pub fn GetTimeZoneInformationForYear(
-        wYear: USHORT, pdtzi: PDYNAMIC_TIME_ZONE_INFORMATION, ptzi: LPTIME_ZONE_INFORMATION,
-    ) -> BOOL;
-    pub fn GetUILanguageInfo(
-        dwFlags: DWORD, pwmszLanguage: PCZZWSTR, pwszFallbackLanguages: PZZWSTR,
-        pcchFallbackLanguages: PDWORD, pAttributes: PDWORD,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetUmsCompletionListEvent(
-        UmsCompletionList: PUMS_COMPLETION_LIST, UmsCompletionEvent: PHANDLE,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn GetUmsSystemThreadInformation(
-        ThreadHandle: HANDLE, SystemThreadInfo: PUMS_SYSTEM_THREAD_INFORMATION,
-    ) -> BOOL;
-    pub fn GetUserDefaultLCID() -> LCID;
-    pub fn GetUserDefaultLangID() -> LANGID;
-    pub fn GetUserDefaultLocaleName(lpLocaleName: LPWSTR, cchLocaleName: c_int) -> c_int;
-    pub fn GetUserDefaultUILanguage() -> LANGID;
-    pub fn GetUserGeoID(GeoClass: GEOCLASS) -> GEOID;
-    pub fn GetUserPreferredUILanguages(
-        dwFlags: DWORD, pulNumLanguages: PULONG, pwszLanguagesBuffer: PZZWSTR,
-        pcchLanguagesBuffer: PULONG,
-    ) -> BOOL;
-    pub fn GetVersion() -> DWORD;
-    pub fn GetVersionExA(lpVersionInformation: LPOSVERSIONINFOA) -> BOOL;
-    pub fn GetVersionExW(lpVersionInformation: LPOSVERSIONINFOW) -> BOOL;
-    pub fn GetVolumeInformationA(
-        lpRootPathName: LPCSTR, lpVolumeNameBuffer: LPSTR, nVolumeNameSize: DWORD,
-        lpVolumeSerialNumber: LPDWORD, lpMaximumComponentLength: LPDWORD,
-        lpFileSystemFlags: LPDWORD, lpFileSystemNameBuffer: LPSTR, nFileSystemNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeInformationByHandleW(
-        hFile: HANDLE, lpVolumeNameBuffer: LPWSTR, nVolumeNameSize: DWORD,
-        lpVolumeSerialNumber: LPDWORD, lpMaximumComponentLength: LPDWORD,
-        lpFileSystemFlags: LPDWORD, lpFileSystemNameBuffer: LPWSTR, nFileSystemNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeInformationW(
-        lpRootPathName: LPCWSTR, lpVolumeNameBuffer: LPWSTR, nVolumeNameSize: DWORD,
-        lpVolumeSerialNumber: LPDWORD, lpMaximumComponentLength: LPDWORD,
-        lpFileSystemFlags: LPDWORD, lpFileSystemNameBuffer: LPWSTR, nFileSystemNameSize: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeNameForVolumeMountPointA(
-        lpszVolumeMountPoint: LPCSTR, lpszVolumeName: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumeNameForVolumeMountPointW(
-        lpszVolumeMountPoint: LPCWSTR, lpszVolumeName: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNameA(
-        lpszFileName: LPCSTR, lpszVolumePathName: LPSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNameW(
-        lpszFileName: LPCWSTR, lpszVolumePathName: LPWSTR, cchBufferLength: DWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNamesForVolumeNameA(
-        lpszVolumeName: LPCSTR, lpszVolumePathNames: LPCH, cchBufferLength: DWORD,
-        lpcchReturnLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetVolumePathNamesForVolumeNameW(
-        lpszVolumeName: LPCWSTR, lpszVolumePathNames: LPWCH, cchBufferLength: DWORD,
-        lpcchReturnLength: PDWORD,
-    ) -> BOOL;
-    pub fn GetWindowsDirectoryA(lpBuffer: LPSTR, uSize: UINT) -> UINT;
-    pub fn GetWindowsDirectoryW(lpBuffer: LPWSTR, uSize: UINT) -> UINT;
-    pub fn GetWriteWatch(
-        dwFlags: DWORD, lpBaseAddress: PVOID, dwRegionSize: SIZE_T, lpAddresses: *mut PVOID,
-        lpdwCount: *mut ULONG_PTR, lpdwGranularity: LPDWORD,
-    ) -> UINT;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn GetXStateFeaturesMask(Context: PCONTEXT, FeatureMask: PDWORD64) -> BOOL;
-    pub fn GlobalAddAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn GlobalAddAtomExA(lpString: LPCSTR, Flags: DWORD) -> ATOM;
-    pub fn GlobalAddAtomExW(lpString: LPCWSTR, Flags: DWORD) -> ATOM;
-    pub fn GlobalAddAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn GlobalAlloc(uFlags: UINT, dwBytes: SIZE_T) -> HGLOBAL;
-    pub fn GlobalCompact(dwMinFree: DWORD) -> SIZE_T;
-    pub fn GlobalDeleteAtom(nAtom: ATOM) -> ATOM;
-    pub fn GlobalFindAtomA(lpString: LPCSTR) -> ATOM;
-    pub fn GlobalFindAtomW(lpString: LPCWSTR) -> ATOM;
-    pub fn GlobalFix(hMem: HGLOBAL);
-    pub fn GlobalFlags(hMem: HGLOBAL) -> UINT;
-    pub fn GlobalFree(hMem: HGLOBAL) -> HGLOBAL;
-    pub fn GlobalGetAtomNameA(nAtom: ATOM, lpBuffer: LPSTR, nSize: c_int) -> UINT;
-    pub fn GlobalGetAtomNameW(nAtom: ATOM, lpBuffer: LPWSTR, nSize: c_int) -> UINT;
-    pub fn GlobalHandle(pMem: LPCVOID) -> HGLOBAL;
-    pub fn GlobalLock(hMem: HGLOBAL) -> LPVOID;
-    pub fn GlobalMemoryStatus(lpBuffer: LPMEMORYSTATUS);
-    pub fn GlobalMemoryStatusEx(lpBuffer: LPMEMORYSTATUSEX) -> BOOL;
-    pub fn GlobalReAlloc(hMem: HGLOBAL, dwBytes: SIZE_T, uFlags: UINT) -> HGLOBAL;
-    pub fn GlobalSize(hMem: HGLOBAL) -> SIZE_T;
-    pub fn GlobalUnWire(hMem: HGLOBAL) -> BOOL;
-    pub fn GlobalUnfix(hMem: HGLOBAL);
-    pub fn GlobalUnlock(hMem: HGLOBAL) -> BOOL;
-    pub fn GlobalWire(hMem: HGLOBAL) -> LPVOID;
-    pub fn Heap32First(lphe: LPHEAPENTRY32, th32ProcessID: DWORD, th32HeapID: ULONG_PTR) -> BOOL;
-    pub fn Heap32ListFirst(hSnapshot: HANDLE, lphl: LPHEAPLIST32) -> BOOL;
-    pub fn Heap32ListNext(hSnapshot: HANDLE, lphl: LPHEAPLIST32) -> BOOL;
-    pub fn Heap32Next(lphe: LPHEAPENTRY32) -> BOOL;
-    pub fn HeapAlloc(hHeap: HANDLE, dwFlags: DWORD, dwBytes: SIZE_T) -> LPVOID;
-    pub fn HeapCompact(hHeap: HANDLE, dwFlags: DWORD) -> SIZE_T;
-    pub fn HeapCreate(flOptions: DWORD, dwInitialSize: SIZE_T, dwMaximumSize: SIZE_T) -> HANDLE;
-    pub fn HeapDestroy(hHeap: HANDLE) -> BOOL;
-    pub fn HeapFree(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID) -> BOOL;
-    pub fn HeapLock(hHeap: HANDLE) -> BOOL;
-    pub fn HeapQueryInformation(
-        HeapHandle: HANDLE, HeapInformationClass: HEAP_INFORMATION_CLASS, HeapInformation: PVOID,
-        HeapInformationLength: SIZE_T, ReturnLength: PSIZE_T,
-    ) -> BOOL;
-    pub fn HeapReAlloc(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPVOID, dwBytes: SIZE_T) -> LPVOID;
-    pub fn HeapSetInformation(
-        HeapHandle: HANDLE, HeapInformationClass: HEAP_INFORMATION_CLASS, HeapInformation: PVOID,
-        HeapInformationLength: SIZE_T,
-    ) -> BOOL;
-    pub fn HeapSize(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPCVOID) -> SIZE_T;
-    pub fn HeapSummary(hHeap: HANDLE, dwFlags: DWORD, lpSummary: LPHEAP_SUMMARY) -> BOOL;
-    pub fn HeapUnlock(hHeap: HANDLE) -> BOOL;
-    pub fn HeapValidate(hHeap: HANDLE, dwFlags: DWORD, lpMem: LPCVOID) -> BOOL;
-    pub fn HeapWalk(hHeap: HANDLE, lpEntry: LPPROCESS_HEAP_ENTRY) -> BOOL;
-    pub fn InitAtomTable(nSize: DWORD) -> BOOL;
-    pub fn InitOnceBeginInitialize(
-        lpInitOnce: LPINIT_ONCE, dwFlags: DWORD, fPending: PBOOL, lpContext: *mut LPVOID,
-    ) -> BOOL;
-    pub fn InitOnceComplete(
-        lpInitOnce: LPINIT_ONCE, dwFlags: DWORD, lpContext: LPVOID,
-    ) -> BOOL;
-    pub fn InitOnceExecuteOnce(
-        InitOnce: PINIT_ONCE, InitFn: PINIT_ONCE_FN, Parameter: PVOID, Context: *mut LPVOID,
-    ) -> BOOL;
-    pub fn InitOnceInitialize(InitOnce: PINIT_ONCE);
-    pub fn InitializeConditionVariable(ConditionVariable: PCONDITION_VARIABLE);
-    pub fn InitializeContext(
-        Buffer: PVOID, ContextFlags: DWORD, Context: *mut PCONTEXT, ContextLength: PDWORD,
-    ) -> BOOL;
-    pub fn InitializeCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn InitializeCriticalSectionAndSpinCount(
-        lpCriticalSection: LPCRITICAL_SECTION, dwSpinCount: DWORD,
-    ) -> BOOL;
-    pub fn InitializeCriticalSectionEx(
-        lpCriticalSection: LPCRITICAL_SECTION, dwSpinCount: DWORD, Flags: DWORD,
-    ) -> BOOL;
-    pub fn InitializeProcThreadAttributeList(
-        lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST, dwAttributeCount: DWORD, dwFlags: DWORD,
-        lpSize: PSIZE_T,
-    ) -> BOOL;
-    pub fn InitializeSListHead(ListHead: PSLIST_HEADER);
-    pub fn InitializeSRWLock(SRWLock: PSRWLOCK);
-    pub fn InitializeSynchronizationBarrier(
-        lpBarrier: LPSYNCHRONIZATION_BARRIER, lTotalThreads: LONG, lSpinCount: LONG,
-    ) -> BOOL;
-    pub fn InstallELAMCertificateInfo(ELAMFile: HANDLE) -> BOOL;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedCompareExchange(
-        Destination: *mut LONG, ExChange: LONG, Comperand: LONG,
-    ) -> LONG;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedCompareExchange64(
-        Destination: *mut LONG64, ExChange: LONG64, Comperand: LONG64,
-    ) -> LONG64;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedDecrement(Addend: *mut LONG) -> LONG;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedExchange(Target: *mut LONG, Value: LONG) -> LONG;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedExchangeAdd(Addend: *mut LONG, Value: LONG) -> LONG;
-    pub fn InterlockedFlushSList(ListHead: PSLIST_HEADER) -> PSLIST_ENTRY;
-    #[cfg(target_arch = "x86")]
-    pub fn InterlockedIncrement(Addend: *mut LONG) -> LONG;
-    pub fn InterlockedPopEntrySList(ListHead: PSLIST_HEADER) -> PSLIST_ENTRY;
-    pub fn InterlockedPushEntrySList(
-        ListHead: PSLIST_HEADER, ListEntry: PSLIST_ENTRY,
-    ) -> PSLIST_ENTRY;
-    pub fn InterlockedPushListSListEx(
-        ListHead: PSLIST_HEADER, List: PSLIST_ENTRY, ListEnd: PSLIST_ENTRY, Count: ULONG,
-    ) -> PSLIST_ENTRY;
-    pub fn IsBadCodePtr(lpfn: FARPROC) -> BOOL;
-    pub fn IsBadHugeReadPtr(lp: *const VOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsBadHugeWritePtr(lp: LPVOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsBadReadPtr(lp: *const VOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsBadStringPtrA(lpsz: LPCSTR, ucchMax: UINT_PTR) -> BOOL;
-    pub fn IsBadStringPtrW(lpsz: LPCWSTR, ucchMax: UINT_PTR) -> BOOL;
-    pub fn IsBadWritePtr(lp: LPVOID, ucb: UINT_PTR) -> BOOL;
-    pub fn IsDBCSLeadByte(TestChar: BYTE) -> BOOL;
-    pub fn IsDBCSLeadByteEx(CodePage: UINT, TestChar: BYTE) -> BOOL;
-    pub fn IsDebuggerPresent() -> BOOL;
-    pub fn IsNLSDefinedString(
-        Function: NLS_FUNCTION, dwFlags: DWORD, lpVersionInformation: LPNLSVERSIONINFO,
-        lpString: LPCWSTR, cchStr: INT,
-    ) -> BOOL;
-    pub fn IsNativeVhdBoot(NativeVhdBoot: PBOOL) -> BOOL;
-    pub fn IsNormalizedString(NormForm: NORM_FORM, lpString: LPCWSTR, cwLength: c_int) -> BOOL;
-    pub fn IsProcessCritical(hProcess: HANDLE, Critical: PBOOL) -> BOOL;
-    pub fn IsProcessInJob(ProcessHandle: HANDLE, JobHandle: HANDLE, Result: PBOOL) -> BOOL;
-    pub fn IsProcessorFeaturePresent(ProcessorFeature: DWORD) -> BOOL;
-    pub fn IsSystemResumeAutomatic() -> BOOL;
-    pub fn IsThreadAFiber() -> BOOL;
-    pub fn IsThreadpoolTimerSet(pti: PTP_TIMER) -> BOOL;
-    pub fn IsValidCodePage(CodePage: UINT) -> BOOL;
-    pub fn IsValidLanguageGroup(LanguageGroup: LGRPID, dwFlags: DWORD) -> BOOL;
-    pub fn IsValidLocale(Locale: LCID, dwFlags: DWORD) -> BOOL;
-    pub fn IsValidLocaleName(lpLocaleName: LPCWSTR) -> BOOL;
-    pub fn IsValidNLSVersion(
-        function: NLS_FUNCTION, lpLocaleName: LPCWSTR, lpVersionInformation: LPNLSVERSIONINFOEX,
-    ) -> BOOL;
-    pub fn IsWow64Process(hProcess: HANDLE, Wow64Process: PBOOL) -> BOOL;
-    pub fn K32EmptyWorkingSet(hProcess: HANDLE) -> BOOL;
-    pub fn K32EnumDeviceDrivers(lpImageBase: *mut LPVOID, cb: DWORD, lpcbNeeded: LPDWORD) -> BOOL;
-    pub fn K32EnumPageFilesA(
-        pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKA, pContext: LPVOID,
-    ) -> BOOL;
-    pub fn K32EnumPageFilesW(
-        pCallBackRoutine: PENUM_PAGE_FILE_CALLBACKW, pContext: LPVOID,
-    ) -> BOOL;
-    pub fn K32EnumProcessModules(
-        hProcess: HANDLE, lphModule: *mut HMODULE, cb: DWORD, lpcbNeeded: LPDWORD,
-    ) -> BOOL;
-    pub fn K32EnumProcessModulesEx(
-        hProcess: HANDLE, lphModule: *mut HMODULE, cb: DWORD, lpcbNeeded: LPDWORD,
-        dwFilterFlag: DWORD,
-    ) -> BOOL;
-    pub fn K32EnumProcesses(
-        lpidProcess: *mut DWORD, cb: DWORD, lpcbNeeded: LPDWORD,
-    ) -> BOOL;
-    pub fn K32GetDeviceDriverBaseNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn K32GetDeviceDriverBaseNameW(
-        ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetDeviceDriverFileNameA(ImageBase: LPVOID, lpFilename: LPSTR, nSize: DWORD) -> DWORD;
-    pub fn K32GetDeviceDriverFileNameW(
-        ImageBase: LPVOID, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetMappedFileNameA(
-        hProcess: HANDLE, lpv: LPVOID, lpFilename: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetMappedFileNameW(
-        hProcess: HANDLE, lpv: LPVOID, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleBaseNameA(
-        hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleBaseNameW(
-        hProcess: HANDLE, hModule: HMODULE, lpBaseName: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleFileNameExA(
-        hProcess: HANDLE, hModule: HMODULE, lpFilename: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleFileNameExW(
-        hProcess: HANDLE, hModule: HMODULE, lpFilename: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetModuleInformation(
-        hProcess: HANDLE, hModule: HMODULE, lpmodinfo: LPMODULEINFO, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetPerformanceInfo(
-        pPerformanceInformation: PPERFORMANCE_INFORMATION, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetProcessImageFileNameA(
-        hProcess: HANDLE, lpImageFileName: LPSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetProcessImageFileNameW(
-        hProcess: HANDLE, lpImageFileName: LPWSTR, nSize: DWORD,
-    ) -> DWORD;
-    pub fn K32GetProcessMemoryInfo(
-        Process: HANDLE, ppsmemCounters: PPROCESS_MEMORY_COUNTERS, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetWsChanges(
-        hProcess: HANDLE, lpWatchInfo: PPSAPI_WS_WATCH_INFORMATION, cb: DWORD,
-    ) -> BOOL;
-    pub fn K32GetWsChangesEx(
-        hProcess: HANDLE, lpWatchInfoEx: PPSAPI_WS_WATCH_INFORMATION_EX, cb: PDWORD,
-    ) -> BOOL;
-    pub fn K32InitializeProcessForWsWatch(hProcess: HANDLE) -> BOOL;
-    pub fn K32QueryWorkingSet(hProcess: HANDLE, pv: PVOID, cb: DWORD) -> BOOL;
-    pub fn K32QueryWorkingSetEx(hProcess: HANDLE, pv: PVOID, cb: DWORD) -> BOOL;
-    pub fn LCIDToLocaleName(Locale: LCID, lpName: LPWSTR, cchName: c_int, dwFlags: DWORD) -> c_int;
-    pub fn LCMapStringA(
-        Locale: LCID, dwMapFlags: DWORD, lpSrcStr: LPCSTR, cchSrc: c_int, lpDestStr: LPSTR,
-        cchDest: c_int,
-    ) -> c_int;
-    pub fn LCMapStringEx(
-        lpLocaleName: LPCWSTR, dwMapFlags: DWORD, lpSrcStr: LPCWSTR, cchSrc: c_int,
-        lpDestStr: LPWSTR, cchDest: c_int, lpVersionInformation: LPNLSVERSIONINFO,
-        lpReserved: LPVOID, sortHandle: LPARAM,
-    ) -> c_int;
-    pub fn LCMapStringW(
-        Locale: LCID, dwMapFlags: DWORD, lpSrcStr: LPCWSTR, cchSrc: c_int, lpDestStr: LPWSTR,
-        cchDest: c_int,
-    ) -> c_int;
-    pub fn LeaveCriticalSection(lpCriticalSection: LPCRITICAL_SECTION);
-    pub fn LeaveCriticalSectionWhenCallbackReturns(
-        pci: PTP_CALLBACK_INSTANCE, pcs: PCRITICAL_SECTION,
-    );
-    // pub fn LoadAppInitDlls();
-    pub fn LoadLibraryA(lpFileName: LPCSTR) -> HMODULE;
-    pub fn LoadLibraryExA(lpLibFileName: LPCSTR, hFile: HANDLE, dwFlags: DWORD) -> HMODULE;
-    pub fn LoadLibraryExW(lpLibFileName: LPCWSTR, hFile: HANDLE, dwFlags: DWORD) -> HMODULE;
-    pub fn LoadLibraryW(lpFileName: LPCWSTR) -> HMODULE;
-    pub fn LoadModule(lpModuleName: LPCSTR, lpParameterBlock: LPVOID) -> DWORD;
-    pub fn LoadPackagedLibrary(lpwLibFileName: LPCWSTR, Reserved: DWORD) -> HMODULE;
-    pub fn LoadResource(hModule: HMODULE, hResInfo: HRSRC) -> HGLOBAL;
-    // pub fn LoadStringBaseExW();
-    // pub fn LoadStringBaseW();
-    pub fn LocalAlloc(uFlags: UINT, uBytes: SIZE_T) -> HLOCAL;
-    pub fn LocalCompact(uMinFree: UINT) -> SIZE_T;
-    pub fn LocalFileTimeToFileTime(
-        lpLocalFileTime: *const FILETIME, lpFileTime: LPFILETIME,
-    ) -> BOOL;
-    pub fn LocalFlags(hMem: HLOCAL) -> UINT;
-    pub fn LocalFree(hMem: HLOCAL) -> HLOCAL;
-    pub fn LocalHandle(pMem: LPCVOID) -> HLOCAL;
-    pub fn LocalLock(hMem: HLOCAL) -> LPVOID;
-    pub fn LocalReAlloc(hMem: HLOCAL, uBytes: SIZE_T, uFlags: UINT) -> HLOCAL;
-    pub fn LocalShrink(hMem: HLOCAL, cbNewSize: UINT) -> SIZE_T;
-    pub fn LocalSize(hMem: HLOCAL) -> SIZE_T;
-    pub fn LocalUnlock(hMem: HLOCAL) -> BOOL;
-    pub fn LocaleNameToLCID(lpName: LPCWSTR, dwFlags: DWORD) -> LCID;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn LocateXStateFeature(Context: PCONTEXT, FeatureId: DWORD, Length: PDWORD) -> PVOID;
-    pub fn LockFile(
-        hFile: HANDLE, dwFileOffsetLow: DWORD, dwFileOffsetHigh: DWORD,
-        nNumberOfBytesToLockLow: DWORD, nNumberOfBytesToLockHigh: DWORD,
-    ) -> BOOL;
-    pub fn LockFileEx(
-        hFile: HANDLE, dwFlags: DWORD, dwReserved: DWORD, nNumberOfBytesToLockLow: DWORD,
-        nNumberOfBytesToLockHigh: DWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn LockResource(hResData: HGLOBAL) -> LPVOID;
-    pub fn MapUserPhysicalPages(
-        VirtualAddress: PVOID, NumberOfPages: ULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn MapUserPhysicalPagesScatter(
-        VirtualAddresses: *mut PVOID, NumberOfPages: ULONG_PTR, PageArray: PULONG_PTR,
-    ) -> BOOL;
-    pub fn MapViewOfFile(
-        hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, dwFileOffsetHigh: DWORD,
-        dwFileOffsetLow: DWORD, dwNumberOfBytesToMap: SIZE_T,
-    ) -> LPVOID;
-    pub fn MapViewOfFileEx(
-        hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, dwFileOffsetHigh: DWORD,
-        dwFileOffsetLow: DWORD, dwNumberOfBytesToMap: SIZE_T, lpBaseAddress: LPVOID,
-    ) -> LPVOID;
-    pub fn MapViewOfFileExNuma(
-        hFileMappingObject: HANDLE, dwDesiredAccess: DWORD, dwFileOffsetHigh: DWORD,
-        dwFileOffsetLow: DWORD, dwNumberOfBytesToMap: SIZE_T, lpBaseAddress: LPVOID,
-        nndPreferred: DWORD,
-    ) -> LPVOID;
-    pub fn MapViewOfFileFromApp(
-        hFileMappingObject: HANDLE, DesiredAccess: ULONG, FileOffset: ULONG64,
-        NumberOfBytesToMap: SIZE_T,
-    ) -> PVOID;
-    pub fn Module32First(hSnapshot: HANDLE, lpme: LPMODULEENTRY32) -> BOOL;
-    pub fn Module32FirstW(hSnapshot: HANDLE, lpme: LPMODULEENTRY32W) -> BOOL;
-    pub fn Module32Next(hSnapshot: HANDLE, lpme: LPMODULEENTRY32) -> BOOL;
-    pub fn Module32NextW(hSnapshot: HANDLE, lpme: LPMODULEENTRY32W) -> BOOL;
-    pub fn MoveFileA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR) -> BOOL;
-    pub fn MoveFileExA(lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, dwFlags: DWORD) -> BOOL;
-    pub fn MoveFileExW(lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, dwFlags: DWORD) -> BOOL;
-    pub fn MoveFileTransactedA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn MoveFileTransactedW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn MoveFileW(lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR) -> BOOL;
-    pub fn MoveFileWithProgressA(
-        lpExistingFileName: LPCSTR, lpNewFileName: LPCSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn MoveFileWithProgressW(
-        lpExistingFileName: LPCWSTR, lpNewFileName: LPCWSTR, lpProgressRoutine: LPPROGRESS_ROUTINE,
-        lpData: LPVOID, dwFlags: DWORD,
-    ) -> BOOL;
-    pub fn MulDiv(nNumber: c_int, nNumerator: c_int, nDenominator: c_int) -> c_int;
-    pub fn MultiByteToWideChar(
-        CodePage: UINT, dwFlags: DWORD, lpMultiByteStr: LPCSTR, cbMultiByte: c_int,
-        lpWideCharStr: LPWSTR, cchWideChar: c_int,
-    ) -> c_int;
-    pub fn NeedCurrentDirectoryForExePathA(ExeName: LPCSTR) -> BOOL;
-    pub fn NeedCurrentDirectoryForExePathW(ExeName: LPCWSTR) -> BOOL;
-    pub fn NormalizeString(
-        NormForm: NORM_FORM, lpSrcString: LPCWSTR, cwSrcLength: c_int, lpDstString: LPWSTR,
-        cwDstLength: c_int,
-    ) -> c_int;
-    // pub fn NotifyMountMgr();
-    pub fn NotifyUILanguageChange(
-        dwFlags: DWORD, pcwstrNewLanguage: PCWSTR, pcwstrPreviousLanguage: PCWSTR,
-        dwReserved: DWORD, pdwStatusRtrn: PDWORD,
-    ) -> BOOL;
-    // pub fn OOBEComplete();
-    pub fn OpenEventA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenEventW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    pub fn OpenFile(lpFileName: LPCSTR, lpReOpenBuff: LPOFSTRUCT, uStyle: UINT) -> HFILE;
-    pub fn OpenFileById(
-        hVolumeHint: HANDLE, lpFileId: LPFILE_ID_DESCRIPTOR, dwDesiredAccess: DWORD,
-        dwShareMode: DWORD, lpSecurityAttributes: LPSECURITY_ATTRIBUTES,
-        dwFlagsAndAttributes: DWORD,
-    ) -> HANDLE;
-    pub fn OpenFileMappingA(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR,
-    ) -> HANDLE;
-    pub fn OpenFileMappingW(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn OpenJobObjectA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenJobObjectW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    pub fn OpenMutexA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenMutexW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    // pub fn OpenPackageInfoByFullName();
-    pub fn OpenPrivateNamespaceA(lpBoundaryDescriptor: LPVOID, lpAliasPrefix: LPCSTR) -> HANDLE;
-    pub fn OpenPrivateNamespaceW(lpBoundaryDescriptor: LPVOID, lpAliasPrefix: LPCWSTR) -> HANDLE;
-    pub fn OpenProcess(dwDesiredAccess: DWORD, bInheritHandle: BOOL, dwProcessId: DWORD) -> HANDLE;
-    pub fn OpenSemaphoreA(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCSTR) -> HANDLE;
-    pub fn OpenSemaphoreW(dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpName: LPCWSTR) -> HANDLE;
-    // pub fn OpenState();
-    // pub fn OpenStateExplicit();
-    pub fn OpenThread(dwDesiredAccess: DWORD, bInheritHandle: BOOL, dwThreadId: DWORD) -> HANDLE;
-    pub fn OpenWaitableTimerA(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpTimerName: LPCSTR,
-    ) -> HANDLE;
-    pub fn OpenWaitableTimerW(
-        dwDesiredAccess: DWORD, bInheritHandle: BOOL, lpTimerName: LPCWSTR,
-    ) -> HANDLE;
-    pub fn OutputDebugStringA(lpOutputString: LPCSTR);
-    pub fn OutputDebugStringW(lpOutputString: LPCWSTR);
-    // pub fn PackageFamilyNameFromFullName();
-    // pub fn PackageFamilyNameFromId();
-    // pub fn PackageFullNameFromId();
-    // pub fn PackageIdFromFullName();
-    // pub fn PackageNameAndPublisherIdFromFamilyName();
-    // pub fn ParseApplicationUserModelId();
-    pub fn PeekConsoleInputA(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn PeekConsoleInputW(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn PeekNamedPipe(
-        hNamedPipe: HANDLE, lpBuffer: LPVOID, nBufferSize: DWORD, lpBytesRead: LPDWORD,
-        lpTotalBytesAvail: LPDWORD, lpBytesLeftThisMessage: LPDWORD,
-    ) -> BOOL;
-    pub fn PostQueuedCompletionStatus(
-        CompletionPort: HANDLE, dwNumberOfBytesTransferred: DWORD, dwCompletionKey: ULONG_PTR,
-        lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn PowerClearRequest(PowerRequest: HANDLE, RequestType: POWER_REQUEST_TYPE) -> BOOL;
-    pub fn PowerCreateRequest(Context: PREASON_CONTEXT) -> HANDLE;
-    pub fn PowerSetRequest(PowerRequest: HANDLE, RequestType: POWER_REQUEST_TYPE) -> BOOL;
-    pub fn PrefetchVirtualMemory(
-        hProcess: HANDLE, NumberOfEntries: ULONG_PTR, VirtualAddresses: PWIN32_MEMORY_RANGE_ENTRY,
-        Flags: ULONG,
-    ) -> BOOL;
-    pub fn PrepareTape(hDevice: HANDLE, dwOperation: DWORD, bImmediate: BOOL) -> DWORD;
-    pub fn Process32First(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32) -> BOOL;
-    pub fn Process32FirstW(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32W) -> BOOL;
-    pub fn Process32Next(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32) -> BOOL;
-    pub fn Process32NextW(hSnapshot: HANDLE, lppe: LPPROCESSENTRY32W) -> BOOL;
-    pub fn ProcessIdToSessionId(dwProcessId: DWORD, pSessionId: *mut DWORD) -> BOOL;
-    pub fn PssCaptureSnapshot(
-        ProcessHandle: HANDLE, CaptureFlags: PSS_CAPTURE_FLAGS, ThreadContextFlags: DWORD,
-        SnapshotHandle: *mut HPSS,
-    ) -> DWORD;
-    pub fn PssDuplicateSnapshot(
-        SourceProcessHandle: HANDLE, SnapshotHandle: HPSS, TargetProcessHandle: HANDLE,
-        TargetSnapshotHandle: *mut HPSS, Flags: PSS_DUPLICATE_FLAGS,
-    ) -> DWORD;
-    pub fn PssFreeSnapshot(ProcessHandle: HANDLE, SnapshotHandle: HPSS) -> DWORD;
-    pub fn PssQuerySnapshot(
-        SnapshotHandle: HPSS, InformationClass: PSS_QUERY_INFORMATION_CLASS, Buffer: *mut c_void,
-        BufferLength: DWORD,
-    ) -> DWORD;
-    pub fn PssWalkMarkerCreate(
-        Allocator: *const PSS_ALLOCATOR, WalkMarkerHandle: *mut HPSSWALK,
-    ) -> DWORD;
-    pub fn PssWalkMarkerFree(WalkMarkerHandle: HPSSWALK) -> DWORD;
-    pub fn PssWalkMarkerGetPosition(WalkMarkerHandle: HPSSWALK, Position: *mut ULONG_PTR) -> DWORD;
-    // pub fn PssWalkMarkerRewind();
-    // pub fn PssWalkMarkerSeek();
-    pub fn PssWalkMarkerSeekToBeginning(WalkMarkerHandle: HPSS) -> DWORD;
-    pub fn PssWalkMarkerSetPosition(WalkMarkerHandle: HPSSWALK, Position: ULONG_PTR) -> DWORD;
-    // pub fn PssWalkMarkerTell();
-    pub fn PssWalkSnapshot(
-        SnapshotHandle: HPSS, InformationClass: PSS_WALK_INFORMATION_CLASS,
-        WalkMarkerHandle: HPSSWALK, Buffer: *mut c_void, BufferLength: DWORD,
-    ) -> DWORD;
-    pub fn PulseEvent(hEvent: HANDLE) -> BOOL;
-    pub fn PurgeComm(hFile: HANDLE, dwFlags: DWORD) -> BOOL;
-    pub fn QueryActCtxSettingsW(
-        dwFlags: DWORD, hActCtx: HANDLE, settingsNameSpace: PCWSTR, settingName: PCWSTR,
-        pvBuffer: PWSTR, dwBuffer: SIZE_T, pdwWrittenOrRequired: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn QueryActCtxW(
-        dwFlags: DWORD, hActCtx: HANDLE, pvSubInstance: PVOID, ulInfoClass: ULONG, pvBuffer: PVOID,
-        cbBuffer: SIZE_T, pcbWrittenOrRequired: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn QueryDepthSList(ListHead: PSLIST_HEADER) -> USHORT;
-    pub fn QueryDosDeviceA(lpDeviceName: LPCSTR, lpTargetPath: LPSTR, ucchMax: DWORD) -> DWORD;
-    pub fn QueryDosDeviceW(lpDeviceName: LPCWSTR, lpTargetPath: LPWSTR, ucchMax: DWORD) -> DWORD;
-    pub fn QueryFullProcessImageNameA(
-        hProcess: HANDLE, dwFlags: DWORD, lpExeName: LPSTR, lpdwSize: PDWORD,
-    ) -> BOOL;
-    pub fn QueryFullProcessImageNameW(
-        hProcess: HANDLE, dwFlags: DWORD, lpExeName: LPWSTR, lpdwSize: PDWORD,
-    ) -> BOOL;
-    pub fn QueryIdleProcessorCycleTime(
-        BufferLength: PULONG, ProcessorIdleCycleTime: PULONG64,
-    ) -> BOOL;
-    pub fn QueryIdleProcessorCycleTimeEx(
-        Group: USHORT, BufferLength: PULONG, ProcessorIdleCycleTime: PULONG64,
-    ) -> BOOL;
-    pub fn QueryInformationJobObject(
-        hJob: HANDLE, JobObjectInformationClass: JOBOBJECTINFOCLASS,
-        lpJobObjectInformation: LPVOID, cbJobObjectInformationLength: DWORD,
-        lpReturnLength: LPDWORD,
-    ) -> BOOL;
-    pub fn QueryMemoryResourceNotification(
-        ResourceNotificationHandle: HANDLE, ResourceState: PBOOL,
-    ) -> BOOL;
-    pub fn QueryPerformanceCounter(lpPerformanceCount: *mut LARGE_INTEGER) -> BOOL;
-    pub fn QueryPerformanceFrequency(lpFrequency: *mut LARGE_INTEGER) -> BOOL;
-    pub fn QueryProcessAffinityUpdateMode(hProcess: HANDLE, lpdwFlags: LPDWORD) -> BOOL;
-    pub fn QueryProcessCycleTime(ProcessHandle: HANDLE, CycleTime: PULONG64) -> BOOL;
-    pub fn QueryProtectedPolicy(PolicyGuid: LPCGUID, PolicyValue: PULONG_PTR) -> BOOL;
-    pub fn QueryThreadCycleTime(ThreadHandle: HANDLE, CycleTime: PULONG64) -> BOOL;
-    pub fn QueryThreadProfiling(ThreadHandle: HANDLE, Enabled: PBOOLEAN) -> DWORD;
-    pub fn QueryThreadpoolStackInformation(
-        ptpp: PTP_POOL, ptpsi: PTP_POOL_STACK_INFORMATION,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn QueryUmsThreadInformation(
-        UmsThread: PUMS_CONTEXT, UmsThreadInfoClass: UMS_THREAD_INFO_CLASS,
-        UmsThreadInformation: PVOID, UmsThreadInformationLength: ULONG, ReturnLength: PULONG,
-    ) -> BOOL;
-    pub fn QueryUnbiasedInterruptTime(UnbiasedTime: PULONGLONG) -> BOOL;
-    pub fn QueueUserAPC(pfnAPC: PAPCFUNC, hThread: HANDLE, dwData: ULONG_PTR) -> DWORD;
-    pub fn QueueUserWorkItem(
-        Function: LPTHREAD_START_ROUTINE, Context: PVOID, Flags: ULONG,
-    ) -> BOOL;
-    pub fn RaiseException(
-        dwExceptionCode: DWORD, dwExceptionFlags: DWORD, nNumberOfArguments: DWORD,
-        lpArguments: *const ULONG_PTR,
-    );
-    pub fn RaiseFailFastException(
-        pExceptionRecord: PEXCEPTION_RECORD, pContextRecord: PCONTEXT, dwFlags: DWORD,
-    );
-    pub fn ReOpenFile(
-        hOriginalFile: HANDLE, dwDesiredAccess: DWORD, dwShareMode: DWORD, dwFlags: DWORD,
-    ) -> HANDLE;
-    pub fn ReadConsoleA(
-        hConsoleInput: HANDLE, lpBuffer: LPVOID, nNumberOfCharsToRead: DWORD,
-        lpNumberOfCharsRead: LPDWORD, pInputControl: PCONSOLE_READCONSOLE_CONTROL,
-    ) -> BOOL;
-    pub fn ReadConsoleInputA(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleInputW(
-        hConsoleInput: HANDLE, lpBuffer: PINPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputA(
-        hConsoleOutput: HANDLE, lpBuffer: PCHAR_INFO, dwBufferSize: COORD, dwBufferCoord: COORD,
-        lpReadRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputAttribute(
-        hConsoleOutput: HANDLE, lpAttribute: LPWORD, nLength: DWORD, dwReadCoord: COORD,
-        lpNumberOfAttrsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputCharacterA(
-        hConsoleOutput: HANDLE, lpCharacter: LPSTR, nLength: DWORD, dwReadCoord: COORD,
-        lpNumberOfCharsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputCharacterW(
-        hConsoleOutput: HANDLE, lpCharacter: LPWSTR, nLength: DWORD, dwReadCoord: COORD,
-        lpNumberOfCharsRead: LPDWORD,
-    ) -> BOOL;
-    pub fn ReadConsoleOutputW(
-        hConsoleOutput: HANDLE, lpBuffer: PCHAR_INFO, dwBufferSize: COORD, dwBufferCoord: COORD,
-        lpReadRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn ReadConsoleW(
-        hConsoleInput: HANDLE, lpBuffer: LPVOID, nNumberOfCharsToRead: DWORD,
-        lpNumberOfCharsRead: LPDWORD, pInputControl: PCONSOLE_READCONSOLE_CONTROL,
-    ) -> BOOL;
-    pub fn ReadDirectoryChangesW(
-        hDirectory: HANDLE, lpBuffer: LPVOID, nBufferLength: DWORD, bWatchSubtree: BOOL,
-        dwNotifyFilter: DWORD, lpBytesReturned: LPDWORD, lpOverlapped: LPOVERLAPPED,
-        lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> BOOL;
-    pub fn ReadFile(
-        hFile: HANDLE, lpBuffer: LPVOID, nNumberOfBytesToRead: DWORD, lpNumberOfBytesRead: LPDWORD,
-        lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn ReadFileEx(
-        hFile: HANDLE, lpBuffer: LPVOID, nNumberOfBytesToRead: DWORD, lpOverlapped: LPOVERLAPPED,
-        lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> BOOL;
-    pub fn ReadFileScatter(
-        hFile: HANDLE, aSegmentArray: *mut FILE_SEGMENT_ELEMENT, nNumberOfBytesToRead: DWORD,
-        lpReserved: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn ReadProcessMemory(
-        hProcess: HANDLE, lpBaseAddress: LPCVOID, lpBuffer: LPVOID, nSize: SIZE_T,
-        lpNumberOfBytesRead: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn ReadThreadProfilingData(
-        PerformanceDataHandle: HANDLE, Flags: DWORD, PerformanceData: PPERFORMANCE_DATA,
-    ) -> DWORD;
-    pub fn RegisterApplicationRecoveryCallback(
-        pRecoveyCallback: APPLICATION_RECOVERY_CALLBACK, pvParameter: PVOID, dwPingInterval: DWORD,
-        dwFlags: DWORD,
-    ) -> HRESULT;
-    pub fn RegisterApplicationRestart(pwzCommandline: PCWSTR, dwFlags: DWORD) -> HRESULT;
-    pub fn RegisterBadMemoryNotification(Callback: PBAD_MEMORY_CALLBACK_ROUTINE) -> PVOID;
-    // pub fn RegisterWaitForInputIdle();
-    pub fn RegisterWaitForSingleObject(
-        phNewWaitObject: PHANDLE, hObject: HANDLE, Callback: WAITORTIMERCALLBACK, Context: PVOID,
-        dwMilliseconds: ULONG, dwFlags: ULONG,
-    ) -> BOOL;
-    pub fn RegisterWaitForSingleObjectEx(
-        hObject: HANDLE, Callback: WAITORTIMERCALLBACK, Context: PVOID, dwMilliseconds: ULONG,
-        dwFlags: ULONG,
-    ) -> HANDLE;
-    // pub fn RegisterWaitUntilOOBECompleted();
-    pub fn ReleaseActCtx(hActCtx: HANDLE);
-    pub fn ReleaseMutex(hMutex: HANDLE) -> BOOL;
-    pub fn ReleaseMutexWhenCallbackReturns(pci: PTP_CALLBACK_INSTANCE, mutex: HANDLE);
-    pub fn ReleaseSRWLockExclusive(SRWLock: PSRWLOCK);
-    pub fn ReleaseSRWLockShared(SRWLock: PSRWLOCK);
-    pub fn ReleaseSemaphore(
-        hSemaphore: HANDLE, lReleaseCount: LONG, lpPreviousCount: LPLONG,
-    ) -> BOOL;
-    pub fn ReleaseSemaphoreWhenCallbackReturns(
-        pci: PTP_CALLBACK_INSTANCE, sem: HANDLE, crel: DWORD,
-    );
-    pub fn RemoveDirectoryA(lpPathName: LPCSTR) -> BOOL;
-    pub fn RemoveDirectoryTransactedA(lpPathName: LPCSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn RemoveDirectoryTransactedW(lpPathName: LPCWSTR, hTransaction: HANDLE) -> BOOL;
-    pub fn RemoveDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-    pub fn RemoveDllDirectory(Cookie: DLL_DIRECTORY_COOKIE) -> BOOL;
-    // pub fn RemoveLocalAlternateComputerNameA();
-    // pub fn RemoveLocalAlternateComputerNameW();
-    pub fn RemoveSecureMemoryCacheCallback(pfnCallBack: PSECURE_MEMORY_CACHE_CALLBACK) -> BOOL;
-    pub fn RemoveVectoredContinueHandler(Handle: PVOID) -> ULONG;
-    pub fn RemoveVectoredExceptionHandler(Handle: PVOID) -> ULONG;
-    pub fn ReplaceFileA(
-        lpReplacedFileName: LPCSTR, lpReplacementFileName: LPCSTR, lpBackupFileName: LPCSTR,
-        dwReplaceFlags: DWORD, lpExclude: LPVOID, lpReserved: LPVOID,
-    );
-    pub fn ReplaceFileW(
-        lpReplacedFileName: LPCWSTR, lpReplacementFileName: LPCWSTR, lpBackupFileName: LPCWSTR,
-        dwReplaceFlags: DWORD, lpExclude: LPVOID, lpReserved: LPVOID,
-    );
-    pub fn ReplacePartitionUnit(
-        TargetPartition: PWSTR, SparePartition: PWSTR, Flags: ULONG,
-    ) -> BOOL;
-    pub fn RequestDeviceWakeup(hDevice: HANDLE) -> BOOL;
-    pub fn RequestWakeupLatency(latency: LATENCY_TIME) -> BOOL;
-    pub fn ResetEvent(hEvent: HANDLE) -> BOOL;
-    pub fn ResetWriteWatch(lpBaseAddress: LPVOID, dwRegionSize: SIZE_T) -> UINT;
-    // pub fn ResolveDelayLoadedAPI();
-    // pub fn ResolveDelayLoadsFromDll();
-    pub fn ResolveLocaleName(
-        lpNameToResolve: LPCWSTR, lpLocaleName: LPWSTR, cchLocaleName: c_int,
-    ) -> c_int;
-    pub fn RestoreLastError(dwErrCode: DWORD);
-    pub fn ResumeThread(hThread: HANDLE) -> DWORD;
-    #[cfg(target_arch = "arm")]
-    pub fn RtlAddFunctionTable(
-        FunctionTable: PRUNTIME_FUNCTION, EntryCount: DWORD, BaseAddress: DWORD,
-    ) -> BOOLEAN;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlAddFunctionTable(
-        FunctionTable: PRUNTIME_FUNCTION, EntryCount: DWORD, BaseAddress: DWORD64,
-    ) -> BOOLEAN;
-    pub fn RtlCaptureContext(ContextRecord: PCONTEXT);
-    pub fn RtlCaptureStackBackTrace(
-        FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: *mut PVOID, BackTraceHash: PDWORD,
-    ) -> WORD;
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlCompareMemory(Source1: *const VOID, Source2: *const VOID, Length: SIZE_T) -> SIZE_T;
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlCopyMemory(Destination: PVOID, Source: *const VOID, Length: SIZE_T);
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlDeleteFunctionTable(FunctionTable: PRUNTIME_FUNCTION) -> BOOLEAN;
-    // pub fn RtlFillMemory();
-    #[cfg(target_arch = "arm")]
-    pub fn RtlInstallFunctionTableCallback(
-        TableIdentifier: DWORD, BaseAddress: DWORD, Length: DWORD,
-        Callback: PGET_RUNTIME_FUNCTION_CALLBACK, Context: PVOID, OutOfProcessCallbackDll: PCWSTR,
-    ) -> BOOLEAN;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlInstallFunctionTableCallback(
-        TableIdentifier: DWORD64, BaseAddress: DWORD64, Length: DWORD,
-        Callback: PGET_RUNTIME_FUNCTION_CALLBACK, Context: PVOID, OutOfProcessCallbackDll: PCWSTR,
-    ) -> BOOLEAN;
-    #[cfg(target_arch = "arm")]
-    pub fn RtlLookupFunctionEntry(
-        ControlPc: ULONG_PTR, ImageBase: PDWORD, HistoryTable: PUNWIND_HISTORY_TABLE,
-    ) -> PRUNTIME_FUNCTION;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlLookupFunctionEntry(
-        ControlPc: DWORD64, ImageBase: PDWORD64, HistoryTable: PUNWIND_HISTORY_TABLE,
-    ) -> PRUNTIME_FUNCTION;
-    // pub fn RtlMoveMemory();
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlPcToFileHeader(PcValue: PVOID, BaseOfImage: *mut PVOID) -> PVOID;
-    // #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    // pub fn RtlRaiseException();
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlRestoreContext(ContextRecord: PCONTEXT, ExceptionRecord: *mut EXCEPTION_RECORD);
-    pub fn RtlUnwind(
-        TargetFrame: PVOID, TargetIp: PVOID, ExceptionRecord: PEXCEPTION_RECORD, ReturnValue: PVOID,
-    );
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn RtlUnwindEx(
-        TargetFrame: PVOID, TargetIp: PVOID, ExceptionRecord: PEXCEPTION_RECORD, ReturnValue: PVOID,
-        ContextRecord: PCONTEXT, HistoryTable: PUNWIND_HISTORY_TABLE,
-    );
-    #[cfg(target_arch = "arm")]
-    pub fn RtlVirtualUnwind(
-        HandlerType: DWORD, ImageBase: DWORD, ControlPc: DWORD, FunctionEntry: PRUNTIME_FUNCTION,
-        ContextRecord: PCONTEXT, HandlerData: *mut PVOID, EstablisherFrame: PDWORD,
-        ContextPointers: PKNONVOLATILE_CONTEXT_POINTERS,
-    ) -> PEXCEPTION_ROUTINE;
-    #[cfg(target_arch = "x86_64")]
-    pub fn RtlVirtualUnwind(
-        HandlerType: DWORD, ImageBase: DWORD64, ControlPc: DWORD64,
-        FunctionEntry: PRUNTIME_FUNCTION, ContextRecord: PCONTEXT, HandlerData: *mut PVOID,
-        EstablisherFrame: PDWORD64, ContextPointers: PKNONVOLATILE_CONTEXT_POINTERS,
-    ) -> PEXCEPTION_ROUTINE;
-    // pub fn RtlZeroMemory();
-    pub fn ScrollConsoleScreenBufferA(
-        hConsoleOutput: HANDLE, lpScrollRectangle: *const SMALL_RECT,
-        lpClipRectangle: *const SMALL_RECT, dwDestinationOrigin: COORD, lpFill: *const CHAR_INFO,
-    ) -> BOOL;
-    pub fn ScrollConsoleScreenBufferW(
-        hConsoleOutput: HANDLE, lpScrollRectangle: *const SMALL_RECT,
-        lpClipRectangle: *const SMALL_RECT, dwDestinationOrigin: COORD, lpFill: *const CHAR_INFO,
-    ) -> BOOL;
-    pub fn SearchPathA(
-        lpPath: LPCSTR, lpFileName: LPCSTR, lpExtension: LPCSTR, nBufferLength: DWORD,
-        lpBuffer: LPSTR, lpFilePart: *mut LPSTR,
-    ) -> DWORD;
-    pub fn SearchPathW(
-        lpPath: LPCWSTR, lpFileName: LPCWSTR, lpExtension: LPCWSTR, nBufferLength: DWORD,
-        lpBuffer: LPWSTR, lpFilePart: *mut LPWSTR,
-    ) -> DWORD;
-    pub fn SetCachedSigningLevel(
-        SourceFiles: PHANDLE, SourceFileCount: ULONG, Flags: ULONG, TargetFile: HANDLE,
-    ) -> BOOL;
-    pub fn SetCalendarInfoA(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPCSTR,
-    ) -> BOOL;
-    pub fn SetCalendarInfoW(
-        Locale: LCID, Calendar: CALID, CalType: CALTYPE, lpCalData: LPCWSTR,
-    ) -> BOOL;
-    pub fn SetCommBreak(hFile: HANDLE) -> BOOL;
-    pub fn SetCommConfig(hCommDev: HANDLE, lpCC: LPCOMMCONFIG, dwSize: DWORD) -> BOOL;
-    pub fn SetCommMask(hFile: HANDLE, dwEvtMask: DWORD) -> BOOL;
-    pub fn SetCommState(hFile: HANDLE, lpDCB: LPDCB) -> BOOL;
-    pub fn SetCommTimeouts(hFile: HANDLE, lpCommTimeouts: LPCOMMTIMEOUTS) -> BOOL;
-    pub fn SetComputerNameA(lpComputerName: LPCSTR) -> BOOL;
-    pub fn SetComputerNameEx2W(
-        NameType: COMPUTER_NAME_FORMAT, Flags: DWORD, lpBuffer: LPCWSTR,
-    ) -> BOOL;
-    pub fn SetComputerNameExA(NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPCSTR) -> BOOL;
-    pub fn SetComputerNameExW(NameType: COMPUTER_NAME_FORMAT, lpBuffer: LPCWSTR) -> BOOL;
-    pub fn SetComputerNameW(lpComputerName: LPCWSTR) -> BOOL;
-    pub fn SetConsoleActiveScreenBuffer(hConsoleOutput: HANDLE) -> BOOL;
-    pub fn SetConsoleCP(wCodePageID: UINT) -> BOOL;
-    pub fn SetConsoleCtrlHandler(HandlerRoutine: PHANDLER_ROUTINE, Add: BOOL) -> BOOL;
-    // pub fn SetConsoleCursor();
-    pub fn SetConsoleCursorInfo(
-        hConsoleOutput: HANDLE, lpConsoleCursorInfo: *const CONSOLE_CURSOR_INFO,
-    ) -> BOOL;
-    pub fn SetConsoleCursorPosition(hConsoleOutput: HANDLE, dwCursorPosition: COORD) -> BOOL;
-    pub fn SetConsoleDisplayMode(
-        hConsoleOutput: HANDLE, dwFlags: DWORD, lpNewScreenBufferDimensions: PCOORD,
-    ) -> BOOL;
-    pub fn SetConsoleHistoryInfo(lpConsoleHistoryInfo: PCONSOLE_HISTORY_INFO) -> BOOL;
-    pub fn SetConsoleMode(hConsoleHandle: HANDLE, dwMode: DWORD) -> BOOL;
-    pub fn SetConsoleOutputCP(wCodePageID: UINT) -> BOOL;
-    pub fn SetConsoleScreenBufferInfoEx(
-        hConsoleOutput: HANDLE, lpConsoleScreenBufferInfoEx: PCONSOLE_SCREEN_BUFFER_INFOEX,
-    ) -> BOOL;
-    pub fn SetConsoleScreenBufferSize(hConsoleOutput: HANDLE, dwSize: COORD) -> BOOL;
-    pub fn SetConsoleTextAttribute(hConsoleOutput: HANDLE, wAttributes: WORD) -> BOOL;
-    pub fn SetConsoleTitleA(lpConsoleTitle: LPCSTR) -> BOOL;
-    pub fn SetConsoleTitleW(lpConsoleTitle: LPCWSTR) -> BOOL;
-    pub fn SetConsoleWindowInfo(
-        hConsoleOutput: HANDLE, bAbsolute: BOOL, lpConsoleWindow: *const SMALL_RECT,
-    ) -> BOOL;
-    pub fn SetCriticalSectionSpinCount(
-        lpCriticalSection: LPCRITICAL_SECTION, dwSpinCount: DWORD,
-    ) -> DWORD;
-    pub fn SetCurrentConsoleFontEx(
-        hConsoleOutput: HANDLE, bMaximumWindow: BOOL, lpConsoleCurrentFontEx: PCONSOLE_FONT_INFOEX,
-    ) -> BOOL;
-    pub fn SetCurrentDirectoryA(lpPathName: LPCSTR) -> BOOL;
-    pub fn SetCurrentDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-    pub fn SetDefaultCommConfigA(lpszName: LPCSTR, lpCC: LPCOMMCONFIG, dwSize: DWORD) -> BOOL;
-    pub fn SetDefaultCommConfigW(lpszName: LPCWSTR, lpCC: LPCOMMCONFIG, dwSize: DWORD) -> BOOL;
-    pub fn SetDefaultDllDirectories(DirectoryFlags: DWORD) -> BOOL;
-    pub fn SetDllDirectoryA(lpPathName: LPCSTR) -> BOOL;
-    pub fn SetDllDirectoryW(lpPathName: LPCWSTR) -> BOOL;
-    pub fn SetDynamicTimeZoneInformation(
-        lpTimeZoneInformation: *const DYNAMIC_TIME_ZONE_INFORMATION,
-    ) -> BOOL;
-    pub fn SetEndOfFile(hFile: HANDLE) -> BOOL;
-    pub fn SetEnvironmentStringsA(NewEnvironment: LPCH) -> BOOL;
-    pub fn SetEnvironmentStringsW(NewEnvironment: LPWCH) -> BOOL;
-    pub fn SetEnvironmentVariableA(lpName: LPCSTR, lpValue: LPCSTR) -> BOOL;
-    pub fn SetEnvironmentVariableW(lpName: LPCWSTR, lpValue: LPCWSTR) -> BOOL;
-    pub fn SetErrorMode(uMode: UINT) -> UINT;
-    pub fn SetEvent(hEvent: HANDLE) -> BOOL;
-    pub fn SetEventWhenCallbackReturns(pci: PTP_CALLBACK_INSTANCE, evt: HANDLE);
-    pub fn SetFileApisToANSI();
-    pub fn SetFileApisToOEM();
-    pub fn SetFileAttributesA(lpFileName: LPCSTR, dwFileAttributes: DWORD) -> BOOL;
-    pub fn SetFileAttributesTransactedA(
-        lpFileName: LPCSTR, dwFileAttributes: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn SetFileAttributesTransactedW(
-        lpFileName: LPCWSTR, dwFileAttributes: DWORD, hTransaction: HANDLE,
-    ) -> BOOL;
-    pub fn SetFileAttributesW(lpFileName: LPCWSTR, dwFileAttributes: DWORD) -> BOOL;
-    pub fn SetFileBandwidthReservation(
-        hFile: HANDLE, nPeriodMilliseconds: DWORD, nBytesPerPeriod: DWORD, bDiscardable: BOOL,
-        lpTransferSize: LPDWORD, lpNumOutstandingRequests: LPDWORD,
-    ) -> BOOL;
-    pub fn SetFileCompletionNotificationModes(FileHandle: HANDLE, Flags: UCHAR) -> BOOL;
-    pub fn SetFileInformationByHandle(
-        hFile: HANDLE, FileInformationClass: FILE_INFO_BY_HANDLE_CLASS, lpFileInformation: LPVOID,
-        dwBufferSize: DWORD,
-    ) -> BOOL;
-    pub fn SetFileIoOverlappedRange(
-        FileHandle: HANDLE, OverlappedRangeStart: PUCHAR, Length: ULONG,
-    ) -> BOOL;
-    pub fn SetFilePointer(
-        hFile: HANDLE, lDistanceToMove: LONG, lpDistanceToMoveHigh: PLONG, dwMoveMethod: DWORD,
-    ) -> DWORD;
-    pub fn SetFilePointerEx(
-        hFile: HANDLE, liDistanceToMove: LARGE_INTEGER, lpNewFilePointer: PLARGE_INTEGER,
-        dwMoveMethod: DWORD,
-    ) -> BOOL;
-    pub fn SetFileShortNameA(hFile: HANDLE, lpShortName: LPCSTR) -> BOOL;
-    pub fn SetFileShortNameW(hFile: HANDLE, lpShortName: LPCWSTR) -> BOOL;
-    pub fn SetFileTime(
-        hFile: HANDLE, lpCreationTime: *const FILETIME, lpLastAccessTime: *const FILETIME,
-        lpLastWriteTime: *const FILETIME,
-    ) -> BOOL;
-    pub fn SetFileValidData(hFile: HANDLE, ValidDataLength: LONGLONG) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pValue: PVOID, nSize: DWORD,
-    ) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableExA(
-        lpName: LPCSTR, lpGuid: LPCSTR, pValue: PVOID, nSize: DWORD, dwAttributes: DWORD,
-    ) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableExW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pValue: PVOID, nSize: DWORD, dwAttributes: DWORD,
-    ) -> BOOL;
-    pub fn SetFirmwareEnvironmentVariableW(
-        lpName: LPCWSTR, lpGuid: LPCWSTR, pValue: PVOID, nSize: DWORD,
-    ) -> BOOL;
-    pub fn SetHandleCount(uNumber: UINT) -> UINT;
-    pub fn SetHandleInformation(hObject: HANDLE, dwMask: DWORD, dwFlags: DWORD) -> BOOL;
-    pub fn SetInformationJobObject(
-        hJob: HANDLE, JobObjectInformationClass: JOBOBJECTINFOCLASS,
-        lpJobObjectInformation: LPVOID, cbJobObjectInformationLength: DWORD,
-    ) -> BOOL;
-    pub fn SetLastError(dwErrCode: DWORD);
-    // pub fn SetLocalPrimaryComputerNameA();
-    // pub fn SetLocalPrimaryComputerNameW();
-    pub fn SetLocalTime(lpSystemTime: *const SYSTEMTIME) -> BOOL;
-    pub fn SetLocaleInfoA(Locale: LCID, LCType: LCTYPE, lpLCData: LPCSTR) -> BOOL;
-    pub fn SetLocaleInfoW(Locale: LCID, LCType: LCTYPE, lpLCData: LPCWSTR) -> BOOL;
-    pub fn SetMailslotInfo(hMailslot: HANDLE, lReadTimeout: DWORD) -> BOOL;
-    pub fn SetMessageWaitingIndicator(hMsgIndicator: HANDLE, ulMsgCount: ULONG) -> BOOL;
-    pub fn SetNamedPipeAttribute(
-        Pipe: HANDLE, AttributeType: PIPE_ATTRIBUTE_TYPE, AttributeName: PSTR,
-        AttributeValue: PVOID, AttributeValueLength: SIZE_T,
-    ) -> BOOL;
-    pub fn SetNamedPipeHandleState(
-        hNamedPipe: HANDLE, lpMode: LPDWORD, lpMaxCollectionCount: LPDWORD,
-        lpCollectDataTimeout: LPDWORD,
-    ) -> BOOL;
-    pub fn SetPriorityClass(hProcess: HANDLE, dwPriorityClass: DWORD) -> BOOL;
-    pub fn SetProcessAffinityMask(hProcess: HANDLE, dwProcessAffinityMask: DWORD) -> BOOL;
-    pub fn SetProcessAffinityUpdateMode(hProcess: HANDLE, dwFlags: DWORD) -> BOOL;
-    pub fn SetProcessDEPPolicy(dwFlags: DWORD) -> BOOL;
-    pub fn SetProcessInformation(
-        hProcess: HANDLE, ProcessInformationClass: PROCESS_INFORMATION_CLASS,
-        ProcessInformation: LPVOID, ProcessInformationSize: DWORD,
-    ) -> BOOL;
-    pub fn SetProcessMitigationPolicy(
-        MitigationPolicy: PROCESS_MITIGATION_POLICY, lpBuffer: PVOID, dwLength: SIZE_T,
-    ) -> BOOL;
-    pub fn SetProcessPreferredUILanguages(
-        dwFlags: DWORD, pwszLanguagesBuffer: PCZZWSTR, pulNumLanguages: PULONG,
-    ) -> BOOL;
-    pub fn SetProcessPriorityBoost(hProcess: HANDLE, bDisablePriorityBoost: BOOL) -> BOOL;
-    pub fn SetProcessShutdownParameters(dwLevel: DWORD, dwFlags: DWORD) -> BOOL;
-    pub fn SetProcessWorkingSetSize(
-        hProcess: HANDLE, dwMinimumWorkingSetSize: SIZE_T, dwMaximumWorkingSetSize: SIZE_T,
-    ) -> BOOL;
-    pub fn SetProcessWorkingSetSizeEx(
-        hProcess: HANDLE, dwMinimumWorkingSetSize: SIZE_T, dwMaximumWorkingSetSize: SIZE_T,
-        Flags: DWORD,
-    ) -> BOOL;
-    pub fn SetProtectedPolicy(
-        PolicyGuid: LPCGUID, PolicyValue: ULONG_PTR, OldPolicyValue: PULONG_PTR,
-    ) -> BOOL;
-    pub fn SetSearchPathMode(Flags: DWORD) -> BOOL;
-    pub fn SetStdHandle(nStdHandle: DWORD, hHandle: HANDLE) -> BOOL;
-    pub fn SetStdHandleEx(nStdHandle: DWORD, hHandle: HANDLE, phPrevValue: PHANDLE) -> BOOL;
-    pub fn SetSystemFileCacheSize(
-        MinimumFileCacheSize: SIZE_T, MaximumFileCacheSize: SIZE_T, Flags: DWORD,
-    ) -> BOOL;
-    pub fn SetSystemPowerState(fSuspend: BOOL, fForce: BOOL) -> BOOL;
-    pub fn SetSystemTime(lpSystemTime: *const SYSTEMTIME) -> BOOL;
-    pub fn SetSystemTimeAdjustment(dwTimeAdjustment: DWORD, bTimeAdjustmentDisabled: BOOL) -> BOOL;
-    pub fn SetTapeParameters(
-        hDevice: HANDLE, dwOperation: DWORD, lpTapeInformation: LPVOID,
-    ) -> DWORD;
-    pub fn SetTapePosition(
-        hDevice: HANDLE, dwPositionMethod: DWORD, dwPartition: DWORD,
-        dwOffsetLow: DWORD, dwOffsetHigh: DWORD, bImmediate: BOOL
-    ) -> DWORD;
-    pub fn SetThreadAffinityMask(hThread: HANDLE, dwThreadAffinityMask: DWORD_PTR) -> DWORD_PTR;
-    pub fn SetThreadContext(hThread: HANDLE, lpContext: *const CONTEXT) -> BOOL;
-    pub fn SetThreadErrorMode(dwNewMode: DWORD, lpOldMode: LPDWORD) -> BOOL;
-    pub fn SetThreadExecutionState(esFlags: EXECUTION_STATE) -> EXECUTION_STATE;
-    pub fn SetThreadGroupAffinity(
-        hThread: HANDLE, GroupAffinity: *const GROUP_AFFINITY,
-        PreviousGroupAffinity: PGROUP_AFFINITY,
-    ) -> BOOL;
-    pub fn SetThreadIdealProcessor(hThread: HANDLE, dwIdealProcessor: DWORD) -> DWORD;
-    pub fn SetThreadIdealProcessorEx(
-        hThread: HANDLE, lpIdealProcessor: PPROCESSOR_NUMBER,
-        lpPreviousIdealProcessor: PPROCESSOR_NUMBER,
-    ) -> BOOL;
-    pub fn SetThreadInformation(
-        hThread: HANDLE, ThreadInformationClass: THREAD_INFORMATION_CLASS,
-        ThreadInformation: LPVOID, ThreadInformationSize: DWORD,
-    );
-    pub fn SetThreadLocale(Locale: LCID) -> BOOL;
-    pub fn SetThreadPreferredUILanguages(
-        dwFlags: DWORD, pwszLanguagesBuffer: PCZZWSTR, pulNumLanguages: PULONG,
-    ) -> BOOL;
-    pub fn SetThreadPriority(hThread: HANDLE, nPriority: c_int) -> BOOL;
-    pub fn SetThreadPriorityBoost(hThread: HANDLE, bDisablePriorityBoost: BOOL) -> BOOL;
-    pub fn SetThreadStackGuarantee(StackSizeInBytes: PULONG) -> BOOL;
-    pub fn SetThreadUILanguage(LangId: LANGID) -> LANGID;
-    pub fn SetThreadpoolStackInformation(
-        ptpp: PTP_POOL, ptpsi: PTP_POOL_STACK_INFORMATION,
-    ) -> BOOL;
-    pub fn SetThreadpoolThreadMaximum(ptpp: PTP_POOL, cthrdMost: DWORD);
-    pub fn SetThreadpoolThreadMinimum(ptpp: PTP_POOL, cthrdMic: DWORD) -> BOOL;
-    pub fn SetThreadpoolTimer(
-        pti: PTP_TIMER, pftDueTime: PFILETIME, msPeriod: DWORD, msWindowLength: DWORD,
-    );
-    pub fn SetThreadpoolTimerEx(
-        pti: PTP_TIMER, pftDueTime: PFILETIME, msPeriod: DWORD, msWindowLength: DWORD,
-    ) -> BOOL;
-    pub fn SetThreadpoolWait(pwa: PTP_WAIT, h: HANDLE, pftTimeout: PFILETIME);
-    pub fn SetThreadpoolWaitEx(
-        pwa: PTP_WAIT, h: HANDLE, pftTimeout: PFILETIME, Reserved: PVOID,
-    ) -> BOOL;
-    pub fn SetTimeZoneInformation(lpTimeZoneInformation: *const TIME_ZONE_INFORMATION) -> BOOL;
-    pub fn SetTimerQueueTimer(
-        TimerQueue: HANDLE, Callback: WAITORTIMERCALLBACK, Parameter: PVOID, DueTime: DWORD,
-        Period: DWORD, PreferIo: BOOL,
-    ) -> HANDLE;
-    #[cfg(target_arch = "x86_64")]
-    pub fn SetUmsThreadInformation(
-        UmsThread: PUMS_CONTEXT, UmsThreadInfoClass: UMS_THREAD_INFO_CLASS,
-        UmsThreadInformation: PVOID, UmsThreadInformationLength: ULONG,
-    ) -> BOOL;
-    pub fn SetUnhandledExceptionFilter(
-        lpTopLevelExceptionFilter: LPTOP_LEVEL_EXCEPTION_FILTER,
-    ) -> LPTOP_LEVEL_EXCEPTION_FILTER;
-    pub fn SetUserGeoID(GeoId: GEOID) -> BOOL;
-    pub fn SetVolumeLabelA(lpRootPathName: LPCSTR, lpVolumeName: LPCSTR) -> BOOL;
-    pub fn SetVolumeLabelW(lpRootPathName: LPCWSTR, lpVolumeName: LPCWSTR) -> BOOL;
-    pub fn SetVolumeMountPointA(lpszVolumeMountPoint: LPCSTR, lpszVolumeName: LPCSTR) -> BOOL;
-    pub fn SetVolumeMountPointW(lpszVolumeMountPoint: LPCWSTR, lpszVolumeName: LPCWSTR) -> BOOL;
-    pub fn SetWaitableTimer(
-        hTimer: HANDLE, lpDueTime: *const LARGE_INTEGER, lPeriod: LONG,
-        pfnCompletionRoutine: PTIMERAPCROUTINE, lpArgToCompletionRoutine: LPVOID, fResume: BOOL,
-    ) -> BOOL;
-    pub fn SetWaitableTimerEx(
-        hTimer: HANDLE, lpDueTime: *const LARGE_INTEGER, lPeriod: LONG,
-        pfnCompletionRoutine: PTIMERAPCROUTINE, lpArgToCompletionRoutine: LPVOID,
-        WakeContext: PREASON_CONTEXT, TolerableDelay: ULONG,
-    ) -> BOOL;
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-    pub fn SetXStateFeaturesMask(Context: PCONTEXT, FeatureMask: DWORD64) -> BOOL;
-    pub fn SetupComm(hFile: HANDLE, dwInQueue: DWORD, dwOutQueue: DWORD) -> BOOL;
-    pub fn SignalObjectAndWait(
-        hObjectToSignal: HANDLE, hObjectToWaitOn: HANDLE, dwMilliseconds: DWORD, bAlertable: BOOL,
-    ) -> DWORD;
-    pub fn SizeofResource(hModule: HMODULE, hResInfo: HRSRC) -> DWORD;
-    pub fn Sleep(dwMilliseconds: DWORD);
-    pub fn SleepConditionVariableCS(
-        ConditionVariable: PCONDITION_VARIABLE, CriticalSection: PCRITICAL_SECTION,
-        dwMilliseconds: DWORD,
-    ) -> BOOL;
-    pub fn SleepConditionVariableSRW(
-        ConditionVariable: PCONDITION_VARIABLE, SRWLock: PSRWLOCK, dwMilliseconds: DWORD,
-        Flags: ULONG,
-    ) -> BOOL;
-    pub fn SleepEx(dwMilliseconds: DWORD, bAlertable: BOOL) -> DWORD;
-    pub fn StartThreadpoolIo(pio: PTP_IO);
-    pub fn SubmitThreadpoolWork(pwk: PTP_WORK);
-    pub fn SuspendThread(hThread: HANDLE) -> DWORD;
-    pub fn SwitchToFiber(lpFiber: LPVOID);
-    pub fn SwitchToThread() -> BOOL;
-    pub fn SystemTimeToFileTime(lpSystemTime: *const SYSTEMTIME, lpFileTime: LPFILETIME) -> BOOL;
-    pub fn SystemTimeToTzSpecificLocalTime(
-        lpTimeZoneInformation: *const TIME_ZONE_INFORMATION, lpUniversalTime: *const SYSTEMTIME,
-        lpLocalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn SystemTimeToTzSpecificLocalTimeEx(
-        lpTimeZoneInformation: *const DYNAMIC_TIME_ZONE_INFORMATION,
-        lpUniversalTime: *const SYSTEMTIME, lpLocalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn TerminateJobObject(hJob: HANDLE, uExitCode: UINT) -> BOOL;
-    pub fn TerminateProcess(hProcess: HANDLE, uExitCode: UINT) -> BOOL;
-    pub fn TerminateThread(hThread: HANDLE, dwExitCode: DWORD) -> BOOL;
-    pub fn Thread32First(hSnapshot: HANDLE, lpte: LPTHREADENTRY32) -> BOOL;
-    pub fn Thread32Next(hSnapshot: HANDLE, lpte: LPTHREADENTRY32) -> BOOL;
-    pub fn TlsAlloc() -> DWORD;
-    pub fn TlsFree(dwTlsIndex: DWORD) -> BOOL;
-    pub fn TlsGetValue(dwTlsIndex: DWORD) -> LPVOID;
-    pub fn TlsSetValue(dwTlsIndex: DWORD, lpTlsValue: LPVOID) -> BOOL;
-    pub fn Toolhelp32ReadProcessMemory(th32ProcessID: DWORD, lpBaseAddress: LPCVOID,
-        lpBuffer: LPVOID, cbRead: SIZE_T, lpNumberOfBytesRead: *mut SIZE_T
-    ) -> BOOL;
-    pub fn TransactNamedPipe(
-        hNamedPipe: HANDLE, lpInBuffer: LPVOID, nInBufferSize: DWORD, lpOutBuffer: LPVOID,
-        nOutBufferSize: DWORD, lpBytesRead: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn TransmitCommChar(hFile: HANDLE, cChar: c_char) -> BOOL;
-    pub fn TryAcquireSRWLockExclusive(SRWLock: PSRWLOCK) -> BOOLEAN;
-    pub fn TryAcquireSRWLockShared(SRWLock: PSRWLOCK) -> BOOLEAN;
-    pub fn TryEnterCriticalSection(lpCriticalSection: LPCRITICAL_SECTION) -> BOOL;
-    pub fn TrySubmitThreadpoolCallback(
-        pfns: PTP_SIMPLE_CALLBACK, pv: PVOID, pcbe: PTP_CALLBACK_ENVIRON,
-    ) -> BOOL;
-    pub fn TzSpecificLocalTimeToSystemTime(
-        lpTimeZoneInformation: *const TIME_ZONE_INFORMATION, lpLocalTime: *const SYSTEMTIME,
-        lpUniversalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    pub fn TzSpecificLocalTimeToSystemTimeEx(
-        lpTimeZoneInformation: *const DYNAMIC_TIME_ZONE_INFORMATION,
-        lpLocalTime: *const SYSTEMTIME, lpUniversalTime: LPSYSTEMTIME,
-    ) -> BOOL;
-    #[cfg(target_arch = "x86_64")]
-    pub fn UmsThreadYield(SchedulerParam: PVOID) -> BOOL;
-    pub fn UnhandledExceptionFilter(ExceptionInfo: *mut EXCEPTION_POINTERS) -> LONG;
-    pub fn UnlockFile(
-        hFile: HANDLE, dwFileOffsetLow: DWORD, dwFileOffsetHigh: DWORD,
-        nNumberOfBytesToUnlockLow: DWORD, nNumberOfBytesToUnlockHigh: DWORD,
-    ) -> BOOL;
-    pub fn UnlockFileEx(
-        hFile: HANDLE, dwReserved: DWORD, nNumberOfBytesToUnlockLow: DWORD,
-        nNumberOfBytesToUnlockHigh: DWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn UnmapViewOfFile(lpBaseAddress: LPCVOID) -> BOOL;
-    pub fn UnregisterApplicationRecoveryCallback() -> HRESULT;
-    pub fn UnregisterApplicationRestart() -> HRESULT;
-    pub fn UnregisterBadMemoryNotification(RegistrationHandle: PVOID) -> BOOL;
-    pub fn UnregisterWait(WaitHandle: HANDLE) -> BOOL;
-    pub fn UnregisterWaitEx(WaitHandle: HANDLE, CompletionEvent: HANDLE) -> BOOL;
-    // pub fn UnregisterWaitUntilOOBECompleted();
-    pub fn UpdateProcThreadAttribute(
-        lpAttributeList: LPPROC_THREAD_ATTRIBUTE_LIST, dwFlags: DWORD, Attribute: DWORD_PTR,
-        lpValue: PVOID, cbSize: SIZE_T, lpPreviousValue: PVOID, lpReturnSize: PSIZE_T,
-    ) -> BOOL;
-    pub fn UpdateResourceA(
-        hUpdate: HANDLE, lpType: LPCSTR, lpName: LPCSTR, wLanguage: WORD, lpData: LPVOID, cb: DWORD,
-    ) -> BOOL;
-    pub fn UpdateResourceW(
-        hUpdate: HANDLE, lpType: LPCWSTR, lpName: LPCWSTR, wLanguage: WORD, lpData: LPVOID,
-        cb: DWORD,
-    ) -> BOOL;
-    pub fn VerLanguageNameA(wLang: DWORD, szLang: LPSTR, cchLang: DWORD) -> DWORD;
-    pub fn VerLanguageNameW(wLang: DWORD, szLang: LPWSTR, cchLang: DWORD) -> DWORD;
-    pub fn VerSetConditionMask(
-        ConditionMask: ULONGLONG, TypeMask: DWORD, Condition: BYTE,
-    ) -> ULONGLONG;
-    pub fn VerifyScripts(
-        dwFlags: DWORD, lpLocaleScripts: LPCWSTR, cchLocaleScripts: c_int, lpTestScripts: LPCWSTR,
-        cchTestScripts: c_int,
-    ) -> BOOL;
-    pub fn VerifyVersionInfoA(
-        lpVersionInformation: LPOSVERSIONINFOEXA, dwTypeMask: DWORD, dwlConditionMask: DWORDLONG,
-    ) -> BOOL;
-    pub fn VerifyVersionInfoW(
-        lpVersionInformation: LPOSVERSIONINFOEXW, dwTypeMask: DWORD, dwlConditionMask: DWORDLONG,
-    ) -> BOOL;
-    pub fn VirtualAlloc(
-        lpAddress: LPVOID, dwSize: SIZE_T, flAllocationType: DWORD, flProtect: DWORD,
-    ) -> LPVOID;
-    pub fn VirtualAllocEx(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, flAllocationType: DWORD,
-        flProtect: DWORD,
-    ) -> LPVOID;
-    pub fn VirtualAllocExNuma(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, flAllocationType: DWORD,
-        flProtect: DWORD, nndPreferred: DWORD,
-    ) -> LPVOID;
-    pub fn VirtualFree(lpAddress: LPVOID, dwSize: SIZE_T, dwFreeType: DWORD) -> BOOL;
-    pub fn VirtualFreeEx(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, dwFreeType: DWORD,
-    ) -> BOOL;
-    pub fn VirtualLock(lpAddress: LPVOID, dwSize: SIZE_T) -> BOOL;
-    pub fn VirtualProtect(
-        lpAddress: LPVOID, dwSize: SIZE_T, flNewProtect: DWORD, lpflOldProtect: PDWORD,
-    ) -> BOOL;
-    pub fn VirtualProtectEx(
-        hProcess: HANDLE, lpAddress: LPVOID, dwSize: SIZE_T, flNewProtect: DWORD,
-        lpflOldProtect: DWORD,
-    ) -> BOOL;
-    pub fn VirtualQuery(
-        lpAddress: LPCVOID, lpBuffer: PMEMORY_BASIC_INFORMATION, dwLength: SIZE_T,
-    ) -> SIZE_T;
-    pub fn VirtualQueryEx(
-        hProcess: HANDLE, lpAddress: LPCVOID, lpBuffer: PMEMORY_BASIC_INFORMATION, dwLength: SIZE_T,
-    ) -> SIZE_T;
-    pub fn VirtualUnlock(lpAddress: LPVOID, dwSize: SIZE_T) -> BOOL;
-    pub fn WTSGetActiveConsoleSessionId() -> DWORD;
-    pub fn WaitCommEvent(hFile: HANDLE, lpEvtMask: LPDWORD, lpOverlapped: LPOVERLAPPED) -> BOOL;
-    pub fn WaitForDebugEvent(lpDebugEvent: LPDEBUG_EVENT, dwMilliseconds: DWORD) -> BOOL;
-    pub fn WaitForMultipleObjects(
-        nCount: DWORD, lpHandles: *const HANDLE, bWaitAll: BOOL, dwMilliseconds: DWORD,
-    ) -> DWORD;
-    pub fn WaitForMultipleObjectsEx(
-        nCount: DWORD, lpHandles: *const HANDLE, bWaitAll: BOOL, dwMilliseconds: DWORD,
-        bAlertable: BOOL,
-    ) -> DWORD;
-    pub fn WaitForSingleObject(hHandle: HANDLE, dwMilliseconds: DWORD) -> DWORD;
-    pub fn WaitForSingleObjectEx(
-        hHandle: HANDLE, dwMilliseconds: DWORD, bAlertable: BOOL,
-    ) -> DWORD;
-    pub fn WaitForThreadpoolIoCallbacks(pio: PTP_IO, fCancelPendingCallbacks: BOOL);
-    pub fn WaitForThreadpoolTimerCallbacks(pti: PTP_TIMER, fCancelPendingCallbacks: BOOL);
-    pub fn WaitForThreadpoolWaitCallbacks(pwa: PTP_WAIT, fCancelPendingCallbacks: BOOL);
-    pub fn WaitForThreadpoolWorkCallbacks(pwk: PTP_WORK, fCancelPendingCallbacks: BOOL);
-    pub fn WaitNamedPipeA(lpNamedPipeName: LPCSTR, nTimeOut: DWORD) -> BOOL;
-    pub fn WaitNamedPipeW(lpNamedPipeName: LPCWSTR, nTimeOut: DWORD) -> BOOL;
-    pub fn WakeAllConditionVariable(ConditionVariable: PCONDITION_VARIABLE);
-    pub fn WakeConditionVariable(ConditionVariable: PCONDITION_VARIABLE);
-    pub fn WerGetFlags(hProcess: HANDLE, pdwFlags: PDWORD) -> HRESULT;
-    pub fn WerRegisterFile(
-        pwzFile: PCWSTR, regFileType: WER_REGISTER_FILE_TYPE, dwFlags: DWORD,
-    ) -> HRESULT;
-    pub fn WerRegisterMemoryBlock(pvAddress: PVOID, dwSize: DWORD) -> HRESULT;
-    pub fn WerRegisterRuntimeExceptionModule(
-        pwszOutOfProcessCallbackDll: PCWSTR, pContext: PVOID,
-    ) -> HRESULT;
-    pub fn WerSetFlags(dwFlags: DWORD) -> HRESULT;
-    pub fn WerUnregisterFile(pwzFilePath: PCWSTR) -> HRESULT;
-    pub fn WerUnregisterMemoryBlock(pvAddress: PVOID) -> HRESULT;
-    pub fn WerUnregisterRuntimeExceptionModule(
-        pwszOutOfProcessCallbackDll: PCWSTR, pContext: PVOID,
-    ) -> HRESULT;
-    // pub fn WerpInitiateRemoteRecovery();
-    pub fn WideCharToMultiByte(
-      CodePage: UINT, dwFlags: DWORD, lpWideCharStr: LPCWSTR, cchWideChar: c_int,
-      lpMultiByteStr: LPSTR, cbMultiByte: c_int, lpDefaultChar: LPCSTR, lpUsedDefaultChar: LPBOOL,
-    ) -> c_int;
-    pub fn WinExec(lpCmdLine: LPCSTR, uCmdShow: UINT) -> UINT;
-    pub fn Wow64DisableWow64FsRedirection(OldValue: *mut PVOID) -> BOOL;
-    pub fn Wow64EnableWow64FsRedirection(Wow64FsEnableRedirection: BOOLEAN) -> BOOLEAN;
-    pub fn Wow64GetThreadContext(hThread: HANDLE, lpContext: PWOW64_CONTEXT) -> BOOL;
-    pub fn Wow64GetThreadSelectorEntry(
-        hThread: HANDLE, dwSelector: DWORD, lpSelectorEntry: PWOW64_LDT_ENTRY,
-    ) -> BOOL;
-    pub fn Wow64RevertWow64FsRedirection(OlValue: PVOID) -> BOOL;
-    pub fn Wow64SetThreadContext(hThread: HANDLE, lpContext: *const WOW64_CONTEXT) -> BOOL;
-    pub fn Wow64SuspendThread(hThread: HANDLE) -> DWORD;
-    pub fn WriteConsoleA(
-        hConsoleOutput: HANDLE, lpBuffer: *const VOID, nNumberOfCharsToWrite: DWORD,
-        lpNumberOfCharsWritten: LPDWORD, lpReserved: LPVOID,
-    ) -> BOOL;
-    pub fn WriteConsoleInputA(
-        hConsoleInput: HANDLE, lpBuffer: *const INPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleInputW(
-        hConsoleInput: HANDLE, lpBuffer: *const INPUT_RECORD, nLength: DWORD,
-        lpNumberOfEventsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputA(
-        hConsoleOutput: HANDLE, lpBuffer: *const CHAR_INFO, dwBufferSize: COORD,
-        dwBufferCoord: COORD, lpWriteRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputAttribute(
-        hConsoleOutput: HANDLE, lpAttribute: *const WORD, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfAttrsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputCharacterA(
-        hConsoleOutput: HANDLE, lpCharacter: LPCSTR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputCharacterW(
-        hConsoleOutput: HANDLE, lpCharacter: LPCWSTR, nLength: DWORD, dwWriteCoord: COORD,
-        lpNumberOfCharsWritten: LPDWORD,
-    ) -> BOOL;
-    pub fn WriteConsoleOutputW(
-        hConsoleOutput: HANDLE, lpBuffer: *const CHAR_INFO, dwBufferSize: COORD,
-        dwBufferCoord: COORD, lpWriteRegion: PSMALL_RECT,
-    ) -> BOOL;
-    pub fn WriteConsoleW(
-        hConsoleOutput: HANDLE, lpBuffer: *const VOID, nNumberOfCharsToWrite: DWORD,
-        lpNumberOfCharsWritten: LPDWORD, lpReserved: LPVOID,
-    ) -> BOOL;
-    pub fn WriteFile(
-        hFile: HANDLE, lpBuffer: LPCVOID, nNumberOfBytesToWrite: DWORD,
-        lpNumberOfBytesWritten: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn WriteFileEx(
-        hFile: HANDLE, lpBuffer: LPCVOID, nNumberOfBytesToWrite: DWORD, lpOverlapped: LPOVERLAPPED,
-        lpCompletionRoutine: LPOVERLAPPED_COMPLETION_ROUTINE,
-    ) -> BOOL;
-    pub fn WriteFileGather(
-        hFile: HANDLE, aSegmentArray: *mut FILE_SEGMENT_ELEMENT, nNumberOfBytesToWrite: DWORD,
-        lpReserved: LPDWORD, lpOverlapped: LPOVERLAPPED,
-    ) -> BOOL;
-    pub fn WritePrivateProfileSectionA(
-        lpAppName: LPCSTR, lpString: LPCSTR, lpFileName: LPCSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileSectionW(
-        lpAppName: LPCWSTR, lpString: LPCWSTR, lpFileName: LPCWSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStringA(
-        lpAppName: LPCSTR, lpKeyName: LPCSTR, lpString: LPCSTR, lpFileName: LPCSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStringW(
-        lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpString: LPCWSTR, lpFileName: LPCWSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStructA(
-        lpszSection: LPCSTR, lpszKey: LPCSTR, lpStruct: LPVOID, uSizeStruct: UINT, szFile: LPCSTR,
-    ) -> BOOL;
-    pub fn WritePrivateProfileStructW(
-        lpszSection: LPCWSTR, lpszKey: LPCWSTR, lpStruct: LPVOID, uSizeStruct: UINT,
-        szFile: LPCWSTR,
-    ) -> BOOL;
-    pub fn WriteProcessMemory(
-        hProcess: HANDLE, lpBaseAddress: LPVOID, lpBuffer: LPCVOID, nSize: SIZE_T,
-        lpNumberOfBytesWritten: *mut SIZE_T,
-    ) -> BOOL;
-    pub fn WriteProfileSectionA(lpAppName: LPCSTR, lpString: LPCSTR) -> BOOL;
-    pub fn WriteProfileSectionW(lpAppName: LPCWSTR, lpString: LPCWSTR) -> BOOL;
-    pub fn WriteProfileStringA(lpAppName: LPCSTR, lpKeyName: LPCSTR, lpString: LPCSTR) -> BOOL;
-    pub fn WriteProfileStringW(lpAppName: LPCWSTR, lpKeyName: LPCWSTR, lpString: LPCWSTR) -> BOOL;
-    pub fn WriteTapemark(
-        hDevice: HANDLE, dwTapemarkType: DWORD, dwTapemarkCount: DWORD, bImmediate: BOOL,
-    ) -> DWORD;
-    pub fn ZombifyActCtx(hActCtx: HANDLE) -> BOOL;
-    pub fn _hread(hFile: HFILE, lpBuffer: LPVOID, lBytes: c_long) -> c_long;
-    pub fn _hwrite(hFile: HFILE, lpBuffer: LPCCH, lBytes: c_long) -> c_long;
-    pub fn _lclose(hFile: HFILE) -> HFILE;
-    pub fn _lcreat(lpPathName: LPCSTR, iAttrubute: c_int) -> HFILE;
-    pub fn _llseek(hFile: HFILE, lOffset: LONG, iOrigin: c_int) -> LONG;
-    pub fn _lopen(lpPathName: LPCSTR, iReadWrite: c_int) -> HFILE;
-    pub fn _lread(hFile: HFILE, lpBuffer: LPVOID, uBytes: UINT) -> UINT;
-    pub fn _lwrite(hFile: HFILE, lpBuffer: LPCCH, uBytes: UINT) -> UINT;
-    pub fn lstrcat(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcatA(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcatW(lpString1: LPWSTR, lpString2: LPCWSTR) -> LPSTR;
-    pub fn lstrcmp(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpA(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpW(lpString1: LPCWSTR, lpString2: LPCWSTR) -> c_int;
-    pub fn lstrcmpi(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpiA(lpString1: LPCSTR, lpString2: LPCSTR) -> c_int;
-    pub fn lstrcmpiW(lpString1: LPCWSTR, lpString2: LPCWSTR) -> c_int;
-    pub fn lstrcpy(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcpyA(lpString1: LPSTR, lpString2: LPCSTR) -> LPSTR;
-    pub fn lstrcpyW(lpString1: LPWSTR, lpString2: LPCWSTR) -> LPSTR;
-    pub fn lstrcpyn(lpString1: LPSTR, lpString2: LPCSTR, iMaxLength: c_int) -> LPSTR;
-    pub fn lstrcpynA(lpString1: LPSTR, lpString2: LPCSTR, iMaxLength: c_int) -> LPSTR;
-    pub fn lstrcpynW(lpString1: LPWSTR, lpString2: LPCWSTR, iMaxLength: c_int) -> LPSTR;
-    pub fn lstrlen(lpString: LPCSTR) -> c_int;
-    pub fn lstrlenA(lpString: LPCSTR) -> c_int;
-    pub fn lstrlenW(lpString: LPCWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_lstrcmpW(String1: PCUWSTR, String2: PCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_lstrcmpiW(String1: PCUWSTR, String2: PCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_lstrlenW(String: LPCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcschr(String: PCUWSTR, Character: WCHAR) -> PUWSTR;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcscpy(Destination: PUWSTR, Source: PCUWSTR) -> PUWSTR;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcsicmp(String1: PCUWSTR, String2: PCUWSTR) -> c_int;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcslen(String: PCUWSTR) -> size_t;
-    #[cfg(any(target_arch = "arm", target_arch = "x86_64"))]
-    pub fn uaw_wcsrchr(String: PCUWSTR, Character: WCHAR) -> PUWSTR;
-}
diff --git a/vendor/lazy_static-0.2.11/.cargo-checksum.json b/vendor/lazy_static-0.2.11/.cargo-checksum.json
deleted file mode 100644
index ab6a46c217..0000000000
--- a/vendor/lazy_static-0.2.11/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"b598bd90e0cda5d1d3cec4042310a9e74afbe398a76af48e0d43ea5d3c51f137","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"0621878e61f0d0fda054bcbe02df75192c28bde1ecc8289cbd86aeba2dd72720","README.md":"c305f498e6d89730d84eaf92e980ba001e259dd40fcb40855947baece2af0895","appveyor.yml":"68c8ff7090ffdfa42b3d65b841d5de67d47a2206e02bf97aaca34b4500ae4bf1","src/core_lazy.rs":"2cea85ad0c2c4f88a5a927815a59270411daa4075510fad0faf671d5f5130fed","src/lazy.rs":"52912a897e8fcc95672e3b3068be82d56548f422edcb60e6ce9570779acb5bc0","src/lib.rs":"facd354cb716ee6941bf9bc8d34c27a2ecd752746c4d5164dbec8cedd80df605","src/nightly_lazy.rs":"34080822b27f3968c872867131448df76acc5aeff259852ff86f6e73b5a913b6","tests/compile-fail/README.md":"296216a459b7bf9947ba540c94b71a48ec90c2632ef5f05248a01dc8611ae149","tests/compile-fail/incorrect_visibility_restriction.rs":"557c94f781d6a2fb6c4be32a2ea252752195ff7b7c889581d95c39f2ce45e7d3","tests/compile-fail/static_is_private.rs":"f778f0759529b2dc8360f9abad1e09ea6662493493d707b3fba6cb1cb3d94af2","tests/compile-fail/static_is_sized.rs":"3b6d632f764ccee5fbd413324d7daeb2ab52dec0c99ea1db11a7eb2bbcad37cb","tests/compile-fail/static_never_used.rs":"5139e2459b4c68b0ed3f5a04452f60895b076acb1b5f344fb6b8ccbd50283a2d","tests/compile_tests.rs":"5710b2c0edc7623b895d67c26180a6c1d4022c154ecd616fab449afc9ba95109","tests/no_std.rs":"2a5236bd3892a253855b4dc192f63138239165fa23b9c3421a9faa5482c780aa","tests/test.rs":"12b100f4790037ca049692d896114d6361373c5321c29e0032c290ee39f1042c"},"package":"76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"}
\ No newline at end of file
diff --git a/vendor/lazy_static-0.2.11/Cargo.toml b/vendor/lazy_static-0.2.11/Cargo.toml
deleted file mode 100644
index c25a8a1850..0000000000
--- a/vendor/lazy_static-0.2.11/Cargo.toml
+++ /dev/null
@@ -1,43 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "lazy_static"
-version = "0.2.11"
-authors = ["Marvin Löbel <loebel.marvin@gmail.com>"]
-description = "A macro for declaring lazily evaluated statics in Rust."
-documentation = "https://docs.rs/lazy_static"
-readme = "README.md"
-keywords = ["macro", "lazy", "static"]
-categories = ["no-std", "rust-patterns", "memory-management"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/rust-lang-nursery/lazy-static.rs"
-[dependencies.compiletest_rs]
-version = "0.3"
-optional = true
-
-[dependencies.spin]
-version = "0.4.6"
-optional = true
-
-[features]
-compiletest = ["compiletest_rs"]
-nightly = []
-spin_no_std = ["nightly", "spin"]
-[badges.appveyor]
-repository = "rust-lang-nursery/lazy-static.rs"
-
-[badges.maintenance]
-status = "passively-maintained"
-
-[badges.travis-ci]
-repository = "rust-lang-nursery/lazy-static.rs"
diff --git a/vendor/lazy_static-0.2.11/LICENSE-MIT b/vendor/lazy_static-0.2.11/LICENSE-MIT
deleted file mode 100644
index 25597d5838..0000000000
--- a/vendor/lazy_static-0.2.11/LICENSE-MIT
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2010 The Rust Project Developers
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/vendor/lazy_static-0.2.11/README.md b/vendor/lazy_static-0.2.11/README.md
deleted file mode 100644
index ad5380ee1b..0000000000
--- a/vendor/lazy_static-0.2.11/README.md
+++ /dev/null
@@ -1,69 +0,0 @@
-lazy-static.rs
-==============
-
-A macro for declaring lazily evaluated statics in Rust.
-
-Using this macro, it is possible to have `static`s that require code to be
-executed at runtime in order to be initialized.
-This includes anything requiring heap allocations, like vectors or hash maps,
-as well as anything that requires non-const function calls to be computed.
-
-[![Travis-CI Status](https://travis-ci.org/rust-lang-nursery/lazy-static.rs.svg?branch=master)](https://travis-ci.org/rust-lang-nursery/lazy-static.rs)
-
-# Getting Started
-
-[lazy-static.rs is available on crates.io](https://crates.io/crates/lazy_static).
-It is recommended to look there for the newest released version, as well as links to the newest builds of the docs.
-
-At the point of the last update of this README, the latest published version could be used like this:
-
-Add the following dependency to your Cargo manifest...
-
-```toml
-[dependencies]
-lazy_static = "0.2"
-```
-
-...and see the [docs](https://docs.rs/lazy_static) for how to use it.
-
-# Example
-
-```rust
-#[macro_use]
-extern crate lazy_static;
-
-use std::collections::HashMap;
-
-lazy_static! {
-    static ref HASHMAP: HashMap<u32, &'static str> = {
-        let mut m = HashMap::new();
-        m.insert(0, "foo");
-        m.insert(1, "bar");
-        m.insert(2, "baz");
-        m
-    };
-}
-
-fn main() {
-    // First access to `HASHMAP` initializes it
-    println!("The entry for `0` is \"{}\".", HASHMAP.get(&0).unwrap());
-
-    // Any further access to `HASHMAP` just returns the computed value
-    println!("The entry for `1` is \"{}\".", HASHMAP.get(&1).unwrap());
-}
-```
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
diff --git a/vendor/lazy_static-0.2.11/appveyor.yml b/vendor/lazy_static-0.2.11/appveyor.yml
deleted file mode 100644
index 82a726c9ae..0000000000
--- a/vendor/lazy_static-0.2.11/appveyor.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-environment:
-  global:
-    PROJECT_NAME: lazy_static
-    # When this was added there were revocation check failures when using the
-    # libcurl backend as libcurl checks by default, but rustup doesn't provide the
-    # switch to turn this off. Switch to Hyper which looks to not check for
-    # revocation by default like libcurl does.
-    RUSTUP_USE_REQWEST: 1
-    CARGO_HTTP_CHECK_REVOKE: false
-  matrix:
-    # Stable channel
-    - TARGET: i686-pc-windows-gnu
-      CHANNEL: stable
-    - TARGET: i686-pc-windows-msvc
-      CHANNEL: stable
-    - TARGET: x86_64-pc-windows-gnu
-      CHANNEL: stable
-    - TARGET: x86_64-pc-windows-msvc
-      CHANNEL: stable
-    # Beta channel
-    - TARGET: i686-pc-windows-gnu
-      CHANNEL: beta
-    - TARGET: i686-pc-windows-msvc
-      CHANNEL: beta
-    - TARGET: x86_64-pc-windows-gnu
-      CHANNEL: beta
-    - TARGET: x86_64-pc-windows-msvc
-      CHANNEL: beta
-    # Nightly channel
-    - TARGET: i686-pc-windows-gnu
-      CHANNEL: nightly
-    - TARGET: i686-pc-windows-msvc
-      CHANNEL: nightly
-    - TARGET: x86_64-pc-windows-gnu
-      CHANNEL: nightly
-    - TARGET: x86_64-pc-windows-msvc
-      CHANNEL: nightly
-
-# Install Rust and Cargo
-# (Based on from https://github.com/rust-lang/libc/blob/master/appveyor.yml)
-install:
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-toolchain %CHANNEL% --default-host %TARGET%
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - if "%TARGET%" == "i686-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw32\bin
-  - if "%TARGET%" == "x86_64-pc-windows-gnu" set PATH=%PATH%;C:\msys64\mingw64\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo build --verbose
-  - cargo test
-  - if [%CHANNEL%]==[nightly] (
-      cargo clean &&
-      cargo build --verbose --features "compiletest" &&
-      cargo test --features "compiletest"
-    )
diff --git a/vendor/lazy_static-0.2.11/src/core_lazy.rs b/vendor/lazy_static-0.2.11/src/core_lazy.rs
deleted file mode 100644
index 90c7aaa9a5..0000000000
--- a/vendor/lazy_static-0.2.11/src/core_lazy.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 lazy-static.rs Developers
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-extern crate spin;
-
-use self::spin::Once;
-
-pub struct Lazy<T: Sync>(Once<T>);
-
-impl<T: Sync> Lazy<T> {
-    #[inline(always)]
-    pub const fn new() -> Self {
-        Lazy(Once::new())
-    }
-
-    #[inline(always)]
-    pub fn get<F>(&'static self, builder: F) -> &T
-        where F: FnOnce() -> T
-    {
-        self.0.call_once(builder)
-    }
-}
-
-#[macro_export]
-macro_rules! __lazy_static_create {
-    ($NAME:ident, $T:ty) => {
-        static $NAME: $crate::lazy::Lazy<$T> = $crate::lazy::Lazy::new();
-    }
-}
diff --git a/vendor/lazy_static-0.2.11/src/lazy.rs b/vendor/lazy_static-0.2.11/src/lazy.rs
deleted file mode 100644
index aab1e0571a..0000000000
--- a/vendor/lazy_static-0.2.11/src/lazy.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2016 lazy-static.rs Developers
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-extern crate std;
-
-use self::std::prelude::v1::*;
-use self::std::sync::Once;
-pub use self::std::sync::ONCE_INIT;
-
-pub struct Lazy<T: Sync>(pub *const T, pub Once);
-
-impl<T: Sync> Lazy<T> {
-    #[inline(always)]
-    pub fn get<F>(&'static mut self, f: F) -> &T
-        where F: FnOnce() -> T
-    {
-        unsafe {
-            let r = &mut self.0;
-            self.1.call_once(|| {
-                *r = Box::into_raw(Box::new(f()));
-            });
-
-            &*self.0
-        }
-    }
-}
-
-unsafe impl<T: Sync> Sync for Lazy<T> {}
-
-#[macro_export]
-macro_rules! __lazy_static_create {
-    ($NAME:ident, $T:ty) => {
-        static mut $NAME: $crate::lazy::Lazy<$T> = $crate::lazy::Lazy(0 as *const $T, $crate::lazy::ONCE_INIT);
-    }
-}
diff --git a/vendor/lazy_static-0.2.11/src/lib.rs b/vendor/lazy_static-0.2.11/src/lib.rs
deleted file mode 100644
index bb15478d3c..0000000000
--- a/vendor/lazy_static-0.2.11/src/lib.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2016 lazy-static.rs Developers
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-/*!
-A macro for declaring lazily evaluated statics.
-
-Using this macro, it is possible to have `static`s that require code to be
-executed at runtime in order to be initialized.
-This includes anything requiring heap allocations, like vectors or hash maps,
-as well as anything that requires function calls to be computed.
-
-# Syntax
-
-```ignore
-lazy_static! {
-    [pub] static ref NAME_1: TYPE_1 = EXPR_1;
-    [pub] static ref NAME_2: TYPE_2 = EXPR_2;
-    ...
-    [pub] static ref NAME_N: TYPE_N = EXPR_N;
-}
-```
-
-Attributes (including doc comments) are supported as well:
-
-```rust
-# #[macro_use]
-# extern crate lazy_static;
-# fn main() {
-lazy_static! {
-    /// This is an example for using doc comment attributes
-    static ref EXAMPLE: u8 = 42;
-}
-# }
-```
-
-# Semantics
-
-For a given `static ref NAME: TYPE = EXPR;`, the macro generates a unique type that
-implements `Deref<TYPE>` and stores it in a static with name `NAME`. (Attributes end up
-attaching to this type.)
-
-On first deref, `EXPR` gets evaluated and stored internally, such that all further derefs
-can return a reference to the same object. Note that this can lead to deadlocks
-if you have multiple lazy statics that depend on each other in their initialization.
-
-Apart from the lazy initialization, the resulting "static ref" variables
-have generally the same properties as regular "static" variables:
-
-- Any type in them needs to fulfill the `Sync` trait.
-- If the type has a destructor, then it will not run when the process exits.
-
-# Example
-
-Using the macro:
-
-```rust
-#[macro_use]
-extern crate lazy_static;
-
-use std::collections::HashMap;
-
-lazy_static! {
-    static ref HASHMAP: HashMap<u32, &'static str> = {
-        let mut m = HashMap::new();
-        m.insert(0, "foo");
-        m.insert(1, "bar");
-        m.insert(2, "baz");
-        m
-    };
-    static ref COUNT: usize = HASHMAP.len();
-    static ref NUMBER: u32 = times_two(21);
-}
-
-fn times_two(n: u32) -> u32 { n * 2 }
-
-fn main() {
-    println!("The map has {} entries.", *COUNT);
-    println!("The entry for `0` is \"{}\".", HASHMAP.get(&0).unwrap());
-    println!("A expensive calculation on a static results in: {}.", *NUMBER);
-}
-```
-
-# Implementation details
-
-The `Deref` implementation uses a hidden static variable that is guarded by a atomic check on each access. On stable Rust, the macro may need to allocate each static on the heap.
-
-*/
-
-#![cfg_attr(feature="spin_no_std", feature(const_fn))]
-#![cfg_attr(feature="nightly", feature(unreachable))]
-
-#![doc(html_root_url = "https://docs.rs/lazy_static/0.2.11")]
-#![no_std]
-
-#[cfg(not(feature="nightly"))]
-#[doc(hidden)]
-pub mod lazy;
-
-#[cfg(all(feature="nightly", not(feature="spin_no_std")))]
-#[path="nightly_lazy.rs"]
-#[doc(hidden)]
-pub mod lazy;
-
-#[cfg(all(feature="nightly", feature="spin_no_std"))]
-#[path="core_lazy.rs"]
-#[doc(hidden)]
-pub mod lazy;
-
-#[doc(hidden)]
-pub use core::ops::Deref as __Deref;
-
-#[macro_export]
-#[doc(hidden)]
-macro_rules! __lazy_static_internal {
-    // optional visibility restrictions are wrapped in `()` to allow for
-    // explicitly passing otherwise implicit information about private items
-    ($(#[$attr:meta])* ($($vis:tt)*) static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
-        __lazy_static_internal!(@MAKE TY, $(#[$attr])*, ($($vis)*), $N);
-        __lazy_static_internal!(@TAIL, $N : $T = $e);
-        lazy_static!($($t)*);
-    };
-    (@TAIL, $N:ident : $T:ty = $e:expr) => {
-        impl $crate::__Deref for $N {
-            type Target = $T;
-            #[allow(unsafe_code)]
-            fn deref(&self) -> &$T {
-                unsafe {
-                    #[inline(always)]
-                    fn __static_ref_initialize() -> $T { $e }
-
-                    #[inline(always)]
-                    unsafe fn __stability() -> &'static $T {
-                        __lazy_static_create!(LAZY, $T);
-                        LAZY.get(__static_ref_initialize)
-                    }
-                    __stability()
-                }
-            }
-        }
-        impl $crate::LazyStatic for $N {
-            fn initialize(lazy: &Self) {
-                let _ = &**lazy;
-            }
-        }
-    };
-    // `vis` is wrapped in `()` to prevent parsing ambiguity
-    (@MAKE TY, $(#[$attr:meta])*, ($($vis:tt)*), $N:ident) => {
-        #[allow(missing_copy_implementations)]
-        #[allow(non_camel_case_types)]
-        #[allow(dead_code)]
-        $(#[$attr])*
-        $($vis)* struct $N {__private_field: ()}
-        #[doc(hidden)]
-        $($vis)* static $N: $N = $N {__private_field: ()};
-    };
-    () => ()
-}
-
-#[macro_export]
-macro_rules! lazy_static {
-    ($(#[$attr:meta])* static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
-        // use `()` to explicitly forward the information about private items
-        __lazy_static_internal!($(#[$attr])* () static ref $N : $T = $e; $($t)*);
-    };
-    ($(#[$attr:meta])* pub static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
-        __lazy_static_internal!($(#[$attr])* (pub) static ref $N : $T = $e; $($t)*);
-    };
-    ($(#[$attr:meta])* pub ($($vis:tt)+) static ref $N:ident : $T:ty = $e:expr; $($t:tt)*) => {
-        __lazy_static_internal!($(#[$attr])* (pub ($($vis)+)) static ref $N : $T = $e; $($t)*);
-    };
-    () => ()
-}
-
-/// Support trait for enabling a few common operation on lazy static values.
-///
-/// This is implemented by each defined lazy static, and
-/// used by the free functions in this crate.
-pub trait LazyStatic {
-    #[doc(hidden)]
-    fn initialize(lazy: &Self);
-}
-
-/// Takes a shared reference to a lazy static and initializes
-/// it if it has not been already.
-///
-/// This can be used to control the initialization point of a lazy static.
-///
-/// Example:
-///
-/// ```rust
-/// #[macro_use]
-/// extern crate lazy_static;
-///
-/// lazy_static! {
-///     static ref BUFFER: Vec<u8> = (0..65537).collect();
-/// }
-///
-/// fn main() {
-///     lazy_static::initialize(&BUFFER);
-///
-///     // ...
-///     work_with_initialized_data(&BUFFER);
-/// }
-/// # fn work_with_initialized_data(_: &[u8]) {}
-/// ```
-pub fn initialize<T: LazyStatic>(lazy: &T) {
-    LazyStatic::initialize(lazy);
-}
diff --git a/vendor/lazy_static-0.2.11/src/nightly_lazy.rs b/vendor/lazy_static-0.2.11/src/nightly_lazy.rs
deleted file mode 100644
index 0ad0f66e7c..0000000000
--- a/vendor/lazy_static-0.2.11/src/nightly_lazy.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 lazy-static.rs Developers
-//
-// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
-// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
-// http://opensource.org/licenses/MIT>, at your option. This file may not be
-// copied, modified, or distributed except according to those terms.
-
-extern crate std;
-
-use self::std::prelude::v1::*;
-use self::std::sync::Once;
-pub use self::std::sync::ONCE_INIT;
-
-pub struct Lazy<T: Sync>(pub Option<T>, pub Once);
-
-impl<T: Sync> Lazy<T> {
-    #[inline(always)]
-    pub fn get<F>(&'static mut self, f: F) -> &T
-        where F: FnOnce() -> T
-    {
-        {
-            let r = &mut self.0;
-            self.1.call_once(|| {
-                *r = Some(f());
-            });
-        }
-        unsafe {
-            match self.0 {
-                Some(ref x) => x,
-                None => std::mem::unreachable(),
-            }
-        }
-    }
-}
-
-unsafe impl<T: Sync> Sync for Lazy<T> {}
-
-#[macro_export]
-macro_rules! __lazy_static_create {
-    ($NAME:ident, $T:ty) => {
-        static mut $NAME: $crate::lazy::Lazy<$T> = $crate::lazy::Lazy(None, $crate::lazy::ONCE_INIT);
-    }
-}
diff --git a/vendor/lazy_static-0.2.11/tests/compile-fail/README.md b/vendor/lazy_static-0.2.11/tests/compile-fail/README.md
deleted file mode 100644
index 7f80d11284..0000000000
--- a/vendor/lazy_static-0.2.11/tests/compile-fail/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-This directory contains snippets of code that should yield a
-warning/note/help/error at compilation. Syntax of annotations is described in
-[rust documentation](https://github.com/rust-lang/rust/blob/master/src/test/COMPILER_TESTS.md).
-For more information check out [`compiletest` crate](https://github.com/laumann/compiletest-rs).
-
-To run compile tests issue `cargo +nightly --test --features compiletest`.
-
-## Notes on working with `compiletest` crate
-
-* Currently code that is inside macro should not be annotated, as `compiletest`
-    crate cannot deal with the fact that macro invocations effectively changes
-    line numbering. To prevent this add a `// error-pattern:<your error message here>`
-    on the top of the file and make sure that you set `deny` lint level
-    if you want to test compiler message different than error.
-* `compiletest` crate by default sets `allow(dead_code)` lint level so make sure
-    that you change it to something suiting your needs even if the warning is
-    issued prior to any macro invocation.
-* If you get a message `error: 0 unexpected errors found, 1 expected errors not found`
-  despite the fact that some error was bound to occur don't worry - it's a known
-  issue in the `compiletest` crate and your error was probably not registered -
-  make sure that your annotations are correct and that you are setting correct
-  lint levels.
diff --git a/vendor/lazy_static-0.2.11/tests/compile-fail/incorrect_visibility_restriction.rs b/vendor/lazy_static-0.2.11/tests/compile-fail/incorrect_visibility_restriction.rs
deleted file mode 100644
index e2e52381b1..0000000000
--- a/vendor/lazy_static-0.2.11/tests/compile-fail/incorrect_visibility_restriction.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// incorrect visibility restriction
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
-    pub(nonsense) static ref WRONG: () = ();
-    //~^ ERROR incorrect visibility restriction
-}
-
-fn main() { }
diff --git a/vendor/lazy_static-0.2.11/tests/compile-fail/static_is_private.rs b/vendor/lazy_static-0.2.11/tests/compile-fail/static_is_private.rs
deleted file mode 100644
index a88c1c611d..0000000000
--- a/vendor/lazy_static-0.2.11/tests/compile-fail/static_is_private.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-#[macro_use]
-extern crate lazy_static;
-
-mod outer {
-    pub mod inner {
-        lazy_static! {
-            pub(in outer) static ref FOO: () = ();
-        }
-    }
-}
-
-fn main() {
-    assert_eq!(*outer::inner::FOO, ()); //~ ERROR static `FOO` is private
-}
diff --git a/vendor/lazy_static-0.2.11/tests/compile-fail/static_is_sized.rs b/vendor/lazy_static-0.2.11/tests/compile-fail/static_is_sized.rs
deleted file mode 100644
index 3681ad7cd9..0000000000
--- a/vendor/lazy_static-0.2.11/tests/compile-fail/static_is_sized.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// error-pattern:the trait bound `str: std::marker::Sized` is not satisfied
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
-    pub static ref FOO: str = panic!();
-}
-
-
-fn main() {
-}
diff --git a/vendor/lazy_static-0.2.11/tests/compile-fail/static_never_used.rs b/vendor/lazy_static-0.2.11/tests/compile-fail/static_never_used.rs
deleted file mode 100644
index a6117786c0..0000000000
--- a/vendor/lazy_static-0.2.11/tests/compile-fail/static_never_used.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// error-pattern:static item is never used: `UNUSED`
-#![deny(dead_code)]
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
-    static ref UNUSED: () = ();
-}
-
-fn main() { }
diff --git a/vendor/lazy_static-0.2.11/tests/compile_tests.rs b/vendor/lazy_static-0.2.11/tests/compile_tests.rs
deleted file mode 100644
index 3e347d5231..0000000000
--- a/vendor/lazy_static-0.2.11/tests/compile_tests.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#![cfg(feature="compiletest")]
-extern crate compiletest_rs as compiletest;
-
-fn run_mode(mode: &'static str) {
-    let mut config = compiletest::Config::default();
-    config.mode = mode.parse().expect("Invalid mode");
-    config.src_base = ["tests", mode].iter().collect();
-    config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned());
-
-    config.verbose = true;
-
-    compiletest::run_tests(&config);
-}
-
-#[test]
-fn compile_test() {
-    run_mode("compile-fail");
-}
diff --git a/vendor/lazy_static-0.2.11/tests/no_std.rs b/vendor/lazy_static-0.2.11/tests/no_std.rs
deleted file mode 100644
index b460e79328..0000000000
--- a/vendor/lazy_static-0.2.11/tests/no_std.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-#![cfg(feature="spin_no_std")]
-#![feature(const_fn)]
-
-#![no_std]
-
-#[macro_use]
-extern crate lazy_static;
-
-lazy_static! {
-    /// Documentation!
-    pub static ref NUMBER: u32 = times_two(3);
-}
-
-fn times_two(n: u32) -> u32 {
-    n * 2
-}
-
-#[test]
-fn test_basic() {
-    assert_eq!(*NUMBER, 6);
-}
diff --git a/vendor/lazy_static-0.2.11/tests/test.rs b/vendor/lazy_static-0.2.11/tests/test.rs
deleted file mode 100644
index fbf225d859..0000000000
--- a/vendor/lazy_static-0.2.11/tests/test.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-#![cfg_attr(feature="nightly", feature(const_fn))]
-
-#[macro_use]
-extern crate lazy_static;
-use std::collections::HashMap;
-
-lazy_static! {
-    /// Documentation!
-    pub static ref NUMBER: u32 = times_two(3);
-
-    static ref ARRAY_BOXES: [Box<u32>; 3] = [Box::new(1), Box::new(2), Box::new(3)];
-
-    /// More documentation!
-    #[allow(unused_variables)]
-    #[derive(Copy, Clone, Debug)]
-    pub static ref STRING: String = "hello".to_string();
-
-    static ref HASHMAP: HashMap<u32, &'static str> = {
-        let mut m = HashMap::new();
-        m.insert(0, "abc");
-        m.insert(1, "def");
-        m.insert(2, "ghi");
-        m
-    };
-
-    // This should not compile if the unsafe is removed.
-    static ref UNSAFE: u32 = unsafe {
-        std::mem::transmute::<i32, u32>(-1)
-    };
-}
-
-lazy_static! {
-    static ref S1: &'static str = "a";
-    static ref S2: &'static str = "b";
-}
-lazy_static! {
-    static ref S3: String = [*S1, *S2].join("");
-}
-
-#[test]
-fn s3() {
-    assert_eq!(&*S3, "ab");
-}
-
-fn times_two(n: u32) -> u32 {
-    n * 2
-}
-
-#[test]
-fn test_basic() {
-    assert_eq!(&**STRING, "hello");
-    assert_eq!(*NUMBER, 6);
-    assert!(HASHMAP.get(&1).is_some());
-    assert!(HASHMAP.get(&3).is_none());
-    assert_eq!(&*ARRAY_BOXES, &[Box::new(1), Box::new(2), Box::new(3)]);
-    assert_eq!(*UNSAFE, std::u32::MAX);
-}
-
-#[test]
-fn test_repeat() {
-    assert_eq!(*NUMBER, 6);
-    assert_eq!(*NUMBER, 6);
-    assert_eq!(*NUMBER, 6);
-}
-
-#[test]
-fn test_meta() {
-    // this would not compile if STRING were not marked #[derive(Copy, Clone)]
-    let copy_of_string = STRING;
-    // just to make sure it was copied
-    assert!(&STRING as *const _ != &copy_of_string as *const _);
-
-    // this would not compile if STRING were not marked #[derive(Debug)]
-    assert_eq!(format!("{:?}", STRING), "STRING { __private_field: () }".to_string());
-}
-
-mod visibility {
-    lazy_static! {
-        pub static ref FOO: Box<u32> = Box::new(0);
-        static ref BAR: Box<u32> = Box::new(98);
-    }
-
-    pub mod inner {
-        lazy_static! {
-            pub(in visibility) static ref BAZ: Box<u32> = Box::new(42);
-            pub(crate) static ref BAG: Box<u32> = Box::new(37);
-        }
-    }
-
-    #[test]
-    fn sub_test() {
-        assert_eq!(**FOO, 0);
-        assert_eq!(**BAR, 98);
-        assert_eq!(**inner::BAZ, 42);
-        assert_eq!(**inner::BAG, 37);
-    }
-}
-
-#[test]
-fn test_visibility() {
-    assert_eq!(*visibility::FOO, Box::new(0));
-    assert_eq!(*visibility::inner::BAG, Box::new(37));
-}
-
-// This should not cause a warning about a missing Copy implementation
-lazy_static! {
-    pub static ref VAR: i32 = { 0 };
-}
-
-#[derive(Copy, Clone, Debug, PartialEq)]
-struct X;
-struct Once(X);
-const ONCE_INIT: Once = Once(X);
-static DATA: X = X;
-static ONCE: X = X;
-fn require_sync() -> X { X }
-fn transmute() -> X { X }
-fn __static_ref_initialize() -> X { X }
-fn test(_: Vec<X>) -> X { X }
-
-// All these names should not be shadowed
-lazy_static! {
-    static ref ITEM_NAME_TEST: X = {
-        test(vec![X, Once(X).0, ONCE_INIT.0, DATA, ONCE,
-                  require_sync(), transmute(),
-                  // Except this, which will sadly be shadowed by internals:
-                  // __static_ref_initialize()
-                  ])
-    };
-}
-
-#[test]
-fn item_name_shadowing() {
-    assert_eq!(*ITEM_NAME_TEST, X);
-}
-
-use std::sync::atomic::AtomicBool;
-use std::sync::atomic::ATOMIC_BOOL_INIT;
-use std::sync::atomic::Ordering::SeqCst;
-
-static PRE_INIT_FLAG: AtomicBool = ATOMIC_BOOL_INIT;
-
-lazy_static! {
-    static ref PRE_INIT: () = {
-        PRE_INIT_FLAG.store(true, SeqCst);
-        ()
-    };
-}
-
-#[test]
-fn pre_init() {
-    assert_eq!(PRE_INIT_FLAG.load(SeqCst), false);
-    lazy_static::initialize(&PRE_INIT);
-    assert_eq!(PRE_INIT_FLAG.load(SeqCst), true);
-}
-
-lazy_static! {
-    static ref LIFETIME_NAME: for<'a> fn(&'a u8) = { fn f(_: &u8) {} f };
-}
-
-#[test]
-fn lifetime_name() {
-    let _ = LIFETIME_NAME;
-}
diff --git a/vendor/memchr/.cargo-checksum.json b/vendor/memchr/.cargo-checksum.json
index fdd7a17bd5..d1e636dea7 100644
--- a/vendor/memchr/.cargo-checksum.json
+++ b/vendor/memchr/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"47408824ff8a0861c0df0cb499f687f7463e461c3b81ea20edf1662b7dc5a121","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"ea4632001f2b384c67278e7114a843ab7094d6011ef87a793881e73cfb525120","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","build.rs":"a8483a0649fa418db667ccd2a16a60e57d886964b54c1af12923b6f6cb4f2c92","src/c.rs":"86fe35cbb46c8bece9927fbde20f1ca3af526defdde05ac969ad2f4bc9bb25e9","src/fallback.rs":"a79752e3bdc3c16febef90fcddb560f80659f802fac202cce3fdffd0b78f6d08","src/iter.rs":"5949fd42b266d3edebf133172c74700d1c0249bdd26c203bcfd1409583e7b502","src/lib.rs":"1b3c131d6ec66837d3d76ad42aa5fc4aebfae232587787bdedb5be2352be4502","src/naive.rs":"d908e5895586ef88913ee10ff3135aabd20363e0e0871c7006a5d40457851deb","src/tests/iter.rs":"262c09e5cabd1caef533475832da8716638b142ec8015e8270c6f5240e478ac1","src/tests/memchr.rs":"f30074eeab99a16ce5ca8a30f1890f86c43c0422523a7195cbb3ca5f3e465b67","src/tests/mod.rs":"8ad1d065d422877ee043f66f987a736a0216757ba66dc1a05bee2a7c949c8037","src/x86/avx.rs":"11d4a149007fde9f34168fa43b3cba700667782c987796dca8526564b3e01007","src/x86/mod.rs":"5032eec7355bc110ec99b06b2cfd916d8bc1e28c44a33f6c92c3cc86f797d683","src/x86/sse2.rs":"103bb9d555be789e678f1af5baa737e13911f60e90888d25fa2883b39a9dffce","src/x86/sse42.rs":"f671ae9dd2b518a823e499a09ce32d4957bc5ae043db90d61c027e32f688f2b2"},"package":"2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"}
\ No newline at end of file
+{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"d909aa4ca83bd6d41f1f6f1ab4ca2af8019c1dbbadfc47084acc5b85105bddad","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"d2ab7c9c77235b68d1cc856ab5ef7b5115312098469edcac9d5611c5b74d3cd1","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","build.rs":"ed35d244304888581bfcbdc52596721a5bbb908bcbd56bbdfe977800ef3042e1","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/c.rs":"86fe35cbb46c8bece9927fbde20f1ca3af526defdde05ac969ad2f4bc9bb25e9","src/fallback.rs":"79519255d480a9c2667c06f9287931cfc2b85f6af6fcf92d453a11ee161dcb74","src/iter.rs":"23b1066d6b40159fe944388db7743c89422b1110ddb44667fde6d722f178ed4e","src/lib.rs":"278f45f16375f084b3d96ffaea40bc8944c3bc252e09a1c2f173e8c121e082fd","src/naive.rs":"c7453bc99cc4e58eb37cf5a50c88688833e50a270ee1849baefddb8acc0ccd94","src/tests/iter.rs":"8d5999a2a5b8a3228c76cd82cd3ee86dfa6f7b4022405b1f06eedf7d74e4c704","src/tests/memchr.rs":"f30074eeab99a16ce5ca8a30f1890f86c43c0422523a7195cbb3ca5f3e465b67","src/tests/miri.rs":"27859a7ac1d0a9305b2d114e6dd8876f3d5e47fc46a81be96239c793ac6edb1f","src/tests/mod.rs":"2ad0c82d33b32562087254522641ea7bfa2a283130152be5e927a33f1978ebc7","src/x86/avx.rs":"b19987410e49a079f33162424c42494626c91303c41824961e478be3b537c9c9","src/x86/mod.rs":"0b13becaabc150a0099f7528226c82e288136cc7ebcdb8e96cf5ee9aae0f05b6","src/x86/sse2.rs":"7c1b8248a8cd48396cb70a862d77f9a972f1e16324d65c260f39d13af73bf638","src/x86/sse42.rs":"f671ae9dd2b518a823e499a09ce32d4957bc5ae043db90d61c027e32f688f2b2"},"package":"53445de381a1f436797497c61d851644d0e8e88e6140f22872ad33a704933978"}
\ No newline at end of file
diff --git a/vendor/memchr/Cargo.toml b/vendor/memchr/Cargo.toml
index e918f9e162..a1a3e0053e 100644
--- a/vendor/memchr/Cargo.toml
+++ b/vendor/memchr/Cargo.toml
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,7 +12,7 @@
 
 [package]
 name = "memchr"
-version = "2.2.0"
+version = "2.3.2"
 authors = ["Andrew Gallant <jamslam@gmail.com>", "bluss"]
 exclude = ["/ci/*", "/.travis.yml", "/Makefile", "/appveyor.yml"]
 description = "Safe interface to memchr."
@@ -33,14 +33,10 @@ version = "0.2.18"
 optional = true
 default-features = false
 [dev-dependencies.quickcheck]
-version = "0.8"
+version = "0.9"
 default-features = false
 
 [features]
-default = ["use_std"]
-use_std = []
-[badges.appveyor]
-repository = "BurntSushi/rust-memchr"
-
-[badges.travis-ci]
-repository = "BurntSushi/rust-memchr"
+default = ["std"]
+std = []
+use_std = ["std"]
diff --git a/vendor/memchr/README.md b/vendor/memchr/README.md
index 3e7ff33336..f78a5a5370 100644
--- a/vendor/memchr/README.md
+++ b/vendor/memchr/README.md
@@ -2,8 +2,7 @@ memchr
 ======
 The `memchr` crate provides heavily optimized routines for searching bytes.
 
-[![Build status](https://api.travis-ci.org/BurntSushi/rust-memchr.png)](https://travis-ci.org/BurntSushi/rust-memchr)
-[![Build status](https://ci.appveyor.com/api/projects/status/8i9484t8l4w7uql0/branch/master?svg=true)](https://ci.appveyor.com/project/BurntSushi/rust-memchr/branch/master)
+[![Build status](https://github.com/BurntSushi/rust-memchr/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-memchr/actions)
 [![](http://meritbadge.herokuapp.com/memchr)](https://crates.io/crates/memchr)
 
 Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
@@ -16,8 +15,8 @@ Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org).
 
 ### Overview
 
-The `memchr` function is traditionally provided by libc, however, the
-performance of `memchr` can vary significantly depending on the specific
+The `memchr` function is traditionally provided by libc, but its
+performance can vary significantly depending on the specific
 implementation of libc that is used. They can range from manually tuned
 Assembly implementations (like that found in GNU's libc) all the way to
 non-vectorized C implementations (like that found in MUSL).
@@ -31,20 +30,50 @@ Assembler.
 Additionally, GNU libc also provides an extension, `memrchr`. This crate
 provides its own implementation of `memrchr` as well, on top of `memchr2`,
 `memchr3`, `memrchr2` and `memrchr3`. The difference between `memchr` and
-`memchr2` is that that `memchr2` permits finding all occurrences of two bytes
+`memchr2` is that `memchr2` permits finding all occurrences of two bytes
 instead of one. Similarly for `memchr3`.
 
 ### Compiling without the standard library
 
 memchr links to the standard library by default, but you can disable the
-`use_std` feature if you want to use it in a `#![no_std]` crate:
+`std` feature if you want to use it in a `#![no_std]` crate:
 
 ```toml
 [dependencies]
 memchr = { version = "2", default-features = false }
 ```
 
-On x86 platforms, when the `use_std` feature is disabled, the SSE2
+On x86 platforms, when the `std` feature is disabled, the SSE2
 implementation of memchr will be used in compilers that support it. When
-`use_std` is enabled, the AVX implementation of memchr will be used if the CPU
+`std` is enabled, the AVX implementation of memchr will be used if the CPU
 is determined to support it at runtime.
+
+### Using libc
+
+`memchr` is a routine that is part of libc, although this crate does not use
+libc by default. Instead, it uses its own routines, which are either vectorized
+or generic fallback routines. In general, these should be competitive with
+what's in libc, although this has not been tested for all architectures. If
+using `memchr` from libc is desirable and a vectorized routine is not otherwise
+available in this crate, then enabling the `libc` feature will use libc's
+version of `memchr`.
+
+The rest of the functions in this crate, e.g., `memchr2` or `memrchr3`, are not
+a standard part of libc, so they will always use the implementations in this
+crate. One exception to this is `memrchr`, which is an extension commonly found
+on Linux. On Linux, `memrchr` is used in precisely the same scenario as
+`memchr`, as described above.
+
+
+### Minimum Rust version policy
+
+This crate's minimum supported `rustc` version is `1.28.0`.
+
+The current policy is that the minimum Rust version required to use this crate
+can be increased in minor version updates. For example, if `crate 1.0` requires
+Rust 1.20.0, then `crate 1.0.z` for all values of `z` will also require Rust
+1.20.0 or newer. However, `crate 1.y` for `y > 0` may require a newer minimum
+version of Rust.
+
+In general, this crate will be conservative with respect to the minimum
+supported version of Rust.
diff --git a/vendor/memchr/build.rs b/vendor/memchr/build.rs
index 35f06f9690..4ae3184d41 100644
--- a/vendor/memchr/build.rs
+++ b/vendor/memchr/build.rs
@@ -1,16 +1,7 @@
 use std::env;
-use std::ffi::OsString;
-use std::process::Command;
 
 fn main() {
-    let version = match Version::read() {
-        Ok(version) => version,
-        Err(err) => {
-            eprintln!("failed to parse `rustc --version`: {}", err);
-            return;
-        }
-    };
-    enable_simd_optimizations(version);
+    enable_simd_optimizations();
     enable_libc();
 }
 
@@ -18,14 +9,10 @@ fn main() {
 //
 // This can be disabled with RUSTFLAGS="--cfg memchr_disable_auto_simd", but
 // this is generally only intended for testing.
-fn enable_simd_optimizations(version: Version) {
+fn enable_simd_optimizations() {
     if is_env_set("CARGO_CFG_MEMCHR_DISABLE_AUTO_SIMD") {
         return;
     }
-    if version < (Version { major: 1, minor: 27, patch: 0 }) {
-        return;
-    }
-
     println!("cargo:rustc-cfg=memchr_runtime_simd");
     println!("cargo:rustc-cfg=memchr_runtime_sse2");
     println!("cargo:rustc-cfg=memchr_runtime_sse42");
@@ -66,69 +53,9 @@ fn enable_libc() {
 }
 
 fn is_feature_set(name: &str) -> bool {
-    is_env_set(&format!("CARGO_FEATURE_{}",  name))
+    is_env_set(&format!("CARGO_FEATURE_{}", name))
 }
 
 fn is_env_set(name: &str) -> bool {
     env::var_os(name).is_some()
 }
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord)]
-struct Version {
-    major: u32,
-    minor: u32,
-    patch: u32,
-}
-
-impl Version {
-    fn read() -> Result<Version, String> {
-        let rustc = env::var_os("RUSTC").unwrap_or(OsString::from("rustc"));
-        let output = Command::new(&rustc)
-            .arg("--version")
-            .output()
-            .unwrap()
-            .stdout;
-        Version::parse(&String::from_utf8(output).unwrap())
-    }
-
-    fn parse(mut s: &str) -> Result<Version, String> {
-        if !s.starts_with("rustc ") {
-            return Err(format!("unrecognized version string: {}", s));
-        }
-        s = &s["rustc ".len()..];
-
-        let parts: Vec<&str> = s.split(".").collect();
-        if parts.len() < 3 {
-            return Err(format!("not enough version parts: {:?}", parts));
-        }
-
-        let mut num = String::new();
-        for c in parts[0].chars() {
-            if !c.is_digit(10) {
-                break;
-            }
-            num.push(c);
-        }
-        let major = num.parse::<u32>().map_err(|e| e.to_string())?;
-
-        num.clear();
-        for c in parts[1].chars() {
-            if !c.is_digit(10) {
-                break;
-            }
-            num.push(c);
-        }
-        let minor = num.parse::<u32>().map_err(|e| e.to_string())?;
-
-        num.clear();
-        for c in parts[2].chars() {
-            if !c.is_digit(10) {
-                break;
-            }
-            num.push(c);
-        }
-        let patch = num.parse::<u32>().map_err(|e| e.to_string())?;
-
-        Ok(Version { major, minor, patch })
-    }
-}
diff --git a/vendor/memchr/rustfmt.toml b/vendor/memchr/rustfmt.toml
new file mode 100644
index 0000000000..aa37a218b9
--- /dev/null
+++ b/vendor/memchr/rustfmt.toml
@@ -0,0 +1,2 @@
+max_width = 79
+use_small_heuristics = "max"
diff --git a/vendor/memchr/src/fallback.rs b/vendor/memchr/src/fallback.rs
index 3fcfc898b9..8bc32b27ba 100644
--- a/vendor/memchr/src/fallback.rs
+++ b/vendor/memchr/src/fallback.rs
@@ -3,9 +3,11 @@
 // get auto-vectorized.
 
 use core::cmp;
-use core::ptr;
 use core::usize;
 
+#[cfg(target_pointer_width = "16")]
+const USIZE_BYTES: usize = 2;
+
 #[cfg(target_pointer_width = "32")]
 const USIZE_BYTES: usize = 4;
 
@@ -56,25 +58,25 @@ pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
             return forward_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        let chunk = read_unaligned_usize(ptr);
+        let chunk = (ptr as *const usize).read_unaligned();
         if contains_zero_byte(chunk ^ vn1) {
             return forward_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        ptr = ptr_add(ptr, USIZE_BYTES - (start_ptr as usize & align));
+        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
         debug_assert!(ptr > start_ptr);
-        debug_assert!(ptr_sub(end_ptr, USIZE_BYTES) >= start_ptr);
-        while loop_size == LOOP_SIZE && ptr <= ptr_sub(end_ptr, loop_size) {
+        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
+        while loop_size == LOOP_SIZE && ptr <= end_ptr.sub(loop_size) {
             debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
 
             let a = *(ptr as *const usize);
-            let b = *(ptr_add(ptr, USIZE_BYTES) as *const usize);
+            let b = *(ptr.add(USIZE_BYTES) as *const usize);
             let eqa = contains_zero_byte(a ^ vn1);
             let eqb = contains_zero_byte(b ^ vn1);
             if eqa || eqb {
                 break;
             }
-            ptr = ptr_add(ptr, LOOP_SIZE);
+            ptr = ptr.add(LOOP_SIZE);
         }
         forward_search(start_ptr, end_ptr, ptr, confirm)
     }
@@ -95,17 +97,17 @@ pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
             return forward_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        let chunk = read_unaligned_usize(ptr);
+        let chunk = (ptr as *const usize).read_unaligned();
         let eq1 = contains_zero_byte(chunk ^ vn1);
         let eq2 = contains_zero_byte(chunk ^ vn2);
         if eq1 || eq2 {
             return forward_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        ptr = ptr_add(ptr, USIZE_BYTES - (start_ptr as usize & align));
+        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
         debug_assert!(ptr > start_ptr);
-        debug_assert!(ptr_sub(end_ptr, USIZE_BYTES) >= start_ptr);
-        while ptr <= ptr_sub(end_ptr, USIZE_BYTES) {
+        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
+        while ptr <= end_ptr.sub(USIZE_BYTES) {
             debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
 
             let chunk = *(ptr as *const usize);
@@ -114,7 +116,7 @@ pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
             if eq1 || eq2 {
                 break;
             }
-            ptr = ptr_add(ptr, USIZE_BYTES);
+            ptr = ptr.add(USIZE_BYTES);
         }
         forward_search(start_ptr, end_ptr, ptr, confirm)
     }
@@ -136,7 +138,7 @@ pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
             return forward_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        let chunk = read_unaligned_usize(ptr);
+        let chunk = (ptr as *const usize).read_unaligned();
         let eq1 = contains_zero_byte(chunk ^ vn1);
         let eq2 = contains_zero_byte(chunk ^ vn2);
         let eq3 = contains_zero_byte(chunk ^ vn3);
@@ -144,10 +146,10 @@ pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
             return forward_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        ptr = ptr_add(ptr, USIZE_BYTES - (start_ptr as usize & align));
+        ptr = ptr.add(USIZE_BYTES - (start_ptr as usize & align));
         debug_assert!(ptr > start_ptr);
-        debug_assert!(ptr_sub(end_ptr, USIZE_BYTES) >= start_ptr);
-        while ptr <= ptr_sub(end_ptr, USIZE_BYTES) {
+        debug_assert!(end_ptr.sub(USIZE_BYTES) >= start_ptr);
+        while ptr <= end_ptr.sub(USIZE_BYTES) {
             debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
 
             let chunk = *(ptr as *const usize);
@@ -157,7 +159,7 @@ pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
             if eq1 || eq2 || eq3 {
                 break;
             }
-            ptr = ptr_add(ptr, USIZE_BYTES);
+            ptr = ptr.add(USIZE_BYTES);
         }
         forward_search(start_ptr, end_ptr, ptr, confirm)
     }
@@ -178,24 +180,24 @@ pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
             return reverse_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        let chunk = read_unaligned_usize(ptr_sub(ptr, USIZE_BYTES));
+        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
         if contains_zero_byte(chunk ^ vn1) {
             return reverse_search(start_ptr, end_ptr, ptr, confirm);
         }
 
         ptr = (end_ptr as usize & !align) as *const u8;
         debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-        while loop_size == LOOP_SIZE && ptr >= ptr_add(start_ptr, loop_size) {
+        while loop_size == LOOP_SIZE && ptr >= start_ptr.add(loop_size) {
             debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
 
-            let a = *(ptr_sub(ptr, 2 * USIZE_BYTES) as *const usize);
-            let b = *(ptr_sub(ptr, 1 * USIZE_BYTES) as *const usize);
+            let a = *(ptr.sub(2 * USIZE_BYTES) as *const usize);
+            let b = *(ptr.sub(1 * USIZE_BYTES) as *const usize);
             let eqa = contains_zero_byte(a ^ vn1);
             let eqb = contains_zero_byte(b ^ vn1);
             if eqa || eqb {
                 break;
             }
-            ptr = ptr_sub(ptr, loop_size);
+            ptr = ptr.sub(loop_size);
         }
         reverse_search(start_ptr, end_ptr, ptr, confirm)
     }
@@ -216,7 +218,7 @@ pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
             return reverse_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        let chunk = read_unaligned_usize(ptr_sub(ptr, USIZE_BYTES));
+        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
         let eq1 = contains_zero_byte(chunk ^ vn1);
         let eq2 = contains_zero_byte(chunk ^ vn2);
         if eq1 || eq2 {
@@ -225,16 +227,16 @@ pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
         ptr = (end_ptr as usize & !align) as *const u8;
         debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-        while ptr >= ptr_add(start_ptr, USIZE_BYTES) {
+        while ptr >= start_ptr.add(USIZE_BYTES) {
             debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
 
-            let chunk = *(ptr_sub(ptr, USIZE_BYTES) as *const usize);
+            let chunk = *(ptr.sub(USIZE_BYTES) as *const usize);
             let eq1 = contains_zero_byte(chunk ^ vn1);
             let eq2 = contains_zero_byte(chunk ^ vn2);
             if eq1 || eq2 {
                 break;
             }
-            ptr = ptr_sub(ptr, USIZE_BYTES);
+            ptr = ptr.sub(USIZE_BYTES);
         }
         reverse_search(start_ptr, end_ptr, ptr, confirm)
     }
@@ -256,7 +258,7 @@ pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
             return reverse_search(start_ptr, end_ptr, ptr, confirm);
         }
 
-        let chunk = read_unaligned_usize(ptr_sub(ptr, USIZE_BYTES));
+        let chunk = (ptr.sub(USIZE_BYTES) as *const usize).read_unaligned();
         let eq1 = contains_zero_byte(chunk ^ vn1);
         let eq2 = contains_zero_byte(chunk ^ vn2);
         let eq3 = contains_zero_byte(chunk ^ vn3);
@@ -266,17 +268,17 @@ pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
 
         ptr = (end_ptr as usize & !align) as *const u8;
         debug_assert!(start_ptr <= ptr && ptr <= end_ptr);
-        while ptr >= ptr_add(start_ptr, USIZE_BYTES) {
+        while ptr >= start_ptr.add(USIZE_BYTES) {
             debug_assert_eq!(0, (ptr as usize) % USIZE_BYTES);
 
-            let chunk = *(ptr_sub(ptr, USIZE_BYTES) as *const usize);
+            let chunk = *(ptr.sub(USIZE_BYTES) as *const usize);
             let eq1 = contains_zero_byte(chunk ^ vn1);
             let eq2 = contains_zero_byte(chunk ^ vn2);
             let eq3 = contains_zero_byte(chunk ^ vn3);
             if eq1 || eq2 || eq3 {
                 break;
             }
-            ptr = ptr_sub(ptr, USIZE_BYTES);
+            ptr = ptr.sub(USIZE_BYTES);
         }
         reverse_search(start_ptr, end_ptr, ptr, confirm)
     }
@@ -320,24 +322,6 @@ unsafe fn reverse_search<F: Fn(u8) -> bool>(
     None
 }
 
-/// Increment the given pointer by the given amount.
-unsafe fn ptr_add(ptr: *const u8, amt: usize) -> *const u8 {
-    debug_assert!(amt < ::core::isize::MAX as usize);
-    ptr.offset(amt as isize)
-}
-
-/// Decrement the given pointer by the given amount.
-unsafe fn ptr_sub(ptr: *const u8, amt: usize) -> *const u8 {
-    debug_assert!(amt < ::core::isize::MAX as usize);
-    ptr.offset((amt as isize).wrapping_neg())
-}
-
-unsafe fn read_unaligned_usize(ptr: *const u8) -> usize {
-    let mut n: usize = 0;
-    ptr::copy_nonoverlapping(ptr, &mut n as *mut _ as *mut u8, USIZE_BYTES);
-    n
-}
-
 /// Subtract `b` from `a` and return the difference. `a` should be greater than
 /// or equal to `b`.
 fn sub(a: *const u8, b: *const u8) -> usize {
diff --git a/vendor/memchr/src/iter.rs b/vendor/memchr/src/iter.rs
index 0ee5f86a87..6217ae4a09 100644
--- a/vendor/memchr/src/iter.rs
+++ b/vendor/memchr/src/iter.rs
@@ -17,7 +17,7 @@ macro_rules! iter_next {
             $self_.position = found_position + 1;
             found_position
         })
-    }
+    };
 }
 
 macro_rules! iter_next_back {
@@ -27,7 +27,7 @@ macro_rules! iter_next_back {
             $self_.haystack = $self_.haystack.split_at(index).0;
             $self_.position + index
         })
-    }
+    };
 }
 
 /// An iterator for `memchr`.
@@ -43,11 +43,7 @@ impl<'a> Memchr<'a> {
     /// Creates a new iterator that yields all positions of needle in haystack.
     #[inline]
     pub fn new(needle: u8, haystack: &[u8]) -> Memchr {
-        Memchr {
-            needle: needle,
-            haystack: haystack,
-            position: 0,
-        }
+        Memchr { needle: needle, haystack: haystack, position: 0 }
     }
 }
 
diff --git a/vendor/memchr/src/lib.rs b/vendor/memchr/src/lib.rs
index b828475f57..d5ddada857 100644
--- a/vendor/memchr/src/lib.rs
+++ b/vendor/memchr/src/lib.rs
@@ -20,20 +20,23 @@ provides its own implementation of `memrchr` as well, on top of `memchr2`,
 instead of one. Similarly for `memchr3`.
 */
 
-#![cfg_attr(not(feature = "use_std"), no_std)]
-
+#![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
 #![doc(html_root_url = "https://docs.rs/memchr/2.0.0")]
 
-// Supporting 16-bit would be fine. If you need it, please submit a bug report
-// at https://github.com/BurntSushi/rust-memchr
-#[cfg(not(any(target_pointer_width = "32", target_pointer_width = "64")))]
+// Supporting 8-bit (or others) would be fine. If you need it, please submit a
+// bug report at https://github.com/BurntSushi/rust-memchr
+#[cfg(not(any(
+    target_pointer_width = "16",
+    target_pointer_width = "32",
+    target_pointer_width = "64"
+)))]
 compile_error!("memchr currently not supported on non-32 or non-64 bit");
 
-#[cfg(feature = "use_std")]
+#[cfg(feature = "std")]
 extern crate core;
 
-#[cfg(test)]
+#[cfg(all(test, not(miri)))]
 #[macro_use]
 extern crate quickcheck;
 
@@ -48,10 +51,13 @@ mod c;
 mod fallback;
 mod iter;
 mod naive;
-#[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
-mod x86;
-#[cfg(test)]
+#[cfg(all(test, not(miri)))]
+mod tests;
+#[cfg(all(test, miri))]
+#[path = "tests/miri.rs"]
 mod tests;
+#[cfg(all(not(miri), target_arch = "x86_64", memchr_runtime_simd))]
+mod x86;
 
 /// An iterator over all occurrences of the needle in a haystack.
 #[inline]
@@ -61,11 +67,7 @@ pub fn memchr_iter(needle: u8, haystack: &[u8]) -> Memchr {
 
 /// An iterator over all occurrences of the needles in a haystack.
 #[inline]
-pub fn memchr2_iter(
-    needle1: u8,
-    needle2: u8,
-    haystack: &[u8],
-) -> Memchr2 {
+pub fn memchr2_iter(needle1: u8, needle2: u8, haystack: &[u8]) -> Memchr2 {
     Memchr2::new(needle1, needle2, haystack)
 }
 
@@ -129,7 +131,13 @@ pub fn memrchr3_iter(
 /// ```
 #[inline]
 pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memchr(n1, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
     #[inline(always)]
     fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
         x86::memchr(n1, haystack)
@@ -137,7 +145,8 @@ pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
 
     #[cfg(all(
         memchr_libc,
-        not(all(target_arch = "x86_64", memchr_runtime_simd))
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
     ))]
     #[inline(always)]
     fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
@@ -146,7 +155,8 @@ pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
 
     #[cfg(all(
         not(memchr_libc),
-        not(all(target_arch = "x86_64", memchr_runtime_simd))
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
     ))]
     #[inline(always)]
     fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
@@ -160,16 +170,46 @@ pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
     }
 }
 
-/// Like `memchr`, but searches for two bytes instead of one.
+/// Like `memchr`, but searches for either of two bytes instead of just one.
+///
+/// This returns the index corresponding to the first occurrence of `needle1`
+/// or the first occurrence of `needle2` in `haystack` (whichever occurs
+/// earlier), or `None` if neither one is found.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().position(|&b| b == needle1 || b == needle2)`, `memchr2`
+/// will use a highly optimized routine that can be up to an order of magnitude
+/// faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the first position of either of two bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memchr2;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memchr2(b'k', b'q', haystack), Some(4));
+/// ```
 #[inline]
 pub fn memchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memchr2(n1, n2, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
         x86::memchr2(n1, n2, haystack)
     }
 
-    #[cfg(not(all(target_arch = "x86_64", memchr_runtime_simd)))]
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
         fallback::memchr2(n1, n2, haystack)
@@ -182,7 +222,28 @@ pub fn memchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
     }
 }
 
-/// Like `memchr`, but searches for three bytes instead of one.
+/// Like `memchr`, but searches for any of three bytes instead of just one.
+///
+/// This returns the index corresponding to the first occurrence of `needle1`,
+/// the first occurrence of `needle2`, or the first occurrence of `needle3` in
+/// `haystack` (whichever occurs earliest), or `None` if none are found.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().position(|&b| b == needle1 || b == needle2 ||
+/// b == needle3)`, `memchr3` will use a highly optimized routine that can be
+/// up to an order of magnitude faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the first position of any of three bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memchr3;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memchr3(b'k', b'q', b'e', haystack), Some(2));
+/// ```
 #[inline]
 pub fn memchr3(
     needle1: u8,
@@ -190,13 +251,22 @@ pub fn memchr3(
     needle3: u8,
     haystack: &[u8],
 ) -> Option<usize> {
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memchr3(n1, n2, n3, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
         x86::memchr3(n1, n2, n3, haystack)
     }
 
-    #[cfg(not(all(target_arch = "x86_64", memchr_runtime_simd)))]
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
         fallback::memchr3(n1, n2, n3, haystack)
@@ -231,15 +301,23 @@ pub fn memchr3(
 /// ```
 #[inline]
 pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memrchr(n1, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
     #[inline(always)]
     fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
         x86::memrchr(n1, haystack)
     }
 
     #[cfg(all(
-        all(memchr_libc, target_os = "linux"),
-        not(all(target_arch = "x86_64", memchr_runtime_simd))
+        memchr_libc,
+        target_os = "linux",
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri)
     ))]
     #[inline(always)]
     fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
@@ -248,7 +326,8 @@ pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
 
     #[cfg(all(
         not(all(memchr_libc, target_os = "linux")),
-        not(all(target_arch = "x86_64", memchr_runtime_simd))
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
     ))]
     #[inline(always)]
     fn imp(n1: u8, haystack: &[u8]) -> Option<usize> {
@@ -262,16 +341,46 @@ pub fn memrchr(needle: u8, haystack: &[u8]) -> Option<usize> {
     }
 }
 
-/// Like `memrchr`, but searches for two bytes instead of one.
+/// Like `memrchr`, but searches for either of two bytes instead of just one.
+///
+/// This returns the index corresponding to the last occurrence of `needle1`
+/// or the last occurrence of `needle2` in `haystack` (whichever occurs later),
+/// or `None` if neither one is found.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().rposition(|&b| b == needle1 || b == needle2)`, `memrchr2`
+/// will use a highly optimized routine that can be up to an order of magnitude
+/// faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the last position of either of two bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memrchr2;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memrchr2(b'k', b'q', haystack), Some(8));
+/// ```
 #[inline]
 pub fn memrchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memrchr2(n1, n2, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
         x86::memrchr2(n1, n2, haystack)
     }
 
-    #[cfg(not(all(target_arch = "x86_64", memchr_runtime_simd)))]
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
         fallback::memrchr2(n1, n2, haystack)
@@ -284,7 +393,28 @@ pub fn memrchr2(needle1: u8, needle2: u8, haystack: &[u8]) -> Option<usize> {
     }
 }
 
-/// Like `memrchr`, but searches for three bytes instead of one.
+/// Like `memrchr`, but searches for any of three bytes instead of just one.
+///
+/// This returns the index corresponding to the last occurrence of `needle1`,
+/// the last occurrence of `needle2`, or the last occurrence of `needle3` in
+/// `haystack` (whichever occurs later), or `None` if none are found.
+///
+/// While this is operationally the same as something like
+/// `haystack.iter().rposition(|&b| b == needle1 || b == needle2 ||
+/// b == needle3)`, `memrchr3` will use a highly optimized routine that can be
+/// up to an order of magnitude faster in some cases.
+///
+/// # Example
+///
+/// This shows how to find the last position of any of three bytes in a byte
+/// string.
+///
+/// ```
+/// use memchr::memrchr3;
+///
+/// let haystack = b"the quick brown fox";
+/// assert_eq!(memrchr3(b'k', b'q', b'e', haystack), Some(8));
+/// ```
 #[inline]
 pub fn memrchr3(
     needle1: u8,
@@ -292,13 +422,22 @@ pub fn memrchr3(
     needle3: u8,
     haystack: &[u8],
 ) -> Option<usize> {
-    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd))]
+    #[cfg(miri)]
+    #[inline(always)]
+    fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
+        naive::memrchr3(n1, n2, n3, haystack)
+    }
+
+    #[cfg(all(target_arch = "x86_64", memchr_runtime_simd, not(miri)))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
         x86::memrchr3(n1, n2, n3, haystack)
     }
 
-    #[cfg(not(all(target_arch = "x86_64", memchr_runtime_simd)))]
+    #[cfg(all(
+        not(all(target_arch = "x86_64", memchr_runtime_simd)),
+        not(miri),
+    ))]
     #[inline(always)]
     fn imp(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
         fallback::memrchr3(n1, n2, n3, haystack)
diff --git a/vendor/memchr/src/naive.rs b/vendor/memchr/src/naive.rs
index 68cecf02ac..3f3053d481 100644
--- a/vendor/memchr/src/naive.rs
+++ b/vendor/memchr/src/naive.rs
@@ -1,37 +1,25 @@
 #![allow(dead_code)]
 
 pub fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    haystack
-        .iter()
-        .position(|&b| b == n1)
+    haystack.iter().position(|&b| b == n1)
 }
 
 pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    haystack
-        .iter()
-        .position(|&b| b == n1 || b == n2)
+    haystack.iter().position(|&b| b == n1 || b == n2)
 }
 
 pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    haystack
-        .iter()
-        .position(|&b| b == n1 || b == n2 || b == n3)
+    haystack.iter().position(|&b| b == n1 || b == n2 || b == n3)
 }
 
 pub fn memrchr(n1: u8, haystack: &[u8]) -> Option<usize> {
-    haystack
-        .iter()
-        .rposition(|&b| b == n1)
+    haystack.iter().rposition(|&b| b == n1)
 }
 
 pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
-    haystack
-        .iter()
-        .rposition(|&b| b == n1 || b == n2)
+    haystack.iter().rposition(|&b| b == n1 || b == n2)
 }
 
 pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    haystack
-        .iter()
-        .rposition(|&b| b == n1 || b == n2 || b == n3)
+    haystack.iter().rposition(|&b| b == n1 || b == n2 || b == n3)
 }
diff --git a/vendor/memchr/src/tests/iter.rs b/vendor/memchr/src/tests/iter.rs
index 33c85652c5..8f335003b9 100644
--- a/vendor/memchr/src/tests/iter.rs
+++ b/vendor/memchr/src/tests/iter.rs
@@ -160,8 +160,9 @@ quickcheck! {
 // Return a vector with the concatenation of the fronts and the reverse of the
 // backs.
 fn double_ended_take<I, J>(mut iter: I, take_side: J) -> Vec<I::Item>
-    where I: DoubleEndedIterator,
-          J: Iterator<Item=bool>,
+where
+    I: DoubleEndedIterator,
+    J: Iterator<Item = bool>,
 {
     let mut found_front = Vec::new();
     let mut found_back = Vec::new();
@@ -191,7 +192,7 @@ fn double_ended_take<I, J>(mut iter: I, take_side: J) -> Vec<I::Item>
 fn positions1<'a>(
     n1: u8,
     haystack: &'a [u8],
-) -> Box<DoubleEndedIterator<Item=usize> + 'a> {
+) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
     let it = haystack
         .iter()
         .enumerate()
@@ -204,7 +205,7 @@ fn positions2<'a>(
     n1: u8,
     n2: u8,
     haystack: &'a [u8],
-) -> Box<DoubleEndedIterator<Item=usize> + 'a> {
+) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
     let it = haystack
         .iter()
         .enumerate()
@@ -218,7 +219,7 @@ fn positions3<'a>(
     n2: u8,
     n3: u8,
     haystack: &'a [u8],
-) -> Box<DoubleEndedIterator<Item=usize> + 'a> {
+) -> Box<dyn DoubleEndedIterator<Item = usize> + 'a> {
     let it = haystack
         .iter()
         .enumerate()
diff --git a/vendor/memchr/src/tests/miri.rs b/vendor/memchr/src/tests/miri.rs
new file mode 100644
index 0000000000..879ef938ec
--- /dev/null
+++ b/vendor/memchr/src/tests/miri.rs
@@ -0,0 +1,19 @@
+// Simple tests using MIRI
+
+use crate::{memchr, memchr2, memchr3, memrchr, memrchr2, memrchr3};
+
+#[test]
+fn test_with_miri() {
+    assert_eq!(memchr(b'a', b"abcda"), Some(0));
+    assert_eq!(memchr(b'z', b"abcda"), None);
+    assert_eq!(memchr2(b'a', b'z', b"abcda"), Some(0));
+    assert_eq!(memchr2(b'z', b'y', b"abcda"), None);
+    assert_eq!(memchr3(b'a', b'z', b'b', b"abcda"), Some(0));
+    assert_eq!(memchr3(b'z', b'y', b'x', b"abcda"), None);
+    assert_eq!(memrchr(b'a', b"abcda"), Some(4));
+    assert_eq!(memrchr(b'z', b"abcda"), None);
+    assert_eq!(memrchr2(b'a', b'z', b"abcda"), Some(4));
+    assert_eq!(memrchr2(b'z', b'y', b"abcda"), None);
+    assert_eq!(memrchr3(b'a', b'z', b'b', b"abcda"), Some(4));
+    assert_eq!(memrchr3(b'z', b'y', b'x', b"abcda"), None);
+}
diff --git a/vendor/memchr/src/tests/mod.rs b/vendor/memchr/src/tests/mod.rs
index 7033e2e80e..82c1a248e9 100644
--- a/vendor/memchr/src/tests/mod.rs
+++ b/vendor/memchr/src/tests/mod.rs
@@ -44,61 +44,21 @@ fn memchr_tests() -> Vec<MemchrTest> {
 /// in the tests by varying the starting point of the slice.
 const MEMCHR_TESTS: &[MemchrTestStatic] = &[
     // one needle (applied to memchr + memchr2 + memchr3)
-    MemchrTestStatic {
-        corpus: "a",
-        needles: &[b'a'],
-        positions: &[0],
-    },
-    MemchrTestStatic {
-        corpus: "aa",
-        needles: &[b'a'],
-        positions: &[0, 1],
-    },
+    MemchrTestStatic { corpus: "a", needles: &[b'a'], positions: &[0] },
+    MemchrTestStatic { corpus: "aa", needles: &[b'a'], positions: &[0, 1] },
     MemchrTestStatic {
         corpus: "aaa",
         needles: &[b'a'],
         positions: &[0, 1, 2],
     },
-    MemchrTestStatic {
-        corpus: "",
-        needles: &[b'a'],
-        positions: &[],
-    },
-    MemchrTestStatic {
-        corpus: "z",
-        needles: &[b'a'],
-        positions: &[],
-    },
-    MemchrTestStatic {
-        corpus: "zz",
-        needles: &[b'a'],
-        positions: &[],
-    },
-    MemchrTestStatic {
-        corpus: "zza",
-        needles: &[b'a'],
-        positions: &[2],
-    },
-    MemchrTestStatic {
-        corpus: "zaza",
-        needles: &[b'a'],
-        positions: &[1, 3],
-    },
-    MemchrTestStatic {
-        corpus: "zzza",
-        needles: &[b'a'],
-        positions: &[3],
-    },
-    MemchrTestStatic {
-        corpus: "\x00a",
-        needles: &[b'a'],
-        positions: &[1],
-    },
-    MemchrTestStatic {
-        corpus: "\x00",
-        needles: &[b'\x00'],
-        positions: &[0],
-    },
+    MemchrTestStatic { corpus: "", needles: &[b'a'], positions: &[] },
+    MemchrTestStatic { corpus: "z", needles: &[b'a'], positions: &[] },
+    MemchrTestStatic { corpus: "zz", needles: &[b'a'], positions: &[] },
+    MemchrTestStatic { corpus: "zza", needles: &[b'a'], positions: &[2] },
+    MemchrTestStatic { corpus: "zaza", needles: &[b'a'], positions: &[1, 3] },
+    MemchrTestStatic { corpus: "zzza", needles: &[b'a'], positions: &[3] },
+    MemchrTestStatic { corpus: "\x00a", needles: &[b'a'], positions: &[1] },
+    MemchrTestStatic { corpus: "\x00", needles: &[b'\x00'], positions: &[0] },
     MemchrTestStatic {
         corpus: "\x00\x00",
         needles: &[b'\x00'],
@@ -119,7 +79,6 @@ const MEMCHR_TESTS: &[MemchrTestStatic] = &[
         needles: &[b'a'],
         positions: &[32],
     },
-
     // two needles (applied to memchr2 + memchr3)
     MemchrTestStatic {
         corpus: "az",
@@ -131,21 +90,9 @@ const MEMCHR_TESTS: &[MemchrTestStatic] = &[
         needles: &[b'a', b'z'],
         positions: &[0, 1],
     },
-    MemchrTestStatic {
-        corpus: "az",
-        needles: &[b'x', b'y'],
-        positions: &[],
-    },
-    MemchrTestStatic {
-        corpus: "az",
-        needles: &[b'a', b'y'],
-        positions: &[0],
-    },
-    MemchrTestStatic {
-        corpus: "az",
-        needles: &[b'x', b'z'],
-        positions: &[1],
-    },
+    MemchrTestStatic { corpus: "az", needles: &[b'x', b'y'], positions: &[] },
+    MemchrTestStatic { corpus: "az", needles: &[b'a', b'y'], positions: &[0] },
+    MemchrTestStatic { corpus: "az", needles: &[b'x', b'z'], positions: &[1] },
     MemchrTestStatic {
         corpus: "yyyyaz",
         needles: &[b'a', b'z'],
@@ -156,7 +103,6 @@ const MEMCHR_TESTS: &[MemchrTestStatic] = &[
         needles: &[b'z', b'a'],
         positions: &[4, 5],
     },
-
     // three needles (applied to memchr3)
     MemchrTestStatic {
         corpus: "xyz",
@@ -217,11 +163,7 @@ struct MemchrTestStatic {
 }
 
 impl MemchrTest {
-    fn one<F: Fn(u8, &[u8]) -> Option<usize>>(
-        &self,
-        reverse: bool,
-        f: F,
-    ) {
+    fn one<F: Fn(u8, &[u8]) -> Option<usize>>(&self, reverse: bool, f: F) {
         let needles = match self.needles(1) {
             None => return,
             Some(needles) => needles,
@@ -248,11 +190,7 @@ impl MemchrTest {
         }
     }
 
-    fn two<F: Fn(u8, u8, &[u8]) -> Option<usize>>(
-        &self,
-        reverse: bool,
-        f: F,
-    ) {
+    fn two<F: Fn(u8, u8, &[u8]) -> Option<usize>>(&self, reverse: bool, f: F) {
         let needles = match self.needles(2) {
             None => return,
             Some(needles) => needles,
@@ -300,8 +238,9 @@ impl MemchrTest {
     }
 
     fn iter_one<'a, I, F>(&'a self, reverse: bool, f: F)
-    where F: FnOnce(u8, &'a [u8]) -> I,
-          I: Iterator<Item=usize>
+    where
+        F: FnOnce(u8, &'a [u8]) -> I,
+        I: Iterator<Item = usize>,
     {
         if let Some(ns) = self.needles(1) {
             self.iter(reverse, f(ns[0], self.corpus.as_bytes()));
@@ -309,8 +248,9 @@ impl MemchrTest {
     }
 
     fn iter_two<'a, I, F>(&'a self, reverse: bool, f: F)
-    where F: FnOnce(u8, u8, &'a [u8]) -> I,
-          I: Iterator<Item=usize>
+    where
+        F: FnOnce(u8, u8, &'a [u8]) -> I,
+        I: Iterator<Item = usize>,
     {
         if let Some(ns) = self.needles(2) {
             self.iter(reverse, f(ns[0], ns[1], self.corpus.as_bytes()));
@@ -318,8 +258,9 @@ impl MemchrTest {
     }
 
     fn iter_three<'a, I, F>(&'a self, reverse: bool, f: F)
-    where F: FnOnce(u8, u8, u8, &'a [u8]) -> I,
-          I: Iterator<Item=usize>
+    where
+        F: FnOnce(u8, u8, u8, &'a [u8]) -> I,
+        I: Iterator<Item = usize>,
     {
         if let Some(ns) = self.needles(3) {
             self.iter(reverse, f(ns[0], ns[1], ns[2], self.corpus.as_bytes()));
@@ -329,7 +270,7 @@ impl MemchrTest {
     /// Test that the positions yielded by the given iterator match the
     /// positions in this test. If reverse is true, then reverse the positions
     /// before comparing them.
-    fn iter<I: Iterator<Item=usize>>(&self, reverse: bool, it: I) {
+    fn iter<I: Iterator<Item = usize>>(&self, reverse: bool, it: I) {
         assert_eq!(
             self.positions(0, reverse),
             it.collect::<Vec<usize>>(),
@@ -365,7 +306,7 @@ impl MemchrTest {
         // Add bytes to the end of the corpus.
         for i in 1..515 {
             let mut t = self.clone();
-            let mut padding: String = repeat('%').take(i).collect();
+            let padding: String = repeat('%').take(i).collect();
             t.corpus.push_str(&padding);
             more.push(t);
         }
@@ -405,14 +346,13 @@ impl MemchrTest {
     /// alignment are offset by the alignment. Positions less than the
     /// alignment are dropped.
     fn positions(&self, align: usize, reverse: bool) -> Vec<usize> {
-        let positions =
-            if reverse {
-                let mut positions = self.positions.to_vec();
-                positions.reverse();
-                positions
-            } else {
-                self.positions.to_vec()
-            };
+        let positions = if reverse {
+            let mut positions = self.positions.to_vec();
+            positions.reverse();
+            positions
+        } else {
+            self.positions.to_vec()
+        };
         positions
             .into_iter()
             .filter(|&p| p >= align)
diff --git a/vendor/memchr/src/x86/avx.rs b/vendor/memchr/src/x86/avx.rs
index e5b4a62ff5..e3d8e8902e 100644
--- a/vendor/memchr/src/x86/avx.rs
+++ b/vendor/memchr/src/x86/avx.rs
@@ -169,8 +169,10 @@ pub unsafe fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
 #[target_feature(enable = "avx2")]
 pub unsafe fn memchr3(
-    n1: u8, n2: u8, n3: u8,
-    haystack: &[u8]
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
 ) -> Option<usize> {
     let vn1 = _mm256_set1_epi8(n1 as i8);
     let vn2 = _mm256_set1_epi8(n2 as i8);
@@ -222,14 +224,6 @@ pub unsafe fn memchr3(
                 return Some(at + forward_pos3(mask1, mask2, mask3));
             }
 
-            at += VECTOR_SIZE;
-            let mask1 = _mm256_movemask_epi8(eqb1);
-            let mask2 = _mm256_movemask_epi8(eqb2);
-            let mask3 = _mm256_movemask_epi8(eqb3);
-            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
-                return Some(at + forward_pos3(mask1, mask2, mask3));
-            }
-
             at += VECTOR_SIZE;
             let mask1 = _mm256_movemask_epi8(eqb1);
             let mask2 = _mm256_movemask_epi8(eqb2);
@@ -239,7 +233,9 @@ pub unsafe fn memchr3(
         ptr = ptr.add(loop_size);
     }
     while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        if let Some(i) = forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        if let Some(i) =
+            forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
             return Some(i);
         }
         ptr = ptr.add(VECTOR_SIZE);
@@ -402,7 +398,9 @@ pub unsafe fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
 #[target_feature(enable = "avx2")]
 pub unsafe fn memrchr3(
-    n1: u8, n2: u8, n3: u8,
+    n1: u8,
+    n2: u8,
+    n3: u8,
     haystack: &[u8],
 ) -> Option<usize> {
     let vn1 = _mm256_set1_epi8(n1 as i8);
@@ -466,7 +464,9 @@ pub unsafe fn memrchr3(
     }
     while ptr >= start_ptr.add(VECTOR_SIZE) {
         ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) = reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        if let Some(i) =
+            reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
             return Some(i);
         }
     }
@@ -642,9 +642,7 @@ fn forward_pos(mask: i32) -> usize {
 fn forward_pos2(mask1: i32, mask2: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0);
 
-    let i1 = forward_pos(mask1);
-    let i2 = forward_pos(mask2);
-    if i1 < i2 { i1 } else { i2 }
+    forward_pos(mask1 | mask2)
 }
 
 /// Compute the position of the first matching byte from the given masks. The
@@ -656,16 +654,7 @@ fn forward_pos2(mask1: i32, mask2: i32) -> usize {
 fn forward_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
 
-    let i1 = forward_pos(mask1);
-    let i2 = forward_pos(mask2);
-    let i3 = forward_pos(mask3);
-    if i1 < i2 && i1 < i3 {
-        i1
-    } else if i2 < i3 {
-        i2
-    } else {
-        i3
-    }
+    forward_pos(mask1 | mask2 | mask3)
 }
 
 /// Compute the position of the last matching byte from the given mask. The
@@ -691,15 +680,7 @@ fn reverse_pos(mask: i32) -> usize {
 fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0);
 
-    if mask1 == 0 {
-        reverse_pos(mask2)
-    } else if mask2 == 0 {
-        reverse_pos(mask1)
-    } else {
-        let i1 = reverse_pos(mask1);
-        let i2 = reverse_pos(mask2);
-        if i1 > i2 { i1 } else { i2 }
-    }
+    reverse_pos(mask1 | mask2)
 }
 
 /// Compute the position of the last matching byte from the given masks. The
@@ -711,24 +692,7 @@ fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
 fn reverse_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
 
-    if mask1 == 0 {
-        reverse_pos2(mask2, mask3)
-    } else if mask2 == 0 {
-        reverse_pos2(mask1, mask3)
-    } else if mask3 == 0 {
-        reverse_pos2(mask1, mask2)
-    } else {
-        let i1 = reverse_pos(mask1);
-        let i2 = reverse_pos(mask2);
-        let i3 = reverse_pos(mask3);
-        if i1 > i2 && i1 > i3 {
-            i1
-        } else if i2 > i3 {
-            i2
-        } else {
-            i3
-        }
-    }
+    reverse_pos(mask1 | mask2 | mask3)
 }
 
 /// Subtract `b` from `a` and return the difference. `a` should be greater than
diff --git a/vendor/memchr/src/x86/mod.rs b/vendor/memchr/src/x86/mod.rs
index 6599da3fd8..855dc8b755 100644
--- a/vendor/memchr/src/x86/mod.rs
+++ b/vendor/memchr/src/x86/mod.rs
@@ -2,7 +2,7 @@ use fallback;
 
 // We only use AVX when we can detect at runtime whether it's available, which
 // requires std.
-#[cfg(feature = "use_std")]
+#[cfg(feature = "std")]
 mod avx;
 mod sse2;
 
@@ -27,7 +27,7 @@ mod sse2;
 // probably can't be inlined anyway---unless you've compiled your entire
 // program with AVX2 enabled. However, even then, the various memchr
 // implementations aren't exactly small, so inlining might not help anyway!
-#[cfg(feature = "use_std")]
+#[cfg(feature = "std")]
 macro_rules! ifunc {
     ($fnty:ty, $name:ident, $haystack:ident, $($needle:ident),+) => {{
         use std::mem;
@@ -59,11 +59,11 @@ macro_rules! ifunc {
     }}
 }
 
-// When std isn't enable (which provides runtime CPU feature detection), or if
+// When std isn't available to provide runtime CPU feature detection, or if
 // runtime CPU feature detection has been explicitly disabled, then just call
 // our optimized SSE2 routine directly. SSE2 is avalbale on all x86_64 targets,
 // so no CPU feature detection is necessary.
-#[cfg(not(feature = "use_std"))]
+#[cfg(not(feature = "std"))]
 macro_rules! ifunc {
     ($fnty:ty, $name:ident, $haystack:ident, $($needle:ident),+) => {{
         if cfg!(memchr_runtime_sse2) {
@@ -86,7 +86,14 @@ pub fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
 #[inline(always)]
 pub fn memchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(fn(u8, u8, u8, &[u8]) -> Option<usize>, memchr3, haystack, n1, n2, n3)
+    ifunc!(
+        fn(u8, u8, u8, &[u8]) -> Option<usize>,
+        memchr3,
+        haystack,
+        n1,
+        n2,
+        n3
+    )
 }
 
 #[inline(always)]
@@ -101,5 +108,12 @@ pub fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
 #[inline(always)]
 pub fn memrchr3(n1: u8, n2: u8, n3: u8, haystack: &[u8]) -> Option<usize> {
-    ifunc!(fn(u8, u8, u8, &[u8]) -> Option<usize>, memrchr3, haystack, n1, n2, n3)
+    ifunc!(
+        fn(u8, u8, u8, &[u8]) -> Option<usize>,
+        memrchr3,
+        haystack,
+        n1,
+        n2,
+        n3
+    )
 }
diff --git a/vendor/memchr/src/x86/sse2.rs b/vendor/memchr/src/x86/sse2.rs
index a988d9acb1..76f5a78c34 100644
--- a/vendor/memchr/src/x86/sse2.rs
+++ b/vendor/memchr/src/x86/sse2.rs
@@ -26,6 +26,8 @@ pub unsafe fn memchr(n1: u8, haystack: &[u8]) -> Option<usize> {
     // and can be expressed straight-forwardly in pseudo code:
     //
     //     needle = (n1 << 15) | (n1 << 14) | ... | (n1 << 1) | n1
+    //     // Note: shift amount in bytes
+    //
     //     while i <= haystack.len() - 16:
     //       // A 16 byte vector. Each byte in chunk corresponds to a byte in
     //       // the haystack.
@@ -257,8 +259,10 @@ pub unsafe fn memchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
 #[target_feature(enable = "sse2")]
 pub unsafe fn memchr3(
-    n1: u8, n2: u8, n3: u8,
-    haystack: &[u8]
+    n1: u8,
+    n2: u8,
+    n3: u8,
+    haystack: &[u8],
 ) -> Option<usize> {
     let vn1 = _mm_set1_epi8(n1 as i8);
     let vn2 = _mm_set1_epi8(n2 as i8);
@@ -310,14 +314,6 @@ pub unsafe fn memchr3(
                 return Some(at + forward_pos3(mask1, mask2, mask3));
             }
 
-            at += VECTOR_SIZE;
-            let mask1 = _mm_movemask_epi8(eqb1);
-            let mask2 = _mm_movemask_epi8(eqb2);
-            let mask3 = _mm_movemask_epi8(eqb3);
-            if mask1 != 0 || mask2 != 0 || mask3 != 0 {
-                return Some(at + forward_pos3(mask1, mask2, mask3));
-            }
-
             at += VECTOR_SIZE;
             let mask1 = _mm_movemask_epi8(eqb1);
             let mask2 = _mm_movemask_epi8(eqb2);
@@ -327,7 +323,9 @@ pub unsafe fn memchr3(
         ptr = ptr.add(loop_size);
     }
     while ptr <= end_ptr.sub(VECTOR_SIZE) {
-        if let Some(i) = forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        if let Some(i) =
+            forward_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
             return Some(i);
         }
         ptr = ptr.add(VECTOR_SIZE);
@@ -490,7 +488,9 @@ pub unsafe fn memrchr2(n1: u8, n2: u8, haystack: &[u8]) -> Option<usize> {
 
 #[target_feature(enable = "sse2")]
 pub unsafe fn memrchr3(
-    n1: u8, n2: u8, n3: u8,
+    n1: u8,
+    n2: u8,
+    n3: u8,
     haystack: &[u8],
 ) -> Option<usize> {
     let vn1 = _mm_set1_epi8(n1 as i8);
@@ -554,7 +554,9 @@ pub unsafe fn memrchr3(
     }
     while ptr >= start_ptr.add(VECTOR_SIZE) {
         ptr = ptr.sub(VECTOR_SIZE);
-        if let Some(i) = reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3) {
+        if let Some(i) =
+            reverse_search3(start_ptr, end_ptr, ptr, vn1, vn2, vn3)
+        {
             return Some(i);
         }
     }
@@ -730,9 +732,7 @@ fn forward_pos(mask: i32) -> usize {
 fn forward_pos2(mask1: i32, mask2: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0);
 
-    let i1 = forward_pos(mask1);
-    let i2 = forward_pos(mask2);
-    if i1 < i2 { i1 } else { i2 }
+    forward_pos(mask1 | mask2)
 }
 
 /// Compute the position of the first matching byte from the given masks. The
@@ -744,16 +744,7 @@ fn forward_pos2(mask1: i32, mask2: i32) -> usize {
 fn forward_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
 
-    let i1 = forward_pos(mask1);
-    let i2 = forward_pos(mask2);
-    let i3 = forward_pos(mask3);
-    if i1 < i2 && i1 < i3 {
-        i1
-    } else if i2 < i3 {
-        i2
-    } else {
-        i3
-    }
+    forward_pos(mask1 | mask2 | mask3)
 }
 
 /// Compute the position of the last matching byte from the given mask. The
@@ -779,15 +770,7 @@ fn reverse_pos(mask: i32) -> usize {
 fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0);
 
-    if mask1 == 0 {
-        reverse_pos(mask2)
-    } else if mask2 == 0 {
-        reverse_pos(mask1)
-    } else {
-        let i1 = reverse_pos(mask1);
-        let i2 = reverse_pos(mask2);
-        if i1 > i2 { i1 } else { i2 }
-    }
+    reverse_pos(mask1 | mask2)
 }
 
 /// Compute the position of the last matching byte from the given masks. The
@@ -799,24 +782,7 @@ fn reverse_pos2(mask1: i32, mask2: i32) -> usize {
 fn reverse_pos3(mask1: i32, mask2: i32, mask3: i32) -> usize {
     debug_assert!(mask1 != 0 || mask2 != 0 || mask3 != 0);
 
-    if mask1 == 0 {
-        reverse_pos2(mask2, mask3)
-    } else if mask2 == 0 {
-        reverse_pos2(mask1, mask3)
-    } else if mask3 == 0 {
-        reverse_pos2(mask1, mask2)
-    } else {
-        let i1 = reverse_pos(mask1);
-        let i2 = reverse_pos(mask2);
-        let i3 = reverse_pos(mask3);
-        if i1 > i2 && i1 > i3 {
-            i1
-        } else if i2 > i3 {
-            i2
-        } else {
-            i3
-        }
-    }
+    reverse_pos(mask1 | mask2 | mask3)
 }
 
 /// Subtract `b` from `a` and return the difference. `a` should be greater than
diff --git a/vendor/parking_lot/.cargo-checksum.json b/vendor/parking_lot-0.9.0/.cargo-checksum.json
similarity index 100%
rename from vendor/parking_lot/.cargo-checksum.json
rename to vendor/parking_lot-0.9.0/.cargo-checksum.json
diff --git a/vendor/parking_lot/CHANGELOG.md b/vendor/parking_lot-0.9.0/CHANGELOG.md
similarity index 100%
rename from vendor/parking_lot/CHANGELOG.md
rename to vendor/parking_lot-0.9.0/CHANGELOG.md
diff --git a/vendor/parking_lot/Cargo.toml b/vendor/parking_lot-0.9.0/Cargo.toml
similarity index 100%
rename from vendor/parking_lot/Cargo.toml
rename to vendor/parking_lot-0.9.0/Cargo.toml
diff --git a/vendor/parking_lot/LICENSE-APACHE b/vendor/parking_lot-0.9.0/LICENSE-APACHE
similarity index 100%
rename from vendor/parking_lot/LICENSE-APACHE
rename to vendor/parking_lot-0.9.0/LICENSE-APACHE
diff --git a/vendor/parking_lot/LICENSE-MIT b/vendor/parking_lot-0.9.0/LICENSE-MIT
similarity index 100%
rename from vendor/parking_lot/LICENSE-MIT
rename to vendor/parking_lot-0.9.0/LICENSE-MIT
diff --git a/vendor/parking_lot/README.md b/vendor/parking_lot-0.9.0/README.md
similarity index 100%
rename from vendor/parking_lot/README.md
rename to vendor/parking_lot-0.9.0/README.md
diff --git a/vendor/parking_lot/appveyor.yml b/vendor/parking_lot-0.9.0/appveyor.yml
similarity index 100%
rename from vendor/parking_lot/appveyor.yml
rename to vendor/parking_lot-0.9.0/appveyor.yml
diff --git a/vendor/parking_lot/build.rs b/vendor/parking_lot-0.9.0/build.rs
similarity index 100%
rename from vendor/parking_lot/build.rs
rename to vendor/parking_lot-0.9.0/build.rs
diff --git a/vendor/parking_lot/src/condvar.rs b/vendor/parking_lot-0.9.0/src/condvar.rs
similarity index 100%
rename from vendor/parking_lot/src/condvar.rs
rename to vendor/parking_lot-0.9.0/src/condvar.rs
diff --git a/vendor/parking_lot/src/deadlock.rs b/vendor/parking_lot-0.9.0/src/deadlock.rs
similarity index 100%
rename from vendor/parking_lot/src/deadlock.rs
rename to vendor/parking_lot-0.9.0/src/deadlock.rs
diff --git a/vendor/parking_lot/src/elision.rs b/vendor/parking_lot-0.9.0/src/elision.rs
similarity index 100%
rename from vendor/parking_lot/src/elision.rs
rename to vendor/parking_lot-0.9.0/src/elision.rs
diff --git a/vendor/parking_lot/src/lib.rs b/vendor/parking_lot-0.9.0/src/lib.rs
similarity index 100%
rename from vendor/parking_lot/src/lib.rs
rename to vendor/parking_lot-0.9.0/src/lib.rs
diff --git a/vendor/parking_lot/src/mutex.rs b/vendor/parking_lot-0.9.0/src/mutex.rs
similarity index 100%
rename from vendor/parking_lot/src/mutex.rs
rename to vendor/parking_lot-0.9.0/src/mutex.rs
diff --git a/vendor/parking_lot/src/once.rs b/vendor/parking_lot-0.9.0/src/once.rs
similarity index 100%
rename from vendor/parking_lot/src/once.rs
rename to vendor/parking_lot-0.9.0/src/once.rs
diff --git a/vendor/parking_lot/src/raw_mutex.rs b/vendor/parking_lot-0.9.0/src/raw_mutex.rs
similarity index 100%
rename from vendor/parking_lot/src/raw_mutex.rs
rename to vendor/parking_lot-0.9.0/src/raw_mutex.rs
diff --git a/vendor/parking_lot/src/raw_rwlock.rs b/vendor/parking_lot-0.9.0/src/raw_rwlock.rs
similarity index 100%
rename from vendor/parking_lot/src/raw_rwlock.rs
rename to vendor/parking_lot-0.9.0/src/raw_rwlock.rs
diff --git a/vendor/parking_lot/src/remutex.rs b/vendor/parking_lot-0.9.0/src/remutex.rs
similarity index 100%
rename from vendor/parking_lot/src/remutex.rs
rename to vendor/parking_lot-0.9.0/src/remutex.rs
diff --git a/vendor/parking_lot/src/rwlock.rs b/vendor/parking_lot-0.9.0/src/rwlock.rs
similarity index 100%
rename from vendor/parking_lot/src/rwlock.rs
rename to vendor/parking_lot-0.9.0/src/rwlock.rs
diff --git a/vendor/parking_lot/src/util.rs b/vendor/parking_lot-0.9.0/src/util.rs
similarity index 100%
rename from vendor/parking_lot/src/util.rs
rename to vendor/parking_lot-0.9.0/src/util.rs
diff --git a/vendor/parking_lot_core/.cargo-checksum.json b/vendor/parking_lot_core-0.6.2/.cargo-checksum.json
similarity index 100%
rename from vendor/parking_lot_core/.cargo-checksum.json
rename to vendor/parking_lot_core-0.6.2/.cargo-checksum.json
diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core-0.6.2/Cargo.toml
similarity index 100%
rename from vendor/parking_lot_core/Cargo.toml
rename to vendor/parking_lot_core-0.6.2/Cargo.toml
diff --git a/vendor/parking_lot_core/LICENSE-APACHE b/vendor/parking_lot_core-0.6.2/LICENSE-APACHE
similarity index 100%
rename from vendor/parking_lot_core/LICENSE-APACHE
rename to vendor/parking_lot_core-0.6.2/LICENSE-APACHE
diff --git a/vendor/parking_lot_core/LICENSE-MIT b/vendor/parking_lot_core-0.6.2/LICENSE-MIT
similarity index 100%
rename from vendor/parking_lot_core/LICENSE-MIT
rename to vendor/parking_lot_core-0.6.2/LICENSE-MIT
diff --git a/vendor/parking_lot_core/build.rs b/vendor/parking_lot_core-0.6.2/build.rs
similarity index 100%
rename from vendor/parking_lot_core/build.rs
rename to vendor/parking_lot_core-0.6.2/build.rs
diff --git a/vendor/parking_lot_core/src/lib.rs b/vendor/parking_lot_core-0.6.2/src/lib.rs
similarity index 100%
rename from vendor/parking_lot_core/src/lib.rs
rename to vendor/parking_lot_core-0.6.2/src/lib.rs
diff --git a/vendor/parking_lot_core/src/parking_lot.rs b/vendor/parking_lot_core-0.6.2/src/parking_lot.rs
similarity index 100%
rename from vendor/parking_lot_core/src/parking_lot.rs
rename to vendor/parking_lot_core-0.6.2/src/parking_lot.rs
diff --git a/vendor/parking_lot_core/src/spinwait.rs b/vendor/parking_lot_core-0.6.2/src/spinwait.rs
similarity index 100%
rename from vendor/parking_lot_core/src/spinwait.rs
rename to vendor/parking_lot_core-0.6.2/src/spinwait.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/cloudabi.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/cloudabi.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/cloudabi.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/cloudabi.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/generic.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/generic.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/generic.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/generic.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/linux.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/linux.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/linux.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/linux.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/mod.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/mod.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/mod.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/mod.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/redox.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/redox.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/redox.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/redox.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/sgx.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/sgx.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/sgx.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/sgx.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/unix.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/unix.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/unix.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/unix.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/wasm.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/wasm.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/wasm.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/wasm.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/wasm_atomic.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/wasm_atomic.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/wasm_atomic.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/wasm_atomic.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/windows/keyed_event.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/windows/keyed_event.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/windows/keyed_event.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/windows/mod.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/windows/mod.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/windows/mod.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/windows/mod.rs
diff --git a/vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs b/vendor/parking_lot_core-0.6.2/src/thread_parker/windows/waitaddress.rs
similarity index 100%
rename from vendor/parking_lot_core/src/thread_parker/windows/waitaddress.rs
rename to vendor/parking_lot_core-0.6.2/src/thread_parker/windows/waitaddress.rs
diff --git a/vendor/parking_lot_core/src/util.rs b/vendor/parking_lot_core-0.6.2/src/util.rs
similarity index 100%
rename from vendor/parking_lot_core/src/util.rs
rename to vendor/parking_lot_core-0.6.2/src/util.rs
diff --git a/vendor/parking_lot_core/src/word_lock.rs b/vendor/parking_lot_core-0.6.2/src/word_lock.rs
similarity index 100%
rename from vendor/parking_lot_core/src/word_lock.rs
rename to vendor/parking_lot_core-0.6.2/src/word_lock.rs
diff --git a/vendor/polonius-engine/.cargo-checksum.json b/vendor/polonius-engine/.cargo-checksum.json
index eaa490ea1e..7ed2bb7757 100644
--- a/vendor/polonius-engine/.cargo-checksum.json
+++ b/vendor/polonius-engine/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"defd2ceec86a7a5f03bb5f26307557441328bcb213509375227cb72ee944f0b1","README.md":"fc6752d50a57acbf3d65581c0d2f3d0da8c5fef5735a12857660c9e9687751d0","src/facts.rs":"bf60ece8f467c04fd5c9cb178cffa38b4ff5d3d6e21016e534e7d7cb81fc3a8e","src/lib.rs":"19ef0fd2d054b3a48c11ff4007734b7940ca739d3a9d5083d3a03b4d982cdb99","src/output/datafrog_opt.rs":"fe552b2736445ea928514451c568292a9c42a3b4416f717d5c94c368fee63288","src/output/initialization.rs":"93e4fefd44e7e3efe041f64c0de7dbc72eea576b09a4eeb557adb6402e7a4391","src/output/liveness.rs":"245c289efa04edb4fbf10a23f4be31f60d6a7bcda9ef3a65d81595112c7d9589","src/output/location_insensitive.rs":"205e662d83c42437346c764867bfa6ed28e489257ad87a450bb9eb01d0428c4c","src/output/mod.rs":"03d64fcff81009fa8b4eb07ed16dc4d40f8fc0c122e513d9141a128d019d7831","src/output/naive.rs":"4651f34daa35b4d9451f3fdf5b946d5616dfc424f88a962be732130dffbed6ea"},"package":"1e478d7c38eb785c6416cbe58df12aa55d7aefa3759b6d3e044b2ed03f423cec"}
\ No newline at end of file
+{"files":{"Cargo.toml":"46270b8953eab061359883668243c1c48cc754b81638038c897565c79e4218cc","README.md":"fc6752d50a57acbf3d65581c0d2f3d0da8c5fef5735a12857660c9e9687751d0","src/facts.rs":"8f9aa8bd3173b258bb1ecd3ab0d32fad952547c5e36f861180bf516224d38244","src/lib.rs":"19ef0fd2d054b3a48c11ff4007734b7940ca739d3a9d5083d3a03b4d982cdb99","src/output/datafrog_opt.rs":"e03e57df4bebe033e0749b58c10ec18621eaeecfbe07dd559d8e8530db8a3ab7","src/output/initialization.rs":"c4da11bf1754d7ac91c76ac6af29bee0963e7f5c543656cf817270075387c54b","src/output/liveness.rs":"9f0ad06c25e115e8b5647cf9f488e9395c51ac4e80dd971a752d603e848839e9","src/output/location_insensitive.rs":"656b1c2f835be4aca129b176da3b9d63487f8b8ed643032116a15626676a16ce","src/output/mod.rs":"ed62730a3969c77227922c4416aba94e16eb1adf6d5b882543a60c93a9a8f55e","src/output/naive.rs":"48277625eb604475d8c9a00b56e9f8927358e1b098b3c53eaf5fefcda7e2b596"},"package":"04d8ef65e3f89ecaec9ca7cb0e0911b4617352d4494018bcf934992f03f2024c"}
\ No newline at end of file
diff --git a/vendor/polonius-engine/Cargo.toml b/vendor/polonius-engine/Cargo.toml
index fc63c5464a..4d37c2d36f 100644
--- a/vendor/polonius-engine/Cargo.toml
+++ b/vendor/polonius-engine/Cargo.toml
@@ -12,7 +12,7 @@
 
 [package]
 name = "polonius-engine"
-version = "0.11.0"
+version = "0.12.0"
 authors = ["The Rust Project Developers", "Polonius Developers"]
 description = "Core definition for the Rust borrow checker"
 readme = "README.md"
diff --git a/vendor/polonius-engine/src/facts.rs b/vendor/polonius-engine/src/facts.rs
index 104a227554..6b5f8daadb 100644
--- a/vendor/polonius-engine/src/facts.rs
+++ b/vendor/polonius-engine/src/facts.rs
@@ -24,45 +24,48 @@ pub struct AllFacts<T: FactTypes> {
     /// `invalidates(point, loan)` when the `loan` is invalidated at `point`
     pub invalidates: Vec<(T::Point, T::Loan)>,
 
-    /// `var_used(var, point)` when the variable `var` is used for anything but a drop at `point`
-    pub var_used: Vec<(T::Variable, T::Point)>,
+    /// `var_used_at(var, point)` when the variable `var` is used for anything
+    /// but a drop at `point`
+    pub var_used_at: Vec<(T::Variable, T::Point)>,
 
-    /// `var_defined(var, point)` when the variable `var` is overwritten at `point`
-    pub var_defined: Vec<(T::Variable, T::Point)>,
+    /// `var_defined_at(var, point)` when the variable `var` is overwritten at `point`
+    pub var_defined_at: Vec<(T::Variable, T::Point)>,
 
-    /// `var_used(var, point)` when the variable `var` is used in a drop at `point`
-    pub var_drop_used: Vec<(T::Variable, T::Point)>,
+    /// `var_dropped_at(var, point)` when the variable `var` is used in a drop at `point`
+    pub var_dropped_at: Vec<(T::Variable, T::Point)>,
 
-    /// `var_uses_region(var, origin)` when the type of `var` includes the `origin`
-    pub var_uses_region: Vec<(T::Variable, T::Origin)>,
+    // `use_of_var_derefs_origin(variable, origin)`: References with the given
+    // `origin` may be dereferenced when the `variable` is used.
+    //
+    // In rustc, we generate this whenever the type of the variable includes the
+    // given origin.
+    pub use_of_var_derefs_origin: Vec<(T::Variable, T::Origin)>,
 
-    /// `var_drops_region(var, origin)` when the type of `var` includes the `origin` and uses
-    /// it when dropping
-    pub var_drops_region: Vec<(T::Variable, T::Origin)>,
+    /// `drop_of_var_derefs_origin(var, origin)` when the type of `var` includes
+    /// the `origin` and uses it when dropping
+    pub drop_of_var_derefs_origin: Vec<(T::Variable, T::Origin)>,
 
-    /// `child(path1, path2)` when the path `path1` is the direct or transitive child
-    /// of `path2`, e.g. `child(x.y, x)`, `child(x.y.z, x.y)`, `child(x.y.z, x)`
-    /// would all be true if there was a path like `x.y.z`.
-    pub child: Vec<(T::Path, T::Path)>,
+    /// `child_path(child, parent)` when the path `child` is the direct child of
+    /// `parent`, e.g. `child_path(x.y, x)`, but not `child_path(x.y.z, x)`.
+    pub child_path: Vec<(T::Path, T::Path)>,
 
-    /// `path_belongs_to_var(path, var)` the root path `path` starting in variable `var`.
-    pub path_belongs_to_var: Vec<(T::Path, T::Variable)>,
+    /// `path_is_var(path, var)` the root path `path` starting in variable `var`.
+    pub path_is_var: Vec<(T::Path, T::Variable)>,
 
-    /// `initialized_at(path, point)` when the `path` was initialized at point
+    /// `path_assigned_at(path, point)` when the `path` was initialized at point
     /// `point`. This fact is only emitted for a prefix `path`, and not for the
     /// implicit initialization of all of `path`'s children. E.g. a statement like
     /// `x.y = 3` at `point` would give the fact `initialized_at(x.y, point)` (but
     /// neither `initialized_at(x.y.z, point)` nor `initialized_at(x, point)`).
-    pub initialized_at: Vec<(T::Path, T::Point)>,
+    pub path_assigned_at_base: Vec<(T::Path, T::Point)>,
 
-    /// `moved_out_at(path, point)` when the `path` was moved at `point`. The
-    /// same logic is applied as for `initialized_at` above.
-    pub moved_out_at: Vec<(T::Path, T::Point)>,
+    /// `path_moved_at_base(path, point)` when the `path` was moved at `point`. The
+    /// same logic is applied as for `assigned_at` above.
+    pub path_moved_at_base: Vec<(T::Path, T::Point)>,
 
-    /// `path_accessed_at(path, point)` when the `path` was accessed at point
+    /// `path_accessed_at_base(path, point)` when the `path` was accessed at point
     /// `point`. The same logic as for `initialized_at` and `moved_out_at` applies.
-    pub path_accessed_at: Vec<(T::Path, T::Point)>,
-
+    pub path_accessed_at_base: Vec<(T::Path, T::Point)>,
     /// These reflect the `'a: 'b` relations that are either declared by the user on function
     /// declarations or which are inferred via implied bounds.
     /// For example: `fn foo<'a, 'b: 'a, 'c>(x: &'c &'a u32)` would have two entries:
@@ -86,16 +89,16 @@ impl<T: FactTypes> Default for AllFacts<T> {
             killed: Vec::default(),
             outlives: Vec::default(),
             invalidates: Vec::default(),
-            var_used: Vec::default(),
-            var_defined: Vec::default(),
-            var_drop_used: Vec::default(),
-            var_uses_region: Vec::default(),
-            var_drops_region: Vec::default(),
-            child: Vec::default(),
-            path_belongs_to_var: Vec::default(),
-            initialized_at: Vec::default(),
-            moved_out_at: Vec::default(),
-            path_accessed_at: Vec::default(),
+            var_used_at: Vec::default(),
+            var_defined_at: Vec::default(),
+            var_dropped_at: Vec::default(),
+            use_of_var_derefs_origin: Vec::default(),
+            drop_of_var_derefs_origin: Vec::default(),
+            child_path: Vec::default(),
+            path_is_var: Vec::default(),
+            path_assigned_at_base: Vec::default(),
+            path_moved_at_base: Vec::default(),
+            path_accessed_at_base: Vec::default(),
             known_subset: Vec::default(),
             placeholder: Vec::default(),
         }
diff --git a/vendor/polonius-engine/src/output/datafrog_opt.rs b/vendor/polonius-engine/src/output/datafrog_opt.rs
index f979143795..8140535015 100644
--- a/vendor/polonius-engine/src/output/datafrog_opt.rs
+++ b/vendor/polonius-engine/src/output/datafrog_opt.rs
@@ -15,14 +15,14 @@ use crate::facts::FactTypes;
 use crate::output::{Context, Output};
 
 pub(super) fn compute<T: FactTypes>(
-    ctx: &Context<T>,
+    ctx: &Context<'_, T>,
     result: &mut Output<T>,
 ) -> Relation<(T::Loan, T::Point)> {
     let timer = Instant::now();
 
     let errors = {
         // Static inputs
-        let region_live_at_rel = &ctx.region_live_at;
+        let origin_live_on_entry_rel = &ctx.origin_live_on_entry;
         let cfg_edge_rel = &ctx.cfg_edge;
         let killed_rel = &ctx.killed;
 
@@ -32,10 +32,10 @@ pub(super) fn compute<T: FactTypes>(
         // `invalidates` facts, stored ready for joins
         let invalidates = iteration.variable::<((T::Loan, T::Point), ())>("invalidates");
 
-        // we need `region_live_at` in both variable and relation forms,
+        // we need `origin_live_on_entry` in both variable and relation forms,
         // (respectively, for join and antijoin).
-        let region_live_at_var =
-            iteration.variable::<((T::Origin, T::Point), ())>("region_live_at");
+        let origin_live_on_entry_var =
+            iteration.variable::<((T::Origin, T::Point), ())>("origin_live_on_entry");
 
         // `borrow_region` input but organized for join
         let borrow_region_op =
@@ -137,8 +137,8 @@ pub(super) fn compute<T: FactTypes>(
                 .iter()
                 .map(|&(loan, point)| ((loan, point), ())),
         );
-        region_live_at_var.extend(
-            region_live_at_rel
+        origin_live_on_entry_var.extend(
+            origin_live_on_entry_rel
                 .iter()
                 .map(|&(origin, point)| ((origin, point), ())),
         );
@@ -176,14 +176,14 @@ pub(super) fn compute<T: FactTypes>(
             // live_to_dying_regions(origin1, origin2, point1, point2) :-
             //   subset(origin1, origin2, point1),
             //   cfg_edge(point1, point2),
-            //   region_live_at(origin1, point2),
-            //   !region_live_at(origin2, point2).
+            //   origin_live_on_entry(origin1, point2),
+            //   !origin_live_on_entry(origin2, point2).
             live_to_dying_regions_o2pq.from_leapjoin(
                 &subset_o1p,
                 (
                     cfg_edge_rel.extend_with(|&((_, point1), _)| point1),
-                    region_live_at_rel.extend_with(|&((origin1, _), _)| origin1),
-                    region_live_at_rel.extend_anti(|&((_, _), origin2)| origin2),
+                    origin_live_on_entry_rel.extend_with(|&((origin1, _), _)| origin1),
+                    origin_live_on_entry_rel.extend_anti(|&((_, _), origin2)| origin2),
                 ),
                 |&((origin1, point1), origin2), &point2| ((origin2, point1, point2), origin1),
             );
@@ -192,13 +192,13 @@ pub(super) fn compute<T: FactTypes>(
             //   requires(origin, loan, point1),
             //   !killed(loan, point1),
             //   cfg_edge(point1, point2),
-            //   !region_live_at(origin, point2).
+            //   !origin_live_on_entry(origin, point2).
             dying_region_requires.from_leapjoin(
                 &requires_op,
                 (
                     killed_rel.filter_anti(|&((_, point1), loan)| (loan, point1)),
                     cfg_edge_rel.extend_with(|&((_, point1), _)| point1),
-                    region_live_at_rel.extend_anti(|&((origin, _), _)| origin),
+                    origin_live_on_entry_rel.extend_anti(|&((origin, _), _)| origin),
                 ),
                 |&((origin, point1), loan), &point2| ((origin, point1, point2), loan),
             );
@@ -228,7 +228,7 @@ pub(super) fn compute<T: FactTypes>(
 
             // dying_can_reach(origin1, origin3, point1, point2) :-
             //   dying_can_reach(origin1, origin2, point1, point2),
-            //   !region_live_at(origin2, point2),
+            //   !origin_live_on_entry(origin2, point2),
             //   subset(origin2, origin3, point1).
             //
             // This is the "transitive closure" rule, but
@@ -236,7 +236,7 @@ pub(super) fn compute<T: FactTypes>(
             // "intermediate" `origin2` is dead at `point2`.
             dying_can_reach_1.from_antijoin(
                 &dying_can_reach_o2q,
-                &region_live_at_rel,
+                &origin_live_on_entry_rel,
                 |&(origin2, point2), &(origin1, point1)| ((origin2, point1), (origin1, point2)),
             );
             dying_can_reach_o2q.from_join(
@@ -249,18 +249,18 @@ pub(super) fn compute<T: FactTypes>(
 
             // dying_can_reach_live(origin1, origin2, point1, point2) :-
             //   dying_can_reach(origin1, origin2, point1, point2),
-            //   region_live_at(origin2, point2).
+            //   origin_live_on_entry(origin2, point2).
             dying_can_reach_live.from_join(
                 &dying_can_reach_o2q,
-                &region_live_at_var,
+                &origin_live_on_entry_var,
                 |&(origin2, point2), &(origin1, point1), _| ((origin1, point1, point2), origin2),
             );
 
             // subset(origin1, origin2, point2) :-
             //   subset(origin1, origin2, point1),
             //   cfg_edge(point1, point2),
-            //   region_live_at(origin1, point2),
-            //   region_live_at(origin2, point2).
+            //   origin_live_on_entry(origin1, point2),
+            //   origin_live_on_entry(origin2, point2).
             //
             // Carry `origin1 <= origin2` from `point1` into `point2` if both `origin1` and
             // `origin2` are live in `point2`.
@@ -268,8 +268,8 @@ pub(super) fn compute<T: FactTypes>(
                 &subset_o1p,
                 (
                     cfg_edge_rel.extend_with(|&((_, point1), _)| point1),
-                    region_live_at_rel.extend_with(|&((origin1, _), _)| origin1),
-                    region_live_at_rel.extend_with(|&((_, _), origin2)| origin2),
+                    origin_live_on_entry_rel.extend_with(|&((origin1, _), _)| origin1),
+                    origin_live_on_entry_rel.extend_with(|&((_, _), origin2)| origin2),
                 ),
                 |&((origin1, _point1), origin2), &point2| ((origin1, point2), origin2),
             );
@@ -302,23 +302,23 @@ pub(super) fn compute<T: FactTypes>(
             //   requires(origin, loan, point1),
             //   !killed(loan, point1),
             //   cfg_edge(point1, point2),
-            //   region_live_at(origin, point2).
+            //   origin_live_on_entry(origin, point2).
             requires_op.from_leapjoin(
                 &requires_op,
                 (
                     killed_rel.filter_anti(|&((_, point1), loan)| (loan, point1)),
                     cfg_edge_rel.extend_with(|&((_, point1), _)| point1),
-                    region_live_at_rel.extend_with(|&((origin, _), _)| origin),
+                    origin_live_on_entry_rel.extend_with(|&((origin, _), _)| origin),
                 ),
                 |&((origin, _), loan), &point2| ((origin, point2), loan),
             );
 
             // dead_borrow_region_can_reach_root((origin, point), loan) :-
             //   borrow_region(origin, loan, point),
-            //   !region_live_at(origin, point).
+            //   !origin_live_on_entry(origin, point).
             dead_borrow_region_can_reach_root.from_antijoin(
                 &borrow_region_op,
-                &region_live_at_rel,
+                &origin_live_on_entry_rel,
                 |&(origin, point), &loan| ((origin, point), loan),
             );
 
@@ -330,7 +330,7 @@ pub(super) fn compute<T: FactTypes>(
             // dead_borrow_region_can_reach_dead((origin2, point), loan) :-
             //   dead_borrow_region_can_reach_dead(origin1, loan, point),
             //   subset(origin1, origin2, point),
-            //   !region_live_at(origin2, point).
+            //   !origin_live_on_entry(origin2, point).
             dead_borrow_region_can_reach_dead_1.from_join(
                 &dead_borrow_region_can_reach_dead,
                 &subset_o1p,
@@ -338,23 +338,23 @@ pub(super) fn compute<T: FactTypes>(
             );
             dead_borrow_region_can_reach_dead.from_antijoin(
                 &dead_borrow_region_can_reach_dead_1,
-                &region_live_at_rel,
+                &origin_live_on_entry_rel,
                 |&(origin2, point), &loan| ((origin2, point), loan),
             );
 
             // borrow_live_at(loan, point) :-
             //   requires(origin, loan, point),
-            //   region_live_at(origin, point).
+            //   origin_live_on_entry(origin, point).
             borrow_live_at.from_join(
                 &requires_op,
-                &region_live_at_var,
+                &origin_live_on_entry_var,
                 |&(_origin, point), &loan, _| ((loan, point), ()),
             );
 
             // borrow_live_at(loan, point) :-
             //   dead_borrow_region_can_reach_dead(origin1, loan, point),
             //   subset(origin1, origin2, point),
-            //   region_live_at(origin2, point).
+            //   origin_live_on_entry(origin2, point).
             //
             // NB: the datafrog code below uses
             // `dead_borrow_region_can_reach_dead_1`, which is equal
@@ -362,7 +362,7 @@ pub(super) fn compute<T: FactTypes>(
             // joined together.
             borrow_live_at.from_join(
                 &dead_borrow_region_can_reach_dead_1,
-                &region_live_at_var,
+                &origin_live_on_entry_var,
                 |&(_origin2, point), &loan, _| ((loan, point), ()),
             );
 
diff --git a/vendor/polonius-engine/src/output/initialization.rs b/vendor/polonius-engine/src/output/initialization.rs
index 25e30b93c0..6c7f5900bb 100644
--- a/vendor/polonius-engine/src/output/initialization.rs
+++ b/vendor/polonius-engine/src/output/initialization.rs
@@ -5,124 +5,275 @@ use crate::output::{InitializationContext, Output};
 
 use datafrog::{Iteration, Relation, RelationLeaper};
 
-pub(super) fn init_var_maybe_initialized_on_exit<T: FactTypes>(
-    ctx: InitializationContext<T>,
-    cfg_edge: &Relation<(T::Point, T::Point)>,
-    output: &mut Output<T>,
-) -> Relation<(T::Variable, T::Point)> {
-    let timer = Instant::now();
+// This represents the output of an intermediate elaboration step (step 1).
+struct TransitivePaths<T: FactTypes> {
+    path_moved_at: Relation<(T::Path, T::Point)>,
+    path_assigned_at: Relation<(T::Path, T::Point)>,
+    path_accessed_at: Relation<(T::Path, T::Point)>,
+    path_begins_with_var: Relation<(T::Path, T::Variable)>,
+}
+
+struct InitializationStatus<T: FactTypes> {
+    var_maybe_partly_initialized_on_exit: Relation<(T::Variable, T::Point)>,
+    move_error: Relation<(T::Path, T::Point)>,
+}
+
+pub(super) struct InitializationResult<T: FactTypes>(
+    pub(super) Relation<(T::Variable, T::Point)>,
+    pub(super) Relation<(T::Path, T::Point)>,
+);
+
+// Step 1: compute transitive closures of path operations. This would elaborate,
+// for example, an access to x into an access to x.f, x.f.0, etc. We do this for:
+// - access to a path
+// - initialization of a path
+// - moves of a path
+// FIXME: transitive rooting in a variable (path_begins_with_var)
+// Note that this step may not be entirely necessary!
+fn compute_transitive_paths<T: FactTypes>(
+    child_path: Vec<(T::Path, T::Path)>,
+    path_assigned_at_base: Vec<(T::Path, T::Point)>,
+    path_moved_at_base: Vec<(T::Path, T::Point)>,
+    path_accessed_at_base: Vec<(T::Path, T::Point)>,
+    path_is_var: Vec<(T::Path, T::Variable)>,
+) -> TransitivePaths<T> {
     let mut iteration = Iteration::new();
+    let child_path: Relation<(T::Path, T::Path)> = child_path.into();
 
-    // Relations
-    //let parent: Relation<(Path, Path)> = child.iter().map(|&(child_path, parent_path)| (parent_path, child_path)).collect();
-    let child: Relation<(T::Path, T::Path)> = ctx.child.into();
-    let path_belongs_to_var: Relation<(T::Path, T::Variable)> = ctx.path_belongs_to_var.into();
-    let initialized_at: Relation<(T::Path, T::Point)> = ctx.initialized_at.into();
-    let moved_out_at: Relation<(T::Path, T::Point)> = ctx.moved_out_at.into();
-    let _path_accessed_at: Relation<(T::Path, T::Point)> = ctx.path_accessed_at.into();
+    let ancestor_path = iteration.variable::<(T::Path, T::Path)>("ancestor");
 
+    // These are the actual targets:
+    let path_moved_at = iteration.variable::<(T::Path, T::Point)>("path_moved_at");
+    let path_assigned_at = iteration.variable::<(T::Path, T::Point)>("path_initialized_at");
+    let path_accessed_at = iteration.variable::<(T::Path, T::Point)>("path_accessed_at");
+    let path_begins_with_var = iteration.variable::<(T::Path, T::Variable)>("path_begins_with_var");
+
+    // ancestor_path(Parent, Child) :- child_path(Child, Parent).
+    ancestor_path.insert(child_path.iter().collect());
+
+    // path_moved_at(Path, Point) :- path_moved_at_base(path, point).
+    path_moved_at.insert(path_moved_at_base.into());
+
+    // path_assigned_at(Path, Point) :- path_assigned_at_base(path, Point).
+    path_assigned_at.insert(path_assigned_at_base.into());
+
+    // path_accessed_at(Path, Point) :- path_accessed_at_base(path, Point).
+    path_accessed_at.insert(path_accessed_at_base.into());
+
+    // path_begins_with_var(Path, Var) :- path_is_var(Path, Var).
+    path_begins_with_var.insert(path_is_var.into_iter().collect());
+
+    while iteration.changed() {
+        // ancestor(Grandparent, Child) :-
+        //    ancestor(Parent, Child),
+        //    child(Parent, Grandparent).
+        ancestor_path.from_join(
+            &ancestor_path,
+            &child_path,
+            |&_mother, &daughter, &grandmother| (grandmother, daughter),
+        );
+
+        // moving a path moves its children
+        // path_moved_at(Child, Point) :-
+        //     path_moved_at(Parent, Point),
+        //     ancestor_path(Parent, Child).
+        path_moved_at.from_join(&path_moved_at, &ancestor_path, |&_parent, &p, &child| {
+            (child, p)
+        });
+
+        // initialising x at p initialises all x:s children
+        // path_assigned_at(Child, point) :-
+        //     path_assigned_at(Parent, point),
+        //     ancestor_path(Parent, Child).
+        path_assigned_at.from_join(&path_assigned_at, &ancestor_path, |&_parent, &p, &child| {
+            (child, p)
+        });
+
+        // accessing x at p accesses all x:s children at p (actually,
+        // accesses should be maximally precise and this shouldn't happen?)
+        // path_accessed_at(Child, point) :-
+        //   path_accessed_at(Parent, point),
+        //   ancestor_path(Parent, Child).
+        path_accessed_at.from_join(&path_accessed_at, &ancestor_path, |&_parent, &p, &child| {
+            (child, p)
+        });
+
+        // path_begins_with_var(Child, Var) :-
+        //   path_begins_with_var(Parent, Var)
+        //   ancestor_path(Parent, Child).
+        path_begins_with_var.from_join(
+            &path_begins_with_var,
+            &ancestor_path,
+            |&_parent, &var, &child| (child, var),
+        );
+    }
+
+    TransitivePaths {
+        path_assigned_at: path_assigned_at.complete(),
+        path_moved_at: path_moved_at.complete(),
+        path_accessed_at: path_accessed_at.complete(),
+        path_begins_with_var: path_begins_with_var.complete(),
+    }
+}
+
+// Step 2: Compute path initialization and deinitialization across the CFG.
+fn compute_move_errors<T: FactTypes>(
+    ctx: TransitivePaths<T>,
+    cfg_edge: &Relation<(T::Point, T::Point)>,
+    output: &mut Output<T>,
+) -> InitializationStatus<T> {
+    let mut iteration = Iteration::new();
     // Variables
 
-    // var_maybe_initialized_on_exit(var, point): Upon leaving `point`, at least one part of the
-    // variable `var` might be initialized for some path through the CFG.
-    let var_maybe_initialized_on_exit =
-        iteration.variable::<(T::Variable, T::Point)>("var_maybe_initialized_on_exit");
+    // var_maybe_partly_initialized_on_exit(var, point): Upon leaving `point`,
+    // `var` is partially initialized for some path through the CFG, that is
+    // there has been an initialization of var, and var has not been moved in
+    // all paths through the CFG.
+    let var_maybe_partly_initialized_on_exit =
+        iteration.variable::<(T::Variable, T::Point)>("var_maybe_partly_initialized_on_exit");
 
-    // path_maybe_initialized_on_exit(path, point): Upon leaving `point`, the move path `path`
-    // might be *partially* initialized for some path through the CFG.
+    // path_maybe_initialized_on_exit(path, point): Upon leaving `point`, the
+    // move path `path` is initialized for some path through the CFG.
     let path_maybe_initialized_on_exit =
         iteration.variable::<(T::Path, T::Point)>("path_maybe_initialized_on_exit");
 
+    // path_maybe_uninitialized_on_exit(Path, Point): There exists at least one
+    // path through the CFG to Point such that `Path` has been moved out by the
+    // time we arrive at `Point` without it being re-initialized for sure.
+    let path_maybe_uninitialized_on_exit =
+        iteration.variable::<(T::Path, T::Point)>("path_maybe_deinitialized_on_exit");
+
+    // move_error(Path, Point): There is an access to `Path` at `Point`, but
+    // `Path` is potentially moved (or never initialised).
+    let move_error = iteration.variable::<(T::Path, T::Point)>("move_error");
+
     // Initial propagation of static relations
 
-    // path_maybe_initialized_on_exit(path, point) :- initialized_at(path, point).
-    path_maybe_initialized_on_exit.insert(initialized_at);
+    // path_maybe_initialized_on_exit(path, point) :- path_assigned_at(path, point).
+    path_maybe_initialized_on_exit.insert(ctx.path_assigned_at.clone());
+
+    // path_maybe_uninitialized_on_exit(path, point) :- path_moved_at(path, point).
+    path_maybe_uninitialized_on_exit.insert(
+        ctx.path_moved_at
+            .iter()
+            .map(|&(path, point)| (path, point))
+            .collect(),
+    );
 
     while iteration.changed() {
         // path_maybe_initialized_on_exit(path, point2) :-
         //     path_maybe_initialized_on_exit(path, point1),
         //     cfg_edge(point1, point2),
-        //     !moved_out_at(path, point2).
+        //     !path_moved_at(path, point2).
         path_maybe_initialized_on_exit.from_leapjoin(
             &path_maybe_initialized_on_exit,
             (
                 cfg_edge.extend_with(|&(_path, point1)| point1),
-                moved_out_at.extend_anti(|&(path, _point1)| path),
+                ctx.path_moved_at.extend_anti(|&(path, _point1)| path),
             ),
             |&(path, _point1), &point2| (path, point2),
         );
 
-        // path_maybe_initialized_on_exit(Mother, point) :-
-        //     path_maybe_initialized_on_exit(Daughter, point),
-        //     child(Daughter, Mother).
-        path_maybe_initialized_on_exit.from_join(
-            &path_maybe_initialized_on_exit,
-            &child,
-            |&_daughter, &point, &mother| (mother, point),
-        );
-
-        // TODO: the following lines contain things left to implement for move
-        // tracking:
-
-        // path_accessed :- path_accessed(path, point).
-        //
-        // -- transitive access of all children
-        // path_accessed(Child, point) :-
-        //     path_accessed(Mother, point),
-        //     parent(Mother, Child).
-
-        // Propagate across CFG edges:
-        // path_maybe_uninit(path, point2) :-
-        //     path_maybe_uninit(path, point1),
+        // path_maybe_uninitialized_on_exit(path, point2) :-
+        //     path_maybe_uninitialized_exit(path, point1),
         //     cfg_edge_(point1, point2)
-        //     !initialized_at(point1, point2).
+        //     !path_assigned_at(point1, point2).
+        path_maybe_uninitialized_on_exit.from_leapjoin(
+            &path_maybe_uninitialized_on_exit,
+            (
+                cfg_edge.extend_with(|&(_path, point1)| point1),
+                ctx.path_assigned_at.extend_anti(|&(path, _point1)| path),
+            ),
+            |&(path, _point1), &point2| (path, point2),
+        );
 
-        // Initial value (static).
-        // path_maybe_uninit(path, point) :- moved_out_at(path, point).
+        // var_maybe_partly_initialized_on_exit(var, point) :-
+        //     path_maybe_initialized_on_exit(path, point).
+        //     path_begins_with(path, var).
+        var_maybe_partly_initialized_on_exit.from_leapjoin(
+            &path_maybe_initialized_on_exit,
+            ctx.path_begins_with_var.extend_with(|&(path, _point)| path),
+            |&(_path, point), &var| (var, point),
+        );
 
-        // NOTE: Double join!
-        // errors(path, point) :-
-        //     path_maybe_uninit(path, point),
-        //     path_accessed(path, point).
+        // move_error(Path, TargetNode) :-
+        //   path_maybe_uninitialized_on_exit(Path, SourceNode),
+        //   cfg_edge(SourceNode, TargetNode),
+        //   path_accessed_at(Path, TargetNode).
+        move_error.from_leapjoin(
+            &path_maybe_uninitialized_on_exit,
+            (
+                cfg_edge.extend_with(|&(_path, source_node)| source_node),
+                ctx.path_accessed_at
+                    .extend_with(|&(path, _source_node)| path),
+            ),
+            |&(path, _source_node), &target_node| (path, target_node),
+        );
+    }
 
-        // END TODO
+    for &(path, location) in path_maybe_initialized_on_exit.complete().iter() {
+        output
+            .path_maybe_initialized_on_exit
+            .entry(location)
+            .or_default()
+            .push(path);
+    }
 
-        // var_maybe_initialized_on_exit(var, point) :-
-        //     path_maybe_initialized_on_exit(path, point),
-        //     path_belongs_to_var(path, var).
-        var_maybe_initialized_on_exit.from_join(
-            &path_maybe_initialized_on_exit,
-            &path_belongs_to_var,
-            |&_path, &point, &var| (var, point),
-        );
+    InitializationStatus {
+        var_maybe_partly_initialized_on_exit: var_maybe_partly_initialized_on_exit.complete(),
+        move_error: move_error.complete(),
     }
+}
+
+// Compute two things:
+//
+// - an over-approximation of the initialization of variables. This is used in
+//   the origin_live_on_entry computations to determine when a drop may happen; a
+//   definitely moved variable would not be actually dropped.
+// - move errors.
+//
+// The process is split into two stages:
+//
+// 1. Compute the transitive closure of path accesses. That is, accessing `f.a`
+//   would access `f.a.b`, etc.
+// 2. Use this to compute both paths that may be initialized and paths that may
+//   have been deinitialized, which in turn can be used to find move errors (an
+//   access to a path that may be deinitialized).
+pub(super) fn compute<T: FactTypes>(
+    ctx: InitializationContext<T>,
+    cfg_edge: &Relation<(T::Point, T::Point)>,
+    output: &mut Output<T>,
+) -> InitializationResult<T> {
+    let timer = Instant::now();
 
-    let var_maybe_initialized_on_exit = var_maybe_initialized_on_exit.complete();
+    let transitive_paths = compute_transitive_paths::<T>(
+        ctx.child_path,
+        ctx.path_assigned_at_base,
+        ctx.path_moved_at_base,
+        ctx.path_accessed_at_base,
+        ctx.path_is_var,
+    );
+    info!("initialization phase 1 completed: {:?}", timer.elapsed());
 
+    let InitializationStatus {
+        var_maybe_partly_initialized_on_exit,
+        move_error,
+    } = compute_move_errors::<T>(transitive_paths, cfg_edge, output);
     info!(
-        "init_var_maybe_initialized_on_exit() completed: {} tuples, {:?}",
-        var_maybe_initialized_on_exit.len(),
+        "initialization phase 2: {} move errors in {:?}",
+        move_error.elements.len(),
         timer.elapsed()
     );
 
     if output.dump_enabled {
-        let path_maybe_initialized_on_exit = path_maybe_initialized_on_exit.complete();
-        for &(path, location) in path_maybe_initialized_on_exit.iter() {
-            output
-                .path_maybe_initialized_at
-                .entry(location)
-                .or_default()
-                .push(path);
-        }
-
-        for &(var, location) in var_maybe_initialized_on_exit.iter() {
+        for &(var, location) in var_maybe_partly_initialized_on_exit.iter() {
             output
-                .var_maybe_initialized_on_exit
+                .var_maybe_partly_initialized_on_exit
                 .entry(location)
                 .or_default()
                 .push(var);
         }
     }
 
-    var_maybe_initialized_on_exit
+    InitializationResult(var_maybe_partly_initialized_on_exit, move_error)
 }
diff --git a/vendor/polonius-engine/src/output/liveness.rs b/vendor/polonius-engine/src/output/liveness.rs
index 292723e97c..f24f655297 100644
--- a/vendor/polonius-engine/src/output/liveness.rs
+++ b/vendor/polonius-engine/src/output/liveness.rs
@@ -18,149 +18,153 @@ use crate::output::{LivenessContext, Output};
 
 use datafrog::{Iteration, Relation, RelationLeaper};
 
-pub(super) fn compute_live_regions<T: FactTypes>(
+pub(super) fn compute_live_origins<T: FactTypes>(
     ctx: LivenessContext<T>,
-    cfg_edge_rel: &Relation<(T::Point, T::Point)>,
-    var_maybe_initialized_on_exit_rel: Relation<(T::Variable, T::Point)>,
+    cfg_edge: &Relation<(T::Point, T::Point)>,
+    var_maybe_partly_initialized_on_exit: Relation<(T::Variable, T::Point)>,
     output: &mut Output<T>,
 ) -> Vec<(T::Origin, T::Point)> {
     let timer = Instant::now();
     let mut iteration = Iteration::new();
 
     // Relations
-    let var_defined_rel: Relation<(T::Variable, T::Point)> = ctx.var_defined.into();
-    let cfg_edge_reverse_rel: Relation<(T::Point, T::Point)> = cfg_edge_rel
+    let var_defined_at: Relation<(T::Variable, T::Point)> = ctx.var_defined_at.into();
+    let cfg_edge_reverse: Relation<(T::Point, T::Point)> = cfg_edge
         .iter()
         .map(|&(point1, point2)| (point2, point1))
         .collect();
-    let var_uses_region_rel: Relation<(T::Variable, T::Origin)> = ctx.var_uses_region.into();
-    let var_drops_region_rel: Relation<(T::Variable, T::Origin)> = ctx.var_drops_region.into();
-    let var_drop_used_rel: Relation<((T::Variable, T::Point), ())> = ctx
-        .var_drop_used
+    let use_of_var_derefs_origin: Relation<(T::Variable, T::Origin)> =
+        ctx.use_of_var_derefs_origin.into();
+    let drop_of_var_derefs_origin: Relation<(T::Variable, T::Origin)> =
+        ctx.drop_of_var_derefs_origin.into();
+    let var_dropped_at: Relation<((T::Variable, T::Point), ())> = ctx
+        .var_dropped_at
         .into_iter()
         .map(|(var, point)| ((var, point), ()))
         .collect();
 
     // Variables
 
-    // `var_live`: variable `var` is live upon entry at `point`
-    let var_live_var = iteration.variable::<(T::Variable, T::Point)>("var_live_at");
-    // `var_drop_live`: variable `var` is drop-live (will be used for a drop) upon entry in `point`
-    let var_drop_live_var = iteration.variable::<(T::Variable, T::Point)>("var_drop_live_at");
+    // `var_live_on_entry`: variable `var` is live upon entry at `point`
+    let var_live_on_entry = iteration.variable::<(T::Variable, T::Point)>("var_live_on_entry");
+    // `var_drop_live_on_entry`: variable `var` is drop-live (will be used for a drop) upon entry in `point`
+    let var_drop_live_on_entry =
+        iteration.variable::<(T::Variable, T::Point)>("var_drop_live_on_entry");
 
     // This is what we are actually calculating:
-    let region_live_at_var = iteration.variable::<(T::Origin, T::Point)>("region_live_at");
+    let origin_live_on_entry = iteration.variable::<(T::Origin, T::Point)>("origin_live_on_entry");
 
-    // This propagates the relation `var_live(var, point) :- var_used(var, point)`:
-    var_live_var.insert(ctx.var_used.into());
+    // This propagates the relation `var_live_on_entry(var, point) :- var_used_at(var, point)`:
+    var_live_on_entry.insert(ctx.var_used_at.into());
 
-    // var_maybe_initialized_on_entry(var, point2) :-
-    //     var_maybe_initialized_on_exit(var, point1),
+    // var_maybe_partly_initialized_on_entry(var, point2) :-
+    //     var_maybe_partly_initialized_on_exit(var, point1),
     //     cfg_edge(point1, point2).
-    let var_maybe_initialized_on_entry = Relation::from_leapjoin(
-        &var_maybe_initialized_on_exit_rel,
-        cfg_edge_rel.extend_with(|&(_var, point1)| point1),
+    let var_maybe_partly_initialized_on_entry = Relation::from_leapjoin(
+        &var_maybe_partly_initialized_on_exit,
+        cfg_edge.extend_with(|&(_var, point1)| point1),
         |&(var, _point1), &point2| ((var, point2), ()),
     );
 
-    // var_drop_live(var, point) :-
-    //     var_drop_used(var, point),
-    //     var_maybe_initialzed_on_entry(var, point).
-    var_drop_live_var.insert(Relation::from_join(
-        &var_drop_used_rel,
-        &var_maybe_initialized_on_entry,
+    // var_drop_live_at(var, point) :-
+    //     var_dropped_at(var, point),
+    //     var_maybe_partly_initialzed_on_entry(var, point).
+    var_drop_live_on_entry.insert(Relation::from_join(
+        &var_dropped_at,
+        &var_maybe_partly_initialized_on_entry,
         |&(var, point), _, _| (var, point),
     ));
 
     while iteration.changed() {
-        // region_live_at(origin, point) :-
-        //   var_drop_live(var, point),
-        //   var_drops_region(var, origin).
-        region_live_at_var.from_join(
-            &var_drop_live_var,
-            &var_drops_region_rel,
+        // origin_live_on_entry(origin, point) :-
+        //   var_drop_live_on_entry(var, point),
+        //   drop_of_var_derefs_origin(var, origin).
+        origin_live_on_entry.from_join(
+            &var_drop_live_on_entry,
+            &drop_of_var_derefs_origin,
             |_var, &point, &origin| (origin, point),
         );
 
-        // region_live_at(origin, point) :-
-        //   var_live(var, point),
-        //   var_uses_region(var, origin).
-        region_live_at_var.from_join(
-            &var_live_var,
-            &var_uses_region_rel,
+        // origin_live_on_entry(origin, point) :-
+        //   var_live_on_entry(var, point),
+        //   use_of_var_derefs_origin(var, origin).
+        origin_live_on_entry.from_join(
+            &var_live_on_entry,
+            &use_of_var_derefs_origin,
             |_var, &point, &origin| (origin, point),
         );
 
-        // var_live(var, point1) :-
-        //     var_live(var, point2),
+        // var_live_on_entry(var, point1) :-
+        //     var_live_on_entry(var, point2),
         //     cfg_edge(point1, point2),
         //     !var_defined(var, point1).
-        var_live_var.from_leapjoin(
-            &var_live_var,
+        var_live_on_entry.from_leapjoin(
+            &var_live_on_entry,
             (
-                var_defined_rel.extend_anti(|&(var, _point2)| var),
-                cfg_edge_reverse_rel.extend_with(|&(_var, point2)| point2),
+                var_defined_at.extend_anti(|&(var, _point2)| var),
+                cfg_edge_reverse.extend_with(|&(_var, point2)| point2),
             ),
             |&(var, _point2), &point1| (var, point1),
         );
 
-        // var_drop_live(var, point1) :-
-        //     var_drop_live(var, point2),
-        //     cfg_edge(point1, point2),
-        //     !var_defined(var, point1)
-        //     var_maybe_initialized_on_exit(var, point1).
-        //
-        // Extend `point1` with `var:s` from `point2` such that `var` is not in `point2`,
-        // there is an edge from `point1` to `point2`
-        var_drop_live_var.from_leapjoin(
-            &var_drop_live_var,
+        // var_drop_live_on_entry(Var, SourceNode) :-
+        //   var_drop_live_on_entry(Var, TargetNode),
+        //   cfg_edge(SourceNode, TargetNode),
+        //   !var_defined_at(Var, SourceNode),
+        //   var_maybe_partly_initialized_on_exit(Var, SourceNode).
+        var_drop_live_on_entry.from_leapjoin(
+            &var_drop_live_on_entry,
             (
-                var_defined_rel.extend_anti(|&(var, _point2)| var),
-                cfg_edge_reverse_rel.extend_with(|&(_var, point2)| point2),
-                var_maybe_initialized_on_exit_rel.extend_with(|&(var, _point2)| var),
+                var_defined_at.extend_anti(|&(var, _target_node)| var),
+                cfg_edge_reverse.extend_with(|&(_var, target_node)| target_node),
+                var_maybe_partly_initialized_on_exit.extend_with(|&(var, _target_node)| var),
             ),
-            |&(var, _point2), &point1| (var, point1),
+            |&(var, _targetnode), &source_node| (var, source_node),
         );
     }
 
-    let region_live_at = region_live_at_var.complete();
+    let origin_live_on_entry = origin_live_on_entry.complete();
 
     info!(
-        "compute_live_regions() completed: {} tuples, {:?}",
-        region_live_at.len(),
+        "compute_live_origins() completed: {} tuples, {:?}",
+        origin_live_on_entry.len(),
         timer.elapsed(),
     );
 
     if output.dump_enabled {
-        let var_drop_live_at = var_drop_live_var.complete();
-        for &(var, location) in var_drop_live_at.iter() {
+        let var_drop_live_on_entry = var_drop_live_on_entry.complete();
+        for &(var, location) in var_drop_live_on_entry.iter() {
             output
-                .var_drop_live_at
+                .var_drop_live_on_entry
                 .entry(location)
                 .or_default()
                 .push(var);
         }
 
-        let var_live_at = var_live_var.complete();
-        for &(var, location) in var_live_at.iter() {
-            output.var_live_at.entry(location).or_default().push(var);
+        let var_live_on_entry = var_live_on_entry.complete();
+        for &(var, location) in var_live_on_entry.iter() {
+            output
+                .var_live_on_entry
+                .entry(location)
+                .or_default()
+                .push(var);
         }
     }
 
-    region_live_at.elements
+    origin_live_on_entry.elements
 }
 
 pub(super) fn make_universal_regions_live<T: FactTypes>(
-    region_live_at: &mut Vec<(T::Origin, T::Point)>,
+    origin_live_on_entry: &mut Vec<(T::Origin, T::Point)>,
     cfg_node: &BTreeSet<T::Point>,
     universal_regions: &[T::Origin],
 ) {
     debug!("make_universal_regions_live()");
 
-    region_live_at.reserve(universal_regions.len() * cfg_node.len());
+    origin_live_on_entry.reserve(universal_regions.len() * cfg_node.len());
     for &origin in universal_regions.iter() {
         for &point in cfg_node.iter() {
-            region_live_at.push((origin, point));
+            origin_live_on_entry.push((origin, point));
         }
     }
 }
diff --git a/vendor/polonius-engine/src/output/location_insensitive.rs b/vendor/polonius-engine/src/output/location_insensitive.rs
index 23153559bc..d63f04bef5 100644
--- a/vendor/polonius-engine/src/output/location_insensitive.rs
+++ b/vendor/polonius-engine/src/output/location_insensitive.rs
@@ -15,14 +15,14 @@ use crate::facts::FactTypes;
 use crate::output::{Context, Output};
 
 pub(super) fn compute<T: FactTypes>(
-    ctx: &Context<T>,
+    ctx: &Context<'_, T>,
     result: &mut Output<T>,
 ) -> Relation<(T::Loan, T::Point)> {
     let timer = Instant::now();
 
     let potential_errors = {
         // Static inputs
-        let region_live_at = &ctx.region_live_at;
+        let origin_live_on_entry = &ctx.origin_live_on_entry;
         let invalidates = &ctx.invalidates;
 
         // Create a new iteration context, ...
@@ -64,7 +64,7 @@ pub(super) fn compute<T: FactTypes>(
 
             // borrow_live_at(loan, point) :-
             //   requires(origin, loan),
-            //   region_live_at(origin, point)
+            //   origin_live_on_entry(origin, point)
             //
             // potential_errors(loan, point) :-
             //   invalidates(loan, point),
@@ -76,7 +76,7 @@ pub(super) fn compute<T: FactTypes>(
             potential_errors.from_leapjoin(
                 &requires,
                 (
-                    region_live_at.extend_with(|&(origin, _loan)| origin),
+                    origin_live_on_entry.extend_with(|&(origin, _loan)| origin),
                     invalidates.extend_with(|&(_origin, loan)| loan),
                 ),
                 |&(_origin, loan), &point| (loan, point),
diff --git a/vendor/polonius-engine/src/output/mod.rs b/vendor/polonius-engine/src/output/mod.rs
index c7c3421d04..a1c81911d9 100644
--- a/vendor/polonius-engine/src/output/mod.rs
+++ b/vendor/polonius-engine/src/output/mod.rs
@@ -77,6 +77,7 @@ impl ::std::str::FromStr for Algorithm {
 pub struct Output<T: FactTypes> {
     pub errors: FxHashMap<T::Point, Vec<T::Loan>>,
     pub subset_errors: FxHashMap<T::Point, BTreeSet<(T::Origin, T::Origin)>>,
+    pub move_errors: FxHashMap<T::Point, Vec<T::Path>>,
 
     pub dump_enabled: bool,
 
@@ -84,39 +85,39 @@ pub struct Output<T: FactTypes> {
     pub borrow_live_at: FxHashMap<T::Point, Vec<T::Loan>>,
     pub restricts: FxHashMap<T::Point, BTreeMap<T::Origin, BTreeSet<T::Loan>>>,
     pub restricts_anywhere: FxHashMap<T::Origin, BTreeSet<T::Loan>>,
-    pub region_live_at: FxHashMap<T::Point, Vec<T::Origin>>,
+    pub origin_live_on_entry: FxHashMap<T::Point, Vec<T::Origin>>,
     pub invalidates: FxHashMap<T::Point, Vec<T::Loan>>,
     pub subset: FxHashMap<T::Point, BTreeMap<T::Origin, BTreeSet<T::Origin>>>,
     pub subset_anywhere: FxHashMap<T::Origin, BTreeSet<T::Origin>>,
-    pub var_live_at: FxHashMap<T::Point, Vec<T::Variable>>,
-    pub var_drop_live_at: FxHashMap<T::Point, Vec<T::Variable>>,
-    pub path_maybe_initialized_at: FxHashMap<T::Point, Vec<T::Path>>,
-    pub var_maybe_initialized_on_exit: FxHashMap<T::Point, Vec<T::Variable>>,
+    pub var_live_on_entry: FxHashMap<T::Point, Vec<T::Variable>>,
+    pub var_drop_live_on_entry: FxHashMap<T::Point, Vec<T::Variable>>,
+    pub path_maybe_initialized_on_exit: FxHashMap<T::Point, Vec<T::Path>>,
     pub known_contains: FxHashMap<T::Origin, BTreeSet<T::Loan>>,
+    pub var_maybe_partly_initialized_on_exit: FxHashMap<T::Point, Vec<T::Variable>>,
 }
 
 /// Subset of `AllFacts` dedicated to initialization
 struct InitializationContext<T: FactTypes> {
-    child: Vec<(T::Path, T::Path)>,
-    path_belongs_to_var: Vec<(T::Path, T::Variable)>,
-    initialized_at: Vec<(T::Path, T::Point)>,
-    moved_out_at: Vec<(T::Path, T::Point)>,
-    path_accessed_at: Vec<(T::Path, T::Point)>,
+    child_path: Vec<(T::Path, T::Path)>,
+    path_is_var: Vec<(T::Path, T::Variable)>,
+    path_assigned_at_base: Vec<(T::Path, T::Point)>,
+    path_moved_at_base: Vec<(T::Path, T::Point)>,
+    path_accessed_at_base: Vec<(T::Path, T::Point)>,
 }
 
 /// Subset of `AllFacts` dedicated to liveness
 struct LivenessContext<T: FactTypes> {
-    var_used: Vec<(T::Variable, T::Point)>,
-    var_defined: Vec<(T::Variable, T::Point)>,
-    var_drop_used: Vec<(T::Variable, T::Point)>,
-    var_uses_region: Vec<(T::Variable, T::Origin)>,
-    var_drops_region: Vec<(T::Variable, T::Origin)>,
+    var_used_at: Vec<(T::Variable, T::Point)>,
+    var_defined_at: Vec<(T::Variable, T::Point)>,
+    var_dropped_at: Vec<(T::Variable, T::Point)>,
+    use_of_var_derefs_origin: Vec<(T::Variable, T::Origin)>,
+    drop_of_var_derefs_origin: Vec<(T::Variable, T::Origin)>,
 }
 
 /// Subset of `AllFacts` dedicated to borrow checking, and data ready to use by the variants
 struct Context<'ctx, T: FactTypes> {
     // `Relation`s used as static inputs, by all variants
-    region_live_at: Relation<(T::Origin, T::Point)>,
+    origin_live_on_entry: Relation<(T::Origin, T::Point)>,
     invalidates: Relation<(T::Loan, T::Point)>,
 
     // static inputs used via `Variable`s, by all variants
@@ -156,32 +157,35 @@ impl<T: FactTypes> Output<T> {
 
         // 1) Initialization
         let initialization_ctx = InitializationContext {
-            child: all_facts.child.clone(),
-            path_belongs_to_var: all_facts.path_belongs_to_var.clone(),
-            initialized_at: all_facts.initialized_at.clone(),
-            moved_out_at: all_facts.moved_out_at.clone(),
-            path_accessed_at: all_facts.path_accessed_at.clone(),
+            child_path: all_facts.child_path.clone(),
+            path_is_var: all_facts.path_is_var.clone(),
+            path_assigned_at_base: all_facts.path_assigned_at_base.clone(),
+            path_moved_at_base: all_facts.path_moved_at_base.clone(),
+            path_accessed_at_base: all_facts.path_accessed_at_base.clone(),
         };
 
-        let var_maybe_initialized_on_exit = initialization::init_var_maybe_initialized_on_exit(
-            initialization_ctx,
-            &cfg_edge,
-            &mut result,
-        );
+        let initialization::InitializationResult::<T>(
+            var_maybe_partly_initialized_on_exit,
+            move_errors,
+        ) = initialization::compute(initialization_ctx, &cfg_edge, &mut result);
+
+        for &(path, location) in move_errors.iter() {
+            result.move_errors.entry(location).or_default().push(path);
+        }
 
         // 2) Liveness
         let liveness_ctx = LivenessContext {
-            var_used: all_facts.var_used.clone(),
-            var_defined: all_facts.var_defined.clone(),
-            var_drop_used: all_facts.var_drop_used.clone(),
-            var_uses_region: all_facts.var_uses_region.clone(),
-            var_drops_region: all_facts.var_drops_region.clone(),
+            var_used_at: all_facts.var_used_at.clone(),
+            var_defined_at: all_facts.var_defined_at.clone(),
+            var_dropped_at: all_facts.var_dropped_at.clone(),
+            use_of_var_derefs_origin: all_facts.use_of_var_derefs_origin.clone(),
+            drop_of_var_derefs_origin: all_facts.drop_of_var_derefs_origin.clone(),
         };
 
-        let mut region_live_at = liveness::compute_live_regions(
+        let mut origin_live_on_entry = liveness::compute_live_origins(
             liveness_ctx,
             &cfg_edge,
-            var_maybe_initialized_on_exit,
+            var_maybe_partly_initialized_on_exit,
             &mut result,
         );
 
@@ -192,7 +196,7 @@ impl<T: FactTypes> Output<T> {
             .collect();
 
         liveness::make_universal_regions_live::<T>(
-            &mut region_live_at,
+            &mut origin_live_on_entry,
             &cfg_node,
             &all_facts.universal_region,
         );
@@ -209,7 +213,7 @@ impl<T: FactTypes> Output<T> {
         // we actually need to compute the full analysis. If these facts happened to
         // be recorded in separate MIR walks, we might also avoid generating those facts.
 
-        let region_live_at = region_live_at.into();
+        let origin_live_on_entry = origin_live_on_entry.into();
 
         // TODO: also flip the order of this relation's arguments in rustc
         // from `invalidates(point, loan)` to `invalidates(loan, point)`.
@@ -248,7 +252,7 @@ impl<T: FactTypes> Output<T> {
 
         // Ask the variants to compute errors in their own way
         let mut ctx = Context {
-            region_live_at,
+            origin_live_on_entry,
             invalidates,
             cfg_edge,
             cfg_node: &cfg_node,
@@ -309,7 +313,7 @@ impl<T: FactTypes> Output<T> {
                 for &(loan, point) in naive_errors.iter() {
                     naive_errors_by_point
                         .entry(point)
-                        .or_insert(Vec::new())
+                        .or_insert_with(Vec::new)
                         .push(loan);
                 }
 
@@ -317,7 +321,7 @@ impl<T: FactTypes> Output<T> {
                 for &(loan, point) in opt_errors.iter() {
                     opt_errors_by_point
                         .entry(point)
-                        .or_insert(Vec::new())
+                        .or_insert_with(Vec::new)
                         .push(loan);
                 }
 
@@ -342,9 +346,9 @@ impl<T: FactTypes> Output<T> {
 
         // Record more debugging info when asked to do so
         if dump_enabled {
-            for &(origin, location) in ctx.region_live_at.iter() {
+            for &(origin, location) in ctx.origin_live_on_entry.iter() {
                 result
-                    .region_live_at
+                    .origin_live_on_entry
                     .entry(location)
                     .or_default()
                     .push(origin);
@@ -366,7 +370,7 @@ impl<T: FactTypes> Output<T> {
     /// the full list of placeholder loans contained by the placeholder origins.
     fn compute_known_contains(
         known_subset: &Relation<(T::Origin, T::Origin)>,
-        placeholder: &Vec<(T::Origin, T::Loan)>,
+        placeholder: &[(T::Origin, T::Loan)],
     ) -> Relation<(T::Origin, T::Loan)> {
         let mut iteration = datafrog::Iteration::new();
         let known_contains = iteration.variable("known_contains");
@@ -397,14 +401,15 @@ impl<T: FactTypes> Output<T> {
             borrow_live_at: FxHashMap::default(),
             restricts: FxHashMap::default(),
             restricts_anywhere: FxHashMap::default(),
-            region_live_at: FxHashMap::default(),
+            origin_live_on_entry: FxHashMap::default(),
             invalidates: FxHashMap::default(),
+            move_errors: FxHashMap::default(),
             subset: FxHashMap::default(),
             subset_anywhere: FxHashMap::default(),
-            var_live_at: FxHashMap::default(),
-            var_drop_live_at: FxHashMap::default(),
-            path_maybe_initialized_at: FxHashMap::default(),
-            var_maybe_initialized_on_exit: FxHashMap::default(),
+            var_live_on_entry: FxHashMap::default(),
+            var_drop_live_on_entry: FxHashMap::default(),
+            path_maybe_initialized_on_exit: FxHashMap::default(),
+            var_maybe_partly_initialized_on_exit: FxHashMap::default(),
             known_contains: FxHashMap::default(),
         }
     }
@@ -436,7 +441,7 @@ impl<T: FactTypes> Output<T> {
 
     pub fn regions_live_at(&self, location: T::Point) -> &[T::Origin] {
         assert!(self.dump_enabled);
-        match self.region_live_at.get(&location) {
+        match self.origin_live_on_entry.get(&location) {
             Some(v) => v,
             None => &[],
         }
diff --git a/vendor/polonius-engine/src/output/naive.rs b/vendor/polonius-engine/src/output/naive.rs
index d5811c0002..14600d3365 100644
--- a/vendor/polonius-engine/src/output/naive.rs
+++ b/vendor/polonius-engine/src/output/naive.rs
@@ -17,7 +17,7 @@ use crate::facts::FactTypes;
 use crate::output::{Context, Output};
 
 pub(super) fn compute<T: FactTypes>(
-    ctx: &Context<T>,
+    ctx: &Context<'_, T>,
     result: &mut Output<T>,
 ) -> (
     Relation<(T::Loan, T::Point)>,
@@ -27,7 +27,7 @@ pub(super) fn compute<T: FactTypes>(
 
     let (errors, subset_errors) = {
         // Static inputs
-        let region_live_at_rel = &ctx.region_live_at;
+        let origin_live_on_entry_rel = &ctx.origin_live_on_entry;
         let cfg_edge_rel = &ctx.cfg_edge;
         let cfg_node = ctx.cfg_node;
         let killed_rel = &ctx.killed;
@@ -53,10 +53,10 @@ pub(super) fn compute<T: FactTypes>(
         // different index for `requires`.
         let requires_op = iteration.variable_indistinct("requires_op");
 
-        // we need `region_live_at` in both variable and relation forms.
+        // we need `origin_live_on_entry` in both variable and relation forms.
         // (respectively, for the regular join and the leapjoin).
-        let region_live_at_var =
-            iteration.variable::<((T::Origin, T::Point), ())>("region_live_at");
+        let origin_live_on_entry_var =
+            iteration.variable::<((T::Origin, T::Point), ())>("origin_live_on_entry");
 
         // output relations: illegal accesses errors, and illegal subset relations errors
         let errors = iteration.variable("errors");
@@ -70,8 +70,8 @@ pub(super) fn compute<T: FactTypes>(
                 .iter()
                 .map(|&(loan, point)| ((loan, point), ())),
         );
-        region_live_at_var.extend(
-            region_live_at_rel
+        origin_live_on_entry_var.extend(
+            origin_live_on_entry_rel
                 .iter()
                 .map(|&(origin, point)| ((origin, point), ())),
         );
@@ -131,14 +131,14 @@ pub(super) fn compute<T: FactTypes>(
             // subset(origin1, origin2, point2) :-
             //   subset(origin1, origin2, point1),
             //   cfg_edge(point1, point2),
-            //   region_live_at(origin1, point2),
-            //   region_live_at(origin2, point2).
+            //   origin_live_on_entry(origin1, point2),
+            //   origin_live_on_entry(origin2, point2).
             subset.from_leapjoin(
                 &subset,
                 (
                     cfg_edge_rel.extend_with(|&(_origin1, _origin2, point1)| point1),
-                    region_live_at_rel.extend_with(|&(origin1, _origin2, _point1)| origin1),
-                    region_live_at_rel.extend_with(|&(_origin1, origin2, _point1)| origin2),
+                    origin_live_on_entry_rel.extend_with(|&(origin1, _origin2, _point1)| origin1),
+                    origin_live_on_entry_rel.extend_with(|&(_origin1, origin2, _point1)| origin2),
                 ),
                 |&(origin1, origin2, _point1), &point2| (origin1, origin2, point2),
             );
@@ -159,23 +159,23 @@ pub(super) fn compute<T: FactTypes>(
             //   requires(origin, loan, point1),
             //   !killed(loan, point1),
             //   cfg_edge(point1, point2),
-            //   region_live_at(origin, point2).
+            //   origin_live_on_entry(origin, point2).
             requires.from_leapjoin(
                 &requires,
                 (
                     killed_rel.filter_anti(|&(_origin, loan, point1)| (loan, point1)),
                     cfg_edge_rel.extend_with(|&(_origin, _loan, point1)| point1),
-                    region_live_at_rel.extend_with(|&(origin, _loan, _point1)| origin),
+                    origin_live_on_entry_rel.extend_with(|&(origin, _loan, _point1)| origin),
                 ),
                 |&(origin, loan, _point1), &point2| (origin, loan, point2),
             );
 
             // borrow_live_at(loan, point) :-
             //   requires(origin, loan, point),
-            //   region_live_at(origin, point).
+            //   origin_live_on_entry(origin, point).
             borrow_live_at.from_join(
                 &requires_op,
-                &region_live_at_var,
+                &origin_live_on_entry_var,
                 |&(_origin, point), &loan, _| ((loan, point), ()),
             );
 
diff --git a/vendor/pulldown-cmark-0.5.3/.cargo-checksum.json b/vendor/pulldown-cmark-0.5.3/.cargo-checksum.json
deleted file mode 100644
index c1c41a38d6..0000000000
--- a/vendor/pulldown-cmark-0.5.3/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"CONTRIBUTING.md":"3c894fb96ad94e1f46328df6857016aab02e185f9d78dc8b767ff43753a24c20","Cargo.toml":"6f1b28563af031eebfad22255a16076e8540186c17e8f2ed96e04e66fb26cf1b","LICENSE":"c4f10f55904bdb9f27d3fbf94c354926d6cfe8b982276e556238c258941b243b","README.md":"80117dca5685c67bb42621f6479ad23cdca8e721e93554fa8d40e8d791c197ba","azure-pipelines.yml":"c1017a5c1d032f26337809d6b639e0413abdb680ffe040b9f66857e2ba3abd56","benches/html_rendering.rs":"4248419563483370c1b74858aead08728eb92003dae74c78d66d36cd0db81640","benches/lib.rs":"deae94b235b5fe06d4112d258ae6b2d4720225c0f5d26e6192e7c7b48e865909","build.rs":"7f4e1517188518c54676220e277facb7dce3f944521b29d2da5c3be28950cedb","examples/event-filter.rs":"85ba4695e8e83c9c59b7b675a2fb8eb40ed5e2b56bc05679732f6e2f9589106d","examples/string-to-string.rs":"864aed51aaa8ffd556995fa937ea99b98d78feeb7bf7ae4b2872c749fb02b386","specs/footnotes.txt":"8593e211895904e861c85f786552f3dc2fe3d9eaa73c36ec1d2731416a8dbe4a","specs/regression.txt":"96f9ad93d56127995c988fcaab7f7ffff1f902c48e3f8d502cc50a57b8954db6","specs/table.txt":"2350d2fa339b2b1383e5ba3ded1120b62697687d69db25fb76f307006b75bf88","src/entities.rs":"1602f3c4d22c0b0e3a4a08467a50bf9d0c27aadf2e5661b15a2cda20da0895a9","src/escape.rs":"fd84eae343220f603ee0cca77e5d15494a4a23d5525a4123ca1f8b87f3e48c51","src/html.rs":"cf967e35c0061a09744ff823f5035eb5d7413f1a756fc568cfda97a6194cec51","src/lib.rs":"7bcb7e34f1463b3389215bf180a25d8ecc557cc01e6e62657395a0e0a892b07c","src/linklabel.rs":"9132fbc16f9612bad73a0344f237b10262390818e3b7792a26cd0824979d63f6","src/main.rs":"43694f3ad6469c86465525ea17b4eac344a9f8277c15c3665555d3405a0a1042","src/parse.rs":"92384111494f700d82862ac0c96e88a525bcdf3382e62ca2e48485560f3b4cdc","src/puncttable.rs":"ddb35138b537c00dd2003daba2d07f1bc8154059a745d4e18b74732614b20f1c","src/scanners.rs":"22ae741756ac43b6e00ef3f4ca5a64764b497fed1a1d5f55445728da5db92988","src/simd.rs":"669d4627dbd3d54262f02ba446afe405a4f68e305ad0903e598f8e79473bdbeb","src/strings.rs":"163455a9f3c3585806604a4529c6b34b4f49ee35367d17efe7c8b82d03837d4a","src/tree.rs":"fb747e6dd975aabd9d07b19ea986fe601985ff77c9beb886f8015b5687fbc4b8","tests/errors.rs":"3677dc76c0ec85b3b65389fe39a82cd7ab9420dd5e2cc5b5b11f490fde2f5fbf","tests/html.rs":"6a2f66f01248e6b1bdd3ec2d5454766ceb617e8e89ab7eb725635c78c77f243f","tests/lib.rs":"879124c4a0c5e253571b4acf13cec3b329ddb0f165c31b4a85e90b0a8aff385b","tests/suite/footnotes.rs":"955ab3bf6446a92ee28152ed952a6169da4b299dbe60ae6fbc6a5145b32f4d7b","tests/suite/gfm_strikethrough.rs":"becabc2f5b0d2dd584908047501c91cc16f62c6533e9a362ed39140670b96ae1","tests/suite/gfm_table.rs":"ab4e2ba5efd774f5c659320ebe43c5f80e5d394d5dfcca04b01b67567565090d","tests/suite/gfm_tasklist.rs":"f20f39ab9bdb4e07708104036a4be39952bebc98779d44a5b7cc2e3f41598575","tests/suite/mod.rs":"c1a6b6ad191830a7ca99b96ff9f8cb4bdb101674679720907902928ada8dc412","tests/suite/regression.rs":"4572e12cb9c1828fc0ab069f92b0538d718df5341c32b80833bbed30bae8730c","tests/suite/spec.rs":"1e88bae48c1da50d61533e6078d13f82c0f9c2d5e744113616b211b37d45649d","tests/suite/table.rs":"b4f28d6a1390a302415cb48babd11ec2ec7054b43a671edbd42d6f8c310983de","third_party/CommonMark/LICENSE":"3026a329eb5a8c5814f48bb1047970ace2a7d877c4973401a24b5563d76e345a","third_party/CommonMark/README.google":"a89d8075d323bda7871772288f3c43be1efb0d1bee2bb25b592278e45bc5c926","third_party/CommonMark/spec.txt":"6b5f4d83a2a9ca7735f7697bf3c7b161bcb0fd409109cc997857e8cfae4d2c3a","third_party/GitHub/LICENSE":"c22e885f33b821bddb24cf007145e5540655b6c0f403e49e6c76a93c28e6d9a9","third_party/GitHub/gfm_strikethrough.txt":"2a9e0579e140682eb5c25e649ddddf2d2221245eb6eecf2bf290f043ac15ded3","third_party/GitHub/gfm_table.txt":"b41089b1c7a1c6926b7e757b7cb3ae911640c1738ea27e0dbd2a8a383fdcf79b","third_party/GitHub/gfm_tasklist.txt":"f1e25d27b1cb57188460996aea745eadbd979145b7e647662ab62c595776c259","third_party/GitHub/spec.txt":"184896f619dee0631ed61f0f9e6c4bfcb3b885004b9cffb0f1ee3668245fbd1a","third_party/xi-editor/LICENSE":"8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac","third_party/xi-editor/crdt.md":"e114174910d1a5f9a08bbd28a333a7d77956e4b391169ea96da2f971db6a9eaf","tools/mk_entities.py":"e7ff10da09231f00aa5bf2c109d37327aa0e0bfbb22581176d81bf88927536ba","tools/mk_puncttable.py":"0bd28aa46d28325a91aa5a28a04e0f9439ddad5687bbc56131f10da34497537d"},"package":"77043da1282374688ee212dc44b3f37ff929431de9c9adc3053bd3cee5630357"}
\ No newline at end of file
diff --git a/vendor/pulldown-cmark-0.5.3/CONTRIBUTING.md b/vendor/pulldown-cmark-0.5.3/CONTRIBUTING.md
deleted file mode 100644
index b198611dbe..0000000000
--- a/vendor/pulldown-cmark-0.5.3/CONTRIBUTING.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Want to contribute? Great! First, read this page.
-
-### Before you contribute
-Before you start working on a larger contribution, you should get in touch with
-us first through the issue tracker with your idea so that we can help out and
-possibly guide you. Coordinating up front makes it much easier to avoid
-frustration later on.
-
-### Code reviews
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose.
diff --git a/vendor/pulldown-cmark-0.5.3/Cargo.toml b/vendor/pulldown-cmark-0.5.3/Cargo.toml
deleted file mode 100644
index ddce7b8aa3..0000000000
--- a/vendor/pulldown-cmark-0.5.3/Cargo.toml
+++ /dev/null
@@ -1,64 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-edition = "2018"
-name = "pulldown-cmark"
-version = "0.5.3"
-authors = ["Raph Levien <raph.levien@gmail.com>", "Marcus Klaas de Vries <mail@marcusklaas.nl>"]
-build = "build.rs"
-description = "A pull parser for CommonMark"
-readme = "README.md"
-keywords = ["markdown", "commonmark"]
-categories = ["text-processing"]
-license = "MIT"
-repository = "https://github.com/raphlinus/pulldown-cmark"
-
-[[bin]]
-name = "pulldown-cmark"
-doc = false
-required-features = ["getopts"]
-
-[[bench]]
-name = "html_rendering"
-harness = false
-[dependencies.bitflags]
-version = "1.1"
-
-[dependencies.getopts]
-version = "0.2"
-optional = true
-
-[dependencies.memchr]
-version = "2.2"
-
-[dependencies.unicase]
-version = "2.4"
-[dev-dependencies.criterion]
-version = "0.2"
-
-[dev-dependencies.html5ever]
-version = "0.23"
-
-[dev-dependencies.lazy_static]
-version = "1.3"
-
-[dev-dependencies.regex]
-version = "1.1"
-
-[dev-dependencies.tendril]
-version = "0.4"
-
-[features]
-default = ["getopts"]
-gen-tests = []
-simd = []
diff --git a/vendor/pulldown-cmark-0.5.3/README.md b/vendor/pulldown-cmark-0.5.3/README.md
deleted file mode 100644
index 7fcfdae3d3..0000000000
--- a/vendor/pulldown-cmark-0.5.3/README.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# pulldown-cmark
-
-[![Build Status](https://dev.azure.com/raphlinus/pulldown-cmark/_apis/build/status/pulldown-cmark-CI?branchName=master)](https://dev.azure.com/raphlinus/pulldown-cmark/_build/latest?definitionId=2&branchName=master)
-[![Docs](https://docs.rs/pulldown-cmark/badge.svg)](https://docs.rs/pulldown-cmark)
-[![Crates.io](https://img.shields.io/crates/v/pulldown-cmark.svg?maxAge=2592000)](https://crates.io/crates/pulldown-cmark)
-
-[Documentation](https://docs.rs/pulldown-cmark/)
-
-This library is a pull parser for [CommonMark](http://commonmark.org/), written
-in [Rust](http://www.rust-lang.org/). It comes with a simple command-line tool,
-useful for rendering to HTML, and is also designed to be easy to use from as
-a library.
-
-It is designed to be:
-
-* Fast; a bare minimum of allocation and copying
-* Safe; written in pure Rust with no unsafe blocks
-* Versatile; in particular source-maps are supported
-* Correct; the goal is 100% compliance with the [CommonMark spec](http://spec.commonmark.org/)
-
-Further, it optionally supports parsing footnotes,
-[Github flavored tables](https://github.github.com/gfm/#tables-extension-),
-[Github flavored task lists](https://github.github.com/gfm/#task-list-items-extension-) and
-[strikethrough](https://github.github.com/gfm/#strikethrough-extension-).
-
-## Why a pull parser?
-
-There are many parsers for Markdown and its variants, but to my knowledge none
-use pull parsing. Pull parsing has become popular for XML, especially for
-memory-conscious applications, because it uses dramatically less memory than
-constructing a document tree, but is much easier to use than push parsers. Push
-parsers are notoriously difficult to use, and also often error-prone because of
-the need for user to delicately juggle state in a series of callbacks.
-
-In a clean design, the parsing and rendering stages are neatly separated, but
-this is often sacrificed in the name of performance and expedience. Many Markdown
-implementations mix parsing and rendering together, and even designs that try
-to separate them (such as the popular [hoedown](https://github.com/hoedown/hoedown)),
-make the assumption that the rendering process can be fully represented as a
-serialized string.
-
-Pull parsing is in some sense the most versatile architecture. It's possible to
-drive a push interface, also with minimal memory, and quite straightforward to
-construct an AST. Another advantage is that source-map information (the mapping
-between parsed blocks and offsets within the source text) is readily available;
-you can call `into_offset_iter()` to create an iterator that yields `(Event, Range)`
-pairs, where the second element is the event's corresponding range in the source
-document.
-
-While manipulating ASTs is the most flexible way to transform documents,
-operating on iterators is surprisingly easy, and quite efficient. Here, for
-example, is the code to transform soft line breaks into hard breaks:
-
-```rust
-let parser = parser.map(|event| match event {
-	Event::SoftBreak => Event::HardBreak,
-	_ => event
-});
-```
-
-Or expanding an abbreviation in text:
-
-```rust
-let parser = parser.map(|event| match event {
-	Event::Text(text) => Event::Text(text.replace("abbr", "abbreviation").into()),
-	_ => event
-});
-```
-
-Another simple example is code to determine the max nesting level:
-
-```rust
-let mut max_nesting = 0;
-let mut level = 0;
-for event in parser {
-	match event {
-		Event::Start(_) => {
-			level += 1;
-			max_nesting = std::cmp::max(max_nesting, level);
-		}
-		Event::End(_) => level -= 1,
-		_ => ()
-	}
-}
-```
-
-There are some basic but fully functional examples of the usage of the crate in the
-`examples` directory of this repository.
-
-## Using Rust idiomatically
-
-A lot of the internal scanning code is written at a pretty low level (it
-pretty much scans byte patterns for the bits of syntax), but the external
-interface is designed to be idiomatic Rust.
-
-Pull parsers are at heart an iterator of events (start and end tags, text,
-and other bits and pieces). The parser data structure implements the
-Rust Iterator trait directly, and Event is an enum. Thus, you can use the
-full power and expressivity of Rust's iterator infrastructure, including
-for loops and `map` (as in the examples above), collecting the events into
-a vector (for recording, playback, and manipulation), and more.
-
-Further, the `Text` event (representing text) is a small copy-on-write string.
-The vast majority of text fragments are just
-slices of the source document. For these, copy-on-write gives a convenient
-representation that requires no allocation or copying, but allocated
-strings are available when they're needed. Thus, when rendering text to
-HTML, most text is copied just once, from the source document to the
-HTML buffer.
-
-When using the pulldown-cmark's own HTML renderer, make sure to write to a buffered
-target like a `Vec<u8>` or `String`. Since it performs many (very) small writes, writing
-directly to stdout, files, or sockets is detrimental to performance. Such writers can
-be wrapped in a [`BufWriter`](https://doc.rust-lang.org/std/io/struct.BufWriter.html).
-
-## Build options
-
-By default, the binary is built as well. If you don't want/need it, then build like this:
-
-```bash
-> cargo build --no-default-features
-```
-
-Or put in your `Cargo.toml` file:
-
-```toml
-pulldown-cmark = { version = "0.5", default-features = false }
-```
-
-SIMD accelerated scanners are available for the x64 platform from version 0.5 onwards. To
-enable them, build with simd feature:
-
-```bash
-> cargo build --release --features simd
-```
-
-Or add the feature to your project's `Cargo.toml`:
-
-```toml
-pulldown-cmark = { version = "0.5", default-features = false, features = ["simd"] }
-```
-
-## Authors
-
-The main author is Raph Levien. The implementation of the new design (v0.3+) was completed by Marcus Klaas de Vries.
-
-## Contributions
-
-We gladly accept contributions via GitHub pull requests. Please see
-[CONTRIBUTING.md](CONTRIBUTING.md) for more details.
diff --git a/vendor/pulldown-cmark-0.5.3/azure-pipelines.yml b/vendor/pulldown-cmark-0.5.3/azure-pipelines.yml
deleted file mode 100644
index db00fefc75..0000000000
--- a/vendor/pulldown-cmark-0.5.3/azure-pipelines.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-pool:
-  vmImage: 'ubuntu-16.04'
-
-steps:
-  - script: |
-      curl https://sh.rustup.rs -sSf | sh -s -- -y
-      echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
-    displayName: Install rust
-  - script: cargo build --all
-    displayName: Cargo build
-  - script: cargo test --all
-    displayName: Cargo test
-  - script: cargo test --all --features=simd
-    displayName: Cargo test with simd feature enabled
-  - script: cargo run --release -- --regressions
-    workingDirectory: fuzzer
-    displayName: Test for superlinear time regressions
diff --git a/vendor/pulldown-cmark-0.5.3/benches/lib.rs b/vendor/pulldown-cmark-0.5.3/benches/lib.rs
deleted file mode 100644
index 4cfa6cd861..0000000000
--- a/vendor/pulldown-cmark-0.5.3/benches/lib.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-#![feature(test)]
-
-extern crate pulldown_cmark;
-extern crate test;
-
-mod to_html {
-    use pulldown_cmark::{html, Options, Parser};
-
-    fn render_html(text: &str, opts: Options) -> String {
-        let mut s = String::with_capacity(text.len() * 3 / 2);
-        let p = Parser::new_ext(text, opts);
-        html::push_html(&mut s, p);
-        s
-    }
-
-    #[bench]
-    fn pathological_links(b: &mut test::Bencher) {
-        let input = "[a](<".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_links2(b: &mut test::Bencher) {
-        let input = "[[]()".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_emphasis1(b: &mut test::Bencher) {
-        let input = "a***".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_emphasis2(b: &mut test::Bencher) {
-        let input = "a***_b__".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_emphasis3(b: &mut test::Bencher) {
-        let input = "[*_a".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_emphasis4(b: &mut test::Bencher) {
-        let input = "*~~\u{a0}".repeat(1000);
-        let mut opts = Options::empty();
-        opts.insert(Options::ENABLE_STRIKETHROUGH);
-
-        b.iter(|| render_html(&input, opts));
-    }
-
-    #[bench]
-    fn pathological_strikethrough(b: &mut test::Bencher) {
-        let input = "a***b~~".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_codeblocks1(b: &mut test::Bencher) {
-        // Note that `buf` grows quadratically with number of
-        // iterations. The point here is that the render time shouldn't
-        // grow faster than that.
-        let mut buf = String::new();
-        for i in 1..1000 {
-            for _ in 0..i {
-                buf.push('`');
-            }
-            buf.push(' ');
-        }
-
-        b.iter(|| render_html(&buf, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_codeblocks2(b: &mut test::Bencher) {
-        let input = "\\``".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_codeblocks3(b: &mut test::Bencher) {
-        let mut input = "`a`".repeat(1000);
-        input.push('`');
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_hrules(b: &mut test::Bencher) {
-        let mut input = "* ".repeat(1000);
-        input.push('a');
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_link_titles(b: &mut test::Bencher) {
-        let input = "[ (](".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn advanced_pathological_codeblocks(b: &mut test::Bencher) {
-        let mut buf = String::new();
-        let mut i = 1;
-        while buf.len() < 1250 {
-            for _ in 0..i {
-                buf.push('`');
-            }
-            buf.push(' ');
-            i += 1;
-        }
-        for _ in 0..buf.len() {
-            buf.push_str("*a* ");
-        }
-
-        b.iter(|| render_html(&buf, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_cdata(b: &mut test::Bencher) {
-        let input = "a <![CDATA[ ".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_html_processing(b: &mut test::Bencher) {
-        let input = "a <? ".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-
-    #[bench]
-    fn pathological_html_defs(b: &mut test::Bencher) {
-        let input = "a <!A ".repeat(1000);
-
-        b.iter(|| render_html(&input, Options::empty()));
-    }
-}
diff --git a/vendor/pulldown-cmark-0.5.3/specs/footnotes.txt b/vendor/pulldown-cmark-0.5.3/specs/footnotes.txt
deleted file mode 100644
index 4b91b38456..0000000000
--- a/vendor/pulldown-cmark-0.5.3/specs/footnotes.txt
+++ /dev/null
@@ -1,153 +0,0 @@
-Run this with `cargo run -- -F -s specs/footnotes.txt`.
-
-This is how footnotes are basically used.
-
-```````````````````````````````` example
-Lorem ipsum.[^a]
-
-[^a]: Cool.
-.
-<p>Lorem ipsum.<sup class="footnote-reference"><a href="#a">1</a></sup></p>
-<div class="footnote-definition" id="a"><sup class="footnote-definition-label">1</sup>
-<p>Cool.</p>
-</div>
-````````````````````````````````
-
-
-Footnotes can be used inside blockquotes:
-
-```````````````````````````````` example
-> This is the song that never ends.\
-> Yes it goes on and on my friends.[^lambchops]
->
-> [^lambchops]: <https://www.youtube.com/watch?v=0U2zJOryHKQ>
-.
-<blockquote>
-<p>This is the song that never ends.<br />
-Yes it goes on and on my friends.<sup class="footnote-reference"><a href="#lambchops">1</a></sup></p>
-<div class="footnote-definition" id="lambchops"><sup class="footnote-definition-label">1</sup>
-<p><a href="https://www.youtube.com/watch?v=0U2zJOryHKQ">https://www.youtube.com/watch?v=0U2zJOryHKQ</a></p>
-</div>
-</blockquote>
-````````````````````````````````
-
-
-Footnotes can be complex block structures:
-
-```````````````````````````````` example
-Songs that simply loop are a popular way to annoy people. [^examples]
-
-[^examples]:
- * [The song that never ends](https://www.youtube.com/watch?v=0U2zJOryHKQ)
- * [I know a song that gets on everybody's nerves](https://www.youtube.com/watch?v=TehWI09qxls)
- * [Ninety-nine bottles of beer on the wall](https://www.youtube.com/watch?v=qVjCag8XoHQ)
-.
-<p>Songs that simply loop are a popular way to annoy people. <sup class="footnote-reference"><a href="#examples">1</a></sup></p>
-<div class="footnote-definition" id="examples"><sup class="footnote-definition-label">1</sup>
-<ul>
-<li><a href="https://www.youtube.com/watch?v=0U2zJOryHKQ">The song that never ends</a></li>
-<li><a href="https://www.youtube.com/watch?v=TehWI09qxls">I know a song that gets on everybody's nerves</a></li>
-<li><a href="https://www.youtube.com/watch?v=qVjCag8XoHQ">Ninety-nine bottles of beer on the wall</a></li>
-</ul>
-</div>
-````````````````````````````````
-
-
-Footnotes can even have multiple paragraphs. They also don't need to be referenced to show up.
-
-```````````````````````````````` example
-[^lorem]: If heaven ever wishes to grant me a boon, it will be a total effacing of the results of a mere chance which fixed my eye on a certain stray piece of shelf-paper. It was nothing on which I would naturally have stumbled in the course of my daily round, for it was an old number of an Australian journal, the Sydney Bulletin for April 18, 1925. It had escaped even the cutting bureau which had at the time of its issuance been avidly collecting material for my uncle's research.
-
-I had largely given over my inquiries into what Professor Angell called the "Cthulhu Cult", and was visiting a learned friend in Paterson, New Jersey; the curator of a local museum and a mineralogist of note. Examining one day the reserve specimens roughly set on the storage shelves in a rear room of the museum, my eye was caught by an odd picture in one of the old papers spread beneath the stones. It was the Sydney Bulletin I have mentioned, for my friend had wide affiliations in all conceivable foreign parts; and the picture was a half-tone cut of a hideous stone image almost identical with that which Legrasse had found in the swamp.
-.
-<div class="footnote-definition" id="lorem"><sup class="footnote-definition-label">1</sup>
-<p>If heaven ever wishes to grant me a boon, it will be a total effacing of the results of a mere chance which fixed my eye on a certain stray piece of shelf-paper. It was nothing on which I would naturally have stumbled in the course of my daily round, for it was an old number of an Australian journal, the Sydney Bulletin for April 18, 1925. It had escaped even the cutting bureau which had at the time of its issuance been avidly collecting material for my uncle's research.</p>
-</div>
-<p>I had largely given over my inquiries into what Professor Angell called the &quot;Cthulhu Cult&quot;, and was visiting a learned friend in Paterson, New Jersey; the curator of a local museum and a mineralogist of note. Examining one day the reserve specimens roughly set on the storage shelves in a rear room of the museum, my eye was caught by an odd picture in one of the old papers spread beneath the stones. It was the Sydney Bulletin I have mentioned, for my friend had wide affiliations in all conceivable foreign parts; and the picture was a half-tone cut of a hideous stone image almost identical with that which Legrasse had found in the swamp.</p>
-````````````````````````````````
-
-
-A footnote will end on a single line break. Note that this behavior changed in version
-0.1.0, to become more like hoedown. See issue #21.
-
-```````````````````````````````` example
-[^ipsum]: How much wood would a woodchuck chuck.
-
-If a woodchuck could chuck wood.
-
-
-# Forms of entertainment that aren't childish
-.
-<div class="footnote-definition" id="ipsum"><sup class="footnote-definition-label">1</sup>
-<p>How much wood would a woodchuck chuck.</p>
-</div>
-<p>If a woodchuck could chuck wood.</p>
-<h1>Forms of entertainment that aren't childish</h1>
-````````````````````````````````
-
-
-A footnote will also break if it's inside another container.
-
-```````````````````````````````` example
-> He's also really stupid. [^why]
->
-> [^why]: Because your mamma!
-
-As such, we can guarantee that the non-childish forms of entertainment are probably more entertaining to adults, since, having had a whole childhood doing the childish ones, the non-childish ones are merely the ones that haven't gotten boring yet.
-.
-<blockquote>
-<p>He's also really stupid. <sup class="footnote-reference"><a href="#why">1</a></sup></p>
-<div class="footnote-definition" id="why"><sup class="footnote-definition-label">1</sup>
-<p>Because your mamma!</p>
-</div>
-</blockquote>
-<p>As such, we can guarantee that the non-childish forms of entertainment are probably more entertaining to adults, since, having had a whole childhood doing the childish ones, the non-childish ones are merely the ones that haven't gotten boring yet.</p>
-````````````````````````````````
-
-
-As a special exception, footnotes cannot be nested directly inside each other.
-
-```````````````````````````````` example
-Nested footnotes are considered poor style. [^a] [^xkcd]
-
-[^a]: This does not mean that footnotes cannot reference each other. [^b]
-
-[^b]: This means that a footnote definition cannot be directly inside another footnote definition.
-> This means that a footnote cannot be directly inside another footnote's body. [^e]
->
-> [^e]: They can, however, be inside anything else.
-
-[^xkcd]: [The other kind of nested footnote is, however, considered poor style.](https://xkcd.com/1208/)
-.
-<p>Nested footnotes are considered poor style. <sup class="footnote-reference"><a href="#a">1</a></sup> <sup class="footnote-reference"><a href="#xkcd">2</a></sup></p>
-<div class="footnote-definition" id="a"><sup class="footnote-definition-label">1</sup>
-<p>This does not mean that footnotes cannot reference each other. <sup class="footnote-reference"><a href="#b">3</a></sup></p>
-</div>
-<div class="footnote-definition" id="b"><sup class="footnote-definition-label">3</sup>
-<p>This means that a footnote definition cannot be directly inside another footnote definition.</p>
-<blockquote>
-<p>This means that a footnote cannot be directly inside another footnote's body. <sup class="footnote-reference"><a href="#e">4</a></sup></p>
-<div class="footnote-definition" id="e"><sup class="footnote-definition-label">4</sup>
-<p>They can, however, be inside anything else.</p>
-</div>
-</blockquote>
-</div>
-<div class="footnote-definition" id="xkcd"><sup class="footnote-definition-label">2</sup>
-<p><a href="https://xkcd.com/1208/">The other kind of nested footnote is, however, considered poor style.</a></p>
-</div>
-````````````````````````````````
-
-They do need one line between each other.
-
-```````````````````````````````` example
-[^Doh] Ray Me Fa So La Te Do! [^1]
-
-[^Doh]: I know. Wrong Doe. And it won't render right.
-[^1]: Common for people practicing music.
-.
-<p><sup class="footnote-reference"><a href="#Doh">1</a></sup> Ray Me Fa So La Te Do! <sup class="footnote-reference"><a href="#1">2</a></sup></p>
-<div class="footnote-definition" id="Doh"><sup class="footnote-definition-label">1</sup>
-<p>I know. Wrong Doe. And it won't render right.
-<sup class="footnote-reference"><a href="#1">2</a></sup>: Common for people practicing music.</p>
-</div>
-````````````````````````````````
diff --git a/vendor/pulldown-cmark-0.5.3/specs/regression.txt b/vendor/pulldown-cmark-0.5.3/specs/regression.txt
deleted file mode 100644
index b25248e75c..0000000000
--- a/vendor/pulldown-cmark-0.5.3/specs/regression.txt
+++ /dev/null
@@ -1,482 +0,0 @@
-Run this with `cargo run -- -T -F -s specs/regression.txt`.
-
-Regression tests for issues on the github issue tracker.
-
-ISSUE #162
-
-```````````````````````````````` example
-<details><summary>Testing 1..2..3..</summary>
-
-This is a test of the details element.
-
-</details>
-.
-<details><summary>Testing 1..2..3..</summary>
-<p>This is a test of the details element.</p>
-</details>
-````````````````````````````````
-
-ISSUE #133
-
-```````````````````````````````` example
-see the [many] [articles] [on] [QuickCheck].
-
-[many]: https://medium.com/@jlouis666/quickcheck-advice-c357efb4e7e6
-[articles]: http://www.quviq.com/products/erlang-quickcheck/
-[on]: https://wiki.haskell.org/Introduction_to_QuickCheck1
-[QuickCheck]: https://hackage.haskell.org/package/QuickCheck
-.
-<p>see the 
-  <a href="https://medium.com/@jlouis666/quickcheck-advice-c357efb4e7e6">many</a> 
-  <a href="http://www.quviq.com/products/erlang-quickcheck/">articles</a> 
-  <a href="https://wiki.haskell.org/Introduction_to_QuickCheck1">on</a> 
-  <a href="https://hackage.haskell.org/package/QuickCheck">QuickCheck</a>.
-</p>
-````````````````````````````````
-
-ISSUE #135
-
-```````````````````````````````` example
-[![debug-stub-derive on crates.io][cratesio-image]][cratesio]
-[![debug-stub-derive on docs.rs][docsrs-image]][docsrs]
-
-[cratesio-image]: https://img.shields.io/crates/v/debug_stub_derive.svg
-[cratesio]: https://crates.io/crates/debug_stub_derive
-[docsrs-image]: https://docs.rs/debug_stub_derive/badge.svg?version=0.3.0
-[docsrs]: https://docs.rs/debug_stub_derive/0.3.0/
-.
-<p><a href="https://crates.io/crates/debug_stub_derive"><img src="https://img.shields.io/crates/v/debug_stub_derive.svg" alt="debug-stub-derive on crates.io" /></a>
-<a href="https://docs.rs/debug_stub_derive/0.3.0/"><img src="https://docs.rs/debug_stub_derive/badge.svg?version=0.3.0" alt="debug-stub-derive on docs.rs" /></a></p>
-````````````````````````````````
-
-ISSUE #145
-
-```````````````````````````````` example
-|  Title A  |  Title B  |
-| --------- | --------- |
-| Content   | Content   |
-
-|  Title A  |  Title B  |  Title C  |  Title D  |
-| --------- | --------- | --------- | ---------:|
-| Content   | Content   | Conent    | Content   |
-.
-<table><thead><tr><th>Title A  </th><th>Title B  </th></tr></thead><tbody>
-<tr><td>Content   </td><td>Content   </td></tr>
-</tbody></table>
-<table><thead><tr><th>Title A  </th><th>Title B  </th><th>Title C  </th><th align="right">Title D  </th></tr></thead><tbody>
-<tr><td>Content   </td><td>Content   </td><td>Conent    </td><td align="right">Content   </td></tr>
-</tbody></table>
-````````````````````````````````
-
-Unicode punctuation and emphasis
-
-```````````````````````````````` example
-foo§__(bar)__
-.
-<p>foo§<strong>(bar)</strong></p>
-````````````````````````````````
-
-ISSUE #213
-
-```````````````````````````````` example
-<https://example.com> hello
-.
-<p><a href="https://example.com">https://example.com</a> hello</p>
-
-````````````````````````````````
-
-ISSUE #43 (1)
-
-```````````````````````````````` example
-[foo][bar]
-
-<!-- foo -->
-[bar]: a
-.
-<p><a href="a">foo</a></p>
-<!-- foo -->
-````````````````````````````````
-
-ISSUE #43 (2)
-
-```````````````````````````````` example
-<!-- <dl> -->
-- **foo** (u8, u8)
-
-  make something
-
-- **bar** (u16, u16)
-
-  make something
-.
-<!-- <dl> -->
-<ul>
-<li>
-<p><strong>foo</strong> (u8, u8)</p>
-<p>make something</p>
-</li>
-<li>
-<p><strong>bar</strong> (u16, u16)</p>
-<p>make something</p>
-</li>
-</ul>
-
-````````````````````````````````
-
-ISSUE #239
-
-```````````````````````````````` example
-[`
-i8
-`](
-../../../std/primitive.i8.html
-)
-.
-<p><a href="../../../std/primitive.i8.html"><code>i8</code></a></p>
-````````````````````````````````
-
-ISSUE #270
-
-```````````````````````````````` example
-[a]
-
-[a]: /url (title\\*)
-.
-<p><a href="/url" title="title\*">a</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[a]
-
-[a]: /url (title\))
-.
-<p><a href="/url" title="title)">a</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[a]
-
-[a]: /url (title))
-.
-<p>[a]</p>
-<p>[a]: /url (title))</p>
-````````````````````````````````
-
-Inline HTML
-
-```````````````````````````````` example
-a <?php this is not a valid processing tag
----
-b <?php but this is ?>
-.
-<h2>a &lt;?php this is not a valid processing tag</h2>
-<p>b <?php but this is ?></p>
-````````````````````````````````
-
-ISSUE #288
-
-```````````````````````````````` example
-[a]: u\
-foo
-.
-<p>foo</p>
-````````````````````````````````
-
-ISSUE #314
-
-```````````````````````````````` example
-\`foo`
-.
-<p>`foo`</p>
-````````````````````````````````
-
-ISSUE #317
-
-```````````````````````````````` example
-foo\\
-bar
-.
-<p>foo\
-bar</p>
-````````````````````````````````
-
-ISSUE #315
-
-```````````````````````````````` example
-1\. foo
-
-1\) bar
-.
-<p>1. foo</p>
-<p>1) bar</p>
-````````````````````````````````
-
-ISSUE #294
-
-```````````````````````````````` example
-1...
-
-1.2.3.
-
-1 2 3 .
-
-1.|2.-3.
-
-1)2)3)
-.
-<p>1...</p>
-<p>1.2.3.</p>
-<p>1 2 3 .</p>
-<p>1.|2.-3.</p>
-<p>1)2)3)</p>
-````````````````````````````````
-
-ISSUE #296
-
-```````````````````````````````` example
-[](<<>)
-.
-<p>[](&lt;&lt;&gt;)</p>
-````````````````````````````````
-
-BACKTICKS
-
-```````````````````````````````` example
-\``foo``bar`
-.
-<p>`<code>foo``bar</code></p>
-````````````````````````````````
-
-MORE BACKTICKS
-
-```````````````````````````````` example
-\\`foo`
-.
-<p>\<code>foo</code></p>
-````````````````````````````````
-
-ISSUE #300
-
-```````````````````````````````` example
-[\\]: x
-
-YOLO
-.
-<p>YOLO</p>
-````````````````````````````````
-
-ISSUE #293
-
-```````````````````````````````` example
-lorem ipsum
-A | B
----|---
-foo | bar
-.
-<p>lorem ipsum
-A | B
----|---
-foo | bar</p>
-````````````````````````````````
-
-ISSUE #318 (note the trailing whitespace on the first line)
-
-```````````````````````````````` example
-foo|bar  
----|---
-foo|bar
-.
-<table><thead><tr><th>foo</th><th>bar</th></tr></thead>
-<tbody><tr><td>foo</td><td>bar</td></tr></tbody>
-</table>
-````````````````````````````````
-
-ISSUE #318
-
-```````````````````````````````` example
-foo|bar\\
----|---
-foo|bar
-.
-<table><thead><tr><th>foo</th><th>bar\</th></tr></thead>
-<tbody><tr><td>foo</td><td>bar</td></tr></tbody>
-</table>
-````````````````````````````````
-
-ISSUE #328
-
-```````````````````````````````` example
-[<foo>](url)
-.
-<p><a href="url"><foo></a></p>
-````````````````````````````````
-
-ISSUE #328
-
-```````````````````````````````` example
-[<foo>bar</foo>](url)
-.
-<p><a href="url"><foo>bar</foo></a></p>
-````````````````````````````````
-
-ISSUE #328
-
-```````````````````````````````` example
-![<http://example.com>](http://example.com/logo.png)
-.
-<p><img alt="http://example.com" src="http://example.com/logo.png"></p>
-````````````````````````````````
-
-ISSUE #328
-
-```````````````````````````````` example
-[<http://one> <http://two>](url)
-.
-<p><a href="url"></a><a href="http://one">http://one</a> <a href="http://two">http://two</a></p>
-````````````````````````````````
-
-ISSUE #330 (NOTE THERE IS A SPACE ON THE LINE BETWEEN THE TABLE AND THE PARAGRAPH!)
-
-```````````````````````````````` example
-Markdown | Less | Pretty
---- | --- | ---
- 
-some text
-.
-<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
-</tbody></table>
-<p>some text</p>
-````````````````````````````````
-
-ISSUE #331
-
-```````````````````````````````` example
-1. > foo
-2. >
-.
-<ol>
-<li>
-<blockquote>
-<p>foo</p>
-</blockquote>
-</li>
-<li>
-<blockquote>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-ISSUE #326
-
-```````````````````````````````` example
-[
-x
-
-]: f
-.
-<p>[
-x</p>
-<p>]: f</p>
-````````````````````````````````
-
-ISSUE #295
-
-```````````````````````````````` example
-[foo]:
-.
-<p>[foo]:</p>
-````````````````````````````````
-
-ISSUE #298 (not yet fixed)
-
-```````````````````````````````` DISABLED example
-> [foo
-> bar]: /url
->
-> [foo bar]
-.
-<blockquote>
-<p><a href="/url">foo bar</a></p>
-</blockquote>
-````````````````````````````````
-
-TABLES IN BROKEN CONTAINERS
-
-```````````````````````````````` example
-> foo | bar
-> --- | ---
-yolo | swag
-.
-<blockquote>
-<table><thead><tr><th>foo</th><th>bar</th></tr></thead></table>
-</blockquote>
-<p>yolo | swag</p>
-````````````````````````````````
-
-ISSUE #336
-
-```````````````````````````````` example
-<foo bar>
-.
-<foo bar>
-````````````````````````````````
-
-ISSUE #336
-
-```````````````````````````````` example
-<foo bar =
- "hi"> 
-.
-<p><foo bar =
- "hi"> </p>
-````````````````````````````````
-
-EMPHASIS ACROSS PARAGRAPHS
-
-```````````````````````````````` example
-~~*_**__
-
-__a__
-.
-<p>~~*_**__</p>
-<p><strong>a</strong></p>
-````````````````````````````````
-
-EMPTY CODE IN BLOCKQUOTE
-
-```````````````````````````````` example
-> `
-> `
-.
-<blockquote>
-<p><code></code></p>
-</blockquote>
-````````````````````````````````
-
-ISSUE #356
-
-```````````````````````````````` example
-`\|`
-.
-<p><code>\|</code></p>
-````````````````````````````````
-
-ISSUE 370
-
-```````````````````````````````` example
-Paragraph 1
-    
-Paragraph 2
-.
-<p>Paragraph 1</p>
-<p>Paragraph 2</p>
-````````````````````````````````
-
-ISSUE 375
-
-```````````````````````````````` example
-\[[link text](https://www.google.com/)\]
-.
-<p>[<a href="https://www.google.com/">link text</a>]</p>
-````````````````````````````````
diff --git a/vendor/pulldown-cmark-0.5.3/specs/table.txt b/vendor/pulldown-cmark-0.5.3/specs/table.txt
deleted file mode 100644
index 5e4d4b39f5..0000000000
--- a/vendor/pulldown-cmark-0.5.3/specs/table.txt
+++ /dev/null
@@ -1,217 +0,0 @@
-Run this with `cargo run -- -T -s specs/table.txt`.
-
-Adapted from original by replacing `td` elements by `th` elements inside `thead`
-and disabling the third test.
-
-False match
-===========
-
-```````````````````````````````` example
-Test header
------------
-.
-<h2>Test header</h2>
-````````````````````````````````
-
-
-True match
-==========
-
-```````````````````````````````` example
-Test|Table
-----|-----
-.
-<table><thead><tr><th>Test</th><th>Table</th></tr></thead>
-</table>
-````````````````````````````````
-
-
-Actual rows in it
-=================
-
-```````````````````````````````` DISABLED example
-Test|Table
-----|-----
-Test row
-Test|2
-
-Test ending
-.
-<table><thead><tr><th>Test</th><th>Table</th></tr></thead>
-<tr><td>Test row</td></tr>
-<tr><td>Test</td><td>2</td></tr>
-</table>
-<p>Test ending</p>
-````````````````````````````````
-
-
-Test with quote
-===============
-
-```````````````````````````````` example
-> Test  | Table
-> ------|------
-> Row 1 | Every
-> Row 2 | Day
->
-> Paragraph
-.
-<blockquote>
-<table><thead><tr><th>Test  </th><th> Table</th></tr></thead>
-<tr><td>Row 1 </td><td> Every</td></tr>
-<tr><td>Row 2 </td><td> Day</td></tr>
-</table>
-<p>Paragraph</p>
-</blockquote>
-````````````````````````````````
-
-
-Test with list
-==============
-
-```````````````````````````````` example
- 1. First entry
- 2. Second entry
-
-    Col 1|Col 2
-    -|-
-    Row 1|Part 2
-    Row 2|Part 2
-.
-<ol>
-<li>
-<p>First entry</p>
-</li>
-<li>
-<p>Second entry</p>
-<table><thead><tr><th>Col 1</th><th>Col 2</th></tr></thead>
-<tr><td>Row 1</td><td>Part 2</td></tr>
-<tr><td>Row 2</td><td>Part 2</td></tr>
-</table>
-</li>
-</ol>
-````````````````````````````````
-
-
-Test with border
-================
-
-```````````````````````````````` example
-|Col 1|Col 2|
-|-----|-----|
-|R1C1 |R1C2 |
-|R2C1 |R2C2 |
-.
-<table><thead><tr><th>Col 1</th><th>Col 2</th></tr></thead>
-<tr><td>R1C1 </td><td>R1C2 </td></tr>
-<tr><td>R2C1 </td><td>R2C2 </td></tr>
-</table>
-````````````````````````````````
-
-
-Test with empty cells
-=====================
-
-Empty cells should work.
-
-```````````````````````````````` example
-| Col 1 | Col 2 |
-|-------|-------|
-|       |       |
-|       |       |
-.
-<table><thead><tr><th> Col 1 </th><th> Col 2 </th></tr></thead>
-<tr><td>       </td><td>       </td></tr>
-<tr><td>       </td><td>       </td></tr>
-</table>
-````````````````````````````````
-
-... and properly mix with filled cells.
-
-```````````````````````````````` example
-| Col 1 | Col 2 |
-|-------|-------|
-|   x   |       |
-|       |    x  |
-.
-<table><thead><tr><th> Col 1 </th><th> Col 2 </th></tr></thead>
-<tr><td>   x   </td><td>       </td></tr>
-<tr><td>       </td><td>    x  </td></tr>
-</table>
-````````````````````````````````
-
-
-Table with UTF-8
-================
-
-Basic example.
-
-```````````````````````````````` example
-|Col 1|Col 2|
-|-----|-----|
-|✓    |✓    |
-|✓    |✓    |
-.
-<table><thead><tr><th>Col 1</th><th>Col 2</th></tr></thead>
-<tr><td>✓    </td><td>✓    </td></tr>
-<tr><td>✓    </td><td>✓    </td></tr>
-</table>
-````````````````````````````````
-
-More advanced example.
-
-```````````````````````````````` example
-|  Target                       | std |rustc|cargo| notes                      |
-|-------------------------------|-----|-----|-----|----------------------------|
-| `x86_64-unknown-linux-musl`   |  ✓  |     |     | 64-bit Linux with MUSL     |
-| `arm-linux-androideabi`       |  ✓  |     |     | ARM Android                |
-| `arm-unknown-linux-gnueabi`   |  ✓  |  ✓  |     | ARM Linux (2.6.18+)        |
-| `arm-unknown-linux-gnueabihf` |  ✓  |  ✓  |     | ARM Linux (2.6.18+)        |
-| `aarch64-unknown-linux-gnu`   |  ✓  |     |     | ARM64 Linux (2.6.18+)      |
-| `mips-unknown-linux-gnu`      |  ✓  |     |     | MIPS Linux (2.6.18+)       |
-| `mipsel-unknown-linux-gnu`    |  ✓  |     |     | MIPS (LE) Linux (2.6.18+)  |
-.
-<table><thead><tr><th>  Target                       </th><th> std </th><th>rustc</th><th>cargo</th><th> notes                      </th></tr></thead>
-<tr><td> <code>x86_64-unknown-linux-musl</code>   </td><td>  ✓  </td><td>     </td><td>     </td><td> 64-bit Linux with MUSL     </td></tr>
-<tr><td> <code>arm-linux-androideabi</code>       </td><td>  ✓  </td><td>     </td><td>     </td><td> ARM Android                </td></tr>
-<tr><td> <code>arm-unknown-linux-gnueabi</code>   </td><td>  ✓  </td><td>  ✓  </td><td>     </td><td> ARM Linux (2.6.18+)        </td></tr>
-<tr><td> <code>arm-unknown-linux-gnueabihf</code> </td><td>  ✓  </td><td>  ✓  </td><td>     </td><td> ARM Linux (2.6.18+)        </td></tr>
-<tr><td> <code>aarch64-unknown-linux-gnu</code>   </td><td>  ✓  </td><td>     </td><td>     </td><td> ARM64 Linux (2.6.18+)      </td></tr>
-<tr><td> <code>mips-unknown-linux-gnu</code>      </td><td>  ✓  </td><td>     </td><td>     </td><td> MIPS Linux (2.6.18+)       </td></tr>
-<tr><td> <code>mipsel-unknown-linux-gnu</code>    </td><td>  ✓  </td><td>     </td><td>     </td><td> MIPS (LE) Linux (2.6.18+)  </td></tr>
-</table>
-````````````````````````````````
-
-Hiragana-containing pseudo-table.
-
-```````````````````````````````` example
-|-|-|
-|ぃ|い|
-.
-<p>|-|-|
-|ぃ|い|</p>
-````````````````````````````````
-
-Hiragana-containing actual table.
-
-```````````````````````````````` example
-|ぁ|ぃ|
-|-|-|
-|ぃ|ぃ|
-.
-<table><thead><tr><th>ぁ</th><th>ぃ</th></tr></thead>
-<tr><td>ぃ</td><td>ぃ</td></tr>
-</table>
-````````````````````````````````
-
-Test russian symbols.
-
-```````````````````````````````` example
-|Колонка 1|Колонка 2|
-|---------|---------|
-|Ячейка 1 |Ячейка 2 |
-.
-<table><thead><tr><th>Колонка 1</th><th>Колонка 2</th></tr></thead>
-<tr><td>Ячейка 1 </td><td>Ячейка 2 </td></tr>
-</table>
-````````````````````````````````
diff --git a/vendor/pulldown-cmark-0.5.3/src/lib.rs b/vendor/pulldown-cmark-0.5.3/src/lib.rs
deleted file mode 100644
index 6120355bc7..0000000000
--- a/vendor/pulldown-cmark-0.5.3/src/lib.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//! Pull parser for [CommonMark](https://commonmark.org). This crate provides a [Parser](struct.Parser.html) struct
-//! which is an iterator over [Event](enum.Event.html)s. This iterator can be used
-//! directly, or to output HTML using the [HTML module](html/index.html).
-//!
-//! By default, only CommonMark features are enabled. To use extensions like tables,
-//! footnotes or task lists, enable by setting the corresponding flags in the
-//! [Options](struct.Options.html) struct.
-//!
-//! # Example
-//! ```rust
-//! use pulldown_cmark::{Parser, Options, html};
-//!
-//! let markdown_input = "Hello world, this is a ~~complicated~~ *very simple* example.";
-//!
-//! // Set up options and parser. Strikethroughs are not part of the CommonMark standard
-//! // and we therefore must enable it explicitly.
-//! let mut options = Options::empty();
-//! options.insert(Options::ENABLE_STRIKETHROUGH);
-//! let parser = Parser::new_ext(markdown_input, options);
-//!
-//! // Write to String buffer.
-//! let mut html_output = String::new();
-//! html::push_html(&mut html_output, parser);
-//!
-//! // Check that the output is what we expected.
-//! let expected_html = "<p>Hello world, this is a <del>complicated</del> <em>very simple</em> example.</p>\n";
-//! assert_eq!(expected_html, &html_output);
-//! ```
-
-// When compiled for the rustc compiler itself we want to make sure that this is
-// an unstable crate.
-#![cfg_attr(rustbuild, feature(staged_api, rustc_private))]
-#![cfg_attr(rustbuild, unstable(feature = "rustc_private", issue = "27812"))]
-
-pub mod html;
-
-#[macro_use]
-extern crate bitflags;
-extern crate unicase;
-
-mod entities;
-mod escape;
-mod linklabel;
-mod parse;
-mod puncttable;
-mod scanners;
-mod strings;
-mod tree;
-
-#[cfg(all(target_arch = "x86_64", feature = "simd"))]
-mod simd;
-
-pub use crate::parse::{Alignment, Event, LinkType, OffsetIter, Options, Parser, Tag};
-pub use crate::strings::{CowStr, InlineStr};
diff --git a/vendor/pulldown-cmark-0.5.3/src/main.rs b/vendor/pulldown-cmark-0.5.3/src/main.rs
deleted file mode 100644
index b480cb77a1..0000000000
--- a/vendor/pulldown-cmark-0.5.3/src/main.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2015 Google Inc. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//! Command line tool to exercise pulldown-cmark.
-
-extern crate getopts;
-
-extern crate pulldown_cmark;
-
-use pulldown_cmark::html;
-use pulldown_cmark::Options;
-use pulldown_cmark::Parser;
-
-use std::env;
-use std::fs::File;
-use std::io::{self, Read, Write};
-use std::mem;
-use std::path::Path;
-
-fn render_html(text: &str, opts: Options) -> String {
-    let mut s = String::with_capacity(text.len() * 3 / 2);
-    let p = Parser::new_ext(text, opts);
-    html::push_html(&mut s, p);
-    s
-}
-
-fn dry_run(text: &str, opts: Options) {
-    let p = Parser::new_ext(text, opts);
-    let count = p.count();
-    println!("{} events", count);
-}
-
-fn print_events(text: &str, opts: Options) {
-    let mut p = Parser::new_ext(text, opts);
-    loop {
-        print!("{}: ", p.get_offset());
-        if let Some(event) = p.next() {
-            println!("{:?}", event);
-        } else {
-            break;
-        }
-    }
-    println!("EOF");
-}
-
-fn read_file(filename: &str) -> String {
-    let path = Path::new(filename);
-    let mut file = match File::open(&path) {
-        Err(why) => panic!("couldn't open {}: {}", path.display(), why),
-        Ok(file) => file,
-    };
-    let mut s = String::new();
-    match file.read_to_string(&mut s) {
-        Err(why) => panic!("couldn't open {}: {}", path.display(), why),
-        Ok(_) => s,
-    }
-}
-
-// Tests in the spec (v0.26) are of the form:
-//
-// ```````````````````````````````` example
-// <markdown input>
-// .
-// <expected output>
-// ````````````````````````````````
-struct Spec<'a> {
-    spec: &'a str,
-    test_n: usize,
-}
-
-impl<'a> Spec<'a> {
-    pub fn new(spec: &'a str) -> Self {
-        Spec { spec, test_n: 0 }
-    }
-}
-
-struct TestCase<'a> {
-    n: usize,
-    input: &'a str,
-    expected: &'a str,
-}
-
-impl<'a> TestCase<'a> {
-    pub fn new(n: usize, input: &'a str, expected: &'a str) -> Self {
-        TestCase { n, input, expected }
-    }
-}
-
-impl<'a> Iterator for Spec<'a> {
-    type Item = TestCase<'a>;
-
-    fn next(&mut self) -> Option<TestCase<'a>> {
-        let spec = self.spec;
-
-        let i_start = match self
-            .spec
-            .find("```````````````````````````````` example\n")
-            .map(|pos| pos + 41)
-        {
-            Some(pos) => pos,
-            None => return None,
-        };
-
-        let i_end = match self.spec[i_start..]
-            .find("\n.\n")
-            .map(|pos| (pos + 1) + i_start)
-        {
-            Some(pos) => pos,
-            None => return None,
-        };
-
-        let e_end = match self.spec[i_end + 2..]
-            .find("````````````````````````````````\n")
-            .map(|pos| pos + i_end + 2)
-        {
-            Some(pos) => pos,
-            None => return None,
-        };
-
-        self.test_n += 1;
-        self.spec = &self.spec[e_end + 33..];
-
-        Some(TestCase::new(
-            self.test_n,
-            &spec[i_start..i_end],
-            &spec[i_end + 2..e_end],
-        ))
-    }
-}
-
-fn run_spec(spec_text: &str, args: &[String], opts: Options) {
-    let (first, last) = if args.is_empty() {
-        (None, None)
-    } else {
-        let mut iter = args[0].split("..");
-        let first = iter.next().and_then(|s| s.parse().ok());
-        let last = match iter.next() {
-            Some(s) => s.parse().ok(),
-            None => first,
-        };
-        (first, last)
-    };
-
-    let spec = Spec::new(spec_text);
-    let mut tests_failed = 0;
-    let mut tests_run = 0;
-    let mut fail_report = String::new();
-
-    for test in spec {
-        if first.map(|fst| test.n < fst).unwrap_or(false) {
-            continue;
-        }
-        if last.map(|lst| test.n > lst).unwrap_or(false) {
-            break;
-        }
-
-        if test.n % 10 == 1 {
-            if test.n % 40 == 1 {
-                if test.n > 1 {
-                    println!();
-                }
-            } else {
-                print!(" ");
-            }
-            print!("[{:3}]", test.n);
-        } else if test.n % 10 == 6 {
-            print!(" ");
-        }
-
-        let our_html = render_html(&test.input, opts);
-
-        if our_html == test.expected.replace("→", "\t") {
-            print!(".");
-        } else {
-            if tests_failed == 0 {
-                fail_report = format!(
-                    "\nFAIL {}:\n\n---input---\n{:?}\n\n---wanted---\n{:?}\n\n---got---\n{:?}\n",
-                    test.n, test.input, test.expected, our_html
-                );
-            }
-            print!("X");
-            tests_failed += 1;
-        }
-
-        let _ = io::stdout().flush();
-        tests_run += 1;
-    }
-
-    println!("\n{}/{} tests passed", tests_run - tests_failed, tests_run);
-    print!("{}", fail_report);
-}
-
-fn brief(program: &str) -> String {
-    format!(
-        "Usage: {} [options]\n\n{}",
-        program, "Reads markdown from standard input and emits HTML.",
-    )
-}
-
-pub fn main() {
-    let args: Vec<_> = env::args().collect();
-    let mut opts = getopts::Options::new();
-    opts.optflag("h", "help", "this help message");
-    opts.optflag("d", "dry-run", "dry run, produce no output");
-    opts.optflag("e", "events", "print event sequence instead of rendering");
-    opts.optflag("T", "enable-tables", "enable GitHub-style tables");
-    opts.optflag("F", "enable-footnotes", "enable Hoedown-style footnotes");
-    opts.optflag(
-        "S",
-        "enable-strikethrough",
-        "enable GitHub-style strikethrough",
-    );
-    opts.optflag("L", "enable-tasklists", "enable GitHub-style task lists");
-    opts.optopt("s", "spec", "run tests from spec file", "FILE");
-    opts.optopt("b", "bench", "run benchmark", "FILE");
-    let matches = match opts.parse(&args[1..]) {
-        Ok(m) => m,
-        Err(f) => {
-            eprintln!("{}\n{}", f, opts.usage(&brief(&args[0])));
-            std::process::exit(1);
-        }
-    };
-    if matches.opt_present("help") {
-        println!("{}", opts.usage(&brief(&args[0])));
-        return;
-    }
-    let mut opts = Options::empty();
-    if matches.opt_present("enable-tables") {
-        opts.insert(Options::ENABLE_TABLES);
-    }
-    if matches.opt_present("enable-footnotes") {
-        opts.insert(Options::ENABLE_FOOTNOTES);
-    }
-    if matches.opt_present("enable-strikethrough") {
-        opts.insert(Options::ENABLE_STRIKETHROUGH);
-    }
-    if matches.opt_present("enable-tasklists") {
-        opts.insert(Options::ENABLE_TASKLISTS);
-    }
-    if let Some(filename) = matches.opt_str("spec") {
-        run_spec(
-            &read_file(&filename).replace("→", "\t"),
-            &matches.free,
-            opts,
-        );
-    } else if let Some(filename) = matches.opt_str("bench") {
-        let inp = read_file(&filename);
-        for _ in 0..1000 {
-            let _ = render_html(&inp, opts);
-        }
-    } else {
-        let mut input = String::new();
-        if let Err(why) = io::stdin().lock().read_to_string(&mut input) {
-            panic!("couldn't read from stdin: {}", why)
-        }
-        if matches.opt_present("events") {
-            print_events(&input, opts);
-        } else if matches.opt_present("dry-run") {
-            dry_run(&input, opts);
-        } else {
-            let mut p = Parser::new_ext(&input, opts);
-            let stdio = io::stdout();
-            let buffer = std::io::BufWriter::with_capacity(1024 * 1024, stdio.lock());
-            html::write_html(buffer, &mut p).unwrap();
-            // Since the program will now terminate and the memory will be returned
-            // to the operating system anyway, there is no point in tidely cleaning
-            // up all the datastructures we have used. We shouldn't do this if we'd
-            // do other things after this, because this is basically intentionally
-            // leaking data. Skipping cleanup let's us return a bit (~5%) faster.
-            mem::forget(p);
-        }
-    }
-}
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/regression.rs b/vendor/pulldown-cmark-0.5.3/tests/suite/regression.rs
deleted file mode 100644
index 9d50732fa3..0000000000
--- a/vendor/pulldown-cmark-0.5.3/tests/suite/regression.rs
+++ /dev/null
@@ -1,557 +0,0 @@
-// This file is auto-generated by the build script
-// Please, do not modify it manually
-
-use super::test_markdown_html;
-
-#[test]
-fn regression_test_1() {
-    let original = r##"<details><summary>Testing 1..2..3..</summary>
-
-This is a test of the details element.
-
-</details>
-"##;
-    let expected = r##"<details><summary>Testing 1..2..3..</summary>
-<p>This is a test of the details element.</p>
-</details>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_2() {
-    let original = r##"see the [many] [articles] [on] [QuickCheck].
-
-[many]: https://medium.com/@jlouis666/quickcheck-advice-c357efb4e7e6
-[articles]: http://www.quviq.com/products/erlang-quickcheck/
-[on]: https://wiki.haskell.org/Introduction_to_QuickCheck1
-[QuickCheck]: https://hackage.haskell.org/package/QuickCheck
-"##;
-    let expected = r##"<p>see the 
-  <a href="https://medium.com/@jlouis666/quickcheck-advice-c357efb4e7e6">many</a> 
-  <a href="http://www.quviq.com/products/erlang-quickcheck/">articles</a> 
-  <a href="https://wiki.haskell.org/Introduction_to_QuickCheck1">on</a> 
-  <a href="https://hackage.haskell.org/package/QuickCheck">QuickCheck</a>.
-</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_3() {
-    let original = r##"[![debug-stub-derive on crates.io][cratesio-image]][cratesio]
-[![debug-stub-derive on docs.rs][docsrs-image]][docsrs]
-
-[cratesio-image]: https://img.shields.io/crates/v/debug_stub_derive.svg
-[cratesio]: https://crates.io/crates/debug_stub_derive
-[docsrs-image]: https://docs.rs/debug_stub_derive/badge.svg?version=0.3.0
-[docsrs]: https://docs.rs/debug_stub_derive/0.3.0/
-"##;
-    let expected = r##"<p><a href="https://crates.io/crates/debug_stub_derive"><img src="https://img.shields.io/crates/v/debug_stub_derive.svg" alt="debug-stub-derive on crates.io" /></a>
-<a href="https://docs.rs/debug_stub_derive/0.3.0/"><img src="https://docs.rs/debug_stub_derive/badge.svg?version=0.3.0" alt="debug-stub-derive on docs.rs" /></a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_4() {
-    let original = r##"|  Title A  |  Title B  |
-| --------- | --------- |
-| Content   | Content   |
-
-|  Title A  |  Title B  |  Title C  |  Title D  |
-| --------- | --------- | --------- | ---------:|
-| Content   | Content   | Conent    | Content   |
-"##;
-    let expected = r##"<table><thead><tr><th>Title A  </th><th>Title B  </th></tr></thead><tbody>
-<tr><td>Content   </td><td>Content   </td></tr>
-</tbody></table>
-<table><thead><tr><th>Title A  </th><th>Title B  </th><th>Title C  </th><th align="right">Title D  </th></tr></thead><tbody>
-<tr><td>Content   </td><td>Content   </td><td>Conent    </td><td align="right">Content   </td></tr>
-</tbody></table>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_5() {
-    let original = r##"foo§__(bar)__
-"##;
-    let expected = r##"<p>foo§<strong>(bar)</strong></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_6() {
-    let original = r##"<https://example.com> hello
-"##;
-    let expected = r##"<p><a href="https://example.com">https://example.com</a> hello</p>
-
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_7() {
-    let original = r##"[foo][bar]
-
-<!-- foo -->
-[bar]: a
-"##;
-    let expected = r##"<p><a href="a">foo</a></p>
-<!-- foo -->
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_8() {
-    let original = r##"<!-- <dl> -->
-- **foo** (u8, u8)
-
-  make something
-
-- **bar** (u16, u16)
-
-  make something
-"##;
-    let expected = r##"<!-- <dl> -->
-<ul>
-<li>
-<p><strong>foo</strong> (u8, u8)</p>
-<p>make something</p>
-</li>
-<li>
-<p><strong>bar</strong> (u16, u16)</p>
-<p>make something</p>
-</li>
-</ul>
-
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_9() {
-    let original = r##"[`
-i8
-`](
-../../../std/primitive.i8.html
-)
-"##;
-    let expected = r##"<p><a href="../../../std/primitive.i8.html"><code>i8</code></a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_10() {
-    let original = r##"[a]
-
-[a]: /url (title\\*)
-"##;
-    let expected = r##"<p><a href="/url" title="title\*">a</a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_11() {
-    let original = r##"[a]
-
-[a]: /url (title\))
-"##;
-    let expected = r##"<p><a href="/url" title="title)">a</a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_12() {
-    let original = r##"[a]
-
-[a]: /url (title))
-"##;
-    let expected = r##"<p>[a]</p>
-<p>[a]: /url (title))</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_13() {
-    let original = r##"a <?php this is not a valid processing tag
----
-b <?php but this is ?>
-"##;
-    let expected = r##"<h2>a &lt;?php this is not a valid processing tag</h2>
-<p>b <?php but this is ?></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_14() {
-    let original = r##"[a]: u\
-foo
-"##;
-    let expected = r##"<p>foo</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_15() {
-    let original = r##"\`foo`
-"##;
-    let expected = r##"<p>`foo`</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_16() {
-    let original = r##"foo\\
-bar
-"##;
-    let expected = r##"<p>foo\
-bar</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_17() {
-    let original = r##"1\. foo
-
-1\) bar
-"##;
-    let expected = r##"<p>1. foo</p>
-<p>1) bar</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_18() {
-    let original = r##"1...
-
-1.2.3.
-
-1 2 3 .
-
-1.|2.-3.
-
-1)2)3)
-"##;
-    let expected = r##"<p>1...</p>
-<p>1.2.3.</p>
-<p>1 2 3 .</p>
-<p>1.|2.-3.</p>
-<p>1)2)3)</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_19() {
-    let original = r##"[](<<>)
-"##;
-    let expected = r##"<p>[](&lt;&lt;&gt;)</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_20() {
-    let original = r##"\``foo``bar`
-"##;
-    let expected = r##"<p>`<code>foo``bar</code></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_21() {
-    let original = r##"\\`foo`
-"##;
-    let expected = r##"<p>\<code>foo</code></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_22() {
-    let original = r##"[\\]: x
-
-YOLO
-"##;
-    let expected = r##"<p>YOLO</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_23() {
-    let original = r##"lorem ipsum
-A | B
----|---
-foo | bar
-"##;
-    let expected = r##"<p>lorem ipsum
-A | B
----|---
-foo | bar</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_24() {
-    let original = r##"foo|bar  
----|---
-foo|bar
-"##;
-    let expected = r##"<table><thead><tr><th>foo</th><th>bar</th></tr></thead>
-<tbody><tr><td>foo</td><td>bar</td></tr></tbody>
-</table>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_25() {
-    let original = r##"foo|bar\\
----|---
-foo|bar
-"##;
-    let expected = r##"<table><thead><tr><th>foo</th><th>bar\</th></tr></thead>
-<tbody><tr><td>foo</td><td>bar</td></tr></tbody>
-</table>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_26() {
-    let original = r##"[<foo>](url)
-"##;
-    let expected = r##"<p><a href="url"><foo></a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_27() {
-    let original = r##"[<foo>bar</foo>](url)
-"##;
-    let expected = r##"<p><a href="url"><foo>bar</foo></a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_28() {
-    let original = r##"![<http://example.com>](http://example.com/logo.png)
-"##;
-    let expected = r##"<p><img alt="http://example.com" src="http://example.com/logo.png"></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_29() {
-    let original = r##"[<http://one> <http://two>](url)
-"##;
-    let expected = r##"<p><a href="url"></a><a href="http://one">http://one</a> <a href="http://two">http://two</a></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_30() {
-    let original = r##"Markdown | Less | Pretty
---- | --- | ---
- 
-some text
-"##;
-    let expected =
-        r##"<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
-</tbody></table>
-<p>some text</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_31() {
-    let original = r##"1. > foo
-2. >
-"##;
-    let expected = r##"<ol>
-<li>
-<blockquote>
-<p>foo</p>
-</blockquote>
-</li>
-<li>
-<blockquote>
-</blockquote>
-</li>
-</ol>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_32() {
-    let original = r##"[
-x
-
-]: f
-"##;
-    let expected = r##"<p>[
-x</p>
-<p>]: f</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_33() {
-    let original = r##"[foo]:
-"##;
-    let expected = r##"<p>[foo]:</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_34() {
-    let original = r##"> foo | bar
-> --- | ---
-yolo | swag
-"##;
-    let expected = r##"<blockquote>
-<table><thead><tr><th>foo</th><th>bar</th></tr></thead></table>
-</blockquote>
-<p>yolo | swag</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_35() {
-    let original = r##"<foo bar>
-"##;
-    let expected = r##"<foo bar>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_36() {
-    let original = r##"<foo bar =
- "hi"> 
-"##;
-    let expected = r##"<p><foo bar =
- "hi"> </p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_37() {
-    let original = r##"~~*_**__
-
-__a__
-"##;
-    let expected = r##"<p>~~*_**__</p>
-<p><strong>a</strong></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_38() {
-    let original = r##"> `
-> `
-"##;
-    let expected = r##"<blockquote>
-<p><code></code></p>
-</blockquote>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_39() {
-    let original = r##"`\|`
-"##;
-    let expected = r##"<p><code>\|</code></p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_40() {
-    let original = r##"Paragraph 1
-    
-Paragraph 2
-"##;
-    let expected = r##"<p>Paragraph 1</p>
-<p>Paragraph 2</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
-
-#[test]
-fn regression_test_41() {
-    let original = r##"\[[link text](https://www.google.com/)\]
-"##;
-    let expected = r##"<p>[<a href="https://www.google.com/">link text</a>]</p>
-"##;
-
-    test_markdown_html(original, expected);
-}
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/LICENSE b/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/LICENSE
deleted file mode 100644
index 6b8a93c5e3..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/LICENSE
+++ /dev/null
@@ -1,105 +0,0 @@
-The CommonMark spec (spec.txt) and DTD (CommonMark.dtd) are
-
-Copyright (C) 2014-16 John MacFarlane
-
-Released under the Creative Commons CC-BY-SA 4.0 license:
-<http://creativecommons.org/licenses/by-sa/4.0/>.
-
-Creative Commons Attribution-ShareAlike 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-Section 1 – Definitions.
-
-Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
-Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
-Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-Section 2 – Scope.
-
-License grant.
-Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-reproduce and Share the Licensed Material, in whole or in part; and
-produce, reproduce, and Share Adapted Material.
-Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-Term. The term of this Public License is specified in Section 6(a).
-Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-Downstream recipients.
-Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
-No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-Other rights.
-
-Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-Patent and trademark rights are not licensed under this Public License.
-To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-Attribution.
-
-If You Share the Licensed Material (including in modified form), You must:
-
-retain the following if it is supplied by the Licensor with the Licensed Material:
-identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-a copyright notice;
-a notice that refers to this Public License;
-a notice that refers to the disclaimer of warranties;
-a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-ShareAlike.
-In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
-
-The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
-You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
-You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
-if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
-You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-Section 6 – Term and Termination.
-
-This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-
-automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-upon express reinstatement by the Licensor.
-For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-Section 7 – Other Terms and Conditions.
-
-The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-Section 8 – Interpretation.
-
-For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
\ No newline at end of file
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/README.google b/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/README.google
deleted file mode 100644
index 7ad133e415..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/README.google
+++ /dev/null
@@ -1,12 +0,0 @@
-URL: https://github.com/jgm/CommonMark.git
-Version: 1ef46a73e61968a60cc7b2e700381d719165b86c
-License: Creative Commons CC-BY-SA 4.0
-License File: LICENSE
-
-Description:
-CommonMark spec
-
-Local Modifications:
-This directory contains only the spec file. License file has been
-subsetted to only the files it applies to, and text of CC-BY-SA 4.0
-license has been added.
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/spec.txt b/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/spec.txt
deleted file mode 100644
index e828e314a4..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/CommonMark/spec.txt
+++ /dev/null
@@ -1,9710 +0,0 @@
----
-title: CommonMark Spec
-author: John MacFarlane
-version: 0.29
-date: '2019-04-06'
-license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
-...
-
-# Introduction
-
-## What is Markdown?
-
-Markdown is a plain text format for writing structured documents,
-based on conventions for indicating formatting in email
-and usenet posts.  It was developed by John Gruber (with
-help from Aaron Swartz) and released in 2004 in the form of a
-[syntax description](http://daringfireball.net/projects/markdown/syntax)
-and a Perl script (`Markdown.pl`) for converting Markdown to
-HTML.  In the next decade, dozens of implementations were
-developed in many languages.  Some extended the original
-Markdown syntax with conventions for footnotes, tables, and
-other document elements.  Some allowed Markdown documents to be
-rendered in formats other than HTML.  Websites like Reddit,
-StackOverflow, and GitHub had millions of people using Markdown.
-And Markdown started to be used beyond the web, to author books,
-articles, slide shows, letters, and lecture notes.
-
-What distinguishes Markdown from many other lightweight markup
-syntaxes, which are often easier to write, is its readability.
-As Gruber writes:
-
-> The overriding design goal for Markdown's formatting syntax is
-> to make it as readable as possible. The idea is that a
-> Markdown-formatted document should be publishable as-is, as
-> plain text, without looking like it's been marked up with tags
-> or formatting instructions.
-> (<http://daringfireball.net/projects/markdown/>)
-
-The point can be illustrated by comparing a sample of
-[AsciiDoc](http://www.methods.co.nz/asciidoc/) with
-an equivalent sample of Markdown.  Here is a sample of
-AsciiDoc from the AsciiDoc manual:
-
-```
-1. List item one.
-+
-List item one continued with a second paragraph followed by an
-Indented block.
-+
-.................
-$ ls *.sh
-$ mv *.sh ~/tmp
-.................
-+
-List item continued with a third paragraph.
-
-2. List item two continued with an open block.
-+
---
-This paragraph is part of the preceding list item.
-
-a. This list is nested and does not require explicit item
-continuation.
-+
-This paragraph is part of the preceding list item.
-
-b. List item b.
-
-This paragraph belongs to item two of the outer list.
---
-```
-
-And here is the equivalent in Markdown:
-```
-1.  List item one.
-
-    List item one continued with a second paragraph followed by an
-    Indented block.
-
-        $ ls *.sh
-        $ mv *.sh ~/tmp
-
-    List item continued with a third paragraph.
-
-2.  List item two continued with an open block.
-
-    This paragraph is part of the preceding list item.
-
-    1. This list is nested and does not require explicit item continuation.
-
-       This paragraph is part of the preceding list item.
-
-    2. List item b.
-
-    This paragraph belongs to item two of the outer list.
-```
-
-The AsciiDoc version is, arguably, easier to write. You don't need
-to worry about indentation.  But the Markdown version is much easier
-to read.  The nesting of list items is apparent to the eye in the
-source, not just in the processed document.
-
-## Why is a spec needed?
-
-John Gruber's [canonical description of Markdown's
-syntax](http://daringfireball.net/projects/markdown/syntax)
-does not specify the syntax unambiguously.  Here are some examples of
-questions it does not answer:
-
-1.  How much indentation is needed for a sublist?  The spec says that
-    continuation paragraphs need to be indented four spaces, but is
-    not fully explicit about sublists.  It is natural to think that
-    they, too, must be indented four spaces, but `Markdown.pl` does
-    not require that.  This is hardly a "corner case," and divergences
-    between implementations on this issue often lead to surprises for
-    users in real documents. (See [this comment by John
-    Gruber](http://article.gmane.org/gmane.text.markdown.general/1997).)
-
-2.  Is a blank line needed before a block quote or heading?
-    Most implementations do not require the blank line.  However,
-    this can lead to unexpected results in hard-wrapped text, and
-    also to ambiguities in parsing (note that some implementations
-    put the heading inside the blockquote, while others do not).
-    (John Gruber has also spoken [in favor of requiring the blank
-    lines](http://article.gmane.org/gmane.text.markdown.general/2146).)
-
-3.  Is a blank line needed before an indented code block?
-    (`Markdown.pl` requires it, but this is not mentioned in the
-    documentation, and some implementations do not require it.)
-
-    ``` markdown
-    paragraph
-        code?
-    ```
-
-4.  What is the exact rule for determining when list items get
-    wrapped in `<p>` tags?  Can a list be partially "loose" and partially
-    "tight"?  What should we do with a list like this?
-
-    ``` markdown
-    1. one
-
-    2. two
-    3. three
-    ```
-
-    Or this?
-
-    ``` markdown
-    1.  one
-        - a
-
-        - b
-    2.  two
-    ```
-
-    (There are some relevant comments by John Gruber
-    [here](http://article.gmane.org/gmane.text.markdown.general/2554).)
-
-5.  Can list markers be indented?  Can ordered list markers be right-aligned?
-
-    ``` markdown
-     8. item 1
-     9. item 2
-    10. item 2a
-    ```
-
-6.  Is this one list with a thematic break in its second item,
-    or two lists separated by a thematic break?
-
-    ``` markdown
-    * a
-    * * * * *
-    * b
-    ```
-
-7.  When list markers change from numbers to bullets, do we have
-    two lists or one?  (The Markdown syntax description suggests two,
-    but the perl scripts and many other implementations produce one.)
-
-    ``` markdown
-    1. fee
-    2. fie
-    -  foe
-    -  fum
-    ```
-
-8.  What are the precedence rules for the markers of inline structure?
-    For example, is the following a valid link, or does the code span
-    take precedence ?
-
-    ``` markdown
-    [a backtick (`)](/url) and [another backtick (`)](/url).
-    ```
-
-9.  What are the precedence rules for markers of emphasis and strong
-    emphasis?  For example, how should the following be parsed?
-
-    ``` markdown
-    *foo *bar* baz*
-    ```
-
-10. What are the precedence rules between block-level and inline-level
-    structure?  For example, how should the following be parsed?
-
-    ``` markdown
-    - `a long code span can contain a hyphen like this
-      - and it can screw things up`
-    ```
-
-11. Can list items include section headings?  (`Markdown.pl` does not
-    allow this, but does allow blockquotes to include headings.)
-
-    ``` markdown
-    - # Heading
-    ```
-
-12. Can list items be empty?
-
-    ``` markdown
-    * a
-    *
-    * b
-    ```
-
-13. Can link references be defined inside block quotes or list items?
-
-    ``` markdown
-    > Blockquote [foo].
-    >
-    > [foo]: /url
-    ```
-
-14. If there are multiple definitions for the same reference, which takes
-    precedence?
-
-    ``` markdown
-    [foo]: /url1
-    [foo]: /url2
-
-    [foo][]
-    ```
-
-In the absence of a spec, early implementers consulted `Markdown.pl`
-to resolve these ambiguities.  But `Markdown.pl` was quite buggy, and
-gave manifestly bad results in many cases, so it was not a
-satisfactory replacement for a spec.
-
-Because there is no unambiguous spec, implementations have diverged
-considerably.  As a result, users are often surprised to find that
-a document that renders one way on one system (say, a GitHub wiki)
-renders differently on another (say, converting to docbook using
-pandoc).  To make matters worse, because nothing in Markdown counts
-as a "syntax error," the divergence often isn't discovered right away.
-
-## About this document
-
-This document attempts to specify Markdown syntax unambiguously.
-It contains many examples with side-by-side Markdown and
-HTML.  These are intended to double as conformance tests.  An
-accompanying script `spec_tests.py` can be used to run the tests
-against any Markdown program:
-
-    python test/spec_tests.py --spec spec.txt --program PROGRAM
-
-Since this document describes how Markdown is to be parsed into
-an abstract syntax tree, it would have made sense to use an abstract
-representation of the syntax tree instead of HTML.  But HTML is capable
-of representing the structural distinctions we need to make, and the
-choice of HTML for the tests makes it possible to run the tests against
-an implementation without writing an abstract syntax tree renderer.
-
-This document is generated from a text file, `spec.txt`, written
-in Markdown with a small extension for the side-by-side tests.
-The script `tools/makespec.py` can be used to convert `spec.txt` into
-HTML or CommonMark (which can then be converted into other formats).
-
-In the examples, the `→` character is used to represent tabs.
-
-# Preliminaries
-
-## Characters and lines
-
-Any sequence of [characters] is a valid CommonMark
-document.
-
-A [character](@) is a Unicode code point.  Although some
-code points (for example, combining accents) do not correspond to
-characters in an intuitive sense, all code points count as characters
-for purposes of this spec.
-
-This spec does not specify an encoding; it thinks of lines as composed
-of [characters] rather than bytes.  A conforming parser may be limited
-to a certain encoding.
-
-A [line](@) is a sequence of zero or more [characters]
-other than newline (`U+000A`) or carriage return (`U+000D`),
-followed by a [line ending] or by the end of file.
-
-A [line ending](@) is a newline (`U+000A`), a carriage return
-(`U+000D`) not followed by a newline, or a carriage return and a
-following newline.
-
-A line containing no characters, or a line containing only spaces
-(`U+0020`) or tabs (`U+0009`), is called a [blank line](@).
-
-The following definitions of character classes will be used in this spec:
-
-A [whitespace character](@) is a space
-(`U+0020`), tab (`U+0009`), newline (`U+000A`), line tabulation (`U+000B`),
-form feed (`U+000C`), or carriage return (`U+000D`).
-
-[Whitespace](@) is a sequence of one or more [whitespace
-characters].
-
-A [Unicode whitespace character](@) is
-any code point in the Unicode `Zs` general category, or a tab (`U+0009`),
-carriage return (`U+000D`), newline (`U+000A`), or form feed
-(`U+000C`).
-
-[Unicode whitespace](@) is a sequence of one
-or more [Unicode whitespace characters].
-
-A [space](@) is `U+0020`.
-
-A [non-whitespace character](@) is any character
-that is not a [whitespace character].
-
-An [ASCII punctuation character](@)
-is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
-`*`, `+`, `,`, `-`, `.`, `/` (U+0021–2F), 
-`:`, `;`, `<`, `=`, `>`, `?`, `@` (U+003A–0040),
-`[`, `\`, `]`, `^`, `_`, `` ` `` (U+005B–0060), 
-`{`, `|`, `}`, or `~` (U+007B–007E).
-
-A [punctuation character](@) is an [ASCII
-punctuation character] or anything in
-the general Unicode categories  `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
-
-## Tabs
-
-Tabs in lines are not expanded to [spaces].  However,
-in contexts where whitespace helps to define block structure,
-tabs behave as if they were replaced by spaces with a tab stop
-of 4 characters.
-
-Thus, for example, a tab can be used instead of four spaces
-in an indented code block.  (Note, however, that internal
-tabs are passed through as literal tabs, not expanded to
-spaces.)
-
-```````````````````````````````` example
-→foo→baz→→bim
-.
-<pre><code>foo→baz→→bim
-</code></pre>
-````````````````````````````````
-
-```````````````````````````````` example
-  →foo→baz→→bim
-.
-<pre><code>foo→baz→→bim
-</code></pre>
-````````````````````````````````
-
-```````````````````````````````` example
-    a→a
-    ὐ→a
-.
-<pre><code>a→a
-ὐ→a
-</code></pre>
-````````````````````````````````
-
-In the following example, a continuation paragraph of a list
-item is indented with a tab; this has exactly the same effect
-as indentation with four spaces would:
-
-```````````````````````````````` example
-  - foo
-
-→bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-- foo
-
-→→bar
-.
-<ul>
-<li>
-<p>foo</p>
-<pre><code>  bar
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-Normally the `>` that begins a block quote may be followed
-optionally by a space, which is not considered part of the
-content.  In the following case `>` is followed by a tab,
-which is treated as if it were expanded into three spaces.
-Since one of these spaces is considered part of the
-delimiter, `foo` is considered to be indented six spaces
-inside the block quote context, so we get an indented
-code block starting with two spaces.
-
-```````````````````````````````` example
->→→foo
-.
-<blockquote>
-<pre><code>  foo
-</code></pre>
-</blockquote>
-````````````````````````````````
-
-```````````````````````````````` example
--→→foo
-.
-<ul>
-<li>
-<pre><code>  foo
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    foo
-→bar
-.
-<pre><code>foo
-bar
-</code></pre>
-````````````````````````````````
-
-```````````````````````````````` example
- - foo
-   - bar
-→ - baz
-.
-<ul>
-<li>foo
-<ul>
-<li>bar
-<ul>
-<li>baz</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-#→Foo
-.
-<h1>Foo</h1>
-````````````````````````````````
-
-```````````````````````````````` example
-*→*→*→
-.
-<hr />
-````````````````````````````````
-
-
-## Insecure characters
-
-For security reasons, the Unicode character `U+0000` must be replaced
-with the REPLACEMENT CHARACTER (`U+FFFD`).
-
-# Blocks and inlines
-
-We can think of a document as a sequence of
-[blocks](@)---structural elements like paragraphs, block
-quotations, lists, headings, rules, and code blocks.  Some blocks (like
-block quotes and list items) contain other blocks; others (like
-headings and paragraphs) contain [inline](@) content---text,
-links, emphasized text, images, code spans, and so on.
-
-## Precedence
-
-Indicators of block structure always take precedence over indicators
-of inline structure.  So, for example, the following is a list with
-two items, not a list with one item containing a code span:
-
-```````````````````````````````` example
-- `one
-- two`
-.
-<ul>
-<li>`one</li>
-<li>two`</li>
-</ul>
-````````````````````````````````
-
-
-This means that parsing can proceed in two steps:  first, the block
-structure of the document can be discerned; second, text lines inside
-paragraphs, headings, and other block constructs can be parsed for inline
-structure.  The second step requires information about link reference
-definitions that will be available only at the end of the first
-step.  Note that the first step requires processing lines in sequence,
-but the second can be parallelized, since the inline parsing of
-one block element does not affect the inline parsing of any other.
-
-## Container blocks and leaf blocks
-
-We can divide blocks into two types:
-[container blocks](@),
-which can contain other blocks, and [leaf blocks](@),
-which cannot.
-
-# Leaf blocks
-
-This section describes the different kinds of leaf block that make up a
-Markdown document.
-
-## Thematic breaks
-
-A line consisting of 0-3 spaces of indentation, followed by a sequence
-of three or more matching `-`, `_`, or `*` characters, each followed
-optionally by any number of spaces or tabs, forms a
-[thematic break](@).
-
-```````````````````````````````` example
-***
----
-___
-.
-<hr />
-<hr />
-<hr />
-````````````````````````````````
-
-
-Wrong characters:
-
-```````````````````````````````` example
-+++
-.
-<p>+++</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-===
-.
-<p>===</p>
-````````````````````````````````
-
-
-Not enough characters:
-
-```````````````````````````````` example
---
-**
-__
-.
-<p>--
-**
-__</p>
-````````````````````````````````
-
-
-One to three spaces indent are allowed:
-
-```````````````````````````````` example
- ***
-  ***
-   ***
-.
-<hr />
-<hr />
-<hr />
-````````````````````````````````
-
-
-Four spaces is too many:
-
-```````````````````````````````` example
-    ***
-.
-<pre><code>***
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-Foo
-    ***
-.
-<p>Foo
-***</p>
-````````````````````````````````
-
-
-More than three characters may be used:
-
-```````````````````````````````` example
-_____________________________________
-.
-<hr />
-````````````````````````````````
-
-
-Spaces are allowed between the characters:
-
-```````````````````````````````` example
- - - -
-.
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
- **  * ** * ** * **
-.
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
--     -      -      -
-.
-<hr />
-````````````````````````````````
-
-
-Spaces are allowed at the end:
-
-```````````````````````````````` example
-- - - -    
-.
-<hr />
-````````````````````````````````
-
-
-However, no other characters may occur in the line:
-
-```````````````````````````````` example
-_ _ _ _ a
-
-a------
-
----a---
-.
-<p>_ _ _ _ a</p>
-<p>a------</p>
-<p>---a---</p>
-````````````````````````````````
-
-
-It is required that all of the [non-whitespace characters] be the same.
-So, this is not a thematic break:
-
-```````````````````````````````` example
- *-*
-.
-<p><em>-</em></p>
-````````````````````````````````
-
-
-Thematic breaks do not need blank lines before or after:
-
-```````````````````````````````` example
-- foo
-***
-- bar
-.
-<ul>
-<li>foo</li>
-</ul>
-<hr />
-<ul>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-Thematic breaks can interrupt a paragraph:
-
-```````````````````````````````` example
-Foo
-***
-bar
-.
-<p>Foo</p>
-<hr />
-<p>bar</p>
-````````````````````````````````
-
-
-If a line of dashes that meets the above conditions for being a
-thematic break could also be interpreted as the underline of a [setext
-heading], the interpretation as a
-[setext heading] takes precedence. Thus, for example,
-this is a setext heading, not a paragraph followed by a thematic break:
-
-```````````````````````````````` example
-Foo
----
-bar
-.
-<h2>Foo</h2>
-<p>bar</p>
-````````````````````````````````
-
-
-When both a thematic break and a list item are possible
-interpretations of a line, the thematic break takes precedence:
-
-```````````````````````````````` example
-* Foo
-* * *
-* Bar
-.
-<ul>
-<li>Foo</li>
-</ul>
-<hr />
-<ul>
-<li>Bar</li>
-</ul>
-````````````````````````````````
-
-
-If you want a thematic break in a list item, use a different bullet:
-
-```````````````````````````````` example
-- Foo
-- * * *
-.
-<ul>
-<li>Foo</li>
-<li>
-<hr />
-</li>
-</ul>
-````````````````````````````````
-
-
-## ATX headings
-
-An [ATX heading](@)
-consists of a string of characters, parsed as inline content, between an
-opening sequence of 1--6 unescaped `#` characters and an optional
-closing sequence of any number of unescaped `#` characters.
-The opening sequence of `#` characters must be followed by a
-[space] or by the end of line. The optional closing sequence of `#`s must be
-preceded by a [space] and may be followed by spaces only.  The opening
-`#` character may be indented 0-3 spaces.  The raw contents of the
-heading are stripped of leading and trailing spaces before being parsed
-as inline content.  The heading level is equal to the number of `#`
-characters in the opening sequence.
-
-Simple headings:
-
-```````````````````````````````` example
-# foo
-## foo
-### foo
-#### foo
-##### foo
-###### foo
-.
-<h1>foo</h1>
-<h2>foo</h2>
-<h3>foo</h3>
-<h4>foo</h4>
-<h5>foo</h5>
-<h6>foo</h6>
-````````````````````````````````
-
-
-More than six `#` characters is not a heading:
-
-```````````````````````````````` example
-####### foo
-.
-<p>####### foo</p>
-````````````````````````````````
-
-
-At least one space is required between the `#` characters and the
-heading's contents, unless the heading is empty.  Note that many
-implementations currently do not require the space.  However, the
-space was required by the
-[original ATX implementation](http://www.aaronsw.com/2002/atx/atx.py),
-and it helps prevent things like the following from being parsed as
-headings:
-
-```````````````````````````````` example
-#5 bolt
-
-#hashtag
-.
-<p>#5 bolt</p>
-<p>#hashtag</p>
-````````````````````````````````
-
-
-This is not a heading, because the first `#` is escaped:
-
-```````````````````````````````` example
-\## foo
-.
-<p>## foo</p>
-````````````````````````````````
-
-
-Contents are parsed as inlines:
-
-```````````````````````````````` example
-# foo *bar* \*baz\*
-.
-<h1>foo <em>bar</em> *baz*</h1>
-````````````````````````````````
-
-
-Leading and trailing [whitespace] is ignored in parsing inline content:
-
-```````````````````````````````` example
-#                  foo                     
-.
-<h1>foo</h1>
-````````````````````````````````
-
-
-One to three spaces indentation are allowed:
-
-```````````````````````````````` example
- ### foo
-  ## foo
-   # foo
-.
-<h3>foo</h3>
-<h2>foo</h2>
-<h1>foo</h1>
-````````````````````````````````
-
-
-Four spaces are too much:
-
-```````````````````````````````` example
-    # foo
-.
-<pre><code># foo
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo
-    # bar
-.
-<p>foo
-# bar</p>
-````````````````````````````````
-
-
-A closing sequence of `#` characters is optional:
-
-```````````````````````````````` example
-## foo ##
-  ###   bar    ###
-.
-<h2>foo</h2>
-<h3>bar</h3>
-````````````````````````````````
-
-
-It need not be the same length as the opening sequence:
-
-```````````````````````````````` example
-# foo ##################################
-##### foo ##
-.
-<h1>foo</h1>
-<h5>foo</h5>
-````````````````````````````````
-
-
-Spaces are allowed after the closing sequence:
-
-```````````````````````````````` example
-### foo ###     
-.
-<h3>foo</h3>
-````````````````````````````````
-
-
-A sequence of `#` characters with anything but [spaces] following it
-is not a closing sequence, but counts as part of the contents of the
-heading:
-
-```````````````````````````````` example
-### foo ### b
-.
-<h3>foo ### b</h3>
-````````````````````````````````
-
-
-The closing sequence must be preceded by a space:
-
-```````````````````````````````` example
-# foo#
-.
-<h1>foo#</h1>
-````````````````````````````````
-
-
-Backslash-escaped `#` characters do not count as part
-of the closing sequence:
-
-```````````````````````````````` example
-### foo \###
-## foo #\##
-# foo \#
-.
-<h3>foo ###</h3>
-<h2>foo ###</h2>
-<h1>foo #</h1>
-````````````````````````````````
-
-
-ATX headings need not be separated from surrounding content by blank
-lines, and they can interrupt paragraphs:
-
-```````````````````````````````` example
-****
-## foo
-****
-.
-<hr />
-<h2>foo</h2>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-Foo bar
-# baz
-Bar foo
-.
-<p>Foo bar</p>
-<h1>baz</h1>
-<p>Bar foo</p>
-````````````````````````````````
-
-
-ATX headings can be empty:
-
-```````````````````````````````` example
-## 
-#
-### ###
-.
-<h2></h2>
-<h1></h1>
-<h3></h3>
-````````````````````````````````
-
-
-## Setext headings
-
-A [setext heading](@) consists of one or more
-lines of text, each containing at least one [non-whitespace
-character], with no more than 3 spaces indentation, followed by
-a [setext heading underline].  The lines of text must be such
-that, were they not followed by the setext heading underline,
-they would be interpreted as a paragraph:  they cannot be
-interpretable as a [code fence], [ATX heading][ATX headings],
-[block quote][block quotes], [thematic break][thematic breaks],
-[list item][list items], or [HTML block][HTML blocks].
-
-A [setext heading underline](@) is a sequence of
-`=` characters or a sequence of `-` characters, with no more than 3
-spaces indentation and any number of trailing spaces.  If a line
-containing a single `-` can be interpreted as an
-empty [list items], it should be interpreted this way
-and not as a [setext heading underline].
-
-The heading is a level 1 heading if `=` characters are used in
-the [setext heading underline], and a level 2 heading if `-`
-characters are used.  The contents of the heading are the result
-of parsing the preceding lines of text as CommonMark inline
-content.
-
-In general, a setext heading need not be preceded or followed by a
-blank line.  However, it cannot interrupt a paragraph, so when a
-setext heading comes after a paragraph, a blank line is needed between
-them.
-
-Simple examples:
-
-```````````````````````````````` example
-Foo *bar*
-=========
-
-Foo *bar*
----------
-.
-<h1>Foo <em>bar</em></h1>
-<h2>Foo <em>bar</em></h2>
-````````````````````````````````
-
-
-The content of the header may span more than one line:
-
-```````````````````````````````` example
-Foo *bar
-baz*
-====
-.
-<h1>Foo <em>bar
-baz</em></h1>
-````````````````````````````````
-
-The contents are the result of parsing the headings's raw
-content as inlines.  The heading's raw content is formed by
-concatenating the lines and removing initial and final
-[whitespace].
-
-```````````````````````````````` example
-  Foo *bar
-baz*→
-====
-.
-<h1>Foo <em>bar
-baz</em></h1>
-````````````````````````````````
-
-
-The underlining can be any length:
-
-```````````````````````````````` example
-Foo
--------------------------
-
-Foo
-=
-.
-<h2>Foo</h2>
-<h1>Foo</h1>
-````````````````````````````````
-
-
-The heading content can be indented up to three spaces, and need
-not line up with the underlining:
-
-```````````````````````````````` example
-   Foo
----
-
-  Foo
------
-
-  Foo
-  ===
-.
-<h2>Foo</h2>
-<h2>Foo</h2>
-<h1>Foo</h1>
-````````````````````````````````
-
-
-Four spaces indent is too much:
-
-```````````````````````````````` example
-    Foo
-    ---
-
-    Foo
----
-.
-<pre><code>Foo
----
-
-Foo
-</code></pre>
-<hr />
-````````````````````````````````
-
-
-The setext heading underline can be indented up to three spaces, and
-may have trailing spaces:
-
-```````````````````````````````` example
-Foo
-   ----      
-.
-<h2>Foo</h2>
-````````````````````````````````
-
-
-Four spaces is too much:
-
-```````````````````````````````` example
-Foo
-    ---
-.
-<p>Foo
----</p>
-````````````````````````````````
-
-
-The setext heading underline cannot contain internal spaces:
-
-```````````````````````````````` example
-Foo
-= =
-
-Foo
---- -
-.
-<p>Foo
-= =</p>
-<p>Foo</p>
-<hr />
-````````````````````````````````
-
-
-Trailing spaces in the content line do not cause a line break:
-
-```````````````````````````````` example
-Foo  
------
-.
-<h2>Foo</h2>
-````````````````````````````````
-
-
-Nor does a backslash at the end:
-
-```````````````````````````````` example
-Foo\
-----
-.
-<h2>Foo\</h2>
-````````````````````````````````
-
-
-Since indicators of block structure take precedence over
-indicators of inline structure, the following are setext headings:
-
-```````````````````````````````` example
-`Foo
-----
-`
-
-<a title="a lot
----
-of dashes"/>
-.
-<h2>`Foo</h2>
-<p>`</p>
-<h2>&lt;a title=&quot;a lot</h2>
-<p>of dashes&quot;/&gt;</p>
-````````````````````````````````
-
-
-The setext heading underline cannot be a [lazy continuation
-line] in a list item or block quote:
-
-```````````````````````````````` example
-> Foo
----
-.
-<blockquote>
-<p>Foo</p>
-</blockquote>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-> foo
-bar
-===
-.
-<blockquote>
-<p>foo
-bar
-===</p>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- Foo
----
-.
-<ul>
-<li>Foo</li>
-</ul>
-<hr />
-````````````````````````````````
-
-
-A blank line is needed between a paragraph and a following
-setext heading, since otherwise the paragraph becomes part
-of the heading's content:
-
-```````````````````````````````` example
-Foo
-Bar
----
-.
-<h2>Foo
-Bar</h2>
-````````````````````````````````
-
-
-But in general a blank line is not required before or after
-setext headings:
-
-```````````````````````````````` example
----
-Foo
----
-Bar
----
-Baz
-.
-<hr />
-<h2>Foo</h2>
-<h2>Bar</h2>
-<p>Baz</p>
-````````````````````````````````
-
-
-Setext headings cannot be empty:
-
-```````````````````````````````` example
-
-====
-.
-<p>====</p>
-````````````````````````````````
-
-
-Setext heading text lines must not be interpretable as block
-constructs other than paragraphs.  So, the line of dashes
-in these examples gets interpreted as a thematic break:
-
-```````````````````````````````` example
----
----
-.
-<hr />
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-- foo
------
-.
-<ul>
-<li>foo</li>
-</ul>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-    foo
----
-.
-<pre><code>foo
-</code></pre>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-> foo
------
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-<hr />
-````````````````````````````````
-
-
-If you want a heading with `> foo` as its literal text, you can
-use backslash escapes:
-
-```````````````````````````````` example
-\> foo
-------
-.
-<h2>&gt; foo</h2>
-````````````````````````````````
-
-
-**Compatibility note:**  Most existing Markdown implementations
-do not allow the text of setext headings to span multiple lines.
-But there is no consensus about how to interpret
-
-``` markdown
-Foo
-bar
----
-baz
-```
-
-One can find four different interpretations:
-
-1. paragraph "Foo", heading "bar", paragraph "baz"
-2. paragraph "Foo bar", thematic break, paragraph "baz"
-3. paragraph "Foo bar --- baz"
-4. heading "Foo bar", paragraph "baz"
-
-We find interpretation 4 most natural, and interpretation 4
-increases the expressive power of CommonMark, by allowing
-multiline headings.  Authors who want interpretation 1 can
-put a blank line after the first paragraph:
-
-```````````````````````````````` example
-Foo
-
-bar
----
-baz
-.
-<p>Foo</p>
-<h2>bar</h2>
-<p>baz</p>
-````````````````````````````````
-
-
-Authors who want interpretation 2 can put blank lines around
-the thematic break,
-
-```````````````````````````````` example
-Foo
-bar
-
----
-
-baz
-.
-<p>Foo
-bar</p>
-<hr />
-<p>baz</p>
-````````````````````````````````
-
-
-or use a thematic break that cannot count as a [setext heading
-underline], such as
-
-```````````````````````````````` example
-Foo
-bar
-* * *
-baz
-.
-<p>Foo
-bar</p>
-<hr />
-<p>baz</p>
-````````````````````````````````
-
-
-Authors who want interpretation 3 can use backslash escapes:
-
-```````````````````````````````` example
-Foo
-bar
-\---
-baz
-.
-<p>Foo
-bar
----
-baz</p>
-````````````````````````````````
-
-
-## Indented code blocks
-
-An [indented code block](@) is composed of one or more
-[indented chunks] separated by blank lines.
-An [indented chunk](@) is a sequence of non-blank lines,
-each indented four or more spaces. The contents of the code block are
-the literal contents of the lines, including trailing
-[line endings], minus four spaces of indentation.
-An indented code block has no [info string].
-
-An indented code block cannot interrupt a paragraph, so there must be
-a blank line between a paragraph and a following indented code block.
-(A blank line is not needed, however, between a code block and a following
-paragraph.)
-
-```````````````````````````````` example
-    a simple
-      indented code block
-.
-<pre><code>a simple
-  indented code block
-</code></pre>
-````````````````````````````````
-
-
-If there is any ambiguity between an interpretation of indentation
-as a code block and as indicating that material belongs to a [list
-item][list items], the list item interpretation takes precedence:
-
-```````````````````````````````` example
-  - foo
-
-    bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1.  foo
-
-    - bar
-.
-<ol>
-<li>
-<p>foo</p>
-<ul>
-<li>bar</li>
-</ul>
-</li>
-</ol>
-````````````````````````````````
-
-
-
-The contents of a code block are literal text, and do not get parsed
-as Markdown:
-
-```````````````````````````````` example
-    <a/>
-    *hi*
-
-    - one
-.
-<pre><code>&lt;a/&gt;
-*hi*
-
-- one
-</code></pre>
-````````````````````````````````
-
-
-Here we have three chunks separated by blank lines:
-
-```````````````````````````````` example
-    chunk1
-
-    chunk2
-  
- 
- 
-    chunk3
-.
-<pre><code>chunk1
-
-chunk2
-
-
-
-chunk3
-</code></pre>
-````````````````````````````````
-
-
-Any initial spaces beyond four will be included in the content, even
-in interior blank lines:
-
-```````````````````````````````` example
-    chunk1
-      
-      chunk2
-.
-<pre><code>chunk1
-  
-  chunk2
-</code></pre>
-````````````````````````````````
-
-
-An indented code block cannot interrupt a paragraph.  (This
-allows hanging indents and the like.)
-
-```````````````````````````````` example
-Foo
-    bar
-
-.
-<p>Foo
-bar</p>
-````````````````````````````````
-
-
-However, any non-blank line with fewer than four leading spaces ends
-the code block immediately.  So a paragraph may occur immediately
-after indented code:
-
-```````````````````````````````` example
-    foo
-bar
-.
-<pre><code>foo
-</code></pre>
-<p>bar</p>
-````````````````````````````````
-
-
-And indented code can occur immediately before and after other kinds of
-blocks:
-
-```````````````````````````````` example
-# Heading
-    foo
-Heading
-------
-    foo
-----
-.
-<h1>Heading</h1>
-<pre><code>foo
-</code></pre>
-<h2>Heading</h2>
-<pre><code>foo
-</code></pre>
-<hr />
-````````````````````````````````
-
-
-The first line can be indented more than four spaces:
-
-```````````````````````````````` example
-        foo
-    bar
-.
-<pre><code>    foo
-bar
-</code></pre>
-````````````````````````````````
-
-
-Blank lines preceding or following an indented code block
-are not included in it:
-
-```````````````````````````````` example
-
-    
-    foo
-    
-
-.
-<pre><code>foo
-</code></pre>
-````````````````````````````````
-
-
-Trailing spaces are included in the code block's content:
-
-```````````````````````````````` example
-    foo  
-.
-<pre><code>foo  
-</code></pre>
-````````````````````````````````
-
-
-
-## Fenced code blocks
-
-A [code fence](@) is a sequence
-of at least three consecutive backtick characters (`` ` ``) or
-tildes (`~`).  (Tildes and backticks cannot be mixed.)
-A [fenced code block](@)
-begins with a code fence, indented no more than three spaces.
-
-The line with the opening code fence may optionally contain some text
-following the code fence; this is trimmed of leading and trailing
-whitespace and called the [info string](@). If the [info string] comes
-after a backtick fence, it may not contain any backtick
-characters.  (The reason for this restriction is that otherwise
-some inline code would be incorrectly interpreted as the
-beginning of a fenced code block.)
-
-The content of the code block consists of all subsequent lines, until
-a closing [code fence] of the same type as the code block
-began with (backticks or tildes), and with at least as many backticks
-or tildes as the opening code fence.  If the leading code fence is
-indented N spaces, then up to N spaces of indentation are removed from
-each line of the content (if present).  (If a content line is not
-indented, it is preserved unchanged.  If it is indented less than N
-spaces, all of the indentation is removed.)
-
-The closing code fence may be indented up to three spaces, and may be
-followed only by spaces, which are ignored.  If the end of the
-containing block (or document) is reached and no closing code fence
-has been found, the code block contains all of the lines after the
-opening code fence until the end of the containing block (or
-document).  (An alternative spec would require backtracking in the
-event that a closing code fence is not found.  But this makes parsing
-much less efficient, and there seems to be no real down side to the
-behavior described here.)
-
-A fenced code block may interrupt a paragraph, and does not require
-a blank line either before or after.
-
-The content of a code fence is treated as literal text, not parsed
-as inlines.  The first word of the [info string] is typically used to
-specify the language of the code sample, and rendered in the `class`
-attribute of the `code` tag.  However, this spec does not mandate any
-particular treatment of the [info string].
-
-Here is a simple example with backticks:
-
-```````````````````````````````` example
-```
-<
- >
-```
-.
-<pre><code>&lt;
- &gt;
-</code></pre>
-````````````````````````````````
-
-
-With tildes:
-
-```````````````````````````````` example
-~~~
-<
- >
-~~~
-.
-<pre><code>&lt;
- &gt;
-</code></pre>
-````````````````````````````````
-
-Fewer than three backticks is not enough:
-
-```````````````````````````````` example
-``
-foo
-``
-.
-<p><code>foo</code></p>
-````````````````````````````````
-
-The closing code fence must use the same character as the opening
-fence:
-
-```````````````````````````````` example
-```
-aaa
-~~~
-```
-.
-<pre><code>aaa
-~~~
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~
-aaa
-```
-~~~
-.
-<pre><code>aaa
-```
-</code></pre>
-````````````````````````````````
-
-
-The closing code fence must be at least as long as the opening fence:
-
-```````````````````````````````` example
-````
-aaa
-```
-``````
-.
-<pre><code>aaa
-```
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~~
-aaa
-~~~
-~~~~
-.
-<pre><code>aaa
-~~~
-</code></pre>
-````````````````````````````````
-
-
-Unclosed code blocks are closed by the end of the document
-(or the enclosing [block quote][block quotes] or [list item][list items]):
-
-```````````````````````````````` example
-```
-.
-<pre><code></code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-`````
-
-```
-aaa
-.
-<pre><code>
-```
-aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> ```
-> aaa
-
-bbb
-.
-<blockquote>
-<pre><code>aaa
-</code></pre>
-</blockquote>
-<p>bbb</p>
-````````````````````````````````
-
-
-A code block can have all empty lines as its content:
-
-```````````````````````````````` example
-```
-
-  
-```
-.
-<pre><code>
-  
-</code></pre>
-````````````````````````````````
-
-
-A code block can be empty:
-
-```````````````````````````````` example
-```
-```
-.
-<pre><code></code></pre>
-````````````````````````````````
-
-
-Fences can be indented.  If the opening fence is indented,
-content lines will have equivalent opening indentation removed,
-if present:
-
-```````````````````````````````` example
- ```
- aaa
-aaa
-```
-.
-<pre><code>aaa
-aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-  ```
-aaa
-  aaa
-aaa
-  ```
-.
-<pre><code>aaa
-aaa
-aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-   ```
-   aaa
-    aaa
-  aaa
-   ```
-.
-<pre><code>aaa
- aaa
-aaa
-</code></pre>
-````````````````````````````````
-
-
-Four spaces indentation produces an indented code block:
-
-```````````````````````````````` example
-    ```
-    aaa
-    ```
-.
-<pre><code>```
-aaa
-```
-</code></pre>
-````````````````````````````````
-
-
-Closing fences may be indented by 0-3 spaces, and their indentation
-need not match that of the opening fence:
-
-```````````````````````````````` example
-```
-aaa
-  ```
-.
-<pre><code>aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-   ```
-aaa
-  ```
-.
-<pre><code>aaa
-</code></pre>
-````````````````````````````````
-
-
-This is not a closing fence, because it is indented 4 spaces:
-
-```````````````````````````````` example
-```
-aaa
-    ```
-.
-<pre><code>aaa
-    ```
-</code></pre>
-````````````````````````````````
-
-
-
-Code fences (opening and closing) cannot contain internal spaces:
-
-```````````````````````````````` example
-``` ```
-aaa
-.
-<p><code> </code>
-aaa</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~~~~
-aaa
-~~~ ~~
-.
-<pre><code>aaa
-~~~ ~~
-</code></pre>
-````````````````````````````````
-
-
-Fenced code blocks can interrupt paragraphs, and can be followed
-directly by paragraphs, without a blank line between:
-
-```````````````````````````````` example
-foo
-```
-bar
-```
-baz
-.
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-<p>baz</p>
-````````````````````````````````
-
-
-Other blocks can also occur before and after fenced code blocks
-without an intervening blank line:
-
-```````````````````````````````` example
-foo
----
-~~~
-bar
-~~~
-# baz
-.
-<h2>foo</h2>
-<pre><code>bar
-</code></pre>
-<h1>baz</h1>
-````````````````````````````````
-
-
-An [info string] can be provided after the opening code fence.
-Although this spec doesn't mandate any particular treatment of
-the info string, the first word is typically used to specify
-the language of the code block. In HTML output, the language is
-normally indicated by adding a class to the `code` element consisting
-of `language-` followed by the language name.
-
-```````````````````````````````` example
-```ruby
-def foo(x)
-  return 3
-end
-```
-.
-<pre><code class="language-ruby">def foo(x)
-  return 3
-end
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~~    ruby startline=3 $%@#$
-def foo(x)
-  return 3
-end
-~~~~~~~
-.
-<pre><code class="language-ruby">def foo(x)
-  return 3
-end
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-````;
-````
-.
-<pre><code class="language-;"></code></pre>
-````````````````````````````````
-
-
-[Info strings] for backtick code blocks cannot contain backticks:
-
-```````````````````````````````` example
-``` aa ```
-foo
-.
-<p><code>aa</code>
-foo</p>
-````````````````````````````````
-
-
-[Info strings] for tilde code blocks can contain backticks and tildes:
-
-```````````````````````````````` example
-~~~ aa ``` ~~~
-foo
-~~~
-.
-<pre><code class="language-aa">foo
-</code></pre>
-````````````````````````````````
-
-
-Closing code fences cannot have [info strings]:
-
-```````````````````````````````` example
-```
-``` aaa
-```
-.
-<pre><code>``` aaa
-</code></pre>
-````````````````````````````````
-
-
-
-## HTML blocks
-
-An [HTML block](@) is a group of lines that is treated
-as raw HTML (and will not be escaped in HTML output).
-
-There are seven kinds of [HTML block], which can be defined by their
-start and end conditions.  The block begins with a line that meets a
-[start condition](@) (after up to three spaces optional indentation).
-It ends with the first subsequent line that meets a matching [end
-condition](@), or the last line of the document, or the last line of
-the [container block](#container-blocks) containing the current HTML
-block, if no line is encountered that meets the [end condition].  If
-the first line meets both the [start condition] and the [end
-condition], the block will contain just that line.
-
-1.  **Start condition:**  line begins with the string `<script`,
-`<pre`, or `<style` (case-insensitive), followed by whitespace,
-the string `>`, or the end of the line.\
-**End condition:**  line contains an end tag
-`</script>`, `</pre>`, or `</style>` (case-insensitive; it
-need not match the start tag).
-
-2.  **Start condition:** line begins with the string `<!--`.\
-**End condition:**  line contains the string `-->`.
-
-3.  **Start condition:** line begins with the string `<?`.\
-**End condition:** line contains the string `?>`.
-
-4.  **Start condition:** line begins with the string `<!`
-followed by an uppercase ASCII letter.\
-**End condition:** line contains the character `>`.
-
-5.  **Start condition:**  line begins with the string
-`<![CDATA[`.\
-**End condition:** line contains the string `]]>`.
-
-6.  **Start condition:** line begins the string `<` or `</`
-followed by one of the strings (case-insensitive) `address`,
-`article`, `aside`, `base`, `basefont`, `blockquote`, `body`,
-`caption`, `center`, `col`, `colgroup`, `dd`, `details`, `dialog`,
-`dir`, `div`, `dl`, `dt`, `fieldset`, `figcaption`, `figure`,
-`footer`, `form`, `frame`, `frameset`,
-`h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `head`, `header`, `hr`,
-`html`, `iframe`, `legend`, `li`, `link`, `main`, `menu`, `menuitem`,
-`nav`, `noframes`, `ol`, `optgroup`, `option`, `p`, `param`,
-`section`, `source`, `summary`, `table`, `tbody`, `td`,
-`tfoot`, `th`, `thead`, `title`, `tr`, `track`, `ul`, followed
-by [whitespace], the end of the line, the string `>`, or
-the string `/>`.\
-**End condition:** line is followed by a [blank line].
-
-7.  **Start condition:**  line begins with a complete [open tag]
-(with any [tag name] other than `script`,
-`style`, or `pre`) or a complete [closing tag],
-followed only by [whitespace] or the end of the line.\
-**End condition:** line is followed by a [blank line].
-
-HTML blocks continue until they are closed by their appropriate
-[end condition], or the last line of the document or other [container
-block](#container-blocks).  This means any HTML **within an HTML
-block** that might otherwise be recognised as a start condition will
-be ignored by the parser and passed through as-is, without changing
-the parser's state.
-
-For instance, `<pre>` within a HTML block started by `<table>` will not affect
-the parser state; as the HTML block was started in by start condition 6, it
-will end at any blank line. This can be surprising:
-
-```````````````````````````````` example
-<table><tr><td>
-<pre>
-**Hello**,
-
-_world_.
-</pre>
-</td></tr></table>
-.
-<table><tr><td>
-<pre>
-**Hello**,
-<p><em>world</em>.
-</pre></p>
-</td></tr></table>
-````````````````````````````````
-
-In this case, the HTML block is terminated by the newline — the `**Hello**`
-text remains verbatim — and regular parsing resumes, with a paragraph,
-emphasised `world` and inline and block HTML following.
-
-All types of [HTML blocks] except type 7 may interrupt
-a paragraph.  Blocks of type 7 may not interrupt a paragraph.
-(This restriction is intended to prevent unwanted interpretation
-of long tags inside a wrapped paragraph as starting HTML blocks.)
-
-Some simple examples follow.  Here are some basic HTML blocks
-of type 6:
-
-```````````````````````````````` example
-<table>
-  <tr>
-    <td>
-           hi
-    </td>
-  </tr>
-</table>
-
-okay.
-.
-<table>
-  <tr>
-    <td>
-           hi
-    </td>
-  </tr>
-</table>
-<p>okay.</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
- <div>
-  *hello*
-         <foo><a>
-.
- <div>
-  *hello*
-         <foo><a>
-````````````````````````````````
-
-
-A block can also start with a closing tag:
-
-```````````````````````````````` example
-</div>
-*foo*
-.
-</div>
-*foo*
-````````````````````````````````
-
-
-Here we have two HTML blocks with a Markdown paragraph between them:
-
-```````````````````````````````` example
-<DIV CLASS="foo">
-
-*Markdown*
-
-</DIV>
-.
-<DIV CLASS="foo">
-<p><em>Markdown</em></p>
-</DIV>
-````````````````````````````````
-
-
-The tag on the first line can be partial, as long
-as it is split where there would be whitespace:
-
-```````````````````````````````` example
-<div id="foo"
-  class="bar">
-</div>
-.
-<div id="foo"
-  class="bar">
-</div>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<div id="foo" class="bar
-  baz">
-</div>
-.
-<div id="foo" class="bar
-  baz">
-</div>
-````````````````````````````````
-
-
-An open tag need not be closed:
-```````````````````````````````` example
-<div>
-*foo*
-
-*bar*
-.
-<div>
-*foo*
-<p><em>bar</em></p>
-````````````````````````````````
-
-
-
-A partial tag need not even be completed (garbage
-in, garbage out):
-
-```````````````````````````````` example
-<div id="foo"
-*hi*
-.
-<div id="foo"
-*hi*
-````````````````````````````````
-
-
-```````````````````````````````` example
-<div class
-foo
-.
-<div class
-foo
-````````````````````````````````
-
-
-The initial tag doesn't even need to be a valid
-tag, as long as it starts like one:
-
-```````````````````````````````` example
-<div *???-&&&-<---
-*foo*
-.
-<div *???-&&&-<---
-*foo*
-````````````````````````````````
-
-
-In type 6 blocks, the initial tag need not be on a line by
-itself:
-
-```````````````````````````````` example
-<div><a href="bar">*foo*</a></div>
-.
-<div><a href="bar">*foo*</a></div>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<table><tr><td>
-foo
-</td></tr></table>
-.
-<table><tr><td>
-foo
-</td></tr></table>
-````````````````````````````````
-
-
-Everything until the next blank line or end of document
-gets included in the HTML block.  So, in the following
-example, what looks like a Markdown code block
-is actually part of the HTML block, which continues until a blank
-line or the end of the document is reached:
-
-```````````````````````````````` example
-<div></div>
-``` c
-int x = 33;
-```
-.
-<div></div>
-``` c
-int x = 33;
-```
-````````````````````````````````
-
-
-To start an [HTML block] with a tag that is *not* in the
-list of block-level tags in (6), you must put the tag by
-itself on the first line (and it must be complete):
-
-```````````````````````````````` example
-<a href="foo">
-*bar*
-</a>
-.
-<a href="foo">
-*bar*
-</a>
-````````````````````````````````
-
-
-In type 7 blocks, the [tag name] can be anything:
-
-```````````````````````````````` example
-<Warning>
-*bar*
-</Warning>
-.
-<Warning>
-*bar*
-</Warning>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<i class="foo">
-*bar*
-</i>
-.
-<i class="foo">
-*bar*
-</i>
-````````````````````````````````
-
-
-```````````````````````````````` example
-</ins>
-*bar*
-.
-</ins>
-*bar*
-````````````````````````````````
-
-
-These rules are designed to allow us to work with tags that
-can function as either block-level or inline-level tags.
-The `<del>` tag is a nice example.  We can surround content with
-`<del>` tags in three different ways.  In this case, we get a raw
-HTML block, because the `<del>` tag is on a line by itself:
-
-```````````````````````````````` example
-<del>
-*foo*
-</del>
-.
-<del>
-*foo*
-</del>
-````````````````````````````````
-
-
-In this case, we get a raw HTML block that just includes
-the `<del>` tag (because it ends with the following blank
-line).  So the contents get interpreted as CommonMark:
-
-```````````````````````````````` example
-<del>
-
-*foo*
-
-</del>
-.
-<del>
-<p><em>foo</em></p>
-</del>
-````````````````````````````````
-
-
-Finally, in this case, the `<del>` tags are interpreted
-as [raw HTML] *inside* the CommonMark paragraph.  (Because
-the tag is not on a line by itself, we get inline HTML
-rather than an [HTML block].)
-
-```````````````````````````````` example
-<del>*foo*</del>
-.
-<p><del><em>foo</em></del></p>
-````````````````````````````````
-
-
-HTML tags designed to contain literal content
-(`script`, `style`, `pre`), comments, processing instructions,
-and declarations are treated somewhat differently.
-Instead of ending at the first blank line, these blocks
-end at the first line containing a corresponding end tag.
-As a result, these blocks can contain blank lines:
-
-A pre tag (type 1):
-
-```````````````````````````````` example
-<pre language="haskell"><code>
-import Text.HTML.TagSoup
-
-main :: IO ()
-main = print $ parseTags tags
-</code></pre>
-okay
-.
-<pre language="haskell"><code>
-import Text.HTML.TagSoup
-
-main :: IO ()
-main = print $ parseTags tags
-</code></pre>
-<p>okay</p>
-````````````````````````````````
-
-
-A script tag (type 1):
-
-```````````````````````````````` example
-<script type="text/javascript">
-// JavaScript example
-
-document.getElementById("demo").innerHTML = "Hello JavaScript!";
-</script>
-okay
-.
-<script type="text/javascript">
-// JavaScript example
-
-document.getElementById("demo").innerHTML = "Hello JavaScript!";
-</script>
-<p>okay</p>
-````````````````````````````````
-
-
-A style tag (type 1):
-
-```````````````````````````````` example
-<style
-  type="text/css">
-h1 {color:red;}
-
-p {color:blue;}
-</style>
-okay
-.
-<style
-  type="text/css">
-h1 {color:red;}
-
-p {color:blue;}
-</style>
-<p>okay</p>
-````````````````````````````````
-
-
-If there is no matching end tag, the block will end at the
-end of the document (or the enclosing [block quote][block quotes]
-or [list item][list items]):
-
-```````````````````````````````` example
-<style
-  type="text/css">
-
-foo
-.
-<style
-  type="text/css">
-
-foo
-````````````````````````````````
-
-
-```````````````````````````````` example
-> <div>
-> foo
-
-bar
-.
-<blockquote>
-<div>
-foo
-</blockquote>
-<p>bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- <div>
-- foo
-.
-<ul>
-<li>
-<div>
-</li>
-<li>foo</li>
-</ul>
-````````````````````````````````
-
-
-The end tag can occur on the same line as the start tag:
-
-```````````````````````````````` example
-<style>p{color:red;}</style>
-*foo*
-.
-<style>p{color:red;}</style>
-<p><em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<!-- foo -->*bar*
-*baz*
-.
-<!-- foo -->*bar*
-<p><em>baz</em></p>
-````````````````````````````````
-
-
-Note that anything on the last line after the
-end tag will be included in the [HTML block]:
-
-```````````````````````````````` example
-<script>
-foo
-</script>1. *bar*
-.
-<script>
-foo
-</script>1. *bar*
-````````````````````````````````
-
-
-A comment (type 2):
-
-```````````````````````````````` example
-<!-- Foo
-
-bar
-   baz -->
-okay
-.
-<!-- Foo
-
-bar
-   baz -->
-<p>okay</p>
-````````````````````````````````
-
-
-
-A processing instruction (type 3):
-
-```````````````````````````````` example
-<?php
-
-  echo '>';
-
-?>
-okay
-.
-<?php
-
-  echo '>';
-
-?>
-<p>okay</p>
-````````````````````````````````
-
-
-A declaration (type 4):
-
-```````````````````````````````` example
-<!DOCTYPE html>
-.
-<!DOCTYPE html>
-````````````````````````````````
-
-
-CDATA (type 5):
-
-```````````````````````````````` example
-<![CDATA[
-function matchwo(a,b)
-{
-  if (a < b && a < 0) then {
-    return 1;
-
-  } else {
-
-    return 0;
-  }
-}
-]]>
-okay
-.
-<![CDATA[
-function matchwo(a,b)
-{
-  if (a < b && a < 0) then {
-    return 1;
-
-  } else {
-
-    return 0;
-  }
-}
-]]>
-<p>okay</p>
-````````````````````````````````
-
-
-The opening tag can be indented 1-3 spaces, but not 4:
-
-```````````````````````````````` example
-  <!-- foo -->
-
-    <!-- foo -->
-.
-  <!-- foo -->
-<pre><code>&lt;!-- foo --&gt;
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-  <div>
-
-    <div>
-.
-  <div>
-<pre><code>&lt;div&gt;
-</code></pre>
-````````````````````````````````
-
-
-An HTML block of types 1--6 can interrupt a paragraph, and need not be
-preceded by a blank line.
-
-```````````````````````````````` example
-Foo
-<div>
-bar
-</div>
-.
-<p>Foo</p>
-<div>
-bar
-</div>
-````````````````````````````````
-
-
-However, a following blank line is needed, except at the end of
-a document, and except for blocks of types 1--5, [above][HTML
-block]:
-
-```````````````````````````````` example
-<div>
-bar
-</div>
-*foo*
-.
-<div>
-bar
-</div>
-*foo*
-````````````````````````````````
-
-
-HTML blocks of type 7 cannot interrupt a paragraph:
-
-```````````````````````````````` example
-Foo
-<a href="bar">
-baz
-.
-<p>Foo
-<a href="bar">
-baz</p>
-````````````````````````````````
-
-
-This rule differs from John Gruber's original Markdown syntax
-specification, which says:
-
-> The only restrictions are that block-level HTML elements —
-> e.g. `<div>`, `<table>`, `<pre>`, `<p>`, etc. — must be separated from
-> surrounding content by blank lines, and the start and end tags of the
-> block should not be indented with tabs or spaces.
-
-In some ways Gruber's rule is more restrictive than the one given
-here:
-
-- It requires that an HTML block be preceded by a blank line.
-- It does not allow the start tag to be indented.
-- It requires a matching end tag, which it also does not allow to
-  be indented.
-
-Most Markdown implementations (including some of Gruber's own) do not
-respect all of these restrictions.
-
-There is one respect, however, in which Gruber's rule is more liberal
-than the one given here, since it allows blank lines to occur inside
-an HTML block.  There are two reasons for disallowing them here.
-First, it removes the need to parse balanced tags, which is
-expensive and can require backtracking from the end of the document
-if no matching end tag is found. Second, it provides a very simple
-and flexible way of including Markdown content inside HTML tags:
-simply separate the Markdown from the HTML using blank lines:
-
-Compare:
-
-```````````````````````````````` example
-<div>
-
-*Emphasized* text.
-
-</div>
-.
-<div>
-<p><em>Emphasized</em> text.</p>
-</div>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<div>
-*Emphasized* text.
-</div>
-.
-<div>
-*Emphasized* text.
-</div>
-````````````````````````````````
-
-
-Some Markdown implementations have adopted a convention of
-interpreting content inside tags as text if the open tag has
-the attribute `markdown=1`.  The rule given above seems a simpler and
-more elegant way of achieving the same expressive power, which is also
-much simpler to parse.
-
-The main potential drawback is that one can no longer paste HTML
-blocks into Markdown documents with 100% reliability.  However,
-*in most cases* this will work fine, because the blank lines in
-HTML are usually followed by HTML block tags.  For example:
-
-```````````````````````````````` example
-<table>
-
-<tr>
-
-<td>
-Hi
-</td>
-
-</tr>
-
-</table>
-.
-<table>
-<tr>
-<td>
-Hi
-</td>
-</tr>
-</table>
-````````````````````````````````
-
-
-There are problems, however, if the inner tags are indented
-*and* separated by spaces, as then they will be interpreted as
-an indented code block:
-
-```````````````````````````````` example
-<table>
-
-  <tr>
-
-    <td>
-      Hi
-    </td>
-
-  </tr>
-
-</table>
-.
-<table>
-  <tr>
-<pre><code>&lt;td&gt;
-  Hi
-&lt;/td&gt;
-</code></pre>
-  </tr>
-</table>
-````````````````````````````````
-
-
-Fortunately, blank lines are usually not necessary and can be
-deleted.  The exception is inside `<pre>` tags, but as described
-[above][HTML blocks], raw HTML blocks starting with `<pre>`
-*can* contain blank lines.
-
-## Link reference definitions
-
-A [link reference definition](@)
-consists of a [link label], indented up to three spaces, followed
-by a colon (`:`), optional [whitespace] (including up to one
-[line ending]), a [link destination],
-optional [whitespace] (including up to one
-[line ending]), and an optional [link
-title], which if it is present must be separated
-from the [link destination] by [whitespace].
-No further [non-whitespace characters] may occur on the line.
-
-A [link reference definition]
-does not correspond to a structural element of a document.  Instead, it
-defines a label which can be used in [reference links]
-and reference-style [images] elsewhere in the document.  [Link
-reference definitions] can come either before or after the links that use
-them.
-
-```````````````````````````````` example
-[foo]: /url "title"
-
-[foo]
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-   [foo]: 
-      /url  
-           'the title'  
-
-[foo]
-.
-<p><a href="/url" title="the title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[Foo*bar\]]:my_(url) 'title (with parens)'
-
-[Foo*bar\]]
-.
-<p><a href="my_(url)" title="title (with parens)">Foo*bar]</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[Foo bar]:
-<my url>
-'title'
-
-[Foo bar]
-.
-<p><a href="my%20url" title="title">Foo bar</a></p>
-````````````````````````````````
-
-
-The title may extend over multiple lines:
-
-```````````````````````````````` example
-[foo]: /url '
-title
-line1
-line2
-'
-
-[foo]
-.
-<p><a href="/url" title="
-title
-line1
-line2
-">foo</a></p>
-````````````````````````````````
-
-
-However, it may not contain a [blank line]:
-
-```````````````````````````````` example
-[foo]: /url 'title
-
-with blank line'
-
-[foo]
-.
-<p>[foo]: /url 'title</p>
-<p>with blank line'</p>
-<p>[foo]</p>
-````````````````````````````````
-
-
-The title may be omitted:
-
-```````````````````````````````` example
-[foo]:
-/url
-
-[foo]
-.
-<p><a href="/url">foo</a></p>
-````````````````````````````````
-
-
-The link destination may not be omitted:
-
-```````````````````````````````` example
-[foo]:
-
-[foo]
-.
-<p>[foo]:</p>
-<p>[foo]</p>
-````````````````````````````````
-
- However, an empty link destination may be specified using
- angle brackets:
-
-```````````````````````````````` example
-[foo]: <>
-
-[foo]
-.
-<p><a href="">foo</a></p>
-````````````````````````````````
-
-The title must be separated from the link destination by
-whitespace:
-
-```````````````````````````````` example
-[foo]: <bar>(baz)
-
-[foo]
-.
-<p>[foo]: <bar>(baz)</p>
-<p>[foo]</p>
-````````````````````````````````
-
-
-Both title and destination can contain backslash escapes
-and literal backslashes:
-
-```````````````````````````````` example
-[foo]: /url\bar\*baz "foo\"bar\baz"
-
-[foo]
-.
-<p><a href="/url%5Cbar*baz" title="foo&quot;bar\baz">foo</a></p>
-````````````````````````````````
-
-
-A link can come before its corresponding definition:
-
-```````````````````````````````` example
-[foo]
-
-[foo]: url
-.
-<p><a href="url">foo</a></p>
-````````````````````````````````
-
-
-If there are several matching definitions, the first one takes
-precedence:
-
-```````````````````````````````` example
-[foo]
-
-[foo]: first
-[foo]: second
-.
-<p><a href="first">foo</a></p>
-````````````````````````````````
-
-
-As noted in the section on [Links], matching of labels is
-case-insensitive (see [matches]).
-
-```````````````````````````````` example
-[FOO]: /url
-
-[Foo]
-.
-<p><a href="/url">Foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[ΑΓΩ]: /φου
-
-[αγω]
-.
-<p><a href="/%CF%86%CE%BF%CF%85">αγω</a></p>
-````````````````````````````````
-
-
-Here is a link reference definition with no corresponding link.
-It contributes nothing to the document.
-
-```````````````````````````````` example
-[foo]: /url
-.
-````````````````````````````````
-
-
-Here is another one:
-
-```````````````````````````````` example
-[
-foo
-]: /url
-bar
-.
-<p>bar</p>
-````````````````````````````````
-
-
-This is not a link reference definition, because there are
-[non-whitespace characters] after the title:
-
-```````````````````````````````` example
-[foo]: /url "title" ok
-.
-<p>[foo]: /url &quot;title&quot; ok</p>
-````````````````````````````````
-
-
-This is a link reference definition, but it has no title:
-
-```````````````````````````````` example
-[foo]: /url
-"title" ok
-.
-<p>&quot;title&quot; ok</p>
-````````````````````````````````
-
-
-This is not a link reference definition, because it is indented
-four spaces:
-
-```````````````````````````````` example
-    [foo]: /url "title"
-
-[foo]
-.
-<pre><code>[foo]: /url &quot;title&quot;
-</code></pre>
-<p>[foo]</p>
-````````````````````````````````
-
-
-This is not a link reference definition, because it occurs inside
-a code block:
-
-```````````````````````````````` example
-```
-[foo]: /url
-```
-
-[foo]
-.
-<pre><code>[foo]: /url
-</code></pre>
-<p>[foo]</p>
-````````````````````````````````
-
-
-A [link reference definition] cannot interrupt a paragraph.
-
-```````````````````````````````` example
-Foo
-[bar]: /baz
-
-[bar]
-.
-<p>Foo
-[bar]: /baz</p>
-<p>[bar]</p>
-````````````````````````````````
-
-
-However, it can directly follow other block elements, such as headings
-and thematic breaks, and it need not be followed by a blank line.
-
-```````````````````````````````` example
-# [Foo]
-[foo]: /url
-> bar
-.
-<h1><a href="/url">Foo</a></h1>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-```````````````````````````````` example
-[foo]: /url
-bar
-===
-[foo]
-.
-<h1>bar</h1>
-<p><a href="/url">foo</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[foo]: /url
-===
-[foo]
-.
-<p>===
-<a href="/url">foo</a></p>
-````````````````````````````````
-
-
-Several [link reference definitions]
-can occur one after another, without intervening blank lines.
-
-```````````````````````````````` example
-[foo]: /foo-url "foo"
-[bar]: /bar-url
-  "bar"
-[baz]: /baz-url
-
-[foo],
-[bar],
-[baz]
-.
-<p><a href="/foo-url" title="foo">foo</a>,
-<a href="/bar-url" title="bar">bar</a>,
-<a href="/baz-url">baz</a></p>
-````````````````````````````````
-
-
-[Link reference definitions] can occur
-inside block containers, like lists and block quotations.  They
-affect the entire document, not just the container in which they
-are defined:
-
-```````````````````````````````` example
-[foo]
-
-> [foo]: /url
-.
-<p><a href="/url">foo</a></p>
-<blockquote>
-</blockquote>
-````````````````````````````````
-
-
-Whether something is a [link reference definition] is
-independent of whether the link reference it defines is
-used in the document.  Thus, for example, the following
-document contains just a link reference definition, and
-no visible content:
-
-```````````````````````````````` example
-[foo]: /url
-.
-````````````````````````````````
-
-
-## Paragraphs
-
-A sequence of non-blank lines that cannot be interpreted as other
-kinds of blocks forms a [paragraph](@).
-The contents of the paragraph are the result of parsing the
-paragraph's raw content as inlines.  The paragraph's raw content
-is formed by concatenating the lines and removing initial and final
-[whitespace].
-
-A simple example with two paragraphs:
-
-```````````````````````````````` example
-aaa
-
-bbb
-.
-<p>aaa</p>
-<p>bbb</p>
-````````````````````````````````
-
-
-Paragraphs can contain multiple lines, but no blank lines:
-
-```````````````````````````````` example
-aaa
-bbb
-
-ccc
-ddd
-.
-<p>aaa
-bbb</p>
-<p>ccc
-ddd</p>
-````````````````````````````````
-
-
-Multiple blank lines between paragraph have no effect:
-
-```````````````````````````````` example
-aaa
-
-
-bbb
-.
-<p>aaa</p>
-<p>bbb</p>
-````````````````````````````````
-
-
-Leading spaces are skipped:
-
-```````````````````````````````` example
-  aaa
- bbb
-.
-<p>aaa
-bbb</p>
-````````````````````````````````
-
-
-Lines after the first may be indented any amount, since indented
-code blocks cannot interrupt paragraphs.
-
-```````````````````````````````` example
-aaa
-             bbb
-                                       ccc
-.
-<p>aaa
-bbb
-ccc</p>
-````````````````````````````````
-
-
-However, the first line may be indented at most three spaces,
-or an indented code block will be triggered:
-
-```````````````````````````````` example
-   aaa
-bbb
-.
-<p>aaa
-bbb</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    aaa
-bbb
-.
-<pre><code>aaa
-</code></pre>
-<p>bbb</p>
-````````````````````````````````
-
-
-Final spaces are stripped before inline parsing, so a paragraph
-that ends with two or more spaces will not end with a [hard line
-break]:
-
-```````````````````````````````` example
-aaa     
-bbb     
-.
-<p>aaa<br />
-bbb</p>
-````````````````````````````````
-
-
-## Blank lines
-
-[Blank lines] between block-level elements are ignored,
-except for the role they play in determining whether a [list]
-is [tight] or [loose].
-
-Blank lines at the beginning and end of the document are also ignored.
-
-```````````````````````````````` example
-  
-
-aaa
-  
-
-# aaa
-
-  
-.
-<p>aaa</p>
-<h1>aaa</h1>
-````````````````````````````````
-
-
-
-# Container blocks
-
-A [container block](#container-blocks) is a block that has other
-blocks as its contents.  There are two basic kinds of container blocks:
-[block quotes] and [list items].
-[Lists] are meta-containers for [list items].
-
-We define the syntax for container blocks recursively.  The general
-form of the definition is:
-
-> If X is a sequence of blocks, then the result of
-> transforming X in such-and-such a way is a container of type Y
-> with these blocks as its content.
-
-So, we explain what counts as a block quote or list item by explaining
-how these can be *generated* from their contents. This should suffice
-to define the syntax, although it does not give a recipe for *parsing*
-these constructions.  (A recipe is provided below in the section entitled
-[A parsing strategy](#appendix-a-parsing-strategy).)
-
-## Block quotes
-
-A [block quote marker](@)
-consists of 0-3 spaces of initial indent, plus (a) the character `>` together
-with a following space, or (b) a single character `>` not followed by a space.
-
-The following rules define [block quotes]:
-
-1.  **Basic case.**  If a string of lines *Ls* constitute a sequence
-    of blocks *Bs*, then the result of prepending a [block quote
-    marker] to the beginning of each line in *Ls*
-    is a [block quote](#block-quotes) containing *Bs*.
-
-2.  **Laziness.**  If a string of lines *Ls* constitute a [block
-    quote](#block-quotes) with contents *Bs*, then the result of deleting
-    the initial [block quote marker] from one or
-    more lines in which the next [non-whitespace character] after the [block
-    quote marker] is [paragraph continuation
-    text] is a block quote with *Bs* as its content.
-    [Paragraph continuation text](@) is text
-    that will be parsed as part of the content of a paragraph, but does
-    not occur at the beginning of the paragraph.
-
-3.  **Consecutiveness.**  A document cannot contain two [block
-    quotes] in a row unless there is a [blank line] between them.
-
-Nothing else counts as a [block quote](#block-quotes).
-
-Here is a simple example:
-
-```````````````````````````````` example
-> # Foo
-> bar
-> baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-The spaces after the `>` characters can be omitted:
-
-```````````````````````````````` example
-># Foo
->bar
-> baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-The `>` characters can be indented 1-3 spaces:
-
-```````````````````````````````` example
-   > # Foo
-   > bar
- > baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-Four spaces gives us a code block:
-
-```````````````````````````````` example
-    > # Foo
-    > bar
-    > baz
-.
-<pre><code>&gt; # Foo
-&gt; bar
-&gt; baz
-</code></pre>
-````````````````````````````````
-
-
-The Laziness clause allows us to omit the `>` before
-[paragraph continuation text]:
-
-```````````````````````````````` example
-> # Foo
-> bar
-baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-A block quote can contain some lazy and some non-lazy
-continuation lines:
-
-```````````````````````````````` example
-> bar
-baz
-> foo
-.
-<blockquote>
-<p>bar
-baz
-foo</p>
-</blockquote>
-````````````````````````````````
-
-
-Laziness only applies to lines that would have been continuations of
-paragraphs had they been prepended with [block quote markers].
-For example, the `> ` cannot be omitted in the second line of
-
-``` markdown
-> foo
-> ---
-```
-
-without changing the meaning:
-
-```````````````````````````````` example
-> foo
----
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-<hr />
-````````````````````````````````
-
-
-Similarly, if we omit the `> ` in the second line of
-
-``` markdown
-> - foo
-> - bar
-```
-
-then the block quote ends after the first line:
-
-```````````````````````````````` example
-> - foo
-- bar
-.
-<blockquote>
-<ul>
-<li>foo</li>
-</ul>
-</blockquote>
-<ul>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-For the same reason, we can't omit the `> ` in front of
-subsequent lines of an indented or fenced code block:
-
-```````````````````````````````` example
->     foo
-    bar
-.
-<blockquote>
-<pre><code>foo
-</code></pre>
-</blockquote>
-<pre><code>bar
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> ```
-foo
-```
-.
-<blockquote>
-<pre><code></code></pre>
-</blockquote>
-<p>foo</p>
-<pre><code></code></pre>
-````````````````````````````````
-
-
-Note that in the following case, we have a [lazy
-continuation line]:
-
-```````````````````````````````` example
-> foo
-    - bar
-.
-<blockquote>
-<p>foo
-- bar</p>
-</blockquote>
-````````````````````````````````
-
-
-To see why, note that in
-
-```markdown
-> foo
->     - bar
-```
-
-the `- bar` is indented too far to start a list, and can't
-be an indented code block because indented code blocks cannot
-interrupt paragraphs, so it is [paragraph continuation text].
-
-A block quote can be empty:
-
-```````````````````````````````` example
->
-.
-<blockquote>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
->
->  
-> 
-.
-<blockquote>
-</blockquote>
-````````````````````````````````
-
-
-A block quote can have initial or final blank lines:
-
-```````````````````````````````` example
->
-> foo
->  
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-````````````````````````````````
-
-
-A blank line always separates block quotes:
-
-```````````````````````````````` example
-> foo
-
-> bar
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-(Most current Markdown implementations, including John Gruber's
-original `Markdown.pl`, will parse this example as a single block quote
-with two paragraphs.  But it seems better to allow the author to decide
-whether two block quotes or one are wanted.)
-
-Consecutiveness means that if we put these block quotes together,
-we get a single block quote:
-
-```````````````````````````````` example
-> foo
-> bar
-.
-<blockquote>
-<p>foo
-bar</p>
-</blockquote>
-````````````````````````````````
-
-
-To get a block quote with two paragraphs, use:
-
-```````````````````````````````` example
-> foo
->
-> bar
-.
-<blockquote>
-<p>foo</p>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-Block quotes can interrupt paragraphs:
-
-```````````````````````````````` example
-foo
-> bar
-.
-<p>foo</p>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-In general, blank lines are not needed before or after block
-quotes:
-
-```````````````````````````````` example
-> aaa
-***
-> bbb
-.
-<blockquote>
-<p>aaa</p>
-</blockquote>
-<hr />
-<blockquote>
-<p>bbb</p>
-</blockquote>
-````````````````````````````````
-
-
-However, because of laziness, a blank line is needed between
-a block quote and a following paragraph:
-
-```````````````````````````````` example
-> bar
-baz
-.
-<blockquote>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> bar
-
-baz
-.
-<blockquote>
-<p>bar</p>
-</blockquote>
-<p>baz</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> bar
->
-baz
-.
-<blockquote>
-<p>bar</p>
-</blockquote>
-<p>baz</p>
-````````````````````````````````
-
-
-It is a consequence of the Laziness rule that any number
-of initial `>`s may be omitted on a continuation line of a
-nested block quote:
-
-```````````````````````````````` example
-> > > foo
-bar
-.
-<blockquote>
-<blockquote>
-<blockquote>
-<p>foo
-bar</p>
-</blockquote>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
->>> foo
-> bar
->>baz
-.
-<blockquote>
-<blockquote>
-<blockquote>
-<p>foo
-bar
-baz</p>
-</blockquote>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-When including an indented code block in a block quote,
-remember that the [block quote marker] includes
-both the `>` and a following space.  So *five spaces* are needed after
-the `>`:
-
-```````````````````````````````` example
->     code
-
->    not code
-.
-<blockquote>
-<pre><code>code
-</code></pre>
-</blockquote>
-<blockquote>
-<p>not code</p>
-</blockquote>
-````````````````````````````````
-
-
-
-## List items
-
-A [list marker](@) is a
-[bullet list marker] or an [ordered list marker].
-
-A [bullet list marker](@)
-is a `-`, `+`, or `*` character.
-
-An [ordered list marker](@)
-is a sequence of 1--9 arabic digits (`0-9`), followed by either a
-`.` character or a `)` character.  (The reason for the length
-limit is that with 10 digits we start seeing integer overflows
-in some browsers.)
-
-The following rules define [list items]:
-
-1.  **Basic case.**  If a sequence of lines *Ls* constitute a sequence of
-    blocks *Bs* starting with a [non-whitespace character], and *M* is a
-    list marker of width *W* followed by 1 ≤ *N* ≤ 4 spaces, then the result
-    of prepending *M* and the following spaces to the first line of
-    *Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a
-    list item with *Bs* as its contents.  The type of the list item
-    (bullet or ordered) is determined by the type of its list marker.
-    If the list item is ordered, then it is also assigned a start
-    number, based on the ordered list marker.
-
-    Exceptions:
-
-    1. When the first list item in a [list] interrupts
-       a paragraph---that is, when it starts on a line that would
-       otherwise count as [paragraph continuation text]---then (a)
-       the lines *Ls* must not begin with a blank line, and (b) if
-       the list item is ordered, the start number must be 1.
-    2. If any line is a [thematic break][thematic breaks] then
-       that line is not a list item.
-
-For example, let *Ls* be the lines
-
-```````````````````````````````` example
-A paragraph
-with two lines.
-
-    indented code
-
-> A block quote.
-.
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-````````````````````````````````
-
-
-And let *M* be the marker `1.`, and *N* = 2.  Then rule #1 says
-that the following is an ordered list item with start number 1,
-and the same contents as *Ls*:
-
-```````````````````````````````` example
-1.  A paragraph
-    with two lines.
-
-        indented code
-
-    > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-The most important thing to notice is that the position of
-the text after the list marker determines how much indentation
-is needed in subsequent blocks in the list item.  If the list
-marker takes up two spaces, and there are three spaces between
-the list marker and the next [non-whitespace character], then blocks
-must be indented five spaces in order to fall under the list
-item.
-
-Here are some examples showing how far content must be indented to be
-put under the list item:
-
-```````````````````````````````` example
-- one
-
- two
-.
-<ul>
-<li>one</li>
-</ul>
-<p>two</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- one
-
-  two
-.
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
- -    one
-
-     two
-.
-<ul>
-<li>one</li>
-</ul>
-<pre><code> two
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
- -    one
-
-      two
-.
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-It is tempting to think of this in terms of columns:  the continuation
-blocks must be indented at least to the column of the first
-[non-whitespace character] after the list marker. However, that is not quite right.
-The spaces after the list marker determine how much relative indentation
-is needed.  Which column this indentation reaches will depend on
-how the list item is embedded in other constructions, as shown by
-this example:
-
-```````````````````````````````` example
-   > > 1.  one
->>
->>     two
-.
-<blockquote>
-<blockquote>
-<ol>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ol>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-Here `two` occurs in the same column as the list marker `1.`,
-but is actually contained in the list item, because there is
-sufficient indentation after the last containing blockquote marker.
-
-The converse is also possible.  In the following example, the word `two`
-occurs far to the right of the initial text of the list item, `one`, but
-it is not considered part of the list item, because it is not indented
-far enough past the blockquote marker:
-
-```````````````````````````````` example
->>- one
->>
-  >  > two
-.
-<blockquote>
-<blockquote>
-<ul>
-<li>one</li>
-</ul>
-<p>two</p>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-Note that at least one space is needed between the list marker and
-any following content, so these are not list items:
-
-```````````````````````````````` example
--one
-
-2.two
-.
-<p>-one</p>
-<p>2.two</p>
-````````````````````````````````
-
-
-A list item may contain blocks that are separated by more than
-one blank line.
-
-```````````````````````````````` example
-- foo
-
-
-  bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-A list item may contain any kind of block:
-
-```````````````````````````````` example
-1.  foo
-
-    ```
-    bar
-    ```
-
-    baz
-
-    > bam
-.
-<ol>
-<li>
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-<p>baz</p>
-<blockquote>
-<p>bam</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-A list item that contains an indented code block will preserve
-empty lines within the code block verbatim.
-
-```````````````````````````````` example
-- Foo
-
-      bar
-
-
-      baz
-.
-<ul>
-<li>
-<p>Foo</p>
-<pre><code>bar
-
-
-baz
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-Note that ordered list start numbers must be nine digits or less:
-
-```````````````````````````````` example
-123456789. ok
-.
-<ol start="123456789">
-<li>ok</li>
-</ol>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1234567890. not ok
-.
-<p>1234567890. not ok</p>
-````````````````````````````````
-
-
-A start number may begin with 0s:
-
-```````````````````````````````` example
-0. ok
-.
-<ol start="0">
-<li>ok</li>
-</ol>
-````````````````````````````````
-
-
-```````````````````````````````` example
-003. ok
-.
-<ol start="3">
-<li>ok</li>
-</ol>
-````````````````````````````````
-
-
-A start number may not be negative:
-
-```````````````````````````````` example
--1. not ok
-.
-<p>-1. not ok</p>
-````````````````````````````````
-
-
-
-2.  **Item starting with indented code.**  If a sequence of lines *Ls*
-    constitute a sequence of blocks *Bs* starting with an indented code
-    block, and *M* is a list marker of width *W* followed by
-    one space, then the result of prepending *M* and the following
-    space to the first line of *Ls*, and indenting subsequent lines of
-    *Ls* by *W + 1* spaces, is a list item with *Bs* as its contents.
-    If a line is empty, then it need not be indented.  The type of the
-    list item (bullet or ordered) is determined by the type of its list
-    marker.  If the list item is ordered, then it is also assigned a
-    start number, based on the ordered list marker.
-
-An indented code block will have to be indented four spaces beyond
-the edge of the region where text will be included in the list item.
-In the following case that is 6 spaces:
-
-```````````````````````````````` example
-- foo
-
-      bar
-.
-<ul>
-<li>
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-
-And in this case it is 11 spaces:
-
-```````````````````````````````` example
-  10.  foo
-
-           bar
-.
-<ol start="10">
-<li>
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-</li>
-</ol>
-````````````````````````````````
-
-
-If the *first* block in the list item is an indented code block,
-then by rule #2, the contents must be indented *one* space after the
-list marker:
-
-```````````````````````````````` example
-    indented code
-
-paragraph
-
-    more code
-.
-<pre><code>indented code
-</code></pre>
-<p>paragraph</p>
-<pre><code>more code
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1.     indented code
-
-   paragraph
-
-       more code
-.
-<ol>
-<li>
-<pre><code>indented code
-</code></pre>
-<p>paragraph</p>
-<pre><code>more code
-</code></pre>
-</li>
-</ol>
-````````````````````````````````
-
-
-Note that an additional space indent is interpreted as space
-inside the code block:
-
-```````````````````````````````` example
-1.      indented code
-
-   paragraph
-
-       more code
-.
-<ol>
-<li>
-<pre><code> indented code
-</code></pre>
-<p>paragraph</p>
-<pre><code>more code
-</code></pre>
-</li>
-</ol>
-````````````````````````````````
-
-
-Note that rules #1 and #2 only apply to two cases:  (a) cases
-in which the lines to be included in a list item begin with a
-[non-whitespace character], and (b) cases in which
-they begin with an indented code
-block.  In a case like the following, where the first block begins with
-a three-space indent, the rules do not allow us to form a list item by
-indenting the whole thing and prepending a list marker:
-
-```````````````````````````````` example
-   foo
-
-bar
-.
-<p>foo</p>
-<p>bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
--    foo
-
-  bar
-.
-<ul>
-<li>foo</li>
-</ul>
-<p>bar</p>
-````````````````````````````````
-
-
-This is not a significant restriction, because when a block begins
-with 1-3 spaces indent, the indentation can always be removed without
-a change in interpretation, allowing rule #1 to be applied.  So, in
-the above case:
-
-```````````````````````````````` example
--  foo
-
-   bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-3.  **Item starting with a blank line.**  If a sequence of lines *Ls*
-    starting with a single [blank line] constitute a (possibly empty)
-    sequence of blocks *Bs*, not separated from each other by more than
-    one blank line, and *M* is a list marker of width *W*,
-    then the result of prepending *M* to the first line of *Ls*, and
-    indenting subsequent lines of *Ls* by *W + 1* spaces, is a list
-    item with *Bs* as its contents.
-    If a line is empty, then it need not be indented.  The type of the
-    list item (bullet or ordered) is determined by the type of its list
-    marker.  If the list item is ordered, then it is also assigned a
-    start number, based on the ordered list marker.
-
-Here are some list items that start with a blank line but are not empty:
-
-```````````````````````````````` example
--
-  foo
--
-  ```
-  bar
-  ```
--
-      baz
-.
-<ul>
-<li>foo</li>
-<li>
-<pre><code>bar
-</code></pre>
-</li>
-<li>
-<pre><code>baz
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-When the list item starts with a blank line, the number of spaces
-following the list marker doesn't change the required indentation:
-
-```````````````````````````````` example
--   
-  foo
-.
-<ul>
-<li>foo</li>
-</ul>
-````````````````````````````````
-
-
-A list item can begin with at most one blank line.
-In the following example, `foo` is not part of the list
-item:
-
-```````````````````````````````` example
--
-
-  foo
-.
-<ul>
-<li></li>
-</ul>
-<p>foo</p>
-````````````````````````````````
-
-
-Here is an empty bullet list item:
-
-```````````````````````````````` example
-- foo
--
-- bar
-.
-<ul>
-<li>foo</li>
-<li></li>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-It does not matter whether there are spaces following the [list marker]:
-
-```````````````````````````````` example
-- foo
--   
-- bar
-.
-<ul>
-<li>foo</li>
-<li></li>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-Here is an empty ordered list item:
-
-```````````````````````````````` example
-1. foo
-2.
-3. bar
-.
-<ol>
-<li>foo</li>
-<li></li>
-<li>bar</li>
-</ol>
-````````````````````````````````
-
-
-A list may start or end with an empty list item:
-
-```````````````````````````````` example
-*
-.
-<ul>
-<li></li>
-</ul>
-````````````````````````````````
-
-However, an empty list item cannot interrupt a paragraph:
-
-```````````````````````````````` example
-foo
-*
-
-foo
-1.
-.
-<p>foo
-*</p>
-<p>foo
-1.</p>
-````````````````````````````````
-
-
-4.  **Indentation.**  If a sequence of lines *Ls* constitutes a list item
-    according to rule #1, #2, or #3, then the result of indenting each line
-    of *Ls* by 1-3 spaces (the same for each line) also constitutes a
-    list item with the same contents and attributes.  If a line is
-    empty, then it need not be indented.
-
-Indented one space:
-
-```````````````````````````````` example
- 1.  A paragraph
-     with two lines.
-
-         indented code
-
-     > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Indented two spaces:
-
-```````````````````````````````` example
-  1.  A paragraph
-      with two lines.
-
-          indented code
-
-      > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Indented three spaces:
-
-```````````````````````````````` example
-   1.  A paragraph
-       with two lines.
-
-           indented code
-
-       > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Four spaces indent gives a code block:
-
-```````````````````````````````` example
-    1.  A paragraph
-        with two lines.
-
-            indented code
-
-        > A block quote.
-.
-<pre><code>1.  A paragraph
-    with two lines.
-
-        indented code
-
-    &gt; A block quote.
-</code></pre>
-````````````````````````````````
-
-
-
-5.  **Laziness.**  If a string of lines *Ls* constitute a [list
-    item](#list-items) with contents *Bs*, then the result of deleting
-    some or all of the indentation from one or more lines in which the
-    next [non-whitespace character] after the indentation is
-    [paragraph continuation text] is a
-    list item with the same contents and attributes.  The unindented
-    lines are called
-    [lazy continuation line](@)s.
-
-Here is an example with [lazy continuation lines]:
-
-```````````````````````````````` example
-  1.  A paragraph
-with two lines.
-
-          indented code
-
-      > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Indentation can be partially deleted:
-
-```````````````````````````````` example
-  1.  A paragraph
-    with two lines.
-.
-<ol>
-<li>A paragraph
-with two lines.</li>
-</ol>
-````````````````````````````````
-
-
-These examples show how laziness can work in nested structures:
-
-```````````````````````````````` example
-> 1. > Blockquote
-continued here.
-.
-<blockquote>
-<ol>
-<li>
-<blockquote>
-<p>Blockquote
-continued here.</p>
-</blockquote>
-</li>
-</ol>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> 1. > Blockquote
-> continued here.
-.
-<blockquote>
-<ol>
-<li>
-<blockquote>
-<p>Blockquote
-continued here.</p>
-</blockquote>
-</li>
-</ol>
-</blockquote>
-````````````````````````````````
-
-
-
-6.  **That's all.** Nothing that is not counted as a list item by rules
-    #1--5 counts as a [list item](#list-items).
-
-The rules for sublists follow from the general rules
-[above][List items].  A sublist must be indented the same number
-of spaces a paragraph would need to be in order to be included
-in the list item.
-
-So, in this case we need two spaces indent:
-
-```````````````````````````````` example
-- foo
-  - bar
-    - baz
-      - boo
-.
-<ul>
-<li>foo
-<ul>
-<li>bar
-<ul>
-<li>baz
-<ul>
-<li>boo</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-One is not enough:
-
-```````````````````````````````` example
-- foo
- - bar
-  - baz
-   - boo
-.
-<ul>
-<li>foo</li>
-<li>bar</li>
-<li>baz</li>
-<li>boo</li>
-</ul>
-````````````````````````````````
-
-
-Here we need four, because the list marker is wider:
-
-```````````````````````````````` example
-10) foo
-    - bar
-.
-<ol start="10">
-<li>foo
-<ul>
-<li>bar</li>
-</ul>
-</li>
-</ol>
-````````````````````````````````
-
-
-Three is not enough:
-
-```````````````````````````````` example
-10) foo
-   - bar
-.
-<ol start="10">
-<li>foo</li>
-</ol>
-<ul>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-A list may be the first block in a list item:
-
-```````````````````````````````` example
-- - foo
-.
-<ul>
-<li>
-<ul>
-<li>foo</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1. - 2. foo
-.
-<ol>
-<li>
-<ul>
-<li>
-<ol start="2">
-<li>foo</li>
-</ol>
-</li>
-</ul>
-</li>
-</ol>
-````````````````````````````````
-
-
-A list item can contain a heading:
-
-```````````````````````````````` example
-- # Foo
-- Bar
-  ---
-  baz
-.
-<ul>
-<li>
-<h1>Foo</h1>
-</li>
-<li>
-<h2>Bar</h2>
-baz</li>
-</ul>
-````````````````````````````````
-
-
-### Motivation
-
-John Gruber's Markdown spec says the following about list items:
-
-1. "List markers typically start at the left margin, but may be indented
-   by up to three spaces. List markers must be followed by one or more
-   spaces or a tab."
-
-2. "To make lists look nice, you can wrap items with hanging indents....
-   But if you don't want to, you don't have to."
-
-3. "List items may consist of multiple paragraphs. Each subsequent
-   paragraph in a list item must be indented by either 4 spaces or one
-   tab."
-
-4. "It looks nice if you indent every line of the subsequent paragraphs,
-   but here again, Markdown will allow you to be lazy."
-
-5. "To put a blockquote within a list item, the blockquote's `>`
-   delimiters need to be indented."
-
-6. "To put a code block within a list item, the code block needs to be
-   indented twice — 8 spaces or two tabs."
-
-These rules specify that a paragraph under a list item must be indented
-four spaces (presumably, from the left margin, rather than the start of
-the list marker, but this is not said), and that code under a list item
-must be indented eight spaces instead of the usual four.  They also say
-that a block quote must be indented, but not by how much; however, the
-example given has four spaces indentation.  Although nothing is said
-about other kinds of block-level content, it is certainly reasonable to
-infer that *all* block elements under a list item, including other
-lists, must be indented four spaces.  This principle has been called the
-*four-space rule*.
-
-The four-space rule is clear and principled, and if the reference
-implementation `Markdown.pl` had followed it, it probably would have
-become the standard.  However, `Markdown.pl` allowed paragraphs and
-sublists to start with only two spaces indentation, at least on the
-outer level.  Worse, its behavior was inconsistent: a sublist of an
-outer-level list needed two spaces indentation, but a sublist of this
-sublist needed three spaces.  It is not surprising, then, that different
-implementations of Markdown have developed very different rules for
-determining what comes under a list item.  (Pandoc and python-Markdown,
-for example, stuck with Gruber's syntax description and the four-space
-rule, while discount, redcarpet, marked, PHP Markdown, and others
-followed `Markdown.pl`'s behavior more closely.)
-
-Unfortunately, given the divergences between implementations, there
-is no way to give a spec for list items that will be guaranteed not
-to break any existing documents.  However, the spec given here should
-correctly handle lists formatted with either the four-space rule or
-the more forgiving `Markdown.pl` behavior, provided they are laid out
-in a way that is natural for a human to read.
-
-The strategy here is to let the width and indentation of the list marker
-determine the indentation necessary for blocks to fall under the list
-item, rather than having a fixed and arbitrary number.  The writer can
-think of the body of the list item as a unit which gets indented to the
-right enough to fit the list marker (and any indentation on the list
-marker).  (The laziness rule, #5, then allows continuation lines to be
-unindented if needed.)
-
-This rule is superior, we claim, to any rule requiring a fixed level of
-indentation from the margin.  The four-space rule is clear but
-unnatural. It is quite unintuitive that
-
-``` markdown
-- foo
-
-  bar
-
-  - baz
-```
-
-should be parsed as two lists with an intervening paragraph,
-
-``` html
-<ul>
-<li>foo</li>
-</ul>
-<p>bar</p>
-<ul>
-<li>baz</li>
-</ul>
-```
-
-as the four-space rule demands, rather than a single list,
-
-``` html
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-<ul>
-<li>baz</li>
-</ul>
-</li>
-</ul>
-```
-
-The choice of four spaces is arbitrary.  It can be learned, but it is
-not likely to be guessed, and it trips up beginners regularly.
-
-Would it help to adopt a two-space rule?  The problem is that such
-a rule, together with the rule allowing 1--3 spaces indentation of the
-initial list marker, allows text that is indented *less than* the
-original list marker to be included in the list item. For example,
-`Markdown.pl` parses
-
-``` markdown
-   - one
-
-  two
-```
-
-as a single list item, with `two` a continuation paragraph:
-
-``` html
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-```
-
-and similarly
-
-``` markdown
->   - one
->
->  two
-```
-
-as
-
-``` html
-<blockquote>
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-</blockquote>
-```
-
-This is extremely unintuitive.
-
-Rather than requiring a fixed indent from the margin, we could require
-a fixed indent (say, two spaces, or even one space) from the list marker (which
-may itself be indented).  This proposal would remove the last anomaly
-discussed.  Unlike the spec presented above, it would count the following
-as a list item with a subparagraph, even though the paragraph `bar`
-is not indented as far as the first paragraph `foo`:
-
-``` markdown
- 10. foo
-
-   bar  
-```
-
-Arguably this text does read like a list item with `bar` as a subparagraph,
-which may count in favor of the proposal.  However, on this proposal indented
-code would have to be indented six spaces after the list marker.  And this
-would break a lot of existing Markdown, which has the pattern:
-
-``` markdown
-1.  foo
-
-        indented code
-```
-
-where the code is indented eight spaces.  The spec above, by contrast, will
-parse this text as expected, since the code block's indentation is measured
-from the beginning of `foo`.
-
-The one case that needs special treatment is a list item that *starts*
-with indented code.  How much indentation is required in that case, since
-we don't have a "first paragraph" to measure from?  Rule #2 simply stipulates
-that in such cases, we require one space indentation from the list marker
-(and then the normal four spaces for the indented code).  This will match the
-four-space rule in cases where the list marker plus its initial indentation
-takes four spaces (a common case), but diverge in other cases.
-
-## Lists
-
-A [list](@) is a sequence of one or more
-list items [of the same type].  The list items
-may be separated by any number of blank lines.
-
-Two list items are [of the same type](@)
-if they begin with a [list marker] of the same type.
-Two list markers are of the
-same type if (a) they are bullet list markers using the same character
-(`-`, `+`, or `*`) or (b) they are ordered list numbers with the same
-delimiter (either `.` or `)`).
-
-A list is an [ordered list](@)
-if its constituent list items begin with
-[ordered list markers], and a
-[bullet list](@) if its constituent list
-items begin with [bullet list markers].
-
-The [start number](@)
-of an [ordered list] is determined by the list number of
-its initial list item.  The numbers of subsequent list items are
-disregarded.
-
-A list is [loose](@) if any of its constituent
-list items are separated by blank lines, or if any of its constituent
-list items directly contain two block-level elements with a blank line
-between them.  Otherwise a list is [tight](@).
-(The difference in HTML output is that paragraphs in a loose list are
-wrapped in `<p>` tags, while paragraphs in a tight list are not.)
-
-Changing the bullet or ordered list delimiter starts a new list:
-
-```````````````````````````````` example
-- foo
-- bar
-+ baz
-.
-<ul>
-<li>foo</li>
-<li>bar</li>
-</ul>
-<ul>
-<li>baz</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1. foo
-2. bar
-3) baz
-.
-<ol>
-<li>foo</li>
-<li>bar</li>
-</ol>
-<ol start="3">
-<li>baz</li>
-</ol>
-````````````````````````````````
-
-
-In CommonMark, a list can interrupt a paragraph. That is,
-no blank line is needed to separate a paragraph from a following
-list:
-
-```````````````````````````````` example
-Foo
-- bar
-- baz
-.
-<p>Foo</p>
-<ul>
-<li>bar</li>
-<li>baz</li>
-</ul>
-````````````````````````````````
-
-`Markdown.pl` does not allow this, through fear of triggering a list
-via a numeral in a hard-wrapped line:
-
-``` markdown
-The number of windows in my house is
-14.  The number of doors is 6.
-```
-
-Oddly, though, `Markdown.pl` *does* allow a blockquote to
-interrupt a paragraph, even though the same considerations might
-apply.
-
-In CommonMark, we do allow lists to interrupt paragraphs, for
-two reasons.  First, it is natural and not uncommon for people
-to start lists without blank lines:
-
-``` markdown
-I need to buy
-- new shoes
-- a coat
-- a plane ticket
-```
-
-Second, we are attracted to a
-
-> [principle of uniformity](@):
-> if a chunk of text has a certain
-> meaning, it will continue to have the same meaning when put into a
-> container block (such as a list item or blockquote).
-
-(Indeed, the spec for [list items] and [block quotes] presupposes
-this principle.) This principle implies that if
-
-``` markdown
-  * I need to buy
-    - new shoes
-    - a coat
-    - a plane ticket
-```
-
-is a list item containing a paragraph followed by a nested sublist,
-as all Markdown implementations agree it is (though the paragraph
-may be rendered without `<p>` tags, since the list is "tight"),
-then
-
-``` markdown
-I need to buy
-- new shoes
-- a coat
-- a plane ticket
-```
-
-by itself should be a paragraph followed by a nested sublist.
-
-Since it is well established Markdown practice to allow lists to
-interrupt paragraphs inside list items, the [principle of
-uniformity] requires us to allow this outside list items as
-well.  ([reStructuredText](http://docutils.sourceforge.net/rst.html)
-takes a different approach, requiring blank lines before lists
-even inside other list items.)
-
-In order to solve of unwanted lists in paragraphs with
-hard-wrapped numerals, we allow only lists starting with `1` to
-interrupt paragraphs.  Thus,
-
-```````````````````````````````` example
-The number of windows in my house is
-14.  The number of doors is 6.
-.
-<p>The number of windows in my house is
-14.  The number of doors is 6.</p>
-````````````````````````````````
-
-We may still get an unintended result in cases like
-
-```````````````````````````````` example
-The number of windows in my house is
-1.  The number of doors is 6.
-.
-<p>The number of windows in my house is</p>
-<ol>
-<li>The number of doors is 6.</li>
-</ol>
-````````````````````````````````
-
-but this rule should prevent most spurious list captures.
-
-There can be any number of blank lines between items:
-
-```````````````````````````````` example
-- foo
-
-- bar
-
-
-- baz
-.
-<ul>
-<li>
-<p>foo</p>
-</li>
-<li>
-<p>bar</p>
-</li>
-<li>
-<p>baz</p>
-</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-- foo
-  - bar
-    - baz
-
-
-      bim
-.
-<ul>
-<li>foo
-<ul>
-<li>bar
-<ul>
-<li>
-<p>baz</p>
-<p>bim</p>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-To separate consecutive lists of the same type, or to separate a
-list from an indented code block that would otherwise be parsed
-as a subparagraph of the final list item, you can insert a blank HTML
-comment:
-
-```````````````````````````````` example
-- foo
-- bar
-
-<!-- -->
-
-- baz
-- bim
-.
-<ul>
-<li>foo</li>
-<li>bar</li>
-</ul>
-<!-- -->
-<ul>
-<li>baz</li>
-<li>bim</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
--   foo
-
-    notcode
-
--   foo
-
-<!-- -->
-
-    code
-.
-<ul>
-<li>
-<p>foo</p>
-<p>notcode</p>
-</li>
-<li>
-<p>foo</p>
-</li>
-</ul>
-<!-- -->
-<pre><code>code
-</code></pre>
-````````````````````````````````
-
-
-List items need not be indented to the same level.  The following
-list items will be treated as items at the same list level,
-since none is indented enough to belong to the previous list
-item:
-
-```````````````````````````````` example
-- a
- - b
-  - c
-   - d
-  - e
- - f
-- g
-.
-<ul>
-<li>a</li>
-<li>b</li>
-<li>c</li>
-<li>d</li>
-<li>e</li>
-<li>f</li>
-<li>g</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1. a
-
-  2. b
-
-   3. c
-.
-<ol>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-<li>
-<p>c</p>
-</li>
-</ol>
-````````````````````````````````
-
-Note, however, that list items may not be indented more than
-three spaces.  Here `- e` is treated as a paragraph continuation
-line, because it is indented more than three spaces:
-
-```````````````````````````````` example
-- a
- - b
-  - c
-   - d
-    - e
-.
-<ul>
-<li>a</li>
-<li>b</li>
-<li>c</li>
-<li>d
-- e</li>
-</ul>
-````````````````````````````````
-
-And here, `3. c` is treated as in indented code block,
-because it is indented four spaces and preceded by a
-blank line.
-
-```````````````````````````````` example
-1. a
-
-  2. b
-
-    3. c
-.
-<ol>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-</ol>
-<pre><code>3. c
-</code></pre>
-````````````````````````````````
-
-
-This is a loose list, because there is a blank line between
-two of the list items:
-
-```````````````````````````````` example
-- a
-- b
-
-- c
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-<li>
-<p>c</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-So is this, with a empty second item:
-
-```````````````````````````````` example
-* a
-*
-
-* c
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li></li>
-<li>
-<p>c</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-These are loose lists, even though there is no space between the items,
-because one of the items directly contains two block-level elements
-with a blank line between them:
-
-```````````````````````````````` example
-- a
-- b
-
-  c
-- d
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-<p>c</p>
-</li>
-<li>
-<p>d</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- a
-- b
-
-  [ref]: /url
-- d
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-<li>
-<p>d</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-This is a tight list, because the blank lines are in a code block:
-
-```````````````````````````````` example
-- a
-- ```
-  b
-
-
-  ```
-- c
-.
-<ul>
-<li>a</li>
-<li>
-<pre><code>b
-
-
-</code></pre>
-</li>
-<li>c</li>
-</ul>
-````````````````````````````````
-
-
-This is a tight list, because the blank line is between two
-paragraphs of a sublist.  So the sublist is loose while
-the outer list is tight:
-
-```````````````````````````````` example
-- a
-  - b
-
-    c
-- d
-.
-<ul>
-<li>a
-<ul>
-<li>
-<p>b</p>
-<p>c</p>
-</li>
-</ul>
-</li>
-<li>d</li>
-</ul>
-````````````````````````````````
-
-
-This is a tight list, because the blank line is inside the
-block quote:
-
-```````````````````````````````` example
-* a
-  > b
-  >
-* c
-.
-<ul>
-<li>a
-<blockquote>
-<p>b</p>
-</blockquote>
-</li>
-<li>c</li>
-</ul>
-````````````````````````````````
-
-
-This list is tight, because the consecutive block elements
-are not separated by blank lines:
-
-```````````````````````````````` example
-- a
-  > b
-  ```
-  c
-  ```
-- d
-.
-<ul>
-<li>a
-<blockquote>
-<p>b</p>
-</blockquote>
-<pre><code>c
-</code></pre>
-</li>
-<li>d</li>
-</ul>
-````````````````````````````````
-
-
-A single-paragraph list is tight:
-
-```````````````````````````````` example
-- a
-.
-<ul>
-<li>a</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- a
-  - b
-.
-<ul>
-<li>a
-<ul>
-<li>b</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-This list is loose, because of the blank line between the
-two block elements in the list item:
-
-```````````````````````````````` example
-1. ```
-   foo
-   ```
-
-   bar
-.
-<ol>
-<li>
-<pre><code>foo
-</code></pre>
-<p>bar</p>
-</li>
-</ol>
-````````````````````````````````
-
-
-Here the outer list is loose, the inner list tight:
-
-```````````````````````````````` example
-* foo
-  * bar
-
-  baz
-.
-<ul>
-<li>
-<p>foo</p>
-<ul>
-<li>bar</li>
-</ul>
-<p>baz</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- a
-  - b
-  - c
-
-- d
-  - e
-  - f
-.
-<ul>
-<li>
-<p>a</p>
-<ul>
-<li>b</li>
-<li>c</li>
-</ul>
-</li>
-<li>
-<p>d</p>
-<ul>
-<li>e</li>
-<li>f</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-# Inlines
-
-Inlines are parsed sequentially from the beginning of the character
-stream to the end (left to right, in left-to-right languages).
-Thus, for example, in
-
-```````````````````````````````` example
-`hi`lo`
-.
-<p><code>hi</code>lo`</p>
-````````````````````````````````
-
-`hi` is parsed as code, leaving the backtick at the end as a literal
-backtick.
-
-
-## Backslash escapes
-
-Any ASCII punctuation character may be backslash-escaped:
-
-```````````````````````````````` example
-\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~
-.
-<p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
-````````````````````````````````
-
-
-Backslashes before other characters are treated as literal
-backslashes:
-
-```````````````````````````````` example
-\→\A\a\ \3\φ\«
-.
-<p>\→\A\a\ \3\φ\«</p>
-````````````````````````````````
-
-
-Escaped characters are treated as regular characters and do
-not have their usual Markdown meanings:
-
-```````````````````````````````` example
-\*not emphasized*
-\<br/> not a tag
-\[not a link](/foo)
-\`not code`
-1\. not a list
-\* not a list
-\# not a heading
-\[foo]: /url "not a reference"
-\&ouml; not a character entity
-.
-<p>*not emphasized*
-&lt;br/&gt; not a tag
-[not a link](/foo)
-`not code`
-1. not a list
-* not a list
-# not a heading
-[foo]: /url &quot;not a reference&quot;
-&amp;ouml; not a character entity</p>
-````````````````````````````````
-
-
-If a backslash is itself escaped, the following character is not:
-
-```````````````````````````````` example
-\\*emphasis*
-.
-<p>\<em>emphasis</em></p>
-````````````````````````````````
-
-
-A backslash at the end of the line is a [hard line break]:
-
-```````````````````````````````` example
-foo\
-bar
-.
-<p>foo<br />
-bar</p>
-````````````````````````````````
-
-
-Backslash escapes do not work in code blocks, code spans, autolinks, or
-raw HTML:
-
-```````````````````````````````` example
-`` \[\` ``
-.
-<p><code>\[\`</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    \[\]
-.
-<pre><code>\[\]
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~
-\[\]
-~~~
-.
-<pre><code>\[\]
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<http://example.com?find=\*>
-.
-<p><a href="http://example.com?find=%5C*">http://example.com?find=\*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<a href="/bar\/)">
-.
-<a href="/bar\/)">
-````````````````````````````````
-
-
-But they work in all other contexts, including URLs and link titles,
-link references, and [info strings] in [fenced code blocks]:
-
-```````````````````````````````` example
-[foo](/bar\* "ti\*tle")
-.
-<p><a href="/bar*" title="ti*tle">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo]
-
-[foo]: /bar\* "ti\*tle"
-.
-<p><a href="/bar*" title="ti*tle">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-``` foo\+bar
-foo
-```
-.
-<pre><code class="language-foo+bar">foo
-</code></pre>
-````````````````````````````````
-
-
-
-## Entity and numeric character references
-
-Valid HTML entity references and numeric character references
-can be used in place of the corresponding Unicode character,
-with the following exceptions:
-
-- Entity and character references are not recognized in code
-  blocks and code spans.
-
-- Entity and character references cannot stand in place of
-  special characters that define structural elements in
-  CommonMark.  For example, although `&#42;` can be used
-  in place of a literal `*` character, `&#42;` cannot replace
-  `*` in emphasis delimiters, bullet list markers, or thematic
-  breaks.
-
-Conforming CommonMark parsers need not store information about
-whether a particular character was represented in the source
-using a Unicode character or an entity reference.
-
-[Entity references](@) consist of `&` + any of the valid
-HTML5 entity names + `;`. The
-document <https://html.spec.whatwg.org/multipage/entities.json>
-is used as an authoritative source for the valid entity
-references and their corresponding code points.
-
-```````````````````````````````` example
-&nbsp; &amp; &copy; &AElig; &Dcaron;
-&frac34; &HilbertSpace; &DifferentialD;
-&ClockwiseContourIntegral; &ngE;
-.
-<p>  &amp; © Æ Ď
-¾ ℋ ⅆ
-∲ ≧̸</p>
-````````````````````````````````
-
-
-[Decimal numeric character
-references](@)
-consist of `&#` + a string of 1--7 arabic digits + `;`. A
-numeric character reference is parsed as the corresponding
-Unicode character. Invalid Unicode code points will be replaced by
-the REPLACEMENT CHARACTER (`U+FFFD`).  For security reasons,
-the code point `U+0000` will also be replaced by `U+FFFD`.
-
-```````````````````````````````` example
-&#35; &#1234; &#992; &#0;
-.
-<p># Ӓ Ϡ �</p>
-````````````````````````````````
-
-
-[Hexadecimal numeric character
-references](@) consist of `&#` +
-either `X` or `x` + a string of 1-6 hexadecimal digits + `;`.
-They too are parsed as the corresponding Unicode character (this
-time specified with a hexadecimal numeral instead of decimal).
-
-```````````````````````````````` example
-&#X22; &#XD06; &#xcab;
-.
-<p>&quot; ആ ಫ</p>
-````````````````````````````````
-
-
-Here are some nonentities:
-
-```````````````````````````````` example
-&nbsp &x; &#; &#x;
-&#87654321;
-&#abcdef0;
-&ThisIsNotDefined; &hi?;
-.
-<p>&amp;nbsp &amp;x; &amp;#; &amp;#x;
-&amp;#87654321;
-&amp;#abcdef0;
-&amp;ThisIsNotDefined; &amp;hi?;</p>
-````````````````````````````````
-
-
-Although HTML5 does accept some entity references
-without a trailing semicolon (such as `&copy`), these are not
-recognized here, because it makes the grammar too ambiguous:
-
-```````````````````````````````` example
-&copy
-.
-<p>&amp;copy</p>
-````````````````````````````````
-
-
-Strings that are not on the list of HTML5 named entities are not
-recognized as entity references either:
-
-```````````````````````````````` example
-&MadeUpEntity;
-.
-<p>&amp;MadeUpEntity;</p>
-````````````````````````````````
-
-
-Entity and numeric character references are recognized in any
-context besides code spans or code blocks, including
-URLs, [link titles], and [fenced code block][] [info strings]:
-
-```````````````````````````````` example
-<a href="&ouml;&ouml;.html">
-.
-<a href="&ouml;&ouml;.html">
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo](/f&ouml;&ouml; "f&ouml;&ouml;")
-.
-<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo]
-
-[foo]: /f&ouml;&ouml; "f&ouml;&ouml;"
-.
-<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-``` f&ouml;&ouml;
-foo
-```
-.
-<pre><code class="language-föö">foo
-</code></pre>
-````````````````````````````````
-
-
-Entity and numeric character references are treated as literal
-text in code spans and code blocks:
-
-```````````````````````````````` example
-`f&ouml;&ouml;`
-.
-<p><code>f&amp;ouml;&amp;ouml;</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    f&ouml;f&ouml;
-.
-<pre><code>f&amp;ouml;f&amp;ouml;
-</code></pre>
-````````````````````````````````
-
-
-Entity and numeric character references cannot be used
-in place of symbols indicating structure in CommonMark
-documents.
-
-```````````````````````````````` example
-&#42;foo&#42;
-*foo*
-.
-<p>*foo*
-<em>foo</em></p>
-````````````````````````````````
-
-```````````````````````````````` example
-&#42; foo
-
-* foo
-.
-<p>* foo</p>
-<ul>
-<li>foo</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-foo&#10;&#10;bar
-.
-<p>foo
-
-bar</p>
-````````````````````````````````
-
-```````````````````````````````` example
-&#9;foo
-.
-<p>→foo</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[a](url &quot;tit&quot;)
-.
-<p>[a](url &quot;tit&quot;)</p>
-````````````````````````````````
-
-
-## Code spans
-
-A [backtick string](@)
-is a string of one or more backtick characters (`` ` ``) that is neither
-preceded nor followed by a backtick.
-
-A [code span](@) begins with a backtick string and ends with
-a backtick string of equal length.  The contents of the code span are
-the characters between the two backtick strings, normalized in the
-following ways:
-
-- First, [line endings] are converted to [spaces].
-- If the resulting string both begins *and* ends with a [space]
-  character, but does not consist entirely of [space]
-  characters, a single [space] character is removed from the
-  front and back.  This allows you to include code that begins
-  or ends with backtick characters, which must be separated by
-  whitespace from the opening or closing backtick strings.
-
-This is a simple code span:
-
-```````````````````````````````` example
-`foo`
-.
-<p><code>foo</code></p>
-````````````````````````````````
-
-
-Here two backticks are used, because the code contains a backtick.
-This example also illustrates stripping of a single leading and
-trailing space:
-
-```````````````````````````````` example
-`` foo ` bar ``
-.
-<p><code>foo ` bar</code></p>
-````````````````````````````````
-
-
-This example shows the motivation for stripping leading and trailing
-spaces:
-
-```````````````````````````````` example
-` `` `
-.
-<p><code>``</code></p>
-````````````````````````````````
-
-Note that only *one* space is stripped:
-
-```````````````````````````````` example
-`  ``  `
-.
-<p><code> `` </code></p>
-````````````````````````````````
-
-The stripping only happens if the space is on both
-sides of the string:
-
-```````````````````````````````` example
-` a`
-.
-<p><code> a</code></p>
-````````````````````````````````
-
-Only [spaces], and not [unicode whitespace] in general, are
-stripped in this way:
-
-```````````````````````````````` example
-` b `
-.
-<p><code> b </code></p>
-````````````````````````````````
-
-No stripping occurs if the code span contains only spaces:
-
-```````````````````````````````` example
-` `
-`  `
-.
-<p><code> </code>
-<code>  </code></p>
-````````````````````````````````
-
-
-[Line endings] are treated like spaces:
-
-```````````````````````````````` example
-``
-foo
-bar  
-baz
-``
-.
-<p><code>foo bar   baz</code></p>
-````````````````````````````````
-
-```````````````````````````````` example
-``
-foo 
-``
-.
-<p><code>foo </code></p>
-````````````````````````````````
-
-
-Interior spaces are not collapsed:
-
-```````````````````````````````` example
-`foo   bar 
-baz`
-.
-<p><code>foo   bar  baz</code></p>
-````````````````````````````````
-
-Note that browsers will typically collapse consecutive spaces
-when rendering `<code>` elements, so it is recommended that
-the following CSS be used:
-
-    code{white-space: pre-wrap;}
-
-
-Note that backslash escapes do not work in code spans. All backslashes
-are treated literally:
-
-```````````````````````````````` example
-`foo\`bar`
-.
-<p><code>foo\</code>bar`</p>
-````````````````````````````````
-
-
-Backslash escapes are never needed, because one can always choose a
-string of *n* backtick characters as delimiters, where the code does
-not contain any strings of exactly *n* backtick characters.
-
-```````````````````````````````` example
-``foo`bar``
-.
-<p><code>foo`bar</code></p>
-````````````````````````````````
-
-```````````````````````````````` example
-` foo `` bar `
-.
-<p><code>foo `` bar</code></p>
-````````````````````````````````
-
-
-Code span backticks have higher precedence than any other inline
-constructs except HTML tags and autolinks.  Thus, for example, this is
-not parsed as emphasized text, since the second `*` is part of a code
-span:
-
-```````````````````````````````` example
-*foo`*`
-.
-<p>*foo<code>*</code></p>
-````````````````````````````````
-
-
-And this is not parsed as a link:
-
-```````````````````````````````` example
-[not a `link](/foo`)
-.
-<p>[not a <code>link](/foo</code>)</p>
-````````````````````````````````
-
-
-Code spans, HTML tags, and autolinks have the same precedence.
-Thus, this is code:
-
-```````````````````````````````` example
-`<a href="`">`
-.
-<p><code>&lt;a href=&quot;</code>&quot;&gt;`</p>
-````````````````````````````````
-
-
-But this is an HTML tag:
-
-```````````````````````````````` example
-<a href="`">`
-.
-<p><a href="`">`</p>
-````````````````````````````````
-
-
-And this is code:
-
-```````````````````````````````` example
-`<http://foo.bar.`baz>`
-.
-<p><code>&lt;http://foo.bar.</code>baz&gt;`</p>
-````````````````````````````````
-
-
-But this is an autolink:
-
-```````````````````````````````` example
-<http://foo.bar.`baz>`
-.
-<p><a href="http://foo.bar.%60baz">http://foo.bar.`baz</a>`</p>
-````````````````````````````````
-
-
-When a backtick string is not closed by a matching backtick string,
-we just have literal backticks:
-
-```````````````````````````````` example
-```foo``
-.
-<p>```foo``</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-`foo
-.
-<p>`foo</p>
-````````````````````````````````
-
-The following case also illustrates the need for opening and
-closing backtick strings to be equal in length:
-
-```````````````````````````````` example
-`foo``bar``
-.
-<p>`foo<code>bar</code></p>
-````````````````````````````````
-
-
-## Emphasis and strong emphasis
-
-John Gruber's original [Markdown syntax
-description](http://daringfireball.net/projects/markdown/syntax#em) says:
-
-> Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-> emphasis. Text wrapped with one `*` or `_` will be wrapped with an HTML
-> `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML `<strong>`
-> tag.
-
-This is enough for most users, but these rules leave much undecided,
-especially when it comes to nested emphasis.  The original
-`Markdown.pl` test suite makes it clear that triple `***` and
-`___` delimiters can be used for strong emphasis, and most
-implementations have also allowed the following patterns:
-
-``` markdown
-***strong emph***
-***strong** in emph*
-***emph* in strong**
-**in strong *emph***
-*in emph **strong***
-```
-
-The following patterns are less widely supported, but the intent
-is clear and they are useful (especially in contexts like bibliography
-entries):
-
-``` markdown
-*emph *with emph* in it*
-**strong **with strong** in it**
-```
-
-Many implementations have also restricted intraword emphasis to
-the `*` forms, to avoid unwanted emphasis in words containing
-internal underscores.  (It is best practice to put these in code
-spans, but users often do not.)
-
-``` markdown
-internal emphasis: foo*bar*baz
-no emphasis: foo_bar_baz
-```
-
-The rules given below capture all of these patterns, while allowing
-for efficient parsing strategies that do not backtrack.
-
-First, some definitions.  A [delimiter run](@) is either
-a sequence of one or more `*` characters that is not preceded or
-followed by a non-backslash-escaped `*` character, or a sequence
-of one or more `_` characters that is not preceded or followed by
-a non-backslash-escaped `_` character.
-
-A [left-flanking delimiter run](@) is
-a [delimiter run] that is (1) not followed by [Unicode whitespace],
-and either (2a) not followed by a [punctuation character], or
-(2b) followed by a [punctuation character] and
-preceded by [Unicode whitespace] or a [punctuation character].
-For purposes of this definition, the beginning and the end of
-the line count as Unicode whitespace.
-
-A [right-flanking delimiter run](@) is
-a [delimiter run] that is (1) not preceded by [Unicode whitespace],
-and either (2a) not preceded by a [punctuation character], or
-(2b) preceded by a [punctuation character] and
-followed by [Unicode whitespace] or a [punctuation character].
-For purposes of this definition, the beginning and the end of
-the line count as Unicode whitespace.
-
-Here are some examples of delimiter runs.
-
-  - left-flanking but not right-flanking:
-
-    ```
-    ***abc
-      _abc
-    **"abc"
-     _"abc"
-    ```
-
-  - right-flanking but not left-flanking:
-
-    ```
-     abc***
-     abc_
-    "abc"**
-    "abc"_
-    ```
-
-  - Both left and right-flanking:
-
-    ```
-     abc***def
-    "abc"_"def"
-    ```
-
-  - Neither left nor right-flanking:
-
-    ```
-    abc *** def
-    a _ b
-    ```
-
-(The idea of distinguishing left-flanking and right-flanking
-delimiter runs based on the character before and the character
-after comes from Roopesh Chander's
-[vfmd](http://www.vfmd.org/vfmd-spec/specification/#procedure-for-identifying-emphasis-tags).
-vfmd uses the terminology "emphasis indicator string" instead of "delimiter
-run," and its rules for distinguishing left- and right-flanking runs
-are a bit more complex than the ones given here.)
-
-The following rules define emphasis and strong emphasis:
-
-1.  A single `*` character [can open emphasis](@)
-    iff (if and only if) it is part of a [left-flanking delimiter run].
-
-2.  A single `_` character [can open emphasis] iff
-    it is part of a [left-flanking delimiter run]
-    and either (a) not part of a [right-flanking delimiter run]
-    or (b) part of a [right-flanking delimiter run]
-    preceded by punctuation.
-
-3.  A single `*` character [can close emphasis](@)
-    iff it is part of a [right-flanking delimiter run].
-
-4.  A single `_` character [can close emphasis] iff
-    it is part of a [right-flanking delimiter run]
-    and either (a) not part of a [left-flanking delimiter run]
-    or (b) part of a [left-flanking delimiter run]
-    followed by punctuation.
-
-5.  A double `**` [can open strong emphasis](@)
-    iff it is part of a [left-flanking delimiter run].
-
-6.  A double `__` [can open strong emphasis] iff
-    it is part of a [left-flanking delimiter run]
-    and either (a) not part of a [right-flanking delimiter run]
-    or (b) part of a [right-flanking delimiter run]
-    preceded by punctuation.
-
-7.  A double `**` [can close strong emphasis](@)
-    iff it is part of a [right-flanking delimiter run].
-
-8.  A double `__` [can close strong emphasis] iff
-    it is part of a [right-flanking delimiter run]
-    and either (a) not part of a [left-flanking delimiter run]
-    or (b) part of a [left-flanking delimiter run]
-    followed by punctuation.
-
-9.  Emphasis begins with a delimiter that [can open emphasis] and ends
-    with a delimiter that [can close emphasis], and that uses the same
-    character (`_` or `*`) as the opening delimiter.  The
-    opening and closing delimiters must belong to separate
-    [delimiter runs].  If one of the delimiters can both
-    open and close emphasis, then the sum of the lengths of the
-    delimiter runs containing the opening and closing delimiters
-    must not be a multiple of 3 unless both lengths are
-    multiples of 3.
-
-10. Strong emphasis begins with a delimiter that
-    [can open strong emphasis] and ends with a delimiter that
-    [can close strong emphasis], and that uses the same character
-    (`_` or `*`) as the opening delimiter.  The
-    opening and closing delimiters must belong to separate
-    [delimiter runs].  If one of the delimiters can both open
-    and close strong emphasis, then the sum of the lengths of
-    the delimiter runs containing the opening and closing
-    delimiters must not be a multiple of 3 unless both lengths
-    are multiples of 3.
-
-11. A literal `*` character cannot occur at the beginning or end of
-    `*`-delimited emphasis or `**`-delimited strong emphasis, unless it
-    is backslash-escaped.
-
-12. A literal `_` character cannot occur at the beginning or end of
-    `_`-delimited emphasis or `__`-delimited strong emphasis, unless it
-    is backslash-escaped.
-
-Where rules 1--12 above are compatible with multiple parsings,
-the following principles resolve ambiguity:
-
-13. The number of nestings should be minimized. Thus, for example,
-    an interpretation `<strong>...</strong>` is always preferred to
-    `<em><em>...</em></em>`.
-
-14. An interpretation `<em><strong>...</strong></em>` is always
-    preferred to `<strong><em>...</em></strong>`.
-
-15. When two potential emphasis or strong emphasis spans overlap,
-    so that the second begins before the first ends and ends after
-    the first ends, the first takes precedence. Thus, for example,
-    `*foo _bar* baz_` is parsed as `<em>foo _bar</em> baz_` rather
-    than `*foo <em>bar* baz</em>`.
-
-16. When there are two potential emphasis or strong emphasis spans
-    with the same closing delimiter, the shorter one (the one that
-    opens later) takes precedence. Thus, for example,
-    `**foo **bar baz**` is parsed as `**foo <strong>bar baz</strong>`
-    rather than `<strong>foo **bar baz</strong>`.
-
-17. Inline code spans, links, images, and HTML tags group more tightly
-    than emphasis.  So, when there is a choice between an interpretation
-    that contains one of these elements and one that does not, the
-    former always wins.  Thus, for example, `*[foo*](bar)` is
-    parsed as `*<a href="bar">foo*</a>` rather than as
-    `<em>[foo</em>](bar)`.
-
-These rules can be illustrated through a series of examples.
-
-Rule 1:
-
-```````````````````````````````` example
-*foo bar*
-.
-<p><em>foo bar</em></p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `*` is followed by
-whitespace, and hence not part of a [left-flanking delimiter run]:
-
-```````````````````````````````` example
-a * foo bar*
-.
-<p>a * foo bar*</p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `*` is preceded
-by an alphanumeric and followed by punctuation, and hence
-not part of a [left-flanking delimiter run]:
-
-```````````````````````````````` example
-a*"foo"*
-.
-<p>a*&quot;foo&quot;*</p>
-````````````````````````````````
-
-
-Unicode nonbreaking spaces count as whitespace, too:
-
-```````````````````````````````` example
-* a *
-.
-<p>* a *</p>
-````````````````````````````````
-
-
-Intraword emphasis with `*` is permitted:
-
-```````````````````````````````` example
-foo*bar*
-.
-<p>foo<em>bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-5*6*78
-.
-<p>5<em>6</em>78</p>
-````````````````````````````````
-
-
-Rule 2:
-
-```````````````````````````````` example
-_foo bar_
-.
-<p><em>foo bar</em></p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `_` is followed by
-whitespace:
-
-```````````````````````````````` example
-_ foo bar_
-.
-<p>_ foo bar_</p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `_` is preceded
-by an alphanumeric and followed by punctuation:
-
-```````````````````````````````` example
-a_"foo"_
-.
-<p>a_&quot;foo&quot;_</p>
-````````````````````````````````
-
-
-Emphasis with `_` is not allowed inside words:
-
-```````````````````````````````` example
-foo_bar_
-.
-<p>foo_bar_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-5_6_78
-.
-<p>5_6_78</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-пристаням_стремятся_
-.
-<p>пристаням_стремятся_</p>
-````````````````````````````````
-
-
-Here `_` does not generate emphasis, because the first delimiter run
-is right-flanking and the second left-flanking:
-
-```````````````````````````````` example
-aa_"bb"_cc
-.
-<p>aa_&quot;bb&quot;_cc</p>
-````````````````````````````````
-
-
-This is emphasis, even though the opening delimiter is
-both left- and right-flanking, because it is preceded by
-punctuation:
-
-```````````````````````````````` example
-foo-_(bar)_
-.
-<p>foo-<em>(bar)</em></p>
-````````````````````````````````
-
-
-Rule 3:
-
-This is not emphasis, because the closing delimiter does
-not match the opening delimiter:
-
-```````````````````````````````` example
-_foo*
-.
-<p>_foo*</p>
-````````````````````````````````
-
-
-This is not emphasis, because the closing `*` is preceded by
-whitespace:
-
-```````````````````````````````` example
-*foo bar *
-.
-<p>*foo bar *</p>
-````````````````````````````````
-
-
-A newline also counts as whitespace:
-
-```````````````````````````````` example
-*foo bar
-*
-.
-<p>*foo bar
-*</p>
-````````````````````````````````
-
-
-This is not emphasis, because the second `*` is
-preceded by punctuation and followed by an alphanumeric
-(hence it is not part of a [right-flanking delimiter run]:
-
-```````````````````````````````` example
-*(*foo)
-.
-<p>*(*foo)</p>
-````````````````````````````````
-
-
-The point of this restriction is more easily appreciated
-with this example:
-
-```````````````````````````````` example
-*(*foo*)*
-.
-<p><em>(<em>foo</em>)</em></p>
-````````````````````````````````
-
-
-Intraword emphasis with `*` is allowed:
-
-```````````````````````````````` example
-*foo*bar
-.
-<p><em>foo</em>bar</p>
-````````````````````````````````
-
-
-
-Rule 4:
-
-This is not emphasis, because the closing `_` is preceded by
-whitespace:
-
-```````````````````````````````` example
-_foo bar _
-.
-<p>_foo bar _</p>
-````````````````````````````````
-
-
-This is not emphasis, because the second `_` is
-preceded by punctuation and followed by an alphanumeric:
-
-```````````````````````````````` example
-_(_foo)
-.
-<p>_(_foo)</p>
-````````````````````````````````
-
-
-This is emphasis within emphasis:
-
-```````````````````````````````` example
-_(_foo_)_
-.
-<p><em>(<em>foo</em>)</em></p>
-````````````````````````````````
-
-
-Intraword emphasis is disallowed for `_`:
-
-```````````````````````````````` example
-_foo_bar
-.
-<p>_foo_bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_пристаням_стремятся
-.
-<p>_пристаням_стремятся</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo_bar_baz_
-.
-<p><em>foo_bar_baz</em></p>
-````````````````````````````````
-
-
-This is emphasis, even though the closing delimiter is
-both left- and right-flanking, because it is followed by
-punctuation:
-
-```````````````````````````````` example
-_(bar)_.
-.
-<p><em>(bar)</em>.</p>
-````````````````````````````````
-
-
-Rule 5:
-
-```````````````````````````````` example
-**foo bar**
-.
-<p><strong>foo bar</strong></p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening delimiter is
-followed by whitespace:
-
-```````````````````````````````` example
-** foo bar**
-.
-<p>** foo bar**</p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening `**` is preceded
-by an alphanumeric and followed by punctuation, and hence
-not part of a [left-flanking delimiter run]:
-
-```````````````````````````````` example
-a**"foo"**
-.
-<p>a**&quot;foo&quot;**</p>
-````````````````````````````````
-
-
-Intraword strong emphasis with `**` is permitted:
-
-```````````````````````````````` example
-foo**bar**
-.
-<p>foo<strong>bar</strong></p>
-````````````````````````````````
-
-
-Rule 6:
-
-```````````````````````````````` example
-__foo bar__
-.
-<p><strong>foo bar</strong></p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening delimiter is
-followed by whitespace:
-
-```````````````````````````````` example
-__ foo bar__
-.
-<p>__ foo bar__</p>
-````````````````````````````````
-
-
-A newline counts as whitespace:
-```````````````````````````````` example
-__
-foo bar__
-.
-<p>__
-foo bar__</p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening `__` is preceded
-by an alphanumeric and followed by punctuation:
-
-```````````````````````````````` example
-a__"foo"__
-.
-<p>a__&quot;foo&quot;__</p>
-````````````````````````````````
-
-
-Intraword strong emphasis is forbidden with `__`:
-
-```````````````````````````````` example
-foo__bar__
-.
-<p>foo__bar__</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-5__6__78
-.
-<p>5__6__78</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-пристаням__стремятся__
-.
-<p>пристаням__стремятся__</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo, __bar__, baz__
-.
-<p><strong>foo, <strong>bar</strong>, baz</strong></p>
-````````````````````````````````
-
-
-This is strong emphasis, even though the opening delimiter is
-both left- and right-flanking, because it is preceded by
-punctuation:
-
-```````````````````````````````` example
-foo-__(bar)__
-.
-<p>foo-<strong>(bar)</strong></p>
-````````````````````````````````
-
-
-
-Rule 7:
-
-This is not strong emphasis, because the closing delimiter is preceded
-by whitespace:
-
-```````````````````````````````` example
-**foo bar **
-.
-<p>**foo bar **</p>
-````````````````````````````````
-
-
-(Nor can it be interpreted as an emphasized `*foo bar *`, because of
-Rule 11.)
-
-This is not strong emphasis, because the second `**` is
-preceded by punctuation and followed by an alphanumeric:
-
-```````````````````````````````` example
-**(**foo)
-.
-<p>**(**foo)</p>
-````````````````````````````````
-
-
-The point of this restriction is more easily appreciated
-with these examples:
-
-```````````````````````````````` example
-*(**foo**)*
-.
-<p><em>(<strong>foo</strong>)</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**Gomphocarpus (*Gomphocarpus physocarpus*, syn.
-*Asclepias physocarpa*)**
-.
-<p><strong>Gomphocarpus (<em>Gomphocarpus physocarpus</em>, syn.
-<em>Asclepias physocarpa</em>)</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo "*bar*" foo**
-.
-<p><strong>foo &quot;<em>bar</em>&quot; foo</strong></p>
-````````````````````````````````
-
-
-Intraword emphasis:
-
-```````````````````````````````` example
-**foo**bar
-.
-<p><strong>foo</strong>bar</p>
-````````````````````````````````
-
-
-Rule 8:
-
-This is not strong emphasis, because the closing delimiter is
-preceded by whitespace:
-
-```````````````````````````````` example
-__foo bar __
-.
-<p>__foo bar __</p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the second `__` is
-preceded by punctuation and followed by an alphanumeric:
-
-```````````````````````````````` example
-__(__foo)
-.
-<p>__(__foo)</p>
-````````````````````````````````
-
-
-The point of this restriction is more easily appreciated
-with this example:
-
-```````````````````````````````` example
-_(__foo__)_
-.
-<p><em>(<strong>foo</strong>)</em></p>
-````````````````````````````````
-
-
-Intraword strong emphasis is forbidden with `__`:
-
-```````````````````````````````` example
-__foo__bar
-.
-<p>__foo__bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__пристаням__стремятся
-.
-<p>__пристаням__стремятся</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo__bar__baz__
-.
-<p><strong>foo__bar__baz</strong></p>
-````````````````````````````````
-
-
-This is strong emphasis, even though the closing delimiter is
-both left- and right-flanking, because it is followed by
-punctuation:
-
-```````````````````````````````` example
-__(bar)__.
-.
-<p><strong>(bar)</strong>.</p>
-````````````````````````````````
-
-
-Rule 9:
-
-Any nonempty sequence of inline elements can be the contents of an
-emphasized span.
-
-```````````````````````````````` example
-*foo [bar](/url)*
-.
-<p><em>foo <a href="/url">bar</a></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo
-bar*
-.
-<p><em>foo
-bar</em></p>
-````````````````````````````````
-
-
-In particular, emphasis and strong emphasis can be nested
-inside emphasis:
-
-```````````````````````````````` example
-_foo __bar__ baz_
-.
-<p><em>foo <strong>bar</strong> baz</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo _bar_ baz_
-.
-<p><em>foo <em>bar</em> baz</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo_ bar_
-.
-<p><em><em>foo</em> bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo *bar**
-.
-<p><em>foo <em>bar</em></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo **bar** baz*
-.
-<p><em>foo <strong>bar</strong> baz</em></p>
-````````````````````````````````
-
-```````````````````````````````` example
-*foo**bar**baz*
-.
-<p><em>foo<strong>bar</strong>baz</em></p>
-````````````````````````````````
-
-Note that in the preceding case, the interpretation
-
-``` markdown
-<p><em>foo</em><em>bar<em></em>baz</em></p>
-```
-
-
-is precluded by the condition that a delimiter that
-can both open and close (like the `*` after `foo`)
-cannot form emphasis if the sum of the lengths of
-the delimiter runs containing the opening and
-closing delimiters is a multiple of 3 unless
-both lengths are multiples of 3.
-
-
-For the same reason, we don't get two consecutive
-emphasis sections in this example:
-
-```````````````````````````````` example
-*foo**bar*
-.
-<p><em>foo**bar</em></p>
-````````````````````````````````
-
-
-The same condition ensures that the following
-cases are all strong emphasis nested inside
-emphasis, even when the interior spaces are
-omitted:
-
-
-```````````````````````````````` example
-***foo** bar*
-.
-<p><em><strong>foo</strong> bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo **bar***
-.
-<p><em>foo <strong>bar</strong></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo**bar***
-.
-<p><em>foo<strong>bar</strong></em></p>
-````````````````````````````````
-
-
-When the lengths of the interior closing and opening
-delimiter runs are *both* multiples of 3, though,
-they can match to create emphasis:
-
-```````````````````````````````` example
-foo***bar***baz
-.
-<p>foo<em><strong>bar</strong></em>baz</p>
-````````````````````````````````
-
-```````````````````````````````` example
-foo******bar*********baz
-.
-<p>foo<strong><strong><strong>bar</strong></strong></strong>***baz</p>
-````````````````````````````````
-
-
-Indefinite levels of nesting are possible:
-
-```````````````````````````````` example
-*foo **bar *baz* bim** bop*
-.
-<p><em>foo <strong>bar <em>baz</em> bim</strong> bop</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo [*bar*](/url)*
-.
-<p><em>foo <a href="/url"><em>bar</em></a></em></p>
-````````````````````````````````
-
-
-There can be no empty emphasis or strong emphasis:
-
-```````````````````````````````` example
-** is not an empty emphasis
-.
-<p>** is not an empty emphasis</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**** is not an empty strong emphasis
-.
-<p>**** is not an empty strong emphasis</p>
-````````````````````````````````
-
-
-
-Rule 10:
-
-Any nonempty sequence of inline elements can be the contents of an
-strongly emphasized span.
-
-```````````````````````````````` example
-**foo [bar](/url)**
-.
-<p><strong>foo <a href="/url">bar</a></strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo
-bar**
-.
-<p><strong>foo
-bar</strong></p>
-````````````````````````````````
-
-
-In particular, emphasis and strong emphasis can be nested
-inside strong emphasis:
-
-```````````````````````````````` example
-__foo _bar_ baz__
-.
-<p><strong>foo <em>bar</em> baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo __bar__ baz__
-.
-<p><strong>foo <strong>bar</strong> baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____foo__ bar__
-.
-<p><strong><strong>foo</strong> bar</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo **bar****
-.
-<p><strong>foo <strong>bar</strong></strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo *bar* baz**
-.
-<p><strong>foo <em>bar</em> baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo*bar*baz**
-.
-<p><strong>foo<em>bar</em>baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-***foo* bar**
-.
-<p><strong><em>foo</em> bar</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo *bar***
-.
-<p><strong>foo <em>bar</em></strong></p>
-````````````````````````````````
-
-
-Indefinite levels of nesting are possible:
-
-```````````````````````````````` example
-**foo *bar **baz**
-bim* bop**
-.
-<p><strong>foo <em>bar <strong>baz</strong>
-bim</em> bop</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo [*bar*](/url)**
-.
-<p><strong>foo <a href="/url"><em>bar</em></a></strong></p>
-````````````````````````````````
-
-
-There can be no empty emphasis or strong emphasis:
-
-```````````````````````````````` example
-__ is not an empty emphasis
-.
-<p>__ is not an empty emphasis</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____ is not an empty strong emphasis
-.
-<p>____ is not an empty strong emphasis</p>
-````````````````````````````````
-
-
-
-Rule 11:
-
-```````````````````````````````` example
-foo ***
-.
-<p>foo ***</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo *\**
-.
-<p>foo <em>*</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo *_*
-.
-<p>foo <em>_</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo *****
-.
-<p>foo *****</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo **\***
-.
-<p>foo <strong>*</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo **_**
-.
-<p>foo <strong>_</strong></p>
-````````````````````````````````
-
-
-Note that when delimiters do not match evenly, Rule 11 determines
-that the excess literal `*` characters will appear outside of the
-emphasis, rather than inside it:
-
-```````````````````````````````` example
-**foo*
-.
-<p>*<em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo**
-.
-<p><em>foo</em>*</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-***foo**
-.
-<p>*<strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-****foo*
-.
-<p>***<em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo***
-.
-<p><strong>foo</strong>*</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo****
-.
-<p><em>foo</em>***</p>
-````````````````````````````````
-
-
-
-Rule 12:
-
-```````````````````````````````` example
-foo ___
-.
-<p>foo ___</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo _\__
-.
-<p>foo <em>_</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo _*_
-.
-<p>foo <em>*</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo _____
-.
-<p>foo _____</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo __\___
-.
-<p>foo <strong>_</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo __*__
-.
-<p>foo <strong>*</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo_
-.
-<p>_<em>foo</em></p>
-````````````````````````````````
-
-
-Note that when delimiters do not match evenly, Rule 12 determines
-that the excess literal `_` characters will appear outside of the
-emphasis, rather than inside it:
-
-```````````````````````````````` example
-_foo__
-.
-<p><em>foo</em>_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-___foo__
-.
-<p>_<strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____foo_
-.
-<p>___<em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo___
-.
-<p><strong>foo</strong>_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo____
-.
-<p><em>foo</em>___</p>
-````````````````````````````````
-
-
-Rule 13 implies that if you want emphasis nested directly inside
-emphasis, you must use different delimiters:
-
-```````````````````````````````` example
-**foo**
-.
-<p><strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*_foo_*
-.
-<p><em><em>foo</em></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo__
-.
-<p><strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_*foo*_
-.
-<p><em><em>foo</em></em></p>
-````````````````````````````````
-
-
-However, strong emphasis within strong emphasis is possible without
-switching delimiters:
-
-```````````````````````````````` example
-****foo****
-.
-<p><strong><strong>foo</strong></strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____foo____
-.
-<p><strong><strong>foo</strong></strong></p>
-````````````````````````````````
-
-
-
-Rule 13 can be applied to arbitrarily long sequences of
-delimiters:
-
-```````````````````````````````` example
-******foo******
-.
-<p><strong><strong><strong>foo</strong></strong></strong></p>
-````````````````````````````````
-
-
-Rule 14:
-
-```````````````````````````````` example
-***foo***
-.
-<p><em><strong>foo</strong></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_____foo_____
-.
-<p><em><strong><strong>foo</strong></strong></em></p>
-````````````````````````````````
-
-
-Rule 15:
-
-```````````````````````````````` example
-*foo _bar* baz_
-.
-<p><em>foo _bar</em> baz_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo __bar *baz bim__ bam*
-.
-<p><em>foo <strong>bar *baz bim</strong> bam</em></p>
-````````````````````````````````
-
-
-Rule 16:
-
-```````````````````````````````` example
-**foo **bar baz**
-.
-<p>**foo <strong>bar baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo *bar baz*
-.
-<p>*foo <em>bar baz</em></p>
-````````````````````````````````
-
-
-Rule 17:
-
-```````````````````````````````` example
-*[bar*](/url)
-.
-<p>*<a href="/url">bar*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo [bar_](/url)
-.
-<p>_foo <a href="/url">bar_</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*<img src="foo" title="*"/>
-.
-<p>*<img src="foo" title="*"/></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**<a href="**">
-.
-<p>**<a href="**"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__<a href="__">
-.
-<p>__<a href="__"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*a `*`*
-.
-<p><em>a <code>*</code></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_a `_`_
-.
-<p><em>a <code>_</code></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**a<http://foo.bar/?q=**>
-.
-<p>**a<a href="http://foo.bar/?q=**">http://foo.bar/?q=**</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__a<http://foo.bar/?q=__>
-.
-<p>__a<a href="http://foo.bar/?q=__">http://foo.bar/?q=__</a></p>
-````````````````````````````````
-
-
-
-## Links
-
-A link contains [link text] (the visible text), a [link destination]
-(the URI that is the link destination), and optionally a [link title].
-There are two basic kinds of links in Markdown.  In [inline links] the
-destination and title are given immediately after the link text.  In
-[reference links] the destination and title are defined elsewhere in
-the document.
-
-A [link text](@) consists of a sequence of zero or more
-inline elements enclosed by square brackets (`[` and `]`).  The
-following rules apply:
-
-- Links may not contain other links, at any level of nesting. If
-  multiple otherwise valid link definitions appear nested inside each
-  other, the inner-most definition is used.
-
-- Brackets are allowed in the [link text] only if (a) they
-  are backslash-escaped or (b) they appear as a matched pair of brackets,
-  with an open bracket `[`, a sequence of zero or more inlines, and
-  a close bracket `]`.
-
-- Backtick [code spans], [autolinks], and raw [HTML tags] bind more tightly
-  than the brackets in link text.  Thus, for example,
-  `` [foo`]` `` could not be a link text, since the second `]`
-  is part of a code span.
-
-- The brackets in link text bind more tightly than markers for
-  [emphasis and strong emphasis]. Thus, for example, `*[foo*](url)` is a link.
-
-A [link destination](@) consists of either
-
-- a sequence of zero or more characters between an opening `<` and a
-  closing `>` that contains no line breaks or unescaped
-  `<` or `>` characters, or
-
-- a nonempty sequence of characters that does not start with
-  `<`, does not include ASCII space or control characters, and
-  includes parentheses only if (a) they are backslash-escaped or
-  (b) they are part of a balanced pair of unescaped parentheses.
-  (Implementations may impose limits on parentheses nesting to
-  avoid performance issues, but at least three levels of nesting
-  should be supported.)
-
-A [link title](@)  consists of either
-
-- a sequence of zero or more characters between straight double-quote
-  characters (`"`), including a `"` character only if it is
-  backslash-escaped, or
-
-- a sequence of zero or more characters between straight single-quote
-  characters (`'`), including a `'` character only if it is
-  backslash-escaped, or
-
-- a sequence of zero or more characters between matching parentheses
-  (`(...)`), including a `(` or `)` character only if it is
-  backslash-escaped.
-
-Although [link titles] may span multiple lines, they may not contain
-a [blank line].
-
-An [inline link](@) consists of a [link text] followed immediately
-by a left parenthesis `(`, optional [whitespace], an optional
-[link destination], an optional [link title] separated from the link
-destination by [whitespace], optional [whitespace], and a right
-parenthesis `)`. The link's text consists of the inlines contained
-in the [link text] (excluding the enclosing square brackets).
-The link's URI consists of the link destination, excluding enclosing
-`<...>` if present, with backslash-escapes in effect as described
-above.  The link's title consists of the link title, excluding its
-enclosing delimiters, with backslash-escapes in effect as described
-above.
-
-Here is a simple inline link:
-
-```````````````````````````````` example
-[link](/uri "title")
-.
-<p><a href="/uri" title="title">link</a></p>
-````````````````````````````````
-
-
-The title may be omitted:
-
-```````````````````````````````` example
-[link](/uri)
-.
-<p><a href="/uri">link</a></p>
-````````````````````````````````
-
-
-Both the title and the destination may be omitted:
-
-```````````````````````````````` example
-[link]()
-.
-<p><a href="">link</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link](<>)
-.
-<p><a href="">link</a></p>
-````````````````````````````````
-
-The destination can only contain spaces if it is
-enclosed in pointy brackets:
-
-```````````````````````````````` example
-[link](/my uri)
-.
-<p>[link](/my uri)</p>
-````````````````````````````````
-
-```````````````````````````````` example
-[link](</my uri>)
-.
-<p><a href="/my%20uri">link</a></p>
-````````````````````````````````
-
-The destination cannot contain line breaks,
-even if enclosed in pointy brackets:
-
-```````````````````````````````` example
-[link](foo
-bar)
-.
-<p>[link](foo
-bar)</p>
-````````````````````````````````
-
-```````````````````````````````` example
-[link](<foo
-bar>)
-.
-<p>[link](<foo
-bar>)</p>
-````````````````````````````````
-
-The destination can contain `)` if it is enclosed
-in pointy brackets:
-
-```````````````````````````````` example
-[a](<b)c>)
-.
-<p><a href="b)c">a</a></p>
-````````````````````````````````
-
-Pointy brackets that enclose links must be unescaped:
-
-```````````````````````````````` example
-[link](<foo\>)
-.
-<p>[link](&lt;foo&gt;)</p>
-````````````````````````````````
-
-These are not links, because the opening pointy bracket
-is not matched properly:
-
-```````````````````````````````` example
-[a](<b)c
-[a](<b)c>
-[a](<b>c)
-.
-<p>[a](&lt;b)c
-[a](&lt;b)c&gt;
-[a](<b>c)</p>
-````````````````````````````````
-
-Parentheses inside the link destination may be escaped:
-
-```````````````````````````````` example
-[link](\(foo\))
-.
-<p><a href="(foo)">link</a></p>
-````````````````````````````````
-
-Any number of parentheses are allowed without escaping, as long as they are
-balanced:
-
-```````````````````````````````` example
-[link](foo(and(bar)))
-.
-<p><a href="foo(and(bar))">link</a></p>
-````````````````````````````````
-
-However, if you have unbalanced parentheses, you need to escape or use the
-`<...>` form:
-
-```````````````````````````````` example
-[link](foo\(and\(bar\))
-.
-<p><a href="foo(and(bar)">link</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link](<foo(and(bar)>)
-.
-<p><a href="foo(and(bar)">link</a></p>
-````````````````````````````````
-
-
-Parentheses and other symbols can also be escaped, as usual
-in Markdown:
-
-```````````````````````````````` example
-[link](foo\)\:)
-.
-<p><a href="foo):">link</a></p>
-````````````````````````````````
-
-
-A link can contain fragment identifiers and queries:
-
-```````````````````````````````` example
-[link](#fragment)
-
-[link](http://example.com#fragment)
-
-[link](http://example.com?foo=3#frag)
-.
-<p><a href="#fragment">link</a></p>
-<p><a href="http://example.com#fragment">link</a></p>
-<p><a href="http://example.com?foo=3#frag">link</a></p>
-````````````````````````````````
-
-
-Note that a backslash before a non-escapable character is
-just a backslash:
-
-```````````````````````````````` example
-[link](foo\bar)
-.
-<p><a href="foo%5Cbar">link</a></p>
-````````````````````````````````
-
-
-URL-escaping should be left alone inside the destination, as all
-URL-escaped characters are also valid URL characters. Entity and
-numerical character references in the destination will be parsed
-into the corresponding Unicode code points, as usual.  These may
-be optionally URL-escaped when written as HTML, but this spec
-does not enforce any particular policy for rendering URLs in
-HTML or other formats.  Renderers may make different decisions
-about how to escape or normalize URLs in the output.
-
-```````````````````````````````` example
-[link](foo%20b&auml;)
-.
-<p><a href="foo%20b%C3%A4">link</a></p>
-````````````````````````````````
-
-
-Note that, because titles can often be parsed as destinations,
-if you try to omit the destination and keep the title, you'll
-get unexpected results:
-
-```````````````````````````````` example
-[link]("title")
-.
-<p><a href="%22title%22">link</a></p>
-````````````````````````````````
-
-
-Titles may be in single quotes, double quotes, or parentheses:
-
-```````````````````````````````` example
-[link](/url "title")
-[link](/url 'title')
-[link](/url (title))
-.
-<p><a href="/url" title="title">link</a>
-<a href="/url" title="title">link</a>
-<a href="/url" title="title">link</a></p>
-````````````````````````````````
-
-
-Backslash escapes and entity and numeric character references
-may be used in titles:
-
-```````````````````````````````` example
-[link](/url "title \"&quot;")
-.
-<p><a href="/url" title="title &quot;&quot;">link</a></p>
-````````````````````````````````
-
-
-Titles must be separated from the link using a [whitespace].
-Other [Unicode whitespace] like non-breaking space doesn't work.
-
-```````````````````````````````` example
-[link](/url "title")
-.
-<p><a href="/url%C2%A0%22title%22">link</a></p>
-````````````````````````````````
-
-
-Nested balanced quotes are not allowed without escaping:
-
-```````````````````````````````` example
-[link](/url "title "and" title")
-.
-<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>
-````````````````````````````````
-
-
-But it is easy to work around this by using a different quote type:
-
-```````````````````````````````` example
-[link](/url 'title "and" title')
-.
-<p><a href="/url" title="title &quot;and&quot; title">link</a></p>
-````````````````````````````````
-
-
-(Note:  `Markdown.pl` did allow double quotes inside a double-quoted
-title, and its test suite included a test demonstrating this.
-But it is hard to see a good rationale for the extra complexity this
-brings, since there are already many ways---backslash escaping,
-entity and numeric character references, or using a different
-quote type for the enclosing title---to write titles containing
-double quotes.  `Markdown.pl`'s handling of titles has a number
-of other strange features.  For example, it allows single-quoted
-titles in inline links, but not reference links.  And, in
-reference links but not inline links, it allows a title to begin
-with `"` and end with `)`.  `Markdown.pl` 1.0.1 even allows
-titles with no closing quotation mark, though 1.0.2b8 does not.
-It seems preferable to adopt a simple, rational rule that works
-the same way in inline links and link reference definitions.)
-
-[Whitespace] is allowed around the destination and title:
-
-```````````````````````````````` example
-[link](   /uri
-  "title"  )
-.
-<p><a href="/uri" title="title">link</a></p>
-````````````````````````````````
-
-
-But it is not allowed between the link text and the
-following parenthesis:
-
-```````````````````````````````` example
-[link] (/uri)
-.
-<p>[link] (/uri)</p>
-````````````````````````````````
-
-
-The link text may contain balanced brackets, but not unbalanced ones,
-unless they are escaped:
-
-```````````````````````````````` example
-[link [foo [bar]]](/uri)
-.
-<p><a href="/uri">link [foo [bar]]</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link] bar](/uri)
-.
-<p>[link] bar](/uri)</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link [bar](/uri)
-.
-<p>[link <a href="/uri">bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link \[bar](/uri)
-.
-<p><a href="/uri">link [bar</a></p>
-````````````````````````````````
-
-
-The link text may contain inline content:
-
-```````````````````````````````` example
-[link *foo **bar** `#`*](/uri)
-.
-<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[![moon](moon.jpg)](/uri)
-.
-<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
-````````````````````````````````
-
-
-However, links may not contain other links, at any level of nesting.
-
-```````````````````````````````` example
-[foo [bar](/uri)](/uri)
-.
-<p>[foo <a href="/uri">bar</a>](/uri)</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *[bar [baz](/uri)](/uri)*](/uri)
-.
-<p>[foo <em>[bar <a href="/uri">baz</a>](/uri)</em>](/uri)</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![[[foo](uri1)](uri2)](uri3)
-.
-<p><img src="uri3" alt="[foo](uri2)" /></p>
-````````````````````````````````
-
-
-These cases illustrate the precedence of link text grouping over
-emphasis grouping:
-
-```````````````````````````````` example
-*[foo*](/uri)
-.
-<p>*<a href="/uri">foo*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *bar](baz*)
-.
-<p><a href="baz*">foo *bar</a></p>
-````````````````````````````````
-
-
-Note that brackets that *aren't* part of links do not take
-precedence:
-
-```````````````````````````````` example
-*foo [bar* baz]
-.
-<p><em>foo [bar</em> baz]</p>
-````````````````````````````````
-
-
-These cases illustrate the precedence of HTML tags, code spans,
-and autolinks over link grouping:
-
-```````````````````````````````` example
-[foo <bar attr="](baz)">
-.
-<p>[foo <bar attr="](baz)"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo`](/uri)`
-.
-<p>[foo<code>](/uri)</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo<http://example.com/?search=](uri)>
-.
-<p>[foo<a href="http://example.com/?search=%5D(uri)">http://example.com/?search=](uri)</a></p>
-````````````````````````````````
-
-
-There are three kinds of [reference link](@)s:
-[full](#full-reference-link), [collapsed](#collapsed-reference-link),
-and [shortcut](#shortcut-reference-link).
-
-A [full reference link](@)
-consists of a [link text] immediately followed by a [link label]
-that [matches] a [link reference definition] elsewhere in the document.
-
-A [link label](@)  begins with a left bracket (`[`) and ends
-with the first right bracket (`]`) that is not backslash-escaped.
-Between these brackets there must be at least one [non-whitespace character].
-Unescaped square bracket characters are not allowed inside the
-opening and closing square brackets of [link labels].  A link
-label can have at most 999 characters inside the square
-brackets.
-
-One label [matches](@)
-another just in case their normalized forms are equal.  To normalize a
-label, strip off the opening and closing brackets,
-perform the *Unicode case fold*, strip leading and trailing
-[whitespace] and collapse consecutive internal
-[whitespace] to a single space.  If there are multiple
-matching reference link definitions, the one that comes first in the
-document is used.  (It is desirable in such cases to emit a warning.)
-
-The contents of the first link label are parsed as inlines, which are
-used as the link's text.  The link's URI and title are provided by the
-matching [link reference definition].
-
-Here is a simple example:
-
-```````````````````````````````` example
-[foo][bar]
-
-[bar]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-The rules for the [link text] are the same as with
-[inline links].  Thus:
-
-The link text may contain balanced brackets, but not unbalanced ones,
-unless they are escaped:
-
-```````````````````````````````` example
-[link [foo [bar]]][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">link [foo [bar]]</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link \[bar][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">link [bar</a></p>
-````````````````````````````````
-
-
-The link text may contain inline content:
-
-```````````````````````````````` example
-[link *foo **bar** `#`*][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[![moon](moon.jpg)][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
-````````````````````````````````
-
-
-However, links may not contain other links, at any level of nesting.
-
-```````````````````````````````` example
-[foo [bar](/uri)][ref]
-
-[ref]: /uri
-.
-<p>[foo <a href="/uri">bar</a>]<a href="/uri">ref</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *bar [baz][ref]*][ref]
-
-[ref]: /uri
-.
-<p>[foo <em>bar <a href="/uri">baz</a></em>]<a href="/uri">ref</a></p>
-````````````````````````````````
-
-
-(In the examples above, we have two [shortcut reference links]
-instead of one [full reference link].)
-
-The following cases illustrate the precedence of link text grouping over
-emphasis grouping:
-
-```````````````````````````````` example
-*[foo*][ref]
-
-[ref]: /uri
-.
-<p>*<a href="/uri">foo*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *bar][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">foo *bar</a></p>
-````````````````````````````````
-
-
-These cases illustrate the precedence of HTML tags, code spans,
-and autolinks over link grouping:
-
-```````````````````````````````` example
-[foo <bar attr="][ref]">
-
-[ref]: /uri
-.
-<p>[foo <bar attr="][ref]"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo`][ref]`
-
-[ref]: /uri
-.
-<p>[foo<code>][ref]</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo<http://example.com/?search=][ref]>
-
-[ref]: /uri
-.
-<p>[foo<a href="http://example.com/?search=%5D%5Bref%5D">http://example.com/?search=][ref]</a></p>
-````````````````````````````````
-
-
-Matching is case-insensitive:
-
-```````````````````````````````` example
-[foo][BaR]
-
-[bar]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-Unicode case fold is used:
-
-```````````````````````````````` example
-[Толпой][Толпой] is a Russian word.
-
-[ТОЛПОЙ]: /url
-.
-<p><a href="/url">Толпой</a> is a Russian word.</p>
-````````````````````````````````
-
-
-Consecutive internal [whitespace] is treated as one space for
-purposes of determining matching:
-
-```````````````````````````````` example
-[Foo
-  bar]: /url
-
-[Baz][Foo bar]
-.
-<p><a href="/url">Baz</a></p>
-````````````````````````````````
-
-
-No [whitespace] is allowed between the [link text] and the
-[link label]:
-
-```````````````````````````````` example
-[foo] [bar]
-
-[bar]: /url "title"
-.
-<p>[foo] <a href="/url" title="title">bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo]
-[bar]
-
-[bar]: /url "title"
-.
-<p>[foo]
-<a href="/url" title="title">bar</a></p>
-````````````````````````````````
-
-
-This is a departure from John Gruber's original Markdown syntax
-description, which explicitly allows whitespace between the link
-text and the link label.  It brings reference links in line with
-[inline links], which (according to both original Markdown and
-this spec) cannot have whitespace after the link text.  More
-importantly, it prevents inadvertent capture of consecutive
-[shortcut reference links]. If whitespace is allowed between the
-link text and the link label, then in the following we will have
-a single reference link, not two shortcut reference links, as
-intended:
-
-``` markdown
-[foo]
-[bar]
-
-[foo]: /url1
-[bar]: /url2
-```
-
-(Note that [shortcut reference links] were introduced by Gruber
-himself in a beta version of `Markdown.pl`, but never included
-in the official syntax description.  Without shortcut reference
-links, it is harmless to allow space between the link text and
-link label; but once shortcut references are introduced, it is
-too dangerous to allow this, as it frequently leads to
-unintended results.)
-
-When there are multiple matching [link reference definitions],
-the first is used:
-
-```````````````````````````````` example
-[foo]: /url1
-
-[foo]: /url2
-
-[bar][foo]
-.
-<p><a href="/url1">bar</a></p>
-````````````````````````````````
-
-
-Note that matching is performed on normalized strings, not parsed
-inline content.  So the following does not match, even though the
-labels define equivalent inline content:
-
-```````````````````````````````` example
-[bar][foo\!]
-
-[foo!]: /url
-.
-<p>[bar][foo!]</p>
-````````````````````````````````
-
-
-[Link labels] cannot contain brackets, unless they are
-backslash-escaped:
-
-```````````````````````````````` example
-[foo][ref[]
-
-[ref[]: /uri
-.
-<p>[foo][ref[]</p>
-<p>[ref[]: /uri</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo][ref[bar]]
-
-[ref[bar]]: /uri
-.
-<p>[foo][ref[bar]]</p>
-<p>[ref[bar]]: /uri</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[[[foo]]]
-
-[[[foo]]]: /url
-.
-<p>[[[foo]]]</p>
-<p>[[[foo]]]: /url</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo][ref\[]
-
-[ref\[]: /uri
-.
-<p><a href="/uri">foo</a></p>
-````````````````````````````````
-
-
-Note that in this example `]` is not backslash-escaped:
-
-```````````````````````````````` example
-[bar\\]: /uri
-
-[bar\\]
-.
-<p><a href="/uri">bar\</a></p>
-````````````````````````````````
-
-
-A [link label] must contain at least one [non-whitespace character]:
-
-```````````````````````````````` example
-[]
-
-[]: /uri
-.
-<p>[]</p>
-<p>[]: /uri</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[
- ]
-
-[
- ]: /uri
-.
-<p>[
-]</p>
-<p>[
-]: /uri</p>
-````````````````````````````````
-
-
-A [collapsed reference link](@)
-consists of a [link label] that [matches] a
-[link reference definition] elsewhere in the
-document, followed by the string `[]`.
-The contents of the first link label are parsed as inlines,
-which are used as the link's text.  The link's URI and title are
-provided by the matching reference link definition.  Thus,
-`[foo][]` is equivalent to `[foo][foo]`.
-
-```````````````````````````````` example
-[foo][]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[*foo* bar][]
-
-[*foo* bar]: /url "title"
-.
-<p><a href="/url" title="title"><em>foo</em> bar</a></p>
-````````````````````````````````
-
-
-The link labels are case-insensitive:
-
-```````````````````````````````` example
-[Foo][]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">Foo</a></p>
-````````````````````````````````
-
-
-
-As with full reference links, [whitespace] is not
-allowed between the two sets of brackets:
-
-```````````````````````````````` example
-[foo] 
-[]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">foo</a>
-[]</p>
-````````````````````````````````
-
-
-A [shortcut reference link](@)
-consists of a [link label] that [matches] a
-[link reference definition] elsewhere in the
-document and is not followed by `[]` or a link label.
-The contents of the first link label are parsed as inlines,
-which are used as the link's text.  The link's URI and title
-are provided by the matching link reference definition.
-Thus, `[foo]` is equivalent to `[foo][]`.
-
-```````````````````````````````` example
-[foo]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[*foo* bar]
-
-[*foo* bar]: /url "title"
-.
-<p><a href="/url" title="title"><em>foo</em> bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[[*foo* bar]]
-
-[*foo* bar]: /url "title"
-.
-<p>[<a href="/url" title="title"><em>foo</em> bar</a>]</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[[bar [foo]
-
-[foo]: /url
-.
-<p>[[bar <a href="/url">foo</a></p>
-````````````````````````````````
-
-
-The link labels are case-insensitive:
-
-```````````````````````````````` example
-[Foo]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">Foo</a></p>
-````````````````````````````````
-
-
-A space after the link text should be preserved:
-
-```````````````````````````````` example
-[foo] bar
-
-[foo]: /url
-.
-<p><a href="/url">foo</a> bar</p>
-````````````````````````````````
-
-
-If you just want bracketed text, you can backslash-escape the
-opening bracket to avoid links:
-
-```````````````````````````````` example
-\[foo]
-
-[foo]: /url "title"
-.
-<p>[foo]</p>
-````````````````````````````````
-
-
-Note that this is a link, because a link label ends with the first
-following closing bracket:
-
-```````````````````````````````` example
-[foo*]: /url
-
-*[foo*]
-.
-<p>*<a href="/url">foo*</a></p>
-````````````````````````````````
-
-
-Full and compact references take precedence over shortcut
-references:
-
-```````````````````````````````` example
-[foo][bar]
-
-[foo]: /url1
-[bar]: /url2
-.
-<p><a href="/url2">foo</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[foo][]
-
-[foo]: /url1
-.
-<p><a href="/url1">foo</a></p>
-````````````````````````````````
-
-Inline links also take precedence:
-
-```````````````````````````````` example
-[foo]()
-
-[foo]: /url1
-.
-<p><a href="">foo</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[foo](not a link)
-
-[foo]: /url1
-.
-<p><a href="/url1">foo</a>(not a link)</p>
-````````````````````````````````
-
-In the following case `[bar][baz]` is parsed as a reference,
-`[foo]` as normal text:
-
-```````````````````````````````` example
-[foo][bar][baz]
-
-[baz]: /url
-.
-<p>[foo]<a href="/url">bar</a></p>
-````````````````````````````````
-
-
-Here, though, `[foo][bar]` is parsed as a reference, since
-`[bar]` is defined:
-
-```````````````````````````````` example
-[foo][bar][baz]
-
-[baz]: /url1
-[bar]: /url2
-.
-<p><a href="/url2">foo</a><a href="/url1">baz</a></p>
-````````````````````````````````
-
-
-Here `[foo]` is not parsed as a shortcut reference, because it
-is followed by a link label (even though `[bar]` is not defined):
-
-```````````````````````````````` example
-[foo][bar][baz]
-
-[baz]: /url1
-[foo]: /url2
-.
-<p>[foo]<a href="/url1">bar</a></p>
-````````````````````````````````
-
-
-
-## Images
-
-Syntax for images is like the syntax for links, with one
-difference. Instead of [link text], we have an
-[image description](@).  The rules for this are the
-same as for [link text], except that (a) an
-image description starts with `![` rather than `[`, and
-(b) an image description may contain links.
-An image description has inline elements
-as its contents.  When an image is rendered to HTML,
-this is standardly used as the image's `alt` attribute.
-
-```````````````````````````````` example
-![foo](/url "title")
-.
-<p><img src="/url" alt="foo" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo *bar*]
-
-[foo *bar*]: train.jpg "train & tracks"
-.
-<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo ![bar](/url)](/url2)
-.
-<p><img src="/url2" alt="foo bar" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo [bar](/url)](/url2)
-.
-<p><img src="/url2" alt="foo bar" /></p>
-````````````````````````````````
-
-
-Though this spec is concerned with parsing, not rendering, it is
-recommended that in rendering to HTML, only the plain string content
-of the [image description] be used.  Note that in
-the above example, the alt attribute's value is `foo bar`, not `foo
-[bar](/url)` or `foo <a href="/url">bar</a>`.  Only the plain string
-content is rendered, without formatting.
-
-```````````````````````````````` example
-![foo *bar*][]
-
-[foo *bar*]: train.jpg "train & tracks"
-.
-<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo *bar*][foobar]
-
-[FOOBAR]: train.jpg "train & tracks"
-.
-<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo](train.jpg)
-.
-<p><img src="train.jpg" alt="foo" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-My ![foo bar](/path/to/train.jpg  "title"   )
-.
-<p>My <img src="/path/to/train.jpg" alt="foo bar" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo](<url>)
-.
-<p><img src="url" alt="foo" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![](/url)
-.
-<p><img src="/url" alt="" /></p>
-````````````````````````````````
-
-
-Reference-style:
-
-```````````````````````````````` example
-![foo][bar]
-
-[bar]: /url
-.
-<p><img src="/url" alt="foo" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo][bar]
-
-[BAR]: /url
-.
-<p><img src="/url" alt="foo" /></p>
-````````````````````````````````
-
-
-Collapsed:
-
-```````````````````````````````` example
-![foo][]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="foo" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![*foo* bar][]
-
-[*foo* bar]: /url "title"
-.
-<p><img src="/url" alt="foo bar" title="title" /></p>
-````````````````````````````````
-
-
-The labels are case-insensitive:
-
-```````````````````````````````` example
-![Foo][]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="Foo" title="title" /></p>
-````````````````````````````````
-
-
-As with reference links, [whitespace] is not allowed
-between the two sets of brackets:
-
-```````````````````````````````` example
-![foo] 
-[]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="foo" title="title" />
-[]</p>
-````````````````````````````````
-
-
-Shortcut:
-
-```````````````````````````````` example
-![foo]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="foo" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![*foo* bar]
-
-[*foo* bar]: /url "title"
-.
-<p><img src="/url" alt="foo bar" title="title" /></p>
-````````````````````````````````
-
-
-Note that link labels cannot contain unescaped brackets:
-
-```````````````````````````````` example
-![[foo]]
-
-[[foo]]: /url "title"
-.
-<p>![[foo]]</p>
-<p>[[foo]]: /url &quot;title&quot;</p>
-````````````````````````````````
-
-
-The link labels are case-insensitive:
-
-```````````````````````````````` example
-![Foo]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="Foo" title="title" /></p>
-````````````````````````````````
-
-
-If you just want a literal `!` followed by bracketed text, you can
-backslash-escape the opening `[`:
-
-```````````````````````````````` example
-!\[foo]
-
-[foo]: /url "title"
-.
-<p>![foo]</p>
-````````````````````````````````
-
-
-If you want a link after a literal `!`, backslash-escape the
-`!`:
-
-```````````````````````````````` example
-\![foo]
-
-[foo]: /url "title"
-.
-<p>!<a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-## Autolinks
-
-[Autolink](@)s are absolute URIs and email addresses inside
-`<` and `>`. They are parsed as links, with the URL or email address
-as the link label.
-
-A [URI autolink](@) consists of `<`, followed by an
-[absolute URI] followed by `>`.  It is parsed as
-a link to the URI, with the URI as the link's label.
-
-An [absolute URI](@),
-for these purposes, consists of a [scheme] followed by a colon (`:`)
-followed by zero or more characters other than ASCII
-[whitespace] and control characters, `<`, and `>`.  If
-the URI includes these characters, they must be percent-encoded
-(e.g. `%20` for a space).
-
-For purposes of this spec, a [scheme](@) is any sequence
-of 2--32 characters beginning with an ASCII letter and followed
-by any combination of ASCII letters, digits, or the symbols plus
-("+"), period ("."), or hyphen ("-").
-
-Here are some valid autolinks:
-
-```````````````````````````````` example
-<http://foo.bar.baz>
-.
-<p><a href="http://foo.bar.baz">http://foo.bar.baz</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<http://foo.bar.baz/test?q=hello&id=22&boolean>
-.
-<p><a href="http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<irc://foo.bar:2233/baz>
-.
-<p><a href="irc://foo.bar:2233/baz">irc://foo.bar:2233/baz</a></p>
-````````````````````````````````
-
-
-Uppercase is also fine:
-
-```````````````````````````````` example
-<MAILTO:FOO@BAR.BAZ>
-.
-<p><a href="MAILTO:FOO@BAR.BAZ">MAILTO:FOO@BAR.BAZ</a></p>
-````````````````````````````````
-
-
-Note that many strings that count as [absolute URIs] for
-purposes of this spec are not valid URIs, because their
-schemes are not registered or because of other problems
-with their syntax:
-
-```````````````````````````````` example
-<a+b+c:d>
-.
-<p><a href="a+b+c:d">a+b+c:d</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<made-up-scheme://foo,bar>
-.
-<p><a href="made-up-scheme://foo,bar">made-up-scheme://foo,bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<http://../>
-.
-<p><a href="http://../">http://../</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<localhost:5001/foo>
-.
-<p><a href="localhost:5001/foo">localhost:5001/foo</a></p>
-````````````````````````````````
-
-
-Spaces are not allowed in autolinks:
-
-```````````````````````````````` example
-<http://foo.bar/baz bim>
-.
-<p>&lt;http://foo.bar/baz bim&gt;</p>
-````````````````````````````````
-
-
-Backslash-escapes do not work inside autolinks:
-
-```````````````````````````````` example
-<http://example.com/\[\>
-.
-<p><a href="http://example.com/%5C%5B%5C">http://example.com/\[\</a></p>
-````````````````````````````````
-
-
-An [email autolink](@)
-consists of `<`, followed by an [email address],
-followed by `>`.  The link's label is the email address,
-and the URL is `mailto:` followed by the email address.
-
-An [email address](@),
-for these purposes, is anything that matches
-the [non-normative regex from the HTML5
-spec](https://html.spec.whatwg.org/multipage/forms.html#e-mail-state-(type=email)):
-
-    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
-    (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
-
-Examples of email autolinks:
-
-```````````````````````````````` example
-<foo@bar.example.com>
-.
-<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<foo+special@Bar.baz-bar0.com>
-.
-<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
-````````````````````````````````
-
-
-Backslash-escapes do not work inside email autolinks:
-
-```````````````````````````````` example
-<foo\+@bar.example.com>
-.
-<p>&lt;foo+@bar.example.com&gt;</p>
-````````````````````````````````
-
-
-These are not autolinks:
-
-```````````````````````````````` example
-<>
-.
-<p>&lt;&gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-< http://foo.bar >
-.
-<p>&lt; http://foo.bar &gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<m:abc>
-.
-<p>&lt;m:abc&gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<foo.bar.baz>
-.
-<p>&lt;foo.bar.baz&gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-http://example.com
-.
-<p>http://example.com</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo@bar.example.com
-.
-<p>foo@bar.example.com</p>
-````````````````````````````````
-
-
-## Raw HTML
-
-Text between `<` and `>` that looks like an HTML tag is parsed as a
-raw HTML tag and will be rendered in HTML without escaping.
-Tag and attribute names are not limited to current HTML tags,
-so custom tags (and even, say, DocBook tags) may be used.
-
-Here is the grammar for tags:
-
-A [tag name](@) consists of an ASCII letter
-followed by zero or more ASCII letters, digits, or
-hyphens (`-`).
-
-An [attribute](@) consists of [whitespace],
-an [attribute name], and an optional
-[attribute value specification].
-
-An [attribute name](@)
-consists of an ASCII letter, `_`, or `:`, followed by zero or more ASCII
-letters, digits, `_`, `.`, `:`, or `-`.  (Note:  This is the XML
-specification restricted to ASCII.  HTML5 is laxer.)
-
-An [attribute value specification](@)
-consists of optional [whitespace],
-a `=` character, optional [whitespace], and an [attribute
-value].
-
-An [attribute value](@)
-consists of an [unquoted attribute value],
-a [single-quoted attribute value], or a [double-quoted attribute value].
-
-An [unquoted attribute value](@)
-is a nonempty string of characters not
-including [whitespace], `"`, `'`, `=`, `<`, `>`, or `` ` ``.
-
-A [single-quoted attribute value](@)
-consists of `'`, zero or more
-characters not including `'`, and a final `'`.
-
-A [double-quoted attribute value](@)
-consists of `"`, zero or more
-characters not including `"`, and a final `"`.
-
-An [open tag](@) consists of a `<` character, a [tag name],
-zero or more [attributes], optional [whitespace], an optional `/`
-character, and a `>` character.
-
-A [closing tag](@) consists of the string `</`, a
-[tag name], optional [whitespace], and the character `>`.
-
-An [HTML comment](@) consists of `<!--` + *text* + `-->`,
-where *text* does not start with `>` or `->`, does not end with `-`,
-and does not contain `--`.  (See the
-[HTML5 spec](http://www.w3.org/TR/html5/syntax.html#comments).)
-
-A [processing instruction](@)
-consists of the string `<?`, a string
-of characters not including the string `?>`, and the string
-`?>`.
-
-A [declaration](@) consists of the
-string `<!`, a name consisting of one or more uppercase ASCII letters,
-[whitespace], a string of characters not including the
-character `>`, and the character `>`.
-
-A [CDATA section](@) consists of
-the string `<![CDATA[`, a string of characters not including the string
-`]]>`, and the string `]]>`.
-
-An [HTML tag](@) consists of an [open tag], a [closing tag],
-an [HTML comment], a [processing instruction], a [declaration],
-or a [CDATA section].
-
-Here are some simple open tags:
-
-```````````````````````````````` example
-<a><bab><c2c>
-.
-<p><a><bab><c2c></p>
-````````````````````````````````
-
-
-Empty elements:
-
-```````````````````````````````` example
-<a/><b2/>
-.
-<p><a/><b2/></p>
-````````````````````````````````
-
-
-[Whitespace] is allowed:
-
-```````````````````````````````` example
-<a  /><b2
-data="foo" >
-.
-<p><a  /><b2
-data="foo" ></p>
-````````````````````````````````
-
-
-With attributes:
-
-```````````````````````````````` example
-<a foo="bar" bam = 'baz <em>"</em>'
-_boolean zoop:33=zoop:33 />
-.
-<p><a foo="bar" bam = 'baz <em>"</em>'
-_boolean zoop:33=zoop:33 /></p>
-````````````````````````````````
-
-
-Custom tag names can be used:
-
-```````````````````````````````` example
-Foo <responsive-image src="foo.jpg" />
-.
-<p>Foo <responsive-image src="foo.jpg" /></p>
-````````````````````````````````
-
-
-Illegal tag names, not parsed as HTML:
-
-```````````````````````````````` example
-<33> <__>
-.
-<p>&lt;33&gt; &lt;__&gt;</p>
-````````````````````````````````
-
-
-Illegal attribute names:
-
-```````````````````````````````` example
-<a h*#ref="hi">
-.
-<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>
-````````````````````````````````
-
-
-Illegal attribute values:
-
-```````````````````````````````` example
-<a href="hi'> <a href=hi'>
-.
-<p>&lt;a href=&quot;hi'&gt; &lt;a href=hi'&gt;</p>
-````````````````````````````````
-
-
-Illegal [whitespace]:
-
-```````````````````````````````` example
-< a><
-foo><bar/ >
-<foo bar=baz
-bim!bop />
-.
-<p>&lt; a&gt;&lt;
-foo&gt;&lt;bar/ &gt;
-&lt;foo bar=baz
-bim!bop /&gt;</p>
-````````````````````````````````
-
-
-Missing [whitespace]:
-
-```````````````````````````````` example
-<a href='bar'title=title>
-.
-<p>&lt;a href='bar'title=title&gt;</p>
-````````````````````````````````
-
-
-Closing tags:
-
-```````````````````````````````` example
-</a></foo >
-.
-<p></a></foo ></p>
-````````````````````````````````
-
-
-Illegal attributes in closing tag:
-
-```````````````````````````````` example
-</a href="foo">
-.
-<p>&lt;/a href=&quot;foo&quot;&gt;</p>
-````````````````````````````````
-
-
-Comments:
-
-```````````````````````````````` example
-foo <!-- this is a
-comment - with hyphen -->
-.
-<p>foo <!-- this is a
-comment - with hyphen --></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo <!-- not a comment -- two hyphens -->
-.
-<p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>
-````````````````````````````````
-
-
-Not comments:
-
-```````````````````````````````` example
-foo <!--> foo -->
-
-foo <!-- foo--->
-.
-<p>foo &lt;!--&gt; foo --&gt;</p>
-<p>foo &lt;!-- foo---&gt;</p>
-````````````````````````````````
-
-
-Processing instructions:
-
-```````````````````````````````` example
-foo <?php echo $a; ?>
-.
-<p>foo <?php echo $a; ?></p>
-````````````````````````````````
-
-
-Declarations:
-
-```````````````````````````````` example
-foo <!ELEMENT br EMPTY>
-.
-<p>foo <!ELEMENT br EMPTY></p>
-````````````````````````````````
-
-
-CDATA sections:
-
-```````````````````````````````` example
-foo <![CDATA[>&<]]>
-.
-<p>foo <![CDATA[>&<]]></p>
-````````````````````````````````
-
-
-Entity and numeric character references are preserved in HTML
-attributes:
-
-```````````````````````````````` example
-foo <a href="&ouml;">
-.
-<p>foo <a href="&ouml;"></p>
-````````````````````````````````
-
-
-Backslash escapes do not work in HTML attributes:
-
-```````````````````````````````` example
-foo <a href="\*">
-.
-<p>foo <a href="\*"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<a href="\"">
-.
-<p>&lt;a href=&quot;&quot;&quot;&gt;</p>
-````````````````````````````````
-
-
-## Hard line breaks
-
-A line break (not in a code span or HTML tag) that is preceded
-by two or more spaces and does not occur at the end of a block
-is parsed as a [hard line break](@) (rendered
-in HTML as a `<br />` tag):
-
-```````````````````````````````` example
-foo  
-baz
-.
-<p>foo<br />
-baz</p>
-````````````````````````````````
-
-
-For a more visible alternative, a backslash before the
-[line ending] may be used instead of two spaces:
-
-```````````````````````````````` example
-foo\
-baz
-.
-<p>foo<br />
-baz</p>
-````````````````````````````````
-
-
-More than two spaces can be used:
-
-```````````````````````````````` example
-foo       
-baz
-.
-<p>foo<br />
-baz</p>
-````````````````````````````````
-
-
-Leading spaces at the beginning of the next line are ignored:
-
-```````````````````````````````` example
-foo  
-     bar
-.
-<p>foo<br />
-bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo\
-     bar
-.
-<p>foo<br />
-bar</p>
-````````````````````````````````
-
-
-Line breaks can occur inside emphasis, links, and other constructs
-that allow inline content:
-
-```````````````````````````````` example
-*foo  
-bar*
-.
-<p><em>foo<br />
-bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo\
-bar*
-.
-<p><em>foo<br />
-bar</em></p>
-````````````````````````````````
-
-
-Line breaks do not occur inside code spans
-
-```````````````````````````````` example
-`code 
-span`
-.
-<p><code>code  span</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-`code\
-span`
-.
-<p><code>code\ span</code></p>
-````````````````````````````````
-
-
-or HTML tags:
-
-```````````````````````````````` example
-<a href="foo  
-bar">
-.
-<p><a href="foo  
-bar"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<a href="foo\
-bar">
-.
-<p><a href="foo\
-bar"></p>
-````````````````````````````````
-
-
-Hard line breaks are for separating inline content within a block.
-Neither syntax for hard line breaks works at the end of a paragraph or
-other block element:
-
-```````````````````````````````` example
-foo\
-.
-<p>foo\</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo  
-.
-<p>foo</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-### foo\
-.
-<h3>foo\</h3>
-````````````````````````````````
-
-
-```````````````````````````````` example
-### foo  
-.
-<h3>foo</h3>
-````````````````````````````````
-
-
-## Soft line breaks
-
-A regular line break (not in a code span or HTML tag) that is not
-preceded by two or more spaces or a backslash is parsed as a
-[softbreak](@).  (A softbreak may be rendered in HTML either as a
-[line ending] or as a space. The result will be the same in
-browsers. In the examples here, a [line ending] will be used.)
-
-```````````````````````````````` example
-foo
-baz
-.
-<p>foo
-baz</p>
-````````````````````````````````
-
-
-Spaces at the end of the line and beginning of the next line are
-removed:
-
-```````````````````````````````` example
-foo 
- baz
-.
-<p>foo
-baz</p>
-````````````````````````````````
-
-
-A conforming parser may render a soft line break in HTML either as a
-line break or as a space.
-
-A renderer may also provide an option to render soft line breaks
-as hard line breaks.
-
-## Textual content
-
-Any characters not given an interpretation by the above rules will
-be parsed as plain textual content.
-
-```````````````````````````````` example
-hello $.;'there
-.
-<p>hello $.;'there</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-Foo χρῆν
-.
-<p>Foo χρῆν</p>
-````````````````````````````````
-
-
-Internal spaces are preserved verbatim:
-
-```````````````````````````````` example
-Multiple     spaces
-.
-<p>Multiple     spaces</p>
-````````````````````````````````
-
-
-<!-- END TESTS -->
-
-# Appendix: A parsing strategy
-
-In this appendix we describe some features of the parsing strategy
-used in the CommonMark reference implementations.
-
-## Overview
-
-Parsing has two phases:
-
-1. In the first phase, lines of input are consumed and the block
-structure of the document---its division into paragraphs, block quotes,
-list items, and so on---is constructed.  Text is assigned to these
-blocks but not parsed. Link reference definitions are parsed and a
-map of links is constructed.
-
-2. In the second phase, the raw text contents of paragraphs and headings
-are parsed into sequences of Markdown inline elements (strings,
-code spans, links, emphasis, and so on), using the map of link
-references constructed in phase 1.
-
-At each point in processing, the document is represented as a tree of
-**blocks**.  The root of the tree is a `document` block.  The `document`
-may have any number of other blocks as **children**.  These children
-may, in turn, have other blocks as children.  The last child of a block
-is normally considered **open**, meaning that subsequent lines of input
-can alter its contents.  (Blocks that are not open are **closed**.)
-Here, for example, is a possible document tree, with the open blocks
-marked by arrows:
-
-``` tree
--> document
-  -> block_quote
-       paragraph
-         "Lorem ipsum dolor\nsit amet."
-    -> list (type=bullet tight=true bullet_char=-)
-         list_item
-           paragraph
-             "Qui *quodsi iracundia*"
-      -> list_item
-        -> paragraph
-             "aliquando id"
-```
-
-## Phase 1: block structure
-
-Each line that is processed has an effect on this tree.  The line is
-analyzed and, depending on its contents, the document may be altered
-in one or more of the following ways:
-
-1. One or more open blocks may be closed.
-2. One or more new blocks may be created as children of the
-   last open block.
-3. Text may be added to the last (deepest) open block remaining
-   on the tree.
-
-Once a line has been incorporated into the tree in this way,
-it can be discarded, so input can be read in a stream.
-
-For each line, we follow this procedure:
-
-1. First we iterate through the open blocks, starting with the
-root document, and descending through last children down to the last
-open block.  Each block imposes a condition that the line must satisfy
-if the block is to remain open.  For example, a block quote requires a
-`>` character.  A paragraph requires a non-blank line.
-In this phase we may match all or just some of the open
-blocks.  But we cannot close unmatched blocks yet, because we may have a
-[lazy continuation line].
-
-2.  Next, after consuming the continuation markers for existing
-blocks, we look for new block starts (e.g. `>` for a block quote).
-If we encounter a new block start, we close any blocks unmatched
-in step 1 before creating the new block as a child of the last
-matched block.
-
-3.  Finally, we look at the remainder of the line (after block
-markers like `>`, list markers, and indentation have been consumed).
-This is text that can be incorporated into the last open
-block (a paragraph, code block, heading, or raw HTML).
-
-Setext headings are formed when we see a line of a paragraph
-that is a [setext heading underline].
-
-Reference link definitions are detected when a paragraph is closed;
-the accumulated text lines are parsed to see if they begin with
-one or more reference link definitions.  Any remainder becomes a
-normal paragraph.
-
-We can see how this works by considering how the tree above is
-generated by four lines of Markdown:
-
-``` markdown
-> Lorem ipsum dolor
-sit amet.
-> - Qui *quodsi iracundia*
-> - aliquando id
-```
-
-At the outset, our document model is just
-
-``` tree
--> document
-```
-
-The first line of our text,
-
-``` markdown
-> Lorem ipsum dolor
-```
-
-causes a `block_quote` block to be created as a child of our
-open `document` block, and a `paragraph` block as a child of
-the `block_quote`.  Then the text is added to the last open
-block, the `paragraph`:
-
-``` tree
--> document
-  -> block_quote
-    -> paragraph
-         "Lorem ipsum dolor"
-```
-
-The next line,
-
-``` markdown
-sit amet.
-```
-
-is a "lazy continuation" of the open `paragraph`, so it gets added
-to the paragraph's text:
-
-``` tree
--> document
-  -> block_quote
-    -> paragraph
-         "Lorem ipsum dolor\nsit amet."
-```
-
-The third line,
-
-``` markdown
-> - Qui *quodsi iracundia*
-```
-
-causes the `paragraph` block to be closed, and a new `list` block
-opened as a child of the `block_quote`.  A `list_item` is also
-added as a child of the `list`, and a `paragraph` as a child of
-the `list_item`.  The text is then added to the new `paragraph`:
-
-``` tree
--> document
-  -> block_quote
-       paragraph
-         "Lorem ipsum dolor\nsit amet."
-    -> list (type=bullet tight=true bullet_char=-)
-      -> list_item
-        -> paragraph
-             "Qui *quodsi iracundia*"
-```
-
-The fourth line,
-
-``` markdown
-> - aliquando id
-```
-
-causes the `list_item` (and its child the `paragraph`) to be closed,
-and a new `list_item` opened up as child of the `list`.  A `paragraph`
-is added as a child of the new `list_item`, to contain the text.
-We thus obtain the final tree:
-
-``` tree
--> document
-  -> block_quote
-       paragraph
-         "Lorem ipsum dolor\nsit amet."
-    -> list (type=bullet tight=true bullet_char=-)
-         list_item
-           paragraph
-             "Qui *quodsi iracundia*"
-      -> list_item
-        -> paragraph
-             "aliquando id"
-```
-
-## Phase 2: inline structure
-
-Once all of the input has been parsed, all open blocks are closed.
-
-We then "walk the tree," visiting every node, and parse raw
-string contents of paragraphs and headings as inlines.  At this
-point we have seen all the link reference definitions, so we can
-resolve reference links as we go.
-
-``` tree
-document
-  block_quote
-    paragraph
-      str "Lorem ipsum dolor"
-      softbreak
-      str "sit amet."
-    list (type=bullet tight=true bullet_char=-)
-      list_item
-        paragraph
-          str "Qui "
-          emph
-            str "quodsi iracundia"
-      list_item
-        paragraph
-          str "aliquando id"
-```
-
-Notice how the [line ending] in the first paragraph has
-been parsed as a `softbreak`, and the asterisks in the first list item
-have become an `emph`.
-
-### An algorithm for parsing nested emphasis and links
-
-By far the trickiest part of inline parsing is handling emphasis,
-strong emphasis, links, and images.  This is done using the following
-algorithm.
-
-When we're parsing inlines and we hit either
-
-- a run of `*` or `_` characters, or
-- a `[` or `![`
-
-we insert a text node with these symbols as its literal content, and we
-add a pointer to this text node to the [delimiter stack](@).
-
-The [delimiter stack] is a doubly linked list.  Each
-element contains a pointer to a text node, plus information about
-
-- the type of delimiter (`[`, `![`, `*`, `_`)
-- the number of delimiters,
-- whether the delimiter is "active" (all are active to start), and
-- whether the delimiter is a potential opener, a potential closer,
-  or both (which depends on what sort of characters precede
-  and follow the delimiters).
-
-When we hit a `]` character, we call the *look for link or image*
-procedure (see below).
-
-When we hit the end of the input, we call the *process emphasis*
-procedure (see below), with `stack_bottom` = NULL.
-
-#### *look for link or image*
-
-Starting at the top of the delimiter stack, we look backwards
-through the stack for an opening `[` or `![` delimiter.
-
-- If we don't find one, we return a literal text node `]`.
-
-- If we do find one, but it's not *active*, we remove the inactive
-  delimiter from the stack, and return a literal text node `]`.
-
-- If we find one and it's active, then we parse ahead to see if
-  we have an inline link/image, reference link/image, compact reference
-  link/image, or shortcut reference link/image.
-
-  + If we don't, then we remove the opening delimiter from the
-    delimiter stack and return a literal text node `]`.
-
-  + If we do, then
-
-    * We return a link or image node whose children are the inlines
-      after the text node pointed to by the opening delimiter.
-
-    * We run *process emphasis* on these inlines, with the `[` opener
-      as `stack_bottom`.
-
-    * We remove the opening delimiter.
-
-    * If we have a link (and not an image), we also set all
-      `[` delimiters before the opening delimiter to *inactive*.  (This
-      will prevent us from getting links within links.)
-
-#### *process emphasis*
-
-Parameter `stack_bottom` sets a lower bound to how far we
-descend in the [delimiter stack].  If it is NULL, we can
-go all the way to the bottom.  Otherwise, we stop before
-visiting `stack_bottom`.
-
-Let `current_position` point to the element on the [delimiter stack]
-just above `stack_bottom` (or the first element if `stack_bottom`
-is NULL).
-
-We keep track of the `openers_bottom` for each delimiter
-type (`*`, `_`) and each length of the closing delimiter run
-(modulo 3).  Initialize this to `stack_bottom`.
-
-Then we repeat the following until we run out of potential
-closers:
-
-- Move `current_position` forward in the delimiter stack (if needed)
-  until we find the first potential closer with delimiter `*` or `_`.
-  (This will be the potential closer closest
-  to the beginning of the input -- the first one in parse order.)
-
-- Now, look back in the stack (staying above `stack_bottom` and
-  the `openers_bottom` for this delimiter type) for the
-  first matching potential opener ("matching" means same delimiter).
-
-- If one is found:
-
-  + Figure out whether we have emphasis or strong emphasis:
-    if both closer and opener spans have length >= 2, we have
-    strong, otherwise regular.
-
-  + Insert an emph or strong emph node accordingly, after
-    the text node corresponding to the opener.
-
-  + Remove any delimiters between the opener and closer from
-    the delimiter stack.
-
-  + Remove 1 (for regular emph) or 2 (for strong emph) delimiters
-    from the opening and closing text nodes.  If they become empty
-    as a result, remove them and remove the corresponding element
-    of the delimiter stack.  If the closing node is removed, reset
-    `current_position` to the next element in the stack.
-
-- If none is found:
-
-  + Set `openers_bottom` to the element before `current_position`.
-    (We know that there are no openers for this kind of closer up to and
-    including this point, so this puts a lower bound on future searches.)
-
-  + If the closer at `current_position` is not a potential opener,
-    remove it from the delimiter stack (since we know it can't
-    be a closer either).
-
-  + Advance `current_position` to the next element in the stack.
-
-After we're done, we remove all delimiters above `stack_bottom` from the
-delimiter stack.
-
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/LICENSE b/vendor/pulldown-cmark-0.5.3/third_party/GitHub/LICENSE
deleted file mode 100644
index db88a81b3e..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/LICENSE
+++ /dev/null
@@ -1,170 +0,0 @@
-Copyright (c) 2014, John MacFarlane
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
------
-
-houdini.h, houdini_href_e.c, houdini_html_e.c, houdini_html_u.c
-
-derive from https://github.com/vmg/houdini (with some modifications)
-
-Copyright (C) 2012 Vicent Martí
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
-buffer.h, buffer.c, chunk.h
-
-are derived from code (C) 2012 Github, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
-utf8.c and utf8.c
-
-are derived from utf8proc
-(<http://www.public-software-group.org/utf8proc>),
-(C) 2009 Public Software Group e. V., Berlin, Germany.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
------
-
-The normalization code in normalize.py was derived from the
-markdowntest project, Copyright 2013 Karl Dubost:
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Karl Dubost
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------
-
-The CommonMark spec (test/spec.txt) is
-
-Copyright (C) 2014-15 John MacFarlane
-
-Released under the Creative Commons CC-BY-SA 4.0 license:
-<http://creativecommons.org/licenses/by-sa/4.0/>.
-
------
-
-The test software in test/ is
-
-Copyright (c) 2014, John MacFarlane
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_strikethrough.txt b/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_strikethrough.txt
deleted file mode 100644
index 277df06cf6..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_strikethrough.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// This is a slightly modified (replaced example strikethrough by example) of the
-// table section from GitHub's spec.txt
-
-## Strikethrough (extension)
-
-GFM enables the `strikethrough` extension, where an additional emphasis type is
-available.
-
-Strikethrough text is any text wrapped in two tildes (`~`).
-
-```````````````````````````````` example
-~~Hi~~ Hello, world!
-.
-<p><del>Hi</del> Hello, world!</p>
-````````````````````````````````
-
-As with regular emphasis delimiters, a new paragraph will cause strikethrough
-parsing to cease:
-
-```````````````````````````````` example
-This ~~has a
-
-new paragraph~~.
-.
-<p>This ~~has a</p>
-<p>new paragraph~~.</p>
-````````````````````````````````
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_table.txt b/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_table.txt
deleted file mode 100644
index 17108767a9..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_table.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-// This is a slightly modified (replaced example table by example,
-// different rendering of code inside table) copy of the
-// table section from GFM's spec.txt
-
-## Tables (extension)
-
-GFM enables the `table` extension, where an additional leaf block type is
-available.
-
-A [table](@) is an arrangement of data with rows and columns, consisting of a
-single header row, a [delimiter row] separating the header from the data, and
-zero or more data rows.
-
-Each row consists of cells containing arbitrary text, in which [inlines] are
-parsed, separated by pipes (`|`).  A leading and trailing pipe is also
-recommended for clarity of reading, and if there's otherwise parsing ambiguity.
-Spaces between pipes and cell content are trimmed.  Block-level elements cannot
-be inserted in a table.
-
-The [delimiter row](@) consists of cells whose only content are hyphens (`-`),
-and optionally, a leading or trailing colon (`:`), or both, to indicate left,
-right, or center alignment respectively.
-
-```````````````````````````````` example
-| foo | bar |
-| --- | --- |
-| baz | bim |
-.
-<table>
-<thead>
-<tr>
-<th>foo</th>
-<th>bar</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>baz</td>
-<td>bim</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-Cells in one column don't need to match length, though it's easier to read if
-they are. Likewise, use of leading and trailing pipes may be inconsistent:
-
-```````````````````````````````` example
-| abc | defghi |
-:-: | -----------:
-bar | baz
-.
-<table>
-<thead>
-<tr>
-<th align="center">abc</th>
-<th align="right">defghi</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">bar</td>
-<td align="right">baz</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-Include a pipe in a cell's content by escaping it, including inside other
-inline spans:
-
-```````````````````````````````` example
-| f\|oo  |
-| ------ |
-| b `\|` az |
-| b **\|** im |
-.
-<table>
-<thead>
-<tr>
-<th>f|oo</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>b <code>\|</code> az</td>
-</tr>
-<tr>
-<td>b <strong>|</strong> im</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-The table is broken at the first empty line, or beginning of another
-block-level structure:
-
-```````````````````````````````` example
-| abc | def |
-| --- | --- |
-| bar | baz |
-> bar
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>bar</td>
-<td>baz</td>
-</tr>
-</tbody>
-</table>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-```````````````````````````````` example
-| abc | def |
-| --- | --- |
-| bar | baz |
-bar
-
-bar
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>bar</td>
-<td>baz</td>
-</tr>
-<tr>
-<td>bar</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-<p>bar</p>
-````````````````````````````````
-
-The header row must match the [delimiter row] in the number of cells.  If not,
-a table will not be recognized:
-
-```````````````````````````````` example
-| abc | def |
-| --- |
-| bar |
-.
-<p>| abc | def |
-| --- |
-| bar |</p>
-````````````````````````````````
-
-The remainder of the table's rows may vary in the number of cells.  If there
-are a number of cells fewer than the number of cells in the header row, empty
-cells are inserted.  If there are greater, the excess is ignored:
-
-```````````````````````````````` example
-| abc | def |
-| --- | --- |
-| bar |
-| bar | baz | boo |
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>bar</td>
-<td></td>
-</tr>
-<tr>
-<td>bar</td>
-<td>baz</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-If there are no rows in the body, no `<tbody>` is generated in HTML output:
-
-```````````````````````````````` example
-| abc | def |
-| --- | --- |
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-</table>
-````````````````````````````````
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_tasklist.txt b/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_tasklist.txt
deleted file mode 100644
index b57feccdb9..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/gfm_tasklist.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-// This is a slightly modified (replaced example disabled by example) of the
-// table section from GitHub's spec.txt
-
-## Task list items (extension)
-
-GFM enables the `tasklist` extension, where an additional processing step is
-performed on [list items].
-
-A [task list item](@) is a [list item][list items] where the first block in it
-is a paragraph which begins with a [task list item marker] and at least one
-whitespace character before any other content.
-
-A [task list item marker](@) consists of an optional number of spaces, a left
-bracket (`[`), either a whitespace character or the letter `x` in either
-lowercase or uppercase, and then a right bracket (`]`).
-
-When rendered, the [task list item marker] is replaced with a semantic checkbox element;
-in an HTML output, this would be an `<input type="checkbox">` element.
-
-If the character between the brackets is a whitespace character, the checkbox
-is unchecked.  Otherwise, the checkbox is checked.
-
-This spec does not define how the checkbox elements are interacted with: in practice,
-implementors are free to render the checkboxes as disabled or inmutable elements,
-or they may dynamically handle dynamic interactions (i.e. checking, unchecking) in
-the final rendered document.
-
-```````````````````````````````` example
-- [ ] foo
-- [x] bar
-.
-<ul>
-<li><input disabled="" type="checkbox"> foo</li>
-<li><input checked="" disabled="" type="checkbox"> bar</li>
-</ul>
-````````````````````````````````
-
-Task lists can be arbitrarily nested:
-
-```````````````````````````````` example
-- [x] foo
-  - [ ] bar
-  - [x] baz
-- [ ] bim
-.
-<ul>
-<li><input checked="" disabled="" type="checkbox"> foo
-<ul>
-<li><input disabled="" type="checkbox"> bar</li>
-<li><input checked="" disabled="" type="checkbox"> baz</li>
-</ul>
-</li>
-<li><input disabled="" type="checkbox"> bim</li>
-</ul>
-````````````````````````````````
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/spec.txt b/vendor/pulldown-cmark-0.5.3/third_party/GitHub/spec.txt
deleted file mode 100644
index a2c8aafa37..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/GitHub/spec.txt
+++ /dev/null
@@ -1,10041 +0,0 @@
----
-title: GitHub Flavored Markdown Spec
-version: 0.28
-date: '2017-08-01'
-license: '[CC-BY-SA 4.0](http://creativecommons.org/licenses/by-sa/4.0/)'
-...
-
-# Introduction
-
-## What is GitHub Flavored Markdown?
-
-GitHub Flavored Markdown, often shortened as GFM, is the dialect of Markdown
-that is currently supported for user content on GitHub.com and GitHub
-Enterprise.
-
-This formal specification, based on the CommonMark Spec, defines the syntax and
-semantics of this dialect.
-
-GFM is a strict superset of CommonMark. All the features which are supported in
-GitHub user content and that are not specified on the original CommonMark Spec
-are hence known as **extensions**, and highlighted as such.
-
-While GFM supports a wide range of inputs, it's worth noting that GitHub.com
-and GitHub Enterprise perform additional post-processing and sanitization after
-GFM is converted to HTML to ensure security and consistency of the website.
-
-## What is Markdown?
-
-Markdown is a plain text format for writing structured documents,
-based on conventions for indicating formatting in email
-and usenet posts.  It was developed by John Gruber (with
-help from Aaron Swartz) and released in 2004 in the form of a
-[syntax description](http://daringfireball.net/projects/markdown/syntax)
-and a Perl script (`Markdown.pl`) for converting Markdown to
-HTML.  In the next decade, dozens of implementations were
-developed in many languages.  Some extended the original
-Markdown syntax with conventions for footnotes, tables, and
-other document elements.  Some allowed Markdown documents to be
-rendered in formats other than HTML.  Websites like Reddit,
-StackOverflow, and GitHub had millions of people using Markdown.
-And Markdown started to be used beyond the web, to author books,
-articles, slide shows, letters, and lecture notes.
-
-What distinguishes Markdown from many other lightweight markup
-syntaxes, which are often easier to write, is its readability.
-As Gruber writes:
-
-> The overriding design goal for Markdown's formatting syntax is
-> to make it as readable as possible. The idea is that a
-> Markdown-formatted document should be publishable as-is, as
-> plain text, without looking like it's been marked up with tags
-> or formatting instructions.
-> (<http://daringfireball.net/projects/markdown/>)
-
-The point can be illustrated by comparing a sample of
-[AsciiDoc](http://www.methods.co.nz/asciidoc/) with
-an equivalent sample of Markdown.  Here is a sample of
-AsciiDoc from the AsciiDoc manual:
-
-```
-1. List item one.
-+
-List item one continued with a second paragraph followed by an
-Indented block.
-+
-.................
-$ ls *.sh
-$ mv *.sh ~/tmp
-.................
-+
-List item continued with a third paragraph.
-
-2. List item two continued with an open block.
-+
---
-This paragraph is part of the preceding list item.
-
-a. This list is nested and does not require explicit item
-continuation.
-+
-This paragraph is part of the preceding list item.
-
-b. List item b.
-
-This paragraph belongs to item two of the outer list.
---
-```
-
-And here is the equivalent in Markdown:
-```
-1.  List item one.
-
-    List item one continued with a second paragraph followed by an
-    Indented block.
-
-        $ ls *.sh
-        $ mv *.sh ~/tmp
-
-    List item continued with a third paragraph.
-
-2.  List item two continued with an open block.
-
-    This paragraph is part of the preceding list item.
-
-    1. This list is nested and does not require explicit item continuation.
-
-       This paragraph is part of the preceding list item.
-
-    2. List item b.
-
-    This paragraph belongs to item two of the outer list.
-```
-
-The AsciiDoc version is, arguably, easier to write. You don't need
-to worry about indentation.  But the Markdown version is much easier
-to read.  The nesting of list items is apparent to the eye in the
-source, not just in the processed document.
-
-## Why is a spec needed?
-
-John Gruber's [canonical description of Markdown's
-syntax](http://daringfireball.net/projects/markdown/syntax)
-does not specify the syntax unambiguously.  Here are some examples of
-questions it does not answer:
-
-1.  How much indentation is needed for a sublist?  The spec says that
-    continuation paragraphs need to be indented four spaces, but is
-    not fully explicit about sublists.  It is natural to think that
-    they, too, must be indented four spaces, but `Markdown.pl` does
-    not require that.  This is hardly a "corner case," and divergences
-    between implementations on this issue often lead to surprises for
-    users in real documents. (See [this comment by John
-    Gruber](http://article.gmane.org/gmane.text.markdown.general/1997).)
-
-2.  Is a blank line needed before a block quote or heading?
-    Most implementations do not require the blank line.  However,
-    this can lead to unexpected results in hard-wrapped text, and
-    also to ambiguities in parsing (note that some implementations
-    put the heading inside the blockquote, while others do not).
-    (John Gruber has also spoken [in favor of requiring the blank
-    lines](http://article.gmane.org/gmane.text.markdown.general/2146).)
-
-3.  Is a blank line needed before an indented code block?
-    (`Markdown.pl` requires it, but this is not mentioned in the
-    documentation, and some implementations do not require it.)
-
-    ``` markdown
-    paragraph
-        code?
-    ```
-
-4.  What is the exact rule for determining when list items get
-    wrapped in `<p>` tags?  Can a list be partially "loose" and partially
-    "tight"?  What should we do with a list like this?
-
-    ``` markdown
-    1. one
-
-    2. two
-    3. three
-    ```
-
-    Or this?
-
-    ``` markdown
-    1.  one
-        - a
-
-        - b
-    2.  two
-    ```
-
-    (There are some relevant comments by John Gruber
-    [here](http://article.gmane.org/gmane.text.markdown.general/2554).)
-
-5.  Can list markers be indented?  Can ordered list markers be right-aligned?
-
-    ``` markdown
-     8. item 1
-     9. item 2
-    10. item 2a
-    ```
-
-6.  Is this one list with a thematic break in its second item,
-    or two lists separated by a thematic break?
-
-    ``` markdown
-    * a
-    * * * * *
-    * b
-    ```
-
-7.  When list markers change from numbers to bullets, do we have
-    two lists or one?  (The Markdown syntax description suggests two,
-    but the perl scripts and many other implementations produce one.)
-
-    ``` markdown
-    1. fee
-    2. fie
-    -  foe
-    -  fum
-    ```
-
-8.  What are the precedence rules for the markers of inline structure?
-    For example, is the following a valid link, or does the code span
-    take precedence ?
-
-    ``` markdown
-    [a backtick (`)](/url) and [another backtick (`)](/url).
-    ```
-
-9.  What are the precedence rules for markers of emphasis and strong
-    emphasis?  For example, how should the following be parsed?
-
-    ``` markdown
-    *foo *bar* baz*
-    ```
-
-10. What are the precedence rules between block-level and inline-level
-    structure?  For example, how should the following be parsed?
-
-    ``` markdown
-    - `a long code span can contain a hyphen like this
-      - and it can screw things up`
-    ```
-
-11. Can list items include section headings?  (`Markdown.pl` does not
-    allow this, but does allow blockquotes to include headings.)
-
-    ``` markdown
-    - # Heading
-    ```
-
-12. Can list items be empty?
-
-    ``` markdown
-    * a
-    *
-    * b
-    ```
-
-13. Can link references be defined inside block quotes or list items?
-
-    ``` markdown
-    > Blockquote [foo].
-    >
-    > [foo]: /url
-    ```
-
-14. If there are multiple definitions for the same reference, which takes
-    precedence?
-
-    ``` markdown
-    [foo]: /url1
-    [foo]: /url2
-
-    [foo][]
-    ```
-
-In the absence of a spec, early implementers consulted `Markdown.pl`
-to resolve these ambiguities.  But `Markdown.pl` was quite buggy, and
-gave manifestly bad results in many cases, so it was not a
-satisfactory replacement for a spec.
-
-Because there is no unambiguous spec, implementations have diverged
-considerably.  As a result, users are often surprised to find that
-a document that renders one way on one system (say, a github wiki)
-renders differently on another (say, converting to docbook using
-pandoc).  To make matters worse, because nothing in Markdown counts
-as a "syntax error," the divergence often isn't discovered right away.
-
-## About this document
-
-This document attempts to specify Markdown syntax unambiguously.
-It contains many examples with side-by-side Markdown and
-HTML.  These are intended to double as conformance tests.  An
-accompanying script `spec_tests.py` can be used to run the tests
-against any Markdown program:
-
-    python test/spec_tests.py --spec spec.txt --program PROGRAM
-
-Since this document describes how Markdown is to be parsed into
-an abstract syntax tree, it would have made sense to use an abstract
-representation of the syntax tree instead of HTML.  But HTML is capable
-of representing the structural distinctions we need to make, and the
-choice of HTML for the tests makes it possible to run the tests against
-an implementation without writing an abstract syntax tree renderer.
-
-This document is generated from a text file, `spec.txt`, written
-in Markdown with a small extension for the side-by-side tests.
-The script `tools/makespec.py` can be used to convert `spec.txt` into
-HTML or CommonMark (which can then be converted into other formats).
-
-In the examples, the `→` character is used to represent tabs.
-
-# Preliminaries
-
-## Characters and lines
-
-Any sequence of [characters] is a valid CommonMark
-document.
-
-A [character](@) is a Unicode code point.  Although some
-code points (for example, combining accents) do not correspond to
-characters in an intuitive sense, all code points count as characters
-for purposes of this spec.
-
-This spec does not specify an encoding; it thinks of lines as composed
-of [characters] rather than bytes.  A conforming parser may be limited
-to a certain encoding.
-
-A [line](@) is a sequence of zero or more [characters]
-other than newline (`U+000A`) or carriage return (`U+000D`),
-followed by a [line ending] or by the end of file.
-
-A [line ending](@) is a newline (`U+000A`), a carriage return
-(`U+000D`) not followed by a newline, or a carriage return and a
-following newline.
-
-A line containing no characters, or a line containing only spaces
-(`U+0020`) or tabs (`U+0009`), is called a [blank line](@).
-
-The following definitions of character classes will be used in this spec:
-
-A [whitespace character](@) is a space
-(`U+0020`), tab (`U+0009`), newline (`U+000A`), line tabulation (`U+000B`),
-form feed (`U+000C`), or carriage return (`U+000D`).
-
-[Whitespace](@) is a sequence of one or more [whitespace
-characters].
-
-A [Unicode whitespace character](@) is
-any code point in the Unicode `Zs` general category, or a tab (`U+0009`),
-carriage return (`U+000D`), newline (`U+000A`), or form feed
-(`U+000C`).
-
-[Unicode whitespace](@) is a sequence of one
-or more [Unicode whitespace characters].
-
-A [space](@) is `U+0020`.
-
-A [non-whitespace character](@) is any character
-that is not a [whitespace character].
-
-An [ASCII punctuation character](@)
-is `!`, `"`, `#`, `$`, `%`, `&`, `'`, `(`, `)`,
-`*`, `+`, `,`, `-`, `.`, `/`, `:`, `;`, `<`, `=`, `>`, `?`, `@`,
-`[`, `\`, `]`, `^`, `_`, `` ` ``, `{`, `|`, `}`, or `~`.
-
-A [punctuation character](@) is an [ASCII
-punctuation character] or anything in
-the general Unicode categories  `Pc`, `Pd`, `Pe`, `Pf`, `Pi`, `Po`, or `Ps`.
-
-## Tabs
-
-Tabs in lines are not expanded to [spaces].  However,
-in contexts where whitespace helps to define block structure,
-tabs behave as if they were replaced by spaces with a tab stop
-of 4 characters.
-
-Thus, for example, a tab can be used instead of four spaces
-in an indented code block.  (Note, however, that internal
-tabs are passed through as literal tabs, not expanded to
-spaces.)
-
-```````````````````````````````` example
-→foo→baz→→bim
-.
-<pre><code>foo→baz→→bim
-</code></pre>
-````````````````````````````````
-
-```````````````````````````````` example
-  →foo→baz→→bim
-.
-<pre><code>foo→baz→→bim
-</code></pre>
-````````````````````````````````
-
-```````````````````````````````` example
-    a→a
-    ὐ→a
-.
-<pre><code>a→a
-ὐ→a
-</code></pre>
-````````````````````````````````
-
-In the following example, a continuation paragraph of a list
-item is indented with a tab; this has exactly the same effect
-as indentation with four spaces would:
-
-```````````````````````````````` example
-  - foo
-
-→bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-- foo
-
-→→bar
-.
-<ul>
-<li>
-<p>foo</p>
-<pre><code>  bar
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-Normally the `>` that begins a block quote may be followed
-optionally by a space, which is not considered part of the
-content.  In the following case `>` is followed by a tab,
-which is treated as if it were expanded into three spaces.
-Since one of these spaces is considered part of the
-delimiter, `foo` is considered to be indented six spaces
-inside the block quote context, so we get an indented
-code block starting with two spaces.
-
-```````````````````````````````` example
->→→foo
-.
-<blockquote>
-<pre><code>  foo
-</code></pre>
-</blockquote>
-````````````````````````````````
-
-```````````````````````````````` example
--→→foo
-.
-<ul>
-<li>
-<pre><code>  foo
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    foo
-→bar
-.
-<pre><code>foo
-bar
-</code></pre>
-````````````````````````````````
-
-```````````````````````````````` example
- - foo
-   - bar
-→ - baz
-.
-<ul>
-<li>foo
-<ul>
-<li>bar
-<ul>
-<li>baz</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-#→Foo
-.
-<h1>Foo</h1>
-````````````````````````````````
-
-```````````````````````````````` example
-*→*→*→
-.
-<hr />
-````````````````````````````````
-
-
-## Insecure characters
-
-For security reasons, the Unicode character `U+0000` must be replaced
-with the REPLACEMENT CHARACTER (`U+FFFD`).
-
-# Blocks and inlines
-
-We can think of a document as a sequence of
-[blocks](@)---structural elements like paragraphs, block
-quotations, lists, headings, rules, and code blocks.  Some blocks (like
-block quotes and list items) contain other blocks; others (like
-headings and paragraphs) contain [inline](@) content---text,
-links, emphasized text, images, code spans, and so on.
-
-## Precedence
-
-Indicators of block structure always take precedence over indicators
-of inline structure.  So, for example, the following is a list with
-two items, not a list with one item containing a code span:
-
-```````````````````````````````` example
-- `one
-- two`
-.
-<ul>
-<li>`one</li>
-<li>two`</li>
-</ul>
-````````````````````````````````
-
-
-This means that parsing can proceed in two steps:  first, the block
-structure of the document can be discerned; second, text lines inside
-paragraphs, headings, and other block constructs can be parsed for inline
-structure.  The second step requires information about link reference
-definitions that will be available only at the end of the first
-step.  Note that the first step requires processing lines in sequence,
-but the second can be parallelized, since the inline parsing of
-one block element does not affect the inline parsing of any other.
-
-## Container blocks and leaf blocks
-
-We can divide blocks into two types:
-[container blocks](@),
-which can contain other blocks, and [leaf blocks](@),
-which cannot.
-
-# Leaf blocks
-
-This section describes the different kinds of leaf block that make up a
-Markdown document.
-
-## Thematic breaks
-
-A line consisting of 0-3 spaces of indentation, followed by a sequence
-of three or more matching `-`, `_`, or `*` characters, each followed
-optionally by any number of spaces or tabs, forms a
-[thematic break](@).
-
-```````````````````````````````` example
-***
----
-___
-.
-<hr />
-<hr />
-<hr />
-````````````````````````````````
-
-
-Wrong characters:
-
-```````````````````````````````` example
-+++
-.
-<p>+++</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-===
-.
-<p>===</p>
-````````````````````````````````
-
-
-Not enough characters:
-
-```````````````````````````````` example
---
-**
-__
-.
-<p>--
-**
-__</p>
-````````````````````````````````
-
-
-One to three spaces indent are allowed:
-
-```````````````````````````````` example
- ***
-  ***
-   ***
-.
-<hr />
-<hr />
-<hr />
-````````````````````````````````
-
-
-Four spaces is too many:
-
-```````````````````````````````` example
-    ***
-.
-<pre><code>***
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-Foo
-    ***
-.
-<p>Foo
-***</p>
-````````````````````````````````
-
-
-More than three characters may be used:
-
-```````````````````````````````` example
-_____________________________________
-.
-<hr />
-````````````````````````````````
-
-
-Spaces are allowed between the characters:
-
-```````````````````````````````` example
- - - -
-.
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
- **  * ** * ** * **
-.
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
--     -      -      -
-.
-<hr />
-````````````````````````````````
-
-
-Spaces are allowed at the end:
-
-```````````````````````````````` example
-- - - -    
-.
-<hr />
-````````````````````````````````
-
-
-However, no other characters may occur in the line:
-
-```````````````````````````````` example
-_ _ _ _ a
-
-a------
-
----a---
-.
-<p>_ _ _ _ a</p>
-<p>a------</p>
-<p>---a---</p>
-````````````````````````````````
-
-
-It is required that all of the [non-whitespace characters] be the same.
-So, this is not a thematic break:
-
-```````````````````````````````` example
- *-*
-.
-<p><em>-</em></p>
-````````````````````````````````
-
-
-Thematic breaks do not need blank lines before or after:
-
-```````````````````````````````` example
-- foo
-***
-- bar
-.
-<ul>
-<li>foo</li>
-</ul>
-<hr />
-<ul>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-Thematic breaks can interrupt a paragraph:
-
-```````````````````````````````` example
-Foo
-***
-bar
-.
-<p>Foo</p>
-<hr />
-<p>bar</p>
-````````````````````````````````
-
-
-If a line of dashes that meets the above conditions for being a
-thematic break could also be interpreted as the underline of a [setext
-heading], the interpretation as a
-[setext heading] takes precedence. Thus, for example,
-this is a setext heading, not a paragraph followed by a thematic break:
-
-```````````````````````````````` example
-Foo
----
-bar
-.
-<h2>Foo</h2>
-<p>bar</p>
-````````````````````````````````
-
-
-When both a thematic break and a list item are possible
-interpretations of a line, the thematic break takes precedence:
-
-```````````````````````````````` example
-* Foo
-* * *
-* Bar
-.
-<ul>
-<li>Foo</li>
-</ul>
-<hr />
-<ul>
-<li>Bar</li>
-</ul>
-````````````````````````````````
-
-
-If you want a thematic break in a list item, use a different bullet:
-
-```````````````````````````````` example
-- Foo
-- * * *
-.
-<ul>
-<li>Foo</li>
-<li>
-<hr />
-</li>
-</ul>
-````````````````````````````````
-
-
-## ATX headings
-
-An [ATX heading](@)
-consists of a string of characters, parsed as inline content, between an
-opening sequence of 1--6 unescaped `#` characters and an optional
-closing sequence of any number of unescaped `#` characters.
-The opening sequence of `#` characters must be followed by a
-[space] or by the end of line. The optional closing sequence of `#`s must be
-preceded by a [space] and may be followed by spaces only.  The opening
-`#` character may be indented 0-3 spaces.  The raw contents of the
-heading are stripped of leading and trailing spaces before being parsed
-as inline content.  The heading level is equal to the number of `#`
-characters in the opening sequence.
-
-Simple headings:
-
-```````````````````````````````` example
-# foo
-## foo
-### foo
-#### foo
-##### foo
-###### foo
-.
-<h1>foo</h1>
-<h2>foo</h2>
-<h3>foo</h3>
-<h4>foo</h4>
-<h5>foo</h5>
-<h6>foo</h6>
-````````````````````````````````
-
-
-More than six `#` characters is not a heading:
-
-```````````````````````````````` example
-####### foo
-.
-<p>####### foo</p>
-````````````````````````````````
-
-
-At least one space is required between the `#` characters and the
-heading's contents, unless the heading is empty.  Note that many
-implementations currently do not require the space.  However, the
-space was required by the
-[original ATX implementation](http://www.aaronsw.com/2002/atx/atx.py),
-and it helps prevent things like the following from being parsed as
-headings:
-
-```````````````````````````````` example
-#5 bolt
-
-#hashtag
-.
-<p>#5 bolt</p>
-<p>#hashtag</p>
-````````````````````````````````
-
-
-This is not a heading, because the first `#` is escaped:
-
-```````````````````````````````` example
-\## foo
-.
-<p>## foo</p>
-````````````````````````````````
-
-
-Contents are parsed as inlines:
-
-```````````````````````````````` example
-# foo *bar* \*baz\*
-.
-<h1>foo <em>bar</em> *baz*</h1>
-````````````````````````````````
-
-
-Leading and trailing blanks are ignored in parsing inline content:
-
-```````````````````````````````` example
-#                  foo                     
-.
-<h1>foo</h1>
-````````````````````````````````
-
-
-One to three spaces indentation are allowed:
-
-```````````````````````````````` example
- ### foo
-  ## foo
-   # foo
-.
-<h3>foo</h3>
-<h2>foo</h2>
-<h1>foo</h1>
-````````````````````````````````
-
-
-Four spaces are too much:
-
-```````````````````````````````` example
-    # foo
-.
-<pre><code># foo
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo
-    # bar
-.
-<p>foo
-# bar</p>
-````````````````````````````````
-
-
-A closing sequence of `#` characters is optional:
-
-```````````````````````````````` example
-## foo ##
-  ###   bar    ###
-.
-<h2>foo</h2>
-<h3>bar</h3>
-````````````````````````````````
-
-
-It need not be the same length as the opening sequence:
-
-```````````````````````````````` example
-# foo ##################################
-##### foo ##
-.
-<h1>foo</h1>
-<h5>foo</h5>
-````````````````````````````````
-
-
-Spaces are allowed after the closing sequence:
-
-```````````````````````````````` example
-### foo ###     
-.
-<h3>foo</h3>
-````````````````````````````````
-
-
-A sequence of `#` characters with anything but [spaces] following it
-is not a closing sequence, but counts as part of the contents of the
-heading:
-
-```````````````````````````````` example
-### foo ### b
-.
-<h3>foo ### b</h3>
-````````````````````````````````
-
-
-The closing sequence must be preceded by a space:
-
-```````````````````````````````` example
-# foo#
-.
-<h1>foo#</h1>
-````````````````````````````````
-
-
-Backslash-escaped `#` characters do not count as part
-of the closing sequence:
-
-```````````````````````````````` example
-### foo \###
-## foo #\##
-# foo \#
-.
-<h3>foo ###</h3>
-<h2>foo ###</h2>
-<h1>foo #</h1>
-````````````````````````````````
-
-
-ATX headings need not be separated from surrounding content by blank
-lines, and they can interrupt paragraphs:
-
-```````````````````````````````` example
-****
-## foo
-****
-.
-<hr />
-<h2>foo</h2>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-Foo bar
-# baz
-Bar foo
-.
-<p>Foo bar</p>
-<h1>baz</h1>
-<p>Bar foo</p>
-````````````````````````````````
-
-
-ATX headings can be empty:
-
-```````````````````````````````` example
-## 
-#
-### ###
-.
-<h2></h2>
-<h1></h1>
-<h3></h3>
-````````````````````````````````
-
-
-## Setext headings
-
-A [setext heading](@) consists of one or more
-lines of text, each containing at least one [non-whitespace
-character], with no more than 3 spaces indentation, followed by
-a [setext heading underline].  The lines of text must be such
-that, were they not followed by the setext heading underline,
-they would be interpreted as a paragraph:  they cannot be
-interpretable as a [code fence], [ATX heading][ATX headings],
-[block quote][block quotes], [thematic break][thematic breaks],
-[list item][list items], or [HTML block][HTML blocks].
-
-A [setext heading underline](@) is a sequence of
-`=` characters or a sequence of `-` characters, with no more than 3
-spaces indentation and any number of trailing spaces.  If a line
-containing a single `-` can be interpreted as an
-empty [list items], it should be interpreted this way
-and not as a [setext heading underline].
-
-The heading is a level 1 heading if `=` characters are used in
-the [setext heading underline], and a level 2 heading if `-`
-characters are used.  The contents of the heading are the result
-of parsing the preceding lines of text as CommonMark inline
-content.
-
-In general, a setext heading need not be preceded or followed by a
-blank line.  However, it cannot interrupt a paragraph, so when a
-setext heading comes after a paragraph, a blank line is needed between
-them.
-
-Simple examples:
-
-```````````````````````````````` example
-Foo *bar*
-=========
-
-Foo *bar*
----------
-.
-<h1>Foo <em>bar</em></h1>
-<h2>Foo <em>bar</em></h2>
-````````````````````````````````
-
-
-The content of the header may span more than one line:
-
-```````````````````````````````` example
-Foo *bar
-baz*
-====
-.
-<h1>Foo <em>bar
-baz</em></h1>
-````````````````````````````````
-
-
-The underlining can be any length:
-
-```````````````````````````````` example
-Foo
--------------------------
-
-Foo
-=
-.
-<h2>Foo</h2>
-<h1>Foo</h1>
-````````````````````````````````
-
-
-The heading content can be indented up to three spaces, and need
-not line up with the underlining:
-
-```````````````````````````````` example
-   Foo
----
-
-  Foo
------
-
-  Foo
-  ===
-.
-<h2>Foo</h2>
-<h2>Foo</h2>
-<h1>Foo</h1>
-````````````````````````````````
-
-
-Four spaces indent is too much:
-
-```````````````````````````````` example
-    Foo
-    ---
-
-    Foo
----
-.
-<pre><code>Foo
----
-
-Foo
-</code></pre>
-<hr />
-````````````````````````````````
-
-
-The setext heading underline can be indented up to three spaces, and
-may have trailing spaces:
-
-```````````````````````````````` example
-Foo
-   ----      
-.
-<h2>Foo</h2>
-````````````````````````````````
-
-
-Four spaces is too much:
-
-```````````````````````````````` example
-Foo
-    ---
-.
-<p>Foo
----</p>
-````````````````````````````````
-
-
-The setext heading underline cannot contain internal spaces:
-
-```````````````````````````````` example
-Foo
-= =
-
-Foo
---- -
-.
-<p>Foo
-= =</p>
-<p>Foo</p>
-<hr />
-````````````````````````````````
-
-
-Trailing spaces in the content line do not cause a line break:
-
-```````````````````````````````` example
-Foo  
------
-.
-<h2>Foo</h2>
-````````````````````````````````
-
-
-Nor does a backslash at the end:
-
-```````````````````````````````` example
-Foo\
-----
-.
-<h2>Foo\</h2>
-````````````````````````````````
-
-
-Since indicators of block structure take precedence over
-indicators of inline structure, the following are setext headings:
-
-```````````````````````````````` example
-`Foo
-----
-`
-
-<a title="a lot
----
-of dashes"/>
-.
-<h2>`Foo</h2>
-<p>`</p>
-<h2>&lt;a title=&quot;a lot</h2>
-<p>of dashes&quot;/&gt;</p>
-````````````````````````````````
-
-
-The setext heading underline cannot be a [lazy continuation
-line] in a list item or block quote:
-
-```````````````````````````````` example
-> Foo
----
-.
-<blockquote>
-<p>Foo</p>
-</blockquote>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-> foo
-bar
-===
-.
-<blockquote>
-<p>foo
-bar
-===</p>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- Foo
----
-.
-<ul>
-<li>Foo</li>
-</ul>
-<hr />
-````````````````````````````````
-
-
-A blank line is needed between a paragraph and a following
-setext heading, since otherwise the paragraph becomes part
-of the heading's content:
-
-```````````````````````````````` example
-Foo
-Bar
----
-.
-<h2>Foo
-Bar</h2>
-````````````````````````````````
-
-
-But in general a blank line is not required before or after
-setext headings:
-
-```````````````````````````````` example
----
-Foo
----
-Bar
----
-Baz
-.
-<hr />
-<h2>Foo</h2>
-<h2>Bar</h2>
-<p>Baz</p>
-````````````````````````````````
-
-
-Setext headings cannot be empty:
-
-```````````````````````````````` example
-
-====
-.
-<p>====</p>
-````````````````````````````````
-
-
-Setext heading text lines must not be interpretable as block
-constructs other than paragraphs.  So, the line of dashes
-in these examples gets interpreted as a thematic break:
-
-```````````````````````````````` example
----
----
-.
-<hr />
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-- foo
------
-.
-<ul>
-<li>foo</li>
-</ul>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-    foo
----
-.
-<pre><code>foo
-</code></pre>
-<hr />
-````````````````````````````````
-
-
-```````````````````````````````` example
-> foo
------
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-<hr />
-````````````````````````````````
-
-
-If you want a heading with `> foo` as its literal text, you can
-use backslash escapes:
-
-```````````````````````````````` example
-\> foo
-------
-.
-<h2>&gt; foo</h2>
-````````````````````````````````
-
-
-**Compatibility note:**  Most existing Markdown implementations
-do not allow the text of setext headings to span multiple lines.
-But there is no consensus about how to interpret
-
-``` markdown
-Foo
-bar
----
-baz
-```
-
-One can find four different interpretations:
-
-1. paragraph "Foo", heading "bar", paragraph "baz"
-2. paragraph "Foo bar", thematic break, paragraph "baz"
-3. paragraph "Foo bar --- baz"
-4. heading "Foo bar", paragraph "baz"
-
-We find interpretation 4 most natural, and interpretation 4
-increases the expressive power of CommonMark, by allowing
-multiline headings.  Authors who want interpretation 1 can
-put a blank line after the first paragraph:
-
-```````````````````````````````` example
-Foo
-
-bar
----
-baz
-.
-<p>Foo</p>
-<h2>bar</h2>
-<p>baz</p>
-````````````````````````````````
-
-
-Authors who want interpretation 2 can put blank lines around
-the thematic break,
-
-```````````````````````````````` example
-Foo
-bar
-
----
-
-baz
-.
-<p>Foo
-bar</p>
-<hr />
-<p>baz</p>
-````````````````````````````````
-
-
-or use a thematic break that cannot count as a [setext heading
-underline], such as
-
-```````````````````````````````` example
-Foo
-bar
-* * *
-baz
-.
-<p>Foo
-bar</p>
-<hr />
-<p>baz</p>
-````````````````````````````````
-
-
-Authors who want interpretation 3 can use backslash escapes:
-
-```````````````````````````````` example
-Foo
-bar
-\---
-baz
-.
-<p>Foo
-bar
----
-baz</p>
-````````````````````````````````
-
-
-## Indented code blocks
-
-An [indented code block](@) is composed of one or more
-[indented chunks] separated by blank lines.
-An [indented chunk](@) is a sequence of non-blank lines,
-each indented four or more spaces. The contents of the code block are
-the literal contents of the lines, including trailing
-[line endings], minus four spaces of indentation.
-An indented code block has no [info string].
-
-An indented code block cannot interrupt a paragraph, so there must be
-a blank line between a paragraph and a following indented code block.
-(A blank line is not needed, however, between a code block and a following
-paragraph.)
-
-```````````````````````````````` example
-    a simple
-      indented code block
-.
-<pre><code>a simple
-  indented code block
-</code></pre>
-````````````````````````````````
-
-
-If there is any ambiguity between an interpretation of indentation
-as a code block and as indicating that material belongs to a [list
-item][list items], the list item interpretation takes precedence:
-
-```````````````````````````````` example
-  - foo
-
-    bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1.  foo
-
-    - bar
-.
-<ol>
-<li>
-<p>foo</p>
-<ul>
-<li>bar</li>
-</ul>
-</li>
-</ol>
-````````````````````````````````
-
-
-
-The contents of a code block are literal text, and do not get parsed
-as Markdown:
-
-```````````````````````````````` example
-    <a/>
-    *hi*
-
-    - one
-.
-<pre><code>&lt;a/&gt;
-*hi*
-
-- one
-</code></pre>
-````````````````````````````````
-
-
-Here we have three chunks separated by blank lines:
-
-```````````````````````````````` example
-    chunk1
-
-    chunk2
-  
- 
- 
-    chunk3
-.
-<pre><code>chunk1
-
-chunk2
-
-
-
-chunk3
-</code></pre>
-````````````````````````````````
-
-
-Any initial spaces beyond four will be included in the content, even
-in interior blank lines:
-
-```````````````````````````````` example
-    chunk1
-      
-      chunk2
-.
-<pre><code>chunk1
-  
-  chunk2
-</code></pre>
-````````````````````````````````
-
-
-An indented code block cannot interrupt a paragraph.  (This
-allows hanging indents and the like.)
-
-```````````````````````````````` example
-Foo
-    bar
-
-.
-<p>Foo
-bar</p>
-````````````````````````````````
-
-
-However, any non-blank line with fewer than four leading spaces ends
-the code block immediately.  So a paragraph may occur immediately
-after indented code:
-
-```````````````````````````````` example
-    foo
-bar
-.
-<pre><code>foo
-</code></pre>
-<p>bar</p>
-````````````````````````````````
-
-
-And indented code can occur immediately before and after other kinds of
-blocks:
-
-```````````````````````````````` example
-# Heading
-    foo
-Heading
-------
-    foo
-----
-.
-<h1>Heading</h1>
-<pre><code>foo
-</code></pre>
-<h2>Heading</h2>
-<pre><code>foo
-</code></pre>
-<hr />
-````````````````````````````````
-
-
-The first line can be indented more than four spaces:
-
-```````````````````````````````` example
-        foo
-    bar
-.
-<pre><code>    foo
-bar
-</code></pre>
-````````````````````````````````
-
-
-Blank lines preceding or following an indented code block
-are not included in it:
-
-```````````````````````````````` example
-
-    
-    foo
-    
-
-.
-<pre><code>foo
-</code></pre>
-````````````````````````````````
-
-
-Trailing spaces are included in the code block's content:
-
-```````````````````````````````` example
-    foo  
-.
-<pre><code>foo  
-</code></pre>
-````````````````````````````````
-
-
-
-## Fenced code blocks
-
-A [code fence](@) is a sequence
-of at least three consecutive backtick characters (`` ` ``) or
-tildes (`~`).  (Tildes and backticks cannot be mixed.)
-A [fenced code block](@)
-begins with a code fence, indented no more than three spaces.
-
-The line with the opening code fence may optionally contain some text
-following the code fence; this is trimmed of leading and trailing
-whitespace and called the [info string](@). If the [info string] comes
-after a backtick fence, it may not contain any backtick
-characters.  (The reason for this restriction is that otherwise
-some inline code would be incorrectly interpreted as the
-beginning of a fenced code block.)
-
-The content of the code block consists of all subsequent lines, until
-a closing [code fence] of the same type as the code block
-began with (backticks or tildes), and with at least as many backticks
-or tildes as the opening code fence.  If the leading code fence is
-indented N spaces, then up to N spaces of indentation are removed from
-each line of the content (if present).  (If a content line is not
-indented, it is preserved unchanged.  If it is indented less than N
-spaces, all of the indentation is removed.)
-
-The closing code fence may be indented up to three spaces, and may be
-followed only by spaces, which are ignored.  If the end of the
-containing block (or document) is reached and no closing code fence
-has been found, the code block contains all of the lines after the
-opening code fence until the end of the containing block (or
-document).  (An alternative spec would require backtracking in the
-event that a closing code fence is not found.  But this makes parsing
-much less efficient, and there seems to be no real down side to the
-behavior described here.)
-
-A fenced code block may interrupt a paragraph, and does not require
-a blank line either before or after.
-
-The content of a code fence is treated as literal text, not parsed
-as inlines.  The first word of the [info string] is typically used to
-specify the language of the code sample, and rendered in the `class`
-attribute of the `code` tag.  However, this spec does not mandate any
-particular treatment of the [info string].
-
-Here is a simple example with backticks:
-
-```````````````````````````````` example
-```
-<
- >
-```
-.
-<pre><code>&lt;
- &gt;
-</code></pre>
-````````````````````````````````
-
-
-With tildes:
-
-```````````````````````````````` example
-~~~
-<
- >
-~~~
-.
-<pre><code>&lt;
- &gt;
-</code></pre>
-````````````````````````````````
-
-Fewer than three backticks is not enough:
-
-```````````````````````````````` example
-``
-foo
-``
-.
-<p><code>foo</code></p>
-````````````````````````````````
-
-The closing code fence must use the same character as the opening
-fence:
-
-```````````````````````````````` example
-```
-aaa
-~~~
-```
-.
-<pre><code>aaa
-~~~
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~
-aaa
-```
-~~~
-.
-<pre><code>aaa
-```
-</code></pre>
-````````````````````````````````
-
-
-The closing code fence must be at least as long as the opening fence:
-
-```````````````````````````````` example
-````
-aaa
-```
-``````
-.
-<pre><code>aaa
-```
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~~
-aaa
-~~~
-~~~~
-.
-<pre><code>aaa
-~~~
-</code></pre>
-````````````````````````````````
-
-
-Unclosed code blocks are closed by the end of the document
-(or the enclosing [block quote][block quotes] or [list item][list items]):
-
-```````````````````````````````` example
-```
-.
-<pre><code></code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-`````
-
-```
-aaa
-.
-<pre><code>
-```
-aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> ```
-> aaa
-
-bbb
-.
-<blockquote>
-<pre><code>aaa
-</code></pre>
-</blockquote>
-<p>bbb</p>
-````````````````````````````````
-
-
-A code block can have all empty lines as its content:
-
-```````````````````````````````` example
-```
-
-  
-```
-.
-<pre><code>
-  
-</code></pre>
-````````````````````````````````
-
-
-A code block can be empty:
-
-```````````````````````````````` example
-```
-```
-.
-<pre><code></code></pre>
-````````````````````````````````
-
-
-Fences can be indented.  If the opening fence is indented,
-content lines will have equivalent opening indentation removed,
-if present:
-
-```````````````````````````````` example
- ```
- aaa
-aaa
-```
-.
-<pre><code>aaa
-aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-  ```
-aaa
-  aaa
-aaa
-  ```
-.
-<pre><code>aaa
-aaa
-aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-   ```
-   aaa
-    aaa
-  aaa
-   ```
-.
-<pre><code>aaa
- aaa
-aaa
-</code></pre>
-````````````````````````````````
-
-
-Four spaces indentation produces an indented code block:
-
-```````````````````````````````` example
-    ```
-    aaa
-    ```
-.
-<pre><code>```
-aaa
-```
-</code></pre>
-````````````````````````````````
-
-
-Closing fences may be indented by 0-3 spaces, and their indentation
-need not match that of the opening fence:
-
-```````````````````````````````` example
-```
-aaa
-  ```
-.
-<pre><code>aaa
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-   ```
-aaa
-  ```
-.
-<pre><code>aaa
-</code></pre>
-````````````````````````````````
-
-
-This is not a closing fence, because it is indented 4 spaces:
-
-```````````````````````````````` example
-```
-aaa
-    ```
-.
-<pre><code>aaa
-    ```
-</code></pre>
-````````````````````````````````
-
-
-
-Code fences (opening and closing) cannot contain internal spaces:
-
-```````````````````````````````` example
-``` ```
-aaa
-.
-<p><code></code>
-aaa</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~~~~
-aaa
-~~~ ~~
-.
-<pre><code>aaa
-~~~ ~~
-</code></pre>
-````````````````````````````````
-
-
-Fenced code blocks can interrupt paragraphs, and can be followed
-directly by paragraphs, without a blank line between:
-
-```````````````````````````````` example
-foo
-```
-bar
-```
-baz
-.
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-<p>baz</p>
-````````````````````````````````
-
-
-Other blocks can also occur before and after fenced code blocks
-without an intervening blank line:
-
-```````````````````````````````` example
-foo
----
-~~~
-bar
-~~~
-# baz
-.
-<h2>foo</h2>
-<pre><code>bar
-</code></pre>
-<h1>baz</h1>
-````````````````````````````````
-
-
-An [info string] can be provided after the opening code fence.
-Opening and closing spaces will be stripped, and the first word, prefixed
-with `language-`, is used as the value for the `class` attribute of the
-`code` element within the enclosing `pre` element.
-
-```````````````````````````````` example
-```ruby
-def foo(x)
-  return 3
-end
-```
-.
-<pre><code class="language-ruby">def foo(x)
-  return 3
-end
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~~    ruby startline=3 $%@#$
-def foo(x)
-  return 3
-end
-~~~~~~~
-.
-<pre><code class="language-ruby">def foo(x)
-  return 3
-end
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-````;
-````
-.
-<pre><code class="language-;"></code></pre>
-````````````````````````````````
-
-
-[Info strings] for backtick code blocks cannot contain backticks:
-
-```````````````````````````````` example
-``` aa ```
-foo
-.
-<p><code>aa</code>
-foo</p>
-````````````````````````````````
-
-
-[Info strings] for tilde code blocks can contain backticks and tildes:
-
-```````````````````````````````` example
-~~~ aa ``` ~~~
-foo
-~~~
-.
-<pre><code class="language-aa">foo
-</code></pre>
-````````````````````````````````
-
-
-Closing code fences cannot have [info strings]:
-
-```````````````````````````````` example
-```
-``` aaa
-```
-.
-<pre><code>``` aaa
-</code></pre>
-````````````````````````````````
-
-
-
-## HTML blocks
-
-An [HTML block](@) is a group of lines that is treated
-as raw HTML (and will not be escaped in HTML output).
-
-There are seven kinds of [HTML block], which can be defined
-by their start and end conditions.  The block begins with a line that
-meets a [start condition](@) (after up to three spaces
-optional indentation).  It ends with the first subsequent line that
-meets a matching [end condition](@), or the last line of
-the document or other [container block](#container-blocks)), if no
-line is encountered that meets the [end condition].  If the first line
-meets both the [start condition] and the [end condition], the block
-will contain just that line.
-
-1.  **Start condition:**  line begins with the string `<script`,
-`<pre`, or `<style` (case-insensitive), followed by whitespace,
-the string `>`, or the end of the line.\
-**End condition:**  line contains an end tag
-`</script>`, `</pre>`, or `</style>` (case-insensitive; it
-need not match the start tag).
-
-2.  **Start condition:** line begins with the string `<!--`.\
-**End condition:**  line contains the string `-->`.
-
-3.  **Start condition:** line begins with the string `<?`.\
-**End condition:** line contains the string `?>`.
-
-4.  **Start condition:** line begins with the string `<!`
-followed by an uppercase ASCII letter.\
-**End condition:** line contains the character `>`.
-
-5.  **Start condition:**  line begins with the string
-`<![CDATA[`.\
-**End condition:** line contains the string `]]>`.
-
-6.  **Start condition:** line begins the string `<` or `</`
-followed by one of the strings (case-insensitive) `address`,
-`article`, `aside`, `base`, `basefont`, `blockquote`, `body`,
-`caption`, `center`, `col`, `colgroup`, `dd`, `details`, `dialog`,
-`dir`, `div`, `dl`, `dt`, `fieldset`, `figcaption`, `figure`,
-`footer`, `form`, `frame`, `frameset`,
-`h1`, `h2`, `h3`, `h4`, `h5`, `h6`, `head`, `header`, `hr`,
-`html`, `iframe`, `legend`, `li`, `link`, `main`, `menu`, `menuitem`,
-`nav`, `noframes`, `ol`, `optgroup`, `option`, `p`, `param`,
-`section`, `source`, `summary`, `table`, `tbody`, `td`,
-`tfoot`, `th`, `thead`, `title`, `tr`, `track`, `ul`, followed
-by [whitespace], the end of the line, the string `>`, or
-the string `/>`.\
-**End condition:** line is followed by a [blank line].
-
-7.  **Start condition:**  line begins with a complete [open tag]
-or [closing tag] (with any [tag name] other than `script`,
-`style`, or `pre`) followed only by [whitespace]
-or the end of the line.\
-**End condition:** line is followed by a [blank line].
-
-HTML blocks continue until they are closed by their appropriate
-[end condition], or the last line of the document or other [container
-block](#container-blocks).  This means any HTML **within an HTML
-block** that might otherwise be recognised as a start condition will
-be ignored by the parser and passed through as-is, without changing
-the parser's state.
-
-For instance, `<pre>` within a HTML block started by `<table>` will not affect
-the parser state; as the HTML block was started in by start condition 6, it
-will end at any blank line. This can be surprising:
-
-```````````````````````````````` example
-<table><tr><td>
-<pre>
-**Hello**,
-
-_world_.
-</pre>
-</td></tr></table>
-.
-<table><tr><td>
-<pre>
-**Hello**,
-<p><em>world</em>.
-</pre></p>
-</td></tr></table>
-````````````````````````````````
-
-In this case, the HTML block is terminated by the newline — the `**Hello**`
-text remains verbatim — and regular parsing resumes, with a paragraph,
-emphasised `world` and inline and block HTML following.
-
-All types of [HTML blocks] except type 7 may interrupt
-a paragraph.  Blocks of type 7 may not interrupt a paragraph.
-(This restriction is intended to prevent unwanted interpretation
-of long tags inside a wrapped paragraph as starting HTML blocks.)
-
-Some simple examples follow.  Here are some basic HTML blocks
-of type 6:
-
-```````````````````````````````` example
-<table>
-  <tr>
-    <td>
-           hi
-    </td>
-  </tr>
-</table>
-
-okay.
-.
-<table>
-  <tr>
-    <td>
-           hi
-    </td>
-  </tr>
-</table>
-<p>okay.</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
- <div>
-  *hello*
-         <foo><a>
-.
- <div>
-  *hello*
-         <foo><a>
-````````````````````````````````
-
-
-A block can also start with a closing tag:
-
-```````````````````````````````` example
-</div>
-*foo*
-.
-</div>
-*foo*
-````````````````````````````````
-
-
-Here we have two HTML blocks with a Markdown paragraph between them:
-
-```````````````````````````````` example
-<DIV CLASS="foo">
-
-*Markdown*
-
-</DIV>
-.
-<DIV CLASS="foo">
-<p><em>Markdown</em></p>
-</DIV>
-````````````````````````````````
-
-
-The tag on the first line can be partial, as long
-as it is split where there would be whitespace:
-
-```````````````````````````````` example
-<div id="foo"
-  class="bar">
-</div>
-.
-<div id="foo"
-  class="bar">
-</div>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<div id="foo" class="bar
-  baz">
-</div>
-.
-<div id="foo" class="bar
-  baz">
-</div>
-````````````````````````````````
-
-
-An open tag need not be closed:
-```````````````````````````````` example
-<div>
-*foo*
-
-*bar*
-.
-<div>
-*foo*
-<p><em>bar</em></p>
-````````````````````````````````
-
-
-
-A partial tag need not even be completed (garbage
-in, garbage out):
-
-```````````````````````````````` example
-<div id="foo"
-*hi*
-.
-<div id="foo"
-*hi*
-````````````````````````````````
-
-
-```````````````````````````````` example
-<div class
-foo
-.
-<div class
-foo
-````````````````````````````````
-
-
-The initial tag doesn't even need to be a valid
-tag, as long as it starts like one:
-
-```````````````````````````````` example
-<div *???-&&&-<---
-*foo*
-.
-<div *???-&&&-<---
-*foo*
-````````````````````````````````
-
-
-In type 6 blocks, the initial tag need not be on a line by
-itself:
-
-```````````````````````````````` example
-<div><a href="bar">*foo*</a></div>
-.
-<div><a href="bar">*foo*</a></div>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<table><tr><td>
-foo
-</td></tr></table>
-.
-<table><tr><td>
-foo
-</td></tr></table>
-````````````````````````````````
-
-
-Everything until the next blank line or end of document
-gets included in the HTML block.  So, in the following
-example, what looks like a Markdown code block
-is actually part of the HTML block, which continues until a blank
-line or the end of the document is reached:
-
-```````````````````````````````` example
-<div></div>
-``` c
-int x = 33;
-```
-.
-<div></div>
-``` c
-int x = 33;
-```
-````````````````````````````````
-
-
-To start an [HTML block] with a tag that is *not* in the
-list of block-level tags in (6), you must put the tag by
-itself on the first line (and it must be complete):
-
-```````````````````````````````` example
-<a href="foo">
-*bar*
-</a>
-.
-<a href="foo">
-*bar*
-</a>
-````````````````````````````````
-
-
-In type 7 blocks, the [tag name] can be anything:
-
-```````````````````````````````` example
-<Warning>
-*bar*
-</Warning>
-.
-<Warning>
-*bar*
-</Warning>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<i class="foo">
-*bar*
-</i>
-.
-<i class="foo">
-*bar*
-</i>
-````````````````````````````````
-
-
-```````````````````````````````` example
-</ins>
-*bar*
-.
-</ins>
-*bar*
-````````````````````````````````
-
-
-These rules are designed to allow us to work with tags that
-can function as either block-level or inline-level tags.
-The `<del>` tag is a nice example.  We can surround content with
-`<del>` tags in three different ways.  In this case, we get a raw
-HTML block, because the `<del>` tag is on a line by itself:
-
-```````````````````````````````` example
-<del>
-*foo*
-</del>
-.
-<del>
-*foo*
-</del>
-````````````````````````````````
-
-
-In this case, we get a raw HTML block that just includes
-the `<del>` tag (because it ends with the following blank
-line).  So the contents get interpreted as CommonMark:
-
-```````````````````````````````` example
-<del>
-
-*foo*
-
-</del>
-.
-<del>
-<p><em>foo</em></p>
-</del>
-````````````````````````````````
-
-
-Finally, in this case, the `<del>` tags are interpreted
-as [raw HTML] *inside* the CommonMark paragraph.  (Because
-the tag is not on a line by itself, we get inline HTML
-rather than an [HTML block].)
-
-```````````````````````````````` example
-<del>*foo*</del>
-.
-<p><del><em>foo</em></del></p>
-````````````````````````````````
-
-
-HTML tags designed to contain literal content
-(`script`, `style`, `pre`), comments, processing instructions,
-and declarations are treated somewhat differently.
-Instead of ending at the first blank line, these blocks
-end at the first line containing a corresponding end tag.
-As a result, these blocks can contain blank lines:
-
-A pre tag (type 1):
-
-```````````````````````````````` example
-<pre language="haskell"><code>
-import Text.HTML.TagSoup
-
-main :: IO ()
-main = print $ parseTags tags
-</code></pre>
-okay
-.
-<pre language="haskell"><code>
-import Text.HTML.TagSoup
-
-main :: IO ()
-main = print $ parseTags tags
-</code></pre>
-<p>okay</p>
-````````````````````````````````
-
-
-A script tag (type 1):
-
-```````````````````````````````` example
-<script type="text/javascript">
-// JavaScript example
-
-document.getElementById("demo").innerHTML = "Hello JavaScript!";
-</script>
-okay
-.
-<script type="text/javascript">
-// JavaScript example
-
-document.getElementById("demo").innerHTML = "Hello JavaScript!";
-</script>
-<p>okay</p>
-````````````````````````````````
-
-
-A style tag (type 1):
-
-```````````````````````````````` example
-<style
-  type="text/css">
-h1 {color:red;}
-
-p {color:blue;}
-</style>
-okay
-.
-<style
-  type="text/css">
-h1 {color:red;}
-
-p {color:blue;}
-</style>
-<p>okay</p>
-````````````````````````````````
-
-
-If there is no matching end tag, the block will end at the
-end of the document (or the enclosing [block quote][block quotes]
-or [list item][list items]):
-
-```````````````````````````````` example
-<style
-  type="text/css">
-
-foo
-.
-<style
-  type="text/css">
-
-foo
-````````````````````````````````
-
-
-```````````````````````````````` example
-> <div>
-> foo
-
-bar
-.
-<blockquote>
-<div>
-foo
-</blockquote>
-<p>bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- <div>
-- foo
-.
-<ul>
-<li>
-<div>
-</li>
-<li>foo</li>
-</ul>
-````````````````````````````````
-
-
-The end tag can occur on the same line as the start tag:
-
-```````````````````````````````` example
-<style>p{color:red;}</style>
-*foo*
-.
-<style>p{color:red;}</style>
-<p><em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<!-- foo -->*bar*
-*baz*
-.
-<!-- foo -->*bar*
-<p><em>baz</em></p>
-````````````````````````````````
-
-
-Note that anything on the last line after the
-end tag will be included in the [HTML block]:
-
-```````````````````````````````` example
-<script>
-foo
-</script>1. *bar*
-.
-<script>
-foo
-</script>1. *bar*
-````````````````````````````````
-
-
-A comment (type 2):
-
-```````````````````````````````` example
-<!-- Foo
-
-bar
-   baz -->
-okay
-.
-<!-- Foo
-
-bar
-   baz -->
-<p>okay</p>
-````````````````````````````````
-
-
-
-A processing instruction (type 3):
-
-```````````````````````````````` example
-<?php
-
-  echo '>';
-
-?>
-okay
-.
-<?php
-
-  echo '>';
-
-?>
-<p>okay</p>
-````````````````````````````````
-
-
-A declaration (type 4):
-
-```````````````````````````````` example
-<!DOCTYPE html>
-.
-<!DOCTYPE html>
-````````````````````````````````
-
-
-CDATA (type 5):
-
-```````````````````````````````` example
-<![CDATA[
-function matchwo(a,b)
-{
-  if (a < b && a < 0) then {
-    return 1;
-
-  } else {
-
-    return 0;
-  }
-}
-]]>
-okay
-.
-<![CDATA[
-function matchwo(a,b)
-{
-  if (a < b && a < 0) then {
-    return 1;
-
-  } else {
-
-    return 0;
-  }
-}
-]]>
-<p>okay</p>
-````````````````````````````````
-
-
-The opening tag can be indented 1-3 spaces, but not 4:
-
-```````````````````````````````` example
-  <!-- foo -->
-
-    <!-- foo -->
-.
-  <!-- foo -->
-<pre><code>&lt;!-- foo --&gt;
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-  <div>
-
-    <div>
-.
-  <div>
-<pre><code>&lt;div&gt;
-</code></pre>
-````````````````````````````````
-
-
-An HTML block of types 1--6 can interrupt a paragraph, and need not be
-preceded by a blank line.
-
-```````````````````````````````` example
-Foo
-<div>
-bar
-</div>
-.
-<p>Foo</p>
-<div>
-bar
-</div>
-````````````````````````````````
-
-
-However, a following blank line is needed, except at the end of
-a document, and except for blocks of types 1--5, [above][HTML
-block]:
-
-```````````````````````````````` example
-<div>
-bar
-</div>
-*foo*
-.
-<div>
-bar
-</div>
-*foo*
-````````````````````````````````
-
-
-HTML blocks of type 7 cannot interrupt a paragraph:
-
-```````````````````````````````` example
-Foo
-<a href="bar">
-baz
-.
-<p>Foo
-<a href="bar">
-baz</p>
-````````````````````````````````
-
-
-This rule differs from John Gruber's original Markdown syntax
-specification, which says:
-
-> The only restrictions are that block-level HTML elements —
-> e.g. `<div>`, `<table>`, `<pre>`, `<p>`, etc. — must be separated from
-> surrounding content by blank lines, and the start and end tags of the
-> block should not be indented with tabs or spaces.
-
-In some ways Gruber's rule is more restrictive than the one given
-here:
-
-- It requires that an HTML block be preceded by a blank line.
-- It does not allow the start tag to be indented.
-- It requires a matching end tag, which it also does not allow to
-  be indented.
-
-Most Markdown implementations (including some of Gruber's own) do not
-respect all of these restrictions.
-
-There is one respect, however, in which Gruber's rule is more liberal
-than the one given here, since it allows blank lines to occur inside
-an HTML block.  There are two reasons for disallowing them here.
-First, it removes the need to parse balanced tags, which is
-expensive and can require backtracking from the end of the document
-if no matching end tag is found. Second, it provides a very simple
-and flexible way of including Markdown content inside HTML tags:
-simply separate the Markdown from the HTML using blank lines:
-
-Compare:
-
-```````````````````````````````` example
-<div>
-
-*Emphasized* text.
-
-</div>
-.
-<div>
-<p><em>Emphasized</em> text.</p>
-</div>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<div>
-*Emphasized* text.
-</div>
-.
-<div>
-*Emphasized* text.
-</div>
-````````````````````````````````
-
-
-Some Markdown implementations have adopted a convention of
-interpreting content inside tags as text if the open tag has
-the attribute `markdown=1`.  The rule given above seems a simpler and
-more elegant way of achieving the same expressive power, which is also
-much simpler to parse.
-
-The main potential drawback is that one can no longer paste HTML
-blocks into Markdown documents with 100% reliability.  However,
-*in most cases* this will work fine, because the blank lines in
-HTML are usually followed by HTML block tags.  For example:
-
-```````````````````````````````` example
-<table>
-
-<tr>
-
-<td>
-Hi
-</td>
-
-</tr>
-
-</table>
-.
-<table>
-<tr>
-<td>
-Hi
-</td>
-</tr>
-</table>
-````````````````````````````````
-
-
-There are problems, however, if the inner tags are indented
-*and* separated by spaces, as then they will be interpreted as
-an indented code block:
-
-```````````````````````````````` example
-<table>
-
-  <tr>
-
-    <td>
-      Hi
-    </td>
-
-  </tr>
-
-</table>
-.
-<table>
-  <tr>
-<pre><code>&lt;td&gt;
-  Hi
-&lt;/td&gt;
-</code></pre>
-  </tr>
-</table>
-````````````````````````````````
-
-
-Fortunately, blank lines are usually not necessary and can be
-deleted.  The exception is inside `<pre>` tags, but as described
-[above][HTML blocks], raw HTML blocks starting with `<pre>`
-*can* contain blank lines.
-
-## Link reference definitions
-
-A [link reference definition](@)
-consists of a [link label], indented up to three spaces, followed
-by a colon (`:`), optional [whitespace] (including up to one
-[line ending]), a [link destination],
-optional [whitespace] (including up to one
-[line ending]), and an optional [link
-title], which if it is present must be separated
-from the [link destination] by [whitespace].
-No further [non-whitespace characters] may occur on the line.
-
-A [link reference definition]
-does not correspond to a structural element of a document.  Instead, it
-defines a label which can be used in [reference links]
-and reference-style [images] elsewhere in the document.  [Link
-reference definitions] can come either before or after the links that use
-them.
-
-```````````````````````````````` example
-[foo]: /url "title"
-
-[foo]
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-   [foo]: 
-      /url  
-           'the title'  
-
-[foo]
-.
-<p><a href="/url" title="the title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[Foo*bar\]]:my_(url) 'title (with parens)'
-
-[Foo*bar\]]
-.
-<p><a href="my_(url)" title="title (with parens)">Foo*bar]</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[Foo bar]:
-<my url>
-'title'
-
-[Foo bar]
-.
-<p><a href="my%20url" title="title">Foo bar</a></p>
-````````````````````````````````
-
-
-The title may extend over multiple lines:
-
-```````````````````````````````` example
-[foo]: /url '
-title
-line1
-line2
-'
-
-[foo]
-.
-<p><a href="/url" title="
-title
-line1
-line2
-">foo</a></p>
-````````````````````````````````
-
-
-However, it may not contain a [blank line]:
-
-```````````````````````````````` example
-[foo]: /url 'title
-
-with blank line'
-
-[foo]
-.
-<p>[foo]: /url 'title</p>
-<p>with blank line'</p>
-<p>[foo]</p>
-````````````````````````````````
-
-
-The title may be omitted:
-
-```````````````````````````````` example
-[foo]:
-/url
-
-[foo]
-.
-<p><a href="/url">foo</a></p>
-````````````````````````````````
-
-
-The link destination may not be omitted:
-
-```````````````````````````````` example
-[foo]:
-
-[foo]
-.
-<p>[foo]:</p>
-<p>[foo]</p>
-````````````````````````````````
-
-The title must be separated from the link destination by
-whitespace:
-
-```````````````````````````````` example
-[foo]: <bar>(baz)
-
-[foo]
-.
-<p>[foo]: <bar>(baz)</p>
-<p>[foo]</p>
-````````````````````````````````
-
-
-Both title and destination can contain backslash escapes
-and literal backslashes:
-
-```````````````````````````````` example
-[foo]: /url\bar\*baz "foo\"bar\baz"
-
-[foo]
-.
-<p><a href="/url%5Cbar*baz" title="foo&quot;bar\baz">foo</a></p>
-````````````````````````````````
-
-
-A link can come before its corresponding definition:
-
-```````````````````````````````` example
-[foo]
-
-[foo]: url
-.
-<p><a href="url">foo</a></p>
-````````````````````````````````
-
-
-If there are several matching definitions, the first one takes
-precedence:
-
-```````````````````````````````` example
-[foo]
-
-[foo]: first
-[foo]: second
-.
-<p><a href="first">foo</a></p>
-````````````````````````````````
-
-
-As noted in the section on [Links], matching of labels is
-case-insensitive (see [matches]).
-
-```````````````````````````````` example
-[FOO]: /url
-
-[Foo]
-.
-<p><a href="/url">Foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[ΑΓΩ]: /φου
-
-[αγω]
-.
-<p><a href="/%CF%86%CE%BF%CF%85">αγω</a></p>
-````````````````````````````````
-
-
-Here is a link reference definition with no corresponding link.
-It contributes nothing to the document.
-
-```````````````````````````````` example
-[foo]: /url
-.
-````````````````````````````````
-
-
-Here is another one:
-
-```````````````````````````````` example
-[
-foo
-]: /url
-bar
-.
-<p>bar</p>
-````````````````````````````````
-
-
-This is not a link reference definition, because there are
-[non-whitespace characters] after the title:
-
-```````````````````````````````` example
-[foo]: /url "title" ok
-.
-<p>[foo]: /url &quot;title&quot; ok</p>
-````````````````````````````````
-
-
-This is a link reference definition, but it has no title:
-
-```````````````````````````````` example
-[foo]: /url
-"title" ok
-.
-<p>&quot;title&quot; ok</p>
-````````````````````````````````
-
-
-This is not a link reference definition, because it is indented
-four spaces:
-
-```````````````````````````````` example
-    [foo]: /url "title"
-
-[foo]
-.
-<pre><code>[foo]: /url &quot;title&quot;
-</code></pre>
-<p>[foo]</p>
-````````````````````````````````
-
-
-This is not a link reference definition, because it occurs inside
-a code block:
-
-```````````````````````````````` example
-```
-[foo]: /url
-```
-
-[foo]
-.
-<pre><code>[foo]: /url
-</code></pre>
-<p>[foo]</p>
-````````````````````````````````
-
-
-A [link reference definition] cannot interrupt a paragraph.
-
-```````````````````````````````` example
-Foo
-[bar]: /baz
-
-[bar]
-.
-<p>Foo
-[bar]: /baz</p>
-<p>[bar]</p>
-````````````````````````````````
-
-
-However, it can directly follow other block elements, such as headings
-and thematic breaks, and it need not be followed by a blank line.
-
-```````````````````````````````` example
-# [Foo]
-[foo]: /url
-> bar
-.
-<h1><a href="/url">Foo</a></h1>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-Several [link reference definitions]
-can occur one after another, without intervening blank lines.
-
-```````````````````````````````` example
-[foo]: /foo-url "foo"
-[bar]: /bar-url
-  "bar"
-[baz]: /baz-url
-
-[foo],
-[bar],
-[baz]
-.
-<p><a href="/foo-url" title="foo">foo</a>,
-<a href="/bar-url" title="bar">bar</a>,
-<a href="/baz-url">baz</a></p>
-````````````````````````````````
-
-
-[Link reference definitions] can occur
-inside block containers, like lists and block quotations.  They
-affect the entire document, not just the container in which they
-are defined:
-
-```````````````````````````````` example
-[foo]
-
-> [foo]: /url
-.
-<p><a href="/url">foo</a></p>
-<blockquote>
-</blockquote>
-````````````````````````````````
-
-
-
-## Paragraphs
-
-A sequence of non-blank lines that cannot be interpreted as other
-kinds of blocks forms a [paragraph](@).
-The contents of the paragraph are the result of parsing the
-paragraph's raw content as inlines.  The paragraph's raw content
-is formed by concatenating the lines and removing initial and final
-[whitespace].
-
-A simple example with two paragraphs:
-
-```````````````````````````````` example
-aaa
-
-bbb
-.
-<p>aaa</p>
-<p>bbb</p>
-````````````````````````````````
-
-
-Paragraphs can contain multiple lines, but no blank lines:
-
-```````````````````````````````` example
-aaa
-bbb
-
-ccc
-ddd
-.
-<p>aaa
-bbb</p>
-<p>ccc
-ddd</p>
-````````````````````````````````
-
-
-Multiple blank lines between paragraph have no effect:
-
-```````````````````````````````` example
-aaa
-
-
-bbb
-.
-<p>aaa</p>
-<p>bbb</p>
-````````````````````````````````
-
-
-Leading spaces are skipped:
-
-```````````````````````````````` example
-  aaa
- bbb
-.
-<p>aaa
-bbb</p>
-````````````````````````````````
-
-
-Lines after the first may be indented any amount, since indented
-code blocks cannot interrupt paragraphs.
-
-```````````````````````````````` example
-aaa
-             bbb
-                                       ccc
-.
-<p>aaa
-bbb
-ccc</p>
-````````````````````````````````
-
-
-However, the first line may be indented at most three spaces,
-or an indented code block will be triggered:
-
-```````````````````````````````` example
-   aaa
-bbb
-.
-<p>aaa
-bbb</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    aaa
-bbb
-.
-<pre><code>aaa
-</code></pre>
-<p>bbb</p>
-````````````````````````````````
-
-
-Final spaces are stripped before inline parsing, so a paragraph
-that ends with two or more spaces will not end with a [hard line
-break]:
-
-```````````````````````````````` example
-aaa     
-bbb     
-.
-<p>aaa<br />
-bbb</p>
-````````````````````````````````
-
-
-## Blank lines
-
-[Blank lines] between block-level elements are ignored,
-except for the role they play in determining whether a [list]
-is [tight] or [loose].
-
-Blank lines at the beginning and end of the document are also ignored.
-
-```````````````````````````````` example
-  
-
-aaa
-  
-
-# aaa
-
-  
-.
-<p>aaa</p>
-<h1>aaa</h1>
-````````````````````````````````
-
-<div class="extension">
-
-## Tables (extension)
-
-GFM enables the `table` extension, where an additional leaf block type is
-available.
-
-A [table](@) is an arrangement of data with rows and columns, consisting of a
-single header row, a [delimiter row] separating the header from the data, and
-zero or more data rows.
-
-Each row consists of cells containing arbitrary text, in which [inlines] are
-parsed, separated by pipes (`|`).  A leading and trailing pipe is also
-recommended for clarity of reading, and if there's otherwise parsing ambiguity.
-Spaces between pipes and cell content are trimmed.  Block-level elements cannot
-be inserted in a table.
-
-The [delimiter row](@) consists of cells whose only content are hyphens (`-`),
-and optionally, a leading or trailing colon (`:`), or both, to indicate left,
-right, or center alignment respectively.
-
-```````````````````````````````` example table
-| foo | bar |
-| --- | --- |
-| baz | bim |
-.
-<table>
-<thead>
-<tr>
-<th>foo</th>
-<th>bar</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>baz</td>
-<td>bim</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-Cells in one column don't need to match length, though it's easier to read if
-they are. Likewise, use of leading and trailing pipes may be inconsistent:
-
-```````````````````````````````` example table
-| abc | defghi |
-:-: | -----------:
-bar | baz
-.
-<table>
-<thead>
-<tr>
-<th align="center">abc</th>
-<th align="right">defghi</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="center">bar</td>
-<td align="right">baz</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-Include a pipe in a cell's content by escaping it, including inside other
-inline spans:
-
-```````````````````````````````` example table
-| f\|oo  |
-| ------ |
-| b `\|` az |
-| b **\|** im |
-.
-<table>
-<thead>
-<tr>
-<th>f|oo</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>b <code>|</code> az</td>
-</tr>
-<tr>
-<td>b <strong>|</strong> im</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-The table is broken at the first empty line, or beginning of another
-block-level structure:
-
-```````````````````````````````` example table
-| abc | def |
-| --- | --- |
-| bar | baz |
-> bar
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>bar</td>
-<td>baz</td>
-</tr>
-</tbody>
-</table>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-```````````````````````````````` example table
-| abc | def |
-| --- | --- |
-| bar | baz |
-bar
-
-bar
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>bar</td>
-<td>baz</td>
-</tr>
-<tr>
-<td>bar</td>
-<td></td>
-</tr>
-</tbody>
-</table>
-<p>bar</p>
-````````````````````````````````
-
-The header row must match the [delimiter row] in the number of cells.  If not,
-a table will not be recognized:
-
-```````````````````````````````` example table
-| abc | def |
-| --- |
-| bar |
-.
-<p>| abc | def |
-| --- |
-| bar |</p>
-````````````````````````````````
-
-The remainder of the table's rows may vary in the number of cells.  If there
-are a number of cells fewer than the number of cells in the header row, empty
-cells are inserted.  If there are greater, the excess is ignored:
-
-```````````````````````````````` example table
-| abc | def |
-| --- | --- |
-| bar |
-| bar | baz | boo |
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>bar</td>
-<td></td>
-</tr>
-<tr>
-<td>bar</td>
-<td>baz</td>
-</tr>
-</tbody>
-</table>
-````````````````````````````````
-
-If there are no rows in the body, no `<tbody>` is generated in HTML output:
-
-```````````````````````````````` example table
-| abc | def |
-| --- | --- |
-.
-<table>
-<thead>
-<tr>
-<th>abc</th>
-<th>def</th>
-</tr>
-</thead>
-</table>
-````````````````````````````````
-
-</div>
-
-# Container blocks
-
-A [container block](#container-blocks) is a block that has other
-blocks as its contents.  There are two basic kinds of container blocks:
-[block quotes] and [list items].
-[Lists] are meta-containers for [list items].
-
-We define the syntax for container blocks recursively.  The general
-form of the definition is:
-
-> If X is a sequence of blocks, then the result of
-> transforming X in such-and-such a way is a container of type Y
-> with these blocks as its content.
-
-So, we explain what counts as a block quote or list item by explaining
-how these can be *generated* from their contents. This should suffice
-to define the syntax, although it does not give a recipe for *parsing*
-these constructions.  (A recipe is provided below in the section entitled
-[A parsing strategy](#appendix-a-parsing-strategy).)
-
-## Block quotes
-
-A [block quote marker](@)
-consists of 0-3 spaces of initial indent, plus (a) the character `>` together
-with a following space, or (b) a single character `>` not followed by a space.
-
-The following rules define [block quotes]:
-
-1.  **Basic case.**  If a string of lines *Ls* constitute a sequence
-    of blocks *Bs*, then the result of prepending a [block quote
-    marker] to the beginning of each line in *Ls*
-    is a [block quote](#block-quotes) containing *Bs*.
-
-2.  **Laziness.**  If a string of lines *Ls* constitute a [block
-    quote](#block-quotes) with contents *Bs*, then the result of deleting
-    the initial [block quote marker] from one or
-    more lines in which the next [non-whitespace character] after the [block
-    quote marker] is [paragraph continuation
-    text] is a block quote with *Bs* as its content.
-    [Paragraph continuation text](@) is text
-    that will be parsed as part of the content of a paragraph, but does
-    not occur at the beginning of the paragraph.
-
-3.  **Consecutiveness.**  A document cannot contain two [block
-    quotes] in a row unless there is a [blank line] between them.
-
-Nothing else counts as a [block quote](#block-quotes).
-
-Here is a simple example:
-
-```````````````````````````````` example
-> # Foo
-> bar
-> baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-The spaces after the `>` characters can be omitted:
-
-```````````````````````````````` example
-># Foo
->bar
-> baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-The `>` characters can be indented 1-3 spaces:
-
-```````````````````````````````` example
-   > # Foo
-   > bar
- > baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-Four spaces gives us a code block:
-
-```````````````````````````````` example
-    > # Foo
-    > bar
-    > baz
-.
-<pre><code>&gt; # Foo
-&gt; bar
-&gt; baz
-</code></pre>
-````````````````````````````````
-
-
-The Laziness clause allows us to omit the `>` before
-[paragraph continuation text]:
-
-```````````````````````````````` example
-> # Foo
-> bar
-baz
-.
-<blockquote>
-<h1>Foo</h1>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-A block quote can contain some lazy and some non-lazy
-continuation lines:
-
-```````````````````````````````` example
-> bar
-baz
-> foo
-.
-<blockquote>
-<p>bar
-baz
-foo</p>
-</blockquote>
-````````````````````````````````
-
-
-Laziness only applies to lines that would have been continuations of
-paragraphs had they been prepended with [block quote markers].
-For example, the `> ` cannot be omitted in the second line of
-
-``` markdown
-> foo
-> ---
-```
-
-without changing the meaning:
-
-```````````````````````````````` example
-> foo
----
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-<hr />
-````````````````````````````````
-
-
-Similarly, if we omit the `> ` in the second line of
-
-``` markdown
-> - foo
-> - bar
-```
-
-then the block quote ends after the first line:
-
-```````````````````````````````` example
-> - foo
-- bar
-.
-<blockquote>
-<ul>
-<li>foo</li>
-</ul>
-</blockquote>
-<ul>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-For the same reason, we can't omit the `> ` in front of
-subsequent lines of an indented or fenced code block:
-
-```````````````````````````````` example
->     foo
-    bar
-.
-<blockquote>
-<pre><code>foo
-</code></pre>
-</blockquote>
-<pre><code>bar
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> ```
-foo
-```
-.
-<blockquote>
-<pre><code></code></pre>
-</blockquote>
-<p>foo</p>
-<pre><code></code></pre>
-````````````````````````````````
-
-
-Note that in the following case, we have a [lazy
-continuation line]:
-
-```````````````````````````````` example
-> foo
-    - bar
-.
-<blockquote>
-<p>foo
-- bar</p>
-</blockquote>
-````````````````````````````````
-
-
-To see why, note that in
-
-```markdown
-> foo
->     - bar
-```
-
-the `- bar` is indented too far to start a list, and can't
-be an indented code block because indented code blocks cannot
-interrupt paragraphs, so it is [paragraph continuation text].
-
-A block quote can be empty:
-
-```````````````````````````````` example
->
-.
-<blockquote>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
->
->  
-> 
-.
-<blockquote>
-</blockquote>
-````````````````````````````````
-
-
-A block quote can have initial or final blank lines:
-
-```````````````````````````````` example
->
-> foo
->  
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-````````````````````````````````
-
-
-A blank line always separates block quotes:
-
-```````````````````````````````` example
-> foo
-
-> bar
-.
-<blockquote>
-<p>foo</p>
-</blockquote>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-(Most current Markdown implementations, including John Gruber's
-original `Markdown.pl`, will parse this example as a single block quote
-with two paragraphs.  But it seems better to allow the author to decide
-whether two block quotes or one are wanted.)
-
-Consecutiveness means that if we put these block quotes together,
-we get a single block quote:
-
-```````````````````````````````` example
-> foo
-> bar
-.
-<blockquote>
-<p>foo
-bar</p>
-</blockquote>
-````````````````````````````````
-
-
-To get a block quote with two paragraphs, use:
-
-```````````````````````````````` example
-> foo
->
-> bar
-.
-<blockquote>
-<p>foo</p>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-Block quotes can interrupt paragraphs:
-
-```````````````````````````````` example
-foo
-> bar
-.
-<p>foo</p>
-<blockquote>
-<p>bar</p>
-</blockquote>
-````````````````````````````````
-
-
-In general, blank lines are not needed before or after block
-quotes:
-
-```````````````````````````````` example
-> aaa
-***
-> bbb
-.
-<blockquote>
-<p>aaa</p>
-</blockquote>
-<hr />
-<blockquote>
-<p>bbb</p>
-</blockquote>
-````````````````````````````````
-
-
-However, because of laziness, a blank line is needed between
-a block quote and a following paragraph:
-
-```````````````````````````````` example
-> bar
-baz
-.
-<blockquote>
-<p>bar
-baz</p>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> bar
-
-baz
-.
-<blockquote>
-<p>bar</p>
-</blockquote>
-<p>baz</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> bar
->
-baz
-.
-<blockquote>
-<p>bar</p>
-</blockquote>
-<p>baz</p>
-````````````````````````````````
-
-
-It is a consequence of the Laziness rule that any number
-of initial `>`s may be omitted on a continuation line of a
-nested block quote:
-
-```````````````````````````````` example
-> > > foo
-bar
-.
-<blockquote>
-<blockquote>
-<blockquote>
-<p>foo
-bar</p>
-</blockquote>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
->>> foo
-> bar
->>baz
-.
-<blockquote>
-<blockquote>
-<blockquote>
-<p>foo
-bar
-baz</p>
-</blockquote>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-When including an indented code block in a block quote,
-remember that the [block quote marker] includes
-both the `>` and a following space.  So *five spaces* are needed after
-the `>`:
-
-```````````````````````````````` example
->     code
-
->    not code
-.
-<blockquote>
-<pre><code>code
-</code></pre>
-</blockquote>
-<blockquote>
-<p>not code</p>
-</blockquote>
-````````````````````````````````
-
-
-
-## List items
-
-A [list marker](@) is a
-[bullet list marker] or an [ordered list marker].
-
-A [bullet list marker](@)
-is a `-`, `+`, or `*` character.
-
-An [ordered list marker](@)
-is a sequence of 1--9 arabic digits (`0-9`), followed by either a
-`.` character or a `)` character.  (The reason for the length
-limit is that with 10 digits we start seeing integer overflows
-in some browsers.)
-
-The following rules define [list items]:
-
-1.  **Basic case.**  If a sequence of lines *Ls* constitute a sequence of
-    blocks *Bs* starting with a [non-whitespace character] and not separated
-    from each other by more than one blank line, and *M* is a list
-    marker of width *W* followed by 1 ≤ *N* ≤ 4 spaces, then the result
-    of prepending *M* and the following spaces to the first line of
-    *Ls*, and indenting subsequent lines of *Ls* by *W + N* spaces, is a
-    list item with *Bs* as its contents.  The type of the list item
-    (bullet or ordered) is determined by the type of its list marker.
-    If the list item is ordered, then it is also assigned a start
-    number, based on the ordered list marker.
-
-    Exceptions:
-
-    1. When the first list item in a [list] interrupts
-    a paragraph---that is, when it starts on a line that would
-    otherwise count as [paragraph continuation text]---then (a)
-    the lines *Ls* must not begin with a blank line, and (b) if
-    the list item is ordered, the start number must be 1.
-    2. If any line is a [thematic break][thematic breaks] then
-       that line is not a list item.
-
-For example, let *Ls* be the lines
-
-```````````````````````````````` example
-A paragraph
-with two lines.
-
-    indented code
-
-> A block quote.
-.
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-````````````````````````````````
-
-
-And let *M* be the marker `1.`, and *N* = 2.  Then rule #1 says
-that the following is an ordered list item with start number 1,
-and the same contents as *Ls*:
-
-```````````````````````````````` example
-1.  A paragraph
-    with two lines.
-
-        indented code
-
-    > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-The most important thing to notice is that the position of
-the text after the list marker determines how much indentation
-is needed in subsequent blocks in the list item.  If the list
-marker takes up two spaces, and there are three spaces between
-the list marker and the next [non-whitespace character], then blocks
-must be indented five spaces in order to fall under the list
-item.
-
-Here are some examples showing how far content must be indented to be
-put under the list item:
-
-```````````````````````````````` example
-- one
-
- two
-.
-<ul>
-<li>one</li>
-</ul>
-<p>two</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- one
-
-  two
-.
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
- -    one
-
-     two
-.
-<ul>
-<li>one</li>
-</ul>
-<pre><code> two
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
- -    one
-
-      two
-.
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-It is tempting to think of this in terms of columns:  the continuation
-blocks must be indented at least to the column of the first
-[non-whitespace character] after the list marker. However, that is not quite right.
-The spaces after the list marker determine how much relative indentation
-is needed.  Which column this indentation reaches will depend on
-how the list item is embedded in other constructions, as shown by
-this example:
-
-```````````````````````````````` example
-   > > 1.  one
->>
->>     two
-.
-<blockquote>
-<blockquote>
-<ol>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ol>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-Here `two` occurs in the same column as the list marker `1.`,
-but is actually contained in the list item, because there is
-sufficient indentation after the last containing blockquote marker.
-
-The converse is also possible.  In the following example, the word `two`
-occurs far to the right of the initial text of the list item, `one`, but
-it is not considered part of the list item, because it is not indented
-far enough past the blockquote marker:
-
-```````````````````````````````` example
->>- one
->>
-  >  > two
-.
-<blockquote>
-<blockquote>
-<ul>
-<li>one</li>
-</ul>
-<p>two</p>
-</blockquote>
-</blockquote>
-````````````````````````````````
-
-
-Note that at least one space is needed between the list marker and
-any following content, so these are not list items:
-
-```````````````````````````````` example
--one
-
-2.two
-.
-<p>-one</p>
-<p>2.two</p>
-````````````````````````````````
-
-
-A list item may contain blocks that are separated by more than
-one blank line.
-
-```````````````````````````````` example
-- foo
-
-
-  bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-A list item may contain any kind of block:
-
-```````````````````````````````` example
-1.  foo
-
-    ```
-    bar
-    ```
-
-    baz
-
-    > bam
-.
-<ol>
-<li>
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-<p>baz</p>
-<blockquote>
-<p>bam</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-A list item that contains an indented code block will preserve
-empty lines within the code block verbatim.
-
-```````````````````````````````` example
-- Foo
-
-      bar
-
-
-      baz
-.
-<ul>
-<li>
-<p>Foo</p>
-<pre><code>bar
-
-
-baz
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-Note that ordered list start numbers must be nine digits or less:
-
-```````````````````````````````` example
-123456789. ok
-.
-<ol start="123456789">
-<li>ok</li>
-</ol>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1234567890. not ok
-.
-<p>1234567890. not ok</p>
-````````````````````````````````
-
-
-A start number may begin with 0s:
-
-```````````````````````````````` example
-0. ok
-.
-<ol start="0">
-<li>ok</li>
-</ol>
-````````````````````````````````
-
-
-```````````````````````````````` example
-003. ok
-.
-<ol start="3">
-<li>ok</li>
-</ol>
-````````````````````````````````
-
-
-A start number may not be negative:
-
-```````````````````````````````` example
--1. not ok
-.
-<p>-1. not ok</p>
-````````````````````````````````
-
-
-
-2.  **Item starting with indented code.**  If a sequence of lines *Ls*
-    constitute a sequence of blocks *Bs* starting with an indented code
-    block and not separated from each other by more than one blank line,
-    and *M* is a list marker of width *W* followed by
-    one space, then the result of prepending *M* and the following
-    space to the first line of *Ls*, and indenting subsequent lines of
-    *Ls* by *W + 1* spaces, is a list item with *Bs* as its contents.
-    If a line is empty, then it need not be indented.  The type of the
-    list item (bullet or ordered) is determined by the type of its list
-    marker.  If the list item is ordered, then it is also assigned a
-    start number, based on the ordered list marker.
-
-An indented code block will have to be indented four spaces beyond
-the edge of the region where text will be included in the list item.
-In the following case that is 6 spaces:
-
-```````````````````````````````` example
-- foo
-
-      bar
-.
-<ul>
-<li>
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-
-And in this case it is 11 spaces:
-
-```````````````````````````````` example
-  10.  foo
-
-           bar
-.
-<ol start="10">
-<li>
-<p>foo</p>
-<pre><code>bar
-</code></pre>
-</li>
-</ol>
-````````````````````````````````
-
-
-If the *first* block in the list item is an indented code block,
-then by rule #2, the contents must be indented *one* space after the
-list marker:
-
-```````````````````````````````` example
-    indented code
-
-paragraph
-
-    more code
-.
-<pre><code>indented code
-</code></pre>
-<p>paragraph</p>
-<pre><code>more code
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1.     indented code
-
-   paragraph
-
-       more code
-.
-<ol>
-<li>
-<pre><code>indented code
-</code></pre>
-<p>paragraph</p>
-<pre><code>more code
-</code></pre>
-</li>
-</ol>
-````````````````````````````````
-
-
-Note that an additional space indent is interpreted as space
-inside the code block:
-
-```````````````````````````````` example
-1.      indented code
-
-   paragraph
-
-       more code
-.
-<ol>
-<li>
-<pre><code> indented code
-</code></pre>
-<p>paragraph</p>
-<pre><code>more code
-</code></pre>
-</li>
-</ol>
-````````````````````````````````
-
-
-Note that rules #1 and #2 only apply to two cases:  (a) cases
-in which the lines to be included in a list item begin with a
-[non-whitespace character], and (b) cases in which
-they begin with an indented code
-block.  In a case like the following, where the first block begins with
-a three-space indent, the rules do not allow us to form a list item by
-indenting the whole thing and prepending a list marker:
-
-```````````````````````````````` example
-   foo
-
-bar
-.
-<p>foo</p>
-<p>bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
--    foo
-
-  bar
-.
-<ul>
-<li>foo</li>
-</ul>
-<p>bar</p>
-````````````````````````````````
-
-
-This is not a significant restriction, because when a block begins
-with 1-3 spaces indent, the indentation can always be removed without
-a change in interpretation, allowing rule #1 to be applied.  So, in
-the above case:
-
-```````````````````````````````` example
--  foo
-
-   bar
-.
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-3.  **Item starting with a blank line.**  If a sequence of lines *Ls*
-    starting with a single [blank line] constitute a (possibly empty)
-    sequence of blocks *Bs*, not separated from each other by more than
-    one blank line, and *M* is a list marker of width *W*,
-    then the result of prepending *M* to the first line of *Ls*, and
-    indenting subsequent lines of *Ls* by *W + 1* spaces, is a list
-    item with *Bs* as its contents.
-    If a line is empty, then it need not be indented.  The type of the
-    list item (bullet or ordered) is determined by the type of its list
-    marker.  If the list item is ordered, then it is also assigned a
-    start number, based on the ordered list marker.
-
-Here are some list items that start with a blank line but are not empty:
-
-```````````````````````````````` example
--
-  foo
--
-  ```
-  bar
-  ```
--
-      baz
-.
-<ul>
-<li>foo</li>
-<li>
-<pre><code>bar
-</code></pre>
-</li>
-<li>
-<pre><code>baz
-</code></pre>
-</li>
-</ul>
-````````````````````````````````
-
-When the list item starts with a blank line, the number of spaces
-following the list marker doesn't change the required indentation:
-
-```````````````````````````````` example
--   
-  foo
-.
-<ul>
-<li>foo</li>
-</ul>
-````````````````````````````````
-
-
-A list item can begin with at most one blank line.
-In the following example, `foo` is not part of the list
-item:
-
-```````````````````````````````` example
--
-
-  foo
-.
-<ul>
-<li></li>
-</ul>
-<p>foo</p>
-````````````````````````````````
-
-
-Here is an empty bullet list item:
-
-```````````````````````````````` example
-- foo
--
-- bar
-.
-<ul>
-<li>foo</li>
-<li></li>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-It does not matter whether there are spaces following the [list marker]:
-
-```````````````````````````````` example
-- foo
--   
-- bar
-.
-<ul>
-<li>foo</li>
-<li></li>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-Here is an empty ordered list item:
-
-```````````````````````````````` example
-1. foo
-2.
-3. bar
-.
-<ol>
-<li>foo</li>
-<li></li>
-<li>bar</li>
-</ol>
-````````````````````````````````
-
-
-A list may start or end with an empty list item:
-
-```````````````````````````````` example
-*
-.
-<ul>
-<li></li>
-</ul>
-````````````````````````````````
-
-However, an empty list item cannot interrupt a paragraph:
-
-```````````````````````````````` example
-foo
-*
-
-foo
-1.
-.
-<p>foo
-*</p>
-<p>foo
-1.</p>
-````````````````````````````````
-
-
-4.  **Indentation.**  If a sequence of lines *Ls* constitutes a list item
-    according to rule #1, #2, or #3, then the result of indenting each line
-    of *Ls* by 1-3 spaces (the same for each line) also constitutes a
-    list item with the same contents and attributes.  If a line is
-    empty, then it need not be indented.
-
-Indented one space:
-
-```````````````````````````````` example
- 1.  A paragraph
-     with two lines.
-
-         indented code
-
-     > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Indented two spaces:
-
-```````````````````````````````` example
-  1.  A paragraph
-      with two lines.
-
-          indented code
-
-      > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Indented three spaces:
-
-```````````````````````````````` example
-   1.  A paragraph
-       with two lines.
-
-           indented code
-
-       > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Four spaces indent gives a code block:
-
-```````````````````````````````` example
-    1.  A paragraph
-        with two lines.
-
-            indented code
-
-        > A block quote.
-.
-<pre><code>1.  A paragraph
-    with two lines.
-
-        indented code
-
-    &gt; A block quote.
-</code></pre>
-````````````````````````````````
-
-
-
-5.  **Laziness.**  If a string of lines *Ls* constitute a [list
-    item](#list-items) with contents *Bs*, then the result of deleting
-    some or all of the indentation from one or more lines in which the
-    next [non-whitespace character] after the indentation is
-    [paragraph continuation text] is a
-    list item with the same contents and attributes.  The unindented
-    lines are called
-    [lazy continuation line](@)s.
-
-Here is an example with [lazy continuation lines]:
-
-```````````````````````````````` example
-  1.  A paragraph
-with two lines.
-
-          indented code
-
-      > A block quote.
-.
-<ol>
-<li>
-<p>A paragraph
-with two lines.</p>
-<pre><code>indented code
-</code></pre>
-<blockquote>
-<p>A block quote.</p>
-</blockquote>
-</li>
-</ol>
-````````````````````````````````
-
-
-Indentation can be partially deleted:
-
-```````````````````````````````` example
-  1.  A paragraph
-    with two lines.
-.
-<ol>
-<li>A paragraph
-with two lines.</li>
-</ol>
-````````````````````````````````
-
-
-These examples show how laziness can work in nested structures:
-
-```````````````````````````````` example
-> 1. > Blockquote
-continued here.
-.
-<blockquote>
-<ol>
-<li>
-<blockquote>
-<p>Blockquote
-continued here.</p>
-</blockquote>
-</li>
-</ol>
-</blockquote>
-````````````````````````````````
-
-
-```````````````````````````````` example
-> 1. > Blockquote
-> continued here.
-.
-<blockquote>
-<ol>
-<li>
-<blockquote>
-<p>Blockquote
-continued here.</p>
-</blockquote>
-</li>
-</ol>
-</blockquote>
-````````````````````````````````
-
-
-
-6.  **That's all.** Nothing that is not counted as a list item by rules
-    #1--5 counts as a [list item](#list-items).
-
-The rules for sublists follow from the general rules
-[above][List items].  A sublist must be indented the same number
-of spaces a paragraph would need to be in order to be included
-in the list item.
-
-So, in this case we need two spaces indent:
-
-```````````````````````````````` example
-- foo
-  - bar
-    - baz
-      - boo
-.
-<ul>
-<li>foo
-<ul>
-<li>bar
-<ul>
-<li>baz
-<ul>
-<li>boo</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-One is not enough:
-
-```````````````````````````````` example
-- foo
- - bar
-  - baz
-   - boo
-.
-<ul>
-<li>foo</li>
-<li>bar</li>
-<li>baz</li>
-<li>boo</li>
-</ul>
-````````````````````````````````
-
-
-Here we need four, because the list marker is wider:
-
-```````````````````````````````` example
-10) foo
-    - bar
-.
-<ol start="10">
-<li>foo
-<ul>
-<li>bar</li>
-</ul>
-</li>
-</ol>
-````````````````````````````````
-
-
-Three is not enough:
-
-```````````````````````````````` example
-10) foo
-   - bar
-.
-<ol start="10">
-<li>foo</li>
-</ol>
-<ul>
-<li>bar</li>
-</ul>
-````````````````````````````````
-
-
-A list may be the first block in a list item:
-
-```````````````````````````````` example
-- - foo
-.
-<ul>
-<li>
-<ul>
-<li>foo</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1. - 2. foo
-.
-<ol>
-<li>
-<ul>
-<li>
-<ol start="2">
-<li>foo</li>
-</ol>
-</li>
-</ul>
-</li>
-</ol>
-````````````````````````````````
-
-
-A list item can contain a heading:
-
-```````````````````````````````` example
-- # Foo
-- Bar
-  ---
-  baz
-.
-<ul>
-<li>
-<h1>Foo</h1>
-</li>
-<li>
-<h2>Bar</h2>
-baz</li>
-</ul>
-````````````````````````````````
-
-
-### Motivation
-
-John Gruber's Markdown spec says the following about list items:
-
-1. "List markers typically start at the left margin, but may be indented
-   by up to three spaces. List markers must be followed by one or more
-   spaces or a tab."
-
-2. "To make lists look nice, you can wrap items with hanging indents....
-   But if you don't want to, you don't have to."
-
-3. "List items may consist of multiple paragraphs. Each subsequent
-   paragraph in a list item must be indented by either 4 spaces or one
-   tab."
-
-4. "It looks nice if you indent every line of the subsequent paragraphs,
-   but here again, Markdown will allow you to be lazy."
-
-5. "To put a blockquote within a list item, the blockquote's `>`
-   delimiters need to be indented."
-
-6. "To put a code block within a list item, the code block needs to be
-   indented twice — 8 spaces or two tabs."
-
-These rules specify that a paragraph under a list item must be indented
-four spaces (presumably, from the left margin, rather than the start of
-the list marker, but this is not said), and that code under a list item
-must be indented eight spaces instead of the usual four.  They also say
-that a block quote must be indented, but not by how much; however, the
-example given has four spaces indentation.  Although nothing is said
-about other kinds of block-level content, it is certainly reasonable to
-infer that *all* block elements under a list item, including other
-lists, must be indented four spaces.  This principle has been called the
-*four-space rule*.
-
-The four-space rule is clear and principled, and if the reference
-implementation `Markdown.pl` had followed it, it probably would have
-become the standard.  However, `Markdown.pl` allowed paragraphs and
-sublists to start with only two spaces indentation, at least on the
-outer level.  Worse, its behavior was inconsistent: a sublist of an
-outer-level list needed two spaces indentation, but a sublist of this
-sublist needed three spaces.  It is not surprising, then, that different
-implementations of Markdown have developed very different rules for
-determining what comes under a list item.  (Pandoc and python-Markdown,
-for example, stuck with Gruber's syntax description and the four-space
-rule, while discount, redcarpet, marked, PHP Markdown, and others
-followed `Markdown.pl`'s behavior more closely.)
-
-Unfortunately, given the divergences between implementations, there
-is no way to give a spec for list items that will be guaranteed not
-to break any existing documents.  However, the spec given here should
-correctly handle lists formatted with either the four-space rule or
-the more forgiving `Markdown.pl` behavior, provided they are laid out
-in a way that is natural for a human to read.
-
-The strategy here is to let the width and indentation of the list marker
-determine the indentation necessary for blocks to fall under the list
-item, rather than having a fixed and arbitrary number.  The writer can
-think of the body of the list item as a unit which gets indented to the
-right enough to fit the list marker (and any indentation on the list
-marker).  (The laziness rule, #5, then allows continuation lines to be
-unindented if needed.)
-
-This rule is superior, we claim, to any rule requiring a fixed level of
-indentation from the margin.  The four-space rule is clear but
-unnatural. It is quite unintuitive that
-
-``` markdown
-- foo
-
-  bar
-
-  - baz
-```
-
-should be parsed as two lists with an intervening paragraph,
-
-``` html
-<ul>
-<li>foo</li>
-</ul>
-<p>bar</p>
-<ul>
-<li>baz</li>
-</ul>
-```
-
-as the four-space rule demands, rather than a single list,
-
-``` html
-<ul>
-<li>
-<p>foo</p>
-<p>bar</p>
-<ul>
-<li>baz</li>
-</ul>
-</li>
-</ul>
-```
-
-The choice of four spaces is arbitrary.  It can be learned, but it is
-not likely to be guessed, and it trips up beginners regularly.
-
-Would it help to adopt a two-space rule?  The problem is that such
-a rule, together with the rule allowing 1--3 spaces indentation of the
-initial list marker, allows text that is indented *less than* the
-original list marker to be included in the list item. For example,
-`Markdown.pl` parses
-
-``` markdown
-   - one
-
-  two
-```
-
-as a single list item, with `two` a continuation paragraph:
-
-``` html
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-```
-
-and similarly
-
-``` markdown
->   - one
->
->  two
-```
-
-as
-
-``` html
-<blockquote>
-<ul>
-<li>
-<p>one</p>
-<p>two</p>
-</li>
-</ul>
-</blockquote>
-```
-
-This is extremely unintuitive.
-
-Rather than requiring a fixed indent from the margin, we could require
-a fixed indent (say, two spaces, or even one space) from the list marker (which
-may itself be indented).  This proposal would remove the last anomaly
-discussed.  Unlike the spec presented above, it would count the following
-as a list item with a subparagraph, even though the paragraph `bar`
-is not indented as far as the first paragraph `foo`:
-
-``` markdown
- 10. foo
-
-   bar  
-```
-
-Arguably this text does read like a list item with `bar` as a subparagraph,
-which may count in favor of the proposal.  However, on this proposal indented
-code would have to be indented six spaces after the list marker.  And this
-would break a lot of existing Markdown, which has the pattern:
-
-``` markdown
-1.  foo
-
-        indented code
-```
-
-where the code is indented eight spaces.  The spec above, by contrast, will
-parse this text as expected, since the code block's indentation is measured
-from the beginning of `foo`.
-
-The one case that needs special treatment is a list item that *starts*
-with indented code.  How much indentation is required in that case, since
-we don't have a "first paragraph" to measure from?  Rule #2 simply stipulates
-that in such cases, we require one space indentation from the list marker
-(and then the normal four spaces for the indented code).  This will match the
-four-space rule in cases where the list marker plus its initial indentation
-takes four spaces (a common case), but diverge in other cases.
-
-<div class="extension">
-
-## Task list items (extension)
-
-GFM enables the `tasklist` extension, where an additional processing step is
-performed on [list items].
-
-A [task list item](@) is a [list item][list items] where the first block in it
-is a paragraph which begins with a [task list item marker] and at least one
-whitespace character before any other content.
-
-A [task list item marker](@) consists of an optional number of spaces, a left
-bracket (`[`), either a whitespace character or the letter `x` in either
-lowercase or uppercase, and then a right bracket (`]`).
-
-When rendered, the [task list item marker] is replaced with a semantic checkbox element;
-in an HTML output, this would be an `<input type="checkbox">` element.
-
-If the character between the brackets is a whitespace character, the checkbox
-is unchecked.  Otherwise, the checkbox is checked.
-
-This spec does not define how the checkbox elements are interacted with: in practice,
-implementors are free to render the checkboxes as disabled or inmutable elements,
-or they may dynamically handle dynamic interactions (i.e. checking, unchecking) in
-the final rendered document.
-
-```````````````````````````````` example disabled
-- [ ] foo
-- [x] bar
-.
-<ul>
-<li><input disabled="" type="checkbox"> foo</li>
-<li><input checked="" disabled="" type="checkbox"> bar</li>
-</ul>
-````````````````````````````````
-
-Task lists can be arbitrarily nested:
-
-```````````````````````````````` example disabled
-- [x] foo
-  - [ ] bar
-  - [x] baz
-- [ ] bim
-.
-<ul>
-<li><input checked="" disabled="" type="checkbox"> foo
-<ul>
-<li><input disabled="" type="checkbox"> bar</li>
-<li><input checked="" disabled="" type="checkbox"> baz</li>
-</ul>
-</li>
-<li><input disabled="" type="checkbox"> bim</li>
-</ul>
-````````````````````````````````
-
-</div>
-
-## Lists
-
-A [list](@) is a sequence of one or more
-list items [of the same type].  The list items
-may be separated by any number of blank lines.
-
-Two list items are [of the same type](@)
-if they begin with a [list marker] of the same type.
-Two list markers are of the
-same type if (a) they are bullet list markers using the same character
-(`-`, `+`, or `*`) or (b) they are ordered list numbers with the same
-delimiter (either `.` or `)`).
-
-A list is an [ordered list](@)
-if its constituent list items begin with
-[ordered list markers], and a
-[bullet list](@) if its constituent list
-items begin with [bullet list markers].
-
-The [start number](@)
-of an [ordered list] is determined by the list number of
-its initial list item.  The numbers of subsequent list items are
-disregarded.
-
-A list is [loose](@) if any of its constituent
-list items are separated by blank lines, or if any of its constituent
-list items directly contain two block-level elements with a blank line
-between them.  Otherwise a list is [tight](@).
-(The difference in HTML output is that paragraphs in a loose list are
-wrapped in `<p>` tags, while paragraphs in a tight list are not.)
-
-Changing the bullet or ordered list delimiter starts a new list:
-
-```````````````````````````````` example
-- foo
-- bar
-+ baz
-.
-<ul>
-<li>foo</li>
-<li>bar</li>
-</ul>
-<ul>
-<li>baz</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1. foo
-2. bar
-3) baz
-.
-<ol>
-<li>foo</li>
-<li>bar</li>
-</ol>
-<ol start="3">
-<li>baz</li>
-</ol>
-````````````````````````````````
-
-
-In CommonMark, a list can interrupt a paragraph. That is,
-no blank line is needed to separate a paragraph from a following
-list:
-
-```````````````````````````````` example
-Foo
-- bar
-- baz
-.
-<p>Foo</p>
-<ul>
-<li>bar</li>
-<li>baz</li>
-</ul>
-````````````````````````````````
-
-`Markdown.pl` does not allow this, through fear of triggering a list
-via a numeral in a hard-wrapped line:
-
-``` markdown
-The number of windows in my house is
-14.  The number of doors is 6.
-```
-
-Oddly, though, `Markdown.pl` *does* allow a blockquote to
-interrupt a paragraph, even though the same considerations might
-apply.
-
-In CommonMark, we do allow lists to interrupt paragraphs, for
-two reasons.  First, it is natural and not uncommon for people
-to start lists without blank lines:
-
-``` markdown
-I need to buy
-- new shoes
-- a coat
-- a plane ticket
-```
-
-Second, we are attracted to a
-
-> [principle of uniformity](@):
-> if a chunk of text has a certain
-> meaning, it will continue to have the same meaning when put into a
-> container block (such as a list item or blockquote).
-
-(Indeed, the spec for [list items] and [block quotes] presupposes
-this principle.) This principle implies that if
-
-``` markdown
-  * I need to buy
-    - new shoes
-    - a coat
-    - a plane ticket
-```
-
-is a list item containing a paragraph followed by a nested sublist,
-as all Markdown implementations agree it is (though the paragraph
-may be rendered without `<p>` tags, since the list is "tight"),
-then
-
-``` markdown
-I need to buy
-- new shoes
-- a coat
-- a plane ticket
-```
-
-by itself should be a paragraph followed by a nested sublist.
-
-Since it is well established Markdown practice to allow lists to
-interrupt paragraphs inside list items, the [principle of
-uniformity] requires us to allow this outside list items as
-well.  ([reStructuredText](http://docutils.sourceforge.net/rst.html)
-takes a different approach, requiring blank lines before lists
-even inside other list items.)
-
-In order to solve of unwanted lists in paragraphs with
-hard-wrapped numerals, we allow only lists starting with `1` to
-interrupt paragraphs.  Thus,
-
-```````````````````````````````` example
-The number of windows in my house is
-14.  The number of doors is 6.
-.
-<p>The number of windows in my house is
-14.  The number of doors is 6.</p>
-````````````````````````````````
-
-We may still get an unintended result in cases like
-
-```````````````````````````````` example
-The number of windows in my house is
-1.  The number of doors is 6.
-.
-<p>The number of windows in my house is</p>
-<ol>
-<li>The number of doors is 6.</li>
-</ol>
-````````````````````````````````
-
-but this rule should prevent most spurious list captures.
-
-There can be any number of blank lines between items:
-
-```````````````````````````````` example
-- foo
-
-- bar
-
-
-- baz
-.
-<ul>
-<li>
-<p>foo</p>
-</li>
-<li>
-<p>bar</p>
-</li>
-<li>
-<p>baz</p>
-</li>
-</ul>
-````````````````````````````````
-
-```````````````````````````````` example
-- foo
-  - bar
-    - baz
-
-
-      bim
-.
-<ul>
-<li>foo
-<ul>
-<li>bar
-<ul>
-<li>
-<p>baz</p>
-<p>bim</p>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-To separate consecutive lists of the same type, or to separate a
-list from an indented code block that would otherwise be parsed
-as a subparagraph of the final list item, you can insert a blank HTML
-comment:
-
-```````````````````````````````` example
-- foo
-- bar
-
-<!-- -->
-
-- baz
-- bim
-.
-<ul>
-<li>foo</li>
-<li>bar</li>
-</ul>
-<!-- -->
-<ul>
-<li>baz</li>
-<li>bim</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
--   foo
-
-    notcode
-
--   foo
-
-<!-- -->
-
-    code
-.
-<ul>
-<li>
-<p>foo</p>
-<p>notcode</p>
-</li>
-<li>
-<p>foo</p>
-</li>
-</ul>
-<!-- -->
-<pre><code>code
-</code></pre>
-````````````````````````````````
-
-
-List items need not be indented to the same level.  The following
-list items will be treated as items at the same list level,
-since none is indented enough to belong to the previous list
-item:
-
-```````````````````````````````` example
-- a
- - b
-  - c
-   - d
-  - e
- - f
-- g
-.
-<ul>
-<li>a</li>
-<li>b</li>
-<li>c</li>
-<li>d</li>
-<li>e</li>
-<li>f</li>
-<li>g</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-1. a
-
-  2. b
-
-   3. c
-.
-<ol>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-<li>
-<p>c</p>
-</li>
-</ol>
-````````````````````````````````
-
-Note, however, that list items may not be indented more than
-three spaces.  Here `- e` is treated as a paragraph continuation
-line, because it is indented more than three spaces:
-
-```````````````````````````````` example
-- a
- - b
-  - c
-   - d
-    - e
-.
-<ul>
-<li>a</li>
-<li>b</li>
-<li>c</li>
-<li>d
-- e</li>
-</ul>
-````````````````````````````````
-
-And here, `3. c` is treated as in indented code block,
-because it is indented four spaces and preceded by a
-blank line.
-
-```````````````````````````````` example
-1. a
-
-  2. b
-
-    3. c
-.
-<ol>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-</ol>
-<pre><code>3. c
-</code></pre>
-````````````````````````````````
-
-
-This is a loose list, because there is a blank line between
-two of the list items:
-
-```````````````````````````````` example
-- a
-- b
-
-- c
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-<li>
-<p>c</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-So is this, with a empty second item:
-
-```````````````````````````````` example
-* a
-*
-
-* c
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li></li>
-<li>
-<p>c</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-These are loose lists, even though there is no space between the items,
-because one of the items directly contains two block-level elements
-with a blank line between them:
-
-```````````````````````````````` example
-- a
-- b
-
-  c
-- d
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-<p>c</p>
-</li>
-<li>
-<p>d</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- a
-- b
-
-  [ref]: /url
-- d
-.
-<ul>
-<li>
-<p>a</p>
-</li>
-<li>
-<p>b</p>
-</li>
-<li>
-<p>d</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-This is a tight list, because the blank lines are in a code block:
-
-```````````````````````````````` example
-- a
-- ```
-  b
-
-
-  ```
-- c
-.
-<ul>
-<li>a</li>
-<li>
-<pre><code>b
-
-
-</code></pre>
-</li>
-<li>c</li>
-</ul>
-````````````````````````````````
-
-
-This is a tight list, because the blank line is between two
-paragraphs of a sublist.  So the sublist is loose while
-the outer list is tight:
-
-```````````````````````````````` example
-- a
-  - b
-
-    c
-- d
-.
-<ul>
-<li>a
-<ul>
-<li>
-<p>b</p>
-<p>c</p>
-</li>
-</ul>
-</li>
-<li>d</li>
-</ul>
-````````````````````````````````
-
-
-This is a tight list, because the blank line is inside the
-block quote:
-
-```````````````````````````````` example
-* a
-  > b
-  >
-* c
-.
-<ul>
-<li>a
-<blockquote>
-<p>b</p>
-</blockquote>
-</li>
-<li>c</li>
-</ul>
-````````````````````````````````
-
-
-This list is tight, because the consecutive block elements
-are not separated by blank lines:
-
-```````````````````````````````` example
-- a
-  > b
-  ```
-  c
-  ```
-- d
-.
-<ul>
-<li>a
-<blockquote>
-<p>b</p>
-</blockquote>
-<pre><code>c
-</code></pre>
-</li>
-<li>d</li>
-</ul>
-````````````````````````````````
-
-
-A single-paragraph list is tight:
-
-```````````````````````````````` example
-- a
-.
-<ul>
-<li>a</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- a
-  - b
-.
-<ul>
-<li>a
-<ul>
-<li>b</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-This list is loose, because of the blank line between the
-two block elements in the list item:
-
-```````````````````````````````` example
-1. ```
-   foo
-   ```
-
-   bar
-.
-<ol>
-<li>
-<pre><code>foo
-</code></pre>
-<p>bar</p>
-</li>
-</ol>
-````````````````````````````````
-
-
-Here the outer list is loose, the inner list tight:
-
-```````````````````````````````` example
-* foo
-  * bar
-
-  baz
-.
-<ul>
-<li>
-<p>foo</p>
-<ul>
-<li>bar</li>
-</ul>
-<p>baz</p>
-</li>
-</ul>
-````````````````````````````````
-
-
-```````````````````````````````` example
-- a
-  - b
-  - c
-
-- d
-  - e
-  - f
-.
-<ul>
-<li>
-<p>a</p>
-<ul>
-<li>b</li>
-<li>c</li>
-</ul>
-</li>
-<li>
-<p>d</p>
-<ul>
-<li>e</li>
-<li>f</li>
-</ul>
-</li>
-</ul>
-````````````````````````````````
-
-
-# Inlines
-
-Inlines are parsed sequentially from the beginning of the character
-stream to the end (left to right, in left-to-right languages).
-Thus, for example, in
-
-```````````````````````````````` example
-`hi`lo`
-.
-<p><code>hi</code>lo`</p>
-````````````````````````````````
-
-
-`hi` is parsed as code, leaving the backtick at the end as a literal
-backtick.
-
-## Backslash escapes
-
-Any ASCII punctuation character may be backslash-escaped:
-
-```````````````````````````````` example
-\!\"\#\$\%\&\'\(\)\*\+\,\-\.\/\:\;\<\=\>\?\@\[\\\]\^\_\`\{\|\}\~
-.
-<p>!&quot;#$%&amp;'()*+,-./:;&lt;=&gt;?@[\]^_`{|}~</p>
-````````````````````````````````
-
-
-Backslashes before other characters are treated as literal
-backslashes:
-
-```````````````````````````````` example
-\→\A\a\ \3\φ\«
-.
-<p>\→\A\a\ \3\φ\«</p>
-````````````````````````````````
-
-
-Escaped characters are treated as regular characters and do
-not have their usual Markdown meanings:
-
-```````````````````````````````` example
-\*not emphasized*
-\<br/> not a tag
-\[not a link](/foo)
-\`not code`
-1\. not a list
-\* not a list
-\# not a heading
-\[foo]: /url "not a reference"
-.
-<p>*not emphasized*
-&lt;br/&gt; not a tag
-[not a link](/foo)
-`not code`
-1. not a list
-* not a list
-# not a heading
-[foo]: /url &quot;not a reference&quot;</p>
-````````````````````````````````
-
-
-If a backslash is itself escaped, the following character is not:
-
-```````````````````````````````` example
-\\*emphasis*
-.
-<p>\<em>emphasis</em></p>
-````````````````````````````````
-
-
-A backslash at the end of the line is a [hard line break]:
-
-```````````````````````````````` example
-foo\
-bar
-.
-<p>foo<br />
-bar</p>
-````````````````````````````````
-
-
-Backslash escapes do not work in code blocks, code spans, autolinks, or
-raw HTML:
-
-```````````````````````````````` example
-`` \[\` ``
-.
-<p><code>\[\`</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    \[\]
-.
-<pre><code>\[\]
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-~~~
-\[\]
-~~~
-.
-<pre><code>\[\]
-</code></pre>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<http://example.com?find=\*>
-.
-<p><a href="http://example.com?find=%5C*">http://example.com?find=\*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<a href="/bar\/)">
-.
-<a href="/bar\/)">
-````````````````````````````````
-
-
-But they work in all other contexts, including URLs and link titles,
-link references, and [info strings] in [fenced code blocks]:
-
-```````````````````````````````` example
-[foo](/bar\* "ti\*tle")
-.
-<p><a href="/bar*" title="ti*tle">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo]
-
-[foo]: /bar\* "ti\*tle"
-.
-<p><a href="/bar*" title="ti*tle">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-``` foo\+bar
-foo
-```
-.
-<pre><code class="language-foo+bar">foo
-</code></pre>
-````````````````````````````````
-
-
-
-## Entity and numeric character references
-
-All valid HTML entity references and numeric character
-references, except those occurring in code blocks and code spans,
-are recognized as such and treated as equivalent to the
-corresponding Unicode characters.  Conforming CommonMark parsers
-need not store information about whether a particular character
-was represented in the source using a Unicode character or
-an entity reference.
-
-[Entity references](@) consist of `&` + any of the valid
-HTML5 entity names + `;`. The
-document <https://html.spec.whatwg.org/multipage/entities.json>
-is used as an authoritative source for the valid entity
-references and their corresponding code points.
-
-```````````````````````````````` example
-&nbsp; &amp; &copy; &AElig; &Dcaron;
-&frac34; &HilbertSpace; &DifferentialD;
-&ClockwiseContourIntegral; &ngE;
-.
-<p>  &amp; © Æ Ď
-¾ ℋ ⅆ
-∲ ≧̸</p>
-````````````````````````````````
-
-
-[Decimal numeric character
-references](@)
-consist of `&#` + a string of 1--7 arabic digits + `;`. A
-numeric character reference is parsed as the corresponding
-Unicode character. Invalid Unicode code points will be replaced by
-the REPLACEMENT CHARACTER (`U+FFFD`).  For security reasons,
-the code point `U+0000` will also be replaced by `U+FFFD`.
-
-```````````````````````````````` example
-&#35; &#1234; &#992; &#0;
-.
-<p># Ӓ Ϡ �</p>
-````````````````````````````````
-
-
-[Hexadecimal numeric character
-references](@) consist of `&#` +
-either `X` or `x` + a string of 1-6 hexadecimal digits + `;`.
-They too are parsed as the corresponding Unicode character (this
-time specified with a hexadecimal numeral instead of decimal).
-
-```````````````````````````````` example
-&#X22; &#XD06; &#xcab;
-.
-<p>&quot; ആ ಫ</p>
-````````````````````````````````
-
-
-Here are some nonentities:
-
-```````````````````````````````` example
-&nbsp &x; &#; &#x;
-&#987654321;
-&#abcdef0;
-&ThisIsNotDefined; &hi?;
-.
-<p>&amp;nbsp &amp;x; &amp;#; &amp;#x;
-&amp;#987654321;
-&amp;#abcdef0;
-&amp;ThisIsNotDefined; &amp;hi?;</p>
-````````````````````````````````
-
-
-Although HTML5 does accept some entity references
-without a trailing semicolon (such as `&copy`), these are not
-recognized here, because it makes the grammar too ambiguous:
-
-```````````````````````````````` example
-&copy
-.
-<p>&amp;copy</p>
-````````````````````````````````
-
-
-Strings that are not on the list of HTML5 named entities are not
-recognized as entity references either:
-
-```````````````````````````````` example
-&MadeUpEntity;
-.
-<p>&amp;MadeUpEntity;</p>
-````````````````````````````````
-
-
-Entity and numeric character references are recognized in any
-context besides code spans or code blocks, including
-URLs, [link titles], and [fenced code block][] [info strings]:
-
-```````````````````````````````` example
-<a href="&ouml;&ouml;.html">
-.
-<a href="&ouml;&ouml;.html">
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo](/f&ouml;&ouml; "f&ouml;&ouml;")
-.
-<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo]
-
-[foo]: /f&ouml;&ouml; "f&ouml;&ouml;"
-.
-<p><a href="/f%C3%B6%C3%B6" title="föö">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-``` f&ouml;&ouml;
-foo
-```
-.
-<pre><code class="language-föö">foo
-</code></pre>
-````````````````````````````````
-
-
-Entity and numeric character references are treated as literal
-text in code spans and code blocks:
-
-```````````````````````````````` example
-`f&ouml;&ouml;`
-.
-<p><code>f&amp;ouml;&amp;ouml;</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-    f&ouml;f&ouml;
-.
-<pre><code>f&amp;ouml;f&amp;ouml;
-</code></pre>
-````````````````````````````````
-
-
-## Code spans
-
-A [backtick string](@)
-is a string of one or more backtick characters (`` ` ``) that is neither
-preceded nor followed by a backtick.
-
-A [code span](@) begins with a backtick string and ends with
-a backtick string of equal length.  The contents of the code span are
-the characters between the two backtick strings, normalized in the
-following ways:
-
-- First, [line endings] are converted to [spaces].
-- If the resulting string both begins *and* ends with a [space]
-  character, a single [space] character is removed from the
-  front and back.  This allows you to include code that begins
-  or ends with backtick characters, which must be separated by
-  whitespace from the opening or closing backtick strings.
-
-This is a simple code span:
-
-```````````````````````````````` example
-`foo`
-.
-<p><code>foo</code></p>
-````````````````````````````````
-
-
-Here two backticks are used, because the code contains a backtick.
-This example also illustrates stripping of a single leading and
-trailing space:
-
-```````````````````````````````` example
-`` foo ` bar ``
-.
-<p><code>foo ` bar</code></p>
-````````````````````````````````
-
-
-This example shows the motivation for stripping leading and trailing
-spaces:
-
-```````````````````````````````` example
-` `` `
-.
-<p><code>``</code></p>
-````````````````````````````````
-
-Note that only *one* space is stripped:
-
-```````````````````````````````` example
-`  ``  `
-.
-<p><code> `` </code></p>
-````````````````````````````````
-
-The stripping only happens if the space is on both
-sides of the string:
-
-```````````````````````````````` example
-` a`
-.
-<p><code> a</code></p>
-````````````````````````````````
-
-Only [spaces], and not [unicode whitespace] in general, are
-stripped in this way:
-
-```````````````````````````````` example
-` b `
-.
-<p><code> b </code></p>
-````````````````````````````````
-
-
-[Line endings] are treated like spaces:
-
-```````````````````````````````` example
-``
-foo
-bar  
-baz
-``
-.
-<p><code>foo bar   baz</code></p>
-````````````````````````````````
-
-```````````````````````````````` example
-``
-foo 
-``
-.
-<p><code>foo </code></p>
-````````````````````````````````
-
-
-Interior spaces are not collapsed:
-
-```````````````````````````````` example
-`foo   bar 
-baz`
-.
-<p><code>foo   bar  baz</code></p>
-````````````````````````````````
-
-Note that browsers will typically collapse consecutive spaces
-when rendering `<code>` elements, so it is recommended that
-the following CSS be used:
-
-    code{white-space: pre-wrap;}
-
-
-Note that backslash escapes do not work in code spans. All backslashes
-are treated literally:
-
-```````````````````````````````` example
-`foo\`bar`
-.
-<p><code>foo\</code>bar`</p>
-````````````````````````````````
-
-
-Backslash escapes are never needed, because one can always choose a
-string of *n* backtick characters as delimiters, where the code does
-not contain any strings of exactly *n* backtick characters.
-
-```````````````````````````````` example
-``foo`bar``
-.
-<p><code>foo`bar</code></p>
-````````````````````````````````
-
-```````````````````````````````` example
-` foo `` bar `
-.
-<p><code>foo `` bar</code></p>
-````````````````````````````````
-
-
-Code span backticks have higher precedence than any other inline
-constructs except HTML tags and autolinks.  Thus, for example, this is
-not parsed as emphasized text, since the second `*` is part of a code
-span:
-
-```````````````````````````````` example
-*foo`*`
-.
-<p>*foo<code>*</code></p>
-````````````````````````````````
-
-
-And this is not parsed as a link:
-
-```````````````````````````````` example
-[not a `link](/foo`)
-.
-<p>[not a <code>link](/foo</code>)</p>
-````````````````````````````````
-
-
-Code spans, HTML tags, and autolinks have the same precedence.
-Thus, this is code:
-
-```````````````````````````````` example
-`<a href="`">`
-.
-<p><code>&lt;a href=&quot;</code>&quot;&gt;`</p>
-````````````````````````````````
-
-
-But this is an HTML tag:
-
-```````````````````````````````` example
-<a href="`">`
-.
-<p><a href="`">`</p>
-````````````````````````````````
-
-
-And this is code:
-
-```````````````````````````````` example
-`<http://foo.bar.`baz>`
-.
-<p><code>&lt;http://foo.bar.</code>baz&gt;`</p>
-````````````````````````````````
-
-
-But this is an autolink:
-
-```````````````````````````````` example
-<http://foo.bar.`baz>`
-.
-<p><a href="http://foo.bar.%60baz">http://foo.bar.`baz</a>`</p>
-````````````````````````````````
-
-
-When a backtick string is not closed by a matching backtick string,
-we just have literal backticks:
-
-```````````````````````````````` example
-```foo``
-.
-<p>```foo``</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-`foo
-.
-<p>`foo</p>
-````````````````````````````````
-
-The following case also illustrates the need for opening and
-closing backtick strings to be equal in length:
-
-```````````````````````````````` example
-`foo``bar``
-.
-<p>`foo<code>bar</code></p>
-````````````````````````````````
-
-
-## Emphasis and strong emphasis
-
-John Gruber's original [Markdown syntax
-description](http://daringfireball.net/projects/markdown/syntax#em) says:
-
-> Markdown treats asterisks (`*`) and underscores (`_`) as indicators of
-> emphasis. Text wrapped with one `*` or `_` will be wrapped with an HTML
-> `<em>` tag; double `*`'s or `_`'s will be wrapped with an HTML `<strong>`
-> tag.
-
-This is enough for most users, but these rules leave much undecided,
-especially when it comes to nested emphasis.  The original
-`Markdown.pl` test suite makes it clear that triple `***` and
-`___` delimiters can be used for strong emphasis, and most
-implementations have also allowed the following patterns:
-
-``` markdown
-***strong emph***
-***strong** in emph*
-***emph* in strong**
-**in strong *emph***
-*in emph **strong***
-```
-
-The following patterns are less widely supported, but the intent
-is clear and they are useful (especially in contexts like bibliography
-entries):
-
-``` markdown
-*emph *with emph* in it*
-**strong **with strong** in it**
-```
-
-Many implementations have also restricted intraword emphasis to
-the `*` forms, to avoid unwanted emphasis in words containing
-internal underscores.  (It is best practice to put these in code
-spans, but users often do not.)
-
-``` markdown
-internal emphasis: foo*bar*baz
-no emphasis: foo_bar_baz
-```
-
-The rules given below capture all of these patterns, while allowing
-for efficient parsing strategies that do not backtrack.
-
-First, some definitions.  A [delimiter run](@) is either
-a sequence of one or more `*` characters that is not preceded or
-followed by a non-backslash-escaped `*` character, or a sequence
-of one or more `_` characters that is not preceded or followed by
-a non-backslash-escaped `_` character.
-
-A [left-flanking delimiter run](@) is
-a [delimiter run] that is (1) not followed by [Unicode whitespace],
-and either (2a) not followed by a [punctuation character], or
-(2b) followed by a [punctuation character] and
-preceded by [Unicode whitespace] or a [punctuation character].
-For purposes of this definition, the beginning and the end of
-the line count as Unicode whitespace.
-
-A [right-flanking delimiter run](@) is
-a [delimiter run] that is (1) not preceded by [Unicode whitespace],
-and either (2a) not preceded by a [punctuation character], or
-(2b) preceded by a [punctuation character] and
-followed by [Unicode whitespace] or a [punctuation character].
-For purposes of this definition, the beginning and the end of
-the line count as Unicode whitespace.
-
-Here are some examples of delimiter runs.
-
-  - left-flanking but not right-flanking:
-
-    ```
-    ***abc
-      _abc
-    **"abc"
-     _"abc"
-    ```
-
-  - right-flanking but not left-flanking:
-
-    ```
-     abc***
-     abc_
-    "abc"**
-    "abc"_
-    ```
-
-  - Both left and right-flanking:
-
-    ```
-     abc***def
-    "abc"_"def"
-    ```
-
-  - Neither left nor right-flanking:
-
-    ```
-    abc *** def
-    a _ b
-    ```
-
-(The idea of distinguishing left-flanking and right-flanking
-delimiter runs based on the character before and the character
-after comes from Roopesh Chander's
-[vfmd](http://www.vfmd.org/vfmd-spec/specification/#procedure-for-identifying-emphasis-tags).
-vfmd uses the terminology "emphasis indicator string" instead of "delimiter
-run," and its rules for distinguishing left- and right-flanking runs
-are a bit more complex than the ones given here.)
-
-The following rules define emphasis and strong emphasis:
-
-1.  A single `*` character [can open emphasis](@)
-    iff (if and only if) it is part of a [left-flanking delimiter run].
-
-2.  A single `_` character [can open emphasis] iff
-    it is part of a [left-flanking delimiter run]
-    and either (a) not part of a [right-flanking delimiter run]
-    or (b) part of a [right-flanking delimiter run]
-    preceded by punctuation.
-
-3.  A single `*` character [can close emphasis](@)
-    iff it is part of a [right-flanking delimiter run].
-
-4.  A single `_` character [can close emphasis] iff
-    it is part of a [right-flanking delimiter run]
-    and either (a) not part of a [left-flanking delimiter run]
-    or (b) part of a [left-flanking delimiter run]
-    followed by punctuation.
-
-5.  A double `**` [can open strong emphasis](@)
-    iff it is part of a [left-flanking delimiter run].
-
-6.  A double `__` [can open strong emphasis] iff
-    it is part of a [left-flanking delimiter run]
-    and either (a) not part of a [right-flanking delimiter run]
-    or (b) part of a [right-flanking delimiter run]
-    preceded by punctuation.
-
-7.  A double `**` [can close strong emphasis](@)
-    iff it is part of a [right-flanking delimiter run].
-
-8.  A double `__` [can close strong emphasis] iff
-    it is part of a [right-flanking delimiter run]
-    and either (a) not part of a [left-flanking delimiter run]
-    or (b) part of a [left-flanking delimiter run]
-    followed by punctuation.
-
-9.  Emphasis begins with a delimiter that [can open emphasis] and ends
-    with a delimiter that [can close emphasis], and that uses the same
-    character (`_` or `*`) as the opening delimiter.  The
-    opening and closing delimiters must belong to separate
-    [delimiter runs].  If one of the delimiters can both
-    open and close emphasis, then the sum of the lengths of the
-    delimiter runs containing the opening and closing delimiters
-    must not be a multiple of 3.
-
-10. Strong emphasis begins with a delimiter that
-    [can open strong emphasis] and ends with a delimiter that
-    [can close strong emphasis], and that uses the same character
-    (`_` or `*`) as the opening delimiter.  The
-    opening and closing delimiters must belong to separate
-    [delimiter runs].  If one of the delimiters can both open
-    and close strong emphasis, then the sum of the lengths of
-    the delimiter runs containing the opening and closing
-    delimiters must not be a multiple of 3.
-
-11. A literal `*` character cannot occur at the beginning or end of
-    `*`-delimited emphasis or `**`-delimited strong emphasis, unless it
-    is backslash-escaped.
-
-12. A literal `_` character cannot occur at the beginning or end of
-    `_`-delimited emphasis or `__`-delimited strong emphasis, unless it
-    is backslash-escaped.
-
-Where rules 1--12 above are compatible with multiple parsings,
-the following principles resolve ambiguity:
-
-13. The number of nestings should be minimized. Thus, for example,
-    an interpretation `<strong>...</strong>` is always preferred to
-    `<em><em>...</em></em>`.
-
-14. An interpretation `<em><strong>...</strong></em>` is always
-    preferred to `<strong><em>...</em></strong>`.
-
-15. When two potential emphasis or strong emphasis spans overlap,
-    so that the second begins before the first ends and ends after
-    the first ends, the first takes precedence. Thus, for example,
-    `*foo _bar* baz_` is parsed as `<em>foo _bar</em> baz_` rather
-    than `*foo <em>bar* baz</em>`.
-
-16. When there are two potential emphasis or strong emphasis spans
-    with the same closing delimiter, the shorter one (the one that
-    opens later) takes precedence. Thus, for example,
-    `**foo **bar baz**` is parsed as `**foo <strong>bar baz</strong>`
-    rather than `<strong>foo **bar baz</strong>`.
-
-17. Inline code spans, links, images, and HTML tags group more tightly
-    than emphasis.  So, when there is a choice between an interpretation
-    that contains one of these elements and one that does not, the
-    former always wins.  Thus, for example, `*[foo*](bar)` is
-    parsed as `*<a href="bar">foo*</a>` rather than as
-    `<em>[foo</em>](bar)`.
-
-These rules can be illustrated through a series of examples.
-
-Rule 1:
-
-```````````````````````````````` example
-*foo bar*
-.
-<p><em>foo bar</em></p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `*` is followed by
-whitespace, and hence not part of a [left-flanking delimiter run]:
-
-```````````````````````````````` example
-a * foo bar*
-.
-<p>a * foo bar*</p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `*` is preceded
-by an alphanumeric and followed by punctuation, and hence
-not part of a [left-flanking delimiter run]:
-
-```````````````````````````````` example
-a*"foo"*
-.
-<p>a*&quot;foo&quot;*</p>
-````````````````````````````````
-
-
-Unicode nonbreaking spaces count as whitespace, too:
-
-```````````````````````````````` example
-* a *
-.
-<p>* a *</p>
-````````````````````````````````
-
-
-Intraword emphasis with `*` is permitted:
-
-```````````````````````````````` example
-foo*bar*
-.
-<p>foo<em>bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-5*6*78
-.
-<p>5<em>6</em>78</p>
-````````````````````````````````
-
-
-Rule 2:
-
-```````````````````````````````` example
-_foo bar_
-.
-<p><em>foo bar</em></p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `_` is followed by
-whitespace:
-
-```````````````````````````````` example
-_ foo bar_
-.
-<p>_ foo bar_</p>
-````````````````````````````````
-
-
-This is not emphasis, because the opening `_` is preceded
-by an alphanumeric and followed by punctuation:
-
-```````````````````````````````` example
-a_"foo"_
-.
-<p>a_&quot;foo&quot;_</p>
-````````````````````````````````
-
-
-Emphasis with `_` is not allowed inside words:
-
-```````````````````````````````` example
-foo_bar_
-.
-<p>foo_bar_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-5_6_78
-.
-<p>5_6_78</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-пристаням_стремятся_
-.
-<p>пристаням_стремятся_</p>
-````````````````````````````````
-
-
-Here `_` does not generate emphasis, because the first delimiter run
-is right-flanking and the second left-flanking:
-
-```````````````````````````````` example
-aa_"bb"_cc
-.
-<p>aa_&quot;bb&quot;_cc</p>
-````````````````````````````````
-
-
-This is emphasis, even though the opening delimiter is
-both left- and right-flanking, because it is preceded by
-punctuation:
-
-```````````````````````````````` example
-foo-_(bar)_
-.
-<p>foo-<em>(bar)</em></p>
-````````````````````````````````
-
-
-Rule 3:
-
-This is not emphasis, because the closing delimiter does
-not match the opening delimiter:
-
-```````````````````````````````` example
-_foo*
-.
-<p>_foo*</p>
-````````````````````````````````
-
-
-This is not emphasis, because the closing `*` is preceded by
-whitespace:
-
-```````````````````````````````` example
-*foo bar *
-.
-<p>*foo bar *</p>
-````````````````````````````````
-
-
-A newline also counts as whitespace:
-
-```````````````````````````````` example
-*foo bar
-*
-.
-<p>*foo bar
-*</p>
-````````````````````````````````
-
-
-This is not emphasis, because the second `*` is
-preceded by punctuation and followed by an alphanumeric
-(hence it is not part of a [right-flanking delimiter run]:
-
-```````````````````````````````` example
-*(*foo)
-.
-<p>*(*foo)</p>
-````````````````````````````````
-
-
-The point of this restriction is more easily appreciated
-with this example:
-
-```````````````````````````````` example
-*(*foo*)*
-.
-<p><em>(<em>foo</em>)</em></p>
-````````````````````````````````
-
-
-Intraword emphasis with `*` is allowed:
-
-```````````````````````````````` example
-*foo*bar
-.
-<p><em>foo</em>bar</p>
-````````````````````````````````
-
-
-
-Rule 4:
-
-This is not emphasis, because the closing `_` is preceded by
-whitespace:
-
-```````````````````````````````` example
-_foo bar _
-.
-<p>_foo bar _</p>
-````````````````````````````````
-
-
-This is not emphasis, because the second `_` is
-preceded by punctuation and followed by an alphanumeric:
-
-```````````````````````````````` example
-_(_foo)
-.
-<p>_(_foo)</p>
-````````````````````````````````
-
-
-This is emphasis within emphasis:
-
-```````````````````````````````` example
-_(_foo_)_
-.
-<p><em>(<em>foo</em>)</em></p>
-````````````````````````````````
-
-
-Intraword emphasis is disallowed for `_`:
-
-```````````````````````````````` example
-_foo_bar
-.
-<p>_foo_bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_пристаням_стремятся
-.
-<p>_пристаням_стремятся</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo_bar_baz_
-.
-<p><em>foo_bar_baz</em></p>
-````````````````````````````````
-
-
-This is emphasis, even though the closing delimiter is
-both left- and right-flanking, because it is followed by
-punctuation:
-
-```````````````````````````````` example
-_(bar)_.
-.
-<p><em>(bar)</em>.</p>
-````````````````````````````````
-
-
-Rule 5:
-
-```````````````````````````````` example
-**foo bar**
-.
-<p><strong>foo bar</strong></p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening delimiter is
-followed by whitespace:
-
-```````````````````````````````` example
-** foo bar**
-.
-<p>** foo bar**</p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening `**` is preceded
-by an alphanumeric and followed by punctuation, and hence
-not part of a [left-flanking delimiter run]:
-
-```````````````````````````````` example
-a**"foo"**
-.
-<p>a**&quot;foo&quot;**</p>
-````````````````````````````````
-
-
-Intraword strong emphasis with `**` is permitted:
-
-```````````````````````````````` example
-foo**bar**
-.
-<p>foo<strong>bar</strong></p>
-````````````````````````````````
-
-
-Rule 6:
-
-```````````````````````````````` example
-__foo bar__
-.
-<p><strong>foo bar</strong></p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening delimiter is
-followed by whitespace:
-
-```````````````````````````````` example
-__ foo bar__
-.
-<p>__ foo bar__</p>
-````````````````````````````````
-
-
-A newline counts as whitespace:
-```````````````````````````````` example
-__
-foo bar__
-.
-<p>__
-foo bar__</p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the opening `__` is preceded
-by an alphanumeric and followed by punctuation:
-
-```````````````````````````````` example
-a__"foo"__
-.
-<p>a__&quot;foo&quot;__</p>
-````````````````````````````````
-
-
-Intraword strong emphasis is forbidden with `__`:
-
-```````````````````````````````` example
-foo__bar__
-.
-<p>foo__bar__</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-5__6__78
-.
-<p>5__6__78</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-пристаням__стремятся__
-.
-<p>пристаням__стремятся__</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo, __bar__, baz__
-.
-<p><strong>foo, <strong>bar</strong>, baz</strong></p>
-````````````````````````````````
-
-
-This is strong emphasis, even though the opening delimiter is
-both left- and right-flanking, because it is preceded by
-punctuation:
-
-```````````````````````````````` example
-foo-__(bar)__
-.
-<p>foo-<strong>(bar)</strong></p>
-````````````````````````````````
-
-
-
-Rule 7:
-
-This is not strong emphasis, because the closing delimiter is preceded
-by whitespace:
-
-```````````````````````````````` example
-**foo bar **
-.
-<p>**foo bar **</p>
-````````````````````````````````
-
-
-(Nor can it be interpreted as an emphasized `*foo bar *`, because of
-Rule 11.)
-
-This is not strong emphasis, because the second `**` is
-preceded by punctuation and followed by an alphanumeric:
-
-```````````````````````````````` example
-**(**foo)
-.
-<p>**(**foo)</p>
-````````````````````````````````
-
-
-The point of this restriction is more easily appreciated
-with these examples:
-
-```````````````````````````````` example
-*(**foo**)*
-.
-<p><em>(<strong>foo</strong>)</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**Gomphocarpus (*Gomphocarpus physocarpus*, syn.
-*Asclepias physocarpa*)**
-.
-<p><strong>Gomphocarpus (<em>Gomphocarpus physocarpus</em>, syn.
-<em>Asclepias physocarpa</em>)</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo "*bar*" foo**
-.
-<p><strong>foo &quot;<em>bar</em>&quot; foo</strong></p>
-````````````````````````````````
-
-
-Intraword emphasis:
-
-```````````````````````````````` example
-**foo**bar
-.
-<p><strong>foo</strong>bar</p>
-````````````````````````````````
-
-
-Rule 8:
-
-This is not strong emphasis, because the closing delimiter is
-preceded by whitespace:
-
-```````````````````````````````` example
-__foo bar __
-.
-<p>__foo bar __</p>
-````````````````````````````````
-
-
-This is not strong emphasis, because the second `__` is
-preceded by punctuation and followed by an alphanumeric:
-
-```````````````````````````````` example
-__(__foo)
-.
-<p>__(__foo)</p>
-````````````````````````````````
-
-
-The point of this restriction is more easily appreciated
-with this example:
-
-```````````````````````````````` example
-_(__foo__)_
-.
-<p><em>(<strong>foo</strong>)</em></p>
-````````````````````````````````
-
-
-Intraword strong emphasis is forbidden with `__`:
-
-```````````````````````````````` example
-__foo__bar
-.
-<p>__foo__bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__пристаням__стремятся
-.
-<p>__пристаням__стремятся</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo__bar__baz__
-.
-<p><strong>foo__bar__baz</strong></p>
-````````````````````````````````
-
-
-This is strong emphasis, even though the closing delimiter is
-both left- and right-flanking, because it is followed by
-punctuation:
-
-```````````````````````````````` example
-__(bar)__.
-.
-<p><strong>(bar)</strong>.</p>
-````````````````````````````````
-
-
-Rule 9:
-
-Any nonempty sequence of inline elements can be the contents of an
-emphasized span.
-
-```````````````````````````````` example
-*foo [bar](/url)*
-.
-<p><em>foo <a href="/url">bar</a></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo
-bar*
-.
-<p><em>foo
-bar</em></p>
-````````````````````````````````
-
-
-In particular, emphasis and strong emphasis can be nested
-inside emphasis:
-
-```````````````````````````````` example
-_foo __bar__ baz_
-.
-<p><em>foo <strong>bar</strong> baz</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo _bar_ baz_
-.
-<p><em>foo <em>bar</em> baz</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo_ bar_
-.
-<p><em><em>foo</em> bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo *bar**
-.
-<p><em>foo <em>bar</em></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo **bar** baz*
-.
-<p><em>foo <strong>bar</strong> baz</em></p>
-````````````````````````````````
-
-```````````````````````````````` example
-*foo**bar**baz*
-.
-<p><em>foo<strong>bar</strong>baz</em></p>
-````````````````````````````````
-
-Note that in the preceding case, the interpretation
-
-``` markdown
-<p><em>foo</em><em>bar<em></em>baz</em></p>
-```
-
-
-is precluded by the condition that a delimiter that
-can both open and close (like the `*` after `foo`)
-cannot form emphasis if the sum of the lengths of
-the delimiter runs containing the opening and
-closing delimiters is a multiple of 3.
-
-
-For the same reason, we don't get two consecutive
-emphasis sections in this example:
-
-```````````````````````````````` example
-*foo**bar*
-.
-<p><em>foo**bar</em></p>
-````````````````````````````````
-
-
-The same condition ensures that the following
-cases are all strong emphasis nested inside
-emphasis, even when the interior spaces are
-omitted:
-
-
-```````````````````````````````` example
-***foo** bar*
-.
-<p><em><strong>foo</strong> bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo **bar***
-.
-<p><em>foo <strong>bar</strong></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo**bar***
-.
-<p><em>foo<strong>bar</strong></em></p>
-````````````````````````````````
-
-
-Indefinite levels of nesting are possible:
-
-```````````````````````````````` example
-*foo **bar *baz* bim** bop*
-.
-<p><em>foo <strong>bar <em>baz</em> bim</strong> bop</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo [*bar*](/url)*
-.
-<p><em>foo <a href="/url"><em>bar</em></a></em></p>
-````````````````````````````````
-
-
-There can be no empty emphasis or strong emphasis:
-
-```````````````````````````````` example
-** is not an empty emphasis
-.
-<p>** is not an empty emphasis</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**** is not an empty strong emphasis
-.
-<p>**** is not an empty strong emphasis</p>
-````````````````````````````````
-
-
-
-Rule 10:
-
-Any nonempty sequence of inline elements can be the contents of an
-strongly emphasized span.
-
-```````````````````````````````` example
-**foo [bar](/url)**
-.
-<p><strong>foo <a href="/url">bar</a></strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo
-bar**
-.
-<p><strong>foo
-bar</strong></p>
-````````````````````````````````
-
-
-In particular, emphasis and strong emphasis can be nested
-inside strong emphasis:
-
-```````````````````````````````` example
-__foo _bar_ baz__
-.
-<p><strong>foo <em>bar</em> baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo __bar__ baz__
-.
-<p><strong>foo <strong>bar</strong> baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____foo__ bar__
-.
-<p><strong><strong>foo</strong> bar</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo **bar****
-.
-<p><strong>foo <strong>bar</strong></strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo *bar* baz**
-.
-<p><strong>foo <em>bar</em> baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo*bar*baz**
-.
-<p><strong>foo<em>bar</em>baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-***foo* bar**
-.
-<p><strong><em>foo</em> bar</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo *bar***
-.
-<p><strong>foo <em>bar</em></strong></p>
-````````````````````````````````
-
-
-Indefinite levels of nesting are possible:
-
-```````````````````````````````` example
-**foo *bar **baz**
-bim* bop**
-.
-<p><strong>foo <em>bar <strong>baz</strong>
-bim</em> bop</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo [*bar*](/url)**
-.
-<p><strong>foo <a href="/url"><em>bar</em></a></strong></p>
-````````````````````````````````
-
-
-There can be no empty emphasis or strong emphasis:
-
-```````````````````````````````` example
-__ is not an empty emphasis
-.
-<p>__ is not an empty emphasis</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____ is not an empty strong emphasis
-.
-<p>____ is not an empty strong emphasis</p>
-````````````````````````````````
-
-
-
-Rule 11:
-
-```````````````````````````````` example
-foo ***
-.
-<p>foo ***</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo *\**
-.
-<p>foo <em>*</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo *_*
-.
-<p>foo <em>_</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo *****
-.
-<p>foo *****</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo **\***
-.
-<p>foo <strong>*</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo **_**
-.
-<p>foo <strong>_</strong></p>
-````````````````````````````````
-
-
-Note that when delimiters do not match evenly, Rule 11 determines
-that the excess literal `*` characters will appear outside of the
-emphasis, rather than inside it:
-
-```````````````````````````````` example
-**foo*
-.
-<p>*<em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo**
-.
-<p><em>foo</em>*</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-***foo**
-.
-<p>*<strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-****foo*
-.
-<p>***<em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**foo***
-.
-<p><strong>foo</strong>*</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo****
-.
-<p><em>foo</em>***</p>
-````````````````````````````````
-
-
-
-Rule 12:
-
-```````````````````````````````` example
-foo ___
-.
-<p>foo ___</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo _\__
-.
-<p>foo <em>_</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo _*_
-.
-<p>foo <em>*</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo _____
-.
-<p>foo _____</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo __\___
-.
-<p>foo <strong>_</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo __*__
-.
-<p>foo <strong>*</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo_
-.
-<p>_<em>foo</em></p>
-````````````````````````````````
-
-
-Note that when delimiters do not match evenly, Rule 12 determines
-that the excess literal `_` characters will appear outside of the
-emphasis, rather than inside it:
-
-```````````````````````````````` example
-_foo__
-.
-<p><em>foo</em>_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-___foo__
-.
-<p>_<strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____foo_
-.
-<p>___<em>foo</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo___
-.
-<p><strong>foo</strong>_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo____
-.
-<p><em>foo</em>___</p>
-````````````````````````````````
-
-
-Rule 13 implies that if you want emphasis nested directly inside
-emphasis, you must use different delimiters:
-
-```````````````````````````````` example
-**foo**
-.
-<p><strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*_foo_*
-.
-<p><em><em>foo</em></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__foo__
-.
-<p><strong>foo</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_*foo*_
-.
-<p><em><em>foo</em></em></p>
-````````````````````````````````
-
-
-However, strong emphasis within strong emphasis is possible without
-switching delimiters:
-
-```````````````````````````````` example
-****foo****
-.
-<p><strong><strong>foo</strong></strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-____foo____
-.
-<p><strong><strong>foo</strong></strong></p>
-````````````````````````````````
-
-
-
-Rule 13 can be applied to arbitrarily long sequences of
-delimiters:
-
-```````````````````````````````` example
-******foo******
-.
-<p><strong><strong><strong>foo</strong></strong></strong></p>
-````````````````````````````````
-
-
-Rule 14:
-
-```````````````````````````````` example
-***foo***
-.
-<p><em><strong>foo</strong></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_____foo_____
-.
-<p><em><strong><strong>foo</strong></strong></em></p>
-````````````````````````````````
-
-
-Rule 15:
-
-```````````````````````````````` example
-*foo _bar* baz_
-.
-<p><em>foo _bar</em> baz_</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo __bar *baz bim__ bam*
-.
-<p><em>foo <strong>bar *baz bim</strong> bam</em></p>
-````````````````````````````````
-
-
-Rule 16:
-
-```````````````````````````````` example
-**foo **bar baz**
-.
-<p>**foo <strong>bar baz</strong></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo *bar baz*
-.
-<p>*foo <em>bar baz</em></p>
-````````````````````````````````
-
-
-Rule 17:
-
-```````````````````````````````` example
-*[bar*](/url)
-.
-<p>*<a href="/url">bar*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_foo [bar_](/url)
-.
-<p>_foo <a href="/url">bar_</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*<img src="foo" title="*"/>
-.
-<p>*<img src="foo" title="*"/></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**<a href="**">
-.
-<p>**<a href="**"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__<a href="__">
-.
-<p>__<a href="__"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*a `*`*
-.
-<p><em>a <code>*</code></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-_a `_`_
-.
-<p><em>a <code>_</code></em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-**a<http://foo.bar/?q=**>
-.
-<p>**a<a href="http://foo.bar/?q=**">http://foo.bar/?q=**</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-__a<http://foo.bar/?q=__>
-.
-<p>__a<a href="http://foo.bar/?q=__">http://foo.bar/?q=__</a></p>
-````````````````````````````````
-
-
-<div class="extension">
-
-## Strikethrough (extension)
-
-GFM enables the `strikethrough` extension, where an additional emphasis type is
-available.
-
-Strikethrough text is any text wrapped in two tildes (`~`).
-
-```````````````````````````````` example strikethrough
-~~Hi~~ Hello, world!
-.
-<p><del>Hi</del> Hello, world!</p>
-````````````````````````````````
-
-As with regular emphasis delimiters, a new paragraph will cause strikethrough
-parsing to cease:
-
-```````````````````````````````` example strikethrough
-This ~~has a
-
-new paragraph~~.
-.
-<p>This ~~has a</p>
-<p>new paragraph~~.</p>
-````````````````````````````````
-
-</div>
-
-## Links
-
-A link contains [link text] (the visible text), a [link destination]
-(the URI that is the link destination), and optionally a [link title].
-There are two basic kinds of links in Markdown.  In [inline links] the
-destination and title are given immediately after the link text.  In
-[reference links] the destination and title are defined elsewhere in
-the document.
-
-A [link text](@) consists of a sequence of zero or more
-inline elements enclosed by square brackets (`[` and `]`).  The
-following rules apply:
-
-- Links may not contain other links, at any level of nesting. If
-  multiple otherwise valid link definitions appear nested inside each
-  other, the inner-most definition is used.
-
-- Brackets are allowed in the [link text] only if (a) they
-  are backslash-escaped or (b) they appear as a matched pair of brackets,
-  with an open bracket `[`, a sequence of zero or more inlines, and
-  a close bracket `]`.
-
-- Backtick [code spans], [autolinks], and raw [HTML tags] bind more tightly
-  than the brackets in link text.  Thus, for example,
-  `` [foo`]` `` could not be a link text, since the second `]`
-  is part of a code span.
-
-- The brackets in link text bind more tightly than markers for
-  [emphasis and strong emphasis]. Thus, for example, `*[foo*](url)` is a link.
-
-A [link destination](@) consists of either
-
-- a sequence of zero or more characters between an opening `<` and a
-  closing `>` that contains no line breaks or unescaped
-  `<` or `>` characters, or
-
-- a nonempty sequence of characters that does not include
-  ASCII space or control characters, and includes parentheses
-  only if (a) they are backslash-escaped or (b) they are part of
-  a balanced pair of unescaped parentheses.  (Implementations
-  may impose limits on parentheses nesting to avoid performance
-  issues, but at least three levels of nesting should be supported.)
-
-A [link title](@)  consists of either
-
-- a sequence of zero or more characters between straight double-quote
-  characters (`"`), including a `"` character only if it is
-  backslash-escaped, or
-
-- a sequence of zero or more characters between straight single-quote
-  characters (`'`), including a `'` character only if it is
-  backslash-escaped, or
-
-- a sequence of zero or more characters between matching parentheses
-  (`(...)`), including a `)` character only if it is backslash-escaped.
-
-Although [link titles] may span multiple lines, they may not contain
-a [blank line].
-
-An [inline link](@) consists of a [link text] followed immediately
-by a left parenthesis `(`, optional [whitespace], an optional
-[link destination], an optional [link title] separated from the link
-destination by [whitespace], optional [whitespace], and a right
-parenthesis `)`. The link's text consists of the inlines contained
-in the [link text] (excluding the enclosing square brackets).
-The link's URI consists of the link destination, excluding enclosing
-`<...>` if present, with backslash-escapes in effect as described
-above.  The link's title consists of the link title, excluding its
-enclosing delimiters, with backslash-escapes in effect as described
-above.
-
-Here is a simple inline link:
-
-```````````````````````````````` example
-[link](/uri "title")
-.
-<p><a href="/uri" title="title">link</a></p>
-````````````````````````````````
-
-
-The title may be omitted:
-
-```````````````````````````````` example
-[link](/uri)
-.
-<p><a href="/uri">link</a></p>
-````````````````````````````````
-
-
-Both the title and the destination may be omitted:
-
-```````````````````````````````` example
-[link]()
-.
-<p><a href="">link</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link](<>)
-.
-<p><a href="">link</a></p>
-````````````````````````````````
-
-The destination can only contain spaces if it is
-enclosed in pointy brackets:
-
-```````````````````````````````` example
-[link](/my uri)
-.
-<p>[link](/my uri)</p>
-````````````````````````````````
-
-```````````````````````````````` example
-[link](</my uri>)
-.
-<p><a href="/my%20uri">link</a></p>
-````````````````````````````````
-
-The destination cannot contain line breaks,
-even if enclosed in pointy brackets:
-
-```````````````````````````````` example
-[link](foo
-bar)
-.
-<p>[link](foo
-bar)</p>
-````````````````````````````````
-
-```````````````````````````````` example
-[link](<foo
-bar>)
-.
-<p>[link](<foo
-bar>)</p>
-````````````````````````````````
-
-Parentheses inside the link destination may be escaped:
-
-```````````````````````````````` example
-[link](\(foo\))
-.
-<p><a href="(foo)">link</a></p>
-````````````````````````````````
-
-Any number of parentheses are allowed without escaping, as long as they are
-balanced:
-
-```````````````````````````````` example
-[link](foo(and(bar)))
-.
-<p><a href="foo(and(bar))">link</a></p>
-````````````````````````````````
-
-However, if you have unbalanced parentheses, you need to escape or use the
-`<...>` form:
-
-```````````````````````````````` example
-[link](foo\(and\(bar\))
-.
-<p><a href="foo(and(bar)">link</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link](<foo(and(bar)>)
-.
-<p><a href="foo(and(bar)">link</a></p>
-````````````````````````````````
-
-
-Parentheses and other symbols can also be escaped, as usual
-in Markdown:
-
-```````````````````````````````` example
-[link](foo\)\:)
-.
-<p><a href="foo):">link</a></p>
-````````````````````````````````
-
-
-A link can contain fragment identifiers and queries:
-
-```````````````````````````````` example
-[link](#fragment)
-
-[link](http://example.com#fragment)
-
-[link](http://example.com?foo=3#frag)
-.
-<p><a href="#fragment">link</a></p>
-<p><a href="http://example.com#fragment">link</a></p>
-<p><a href="http://example.com?foo=3#frag">link</a></p>
-````````````````````````````````
-
-
-Note that a backslash before a non-escapable character is
-just a backslash:
-
-```````````````````````````````` example
-[link](foo\bar)
-.
-<p><a href="foo%5Cbar">link</a></p>
-````````````````````````````````
-
-
-URL-escaping should be left alone inside the destination, as all
-URL-escaped characters are also valid URL characters. Entity and
-numerical character references in the destination will be parsed
-into the corresponding Unicode code points, as usual.  These may
-be optionally URL-escaped when written as HTML, but this spec
-does not enforce any particular policy for rendering URLs in
-HTML or other formats.  Renderers may make different decisions
-about how to escape or normalize URLs in the output.
-
-```````````````````````````````` example
-[link](foo%20b&auml;)
-.
-<p><a href="foo%20b%C3%A4">link</a></p>
-````````````````````````````````
-
-
-Note that, because titles can often be parsed as destinations,
-if you try to omit the destination and keep the title, you'll
-get unexpected results:
-
-```````````````````````````````` example
-[link]("title")
-.
-<p><a href="%22title%22">link</a></p>
-````````````````````````````````
-
-
-Titles may be in single quotes, double quotes, or parentheses:
-
-```````````````````````````````` example
-[link](/url "title")
-[link](/url 'title')
-[link](/url (title))
-.
-<p><a href="/url" title="title">link</a>
-<a href="/url" title="title">link</a>
-<a href="/url" title="title">link</a></p>
-````````````````````````````````
-
-
-Backslash escapes and entity and numeric character references
-may be used in titles:
-
-```````````````````````````````` example
-[link](/url "title \"&quot;")
-.
-<p><a href="/url" title="title &quot;&quot;">link</a></p>
-````````````````````````````````
-
-
-Titles must be separated from the link using a [whitespace].
-Other [Unicode whitespace] like non-breaking space doesn't work.
-
-```````````````````````````````` example
-[link](/url "title")
-.
-<p><a href="/url%C2%A0%22title%22">link</a></p>
-````````````````````````````````
-
-
-Nested balanced quotes are not allowed without escaping:
-
-```````````````````````````````` example
-[link](/url "title "and" title")
-.
-<p>[link](/url &quot;title &quot;and&quot; title&quot;)</p>
-````````````````````````````````
-
-
-But it is easy to work around this by using a different quote type:
-
-```````````````````````````````` example
-[link](/url 'title "and" title')
-.
-<p><a href="/url" title="title &quot;and&quot; title">link</a></p>
-````````````````````````````````
-
-
-(Note:  `Markdown.pl` did allow double quotes inside a double-quoted
-title, and its test suite included a test demonstrating this.
-But it is hard to see a good rationale for the extra complexity this
-brings, since there are already many ways---backslash escaping,
-entity and numeric character references, or using a different
-quote type for the enclosing title---to write titles containing
-double quotes.  `Markdown.pl`'s handling of titles has a number
-of other strange features.  For example, it allows single-quoted
-titles in inline links, but not reference links.  And, in
-reference links but not inline links, it allows a title to begin
-with `"` and end with `)`.  `Markdown.pl` 1.0.1 even allows
-titles with no closing quotation mark, though 1.0.2b8 does not.
-It seems preferable to adopt a simple, rational rule that works
-the same way in inline links and link reference definitions.)
-
-[Whitespace] is allowed around the destination and title:
-
-```````````````````````````````` example
-[link](   /uri
-  "title"  )
-.
-<p><a href="/uri" title="title">link</a></p>
-````````````````````````````````
-
-
-But it is not allowed between the link text and the
-following parenthesis:
-
-```````````````````````````````` example
-[link] (/uri)
-.
-<p>[link] (/uri)</p>
-````````````````````````````````
-
-
-The link text may contain balanced brackets, but not unbalanced ones,
-unless they are escaped:
-
-```````````````````````````````` example
-[link [foo [bar]]](/uri)
-.
-<p><a href="/uri">link [foo [bar]]</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link] bar](/uri)
-.
-<p>[link] bar](/uri)</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link [bar](/uri)
-.
-<p>[link <a href="/uri">bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link \[bar](/uri)
-.
-<p><a href="/uri">link [bar</a></p>
-````````````````````````````````
-
-
-The link text may contain inline content:
-
-```````````````````````````````` example
-[link *foo **bar** `#`*](/uri)
-.
-<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[![moon](moon.jpg)](/uri)
-.
-<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
-````````````````````````````````
-
-
-However, links may not contain other links, at any level of nesting.
-
-```````````````````````````````` example
-[foo [bar](/uri)](/uri)
-.
-<p>[foo <a href="/uri">bar</a>](/uri)</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *[bar [baz](/uri)](/uri)*](/uri)
-.
-<p>[foo <em>[bar <a href="/uri">baz</a>](/uri)</em>](/uri)</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![[[foo](uri1)](uri2)](uri3)
-.
-<p><img src="uri3" alt="[foo](uri2)" /></p>
-````````````````````````````````
-
-
-These cases illustrate the precedence of link text grouping over
-emphasis grouping:
-
-```````````````````````````````` example
-*[foo*](/uri)
-.
-<p>*<a href="/uri">foo*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *bar](baz*)
-.
-<p><a href="baz*">foo *bar</a></p>
-````````````````````````````````
-
-
-Note that brackets that *aren't* part of links do not take
-precedence:
-
-```````````````````````````````` example
-*foo [bar* baz]
-.
-<p><em>foo [bar</em> baz]</p>
-````````````````````````````````
-
-
-These cases illustrate the precedence of HTML tags, code spans,
-and autolinks over link grouping:
-
-```````````````````````````````` example
-[foo <bar attr="](baz)">
-.
-<p>[foo <bar attr="](baz)"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo`](/uri)`
-.
-<p>[foo<code>](/uri)</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo<http://example.com/?search=](uri)>
-.
-<p>[foo<a href="http://example.com/?search=%5D(uri)">http://example.com/?search=](uri)</a></p>
-````````````````````````````````
-
-
-There are three kinds of [reference link](@)s:
-[full](#full-reference-link), [collapsed](#collapsed-reference-link),
-and [shortcut](#shortcut-reference-link).
-
-A [full reference link](@)
-consists of a [link text] immediately followed by a [link label]
-that [matches] a [link reference definition] elsewhere in the document.
-
-A [link label](@)  begins with a left bracket (`[`) and ends
-with the first right bracket (`]`) that is not backslash-escaped.
-Between these brackets there must be at least one [non-whitespace character].
-Unescaped square bracket characters are not allowed inside the
-opening and closing square brackets of [link labels].  A link
-label can have at most 999 characters inside the square
-brackets.
-
-One label [matches](@)
-another just in case their normalized forms are equal.  To normalize a
-label, strip off the opening and closing brackets,
-perform the *Unicode case fold*, strip leading and trailing
-[whitespace] and collapse consecutive internal
-[whitespace] to a single space.  If there are multiple
-matching reference link definitions, the one that comes first in the
-document is used.  (It is desirable in such cases to emit a warning.)
-
-The contents of the first link label are parsed as inlines, which are
-used as the link's text.  The link's URI and title are provided by the
-matching [link reference definition].
-
-Here is a simple example:
-
-```````````````````````````````` example
-[foo][bar]
-
-[bar]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-The rules for the [link text] are the same as with
-[inline links].  Thus:
-
-The link text may contain balanced brackets, but not unbalanced ones,
-unless they are escaped:
-
-```````````````````````````````` example
-[link [foo [bar]]][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">link [foo [bar]]</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[link \[bar][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">link [bar</a></p>
-````````````````````````````````
-
-
-The link text may contain inline content:
-
-```````````````````````````````` example
-[link *foo **bar** `#`*][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[![moon](moon.jpg)][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri"><img src="moon.jpg" alt="moon" /></a></p>
-````````````````````````````````
-
-
-However, links may not contain other links, at any level of nesting.
-
-```````````````````````````````` example
-[foo [bar](/uri)][ref]
-
-[ref]: /uri
-.
-<p>[foo <a href="/uri">bar</a>]<a href="/uri">ref</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *bar [baz][ref]*][ref]
-
-[ref]: /uri
-.
-<p>[foo <em>bar <a href="/uri">baz</a></em>]<a href="/uri">ref</a></p>
-````````````````````````````````
-
-
-(In the examples above, we have two [shortcut reference links]
-instead of one [full reference link].)
-
-The following cases illustrate the precedence of link text grouping over
-emphasis grouping:
-
-```````````````````````````````` example
-*[foo*][ref]
-
-[ref]: /uri
-.
-<p>*<a href="/uri">foo*</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo *bar][ref]
-
-[ref]: /uri
-.
-<p><a href="/uri">foo *bar</a></p>
-````````````````````````````````
-
-
-These cases illustrate the precedence of HTML tags, code spans,
-and autolinks over link grouping:
-
-```````````````````````````````` example
-[foo <bar attr="][ref]">
-
-[ref]: /uri
-.
-<p>[foo <bar attr="][ref]"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo`][ref]`
-
-[ref]: /uri
-.
-<p>[foo<code>][ref]</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo<http://example.com/?search=][ref]>
-
-[ref]: /uri
-.
-<p>[foo<a href="http://example.com/?search=%5D%5Bref%5D">http://example.com/?search=][ref]</a></p>
-````````````````````````````````
-
-
-Matching is case-insensitive:
-
-```````````````````````````````` example
-[foo][BaR]
-
-[bar]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-Unicode case fold is used:
-
-```````````````````````````````` example
-[Толпой][Толпой] is a Russian word.
-
-[ТОЛПОЙ]: /url
-.
-<p><a href="/url">Толпой</a> is a Russian word.</p>
-````````````````````````````````
-
-
-Consecutive internal [whitespace] is treated as one space for
-purposes of determining matching:
-
-```````````````````````````````` example
-[Foo
-  bar]: /url
-
-[Baz][Foo bar]
-.
-<p><a href="/url">Baz</a></p>
-````````````````````````````````
-
-
-No [whitespace] is allowed between the [link text] and the
-[link label]:
-
-```````````````````````````````` example
-[foo] [bar]
-
-[bar]: /url "title"
-.
-<p>[foo] <a href="/url" title="title">bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo]
-[bar]
-
-[bar]: /url "title"
-.
-<p>[foo]
-<a href="/url" title="title">bar</a></p>
-````````````````````````````````
-
-
-This is a departure from John Gruber's original Markdown syntax
-description, which explicitly allows whitespace between the link
-text and the link label.  It brings reference links in line with
-[inline links], which (according to both original Markdown and
-this spec) cannot have whitespace after the link text.  More
-importantly, it prevents inadvertent capture of consecutive
-[shortcut reference links]. If whitespace is allowed between the
-link text and the link label, then in the following we will have
-a single reference link, not two shortcut reference links, as
-intended:
-
-``` markdown
-[foo]
-[bar]
-
-[foo]: /url1
-[bar]: /url2
-```
-
-(Note that [shortcut reference links] were introduced by Gruber
-himself in a beta version of `Markdown.pl`, but never included
-in the official syntax description.  Without shortcut reference
-links, it is harmless to allow space between the link text and
-link label; but once shortcut references are introduced, it is
-too dangerous to allow this, as it frequently leads to
-unintended results.)
-
-When there are multiple matching [link reference definitions],
-the first is used:
-
-```````````````````````````````` example
-[foo]: /url1
-
-[foo]: /url2
-
-[bar][foo]
-.
-<p><a href="/url1">bar</a></p>
-````````````````````````````````
-
-
-Note that matching is performed on normalized strings, not parsed
-inline content.  So the following does not match, even though the
-labels define equivalent inline content:
-
-```````````````````````````````` example
-[bar][foo\!]
-
-[foo!]: /url
-.
-<p>[bar][foo!]</p>
-````````````````````````````````
-
-
-[Link labels] cannot contain brackets, unless they are
-backslash-escaped:
-
-```````````````````````````````` example
-[foo][ref[]
-
-[ref[]: /uri
-.
-<p>[foo][ref[]</p>
-<p>[ref[]: /uri</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo][ref[bar]]
-
-[ref[bar]]: /uri
-.
-<p>[foo][ref[bar]]</p>
-<p>[ref[bar]]: /uri</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[[[foo]]]
-
-[[[foo]]]: /url
-.
-<p>[[[foo]]]</p>
-<p>[[[foo]]]: /url</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[foo][ref\[]
-
-[ref\[]: /uri
-.
-<p><a href="/uri">foo</a></p>
-````````````````````````````````
-
-
-Note that in this example `]` is not backslash-escaped:
-
-```````````````````````````````` example
-[bar\\]: /uri
-
-[bar\\]
-.
-<p><a href="/uri">bar\</a></p>
-````````````````````````````````
-
-
-A [link label] must contain at least one [non-whitespace character]:
-
-```````````````````````````````` example
-[]
-
-[]: /uri
-.
-<p>[]</p>
-<p>[]: /uri</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[
- ]
-
-[
- ]: /uri
-.
-<p>[
-]</p>
-<p>[
-]: /uri</p>
-````````````````````````````````
-
-
-A [collapsed reference link](@)
-consists of a [link label] that [matches] a
-[link reference definition] elsewhere in the
-document, followed by the string `[]`.
-The contents of the first link label are parsed as inlines,
-which are used as the link's text.  The link's URI and title are
-provided by the matching reference link definition.  Thus,
-`[foo][]` is equivalent to `[foo][foo]`.
-
-```````````````````````````````` example
-[foo][]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[*foo* bar][]
-
-[*foo* bar]: /url "title"
-.
-<p><a href="/url" title="title"><em>foo</em> bar</a></p>
-````````````````````````````````
-
-
-The link labels are case-insensitive:
-
-```````````````````````````````` example
-[Foo][]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">Foo</a></p>
-````````````````````````````````
-
-
-
-As with full reference links, [whitespace] is not
-allowed between the two sets of brackets:
-
-```````````````````````````````` example
-[foo] 
-[]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">foo</a>
-[]</p>
-````````````````````````````````
-
-
-A [shortcut reference link](@)
-consists of a [link label] that [matches] a
-[link reference definition] elsewhere in the
-document and is not followed by `[]` or a link label.
-The contents of the first link label are parsed as inlines,
-which are used as the link's text.  The link's URI and title
-are provided by the matching link reference definition.
-Thus, `[foo]` is equivalent to `[foo][]`.
-
-```````````````````````````````` example
-[foo]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[*foo* bar]
-
-[*foo* bar]: /url "title"
-.
-<p><a href="/url" title="title"><em>foo</em> bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[[*foo* bar]]
-
-[*foo* bar]: /url "title"
-.
-<p>[<a href="/url" title="title"><em>foo</em> bar</a>]</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-[[bar [foo]
-
-[foo]: /url
-.
-<p>[[bar <a href="/url">foo</a></p>
-````````````````````````````````
-
-
-The link labels are case-insensitive:
-
-```````````````````````````````` example
-[Foo]
-
-[foo]: /url "title"
-.
-<p><a href="/url" title="title">Foo</a></p>
-````````````````````````````````
-
-
-A space after the link text should be preserved:
-
-```````````````````````````````` example
-[foo] bar
-
-[foo]: /url
-.
-<p><a href="/url">foo</a> bar</p>
-````````````````````````````````
-
-
-If you just want bracketed text, you can backslash-escape the
-opening bracket to avoid links:
-
-```````````````````````````````` example
-\[foo]
-
-[foo]: /url "title"
-.
-<p>[foo]</p>
-````````````````````````````````
-
-
-Note that this is a link, because a link label ends with the first
-following closing bracket:
-
-```````````````````````````````` example
-[foo*]: /url
-
-*[foo*]
-.
-<p>*<a href="/url">foo*</a></p>
-````````````````````````````````
-
-
-Full and compact references take precedence over shortcut
-references:
-
-```````````````````````````````` example
-[foo][bar]
-
-[foo]: /url1
-[bar]: /url2
-.
-<p><a href="/url2">foo</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[foo][]
-
-[foo]: /url1
-.
-<p><a href="/url1">foo</a></p>
-````````````````````````````````
-
-Inline links also take precedence:
-
-```````````````````````````````` example
-[foo]()
-
-[foo]: /url1
-.
-<p><a href="">foo</a></p>
-````````````````````````````````
-
-```````````````````````````````` example
-[foo](not a link)
-
-[foo]: /url1
-.
-<p><a href="/url1">foo</a>(not a link)</p>
-````````````````````````````````
-
-In the following case `[bar][baz]` is parsed as a reference,
-`[foo]` as normal text:
-
-```````````````````````````````` example
-[foo][bar][baz]
-
-[baz]: /url
-.
-<p>[foo]<a href="/url">bar</a></p>
-````````````````````````````````
-
-
-Here, though, `[foo][bar]` is parsed as a reference, since
-`[bar]` is defined:
-
-```````````````````````````````` example
-[foo][bar][baz]
-
-[baz]: /url1
-[bar]: /url2
-.
-<p><a href="/url2">foo</a><a href="/url1">baz</a></p>
-````````````````````````````````
-
-
-Here `[foo]` is not parsed as a shortcut reference, because it
-is followed by a link label (even though `[bar]` is not defined):
-
-```````````````````````````````` example
-[foo][bar][baz]
-
-[baz]: /url1
-[foo]: /url2
-.
-<p>[foo]<a href="/url1">bar</a></p>
-````````````````````````````````
-
-
-
-## Images
-
-Syntax for images is like the syntax for links, with one
-difference. Instead of [link text], we have an
-[image description](@).  The rules for this are the
-same as for [link text], except that (a) an
-image description starts with `![` rather than `[`, and
-(b) an image description may contain links.
-An image description has inline elements
-as its contents.  When an image is rendered to HTML,
-this is standardly used as the image's `alt` attribute.
-
-```````````````````````````````` example
-![foo](/url "title")
-.
-<p><img src="/url" alt="foo" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo *bar*]
-
-[foo *bar*]: train.jpg "train & tracks"
-.
-<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo ![bar](/url)](/url2)
-.
-<p><img src="/url2" alt="foo bar" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo [bar](/url)](/url2)
-.
-<p><img src="/url2" alt="foo bar" /></p>
-````````````````````````````````
-
-
-Though this spec is concerned with parsing, not rendering, it is
-recommended that in rendering to HTML, only the plain string content
-of the [image description] be used.  Note that in
-the above example, the alt attribute's value is `foo bar`, not `foo
-[bar](/url)` or `foo <a href="/url">bar</a>`.  Only the plain string
-content is rendered, without formatting.
-
-```````````````````````````````` example
-![foo *bar*][]
-
-[foo *bar*]: train.jpg "train & tracks"
-.
-<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo *bar*][foobar]
-
-[FOOBAR]: train.jpg "train & tracks"
-.
-<p><img src="train.jpg" alt="foo bar" title="train &amp; tracks" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo](train.jpg)
-.
-<p><img src="train.jpg" alt="foo" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-My ![foo bar](/path/to/train.jpg  "title"   )
-.
-<p>My <img src="/path/to/train.jpg" alt="foo bar" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo](<url>)
-.
-<p><img src="url" alt="foo" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![](/url)
-.
-<p><img src="/url" alt="" /></p>
-````````````````````````````````
-
-
-Reference-style:
-
-```````````````````````````````` example
-![foo][bar]
-
-[bar]: /url
-.
-<p><img src="/url" alt="foo" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![foo][bar]
-
-[BAR]: /url
-.
-<p><img src="/url" alt="foo" /></p>
-````````````````````````````````
-
-
-Collapsed:
-
-```````````````````````````````` example
-![foo][]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="foo" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![*foo* bar][]
-
-[*foo* bar]: /url "title"
-.
-<p><img src="/url" alt="foo bar" title="title" /></p>
-````````````````````````````````
-
-
-The labels are case-insensitive:
-
-```````````````````````````````` example
-![Foo][]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="Foo" title="title" /></p>
-````````````````````````````````
-
-
-As with reference links, [whitespace] is not allowed
-between the two sets of brackets:
-
-```````````````````````````````` example
-![foo] 
-[]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="foo" title="title" />
-[]</p>
-````````````````````````````````
-
-
-Shortcut:
-
-```````````````````````````````` example
-![foo]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="foo" title="title" /></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-![*foo* bar]
-
-[*foo* bar]: /url "title"
-.
-<p><img src="/url" alt="foo bar" title="title" /></p>
-````````````````````````````````
-
-
-Note that link labels cannot contain unescaped brackets:
-
-```````````````````````````````` example
-![[foo]]
-
-[[foo]]: /url "title"
-.
-<p>![[foo]]</p>
-<p>[[foo]]: /url &quot;title&quot;</p>
-````````````````````````````````
-
-
-The link labels are case-insensitive:
-
-```````````````````````````````` example
-![Foo]
-
-[foo]: /url "title"
-.
-<p><img src="/url" alt="Foo" title="title" /></p>
-````````````````````````````````
-
-
-If you just want a literal `!` followed by bracketed text, you can
-backslash-escape the opening `[`:
-
-```````````````````````````````` example
-!\[foo]
-
-[foo]: /url "title"
-.
-<p>![foo]</p>
-````````````````````````````````
-
-
-If you want a link after a literal `!`, backslash-escape the
-`!`:
-
-```````````````````````````````` example
-\![foo]
-
-[foo]: /url "title"
-.
-<p>!<a href="/url" title="title">foo</a></p>
-````````````````````````````````
-
-
-## Autolinks
-
-[Autolink](@)s are absolute URIs and email addresses inside
-`<` and `>`. They are parsed as links, with the URL or email address
-as the link label.
-
-A [URI autolink](@) consists of `<`, followed by an
-[absolute URI] not containing `<`, followed by `>`.  It is parsed as
-a link to the URI, with the URI as the link's label.
-
-An [absolute URI](@),
-for these purposes, consists of a [scheme] followed by a colon (`:`)
-followed by zero or more characters other than ASCII
-[whitespace] and control characters, `<`, and `>`.  If
-the URI includes these characters, they must be percent-encoded
-(e.g. `%20` for a space).
-
-For purposes of this spec, a [scheme](@) is any sequence
-of 2--32 characters beginning with an ASCII letter and followed
-by any combination of ASCII letters, digits, or the symbols plus
-("+"), period ("."), or hyphen ("-").
-
-Here are some valid autolinks:
-
-```````````````````````````````` example
-<http://foo.bar.baz>
-.
-<p><a href="http://foo.bar.baz">http://foo.bar.baz</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<http://foo.bar.baz/test?q=hello&id=22&boolean>
-.
-<p><a href="http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean">http://foo.bar.baz/test?q=hello&amp;id=22&amp;boolean</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<irc://foo.bar:2233/baz>
-.
-<p><a href="irc://foo.bar:2233/baz">irc://foo.bar:2233/baz</a></p>
-````````````````````````````````
-
-
-Uppercase is also fine:
-
-```````````````````````````````` example
-<MAILTO:FOO@BAR.BAZ>
-.
-<p><a href="MAILTO:FOO@BAR.BAZ">MAILTO:FOO@BAR.BAZ</a></p>
-````````````````````````````````
-
-
-Note that many strings that count as [absolute URIs] for
-purposes of this spec are not valid URIs, because their
-schemes are not registered or because of other problems
-with their syntax:
-
-```````````````````````````````` example
-<a+b+c:d>
-.
-<p><a href="a+b+c:d">a+b+c:d</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<made-up-scheme://foo,bar>
-.
-<p><a href="made-up-scheme://foo,bar">made-up-scheme://foo,bar</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<http://../>
-.
-<p><a href="http://../">http://../</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<localhost:5001/foo>
-.
-<p><a href="localhost:5001/foo">localhost:5001/foo</a></p>
-````````````````````````````````
-
-
-Spaces are not allowed in autolinks:
-
-```````````````````````````````` example
-<http://foo.bar/baz bim>
-.
-<p>&lt;http://foo.bar/baz bim&gt;</p>
-````````````````````````````````
-
-
-Backslash-escapes do not work inside autolinks:
-
-```````````````````````````````` example
-<http://example.com/\[\>
-.
-<p><a href="http://example.com/%5C%5B%5C">http://example.com/\[\</a></p>
-````````````````````````````````
-
-
-An [email autolink](@)
-consists of `<`, followed by an [email address],
-followed by `>`.  The link's label is the email address,
-and the URL is `mailto:` followed by the email address.
-
-An [email address](@),
-for these purposes, is anything that matches
-the [non-normative regex from the HTML5
-spec](https://html.spec.whatwg.org/multipage/forms.html#e-mail-state-(type=email)):
-
-    /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
-    (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
-
-Examples of email autolinks:
-
-```````````````````````````````` example
-<foo@bar.example.com>
-.
-<p><a href="mailto:foo@bar.example.com">foo@bar.example.com</a></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<foo+special@Bar.baz-bar0.com>
-.
-<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
-````````````````````````````````
-
-
-Backslash-escapes do not work inside email autolinks:
-
-```````````````````````````````` example
-<foo\+@bar.example.com>
-.
-<p>&lt;foo+@bar.example.com&gt;</p>
-````````````````````````````````
-
-
-These are not autolinks:
-
-```````````````````````````````` example
-<>
-.
-<p>&lt;&gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-< http://foo.bar >
-.
-<p>&lt; http://foo.bar &gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<m:abc>
-.
-<p>&lt;m:abc&gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<foo.bar.baz>
-.
-<p>&lt;foo.bar.baz&gt;</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-http://example.com
-.
-<p>http://example.com</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo@bar.example.com
-.
-<p>foo@bar.example.com</p>
-````````````````````````````````
-
-<div class="extension">
-
-## Autolinks (extension)
-
-GFM enables the `autolink` extension, where autolinks will be recognised in a
-greater number of conditions.
-
-[Autolink]s can also be constructed without requiring the use of `<` and to `>`
-to delimit them, although they will be recognized under a smaller set of
-circumstances.  All such recognized autolinks can only come at the beginning of
-a line, after whitespace, or any of the delimiting characters `*`, `_`, `~`,
-and `(`.
-
-An [extended www autolink](@) will be recognized when the text `www.` is found
-followed by a [valid domain]. A [valid domain](@) consists of alphanumeric
-characters, underscores (`_`), hyphens (`-`) and periods (`.`).  There must be
-at least one period, and no underscores may be present in the last two segments
-of the domain.
-
-The scheme `http` will be inserted automatically:
-
-```````````````````````````````` example autolink
-www.commonmark.org
-.
-<p><a href="http://www.commonmark.org">www.commonmark.org</a></p>
-````````````````````````````````
-
-After a [valid domain], zero or more non-space non-`<` characters may follow:
-
-```````````````````````````````` example autolink
-Visit www.commonmark.org/help for more information.
-.
-<p>Visit <a href="http://www.commonmark.org/help">www.commonmark.org/help</a> for more information.</p>
-````````````````````````````````
-
-We then apply [extended autolink path validation](@) as follows:
-
-Trailing punctuation (specifically, `?`, `!`, `.`, `,`, `:`, `*`, `_`, and `~`)
-will not be considered part of the autolink, though they may be included in the
-interior of the link:
-
-```````````````````````````````` example autolink
-Visit www.commonmark.org.
-
-Visit www.commonmark.org/a.b.
-.
-<p>Visit <a href="http://www.commonmark.org">www.commonmark.org</a>.</p>
-<p>Visit <a href="http://www.commonmark.org/a.b">www.commonmark.org/a.b</a>.</p>
-````````````````````````````````
-
-When an autolink ends in `)`, we scan the entire autolink for the total number
-of parentheses.  If there is a greater number of closing parentheses than
-opening ones, we don't consider the last character part of the autolink, in
-order to facilitate including an autolink inside a parenthesis:
-
-```````````````````````````````` example autolink
-www.google.com/search?q=Markup+(business)
-
-(www.google.com/search?q=Markup+(business))
-.
-<p><a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a></p>
-<p>(<a href="http://www.google.com/search?q=Markup+(business)">www.google.com/search?q=Markup+(business)</a>)</p>
-````````````````````````````````
-
-This check is only done when the link ends in a closing parentheses `)`, so if
-the only parentheses are in the interior of the autolink, no special rules are
-applied:
-
-```````````````````````````````` example autolink
-www.google.com/search?q=(business))+ok
-.
-<p><a href="http://www.google.com/search?q=(business))+ok">www.google.com/search?q=(business))+ok</a></p>
-````````````````````````````````
-
-If an autolink ends in a semicolon (`;`), we check to see if it appears to
-resemble an [entity reference][entity references]; if the preceding text is `&`
-followed by one or more alphanumeric characters.  If so, it is excluded from
-the autolink:
-
-```````````````````````````````` example autolink
-www.google.com/search?q=commonmark&hl=en
-
-www.google.com/search?q=commonmark&hl;
-.
-<p><a href="http://www.google.com/search?q=commonmark&amp;hl=en">www.google.com/search?q=commonmark&amp;hl=en</a></p>
-<p><a href="http://www.google.com/search?q=commonmark">www.google.com/search?q=commonmark</a>&amp;hl;</p>
-````````````````````````````````
-
-`<` immediately ends an autolink.
-
-```````````````````````````````` example autolink
-www.commonmark.org/he<lp
-.
-<p><a href="http://www.commonmark.org/he">www.commonmark.org/he</a>&lt;lp</p>
-````````````````````````````````
-
-An [extended url autolink](@) will be recognised when one of the schemes
-`http://`, `https://`, or `ftp://`, followed by a [valid domain], then zero or
-more non-space non-`<` characters according to
-[extended autolink path validation]:
-
-```````````````````````````````` example autolink
-http://commonmark.org
-
-(Visit https://encrypted.google.com/search?q=Markup+(business))
-
-Anonymous FTP is available at ftp://foo.bar.baz.
-.
-<p><a href="http://commonmark.org">http://commonmark.org</a></p>
-<p>(Visit <a href="https://encrypted.google.com/search?q=Markup+(business)">https://encrypted.google.com/search?q=Markup+(business)</a>)</p>
-<p>Anonymous FTP is available at <a href="ftp://foo.bar.baz">ftp://foo.bar.baz</a>.</p>
-````````````````````````````````
-
-
-An [extended email autolink](@) will be recognised when an email address is
-recognised within any text node.  Email addresses are recognised according to
-the following rules:
-
-* One ore more characters which are alphanumeric, or `.`, `-`, `_`, or `+`.
-* An `@` symbol.
-* One or more characters which are alphanumeric, or `.`, `-`, or `_`. At least
-  one of the characters here must be a period (`.`).  The last character must
-  not be one of `-` or `_`.  If the last character is a period (`.`), it will
-  be excluded from the autolink.
-
-The scheme `mailto:` will automatically be added to the generated link:
-
-```````````````````````````````` example autolink
-foo@bar.baz
-.
-<p><a href="mailto:foo@bar.baz">foo@bar.baz</a></p>
-````````````````````````````````
-
-`+` can occur before the `@`, but not after.
-
-```````````````````````````````` example autolink
-hello@mail+xyz.example isn't valid, but hello+xyz@mail.example is.
-.
-<p>hello@mail+xyz.example isn't valid, but <a href="mailto:hello+xyz@mail.example">hello+xyz@mail.example</a> is.</p>
-````````````````````````````````
-
-`.`, `-`, and `_` can occur on both sides of the `@`, but only `.` may occur at
-the end of the email address, in which case it will not be considered part of
-the address:
-
-```````````````````````````````` example autolink
-a.b-c_d@a.b
-
-a.b-c_d@a.b.
-
-a.b-c_d@a.b-
-
-a.b-c_d@a.b_
-.
-<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a></p>
-<p><a href="mailto:a.b-c_d@a.b">a.b-c_d@a.b</a>.</p>
-<p>a.b-c_d@a.b-</p>
-<p>a.b-c_d@a.b_</p>
-````````````````````````````````
-
-</div>
-
-## Raw HTML
-
-Text between `<` and `>` that looks like an HTML tag is parsed as a
-raw HTML tag and will be rendered in HTML without escaping.
-Tag and attribute names are not limited to current HTML tags,
-so custom tags (and even, say, DocBook tags) may be used.
-
-Here is the grammar for tags:
-
-A [tag name](@) consists of an ASCII letter
-followed by zero or more ASCII letters, digits, or
-hyphens (`-`).
-
-An [attribute](@) consists of [whitespace],
-an [attribute name], and an optional
-[attribute value specification].
-
-An [attribute name](@)
-consists of an ASCII letter, `_`, or `:`, followed by zero or more ASCII
-letters, digits, `_`, `.`, `:`, or `-`.  (Note:  This is the XML
-specification restricted to ASCII.  HTML5 is laxer.)
-
-An [attribute value specification](@)
-consists of optional [whitespace],
-a `=` character, optional [whitespace], and an [attribute
-value].
-
-An [attribute value](@)
-consists of an [unquoted attribute value],
-a [single-quoted attribute value], or a [double-quoted attribute value].
-
-An [unquoted attribute value](@)
-is a nonempty string of characters not
-including [whitespace], `"`, `'`, `=`, `<`, `>`, or `` ` ``.
-
-A [single-quoted attribute value](@)
-consists of `'`, zero or more
-characters not including `'`, and a final `'`.
-
-A [double-quoted attribute value](@)
-consists of `"`, zero or more
-characters not including `"`, and a final `"`.
-
-An [open tag](@) consists of a `<` character, a [tag name],
-zero or more [attributes], optional [whitespace], an optional `/`
-character, and a `>` character.
-
-A [closing tag](@) consists of the string `</`, a
-[tag name], optional [whitespace], and the character `>`.
-
-An [HTML comment](@) consists of `<!--` + *text* + `-->`,
-where *text* does not start with `>` or `->`, does not end with `-`,
-and does not contain `--`.  (See the
-[HTML5 spec](http://www.w3.org/TR/html5/syntax.html#comments).)
-
-A [processing instruction](@)
-consists of the string `<?`, a string
-of characters not including the string `?>`, and the string
-`?>`.
-
-A [declaration](@) consists of the
-string `<!`, a name consisting of one or more uppercase ASCII letters,
-[whitespace], a string of characters not including the
-character `>`, and the character `>`.
-
-A [CDATA section](@) consists of
-the string `<![CDATA[`, a string of characters not including the string
-`]]>`, and the string `]]>`.
-
-An [HTML tag](@) consists of an [open tag], a [closing tag],
-an [HTML comment], a [processing instruction], a [declaration],
-or a [CDATA section].
-
-Here are some simple open tags:
-
-```````````````````````````````` example
-<a><bab><c2c>
-.
-<p><a><bab><c2c></p>
-````````````````````````````````
-
-
-Empty elements:
-
-```````````````````````````````` example
-<a/><b2/>
-.
-<p><a/><b2/></p>
-````````````````````````````````
-
-
-[Whitespace] is allowed:
-
-```````````````````````````````` example
-<a  /><b2
-data="foo" >
-.
-<p><a  /><b2
-data="foo" ></p>
-````````````````````````````````
-
-
-With attributes:
-
-```````````````````````````````` example
-<a foo="bar" bam = 'baz <em>"</em>'
-_boolean zoop:33=zoop:33 />
-.
-<p><a foo="bar" bam = 'baz <em>"</em>'
-_boolean zoop:33=zoop:33 /></p>
-````````````````````````````````
-
-
-Custom tag names can be used:
-
-```````````````````````````````` example
-Foo <responsive-image src="foo.jpg" />
-.
-<p>Foo <responsive-image src="foo.jpg" /></p>
-````````````````````````````````
-
-
-Illegal tag names, not parsed as HTML:
-
-```````````````````````````````` example
-<33> <__>
-.
-<p>&lt;33&gt; &lt;__&gt;</p>
-````````````````````````````````
-
-
-Illegal attribute names:
-
-```````````````````````````````` example
-<a h*#ref="hi">
-.
-<p>&lt;a h*#ref=&quot;hi&quot;&gt;</p>
-````````````````````````````````
-
-
-Illegal attribute values:
-
-```````````````````````````````` example
-<a href="hi'> <a href=hi'>
-.
-<p>&lt;a href=&quot;hi'&gt; &lt;a href=hi'&gt;</p>
-````````````````````````````````
-
-
-Illegal [whitespace]:
-
-```````````````````````````````` example
-< a><
-foo><bar/ >
-<foo bar=baz
-bim!bop />
-.
-<p>&lt; a&gt;&lt;
-foo&gt;&lt;bar/ &gt;
-&lt;foo bar=baz
-bim!bop /&gt;</p>
-````````````````````````````````
-
-
-Missing [whitespace]:
-
-```````````````````````````````` example
-<a href='bar'title=title>
-.
-<p>&lt;a href='bar'title=title&gt;</p>
-````````````````````````````````
-
-
-Closing tags:
-
-```````````````````````````````` example
-</a></foo >
-.
-<p></a></foo ></p>
-````````````````````````````````
-
-
-Illegal attributes in closing tag:
-
-```````````````````````````````` example
-</a href="foo">
-.
-<p>&lt;/a href=&quot;foo&quot;&gt;</p>
-````````````````````````````````
-
-
-Comments:
-
-```````````````````````````````` example
-foo <!-- this is a
-comment - with hyphen -->
-.
-<p>foo <!-- this is a
-comment - with hyphen --></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo <!-- not a comment -- two hyphens -->
-.
-<p>foo &lt;!-- not a comment -- two hyphens --&gt;</p>
-````````````````````````````````
-
-
-Not comments:
-
-```````````````````````````````` example
-foo <!--> foo -->
-
-foo <!-- foo--->
-.
-<p>foo &lt;!--&gt; foo --&gt;</p>
-<p>foo &lt;!-- foo---&gt;</p>
-````````````````````````````````
-
-
-Processing instructions:
-
-```````````````````````````````` example
-foo <?php echo $a; ?>
-.
-<p>foo <?php echo $a; ?></p>
-````````````````````````````````
-
-
-Declarations:
-
-```````````````````````````````` example
-foo <!ELEMENT br EMPTY>
-.
-<p>foo <!ELEMENT br EMPTY></p>
-````````````````````````````````
-
-
-CDATA sections:
-
-```````````````````````````````` example
-foo <![CDATA[>&<]]>
-.
-<p>foo <![CDATA[>&<]]></p>
-````````````````````````````````
-
-
-Entity and numeric character references are preserved in HTML
-attributes:
-
-```````````````````````````````` example
-foo <a href="&ouml;">
-.
-<p>foo <a href="&ouml;"></p>
-````````````````````````````````
-
-
-Backslash escapes do not work in HTML attributes:
-
-```````````````````````````````` example
-foo <a href="\*">
-.
-<p>foo <a href="\*"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<a href="\"">
-.
-<p>&lt;a href=&quot;&quot;&quot;&gt;</p>
-````````````````````````````````
-
-
-<div class="extension">
-
-## Disallowed Raw HTML (extension)
-
-GFM enables the `tagfilter` extension, where the following HTML tags will be
-filtered when rendering HTML output:
-
-* `<title>`
-* `<textarea>`
-* `<style>`
-* `<xmp>`
-* `<iframe>`
-* `<noembed>`
-* `<noframes>`
-* `<script>`
-* `<plaintext>`
-
-Filtering is done by replacing the leading `<` with the entity `&lt;`.  These
-tags are chosen in particular as they change how HTML is interpreted in a way
-unique to them (i.e. nested HTML is interpreted differently), and this is
-usually undesireable in the context of other rendered Markdown content.
-
-All other HTML tags are left untouched.
-
-```````````````````````````````` example tagfilter
-<strong> <title> <style> <em>
-
-<blockquote>
-  <xmp> is disallowed.  <XMP> is also disallowed.
-</blockquote>
-.
-<p><strong> &lt;title> &lt;style> <em></p>
-<blockquote>
-  &lt;xmp> is disallowed.  &lt;XMP> is also disallowed.
-</blockquote>
-````````````````````````````````
-
-</div>
-
-## Hard line breaks
-
-A line break (not in a code span or HTML tag) that is preceded
-by two or more spaces and does not occur at the end of a block
-is parsed as a [hard line break](@) (rendered
-in HTML as a `<br />` tag):
-
-```````````````````````````````` example
-foo  
-baz
-.
-<p>foo<br />
-baz</p>
-````````````````````````````````
-
-
-For a more visible alternative, a backslash before the
-[line ending] may be used instead of two spaces:
-
-```````````````````````````````` example
-foo\
-baz
-.
-<p>foo<br />
-baz</p>
-````````````````````````````````
-
-
-More than two spaces can be used:
-
-```````````````````````````````` example
-foo       
-baz
-.
-<p>foo<br />
-baz</p>
-````````````````````````````````
-
-
-Leading spaces at the beginning of the next line are ignored:
-
-```````````````````````````````` example
-foo  
-     bar
-.
-<p>foo<br />
-bar</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo\
-     bar
-.
-<p>foo<br />
-bar</p>
-````````````````````````````````
-
-
-Line breaks can occur inside emphasis, links, and other constructs
-that allow inline content:
-
-```````````````````````````````` example
-*foo  
-bar*
-.
-<p><em>foo<br />
-bar</em></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-*foo\
-bar*
-.
-<p><em>foo<br />
-bar</em></p>
-````````````````````````````````
-
-
-Line breaks do not occur inside code spans
-
-```````````````````````````````` example
-`code 
-span`
-.
-<p><code>code  span</code></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-`code\
-span`
-.
-<p><code>code\ span</code></p>
-````````````````````````````````
-
-
-or HTML tags:
-
-```````````````````````````````` example
-<a href="foo  
-bar">
-.
-<p><a href="foo  
-bar"></p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-<a href="foo\
-bar">
-.
-<p><a href="foo\
-bar"></p>
-````````````````````````````````
-
-
-Hard line breaks are for separating inline content within a block.
-Neither syntax for hard line breaks works at the end of a paragraph or
-other block element:
-
-```````````````````````````````` example
-foo\
-.
-<p>foo\</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-foo  
-.
-<p>foo</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-### foo\
-.
-<h3>foo\</h3>
-````````````````````````````````
-
-
-```````````````````````````````` example
-### foo  
-.
-<h3>foo</h3>
-````````````````````````````````
-
-
-## Soft line breaks
-
-A regular line break (not in a code span or HTML tag) that is not
-preceded by two or more spaces or a backslash is parsed as a
-[softbreak](@).  (A softbreak may be rendered in HTML either as a
-[line ending] or as a space. The result will be the same in
-browsers. In the examples here, a [line ending] will be used.)
-
-```````````````````````````````` example
-foo
-baz
-.
-<p>foo
-baz</p>
-````````````````````````````````
-
-
-Spaces at the end of the line and beginning of the next line are
-removed:
-
-```````````````````````````````` example
-foo 
- baz
-.
-<p>foo
-baz</p>
-````````````````````````````````
-
-
-A conforming parser may render a soft line break in HTML either as a
-line break or as a space.
-
-A renderer may also provide an option to render soft line breaks
-as hard line breaks.
-
-## Textual content
-
-Any characters not given an interpretation by the above rules will
-be parsed as plain textual content.
-
-```````````````````````````````` example
-hello $.;'there
-.
-<p>hello $.;'there</p>
-````````````````````````````````
-
-
-```````````````````````````````` example
-Foo χρῆν
-.
-<p>Foo χρῆν</p>
-````````````````````````````````
-
-
-Internal spaces are preserved verbatim:
-
-```````````````````````````````` example
-Multiple     spaces
-.
-<p>Multiple     spaces</p>
-````````````````````````````````
-
-
-<!-- END TESTS -->
-
-# Appendix: A parsing strategy
-
-In this appendix we describe some features of the parsing strategy
-used in the CommonMark reference implementations.
-
-## Overview
-
-Parsing has two phases:
-
-1. In the first phase, lines of input are consumed and the block
-structure of the document---its division into paragraphs, block quotes,
-list items, and so on---is constructed.  Text is assigned to these
-blocks but not parsed. Link reference definitions are parsed and a
-map of links is constructed.
-
-2. In the second phase, the raw text contents of paragraphs and headings
-are parsed into sequences of Markdown inline elements (strings,
-code spans, links, emphasis, and so on), using the map of link
-references constructed in phase 1.
-
-At each point in processing, the document is represented as a tree of
-**blocks**.  The root of the tree is a `document` block.  The `document`
-may have any number of other blocks as **children**.  These children
-may, in turn, have other blocks as children.  The last child of a block
-is normally considered **open**, meaning that subsequent lines of input
-can alter its contents.  (Blocks that are not open are **closed**.)
-Here, for example, is a possible document tree, with the open blocks
-marked by arrows:
-
-``` tree
--> document
-  -> block_quote
-       paragraph
-         "Lorem ipsum dolor\nsit amet."
-    -> list (type=bullet tight=true bullet_char=-)
-         list_item
-           paragraph
-             "Qui *quodsi iracundia*"
-      -> list_item
-        -> paragraph
-             "aliquando id"
-```
-
-## Phase 1: block structure
-
-Each line that is processed has an effect on this tree.  The line is
-analyzed and, depending on its contents, the document may be altered
-in one or more of the following ways:
-
-1. One or more open blocks may be closed.
-2. One or more new blocks may be created as children of the
-   last open block.
-3. Text may be added to the last (deepest) open block remaining
-   on the tree.
-
-Once a line has been incorporated into the tree in this way,
-it can be discarded, so input can be read in a stream.
-
-For each line, we follow this procedure:
-
-1. First we iterate through the open blocks, starting with the
-root document, and descending through last children down to the last
-open block.  Each block imposes a condition that the line must satisfy
-if the block is to remain open.  For example, a block quote requires a
-`>` character.  A paragraph requires a non-blank line.
-In this phase we may match all or just some of the open
-blocks.  But we cannot close unmatched blocks yet, because we may have a
-[lazy continuation line].
-
-2.  Next, after consuming the continuation markers for existing
-blocks, we look for new block starts (e.g. `>` for a block quote).
-If we encounter a new block start, we close any blocks unmatched
-in step 1 before creating the new block as a child of the last
-matched block.
-
-3.  Finally, we look at the remainder of the line (after block
-markers like `>`, list markers, and indentation have been consumed).
-This is text that can be incorporated into the last open
-block (a paragraph, code block, heading, or raw HTML).
-
-Setext headings are formed when we see a line of a paragraph
-that is a [setext heading underline].
-
-Reference link definitions are detected when a paragraph is closed;
-the accumulated text lines are parsed to see if they begin with
-one or more reference link definitions.  Any remainder becomes a
-normal paragraph.
-
-We can see how this works by considering how the tree above is
-generated by four lines of Markdown:
-
-``` markdown
-> Lorem ipsum dolor
-sit amet.
-> - Qui *quodsi iracundia*
-> - aliquando id
-```
-
-At the outset, our document model is just
-
-``` tree
--> document
-```
-
-The first line of our text,
-
-``` markdown
-> Lorem ipsum dolor
-```
-
-causes a `block_quote` block to be created as a child of our
-open `document` block, and a `paragraph` block as a child of
-the `block_quote`.  Then the text is added to the last open
-block, the `paragraph`:
-
-``` tree
--> document
-  -> block_quote
-    -> paragraph
-         "Lorem ipsum dolor"
-```
-
-The next line,
-
-``` markdown
-sit amet.
-```
-
-is a "lazy continuation" of the open `paragraph`, so it gets added
-to the paragraph's text:
-
-``` tree
--> document
-  -> block_quote
-    -> paragraph
-         "Lorem ipsum dolor\nsit amet."
-```
-
-The third line,
-
-``` markdown
-> - Qui *quodsi iracundia*
-```
-
-causes the `paragraph` block to be closed, and a new `list` block
-opened as a child of the `block_quote`.  A `list_item` is also
-added as a child of the `list`, and a `paragraph` as a child of
-the `list_item`.  The text is then added to the new `paragraph`:
-
-``` tree
--> document
-  -> block_quote
-       paragraph
-         "Lorem ipsum dolor\nsit amet."
-    -> list (type=bullet tight=true bullet_char=-)
-      -> list_item
-        -> paragraph
-             "Qui *quodsi iracundia*"
-```
-
-The fourth line,
-
-``` markdown
-> - aliquando id
-```
-
-causes the `list_item` (and its child the `paragraph`) to be closed,
-and a new `list_item` opened up as child of the `list`.  A `paragraph`
-is added as a child of the new `list_item`, to contain the text.
-We thus obtain the final tree:
-
-``` tree
--> document
-  -> block_quote
-       paragraph
-         "Lorem ipsum dolor\nsit amet."
-    -> list (type=bullet tight=true bullet_char=-)
-         list_item
-           paragraph
-             "Qui *quodsi iracundia*"
-      -> list_item
-        -> paragraph
-             "aliquando id"
-```
-
-## Phase 2: inline structure
-
-Once all of the input has been parsed, all open blocks are closed.
-
-We then "walk the tree," visiting every node, and parse raw
-string contents of paragraphs and headings as inlines.  At this
-point we have seen all the link reference definitions, so we can
-resolve reference links as we go.
-
-``` tree
-document
-  block_quote
-    paragraph
-      str "Lorem ipsum dolor"
-      softbreak
-      str "sit amet."
-    list (type=bullet tight=true bullet_char=-)
-      list_item
-        paragraph
-          str "Qui "
-          emph
-            str "quodsi iracundia"
-      list_item
-        paragraph
-          str "aliquando id"
-```
-
-Notice how the [line ending] in the first paragraph has
-been parsed as a `softbreak`, and the asterisks in the first list item
-have become an `emph`.
-
-### An algorithm for parsing nested emphasis and links
-
-By far the trickiest part of inline parsing is handling emphasis,
-strong emphasis, links, and images.  This is done using the following
-algorithm.
-
-When we're parsing inlines and we hit either
-
-- a run of `*` or `_` characters, or
-- a `[` or `![`
-
-we insert a text node with these symbols as its literal content, and we
-add a pointer to this text node to the [delimiter stack](@).
-
-The [delimiter stack] is a doubly linked list.  Each
-element contains a pointer to a text node, plus information about
-
-- the type of delimiter (`[`, `![`, `*`, `_`)
-- the number of delimiters,
-- whether the delimiter is "active" (all are active to start), and
-- whether the delimiter is a potential opener, a potential closer,
-  or both (which depends on what sort of characters precede
-  and follow the delimiters).
-
-When we hit a `]` character, we call the *look for link or image*
-procedure (see below).
-
-When we hit the end of the input, we call the *process emphasis*
-procedure (see below), with `stack_bottom` = NULL.
-
-#### *look for link or image*
-
-Starting at the top of the delimiter stack, we look backwards
-through the stack for an opening `[` or `![` delimiter.
-
-- If we don't find one, we return a literal text node `]`.
-
-- If we do find one, but it's not *active*, we remove the inactive
-  delimiter from the stack, and return a literal text node `]`.
-
-- If we find one and it's active, then we parse ahead to see if
-  we have an inline link/image, reference link/image, compact reference
-  link/image, or shortcut reference link/image.
-
-  + If we don't, then we remove the opening delimiter from the
-    delimiter stack and return a literal text node `]`.
-
-  + If we do, then
-
-    * We return a link or image node whose children are the inlines
-      after the text node pointed to by the opening delimiter.
-
-    * We run *process emphasis* on these inlines, with the `[` opener
-      as `stack_bottom`.
-
-    * We remove the opening delimiter.
-
-    * If we have a link (and not an image), we also set all
-      `[` delimiters before the opening delimiter to *inactive*.  (This
-      will prevent us from getting links within links.)
-
-#### *process emphasis*
-
-Parameter `stack_bottom` sets a lower bound to how far we
-descend in the [delimiter stack].  If it is NULL, we can
-go all the way to the bottom.  Otherwise, we stop before
-visiting `stack_bottom`.
-
-Let `current_position` point to the element on the [delimiter stack]
-just above `stack_bottom` (or the first element if `stack_bottom`
-is NULL).
-
-We keep track of the `openers_bottom` for each delimiter
-type (`*`, `_`).  Initialize this to `stack_bottom`.
-
-Then we repeat the following until we run out of potential
-closers:
-
-- Move `current_position` forward in the delimiter stack (if needed)
-  until we find the first potential closer with delimiter `*` or `_`.
-  (This will be the potential closer closest
-  to the beginning of the input -- the first one in parse order.)
-
-- Now, look back in the stack (staying above `stack_bottom` and
-  the `openers_bottom` for this delimiter type) for the
-  first matching potential opener ("matching" means same delimiter).
-
-- If one is found:
-
-  + Figure out whether we have emphasis or strong emphasis:
-    if both closer and opener spans have length >= 2, we have
-    strong, otherwise regular.
-
-  + Insert an emph or strong emph node accordingly, after
-    the text node corresponding to the opener.
-
-  + Remove any delimiters between the opener and closer from
-    the delimiter stack.
-
-  + Remove 1 (for regular emph) or 2 (for strong emph) delimiters
-    from the opening and closing text nodes.  If they become empty
-    as a result, remove them and remove the corresponding element
-    of the delimiter stack.  If the closing node is removed, reset
-    `current_position` to the next element in the stack.
-
-- If none in found:
-
-  + Set `openers_bottom` to the element before `current_position`.
-    (We know that there are no openers for this kind of closer up to and
-    including this point, so this puts a lower bound on future searches.)
-
-  + If the closer at `current_position` is not a potential opener,
-    remove it from the delimiter stack (since we know it can't
-    be a closer either).
-
-  + Advance `current_position` to the next element in the stack.
-
-After we're done, we remove all delimiters above `stack_bottom` from the
-delimiter stack.
-
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/xi-editor/LICENSE b/vendor/pulldown-cmark-0.5.3/third_party/xi-editor/LICENSE
deleted file mode 100644
index 6b0b1270ff..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/xi-editor/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/vendor/pulldown-cmark-0.5.3/third_party/xi-editor/crdt.md b/vendor/pulldown-cmark-0.5.3/third_party/xi-editor/crdt.md
deleted file mode 100644
index 025ba20562..0000000000
--- a/vendor/pulldown-cmark-0.5.3/third_party/xi-editor/crdt.md
+++ /dev/null
@@ -1,1097 +0,0 @@
----
-layout: page
-title: CRDT - The Xi Text Engine
-site_nav_category_order: 206
-is_site_nav_category2: true
-site_nav_category: docs
----
-
-<!-- See https://www.figma.com/file/UGOAcpKR5WIP81t3DGPIP2dR/CRDT-Merge-Diagrams for the source of the diagrams -->
-
-This document contains a detailed description of the data structures and operations Xi uses for text. These data structures and the `merge` operation also form a Conflict-free Replicated Data Type (CRDT). It being a CRDT allows Xi to be used for concurrent editing of text on multiple devices, it can merge edits, including those made offline, between multiple devices and converge on a consistent document that includes all changes.
-
-Beyond synchronizing text, these data structures and operations allow Xi to handle asynchronous editing of the text from plugins, support undo and redo, and allow incremental updating of editor state and the view based on differences between revisions.
-
-Many of these data structures and operations have been in Xi for a while but they've recently been heavily overhauled and extended as part of [a project](https://github.com/xi-editor/xi-editor/issues/250) that added multi-device syncing support via the CRDT merge operation. This was done for [use on the Fuchsia operating system](https://fuchsia.googlesource.com/topaz/+/master/bin/xi/), where it uses [Ledger](https://fuchsia.googlesource.com/peridot/+/HEAD/docs/ledger) to synchronize documents between devices.
-
-What follows is both a description of a data structure for text and a code tour of the `xi-rope` crate. It describes the actual Rust data structures and algorithms used, because the primary novelty and difficulty of this CRDT is in the optimized representation that allows for better time and memory complexity. If you want an overview of the motivation behind using a CRDT and a conceptual description of what the CRDT does see [`crdt.md`](crdt.md). The intended audience is anyone interested in implementing CRDTs, anyone who wants to work on Xi, or just anyone curious enough.
-
-## Table of Contents
-
-- [Motivation](#motivation): Why Xi's CRDT is the way it is.
-- [Representation](#representation): Describes the representation Xi uses to implement the CRDT in a memory and time efficient way.
-- [Operations](#operations): Describes all the operations implemented on the representation to allow it to support undo, asynchronous edits, distributed synchronization and more.
-    - [Engine::merge](#enginemerge): Description of the CRDT merge operation used for multi-device syncing.
-
-## Motivation
-
-The Xi CRDT attempts to have a number of properties that many other asynchronous text editing solutions don't:
-
-- Usable without a central server: Even though the Fuchsia Ledger does sync to a cloud server, it can't actually inspect the data or perform operations, so conflict resolution must be possible on every device independently.
-- Support large documents: The memory complexity of the representation and the time complexity of common operations should be low enough to support very large text documents like books or long code files.
-- Support long histories: Similarly, documents that have gone through many edits should be efficient to edit both in time and memory.
-
-As of the time this document was written, it satisfies all of these properties to some extent, but some operations and representations are not as memory and time efficient as we'd like. However, everything has been designed with a few more key optimizations in mind. Those optimizations should bring the memory and time complexity down to where we want.
-
-### Transform Property 2 (TP2) and Operational Transforms
-
-[Operational Transformation (OT)](https://en.wikipedia.org/wiki/Operational_transformation) is a common way to implement asynchronous text editing. It works by sending *operations* like inserts and deletes between peers and transforming them to apply to the current text. Unfortunately many implementations of OT have a problem where they don't always preserve ordering when text is deleted.
-
-For example see the following diagram showing 3 peers sending edits between each other ending up in an inconsistent state. The arrows represent operations being sent asynchronously between devices in a peer-to-peer editing system based on OT, with time progressing downward. Whenever an edit is made the operation is sent to all other peers, but due to asynchronous communication they can be arbitrarily delayed. When an operation arrives at a peer it is transformed and applied to the current text. For clarity, not all arrows are shown, but you can imagine that the arrival of missing sends just got delayed past the end of the diagram.
-
-![TP2 Problem](img/tp2.png)
-
-Acting consistently in cases like this is called having "Transform Property 2" (see [Operational Transformation in Real-Time Group Editors:
-Issues, Algorithms, and Achievements](http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.53.933&rep=rep1&type=pdf) by Sun & Ellis, 1998). One approach to the problem is to serialize all edits through a central server which does all the transformation. With this approach, the ordering relative to deleted text may not be preserved, but at least all clients will converge to the same state. This is what Google Docs and many other collaborative editing systems do.
-
-Xi avoids this problem by using "tombstones" (see [Tombstone Transformation Functions for Ensuring Consistency in Collaborative Editing Systems](http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.103.2679&rep=rep1&type=pdf)), which leave deleted characters in the representation so that ordering can be preserved. This will be described in detail later.
-
-## Representation
-
-The conceptual representation described in [`crdt.md`](crdt.md) would be very inefficient to use directly. If we had to store an ID and ordering edges for each character and reconstruct the current text via topological sort every time we wanted to know what the current text is, Xi would be incredibly slow and would use much more memory than is necessary.
-
-Instead, we use a representation that allows all the operations we care about to be fast. We also take advantage of the typical patterns of text document usage to make the representation more memory efficient for common cases.
-
-The key optimization that shapes everything else is to avoid using IDs for characters or storing ordering edges explicitly. Instead, we represent the identity of characters implicitly by their position in the current text. But then how do we reference them in our revision history? If we use indices into the current text, they will get outdated by changes. We could rewrite all the indices in the history every time we made an edit, but that would be terribly inefficient. Instead the set of inserted characters in every revision is treated as a *coordinate transform* for the older revisions. In order to find the character referred to by an older revision you have to transform the indices it uses based on the insertions made after it. This allows us to make our history append-only, leaving the indices referring to the text at the time of the revision.
-
-That description is almost certainly too vague to be understandable at this point, but don't worry, there will be a full description with diagrams later on.
-
-Starting from the basic building blocks and proceeding towards the top level CRDT `Engine`, here are all the structures:
-
-### Rope
-
-```rust
-pub struct Rope(Arc<RopeBody>);
-
-#[derive(Clone)]
-struct RopeBody {
-    /// Used for efficiently seeking to an index in the tree
-    len: usize,
-    /// Used for rebalancing
-    height: usize,
-    val: RopeVal,
-}
-
-enum RopeVal {
-    Leaf(String),
-    Internal(Vec<Rope>),
-}
-```
-**Note:** All the Rust code in this document is simplified from the actual implementation so that it still conveys the structure and memory properties of the representation but elides details not necessary to understand the CRDT. See the code or generated docs for the full definitions. For example, the real struct for `Rope` is called `Node<N: NodeInfo>` and is a generic structure not specific to text, that is later instantiated for text as `pub type Rope = Node<RopeInfo>`.
-
-When representing potentially large amounts of text, Xi avoids using `String`s and instead uses a data structure called `Rope`. This is essentially an immutable `String` except many operations that would be `O(n)` with normal strings are instead `O(log n)` or `O(1)`. Some examples of operations like this:
-
-- Copying
-- Extracting a substring by index
-- Inserting one piece of text in the middle of another producing a new piece of text
-- Deleting an interval from a piece of text, producing a new piece of text
-
-Behind the scenes, `Rope` is an immutable balanced tree structure using Rust's atomic reference counting smart pointer (`Arc`) to share data, so "copying" any sub-tree is a very fast `O(1)` operation. The leaves of the tree are chunks of text with a maximum size.
-
-An example of a `O(log n)` operation is deleting an interval of a `Rope`, which only requires creating a few new nodes that reference the sub-trees to the right and left of the deleted interval, and creating up to two new leaves if the deleted interval doesn't lie on chunk boundaries.
-
-Obviously `Rope`s will be slower and take more memory than small `Strings` but they have an asymptotic advantage when working with large documents.
-
-For a deeper look at `Rope`s see the [Rope Science](rope_science_00.md) series.
-
-### Subset
-
-```rust
-struct Segment {
-    len: usize,
-    count: usize,
-}
-
-pub struct Subset {
-    /// Invariant, maintained by `SubsetBuilder`: all `Segment`s have non-zero
-    /// length, and no `Segment` has the same count as the one before it.
-    segments: Vec<Segment>,
-}
-```
-
-The `Subset` structure in `multiset.rs` represents a multi-subset of a string, meaning that every character in the string has a count (often `0`) representing how many times it is in the `Subset`. Most of the time this structure is used to represent plain-old subsets and the counts are only ever `0` for something not in the set or `1` for a character in the set. It is primarily used to efficiently represent inserted and deleted regions of a document.
-
-**Note:** The exact nature of the characters is not central to the CRDT algorithm. It's most convenient for indices to match the representation, so throughout this document "characters" are actually counting UTF-8 code units, so for example an emoji would be multiple "characters" in this sense.
-
-It stores this information compactly as a list of consecutive `Segment`s with a `length` and a `count`. This way a `Subset` representing 1000 consecutive characters in the middle of a string will only require 3 segments (a 0-count one at the start, a 1-count one in the middle, and another 0-count one at the end). So as `(len, count)` tuples this would look like: `(n, 0), (1000, 1), (m, 0)`.
-
-The primary reason that `Subset`s can have counts greater than `1` is to represent concurrent deletes, for example if two concurrent edits delete the same character, and one of them is undone, subtracting one of the deletes from the `Subset` of deleted characters should still leave the character deleted once. For this reason, the `Subset`s of deleted characters which are described later have counts that represent how many times each character has been deleted.
-
-Note that an "empty" `Subset` where all the characters have count `0` is still represented as a single segment with the length of the base string and count set to `0`. This allows functions using `Subset`s to panic if they are used with strings or other `Subset`s of the wrong length. This gives a level of dynamic checking that algorithms are using `Subset`s correctly.
-
-### Delta
-
-```rust
-enum DeltaElement {
-    /// Represents a range of text in the base document. Includes beginning, excludes end.
-    Copy(usize, usize),
-    Insert(Rope),
-}
-
-pub struct Delta {
-    els: Vec<DeltaElement>,
-    /// The total length of the base document, used for checks in some operations
-    base_len: usize,
-}
-
-pub struct InsertDelta(Delta);
-```
-
-A `Delta` represents the difference between one string (*A*) and another (*B*). It stores this as a list of intervals copied from the *A* string and new inserted sections. All the indices of the copied intervals are non-decreasing. So a deletion is represented as a section of the *A* string which isn't copied to the *B* string, and insertions are represented as inserted sections in between copied sections. `Delta` is the data structure the text editor interface creates when the user or a plugin edits the document, these are then applied to the document by the `Engine::edit_rev` operation described later.
-
-There is also a type `InsertDelta` that is just a wrapper around a `Delta` but represents a guarantee that the `Delta` only inserts, that is, the entire *A* string is copied by the `Copy` intervals.
-
-### Text, tombstones and the "union string"
-
-A super important part of being able to provide the properties we desire in our CRDT is that we never throw useful information away. This means that when you delete text in Xi, or undo an insert, the text doesn't actually get thrown away, just marked as deleted. You can think of this as if there is a "union string" that contains all the characters that have ever been inserted, with some marked as deleted.
-
-When we delete or undo, we don't touch the union string, we just change a `Subset` (`deletes_from_union`, more on that later) which marks which characters of the union string are deleted. These deleted characters are sometimes called "tombstones" both within Xi and the academic CRDT literature.
-
-If we wanted to go from the "union string" to the current text of the document, you'd delete the characters marked in `deletes_from_union` from the union string. The problem is, Xi access the current text **very often**, so this would be an inefficient way to actually store the text for large documents.
-
-As an optimization, we store the union string as two separate parts: `text` and `tombstones`. The `text` stores the current visible document contents, so it is really fast to access, and `tombstones` stores all the characters that are currently in the `deletes_from_union` set. We still store the `deletes_from_union` set to mark deleted characters. Note that the union string is still used for most indices as a coordinate space for `Subset`s like `deletes_from_union`.
-
-Here's an example of what this looks like:
-
-```
-union string:       abcdefgh
-deletes_from_union: -+---+-+
-text:               acdeg
-tombstones:         bfh
-```
-
-We can now also look at `deletes_from_union` as describing the interleaving of characters from `text` and `tombstones`:
-
-```
-text:               a cde g
-deletes_from_union: -+---+-+
-tombstones:          b   f h
-```
-
-The union string is still an important and useful concept because it makes a lot of the operations easier to implement and understand. Almost all explanations will be in terms of the union string, if you want you can largely ignore that fact that it's actually stored as two separate parts. Most operations are done in terms of the union string and then at the very end they shuffle some things around between the current `text` and `tombstones`.
-
-### Revision
-
-```rust
-struct Revision {
-    /// This uniquely represents the identity of this revision and it stays
-    /// the same even if it is rebased or merged between devices.
-    rev_id: RevId,
-    /// The largest undo group number of any edit in the history up to this
-    /// point. Used to optimize undo to not look further back.
-    max_undo_so_far: usize,
-    edit: Contents,
-}
-
-enum Contents {
-    Edit {
-        /// Used to order concurrent inserts, for example auto-indentation
-        /// should go before typed text.
-        priority: usize,
-        /// Groups related edits together so that they are undone and re-done
-        /// together. For example, an auto-indent insertion would be un-done
-        /// along with the newline that triggered it.
-        undo_group: usize,
-        /// The subset of the characters of the union string from after this
-        /// revision that were added by this revision.
-        inserts: Subset,
-        /// The subset of the characters of the union string from after this
-        /// revision that were deleted by this revision.
-        deletes: Subset,
-    },
-    Undo {
-        /// The set of groups toggled between undone and done.
-        /// Just the `symmetric_difference` (XOR) of the two sets.
-        toggled_groups: BTreeSet<usize>,  // set of undo_group id's
-        /// Used to store a reversible difference between the deleted
-        /// characters before and after this operation.
-        deletes_bitxor: Subset,
-    }
-}
-```
-
-`Revision`s represent a single edit to the document. Typing a character into a Xi document will create a new `Revision` with a `Contents::Edit` with an empty `deletes` subset and an `inserts` subset containing the character inserted.
-
-They can also represent more complex things like selecting multiple ranges of text using multiple cursors (which Xi supports) and then pasting. This would result in a `Contents::Edit` with an `inserts` subset containing multiple separate segments of pasted characters, and a `deletes` subset containing the multiple ranges of previous text that were replaced.
-
-Note that the `inserts` and `deletes` `Subset`s are based on the union string from after the `Revision` is applied. The fact that the union string includes deleted characters allows insertions and deletions to maintain their position easily in the face of concurrency and undo. For example, say I have the text "ac" and I change it to "abc", but then undo the first edit leaving "b". If I re-do the first edit, Xi needs to know that the "b" goes between the two deleted characters. You might be able to think of ways to do this with other coordinates, but it's much easier and less fraught when coordinates only change on insertions instead of insertions, deletions and undo.
-
-A key property of `Revision`s is that they contain all the necessary information to apply them as well as reverse them. This is important both for undo and also for some operations we'll get to later. This is why `Contents::undo` stores the set of toggled groups rather than the new set of undone groups. It's also why it stores a reversible set of changes to the deleted characters (more on those later), this could be found by replaying all of history using the new set of undo groups, but then it would be inefficient to apply and reverse (because it would be proportional to the length of history).
-
-### RevId & RevToken
-
-```rust
-pub struct RevId {
-    // 96 bits has a 10^(-12) chance of collision with 400 million sessions and 10^(-6) with 100 billion.
-    // `session1==session2==0` is reserved for initialization which is the same on all sessions.
-    // A colliding session will break merge invariants and the document will start crashing Xi.
-    session1: u64,
-    // if this was a tuple field instead of two fields, alignment padding would add 8 more bytes.
-    session2: u32,
-    // There will probably never be a document with more than 4 billion edits
-    // in a single session.
-    num: u32,
-}
-
-/// Valid within a session. If there's a collision the most recent matching
-/// Revision will be used, which means only the (small) set of concurrent edits
-/// could trigger incorrect behavior if they collide, so u64 is safe.
-pub type RevToken = u64;
-```
-
-`RevId` is used to uniquely identify the revision. The trick is offline devices have to be able to generate non-colliding IDs, which they do by generating random "session IDs" that become part of their revision numbers for that execution, with `num` being just an incrementing counter. The reason the IDs aren't fully random is so that eventually we can delta-compress them and the IDs will take on average 1 bit per revision instead of 128 bits. This is only necessary for the multi-device syncing case, in the single-device case the session ID is always `(1,0)`.
-
-`RevToken` is used to make the API simpler, it is just the hash of a `RevId`. This makes things easy for plugins and other things that need to reference revisions.
-
-
-### Engine
-
-```rust
-/// Represents the current state of a document and all of its history
-pub struct Engine {
-    /// The session ID used to create new `RevId`s for edits made on this device
-    session: SessionId,
-    /// The incrementing revision number counter for this session used for `RevId`s
-    rev_id_counter: u32,
-    /// The current contents of the document as would be displayed on screen
-    text: Rope,
-    /// Storage for all the characters that have been deleted  but could
-    /// return if a delete is un-done or an insert is re- done.
-    tombstones: Rope,
-    /// Imagine a "union string" that contained all the characters ever
-    /// inserted, including the ones that were later deleted, in the locations
-    /// they would be if they hadn't been deleted.
-    ///
-    /// This is a `Subset` of the "union string" representing the characters
-    /// that are currently deleted, and thus in `tombstones` rather than
-    /// `text`. The count of a character in `deletes_from_union` represents
-    /// how many times it has been deleted, so if a character is deleted twice
-    /// concurrently it will have count `2` so that undoing one delete but not
-    /// the other doesn't make it re-appear.
-    ///
-    /// You could construct the "union string" from `text`, `tombstones` and
-    /// `deletes_from_union` by splicing a segment of `tombstones` into `text`
-    /// wherever there's a non-zero-count segment in `deletes_from_union`.
-    deletes_from_union: Subset,
-    undone_groups: BTreeSet<usize>,  // set of undo_group id's
-    /// The revision history of the document
-    revs: Vec<Revision>,
-}
-
-/// the session ID component of a `RevId`
-pub type SessionId = (u64, u32);
-```
-
-`Engine` is the top-level container of text state for the CRDT. It stores the current state of the document and all the `Revision`s that lead up to it. This allows operations that require knowledge of history to apply `Revision`s in reverse from the current state to find the state at a point in the past, without having to store the state at every point in history. Be sure to read the code in this case, all the fields are described by doc comments.
-
-**SUPER IMPORTANT INSIGHT:** Because the union string preserves the textual ordering of inserted characters, indices in the union string only depend on the set of inserted characters and not what order they were added in the history. This means that the correct representation of a `Revision` for a given edit *doesn't depend on the order* of `Revision`s before it in the history, only what *set* of `Revision`s is before it.
-
-### Example History
-
-Bringing it all together, here's a sketch of how a simple editing scenario would be represented this way.
-
-![Representation example](img/representation-overview.png)
-
-Shown below is a longer history of `Edit` `Revision`s. At each point, the `inserts` and `deletes` `Subset`s of the `Revision` that was just added are shown. Below that is what the contents of `Engine` would be immediately after that `Revision` was added to it.
-
-Also included is a "Concepts" section that includes things that aren't actually stored but are useful for understanding the representation. This includes the "union" string that all indices are based on. It also includes `back_computed_deletions_from_6_union`, which is like `deletes_from_union` except instead of being based on the union at the time of the edit, it is based on the union of `Revision` 6. This shows that since we never throw away information, we can represent the `text` at any past `Revision` as a set of deletions from the union string of any later revision.
-
-```
-()  Revision: before any revisions are made
-    Engine:   text="" tombstones="" deletes_from_union={}
-    Concepts: union="" back_computed_deletions_from_6_union={0,1,2,3,4,5}
-(1) Revision: inserts={0, 1, 2} deletes={}
-    Engine:   text="123" tombstones="" deletes_from_union={}
-    Concepts: union="123" back_computed_deletions_from_6_union={0,1,2}
-(2) Revision: inserts={} deletes={0, 1, 2}
-    Engine:   text="" tombstones="123" deletes_from_union={0,1,2}
-    Concepts: union="123" back_computed_deletions_from_6_union={0,1,2,3,4,5}
-(3) Revision: inserts={0} deletes={}
-    Engine:   text="a" tombstones="123" deletes_from_union={1,2,3}
-    Concepts: union="a123" back_computed_deletions_from_6_union={1,2,3,4,5}
-(4) Revision: inserts={1} deletes={}
-    Engine:   text="ab" tombstones="123" deletes_from_union={2,3,4}
-    Concepts: union="ab123" back_computed_deletions_from_6_union={1,3,4,5}
-(5) Revision: inserts={1} deletes={}
-    Engine:   text="axb" tombstones="123" deletes_from_union={3,4,5}
-    Concepts: union="axb123" back_computed_deletions_from_6_union={3,4,5}
-(6) Revision: inserts={} deletes={1}
-    Engine:   text="ab" tombstones="x123" deletes_from_union={1,3,4,5}
-    Concepts: union="axb123"
-```
-
-## Operations
-
-Now that you know what we have to work with, let's go over the operations that `Engine` supports. Each of these operations relies on a bunch of different shared helpers, as we go from the simplest operations to the most complex, we'll gradually build up the set of helpers we use.
-
-After describing how each operation or helper works there'll often be a code block with the actual function, it isn't necessary to understand the code and it may have complications that aren't mentioned, so feel free to skip them, they're there if you want to confirm or enhance your understanding.
-
-### Subset helpers
-
-`Subset` has a number of operations that produce new `Subset`s, these form the core of most work the CRDT operations do. It's better to explain them together near the start since they're used everywhere:
-
-#### Subset::union
-
-Takes two `Subset`s and produces a new `Subset` of the same string where each character has the sum of the counts it has in each input. When treating a `Subset` as a normal set, this is just the union.
-
-#### Subset::transform_expand
-
-`Subset::transform_expand` takes a `Subset` and another "transform" `Subset` and transforms the first `Subset` through the coordinate transform represented by the "transform". Now what does this mean:
-
-
-`Revision`s are never modified, and their `Edit`s always refer to the union string that existed when they were created. For operations on multiple `Revision`s, we have to be able to map coordinates in one's union string to coordinates in another's. We can deal with this by treating `Subset`s of inserted characters as coordinate transforms. Since the only difference to the union string is the inserted characters, if we can map the coordinates of a `Subset` from one union string to another, we can work with edits from multiple `Revision`s together.
-
-We can do this by "expanding" the indices in a `Subset` after each insert by the size of that insert, where the inserted characters are the "transform". Conceptually if a `Subset` represents the set of characters in a string that were inserted by an edit, then it can be used as a transform from the coordinate space before that edit to after that edit by mapping a `Subset` of the string before the insertion onto the 0-count regions of the transform `Subset`.
-
-The actual procedure works by iterating over the segments of the transform:
-
-- When it encounters a 0-count segment it keeps putting (potentially partial) segments from `self` into the output until it fills its size.
-- When it encounters a non-0-count transform segment it outputs a 0-count segment of the same size.
-
-The `SubsetBuilder` used for the output automatically merges consecutive segments that have the same count. See the diagram below for how this plays out:
-
-![transform_expand workings](img/trans-expand-1.png)
-
-One example of how this can be used is to find the characters that were inserted by a past `Revision` in the coordinates of the current union string instead of the past one:
-
-![transform_expand usage](img/trans-expand-2.png)
-
-```rust
-/// Map the contents of `self` into the 0-regions of `other`.
-/// Precondition: `self.count(CountMatcher::All) == other.count(CountMatcher::Zero)`
-fn transform(&self, other: &Subset, union: bool) -> Subset {
-    let mut sb = SubsetBuilder::new();
-    let mut seg_iter = self.segments.iter();
-    let mut cur_seg = Segment {len: 0, count: 0};
-    for oseg in &other.segments {
-        if oseg.count > 0 {
-            sb.push_segment(oseg.len, if union { oseg.count } else { 0 });
-        } else {
-            // fill 0-region with segments from self.
-            let mut to_be_consumed = oseg.len;
-            while to_be_consumed > 0 {
-                if cur_seg.len == 0 {
-                    cur_seg = seg_iter.next().expect("self must cover all 0-regions of other").clone();
-                }
-                // consume as much of the segment as possible and necessary
-                let to_consume = cmp::min(cur_seg.len,to_be_consumed);
-                sb.push_segment(to_consume,cur_seg.count);
-                to_be_consumed -= to_consume;
-                cur_seg.len -= to_consume;
-            }
-        }
-    }
-    assert_eq!(cur_seg.len, 0, "the 0-regions of other must be the size of self");
-    assert_eq!(seg_iter.next(), None, "the 0-regions of other must be the size of self");
-    sb.build()
-}
-
-/// Transform through coordinate transform represented by other.
-/// The equation satisfied is as follows:
-///
-/// s1 = other.delete_from_string(s0)
-///
-/// s2 = self.delete_from_string(s1)
-///
-/// element in self.transform_expand(other).delete_from_string(s0) if (not in s1) or in s2
-pub fn transform_expand(&self, other: &Subset) -> Subset {
-    self.transform(other, false)
-}
-```
-
-#### Subset::transform_union
-
-Like `transform_expand` except it preserves the non-zero segments of the transform instead of mapping them to 0-segments. This is the same as `transform_expand`ing and then taking the `union` with the transform, but more efficient. These two operations are frequently chained so a shortcut is useful, for example to transform a set of deletions to the coordinate space including some new characters, while also adding those insertions to the deleted set. So:
-
-```rust
-a.transform_union(&b) == a.transform_expand(&b).union(&b)
-```
-
-#### Subset::transform_shrink
-
-The reverse of `Subset::transform_expand`. It takes a `Subset` and a transform `Subset` that are based on the same string and removes sections of the former that align with non-zero segments of the latter. In most uses these sections of the former always have count 0 (otherwise this transform would lose information), but there are some things like garbage collection that intentionally use this to discard information.
-
-```rust
-/// Transform subset through other coordinate transform, shrinking.
-/// The following equation is satisfied:
-///
-/// C = A.transform_expand(B)
-///
-/// B.transform_shrink(C).delete_from_string(C.delete_from_string(s)) =
-///   A.delete_from_string(B.delete_from_string(s))
-pub fn transform_shrink(&self, other: &Subset) -> Subset {
-    let mut sb = SubsetBuilder::new();
-    // discard ZipSegments where the shrinking set has positive count
-    for zseg in self.zip(other) {
-        // TODO: should this actually do something like subtract counts?
-        if zseg.b_count == 0 {
-            sb.push_segment(zseg.len, zseg.a_count);
-        }
-    }
-    sb.build()
-}
-```
-
-### Engine::get_rev
-
-This operation is used in the plugin API and is probably the simplest operation, but it still relies on a lot of sub-steps that are shared with other operations.
-
-The idea behind how it works is that we already have all the characters we need in the `text` and `tombstones` `Rope`s we store, but some of the characters from the past revision might have been deleted, and some new characters might have been inserted that weren't in the past revision. We need to find a way to delete the newer insertions from `text` and insert the things that weren't deleted at the past point from where they are in `tombstones`.
-
-The way we describe the current state of `text` and `tombstones` relative to the "union string" is with `deletes_from_union` (see [Engine](#engine)), so what if we could find a similar `old_deletes_from_cur_union` that represented what the old revision's text looked like relative to the current union string. This would be the same as our current `deletes_from_union` except characters inserted after the old revision would be marked deleted and newer deletes would be un-marked. The function that finds this is `Engine::deletes_from_cur_union_for_index`.
-
-Once we have this `old_deletes_from_cur_union` and a new `deletes_from_union`, we need a way to take our current `text` and `tombstones` and get a `Rope` of what the `text` would have looked like at that old revision. We can do this by performing inserts and deletes on the `text` `Rope` based on the differences between the old and new deletions. We already have a way of describing inserts and deletes (a `Delta`), and we can create one using a helper called `Delta::synthesize`.
-
-Then we just have to apply the `Delta` we synthesized to the current `text`, returning the resulting old text.
-
-```rust
-/// Get text of a given revision, if it can be found.
-pub fn get_rev(&self, rev: RevToken) -> Option<Rope> {
-    self.find_rev_token(rev).map(|rev_index| self.rev_content_for_index(rev_index))
-}
-
-/// Get text of a given revision, if it can be found.
-fn rev_content_for_index(&self, rev_index: usize) -> Rope {
-    let old_deletes_from_union = self.deletes_from_cur_union_for_index(rev_index);
-    let delta = Delta::synthesize(&self.tombstones,
-        &self.deletes_from_union, &old_deletes_from_union);
-    delta.apply(&self.text)
-}
-```
-
-#### Engine::deletes_from_cur_union_for_index
-
-If you look back at the [example history scenario](#example-history), you'll see `back_computed_deletions_from_6_union`, which shows that for any past `Revision` we can find a set of deletions from the current union string that result in the past text. This helper is what computes deletion sets like [`back_computed_deletions_from_6_union`](#example-history).
-
-We can find an `old_deletes_from_cur_union` by taking our current `deletes_from_union` and walking backwards through our list of `Revision`s undoing the changes they have made since the old revision.
-
-There's a problem with this though, the `inserts` and `deletes` subsets for a `Revision` use indices in the coordinate space of the union string at the time the `Revision` was created, which may be smaller than our current union string.
-
-We could keep track of the transform and account for it, but it's easier to use a helper we need anyway elsewhere that computes what the `deletes_from_union` actually would have been at that previous point in time, that is, relative to the old union string not the current one like we want. This helper is called `Engine::deletes_from_union_for_index` and it performs the work of un-deleting and un-undoing everything after the old revision.
-
-Then we can take this `old_deletes_from_union` and `Subset::transform_union` it through the `inserts` since that old revision to get the `old_deletes_from_cur_union` we wanted. This puts it in the right coordinate space and the `union` part of `transform_union` makes sure that new inserts are considered as deleted (so not present) in `old_deletes_from_cur_union`.
-
-```rust
-/// Get the Subset to delete from the current union string in order to obtain a revision's content
-fn deletes_from_cur_union_for_index(&self, rev_index: usize) -> Cow<Subset> {
-    let mut deletes_from_union = self.deletes_from_union_for_index(rev_index);
-    for rev in &self.revs[rev_index + 1..] {
-        if let Edit { ref inserts, .. } = rev.edit {
-            if !inserts.is_empty() {
-                deletes_from_union = Cow::Owned(deletes_from_union.transform_union(inserts));
-            }
-        }
-    }
-    deletes_from_union
-}
-```
-
-#### Engine::deletes_from_union_for_index
-
-This function uses the property that each `Revision` contains the information necessary to reverse it, in order to work backwards from the current state of `deletes_from_union` to the past state. For every `Edit` revision it `subtract`s the `deletes` (meaning if something was deleted twice, this will only reverse one), but only if they weren't undone, and then uses `transform_shrink` to reverse the coordinate transform of the `inserts` so that the indices in the intermediate `old_deletes_from_union` refer to the previous union string. `Undo` edits store the symmetric differences of the `deletes_from_union` and the currently undone groups, so those are just reversed.
-
-```rust
-/// Find what the `deletes_from_union` field in Engine would have been at the time
-/// of a certain `rev_index`. In other words, the deletes from the union string at that time.
-fn deletes_from_union_for_index(&self, rev_index: usize) -> Cow<Subset> {
-    self.deletes_from_union_before_index(rev_index + 1, true)
-}
-
-/// Garbage collection means undo can sometimes need to replay the very first
-/// revision, and so needs a way to get the deletion set before then.
-fn deletes_from_union_before_index(&self, rev_index: usize, invert_undos: bool) -> Cow<Subset> {
-    let mut deletes_from_union = Cow::Borrowed(&self.deletes_from_union);
-    let mut undone_groups = Cow::Borrowed(&self.undone_groups);
-
-    // invert the changes to deletes_from_union starting in the present and working backwards
-    for rev in self.revs[rev_index..].iter().rev() {
-        deletes_from_union = match rev.edit {
-            Edit { ref inserts, ref deletes, ref undo_group, .. } => {
-                if undone_groups.contains(undo_group) {
-                    // no need to un-delete undone inserts since we'll just shrink them out
-                    Cow::Owned(deletes_from_union.transform_shrink(inserts))
-                } else {
-                    let un_deleted = deletes_from_union.subtract(deletes);
-                    Cow::Owned(un_deleted.transform_shrink(inserts))
-                }
-            }
-            Undo { ref toggled_groups, ref deletes_bitxor } => {
-                if invert_undos {
-                    let new_undone = undone_groups.symmetric_difference(toggled_groups).cloned().collect();
-                    undone_groups = Cow::Owned(new_undone);
-                    Cow::Owned(deletes_from_union.bitxor(deletes_bitxor))
-                } else {
-                    deletes_from_union
-                }
-            }
-        }
-    }
-    deletes_from_union
-}
-```
-
-#### Delta::synthesize
-
-This function is just a big hand-written triply-nested looping algorithm that loops over a `from_dels` and `to_dels` subset and uses a `tombstones` to construct a `Delta`. It's not particularly interesting, easy or worthwhile to understand.
-
-```rust
-/// Synthesize a delta from a "union string" and two subsets: an old set
-/// of deletions and a new set of deletions from the union. The Delta is
-/// from text to text, not union to union; anything in both subsets will
-/// be assumed to be missing from the Delta base and the new text. You can
-/// also think of these as a set of insertions and one of deletions, with
-/// overlap doing nothing. This is basically the inverse of `factor`.
-///
-/// Since only the deleted portions of the union string are necessary,
-/// instead of requiring a union string the function takes a `tombstones`
-/// rope which contains the deleted portions of the union string. The
-/// `from_dels` subset must be the interleaving of `tombstones` into the
-/// union string.
-pub fn synthesize(tombstones: &Node<N>, from_dels: &Subset, to_dels: &Subset) -> Delta<N> {
-  // ...
-}
-```
-
-### Engine::delta_rev_head
-
-This operation is similar to `Engine::get_head` except it returns a `Delta` from the text at a specified revision to the current head text. This is useful for things like updating the position of cursors and rich text spans when edits are made.
-
-Like `Engine::get_head` it starts by calling `Engine::deletes_from_cur_union_for_index` to get a `Subset` describing the state of the text at the old revision relative to the current union string. Now we can just use `Delta::synthesize` to create a `Delta` from the old to the new `deletes_from_union`. The problem is, `Delta::synthesize` expects the tombstones `Rope` you give it to correspond to `from_dels`, but we have one for `to_dels`. To fix this, we can use a helper called `shuffle_tombstones` to move characters in and out of the tombstones to get an `old_tombstones` corresponding to `from_dels`.
-
-#### shuffle_tombstones
-
-Constructing a `tombstones` to go with an older `deletes_from_union` given the current `text`, `tombstones` and `deletes_from_union` may involve moving characters from `text` to the old `tombstones`, and removing characters from the `tombstones` that weren't deleted at the time. We can describe the necessary changes using a `Delta`, but how do we create it?
-
-We can note that since the 0-segments of `deletes_from_union` correspond to characters in `text` and the non-zero segments correspond to characters in `tombstones`, if we take the complement (0 becomes 1, non-zero becomes 0) of `deletes_from_union` we can use helpers designed for use with tombstones on `text` and vice-versa. So we can use `Delta::synthesize` with the `text` (where you would normally put the tombstones) and the complement of the old and new `deletes_from_union` to create the required `Delta` of the `tombstones` when it normally creates deltas of `text`.
-
-```rust
-/// Move sections from text to tombstones and out of tombstones based on a new and old set of deletions
-fn shuffle_tombstones(text: &Rope, tombstones: &Rope,
-        old_deletes_from_union: &Subset, new_deletes_from_union: &Subset) -> Rope {
-    // Taking the complement of deletes_from_union leads to an interleaving valid for swapped text and tombstones,
-    // allowing us to use the same method to insert the text into the tombstones.
-    let inverse_tombstones_map = old_deletes_from_union.complement();
-    let move_delta = Delta::synthesize(text, &inverse_tombstones_map, &new_deletes_from_union.complement());
-    move_delta.apply(tombstones)
-}
-```
-
-### Engine::edit_rev
-
-This is the mini-CRDT function, it enables concurrent edits, but each peer can only have one in flight at a time and all edits must go through a central server. The form this takes is that you can submit `Delta`s to the `Engine` that are based on a revision that is not the current head. For example a plugin can get the text at a revision, make an edit and submit it along with the `RevToken` it is based on, but by that time there might have been new edits. That's not a problem since `edit_rev` can accept an arbitrary past `base_rev`.
-
-This operation has a number of stages:
-
-1. Use the `Delta::factor` helper to split the given `delta` into `ins_delta` and `deletes`. This helper returns an `InsertDelta` containing only the inserts and a `Subset` based on the text (before the inserts) containing the deleted characters. When you see "delta" from now on, it refers to both pieces.
-1. Use `Engine::deletes_from_union_for_index` to work backwards from the present to find the `deletes_from_union` at the time of the base revision: `deletes_at_rev`.
-1. Transform the delta to be based on the union string at the time of `base_rev` rather than the `text` at the time of `base_rev`. This makes later transformations easier.
-    - The `deletes` are transformed using `Subset::transform_expand` to expand the indices to include the characters that weren't in the text the `deletes` was based on.
-    - `ins_delta` is transformed using the similar `InsertDelta::transform_expand` helper. The thing is, with inserts it is ambigous if deleted characters between the same two characters in `text` should be placed before or after characters inserted in the same place.
-
-        This comes into play with arbitrary undo, where if we have "abc", we delete "b", and then insert to get "azc", then undo the deletion of "b", should we get "abzc" or "azbc"? We decided to put the inserts after the deletes, so we would get "abzc", but it's not important.
-1. Transform the delta to be based on the current head revision's union string instead of `base_rev`'s union string.
-    - This is done by looping over every `Edit` `Revision` since `base_rev` and `transform_expand`-ing both the `ins_delta` and `deletes` by the inserted characters.
-    - But again we have the problem of whether we put the `ins_delta` inserts before or after inserts in the same place since then. For this we use the `priority` field of `Revision`. The `priority` of the incoming edit we're transforming is compared with the `priority` of the inserts we're transforming it by, and they're ordered in ascending order of priority.
-    - Each concurrent plugin has a different `priority` and they are useful for expressing what we expect concurrent edits to do. For example inserted auto-indentation should come before new user edits, but matched brackets should come after concurrent user edits, we can set the `priority` of the plugins to get this behavior. In the case of concurrent edits by the same plugin on different synced devices we break ties by session ID.
-1. `Subset::transform_expand` the `deletes` to apply to the head union string after `ins_delta` is applied instead of before. This matches the meaning of `inserts` and `deletes` in `Revision`, whereas `Delta::factor` gives them to us based on the same string. We `transform_expand` a `Subset` by an `InsertDelta` by first using the `InsertDelta::inserted_subset` helper to get a `Subset` of the post-insert string designating which characters were inserted.
-1. Transform the `ins_delta` to be based on the head `text` instead of the union string. Now that we've done all the transformation, we can commit it, and since inserts can only affect the `text` we can use `Subset::transform_shrink` and know that only `Copy` regions of the `InsertDelta` will be collapsed so that the indices of inserted segments can be applied to `text`.
-1. Apply the `ins_delta` to `text` using `Delta::apply` and also `transform_expand` `deletes_from_union` to include the newly inserted characters.
-1. Now that we've applied the inserts, we just need to apply the deletions. But wait! What if the undo group of this edit was undone between `base_rev` and now? The edit might already be undone, in which case the `deletes` shouldn't apply and the inserted characters should be deleted.
-    1. We solve this by checking if our undo group is currently undone and if it is we set `to_delete` to the inserted characters, and otherwise set it to `deletes`.
-    1. Then we compute a new `deletes_from_union` by using `Subset::union` to delete the characters in `to_delete`.
-1. We use a helper called `shuffle` which is like (and uses) `shuffle_tombstones` but it updates both the `text` and `tombstones` from corresponding to an old `deletes_from_union` to a new one. It "shuffles" characters between `text` and `tombstones` as necessary so that their new state corresponds to the new `deletes_from_union`.
-
-And that's it, after that we just package up the inserted and deleted characters into a `Revision` and add it to the list of `revs` in `Engine`.
-
-```rust
-/// Returns a tuple of a new `Revision` representing the edit based on the
-/// current head, a new text `Rope`, a new tombstones `Rope` and a new `deletes_from_union`.
-fn mk_new_rev(&self, new_priority: usize, undo_group: usize,
-        base_rev: RevToken, delta: Delta<RopeInfo>) -> (Revision, Rope, Rope, Subset) {
-    let ix = self.find_rev_token(base_rev).expect("base revision not found");
-    // 1. split
-    let (ins_delta, deletes) = delta.factor();
-
-    // 2. Work backwards to find the old deletes_from_union
-    let deletes_at_rev = self.deletes_from_union_for_index(ix);
-    // 3. rebase delta to be on the base_rev union instead of the text
-    let mut union_ins_delta = ins_delta.transform_expand(&deletes_at_rev, true);
-    let mut new_deletes = deletes.transform_expand(&deletes_at_rev);
-
-    // 4. rebase the delta to be on the head union instead of the base_rev union
-    let new_full_priority = FullPriority { priority: new_priority, session_id: self.session };
-    for r in &self.revs[ix + 1..] {
-        if let Edit { priority, ref inserts, .. } = r.edit {
-            if !inserts.is_empty() {
-                let full_priority = FullPriority { priority, session_id: r.rev_id.session_id() };
-                let after = new_full_priority >= full_priority;  // should never be ==
-                union_ins_delta = union_ins_delta.transform_expand(inserts, after);
-                new_deletes = new_deletes.transform_expand(inserts);
-            }
-        }
-    }
-
-    // 5. rebase the deletion to be after the inserts instead of directly on the head union
-    let new_inserts = union_ins_delta.inserted_subset();
-    if !new_inserts.is_empty() {
-        new_deletes = new_deletes.transform_expand(&new_inserts);
-    }
-
-    // 6. rebase insertions on text
-    let cur_deletes_from_union = &self.deletes_from_union;
-    let text_ins_delta = union_ins_delta.transform_shrink(cur_deletes_from_union);
-    // 7. apply inserts and rebase deletes_from_union
-    let text_with_inserts = text_ins_delta.apply(&self.text);
-    let rebased_deletes_from_union = cur_deletes_from_union.transform_expand(&new_inserts);
-
-    // 8. is the new edit in an undo group that was already undone due to concurrency?
-    let undone = self.undone_groups.contains(&undo_group);
-    let new_deletes_from_union = {
-        let to_delete = if undone { &new_inserts } else { &new_deletes };
-        rebased_deletes_from_union.union(to_delete)
-    };
-
-    // 9. move deleted or undone-inserted things from text to tombstones
-    let (new_text, new_tombstones) = shuffle(&text_with_inserts, &self.tombstones,
-        &rebased_deletes_from_union, &new_deletes_from_union);
-
-    let head_rev = &self.revs.last().unwrap();
-    (Revision {
-        rev_id: self.next_rev_id(),
-        max_undo_so_far: std::cmp::max(undo_group, head_rev.max_undo_so_far),
-        edit: Edit {
-            priority: new_priority,
-            undo_group: undo_group,
-            inserts: new_inserts,
-            deletes: new_deletes,
-        }
-    }, new_text, new_tombstones, new_deletes_from_union)
-}
-
-// TODO: have `base_rev` be an index so that it can be used maximally efficiently with the
-// head revision, a token or a revision ID. Efficiency loss of token is negligible but unfortunate.
-pub fn edit_rev(&mut self, priority: usize, undo_group: usize,
-        base_rev: RevToken, delta: Delta<RopeInfo>) {
-    let (new_rev, new_text, new_tombstones, new_deletes_from_union) =
-        self.mk_new_rev(priority, undo_group, base_rev, delta);
-    self.rev_id_counter += 1;
-    self.revs.push(new_rev);
-    self.text = new_text;
-    self.tombstones = new_tombstones;
-    self.deletes_from_union = new_deletes_from_union;
-}
-```
-
-#### InsertDelta::transform_expand
-
-This is another big function with lots of nested loops. Unlike `Subset::transform_expand` it takes a boolean parameter `after` that resolves the ambiguity of whether inserts should go before or after the characters being transformed over.
-
-```rust
-/// Do a coordinate transformation on an insert-only delta. The `after` parameter
-/// controls whether the insertions in `self` come after those specific in the
-/// coordinate transform.
-pub fn transform_expand(&self, xform: &Subset, after: bool) -> InsertDelta<N> {
-    // ...
-}
-```
-
-#### shuffle
-
-This helper is used in many different operations that use the pattern of computing how `deletes_from_union` should change and then updating `text` and `tombstones` to reflect that new state.
-
-```rust
-/// Move sections from text to tombstones and vice versa based on a new and old set of deletions.
-/// Returns a tuple of a new text `Rope` and a new `Tombstones` rope described by `new_deletes_from_union`.
-fn shuffle(text: &Rope, tombstones: &Rope,
-        old_deletes_from_union: &Subset, new_deletes_from_union: &Subset) -> (Rope,Rope) {
-    // Delta that deletes the right bits from the text
-    let del_delta = Delta::synthesize(tombstones, old_deletes_from_union, new_deletes_from_union);
-    let new_text = del_delta.apply(text);
-    (new_text, shuffle_tombstones(text,tombstones,old_deletes_from_union,new_deletes_from_union))
-}
-```
-
-### Engine::undo
-
-Undo works conceptually by rewinding to the earliest point in history that a toggled undo group appears, and replaying history from there but with revisions in the new `undone_groups` not applied.
-
-1. First, it uses the `max_undo_so_far` field on every `Revision` as well as the set of changed undo groups to find the latest point before any of the changed groups were used.
-1. Next it uses `Engine::deletes_from_union_before_index` to find the `deletes_from_union` before that earliest revision. The earliest revision might have been the very first one so that's why we need to get it from *before* the revision and not *at* the previous revision.
-1. Then it loops over history after that point manipulating `deletes_from_union` to either `transform_expand` by the `inserts` and `union` the `deletes` in the normal case, or `transform_union` (transform then delete) over the `inserts` in the undone case.
-1. Now that it has a fixed `deletes_from_union` it uses `shuffle` to update `text` and `tombstones`.
-
-```rust
-// This computes undo all the way from the beginning. An optimization would be to not
-// recompute the prefix up to where the history diverges, but it's not clear that's
-// even worth the code complexity.
-fn compute_undo(&self, groups: &BTreeSet<usize>) -> (Revision, Subset) {
-    let toggled_groups = self.undone_groups.symmetric_difference(&groups).cloned().collect();
-    let first_candidate = self.find_first_undo_candidate_index(&toggled_groups);
-    // the `false` below: don't invert undos since our first_candidate is based on the current undo set, not past
-    let mut deletes_from_union = self.deletes_from_union_before_index(first_candidate, false).into_owned();
-
-    for rev in &self.revs[first_candidate..] {
-        if let Edit { ref undo_group, ref inserts, ref deletes, .. } = rev.edit {
-            if groups.contains(undo_group) {
-                if !inserts.is_empty() {
-                    deletes_from_union = deletes_from_union.transform_union(inserts);
-                }
-            } else {
-                if !inserts.is_empty() {
-                    deletes_from_union = deletes_from_union.transform_expand(inserts);
-                }
-                if !deletes.is_empty() {
-                    deletes_from_union = deletes_from_union.union(deletes);
-                }
-            }
-        }
-    }
-
-    let deletes_bitxor = self.deletes_from_union.bitxor(&deletes_from_union);
-    let max_undo_so_far = self.revs.last().unwrap().max_undo_so_far;
-    (Revision {
-        rev_id: self.next_rev_id(),
-        max_undo_so_far,
-        edit: Undo { toggled_groups, deletes_bitxor }
-    }, deletes_from_union)
-}
-
-pub fn undo(&mut self, groups: BTreeSet<usize>) {
-    let (new_rev, new_deletes_from_union) = self.compute_undo(&groups);
-
-    let (new_text, new_tombstones) =
-        shuffle(&self.text, &self.tombstones, &self.deletes_from_union, &new_deletes_from_union);
-
-    self.text = new_text;
-    self.tombstones = new_tombstones;
-    self.deletes_from_union = new_deletes_from_union;
-    self.undone_groups = groups;
-    self.revs.push(new_rev);
-    self.rev_id_counter += 1;
-}
-```
-
-### Engine::gc
-
-This is a large function that is only used in the single-device case to limit the size of history and the size of `deletes_from_union` so that operations like insertion and undo are always fast even on large documents with long histories. It throws away information, so it is incorrect in the multi-device case, and so we have plans for optimizing all our representations and algorithms so that it is unnecessary and we can remove it. It's not particularly interesting, if you want to see how it works you can read the code.
-
-### Engine::merge
-
-This is the operation you were (maybe) waiting for! The CRDT merge operation that allows peer-to-peer syncing of edits in a conflict-free eventually-consistent way. It takes `self` and another instance of `Engine` and incorporates any changes which that `Engine` has into `self`.
-
-It does this by finding changes which the other `Engine` has but `self` doesn't and doing a whole bunch of transformations so that those edits can be appended directly on to the end of `self`'s list of `revs`. The append-only nature of merge preserves the ability for operations like `Engine::delta_rev_head` to work, and allows future optimizations of how things are persisted.
-
-The fact that, even in a merge, `Revision`s are only ever appended leads to the interesting fact that two peers (Separate devices/engines that share state my merging) can have `Engine`s that represent the same document contents and history, but where the `Revision`s are in a totally different order. This is fine though because the `Revision` ids allow us to compare the identity of two `Revision`s even if their `Subset`s are different due to transforms, and undo groups allow us to maintain and manipulate undo history order separately from CRDT history order.
-
-In practice the order of the `Revision` history will tend to be very similar between peers. Any edit that occurs while another edit is visible on screen (present in this peer's `Engine`) will never be re-ordered before that visible edit. Thus if there are no concurrent edits made on devices that sync with each other by merging, the devices will end up with the same `Revision` history.
-
-**Note:** As of the time this was written, Xi's `merge` implementation does not support undo operations, and will panic if one is encountered. We plan to fix this and expect that the structure of the merge operation will stay the same, just with more cases. So for the rest of this description, presume `Edit`s are the only type of `Revision`.
-
-#### Base and common revisions
-
-An important part of merging is figuring out which revisions the two sides have in common. These common revisions are found as two parts:
-
-1. The "base": A prefix of the same length of both histories such that the set of revisions in both prefixes is the same.
-    - Note that they aren't necessarily in the same order, just all shared. That's because all indices are relative to the union string, which is the same regardless of the order of the revisions that created it.
-    - We ignore everything in this prefix, so the longer it is the faster the merge runs, but a length of 0 is perfectly fine and in fact at the time this was written, that's what Xi uses.
-    - Ideally this should be the longest prefix length such that the set of revisions in the prefix is equal in both histories, and we plan on using this later as an important optimization.
-1. The "common" revisions: After the base, some revisions on each side will be shared by both sides. The common revisions are the intersection of the two revision sets after the base.
-    - Note that the common revisions aren't necessarily in the same positions or order on each side.
-
-![CRDT Merge Flow Example](img/merge-intro.png)
-
-If you're wondering how you can end up with common revisions not in the base, and in different positions and ordering, it's rare, but it can happen under high levels of asynchrony. These cases can occur even with only two peers.
-
-See the example sequence below, where the boxes represent revisions, and the arrows represent merges. The red arrow with its two sides illustrated below it, shows such a tricky merge.
-
-This example isn't meant to show a networking scenario, just a legal sequence of applying operations on two CRDT instances. These scenarios can be caused by asynchrony of the network, but exactly how depends on the syncing topology and ordering guarantees, some ways of using `merge` may require 3 peers to trigger a case like this in real use.
-
-![CRDT merge common in different order](img/merge-common-diff-3.png)
-
-The first two steps of the `merge` operation are to find the base index and common revision set.
-As of writing these are both the easiest possible correct representations, and not the fastest ones, but we plan on optimizing soon.
-
-```rust
-/// Find an index before which everything is the same
-fn find_base_index(a: &[Revision], b: &[Revision]) -> usize {
-    assert!(a.len() > 0 && b.len() > 0);
-    assert!(a[0].rev_id == b[0].rev_id);
-    // TODO find the maximum base revision.
-    // returning 1 should have the same behavior, but worse performance
-    return 1;
-}
-
-/// Find a set of revisions common to both lists
-fn find_common(a: &[Revision], b: &[Revision]) -> BTreeSet<RevId> {
-    // TODO make this faster somehow?
-    let a_ids: BTreeSet<RevId> = a.iter().map(|r| r.rev_id).collect();
-    let b_ids: BTreeSet<RevId> = b.iter().map(|r| r.rev_id).collect();
-    a_ids.intersection(&b_ids).cloned().collect()
-}
-```
-
-#### Rearranging
-
-To make the rest of the algorithm easier, it would be nice if we didn't have to worry about any of the common revisions and could just work with the new revisions on each side. We can realize this by transforming and reordering all the new revisions on each side after all of the common revisions.
-
-We can safely use transforms to reorder two revisions if neither of the revisions depends on the other. A revision depends on all the revisions that were in the `Engine` at the time `Engine::edit_rev` was called. We know that a new revision can't depend on a common revision after it, because the append-only nature means that ordering couldn't occur. Furthermore, the common revision can't depend on the new revision, because by definitions the other peer has the common revision but not the new revision, and merges never merge a revision but not its dependencies. Thus, even without explicit dependency information, we know we can reorder all the new revisions on each side after all the common revisions.
-
-Note that though it's nice to think about it as reordering the histories, really we just need to compute the transformed new revisions, transforming each new revision to be based on all common revisions after it. See the "computed" and "taken to next step" annotations of the diagram below, they are what `rearrange` returns, note that transformed operations are marked with a prime tick but they maintain their ID.
-
-![CRDT merge rearrange](img/merge-rearrange.png)
-
-We do the rearranging by working from the end of the list of revisions to the beginning. We build up a `Subset` representing all the characters that were added to the union string by the common revisions after each point. Starting with the identity transformation (an entirely 0-count `Subset`), whenever we encounter a common revision we add the characters it inserts to the transform. When we encounter a new revision we `transform_expand` its inserts and deletes by the transform `Subset` and add it to the output `Vec`. Then we `transform_shrink` the transform `Subset` by the characters inserted in the new revision, because we only want to fast-forward new revisions over common revisions after them, not new revisions after them.
-
-That was likely too imprecise and hard to follow, so here's an example diagram and the code:
-
-![CRDT merge rearrange example](img/merge-rearrange-example.png)
-
-```rust
-/// Returns the operations in `revs` that don't have their `rev_id` in
-/// `base_revs`, but modified so that they are in the same order but based on
-/// the `base_revs`. This allows the rest of the merge to operate on only
-/// revisions not shared by both sides.
-///
-/// Conceptually, see the diagram below, with `.` being base revs and `n` being
-/// non-base revs, `N` being transformed non-base revs, and rearranges it:
-/// .n..n...nn..  -> ........NNNN -> returns vec![N,N,N,N]
-fn rearrange(revs: &[Revision], base_revs: &BTreeSet<RevId>, head_len: usize) -> Vec<Revision> {
-    // transform representing the characters added by common revisions after a point.
-    let mut s = Subset::new(head_len);
-
-    let mut out = Vec::with_capacity(revs.len() - base_revs.len());
-    for rev in revs.iter().rev() {
-        let is_base = base_revs.contains(&rev.rev_id);
-        let contents = match rev.edit {
-            Contents::Edit {priority, undo_group, ref inserts, ref deletes} => {
-                if is_base {
-                    s = inserts.transform_union(&s);
-                    None
-                } else {
-                    // fast-forward this revision over all common ones after it
-                    let transformed_inserts = inserts.transform_expand(&s);
-                    let transformed_deletes = deletes.transform_expand(&s);
-                    // we don't want new revisions before this to be transformed after us
-                    s = s.transform_shrink(&transformed_inserts);
-                    Some(Contents::Edit {
-                        inserts: transformed_inserts,
-                        deletes: transformed_deletes,
-                        priority, undo_group,
-                    })
-                }
-            },
-            Contents::Undo { .. } => panic!("can't merge undo yet"),
-        };
-        if let Some(edit) = contents {
-            out.push(Revision { edit, rev_id: rev.rev_id, max_undo_so_far: rev.max_undo_so_far });
-        }
-    }
-
-    out.as_mut_slice().reverse();
-    out
-}
-
-```
-
-#### Computing Deltas
-
-Merging the changes from `other` into `self` doesn't just involve appending the `Revision`s, we also have to update the `text` and `tombstones` of `self` to correspond with those new revisions. In `Engine::edit_rev` we transform an `InsertDelta` until we can apply it to the text, but when merging we don't have any `Delta`s. Additionally, the operation for resolving the order of concurrent insertions based on priority is `Delta::transform_expand` and we don't have an equivalent for `Subset` (`Subset::transform_expand` does a slightly different thing).
-
-There's two possible approaches:
-
-1. Transform the new revisions from `other` and append them, using a newly written equivalent of `Delta::transform_expand` for `Subset`s. Then work through the resulting histories to figure out what characters we need to add to the `text` and `tombstones`, and where. We think it may be easier to support undo and incremental Ledger updating with this approach, and we plan on switching eventually, but for now it's not what we chose first.
-2. Create some `Delta`s! We can turn the new revisions from `other` into a different representation that encodes the `inserts` as an `InsertDelta` so that we can transform them using `Delta::transform_expand` and eventually apply them to the `text` of `self`.
-
-We can create these `DeltaOp`s by working backwards from the end of the `rearrange`d new revisions from `other` and keeping track of all the characters they insert in a `Subset` using `Subset::transform_union`. Then for each revision we can use `shuffle_tombstones` to extract a `Rope` of all the inserted characters, and then use `Delta::synthesize` to create a `Delta` from our `Subset` of inserts to the inserts `Subset` from the previous iteration (one step forward in time since we're iterating backwards). This gives us a `Delta` inserting the new characters from this `Revision`, which we can bundle into a `DeltaOp`.
-
-```rust
-struct DeltaOp {
-    rev_id: RevId,
-    priority: usize,
-    undo_group: usize,
-    inserts: InsertDelta<RopeInfo>,
-    deletes: Subset,
-}
-
-/// Transform `revs`, which doesn't include information on the actual content of the operations,
-/// into an `InsertDelta`-based representation that does by working backward from the text and tombstones.
-fn compute_deltas(revs: &[Revision], text: &Rope, tombstones: &Rope, deletes_from_union: &Subset) -> Vec<DeltaOp> {
-    let mut out = Vec::with_capacity(revs.len());
-
-    let mut cur_all_inserts = Subset::new(deletes_from_union.len());
-    for rev in revs.iter().rev() {
-        match rev.edit {
-            Contents::Edit {priority, undo_group, ref inserts, ref deletes} => {
-                let older_all_inserts = inserts.transform_union(&cur_all_inserts);
-
-                // TODO could probably be more efficient by avoiding shuffling from head every time
-                let tombstones_here = shuffle_tombstones(text, tombstones, deletes_from_union, &older_all_inserts);
-                let delta = Delta::synthesize(&tombstones_here, &older_all_inserts, &cur_all_inserts);
-                // TODO create InsertDelta directly and more efficiently instead of factoring
-                let (ins, _) = delta.factor();
-                out.push(DeltaOp {
-                    rev_id: rev.rev_id,
-                    priority, undo_group,
-                    inserts: ins,
-                    deletes: deletes.clone(),
-                });
-
-                cur_all_inserts = older_all_inserts;
-            },
-            Contents::Undo { .. } => panic!("can't merge undo yet"),
-        }
-    }
-
-    out.as_mut_slice().reverse();
-    out
-}
-```
-
-#### Computing Transforms
-
-Now we have a list of `DeltaOp`s from `other` and a list of new `Revision`s from `self`. Keeping in mind the goal of appending the changes from other, we need to transform the `DeltaOp`s to be based on top of the new `Revision`s from `self`. This really just involves figuring out the correct indices in the union string that includes the newly inserted characters from `self`.
-
-In order to do this we need the new `inserts` from `self`, but in order to resolve the order of concurrent inserts, we also need the "priority" of the edits. So we have a helper called `compute_transforms` that returns a list of `(priority, inserts)` tuples.
-
-This helper does one other important thing, which is combine sequential edits by the same peer with the same priority into one transform. This is important because the next stage does a lot of work per-transform. Without this optimization a paragraph of typed inserted characters would be hundreds of transforms, but with the optimization it is one transform.
-
-```rust
-/// Computes a series of priorities and transforms for the deltas on the right
-/// from the new revisions on the left.
-///
-/// Applies an optimization where it combines sequential revisions with the
-/// same priority into one transform to decrease the number of transforms that
-/// have to be considered in `rebase` substantially for normal editing
-/// patterns. Any large runs of typing in the same place by the same user (e.g
-/// typing a paragraph) will be combined into a single segment in a transform
-/// as opposed to thousands of revisions.
-fn compute_transforms(revs: Vec<Revision>) -> Vec<(FullPriority, Subset)> {
-    let mut out = Vec::new();
-    let mut last_priority: Option<usize> = None;
-    for r in revs.into_iter() {
-        if let Contents::Edit {priority, inserts, .. } = r.edit {
-            if inserts.is_empty() {
-                continue;
-            }
-            if Some(priority) == last_priority {
-                let last: &mut (FullPriority, Subset) = out.last_mut().unwrap();
-                last.1 = last.1.transform_union(&inserts);
-            } else {
-                last_priority = Some(priority);
-                let prio = FullPriority { priority, session_id: r.rev_id.session_id() };
-                out.push((prio, inserts));
-            }
-        }
-    }
-    out
-}
-```
-
-#### Rebasing
-
-Now that we have the `DeltaOp`s and transforms, we just need to forward the `DeltaOp`s through the transforms. The helper for this is named `rebase` since it's analogous to a `git rebase`.
-
-Basically, for every `DeltaOp` from `other`, we:
-
-1. `Delta::transform_expand` it by each transform from `self`.
-1. Update the transforms for the next round so they include the `DeltaOp`s inserts, and so effectively they become part of the base for both sides.
-1. Apply the `DeltaOp` to the `text` and `tombstones`
-1. Create a `Revision` from it and append it to the history.
-
-This procedure works iteratively starting with the results of `compute_transforms` and `compute_deltas`. Every iteration it takes the first `DeltaOp`, transforms it and applies it to the text, and updates all the transforms so that it is effectively in the base of both sides. See the diagrams below of an initial state, the operations performed in the first iteration, and the state after the first iteration. You can refer to the code further below to see how they align.
-
-![CRDT merge rebase initial state](img/merge-rebase-initial.png)
-![CRDT merge rebase trace](img/merge-rebase-trace.png)
-![CRDT merge rebase state after](img/merge-rebase-after.png)
-
-```rust
-/// Rebase `b_new` on top of `expand_by` and return revision contents that can be appended as new
-/// revisions on top of the revisions represented by `expand_by`.
-fn rebase(mut expand_by: Vec<(FullPriority, Subset)>, b_new: Vec<DeltaOp>, mut text: Rope, mut tombstones: Rope,
-        mut deletes_from_union: Subset, mut max_undo_so_far: usize) -> (Vec<Revision>, Rope, Rope, Subset) {
-    let mut out = Vec::with_capacity(b_new.len());
-
-    let mut next_expand_by = Vec::with_capacity(expand_by.len());
-    for op in b_new.into_iter() {
-        let DeltaOp { rev_id, priority, undo_group, mut inserts, mut deletes } = op;
-        let full_priority = FullPriority { priority, session_id: rev_id.session_id() };
-        // (1) (2) (3) expand by each in expand_by
-        for &(trans_priority, ref trans_inserts) in &expand_by {
-            let after = full_priority >= trans_priority;  // should never be ==
-            // d-expand by other
-            inserts = inserts.transform_expand(trans_inserts, after);
-            // trans-expand other by expanded so they have the same context
-            let inserted = inserts.inserted_subset();
-            let new_trans_inserts = trans_inserts.transform_expand(&inserted);
-            // The deletes are already after our inserts, but we need to include the other inserts
-            deletes = deletes.transform_expand(&new_trans_inserts);
-            // (6) On the next step we want things in expand_by to have op in the context
-            next_expand_by.push((trans_priority, new_trans_inserts));
-        }
-
-        // (4) Update the text and tombstones
-        let text_inserts = inserts.transform_shrink(&deletes_from_union);
-        let text_with_inserts = text_inserts.apply(&text);
-        let inserted = inserts.inserted_subset();
-
-        let expanded_deletes_from_union = deletes_from_union.transform_expand(&inserted);
-        let new_deletes_from_union = expanded_deletes_from_union.union(&deletes);
-        let (new_text, new_tombstones) =
-            shuffle(&text_with_inserts, &tombstones, &expanded_deletes_from_union, &new_deletes_from_union);
-
-        text = new_text;
-        tombstones = new_tombstones;
-        deletes_from_union = new_deletes_from_union;
-
-        // (5) Build a revision and append it to the history
-        max_undo_so_far = std::cmp::max(max_undo_so_far, undo_group);
-        out.push(Revision {
-            rev_id, max_undo_so_far,
-            edit: Contents::Edit {
-                priority, undo_group, deletes,
-                inserts: inserted,
-            }
-        });
-
-        expand_by = next_expand_by;
-        next_expand_by = Vec::with_capacity(expand_by.len());
-    }
-
-    (out, text, tombstones, deletes_from_union)
-}
-```
-
-#### That's it!
-
-After all those stages are complete, the merge is done. The `rebase` has appended the transformed versions of all the new `Revision`s from `other` and updated the `text`, `tombstones` and `deletes_from_union`. The actual `Engine::merge` function just ties all these helpers together:
-
-```rust
-/// Merge the new content from another Engine into this one with a CRDT merge
-pub fn merge(&mut self, other: &Engine) {
-    let (mut new_revs, text, tombstones, deletes_from_union) = {
-        let base_index = find_base_index(&self.revs, &other.revs);
-        let a_to_merge = &self.revs[base_index..];
-        let b_to_merge = &other.revs[base_index..];
-
-        let common = find_common(a_to_merge, b_to_merge);
-
-        let a_new = rearrange(a_to_merge, &common, self.deletes_from_union.len());
-        let b_new = rearrange(b_to_merge, &common, other.deletes_from_union.len());
-
-        let b_deltas = compute_deltas(&b_new, &other.text, &other.tombstones, &other.deletes_from_union);
-        let expand_by = compute_transforms(a_new);
-
-        let max_undo = self.max_undo_group_id();
-        rebase(expand_by, b_deltas, self.text.clone(), self.tombstones.clone(), self.deletes_from_union.clone(), max_undo)
-    };
-
-    self.text = text;
-    self.tombstones = tombstones;
-    self.deletes_from_union = deletes_from_union;
-    self.revs.append(&mut new_revs);
-}
-```
-
-#### Testing
-
-Every operation is tested in the `tests` module of `engine.rs`. The `Engine::merge` function is tested using a facility for creating and running "merge scripts" that describe a sequence of operations on multiple engines, merges between them, and assertions about their contents. This makes building complex merge scenarios to test much easier.
diff --git a/vendor/pulldown-cmark-0.5.3/tools/mk_entities.py b/vendor/pulldown-cmark-0.5.3/tools/mk_entities.py
deleted file mode 100644
index ba6408fb69..0000000000
--- a/vendor/pulldown-cmark-0.5.3/tools/mk_entities.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2015 Google Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Note: this script no longer works on python 2!
-
-# get https://html.spec.whatwg.org/multipage/entities.json
-# Usage: python tools/mk_entities.py entities.json > src/entities.rs
-
-import json
-import sys
-
-def main(args):
-    with open(args[1]) as json_file:
-        jsondata = json.load(json_file)
-    entities = [entity[1:-1] for entity in jsondata.keys() if entity.endswith(';')]
-    entities.sort()
-    print(f"""// Copyright 2015 Google Inc. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//! Expansions of HTML5 entities
-
-// Autogenerated by mk_entities.py
-
-const ENTITIES: [(&[u8], &str); {len(entities)}] = [""")
-
-    for e in entities:
-        codepoints = jsondata['&' + e + ';']["codepoints"];
-        s = ''.join([r'\u{%04X}' % cp for cp in codepoints])
-        print(f"    (b\"{e}\", \"{s}\"),")
-    print("""];
-
-pub(crate) fn get_entity(bytes: &[u8]) -> Option<&'static str> {
-    ENTITIES
-        .binary_search_by_key(&bytes, |&(key, _value)| key)
-        .ok()
-        .map(|i| ENTITIES[i].1)
-}
-""")
-
-main(sys.argv)
\ No newline at end of file
diff --git a/vendor/pulldown-cmark-0.5.3/tools/mk_puncttable.py b/vendor/pulldown-cmark-0.5.3/tools/mk_puncttable.py
deleted file mode 100644
index f2fcbc6df9..0000000000
--- a/vendor/pulldown-cmark-0.5.3/tools/mk_puncttable.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2015 Google Inc. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# get ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt
-# Usage: python tools/mk_puncttable.py UnicodeData.txt > src/puncttable.rs
-
-import sys
-
-def get_bits(high, punct):
-    b = 0
-    for i in range(16):
-        if high * 16 + i in punct:
-            b |= 1 << i
-    return b
-
-def main(args):
-    ascii_punct = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
-    ascii_set = set((ord(c) for c in ascii_punct))
-
-    punct = set()
-    for line in file(args[1]):
-        spl = line.split(';')
-        if spl[2] in ('Pc', 'Pd', 'Pe', 'Pf', 'Pi', 'Po', 'Ps'):
-            punct.add(int(spl[0], 16))
-    pshift = list(set((cp // 16 for cp in punct if cp >= 128)))
-    pshift.sort()
-    bits = [get_bits(high, punct) for high in pshift]
-    print """// Copyright 2015 Google Inc. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-//! CommonMark punctuation set based on spec and Unicode properties.
-
-// Autogenerated by mk_puncttable.py
-
-const PUNCT_MASKS_ASCII: [u16; 8] = ["""
-    for x in range(8):
-        y = get_bits(x, ascii_set)
-        print '    0x%04x,  // U+%04X...U+%04X' % (y, x * 16, x * 16 + 15)
-    print """];
-
-const PUNCT_TAB: [u16; %i] = [""" % len(pshift)
-    for x in pshift:
-        print '    %d,  // U+%04X...U+%04X' % (x, x * 16, x * 16 + 15)
-    print """];
-
-const PUNCT_MASKS: [u16; %i] = [""" % len(pshift)
-    for i, y in enumerate(bits):
-        x = pshift[i]
-        print '    0x%04x,  // U+%04X...U+%04X' % (y, x * 16, x * 16 + 15)
-    print """];
-
-pub fn is_ascii_punctuation(c: u8) -> bool {
-    c < 128 && (PUNCT_MASKS_ASCII[(c / 16) as usize] & (1 << (c & 15))) != 0
-}
-
-pub fn is_punctuation(c: char) -> bool {
-    let cp = c as u32;
-    if cp < 128 {return is_ascii_punctuation(cp as u8); }
-    if cp > 0x%04X { return false; }
-    let high = (cp / 16) as u16;
-    match PUNCT_TAB.binary_search(&high) {
-        Ok(index) => (PUNCT_MASKS[index] & (1 << (cp & 15))) != 0,
-        _ => false
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::{is_ascii_punctuation, is_punctuation};
-
-    #[test]
-    fn test_ascii() {
-        assert!(is_ascii_punctuation(b'!'));
-        assert!(is_ascii_punctuation(b'@'));
-        assert!(is_ascii_punctuation(b'~'));
-        assert!(!is_ascii_punctuation(b' '));
-        assert!(!is_ascii_punctuation(b'0'));
-        assert!(!is_ascii_punctuation(b'A'));
-        assert!(!is_ascii_punctuation(0xA1));
-    }
-
-    #[test]
-    fn test_unicode() {
-        assert!(is_punctuation('~'));
-        assert!(!is_punctuation(' '));
-
-        assert!(is_punctuation('\u{00A1}'));
-        assert!(is_punctuation('\u{060C}'));
-        assert!(is_punctuation('\u{FF65}'));
-        assert!(is_punctuation('\u{1BC9F}'));
-        assert!(!is_punctuation('\u{1BCA0}'));
-    }
-}
-""" % max(punct)
-
-main(sys.argv)
diff --git a/vendor/pulldown-cmark-0.6.1/.cargo-checksum.json b/vendor/pulldown-cmark-0.6.1/.cargo-checksum.json
new file mode 100644
index 0000000000..1ac4ba9fe7
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"CONTRIBUTING.md":"a5bbc113fdcb8101367da47daba32ab10aa2377a825040c78d847d870108d849","Cargo.lock":"0f6ce6ce8e4d2992962bcfcf9e02095e580ea02d2afd4cd4380b476f3f90d88b","Cargo.toml":"74bc708c008630c7dfa2ef8d6e0ff1a014a844088eb4337f7ae51c7e70c5eb95","LICENSE":"c4f10f55904bdb9f27d3fbf94c354926d6cfe8b982276e556238c258941b243b","README.md":"ddd40178b0214e2a6a26189963de686ba417c2ea95f24e32c98e843726137b21","benches/html_rendering.rs":"4248419563483370c1b74858aead08728eb92003dae74c78d66d36cd0db81640","benches/lib.rs":"e7a2ac16b4fd024d4da03221083ed48e00404b6e79ef1f8b449dec9a96776304","build.rs":"7f4e1517188518c54676220e277facb7dce3f944521b29d2da5c3be28950cedb","examples/event-filter.rs":"85ba4695e8e83c9c59b7b675a2fb8eb40ed5e2b56bc05679732f6e2f9589106d","examples/string-to-string.rs":"864aed51aaa8ffd556995fa937ea99b98d78feeb7bf7ae4b2872c749fb02b386","src/entities.rs":"1602f3c4d22c0b0e3a4a08467a50bf9d0c27aadf2e5661b15a2cda20da0895a9","src/escape.rs":"72b3732bd5e15f935cbe68f9296d62f4c1780a27b32f8a7e1663a57983fde068","src/html.rs":"88ea7b0e229c86e2e416e350949ef3c691cb6c9c4c57b8474626993e0c45e174","src/lib.rs":"2c079f858ce189e7a50eb6ab4800e7b7017978124e94b15efc5571bdd5bc353c","src/linklabel.rs":"503710b7c540ea025b22ed2c9378cd0a741d56cb957fdd962515dd3c054fcd30","src/main.rs":"579c37b20a955b4a856fd0250f9e69a34fe1c2d729ab1f247623976e36de5f2f","src/parse.rs":"de297cbaed6b56925c26987cfd2aac1b349cc08e348c50ad00248f04fae32343","src/puncttable.rs":"ddb35138b537c00dd2003daba2d07f1bc8154059a745d4e18b74732614b20f1c","src/scanners.rs":"2f5a89b9c26c2688763286402fcbcd9aff573afdf6d7e276b330c231ad63a742","src/simd.rs":"669d4627dbd3d54262f02ba446afe405a4f68e305ad0903e598f8e79473bdbeb","src/strings.rs":"06a7ee24e93d536238602ce909a8a9d1c854446abaab44368a3630f7f5c5eb00","src/tree.rs":"fb747e6dd975aabd9d07b19ea986fe601985ff77c9beb886f8015b5687fbc4b8","tests/errors.rs":"3677dc76c0ec85b3b65389fe39a82cd7ab9420dd5e2cc5b5b11f490fde2f5fbf","tests/html.rs":"6a2f66f01248e6b1bdd3ec2d5454766ceb617e8e89ab7eb725635c78c77f243f","tests/lib.rs":"879124c4a0c5e253571b4acf13cec3b329ddb0f165c31b4a85e90b0a8aff385b","tests/suite/footnotes.rs":"955ab3bf6446a92ee28152ed952a6169da4b299dbe60ae6fbc6a5145b32f4d7b","tests/suite/gfm_strikethrough.rs":"becabc2f5b0d2dd584908047501c91cc16f62c6533e9a362ed39140670b96ae1","tests/suite/gfm_table.rs":"ab4e2ba5efd774f5c659320ebe43c5f80e5d394d5dfcca04b01b67567565090d","tests/suite/gfm_tasklist.rs":"f20f39ab9bdb4e07708104036a4be39952bebc98779d44a5b7cc2e3f41598575","tests/suite/mod.rs":"c1a6b6ad191830a7ca99b96ff9f8cb4bdb101674679720907902928ada8dc412","tests/suite/regression.rs":"c749c9274d51909c05d0b92afce6767e5806355dc5cf187a690cf815fb991ec0","tests/suite/spec.rs":"1e88bae48c1da50d61533e6078d13f82c0f9c2d5e744113616b211b37d45649d","tests/suite/table.rs":"b4f28d6a1390a302415cb48babd11ec2ec7054b43a671edbd42d6f8c310983de"},"package":"1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e"}
\ No newline at end of file
diff --git a/vendor/pulldown-cmark-0.6.1/CONTRIBUTING.md b/vendor/pulldown-cmark-0.6.1/CONTRIBUTING.md
new file mode 100644
index 0000000000..5200aa4720
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/CONTRIBUTING.md
@@ -0,0 +1,21 @@
+Want to contribute? Great! First, read this page.
+
+### Before you contribute
+
+Before you start working on a larger contribution, you should get in touch with
+us first through the issue tracker with your idea so that we can help out and
+possibly guide you. Coordinating up front makes it much easier to avoid
+frustration later on.
+
+### Getting familiar with the project
+
+**The architecture** is somewhat unique, it was originally inspired by [XML pull parsers](http://www.xmlpull.org), but ended up going in somewhat its own direction. to get familiar with it, 
+- start my reading the [README](README.md) page, which gives some details on the design of the parser (pull-based events) and some rationalization for it ;
+- read the [blog post](https://fullyfaithful.eu/pulldown-cmark) about the release of Pulldown-cmark 0.3 by Marcus Klaas de Vries.
+
+**The source code** can be approached by skimming the [API documentation](https://docs.rs/pulldown-cmark/latest/pulldown_cmark) first, then explore the code for the main struct, [`Parser`](https://docs.rs/pulldown-cmark/latest/pulldown_cmark/struct.Parser.html)
+
+### Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose.
diff --git a/vendor/pulldown-cmark-0.6.1/Cargo.lock b/vendor/pulldown-cmark-0.6.1/Cargo.lock
new file mode 100644
index 0000000000..8af891811e
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/Cargo.lock
@@ -0,0 +1,871 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "aho-corasick"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "atty"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "autocfg"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bitflags"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "bstr"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cast"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "cfg-if"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "clap"
+version = "2.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "cloudabi"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "criterion"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "csv"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "csv-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "either"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "fuchsia-cprng"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "futf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "itertools"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "itoa"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "libc"
+version = "0.2.62"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "log"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "mac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "markup5ever"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memchr"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "nodrop"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "num-traits"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.7.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.6.1"
+dependencies = [
+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
+ "html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_isaac"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_jitter"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_os"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_pcg"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rand_xoshiro"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "rdrand"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "same-file"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "serde_derive"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "string_cache"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "string_cache_shared"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "syn"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tendril"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "tinytemplate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicase"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "unicode-xid"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "utf-8"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "version_check"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "walkdir"
+version = "2.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasi"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[metadata]
+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
+"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
+"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
+"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
+"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
+"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
+"checksum criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "938703e165481c8d612ea3479ac8342e5615185db37765162e762ec3523e2fc6"
+"checksum criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2"
+"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
+"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
+"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
+"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
+"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
+"checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
+"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+"checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
+"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+"checksum html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb"
+"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
+"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
+"checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+"checksum markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03"
+"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
+"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
+"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30"
+"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
+"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
+"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+"checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
+"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
+"checksum rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a"
+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
+"checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
+"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
+"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
+"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
+"checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
+"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
+"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
+"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
+"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
+"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+"checksum string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67"
+"checksum string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
+"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
+"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b"
+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+"checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
+"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
+"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
+"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
+"checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
+"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
+"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/vendor/pulldown-cmark-0.6.1/Cargo.toml b/vendor/pulldown-cmark-0.6.1/Cargo.toml
new file mode 100644
index 0000000000..86b167222d
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/Cargo.toml
@@ -0,0 +1,65 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "pulldown-cmark"
+version = "0.6.1"
+authors = ["Raph Levien <raph.levien@gmail.com>", "Marcus Klaas de Vries <mail@marcusklaas.nl>"]
+build = "build.rs"
+exclude = ["/third_party/**/*", "/tools/**/*", "/specs/**/*", "/fuzzer/**/*", "/azure-pipelines.yml"]
+description = "A pull parser for CommonMark"
+readme = "README.md"
+keywords = ["markdown", "commonmark"]
+categories = ["text-processing"]
+license = "MIT"
+repository = "https://github.com/raphlinus/pulldown-cmark"
+
+[[bin]]
+name = "pulldown-cmark"
+doc = false
+required-features = ["getopts"]
+
+[[bench]]
+name = "html_rendering"
+harness = false
+[dependencies.bitflags]
+version = "1.2"
+
+[dependencies.getopts]
+version = "0.2"
+optional = true
+
+[dependencies.memchr]
+version = "2.2"
+
+[dependencies.unicase]
+version = "2.5"
+[dev-dependencies.criterion]
+version = "0.3"
+
+[dev-dependencies.html5ever]
+version = "0.24"
+
+[dev-dependencies.lazy_static]
+version = "1.4"
+
+[dev-dependencies.regex]
+version = "1.3"
+
+[dev-dependencies.tendril]
+version = "0.4"
+
+[features]
+default = ["getopts"]
+gen-tests = []
+simd = []
diff --git a/vendor/pulldown-cmark-0.5.3/LICENSE b/vendor/pulldown-cmark-0.6.1/LICENSE
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/LICENSE
rename to vendor/pulldown-cmark-0.6.1/LICENSE
diff --git a/vendor/pulldown-cmark-0.6.1/README.md b/vendor/pulldown-cmark-0.6.1/README.md
new file mode 100644
index 0000000000..bdf945b585
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/README.md
@@ -0,0 +1,152 @@
+# pulldown-cmark
+
+[![Build Status](https://dev.azure.com/raphlinus/pulldown-cmark/_apis/build/status/pulldown-cmark-CI?branchName=master)](https://dev.azure.com/raphlinus/pulldown-cmark/_build/latest?definitionId=2&branchName=master)
+[![Docs](https://docs.rs/pulldown-cmark/badge.svg)](https://docs.rs/pulldown-cmark)
+[![Crates.io](https://img.shields.io/crates/v/pulldown-cmark.svg?maxAge=2592000)](https://crates.io/crates/pulldown-cmark)
+
+[Documentation](https://docs.rs/pulldown-cmark/)
+
+This library is a pull parser for [CommonMark](http://commonmark.org/), written
+in [Rust](http://www.rust-lang.org/). It comes with a simple command-line tool,
+useful for rendering to HTML, and is also designed to be easy to use from as
+a library.
+
+It is designed to be:
+
+* Fast; a bare minimum of allocation and copying
+* Safe; written in pure Rust with no unsafe blocks
+* Versatile; in particular source-maps are supported
+* Correct; the goal is 100% compliance with the [CommonMark spec](http://spec.commonmark.org/)
+
+Further, it optionally supports parsing footnotes,
+[Github flavored tables](https://github.github.com/gfm/#tables-extension-),
+[Github flavored task lists](https://github.github.com/gfm/#task-list-items-extension-) and
+[strikethrough](https://github.github.com/gfm/#strikethrough-extension-).
+
+Rustc 1.34 or newer is required to build the crate.
+
+## Why a pull parser?
+
+There are many parsers for Markdown and its variants, but to my knowledge none
+use pull parsing. Pull parsing has become popular for XML, especially for
+memory-conscious applications, because it uses dramatically less memory than
+constructing a document tree, but is much easier to use than push parsers. Push
+parsers are notoriously difficult to use, and also often error-prone because of
+the need for user to delicately juggle state in a series of callbacks.
+
+In a clean design, the parsing and rendering stages are neatly separated, but
+this is often sacrificed in the name of performance and expedience. Many Markdown
+implementations mix parsing and rendering together, and even designs that try
+to separate them (such as the popular [hoedown](https://github.com/hoedown/hoedown)),
+make the assumption that the rendering process can be fully represented as a
+serialized string.
+
+Pull parsing is in some sense the most versatile architecture. It's possible to
+drive a push interface, also with minimal memory, and quite straightforward to
+construct an AST. Another advantage is that source-map information (the mapping
+between parsed blocks and offsets within the source text) is readily available;
+you can call `into_offset_iter()` to create an iterator that yields `(Event, Range)`
+pairs, where the second element is the event's corresponding range in the source
+document.
+
+While manipulating ASTs is the most flexible way to transform documents,
+operating on iterators is surprisingly easy, and quite efficient. Here, for
+example, is the code to transform soft line breaks into hard breaks:
+
+```rust
+let parser = parser.map(|event| match event {
+	Event::SoftBreak => Event::HardBreak,
+	_ => event
+});
+```
+
+Or expanding an abbreviation in text:
+
+```rust
+let parser = parser.map(|event| match event {
+	Event::Text(text) => Event::Text(text.replace("abbr", "abbreviation").into()),
+	_ => event
+});
+```
+
+Another simple example is code to determine the max nesting level:
+
+```rust
+let mut max_nesting = 0;
+let mut level = 0;
+for event in parser {
+	match event {
+		Event::Start(_) => {
+			level += 1;
+			max_nesting = std::cmp::max(max_nesting, level);
+		}
+		Event::End(_) => level -= 1,
+		_ => ()
+	}
+}
+```
+
+There are some basic but fully functional examples of the usage of the crate in the
+`examples` directory of this repository.
+
+## Using Rust idiomatically
+
+A lot of the internal scanning code is written at a pretty low level (it
+pretty much scans byte patterns for the bits of syntax), but the external
+interface is designed to be idiomatic Rust.
+
+Pull parsers are at heart an iterator of events (start and end tags, text,
+and other bits and pieces). The parser data structure implements the
+Rust Iterator trait directly, and Event is an enum. Thus, you can use the
+full power and expressivity of Rust's iterator infrastructure, including
+for loops and `map` (as in the examples above), collecting the events into
+a vector (for recording, playback, and manipulation), and more.
+
+Further, the `Text` event (representing text) is a small copy-on-write string.
+The vast majority of text fragments are just
+slices of the source document. For these, copy-on-write gives a convenient
+representation that requires no allocation or copying, but allocated
+strings are available when they're needed. Thus, when rendering text to
+HTML, most text is copied just once, from the source document to the
+HTML buffer.
+
+When using the pulldown-cmark's own HTML renderer, make sure to write to a buffered
+target like a `Vec<u8>` or `String`. Since it performs many (very) small writes, writing
+directly to stdout, files, or sockets is detrimental to performance. Such writers can
+be wrapped in a [`BufWriter`](https://doc.rust-lang.org/std/io/struct.BufWriter.html).
+
+## Build options
+
+By default, the binary is built as well. If you don't want/need it, then build like this:
+
+```bash
+> cargo build --no-default-features
+```
+
+Or put in your `Cargo.toml` file:
+
+```toml
+pulldown-cmark = { version = "0.6", default-features = false }
+```
+
+SIMD accelerated scanners are available for the x64 platform from version 0.5 onwards. To
+enable them, build with simd feature:
+
+```bash
+> cargo build --release --features simd
+```
+
+Or add the feature to your project's `Cargo.toml`:
+
+```toml
+pulldown-cmark = { version = "0.6", default-features = false, features = ["simd"] }
+```
+
+## Authors
+
+The main author is Raph Levien. The implementation of the new design (v0.3+) was completed by Marcus Klaas de Vries.
+
+## Contributions
+
+We gladly accept contributions via GitHub pull requests. Please see
+[CONTRIBUTING.md](CONTRIBUTING.md) for more details.
diff --git a/vendor/pulldown-cmark-0.5.3/benches/html_rendering.rs b/vendor/pulldown-cmark-0.6.1/benches/html_rendering.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/benches/html_rendering.rs
rename to vendor/pulldown-cmark-0.6.1/benches/html_rendering.rs
diff --git a/vendor/pulldown-cmark-0.6.1/benches/lib.rs b/vendor/pulldown-cmark-0.6.1/benches/lib.rs
new file mode 100644
index 0000000000..d0b8dfcb80
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/benches/lib.rs
@@ -0,0 +1,49 @@
+#![feature(test)]
+
+extern crate pulldown_cmark;
+extern crate test;
+
+mod to_html {
+    use pulldown_cmark::{html, Options, Parser};
+
+    fn render_html(text: &str, opts: Options) -> String {
+        let mut s = String::with_capacity(text.len() * 3 / 2);
+        let p = Parser::new_ext(text, opts);
+        html::push_html(&mut s, p);
+        s
+    }
+
+    #[bench]
+    fn pathological_codeblocks1(b: &mut test::Bencher) {
+        // Note that `buf` grows quadratically with number of
+        // iterations. The point here is that the render time shouldn't
+        // grow faster than that.
+        let mut buf = String::new();
+        for i in 1..1000 {
+            for _ in 0..i {
+                buf.push('`');
+            }
+            buf.push(' ');
+        }
+
+        b.iter(|| render_html(&buf, Options::empty()));
+    }
+
+    #[bench]
+    fn advanced_pathological_codeblocks(b: &mut test::Bencher) {
+        let mut buf = String::new();
+        let mut i = 1;
+        while buf.len() < 1250 {
+            for _ in 0..i {
+                buf.push('`');
+            }
+            buf.push(' ');
+            i += 1;
+        }
+        for _ in 0..buf.len() {
+            buf.push_str("*a* ");
+        }
+
+        b.iter(|| render_html(&buf, Options::empty()));
+    }
+}
diff --git a/vendor/pulldown-cmark-0.5.3/build.rs b/vendor/pulldown-cmark-0.6.1/build.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/build.rs
rename to vendor/pulldown-cmark-0.6.1/build.rs
diff --git a/vendor/pulldown-cmark-0.5.3/examples/event-filter.rs b/vendor/pulldown-cmark-0.6.1/examples/event-filter.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/examples/event-filter.rs
rename to vendor/pulldown-cmark-0.6.1/examples/event-filter.rs
diff --git a/vendor/pulldown-cmark-0.5.3/examples/string-to-string.rs b/vendor/pulldown-cmark-0.6.1/examples/string-to-string.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/examples/string-to-string.rs
rename to vendor/pulldown-cmark-0.6.1/examples/string-to-string.rs
diff --git a/vendor/pulldown-cmark-0.5.3/src/entities.rs b/vendor/pulldown-cmark-0.6.1/src/entities.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/src/entities.rs
rename to vendor/pulldown-cmark-0.6.1/src/entities.rs
diff --git a/vendor/pulldown-cmark-0.5.3/src/escape.rs b/vendor/pulldown-cmark-0.6.1/src/escape.rs
similarity index 90%
rename from vendor/pulldown-cmark-0.5.3/src/escape.rs
rename to vendor/pulldown-cmark-0.6.1/src/escape.rs
index 948454f657..1d2e8677e0 100644
--- a/vendor/pulldown-cmark-0.5.3/src/escape.rs
+++ b/vendor/pulldown-cmark-0.6.1/src/escape.rs
@@ -78,27 +78,18 @@ where
     w.write_str(&s[mark..])
 }
 
-#[rustfmt::skip]
-static HTML_ESCAPE_TABLE: [u8; 256] = [
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 4, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-];
+const fn create_html_escape_table() -> [u8; 256] {
+    let mut table = [0; 256];
+    table[b'"' as usize] = 1;
+    table[b'&' as usize] = 2;
+    table[b'<' as usize] = 3;
+    table[b'>' as usize] = 4;
+    table
+}
+
+static HTML_ESCAPE_TABLE: [u8; 256] = create_html_escape_table();
 
-static HTML_ESCAPES: [&str; 5] = ["", "&quot;", "&amp;", "&lt;", "&gt;"];
+static HTML_ESCAPES: [&'static str; 5] = ["", "&quot;", "&amp;", "&lt;", "&gt;"];
 
 /// Writes the given string to the Write sink, replacing special HTML bytes
 /// (<, >, &, ") by escape sequences.
@@ -129,13 +120,11 @@ fn escape_html_scalar<W: StrWrite>(mut w: W, s: &str) -> io::Result<()> {
         }
         let c = bytes[i];
         let escape = HTML_ESCAPE_TABLE[c as usize];
-        if escape != 0 {
-            let escape_seq = HTML_ESCAPES[escape as usize];
-            w.write_str(&s[mark..i])?;
-            w.write_str(escape_seq)?;
-            mark = i + 1; // all escaped characters are ASCII
-        }
+        let escape_seq = HTML_ESCAPES[escape as usize];
+        w.write_str(&s[mark..i])?;
+        w.write_str(escape_seq)?;
         i += 1;
+        mark = i; // all escaped characters are ASCII
     }
     w.write_str(&s[mark..])
 }
diff --git a/vendor/pulldown-cmark-0.5.3/src/html.rs b/vendor/pulldown-cmark-0.6.1/src/html.rs
similarity index 96%
rename from vendor/pulldown-cmark-0.5.3/src/html.rs
rename to vendor/pulldown-cmark-0.6.1/src/html.rs
index c0bc57173c..8a3cc5c102 100644
--- a/vendor/pulldown-cmark-0.5.3/src/html.rs
+++ b/vendor/pulldown-cmark-0.6.1/src/html.rs
@@ -160,7 +160,7 @@ where
                     escape_html(&mut self.writer, &text)?;
                     self.write("</code>")?;
                 }
-                Html(html) | InlineHtml(html) => {
+                Html(html) => {
                     self.write(&html)?;
                 }
                 SoftBreak => {
@@ -169,6 +169,13 @@ where
                 HardBreak => {
                     self.write("<br />\n")?;
                 }
+                Rule => {
+                    if self.end_newline {
+                        self.write("<hr />\n")?;
+                    } else {
+                        self.write("\n<hr />\n")?;
+                    }
+                }
                 FootnoteReference(name) => {
                     let len = self.numbers.len() + 1;
                     self.write("<sup class=\"footnote-reference\"><a href=\"#")?;
@@ -199,14 +206,7 @@ where
                     self.write("\n<p>")
                 }
             }
-            Tag::Rule => {
-                if self.end_newline {
-                    self.write("<hr />\n")
-                } else {
-                    self.write("\n<hr />\n")
-                }
-            }
-            Tag::Header(level) => {
+            Tag::Heading(level) => {
                 if self.end_newline {
                     self.end_newline = false;
                     write!(&mut self.writer, "<h{}>", level)
@@ -338,7 +338,6 @@ where
                 write!(&mut self.writer, "{}", number)?;
                 self.write("</sup>")
             }
-            Tag::HtmlBlock => Ok(()),
         }
     }
 
@@ -347,8 +346,7 @@ where
             Tag::Paragraph => {
                 self.write("</p>\n")?;
             }
-            Tag::Rule => (),
-            Tag::Header(level) => {
+            Tag::Heading(level) => {
                 self.write("</h")?;
                 write!(&mut self.writer, "{}", level)?;
                 self.write(">\n")?;
@@ -405,7 +403,6 @@ where
             Tag::FootnoteDefinition(_) => {
                 self.write("</div>\n")?;
             }
-            Tag::HtmlBlock => {}
         }
         Ok(())
     }
@@ -422,12 +419,11 @@ where
                     }
                     nest -= 1;
                 }
-                Html(_) => (),
-                InlineHtml(text) | Code(text) | Text(text) => {
+                Html(text) | Code(text) | Text(text) => {
                     escape_html(&mut self.writer, &text)?;
                     self.end_newline = text.ends_with('\n');
                 }
-                SoftBreak | HardBreak => {
+                SoftBreak | HardBreak | Rule => {
                     self.write(" ")?;
                 }
                 FootnoteReference(name) => {
diff --git a/vendor/pulldown-cmark-0.6.1/src/lib.rs b/vendor/pulldown-cmark-0.6.1/src/lib.rs
new file mode 100644
index 0000000000..18b8d85dc6
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/src/lib.rs
@@ -0,0 +1,74 @@
+// Copyright 2015 Google Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+//! Pull parser for [CommonMark](https://commonmark.org). This crate provides a [Parser](struct.Parser.html) struct
+//! which is an iterator over [Event](enum.Event.html)s. This iterator can be used
+//! directly, or to output HTML using the [HTML module](html/index.html).
+//!
+//! By default, only CommonMark features are enabled. To use extensions like tables,
+//! footnotes or task lists, enable them by setting the corresponding flags in the
+//! [Options](struct.Options.html) struct.
+//!
+//! # Example
+//! ```rust
+//! use pulldown_cmark::{Parser, Options, html};
+//!
+//! let markdown_input = "Hello world, this is a ~~complicated~~ *very simple* example.";
+//!
+//! // Set up options and parser. Strikethroughs are not part of the CommonMark standard
+//! // and we therefore must enable it explicitly.
+//! let mut options = Options::empty();
+//! options.insert(Options::ENABLE_STRIKETHROUGH);
+//! let parser = Parser::new_ext(markdown_input, options);
+//!
+//! // Write to String buffer.
+//! let mut html_output = String::new();
+//! html::push_html(&mut html_output, parser);
+//!
+//! // Check that the output is what we expected.
+//! let expected_html = "<p>Hello world, this is a <del>complicated</del> <em>very simple</em> example.</p>\n";
+//! assert_eq!(expected_html, &html_output);
+//! ```
+
+// When compiled for the rustc compiler itself we want to make sure that this is
+// an unstable crate.
+#![cfg_attr(rustbuild, feature(staged_api, rustc_private))]
+#![cfg_attr(rustbuild, unstable(feature = "rustc_private", issue = "27812"))]
+
+pub mod html;
+
+#[macro_use]
+extern crate bitflags;
+extern crate unicase;
+
+mod entities;
+mod escape;
+mod linklabel;
+mod parse;
+mod puncttable;
+mod scanners;
+mod strings;
+mod tree;
+
+#[cfg(all(target_arch = "x86_64", feature = "simd"))]
+mod simd;
+
+pub use crate::parse::{Alignment, Event, LinkType, OffsetIter, Options, Parser, Tag};
+pub use crate::strings::{CowStr, InlineStr};
diff --git a/vendor/pulldown-cmark-0.5.3/src/linklabel.rs b/vendor/pulldown-cmark-0.6.1/src/linklabel.rs
similarity index 85%
rename from vendor/pulldown-cmark-0.5.3/src/linklabel.rs
rename to vendor/pulldown-cmark-0.6.1/src/linklabel.rs
index 223a6c272c..846210f040 100644
--- a/vendor/pulldown-cmark-0.5.3/src/linklabel.rs
+++ b/vendor/pulldown-cmark-0.6.1/src/linklabel.rs
@@ -32,24 +32,16 @@ pub enum ReferenceLabel<'a> {
 
 pub type LinkLabel<'a> = UniCase<CowStr<'a>>;
 
-/// Returns number of bytes (including brackets) and label on success.
-pub(crate) fn scan_link_label(text: &str) -> Option<(usize, ReferenceLabel<'_>)> {
-    if text.len() < 2 || text.as_bytes()[0] != b'[' {
-        return None;
-    }
-    let pair = if b'^' == text.as_bytes()[1] {
-        let (byte_index, cow) = scan_link_label_rest(&text[2..])?;
-        (byte_index + 2, ReferenceLabel::Footnote(cow))
-    } else {
-        let (byte_index, cow) = scan_link_label_rest(&text[1..])?;
-        (byte_index + 1, ReferenceLabel::Link(cow))
-    };
-    Some(pair)
-}
-
 /// Assumes the opening bracket has already been scanned.
+/// The line break handler determines what happens when a linebreak
+/// is found. It is passed the bytes following the line break and
+/// either returns `Some(k)`, where `k` is the number of bytes to skip,
+/// or `None` to abort parsing the label.
 /// Returns the number of bytes read (including closing bracket) and label on success.
-pub(crate) fn scan_link_label_rest(text: &str) -> Option<(usize, CowStr<'_>)> {
+pub(crate) fn scan_link_label_rest<'t>(
+    text: &'t str,
+    linebreak_handler: &dyn Fn(&[u8]) -> Option<usize>,
+) -> Option<(usize, CowStr<'t>)> {
     let bytes = text.as_bytes();
     let mut ix = 0;
     let mut only_white_space = true;
@@ -83,6 +75,7 @@ pub(crate) fn scan_link_label_rest(text: &str) -> Option<(usize, CowStr<'_>)> {
                             return None;
                         }
                         ix += eol_bytes;
+                        ix += linebreak_handler(&bytes[ix..])?;
                         whitespaces += 2; // indicate that we need to replace
                     } else {
                         whitespaces += if bytes[ix] == b' ' { 1 } else { 2 };
@@ -130,13 +123,13 @@ mod test {
         let input = "«\t\tBlurry Eyes\t\t»][blurry_eyes]";
         let expected_output = "« Blurry Eyes »"; // regular spaces!
 
-        let (_bytes, normalized_label) = scan_link_label_rest(input).unwrap();
+        let (_bytes, normalized_label) = scan_link_label_rest(input, &|_| None).unwrap();
         assert_eq!(expected_output, normalized_label.as_ref());
     }
 
     #[test]
     fn return_carriage_linefeed_ok() {
         let input = "hello\r\nworld\r\n]";
-        assert!(scan_link_label_rest(input).is_some());
+        assert!(scan_link_label_rest(input, &|_| Some(0)).is_some());
     }
 }
diff --git a/vendor/pulldown-cmark-0.6.1/src/main.rs b/vendor/pulldown-cmark-0.6.1/src/main.rs
new file mode 100644
index 0000000000..ddb461af5b
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/src/main.rs
@@ -0,0 +1,109 @@
+// Copyright 2015 Google Inc. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+//! Command line tool to exercise pulldown-cmark.
+
+use pulldown_cmark::{html, Options, Parser};
+
+use std::env;
+use std::io::{self, Read};
+use std::mem;
+
+fn dry_run(text: &str, opts: Options) {
+    let p = Parser::new_ext(text, opts);
+    let count = p.count();
+    println!("{} events", count);
+}
+
+fn print_events(text: &str, opts: Options) {
+    let parser = Parser::new_ext(text, opts).into_offset_iter();
+    for (event, range) in parser {
+        println!("{:?}: {:?}", range, event);
+    }
+    println!("EOF");
+}
+
+fn brief(program: &str) -> String {
+    format!(
+        "Usage: {} [options]\n\n{}",
+        program, "Reads markdown from standard input and emits HTML.",
+    )
+}
+
+pub fn main() -> std::io::Result<()> {
+    let args: Vec<_> = env::args().collect();
+    let mut opts = getopts::Options::new();
+    opts.optflag("h", "help", "this help message");
+    opts.optflag("d", "dry-run", "dry run, produce no output");
+    opts.optflag("e", "events", "print event sequence instead of rendering");
+    opts.optflag("T", "enable-tables", "enable GitHub-style tables");
+    opts.optflag("F", "enable-footnotes", "enable Hoedown-style footnotes");
+    opts.optflag(
+        "S",
+        "enable-strikethrough",
+        "enable GitHub-style strikethrough",
+    );
+    opts.optflag("L", "enable-tasklists", "enable GitHub-style task lists");
+
+    let matches = match opts.parse(&args[1..]) {
+        Ok(m) => m,
+        Err(f) => {
+            eprintln!("{}\n{}", f, opts.usage(&brief(&args[0])));
+            std::process::exit(1);
+        }
+    };
+    if matches.opt_present("help") {
+        println!("{}", opts.usage(&brief(&args[0])));
+        return Ok(());
+    }
+    let mut opts = Options::empty();
+    if matches.opt_present("enable-tables") {
+        opts.insert(Options::ENABLE_TABLES);
+    }
+    if matches.opt_present("enable-footnotes") {
+        opts.insert(Options::ENABLE_FOOTNOTES);
+    }
+    if matches.opt_present("enable-strikethrough") {
+        opts.insert(Options::ENABLE_STRIKETHROUGH);
+    }
+    if matches.opt_present("enable-tasklists") {
+        opts.insert(Options::ENABLE_TASKLISTS);
+    }
+
+    let mut input = String::new();
+    io::stdin().lock().read_to_string(&mut input)?;
+    if matches.opt_present("events") {
+        print_events(&input, opts);
+    } else if matches.opt_present("dry-run") {
+        dry_run(&input, opts);
+    } else {
+        let mut p = Parser::new_ext(&input, opts);
+        let stdio = io::stdout();
+        let buffer = std::io::BufWriter::with_capacity(1024 * 1024, stdio.lock());
+        html::write_html(buffer, &mut p)?;
+        // Since the program will now terminate and the memory will be returned
+        // to the operating system anyway, there is no point in tidely cleaning
+        // up all the datastructures we have used. We shouldn't do this if we'd
+        // do other things after this, because this is basically intentionally
+        // leaking data. Skipping cleanup let's us return a bit (~5%) faster.
+        mem::forget(p);
+    }
+    Ok(())
+}
diff --git a/vendor/pulldown-cmark-0.5.3/src/parse.rs b/vendor/pulldown-cmark-0.6.1/src/parse.rs
similarity index 85%
rename from vendor/pulldown-cmark-0.5.3/src/parse.rs
rename to vendor/pulldown-cmark-0.6.1/src/parse.rs
index 7f289ce257..e4cbca0449 100644
--- a/vendor/pulldown-cmark-0.5.3/src/parse.rs
+++ b/vendor/pulldown-cmark-0.6.1/src/parse.rs
@@ -20,38 +20,53 @@
 
 //! Tree-based two pass parser.
 
-use std::cmp::min;
+use std::cmp::{max, min};
 use std::collections::{HashMap, VecDeque};
 use std::ops::{Index, Range};
 
 use unicase::UniCase;
 
-use crate::linklabel::{scan_link_label, scan_link_label_rest, LinkLabel, ReferenceLabel};
+use crate::linklabel::{scan_link_label_rest, LinkLabel, ReferenceLabel};
 use crate::scanners::*;
 use crate::strings::CowStr;
 use crate::tree::{Tree, TreeIndex, TreePointer};
 
+// Allowing arbitrary depth nested parentheses inside link destinations
+// can create denial of service vulnerabilities if we're not careful.
+// The simplest countermeasure is to limit their depth, which is
+// explicitly allowed by the spec as long as the limit is at least 3:
+// https://spec.commonmark.org/0.29/#link-destination
+const LINK_MAX_NESTED_PARENS: usize = 5;
+
+/// Tags for elements that can contain other elements.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Tag<'a> {
-    // block-level tags
+    /// A paragraph of text and other inline elements.
     Paragraph,
-    Rule,
 
     /// A heading. The field indicates the level of the heading.
-    Header(i32),
+    Heading(u32),
 
     BlockQuote,
+    /// A code block. The value contained in the tag describes the language of the code,
+    /// which may be empty.
     CodeBlock(CowStr<'a>),
 
     /// A list. If the list is ordered the field indicates the number of the first item.
-    List(Option<usize>), // TODO: add delim and tight for ast (not needed for html)
+    /// Contains only list items.
+    List(Option<u64>), // TODO: add delim and tight for ast (not needed for html)
+    /// A list item.
     Item,
+    /// A footnote definition. The value contained is the footnote's label by which it can
+    /// be referred to.
     FootnoteDefinition(CowStr<'a>),
-    HtmlBlock,
 
-    // tables
+    /// A table. Contains a vector describing the text-alignment for each of its columns.
     Table(Vec<Alignment>),
+    /// A table header. Contains only `TableRow`s. Note that the table body starts immediately
+    /// after the closure of the `TableHead` tag. There is no `TableBody` tag.
     TableHead,
+    /// A table row. Is used both for header rows as body rows. Contains only `TableCell`s.
     TableRow,
     TableCell,
 
@@ -60,13 +75,14 @@ pub enum Tag<'a> {
     Strong,
     Strikethrough,
 
-    /// A link. The first field is the link type, the second the destination URL and the third is a title
+    /// A link. The first field is the link type, the second the destination URL and the third is a title.
     Link(LinkType, CowStr<'a>, CowStr<'a>),
 
-    /// An image. The first field is the link type, the second the destination URL and the third is a title
+    /// An image. The first field is the link type, the second the destination URL and the third is a title.
     Image(LinkType, CowStr<'a>, CowStr<'a>),
 }
 
+/// Type specifier for inline links. See [the Tag::Link](enum.Tag.html#variant.Link) for more information.
 #[derive(Clone, Debug, PartialEq, Copy)]
 pub enum LinkType {
     /// Inline link like `[foo](bar)`
@@ -100,23 +116,41 @@ impl LinkType {
     }
 }
 
+/// Markdown events that are generated in a preorder traversal of the document
+/// tree, with additional `End` events whenever all of an inner node's children
+/// have been visited.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Event<'a> {
+    /// Start of a tagged element. Events that are yielded after this event
+    /// and before its corresponding `End` event are inside this element.
+    /// Start and end events are guaranteed to be balanced.
     Start(Tag<'a>),
+    /// End of a tagged element.
     End(Tag<'a>),
+    /// A text node.
     Text(CowStr<'a>),
+    /// An inline code node.
     Code(CowStr<'a>),
+    /// An HTML node.
     Html(CowStr<'a>),
-    InlineHtml(CowStr<'a>),
+    /// A reference to a footnote with given label, which may or may not be defined
+    /// by an event with a `Tag::FootnoteDefinition` tag. Definitions and references to them may
+    /// occur in any order.
     FootnoteReference(CowStr<'a>),
+    /// A soft line break.
     SoftBreak,
+    /// A hard line break.
     HardBreak,
-    /// A task list marker, rendered as a checkbox in HTML. Contains a true when it is checked
+    /// A horizontal ruler.
+    Rule,
+    /// A task list marker, rendered as a checkbox in HTML. Contains a true when it is checked.
     TaskListMarker(bool),
 }
 
+/// Table column text alignment.
 #[derive(Copy, Clone, Debug, PartialEq)]
 pub enum Alignment {
+    /// Default text alignment.
     None,
     Left,
     Center,
@@ -124,8 +158,9 @@ pub enum Alignment {
 }
 
 bitflags! {
+    /// Option struct containing flags for enabling extra features
+    /// that are not part of the CommonMark spec.
     pub struct Options: u32 {
-        const FIRST_PASS = 1 << 0;
         const ENABLE_TABLES = 1 << 1;
         const ENABLE_FOOTNOTES = 1 << 2;
         const ENABLE_STRIKETHROUGH = 1 << 3;
@@ -162,21 +197,19 @@ enum ItemBody {
     Strong,
     Strikethrough,
     Code(CowIndex),
-    InlineHtml,
     Link(LinkIndex),
     Image(LinkIndex),
     FootnoteReference(CowIndex),
     TaskListMarker(bool), // true for checked
 
     Rule,
-    Header(i32), // header level
+    Heading(u32), // heading level
     FencedCodeBlock(CowIndex),
     IndentCodeBlock,
-    HtmlBlock(Option<u32>), // end tag, or none for type 6
     Html,
     BlockQuote,
-    List(bool, u8, usize), // is_tight, list character, list start index
-    ListItem(usize),       // indent level
+    List(bool, u8, u64), // is_tight, list character, list start index
+    ListItem(usize),     // indent level
     SynthesizeText(CowIndex),
     FootnoteDefinition(CowIndex),
 
@@ -239,7 +272,7 @@ impl<'a> FirstPass<'a> {
     fn new(text: &'a str, options: Options) -> FirstPass {
         // This is a very naive heuristic for the number of nodes
         // we'll need.
-        let start_capacity = std::cmp::max(128, text.len() / 32);
+        let start_capacity = max(128, text.len() / 32);
         let tree = Tree::with_capacity(start_capacity);
         let begin_list_item = false;
         let last_line_blank = false;
@@ -271,7 +304,7 @@ impl<'a> FirstPass<'a> {
         let bytes = self.text.as_bytes();
         let mut line_start = LineStart::new(&bytes[start_ix..]);
 
-        let i = self.scan_containers(&mut line_start);
+        let i = scan_containers(&self.tree, &mut line_start);
         for _ in i..self.tree.spine_len() {
             self.pop(start_ix);
         }
@@ -369,11 +402,11 @@ impl<'a> FirstPass<'a> {
         let ix = start_ix + line_start.bytes_scanned();
 
         // HTML Blocks
-        if self.text.as_bytes()[ix] == b'<' {
+        if bytes[ix] == b'<' {
             // Types 1-5 are all detected by one function and all end with the same
             // pattern
-            if let Some(html_end_tag_ix) = get_html_end_tag(&bytes[(ix + 1)..]) {
-                return self.parse_html_block_type_1_to_5(ix, html_end_tag_ix, remaining_space);
+            if let Some(html_end_tag) = get_html_end_tag(&bytes[(ix + 1)..]) {
+                return self.parse_html_block_type_1_to_5(ix, html_end_tag, remaining_space);
             }
 
             // Detect type 6
@@ -392,14 +425,17 @@ impl<'a> FirstPass<'a> {
             return self.parse_hrule(n, ix);
         }
 
-        if let Some((atx_size, atx_level)) = scan_atx_heading(&bytes[ix..]) {
-            return self.parse_atx_heading(ix, atx_level, atx_size);
+        if let Some(atx_size) = scan_atx_heading(&bytes[ix..]) {
+            return self.parse_atx_heading(ix, atx_size);
         }
 
         // parse refdef
         if let Some((bytecount, label, link_def)) = self.parse_refdef_total(ix) {
             self.allocs.refdefs.entry(label).or_insert(link_def);
-            return ix + bytecount;
+            let ix = ix + bytecount;
+            // try to read trailing whitespace or it will register as a completely blank line
+            // TODO: shouldn't we do this for all block level items?
+            return ix + scan_blank_line(&bytes[ix..]).unwrap_or(0);
         }
 
         if let Some((n, fence_ch)) = scan_code_fence(&bytes[ix..]) {
@@ -498,7 +534,7 @@ impl<'a> FirstPass<'a> {
     fn parse_table_row(&mut self, mut ix: usize, row_cells: usize) -> Option<(usize, TreeIndex)> {
         let bytes = self.text.as_bytes();
         let mut line_start = LineStart::new(&bytes[ix..]);
-        let containers = self.scan_containers(&mut line_start);
+        let containers = scan_containers(&self.tree, &mut line_start);
         if containers != self.tree.spine_len() {
             return None;
         }
@@ -554,7 +590,7 @@ impl<'a> FirstPass<'a> {
 
             ix = next_ix;
             let mut line_start = LineStart::new(&bytes[ix..]);
-            let n_containers = self.scan_containers(&mut line_start);
+            let n_containers = scan_containers(&self.tree, &mut line_start);
             if !line_start.scan_space(4) {
                 let ix_new = ix + line_start.bytes_scanned();
                 if n_containers == self.tree.spine_len() {
@@ -597,7 +633,7 @@ impl<'a> FirstPass<'a> {
     fn parse_setext_heading(&mut self, ix: usize, node_ix: TreeIndex) -> Option<usize> {
         let bytes = self.text.as_bytes();
         let (n, level) = scan_setext_heading(&bytes[ix..])?;
-        self.tree[node_ix].item.body = ItemBody::Header(level);
+        self.tree[node_ix].item.body = ItemBody::Heading(level);
 
         // strip trailing whitespace
         if let TreePointer::Valid(cur_ix) = self.tree.cur() {
@@ -632,7 +668,7 @@ impl<'a> FirstPass<'a> {
                         // check if we may be parsing a table
                         let next_line_ix = ix + eol_bytes;
                         let mut line_start = LineStart::new(&bytes[next_line_ix..]);
-                        if self.scan_containers(&mut line_start) == self.tree.spine_len() {
+                        if scan_containers(&self.tree, &mut line_start) == self.tree.spine_len() {
                             let table_head_ix = next_line_ix + line_start.bytes_scanned();
                             let (table_head_bytes, alignment) =
                                 scan_table_head(&bytes[table_head_ix..]);
@@ -848,47 +884,33 @@ impl<'a> FirstPass<'a> {
     fn parse_html_block_type_1_to_5(
         &mut self,
         start_ix: usize,
-        html_end_tag_ix: u32,
+        html_end_tag: &str,
         mut remaining_space: usize,
     ) -> usize {
-        self.tree.append(Item {
-            start: start_ix,
-            end: 0, // set later
-            body: ItemBody::HtmlBlock(Some(html_end_tag_ix)),
-        });
-        self.tree.push();
-
         let bytes = self.text.as_bytes();
         let mut ix = start_ix;
-        let end_ix;
         loop {
             let line_start_ix = ix;
             ix += scan_nextline(&bytes[ix..]);
             self.append_html_line(remaining_space, line_start_ix, ix);
 
             let mut line_start = LineStart::new(&bytes[ix..]);
-            let n_containers = self.scan_containers(&mut line_start);
+            let n_containers = scan_containers(&self.tree, &mut line_start);
             if n_containers < self.tree.spine_len() {
-                end_ix = ix;
                 break;
             }
 
-            let html_end_tag = HTML_END_TAGS[html_end_tag_ix as usize];
-
             if (&self.text[line_start_ix..ix]).contains(html_end_tag) {
-                end_ix = ix;
                 break;
             }
 
             let next_line_ix = ix + line_start.bytes_scanned();
             if next_line_ix == self.text.len() {
-                end_ix = next_line_ix;
                 break;
             }
             ix = next_line_ix;
             remaining_space = line_start.remaining_space();
         }
-        self.pop(end_ix);
         ix
     }
 
@@ -900,38 +922,27 @@ impl<'a> FirstPass<'a> {
         start_ix: usize,
         mut remaining_space: usize,
     ) -> usize {
-        self.tree.append(Item {
-            start: start_ix,
-            end: 0, // set later
-            body: ItemBody::HtmlBlock(None),
-        });
-        self.tree.push();
-
         let bytes = self.text.as_bytes();
         let mut ix = start_ix;
-        let end_ix;
         loop {
             let line_start_ix = ix;
             ix += scan_nextline(&bytes[ix..]);
             self.append_html_line(remaining_space, line_start_ix, ix);
 
             let mut line_start = LineStart::new(&bytes[ix..]);
-            let n_containers = self.scan_containers(&mut line_start);
+            let n_containers = scan_containers(&self.tree, &mut line_start);
             if n_containers < self.tree.spine_len() || line_start.is_at_eol() {
-                end_ix = ix;
                 break;
             }
 
             let next_line_ix = ix + line_start.bytes_scanned();
             if next_line_ix == self.text.len() || scan_blank_line(&bytes[next_line_ix..]).is_some()
             {
-                end_ix = next_line_ix;
                 break;
             }
             ix = next_line_ix;
             remaining_space = line_start.remaining_space();
         }
-        self.pop(end_ix);
         ix
     }
 
@@ -962,7 +973,7 @@ impl<'a> FirstPass<'a> {
             }
 
             let mut line_start = LineStart::new(&bytes[ix..]);
-            let n_containers = self.scan_containers(&mut line_start);
+            let n_containers = scan_containers(&self.tree, &mut line_start);
             if n_containers < self.tree.spine_len()
                 || !(line_start.scan_space(4) || line_start.is_at_eol())
             {
@@ -1009,7 +1020,7 @@ impl<'a> FirstPass<'a> {
         self.tree.push();
         loop {
             let mut line_start = LineStart::new(&bytes[ix..]);
-            let n_containers = self.scan_containers(&mut line_start);
+            let n_containers = scan_containers(&self.tree, &mut line_start);
             if n_containers < self.tree.spine_len() {
                 break;
             }
@@ -1086,34 +1097,6 @@ impl<'a> FirstPass<'a> {
         }
     }
 
-    /// Returns number of containers scanned.
-    fn scan_containers(&self, line_start: &mut LineStart) -> usize {
-        let mut i = 0;
-        for &node_ix in self.tree.walk_spine() {
-            match self.tree[node_ix].item.body {
-                ItemBody::BlockQuote => {
-                    let save = line_start.clone();
-                    if !line_start.scan_blockquote_marker() {
-                        *line_start = save;
-                        break;
-                    }
-                }
-                ItemBody::ListItem(indent) => {
-                    if !line_start.is_at_eol() {
-                        let save = line_start.clone();
-                        if !line_start.scan_space(indent) {
-                            *line_start = save;
-                            break;
-                        }
-                    }
-                }
-                _ => (),
-            }
-            i += 1;
-        }
-        i
-    }
-
     /// Pop a container, setting its end.
     fn pop(&mut self, ix: usize) {
         let cur_ix = self.tree.pop().unwrap();
@@ -1143,7 +1126,7 @@ impl<'a> FirstPass<'a> {
 
     /// Continue an existing list or start a new one if there's not an open
     /// list that matches.
-    fn continue_list(&mut self, start: usize, ch: u8, index: usize) {
+    fn continue_list(&mut self, start: usize, ch: u8, index: u64) {
         if let Some(node_ix) = self.tree.peek_up() {
             if let ItemBody::List(ref mut is_tight, existing_ch, _) = self.tree[node_ix].item.body {
                 if existing_ch == ch {
@@ -1182,17 +1165,17 @@ impl<'a> FirstPass<'a> {
     /// Parse an ATX heading.
     ///
     /// Returns index of start of next line.
-    fn parse_atx_heading(&mut self, mut ix: usize, atx_level: i32, atx_size: usize) -> usize {
-        self.tree.append(Item {
+    fn parse_atx_heading(&mut self, mut ix: usize, atx_size: usize) -> usize {
+        let heading_ix = self.tree.append(Item {
             start: ix,
             end: 0, // set later
-            body: ItemBody::Header(atx_level),
+            body: ItemBody::Heading(atx_size as u32),
         });
         ix += atx_size;
-        // next char is space or scan_eol
-        // (guaranteed by scan_atx_heading)
+        // next char is space or eol (guaranteed by scan_atx_heading)
         let bytes = self.text.as_bytes();
         if let Some(eol_bytes) = scan_eol(&bytes[ix..]) {
+            self.tree[heading_ix].item.end = ix + eol_bytes;
             return ix + eol_bytes;
         }
         // skip leading spaces
@@ -1237,7 +1220,7 @@ impl<'a> FirstPass<'a> {
         if !bytes.starts_with(b"[^") {
             return None;
         }
-        let (mut i, label) = scan_link_label_rest(&self.text[(start + 2)..])?;
+        let (mut i, label) = self.parse_refdef_label(start + 2)?;
         i += 2;
         if scan_ch(&bytes[i..], b':') == 0 {
             return None;
@@ -1246,19 +1229,37 @@ impl<'a> FirstPass<'a> {
         self.tree.append(Item {
             start,
             end: 0, // will get set later
-            body: ItemBody::FootnoteDefinition(self.allocs.allocate_cow(label)), // TODO: check whether the label here is strictly necessary
+            // TODO: check whether the label here is strictly necessary
+            body: ItemBody::FootnoteDefinition(self.allocs.allocate_cow(label)),
         });
         self.tree.push();
         Some(i)
     }
 
+    /// Tries to parse a reference label, which can be interrupted by new blocks.
+    /// On success, returns the number of bytes of the label and the label itself.
+    fn parse_refdef_label(&self, start: usize) -> Option<(usize, CowStr<'a>)> {
+        scan_link_label_rest(&self.text[start..], &|bytes| {
+            let mut line_start = LineStart::new(bytes);
+            let _ = scan_containers(&self.tree, &mut line_start);
+            let bytes_scanned = line_start.bytes_scanned();
+
+            let suffix = &bytes[bytes_scanned..];
+            if self.interrupt_paragraph_by_list(suffix) || scan_paragraph_interrupt(suffix) {
+                None
+            } else {
+                Some(bytes_scanned)
+            }
+        })
+    }
+
     /// Returns number of bytes scanned, label and definition on success.
     fn parse_refdef_total(&mut self, start: usize) -> Option<(usize, LinkLabel<'a>, LinkDef<'a>)> {
         let bytes = &self.text.as_bytes()[start..];
         if scan_ch(bytes, b'[') == 0 {
             return None;
         }
-        let (mut i, label) = scan_link_label_rest(&self.text[(start + 1)..])?;
+        let (mut i, label) = self.parse_refdef_label(start + 1)?;
         i += 1;
         if scan_ch(&bytes[i..], b':') == 0 {
             return None;
@@ -1284,7 +1285,7 @@ impl<'a> FirstPass<'a> {
                 break;
             }
             let mut line_start = LineStart::new(&bytes[i..]);
-            if self.tree.spine_len() != self.scan_containers(&mut line_start) {
+            if self.tree.spine_len() != scan_containers(&self.tree, &mut line_start) {
                 return None;
             }
             i += line_start.bytes_scanned();
@@ -1351,6 +1352,34 @@ impl<'a> FirstPass<'a> {
     }
 }
 
+/// Returns number of containers scanned.
+fn scan_containers(tree: &Tree<Item>, line_start: &mut LineStart) -> usize {
+    let mut i = 0;
+    for &node_ix in tree.walk_spine() {
+        match tree[node_ix].item.body {
+            ItemBody::BlockQuote => {
+                let save = line_start.clone();
+                if !line_start.scan_blockquote_marker() {
+                    *line_start = save;
+                    break;
+                }
+            }
+            ItemBody::ListItem(indent) => {
+                if !line_start.is_at_eol() {
+                    let save = line_start.clone();
+                    if !line_start.scan_space(indent) {
+                        *line_start = save;
+                        break;
+                    }
+                }
+            }
+            _ => (),
+        }
+        i += 1;
+    }
+    i
+}
+
 /// Computes the number of header columns in a table line by computing the number of dividing pipes
 /// that aren't followed or preceeded by whitespace.
 fn count_header_cols(
@@ -1459,15 +1488,15 @@ fn scan_paragraph_interrupt(bytes: &[u8]) -> bool {
             || is_html_tag(scan_html_block_tag(&bytes[1..]).1))
 }
 
-static HTML_END_TAGS: &[&str; 7] = &["</pre>", "</style>", "</script>", "-->", "?>", "]]>", ">"];
-
-/// Returns an index into HTML_END_TAGS.
 /// Assumes `text_bytes` is preceded by `<`.
-fn get_html_end_tag(text_bytes: &[u8]) -> Option<u32> {
+fn get_html_end_tag(text_bytes: &[u8]) -> Option<&'static str> {
     static BEGIN_TAGS: &[&[u8]; 3] = &[b"pre", b"style", b"script"];
     static ST_BEGIN_TAGS: &[&[u8]; 3] = &[b"!--", b"?", b"![CDATA["];
 
-    for (beg_tag, end_tag_ix) in BEGIN_TAGS.iter().zip(0..3) {
+    for (beg_tag, end_tag) in BEGIN_TAGS
+        .iter()
+        .zip(["</pre>", "</style>", "</script>"].into_iter())
+    {
         let tag_len = beg_tag.len();
 
         if text_bytes.len() < tag_len {
@@ -1481,19 +1510,19 @@ fn get_html_end_tag(text_bytes: &[u8]) -> Option<u32> {
 
         // Must either be the end of the line...
         if text_bytes.len() == tag_len {
-            return Some(end_tag_ix);
+            return Some(end_tag);
         }
 
         // ...or be followed by whitespace, newline, or '>'.
         let s = text_bytes[tag_len];
         if is_ascii_whitespace(s) || s == b'>' {
-            return Some(end_tag_ix);
+            return Some(end_tag);
         }
     }
 
-    for (beg_tag, end_tag_ix) in ST_BEGIN_TAGS.iter().zip(3..6) {
+    for (beg_tag, end_tag) in ST_BEGIN_TAGS.iter().zip(["-->", "?>", "]]>"].into_iter()) {
         if text_bytes.starts_with(beg_tag) {
-            return Some(end_tag_ix);
+            return Some(end_tag);
         }
     }
 
@@ -1502,7 +1531,7 @@ fn get_html_end_tag(text_bytes: &[u8]) -> Option<u32> {
         && text_bytes[1] >= b'A'
         && text_bytes[1] <= b'Z'
     {
-        Some(6)
+        Some(">")
     } else {
         None
     }
@@ -1629,6 +1658,8 @@ enum RefScan<'a> {
     Failed,
 }
 
+/// Skips forward within a block to a node which spans (ends inclusive) the given
+/// index into the source.
 fn scan_nodes_to_ix(tree: &Tree<Item>, mut node: TreePointer, ix: usize) -> TreePointer {
     while let TreePointer::Valid(node_ix) = node {
         if tree[node_ix].item.end <= ix {
@@ -1640,6 +1671,31 @@ fn scan_nodes_to_ix(tree: &Tree<Item>, mut node: TreePointer, ix: usize) -> Tree
     node
 }
 
+/// Scans an inline link label, which cannot be interrupted.
+/// Returns number of bytes (including brackets) and label on success.
+fn scan_link_label<'text, 'tree>(
+    tree: &'tree Tree<Item>,
+    text: &'text str,
+) -> Option<(usize, ReferenceLabel<'text>)> {
+    let bytes = &text.as_bytes();
+    if bytes.len() < 2 || bytes[0] != b'[' {
+        return None;
+    }
+    let linebreak_handler = |bytes: &[u8]| {
+        let mut line_start = LineStart::new(bytes);
+        let _ = scan_containers(tree, &mut line_start);
+        Some(line_start.bytes_scanned())
+    };
+    let pair = if b'^' == bytes[1] {
+        let (byte_index, cow) = scan_link_label_rest(&text[2..], &linebreak_handler)?;
+        (byte_index + 2, ReferenceLabel::Footnote(cow))
+    } else {
+        let (byte_index, cow) = scan_link_label_rest(&text[1..], &linebreak_handler)?;
+        (byte_index + 1, ReferenceLabel::Link(cow))
+    };
+    Some(pair)
+}
+
 fn scan_reference<'a, 'b>(tree: &'a Tree<Item>, text: &'b str, cur: TreePointer) -> RefScan<'b> {
     let cur_ix = match cur {
         TreePointer::Nil => return RefScan::Failed,
@@ -1651,7 +1707,7 @@ fn scan_reference<'a, 'b>(tree: &'a Tree<Item>, text: &'b str, cur: TreePointer)
     if tail.starts_with(b"[]") {
         let closing_node = tree[cur_ix].next.unwrap();
         RefScan::Collapsed(tree[closing_node].next)
-    } else if let Some((ix, ReferenceLabel::Link(label))) = scan_link_label(&text[start..]) {
+    } else if let Some((ix, ReferenceLabel::Link(label))) = scan_link_label(tree, &text[start..]) {
         let next_node = scan_nodes_to_ix(tree, cur, start + ix);
         RefScan::LinkLabel(label, next_node)
     } else {
@@ -1839,13 +1895,13 @@ pub(crate) struct HtmlScanGuard {
     pub declaration: usize,
 }
 
+/// Markdown event iterator.
 #[derive(Clone)]
 pub struct Parser<'a> {
     text: &'a str,
     tree: Tree<Item>,
     allocs: Allocations<'a>,
     broken_link_callback: Option<&'a dyn Fn(&str, &str) -> Option<(String, String)>>,
-    offset: usize,
     html_scan_guard: HtmlScanGuard,
 
     // used by inline passes. store them here for reuse
@@ -1854,10 +1910,12 @@ pub struct Parser<'a> {
 }
 
 impl<'a> Parser<'a> {
+    /// Creates a new event iterator for a markdown string without any options enabled.
     pub fn new(text: &'a str) -> Parser<'a> {
         Parser::new_ext(text, Options::empty())
     }
 
+    /// Creates a new event iteratorfor a markdown string with given options.
     pub fn new_ext(text: &'a str, options: Options) -> Parser<'a> {
         Parser::new_with_broken_link_callback(text, options, None)
     }
@@ -1865,8 +1923,8 @@ impl<'a> Parser<'a> {
     /// In case the parser encounters any potential links that have a broken
     /// reference (e.g `[foo]` when there is no `[foo]: ` entry at the bottom)
     /// the provided callback will be called with the reference name,
-    /// and the returned pair will be used as the link name and title if not
-    /// None.
+    /// and the returned pair will be used as the link name and title if it is not
+    /// `None`.
     pub fn new_with_broken_link_callback(
         text: &'a str,
         options: Options,
@@ -1883,17 +1941,12 @@ impl<'a> Parser<'a> {
             tree,
             allocs,
             broken_link_callback,
-            offset: 0,
             inline_stack,
             link_stack,
             html_scan_guard,
         }
     }
 
-    pub fn get_offset(&self) -> usize {
-        self.offset
-    }
-
     /// Handle inline markup.
     ///
     /// When the parser encounters any item indicating potential inline markup, all
@@ -1915,12 +1968,15 @@ impl<'a> Parser<'a> {
         let mut cur = self.tree.cur();
         let mut prev = TreePointer::Nil;
 
+        let block_end = self.tree[self.tree.peek_up().unwrap()].item.end;
+        let block_text = &self.text[..block_end];
+
         while let TreePointer::Valid(mut cur_ix) = cur {
             match self.tree[cur_ix].item.body {
                 ItemBody::MaybeHtml => {
                     let next = self.tree[cur_ix].next;
                     let autolink = if let TreePointer::Valid(next_ix) = next {
-                        scan_autolink(self.text, self.tree[next_ix].item.start)
+                        scan_autolink(block_text, self.tree[next_ix].item.start)
                     } else {
                         None
                     };
@@ -1940,36 +1996,28 @@ impl<'a> Parser<'a> {
                         prev = cur;
                         cur = node;
                         if let TreePointer::Valid(node_ix) = cur {
-                            self.tree[node_ix].item.start = ix;
+                            self.tree[node_ix].item.start = max(self.tree[node_ix].item.start, ix);
                         }
                         continue;
                     } else {
                         let inline_html = if let TreePointer::Valid(next_ix) = next {
-                            self.tree
-                                .peek_up()
-                                .map(|parent_ix| self.tree[parent_ix].item.end)
-                                .and_then(|end_offset| {
-                                    let bytes = &self.text.as_bytes()[..end_offset];
-                                    scan_inline_html(
-                                        bytes,
-                                        self.tree[next_ix].item.start,
-                                        &mut self.html_scan_guard,
-                                    )
-                                })
+                            self.scan_inline_html(
+                                block_text.as_bytes(),
+                                self.tree[next_ix].item.start,
+                            )
                         } else {
                             None
                         };
                         if let Some(ix) = inline_html {
                             let node = scan_nodes_to_ix(&self.tree, next, ix);
-                            // TODO: this logic isn't right if the replaced chain has
-                            // tricky stuff (skipped containers, replaced nulls).
-                            self.tree[cur_ix].item.body = ItemBody::InlineHtml;
+                            self.tree[cur_ix].item.body = ItemBody::Html;
                             self.tree[cur_ix].item.end = ix;
                             self.tree[cur_ix].next = node;
                             prev = cur;
                             cur = node;
                             if let TreePointer::Valid(node_ix) = cur {
-                                self.tree[node_ix].item.start = ix;
+                                self.tree[node_ix].item.start =
+                                    max(self.tree[node_ix].item.start, ix);
                             }
                             continue;
                         }
@@ -2043,9 +2091,8 @@ impl<'a> Parser<'a> {
                             continue;
                         }
                         let next = self.tree[cur_ix].next;
-
                         if let Some((next_ix, url, title)) =
-                            scan_inline_link(self.text, self.tree[cur_ix].item.end)
+                            self.scan_inline_link(block_text, self.tree[cur_ix].item.end, next)
                         {
                             let next_node = scan_nodes_to_ix(&self.tree, next, next_ix);
                             if let TreePointer::Valid(prev_ix) = prev {
@@ -2061,9 +2108,10 @@ impl<'a> Parser<'a> {
                             };
                             self.tree[cur_ix].child = self.tree[cur_ix].next;
                             self.tree[cur_ix].next = next_node;
+                            self.tree[cur_ix].item.end = next_ix;
                             if let TreePointer::Valid(next_node_ix) = next_node {
                                 self.tree[next_node_ix].item.start =
-                                    std::cmp::max(self.tree[next_node_ix].item.start, next_ix);
+                                    max(self.tree[next_node_ix].item.start, next_ix);
                             }
 
                             if tos.ty == LinkStackTy::Link {
@@ -2072,7 +2120,7 @@ impl<'a> Parser<'a> {
                         } else {
                             // ok, so its not an inline link. maybe it is a reference
                             // to a defined link?
-                            let scan_result = scan_reference(&self.tree, &self.text, next);
+                            let scan_result = scan_reference(&self.tree, block_text, next);
                             let label_node = self.tree[tos.node].next;
                             let node_after_link = match scan_result {
                                 RefScan::LinkLabel(_, next_node) => next_node,
@@ -2088,11 +2136,12 @@ impl<'a> Parser<'a> {
                                 RefScan::LinkLabel(l, ..) => Some(ReferenceLabel::Link(l)),
                                 RefScan::Collapsed(..) | RefScan::Failed => {
                                     // No label? maybe it is a shortcut reference
-                                    let start = self.tree[tos.node].item.end - 1;
-                                    let end = self.tree[cur_ix].item.end;
-                                    let search_text = &self.text[start..end];
-
-                                    scan_link_label(search_text).map(|(_ix, label)| label)
+                                    scan_link_label(
+                                        &self.tree,
+                                        &self.text[(self.tree[tos.node].item.end - 1)
+                                            ..self.tree[cur_ix].item.end],
+                                    )
+                                    .map(|(_ix, label)| label)
                                 }
                             };
 
@@ -2107,32 +2156,31 @@ impl<'a> Parser<'a> {
                                 self.link_stack.clear();
                                 continue;
                             } else if let Some(ReferenceLabel::Link(link_label)) = label {
-                                let type_url_title = if let Some(matching_def) = self
+                                let type_url_title = self
                                     .allocs
                                     .refdefs
                                     .get(&UniCase::new(link_label.as_ref().into()))
-                                {
-                                    // found a matching definition!
-                                    let title = matching_def
-                                        .title
-                                        .as_ref()
-                                        .cloned()
-                                        .unwrap_or_else(|| "".into());
-                                    let url = matching_def.dest.clone();
-                                    Some((link_type, url, title))
-                                } else if let Some(callback) = self.broken_link_callback {
-                                    // looked for matching definition, but didn't find it. try to fix
-                                    // link with callback, if it is defined
-                                    if let Some((url, title)) =
-                                        callback(link_label.as_ref(), link_label.as_ref())
-                                    {
-                                        Some((link_type.to_unknown(), url.into(), title.into()))
-                                    } else {
-                                        None
-                                    }
-                                } else {
-                                    None
-                                };
+                                    .map(|matching_def| {
+                                        // found a matching definition!
+                                        let title = matching_def
+                                            .title
+                                            .as_ref()
+                                            .cloned()
+                                            .unwrap_or_else(|| "".into());
+                                        let url = matching_def.dest.clone();
+                                        (link_type, url, title)
+                                    })
+                                    .or_else(|| {
+                                        self.broken_link_callback
+                                            .and_then(|callback| {
+                                                // looked for matching definition, but didn't find it. try to fix
+                                                // link with callback, if it is defined
+                                                callback(link_label.as_ref(), link_label.as_ref())
+                                            })
+                                            .map(|(url, title)| {
+                                                (link_type.to_unknown(), url.into(), title.into())
+                                            })
+                                    });
 
                                 if let Some((def_link_type, url, title)) = type_url_title {
                                     let link_ix =
@@ -2271,6 +2319,108 @@ impl<'a> Parser<'a> {
         self.inline_stack.pop_all(&mut self.tree);
     }
 
+    /// Returns next byte index, url and title.
+    fn scan_inline_link(
+        &self,
+        underlying: &'a str,
+        start_ix: usize,
+        node: TreePointer,
+    ) -> Option<(usize, CowStr<'a>, CowStr<'a>)> {
+        let mut ix = start_ix;
+        if scan_ch(&underlying.as_bytes()[ix..], b'(') == 0 {
+            return None;
+        }
+        ix += 1;
+        ix += scan_while(&underlying.as_bytes()[ix..], is_ascii_whitespace);
+
+        let (dest_length, dest) = scan_link_dest(underlying, ix, LINK_MAX_NESTED_PARENS)?;
+        let dest = unescape(dest);
+        ix += dest_length;
+
+        ix += scan_while(&underlying.as_bytes()[ix..], is_ascii_whitespace);
+
+        let title = if let Some((bytes_scanned, t)) = self.scan_link_title(underlying, ix, node) {
+            ix += bytes_scanned;
+            ix += scan_while(&underlying.as_bytes()[ix..], is_ascii_whitespace);
+            t
+        } else {
+            "".into()
+        };
+        if scan_ch(&underlying.as_bytes()[ix..], b')') == 0 {
+            return None;
+        }
+        ix += 1;
+
+        Some((ix, dest, title))
+    }
+
+    // returns (bytes scanned, title cow)
+    fn scan_link_title(
+        &self,
+        text: &'a str,
+        start_ix: usize,
+        node: TreePointer,
+    ) -> Option<(usize, CowStr<'a>)> {
+        let bytes = text.as_bytes();
+        let open = match bytes.get(start_ix) {
+            Some(b @ b'\'') | Some(b @ b'\"') | Some(b @ b'(') => *b,
+            _ => return None,
+        };
+        let close = if open == b'(' { b')' } else { open };
+
+        let mut title = String::new();
+        let mut mark = start_ix + 1;
+        let mut i = start_ix + 1;
+
+        while i < bytes.len() {
+            let c = bytes[i];
+
+            if c == close {
+                let cow = if mark == 1 {
+                    (i - start_ix + 1, text[mark..i].into())
+                } else {
+                    title.push_str(&text[mark..i]);
+                    (i - start_ix + 1, title.into())
+                };
+
+                return Some(cow);
+            }
+            if c == open {
+                return None;
+            }
+
+            if c == b'\n' || c == b'\r' {
+                if let TreePointer::Valid(node_ix) = scan_nodes_to_ix(&self.tree, node, i + 1) {
+                    if self.tree[node_ix].item.start > i {
+                        title.push_str(&text[mark..i]);
+                        title.push('\n');
+                        i = self.tree[node_ix].item.start;
+                        mark = i;
+                        continue;
+                    }
+                }
+            }
+            if c == b'&' {
+                if let (n, Some(value)) = scan_entity(&bytes[i..]) {
+                    title.push_str(&text[mark..i]);
+                    title.push_str(&value);
+                    i += n;
+                    mark = i;
+                    continue;
+                }
+            }
+            if c == b'\\' && i + 1 < bytes.len() && is_ascii_punctuation(bytes[i + 1]) {
+                title.push_str(&text[mark..i]);
+                i += 1;
+                mark = i;
+            }
+
+            i += 1;
+        }
+
+        None
+    }
+
     /// Make a code span.
     ///
     /// Both `open` and `close` are matching MaybeCode items.
@@ -2361,6 +2511,29 @@ impl<'a> Parser<'a> {
         }
     }
 
+    /// Returns the next byte offset on success.
+    fn scan_inline_html(&mut self, bytes: &[u8], ix: usize) -> Option<usize> {
+        let c = *bytes.get(ix)?;
+        if c == b'!' {
+            scan_inline_html_comment(bytes, ix + 1, &mut self.html_scan_guard)
+        } else if c == b'?' {
+            scan_inline_html_processing(bytes, ix + 1, &mut self.html_scan_guard)
+        } else {
+            let i = scan_html_block_inner(
+                &bytes[ix..],
+                Some(&|_bytes| {
+                    let mut line_start = LineStart::new(bytes);
+                    let _ = scan_containers(&self.tree, &mut line_start);
+                    line_start.bytes_scanned()
+                }),
+            )?;
+            Some(i + ix)
+        }
+    }
+
+    /// Consumes the event iterator and produces an iterator that produces
+    /// `(Event, Range)` pairs, where the `Range` value maps to the corresponding
+    /// range in the markdown source.
     pub fn into_offset_iter(self) -> OffsetIter<'a> {
         OffsetIter { inner: self }
     }
@@ -2376,7 +2549,7 @@ pub(crate) enum LoopInstruction<T> {
 /// This function walks the byte slices from the given index and
 /// calls the callback function on all bytes (and their indices) that are in the following set:
 /// `` ` ``, `\`, `&`, `*`, `_`, `~`, `!`, `<`, `[`, `]`, `|`, `\r`, `\n`
-/// It may also call the callback on other bytes, but it is not guaranteed.
+/// It is guaranteed not call the callback on other bytes.
 /// Whenever `callback(ix, byte)` returns a `ContinueAndSkip(n)` value, the callback
 /// will not be called with an index that is less than `ix + n + 1`.
 /// When the callback returns a `BreakAtWith(end_ix, opt+val)`, no more callbacks will be
@@ -2397,6 +2570,24 @@ where
     }
 }
 
+const fn special_bytes() -> [bool; 256] {
+    let mut bytes = [false; 256];
+    bytes[b'<' as usize] = true;
+    bytes[b'!' as usize] = true;
+    bytes[b'[' as usize] = true;
+    bytes[b'~' as usize] = true;
+    bytes[b'`' as usize] = true;
+    bytes[b'|' as usize] = true;
+    bytes[b'\\' as usize] = true;
+    bytes[b'*' as usize] = true;
+    bytes[b'_' as usize] = true;
+    bytes[b'\r' as usize] = true;
+    bytes[b'\n' as usize] = true;
+    bytes[b']' as usize] = true;
+    bytes[b'&' as usize] = true;
+    bytes
+}
+
 pub(crate) fn scalar_iterate_special_bytes<F, T>(
     bytes: &[u8],
     mut ix: usize,
@@ -2405,20 +2596,33 @@ pub(crate) fn scalar_iterate_special_bytes<F, T>(
 where
     F: FnMut(usize, u8) -> LoopInstruction<Option<T>>,
 {
+    let special_bytes = special_bytes();
+
     while ix < bytes.len() {
-        match callback(ix, bytes[ix]) {
-            LoopInstruction::ContinueAndSkip(skip) => {
-                ix += skip + 1;
-            }
-            LoopInstruction::BreakAtWith(ix, val) => {
-                return (ix, val);
+        let b = bytes[ix];
+        if special_bytes[b as usize] {
+            match callback(ix, b) {
+                LoopInstruction::ContinueAndSkip(skip) => {
+                    ix += skip;
+                }
+                LoopInstruction::BreakAtWith(ix, val) => {
+                    return (ix, val);
+                }
             }
         }
+        ix += 1;
     }
 
     (ix, None)
 }
 
+/// Markdown event and source range iterator.
+///
+/// Generates tuples where the first element is the markdown event and the second
+/// is a the corresponding range in the source string.
+///
+/// Constructed from a `Parser` using its
+/// [`into_offset_iter`](struct.Parser.html#method.into_offset_iter) method.
 pub struct OffsetIter<'a> {
     inner: Parser<'a>,
 }
@@ -2470,8 +2674,7 @@ fn item_to_tag<'a>(item: &Item, allocs: &Allocations<'a>) -> Tag<'a> {
             let &(ref link_type, ref url, ref title) = allocs.index(link_ix);
             Tag::Image(*link_type, url.clone(), title.clone())
         }
-        ItemBody::Rule => Tag::Rule,
-        ItemBody::Header(level) => Tag::Header(level),
+        ItemBody::Heading(level) => Tag::Heading(level),
         ItemBody::FencedCodeBlock(cow_ix) => Tag::CodeBlock(allocs[cow_ix].clone()),
         ItemBody::IndentCodeBlock => Tag::CodeBlock("".into()),
         ItemBody::BlockQuote => Tag::BlockQuote,
@@ -2483,7 +2686,6 @@ fn item_to_tag<'a>(item: &Item, allocs: &Allocations<'a>) -> Tag<'a> {
             }
         }
         ItemBody::ListItem(_) => Tag::Item,
-        ItemBody::HtmlBlock(_) => Tag::HtmlBlock,
         ItemBody::TableHead => Tag::TableHead,
         ItemBody::TableCell => Tag::TableCell,
         ItemBody::TableRow => Tag::TableRow,
@@ -2499,13 +2701,13 @@ fn item_to_event<'a>(item: Item, text: &'a str, allocs: &Allocations<'a>) -> Eve
         ItemBody::Code(cow_ix) => return Event::Code(allocs[cow_ix].clone()),
         ItemBody::SynthesizeText(cow_ix) => return Event::Text(allocs[cow_ix].clone()),
         ItemBody::Html => return Event::Html(text[item.start..item.end].into()),
-        ItemBody::InlineHtml => return Event::InlineHtml(text[item.start..item.end].into()),
         ItemBody::SoftBreak => return Event::SoftBreak,
         ItemBody::HardBreak => return Event::HardBreak,
         ItemBody::FootnoteReference(cow_ix) => {
             return Event::FootnoteReference(allocs[cow_ix].clone())
         }
         ItemBody::TaskListMarker(checked) => return Event::TaskListMarker(checked),
+        ItemBody::Rule => return Event::Rule,
 
         ItemBody::Paragraph => Tag::Paragraph,
         ItemBody::Emphasis => Tag::Emphasis,
@@ -2519,8 +2721,7 @@ fn item_to_event<'a>(item: Item, text: &'a str, allocs: &Allocations<'a>) -> Eve
             let &(ref link_type, ref url, ref title) = allocs.index(link_ix);
             Tag::Image(*link_type, url.clone(), title.clone())
         }
-        ItemBody::Rule => Tag::Rule,
-        ItemBody::Header(level) => Tag::Header(level),
+        ItemBody::Heading(level) => Tag::Heading(level),
         ItemBody::FencedCodeBlock(cow_ix) => Tag::CodeBlock(allocs[cow_ix].clone()),
         ItemBody::IndentCodeBlock => Tag::CodeBlock("".into()),
         ItemBody::BlockQuote => Tag::BlockQuote,
@@ -2532,7 +2733,6 @@ fn item_to_event<'a>(item: Item, text: &'a str, allocs: &Allocations<'a>) -> Eve
             }
         }
         ItemBody::ListItem(_) => Tag::Item,
-        ItemBody::HtmlBlock(_) => Tag::HtmlBlock,
         ItemBody::TableHead => Tag::TableHead,
         ItemBody::TableCell => Tag::TableCell,
         ItemBody::TableRow => Tag::TableRow,
@@ -2596,7 +2796,6 @@ impl<'a> Iterator for Parser<'a> {
             TreePointer::Nil => {
                 let ix = self.tree.pop()?;
                 let tag = item_to_tag(&self.tree[ix].item, &self.allocs);
-                self.offset = self.tree[ix].item.end;
                 self.tree.next_sibling(ix);
                 Some(Event::End(tag))
             }
@@ -2609,14 +2808,8 @@ impl<'a> Iterator for Parser<'a> {
                 let item = node.item;
                 let event = item_to_event(item, self.text, &self.allocs);
                 if let Event::Start(..) = event {
-                    self.offset = if let TreePointer::Valid(child_ix) = node.child {
-                        self.tree[child_ix].item.start
-                    } else {
-                        item.end
-                    };
                     self.tree.push();
                 } else {
-                    self.offset = item.end;
                     self.tree.next_sibling(cur_ix);
                 }
                 Some(event)
@@ -2749,6 +2942,26 @@ mod test {
         assert_eq!(expected_offsets, event_offsets);
     }
 
+    #[test]
+    fn offset_iter_issue_378() {
+        let event_offsets: Vec<_> = Parser::new("a [b](c) d")
+            .into_offset_iter()
+            .map(|(_ev, range)| range)
+            .collect();
+        let expected_offsets = vec![(0..10), (0..2), (2..8), (3..4), (2..8), (8..10), (0..10)];
+        assert_eq!(expected_offsets, event_offsets);
+    }
+
+    #[test]
+    fn offset_iter_issue_404() {
+        let event_offsets: Vec<_> = Parser::new("###\n")
+            .into_offset_iter()
+            .map(|(_ev, range)| range)
+            .collect();
+        let expected_offsets = vec![(0..4), (0..4)];
+        assert_eq!(expected_offsets, event_offsets);
+    }
+
     // FIXME: add this one regression suite
     #[test]
     fn link_def_at_eof() {
diff --git a/vendor/pulldown-cmark-0.5.3/src/puncttable.rs b/vendor/pulldown-cmark-0.6.1/src/puncttable.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/src/puncttable.rs
rename to vendor/pulldown-cmark-0.6.1/src/puncttable.rs
diff --git a/vendor/pulldown-cmark-0.5.3/src/scanners.rs b/vendor/pulldown-cmark-0.6.1/src/scanners.rs
similarity index 86%
rename from vendor/pulldown-cmark-0.5.3/src/scanners.rs
rename to vendor/pulldown-cmark-0.6.1/src/scanners.rs
index ea7b5d4b98..87a91d210d 100644
--- a/vendor/pulldown-cmark-0.5.3/src/scanners.rs
+++ b/vendor/pulldown-cmark-0.6.1/src/scanners.rs
@@ -30,13 +30,6 @@ use crate::strings::CowStr;
 
 use memchr::memchr;
 
-// Allowing arbitrary depth nested parentheses inside link destinations
-// can create denial of service vulnerabilities if we're not careful.
-// The simplest countermeasure is to limit their depth, which is
-// explicitly allowed by the spec as long as the limit is at least 3:
-// https://spec.commonmark.org/0.29/#link-destination
-const LINK_MAX_NESTED_PARENS: usize = 5;
-
 // sorted for binary search
 const HTML_TAGS: [&str; 62] = [
     "address",
@@ -179,11 +172,10 @@ impl<'a> LineStart<'a> {
 
     /// Determine whether we're at end of line (includes end of file).
     pub(crate) fn is_at_eol(&self) -> bool {
-        if self.ix >= self.bytes.len() {
-            return true;
-        }
-        let c = self.bytes[self.ix];
-        c == b'\r' || c == b'\n'
+        self.bytes
+            .get(self.ix)
+            .map(|&c| c == b'\r' || c == b'\n')
+            .unwrap_or(true)
     }
 
     fn scan_ch(&mut self, c: u8) -> bool {
@@ -212,7 +204,7 @@ impl<'a> LineStart<'a> {
     /// Return value is the character, the start index, and the indent in spaces.
     /// For ordered list markers, the character will be one of b'.' or b')'. For
     /// bullet list markers, it will be one of b'-', b'+', or b'*'.
-    pub(crate) fn scan_list_marker(&mut self) -> Option<(u8, usize, usize)> {
+    pub(crate) fn scan_list_marker(&mut self) -> Option<(u8, u64, usize)> {
         let save = self.clone();
         let indent = self.scan_space_upto(3);
         if self.ix < self.bytes.len() {
@@ -242,18 +234,8 @@ impl<'a> LineStart<'a> {
                         val = val * 10 + u64::from(c - b'0');
                     } else if c == b')' || c == b'.' {
                         self.ix = ix;
-                        let val_usize = val as usize;
-                        // This will cause some failures on 32 bit arch.
-                        // TODO (breaking API change): should be u64, not usize.
-                        if val_usize as u64 != val {
-                            return None;
-                        }
                         if self.scan_space(1) || self.is_at_eol() {
-                            return self.finish_list_marker(
-                                c,
-                                val_usize,
-                                indent + self.ix - start_ix,
-                            );
+                            return self.finish_list_marker(c, val, indent + self.ix - start_ix);
                         } else {
                             break;
                         }
@@ -270,9 +252,9 @@ impl<'a> LineStart<'a> {
     fn finish_list_marker(
         &mut self,
         c: u8,
-        start: usize,
+        start: u64,
         mut indent: usize,
-    ) -> Option<(u8, usize, usize)> {
+    ) -> Option<(u8, u64, usize)> {
         let save = self.clone();
 
         // skip the rest of the line if it's blank
@@ -523,10 +505,10 @@ pub(crate) fn scan_hrule(bytes: &[u8]) -> Result<usize, usize> {
 /// Scan an ATX heading opening sequence.
 ///
 /// Returns number of bytes in prefix and level.
-pub(crate) fn scan_atx_heading(data: &[u8]) -> Option<(usize, i32)> {
+pub(crate) fn scan_atx_heading(data: &[u8]) -> Option<usize> {
     let level = scan_ch_repeat(data, b'#');
     if level >= 1 && level <= 6 && data.get(level).cloned().map_or(true, is_ascii_whitespace) {
-        Some((level, level as i32))
+        Some(level)
     } else {
         None
     }
@@ -535,7 +517,7 @@ pub(crate) fn scan_atx_heading(data: &[u8]) -> Option<(usize, i32)> {
 /// Scan a setext heading underline.
 ///
 /// Returns number of bytes in line (including trailing newline) and level.
-pub(crate) fn scan_setext_heading(data: &[u8]) -> Option<(usize, i32)> {
+pub(crate) fn scan_setext_heading(data: &[u8]) -> Option<(usize, u32)> {
     let c = *data.get(0)?;
     if !(c == b'-' || c == b'=') {
         return None;
@@ -762,58 +744,6 @@ pub(crate) fn scan_entity(bytes: &[u8]) -> (usize, Option<CowStr<'static>>) {
     (0, None)
 }
 
-// returns (bytes scanned, title cow)
-fn scan_link_title(text: &str, start_ix: usize) -> Option<(usize, CowStr<'_>)> {
-    let bytes = text.as_bytes();
-    let open = match bytes.get(start_ix) {
-        Some(b @ b'\'') | Some(b @ b'\"') | Some(b @ b'(') => *b,
-        _ => return None,
-    };
-    let close = if open == b'(' { b')' } else { open };
-
-    let mut title = String::new();
-    let mut mark = start_ix + 1;
-    let mut i = start_ix + 1;
-
-    while i < bytes.len() {
-        let c = bytes[i];
-
-        if c == close {
-            let cow = if mark == 1 {
-                (i - start_ix + 1, text[mark..i].into())
-            } else {
-                title.push_str(&text[mark..i]);
-                (i - start_ix + 1, title.into())
-            };
-
-            return Some(cow);
-        }
-        if c == open {
-            return None;
-        }
-
-        // TODO: do b'\r' as well?
-        if c == b'&' {
-            if let (n, Some(value)) = scan_entity(&bytes[i..]) {
-                title.push_str(&text[mark..i]);
-                title.push_str(&value);
-                i += n;
-                mark = i;
-                continue;
-            }
-        }
-        if c == b'\\' && i + 1 < bytes.len() && is_ascii_punctuation(bytes[i + 1]) {
-            title.push_str(&text[mark..i]);
-            i += 1;
-            mark = i;
-        }
-
-        i += 1;
-    }
-
-    None
-}
-
 // FIXME: we can most likely re-use other scanners
 // returns (bytelength, title_str)
 pub(crate) fn scan_refdef_title(text: &str) -> Option<(usize, &str)> {
@@ -911,39 +841,6 @@ pub(crate) fn scan_link_dest(
     }
 }
 
-/// Returns next byte index, url and title.
-pub(crate) fn scan_inline_link(
-    underlying: &str,
-    start_ix: usize,
-) -> Option<(usize, CowStr<'_>, CowStr<'_>)> {
-    let mut ix = start_ix;
-    if scan_ch(&underlying.as_bytes()[ix..], b'(') == 0 {
-        return None;
-    }
-    ix += 1;
-    ix += scan_while(&underlying.as_bytes()[ix..], is_ascii_whitespace);
-
-    let (dest_length, dest) = scan_link_dest(underlying, ix, LINK_MAX_NESTED_PARENS)?;
-    let dest = unescape(dest);
-    ix += dest_length;
-
-    ix += scan_while(&underlying.as_bytes()[ix..], is_ascii_whitespace);
-
-    let title = if let Some((bytes_scanned, t)) = scan_link_title(underlying, ix) {
-        ix += bytes_scanned;
-        ix += scan_while(&underlying.as_bytes()[ix..], is_ascii_whitespace);
-        t
-    } else {
-        "".into()
-    };
-    if scan_ch(&underlying.as_bytes()[ix..], b')') == 0 {
-        return None;
-    }
-    ix += 1;
-
-    Some((ix, dest, title))
-}
-
 /// Returns bytes scanned
 fn scan_attribute_name(data: &[u8]) -> Option<usize> {
     let (&c, tail) = data.split_first()?;
@@ -959,7 +856,9 @@ fn scan_attribute_name(data: &[u8]) -> Option<usize> {
 }
 
 /// Returns byte scanned (TODO: should it return new offset?)
-fn scan_attribute(data: &[u8], allow_newline: bool) -> Option<usize> {
+// TODO: properly use the newline handler here
+fn scan_attribute(data: &[u8], newline_handler: Option<&dyn Fn(&[u8]) -> usize>) -> Option<usize> {
+    let allow_newline = newline_handler.is_some();
     let whitespace_scanner =
         |c| is_ascii_whitespace(c) && (allow_newline || c != b'\n' && c != b'\r');
     let mut ix = scan_attribute_name(data)?;
@@ -968,7 +867,7 @@ fn scan_attribute(data: &[u8], allow_newline: bool) -> Option<usize> {
     if scan_ch(&data[ix..], b'=') == 1 {
         ix += 1;
         ix += scan_while(&data[ix..], whitespace_scanner);
-        ix += scan_attribute_value(&data[ix..], allow_newline)?;
+        ix += scan_attribute_value(&data[ix..], newline_handler)?;
     } else if n_whitespace > 0 {
         // Leave whitespace for next attribute.
         ix -= 1;
@@ -976,18 +875,27 @@ fn scan_attribute(data: &[u8], allow_newline: bool) -> Option<usize> {
     Some(ix)
 }
 
-fn scan_attribute_value(data: &[u8], allow_newline: bool) -> Option<usize> {
+fn scan_attribute_value(
+    data: &[u8],
+    newline_handler: Option<&dyn Fn(&[u8]) -> usize>,
+) -> Option<usize> {
     let mut i = 0;
     match *data.get(0)? {
         b @ b'"' | b @ b'\'' => {
             i += 1;
-            i += scan_while(&data[i..], |c| {
-                c != b && (allow_newline || c != b'\n' && c != b'\r')
-            });
-            if scan_ch(&data[i..], b) == 0 {
-                return None;
+            while i < data.len() {
+                if data[i] == b {
+                    return Some(i + 1);
+                }
+                if let Some(eol_bytes) = scan_eol(&data[i..]) {
+                    let handler = newline_handler?;
+                    i += eol_bytes;
+                    i += handler(&data[i..]);
+                } else {
+                    i += 1;
+                }
             }
-            i += 1;
+            return None;
         }
         b' ' | b'=' | b'>' | b'<' | b'`' | b'\n' | b'\r' => {
             return None;
@@ -1069,12 +977,22 @@ pub(crate) fn is_html_tag(tag: &[u8]) -> bool {
 
 /// Assumes that `data` is preceded by `<`.
 pub(crate) fn scan_html_type_7(data: &[u8]) -> Option<usize> {
-    let i = scan_html_block_inner(data, false)?;
+    // Block type html does not allow for newlines, so we
+    // do not pass a newline handler.
+    let i = scan_html_block_inner(data, None)?;
     scan_blank_line(&data[i..])?;
     Some(i)
 }
 
-fn scan_html_block_inner(data: &[u8], allow_newline: bool) -> Option<usize> {
+// FIXME: instead of a newline handler, maybe this should receive
+// a whitespace handler instead.
+// With signature `&dyn Fn(&[u8]) -> Option<usize>`.
+// We currently need to implement whitespace handling in all of
+// this function's dependencies as well.
+pub(crate) fn scan_html_block_inner(
+    data: &[u8],
+    newline_handler: Option<&dyn Fn(&[u8]) -> usize>,
+) -> Option<usize> {
     let close_tag_bytes = scan_ch(&data, b'/');
     let l = scan_while(&data[close_tag_bytes..], is_ascii_alpha);
     if l == 0 {
@@ -1085,17 +1003,28 @@ fn scan_html_block_inner(data: &[u8], allow_newline: bool) -> Option<usize> {
 
     if close_tag_bytes == 0 {
         loop {
-            let whitespace_scanner =
-                |c| is_ascii_whitespace(c) && (allow_newline || c != b'\n' && c != b'\r');
-            let whitespace = scan_while(&data[i..], whitespace_scanner);
-            i += whitespace;
+            let old_i = i;
+            loop {
+                i += scan_whitespace_no_nl(&data[i..]);
+                if let Some(eol_bytes) = scan_eol(&data[i..]) {
+                    if let Some(handler) = newline_handler {
+                        i += eol_bytes;
+                        i += handler(&data[i..]);
+                    } else {
+                        return None;
+                    }
+                } else {
+                    break;
+                }
+            }
             if let Some(b'/') | Some(b'>') = data.get(i) {
                 break;
             }
-            if whitespace == 0 {
+            if old_i == i {
+                // No whitespace, which is mandatory.
                 return None;
             }
-            i += scan_attribute(&data[i..], allow_newline)?;
+            i += scan_attribute(&data[i..], newline_handler)?;
         }
     }
 
@@ -1105,11 +1034,10 @@ fn scan_html_block_inner(data: &[u8], allow_newline: bool) -> Option<usize> {
         i += scan_ch(&data[i..], b'/');
     }
 
-    let c = scan_ch(&data[i..], b'>');
-    if c == 0 {
+    if scan_ch(&data[i..], b'>') == 0 {
         None
     } else {
-        Some(i + c)
+        Some(i + 1)
     }
 }
 
@@ -1148,20 +1076,16 @@ fn scan_uri(text: &str, start_ix: usize) -> Option<(usize, CowStr<'_>)> {
         return None;
     }
 
-    let mut ended = false;
     while i < bytes.len() {
         match bytes[i] {
-            b'\0'..=b' ' => {
-                ended = true;
-            }
-            b'>' | b'<' => break,
-            _ if ended => return None,
+            b'>' => return Some((start_ix + i + 1, text[start_ix..(start_ix + i)].into())),
+            b'\0'..=b' ' | b'<' => return None,
             _ => (),
         }
         i += 1;
     }
 
-    Some((start_ix + i + 1, text[start_ix..(start_ix + i)].into()))
+    None
 }
 
 /// Returns (next_byte_offset, email)
@@ -1218,7 +1142,7 @@ fn scan_email(text: &str, start_ix: usize) -> Option<(usize, CowStr<'_>)> {
 
 /// Scan comment, declaration, or CDATA section, with initial "<!" already consumed.
 /// Returns byte offset on match.
-fn scan_inline_html_comment(
+pub(crate) fn scan_inline_html_comment(
     bytes: &[u8],
     mut ix: usize,
     scan_guard: &mut HtmlScanGuard,
@@ -1285,7 +1209,7 @@ fn scan_inline_html_comment(
 
 /// Scan processing directive, with initial "<?" already consumed.
 /// Returns the next byte offset on success.
-fn scan_inline_html_processing(
+pub(crate) fn scan_inline_html_processing(
     bytes: &[u8],
     mut ix: usize,
     scan_guard: &mut HtmlScanGuard,
@@ -1303,23 +1227,6 @@ fn scan_inline_html_processing(
     None
 }
 
-/// Returns the next byte offset on success.
-pub(crate) fn scan_inline_html(
-    bytes: &[u8],
-    ix: usize,
-    scan_guard: &mut HtmlScanGuard,
-) -> Option<usize> {
-    let c = *bytes.get(ix)?;
-    if c == b'!' {
-        scan_inline_html_comment(bytes, ix + 1, scan_guard)
-    } else if c == b'?' {
-        scan_inline_html_processing(bytes, ix + 1, scan_guard)
-    } else {
-        let i = scan_html_block_inner(&bytes[ix..], true)?;
-        Some(i + ix)
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/vendor/pulldown-cmark-0.5.3/src/simd.rs b/vendor/pulldown-cmark-0.6.1/src/simd.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/src/simd.rs
rename to vendor/pulldown-cmark-0.6.1/src/simd.rs
diff --git a/vendor/pulldown-cmark-0.5.3/src/strings.rs b/vendor/pulldown-cmark-0.6.1/src/strings.rs
similarity index 86%
rename from vendor/pulldown-cmark-0.5.3/src/strings.rs
rename to vendor/pulldown-cmark-0.6.1/src/strings.rs
index 501fd27fbf..d94ddfaeb3 100644
--- a/vendor/pulldown-cmark-0.5.3/src/strings.rs
+++ b/vendor/pulldown-cmark-0.6.1/src/strings.rs
@@ -1,5 +1,5 @@
 use std::borrow::{Borrow, ToOwned};
-use std::convert::AsRef;
+use std::convert::{AsRef, TryFrom};
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::ops::Deref;
@@ -7,11 +7,13 @@ use std::str::from_utf8;
 
 const MAX_INLINE_STR_LEN: usize = 3 * std::mem::size_of::<isize>() - 1;
 
-/// Returned when trying to convert a &str into a InlineStr
+/// Returned when trying to convert a `&str` into a `InlineStr`
 /// but it fails because it doesn't fit.
 #[derive(Debug)]
 pub struct StringTooLongError;
 
+/// An inline string that can contain almost three words
+/// of utf-8 text.
 #[derive(Debug, Clone, Copy, Eq)]
 pub struct InlineStr {
     inner: [u8; MAX_INLINE_STR_LEN],
@@ -44,10 +46,10 @@ impl<'a> std::cmp::PartialEq<InlineStr> for InlineStr {
     }
 }
 
-// This could be an implementation of TryFrom<&str>
-// when that trait is stabilized.
-impl InlineStr {
-    pub fn try_from_str(s: &str) -> Result<InlineStr, StringTooLongError> {
+impl TryFrom<&str> for InlineStr {
+    type Error = StringTooLongError;
+
+    fn try_from(s: &str) -> Result<InlineStr, StringTooLongError> {
         let len = s.len();
         if len < MAX_INLINE_STR_LEN {
             let mut inner = [0u8; MAX_INLINE_STR_LEN];
@@ -75,10 +77,17 @@ impl fmt::Display for InlineStr {
     }
 }
 
+/// A copy-on-write string that can be owned, borrowed
+/// or inlined.
+///
+/// It is three words long.
 #[derive(Debug, Eq)]
 pub enum CowStr<'a> {
+    /// An owned, immutable string.
     Boxed(Box<str>),
+    /// A borrowed string.
     Borrowed(&'a str),
+    /// A short inline string.
     Inlined(InlineStr),
 }
 
@@ -97,10 +106,10 @@ impl<'a> Hash for CowStr<'a> {
 impl<'a> std::clone::Clone for CowStr<'a> {
     fn clone(&self) -> Self {
         match self {
-            CowStr::Boxed(s) if s.len() < MAX_INLINE_STR_LEN => {
-                CowStr::Inlined(InlineStr::try_from_str(&**s).unwrap())
-            }
-            CowStr::Boxed(s) => CowStr::Boxed(s.clone()),
+            CowStr::Boxed(s) => match InlineStr::try_from(&**s) {
+                Ok(inline) => CowStr::Inlined(inline),
+                Err(..) => CowStr::Boxed(s.clone()),
+            },
             CowStr::Borrowed(s) => CowStr::Borrowed(s),
             CowStr::Inlined(s) => CowStr::Inlined(*s),
         }
@@ -208,7 +217,7 @@ mod test_special_string {
     #[cfg(target_pointer_width = "64")]
     fn inlinestr_fits_twentytwo() {
         let s = "0123456789abcdefghijkl";
-        let stack_str = InlineStr::try_from_str(s).unwrap();
+        let stack_str = InlineStr::try_from(s).unwrap();
         assert_eq!(stack_str.deref(), s);
     }
 
@@ -216,7 +225,7 @@ mod test_special_string {
     #[cfg(target_pointer_width = "64")]
     fn inlinestr_not_fits_twentythree() {
         let s = "0123456789abcdefghijklm";
-        let _stack_str = InlineStr::try_from_str(s).unwrap_err();
+        let _stack_str = InlineStr::try_from(s).unwrap_err();
     }
 
     #[test]
diff --git a/vendor/pulldown-cmark-0.5.3/src/tree.rs b/vendor/pulldown-cmark-0.6.1/src/tree.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/src/tree.rs
rename to vendor/pulldown-cmark-0.6.1/src/tree.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/errors.rs b/vendor/pulldown-cmark-0.6.1/tests/errors.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/errors.rs
rename to vendor/pulldown-cmark-0.6.1/tests/errors.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/html.rs b/vendor/pulldown-cmark-0.6.1/tests/html.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/html.rs
rename to vendor/pulldown-cmark-0.6.1/tests/html.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/lib.rs b/vendor/pulldown-cmark-0.6.1/tests/lib.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/lib.rs
rename to vendor/pulldown-cmark-0.6.1/tests/lib.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/footnotes.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/footnotes.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/footnotes.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/footnotes.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/gfm_strikethrough.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/gfm_strikethrough.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/gfm_strikethrough.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/gfm_strikethrough.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/gfm_table.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/gfm_table.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/gfm_table.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/gfm_table.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/gfm_tasklist.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/gfm_tasklist.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/gfm_tasklist.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/gfm_tasklist.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/mod.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/mod.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/mod.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/mod.rs
diff --git a/vendor/pulldown-cmark-0.6.1/tests/suite/regression.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/regression.rs
new file mode 100644
index 0000000000..3db91862a8
--- /dev/null
+++ b/vendor/pulldown-cmark-0.6.1/tests/suite/regression.rs
@@ -0,0 +1,807 @@
+// This file is auto-generated by the build script
+// Please, do not modify it manually
+
+use super::test_markdown_html;
+
+#[test]
+fn regression_test_1() {
+    let original = r##"<details><summary>Testing 1..2..3..</summary>
+
+This is a test of the details element.
+
+</details>
+"##;
+    let expected = r##"<details><summary>Testing 1..2..3..</summary>
+<p>This is a test of the details element.</p>
+</details>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_2() {
+    let original = r##"see the [many] [articles] [on] [QuickCheck].
+
+[many]: https://medium.com/@jlouis666/quickcheck-advice-c357efb4e7e6
+[articles]: http://www.quviq.com/products/erlang-quickcheck/
+[on]: https://wiki.haskell.org/Introduction_to_QuickCheck1
+[QuickCheck]: https://hackage.haskell.org/package/QuickCheck
+"##;
+    let expected = r##"<p>see the 
+  <a href="https://medium.com/@jlouis666/quickcheck-advice-c357efb4e7e6">many</a> 
+  <a href="http://www.quviq.com/products/erlang-quickcheck/">articles</a> 
+  <a href="https://wiki.haskell.org/Introduction_to_QuickCheck1">on</a> 
+  <a href="https://hackage.haskell.org/package/QuickCheck">QuickCheck</a>.
+</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_3() {
+    let original = r##"[![debug-stub-derive on crates.io][cratesio-image]][cratesio]
+[![debug-stub-derive on docs.rs][docsrs-image]][docsrs]
+
+[cratesio-image]: https://img.shields.io/crates/v/debug_stub_derive.svg
+[cratesio]: https://crates.io/crates/debug_stub_derive
+[docsrs-image]: https://docs.rs/debug_stub_derive/badge.svg?version=0.3.0
+[docsrs]: https://docs.rs/debug_stub_derive/0.3.0/
+"##;
+    let expected = r##"<p><a href="https://crates.io/crates/debug_stub_derive"><img src="https://img.shields.io/crates/v/debug_stub_derive.svg" alt="debug-stub-derive on crates.io" /></a>
+<a href="https://docs.rs/debug_stub_derive/0.3.0/"><img src="https://docs.rs/debug_stub_derive/badge.svg?version=0.3.0" alt="debug-stub-derive on docs.rs" /></a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_4() {
+    let original = r##"|  Title A  |  Title B  |
+| --------- | --------- |
+| Content   | Content   |
+
+|  Title A  |  Title B  |  Title C  |  Title D  |
+| --------- | --------- | --------- | ---------:|
+| Content   | Content   | Conent    | Content   |
+"##;
+    let expected = r##"<table><thead><tr><th>Title A  </th><th>Title B  </th></tr></thead><tbody>
+<tr><td>Content   </td><td>Content   </td></tr>
+</tbody></table>
+<table><thead><tr><th>Title A  </th><th>Title B  </th><th>Title C  </th><th align="right">Title D  </th></tr></thead><tbody>
+<tr><td>Content   </td><td>Content   </td><td>Conent    </td><td align="right">Content   </td></tr>
+</tbody></table>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_5() {
+    let original = r##"foo§__(bar)__
+"##;
+    let expected = r##"<p>foo§<strong>(bar)</strong></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_6() {
+    let original = r##"<https://example.com> hello
+"##;
+    let expected = r##"<p><a href="https://example.com">https://example.com</a> hello</p>
+
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_7() {
+    let original = r##"[foo][bar]
+
+<!-- foo -->
+[bar]: a
+"##;
+    let expected = r##"<p><a href="a">foo</a></p>
+<!-- foo -->
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_8() {
+    let original = r##"<!-- <dl> -->
+- **foo** (u8, u8)
+
+  make something
+
+- **bar** (u16, u16)
+
+  make something
+"##;
+    let expected = r##"<!-- <dl> -->
+<ul>
+<li>
+<p><strong>foo</strong> (u8, u8)</p>
+<p>make something</p>
+</li>
+<li>
+<p><strong>bar</strong> (u16, u16)</p>
+<p>make something</p>
+</li>
+</ul>
+
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_9() {
+    let original = r##"[`
+i8
+`](
+../../../std/primitive.i8.html
+)
+"##;
+    let expected = r##"<p><a href="../../../std/primitive.i8.html"><code>i8</code></a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_10() {
+    let original = r##"[a]
+
+[a]: /url (title\\*)
+"##;
+    let expected = r##"<p><a href="/url" title="title\*">a</a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_11() {
+    let original = r##"[a]
+
+[a]: /url (title\))
+"##;
+    let expected = r##"<p><a href="/url" title="title)">a</a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_12() {
+    let original = r##"[a]
+
+[a]: /url (title))
+"##;
+    let expected = r##"<p>[a]</p>
+<p>[a]: /url (title))</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_13() {
+    let original = r##"a <?php this is not a valid processing tag
+---
+b <?php but this is ?>
+"##;
+    let expected = r##"<h2>a &lt;?php this is not a valid processing tag</h2>
+<p>b <?php but this is ?></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_14() {
+    let original = r##"[a]: u\
+foo
+"##;
+    let expected = r##"<p>foo</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_15() {
+    let original = r##"\`foo`
+"##;
+    let expected = r##"<p>`foo`</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_16() {
+    let original = r##"foo\\
+bar
+"##;
+    let expected = r##"<p>foo\
+bar</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_17() {
+    let original = r##"1\. foo
+
+1\) bar
+"##;
+    let expected = r##"<p>1. foo</p>
+<p>1) bar</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_18() {
+    let original = r##"1...
+
+1.2.3.
+
+1 2 3 .
+
+1.|2.-3.
+
+1)2)3)
+"##;
+    let expected = r##"<p>1...</p>
+<p>1.2.3.</p>
+<p>1 2 3 .</p>
+<p>1.|2.-3.</p>
+<p>1)2)3)</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_19() {
+    let original = r##"[](<<>)
+"##;
+    let expected = r##"<p>[](&lt;&lt;&gt;)</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_20() {
+    let original = r##"\``foo``bar`
+"##;
+    let expected = r##"<p>`<code>foo``bar</code></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_21() {
+    let original = r##"\\`foo`
+"##;
+    let expected = r##"<p>\<code>foo</code></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_22() {
+    let original = r##"[\\]: x
+
+YOLO
+"##;
+    let expected = r##"<p>YOLO</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_23() {
+    let original = r##"lorem ipsum
+A | B
+---|---
+foo | bar
+"##;
+    let expected = r##"<p>lorem ipsum
+A | B
+---|---
+foo | bar</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_24() {
+    let original = r##"foo|bar  
+---|---
+foo|bar
+"##;
+    let expected = r##"<table><thead><tr><th>foo</th><th>bar</th></tr></thead>
+<tbody><tr><td>foo</td><td>bar</td></tr></tbody>
+</table>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_25() {
+    let original = r##"foo|bar\\
+---|---
+foo|bar
+"##;
+    let expected = r##"<table><thead><tr><th>foo</th><th>bar\</th></tr></thead>
+<tbody><tr><td>foo</td><td>bar</td></tr></tbody>
+</table>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_26() {
+    let original = r##"[<foo>](url)
+"##;
+    let expected = r##"<p><a href="url"><foo></a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_27() {
+    let original = r##"[<foo>bar</foo>](url)
+"##;
+    let expected = r##"<p><a href="url"><foo>bar</foo></a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_28() {
+    let original = r##"![<http://example.com>](http://example.com/logo.png)
+"##;
+    let expected = r##"<p><img alt="http://example.com" src="http://example.com/logo.png"></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_29() {
+    let original = r##"[<http://one> <http://two>](url)
+"##;
+    let expected = r##"<p><a href="url"></a><a href="http://one">http://one</a> <a href="http://two">http://two</a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_30() {
+    let original = r##"Markdown | Less | Pretty
+--- | --- | ---
+ 
+some text
+"##;
+    let expected =
+        r##"<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
+</tbody></table>
+<p>some text</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_31() {
+    let original = r##"1. > foo
+2. >
+"##;
+    let expected = r##"<ol>
+<li>
+<blockquote>
+<p>foo</p>
+</blockquote>
+</li>
+<li>
+<blockquote>
+</blockquote>
+</li>
+</ol>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_32() {
+    let original = r##"[
+x
+
+]: f
+"##;
+    let expected = r##"<p>[
+x</p>
+<p>]: f</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_33() {
+    let original = r##"[foo]:
+"##;
+    let expected = r##"<p>[foo]:</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_34() {
+    let original = r##"> foo | bar
+> --- | ---
+yolo | swag
+"##;
+    let expected = r##"<blockquote>
+<table><thead><tr><th>foo</th><th>bar</th></tr></thead></table>
+</blockquote>
+<p>yolo | swag</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_35() {
+    let original = r##"<foo bar>
+"##;
+    let expected = r##"<foo bar>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_36() {
+    let original = r##"<foo bar =
+ "hi"> 
+"##;
+    let expected = r##"<p><foo bar =
+ "hi"> </p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_37() {
+    let original = r##"~~*_**__
+
+__a__
+"##;
+    let expected = r##"<p>~~*_**__</p>
+<p><strong>a</strong></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_38() {
+    let original = r##"> `
+> `
+"##;
+    let expected = r##"<blockquote>
+<p><code></code></p>
+</blockquote>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_39() {
+    let original = r##"`\|`
+"##;
+    let expected = r##"<p><code>\|</code></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_40() {
+    let original = r##"Paragraph 1
+    
+Paragraph 2
+"##;
+    let expected = r##"<p>Paragraph 1</p>
+<p>Paragraph 2</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_41() {
+    let original = r##"\[[link text](https://www.google.com/)\]
+"##;
+    let expected = r##"<p>[<a href="https://www.google.com/">link text</a>]</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_42() {
+    let original = r##"foo | bar
+--- | ---
+[a](< | url>)
+"##;
+    let expected = r##"<table><thead><tr><th>foo</th><th>bar</th></tr></thead><tbody><tr><td>[a](&lt;</td><td>url&gt;)</td></tr></tbody></table>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_43() {
+    let original = r##"[a](url "
+- - -
+")
+"##;
+    let expected = r##"<p>[a](url "</p>
+<hr>
+<p>")</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_44() {
+    let original = r##"[a](url
+
+)
+"##;
+    let expected = r##"<p>[a](url</p>
+<p>)</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_45() {
+    let original = r##"[a](b "
+
+")
+"##;
+    let expected = r##"<p>[a](b &quot;</p>
+<p>&quot;)</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_46() {
+    let original = r##"<http:// >
+"##;
+    let expected = r##"<p>&lt;http:// &gt;</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_47() {
+    let original = r##"<http://>
+"##;
+    let expected = r##"<p>&lt;http://&gt;</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_48() {
+    let original = r##"foo | bar
+--- | ---
+<http://| baz
+"##;
+    let expected = r##"<table>
+<thead>
+<tr><th>foo</th><th>bar</th></tr>
+</thead>
+<tbody>
+<tr><td>&lt;http://</td><td>baz</td></tr>
+</tbody>
+</table>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_49() {
+    let original = r##"foo | bar
+--- | ---
+<http://|>
+"##;
+    let expected = r##"<table>
+<thead>
+<tr><th>foo</th><th>bar</th></tr>
+</thead>
+<tbody>
+<tr><td>&lt;http://</td><td>&gt;</td></tr>
+</tbody>
+</table>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_50() {
+    let original = r##"<sup>\*hi</sup>\_
+"##;
+    let expected = r##"<p><sup>*hi</sup>_</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_51() {
+    let original = r##"email: <john@example.com>\_
+"##;
+    let expected = r##"<p>email: <a href="mailto:john@example.com">john@example.com</a>_</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_52() {
+    let original = r##"> [link](/url 'foo
+> bar')
+"##;
+    let expected = r##"<blockquote>
+<p><a href="/url" title="foo
+bar">link</a></p>
+</blockquote>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_53() {
+    let original = r##"> [foo
+> bar]: /url
+>
+> [foo bar]
+"##;
+    let expected = r##"<blockquote>
+<p><a href="/url">foo bar</a></p>
+</blockquote>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_54() {
+    let original = r##"> [foo   bar]: /url
+>
+> [foo
+> bar]
+"##;
+    let expected = r##"<blockquote>
+<p><a href="/url">foo
+bar</a></p>
+</blockquote>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_55() {
+    let original = r##"> - [a
+> b c]: /foo
+
+[a b c]
+"##;
+    let expected = r##"<blockquote>
+<ul>
+<li></li>
+</ul>
+</blockquote>
+<p><a href="/foo">a b c</a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_56() {
+    let original = r##"[a
+> b]: /foo
+
+[a b] [a > b]
+"##;
+    let expected = r##"<p>[a</p>
+<blockquote>
+<p>b]: /foo</p>
+</blockquote>
+<p>[a b] [a > b]</p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_57() {
+    let original = r##"[`cargo
+package`]
+
+[`cargo package`]: https://example.com
+"##;
+    let expected = r##"<p><a href="https://example.com"><code>cargo package</code></a></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_58() {
+    let original = r##"> [`cargo
+> package`]
+
+[`cargo package`]: https://example.com
+"##;
+    let expected = r##"<blockquote>
+<p><a href="https://example.com"><code>cargo package</code></a></p>
+</blockquote>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_59() {
+    let original = r##"> `cargo
+> package`
+"##;
+    let expected = r##"<blockquote>
+<p><code>cargo package</code></p>
+"##;
+
+    test_markdown_html(original, expected);
+}
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/spec.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/spec.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/spec.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/spec.rs
diff --git a/vendor/pulldown-cmark-0.5.3/tests/suite/table.rs b/vendor/pulldown-cmark-0.6.1/tests/suite/table.rs
similarity index 100%
rename from vendor/pulldown-cmark-0.5.3/tests/suite/table.rs
rename to vendor/pulldown-cmark-0.6.1/tests/suite/table.rs
diff --git a/vendor/pulldown-cmark/.cargo-checksum.json b/vendor/pulldown-cmark/.cargo-checksum.json
index 1ac4ba9fe7..007e041d03 100644
--- a/vendor/pulldown-cmark/.cargo-checksum.json
+++ b/vendor/pulldown-cmark/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CONTRIBUTING.md":"a5bbc113fdcb8101367da47daba32ab10aa2377a825040c78d847d870108d849","Cargo.lock":"0f6ce6ce8e4d2992962bcfcf9e02095e580ea02d2afd4cd4380b476f3f90d88b","Cargo.toml":"74bc708c008630c7dfa2ef8d6e0ff1a014a844088eb4337f7ae51c7e70c5eb95","LICENSE":"c4f10f55904bdb9f27d3fbf94c354926d6cfe8b982276e556238c258941b243b","README.md":"ddd40178b0214e2a6a26189963de686ba417c2ea95f24e32c98e843726137b21","benches/html_rendering.rs":"4248419563483370c1b74858aead08728eb92003dae74c78d66d36cd0db81640","benches/lib.rs":"e7a2ac16b4fd024d4da03221083ed48e00404b6e79ef1f8b449dec9a96776304","build.rs":"7f4e1517188518c54676220e277facb7dce3f944521b29d2da5c3be28950cedb","examples/event-filter.rs":"85ba4695e8e83c9c59b7b675a2fb8eb40ed5e2b56bc05679732f6e2f9589106d","examples/string-to-string.rs":"864aed51aaa8ffd556995fa937ea99b98d78feeb7bf7ae4b2872c749fb02b386","src/entities.rs":"1602f3c4d22c0b0e3a4a08467a50bf9d0c27aadf2e5661b15a2cda20da0895a9","src/escape.rs":"72b3732bd5e15f935cbe68f9296d62f4c1780a27b32f8a7e1663a57983fde068","src/html.rs":"88ea7b0e229c86e2e416e350949ef3c691cb6c9c4c57b8474626993e0c45e174","src/lib.rs":"2c079f858ce189e7a50eb6ab4800e7b7017978124e94b15efc5571bdd5bc353c","src/linklabel.rs":"503710b7c540ea025b22ed2c9378cd0a741d56cb957fdd962515dd3c054fcd30","src/main.rs":"579c37b20a955b4a856fd0250f9e69a34fe1c2d729ab1f247623976e36de5f2f","src/parse.rs":"de297cbaed6b56925c26987cfd2aac1b349cc08e348c50ad00248f04fae32343","src/puncttable.rs":"ddb35138b537c00dd2003daba2d07f1bc8154059a745d4e18b74732614b20f1c","src/scanners.rs":"2f5a89b9c26c2688763286402fcbcd9aff573afdf6d7e276b330c231ad63a742","src/simd.rs":"669d4627dbd3d54262f02ba446afe405a4f68e305ad0903e598f8e79473bdbeb","src/strings.rs":"06a7ee24e93d536238602ce909a8a9d1c854446abaab44368a3630f7f5c5eb00","src/tree.rs":"fb747e6dd975aabd9d07b19ea986fe601985ff77c9beb886f8015b5687fbc4b8","tests/errors.rs":"3677dc76c0ec85b3b65389fe39a82cd7ab9420dd5e2cc5b5b11f490fde2f5fbf","tests/html.rs":"6a2f66f01248e6b1bdd3ec2d5454766ceb617e8e89ab7eb725635c78c77f243f","tests/lib.rs":"879124c4a0c5e253571b4acf13cec3b329ddb0f165c31b4a85e90b0a8aff385b","tests/suite/footnotes.rs":"955ab3bf6446a92ee28152ed952a6169da4b299dbe60ae6fbc6a5145b32f4d7b","tests/suite/gfm_strikethrough.rs":"becabc2f5b0d2dd584908047501c91cc16f62c6533e9a362ed39140670b96ae1","tests/suite/gfm_table.rs":"ab4e2ba5efd774f5c659320ebe43c5f80e5d394d5dfcca04b01b67567565090d","tests/suite/gfm_tasklist.rs":"f20f39ab9bdb4e07708104036a4be39952bebc98779d44a5b7cc2e3f41598575","tests/suite/mod.rs":"c1a6b6ad191830a7ca99b96ff9f8cb4bdb101674679720907902928ada8dc412","tests/suite/regression.rs":"c749c9274d51909c05d0b92afce6767e5806355dc5cf187a690cf815fb991ec0","tests/suite/spec.rs":"1e88bae48c1da50d61533e6078d13f82c0f9c2d5e744113616b211b37d45649d","tests/suite/table.rs":"b4f28d6a1390a302415cb48babd11ec2ec7054b43a671edbd42d6f8c310983de"},"package":"1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e"}
\ No newline at end of file
+{"files":{"CONTRIBUTING.md":"a5bbc113fdcb8101367da47daba32ab10aa2377a825040c78d847d870108d849","Cargo.lock":"050556922878bce2a86295eb4113b6f1e3b31015e533fdc1f3d310d07025d1a3","Cargo.toml":"7a5efd187c4fe48ebe12528fcdf2976460b278a61bc5d6838f216daebcbf850c","LICENSE":"c4f10f55904bdb9f27d3fbf94c354926d6cfe8b982276e556238c258941b243b","README.md":"6d6b35e5a8dddb07802bf5c1a70dbd41b38798f867c8f6d0a6bb247ba0b46e4d","benches/html_rendering.rs":"4248419563483370c1b74858aead08728eb92003dae74c78d66d36cd0db81640","benches/lib.rs":"e7a2ac16b4fd024d4da03221083ed48e00404b6e79ef1f8b449dec9a96776304","build.rs":"7f4e1517188518c54676220e277facb7dce3f944521b29d2da5c3be28950cedb","examples/event-filter.rs":"85ba4695e8e83c9c59b7b675a2fb8eb40ed5e2b56bc05679732f6e2f9589106d","examples/string-to-string.rs":"864aed51aaa8ffd556995fa937ea99b98d78feeb7bf7ae4b2872c749fb02b386","src/entities.rs":"1602f3c4d22c0b0e3a4a08467a50bf9d0c27aadf2e5661b15a2cda20da0895a9","src/escape.rs":"72b3732bd5e15f935cbe68f9296d62f4c1780a27b32f8a7e1663a57983fde068","src/html.rs":"5bee732209dfce3b7c28f1175c072fdadfc8b4f28fb9a951443ee7020332151d","src/lib.rs":"65917a704ab2a43618976b69413819e3e52a7951e5cf9c43cdc280de3bae2904","src/linklabel.rs":"503710b7c540ea025b22ed2c9378cd0a741d56cb957fdd962515dd3c054fcd30","src/main.rs":"579c37b20a955b4a856fd0250f9e69a34fe1c2d729ab1f247623976e36de5f2f","src/parse.rs":"c7db60ff2d35c1e6e6748cc2827c6df4d99c8c67ab7dce6ee0d625511e1f22b5","src/puncttable.rs":"ddb35138b537c00dd2003daba2d07f1bc8154059a745d4e18b74732614b20f1c","src/scanners.rs":"004fd2165a9f3ab4c21a3bc6b7d67485e2069dae297912b47eb60326914ff167","src/simd.rs":"669d4627dbd3d54262f02ba446afe405a4f68e305ad0903e598f8e79473bdbeb","src/strings.rs":"06a7ee24e93d536238602ce909a8a9d1c854446abaab44368a3630f7f5c5eb00","src/tree.rs":"fb747e6dd975aabd9d07b19ea986fe601985ff77c9beb886f8015b5687fbc4b8","tests/errors.rs":"3677dc76c0ec85b3b65389fe39a82cd7ab9420dd5e2cc5b5b11f490fde2f5fbf","tests/html.rs":"6a2f66f01248e6b1bdd3ec2d5454766ceb617e8e89ab7eb725635c78c77f243f","tests/lib.rs":"879124c4a0c5e253571b4acf13cec3b329ddb0f165c31b4a85e90b0a8aff385b","tests/suite/footnotes.rs":"955ab3bf6446a92ee28152ed952a6169da4b299dbe60ae6fbc6a5145b32f4d7b","tests/suite/gfm_strikethrough.rs":"becabc2f5b0d2dd584908047501c91cc16f62c6533e9a362ed39140670b96ae1","tests/suite/gfm_table.rs":"ab4e2ba5efd774f5c659320ebe43c5f80e5d394d5dfcca04b01b67567565090d","tests/suite/gfm_tasklist.rs":"f20f39ab9bdb4e07708104036a4be39952bebc98779d44a5b7cc2e3f41598575","tests/suite/mod.rs":"c1a6b6ad191830a7ca99b96ff9f8cb4bdb101674679720907902928ada8dc412","tests/suite/regression.rs":"864f619c3a3c6c5f53f5186eb0a1642b97de5f5a1b5f1474010871d0072e3dde","tests/suite/spec.rs":"108fc0725694adda5e8886e443a6ff45f3a8ab77db70b94576152241bf1af376","tests/suite/table.rs":"088970da9a9b63a1d197ac6d5d1151e704035b46d0832da1f2ddb1d4ee8a5f3f"},"package":"2c2d7fd131800e0d63df52aff46201acaab70b431a4a1ec6f0343fe8e64f35a4"}
\ No newline at end of file
diff --git a/vendor/pulldown-cmark/Cargo.lock b/vendor/pulldown-cmark/Cargo.lock
index 8af891811e..52d70ebc6c 100644
--- a/vendor/pulldown-cmark/Cargo.lock
+++ b/vendor/pulldown-cmark/Cargo.lock
@@ -2,32 +2,35 @@
 # It is not intended for manual editing.
 [[package]]
 name = "aho-corasick"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "arrayvec"
-version = "0.4.11"
+name = "anyhow"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "atty"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "autocfg"
-version = "0.1.6"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "autocfg"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -37,28 +40,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "bstr"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bumpalo"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "byteorder"
-version = "1.3.2"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cast"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "cfg-if"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -68,7 +79,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -81,86 +92,88 @@ dependencies = [
 
 [[package]]
 name = "criterion"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tinytemplate 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "criterion-plot"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.1.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.6.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "csv"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -168,12 +181,12 @@ name = "csv-core"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "either"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -187,7 +200,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "new_debug_unreachable 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -195,17 +208,23 @@ name = "getopts"
 version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "getrandom"
-version = "0.1.12"
+name = "heck"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -216,24 +235,32 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "itoa"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "js-sys"
+version = "0.3.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -241,7 +268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.62"
+version = "0.2.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -249,7 +276,7 @@ name = "log"
 version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -265,9 +292,9 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -275,15 +302,15 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "memoffset"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -291,30 +318,40 @@ dependencies = [
 
 [[package]]
 name = "new_debug_unreachable"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
-name = "nodrop"
-version = "0.1.13"
+name = "nom"
+version = "4.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "num-traits"
-version = "0.2.8"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "num_cpus"
-version = "1.10.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "oorandom"
+version = "11.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "phf"
 version = "0.7.24"
@@ -349,6 +386,17 @@ dependencies = [
  "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "plotters"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "web-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "precomputed-hash"
 version = "0.1.1"
@@ -356,7 +404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.2"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -364,17 +412,17 @@ dependencies = [
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.6.1"
+version = "0.7.0"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
  "html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -382,7 +430,7 @@ name = "quote"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -390,8 +438,8 @@ name = "rand"
 version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -408,7 +456,7 @@ name = "rand_chacha"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -425,14 +473,6 @@ name = "rand_core"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rand_hc"
 version = "0.1.0"
@@ -454,7 +494,7 @@ name = "rand_jitter"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -466,27 +506,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand_os"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rand_pcg"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -498,34 +529,26 @@ dependencies = [
  "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "rand_xoshiro"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "rayon"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "rayon-core"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -538,13 +561,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.3.1"
+version = "1.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -552,12 +575,12 @@ name = "regex-automata"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.12"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -570,15 +593,15 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "same-file"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -601,27 +624,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.99"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.99"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.40"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -629,16 +652,21 @@ name = "siphasher"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "sourcefile"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "string_cache"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "new_debug_unreachable 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -650,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
  "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -662,10 +690,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "1.0.5"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -685,12 +713,12 @@ name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "thread_local"
-version = "0.3.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -698,24 +726,29 @@ dependencies = [
 
 [[package]]
 name = "tinytemplate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "unicase"
-version = "2.5.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "unicode-width"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -733,20 +766,104 @@ name = "version_check"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "version_check"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "walkdir"
-version = "2.2.9"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "wasi"
-version = "0.7.0"
+name = "wasm-bindgen"
+version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "wasm-bindgen-webidl"
+version = "0.2.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)",
+ "js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)",
+ "sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+ "wasm-bindgen-webidl 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "weedle"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
 
 [[package]]
 name = "winapi"
@@ -764,7 +881,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -776,96 +893,109 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [metadata]
-"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
-"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba"
-"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
-"checksum autocfg 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "b671c8fb71b457dd4ae18c4ba1e59aa81793daacc361d82fcd410cef0d491875"
+"checksum aho-corasick 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)" = "743ad5a418686aad3b87fd14c43badd828cf26e214a00f92a384291cf22e1811"
+"checksum anyhow 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "7825f6833612eb2414095684fcf6c635becf3ce97fe48cf6421321e93bfbd53c"
+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2"
+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
 "checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum bstr 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8d6c2c5b58ab920a4f5aeaaca34b4488074e8cc7596af94e6f8c6ff247c60245"
-"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5"
-"checksum cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "926013f2860c46252efceabb19f4a6b308197505082c609025aa6706c011d427"
-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
+"checksum bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48"
+"checksum bumpalo 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f359dc14ff8911330a51ef78022d376f25ed00248912803b58f00cb1c27f742"
+"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
+"checksum cast 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0"
+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum criterion 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "938703e165481c8d612ea3479ac8342e5615185db37765162e762ec3523e2fc6"
-"checksum criterion-plot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eccdc6ce8bbe352ca89025bee672aa6d24f4eb8c53e3a8b5d1bc58011da072a2"
-"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
-"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9"
-"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b"
-"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6"
-"checksum csv 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37519ccdfd73a75821cac9319d4fce15a81b9fcf75f951df5b9988aa3a0af87d"
+"checksum criterion 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc755679c12bda8e5523a71e4d654b6bf2e14bd838dfc48cde6559a05caf7d1"
+"checksum criterion-plot 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a01e15e0ea58e8234f96146b1f91fa9d0e4dd7a38da93ff7a75d42c0b9d3a545"
+"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca"
+"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac"
+"checksum crossbeam-queue 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c695eeca1e7173472a32221542ae469b3e9aac3a4fc81f7696bcad82029493db"
+"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4"
+"checksum csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279"
 "checksum csv-core 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "9b5cadb6b25c77aeff80ba701712494213f4a8418fcda2ee11b6560c3ad0bf4c"
-"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum futf 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7c9c1ce3fa9336301af935ab852c437817d14cd33690446569392e65170aac3b"
 "checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-"checksum getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772"
 "checksum html5ever 0.24.1 (registry+https://github.com/rust-lang/crates.io-index)" = "025483b0a1e4577bb28578318c886ee5f817dda6eb62473269349044406644cb"
-"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
-"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f"
+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
+"checksum js-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7889c7c36282151f6bf465be4700359318aef36baa951462382eae49e9577cf9"
 "checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba"
+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
 "checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
 "checksum mac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 "checksum markup5ever 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "65381d9d47506b8592b97c4efd936afcf673b09b059f2bef39c7211ee78b9d03"
-"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
-"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
-"checksum new_debug_unreachable 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f40f005c60db6e03bae699e414c58bf9aa7ea02a2d0b9bfbcf19286cc4c82b30"
-"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
-"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223"
+"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9"
+"checksum new_debug_unreachable 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
+"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096"
+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6"
+"checksum oorandom 11.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebcec7c9c2a95cacc7cd0ecb89d8a8454eca13906f6deb55258ffff0adeb9405"
 "checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18"
 "checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e"
 "checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662"
 "checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0"
+"checksum plotters 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "4e3bb8da247d27ae212529352020f3e5ee16e83c0c258061d27b08ab92675eeb"
 "checksum precomputed-hash 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-"checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
+"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
 "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 "checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
 "checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b"
 "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
-"checksum rand_os 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a788ae3edb696cfcba1c19bfd388cc4b8c21f8a408432b199c072825084da58a"
 "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44"
 "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c"
-"checksum rand_xoshiro 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0e18c91676f670f6f0312764c759405f13afb98d5d73819840cf72a518487bff"
-"checksum rayon 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83a27732a533a1be0a0035a111fe76db89ad312f6f0347004c220c57f209a123"
-"checksum rayon-core 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98dcf634205083b17d0861252431eb2acbfb698ab7478a2d20de07954f47ec7b"
+"checksum rayon 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "db6ce3297f9c85e16621bb8cca38a06779ffc31bb8184e1be4bed2be4678a098"
+"checksum rayon-core 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08a89b46efaf957e52b18062fb2f4660f8b8a4dde1807ca002690868ef2c85a9"
 "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-"checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd"
+"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8"
 "checksum regex-automata 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "92b73c2a1770c255c240eaa4ee600df1704a38dc3feaa6e949e7fcd4f8dc09f9"
-"checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716"
+"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997"
-"checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
+"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
-"checksum serde_derive 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)" = "cb4dc18c61206b08dc98216c98faa0232f4337e1e1b8574551d5bad29ea1b425"
-"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704"
+"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449"
+"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64"
+"checksum serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "15913895b61e0be854afd32fd4163fcd2a3df34142cf2cb961b310ce694cbf90"
 "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac"
+"checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
 "checksum string_cache 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "89c058a82f9fd69b1becf8c274f412281038877c553182f1d02eb027045a2d67"
 "checksum string_cache_codegen 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
 "checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
-"checksum syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5"
 "checksum tendril 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "707feda9f2582d5d680d733e38755547a3e8fb471e7ba11452ecfd9ce93a5d3b"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
-"checksum tinytemplate 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4574b75faccaacddb9b284faecdf0b544b80b6b294f3d062d325c5726a209c20"
-"checksum unicase 2.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"
-"checksum unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7007dbd421b92cc6e28410fe7362e2e0a2503394908f417b68ec8d1c364c4e20"
+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"
+"checksum tinytemplate 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "57a3c6667d3e65eb1bc3aed6fd14011c6cbc3a0665218ab7f5daf040b9ec371a"
+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0"
+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479"
 "checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c"
 "checksum utf-8 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
 "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
-"checksum walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9658c94fa8b940eab2250bd5a457f9c48b748420d71293b165c8cdbe2f55f71e"
-"checksum wasi 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b89c3ce4ce14bdc6fb6beaf9ec7928ca331de5df7e5ea278375642a2f478570d"
+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"
+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+"checksum wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "5205e9afdf42282b192e2310a5b463a6d1c1d774e30dc3c791ac37ab42d2616c"
+"checksum wasm-bindgen-backend 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "11cdb95816290b525b32587d76419facd99662a07e59d3cdb560488a819d9a45"
+"checksum wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "574094772ce6921576fb6f2e3f7497b8a76273b6db092be18fc48a082de09dc3"
+"checksum wasm-bindgen-macro-support 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
+"checksum wasm-bindgen-shared 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f5e7e61fc929f4c0dddb748b102ebf9f632e2b8d739f2016542b4de2965a9601"
+"checksum wasm-bindgen-webidl 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "ef012a0d93fc0432df126a8eaf547b2dce25a8ce9212e1d3cbeef5c11157975d"
+"checksum web-sys 0.3.35 (registry+https://github.com/rust-lang/crates.io-index)" = "aaf97caf6aa8c2b1dac90faf0db529d9d63c93846cca4911856f78a83cebf53b"
+"checksum weedle 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3bb43f70885151e629e2a19ce9e50bd730fd436cfd4b666894c9ce4de9141164"
 "checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6"
 "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/vendor/pulldown-cmark/Cargo.toml b/vendor/pulldown-cmark/Cargo.toml
index 86b167222d..5f5713cfc6 100644
--- a/vendor/pulldown-cmark/Cargo.toml
+++ b/vendor/pulldown-cmark/Cargo.toml
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "pulldown-cmark"
-version = "0.6.1"
+version = "0.7.0"
 authors = ["Raph Levien <raph.levien@gmail.com>", "Marcus Klaas de Vries <mail@marcusklaas.nl>"]
 build = "build.rs"
 exclude = ["/third_party/**/*", "/tools/**/*", "/specs/**/*", "/fuzzer/**/*", "/azure-pipelines.yml"]
@@ -40,10 +40,10 @@ version = "0.2"
 optional = true
 
 [dependencies.memchr]
-version = "2.2"
+version = "2.3"
 
 [dependencies.unicase]
-version = "2.5"
+version = "2.6"
 [dev-dependencies.criterion]
 version = "0.3"
 
diff --git a/vendor/pulldown-cmark/README.md b/vendor/pulldown-cmark/README.md
index bdf945b585..9bf09fa2d7 100644
--- a/vendor/pulldown-cmark/README.md
+++ b/vendor/pulldown-cmark/README.md
@@ -126,7 +126,7 @@ By default, the binary is built as well. If you don't want/need it, then build l
 Or put in your `Cargo.toml` file:
 
 ```toml
-pulldown-cmark = { version = "0.6", default-features = false }
+pulldown-cmark = { version = "0.7", default-features = false }
 ```
 
 SIMD accelerated scanners are available for the x64 platform from version 0.5 onwards. To
@@ -139,7 +139,7 @@ enable them, build with simd feature:
 Or add the feature to your project's `Cargo.toml`:
 
 ```toml
-pulldown-cmark = { version = "0.6", default-features = false, features = ["simd"] }
+pulldown-cmark = { version = "0.7", default-features = false, features = ["simd"] }
 ```
 
 ## Authors
diff --git a/vendor/pulldown-cmark/src/html.rs b/vendor/pulldown-cmark/src/html.rs
index 8a3cc5c102..6edf72156f 100644
--- a/vendor/pulldown-cmark/src/html.rs
+++ b/vendor/pulldown-cmark/src/html.rs
@@ -26,7 +26,7 @@ use std::io::{self, ErrorKind, Write};
 
 use crate::escape::{escape_href, escape_html};
 use crate::parse::Event::*;
-use crate::parse::{Alignment, Event, LinkType, Tag};
+use crate::parse::{Alignment, CodeBlockKind, Event, LinkType, Tag};
 use crate::strings::CowStr;
 
 enum TableState {
@@ -254,13 +254,18 @@ where
                 if !self.end_newline {
                     self.write_newline()?;
                 }
-                let lang = info.split(' ').next().unwrap();
-                if lang.is_empty() {
-                    self.write("<pre><code>")
-                } else {
-                    self.write("<pre><code class=\"language-")?;
-                    escape_html(&mut self.writer, lang)?;
-                    self.write("\">")
+                match info {
+                    CodeBlockKind::Fenced(info) => {
+                        let lang = info.split(' ').next().unwrap();
+                        if lang.is_empty() {
+                            self.write("<pre><code>")
+                        } else {
+                            self.write("<pre><code class=\"language-")?;
+                            escape_html(&mut self.writer, lang)?;
+                            self.write("\">")
+                        }
+                    }
+                    CodeBlockKind::Indented => self.write("<pre><code>"),
                 }
             }
             Tag::List(Some(1)) => {
diff --git a/vendor/pulldown-cmark/src/lib.rs b/vendor/pulldown-cmark/src/lib.rs
index 18b8d85dc6..a6f6e8a701 100644
--- a/vendor/pulldown-cmark/src/lib.rs
+++ b/vendor/pulldown-cmark/src/lib.rs
@@ -70,5 +70,7 @@ mod tree;
 #[cfg(all(target_arch = "x86_64", feature = "simd"))]
 mod simd;
 
-pub use crate::parse::{Alignment, Event, LinkType, OffsetIter, Options, Parser, Tag};
+pub use crate::parse::{
+    Alignment, CodeBlockKind, Event, LinkType, OffsetIter, Options, Parser, Tag,
+};
 pub use crate::strings::{CowStr, InlineStr};
diff --git a/vendor/pulldown-cmark/src/parse.rs b/vendor/pulldown-cmark/src/parse.rs
index e4cbca0449..5ec712b770 100644
--- a/vendor/pulldown-cmark/src/parse.rs
+++ b/vendor/pulldown-cmark/src/parse.rs
@@ -38,6 +38,30 @@ use crate::tree::{Tree, TreeIndex, TreePointer};
 // https://spec.commonmark.org/0.29/#link-destination
 const LINK_MAX_NESTED_PARENS: usize = 5;
 
+/// Codeblock kind.
+#[derive(Clone, Debug, PartialEq)]
+pub enum CodeBlockKind<'a> {
+    Indented,
+    /// The value contained in the tag describes the language of the code, which may be empty.
+    Fenced(CowStr<'a>),
+}
+
+impl<'a> CodeBlockKind<'a> {
+    pub fn is_indented(&self) -> bool {
+        match *self {
+            CodeBlockKind::Indented => true,
+            _ => false,
+        }
+    }
+
+    pub fn is_fenced(&self) -> bool {
+        match *self {
+            CodeBlockKind::Fenced(_) => true,
+            _ => false,
+        }
+    }
+}
+
 /// Tags for elements that can contain other elements.
 #[derive(Clone, Debug, PartialEq)]
 pub enum Tag<'a> {
@@ -48,9 +72,8 @@ pub enum Tag<'a> {
     Heading(u32),
 
     BlockQuote,
-    /// A code block. The value contained in the tag describes the language of the code,
-    /// which may be empty.
-    CodeBlock(CowStr<'a>),
+    /// A code block.
+    CodeBlock(CodeBlockKind<'a>),
 
     /// A list. If the list is ordered the field indicates the number of the first item.
     /// Contains only list items.
@@ -757,8 +780,8 @@ impl<'a> FirstPass<'a> {
                 c @ b'*' | c @ b'_' | c @ b'~' => {
                     let string_suffix = &self.text[ix..];
                     let count = 1 + scan_ch_repeat(&string_suffix.as_bytes()[1..], c);
-                    let can_open = delim_run_can_open(&self.text, string_suffix, count, ix);
-                    let can_close = delim_run_can_close(&self.text, string_suffix, count, ix);
+                    let can_open = delim_run_can_open(self.text, string_suffix, count, ix);
+                    let can_close = delim_run_can_close(self.text, string_suffix, count, ix);
                     let is_valid_seq = c != b'~'
                         || count == 2 && self.options.contains(Options::ENABLE_STRIKETHROUGH);
 
@@ -1226,6 +1249,7 @@ impl<'a> FirstPass<'a> {
             return None;
         }
         i += 1;
+        self.finish_list(start);
         self.tree.append(Item {
             start,
             end: 0, // will get set later
@@ -1299,10 +1323,10 @@ impl<'a> FirstPass<'a> {
         let bytes = self.text.as_bytes();
 
         // whitespace between label and url (including up to one newline)
-        let (mut i, _newlines) = self.scan_refdef_space(&bytes, start)?;
+        let (mut i, _newlines) = self.scan_refdef_space(bytes, start)?;
 
         // scan link dest
-        let (dest_length, dest) = scan_link_dest(&self.text, i, 1)?;
+        let (dest_length, dest) = scan_link_dest(self.text, i, 1)?;
         if dest_length == 0 {
             return None;
         }
@@ -1314,7 +1338,7 @@ impl<'a> FirstPass<'a> {
 
         // scan whitespace between dest and label
         let (mut i, newlines) =
-            if let Some((new_i, mut newlines)) = self.scan_refdef_space(&bytes, i) {
+            if let Some((new_i, mut newlines)) = self.scan_refdef_space(bytes, i) {
                 if i == self.text.len() {
                     newlines += 1;
                 }
@@ -1495,7 +1519,7 @@ fn get_html_end_tag(text_bytes: &[u8]) -> Option<&'static str> {
 
     for (beg_tag, end_tag) in BEGIN_TAGS
         .iter()
-        .zip(["</pre>", "</style>", "</script>"].into_iter())
+        .zip(["</pre>", "</style>", "</script>"].iter())
     {
         let tag_len = beg_tag.len();
 
@@ -1520,7 +1544,7 @@ fn get_html_end_tag(text_bytes: &[u8]) -> Option<&'static str> {
         }
     }
 
-    for (beg_tag, end_tag) in ST_BEGIN_TAGS.iter().zip(["-->", "?>", "]]>"].into_iter()) {
+    for (beg_tag, end_tag) in ST_BEGIN_TAGS.iter().zip(["-->", "?>", "]]>"].iter()) {
         if text_bytes.starts_with(beg_tag) {
             return Some(end_tag);
         }
@@ -1915,7 +1939,7 @@ impl<'a> Parser<'a> {
         Parser::new_ext(text, Options::empty())
     }
 
-    /// Creates a new event iteratorfor a markdown string with given options.
+    /// Creates a new event iterator for a markdown string with given options.
     pub fn new_ext(text: &'a str, options: Options) -> Parser<'a> {
         Parser::new_with_broken_link_callback(text, options, None)
     }
@@ -2121,7 +2145,6 @@ impl<'a> Parser<'a> {
                             // ok, so its not an inline link. maybe it is a reference
                             // to a defined link?
                             let scan_result = scan_reference(&self.tree, block_text, next);
-                            let label_node = self.tree[tos.node].next;
                             let node_after_link = match scan_result {
                                 RefScan::LinkLabel(_, next_node) => next_node,
                                 RefScan::Collapsed(next_node) => next_node,
@@ -2132,6 +2155,7 @@ impl<'a> Parser<'a> {
                                 RefScan::Collapsed(..) => LinkType::Collapsed,
                                 RefScan::Failed => LinkType::Shortcut,
                             };
+
                             let label: Option<ReferenceLabel<'a>> = match scan_result {
                                 RefScan::LinkLabel(l, ..) => Some(ReferenceLabel::Link(l)),
                                 RefScan::Collapsed(..) | RefScan::Failed => {
@@ -2191,17 +2215,20 @@ impl<'a> Parser<'a> {
                                     } else {
                                         ItemBody::Link(link_ix)
                                     };
+                                    let label_node = self.tree[tos.node].next;
 
                                     // lets do some tree surgery to add the link to the tree
                                     // 1st: skip the label node and close node
                                     self.tree[tos.node].next = node_after_link;
 
-                                    // then, add the label node as a child to the link node
-                                    self.tree[tos.node].child = label_node;
+                                    // then, if it exists, add the label node as a child to the link node
+                                    if label_node != cur {
+                                        self.tree[tos.node].child = label_node;
 
-                                    // finally: disconnect list of children
-                                    if let TreePointer::Valid(prev_ix) = prev {
-                                        self.tree[prev_ix].next = TreePointer::Nil;
+                                        // finally: disconnect list of children
+                                        if let TreePointer::Valid(prev_ix) = prev {
+                                            self.tree[prev_ix].next = TreePointer::Nil;
+                                        }
                                     }
 
                                     // set up cur so next node will be node_after_link
@@ -2323,10 +2350,9 @@ impl<'a> Parser<'a> {
     fn scan_inline_link(
         &self,
         underlying: &'a str,
-        start_ix: usize,
+        mut ix: usize,
         node: TreePointer,
     ) -> Option<(usize, CowStr<'a>, CowStr<'a>)> {
-        let mut ix = start_ix;
         if scan_ch(&underlying.as_bytes()[ix..], b'(') == 0 {
             return None;
         }
@@ -2675,8 +2701,10 @@ fn item_to_tag<'a>(item: &Item, allocs: &Allocations<'a>) -> Tag<'a> {
             Tag::Image(*link_type, url.clone(), title.clone())
         }
         ItemBody::Heading(level) => Tag::Heading(level),
-        ItemBody::FencedCodeBlock(cow_ix) => Tag::CodeBlock(allocs[cow_ix].clone()),
-        ItemBody::IndentCodeBlock => Tag::CodeBlock("".into()),
+        ItemBody::FencedCodeBlock(cow_ix) => {
+            Tag::CodeBlock(CodeBlockKind::Fenced(allocs[cow_ix].clone()))
+        }
+        ItemBody::IndentCodeBlock => Tag::CodeBlock(CodeBlockKind::Indented),
         ItemBody::BlockQuote => Tag::BlockQuote,
         ItemBody::List(_, c, listitem_start) => {
             if c == b'.' || c == b')' {
@@ -2722,8 +2750,10 @@ fn item_to_event<'a>(item: Item, text: &'a str, allocs: &Allocations<'a>) -> Eve
             Tag::Image(*link_type, url.clone(), title.clone())
         }
         ItemBody::Heading(level) => Tag::Heading(level),
-        ItemBody::FencedCodeBlock(cow_ix) => Tag::CodeBlock(allocs[cow_ix].clone()),
-        ItemBody::IndentCodeBlock => Tag::CodeBlock("".into()),
+        ItemBody::FencedCodeBlock(cow_ix) => {
+            Tag::CodeBlock(CodeBlockKind::Fenced(allocs[cow_ix].clone()))
+        }
+        ItemBody::IndentCodeBlock => Tag::CodeBlock(CodeBlockKind::Indented),
         ItemBody::BlockQuote => Tag::BlockQuote,
         ItemBody::List(_, c, listitem_start) => {
             if c == b'.' || c == b')' {
@@ -3030,4 +3060,35 @@ mod test {
         }
         assert!(link_tag_count > 0);
     }
+
+    #[test]
+    fn code_block_kind_check_fenced() {
+        let parser = Parser::new("hello\n```test\ntadam\n```");
+        let mut found = 0;
+        for (ev, _range) in parser.into_offset_iter() {
+            match ev {
+                Event::Start(Tag::CodeBlock(CodeBlockKind::Fenced(syntax))) => {
+                    assert_eq!(syntax.as_ref(), "test");
+                    found += 1;
+                }
+                _ => {}
+            }
+        }
+        assert_eq!(found, 1);
+    }
+
+    #[test]
+    fn code_block_kind_check_indented() {
+        let parser = Parser::new("hello\n\n    ```test\n    tadam\nhello");
+        let mut found = 0;
+        for (ev, _range) in parser.into_offset_iter() {
+            match ev {
+                Event::Start(Tag::CodeBlock(CodeBlockKind::Indented)) => {
+                    found += 1;
+                }
+                _ => {}
+            }
+        }
+        assert_eq!(found, 1);
+    }
 }
diff --git a/vendor/pulldown-cmark/src/scanners.rs b/vendor/pulldown-cmark/src/scanners.rs
index 87a91d210d..c410500618 100644
--- a/vendor/pulldown-cmark/src/scanners.rs
+++ b/vendor/pulldown-cmark/src/scanners.rs
@@ -993,7 +993,7 @@ pub(crate) fn scan_html_block_inner(
     data: &[u8],
     newline_handler: Option<&dyn Fn(&[u8]) -> usize>,
 ) -> Option<usize> {
-    let close_tag_bytes = scan_ch(&data, b'/');
+    let close_tag_bytes = scan_ch(data, b'/');
     let l = scan_while(&data[close_tag_bytes..], is_ascii_alpha);
     if l == 0 {
         return None;
diff --git a/vendor/pulldown-cmark/tests/suite/regression.rs b/vendor/pulldown-cmark/tests/suite/regression.rs
index 3db91862a8..1ab15a5fd8 100644
--- a/vendor/pulldown-cmark/tests/suite/regression.rs
+++ b/vendor/pulldown-cmark/tests/suite/regression.rs
@@ -405,8 +405,7 @@ fn regression_test_30() {
  
 some text
 "##;
-    let expected =
-        r##"<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
+    let expected = r##"<table><thead><tr><th>Markdown </th><th> Less </th><th> Pretty</th></tr></thead><tbody>
 </tbody></table>
 <p>some text</p>
 "##;
@@ -805,3 +804,46 @@ fn regression_test_59() {
 
     test_markdown_html(original, expected);
 }
+
+#[test]
+fn regression_test_60() {
+    let original = r##"Lorem ipsum.[^a]
+
+An unordered list before the footnotes:
+* Ipsum
+* Lorem
+
+[^a]: Cool.
+"##;
+    let expected = r##"<p>Lorem ipsum.<sup class="footnote-reference"><a href="#a">1</a></sup></p>
+<p>An unordered list before the footnotes:</p>
+<ul>
+    <li>Ipsum</li>
+    <li>Lorem</li>
+</ul>
+<div class="footnote-definition" id="a"><sup class="footnote-definition-label">1</sup>
+    <p>Cool.</p>
+</div>
+"##;
+
+    test_markdown_html(original, expected);
+}
+
+#[test]
+fn regression_test_61() {
+    let original = r##"[][a]
+
+[a]: b
+
+# assimp-rs [![][crates-badge]][crates]
+
+[crates]: https://crates.io/crates/assimp
+[crates-badge]: http://meritbadge.herokuapp.com/assimp
+"##;
+    let expected = r##"<p><a href="b"></a></p>
+
+<h1>assimp-rs <a href="https://crates.io/crates/assimp"><img alt="" src="http://meritbadge.herokuapp.com/assimp"></a></h1>
+"##;
+
+    test_markdown_html(original, expected);
+}
diff --git a/vendor/pulldown-cmark/tests/suite/spec.rs b/vendor/pulldown-cmark/tests/suite/spec.rs
index 89f12cf914..3d55062c52 100644
--- a/vendor/pulldown-cmark/tests/suite/spec.rs
+++ b/vendor/pulldown-cmark/tests/suite/spec.rs
@@ -6889,8 +6889,7 @@ fn spec_test_511() {
 fn spec_test_512() {
     let original = r##"[link *foo **bar** `#`*](/uri)
 "##;
-    let expected =
-        r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+    let expected = r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
 "##;
 
     test_markdown_html(original, expected);
@@ -7038,8 +7037,7 @@ fn spec_test_526() {
 
 [ref]: /uri
 "##;
-    let expected =
-        r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
+    let expected = r##"<p><a href="/uri">link <em>foo <strong>bar</strong> <code>#</code></em></a></p>
 "##;
 
     test_markdown_html(original, expected);
@@ -7923,8 +7921,7 @@ fn spec_test_600() {
 fn spec_test_601() {
     let original = r##"<foo+special@Bar.baz-bar0.com>
 "##;
-    let expected =
-        r##"<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
+    let expected = r##"<p><a href="mailto:foo+special@Bar.baz-bar0.com">foo+special@Bar.baz-bar0.com</a></p>
 "##;
 
     test_markdown_html(original, expected);
diff --git a/vendor/pulldown-cmark/tests/suite/table.rs b/vendor/pulldown-cmark/tests/suite/table.rs
index edfa4e9fd3..4da4df6a8d 100644
--- a/vendor/pulldown-cmark/tests/suite/table.rs
+++ b/vendor/pulldown-cmark/tests/suite/table.rs
@@ -140,8 +140,7 @@ fn table_test_8() {
 
 #[test]
 fn table_test_9() {
-    let original =
-        r##"|  Target                       | std |rustc|cargo| notes                      |
+    let original = r##"|  Target                       | std |rustc|cargo| notes                      |
 |-------------------------------|-----|-----|-----|----------------------------|
 | `x86_64-unknown-linux-musl`   |  ✓  |     |     | 64-bit Linux with MUSL     |
 | `arm-linux-androideabi`       |  ✓  |     |     | ARM Android                |
diff --git a/vendor/tar/.cargo-checksum.json b/vendor/tar/.cargo-checksum.json
index 90ebbc9839..368708f460 100644
--- a/vendor/tar/.cargo-checksum.json
+++ b/vendor/tar/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"2104f2b8501d861ee4c5f1c7df609dbfbb182c0c3006c1272c24e4224c5a8ed1","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"e16ec1c38809cfef4b67a4a8b521d2c679832379eddedba5212444dbb3d1f436","appveyor.yml":"2b698d8ab9a0b4b3781eb592d5d688f8b79c7e8044c9ccb3f3c5b5593fe1fb3b","examples/extract_file.rs":"dc487f6631d824175afc3ee33de99e80718a8ca3f9e57fddd7cac0a46c07d3ae","examples/list.rs":"36e412205eaffea8ab7f39be4173594b74e36acb369e091362b1975ee4a7a14b","examples/raw_list.rs":"0a735576ac354457d6d5a4d395d044fae99bf67a7c69960ca784a6f6a1743651","examples/write.rs":"419ac3e4155035e32b52cd8e6ae987a2d99cf82f60abbfb315c2a2c4f8e8fd19","src/archive.rs":"950e9ec8ea384960a588a04700bde3cf3c9012cc95353a335c546f24584af19c","src/builder.rs":"d06a9b84cabbf416a6e16adf85b1cda5746147cefe2393d56882bb7cb8b125ad","src/entry.rs":"099ddd432a57f43183aec20afdc1289a1b0a57f36b39ff1fa279327d0a1b7cce","src/entry_type.rs":"0786688729a96b4a3135b28d40b95c3d4feaad66b9574c490cbea14814ab975f","src/error.rs":"64652621ecf5c605e8905c5dd004cacd9facfa1222b2ea215907d1d0b0ddbcc2","src/header.rs":"c4133eee35ad1c03ba8199138460870005517c2c2060b02cfa426e5cf2bcc1e1","src/lib.rs":"363287c4b12262fab344ead58de40da38abbe53e68f18813aa067af3e7627cc2","src/pax.rs":"a2ba8cdd4dd18963e115940548928af1a2ccf5c610d1168b649b5d555d87b328","tests/all.rs":"c12316d125b7ff13118371af6e5f1a2e2a7ee84386209648a08240769be3609e","tests/archives/directory.tar":"ada2bda5ee257056ef9fbe6338f66f7188c9f32614991d73f83005b7972802f3","tests/archives/duplicate_dirs.tar":"7732db3e60c56e4bdf027021347b301452bcce66e83f2cfb4d4aa44e1b219a28","tests/archives/empty_filename.tar":"c58a599a8d6342841a7bff96f49e94fd779b96ab5d4f93795577b504afe1060a","tests/archives/file_times.tar":"35e1d58c149dafe0ec57793eedd14f4c3e7d36768d4068650a6cde63de014ba9","tests/archives/link.tar":"06ce2045e1d97d617821e7257721d446c876065a665a38bea6d5e9ce31a52f59","tests/archives/pax.tar":"ae37540f6940aad3707491ce2f37d0998cbee480919b1e6566794748cae9a097","tests/archives/pax2.tar":"08449d2fb749a303d8ec2e0e64aac882b1e6be756d2a0d33df839b55fb415423","tests/archives/reading_files.tar":"543b51829fbd4c5df77f873c63380c960c6dbea244999030cf7672b0b3a456a2","tests/archives/simple.tar":"1c3b1e2a39e83b85a8ee5c920aa3ed809cee2eeaa40b0ed79f10dfea91826daf","tests/archives/simple_missing_last_header.tar":"84fd3abb8bde47caed14ecb1e32b1fbf9a2eab1341b70db8085d2375f0f88cd6","tests/archives/spaces.tar":"4f7d19a9fe2785e97a128d27263dee9d9df2fd8866dcece9fb44dcf20c2c0b24","tests/archives/sparse.tar":"64db241afcbfd9ced33a9482c577774f47c74cbd835207478ec235946c3c639d","tests/archives/xattrs.tar":"6df389a5be73fe184c0427d74a1689cce6af0d3488b270acdf3224e3b3f4acbb","tests/entry.rs":"f3bfbad2db9d4f8c63068f30e07930a26328b024bf01a6b1c2bf32d81f0d2e6b","tests/header/mod.rs":"8a8b396acb7db823f2b28da6199c18f5505f9a8e598acb705131e1a5f4835feb"},"package":"a303ba60a099fcd2aaa646b14d2724591a96a75283e4b7ed3d1a1658909d9ae2"}
\ No newline at end of file
+{"files":{"Cargo.toml":"1985949b4ed78ff2562add747f7c3f0b58ba3f22cb7b802544f80f198c6e312d","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f0f9d2dddff29bf032ab6aba6df8f526b2101c5e2b5befac9d40e5cbe10f19f2","appveyor.yml":"2b698d8ab9a0b4b3781eb592d5d688f8b79c7e8044c9ccb3f3c5b5593fe1fb3b","examples/extract_file.rs":"dc487f6631d824175afc3ee33de99e80718a8ca3f9e57fddd7cac0a46c07d3ae","examples/list.rs":"36e412205eaffea8ab7f39be4173594b74e36acb369e091362b1975ee4a7a14b","examples/raw_list.rs":"0a735576ac354457d6d5a4d395d044fae99bf67a7c69960ca784a6f6a1743651","examples/write.rs":"419ac3e4155035e32b52cd8e6ae987a2d99cf82f60abbfb315c2a2c4f8e8fd19","src/archive.rs":"d5b06aca74b1baac65fde02bee038e260b99e789521837c87170968058ac55cb","src/builder.rs":"71eca905421d05f49edcfbd5d956d87ae9ac2482f04b21d0fc5db0672e3572de","src/entry.rs":"1a2805ef9d37e3f76dbba21335cbef2aeb845ff45b46312fa0a119308f6e6149","src/entry_type.rs":"0786688729a96b4a3135b28d40b95c3d4feaad66b9574c490cbea14814ab975f","src/error.rs":"07d9cf09ac9d1869be0b951200f00852517dfdf8928c890eff63d83fcc3df227","src/header.rs":"a502155f0b3a3bfed9bc0b2c6bf101173f10848e4f8f6e1b0de73ab485d2377e","src/lib.rs":"5468e413205c907c367c35d28a528389103d68fd6a5b5979bbedba7c9e6b6c99","src/pax.rs":"c112be735d2e3ff17ad56d29abd84dc3b65dc235d077f281e9101da84b377919","tests/all.rs":"d2776ef42fbb046397a870ae7e1a1e7d01af646735f78508716470ee35c87f17","tests/entry.rs":"791331ae01bb605af721c16085fb234ea04365ae0843b3756624231813cef4e7","tests/header/mod.rs":"8a8b396acb7db823f2b28da6199c18f5505f9a8e598acb705131e1a5f4835feb"},"package":"b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3"}
\ No newline at end of file
diff --git a/vendor/tar/Cargo.toml b/vendor/tar/Cargo.toml
index 18568f8fe3..6fbe0b6c46 100644
--- a/vendor/tar/Cargo.toml
+++ b/vendor/tar/Cargo.toml
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -11,9 +11,11 @@
 # will likely look very different (and much more reasonable)
 
 [package]
+edition = "2018"
 name = "tar"
-version = "0.4.20"
+version = "0.4.26"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
+exclude = ["tests/archives/*"]
 description = "A Rust implementation of a TAR file reader and writer. This library does not\ncurrently handle compression, but it is abstract over all I/O readers and\nwriters. Additionally, great lengths are taken to ensure that the entire\ncontents are never required to be entirely resident in memory all at once.\n"
 homepage = "https://github.com/alexcrichton/tar-rs"
 documentation = "https://docs.rs/tar"
@@ -22,7 +24,7 @@ keywords = ["tar", "tarfile", "encoding"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/alexcrichton/tar-rs"
 [dependencies.filetime]
-version = "0.2"
+version = "0.2.6"
 [dev-dependencies.tempdir]
 version = "0.3"
 
diff --git a/vendor/tar/README.md b/vendor/tar/README.md
index 28b5d94cf9..77963e2885 100644
--- a/vendor/tar/README.md
+++ b/vendor/tar/README.md
@@ -1,6 +1,6 @@
 # tar-rs
 
-[![Build Status](https://travis-ci.org/alexcrichton/tar-rs.svg?branch=master)](https://travis-ci.org/alexcrichton/tar-rs)
+[![Build Status](https://travis-ci.com/alexcrichton/tar-rs.svg?branch=master)](https://travis-ci.com/alexcrichton/tar-rs)
 [![Build status](https://ci.appveyor.com/api/projects/status/0udgokm2fc6ljorj?svg=true)](https://ci.appveyor.com/project/alexcrichton/tar-rs)
 [![Coverage Status](https://coveralls.io/repos/alexcrichton/tar-rs/badge.svg?branch=master&service=github)](https://coveralls.io/github/alexcrichton/tar-rs?branch=master)
 
@@ -76,5 +76,5 @@ at your option.
 ### Contribution
 
 Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in Serde by you, as defined in the Apache-2.0 license, shall be
-dual licensed as above, without any additional terms or conditions.
+for inclusion in this project by you, as defined in the Apache-2.0 license,
+shall be dual licensed as above, without any additional terms or conditions.
diff --git a/vendor/tar/src/archive.rs b/vendor/tar/src/archive.rs
index a9220cb3fd..433c6de329 100644
--- a/vendor/tar/src/archive.rs
+++ b/vendor/tar/src/archive.rs
@@ -5,10 +5,10 @@ use std::io::prelude::*;
 use std::marker;
 use std::path::Path;
 
-use entry::{EntryFields, EntryIo};
-use error::TarError;
-use other;
-use {Entry, GnuExtSparseHeader, GnuSparseHeader, Header};
+use crate::entry::{EntryFields, EntryIo};
+use crate::error::TarError;
+use crate::other;
+use crate::{Entry, GnuExtSparseHeader, GnuSparseHeader, Header};
 
 /// A top-level representation of an archive file.
 ///
@@ -233,7 +233,8 @@ impl<'a> EntriesFields<'a> {
         let sum = header.as_bytes()[..148]
             .iter()
             .chain(&header.as_bytes()[156..])
-            .fold(0, |a, b| a + (*b as u32)) + 8 * 32;
+            .fold(0, |a, b| a + (*b as u32))
+            + 8 * 32;
         let cksum = header.cksum()?;
         if sum != cksum {
             return Err(other("archive header checksum mismatch"));
@@ -281,7 +282,7 @@ impl<'a> EntriesFields<'a> {
                     return Err(other(
                         "members found describing a future member \
                          but no future member found",
-                    ))
+                    ));
                 }
                 None => return Ok(None),
             };
diff --git a/vendor/tar/src/builder.rs b/vendor/tar/src/builder.rs
index 5b5c615f8a..de24f593b8 100644
--- a/vendor/tar/src/builder.rs
+++ b/vendor/tar/src/builder.rs
@@ -4,8 +4,8 @@ use std::io;
 use std::io::prelude::*;
 use std::path::Path;
 
-use header::{bytes2path, path2bytes, HeaderMode};
-use {other, EntryType, Header};
+use crate::header::{bytes2path, path2bytes, HeaderMode};
+use crate::{other, EntryType, Header};
 
 /// A structure for building archives
 ///
@@ -31,10 +31,6 @@ impl<W: Write> Builder<W> {
         }
     }
 
-    fn inner(&mut self) -> &mut W {
-        self.obj.as_mut().unwrap()
-    }
-
     /// Changes the HeaderMode that will be used when reading fs Metadata for
     /// methods that implicitly read metadata for an input Path. Notably, this
     /// does _not_ apply to `append(Header)`.
@@ -48,6 +44,21 @@ impl<W: Write> Builder<W> {
         self.follow = follow;
     }
 
+    /// Gets shared reference to the underlying object.
+    pub fn get_ref(&self) -> &W {
+        self.obj.as_ref().unwrap()
+    }
+
+    /// Gets mutable reference to the underlying object.
+    ///
+    /// Note that care must be taken while writing to the underlying
+    /// object. But, e.g. `get_mut().flush()` is clamed to be safe and
+    /// useful in the situations when one needs to be ensured that
+    /// tar entry was flushed to the disk.
+    pub fn get_mut(&mut self) -> &mut W {
+        self.obj.as_mut().unwrap()
+    }
+
     /// Unwrap this archive, returning the underlying object.
     ///
     /// This function will finish writing the archive if the `finish` function
@@ -97,7 +108,7 @@ impl<W: Write> Builder<W> {
     /// let data = ar.into_inner().unwrap();
     /// ```
     pub fn append<R: Read>(&mut self, header: &Header, mut data: R) -> io::Result<()> {
-        append(self.inner(), header, &mut data)
+        append(self.get_mut(), header, &mut data)
     }
 
     /// Adds a new entry to this archive with the specified path.
@@ -146,7 +157,7 @@ impl<W: Write> Builder<W> {
         path: P,
         data: R,
     ) -> io::Result<()> {
-        prepare_header(self.inner(), header, path.as_ref())?;
+        prepare_header_path(self.get_mut(), header, path.as_ref())?;
         header.set_cksum();
         self.append(&header, data)
     }
@@ -178,7 +189,49 @@ impl<W: Write> Builder<W> {
     pub fn append_path<P: AsRef<Path>>(&mut self, path: P) -> io::Result<()> {
         let mode = self.mode.clone();
         let follow = self.follow;
-        append_path(self.inner(), path.as_ref(), mode, follow)
+        append_path_with_name(self.get_mut(), path.as_ref(), None, mode, follow)
+    }
+
+    /// Adds a file on the local filesystem to this archive under another name.
+    ///
+    /// This function will open the file specified by `path` and insert the file
+    /// into the archive as `name` with appropriate metadata set, returning any
+    /// I/O error which occurs while writing. The path name for the file inside
+    /// of this archive will be `name` and `path` is required to be a relative
+    /// path.
+    ///
+    /// Note that this will not attempt to seek the archive to a valid position,
+    /// so if the archive is in the middle of a read or some other similar
+    /// operation then this may corrupt the archive.
+    ///
+    /// Also note that after all files have been written to an archive the
+    /// `finish` function needs to be called to finish writing the archive.
+    ///
+    /// # Examples
+    ///
+    /// ```no_run
+    /// use tar::Builder;
+    ///
+    /// let mut ar = Builder::new(Vec::new());
+    ///
+    /// // Insert the local file "foo/bar.txt" in the archive but with the name
+    /// // "bar/foo.txt".
+    /// ar.append_path_with_name("foo/bar.txt", "bar/foo.txt").unwrap();
+    /// ```
+    pub fn append_path_with_name<P: AsRef<Path>, N: AsRef<Path>>(
+        &mut self,
+        path: P,
+        name: N,
+    ) -> io::Result<()> {
+        let mode = self.mode.clone();
+        let follow = self.follow;
+        append_path_with_name(
+            self.get_mut(),
+            path.as_ref(),
+            Some(name.as_ref()),
+            mode,
+            follow,
+        )
     }
 
     /// Adds a file to this archive with the given path as the name of the file
@@ -209,7 +262,7 @@ impl<W: Write> Builder<W> {
     /// ```
     pub fn append_file<P: AsRef<Path>>(&mut self, path: P, file: &mut fs::File) -> io::Result<()> {
         let mode = self.mode.clone();
-        append_file(self.inner(), path.as_ref(), file, mode)
+        append_file(self.get_mut(), path.as_ref(), file, mode)
     }
 
     /// Adds a directory to this archive with the given path as the name of the
@@ -243,7 +296,7 @@ impl<W: Write> Builder<W> {
         Q: AsRef<Path>,
     {
         let mode = self.mode.clone();
-        append_dir(self.inner(), path.as_ref(), src_path.as_ref(), mode)
+        append_dir(self.get_mut(), path.as_ref(), src_path.as_ref(), mode)
     }
 
     /// Adds a directory and all of its contents (recursively) to this archive
@@ -275,7 +328,13 @@ impl<W: Write> Builder<W> {
     {
         let mode = self.mode.clone();
         let follow = self.follow;
-        append_dir_all(self.inner(), path.as_ref(), src_path.as_ref(), mode, follow)
+        append_dir_all(
+            self.get_mut(),
+            path.as_ref(),
+            src_path.as_ref(),
+            mode,
+            follow,
+        )
     }
 
     /// Finish writing this archive, emitting the termination sections.
@@ -290,7 +349,7 @@ impl<W: Write> Builder<W> {
             return Ok(());
         }
         self.finished = true;
-        self.inner().write_all(&[0; 1024])
+        self.get_mut().write_all(&[0; 1024])
     }
 }
 
@@ -308,7 +367,13 @@ fn append(mut dst: &mut Write, header: &Header, mut data: &mut Read) -> io::Resu
     Ok(())
 }
 
-fn append_path(dst: &mut Write, path: &Path, mode: HeaderMode, follow: bool) -> io::Result<()> {
+fn append_path_with_name(
+    dst: &mut Write,
+    path: &Path,
+    name: Option<&Path>,
+    mode: HeaderMode,
+    follow: bool,
+) -> io::Result<()> {
     let stat = if follow {
         fs::metadata(path).map_err(|err| {
             io::Error::new(
@@ -324,13 +389,21 @@ fn append_path(dst: &mut Write, path: &Path, mode: HeaderMode, follow: bool) ->
             )
         })?
     };
+    let ar_name = name.unwrap_or(path);
     if stat.is_file() {
-        append_fs(dst, path, &stat, &mut fs::File::open(path)?, mode, None)
+        append_fs(dst, ar_name, &stat, &mut fs::File::open(path)?, mode, None)
     } else if stat.is_dir() {
-        append_fs(dst, path, &stat, &mut io::empty(), mode, None)
+        append_fs(dst, ar_name, &stat, &mut io::empty(), mode, None)
     } else if stat.file_type().is_symlink() {
         let link_name = fs::read_link(path)?;
-        append_fs(dst, path, &stat, &mut io::empty(), mode, Some(&link_name))
+        append_fs(
+            dst,
+            ar_name,
+            &stat,
+            &mut io::empty(),
+            mode,
+            Some(&link_name),
+        )
     } else {
         Err(other(&format!("{} has unknown file type", path.display())))
     }
@@ -351,26 +424,37 @@ fn append_dir(dst: &mut Write, path: &Path, src_path: &Path, mode: HeaderMode) -
     append_fs(dst, path, &stat, &mut io::empty(), mode, None)
 }
 
-fn prepare_header(dst: &mut Write, header: &mut Header, path: &Path) -> io::Result<()> {
+fn prepare_header(size: u64, entry_type: u8) -> Header {
+    let mut header = Header::new_gnu();
+    let name = b"././@LongLink";
+    header.as_gnu_mut().unwrap().name[..name.len()].clone_from_slice(&name[..]);
+    header.set_mode(0o644);
+    header.set_uid(0);
+    header.set_gid(0);
+    header.set_mtime(0);
+    // + 1 to be compliant with GNU tar
+    header.set_size(size + 1);
+    header.set_entry_type(EntryType::new(entry_type));
+    header.set_cksum();
+    header
+}
+
+fn prepare_header_path(dst: &mut Write, header: &mut Header, path: &Path) -> io::Result<()> {
     // Try to encode the path directly in the header, but if it ends up not
-    // working (e.g. it's too long) then use the GNU-specific long name
-    // extension by emitting an entry which indicates that it's the filename
+    // working (probably because it's too long) then try to use the GNU-specific
+    // long name extension by emitting an entry which indicates that it's the
+    // filename.
     if let Err(e) = header.set_path(path) {
         let data = path2bytes(&path)?;
         let max = header.as_old().name.len();
+        //  Since e isn't specific enough to let us know the path is indeed too
+        //  long, verify it first before using the extension.
         if data.len() < max {
             return Err(e);
         }
-        let mut header2 = Header::new_gnu();
-        header2.as_gnu_mut().unwrap().name[..13].clone_from_slice(b"././@LongLink");
-        header2.set_mode(0o644);
-        header2.set_uid(0);
-        header2.set_gid(0);
-        header2.set_mtime(0);
-        header2.set_size((data.len() + 1) as u64);
-        header2.set_entry_type(EntryType::new(b'L'));
-        header2.set_cksum();
-        let mut data2 = data.chain(io::repeat(0).take(0));
+        let header2 = prepare_header(data.len() as u64, b'L');
+        // null-terminated string
+        let mut data2 = data.chain(io::repeat(0).take(1));
         append(dst, &header2, &mut data2)?;
         // Truncate the path to store in the header we're about to emit to
         // ensure we've got something at least mentioned.
@@ -380,6 +464,20 @@ fn prepare_header(dst: &mut Write, header: &mut Header, path: &Path) -> io::Resu
     Ok(())
 }
 
+fn prepare_header_link(dst: &mut Write, header: &mut Header, link_name: &Path) -> io::Result<()> {
+    // Same as previous function but for linkname
+    if let Err(e) = header.set_link_name(&link_name) {
+        let data = path2bytes(&link_name)?;
+        if data.len() < header.as_old().linkname.len() {
+            return Err(e);
+        }
+        let header2 = prepare_header(data.len() as u64, b'K');
+        let mut data2 = data.chain(io::repeat(0).take(1));
+        append(dst, &header2, &mut data2)?;
+    }
+    Ok(())
+}
+
 fn append_fs(
     dst: &mut Write,
     path: &Path,
@@ -390,10 +488,10 @@ fn append_fs(
 ) -> io::Result<()> {
     let mut header = Header::new_gnu();
 
-    prepare_header(dst, &mut header, path)?;
+    prepare_header_path(dst, &mut header, path)?;
     header.set_metadata_in_mode(meta, mode);
     if let Some(link_name) = link_name {
-        header.set_link_name(link_name)?;
+        prepare_header_link(dst, &mut header, link_name)?;
     }
     header.set_cksum();
     append(dst, &header, read)
@@ -409,7 +507,8 @@ fn append_dir_all(
     let mut stack = vec![(src_path.to_path_buf(), true, false)];
     while let Some((src, is_dir, is_symlink)) = stack.pop() {
         let dest = path.join(src.strip_prefix(&src_path).unwrap());
-        if is_dir {
+        // In case of a symlink pointing to a directory, is_dir is false, but src.is_dir() will return true
+        if is_dir || (is_symlink && follow && src.is_dir()) {
             for entry in fs::read_dir(&src)? {
                 let entry = entry?;
                 let file_type = entry.file_type()?;
diff --git a/vendor/tar/src/entry.rs b/vendor/tar/src/entry.rs
index fdddf6fde8..52b5a3df87 100644
--- a/vendor/tar/src/entry.rs
+++ b/vendor/tar/src/entry.rs
@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 use std::cmp;
 use std::fs;
+use std::fs::OpenOptions;
 use std::io::prelude::*;
 use std::io::{self, Error, ErrorKind, SeekFrom};
 use std::marker;
@@ -8,12 +9,12 @@ use std::path::{Component, Path, PathBuf};
 
 use filetime::{self, FileTime};
 
-use archive::ArchiveInner;
-use error::TarError;
-use header::bytes2path;
-use other;
-use pax::pax_extensions;
-use {Archive, Header, PaxExtensions};
+use crate::archive::ArchiveInner;
+use crate::error::TarError;
+use crate::header::bytes2path;
+use crate::other;
+use crate::pax::pax_extensions;
+use crate::{Archive, Header, PaxExtensions};
 
 /// A read-only view into an entry of an archive.
 ///
@@ -46,6 +47,18 @@ pub enum EntryIo<'a> {
     Data(io::Take<&'a ArchiveInner<Read + 'a>>),
 }
 
+/// When unpacking items the unpacked thing is returned to allow custom
+/// additional handling by users. Today the File is returned, in future
+/// the enum may be extended with kinds for links, directories etc.
+#[derive(Debug)]
+pub enum Unpacked {
+    /// A file was unpacked.
+    File(std::fs::File),
+    /// A directory, hardlink, symlink, or other node was unpacked.
+    #[doc(hidden)]
+    __Nonexhaustive,
+}
+
 impl<'a, R: Read> Entry<'a, R> {
     /// Returns the path name for this entry.
     ///
@@ -177,7 +190,7 @@ impl<'a, R: Read> Entry<'a, R> {
     ///     file.unpack(format!("file-{}", i)).unwrap();
     /// }
     /// ```
-    pub fn unpack<P: AsRef<Path>>(&mut self, dst: P) -> io::Result<()> {
+    pub fn unpack<P: AsRef<Path>>(&mut self, dst: P) -> io::Result<Unpacked> {
         self.fields.unpack(None, dst.as_ref())
     }
 
@@ -397,24 +410,30 @@ impl<'a> EntryFields<'a> {
     /// Unpack as destination directory `dst`.
     fn unpack_dir(&mut self, dst: &Path) -> io::Result<()> {
         // If the directory already exists just let it slide
-        let prev = fs::metadata(dst);
-        if prev.map(|m| m.is_dir()).unwrap_or(false) {
-            return Ok(());
-        }
-        return fs::create_dir(dst).map_err(|err| {
-            Error::new(
+        fs::create_dir(dst).or_else(|err| {
+            if err.kind() == ErrorKind::AlreadyExists {
+                let prev = fs::metadata(dst);
+                if prev.map(|m| m.is_dir()).unwrap_or(false) {
+                    return Ok(());
+                }
+            }
+            Err(Error::new(
                 err.kind(),
                 format!("{} when creating dir {}", err, dst.display()),
-            )
-        });
+            ))
+        })
     }
 
     /// Returns access to the header of this entry in the archive.
-    fn unpack(&mut self, target_base: Option<&Path>, dst: &Path) -> io::Result<()> {
+    fn unpack(&mut self, target_base: Option<&Path>, dst: &Path) -> io::Result<Unpacked> {
         let kind = self.header.entry_type();
 
         if kind.is_dir() {
-            return self.unpack_dir(dst);
+            self.unpack_dir(dst)?;
+            if let Ok(mode) = self.header.mode() {
+                set_perms(dst, None, mode, self.preserve_permissions)?;
+            }
+            return Ok(Unpacked::__Nonexhaustive);
         } else if kind.is_hard_link() || kind.is_symlink() {
             let src = match self.link_name()? {
                 Some(name) => name,
@@ -422,7 +441,7 @@ impl<'a> EntryFields<'a> {
                     return Err(other(&format!(
                         "hard link listed for {} but no link name found",
                         String::from_utf8_lossy(self.header.as_bytes())
-                    )))
+                    )));
                 }
             };
 
@@ -433,7 +452,7 @@ impl<'a> EntryFields<'a> {
                 )));
             }
 
-            return if kind.is_hard_link() {
+            if kind.is_hard_link() {
                 let link_src = match target_base {
                     // If we're unpacking within a directory then ensure that
                     // the destination of this hard link is both present and
@@ -463,7 +482,7 @@ impl<'a> EntryFields<'a> {
                             dst.display()
                         ),
                     )
-                })
+                })?;
             } else {
                 symlink(&src, dst).map_err(|err| {
                     Error::new(
@@ -475,8 +494,15 @@ impl<'a> EntryFields<'a> {
                             dst.display()
                         ),
                     )
-                })
+                })?;
             };
+            return Ok(Unpacked::__Nonexhaustive);
+
+            #[cfg(target_arch = "wasm32")]
+            #[allow(unused_variables)]
+            fn symlink(src: &Path, dst: &Path) -> io::Result<()> {
+                Err(io::Error::new(io::ErrorKind::Other, "Not implemented"))
+            }
 
             #[cfg(windows)]
             fn symlink(src: &Path, dst: &Path) -> io::Result<()> {
@@ -492,16 +518,18 @@ impl<'a> EntryFields<'a> {
             || kind.is_gnu_longname()
             || kind.is_gnu_longlink()
         {
-            return Ok(());
+            return Ok(Unpacked::__Nonexhaustive);
         };
 
         // Old BSD-tar compatibility.
         // Names that have a trailing slash should be treated as a directory.
         // Only applies to old headers.
-        if self.header.as_ustar().is_none()
-            && self.path_bytes().ends_with(b"/")
-        {
-            return self.unpack_dir(dst);
+        if self.header.as_ustar().is_none() && self.path_bytes().ends_with(b"/") {
+            self.unpack_dir(dst)?;
+            if let Ok(mode) = self.header.mode() {
+                set_perms(dst, None, mode, self.preserve_permissions)?;
+            }
+            return Ok(Unpacked::__Nonexhaustive);
         }
 
         // Note the lack of `else` clause above. According to the FreeBSD
@@ -513,16 +541,23 @@ impl<'a> EntryFields<'a> {
         // As a result if we don't recognize the kind we just write out the file
         // as we would normally.
 
-        // Remove an existing file, if any, to avoid writing through
-        // symlinks/hardlinks to weird locations. The tar archive says this is a
-        // regular file, so let's make it a regular file.
-        (|| -> io::Result<()> {
-            match fs::remove_file(dst) {
-                Ok(()) => {}
-                Err(ref e) if e.kind() == io::ErrorKind::NotFound => {}
-                Err(e) => return Err(e),
-            }
-            let mut f = fs::File::create(dst)?;
+        // Ensure we write a new file rather than overwriting in-place which
+        // is attackable; if an existing file is found unlink it.
+        fn open(dst: &Path) -> io::Result<std::fs::File> {
+            OpenOptions::new().write(true).create_new(true).open(dst)
+        };
+        let mut f = (|| -> io::Result<std::fs::File> {
+            let mut f = open(dst).or_else(|err| {
+                if err.kind() != ErrorKind::AlreadyExists {
+                    Err(err)
+                } else {
+                    match fs::remove_file(dst) {
+                        Ok(()) => open(dst),
+                        Err(ref e) if e.kind() == io::ErrorKind::NotFound => open(dst),
+                        Err(e) => Err(e),
+                    }
+                }
+            })?;
             for io in self.data.drain(..) {
                 match io {
                     EntryIo::Data(mut d) => {
@@ -539,8 +574,9 @@ impl<'a> EntryFields<'a> {
                     }
                 }
             }
-            Ok(())
-        })().map_err(|e| {
+            Ok(f)
+        })()
+        .map_err(|e| {
             let header = self.header.path_bytes();
             TarError::new(
                 &format!(
@@ -555,13 +591,26 @@ impl<'a> EntryFields<'a> {
         if self.preserve_mtime {
             if let Ok(mtime) = self.header.mtime() {
                 let mtime = FileTime::from_unix_time(mtime as i64, 0);
-                filetime::set_file_times(dst, mtime, mtime).map_err(|e| {
+                filetime::set_file_handle_times(&f, Some(mtime), Some(mtime)).map_err(|e| {
                     TarError::new(&format!("failed to set mtime for `{}`", dst.display()), e)
                 })?;
             }
         }
         if let Ok(mode) = self.header.mode() {
-            set_perms(dst, mode, self.preserve_permissions).map_err(|e| {
+            set_perms(dst, Some(&mut f), mode, self.preserve_permissions)?;
+        }
+        if self.unpack_xattrs {
+            set_xattrs(self, dst)?;
+        }
+        return Ok(Unpacked::File(f));
+
+        fn set_perms(
+            dst: &Path,
+            f: Option<&mut std::fs::File>,
+            mode: u32,
+            preserve: bool,
+        ) -> Result<(), TarError> {
+            _set_perms(dst, f, mode, preserve).map_err(|e| {
                 TarError::new(
                     &format!(
                         "failed to set permissions to {:o} \
@@ -571,34 +620,65 @@ impl<'a> EntryFields<'a> {
                     ),
                     e,
                 )
-            })?;
-        }
-        if self.unpack_xattrs {
-            set_xattrs(self, dst)?;
+            })
         }
-        return Ok(());
 
         #[cfg(any(unix, target_os = "redox"))]
-        fn set_perms(dst: &Path, mode: u32, preserve: bool) -> io::Result<()> {
+        fn _set_perms(
+            dst: &Path,
+            f: Option<&mut std::fs::File>,
+            mode: u32,
+            preserve: bool,
+        ) -> io::Result<()> {
             use std::os::unix::prelude::*;
 
             let mode = if preserve { mode } else { mode & 0o777 };
-
             let perm = fs::Permissions::from_mode(mode as _);
-            fs::set_permissions(dst, perm)
+            match f {
+                Some(f) => f.set_permissions(perm),
+                None => fs::set_permissions(dst, perm),
+            }
         }
+
         #[cfg(windows)]
-        fn set_perms(dst: &Path, mode: u32, _preserve: bool) -> io::Result<()> {
-            let mut perm = try!(fs::metadata(dst)).permissions();
-            perm.set_readonly(mode & 0o200 != 0o200);
-            fs::set_permissions(dst, perm)
+        fn _set_perms(
+            dst: &Path,
+            f: Option<&mut std::fs::File>,
+            mode: u32,
+            _preserve: bool,
+        ) -> io::Result<()> {
+            if mode & 0o200 == 0o200 {
+                return Ok(());
+            }
+            match f {
+                Some(f) => {
+                    let mut perm = f.metadata()?.permissions();
+                    perm.set_readonly(true);
+                    f.set_permissions(perm)
+                }
+                None => {
+                    let mut perm = fs::metadata(dst)?.permissions();
+                    perm.set_readonly(true);
+                    fs::set_permissions(dst, perm)
+                }
+            }
+        }
+
+        #[cfg(target_arch = "wasm32")]
+        #[allow(unused_variables)]
+        fn _set_perms(
+            dst: &Path,
+            f: Option<&mut std::fs::File>,
+            mode: u32,
+            _preserve: bool,
+        ) -> io::Result<()> {
+            Err(io::Error::new(io::ErrorKind::Other, "Not implemented"))
         }
 
         #[cfg(all(unix, feature = "xattr"))]
         fn set_xattrs(me: &mut EntryFields, dst: &Path) -> io::Result<()> {
             use std::ffi::OsStr;
             use std::os::unix::prelude::*;
-            use xattr;
 
             let exts = match me.pax_extensions() {
                 Ok(Some(e)) => e,
@@ -637,7 +717,12 @@ impl<'a> EntryFields<'a> {
         }
         // Windows does not completely support posix xattrs
         // https://en.wikipedia.org/wiki/Extended_file_attributes#Windows_NT
-        #[cfg(any(windows, target_os = "redox", not(feature = "xattr")))]
+        #[cfg(any(
+            windows,
+            target_os = "redox",
+            not(feature = "xattr"),
+            target_arch = "wasm32"
+        ))]
         fn set_xattrs(_: &mut EntryFields, _: &Path) -> io::Result<()> {
             Ok(())
         }
diff --git a/vendor/tar/src/error.rs b/vendor/tar/src/error.rs
index 0e9cff9001..bfe6af9c32 100644
--- a/vendor/tar/src/error.rs
+++ b/vendor/tar/src/error.rs
@@ -22,7 +22,7 @@ impl error::Error for TarError {
         &self.desc
     }
 
-    fn cause(&self) -> Option<&error::Error> {
+    fn source(&self) -> Option<&(error::Error + 'static)> {
         Some(&self.io)
     }
 }
diff --git a/vendor/tar/src/header.rs b/vendor/tar/src/header.rs
index 0f2d7bd9c1..2a79a5f689 100644
--- a/vendor/tar/src/header.rs
+++ b/vendor/tar/src/header.rs
@@ -13,8 +13,8 @@ use std::mem;
 use std::path::{Component, Path, PathBuf};
 use std::str;
 
-use other;
-use EntryType;
+use crate::other;
+use crate::EntryType;
 
 /// Representation of the header of an entry in an archive
 #[repr(C)]
@@ -410,11 +410,11 @@ impl Header {
         }
     }
 
-    /// Sets the path name for this header.
+    /// Sets the link name for this header.
     ///
-    /// This function will set the pathname listed in this header, encoding it
-    /// in the appropriate format. May fail if the path is too long or if the
-    /// path specified is not unicode and this is a Windows platform.
+    /// This function will set the linkname listed in this header, encoding it
+    /// in the appropriate format. May fail if the link name is too long or if
+    /// the path specified is not unicode and this is a Windows platform.
     pub fn set_link_name<P: AsRef<Path>>(&mut self, p: P) -> io::Result<()> {
         self._set_link_name(p.as_ref())
     }
@@ -711,6 +711,12 @@ impl Header {
         }
     }
 
+    #[cfg(target_arch = "wasm32")]
+    #[allow(unused_variables)]
+    fn fill_platform_from(&mut self, meta: &fs::Metadata, mode: HeaderMode) {
+        unimplemented!();
+    }
+
     #[cfg(any(unix, target_os = "redox"))]
     fn fill_platform_from(&mut self, meta: &fs::Metadata, mode: HeaderMode) {
         match mode {
@@ -750,7 +756,6 @@ impl Header {
 
         #[cfg(not(target_os = "redox"))]
         fn entry_type(mode: u32) -> EntryType {
-            use libc;
             match mode as libc::mode_t & libc::S_IFMT {
                 libc::S_IFREG => EntryType::file(),
                 libc::S_IFLNK => EntryType::symlink(),
@@ -978,7 +983,7 @@ impl UstarHeader {
                         return Err(other(&format!(
                             "path cannot be split to be inserted into archive: {}",
                             path.display()
-                        )))
+                        )));
                     }
                 }
                 prefixlen = path2bytes(prefix)?.len();
@@ -1377,7 +1382,7 @@ fn octal_from(slice: &[u8]) -> io::Result<u64> {
             return Err(other(&format!(
                 "numeric field did not have utf-8 text: {}",
                 String::from_utf8_lossy(trun)
-            )))
+            )));
         }
     };
     match u64::from_str_radix(num.trim(), 8) {
@@ -1421,7 +1426,8 @@ fn num_field_wrapper_from(src: &[u8]) -> io::Result<u64> {
 fn numeric_extended_into(dst: &mut [u8], src: u64) {
     let len: usize = dst.len();
     for (slot, val) in dst.iter_mut().zip(
-        repeat(0).take(len - 8) // to zero init extra bytes
+        repeat(0)
+            .take(len - 8) // to zero init extra bytes
             .chain((0..8).rev().map(|x| ((src >> (8 * x)) & 0xff) as u8)),
     ) {
         *slot = val;
@@ -1483,10 +1489,10 @@ fn copy_path_into(mut slot: &mut [u8], path: &Path, is_link_name: bool) -> io::R
         let bytes = path2bytes(Path::new(component.as_os_str()))?;
         match (component, is_link_name) {
             (Component::Prefix(..), false) | (Component::RootDir, false) => {
-                return Err(other("paths in archives must be relative"))
+                return Err(other("paths in archives must be relative"));
             }
             (Component::ParentDir, false) => {
-                return Err(other("paths in archives must not have `..`"))
+                return Err(other("paths in archives must not have `..`"));
             }
             // Allow "./" as the path
             (Component::CurDir, false) if path.components().count() == 1 => {}
@@ -1523,6 +1529,11 @@ fn copy_path_into(mut slot: &mut [u8], path: &Path, is_link_name: bool) -> io::R
     }
 }
 
+#[cfg(target_arch = "wasm32")]
+fn ends_with_slash(p: &Path) -> bool {
+    p.to_string_lossy().ends_with('/')
+}
+
 #[cfg(windows)]
 fn ends_with_slash(p: &Path) -> bool {
     let last = p.as_os_str().encode_wide().last();
@@ -1534,7 +1545,7 @@ fn ends_with_slash(p: &Path) -> bool {
     p.as_os_str().as_bytes().ends_with(&[b'/'])
 }
 
-#[cfg(windows)]
+#[cfg(any(windows, target_arch = "wasm32"))]
 pub fn path2bytes(p: &Path) -> io::Result<Cow<[u8]>> {
     p.as_os_str()
         .to_str()
@@ -1568,11 +1579,12 @@ pub fn path2bytes(p: &Path) -> io::Result<Cow<[u8]>> {
 pub fn bytes2path(bytes: Cow<[u8]>) -> io::Result<Cow<Path>> {
     return match bytes {
         Cow::Borrowed(bytes) => {
-            let s = try!(str::from_utf8(bytes).map_err(|_| not_unicode(bytes)));
+            let s = r#try!(str::from_utf8(bytes).map_err(|_| not_unicode(bytes)));
             Ok(Cow::Borrowed(Path::new(s)))
         }
         Cow::Owned(bytes) => {
-            let s = try!(String::from_utf8(bytes).map_err(|uerr| not_unicode(&uerr.into_bytes())));
+            let s =
+                r#try!(String::from_utf8(bytes).map_err(|uerr| not_unicode(&uerr.into_bytes())));
             Ok(Cow::Owned(PathBuf::from(s)))
         }
     };
@@ -1595,3 +1607,20 @@ pub fn bytes2path(bytes: Cow<[u8]>) -> io::Result<Cow<Path>> {
         Cow::Owned(bytes) => Cow::Owned({ PathBuf::from(OsString::from_vec(bytes)) }),
     })
 }
+
+#[cfg(target_arch = "wasm32")]
+pub fn bytes2path(bytes: Cow<[u8]>) -> io::Result<Cow<Path>> {
+    Ok(match bytes {
+        Cow::Borrowed(bytes) => {
+            Cow::Borrowed({ Path::new(str::from_utf8(bytes).map_err(invalid_utf8)?) })
+        }
+        Cow::Owned(bytes) => {
+            Cow::Owned({ PathBuf::from(String::from_utf8(bytes).map_err(invalid_utf8)?) })
+        }
+    })
+}
+
+#[cfg(target_arch = "wasm32")]
+fn invalid_utf8<T>(_: T) -> io::Error {
+    io::Error::new(io::ErrorKind::InvalidData, "Invalid utf8")
+}
diff --git a/vendor/tar/src/lib.rs b/vendor/tar/src/lib.rs
index 4954007be0..52251cd2ca 100644
--- a/vendor/tar/src/lib.rs
+++ b/vendor/tar/src/lib.rs
@@ -21,23 +21,15 @@
 #![deny(missing_docs)]
 #![cfg_attr(test, deny(warnings))]
 
-extern crate filetime;
-#[cfg(unix)]
-extern crate libc;
-#[cfg(target_os = "redox")]
-extern crate syscall;
-#[cfg(all(unix, feature = "xattr"))]
-extern crate xattr;
-
 use std::io::{Error, ErrorKind};
 
-pub use archive::{Archive, Entries};
-pub use builder::Builder;
-pub use entry::Entry;
-pub use entry_type::EntryType;
-pub use header::GnuExtSparseHeader;
-pub use header::{GnuHeader, GnuSparseHeader, Header, HeaderMode, OldHeader, UstarHeader};
-pub use pax::{PaxExtension, PaxExtensions};
+pub use crate::archive::{Archive, Entries};
+pub use crate::builder::Builder;
+pub use crate::entry::{Entry, Unpacked};
+pub use crate::entry_type::EntryType;
+pub use crate::header::GnuExtSparseHeader;
+pub use crate::header::{GnuHeader, GnuSparseHeader, Header, HeaderMode, OldHeader, UstarHeader};
+pub use crate::pax::{PaxExtension, PaxExtensions};
 
 mod archive;
 mod builder;
diff --git a/vendor/tar/src/pax.rs b/vendor/tar/src/pax.rs
index 69a1b33f8e..e0298d533d 100644
--- a/vendor/tar/src/pax.rs
+++ b/vendor/tar/src/pax.rs
@@ -2,7 +2,7 @@ use std::io;
 use std::slice;
 use std::str;
 
-use other;
+use crate::other;
 
 /// An iterator over the pax extensions in an archive entry.
 ///
diff --git a/vendor/tar/tests/all.rs b/vendor/tar/tests/all.rs
index 2ae40235b1..254dffbf55 100644
--- a/vendor/tar/tests/all.rs
+++ b/vendor/tar/tests/all.rs
@@ -63,7 +63,10 @@ fn simple_concat() {
     let actual = decode_names(&mut ar);
     assert_eq!(expected, actual);
 
-    fn decode_names<R>(ar: &mut Archive<R>) -> Vec<String> where R: Read {
+    fn decode_names<R>(ar: &mut Archive<R>) -> Vec<String>
+    where
+        R: Read,
+    {
         let mut names = Vec::new();
 
         for entry in t!(ar.entries()) {
@@ -310,19 +313,15 @@ fn writing_directories_recursively() {
     let base_dir = td.path().join("foobar");
     assert!(fs::metadata(&base_dir).map(|m| m.is_dir()).unwrap_or(false));
     let file1_path = base_dir.join("file1");
-    assert!(
-        fs::metadata(&file1_path)
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
+    assert!(fs::metadata(&file1_path)
+        .map(|m| m.is_file())
+        .unwrap_or(false));
     let sub_dir = base_dir.join("sub");
     assert!(fs::metadata(&sub_dir).map(|m| m.is_dir()).unwrap_or(false));
     let file2_path = sub_dir.join("file2");
-    assert!(
-        fs::metadata(&file2_path)
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
+    assert!(fs::metadata(&file2_path)
+        .map(|m| m.is_file())
+        .unwrap_or(false));
 }
 
 #[test]
@@ -345,19 +344,15 @@ fn append_dir_all_blank_dest() {
     let base_dir = td.path();
     assert!(fs::metadata(&base_dir).map(|m| m.is_dir()).unwrap_or(false));
     let file1_path = base_dir.join("file1");
-    assert!(
-        fs::metadata(&file1_path)
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
+    assert!(fs::metadata(&file1_path)
+        .map(|m| m.is_file())
+        .unwrap_or(false));
     let sub_dir = base_dir.join("sub");
     assert!(fs::metadata(&sub_dir).map(|m| m.is_dir()).unwrap_or(false));
     let file2_path = sub_dir.join("file2");
-    assert!(
-        fs::metadata(&file2_path)
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
+    assert!(fs::metadata(&file2_path)
+        .map(|m| m.is_file())
+        .unwrap_or(false));
 }
 
 #[test]
@@ -496,41 +491,27 @@ fn extracting_malicious_tarball() {
     // The `tmp` subdirectory should be created and within this
     // subdirectory, there should be files named `abs_evil.txt` through
     // `abs_evil6.txt`.
-    assert!(
-        fs::metadata(td.path().join("tmp"))
-            .map(|m| m.is_dir())
-            .unwrap_or(false)
-    );
-    assert!(
-        fs::metadata(td.path().join("tmp/abs_evil.txt"))
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
-    assert!(
-        fs::metadata(td.path().join("tmp/abs_evil2.txt"))
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
-    assert!(
-        fs::metadata(td.path().join("tmp/abs_evil3.txt"))
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
-    assert!(
-        fs::metadata(td.path().join("tmp/abs_evil4.txt"))
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
-    assert!(
-        fs::metadata(td.path().join("tmp/abs_evil5.txt"))
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
-    assert!(
-        fs::metadata(td.path().join("tmp/abs_evil6.txt"))
-            .map(|m| m.is_file())
-            .unwrap_or(false)
-    );
+    assert!(fs::metadata(td.path().join("tmp"))
+        .map(|m| m.is_dir())
+        .unwrap_or(false));
+    assert!(fs::metadata(td.path().join("tmp/abs_evil.txt"))
+        .map(|m| m.is_file())
+        .unwrap_or(false));
+    assert!(fs::metadata(td.path().join("tmp/abs_evil2.txt"))
+        .map(|m| m.is_file())
+        .unwrap_or(false));
+    assert!(fs::metadata(td.path().join("tmp/abs_evil3.txt"))
+        .map(|m| m.is_file())
+        .unwrap_or(false));
+    assert!(fs::metadata(td.path().join("tmp/abs_evil4.txt"))
+        .map(|m| m.is_file())
+        .unwrap_or(false));
+    assert!(fs::metadata(td.path().join("tmp/abs_evil5.txt"))
+        .map(|m| m.is_file())
+        .unwrap_or(false));
+    assert!(fs::metadata(td.path().join("tmp/abs_evil6.txt"))
+        .map(|m| m.is_file())
+        .unwrap_or(false));
 }
 
 #[test]
@@ -916,9 +897,18 @@ fn append_path_symlink() {
     ar.follow_symlinks(false);
     let td = t!(TempDir::new("tar-rs"));
 
+    let long_linkname = repeat("abcd").take(30).collect::<String>();
+    let long_pathname = repeat("dcba").take(30).collect::<String>();
     t!(env::set_current_dir(td.path()));
+    // "short" path name / short link name
     t!(symlink("testdest", "test"));
     t!(ar.append_path("test"));
+    // short path name / long link name
+    t!(symlink(&long_linkname, "test2"));
+    t!(ar.append_path("test2"));
+    // long path name / long link name
+    t!(symlink(&long_linkname, &long_pathname));
+    t!(ar.append_path(&long_pathname));
 
     let rd = Cursor::new(t!(ar.into_inner()));
     let mut ar = Archive::new(rd);
@@ -932,6 +922,22 @@ fn append_path_symlink() {
     );
     assert_eq!(t!(entry.header().size()), 0);
 
+    let entry = t!(entries.next().unwrap());
+    assert_eq!(t!(entry.path()), Path::new("test2"));
+    assert_eq!(
+        t!(entry.link_name()),
+        Some(Cow::from(Path::new(&long_linkname)))
+    );
+    assert_eq!(t!(entry.header().size()), 0);
+
+    let entry = t!(entries.next().unwrap());
+    assert_eq!(t!(entry.path()), Path::new(&long_pathname));
+    assert_eq!(
+        t!(entry.link_name()),
+        Some(Cow::from(Path::new(&long_linkname)))
+    );
+    assert_eq!(t!(entry.header().size()), 0);
+
     assert!(entries.next().is_none());
 }
 
@@ -967,3 +973,41 @@ fn name_with_slash_doesnt_fool_long_link_and_bsd_compat() {
 
     assert!(td.path().join("foo").is_file());
 }
+
+#[test]
+fn insert_local_file_different_name() {
+    let mut ar = Builder::new(Vec::new());
+    let td = t!(TempDir::new("tar-rs"));
+    let path = td.path().join("directory");
+    t!(fs::create_dir(&path));
+    ar.append_path_with_name(&path, "archive/dir").unwrap();
+    let path = td.path().join("file");
+    t!(t!(File::create(&path)).write_all(b"test"));
+    ar.append_path_with_name(&path, "archive/dir/f").unwrap();
+
+    let rd = Cursor::new(t!(ar.into_inner()));
+    let mut ar = Archive::new(rd);
+    let mut entries = t!(ar.entries());
+    let entry = t!(entries.next().unwrap());
+    assert_eq!(t!(entry.path()), Path::new("archive/dir"));
+    let entry = t!(entries.next().unwrap());
+    assert_eq!(t!(entry.path()), Path::new("archive/dir/f"));
+    assert!(entries.next().is_none());
+}
+
+#[test]
+#[cfg(unix)]
+fn tar_directory_containing_symlink_to_directory() {
+    use std::os::unix::fs::symlink;
+
+    let td = t!(TempDir::new("tar-rs"));
+    let dummy_src = t!(TempDir::new("dummy_src"));
+    let dummy_dst = td.path().join("dummy_dst");
+    let mut ar = Builder::new(Vec::new());
+    t!(symlink(dummy_src.path().display().to_string(), &dummy_dst));
+
+    assert!(dummy_dst.read_link().is_ok());
+    assert!(dummy_dst.read_link().unwrap().is_dir());
+    ar.append_dir_all("symlinks", td.path()).unwrap();
+    ar.finish().unwrap();
+}
diff --git a/vendor/tar/tests/archives/directory.tar b/vendor/tar/tests/archives/directory.tar
deleted file mode 100644
index ec6867a4be3a84766e2b4d9dc8903abc66187359..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeIxJq|)448ZZuo`M_DA|L0$r=t!&_58wOT!=2bnE3C~p&=!|w$;n@&=w^nX~{~`
z_uNZ8#6pa!!BUB$ra2aIY5LDvgZp}`SLfvXI9^WcxZ|h#_~lPmsy|HMfIi@_=O5ah
zSYH6<zs2HIzf5n_=bvM{>*4)}*Zt?c_4_X+i__^pYYqPV{+Hbr$n-z}0R#|0009IL
lKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q3`d@C27|H#z_S

diff --git a/vendor/tar/tests/archives/duplicate_dirs.tar b/vendor/tar/tests/archives/duplicate_dirs.tar
deleted file mode 100644
index fc19b9d01a7cd6a3134b649faceb634e605ec22c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
zcmeHFZ3=)e2;EV<K{j(8Cq@|reZW@tZ>yl_{~&1Z&vPo{`P46yG~M6|l@5qlGlPn3
z%)zLulS3{7O3k_^B1Qr%nb0WUbdv6$H@{jJq_wt_xs}N}FT*&>-El^tt?%E-$NQQi
b4jBNC%BMr0_y6ntfBHDHxa>f7AgKd8zT`G5

diff --git a/vendor/tar/tests/archives/empty_filename.tar b/vendor/tar/tests/archives/empty_filename.tar
deleted file mode 100644
index dd1c8a9fd5611c88405a307af267a15b302b8970..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 512
zcmZQzU|=XME=ep>Pyn)M0}Oz`+|-l-NEw=&8X(gkDG*>VG%_(UFfcMSH8)`}Ff=eT
iF=tRPrHyk?O@(<rw=BiP$kZ5B5{XAgCn4ENb0z@&7ZLgZ

diff --git a/vendor/tar/tests/archives/file_times.tar b/vendor/tar/tests/archives/file_times.tar
deleted file mode 100644
index 1a77a79a0bd19b8948541ba2e14f90a1c1093fde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1536
zcmYdfpgk}!FfcPQQD6Yl=4Pf~+Q10H2MU3Kf`PfQiJ7U1DUhdNU}$7$V8EbYKzpY#
yFq9UTBo+ak=24lNpXZ&Ki_1=+va~c@l0b2&Kj1VTrK3`#Aut*OqaiRDLI41qoD_us

diff --git a/vendor/tar/tests/archives/link.tar b/vendor/tar/tests/archives/link.tar
deleted file mode 100644
index e2cd61d322a4fa282aa559a1cb20d285d2dee049..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeIwJr2S!42EIPoFYeX{*QwY1PM_Ui3ZM3G9WsYg;or&7Y|nC==nU1S6REXRnA#j
zvpMR#_fapgF1e6g^xleEjUkC~=gUym{@i1#hr2OyD$m7L-{y;t|97|raSu3!Fwgyc
z2YuA8B7O3=?M|#}@M3feHu5j~<87>EtkZ4_aCRVo00IagfB*srAb<b@2q1s}0tg_0
b00IagfB*srAb<b@2q1s}0tg_0z^?>eA&w`R

diff --git a/vendor/tar/tests/archives/pax.tar b/vendor/tar/tests/archives/pax.tar
deleted file mode 100644
index 6de2d3bd35786d6cc4319404f6825c9baa874dbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeHLZExH*682~P3U-U8YusA<{^~mIrg7Wg;OoKh0S6d{!IiiYYl&1z%Im!#|NWk!
zR_nDBr?`WA7X-UVEWXWf=Hblfp~Cjx`Q0yq$HLffFz8L%KXQ}k(CIuoc&1+mztLcD
zKu`Q0KRexi_n_Mw4aU6zEj;L;(;FVJyJy<}lWI!qxPeKZT=eBm_B$+hG8ZS^!LZ*Q
zjJl&iI7O@1ACD$MZ_4;~wm0lfyTh<Im`w416hJiEPJSTz<wEvFdG`F-{vkY+^drja
zPNzE_`uwk-G}Y~oJCE~!Jn9{=|4B~P`Oh=)$$Ilg^W+JB+v4^i44>u5Wx=Bxo`|a;
zP&^mxgf&nP8^JB!2U08Qcfx+yZv?z_sWuiPmyJ2VVm}%gr4DPpBW!-4Khb6=jCB68
zaTTOG7X`GFn$)?%&f4uny0l!-iuSHZ8`~Zk+X##(w3SYq^?xE2>!{3yawu1o)wCUU
z+ug$NS#OicNGR(qJ9~4{o&$$e9QDFZBe)Ukl{RtZDxuNxpe$u3s3}yWW2qAOXYk^z
zKs!I3zdkz+^SBWNv9JK5s4ZzUf;l@!oH3afnYg!7FBxYS^K(X;8R-&+aTT+bkxrP9
zU8K^oOfC!u7_k<XDeZ!&GzOk#YnEa$Bmre%gr)Opu|<h}@Xs>7u+H$vF^$7yJj>Xd
z_OF|5FstIA+Q)`$9><c*#iDhKB{0RYOsK@ASZD-u{6;9|Gy`NM^;0ZxsX*UJBZ5dP
zhi0`{3EIzy-%CuzB(<m)!e$sMW2|LTv0UVI%w!t$X%&euXaKI@G8TnUSQbfPuL3|2
zRgu_h1OyhncB+AHIBWzfsdyo`D@gqI=%ETH@*<X|T7zi*ER*s7V3ak{2MiE!hsHji
zF;o{n&Hs8;{RjK#^gRC?490u@_k1Vtw5A9AuQwV`CzEh8?R18nX}3!hZ-@VlCOF7&
z-0$@IlWDjAkN|FFC!Jxp)1T}!>}k+HqZ!Ko=g#-X?)m(Gn*R-kz0u?R9}h-*{`VNi
zKcnAnf5qloj<MAA;^xF|wnT*5L{hkkQh6(E01^8Ckew7p-{QS)S?Od3E<s#HL?9(Z
zT|fbHu80TjDq@%2E3c>~Dj*9LRoRdf25V|6^t0zAAT)lHr#MNaPSv&&3;HM<S(YF=
zAE6>G&qeg&HxW7SDBJkOGJF*gkl_qA2%Zxv5~Rm0c?3SBy~%8`c5r-YbRKSDf|oP4
zVWUEYD|sUe5lbFwleDSVzToEio8E+I9MDtAH@#^9adxIbwLol%%4yI#B3!X>90Ulo
ziW`RG%0ZkW4v#bIdDc>wAdsmrVn!-9`>s~2aA|~C*w}9yC9;hZ3Gw{?_fnYk3Dmu?
z;)Y1z$?yf{3hvUApCI$<?d!ixjy9yz+x53sGiJf;83-)dRMBAu3E-hTwPZ4uI=9{s
zoc)?vA##9+&~RX^L`+ozwg(gG=ZP*3>z>+@t{fB^Fca;(!<|47_+<fZnFu9t)7UwH
zRSHmQZ5|6SWx^*S4N)dNJB23LDj>c?URh+g13?A<XP#HWr8O(<R-JTU;u;cw8l;qE
z8blYa<Bo7c5f*FZBVd;sgAhkXxO*KBn198SiS|~<1uE=_>Q|P~4S-;+y<C<G-&r&P
z3#z?AjD&xqJ4J;E#1(Rd7l6mIrU;V|9$BAy8<!8mAo%*LOT<$%b$NDew075}$%qpF
z!DZ?2%1a8hZsrpA43%6{SXRT)GP%ZSnI=NtwGg0Kwc<u$l|96gK-^JSY@8!1fBbN$
zV(*UzYnFc;1UL!=Ogx)OJ)6BdHAb5j^N+tu6~8~eU!ZZpoV|OE;9s_wf1H&L3xc9t
z(1{`(>5hdp)fdke`v-mft2;lda;N#W;Kqt-06J<F2qd$<cI!gSW~bD?K=aY`X6Al$
zQ#-NoysDyb0J5l(JDL}z%)E84s>Z!|!S5i754ER&Qqeunw%Bf$e9U!R*S%xk+32e}
z-t3*G_h8c}M5|`%@u}L_6j~8(KfU?q*=f@t*p4z}ZJSzO<8y7Nf9PwB&){>Jqz>29
z6@{)5-y&FX6;0SGMY3`B`t1cJeHl5-WE^q3lp;f+;+EkKxD9L6F_|d3B2&IqX^I;o
zE{Akit~B5R+Ct4MDGpHrZXpu0Li=iLtLtW+B?vlPWl=4?8Im@SusH^}@r4p8ZA#o>
zbK!H`r}SpZXXHxwB64q^F3pZJw3}2=$jOyks!+b>Ea-9$MEt$GcIZ}e#<!N)wE|LB
z{tL#GqXBECx)9ZSiIU&HZ{YVm9xL%Javs)F*`sZ@stUU0<8#I#USGa;pp@8DmxS+D
z>27tR4Yq($B_Y4J>hP)wg9>Ukr{nm=d-C1+jD7!>?0wmU!7X-vi1?sS8ap#p))5E~
zMPIUa0mTXB4a55`5e{|d{MZjJ6{-euwuv`Twmf7<FWHN8_Kx{(*k$j7_aEN}+5PlZ
zwbtvrbj=s|gLhD^oqB$UdU&%-03l5Q+{|q<g8|NXb9}YgxZvBfnG&n!wg}B;zmimo
tLF^FL{uxYduXB&U9)Udqdj$3f>=D=_ut#8zz#f4;0(%7Z2>ka5{2L#DtDyh@

diff --git a/vendor/tar/tests/archives/pax2.tar b/vendor/tar/tests/archives/pax2.tar
deleted file mode 100644
index c0c8ed314ce8236a40a841950f0b7fbbfe8d7b44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeIyOA5j;5P;#VJw;ETGnuBP3l9@SP*4!9;PFkAV(X%AqPX~HGYv!Y_|j>NlUPkg
zF%}t1il(kz&MDrr)TyRs8br*iIx(>}xa#J95Z6l|&uL3PSn3~_@Zzge?04&LT>NOx
zA|KM+d<&E6*zb?qwFVQl#)~ec>%4hsHCN-b+AXa%3ylvxS2xq@_}zcJw^Dl=k><y*
zTvKlPHZ^og+J;B}4>^}|y!F4O8+27Db;!AShW?L-?d<>NQ~i04*UxQkO=<`rfB*sr
qAb<b@2q1s}0tg_000IagfB*srAb<b@2q1s}0tg_000IaU61W4?j>YZ(

diff --git a/vendor/tar/tests/archives/reading_files.tar b/vendor/tar/tests/archives/reading_files.tar
deleted file mode 100644
index 67e79ffdfe2d85519305dff62a70a9950058a1d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeIxJqpAi5QgEYa|(|zX3flb45Zs?e_)Tl+NF>rg+hu~3&9V^;ep9AerZ`|Ny-s@
z(fwH?)!8J@4=Z6x9!u`#E<wk)Ch~oM@+$<%&+T{g-&ub2_QqMBTKmQg(^^-7wQIF@
zu{z?{=ilo5yDrRsTeI)&I<<D+Kd6QP0tg_000IagfB*srAb<b@2q1s}0tg_000Iag
RfB*srAb<b@2p}*{;1AnQDR2M)

diff --git a/vendor/tar/tests/archives/simple.tar b/vendor/tar/tests/archives/simple.tar
deleted file mode 100644
index 747ddf9d585753b8e6acf36086270a3523c56ab8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeIvJqmy@42IzxrAKJ1rst{R=Hw4}eA~^bqF_;YLm@*b3C|bh{j#Z4TS?7@&YpW7
z<r3!`b()_~^Ps9??E9yQY|9#FV<b-FUfOpxFa7=Stgmoe4)}Kdf&42(BSVEHPx23z
z{3}Gm3Iq^9009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~fu9Q;-KH=t

diff --git a/vendor/tar/tests/archives/simple_missing_last_header.tar b/vendor/tar/tests/archives/simple_missing_last_header.tar
deleted file mode 100644
index b98c1ded5793fc1ccd064c21fcdfc4412690bb18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9728
zcmeIvJqmy@42IzxrAKJ1rst{R=Hw4}eA~^bqF@nuLm@*b3C|bh{j#Z4TS?7@&YpW7
z<r3!`b()_~^Ps9??E9yQY|9#FV<b-FUfOpxFa7=Stgmoe4)}Kdf&42(BSVEHPx23z
x{3}Gm3Iq^9009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q7UvzyW>+Ff9N8

diff --git a/vendor/tar/tests/archives/spaces.tar b/vendor/tar/tests/archives/spaces.tar
deleted file mode 100644
index 68e2a519eebd0d751f17106db3a5722cfc76f223..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2048
zcmYdfpgk}&FfcbaS71;80RuD|ENG-)Xk=nyU|?uwW@Z8uF)=bVR$wroz0*d#4T)SM
UJ_tqwU^E0qLtr!nMq~&801;dXMF0Q*

diff --git a/vendor/tar/tests/archives/sparse.tar b/vendor/tar/tests/archives/sparse.tar
deleted file mode 100644
index 216aed1d780cf5ec5e1b2143e284bdbc362124aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeHM;cCMm5O#m}6n%nmMok`M4^X;Iwn1o1w5*T6yV$f1rh$MmTux|XPW^Ix=cn=F
zj=Rp;?VJ7l-oN;>7a0m*skIh(k&OYmf(-Y475{{+8VQYRB(+xnl@goR48BB=C+BzF
zW+RU8QPaq9a<+3LOQIX1;8J>KurBd;smrF;L%r{{{HXyv07av{b^bZBvSBR@xS)T#
z|H!3&(a+=={X=c!RsRZ%0BLk>)}?>h+%%7?B{Gt%T=kz4G?{k{G|K?3&s$Vyt~Gkl
z|JnbU{tck!!~U-;trYJ6s@8I4`X`l6?EmV49Z8$)Ps_*{=ZP#J3CP4#Ei}>#$9Pn*
zkDiXE34j=qEd?>)?U~>I3W`^1S2_Nv87&Ks<6l<1QhUqsPt9mqcpU$-;+5K4j(=)K
z%fbui|9oeEVuQ|-Gx<Nv_TTdV+SHW)$BzMg{wLn5`@G=YcL7a}L%yJ|Kb&{e3J?ZF
xoxW__9&#m@qNlNe8DIvMFz|Ee+HA?+C5~`kW`G%B2ABb6fEi#0n1O%6z%Q<sqKE(h

diff --git a/vendor/tar/tests/archives/xattrs.tar b/vendor/tar/tests/archives/xattrs.tar
deleted file mode 100644
index e8224fac24888c24d9c22da60b0f837dc6e4b3d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10240
zcmeH}O-sZu5QcN^ujnsGGtFlYd-Ae^2f>ras8s|DOFy7L-vm*+*-|`o7q##7kT#Q~
zGf$W|;l-^V_qBhj+m1V7sqk!V6Tys9EVjYYR*)n{r45g<@m&xJMJylJ4rFe<q3eAc
zLYnh!pihdt>0g_AN6KicgmV>_m8vSzrOC=F_s3qvsdUnj)LEGNc<h``-2l7)kfJZn
zpG7Qst97h<vihU`>01w?JFS0ZEz9-!Lu2f-{+pq%m;N_&K_M3g#4Lh+iQB@^-{kTq
z`v0(cc#+GZ{#%{yf6y1`|LPktv*5D+2XCVPQ;9!004m2zB5iayK{BcHyQ}^6%{?D|
z-?uy#5I^{lKfn2xZdV_gY$hIbU6z0^*01+8gGv4WRR4_(_rHtW$u_S4>0aR*1V8`;
qKmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1VG^L5_ku0yMiD9

diff --git a/vendor/tar/tests/entry.rs b/vendor/tar/tests/entry.rs
index 2cba1bf625..5d3c8ca4b2 100644
--- a/vendor/tar/tests/entry.rs
+++ b/vendor/tar/tests/entry.rs
@@ -154,6 +154,32 @@ fn relative_link_deref_error() {
     assert!(File::open(td.path().join("foo").join("bar")).is_err());
 }
 
+#[test]
+#[cfg(unix)]
+fn directory_maintains_permissions() {
+    use ::std::os::unix::fs::PermissionsExt;
+
+    let mut ar = tar::Builder::new(Vec::new());
+
+    let mut header = tar::Header::new_gnu();
+    header.set_size(0);
+    header.set_entry_type(tar::EntryType::Directory);
+    t!(header.set_path("foo"));
+    header.set_mode(0o777);
+    header.set_cksum();
+    t!(ar.append(&header, &[][..]));
+
+    let bytes = t!(ar.into_inner());
+    let mut ar = tar::Archive::new(&bytes[..]);
+
+    let td = t!(TempDir::new("tar"));
+    t!(ar.unpack(td.path()));
+    let f = t!(File::open(td.path().join("foo")));
+    let md = t!(f.metadata());
+    assert!(md.is_dir());
+    assert_eq!(md.permissions().mode(), 0o40777);
+}
+
 #[test]
 fn modify_link_just_created() {
     let mut ar = tar::Builder::new(Vec::new());
diff --git a/vendor/term_size/.cargo-checksum.json b/vendor/term_size/.cargo-checksum.json
deleted file mode 100644
index e73b8d94ba..0000000000
--- a/vendor/term_size/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"CHANGELOG.md":"c3ba8be220413f2ed5fce3f49a3888d22e20802f19a237cdaa1171fb13000427","CONTRIBUTORS.md":"fec990280aad6c99316b11a69f7f560fbdf722b5e83d9743449127e8f3d5499b","Cargo.toml":"3202b196bb0c19167c07b8c980550f1d21640e0c4a6b6ce72012fb7b5fbf7a75","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6725d1437fc6c77301f2ff0e7d52914cf4f9509213e1078dc77d9356dbe6eac5","README.md":"9cf3574889a4e7f4fe68f532bacd596786057d41eb20fe8e8ed2215d430d8bd3","appveyor.yml":"bd88ad4a942e10ef602540ae592f3e010327dc93aa3d60f07f9f7ff6d3562719","index.html":"d2203968a6fb051d52c55d6e517614c942ea0edbc283e6c3cc8aeb4556eeaad4","justfile":"d89a49bee30578a4af4a4bba4d98578331214370e665561052c0dca7bf956ce1","rustfmt.toml":"8fd2d63119df515fd5f44e530c709b19d66b09fbc2e22a640bf4b64c57e7d6b3","src/lib.rs":"eab371fe8be05d03bb1cd2a5f1ec3e665423501412383d211552174e21da05c7"},"package":"9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"}
\ No newline at end of file
diff --git a/vendor/term_size/CHANGELOG.md b/vendor/term_size/CHANGELOG.md
deleted file mode 100644
index 3a0d3dfad7..0000000000
--- a/vendor/term_size/CHANGELOG.md
+++ /dev/null
@@ -1,48 +0,0 @@
-<a name="v0.3.0"></a>
-## v0.3.0 (2017-04-09)
-
-
-#### Features
-
-*   allows getting the terminal size of all standard streams, or just particular ones ([c7095c95](https://github.com/kbknapp/term_size-rs/commit/c7095c95d633e0a36ea78434bc83349a9711a187))
-
-
-
-<a name="v0.2.3"></a>
-### v0.2.3 (2017-02-21)
-
-#### Bug Fixes
-
-* Moves the code into distinct modules and adds dummy functions for unsupported platforms
-
-
-<a name="v0.2.2"></a>
-### v0.2.2 (2017-01-29)
-
-* Updates deps `libc` and `clippy`
-
-<a name="v0.2.1"></a>
-### v0.2.1 (2016-09-05)
-
-
-#### Bug Fixes
-
-*   uses libc::winsize instead of homegrown ([216986ec](https://github.com/kbknapp/term_size-rs/commit/216986ecdbe528523953a1cde4cf6c329a0f4fbc), closes [#6](https://github.com/kbknapp/term_size-rs/issues/6))
-
-
-
-
-<a name="v0.2.0">v0.2.0</a>
-## v0.2.0 (2016-09-05)
-
-#### Features
-
-* adds support for Windows ([f181c99](https://github.com/kbknapp/term_size-rs/commit/f181c99c0c306b711952a2a4053df904e851413f))
-
-#### Documentation
-
-* **README.md:**
-  *  fixes documentation link ([ca06bf13](https://github.com/kbknapp/term_size-rs/commit/ca06bf132948559032853addd9aa0af022a126e9))
-  *  minor fixups ([1c269046](https://github.com/kbknapp/term_size-rs/commit/1c2690462b1b1db58d46395c6f1cf098dd769e18))
-
-
diff --git a/vendor/term_size/CONTRIBUTORS.md b/vendor/term_size/CONTRIBUTORS.md
deleted file mode 100644
index 43d92f4248..0000000000
--- a/vendor/term_size/CONTRIBUTORS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-the following is a list of contributors:
-
-
-[<img alt="kbknapp" src="https://avatars1.githubusercontent.com/u/6942134?v=4&s=117" width="117">](https://github.com/kbknapp) |[<img alt="nabijaczleweli" src="https://avatars3.githubusercontent.com/u/6709544?v=4&s=117" width="117">](https://github.com/nabijaczleweli) |[<img alt="vorner" src="https://avatars2.githubusercontent.com/u/11783500?v=4&s=117" width="117">](https://github.com/vorner) |[<img alt="nbaksalyar" src="https://avatars0.githubusercontent.com/u/217316?v=4&s=117" width="117">](https://github.com/nbaksalyar) |[<img alt="kaegi" src="https://avatars2.githubusercontent.com/u/16853465?v=4&s=117" width="117">](https://github.com/kaegi) |
-:---: |:---: |:---: |:---: |:---: |
-[kbknapp](https://github.com/kbknapp) |[nabijaczleweli](https://github.com/nabijaczleweli) |[vorner](https://github.com/vorner) |[nbaksalyar](https://github.com/nbaksalyar) |[kaegi](https://github.com/kaegi) |
-
-
-
-
-This list was generated by [mgechev/github-contributors-list](https://github.com/mgechev/github-contributors-list)
diff --git a/vendor/term_size/Cargo.toml b/vendor/term_size/Cargo.toml
deleted file mode 100644
index 4b5c0fe744..0000000000
--- a/vendor/term_size/Cargo.toml
+++ /dev/null
@@ -1,84 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "term_size"
-version = "0.3.1"
-authors = ["Kevin K. <kbknapp@gmail.com>", "Benjamin Sago <ogham@bsago.me>"]
-exclude = []
-description = "functions for determining terminal sizes and dimensions"
-documentation = "https://kbknapp.github.io/term_size-rs"
-readme = "README.md"
-keywords = ["term", "terminal", "size", "width", "dimension"]
-categories = ["command-line-interface"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/kbknapp/term_size-rs.git"
-[profile.test]
-opt-level = 1
-lto = false
-codegen-units = 2
-debug = true
-debug-assertions = true
-rpath = false
-
-[profile.doc]
-opt-level = 0
-lto = false
-codegen-units = 4
-debug = true
-debug-assertions = true
-rpath = false
-
-[profile.bench]
-opt-level = 3
-lto = true
-debug = false
-debug-assertions = false
-rpath = false
-
-[profile.dev]
-opt-level = 0
-lto = false
-codegen-units = 4
-debug = true
-debug-assertions = true
-rpath = false
-
-[profile.release]
-opt-level = 3
-lto = true
-debug = false
-debug-assertions = false
-rpath = false
-[dependencies.clippy]
-version = "~0.0.112"
-optional = true
-
-[features]
-debug = []
-default = []
-lints = ["clippy", "nightly"]
-nightly = []
-travis = ["lints", "nightly"]
-unstable = []
-[target."cfg(not(target_os = \"windows\"))".dependencies.libc]
-version = "~0.2.20"
-[target."cfg(target_os = \"windows\")".dependencies.kernel32-sys]
-version = "~0.2.2"
-
-[target."cfg(target_os = \"windows\")".dependencies.winapi]
-version = "~0.2.8"
-[badges.appveyor]
-repository = "kbknapp/term_size-rs"
-
-[badges.travis-ci]
-repository = "kbknapp/term_size-rs"
diff --git a/vendor/term_size/LICENSE-MIT b/vendor/term_size/LICENSE-MIT
deleted file mode 100644
index 5acedf0412..0000000000
--- a/vendor/term_size/LICENSE-MIT
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015-2016 Kevin B. Knapp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/vendor/term_size/README.md b/vendor/term_size/README.md
deleted file mode 100644
index 9f9c6f26aa..0000000000
--- a/vendor/term_size/README.md
+++ /dev/null
@@ -1,63 +0,0 @@
-term_size
-====
-
-[![Crates.io](https://img.shields.io/crates/v/term_size.svg)](https://crates.io/crates/term_size) [![Crates.io](https://img.shields.io/crates/d/term_size.svg)](https://crates.io/crates/term_size) [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/kbknapp/term_size-rs/blob/master/LICENSE-MIT) [![license](http://img.shields.io/badge/license-Apache2.0-blue.svg)](https://github.com/kbknapp/term_size-rs/blob/master/LICENSE-APACHE) [![Coverage Status](https://coveralls.io/repos/kbknapp/term_size-rs/badge.svg?branch=master&service=github)](https://coveralls.io/github/kbknapp/term_size-rs?branch=master) [![Join the chat at https://gitter.im/kbknapp/term_size-rs](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kbknapp/term_size-rs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-Linux: [![Build Status](https://travis-ci.org/kbknapp/term_size-rs.svg?branch=master)](https://travis-ci.org/kbknapp/term_size-rs)
-Windows: [![Build status](https://ci.appveyor.com/api/projects/status/6q0x4h6i0e3ypbm5?svg=true
-)](https://ci.appveyor.com/project/kbknapp/term_size-rs/branch/master)
-
-A Rust library to enable getting terminal sizes and dimensions
-
-[Documentation](https://kbknapp.github.io/term_size-rs)
-
-## Usage
-
-First, add the following to your `Cargo.toml`:
-
-```toml
-[dependencies]
-term_size = "0.3"
-```
-
-Next, add this to your crate root:
-
-```rust
-extern crate term_size;
-```
-
-To get the dimensions of your terminal window, simply use the following:
-
-```rust
-fn main() {
-  if let Some((w, h)) = term_size::dimensions() {
-    println!("Width: {}\nHeight: {}", w, h);
-  } else {
-    println!("Unable to get term size :(")
-  }
-}
-```
-
-## License
-
-Copyright Benjamin Sago, Kevin Knapp, and `term_size` contributors.
-
-Licensed under either of
-
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-## Contributing
-
-1. Fork it!
-2. Create your feature branch: `git checkout -b my-new-feature`
-3. Commit your changes: `git commit -am 'Add some feature'`
-4. Push to the branch: `git push origin my-new-feature`
-5. Submit a pull request :D
-
-Unless you explicitly state otherwise, any contribution intentionally
-submitted for inclusion in the work by you, as defined in the
-Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
diff --git a/vendor/term_size/appveyor.yml b/vendor/term_size/appveyor.yml
deleted file mode 100644
index efef69ec25..0000000000
--- a/vendor/term_size/appveyor.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-install:
-  - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-nightly-i686-pc-windows-gnu.exe'
-  - rust-nightly-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
-  - rustc -V
-  - cargo -V
-
-build: false
-
-test_script:
-  - cargo build --verbose
-  - cargo test --verbose
diff --git a/vendor/term_size/index.html b/vendor/term_size/index.html
deleted file mode 100644
index 0b03ded533..0000000000
--- a/vendor/term_size/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<meta http-equiv="refresh" content="0; url=https://kbknapp.github.io/term_size-rs/doc/term_size/index.html" />
diff --git a/vendor/term_size/justfile b/vendor/term_size/justfile
deleted file mode 100644
index 64ec724e38..0000000000
--- a/vendor/term_size/justfile
+++ /dev/null
@@ -1,39 +0,0 @@
-@update-contributors:
-	echo 'Removing old CONTRIBUTORS.md'
-	mv CONTRIBUTORS.md CONTRIBUTORS.md.bak
-	echo 'Downloading a list of new contributors'
-	echo "the following is a list of contributors:" > CONTRIBUTORS.md
-	echo "" >> CONTRIBUTORS.md
-	echo "" >> CONTRIBUTORS.md
-	githubcontrib --owner kbknapp --repo term_size-rs --sha master --cols 6 --format md --showlogin true --sortBy contributions --sortOrder desc >> CONTRIBUTORS.md
-	echo "" >> CONTRIBUTORS.md
-	echo "" >> CONTRIBUTORS.md
-	echo "This list was generated by [mgechev/github-contributors-list](https://github.com/mgechev/github-contributors-list)" >> CONTRIBUTORS.md
-	rm CONTRIBUTORS.md.bak
-
-run-test TEST:
-	cargo test --test {{TEST}}
-
-debug TEST:
-	cargo test --test {{TEST}} --features debug
-
-run-tests:
-	cargo test --features "yaml unstable"
-
-@bench: nightly
-	cargo bench && just remove-nightly
-
-nightly:
-	rustup override add nightly
-
-remove-nightly:
-	rustup override remove
-
-@lint: nightly
-	cargo build --features lints && just remove-nightly
-
-clean:
-	cargo clean
-	find . -type f -name "*.orig" -exec rm {} \;
-	find . -type f -name "*.bk" -exec rm {} \;
-	find . -type f -name ".*~" -exec rm {} \;
diff --git a/vendor/term_size/rustfmt.toml b/vendor/term_size/rustfmt.toml
deleted file mode 100644
index 0136d86e31..0000000000
--- a/vendor/term_size/rustfmt.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-format_strings = false
-chain_overflow_last = false
-same_line_if_else = true
-fn_single_line = true
diff --git a/vendor/term_size/src/lib.rs b/vendor/term_size/src/lib.rs
deleted file mode 100644
index da2b96cbe3..0000000000
--- a/vendor/term_size/src/lib.rs
+++ /dev/null
@@ -1,237 +0,0 @@
-// The following was originally taken and adapated from exa source
-// repo: https://github.com/ogham/exa
-// commit: b9eb364823d0d4f9085eb220233c704a13d0f611
-// license: MIT - Copyright (c) 2014 Benjamin Sago
-
-//! System calls for getting the terminal size.
-//!
-//! Getting the terminal size is performed using an ioctl command that takes
-//! the file handle to the terminal -- which in this case, is stdout -- and
-//! populates a structure containing the values.
-//!
-//! The size is needed when the user wants the output formatted into columns:
-//! the default grid view, or the hybrid grid-details view.
-
-#[cfg(not(target_os = "windows"))]
-extern crate libc;
-#[cfg(target_os = "windows")]
-extern crate kernel32;
-#[cfg(target_os = "windows")]
-extern crate winapi;
-
-pub use platform::{dimensions, dimensions_stdout, dimensions_stdin, dimensions_stderr};
-
-#[cfg(any(target_os = "linux",
-          target_os = "android",
-          target_os = "macos",
-          target_os = "ios",
-          target_os = "bitrig",
-          target_os = "dragonfly",
-          target_os = "freebsd",
-          target_os = "netbsd",
-          target_os = "openbsd",
-          target_os = "solaris"))]
-mod platform {
-    use libc::{STDOUT_FILENO, STDIN_FILENO, STDERR_FILENO, c_int, c_ulong, winsize};
-    use std::mem::zeroed;
-
-    // Unfortunately the actual command is not standardised...
-    #[cfg(any(target_os = "linux", target_os = "android"))]
-    static TIOCGWINSZ: c_ulong = 0x5413;
-
-    #[cfg(any(target_os = "macos",
-              target_os = "ios",
-              target_os = "bitrig",
-              target_os = "dragonfly",
-              target_os = "freebsd",
-              target_os = "netbsd",
-              target_os = "openbsd"))]
-    static TIOCGWINSZ: c_ulong = 0x40087468;
-
-    #[cfg(target_os = "solaris")]
-    static TIOCGWINSZ: c_ulong = 0x5468;
-
-    extern "C" {
-        fn ioctl(fd: c_int, request: c_ulong, ...) -> c_int;
-    }
-
-    /// Runs the ioctl command. Returns (0, 0) if all of the streams are not to a terminal, or
-    /// there is an error. (0, 0) is an invalid size to have anyway, which is why
-    /// it can be used as a nil value.
-    unsafe fn get_dimensions_any() -> winsize {
-        let mut window: winsize = zeroed();
-        let mut result = ioctl(STDOUT_FILENO, TIOCGWINSZ, &mut window);
-
-        if result == -1 {
-            window = zeroed();
-            result = ioctl(STDIN_FILENO, TIOCGWINSZ, &mut window);
-            if result == -1 {
-                window = zeroed();
-                result = ioctl(STDERR_FILENO, TIOCGWINSZ, &mut window);
-                if result == -1 {
-                    return zeroed();
-                }
-            }
-        }
-        window
-    }
-
-    /// Runs the ioctl command. Returns (0, 0) if the output is not to a terminal, or
-    /// there is an error. (0, 0) is an invalid size to have anyway, which is why
-    /// it can be used as a nil value.
-    unsafe fn get_dimensions_out() -> winsize {
-        let mut window: winsize = zeroed();
-        let result = ioctl(STDOUT_FILENO, TIOCGWINSZ, &mut window);
-
-        if result != -1 {
-            return window;
-        }
-        zeroed()
-    }
-
-    /// Runs the ioctl command. Returns (0, 0) if the input is not to a terminal, or
-    /// there is an error. (0, 0) is an invalid size to have anyway, which is why
-    /// it can be used as a nil value.
-    unsafe fn get_dimensions_in() -> winsize {
-        let mut window: winsize = zeroed();
-        let result = ioctl(STDIN_FILENO, TIOCGWINSZ, &mut window);
-
-        if result != -1 {
-            return window;
-        }
-        zeroed()
-    }
-
-    /// Runs the ioctl command. Returns (0, 0) if the error is not to a terminal, or
-    /// there is an error. (0, 0) is an invalid size to have anyway, which is why
-    /// it can be used as a nil value.
-    unsafe fn get_dimensions_err() -> winsize {
-        let mut window: winsize = zeroed();
-        let result = ioctl(STDERR_FILENO, TIOCGWINSZ, &mut window);
-
-        if result != -1 {
-            return window;
-        }
-        zeroed()
-    }
-
-    /// Query the current processes's output (`stdout`), input (`stdin`), and error (`stderr`) in
-    /// that order, in the attempt to dtermine terminal width. If one of those streams is actually
-    /// a tty, this function returns its width and height as a number of characters.
-    ///
-    /// If *all* of the streams are not ttys or return any errors this function will return `None`.
-    pub fn dimensions() -> Option<(usize, usize)> {
-        let w = unsafe { get_dimensions_any() };
-
-        if w.ws_col == 0 || w.ws_row == 0 {
-            None
-        } else {
-            Some((w.ws_col as usize, w.ws_row as usize))
-        }
-    }
-
-    /// Query the current processes's output (`stdout`) *only*, in the attempt to dtermine
-    /// terminal width. If that streams is actually a tty, this function returns its width
-    /// and height as a number of characters.
-    ///
-    /// If *all* of the streams are not ttys or return any errors this function will return `None`.
-    pub fn dimensions_stdout() -> Option<(usize, usize)> {
-        let w = unsafe { get_dimensions_out() };
-
-        if w.ws_col == 0 || w.ws_row == 0 {
-            None
-        } else {
-            Some((w.ws_col as usize, w.ws_row as usize))
-        }
-    }
-
-    /// Query the current processes's input (`stdin`) *only*, in the attempt to dtermine
-    /// terminal width. If that streams is actually a tty, this function returns its width
-    /// and height as a number of characters.
-    ///
-    /// If *all* of the streams are not ttys or return any errors this function will return `None`.
-    pub fn dimensions_stdin() -> Option<(usize, usize)> {
-        let w = unsafe { get_dimensions_in() };
-
-        if w.ws_col == 0 || w.ws_row == 0 {
-            None
-        } else {
-            Some((w.ws_col as usize, w.ws_row as usize))
-        }
-    }
-
-    /// Query the current processes's error output (`stderr`) *only*, in the attempt to dtermine
-    /// terminal width. If that streams is actually a tty, this function returns its width
-    /// and height as a number of characters.
-    ///
-    /// If *all* of the streams are not ttys or return any errors this function will return `None`.
-    pub fn dimensions_stderr() -> Option<(usize, usize)> {
-        let w = unsafe { get_dimensions_err() };
-
-        if w.ws_col == 0 || w.ws_row == 0 {
-            None
-        } else {
-            Some((w.ws_col as usize, w.ws_row as usize))
-        }
-    }
-}
-
-#[cfg(target_os = "windows")]
-mod platform {
-    use kernel32::{GetConsoleScreenBufferInfo, GetStdHandle};
-    use winapi::{CONSOLE_SCREEN_BUFFER_INFO, COORD, SMALL_RECT, STD_OUTPUT_HANDLE};
-
-    /// Query the current processes's output, returning its width and height as a
-    /// number of characters. Returns `None` if the output isn't to a terminal.
-    pub fn dimensions() -> Option<(usize, usize)> {
-        let null_coord = COORD { X: 0, Y: 0 };
-        let null_smallrect = SMALL_RECT {
-            Left: 0,
-            Top: 0,
-            Right: 0,
-            Bottom: 0,
-        };
-
-        let stdout_h = unsafe { GetStdHandle(STD_OUTPUT_HANDLE) };
-        let mut console_data = CONSOLE_SCREEN_BUFFER_INFO {
-            dwSize: null_coord,
-            dwCursorPosition: null_coord,
-            wAttributes: 0,
-            srWindow: null_smallrect,
-            dwMaximumWindowSize: null_coord,
-        };
-
-        if unsafe { GetConsoleScreenBufferInfo(stdout_h, &mut console_data) } != 0 {
-            Some(((console_data.srWindow.Right - console_data.srWindow.Left) as usize,
-                  (console_data.srWindow.Bottom - console_data.srWindow.Top) as usize))
-        } else {
-            None
-        }
-    }
-    /// Query the current processes's output, returning its width and height as a
-    /// number of characters. Returns `None` if the output isn't to a terminal.
-    pub fn dimensions_stdout() -> Option<(usize, usize)> { dimensions() }
-    /// This isn't implemented for Windows
-    pub fn dimensions_stdin() -> Option<(usize, usize)> { unimplemented!() }
-    /// This isn't implemented for Windows
-    pub fn dimensions_stderr() -> Option<(usize, usize)> { unimplemented!() }
-}
-
-// makes project compilable on unsupported platforms
-#[cfg(not(any(target_os = "linux",
-              target_os = "android",
-              target_os = "macos",
-              target_os = "ios",
-              target_os = "bitrig",
-              target_os = "dragonfly",
-              target_os = "freebsd",
-              target_os = "netbsd",
-              target_os = "openbsd",
-              target_os = "solaris",
-              target_os = "windows")))]
-mod platform {
-    pub fn dimensions() -> Option<(usize, usize)> { None }
-    pub fn dimensions_stdout() -> Option<(usize, usize)> { None }
-    pub fn dimensions_stdin() -> Option<(usize, usize)> { None }
-    pub fn dimensions_stderr() -> Option<(usize, usize)> { None }
-}
diff --git a/vendor/termize/.cargo-checksum.json b/vendor/termize/.cargo-checksum.json
new file mode 100644
index 0000000000..301f8ae9ba
--- /dev/null
+++ b/vendor/termize/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"CHANGELOG.md":"9809268178a89f40adabf0ccd6145fdb3742367c3c603b2047fe4cdff0262c62","CODE_OF_CONDUCT.md":"e3334b644bfab253193019119b34b833c8733b1ce32034372a00bfbb746ae355","CONTRIBUTING.md":"58454fb3db5a9df077ce7dea1b333b7f7327db33a57bcfd695d18c904b76281e","Cargo.toml":"4d32ede02b13a48756ef81ae21d3512838c16f07378fcf5b3ab6287b38f717f4","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"526045f49bd068c0f156a8cb406ac6470db580ce1605fecb9c35bc21e30fdaa8","README.md":"09de69ee4d93b2f9db71682133ae6161e408ed2cf066c8b8b0c62c55f3028950","src/lib.rs":"8950e7748f8594fd184e9deecea0e264c66857eb104426406e397da30a6bc6a0","src/platform/mod.rs":"0c113921402db5c12c99b34df7fe4dc8749630e465bc050f8da9c5803d441d32","src/platform/unix.rs":"ec957972c6f31a4a42dcc3380eb166109b10297f18225121451de8971d143d8e","src/platform/unsupported.rs":"1f151670229c96252fe3bb0a5b49f344e12b3e68b384aecb6ba93f5e07848a5c","src/platform/windows.rs":"5560353eeac04f5bc31850611ec89f15c146bcfa966582bd34cde98b5e4ce63c"},"package":"1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295"}
\ No newline at end of file
diff --git a/vendor/termize/CHANGELOG.md b/vendor/termize/CHANGELOG.md
new file mode 100644
index 0000000000..d80a2f1ee2
--- /dev/null
+++ b/vendor/termize/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changes
+
+## 0.1.1
+
+- Fix cargo metadata
+
+## 0.1.0
+
+Initial release.
diff --git a/vendor/termize/CODE_OF_CONDUCT.md b/vendor/termize/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..a9e4ad85d0
--- /dev/null
+++ b/vendor/termize/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at huyuumi.dev@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/vendor/termize/CONTRIBUTING.md b/vendor/termize/CONTRIBUTING.md
new file mode 100644
index 0000000000..188f263d8a
--- /dev/null
+++ b/vendor/termize/CONTRIBUTING.md
@@ -0,0 +1,22 @@
+# How to contribute
+
+Thanks for reading this! 
+
+## Bugs/Feature Requests/Questions
+
+You can submit bug reports, feature requests, and questions to
+[issue tracker](https://github.com/JohnTitor/termize).
+
+## Submitting changes
+
+You can submit patches as a pull request. The commit title should start with
+the base verb whose first letter is a capital letter.
+
+We follow no merge policy. You should resolve merge conflicts by rebase,
+not merge.
+
+## Coding conventions
+
+  * Use four spaces (not hard tabs) on Rust files(*.rs)
+  * Use two spaces (not hard tabs) on other files basically
+  * Run clippy and rustfmt before submitting pull requests if possible
diff --git a/vendor/termize/Cargo.toml b/vendor/termize/Cargo.toml
new file mode 100644
index 0000000000..d248f4db5e
--- /dev/null
+++ b/vendor/termize/Cargo.toml
@@ -0,0 +1,56 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+edition = "2018"
+name = "termize"
+version = "0.1.1"
+authors = ["Yuki Okushi <huyuumi.dev@gmail.com>"]
+exclude = [".github/*", ".travis.yml", ".cirrus.yml"]
+description = "functions for determining terminal sizes and dimensions"
+documentation = "https://docs.rs/termize"
+readme = "README.md"
+keywords = ["term", "terminal", "size", "width", "dimension"]
+categories = ["command-line-interface"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/JohnTitor/termize"
+[profile.dev]
+opt-level = 0
+lto = false
+codegen-units = 4
+debug = true
+debug-assertions = true
+rpath = false
+
+[profile.release]
+opt-level = 3
+lto = true
+debug = false
+debug-assertions = false
+rpath = false
+
+[profile.test]
+opt-level = 1
+lto = false
+codegen-units = 2
+debug = true
+debug-assertions = true
+rpath = false
+
+[dependencies]
+[target."cfg(unix)".dependencies.libc]
+version = "0.2.66"
+[target."cfg(windows)".dependencies.winapi]
+version = "0.3.8"
+features = ["handleapi", "processenv", "wincon", "winbase"]
+[badges.cirrus-ci]
+repository = "JohnTitor/termize"
diff --git a/vendor/term_size/LICENSE-APACHE b/vendor/termize/LICENSE-APACHE
similarity index 100%
rename from vendor/term_size/LICENSE-APACHE
rename to vendor/termize/LICENSE-APACHE
diff --git a/vendor/termize/LICENSE-MIT b/vendor/termize/LICENSE-MIT
new file mode 100644
index 0000000000..8a060d2171
--- /dev/null
+++ b/vendor/termize/LICENSE-MIT
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2019 Kevin B. Knapp
+Copyright (c) 2019 Yuki Okushi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/termize/README.md b/vendor/termize/README.md
new file mode 100644
index 0000000000..1c5ce32d36
--- /dev/null
+++ b/vendor/termize/README.md
@@ -0,0 +1,51 @@
+termize
+====
+
+[![Crates.io](https://img.shields.io/crates/v/termize.svg)](https://crates.io/crates/termize) [![Crates.io](https://img.shields.io/crates/d/termize.svg)](https://crates.io/crates/termize) [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/JohnTitor/termize/blob/master/LICENSE-MIT) [![license](http://img.shields.io/badge/license-Apache2.0-blue.svg)](https://github.com/JohnTitor/termize/blob/master/LICENSE-APACHE) [![Actions](https://github.com/JohnTitor/termize/workflows/CI/badge.svg)](https://github.com/JohnTitor/termize/workflows/CI) [![Cirrus CI](https://api.cirrus-ci.com/github/JohnTitor/termize.svg)](https://cirrus-ci.com/github/JohnTitor/termize)
+
+A Rust library to enable getting terminal sizes and dimensions
+
+**This is a fork repository, original is [here](https://github.com/clap-rs/term_size-rs).**
+
+MSRV (Minimum Supported Rust Version): 1.31.1
+
+[Documentation](https://docs.rs/termize)
+
+## Usage
+
+First, add the following to your `Cargo.toml`:
+
+```toml
+[dependencies]
+termize = "0.1"
+```
+
+To get the dimensions of your terminal window, simply use the following:
+
+```rust
+fn main() {
+    if let Some((w, h)) = termize::dimensions() {
+        println!("Width: {}\nHeight: {}", w, h);
+    } else {
+        println!("Unable to get term size :(");
+    }
+}
+```
+
+## License
+
+Copyright Benjamin Sago, Kevin Knapp, Yuki Okushi, and `term_size`/`termize` contributors.
+
+Licensed under either of
+
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option. Unless you explicitly state otherwise, any contribution intentionally
+submitted for inclusion in the work by you, as defined in the
+Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
+
+## Contributing
+
+Contributions are welcome! Here is our [CONTRIBUTING GUIDE](./CONTRIBUTING.md).
diff --git a/vendor/termize/src/lib.rs b/vendor/termize/src/lib.rs
new file mode 100644
index 0000000000..87be69413b
--- /dev/null
+++ b/vendor/termize/src/lib.rs
@@ -0,0 +1,34 @@
+//! System calls for getting the terminal size.
+//!
+//! Getting the terminal size is performed using an ioctl command that takes
+//! the file handle to the terminal -- which in this case, is stdout -- and
+//! populates a structure containing the values.
+//!
+//! The size is needed when the user wants the output formatted into columns:
+//! the default grid view, or the hybrid grid-details view.
+//!
+//! # Example
+//!
+//! To get the dimensions of your terminal window, simply use the following:
+//!
+//! ```no_run
+//! if let Some((w, h)) = termize::dimensions() {
+//!     println!("Width: {}\nHeight: {}", w, h);
+//! } else {
+//!     println!("Unable to get term size :(");
+//! }
+//! ```
+#![deny(
+    missing_docs,
+    missing_debug_implementations,
+    missing_copy_implementations,
+    trivial_casts,
+    unused_import_braces,
+    unused_allocation,
+    unused_qualifications,
+    trivial_numeric_casts
+)]
+
+// A facade to allow exposing functions depending on the platform
+mod platform;
+pub use crate::platform::{dimensions, dimensions_stderr, dimensions_stdin, dimensions_stdout};
diff --git a/vendor/termize/src/platform/mod.rs b/vendor/termize/src/platform/mod.rs
new file mode 100644
index 0000000000..c48d001e97
--- /dev/null
+++ b/vendor/termize/src/platform/mod.rs
@@ -0,0 +1,15 @@
+#[cfg(unix)]
+mod unix;
+#[cfg(unix)]
+pub use self::unix::{dimensions, dimensions_stderr, dimensions_stdin, dimensions_stdout};
+
+#[cfg(windows)]
+mod windows;
+#[cfg(windows)]
+pub use self::windows::{dimensions, dimensions_stderr, dimensions_stdin, dimensions_stdout};
+
+// makes project compilable on unsupported platforms
+#[cfg(not(any(unix, windows)))]
+mod unsupported;
+#[cfg(not(any(unix, windows)))]
+pub use self::unsupported::{dimensions, dimensions_stderr, dimensions_stdin, dimensions_stdout};
diff --git a/vendor/termize/src/platform/unix.rs b/vendor/termize/src/platform/unix.rs
new file mode 100644
index 0000000000..0420789b71
--- /dev/null
+++ b/vendor/termize/src/platform/unix.rs
@@ -0,0 +1,232 @@
+// Supress warnings for `TIOCGWINSZ.into()` since freebsd requires it.
+#![allow(clippy::identity_conversion)]
+
+use libc::{ioctl, winsize, STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO, TIOCGWINSZ};
+use std::mem::zeroed;
+
+/// Runs the ioctl command. Returns (0, 0) if all of the streams are not to a terminal, or
+/// there is an error. (0, 0) is an invalid size to have anyway, which is why
+/// it can be used as a nil value.
+unsafe fn get_dimensions_any() -> winsize {
+    let mut window: winsize = zeroed();
+    let mut result = ioctl(STDOUT_FILENO, TIOCGWINSZ.into(), &mut window);
+
+    if result == -1 {
+        window = zeroed();
+        result = ioctl(STDIN_FILENO, TIOCGWINSZ.into(), &mut window);
+        if result == -1 {
+            window = zeroed();
+            result = ioctl(STDERR_FILENO, TIOCGWINSZ.into(), &mut window);
+            if result == -1 {
+                return zeroed();
+            }
+        }
+    }
+    window
+}
+
+/// Runs the ioctl command. Returns (0, 0) if the output is not to a terminal, or
+/// there is an error. (0, 0) is an invalid size to have anyway, which is why
+/// it can be used as a nil value.
+unsafe fn get_dimensions_out() -> winsize {
+    let mut window: winsize = zeroed();
+    let result = ioctl(STDOUT_FILENO, TIOCGWINSZ.into(), &mut window);
+
+    if result != -1 {
+        return window;
+    }
+    zeroed()
+}
+
+/// Runs the ioctl command. Returns (0, 0) if the input is not to a terminal, or
+/// there is an error. (0, 0) is an invalid size to have anyway, which is why
+/// it can be used as a nil value.
+unsafe fn get_dimensions_in() -> winsize {
+    let mut window: winsize = zeroed();
+    let result = ioctl(STDIN_FILENO, TIOCGWINSZ.into(), &mut window);
+
+    if result != -1 {
+        return window;
+    }
+    zeroed()
+}
+
+/// Runs the ioctl command. Returns (0, 0) if the error is not to a terminal, or
+/// there is an error. (0, 0) is an invalid size to have anyway, which is why
+/// it can be used as a nil value.
+unsafe fn get_dimensions_err() -> winsize {
+    let mut window: winsize = zeroed();
+    let result = ioctl(STDERR_FILENO, TIOCGWINSZ.into(), &mut window);
+
+    if result != -1 {
+        return window;
+    }
+    zeroed()
+}
+
+/// Query the current processes's output (`stdout`), input (`stdin`), and error (`stderr`) in
+/// that order, in the attempt to determine terminal width. If one of those streams is actually
+/// a tty, this function returns its width and height as a number of characters.
+///
+/// # Errors
+///
+/// If *all* of the streams are not ttys or return any errors this function will return `None`.
+///
+/// # Example
+///
+/// To get the dimensions of your terminal window, simply use the following:
+///
+/// ```no_run
+/// if let Some((w, h)) = termize::dimensions() {
+///     println!("Width: {}\nHeight: {}", w, h);
+/// } else {
+///     println!("Unable to get term size :(");
+/// }
+/// ```
+pub fn dimensions() -> Option<(usize, usize)> {
+    let w = unsafe { get_dimensions_any() };
+
+    if w.ws_col == 0 || w.ws_row == 0 {
+        None
+    } else {
+        Some((w.ws_col as usize, w.ws_row as usize))
+    }
+}
+
+/// Query the current processes's output (`stdout`) *only*, in the attempt to determine
+/// terminal width. If that stream is actually a tty, this function returns its width
+/// and height as a number of characters.
+///
+/// # Errors
+///
+/// If the stream is not a tty or return any errors this function will return `None`.
+///
+/// # Example
+///
+/// To get the dimensions of your terminal window, simply use the following:
+///
+/// ```no_run
+/// if let Some((w, h)) = termize::dimensions_stdout() {
+///     println!("Width: {}\nHeight: {}", w, h);
+/// } else {
+///     println!("Unable to get term size :(");
+/// }
+/// ```
+pub fn dimensions_stdout() -> Option<(usize, usize)> {
+    let w = unsafe { get_dimensions_out() };
+
+    if w.ws_col == 0 || w.ws_row == 0 {
+        None
+    } else {
+        Some((w.ws_col as usize, w.ws_row as usize))
+    }
+}
+
+/// Query the current processes's input (`stdin`) *only*, in the attempt to determine
+/// terminal width. If that stream is actually a tty, this function returns its width
+/// and height as a number of characters.
+///
+/// # Errors
+///
+/// If the stream is not a tty or return any errors this function will return `None`.
+///
+/// # Example
+///
+/// To get the dimensions of your terminal window, simply use the following:
+///
+/// ```no_run
+/// if let Some((w, h)) = termize::dimensions_stdin() {
+///     println!("Width: {}\nHeight: {}", w, h);
+/// } else {
+///     println!("Unable to get term size :(");
+/// }
+/// ```
+pub fn dimensions_stdin() -> Option<(usize, usize)> {
+    let w = unsafe { get_dimensions_in() };
+
+    if w.ws_col == 0 || w.ws_row == 0 {
+        None
+    } else {
+        Some((w.ws_col as usize, w.ws_row as usize))
+    }
+}
+
+/// Query the current processes's error output (`stderr`) *only*, in the attempt to dtermine
+/// terminal width. If that stream is actually a tty, this function returns its width
+/// and height as a number of characters.
+///
+/// # Errors
+///
+/// If the stream is not a tty or return any errors this function will return `None`.
+///
+/// # Example
+///
+/// To get the dimensions of your terminal window, simply use the following:
+///
+/// ```no_run
+/// if let Some((w, h)) = termize::dimensions_stderr() {
+///     println!("Width: {}\nHeight: {}", w, h);
+/// } else {
+///     println!("Unable to get term size :(");
+/// }
+/// ```
+pub fn dimensions_stderr() -> Option<(usize, usize)> {
+    let w = unsafe { get_dimensions_err() };
+
+    if w.ws_col == 0 || w.ws_row == 0 {
+        None
+    } else {
+        Some((w.ws_col as usize, w.ws_row as usize))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::dimensions;
+    use std::process::{Command, Output, Stdio};
+
+    #[cfg(target_os = "macos")]
+    fn stty_size() -> Output {
+        Command::new("stty")
+            .arg("-f")
+            .arg("/dev/stderr")
+            .arg("size")
+            .stderr(Stdio::inherit())
+            .output()
+            .unwrap()
+    }
+
+    #[cfg(not(target_os = "macos"))]
+    fn stty_size() -> Output {
+        Command::new("stty")
+            .arg("-F")
+            .arg("/dev/stderr")
+            .arg("size")
+            .stderr(Stdio::inherit())
+            .output()
+            .expect("failed to run `stty_size()`")
+    }
+
+    #[test]
+    fn test_shell() {
+        let output = stty_size();
+        let stdout = String::from_utf8(output.stdout).expect("failed to turn into String");
+        let mut data = stdout.split_whitespace();
+        let rs = data
+            .next()
+            .unwrap_or("0")
+            .parse::<usize>()
+            .expect("failed to parse rows");
+        let cs = data
+            .next()
+            .unwrap_or("0")
+            .parse::<usize>()
+            .expect("failed to parse cols");
+        println!("stdout: {}", stdout);
+        println!("rows: {}\ncols: {}", rs, cs);
+        if let Some((w, h)) = dimensions() {
+            assert_eq!(rs, h);
+            assert_eq!(cs, w);
+        }
+    }
+}
diff --git a/vendor/termize/src/platform/unsupported.rs b/vendor/termize/src/platform/unsupported.rs
new file mode 100644
index 0000000000..a246eee58c
--- /dev/null
+++ b/vendor/termize/src/platform/unsupported.rs
@@ -0,0 +1,12 @@
+pub fn dimensions() -> Option<(usize, usize)> {
+    None
+}
+pub fn dimensions_stdout() -> Option<(usize, usize)> {
+    None
+}
+pub fn dimensions_stdin() -> Option<(usize, usize)> {
+    None
+}
+pub fn dimensions_stderr() -> Option<(usize, usize)> {
+    None
+}
diff --git a/vendor/termize/src/platform/windows.rs b/vendor/termize/src/platform/windows.rs
new file mode 100644
index 0000000000..6d9d0c1a20
--- /dev/null
+++ b/vendor/termize/src/platform/windows.rs
@@ -0,0 +1,107 @@
+use winapi::um::handleapi::INVALID_HANDLE_VALUE;
+use winapi::um::processenv::GetStdHandle;
+use winapi::um::winbase::STD_OUTPUT_HANDLE;
+use winapi::um::wincon::GetConsoleScreenBufferInfo;
+use winapi::um::wincon::{CONSOLE_SCREEN_BUFFER_INFO, COORD, SMALL_RECT};
+
+/// Query the current processes's output, returning its width and height as a
+/// number of characters.
+///
+/// # Errors
+///
+/// Returns `None` if the output isn't to a terminal.
+///
+/// # Example
+///
+/// To get the dimensions of your terminal window, simply use the following:
+///
+/// ```no_run
+/// if let Some((w, h)) = termize::dimensions() {
+///     println!("Width: {}\nHeight: {}", w, h);
+/// } else {
+///     println!("Unable to get term size :(");
+/// }
+/// ```
+pub fn dimensions() -> Option<(usize, usize)> {
+    let null_coord = COORD { X: 0, Y: 0 };
+    let null_smallrect = SMALL_RECT {
+        Left: 0,
+        Top: 0,
+        Right: 0,
+        Bottom: 0,
+    };
+
+    let stdout_h = unsafe { GetStdHandle(STD_OUTPUT_HANDLE) };
+    if stdout_h == INVALID_HANDLE_VALUE {
+        return None;
+    }
+
+    let mut console_data = CONSOLE_SCREEN_BUFFER_INFO {
+        dwSize: null_coord,
+        dwCursorPosition: null_coord,
+        wAttributes: 0,
+        srWindow: null_smallrect,
+        dwMaximumWindowSize: null_coord,
+    };
+
+    if unsafe { GetConsoleScreenBufferInfo(stdout_h, &mut console_data) } != 0 {
+        Some((
+            (console_data.srWindow.Right - console_data.srWindow.Left + 1) as usize,
+            (console_data.srWindow.Bottom - console_data.srWindow.Top + 1) as usize,
+        ))
+    } else {
+        None
+    }
+}
+
+/// Query the current processes's output, returning its width and height as a
+/// number of characters. Returns `None` if the output isn't to a terminal.
+///
+/// # Errors
+///
+/// Returns `None` if the output isn't to a terminal.
+///
+/// # Example
+///
+/// To get the dimensions of your terminal window, simply use the following:
+///
+/// ```no_run
+/// if let Some((w, h)) = termize::dimensions() {
+///     println!("Width: {}\nHeight: {}", w, h);
+/// } else {
+///     println!("Unable to get term size :(");
+/// }
+/// ```
+pub fn dimensions_stdout() -> Option<(usize, usize)> {
+    dimensions()
+}
+
+/// This isn't implemented for Windows
+///
+/// # Panics
+///
+/// This function `panic!`s unconditionally with the `unimplemented!`
+/// macro
+pub fn dimensions_stdin() -> Option<(usize, usize)> {
+    unimplemented!()
+}
+
+/// This isn't implemented for Windows
+///
+/// # Panics
+///
+/// This function `panic!`s unconditionally with the `unimplemented!`
+/// macro
+pub fn dimensions_stderr() -> Option<(usize, usize)> {
+    unimplemented!()
+}
+
+// Just check if function works well. `dimensions()` on no terminal always
+// returns `None` like CI so don't check with `is_some()`. Please test with
+// with `--nocapture` on local, to check terminal size.
+#[test]
+fn just_check_work() {
+    if let Some((w, h)) = dimensions() {
+        println!("width: {}\nheight: {}", w, h);
+    }
+}
diff --git a/vendor/thread_local-0.3.6/.cargo-checksum.json b/vendor/thread_local-0.3.6/.cargo-checksum.json
new file mode 100644
index 0000000000..8798696c8d
--- /dev/null
+++ b/vendor/thread_local-0.3.6/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"b4f81d513b95fff17f96d5da83768187870df83969fd5e49b030aaf6158ccd58","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"00a29378d5aeb66b7a48b77bee0d463c8b408b8a9cb0abb7674edb10d142aca0","benches/thread_local.rs":"cc8bde81ed6206525feff209598caf1e01e89a83bf21d8b7ccc0dadc8b89d815","src/lib.rs":"d7f875b0c4a8e2229f3510c88c0425342f1628fdf2f2b113c80789b6b90378b7","src/thread_id.rs":"0962c130061939557aa272115e4420fbbc63b6bd306783a456a8ffcbf304a447","src/unreachable.rs":"830d44988f86f4fc6c3c4dd7e9e4e7d0f2cb9c5b024c360b5f7ceae365983367"},"package":"c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"}
\ No newline at end of file
diff --git a/vendor/thread_local-0.3.6/Cargo.toml b/vendor/thread_local-0.3.6/Cargo.toml
new file mode 100644
index 0000000000..fc7b3c82dd
--- /dev/null
+++ b/vendor/thread_local-0.3.6/Cargo.toml
@@ -0,0 +1,26 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "thread_local"
+version = "0.3.6"
+authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
+description = "Per-object thread-local storage"
+documentation = "https://amanieu.github.io/thread_local-rs/thread_local/index.html"
+readme = "README.md"
+keywords = ["thread_local", "concurrent", "thread"]
+license = "Apache-2.0/MIT"
+repository = "https://github.com/Amanieu/thread_local-rs"
+[dependencies.lazy_static]
+version = "1.0"
+[badges.travis-ci]
+repository = "Amanieu/thread_local-rs"
diff --git a/vendor/version_check-0.1.5/LICENSE-APACHE b/vendor/thread_local-0.3.6/LICENSE-APACHE
similarity index 100%
rename from vendor/version_check-0.1.5/LICENSE-APACHE
rename to vendor/thread_local-0.3.6/LICENSE-APACHE
diff --git a/vendor/thread_local-0.3.6/LICENSE-MIT b/vendor/thread_local-0.3.6/LICENSE-MIT
new file mode 100644
index 0000000000..40b8817a47
--- /dev/null
+++ b/vendor/thread_local-0.3.6/LICENSE-MIT
@@ -0,0 +1,25 @@
+Copyright (c) 2016 The Rust Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/vendor/thread_local-0.3.6/README.md b/vendor/thread_local-0.3.6/README.md
new file mode 100644
index 0000000000..1472ed1c61
--- /dev/null
+++ b/vendor/thread_local-0.3.6/README.md
@@ -0,0 +1,41 @@
+thread_local
+============
+
+[![Build Status](https://travis-ci.org/Amanieu/thread_local-rs.svg?branch=master)](https://travis-ci.org/Amanieu/thread_local-rs) [![Crates.io](https://img.shields.io/crates/v/thread_local.svg)](https://crates.io/crates/thread_local)
+
+This library provides the `ThreadLocal` and `CachedThreadLocal` types which
+allow a separate copy of an object to be used for each thread. This allows for
+per-object thread-local storage, unlike the standard library's `thread_local!`
+macro which only allows static thread-local storage.
+
+[Documentation](https://amanieu.github.io/thread_local-rs/thread_local/index.html)
+
+## Usage
+
+Add this to your `Cargo.toml`:
+
+```toml
+[dependencies]
+thread_local = "0.3"
+```
+
+and this to your crate root:
+
+```rust
+extern crate thread_local;
+```
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
diff --git a/vendor/thread_local-0.3.6/benches/thread_local.rs b/vendor/thread_local-0.3.6/benches/thread_local.rs
new file mode 100644
index 0000000000..4cfaacdc4b
--- /dev/null
+++ b/vendor/thread_local-0.3.6/benches/thread_local.rs
@@ -0,0 +1,18 @@
+#![feature(test)]
+
+extern crate thread_local;
+extern crate test;
+
+use thread_local::{ThreadLocal, CachedThreadLocal};
+
+#[bench]
+fn thread_local(b: &mut test::Bencher) {
+    let local = ThreadLocal::new();
+    b.iter(|| { let _: &i32 = local.get_or(|| Box::new(0)); });
+}
+
+#[bench]
+fn cached_thread_local(b: &mut test::Bencher) {
+    let local = CachedThreadLocal::new();
+    b.iter(|| { let _: &i32 = local.get_or(|| Box::new(0)); });
+}
diff --git a/vendor/thread_local-0.3.6/src/lib.rs b/vendor/thread_local-0.3.6/src/lib.rs
new file mode 100644
index 0000000000..2f8e579b59
--- /dev/null
+++ b/vendor/thread_local-0.3.6/src/lib.rs
@@ -0,0 +1,757 @@
+// Copyright 2017 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! Per-object thread-local storage
+//!
+//! This library provides the `ThreadLocal` type which allows a separate copy of
+//! an object to be used for each thread. This allows for per-object
+//! thread-local storage, unlike the standard library's `thread_local!` macro
+//! which only allows static thread-local storage.
+//!
+//! Per-thread objects are not destroyed when a thread exits. Instead, objects
+//! are only destroyed when the `ThreadLocal` containing them is destroyed.
+//!
+//! You can also iterate over the thread-local values of all thread in a
+//! `ThreadLocal` object using the `iter_mut` and `into_iter` methods. This can
+//! only be done if you have mutable access to the `ThreadLocal` object, which
+//! guarantees that you are the only thread currently accessing it.
+//!
+//! A `CachedThreadLocal` type is also provided which wraps a `ThreadLocal` but
+//! also uses a special fast path for the first thread that writes into it. The
+//! fast path has very low overhead (<1ns per access) while keeping the same
+//! performance as `ThreadLocal` for other threads.
+//!
+//! Note that since thread IDs are recycled when a thread exits, it is possible
+//! for one thread to retrieve the object of another thread. Since this can only
+//! occur after a thread has exited this does not lead to any race conditions.
+//!
+//! # Examples
+//!
+//! Basic usage of `ThreadLocal`:
+//!
+//! ```rust
+//! use thread_local::ThreadLocal;
+//! let tls: ThreadLocal<u32> = ThreadLocal::new();
+//! assert_eq!(tls.get(), None);
+//! assert_eq!(tls.get_or(|| Box::new(5)), &5);
+//! assert_eq!(tls.get(), Some(&5));
+//! ```
+//!
+//! Combining thread-local values into a single result:
+//!
+//! ```rust
+//! use thread_local::ThreadLocal;
+//! use std::sync::Arc;
+//! use std::cell::Cell;
+//! use std::thread;
+//!
+//! let tls = Arc::new(ThreadLocal::new());
+//!
+//! // Create a bunch of threads to do stuff
+//! for _ in 0..5 {
+//!     let tls2 = tls.clone();
+//!     thread::spawn(move || {
+//!         // Increment a counter to count some event...
+//!         let cell = tls2.get_or(|| Box::new(Cell::new(0)));
+//!         cell.set(cell.get() + 1);
+//!     }).join().unwrap();
+//! }
+//!
+//! // Once all threads are done, collect the counter values and return the
+//! // sum of all thread-local counter values.
+//! let tls = Arc::try_unwrap(tls).unwrap();
+//! let total = tls.into_iter().fold(0, |x, y| x + y.get());
+//! assert_eq!(total, 5);
+//! ```
+
+#![warn(missing_docs)]
+
+#[macro_use]
+extern crate lazy_static;
+
+mod thread_id;
+mod unreachable;
+
+use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
+use std::sync::Mutex;
+use std::marker::PhantomData;
+use std::cell::UnsafeCell;
+use std::fmt;
+use std::iter::Chain;
+use std::option::IntoIter as OptionIter;
+use std::panic::UnwindSafe;
+use unreachable::{UncheckedOptionExt, UncheckedResultExt};
+
+/// Thread-local variable wrapper
+///
+/// See the [module-level documentation](index.html) for more.
+pub struct ThreadLocal<T: ?Sized + Send> {
+    // Pointer to the current top-level hash table
+    table: AtomicPtr<Table<T>>,
+
+    // Lock used to guard against concurrent modifications. This is only taken
+    // while writing to the table, not when reading from it. This also guards
+    // the counter for the total number of values in the hash table.
+    lock: Mutex<usize>,
+
+    // PhantomData to indicate that we logically own T
+    marker: PhantomData<T>,
+}
+
+struct Table<T: ?Sized + Send> {
+    // Hash entries for the table
+    entries: Box<[TableEntry<T>]>,
+
+    // Number of bits used for the hash function
+    hash_bits: usize,
+
+    // Previous table, half the size of the current one
+    prev: Option<Box<Table<T>>>,
+}
+
+struct TableEntry<T: ?Sized + Send> {
+    // Current owner of this entry, or 0 if this is an empty entry
+    owner: AtomicUsize,
+
+    // The object associated with this entry. This is only ever accessed by the
+    // owner of the entry.
+    data: UnsafeCell<Option<Box<T>>>,
+}
+
+// ThreadLocal is always Sync, even if T isn't
+unsafe impl<T: ?Sized + Send> Sync for ThreadLocal<T> {}
+
+impl<T: ?Sized + Send> Default for ThreadLocal<T> {
+    fn default() -> ThreadLocal<T> {
+        ThreadLocal::new()
+    }
+}
+
+impl<T: ?Sized + Send> Drop for ThreadLocal<T> {
+    fn drop(&mut self) {
+        unsafe {
+            Box::from_raw(self.table.load(Ordering::Relaxed));
+        }
+    }
+}
+
+// Implementation of Clone for TableEntry, needed to make vec![] work
+impl<T: ?Sized + Send> Clone for TableEntry<T> {
+    fn clone(&self) -> TableEntry<T> {
+        TableEntry {
+            owner: AtomicUsize::new(0),
+            data: UnsafeCell::new(None),
+        }
+    }
+}
+
+// Hash function for the thread id
+#[cfg(target_pointer_width = "32")]
+#[inline]
+fn hash(id: usize, bits: usize) -> usize {
+    id.wrapping_mul(0x9E3779B9) >> (32 - bits)
+}
+#[cfg(target_pointer_width = "64")]
+#[inline]
+fn hash(id: usize, bits: usize) -> usize {
+    id.wrapping_mul(0x9E37_79B9_7F4A_7C15) >> (64 - bits)
+}
+
+impl<T: ?Sized + Send> ThreadLocal<T> {
+    /// Creates a new empty `ThreadLocal`.
+    pub fn new() -> ThreadLocal<T> {
+        let entry = TableEntry {
+            owner: AtomicUsize::new(0),
+            data: UnsafeCell::new(None),
+        };
+        let table = Table {
+            entries: vec![entry; 2].into_boxed_slice(),
+            hash_bits: 1,
+            prev: None,
+        };
+        ThreadLocal {
+            table: AtomicPtr::new(Box::into_raw(Box::new(table))),
+            lock: Mutex::new(0),
+            marker: PhantomData,
+        }
+    }
+
+    /// Returns the element for the current thread, if it exists.
+    pub fn get(&self) -> Option<&T> {
+        let id = thread_id::get();
+        self.get_fast(id)
+    }
+
+    /// Returns the element for the current thread, or creates it if it doesn't
+    /// exist.
+    pub fn get_or<F>(&self, create: F) -> &T
+    where
+        F: FnOnce() -> Box<T>,
+    {
+        unsafe {
+            self.get_or_try(|| Ok::<Box<T>, ()>(create()))
+                .unchecked_unwrap_ok()
+        }
+    }
+
+    /// Returns the element for the current thread, or creates it if it doesn't
+    /// exist. If `create` fails, that error is returned and no element is
+    /// added.
+    pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
+    where
+        F: FnOnce() -> Result<Box<T>, E>,
+    {
+        let id = thread_id::get();
+        match self.get_fast(id) {
+            Some(x) => Ok(x),
+            None => Ok(self.insert(id, try!(create()), true)),
+        }
+    }
+
+    // Simple hash table lookup function
+    fn lookup(id: usize, table: &Table<T>) -> Option<&UnsafeCell<Option<Box<T>>>> {
+        // Because we use a Mutex to prevent concurrent modifications (but not
+        // reads) of the hash table, we can avoid any memory barriers here. No
+        // elements between our hash bucket and our value can have been modified
+        // since we inserted our thread-local value into the table.
+        for entry in table.entries.iter().cycle().skip(hash(id, table.hash_bits)) {
+            let owner = entry.owner.load(Ordering::Relaxed);
+            if owner == id {
+                return Some(&entry.data);
+            }
+            if owner == 0 {
+                return None;
+            }
+        }
+        unreachable!();
+    }
+
+    // Fast path: try to find our thread in the top-level hash table
+    fn get_fast(&self, id: usize) -> Option<&T> {
+        let table = unsafe { &*self.table.load(Ordering::Relaxed) };
+        match Self::lookup(id, table) {
+            Some(x) => unsafe { Some((*x.get()).as_ref().unchecked_unwrap()) },
+            None => self.get_slow(id, table),
+        }
+    }
+
+    // Slow path: try to find our thread in the other hash tables, and then
+    // move it to the top-level hash table.
+    #[cold]
+    fn get_slow(&self, id: usize, table_top: &Table<T>) -> Option<&T> {
+        let mut current = &table_top.prev;
+        while let Some(ref table) = *current {
+            if let Some(x) = Self::lookup(id, table) {
+                let data = unsafe { (*x.get()).take().unchecked_unwrap() };
+                return Some(self.insert(id, data, false));
+            }
+            current = &table.prev;
+        }
+        None
+    }
+
+    #[cold]
+    fn insert(&self, id: usize, data: Box<T>, new: bool) -> &T {
+        // Lock the Mutex to ensure only a single thread is modify the hash
+        // table at once.
+        let mut count = self.lock.lock().unwrap();
+        if new {
+            *count += 1;
+        }
+        let table_raw = self.table.load(Ordering::Relaxed);
+        let table = unsafe { &*table_raw };
+
+        // If the current top-level hash table is more than 75% full, add a new
+        // level with 2x the capacity. Elements will be moved up to the new top
+        // level table as they are accessed.
+        let table = if *count > table.entries.len() * 3 / 4 {
+            let entry = TableEntry {
+                owner: AtomicUsize::new(0),
+                data: UnsafeCell::new(None),
+            };
+            let new_table = Box::into_raw(Box::new(Table {
+                entries: vec![entry; table.entries.len() * 2].into_boxed_slice(),
+                hash_bits: table.hash_bits + 1,
+                prev: unsafe { Some(Box::from_raw(table_raw)) },
+            }));
+            self.table.store(new_table, Ordering::Release);
+            unsafe { &*new_table }
+        } else {
+            table
+        };
+
+        // Insert the new element into the top-level hash table
+        for entry in table.entries.iter().cycle().skip(hash(id, table.hash_bits)) {
+            let owner = entry.owner.load(Ordering::Relaxed);
+            if owner == 0 {
+                unsafe {
+                    entry.owner.store(id, Ordering::Relaxed);
+                    *entry.data.get() = Some(data);
+                    return (*entry.data.get()).as_ref().unchecked_unwrap();
+                }
+            }
+            if owner == id {
+                // This can happen if create() inserted a value into this
+                // ThreadLocal between our calls to get_fast() and insert(). We
+                // just return the existing value and drop the newly-allocated
+                // Box.
+                unsafe {
+                    return (*entry.data.get()).as_ref().unchecked_unwrap();
+                }
+            }
+        }
+        unreachable!();
+    }
+
+    /// Returns a mutable iterator over the local values of all threads.
+    ///
+    /// Since this call borrows the `ThreadLocal` mutably, this operation can
+    /// be done safely---the mutable borrow statically guarantees no other
+    /// threads are currently accessing their associated values.
+    pub fn iter_mut(&mut self) -> IterMut<T> {
+        let raw = RawIter {
+            remaining: *self.lock.lock().unwrap(),
+            index: 0,
+            table: self.table.load(Ordering::Relaxed),
+        };
+        IterMut {
+            raw: raw,
+            marker: PhantomData,
+        }
+    }
+
+    /// Removes all thread-specific values from the `ThreadLocal`, effectively
+    /// reseting it to its original state.
+    ///
+    /// Since this call borrows the `ThreadLocal` mutably, this operation can
+    /// be done safely---the mutable borrow statically guarantees no other
+    /// threads are currently accessing their associated values.
+    pub fn clear(&mut self) {
+        *self = ThreadLocal::new();
+    }
+}
+
+impl<T: ?Sized + Send> IntoIterator for ThreadLocal<T> {
+    type Item = Box<T>;
+    type IntoIter = IntoIter<T>;
+
+    fn into_iter(self) -> IntoIter<T> {
+        let raw = RawIter {
+            remaining: *self.lock.lock().unwrap(),
+            index: 0,
+            table: self.table.load(Ordering::Relaxed),
+        };
+        IntoIter {
+            raw: raw,
+            _thread_local: self,
+        }
+    }
+}
+
+impl<'a, T: ?Sized + Send + 'a> IntoIterator for &'a mut ThreadLocal<T> {
+    type Item = &'a mut Box<T>;
+    type IntoIter = IterMut<'a, T>;
+
+    fn into_iter(self) -> IterMut<'a, T> {
+        self.iter_mut()
+    }
+}
+
+impl<T: Send + Default> ThreadLocal<T> {
+    /// Returns the element for the current thread, or creates a default one if
+    /// it doesn't exist.
+    pub fn get_default(&self) -> &T {
+        self.get_or(|| Box::new(T::default()))
+    }
+}
+
+impl<T: ?Sized + Send + fmt::Debug> fmt::Debug for ThreadLocal<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
+    }
+}
+
+impl<T: ?Sized + Send + UnwindSafe> UnwindSafe for ThreadLocal<T> {}
+
+struct RawIter<T: ?Sized + Send> {
+    remaining: usize,
+    index: usize,
+    table: *const Table<T>,
+}
+
+impl<T: ?Sized + Send> RawIter<T> {
+    fn next(&mut self) -> Option<*mut Option<Box<T>>> {
+        if self.remaining == 0 {
+            return None;
+        }
+
+        loop {
+            let entries = unsafe { &(*self.table).entries[..] };
+            while self.index < entries.len() {
+                let val = entries[self.index].data.get();
+                self.index += 1;
+                if unsafe { (*val).is_some() } {
+                    self.remaining -= 1;
+                    return Some(val);
+                }
+            }
+            self.index = 0;
+            self.table = unsafe { &**(*self.table).prev.as_ref().unchecked_unwrap() };
+        }
+    }
+}
+
+/// Mutable iterator over the contents of a `ThreadLocal`.
+pub struct IterMut<'a, T: ?Sized + Send + 'a> {
+    raw: RawIter<T>,
+    marker: PhantomData<&'a mut ThreadLocal<T>>,
+}
+
+impl<'a, T: ?Sized + Send + 'a> Iterator for IterMut<'a, T> {
+    type Item = &'a mut Box<T>;
+
+    fn next(&mut self) -> Option<&'a mut Box<T>> {
+        self.raw.next().map(|x| unsafe {
+            (*x).as_mut().unchecked_unwrap()
+        })
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.raw.remaining, Some(self.raw.remaining))
+    }
+}
+
+impl<'a, T: ?Sized + Send + 'a> ExactSizeIterator for IterMut<'a, T> {}
+
+/// An iterator that moves out of a `ThreadLocal`.
+pub struct IntoIter<T: ?Sized + Send> {
+    raw: RawIter<T>,
+    _thread_local: ThreadLocal<T>,
+}
+
+impl<T: ?Sized + Send> Iterator for IntoIter<T> {
+    type Item = Box<T>;
+
+    fn next(&mut self) -> Option<Box<T>> {
+        self.raw.next().map(
+            |x| unsafe { (*x).take().unchecked_unwrap() },
+        )
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.raw.remaining, Some(self.raw.remaining))
+    }
+}
+
+impl<T: ?Sized + Send> ExactSizeIterator for IntoIter<T> {}
+
+/// Wrapper around `ThreadLocal` which adds a fast path for a single thread.
+///
+/// This has the same API as `ThreadLocal`, but will register the first thread
+/// that sets a value as its owner. All accesses by the owner will go through
+/// a special fast path which is much faster than the normal `ThreadLocal` path.
+pub struct CachedThreadLocal<T: ?Sized + Send> {
+    owner: AtomicUsize,
+    local: UnsafeCell<Option<Box<T>>>,
+    global: ThreadLocal<T>,
+}
+
+// CachedThreadLocal is always Sync, even if T isn't
+unsafe impl<T: ?Sized + Send> Sync for CachedThreadLocal<T> {}
+
+impl<T: ?Sized + Send> Default for CachedThreadLocal<T> {
+    fn default() -> CachedThreadLocal<T> {
+        CachedThreadLocal::new()
+    }
+}
+
+impl<T: ?Sized + Send> CachedThreadLocal<T> {
+    /// Creates a new empty `CachedThreadLocal`.
+    pub fn new() -> CachedThreadLocal<T> {
+        CachedThreadLocal {
+            owner: AtomicUsize::new(0),
+            local: UnsafeCell::new(None),
+            global: ThreadLocal::new(),
+        }
+    }
+
+    /// Returns the element for the current thread, if it exists.
+    pub fn get(&self) -> Option<&T> {
+        let id = thread_id::get();
+        let owner = self.owner.load(Ordering::Relaxed);
+        if owner == id {
+            return unsafe { Some((*self.local.get()).as_ref().unchecked_unwrap()) };
+        }
+        if owner == 0 {
+            return None;
+        }
+        self.global.get_fast(id)
+    }
+
+    /// Returns the element for the current thread, or creates it if it doesn't
+    /// exist.
+    #[inline(always)]
+    pub fn get_or<F>(&self, create: F) -> &T
+    where
+        F: FnOnce() -> Box<T>,
+    {
+        unsafe {
+            self.get_or_try(|| Ok::<Box<T>, ()>(create()))
+                .unchecked_unwrap_ok()
+        }
+    }
+
+    /// Returns the element for the current thread, or creates it if it doesn't
+    /// exist. If `create` fails, that error is returned and no element is
+    /// added.
+    pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
+    where
+        F: FnOnce() -> Result<Box<T>, E>,
+    {
+        let id = thread_id::get();
+        let owner = self.owner.load(Ordering::Relaxed);
+        if owner == id {
+            return Ok(unsafe { (*self.local.get()).as_ref().unchecked_unwrap() });
+        }
+        self.get_or_try_slow(id, owner, create)
+    }
+
+    #[cold]
+    #[inline(never)]
+    fn get_or_try_slow<F, E>(&self, id: usize, owner: usize, create: F) -> Result<&T, E>
+    where
+        F: FnOnce() -> Result<Box<T>, E>,
+    {
+        if owner == 0 && self.owner.compare_and_swap(0, id, Ordering::Relaxed) == 0 {
+            unsafe {
+                (*self.local.get()) = Some(try!(create()));
+                return Ok((*self.local.get()).as_ref().unchecked_unwrap());
+            }
+        }
+        match self.global.get_fast(id) {
+            Some(x) => Ok(x),
+            None => Ok(self.global.insert(id, try!(create()), true)),
+        }
+    }
+
+    /// Returns a mutable iterator over the local values of all threads.
+    ///
+    /// Since this call borrows the `ThreadLocal` mutably, this operation can
+    /// be done safely---the mutable borrow statically guarantees no other
+    /// threads are currently accessing their associated values.
+    pub fn iter_mut(&mut self) -> CachedIterMut<T> {
+        unsafe {
+            (*self.local.get()).as_mut().into_iter().chain(
+                self.global
+                    .iter_mut(),
+            )
+        }
+    }
+
+    /// Removes all thread-specific values from the `ThreadLocal`, effectively
+    /// reseting it to its original state.
+    ///
+    /// Since this call borrows the `ThreadLocal` mutably, this operation can
+    /// be done safely---the mutable borrow statically guarantees no other
+    /// threads are currently accessing their associated values.
+    pub fn clear(&mut self) {
+        *self = CachedThreadLocal::new();
+    }
+}
+
+impl<T: ?Sized + Send> IntoIterator for CachedThreadLocal<T> {
+    type Item = Box<T>;
+    type IntoIter = CachedIntoIter<T>;
+
+    fn into_iter(self) -> CachedIntoIter<T> {
+        unsafe {
+            (*self.local.get()).take().into_iter().chain(
+                self.global
+                    .into_iter(),
+            )
+        }
+    }
+}
+
+impl<'a, T: ?Sized + Send + 'a> IntoIterator for &'a mut CachedThreadLocal<T> {
+    type Item = &'a mut Box<T>;
+    type IntoIter = CachedIterMut<'a, T>;
+
+    fn into_iter(self) -> CachedIterMut<'a, T> {
+        self.iter_mut()
+    }
+}
+
+impl<T: Send + Default> CachedThreadLocal<T> {
+    /// Returns the element for the current thread, or creates a default one if
+    /// it doesn't exist.
+    pub fn get_default(&self) -> &T {
+        self.get_or(|| Box::new(T::default()))
+    }
+}
+
+impl<T: ?Sized + Send + fmt::Debug> fmt::Debug for CachedThreadLocal<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
+    }
+}
+
+/// Mutable iterator over the contents of a `CachedThreadLocal`.
+pub type CachedIterMut<'a, T> = Chain<OptionIter<&'a mut Box<T>>, IterMut<'a, T>>;
+
+/// An iterator that moves out of a `CachedThreadLocal`.
+pub type CachedIntoIter<T> = Chain<OptionIter<Box<T>>, IntoIter<T>>;
+
+impl<T: ?Sized + Send + UnwindSafe> UnwindSafe for CachedThreadLocal<T> {}
+
+#[cfg(test)]
+mod tests {
+    use std::cell::RefCell;
+    use std::sync::Arc;
+    use std::sync::atomic::AtomicUsize;
+    use std::sync::atomic::Ordering::Relaxed;
+    use std::thread;
+    use super::{ThreadLocal, CachedThreadLocal};
+
+    fn make_create() -> Arc<Fn() -> Box<usize> + Send + Sync> {
+        let count = AtomicUsize::new(0);
+        Arc::new(move || Box::new(count.fetch_add(1, Relaxed)))
+    }
+
+    #[test]
+    fn same_thread() {
+        let create = make_create();
+        let mut tls = ThreadLocal::new();
+        assert_eq!(None, tls.get());
+        assert_eq!("ThreadLocal { local_data: None }", format!("{:?}", &tls));
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!("ThreadLocal { local_data: Some(0) }", format!("{:?}", &tls));
+        tls.clear();
+        assert_eq!(None, tls.get());
+    }
+
+    #[test]
+    fn same_thread_cached() {
+        let create = make_create();
+        let mut tls = CachedThreadLocal::new();
+        assert_eq!(None, tls.get());
+        assert_eq!("ThreadLocal { local_data: None }", format!("{:?}", &tls));
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!("ThreadLocal { local_data: Some(0) }", format!("{:?}", &tls));
+        tls.clear();
+        assert_eq!(None, tls.get());
+    }
+
+    #[test]
+    fn different_thread() {
+        let create = make_create();
+        let tls = Arc::new(ThreadLocal::new());
+        assert_eq!(None, tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+
+        let tls2 = tls.clone();
+        let create2 = create.clone();
+        thread::spawn(move || {
+            assert_eq!(None, tls2.get());
+            assert_eq!(1, *tls2.get_or(|| create2()));
+            assert_eq!(Some(&1), tls2.get());
+        }).join()
+            .unwrap();
+
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+    }
+
+    #[test]
+    fn different_thread_cached() {
+        let create = make_create();
+        let tls = Arc::new(CachedThreadLocal::new());
+        assert_eq!(None, tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+        assert_eq!(Some(&0), tls.get());
+
+        let tls2 = tls.clone();
+        let create2 = create.clone();
+        thread::spawn(move || {
+            assert_eq!(None, tls2.get());
+            assert_eq!(1, *tls2.get_or(|| create2()));
+            assert_eq!(Some(&1), tls2.get());
+        }).join()
+            .unwrap();
+
+        assert_eq!(Some(&0), tls.get());
+        assert_eq!(0, *tls.get_or(|| create()));
+    }
+
+    #[test]
+    fn iter() {
+        let tls = Arc::new(ThreadLocal::new());
+        tls.get_or(|| Box::new(1));
+
+        let tls2 = tls.clone();
+        thread::spawn(move || {
+            tls2.get_or(|| Box::new(2));
+            let tls3 = tls2.clone();
+            thread::spawn(move || { tls3.get_or(|| Box::new(3)); })
+                .join()
+                .unwrap();
+        }).join()
+            .unwrap();
+
+        let mut tls = Arc::try_unwrap(tls).unwrap();
+        let mut v = tls.iter_mut().map(|x| **x).collect::<Vec<i32>>();
+        v.sort();
+        assert_eq!(vec![1, 2, 3], v);
+        let mut v = tls.into_iter().map(|x| *x).collect::<Vec<i32>>();
+        v.sort();
+        assert_eq!(vec![1, 2, 3], v);
+    }
+
+    #[test]
+    fn iter_cached() {
+        let tls = Arc::new(CachedThreadLocal::new());
+        tls.get_or(|| Box::new(1));
+
+        let tls2 = tls.clone();
+        thread::spawn(move || {
+            tls2.get_or(|| Box::new(2));
+            let tls3 = tls2.clone();
+            thread::spawn(move || { tls3.get_or(|| Box::new(3)); })
+                .join()
+                .unwrap();
+        }).join()
+            .unwrap();
+
+        let mut tls = Arc::try_unwrap(tls).unwrap();
+        let mut v = tls.iter_mut().map(|x| **x).collect::<Vec<i32>>();
+        v.sort();
+        assert_eq!(vec![1, 2, 3], v);
+        let mut v = tls.into_iter().map(|x| *x).collect::<Vec<i32>>();
+        v.sort();
+        assert_eq!(vec![1, 2, 3], v);
+    }
+
+    #[test]
+    fn is_sync() {
+        fn foo<T: Sync>() {}
+        foo::<ThreadLocal<String>>();
+        foo::<ThreadLocal<RefCell<String>>>();
+        foo::<CachedThreadLocal<String>>();
+        foo::<CachedThreadLocal<RefCell<String>>>();
+    }
+}
diff --git a/vendor/thread_local-0.3.6/src/thread_id.rs b/vendor/thread_local-0.3.6/src/thread_id.rs
new file mode 100644
index 0000000000..e7579483a4
--- /dev/null
+++ b/vendor/thread_local-0.3.6/src/thread_id.rs
@@ -0,0 +1,61 @@
+// Copyright 2017 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+use std::collections::BinaryHeap;
+use std::sync::Mutex;
+use std::usize;
+
+// Thread ID manager which allocates thread IDs. It attempts to aggressively
+// reuse thread IDs where possible to avoid cases where a ThreadLocal grows
+// indefinitely when it is used by many short-lived threads.
+struct ThreadIdManager {
+    limit: usize,
+    free_list: BinaryHeap<usize>,
+}
+impl ThreadIdManager {
+    fn new() -> ThreadIdManager {
+        ThreadIdManager {
+            limit: usize::MAX,
+            free_list: BinaryHeap::new(),
+        }
+    }
+    fn alloc(&mut self) -> usize {
+        if let Some(id) = self.free_list.pop() {
+            id
+        } else {
+            let id = self.limit;
+            self.limit = self.limit.checked_sub(1).expect("Ran out of thread IDs");
+            id
+        }
+    }
+    fn free(&mut self, id: usize) {
+        self.free_list.push(id);
+    }
+}
+lazy_static! {
+    static ref THREAD_ID_MANAGER: Mutex<ThreadIdManager> = Mutex::new(ThreadIdManager::new());
+}
+
+// Non-zero integer which is unique to the current thread while it is running.
+// A thread ID may be reused after a thread exits.
+struct ThreadId(usize);
+impl ThreadId {
+    fn new() -> ThreadId {
+        ThreadId(THREAD_ID_MANAGER.lock().unwrap().alloc())
+    }
+}
+impl Drop for ThreadId {
+    fn drop(&mut self) {
+        THREAD_ID_MANAGER.lock().unwrap().free(self.0);
+    }
+}
+thread_local!(static THREAD_ID: ThreadId = ThreadId::new());
+
+/// Returns a non-zero ID for the current thread
+pub fn get() -> usize {
+    THREAD_ID.with(|x| x.0)
+}
diff --git a/vendor/thread_local-0.3.6/src/unreachable.rs b/vendor/thread_local-0.3.6/src/unreachable.rs
new file mode 100644
index 0000000000..baff76600c
--- /dev/null
+++ b/vendor/thread_local-0.3.6/src/unreachable.rs
@@ -0,0 +1,74 @@
+// Copyright 2017 Amanieu d'Antras
+//
+// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
+// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
+// http://opensource.org/licenses/MIT>, at your option. This file may not be
+// copied, modified, or distributed except according to those terms.
+
+//! # unreachable
+//! inlined from https://github.com/reem/rust-unreachable/
+//!
+//! An unreachable code optimization hint in stable rust, and some useful
+//! extension traits for `Option` and `Result`.
+//!
+
+/// Hint to the optimizer that any code path which calls this function is
+/// statically unreachable and can be removed.
+///
+/// Calling this function in reachable code invokes undefined behavior. Be
+/// very, very sure this is what you want; often, a simple `panic!` is more
+/// suitable.
+#[inline]
+pub unsafe fn unreachable() -> ! {
+    /// The empty type for cases which can't occur.
+    enum Void { }
+    let x: &Void = ::std::mem::transmute(1usize);
+    match *x {}
+}
+
+/// An extension trait for `Option<T>` providing unchecked unwrapping methods.
+pub trait UncheckedOptionExt<T> {
+    /// Get the value out of this Option without checking for None.
+    unsafe fn unchecked_unwrap(self) -> T;
+
+    /// Assert that this Option is a None to the optimizer.
+    unsafe fn unchecked_unwrap_none(self);
+}
+
+/// An extension trait for `Result<T, E>` providing unchecked unwrapping methods.
+pub trait UncheckedResultExt<T, E> {
+    /// Get the value out of this Result without checking for Err.
+    unsafe fn unchecked_unwrap_ok(self) -> T;
+
+    /// Get the error out of this Result without checking for Ok.
+    unsafe fn unchecked_unwrap_err(self) -> E;
+}
+
+impl<T> UncheckedOptionExt<T> for Option<T> {
+    unsafe fn unchecked_unwrap(self) -> T {
+        match self {
+            Some(x) => x,
+            None => unreachable()
+        }
+    }
+
+    unsafe fn unchecked_unwrap_none(self) {
+        if self.is_some() { unreachable() }
+    }
+}
+
+impl<T, E> UncheckedResultExt<T, E> for Result<T, E> {
+    unsafe fn unchecked_unwrap_ok(self) -> T {
+        match self {
+            Ok(x) => x,
+            Err(_) => unreachable()
+        }
+    }
+
+    unsafe fn unchecked_unwrap_err(self) -> E {
+        match self {
+            Ok(_) => unreachable(),
+            Err(e) => e
+        }
+    }
+}
\ No newline at end of file
diff --git a/vendor/thread_local/.cargo-checksum.json b/vendor/thread_local/.cargo-checksum.json
index 8798696c8d..b84db3ed50 100644
--- a/vendor/thread_local/.cargo-checksum.json
+++ b/vendor/thread_local/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"b4f81d513b95fff17f96d5da83768187870df83969fd5e49b030aaf6158ccd58","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"00a29378d5aeb66b7a48b77bee0d463c8b408b8a9cb0abb7674edb10d142aca0","benches/thread_local.rs":"cc8bde81ed6206525feff209598caf1e01e89a83bf21d8b7ccc0dadc8b89d815","src/lib.rs":"d7f875b0c4a8e2229f3510c88c0425342f1628fdf2f2b113c80789b6b90378b7","src/thread_id.rs":"0962c130061939557aa272115e4420fbbc63b6bd306783a456a8ffcbf304a447","src/unreachable.rs":"830d44988f86f4fc6c3c4dd7e9e4e7d0f2cb9c5b024c360b5f7ceae365983367"},"package":"c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"}
\ No newline at end of file
+{"files":{"Cargo.toml":"a08d3007cec7ad1a83afad57980965ece5457089404f6f5d41eacc8143386d69","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"c9a75f18b9ab2927829a208fc6aa2cf4e63b8420887ba29cdb265d6619ae82d5","README.md":"ab6f09e96c06e37ee3df492562a07c1c3548dd5abf73301f8215a5dcedcccc84","benches/thread_local.rs":"cc8bde81ed6206525feff209598caf1e01e89a83bf21d8b7ccc0dadc8b89d815","src/cached.rs":"089286aa7bcde7c92b1ee7381b74f8c30049c0d80a85c1babdbac69b2e210396","src/lib.rs":"a67d7bf8c7c3bd869ea297cf1d158db8c9c4bbf7ae1e23d9028cfc3a7554e235","src/thread_id.rs":"0962c130061939557aa272115e4420fbbc63b6bd306783a456a8ffcbf304a447","src/unreachable.rs":"830d44988f86f4fc6c3c4dd7e9e4e7d0f2cb9c5b024c360b5f7ceae365983367"},"package":"d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14"}
\ No newline at end of file
diff --git a/vendor/thread_local/Cargo.toml b/vendor/thread_local/Cargo.toml
index fc7b3c82dd..0ce59da27b 100644
--- a/vendor/thread_local/Cargo.toml
+++ b/vendor/thread_local/Cargo.toml
@@ -3,7 +3,7 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
+# to registry (e.g., crates.io) dependencies
 #
 # If you believe there's an error in this file please file an
 # issue against the rust-lang/cargo repository. If you're
@@ -12,7 +12,7 @@
 
 [package]
 name = "thread_local"
-version = "0.3.6"
+version = "1.0.1"
 authors = ["Amanieu d'Antras <amanieu@gmail.com>"]
 description = "Per-object thread-local storage"
 documentation = "https://amanieu.github.io/thread_local-rs/thread_local/index.html"
diff --git a/vendor/thread_local/README.md b/vendor/thread_local/README.md
index 1472ed1c61..d00355bb1a 100644
--- a/vendor/thread_local/README.md
+++ b/vendor/thread_local/README.md
@@ -16,7 +16,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-thread_local = "0.3"
+thread_local = "1.0"
 ```
 
 and this to your crate root:
diff --git a/vendor/thread_local/src/cached.rs b/vendor/thread_local/src/cached.rs
new file mode 100644
index 0000000000..ab43c86da5
--- /dev/null
+++ b/vendor/thread_local/src/cached.rs
@@ -0,0 +1,198 @@
+use super::{IntoIter, IterMut, ThreadLocal};
+use std::cell::UnsafeCell;
+use std::fmt;
+use std::panic::UnwindSafe;
+use std::sync::atomic::{AtomicUsize, Ordering};
+use thread_id;
+use unreachable::{UncheckedOptionExt, UncheckedResultExt};
+
+/// Wrapper around `ThreadLocal` which adds a fast path for a single thread.
+///
+/// This has the same API as `ThreadLocal`, but will register the first thread
+/// that sets a value as its owner. All accesses by the owner will go through
+/// a special fast path which is much faster than the normal `ThreadLocal` path.
+pub struct CachedThreadLocal<T: Send> {
+    owner: AtomicUsize,
+    local: UnsafeCell<Option<Box<T>>>,
+    global: ThreadLocal<T>,
+}
+
+// CachedThreadLocal is always Sync, even if T isn't
+unsafe impl<T: Send> Sync for CachedThreadLocal<T> {}
+
+impl<T: Send> Default for CachedThreadLocal<T> {
+    fn default() -> CachedThreadLocal<T> {
+        CachedThreadLocal::new()
+    }
+}
+
+impl<T: Send> CachedThreadLocal<T> {
+    /// Creates a new empty `CachedThreadLocal`.
+    pub fn new() -> CachedThreadLocal<T> {
+        CachedThreadLocal {
+            owner: AtomicUsize::new(0),
+            local: UnsafeCell::new(None),
+            global: ThreadLocal::new(),
+        }
+    }
+
+    /// Returns the element for the current thread, if it exists.
+    pub fn get(&self) -> Option<&T> {
+        let id = thread_id::get();
+        let owner = self.owner.load(Ordering::Relaxed);
+        if owner == id {
+            return unsafe { Some((*self.local.get()).as_ref().unchecked_unwrap()) };
+        }
+        if owner == 0 {
+            return None;
+        }
+        self.global.get_fast(id)
+    }
+
+    /// Returns the element for the current thread, or creates it if it doesn't
+    /// exist.
+    #[inline(always)]
+    pub fn get_or<F>(&self, create: F) -> &T
+    where
+        F: FnOnce() -> T,
+    {
+        unsafe {
+            self.get_or_try(|| Ok::<T, ()>(create()))
+                .unchecked_unwrap_ok()
+        }
+    }
+
+    /// Returns the element for the current thread, or creates it if it doesn't
+    /// exist. If `create` fails, that error is returned and no element is
+    /// added.
+    pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
+    where
+        F: FnOnce() -> Result<T, E>,
+    {
+        let id = thread_id::get();
+        let owner = self.owner.load(Ordering::Relaxed);
+        if owner == id {
+            return Ok(unsafe { (*self.local.get()).as_ref().unchecked_unwrap() });
+        }
+        self.get_or_try_slow(id, owner, create)
+    }
+
+    #[cold]
+    #[inline(never)]
+    fn get_or_try_slow<F, E>(&self, id: usize, owner: usize, create: F) -> Result<&T, E>
+    where
+        F: FnOnce() -> Result<T, E>,
+    {
+        if owner == 0 && self.owner.compare_and_swap(0, id, Ordering::Relaxed) == 0 {
+            unsafe {
+                (*self.local.get()) = Some(Box::new(create()?));
+                return Ok((*self.local.get()).as_ref().unchecked_unwrap());
+            }
+        }
+        match self.global.get_fast(id) {
+            Some(x) => Ok(x),
+            None => Ok(self.global.insert(id, Box::new(create()?), true)),
+        }
+    }
+
+    /// Returns a mutable iterator over the local values of all threads.
+    ///
+    /// Since this call borrows the `ThreadLocal` mutably, this operation can
+    /// be done safely---the mutable borrow statically guarantees no other
+    /// threads are currently accessing their associated values.
+    pub fn iter_mut(&mut self) -> CachedIterMut<T> {
+        CachedIterMut {
+            local: unsafe { (*self.local.get()).as_mut().map(|x| &mut **x) },
+            global: self.global.iter_mut(),
+        }
+    }
+
+    /// Removes all thread-specific values from the `ThreadLocal`, effectively
+    /// reseting it to its original state.
+    ///
+    /// Since this call borrows the `ThreadLocal` mutably, this operation can
+    /// be done safely---the mutable borrow statically guarantees no other
+    /// threads are currently accessing their associated values.
+    pub fn clear(&mut self) {
+        *self = CachedThreadLocal::new();
+    }
+}
+
+impl<T: Send> IntoIterator for CachedThreadLocal<T> {
+    type Item = T;
+    type IntoIter = CachedIntoIter<T>;
+
+    fn into_iter(self) -> CachedIntoIter<T> {
+        CachedIntoIter {
+            local: unsafe { (*self.local.get()).take().map(|x| *x) },
+            global: self.global.into_iter(),
+        }
+    }
+}
+
+impl<'a, T: Send + 'a> IntoIterator for &'a mut CachedThreadLocal<T> {
+    type Item = &'a mut T;
+    type IntoIter = CachedIterMut<'a, T>;
+
+    fn into_iter(self) -> CachedIterMut<'a, T> {
+        self.iter_mut()
+    }
+}
+
+impl<T: Send + Default> CachedThreadLocal<T> {
+    /// Returns the element for the current thread, or creates a default one if
+    /// it doesn't exist.
+    pub fn get_or_default(&self) -> &T {
+        self.get_or(T::default)
+    }
+}
+
+impl<T: Send + fmt::Debug> fmt::Debug for CachedThreadLocal<T> {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
+    }
+}
+
+impl<T: Send + UnwindSafe> UnwindSafe for CachedThreadLocal<T> {}
+
+/// Mutable iterator over the contents of a `CachedThreadLocal`.
+pub struct CachedIterMut<'a, T: Send + 'a> {
+    local: Option<&'a mut T>,
+    global: IterMut<'a, T>,
+}
+
+impl<'a, T: Send + 'a> Iterator for CachedIterMut<'a, T> {
+    type Item = &'a mut T;
+
+    fn next(&mut self) -> Option<&'a mut T> {
+        self.local.take().or_else(|| self.global.next())
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.global.size_hint().0 + self.local.is_some() as usize;
+        (len, Some(len))
+    }
+}
+
+impl<'a, T: Send + 'a> ExactSizeIterator for CachedIterMut<'a, T> {}
+
+/// An iterator that moves out of a `CachedThreadLocal`.
+pub struct CachedIntoIter<T: Send> {
+    local: Option<T>,
+    global: IntoIter<T>,
+}
+
+impl<T: Send> Iterator for CachedIntoIter<T> {
+    type Item = T;
+
+    fn next(&mut self) -> Option<T> {
+        self.local.take().or_else(|| self.global.next())
+    }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        let len = self.global.size_hint().0 + self.local.is_some() as usize;
+        (len, Some(len))
+    }
+}
+
+impl<T: Send> ExactSizeIterator for CachedIntoIter<T> {}
diff --git a/vendor/thread_local/src/lib.rs b/vendor/thread_local/src/lib.rs
index 2f8e579b59..9fd6d197bc 100644
--- a/vendor/thread_local/src/lib.rs
+++ b/vendor/thread_local/src/lib.rs
@@ -37,7 +37,7 @@
 //! use thread_local::ThreadLocal;
 //! let tls: ThreadLocal<u32> = ThreadLocal::new();
 //! assert_eq!(tls.get(), None);
-//! assert_eq!(tls.get_or(|| Box::new(5)), &5);
+//! assert_eq!(tls.get_or(|| 5), &5);
 //! assert_eq!(tls.get(), Some(&5));
 //! ```
 //!
@@ -56,7 +56,7 @@
 //!     let tls2 = tls.clone();
 //!     thread::spawn(move || {
 //!         // Increment a counter to count some event...
-//!         let cell = tls2.get_or(|| Box::new(Cell::new(0)));
+//!         let cell = tls2.get_or(|| Cell::new(0));
 //!         cell.set(cell.get() + 1);
 //!     }).join().unwrap();
 //! }
@@ -75,21 +75,22 @@ extern crate lazy_static;
 
 mod thread_id;
 mod unreachable;
+mod cached;
+
+pub use cached::{CachedIntoIter, CachedIterMut, CachedThreadLocal};
 
-use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
-use std::sync::Mutex;
-use std::marker::PhantomData;
 use std::cell::UnsafeCell;
 use std::fmt;
-use std::iter::Chain;
-use std::option::IntoIter as OptionIter;
+use std::marker::PhantomData;
 use std::panic::UnwindSafe;
+use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
+use std::sync::Mutex;
 use unreachable::{UncheckedOptionExt, UncheckedResultExt};
 
 /// Thread-local variable wrapper
 ///
 /// See the [module-level documentation](index.html) for more.
-pub struct ThreadLocal<T: ?Sized + Send> {
+pub struct ThreadLocal<T: Send> {
     // Pointer to the current top-level hash table
     table: AtomicPtr<Table<T>>,
 
@@ -97,12 +98,9 @@ pub struct ThreadLocal<T: ?Sized + Send> {
     // while writing to the table, not when reading from it. This also guards
     // the counter for the total number of values in the hash table.
     lock: Mutex<usize>,
-
-    // PhantomData to indicate that we logically own T
-    marker: PhantomData<T>,
 }
 
-struct Table<T: ?Sized + Send> {
+struct Table<T: Send> {
     // Hash entries for the table
     entries: Box<[TableEntry<T>]>,
 
@@ -113,7 +111,7 @@ struct Table<T: ?Sized + Send> {
     prev: Option<Box<Table<T>>>,
 }
 
-struct TableEntry<T: ?Sized + Send> {
+struct TableEntry<T: Send> {
     // Current owner of this entry, or 0 if this is an empty entry
     owner: AtomicUsize,
 
@@ -123,15 +121,15 @@ struct TableEntry<T: ?Sized + Send> {
 }
 
 // ThreadLocal is always Sync, even if T isn't
-unsafe impl<T: ?Sized + Send> Sync for ThreadLocal<T> {}
+unsafe impl<T: Send> Sync for ThreadLocal<T> {}
 
-impl<T: ?Sized + Send> Default for ThreadLocal<T> {
+impl<T: Send> Default for ThreadLocal<T> {
     fn default() -> ThreadLocal<T> {
         ThreadLocal::new()
     }
 }
 
-impl<T: ?Sized + Send> Drop for ThreadLocal<T> {
+impl<T: Send> Drop for ThreadLocal<T> {
     fn drop(&mut self) {
         unsafe {
             Box::from_raw(self.table.load(Ordering::Relaxed));
@@ -140,7 +138,7 @@ impl<T: ?Sized + Send> Drop for ThreadLocal<T> {
 }
 
 // Implementation of Clone for TableEntry, needed to make vec![] work
-impl<T: ?Sized + Send> Clone for TableEntry<T> {
+impl<T: Send> Clone for TableEntry<T> {
     fn clone(&self) -> TableEntry<T> {
         TableEntry {
             owner: AtomicUsize::new(0),
@@ -161,7 +159,7 @@ fn hash(id: usize, bits: usize) -> usize {
     id.wrapping_mul(0x9E37_79B9_7F4A_7C15) >> (64 - bits)
 }
 
-impl<T: ?Sized + Send> ThreadLocal<T> {
+impl<T: Send> ThreadLocal<T> {
     /// Creates a new empty `ThreadLocal`.
     pub fn new() -> ThreadLocal<T> {
         let entry = TableEntry {
@@ -176,7 +174,6 @@ impl<T: ?Sized + Send> ThreadLocal<T> {
         ThreadLocal {
             table: AtomicPtr::new(Box::into_raw(Box::new(table))),
             lock: Mutex::new(0),
-            marker: PhantomData,
         }
     }
 
@@ -190,10 +187,10 @@ impl<T: ?Sized + Send> ThreadLocal<T> {
     /// exist.
     pub fn get_or<F>(&self, create: F) -> &T
     where
-        F: FnOnce() -> Box<T>,
+        F: FnOnce() -> T,
     {
         unsafe {
-            self.get_or_try(|| Ok::<Box<T>, ()>(create()))
+            self.get_or_try(|| Ok::<T, ()>(create()))
                 .unchecked_unwrap_ok()
         }
     }
@@ -203,12 +200,12 @@ impl<T: ?Sized + Send> ThreadLocal<T> {
     /// added.
     pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
     where
-        F: FnOnce() -> Result<Box<T>, E>,
+        F: FnOnce() -> Result<T, E>,
     {
         let id = thread_id::get();
         match self.get_fast(id) {
             Some(x) => Ok(x),
-            None => Ok(self.insert(id, try!(create()), true)),
+            None => Ok(self.insert(id, Box::new(create()?), true)),
         }
     }
 
@@ -232,7 +229,7 @@ impl<T: ?Sized + Send> ThreadLocal<T> {
 
     // Fast path: try to find our thread in the top-level hash table
     fn get_fast(&self, id: usize) -> Option<&T> {
-        let table = unsafe { &*self.table.load(Ordering::Relaxed) };
+        let table = unsafe { &*self.table.load(Ordering::Acquire) };
         match Self::lookup(id, table) {
             Some(x) => unsafe { Some((*x.get()).as_ref().unchecked_unwrap()) },
             None => self.get_slow(id, table),
@@ -307,19 +304,22 @@ impl<T: ?Sized + Send> ThreadLocal<T> {
         unreachable!();
     }
 
+    fn raw_iter(&mut self) -> RawIter<T> {
+        RawIter {
+            remaining: *self.lock.get_mut().unwrap(),
+            index: 0,
+            table: self.table.load(Ordering::Relaxed),
+        }
+    }
+
     /// Returns a mutable iterator over the local values of all threads.
     ///
     /// Since this call borrows the `ThreadLocal` mutably, this operation can
     /// be done safely---the mutable borrow statically guarantees no other
     /// threads are currently accessing their associated values.
     pub fn iter_mut(&mut self) -> IterMut<T> {
-        let raw = RawIter {
-            remaining: *self.lock.lock().unwrap(),
-            index: 0,
-            table: self.table.load(Ordering::Relaxed),
-        };
         IterMut {
-            raw: raw,
+            raw: self.raw_iter(),
             marker: PhantomData,
         }
     }
@@ -335,25 +335,20 @@ impl<T: ?Sized + Send> ThreadLocal<T> {
     }
 }
 
-impl<T: ?Sized + Send> IntoIterator for ThreadLocal<T> {
-    type Item = Box<T>;
+impl<T: Send> IntoIterator for ThreadLocal<T> {
+    type Item = T;
     type IntoIter = IntoIter<T>;
 
-    fn into_iter(self) -> IntoIter<T> {
-        let raw = RawIter {
-            remaining: *self.lock.lock().unwrap(),
-            index: 0,
-            table: self.table.load(Ordering::Relaxed),
-        };
+    fn into_iter(mut self) -> IntoIter<T> {
         IntoIter {
-            raw: raw,
+            raw: self.raw_iter(),
             _thread_local: self,
         }
     }
 }
 
-impl<'a, T: ?Sized + Send + 'a> IntoIterator for &'a mut ThreadLocal<T> {
-    type Item = &'a mut Box<T>;
+impl<'a, T: Send + 'a> IntoIterator for &'a mut ThreadLocal<T> {
+    type Item = &'a mut T;
     type IntoIter = IterMut<'a, T>;
 
     fn into_iter(self) -> IterMut<'a, T> {
@@ -364,26 +359,28 @@ impl<'a, T: ?Sized + Send + 'a> IntoIterator for &'a mut ThreadLocal<T> {
 impl<T: Send + Default> ThreadLocal<T> {
     /// Returns the element for the current thread, or creates a default one if
     /// it doesn't exist.
-    pub fn get_default(&self) -> &T {
-        self.get_or(|| Box::new(T::default()))
+    pub fn get_or_default(&self) -> &T {
+        self.get_or(Default::default)
     }
 }
 
-impl<T: ?Sized + Send + fmt::Debug> fmt::Debug for ThreadLocal<T> {
+impl<T: Send + fmt::Debug> fmt::Debug for ThreadLocal<T> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
     }
 }
 
-impl<T: ?Sized + Send + UnwindSafe> UnwindSafe for ThreadLocal<T> {}
+impl<T: Send + UnwindSafe> UnwindSafe for ThreadLocal<T> {}
 
-struct RawIter<T: ?Sized + Send> {
+struct RawIter<T: Send> {
     remaining: usize,
     index: usize,
     table: *const Table<T>,
 }
 
-impl<T: ?Sized + Send> RawIter<T> {
+impl<T: Send> Iterator for RawIter<T> {
+    type Item = *mut Option<Box<T>>;
+
     fn next(&mut self) -> Option<*mut Option<Box<T>>> {
         if self.remaining == 0 {
             return None;
@@ -403,223 +400,68 @@ impl<T: ?Sized + Send> RawIter<T> {
             self.table = unsafe { &**(*self.table).prev.as_ref().unchecked_unwrap() };
         }
     }
+
+    fn size_hint(&self) -> (usize, Option<usize>) {
+        (self.remaining, Some(self.remaining))
+    }
 }
 
 /// Mutable iterator over the contents of a `ThreadLocal`.
-pub struct IterMut<'a, T: ?Sized + Send + 'a> {
+pub struct IterMut<'a, T: Send + 'a> {
     raw: RawIter<T>,
     marker: PhantomData<&'a mut ThreadLocal<T>>,
 }
 
-impl<'a, T: ?Sized + Send + 'a> Iterator for IterMut<'a, T> {
-    type Item = &'a mut Box<T>;
+impl<'a, T: Send + 'a> Iterator for IterMut<'a, T> {
+    type Item = &'a mut T;
 
-    fn next(&mut self) -> Option<&'a mut Box<T>> {
-        self.raw.next().map(|x| unsafe {
-            (*x).as_mut().unchecked_unwrap()
-        })
+    fn next(&mut self) -> Option<&'a mut T> {
+        self.raw
+            .next()
+            .map(|x| unsafe { &mut **(*x).as_mut().unchecked_unwrap() })
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.raw.remaining, Some(self.raw.remaining))
+        self.raw.size_hint()
     }
 }
 
-impl<'a, T: ?Sized + Send + 'a> ExactSizeIterator for IterMut<'a, T> {}
+impl<'a, T: Send + 'a> ExactSizeIterator for IterMut<'a, T> {}
 
 /// An iterator that moves out of a `ThreadLocal`.
-pub struct IntoIter<T: ?Sized + Send> {
+pub struct IntoIter<T: Send> {
     raw: RawIter<T>,
     _thread_local: ThreadLocal<T>,
 }
 
-impl<T: ?Sized + Send> Iterator for IntoIter<T> {
-    type Item = Box<T>;
+impl<T: Send> Iterator for IntoIter<T> {
+    type Item = T;
 
-    fn next(&mut self) -> Option<Box<T>> {
-        self.raw.next().map(
-            |x| unsafe { (*x).take().unchecked_unwrap() },
-        )
+    fn next(&mut self) -> Option<T> {
+        self.raw
+            .next()
+            .map(|x| unsafe { *(*x).take().unchecked_unwrap() })
     }
 
     fn size_hint(&self) -> (usize, Option<usize>) {
-        (self.raw.remaining, Some(self.raw.remaining))
+        self.raw.size_hint()
     }
 }
 
-impl<T: ?Sized + Send> ExactSizeIterator for IntoIter<T> {}
-
-/// Wrapper around `ThreadLocal` which adds a fast path for a single thread.
-///
-/// This has the same API as `ThreadLocal`, but will register the first thread
-/// that sets a value as its owner. All accesses by the owner will go through
-/// a special fast path which is much faster than the normal `ThreadLocal` path.
-pub struct CachedThreadLocal<T: ?Sized + Send> {
-    owner: AtomicUsize,
-    local: UnsafeCell<Option<Box<T>>>,
-    global: ThreadLocal<T>,
-}
-
-// CachedThreadLocal is always Sync, even if T isn't
-unsafe impl<T: ?Sized + Send> Sync for CachedThreadLocal<T> {}
-
-impl<T: ?Sized + Send> Default for CachedThreadLocal<T> {
-    fn default() -> CachedThreadLocal<T> {
-        CachedThreadLocal::new()
-    }
-}
-
-impl<T: ?Sized + Send> CachedThreadLocal<T> {
-    /// Creates a new empty `CachedThreadLocal`.
-    pub fn new() -> CachedThreadLocal<T> {
-        CachedThreadLocal {
-            owner: AtomicUsize::new(0),
-            local: UnsafeCell::new(None),
-            global: ThreadLocal::new(),
-        }
-    }
-
-    /// Returns the element for the current thread, if it exists.
-    pub fn get(&self) -> Option<&T> {
-        let id = thread_id::get();
-        let owner = self.owner.load(Ordering::Relaxed);
-        if owner == id {
-            return unsafe { Some((*self.local.get()).as_ref().unchecked_unwrap()) };
-        }
-        if owner == 0 {
-            return None;
-        }
-        self.global.get_fast(id)
-    }
-
-    /// Returns the element for the current thread, or creates it if it doesn't
-    /// exist.
-    #[inline(always)]
-    pub fn get_or<F>(&self, create: F) -> &T
-    where
-        F: FnOnce() -> Box<T>,
-    {
-        unsafe {
-            self.get_or_try(|| Ok::<Box<T>, ()>(create()))
-                .unchecked_unwrap_ok()
-        }
-    }
-
-    /// Returns the element for the current thread, or creates it if it doesn't
-    /// exist. If `create` fails, that error is returned and no element is
-    /// added.
-    pub fn get_or_try<F, E>(&self, create: F) -> Result<&T, E>
-    where
-        F: FnOnce() -> Result<Box<T>, E>,
-    {
-        let id = thread_id::get();
-        let owner = self.owner.load(Ordering::Relaxed);
-        if owner == id {
-            return Ok(unsafe { (*self.local.get()).as_ref().unchecked_unwrap() });
-        }
-        self.get_or_try_slow(id, owner, create)
-    }
-
-    #[cold]
-    #[inline(never)]
-    fn get_or_try_slow<F, E>(&self, id: usize, owner: usize, create: F) -> Result<&T, E>
-    where
-        F: FnOnce() -> Result<Box<T>, E>,
-    {
-        if owner == 0 && self.owner.compare_and_swap(0, id, Ordering::Relaxed) == 0 {
-            unsafe {
-                (*self.local.get()) = Some(try!(create()));
-                return Ok((*self.local.get()).as_ref().unchecked_unwrap());
-            }
-        }
-        match self.global.get_fast(id) {
-            Some(x) => Ok(x),
-            None => Ok(self.global.insert(id, try!(create()), true)),
-        }
-    }
-
-    /// Returns a mutable iterator over the local values of all threads.
-    ///
-    /// Since this call borrows the `ThreadLocal` mutably, this operation can
-    /// be done safely---the mutable borrow statically guarantees no other
-    /// threads are currently accessing their associated values.
-    pub fn iter_mut(&mut self) -> CachedIterMut<T> {
-        unsafe {
-            (*self.local.get()).as_mut().into_iter().chain(
-                self.global
-                    .iter_mut(),
-            )
-        }
-    }
-
-    /// Removes all thread-specific values from the `ThreadLocal`, effectively
-    /// reseting it to its original state.
-    ///
-    /// Since this call borrows the `ThreadLocal` mutably, this operation can
-    /// be done safely---the mutable borrow statically guarantees no other
-    /// threads are currently accessing their associated values.
-    pub fn clear(&mut self) {
-        *self = CachedThreadLocal::new();
-    }
-}
-
-impl<T: ?Sized + Send> IntoIterator for CachedThreadLocal<T> {
-    type Item = Box<T>;
-    type IntoIter = CachedIntoIter<T>;
-
-    fn into_iter(self) -> CachedIntoIter<T> {
-        unsafe {
-            (*self.local.get()).take().into_iter().chain(
-                self.global
-                    .into_iter(),
-            )
-        }
-    }
-}
-
-impl<'a, T: ?Sized + Send + 'a> IntoIterator for &'a mut CachedThreadLocal<T> {
-    type Item = &'a mut Box<T>;
-    type IntoIter = CachedIterMut<'a, T>;
-
-    fn into_iter(self) -> CachedIterMut<'a, T> {
-        self.iter_mut()
-    }
-}
-
-impl<T: Send + Default> CachedThreadLocal<T> {
-    /// Returns the element for the current thread, or creates a default one if
-    /// it doesn't exist.
-    pub fn get_default(&self) -> &T {
-        self.get_or(|| Box::new(T::default()))
-    }
-}
-
-impl<T: ?Sized + Send + fmt::Debug> fmt::Debug for CachedThreadLocal<T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "ThreadLocal {{ local_data: {:?} }}", self.get())
-    }
-}
-
-/// Mutable iterator over the contents of a `CachedThreadLocal`.
-pub type CachedIterMut<'a, T> = Chain<OptionIter<&'a mut Box<T>>, IterMut<'a, T>>;
-
-/// An iterator that moves out of a `CachedThreadLocal`.
-pub type CachedIntoIter<T> = Chain<OptionIter<Box<T>>, IntoIter<T>>;
-
-impl<T: ?Sized + Send + UnwindSafe> UnwindSafe for CachedThreadLocal<T> {}
+impl<T: Send> ExactSizeIterator for IntoIter<T> {}
 
 #[cfg(test)]
 mod tests {
+    use super::{CachedThreadLocal, ThreadLocal};
     use std::cell::RefCell;
-    use std::sync::Arc;
     use std::sync::atomic::AtomicUsize;
     use std::sync::atomic::Ordering::Relaxed;
+    use std::sync::Arc;
     use std::thread;
-    use super::{ThreadLocal, CachedThreadLocal};
 
-    fn make_create() -> Arc<Fn() -> Box<usize> + Send + Sync> {
+    fn make_create() -> Arc<dyn Fn() -> usize + Send + Sync> {
         let count = AtomicUsize::new(0);
-        Arc::new(move || Box::new(count.fetch_add(1, Relaxed)))
+        Arc::new(move || count.fetch_add(1, Relaxed))
     }
 
     #[test]
@@ -670,8 +512,9 @@ mod tests {
             assert_eq!(None, tls2.get());
             assert_eq!(1, *tls2.get_or(|| create2()));
             assert_eq!(Some(&1), tls2.get());
-        }).join()
-            .unwrap();
+        })
+        .join()
+        .unwrap();
 
         assert_eq!(Some(&0), tls.get());
         assert_eq!(0, *tls.get_or(|| create()));
@@ -691,8 +534,9 @@ mod tests {
             assert_eq!(None, tls2.get());
             assert_eq!(1, *tls2.get_or(|| create2()));
             assert_eq!(Some(&1), tls2.get());
-        }).join()
-            .unwrap();
+        })
+        .join()
+        .unwrap();
 
         assert_eq!(Some(&0), tls.get());
         assert_eq!(0, *tls.get_or(|| create()));
@@ -707,11 +551,14 @@ mod tests {
         thread::spawn(move || {
             tls2.get_or(|| Box::new(2));
             let tls3 = tls2.clone();
-            thread::spawn(move || { tls3.get_or(|| Box::new(3)); })
-                .join()
-                .unwrap();
-        }).join()
+            thread::spawn(move || {
+                tls3.get_or(|| Box::new(3));
+            })
+            .join()
             .unwrap();
+        })
+        .join()
+        .unwrap();
 
         let mut tls = Arc::try_unwrap(tls).unwrap();
         let mut v = tls.iter_mut().map(|x| **x).collect::<Vec<i32>>();
@@ -731,11 +578,14 @@ mod tests {
         thread::spawn(move || {
             tls2.get_or(|| Box::new(2));
             let tls3 = tls2.clone();
-            thread::spawn(move || { tls3.get_or(|| Box::new(3)); })
-                .join()
-                .unwrap();
-        }).join()
+            thread::spawn(move || {
+                tls3.get_or(|| Box::new(3));
+            })
+            .join()
             .unwrap();
+        })
+        .join()
+        .unwrap();
 
         let mut tls = Arc::try_unwrap(tls).unwrap();
         let mut v = tls.iter_mut().map(|x| **x).collect::<Vec<i32>>();
diff --git a/vendor/unicase/.cargo-checksum.json b/vendor/unicase/.cargo-checksum.json
index 52fffadfd8..827c5ab4d7 100644
--- a/vendor/unicase/.cargo-checksum.json
+++ b/vendor/unicase/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"74e03c734b34bc3abb34b6b30d21271a56501f2404528345d358de187b472a55","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b6f96c1e11a9adb0a60ff1fa3da58bf89296ba8269b50fd330c610e3dfedb4dc","README.md":"779866876776401c3bdd80f23e02131fa1484b21e9ec56408534c97f5cafca1c","build.rs":"ace1b64010b84b7fe3ae538aa8e9743d1a9e139ce32b3e2a9ddfd1a9c86f709d","src/ascii.rs":"400bb2510841a0c9b8d77f4c112de207a25a13630a43e140fee3fdb28ea8764d","src/lib.rs":"81839a2e9eccabc887d97dbf0a031b0ab9bcd640eb510bf6ff1fb1ca4a134eed","src/unicode/map.rs":"2c7304f0e31c11c59a7b9d3b9defa8bc1143ec71ec69f49d3308c508c636d0f9","src/unicode/mod.rs":"06a9a74af66936957a859740403d593afb4f1b6e9cb5797885ba8d2e7bc24934"},"package":"2e2e6bd1e59e56598518beb94fd6db628ded570326f0a98c679a304bd9f00150"}
\ No newline at end of file
+{"files":{"Cargo.toml":"9d53be46ab942ae4b7684d673c9d910f492f923e582ae9b27f721e2b57e3874f","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b6f96c1e11a9adb0a60ff1fa3da58bf89296ba8269b50fd330c610e3dfedb4dc","README.md":"779866876776401c3bdd80f23e02131fa1484b21e9ec56408534c97f5cafca1c","build.rs":"18352be12daf69f90a317a479badfa0c2feb508a717a93d0abe3d07c37f1c9f4","src/ascii.rs":"37690625c90dbcd442ac7027c9a4298c1258368b437882036520a966675f62ad","src/lib.rs":"89ea45853f3aa797ba9aa7c856e6d93b674b7d93623fa304f292ddcc61fd0390","src/unicode/map.rs":"3679235bfd5ff68b0a0040bfe687fda231b1934762158bc52e6b58e2a1fcc6cb","src/unicode/mod.rs":"d6183755af22f1f74c63b27ae2b779071030f70358923b4c73010276e492d16b"},"package":"50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"}
\ No newline at end of file
diff --git a/vendor/unicase/Cargo.toml b/vendor/unicase/Cargo.toml
index d6b92bf397..d823e925a3 100644
--- a/vendor/unicase/Cargo.toml
+++ b/vendor/unicase/Cargo.toml
@@ -12,19 +12,19 @@
 
 [package]
 name = "unicase"
-version = "2.5.1"
+version = "2.6.0"
 authors = ["Sean McArthur <sean@seanmonstar.com>"]
 build = "build.rs"
 exclude = ["scripts/*"]
 description = "A case-insensitive wrapper around strings."
 documentation = "https://docs.rs/unicase"
 readme = "README.md"
-keywords = ["lowercase", "case", "case-insensitive", "case-folding"]
-categories = ["internationalization", "text-processing"]
+keywords = ["lowercase", "case", "case-insensitive", "case-folding", "no_std"]
+categories = ["internationalization", "text-processing", "no-std"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/seanmonstar/unicase"
 [build-dependencies.version_check]
-version = "0.1"
+version = "0.9"
 
 [features]
 nightly = []
diff --git a/vendor/unicase/build.rs b/vendor/unicase/build.rs
index 0ed3d8defc..6b22ab5f32 100644
--- a/vendor/unicase/build.rs
+++ b/vendor/unicase/build.rs
@@ -1,15 +1,23 @@
 extern crate version_check as rustc;
 
 fn main() {
-    if rustc::is_min_version("1.5.0").map(|(is_min, _)| is_min).unwrap_or(true) {
+    if is_rustc_at_least("1.5.0") {
         println!("cargo:rustc-cfg=__unicase__iter_cmp");
     }
 
-    if rustc::is_min_version("1.13.0").map(|(is_min, _)| is_min).unwrap_or(true) {
+    if is_rustc_at_least("1.13.0") {
         println!("cargo:rustc-cfg=__unicase__default_hasher");
     }
 
-    if rustc::is_min_version("1.31.0").map(|(is_min, _)| is_min).unwrap_or(true) {
+    if is_rustc_at_least("1.31.0") {
         println!("cargo:rustc-cfg=__unicase__const_fns");
     }
+
+    if is_rustc_at_least("1.36.0") {
+        println!("cargo:rustc-cfg=__unicase__core_and_alloc");
+    }
+}
+
+fn is_rustc_at_least(v: &str) -> bool {
+    rustc::is_min_version(v).unwrap_or(true)
 }
diff --git a/vendor/unicase/src/ascii.rs b/vendor/unicase/src/ascii.rs
index d656cd2af9..8940733c38 100644
--- a/vendor/unicase/src/ascii.rs
+++ b/vendor/unicase/src/ascii.rs
@@ -1,11 +1,13 @@
+use alloc::string::String;
+#[cfg(__unicase__iter_cmp)]
+use core::cmp::Ordering;
+use core::fmt;
+use core::hash::{Hash, Hasher};
+use core::ops::{Deref, DerefMut};
+use core::str::FromStr;
+#[cfg(not(__unicase__core_and_alloc))]
 #[allow(deprecated, unused)]
 use std::ascii::AsciiExt;
-#[cfg(__unicase__iter_cmp)]
-use std::cmp::Ordering;
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::ops::{Deref, DerefMut};
-use std::str::FromStr;
 
 use super::{Ascii, Encoding, UniCase};
 
diff --git a/vendor/unicase/src/lib.rs b/vendor/unicase/src/lib.rs
index 6182b24855..0c02b5ebca 100644
--- a/vendor/unicase/src/lib.rs
+++ b/vendor/unicase/src/lib.rs
@@ -1,7 +1,14 @@
 #![cfg_attr(test, deny(missing_docs))]
 #![cfg_attr(test, deny(warnings))]
-#![doc(html_root_url = "https://docs.rs/unicase/2.5.1")]
+#![doc(html_root_url = "https://docs.rs/unicase/2.6.0")]
 #![cfg_attr(feature = "nightly", feature(test))]
+#![cfg_attr(
+    all(
+        __unicase__core_and_alloc,
+        not(test),
+    ),
+    no_std,
+)]
 
 //! # UniCase
 //!
@@ -45,13 +52,23 @@
 #[cfg(feature = "nightly")]
 extern crate test;
 
-use std::borrow::Cow;
+#[cfg(all(__unicase__core_and_alloc, not(test)))]
+extern crate alloc;
+#[cfg(all(__unicase__core_and_alloc, not(test)))]
+use alloc::string::String;
+
+#[cfg(not(all(__unicase__core_and_alloc, not(test))))]
+extern crate std as alloc;
+#[cfg(not(all(__unicase__core_and_alloc, not(test))))]
+extern crate std as core;
+
+use alloc::borrow::Cow;
 #[cfg(__unicase__iter_cmp)]
-use std::cmp::Ordering;
-use std::fmt;
-use std::hash::{Hash, Hasher};
-use std::ops::{Deref, DerefMut};
-use std::str::FromStr;
+use core::cmp::Ordering;
+use core::fmt;
+use core::hash::{Hash, Hasher};
+use core::ops::{Deref, DerefMut};
+use core::str::FromStr;
 
 use self::unicode::Unicode;
 
@@ -118,8 +135,10 @@ impl<S: AsRef<str>> UniCase<S> {
     ///
     /// Note: This scans the text to determine if it is all ASCII or not.
     pub fn new(s: S) -> UniCase<S> {
+        #[cfg(not(__unicase__core_and_alloc))]
         #[allow(deprecated, unused)]
         use std::ascii::AsciiExt;
+
         if s.as_ref().is_ascii() {
             UniCase(Encoding::Ascii(Ascii(s)))
         } else {
@@ -341,7 +360,9 @@ mod tests {
         let c = UniCase::ascii("FoObAr");
 
         assert_eq!(a, b);
+        assert_eq!(b, a);
         assert_eq!(a, c);
+        assert_eq!(c, a);
         assert_eq!(hash(&a), hash(&b));
         assert_eq!(hash(&a), hash(&c));
         assert!(a.is_ascii());
@@ -349,14 +370,26 @@ mod tests {
         assert!(c.is_ascii());
     }
 
+
     #[test]
     fn test_eq_unicode() {
         let a = UniCase::new("στιγμας");
         let b = UniCase::new("στιγμασ");
         assert_eq!(a, b);
+        assert_eq!(b, a);
         assert_eq!(hash(&a), hash(&b));
     }
 
+    #[test]
+    fn test_eq_unicode_left_is_substring() {
+        // https://github.com/seanmonstar/unicase/issues/38
+        let a = UniCase::unicode("foo");
+        let b = UniCase::unicode("foobar");
+
+        assert!(a != b);
+        assert!(b != a);
+    }
+
     #[cfg(feature = "nightly")]
     #[bench]
     fn bench_unicase_ascii(b: &mut ::test::Bencher) {
diff --git a/vendor/unicase/src/unicode/map.rs b/vendor/unicase/src/unicode/map.rs
index 0ec6b4cd41..e43e0b7fe3 100644
--- a/vendor/unicase/src/unicode/map.rs
+++ b/vendor/unicase/src/unicode/map.rs
@@ -3,7 +3,7 @@
 
 use super::fold::Fold;
 
-use std::char;
+use core::char;
 pub fn lookup(orig: char) -> Fold {
     // The code below is is intended to reduce the binary size from that of a simple 1:1 lookup table.
     // It exploits two facts:
diff --git a/vendor/unicase/src/unicode/mod.rs b/vendor/unicase/src/unicode/mod.rs
index defa51c645..8b887331bf 100644
--- a/vendor/unicase/src/unicode/mod.rs
+++ b/vendor/unicase/src/unicode/mod.rs
@@ -1,6 +1,6 @@
 #[cfg(__unicase__iter_cmp)]
-use std::cmp::Ordering;
-use std::hash::{Hash, Hasher};
+use core::cmp::Ordering;
+use core::hash::{Hash, Hasher};
 
 use self::map::lookup;
 mod map;
@@ -11,9 +11,25 @@ pub struct Unicode<S>(pub S);
 impl<S1: AsRef<str>, S2: AsRef<str>> PartialEq<Unicode<S2>> for Unicode<S1> {
     #[inline]
     fn eq(&self, other: &Unicode<S2>) -> bool {
-        self.0.as_ref().chars().flat_map(lookup)
-            .zip(other.0.as_ref().chars().flat_map(lookup))
-            .all(|(a, b)| a == b)
+        let mut left = self.0.as_ref().chars().flat_map(lookup);
+        let mut right = other.0.as_ref().chars().flat_map(lookup);
+
+        // inline Iterator::eq since not added until Rust 1.5
+        loop {
+            let x = match left.next() {
+                None => return right.next().is_none(),
+                Some(val) => val,
+            };
+
+            let y = match right.next() {
+                None => return false,
+                Some(val) => val,
+            };
+
+            if x != y {
+                return false;
+            }
+        }
     }
 }
 
diff --git a/vendor/version_check-0.1.5/.cargo-checksum.json b/vendor/version_check-0.1.5/.cargo-checksum.json
deleted file mode 100644
index f93491f862..0000000000
--- a/vendor/version_check-0.1.5/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"95aa7965cb8a20e6b196cda8122e9855cc04ac4a42bc93e0616b45605a11bc2b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b7e650f3fce5c53249d1cdc608b54df156a97edd636cf9d23498d0cfe7aec63e","README.md":"8e5c0390f2dd2e9c082ea8feb1539af74f60c536faf6b836b8afd17fe605004c","src/lib.rs":"100373e52a857267090c78910b7b3f734949dd74092c1caf31f49cc64f8835e7"},"package":"914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"}
\ No newline at end of file
diff --git a/vendor/version_check-0.1.5/Cargo.toml b/vendor/version_check-0.1.5/Cargo.toml
deleted file mode 100644
index 2844801448..0000000000
--- a/vendor/version_check-0.1.5/Cargo.toml
+++ /dev/null
@@ -1,24 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
-#
-# When uploading crates to the registry Cargo will automatically
-# "normalize" Cargo.toml files for maximal compatibility
-# with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g. crates.io) dependencies
-#
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
-
-[package]
-name = "version_check"
-version = "0.1.5"
-authors = ["Sergio Benitez <sb@sergio.bz>"]
-description = "Tiny crate to check the version of the installed/running rustc."
-documentation = "https://docs.rs/version_check/"
-readme = "README.md"
-keywords = ["version", "rustc", "minimum", "check"]
-license = "MIT/Apache-2.0"
-repository = "https://github.com/SergioBenitez/version_check"
-
-[dependencies]
diff --git a/vendor/version_check-0.1.5/README.md b/vendor/version_check-0.1.5/README.md
deleted file mode 100644
index 63b3a623e9..0000000000
--- a/vendor/version_check-0.1.5/README.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# version\_check
-
-This tiny crate checks that the running or installed `rustc` meets some version
-requirements. The version is queried by calling the Rust compiler with
-`--version`. The path to the compiler is determined first via the `RUSTC`
-environment variable. If it is not set, then `rustc` is used. If that fails, no
-determination is made, and calls return `None`.
-
-## Usage
-
-Add to your `Cargo.toml` file, typically as a build dependency:
-
-```toml
-[build-dependencies]
-version_check = "0.1"
-```
-
-## Examples
-
-Check that the running compiler is a nightly release:
-
-```rust
-extern crate version_check;
-
-match version_check::is_nightly() {
-    Some(true) => "running a nightly",
-    Some(false) => "not nightly",
-    None => "couldn't figure it out"
-};
-```
-
-Check that the running compiler is at least version `1.13.0`:
-
-```rust
-extern crate version_check;
-
-match version_check::is_min_version("1.13.0") {
-    Some((true, version)) => format!("Yes! It's: {}", version),
-    Some((false, version)) => format!("No! {} is too old!", version),
-    None => "couldn't figure it out".into()
-};
-```
-
-Check that the running compiler was released on or after `2016-12-18`:
-
-```rust
-extern crate version_check;
-
-match version_check::is_min_date("2016-12-18") {
-    Some((true, date)) => format!("Yes! It's: {}", date),
-    Some((false, date)) => format!("No! {} is too long ago!", date),
-    None => "couldn't figure it out".into()
-};
-```
-
-## Alternatives
-
-This crate is dead simple with no dependencies. If you need something more and
-don't care about panicking if the version cannot be obtained or adding
-dependencies, see [rustc_version](https://crates.io/crates/rustc_version).
-
-## License
-
-`version_check` is licensed under either of the following, at your option:
-
- * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT License ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
diff --git a/vendor/version_check-0.1.5/src/lib.rs b/vendor/version_check-0.1.5/src/lib.rs
deleted file mode 100644
index a062062286..0000000000
--- a/vendor/version_check-0.1.5/src/lib.rs
+++ /dev/null
@@ -1,255 +0,0 @@
-//! This tiny crate checks that the running or installed `rustc` meets some
-//! version requirements. The version is queried by calling the Rust compiler
-//! with `--version`. The path to the compiler is determined first via the
-//! `RUSTC` environment variable. If it is not set, then `rustc` is used. If
-//! that fails, no determination is made, and calls return `None`.
-//!
-//! # Example
-//!
-//! Check that the running compiler is a nightly release:
-//!
-//! ```rust
-//! extern crate version_check;
-//!
-//! match version_check::is_nightly() {
-//!     Some(true) => "running a nightly",
-//!     Some(false) => "not nightly",
-//!     None => "couldn't figure it out"
-//! };
-//! ```
-//!
-//! Check that the running compiler is at least version `1.13.0`:
-//!
-//! ```rust
-//! extern crate version_check;
-//!
-//! match version_check::is_min_version("1.13.0") {
-//!     Some((true, version)) => format!("Yes! It's: {}", version),
-//!     Some((false, version)) => format!("No! {} is too old!", version),
-//!     None => "couldn't figure it out".into()
-//! };
-//! ```
-//!
-//! Check that the running compiler was released on or after `2016-12-18`:
-//!
-//! ```rust
-//! extern crate version_check;
-//!
-//! match version_check::is_min_date("2016-12-18") {
-//!     Some((true, date)) => format!("Yes! It's: {}", date),
-//!     Some((false, date)) => format!("No! {} is too long ago!", date),
-//!     None => "couldn't figure it out".into()
-//! };
-//! ```
-//!
-//! # Alternatives
-//!
-//! This crate is dead simple with no dependencies. If you need something more
-//! and don't care about panicking if the version cannot be obtained or adding
-//! dependencies, see [rustc_version](https://crates.io/crates/rustc_version).
-
-use std::env;
-use std::process::Command;
-
-// Convert a string of %Y-%m-%d to a single u32 maintaining ordering.
-fn str_to_ymd(ymd: &str) -> Option<u32> {
-    let ymd: Vec<u32> = ymd.split("-").filter_map(|s| s.parse::<u32>().ok()).collect();
-    if ymd.len() != 3 {
-        return None
-    }
-
-    let (y, m, d) = (ymd[0], ymd[1], ymd[2]);
-    Some((y << 9) | (m << 5) | d)
-}
-
-// Convert a string with prefix major-minor-patch to a single u64 maintaining
-// ordering. Assumes none of the components are > 1048576.
-fn str_to_mmp(mmp: &str) -> Option<u64> {
-    let mut mmp: Vec<u16> = mmp.split('-')
-        .nth(0)
-        .unwrap_or("")
-        .split('.')
-        .filter_map(|s| s.parse::<u16>().ok())
-        .collect();
-
-    if mmp.is_empty() {
-        return None
-    }
-
-    while mmp.len() < 3 {
-        mmp.push(0);
-    }
-
-    let (maj, min, patch) = (mmp[0] as u64, mmp[1] as u64, mmp[2] as u64);
-    Some((maj << 32) | (min << 16) | patch)
-}
-
-/// Returns (version, date) as available.
-fn version_and_date_from_rustc_version(s: &str) -> (Option<String>, Option<String>) {
-    let last_line = s.lines().last().unwrap_or(s);
-    let mut components = last_line.trim().split(" ");
-    let version = components.nth(1);
-    let date = components.nth(1).map(|s| s.trim_right().trim_right_matches(")"));
-    (version.map(|s| s.to_string()), date.map(|s| s.to_string()))
-}
-
-/// Returns (version, date) as available.
-fn get_version_and_date() -> Option<(Option<String>, Option<String>)> {
-    env::var("RUSTC").ok()
-        .and_then(|rustc| Command::new(rustc).arg("--version").output().ok())
-        .or_else(|| Command::new("rustc").arg("--version").output().ok())
-        .and_then(|output| String::from_utf8(output.stdout).ok())
-        .map(|s| version_and_date_from_rustc_version(&s))
-}
-
-/// Checks that the running or installed `rustc` was released no earlier than
-/// some date.
-///
-/// The format of `min_date` must be YYYY-MM-DD. For instance: `2016-12-20` or
-/// `2017-01-09`.
-///
-/// If the date cannot be retrieved or parsed, or if `min_date` could not be
-/// parsed, returns `None`. Otherwise returns a tuple where the first value is
-/// `true` if the installed `rustc` is at least from `min_data` and the second
-/// value is the date (in YYYY-MM-DD) of the installed `rustc`.
-pub fn is_min_date(min_date: &str) -> Option<(bool, String)> {
-    if let Some((_, Some(actual_date_str))) = get_version_and_date() {
-        str_to_ymd(&actual_date_str)
-            .and_then(|actual| str_to_ymd(min_date).map(|min| (min, actual)))
-            .map(|(min, actual)| (actual >= min, actual_date_str))
-    } else {
-        None
-    }
-}
-
-/// Checks that the running or installed `rustc` is at least some minimum
-/// version.
-///
-/// The format of `min_version` is a semantic version: `1.3.0`, `1.15.0-beta`,
-/// `1.14.0`, `1.16.0-nightly`, etc.
-///
-/// If the version cannot be retrieved or parsed, or if `min_version` could not
-/// be parsed, returns `None`. Otherwise returns a tuple where the first value
-/// is `true` if the installed `rustc` is at least `min_version` and the second
-/// value is the version (semantic) of the installed `rustc`.
-pub fn is_min_version(min_version: &str) -> Option<(bool, String)> {
-    if let Some((Some(actual_version_str), _)) = get_version_and_date() {
-        str_to_mmp(&actual_version_str)
-            .and_then(|actual| str_to_mmp(min_version).map(|min| (min, actual)))
-            .map(|(min, actual)| (actual >= min, actual_version_str))
-    } else {
-        None
-    }
-}
-
-fn version_channel_is(channel: &str) -> Option<bool> {
-    get_version_and_date()
-        .and_then(|(version_str_opt, _)|  version_str_opt)
-        .map(|version_str| version_str.contains(channel))
-}
-
-/// Determines whether the running or installed `rustc` is on the nightly
-/// channel.
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version is a nightly release, and `Some(false)`
-/// otherwise.
-pub fn is_nightly() -> Option<bool> {
-    version_channel_is("nightly")
-}
-
-/// Determines whether the running or installed `rustc` is on the beta channel.
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version is a beta release, and `Some(false)`
-/// otherwise.
-pub fn is_beta() -> Option<bool> {
-    version_channel_is("beta")
-}
-
-/// Determines whether the running or installed `rustc` is on the dev channel.
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version is a dev release, and `Some(false)`
-/// otherwise.
-pub fn is_dev() -> Option<bool> {
-    version_channel_is("dev")
-}
-
-/// Determines whether the running or installed `rustc` supports feature flags.
-/// In other words, if the channel is either "nightly" or "dev".
-///
-/// If the version could not be determined, returns `None`. Otherwise returns
-/// `Some(true)` if the running version supports features, and `Some(false)`
-/// otherwise.
-pub fn supports_features() -> Option<bool> {
-    match is_nightly() {
-        b@Some(true) => b,
-        _ => is_dev()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::version_and_date_from_rustc_version;
-    use super::str_to_mmp;
-
-    macro_rules! check_mmp {
-        ($string:expr => ($x:expr, $y:expr, $z:expr)) => (
-            if let Some(mmp) = str_to_mmp($string) {
-                let expected = $x << 32 | $y << 16 | $z;
-                if mmp != expected {
-                    panic!("{:?} didn't parse as {}.{}.{}.", $string, $x, $y, $z);
-                }
-            } else {
-                panic!("{:?} didn't parse for mmp testing.", $string);
-            }
-        )
-    }
-
-    macro_rules! check_version {
-        ($s:expr => ($x:expr, $y:expr, $z:expr)) => (
-            if let (Some(version_str), _) = version_and_date_from_rustc_version($s) {
-                check_mmp!(&version_str => ($x, $y, $z));
-            } else {
-                panic!("{:?} didn't parse for version testing.", $s);
-            }
-        )
-    }
-
-    #[test]
-    fn test_str_to_mmp() {
-        check_mmp!("1.18.0" => (1, 18, 0));
-        check_mmp!("1.19.0" => (1, 19, 0));
-        check_mmp!("1.19.0-nightly" => (1, 19, 0));
-        check_mmp!("1.12.2349" => (1, 12, 2349));
-        check_mmp!("0.12" => (0, 12, 0));
-        check_mmp!("1.12.5" => (1, 12, 5));
-        check_mmp!("1.12" => (1, 12, 0));
-        check_mmp!("1" => (1, 0, 0));
-    }
-
-    #[test]
-    fn test_version_parse() {
-        check_version!("rustc 1.18.0" => (1, 18, 0));
-        check_version!("rustc 1.8.0" => (1, 8, 0));
-        check_version!("rustc 1.20.0-nightly" => (1, 20, 0));
-        check_version!("rustc 1.20" => (1, 20, 0));
-        check_version!("rustc 1.3" => (1, 3, 0));
-        check_version!("rustc 1" => (1, 0, 0));
-        check_version!("rustc 1.2.5.6" => (1, 2, 5));
-        check_version!("rustc 1.5.1-beta" => (1, 5, 1));
-        check_version!("rustc 1.20.0-nightly (d84693b93 2017-07-09)" => (1, 20, 0));
-        check_version!("rustc 1.20.0 (d84693b93 2017-07-09)" => (1, 20, 0));
-        check_version!("rustc 1.20.0 (2017-07-09)" => (1, 20, 0));
-        check_version!("rustc 1.20.0-dev (2017-07-09)" => (1, 20, 0));
-
-        check_version!("warning: invalid logging spec 'warning', ignoring it
-                        rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => (1, 30, 0));
-        check_version!("warning: invalid logging spec 'warning', ignoring it\n
-                        rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => (1, 30, 0));
-        check_version!("warning: invalid logging spec 'warning', ignoring it
-                        warning: something else went wrong
-                        rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)" => (1, 30, 0));
-    }
-}
diff --git a/vendor/version_check/.cargo-checksum.json b/vendor/version_check/.cargo-checksum.json
new file mode 100644
index 0000000000..f4066d52f2
--- /dev/null
+++ b/vendor/version_check/.cargo-checksum.json
@@ -0,0 +1 @@
+{"files":{"Cargo.toml":"8e79e76a669227ea5f61530ad74ea835434efb34b3143dd8afe7fbd327e1f8f9","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"b7e650f3fce5c53249d1cdc608b54df156a97edd636cf9d23498d0cfe7aec63e","README.md":"d45a7a97623a56bf9cb7766976c3807312f7d4ac0cfaf4563ff76bc4d6ad1835","src/channel.rs":"f916ece9beeb7f3d512b423ae6da05d45f284bf42ddf7c14f80b77398d52dac7","src/date.rs":"d31e158a2b49f81da512150c5c93194655dac4114825e285fe2f688c09b001a4","src/lib.rs":"a15eb43cec1acfb0db42e8f93bdf70246ebceb1684ac39496bd28184722e4480","src/version.rs":"7022a20252f8beee0833f5d4f67b863e2f10963a24010e1300cb6603bcb7d514"},"package":"078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce"}
\ No newline at end of file
diff --git a/vendor/version_check/Cargo.toml b/vendor/version_check/Cargo.toml
new file mode 100644
index 0000000000..6e01ed8c31
--- /dev/null
+++ b/vendor/version_check/Cargo.toml
@@ -0,0 +1,24 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
+[package]
+name = "version_check"
+version = "0.9.1"
+authors = ["Sergio Benitez <sb@sergio.bz>"]
+description = "Tiny crate to check the version of the installed/running rustc."
+documentation = "https://docs.rs/version_check/"
+readme = "README.md"
+keywords = ["version", "rustc", "minimum", "check"]
+license = "MIT/Apache-2.0"
+repository = "https://github.com/SergioBenitez/version_check"
+
+[dependencies]
diff --git a/vendor/version_check/LICENSE-APACHE b/vendor/version_check/LICENSE-APACHE
new file mode 100644
index 0000000000..16fe87b06e
--- /dev/null
+++ b/vendor/version_check/LICENSE-APACHE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/vendor/version_check-0.1.5/LICENSE-MIT b/vendor/version_check/LICENSE-MIT
similarity index 100%
rename from vendor/version_check-0.1.5/LICENSE-MIT
rename to vendor/version_check/LICENSE-MIT
diff --git a/vendor/version_check/README.md b/vendor/version_check/README.md
new file mode 100644
index 0000000000..9d4c169ce7
--- /dev/null
+++ b/vendor/version_check/README.md
@@ -0,0 +1,76 @@
+# version\_check
+
+[![Build Status](https://travis-ci.com/SergioBenitez/version_check.svg?branch=master)](https://travis-ci.com/SergioBenitez/version_check)
+[![Current Crates.io Version](https://img.shields.io/crates/v/version_check.svg)](https://crates.io/crates/version_check)
+[![rustdocs on docs.rs](https://docs.rs/version_check/badge.svg)](https://docs.rs/version_check)
+
+This tiny crate checks that the running or installed `rustc` meets some version
+requirements. The version is queried by calling the Rust compiler with
+`--version`. The path to the compiler is determined first via the `RUSTC`
+environment variable. If it is not set, then `rustc` is used. If that fails, no
+determination is made, and calls return `None`.
+
+## Usage
+
+Add to your `Cargo.toml` file, typically as a build dependency:
+
+```toml
+[build-dependencies]
+version_check = "0.9"
+```
+
+`version_check` is compatible and compiles with Rust 1.0.0 and beyond.
+
+## Examples
+
+Set a `cfg` flag in `build.rs` if the running compiler was determined to be
+at least version `1.13.0`:
+
+```rust
+extern crate version_check as rustc;
+
+if rustc::is_min_version("1.13.0").unwrap_or(false) {
+    println!("cargo:rustc-cfg=question_mark_operator");
+}
+```
+
+Check that the running compiler was released on or after `2018-12-18`:
+
+```rust
+extern crate version_check as rustc;
+
+match rustc::is_min_date("2018-12-18") {
+    Some(true) => "Yep! It's recent!",
+    Some(false) => "No, it's older.",
+    None => "Couldn't determine the rustc version."
+};
+```
+
+Check that the running compiler supports feature flags:
+
+```rust
+extern crate version_check as rustc;
+
+match rustc::is_feature_flaggable() {
+    Some(true) => "Yes! It's a dev or nightly release!",
+    Some(false) => "No, it's stable or beta.",
+    None => "Couldn't determine the rustc version."
+};
+```
+
+See the [rustdocs](https://docs.rs/version_check) for more examples and complete
+documentation.
+
+## Alternatives
+
+This crate is dead simple with no dependencies. If you need something more
+and don't care about panicking if the version cannot be obtained, or if you
+don't mind adding dependencies, see
+[rustc_version](https://crates.io/crates/rustc_version).
+
+## License
+
+`version_check` is licensed under either of the following, at your option:
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT License ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
diff --git a/vendor/version_check/src/channel.rs b/vendor/version_check/src/channel.rs
new file mode 100644
index 0000000000..2332a014c2
--- /dev/null
+++ b/vendor/version_check/src/channel.rs
@@ -0,0 +1,192 @@
+use std::fmt;
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+enum Kind {
+    Dev,
+    Nightly,
+    Beta,
+    Stable,
+}
+
+/// Release channel: "dev", "nightly", "beta", or "stable".
+#[derive(Debug, PartialEq, Eq, Copy, Clone)]
+pub struct Channel(Kind);
+
+impl Channel {
+    /// Reads the release channel of the running compiler. If it cannot be
+    /// determined (see the [top-level documentation](crate)), returns `None`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// match Channel::read() {
+    ///     Some(c) => format!("The channel is: {}", c),
+    ///     None => format!("Failed to read the release channel.")
+    /// };
+    /// ```
+    pub fn read() -> Option<Channel> {
+        ::get_version_and_date()
+            .and_then(|(version, _)| version)
+            .and_then(|version| Channel::parse(&version))
+    }
+
+    /// Parse a Rust release channel from a Rust release version string (of the
+    /// form `major[.minor[.patch[-channel]]]`). Returns `None` if `version` is
+    /// not a valid Rust version string.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// let dev = Channel::parse("1.3.0-dev").unwrap();
+    /// assert!(dev.is_dev());
+    ///
+    /// let nightly = Channel::parse("1.42.2-nightly").unwrap();
+    /// assert!(nightly.is_nightly());
+    ///
+    /// let beta = Channel::parse("1.32.0-beta").unwrap();
+    /// assert!(beta.is_beta());
+    ///
+    /// let stable = Channel::parse("1.4.0").unwrap();
+    /// assert!(stable.is_stable());
+    /// ```
+    pub fn parse(version: &str) -> Option<Channel> {
+        if version.contains("-dev") {
+            Some(Channel(Kind::Dev))
+        } else if version.contains("-nightly") {
+            Some(Channel(Kind::Nightly))
+        } else if version.contains("-beta") {
+            Some(Channel(Kind::Beta))
+        } else if !version.contains("-") {
+            Some(Channel(Kind::Stable))
+        } else {
+            None
+        }
+    }
+
+    /// Returns the name of the release channel.
+    fn as_str(&self) -> &'static str {
+        match self.0 {
+            Kind::Dev => "dev",
+            Kind::Beta => "beta",
+            Kind::Nightly => "nightly",
+            Kind::Stable => "stable",
+        }
+    }
+
+    /// Returns `true` if this channel supports feature flags. In other words,
+    /// returns `true` if the channel is either `dev` or `nightly`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// let dev = Channel::parse("1.3.0-dev").unwrap();
+    /// assert!(dev.supports_features());
+    ///
+    /// let nightly = Channel::parse("1.42.2-nightly").unwrap();
+    /// assert!(nightly.supports_features());
+    ///
+    /// let beta = Channel::parse("1.32.0-beta").unwrap();
+    /// assert!(!beta.supports_features());
+    ///
+    /// let stable = Channel::parse("1.4.0").unwrap();
+    /// assert!(!stable.supports_features());
+    /// ```
+    pub fn supports_features(&self) -> bool {
+        match self.0 {
+            Kind::Dev | Kind::Nightly => true,
+            Kind::Beta | Kind::Stable => false
+        }
+    }
+
+    /// Returns `true` if this channel is `dev` and `false` otherwise.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// let dev = Channel::parse("1.3.0-dev").unwrap();
+    /// assert!(dev.is_dev());
+    ///
+    /// let stable = Channel::parse("1.0.0").unwrap();
+    /// assert!(!stable.is_dev());
+    /// ```
+    pub fn is_dev(&self) -> bool {
+        match self.0 {
+            Kind::Dev => true,
+            _ => false
+        }
+    }
+
+    /// Returns `true` if this channel is `nightly` and `false` otherwise.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// let nightly = Channel::parse("1.3.0-nightly").unwrap();
+    /// assert!(nightly.is_nightly());
+    ///
+    /// let stable = Channel::parse("1.0.0").unwrap();
+    /// assert!(!stable.is_nightly());
+    /// ```
+    pub fn is_nightly(&self) -> bool {
+        match self.0 {
+            Kind::Nightly => true,
+            _ => false
+        }
+    }
+
+    /// Returns `true` if this channel is `beta` and `false` otherwise.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// let beta = Channel::parse("1.3.0-beta").unwrap();
+    /// assert!(beta.is_beta());
+    ///
+    /// let stable = Channel::parse("1.0.0").unwrap();
+    /// assert!(!stable.is_beta());
+    /// ```
+    pub fn is_beta(&self) -> bool {
+        match self.0 {
+            Kind::Beta => true,
+            _ => false
+        }
+    }
+
+    /// Returns `true` if this channel is `stable` and `false` otherwise.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Channel;
+    ///
+    /// let stable = Channel::parse("1.0.0").unwrap();
+    /// assert!(stable.is_stable());
+    ///
+    /// let beta = Channel::parse("1.3.0-beta").unwrap();
+    /// assert!(!beta.is_stable());
+    /// ```
+    pub fn is_stable(&self) -> bool {
+        match self.0 {
+            Kind::Stable => true,
+            _ => false
+        }
+    }
+}
+
+impl fmt::Display for Channel {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "{}", self.as_str())
+    }
+}
diff --git a/vendor/version_check/src/date.rs b/vendor/version_check/src/date.rs
new file mode 100644
index 0000000000..55d9b24317
--- /dev/null
+++ b/vendor/version_check/src/date.rs
@@ -0,0 +1,167 @@
+use std::fmt;
+
+/// Release date including year, month, and day.
+// Internal storage is: y[31..9] | m[8..5] | d[5...0].
+#[derive(Debug, PartialEq, Eq, Copy, Clone, PartialOrd, Ord)]
+pub struct Date(u32);
+
+impl Date {
+    /// Reads the release date of the running compiler. If it cannot be
+    /// determined (see the [top-level documentation](crate)), returns `None`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Date;
+    ///
+    /// match Date::read() {
+    ///     Some(d) => format!("The release date is: {}", d),
+    ///     None => format!("Failed to read the release date.")
+    /// };
+    /// ```
+    pub fn read() -> Option<Date> {
+        ::get_version_and_date()
+            .and_then(|(_, date)| date)
+            .and_then(|date| Date::parse(&date))
+    }
+
+    /// Return the original (YYYY, MM, DD).
+    fn to_ymd(&self) -> (u16, u8, u8) {
+        let y = self.0 >> 9;
+        let m = (self.0 << 23) >> 28;
+        let d = (self.0 << 27) >> 27;
+        (y as u16, m as u8, d as u8)
+    }
+
+    /// Parse a release date of the form `%Y-%m-%d`. Returns `None` if `date` is
+    /// not in `%Y-%m-%d` format.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Date;
+    ///
+    /// let date = Date::parse("2016-04-20").unwrap();
+    ///
+    /// assert!(date.at_least("2016-01-10"));
+    /// assert!(date.at_most("2016-04-20"));
+    /// assert!(date.exactly("2016-04-20"));
+    ///
+    /// assert!(Date::parse("March 13, 2018").is_none());
+    /// assert!(Date::parse("1-2-3-4-5").is_none());
+    /// ```
+    pub fn parse(date: &str) -> Option<Date> {
+        let ymd: Vec<u32> = date.split("-")
+            .filter_map(|s| s.parse::<u32>().ok())
+            .collect();
+
+        if ymd.len() != 3 {
+            return None
+        }
+
+        let (y, m, d) = (ymd[0], ymd[1], ymd[2]);
+        Some(Date((y << 9) | ((m & 0xF) << 5) | (d & 0x1F)))
+    }
+
+    /// Returns `true` if `self` occurs on or after `date`.
+    ///
+    /// If `date` occurs before `self`, or if `date` is not in `%Y-%m-%d`
+    /// format, returns `false`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Date;
+    ///
+    /// let date = Date::parse("2020-01-01").unwrap();
+    ///
+    /// assert!(date.at_least("2019-12-31"));
+    /// assert!(date.at_least("2020-01-01"));
+    /// assert!(date.at_least("2014-04-31"));
+    ///
+    /// assert!(!date.at_least("2020-01-02"));
+    /// assert!(!date.at_least("2024-08-18"));
+    /// ```
+    pub fn at_least(&self, date: &str) -> bool {
+        Date::parse(date)
+            .map(|date| self >= &date)
+            .unwrap_or(false)
+    }
+
+    /// Returns `true` if `self` occurs on or before `date`.
+    ///
+    /// If `date` occurs after `self`, or if `date` is not in `%Y-%m-%d`
+    /// format, returns `false`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Date;
+    ///
+    /// let date = Date::parse("2020-01-01").unwrap();
+    ///
+    /// assert!(date.at_most("2020-01-01"));
+    /// assert!(date.at_most("2020-01-02"));
+    /// assert!(date.at_most("2024-08-18"));
+    ///
+    /// assert!(!date.at_most("2019-12-31"));
+    /// assert!(!date.at_most("2014-04-31"));
+    /// ```
+    pub fn at_most(&self, date: &str) -> bool {
+        Date::parse(date)
+            .map(|date| self <= &date)
+            .unwrap_or(false)
+    }
+
+    /// Returns `true` if `self` occurs exactly on `date`.
+    ///
+    /// If `date` is not exactly `self`, or if `date` is not in `%Y-%m-%d`
+    /// format, returns `false`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Date;
+    ///
+    /// let date = Date::parse("2020-01-01").unwrap();
+    ///
+    /// assert!(date.exactly("2020-01-01"));
+    ///
+    /// assert!(!date.exactly("2019-12-31"));
+    /// assert!(!date.exactly("2014-04-31"));
+    /// assert!(!date.exactly("2020-01-02"));
+    /// assert!(!date.exactly("2024-08-18"));
+    /// ```
+    pub fn exactly(&self, date: &str) -> bool {
+        Date::parse(date)
+            .map(|date| self == &date)
+            .unwrap_or(false)
+    }
+}
+
+impl fmt::Display for Date {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let (y, m, d) = self.to_ymd();
+        write!(f, "{}-{:02}-{:02}", y, m, d)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Date;
+
+    macro_rules! reflexive_display {
+        ($string:expr) => (
+            assert_eq!(Date::parse($string).unwrap().to_string(), $string);
+        )
+    }
+
+    #[test]
+    fn display() {
+        reflexive_display!("2019-05-08");
+        reflexive_display!("2000-01-01");
+        reflexive_display!("2000-12-31");
+        reflexive_display!("2090-12-31");
+        reflexive_display!("1999-02-19");
+    }
+}
diff --git a/vendor/version_check/src/lib.rs b/vendor/version_check/src/lib.rs
new file mode 100644
index 0000000000..6df728e25a
--- /dev/null
+++ b/vendor/version_check/src/lib.rs
@@ -0,0 +1,288 @@
+//! This tiny crate checks that the running or installed `rustc` meets some
+//! version requirements. The version is queried by calling the Rust compiler
+//! with `--version`. The path to the compiler is determined first via the
+//! `RUSTC` environment variable. If it is not set, then `rustc` is used. If
+//! that fails, no determination is made, and calls return `None`.
+//!
+//! # Examples
+//!
+//! Set a `cfg` flag in `build.rs` if the running compiler was determined to be
+//! at least version `1.13.0`:
+//!
+//! ```rust
+//! extern crate version_check as rustc;
+//!
+//! if rustc::is_min_version("1.13.0").unwrap_or(false) {
+//!     println!("cargo:rustc-cfg=question_mark_operator");
+//! }
+//! ```
+//!
+//! See [`is_max_version`] or [`is_exact_version`] to check if the compiler
+//! is _at most_ or _exactly_ a certain version.
+//!
+//! Check that the running compiler was released on or after `2018-12-18`:
+//!
+//! ```rust
+//! extern crate version_check as rustc;
+//!
+//! match rustc::is_min_date("2018-12-18") {
+//!     Some(true) => "Yep! It's recent!",
+//!     Some(false) => "No, it's older.",
+//!     None => "Couldn't determine the rustc version."
+//! };
+//! ```
+//!
+//! See [`is_max_date`] or [`is_exact_date`] to check if the compiler was
+//! released _prior to_ or _exactly on_ a certain date.
+//!
+//! Check that the running compiler supports feature flags:
+//!
+//! ```rust
+//! extern crate version_check as rustc;
+//!
+//! match rustc::is_feature_flaggable() {
+//!     Some(true) => "Yes! It's a dev or nightly release!",
+//!     Some(false) => "No, it's stable or beta.",
+//!     None => "Couldn't determine the rustc version."
+//! };
+//! ```
+//!
+//! Check that the running compiler is on the stable channel:
+//!
+//! ```rust
+//! extern crate version_check as rustc;
+//!
+//! match rustc::Channel::read() {
+//!     Some(c) if c.is_stable() => format!("Yes! It's stable."),
+//!     Some(c) => format!("No, the channel {} is not stable.", c),
+//!     None => format!("Couldn't determine the rustc version.")
+//! };
+//! ```
+//!
+//! To interact with the version, release date, and release channel as structs,
+//! use [`Version`], [`Date`], and [`Channel`], respectively. The [`triple()`]
+//! function returns all three values efficiently.
+//!
+//! # Alternatives
+//!
+//! This crate is dead simple with no dependencies. If you need something more
+//! and don't care about panicking if the version cannot be obtained, or if you
+//! don't mind adding dependencies, see
+//! [rustc_version](https://crates.io/crates/rustc_version).
+
+#![allow(deprecated)]
+
+mod version;
+mod channel;
+mod date;
+
+use std::env;
+use std::process::Command;
+
+#[doc(inline)] pub use version::*;
+#[doc(inline)] pub use channel::*;
+#[doc(inline)] pub use date::*;
+
+/// Parses (version, date) as available from rustc version string.
+fn version_and_date_from_rustc_version(s: &str) -> (Option<String>, Option<String>) {
+    let last_line = s.lines().last().unwrap_or(s);
+    let mut components = last_line.trim().split(" ");
+    let version = components.nth(1);
+    let date = components.filter(|c| c.ends_with(')')).next()
+        .map(|s| s.trim_right().trim_right_matches(")").trim_left().trim_left_matches('('));
+    (version.map(|s| s.to_string()), date.map(|s| s.to_string()))
+}
+
+/// Returns (version, date) as available from `rustc --version`.
+fn get_version_and_date() -> Option<(Option<String>, Option<String>)> {
+    env::var("RUSTC").ok()
+        .and_then(|rustc| Command::new(rustc).arg("--version").output().ok())
+        .or_else(|| Command::new("rustc").arg("--version").output().ok())
+        .and_then(|output| String::from_utf8(output.stdout).ok())
+        .map(|s| version_and_date_from_rustc_version(&s))
+}
+
+/// Reads the triple of [`Version`], [`Channel`], and [`Date`] of the installed
+/// or running `rustc`.
+///
+/// If any attribute cannot be determined (see the [top-level
+/// documentation](crate)), returns `None`.
+///
+/// To obtain only one of three attributes, use [`Version::read()`],
+/// [`Channel::read()`], or [`Date::read()`].
+pub fn triple() -> Option<(Version, Channel, Date)> {
+    let (version_str, date_str) = match get_version_and_date() {
+        Some((Some(version), Some(date))) => (version, date),
+        _ => return None
+    };
+
+    // Can't use `?` or `try!` for `Option` in 1.0.0.
+    match Version::parse(&version_str) {
+        Some(version) => match Channel::parse(&version_str) {
+            Some(channel) => match Date::parse(&date_str) {
+                Some(date) => Some((version, channel, date)),
+                _ => None,
+            },
+            _ => None,
+        },
+        _ => None
+    }
+}
+
+/// Checks that the running or installed `rustc` was released **on or after**
+/// some date.
+///
+/// The format of `min_date` must be YYYY-MM-DD. For instance: `2016-12-20` or
+/// `2017-01-09`.
+///
+/// If the date cannot be retrieved or parsed, or if `min_date` could not be
+/// parsed, returns `None`. Otherwise returns `true` if the installed `rustc`
+/// was release on or after `min_date` and `false` otherwise.
+pub fn is_min_date(min_date: &str) -> Option<bool> {
+    match (Date::read(), Date::parse(min_date)) {
+        (Some(rustc_date), Some(min_date)) => Some(rustc_date >= min_date),
+        _ => None
+    }
+}
+
+/// Checks that the running or installed `rustc` was released **on or before**
+/// some date.
+///
+/// The format of `max_date` must be YYYY-MM-DD. For instance: `2016-12-20` or
+/// `2017-01-09`.
+///
+/// If the date cannot be retrieved or parsed, or if `max_date` could not be
+/// parsed, returns `None`. Otherwise returns `true` if the installed `rustc`
+/// was release on or before `max_date` and `false` otherwise.
+pub fn is_max_date(max_date: &str) -> Option<bool> {
+    match (Date::read(), Date::parse(max_date)) {
+        (Some(rustc_date), Some(max_date)) => Some(rustc_date <= max_date),
+        _ => None
+    }
+}
+
+/// Checks that the running or installed `rustc` was released **exactly** on
+/// some date.
+///
+/// The format of `date` must be YYYY-MM-DD. For instance: `2016-12-20` or
+/// `2017-01-09`.
+///
+/// If the date cannot be retrieved or parsed, or if `date` could not be parsed,
+/// returns `None`. Otherwise returns `true` if the installed `rustc` was
+/// release on `date` and `false` otherwise.
+pub fn is_exact_date(date: &str) -> Option<bool> {
+    match (Date::read(), Date::parse(date)) {
+        (Some(rustc_date), Some(date)) => Some(rustc_date == date),
+        _ => None
+    }
+}
+
+/// Checks that the running or installed `rustc` is **at least** some minimum
+/// version.
+///
+/// The format of `min_version` is a semantic version: `1.3.0`, `1.15.0-beta`,
+/// `1.14.0`, `1.16.0-nightly`, etc.
+///
+/// If the version cannot be retrieved or parsed, or if `min_version` could not
+/// be parsed, returns `None`. Otherwise returns `true` if the installed `rustc`
+/// is at least `min_version` and `false` otherwise.
+pub fn is_min_version(min_version: &str) -> Option<bool> {
+    match (Version::read(), Version::parse(min_version)) {
+        (Some(rustc_ver), Some(min_ver)) => Some(rustc_ver >= min_ver),
+        _ => None
+    }
+}
+
+/// Checks that the running or installed `rustc` is **at most** some maximum
+/// version.
+///
+/// The format of `max_version` is a semantic version: `1.3.0`, `1.15.0-beta`,
+/// `1.14.0`, `1.16.0-nightly`, etc.
+///
+/// If the version cannot be retrieved or parsed, or if `max_version` could not
+/// be parsed, returns `None`. Otherwise returns `true` if the installed `rustc`
+/// is at most `max_version` and `false` otherwise.
+pub fn is_max_version(max_version: &str) -> Option<bool> {
+    match (Version::read(), Version::parse(max_version)) {
+        (Some(rustc_ver), Some(max_ver)) => Some(rustc_ver <= max_ver),
+        _ => None
+    }
+}
+
+/// Checks that the running or installed `rustc` is **exactly** some version.
+///
+/// The format of `version` is a semantic version: `1.3.0`, `1.15.0-beta`,
+/// `1.14.0`, `1.16.0-nightly`, etc.
+///
+/// If the version cannot be retrieved or parsed, or if `version` could not be
+/// parsed, returns `None`. Otherwise returns `true` if the installed `rustc` is
+/// exactly `version` and `false` otherwise.
+pub fn is_exact_version(version: &str) -> Option<bool> {
+    match (Version::read(), Version::parse(version)) {
+        (Some(rustc_ver), Some(version)) => Some(rustc_ver == version),
+        _ => None
+    }
+}
+
+/// Checks whether the running or installed `rustc` supports feature flags.
+///
+/// In other words, if the channel is either "nightly" or "dev".
+///
+/// If the version could not be determined, returns `None`. Otherwise returns
+/// `true` if the running version supports feature flags and `false` otherwise.
+pub fn is_feature_flaggable() -> Option<bool> {
+    Channel::read().map(|c| c.supports_features())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::version_and_date_from_rustc_version;
+
+    macro_rules! check_parse {
+        ($s:expr => $v:expr, $d:expr) => (
+            if let (Some(v), d) = version_and_date_from_rustc_version($s) {
+                let e_d: Option<&str> = $d.into();
+                assert_eq!((v, d), ($v.into(), e_d.map(|s| s.into())));
+            } else {
+                panic!("{:?} didn't parse for version testing.", $s);
+            }
+        )
+    }
+
+    #[test]
+    fn test_version_parse() {
+        check_parse!("rustc 1.18.0" => "1.18.0", None);
+        check_parse!("rustc 1.8.0" => "1.8.0", None);
+        check_parse!("rustc 1.20.0-nightly" => "1.20.0-nightly", None);
+        check_parse!("rustc 1.20" => "1.20", None);
+        check_parse!("rustc 1.3" => "1.3", None);
+        check_parse!("rustc 1" => "1", None);
+        check_parse!("rustc 1.5.1-beta" => "1.5.1-beta", None);
+
+        // Because of 1.0.0, we can't use Option<T>: From<T>.
+        check_parse!("rustc 1.20.0 (2017-07-09)"
+                     => "1.20.0", Some("2017-07-09"));
+
+        check_parse!("rustc 1.20.0-dev (2017-07-09)"
+                     => "1.20.0-dev", Some("2017-07-09"));
+
+        check_parse!("rustc 1.20.0-nightly (d84693b93 2017-07-09)"
+                       => "1.20.0-nightly", Some("2017-07-09"));
+
+        check_parse!("rustc 1.20.0 (d84693b93 2017-07-09)"
+                       => "1.20.0", Some("2017-07-09"));
+
+        check_parse!("warning: invalid logging spec 'warning', ignoring it
+                      rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
+                      => "1.30.0-nightly", Some("2018-09-20"));
+
+        check_parse!("warning: invalid logging spec 'warning', ignoring it\n
+                      rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
+                      => "1.30.0-nightly", Some("2018-09-20"));
+
+        check_parse!("warning: invalid logging spec 'warning', ignoring it
+                      warning: something else went wrong
+                      rustc 1.30.0-nightly (3bc2ca7e4 2018-09-20)"
+                      => "1.30.0-nightly", Some("2018-09-20"));
+    }
+}
diff --git a/vendor/version_check/src/version.rs b/vendor/version_check/src/version.rs
new file mode 100644
index 0000000000..a0738d983a
--- /dev/null
+++ b/vendor/version_check/src/version.rs
@@ -0,0 +1,238 @@
+use std::fmt;
+
+/// Version number: `major.minor.patch`, ignoring release channel.
+#[derive(Debug, PartialEq, Eq, Copy, Clone, PartialOrd, Ord)]
+pub struct Version(u64);
+
+impl Version {
+    fn to_mmp(&self) -> (u16, u16, u16) {
+        let major = self.0 >> 32;
+        let minor = (self.0 << 32) >> 48;
+        let patch = (self.0 << 48) >> 48;
+        (major as u16, minor as u16, patch as u16)
+    }
+
+    /// Reads the version of the running compiler. If it cannot be determined
+    /// (see the [top-level documentation](crate)), returns `None`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Version;
+    ///
+    /// match Version::read() {
+    ///     Some(d) => format!("Version is: {}", d),
+    ///     None => format!("Failed to read the version.")
+    /// };
+    /// ```
+    pub fn read() -> Option<Version> {
+        ::get_version_and_date()
+            .and_then(|(version, _)| version)
+            .and_then(|version| Version::parse(&version))
+    }
+
+
+    /// Parse a Rust release version (of the form
+    /// `major[.minor[.patch[-channel]]]`), ignoring the release channel, if
+    /// any. Returns `None` if `version` is not a valid Rust version string.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Version;
+    ///
+    /// let version = Version::parse("1.18.0").unwrap();
+    /// assert!(version.exactly("1.18.0"));
+    ///
+    /// let version = Version::parse("1.20.0-nightly").unwrap();
+    /// assert!(version.exactly("1.20.0"));
+    /// assert!(version.exactly("1.20.0-beta"));
+    ///
+    /// let version = Version::parse("1.3").unwrap();
+    /// assert!(version.exactly("1.3.0"));
+    ///
+    /// let version = Version::parse("1").unwrap();
+    /// assert!(version.exactly("1.0.0"));
+    ///
+    /// assert!(Version::parse("one.two.three").is_none());
+    /// ```
+    pub fn parse(version: &str) -> Option<Version> {
+        let mut mmp: Vec<u16> = version.split('-')
+            .nth(0)
+            .unwrap_or("")
+            .split('.')
+            .filter_map(|s| s.parse::<u16>().ok())
+            .collect();
+
+        if mmp.is_empty() {
+            return None
+        }
+
+        while mmp.len() < 3 {
+            mmp.push(0);
+        }
+
+        let (maj, min, patch) = (mmp[0] as u64, mmp[1] as u64, mmp[2] as u64);
+        Some(Version((maj << 32) | (min << 16) | patch))
+    }
+
+    /// Returns `true` if `self` is greater than or equal to `version`.
+    ///
+    /// If `version` is greater than `self`, or if `version` is not a valid Rust
+    /// version string, returns `false`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Version;
+    ///
+    /// let version = Version::parse("1.35.0").unwrap();
+    ///
+    /// assert!(version.at_least("1.33.0"));
+    /// assert!(version.at_least("1.35.0"));
+    /// assert!(version.at_least("1.13.2"));
+    ///
+    /// assert!(!version.at_least("1.35.1"));
+    /// assert!(!version.at_least("1.55.0"));
+    /// ```
+    pub fn at_least(&self, version: &str) -> bool {
+        Version::parse(version)
+            .map(|version| self >= &version)
+            .unwrap_or(false)
+    }
+
+    /// Returns `true` if `self` is less than or equal to `version`.
+    ///
+    /// If `version` is less than `self`, or if `version` is not a valid Rust
+    /// version string, returns `false`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Version;
+    ///
+    /// let version = Version::parse("1.35.0").unwrap();
+    ///
+    /// assert!(version.at_most("1.35.1"));
+    /// assert!(version.at_most("1.55.0"));
+    /// assert!(version.at_most("1.35.0"));
+    ///
+    /// assert!(!version.at_most("1.33.0"));
+    /// assert!(!version.at_most("1.13.2"));
+    /// ```
+    pub fn at_most(&self, version: &str) -> bool {
+        Version::parse(version)
+            .map(|version| self <= &version)
+            .unwrap_or(false)
+    }
+
+    /// Returns `true` if `self` is exactly equal to `version`.
+    ///
+    /// If `version` is not equal to `self`, or if `version` is not a valid Rust
+    /// version string, returns `false`.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// use version_check::Version;
+    ///
+    /// let version = Version::parse("1.35.0").unwrap();
+    ///
+    /// assert!(version.exactly("1.35.0"));
+    ///
+    /// assert!(!version.exactly("1.33.0"));
+    /// assert!(!version.exactly("1.35.1"));
+    /// assert!(!version.exactly("1.13.2"));
+    /// ```
+    pub fn exactly(&self, version: &str) -> bool {
+        Version::parse(version)
+            .map(|version| self == &version)
+            .unwrap_or(false)
+    }
+}
+
+impl fmt::Display for Version {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let (major, minor, patch) = self.to_mmp();
+        write!(f, "{}.{}.{}", major, minor, patch)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Version;
+
+    macro_rules! check_mmp {
+        ($s:expr => ($x:expr, $y:expr, $z:expr)) => (
+            if let Some(v) = Version::parse($s) {
+                if v.to_mmp() != ($x, $y, $z) {
+                    panic!("{:?} ({}) didn't parse as {}.{}.{}.", $s, v, $x, $y, $z);
+                }
+            } else {
+                panic!("{:?} didn't parse for mmp testing.", $s);
+            }
+        )
+    }
+
+    #[test]
+    fn test_str_to_mmp() {
+        check_mmp!("1.18.0" => (1, 18, 0));
+        check_mmp!("3.19.0" => (3, 19, 0));
+        check_mmp!("1.19.0-nightly" => (1, 19, 0));
+        check_mmp!("1.12.2349" => (1, 12, 2349));
+        check_mmp!("0.12" => (0, 12, 0));
+        check_mmp!("1.12.5" => (1, 12, 5));
+        check_mmp!("1.12" => (1, 12, 0));
+        check_mmp!("1" => (1, 0, 0));
+        check_mmp!("1.4.4-nightly (d84693b93 2017-07-09)" => (1, 4, 4));
+        check_mmp!("1.58879.4478-dev" => (1, 58879, 4478));
+        check_mmp!("1.58879.4478-dev (d84693b93 2017-07-09)" => (1, 58879, 4478));
+    }
+
+    #[test]
+    fn test_comparisons() {
+        let version = Version::parse("1.18.0").unwrap();
+        assert!(version.exactly("1.18.0"));
+        assert!(version.at_least("1.12.0"));
+        assert!(version.at_least("1.12"));
+        assert!(version.at_least("1"));
+        assert!(version.at_most("1.18.1"));
+        assert!(!version.exactly("1.19.0"));
+        assert!(!version.exactly("1.18.1"));
+
+        let version = Version::parse("1.20.0-nightly").unwrap();
+        assert!(version.exactly("1.20.0-beta"));
+        assert!(version.exactly("1.20.0-nightly"));
+        assert!(version.exactly("1.20.0"));
+        assert!(!version.exactly("1.19"));
+
+        let version = Version::parse("1.3").unwrap();
+        assert!(version.exactly("1.3.0"));
+        assert!(version.exactly("1.3.0-stable"));
+        assert!(version.exactly("1.3"));
+        assert!(!version.exactly("1.5.0-stable"));
+
+        let version = Version::parse("1").unwrap();
+        assert!(version.exactly("1.0.0"));
+        assert!(version.exactly("1.0"));
+        assert!(version.exactly("1"));
+
+        assert!(Version::parse("one.two.three").is_none());
+    }
+
+    macro_rules! reflexive_display {
+        ($s:expr) => (
+            assert_eq!(Version::parse($s).unwrap().to_string(), $s);
+        )
+    }
+
+    #[test]
+    fn display() {
+        reflexive_display!("1.0.0");
+        reflexive_display!("1.2.3");
+        reflexive_display!("1.12.1438");
+        reflexive_display!("1.44.0");
+        reflexive_display!("2.44.0");
+        reflexive_display!("23459.28923.3483");
+    }
+}
diff --git a/vendor/winapi-0.2.8/.cargo-checksum.json b/vendor/winapi-0.2.8/.cargo-checksum.json
deleted file mode 100644
index 8723902673..0000000000
--- a/vendor/winapi-0.2.8/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"d15a0464554e57323507a2ff34925a2c592f3dffec9beb092c7ce985440f5bda","LICENSE.md":"fd232cfaeeff018cd3b9f22e0279b1c2237742999277596638800e967f6e4a29","src/activation.rs":"0e25834dfecd59391e2ecfdaa2e01bb5ac4d181778b47d0b9f67c56a6b2bd75f","src/audioclient.rs":"8c645d4ddb171620a527bcc14fa2904ff9aeb529262e68a0a9957d2ed77118be","src/audiosessiontypes.rs":"ba8cd1950cdab112861208ac1ecc35e656cbbe36e60c31315e547cfe47707685","src/basetsd.rs":"7b879d3164d5e6ec1b94d18a6b58f74a7f4e62fc279df32126e76c4f3138239d","src/bcrypt.rs":"05fe44190a37dd744bff8fc682f25a47c5f4239d417b213d18542aaa19b08b06","src/cfg.rs":"057ace203f04f8c09b6f68fefba7d3eb6644c46f2e44ca8f1364a8bc3bdd4970","src/cfgmgr32.rs":"714289f058283fc89fc79bbd4932bdbc0e9a88edd62a1787aac82c338f2dfb45","src/combaseapi.rs":"45458b1e0d918b237afd7e9581e2714b58ee009a91bbec45827694d1159a2e8b","src/commctrl.rs":"c0173aabd50f34a85c2523876fa0191d052d1d0c157f95ed228d98508806cc7d","src/commdlg.rs":"e75f64491eea54f651884eb3cc5353588c7fe54b086b43557d6d4917abbf95cd","src/corsym.rs":"301f937c7cb394675b2127a24595beef261d269d8f7cb45d6b4ac21a063985e3","src/d2d1.rs":"e7aa08883d85e2631f5327541e644b650ad009095daadef606bb06d9ac99afd3","src/d2dbasetypes.rs":"5a26048c997a580d8bb2a3512f1cb20dba411da99ffd6b23f4b0615ab9378058","src/d3d10shader.rs":"d6edf923fa8442be35b7f4ebebcd2e4bec4c3842ed5aee4bfd05c2de11edc4e0","src/d3d11.rs":"3f2f681357730df7ea954fb78903f0f0ad0bb3b577727307e751fd9598a4e837","src/d3d11shader.rs":"29612cc75ba238e2cd691fdcc01be9c79ca12b046e207d3cbfc5af23f04c4cb9","src/d3d12.rs":"906e512385e78756fe84f9a9622c510ce5a6daeb121127cf93f11af0f2fa3763","src/d3d12sdklayers.rs":"b50edb48a1c51bc7e3bf7176733c3dad4eb45a4e9747096e3b5a723052e130c8","src/d3d12shader.rs":"ff58932ef32c108348e41864f09ac6f909d641cac4f94c3e4f6c3dc4e5916521","src/d3d9.rs":"e01614130a4d68bb6e2a23f62ffb4d5016381e9026f8477aaca64851c8dcad53","src/d3d9caps.rs":"d4bcf91b7ae307388c91c19eacdb808506faea184b03178feee5c47959211b7b","src/d3d9types.rs":"1e10aae6297bc8dc083b111da496313ff19dcb9b88450e2637f8e98c0401519c","src/d3dcommon.rs":"f841b2e4df6dfccb9eb1955add24689db7b173780ec25e99b89097140a012152","src/d3dcompiler.rs":"02269410bd7f83f49391f852320ca0d76fd8d907ed22c68a003af65b3f5ab54a","src/dbghelp.rs":"c0ea5bcd04f414a696cd876439a7c4d6ee63627f4662705d189fd6e0412622f8","src/dcommon.rs":"8889ca66e2f89f1c275e5d6b7d6b203e7f25b4e7a262689b2ec6f04b9d1b5ae8","src/devpropdef.rs":"74948513ed623d3bdf1ea3fbf1f540b3e9e46efb9c1674ecccfe7f2fae5792f2","src/docobj.rs":"43e214d9d0c436a88ed2c620b8386e58e4d549ba9c8be51bf52291caf95e225d","src/dpapi.rs":"d44a1a6c9e52b34e8e87df1079b97081c646f07d0eee51f0d0cf66ae1c6fd58a","src/dsgetdc.rs":"5911c35ef3d80a5162fdbea6902f9b07033b746ff91bff2657a0971edb07bff2","src/dsound.rs":"53a5532d645e1b7995f0b4a0f0711fc66da8a27b7f8c87ce3d9e0882cfdca07c","src/dsrole.rs":"50b27a8afb11188ce24ab49620fe69ea21658148d8fd6076b8927175db5c1a9e","src/dwmapi.rs":"e65ca961eec0db275e211e04c59a8995c8c13d36ab08dc36ce197d9a4856266f","src/dwrite.rs":"f138d36e8b93778a7866cc755893b4da19cfd6ce42427139589a0bbaa294eb44","src/dxgi.rs":"5b6fcc5c665df1c0c6ed3de5d678a7bade1bb8ab1acbe952b784ce99fc817e53","src/dxgi1_2.rs":"6ba44755d715f2493236103fc5c24d7d45dff2e1fc3690aefbd4eb6c859dbc07","src/dxgi1_3.rs":"1f86a9db5fd45199fcc3ce56423e5fcf0c58df4001e2b50c5586d38ab820b78f","src/dxgi1_4.rs":"c578e6fcb82d535b20fc10232b75a7b9512d068919cc1e3f1c7cf55f3eb46460","src/dxgiformat.rs":"2e73df34f480b6ef3b5e21de0a520dacec91b00772e42786568fd162ca5e9aa6","src/dxgitype.rs":"204b8dae38c13a1dd8cd2ce6ca68851f743b416213d6db1cd0d96808bcbf7058","src/errhandlingapi.rs":"a70f9db3dd8ab60aba0daf39f12b527e54e312ca640e0b80d80c93ffdb6913c6","src/excpt.rs":"b07cf9ff0d23dd50c0776d048d0c579e401b7d729635f78998f85d35f33f05a4","src/fileapi.rs":"d31814c612bbd9372abbf6f8455fc2af89ac236c6b1855da10d66545e485ec57","src/gl.rs":"9429708bb97aeecb2c40030460ed0c3415fc0f2335c9513c68afa6157bd9b465","src/guiddef.rs":"86618dcd39c77048c7e453e6e86dafe90358eb7f97144f9672ae09e7b9855729","src/heapapi.rs":"21e420ba7641e507e8f2801d2b0ed25dbcb98e967924d711beb5cbfa8a5785e4","src/hidclass.rs":"a93380d35dc4d45807b10bbd69ee63eb8517b75989b68391685070a2fcfbefa1","src/hidpi.rs":"0b641fc119ac35761fe8e5eaed9a0781e9018598ea269d6cd386dbf5563ab9a0","src/hidsdi.rs":"50abb938ea8d0af90ccdea7ac3de4bc10fe42e34bc6a6d6eb4da1b330727da34","src/hidusage.rs":"44adc029bc89f0d4977b1295b7e998ddabf5283de66e1e33146bda8968d1d98b","src/hstring.rs":"51b3e63e3f1ed48f54c63c3e820e0563fb857b2743529d5f947f718d43425b89","src/http.rs":"ebb8b8db9e786e2683ad8b9a9066ef418df773ae7ce4d75f166cb5321f85f5a0","src/imm.rs":"b9277502f17f4cc6bde4f80f722ec1b976913355edbf162814ccfec2b3b080fd","src/inaddr.rs":"938143669da02c83a31d207be11e2176ed5219edf0e6f8f7a5534a5c6c3ce8d1","src/inspectable.rs":"b01f1814a233a77bf9f25c264747252c0464388c7d9c7302e5bde57502b8139b","src/ksmedia.rs":"acb96b1ea0cf3b5397f9037958093c6b4dbb54c4246516e57b9fed055e8e69c1","src/lib.rs":"8a7840b030f56883f68bdf90a1a04df8be2a5e2698a9ea86c73fac59c9f09b6e","src/libloaderapi.rs":"21a5d17c9f8ac4c006b515979964a8870f30710be4482083f45c6a41a16a36ce","src/lmaccess.rs":"712661c871569513334152bdcdf56c07776c560a22cd5b892a0f38e1957e28db","src/lmcons.rs":"3449aab4399cc36e7d7db551e384d82dfa4204178c4cfb9642f90645687fbc81","src/lmdfs.rs":"c351cdb2d10bf3a7c5ce7400dcdca41a792554e21e75fa9e5378ac18d8d3e4e7","src/lmerrlog.rs":"7937928544d27575e302c5e9c5e6803e9033e1f4d715e7ca29be202276d7d7a6","src/lmjoin.rs":"362cdc71f3f50099b862eff0733b3a57dd0f95cac15943135f794424f651b916","src/lsalookup.rs":"4aef1a95033444181f2b2b9df364ea165b0fdedb396c63e5d12db6b7398a3d5f","src/macros.rs":"5dacc570f226b6f1ad31d76a03675f0d182a3d578846920000fabb7cd92fc7f8","src/memoryapi.rs":"2273b8bfd7fc36dcf654c320826952ad502e8922a84174f8c1f7ed08aa555a04","src/minschannel.rs":"139828de63a0a4476de2bee454f5bca5e8a46cc29f1680339bb2804ee2d17322","src/minwinbase.rs":"6cd387a7f79e1a708bc48b5b27eaeaa7aadf0fff7a5e0a76cda0bdf3fa871863","src/minwindef.rs":"47ba4f2ec7789109ae339170715ed76288ae60ee57a4f06d5cc50a0e6855699f","src/mmdeviceapi.rs":"c8b7f7b6b78488d23ccba2b34e8765eac60ec9f08e19c96b377d957f65b1b6d1","src/mmreg.rs":"1621fad6eaa16d1e5ca95055fd11bf066b777b1343625f9fdc74e4d313d60dea","src/mmsystem.rs":"f6a2bff3bf80af1468de2c2a5f7ff2ced2b625adaf24f08f9b303965ed5ee371","src/mscat.rs":"9226a8e30546c4142e4fcdc716f8a15cc7c8081c9e875ec72ff9e8551f86f9a1","src/mssip.rs":"d7e2b91e358ff4986e700396d04f92aa1671aafada0d4889914a413177c091e1","src/nb30.rs":"dd85d7849111f04d33895835269929dc219e04de4373e91468eb053e3e0a5c52","src/ncrypt.rs":"29f168dcddeaa2cb231a7174cec672be83cca192ffc4632cead4c4a25189fb49","src/ntdef.rs":"3be66042d16a862f0fed8f48406b08c3091fbf92885a44efb7747f4a764d7de7","src/ntsecapi.rs":"dfb2cc7e23e8b20fa5ffd30ccecdb81b62d8ffeb68fdf99f93fb141ff4155afd","src/ntstatus.rs":"de6208f4e119a6405c1726433ea5e47a8b5f46b345f5809e9f580cce88360a79","src/oaidl.rs":"640c911e39888928baf77145cca34c1a768bfd759ec9709f70649a2946cb3246","src/objbase.rs":"7c9edb6a9ea72baddb15a6aec3602b3f9e7b1ce969dd655f440eae0ede1372e2","src/objidl.rs":"2a623b989f2a216edca3bd118eceff41267632839a3fd4410df9a7c126a87b64","src/objidlbase.rs":"3415a0bcd1b5b63ff48e17138ff87dae7c31eaeb323ae81f34b6712efade1d04","src/olectl.rs":"da2014c3d5858c5abff1635e1b8c8223333e7d22d28cac614aac3305a7f04ee4","src/pdh.rs":"eb01459c2acc456ecd204c6716d26027a6c77c2b4a9b698d3c922254fe2cc319","src/playsoundapi.rs":"7efddfc8601de565946c8c93074211c83b20866a1588e36e0518bba9864d0cf0","src/processsnapshot.rs":"df99a56280e6e41c5896341ffa1abe734f6c8662f4d7ea960cb97fb34c5b85d9","src/processthreadsapi.rs":"bf8edf8984ee97bc5054e68d02ec4633b5f15720602ab19c95d78e7d420c9cc8","src/propidl.rs":"88b5f176e4624063cadd8db95db52bf07cff421d73a8cfe319f992a9c99cd315","src/propsys.rs":"05c411639479f88e77383c585117a886f48ea7453260210db9f283e2cafdffbf","src/prsht.rs":"f862538c0010a51a02e5f24b3a44b54ba5993c32400b98a3b0558741ae7473a3","src/psapi.rs":"512523c5f8334c9ad221a73776c0ed2da93d8e2353dc4d2cee951ffa6ea7c163","src/qos.rs":"9ef6183b7c03b5b412f81f38ebb06048ff6266032bc236964dd994f173b82ec4","src/reason.rs":"c92aded3bbea859f110eed73b9b0fb40df6ac4a6ed6431ca69882b46b5ad5229","src/restrictederrorinfo.rs":"b8c53f4ae149ea806028cdafe699390a20202d72028b5f62836bcbf97720d133","src/roapi.rs":"dbbefb19f402a2aece66b500739b0a9e2c4d0133a8bc94d076510d5a67def175","src/roerrorapi.rs":"84a0a71a3f9ce67a577954ee5761cbd97d892eb5e7eb2c381f6bd29d4e1d4af7","src/rpc.rs":"e2293651222edf37f3ad3076adaae9033b25b06bd7b88ed7372585a4ae46c7d9","src/rpcdce.rs":"de77ca3c9b689ffaaf395a6882d3dfc3a1cec181efa6cb6075e605e4462bc3f6","src/sapi.rs":"05dbc1166b836251538c9e52a772fa584a1d0a1ad823e4336ab5e6cfefb96d57","src/schannel.rs":"e48926896227ffae5033bd634a7c71f5359d7a08b7b8c6e94e03864d87a37f8b","src/servprov.rs":"f086b4330162c7da711ea59d7023304a8fa2a53470b54d846ea1c11567703693","src/setupapi.rs":"4959862dd39597cd711022fcefbaf5c75b61410d57d04e9dbec2ddf7a2fa6f31","src/shellapi.rs":"ce3e3e7cd8aefe8068d6c51256827c0c3d51a449e4ab73e7125ea28d44dd6b6d","src/shellscalingapi.rs":"59c162b0215ff4b71b3535b6e142cca8cd99028031f47f0a6efb960c160a8776","src/shlguid.rs":"dcb7a1ada1b1b90f405e6dea8bcf1fc6994725b49a3165b7908670b2c31490e5","src/shlobj.rs":"53ff059ec6123001bed8f007c36e40812f83e4e04bd50b371319d10b4e38c36f","src/shobjidl.rs":"953d6ef4dc2a0d175d7133dc2f41255123ab8f778b22feaebd8ca1fa77356aa7","src/shtypes.rs":"ff785004e819bcfc521ab79327e58f98debab4e40c20412bbecdcee1b2801371","src/spapidef.rs":"9abe751425b6aaac7e4a7ea49f6d8e859f8f73164abd4d69b48e3e224d7de829","src/sql.rs":"004ed353b40bb4bceab55d6e8c33063a8eac992b076e47e6ead8303dbbc5b67f","src/sqltypes.rs":"0c5fa183c9f5b9e16e292de6a9afdf73f554730e651250856148ac04718803b8","src/sspi.rs":"dbd9d544abea4396983867ef4f7fbe2588673cc953dbeb74e7edc46503b16fa0","src/strmif.rs":"168040999cf99843cc1447988e46c56481a7a343ae41ab854db40ef566fa1119","src/subauth.rs":"183dd0df6436e9f0e859d62ca78e8ed42d4c1a5dc0690dcf22d42467fd2e0700","src/synchapi.rs":"cfce677c85377a340cb9307d9ac9eb06ffe9fd5e2ce08ed4a0390729e3a7d717","src/sysinfoapi.rs":"9a5579143263ce20d8c365b9874a0ae90ef28bc3295eab26ba3782efa48b464a","src/threadpoolapi.rs":"57876ea70b86d08663f7916ce076547f17596c26b8bf4dfafbad60e78264ff95","src/timezoneapi.rs":"5ccd80e6d16a858c56e20a7f3c5570e29777dab0fdfc057b6d2fb06463d56eb3","src/tlhelp32.rs":"c96ef7416bceab473463cc4ad98f037aeaac87bb7adf45cc16c281308537e82f","src/unknwnbase.rs":"2708c19491deb7364100025f3bb88a791c219551a65af70a776f8f3c5bf18b05","src/urlhist.rs":"8c8c0d0a613e59f68bf0e8cec061ea2126baa98d1479df4d07c8df5e41b50bc1","src/urlmon.rs":"0652e602ef2f5826360e5eab68bdf4f9365827a012c2c89289c54016ea001b74","src/usb.rs":"7e682ee819b237eabe796e604cff2434c450f724f4c86d919683eb7a5167c343","src/usbspec.rs":"d19671960838eb592cda4cd7c84c6f66cd9484f0904b5a28e1d8fd91e9c2c6af","src/usp10.rs":"baa2c1ef6ca5f064bc55b24f39c0553ede45a87b9183318572916fd4f1c679c6","src/vadefs.rs":"0e2f12fd1c521a943908669b2d10fceea409bac45242ec6e87c0e69706c1b3d0","src/vsbackup.rs":"af71cb851bd7eacde9d3e46a112497baef3ecebb472aae3c76c7faff804d33f9","src/vss.rs":"a626613810a69309b8f50d0a3bd75928d9de771c2287b6242487cb8cd55394a0","src/vsserror.rs":"f06b108d66ea9f06ad15d83b981117ed6a2a9cd218bb3bf53f13b0055acd9b2e","src/vswriter.rs":"8c4f5d27fa0883d187506538136cc610074941bb952afbe0984f7cb7c3c656f7","src/werapi.rs":"a2d692514ff3a61126971c5c2c5a7298c0f822559550a7f14501f8c96d1d951a","src/winbase.rs":"e224c40d827b1f1a9c74643c000f71e87ad18f749810cc611425af325c9472b8","src/wincon.rs":"402c5ebf80aa6ab1002935b7ddca17e8a243d0c714982054395862fe0ae40a04","src/wincred.rs":"e5fa987622dd880151ae190bb45daa666ffae3ae8e2da97407210afe01dd93d6","src/wincrypt.rs":"f7f8743b6a89d3f5e8b07405e43010bb3729aa8a8cf4546cc02705f802947ebc","src/windef.rs":"89fa9f5ab2909a4840f16979ebbc0afa2134abcb1d47cb7435b581f31b227658","src/windowscodecs.rs":"7c63bc4e2d0e7ce60c7bb13b93ef5aa12213f71a46845b6e034a9c224ef3eb3c","src/windowsx.rs":"414a9a841590f88804da3eb9ba55d583372a467cc50ab1ebdd7cfc653ce5f627","src/winerror.rs":"f3882eba4e299acbdedd548feb1ff89de958fb72d665bd6ba013b6a1f7596b52","src/winevt.rs":"64ae96f475ed98da7a84704d53d16caccbac2dbd525de0ef0f65fc58a6775ed1","src/wingdi.rs":"35aa9dd14b4b4c5a227ac3df0d312c19cbaede2d1388c26ad8eb910e80efeafd","src/winhttp.rs":"37769be104a2eb9efa70ffd74c8f38a09d9639cf575a677ad75d941e8d87cd58","src/winioctl.rs":"0f0efe0a41894a325b70428d04aeddec8dd7a87a91489a4e564a248e8498861b","src/winnetwk.rs":"d492c3d14a422f611166d39b895ddc6dd749ebc64a020bf3125af452494f91dd","src/winnls.rs":"90904d6adad70081a620165223fb4a71b64d747596c64d0df7de9511cd0f75c6","src/winnt.rs":"2c51ad0a065006010f1cfe7a3335274304e4747adc63f9798e1ca1f7091154a5","src/winreg.rs":"c687a5c6433daa13793815ef9af8befaedc9635be14eea0c618ad5334952dc31","src/winscard.rs":"78ab1d3ae22e486726740c343a4cc6268ca318de43f4b7d7ba51acbdf1b93936","src/winsmcrd.rs":"62be129c3d4cdea9dd31e769b587f071a94c347c8df71a43bb1eea18d52a60cc","src/winsock2.rs":"21dc0393f37f56c15c59d49a32861fb24c8f28d43ce26b56d958a174a5040a76","src/winspool.rs":"a3bd8e04f2db6118fe529bf52cb856a773cd8b816d197fc8edc8ac942578fd74","src/winstring.rs":"dc535f972d93be2fe067a5ca64edb45b6ad8e4549ecc0ce24486bd94555d5707","src/winsvc.rs":"7999f00b341f3e0e8701ea89f71986a6600650ff8cffdb1292e9f55d47bd0a3e","src/winusb.rs":"0ac355aa879a4aae501db04f1e8859dbef5e33fda9d46a7a12ef25e5524ec396","src/winusbio.rs":"8e2d64832999b59b2ea900396184c36d34cf94c97f31e15916c299213748a3e1","src/winuser.rs":"791bd8625812feccc8ec421489194d635c94cb4c4d754287a0caa54fa8f71c19","src/ws2def.rs":"0a1c7a69e4da8edc0584b0e3fb4ad1fa4aed621510b1bc1b0d104990577c6a38","src/ws2ipdef.rs":"c6a898cf25d187ad83e110af1e2286824868691a60818ecc44e68fa0bbbd4ff6","src/ws2spi.rs":"e63da700de55a317769230319eb9e4ec85cc0ac80b2baa076399367338b7ca0f","src/ws2tcpip.rs":"698084fd5d631a2ef236fe76001e7c44afd9b8958243e4ad4c098ac4beb4b352","src/wtypes.rs":"2689e8f442ccdc0b0e1ec82160a5cc3e80abf95dca82855ec595314062774a14","src/wtypesbase.rs":"f6dc0a8b09f3f003339c5dd366bdddb9dd671894be9dcf4a42058b226d2917a8","src/xinput.rs":"e15cd46bf18977481e22d609f8e0bb5508776902d7fa64477bb5b78596c0f67d"},"package":"167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"}
\ No newline at end of file
diff --git a/vendor/winapi-0.2.8/Cargo.toml b/vendor/winapi-0.2.8/Cargo.toml
deleted file mode 100644
index 941a659b0f..0000000000
--- a/vendor/winapi-0.2.8/Cargo.toml
+++ /dev/null
@@ -1,61 +0,0 @@
-[package]
-name = "winapi"
-version = "0.2.8"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."
-documentation = "https://retep998.github.io/doc/winapi/"
-repository = "https://github.com/retep998/winapi-rs"
-readme = "README.md"
-keywords = ["windows", "ffi", "win32", "com", "directx"]
-license = "MIT"
-include = ["src/**/*", "Cargo.toml", "LICENSE.md"]
-
-[dev-dependencies]
-advapi32-sys = { version = "0", path = "lib/advapi32" }
-bcrypt-sys = { version = "0", path = "lib/bcrypt" }
-comctl32-sys = { version = "0", path = "lib/comctl32" }
-comdlg32-sys = { version = "0", path = "lib/comdlg32" }
-credui-sys = { version = "0", path = "lib/credui" }
-crypt32-sys = { version = "0", path = "lib/crypt32" }
-d2d1-sys = { version = "0", path = "lib/d2d1" }
-d3d11-sys = { version = "0", path = "lib/d3d11" }
-d3d12-sys = { version = "0", path = "lib/d3d12" }
-d3d9-sys = { version = "0", path = "lib/d3d9" }
-d3dcompiler-sys = { version = "0", path = "lib/d3dcompiler" }
-dbghelp-sys = { version = "0", path = "lib/dbghelp" }
-dsound-sys = { version = "0", path = "lib/dsound" }
-dwmapi-sys = { version = "0", path = "lib/dwmapi" }
-dwrite-sys = { version = "0", path = "lib/dwrite" }
-dxgi-sys = { version = "0", path = "lib/dxgi" }
-dxguid-sys = { version = "0", path = "lib/dxguid" }
-gdi32-sys = { version = "0", path = "lib/gdi32" }
-hid-sys = { version = "0", path = "lib/hid" }
-httpapi-sys = { version = "0", path = "lib/httpapi" }
-kernel32-sys = { version = "0", path = "lib/kernel32" }
-ktmw32-sys = { version = "0", path = "lib/ktmw32" }
-mpr-sys = { version = "0", path = "lib/mpr" }
-netapi32-sys = { version = "0", path = "lib/netapi32" }
-odbc32-sys = { version = "0", path = "lib/odbc32" }
-ole32-sys = { version = "0", path = "lib/ole32" }
-oleaut32-sys = { version = "0", path = "lib/oleaut32" }
-opengl32-sys = { version = "0", path = "lib/opengl32" }
-pdh-sys = { version = "0", path = "lib/pdh" }
-psapi-sys = { version = "0", path = "lib/psapi" }
-runtimeobject-sys = { version = "0", path = "lib/runtimeobject" }
-secur32-sys = { version = "0", path = "lib/secur32" }
-setupapi-sys = { version = "0", path = "lib/setupapi" }
-shell32-sys = { version = "0", path = "lib/shell32" }
-shlwapi-sys = { version = "0", path = "lib/shlwapi" }
-user32-sys = { version = "0", path = "lib/user32" }
-userenv-sys = { version = "0", path = "lib/userenv" }
-usp10-sys = { version = "0", path = "lib/usp10" }
-uuid-sys = { version = "0", path = "lib/uuid" }
-vssapi-sys = { version = "0", path = "lib/vssapi" }
-wevtapi-sys = { version = "0", path = "lib/wevtapi" }
-winhttp-sys = { version = "0", path = "lib/winhttp" }
-winmm-sys = { version = "0", path = "lib/winmm" }
-winscard-sys = { version = "0", path = "lib/winscard" }
-winspool-sys = { version = "0", path = "lib/winspool" }
-winusb-sys = { version = "0", path = "lib/winusb" }
-ws2_32-sys = { version = "0", path = "lib/ws2_32" }
-xinput-sys = { version = "0", path = "lib/xinput" }
diff --git a/vendor/winapi-0.2.8/LICENSE.md b/vendor/winapi-0.2.8/LICENSE.md
deleted file mode 100644
index 60d12ac7b7..0000000000
--- a/vendor/winapi-0.2.8/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Peter Atashian
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/winapi-0.2.8/src/activation.rs b/vendor/winapi-0.2.8/src/activation.rs
deleted file mode 100644
index f94f81b4ea..0000000000
--- a/vendor/winapi-0.2.8/src/activation.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-RIDL!(
-interface IActivationFactory(IActivationFactoryVtbl): IInspectable(IInspectableVtbl) {
-    fn ActivateInstance(&mut self, instance: *mut *mut ::IInspectable) -> ::HRESULT
-}
-);
\ No newline at end of file
diff --git a/vendor/winapi-0.2.8/src/audioclient.rs b/vendor/winapi-0.2.8/src/audioclient.rs
deleted file mode 100644
index 5a5ee6a84c..0000000000
--- a/vendor/winapi-0.2.8/src/audioclient.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-//1627
-pub const AUDCLNT_E_NOT_INITIALIZED: ::HRESULT = AUDCLNT_ERR!(0x001);
-pub const AUDCLNT_E_ALREADY_INITIALIZED: ::HRESULT = AUDCLNT_ERR!(0x002);
-pub const AUDCLNT_E_WRONG_ENDPOINT_TYPE: ::HRESULT = AUDCLNT_ERR!(0x003);
-pub const AUDCLNT_E_DEVICE_INVALIDATED: ::HRESULT = AUDCLNT_ERR!(0x004);
-pub const AUDCLNT_E_NOT_STOPPED: ::HRESULT = AUDCLNT_ERR!(0x005);
-pub const AUDCLNT_E_BUFFER_TOO_LARGE: ::HRESULT = AUDCLNT_ERR!(0x006);
-pub const AUDCLNT_E_OUT_OF_ORDER: ::HRESULT = AUDCLNT_ERR!(0x007);
-pub const AUDCLNT_E_UNSUPPORTED_FORMAT: ::HRESULT = AUDCLNT_ERR!(0x008);
-pub const AUDCLNT_E_INVALID_SIZE: ::HRESULT = AUDCLNT_ERR!(0x009);
-pub const AUDCLNT_E_DEVICE_IN_USE: ::HRESULT = AUDCLNT_ERR!(0x00a);
-pub const AUDCLNT_E_BUFFER_OPERATION_PENDING: ::HRESULT = AUDCLNT_ERR!(0x00b);
-pub const AUDCLNT_E_THREAD_NOT_REGISTERED: ::HRESULT = AUDCLNT_ERR!(0x00c);
-pub const AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED: ::HRESULT = AUDCLNT_ERR!(0x00e);
-pub const AUDCLNT_E_ENDPOINT_CREATE_FAILED: ::HRESULT = AUDCLNT_ERR!(0x00f);
-pub const AUDCLNT_E_SERVICE_NOT_RUNNING: ::HRESULT = AUDCLNT_ERR!(0x010);
-pub const AUDCLNT_E_EVENTHANDLE_NOT_EXPECTED: ::HRESULT = AUDCLNT_ERR!(0x011);
-pub const AUDCLNT_E_EXCLUSIVE_MODE_ONLY: ::HRESULT = AUDCLNT_ERR!(0x012);
-pub const AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL: ::HRESULT = AUDCLNT_ERR!(0x013);
-pub const AUDCLNT_E_EVENTHANDLE_NOT_SET: ::HRESULT = AUDCLNT_ERR!(0x014);
-pub const AUDCLNT_E_INCORRECT_BUFFER_SIZE: ::HRESULT = AUDCLNT_ERR!(0x015);
-pub const AUDCLNT_E_BUFFER_SIZE_ERROR: ::HRESULT = AUDCLNT_ERR!(0x016);
-pub const AUDCLNT_E_CPUUSAGE_EXCEEDED: ::HRESULT = AUDCLNT_ERR!(0x017);
-pub const AUDCLNT_E_BUFFER_ERROR: ::HRESULT = AUDCLNT_ERR!(0x018);
-pub const AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED: ::HRESULT = AUDCLNT_ERR!(0x019);
-pub const AUDCLNT_E_INVALID_DEVICE_PERIOD: ::HRESULT = AUDCLNT_ERR!(0x020);
-pub const AUDCLNT_E_INVALID_STREAM_FLAG: ::HRESULT = AUDCLNT_ERR!(0x021);
-pub const AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE: ::HRESULT = AUDCLNT_ERR!(0x022);
-pub const AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES: ::HRESULT = AUDCLNT_ERR!(0x023);
-pub const AUDCLNT_E_OFFLOAD_MODE_ONLY: ::HRESULT = AUDCLNT_ERR!(0x024);
-pub const AUDCLNT_E_NONOFFLOAD_MODE_ONLY: ::HRESULT = AUDCLNT_ERR!(0x025);
-pub const AUDCLNT_E_RESOURCES_INVALIDATED: ::HRESULT = AUDCLNT_ERR!(0x026);
-pub const AUDCLNT_E_RAW_MODE_UNSUPPORTED: ::HRESULT = AUDCLNT_ERR!(0x027);
-pub const AUDCLNT_S_BUFFER_EMPTY: ::SCODE = AUDCLNT_SUCCESS!(0x001);
-pub const AUDCLNT_S_THREAD_ALREADY_REGISTERED: ::SCODE = AUDCLNT_SUCCESS!(0x002);
-pub const AUDCLNT_S_POSITION_STALLED: ::SCODE = AUDCLNT_SUCCESS!(0x003);
-DEFINE_GUID!(IID_IAudioClient, 0x1CB9AD4C, 0xDBFA, 0x4c32,
-    0xB1, 0x78, 0xC2, 0xF5, 0x68, 0xA7, 0x03, 0xB2);
-DEFINE_GUID!(IID_IAudioRenderClient, 0xF294ACFC, 0x3146, 0x4483,
-    0xA7, 0xBF, 0xAD, 0xDC, 0xA7, 0xC2, 0x60, 0xE2);
-RIDL!{interface IAudioClient(IAudioClientVtbl): IUnknown(IUnknownVtbl) {
-    fn Initialize(
-        &mut self, ShareMode: ::AUDCLNT_SHAREMODE, StreamFlags: ::DWORD,
-        hnsBufferDuration: ::REFERENCE_TIME, hnsPeriodicity: ::REFERENCE_TIME,
-        pFormat: *const ::WAVEFORMATEX, AudioSessionGuid: ::LPCGUID
-    ) -> ::HRESULT,
-    fn GetBufferSize(&mut self, pNumBufferFrames: *mut ::UINT32) -> ::HRESULT,
-    fn GetStreamLatency(&mut self, phnsLatency: *mut ::REFERENCE_TIME) -> ::HRESULT,
-    fn GetCurrentPadding(&mut self, pNumPaddingFrames: *mut ::UINT32) -> ::HRESULT,
-    fn IsFormatSupported(
-        &mut self, ShareMode: ::AUDCLNT_SHAREMODE, pFormat: *const ::WAVEFORMATEX,
-        ppClosestMatch: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetMixFormat(&mut self, ppDeviceFormat: *mut *mut ::WAVEFORMATEX) -> ::HRESULT,
-    fn GetDevicePeriod(
-        &mut self, phnsDefaultDevicePeriod: *mut ::REFERENCE_TIME,
-        phnsMinimumDevicePeriod: *mut ::REFERENCE_TIME
-    ) -> ::HRESULT,
-    fn Start(&mut self) -> ::HRESULT,
-    fn Stop(&mut self) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn SetEventHandle(&mut self, eventHandle: ::HANDLE) -> ::HRESULT,
-    fn GetService(&mut self, riid: ::REFIID, ppv: *mut ::LPVOID) -> ::HRESULT
-}}
-RIDL!{interface IAudioRenderClient(IAudioRenderClientVtbl): IUnknown(IUnknownVtbl) {
-    fn GetBuffer(&mut self, NumFramesRequested: ::UINT32, ppData: *mut *mut ::BYTE) -> ::HRESULT,
-    fn ReleaseBuffer(&mut self, NumFramesWritten: ::UINT32, dwFlags: ::DWORD) -> ::HRESULT
-}}
diff --git a/vendor/winapi-0.2.8/src/audiosessiontypes.rs b/vendor/winapi-0.2.8/src/audiosessiontypes.rs
deleted file mode 100644
index 796f17f286..0000000000
--- a/vendor/winapi-0.2.8/src/audiosessiontypes.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-ENUM!{enum AUDCLNT_SHAREMODE {
-    AUDCLNT_SHAREMODE_SHARED,
-    AUDCLNT_SHAREMODE_EXCLUSIVE,
-}}
-pub const AUDCLNT_STREAMFLAGS_CROSSPROCESS: ::DWORD = 0x00010000;
-pub const AUDCLNT_STREAMFLAGS_LOOPBACK: ::DWORD = 0x00020000;
-pub const AUDCLNT_STREAMFLAGS_EVENTCALLBACK: ::DWORD = 0x00040000;
-pub const AUDCLNT_STREAMFLAGS_NOPERSIST: ::DWORD = 0x00080000;
-pub const AUDCLNT_STREAMFLAGS_RATEADJUST: ::DWORD = 0x00100000;
diff --git a/vendor/winapi-0.2.8/src/basetsd.rs b/vendor/winapi-0.2.8/src/basetsd.rs
deleted file mode 100644
index 6bf20fc96d..0000000000
--- a/vendor/winapi-0.2.8/src/basetsd.rs
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Type definitions for the basic sized types.
-#[cfg(target_arch = "x86")]
-pub type POINTER_64_INT = ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type POINTER_64_INT = ::__uint64;
-pub type INT8 = ::c_schar;
-pub type PINT8 = *mut ::c_schar;
-pub type INT16 = ::c_short;
-pub type PINT16 = *mut ::c_short;
-pub type INT32 = ::c_int;
-pub type PINT32 = *mut ::c_int;
-pub type INT64 = ::__int64;
-pub type PINT64 = *mut ::__int64;
-pub type UINT8 = ::c_uchar;
-pub type PUINT8 = *mut ::c_uchar;
-pub type UINT16 = ::c_ushort;
-pub type PUINT16 = *mut ::c_ushort;
-pub type UINT32 = ::c_uint;
-pub type PUINT32 = *mut ::c_uint;
-pub type UINT64 = ::__uint64;
-pub type PUINT64 = *mut ::__uint64;
-pub type LONG32 = ::c_int;
-pub type PLONG32 = *mut ::c_int;
-pub type ULONG32 = ::c_uint;
-pub type PULONG32 = *mut ::c_uint;
-pub type DWORD32 = ::c_uint;
-pub type PDWORD32 = *mut ::c_uint;
-#[cfg(target_arch = "x86")]
-pub type INT_PTR = ::c_int;
-#[cfg(target_arch = "x86_64")]
-pub type INT_PTR = ::__int64;
-#[cfg(target_arch = "x86")]
-pub type PINT_PTR = *mut ::c_int;
-#[cfg(target_arch = "x86_64")]
-pub type PINT_PTR = *mut ::__int64;
-#[cfg(target_arch = "x86")]
-pub type UINT_PTR = ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type UINT_PTR = ::__uint64;
-#[cfg(target_arch = "x86")]
-pub type PUINT_PTR = *mut ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type PUINT_PTR = *mut ::__uint64;
-#[cfg(target_arch = "x86")]
-pub type LONG_PTR = ::c_long;
-#[cfg(target_arch = "x86_64")]
-pub type LONG_PTR = ::__int64;
-#[cfg(target_arch = "x86")]
-pub type PLONG_PTR = *mut ::c_long;
-#[cfg(target_arch = "x86_64")]
-pub type PLONG_PTR = *mut ::__int64;
-#[cfg(target_arch = "x86")]
-pub type ULONG_PTR = ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type ULONG_PTR = ::__uint64;
-#[cfg(target_arch = "x86")]
-pub type PULONG_PTR = *mut ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type PULONG_PTR = *mut ::__uint64;
-#[cfg(target_arch = "x86_64")]
-pub type SHANDLE_PTR = ::__int64;
-#[cfg(target_arch = "x86_64")]
-pub type HANDLE_PTR = ::__uint64;
-#[cfg(target_arch = "x86_64")]
-pub type UHALF_PTR = ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type PUHALF_PTR = *mut ::c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type HALF_PTR = ::c_int;
-#[cfg(target_arch = "x86_64")]
-pub type PHALF_PTR = *mut ::c_int;
-#[cfg(target_arch = "x86")]
-pub type SHANDLE_PTR = ::c_long;
-#[cfg(target_arch = "x86")]
-pub type HANDLE_PTR = ::c_ulong;
-#[cfg(target_arch = "x86")]
-pub type UHALF_PTR = ::c_ushort;
-#[cfg(target_arch = "x86")]
-pub type PUHALF_PTR = *mut ::c_ushort;
-#[cfg(target_arch = "x86")]
-pub type HALF_PTR = ::c_short;
-#[cfg(target_arch = "x86")]
-pub type PHALF_PTR = *mut ::c_short;
-pub type SIZE_T = ULONG_PTR;
-pub type PSIZE_T = *mut ULONG_PTR;
-pub type SSIZE_T = LONG_PTR;
-pub type PSSIZE_T = *mut LONG_PTR;
-pub type DWORD_PTR = ULONG_PTR;
-pub type PDWORD_PTR = *mut ULONG_PTR;
-pub type LONG64 = ::__int64;
-pub type PLONG64 = *mut ::__int64;
-pub type ULONG64 = ::__uint64;
-pub type PULONG64 = *mut ::__uint64;
-pub type DWORD64 = ::__uint64;
-pub type PDWORD64 = *mut ::__uint64;
-pub type KAFFINITY = ULONG_PTR;
-pub type PKAFFINITY = *mut KAFFINITY;
diff --git a/vendor/winapi-0.2.8/src/bcrypt.rs b/vendor/winapi-0.2.8/src/bcrypt.rs
deleted file mode 100644
index ee818a5bd0..0000000000
--- a/vendor/winapi-0.2.8/src/bcrypt.rs
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Cryptographic Primitive API Prototypes and Definitions
-pub const KDF_HASH_ALGORITHM: ::ULONG = 0x0;
-pub const KDF_SECRET_PREPEND: ::ULONG = 0x1;
-pub const KDF_SECRET_APPEND: ::ULONG = 0x2;
-pub const KDF_HMAC_KEY: ::ULONG = 0x3;
-pub const KDF_TLS_PRF_LABEL: ::ULONG = 0x4;
-pub const KDF_TLS_PRF_SEED: ::ULONG = 0x5;
-pub const KDF_SECRET_HANDLE: ::ULONG = 0x6;
-pub const KDF_TLS_PRF_PROTOCOL: ::ULONG = 0x7;
-pub const KDF_ALGORITHMID: ::ULONG = 0x8;
-pub const KDF_PARTYUINFO: ::ULONG = 0x9;
-pub const KDF_PARTYVINFO: ::ULONG = 0xA;
-pub const KDF_SUPPPUBINFO: ::ULONG = 0xB;
-pub const KDF_SUPPPRIVINFO: ::ULONG = 0xC;
-pub const KDF_LABEL: ::ULONG = 0xD;
-pub const KDF_CONTEXT: ::ULONG = 0xE;
-pub const KDF_SALT: ::ULONG = 0xF;
-pub const KDF_ITERATION_COUNT: ::ULONG = 0x10;
-pub const KDF_GENERIC_PARAMETER: ::ULONG = 0x11;
-pub const KDF_KEYBITLENGTH: ::ULONG = 0x12;
-pub const KDF_USE_SECRET_AS_HMAC_KEY_FLAG: ::ULONG = 0x1;
-STRUCT!{struct BCRYPT_KEY_LENGTHS_STRUCT {
-    dwMinLength: ::ULONG,
-    dwMaxLength: ::ULONG,
-    dwIncrement: ::ULONG,
-}}
-pub type BCRYPT_AUTH_TAG_LENGTHS_STRUCT = BCRYPT_KEY_LENGTHS_STRUCT;
-STRUCT!{struct BCRYPT_OID {
-    cbOID: ::ULONG,
-    pbOID: ::PUCHAR,
-}}
-STRUCT!{struct BCRYPT_OID_LIST {
-    dwOIDCount: ::ULONG,
-    pOIDs: *mut BCRYPT_OID,
-}}
-STRUCT!{struct BCRYPT_PKCS1_PADDING_INFO {
-    pszAlgId: ::LPCWSTR,
-}}
-STRUCT!{struct BCRYPT_PSS_PADDING_INFO {
-    pszAlgId: ::LPCWSTR,
-    cbSalt: ::ULONG,
-}}
-STRUCT!{struct BCRYPT_OAEP_PADDING_INFO {
-    pszAlgId: ::LPCWSTR,
-    pbLabel: ::PUCHAR,
-    cbLabel: ::ULONG,
-}}
-pub const BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION: ::ULONG = 1;
-pub const BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG: ::ULONG = 0x00000001;
-pub const BCRYPT_AUTH_MODE_IN_PROGRESS_FLAG: ::ULONG = 0x00000002;
-STRUCT!{struct BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO {
-    cbSize: ::ULONG,
-    dwInfoVersion: ::ULONG,
-    pbNonce: ::PUCHAR,
-    cbNonce: ::ULONG,
-    pbAuthData: ::PUCHAR,
-    cbAuthData: ::ULONG,
-    pbTag: ::PUCHAR,
-    cbTag: ::ULONG,
-    pbMacContext: ::PUCHAR,
-    cbMacContext: ::ULONG,
-    cbAAD: ::ULONG,
-    cbData: ::ULONGLONG,
-    dwFlags: ::ULONG,
-}}
-pub type PBCRYPT_AUTHENTICATED_CIPHER_MODE_INFO = *mut BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO;
-pub const BCRYPT_PROV_DISPATCH: ::ULONG = 0x00000001;
-pub const BCRYPT_BLOCK_PADDING: ::ULONG = 0x00000001;
-pub const BCRYPT_PAD_NONE: ::ULONG = 0x00000001;
-pub const BCRYPT_PAD_PKCS1: ::ULONG = 0x00000002;
-pub const BCRYPT_PAD_OAEP: ::ULONG = 0x00000004;
-pub const BCRYPT_PAD_PSS: ::ULONG = 0x00000008;
-pub const BCRYPT_PAD_PKCS1_OPTIONAL_HASH_OID: ::ULONG = 0x00000010;
-pub const BCRYPTBUFFER_VERSION: ::ULONG = 0;
-STRUCT!{struct BCryptBuffer {
-    cbBuffer: ::ULONG,
-    BufferType: ::ULONG,
-    pvBuffer: ::PVOID,
-}}
-pub type PBCryptBuffer = *mut BCryptBuffer;
-STRUCT!{struct BCryptBufferDesc {
-    ulVersion: ::ULONG,
-    cBuffers: ::ULONG,
-    pBuffers: PBCryptBuffer,
-}}
-pub type PBCryptBufferDesc = *mut BCryptBufferDesc;
-//321
-pub type BCRYPT_HANDLE = ::PVOID;
-pub type BCRYPT_ALG_HANDLE = ::PVOID;
-pub type BCRYPT_KEY_HANDLE = ::PVOID;
-pub type BCRYPT_HASH_HANDLE = ::PVOID;
-pub type BCRYPT_SECRET_HANDLE = ::PVOID;
-STRUCT!{struct BCRYPT_KEY_BLOB {
-    Magic: ::ULONG,
-}}
-pub const BCRYPT_RSAPUBLIC_MAGIC: ::ULONG = 0x31415352;
-pub const BCRYPT_RSAPRIVATE_MAGIC: ::ULONG = 0x32415352;
-STRUCT!{struct BCRYPT_RSAKEY_BLOB {
-    Magic: ::ULONG,
-    BitLength: ::ULONG,
-    cbPublicExp: ::ULONG,
-    cbModulus: ::ULONG,
-    cbPrime1: ::ULONG,
-    cbPrime2: ::ULONG,
-}}
-pub const BCRYPT_RSAFULLPRIVATE_MAGIC: ::ULONG = 0x33415352;
-pub const BCRYPT_ECDH_PUBLIC_P256_MAGIC: ::ULONG = 0x314B4345;
-pub const BCRYPT_ECDH_PRIVATE_P256_MAGIC: ::ULONG = 0x324B4345;
-pub const BCRYPT_ECDH_PUBLIC_P384_MAGIC: ::ULONG = 0x334B4345;
-pub const BCRYPT_ECDH_PRIVATE_P384_MAGIC: ::ULONG = 0x344B4345;
-pub const BCRYPT_ECDH_PUBLIC_P521_MAGIC: ::ULONG = 0x354B4345;
-pub const BCRYPT_ECDH_PRIVATE_P521_MAGIC: ::ULONG = 0x364B4345;
-pub const BCRYPT_ECDSA_PUBLIC_P256_MAGIC: ::ULONG = 0x31534345;
-pub const BCRYPT_ECDSA_PRIVATE_P256_MAGIC: ::ULONG = 0x32534345;
-pub const BCRYPT_ECDSA_PUBLIC_P384_MAGIC: ::ULONG = 0x33534345;
-pub const BCRYPT_ECDSA_PRIVATE_P384_MAGIC: ::ULONG = 0x34534345;
-pub const BCRYPT_ECDSA_PUBLIC_P521_MAGIC: ::ULONG = 0x35534345;
-pub const BCRYPT_ECDSA_PRIVATE_P521_MAGIC: ::ULONG = 0x36534345;
-STRUCT!{struct BCRYPT_ECCKEY_BLOB {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-}}
-pub type PBCRYPT_ECCKEY_BLOB = *mut BCRYPT_ECCKEY_BLOB;
-pub const BCRYPT_DH_PUBLIC_MAGIC: ::ULONG = 0x42504844;
-pub const BCRYPT_DH_PRIVATE_MAGIC: ::ULONG = 0x56504844;
-STRUCT!{struct BCRYPT_DH_KEY_BLOB {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-}}
-pub type PBCRYPT_DH_KEY_BLOB = *mut BCRYPT_DH_KEY_BLOB;
-pub const BCRYPT_DH_PARAMETERS_MAGIC: ::ULONG = 0x4d504844;
-STRUCT!{struct BCRYPT_DH_PARAMETER_HEADER {
-    cbLength: ::ULONG,
-    dwMagic: ::ULONG,
-    cbKeyLength: ::ULONG,
-}}
-pub const BCRYPT_DSA_PUBLIC_MAGIC: ::ULONG = 0x42505344;
-pub const BCRYPT_DSA_PRIVATE_MAGIC: ::ULONG = 0x56505344;
-pub const BCRYPT_DSA_PUBLIC_MAGIC_V2: ::ULONG = 0x32425044;
-pub const BCRYPT_DSA_PRIVATE_MAGIC_V2: ::ULONG = 0x32565044;
-STRUCT!{struct BCRYPT_DSA_KEY_BLOB {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-    Count: [::UCHAR; 4],
-    Seed: [::UCHAR; 20],
-    q: [::UCHAR; 20],
-}}
-pub type PBCRYPT_DSA_KEY_BLOB = *mut BCRYPT_DSA_KEY_BLOB;
-ENUM!{enum HASHALGORITHM_ENUM {
-    DSA_HASH_ALGORITHM_SHA1,
-    DSA_HASH_ALGORITHM_SHA256,
-    DSA_HASH_ALGORITHM_SHA512,
-}}
-ENUM!{enum DSAFIPSVERSION_ENUM {
-    DSA_FIPS186_2,
-    DSA_FIPS186_3,
-}}
-STRUCT!{struct BCRYPT_DSA_KEY_BLOB_V2 {
-    dwMagic: ::ULONG,
-    cbKey: ::ULONG,
-    hashAlgorithm: HASHALGORITHM_ENUM,
-    standardVersion: DSAFIPSVERSION_ENUM,
-    cbSeedLength: ::ULONG,
-    cbGroupSize: ::ULONG,
-    Count: [::UCHAR; 4],
-}}
-pub type PBCRYPT_DSA_KEY_BLOB_V2 = *mut BCRYPT_DSA_KEY_BLOB_V2;
-STRUCT!{struct BCRYPT_KEY_DATA_BLOB_HEADER {
-    dwMagic: ::ULONG,
-    dwVersion: ::ULONG,
-    cbKeyData: ::ULONG,
-}}
-pub type PBCRYPT_KEY_DATA_BLOB_HEADER = *mut BCRYPT_KEY_DATA_BLOB_HEADER;
-pub const BCRYPT_KEY_DATA_BLOB_MAGIC: ::ULONG = 0x4d42444b;
-pub const BCRYPT_KEY_DATA_BLOB_VERSION1: ::ULONG = 0x1;
-pub const BCRYPT_DSA_PARAMETERS_MAGIC: ::ULONG = 0x4d505344;
-pub const BCRYPT_DSA_PARAMETERS_MAGIC_V2: ::ULONG = 0x324d5044;
-STRUCT!{struct BCRYPT_DSA_PARAMETER_HEADER {
-    cbLength: ::ULONG,
-    dwMagic: ::ULONG,
-    cbKeyLength: ::ULONG,
-    Count: [::UCHAR; 4],
-    Seed: [::UCHAR; 20],
-    q: [::UCHAR; 20],
-}}
-STRUCT!{struct BCRYPT_DSA_PARAMETER_HEADER_V2 {
-    cbLength: ::ULONG,
-    dwMagic: ::ULONG,
-    cbKeyLength: ::ULONG,
-    hashAlgorithm: HASHALGORITHM_ENUM,
-    standardVersion: DSAFIPSVERSION_ENUM,
-    cbSeedLength: ::ULONG,
-    cbGroupSize: ::ULONG,
-    Count: [::UCHAR; 4],
-}}
-ENUM!{enum BCRYPT_HASH_OPERATION_TYPE {
-    BCRYPT_HASH_OPERATION_HASH_DATA = 1,
-    BCRYPT_HASH_OPERATION_FINISH_HASH = 2,
-}}
-STRUCT!{struct BCRYPT_MULTI_HASH_OPERATION {
-    iHash: ::ULONG,
-    hashOperation: BCRYPT_HASH_OPERATION_TYPE,
-    pbBuffer: ::PUCHAR,
-    cbBuffer: ::ULONG,
-}}
-ENUM!{enum BCRYPT_MULTI_OPERATION_TYPE {
-    BCRYPT_OPERATION_TYPE_HASH = 1,
-}}
-STRUCT!{struct BCRYPT_MULTI_OBJECT_LENGTH_STRUCT {
-    cbPerObject: ::ULONG,
-    cbPerElement: ::ULONG,
-}}
-pub const BCRYPT_CIPHER_INTERFACE: ::ULONG = 0x00000001;
-pub const BCRYPT_HASH_INTERFACE: ::ULONG = 0x00000002;
-pub const BCRYPT_ASYMMETRIC_ENCRYPTION_INTERFACE: ::ULONG = 0x00000003;
-pub const BCRYPT_SECRET_AGREEMENT_INTERFACE: ::ULONG = 0x00000004;
-pub const BCRYPT_SIGNATURE_INTERFACE: ::ULONG = 0x00000005;
-pub const BCRYPT_RNG_INTERFACE: ::ULONG = 0x00000006;
-pub const BCRYPT_KEY_DERIVATION_INTERFACE: ::ULONG = 0x00000007;
-pub const BCRYPT_ALG_HANDLE_HMAC_FLAG: ::ULONG = 0x00000008;
-pub const BCRYPT_CAPI_AES_FLAG: ::ULONG = 0x00000010;
-pub const BCRYPT_HASH_REUSABLE_FLAG: ::ULONG = 0x00000020;
-pub const BCRYPT_BUFFERS_LOCKED_FLAG: ::ULONG = 0x00000040;
-pub const BCRYPT_EXTENDED_KEYSIZE: ::ULONG = 0x00000080;
-pub const BCRYPT_CIPHER_OPERATION: ::ULONG = 0x00000001;
-pub const BCRYPT_HASH_OPERATION: ::ULONG = 0x00000002;
-pub const BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION: ::ULONG = 0x00000004;
-pub const BCRYPT_SECRET_AGREEMENT_OPERATION: ::ULONG = 0x00000008;
-pub const BCRYPT_SIGNATURE_OPERATION: ::ULONG = 0x00000010;
-pub const BCRYPT_RNG_OPERATION: ::ULONG = 0x00000020;
-pub const BCRYPT_KEY_DERIVATION_OPERATION: ::ULONG = 0x00000040;
-STRUCT!{struct BCRYPT_ALGORITHM_IDENTIFIER {
-    pszName: ::LPWSTR,
-    dwClass: ::ULONG,
-    dwFlags: ::ULONG,
-}}
-STRUCT!{struct BCRYPT_PROVIDER_NAME {
-    pszProviderName: ::LPWSTR,
-}}
-pub const BCRYPT_PUBLIC_KEY_FLAG: ::ULONG = 0x00000001;
-pub const BCRYPT_PRIVATE_KEY_FLAG: ::ULONG = 0x00000002;
-pub const BCRYPT_RNG_USE_ENTROPY_IN_BUFFER: ::ULONG = 0x00000001;
-pub const BCRYPT_USE_SYSTEM_PREFERRED_RNG: ::ULONG = 0x00000002;
-STRUCT!{struct BCRYPT_INTERFACE_VERSION {
-    MajorVersion: ::USHORT,
-    MinorVersion: ::USHORT,
-}}
-pub type PBCRYPT_INTERFACE_VERSION = *mut BCRYPT_INTERFACE_VERSION;
-pub const BCRYPT_CIPHER_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_HASH_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_HASH_INTERFACE_MAJORVERSION_2: ::USHORT = 2;
-pub const BCRYPT_HASH_INTERFACE_VERSION_2: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(BCRYPT_HASH_INTERFACE_MAJORVERSION_2, 0);
-pub const BCRYPT_ASYMMETRIC_ENCRYPTION_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_SECRET_AGREEMENT_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_SIGNATURE_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const BCRYPT_RNG_INTERFACE_VERSION_1: BCRYPT_INTERFACE_VERSION =
-    BCRYPT_MAKE_INTERFACE_VERSION!(1, 0);
-pub const CRYPT_MIN_DEPENDENCIES: ::ULONG = 0x00000001;
-pub const CRYPT_PROCESS_ISOLATE: ::ULONG = 0x00010000;
-pub const CRYPT_UM: ::ULONG = 0x00000001;
-pub const CRYPT_KM: ::ULONG = 0x00000002;
-pub const CRYPT_MM: ::ULONG = 0x00000003;
-pub const CRYPT_ANY: ::ULONG = 0x00000004;
-pub const CRYPT_OVERWRITE: ::ULONG = 0x00000001;
-pub const CRYPT_LOCAL: ::ULONG = 0x00000001;
-pub const CRYPT_DOMAIN: ::ULONG = 0x00000002;
-pub const CRYPT_EXCLUSIVE: ::ULONG = 0x00000001;
-pub const CRYPT_OVERRIDE: ::ULONG = 0x00010000;
-pub const CRYPT_ALL_FUNCTIONS: ::ULONG = 0x00000001;
-pub const CRYPT_ALL_PROVIDERS: ::ULONG = 0x00000002;
-pub const CRYPT_PRIORITY_TOP: ::ULONG = 0x00000000;
-pub const CRYPT_PRIORITY_BOTTOM: ::ULONG = 0xFFFFFFFF;
-STRUCT!{struct CRYPT_INTERFACE_REG {
-    dwInterface: ::ULONG,
-    dwFlags: ::ULONG,
-    cFunctions: ::ULONG,
-    rgpszFunctions: *mut ::PWSTR,
-}}
-pub type PCRYPT_INTERFACE_REG = *mut CRYPT_INTERFACE_REG;
-STRUCT!{struct CRYPT_IMAGE_REG {
-    pszImage: ::PWSTR,
-    cInterfaces: ::ULONG,
-    rgpInterfaces: *mut PCRYPT_INTERFACE_REG,
-}}
-pub type PCRYPT_IMAGE_REG = *mut CRYPT_IMAGE_REG;
-STRUCT!{struct CRYPT_PROVIDER_REG {
-    cAliases: ::ULONG,
-    rgpszAliases: *mut ::PWSTR,
-    pUM: PCRYPT_IMAGE_REG,
-    pKM: PCRYPT_IMAGE_REG,
-}}
-pub type PCRYPT_PROVIDER_REG = *mut CRYPT_PROVIDER_REG;
-STRUCT!{struct CRYPT_PROVIDERS {
-    cProviders: ::ULONG,
-    rgpszProviders: *mut ::PWSTR,
-}}
-pub type PCRYPT_PROVIDERS = *mut CRYPT_PROVIDERS;
-STRUCT!{struct CRYPT_CONTEXT_CONFIG {
-    dwFlags: ::ULONG,
-    dwReserved: ::ULONG,
-}}
-pub type PCRYPT_CONTEXT_CONFIG = *mut CRYPT_CONTEXT_CONFIG;
-STRUCT!{struct CRYPT_CONTEXT_FUNCTION_CONFIG {
-    dwFlags: ::ULONG,
-    dwReserved: ::ULONG,
-}}
-pub type PCRYPT_CONTEXT_FUNCTION_CONFIG = *mut CRYPT_CONTEXT_FUNCTION_CONFIG;
-STRUCT!{struct CRYPT_CONTEXTS {
-    cContexts: ::ULONG,
-    rgpszContexts: *mut ::PWSTR,
-}}
-pub type PCRYPT_CONTEXTS = *mut CRYPT_CONTEXTS;
-STRUCT!{struct CRYPT_CONTEXT_FUNCTIONS {
-    cFunctions: ::ULONG,
-    rgpszFunctions: *mut ::PWSTR,
-}}
-pub type PCRYPT_CONTEXT_FUNCTIONS = *mut CRYPT_CONTEXT_FUNCTIONS;
-STRUCT!{struct CRYPT_CONTEXT_FUNCTION_PROVIDERS {
-    cProviders: ::ULONG,
-    rgpszProviders: *mut ::PWSTR,
-}}
-pub type PCRYPT_CONTEXT_FUNCTION_PROVIDERS = *mut CRYPT_CONTEXT_FUNCTION_PROVIDERS;
-STRUCT!{struct CRYPT_PROPERTY_REF {
-    pszProperty: ::PWSTR,
-    cbValue: ::ULONG,
-    pbValue: ::PUCHAR,
-}}
-pub type PCRYPT_PROPERTY_REF = *mut CRYPT_PROPERTY_REF;
-STRUCT!{struct CRYPT_IMAGE_REF {
-    pszImage: ::PWSTR,
-    dwFlags: ::ULONG,
-}}
-pub type PCRYPT_IMAGE_REF = *mut CRYPT_IMAGE_REF;
-STRUCT!{struct CRYPT_PROVIDER_REF {
-    dwInterface: ::ULONG,
-    pszFunction: ::PWSTR,
-    pszProvider: ::PWSTR,
-    cProperties: ::ULONG,
-    rgpProperties: *mut PCRYPT_PROPERTY_REF,
-    pUM: PCRYPT_IMAGE_REF,
-    pKM: PCRYPT_IMAGE_REF,
-}}
-pub type PCRYPT_PROVIDER_REF = *mut CRYPT_PROVIDER_REF;
-STRUCT!{struct CRYPT_PROVIDER_REFS {
-    cProviders: ::ULONG,
-    rgpProviders: *mut PCRYPT_PROVIDER_REF,
-}}
-pub type PCRYPT_PROVIDER_REFS = *mut CRYPT_PROVIDER_REFS;
diff --git a/vendor/winapi-0.2.8/src/cfg.rs b/vendor/winapi-0.2.8/src/cfg.rs
deleted file mode 100644
index 0720d32472..0000000000
--- a/vendor/winapi-0.2.8/src/cfg.rs
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! common Configuration Manager definitions for both user mode and kernel mode code
-ENUM!{enum PNP_VETO_TYPE {
-    PNP_VetoTypeUnknown,
-    PNP_VetoLegacyDevice,
-    PNP_VetoPendingClose,
-    PNP_VetoWindowsApp,
-    PNP_VetoWindowsService,
-    PNP_VetoOutstandingOpen,
-    PNP_VetoDevice,
-    PNP_VetoDriver,
-    PNP_VetoIllegalDeviceRequest,
-    PNP_VetoInsufficientPower,
-    PNP_VetoNonDisableable,
-    PNP_VetoLegacyDriver,
-    PNP_VetoInsufficientRights,
-}}
-pub type PPNP_VETO_TYPE = *mut PNP_VETO_TYPE;
-pub const CM_PROB_NOT_CONFIGURED: ::CONFIGRET = 0x00000001;
-pub const CM_PROB_DEVLOADER_FAILED: ::CONFIGRET = 0x00000002;
-pub const CM_PROB_OUT_OF_MEMORY: ::CONFIGRET = 0x00000003;
-pub const CM_PROB_ENTRY_IS_WRONG_TYPE: ::CONFIGRET = 0x00000004;
-pub const CM_PROB_LACKED_ARBITRATOR: ::CONFIGRET = 0x00000005;
-pub const CM_PROB_BOOT_CONFIG_CONFLICT: ::CONFIGRET = 0x00000006;
-pub const CM_PROB_FAILED_FILTER: ::CONFIGRET = 0x00000007;
-pub const CM_PROB_DEVLOADER_NOT_FOUND: ::CONFIGRET = 0x00000008;
-pub const CM_PROB_INVALID_DATA: ::CONFIGRET = 0x00000009;
-pub const CM_PROB_FAILED_START: ::CONFIGRET = 0x0000000A;
-pub const CM_PROB_LIAR: ::CONFIGRET = 0x0000000B;
-pub const CM_PROB_NORMAL_CONFLICT: ::CONFIGRET = 0x0000000C;
-pub const CM_PROB_NOT_VERIFIED: ::CONFIGRET = 0x0000000D;
-pub const CM_PROB_NEED_RESTART: ::CONFIGRET = 0x0000000E;
-pub const CM_PROB_REENUMERATION: ::CONFIGRET = 0x0000000F;
-pub const CM_PROB_PARTIAL_LOG_CONF: ::CONFIGRET = 0x00000010;
-pub const CM_PROB_UNKNOWN_RESOURCE: ::CONFIGRET = 0x00000011;
-pub const CM_PROB_REINSTALL: ::CONFIGRET = 0x00000012;
-pub const CM_PROB_REGISTRY: ::CONFIGRET = 0x00000013;
-pub const CM_PROB_VXDLDR: ::CONFIGRET = 0x00000014;
-pub const CM_PROB_WILL_BE_REMOVED: ::CONFIGRET = 0x00000015;
-pub const CM_PROB_DISABLED: ::CONFIGRET = 0x00000016;
-pub const CM_PROB_DEVLOADER_NOT_READY: ::CONFIGRET = 0x00000017;
-pub const CM_PROB_DEVICE_NOT_THERE: ::CONFIGRET = 0x00000018;
-pub const CM_PROB_MOVED: ::CONFIGRET = 0x00000019;
-pub const CM_PROB_TOO_EARLY: ::CONFIGRET = 0x0000001A;
-pub const CM_PROB_NO_VALID_LOG_CONF: ::CONFIGRET = 0x0000001B;
-pub const CM_PROB_FAILED_INSTALL: ::CONFIGRET = 0x0000001C;
-pub const CM_PROB_HARDWARE_DISABLED: ::CONFIGRET = 0x0000001D;
-pub const CM_PROB_CANT_SHARE_IRQ: ::CONFIGRET = 0x0000001E;
-pub const CM_PROB_FAILED_ADD: ::CONFIGRET = 0x0000001F;
-pub const CM_PROB_DISABLED_SERVICE: ::CONFIGRET = 0x00000020;
-pub const CM_PROB_TRANSLATION_FAILED: ::CONFIGRET = 0x00000021;
-pub const CM_PROB_NO_SOFTCONFIG: ::CONFIGRET = 0x00000022;
-pub const CM_PROB_BIOS_TABLE: ::CONFIGRET = 0x00000023;
-pub const CM_PROB_IRQ_TRANSLATION_FAILED: ::CONFIGRET = 0x00000024;
-pub const CM_PROB_FAILED_DRIVER_ENTRY: ::CONFIGRET = 0x00000025;
-pub const CM_PROB_DRIVER_FAILED_PRIOR_UNLOAD: ::CONFIGRET = 0x00000026;
-pub const CM_PROB_DRIVER_FAILED_LOAD: ::CONFIGRET = 0x00000027;
-pub const CM_PROB_DRIVER_SERVICE_KEY_INVALID: ::CONFIGRET = 0x00000028;
-pub const CM_PROB_LEGACY_SERVICE_NO_DEVICES: ::CONFIGRET = 0x00000029;
-pub const CM_PROB_DUPLICATE_DEVICE: ::CONFIGRET = 0x0000002A;
-pub const CM_PROB_FAILED_POST_START: ::CONFIGRET = 0x0000002B;
-pub const CM_PROB_HALTED: ::CONFIGRET = 0x0000002C;
-pub const CM_PROB_PHANTOM: ::CONFIGRET = 0x0000002D;
-pub const CM_PROB_SYSTEM_SHUTDOWN: ::CONFIGRET = 0x0000002E;
-pub const CM_PROB_HELD_FOR_EJECT: ::CONFIGRET = 0x0000002F;
-pub const CM_PROB_DRIVER_BLOCKED: ::CONFIGRET = 0x00000030;
-pub const CM_PROB_REGISTRY_TOO_LARGE: ::CONFIGRET = 0x00000031;
-pub const CM_PROB_SETPROPERTIES_FAILED: ::CONFIGRET = 0x00000032;
-pub const CM_PROB_WAITING_ON_DEPENDENCY: ::CONFIGRET = 0x00000033;
-pub const CM_PROB_UNSIGNED_DRIVER: ::CONFIGRET = 0x00000034;
-pub const CM_PROB_USED_BY_DEBUGGER: ::CONFIGRET = 0x00000035;
-pub const NUM_CM_PROB_V1: ::CONFIGRET = 0x00000025;
-pub const NUM_CM_PROB_V2: ::CONFIGRET = 0x00000032;
-pub const NUM_CM_PROB_V3: ::CONFIGRET = 0x00000033;
-pub const NUM_CM_PROB_V4: ::CONFIGRET = 0x00000034;
-pub const NUM_CM_PROB_V5: ::CONFIGRET = 0x00000035;
-pub const NUM_CM_PROB_V6: ::CONFIGRET = 0x00000036;
-pub const DN_ROOT_ENUMERATED: ::CONFIGRET = 0x00000001;
-pub const DN_DRIVER_LOADED: ::CONFIGRET = 0x00000002;
-pub const DN_ENUM_LOADED: ::CONFIGRET = 0x00000004;
-pub const DN_STARTED: ::CONFIGRET = 0x00000008;
-pub const DN_MANUAL: ::CONFIGRET = 0x00000010;
-pub const DN_NEED_TO_ENUM: ::CONFIGRET = 0x00000020;
-pub const DN_NOT_FIRST_TIME: ::CONFIGRET = 0x00000040;
-pub const DN_HARDWARE_ENUM: ::CONFIGRET = 0x00000080;
-pub const DN_LIAR: ::CONFIGRET = 0x00000100;
-pub const DN_HAS_MARK: ::CONFIGRET = 0x00000200;
-pub const DN_HAS_PROBLEM: ::CONFIGRET = 0x00000400;
-pub const DN_FILTERED: ::CONFIGRET = 0x00000800;
-pub const DN_MOVED: ::CONFIGRET = 0x00001000;
-pub const DN_DISABLEABLE: ::CONFIGRET = 0x00002000;
-pub const DN_REMOVABLE: ::CONFIGRET = 0x00004000;
-pub const DN_PRIVATE_PROBLEM: ::CONFIGRET = 0x00008000;
-pub const DN_MF_PARENT: ::CONFIGRET = 0x00010000;
-pub const DN_MF_CHILD: ::CONFIGRET = 0x00020000;
-pub const DN_WILL_BE_REMOVED: ::CONFIGRET = 0x00040000;
-pub const DN_NOT_FIRST_TIMEE: ::CONFIGRET = 0x00080000;
-pub const DN_STOP_FREE_RES: ::CONFIGRET = 0x00100000;
-pub const DN_REBAL_CANDIDATE: ::CONFIGRET = 0x00200000;
-pub const DN_BAD_PARTIAL: ::CONFIGRET = 0x00400000;
-pub const DN_NT_ENUMERATOR: ::CONFIGRET = 0x00800000;
-pub const DN_NT_DRIVER: ::CONFIGRET = 0x01000000;
-pub const DN_NEEDS_LOCKING: ::CONFIGRET = 0x02000000;
-pub const DN_ARM_WAKEUP: ::CONFIGRET = 0x04000000;
-pub const DN_APM_ENUMERATOR: ::CONFIGRET = 0x08000000;
-pub const DN_APM_DRIVER: ::CONFIGRET = 0x10000000;
-pub const DN_SILENT_INSTALL: ::CONFIGRET = 0x20000000;
-pub const DN_NO_SHOW_IN_DM: ::CONFIGRET = 0x40000000;
-pub const DN_BOOT_LOG_PROB: ::CONFIGRET = 0x80000000;
-pub const DN_NEED_RESTART: ::CONFIGRET = DN_LIAR;
-pub const DN_DRIVER_BLOCKED: ::CONFIGRET = DN_NOT_FIRST_TIME;
-pub const DN_LEGACY_DRIVER: ::CONFIGRET = DN_MOVED;
-pub const DN_CHILD_WITH_INVALID_ID: ::CONFIGRET = DN_HAS_MARK;
-pub const DN_DEVICE_DISCONNECTED: ::CONFIGRET = DN_NEEDS_LOCKING;
-pub const DN_CHANGEABLE_FLAGS: ::CONFIGRET = DN_NOT_FIRST_TIME + DN_HARDWARE_ENUM + DN_HAS_MARK
-    + DN_DISABLEABLE + DN_REMOVABLE + DN_MF_CHILD + DN_MF_PARENT + DN_NOT_FIRST_TIMEE
-    + DN_STOP_FREE_RES + DN_REBAL_CANDIDATE + DN_NT_ENUMERATOR + DN_NT_DRIVER + DN_SILENT_INSTALL
-    + DN_NO_SHOW_IN_DM;
-pub const LCPRI_FORCECONFIG: ::PRIORITY = 0x00000000;
-pub const LCPRI_BOOTCONFIG: ::PRIORITY = 0x00000001;
-pub const LCPRI_DESIRED: ::PRIORITY = 0x00002000;
-pub const LCPRI_NORMAL: ::PRIORITY = 0x00003000;
-pub const LCPRI_LASTBESTCONFIG: ::PRIORITY = 0x00003FFF;
-pub const LCPRI_SUBOPTIMAL: ::PRIORITY = 0x00005000;
-pub const LCPRI_LASTSOFTCONFIG: ::PRIORITY = 0x00007FFF;
-pub const LCPRI_RESTART: ::PRIORITY = 0x00008000;
-pub const LCPRI_REBOOT: ::PRIORITY = 0x00009000;
-pub const LCPRI_POWEROFF: ::PRIORITY = 0x0000A000;
-pub const LCPRI_HARDRECONFIG: ::PRIORITY = 0x0000C000;
-pub const LCPRI_HARDWIRED: ::PRIORITY = 0x0000E000;
-pub const LCPRI_IMPOSSIBLE: ::PRIORITY = 0x0000F000;
-pub const LCPRI_DISABLED: ::PRIORITY = 0x0000FFFF;
-pub const MAX_LCPRI: ::PRIORITY = 0x0000FFFF;
diff --git a/vendor/winapi-0.2.8/src/cfgmgr32.rs b/vendor/winapi-0.2.8/src/cfgmgr32.rs
deleted file mode 100644
index 0305f1bd7f..0000000000
--- a/vendor/winapi-0.2.8/src/cfgmgr32.rs
+++ /dev/null
@@ -1,758 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! user APIs for the Configuration Manager
-pub type PCVOID = *const ::VOID;
-pub const MAX_DEVICE_ID_LEN: usize = 200;
-pub const MAX_DEVNODE_ID_LEN: usize = MAX_DEVICE_ID_LEN;
-pub const MAX_GUID_STRING_LEN: usize = 39;
-pub const MAX_CLASS_NAME_LEN: usize = 32;
-pub const MAX_PROFILE_LEN: usize = 80;
-pub const MAX_CONFIG_VALUE: ::DWORD = 9999;
-pub const MAX_INSTANCE_VALUE: ::DWORD = 9999;
-pub const MAX_MEM_REGISTERS: ::DWORD = 9;
-pub const MAX_IO_PORTS: ::DWORD = 20;
-pub const MAX_IRQS: ::DWORD = 7;
-pub const MAX_DMA_CHANNELS: ::DWORD = 7;
-pub const DWORD_MAX: ::DWORD = 0xffffffff;
-pub const DWORDLONG_MAX: ::DWORDLONG = 0xffffffffffffffff;
-pub const CONFIGMG_VERSION: ::DWORD = 0x0400;
-pub type RETURN_TYPE = ::DWORD;
-pub type CONFIGRET = RETURN_TYPE;
-pub type DEVNODE = ::DWORD;
-pub type DEVINST = ::DWORD;
-pub type PDEVNODE = *mut DEVNODE;
-pub type PDEVINST = *mut DEVNODE;
-pub type DEVNODEID_A = *mut ::CHAR;
-pub type DEVINSTID_A = *mut ::CHAR;
-pub type DEVNODEID_W = *mut ::WCHAR;
-pub type DEVINSTID_W = *mut ::WCHAR;
-pub type LOG_CONF = ::DWORD_PTR;
-pub type PLOG_CONF = *mut LOG_CONF;
-pub type RES_DES = ::DWORD_PTR;
-pub type PRES_DES = *mut RES_DES;
-pub type RESOURCEID = ::ULONG;
-pub type PRESOURCEID = *mut RESOURCEID;
-pub type PRIORITY = ::ULONG;
-pub type PPRIORITY = *mut PRIORITY;
-pub type RANGE_LIST = ::DWORD_PTR;
-pub type PRANGE_LIST = *mut RANGE_LIST;
-pub type RANGE_ELEMENT = ::DWORD_PTR;
-pub type PRANGE_ELEMENT = *mut RANGE_ELEMENT;
-pub type HMACHINE = ::HANDLE;
-pub type PHMACHINE = *mut HMACHINE;
-pub type CONFLICT_LIST = ::ULONG_PTR;
-pub type PCONFLICT_LIST = *mut CONFLICT_LIST;
-STRUCT!{nodebug struct CONFLICT_DETAILS_A {
-    CD_ulSize: ::ULONG,
-    CD_ulMask: ::ULONG,
-    CD_dnDevInst: DEVINST,
-    CD_rdResDes: RES_DES,
-    CD_ulFlags: ::ULONG,
-    CD_szDescription: [::CHAR; ::MAX_PATH],
-}}
-pub type PCONFLICT_DETAILS_A = *mut CONFLICT_DETAILS_A;
-STRUCT!{nodebug struct CONFLICT_DETAILS_W {
-    CD_ulSize: ::ULONG,
-    CD_ulMask: ::ULONG,
-    CD_dnDevInst: DEVINST,
-    CD_rdResDes: RES_DES,
-    CD_ulFlags: ::ULONG,
-    CD_szDescription: [::WCHAR; ::MAX_PATH],
-}}
-pub type PCONFLICT_DETAILS_W = *mut CONFLICT_DETAILS_W;
-pub const CM_CDMASK_DEVINST: ::ULONG = 0x00000001;
-pub const CM_CDMASK_RESDES: ::ULONG = 0x00000002;
-pub const CM_CDMASK_FLAGS: ::ULONG = 0x00000004;
-pub const CM_CDMASK_DESCRIPTION: ::ULONG = 0x00000008;
-pub const CM_CDMASK_VALID: ::ULONG = 0x0000000F;
-pub const CM_CDFLAGS_DRIVER: ::ULONG = 0x00000001;
-pub const CM_CDFLAGS_ROOT_OWNED: ::ULONG = 0x00000002;
-pub const CM_CDFLAGS_RESERVED: ::ULONG = 0x00000004;
-pub type REGDISPOSITION = ::ULONG;
-pub const mMD_MemoryType: ::DWORD = 0x1;
-pub const fMD_MemoryType: ::DWORD = mMD_MemoryType;
-pub const fMD_ROM: ::DWORD = 0x0;
-pub const fMD_RAM: ::DWORD = 0x1;
-pub const mMD_32_24: ::DWORD = 0x2;
-pub const fMD_32_24: ::DWORD = mMD_32_24;
-pub const fMD_24: ::DWORD = 0x0;
-pub const fMD_32: ::DWORD = 0x2;
-pub const mMD_Prefetchable: ::DWORD = 0x4;
-pub const fMD_Prefetchable: ::DWORD = mMD_Prefetchable;
-pub const fMD_Pref: ::DWORD = mMD_Prefetchable;
-pub const fMD_PrefetchDisallowed: ::DWORD = 0x0;
-pub const fMD_PrefetchAllowed: ::DWORD = 0x4;
-pub const mMD_Readable: ::DWORD = 0x8;
-pub const fMD_Readable: ::DWORD = mMD_Readable;
-pub const fMD_ReadAllowed: ::DWORD = 0x0;
-pub const fMD_ReadDisallowed: ::DWORD = 0x8;
-pub const mMD_CombinedWrite: ::DWORD = 0x10;
-pub const fMD_CombinedWrite: ::DWORD = mMD_CombinedWrite;
-pub const fMD_CombinedWriteDisallowed: ::DWORD = 0x0;
-pub const fMD_CombinedWriteAllowed: ::DWORD = 0x10;
-pub const mMD_Cacheable: ::DWORD = 0x20;
-pub const fMD_NonCacheable: ::DWORD = 0x0;
-pub const fMD_Cacheable: ::DWORD = 0x20;
-pub const fMD_WINDOW_DECODE: ::DWORD = 0x40;
-pub const fMD_MEMORY_BAR: ::DWORD = 0x80;
-STRUCT!{struct MEM_RANGE {
-    MR_Align: ::DWORDLONG,
-    MR_nBytes: ::ULONG,
-    MR_Min: ::DWORDLONG,
-    MR_Max: ::DWORDLONG,
-    MR_Flags: ::DWORD,
-    MR_Reserved: ::DWORD,
-}}
-pub type PMEM_RANGE = *mut MEM_RANGE;
-STRUCT!{struct MEM_DES {
-    MD_Count: ::DWORD,
-    MD_Type: ::DWORD,
-    MD_Alloc_Base: ::DWORDLONG,
-    MD_Alloc_End: ::DWORDLONG,
-    MD_Flags: ::DWORD,
-    MD_Reserved: ::DWORD,
-}}
-pub type PMEM_DES = *mut MEM_DES;
-STRUCT!{struct MEM_RESOURCE {
-    MEM_Header: MEM_DES,
-    MEM_Data: [MEM_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PMEM_RESOURCE = *mut MEM_RESOURCE;
-STRUCT!{struct MEM_LARGE_RANGE {
-    MLR_Align: ::DWORDLONG,
-    MLR_nBytes: ::ULONGLONG,
-    MLR_Min: ::DWORDLONG,
-    MLR_Max: ::DWORDLONG,
-    MLR_Flags: ::DWORD,
-    MLR_Reserved: ::DWORD,
-}}
-pub type PMEM_LARGE_RANGE = *mut MEM_LARGE_RANGE;
-STRUCT!{struct MEM_LARGE_DES {
-    MLD_Count: ::DWORD,
-    MLD_Type: ::DWORD,
-    MLD_Alloc_Base: ::DWORDLONG,
-    MLD_Alloc_End: ::DWORDLONG,
-    MLD_Flags: ::DWORD,
-    MLD_Reserved: ::DWORD,
-}}
-pub type PMEM_LARGE_DES = *mut MEM_LARGE_DES;
-STRUCT!{struct MEM_LARGE_RESOURCE {
-    MEM_LARGE_Header: MEM_LARGE_DES,
-    MEM_LARGE_Data: [MEM_LARGE_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PMEM_LARGE_RESOURCE = *mut MEM_LARGE_RESOURCE;
-pub const fIOD_PortType: ::DWORD = 0x1;
-pub const fIOD_Memory: ::DWORD = 0x0;
-pub const fIOD_IO: ::DWORD = 0x1;
-pub const fIOD_DECODE: ::DWORD = 0x00fc;
-pub const fIOD_10_BIT_DECODE: ::DWORD = 0x0004;
-pub const fIOD_12_BIT_DECODE: ::DWORD = 0x0008;
-pub const fIOD_16_BIT_DECODE: ::DWORD = 0x0010;
-pub const fIOD_POSITIVE_DECODE: ::DWORD = 0x0020;
-pub const fIOD_PASSIVE_DECODE: ::DWORD = 0x0040;
-pub const fIOD_WINDOW_DECODE: ::DWORD = 0x0080;
-pub const fIOD_PORT_BAR: ::DWORD = 0x0100;
-pub const IO_ALIAS_10_BIT_DECODE: ::DWORDLONG = 0x00000004;
-pub const IO_ALIAS_12_BIT_DECODE: ::DWORDLONG = 0x00000010;
-pub const IO_ALIAS_16_BIT_DECODE: ::DWORDLONG = 0x00000000;
-pub const IO_ALIAS_POSITIVE_DECODE: ::DWORDLONG = 0x000000FF;
-STRUCT!{struct IO_RANGE {
-    IOR_Align: ::DWORDLONG,
-    IOR_nPorts: ::DWORD,
-    IOR_Min: ::DWORDLONG,
-    IOR_Max: ::DWORDLONG,
-    IOR_RangeFlags: ::DWORD,
-    IOR_Alias: ::DWORDLONG,
-}}
-pub type PIO_RANGE = *mut IO_RANGE;
-STRUCT!{struct IO_DES {
-    IOD_Count: ::DWORD,
-    IOD_Type: ::DWORD,
-    IOD_Alloc_Base: ::DWORDLONG,
-    IOD_Alloc_End: ::DWORDLONG,
-    IOD_DesFlags: ::DWORD,
-}}
-pub type PIO_DES = *mut IO_DES;
-STRUCT!{struct IO_RESOURCE {
-    IO_Header: IO_DES,
-    IO_Data: [IO_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PIO_RESOURCE = *mut IO_RESOURCE;
-pub const mDD_Width: ::ULONG = 0x3;
-pub const fDD_BYTE: ::ULONG = 0x0;
-pub const fDD_WORD: ::ULONG = 0x1;
-pub const fDD_DWORD: ::ULONG = 0x2;
-pub const fDD_BYTE_AND_WORD: ::ULONG = 0x3;
-pub const mDD_BusMaster: ::ULONG = 0x4;
-pub const fDD_NoBusMaster: ::ULONG = 0x0;
-pub const fDD_BusMaster: ::ULONG = 0x4;
-pub const mDD_Type: ::ULONG = 0x18;
-pub const fDD_TypeStandard: ::ULONG = 0x00;
-pub const fDD_TypeA: ::ULONG = 0x08;
-pub const fDD_TypeB: ::ULONG = 0x10;
-pub const fDD_TypeF: ::ULONG = 0x18;
-STRUCT!{struct DMA_RANGE {
-    DR_Min: ::ULONG,
-    DR_Max: ::ULONG,
-    DR_Flags: ::ULONG,
-}}
-pub type PDMA_RANGE = *mut DMA_RANGE;
-STRUCT!{struct DMA_DES {
-    DD_Count: ::DWORD,
-    DD_Type: ::DWORD,
-    DD_Flags: ::DWORD,
-    DD_Alloc_Chan: ::ULONG,
-}}
-pub type PDMA_DES = *mut DMA_DES;
-STRUCT!{struct DMA_RESOURCE {
-    DMA_Header: DMA_DES,
-    DMA_Data: [DMA_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PDMA_RESOURCE = *mut DMA_RESOURCE;
-pub const mIRQD_Share: ::ULONG = 0x1;
-pub const fIRQD_Exclusive: ::ULONG = 0x0;
-pub const fIRQD_Share: ::ULONG = 0x1;
-pub const fIRQD_Share_Bit: ::ULONG = 0;
-pub const fIRQD_Level_Bit: ::ULONG = 1;
-pub const mIRQD_Edge_Level: ::ULONG = 0x2;
-pub const fIRQD_Level: ::ULONG = 0x0;
-pub const fIRQD_Edge: ::ULONG = 0x2;
-STRUCT!{struct IRQ_RANGE {
-    IRQR_Min: ::ULONG,
-    IRQR_Max: ::ULONG,
-    IRQR_Flags: ::ULONG,
-}}
-pub type PIRQ_RANGE = *mut IRQ_RANGE;
-STRUCT!{struct IRQ_DES_32 {
-    IRQD_Count: ::DWORD,
-    IRQD_Type: ::DWORD,
-    IRQD_Flags: ::DWORD,
-    IRQD_Alloc_Num: ::ULONG,
-    IRQD_Affinity: ::ULONG32,
-}}
-pub type PIRQ_DES_32 = *mut IRQ_DES_32;
-STRUCT!{struct IRQ_DES_64 {
-    IRQD_Count: ::DWORD,
-    IRQD_Type: ::DWORD,
-    IRQD_Flags: ::DWORD,
-    IRQD_Alloc_Num: ::ULONG,
-    IRQD_Affinity: ::ULONG64,
-}}
-pub type PIRQ_DES_64 = *mut IRQ_DES_64;
-STRUCT!{struct IRQ_RESOURCE_32 {
-    IRQ_Header: IRQ_DES_32,
-    IRQ_Data: [IRQ_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PIRQ_RESOURCE_32 = *mut IRQ_RESOURCE_32;
-STRUCT!{struct IRQ_RESOURCE_64 {
-    IRQ_Header: IRQ_DES_64,
-    IRQ_Data: [IRQ_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PIRQ_RESOURCE_64 = *mut IRQ_RESOURCE_64;
-STRUCT!{struct DEVPRIVATE_RANGE {
-    PR_Data1: ::DWORD,
-    PR_Data2: ::DWORD,
-    PR_Data3: ::DWORD,
-}}
-pub type PDEVPRIVATE_RANGE = *mut DEVPRIVATE_RANGE;
-STRUCT!{struct DEVPRIVATE_DES {
-    PD_Count: ::DWORD,
-    PD_Type: ::DWORD,
-    PD_Data1: ::DWORD,
-    PD_Data2: ::DWORD,
-    PD_Data3: ::DWORD,
-    PD_Flags: ::DWORD,
-}}
-pub type PDEVPRIVATE_DES = *mut DEVPRIVATE_DES;
-STRUCT!{struct DEVPRIVATE_RESOURCE {
-    PRV_Header: DEVPRIVATE_DES,
-    PRV_Data: [DEVPRIVATE_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PDEVPRIVATE_RESOURCE = *mut DEVPRIVATE_RESOURCE;
-STRUCT!{struct CS_DES {
-    CSD_SignatureLength: ::DWORD,
-    CSD_LegacyDataOffset: ::DWORD,
-    CSD_LegacyDataSize: ::DWORD,
-    CSD_Flags: ::DWORD,
-    CSD_ClassGuid: ::GUID,
-    CSD_Signature: [::BYTE; ::ANYSIZE_ARRAY],
-}}
-pub type PCS_DES = *mut CS_DES;
-STRUCT!{struct CS_RESOURCE {
-    CS_Header: CS_DES,
-}}
-pub type PCS_RESOURCE = *mut CS_RESOURCE;
-pub const mPCD_IO_8_16: ::DWORD = 0x1;
-pub const fPCD_IO_8: ::DWORD = 0x0;
-pub const fPCD_IO_16: ::DWORD = 0x1;
-pub const mPCD_MEM_8_16: ::DWORD = 0x2;
-pub const fPCD_MEM_8: ::DWORD = 0x0;
-pub const fPCD_MEM_16: ::DWORD = 0x2;
-pub const mPCD_MEM_A_C: ::DWORD = 0xC;
-pub const fPCD_MEM1_A: ::DWORD = 0x4;
-pub const fPCD_MEM2_A: ::DWORD = 0x8;
-pub const fPCD_IO_ZW_8: ::DWORD = 0x10;
-pub const fPCD_IO_SRC_16: ::DWORD = 0x20;
-pub const fPCD_IO_WS_16: ::DWORD = 0x40;
-pub const mPCD_MEM_WS: ::DWORD = 0x300;
-pub const fPCD_MEM_WS_ONE: ::DWORD = 0x100;
-pub const fPCD_MEM_WS_TWO: ::DWORD = 0x200;
-pub const fPCD_MEM_WS_THREE: ::DWORD = 0x300;
-pub const fPCD_MEM_A: ::DWORD = 0x4;
-pub const fPCD_ATTRIBUTES_PER_WINDOW: ::DWORD = 0x8000;
-pub const fPCD_IO1_16: ::DWORD = 0x00010000;
-pub const fPCD_IO1_ZW_8: ::DWORD = 0x00020000;
-pub const fPCD_IO1_SRC_16: ::DWORD = 0x00040000;
-pub const fPCD_IO1_WS_16: ::DWORD = 0x00080000;
-pub const fPCD_IO2_16: ::DWORD = 0x00100000;
-pub const fPCD_IO2_ZW_8: ::DWORD = 0x00200000;
-pub const fPCD_IO2_SRC_16: ::DWORD = 0x00400000;
-pub const fPCD_IO2_WS_16: ::DWORD = 0x00800000;
-pub const mPCD_MEM1_WS: ::DWORD = 0x03000000;
-pub const fPCD_MEM1_WS_TWO: ::DWORD = 0x02000000;
-pub const fPCD_MEM1_WS_THREE: ::DWORD = 0x03000000;
-pub const fPCD_MEM1_16: ::DWORD = 0x04000000;
-pub const mPCD_MEM2_WS: ::DWORD = 0x30000000;
-pub const fPCD_MEM2_WS_ONE: ::DWORD = 0x10000000;
-pub const fPCD_MEM2_WS_TWO: ::DWORD = 0x20000000;
-pub const fPCD_MEM2_WS_THREE: ::DWORD = 0x30000000;
-pub const fPCD_MEM2_16: ::DWORD = 0x40000000;
-pub const PCD_MAX_MEMORY: usize = 2;
-pub const PCD_MAX_IO: usize = 2;
-STRUCT!{struct PCCARD_DES {
-    PCD_Count: ::DWORD,
-    PCD_Type: ::DWORD,
-    PCD_Flags: ::DWORD,
-    PCD_ConfigIndex: ::BYTE,
-    PCD_Reserved: [::BYTE; 3],
-    PCD_MemoryCardBase1: ::DWORD,
-    PCD_MemoryCardBase2: ::DWORD,
-    PCD_MemoryCardBase: [::DWORD; PCD_MAX_MEMORY],
-    PCD_MemoryFlags: [::WORD; PCD_MAX_MEMORY],
-    PCD_IoFlags: [::BYTE; PCD_MAX_IO],
-}}
-pub type PPCCARD_DES = *mut PCCARD_DES;
-STRUCT!{struct PCCARD_RESOURCE {
-    PcCard_Header: PCCARD_DES,
-}}
-pub type PPCCARD_RESOURCE = *mut PCCARD_RESOURCE;
-pub const mPMF_AUDIO_ENABLE: ::DWORD = 0x8;
-pub const fPMF_AUDIO_ENABLE: ::DWORD = 0x8;
-STRUCT!{struct MFCARD_DES {
-    PMF_Count: ::DWORD,
-    PMF_Type: ::DWORD,
-    PMF_Flags: ::DWORD,
-    PMF_ConfigOptions: ::BYTE,
-    PMF_IoResourceIndex: ::BYTE,
-    PMF_Reserved: [::BYTE; 2],
-    PMF_ConfigRegisterBase: ::DWORD,
-}}
-pub type PMFCARD_DES = *mut MFCARD_DES;
-STRUCT!{struct MFCARD_RESOURCE {
-    MfCard_Header: MFCARD_DES,
-}}
-pub type PMFCARD_RESOURCE = *mut MFCARD_RESOURCE;
-STRUCT!{struct BUSNUMBER_RANGE {
-    BUSR_Min: ::ULONG,
-    BUSR_Max: ::ULONG,
-    BUSR_nBusNumbers: ::ULONG,
-    BUSR_Flags: ::ULONG,
-}}
-pub type PBUSNUMBER_RANGE = *mut BUSNUMBER_RANGE;
-STRUCT!{struct BUSNUMBER_DES {
-    BUSD_Count: ::DWORD,
-    BUSD_Type: ::DWORD,
-    BUSD_Flags: ::DWORD,
-    BUSD_Alloc_Base: ::ULONG,
-    BUSD_Alloc_End: ::ULONG,
-}}
-pub type PBUSNUMBER_DES = *mut BUSNUMBER_DES;
-STRUCT!{struct BUSNUMBER_RESOURCE {
-    BusNumber_Header: BUSNUMBER_DES,
-    BusNumber_Data: [BUSNUMBER_RANGE; ::ANYSIZE_ARRAY],
-}}
-pub type PBUSNUMBER_RESOURCE = *mut BUSNUMBER_RESOURCE;
-STRUCT!{struct CONNECTION_DES {
-    COND_Type: ::DWORD,
-    COND_Flags: ::DWORD,
-    COND_Class: ::BYTE,
-    COND_ClassType: ::BYTE,
-    COND_Reserved1: ::BYTE,
-    COND_Reserved2: ::BYTE,
-    COND_Id: ::LARGE_INTEGER,
-}}
-pub type PCONNECTION_DES = *mut CONNECTION_DES;
-STRUCT!{struct CONNECTION_RESOURCE {
-    Connection_Header: CONNECTION_DES,
-}}
-pub type PCONNECTION_RESOURCE = *mut CONNECTION_RESOURCE;
-pub const CM_HWPI_NOT_DOCKABLE: ::DWORD = 0x00000000;
-pub const CM_HWPI_UNDOCKED: ::DWORD = 0x00000001;
-pub const CM_HWPI_DOCKED: ::DWORD = 0x00000002;
-STRUCT!{nodebug struct HWPROFILEINFO_A {
-    HWPI_ulHWProfile: ::ULONG,
-    HWPI_szFriendlyName: [::CHAR; MAX_PROFILE_LEN],
-    HWPI_dwFlags: ::DWORD,
-}}
-pub type PHWPROFILEINFO_A = *mut HWPROFILEINFO_A;
-STRUCT!{nodebug struct HWPROFILEINFO_W {
-    HWPI_ulHWProfile: ::ULONG,
-    HWPI_szFriendlyName: [::WCHAR; MAX_PROFILE_LEN],
-    HWPI_dwFlags: ::DWORD,
-}}
-pub type PHWPROFILEINFO_W = *mut HWPROFILEINFO_W;
-pub const ResType_All: RESOURCEID = 0x00000000;
-pub const ResType_None: RESOURCEID = 0x00000000;
-pub const ResType_Mem: RESOURCEID = 0x00000001;
-pub const ResType_IO: RESOURCEID = 0x00000002;
-pub const ResType_DMA: RESOURCEID = 0x00000003;
-pub const ResType_IRQ: RESOURCEID = 0x00000004;
-pub const ResType_DoNotUse: RESOURCEID = 0x00000005;
-pub const ResType_BusNumber: RESOURCEID = 0x00000006;
-pub const ResType_MemLarge: RESOURCEID = 0x00000007;
-pub const ResType_MAX: RESOURCEID = 0x00000007;
-pub const ResType_Ignored_Bit: RESOURCEID = 0x00008000;
-pub const ResType_ClassSpecific: RESOURCEID = 0x0000FFFF;
-pub const ResType_Reserved: RESOURCEID = 0x00008000;
-pub const ResType_DevicePrivate: RESOURCEID = 0x00008001;
-pub const ResType_PcCardConfig: RESOURCEID = 0x00008002;
-pub const ResType_MfCardConfig: RESOURCEID = 0x00008003;
-pub const ResType_Connection: RESOURCEID = 0x00008004;
-pub const CM_ADD_RANGE_ADDIFCONFLICT: ::ULONG = 0x00000000;
-pub const CM_ADD_RANGE_DONOTADDIFCONFLICT: ::ULONG = 0x00000001;
-pub const CM_ADD_RANGE_BITS: ::ULONG = 0x00000001;
-pub const BASIC_LOG_CONF: ::ULONG = 0x00000000;
-pub const FILTERED_LOG_CONF: ::ULONG = 0x00000001;
-pub const ALLOC_LOG_CONF: ::ULONG = 0x00000002;
-pub const BOOT_LOG_CONF: ::ULONG = 0x00000003;
-pub const FORCED_LOG_CONF: ::ULONG = 0x00000004;
-pub const OVERRIDE_LOG_CONF: ::ULONG = 0x00000005;
-pub const NUM_LOG_CONF: ::ULONG = 0x00000006;
-pub const LOG_CONF_BITS: ::ULONG = 0x00000007;
-pub const PRIORITY_EQUAL_FIRST: ::ULONG = 0x00000008;
-pub const PRIORITY_EQUAL_LAST: ::ULONG = 0x00000000;
-pub const PRIORITY_BIT: ::ULONG = 0x00000008;
-pub const RegDisposition_OpenAlways: REGDISPOSITION = 0x00000000;
-pub const RegDisposition_OpenExisting: REGDISPOSITION = 0x00000001;
-pub const RegDisposition_Bits: REGDISPOSITION = 0x00000001;
-pub const CM_ADD_ID_HARDWARE: ::ULONG = 0x00000000;
-pub const CM_ADD_ID_COMPATIBLE: ::ULONG = 0x00000001;
-pub const CM_ADD_ID_BITS: ::ULONG = 0x00000001;
-pub const CM_CREATE_DEVNODE_NORMAL: ::ULONG = 0x00000000;
-pub const CM_CREATE_DEVNODE_NO_WAIT_INSTALL: ::ULONG = 0x00000001;
-pub const CM_CREATE_DEVNODE_PHANTOM: ::ULONG = 0x00000002;
-pub const CM_CREATE_DEVNODE_GENERATE_ID: ::ULONG = 0x00000004;
-pub const CM_CREATE_DEVNODE_DO_NOT_INSTALL: ::ULONG = 0x00000008;
-pub const CM_CREATE_DEVNODE_BITS: ::ULONG = 0x0000000F;
-pub const CM_CREATE_DEVINST_NORMAL: ::ULONG = CM_CREATE_DEVNODE_NORMAL;
-pub const CM_CREATE_DEVINST_NO_WAIT_INSTALL: ::ULONG = CM_CREATE_DEVNODE_NO_WAIT_INSTALL;
-pub const CM_CREATE_DEVINST_PHANTOM: ::ULONG = CM_CREATE_DEVNODE_PHANTOM;
-pub const CM_CREATE_DEVINST_GENERATE_ID: ::ULONG = CM_CREATE_DEVNODE_GENERATE_ID;
-pub const CM_CREATE_DEVINST_DO_NOT_INSTALL: ::ULONG = CM_CREATE_DEVNODE_DO_NOT_INSTALL;
-pub const CM_CREATE_DEVINST_BITS: ::ULONG = CM_CREATE_DEVNODE_BITS;
-pub const CM_DELETE_CLASS_ONLY: ::ULONG = 0x00000000;
-pub const CM_DELETE_CLASS_SUBKEYS: ::ULONG = 0x00000001;
-pub const CM_DELETE_CLASS_INTERFACE: ::ULONG = 0x00000002;
-pub const CM_DELETE_CLASS_BITS: ::ULONG = 0x00000003;
-pub const CM_ENUMERATE_CLASSES_INSTALLER: ::ULONG = 0x00000000;
-pub const CM_ENUMERATE_CLASSES_INTERFACE: ::ULONG = 0x00000001;
-pub const CM_ENUMERATE_CLASSES_BITS: ::ULONG = 0x00000001;
-pub const CM_DETECT_NEW_PROFILE: ::ULONG = 0x00000001;
-pub const CM_DETECT_CRASHED: ::ULONG = 0x00000002;
-pub const CM_DETECT_HWPROF_FIRST_BOOT: ::ULONG = 0x00000004;
-pub const CM_DETECT_RUN: ::ULONG = 0x80000000;
-pub const CM_DETECT_BITS: ::ULONG = 0x80000007;
-pub const CM_DISABLE_POLITE: ::ULONG = 0x00000000;
-pub const CM_DISABLE_ABSOLUTE: ::ULONG = 0x00000001;
-pub const CM_DISABLE_HARDWARE: ::ULONG = 0x00000002;
-pub const CM_DISABLE_UI_NOT_OK: ::ULONG = 0x00000004;
-pub const CM_DISABLE_BITS: ::ULONG = 0x00000007;
-pub const CM_GETIDLIST_FILTER_NONE: ::ULONG = 0x00000000;
-pub const CM_GETIDLIST_FILTER_ENUMERATOR: ::ULONG = 0x00000001;
-pub const CM_GETIDLIST_FILTER_SERVICE: ::ULONG = 0x00000002;
-pub const CM_GETIDLIST_FILTER_EJECTRELATIONS: ::ULONG = 0x00000004;
-pub const CM_GETIDLIST_FILTER_REMOVALRELATIONS: ::ULONG = 0x00000008;
-pub const CM_GETIDLIST_FILTER_POWERRELATIONS: ::ULONG = 0x00000010;
-pub const CM_GETIDLIST_FILTER_BUSRELATIONS: ::ULONG = 0x00000020;
-pub const CM_GETIDLIST_DONOTGENERATE: ::ULONG = 0x10000040;
-pub const CM_GETIDLIST_FILTER_TRANSPORTRELATIONS: ::ULONG = 0x00000080;
-pub const CM_GETIDLIST_FILTER_PRESENT: ::ULONG = 0x00000100;
-pub const CM_GETIDLIST_FILTER_CLASS: ::ULONG = 0x00000200;
-pub const CM_GETIDLIST_FILTER_BITS: ::ULONG = 0x100003FF;
-pub const CM_GET_DEVICE_INTERFACE_LIST_PRESENT: ::ULONG = 0x00000000;
-pub const CM_GET_DEVICE_INTERFACE_LIST_ALL_DEVICES: ::ULONG = 0x00000001;
-pub const CM_GET_DEVICE_INTERFACE_LIST_BITS: ::ULONG = 0x00000001;
-pub const CM_DRP_DEVICEDESC: ::ULONG = 0x00000001;
-pub const CM_DRP_HARDWAREID: ::ULONG = 0x00000002;
-pub const CM_DRP_COMPATIBLEIDS: ::ULONG = 0x00000003;
-pub const CM_DRP_UNUSED0: ::ULONG = 0x00000004;
-pub const CM_DRP_SERVICE: ::ULONG = 0x00000005;
-pub const CM_DRP_UNUSED1: ::ULONG = 0x00000006;
-pub const CM_DRP_UNUSED2: ::ULONG = 0x00000007;
-pub const CM_DRP_CLASS: ::ULONG = 0x00000008;
-pub const CM_DRP_CLASSGUID: ::ULONG = 0x00000009;
-pub const CM_DRP_DRIVER: ::ULONG = 0x0000000A;
-pub const CM_DRP_CONFIGFLAGS: ::ULONG = 0x0000000B;
-pub const CM_DRP_MFG: ::ULONG = 0x0000000C;
-pub const CM_DRP_FRIENDLYNAME: ::ULONG = 0x0000000D;
-pub const CM_DRP_LOCATION_INFORMATION: ::ULONG = 0x0000000E;
-pub const CM_DRP_PHYSICAL_DEVICE_OBJECT_NAME: ::ULONG = 0x0000000F;
-pub const CM_DRP_CAPABILITIES: ::ULONG = 0x00000010;
-pub const CM_DRP_UI_NUMBER: ::ULONG = 0x00000011;
-pub const CM_DRP_UPPERFILTERS: ::ULONG = 0x00000012;
-pub const CM_CRP_UPPERFILTERS: ::ULONG = CM_DRP_UPPERFILTERS;
-pub const CM_DRP_LOWERFILTERS: ::ULONG = 0x00000013;
-pub const CM_CRP_LOWERFILTERS: ::ULONG = CM_DRP_LOWERFILTERS;
-pub const CM_DRP_BUSTYPEGUID: ::ULONG = 0x00000014;
-pub const CM_DRP_LEGACYBUSTYPE: ::ULONG = 0x00000015;
-pub const CM_DRP_BUSNUMBER: ::ULONG = 0x00000016;
-pub const CM_DRP_ENUMERATOR_NAME: ::ULONG = 0x00000017;
-pub const CM_DRP_SECURITY: ::ULONG = 0x00000018;
-pub const CM_CRP_SECURITY: ::ULONG = CM_DRP_SECURITY;
-pub const CM_DRP_SECURITY_SDS: ::ULONG = 0x00000019;
-pub const CM_CRP_SECURITY_SDS: ::ULONG = CM_DRP_SECURITY_SDS;
-pub const CM_DRP_DEVTYPE: ::ULONG = 0x0000001A;
-pub const CM_CRP_DEVTYPE: ::ULONG = CM_DRP_DEVTYPE;
-pub const CM_DRP_EXCLUSIVE: ::ULONG = 0x0000001B;
-pub const CM_CRP_EXCLUSIVE: ::ULONG = CM_DRP_EXCLUSIVE;
-pub const CM_DRP_CHARACTERISTICS: ::ULONG = 0x0000001C;
-pub const CM_CRP_CHARACTERISTICS: ::ULONG = CM_DRP_CHARACTERISTICS;
-pub const CM_DRP_ADDRESS: ::ULONG = 0x0000001D;
-pub const CM_DRP_UI_NUMBER_DESC_FORMAT: ::ULONG = 0x0000001E;
-pub const CM_DRP_DEVICE_POWER_DATA: ::ULONG = 0x0000001F;
-pub const CM_DRP_REMOVAL_POLICY: ::ULONG = 0x00000020;
-pub const CM_DRP_REMOVAL_POLICY_HW_DEFAULT: ::ULONG = 0x00000021;
-pub const CM_DRP_REMOVAL_POLICY_OVERRIDE: ::ULONG = 0x00000022;
-pub const CM_DRP_INSTALL_STATE: ::ULONG = 0x00000023;
-pub const CM_DRP_LOCATION_PATHS: ::ULONG = 0x00000024;
-pub const CM_DRP_BASE_CONTAINERID: ::ULONG = 0x00000025;
-pub const CM_DRP_MIN: ::ULONG = 0x00000001;
-pub const CM_CRP_MIN: ::ULONG = CM_DRP_MIN;
-pub const CM_DRP_MAX: ::ULONG = 0x00000025;
-pub const CM_CRP_MAX: ::ULONG = CM_DRP_MAX;
-pub const CM_DEVCAP_LOCKSUPPORTED: ::ULONG = 0x00000001;
-pub const CM_DEVCAP_EJECTSUPPORTED: ::ULONG = 0x00000002;
-pub const CM_DEVCAP_REMOVABLE: ::ULONG = 0x00000004;
-pub const CM_DEVCAP_DOCKDEVICE: ::ULONG = 0x00000008;
-pub const CM_DEVCAP_UNIQUEID: ::ULONG = 0x00000010;
-pub const CM_DEVCAP_SILENTINSTALL: ::ULONG = 0x00000020;
-pub const CM_DEVCAP_RAWDEVICEOK: ::ULONG = 0x00000040;
-pub const CM_DEVCAP_SURPRISEREMOVALOK: ::ULONG = 0x00000080;
-pub const CM_DEVCAP_HARDWAREDISABLED: ::ULONG = 0x00000100;
-pub const CM_DEVCAP_NONDYNAMIC: ::ULONG = 0x00000200;
-pub const CM_REMOVAL_POLICY_EXPECT_NO_REMOVAL: ::ULONG = 1;
-pub const CM_REMOVAL_POLICY_EXPECT_ORDERLY_REMOVAL: ::ULONG = 2;
-pub const CM_REMOVAL_POLICY_EXPECT_SURPRISE_REMOVAL: ::ULONG = 3;
-pub const CM_INSTALL_STATE_INSTALLED: ::ULONG = 0;
-pub const CM_INSTALL_STATE_NEEDS_REINSTALL: ::ULONG = 1;
-pub const CM_INSTALL_STATE_FAILED_INSTALL: ::ULONG = 2;
-pub const CM_INSTALL_STATE_FINISH_INSTALL: ::ULONG = 3;
-pub const CM_LOCATE_DEVNODE_NORMAL: ::ULONG = 0x00000000;
-pub const CM_LOCATE_DEVNODE_PHANTOM: ::ULONG = 0x00000001;
-pub const CM_LOCATE_DEVNODE_CANCELREMOVE: ::ULONG = 0x00000002;
-pub const CM_LOCATE_DEVNODE_NOVALIDATION: ::ULONG = 0x00000004;
-pub const CM_LOCATE_DEVNODE_BITS: ::ULONG = 0x00000007;
-pub const CM_LOCATE_DEVINST_NORMAL: ::ULONG = CM_LOCATE_DEVNODE_NORMAL;
-pub const CM_LOCATE_DEVINST_PHANTOM: ::ULONG = CM_LOCATE_DEVNODE_PHANTOM;
-pub const CM_LOCATE_DEVINST_CANCELREMOVE: ::ULONG = CM_LOCATE_DEVNODE_CANCELREMOVE;
-pub const CM_LOCATE_DEVINST_NOVALIDATION: ::ULONG = CM_LOCATE_DEVNODE_NOVALIDATION;
-pub const CM_LOCATE_DEVINST_BITS: ::ULONG = CM_LOCATE_DEVNODE_BITS;
-pub const CM_OPEN_CLASS_KEY_INSTALLER: ::ULONG = 0x00000000;
-pub const CM_OPEN_CLASS_KEY_INTERFACE: ::ULONG = 0x00000001;
-pub const CM_OPEN_CLASS_KEY_BITS: ::ULONG = 0x00000001;
-pub const CM_REMOVE_UI_OK: ::ULONG = 0x00000000;
-pub const CM_REMOVE_UI_NOT_OK: ::ULONG = 0x00000001;
-pub const CM_REMOVE_NO_RESTART: ::ULONG = 0x00000002;
-pub const CM_REMOVE_BITS: ::ULONG = 0x00000003;
-pub const CM_QUERY_REMOVE_UI_OK: ::ULONG = CM_REMOVE_UI_OK;
-pub const CM_QUERY_REMOVE_UI_NOT_OK: ::ULONG = CM_REMOVE_UI_NOT_OK;
-pub const CM_QUERY_REMOVE_BITS: ::ULONG = CM_QUERY_REMOVE_UI_OK | CM_QUERY_REMOVE_UI_NOT_OK;
-pub const CM_REENUMERATE_NORMAL: ::ULONG = 0x00000000;
-pub const CM_REENUMERATE_SYNCHRONOUS: ::ULONG = 0x00000001;
-pub const CM_REENUMERATE_RETRY_INSTALLATION: ::ULONG = 0x00000002;
-pub const CM_REENUMERATE_ASYNCHRONOUS: ::ULONG = 0x00000004;
-pub const CM_REENUMERATE_BITS: ::ULONG = 0x00000007;
-pub const CM_REGISTER_DEVICE_DRIVER_STATIC: ::ULONG = 0x00000000;
-pub const CM_REGISTER_DEVICE_DRIVER_DISABLEABLE: ::ULONG = 0x00000001;
-pub const CM_REGISTER_DEVICE_DRIVER_REMOVABLE: ::ULONG = 0x00000002;
-pub const CM_REGISTER_DEVICE_DRIVER_BITS: ::ULONG = 0x00000003;
-pub const CM_REGISTRY_HARDWARE: ::ULONG = 0x00000000;
-pub const CM_REGISTRY_SOFTWARE: ::ULONG = 0x00000001;
-pub const CM_REGISTRY_USER: ::ULONG = 0x00000100;
-pub const CM_REGISTRY_CONFIG: ::ULONG = 0x00000200;
-pub const CM_REGISTRY_BITS: ::ULONG = 0x00000301;
-pub const CM_SET_DEVNODE_PROBLEM_NORMAL: ::ULONG = 0x00000000;
-pub const CM_SET_DEVNODE_PROBLEM_OVERRIDE: ::ULONG = 0x00000001;
-pub const CM_SET_DEVNODE_PROBLEM_BITS: ::ULONG = 0x00000001;
-pub const CM_SET_DEVINST_PROBLEM_NORMAL: ::ULONG = CM_SET_DEVNODE_PROBLEM_NORMAL;
-pub const CM_SET_DEVINST_PROBLEM_OVERRIDE: ::ULONG = CM_SET_DEVNODE_PROBLEM_OVERRIDE;
-pub const CM_SET_DEVINST_PROBLEM_BITS: ::ULONG = CM_SET_DEVNODE_PROBLEM_BITS;
-pub const CM_SET_HW_PROF_FLAGS_UI_NOT_OK: ::ULONG = 0x00000001;
-pub const CM_SET_HW_PROF_FLAGS_BITS: ::ULONG = 0x00000001;
-pub const CM_SETUP_DEVNODE_READY: ::ULONG = 0x00000000;
-pub const CM_SETUP_DEVINST_READY: ::ULONG = CM_SETUP_DEVNODE_READY;
-pub const CM_SETUP_DOWNLOAD: ::ULONG = 0x00000001;
-pub const CM_SETUP_WRITE_LOG_CONFS: ::ULONG = 0x00000002;
-pub const CM_SETUP_PROP_CHANGE: ::ULONG = 0x00000003;
-pub const CM_SETUP_DEVNODE_RESET: ::ULONG = 0x00000004;
-pub const CM_SETUP_DEVINST_RESET: ::ULONG = CM_SETUP_DEVNODE_RESET;
-pub const CM_SETUP_DEVNODE_CONFIG: ::ULONG = 0x00000005;
-pub const CM_SETUP_DEVINST_CONFIG: ::ULONG = CM_SETUP_DEVNODE_CONFIG;
-pub const CM_SETUP_DEVNODE_CONFIG_CLASS: ::ULONG = 0x00000006;
-pub const CM_SETUP_DEVINST_CONFIG_CLASS: ::ULONG = CM_SETUP_DEVNODE_CONFIG_CLASS;
-pub const CM_SETUP_DEVNODE_CONFIG_EXTENSIONS: ::ULONG = 0x00000007;
-pub const CM_SETUP_DEVINST_CONFIG_EXTENSIONS: ::ULONG = CM_SETUP_DEVNODE_CONFIG_EXTENSIONS;
-pub const CM_SETUP_BITS: ::ULONG = 0x00000007;
-pub const CM_QUERY_ARBITRATOR_RAW: ::ULONG = 0x00000000;
-pub const CM_QUERY_ARBITRATOR_TRANSLATED: ::ULONG = 0x00000001;
-pub const CM_QUERY_ARBITRATOR_BITS: ::ULONG = 0x00000001;
-pub const CM_CUSTOMDEVPROP_MERGE_MULTISZ: ::ULONG = 0x00000001;
-pub const CM_CUSTOMDEVPROP_BITS: ::ULONG = 0x00000001;
-pub const CM_NAME_ATTRIBUTE_NAME_RETRIEVED_FROM_DEVICE: ::ULONG = 0x1;
-pub const CM_NAME_ATTRIBUTE_USER_ASSIGNED_NAME: ::ULONG = 0x2;
-pub const CM_CLASS_PROPERTY_INSTALLER: ::ULONG = 0x00000000;
-pub const CM_CLASS_PROPERTY_INTERFACE: ::ULONG = 0x00000001;
-pub const CM_CLASS_PROPERTY_BITS: ::ULONG = 0x00000001;
-DECLARE_HANDLE!(HCMNOTIFICATION, HCMNOTIFICATION__);
-pub type PHCMNOTIFICATION = *mut HCMNOTIFICATION;
-pub const CM_NOTIFY_FILTER_FLAG_ALL_INTERFACE_CLASSES: ::ULONG = 0x00000001;
-pub const CM_NOTIFY_FILTER_FLAG_ALL_DEVICE_INSTANCES: ::ULONG = 0x00000002;
-pub const CM_NOTIFY_FILTER_VALID_FLAGS: ::ULONG = CM_NOTIFY_FILTER_FLAG_ALL_INTERFACE_CLASSES
-    | CM_NOTIFY_FILTER_FLAG_ALL_DEVICE_INSTANCES;
-ENUM!{enum CM_NOTIFY_FILTER_TYPE {
-    CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE = 0,
-    CM_NOTIFY_FILTER_TYPE_DEVICEHANDLE,
-    CM_NOTIFY_FILTER_TYPE_DEVICEINSTANCE,
-    CM_NOTIFY_FILTER_TYPE_MAX,
-}}
-pub type PCM_NOTIFY_FILTER_TYPE = *mut CM_NOTIFY_FILTER_TYPE;
-STRUCT!{struct CM_NOTIFY_FILTER_DeviceInterface {
-    ClassGuid: ::GUID,
-}}
-STRUCT!{struct CM_NOTIFY_FILTER_DeviceHandle {
-    hTarget: ::HANDLE,
-}}
-STRUCT!{nodebug struct CM_NOTIFY_FILTER_DeviceInstance {
-    InstanceId: [::WCHAR; MAX_DEVICE_ID_LEN],
-}}
-STRUCT!{nodebug struct CM_NOTIFY_FILTER {
-    cbSize: ::DWORD,
-    Flags: ::DWORD,
-    FilterType: CM_NOTIFY_FILTER_TYPE,
-    Reserved: ::DWORD,
-    u: [::BYTE; 400],
-}}
-UNION!(CM_NOTIFY_FILTER, u, DeviceInterface, DeviceInterface_mut, CM_NOTIFY_FILTER_DeviceInterface);
-UNION!(CM_NOTIFY_FILTER, u, DeviceHandle, DeviceHandle_mut, CM_NOTIFY_FILTER_DeviceHandle);
-UNION!(CM_NOTIFY_FILTER, u, DeviceInstance, DeviceInstance_mut, CM_NOTIFY_FILTER_DeviceInstance);
-pub type PCM_NOTIFY_FILTER = *mut CM_NOTIFY_FILTER;
-ENUM!{enum CM_NOTIFY_ACTION {
-    CM_NOTIFY_ACTION_DEVICEINTERFACEARRIVAL = 0,
-    CM_NOTIFY_ACTION_DEVICEINTERFACEREMOVAL,
-    CM_NOTIFY_ACTION_DEVICEQUERYREMOVE,
-    CM_NOTIFY_ACTION_DEVICEQUERYREMOVEFAILED,
-    CM_NOTIFY_ACTION_DEVICEREMOVEPENDING,
-    CM_NOTIFY_ACTION_DEVICEREMOVECOMPLETE,
-    CM_NOTIFY_ACTION_DEVICECUSTOMEVENT,
-    CM_NOTIFY_ACTION_DEVICEINSTANCEENUMERATED,
-    CM_NOTIFY_ACTION_DEVICEINSTANCESTARTED,
-    CM_NOTIFY_ACTION_DEVICEINSTANCEREMOVED,
-    CM_NOTIFY_ACTION_MAX,
-}}
-pub type PCM_NOTIFY_ACTION = *mut CM_NOTIFY_ACTION;
-STRUCT!{struct CM_NOTIFY_EVENT_DATA_DeviceInterface {
-    ClassGuid: ::GUID,
-    SymbolicLink: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-STRUCT!{struct CM_NOTIFY_EVENT_DATA_DeviceHandle {
-    EventGuid: ::GUID,
-    NameOffset: ::LONG,
-    DataSize: ::DWORD,
-    Data: [::BYTE; ::ANYSIZE_ARRAY],
-}}
-STRUCT!{struct CM_NOTIFY_EVENT_DATA_DeviceInstance {
-    InstanceId: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-STRUCT!{struct CM_NOTIFY_EVENT_DATA {
-    FilterType: CM_NOTIFY_FILTER_TYPE,
-    Reserved: ::DWORD,
-    u: [::BYTE; 25],
-}}
-UNION!(
-    CM_NOTIFY_EVENT_DATA, u, DeviceInterface, DeviceInterface_mut,
-    CM_NOTIFY_EVENT_DATA_DeviceInterface
-);
-UNION!(CM_NOTIFY_EVENT_DATA, u, DeviceHandle, DeviceHandle_mut, CM_NOTIFY_EVENT_DATA_DeviceHandle);
-UNION!(
-    CM_NOTIFY_EVENT_DATA, u, DeviceInstance, DeviceInstance_mut, CM_NOTIFY_EVENT_DATA_DeviceInstance
-);
-pub type PCM_NOTIFY_EVENT_DATA = *mut CM_NOTIFY_EVENT_DATA;
-pub type PCM_NOTIFY_CALLBACK = Option<unsafe extern "system" fn(
-    hNotify: HCMNOTIFICATION, Context: ::PVOID, Action: CM_NOTIFY_ACTION,
-    EventData: PCM_NOTIFY_EVENT_DATA, EventDataSize: ::DWORD,
-) -> ::DWORD>;
-pub const CR_SUCCESS: CONFIGRET = 0x00000000;
-pub const CR_DEFAULT: CONFIGRET = 0x00000001;
-pub const CR_OUT_OF_MEMORY: CONFIGRET = 0x00000002;
-pub const CR_INVALID_POINTER: CONFIGRET = 0x00000003;
-pub const CR_INVALID_FLAG: CONFIGRET = 0x00000004;
-pub const CR_INVALID_DEVNODE: CONFIGRET = 0x00000005;
-pub const CR_INVALID_DEVINST: CONFIGRET = CR_INVALID_DEVNODE;
-pub const CR_INVALID_RES_DES: CONFIGRET = 0x00000006;
-pub const CR_INVALID_LOG_CONF: CONFIGRET = 0x00000007;
-pub const CR_INVALID_ARBITRATOR: CONFIGRET = 0x00000008;
-pub const CR_INVALID_NODELIST: CONFIGRET = 0x00000009;
-pub const CR_DEVNODE_HAS_REQS: CONFIGRET = 0x0000000A;
-pub const CR_DEVINST_HAS_REQS: CONFIGRET = CR_DEVNODE_HAS_REQS;
-pub const CR_INVALID_RESOURCEID: CONFIGRET = 0x0000000B;
-pub const CR_DLVXD_NOT_FOUND: CONFIGRET = 0x0000000C;
-pub const CR_NO_SUCH_DEVNODE: CONFIGRET = 0x0000000D;
-pub const CR_NO_SUCH_DEVINST: CONFIGRET = CR_NO_SUCH_DEVNODE;
-pub const CR_NO_MORE_LOG_CONF: CONFIGRET = 0x0000000E;
-pub const CR_NO_MORE_RES_DES: CONFIGRET = 0x0000000F;
-pub const CR_ALREADY_SUCH_DEVNODE: CONFIGRET = 0x00000010;
-pub const CR_ALREADY_SUCH_DEVINST: CONFIGRET = CR_ALREADY_SUCH_DEVNODE;
-pub const CR_INVALID_RANGE_LIST: CONFIGRET = 0x00000011;
-pub const CR_INVALID_RANGE: CONFIGRET = 0x00000012;
-pub const CR_FAILURE: CONFIGRET = 0x00000013;
-pub const CR_NO_SUCH_LOGICAL_DEV: CONFIGRET = 0x00000014;
-pub const CR_CREATE_BLOCKED: CONFIGRET = 0x00000015;
-pub const CR_NOT_SYSTEM_VM: CONFIGRET = 0x00000016;
-pub const CR_REMOVE_VETOED: CONFIGRET = 0x00000017;
-pub const CR_APM_VETOED: CONFIGRET = 0x00000018;
-pub const CR_INVALID_LOAD_TYPE: CONFIGRET = 0x00000019;
-pub const CR_BUFFER_SMALL: CONFIGRET = 0x0000001A;
-pub const CR_NO_ARBITRATOR: CONFIGRET = 0x0000001B;
-pub const CR_NO_REGISTRY_HANDLE: CONFIGRET = 0x0000001C;
-pub const CR_REGISTRY_ERROR: CONFIGRET = 0x0000001D;
-pub const CR_INVALID_DEVICE_ID: CONFIGRET = 0x0000001E;
-pub const CR_INVALID_DATA: CONFIGRET = 0x0000001F;
-pub const CR_INVALID_API: CONFIGRET = 0x00000020;
-pub const CR_DEVLOADER_NOT_READY: CONFIGRET = 0x00000021;
-pub const CR_NEED_RESTART: CONFIGRET = 0x00000022;
-pub const CR_NO_MORE_HW_PROFILES: CONFIGRET = 0x00000023;
-pub const CR_DEVICE_NOT_THERE: CONFIGRET = 0x00000024;
-pub const CR_NO_SUCH_VALUE: CONFIGRET = 0x00000025;
-pub const CR_WRONG_TYPE: CONFIGRET = 0x00000026;
-pub const CR_INVALID_PRIORITY: CONFIGRET = 0x00000027;
-pub const CR_NOT_DISABLEABLE: CONFIGRET = 0x00000028;
-pub const CR_FREE_RESOURCES: CONFIGRET = 0x00000029;
-pub const CR_QUERY_VETOED: CONFIGRET = 0x0000002A;
-pub const CR_CANT_SHARE_IRQ: CONFIGRET = 0x0000002B;
-pub const CR_NO_DEPENDENT: CONFIGRET = 0x0000002C;
-pub const CR_SAME_RESOURCES: CONFIGRET = 0x0000002D;
-pub const CR_NO_SUCH_REGISTRY_KEY: CONFIGRET = 0x0000002E;
-pub const CR_INVALID_MACHINENAME: CONFIGRET = 0x0000002F;
-pub const CR_REMOTE_COMM_FAILURE: CONFIGRET = 0x00000030;
-pub const CR_MACHINE_UNAVAILABLE: CONFIGRET = 0x00000031;
-pub const CR_NO_CM_SERVICES: CONFIGRET = 0x00000032;
-pub const CR_ACCESS_DENIED: CONFIGRET = 0x00000033;
-pub const CR_CALL_NOT_IMPLEMENTED: CONFIGRET = 0x00000034;
-pub const CR_INVALID_PROPERTY: CONFIGRET = 0x00000035;
-pub const CR_DEVICE_INTERFACE_ACTIVE: CONFIGRET = 0x00000036;
-pub const CR_NO_SUCH_DEVICE_INTERFACE: CONFIGRET = 0x00000037;
-pub const CR_INVALID_REFERENCE_STRING: CONFIGRET = 0x00000038;
-pub const CR_INVALID_CONFLICT_LIST: CONFIGRET = 0x00000039;
-pub const CR_INVALID_INDEX: CONFIGRET = 0x0000003A;
-pub const CR_INVALID_STRUCTURE_SIZE: CONFIGRET = 0x0000003B;
-pub const NUM_CR_RESULTS: CONFIGRET = 0x0000003C;
diff --git a/vendor/winapi-0.2.8/src/combaseapi.rs b/vendor/winapi-0.2.8/src/combaseapi.rs
deleted file mode 100644
index 9233bc58a0..0000000000
--- a/vendor/winapi-0.2.8/src/combaseapi.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const CLSCTX_INPROC_SERVER: DWORD = 0x1;
-pub const CLSCTX_INPROC_HANDLER: DWORD = 0x2;
-pub const CLSCTX_LOCAL_SERVER: DWORD = 0x4;
-pub const CLSCTX_REMOTE_SERVER: DWORD = 0x10;
-pub const CLSCTX_SERVER: DWORD = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER |
-                                 CLSCTX_REMOTE_SERVER;
-pub const CLSCTX_ALL: DWORD = CLSCTX_INPROC_HANDLER | CLSCTX_SERVER;
-STRUCT!{struct ServerInformation {
-    dwServerPid: DWORD,
-    dwServerTid: DWORD,
-    ui64ServerAddress: UINT64,
-}}
-pub type PServerInformation = *mut ServerInformation;
-DECLARE_HANDLE!(CO_MTA_USAGE_COOKIE, CO_MTA_USAGE_COOKIE__);
diff --git a/vendor/winapi-0.2.8/src/commctrl.rs b/vendor/winapi-0.2.8/src/commctrl.rs
deleted file mode 100644
index 88513e1170..0000000000
--- a/vendor/winapi-0.2.8/src/commctrl.rs
+++ /dev/null
@@ -1,3578 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//138
-STRUCT!{struct INITCOMMONCONTROLSEX {
-    dwSize: ::DWORD,
-    dwICC: ::DWORD,
-}}
-pub type LPINITCOMMONCONTROLSEX = *mut INITCOMMONCONTROLSEX;
-pub const ICC_LISTVIEW_CLASSES: ::DWORD = 0x1;
-pub const ICC_TREEVIEW_CLASSES: ::DWORD = 0x2;
-pub const ICC_BAR_CLASSES: ::DWORD = 0x4;
-pub const ICC_TAB_CLASSES: ::DWORD = 0x8;
-pub const ICC_UPDOWN_CLASS: ::DWORD = 0x10;
-pub const ICC_PROGRESS_CLASS: ::DWORD = 0x20;
-pub const ICC_HOTKEY_CLASS: ::DWORD = 0x40;
-pub const ICC_ANIMATE_CLASS: ::DWORD = 0x80;
-pub const ICC_WIN95_CLASSES: ::DWORD = 0xFF;
-pub const ICC_DATE_CLASSES: ::DWORD = 0x100;
-pub const ICC_USEREX_CLASSES: ::DWORD = 0x200;
-pub const ICC_COOL_CLASSES: ::DWORD = 0x400;
-pub const ICC_INTERNET_CLASSES: ::DWORD = 0x800;
-pub const ICC_PAGESCROLLER_CLASS: ::DWORD = 0x1000;
-pub const ICC_NATIVEFNTCTL_CLASS: ::DWORD = 0x2000;
-pub const ICC_STANDARD_CLASSES: ::DWORD = 0x4000;
-pub const ICC_LINK_CLASS: ::DWORD = 0x8000;
-pub const ODT_HEADER: ::UINT = 100;
-pub const ODT_TAB: ::UINT = 101;
-pub const ODT_LISTVIEW: ::UINT = 102;
-pub const LVM_FIRST: ::UINT = 0x1000;
-pub const TV_FIRST: ::UINT = 0x1100;
-pub const HDM_FIRST: ::UINT = 0x1200;
-pub const TCM_FIRST: ::UINT = 0x1300;
-pub const PGM_FIRST: ::UINT = 0x1400;
-pub const ECM_FIRST: ::UINT = 0x1500;
-pub const BCM_FIRST: ::UINT = 0x1600;
-pub const CBM_FIRST: ::UINT = 0x1700;
-pub const CCM_FIRST: ::UINT = 0x2000;
-pub const CCM_LAST: ::UINT = CCM_FIRST + 0x200;
-pub const CCM_SETBKCOLOR: ::UINT = CCM_FIRST + 1;
-STRUCT!{struct COLORSCHEME {
-    dwSize: ::DWORD,
-    clrBtnHighlight: ::COLORREF,
-    clrBtnShadow: ::COLORREF,
-}}
-pub type LPCOLORSCHEME = *mut COLORSCHEME;
-pub const CCM_SETCOLORSCHEME: ::UINT = CCM_FIRST + 2;
-pub const CCM_GETCOLORSCHEME: ::UINT = CCM_FIRST + 3;
-pub const CCM_GETDROPTARGET: ::UINT = CCM_FIRST + 4;
-pub const CCM_SETUNICODEFORMAT: ::UINT = CCM_FIRST + 5;
-pub const CCM_GETUNICODEFORMAT: ::UINT = CCM_FIRST + 6;
-pub const CCM_SETVERSION: ::UINT = CCM_FIRST + 7;
-pub const CCM_GETVERSION: ::UINT = CCM_FIRST + 8;
-pub const CCM_SETNOTIFYWINDOW: ::UINT = CCM_FIRST + 9;
-pub const CCM_SETWINDOWTHEME: ::UINT = CCM_FIRST + 0xb;
-pub const CCM_DPISCALE: ::UINT = CCM_FIRST + 0xc;
-pub const INFOTIPSIZE: ::c_int = 1024;
-pub const NM_OUTOFMEMORY: ::UINT = (NM_FIRST as ::INT - 1) as ::UINT;
-pub const NM_CLICK: ::UINT = (NM_FIRST as ::INT - 2) as ::UINT;
-pub const NM_DBLCLK: ::UINT = (NM_FIRST as ::INT - 3) as ::UINT;
-pub const NM_RETURN: ::UINT = (NM_FIRST as ::INT - 4) as ::UINT;
-pub const NM_RCLICK: ::UINT = (NM_FIRST as ::INT - 5) as ::UINT;
-pub const NM_RDBLCLK: ::UINT = (NM_FIRST as ::INT - 6) as ::UINT;
-pub const NM_SETFOCUS: ::UINT = (NM_FIRST as ::INT - 7) as ::UINT;
-pub const NM_KILLFOCUS: ::UINT = (NM_FIRST as ::INT - 8) as ::UINT;
-pub const NM_CUSTOMDRAW: ::UINT = (NM_FIRST as ::INT - 12) as ::UINT;
-pub const NM_HOVER: ::UINT = (NM_FIRST as ::INT - 13) as ::UINT;
-pub const NM_NCHITTEST: ::UINT = (NM_FIRST as ::INT - 14) as ::UINT;
-pub const NM_KEYDOWN: ::UINT = (NM_FIRST as ::INT - 15) as ::UINT;
-pub const NM_RELEASEDCAPTURE: ::UINT = (NM_FIRST as ::INT - 16) as ::UINT;
-pub const NM_SETCURSOR: ::UINT = (NM_FIRST as ::INT - 17) as ::UINT;
-pub const NM_CHAR: ::UINT = (NM_FIRST as ::INT - 18) as ::UINT;
-pub const NM_TOOLTIPSCREATED: ::UINT = (NM_FIRST as ::INT - 19) as ::UINT;
-pub const NM_LDOWN: ::UINT = (NM_FIRST as ::INT - 20) as ::UINT;
-pub const NM_RDOWN: ::UINT = (NM_FIRST as ::INT - 21) as ::UINT;
-pub const NM_THEMECHANGED: ::UINT = (NM_FIRST as ::INT - 22) as ::UINT;
-pub const NM_FONTCHANGED: ::UINT = (NM_FIRST as ::INT - 23) as ::UINT;
-pub const NM_CUSTOMTEXT: ::UINT = (NM_FIRST as ::INT - 24) as ::UINT;
-pub const NM_TVSTATEIMAGECHANGING: ::UINT = (NM_FIRST as ::INT - 24) as ::UINT;
-STRUCT!{struct NMTOOLTIPSCREATED {
-    hdr: ::NMHDR,
-    hwndToolTips: ::HWND,
-}}
-pub type LPNMTOOLTIPSCREATED = *mut NMTOOLTIPSCREATED;
-STRUCT!{struct NMMOUSE {
-    hdr : ::NMHDR,
-    dwItemSpec: ::DWORD_PTR,
-    dwItemData: ::DWORD_PTR,
-    pt: ::POINT,
-    dwHitInfo: ::LPARAM,
-}}
-pub type LPNMMOUSE = *mut NMMOUSE;
-pub type NMCLICK = NMMOUSE;
-pub type LPNMCLICK = LPNMMOUSE;
-STRUCT!{struct NMOBJECTNOTIFY {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    piid: *const ::IID,
-    pObject: *mut ::c_void,
-    hResult: ::HRESULT,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMOBJECTNOTIFY = *mut NMOBJECTNOTIFY;
-STRUCT!{struct NMKEY {
-    hdr: ::NMHDR,
-    nVKey: ::UINT,
-    uFlags: ::UINT,
-}}
-pub type LPNMKEY = *mut NMKEY;
-STRUCT!{struct NMCHAR {
-    hdr: ::NMHDR,
-    ch: ::UINT,
-    dwItemPrev: ::DWORD,
-    dwItemNext: ::DWORD,
-}}
-pub type LPNMCHAR = *mut NMCHAR;
-STRUCT!{struct NMCUSTOMTEXT {
-    hdr: ::NMHDR,
-    hDC: ::HDC,
-    lpString: ::LPCWSTR,
-    nCount: ::c_int,
-    lpRect: ::LPRECT,
-    uFormat: ::UINT,
-    fLink: ::BOOL,
-}}
-pub type LPNMCUSTOMTEXT = *mut NMCUSTOMTEXT;
-pub const NM_FIRST: ::UINT = 0;
-pub const NM_LAST: ::UINT = -99i32 as ::UINT;
-pub const LVN_FIRST: ::UINT = -100i32 as ::UINT;
-pub const LVN_LAST: ::UINT = -199i32 as ::UINT;
-pub const HDN_FIRST: ::UINT = -300i32 as ::UINT;
-pub const HDN_LAST: ::UINT = -399i32 as ::UINT;
-pub const TVN_FIRST: ::UINT = -400i32 as ::UINT;
-pub const TVN_LAST: ::UINT = -499i32 as ::UINT;
-pub const TTN_FIRST: ::UINT = -520i32 as ::UINT;
-pub const TTN_LAST: ::UINT = -549i32 as ::UINT;
-pub const TCN_FIRST: ::UINT = -550i32 as ::UINT;
-pub const TCN_LAST: ::UINT = -580i32 as ::UINT;
-// pub const CDN_FIRST: ::UINT = 0 - 601;
-// pub const CDN_LAST: ::UINT = 0 - 699;
-pub const TBN_FIRST: ::UINT = -700i32 as ::UINT;
-pub const TBN_LAST: ::UINT = -720i32 as ::UINT;
-pub const UDN_FIRST: ::UINT = -721i32 as ::UINT;
-pub const UDN_LAST: ::UINT = -729i32 as ::UINT;
-pub const DTN_FIRST: ::UINT = -740i32 as ::UINT;
-pub const DTN_LAST: ::UINT = -745i32 as ::UINT;
-pub const MCN_FIRST: ::UINT = -746i32 as ::UINT;
-pub const MCN_LAST: ::UINT = -752i32 as ::UINT;
-pub const DTN_FIRST2: ::UINT = -753i32 as ::UINT;
-pub const DTN_LAST2: ::UINT = -799i32 as ::UINT;
-pub const CBEN_FIRST: ::UINT = -800i32 as ::UINT;
-pub const CBEN_LAST: ::UINT = -830i32 as ::UINT;
-pub const RBN_FIRST: ::UINT = -831i32 as ::UINT;
-pub const RBN_LAST: ::UINT = -859i32 as ::UINT;
-pub const IPN_FIRST: ::UINT = -860i32 as ::UINT;
-pub const IPN_LAST: ::UINT = -879i32 as ::UINT;
-pub const SBN_FIRST: ::UINT = -880i32 as ::UINT;
-pub const SBN_LAST: ::UINT = -899i32 as ::UINT;
-pub const PGN_FIRST: ::UINT = -900i32 as ::UINT;
-pub const PGN_LAST: ::UINT = -950i32 as ::UINT;
-pub const WMN_FIRST: ::UINT = -1000i32 as ::UINT;
-pub const WMN_LAST: ::UINT = -1200i32 as ::UINT;
-pub const BCN_FIRST: ::UINT = -1250i32 as ::UINT;
-pub const BCN_LAST: ::UINT = -1350i32 as ::UINT;
-pub const TRBN_FIRST: ::UINT = -1501i32 as ::UINT;
-pub const TRBN_LAST: ::UINT = -1519i32 as ::UINT;
-pub const CDRF_DODEFAULT: ::LRESULT = 0x00000000;
-pub const CDRF_NEWFONT: ::LRESULT = 0x00000002;
-pub const CDRF_SKIPDEFAULT: ::LRESULT = 0x00000004;
-pub const CDRF_DOERASE: ::LRESULT = 0x00000008;
-pub const CDRF_SKIPPOSTPAINT: ::LRESULT = 0x00000100;
-pub const CDRF_NOTIFYPOSTPAINT: ::LRESULT = 0x00000010;
-pub const CDRF_NOTIFYITEMDRAW: ::LRESULT = 0x00000020;
-pub const CDRF_NOTIFYSUBITEMDRAW: ::LRESULT = 0x00000020;
-pub const CDRF_NOTIFYPOSTERASE: ::LRESULT = 0x00000040;
-pub const CDDS_PREPAINT: ::DWORD = 0x00000001;
-pub const CDDS_POSTPAINT: ::DWORD = 0x00000002;
-pub const CDDS_PREERASE: ::DWORD = 0x00000003;
-pub const CDDS_POSTERASE: ::DWORD = 0x00000004;
-pub const CDDS_ITEM: ::DWORD = 0x00010000;
-pub const CDDS_ITEMPREPAINT: ::DWORD = CDDS_ITEM | CDDS_PREPAINT;
-pub const CDDS_ITEMPOSTPAINT: ::DWORD = CDDS_ITEM | CDDS_POSTPAINT;
-pub const CDDS_ITEMPREERASE: ::DWORD = CDDS_ITEM | CDDS_PREERASE;
-pub const CDDS_ITEMPOSTERASE: ::DWORD = CDDS_ITEM | CDDS_POSTERASE;
-pub const CDDS_SUBITEM: ::DWORD = 0x00020000;
-pub const CDIS_SELECTED: ::UINT = 0x0001;
-pub const CDIS_GRAYED: ::UINT = 0x0002;
-pub const CDIS_DISABLED: ::UINT = 0x0004;
-pub const CDIS_CHECKED: ::UINT = 0x0008;
-pub const CDIS_FOCUS: ::UINT = 0x0010;
-pub const CDIS_DEFAULT: ::UINT = 0x0020;
-pub const CDIS_HOT: ::UINT = 0x0040;
-pub const CDIS_MARKED: ::UINT = 0x0080;
-pub const CDIS_INDETERMINATE: ::UINT = 0x0100;
-pub const CDIS_SHOWKEYBOARDCUES: ::UINT = 0x0200;
-pub const CDIS_NEARHOT: ::UINT = 0x0400;
-pub const CDIS_OTHERSIDEHOT: ::UINT = 0x0800;
-pub const CDIS_DROPHILITED: ::UINT = 0x1000;
-STRUCT!{struct NMCUSTOMDRAW {
-    hdr: ::NMHDR,
-    dwDrawStage: ::DWORD,
-    hdc: ::HDC,
-    rc: ::RECT,
-    dwItemSpec: ::DWORD_PTR,
-    uItemState: ::UINT,
-    lItemlParam: ::LPARAM,
-}}
-pub type LPNMCUSTOMDRAW = *mut NMCUSTOMDRAW;
-STRUCT!{struct NMTTCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    uDrawFlags: ::UINT,
-}}
-pub type LPNMTTCUSTOMDRAW = *mut NMTTCUSTOMDRAW;
-STRUCT!{struct NMCUSTOMSPLITRECTINFO {
-    hdr: ::NMHDR,
-    rcClient: ::RECT,
-    rcButton: ::RECT,
-    rcSplit: ::RECT,
-}}
-pub type LPNMCUSTOMSPLITRECTINFO = *mut NMCUSTOMSPLITRECTINFO;
-pub const NM_GETCUSTOMSPLITRECT: ::UINT = BCN_FIRST + 0x0003;
-pub const CLR_NONE: ::DWORD = 0xFFFFFFFF;
-pub const CLR_DEFAULT: ::DWORD = 0xFF000000;
-pub enum IMAGELIST {}
-pub type HIMAGELIST = *mut IMAGELIST;
-STRUCT!{struct IMAGELISTDRAWPARAMS {
-    cbSize: ::DWORD,
-    himl: HIMAGELIST,
-    i: ::c_int,
-    hdcDst: ::HDC,
-    x: ::c_int,
-    y: ::c_int,
-    cx: ::c_int,
-    cy: ::c_int,
-    xBitmap: ::c_int,
-    yBitmap: ::c_int,
-    rgbBk: ::COLORREF,
-    rgbFg: ::COLORREF,
-    fStyle: ::UINT,
-    dwRop: ::DWORD,
-    fState: ::DWORD,
-    Frame: ::DWORD,
-    crEffect: ::COLORREF,
-}}
-pub type LPIMAGELISTDRAWPARAMS = *mut IMAGELISTDRAWPARAMS;
-pub const ILC_MASK: ::UINT = 0x00000001;
-pub const ILC_COLOR: ::UINT = 0x00000000;
-pub const ILC_COLORDDB: ::UINT = 0x000000FE;
-pub const ILC_COLOR4: ::UINT = 0x00000004;
-pub const ILC_COLOR8: ::UINT = 0x00000008;
-pub const ILC_COLOR16: ::UINT = 0x00000010;
-pub const ILC_COLOR24: ::UINT = 0x00000018;
-pub const ILC_COLOR32: ::UINT = 0x00000020;
-pub const ILC_PALETTE: ::UINT = 0x00000800;
-pub const ILC_MIRROR: ::UINT = 0x00002000;
-pub const ILC_PERITEMMIRROR: ::UINT = 0x00008000;
-pub const ILC_ORIGINALSIZE: ::UINT = 0x00010000;
-pub const ILC_HIGHQUALITYSCALE: ::UINT = 0x00020000;
-pub const ILD_NORMAL: ::UINT = 0x00000000;
-pub const ILD_TRANSPARENT: ::UINT = 0x00000001;
-pub const ILD_MASK: ::UINT = 0x00000010;
-pub const ILD_IMAGE: ::UINT = 0x00000020;
-pub const ILD_ROP: ::UINT = 0x00000040;
-pub const ILD_BLEND25: ::UINT = 0x00000002;
-pub const ILD_BLEND50: ::UINT = 0x00000004;
-pub const ILD_OVERLAYMASK: ::UINT = 0x00000F00;
-#[inline] #[allow(dead_code)]
-pub fn INDEXTOOVERLAYMASK(i: ::UINT) -> ::UINT { i << 8 }
-pub const ILD_PRESERVEALPHA: ::UINT = 0x00001000;
-pub const ILD_SCALE: ::UINT = 0x00002000;
-pub const ILD_DPISCALE: ::UINT = 0x00004000;
-pub const ILD_ASYNC: ::UINT = 0x00008000;
-pub const ILD_SELECTED: ::UINT = ILD_BLEND50;
-pub const ILD_FOCUS: ::UINT = ILD_BLEND25;
-pub const ILD_BLEND: ::UINT = ILD_BLEND50;
-pub const CLR_HILIGHT: ::DWORD = CLR_DEFAULT;
-pub const ILS_NORMAL: ::DWORD = 0x00000000;
-pub const ILS_GLOW: ::DWORD = 0x00000001;
-pub const ILS_SHADOW: ::DWORD = 0x00000002;
-pub const ILS_SATURATE: ::DWORD = 0x00000004;
-pub const ILS_ALPHA: ::DWORD = 0x00000008;
-pub const HBITMAP_CALLBACK: ::HBITMAP = (0-1) as ::HBITMAP;
-pub const ILCF_MOVE: ::UINT = 0x00000000;
-pub const ILCF_SWAP: ::UINT = 0x00000001;
-STRUCT!{struct IMAGEINFO {
-    hbmImage: ::HBITMAP,
-    hbmMask: ::HBITMAP,
-    Unused1: ::c_int,
-    Unused2: ::c_int,
-    rcImage: ::RECT,
-}}
-pub type LPIMAGEINFO = *mut IMAGEINFO;
-pub const HDS_HORZ: ::DWORD = 0x0000;
-pub const HDS_BUTTONS: ::DWORD = 0x0002;
-pub const HDS_HOTTRACK: ::DWORD = 0x0004;
-pub const HDS_HIDDEN: ::DWORD = 0x0008;
-pub const HDS_DRAGDROP: ::DWORD = 0x0040;
-pub const HDS_FULLDRAG: ::DWORD = 0x0080;
-pub const HDS_FILTERBAR: ::DWORD = 0x0100;
-pub const HDS_FLAT: ::DWORD = 0x0200;
-pub const HDS_CHECKBOXES: ::DWORD = 0x0400;
-pub const HDS_NOSIZING: ::DWORD = 0x0800;
-pub const HDS_OVERFLOW: ::DWORD = 0x1000;
-pub const HDFT_ISSTRING: ::UINT = 0x0000;
-pub const HDFT_ISNUMBER: ::UINT = 0x0001;
-pub const HDFT_ISDATE: ::UINT = 0x0002;
-pub const HDFT_HASNOVALUE: ::UINT = 0x8000;
-STRUCT!{struct HD_TEXTFILTERA {
-    pszText: ::LPSTR,
-    cchTextMax: ::INT,
-}}
-pub type LPHD_TEXTFILTERA = *mut HD_TEXTFILTERA;
-STRUCT!{struct HD_TEXTFILTERW {
-    pszText: ::LPWSTR,
-    cchTextMax: ::INT,
-}}
-pub type LPHD_TEXTFILTERW = *mut HD_TEXTFILTERW;
-STRUCT!{struct HDITEMA {
-    mask: ::UINT,
-    cxy: ::c_int,
-    pszText: ::LPSTR,
-    hbm: ::HBITMAP,
-    cchTextMax: ::c_int,
-    fmt: ::c_int,
-    lParam: ::LPARAM,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    _type: ::UINT,
-    pvFilter: *mut ::c_void,
-    state: ::UINT,
-}}
-pub type LPHDITEMA = *mut HDITEMA;
-STRUCT!{struct HDITEMW {
-    mask: ::UINT,
-    cxy: ::c_int,
-    pszText: ::LPWSTR,
-    hbm: ::HBITMAP,
-    cchTextMax: ::c_int,
-    fmt: ::c_int,
-    lParam: ::LPARAM,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    _type: ::UINT,
-    pvFilter: *mut ::c_void,
-    state: ::UINT,
-}}
-pub type LPHDITEMW = *mut HDITEMW;
-pub const HDI_WIDTH: ::UINT = 0x0001;
-pub const HDI_HEIGHT: ::UINT = HDI_WIDTH;
-pub const HDI_TEXT: ::UINT = 0x0002;
-pub const HDI_FORMAT: ::UINT = 0x0004;
-pub const HDI_LPARAM: ::UINT = 0x0008;
-pub const HDI_BITMAP: ::UINT = 0x0010;
-pub const HDI_IMAGE: ::UINT = 0x0020;
-pub const HDI_DI_SETITEM: ::UINT = 0x0040;
-pub const HDI_ORDER: ::UINT = 0x0080;
-pub const HDI_FILTER: ::UINT = 0x0100;
-pub const HDI_STATE: ::UINT = 0x0200;
-pub const HDF_LEFT: ::c_int = 0x0000;
-pub const HDF_RIGHT: ::c_int = 0x0001;
-pub const HDF_CENTER: ::c_int = 0x0002;
-pub const HDF_JUSTIFYMASK: ::c_int = 0x0003;
-pub const HDF_RTLREADING: ::c_int = 0x0004;
-pub const HDF_BITMAP: ::c_int = 0x2000;
-pub const HDF_STRING: ::c_int = 0x4000;
-pub const HDF_OWNERDRAW: ::c_int = 0x8000;
-pub const HDF_IMAGE: ::c_int = 0x0800;
-pub const HDF_BITMAP_ON_RIGHT: ::c_int = 0x1000;
-pub const HDF_SORTUP: ::c_int = 0x0400;
-pub const HDF_SORTDOWN: ::c_int = 0x0200;
-pub const HDF_CHECKBOX: ::c_int = 0x0040;
-pub const HDF_CHECKED: ::c_int = 0x0080;
-pub const HDF_FIXEDWIDTH: ::c_int = 0x0100;
-pub const HDF_SPLITBUTTON: ::c_int = 0x1000000;
-pub const HDIS_FOCUSED: ::UINT = 0x00000001;
-pub const HDM_GETITEMCOUNT: ::UINT = HDM_FIRST + 0;
-pub const HDM_INSERTITEMA: ::UINT = HDM_FIRST + 1;
-pub const HDM_INSERTITEMW: ::UINT = HDM_FIRST + 10;
-pub const HDM_DELETEITEM: ::UINT = HDM_FIRST + 2;
-pub const HDM_GETITEMA: ::UINT = HDM_FIRST + 3;
-pub const HDM_GETITEMW: ::UINT = HDM_FIRST + 11;
-pub const HDM_SETITEMA: ::UINT = HDM_FIRST + 4;
-pub const HDM_SETITEMW: ::UINT = HDM_FIRST + 12;
-STRUCT!{struct HDLAYOUT {
-    prc: *mut ::RECT,
-    pwpos: *mut ::WINDOWPOS,
-}}
-pub type LPHDLAYOUT = *mut HDLAYOUT;
-pub const HDM_LAYOUT: ::UINT = HDM_FIRST + 5;
-pub const HHT_NOWHERE: ::UINT = 0x0001;
-pub const HHT_ONHEADER: ::UINT = 0x0002;
-pub const HHT_ONDIVIDER: ::UINT = 0x0004;
-pub const HHT_ONDIVOPEN: ::UINT = 0x0008;
-pub const HHT_ONFILTER: ::UINT = 0x0010;
-pub const HHT_ONFILTERBUTTON: ::UINT = 0x0020;
-pub const HHT_ABOVE: ::UINT = 0x0100;
-pub const HHT_BELOW: ::UINT = 0x0200;
-pub const HHT_TORIGHT: ::UINT = 0x0400;
-pub const HHT_TOLEFT: ::UINT = 0x0800;
-pub const HHT_ONITEMSTATEICON: ::UINT = 0x1000;
-pub const HHT_ONDROPDOWN: ::UINT = 0x2000;
-pub const HHT_ONOVERFLOW: ::UINT = 0x4000;
-STRUCT!{struct HDHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    iItem: ::c_int,
-}}
-pub type LPHDHITTESTINFO = *mut HDHITTESTINFO;
-pub const HDSIL_NORMAL: ::WPARAM = 0;
-pub const HDSIL_STATE: ::WPARAM = 1;
-pub const HDM_HITTEST: ::UINT = HDM_FIRST + 6;
-pub const HDM_GETITEMRECT: ::UINT = HDM_FIRST + 7;
-pub const HDM_SETIMAGELIST: ::UINT = HDM_FIRST + 8;
-pub const HDM_GETIMAGELIST: ::UINT = HDM_FIRST + 9;
-pub const HDM_ORDERTOINDEX: ::UINT = HDM_FIRST + 15;
-pub const HDM_CREATEDRAGIMAGE: ::UINT = HDM_FIRST + 16;
-pub const HDM_GETORDERARRAY: ::UINT = HDM_FIRST + 17;
-pub const HDM_SETORDERARRAY: ::UINT = HDM_FIRST + 18;
-pub const HDM_SETHOTDIVIDER: ::UINT = HDM_FIRST + 19;
-pub const HDM_SETBITMAPMARGIN: ::UINT = HDM_FIRST + 20;
-pub const HDM_GETBITMAPMARGIN: ::UINT = HDM_FIRST + 21;
-pub const HDM_SETFILTERCHANGETIMEOUT: ::UINT = HDM_FIRST + 22;
-pub const HDM_EDITFILTER: ::UINT = HDM_FIRST + 23;
-pub const HDM_CLEARFILTER: ::UINT = HDM_FIRST + 24;
-pub const HDM_GETITEMDROPDOWNRECT: ::UINT = HDM_FIRST + 25;
-pub const HDM_GETOVERFLOWRECT: ::UINT = HDM_FIRST + 26;
-pub const HDM_GETFOCUSEDITEM: ::UINT = HDM_FIRST + 27;
-pub const HDM_SETFOCUSEDITEM: ::UINT = HDM_FIRST + 28;
-pub const HDN_ITEMCHANGINGA: ::UINT = HDN_FIRST-0;
-pub const HDN_ITEMCHANGINGW: ::UINT = HDN_FIRST-20;
-pub const HDN_ITEMCHANGEDA: ::UINT = HDN_FIRST-1;
-pub const HDN_ITEMCHANGEDW: ::UINT = HDN_FIRST-21;
-pub const HDN_ITEMCLICKA: ::UINT = HDN_FIRST-2;
-pub const HDN_ITEMCLICKW: ::UINT = HDN_FIRST-22;
-pub const HDN_ITEMDBLCLICKA: ::UINT = HDN_FIRST-3;
-pub const HDN_ITEMDBLCLICKW: ::UINT = HDN_FIRST-23;
-pub const HDN_DIVIDERDBLCLICKA: ::UINT = HDN_FIRST-5;
-pub const HDN_DIVIDERDBLCLICKW: ::UINT = HDN_FIRST-25;
-pub const HDN_BEGINTRACKA: ::UINT = HDN_FIRST-6;
-pub const HDN_BEGINTRACKW: ::UINT = HDN_FIRST-26;
-pub const HDN_ENDTRACKA: ::UINT = HDN_FIRST-7;
-pub const HDN_ENDTRACKW: ::UINT = HDN_FIRST-27;
-pub const HDN_TRACKA: ::UINT = HDN_FIRST-8;
-pub const HDN_TRACKW: ::UINT = HDN_FIRST-28;
-pub const HDN_GETDISPINFOA: ::UINT = HDN_FIRST-9;
-pub const HDN_GETDISPINFOW: ::UINT = HDN_FIRST-29;
-pub const HDN_BEGINDRAG: ::UINT = HDN_FIRST-10;
-pub const HDN_ENDDRAG: ::UINT = HDN_FIRST-11;
-pub const HDN_FILTERCHANGE: ::UINT = HDN_FIRST-12;
-pub const HDN_FILTERBTNCLICK: ::UINT = HDN_FIRST-13;
-pub const HDN_BEGINFILTEREDIT: ::UINT = HDN_FIRST-14;
-pub const HDN_ENDFILTEREDIT: ::UINT = HDN_FIRST-15;
-pub const HDN_ITEMSTATEICONCLICK: ::UINT = HDN_FIRST-16;
-pub const HDN_ITEMKEYDOWN: ::UINT = HDN_FIRST-17;
-pub const HDN_DROPDOWN: ::UINT = HDN_FIRST-18;
-pub const HDN_OVERFLOWCLICK: ::UINT = HDN_FIRST-19;
-STRUCT!{struct NMHEADERA {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iButton: ::c_int,
-    pitem: *mut HDITEMA,
-}}
-pub type LPNMHEADERA = *mut NMHEADERA;
-STRUCT!{struct NMHEADERW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iButton: ::c_int,
-    pitem: *mut HDITEMW,
-}}
-pub type LPNMHEADERW = *mut NMHEADERW;
-STRUCT!{struct NMHDDISPINFOW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    mask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMHDDISPINFOW = *mut NMHDDISPINFOW;
-STRUCT!{struct NMHDDISPINFOA {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    mask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMHDDISPINFOA = *mut NMHDDISPINFOA;
-STRUCT!{struct NMHDFILTERBTNCLICK {
-    hdr: ::NMHDR,
-    iItem: ::INT,
-    rc: ::RECT,
-}}
-pub type LPNMHDFILTERBTNCLICK = *mut NMHDFILTERBTNCLICK;
-#[cfg(target_arch="x86")]
-STRUCT!{struct TBBUTTON {
-    iBitmap: ::c_int,
-    idCommand: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    bReserved: [::BYTE; 2],
-    dwData: ::DWORD_PTR,
-    iString: ::INT_PTR,
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct TBBUTTON {
-    iBitmap: ::c_int,
-    idCommand: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    bReserved: [::BYTE; 6],
-    dwData: ::DWORD_PTR,
-    iString: ::INT_PTR,
-}}
-pub type PTBBUTTON = *mut TBBUTTON;
-pub type LPTBBUTTON = *mut TBBUTTON;
-pub type LPCTBBUTTON = *const TBBUTTON;
-STRUCT!{struct COLORMAP {
-    from: ::COLORREF,
-    to: ::COLORREF,
-}}
-pub type LPCOLORMAP = *mut COLORMAP;
-pub const CMB_MASKED: ::UINT = 0x02;
-pub const TBSTATE_CHECKED: ::BYTE = 0x01;
-pub const TBSTATE_PRESSED: ::BYTE = 0x02;
-pub const TBSTATE_ENABLED: ::BYTE = 0x04;
-pub const TBSTATE_HIDDEN: ::BYTE = 0x08;
-pub const TBSTATE_INDETERMINATE: ::BYTE = 0x10;
-pub const TBSTATE_WRAP: ::BYTE = 0x20;
-pub const TBSTATE_ELLIPSES: ::BYTE = 0x40;
-pub const TBSTATE_MARKED: ::BYTE = 0x80;
-pub const TBSTYLE_BUTTON: ::DWORD = 0x0000;
-pub const TBSTYLE_SEP: ::DWORD = 0x0001;
-pub const TBSTYLE_CHECK: ::DWORD = 0x0002;
-pub const TBSTYLE_GROUP: ::DWORD = 0x0004;
-pub const TBSTYLE_CHECKGROUP: ::DWORD = TBSTYLE_GROUP | TBSTYLE_CHECK;
-pub const TBSTYLE_DROPDOWN: ::DWORD = 0x0008;
-pub const TBSTYLE_AUTOSIZE: ::DWORD = 0x0010;
-pub const TBSTYLE_NOPREFIX: ::DWORD = 0x0020;
-pub const TBSTYLE_TOOLTIPS: ::DWORD = 0x0100;
-pub const TBSTYLE_WRAPABLE: ::DWORD = 0x0200;
-pub const TBSTYLE_ALTDRAG: ::DWORD = 0x0400;
-pub const TBSTYLE_FLAT: ::DWORD = 0x0800;
-pub const TBSTYLE_LIST: ::DWORD = 0x1000;
-pub const TBSTYLE_CUSTOMERASE: ::DWORD = 0x2000;
-pub const TBSTYLE_REGISTERDROP: ::DWORD = 0x4000;
-pub const TBSTYLE_TRANSPARENT: ::DWORD = 0x8000;
-pub const TBSTYLE_EX_DRAWDDARROWS: ::DWORD = 0x00000001;
-pub const BTNS_BUTTON: ::DWORD = TBSTYLE_BUTTON;
-pub const BTNS_SEP: ::DWORD = TBSTYLE_SEP;
-pub const BTNS_CHECK: ::DWORD = TBSTYLE_CHECK;
-pub const BTNS_GROUP: ::DWORD = TBSTYLE_GROUP;
-pub const BTNS_CHECKGROUP: ::DWORD = TBSTYLE_CHECKGROUP;
-pub const BTNS_DROPDOWN: ::DWORD = TBSTYLE_DROPDOWN;
-pub const BTNS_AUTOSIZE: ::DWORD = TBSTYLE_AUTOSIZE;
-pub const BTNS_NOPREFIX: ::DWORD = TBSTYLE_NOPREFIX;
-pub const BTNS_SHOWTEXT: ::DWORD = 0x0040;
-pub const BTNS_WHOLEDROPDOWN: ::DWORD = 0x0080;
-pub const TBSTYLE_EX_MIXEDBUTTONS: ::DWORD = 0x00000008;
-pub const TBSTYLE_EX_HIDECLIPPEDBUTTONS: ::DWORD = 0x00000010;
-pub const TBSTYLE_EX_MULTICOLUMN: ::DWORD = 0x00000002;
-pub const TBSTYLE_EX_VERTICAL: ::DWORD = 0x00000004;
-pub const TBSTYLE_EX_DOUBLEBUFFER: ::DWORD = 0x00000080;
-STRUCT!{struct NMTBCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    hbrMonoDither: ::HBRUSH,
-    hbrLines: ::HBRUSH,
-    hpenLines: ::HPEN,
-    clrText: ::COLORREF,
-    clrMark: ::COLORREF,
-    clrTextHighlight: ::COLORREF,
-    clrBtnFace: ::COLORREF,
-    clrBtnHighlight: ::COLORREF,
-    clrHighlightHotTrack: ::COLORREF,
-    rcText: ::RECT,
-    nStringBkMode: ::c_int,
-    nHLStringBkMode: ::c_int,
-    iListGap: ::c_int,
-}}
-pub type LPNMTBCUSTOMDRAW = *mut NMTBCUSTOMDRAW;
-pub const TBCDRF_NOEDGES: ::LRESULT = 0x00010000;
-pub const TBCDRF_HILITEHOTTRACK: ::LRESULT = 0x00020000;
-pub const TBCDRF_NOOFFSET: ::LRESULT = 0x00040000;
-pub const TBCDRF_NOMARK: ::LRESULT = 0x00080000;
-pub const TBCDRF_NOETCHEDEFFECT: ::LRESULT = 0x00100000;
-pub const TBCDRF_BLENDICON: ::LRESULT = 0x00200000;
-pub const TBCDRF_NOBACKGROUND: ::LRESULT = 0x00400000;
-pub const TBCDRF_USECDCOLORS: ::LRESULT = 0x00800000;
-pub const TB_ENABLEBUTTON: ::UINT = ::WM_USER + 1;
-pub const TB_CHECKBUTTON: ::UINT = ::WM_USER + 2;
-pub const TB_PRESSBUTTON: ::UINT = ::WM_USER + 3;
-pub const TB_HIDEBUTTON: ::UINT = ::WM_USER + 4;
-pub const TB_INDETERMINATE: ::UINT = ::WM_USER + 5;
-pub const TB_MARKBUTTON: ::UINT = ::WM_USER + 6;
-pub const TB_ISBUTTONENABLED: ::UINT = ::WM_USER + 9;
-pub const TB_ISBUTTONCHECKED: ::UINT = ::WM_USER + 10;
-pub const TB_ISBUTTONPRESSED: ::UINT = ::WM_USER + 11;
-pub const TB_ISBUTTONHIDDEN: ::UINT = ::WM_USER + 12;
-pub const TB_ISBUTTONINDETERMINATE : ::UINT = ::WM_USER + 13;
-pub const TB_ISBUTTONHIGHLIGHTED: ::UINT = ::WM_USER + 14;
-pub const TB_SETSTATE: ::UINT = ::WM_USER + 17;
-pub const TB_GETSTATE: ::UINT = ::WM_USER + 18;
-pub const TB_ADDBITMAP: ::UINT = ::WM_USER + 19;
-STRUCT!{struct TBADDBITMAP {
-    hInst: ::HINSTANCE,
-    nID: ::UINT_PTR,
-}}
-pub type LPTBADDBITMAP = *mut TBADDBITMAP;
-pub const HINST_COMMCTRL: ::HINSTANCE = (0 - 1) as ::HINSTANCE;
-pub const IDB_STD_SMALL_COLOR: ::WPARAM = 0;
-pub const IDB_STD_LARGE_COLOR: ::WPARAM = 1;
-pub const IDB_VIEW_SMALL_COLOR: ::WPARAM = 4;
-pub const IDB_VIEW_LARGE_COLOR: ::WPARAM = 5;
-pub const IDB_HIST_SMALL_COLOR: ::WPARAM = 8;
-pub const IDB_HIST_LARGE_COLOR: ::WPARAM = 9;
-pub const IDB_HIST_NORMAL: ::WPARAM = 12;
-pub const IDB_HIST_HOT: ::WPARAM = 13;
-pub const IDB_HIST_DISABLED: ::WPARAM = 14;
-pub const IDB_HIST_PRESSED: ::WPARAM = 15;
-pub const STD_CUT: ::c_int = 0;
-pub const STD_COPY: ::c_int = 1;
-pub const STD_PASTE: ::c_int = 2;
-pub const STD_UNDO: ::c_int = 3;
-pub const STD_REDOW: ::c_int = 4;
-pub const STD_DELETE: ::c_int = 5;
-pub const STD_FILENEW: ::c_int = 6;
-pub const STD_FILEOPEN: ::c_int = 7;
-pub const STD_FILESAVE: ::c_int = 8;
-pub const STD_PRINTPRE: ::c_int = 9;
-pub const STD_PROPERTIES: ::c_int = 10;
-pub const STD_HELP: ::c_int = 11;
-pub const STD_FIND: ::c_int = 12;
-pub const STD_REPLACE: ::c_int = 13;
-pub const STD_PRINT: ::c_int = 14;
-pub const VIEW_LARGEICONS: ::c_int = 0;
-pub const VIEW_SMALLICONS: ::c_int = 1;
-pub const VIEW_LIST: ::c_int = 2;
-pub const VIEW_DETAILS: ::c_int = 3;
-pub const VIEW_SORTNAME: ::c_int = 4;
-pub const VIEW_SORTSIZE: ::c_int = 5;
-pub const VIEW_SORTDATE: ::c_int = 6;
-pub const VIEW_SORTTYPE: ::c_int = 7;
-pub const VIEW_PARENTFOLDER: ::c_int = 8;
-pub const VIEW_NETCONNECT: ::c_int = 9;
-pub const VIEW_NETDISCONNECT: ::c_int = 10;
-pub const VIEW_NEWFOLDER: ::c_int = 11;
-pub const VIEW_VIEWMENU: ::c_int = 12;
-pub const HIST_BACK: ::c_int = 0;
-pub const HIST_FORWARD: ::c_int = 1;
-pub const HIST_FAVORITES: ::c_int = 2;
-pub const HIST_ADDTOFAVORITES: ::c_int = 3;
-pub const HIST_VIEWTREE: ::c_int = 4;
-pub const TB_ADDBUTTONSA: ::UINT = ::WM_USER + 20;
-pub const TB_INSERTBUTTONA: ::UINT = ::WM_USER + 21;
-pub const TB_DELETEBUTTON: ::UINT = ::WM_USER + 22;
-pub const TB_GETBUTTON: ::UINT = ::WM_USER + 23;
-pub const TB_BUTTONCOUNT: ::UINT = ::WM_USER + 24;
-pub const TB_COMMANDTOINDEX: ::UINT = ::WM_USER + 25;
-STRUCT!{struct TBSAVEPARAMSA {
-    hkr: ::HKEY,
-    pszSubKey: ::LPCSTR,
-    pszValueName: ::LPCSTR,
-}}
-pub type LPTBSAVEPARAMSA = *mut TBSAVEPARAMSA;
-STRUCT!{struct TBSAVEPARAMSW {
-    hkr: ::HKEY,
-    pszSubKey: ::LPCWSTR,
-    pszValueName: ::LPCWSTR,
-}}
-pub type LPTBSAVEPARAMSW = *mut TBSAVEPARAMSW;
-pub const TB_SAVERESTOREA: ::UINT = ::WM_USER + 26;
-pub const TB_SAVERESTOREW: ::UINT = ::WM_USER + 76;
-pub const TB_CUSTOMIZE: ::UINT = ::WM_USER + 27;
-pub const TB_ADDSTRINGA: ::UINT = ::WM_USER + 28;
-pub const TB_ADDSTRINGW: ::UINT = ::WM_USER + 77;
-pub const TB_GETITEMRECT: ::UINT = ::WM_USER + 29;
-pub const TB_BUTTONSTRUCTSIZE: ::UINT = ::WM_USER + 30;
-pub const TB_SETBUTTONSIZE: ::UINT = ::WM_USER + 31;
-pub const TB_SETBITMAPSIZE: ::UINT = ::WM_USER + 32;
-pub const TB_AUTOSIZE: ::UINT = ::WM_USER + 33;
-pub const TB_GETTOOLTIPS: ::UINT = ::WM_USER + 35;
-pub const TB_SETTOOLTIPS: ::UINT = ::WM_USER + 36;
-pub const TB_SETPARENT: ::UINT = ::WM_USER + 37;
-pub const TB_SETROWS: ::UINT = ::WM_USER + 39;
-pub const TB_GETROWS: ::UINT = ::WM_USER + 40;
-pub const TB_SETCMDID: ::UINT = ::WM_USER + 42;
-pub const TB_CHANGEBITMAP: ::UINT = ::WM_USER + 43;
-pub const TB_GETBITMAP: ::UINT = ::WM_USER + 44;
-pub const TB_GETBUTTONTEXTA: ::UINT = ::WM_USER + 45;
-pub const TB_GETBUTTONTEXTW: ::UINT = ::WM_USER + 75;
-pub const TB_REPLACEBITMAP: ::UINT = ::WM_USER + 46;
-pub const TB_SETINDENT: ::UINT = ::WM_USER + 47;
-pub const TB_SETIMAGELIST: ::UINT = ::WM_USER + 48;
-pub const TB_GETIMAGELIST: ::UINT = ::WM_USER + 49;
-pub const TB_LOADIMAGES: ::UINT = ::WM_USER + 50;
-pub const TB_GETRECT: ::UINT = ::WM_USER + 51;
-pub const TB_SETHOTIMAGELIST: ::UINT = ::WM_USER + 52;
-pub const TB_GETHOTIMAGELIST: ::UINT = ::WM_USER + 53;
-pub const TB_SETDISABLEDIMAGELIST: ::UINT = ::WM_USER + 54;
-pub const TB_GETDISABLEDIMAGELIST: ::UINT = ::WM_USER + 55;
-pub const TB_SETSTYLE: ::UINT = ::WM_USER + 56;
-pub const TB_GETSTYLE: ::UINT = ::WM_USER + 57;
-pub const TB_GETBUTTONSIZE: ::UINT = ::WM_USER + 58;
-pub const TB_SETBUTTONWIDTH: ::UINT = ::WM_USER + 59;
-pub const TB_SETMAXTEXTROWS: ::UINT = ::WM_USER + 60;
-pub const TB_GETTEXTROWS: ::UINT = ::WM_USER + 61;
-pub const TB_GETOBJECT: ::UINT = ::WM_USER + 62;
-pub const TB_GETHOTITEM: ::UINT = ::WM_USER + 71;
-pub const TB_SETHOTITEM: ::UINT = ::WM_USER + 72;
-pub const TB_SETANCHORHIGHLIGHT: ::UINT = ::WM_USER + 73;
-pub const TB_GETANCHORHIGHLIGHT: ::UINT = ::WM_USER + 74;
-pub const TB_MAPACCELERATORA: ::UINT = ::WM_USER + 78;
-STRUCT!{struct TBINSERTMARK {
-    iButton: ::c_int,
-    dwFlags: ::DWORD,
-}}
-pub type LPTBINSERTMARK = *mut TBINSERTMARK;
-pub const TBIMHT_AFTER: ::DWORD = 0x00000001;
-pub const TBIMHT_BACKGROUND: ::DWORD = 0x00000002;
-pub const TB_GETINSERTMARK: ::UINT = ::WM_USER + 79;
-pub const TB_SETINSERTMARK: ::UINT = ::WM_USER + 80;
-pub const TB_INSERTMARKHITTEST: ::UINT = ::WM_USER + 81;
-pub const TB_MOVEBUTTON: ::UINT = ::WM_USER + 82;
-pub const TB_GETMAXSIZE: ::UINT = ::WM_USER + 83;
-pub const TB_SETEXTENDEDSTYLE: ::UINT = ::WM_USER + 84;
-pub const TB_GETEXTENDEDSTYLE: ::UINT = ::WM_USER + 85;
-pub const TB_GETPADDING: ::UINT = ::WM_USER + 86;
-pub const TB_SETPADDING: ::UINT = ::WM_USER + 87;
-pub const TB_SETINSERTMARKCOLOR: ::UINT = ::WM_USER + 88;
-pub const TB_GETINSERTMARKCOLOR: ::UINT = ::WM_USER + 89;
-pub const TB_SETCOLORSCHEME: ::UINT = CCM_SETCOLORSCHEME;
-pub const TB_GETCOLORSCHEME: ::UINT = CCM_GETCOLORSCHEME;
-pub const TB_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TB_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TB_MAPACCELERATORW: ::UINT = ::WM_USER + 90;
-STRUCT!{struct TBREPLACEBITMAP {
-    hInstOld: ::HINSTANCE,
-    nIDOld: ::UINT_PTR,
-    hInstNew: ::HINSTANCE,
-    nIDNew: ::UINT_PTR,
-    nButtons: ::c_int,
-}}
-pub type LPTBREPLACEBITMAP = *mut TBREPLACEBITMAP;
-pub const TBBF_LARGE: ::DWORD = 0x0001;
-pub const TB_GETBITMAPFLAGS: ::UINT = ::WM_USER + 41;
-pub const TBIF_IMAGE: ::DWORD = 0x00000001;
-pub const TBIF_TEXT: ::DWORD = 0x00000002;
-pub const TBIF_STATE: ::DWORD = 0x00000004;
-pub const TBIF_STYLE: ::DWORD = 0x00000008;
-pub const TBIF_LPARAM: ::DWORD = 0x00000010;
-pub const TBIF_COMMAND: ::DWORD = 0x00000020;
-pub const TBIF_SIZE: ::DWORD = 0x00000040;
-pub const TBIF_BYINDEX: ::DWORD = 0x80000000;
-STRUCT!{struct TBBUTTONINFOA {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    iImage: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    cx: ::WORD,
-    lParam: ::DWORD_PTR,
-    pszText: ::LPSTR,
-    cchText: ::c_int,
-}}
-pub type LPTBBUTTONINFOA = *mut TBBUTTONINFOA;
-STRUCT!{struct TBBUTTONINFOW {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    iImage: ::c_int,
-    fsState: ::BYTE,
-    fsStyle: ::BYTE,
-    cx: ::WORD,
-    lParam: ::DWORD_PTR,
-    pszText: ::LPWSTR,
-    cchText: ::c_int,
-}}
-pub type LPTBBUTTONINFOW = *mut TBBUTTONINFOW;
-pub const TB_GETBUTTONINFOW: ::UINT = ::WM_USER + 63;
-pub const TB_SETBUTTONINFOW: ::UINT = ::WM_USER + 64;
-pub const TB_GETBUTTONINFOA: ::UINT = ::WM_USER + 65;
-pub const TB_SETBUTTONINFOA: ::UINT = ::WM_USER + 66;
-pub const TB_INSERTBUTTONW: ::UINT = ::WM_USER + 67;
-pub const TB_ADDBUTTONSW: ::UINT = ::WM_USER + 68;
-pub const TB_HITTEST: ::UINT = ::WM_USER + 69;
-pub const TB_SETDRAWTEXTFLAGS: ::UINT = ::WM_USER + 70;
-pub const TB_GETSTRINGW: ::UINT = ::WM_USER + 91;
-pub const TB_GETSTRINGA: ::UINT = ::WM_USER + 92;
-pub const TB_SETBOUNDINGSIZE: ::UINT = ::WM_USER + 93;
-pub const TB_SETHOTITEM2: ::UINT = ::WM_USER + 94;
-pub const TB_HASACCELERATOR: ::UINT = ::WM_USER + 95;
-pub const TB_SETLISTGAP: ::UINT = ::WM_USER + 96;
-pub const TB_GETIMAGELISTCOUNT: ::UINT = ::WM_USER + 98;
-pub const TB_GETIDEALSIZE: ::UINT = ::WM_USER + 99;
-pub const TBMF_PAD: ::DWORD = 0x00000001;
-pub const TBMF_BARPAD: ::DWORD = 0x00000002;
-pub const TBMF_BUTTONSPACING: ::DWORD = 0x00000004;
-STRUCT!{struct TBMETRICS {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    cxPad: ::c_int,
-    cyPad: ::c_int,
-    cxBarPad: ::c_int,
-    cyBarPad: ::c_int,
-    cxButtonSpacing: ::c_int,
-    cyButtonSpacing: ::c_int,
-}}
-pub type LPTBMETRICS = *mut TBMETRICS;
-pub const TB_GETMETRICS: ::UINT = ::WM_USER + 101;
-pub const TB_SETMETRICS: ::UINT = ::WM_USER + 102;
-pub const TB_GETITEMDROPDOWNRECT: ::UINT = ::WM_USER + 103;
-pub const TB_SETPRESSEDIMAGELIST: ::UINT = ::WM_USER + 104;
-pub const TB_GETPRESSEDIMAGELIST: ::UINT = ::WM_USER + 105;
-pub const TB_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub const TBN_GETBUTTONINFOA: ::UINT = TBN_FIRST - 0;
-pub const TBN_BEGINDRAG: ::UINT = TBN_FIRST - 1;
-pub const TBN_ENDDRAG: ::UINT = TBN_FIRST - 2;
-pub const TBN_BEGINADJUST: ::UINT = TBN_FIRST - 3;
-pub const TBN_ENDADJUST: ::UINT = TBN_FIRST - 4;
-pub const TBN_RESET: ::UINT = TBN_FIRST - 5;
-pub const TBN_QUERYINSERT: ::UINT = TBN_FIRST - 6;
-pub const TBN_QUERYDELETE: ::UINT = TBN_FIRST - 7;
-pub const TBN_TOOLBARCHANGE: ::UINT = TBN_FIRST - 8;
-pub const TBN_CUSTHELP: ::UINT = TBN_FIRST - 9;
-pub const TBN_DROPDOWN: ::UINT = TBN_FIRST - 10;
-pub const TBN_GETOBJECT: ::UINT = TBN_FIRST - 12;
-STRUCT!{struct NMTBHOTITEM {
-    hdr: ::NMHDR,
-    idOld: ::c_int,
-    idNew: ::c_int,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMTBHOTITEM = *mut NMTBHOTITEM;
-pub const HICF_OTHER: ::DWORD = 0x00000000;
-pub const HICF_MOUSE: ::DWORD = 0x00000001;
-pub const HICF_ARROWKEYS: ::DWORD = 0x00000002;
-pub const HICF_ACCELERATOR: ::DWORD = 0x00000004;
-pub const HICF_DUPACCEL: ::DWORD = 0x00000008;
-pub const HICF_ENTERING: ::DWORD = 0x00000010;
-pub const HICF_LEAVING: ::DWORD = 0x00000020;
-pub const HICF_RESELECT: ::DWORD = 0x00000040;
-pub const HICF_LMOUSE: ::DWORD = 0x00000080;
-pub const HICF_TOGGLEDROPDOWN: ::DWORD = 0x00000100;
-pub const TBN_HOTITEMCHANGE: ::UINT = TBN_FIRST - 13;
-pub const TBN_DRAGOUT: ::UINT = TBN_FIRST - 14;
-pub const TBN_DELETINGBUTTON: ::UINT = TBN_FIRST - 15;
-pub const TBN_GETDISPINFOA: ::UINT = TBN_FIRST - 16;
-pub const TBN_GETDISPINFOW: ::UINT = TBN_FIRST - 17;
-pub const TBN_GETINFOTIPA: ::UINT = TBN_FIRST - 18;
-pub const TBN_GETINFOTIPW: ::UINT = TBN_FIRST - 19;
-pub const TBN_GETBUTTONINFOW: ::UINT = TBN_FIRST - 20;
-pub const TBN_RESTORE: ::UINT = TBN_FIRST - 21;
-pub const TBN_SAVE: ::UINT = TBN_FIRST - 22;
-pub const TBN_INITCUSTOMIZE: ::UINT = TBN_FIRST - 23;
-pub const TBN_WRAPHOTITEM: ::UINT = TBN_FIRST - 24;
-pub const TBN_DUPACCELERATOR: ::UINT = TBN_FIRST - 25;
-pub const TBN_WRAPACCELERATOR: ::UINT = TBN_FIRST - 26;
-pub const TBN_DRAGOVER: ::UINT = TBN_FIRST - 27;
-pub const TBN_MAPACCELERATOR: ::UINT = TBN_FIRST - 28;
-pub const TBNRF_HIDEHELP: ::LRESULT = 0x00000001;
-pub const TBNRF_ENDCUSTOMIZE: ::LRESULT = 0x00000002;
-STRUCT!{struct NMTBSAVE {
-    hdr: ::NMHDR,
-    pData: *mut ::DWORD,
-    pCurrent: *mut ::DWORD,
-    cbData: ::UINT,
-    iItem: ::c_int,
-    cButtons: ::c_int,
-    tbButton: TBBUTTON,
-}}
-pub type LPNMTBSAVE = *mut NMTBSAVE;
-STRUCT!{struct NMTBRESTORE {
-    hdr: ::NMHDR,
-    pData: *mut ::DWORD,
-    pCurrent: *mut ::DWORD,
-    cbData: ::UINT,
-    iItem: ::c_int,
-    cButtons: ::c_int,
-    cbBytesPerRecord: ::c_int,
-    tbButton: TBBUTTON,
-}}
-pub type LPNMTBRESTORE = *mut NMTBRESTORE;
-STRUCT!{struct NMTBGETINFOTIPA {
-    hdr: ::NMHDR,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    lParal: ::LPARAM,
-}}
-pub type LPNMTBGETINFOTIPA = *mut NMTBGETINFOTIPA;
-STRUCT!{struct NMTBGETINFOTIPW {
-    hdr: ::NMHDR,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    lParal: ::LPARAM,
-}}
-pub type LPNMTBGETINFOTIPW = *mut NMTBGETINFOTIPW;
-pub const TBNF_IMAGE: ::DWORD = 0x00000001;
-pub const TBNF_TEXT: ::DWORD = 0x00000002;
-pub const TBNF_DI_SETITEM: ::DWORD = 0x10000000;
-STRUCT!{struct NMTBDISPINFOA {
-    hdr: ::NMHDR,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    lParam: ::DWORD_PTR,
-    iImage: ::c_int,
-    pszText: ::LPSTR,
-    cchText: ::c_int,
-}}
-pub type LPNMTBDISPINFOA = *mut NMTBDISPINFOA;
-STRUCT!{struct NMTBDISPINFOW {
-    hdr: ::NMHDR,
-    dwMask: ::DWORD,
-    idCommand: ::c_int,
-    lParam: ::DWORD_PTR,
-    iImage: ::c_int,
-    pszText: ::LPWSTR,
-    cchText: ::c_int,
-}}
-pub type LPNMTBDISPINFOW = *mut NMTBDISPINFOW;
-pub const TBDDRET_DEFAULT: ::LRESULT = 0;
-pub const TBDDRET_NODEFAULT: ::LRESULT = 1;
-pub const TBDDRET_TREATPRESSED: ::LRESULT = 2;
-pub type TBNOTIFYA = NMTOOLBARA;
-pub type TBNOTIFYW = NMTOOLBARW;
-pub type LPTBNOTIFYA = LPNMTOOLBARA;
-pub type LPTBNOTIFYW = LPNMTOOLBARW;
-STRUCT!{struct NMTOOLBARA {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    tbButton: TBBUTTON,
-    cchText: ::c_int,
-    pszText: ::LPSTR,
-    rcButton: ::RECT,
-}}
-pub type LPNMTOOLBARA = *mut NMTOOLBARA;
-STRUCT!{struct NMTOOLBARW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    tbButton: TBBUTTON,
-    cchText: ::c_int,
-    pszText: ::LPWSTR,
-    rcButton: ::RECT,
-}}
-pub type LPNMTOOLBARW = *mut NMTOOLBARW;
-pub const RBIM_IMAGELIST: ::UINT = 0x00000001;
-pub const RBS_TOOLTIPS: ::DWORD = 0x00000100;
-pub const RBS_VARHEIGHT: ::DWORD = 0x00000200;
-pub const RBS_BANDBORDERS: ::DWORD = 0x00000400;
-pub const RBS_FIXEDORDER: ::DWORD = 0x00000800;
-pub const RBS_REGISTERDROP: ::DWORD = 0x00001000;
-pub const RBS_AUTOSIZE: ::DWORD = 0x00002000;
-pub const RBS_VERTICALGRIPPER: ::DWORD = 0x00004000;
-pub const RBS_DBLCLKTOGGLE: ::DWORD = 0x00008000;
-STRUCT!{struct REBARINFO {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    himl: HIMAGELIST,
-}}
-pub type LPREBARINFO = *mut REBARINFO;
-pub const RBBS_BREAK: ::UINT = 0x00000001;
-pub const RBBS_FIXEDSIZE: ::UINT = 0x00000002;
-pub const RBBS_CHILDEDGE: ::UINT = 0x00000004;
-pub const RBBS_HIDDEN: ::UINT = 0x00000008;
-pub const RBBS_NOVERT: ::UINT = 0x00000010;
-pub const RBBS_FIXEDBMP: ::UINT = 0x00000020;
-pub const RBBS_VARIABLEHEIGHT: ::UINT = 0x00000040;
-pub const RBBS_GRIPPERALWAYS: ::UINT = 0x00000080;
-pub const RBBS_NOGRIPPER: ::UINT = 0x00000100;
-pub const RBBS_USECHEVRON: ::UINT = 0x00000200;
-pub const RBBS_HIDETITLE: ::UINT = 0x00000400;
-pub const RBBS_TOPALIGN: ::UINT = 0x00000800;
-pub const RBBIM_STYLE: ::UINT = 0x00000001;
-pub const RBBIM_COLORS: ::UINT = 0x00000002;
-pub const RBBIM_TEXT: ::UINT = 0x00000004;
-pub const RBBIM_IMAGE: ::UINT = 0x00000008;
-pub const RBBIM_CHILD: ::UINT = 0x00000010;
-pub const RBBIM_CHILDSIZE: ::UINT = 0x00000020;
-pub const RBBIM_SIZE: ::UINT = 0x00000040;
-pub const RBBIM_BACKGROUND: ::UINT = 0x00000080;
-pub const RBBIM_ID: ::UINT = 0x00000100;
-pub const RBBIM_IDEALSIZE: ::UINT = 0x00000200;
-pub const RBBIM_LPARAM: ::UINT = 0x00000400;
-pub const RBBIM_HEADERSIZE: ::UINT = 0x00000800;
-pub const RBBIM_CHEVRONLOCATION: ::UINT = 0x00001000;
-pub const RBBIM_CHEVRONSTATE: ::UINT = 0x00002000;
-STRUCT!{struct REBARBANDINFOA {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fStyle: ::UINT,
-    clrFore: ::COLORREF,
-    clrBack: ::COLORREF,
-    lpText: ::LPSTR,
-    cch: ::UINT,
-    iImage: ::c_int,
-    hwndChild: ::HWND,
-    cxMinChild: ::UINT,
-    cyMinChild: ::UINT,
-    cx: ::UINT,
-    hbmBack: ::HBITMAP,
-    wID: ::UINT,
-    cyChild: ::UINT,
-    cyMaxChild: ::UINT,
-    cyIntegral: ::UINT,
-    cxIdeal: ::UINT,
-    lParam: ::LPARAM,
-    cxHeader: ::UINT,
-    rcChevronLocation: ::RECT,
-    uChevronState: ::UINT,
-}}
-pub type LPREBARBANDINFOA = *mut REBARBANDINFOA;
-pub type LPCREBARBANDINFOA = *const REBARBANDINFOA;
-STRUCT!{struct REBARBANDINFOW {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fStyle: ::UINT,
-    clrFore: ::COLORREF,
-    clrBack: ::COLORREF,
-    lpText: ::LPWSTR,
-    cch: ::UINT,
-    iImage: ::c_int,
-    hwndChild: ::HWND,
-    cxMinChild: ::UINT,
-    cyMinChild: ::UINT,
-    cx: ::UINT,
-    hbmBack: ::HBITMAP,
-    wID: ::UINT,
-    cyChild: ::UINT,
-    cyMaxChild: ::UINT,
-    cyIntegral: ::UINT,
-    cxIdeal: ::UINT,
-    lParam: ::LPARAM,
-    cxHeader: ::UINT,
-    rcChevronLocation: ::RECT,
-    uChevronState: ::UINT,
-}}
-pub type LPREBARBANDINFOW = *mut REBARBANDINFOW;
-pub type LPCREBARBANDINFOW = *const REBARBANDINFOW;
-pub const RB_INSERTBANDA: ::UINT = ::WM_USER + 1;
-pub const RB_DELETEBAND: ::UINT = ::WM_USER + 2;
-pub const RB_GETBARINFO: ::UINT = ::WM_USER + 3;
-pub const RB_SETBARINFO: ::UINT = ::WM_USER + 4;
-pub const RB_SETBANDINFOA: ::UINT = ::WM_USER + 6;
-pub const RB_SETPARENT: ::UINT = ::WM_USER + 7;
-pub const RB_HITTEST: ::UINT = ::WM_USER + 8;
-pub const RB_GETRECT: ::UINT = ::WM_USER + 9;
-pub const RB_INSERTBANDW: ::UINT = ::WM_USER + 10;
-pub const RB_SETBANDINFOW: ::UINT = ::WM_USER + 11;
-pub const RB_GETBANDCOUNT: ::UINT = ::WM_USER + 12;
-pub const RB_GETROWCOUNT: ::UINT = ::WM_USER + 13;
-pub const RB_GETROWHEIGHT: ::UINT = ::WM_USER + 14;
-pub const RB_IDTOINDEX: ::UINT = ::WM_USER + 16;
-pub const RB_GETTOOLTIPS: ::UINT = ::WM_USER + 17;
-pub const RB_SETTOOLTIPS: ::UINT = ::WM_USER + 18;
-pub const RB_SETBKCOLOR: ::UINT = ::WM_USER + 19;
-pub const RB_GETBKCOLOR: ::UINT = ::WM_USER + 20;
-pub const RB_SETTEXTCOLOR: ::UINT = ::WM_USER + 21;
-pub const RB_GETTEXTCOLOR: ::UINT = ::WM_USER + 22;
-pub const RBSTR_CHANGERECT: ::WPARAM = 0x0001;
-pub const RB_SIZETORECT: ::UINT = ::WM_USER + 23;
-pub const RB_SETCOLORSCHEME: ::UINT = CCM_SETCOLORSCHEME;
-pub const RB_GETCOLORSCHEME: ::UINT = CCM_GETCOLORSCHEME;
-pub const RB_BEGINDRAG: ::UINT = ::WM_USER + 24;
-pub const RB_ENDDRAG: ::UINT = ::WM_USER + 25;
-pub const RB_DRAGMOVE: ::UINT = ::WM_USER + 26;
-pub const RB_GETBARHEIGHT: ::UINT = ::WM_USER + 27;
-pub const RB_GETBANDINFOW: ::UINT = ::WM_USER + 28;
-pub const RB_GETBANDINFOA: ::UINT = ::WM_USER + 29;
-pub const RB_MINIMIZEBAND: ::UINT = ::WM_USER + 30;
-pub const RB_MAXIMIZEBAND: ::UINT = ::WM_USER + 31;
-pub const RB_GETDROPTARGET: ::UINT = CCM_GETDROPTARGET;
-pub const RB_GETBANDBORDERS: ::UINT = ::WM_USER + 34;
-pub const RB_SHOWBAND: ::UINT = ::WM_USER + 35;
-pub const RB_SETPALETTE: ::UINT = ::WM_USER + 37;
-pub const RB_GETPALETTE: ::UINT = ::WM_USER + 38;
-pub const RB_MOVEBAND: ::UINT = ::WM_USER + 39;
-pub const RB_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const RB_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const RB_GETBANDMARGINS: ::UINT = ::WM_USER + 40;
-pub const RB_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub const RB_SETEXTENDEDSTYLE: ::UINT = ::WM_USER + 41;
-pub const RB_GETEXTENDEDSTYLE: ::UINT = ::WM_USER + 42;
-pub const RB_PUSHCHEVRON: ::UINT = ::WM_USER + 43;
-pub const RB_SETBANDWIDTH: ::UINT = ::WM_USER + 44;
-pub const RBN_HEIGHTCHANGE: ::UINT = RBN_FIRST - 0;
-pub const RBN_GETOBJECT: ::UINT = RBN_FIRST - 1;
-pub const RBN_LAYOUTCHANGED: ::UINT = RBN_FIRST - 2;
-pub const RBN_AUTOSIZE: ::UINT = RBN_FIRST - 3;
-pub const RBN_BEGINDRAG: ::UINT = RBN_FIRST - 4;
-pub const RBN_ENDDRAG: ::UINT = RBN_FIRST - 5;
-pub const RBN_DELETINGBAND: ::UINT = RBN_FIRST - 6;
-pub const RBN_DELETEDBAND: ::UINT = RBN_FIRST - 7;
-pub const RBN_CHILDSIZE: ::UINT = RBN_FIRST - 8;
-pub const RBN_CHEVRONPUSHED: ::UINT = RBN_FIRST - 10;
-pub const RBN_SPLITTERDRAG: ::UINT = RBN_FIRST - 11;
-pub const RBN_MINMAX: ::UINT = RBN_FIRST - 21;
-pub const RBN_AUTOBREAK: ::UINT = RBN_FIRST - 22;
-STRUCT!{struct NMREBARCHILDSIZE {
-    hdr: ::NMHDR,
-    uBand: ::UINT,
-    wID: ::UINT,
-    rcChild: ::RECT,
-    rcBand: ::RECT,
-}}
-pub type LPNMREBARCHILDSIZE = *mut NMREBARCHILDSIZE;
-STRUCT!{struct NMREBAR {
-    hdr: ::NMHDR,
-    dwMask: ::DWORD,
-    uBand: ::UINT,
-    fStyle: ::UINT,
-    wID: ::UINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMREBAR = *mut NMREBAR;
-pub const RBNM_ID: ::DWORD = 0x00000001;
-pub const RBNM_STYLE: ::DWORD = 0x00000002;
-pub const RBNM_LPARAM: ::DWORD = 0x00000004;
-STRUCT!{struct NMRBAUTOSIZE {
-    hdr: ::NMHDR,
-    fChanged: ::BOOL,
-    rcTarget: ::RECT,
-    rcActual: ::RECT,
-}}
-pub type LPNMRBAUTOSIZE = *mut NMRBAUTOSIZE;
-STRUCT!{struct NMREBARCHEVRON {
-    hdr: ::NMHDR,
-    uBand: ::UINT,
-    wID: ::UINT,
-    lParam: ::LPARAM,
-    rc: ::RECT,
-    lParamNM: ::LPARAM,
-}}
-pub type LPNMREBARCHEVRON = *mut NMREBARCHEVRON;
-STRUCT!{struct NMREBARSPLITTER {
-    hdr: ::NMHDR,
-    rcSizing: ::RECT,
-}}
-pub type LPNMREBARSPLITTER = *mut NMREBARSPLITTER;
-pub const RBAB_AUTOSIZE: ::UINT = 0x0001;
-pub const RBAB_ADDBAND: ::UINT = 0x0002;
-STRUCT!{struct NMREBARAUTOBREAK {
-    hdr: ::NMHDR,
-    uBand: ::UINT,
-    wID: ::UINT,
-    lParam: ::LPARAM,
-    uMsg: ::UINT,
-    fStyleCurrent: ::UINT,
-    fAutoBreak: ::UINT,
-}}
-pub type LPNMREBARAUTOBREAK = *mut NMREBARAUTOBREAK;
-pub const RBHT_NOWHERE: ::UINT = 0x0001;
-pub const RBHT_CAPTION: ::UINT = 0x0002;
-pub const RBHT_CLIENT: ::UINT = 0x0003;
-pub const RBHT_GRABBER: ::UINT = 0x0004;
-pub const RBHT_CHEVRON: ::UINT = 0x0008;
-pub const RBHT_SPLITTER: ::UINT = 0x0010;
-STRUCT!{struct RBHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    iBand: ::c_int,
-}}
-pub type LPRBHITTESTINFO = *mut RBHITTESTINFO;
-pub type LPTOOLINFOA = LPTTTOOLINFOA;
-pub type LPTOOLINFOW = LPTTTOOLINFOW;
-pub type TOOLINFOA = TTTOOLINFOA;
-pub type TOOLINFOW = TTTOOLINFOW;
-STRUCT!{struct TTTOOLINFOA {
-    cbSize: ::UINT,
-    uFlags: ::UINT,
-    hwnd: ::HWND,
-    uId: ::UINT_PTR,
-    rect: ::RECT,
-    hinst: ::HINSTANCE,
-    lpszText: ::LPSTR,
-    lParam: ::LPARAM,
-    lpReserved: *mut ::c_void,
-}}
-pub type PTTTOOLINFOA = *mut TTTOOLINFOA;
-pub type LPTTTOOLINFOA = *mut TTTOOLINFOA;
-STRUCT!{struct TTTOOLINFOW {
-    cbSize: ::UINT,
-    uFlags: ::UINT,
-    hwnd: ::HWND,
-    uId: ::UINT_PTR,
-    rect: ::RECT,
-    hinst: ::HINSTANCE,
-    lpszText: ::LPSTR,
-    lParam: ::LPARAM,
-    lpReserved: *mut ::c_void,
-}}
-pub type PTTTOOLINFOW = *mut TTTOOLINFOW;
-pub type LPTTTOOLINFOW = *mut TTTOOLINFOW;
-pub const TTS_ALWAYSTIP: ::DWORD = 0x01;
-pub const TTS_NOPREFIX: ::DWORD = 0x02;
-pub const TTS_NOANIMATE: ::DWORD = 0x10;
-pub const TTS_NOFADE: ::DWORD = 0x20;
-pub const TTS_BALLOON: ::DWORD = 0x40;
-pub const TTS_CLOSE: ::DWORD = 0x80;
-pub const TTS_USEVISUALSTYLE: ::DWORD = 0x100;
-pub const TTF_IDISHWND: ::UINT = 0x0001;
-pub const TTF_CENTERTIP: ::UINT = 0x0002;
-pub const TTF_RTLREADING: ::UINT = 0x0004;
-pub const TTF_SUBCLASS: ::UINT = 0x0010;
-pub const TTF_TRACK: ::UINT = 0x0020;
-pub const TTF_ABSOLUTE: ::UINT = 0x0080;
-pub const TTF_TRANSPARENT: ::UINT = 0x0100;
-pub const TTF_PARSELINKS: ::UINT = 0x1000;
-pub const TTF_DI_SETITEM: ::UINT = 0x8000;
-pub const TTDT_AUTOMATIC: ::WPARAM = 0;
-pub const TTDT_RESHOW: ::WPARAM = 1;
-pub const TTDT_AUTOPOP: ::WPARAM = 2;
-pub const TTDT_INITIAL: ::WPARAM = 3;
-pub const TTI_NONE: ::WPARAM = 0;
-pub const TTI_INFO: ::WPARAM = 1;
-pub const TTI_WARNING: ::WPARAM = 2;
-pub const TTI_ERROR: ::WPARAM = 3;
-pub const TTI_INFO_LARGE: ::WPARAM = 4;
-pub const TTI_WARNING_LARGE: ::WPARAM = 5;
-pub const TTI_ERROR_LARGE: ::WPARAM = 6;
-pub const TTM_ACTIVATE: ::UINT = ::WM_USER + 1;
-pub const TTM_SETDELAYTIME: ::UINT = ::WM_USER + 3;
-pub const TTM_ADDTOOLA: ::UINT = ::WM_USER + 4;
-pub const TTM_ADDTOOLW: ::UINT = ::WM_USER + 50;
-pub const TTM_DELTOOLA: ::UINT = ::WM_USER + 5;
-pub const TTM_DELTOOLW: ::UINT = ::WM_USER + 51;
-pub const TTM_NEWTOOLRECTA: ::UINT = ::WM_USER + 6;
-pub const TTM_NEWTOOLRECTW: ::UINT = ::WM_USER + 52;
-pub const TTM_RELAYEVENT: ::UINT = ::WM_USER + 7;
-pub const TTM_GETTOOLINFOA: ::UINT = ::WM_USER + 8;
-pub const TTM_GETTOOLINFOW: ::UINT = ::WM_USER + 53;
-pub const TTM_SETTOOLINFOA: ::UINT = ::WM_USER + 9;
-pub const TTM_SETTOOLINFOW: ::UINT = ::WM_USER + 54;
-pub const TTM_HITTESTA: ::UINT = ::WM_USER + 10;
-pub const TTM_HITTESTW: ::UINT = ::WM_USER + 55;
-pub const TTM_GETTEXTA: ::UINT = ::WM_USER + 11;
-pub const TTM_GETTEXTW: ::UINT = ::WM_USER + 56;
-pub const TTM_UPDATETIPTEXTA: ::UINT = ::WM_USER + 12;
-pub const TTM_UPDATETIPTEXTW: ::UINT = ::WM_USER + 57;
-pub const TTM_GETTOOLCOUNT: ::UINT = ::WM_USER + 13;
-pub const TTM_ENUMTOOLSA: ::UINT = ::WM_USER + 14;
-pub const TTM_ENUMTOOLSW: ::UINT = ::WM_USER + 58;
-pub const TTM_GETCURRENTTOOLA: ::UINT = ::WM_USER + 15;
-pub const TTM_GETCURRENTTOOLW: ::UINT = ::WM_USER + 59;
-pub const TTM_WINDOWFROMPOINT: ::UINT = ::WM_USER + 16;
-pub const TTM_TRACKACTIVATE: ::UINT = ::WM_USER + 17;
-pub const TTM_TRACKPOSITION: ::UINT = ::WM_USER + 18;
-pub const TTM_SETTIPBKCOLOR: ::UINT = ::WM_USER + 19;
-pub const TTM_SETTIPTEXTCOLOR: ::UINT = ::WM_USER + 20;
-pub const TTM_GETDELAYTIME: ::UINT = ::WM_USER + 21;
-pub const TTM_GETTIPBKCOLOR: ::UINT = ::WM_USER + 22;
-pub const TTM_GETTIPTEXTCOLOR: ::UINT = ::WM_USER + 23;
-pub const TTM_SETMAXTIPWIDTH: ::UINT = ::WM_USER + 24;
-pub const TTM_GETMAXTIPWIDTH: ::UINT = ::WM_USER + 25;
-pub const TTM_SETMARGIN: ::UINT = ::WM_USER + 26;
-pub const TTM_GETMARGIN: ::UINT = ::WM_USER + 27;
-pub const TTM_POP: ::UINT = ::WM_USER + 28;
-pub const TTM_UPDATE: ::UINT = ::WM_USER + 29;
-pub const TTM_GETBUBBLESIZE: ::UINT = ::WM_USER + 30;
-pub const TTM_ADJUSTRECT: ::UINT = ::WM_USER + 31;
-pub const TTM_SETTITLEA: ::UINT = ::WM_USER + 32;
-pub const TTM_SETTITLEW: ::UINT = ::WM_USER + 33;
-pub const TTM_POPUP: ::UINT = ::WM_USER + 34;
-pub const TTM_GETTITLE: ::UINT = ::WM_USER + 35;
-STRUCT!{struct TTGETTITLE {
-    dwSize: ::DWORD,
-    uTitleBitmap: ::UINT,
-    cch: ::UINT,
-    pszTitle: *mut ::WCHAR,
-}}
-pub type LPTTGETTITLE = *mut TTGETTITLE;
-pub const TTM_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub type LPHITTESTINFOW = LPTTHITTESTINFOW;
-pub type LPHITTESTINFOA = LPTTHITTESTINFOA;
-STRUCT!{struct TTHITTESTINFOA {
-    hwnd: ::HWND,
-    pt: ::POINT,
-    ti: TTTOOLINFOA,
-}}
-pub type LPTTHITTESTINFOA = *mut TTHITTESTINFOA;
-STRUCT!{struct TTHITTESTINFOW {
-    hwnd: ::HWND,
-    pt: ::POINT,
-    ti: TTTOOLINFOW,
-}}
-pub type LPTTHITTESTINFOW = *mut TTHITTESTINFOW;
-pub const TTN_GETDISPINFOA: ::UINT = TTN_FIRST - 0;
-pub const TTN_GETDISPINFOW: ::UINT = TTN_FIRST - 10;
-pub const TTN_SHOW: ::UINT = TTN_FIRST - 1;
-pub const TTN_POP: ::UINT = TTN_FIRST - 2;
-pub const TTN_LINKCLICK: ::UINT = TTN_FIRST - 3;
-pub const TTN_NEEDTEXTA: ::UINT = TTN_GETDISPINFOA;
-pub const TTN_NEEDTEXTW: ::UINT = TTN_GETDISPINFOW;
-pub type TOOLTIPTEXTW = NMTTDISPINFOW;
-pub type TOOLTIPTEXTA = NMTTDISPINFOA;
-pub type LPTOOLTIPTEXTA = LPNMTTDISPINFOA;
-pub type LPTOOLTIPTEXTW = LPNMTTDISPINFOW;
-STRUCT!{nodebug struct NMTTDISPINFOA {
-    hdr: ::NMHDR,
-    lpszText: ::LPSTR,
-    szText: [::c_char; 80],
-    hinst: ::HINSTANCE,
-    uFlags: ::UINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTTDISPINFOA = *mut NMTTDISPINFOA;
-STRUCT!{nodebug struct NMTTDISPINFOW {
-    hdr: ::NMHDR,
-    lpszText: ::LPWSTR,
-    szText: [::WCHAR; 80],
-    hinst: ::HINSTANCE,
-    uFlags: ::UINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTTDISPINFOW = *mut NMTTDISPINFOW;
-pub const SBARS_SIZEGRIP: ::DWORD = 0x0100;
-pub const SBARS_TOOLTIPS: ::DWORD = 0x0800;
-pub const SBT_TOOLTIPS: ::DWORD = 0x0800;
-pub const SB_SETTEXTA: ::UINT = ::WM_USER + 1;
-pub const SB_SETTEXTW: ::UINT = ::WM_USER + 11;
-pub const SB_GETTEXTA: ::UINT = ::WM_USER + 2;
-pub const SB_GETTEXTW: ::UINT = ::WM_USER + 13;
-pub const SB_GETTEXTLENGTHA: ::UINT = ::WM_USER + 3;
-pub const SB_GETTEXTLENGTHW: ::UINT = ::WM_USER + 12;
-pub const SB_SETPARTS: ::UINT = ::WM_USER + 4;
-pub const SB_GETPARTS: ::UINT = ::WM_USER + 6;
-pub const SB_GETBORDERS: ::UINT = ::WM_USER + 7;
-pub const SB_SETMINHEIGHT: ::UINT = ::WM_USER + 8;
-pub const SB_SIMPLE: ::UINT = ::WM_USER + 9;
-pub const SB_GETRECT: ::UINT = ::WM_USER + 10;
-pub const SB_ISSIMPLE: ::UINT = ::WM_USER + 14;
-pub const SB_SETICON: ::UINT = ::WM_USER + 15;
-pub const SB_SETTIPTEXTA: ::UINT = ::WM_USER + 16;
-pub const SB_SETTIPTEXTW: ::UINT = ::WM_USER + 17;
-pub const SB_GETTIPTEXTA: ::UINT = ::WM_USER + 18;
-pub const SB_GETTIPTEXTW: ::UINT = ::WM_USER + 19;
-pub const SB_GETICON: ::UINT = ::WM_USER + 20;
-pub const SB_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const SB_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const SBT_OWNERDRAW: ::WPARAM = 0x1000;
-pub const SBT_NOBORDERS: ::WPARAM = 0x0100;
-pub const SBT_POPOUT: ::WPARAM = 0x0200;
-pub const SBT_RTLREADING: ::WPARAM = 0x0400;
-pub const SBT_NOTABPARSING: ::WPARAM = 0x0800;
-pub const SB_SETBKCOLOR: ::UINT = CCM_SETBKCOLOR;
-pub const SBN_SIMPLEMODECHANGE: ::UINT = SBN_FIRST - 0;
-pub const SB_SIMPLEID: ::WPARAM = 0x00ff;
-pub const TBS_AUTOTICKS: ::DWORD = 0x0001;
-pub const TBS_VERT: ::DWORD = 0x0002;
-pub const TBS_HORZ: ::DWORD = 0x0000;
-pub const TBS_TOP: ::DWORD = 0x0004;
-pub const TBS_BOTTOM: ::DWORD = 0x0000;
-pub const TBS_LEFT: ::DWORD = 0x0004;
-pub const TBS_RIGHT: ::DWORD = 0x0000;
-pub const TBS_BOTH: ::DWORD = 0x0008;
-pub const TBS_NOTICKS: ::DWORD = 0x0010;
-pub const TBS_ENABLESELRANGE: ::DWORD = 0x0020;
-pub const TBS_FIXEDLENGTH: ::DWORD = 0x0040;
-pub const TBS_NOTHUMB: ::DWORD = 0x0080;
-pub const TBS_TOOLTIPS: ::DWORD = 0x0100;
-pub const TBS_REVERSED: ::DWORD = 0x0200;
-pub const TBS_DOWNISLEFT: ::DWORD = 0x0400;
-pub const TBS_NOTIFYBEFOREMOVE: ::DWORD = 0x0800;
-pub const TBS_TRANSPARENTBKGND: ::DWORD = 0x1000;
-pub const TBM_GETPOS: ::UINT = ::WM_USER;
-pub const TBM_GETRANGEMIN: ::UINT = ::WM_USER + 1;
-pub const TBM_GETRANGEMAX: ::UINT = ::WM_USER + 2;
-pub const TBM_GETTIC: ::UINT = ::WM_USER + 3;
-pub const TBM_SETTIC: ::UINT = ::WM_USER + 4;
-pub const TBM_SETPOS: ::UINT = ::WM_USER + 5;
-pub const TBM_SETRANGE: ::UINT = ::WM_USER + 6;
-pub const TBM_SETRANGEMIN: ::UINT = ::WM_USER + 7;
-pub const TBM_SETRANGEMAX: ::UINT = ::WM_USER + 8;
-pub const TBM_CLEARTICS: ::UINT = ::WM_USER + 9;
-pub const TBM_SETSEL: ::UINT = ::WM_USER + 10;
-pub const TBM_SETSELSTART: ::UINT = ::WM_USER + 11;
-pub const TBM_SETSELEND: ::UINT = ::WM_USER + 12;
-pub const TBM_GETPTICS: ::UINT = ::WM_USER + 14;
-pub const TBM_GETTICPOS: ::UINT = ::WM_USER + 15;
-pub const TBM_GETNUMTICS: ::UINT = ::WM_USER + 16;
-pub const TBM_GETSELSTART: ::UINT = ::WM_USER + 17;
-pub const TBM_GETSELEND: ::UINT = ::WM_USER + 18;
-pub const TBM_CLEARSEL: ::UINT = ::WM_USER + 19;
-pub const TBM_SETTICFREQ: ::UINT = ::WM_USER + 20;
-pub const TBM_SETPAGESIZE: ::UINT = ::WM_USER + 21;
-pub const TBM_GETPAGESIZE: ::UINT = ::WM_USER + 22;
-pub const TBM_SETLINESIZE: ::UINT = ::WM_USER + 23;
-pub const TBM_GETLINESIZE: ::UINT = ::WM_USER + 24;
-pub const TBM_GETTHUMBRECT: ::UINT = ::WM_USER + 25;
-pub const TBM_GETCHANNELRECT: ::UINT = ::WM_USER + 26;
-pub const TBM_SETTHUMBLENGTH: ::UINT = ::WM_USER + 27;
-pub const TBM_GETTHUMBLENGTH: ::UINT = ::WM_USER + 28;
-pub const TBM_SETTOOLTIPS: ::UINT = ::WM_USER + 29;
-pub const TBM_GETTOOLTIPS: ::UINT = ::WM_USER + 30;
-pub const TBM_SETTIPSIDE: ::UINT = ::WM_USER + 31;
-pub const TBTS_TOP: ::WPARAM = 0;
-pub const TBTS_LEFT: ::WPARAM = 1;
-pub const TBTS_BOTTOM: ::WPARAM = 2;
-pub const TBTS_RIGHT: ::WPARAM = 3;
-pub const TBM_SETBUDDY: ::UINT = ::WM_USER + 32;
-pub const TBM_GETBUDDY: ::UINT = ::WM_USER + 33;
-pub const TBM_SETPOSNOTIFY: ::UINT = ::WM_USER + 34;
-pub const TBM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TBM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TBCD_TICS: ::DWORD_PTR = 0x0001;
-pub const TBCD_THUMB: ::DWORD_PTR = 0x0001;
-pub const TBCD_CHANNEL: ::DWORD_PTR = 0x0001;
-pub const TB_LINEUP: ::WPARAM = 0;
-pub const TB_LINEDOWN: ::WPARAM = 1;
-pub const TB_PAGEUP: ::WPARAM = 2;
-pub const TB_PAGEDOWN: ::WPARAM = 3;
-pub const TB_THUMBPOSITION: ::WPARAM = 4;
-pub const TB_THUMBTRACK: ::WPARAM = 5;
-pub const TB_TOP: ::WPARAM = 6;
-pub const TB_BOTTOM: ::WPARAM = 7;
-pub const TB_ENDTRACK: ::WPARAM = 8;
-pub const TRBN_THUMBPOSCHANGING: ::UINT = TRBN_FIRST - 1;
-STRUCT!{struct NMTRBTHUMBPOSCHANGING {
-    hdr: ::NMHDR,
-    dwPos: ::DWORD,
-    nReason: ::c_int,
-}}
-STRUCT!{struct DRAGLISTINFO {
-    uNotification: ::UINT,
-    hWnd: ::HWND,
-    ptCursor: ::POINT,
-}}
-pub type LPDRAGLISTINFO = *mut DRAGLISTINFO;
-pub const DL_BEGINDRAG: ::UINT = ::WM_USER + 133;
-pub const DL_DRAGGING: ::UINT = ::WM_USER + 134;
-pub const DL_DROPPED: ::UINT = ::WM_USER + 135;
-pub const DL_CANCELDRAG: ::UINT = ::WM_USER + 136;
-pub const DL_CURSORSET: ::UINT = 0;
-pub const DL_STOPCURSOR: ::UINT = 1;
-pub const DL_COPYCURSOR: ::UINT = 2;
-pub const DL_MOVECURSOR: ::UINT = 3;
-STRUCT!{struct UDACCEL {
-    nSec: ::UINT,
-    nInc: ::UINT,
-}}
-pub type LPUDACCEL = *mut UDACCEL;
-pub const UD_MAXVAL: ::c_short = 0x7fff;
-pub const UD_MINVAL: ::c_short = 0 - UD_MAXVAL;
-pub const UDS_WRAP: ::DWORD = 0x0001;
-pub const UDS_SETBUDDYINT: ::DWORD = 0x0002;
-pub const UDS_ALIGNRIGHT: ::DWORD = 0x0004;
-pub const UDS_ALIGNLEFT: ::DWORD = 0x0008;
-pub const UDS_AUTOBUDDY: ::DWORD = 0x0010;
-pub const UDS_ARROWKEYS: ::DWORD = 0x0020;
-pub const UDS_HORZ: ::DWORD = 0x0040;
-pub const UDS_NOTHOUSANDS: ::DWORD = 0x0080;
-pub const UDS_HOTTRACK: ::DWORD = 0x0100;
-pub const UDM_SETRANGE: ::UINT = ::WM_USER + 101;
-pub const UDM_GETRANGE: ::UINT = ::WM_USER + 102;
-pub const UDM_SETPOS: ::UINT = ::WM_USER + 103;
-pub const UDM_GETPOS: ::UINT = ::WM_USER + 104;
-pub const UDM_SETBUDDY: ::UINT = ::WM_USER + 105;
-pub const UDM_GETBUDDY: ::UINT = ::WM_USER + 106;
-pub const UDM_SETACCEL: ::UINT = ::WM_USER + 107;
-pub const UDM_GETACCEL: ::UINT = ::WM_USER + 108;
-pub const UDM_SETBASE: ::UINT = ::WM_USER + 109;
-pub const UDM_GETBASE: ::UINT = ::WM_USER + 110;
-pub const UDM_SETRANGE32: ::UINT = ::WM_USER + 111;
-pub const UDM_GETRANGE32: ::UINT = ::WM_USER + 112;
-pub const UDM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const UDM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const UDM_SETPOS32: ::UINT = ::WM_USER + 113;
-pub const UDM_GETPOS32: ::UINT = ::WM_USER + 114;
-pub type NM_UPDOWN = NMUPDOWN;
-pub type LPNM_UPDOWN = LPNMUPDOWN;
-STRUCT!{struct NMUPDOWN {
-    hdr: ::NMHDR,
-    iPos: ::c_int,
-    iDelta: ::c_int,
-}}
-pub type LPNMUPDOWN = *mut NMUPDOWN;
-pub const UDN_DELTAPOS: ::UINT = UDN_FIRST - 1;
-pub const PBS_SMOOTH: ::DWORD = 0x01;
-pub const PBS_VERTICAL: ::DWORD = 0x04;
-pub const PBM_SETRANGE: ::UINT = ::WM_USER + 1;
-pub const PBM_SETPOS: ::UINT = ::WM_USER + 2;
-pub const PBM_DELTAPOS: ::UINT = ::WM_USER + 3;
-pub const PBM_SETSTEP: ::UINT = ::WM_USER + 4;
-pub const PBM_STEPIT: ::UINT = ::WM_USER + 5;
-pub const PBM_SETRANGE32: ::UINT = ::WM_USER + 6;
-STRUCT!{struct PBRANGE {
-    iLow: ::c_int,
-    iHigh: ::c_int,
-}}
-pub type LPPBRANGE = *mut PBRANGE;
-pub const PBM_GETRANGE: ::UINT = ::WM_USER + 7;
-pub const PBM_GETPOS: ::UINT = ::WM_USER + 8;
-pub const PBM_SETBARCOLOR: ::UINT = ::WM_USER + 9;
-pub const PBM_SETBKCOLOR: ::UINT = CCM_SETBKCOLOR;
-pub const PBM_SETMARQUEE: ::UINT = ::WM_USER + 10;
-pub const PBS_MARQUEE: ::DWORD = 0x08;
-pub const PBS_SMOOTHREVERSE: ::DWORD = 0x10;
-pub const PBM_GETSTEP: ::UINT = ::WM_USER + 13;
-pub const PBM_GETBKCOLOR: ::UINT = ::WM_USER + 14;
-pub const PBM_GETBARCOLOR: ::UINT = ::WM_USER + 15;
-pub const PBM_SETSTATE: ::UINT = ::WM_USER + 16;
-pub const PBM_GETSTATE: ::UINT = ::WM_USER + 17;
-pub const PBST_NORMAL: ::c_int = 0x0001;
-pub const PBST_ERROR: ::c_int = 0x0002;
-pub const PBST_PAUSED: ::c_int = 0x0003;
-pub const HOTKEYF_SHIFT: ::BYTE = 0x01;
-pub const HOTKEYF_CONTROL: ::BYTE = 0x02;
-pub const HOTKEYF_ALT: ::BYTE = 0x04;
-pub const HOTKEYF_EXT: ::BYTE = 0x08;
-pub const HKCOMB_NONE: ::WPARAM = 0x0001;
-pub const HKCOMB_S: ::WPARAM = 0x0002;
-pub const HKCOMB_C: ::WPARAM = 0x0004;
-pub const HKCOMB_A: ::WPARAM = 0x0008;
-pub const HKCOMB_SC: ::WPARAM = 0x0010;
-pub const HKCOMB_SA: ::WPARAM = 0x0020;
-pub const HKCOMB_CA: ::WPARAM = 0x0040;
-pub const HKCOMB_SCA: ::WPARAM = 0x0080;
-pub const HKM_SETHOTKEY: ::UINT = ::WM_USER + 1;
-pub const HKM_GETHOTKEY: ::UINT = ::WM_USER + 2;
-pub const HKM_SETRULES: ::UINT = ::WM_USER + 3;
-pub const CCS_TOP: ::DWORD = 0x00000001;
-pub const CCS_NOMOVEY: ::DWORD = 0x00000002;
-pub const CCS_BOTTOM: ::DWORD = 0x00000003;
-pub const CCS_NORESIZE: ::DWORD = 0x00000004;
-pub const CCS_NOPARENTALIGN: ::DWORD = 0x00000008;
-pub const CCS_ADJUSTABLE: ::DWORD = 0x00000020;
-pub const CCS_NODIVIDER: ::DWORD = 0x00000040;
-pub const CCS_VERT: ::DWORD = 0x00000080;
-pub const CCS_LEFT: ::DWORD = CCS_VERT | CCS_TOP;
-pub const CCS_RIGHT: ::DWORD = CCS_VERT | CCS_BOTTOM;
-pub const CCS_NOMOVEX: ::DWORD = CCS_VERT | CCS_NOMOVEY;
-pub const MAX_LINKID_TEXT: usize = 48;
-pub const L_MAX_URL_LENGTH: usize = 2048 + 32 + 4;
-pub const LWS_TRANSPARENT: ::DWORD = 0x0001;
-pub const LWS_IGNORERETURN: ::DWORD = 0x0002;
-pub const LWS_NOPREFIX: ::DWORD = 0x0004;
-pub const LWS_USEVISUALSTYLE: ::DWORD = 0x0008;
-pub const LWS_USECUSTOMTEXT: ::DWORD = 0x0010;
-pub const LWS_RIGHT: ::DWORD = 0x0020;
-pub const LIF_ITEMINDEX: ::UINT = 0x00000001;
-pub const LIF_STATE: ::UINT = 0x00000002;
-pub const LIF_ITEMID: ::UINT = 0x00000004;
-pub const LIF_URL: ::UINT = 0x00000008;
-pub const LIS_FOCUSED: ::UINT = 0x00000001;
-pub const LIS_ENABLED: ::UINT = 0x00000002;
-pub const LIS_VISITED: ::UINT = 0x00000004;
-pub const LIS_HOTTRACK: ::UINT = 0x00000008;
-pub const LIS_DEFAULTCOLORS: ::UINT = 0x00000010;
-STRUCT!{nodebug struct LITEM {
-    mask: ::UINT,
-    iLink: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-    szID: [::WCHAR; MAX_LINKID_TEXT],
-    szUrl: [::WCHAR; L_MAX_URL_LENGTH],
-}}
-pub type PLITEM = *mut LITEM;
-STRUCT!{nodebug struct LHITTESTINFO {
-    pt: ::POINT,
-    item: LITEM,
-}}
-pub type PLHITTESTINFO = *mut LHITTESTINFO;
-STRUCT!{nodebug struct NMLINK {
-    hdr: ::NMHDR,
-    item: LITEM,
-}}
-pub type PNMLINK = *mut NMLINK;
-pub const LM_HITTEST: ::UINT = ::WM_USER + 0x300;
-pub const LM_GETIDEALHEIGHT: ::UINT = ::WM_USER + 0x301;
-pub const LM_SETITEM: ::UINT = ::WM_USER + 0x302;
-pub const LM_GETITEM: ::UINT = ::WM_USER + 0x303;
-pub const LM_GETIDEALSIZE: ::UINT = LM_GETIDEALHEIGHT;
-pub const LVS_ICON: ::DWORD = 0x0000;
-pub const LVS_REPORT: ::DWORD = 0x0001;
-pub const LVS_SMALLICON: ::DWORD = 0x0002;
-pub const LVS_LIST: ::DWORD = 0x0003;
-pub const LVS_TYPEMASK: ::DWORD = 0x0003;
-pub const LVS_SINGLESEL: ::DWORD = 0x0004;
-pub const LVS_SHOWSELALWAYS: ::DWORD = 0x0008;
-pub const LVS_SORTASCENDING: ::DWORD = 0x0010;
-pub const LVS_SORTDESCENDING: ::DWORD = 0x0020;
-pub const LVS_SHAREIMAGELISTS: ::DWORD = 0x0040;
-pub const LVS_NOLABELWRAP: ::DWORD = 0x0080;
-pub const LVS_AUTOARRANGE: ::DWORD = 0x0100;
-pub const LVS_EDITLABELS: ::DWORD = 0x0200;
-pub const LVS_OWNERDATA: ::DWORD = 0x1000;
-pub const LVS_NOSCROLL: ::DWORD = 0x2000;
-pub const LVS_TYPESTYLEMASK: ::DWORD = 0xfc00;
-pub const LVS_ALIGNTOP: ::DWORD = 0x0000;
-pub const LVS_ALIGNLEFT: ::DWORD = 0x0800;
-pub const LVS_ALIGNMASK: ::DWORD = 0x0c00;
-pub const LVS_OWNERDRAWFIXED: ::DWORD = 0x0400;
-pub const LVS_NOCOLUMNHEADER: ::DWORD = 0x4000;
-pub const LVS_NOSORTHEADER: ::DWORD = 0x8000;
-pub const LVM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const LVM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const LVM_GETBKCOLOR: ::UINT = LVM_FIRST + 0;
-pub const LVM_SETBKCOLOR: ::UINT = LVM_FIRST + 1;
-pub const LVM_GETIMAGELIST: ::UINT = LVM_FIRST + 2;
-pub const LVM_SETIMAGELIST: ::UINT = LVM_FIRST + 3;
-pub const LVM_GETITEMCOUNT: ::UINT = LVM_FIRST + 4;
-pub const LVSIL_NORMAL: ::c_int = 0;
-pub const LVSIL_SMALL: ::c_int = 1;
-pub const LVSIL_STATE: ::c_int = 2;
-pub const LVSIL_GROUPHEADER: ::c_int = 3;
-pub const LVIF_TEXT: ::UINT = 0x00000001;
-pub const LVIF_IMAGE: ::UINT = 0x00000002;
-pub const LVIF_PARAM: ::UINT = 0x00000004;
-pub const LVIF_STATE: ::UINT = 0x00000008;
-pub const LVIF_INDENT: ::UINT = 0x00000010;
-pub const LVIF_NORECOMPUTE: ::UINT = 0x00000800;
-pub const LVIF_GROUPID: ::UINT = 0x00000100;
-pub const LVIF_COLUMNS: ::UINT = 0x00000200;
-pub const LVIF_COLFMT: ::UINT = 0x00010000;
-pub const LVIS_FOCUSED: ::UINT = 0x0001;
-pub const LVIS_SELECTED: ::UINT = 0x0002;
-pub const LVIS_CUT: ::UINT = 0x0004;
-pub const LVIS_DROPHILITED: ::UINT = 0x0008;
-pub const LVIS_GLOW: ::UINT = 0x0010;
-pub const LVIS_ACTIVATING: ::UINT = 0x0020;
-pub const LVIS_OVERLAYMASK: ::UINT = 0x0F00;
-pub const LVIS_STATEIMAGEMASK: ::UINT = 0xF000;
-#[inline] #[allow(dead_code)]
-pub fn INDEXTOSTATEIMAGEMASK(i: ::UINT) -> ::UINT { i << 12 }
-pub const I_INDENTCALLBACK: ::c_int = -1;
-pub type LV_ITEMA = LVITEMA;
-pub type LV_ITEMW = LVITEMW;
-pub const I_GROUPIDCALLBACK: ::c_int = -1;
-pub const I_GROUPIDNONE: ::c_int = -2;
-STRUCT!{struct LVITEMA {
-    mask: ::UINT,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-    iIndent: ::c_int,
-    iGroupId: ::c_int,
-    cColumns: ::UINT,
-    puColumns: ::PUINT,
-    piColFmt: *mut ::c_int,
-    iGroup: ::c_int,
-}}
-pub type LPLVITEMA = *mut LVITEMA;
-STRUCT!{struct LVITEMW {
-    mask: ::UINT,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-    iIndent: ::c_int,
-    iGroupId: ::c_int,
-    cColumns: ::UINT,
-    puColumns: ::PUINT,
-    piColFmt: *mut ::c_int,
-    iGroup: ::c_int,
-}}
-pub type LPLVITEMW = *mut LVITEMW;
-pub const LPSTR_TEXTCALLBACKW: ::LPWSTR = (0 - 1) as ::LPWSTR;
-pub const LPSTR_TEXTCALLBACKA: ::LPSTR = (0 - 1) as ::LPSTR;
-pub const I_IMAGECALLBACK: ::c_int = -1;
-pub const I_IMAGENONE: ::c_int = -2;
-pub const I_COLUMNSCALLBACK: ::UINT = -1i32 as ::UINT;
-pub const LVM_GETITEMA: ::UINT = LVM_FIRST + 5;
-pub const LVM_GETITEMW: ::UINT = LVM_FIRST + 75;
-pub const LVM_SETITEMA: ::UINT = LVM_FIRST + 6;
-pub const LVM_SETITEMW: ::UINT = LVM_FIRST + 76;
-pub const LVM_INSERTITEMA: ::UINT = LVM_FIRST + 7;
-pub const LVM_INSERTITEMW: ::UINT = LVM_FIRST + 77;
-pub const LVM_DELETEITEM: ::UINT = LVM_FIRST + 8;
-pub const LVM_DELETEALLITEMS: ::UINT = LVM_FIRST + 9;
-pub const LVM_GETCALLBACKMASK: ::UINT = LVM_FIRST + 10;
-pub const LVM_SETCALLBACKMASK: ::UINT = LVM_FIRST + 11;
-pub const LVM_GETNEXTITEM: ::UINT = LVM_FIRST + 12;
-pub const LVNI_ALL: ::LPARAM = 0x0000;
-pub const LVNI_FOCUSED: ::LPARAM = 0x0001;
-pub const LVNI_SELECTED: ::LPARAM = 0x0002;
-pub const LVNI_CUT: ::LPARAM = 0x0004;
-pub const LVNI_DROPHILITED: ::LPARAM = 0x0008;
-pub const LVNI_STATEMASK: ::LPARAM = LVNI_FOCUSED | LVNI_SELECTED | LVNI_CUT | LVNI_DROPHILITED;
-pub const LVNI_VISIBLEORDER: ::LPARAM = 0x0010;
-pub const LVNI_PREVIOUS: ::LPARAM = 0x0020;
-pub const LVNI_VISIBLEONLY: ::LPARAM = 0x0040;
-pub const LVNI_SAMEGROUPONLY: ::LPARAM = 0x0080;
-pub const LVNI_ABOVE: ::LPARAM = 0x0100;
-pub const LVNI_BELOW: ::LPARAM = 0x0200;
-pub const LVNI_TOLEFT: ::LPARAM = 0x0400;
-pub const LVNI_TORIGHT: ::LPARAM = 0x0800;
-pub const LVNI_DIRECTIONMASK: ::LPARAM = LVNI_ABOVE | LVNI_BELOW | LVNI_TOLEFT | LVNI_TORIGHT;
-pub const LVFI_PARAM: ::UINT = 0x0001;
-pub const LVFI_STRING: ::UINT = 0x0002;
-pub const LVFI_SUBSTRING: ::UINT = 0x0004;
-pub const LVFI_PARTIAL: ::UINT = 0x0008;
-pub const LVFI_WRAP: ::UINT = 0x0020;
-pub const LVFI_NEARESTXY: ::UINT = 0x0040;
-pub type LV_FINDINFOA = LVFINDINFOA;
-pub type LV_FINDINFOW = LVFINDINFOW;
-STRUCT!{struct LVFINDINFOA {
-    flags: ::UINT,
-    psz: ::LPCSTR,
-    lParam: ::LPARAM,
-    pt: ::POINT,
-    vkDirection: ::UINT,
-}}
-pub type LPLVFINDINFOA = *mut LVFINDINFOA;
-STRUCT!{struct LVFINDINFOW {
-    flags: ::UINT,
-    psz: ::LPCWSTR,
-    lParam: ::LPARAM,
-    pt: ::POINT,
-    vkDirection: ::UINT,
-}}
-pub type LPLVFINDINFOW = *mut LVFINDINFOW;
-pub const LVM_FINDITEMA: ::UINT = LVM_FIRST + 13;
-pub const LVM_FINDITEMW: ::UINT = LVM_FIRST + 83;
-pub const LVIR_BOUNDS: ::c_int = 0;
-pub const LVIR_ICON: ::c_int = 1;
-pub const LVIR_LABEL: ::c_int = 2;
-pub const LVIR_SELECTBOUNDS: ::c_int = 3;
-pub const LVM_GETITEMRECT: ::UINT = LVM_FIRST + 14;
-pub const LVM_SETITEMPOSITION: ::UINT = LVM_FIRST + 15;
-pub const LVM_GETITEMPOSITION: ::UINT = LVM_FIRST + 16;
-pub const LVM_GETSTRINGWIDTHA: ::UINT = LVM_FIRST + 17;
-pub const LVM_GETSTRINGWIDTHW: ::UINT = LVM_FIRST + 87;
-pub const LVHT_NOWHERE: ::UINT = 0x00000001;
-pub const LVHT_ONITEMICON: ::UINT = 0x00000002;
-pub const LVHT_ONITEMLABEL: ::UINT = 0x00000004;
-pub const LVHT_ONITEMSTATEICON: ::UINT = 0x00000008;
-pub const LVHT_ONITEM: ::UINT = LVHT_ONITEMICON | LVHT_ONITEMLABEL | LVHT_ONITEMSTATEICON;
-pub const LVHT_ABOVE: ::UINT = 0x00000008;
-pub const LVHT_BELOW: ::UINT = 0x00000010;
-pub const LVHT_TORIGHT: ::UINT = 0x00000020;
-pub const LVHT_TOLEFT: ::UINT = 0x00000040;
-pub const LVHT_EX_GROUP_HEADER: ::UINT = 0x10000000;
-pub const LVHT_EX_GROUP_FOOTER: ::UINT = 0x20000000;
-pub const LVHT_EX_GROUP_COLLAPSE: ::UINT = 0x40000000;
-pub const LVHT_EX_GROUP_BACKGROUND: ::UINT = 0x80000000;
-pub const LVHT_EX_GROUP_STATEICON: ::UINT = 0x01000000;
-pub const LVHT_EX_GROUP_SUBSETLINK: ::UINT = 0x02000000;
-pub const LVHT_EX_GROUP: ::UINT = LVHT_EX_GROUP_BACKGROUND | LVHT_EX_GROUP_COLLAPSE
-    | LVHT_EX_GROUP_FOOTER | LVHT_EX_GROUP_HEADER | LVHT_EX_GROUP_STATEICON
-    | LVHT_EX_GROUP_SUBSETLINK;
-pub const LVHT_EX_ONCONTENTS: ::UINT = 0x04000000;
-pub const LVHT_EX_FOOTER: ::UINT = 0x08000000;
-pub type LV_HITTESTINFO = LVHITTESTINFO;
-STRUCT!{struct LVHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    iGroup: ::c_int,
-}}
-pub type LPLVHITTESTINFO = *mut LVHITTESTINFO;
-pub const LVM_HITTEST: ::UINT = LVM_FIRST + 18;
-pub const LVM_ENSUREVISIBLE: ::UINT = LVM_FIRST + 19;
-pub const LVM_SCROLL: ::UINT = LVM_FIRST + 20;
-pub const LVM_REDRAWITEMS: ::UINT = LVM_FIRST + 21;
-pub const LVA_DEFAULT: ::WPARAM = 0x0000;
-pub const LVA_ALIGNLEFT: ::WPARAM = 0x0001;
-pub const LVA_ALIGNTOP: ::WPARAM = 0x0002;
-pub const LVA_SNAPTOGRID: ::WPARAM = 0x0005;
-pub const LVM_ARRANGE: ::UINT = LVM_FIRST + 22;
-pub const LVM_EDITLABELA: ::UINT = LVM_FIRST + 23;
-pub const LVM_EDITLABELW: ::UINT = LVM_FIRST + 118;
-pub const LVM_GETEDITCONTROL: ::UINT = LVM_FIRST + 24;
-pub type LV_COLUMNA = LVCOLUMNA;
-pub type LV_COLUMNW = LVCOLUMNW;
-STRUCT!{struct LVCOLUMNA {
-    mask: ::UINT,
-    fmt: ::c_int,
-    cx: ::c_int,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iSubItem: ::c_int,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    cxMin: ::c_int,
-    cxDefault: ::c_int,
-    cxIdeal: ::c_int,
-}}
-pub type LPLVCOLUMNA = *mut LVCOLUMNA;
-STRUCT!{struct LVCOLUMNW {
-    mask: ::UINT,
-    fmt: ::c_int,
-    cx: ::c_int,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iSubItem: ::c_int,
-    iImage: ::c_int,
-    iOrder: ::c_int,
-    cxMin: ::c_int,
-    cxDefault: ::c_int,
-    cxIdeal: ::c_int,
-}}
-pub type LPLVCOLUMNW = *mut LVCOLUMNW;
-pub const LVCF_FMT: ::UINT = 0x0001;
-pub const LVCF_WIDTH: ::UINT = 0x0002;
-pub const LVCF_TEXT: ::UINT = 0x0004;
-pub const LVCF_SUBITEM: ::UINT = 0x0008;
-pub const LVCF_IMAGE: ::UINT = 0x0010;
-pub const LVCF_ORDER: ::UINT = 0x0020;
-pub const LVCF_MINWIDTH: ::UINT = 0x0040;
-pub const LVCF_DEFAULTWIDTH: ::UINT = 0x0080;
-pub const LVCF_IDEALWIDTH: ::UINT = 0x0100;
-pub const LVCFMT_LEFT: ::c_int = 0x0000;
-pub const LVCFMT_RIGHT: ::c_int = 0x0001;
-pub const LVCFMT_CENTER: ::c_int = 0x0002;
-pub const LVCFMT_JUSTIFYMASK: ::c_int = 0x0003;
-pub const LVCFMT_IMAGE: ::c_int = 0x0800;
-pub const LVCFMT_BITMAP_ON_RIGHT: ::c_int = 0x1000;
-pub const LVCFMT_COL_HAS_IMAGES: ::c_int = 0x8000;
-pub const LVCFMT_FIXED_WIDTH: ::c_int = 0x00100;
-pub const LVCFMT_NO_DPI_SCALE: ::c_int = 0x40000;
-pub const LVCFMT_FIXED_RATIO: ::c_int = 0x80000;
-pub const LVCFMT_LINE_BREAK: ::c_int = 0x100000;
-pub const LVCFMT_FILL: ::c_int = 0x200000;
-pub const LVCFMT_WRAP: ::c_int = 0x400000;
-pub const LVCFMT_NO_TITLE: ::c_int = 0x800000;
-pub const LVCFMT_TILE_PLACEMENTMASK: ::c_int = LVCFMT_LINE_BREAK | LVCFMT_FILL;
-pub const LVCFMT_SPLITBUTTON: ::c_int = 0x1000000;
-pub const LVM_GETCOLUMNA: ::UINT = LVM_FIRST + 25;
-pub const LVM_GETCOLUMNW: ::UINT = LVM_FIRST + 95;
-pub const LVM_SETCOLUMNA: ::UINT = LVM_FIRST + 26;
-pub const LVM_SETCOLUMNW: ::UINT = LVM_FIRST + 96;
-pub const LVM_INSERTCOLUMNA: ::UINT = LVM_FIRST + 27;
-pub const LVM_INSERTCOLUMNW: ::UINT = LVM_FIRST + 97;
-pub const LVM_DELETECOLUMN: ::UINT = LVM_FIRST + 28;
-pub const LVM_GETCOLUMNWIDTH: ::UINT = LVM_FIRST + 29;
-pub const LVM_SETCOLUMNWIDTH: ::UINT = LVM_FIRST + 30;
-pub const LVM_GETHEADER: ::UINT = LVM_FIRST + 31;
-pub const LVM_CREATEDRAGIMAGE: ::UINT = LVM_FIRST + 33;
-pub const LVM_GETVIEWRECT: ::UINT = LVM_FIRST + 34;
-pub const LVM_GETTEXTCOLOR: ::UINT = LVM_FIRST + 35;
-pub const LVM_SETTEXTCOLOR: ::UINT = LVM_FIRST + 36;
-pub const LVM_GETTEXTBKCOLOR: ::UINT = LVM_FIRST + 37;
-pub const LVM_SETTEXTBKCOLOR: ::UINT = LVM_FIRST + 38;
-pub const LVM_GETTOPINDEX: ::UINT = LVM_FIRST + 39;
-pub const LVM_GETCOUNTPERPAGE: ::UINT = LVM_FIRST + 40;
-pub const LVM_GETORIGIN: ::UINT = LVM_FIRST + 41;
-pub const LVM_UPDATE: ::UINT = LVM_FIRST + 42;
-pub const LVM_SETITEMSTATE: ::UINT = LVM_FIRST + 43;
-pub const LVM_GETITEMSTATE: ::UINT = LVM_FIRST + 44;
-pub const LVM_GETITEMTEXTA: ::UINT = LVM_FIRST + 45;
-pub const LVM_GETITEMTEXTW: ::UINT = LVM_FIRST + 115;
-pub const LVM_SETITEMTEXTA: ::UINT = LVM_FIRST + 46;
-pub const LVM_SETITEMTEXTW: ::UINT = LVM_FIRST + 116;
-pub const LVM_SETITEMCOUNT: ::UINT = LVM_FIRST + 47;
-pub const LVM_SORTITEMS: ::UINT = LVM_FIRST + 48;
-pub const LVM_SETITEMPOSITION32: ::UINT = LVM_FIRST + 49;
-pub const LVM_GETSELECTEDCOUNT: ::UINT = LVM_FIRST + 50;
-pub const LVM_GETITEMSPACING: ::UINT = LVM_FIRST + 51;
-pub const LVM_GETISEARCHSTRINGA: ::UINT = LVM_FIRST + 52;
-pub const LVM_GETISEARCHSTRINGW: ::UINT = LVM_FIRST + 117;
-pub const LVM_SETICONSPACING: ::UINT = LVM_FIRST + 53;
-pub const LVM_SETEXTENDEDLISTVIEWSTYLE: ::UINT = LVM_FIRST + 54;
-pub const LVM_GETEXTENDEDLISTVIEWSTYLE: ::UINT = LVM_FIRST + 55;
-pub const LVSICF_NOINVALIDATEALL: ::LPARAM = 0x00000001;
-pub const LVSICF_NOSCROLL: ::LPARAM = 0x00000002;
-pub const LVS_EX_GRIDLINES: ::DWORD = 0x00000001;
-pub const LVS_EX_SUBITEMIMAGES: ::DWORD = 0x00000002;
-pub const LVS_EX_CHECKBOXES: ::DWORD = 0x00000004;
-pub const LVS_EX_TRACKSELECT: ::DWORD = 0x00000008;
-pub const LVS_EX_HEADERDRAGDROP: ::DWORD = 0x00000010;
-pub const LVS_EX_FULLROWSELECT: ::DWORD = 0x00000020;
-pub const LVS_EX_ONECLICKACTIVATE: ::DWORD = 0x00000040;
-pub const LVS_EX_TWOCLICKACTIVATE: ::DWORD = 0x00000080;
-pub const LVS_EX_FLATSB: ::DWORD = 0x00000100;
-pub const LVS_EX_REGIONAL: ::DWORD = 0x00000200;
-pub const LVS_EX_INFOTIP: ::DWORD = 0x00000400;
-pub const LVS_EX_UNDERLINEHOT: ::DWORD = 0x00000800;
-pub const LVS_EX_UNDERLINECOLD: ::DWORD = 0x00001000;
-pub const LVS_EX_MULTIWORKAREAS: ::DWORD = 0x00002000;
-pub const LVS_EX_LABELTIP: ::DWORD = 0x00004000;
-pub const LVS_EX_BORDERSELECT: ::DWORD = 0x00008000;
-pub const LVS_EX_DOUBLEBUFFER: ::DWORD = 0x00010000;
-pub const LVS_EX_HIDELABELS: ::DWORD = 0x00020000;
-pub const LVS_EX_SINGLEROW: ::DWORD = 0x00040000;
-pub const LVS_EX_SNAPTOGRID: ::DWORD = 0x00080000;
-pub const LVS_EX_SIMPLESELECT: ::DWORD = 0x00100000;
-pub const LVS_EX_JUSTIFYCOLUMNS: ::DWORD = 0x00200000;
-pub const LVS_EX_TRANSPARENTBKGND: ::DWORD = 0x00400000;
-pub const LVS_EX_TRANSPARENTSHADOWTEXT: ::DWORD = 0x00800000;
-pub const LVS_EX_AUTOAUTOARRANGE: ::DWORD = 0x01000000;
-pub const LVS_EX_HEADERINALLVIEWS: ::DWORD = 0x02000000;
-pub const LVS_EX_AUTOCHECKSELECT: ::DWORD = 0x08000000;
-pub const LVS_EX_AUTOSIZECOLUMNS: ::DWORD = 0x10000000;
-pub const LVS_EX_COLUMNSNAPPOINTS: ::DWORD = 0x40000000;
-pub const LVS_EX_COLUMNOVERFLOW: ::DWORD = 0x80000000;
-pub const LVM_GETSUBITEMRECT: ::UINT = LVM_FIRST + 56;
-pub const LVM_SUBITEMHITTEST: ::UINT = LVM_FIRST + 57;
-pub const LVM_SETCOLUMNORDERARRAY: ::UINT = LVM_FIRST + 58;
-pub const LVM_GETCOLUMNORDERARRAY: ::UINT = LVM_FIRST + 59;
-pub const LVM_SETHOTITEM: ::UINT = LVM_FIRST + 60;
-pub const LVM_GETHOTITEM: ::UINT = LVM_FIRST + 61;
-pub const LVM_SETHOTCURSOR: ::UINT = LVM_FIRST + 62;
-pub const LVM_GETHOTCURSOR: ::UINT = LVM_FIRST + 63;
-pub const LVM_APPROXIMATEVIEWRECT: ::UINT = LVM_FIRST + 64;
-pub const LV_MAX_WORKAREAS: ::WPARAM = 16;
-pub const LVM_SETWORKAREAS: ::UINT = LVM_FIRST + 65;
-pub const LVM_GETWORKAREAS: ::UINT = LVM_FIRST + 70;
-pub const LVM_GETNUMBEROFWORKAREAS: ::UINT = LVM_FIRST + 73;
-pub const LVM_GETSELECTIONMARK: ::UINT = LVM_FIRST + 66;
-pub const LVM_SETSELECTIONMARK: ::UINT = LVM_FIRST + 67;
-pub const LVM_SETHOVERTIME: ::UINT = LVM_FIRST + 71;
-pub const LVM_GETHOVERTIME: ::UINT = LVM_FIRST + 72;
-pub const LVM_SETTOOLTIPS: ::UINT = LVM_FIRST + 74;
-pub const LVM_GETTOOLTIPS: ::UINT = LVM_FIRST + 78;
-pub const LVM_SORTITEMSEX: ::UINT = LVM_FIRST + 81;
-STRUCT!{struct LVBKIMAGEA {
-    ulFlags: ::ULONG,
-    hbm: ::HBITMAP,
-    pszImage: ::LPSTR,
-    cchImageMax: ::UINT,
-    xOffsetPercent: ::c_int,
-    yOffsetPercent: ::c_int,
-}}
-pub type LPLVBKIMAGEA = *mut LVBKIMAGEA;
-STRUCT!{struct LVBKIMAGEW {
-    ulFlags: ::ULONG,
-    hbm: ::HBITMAP,
-    pszImage: ::LPWSTR,
-    cchImageMax: ::UINT,
-    xOffsetPercent: ::c_int,
-    yOffsetPercent: ::c_int,
-}}
-pub type LPLVBKIMAGEW = *mut LVBKIMAGEW;
-pub const LVBKIF_SOURCE_NONE: ::ULONG = 0x00000000;
-pub const LVBKIF_SOURCE_HBITMAP: ::ULONG = 0x00000001;
-pub const LVBKIF_SOURCE_URL: ::ULONG = 0x00000002;
-pub const LVBKIF_SOURCE_MASK: ::ULONG = 0x00000003;
-pub const LVBKIF_STYLE_NORMAL: ::ULONG = 0x00000000;
-pub const LVBKIF_STYLE_TILE: ::ULONG = 0x00000010;
-pub const LVBKIF_STYLE_MASK: ::ULONG = 0x00000010;
-pub const LVBKIF_FLAG_TILEOFFSET: ::ULONG = 0x00000100;
-pub const LVBKIF_TYPE_WATERMARK: ::ULONG = 0x10000000;
-pub const LVBKIF_FLAG_ALPHABLEND: ::ULONG = 0x20000000;
-pub const LVM_SETBKIMAGEA: ::UINT = LVM_FIRST + 68;
-pub const LVM_SETBKIMAGEW: ::UINT = LVM_FIRST + 138;
-pub const LVM_GETBKIMAGEA: ::UINT = LVM_FIRST + 69;
-pub const LVM_GETBKIMAGEW: ::UINT = LVM_FIRST + 139;
-pub const LVM_SETSELECTEDCOLUMN: ::UINT = LVM_FIRST + 140;
-pub const LV_VIEW_ICON: ::DWORD = 0x0000;
-pub const LV_VIEW_DETAILS: ::DWORD = 0x0001;
-pub const LV_VIEW_SMALLICON: ::DWORD = 0x0002;
-pub const LV_VIEW_LIST: ::DWORD = 0x0003;
-pub const LV_VIEW_TILE: ::DWORD = 0x0004;
-pub const LV_VIEW_MAX: ::DWORD = 0x0004;
-pub const LVM_SETVIEW: ::UINT = LVM_FIRST + 142;
-pub const LVM_GETVIEW: ::UINT = LVM_FIRST + 143;
-pub const LVGF_NONE: ::UINT = 0x00000000;
-pub const LVGF_HEADER: ::UINT = 0x00000001;
-pub const LVGF_FOOTER: ::UINT = 0x00000002;
-pub const LVGF_STATE: ::UINT = 0x00000004;
-pub const LVGF_ALIGN: ::UINT = 0x00000008;
-pub const LVGF_GROUPID: ::UINT = 0x00000010;
-pub const LVGF_SUBTITLE: ::UINT = 0x00000100;
-pub const LVGF_TASK: ::UINT = 0x00000200;
-pub const LVGF_DESCRIPTIONTOP: ::UINT = 0x00000400;
-pub const LVGF_DESCRIPTIONBOTTOM: ::UINT = 0x00000800;
-pub const LVGF_TITLEIMAGE: ::UINT = 0x00001000;
-pub const LVGF_EXTENDEDIMAGE: ::UINT = 0x00002000;
-pub const LVGF_ITEMS: ::UINT = 0x00004000;
-pub const LVGF_SUBSET: ::UINT = 0x00008000;
-pub const LVGF_SUBSETITEMS: ::UINT = 0x00010000;
-pub const LVGS_NORMAL: ::UINT = 0x00000000;
-pub const LVGS_COLLAPSED: ::UINT = 0x00000001;
-pub const LVGS_HIDDEN: ::UINT = 0x00000002;
-pub const LVGS_NOHEADER: ::UINT = 0x00000004;
-pub const LVGS_COLLAPSIBLE: ::UINT = 0x00000008;
-pub const LVGS_FOCUSED: ::UINT = 0x00000010;
-pub const LVGS_SELECTED: ::UINT = 0x00000020;
-pub const LVGS_SUBSETED: ::UINT = 0x00000040;
-pub const LVGS_SUBSETLINKFOCUSED: ::UINT = 0x00000080;
-pub const LVGA_HEADER_LEFT: ::UINT = 0x00000001;
-pub const LVGA_HEADER_CENTER: ::UINT = 0x00000002;
-pub const LVGA_HEADER_RIGHT: ::UINT = 0x00000004;
-pub const LVGA_FOOTER_LEFT: ::UINT = 0x00000008;
-pub const LVGA_FOOTER_CENTER: ::UINT = 0x00000010;
-pub const LVGA_FOOTER_RIGHT: ::UINT = 0x00000020;
-STRUCT!{struct LVGROUP {
-    cbSize: ::UINT,
-    mask: ::UINT,
-    pszHeader: ::LPWSTR,
-    cchHeader: ::c_int,
-    pszFooter: ::LPWSTR,
-    cchFooter: ::c_int,
-    iGroupId: ::c_int,
-    stateMask: ::UINT,
-    state: ::UINT,
-    uAlign: ::UINT,
-    pszSubtitle: ::LPWSTR,
-    cchSubtitle: ::UINT,
-    pszTask: ::LPWSTR,
-    cchTask: ::UINT,
-    pszDescriptionTop: ::LPWSTR,
-    cchDescriptionTop: ::UINT,
-    pszDescriptionBottom: ::LPWSTR,
-    cchDescriptionBottom: ::UINT,
-    iTitleImage: ::c_int,
-    iExtendedImage: ::c_int,
-    iFirstItem: ::c_int,
-    cItems: ::UINT,
-    pszSubsetTitle: ::LPWSTR,
-    cchSubsetTitle: ::UINT,
-}}
-pub type PLVGROUP = *mut LVGROUP;
-pub const LVM_INSERTGROUP: ::UINT = LVM_FIRST + 145;
-pub const LVM_SETGROUPINFO: ::UINT = LVM_FIRST + 147;
-pub const LVM_GETGROUPINFO: ::UINT = LVM_FIRST + 149;
-pub const LVM_REMOVEGROUP: ::UINT = LVM_FIRST + 150;
-pub const LVM_MOVEGROUP: ::UINT = LVM_FIRST + 151;
-pub const LVM_GETGROUPCOUNT: ::UINT = LVM_FIRST + 152;
-pub const LVM_GETGROUPINFOBYINDEX: ::UINT = LVM_FIRST + 153;
-pub const LVM_MOVEITEMTOGROUP: ::UINT = LVM_FIRST + 154;
-pub const LVM_GETGROUPRECT: ::UINT = LVM_FIRST + 98;
-pub const LVGGR_GROUP: ::LPARAM = 0;
-pub const LVGGR_HEADER: ::LPARAM = 1;
-pub const LVGGR_LABEL: ::LPARAM = 2;
-pub const LVGGR_SUBSETLINK: ::LPARAM = 3;
-pub const LVGMF_NONE: ::UINT = 0x00000000;
-pub const LVGMF_BORDERSIZE: ::UINT = 0x00000001;
-pub const LVGMF_BORDERCOLOR: ::UINT = 0x00000002;
-pub const LVGMF_TEXTCOLOR: ::UINT = 0x00000004;
-STRUCT!{struct LVGROUPMETRICS {
-    cbSize: ::UINT,
-    mask: ::UINT,
-    Left: ::UINT,
-    Top: ::UINT,
-    Right: ::UINT,
-    Bottom: ::UINT,
-    crLeft: ::COLORREF,
-    crTop: ::COLORREF,
-    crRight: ::COLORREF,
-    crBottom: ::COLORREF,
-    crHeader: ::COLORREF,
-    crFooter: ::COLORREF,
-}}
-pub type PLVGROUPMETRICS = *mut LVGROUPMETRICS;
-pub const LVM_SETGROUPMETRICS: ::UINT = LVM_FIRST + 155;
-pub const LVM_GETGROUPMETRICS: ::UINT = LVM_FIRST + 156;
-pub const LVM_ENABLEGROUPVIEW: ::UINT = LVM_FIRST + 157;
-pub const LVM_SORTGROUPS: ::UINT = LVM_FIRST + 158;
-pub type PFNLVGROUPCOMPARE = Option<unsafe extern "system" fn(
-    ::c_int, ::c_int, *mut ::c_void,
-) -> ::c_int>;
-STRUCT!{nodebug struct LVINSERTGROUPSORTED {
-    pfnGroupCompare: PFNLVGROUPCOMPARE,
-    pvData: *mut ::c_void,
-    lvGroup: LVGROUP,
-}}
-pub type PLVINSERTGROUPSORTED = *mut LVINSERTGROUPSORTED;
-pub const LVM_INSERTGROUPSORTED: ::UINT = LVM_FIRST + 159;
-pub const LVM_REMOVEALLGROUPS: ::UINT = LVM_FIRST + 160;
-pub const LVM_HASGROUP: ::UINT = LVM_FIRST + 161;
-pub const LVM_GETGROUPSTATE: ::UINT = LVM_FIRST + 92;
-pub const LVM_GETFOCUSEDGROUP: ::UINT = LVM_FIRST + 93;
-pub const LVTVIF_AUTOSIZE: ::DWORD = 0x00000000;
-pub const LVTVIF_FIXEDWIDTH: ::DWORD = 0x00000001;
-pub const LVTVIF_FIXEDHEIGHT: ::DWORD = 0x00000002;
-pub const LVTVIF_FIXEDSIZE: ::DWORD = 0x00000003;
-pub const LVTVIF_EXTENDED: ::DWORD = 0x00000004;
-pub const LVTVIM_TILESIZE: ::DWORD = 0x00000001;
-pub const LVTVIM_COLUMNS: ::DWORD = 0x00000002;
-pub const LVTVIM_LABELMARGIN: ::DWORD = 0x00000004;
-STRUCT!{struct LVTILEVIEWINFO {
-    cbSize: ::UINT,
-    dwMask: ::DWORD,
-    dwFlags: ::DWORD,
-    sizeTile: ::SIZE,
-    cLines: ::c_int,
-    rcLabelMargin: ::RECT,
-}}
-pub type PLVTILEVIEWINFO = *mut LVTILEVIEWINFO;
-STRUCT!{struct LVTILEINFO {
-    cbSize: ::UINT,
-    iItem: ::c_int,
-    cColumns: ::UINT,
-    puColumns: ::PUINT,
-    piColFmt: *mut ::c_int,
-}}
-pub type PLVTILEINFO = *mut LVTILEINFO;
-pub const LVM_SETTILEVIEWINFO: ::UINT = LVM_FIRST + 162;
-pub const LVM_GETTILEVIEWINFO: ::UINT = LVM_FIRST + 163;
-pub const LVM_SETTILEINFO: ::UINT = LVM_FIRST + 164;
-pub const LVM_GETTILEINFO: ::UINT = LVM_FIRST + 165;
-STRUCT!{struct LVINSERTMARK {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-    iItem: ::c_int,
-    dwReserved: ::DWORD,
-}}
-pub type LPLVINSERTMARK = *mut LVINSERTMARK;
-pub const LVIM_AFTER: ::DWORD = 0x00000001;
-pub const LVM_SETINSERTMARK: ::UINT = LVM_FIRST + 166;
-pub const LVM_GETINSERTMARK: ::UINT = LVM_FIRST + 167;
-pub const LVM_INSERTMARKHITTEST: ::UINT = LVM_FIRST + 168;
-pub const LVM_GETINSERTMARKRECT: ::UINT = LVM_FIRST + 169;
-pub const LVM_SETINSERTMARKCOLOR: ::UINT = LVM_FIRST + 170;
-pub const LVM_GETINSERTMARKCOLOR: ::UINT = LVM_FIRST + 171;
-STRUCT!{struct LVSETINFOTIP {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-    pszText: ::LPWSTR,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-}}
-pub type PLVSETINFOTIP = *mut LVSETINFOTIP;
-pub const  LVM_SETINFOTIP: ::UINT = LVM_FIRST + 173;
-pub const LVM_GETSELECTEDCOLUMN: ::UINT = LVM_FIRST + 174;
-pub const LVM_ISGROUPVIEWENABLED: ::UINT = LVM_FIRST + 175;
-pub const LVM_GETOUTLINECOLOR: ::UINT = LVM_FIRST + 176;
-pub const LVM_SETOUTLINECOLOR: ::UINT = LVM_FIRST + 177;
-pub const LVM_CANCELEDITLABEL: ::UINT = LVM_FIRST + 179;
-pub const LVM_MAPINDEXTOID: ::UINT = LVM_FIRST + 180;
-pub const LVM_MAPIDTOINDEX: ::UINT = LVM_FIRST + 181;
-pub const LVM_ISITEMVISIBLE: ::UINT = LVM_FIRST + 182;
-pub const LVM_GETEMPTYTEXT: ::UINT = LVM_FIRST + 204;
-pub const LVM_GETFOOTERRECT: ::UINT = LVM_FIRST + 205;
-pub const LVFF_ITEMCOUNT: ::UINT = 0x00000001;
-STRUCT!{struct LVFOOTERINFO {
-    mask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    cItems: ::UINT,
-}}
-pub type LPLVFOOTERINFO = *mut LVFOOTERINFO;
-pub const LVM_GETFOOTERINFO: ::UINT = LVM_FIRST + 206;
-pub const LVM_GETFOOTERITEMRECT: ::UINT = LVM_FIRST + 207;
-pub const LVFIF_TEXT: ::UINT = 0x00000001;
-pub const LVFIF_STATE: ::UINT = 0x00000002;
-pub const LVFIS_FOCUSED: ::UINT = 0x0001;
-STRUCT!{struct LVFOOTERITEM {
-    mask: ::UINT,
-    iItem: ::c_int,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    state: ::UINT,
-    stateMask: ::UINT,
-}}
-pub type LPLVFOOTERITEM = *mut LVFOOTERITEM;
-pub const LVM_GETFOOTERITEM: ::UINT = LVM_FIRST + 208;
-STRUCT!{struct LVITEMINDEX {
-    iItem: ::c_int,
-    iGroup: ::c_int,
-}}
-pub type PLVITEMINDEX = *mut LVITEMINDEX;
-pub const LVM_GETITEMINDEXRECT: ::UINT = LVM_FIRST + 209;
-pub const LVM_SETITEMINDEXSTATE: ::UINT = LVM_FIRST + 210;
-pub const LVM_GETNEXTITEMINDEX: ::UINT = LVM_FIRST + 211;
-pub type LPNM_LISTVIEW = LPNMLISTVIEW;
-pub type NM_LISTVIEW = NMLISTVIEW;
-STRUCT!{struct NMLISTVIEW {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    uNewState: ::UINT,
-    uOldState: ::UINT,
-    uChanged: ::UINT,
-    ptAction: ::POINT,
-    lParam: ::LPARAM,
-}}
-pub type LPNMLISTVIEW = *mut NMLISTVIEW;
-STRUCT!{struct NMITEMACTIVATE {
-    hdr: ::NMHDR,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    uNewState: ::UINT,
-    uOldState: ::UINT,
-    uChanged: ::UINT,
-    ptAction: ::POINT,
-    lParam: ::LPARAM,
-    uKeyFlags: ::UINT,
-}}
-pub type LPNMITEMACTIVATE = *mut NMITEMACTIVATE;
-pub const LVKF_ALT: ::UINT = 0x0001;
-pub const LVKF_CONTROL: ::UINT = 0x0002;
-pub const LVKF_SHIFT: ::UINT = 0x0004;
-STRUCT!{struct NMLVCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    clrText: ::COLORREF,
-    clrTextBk: ::COLORREF,
-    iSubItem: ::c_int,
-    dwItemType: ::DWORD,
-    clrFace: ::COLORREF,
-    iIconEffect: ::c_int,
-    iIconPhase: ::c_int,
-    iPartId: ::c_int,
-    iStateId: ::c_int,
-    rcText: ::RECT,
-    uAlign: ::UINT,
-}}
-pub type LPNMLVCUSTOMDRAW = *mut NMLVCUSTOMDRAW;
-pub const LVCDI_ITEM: ::DWORD = 0x00000000;
-pub const LVCDI_GROUP: ::DWORD = 0x00000001;
-pub const LVCDI_ITEMSLIST: ::DWORD = 0x00000002;
-pub const LVCDRF_NOSELECT: ::LRESULT = 0x00010000;
-pub const LVCDRF_NOGROUPFRAME: ::LRESULT = 0x00020000;
-STRUCT!{struct NMLVCACHEHINT {
-    hdr: ::NMHDR,
-    iFrom: ::c_int,
-    iTo: ::c_int,
-}}
-pub type LPNMLVCACHEHINT = *mut NMLVCACHEHINT;
-pub type LPNM_CACHEHINT = LPNMLVCACHEHINT;
-pub type PNM_CACHEHINT = LPNMLVCACHEHINT;
-pub type NM_CACHEHINT = NMLVCACHEHINT;
-STRUCT!{struct NMLVFINDITEMA {
-    hdr: ::NMHDR,
-    iStart: ::c_int,
-    lvfi: LVFINDINFOA,
-}}
-pub type LPNMLVFINDITEMA = *mut NMLVFINDITEMA;
-STRUCT!{struct NMLVFINDITEMW {
-    hdr: ::NMHDR,
-    iStart: ::c_int,
-    lvfi: LVFINDINFOW,
-}}
-pub type LPNMLVFINDITEMW = *mut NMLVFINDITEMW;
-pub type PNM_FINDITEMA = LPNMLVFINDITEMA;
-pub type LPNM_FINDITEMA = LPNMLVFINDITEMA;
-pub type NM_FINDITEMA = NMLVFINDITEMA;
-pub type PNM_FINDITEMW = LPNMLVFINDITEMW;
-pub type LPNM_FINDITEMW = LPNMLVFINDITEMW;
-pub type NM_FINDITEMW = NMLVFINDITEMW;
-STRUCT!{struct NMLVODSTATECHANGE {
-    hdr: ::NMHDR,
-    iFrom: ::c_int,
-    iTo: ::c_int,
-    uNewState: ::UINT,
-    uOldState: ::UINT,
-}}
-pub type LPNMLVODSTATECHANGE = *mut NMLVODSTATECHANGE;
-pub type PNM_ODSTATECHANGE = LPNMLVODSTATECHANGE;
-pub type LPNM_ODSTATECHANGE = LPNMLVODSTATECHANGE;
-pub type NM_ODSTATECHANGE = NMLVODSTATECHANGE;
-pub const LVN_ITEMCHANGING: ::UINT = LVN_FIRST - 0;
-pub const LVN_ITEMCHANGED: ::UINT = LVN_FIRST - 1;
-pub const LVN_INSERTITEM: ::UINT = LVN_FIRST - 2;
-pub const LVN_DELETEITEM: ::UINT = LVN_FIRST - 3;
-pub const LVN_DELETEALLITEMS: ::UINT = LVN_FIRST - 4;
-pub const LVN_BEGINLABELEDITA: ::UINT = LVN_FIRST - 5;
-pub const LVN_BEGINLABELEDITW: ::UINT = LVN_FIRST - 75;
-pub const LVN_ENDLABELEDITA: ::UINT = LVN_FIRST - 6;
-pub const LVN_ENDLABELEDITW: ::UINT = LVN_FIRST - 76;
-pub const LVN_COLUMNCLICK: ::UINT = LVN_FIRST - 8;
-pub const LVN_BEGINDRAG: ::UINT = LVN_FIRST - 9;
-pub const LVN_BEGINRDRAG: ::UINT = LVN_FIRST - 11;
-pub const LVN_ODCACHEHINT: ::UINT = LVN_FIRST - 13;
-pub const LVN_ODFINDITEMA: ::UINT = LVN_FIRST - 52;
-pub const LVN_ODFINDITEMW: ::UINT = LVN_FIRST - 79;
-pub const LVN_ITEMACTIVATE: ::UINT = LVN_FIRST - 14;
-pub const LVN_ODSTATECHANGED: ::UINT = LVN_FIRST - 15;
-pub const LVN_HOTTRACK: ::UINT = LVN_FIRST - 21;
-pub const LVN_GETDISPINFOA: ::UINT = LVN_FIRST - 50;
-pub const LVN_GETDISPINFOW: ::UINT = LVN_FIRST - 77;
-pub const LVN_SETDISPINFOA: ::UINT = LVN_FIRST - 51;
-pub const LVN_SETDISPINFOW: ::UINT = LVN_FIRST - 78;
-pub const LVIF_DI_SETITEM: ::UINT = 0x1000;
-pub type LV_DISPINFOA = NMLVDISPINFOA;
-pub type LV_DISPINFOW = NMLVDISPINFOW;
-STRUCT!{struct NMLVDISPINFOA {
-    hdr: ::NMHDR,
-    item: LVITEMA,
-}}
-pub type LPNMLVDISPINFOA = *mut NMLVDISPINFOA;
-STRUCT!{struct NMLVDISPINFOW {
-    hdr: ::NMHDR,
-    item: LVITEMW,
-}}
-pub type LPNMLVDISPINFOW = *mut NMLVDISPINFOW;
-pub const LVN_KEYDOWN: ::UINT = LVN_FIRST - 55;
-pub type LV_KEYDOWN = NMLVKEYDOWN;
-STRUCT!{struct NMLVKEYDOWN {
-    hdr: ::NMHDR,
-    wVKey: ::WORD,
-    flags: ::UINT,
-}}
-pub type LPNMLVKEYDOWN = *mut NMLVKEYDOWN;
-pub const LVN_MARQUEEBEGIN: ::UINT = LVN_FIRST - 56;
-STRUCT!{nodebug struct NMLVLINK {
-    hdr: ::NMHDR,
-    link: LITEM,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-}}
-pub type PNMLVLINK = *mut NMLVLINK;
-STRUCT!{struct NMLVGETINFOTIPA {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMLVGETINFOTIPA = *mut NMLVGETINFOTIPA;
-STRUCT!{struct NMLVGETINFOTIPW {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iItem: ::c_int,
-    iSubItem: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPNMLVGETINFOTIPW = *mut NMLVGETINFOTIPW;
-pub const LVGIT_UNFOLDED: ::DWORD = 0x0001;
-pub const LVN_GETINFOTIPA: ::UINT = LVN_FIRST - 57;
-pub const LVN_GETINFOTIPW: ::UINT = LVN_FIRST - 58;
-pub const LVNSCH_DEFAULT: ::LPARAM = -1;
-pub const LVNSCH_ERROR: ::LPARAM = -2;
-pub const LVNSCH_IGNORE: ::LPARAM = -3;
-pub const LVN_INCREMENTALSEARCHA: ::UINT = LVN_FIRST - 62;
-pub const LVN_INCREMENTALSEARCHW: ::UINT = LVN_FIRST - 63;
-pub const LVN_COLUMNDROPDOWN: ::UINT = LVN_FIRST - 64;
-pub const LVN_COLUMNOVERFLOWCLICK: ::UINT = LVN_FIRST - 66;
-STRUCT!{struct NMLVSCROLL {
-    hdr: ::NMHDR,
-    dx: ::c_int,
-    dy: ::c_int,
-}}
-pub type LPNMLVSCROLL = *mut NMLVSCROLL;
-pub const LVN_BEGINSCROLL: ::UINT = LVN_FIRST - 80;
-pub const LVN_ENDSCROLL: ::UINT = LVN_FIRST - 81;
-pub const LVN_LINKCLICK: ::UINT = LVN_FIRST - 84;
-pub const EMF_CENTERED: ::DWORD = 0x00000001;
-STRUCT!{nodebug struct NMLVEMPTYMARKUP {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    szMarkup: [::WCHAR; L_MAX_URL_LENGTH],
-}}
-pub const LVN_GETEMPTYMARKUP: ::UINT = LVN_FIRST - 87;
-pub const TVS_HASBUTTONS: ::DWORD = 0x0001;
-pub const TVS_HASLINES: ::DWORD = 0x0002;
-pub const TVS_LINESATROOT: ::DWORD = 0x0004;
-pub const TVS_EDITLABELS: ::DWORD = 0x0008;
-pub const TVS_DISABLEDRAGDROP: ::DWORD = 0x0010;
-pub const TVS_SHOWSELALWAYS: ::DWORD = 0x0020;
-pub const TVS_RTLREADING: ::DWORD = 0x0040;
-pub const TVS_NOTOOLTIPS: ::DWORD = 0x0080;
-pub const TVS_CHECKBOXES: ::DWORD = 0x0100;
-pub const TVS_TRACKSELECT: ::DWORD = 0x0200;
-pub const TVS_SINGLEEXPAND: ::DWORD = 0x0400;
-pub const TVS_INFOTIP: ::DWORD = 0x0800;
-pub const TVS_FULLROWSELECT: ::DWORD = 0x1000;
-pub const TVS_NOSCROLL: ::DWORD = 0x2000;
-pub const TVS_NONEVENHEIGHT: ::DWORD = 0x4000;
-pub const TVS_NOHSCROLL: ::DWORD = 0x8000;
-pub const TVS_EX_NOSINGLECOLLAPSE: ::DWORD = 0x0001;
-pub const TVS_EX_MULTISELECT: ::DWORD = 0x0002;
-pub const TVS_EX_DOUBLEBUFFER: ::DWORD = 0x0004;
-pub const TVS_EX_NOINDENTSTATE: ::DWORD = 0x0008;
-pub const TVS_EX_RICHTOOLTIP: ::DWORD = 0x0010;
-pub const TVS_EX_AUTOHSCROLL: ::DWORD = 0x0020;
-pub const TVS_EX_FADEINOUTEXPANDOS: ::DWORD = 0x0040;
-pub const TVS_EX_PARTIALCHECKBOXES: ::DWORD = 0x0080;
-pub const TVS_EX_EXCLUSIONCHECKBOXES: ::DWORD = 0x0100;
-pub const TVS_EX_DIMMEDCHECKBOXES: ::DWORD = 0x0200;
-pub const TVS_EX_DRAWIMAGEASYNC: ::DWORD = 0x0400;
-pub enum TREEITEM {}
-pub type HTREEITEM = *mut TREEITEM;
-pub const TVIF_TEXT: ::UINT = 0x0001;
-pub const TVIF_IMAGE: ::UINT = 0x0002;
-pub const TVIF_PARAM: ::UINT = 0x0004;
-pub const TVIF_STATE: ::UINT = 0x0008;
-pub const TVIF_HANDLE: ::UINT = 0x0010;
-pub const TVIF_SELECTEDIMAGE: ::UINT = 0x0020;
-pub const TVIF_CHILDREN: ::UINT = 0x0040;
-pub const TVIF_INTEGRAL: ::UINT = 0x0080;
-pub const TVIF_STATEEX: ::UINT = 0x0100;
-pub const TVIF_EXPANDEDIMAGE: ::UINT = 0x0200;
-pub const TVIS_SELECTED: ::UINT = 0x0002;
-pub const TVIS_CUT: ::UINT = 0x0004;
-pub const TVIS_DROPHILITED: ::UINT = 0x0008;
-pub const TVIS_BOLD: ::UINT = 0x0010;
-pub const TVIS_EXPANDED: ::UINT = 0x0020;
-pub const TVIS_EXPANDEDONCE: ::UINT = 0x0040;
-pub const TVIS_EXPANDPARTIAL: ::UINT = 0x0080;
-pub const TVIS_OVERLAYMASK: ::UINT = 0x0F00;
-pub const TVIS_STATEIMAGEMASK: ::UINT = 0xF000;
-pub const TVIS_USERMASK: ::UINT = 0xF000;
-pub const TVIS_EX_FLAT: ::UINT = 0x0001;
-pub const TVIS_EX_DISABLED: ::UINT = 0x0002;
-pub const TVIS_EX_ALL: ::UINT = 0x0002;
-STRUCT!{struct NMTVSTATEIMAGECHANGING {
-    hdr: ::NMHDR,
-    hti: HTREEITEM,
-    iOldStateImageIndex: ::c_int,
-    iNewStateImageIndex: ::c_int,
-}}
-pub type LPNMTVSTATEIMAGECHANGING = *mut NMTVSTATEIMAGECHANGING;
-pub const I_CHILDRENCALLBACK: ::c_int = -1;
-pub const I_CHILDRENAUTO: ::c_int = -2;
-pub type LPTV_ITEMW = LPTVITEMW;
-pub type LPTV_ITEMA = LPTVITEMA;
-pub type TV_ITEMW = TVITEMW;
-pub type TV_ITEMA = TVITEMA;
-STRUCT!{struct TVITEMA {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTVITEMA = *mut TVITEMA;
-STRUCT!{struct TVITEMW {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTVITEMW = *mut TVITEMW;
-STRUCT!{struct TVITEMEXA {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-    iIntegral: ::c_int,
-    uStateEx: ::UINT,
-    hwnd: ::HWND,
-    iExpandedImage: ::c_int,
-    iReserved: ::c_int,
-}}
-pub type LPTVITEMEXA = *mut TVITEMEXA;
-STRUCT!{struct TVITEMEXW {
-    mask: ::UINT,
-    hItem: HTREEITEM,
-    state: ::UINT,
-    stateMask: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    cChildren: ::c_int,
-    lParam: ::LPARAM,
-    iIntegral: ::c_int,
-    uStateEx: ::UINT,
-    hwnd: ::HWND,
-    iExpandedImage: ::c_int,
-    iReserved: ::c_int,
-}}
-pub type LPTVITEMEXW = *mut TVITEMEXW;
-pub const TVI_ROOT: HTREEITEM = (0 - 0x10000) as HTREEITEM;
-pub const TVI_FIRST: HTREEITEM = (0 - 0x0FFFF) as HTREEITEM;
-pub const TVI_LAST: HTREEITEM = (0 - 0x0FFFE) as HTREEITEM;
-pub const TVI_SORT: HTREEITEM = (0 - 0x0FFFD) as HTREEITEM;
-pub type LPTV_INSERTSTRUCTA = LPTVINSERTSTRUCTA;
-pub type LPTV_INSERTSTRUCTW = LPTVINSERTSTRUCTW;
-pub type TV_INSERTSTRUCTA = TVINSERTSTRUCTA;
-pub type TV_INSERTSTRUCTW = TVINSERTSTRUCTW;
-STRUCT!{struct TVINSERTSTRUCTA {
-    hParent: HTREEITEM,
-    hInsertAfter: HTREEITEM,
-    itemex: TVITEMEXA,
-}}
-UNION!(TVINSERTSTRUCTA, itemex, item, item_mut, TV_ITEMA);
-pub type LPTVINSERTSTRUCTA = *mut TVINSERTSTRUCTA;
-STRUCT!{struct TVINSERTSTRUCTW {
-    hParent: HTREEITEM,
-    hInsertAfter: HTREEITEM,
-    itemex: TVITEMEXW,
-}}
-UNION!(TVINSERTSTRUCTW, itemex, item, item_mut, TV_ITEMW);
-pub type LPTVINSERTSTRUCTW = *mut TVINSERTSTRUCTW;
-pub const TVM_INSERTITEMA: ::UINT = TV_FIRST + 0;
-pub const TVM_INSERTITEMW: ::UINT = TV_FIRST + 50;
-pub const TVM_DELETEITEM: ::UINT = TV_FIRST + 1;
-pub const TVM_EXPAND: ::UINT = TV_FIRST + 2;
-pub const TVM_GETITEMRECT: ::UINT = TV_FIRST + 4;
-pub const TVE_COLLAPSE: ::WPARAM = 0x0001;
-pub const TVE_EXPAND: ::WPARAM = 0x0002;
-pub const TVE_TOGGLE: ::WPARAM = 0x0003;
-pub const TVE_EXPANDPARTIAL: ::WPARAM = 0x4000;
-pub const TVE_COLLAPSERESET: ::WPARAM = 0x8000;
-pub const TVM_GETCOUNT: ::UINT = TV_FIRST + 5;
-pub const TVM_GETINDENT: ::UINT = TV_FIRST + 6;
-pub const TVM_SETINDENT: ::UINT = TV_FIRST + 7;
-pub const TVM_GETIMAGELIST: ::UINT = TV_FIRST + 8;
-pub const TVM_SETIMAGELIST: ::UINT = TV_FIRST + 9;
-pub const TVM_GETNEXTITEM: ::UINT = TV_FIRST + 10;
-pub const TVSIL_NORMAL: ::WPARAM = 0;
-pub const TVSIL_STATE: ::WPARAM = 2;
-pub const TVGN_ROOT: ::WPARAM = 0x0000;
-pub const TVGN_NEXT: ::WPARAM = 0x0001;
-pub const TVGN_PREVIOUS: ::WPARAM = 0x0002;
-pub const TVGN_PARENT: ::WPARAM = 0x0003;
-pub const TVGN_CHILD: ::WPARAM = 0x0004;
-pub const TVGN_FIRSTVISIBLE: ::WPARAM = 0x0005;
-pub const TVGN_NEXTVISIBLE: ::WPARAM = 0x0006;
-pub const TVGN_PREVIOUSVISIBLE: ::WPARAM = 0x0007;
-pub const TVGN_DROPHILITE: ::WPARAM = 0x0008;
-pub const TVGN_CARET: ::WPARAM = 0x0009;
-pub const TVGN_LASTVISIBLE: ::WPARAM = 0x000A;
-pub const TVGN_NEXTSELECTED: ::WPARAM = 0x000B;
-pub const TVSI_NOSINGLEEXPAND: ::WPARAM = 0x8000;
-pub const TVM_SELECTITEM: ::UINT = TV_FIRST + 11;
-pub const TVM_GETITEMA: ::UINT = TV_FIRST + 12;
-pub const TVM_GETITEMW: ::UINT = TV_FIRST + 62;
-pub const TVM_SETITEMA: ::UINT = TV_FIRST + 13;
-pub const TVM_SETITEMW: ::UINT = TV_FIRST + 63;
-pub const TVM_EDITLABELA: ::UINT = TV_FIRST + 14;
-pub const TVM_EDITLABELW: ::UINT = TV_FIRST + 65;
-pub const TVM_GETEDITCONTROL: ::UINT = TV_FIRST + 15;
-pub const TVM_GETVISIBLECOUNT: ::UINT = TV_FIRST + 16;
-pub const TVM_HITTEST: ::UINT = TV_FIRST + 17;
-pub type LPTV_HITTESTINFO = LPTVHITTESTINFO;
-pub type TV_HITTESTINFO = TVHITTESTINFO;
-STRUCT!{struct TVHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-    hItem: HTREEITEM,
-}}
-pub type LPTVHITTESTINFO = *mut TVHITTESTINFO;
-pub const TVHT_NOWHERE: ::UINT = 0x0001;
-pub const TVHT_ONITEMICON: ::UINT = 0x0002;
-pub const TVHT_ONITEMLABEL: ::UINT = 0x0004;
-pub const TVHT_ONITEM: ::UINT = TVHT_ONITEMICON | TVHT_ONITEMLABEL | TVHT_ONITEMSTATEICON;
-pub const TVHT_ONITEMINDENT: ::UINT = 0x0008;
-pub const TVHT_ONITEMBUTTON: ::UINT = 0x0010;
-pub const TVHT_ONITEMRIGHT: ::UINT = 0x0020;
-pub const TVHT_ONITEMSTATEICON: ::UINT = 0x0040;
-pub const TVHT_ABOVE: ::UINT = 0x0100;
-pub const TVHT_BELOW: ::UINT = 0x0200;
-pub const TVHT_TORIGHT: ::UINT = 0x0400;
-pub const TVHT_TOLEFT: ::UINT = 0x0800;
-pub const TVM_CREATEDRAGIMAGE: ::UINT = TV_FIRST + 18;
-pub const TVM_SORTCHILDREN: ::UINT = TV_FIRST + 19;
-pub const TVM_ENSUREVISIBLE: ::UINT = TV_FIRST + 20;
-pub const TVM_SORTCHILDRENCB: ::UINT = TV_FIRST + 21;
-pub const TVM_ENDEDITLABELNOW: ::UINT = TV_FIRST + 22;
-pub const TVM_GETISEARCHSTRINGA: ::UINT = TV_FIRST + 23;
-pub const TVM_GETISEARCHSTRINGW: ::UINT = TV_FIRST + 64;
-pub const TVM_SETTOOLTIPS: ::UINT = TV_FIRST + 24;
-pub const TVM_GETTOOLTIPS: ::UINT = TV_FIRST + 25;
-pub const TVM_SETINSERTMARK: ::UINT = TV_FIRST + 26;
-pub const TVM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TVM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TVM_SETITEMHEIGHT: ::UINT = TV_FIRST + 27;
-pub const TVM_GETITEMHEIGHT: ::UINT = TV_FIRST + 28;
-pub const TVM_SETBKCOLOR: ::UINT = TV_FIRST + 29;
-pub const TVM_SETTEXTCOLOR: ::UINT = TV_FIRST + 30;
-pub const TVM_GETBKCOLOR: ::UINT = TV_FIRST + 31;
-pub const TVM_GETTEXTCOLOR: ::UINT = TV_FIRST + 32;
-pub const TVM_SETSCROLLTIME: ::UINT = TV_FIRST + 33;
-pub const TVM_GETSCROLLTIME: ::UINT = TV_FIRST + 34;
-pub const TVM_SETINSERTMARKCOLOR: ::UINT = TV_FIRST + 37;
-pub const TVM_GETINSERTMARKCOLOR: ::UINT = TV_FIRST + 38;
-pub const TVM_SETBORDER: ::UINT = TV_FIRST + 35;
-pub const TVSBF_XBORDER: ::WPARAM = 0x00000001;
-pub const TVSBF_YBORDER: ::WPARAM = 0x00000002;
-pub const TVM_GETITEMSTATE: ::UINT = TV_FIRST + 39;
-pub const TVM_SETLINECOLOR: ::UINT = TV_FIRST + 40;
-pub const TVM_GETLINECOLOR: ::UINT = TV_FIRST + 41;
-pub const TVM_MAPACCIDTOHTREEITEM: ::UINT = TV_FIRST + 42;
-pub const TVM_MAPHTREEITEMTOACCID: ::UINT = TV_FIRST + 43;
-pub const TVM_SETEXTENDEDSTYLE: ::UINT = TV_FIRST + 44;
-pub const TVM_GETEXTENDEDSTYLE: ::UINT = TV_FIRST + 45;
-pub const TVM_SETAUTOSCROLLINFO: ::UINT = TV_FIRST + 59;
-pub const TVM_SETHOT: ::UINT = TV_FIRST + 58;
-pub const TVM_GETSELECTEDCOUNT: ::UINT = TV_FIRST + 70;
-pub const TVM_SHOWINFOTIP: ::UINT = TV_FIRST + 71;
-ENUM!{enum TVITEMPART {
-    TVGIPR_BUTTON = 0x0001,
-}}
-STRUCT!{struct TVGETITEMPARTRECTINFO {
-    hti: HTREEITEM,
-    prc: *mut ::RECT,
-    partID: TVITEMPART,
-}}
-pub const TVM_GETITEMPARTRECT: ::UINT = TV_FIRST + 72;
-pub type PFNTVCOMPARE = Option<unsafe extern "system" fn(
-    lParam1: ::LPARAM, lParam2: ::LPARAM, lParamSort: ::LPARAM,
-) -> ::c_int>;
-pub type LPTV_SORTCB = LPTVSORTCB;
-pub type TV_SORTCB = TVSORTCB;
-STRUCT!{nodebug struct TVSORTCB {
-    hParent: HTREEITEM,
-    lpfnCompare: PFNTVCOMPARE,
-    lParam: ::LPARAM,
-}}
-pub type LPTVSORTCB = *mut TVSORTCB;
-pub type LPNM_TREEVIEWA = LPNMTREEVIEWA;
-pub type LPNM_TREEVIEWW = LPNMTREEVIEWW;
-pub type NM_TREEVIEWA = NMTREEVIEWA;
-pub type NM_TREEVIEWW = NMTREEVIEWW;
-STRUCT!{struct NMTREEVIEWA {
-    hdr: ::NMHDR,
-    action: ::UINT,
-    itemOld: TVITEMA,
-    itemNew: TVITEMA,
-    ptDrag: ::POINT,
-}}
-pub type LPNMTREEVIEWA = *mut NMTREEVIEWA;
-STRUCT!{struct NMTREEVIEWW {
-    hdr: ::NMHDR,
-    action: ::UINT,
-    itemOld: TVITEMW,
-    itemNew: TVITEMW,
-    ptDrag: ::POINT,
-}}
-pub type LPNMTREEVIEWW = *mut NMTREEVIEWW;
-pub const TVN_SELCHANGINGA: ::UINT = TVN_FIRST - 1;
-pub const TVN_SELCHANGINGW: ::UINT = TVN_FIRST - 50;
-pub const TVN_SELCHANGEDA: ::UINT = TVN_FIRST - 2;
-pub const TVN_SELCHANGEDW: ::UINT = TVN_FIRST - 51;
-pub const TVN_GETDISPINFOA: ::UINT = TVN_FIRST - 3;
-pub const TVN_GETDISPINFOW: ::UINT = TVN_FIRST - 52;
-pub const TVN_SETDISPINFOA: ::UINT = TVN_FIRST - 4;
-pub const TVN_SETDISPINFOW: ::UINT = TVN_FIRST - 53;
-pub const TVC_UNKNOWN: ::LPARAM = 0x0000;
-pub const TVC_BYMOUSE: ::LPARAM = 0x0001;
-pub const TVC_BYKEYBOARD: ::LPARAM = 0x0002;
-pub const TVIF_DI_SETITEM: ::UINT = 0x1000;
-pub type TV_DISPINFOA = NMTVDISPINFOA;
-pub type TV_DISPINFOW = NMTVDISPINFOW;
-STRUCT!{struct NMTVDISPINFOA {
-    hdr: ::NMHDR,
-    item: TVITEMA,
-}}
-pub type LPNMTVDISPINFOA = *mut NMTVDISPINFOA;
-STRUCT!{struct NMTVDISPINFOW {
-    hdr: ::NMHDR,
-    item: TVITEMW,
-}}
-pub type LPNMTVDISPINFOW = *mut NMTVDISPINFOW;
-STRUCT!{struct NMTVDISPINFOEXA {
-    hdr: ::NMHDR,
-    item: TVITEMEXA,
-}}
-pub type LPNMTVDISPINFOEXA = *mut NMTVDISPINFOEXA;
-STRUCT!{struct NMTVDISPINFOEXW {
-    hdr: ::NMHDR,
-    item: TVITEMEXW,
-}}
-pub type LPNMTVDISPINFOEXW = *mut NMTVDISPINFOEXW;
-pub type TV_DISPINFOEXA = NMTVDISPINFOEXA;
-pub type TV_DISPINFOEXW = NMTVDISPINFOEXW;
-pub const TVN_ITEMEXPANDINGA: ::UINT = TVN_FIRST - 5;
-pub const TVN_ITEMEXPANDINGW: ::UINT = TVN_FIRST - 54;
-pub const TVN_ITEMEXPANDEDA: ::UINT = TVN_FIRST - 6;
-pub const TVN_ITEMEXPANDEDW: ::UINT = TVN_FIRST - 55;
-pub const TVN_BEGINDRAGA: ::UINT = TVN_FIRST - 7;
-pub const TVN_BEGINDRAGW: ::UINT = TVN_FIRST - 56;
-pub const TVN_BEGINRDRAGA: ::UINT = TVN_FIRST - 8;
-pub const TVN_BEGINRDRAGW: ::UINT = TVN_FIRST - 57;
-pub const TVN_DELETEITEMA: ::UINT = TVN_FIRST - 9;
-pub const TVN_DELETEITEMW: ::UINT = TVN_FIRST - 58;
-pub const TVN_BEGINLABELEDITA: ::UINT = TVN_FIRST - 10;
-pub const TVN_BEGINLABELEDITW: ::UINT = TVN_FIRST - 59;
-pub const TVN_ENDLABELEDITA: ::UINT = TVN_FIRST - 11;
-pub const TVN_ENDLABELEDITW: ::UINT = TVN_FIRST - 60;
-pub const TVN_KEYDOWN: ::UINT = TVN_FIRST - 12;
-pub const TVN_GETINFOTIPA: ::UINT = TVN_FIRST - 13;
-pub const TVN_GETINFOTIPW: ::UINT = TVN_FIRST - 14;
-pub const TVN_SINGLEEXPAND: ::UINT = TVN_FIRST - 15;
-pub const TVN_ITEMCHANGINGA: ::UINT = TVN_FIRST - 16;
-pub const TVN_ITEMCHANGINGW: ::UINT = TVN_FIRST - 17;
-pub const TVN_ITEMCHANGEDA: ::UINT = TVN_FIRST - 18;
-pub const TVN_ITEMCHANGEDW: ::UINT = TVN_FIRST - 19;
-pub const TVN_ASYNCDRAW: ::UINT = TVN_FIRST - 20;
-pub const TVNRET_DEFAULT: ::LRESULT = 0;
-pub const TVNRET_SKIPOLD: ::LRESULT = 1;
-pub const TVNRET_SKIPNEW: ::LRESULT = 2;
-pub type TV_KEYDOWN = NMTVKEYDOWN;
-STRUCT!{struct NMTVKEYDOWN {
-    hdr: ::NMHDR,
-    wVKey: ::WORD,
-    flags: ::UINT,
-}}
-pub type LPNMTVKEYDOWN = *mut NMTVKEYDOWN;
-STRUCT!{struct NMTVCUSTOMDRAW {
-    nmcd: NMCUSTOMDRAW,
-    clrText: ::COLORREF,
-    clrTextBk: ::COLORREF,
-    iLevel: ::c_int,
-}}
-pub type LPNMTVCUSTOMDRAW = *mut NMTVCUSTOMDRAW;
-STRUCT!{struct NMTVGETINFOTIPA {
-    hdr: ::NMHDR,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    hItem: HTREEITEM,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTVGETINFOTIPA = *mut NMTVGETINFOTIPA;
-STRUCT!{struct NMTVGETINFOTIPW {
-    hdr: ::NMHDR,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    hItem: HTREEITEM,
-    lParam: ::LPARAM,
-}}
-pub type LPNMTVGETINFOTIPW = *mut NMTVGETINFOTIPW;
-pub const TVCDRF_NOIMAGES: ::LRESULT = 0x00010000;
-STRUCT!{struct NMTVITEMCHANGE {
-    hdr: ::NMHDR,
-    uChanged: ::UINT,
-    hItem: HTREEITEM,
-    uStateNew: ::UINT,
-    uStateOld: ::UINT,
-    lParam: ::LPARAM,
-}}
-STRUCT!{struct NMTVASYNCDRAW {
-    hdr: ::NMHDR,
-    pimldp: *mut IMAGELISTDRAWPARAMS,
-    hr: ::HRESULT,
-    hItem: HTREEITEM,
-    lParam: ::LPARAM,
-    dwRetFlags: ::DWORD,
-    iRetImageIndex: ::c_int,
-}}
-pub const CBEIF_TEXT: ::UINT = 0x00000001;
-pub const CBEIF_IMAGE: ::UINT = 0x00000002;
-pub const CBEIF_SELECTEDIMAGE: ::UINT = 0x00000004;
-pub const CBEIF_OVERLAY: ::UINT = 0x00000008;
-pub const CBEIF_INDENT: ::UINT = 0x00000010;
-pub const CBEIF_LPARAM: ::UINT = 0x00000020;
-pub const CBEIF_DI_SETITEM: ::UINT = 0x10000000;
-STRUCT!{struct COMBOBOXEXITEMA {
-    mask: ::UINT,
-    iItem: ::INT_PTR,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    iOverlay: ::c_int,
-    iIndent: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type PCOMBOBOXEXITEMA = *mut COMBOBOXEXITEMA;
-pub type PCCOMBOBOXEXITEMA = *const COMBOBOXEXITEMA;
-STRUCT!{struct COMBOBOXEXITEMW {
-    mask: ::UINT,
-    iItem: ::INT_PTR,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    iSelectedImage: ::c_int,
-    iOverlay: ::c_int,
-    iIndent: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type PCOMBOBOXEXITEMW = *mut COMBOBOXEXITEMW;
-pub type PCCOMBOBOXEXITEMW = *const COMBOBOXEXITEMW;
-pub const CBEM_INSERTITEMA: ::UINT = ::WM_USER + 1;
-pub const CBEM_SETIMAGELIST: ::UINT = ::WM_USER + 2;
-pub const CBEM_GETIMAGELIST: ::UINT = ::WM_USER + 3;
-pub const CBEM_GETITEMA: ::UINT = ::WM_USER + 4;
-pub const CBEM_SETITEMA: ::UINT = ::WM_USER + 5;
-pub const CBEM_DELETEITEM: ::UINT = ::CB_DELETESTRING;
-pub const CBEM_GETCOMBOCONTROL: ::UINT = ::WM_USER + 6;
-pub const CBEM_GETEDITCONTROL: ::UINT = ::WM_USER + 7;
-pub const CBEM_SETEXSTYLE: ::UINT = ::WM_USER + 8;
-pub const CBEM_SETEXTENDEDSTYLE: ::UINT = ::WM_USER + 14;
-pub const CBEM_GETEXSTYLE: ::UINT = ::WM_USER + 9;
-pub const CBEM_GETEXTENDEDSTYLE: ::UINT = ::WM_USER + 9;
-pub const CBEM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const CBEM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const CBEM_HASEDITCHANGED: ::UINT = ::WM_USER + 10;
-pub const CBEM_INSERTITEMW: ::UINT = ::WM_USER + 11;
-pub const CBEM_SETITEMW: ::UINT = ::WM_USER + 12;
-pub const CBEM_GETITEMW: ::UINT = ::WM_USER + 13;
-pub const CBEM_SETWINDOWTHEME: ::UINT = CCM_SETWINDOWTHEME;
-pub const CBES_EX_NOEDITIMAGE: ::DWORD = 0x00000001;
-pub const CBES_EX_NOEDITIMAGEINDENT: ::DWORD = 0x00000002;
-pub const CBES_EX_PATHWORDBREAKPROC: ::DWORD = 0x00000004;
-pub const CBES_EX_NOSIZELIMIT: ::DWORD = 0x00000008;
-pub const CBES_EX_CASESENSITIVE: ::DWORD = 0x00000010;
-pub const CBES_EX_TEXTENDELLIPSIS: ::DWORD = 0x00000020;
-STRUCT!{struct NMCOMBOBOXEXA {
-    hdr: ::NMHDR,
-    ceItem: COMBOBOXEXITEMA,
-}}
-pub type PNMCOMBOBOXEXA = *mut NMCOMBOBOXEXA;
-STRUCT!{struct NMCOMBOBOXEXW {
-    hdr: ::NMHDR,
-    ceItem: COMBOBOXEXITEMW,
-}}
-pub type PNMCOMBOBOXEXW = *mut NMCOMBOBOXEXW;
-pub const CBEN_GETDISPINFOA: ::UINT = CBEN_FIRST - 0;
-pub const CBEN_INSERTITEM: ::UINT = CBEN_FIRST - 1;
-pub const CBEN_DELETEITEM: ::UINT = CBEN_FIRST - 2;
-pub const CBEN_BEGINEDIT: ::UINT = CBEN_FIRST - 4;
-pub const CBEN_ENDEDITA: ::UINT = CBEN_FIRST - 5;
-pub const CBEN_ENDEDITW: ::UINT = CBEN_FIRST - 6;
-pub const CBEN_GETDISPINFOW: ::UINT = CBEN_FIRST - 7;
-pub const CBEN_DRAGBEGINA: ::UINT = CBEN_FIRST - 8;
-pub const CBEN_DRAGBEGINW: ::UINT = CBEN_FIRST - 9;
-pub const CBENF_KILLFOCUS: ::c_int = 1;
-pub const CBENF_RETURN: ::c_int = 2;
-pub const CBENF_ESCAPE: ::c_int = 3;
-pub const CBENF_DROPDOWN: ::c_int = 4;
-pub const CBEMAXSTRLEN: usize = 260;
-STRUCT!{nodebug struct NMCBEDRAGBEGINW {
-    hdr: ::NMHDR,
-    iItemid: ::c_int,
-    szText: [::WCHAR; CBEMAXSTRLEN],
-}}
-pub type PNMCBEDRAGBEGINW = *mut NMCBEDRAGBEGINW;
-pub type LPNMCBEDRAGBEGINW = *mut NMCBEDRAGBEGINW;
-STRUCT!{nodebug struct NMCBEDRAGBEGINA {
-    hdr: ::NMHDR,
-    iItemid: ::c_int,
-    szText: [::c_char; CBEMAXSTRLEN],
-}}
-pub type PNMCBEDRAGBEGINA = *mut NMCBEDRAGBEGINA;
-pub type LPNMCBEDRAGBEGINA = *mut NMCBEDRAGBEGINA;
-STRUCT!{nodebug struct NMCBEENDEDITW {
-    hdr: ::NMHDR,
-    fChanged: ::BOOL,
-    iNewSelection: ::c_int,
-    szText: [::WCHAR; CBEMAXSTRLEN],
-    iWhy: ::c_int,
-}}
-pub type PNMCBEENDEDITW = *mut NMCBEENDEDITW;
-pub type LPNMCBEENDEDITW = *mut NMCBEENDEDITW;
-STRUCT!{nodebug struct NMCBEENDEDITA {
-    hdr: ::NMHDR,
-    fChanged: ::BOOL,
-    iNewSelection: ::c_int,
-    szText: [::c_char; CBEMAXSTRLEN],
-    iWhy: ::c_int,
-}}
-pub type PNMCBEENDEDITA = *mut NMCBEENDEDITA;
-pub type LPNMCBEENDEDITA = *mut NMCBEENDEDITA;
-pub const TCS_SCROLLOPPOSITE: ::DWORD = 0x0001;
-pub const TCS_BOTTOM: ::DWORD = 0x0002;
-pub const TCS_RIGHT: ::DWORD = 0x0002;
-pub const TCS_MULTISELECT: ::DWORD = 0x0004;
-pub const TCS_FLATBUTTONS: ::DWORD = 0x0008;
-pub const TCS_FORCEICONLEFT: ::DWORD = 0x0010;
-pub const TCS_FORCELABELLEFT: ::DWORD = 0x0020;
-pub const TCS_HOTTRACK: ::DWORD = 0x0040;
-pub const TCS_VERTICAL: ::DWORD = 0x0080;
-pub const TCS_TABS: ::DWORD = 0x0000;
-pub const TCS_BUTTONS: ::DWORD = 0x0100;
-pub const TCS_SINGLELINE: ::DWORD = 0x0000;
-pub const TCS_MULTILINE: ::DWORD = 0x0200;
-pub const TCS_RIGHTJUSTIFY: ::DWORD = 0x0000;
-pub const TCS_FIXEDWIDTH: ::DWORD = 0x0400;
-pub const TCS_RAGGEDRIGHT: ::DWORD = 0x0800;
-pub const TCS_FOCUSONBUTTONDOWN: ::DWORD = 0x1000;
-pub const TCS_OWNERDRAWFIXED: ::DWORD = 0x2000;
-pub const TCS_TOOLTIPS: ::DWORD = 0x4000;
-pub const TCS_FOCUSNEVER: ::DWORD = 0x8000;
-pub const TCS_EX_FLATSEPARATORS: ::DWORD = 0x00000001;
-pub const TCS_EX_REGISTERDROP: ::DWORD = 0x00000002;
-pub const TCM_GETIMAGELIST: ::UINT = TCM_FIRST + 2;
-pub const TCM_SETIMAGELIST: ::UINT = TCM_FIRST + 3;
-pub const TCM_GETITEMCOUNT: ::UINT = TCM_FIRST + 4;
-pub const TCIF_TEXT: ::UINT = 0x0001;
-pub const TCIF_IMAGE: ::UINT = 0x0002;
-pub const TCIF_RTLREADING: ::UINT = 0x0004;
-pub const TCIF_PARAM: ::UINT = 0x0008;
-pub const TCIF_STATE: ::UINT = 0x0010;
-pub const TCIS_BUTTONPRESSED: ::DWORD = 0x0001;
-pub const TCIS_HIGHLIGHTED: ::DWORD = 0x0002;
-pub type TC_ITEMHEADERA = TCITEMHEADERA;
-pub type TC_ITEMHEADERW = TCITEMHEADERW;
-STRUCT!{struct TCITEMHEADERA {
-    mask: ::UINT,
-    lpReserved1: ::UINT,
-    lpReserved2: ::UINT,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-}}
-pub type LPTCITEMHEADERA = *mut TCITEMHEADERA;
-STRUCT!{struct TCITEMHEADERW {
-    mask: ::UINT,
-    lpReserved1: ::UINT,
-    lpReserved2: ::UINT,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-}}
-pub type LPTCITEMHEADERW = *mut TCITEMHEADERW;
-pub type TC_ITEMA = TCITEMA;
-pub type TC_ITEMW = TCITEMW;
-STRUCT!{struct TCITEMA {
-    mask: ::UINT,
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    pszText: ::LPSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTCITEMA = *mut TCITEMA;
-STRUCT!{struct TCITEMW {
-    mask: ::UINT,
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    pszText: ::LPWSTR,
-    cchTextMax: ::c_int,
-    iImage: ::c_int,
-    lParam: ::LPARAM,
-}}
-pub type LPTCITEMW = *mut TCITEMW;
-pub const TCM_GETITEMA: ::UINT = TCM_FIRST + 5;
-pub const TCM_GETITEMW: ::UINT = TCM_FIRST + 60;
-pub const TCM_SETITEMA: ::UINT = TCM_FIRST + 6;
-pub const TCM_SETITEMW: ::UINT = TCM_FIRST + 61;
-pub const TCM_INSERTITEMA: ::UINT = TCM_FIRST + 7;
-pub const TCM_INSERTITEMW: ::UINT = TCM_FIRST + 62;
-pub const TCM_DELETEITEM: ::UINT = TCM_FIRST + 8;
-pub const TCM_DELETEALLITEMS: ::UINT = TCM_FIRST + 9;
-pub const TCM_GETITEMRECT: ::UINT = TCM_FIRST + 10;
-pub const TCM_GETCURSEL: ::UINT = TCM_FIRST + 11;
-pub const TCM_SETCURSEL: ::UINT = TCM_FIRST + 12;
-pub const TCHT_NOWHERE: ::UINT = 0x0001;
-pub const TCHT_ONITEMICON: ::UINT = 0x0002;
-pub const TCHT_ONITEMLABEL: ::UINT = 0x0004;
-pub const TCHT_ONITEM: ::UINT = TCHT_ONITEMICON | TCHT_ONITEMLABEL;
-pub type LPTC_HITTESTINFO = LPTCHITTESTINFO;
-pub type TC_HITTESTINFO = TCHITTESTINFO;
-STRUCT!{struct TCHITTESTINFO {
-    pt: ::POINT,
-    flags: ::UINT,
-}}
-pub type LPTCHITTESTINFO = *mut TCHITTESTINFO;
-pub const TCM_HITTEST: ::UINT = TCM_FIRST + 13;
-pub const TCM_SETITEMEXTRA: ::UINT = TCM_FIRST + 14;
-pub const TCM_ADJUSTRECT: ::UINT = TCM_FIRST + 40;
-pub const TCM_SETITEMSIZE: ::UINT = TCM_FIRST + 41;
-pub const TCM_REMOVEIMAGE: ::UINT = TCM_FIRST + 42;
-pub const TCM_SETPADDING: ::UINT = TCM_FIRST + 43;
-pub const TCM_GETROWCOUNT: ::UINT = TCM_FIRST + 44;
-pub const TCM_GETTOOLTIPS: ::UINT = TCM_FIRST + 45;
-pub const TCM_SETTOOLTIPS: ::UINT = TCM_FIRST + 46;
-pub const TCM_GETCURFOCUS: ::UINT = TCM_FIRST + 47;
-pub const TCM_SETCURFOCUS: ::UINT = TCM_FIRST + 48;
-pub const TCM_SETMINTABWIDTH: ::UINT = TCM_FIRST + 49;
-pub const TCM_DESELECTALL: ::UINT = TCM_FIRST + 50;
-pub const TCM_HIGHLIGHTITEM: ::UINT = TCM_FIRST + 51;
-pub const TCM_SETEXTENDEDSTYLE: ::UINT = TCM_FIRST + 52;
-pub const TCM_GETEXTENDEDSTYLE: ::UINT = TCM_FIRST + 53;
-pub const TCM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const TCM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const TCN_KEYDOWN: ::UINT = TCN_FIRST - 0;
-pub type TC_KEYDOWN = NMTCKEYDOWN;
-STRUCT!{struct NMTCKEYDOWN {
-    hdr: ::NMHDR,
-    wVKey: ::WORD,
-    flags: ::UINT,
-}}
-pub const TCN_SELCHANGE: ::UINT = TCN_FIRST - 1;
-pub const TCN_SELCHANGING: ::UINT = TCN_FIRST - 2;
-pub const TCN_GETOBJECT: ::UINT = TCN_FIRST - 3;
-pub const TCN_FOCUSCHANGE: ::UINT = TCN_FIRST - 4;
-pub const ACS_CENTER: ::DWORD = 0x0001;
-pub const ACS_TRANSPARENT: ::DWORD = 0x0002;
-pub const ACS_AUTOPLAY: ::DWORD = 0x0004;
-pub const ACS_TIMER: ::DWORD = 0x0008;
-pub const ACM_OPENA: ::UINT = ::WM_USER + 100;
-pub const ACM_OPENW: ::UINT = ::WM_USER + 103;
-pub const ACM_PLAY: ::UINT = ::WM_USER + 101;
-pub const ACM_STOP: ::UINT = ::WM_USER + 102;
-pub const ACM_ISPLAYING: ::UINT = ::WM_USER + 104;
-pub const ACN_START: ::WPARAM = 1;
-pub const ACN_STOP: ::WPARAM = 2;
-pub type MONTHDAYSTATE = ::DWORD;
-pub type LPMONTHDAYSTATE = *mut ::DWORD;
-pub const MCM_FIRST: ::UINT = 0x1000;
-pub const MCM_GETCURSEL: ::UINT = MCM_FIRST + 1;
-pub const MCM_SETCURSEL: ::UINT = MCM_FIRST + 2;
-pub const MCM_GETMAXSELCOUNT: ::UINT = MCM_FIRST + 3;
-pub const MCM_SETMAXSELCOUNT: ::UINT = MCM_FIRST + 4;
-pub const MCM_GETSELRANGE: ::UINT = MCM_FIRST + 5;
-pub const MCM_SETSELRANGE: ::UINT = MCM_FIRST + 6;
-pub const MCM_GETMONTHRANGE: ::UINT = MCM_FIRST + 7;
-pub const MCM_SETDAYSTATE: ::UINT = MCM_FIRST + 8;
-pub const MCM_GETMINREQRECT: ::UINT = MCM_FIRST + 9;
-pub const MCM_SETCOLOR: ::UINT = MCM_FIRST + 10;
-pub const MCM_GETCOLOR: ::UINT = MCM_FIRST + 11;
-pub const MCM_SETTODAY: ::UINT = MCM_FIRST + 12;
-pub const MCM_GETTODAY: ::UINT = MCM_FIRST + 13;
-pub const MCM_HITTEST: ::UINT = MCM_FIRST + 14;
-pub const MCSC_BACKGROUND: ::WPARAM = 0;
-pub const MCSC_TEXT: ::WPARAM = 1;
-pub const MCSC_TITLEBK: ::WPARAM = 2;
-pub const MCSC_TITLETEXT: ::WPARAM = 3;
-pub const MCSC_MONTHBK: ::WPARAM = 4;
-pub const MCSC_TRAILINGTEXT: ::WPARAM = 5;
-STRUCT!{struct MCHITTESTINFO {
-    cbSize: ::UINT,
-    pt: ::POINT,
-    uHit: ::UINT,
-    st: ::SYSTEMTIME,
-    rc: ::RECT,
-    iOffset: ::c_int,
-    iRow: ::c_int,
-    iCol: ::c_int,
-}}
-pub type PMCHITTESTINFO = *mut MCHITTESTINFO;
-pub const MCHT_TITLE: ::UINT = 0x00010000;
-pub const MCHT_CALENDAR: ::UINT = 0x00020000;
-pub const MCHT_TODAYLINK: ::UINT = 0x00030000;
-pub const MCHT_CALENDARCONTROL: ::UINT = 0x00100000;
-pub const MCHT_NEXT: ::UINT = 0x01000000;
-pub const MCHT_PREV: ::UINT = 0x02000000;
-pub const MCHT_NOWHERE: ::UINT = 0x00000000;
-pub const MCHT_TITLEBK: ::UINT = MCHT_TITLE;
-pub const MCHT_TITLEMONTH: ::UINT = MCHT_TITLE | 0x0001;
-pub const MCHT_TITLEYEAR: ::UINT = MCHT_TITLE | 0x0002;
-pub const MCHT_TITLEBTNNEXT: ::UINT = MCHT_TITLE | MCHT_NEXT | 0x0003;
-pub const MCHT_TITLEBTNPREV: ::UINT = MCHT_TITLE | MCHT_PREV | 0x0003;
-pub const MCHT_CALENDARBK: ::UINT = MCHT_CALENDAR;
-pub const MCHT_CALENDARDATE: ::UINT = MCHT_CALENDAR | 0x0001;
-pub const MCHT_CALENDARDATENEXT: ::UINT = MCHT_CALENDARDATE | MCHT_NEXT;
-pub const MCHT_CALENDARDATEPREV: ::UINT = MCHT_CALENDARDATE | MCHT_PREV;
-pub const MCHT_CALENDARDAY: ::UINT = MCHT_CALENDAR | 0x0002;
-pub const MCHT_CALENDARWEEKNUM: ::UINT = MCHT_CALENDAR | 0x0003;
-pub const MCHT_CALENDARDATEMIN: ::UINT = MCHT_CALENDAR | 0x0004;
-pub const MCHT_CALENDARDATEMAX: ::UINT = MCHT_CALENDAR | 0x0005;
-pub const MCM_SETFIRSTDAYOFWEEK: ::UINT = MCM_FIRST + 15;
-pub const MCM_GETFIRSTDAYOFWEEK: ::UINT = MCM_FIRST + 16;
-pub const MCM_GETRANGE: ::UINT = MCM_FIRST + 17;
-pub const MCM_SETRANGE: ::UINT = MCM_FIRST + 18;
-pub const MCM_GETMONTHDELTA: ::UINT = MCM_FIRST + 19;
-pub const MCM_SETMONTHDELTA: ::UINT = MCM_FIRST + 20;
-pub const MCM_GETMAXTODAYWIDTH: ::UINT = MCM_FIRST + 21;
-pub const MCM_SETUNICODEFORMAT: ::UINT = CCM_SETUNICODEFORMAT;
-pub const MCM_GETUNICODEFORMAT: ::UINT = CCM_GETUNICODEFORMAT;
-pub const MCM_GETCURRENTVIEW: ::UINT = MCM_FIRST + 22;
-pub const MCM_GETCALENDARCOUNT: ::UINT = MCM_FIRST + 23;
-pub const MCMV_MONTH: ::DWORD = 0;
-pub const MCMV_YEAR: ::DWORD = 1;
-pub const MCMV_DECADE: ::DWORD = 2;
-pub const MCMV_CENTURY: ::DWORD = 3;
-pub const MCMV_MAX: ::DWORD = MCMV_CENTURY;
-pub const MCGIP_CALENDARCONTROL: ::DWORD = 0;
-pub const MCGIP_NEXT: ::DWORD = 1;
-pub const MCGIP_PREV: ::DWORD = 2;
-pub const MCGIP_FOOTER: ::DWORD = 3;
-pub const MCGIP_CALENDAR: ::DWORD = 4;
-pub const MCGIP_CALENDARHEADER: ::DWORD = 5;
-pub const MCGIP_CALENDARBODY: ::DWORD = 6;
-pub const MCGIP_CALENDARROW: ::DWORD = 7;
-pub const MCGIP_CALENDARCELL: ::DWORD = 8;
-pub const MCGIF_DATE: ::DWORD = 0x00000001;
-pub const MCGIF_RECT: ::DWORD = 0x00000002;
-pub const MCGIF_NAME: ::DWORD = 0x00000004;
-STRUCT!{struct MCGRIDINFO {
-    cbSize: ::UINT,
-    dwPart: ::DWORD,
-    dwFlags: ::DWORD,
-    iCalendar: ::c_int,
-    iRow: ::c_int,
-    iCol: ::c_int,
-    bSelected: ::BOOL,
-    stStart: ::SYSTEMTIME,
-    stEnd: ::SYSTEMTIME,
-    rc: ::RECT,
-    pszName: ::PWSTR,
-    cchName: ::size_t,
-}}
-pub type PMCGRIDINFO = *mut MCGRIDINFO;
-pub const MCM_GETCALENDARGRIDINFO: ::UINT = MCM_FIRST + 24;
-pub const MCM_GETCALID: ::UINT = MCM_FIRST + 27;
-pub const MCM_SETCALID: ::UINT = MCM_FIRST + 28;
-pub const MCM_SIZERECTTOMIN: ::UINT = MCM_FIRST + 29;
-pub const MCM_SETCALENDARBORDER: ::UINT = MCM_FIRST + 30;
-pub const MCM_GETCALENDARBORDER: ::UINT = MCM_FIRST + 31;
-pub const MCM_SETCURRENTVIEW: ::UINT = MCM_FIRST + 32;
-STRUCT!{struct NMSELCHANGE {
-    nmhdr: ::NMHDR,
-    stSelStart: ::SYSTEMTIME,
-    stSelEnd: ::SYSTEMTIME,
-}}
-pub type LPNMSELCHANGE = *mut NMSELCHANGE;
-pub const MCN_SELCHANGE: ::UINT = MCN_FIRST - 3;
-STRUCT!{struct NMDAYSTATE {
-    nmhdr: ::NMHDR,
-    stStart: ::SYSTEMTIME,
-    cDayState: ::c_int,
-    prgDayState: LPMONTHDAYSTATE,
-}}
-pub type LPNMDAYSTATE = *mut NMDAYSTATE;
-pub const MCN_GETDAYSTATE: ::UINT = MCN_FIRST - 1;
-pub type NMSELECT = NMSELCHANGE;
-pub type LPNMSELECT = *mut NMSELCHANGE;
-pub const MCN_SELECT: ::UINT = MCN_FIRST;
-STRUCT!{struct NMVIEWCHANGE {
-    nmhdr: ::NMHDR,
-    dwOldView: ::DWORD,
-    dwNewView: ::DWORD,
-}}
-pub type LPNMVIEWCHANGE = *mut NMVIEWCHANGE;
-pub const MCN_VIEWCHANGE: ::UINT = MCN_FIRST - 4;
-pub const MCS_DAYSTATE: ::DWORD = 0x0001;
-pub const MCS_MULTISELECT: ::DWORD = 0x0002;
-pub const MCS_WEEKNUMBERS: ::DWORD = 0x0004;
-pub const MCS_NOTODAYCIRCLE: ::DWORD = 0x0008;
-pub const MCS_NOTODAY: ::DWORD = 0x0010;
-pub const MCS_NOTRAILINGDATES: ::DWORD = 0x0040;
-pub const MCS_SHORTDAYSOFWEEK: ::DWORD = 0x0080;
-pub const MCS_NOSELCHANGEONNAV: ::DWORD = 0x0100;
-pub const GMR_VISIBLE: ::DWORD = 0;
-pub const GMR_DAYSTATE: ::DWORD = 1;
-STRUCT!{struct DATETIMEPICKERINFO {
-    cbSize: ::UINT,
-    rcCheck: ::RECT,
-    stateCheck: ::DWORD,
-    rcButton: ::RECT,
-    stateButton: ::DWORD,
-    hwndEdit: ::HWND,
-    hwndUD: ::HWND,
-    hwndDropDown: ::HWND,
-}}
-pub type LPDATETIMEPICKERINFO = *mut DATETIMEPICKERINFO;
-pub const DTM_FIRST: ::UINT = 0x1000;
-pub const DTM_GETSYSTEMTIME: ::UINT = DTM_FIRST + 1;
-pub const DTM_SETSYSTEMTIME: ::UINT = DTM_FIRST + 2;
-pub const DTM_GETRANGE: ::UINT = DTM_FIRST + 3;
-pub const DTM_SETRANGE: ::UINT = DTM_FIRST + 4;
-pub const DTM_SETFORMATA: ::UINT = DTM_FIRST + 5;
-pub const DTM_SETFORMATW: ::UINT = DTM_FIRST + 50;
-pub const DTM_SETMCCOLOR: ::UINT = DTM_FIRST + 6;
-pub const DTM_GETMCCOLOR: ::UINT = DTM_FIRST + 7;
-pub const DTM_GETMONTHCAL: ::UINT = DTM_FIRST + 8;
-pub const DTM_SETMCFONT: ::UINT = DTM_FIRST + 9;
-pub const DTM_GETMCFONT: ::UINT = DTM_FIRST + 10;
-pub const DTM_SETMCSTYLE: ::UINT = DTM_FIRST + 11;
-pub const DTM_GETMCSTYLE: ::UINT = DTM_FIRST + 12;
-pub const DTM_CLOSEMONTHCAL: ::UINT = DTM_FIRST + 13;
-pub const DTM_GETDATETIMEPICKERINFO: ::UINT = DTM_FIRST + 14;
-pub const DTM_GETIDEALSIZE: ::UINT = DTM_FIRST + 15;
-pub const DTS_UPDOWN: ::DWORD = 0x0001;
-pub const DTS_SHOWNONE: ::DWORD = 0x0002;
-pub const DTS_SHORTDATEFORMAT: ::DWORD = 0x0000;
-pub const DTS_LONGDATEFORMAT: ::DWORD = 0x0004;
-pub const DTS_SHORTDATECENTURYFORMAT: ::DWORD = 0x000C;
-pub const DTS_TIMEFORMAT: ::DWORD = 0x0009;
-pub const DTS_APPCANPARSE: ::DWORD = 0x0010;
-pub const DTS_RIGHTALIGN: ::DWORD = 0x0020;
-pub const DTN_DATETIMECHANGE: ::UINT = DTN_FIRST2 - 6;
-STRUCT!{struct NMDATETIMECHANGE {
-    nmhdr: ::NMHDR,
-    dwFlags: ::DWORD,
-    st: ::SYSTEMTIME,
-}}
-pub type LPNMDATETIMECHANGE = *mut NMDATETIMECHANGE;
-pub const DTN_USERSTRINGA: ::UINT = DTN_FIRST2 - 5;
-pub const DTN_USERSTRINGW: ::UINT = DTN_FIRST - 5;
-STRUCT!{struct NMDATETIMESTRINGA {
-    nmhdr: ::NMHDR,
-    pszUserString: ::LPCSTR,
-    st: ::SYSTEMTIME,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMDATETIMESTRINGA = *mut NMDATETIMESTRINGA;
-STRUCT!{struct NMDATETIMESTRINGW {
-    nmhdr: ::NMHDR,
-    pszUserString: ::LPCWSTR,
-    st: ::SYSTEMTIME,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMDATETIMESTRINGW = *mut NMDATETIMESTRINGW;
-pub const DTN_WMKEYDOWNA: ::UINT = DTN_FIRST2 - 4;
-pub const DTN_WMKEYDOWNW: ::UINT = DTN_FIRST - 4;
-STRUCT!{struct NMDATETIMEWMKEYDOWNA {
-    nmhdr: ::NMHDR,
-    nVirtKey: ::c_int,
-    pszFormat: ::LPCSTR,
-    st: ::SYSTEMTIME,
-}}
-pub type LPNMDATETIMEWMKEYDOWNA = *mut NMDATETIMEWMKEYDOWNA;
-STRUCT!{struct NMDATETIMEWMKEYDOWNW {
-    nmhdr: ::NMHDR,
-    nVirtKey: ::c_int,
-    pszFormat: ::LPCWSTR,
-    st: ::SYSTEMTIME,
-}}
-pub type LPNMDATETIMEWMKEYDOWNW = *mut NMDATETIMEWMKEYDOWNW;
-pub const DTN_FORMATA: ::UINT = DTN_FIRST2 - 3;
-pub const DTN_FORMATW: ::UINT = DTN_FIRST - 3;
-STRUCT!{nodebug struct NMDATETIMEFORMATA {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCSTR,
-    st: ::SYSTEMTIME,
-    pszDisplay: ::LPCSTR,
-    szDisplay: [::CHAR; 64],
-}}
-pub type LPNMDATETIMEFORMATA = *mut NMDATETIMEFORMATA;
-STRUCT!{nodebug struct NMDATETIMEFORMATW {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCWSTR,
-    st: ::SYSTEMTIME,
-    pszDisplay: ::LPCWSTR,
-    szDisplay: [::WCHAR; 64],
-}}
-pub type LPNMDATETIMEFORMATW = *mut NMDATETIMEFORMATW;
-pub const DTN_FORMATQUERYA: ::UINT = DTN_FIRST2 - 2;
-pub const DTN_FORMATQUERYW: ::UINT = DTN_FIRST - 2;
-STRUCT!{struct NMDATETIMEFORMATQUERYA {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCSTR,
-    szMax: ::SIZE,
-}}
-pub type LPNMDATETIMEFORMATQUERYA = *mut NMDATETIMEFORMATQUERYA;
-STRUCT!{struct NMDATETIMEFORMATQUERYW {
-    nmhdr: ::NMHDR,
-    pszFormat: ::LPCWSTR,
-    szMax: ::SIZE,
-}}
-pub type LPNMDATETIMEFORMATQUERYW = *mut NMDATETIMEFORMATQUERYW;
-pub const DTN_DROPDOWN: ::UINT = DTN_FIRST2 - 1;
-pub const DTN_CLOSEUP: ::UINT = DTN_FIRST2;
-pub const GDTR_MIN: ::WPARAM = 0x0001;
-pub const GDTR_MAX: ::WPARAM = 0x0002;
-pub const GDT_ERROR: ::LRESULT = -1;
-pub const GDT_VALID: ::LRESULT = 0;
-pub const GDT_NONE: ::LRESULT = 1;
-pub const IPM_CLEARADDRESS: ::UINT = ::WM_USER + 100;
-pub const IPM_SETADDRESS: ::UINT = ::WM_USER + 101;
-pub const IPM_GETADDRESS: ::UINT = ::WM_USER + 102;
-pub const IPM_SETRANGE: ::UINT = ::WM_USER + 103;
-pub const IPM_SETFOCUS: ::UINT = ::WM_USER + 104;
-pub const IPM_ISBLANK: ::UINT = ::WM_USER + 105;
-pub const IPN_FIELDCHANGED: ::UINT = IPN_FIRST - 0;
-STRUCT!{struct NMIPADDRESS {
-    hdr: ::NMHDR,
-    iField: ::c_int,
-    iValue: ::c_int,
-}}
-pub type LPNMIPADDRESS = *mut NMIPADDRESS;
-#[inline] #[allow(dead_code)]
-pub fn MAKEIPRANGE(low: ::BYTE, high: ::BYTE) -> ::LPARAM {
-    (high << 8 + low) as ::LPARAM
-}
-#[inline] #[allow(dead_code)]
-pub fn MAKEIPADDRESS(b1: ::DWORD, b2: ::DWORD, b3: ::DWORD, b4: ::DWORD) -> ::LPARAM {
-    ((b1 << 24) + (b2 << 16) + (b3 << 8) + b4) as ::LPARAM
-}
-pub const PGS_VERT: ::DWORD = 0x00000000;
-pub const PGS_HORZ: ::DWORD = 0x00000001;
-pub const PGS_AUTOSCROLL: ::DWORD = 0x00000002;
-pub const PGS_DRAGNDROP: ::DWORD = 0x00000004;
-pub const  PGF_INVISIBLE: ::DWORD = 0;
-pub const  PGF_NORMAL: ::DWORD = 1;
-pub const  PGF_GRAYED: ::DWORD = 2;
-pub const  PGF_DEPRESSED: ::DWORD = 4;
-pub const  PGF_HOT: ::DWORD = 8;
-pub const PGB_TOPORLEFT: ::c_int = 0;
-pub const PGB_BOTTOMORRIGHT: ::c_int = 1;
-pub const PGM_SETCHILD: ::UINT = PGM_FIRST + 1;
-pub const PGM_RECALCSIZE: ::UINT = PGM_FIRST + 2;
-pub const PGM_FORWARDMOUSE: ::UINT = PGM_FIRST + 3;
-pub const PGM_SETBKCOLOR: ::UINT = PGM_FIRST + 4;
-pub const PGM_GETBKCOLOR: ::UINT = PGM_FIRST + 5;
-pub const PGM_SETBORDER: ::UINT = PGM_FIRST + 6;
-pub const PGM_GETBORDER: ::UINT = PGM_FIRST + 7;
-pub const PGM_SETPOS: ::UINT = PGM_FIRST + 8;
-pub const PGM_GETPOS: ::UINT = PGM_FIRST + 9;
-pub const PGM_SETBUTTONSIZE: ::UINT = PGM_FIRST + 10;
-pub const PGM_GETBUTTONSIZE: ::UINT = PGM_FIRST + 11;
-pub const PGM_GETBUTTONSTATE: ::UINT = PGM_FIRST + 12;
-pub const PGM_GETDROPTARGET: ::UINT = CCM_GETDROPTARGET;
-pub const PGM_SETSCROLLINFO: ::UINT = PGM_FIRST + 13;
-pub const PGN_SCROLL: ::UINT = PGN_FIRST - 1;
-pub const PGF_SCROLLUP: ::c_int = 1;
-pub const PGF_SCROLLDOWN: ::c_int = 2;
-pub const PGF_SCROLLLEFT: ::c_int = 4;
-pub const PGF_SCROLLRIGHT: ::c_int = 8;
-pub const PGK_SHIFT: ::BOOL = 1;
-pub const PGK_CONTROL: ::BOOL = 2;
-pub const PGK_MENU: ::BOOL = 4;
-STRUCT!{struct NMPGSCROLL {
-    hdr: ::NMHDR,
-    fwKeys: ::BOOL,
-    rcParent: ::RECT,
-    iDir: ::c_int,
-    iXpos: ::c_int,
-    iYpos: ::c_int,
-    iScroll: ::c_int,
-}}
-pub type LPNMPGSCROLL = *mut NMPGSCROLL;
-pub const PGN_CALCSIZE: ::UINT = PGN_FIRST - 2;
-pub const PGF_CALCWIDTH: ::DWORD = 1;
-pub const PGF_CALCHEIGHT: ::DWORD = 2;
-STRUCT!{struct NMPGCALCSIZE {
-    hdr: ::NMHDR,
-    dwFlag: ::DWORD,
-    iWidth: ::c_int,
-    iHeight: ::c_int,
-}}
-pub type LPNMPGCALCSIZE = *mut NMPGCALCSIZE;
-pub const PGN_HOTITEMCHANGE: ::UINT = PGN_FIRST - 3;
-STRUCT!{struct NMPGHOTITEM {
-    hdr: ::NMHDR,
-    idOld: ::c_int,
-    idNew: ::c_int,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMPGHOTITEM = *mut NMPGHOTITEM;
-pub const NFS_EDIT: ::DWORD = 0x0001;
-pub const NFS_STATIC: ::DWORD = 0x0002;
-pub const NFS_LISTCOMBO: ::DWORD = 0x0004;
-pub const NFS_BUTTON: ::DWORD = 0x0008;
-pub const NFS_ALL: ::DWORD = 0x0010;
-pub const NFS_USEFONTASSOC: ::DWORD = 0x0020;
-pub const BUTTON_IMAGELIST_ALIGN_LEFT: ::UINT = 0;
-pub const BUTTON_IMAGELIST_ALIGN_RIGHT: ::UINT = 1;
-pub const BUTTON_IMAGELIST_ALIGN_TOP: ::UINT = 2;
-pub const BUTTON_IMAGELIST_ALIGN_BOTTOM: ::UINT = 3;
-pub const BUTTON_IMAGELIST_ALIGN_CENTER: ::UINT = 4;
-STRUCT!{struct BUTTON_IMAGELIST {
-    himl: HIMAGELIST,
-    margin: ::RECT,
-    uAlign: ::UINT,
-}}
-pub type PBUTTON_IMAGELIST = *mut BUTTON_IMAGELIST;
-pub const BCM_GETIDEALSIZE: ::UINT = BCM_FIRST + 0x0001;
-pub const BCM_SETIMAGELIST: ::UINT = BCM_FIRST + 0x0002;
-pub const BCM_GETIMAGELIST: ::UINT = BCM_FIRST + 0x0003;
-pub const BCM_SETTEXTMARGIN: ::UINT = BCM_FIRST + 0x0004;
-pub const BCM_GETTEXTMARGIN: ::UINT = BCM_FIRST + 0x0005;
-STRUCT!{struct NMBCHOTITEM {
-    hdr: ::NMHDR,
-    dwFlags: ::DWORD,
-}}
-pub type LPNMBCHOTITEM = *mut NMBCHOTITEM;
-pub const BCN_HOTITEMCHANGE: ::UINT = BCN_FIRST + 0x0001;
-pub const BS_SPLITBUTTON: ::UINT = 0x0000000C;
-pub const BS_DEFSPLITBUTTON: ::UINT = 0x0000000D;
-pub const BS_COMMANDLINK: ::UINT = 0x0000000E;
-pub const BS_DEFCOMMANDLINK: ::UINT = 0x0000000F;
-pub const BCSIF_GLYPH: ::UINT = 0x0001;
-pub const BCSIF_IMAGE: ::UINT = 0x0002;
-pub const BCSIF_STYLE: ::UINT = 0x0004;
-pub const BCSIF_SIZE: ::UINT = 0x0008;
-pub const BCSS_NOSPLIT: ::UINT = 0x0001;
-pub const BCSS_STRETCH: ::UINT = 0x0002;
-pub const BCSS_ALIGNLEFT: ::UINT = 0x0004;
-pub const BCSS_IMAGE: ::UINT = 0x0008;
-STRUCT!{struct BUTTON_SPLITINFO {
-    mask: ::UINT,
-    himlGlyph: HIMAGELIST,
-    uSplitStyle: ::UINT,
-    size: ::SIZE,
-}}
-pub type PBUTTON_SPLITINFO = *mut BUTTON_SPLITINFO;
-pub const BCM_SETDROPDOWNSTATE: ::UINT = BCM_FIRST + 0x0006;
-pub const BCM_SETSPLITINFO: ::UINT = BCM_FIRST + 0x0007;
-pub const BCM_GETSPLITINFO: ::UINT = BCM_FIRST + 0x0008;
-pub const BCM_SETNOTE: ::UINT = BCM_FIRST + 0x0009;
-pub const BCM_GETNOTE: ::UINT = BCM_FIRST + 0x000A;
-pub const BCM_GETNOTELENGTH: ::UINT = BCM_FIRST + 0x000B;
-pub const BCM_SETSHIELD: ::UINT = BCM_FIRST + 0x000C;
-pub const BCCL_NOGLYPH: HIMAGELIST = (0 - 1) as HIMAGELIST;
-STRUCT!{struct NMBCDROPDOWN {
-    hdr: ::NMHDR,
-    rcButton: ::RECT,
-}}
-pub type LPNMBCDROPDOWN = *mut NMBCDROPDOWN;
-pub const BCN_DROPDOWN: ::UINT = BCN_FIRST + 0x0002;
-pub const EM_SETCUEBANNER: ::UINT = ECM_FIRST + 1;
-pub const EM_GETCUEBANNER: ::UINT = ECM_FIRST + 2;
-pub const EM_SHOWBALLOONTIP: ::UINT = ECM_FIRST + 3;
-pub const EM_HIDEBALLOONTIP: ::UINT = ECM_FIRST + 4;
-pub const EM_SETHILITE: ::UINT = ECM_FIRST + 5;
-pub const EM_GETHILITE: ::UINT = ECM_FIRST + 6;
-pub const EM_NOSETFOCUS: ::UINT = ECM_FIRST + 7;
-pub const EM_TAKEFOCUS: ::UINT = ECM_FIRST + 8;
-STRUCT!{struct EDITBALLOONTIP {
-    cbStruct: ::DWORD,
-    pszTitle: ::LPCWSTR,
-    pszText: ::LPCWSTR,
-    ttiIcon: ::INT,
-}}
-pub type PEDITBALLOONTIP = *mut EDITBALLOONTIP;
-pub const CB_SETMINVISIBLE: ::UINT = CBM_FIRST + 1;
-pub const CB_GETMINVISIBLE: ::UINT = CBM_FIRST + 2;
-pub const CB_SETCUEBANNER: ::UINT = CBM_FIRST + 3;
-pub const CB_GETCUEBANNER: ::UINT = CBM_FIRST + 4;
-pub type PFTASKDIALOGCALLBACK = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, msg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM, lpRefData: ::LONG_PTR,
-) -> ::HRESULT>;
-FLAGS!{enum TASKDIALOG_FLAGS {
-    TDF_ENABLE_HYPERLINKS = 0x0001,
-    TDF_USE_HICON_MAIN = 0x0002,
-    TDF_USE_HICON_FOOTER = 0x0004,
-    TDF_ALLOW_DIALOG_CANCELLATION = 0x0008,
-    TDF_USE_COMMAND_LINKS = 0x0010,
-    TDF_USE_COMMAND_LINKS_NO_ICON = 0x0020,
-    TDF_EXPAND_FOOTER_AREA = 0x0040,
-    TDF_EXPANDED_BY_DEFAULT = 0x0080,
-    TDF_VERIFICATION_FLAG_CHECKED = 0x0100,
-    TDF_SHOW_PROGRESS_BAR = 0x0200,
-    TDF_SHOW_MARQUEE_PROGRESS_BAR = 0x0400,
-    TDF_CALLBACK_TIMER = 0x0800,
-    TDF_POSITION_RELATIVE_TO_WINDOW = 0x1000,
-    TDF_RTL_LAYOUT = 0x2000,
-    TDF_NO_DEFAULT_RADIO_BUTTON = 0x4000,
-    TDF_CAN_BE_MINIMIZED = 0x8000,
-    TDF_NO_SET_FOREGROUND = 0x00010000,
-    TDF_SIZE_TO_CONTENT = 0x01000000,
-}}
-ENUM!{enum TASKDIALOG_MESSAGES {
-    TDM_NAVIGATE_PAGE = ::WM_USER + 101,
-    TDM_CLICK_BUTTON = ::WM_USER + 102,
-    TDM_SET_MARQUEE_PROGRESS_BAR = ::WM_USER + 103,
-    TDM_SET_PROGRESS_BAR_STATE = ::WM_USER + 104,
-    TDM_SET_PROGRESS_BAR_RANGE = ::WM_USER + 105,
-    TDM_SET_PROGRESS_BAR_POS = ::WM_USER + 106,
-    TDM_SET_PROGRESS_BAR_MARQUEE = ::WM_USER + 107,
-    TDM_SET_ELEMENT_TEXT = ::WM_USER + 108,
-    TDM_CLICK_RADIO_BUTTON = ::WM_USER + 110,
-    TDM_ENABLE_BUTTON = ::WM_USER + 111,
-    TDM_ENABLE_RADIO_BUTTON = ::WM_USER + 112,
-    TDM_CLICK_VERIFICATION = ::WM_USER + 113,
-    TDM_UPDATE_ELEMENT_TEXT = ::WM_USER + 114,
-    TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = ::WM_USER + 115,
-    TDM_UPDATE_ICON = ::WM_USER + 116,
-}}
-ENUM!{enum TASKDIALOG_NOTIFICATIONS {
-    TDN_CREATED = 0,
-    TDN_NAVIGATED = 1,
-    TDN_BUTTON_CLICKED = 2,
-    TDN_HYPERLINK_CLICKED = 3,
-    TDN_TIMER = 4,
-    TDN_DESTROYED = 5,
-    TDN_RADIO_BUTTON_CLICKED = 6,
-    TDN_DIALOG_CONSTRUCTED = 7,
-    TDN_VERIFICATION_CLICKED = 8,
-    TDN_HELP = 9,
-    TDN_EXPANDO_BUTTON_CLICKED = 10,
-}}
-STRUCT!{struct TASKDIALOG_BUTTON {
-    nButtonID: ::c_int,
-    pszButtonText: ::PCWSTR,
-}}
-ENUM!{enum TASKDIALOG_ELEMENTS {
-    TDE_CONTENT,
-    TDE_EXPANDED_INFORMATION,
-    TDE_FOOTER,
-    TDE_MAIN_INSTRUCTION,
-}}
-ENUM!{enum TASKDIALOG_ICON_ELEMENTS {
-    TDIE_ICON_MAIN,
-    TDIE_ICON_FOOTER,
-}}
-FLAGS!{enum TASKDIALOG_COMMON_BUTTON_FLAGS {
-    TDCBF_OK_BUTTON = 0x0001,
-    TDCBF_YES_BUTTON = 0x0002,
-    TDCBF_NO_BUTTON = 0x0004,
-    TDCBF_CANCEL_BUTTON = 0x0008,
-    TDCBF_RETRY_BUTTON = 0x0010,
-    TDCBF_CLOSE_BUTTON = 0x0020,
-}}
-STRUCT!{nodebug struct TASKDIALOGCONFIG {
-    cbSize: ::UINT,
-    hwndParent: ::HWND,
-    hInstance: ::HINSTANCE,
-    dwFlags: TASKDIALOG_FLAGS,
-    dwCommonButtons: TASKDIALOG_COMMON_BUTTON_FLAGS,
-    pszWindowTitle: ::PCWSTR,
-    hMainIcon: ::HICON,
-    pszMainInstruction: ::PCWSTR,
-    pszContent: ::PCWSTR,
-    cButtons: ::UINT,
-    pButtons: *const TASKDIALOG_BUTTON,
-    nDefaultButton: ::c_int,
-    cRadioButtons: ::UINT,
-    pRadioButtons: *const TASKDIALOG_BUTTON,
-    nDefaultRadioButton: ::c_int,
-    pszVerificationText: ::PCWSTR,
-    pszExpandedInformation: ::PCWSTR,
-    pszExpandedControlText: ::PCWSTR,
-    pszCollapsedControlText: ::PCWSTR,
-    hFooterIcon: ::HICON,
-    pszFooter: ::PCWSTR,
-    pfCallback: PFTASKDIALOGCALLBACK,
-    lpCallbackData: ::LONG_PTR,
-    cxWidth: ::UINT,
-}}
-UNION!(TASKDIALOGCONFIG, hMainIcon, pszMainIcon, pszMainIcon_mut, ::PCWSTR);
-UNION!(TASKDIALOGCONFIG, hFooterIcon, pszFooterIcon, pszFooterIcon_mut, ::PCWSTR);
-pub const DA_LAST: ::c_int = 0x7FFFFFFF;
-pub const DA_ERR: ::c_int = -1;
-pub type PFNDAENUMCALLBACK = Option<unsafe extern "system" fn(
-    p: *mut ::c_void, pData: *mut ::c_void,
-) -> ::c_int>;
-pub type PFNDAENUMCALLBACKCONST = Option<unsafe extern "system" fn(
-    p: *const ::c_void, pData: *mut ::c_void,
-) -> ::c_int>;
-pub type PFNDACOMPARE = Option<unsafe extern "system" fn(
-    p1: *mut ::c_void, p2: *mut ::c_void, lParam: ::LPARAM,
-) -> ::c_int>;
-pub type PFNDACOMPARECONST = Option<unsafe extern "system" fn(
-    p1: *const ::c_void, p2: *const ::c_void, lParam: ::LPARAM,
-) -> ::c_int>;
-pub enum DSA {}
-pub type HDSA = *mut DSA;
-pub const DSA_APPEND: ::c_int = DA_LAST;
-pub const DSA_ERR: ::c_int = DA_ERR;
-pub type PFNDSAENUMCALLBACK = PFNDAENUMCALLBACK;
-pub type PFNDSAENUMCALLBACKCONST = PFNDAENUMCALLBACKCONST;
-pub type PFNDSACOMPARE = PFNDACOMPARE;
-pub type PFNDSACOMPARECONST = PFNDACOMPARECONST;
-pub enum DPA {}
-pub type HDPA = *mut DPA;
-STRUCT!{struct DPASTREAMINFO {
-    iPos: ::c_int,
-    pvItem: *mut ::c_void,
-}}
-pub type PFNDPASTREAM = Option<unsafe extern "system" fn(
-    pinfo: *mut DPASTREAMINFO, pstream: *mut ::IStream, pvInstData: *mut ::c_void,
-) -> ::HRESULT>;
-pub const DPAM_SORTED: ::DWORD = 0x00000001;
-pub const DPAM_NORMAL: ::DWORD = 0x00000002;
-pub const DPAM_UNION: ::DWORD = 0x00000004;
-pub const DPAM_INTERSECT: ::DWORD = 0x00000008;
-pub type PFNDPAMERGE = Option<unsafe extern "system" fn(
-    uMsg: ::UINT, pvDest: *mut ::c_void, pvSrc: *mut ::c_void, lParam: ::LPARAM,
-) -> *mut ::c_void>;
-pub type PFNDPAMERGECONST = Option<unsafe extern "system" fn(
-    uMsg: ::UINT, pvDest: *const ::c_void, pvSrc: *const ::c_void, lParam: ::LPARAM,
-) -> *const ::c_void>;
-pub const DPAMM_MERGE: ::UINT = 1;
-pub const DPAMM_DELETE: ::UINT = 2;
-pub const DPAMM_INSERT: ::UINT = 3;
-pub const DPAS_SORTED: ::UINT = 0x0001;
-pub const DPAS_INSERTBEFORE: ::UINT = 0x0002;
-pub const DPAS_INSERTAFTER: ::UINT = 0x0004;
-pub const DPA_APPEND: ::c_int = DA_LAST;
-pub const DPA_ERR: ::c_int = DA_ERR;
-pub type PFNDPAENUMCALLBACK = PFNDAENUMCALLBACK;
-pub type PFNDPAENUMCALLBACKCONST = PFNDAENUMCALLBACKCONST;
-pub type PFNDPACOMPARE = PFNDACOMPARE;
-pub type PFNDPACOMPARECONST = PFNDACOMPARECONST;
-pub const WSB_PROP_CYVSCROLL: ::UINT = 0x00000001;
-pub const WSB_PROP_CXHSCROLL: ::UINT = 0x00000002;
-pub const WSB_PROP_CYHSCROLL: ::UINT = 0x00000004;
-pub const WSB_PROP_CXVSCROLL: ::UINT = 0x00000008;
-pub const WSB_PROP_CXHTHUMB: ::UINT = 0x00000010;
-pub const WSB_PROP_CYVTHUMB: ::UINT = 0x00000020;
-pub const WSB_PROP_VBKGCOLOR: ::UINT = 0x00000040;
-pub const WSB_PROP_HBKGCOLOR: ::UINT = 0x00000080;
-pub const WSB_PROP_VSTYLE: ::UINT = 0x00000100;
-pub const WSB_PROP_HSTYLE: ::UINT = 0x00000200;
-pub const WSB_PROP_WINSTYLE: ::UINT = 0x00000400;
-pub const WSB_PROP_PALETTE: ::UINT = 0x00000800;
-pub const WSB_PROP_MASK: ::UINT = 0x00000FFF;
-pub const FSB_FLAT_MODE: ::INT_PTR = 2;
-pub const FSB_ENCARTA_MODE: ::INT_PTR = 1;
-pub const FSB_REGULAR_MODE: ::INT_PTR = 0;
-pub type SUBCLASSPROC = Option<unsafe extern "system" fn(
-    hWnd: ::HWND, uMsg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM, uIdSubclass: ::UINT_PTR,
-    dwRefData: ::DWORD_PTR,
-) -> ::LRESULT>;
diff --git a/vendor/winapi-0.2.8/src/commdlg.rs b/vendor/winapi-0.2.8/src/commdlg.rs
deleted file mode 100644
index 0eb3fd8721..0000000000
--- a/vendor/winapi-0.2.8/src/commdlg.rs
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! 32-Bit Common Dialog APIs
-pub type LPOFNHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct OPENFILENAME_NT4A {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCSTR,
-    lpstrCustomFilter: ::LPSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCSTR,
-    lpstrTitle: ::LPCSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-}}
-pub type LPOPENFILENAME_NT4A = *mut OPENFILENAME_NT4A;
-STRUCT!{nodebug struct OPENFILENAME_NT4W {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCWSTR,
-    lpstrCustomFilter: ::LPWSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPWSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPWSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCWSTR,
-    lpstrTitle: ::LPCWSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCWSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-}}
-pub type LPOPENFILENAME_NT4W = *mut OPENFILENAME_NT4W;
-STRUCT!{nodebug struct OPENFILENAMEA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCSTR,
-    lpstrCustomFilter: ::LPSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCSTR,
-    lpstrTitle: ::LPCSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-    pvReserved: *mut ::c_void,
-    dwReserved: ::DWORD,
-    FlagsEx: ::DWORD,
-}}
-pub type LPOPENFILENAMEA = *mut OPENFILENAMEA;
-STRUCT!{nodebug struct OPENFILENAMEW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpstrFilter: ::LPCWSTR,
-    lpstrCustomFilter: ::LPWSTR,
-    nMaxCustFilter: ::DWORD,
-    nFilterIndex: ::DWORD,
-    lpstrFile: ::LPWSTR,
-    nMaxFile: ::DWORD,
-    lpstrFileTitle: ::LPWSTR,
-    nMaxFileTitle: ::DWORD,
-    lpstrInitialDir: ::LPCWSTR,
-    lpstrTitle: ::LPCWSTR,
-    Flags: ::DWORD,
-    nFileOffset: ::WORD,
-    nFileExtension: ::WORD,
-    lpstrDefExt: ::LPCWSTR,
-    lCustData: ::LPARAM,
-    lpfnHook: LPOFNHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-    pvReserved: *mut ::c_void,
-    dwReserved: ::DWORD,
-    FlagsEx: ::DWORD,
-}}
-pub type LPOPENFILENAMEW = *mut OPENFILENAMEW;
-pub const OFN_READONLY: ::DWORD = 0x00000001;
-pub const OFN_OVERWRITEPROMPT: ::DWORD = 0x00000002;
-pub const OFN_HIDEREADONLY: ::DWORD = 0x00000004;
-pub const OFN_NOCHANGEDIR: ::DWORD = 0x00000008;
-pub const OFN_SHOWHELP: ::DWORD = 0x00000010;
-pub const OFN_ENABLEHOOK: ::DWORD = 0x00000020;
-pub const OFN_ENABLETEMPLATE: ::DWORD = 0x00000040;
-pub const OFN_ENABLETEMPLATEHANDLE: ::DWORD = 0x00000080;
-pub const OFN_NOVALIDATE: ::DWORD = 0x00000100;
-pub const OFN_ALLOWMULTISELECT: ::DWORD = 0x00000200;
-pub const OFN_EXTENSIONDIFFERENT: ::DWORD = 0x00000400;
-pub const OFN_PATHMUSTEXIST: ::DWORD = 0x00000800;
-pub const OFN_FILEMUSTEXIST: ::DWORD = 0x00001000;
-pub const OFN_CREATEPROMPT: ::DWORD = 0x00002000;
-pub const OFN_SHAREAWARE: ::DWORD = 0x00004000;
-pub const OFN_NOREADONLYRETURN: ::DWORD = 0x00008000;
-pub const OFN_NOTESTFILECREATE: ::DWORD = 0x00010000;
-pub const OFN_NONETWORKBUTTON: ::DWORD = 0x00020000;
-pub const OFN_NOLONGNAMES: ::DWORD = 0x00040000;
-pub const OFN_EXPLORER: ::DWORD = 0x00080000;
-pub const OFN_NODEREFERENCELINKS: ::DWORD = 0x00100000;
-pub const OFN_LONGNAMES: ::DWORD = 0x00200000;
-pub const OFN_ENABLEINCLUDENOTIFY: ::DWORD = 0x00400000;
-pub const OFN_ENABLESIZING: ::DWORD = 0x00800000;
-pub const OFN_DONTADDTORECENT: ::DWORD = 0x02000000;
-pub const OFN_FORCESHOWHIDDEN: ::DWORD = 0x10000000;
-pub const OFN_EX_NOPLACESBAR: ::DWORD = 0x00000001;
-pub const OFN_SHAREFALLTHROUGH: ::UINT_PTR = 2;
-pub const OFN_SHARENOWARN: ::UINT_PTR = 1;
-pub const OFN_SHAREWARN: ::UINT_PTR = 0;
-pub type LPCCHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{struct OFNOTIFYA {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEA,
-    pszFile: ::LPSTR,
-}}
-pub type LPOFNOTIFYA = *mut OFNOTIFYA;
-STRUCT!{struct OFNOTIFYW {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEW,
-    pszFile: ::LPWSTR,
-}}
-pub type LPOFNOTIFYW = *mut OFNOTIFYW;
-STRUCT!{struct OFNOTIFYEXA {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEA,
-    psf: ::LPVOID,
-    pidl: ::LPVOID,
-}}
-pub type LPOFNOTIFYEXA = *mut OFNOTIFYEXA;
-STRUCT!{struct OFNOTIFYEXW {
-    hdr: ::NMHDR,
-    lpOFN: LPOPENFILENAMEW,
-    psf: ::LPVOID,
-    pidl: ::LPVOID,
-}}
-pub type LPOFNOTIFYEXW = *mut OFNOTIFYEXW;
-pub const CDN_FIRST: ::UINT = -601i32 as ::UINT;
-pub const CDN_LAST: ::UINT = -699i32 as ::UINT;
-pub const CDN_INITDONE: ::UINT = CDN_FIRST - 0x0000;
-pub const CDN_SELCHANGE: ::UINT = CDN_FIRST - 0x0001;
-pub const CDN_FOLDERCHANGE: ::UINT = CDN_FIRST - 0x0002;
-pub const CDN_SHAREVIOLATION: ::UINT = CDN_FIRST - 0x0003;
-pub const CDN_HELP: ::UINT = CDN_FIRST - 0x0004;
-pub const CDN_FILEOK: ::UINT = CDN_FIRST - 0x0005;
-pub const CDN_TYPECHANGE: ::UINT = CDN_FIRST - 0x0006;
-pub const CDN_INCLUDEITEM: ::UINT = CDN_FIRST - 0x0007;
-pub const CDM_FIRST: ::UINT = ::WM_USER + 100;
-pub const CDM_LAST: ::UINT = ::WM_USER + 200;
-pub const CDM_GETSPEC: ::UINT = CDM_FIRST + 0x0000;
-pub const CDM_GETFILEPATH: ::UINT = CDM_FIRST + 0x0001;
-pub const CDM_GETFOLDERPATH: ::UINT = CDM_FIRST + 0x0002;
-pub const CDM_GETFOLDERIDLIST: ::UINT = CDM_FIRST + 0x0003;
-pub const CDM_SETCONTROLTEXT: ::UINT = CDM_FIRST + 0x0004;
-pub const CDM_HIDECONTROL: ::UINT = CDM_FIRST + 0x0005;
-pub const CDM_SETDEFEXT: ::UINT = CDM_FIRST + 0x0006;
-STRUCT!{nodebug struct CHOOSECOLORA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HWND,
-    rgbResult: ::COLORREF,
-    lpCustColors: *mut ::COLORREF,
-    Flags: ::DWORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCCHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-}}
-pub type LPCHOOSECOLORA = *mut CHOOSECOLORA;
-STRUCT!{nodebug struct CHOOSECOLORW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HWND,
-    rgbResult: ::COLORREF,
-    lpCustColors: *mut ::COLORREF,
-    Flags: ::DWORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCCHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-}}
-pub type LPCHOOSECOLORW = *mut CHOOSECOLORW;
-pub const CC_RGBINIT: ::DWORD = 0x00000001;
-pub const CC_FULLOPEN: ::DWORD = 0x00000002;
-pub const CC_PREVENTFULLOPEN: ::DWORD = 0x00000004;
-pub const CC_SHOWHELP: ::DWORD = 0x00000008;
-pub const CC_ENABLEHOOK: ::DWORD = 0x00000010;
-pub const CC_ENABLETEMPLATE: ::DWORD = 0x00000020;
-pub const CC_ENABLETEMPLATEHANDLE: ::DWORD = 0x00000040;
-pub const CC_SOLIDCOLOR: ::DWORD = 0x00000080;
-pub const CC_ANYCOLOR: ::DWORD = 0x00000100;
-pub type LPFRHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct FINDREPLACEA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    Flags: ::DWORD,
-    lpstrFindWhat: ::LPSTR,
-    lpstrReplaceWith: ::LPSTR,
-    wFindWhatLen: ::WORD,
-    wReplaceWithLen: ::WORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPFRHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-}}
-pub type LPFINDREPLACEA = *mut FINDREPLACEA;
-STRUCT!{nodebug struct FINDREPLACEW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    Flags: ::DWORD,
-    lpstrFindWhat: ::LPWSTR,
-    lpstrReplaceWith: ::LPWSTR,
-    wFindWhatLen: ::WORD,
-    wReplaceWithLen: ::WORD,
-    lCustData: ::LPARAM,
-    lpfnHook: LPFRHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-}}
-pub type LPFINDREPLACEW = *mut FINDREPLACEW;
-pub const FR_DOWN: ::DWORD = 0x00000001;
-pub const FR_WHOLEWORD: ::DWORD = 0x00000002;
-pub const FR_MATCHCASE: ::DWORD = 0x00000004;
-pub const FR_FINDNEXT: ::DWORD = 0x00000008;
-pub const FR_REPLACE: ::DWORD = 0x00000010;
-pub const FR_REPLACEALL: ::DWORD = 0x00000020;
-pub const FR_DIALOGTERM: ::DWORD = 0x00000040;
-pub const FR_SHOWHELP: ::DWORD = 0x00000080;
-pub const FR_ENABLEHOOK: ::DWORD = 0x00000100;
-pub const FR_ENABLETEMPLATE: ::DWORD = 0x00000200;
-pub const FR_NOUPDOWN: ::DWORD = 0x00000400;
-pub const FR_NOMATCHCASE: ::DWORD = 0x00000800;
-pub const FR_NOWHOLEWORD: ::DWORD = 0x00001000;
-pub const FR_ENABLETEMPLATEHANDLE: ::DWORD = 0x00002000;
-pub const FR_HIDEUPDOWN: ::DWORD = 0x00004000;
-pub const FR_HIDEMATCHCASE: ::DWORD = 0x00008000;
-pub const FR_HIDEWHOLEWORD: ::DWORD = 0x00010000;
-pub const FR_RAW: ::DWORD = 0x00020000;
-pub const FR_MATCHDIAC: ::DWORD = 0x20000000;
-pub const FR_MATCHKASHIDA: ::DWORD = 0x40000000;
-pub const FR_MATCHALEFHAMZA: ::DWORD = 0x80000000;
-pub type LPCFHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct CHOOSEFONTA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDC: ::HDC,
-    lpLogFont: ::LPLOGFONTA,
-    iPointSize: ::INT,
-    Flags: ::DWORD,
-    rgbColors: ::COLORREF,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCFHOOKPROC,
-    lpTemplateName: ::LPCSTR,
-    hInstance: ::HINSTANCE,
-    lpszStyle: ::LPSTR,
-    nFontType: ::WORD,
-    ___MISSING_ALIGNMENT__: ::WORD,
-    nSizeMin: ::INT,
-    nSizeMax: ::INT,
-}}
-pub type LPCHOOSEFONTA = *mut CHOOSEFONTA;
-STRUCT!{nodebug struct CHOOSEFONTW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDC: ::HDC,
-    lpLogFont: ::LPLOGFONTW,
-    iPointSize: ::INT,
-    Flags: ::DWORD,
-    rgbColors: ::COLORREF,
-    lCustData: ::LPARAM,
-    lpfnHook: LPCFHOOKPROC,
-    lpTemplateName: ::LPCWSTR,
-    hInstance: ::HINSTANCE,
-    lpszStyle: ::LPWSTR,
-    nFontType: ::WORD,
-    ___MISSING_ALIGNMENT__: ::WORD,
-    nSizeMin: ::INT,
-    nSizeMax: ::INT,
-}}
-pub type LPCHOOSEFONTW = *mut CHOOSEFONTW;
-pub const CF_SCREENFONTS: ::DWORD = 0x00000001;
-pub const CF_PRINTERFONTS: ::DWORD = 0x00000002;
-pub const CF_BOTH: ::DWORD = CF_SCREENFONTS | CF_PRINTERFONTS;
-pub const CF_SHOWHELP: ::DWORD = 0x00000004;
-pub const CF_ENABLEHOOK: ::DWORD = 0x00000008;
-pub const CF_ENABLETEMPLATE: ::DWORD = 0x00000010;
-pub const CF_ENABLETEMPLATEHANDLE: ::DWORD = 0x00000020;
-pub const CF_INITTOLOGFONTSTRUCT: ::DWORD = 0x00000040;
-pub const CF_USESTYLE: ::DWORD = 0x00000080;
-pub const CF_EFFECTS: ::DWORD = 0x00000100;
-pub const CF_APPLY: ::DWORD = 0x00000200;
-pub const CF_ANSIONLY: ::DWORD = 0x00000400;
-pub const CF_SCRIPTSONLY: ::DWORD = CF_ANSIONLY;
-pub const CF_NOVECTORFONTS: ::DWORD = 0x00000800;
-pub const CF_NOOEMFONTS: ::DWORD = CF_NOVECTORFONTS;
-pub const CF_NOSIMULATIONS: ::DWORD = 0x00001000;
-pub const CF_LIMITSIZE: ::DWORD = 0x00002000;
-pub const CF_FIXEDPITCHONLY: ::DWORD = 0x00004000;
-pub const CF_WYSIWYG: ::DWORD = 0x00008000;
-pub const CF_FORCEFONTEXIST: ::DWORD = 0x00010000;
-pub const CF_SCALABLEONLY: ::DWORD = 0x00020000;
-pub const CF_TTONLY: ::DWORD = 0x00040000;
-pub const CF_NOFACESEL: ::DWORD = 0x00080000;
-pub const CF_NOSTYLESEL: ::DWORD = 0x00100000;
-pub const CF_NOSIZESEL: ::DWORD = 0x00200000;
-pub const CF_SELECTSCRIPT: ::DWORD = 0x00400000;
-pub const CF_NOSCRIPTSEL: ::DWORD = 0x00800000;
-pub const CF_NOVERTFONTS: ::DWORD = 0x01000000;
-pub const CF_INACTIVEFONTS: ::DWORD = 0x02000000;
-pub const SIMULATED_FONTTYPE: ::WORD = 0x8000;
-pub const PRINTER_FONTTYPE: ::WORD = 0x4000;
-pub const SCREEN_FONTTYPE: ::WORD = 0x2000;
-pub const BOLD_FONTTYPE: ::WORD = 0x0100;
-pub const ITALIC_FONTTYPE: ::WORD = 0x0200;
-pub const REGULAR_FONTTYPE: ::WORD = 0x0400;
-pub const PS_OPENTYPE_FONTTYPE: ::DWORD = 0x10000;
-pub const TT_OPENTYPE_FONTTYPE: ::DWORD = 0x20000;
-pub const TYPE1_FONTTYPE: ::DWORD = 0x40000;
-pub const SYMBOL_FONTTYPE: ::DWORD = 0x80000;
-pub const WM_CHOOSEFONT_GETLOGFONT: ::UINT = ::WM_USER + 1;
-pub const WM_CHOOSEFONT_SETLOGFONT: ::UINT = ::WM_USER + 101;
-pub const WM_CHOOSEFONT_SETFLAGS: ::UINT = ::WM_USER + 102;
-pub const CD_LBSELNOITEMS: ::WORD = -1i16 as ::WORD;
-pub const CD_LBSELCHANGE: ::WORD = 0;
-pub const CD_LBSELSUB: ::WORD = 1;
-pub const CD_LBSELADD: ::WORD = 2;
-pub type LPPRINTHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-pub type LPSETUPHOOKPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct PRINTDLGA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    nFromPage: ::WORD,
-    nToPage: ::WORD,
-    nMinPage: ::WORD,
-    nMaxPage: ::WORD,
-    nCopies: ::WORD,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPrintHook: LPPRINTHOOKPROC,
-    lpfnSetupHook: LPSETUPHOOKPROC,
-    lpPrintTemplateName: ::LPCSTR,
-    lpSetupTemplateName: ::LPCSTR,
-    hPrintTemplate: ::HGLOBAL,
-    hSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPRINTDLGA = *mut PRINTDLGA;
-STRUCT!{nodebug struct PRINTDLGW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    nFromPage: ::WORD,
-    nToPage: ::WORD,
-    nMinPage: ::WORD,
-    nMaxPage: ::WORD,
-    nCopies: ::WORD,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPrintHook: LPPRINTHOOKPROC,
-    lpfnSetupHook: LPSETUPHOOKPROC,
-    lpPrintTemplateName: ::LPCWSTR,
-    lpSetupTemplateName: ::LPCWSTR,
-    hPrintTemplate: ::HGLOBAL,
-    hSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPRINTDLGW = *mut PRINTDLGW;
-RIDL!(
-interface IPrintDialogCallback(IPrintDialogCallbackVtbl) : IUnknown(IUnknownVtbl) {
-    fn InitDone(&mut self) -> ::HRESULT,
-    fn SelectionChange(&mut self) -> ::HRESULT,
-    fn HandleMessage(
-        &mut self, hDlg: ::HWND, uMsg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM,
-        pResult: *mut ::LRESULT
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IPrintDialogServices(IPrintDialogServicesVtbl) : IUnknown(IUnknownVtbl) {
-    fn GetCurrentDevMode(&mut self, pDevMode: ::LPDEVMODEW, pcbSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCurrentPrinterName(&mut self, pPrinterName: ::LPWSTR, pcchSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCurrentPortName(&mut self, pPortName: ::LPWSTR, pcchSize: *mut ::UINT) -> ::HRESULT
-}
-);
-STRUCT!{struct PRINTPAGERANGE {
-    nFromPage: ::DWORD,
-    nToPage: ::DWORD,
-}}
-pub type LPPRINTPAGERANGE = *mut PRINTPAGERANGE;
-pub type PCPRINTPAGERANGE = *const PRINTPAGERANGE;
-STRUCT!{struct PRINTDLGEXA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    Flags2: ::DWORD,
-    ExclusionFlags: ::DWORD,
-    nPageRanges: ::DWORD,
-    nMaxPageRanges: ::DWORD,
-    lpPageRanges: LPPRINTPAGERANGE,
-    nMinPage: ::DWORD,
-    nMaxPage: ::DWORD,
-    nCopies: ::DWORD,
-    hInstance: ::HINSTANCE,
-    lpPrintTemplateName: ::LPCSTR,
-    lpCallback: ::LPUNKNOWN,
-    nPropertyPages: ::DWORD,
-    lphPropertyPages: *mut ::HPROPSHEETPAGE,
-    nStartPage: ::DWORD,
-    dwResultAction: ::DWORD,
-}}
-pub type LPPRINTDLGEXA = *mut PRINTDLGEXA;
-STRUCT!{struct PRINTDLGEXW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    hDC: ::HDC,
-    Flags: ::DWORD,
-    Flags2: ::DWORD,
-    ExclusionFlags: ::DWORD,
-    nPageRanges: ::DWORD,
-    nMaxPageRanges: ::DWORD,
-    lpPageRanges: LPPRINTPAGERANGE,
-    nMinPage: ::DWORD,
-    nMaxPage: ::DWORD,
-    nCopies: ::DWORD,
-    hInstance: ::HINSTANCE,
-    lpPrintTemplateName: ::LPCWSTR,
-    lpCallback: ::LPUNKNOWN,
-    nPropertyPages: ::DWORD,
-    lphPropertyPages: *mut ::HPROPSHEETPAGE,
-    nStartPage: ::DWORD,
-    dwResultAction: ::DWORD,
-}}
-pub type LPPRINTDLGEXW = *mut PRINTDLGEXW;
-pub const PD_ALLPAGES: ::DWORD = 0x00000000;
-pub const PD_SELECTION: ::DWORD = 0x00000001;
-pub const PD_PAGENUMS: ::DWORD = 0x00000002;
-pub const PD_NOSELECTION: ::DWORD = 0x00000004;
-pub const PD_NOPAGENUMS: ::DWORD = 0x00000008;
-pub const PD_COLLATE: ::DWORD = 0x00000010;
-pub const PD_PRINTTOFILE: ::DWORD = 0x00000020;
-pub const PD_PRINTSETUP: ::DWORD = 0x00000040;
-pub const PD_NOWARNING: ::DWORD = 0x00000080;
-pub const PD_RETURNDC: ::DWORD = 0x00000100;
-pub const PD_RETURNIC: ::DWORD = 0x00000200;
-pub const PD_RETURNDEFAULT: ::DWORD = 0x00000400;
-pub const PD_SHOWHELP: ::DWORD = 0x00000800;
-pub const PD_ENABLEPRINTHOOK: ::DWORD = 0x00001000;
-pub const PD_ENABLESETUPHOOK: ::DWORD = 0x00002000;
-pub const PD_ENABLEPRINTTEMPLATE: ::DWORD = 0x00004000;
-pub const PD_ENABLESETUPTEMPLATE: ::DWORD = 0x00008000;
-pub const PD_ENABLEPRINTTEMPLATEHANDLE: ::DWORD = 0x00010000;
-pub const PD_ENABLESETUPTEMPLATEHANDLE: ::DWORD = 0x00020000;
-pub const PD_USEDEVMODECOPIES: ::DWORD = 0x00040000;
-pub const PD_USEDEVMODECOPIESANDCOLLATE: ::DWORD = 0x00040000;
-pub const PD_DISABLEPRINTTOFILE: ::DWORD = 0x00080000;
-pub const PD_HIDEPRINTTOFILE: ::DWORD = 0x00100000;
-pub const PD_NONETWORKBUTTON: ::DWORD = 0x00200000;
-pub const PD_CURRENTPAGE: ::DWORD = 0x00400000;
-pub const PD_NOCURRENTPAGE: ::DWORD = 0x00800000;
-pub const PD_EXCLUSIONFLAGS: ::DWORD = 0x01000000;
-pub const PD_USELARGETEMPLATE: ::DWORD = 0x10000000;
-pub const PD_EXCL_COPIESANDCOLLATE: ::DWORD = ::DM_COPIES | ::DM_COLLATE;
-pub const START_PAGE_GENERAL: ::DWORD = 0xffffffff;
-pub const PD_RESULT_CANCEL: ::DWORD = 0;
-pub const PD_RESULT_PRINT: ::DWORD = 1;
-pub const PD_RESULT_APPLY: ::DWORD = 2;
-STRUCT!{struct DEVNAMES {
-    wDriverOffset: ::WORD,
-    wDeviceOffset: ::WORD,
-    wOutputOffset: ::WORD,
-    wDefault: ::WORD,
-}}
-pub type LPDEVNAMES = *mut DEVNAMES;
-pub type PCDEVNAMES = *const DEVNAMES;
-pub const DN_DEFAULTPRN: ::WORD = 0x0001;
-pub const WM_PSD_PAGESETUPDLG: ::UINT = ::WM_USER;
-pub const WM_PSD_FULLPAGERECT: ::UINT = ::WM_USER + 1;
-pub const WM_PSD_MINMARGINRECT: ::UINT = ::WM_USER + 2;
-pub const WM_PSD_MARGINRECT: ::UINT = ::WM_USER + 3;
-pub const WM_PSD_GREEKTEXTRECT: ::UINT = ::WM_USER + 4;
-pub const WM_PSD_ENVSTAMPRECT: ::UINT = ::WM_USER + 5;
-pub const WM_PSD_YAFULLPAGERECT: ::UINT = ::WM_USER + 6;
-pub type LPPAGEPAINTHOOK = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-pub type LPPAGESETUPHOOK = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::UINT_PTR>;
-STRUCT!{nodebug struct PAGESETUPDLGA {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    Flags: ::DWORD,
-    ptPaperSize: ::POINT,
-    rtMinMargin: ::RECT,
-    rtMargin: ::RECT,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPageSetupHook: LPPAGESETUPHOOK,
-    lpfnPagePaintHook: LPPAGEPAINTHOOK,
-    lpPageSetupTemplateName: ::LPCSTR,
-    hPageSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPAGESETUPDLGA = *mut PAGESETUPDLGA;
-STRUCT!{nodebug struct PAGESETUPDLGW {
-    lStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hDevMode: ::HGLOBAL,
-    hDevNames: ::HGLOBAL,
-    Flags: ::DWORD,
-    ptPaperSize: ::POINT,
-    rtMinMargin: ::RECT,
-    rtMargin: ::RECT,
-    hInstance: ::HINSTANCE,
-    lCustData: ::LPARAM,
-    lpfnPageSetupHook: LPPAGESETUPHOOK,
-    lpfnPagePaintHook: LPPAGEPAINTHOOK,
-    lpPageSetupTemplateName: ::LPCWSTR,
-    hPageSetupTemplate: ::HGLOBAL,
-}}
-pub type LPPAGESETUPDLGW = *mut PAGESETUPDLGW;
-pub const PSD_DEFAULTMINMARGINS: ::DWORD = 0x00000000;
-pub const PSD_INWININIINTLMEASURE: ::DWORD = 0x00000000;
-pub const PSD_MINMARGINS: ::DWORD = 0x00000001;
-pub const PSD_MARGINS: ::DWORD = 0x00000002;
-pub const PSD_INTHOUSANDTHSOFINCHES: ::DWORD = 0x00000004;
-pub const PSD_INHUNDREDTHSOFMILLIMETERS: ::DWORD = 0x00000008;
-pub const PSD_DISABLEMARGINS: ::DWORD = 0x00000010;
-pub const PSD_DISABLEPRINTER: ::DWORD = 0x00000020;
-pub const PSD_NOWARNING: ::DWORD = 0x00000080;
-pub const PSD_DISABLEORIENTATION: ::DWORD = 0x00000100;
-pub const PSD_RETURNDEFAULT: ::DWORD = 0x00000400;
-pub const PSD_DISABLEPAPER: ::DWORD = 0x00000200;
-pub const PSD_SHOWHELP: ::DWORD = 0x00000800;
-pub const PSD_ENABLEPAGESETUPHOOK: ::DWORD = 0x00002000;
-pub const PSD_ENABLEPAGESETUPTEMPLATE: ::DWORD = 0x00008000;
-pub const PSD_ENABLEPAGESETUPTEMPLATEHANDLE: ::DWORD = 0x00020000;
-pub const PSD_ENABLEPAGEPAINTHOOK: ::DWORD = 0x00040000;
-pub const PSD_DISABLEPAGEPAINTING: ::DWORD = 0x00080000;
-pub const PSD_NONETWORKBUTTON: ::DWORD = 0x00200000;
diff --git a/vendor/winapi-0.2.8/src/corsym.rs b/vendor/winapi-0.2.8/src/corsym.rs
deleted file mode 100644
index d036f07d64..0000000000
--- a/vendor/winapi-0.2.8/src/corsym.rs
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Common Language Runtime Debugging Symbol Reader/Writer/Binder Interfaces
-DEFINE_GUID!(CorSym_LanguageType_C, 0x63a08714, 0xfc37, 0x11d2,
-    0x90, 0x4c, 0x0, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_LanguageType_CPlusPlus, 0x3a12d0b7, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x0, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_CSharp, 0x3f5162f8, 0x07c6, 0x11d3,
-    0x90, 0x53, 0x0, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_LanguageType_Basic, 0x3a12d0b8, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x0, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_Java, 0x3a12d0b4, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x0, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_Cobol, 0xaf046cd1, 0xd0e1, 0x11d2,
-    0x97, 0x7c, 0x0, 0xa0, 0xc9, 0xb4, 0xd5, 0xc);
-DEFINE_GUID!(CorSym_LanguageType_Pascal, 0xaf046cd2, 0xd0e1, 0x11d2,
-    0x97, 0x7c, 0x0, 0xa0, 0xc9, 0xb4, 0xd5, 0xc);
-DEFINE_GUID!(CorSym_LanguageType_ILAssembly, 0xaf046cd3, 0xd0e1, 0x11d2,
-    0x97, 0x7c, 0x0, 0xa0, 0xc9, 0xb4, 0xd5, 0xc);
-DEFINE_GUID!(CorSym_LanguageType_JScript, 0x3a12d0b6, 0xc26c, 0x11d0,
-    0xb4, 0x42, 0x00, 0xa0, 0x24, 0x4a, 0x1d, 0xd2);
-DEFINE_GUID!(CorSym_LanguageType_SMC, 0xd9b9f7b, 0x6611, 0x11d3,
-    0xbd, 0x2a, 0x0, 0x0, 0xf8, 0x8, 0x49, 0xbd);
-DEFINE_GUID!(CorSym_LanguageType_MCPlusPlus, 0x4b35fde8, 0x07c6, 0x11d3,
-    0x90, 0x53, 0x0, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_LanguageVendor_Microsoft, 0x994b45c4, 0xe6e9, 0x11d2,
-    0x90, 0x3f, 0x00, 0xc0, 0x4f, 0xa3, 0x02, 0xa1);
-DEFINE_GUID!(CorSym_DocumentType_Text, 0x5a869d0b, 0x6611, 0x11d3,
-    0xbd, 0x2a, 0x0, 0x0, 0xf8, 0x8, 0x49, 0xbd);
-DEFINE_GUID!(CorSym_DocumentType_MC, 0xeb40cb65, 0x3c1f, 0x4352,
-    0x9d, 0x7b, 0xba, 0xf, 0xc4, 0x7a, 0x9d, 0x77);
-DEFINE_GUID!(CorSym_SourceHash_MD5,  0x406ea660, 0x64cf, 0x4c82,
-    0xb6, 0xf0, 0x42, 0xd4, 0x81, 0x72, 0xa7, 0x99);
-DEFINE_GUID!(CorSym_SourceHash_SHA1, 0xff1816ec, 0xaa5e, 0x4d10,
-    0x87, 0xf7, 0x6f, 0x49, 0x63, 0x83, 0x34, 0x60);
-ENUM!{enum CorSymAddrKind {
-    ADDR_IL_OFFSET = 1,
-    ADDR_NATIVE_RVA = 2,
-    ADDR_NATIVE_REGISTER = 3,
-    ADDR_NATIVE_REGREL = 4,
-    ADDR_NATIVE_OFFSET = 5,
-    ADDR_NATIVE_REGREG = 6,
-    ADDR_NATIVE_REGSTK = 7,
-    ADDR_NATIVE_STKREG = 8,
-    ADDR_BITFIELD = 9,
-    ADDR_NATIVE_ISECTOFFSET = 10,
-}}
-FLAGS!{enum CorSymVarFlag {
-    VAR_IS_COMP_GEN = 1,
-}}
-RIDL!(
-interface ISymUnmanagedBinder(ISymUnmanagedBinderVtbl): IUnknown(IUnknownVtbl) {
-    fn GetReaderForFile(
-        &mut self, importer: *mut ::IUnknown, fileName: *const ::WCHAR, searchPath: *const ::WCHAR,
-        pRetVal: *mut *mut ISymUnmanagedReader
-    ) -> ::HRESULT,
-    fn GetReaderFromStream(
-        &mut self, importer: *mut ::IUnknown, pstream: *mut ::IStream,
-        pRetVal: *mut *mut ISymUnmanagedReader
-    ) -> ::HRESULT
-}
-);
-FLAGS!{enum CorSymSearchPolicyAttributes {
-    AllowRegistryAccess = 0x1,
-    AllowSymbolServerAccess = 0x2,
-    AllowOriginalPathAccess = 0x4,
-    AllowReferencePathAccess = 0x8,
-}}
-RIDL!(
-interface ISymUnmanagedBinder2(ISymUnmanagedBinder2Vtbl):
-    ISymUnmanagedBinder(ISymUnmanagedBinderVtbl) {
-    fn GetReaderForFile2(
-        &mut self, importer: *mut ::IUnknown, fileName: *const ::WCHAR, searchPath: *const ::WCHAR,
-        searchPolicy: ::ULONG32, pRetVal: *mut *mut ISymUnmanagedReader
-    ) -> ::HRESULT
-}
-);
-#[derive(Clone, Copy)]
-pub struct ISymUnmanagedReader;
diff --git a/vendor/winapi-0.2.8/src/d2d1.rs b/vendor/winapi-0.2.8/src/d2d1.rs
deleted file mode 100644
index 1b1b039803..0000000000
--- a/vendor/winapi-0.2.8/src/d2d1.rs
+++ /dev/null
@@ -1,734 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of d2d1.h
-// Types confirmed affected by the ABI issue:
-// D2D1_SIZE_F, D2D1_SIZE_U, D2D1_COLOR_F, D2D1_PIXEL_FORMAT,
-// D2D1_POINT_2F
-pub const D2D1_DEFAULT_FLATTENING_TOLERANCE: ::FLOAT = 0.25;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR: ::DWORD = 0;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR: ::DWORD = 1;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_CUBIC: ::DWORD = 2;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_MULTI_SAMPLE_LINEAR: ::DWORD = 3;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_ANISOTROPIC: ::DWORD = 4;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_HIGH_QUALITY_CUBIC: ::DWORD = 5;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_FANT: ::DWORD = 6;
-pub const D2D1_INTERPOLATION_MODE_DEFINITION_MIPMAP_LINEAR: ::DWORD = 7;
-ENUM!{enum D2D1_GAMMA {
-    D2D1_GAMMA_2_2 = 0,
-    D2D1_GAMMA_1_0 = 1,
-}}
-ENUM!{enum D2D1_OPACITY_MASK_CONTENT {
-    D2D1_OPACITY_MASK_CONTENT_GRAPHICS = 0,
-    D2D1_OPACITY_MASK_CONTENT_TEXT_NATURAL = 1,
-    D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE = 2,
-}}
-ENUM!{enum D2D1_EXTEND_MODE {
-    D2D1_EXTEND_MODE_CLAMP = 0,
-    D2D1_EXTEND_MODE_WRAP = 1,
-    D2D1_EXTEND_MODE_MIRROR = 2,
-}}
-ENUM!{enum D2D1_ANTIALIAS_MODE {
-    D2D1_ANTIALIAS_MODE_PER_PRIMITIVE = 0,
-    D2D1_ANTIALIAS_MODE_ALIASED = 1,
-}}
-ENUM!{enum D2D1_TEXT_ANTIALIAS_MODE {
-    D2D1_TEXT_ANTIALIAS_MODE_DEFAULT = 0,
-    D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE = 1,
-    D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE = 2,
-    D2D1_TEXT_ANTIALIAS_MODE_ALIASED = 3,
-}}
-ENUM!{enum D2D1_BITMAP_INTERPOLATION_MODE {
-    D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR =
-        D2D1_INTERPOLATION_MODE_DEFINITION_NEAREST_NEIGHBOR,
-    D2D1_BITMAP_INTERPOLATION_MODE_LINEAR =
-        D2D1_INTERPOLATION_MODE_DEFINITION_LINEAR,
-}}
-FLAGS!{enum D2D1_DRAW_TEXT_OPTIONS {
-    D2D1_DRAW_TEXT_OPTIONS_NO_SNAP = 0x00000001,
-    D2D1_DRAW_TEXT_OPTIONS_CLIP = 0x00000002,
-    D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT = 0x00000004,
-    D2D1_DRAW_TEXT_OPTIONS_NONE = 0x00000000,
-}}
-pub type D2D1_POINT_2U = ::D2D_POINT_2U;
-pub type D2D1_POINT_2F = ::D2D_POINT_2F;
-pub type D2D1_RECT_F = ::D2D_RECT_F;
-pub type D2D1_RECT_U = ::D2D_RECT_U;
-pub type D2D1_SIZE_F = ::D2D_SIZE_F;
-pub type D2D1_SIZE_U = ::D2D_SIZE_U;
-pub type D2D1_COLOR_F = ::D2D_COLOR_F;
-pub type D2D1_MATRIX_3X2_F = ::D2D_MATRIX_3X2_F;
-pub type D2D1_TAG = ::UINT64;
-STRUCT!{struct D2D1_BITMAP_PROPERTIES {
-    pixelFormat: ::D2D1_PIXEL_FORMAT,
-    dpiX: ::FLOAT,
-    dpiY: ::FLOAT,
-}}
-STRUCT!{struct D2D1_GRADIENT_STOP {
-    position: ::FLOAT,
-    color: D2D1_COLOR_F,
-}}
-STRUCT!{struct D2D1_BRUSH_PROPERTIES {
-    opacity: ::FLOAT,
-    transform: D2D1_MATRIX_3X2_F,
-}}
-STRUCT!{struct D2D1_BITMAP_BRUSH_PROPERTIES {
-    extendModeX: D2D1_EXTEND_MODE,
-    extendModeY: D2D1_EXTEND_MODE,
-    interpolationMode: D2D1_BITMAP_INTERPOLATION_MODE,
-}}
-STRUCT!{struct D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES {
-    startPoint: ::D2D1_POINT_2F,
-    endPoint: ::D2D1_POINT_2F,
-}}
-STRUCT!{struct D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES {
-    center: ::D2D1_POINT_2F,
-    gradientOriginOffset: ::D2D1_POINT_2F,
-    radiusX: ::FLOAT,
-    radiusY: ::FLOAT,
-}}
-ENUM!{enum D2D1_ARC_SIZE {
-    D2D1_ARC_SIZE_SMALL = 0,
-    D2D1_ARC_SIZE_LARGE = 1,
-}}
-ENUM!{enum D2D1_CAP_STYLE {
-    D2D1_CAP_STYLE_FLAT = 0,
-    D2D1_CAP_STYLE_SQUARE = 1,
-    D2D1_CAP_STYLE_ROUND = 2,
-    D2D1_CAP_STYLE_TRIANGLE = 3,
-}}
-ENUM!{enum D2D1_DASH_STYLE {
-    D2D1_DASH_STYLE_SOLID = 0,
-    D2D1_DASH_STYLE_DASH = 1,
-    D2D1_DASH_STYLE_DOT = 2,
-    D2D1_DASH_STYLE_DASH_DOT = 3,
-    D2D1_DASH_STYLE_DASH_DOT_DOT = 4,
-    D2D1_DASH_STYLE_CUSTOM = 5,
-}}
-ENUM!{enum D2D1_LINE_JOIN {
-    D2D1_LINE_JOIN_MITER = 0,
-    D2D1_LINE_JOIN_BEVEL = 1,
-    D2D1_LINE_JOIN_ROUND = 2,
-    D2D1_LINE_JOIN_MITER_OR_BEVEL = 3,
-}}
-ENUM!{enum D2D1_COMBINE_MODE {
-    D2D1_COMBINE_MODE_UNION = 0,
-    D2D1_COMBINE_MODE_INTERSECT = 1,
-    D2D1_COMBINE_MODE_XOR = 2,
-    D2D1_COMBINE_MODE_EXCLUDE = 3,
-}}
-ENUM!{enum D2D1_GEOMETRY_RELATION {
-    D2D1_GEOMETRY_RELATION_UNKNOWN = 0,
-    D2D1_GEOMETRY_RELATION_DISJOINT = 1,
-    D2D1_GEOMETRY_RELATION_IS_CONTAINED = 2,
-    D2D1_GEOMETRY_RELATION_CONTAINS = 3,
-    D2D1_GEOMETRY_RELATION_OVERLAP = 4,
-}}
-ENUM!{enum D2D1_GEOMETRY_SIMPLIFICATION_OPTION {
-    D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES = 0,
-    D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES = 1,
-}}
-ENUM!{enum D2D1_FIGURE_BEGIN {
-    D2D1_FIGURE_BEGIN_FILLED = 0,
-    D2D1_FIGURE_BEGIN_HOLLOW = 1,
-}}
-ENUM!{enum D2D1_FIGURE_END {
-    D2D1_FIGURE_END_OPEN = 0,
-    D2D1_FIGURE_END_CLOSED = 1,
-}}
-STRUCT!{struct D2D1_BEZIER_SEGMENT {
-    point1: ::D2D1_POINT_2F,
-    point2: ::D2D1_POINT_2F,
-    point3: ::D2D1_POINT_2F,
-}}
-STRUCT!{struct D2D1_TRIANGLE {
-    point1: ::D2D1_POINT_2F,
-    point2: ::D2D1_POINT_2F,
-    point3: ::D2D1_POINT_2F,
-}}
-FLAGS!{enum D2D1_PATH_SEGMENT {
-    D2D1_PATH_SEGMENT_NONE = 0x00000000,
-    D2D1_PATH_SEGMENT_FORCE_UNSTROKED = 0x00000001,
-    D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN = 0x00000002,
-}}
-ENUM!{enum D2D1_SWEEP_DIRECTION {
-    D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE = 0,
-    D2D1_SWEEP_DIRECTION_CLOCKWISE = 1,
-}}
-ENUM!{enum D2D1_FILL_MODE {
-    D2D1_FILL_MODE_ALTERNATE = 0,
-    D2D1_FILL_MODE_WINDING = 1,
-}}
-STRUCT!{struct D2D1_ARC_SEGMENT {
-    point: ::D2D1_POINT_2F,
-    size: D2D1_SIZE_F,
-    rotationAngle: ::FLOAT,
-    sweepDirection: D2D1_SWEEP_DIRECTION,
-    arcSize: D2D1_ARC_SIZE,
-}}
-STRUCT!{struct D2D1_QUADRATIC_BEZIER_SEGMENT {
-    point1: ::D2D1_POINT_2F,
-    point2: ::D2D1_POINT_2F,
-}}
-STRUCT!{struct D2D1_ELLIPSE {
-    point: ::D2D1_POINT_2F,
-    radiusX: ::FLOAT,
-    radiusY: ::FLOAT,
-}}
-STRUCT!{struct D2D1_ROUNDED_RECT {
-    rect: ::D2D1_RECT_F,
-    radiusX: ::FLOAT,
-    radiusY: ::FLOAT,
-}}
-STRUCT!{struct D2D1_STROKE_STYLE_PROPERTIES {
-    startCap: D2D1_CAP_STYLE,
-    endCap: D2D1_CAP_STYLE,
-    dashCap: D2D1_CAP_STYLE,
-    lineJoin: D2D1_LINE_JOIN,
-    miterLimit: ::FLOAT,
-    dashStyle: D2D1_DASH_STYLE,
-    dashOffset: ::FLOAT,
-}}
-FLAGS!{enum D2D1_LAYER_OPTIONS {
-    D2D1_LAYER_OPTIONS_NONE = 0x00000000,
-    D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE = 0x00000001,
-}}
-STRUCT!{struct D2D1_LAYER_PARAMETERS {
-    contentBounds: ::D2D1_RECT_F,
-    geometricMask: *mut ID2D1Geometry,
-    maskAntialiasMode: D2D1_ANTIALIAS_MODE,
-    maskTransform: D2D1_MATRIX_3X2_F,
-    opacity: ::FLOAT,
-    opacityBrush: *mut ID2D1Brush,
-    layerOptions: D2D1_LAYER_OPTIONS,
-}}
-ENUM!{enum D2D1_WINDOW_STATE {
-    D2D1_WINDOW_STATE_NONE = 0x0000000,
-    D2D1_WINDOW_STATE_OCCLUDED = 0x0000001,
-}}
-ENUM!{enum D2D1_RENDER_TARGET_TYPE {
-    D2D1_RENDER_TARGET_TYPE_DEFAULT = 0,
-    D2D1_RENDER_TARGET_TYPE_SOFTWARE = 1,
-    D2D1_RENDER_TARGET_TYPE_HARDWARE = 2,
-}}
-ENUM!{enum D2D1_FEATURE_LEVEL {
-    D2D1_FEATURE_LEVEL_DEFAULT = 0,
-    D2D1_FEATURE_LEVEL_9 = ::D3D_FEATURE_LEVEL_9_1.0,
-    D2D1_FEATURE_LEVEL_10 = ::D3D_FEATURE_LEVEL_10_0.0,
-}}
-FLAGS!{enum D2D1_RENDER_TARGET_USAGE {
-    D2D1_RENDER_TARGET_USAGE_NONE = 0x00000000,
-    D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING = 0x00000001,
-    D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE = 0x00000002,
-}}
-FLAGS!{enum D2D1_PRESENT_OPTIONS {
-    D2D1_PRESENT_OPTIONS_NONE = 0x00000000,
-    D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS = 0x00000001,
-    D2D1_PRESENT_OPTIONS_IMMEDIATELY = 0x00000002,
-}}
-STRUCT!{struct D2D1_RENDER_TARGET_PROPERTIES {
-    _type: D2D1_RENDER_TARGET_TYPE,
-    pixelFormat: ::D2D1_PIXEL_FORMAT,
-    dpiX: ::FLOAT,
-    dpiY: ::FLOAT,
-    usage: D2D1_RENDER_TARGET_USAGE,
-    minLevel: D2D1_FEATURE_LEVEL,
-}}
-STRUCT!{struct D2D1_HWND_RENDER_TARGET_PROPERTIES {
-    hwnd: ::HWND,
-    pixelSize: D2D1_SIZE_U,
-    presentOptions: D2D1_PRESENT_OPTIONS,
-}}
-FLAGS!{enum D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS {
-    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE = 0x00000000,
-    D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE = 0x00000001,
-}}
-STRUCT!{struct D2D1_DRAWING_STATE_DESCRIPTION {
-    antialiasMode: D2D1_ANTIALIAS_MODE,
-    textAntialiasMode: D2D1_TEXT_ANTIALIAS_MODE,
-    tag1: D2D1_TAG,
-    tag2: D2D1_TAG,
-    transform: D2D1_MATRIX_3X2_F,
-}}
-ENUM!{enum D2D1_DC_INITIALIZE_MODE {
-    D2D1_DC_INITIALIZE_MODE_COPY = 0,
-    D2D1_DC_INITIALIZE_MODE_CLEAR = 1,
-}}
-ENUM!{enum D2D1_DEBUG_LEVEL {
-    D2D1_DEBUG_LEVEL_NONE = 0,
-    D2D1_DEBUG_LEVEL_ERROR = 1,
-    D2D1_DEBUG_LEVEL_WARNING = 2,
-    D2D1_DEBUG_LEVEL_INFORMATION = 3,
-}}
-ENUM!{enum D2D1_FACTORY_TYPE {
-    D2D1_FACTORY_TYPE_SINGLE_THREADED = 0,
-    D2D1_FACTORY_TYPE_MULTI_THREADED = 1,
-}}
-STRUCT!{struct D2D1_FACTORY_OPTIONS {
-    debugLevel: D2D1_DEBUG_LEVEL,
-}}
-RIDL!(
-interface ID2D1Resource(ID2D1ResourceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFactory(&mut self, factory: *mut *mut ID2D1Factory) -> ()
-});
-RIDL!(
-interface ID2D1Image(ID2D1ImageVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-});
-RIDL!(
-interface ID2D1Bitmap(ID2D1BitmapVtbl): ID2D1Image(ID2D1ImageVtbl) {
-    fn GetSize(&mut self, ret: *mut D2D1_SIZE_F) -> *mut D2D1_SIZE_F, // FIXME: ABI issue
-    fn GetPixelSize(&mut self, ret: *mut D2D1_SIZE_U) -> *mut D2D1_SIZE_U, // FIXME: ABI issue
-    fn GetPixelFormat(
-        &mut self, ret: *mut ::D2D1_PIXEL_FORMAT
-    ) -> *mut ::D2D1_PIXEL_FORMAT, // FIXME: ABI issue
-    fn GetDpi(&mut self, dpiX: *mut ::FLOAT, dpiY: *mut ::FLOAT) -> (),
-    fn CopyFromBitmap(
-        &mut self, destPoint: *const ::D2D1_POINT_2U, bitmap: *mut ID2D1Bitmap,
-        srcRect: *const ::D2D1_RECT_U
-    ) -> ::HRESULT,
-    fn CopyFromRenderTarget(
-        &mut self, destPoint: *const ::D2D1_POINT_2U, renderTarget: *mut ID2D1RenderTarget,
-        srcRect: *const ::D2D1_RECT_U
-    ) -> ::HRESULT,
-    fn CopyFromMemory(
-        &mut self, dstRect: *const ::D2D1_RECT_U, srcData: *const ::c_void, pitch: ::UINT32
-    ) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1GradientStopCollection(ID2D1GradientStopCollectionVtbl)
-    : ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetGradientStopCount(&mut self) -> ::UINT32,
-    fn GetGradientStops(
-        &mut self, gradientStops: *mut D2D1_GRADIENT_STOP, gradientStopsCount: ::UINT32
-    ) -> (),
-    fn GetColorInterpolationGamma(&mut self) -> D2D1_GAMMA,
-    fn GetExtendMode(&mut self) -> D2D1_EXTEND_MODE
-});
-RIDL!(
-interface ID2D1Brush(ID2D1BrushVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn SetOpacity(&mut self, opacity: ::FLOAT) -> (),
-    fn SetTransform(&mut self, transform: *const D2D1_MATRIX_3X2_F) -> (),
-    fn GetOpacity(&mut self) -> ::FLOAT,
-    fn GetTransform(&mut self, transform: *mut D2D1_MATRIX_3X2_F) -> ()
-});
-RIDL!(
-interface ID2D1BitmapBrush(ID2D1BitmapBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetExtendModeX(&mut self, extendModeX: D2D1_EXTEND_MODE) -> (),
-    fn SetExtendModeY(&mut self, extendModeY: D2D1_EXTEND_MODE) -> (),
-    fn SetInterpolationMode(&mut self, interpolationMode: D2D1_BITMAP_INTERPOLATION_MODE) -> (),
-    fn SetBitmap(&mut self, bitmap: *mut ID2D1Bitmap) -> (),
-    fn GetExtendModeX(&mut self) -> D2D1_EXTEND_MODE,
-    fn GetExtendModeY(&mut self) -> D2D1_EXTEND_MODE,
-    fn GetInterpolationMode(&mut self) -> D2D1_BITMAP_INTERPOLATION_MODE,
-    fn GetBitmap(&mut self, bitmap: *mut *mut ID2D1Bitmap) -> ()
-});
-RIDL!(
-interface ID2D1SolidColorBrush(ID2D1SolidColorBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetColor(&mut self, color: *const D2D1_COLOR_F) -> (),
-    fn GetColor(&mut self, color: *mut D2D1_COLOR_F) -> *mut D2D1_COLOR_F
-});
-RIDL!(
-interface ID2D1LinearGradientBrush(ID2D1LinearGradientBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetStartPoint(&mut self, startPoint: ::D2D1_POINT_2F) -> (),
-    fn SetEndPoint(&mut self, endPoint: ::D2D1_POINT_2F) -> (),
-    fn GetStartPoint(&mut self, ret: *mut D2D1_POINT_2F) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetEndPoint(&mut self, ret: *mut D2D1_POINT_2F) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetGradientStopCollection(
-        &mut self, gradientStopCollection: *mut *mut ID2D1GradientStopCollection
-    ) -> ()
-});
-RIDL!(
-interface ID2D1RadialGradientBrush(ID2D1RadialGradientBrushVtbl): ID2D1Brush(ID2D1BrushVtbl) {
-    fn SetCenter(&mut self, center: ::D2D1_POINT_2F) -> (),
-    fn SetGradientOriginOffset(&mut self, gradientOriginOffset: ::D2D1_POINT_2F) -> (),
-    fn SetRadiusX(&mut self, radiusX: ::FLOAT) -> (),
-    fn SetRadiusY(&mut self, radiusY: ::FLOAT) -> (),
-    fn GetCenter(&mut self, ret: *mut D2D1_POINT_2F) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetGradientOriginOffset(
-        &mut self, ret: *mut D2D1_POINT_2F
-    ) -> *mut D2D1_POINT_2F, // FIXME ABI issue
-    fn GetRadiusX(&mut self) -> ::FLOAT,
-    fn GetRadiusY(&mut self) -> ::FLOAT,
-    fn GetGradientStopCollection(
-        &mut self, gradientStopCollection: *mut *mut ID2D1GradientStopCollection
-    ) -> ()
-});
-RIDL!(
-interface ID2D1StrokeStyle(ID2D1StrokeStyleVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetStartCap(&mut self) -> D2D1_CAP_STYLE,
-    fn GetEndCap(&mut self) -> D2D1_CAP_STYLE,
-    fn GetDashCap(&mut self) -> D2D1_CAP_STYLE,
-    fn GetMiterLimit(&mut self) -> ::FLOAT,
-    fn GetLineJoin(&mut self) -> D2D1_LINE_JOIN,
-    fn GetDashOffset(&mut self) -> ::FLOAT,
-    fn GetDashStyle(&mut self) -> D2D1_DASH_STYLE,
-    fn GetDashesCount(&mut self) -> ::UINT32,
-    fn GetDashes(&mut self, dashes: *mut ::FLOAT, dashesCount: ::UINT32) -> ()
-});
-RIDL!(
-interface ID2D1Geometry(ID2D1GeometryVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetBounds(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, bounds: *mut ::D2D1_RECT_F
-    ) -> ::HRESULT,
-    fn GetWidenedBounds(
-        &mut self, strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        bounds: *mut ::D2D1_RECT_F
-    ) -> ::HRESULT,
-    fn StrokeContainsPoint(
-        &mut self, point: ::D2D1_POINT_2F, strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        contains: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn FillContainsPoint(
-        &mut self, point: ::D2D1_POINT_2F, worldTransform: *const D2D1_MATRIX_3X2_F,
-        flatteningTolerance: ::FLOAT, contains: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn CompareWithGeometry(
-        &mut self, inputGeometry: *mut ID2D1Geometry,
-        inputGeometryTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        relation: *mut D2D1_GEOMETRY_RELATION
-    ) -> ::HRESULT,
-    fn Simplify(
-        &mut self, simplificationOption: D2D1_GEOMETRY_SIMPLIFICATION_OPTION,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT,
-    fn Tessellate(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        tessellationSink: *mut ID2D1TessellationSink
-    ) -> ::HRESULT,
-    fn CombineWithGeometry(
-        &mut self, inputGeometry: *mut ID2D1Geometry, combineMode: D2D1_COMBINE_MODE,
-        inputGeometryTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT,
-    fn Outline(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT,
-    fn ComputeArea(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        area: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn ComputeLength(
-        &mut self, worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        length: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn ComputePointAtLength(
-        &mut self, length: ::FLOAT, worldTransform: *const D2D1_MATRIX_3X2_F,
-        flatteningTolerance: ::FLOAT, point: *mut ::D2D1_POINT_2F,
-        unitTangentVector: *mut ::D2D1_POINT_2F
-    ) -> ::HRESULT,
-    fn Widen(
-        &mut self, strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle,
-        worldTransform: *const D2D1_MATRIX_3X2_F, flatteningTolerance: ::FLOAT,
-        geometrySink: *mut ID2D1SimplifiedGeometrySink
-    ) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1RectangleGeometry(ID2D1RectangleGeometryVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetRect(&mut self, rect: *mut ::D2D1_RECT_F) -> ()
-});
-RIDL!(
-interface ID2D1RoundedRectangleGeometry(ID2D1RoundedRectangleGeometryVtbl)
-    : ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetRoundedRect(&mut self, roundedRect: *mut D2D1_ROUNDED_RECT) -> ()
-});
-RIDL!(
-interface ID2D1EllipseGeometry(ID2D1EllipseGeometryVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetEllipse(&mut self, ellipse: *mut D2D1_ELLIPSE) -> ()
-});
-RIDL!(
-interface ID2D1GeometryGroup(ID2D1GeometryGroupVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetFillMode(&mut self) -> D2D1_FILL_MODE,
-    fn GetSourceGeometryCount(&mut self) -> ::UINT32,
-    fn GetSourceGeometries(
-        &mut self, geometries: *mut *mut ID2D1Geometry, geometriesCount: ::UINT32
-    ) -> ()
-});
-RIDL!(
-interface ID2D1TransformedGeometry(ID2D1TransformedGeometryVtbl)
-    : ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn GetSourceGeometry(&mut self, sourceGeometry: *mut *mut ID2D1Geometry) -> (),
-    fn GetTransform(&mut self, transform: *mut D2D1_MATRIX_3X2_F) -> ()
-});
-RIDL!(
-interface ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySinkVtbl): IUnknown(IUnknownVtbl) {
-    fn SetFillMode(&mut self, fillMode: D2D1_FILL_MODE) -> (),
-    fn SetSegmentFlags(&mut self, vertexFlags: D2D1_PATH_SEGMENT) -> (),
-    fn BeginFigure(&mut self, startPoint: ::D2D1_POINT_2F, figureBegin: D2D1_FIGURE_BEGIN) -> (),
-    fn AddLines(&mut self, points: *const ::D2D1_POINT_2F, pointsCount: ::UINT32) -> (),
-    fn AddBeziers(&mut self, beziers: *const D2D1_BEZIER_SEGMENT, beziersCount: ::UINT32) -> (),
-    fn EndFigure(&mut self, figureEnd: D2D1_FIGURE_END) -> (),
-    fn Close(&mut self) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1GeometrySink(ID2D1GeometrySinkVtbl)
-    : ID2D1SimplifiedGeometrySink(ID2D1SimplifiedGeometrySinkVtbl) {
-    fn AddLine(&mut self, point: ::D2D1_POINT_2F) -> (),
-    fn AddBezier(&mut self, bezier: *const D2D1_BEZIER_SEGMENT) -> (),
-    fn AddQuadraticBezier(&mut self, bezier: *const D2D1_QUADRATIC_BEZIER_SEGMENT) -> (),
-    fn AddQuadraticBeziers(
-        &mut self, beziers: *const D2D1_QUADRATIC_BEZIER_SEGMENT, beziersCount: ::UINT32
-    ) -> (),
-    fn AddArc(&mut self, arc: *const D2D1_ARC_SEGMENT) -> ()
-});
-RIDL!(
-interface ID2D1TessellationSink(ID2D1TessellationSinkVtbl): IUnknown(IUnknownVtbl) {
-    fn AddTriangles(&mut self, triangles: *const D2D1_TRIANGLE, triangleCount: ::UINT32) -> (),
-    fn Close(&mut self) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1PathGeometry(ID2D1PathGeometryVtbl): ID2D1Geometry(ID2D1GeometryVtbl) {
-    fn Open(&mut self, geometrySink: *mut *mut ID2D1GeometrySink) -> ::HRESULT,
-    fn Stream(&mut self, geometrySink: *mut ID2D1GeometrySink) -> ::HRESULT,
-    fn GetSegmentCount(&mut self, count: *mut ::UINT32) -> ::HRESULT,
-    fn GetFigureCount(&mut self, count: *mut ::UINT32) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1Mesh(ID2D1MeshVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn Open(&mut self, tessellationSink: *mut *mut ID2D1TessellationSink) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1Layer(ID2D1LayerVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetSize(&mut self, ret: *mut D2D1_SIZE_F) -> *mut D2D1_SIZE_F // FIXME: ABI issue
-});
-RIDL!(
-interface ID2D1DrawingStateBlock(ID2D1DrawingStateBlockVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn GetDescription(&mut self, stateDescription: *mut D2D1_DRAWING_STATE_DESCRIPTION) -> (),
-    fn SetDescription(&mut self, stateDescription: *const D2D1_DRAWING_STATE_DESCRIPTION) -> (),
-    fn SetTextRenderingParams(
-        &mut self, textRenderingParams: *mut ::IDWriteRenderingParams
-    ) -> (),
-    fn GetTextRenderingParams(
-        &mut self, textRenderingParams: *mut *mut ::IDWriteRenderingParams
-    ) -> ()
-});
-RIDL!(
-interface ID2D1RenderTarget(ID2D1RenderTargetVtbl): ID2D1Resource(ID2D1ResourceVtbl) {
-    fn CreateBitmap(
-        &mut self, size: D2D1_SIZE_U, srcData: *const ::c_void, pitch: ::UINT32,
-        bitmapProperties: *const D2D1_BITMAP_PROPERTIES, bitmap: *mut *mut ID2D1Bitmap
-    ) -> ::HRESULT,
-    fn CreateBitmapFromWicBitmap(
-        &mut self, wicBitmapSource: *mut ::IWICBitmapSource,
-        bitmapProperties: *const D2D1_BITMAP_PROPERTIES, bitmap: *mut *mut ID2D1Bitmap
-    ) -> ::HRESULT,
-    fn CreateSharedBitmap(
-        &mut self, riid: ::REFIID, data: *const ::c_void,
-        bitmapProperties: *const D2D1_BITMAP_PROPERTIES, bitmap: *mut *mut ID2D1Bitmap
-    ) -> ::HRESULT,
-    fn CreateBitmapBrush(
-        &mut self, bitmap: *mut ID2D1Bitmap,
-        bitmapBrushProperties: *const D2D1_BITMAP_BRUSH_PROPERTIES,
-        brushProperties: *const D2D1_BRUSH_PROPERTIES, bitmapBrush: *mut *mut ID2D1BitmapBrush
-    ) -> ::HRESULT,
-    fn CreateSolidColorBrush(
-        &mut self, color: *const D2D1_COLOR_F, brushProperties: *const D2D1_BRUSH_PROPERTIES,
-        solidColorBrush: *mut *mut ID2D1SolidColorBrush
-    ) -> ::HRESULT,
-    fn CreateGradientStopCollection(
-        &mut self, gradientStops: *const D2D1_GRADIENT_STOP, gradientStopsCount: ::UINT32,
-        colorInterpolationGamma: D2D1_GAMMA, extendMode: D2D1_EXTEND_MODE,
-        gradientStopCollection: *mut *mut ID2D1GradientStopCollection
-    ) -> ::HRESULT,
-    fn CreateLinearGradientBrush(
-        &mut self, linearGradientBrushProperties: *const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES,
-        brushProperties: *const D2D1_BRUSH_PROPERTIES,
-        gradientStopCollection: *mut ID2D1GradientStopCollection,
-        linearGradientBrush: *mut *mut ID2D1LinearGradientBrush
-    ) -> ::HRESULT,
-    fn CreateRadialGradientBrush(
-        &mut self, radialGradientBrushProperties: *const D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES,
-        brushProperties: *const D2D1_BRUSH_PROPERTIES,
-        gradientStopCollection: *mut ID2D1GradientStopCollection,
-        radialGradientBrush: *mut *mut ID2D1RadialGradientBrush
-    ) -> ::HRESULT,
-    fn CreateCompatibleRenderTarget(
-        &mut self, desiredSize: *const D2D1_SIZE_F, desiredPixelSize: *const D2D1_SIZE_U,
-        desiredFormat: *const ::D2D1_PIXEL_FORMAT, options: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS,
-        bitmapRenderTarget: *mut *mut ID2D1BitmapRenderTarget
-    ) -> ::HRESULT,
-    fn CreateLayer(&mut self, size: *const D2D1_SIZE_F, layer: *mut *mut ID2D1Layer) -> ::HRESULT,
-    fn CreateMesh(&mut self, mesh: *mut *mut ID2D1Mesh) -> ::HRESULT,
-    fn DrawLine(
-        &mut self, point0: ::D2D1_POINT_2F, point1: ::D2D1_POINT_2F, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStype: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn DrawRectangle(
-        &mut self, rect: *const ::D2D1_RECT_F, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillRectangle(
-        &mut self, rect: *const ::D2D1_RECT_F, brush: *mut ID2D1Brush
-    ) -> (),
-    fn DrawRoundedRectangle(
-        &mut self, roundedRect: *const D2D1_ROUNDED_RECT, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillRoundedRectangle(
-        &mut self, roundedRect: *const D2D1_ROUNDED_RECT, brush: *mut ID2D1Brush
-    ) -> (),
-    fn DrawEllipse(
-        &mut self, ellipse: *const D2D1_ELLIPSE, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillEllipse(
-        &mut self, ellipse: *const D2D1_ELLIPSE, brush: *mut ID2D1Brush
-    ) -> (),
-    fn DrawGeometry(
-        &mut self, geometry: *mut ID2D1Geometry, brush: *mut ID2D1Brush,
-        strokeWidth: ::FLOAT, strokeStyle: *mut ID2D1StrokeStyle
-    ) -> (),
-    fn FillGeometry(
-        &mut self, geometry: *mut ID2D1Geometry, brush: *mut ID2D1Brush,
-        opacityBrush: *mut ID2D1Brush
-    ) -> (),
-    fn FillMesh(
-        &mut self, mesh: *mut ID2D1Mesh, brush: *const ID2D1Brush
-    ) -> (),
-    fn FillOpacityMask(
-        &mut self, opacityMask: *mut ID2D1Bitmap, brush: *mut ID2D1Brush,
-        content: D2D1_OPACITY_MASK_CONTENT, destinationRectangle: *const ::D2D1_RECT_F,
-        sourceRectangle: *const ::D2D1_RECT_F
-    ) -> (),
-    fn DrawBitmap(
-        &mut self, bitmap: *mut ID2D1Bitmap, destinationRectangle: *const ::D2D1_RECT_F,
-        opacity: ::FLOAT, interpolationMode: D2D1_BITMAP_INTERPOLATION_MODE,
-        sourceRectangle: *const ::D2D1_RECT_F
-    ) -> (),
-    fn DrawText(
-        &mut self, string: *const ::WCHAR, stringLength: ::UINT32,
-        textFormat: *mut ::IDWriteTextFormat, layoutRect: *const ::D2D1_RECT_F,
-        defaultForegroundBrush: *mut ID2D1Brush, options: D2D1_DRAW_TEXT_OPTIONS,
-        measuringMode: ::DWRITE_MEASURING_MODE
-    ) -> (),
-    fn DrawTextLayout(
-        &mut self, origin: ::D2D1_POINT_2F, textLayout: *mut ::IDWriteTextLayout,
-        defaultForegroundBrush: *mut ID2D1Brush, options: D2D1_DRAW_TEXT_OPTIONS
-    ) -> (),
-    fn DrawGlyphRun(
-        &mut self, baselineOrigin: ::D2D1_POINT_2F, glyphRun: *const ::DWRITE_GLYPH_RUN,
-        foregroundBrush: *mut ID2D1Brush, measuringMode: ::DWRITE_MEASURING_MODE
-    ) -> (),
-    fn SetTransform(&mut self, transform: *const D2D1_MATRIX_3X2_F) -> (),
-    fn GetTransform(&mut self, transform: *mut D2D1_MATRIX_3X2_F) -> (),
-    fn SetAntialiasMode(&mut self, antialiasMode: D2D1_ANTIALIAS_MODE) -> (),
-    fn GetAntialiasMode(&mut self) -> D2D1_ANTIALIAS_MODE,
-    fn SetTextAntialiasMode(&mut self, textAntialiasMode: D2D1_TEXT_ANTIALIAS_MODE) -> (),
-    fn GetTextAntialiasMode(&mut self) -> D2D1_TEXT_ANTIALIAS_MODE,
-    fn SetTextRenderingParams(
-        &mut self, textRenderingParams: *mut ::IDWriteRenderingParams
-    ) -> (),
-    fn GetTextRenderingParams(
-        &mut self, textRenderingParams: *mut *mut ::IDWriteRenderingParams
-    ) -> (),
-    fn SetTags(&mut self, tag1: D2D1_TAG, tag2: D2D1_TAG) -> (),
-    fn GetTags(&mut self, tag1: *mut D2D1_TAG, tag2: *mut D2D1_TAG) -> (),
-    fn PushLayer(
-        &mut self, layerParameters: *const D2D1_LAYER_PARAMETERS, layer: *mut ID2D1Layer
-    ) -> (),
-    fn PopLayer(&mut self) -> (),
-    fn Flush(&mut self, tag1: *mut D2D1_TAG, tag2: *mut D2D1_TAG) -> ::HRESULT,
-    fn SaveDrawingState(&mut self, drawingStateBlock: *mut ID2D1DrawingStateBlock) -> (),
-    fn RestoreDrawingState(&mut self, drawingStateBlock: *mut ID2D1DrawingStateBlock) -> (),
-    fn PushAxisAlignedClip(
-        &mut self, clipRect: *const ::D2D1_RECT_F, antialiasMode: D2D1_ANTIALIAS_MODE
-    ) -> (),
-    fn PopAxisAlignedClip(&mut self) -> (),
-    fn Clear(&mut self, clearColor: *const D2D1_COLOR_F) -> (),
-    fn BeginDraw(&mut self) -> (),
-    fn EndDraw(&mut self, tag1: *mut D2D1_TAG, tag2: *mut D2D1_TAG) -> ::HRESULT,
-    fn GetPixelFormat(
-        &mut self, ret: *mut ::D2D1_PIXEL_FORMAT
-    ) -> *mut ::D2D1_PIXEL_FORMAT, // FIXME: ABI issue
-    fn SetDpi(&mut self, dpiX: ::FLOAT, dpiY: ::FLOAT) -> (),
-    fn GetDpi(&mut self, dpiX: *mut ::FLOAT, dpiY: *mut ::FLOAT) -> (),
-    fn GetSize(&mut self, ret: *mut D2D1_SIZE_F) -> *mut D2D1_SIZE_F, // FIXME: ABI issue
-    fn GetPixelSize(&mut self, ret: *mut D2D1_SIZE_U) -> *mut D2D1_SIZE_U, // FIXME: ABI issue
-    fn GetMaximumBitmapSize(&mut self) -> ::UINT32,
-    fn IsSupported(
-        &mut self, renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES
-    ) -> ::BOOL
-});
-RIDL!(
-interface ID2D1BitmapRenderTarget(ID2D1BitmapRenderTargetVtbl)
-    : ID2D1RenderTarget(ID2D1RenderTargetVtbl) {
-    fn GetBitmap(&mut self, bitmap: *mut *mut ID2D1Bitmap) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1HwndRenderTarget(ID2D1HwndRenderTargetVtbl)
-    : ID2D1RenderTarget(ID2D1RenderTargetVtbl) {
-    fn CheckWindowState(&mut self) -> D2D1_WINDOW_STATE,
-    fn Resize(&mut self, pixelSize: *const D2D1_SIZE_U) -> ::HRESULT,
-    fn GetHwnd(&mut self) -> ::HWND
-});
-RIDL!(
-interface ID2D1GdiInteropRenderTarget(ID2D1GdiInteropRenderTargetVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDC(&mut self, mode: D2D1_DC_INITIALIZE_MODE, hdc: *mut ::HDC) -> ::HRESULT,
-    fn ReleaseDC(&mut self, update: *const ::RECT) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1DCRenderTarget(ID2D1DCRenderTargetVtbl): ID2D1RenderTarget(ID2D1RenderTargetVtbl) {
-    fn BindDC(&mut self, hDC: ::HDC, pSubRect: *const ::RECT) -> ::HRESULT
-});
-RIDL!(
-interface ID2D1Factory(ID2D1FactoryVtbl): IUnknown(IUnknownVtbl) {
-    fn ReloadSystemMetrics(&mut self) -> ::HRESULT,
-    fn GetDesktopDpi(&mut self, dpiX: *mut ::FLOAT, dpiY: *mut ::FLOAT) -> (),
-    fn CreateRectangleGeometry(
-        &mut self, rectangle: *const ::D2D1_RECT_F,
-        rectangleGeometry: *mut *mut ID2D1RectangleGeometry
-    ) -> ::HRESULT,
-    fn CreateRoundedRectangleGeometry(
-        &mut self, roundedRectangle: *const D2D1_ROUNDED_RECT,
-        roundedRectangleGeometry: *mut *mut ID2D1RoundedRectangleGeometry
-    ) -> ::HRESULT,
-    fn CreateEllipseGeometry(
-        &mut self, ellipse: *const D2D1_ELLIPSE,
-        ellipseGeometry: *mut *mut ID2D1EllipseGeometry
-    ) -> ::HRESULT,
-    fn CreateGeometryGroup(
-        &mut self, fillMode: D2D1_FILL_MODE, geometries: *mut *mut ID2D1Geometry,
-        geometriesCount: ::UINT32, geometryGroup: *mut *mut ID2D1GeometryGroup
-    ) -> ::HRESULT,
-    fn CreateTransformedGeometry(
-        &mut self, sourceGeometry: *mut ID2D1Geometry, transform: *const D2D1_MATRIX_3X2_F,
-        transformedGeometry: *mut *mut ID2D1TransformedGeometry
-    ) -> ::HRESULT,
-    fn CreatePathGeometry(
-        &mut self, pathGeometry: *mut *mut ID2D1PathGeometry
-    ) -> ::HRESULT,
-    fn CreateStrokeStyle(
-        &mut self, strokeStyleProperties: *const D2D1_STROKE_STYLE_PROPERTIES,
-        dashes: *const ::FLOAT, dashesCount: ::UINT32, strokeStyle: *mut *mut ID2D1StrokeStyle
-    ) -> ::HRESULT,
-    fn CreateDrawingStateBlock(
-        &mut self, drawingStateDescription: *const D2D1_DRAWING_STATE_DESCRIPTION,
-        textRenderingParams: *mut ::IDWriteRenderingParams,
-        drawingStateBlock: *mut *mut ID2D1DrawingStateBlock
-    ) -> ::HRESULT,
-    fn CreateWicBitmapRenderTarget(
-        &mut self, target: *mut ::IWICBitmap,
-        renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        renderTarget: *mut *mut ID2D1RenderTarget
-    ) -> ::HRESULT,
-    fn CreateHwndRenderTarget(
-        &mut self, renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        hwndRenderTargetProperties: *const D2D1_HWND_RENDER_TARGET_PROPERTIES,
-        hwndRenderTarget: *mut *mut ID2D1HwndRenderTarget
-    ) -> ::HRESULT,
-    fn CreateDxgiSurfaceRenderTarget(
-        &mut self, dxgiSurface: *mut ::IDXGISurface,
-        renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        renderTarget: *mut *mut ID2D1RenderTarget
-    ) -> ::HRESULT,
-    fn CreateDCRenderTarget(
-        &mut self, renderTargetProperties: *const D2D1_RENDER_TARGET_PROPERTIES,
-        dcRenderTarget: *mut *mut ID2D1DCRenderTarget
-    ) -> ::HRESULT
-});
-DEFINE_GUID!(
-    UuidOfID2D1Factory,
-    0x06152247, 0x6f50, 0x465a, 0x92, 0x45, 0x11, 0x8b, 0xfd, 0x3b, 0x60, 0x07
-);
diff --git a/vendor/winapi-0.2.8/src/d2dbasetypes.rs b/vendor/winapi-0.2.8/src/d2dbasetypes.rs
deleted file mode 100644
index 45a5a1414d..0000000000
--- a/vendor/winapi-0.2.8/src/d2dbasetypes.rs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of d2dbasetypes.h
-STRUCT!{struct D2D_POINT_2U {
-    x: ::UINT32,
-    y: ::UINT32,
-}}
-STRUCT!{struct D2D_POINT_2F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-}}
-pub type D2D_POINT_2L = ::POINT;
-STRUCT!{struct D2D_VECTOR_2F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-}}
-STRUCT!{struct D2D_VECTOR_3F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-    z: ::FLOAT,
-}}
-STRUCT!{struct D2D_VECTOR_4F {
-    x: ::FLOAT,
-    y: ::FLOAT,
-    z: ::FLOAT,
-    w: ::FLOAT,
-}}
-STRUCT!{struct D2D_RECT_F {
-    left: ::FLOAT,
-    top: ::FLOAT,
-    right: ::FLOAT,
-    bottom: ::FLOAT,
-}}
-STRUCT!{struct D2D_RECT_U {
-    left: ::UINT32,
-    top: ::UINT32,
-    right: ::UINT32,
-    bottom: ::UINT32,
-}}
-pub type D2D_RECT_L = ::RECT;
-STRUCT!{struct D2D_SIZE_F {
-    width: ::FLOAT,
-    height: ::FLOAT,
-}}
-STRUCT!{struct D2D_SIZE_U {
-    width: ::UINT32,
-    height: ::UINT32,
-}}
-pub type D2D_COLOR_F = ::D3DCOLORVALUE;
-STRUCT!{struct D2D_MATRIX_3X2_F {
-    matrix: [[::FLOAT; 2]; 3],
-}}
-STRUCT!{struct D2D_MATRIX_4X3_F {
-    matrix: [[::FLOAT; 3]; 4],
-}}
-STRUCT!{struct D2D_MATRIX_4X4_F {
-    matrix: [[::FLOAT; 4]; 4],
-}}
-STRUCT!{struct D2D_MATRIX_5X4_F {
-    matrix: [[::FLOAT; 4]; 5],
-}}
diff --git a/vendor/winapi-0.2.8/src/d3d10shader.rs b/vendor/winapi-0.2.8/src/d3d10shader.rs
deleted file mode 100644
index 4f64c5f330..0000000000
--- a/vendor/winapi-0.2.8/src/d3d10shader.rs
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub type D3D10_RESOURCE_RETURN_TYPE = D3D_RESOURCE_RETURN_TYPE;
-pub type D3D10_CBUFFER_TYPE = D3D_CBUFFER_TYPE;
-STRUCT!{struct D3D10_SHADER_DESC {
-    Version: UINT,
-    Creator: LPCSTR,
-    Flags: UINT,
-    ConstantBuffers: UINT,
-    BoundResources: UINT,
-    InputParameters: UINT,
-    OutputParameters: UINT,
-    InstructionCount: UINT,
-    TempRegisterCount: UINT,
-    TempArrayCount: UINT,
-    DefCount: UINT,
-    DclCount: UINT,
-    TextureNormalInstructions: UINT,
-    TextureLoadInstructions: UINT,
-    TextureCompInstructions: UINT,
-    TextureBiasInstructions: UINT,
-    TextureGradientInstructions: UINT,
-    FloatInstructionCount: UINT,
-    IntInstructionCount: UINT,
-    UintInstructionCount: UINT,
-    StaticFlowControlCount: UINT,
-    DynamicFlowControlCount: UINT,
-    MacroInstructionCount: UINT,
-    ArrayInstructionCount: UINT,
-    CutInstructionCount: UINT,
-    EmitInstructionCount: UINT,
-    GSOutputTopology: D3D_PRIMITIVE_TOPOLOGY,
-    GSMaxOutputVertexCount: UINT,
-}}
-STRUCT!{struct D3D10_SHADER_BUFFER_DESC {
-    Name: LPCSTR,
-    Type: D3D10_CBUFFER_TYPE,
-    Variables: UINT,
-    Size: UINT,
-    uFlags: UINT,
-}}
-STRUCT!{struct D3D10_SHADER_VARIABLE_DESC {
-    Name: LPCSTR,
-    StartOffset: UINT,
-    Size: UINT,
-    uFlags: UINT,
-    DefaultValue: LPVOID,
-}}
-STRUCT!{struct D3D10_SHADER_TYPE_DESC {
-    Class: D3D_SHADER_VARIABLE_CLASS,
-    Type: D3D_SHADER_VARIABLE_TYPE,
-    Rows: UINT,
-    Columns: UINT,
-    Elements: UINT,
-    Members: UINT,
-    Offset: UINT,
-}}
-STRUCT!{struct D3D10_SHADER_INPUT_BIND_DESC {
-    Name: LPCSTR,
-    Type: D3D_SHADER_INPUT_TYPE,
-    BindPoint: UINT,
-    BindCount: UINT,
-    uFlags: UINT,
-    ReturnType: D3D_RESOURCE_RETURN_TYPE,
-    Dimension: D3D_SRV_DIMENSION,
-    NumSamples: UINT,
-}}
-STRUCT!{struct D3D10_SIGNATURE_PARAMETER_DESC {
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    Register: UINT,
-    SystemValueType: D3D_NAME,
-    ComponentType: D3D_REGISTER_COMPONENT_TYPE,
-    Mask: BYTE,
-    ReadWriteMask: BYTE,
-}}
-RIDL!{interface ID3D10ShaderReflectionType(ID3D10ShaderReflectionTypeVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_TYPE_DESC) -> HRESULT,
-    fn GetMemberTypeByIndex(&mut self, Index: UINT) -> *mut ID3D10ShaderReflectionType,
-    fn GetMemberTypeByName(&mut self, Name: LPCSTR) -> *mut ID3D10ShaderReflectionType,
-    fn GetMemberTypeName(&mut self, Index: UINT) -> LPCSTR
-}}
-RIDL!{interface ID3D10ShaderReflectionVariable(ID3D10ShaderReflectionVariableVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_VARIABLE_DESC) -> HRESULT,
-    fn GetType(&mut self) -> *mut ID3D10ShaderReflectionType
-}}
-RIDL!{interface ID3D10ShaderReflectionConstantBuffer(ID3D10ShaderReflectionConstantBufferVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_BUFFER_DESC) -> HRESULT,
-    fn GetVariableByIndex(&mut self, Index: UINT) -> *mut ID3D10ShaderReflectionVariable,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D10ShaderReflectionVariable
-}}
-RIDL!{interface ID3D10ShaderReflection(ID3D10ShaderReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D10_SHADER_DESC) -> HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, Index: UINT
-    ) -> *mut ID3D10ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: LPCSTR
-    ) -> *mut ID3D10ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: UINT, pDesc: *mut D3D10_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetInputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D10_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetOutputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D10_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT
-}}
diff --git a/vendor/winapi-0.2.8/src/d3d11.rs b/vendor/winapi-0.2.8/src/d3d11.rs
deleted file mode 100644
index 4fed70ca2e..0000000000
--- a/vendor/winapi-0.2.8/src/d3d11.rs
+++ /dev/null
@@ -1,2665 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const D3D11_16BIT_INDEX_STRIP_CUT_VALUE: DWORD = 0xffff;
-pub const D3D11_32BIT_INDEX_STRIP_CUT_VALUE: DWORD = 0xffffffff;
-pub const D3D11_8BIT_INDEX_STRIP_CUT_VALUE: DWORD = 0xff;
-pub const D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT: DWORD = 9;
-pub const D3D11_CLIP_OR_CULL_DISTANCE_COUNT: DWORD = 8;
-pub const D3D11_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT: DWORD = 2;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT: DWORD = 14;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT: DWORD = 15;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_PARTIAL_UPDATE_EXTENTS_BYTE_ALIGNMENT: DWORD = 16;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT: DWORD = 15;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT: DWORD = 64;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT: DWORD = 128;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT: DWORD = 128;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_COUNT: DWORD = 16;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_COMMONSHADER_SAMPLER_SLOT_COUNT: DWORD = 16;
-pub const D3D11_COMMONSHADER_SUBROUTINE_NESTING_LIMIT: DWORD = 32;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_COUNT: DWORD = 4096;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_READS_PER_INST: DWORD = 3;
-pub const D3D11_COMMONSHADER_TEMP_REGISTER_READ_PORTS: DWORD = 3;
-pub const D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX: DWORD = 10;
-pub const D3D11_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN: c_long = -10;
-pub const D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE: c_long = -8;
-pub const D3D11_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE: DWORD = 7;
-pub const D3D11_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 256;
-pub const D3D11_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP: DWORD = 64;
-pub const D3D11_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 240;
-pub const D3D11_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP: DWORD = 68;
-pub const D3D11_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 224;
-pub const D3D11_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP: DWORD = 72;
-pub const D3D11_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 208;
-pub const D3D11_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP: DWORD = 76;
-pub const D3D11_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 192;
-pub const D3D11_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP: DWORD = 84;
-pub const D3D11_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 176;
-pub const D3D11_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP: DWORD = 92;
-pub const D3D11_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 160;
-pub const D3D11_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP: DWORD = 100;
-pub const D3D11_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 144;
-pub const D3D11_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP: DWORD = 112;
-pub const D3D11_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 128;
-pub const D3D11_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP: DWORD = 128;
-pub const D3D11_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 112;
-pub const D3D11_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP: DWORD = 144;
-pub const D3D11_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 96;
-pub const D3D11_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP: DWORD = 168;
-pub const D3D11_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 80;
-pub const D3D11_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP: DWORD = 204;
-pub const D3D11_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 64;
-pub const D3D11_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP: DWORD = 256;
-pub const D3D11_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 48;
-pub const D3D11_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP: DWORD = 340;
-pub const D3D11_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 32;
-pub const D3D11_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP: DWORD = 512;
-pub const D3D11_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: DWORD = 16;
-pub const D3D11_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP: DWORD = 768;
-pub const D3D11_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION: DWORD = 1;
-pub const D3D11_CS_4_X_RAW_UAV_BYTE_ALIGNMENT: DWORD = 256;
-pub const D3D11_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP: DWORD = 768;
-pub const D3D11_CS_4_X_THREAD_GROUP_MAX_X: DWORD = 768;
-pub const D3D11_CS_4_X_THREAD_GROUP_MAX_Y: DWORD = 768;
-pub const D3D11_CS_4_X_UAV_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION: DWORD = 65535;
-pub const D3D11_CS_TGSM_REGISTER_COUNT: DWORD = 8192;
-pub const D3D11_CS_TGSM_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_CS_TGSM_RESOURCE_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_CS_TGSM_RESOURCE_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_CS_THREADGROUPID_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_CS_THREADGROUPID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREADIDINGROUPFLATTENED_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_CS_THREADIDINGROUPFLATTENED_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREADIDINGROUP_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_CS_THREADIDINGROUP_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREADID_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_CS_THREADID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP: DWORD = 1024;
-pub const D3D11_CS_THREAD_GROUP_MAX_X: DWORD = 1024;
-pub const D3D11_CS_THREAD_GROUP_MAX_Y: DWORD = 1024;
-pub const D3D11_CS_THREAD_GROUP_MAX_Z: DWORD = 64;
-pub const D3D11_CS_THREAD_GROUP_MIN_X: DWORD = 1;
-pub const D3D11_CS_THREAD_GROUP_MIN_Y: DWORD = 1;
-pub const D3D11_CS_THREAD_GROUP_MIN_Z: DWORD = 1;
-pub const D3D11_CS_THREAD_LOCAL_TEMP_REGISTER_POOL: DWORD = 16384;
-pub const D3D11_DEFAULT_BLEND_FACTOR_ALPHA: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BLEND_FACTOR_BLUE: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BLEND_FACTOR_GREEN: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BLEND_FACTOR_RED: FLOAT = 1.0;
-pub const D3D11_DEFAULT_BORDER_COLOR_COMPONENT: FLOAT = 0.0;
-pub const D3D11_DEFAULT_DEPTH_BIAS: DWORD = 0;
-pub const D3D11_DEFAULT_DEPTH_BIAS_CLAMP: FLOAT = 0.0;
-pub const D3D11_DEFAULT_MAX_ANISOTROPY: DWORD = 16;
-pub const D3D11_DEFAULT_MIP_LOD_BIAS: FLOAT = 0.0;
-pub const D3D11_DEFAULT_RENDER_TARGET_ARRAY_INDEX: DWORD = 0;
-pub const D3D11_DEFAULT_SAMPLE_MASK: DWORD = 0xffffffff;
-pub const D3D11_DEFAULT_SCISSOR_ENDX: DWORD = 0;
-pub const D3D11_DEFAULT_SCISSOR_ENDY: DWORD = 0;
-pub const D3D11_DEFAULT_SCISSOR_STARTX: DWORD = 0;
-pub const D3D11_DEFAULT_SCISSOR_STARTY: DWORD = 0;
-pub const D3D11_DEFAULT_SLOPE_SCALED_DEPTH_BIAS: FLOAT = 0.0;
-pub const D3D11_DEFAULT_STENCIL_READ_MASK: DWORD = 0xff;
-pub const D3D11_DEFAULT_STENCIL_REFERENCE: DWORD = 0;
-pub const D3D11_DEFAULT_STENCIL_WRITE_MASK: DWORD = 0xff;
-pub const D3D11_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_HEIGHT: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_MAX_DEPTH: FLOAT = 0.0;
-pub const D3D11_DEFAULT_VIEWPORT_MIN_DEPTH: FLOAT = 0.0;
-pub const D3D11_DEFAULT_VIEWPORT_TOPLEFTX: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_TOPLEFTY: DWORD = 0;
-pub const D3D11_DEFAULT_VIEWPORT_WIDTH: DWORD = 0;
-pub const D3D11_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: DWORD = 3968;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS: DWORD = 3;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_DS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_DS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_DS_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_FLOAT16_FUSED_TOLERANCE_IN_ULP: FLOAT = 0.6;
-pub const D3D11_FLOAT32_MAX: FLOAT = 3.402823466E+38;
-pub const D3D11_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP: FLOAT = 0.6;
-pub const D3D11_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR: FLOAT = 2.4;
-pub const D3D11_FLOAT_TO_SRGB_EXPONENT_NUMERATOR: FLOAT = 1.0;
-pub const D3D11_FLOAT_TO_SRGB_OFFSET: FLOAT = 0.055;
-pub const D3D11_FLOAT_TO_SRGB_SCALE_1: FLOAT = 12.92;
-pub const D3D11_FLOAT_TO_SRGB_SCALE_2: FLOAT = 1.055;
-pub const D3D11_FLOAT_TO_SRGB_THRESHOLD: FLOAT = 0.0031308;
-pub const D3D11_FTOI_INSTRUCTION_MAX_INPUT: FLOAT = 2147483647.999;
-pub const D3D11_FTOI_INSTRUCTION_MIN_INPUT: FLOAT = -2147483648.999;
-pub const D3D11_FTOU_INSTRUCTION_MAX_INPUT: FLOAT = 4294967295.999;
-pub const D3D11_FTOU_INSTRUCTION_MIN_INPUT: FLOAT = 0.0;
-pub const D3D11_GS_INPUT_INSTANCE_ID_READS_PER_INST: DWORD = 2;
-pub const D3D11_GS_INPUT_INSTANCE_ID_READ_PORTS: DWORD = 1;
-pub const D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_INSTANCE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_GS_INPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_GS_INPUT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_GS_INPUT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_GS_INPUT_REGISTER_VERTICES: DWORD = 32;
-pub const D3D11_GS_MAX_INSTANCE_COUNT: DWORD = 32;
-pub const D3D11_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES: DWORD = 1024;
-pub const D3D11_GS_OUTPUT_ELEMENTS: DWORD = 32;
-pub const D3D11_GS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_GS_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_CONTROL_POINT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND: DWORD = 0xffffffff;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND: DWORD = 0xffffffff;
-pub const D3D11_HS_MAXTESSFACTOR_LOWER_BOUND: FLOAT = 1.0;
-pub const D3D11_HS_MAXTESSFACTOR_UPPER_BOUND: FLOAT = 64.0;
-pub const D3D11_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: DWORD = 3968;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_HS_OUTPUT_PATCH_CONSTANT_REGISTER_SCALAR_COMPONENTS: DWORD = 128;
-pub const D3D11_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES: DWORD = 0;
-pub const D3D11_IA_DEFAULT_PRIMITIVE_TOPOLOGY: DWORD = 0;
-pub const D3D11_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES: DWORD = 0;
-pub const D3D11_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT: DWORD = 1;
-pub const D3D11_IA_INSTANCE_ID_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_INTEGER_ARITHMETIC_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_PATCH_MAX_CONTROL_POINT_COUNT: DWORD = 32;
-pub const D3D11_IA_PRIMITIVE_ID_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_VERTEX_ID_BIT_COUNT: DWORD = 32;
-pub const D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT: DWORD = 32;
-pub const D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS: DWORD = 128;
-pub const D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT: DWORD = 32;
-pub const D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT: DWORD = 0xffffffff;
-pub const D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER: DWORD = 0xffffffff;
-pub const D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL: DWORD = 0xffffffff;
-pub const D3D11_KEEP_UNORDERED_ACCESS_VIEWS: DWORD = 0xffffffff;
-pub const D3D11_LINEAR_GAMMA: FLOAT = 1.0;
-pub const D3D11_MAJOR_VERSION: DWORD = 11;
-pub const D3D11_MAX_BORDER_COLOR_COMPONENT: FLOAT = 1.0;
-pub const D3D11_MAX_DEPTH: FLOAT = 1.0;
-pub const D3D11_MAX_MAXANISOTROPY: DWORD = 16;
-pub const D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT: DWORD = 32;
-pub const D3D11_MAX_POSITION_VALUE: FLOAT = 3.402823466E+34;
-pub const D3D11_MAX_TEXTURE_DIMENSION_2_TO_EXP: DWORD = 17;
-pub const D3D11_MINOR_VERSION: DWORD = 0;
-pub const D3D11_MIN_BORDER_COLOR_COMPONENT: FLOAT = 0.0;
-pub const D3D11_MIN_DEPTH: FLOAT = 0.0;
-pub const D3D11_MIN_MAXANISOTROPY: DWORD = 0;
-pub const D3D11_MIP_LOD_BIAS_MAX: FLOAT = 15.99;
-pub const D3D11_MIP_LOD_BIAS_MIN: FLOAT = -16.0;
-pub const D3D11_MIP_LOD_FRACTIONAL_BIT_COUNT: DWORD = 8;
-pub const D3D11_MIP_LOD_RANGE_BIT_COUNT: DWORD = 8;
-pub const D3D11_MULTISAMPLE_ANTIALIAS_LINE_WIDTH: FLOAT = 1.4;
-pub const D3D11_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT: DWORD = 0;
-pub const D3D11_PIXEL_ADDRESS_RANGE_BIT_COUNT: DWORD = 15;
-pub const D3D11_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT: DWORD = 16;
-pub const D3D11_PS_CS_UAV_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_PS_CS_UAV_REGISTER_COUNT: DWORD = 8;
-pub const D3D11_PS_CS_UAV_REGISTER_READS_PER_INST: DWORD = 1;
-pub const D3D11_PS_CS_UAV_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_PS_FRONTFACING_DEFAULT_VALUE: DWORD = 0xffffffff;
-pub const D3D11_PS_FRONTFACING_FALSE_VALUE: DWORD = 0;
-pub const D3D11_PS_FRONTFACING_TRUE_VALUE: DWORD = 0xffffffff;
-pub const D3D11_PS_INPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_PS_INPUT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_PS_INPUT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT: FLOAT = 0.0;
-pub const D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_OUTPUT_DEPTH_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENTS: DWORD = 1;
-pub const D3D11_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_OUTPUT_MASK_REGISTER_COUNT: DWORD = 1;
-pub const D3D11_PS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_PS_OUTPUT_REGISTER_COUNT: DWORD = 8;
-pub const D3D11_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT: FLOAT = 0.5;
-pub const D3D11_RAW_UAV_SRV_BYTE_ALIGNMENT: DWORD = 16;
-pub const D3D11_REQ_BLEND_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP: DWORD = 27;
-pub const D3D11_REQ_CONSTANT_BUFFER_ELEMENT_COUNT: DWORD = 4096;
-pub const D3D11_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: DWORD = 32;
-pub const D3D11_REQ_DRAW_VERTEX_COUNT_2_TO_EXP: DWORD = 32;
-pub const D3D11_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION: DWORD = 16384;
-pub const D3D11_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT: DWORD = 1024;
-pub const D3D11_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT: DWORD = 4096;
-pub const D3D11_REQ_MAXANISOTROPY: DWORD = 16;
-pub const D3D11_REQ_MIP_LEVELS: DWORD = 15;
-pub const D3D11_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES: DWORD = 2048;
-pub const D3D11_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH: DWORD = 16384;
-pub const D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM: DWORD = 128;
-pub const D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM: FLOAT = 0.25;
-pub const D3D11_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_C_TERM: DWORD = 2048;
-pub const D3D11_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP: DWORD = 20;
-pub const D3D11_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE: DWORD = 4096;
-pub const D3D11_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION: DWORD = 2048;
-pub const D3D11_REQ_TEXTURE1D_U_DIMENSION: DWORD = 16384;
-pub const D3D11_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION: DWORD = 2048;
-pub const D3D11_REQ_TEXTURE2D_U_OR_V_DIMENSION: DWORD = 16384;
-pub const D3D11_REQ_TEXTURE3D_U_V_OR_W_DIMENSION: DWORD = 2048;
-pub const D3D11_REQ_TEXTURECUBE_DIMENSION: DWORD = 16384;
-pub const D3D11_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL: DWORD = 0;
-pub const D3D11_SHADER_MAJOR_VERSION: DWORD = 5;
-pub const D3D11_SHADER_MAX_INSTANCES: DWORD = 65535;
-pub const D3D11_SHADER_MAX_INTERFACES: DWORD = 253;
-pub const D3D11_SHADER_MAX_INTERFACE_CALL_SITES: DWORD = 4096;
-pub const D3D11_SHADER_MAX_TYPES: DWORD = 65535;
-pub const D3D11_SHADER_MINOR_VERSION: DWORD = 0;
-pub const D3D11_SHIFT_INSTRUCTION_PAD_VALUE: DWORD = 0;
-pub const D3D11_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT: DWORD = 5;
-pub const D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT: DWORD = 8;
-pub const D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES: DWORD = 2048;
-pub const D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES: DWORD = 512;
-pub const D3D11_SO_BUFFER_SLOT_COUNT: DWORD = 4;
-pub const D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP: DWORD = 0xffffffff;
-pub const D3D11_SO_NO_RASTERIZED_STREAM: DWORD = 0xffffffff;
-pub const D3D11_SO_OUTPUT_COMPONENT_COUNT: DWORD = 128;
-pub const D3D11_SO_STREAM_COUNT: DWORD = 4;
-pub const D3D11_SPEC_DATE_DAY: DWORD = 16;
-pub const D3D11_SPEC_DATE_MONTH: DWORD = 05;
-pub const D3D11_SPEC_DATE_YEAR: DWORD = 2011;
-pub const D3D11_SPEC_VERSION: FLOAT = 1.07;
-pub const D3D11_SRGB_GAMMA: FLOAT = 2.2;
-pub const D3D11_SRGB_TO_FLOAT_DENOMINATOR_1: FLOAT = 12.92;
-pub const D3D11_SRGB_TO_FLOAT_DENOMINATOR_2: FLOAT = 1.055;
-pub const D3D11_SRGB_TO_FLOAT_EXPONENT: FLOAT = 2.4;
-pub const D3D11_SRGB_TO_FLOAT_OFFSET: FLOAT = 0.055;
-pub const D3D11_SRGB_TO_FLOAT_THRESHOLD: FLOAT = 0.04045;
-pub const D3D11_SRGB_TO_FLOAT_TOLERANCE_IN_ULP: FLOAT = 0.5;
-pub const D3D11_STANDARD_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_STANDARD_COMPONENT_BIT_COUNT_DOUBLED: DWORD = 64;
-pub const D3D11_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE: DWORD = 4;
-pub const D3D11_STANDARD_PIXEL_COMPONENT_COUNT: DWORD = 128;
-pub const D3D11_STANDARD_PIXEL_ELEMENT_COUNT: DWORD = 32;
-pub const D3D11_STANDARD_VECTOR_SIZE: DWORD = 4;
-pub const D3D11_STANDARD_VERTEX_ELEMENT_COUNT: DWORD = 32;
-pub const D3D11_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT: DWORD = 64;
-pub const D3D11_SUBPIXEL_FRACTIONAL_BIT_COUNT: DWORD = 8;
-pub const D3D11_SUBTEXEL_FRACTIONAL_BIT_COUNT: DWORD = 8;
-pub const D3D11_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR: DWORD = 64;
-pub const D3D11_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR: DWORD = 64;
-pub const D3D11_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR: DWORD = 63;
-pub const D3D11_TESSELLATOR_MAX_TESSELLATION_FACTOR: DWORD = 64;
-pub const D3D11_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR: DWORD = 2;
-pub const D3D11_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR: DWORD = 1;
-pub const D3D11_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR: DWORD = 1;
-pub const D3D11_TEXEL_ADDRESS_RANGE_BIT_COUNT: DWORD = 16;
-pub const D3D11_UNBOUND_MEMORY_ACCESS_RESULT: DWORD = 0;
-pub const D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX: DWORD = 15;
-pub const D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE: DWORD = 16;
-pub const D3D11_VIEWPORT_BOUNDS_MAX: DWORD = 32767;
-pub const D3D11_VIEWPORT_BOUNDS_MIN: c_long = -32768;
-pub const D3D11_VS_INPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_VS_INPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_VS_INPUT_REGISTER_READS_PER_INST: DWORD = 2;
-pub const D3D11_VS_INPUT_REGISTER_READ_PORTS: DWORD = 1;
-pub const D3D11_VS_OUTPUT_REGISTER_COMPONENTS: DWORD = 4;
-pub const D3D11_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: DWORD = 32;
-pub const D3D11_VS_OUTPUT_REGISTER_COUNT: DWORD = 32;
-pub const D3D11_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT: DWORD = 10;
-pub const D3D11_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: DWORD = 25;
-pub const D3D11_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP: DWORD = 25;
-pub const D3D11_1_UAV_SLOT_COUNT: DWORD = 64;
-pub const D3D11_2_TILED_RESOURCE_TILE_SIZE_IN_BYTES: DWORD = 65536;
-ENUM!{enum D3D11_INPUT_CLASSIFICATION {
-    D3D11_INPUT_PER_VERTEX_DATA = 0,
-    D3D11_INPUT_PER_INSTANCE_DATA = 1,
-}}
-pub const D3D11_APPEND_ALIGNED_ELEMENT: DWORD = 0xffffffff;
-STRUCT!{struct D3D11_INPUT_ELEMENT_DESC {
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    Format: DXGI_FORMAT,
-    InputSlot: UINT,
-    AlignedByteOffset: UINT,
-    InputSlotClass: D3D11_INPUT_CLASSIFICATION,
-    InstanceDataStepRate: UINT,
-}}
-ENUM!{enum D3D11_FILL_MODE {
-    D3D11_FILL_WIREFRAME = 2,
-    D3D11_FILL_SOLID = 3,
-}}
-pub type D3D11_PRIMITIVE_TOPOLOGY = D3D_PRIMITIVE_TOPOLOGY;
-pub type D3D11_PRIMITIVE = D3D_PRIMITIVE;
-ENUM!{enum D3D11_CULL_MODE {
-    D3D11_CULL_NONE = 1,
-    D3D11_CULL_FRONT = 2,
-    D3D11_CULL_BACK = 3,
-}}
-STRUCT!{struct D3D11_SO_DECLARATION_ENTRY {
-    Stream: UINT,
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    StartComponent: BYTE,
-    ComponentCount: BYTE,
-    OutputSlot: BYTE,
-}}
-STRUCT!{struct D3D11_VIEWPORT {
-    TopLeftX: FLOAT,
-    TopLeftY: FLOAT,
-    Width: FLOAT,
-    Height: FLOAT,
-    MinDepth: FLOAT,
-    MaxDepth: FLOAT,
-}}
-STRUCT!{struct D3D11_DRAW_INSTANCED_INDIRECT_ARGS {
-    VertexCountPerInstance: UINT,
-    InstanceCount: UINT,
-    StartVertexLocation: UINT,
-    StartInstanceLocation: UINT,
-}}
-STRUCT!{struct D3D11_DRAW_INDEXED_INSTANCED_INDIRECT_ARGS {
-    IndexCountPerInstance: UINT,
-    InstanceCount: UINT,
-    StartIndexLocation: UINT,
-    BaseVertexLocation: INT,
-    StartInstanceLocation: UINT,
-}}
-ENUM!{enum D3D11_RESOURCE_DIMENSION {
-    D3D11_RESOURCE_DIMENSION_UNKNOWN = 0,
-    D3D11_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D11_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    D3D11_RESOURCE_DIMENSION_TEXTURE2D = 3,
-    D3D11_RESOURCE_DIMENSION_TEXTURE3D = 4,
-}}
-pub type D3D11_SRV_DIMENSION = D3D_SRV_DIMENSION;
-ENUM!{enum D3D11_DSV_DIMENSION {
-    D3D11_DSV_DIMENSION_UNKNOWN = 0,
-    D3D11_DSV_DIMENSION_TEXTURE1D = 1,
-    D3D11_DSV_DIMENSION_TEXTURE1DARRAY = 2,
-    D3D11_DSV_DIMENSION_TEXTURE2D = 3,
-    D3D11_DSV_DIMENSION_TEXTURE2DARRAY = 4,
-    D3D11_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY = 6,
-}}
-ENUM!{enum D3D11_RTV_DIMENSION {
-    D3D11_RTV_DIMENSION_UNKNOWN = 0,
-    D3D11_RTV_DIMENSION_BUFFER = 1,
-    D3D11_RTV_DIMENSION_TEXTURE1D = 2,
-    D3D11_RTV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D11_RTV_DIMENSION_TEXTURE2D = 4,
-    D3D11_RTV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D11_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D11_RTV_DIMENSION_TEXTURE3D = 8,
-}}
-ENUM!{enum D3D11_UAV_DIMENSION {
-    D3D11_UAV_DIMENSION_UNKNOWN = 0,
-    D3D11_UAV_DIMENSION_BUFFER = 1,
-    D3D11_UAV_DIMENSION_TEXTURE1D = 2,
-    D3D11_UAV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D11_UAV_DIMENSION_TEXTURE2D = 4,
-    D3D11_UAV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D11_UAV_DIMENSION_TEXTURE3D = 8,
-}}
-ENUM!{enum D3D11_USAGE {
-    D3D11_USAGE_DEFAULT = 0,
-    D3D11_USAGE_IMMUTABLE = 1,
-    D3D11_USAGE_DYNAMIC = 2,
-    D3D11_USAGE_STAGING = 3,
-}}
-FLAGS!{enum D3D11_BIND_FLAG {
-    D3D11_BIND_VERTEX_BUFFER = 0x1,
-    D3D11_BIND_INDEX_BUFFER = 0x2,
-    D3D11_BIND_CONSTANT_BUFFER = 0x4,
-    D3D11_BIND_SHADER_RESOURCE = 0x8,
-    D3D11_BIND_STREAM_OUTPUT = 0x10,
-    D3D11_BIND_RENDER_TARGET = 0x20,
-    D3D11_BIND_DEPTH_STENCIL = 0x40,
-    D3D11_BIND_UNORDERED_ACCESS = 0x80,
-    D3D11_BIND_DECODER = 0x200,
-    D3D11_BIND_VIDEO_ENCODER = 0x400,
-}}
-FLAGS!{enum D3D11_CPU_ACCESS_FLAG {
-    D3D11_CPU_ACCESS_WRITE = 0x10000,
-    D3D11_CPU_ACCESS_READ = 0x20000,
-}}
-FLAGS!{enum D3D11_RESOURCE_MISC_FLAG {
-    D3D11_RESOURCE_MISC_GENERATE_MIPS = 0x1,
-    D3D11_RESOURCE_MISC_SHARED = 0x2,
-    D3D11_RESOURCE_MISC_TEXTURECUBE = 0x4,
-    D3D11_RESOURCE_MISC_DRAWINDIRECT_ARGS = 0x10,
-    D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS = 0x20,
-    D3D11_RESOURCE_MISC_BUFFER_STRUCTURED = 0x40,
-    D3D11_RESOURCE_MISC_RESOURCE_CLAMP = 0x80,
-    D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX = 0x100,
-    D3D11_RESOURCE_MISC_GDI_COMPATIBLE = 0x200,
-    D3D11_RESOURCE_MISC_SHARED_NTHANDLE = 0x800,
-    D3D11_RESOURCE_MISC_RESTRICTED_CONTENT = 0x1000,
-    D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE = 0x2000,
-    D3D11_RESOURCE_MISC_RESTRICT_SHARED_RESOURCE_DRIVER = 0x4000,
-    D3D11_RESOURCE_MISC_GUARDED = 0x8000,
-    D3D11_RESOURCE_MISC_TILE_POOL = 0x20000,
-    D3D11_RESOURCE_MISC_TILED = 0x40000,
-    D3D11_RESOURCE_MISC_HW_PROTECTED = 0x80000,
-}}
-ENUM!{enum D3D11_MAP {
-    D3D11_MAP_READ = 1,
-    D3D11_MAP_WRITE = 2,
-    D3D11_MAP_READ_WRITE = 3,
-    D3D11_MAP_WRITE_DISCARD = 4,
-    D3D11_MAP_WRITE_NO_OVERWRITE = 5,
-}}
-FLAGS!{enum D3D11_MAP_FLAG {
-    D3D11_MAP_FLAG_DO_NOT_WAIT = 0x100000,
-}}
-FLAGS!{enum D3D11_RAISE_FLAG {
-    D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR = 0x1,
-}}
-FLAGS!{enum D3D11_CLEAR_FLAG {
-    D3D11_CLEAR_DEPTH = 0x1,
-    D3D11_CLEAR_STENCIL = 0x2,
-}}
-pub type D3D11_RECT = RECT;
-STRUCT!{struct D3D11_BOX {
-    left: UINT,
-    top: UINT,
-    front: UINT,
-    right: UINT,
-    bottom: UINT,
-    back: UINT,
-}}
-RIDL!{interface ID3D11DeviceChild(ID3D11DeviceChildVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut ID3D11Device) -> (),
-    fn GetPrivateData(
-        &mut self, guid: REFGUID, pDataSize: *mut UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn SetPrivateData(
-        &mut self, guid: REFGUID, DataSize: UINT, pData: *const c_void
-    ) -> HRESULT,
-    fn SetPrivateDataInterface(&mut self, guid: REFGUID, pData: *const IUnknown) -> HRESULT
-}}
-ENUM!{enum D3D11_COMPARISON_FUNC {
-    D3D11_COMPARISON_NEVER = 1,
-    D3D11_COMPARISON_LESS = 2,
-    D3D11_COMPARISON_EQUAL = 3,
-    D3D11_COMPARISON_LESS_EQUAL = 4,
-    D3D11_COMPARISON_GREATER = 5,
-    D3D11_COMPARISON_NOT_EQUAL = 6,
-    D3D11_COMPARISON_GREATER_EQUAL = 7,
-    D3D11_COMPARISON_ALWAYS = 8,
-}}
-ENUM!{enum D3D11_DEPTH_WRITE_MASK {
-    D3D11_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D11_DEPTH_WRITE_MASK_ALL = 1,
-}}
-ENUM!{enum D3D11_STENCIL_OP {
-    D3D11_STENCIL_OP_KEEP = 1,
-    D3D11_STENCIL_OP_ZERO = 2,
-    D3D11_STENCIL_OP_REPLACE = 3,
-    D3D11_STENCIL_OP_INCR_SAT = 4,
-    D3D11_STENCIL_OP_DECR_SAT = 5,
-    D3D11_STENCIL_OP_INVERT = 6,
-    D3D11_STENCIL_OP_INCR = 7,
-    D3D11_STENCIL_OP_DECR = 8,
-}}
-STRUCT!{struct D3D11_DEPTH_STENCILOP_DESC {
-    StencilFailOp: D3D11_STENCIL_OP,
-    StencilDepthFailOp: D3D11_STENCIL_OP,
-    StencilPassOp: D3D11_STENCIL_OP,
-    StencilFunc: D3D11_COMPARISON_FUNC,
-}}
-STRUCT!{struct D3D11_DEPTH_STENCIL_DESC {
-    DepthEnable: BOOL,
-    DepthWriteMask: D3D11_DEPTH_WRITE_MASK,
-    DepthFunc: D3D11_COMPARISON_FUNC,
-    StencilEnable: BOOL,
-    StencilReadMask: UINT8,
-    StencilWriteMask: UINT8,
-    FrontFace: D3D11_DEPTH_STENCILOP_DESC,
-    BackFace: D3D11_DEPTH_STENCILOP_DESC,
-}}
-RIDL!{interface ID3D11DepthStencilState(ID3D11DepthStencilStateVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_DEPTH_STENCIL_DESC) -> ()
-}}
-ENUM!{enum D3D11_BLEND {
-    D3D11_BLEND_ZERO = 1,
-    D3D11_BLEND_ONE = 2,
-    D3D11_BLEND_SRC_COLOR = 3,
-    D3D11_BLEND_INV_SRC_COLOR = 4,
-    D3D11_BLEND_SRC_ALPHA = 5,
-    D3D11_BLEND_INV_SRC_ALPHA = 6,
-    D3D11_BLEND_DEST_ALPHA = 7,
-    D3D11_BLEND_INV_DEST_ALPHA = 8,
-    D3D11_BLEND_DEST_COLOR = 9,
-    D3D11_BLEND_INV_DEST_COLOR = 10,
-    D3D11_BLEND_SRC_ALPHA_SAT = 11,
-    D3D11_BLEND_BLEND_FACTOR = 14,
-    D3D11_BLEND_INV_BLEND_FACTOR = 15,
-    D3D11_BLEND_SRC1_COLOR = 16,
-    D3D11_BLEND_INV_SRC1_COLOR = 17,
-    D3D11_BLEND_SRC1_ALPHA = 18,
-    D3D11_BLEND_INV_SRC1_ALPHA = 19,
-}}
-ENUM!{enum D3D11_BLEND_OP {
-    D3D11_BLEND_OP_ADD = 1,
-    D3D11_BLEND_OP_SUBTRACT = 2,
-    D3D11_BLEND_OP_REV_SUBTRACT = 3,
-    D3D11_BLEND_OP_MIN = 4,
-    D3D11_BLEND_OP_MAX = 5,
-}}
-FLAGS!{enum D3D11_COLOR_WRITE_ENABLE {
-    D3D11_COLOR_WRITE_ENABLE_RED = 1,
-    D3D11_COLOR_WRITE_ENABLE_GREEN = 2,
-    D3D11_COLOR_WRITE_ENABLE_BLUE = 4,
-    D3D11_COLOR_WRITE_ENABLE_ALPHA = 8,
-    D3D11_COLOR_WRITE_ENABLE_ALL = D3D11_COLOR_WRITE_ENABLE_RED.0 | D3D11_COLOR_WRITE_ENABLE_GREEN.0 |
-        D3D11_COLOR_WRITE_ENABLE_BLUE.0 | D3D11_COLOR_WRITE_ENABLE_ALPHA.0,
-}}
-STRUCT!{struct D3D11_RENDER_TARGET_BLEND_DESC {
-    BlendEnable: BOOL,
-    SrcBlend: D3D11_BLEND,
-    DestBlend: D3D11_BLEND,
-    BlendOp: D3D11_BLEND_OP,
-    SrcBlendAlpha: D3D11_BLEND,
-    DestBlendAlpha: D3D11_BLEND,
-    BlendOpAlpha: D3D11_BLEND_OP,
-    RenderTargetWriteMask: UINT8,
-}}
-STRUCT!{struct D3D11_BLEND_DESC {
-    AlphaToCoverageEnable: BOOL,
-    IndependentBlendEnable: BOOL,
-    RenderTarget: [D3D11_RENDER_TARGET_BLEND_DESC; 8],
-}}
-RIDL!{interface ID3D11BlendState(ID3D11BlendStateVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_BLEND_DESC) -> ()
-}}
-STRUCT!{struct D3D11_RASTERIZER_DESC {
-    FillMode: D3D11_FILL_MODE,
-    CullMode: D3D11_CULL_MODE,
-    FrontCounterClockwise: BOOL,
-    DepthBias: INT,
-    DepthBiasClamp: FLOAT,
-    SlopeScaledDepthBias: FLOAT,
-    DepthClipEnable: BOOL,
-    ScissorEnable: BOOL,
-    MultisampleEnable: BOOL,
-    AntialiasedLineEnable: BOOL,
-}}
-RIDL!{interface ID3D11RasterizerState(ID3D11RasterizerStateVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_RASTERIZER_DESC) -> ()
-}}
-STRUCT!{struct D3D11_SUBRESOURCE_DATA {
-    pSysMem: *const c_void,
-    SysMemPitch: UINT,
-    SysMemSlicePitch: UINT,
-}}
-STRUCT!{struct D3D11_MAPPED_SUBRESOURCE {
-    pData: *mut c_void,
-    RowPitch: UINT,
-    DepthPitch: UINT,
-}}
-RIDL!{interface ID3D11Resource(ID3D11ResourceVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetType(&mut self, pResourceDimension: *mut D3D11_RESOURCE_DIMENSION) -> (),
-    fn SetEvictionPriority(&mut self, EvictionPriority: UINT) -> (),
-    fn GetEvictionPriority(&mut self) -> UINT
-}}
-STRUCT!{struct D3D11_BUFFER_DESC {
-    ByteWidth: UINT,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-    StructureByteStride: UINT,
-}}
-RIDL!{interface ID3D11Buffer(ID3D11BufferVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_BUFFER_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEXTURE1D_DESC {
-    Width: UINT,
-    MipLevels: UINT,
-    ArraySize: UINT,
-    Format: DXGI_FORMAT,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Texture1D(ID3D11Texture1DVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_TEXTURE1D_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEXTURE2D_DESC {
-    Width: UINT,
-    Height: UINT,
-    MipLevels: UINT,
-    ArraySize: UINT,
-    Format: DXGI_FORMAT,
-    SampleDesc: DXGI_SAMPLE_DESC,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Texture2D(ID3D11Texture2DVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_TEXTURE2D_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEXTURE3D_DESC {
-    Width: UINT,
-    Height: UINT,
-    Depth: UINT,
-    MipLevels: UINT,
-    Format: DXGI_FORMAT,
-    Usage: D3D11_USAGE,
-    BindFlags: UINT,
-    CPUAccessFlags: UINT,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Texture3D(ID3D11Texture3DVtbl): ID3D11Resource(ID3D11ResourceVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_TEXTURE3D_DESC) -> ()
-}}
-ENUM!{enum D3D11_TEXTURECUBE_FACE {
-    D3D11_TEXTURECUBE_FACE_POSITIVE_X = 0,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_X = 1,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Y = 2,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Y = 3,
-    D3D11_TEXTURECUBE_FACE_POSITIVE_Z = 4,
-    D3D11_TEXTURECUBE_FACE_NEGATIVE_Z = 5,
-}}
-RIDL!{interface ID3D11View(ID3D11ViewVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetResource(&mut self, ppResource: *mut *mut ID3D11Resource) -> ()
-}}
-STRUCT!{struct D3D11_BUFFER_SRV {
-    u1: UINT,
-    u2: UINT,
-}}
-UNION!{D3D11_BUFFER_SRV, u1, FirstElement, FirstElement_mut, UINT}
-UNION!{D3D11_BUFFER_SRV, u1, ElementOffset, ElementOffset_mut, UINT}
-UNION!{D3D11_BUFFER_SRV, u2, NumElements, NumElements_mut, UINT}
-UNION!{D3D11_BUFFER_SRV, u2, ElementWidth, ElementWidth_mut, UINT}
-FLAGS!{enum D3D11_BUFFEREX_SRV_FLAG {
-    D3D11_BUFFEREX_SRV_FLAG_RAW = 0x1,
-}}
-STRUCT!{struct D3D11_BUFFEREX_SRV {
-    FirstElement: UINT,
-    NumElements: UINT,
-    Flags: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX3D_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEXCUBE_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-}}
-STRUCT!{struct D3D11_TEXCUBE_ARRAY_SRV {
-    MostDetailedMip: UINT,
-    MipLevels: UINT,
-    First2DArrayFace: UINT,
-    NumCubes: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_SRV {
-    UnusedField_NothingToDefine: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_ARRAY_SRV {
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_RESOURCE_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension:  D3D11_SRV_DIMENSION,
-    u: [UINT; 4],
-}}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Buffer, Buffer_mut, D3D11_BUFFER_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, D3D11_TEX2DMS_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    D3D11_TEX2DMS_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, Texture3D, Texture3D_mut, D3D11_TEX3D_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, TextureCube, TextureCube_mut, D3D11_TEXCUBE_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, TextureCubeArray, TextureCubeArray_mut,
-    D3D11_TEXCUBE_ARRAY_SRV}
-UNION!{D3D11_SHADER_RESOURCE_VIEW_DESC, u, BufferEx, BufferEx_mut, D3D11_BUFFEREX_SRV}
-RIDL!{interface ID3D11ShaderResourceView(ID3D11ShaderResourceViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_RESOURCE_VIEW_DESC) -> ()
-}}
-STRUCT!{struct D3D11_BUFFER_RTV {
-    u1: UINT,
-    u2: UINT,
-}}
-UNION!{D3D11_BUFFER_RTV, u1, FirstElement, FirstElement_mut, UINT}
-UNION!{D3D11_BUFFER_RTV, u1, ElementOffset, ElementOffset_mut, UINT}
-UNION!{D3D11_BUFFER_RTV, u2, NumElements, NumElements_mut, UINT}
-UNION!{D3D11_BUFFER_RTV, u2, ElementWidth, ElementWidth_mut, UINT}
-STRUCT!{struct D3D11_TEX1D_RTV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_RTV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_RTV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_RTV {
-    UnusedField_NothingToDefine: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_RTV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_ARRAY_RTV {
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX3D_RTV {
-    MipSlice: UINT,
-    FirstWSlice: UINT,
-    WSize: UINT,
-}}
-STRUCT!{struct D3D11_RENDER_TARGET_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension: D3D11_RTV_DIMENSION,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Buffer, Buffer_mut, D3D11_BUFFER_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, D3D11_TEX2DMS_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture2DMSArray,Texture2DMSArray_mut,
-    D3D11_TEX2DMS_ARRAY_RTV}
-UNION!{D3D11_RENDER_TARGET_VIEW_DESC, u, Texture3D, Texture3D_mut, D3D11_TEX3D_RTV}
-RIDL!{interface ID3D11RenderTargetView(ID3D11RenderTargetViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_RENDER_TARGET_VIEW_DESC) -> ()
-}}
-STRUCT!{struct D3D11_TEX1D_DSV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_DSV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_DSV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_DSV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_DSV {
-    UnusedField_NothingToDefine: UINT,
-}}
-STRUCT!{struct D3D11_TEX2DMS_ARRAY_DSV {
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-FLAGS!{enum D3D11_DSV_FLAG{
-    D3D11_DSV_READ_ONLY_DEPTH = 0x1,
-    D3D11_DSV_READ_ONLY_STENCIL = 0x2,
-}}
-STRUCT!{struct D3D11_DEPTH_STENCIL_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension: D3D11_DSV_DIMENSION,
-    Flags: UINT,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, D3D11_TEX2DMS_DSV}
-UNION!{D3D11_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    D3D11_TEX2DMS_ARRAY_DSV}
-RIDL!{interface ID3D11DepthStencilView(ID3D11DepthStencilViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_DEPTH_STENCIL_VIEW_DESC) -> ()
-}}
-FLAGS!{enum D3D11_BUFFER_UAV_FLAG {
-    D3D11_BUFFER_UAV_FLAG_RAW = 0x1,
-    D3D11_BUFFER_UAV_FLAG_APPEND = 0x2,
-    D3D11_BUFFER_UAV_FLAG_COUNTER = 0x4,
-}}
-STRUCT!{struct D3D11_BUFFER_UAV {
-    FirstElement: UINT,
-    NumElements: UINT,
-    Flags: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_UAV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX1D_ARRAY_UAV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_UAV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_UAV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_TEX3D_UAV {
-    MipSlice: UINT,
-    FirstWSlice: UINT,
-    WSize: UINT,
-}}
-STRUCT!{struct D3D11_UNORDERED_ACCESS_VIEW_DESC {
-    Format: DXGI_FORMAT,
-    ViewDimension: D3D11_UAV_DIMENSION,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Buffer, Buffer_mut, D3D11_BUFFER_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture1D, Texture1D_mut, D3D11_TEX1D_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    D3D11_TEX1D_ARRAY_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_UAV}
-UNION!{D3D11_UNORDERED_ACCESS_VIEW_DESC, u, Texture3D, Texture3D_mut, D3D11_TEX3D_UAV}
-RIDL!{interface ID3D11UnorderedAccessView(ID3D11UnorderedAccessViewVtbl): ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_UNORDERED_ACCESS_VIEW_DESC) -> ()
-}}
-RIDL!{interface ID3D11VertexShader(ID3D11VertexShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11HullShader(ID3D11HullShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11DomainShader(ID3D11DomainShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11GeometryShader(ID3D11GeometryShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11PixelShader(ID3D11PixelShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11ComputeShader(ID3D11ComputeShaderVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-RIDL!{interface ID3D11InputLayout(ID3D11InputLayoutVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {}}
-ENUM!{enum D3D11_FILTER {
-    D3D11_FILTER_MIN_MAG_MIP_POINT = 0,
-    D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR = 0x1,
-    D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x4,
-    D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR = 0x5,
-    D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT = 0x10,
-    D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x11,
-    D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT = 0x14,
-    D3D11_FILTER_MIN_MAG_MIP_LINEAR = 0x15,
-    D3D11_FILTER_ANISOTROPIC = 0x55,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 0x80,
-    D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 0x81,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x84,
-    D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 0x85,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 0x90,
-    D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x91,
-    D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 0x94,
-    D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 0x95,
-    D3D11_FILTER_COMPARISON_ANISOTROPIC = 0xd5,
-    D3D11_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 0x100,
-    D3D11_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x101,
-    D3D11_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x104,
-    D3D11_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x105,
-    D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x110,
-    D3D11_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x111,
-    D3D11_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x114,
-    D3D11_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 0x115,
-    D3D11_FILTER_MINIMUM_ANISOTROPIC = 0x155,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 0x180,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 0x181,
-    D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 0x184,
-    D3D11_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 0x185,
-    D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 0x190,
-    D3D11_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 0x191,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 0x194,
-    D3D11_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 0x195,
-    D3D11_FILTER_MAXIMUM_ANISOTROPIC = 0x1d5,
-}}
-ENUM!{enum D3D11_FILTER_TYPE {
-    D3D11_FILTER_TYPE_POINT = 0,
-    D3D11_FILTER_TYPE_LINEAR = 1,
-}}
-ENUM!{enum D3D11_FILTER_REDUCTION_TYPE {
-    D3D11_FILTER_REDUCTION_TYPE_STANDARD = 0,
-    D3D11_FILTER_REDUCTION_TYPE_COMPARISON = 1,
-    D3D11_FILTER_REDUCTION_TYPE_MINIMUM = 2,
-    D3D11_FILTER_REDUCTION_TYPE_MAXIMUM = 3,
-}}
-pub const D3D11_FILTER_REDUCTION_TYPE_MASK: DWORD = 0x3;
-pub const D3D11_FILTER_REDUCTION_TYPE_SHIFT: DWORD = 7;
-pub const D3D11_FILTER_TYPE_MASK: DWORD = 0x3;
-pub const D3D11_MIN_FILTER_SHIFT: DWORD = 4;
-pub const D3D11_MAG_FILTER_SHIFT: DWORD = 2;
-pub const D3D11_MIP_FILTER_SHIFT: DWORD = 0;
-pub const D3D11_COMPARISON_FILTERING_BIT: DWORD = 0x80;
-pub const D3D11_ANISOTROPIC_FILTERING_BIT: DWORD = 0x40;
-ENUM!{enum D3D11_TEXTURE_ADDRESS_MODE {
-    D3D11_TEXTURE_ADDRESS_WRAP = 1,
-    D3D11_TEXTURE_ADDRESS_MIRROR = 2,
-    D3D11_TEXTURE_ADDRESS_CLAMP = 3,
-    D3D11_TEXTURE_ADDRESS_BORDER = 4,
-    D3D11_TEXTURE_ADDRESS_MIRROR_ONCE = 5,
-}}
-STRUCT!{struct D3D11_SAMPLER_DESC {
-    Filter:  D3D11_FILTER,
-    AddressU: D3D11_TEXTURE_ADDRESS_MODE,
-    AddressV: D3D11_TEXTURE_ADDRESS_MODE,
-    AddressW: D3D11_TEXTURE_ADDRESS_MODE,
-    MipLODBias: FLOAT,
-    MaxAnisotropy: UINT,
-    ComparisonFunc: D3D11_COMPARISON_FUNC,
-    BorderColor: [FLOAT; 4],
-    MinLOD: FLOAT,
-    MaxLOD: FLOAT,
-}}
-RIDL!{interface ID3D11SamplerState(ID3D11SamplerStateVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SAMPLER_DESC) -> ()
-}}
-FLAGS!{enum D3D11_FORMAT_SUPPORT {
-    D3D11_FORMAT_SUPPORT_BUFFER = 0x1,
-    D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER = 0x2,
-    D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER = 0x4,
-    D3D11_FORMAT_SUPPORT_SO_BUFFER = 0x8,
-    D3D11_FORMAT_SUPPORT_TEXTURE1D = 0x10,
-    D3D11_FORMAT_SUPPORT_TEXTURE2D = 0x20,
-    D3D11_FORMAT_SUPPORT_TEXTURE3D = 0x40,
-    D3D11_FORMAT_SUPPORT_TEXTURECUBE = 0x80,
-    D3D11_FORMAT_SUPPORT_SHADER_LOAD = 0x100,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE = 0x200,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON = 0x400,
-    D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT = 0x800,
-    D3D11_FORMAT_SUPPORT_MIP = 0x1000,
-    D3D11_FORMAT_SUPPORT_MIP_AUTOGEN = 0x2000,
-    D3D11_FORMAT_SUPPORT_RENDER_TARGET = 0x4000,
-    D3D11_FORMAT_SUPPORT_BLENDABLE = 0x8000,
-    D3D11_FORMAT_SUPPORT_DEPTH_STENCIL = 0x10000,
-    D3D11_FORMAT_SUPPORT_CPU_LOCKABLE = 0x20000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE = 0x40000,
-    D3D11_FORMAT_SUPPORT_DISPLAY = 0x80000,
-    D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET = 0x200000,
-    D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD = 0x400000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER = 0x800000,
-    D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST = 0x1000000,
-    D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW = 0x2000000,
-    D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON = 0x4000000,
-    D3D11_FORMAT_SUPPORT_DECODER_OUTPUT = 0x8000000,
-    D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_OUTPUT = 0x10000000,
-    D3D11_FORMAT_SUPPORT_VIDEO_PROCESSOR_INPUT = 0x20000000,
-    D3D11_FORMAT_SUPPORT_VIDEO_ENCODER = 0x40000000,
-}}
-FLAGS!{enum D3D11_FORMAT_SUPPORT2 {
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD = 0x1,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS = 0x2,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE = 0x4,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE = 0x8,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX = 0x10,
-    D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX = 0x20,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD = 0x40,
-    D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE = 0x80,
-    D3D11_FORMAT_SUPPORT2_OUTPUT_MERGER_LOGIC_OP = 0x100,
-    D3D11_FORMAT_SUPPORT2_TILED = 0x200,
-    D3D11_FORMAT_SUPPORT2_SHAREABLE = 0x400,
-    D3D11_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x4000,
-}}
-RIDL!{interface ID3D11Asynchronous(ID3D11AsynchronousVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDataSize(&mut self) -> UINT
-}}
-FLAGS!{enum D3D11_ASYNC_GETDATA_FLAG {
-    D3D11_ASYNC_GETDATA_DONOTFLUSH = 0x1,
-}}
-ENUM!{enum D3D11_QUERY {
-    D3D11_QUERY_EVENT = 0,
-    D3D11_QUERY_OCCLUSION = D3D11_QUERY_EVENT.0 + 1,
-    D3D11_QUERY_TIMESTAMP = D3D11_QUERY_OCCLUSION.0 + 1,
-    D3D11_QUERY_TIMESTAMP_DISJOINT = D3D11_QUERY_TIMESTAMP.0 + 1,
-    D3D11_QUERY_PIPELINE_STATISTICS = D3D11_QUERY_TIMESTAMP_DISJOINT.0 + 1,
-    D3D11_QUERY_OCCLUSION_PREDICATE = D3D11_QUERY_PIPELINE_STATISTICS.0 + 1,
-    D3D11_QUERY_SO_STATISTICS = D3D11_QUERY_OCCLUSION_PREDICATE.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE = D3D11_QUERY_SO_STATISTICS.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM0 = D3D11_QUERY_SO_OVERFLOW_PREDICATE.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0 = D3D11_QUERY_SO_STATISTICS_STREAM0.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM1 = D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM0.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1 = D3D11_QUERY_SO_STATISTICS_STREAM1.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM2 = D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM1.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 = D3D11_QUERY_SO_STATISTICS_STREAM2.0 + 1,
-    D3D11_QUERY_SO_STATISTICS_STREAM3 = D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2.0 + 1,
-    D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3 = D3D11_QUERY_SO_STATISTICS_STREAM3.0 + 1,
-}}
-FLAGS!{enum D3D11_QUERY_MISC_FLAG {
-    D3D11_QUERY_MISC_PREDICATEHINT = 0x1,
-}}
-STRUCT!{struct D3D11_QUERY_DESC {
-    Query: D3D11_QUERY,
-    MiscFlags: UINT,
-}}
-RIDL!{interface ID3D11Query(ID3D11QueryVtbl): ID3D11Asynchronous(ID3D11AsynchronousVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_QUERY_DESC) -> ()
-}}
-RIDL!{interface ID3D11Predicate(ID3D11PredicateVtbl): ID3D11Query(ID3D11QueryVtbl) {}}
-STRUCT!{struct D3D11_QUERY_DATA_TIMESTAMP_DISJOINT {
-    Frequency: UINT64,
-    Disjoint: BOOL,
-}}
-STRUCT!{struct D3D11_QUERY_DATA_PIPELINE_STATISTICS {
-    IAVertices: UINT64,
-    IAPrimitives: UINT64,
-    VSInvocations: UINT64,
-    GSInvocations: UINT64,
-    GSPrimitives: UINT64,
-    CInvocations: UINT64,
-    CPrimitives: UINT64,
-    PSInvocations: UINT64,
-    HSInvocations: UINT64,
-    DSInvocations: UINT64,
-    CSInvocations: UINT64,
-}}
-STRUCT!{struct D3D11_QUERY_DATA_SO_STATISTICS {
-    NumPrimitivesWritten: UINT64,
-    PrimitivesStorageNeeded: UINT64,
-}}
-FLAGS!{enum D3D11_COUNTER {
-    D3D11_COUNTER_DEVICE_DEPENDENT_0 = 0x40000000,
-}}
-ENUM!{enum D3D11_COUNTER_TYPE {
-    D3D11_COUNTER_TYPE_FLOAT32 = 0,
-    D3D11_COUNTER_TYPE_UINT16 = D3D11_COUNTER_TYPE_FLOAT32.0 + 1,
-    D3D11_COUNTER_TYPE_UINT32 = D3D11_COUNTER_TYPE_UINT16.0 + 1,
-    D3D11_COUNTER_TYPE_UINT64 = D3D11_COUNTER_TYPE_UINT32.0 + 1,
-}}
-STRUCT!{struct D3D11_COUNTER_DESC {
-    Counter: D3D11_COUNTER,
-    MiscFlags: UINT,
-}}
-STRUCT!{struct D3D11_COUNTER_INFO {
-    LastDeviceDependentCounter: D3D11_COUNTER,
-    NumSimultaneousCounters: UINT,
-    NumDetectableParallelUnits: UINT8,
-}}
-RIDL!{interface ID3D11Counter(ID3D11CounterVtbl): ID3D11Asynchronous(ID3D11AsynchronousVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_COUNTER_DESC) -> ()
-}}
-ENUM!{enum D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS {
-    D3D11_STANDARD_MULTISAMPLE_PATTERN = 0xffffffff,
-    D3D11_CENTER_MULTISAMPLE_PATTERN = 0xfffffffe,
-}}
-ENUM!{enum D3D11_DEVICE_CONTEXT_TYPE {
-    D3D11_DEVICE_CONTEXT_IMMEDIATE = 0,
-    D3D11_DEVICE_CONTEXT_DEFERRED = D3D11_DEVICE_CONTEXT_IMMEDIATE.0 + 1,
-}}
-STRUCT!{struct D3D11_CLASS_INSTANCE_DESC {
-    InstanceId: UINT,
-    InstanceIndex: UINT,
-    TypeId: UINT,
-    ConstantBuffer: UINT,
-    BaseConstantBufferOffset: UINT,
-    BaseTexture: UINT,
-    BaseSampler: UINT,
-    Created: BOOL,
-}}
-RIDL!{interface ID3D11ClassInstance(ID3D11ClassInstanceVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetClassLinkage(&mut self, ppLinkage: *mut *mut ID3D11ClassLinkage) -> (),
-    fn GetDesc(&mut self, pDesc: *mut D3D11_CLASS_INSTANCE_DESC) -> (),
-    fn GetInstanceName(&mut self, pInstanceName: LPSTR, pBufferLength: *mut SIZE_T) -> (),
-    fn GetTypeName(&mut self, pTypeName: LPSTR, pBufferLength: *mut SIZE_T) -> ()
-}}
-RIDL!{interface ID3D11ClassLinkage(ID3D11ClassLinkageVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetClassInstance(
-        &mut self, GetClassInstance: LPCSTR, InstanceIndex: UINT,
-        ppInstance: *mut *mut ID3D11ClassInstance
-    ) -> HRESULT,
-    fn CreateClassInstance(
-        &mut self, pClassTypeName: LPCSTR, ConstantBufferOffset: UINT, ConstantVectorOffset: UINT, TextureOffset: UINT, SamplerOffset: UINT, ppInstance: *mut *mut ID3D11ClassInstance
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11CommandList(ID3D11CommandListVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetContextFlags(&mut self) -> UINT
-}}
-ENUM!{enum D3D11_FEATURE {
-    D3D11_FEATURE_THREADING = 0,
-    D3D11_FEATURE_DOUBLES = D3D11_FEATURE_THREADING.0 + 1,
-    D3D11_FEATURE_FORMAT_SUPPORT = D3D11_FEATURE_DOUBLES.0 + 1,
-    D3D11_FEATURE_FORMAT_SUPPORT2 = D3D11_FEATURE_FORMAT_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS = D3D11_FEATURE_FORMAT_SUPPORT2.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS = D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS.0 + 1,
-    D3D11_FEATURE_ARCHITECTURE_INFO = D3D11_FEATURE_D3D11_OPTIONS.0 + 1,
-    D3D11_FEATURE_D3D9_OPTIONS = D3D11_FEATURE_ARCHITECTURE_INFO.0 + 1,
-    D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT = D3D11_FEATURE_D3D9_OPTIONS.0 + 1,
-    D3D11_FEATURE_D3D9_SHADOW_SUPPORT = D3D11_FEATURE_SHADER_MIN_PRECISION_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS1 = D3D11_FEATURE_D3D9_SHADOW_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT = D3D11_FEATURE_D3D11_OPTIONS1.0 + 1,
-    D3D11_FEATURE_MARKER_SUPPORT = D3D11_FEATURE_D3D9_SIMPLE_INSTANCING_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D9_OPTIONS1 = D3D11_FEATURE_MARKER_SUPPORT.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS2 = D3D11_FEATURE_D3D9_OPTIONS1.0 + 1,
-    D3D11_FEATURE_D3D11_OPTIONS3 = D3D11_FEATURE_D3D11_OPTIONS2.0 + 1,
-    D3D11_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = D3D11_FEATURE_D3D11_OPTIONS3.0 + 1,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_THREADING {
-    DriverConcurrentCreates: BOOL,
-    DriverCommandLists: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_DOUBLES {
-    DoublePrecisionFloatShaderOps: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_FORMAT_SUPPORT {
-    InFormat: DXGI_FORMAT,
-    OutFormatSupport: UINT,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_FORMAT_SUPPORT2 {
-    InFormat: DXGI_FORMAT,
-    OutFormatSupport2: UINT,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS {
-    ComputeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS {
-    OutputMergerLogicOp: BOOL,
-    UAVOnlyRenderingForcedSampleCount: BOOL,
-    DiscardAPIsSeenByDriver: BOOL,
-    FlagsForUpdateAndCopySeenByDriver: BOOL,
-    ClearView: BOOL,
-    CopyWithOverlap: BOOL,
-    ConstantBufferPartialUpdate: BOOL,
-    ConstantBufferOffsetting: BOOL,
-    MapNoOverwriteOnDynamicConstantBuffer: BOOL,
-    MapNoOverwriteOnDynamicBufferSRV: BOOL,
-    MultisampleRTVWithForcedSampleCountOne: BOOL,
-    SAD4ShaderInstructions: BOOL,
-    ExtendedDoublesShaderInstructions: BOOL,
-    ExtendedResourceSharing: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_ARCHITECTURE_INFO {
-    TileBasedDeferredRenderer: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_OPTIONS {
-    FullNonPow2TextureSupport: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_SHADOW_SUPPORT {
-    SupportsDepthAsTextureWithLessEqualComparisonFilter: BOOL,
-}}
-FLAGS!{enum D3D11_SHADER_MIN_PRECISION_SUPPORT {
-    D3D11_SHADER_MIN_PRECISION_10_BIT = 0x1,
-    D3D11_SHADER_MIN_PRECISION_16_BIT = 0x2,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_SHADER_MIN_PRECISION_SUPPORT {
-    PixelShaderMinPrecision: UINT,
-    AllOtherShaderStagesMinPrecision: UINT,
-}}
-ENUM!{enum D3D11_TILED_RESOURCES_TIER {
-    D3D11_TILED_RESOURCES_NOT_SUPPORTED = 0,
-    D3D11_TILED_RESOURCES_TIER_1 = 1,
-    D3D11_TILED_RESOURCES_TIER_2 = 2,
-    D3D11_TILED_RESOURCES_TIER_3 = 3,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS1 {
-    TiledResourcesTier: D3D11_TILED_RESOURCES_TIER,
-    MinMaxFiltering: BOOL,
-    ClearViewAlsoSupportsDepthOnlyFormats: BOOL,
-    MapOnDefaultBuffers: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_SIMPLE_INSTANCING_SUPPORT {
-    SimpleInstancingSupported: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_MARKER_SUPPORT {
-    Profile: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D9_OPTIONS1 {
-    FullNonPow2TextureSupported: BOOL,
-    DepthAsTextureWithLessEqualComparisonFilterSupported: BOOL,
-    SimpleInstancingSupported: BOOL,
-    TextureCubeFaceRenderTargetWithNonCubeDepthStencilSupported: BOOL,
-}}
-ENUM!{enum D3D11_CONSERVATIVE_RASTERIZATION_TIER {
-    D3D11_CONSERVATIVE_RASTERIZATION_NOT_SUPPORTED = 0,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D11_CONSERVATIVE_RASTERIZATION_TIER_3 = 3,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS2 {
-    PSSpecifiedStencilRefSupported: BOOL,
-    TypedUAVLoadAdditionalFormats: BOOL,
-    ROVsSupported: BOOL,
-    ConservativeRasterizationTier: D3D11_CONSERVATIVE_RASTERIZATION_TIER,
-    TiledResourcesTier: D3D11_TILED_RESOURCES_TIER,
-    MapOnDefaultTextures: BOOL,
-    StandardSwizzle: BOOL,
-    UnifiedMemoryArchitecture: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_D3D11_OPTIONS3 {
-    VPAndRTArrayIndexFromAnyShaderFeedingRasterizer: BOOL,
-}}
-STRUCT!{struct D3D11_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT {
-    MaxGPUVirtualAddressBitsPerResource: UINT,
-    MaxGPUVirtualAddressBitsPerProcess: UINT,
-}}
-RIDL!{interface ID3D11DeviceContext(ID3D11DeviceContextVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn VSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn PSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn PSSetShader(
-        &mut self, pPixelShader: *mut ID3D11PixelShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn PSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn VSSetShader(
-        &mut self, pVertexShader: *mut ID3D11VertexShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn DrawIndexed(
-        &mut self, IndexCount: UINT, StartIndexLocation: UINT, BaseVertexLocation: INT
-    ) -> (),
-    fn Draw(&mut self, VertexCount: UINT, StartVertexLocation: UINT) -> (),
-    fn Map(
-        &mut self, pResource: *mut ID3D11Resource, Subresource: UINT, MapType: D3D11_MAP,
-        MapFlags: UINT, pMappedResource: *mut D3D11_MAPPED_SUBRESOURCE
-    ) -> HRESULT,
-    fn Unmap(&mut self, pResource: *mut ID3D11Resource, Subresource: UINT) -> (),
-    fn PSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn IASetInputLayout(&mut self, pInputLayout: *mut ID3D11InputLayout) -> (),
-    fn IASetVertexBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppVertexBuffers: *const *mut ID3D11Buffer,
-        pStrides: *const UINT, pOffsets: *const UINT
-    ) -> (),
-    fn IASetIndexBuffer(
-        &mut self, pIndexBuffer: *mut ID3D11Buffer, Format: DXGI_FORMAT, Offset: UINT
-    ) -> (),
-    fn DrawIndexedInstanced(
-        &mut self, IndexCountPerInstance: UINT, InstanceCount: UINT, StartIndexLocation: UINT,
-        BaseVertexLocation: INT, StartInstanceLocation: UINT
-    ) -> (),
-    fn DrawInstanced(
-        &mut self, VertexCountPerInstance: UINT, InstanceCount: UINT, StartVertexLocation: UINT,
-        StartInstanceLocation: UINT
-    ) -> (),
-    fn GSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn GSSetShader(
-        &mut self, pShader: *mut ID3D11GeometryShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn IASetPrimitiveTopology(&mut self, Topology: D3D11_PRIMITIVE_TOPOLOGY) -> (),
-    fn VSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn VSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn Begin(&mut self, pAsync: *mut ID3D11Asynchronous) -> (),
-    fn End(&mut self, pAsync: *mut ID3D11Asynchronous) -> (),
-    fn GetData(
-        &mut self,  pAsync: *mut ID3D11Asynchronous, pData: *mut c_void, DataSize: UINT,
-        GetDataFlags: UINT
-    ) -> HRESULT,
-    fn SetPredication(
-        &mut self, pPredicate: *mut ID3D11Predicate, PredicateValue: BOOL
-    ) -> (),
-    fn GSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn GSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn OMSetRenderTargets(
-        &mut self, NumViews: UINT, ppRenderTargetViews: *const *mut ID3D11RenderTargetView,
-        pDepthStencilView: *mut ID3D11DepthStencilView
-    ) -> (),
-    fn OMSetRenderTargetsAndUnorderedAccessViews(
-        &mut self, NumRTVs: UINT, ppRenderTargetViews: *const *mut ID3D11RenderTargetView,
-        pDepthStencilView: *mut ID3D11DepthStencilView, UAVStartSlot: UINT, NumUAVs: UINT,
-        ppUnorderedAccessViews: *const *mut ID3D11UnorderedAccessView,
-        pUAVInitialCounts: *const UINT
-    ) -> (),
-    fn OMSetBlendState(
-        &mut self, pBlendState: *mut ID3D11BlendState, BlendFactor: &[FLOAT; 4], SampleMask: UINT
-    ) -> (),
-    fn OMSetDepthStencilState(
-        &mut self, pDepthStencilState: *mut ID3D11DepthStencilState, StencilRef: UINT
-    ) -> (),
-    fn SOSetTargets(
-        &mut self, NumBuffers: UINT, ppSOTargets: *const *mut ID3D11Buffer, pOffsets: *const UINT
-    ) -> (),
-    fn DrawAuto(&mut self) -> (),
-    fn DrawIndexedInstancedIndirect(
-        &mut self, pBufferForArgs: *mut ID3D11Buffer, AlignedByteOffsetForArgs: UINT
-    ) -> (),
-    fn DrawInstancedIndirect(
-        &mut self, pBufferForArgs: *mut ID3D11Buffer, AlignedByteOffsetForArgs: UINT
-    ) -> (),
-    fn Dispatch(
-        &mut self, ThreadGroupCountX: UINT, ThreadGroupCountY: UINT, ThreadGroupCountZ: UINT
-    ) -> (),
-    fn DispatchIndirect(
-        &mut self, pBufferForArgs: *mut ID3D11Buffer, AlignedByteOffsetForArgs: UINT
-    ) -> (),
-    fn RSSetState(&mut self, pRasterizerState: *mut ID3D11RasterizerState) -> (),
-    fn RSSetViewports(&mut self, NumViewports: UINT, pViewports: *const D3D11_VIEWPORT) -> (),
-    fn RSSetScissorRects(&mut self, NumRects: UINT, pRects: *const D3D11_RECT) -> (),
-    fn CopySubresourceRegion(
-        &mut self, pDstResource: *mut ID3D11Resource, DstSubresource: UINT, DstX: UINT, DstY: UINT,
-        DstZ: UINT, pSrcResource: *mut ID3D11Resource, SrcSubresource: UINT,
-        pSrcBox: *const D3D11_BOX
-    ) -> (),
-    fn CopyResource(
-        &mut self, pDstResource: *mut ID3D11Resource, pSrcResource: *mut ID3D11Resource
-    ) -> (),
-    fn UpdateSubresource(
-        &mut self, pDstResource: *mut ID3D11Resource, DstSubresource: UINT,
-        pDstBox: *const D3D11_BOX, pSrcData: *const c_void, SrcRowPitch: UINT, SrcDepthPitch: UINT
-    ) -> (),
-    fn CopyStructureCount(
-        &mut self, pDstBuffer: *mut ID3D11Buffer, DstAlignedByteOffset: UINT,
-        pSrcView: *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn ClearRenderTargetView(
-        &mut self, pRenderTargetView: *mut ID3D11RenderTargetView, ColorRGBA: &[FLOAT; 4]
-    ) -> (),
-    fn ClearUnorderedAccessViewUint(
-        &mut self, pUnorderedAccessView: *mut ID3D11UnorderedAccessView, Values: &[UINT; 4]
-    ) -> (),
-    fn ClearUnorderedAccessViewFloat(
-        &mut self, pUnorderedAccessView: *mut ID3D11UnorderedAccessView, Values: &[FLOAT; 4]
-    ) -> (),
-    fn ClearDepthStencilView(
-        &mut self, pDepthStencilView: *mut ID3D11DepthStencilView, ClearFlags: UINT, Depth: FLOAT,
-        Stencil: UINT8
-    ) -> (),
-    fn GenerateMips(&mut self, pShaderResourceView: *mut ID3D11ShaderResourceView) -> (),
-    fn SetResourceMinLOD(&mut self, pResource: *mut ID3D11Resource, MinLOD: FLOAT) -> (),
-    fn GetResourceMinLOD(&mut self, pResource: *mut ID3D11Resource) -> FLOAT,
-    fn ResolveSubresource(
-        &mut self, pDstResource: *mut ID3D11Resource, DstSubresource: UINT,
-        pSrcResource: *mut ID3D11Resource, SrcSubresource: UINT, Format: DXGI_FORMAT
-    ) -> (),
-    fn ExecuteCommandList(
-        &mut self, pCommandList: *mut ID3D11CommandList,
-        RestoreContextState: BOOL
-    ) -> (),
-    fn HSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn HSSetShader(
-        &mut self, pHullShader: *mut ID3D11HullShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn HSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn HSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn DSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn DSSetShader(
-        &mut self, pDomainShader: *mut ID3D11DomainShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn DSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn DSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn CSSetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *const *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn CSSetUnorderedAccessViews(
-        &mut self, StartSlot: UINT, NumUAVs: UINT,
-        ppUnorderedAccessViews: *const *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn CSSetShader(
-        &mut self, pComputeShader: *mut ID3D11ComputeShader,
-        ppClassInstances: *const *mut ID3D11ClassInstance, NumClassInstances: UINT
-    ) -> (),
-    fn CSSetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *const *mut ID3D11SamplerState
-    ) -> (),
-    fn CSSetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *const *mut ID3D11Buffer
-    ) -> (),
-    fn VSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn PSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn PSGetShader(
-        &mut self, ppPixelShader: *mut *mut ID3D11PixelShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn PSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn VSGetShader(
-        &mut self, ppVertexShader: *mut *mut ID3D11VertexShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn PSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn IAGetInputLayout(&mut self, ppInputLayout: *mut *mut ID3D11InputLayout) -> (),
-    fn IAGetVertexBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppVertexBuffers: *mut *mut ID3D11Buffer,
-        pStrides: *mut UINT, pOffsets: *mut UINT
-    ) -> (),
-    fn IAGetIndexBuffer(
-        &mut self, pIndexBuffer: *mut *mut ID3D11Buffer, Format: *mut DXGI_FORMAT,
-        Offset: *mut UINT
-    ) -> (),
-    fn GSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn GSGetShader(
-        &mut self, ppGeometryShader: *mut *mut ID3D11GeometryShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn IAGetPrimitiveTopology(&mut self, pTopology: *mut D3D11_PRIMITIVE_TOPOLOGY) -> (),
-    fn VSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn VSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn GetPredication(
-        &mut self, ppPredicate: *mut *mut ID3D11Predicate, pPredicateValue: *mut BOOL
-    ) -> (),
-    fn GSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn GSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn OMGetRenderTargets(
-        &mut self, NumViews: UINT, ppRenderTargetViews: *mut *mut ID3D11RenderTargetView,
-        ppDepthStencilView: *mut *mut ID3D11DepthStencilView
-    ) -> (),
-    fn OMGetRenderTargetsAndUnorderedAccessViews(
-        &mut self, NumRTVs: UINT, ppRenderTargetViews: *mut *mut ID3D11RenderTargetView,
-        ppDepthStencilView: *mut *mut ID3D11DepthStencilView, UAVStartSlot: UINT,
-        ppUnorderedAccessViews: *mut *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn OMGetBlendState(
-        &mut self, ppBlendState: *mut *mut ID3D11BlendState, BlendFactor: &mut [FLOAT; 4],
-        pSampleMask: *mut UINT
-    ) -> (),
-    fn OMGetDepthStencilState(
-        &mut self, ppDepthStencilState: *mut *mut ID3D11DepthStencilState, pStencilRef: *mut UINT
-    ) -> (),
-    fn SOGetTargets(&mut self, NumBuffers: UINT, ppSOTargets: *mut *mut ID3D11Buffer) -> (),
-    fn RSGetState(&mut self, ppRasterizerState: *mut *mut ID3D11RasterizerState) -> (),
-    fn RSGetViewports(&mut self, pNumViewports: *mut UINT, pViewports: *mut D3D11_VIEWPORT) -> (),
-    fn RSGetScissorRects(&mut self, pNumRects: *mut UINT, pRects: *mut D3D11_RECT) -> (),
-    fn HSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn HSGetShader(
-        &mut self, ppHullShader: *mut *mut ID3D11HullShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn HSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn HSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn DSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn DSGetShader(
-        &mut self, ppDomainShader: *mut *mut ID3D11DomainShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn DSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn DSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn CSGetShaderResources(
-        &mut self, StartSlot: UINT, NumViews: UINT,
-        ppShaderResourceViews: *mut *mut ID3D11ShaderResourceView
-    ) -> (),
-    fn CSGetUnorderedAccessViews(
-        &mut self, StartSlot: UINT, NumUAVs: UINT,
-        ppUnorderedAccessViews: *mut *mut ID3D11UnorderedAccessView
-    ) -> (),
-    fn CSGetShader(
-        &mut self, ppComputeShader: *mut *mut ID3D11ComputeShader,
-        ppClassInstances: *mut *mut ID3D11ClassInstance, pNumClassInstances: *mut UINT
-    ) -> (),
-    fn CSGetSamplers(
-        &mut self, StartSlot: UINT, NumSamplers: UINT, ppSamplers: *mut *mut ID3D11SamplerState
-    ) -> (),
-    fn CSGetConstantBuffers(
-        &mut self, StartSlot: UINT, NumBuffers: UINT, ppConstantBuffers: *mut *mut ID3D11Buffer
-    ) -> (),
-    fn ClearState(&mut self) -> (),
-    fn Flush(&mut self) -> (),
-    fn GetType(&mut self) -> D3D11_DEVICE_CONTEXT_TYPE,
-    fn GetContextFlags(&mut self) -> UINT,
-    fn FinishCommandList(
-        &mut self, RestoreDeferredContextState: BOOL, ppCommandList: *mut *mut ID3D11CommandList
-    ) -> HRESULT
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_DESC {
-    Guid: GUID,
-    SampleWidth: UINT,
-    SampleHeight: UINT,
-    OutputFormat: DXGI_FORMAT,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_CONFIG {
-    guidConfigBitstreamEncryption: GUID,
-    guidConfigMBcontrolEncryption: GUID,
-    guidConfigResidDiffEncryption: GUID,
-    ConfigBitstreamRaw: UINT,
-    ConfigMBcontrolRasterOrder: UINT,
-    ConfigResidDiffHost: UINT,
-    ConfigSpatialResid8: UINT,
-    ConfigResid8Subtraction: UINT,
-    ConfigSpatialHost8or9Clipping: UINT,
-    ConfigSpatialResidInterleaved: UINT,
-    ConfigIntraResidUnsigned: UINT,
-    ConfigResidDiffAccelerator: UINT,
-    ConfigHostInverseScan: UINT,
-    ConfigSpecificIDCT: UINT,
-    Config4GroupedCoefs: UINT,
-    ConfigMinRenderTargetBuffCount: USHORT,
-    ConfigDecoderSpecific: USHORT,
-}}
-ENUM!{enum D3D11_VIDEO_DECODER_BUFFER_TYPE {
-    D3D11_VIDEO_DECODER_BUFFER_PICTURE_PARAMETERS = 0,
-    D3D11_VIDEO_DECODER_BUFFER_MACROBLOCK_CONTROL = 1,
-    D3D11_VIDEO_DECODER_BUFFER_RESIDUAL_DIFFERENCE = 2,
-    D3D11_VIDEO_DECODER_BUFFER_DEBLOCKING_CONTROL = 3,
-    D3D11_VIDEO_DECODER_BUFFER_INVERSE_QUANTIZATION_MATRIX = 4,
-    D3D11_VIDEO_DECODER_BUFFER_SLICE_CONTROL = 5,
-    D3D11_VIDEO_DECODER_BUFFER_BITSTREAM = 6,
-    D3D11_VIDEO_DECODER_BUFFER_MOTION_VECTOR = 7,
-    D3D11_VIDEO_DECODER_BUFFER_FILM_GRAIN = 8,
-}}
-STRUCT!{struct D3D11_AES_CTR_IV {
-    IV: UINT64,
-    Count: UINT64,
-}}
-STRUCT!{struct D3D11_ENCRYPTED_BLOCK_INFO {
-    NumEncryptedBytesAtBeginning: UINT,
-    NumBytesInSkipPattern: UINT,
-    NumBytesInEncryptPattern: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_BUFFER_DESC {
-    BufferType: D3D11_VIDEO_DECODER_BUFFER_TYPE,
-    BufferIndex: UINT,
-    DataOffset: UINT,
-    DataSize: UINT,
-    FirstMBaddress: UINT,
-    NumMBsInBuffer: UINT,
-    Width: UINT,
-    Height: UINT,
-    Stride: UINT,
-    ReservedBits: UINT,
-    pIV: *mut c_void,
-    IVSize: UINT,
-    PartialEncryption: BOOL,
-    EncryptedBlockInfo: D3D11_ENCRYPTED_BLOCK_INFO,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_EXTENSION {
-    Function: UINT,
-    pPrivateInputData: *mut c_void,
-    PrivateInputDataSize: UINT,
-    pPrivateOutputData: *mut c_void,
-    PrivateOutputDataSize: UINT,
-    ResourceCount: UINT,
-    ppResourceList: *mut *mut ID3D11Resource,
-}}
-RIDL!{interface ID3D11VideoDecoder(ID3D11VideoDecoderVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetCreationParameters(
-        &mut self, pVideoDesc: *mut D3D11_VIDEO_DECODER_DESC,
-        pConfig: *mut D3D11_VIDEO_DECODER_CONFIG
-    ) -> HRESULT,
-    fn GetDriverHandle(&mut self, pDriverHandle: *mut HANDLE) -> HRESULT
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT {
-    D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT = 0x1,
-    D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT = 0x2,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_DEVICE_CAPS {
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_LINEAR_SPACE = 0x1,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_xvYCC = 0x2,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_RGB_RANGE_CONVERSION = 0x4,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_YCbCr_MATRIX_CONVERSION = 0x8,
-    D3D11_VIDEO_PROCESSOR_DEVICE_CAPS_NOMINAL_RANGE = 0x10,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FEATURE_CAPS {
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_FILL = 0x1,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_CONSTRICTION = 0x2,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LUMA_KEY = 0x4,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_PALETTE = 0x8,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_LEGACY = 0x10,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_STEREO = 0x20,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ROTATION = 0x40,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_ALPHA_STREAM = 0x80,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_PIXEL_ASPECT_RATIO = 0x100,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_MIRROR = 0x200,
-    D3D11_VIDEO_PROCESSOR_FEATURE_CAPS_SHADER_USAGE = 0x400,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FILTER_CAPS {
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS = 0x1,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST = 0x2,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE = 0x4,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION = 0x8,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_NOISE_REDUCTION = 0x10,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_EDGE_ENHANCEMENT = 0x20,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_ANAMORPHIC_SCALING = 0x40,
-    D3D11_VIDEO_PROCESSOR_FILTER_CAPS_STEREO_ADJUSTMENT = 0x80,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_FORMAT_CAPS {
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_INTERLACED = 0x1,
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_PROCAMP = 0x2,
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_RGB_LUMA_KEY = 0x4,
-    D3D11_VIDEO_PROCESSOR_FORMAT_CAPS_PALETTE_INTERLACED = 0x8,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS {
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DENOISE = 0x1,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_DERINGING = 0x2,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_EDGE_ENHANCEMENT = 0x4,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_COLOR_CORRECTION = 0x8,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_FLESH_TONE_MAPPING = 0x10,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_IMAGE_STABILIZATION = 0x20,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_SUPER_RESOLUTION = 0x40,
-    D3D11_VIDEO_PROCESSOR_AUTO_STREAM_CAPS_ANAMORPHIC_SCALING = 0x80,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_STEREO_CAPS {
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_MONO_OFFSET = 0x1,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_ROW_INTERLEAVED = 0x2,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_COLUMN_INTERLEAVED = 0x4,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_CHECKERBOARD = 0x8,
-    D3D11_VIDEO_PROCESSOR_STEREO_CAPS_FLIP_MODE = 0x10,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_CAPS {
-    DeviceCaps: UINT,
-    FeatureCaps: UINT,
-    FilterCaps: UINT,
-    InputFormatCaps: UINT,
-    AutoStreamCaps: UINT,
-    StereoCaps: UINT,
-    RateConversionCapsCount: UINT,
-    MaxInputStreams: UINT,
-    MaxStreamStates: UINT,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS {
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BLEND = 0x1,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_BOB = 0x2,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_ADAPTIVE = 0x4,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_DEINTERLACE_MOTION_COMPENSATION = 0x8,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_INVERSE_TELECINE = 0x10,
-    D3D11_VIDEO_PROCESSOR_PROCESSOR_CAPS_FRAME_RATE_CONVERSION = 0x20,
-}}
-FLAGS!{enum D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS {
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_32 = 0x1,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_22 = 0x2,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_2224 = 0x4,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_2332 = 0x8,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_32322 = 0x10,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_55 = 0x20,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_64 = 0x40,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_87 = 0x80,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_222222222223 = 0x100,
-    D3D11_VIDEO_PROCESSOR_ITELECINE_CAPS_OTHER = 0x80000000,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS {
-    PastFrames: UINT,
-    FutureFrames: UINT,
-    ProcessorCaps: UINT,
-    ITelecineCaps: UINT,
-    CustomRateCount: UINT,
-}}
-FLAGS!{enum D3D11_CONTENT_PROTECTION_CAPS {
-    D3D11_CONTENT_PROTECTION_CAPS_SOFTWARE = 0x1,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE = 0x2,
-    D3D11_CONTENT_PROTECTION_CAPS_PROTECTION_ALWAYS_ON = 0x4,
-    D3D11_CONTENT_PROTECTION_CAPS_PARTIAL_DECRYPTION = 0x8,
-    D3D11_CONTENT_PROTECTION_CAPS_CONTENT_KEY = 0x10,
-    D3D11_CONTENT_PROTECTION_CAPS_FRESHEN_SESSION_KEY = 0x20,
-    D3D11_CONTENT_PROTECTION_CAPS_ENCRYPTED_READ_BACK = 0x40,
-    D3D11_CONTENT_PROTECTION_CAPS_ENCRYPTED_READ_BACK_KEY = 0x80,
-    D3D11_CONTENT_PROTECTION_CAPS_SEQUENTIAL_CTR_IV = 0x100,
-    D3D11_CONTENT_PROTECTION_CAPS_ENCRYPT_SLICEDATA_ONLY = 0x200,
-    D3D11_CONTENT_PROTECTION_CAPS_DECRYPTION_BLT = 0x400,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_PROTECT_UNCOMPRESSED = 0x800,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_PROTECTED_MEMORY_PAGEABLE = 0x1000,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_TEARDOWN = 0x2000,
-    D3D11_CONTENT_PROTECTION_CAPS_HARDWARE_DRM_COMMUNICATION = 0x4000,
-}}
-STRUCT!{struct D3D11_VIDEO_CONTENT_PROTECTION_CAPS {
-    Caps: UINT,
-    KeyExchangeTypeCount: UINT,
-    BlockAlignmentSize: UINT,
-    ProtectedMemorySize: ULONGLONG,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_CUSTOM_RATE {
-    CustomRate: DXGI_RATIONAL,
-    OutputFrames: UINT,
-    InputInterlaced: BOOL,
-    InputFramesOrFields: UINT,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_FILTER {
-    D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS = 0,
-    D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST = 1,
-    D3D11_VIDEO_PROCESSOR_FILTER_HUE = 2,
-    D3D11_VIDEO_PROCESSOR_FILTER_SATURATION = 3,
-    D3D11_VIDEO_PROCESSOR_FILTER_NOISE_REDUCTION = 4,
-    D3D11_VIDEO_PROCESSOR_FILTER_EDGE_ENHANCEMENT = 5,
-    D3D11_VIDEO_PROCESSOR_FILTER_ANAMORPHIC_SCALING = 6,
-    D3D11_VIDEO_PROCESSOR_FILTER_STEREO_ADJUSTMENT = 7,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_FILTER_RANGE {
-    Minimum: c_int,
-    Maximum: c_int,
-    Default: c_int,
-    Multiplier: c_float,
-}}
-ENUM!{enum D3D11_VIDEO_FRAME_FORMAT {
-    D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE = 0,
-    D3D11_VIDEO_FRAME_FORMAT_INTERLACED_TOP_FIELD_FIRST = 1,
-    D3D11_VIDEO_FRAME_FORMAT_INTERLACED_BOTTOM_FIELD_FIRST = 2,
-}}
-ENUM!{enum D3D11_VIDEO_USAGE {
-    D3D11_VIDEO_USAGE_PLAYBACK_NORMAL = 0,
-    D3D11_VIDEO_USAGE_OPTIMAL_SPEED = 1,
-    D3D11_VIDEO_USAGE_OPTIMAL_QUALITY = 2,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_CONTENT_DESC {
-    InputFrameFormat: D3D11_VIDEO_FRAME_FORMAT,
-    InputFrameRate: DXGI_RATIONAL,
-    InputWidth: UINT,
-    InputHeight: UINT,
-    OutputFrameRate: DXGI_RATIONAL,
-    OutputWidth: UINT,
-    OutputHeight: UINT,
-    Usage: D3D11_VIDEO_USAGE,
-}}
-RIDL!{interface ID3D11VideoProcessorEnumerator(ID3D11VideoProcessorEnumeratorVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetVideoProcessorContentDesc(
-        &mut self, pContentDesc: *mut D3D11_VIDEO_PROCESSOR_CONTENT_DESC
-    ) -> HRESULT,
-    fn CheckVideoProcessorFormat(&mut self, Format: DXGI_FORMAT, pFlags: *mut UINT) -> HRESULT,
-    fn GetVideoProcessorCaps(&mut self, pCaps: *mut D3D11_VIDEO_PROCESSOR_CAPS) -> HRESULT,
-    fn GetVideoProcessorRateConversionCaps(
-        &mut self, TypeIndex: UINT, pCaps: *mut D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS
-    ) -> HRESULT,
-    fn GetVideoProcessorCustomRate(
-        &mut self, TypeIndex: UINT, CustomRateIndex: UINT,
-        pRate: *mut D3D11_VIDEO_PROCESSOR_CUSTOM_RATE
-    ) -> HRESULT,
-    fn GetVideoProcessorFilterRange(
-        &mut self, Filter: D3D11_VIDEO_PROCESSOR_FILTER,
-        Range: *mut D3D11_VIDEO_PROCESSOR_FILTER_RANGE
-    ) -> HRESULT
-}}
-STRUCT!{struct D3D11_VIDEO_COLOR_RGBA {
-    R: c_float,
-    G: c_float,
-    B: c_float,
-    A: c_float,
-}}
-STRUCT!{struct D3D11_VIDEO_COLOR_YCbCrA {
-    Y: c_float,
-    Cb: c_float,
-    Cr: c_float,
-    A: c_float,
-}}
-STRUCT!{struct D3D11_VIDEO_COLOR {
-    u: [c_float; 4],
-}}
-UNION!{D3D11_VIDEO_COLOR, u, YCbCr, YCbCr_mut, D3D11_VIDEO_COLOR_YCbCrA}
-UNION!{D3D11_VIDEO_COLOR, u, RGBA, RGBA_mut, D3D11_VIDEO_COLOR_RGBA}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE {
-    D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_UNDEFINED = 0,
-    D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_16_235 = 1,
-    D3D11_VIDEO_PROCESSOR_NOMINAL_RANGE_0_255 = 2,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_COLOR_SPACE {
-    bitfield: UINT,
-}}
-BITFIELD!{D3D11_VIDEO_PROCESSOR_COLOR_SPACE bitfield: UINT [
-    Usage set_Usage[0..1],
-    RGB_Range set_RGB_Range[1..2],
-    YCbCr_Matrix set_YCbCr_Matrix[2..3],
-    YCbCr_xvYCC set_YCbCr_xvYCC[3..4],
-    Nominal_Range set_Nominal_Range[4..6],
-]}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE {
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_OPAQUE = 0,
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_BACKGROUND = 1,
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_DESTINATION = 2,
-    D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE_SOURCE_STREAM = 3,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_OUTPUT_RATE {
-    D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_NORMAL = 0,
-    D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_HALF = 1,
-    D3D11_VIDEO_PROCESSOR_OUTPUT_RATE_CUSTOM = 2,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_STEREO_FORMAT {
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO = 0,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_HORIZONTAL = 1,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_VERTICAL = 2,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_SEPARATE = 3,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_MONO_OFFSET = 4,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_ROW_INTERLEAVED = 5,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_COLUMN_INTERLEAVED = 6,
-    D3D11_VIDEO_PROCESSOR_STEREO_FORMAT_CHECKERBOARD = 7,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE {
-    D3D11_VIDEO_PROCESSOR_STEREO_FLIP_NONE = 0,
-    D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME0 = 1,
-    D3D11_VIDEO_PROCESSOR_STEREO_FLIP_FRAME1 = 2,
-}}
-ENUM!{enum D3D11_VIDEO_PROCESSOR_ROTATION {
-    D3D11_VIDEO_PROCESSOR_ROTATION_IDENTITY = 0,
-    D3D11_VIDEO_PROCESSOR_ROTATION_90 = 1,
-    D3D11_VIDEO_PROCESSOR_ROTATION_180 = 2,
-    D3D11_VIDEO_PROCESSOR_ROTATION_270 = 3,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_STREAM {
-    Enable: BOOL,
-    OutputIndex: UINT,
-    InputFrameOrField: UINT,
-    PastFrames: UINT,
-    FutureFrames: UINT,
-    ppPastSurfaces: *mut *mut ID3D11VideoProcessorInputView,
-    pInputSurface: *mut ID3D11VideoProcessorInputView,
-    ppFutureSurfaces: *mut *mut ID3D11VideoProcessorInputView,
-    ppPastSurfacesRight: *mut *mut ID3D11VideoProcessorInputView,
-    pInputSurfaceRight: *mut ID3D11VideoProcessorInputView,
-    ppFutureSurfacesRight: *mut *mut ID3D11VideoProcessorInputView,
-}}
-RIDL!{interface ID3D11VideoProcessor(ID3D11VideoProcessorVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetContentDesc(&mut self, pDesc: *mut D3D11_VIDEO_PROCESSOR_CONTENT_DESC) -> (),
-    fn GetRateConversionCaps(
-        &mut self, pCaps: *mut D3D11_VIDEO_PROCESSOR_RATE_CONVERSION_CAPS
-    ) -> ()
-}}
-STRUCT!{struct D3D11_OMAC {
-    Omac: [BYTE; 16],
-}}
-ENUM!{enum D3D11_AUTHENTICATED_CHANNEL_TYPE {
-    D3D11_AUTHENTICATED_CHANNEL_D3D11 = 1,
-    D3D11_AUTHENTICATED_CHANNEL_DRIVER_SOFTWARE = 2,
-    D3D11_AUTHENTICATED_CHANNEL_DRIVER_HARDWARE = 3,
-}}
-RIDL!{interface ID3D11AuthenticatedChannel(ID3D11AuthenticatedChannelVtbl)
-    : ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut UINT) -> HRESULT,
-    fn GetCertificate(&mut self, CertificateSize: UINT, pCertificate: *mut BYTE) -> HRESULT,
-    fn GetChannelHandle(&mut self, pChannelHandle: *mut HANDLE) -> ()
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_INPUT {
-    QueryType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT {
-    omac: D3D11_OMAC,
-    QueryType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-    ReturnCode: HRESULT,
-}}
-//FIXME bitfield
-STRUCT!{struct D3D11_AUTHENTICATED_PROTECTION_FLAGS {
-    u: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_PROTECTION_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    ProtectionFlags: D3D11_AUTHENTICATED_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CHANNEL_TYPE_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    ChannelType: D3D11_AUTHENTICATED_CHANNEL_TYPE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_DEVICE_HANDLE_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DeviceHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    DecoderHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CRYPTO_SESSION_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DecoderHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    DeviceHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    RestrictedSharedResourceProcessCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    ProcessIndex: UINT,
-}}
-ENUM!{enum D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE {
-    DD3D11_PROCESSIDTYPE_UNKNOWN = 0,
-    DD3D11_PROCESSIDTYPE_DWM = 1,
-    DD3D11_PROCESSIDTYPE_HANDLE  = 2,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_RESTRICTED_SHARED_RESOURCE_PROCESS_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    ProcessIndex: UINT,
-    ProcessIdentifier: D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE,
-    ProcessHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_UNRESTRICTED_PROTECTED_SHARED_RESOURCE_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    UnrestrictedProtectedSharedResourceCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    OutputIDCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    OutputIDIndex: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_OUTPUT_ID_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    DeviceHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    OutputIDIndex: UINT,
-    OutputID: UINT64,
-}}
-ENUM!{enum D3D11_BUS_TYPE {
-    D3D11_BUS_TYPE_OTHER = 0,
-    D3D11_BUS_TYPE_PCI = 0x1,
-    D3D11_BUS_TYPE_PCIX = 0x2,
-    D3D11_BUS_TYPE_PCIEXPRESS = 0x3,
-    D3D11_BUS_TYPE_AGP = 0x4,
-    D3D11_BUS_IMPL_MODIFIER_INSIDE_OF_CHIPSET = 0x10000,
-    D3D11_BUS_IMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP = 0x20000,
-    D3D11_BUS_IMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET = 0x30000,
-    D3D11_BUS_IMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR = 0x40000,
-    D3D11_BUS_IMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE = 0x50000,
-    D3D11_BUS_IMPL_MODIFIER_NON_STANDARD = 0x80000000,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACESSIBILITY_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    BusType: D3D11_BUS_TYPE,
-    AccessibleInContiguousBlocks: BOOL,
-    AccessibleInNonContiguousBlocks: BOOL,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACCESSIBILITY_ENCRYPTION_GUID_COUNT_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    EncryptionGuidCount: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACCESSIBILITY_ENCRYPTION_GUID_INPUT {
-    Input: D3D11_AUTHENTICATED_QUERY_INPUT,
-    EncryptionGuidIndex: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_ACCESSIBILITY_ENCRYPTION_GUID_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    EncryptionGuidIndex: UINT,
-    EncryptionGuid: GUID,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_QUERY_CURRENT_ACCESSIBILITY_ENCRYPTION_OUTPUT {
-    Output: D3D11_AUTHENTICATED_QUERY_OUTPUT,
-    EncryptionGuid: GUID,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_INPUT {
-    omac: D3D11_OMAC,
-    ConfigureType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_OUTPUT {
-    omac: D3D11_OMAC,
-    ConfigureType: GUID,
-    hChannel: HANDLE,
-    SequenceNumber: UINT,
-    ReturnCode: HRESULT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_INITIALIZE_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    StartSequenceQuery: UINT,
-    StartSequenceConfigure: UINT,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_PROTECTION_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    Protections: D3D11_AUTHENTICATED_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_CRYPTO_SESSION_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    DecoderHandle: HANDLE,
-    CryptoSessionHandle: HANDLE,
-    DeviceHandle: HANDLE,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_SHARED_RESOURCE_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    ProcessType: D3D11_AUTHENTICATED_PROCESS_IDENTIFIER_TYPE,
-    ProcessHandle: HANDLE,
-    AllowAccess: BOOL,
-}}
-STRUCT!{struct D3D11_AUTHENTICATED_CONFIGURE_ACCESSIBLE_ENCRYPTION_INPUT {
-    Parameters: D3D11_AUTHENTICATED_CONFIGURE_INPUT,
-    EncryptionGuid: GUID,
-}}
-RIDL!{interface ID3D11CryptoSession(ID3D11CryptoSessionVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetCryptoType(&mut self, pCryptoType: *mut GUID) -> (),
-    fn GetDecoderProfile(&mut self, pDecoderProfile: *mut GUID) -> (),
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut UINT) -> HRESULT,
-    fn GetCertificate(&mut self, CertificateSize: UINT, pCertificate: *mut BYTE) -> HRESULT,
-    fn GetCryptoSessionHandle(&mut self, pCertificate: *mut HANDLE) -> ()
-}}
-ENUM!{enum D3D11_VDOV_DIMENSION {
-    D3D11_VDOV_DIMENSION_UNKNOWN = 0,
-    D3D11_VDOV_DIMENSION_TEXTURE2D = 1,
-}}
-STRUCT!{struct D3D11_TEX2D_VDOV {
-    ArraySlice: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC {
-    DecodeProfile: GUID,
-    ViewDimension: D3D11_VDOV_DIMENSION,
-    Texture2D: D3D11_TEX2D_VDOV,
-}}
-RIDL!{interface ID3D11VideoDecoderOutputView(ID3D11VideoDecoderOutputViewVtbl)
-    : ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC) -> ()
-}}
-ENUM!{enum D3D11_VPIV_DIMENSION {
-    D3D11_VPIV_DIMENSION_UNKNOWN = 0,
-    D3D11_VPIV_DIMENSION_TEXTURE2D = 1,
-}}
-STRUCT!{struct D3D11_TEX2D_VPIV {
-    MipSlice: UINT,
-    ArraySlice: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC {
-    FourCC: UINT,
-    ViewDimension: D3D11_VPIV_DIMENSION,
-    Texture2D: D3D11_TEX2D_VPIV,
-}}
-RIDL!{interface ID3D11VideoProcessorInputView(ID3D11VideoProcessorInputViewVtbl)
-    : ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC) -> ()
-}}
-ENUM!{enum D3D11_VPOV_DIMENSION {
-    D3D11_VPOV_DIMENSION_UNKNOWN = 0,
-    D3D11_VPOV_DIMENSION_TEXTURE2D = 1,
-    D3D11_VPOV_DIMENSION_TEXTURE2DARRAY = 2,
-}}
-STRUCT!{struct D3D11_TEX2D_VPOV {
-    MipSlice: UINT,
-}}
-STRUCT!{struct D3D11_TEX2D_ARRAY_VPOV {
-    MipSlice: UINT,
-    FirstArraySlice: UINT,
-    ArraySize: UINT,
-}}
-STRUCT!{struct D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC {
-    ViewDimension: D3D11_VPOV_DIMENSION,
-    u: [UINT; 3],
-}}
-UNION!{D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC, u, Texture2D, Texture2D_mut, D3D11_TEX2D_VPOV}
-UNION!{D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    D3D11_TEX2D_ARRAY_VPOV}
-RIDL!{interface ID3D11VideoProcessorOutputView(ID3D11VideoProcessorOutputViewVtbl)
-    : ID3D11View(ID3D11ViewVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC) -> ()
-}}
-RIDL!{interface ID3D11VideoContext(ID3D11VideoContextVtbl): ID3D11DeviceChild(ID3D11DeviceChildVtbl) {
-    fn GetDecoderBuffer(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, Type:  D3D11_VIDEO_DECODER_BUFFER_TYPE,
-        pBufferSize: *mut UINT, ppBuffer: *mut *mut c_void
-    ) -> HRESULT,
-    fn ReleaseDecoderBuffer(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, Type:  D3D11_VIDEO_DECODER_BUFFER_TYPE
-    ) -> HRESULT,
-    fn DecoderBeginFrame(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, pView: *mut ID3D11VideoDecoderOutputView,
-        ContentKeySize: UINT, pContentKey: *const c_void
-    ) -> HRESULT,
-    fn DecoderEndFrame(&mut self, pDecoder: *mut ID3D11VideoDecoder) -> HRESULT,
-    fn SubmitDecoderBuffers(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder, NumBuffers: UINT,
-        pBufferDesc: *const D3D11_VIDEO_DECODER_BUFFER_DESC
-    ) -> HRESULT,
-    fn DecoderExtension(
-        &mut self, pDecoder: *mut ID3D11VideoDecoder,
-        pExtensionData: *const D3D11_VIDEO_DECODER_EXTENSION
-    ) -> HRESULT,
-    fn VideoProcessorSetOutputTargetRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enable: BOOL, pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetOutputBackgroundColor(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, YCbCr: BOOL, pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetOutputColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pColorSpace: *const D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> HRESULT,
-    fn VideoProcessorSetOutputAlphaFillMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        AlphaFillMode: D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE, StreamIndex: UINT
-    ) -> (),
-    fn VideoProcessorSetOutputConstriction(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enable: BOOL, Size: SIZE
-    ) -> (),
-    fn VideoProcessorSetOutputStereoMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enable: BOOL
-    ) -> (),
-    fn VideoProcessorSetOutputExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pExtensionGuid: *const GUID,
-        DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorGetOutputTargetRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, Enabled: *mut BOOL, pRect: *mut RECT
-    ) -> (),
-    fn VideoProcessorGetOutputBackgroundColor(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pYCbCr: *mut BOOL,
-        pColor: *mut D3D11_VIDEO_COLOR
-    ) -> (),
-    fn VideoProcessorGetOutputColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pColorSpace: *mut D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> (),
-    fn VideoProcessorGetOutputAlphaFillMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pAlphaFillMode: *mut D3D11_VIDEO_PROCESSOR_ALPHA_FILL_MODE, pStreamIndex: *mut UINT
-    ) -> (),
-    fn VideoProcessorGetOutputConstriction(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pEnabled: *mut BOOL,
-        pSize: *mut SIZE
-    ) -> (),
-    fn VideoProcessorGetOutputStereoMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pEnabled: *mut BOOL
-    ) -> (),
-    fn VideoProcessorGetOutputExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, pExtensionGuid: *const GUID,
-        DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorSetStreamFrameFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        FrameFormat: D3D11_VIDEO_FRAME_FORMAT
-    ) -> (),
-    fn VideoProcessorSetStreamColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pColorSpace: *const D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> (),
-    fn VideoProcessorSetStreamOutputRate(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        OutputRate: D3D11_VIDEO_PROCESSOR_OUTPUT_RATE, RepeatFrame: BOOL,
-        pCustomRate: *const DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorSetStreamSourceRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetStreamDestRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        pRect: *const RECT
-    ) -> (),
-    fn VideoProcessorSetStreamAlpha(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Alpha: FLOAT
-    ) -> (),
-    fn VideoProcessorSetStreamPalette(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Count: UINT,
-        pEntries: *const UINT
-    ) -> (),
-    fn VideoProcessorSetStreamPixelAspectRatio(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        pSourceAspectRatio: *const DXGI_RATIONAL, pDestinationAspectRatio: *const DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorSetStreamLumaKey(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Lower: FLOAT, Upper: FLOAT
-    ) -> (),
-    fn VideoProcessorSetStreamStereoFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Format: D3D11_VIDEO_PROCESSOR_STEREO_FORMAT, LeftViewFrame0: BOOL, BaseViewFrame0: BOOL,
-        FlipMode: D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE
-    ) -> (),
-    fn VideoProcessorSetStreamAutoProcessingMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL
-    ) -> (),
-    fn VideoProcessorSetStreamFilter(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        Filter: D3D11_VIDEO_PROCESSOR_FILTER, Enable: BOOL, Level: c_int
-    ) -> (),
-    fn VideoProcessorSetStreamExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pExtensionGuid: *const GUID, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorGetStreamFrameFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pFrameFormat: *mut D3D11_VIDEO_FRAME_FORMAT
-    ) -> (),
-    fn VideoProcessorGetStreamColorSpace(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pColorSpace: *mut D3D11_VIDEO_PROCESSOR_COLOR_SPACE
-    ) -> (),
-    fn VideoProcessorGetStreamOutputRate(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pOutputRate: *mut D3D11_VIDEO_PROCESSOR_OUTPUT_RATE, pRepeatFrame: *mut BOOL,
-        pCustomRate: *mut DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorGetStreamSourceRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pRect: *mut RECT
-    ) -> (),
-    fn VideoProcessorGetStreamDestRect(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pRect: *mut RECT
-    ) -> (),
-    fn VideoProcessorGetStreamAlpha(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pAlpha: *mut FLOAT
-    ) -> (),
-    fn VideoProcessorGetStreamPalette(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Count: UINT,
-        pEntries: *mut UINT
-    ) -> (),
-    fn VideoProcessorGetStreamPixelAspectRatio(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pSourceAspectRatio: *mut DXGI_RATIONAL,
-        pDestinationAspectRatio: *mut DXGI_RATIONAL
-    ) -> (),
-    fn VideoProcessorGetStreamLumaKey(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pLower: *mut FLOAT, pUpper: *mut FLOAT
-    ) -> (),
-    fn VideoProcessorGetStreamStereoFormat(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL, pFormat: *mut D3D11_VIDEO_PROCESSOR_STEREO_FORMAT,
-        pLeftViewFrame0: *mut BOOL, pBaseViewFrame0: *mut BOOL,
-        pFlipMode: *mut D3D11_VIDEO_PROCESSOR_STEREO_FLIP_MODE, MonoOffset: *mut c_int
-    ) -> (),
-    fn VideoProcessorGetStreamAutoProcessingMode(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnabled: *mut BOOL
-    ) -> (),
-    fn VideoProcessorGetStreamFilter(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        Filter: D3D11_VIDEO_PROCESSOR_FILTER, pEnabled: *mut BOOL, pLevel: *mut c_int
-    ) -> (),
-    fn VideoProcessorGetStreamExtension(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pExtensionGuid: *const GUID, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn VideoProcessorBlt(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor,
-        pView: *mut ID3D11VideoProcessorOutputView, OutputFrame: UINT, StreamCount: UINT,
-        pStreams: *const D3D11_VIDEO_PROCESSOR_STREAM
-    ) -> HRESULT,
-    fn NegotiateCryptoSessionKeyExchange(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn EncryptionBlt(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, pSrcSurface: *mut ID3D11Texture2D,
-        pDstSurface: *mut ID3D11Texture2D, IVSize: UINT, pIV: *mut c_void
-    ) -> HRESULT,
-    fn DecryptionBlt(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, pSrcSurface: *mut ID3D11Texture2D,
-        pDstSurface: *mut ID3D11Texture2D, pEncryptedBlockInfo: *mut D3D11_ENCRYPTED_BLOCK_INFO,
-        ContentKeySize: UINT, pContentKey: *const c_void, IVSize: UINT, pIV: *mut c_void
-    ) -> HRESULT,
-    fn StartSessionKeyRefresh(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, RandomNumberSize: UINT,
-        pRandomNumber: *mut c_void
-    ) -> HRESULT,
-    fn FinishSessionKeyRefresh(&mut self, pCryptoSession: *mut ID3D11CryptoSession) -> HRESULT,
-    fn GetEncryptionBltKey(
-        &mut self, pCryptoSession: *mut ID3D11CryptoSession, KeySize: UINT,
-        pReadbackKey: *mut c_void
-    ) -> HRESULT,
-    fn NegotiateAuthenticatedChannelKeyExchange(
-        &mut self, pChannel: *mut ID3D11AuthenticatedChannel, DataSize: UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn QueryAuthenticatedChannel(
-        &mut self, pChannel: *mut ID3D11AuthenticatedChannel, InputSize: UINT,
-        pInput: *const c_void, OutputSize: UINT, pOutput: *mut c_void
-    ) -> HRESULT,
-    fn ConfigureAuthenticatedChannel(
-        &mut self, pChannel: *mut ID3D11AuthenticatedChannel, InputSize: UINT,
-        pInput: *const c_void, pOutput: *mut D3D11_AUTHENTICATED_CONFIGURE_OUTPUT
-    ) -> HRESULT,
-    fn VideoProcessorSetStreamRotation(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT, Enable: BOOL,
-        Rotation: D3D11_VIDEO_PROCESSOR_ROTATION
-    ) -> HRESULT,
-    fn VideoProcessorGetStreamRotation(
-        &mut self, pVideoProcessor: *mut ID3D11VideoProcessor, StreamIndex: UINT,
-        pEnable: *mut BOOL, pRotation: *mut D3D11_VIDEO_PROCESSOR_ROTATION
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11VideoDevice(ID3D11VideoDeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateVideoDecoder(
-        &mut self, pVideoDesc: *const D3D11_VIDEO_DECODER_DESC,
-        pConfig: *const D3D11_VIDEO_DECODER_CONFIG, ppDecoder: *mut *mut ID3D11VideoDecoder
-    ) -> HRESULT,
-    fn CreateVideoProcessor(
-        &mut self, pEnum: *mut ID3D11VideoProcessorEnumerator, RateConversionIndex: UINT,
-        ppVideoProcessor: *mut *mut ID3D11VideoProcessor
-    ) -> HRESULT,
-    fn CreateAuthenticatedChannel(
-        &mut self, ChannelType: D3D11_AUTHENTICATED_CHANNEL_TYPE,
-        ppAuthenticatedChannel: *mut *mut ID3D11AuthenticatedChannel
-    ) -> HRESULT,
-    fn CreateCryptoSession(
-        &mut self, pCryptoType: *const GUID, pDecoderProfile: *const GUID,
-        pKeyExchangeType: *const GUID, ppCryptoSession: *mut *mut ID3D11CryptoSession
-    ) -> HRESULT,
-    fn CreateVideoDecoderOutputView(
-        &mut self, pResource: *mut ID3D11Resource,
-        pDesc: *const D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC,
-        ppVDOVView: *mut *mut ID3D11VideoDecoderOutputView
-    ) -> HRESULT,
-    fn CreateVideoProcessorInputView(
-        &mut self, pResource: *mut ID3D11Resource, pEnum: *mut ID3D11VideoProcessorEnumerator,
-        pDesc: *const D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC,
-        ppVPIView: *mut *mut ID3D11VideoProcessorInputView
-    ) -> HRESULT,
-    fn CreateVideoProcessorOutputView(
-        &mut self, pResource: *mut ID3D11Resource, pEnum: *mut ID3D11VideoProcessorEnumerator,
-        pDesc: *const D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC,
-        ppVPOView: *mut *mut ID3D11VideoProcessorOutputView
-    ) -> HRESULT,
-    fn CreateVideoProcessorEnumerator(
-        &mut self, pDesc: *const D3D11_VIDEO_PROCESSOR_CONTENT_DESC,
-        ppEnum: *mut *mut ID3D11VideoProcessorEnumerator
-    ) -> HRESULT,
-    fn GetVideoDecoderProfileCount(&mut self) -> UINT,
-    fn GetVideoDecoderProfile(&mut self, Index: UINT, pDecoderProfile: *mut GUID) -> HRESULT,
-    fn CheckVideoDecoderFormat(
-        &mut self, pDecoderProfile: *const GUID, Format: DXGI_FORMAT, pSupported: *mut BOOL
-    ) -> HRESULT,
-    fn GetVideoDecoderConfigCount(
-        &mut self, pDesc: *const D3D11_VIDEO_DECODER_DESC, pCount: *mut UINT
-    ) -> HRESULT,
-    fn GetVideoDecoderConfig(
-        &mut self, pDesc: *const D3D11_VIDEO_DECODER_DESC, Index: UINT,
-        pConfig: *mut D3D11_VIDEO_DECODER_CONFIG
-    ) -> HRESULT,
-    fn GetContentProtectionCaps(
-        &mut self, pCryptoType: *const GUID, pDecoderProfile: *const GUID,
-        pCaps: *mut D3D11_VIDEO_CONTENT_PROTECTION_CAPS
-    ) -> HRESULT,
-    fn CheckCryptoKeyExchange(
-        &mut self, pCryptoType: *const GUID, pDecoderProfile: *const GUID, Index: UINT,
-        pKeyExchangeType: *mut GUID
-    ) -> HRESULT,
-    fn SetPrivateData( &mut self, guid: REFGUID, DataSize: UINT, pData: *const c_void) -> HRESULT,
-    fn SetPrivateDataInterface(&mut self, guid: REFGUID, pData: *const IUnknown) -> HRESULT
-}}
-RIDL!{interface ID3D11Device(ID3D11DeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateBuffer(
-        &mut self, pDesc: *const D3D11_BUFFER_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppBuffer: *mut *mut ID3D11Buffer
-    ) -> HRESULT,
-    fn CreateTexture1D(
-        &mut self, pDesc: *const D3D11_TEXTURE1D_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppTexture1D: *mut *mut ID3D11Texture1D
-    ) ->  HRESULT,
-    fn CreateTexture2D(
-        &mut self, pDesc: *const D3D11_TEXTURE2D_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppTexture2D: *mut *mut ID3D11Texture2D
-    ) -> HRESULT,
-    fn CreateTexture3D(
-        &mut self, pDesc: *const D3D11_TEXTURE3D_DESC, pInitialData: *const D3D11_SUBRESOURCE_DATA,
-        ppTexture3D: *mut *mut ID3D11Texture3D
-    ) -> HRESULT,
-    fn CreateShaderResourceView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_SHADER_RESOURCE_VIEW_DESC,
-        ppSRView: *mut *mut ID3D11ShaderResourceView
-    ) -> HRESULT,
-    fn CreateUnorderedAccessView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_UNORDERED_ACCESS_VIEW_DESC,
-        ppUAView: *mut *mut ID3D11UnorderedAccessView
-    ) -> HRESULT,
-    fn CreateRenderTargetView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_RENDER_TARGET_VIEW_DESC,
-        ppRTView: *mut *mut ID3D11RenderTargetView
-    ) -> HRESULT,
-    fn CreateDepthStencilView(
-        &mut self, pResource: *mut ID3D11Resource, pDesc: *const D3D11_DEPTH_STENCIL_VIEW_DESC,
-        ppDepthStencilView: *mut *mut ID3D11DepthStencilView
-    ) -> HRESULT,
-    fn CreateInputLayout(
-        &mut self, pInputElementDescs: *const D3D11_INPUT_ELEMENT_DESC, NumElements: UINT,
-        pShaderBytecodeWithInputSignature: *const c_void, BytecodeLength: SIZE_T,
-        ppInputLayout: *mut *mut ID3D11InputLayout
-    ) -> HRESULT,
-    fn CreateVertexShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppVertexShader: *mut *mut ID3D11VertexShader
-    ) -> HRESULT,
-    fn CreateGeometryShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppGeometryShader: *mut *mut ID3D11GeometryShader
-    ) -> HRESULT,
-    fn CreateGeometryShaderWithStreamOutput(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pSODeclaration: *const D3D11_SO_DECLARATION_ENTRY, NumEntries: UINT,
-        pBufferStrides: *const UINT, NumStrides: UINT, RasterizedStream: UINT,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppGeometryShader: *mut *mut ID3D11GeometryShader
-    ) -> HRESULT,
-    fn CreatePixelShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppPixelShader: *mut *mut ID3D11PixelShader
-    ) -> HRESULT,
-    fn CreateHullShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppHullShader: *mut *mut ID3D11HullShader
-    ) -> HRESULT,
-    fn CreateDomainShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppDomainShader: *mut *mut ID3D11DomainShader
-    ) -> HRESULT,
-    fn CreateComputeShader(
-        &mut self, pShaderBytecode: *const c_void, BytecodeLength: SIZE_T,
-        pClassLinkage: *mut ID3D11ClassLinkage, ppComputeShader: *mut *mut ID3D11ComputeShader
-    ) -> HRESULT,
-    fn CreateClassLinkage(&mut self, ppLinkage: *mut *mut ID3D11ClassLinkage) -> HRESULT,
-    fn CreateBlendState(
-        &mut self, pBlendStateDesc: *const D3D11_BLEND_DESC,
-        ppBlendState: *mut *mut ID3D11BlendState
-    ) -> HRESULT,
-    fn CreateDepthStencilState(
-        &mut self, pDepthStencilDesc: *const D3D11_DEPTH_STENCIL_DESC,
-        ppDepthStencilState: *mut *mut ID3D11DepthStencilState
-    ) -> HRESULT,
-    fn CreateRasterizerState(
-        &mut self, pRasterizerDesc: *const D3D11_RASTERIZER_DESC,
-        ppRasterizerState: *mut *mut ID3D11RasterizerState
-    ) -> HRESULT,
-    fn CreateSamplerState(
-        &mut self, pSamplerDesc: *const D3D11_SAMPLER_DESC,
-        ppSamplerState: *mut *mut ID3D11SamplerState
-    ) -> HRESULT,
-    fn CreateQuery(
-        &mut self, pQueryDesc: *const D3D11_QUERY_DESC, ppQuery: *mut *mut ID3D11Query
-    ) -> HRESULT,
-    fn CreatePredicate(
-        &mut self, pPredicateDesc: *const D3D11_QUERY_DESC, ppPredicate: *mut *mut ID3D11Predicate
-    ) -> HRESULT,
-    fn CreateCounter(
-        &mut self, pCounterDesc: *const D3D11_COUNTER_DESC, ppCounter: *mut *mut ID3D11Counter
-    ) -> HRESULT,
-    fn CreateDeferredContext(
-        &mut self, ContextFlags: UINT, ppDeferredContext: *mut *mut ID3D11DeviceContext
-    ) -> HRESULT,
-    fn OpenSharedResource(
-        &mut self, hResource: HANDLE, ReturnedInterface: REFIID, ppResource: *mut *mut c_void
-    ) -> HRESULT,
-    fn CheckFormatSupport(
-        &mut self, Format: DXGI_FORMAT, pFormatSupport: *mut UINT
-    ) -> HRESULT,
-    fn CheckMultisampleQualityLevels(
-        &mut self, Format: DXGI_FORMAT, SampleCount: UINT, pNumQualityLevels: *mut UINT
-    ) -> HRESULT,
-    fn CheckCounterInfo(&mut self, pCounterInfo: *mut D3D11_COUNTER_INFO) -> (),
-    fn CheckCounter(
-        &mut self, pDesc: *const D3D11_COUNTER_DESC, pType: *mut D3D11_COUNTER_TYPE,
-        pActiveCounters: *mut UINT, szName: LPSTR, pNameLength: *mut UINT, szUnits: LPSTR,
-        pUnitsLength: *mut UINT, szDescription: LPSTR, pDescriptionLength: *mut UINT
-    ) -> HRESULT,
-    fn CheckFeatureSupport(
-        &mut self, Feature: D3D11_FEATURE, pFeatureSupportData: *mut c_void,
-        FeatureSupportDataSize: UINT
-    ) -> HRESULT,
-    fn GetPrivateData(
-        &mut self, guid: REFGUID, pDataSize: *mut UINT, pData: *mut c_void
-    ) -> HRESULT,
-    fn SetPrivateData(
-        &mut self, guid: REFGUID, DataSize: UINT, pData: *const c_void
-    ) -> HRESULT,
-    fn SetPrivateDataInterface(&mut self, guid: REFGUID, pData: *const IUnknown) -> HRESULT,
-    fn GetFeatureLevel(&mut self) -> D3D_FEATURE_LEVEL,
-    fn GetCreationFlags(&mut self) -> UINT,
-    fn GetDeviceRemovedReason(&mut self) -> HRESULT,
-    fn GetImmediateContext(&mut self, ppImmediateContext: *mut *mut ID3D11DeviceContext) -> (),
-    fn SetExceptionMode(&mut self, RaiseFlags: UINT) -> HRESULT,
-    fn GetExceptionMode(&mut self) -> UINT
-}}
-FLAGS!{enum D3D11_CREATE_DEVICE_FLAG {
-    D3D11_CREATE_DEVICE_SINGLETHREADED = 0x1,
-    D3D11_CREATE_DEVICE_DEBUG = 0x2,
-    D3D11_CREATE_DEVICE_SWITCH_TO_REF = 0x4,
-    D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS = 0x8,
-    D3D11_CREATE_DEVICE_BGRA_SUPPORT = 0x20,
-    D3D11_CREATE_DEVICE_DEBUGGABLE = 0x40,
-    D3D11_CREATE_DEVICE_PREVENT_ALTERING_LAYER_SETTINGS_FROM_REGISTRY = 0x80,
-    D3D11_CREATE_DEVICE_DISABLE_GPU_TIMEOUT = 0x100,
-    D3D11_CREATE_DEVICE_VIDEO_SUPPORT = 0x800,
-}}
-pub const D3D11_SDK_VERSION: DWORD = 7;
-
-pub fn D3D11CalcSubresource(MipSlice: ::UINT, ArraySlice: ::UINT, MipLevels: ::UINT) -> ::UINT {
-    MipSlice + ArraySlice * MipLevels
-}
diff --git a/vendor/winapi-0.2.8/src/d3d11shader.rs b/vendor/winapi-0.2.8/src/d3d11shader.rs
deleted file mode 100644
index 8328abe82e..0000000000
--- a/vendor/winapi-0.2.8/src/d3d11shader.rs
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-ENUM!{enum D3D11_SHADER_VERSION_TYPE {
-    D3D11_SHVER_PIXEL_SHADER = 0,
-    D3D11_SHVER_VERTEX_SHADER = 1,
-    D3D11_SHVER_GEOMETRY_SHADER = 2,
-    D3D11_SHVER_HULL_SHADER = 3,
-    D3D11_SHVER_DOMAIN_SHADER = 4,
-    D3D11_SHVER_COMPUTE_SHADER = 5,
-    D3D11_SHVER_RESERVED0 = 0xFFF0,
-}}
-pub const D3D_RETURN_PARAMETER_INDEX: c_int = -1;
-pub type D3D11_RESOURCE_RETURN_TYPE = D3D_RESOURCE_RETURN_TYPE;
-pub type D3D11_CBUFFER_TYPE = D3D_CBUFFER_TYPE;
-STRUCT!{struct D3D11_SIGNATURE_PARAMETER_DESC {
-    SemanticName: LPCSTR,
-    SemanticIndex: UINT,
-    Register: UINT,
-    SystemValueType: D3D_NAME,
-    ComponentType: D3D_REGISTER_COMPONENT_TYPE,
-    Mask: BYTE,
-    ReadWriteMask: BYTE,
-    Stream: UINT,
-    MinPrecision: D3D_MIN_PRECISION,
-}}
-STRUCT!{struct D3D11_SHADER_BUFFER_DESC {
-    Name: LPCSTR,
-    Type: D3D_CBUFFER_TYPE,
-    Variables: UINT,
-    Size: UINT,
-    uFlags: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_VARIABLE_DESC {
-    Name: LPCSTR,
-    StartOffset: UINT,
-    Size: UINT,
-    uFlags: UINT,
-    DefaultValue: LPVOID,
-    StartTexture: UINT,
-    TextureSize: UINT,
-    StartSampler: UINT,
-    SamplerSize: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_TYPE_DESC {
-    Class: D3D_SHADER_VARIABLE_CLASS,
-    Type: D3D_SHADER_VARIABLE_TYPE,
-    Rows: UINT,
-    Columns: UINT,
-    Elements: UINT,
-    Members: UINT,
-    Offset: UINT,
-    Name: LPCSTR,
-}}
-pub type D3D11_TESSELLATOR_DOMAIN = D3D_TESSELLATOR_DOMAIN;
-pub type D3D11_TESSELLATOR_PARTITIONING = D3D_TESSELLATOR_PARTITIONING;
-pub type D3D11_TESSELLATOR_OUTPUT_PRIMITIVE = D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-STRUCT!{struct D3D11_SHADER_DESC {
-    Version: UINT,
-    Creator: LPCSTR,
-    Flags: UINT,
-    ConstantBuffers: UINT,
-    BoundResources: UINT,
-    InputParameters: UINT,
-    OutputParameters: UINT,
-    InstructionCount: UINT,
-    TempRegisterCount: UINT,
-    TempArrayCount: UINT,
-    DefCount: UINT,
-    DclCount: UINT,
-    TextureNormalInstructions: UINT,
-    TextureLoadInstructions: UINT,
-    TextureCompInstructions: UINT,
-    TextureBiasInstructions: UINT,
-    TextureGradientInstructions: UINT,
-    FloatInstructionCount: UINT,
-    IntInstructionCount: UINT,
-    UintInstructionCount: UINT,
-    StaticFlowControlCount: UINT,
-    DynamicFlowControlCount: UINT,
-    MacroInstructionCount: UINT,
-    ArrayInstructionCount: UINT,
-    CutInstructionCount: UINT,
-    EmitInstructionCount: UINT,
-    GSOutputTopology: D3D_PRIMITIVE_TOPOLOGY,
-    GSMaxOutputVertexCount: UINT,
-    InputPrimitive: D3D_PRIMITIVE,
-    PatchConstantParameters: UINT,
-    cGSInstanceCount: UINT,
-    cControlPoints: UINT,
-    HSOutputPrimitive: D3D_TESSELLATOR_OUTPUT_PRIMITIVE,
-    HSPartitioning: D3D_TESSELLATOR_PARTITIONING,
-    TessellatorDomain: D3D_TESSELLATOR_DOMAIN,
-    cBarrierInstructions: UINT,
-    cInterlockedInstructions: UINT,
-    cTextureStoreInstructions: UINT,
-}}
-STRUCT!{struct D3D11_SHADER_INPUT_BIND_DESC {
-    Name: LPCSTR,
-    Type: D3D_SHADER_INPUT_TYPE,
-    BindPoint: UINT,
-    BindCount: UINT,
-    uFlags: UINT,
-    ReturnType: D3D_RESOURCE_RETURN_TYPE,
-    Dimension: D3D_SRV_DIMENSION,
-    NumSamples: UINT,
-}}
-pub const D3D_SHADER_REQUIRES_DOUBLES: UINT64 = 0x00000001;
-pub const D3D_SHADER_REQUIRES_EARLY_DEPTH_STENCIL: UINT64 = 0x00000002;
-pub const D3D_SHADER_REQUIRES_UAVS_AT_EVERY_STAGE: UINT64 = 0x00000004;
-pub const D3D_SHADER_REQUIRES_64_UAVS: UINT64 = 0x00000008;
-pub const D3D_SHADER_REQUIRES_MINIMUM_PRECISION: UINT64 = 0x00000010;
-pub const D3D_SHADER_REQUIRES_11_1_DOUBLE_EXTENSIONS: UINT64 = 0x00000020;
-pub const D3D_SHADER_REQUIRES_11_1_SHADER_EXTENSIONS: UINT64 = 0x00000040;
-pub const D3D_SHADER_REQUIRES_LEVEL_9_COMPARISON_FILTERING: UINT64 = 0x00000080;
-pub const D3D_SHADER_REQUIRES_TILED_RESOURCES: UINT64 = 0x00000100;
-STRUCT!{struct D3D11_LIBRARY_DESC {
-    Creator: LPCSTR,
-    Flags: UINT,
-    FunctionCount: UINT,
-}}
-STRUCT!{struct D3D11_FUNCTION_DESC {
-    Version: UINT,
-    Creator: LPCSTR,
-    Flags: UINT,
-    ConstantBuffers: UINT,
-    BoundResources: UINT,
-    InstructionCount: UINT,
-    TempRegisterCount: UINT,
-    TempArrayCount: UINT,
-    DefCount: UINT,
-    DclCount: UINT,
-    TextureNormalInstructions: UINT,
-    TextureLoadInstructions: UINT,
-    TextureCompInstructions: UINT,
-    TextureBiasInstructions: UINT,
-    TextureGradientInstructions: UINT,
-    FloatInstructionCount: UINT,
-    IntInstructionCount: UINT,
-    UintInstructionCount: UINT,
-    StaticFlowControlCount: UINT,
-    DynamicFlowControlCount: UINT,
-    MacroInstructionCount: UINT,
-    ArrayInstructionCount: UINT,
-    MovInstructionCount: UINT,
-    MovcInstructionCount: UINT,
-    ConversionInstructionCount: UINT,
-    BitwiseInstructionCount: UINT,
-    MinFeatureLevel: D3D_FEATURE_LEVEL,
-    RequiredFeatureFlags: UINT64,
-    Name: LPCSTR,
-    FunctionParameterCount: INT,
-    HasReturn: BOOL,
-    Has10Level9VertexShader: BOOL,
-    Has10Level9PixelShader: BOOL,
-}}
-STRUCT!{struct D3D11_PARAMETER_DESC {
-    Name: LPCSTR,
-    SemanticName: LPCSTR,
-    Type: D3D_SHADER_VARIABLE_TYPE,
-    Class: D3D_SHADER_VARIABLE_CLASS,
-    Rows: UINT,
-    Columns: UINT,
-    InterpolationMode: D3D_INTERPOLATION_MODE,
-    Flags: D3D_PARAMETER_FLAGS,
-    FirstInRegister: UINT,
-    FirstInComponent: UINT,
-    FirstOutRegister: UINT,
-    FirstOutComponent: UINT,
-}}
-RIDL!{interface ID3D11ShaderReflectionType(ID3D11ShaderReflectionTypeVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_TYPE_DESC) -> HRESULT,
-    fn GetMemberTypeByIndex(&mut self, Index: UINT) -> *mut ID3D11ShaderReflectionType,
-    fn GetMemberTypeByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionType,
-    fn GetMemberTypeName(&mut self, Index: UINT) -> LPCSTR,
-    fn IsEqual(&mut self, pType: *mut ID3D11ShaderReflectionType) -> HRESULT,
-    fn GetSubType(&mut self) -> *mut ID3D11ShaderReflectionType,
-    fn GetBaseClass(&mut self) -> *mut ID3D11ShaderReflectionType,
-    fn GetNumInterfaces(&mut self) -> UINT,
-    fn GetInterfaceByIndex(&mut self, uIndex: UINT) -> *mut ID3D11ShaderReflectionType,
-    fn IsOfType(&mut self, pType: *mut ID3D11ShaderReflectionType) -> HRESULT,
-    fn ImplementsInterface(&mut self, pBase: *mut ID3D11ShaderReflectionType) -> HRESULT
-}}
-RIDL!{interface ID3D11ShaderReflectionVariable(ID3D11ShaderReflectionVariableVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_VARIABLE_DESC) -> HRESULT,
-    fn GetType(&mut self) -> *mut ID3D11ShaderReflectionType,
-    fn GetBuffer(&mut self) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetInterfaceSlot(&mut self, uArrayIndex: UINT) -> UINT
-}}
-RIDL!{interface ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBufferVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_BUFFER_DESC) -> HRESULT,
-    fn GetVariableByIndex(&mut self, Index: UINT) -> *mut ID3D11ShaderReflectionVariable,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionVariable
-}}
-RIDL!{interface ID3D11ShaderReflection(ID3D11ShaderReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_SHADER_DESC) -> HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, Index: UINT
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: LPCSTR
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: UINT, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetInputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D11_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetOutputParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D11_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetPatchConstantParameterDesc(
-        &mut self, ParameterIndex: UINT, pDesc: *mut D3D11_SIGNATURE_PARAMETER_DESC
-    ) -> HRESULT,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: LPCSTR, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetMovInstructionCount(&mut self) -> UINT,
-    fn GetMovcInstructionCount(&mut self) -> UINT,
-    fn GetConversionInstructionCount(&mut self) -> UINT,
-    fn GetBitwiseInstructionCount(&mut self) -> UINT,
-    fn GetGSInputPrimitive(&mut self) -> D3D_PRIMITIVE,
-    fn IsSampleFrequencyShader(&mut self) -> BOOL,
-    fn GetNumInterfaceSlots(&mut self) -> UINT,
-    fn GetMinFeatureLevel(&mut self, pLevel: *mut D3D_FEATURE_LEVEL) -> HRESULT,
-    fn GetThreadGroupSize(
-        &mut self, pSizeX: *mut UINT, pSizeY: *mut UINT, pSizeZ: *mut UINT
-    ) -> UINT,
-    fn GetRequiresFlags(&mut self) -> UINT64
-}}
-RIDL!{interface ID3D11LibraryReflection(ID3D11LibraryReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_LIBRARY_DESC) -> HRESULT,
-    fn GetFunctionByIndex(&mut self, FunctionIndex: INT) -> *mut ID3D11FunctionReflection
-}}
-RIDL!{interface ID3D11FunctionReflection(ID3D11FunctionReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_FUNCTION_DESC) -> HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, BufferIndex: UINT
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: LPCSTR
-    ) -> *mut ID3D11ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: UINT, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetVariableByName(&mut self, Name: LPCSTR) -> *mut ID3D11ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: LPCSTR, pDesc: *mut D3D11_SHADER_INPUT_BIND_DESC
-    ) -> HRESULT,
-    fn GetFunctionParameter(
-        &mut self, ParameterIndex: INT
-    ) -> *mut ID3D11FunctionParameterReflection
-}}
-RIDL!{interface ID3D11FunctionParameterReflection(ID3D11FunctionParameterReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut D3D11_PARAMETER_DESC) -> HRESULT
-}}
-RIDL!{interface ID3D11Module(ID3D11ModuleVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateInstance(
-        &mut self, pNamespace: LPCSTR, ppModuleInstance: *mut *mut ID3D11ModuleInstance
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11ModuleInstance(ID3D11ModuleInstanceVtbl): IUnknown(IUnknownVtbl) {
-    fn BindConstantBuffer(&mut self, uSrcSlot: UINT, uDstSlot: UINT, cbDstOffset: UINT) -> HRESULT,
-    fn BindConstantBufferByName(
-        &mut self, pName: LPCSTR, uDstSlot: UINT, cbDstOffset: UINT
-    ) -> HRESULT,
-    fn BindResource(&mut self, uSrcSlot: UINT, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindResourceByName(&mut self, pName: LPCSTR, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindSampler(&mut self, uSrcSlot: UINT, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindSamplerByName(&mut self, pName: LPCSTR, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindUnorderedAccessView(&mut self, uSrcSlot: UINT, uDstSlot: UINT, uCount: UINT) -> HRESULT,
-    fn BindUnorderedAccessViewByName(
-        &mut self, pName: LPCSTR, uDstSlot: UINT, uCount: UINT
-    ) -> HRESULT,
-    fn BindResourceAsUnorderedAccessView(
-        &mut self, uSrcSrvSlot: UINT, uDstUavSlot: UINT, uCount: UINT
-    ) -> HRESULT,
-    fn BindResourceAsUnorderedAccessViewByName(
-        &mut self, pSrvName: LPCSTR, uDstUavSlot: UINT, uCount: UINT
-    ) -> HRESULT
-}}
-RIDL!{interface ID3D11Linker(ID3D11LinkerVtbl): IUnknown(IUnknownVtbl) {
-    fn Link(
-        &mut self, pEntry: *mut ID3D11ModuleInstance, pEntryName: LPCSTR, pTargetName: LPCSTR,
-        uFlags: UINT, ppShaderBlob: *mut *mut ID3DBlob, ppErrorBuffer: *mut *mut ID3DBlob
-    ) -> HRESULT,
-    fn UseLibrary(&mut self, pLibraryMI: *mut ID3D11ModuleInstance) -> HRESULT,
-    fn AddClipPlaneFromCBuffer(&mut self, uCBufferSlot: UINT, uCBufferEntry: UINT) -> HRESULT
-}}
-RIDL!{interface ID3D11LinkingNode(ID3D11LinkingNodeVtbl): IUnknown(IUnknownVtbl) {}}
-RIDL!{interface ID3D11FunctionLinkingGraph(ID3D11FunctionLinkingGraphVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateModuleInstance(
-        &mut self, ppModuleInstance: *mut *mut ID3D11ModuleInstance,
-        ppErrorBuffer: *mut *mut ID3DBlob
-    ) -> HRESULT,
-    fn SetInputSignature(
-        &mut self, pInputParameters: *const D3D11_PARAMETER_DESC, cInputParameters: UINT,
-        ppInputNode: *mut *mut ID3D11LinkingNode
-    ) -> HRESULT,
-    fn SetOutputSignature(
-        &mut self, pOutputParameters: *const D3D11_PARAMETER_DESC, cOutputParameters: UINT,
-        ppOutputNode: *mut *mut ID3D11LinkingNode
-    ) -> HRESULT,
-    fn CallFunction(
-        &mut self, pModuleInstanceNamespace: LPCSTR,
-        pModuleWithFunctionPrototype: *mut ID3D11Module, pFunctionName: LPCSTR,
-        ppCallNode: *mut *mut ID3D11LinkingNode
-    ) -> HRESULT,
-    fn PassValue(
-        &mut self, pSrcNode: *mut ID3D11LinkingNode, SrcParameterIndex: INT,
-        pDstNode: *mut ID3D11LinkingNode, DstParameterIndex: INT
-    ) -> HRESULT,
-    fn PassValueWithSwizzle(
-        &mut self, pSrcNode: *mut ID3D11LinkingNode, SrcParameterIndex: INT, pSrcSwizzle: LPCSTR,
-        pDstNode: *mut ID3D11LinkingNode, DstParameterIndex: INT, pDstSwizzle: LPCSTR
-    ) -> HRESULT,
-    fn GetLastError(&mut self, ppErrorBuffer: *mut *mut ID3DBlob) -> HRESULT,
-    fn GenerateHlsl(&mut self, uFlags: UINT, ppBuffer: *mut *mut ID3DBlob) -> HRESULT
-}}
diff --git a/vendor/winapi-0.2.8/src/d3d12.rs b/vendor/winapi-0.2.8/src/d3d12.rs
deleted file mode 100644
index ac6ae3bdd2..0000000000
--- a/vendor/winapi-0.2.8/src/d3d12.rs
+++ /dev/null
@@ -1,2324 +0,0 @@
-// Copyright © 2015, Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-pub const D3D12_16BIT_INDEX_STRIP_CUT_VALUE: ::UINT = 0xffff;
-pub const D3D12_32BIT_INDEX_STRIP_CUT_VALUE: ::UINT = 0xffffffff;
-pub const D3D12_8BIT_INDEX_STRIP_CUT_VALUE: ::UINT = 0xff;
-pub const D3D12_ANISOTROPIC_FILTERING_BIT: ::UINT = 0x40;
-pub const D3D12_APPEND_ALIGNED_ELEMENT: ::UINT = 0xffffffff;
-pub const D3D12_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT: ::UINT = 9;
-pub const D3D12_CLIP_OR_CULL_DISTANCE_COUNT: ::UINT = 8;
-pub const D3D12_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT: ::UINT = 2;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_API_SLOT_COUNT: ::UINT = 14;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_HW_SLOT_COUNT: ::UINT = 15;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_PARTIAL_UPDATE_EXTENTS_BYTE_ALIGNMENT: ::UINT = 16;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_COUNT: ::UINT = 15;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_CONSTANT_BUFFER_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_FLOWCONTROL_NESTING_LIMIT: ::UINT = 64;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_IMMEDIATE_CONSTANT_BUFFER_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_IMMEDIATE_VALUE_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_COUNT: ::UINT = 128;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT: ::UINT = 128;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_COUNT: ::UINT = 16;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_COMMONSHADER_SAMPLER_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_COMMONSHADER_SAMPLER_SLOT_COUNT: ::UINT = 16;
-pub const D3D12_COMMONSHADER_SUBROUTINE_NESTING_LIMIT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_COUNT: ::UINT = 4096;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_READS_PER_INST: ::UINT = 3;
-pub const D3D12_COMMONSHADER_TEMP_REGISTER_READ_PORTS: ::UINT = 3;
-pub const D3D12_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MAX: ::UINT = 10;
-pub const D3D12_COMMONSHADER_TEXCOORD_RANGE_REDUCTION_MIN: ::INT = -10;
-pub const D3D12_COMMONSHADER_TEXEL_OFFSET_MAX_NEGATIVE: ::INT = -8;
-pub const D3D12_COMMONSHADER_TEXEL_OFFSET_MAX_POSITIVE: ::UINT = 7;
-pub const D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT: ::UINT = 256;
-pub const D3D12_CS_4_X_BUCKET00_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 256;
-pub const D3D12_CS_4_X_BUCKET00_MAX_NUM_THREADS_PER_GROUP: ::UINT = 64;
-pub const D3D12_CS_4_X_BUCKET01_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 240;
-pub const D3D12_CS_4_X_BUCKET01_MAX_NUM_THREADS_PER_GROUP: ::UINT = 68;
-pub const D3D12_CS_4_X_BUCKET02_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 224;
-pub const D3D12_CS_4_X_BUCKET02_MAX_NUM_THREADS_PER_GROUP: ::UINT = 72;
-pub const D3D12_CS_4_X_BUCKET03_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 208;
-pub const D3D12_CS_4_X_BUCKET03_MAX_NUM_THREADS_PER_GROUP: ::UINT = 76;
-pub const D3D12_CS_4_X_BUCKET04_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 192;
-pub const D3D12_CS_4_X_BUCKET04_MAX_NUM_THREADS_PER_GROUP: ::UINT = 84;
-pub const D3D12_CS_4_X_BUCKET05_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 176;
-pub const D3D12_CS_4_X_BUCKET05_MAX_NUM_THREADS_PER_GROUP: ::UINT = 92;
-pub const D3D12_CS_4_X_BUCKET06_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 160;
-pub const D3D12_CS_4_X_BUCKET06_MAX_NUM_THREADS_PER_GROUP: ::UINT = 100;
-pub const D3D12_CS_4_X_BUCKET07_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 144;
-pub const D3D12_CS_4_X_BUCKET07_MAX_NUM_THREADS_PER_GROUP: ::UINT = 112;
-pub const D3D12_CS_4_X_BUCKET08_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 128;
-pub const D3D12_CS_4_X_BUCKET08_MAX_NUM_THREADS_PER_GROUP: ::UINT = 128;
-pub const D3D12_CS_4_X_BUCKET09_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 112;
-pub const D3D12_CS_4_X_BUCKET09_MAX_NUM_THREADS_PER_GROUP: ::UINT = 144;
-pub const D3D12_CS_4_X_BUCKET10_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 96;
-pub const D3D12_CS_4_X_BUCKET10_MAX_NUM_THREADS_PER_GROUP: ::UINT = 168;
-pub const D3D12_CS_4_X_BUCKET11_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 80;
-pub const D3D12_CS_4_X_BUCKET11_MAX_NUM_THREADS_PER_GROUP: ::UINT = 204;
-pub const D3D12_CS_4_X_BUCKET12_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 64;
-pub const D3D12_CS_4_X_BUCKET12_MAX_NUM_THREADS_PER_GROUP: ::UINT = 256;
-pub const D3D12_CS_4_X_BUCKET13_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 48;
-pub const D3D12_CS_4_X_BUCKET13_MAX_NUM_THREADS_PER_GROUP: ::UINT = 340;
-pub const D3D12_CS_4_X_BUCKET14_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 32;
-pub const D3D12_CS_4_X_BUCKET14_MAX_NUM_THREADS_PER_GROUP: ::UINT = 512;
-pub const D3D12_CS_4_X_BUCKET15_MAX_BYTES_TGSM_WRITABLE_PER_THREAD: ::UINT = 16;
-pub const D3D12_CS_4_X_BUCKET15_MAX_NUM_THREADS_PER_GROUP: ::UINT = 768;
-pub const D3D12_CS_4_X_DISPATCH_MAX_THREAD_GROUPS_IN_Z_DIMENSION: ::UINT = 1;
-pub const D3D12_CS_4_X_RAW_UAV_BYTE_ALIGNMENT: ::UINT = 256;
-pub const D3D12_CS_4_X_THREAD_GROUP_MAX_THREADS_PER_GROUP: ::UINT = 768;
-pub const D3D12_CS_4_X_THREAD_GROUP_MAX_X: ::UINT = 768;
-pub const D3D12_CS_4_X_THREAD_GROUP_MAX_Y: ::UINT = 768;
-pub const D3D12_CS_4_X_UAV_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_DISPATCH_MAX_THREAD_GROUPS_PER_DIMENSION: ::UINT = 65535;
-pub const D3D12_CS_TGSM_REGISTER_COUNT: ::UINT = 8192;
-pub const D3D12_CS_TGSM_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_CS_TGSM_RESOURCE_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_CS_TGSM_RESOURCE_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_CS_THREADGROUPID_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_CS_THREADGROUPID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREADIDINGROUPFLATTENED_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_CS_THREADIDINGROUPFLATTENED_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREADIDINGROUP_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_CS_THREADIDINGROUP_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREADID_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_CS_THREADID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_CS_THREAD_GROUP_MAX_THREADS_PER_GROUP: ::UINT = 1024;
-pub const D3D12_CS_THREAD_GROUP_MAX_X: ::UINT = 1024;
-pub const D3D12_CS_THREAD_GROUP_MAX_Y: ::UINT = 1024;
-pub const D3D12_CS_THREAD_GROUP_MAX_Z: ::UINT = 64;
-pub const D3D12_CS_THREAD_GROUP_MIN_X: ::UINT = 1;
-pub const D3D12_CS_THREAD_GROUP_MIN_Y: ::UINT = 1;
-pub const D3D12_CS_THREAD_GROUP_MIN_Z: ::UINT = 1;
-pub const D3D12_CS_THREAD_LOCAL_TEMP_REGISTER_POOL: ::UINT = 16384;
-pub const D3D12_DEFAULT_BLEND_FACTOR_ALPHA: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BLEND_FACTOR_BLUE: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BLEND_FACTOR_GREEN: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BLEND_FACTOR_RED: ::FLOAT = 1.0;
-pub const D3D12_DEFAULT_BORDER_COLOR_COMPONENT: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_DEPTH_BIAS: ::UINT = 0;
-pub const D3D12_DEFAULT_DEPTH_BIAS_CLAMP: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_MAX_ANISOTROPY: ::UINT = 16;
-pub const D3D12_DEFAULT_MIP_LOD_BIAS: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_MSAA_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 4194304;
-pub const D3D12_DEFAULT_RENDER_TARGET_ARRAY_INDEX: ::UINT = 0;
-pub const D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 65536;
-pub const D3D12_DEFAULT_SAMPLE_MASK: ::UINT = 0xffffffff;
-pub const D3D12_DEFAULT_SCISSOR_ENDX: ::UINT = 0;
-pub const D3D12_DEFAULT_SCISSOR_ENDY: ::UINT = 0;
-pub const D3D12_DEFAULT_SCISSOR_STARTX: ::UINT = 0;
-pub const D3D12_DEFAULT_SCISSOR_STARTY: ::UINT = 0;
-pub const D3D12_DEFAULT_SLOPE_SCALED_DEPTH_BIAS: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_STENCIL_READ_MASK: ::UINT = 0xff;
-pub const D3D12_DEFAULT_STENCIL_REFERENCE: ::UINT = 0;
-pub const D3D12_DEFAULT_STENCIL_WRITE_MASK: ::UINT = 0xff;
-pub const D3D12_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_HEIGHT: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_MAX_DEPTH: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_VIEWPORT_MIN_DEPTH: ::FLOAT = 0.0;
-pub const D3D12_DEFAULT_VIEWPORT_TOPLEFTX: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_TOPLEFTY: ::UINT = 0;
-pub const D3D12_DEFAULT_VIEWPORT_WIDTH: ::UINT = 0;
-pub const D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND: ::UINT = 0xffffffff;
-pub const D3D12_DRIVER_RESERVED_REGISTER_SPACE_VALUES_END: ::UINT = 0xfffffff7;
-pub const D3D12_DRIVER_RESERVED_REGISTER_SPACE_VALUES_START: ::UINT = 0xfffffff0;
-pub const D3D12_DS_INPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: ::UINT = 3968;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_CONTROL_POINT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENTS: ::UINT = 3;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_DOMAIN_POINT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_DS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_DS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_DS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_DS_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_FILTER_REDUCTION_TYPE_MASK: ::UINT = 0x3;
-pub const D3D12_FILTER_REDUCTION_TYPE_SHIFT: ::UINT = 7;
-pub const D3D12_FILTER_TYPE_MASK: ::UINT = 0x3;
-pub const D3D12_FLOAT16_FUSED_TOLERANCE_IN_ULP: ::DOUBLE = 0.6;
-pub const D3D12_FLOAT32_MAX: ::FLOAT = 3.402823466e+38;
-pub const D3D12_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP: ::FLOAT = 0.6;
-pub const D3D12_FLOAT_TO_SRGB_EXPONENT_DENOMINATOR: ::FLOAT = 2.4;
-pub const D3D12_FLOAT_TO_SRGB_EXPONENT_NUMERATOR: ::FLOAT = 1.0;
-pub const D3D12_FLOAT_TO_SRGB_OFFSET: ::FLOAT = 0.055;
-pub const D3D12_FLOAT_TO_SRGB_SCALE_1: ::FLOAT = 12.92;
-pub const D3D12_FLOAT_TO_SRGB_SCALE_2: ::FLOAT = 1.055;
-pub const D3D12_FLOAT_TO_SRGB_THRESHOLD: ::FLOAT = 0.0031308;
-pub const D3D12_FTOI_INSTRUCTION_MAX_INPUT: ::FLOAT = 2147483647.999;
-pub const D3D12_FTOI_INSTRUCTION_MIN_INPUT: ::FLOAT = -2147483648.999;
-pub const D3D12_FTOU_INSTRUCTION_MAX_INPUT: ::FLOAT = 4294967295.999;
-pub const D3D12_FTOU_INSTRUCTION_MIN_INPUT: ::FLOAT = 0.0;
-pub const D3D12_GS_INPUT_INSTANCE_ID_READS_PER_INST: ::UINT = 2;
-pub const D3D12_GS_INPUT_INSTANCE_ID_READ_PORTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_INSTANCE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_GS_INPUT_PRIM_CONST_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_GS_INPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_GS_INPUT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_GS_INPUT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_GS_INPUT_REGISTER_VERTICES: ::UINT = 32;
-pub const D3D12_GS_MAX_INSTANCE_COUNT: ::UINT = 32;
-pub const D3D12_GS_MAX_OUTPUT_VERTEX_COUNT_ACROSS_INSTANCES: ::UINT = 1024;
-pub const D3D12_GS_OUTPUT_ELEMENTS: ::UINT = 32;
-pub const D3D12_GS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_GS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_GS_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_PHASE_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_PHASE_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_CONTROL_POINT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND: ::UINT = 0xffffffff;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_INPUT_FORK_INSTANCE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_INPUT_JOIN_INSTANCE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND: ::UINT = 0xffffffff;
-pub const D3D12_HS_MAXTESSFACTOR_LOWER_BOUND: ::FLOAT = 1.0;
-pub const D3D12_HS_MAXTESSFACTOR_UPPER_BOUND: ::FLOAT = 64.0;
-pub const D3D12_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS: ::UINT = 3968;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_OUTPUT_CONTROL_POINT_ID_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_HS_OUTPUT_PATCH_CONSTANT_REGISTER_SCALAR_COMPONENTS: ::UINT = 128;
-pub const D3D12_IA_DEFAULT_INDEX_BUFFER_OFFSET_IN_BYTES: ::UINT = 0;
-pub const D3D12_IA_DEFAULT_PRIMITIVE_TOPOLOGY: ::UINT = 0;
-pub const D3D12_IA_DEFAULT_VERTEX_BUFFER_OFFSET_IN_BYTES: ::UINT = 0;
-pub const D3D12_IA_INDEX_INPUT_RESOURCE_SLOT_COUNT: ::UINT = 1;
-pub const D3D12_IA_INSTANCE_ID_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_INTEGER_ARITHMETIC_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_PATCH_MAX_CONTROL_POINT_COUNT: ::UINT = 32;
-pub const D3D12_IA_PRIMITIVE_ID_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_VERTEX_ID_BIT_COUNT: ::UINT = 32;
-pub const D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT: ::UINT = 32;
-pub const D3D12_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS: ::UINT = 128;
-pub const D3D12_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT: ::UINT = 32;
-pub const D3D12_INTEGER_DIVIDE_BY_ZERO_QUOTIENT: ::UINT = 0xffffffff;
-pub const D3D12_INTEGER_DIVIDE_BY_ZERO_REMAINDER: ::UINT = 0xffffffff;
-pub const D3D12_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL: ::UINT = 0xffffffff;
-pub const D3D12_KEEP_UNORDERED_ACCESS_VIEWS: ::UINT = 0xffffffff;
-pub const D3D12_LINEAR_GAMMA: ::FLOAT = 1.0;
-pub const D3D12_MAG_FILTER_SHIFT: ::UINT = 2;
-pub const D3D12_MAJOR_VERSION: ::UINT = 12;
-pub const D3D12_MAX_BORDER_COLOR_COMPONENT: ::FLOAT = 1.0;
-pub const D3D12_MAX_DEPTH: ::FLOAT = 1.0;
-pub const D3D12_MAX_LIVE_STATIC_SAMPLERS: ::UINT = 2032;
-pub const D3D12_MAX_MAXANISOTROPY: ::UINT = 16;
-pub const D3D12_MAX_MULTISAMPLE_SAMPLE_COUNT: ::UINT = 32;
-pub const D3D12_MAX_POSITION_VALUE: ::FLOAT = 3.402823466e+34;
-pub const D3D12_MAX_ROOT_COST: ::UINT = 64;
-pub const D3D12_MAX_SHADER_VISIBLE_DESCRIPTOR_HEAP_SIZE_TIER_1: ::UINT = 1000000;
-pub const D3D12_MAX_SHADER_VISIBLE_DESCRIPTOR_HEAP_SIZE_TIER_2: ::UINT = 1000000;
-pub const D3D12_MAX_SHADER_VISIBLE_SAMPLER_HEAP_SIZE: ::UINT = 2048;
-pub const D3D12_MAX_TEXTURE_DIMENSION_2_TO_EXP: ::UINT = 17;
-pub const D3D12_MINOR_VERSION: ::UINT = 0;
-pub const D3D12_MIN_BORDER_COLOR_COMPONENT: ::FLOAT = 0.0;
-pub const D3D12_MIN_DEPTH: ::FLOAT = 0.0;
-pub const D3D12_MIN_FILTER_SHIFT: ::UINT = 4;
-pub const D3D12_MIN_MAXANISOTROPY: ::UINT = 0;
-pub const D3D12_MIP_FILTER_SHIFT: ::UINT = 0;
-pub const D3D12_MIP_LOD_BIAS_MAX: ::FLOAT = 15.99;
-pub const D3D12_MIP_LOD_BIAS_MIN: ::FLOAT = -16.0;
-pub const D3D12_MIP_LOD_FRACTIONAL_BIT_COUNT: ::UINT = 8;
-pub const D3D12_MIP_LOD_RANGE_BIT_COUNT: ::UINT = 8;
-pub const D3D12_MULTISAMPLE_ANTIALIAS_LINE_WIDTH: ::FLOAT = 1.4;
-pub const D3D12_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT: ::UINT = 0;
-pub const D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_END: ::UINT = 0xffffffff;
-pub const D3D12_OS_RESERVED_REGISTER_SPACE_VALUES_START: ::UINT = 0xfffffff8;
-pub const D3D12_PACKED_TILE: ::UINT = 0xffffffff;
-pub const D3D12_PIXEL_ADDRESS_RANGE_BIT_COUNT: ::UINT = 15;
-pub const D3D12_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT: ::UINT = 16;
-pub const D3D12_PS_CS_UAV_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_PS_CS_UAV_REGISTER_COUNT: ::UINT = 8;
-pub const D3D12_PS_CS_UAV_REGISTER_READS_PER_INST: ::UINT = 1;
-pub const D3D12_PS_CS_UAV_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_PS_FRONTFACING_DEFAULT_VALUE: ::UINT = 0xffffffff;
-pub const D3D12_PS_FRONTFACING_FALSE_VALUE: ::UINT = 0;
-pub const D3D12_PS_FRONTFACING_TRUE_VALUE: ::UINT = 0xffffffff;
-pub const D3D12_PS_INPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_PS_INPUT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_PS_INPUT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_PS_LEGACY_PIXEL_CENTER_FRACTIONAL_COMPONENT: ::FLOAT = 0.0;
-pub const D3D12_PS_OUTPUT_DEPTH_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_DEPTH_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_OUTPUT_DEPTH_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_MASK_REGISTER_COMPONENTS: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_MASK_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_OUTPUT_MASK_REGISTER_COUNT: ::UINT = 1;
-pub const D3D12_PS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_PS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_PS_OUTPUT_REGISTER_COUNT: ::UINT = 8;
-pub const D3D12_PS_PIXEL_CENTER_FRACTIONAL_COMPONENT: ::FLOAT = 0.5;
-pub const D3D12_RAW_UAV_SRV_BYTE_ALIGNMENT: ::UINT = 16;
-pub const D3D12_REQ_BLEND_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_BUFFER_RESOURCE_TEXEL_COUNT_2_TO_EXP: ::UINT = 27;
-pub const D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT: ::UINT = 4096;
-pub const D3D12_REQ_DEPTH_STENCIL_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: ::UINT = 32;
-pub const D3D12_REQ_DRAW_VERTEX_COUNT_2_TO_EXP: ::UINT = 32;
-pub const D3D12_REQ_FILTERING_HW_ADDRESSABLE_RESOURCE_DIMENSION: ::UINT = 16384;
-pub const D3D12_REQ_GS_INVOCATION_32BIT_OUTPUT_COMPONENT_LIMIT: ::UINT = 1024;
-pub const D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT: ::UINT = 4096;
-pub const D3D12_REQ_MAXANISOTROPY: ::UINT = 16;
-pub const D3D12_REQ_MIP_LEVELS: ::UINT = 15;
-pub const D3D12_REQ_MULTI_ELEMENT_STRUCTURE_SIZE_IN_BYTES: ::UINT = 2048;
-pub const D3D12_REQ_RASTERIZER_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_RENDER_TO_BUFFER_WINDOW_WIDTH: ::UINT = 16384;
-pub const D3D12_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_A_TERM: ::UINT = 128;
-pub const D3D12_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_B_TERM: ::FLOAT = 0.25;
-pub const D3D12_REQ_RESOURCE_SIZE_IN_MEGABYTES_EXPRESSION_C_TERM: ::UINT = 2048;
-pub const D3D12_REQ_RESOURCE_VIEW_COUNT_PER_DEVICE_2_TO_EXP: ::UINT = 20;
-pub const D3D12_REQ_SAMPLER_OBJECT_COUNT_PER_DEVICE: ::UINT = 4096;
-pub const D3D12_REQ_SUBRESOURCES: ::UINT = 30720;
-pub const D3D12_REQ_TEXTURE1D_ARRAY_AXIS_DIMENSION: ::UINT = 2048;
-pub const D3D12_REQ_TEXTURE1D_U_DIMENSION: ::UINT = 16384;
-pub const D3D12_REQ_TEXTURE2D_ARRAY_AXIS_DIMENSION: ::UINT = 2048;
-pub const D3D12_REQ_TEXTURE2D_U_OR_V_DIMENSION: ::UINT = 16384;
-pub const D3D12_REQ_TEXTURE3D_U_V_OR_W_DIMENSION: ::UINT = 2048;
-pub const D3D12_REQ_TEXTURECUBE_DIMENSION: ::UINT = 16384;
-pub const D3D12_RESINFO_INSTRUCTION_MISSING_COMPONENT_RETVAL: ::UINT = 0;
-pub const D3D12_RESOURCE_BARRIER_ALL_SUBRESOURCES: ::UINT = 0xffffffff;
-pub const D3D12_SHADER_COMPONENT_MAPPING_MASK: ::UINT = 0x7;
-pub const D3D12_SHADER_COMPONENT_MAPPING_SHIFT: ::UINT = 3;
-pub const D3D12_SHADER_MAJOR_VERSION: ::UINT = 5;
-pub const D3D12_SHADER_MAX_INSTANCES: ::UINT = 65535;
-pub const D3D12_SHADER_MAX_INTERFACES: ::UINT = 253;
-pub const D3D12_SHADER_MAX_INTERFACE_CALL_SITES: ::UINT = 4096;
-pub const D3D12_SHADER_MAX_TYPES: ::UINT = 65535;
-pub const D3D12_SHADER_MINOR_VERSION: ::UINT = 1;
-pub const D3D12_SHIFT_INSTRUCTION_PAD_VALUE: ::UINT = 0;
-pub const D3D12_SHIFT_INSTRUCTION_SHIFT_VALUE_BIT_COUNT: ::UINT = 5;
-pub const D3D12_SIMULTANEOUS_RENDER_TARGET_COUNT: ::UINT = 8;
-pub const D3D12_SMALL_MSAA_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 65536;
-pub const D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT: ::UINT = 4096;
-pub const D3D12_SO_BUFFER_MAX_STRIDE_IN_BYTES: ::UINT = 2048;
-pub const D3D12_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES: ::UINT = 512;
-pub const D3D12_SO_BUFFER_SLOT_COUNT: ::UINT = 4;
-pub const D3D12_SO_DDI_REGISTER_INDEX_DENOTING_GAP: ::UINT = 0xffffffff;
-pub const D3D12_SO_NO_RASTERIZED_STREAM: ::UINT = 0xffffffff;
-pub const D3D12_SO_OUTPUT_COMPONENT_COUNT: ::UINT = 128;
-pub const D3D12_SO_STREAM_COUNT: ::UINT = 4;
-pub const D3D12_SPEC_DATE_DAY: ::UINT = 14;
-pub const D3D12_SPEC_DATE_MONTH: ::UINT = 11;
-pub const D3D12_SPEC_DATE_YEAR: ::UINT = 2014;
-pub const D3D12_SPEC_VERSION: ::DOUBLE = 1.16;
-pub const D3D12_SRGB_GAMMA: ::FLOAT = 2.2;
-pub const D3D12_SRGB_TO_FLOAT_DENOMINATOR_1: ::FLOAT = 12.92;
-pub const D3D12_SRGB_TO_FLOAT_DENOMINATOR_2: ::FLOAT = 1.055;
-pub const D3D12_SRGB_TO_FLOAT_EXPONENT: ::FLOAT = 2.4;
-pub const D3D12_SRGB_TO_FLOAT_OFFSET: ::FLOAT = 0.055;
-pub const D3D12_SRGB_TO_FLOAT_THRESHOLD: ::FLOAT = 0.04045;
-pub const D3D12_SRGB_TO_FLOAT_TOLERANCE_IN_ULP: ::FLOAT = 0.5;
-pub const D3D12_STANDARD_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_STANDARD_COMPONENT_BIT_COUNT_DOUBLED: ::UINT = 64;
-pub const D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE: ::UINT = 4;
-pub const D3D12_STANDARD_PIXEL_COMPONENT_COUNT: ::UINT = 128;
-pub const D3D12_STANDARD_PIXEL_ELEMENT_COUNT: ::UINT = 32;
-pub const D3D12_STANDARD_VECTOR_SIZE: ::UINT = 4;
-pub const D3D12_STANDARD_VERTEX_ELEMENT_COUNT: ::UINT = 32;
-pub const D3D12_STANDARD_VERTEX_TOTAL_COMPONENT_COUNT: ::UINT = 64;
-pub const D3D12_SUBPIXEL_FRACTIONAL_BIT_COUNT: ::UINT = 8;
-pub const D3D12_SUBTEXEL_FRACTIONAL_BIT_COUNT: ::UINT = 8;
-pub const D3D12_SYSTEM_RESERVED_REGISTER_SPACE_VALUES_END: ::UINT = 0xffffffff;
-pub const D3D12_SYSTEM_RESERVED_REGISTER_SPACE_VALUES_START: ::UINT = 0xfffffff0;
-pub const D3D12_TESSELLATOR_MAX_EVEN_TESSELLATION_FACTOR: ::UINT = 64;
-pub const D3D12_TESSELLATOR_MAX_ISOLINE_DENSITY_TESSELLATION_FACTOR: ::UINT = 64;
-pub const D3D12_TESSELLATOR_MAX_ODD_TESSELLATION_FACTOR: ::UINT = 63;
-pub const D3D12_TESSELLATOR_MAX_TESSELLATION_FACTOR: ::UINT = 64;
-pub const D3D12_TESSELLATOR_MIN_EVEN_TESSELLATION_FACTOR: ::UINT = 2;
-pub const D3D12_TESSELLATOR_MIN_ISOLINE_DENSITY_TESSELLATION_FACTOR: ::UINT = 1;
-pub const D3D12_TESSELLATOR_MIN_ODD_TESSELLATION_FACTOR: ::UINT = 1;
-pub const D3D12_TEXEL_ADDRESS_RANGE_BIT_COUNT: ::UINT = 16;
-pub const D3D12_TEXTURE_DATA_PITCH_ALIGNMENT: ::UINT = 256;
-pub const D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT: ::UINT = 512;
-pub const D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES: ::UINT = 65536;
-pub const D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT: ::UINT = 4096;
-pub const D3D12_UAV_SLOT_COUNT: ::UINT = 64;
-pub const D3D12_UNBOUND_MEMORY_ACCESS_RESULT: ::UINT = 0;
-pub const D3D12_VIEWPORT_AND_SCISSORRECT_MAX_INDEX: ::UINT = 15;
-pub const D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE: ::UINT = 16;
-pub const D3D12_VIEWPORT_BOUNDS_MAX: ::UINT = 32767;
-pub const D3D12_VIEWPORT_BOUNDS_MIN: ::INT = -32768;
-pub const D3D12_VS_INPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_VS_INPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_VS_INPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_VS_INPUT_REGISTER_READS_PER_INST: ::UINT = 2;
-pub const D3D12_VS_INPUT_REGISTER_READ_PORTS: ::UINT = 1;
-pub const D3D12_VS_OUTPUT_REGISTER_COMPONENTS: ::UINT = 4;
-pub const D3D12_VS_OUTPUT_REGISTER_COMPONENT_BIT_COUNT: ::UINT = 32;
-pub const D3D12_VS_OUTPUT_REGISTER_COUNT: ::UINT = 32;
-pub const D3D12_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT: ::UINT = 10;
-pub const D3D12_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP: ::UINT = 25;
-pub const D3D12_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP: ::UINT = 25;
-pub type D3D12_GPU_VIRTUAL_ADDRESS = ::UINT64;
-ENUM!{enum D3D12_COMMAND_LIST_TYPE {
-    D3D12_COMMAND_LIST_TYPE_DIRECT = 0,
-    D3D12_COMMAND_LIST_TYPE_BUNDLE = 1,
-    D3D12_COMMAND_LIST_TYPE_COMPUTE = 2,
-    D3D12_COMMAND_LIST_TYPE_COPY = 3,
-}}
-FLAGS!{enum D3D12_COMMAND_QUEUE_FLAGS {
-    D3D12_COMMAND_QUEUE_FLAG_NONE = 0x0,
-    D3D12_COMMAND_QUEUE_FLAG_DISABLE_GPU_TIMEOUT = 0x1,
-}}
-ENUM!{enum D3D12_COMMAND_QUEUE_PRIORITY {
-    D3D12_COMMAND_QUEUE_PRIORITY_NORMAL = 0,
-    D3D12_COMMAND_QUEUE_PRIORITY_HIGH = 100,
-}}
-STRUCT!{struct D3D12_COMMAND_QUEUE_DESC {
-    Type: D3D12_COMMAND_LIST_TYPE,
-    Priority: ::INT,
-    Flags: D3D12_COMMAND_QUEUE_FLAGS,
-    NodeMask: ::UINT,
-}}
-ENUM!{enum D3D12_PRIMITIVE_TOPOLOGY_TYPE {
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_UNDEFINED = 0,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT = 1,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE = 2,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE = 3,
-    D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH = 4,
-}}
-ENUM!{enum D3D12_INPUT_CLASSIFICATION {
-    D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA = 0,
-    D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA = 1,
-}}
-STRUCT!{struct D3D12_INPUT_ELEMENT_DESC {
-    SemanticName: ::LPCSTR,
-    SemanticIndex: ::UINT,
-    Format: ::DXGI_FORMAT,
-    InputSlot: ::UINT,
-    AlignedByteOffset: ::UINT,
-    InputSlotClass: D3D12_INPUT_CLASSIFICATION,
-    InstanceDataStepRate: ::UINT,
-}}
-ENUM!{enum D3D12_FILL_MODE {
-    D3D12_FILL_MODE_WIREFRAME = 2,
-    D3D12_FILL_MODE_SOLID = 3,
-}}
-pub type D3D12_PRIMITIVE_TOPOLOGY = ::D3D_PRIMITIVE_TOPOLOGY;
-pub type D3D12_PRIMITIVE = ::D3D_PRIMITIVE;
-ENUM!{enum D3D12_CULL_MODE {
-    D3D12_CULL_MODE_NONE = 1,
-    D3D12_CULL_MODE_FRONT = 2,
-    D3D12_CULL_MODE_BACK = 3,
-}}
-STRUCT!{struct D3D12_SO_DECLARATION_ENTRY {
-    Stream: ::UINT,
-    SemanticName: ::LPCSTR,
-    SemanticIndex: ::UINT,
-    StartComponent: ::BYTE,
-    ComponentCount: ::BYTE,
-    OutputSlot: ::BYTE,
-}}
-STRUCT!{struct D3D12_VIEWPORT {
-    TopLeftX: ::FLOAT,
-    TopLeftY: ::FLOAT,
-    Width: ::FLOAT,
-    Height: ::FLOAT,
-    MinDepth: ::FLOAT,
-    MaxDepth: ::FLOAT,
-}}
-pub type D3D12_RECT = ::RECT;
-STRUCT!{struct D3D12_BOX {
-    left: ::UINT,
-    top: ::UINT,
-    front: ::UINT,
-    right: ::UINT,
-    bottom: ::UINT,
-    back: ::UINT,
-}}
-ENUM!{enum D3D12_COMPARISON_FUNC {
-    D3D12_COMPARISON_FUNC_NEVER = 1,
-    D3D12_COMPARISON_FUNC_LESS = 2,
-    D3D12_COMPARISON_FUNC_EQUAL = 3,
-    D3D12_COMPARISON_FUNC_LESS_EQUAL = 4,
-    D3D12_COMPARISON_FUNC_GREATER = 5,
-    D3D12_COMPARISON_FUNC_NOT_EQUAL = 6,
-    D3D12_COMPARISON_FUNC_GREATER_EQUAL = 7,
-    D3D12_COMPARISON_FUNC_ALWAYS = 8,
-}}
-ENUM!{enum D3D12_DEPTH_WRITE_MASK {
-    D3D12_DEPTH_WRITE_MASK_ZERO = 0,
-    D3D12_DEPTH_WRITE_MASK_ALL = 1,
-}}
-ENUM!{enum D3D12_STENCIL_OP {
-    D3D12_STENCIL_OP_KEEP = 1,
-    D3D12_STENCIL_OP_ZERO = 2,
-    D3D12_STENCIL_OP_REPLACE = 3,
-    D3D12_STENCIL_OP_INCR_SAT = 4,
-    D3D12_STENCIL_OP_DECR_SAT = 5,
-    D3D12_STENCIL_OP_INVERT = 6,
-    D3D12_STENCIL_OP_INCR = 7,
-    D3D12_STENCIL_OP_DECR = 8,
-}}
-STRUCT!{struct D3D12_DEPTH_STENCILOP_DESC {
-    StencilFailOp: D3D12_STENCIL_OP,
-    StencilDepthFailOp: D3D12_STENCIL_OP,
-    StencilPassOp: D3D12_STENCIL_OP,
-    StencilFunc: D3D12_COMPARISON_FUNC,
-}}
-STRUCT!{struct D3D12_DEPTH_STENCIL_DESC {
-    DepthEnable: ::BOOL,
-    DepthWriteMask: D3D12_DEPTH_WRITE_MASK,
-    DepthFunc: D3D12_COMPARISON_FUNC,
-    StencilEnable: ::BOOL,
-    StencilReadMask: ::UINT8,
-    StencilWriteMask: ::UINT8,
-    FrontFace: D3D12_DEPTH_STENCILOP_DESC,
-    BackFace: D3D12_DEPTH_STENCILOP_DESC,
-}}
-ENUM!{enum D3D12_BLEND {
-    D3D12_BLEND_ZERO = 1,
-    D3D12_BLEND_ONE = 2,
-    D3D12_BLEND_SRC_COLOR = 3,
-    D3D12_BLEND_INV_SRC_COLOR = 4,
-    D3D12_BLEND_SRC_ALPHA = 5,
-    D3D12_BLEND_INV_SRC_ALPHA = 6,
-    D3D12_BLEND_DEST_ALPHA = 7,
-    D3D12_BLEND_INV_DEST_ALPHA = 8,
-    D3D12_BLEND_DEST_COLOR = 9,
-    D3D12_BLEND_INV_DEST_COLOR = 10,
-    D3D12_BLEND_SRC_ALPHA_SAT = 11,
-    D3D12_BLEND_BLEND_FACTOR = 14,
-    D3D12_BLEND_INV_BLEND_FACTOR = 15,
-    D3D12_BLEND_SRC1_COLOR = 16,
-    D3D12_BLEND_INV_SRC1_COLOR = 17,
-    D3D12_BLEND_SRC1_ALPHA = 18,
-    D3D12_BLEND_INV_SRC1_ALPHA = 19,
-}}
-ENUM!{enum D3D12_BLEND_OP {
-    D3D12_BLEND_OP_ADD = 1,
-    D3D12_BLEND_OP_SUBTRACT = 2,
-    D3D12_BLEND_OP_REV_SUBTRACT = 3,
-    D3D12_BLEND_OP_MIN = 4,
-    D3D12_BLEND_OP_MAX = 5,
-}}
-FLAGS!{enum D3D12_COLOR_WRITE_ENABLE {
-    D3D12_COLOR_WRITE_ENABLE_RED = 0x1,
-    D3D12_COLOR_WRITE_ENABLE_GREEN = 0x2,
-    D3D12_COLOR_WRITE_ENABLE_BLUE = 0x4,
-    D3D12_COLOR_WRITE_ENABLE_ALPHA = 0x8,
-    D3D12_COLOR_WRITE_ENABLE_ALL = 0xF,
-}}
-ENUM!{enum D3D12_LOGIC_OP {
-    D3D12_LOGIC_OP_CLEAR = 0,
-    D3D12_LOGIC_OP_SET = 1,
-    D3D12_LOGIC_OP_COPY = 2,
-    D3D12_LOGIC_OP_COPY_INVERTED = 3,
-    D3D12_LOGIC_OP_NOOP = 4,
-    D3D12_LOGIC_OP_INVERT = 5,
-    D3D12_LOGIC_OP_AND = 6,
-    D3D12_LOGIC_OP_NAND = 7,
-    D3D12_LOGIC_OP_OR = 8,
-    D3D12_LOGIC_OP_NOR = 9,
-    D3D12_LOGIC_OP_XOR = 10,
-    D3D12_LOGIC_OP_EQUIV = 11,
-    D3D12_LOGIC_OP_AND_REVERSE = 12,
-    D3D12_LOGIC_OP_AND_INVERTED = 13,
-    D3D12_LOGIC_OP_OR_REVERSE = 14,
-    D3D12_LOGIC_OP_OR_INVERTED = 15,
-}}
-STRUCT!{struct D3D12_RENDER_TARGET_BLEND_DESC {
-    BlendEnable: ::BOOL,
-    LogicOpEnable: ::BOOL,
-    SrcBlend: D3D12_BLEND,
-    DestBlend: D3D12_BLEND,
-    BlendOp: D3D12_BLEND_OP,
-    SrcBlendAlpha: D3D12_BLEND,
-    DestBlendAlpha: D3D12_BLEND,
-    BlendOpAlpha: D3D12_BLEND_OP,
-    LogicOp: D3D12_LOGIC_OP,
-    RenderTargetWriteMask: ::UINT8,
-}}
-STRUCT!{struct D3D12_BLEND_DESC {
-    AlphaToCoverageEnable: ::BOOL,
-    IndependentBlendEnable: ::BOOL,
-    RenderTarget: [D3D12_RENDER_TARGET_BLEND_DESC; 8],
-}}
-ENUM!{enum D3D12_CONSERVATIVE_RASTERIZATION_MODE {
-    D3D12_CONSERVATIVE_RASTERIZATION_MODE_OFF = 0,
-    D3D12_CONSERVATIVE_RASTERIZATION_MODE_ON = 1,
-}}
-STRUCT!{struct D3D12_RASTERIZER_DESC {
-    FillMode: D3D12_FILL_MODE,
-    CullMode: D3D12_CULL_MODE,
-    FrontCounterClockwise: ::BOOL,
-    DepthBias: ::INT,
-    DepthBiasClamp: ::FLOAT,
-    SlopeScaledDepthBias: ::FLOAT,
-    DepthClipEnable: ::BOOL,
-    MultisampleEnable: ::BOOL,
-    AntialiasedLineEnable: ::BOOL,
-    ForcedSampleCount: ::UINT,
-    ConservativeRaster: D3D12_CONSERVATIVE_RASTERIZATION_MODE,
-}}
-RIDL!{interface ID3D12Object(ID3D12ObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPrivateData(
-        &mut self, guid: ::REFGUID, pDataSize: *mut ::UINT, pData: *mut ::c_void
-    ) -> ::HRESULT,
-    fn SetPrivateData(
-        &mut self, guid: ::REFGUID, DataSize: ::UINT, pData: *const ::c_void
-    ) -> ::HRESULT,
-    fn SetPrivateDataInterface(
-        &mut self, guid: ::REFGUID, pData: *const ::IUnknown
-    ) -> ::HRESULT,
-    fn SetName(&mut self, Name: ::LPCWSTR) -> ::HRESULT
-}}
-RIDL!{interface ID3D12DeviceChild(ID3D12DeviceChildVtbl): ID3D12Object(ID3D12ObjectVtbl) {
-    fn GetDevice(
-        &mut self, riid: ::REFGUID, ppvDevice: *mut *mut ::c_void
-    ) -> ::HRESULT
-}}
-RIDL!{interface ID3D12RootSignature(ID3D12RootSignatureVtbl):
-    ID3D12DeviceChild(ID3D12DeviceChildVtbl) {
-}}
-STRUCT!{struct D3D12_SHADER_BYTECODE {
-    pShaderBytecode: *const ::c_void,
-    BytecodeLength: ::SIZE_T,
-}}
-STRUCT!{struct D3D12_STREAM_OUTPUT_DESC {
-    pSODeclaration: *const D3D12_SO_DECLARATION_ENTRY,
-    NumEntries: ::UINT,
-    pBufferStrides: *const ::UINT,
-    NumStrides: ::UINT,
-    RasterizedStream: ::UINT,
-}}
-STRUCT!{struct D3D12_INPUT_LAYOUT_DESC {
-    pInputElementDescs: *const D3D12_INPUT_ELEMENT_DESC,
-    NumElements: ::UINT,
-}}
-ENUM!{enum D3D12_INDEX_BUFFER_STRIP_CUT_VALUE {
-    D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED = 0,
-    D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF = 1,
-    D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF = 2,
-}}
-STRUCT!{struct D3D12_CACHED_PIPELINE_STATE {
-    pCachedBlob: *const ::c_void,
-    CachedBlobSizeInBytes: ::SIZE_T,
-}}
-FLAGS!{enum D3D12_PIPELINE_STATE_FLAGS {
-    D3D12_PIPELINE_STATE_FLAG_NONE = 0x0,
-    D3D12_PIPELINE_STATE_FLAG_TOOL_DEBUG = 0x1,
-}}
-STRUCT!{struct D3D12_GRAPHICS_PIPELINE_STATE_DESC {
-    pRootSignature: *mut ID3D12RootSignature,
-    VS: D3D12_SHADER_BYTECODE,
-    PS: D3D12_SHADER_BYTECODE,
-    DS: D3D12_SHADER_BYTECODE,
-    HS: D3D12_SHADER_BYTECODE,
-    GS: D3D12_SHADER_BYTECODE,
-    StreamOutput: D3D12_STREAM_OUTPUT_DESC,
-    BlendState: D3D12_BLEND_DESC,
-    SampleMask: ::UINT,
-    RasterizerState: D3D12_RASTERIZER_DESC,
-    DepthStencilState: D3D12_DEPTH_STENCIL_DESC,
-    InputLayout: D3D12_INPUT_LAYOUT_DESC,
-    IBStripCutValue: D3D12_INDEX_BUFFER_STRIP_CUT_VALUE,
-    PrimitiveTopologyType: D3D12_PRIMITIVE_TOPOLOGY_TYPE,
-    NumRenderTargets: ::UINT,
-    RTVFormats: [::DXGI_FORMAT; 8],
-    DSVFormat: ::DXGI_FORMAT,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    NodeMask: ::UINT,
-    CachedPSO: D3D12_CACHED_PIPELINE_STATE,
-    Flags: D3D12_PIPELINE_STATE_FLAGS,
-}}
-STRUCT!{struct D3D12_COMPUTE_PIPELINE_STATE_DESC {
-    pRootSignature: *mut ID3D12RootSignature,
-    CS: D3D12_SHADER_BYTECODE,
-    NodeMask: ::UINT,
-    CachedPSO: D3D12_CACHED_PIPELINE_STATE,
-    Flags: D3D12_PIPELINE_STATE_FLAGS,
-}}
-ENUM!{enum D3D12_FEATURE {
-    D3D12_FEATURE_D3D12_OPTIONS = 0,
-    D3D12_FEATURE_ARCHITECTURE = 1,
-    D3D12_FEATURE_FEATURE_LEVELS = 2,
-    D3D12_FEATURE_FORMAT_SUPPORT = 3,
-    D3D12_FEATURE_MULTISAMPLE_QUALITY_LEVELS = 4,
-    D3D12_FEATURE_FORMAT_INFO = 5,
-    D3D12_FEATURE_GPU_VIRTUAL_ADDRESS_SUPPORT = 6,
-}}
-FLAGS!{enum D3D12_SHADER_MIN_PRECISION_SUPPORT {
-    D3D12_SHADER_MIN_PRECISION_SUPPORT_NONE = 0,
-    D3D12_SHADER_MIN_PRECISION_SUPPORT_10_BIT = 0x1,
-    D3D12_SHADER_MIN_PRECISION_SUPPORT_16_BIT = 0x2,
-}}
-ENUM!{enum D3D12_TILED_RESOURCES_TIER {
-    D3D12_TILED_RESOURCES_TIER_NOT_SUPPORTED = 0,
-    D3D12_TILED_RESOURCES_TIER_1 = 1,
-    D3D12_TILED_RESOURCES_TIER_2 = 2,
-    D3D12_TILED_RESOURCES_TIER_3 = 3,
-}}
-ENUM!{enum D3D12_RESOURCE_BINDING_TIER {
-    D3D12_RESOURCE_BINDING_TIER_1 = 1,
-    D3D12_RESOURCE_BINDING_TIER_2 = 2,
-    D3D12_RESOURCE_BINDING_TIER_3 = 3,
-}}
-ENUM!{enum D3D12_CONSERVATIVE_RASTERIZATION_TIER {
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_NOT_SUPPORTED = 0,
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_1 = 1,
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_2 = 2,
-    D3D12_CONSERVATIVE_RASTERIZATION_TIER_3 = 3,
-}}
-FLAGS!{enum D3D12_FORMAT_SUPPORT1 {
-    D3D12_FORMAT_SUPPORT1_NONE = 0x0,
-    D3D12_FORMAT_SUPPORT1_BUFFER = 0x1,
-    D3D12_FORMAT_SUPPORT1_IA_VERTEX_BUFFER = 0x2,
-    D3D12_FORMAT_SUPPORT1_IA_INDEX_BUFFER = 0x4,
-    D3D12_FORMAT_SUPPORT1_SO_BUFFER = 0x8,
-    D3D12_FORMAT_SUPPORT1_TEXTURE1D = 0x10,
-    D3D12_FORMAT_SUPPORT1_TEXTURE2D = 0x20,
-    D3D12_FORMAT_SUPPORT1_TEXTURE3D = 0x40,
-    D3D12_FORMAT_SUPPORT1_TEXTURECUBE = 0x80,
-    D3D12_FORMAT_SUPPORT1_SHADER_LOAD = 0x100,
-    D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE = 0x200,
-    D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE_COMPARISON = 0x400,
-    D3D12_FORMAT_SUPPORT1_SHADER_SAMPLE_MONO_TEXT = 0x800,
-    D3D12_FORMAT_SUPPORT1_MIP = 0x1000,
-    D3D12_FORMAT_SUPPORT1_RENDER_TARGET = 0x4000,
-    D3D12_FORMAT_SUPPORT1_BLENDABLE = 0x8000,
-    D3D12_FORMAT_SUPPORT1_DEPTH_STENCIL = 0x10000,
-    D3D12_FORMAT_SUPPORT1_MULTISAMPLE_RESOLVE = 0x40000,
-    D3D12_FORMAT_SUPPORT1_DISPLAY = 0x80000,
-    D3D12_FORMAT_SUPPORT1_CAST_WITHIN_BIT_LAYOUT = 0x100000,
-    D3D12_FORMAT_SUPPORT1_MULTISAMPLE_RENDERTARGET = 0x200000,
-    D3D12_FORMAT_SUPPORT1_MULTISAMPLE_LOAD = 0x400000,
-    D3D12_FORMAT_SUPPORT1_SHADER_GATHER = 0x800000,
-    D3D12_FORMAT_SUPPORT1_BACK_BUFFER_CAST = 0x1000000,
-    D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW = 0x2000000,
-    D3D12_FORMAT_SUPPORT1_SHADER_GATHER_COMPARISON = 0x4000000,
-    D3D12_FORMAT_SUPPORT1_DECODER_OUTPUT = 0x8000000,
-    D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_OUTPUT = 0x10000000,
-    D3D12_FORMAT_SUPPORT1_VIDEO_PROCESSOR_INPUT = 0x20000000,
-    D3D12_FORMAT_SUPPORT1_VIDEO_ENCODER = 0x40000000,
-}}
-FLAGS!{enum D3D12_FORMAT_SUPPORT2 {
-    D3D12_FORMAT_SUPPORT2_NONE = 0x0,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_ADD = 0x1,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS = 0x2,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE = 0x4,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE = 0x8,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX = 0x10,
-    D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX = 0x20,
-    D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD = 0x40,
-    D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE = 0x80,
-    D3D12_FORMAT_SUPPORT2_OUTPUT_MERGER_LOGIC_OP = 0x100,
-    D3D12_FORMAT_SUPPORT2_TILED = 0x200,
-    D3D12_FORMAT_SUPPORT2_MULTIPLANE_OVERLAY = 0x4000,
-}}
-FLAGS!{enum D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS {
-    D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_NONE = 0x0,
-    D3D12_MULTISAMPLE_QUALITY_LEVELS_FLAG_TILED_RESOURCE = 0x1,
-}}
-ENUM!{enum D3D12_CROSS_NODE_SHARING_TIER {
-    D3D12_CROSS_NODE_SHARING_TIER_NOT_SUPPORTED = 0,
-    D3D12_CROSS_NODE_SHARING_TIER_1_EMULATED = 1,
-    D3D12_CROSS_NODE_SHARING_TIER_1 = 2,
-    D3D12_CROSS_NODE_SHARING_TIER_2 = 3,
-}}
-ENUM!{enum D3D12_RESOURCE_HEAP_TIER {
-    D3D12_RESOURCE_HEAP_TIER_1 = 1,
-    D3D12_RESOURCE_HEAP_TIER_2 = 2,
-}}
-STRUCT!{struct D3D12_FEATURE_DATA_D3D12_OPTIONS {
-    DoublePrecisionFloatShaderOps: ::BOOL,
-    OutputMergerLogicOp: ::BOOL,
-    MinPrecisionSupport: D3D12_SHADER_MIN_PRECISION_SUPPORT,
-    TiledResourcesTier: D3D12_TILED_RESOURCES_TIER,
-    ResourceBindingTier: D3D12_RESOURCE_BINDING_TIER,
-    PSSpecifiedStencilRefSupported: ::BOOL,
-    TypedUAVLoadAdditionalFormats: ::BOOL,
-    ROVsSupported: ::BOOL,
-    ConservativeRasterizationTier: D3D12_CONSERVATIVE_RASTERIZATION_TIER,
-    MaxGPUVirtualAddressBitsPerResource: ::UINT,
-    StandardSwizzle64KBSupported: ::BOOL,
-    CrossNodeSharingTier: D3D12_CROSS_NODE_SHARING_TIER,
-    CrossAdapterRowMajorTextureSupported: ::BOOL,
-    VPAndRTArrayIndexFromAnyShaderFeedingRasterizerSupportedWithoutGSEmulation: ::BOOL,
-    ResourceHeapTier: D3D12_RESOURCE_HEAP_TIER,
-}}
-
-
-
-
-
-
-
-
-
-FLAGS!{ enum D3D12_BUFFER_SRV_FLAGS {
-    D3D12_BUFFER_SRV_FLAG_NONE = 0x0,
-    D3D12_BUFFER_SRV_FLAG_RAW = 0x1,
-}}
-
-FLAGS!{ enum D3D12_BUFFER_UAV_FLAGS {
-    D3D12_BUFFER_UAV_FLAG_NONE = 0x0,
-    D3D12_BUFFER_UAV_FLAG_RAW = 0x1,
-}}
-
-FLAGS!{ enum D3D12_CLEAR_FLAGS {
-    D3D12_CLEAR_FLAG_DEPTH = 0x1,
-    D3D12_CLEAR_FLAG_STENCIL = 0x2,
-}}
-
-
-ENUM!{ enum D3D12_CPU_PAGE_PROPERTY {
-    D3D12_CPU_PAGE_PROPERTY_UNKNOWN = 0,
-    D3D12_CPU_PAGE_PROPERTY_NOT_AVAILABLE = 1,
-    D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE = 2,
-    D3D12_CPU_PAGE_PROPERTY_WRITE_BACK = 3,
-}}
-
-
-FLAGS!{ enum D3D12_DESCRIPTOR_HEAP_FLAGS {
-    D3D12_DESCRIPTOR_HEAP_FLAG_NONE = 0x0,
-    D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE = 0x1,
-}}
-
-ENUM!{ enum D3D12_DESCRIPTOR_HEAP_TYPE {
-    D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV = 0,
-    D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER = 1,
-    D3D12_DESCRIPTOR_HEAP_TYPE_RTV = 2,
-    D3D12_DESCRIPTOR_HEAP_TYPE_DSV = 3,
-    D3D12_DESCRIPTOR_HEAP_TYPE_NUM_TYPES = 4,
-}}
-
-ENUM!{ enum D3D12_DESCRIPTOR_RANGE_TYPE {
-    D3D12_DESCRIPTOR_RANGE_TYPE_SRV = 0,
-    D3D12_DESCRIPTOR_RANGE_TYPE_UAV = 1,
-    D3D12_DESCRIPTOR_RANGE_TYPE_CBV = 2,
-    D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER = 3,
-}}
-
-ENUM!{ enum D3D12_DSV_DIMENSION {
-    D3D12_DSV_DIMENSION_UNKNOWN = 0,
-    D3D12_DSV_DIMENSION_TEXTURE1D = 1,
-    D3D12_DSV_DIMENSION_TEXTURE1DARRAY = 2,
-    D3D12_DSV_DIMENSION_TEXTURE2D = 3,
-    D3D12_DSV_DIMENSION_TEXTURE2DARRAY = 4,
-    D3D12_DSV_DIMENSION_TEXTURE2DMS = 5,
-    D3D12_DSV_DIMENSION_TEXTURE2DMSARRAY = 6,
-}}
-
-FLAGS!{ enum D3D12_DSV_FLAGS {
-    D3D12_DSV_FLAG_NONE = 0x0,
-    D3D12_DSV_FLAG_READ_ONLY_DEPTH = 0x1,
-    D3D12_DSV_FLAG_READ_ONLY_STENCIL = 0x2,
-}}
-
-
-
-FLAGS!{ enum D3D12_FENCE_FLAGS {
-    D3D12_FENCE_FLAG_NONE = 0x0,
-    D3D12_FENCE_FLAG_SHARED = 0x1,
-    D3D12_FENCE_FLAG_SHARED_CROSS_ADAPTER = 0x2,
-}}
-
-
-
-ENUM!{ enum D3D12_FILTER {
-    D3D12_FILTER_MIN_MAG_MIP_POINT = 0,
-    D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR = 1,
-    D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT = 4,
-    D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR = 5,
-    D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT = 16,
-    D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 17,
-    D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT = 20,
-    D3D12_FILTER_MIN_MAG_MIP_LINEAR = 21,
-    D3D12_FILTER_ANISOTROPIC = 85,
-    D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT = 128,
-    D3D12_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR = 129,
-    D3D12_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT = 132,
-    D3D12_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR = 133,
-    D3D12_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT = 144,
-    D3D12_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 145,
-    D3D12_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT = 148,
-    D3D12_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR = 149,
-    D3D12_FILTER_COMPARISON_ANISOTROPIC = 213,
-    D3D12_FILTER_MINIMUM_MIN_MAG_MIP_POINT = 256,
-    D3D12_FILTER_MINIMUM_MIN_MAG_POINT_MIP_LINEAR = 257,
-    D3D12_FILTER_MINIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 260,
-    D3D12_FILTER_MINIMUM_MIN_POINT_MAG_MIP_LINEAR = 261,
-    D3D12_FILTER_MINIMUM_MIN_LINEAR_MAG_MIP_POINT = 272,
-    D3D12_FILTER_MINIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 273,
-    D3D12_FILTER_MINIMUM_MIN_MAG_LINEAR_MIP_POINT = 276,
-    D3D12_FILTER_MINIMUM_MIN_MAG_MIP_LINEAR = 277,
-    D3D12_FILTER_MINIMUM_ANISOTROPIC = 341,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_MIP_POINT = 384,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_POINT_MIP_LINEAR = 385,
-    D3D12_FILTER_MAXIMUM_MIN_POINT_MAG_LINEAR_MIP_POINT = 388,
-    D3D12_FILTER_MAXIMUM_MIN_POINT_MAG_MIP_LINEAR = 389,
-    D3D12_FILTER_MAXIMUM_MIN_LINEAR_MAG_MIP_POINT = 400,
-    D3D12_FILTER_MAXIMUM_MIN_LINEAR_MAG_POINT_MIP_LINEAR = 401,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_LINEAR_MIP_POINT = 404,
-    D3D12_FILTER_MAXIMUM_MIN_MAG_MIP_LINEAR = 405,
-    D3D12_FILTER_MAXIMUM_ANISOTROPIC = 469,
-}}
-
-ENUM!{ enum D3D12_FILTER_REDUCTION_TYPE {
-    D3D12_FILTER_REDUCTION_TYPE_STANDARD = 0,
-    D3D12_FILTER_REDUCTION_TYPE_COMPARISON = 1,
-    D3D12_FILTER_REDUCTION_TYPE_MINIMUM = 2,
-    D3D12_FILTER_REDUCTION_TYPE_MAXIMUM = 3,
-}}
-
-ENUM!{ enum D3D12_FILTER_TYPE {
-    D3D12_FILTER_TYPE_POINT = 0,
-    D3D12_FILTER_TYPE_LINEAR = 1,
-}}
-
-
-
-FLAGS!{ enum D3D12_HEAP_FLAGS {
-    D3D12_HEAP_FLAG_NONE = 0x0,
-    D3D12_HEAP_FLAG_SHARED = 0x1,
-    D3D12_HEAP_FLAG_DENY_BUFFERS = 0x4,
-    D3D12_HEAP_FLAG_ALLOW_DISPLAY = 0x8,
-    D3D12_HEAP_FLAG_SHARED_CROSS_ADAPTER = 0x20,
-    D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES = 0x40,
-    D3D12_HEAP_FLAG_DENY_NON_RT_DS_TEXTURES = 0x80,
-    D3D12_HEAP_FLAG_ALLOW_ALL_BUFFERS_AND_TEXTURES = 0x0,
-    D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS = 0xC0,
-    D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES = 0x44,
-    D3D12_HEAP_FLAG_ALLOW_ONLY_RT_DS_TEXTURES = 0x84,
-}}
-
-ENUM!{ enum D3D12_HEAP_TYPE {
-    D3D12_HEAP_TYPE_DEFAULT = 1,
-    D3D12_HEAP_TYPE_UPLOAD = 2,
-    D3D12_HEAP_TYPE_READBACK = 3,
-    D3D12_HEAP_TYPE_CUSTOM = 4,
-}}
-
-
-
-ENUM!{ enum D3D12_INDIRECT_ARGUMENT_TYPE {
-    D3D12_INDIRECT_ARGUMENT_TYPE_DRAW = 0,
-    D3D12_INDIRECT_ARGUMENT_TYPE_DRAW_INDEXED = 1,
-    D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH = 2,
-    D3D12_INDIRECT_ARGUMENT_TYPE_VERTEX_BUFFER_VIEW = 3,
-    D3D12_INDIRECT_ARGUMENT_TYPE_INDEX_BUFFER_VIEW = 4,
-    D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT = 5,
-    D3D12_INDIRECT_ARGUMENT_TYPE_CONSTANT_BUFFER_VIEW = 6,
-    D3D12_INDIRECT_ARGUMENT_TYPE_SHADER_RESOURCE_VIEW = 7,
-    D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW = 8,
-}}
-
-
-
-
-
-ENUM!{ enum D3D12_MEMORY_POOL {
-    D3D12_MEMORY_POOL_UNKNOWN = 0,
-    D3D12_MEMORY_POOL_L0 = 1,
-    D3D12_MEMORY_POOL_L1 = 2,
-}}
-
-
-
-
-ENUM!{ enum D3D12_PREDICATION_OP {
-    D3D12_PREDICATION_OP_EQUAL_ZERO = 0,
-    D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1,
-}}
-
-
-
-ENUM!{ enum D3D12_QUERY_HEAP_TYPE {
-    D3D12_QUERY_HEAP_TYPE_OCCLUSION = 0,
-    D3D12_QUERY_HEAP_TYPE_TIMESTAMP = 1,
-    D3D12_QUERY_HEAP_TYPE_PIPELINE_STATISTICS = 2,
-    D3D12_QUERY_HEAP_TYPE_SO_STATISTICS = 3,
-}}
-
-ENUM!{ enum D3D12_QUERY_TYPE {
-    D3D12_QUERY_TYPE_OCCLUSION = 0,
-    D3D12_QUERY_TYPE_BINARY_OCCLUSION = 1,
-    D3D12_QUERY_TYPE_TIMESTAMP = 2,
-    D3D12_QUERY_TYPE_PIPELINE_STATISTICS = 3,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0 = 4,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM1 = 5,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM2 = 6,
-    D3D12_QUERY_TYPE_SO_STATISTICS_STREAM3 = 7,
-}}
-
-FLAGS!{ enum D3D12_RESOURCE_BARRIER_FLAGS {
-    D3D12_RESOURCE_BARRIER_FLAG_NONE = 0x0,
-    D3D12_RESOURCE_BARRIER_FLAG_BEGIN_ONLY = 0x1,
-    D3D12_RESOURCE_BARRIER_FLAG_END_ONLY = 0x2,
-}}
-
-ENUM!{ enum D3D12_RESOURCE_BARRIER_TYPE {
-    D3D12_RESOURCE_BARRIER_TYPE_TRANSITION = 0,
-    D3D12_RESOURCE_BARRIER_TYPE_ALIASING = 1,
-    D3D12_RESOURCE_BARRIER_TYPE_UAV = 2,
-}}
-
-
-ENUM!{ enum D3D12_RESOURCE_DIMENSION {
-    D3D12_RESOURCE_DIMENSION_UNKNOWN = 0,
-    D3D12_RESOURCE_DIMENSION_BUFFER = 1,
-    D3D12_RESOURCE_DIMENSION_TEXTURE1D = 2,
-    D3D12_RESOURCE_DIMENSION_TEXTURE2D = 3,
-    D3D12_RESOURCE_DIMENSION_TEXTURE3D = 4,
-}}
-
-FLAGS!{ enum D3D12_RESOURCE_FLAGS {
-    D3D12_RESOURCE_FLAG_NONE = 0x0,
-    D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET = 0x1,
-    D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL = 0x2,
-    D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS = 0x4,
-    D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE = 0x8,
-    D3D12_RESOURCE_FLAG_ALLOW_CROSS_ADAPTER = 0x10,
-    D3D12_RESOURCE_FLAG_ALLOW_SIMULTANEOUS_ACCESS = 0x20,
-}}
-
-
-FLAGS!{ enum D3D12_RESOURCE_STATES {
-    D3D12_RESOURCE_STATE_COMMON = 0x0,
-    D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER = 0x1,
-    D3D12_RESOURCE_STATE_INDEX_BUFFER = 0x2,
-    D3D12_RESOURCE_STATE_RENDER_TARGET = 0x4,
-    D3D12_RESOURCE_STATE_UNORDERED_ACCESS = 0x8,
-    D3D12_RESOURCE_STATE_DEPTH_WRITE = 0x10,
-    D3D12_RESOURCE_STATE_DEPTH_READ = 0x20,
-    D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE = 0x40,
-    D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE = 0x80,
-    D3D12_RESOURCE_STATE_STREAM_OUT = 0x100,
-    D3D12_RESOURCE_STATE_INDIRECT_ARGUMENT = 0x200,
-    D3D12_RESOURCE_STATE_COPY_DEST = 0x400,
-    D3D12_RESOURCE_STATE_COPY_SOURCE = 0x800,
-    D3D12_RESOURCE_STATE_RESOLVE_DEST = 0x1000,
-    D3D12_RESOURCE_STATE_RESOLVE_SOURCE = 0x2000,
-    D3D12_RESOURCE_STATE_GENERIC_READ = 0xAC3,
-    D3D12_RESOURCE_STATE_PRESENT = 0x0,
-    D3D12_RESOURCE_STATE_PREDICATION = 0x200,
-}}
-
-ENUM!{ enum D3D12_ROOT_PARAMETER_TYPE {
-    D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE = 0,
-    D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS = 1,
-    D3D12_ROOT_PARAMETER_TYPE_CBV = 2,
-    D3D12_ROOT_PARAMETER_TYPE_SRV = 3,
-    D3D12_ROOT_PARAMETER_TYPE_UAV = 4,
-}}
-
-FLAGS!{ enum D3D12_ROOT_SIGNATURE_FLAGS {
-    D3D12_ROOT_SIGNATURE_FLAG_NONE = 0x0,
-    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT = 0x1,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_VERTEX_SHADER_ROOT_ACCESS = 0x2,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_HULL_SHADER_ROOT_ACCESS = 0x4,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_DOMAIN_SHADER_ROOT_ACCESS = 0x8,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_GEOMETRY_SHADER_ROOT_ACCESS = 0x10,
-    D3D12_ROOT_SIGNATURE_FLAG_DENY_PIXEL_SHADER_ROOT_ACCESS = 0x20,
-    D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT = 0x40,
-}}
-
-ENUM!{ enum D3D12_RTV_DIMENSION {
-    D3D12_RTV_DIMENSION_UNKNOWN = 0,
-    D3D12_RTV_DIMENSION_BUFFER = 1,
-    D3D12_RTV_DIMENSION_TEXTURE1D = 2,
-    D3D12_RTV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D12_RTV_DIMENSION_TEXTURE2D = 4,
-    D3D12_RTV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D12_RTV_DIMENSION_TEXTURE2DMS = 6,
-    D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D12_RTV_DIMENSION_TEXTURE3D = 8,
-}}
-
-ENUM!{ enum D3D12_SHADER_COMPONENT_MAPPING {
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_0 = 0,
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_1 = 1,
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_2 = 2,
-    D3D12_SHADER_COMPONENT_MAPPING_FROM_MEMORY_COMPONENT_3 = 3,
-    D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_0 = 4,
-    D3D12_SHADER_COMPONENT_MAPPING_FORCE_VALUE_1 = 5,
-}}
-
-
-ENUM!{ enum D3D12_SHADER_VISIBILITY {
-    D3D12_SHADER_VISIBILITY_ALL = 0,
-    D3D12_SHADER_VISIBILITY_VERTEX = 1,
-    D3D12_SHADER_VISIBILITY_HULL = 2,
-    D3D12_SHADER_VISIBILITY_DOMAIN = 3,
-    D3D12_SHADER_VISIBILITY_GEOMETRY = 4,
-    D3D12_SHADER_VISIBILITY_PIXEL = 5,
-}}
-
-ENUM!{ enum D3D12_SRV_DIMENSION {
-    D3D12_SRV_DIMENSION_UNKNOWN = 0,
-    D3D12_SRV_DIMENSION_BUFFER = 1,
-    D3D12_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D12_SRV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D12_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D12_SRV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D12_SRV_DIMENSION_TEXTURE2DMS = 6,
-    D3D12_SRV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D12_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D12_SRV_DIMENSION_TEXTURECUBE = 9,
-    D3D12_SRV_DIMENSION_TEXTURECUBEARRAY = 10,
-}}
-
-ENUM!{ enum D3D12_STATIC_BORDER_COLOR {
-    D3D12_STATIC_BORDER_COLOR_TRANSPARENT_BLACK = 0,
-    D3D12_STATIC_BORDER_COLOR_OPAQUE_BLACK = 1,
-    D3D12_STATIC_BORDER_COLOR_OPAQUE_WHITE = 2,
-}}
-
-
-
-ENUM!{ enum D3D12_TEXTURE_ADDRESS_MODE {
-    D3D12_TEXTURE_ADDRESS_MODE_WRAP = 1,
-    D3D12_TEXTURE_ADDRESS_MODE_MIRROR = 2,
-    D3D12_TEXTURE_ADDRESS_MODE_CLAMP = 3,
-    D3D12_TEXTURE_ADDRESS_MODE_BORDER = 4,
-    D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE = 5,
-}}
-
-ENUM!{ enum D3D12_TEXTURE_COPY_TYPE {
-    D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX = 0,
-    D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT = 1,
-}}
-
-ENUM!{ enum D3D12_TEXTURE_LAYOUT {
-    D3D12_TEXTURE_LAYOUT_UNKNOWN = 0,
-    D3D12_TEXTURE_LAYOUT_ROW_MAJOR = 1,
-    D3D12_TEXTURE_LAYOUT_64KB_UNDEFINED_SWIZZLE = 2,
-    D3D12_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE = 3,
-}}
-
-
-FLAGS!{ enum D3D12_TILE_COPY_FLAGS {
-    D3D12_TILE_COPY_FLAG_NONE = 0x0,
-    D3D12_TILE_COPY_FLAG_NO_HAZARD = 0x1,
-    D3D12_TILE_COPY_FLAG_LINEAR_BUFFER_TO_SWIZZLED_TILED_RESOURCE = 0x2,
-    D3D12_TILE_COPY_FLAG_SWIZZLED_TILED_RESOURCE_TO_LINEAR_BUFFER = 0x4,
-}}
-
-FLAGS!{ enum D3D12_TILE_MAPPING_FLAGS {
-    D3D12_TILE_MAPPING_FLAG_NONE = 0x0,
-    D3D12_TILE_MAPPING_FLAG_NO_HAZARD = 0x1,
-}}
-
-FLAGS!{ enum D3D12_TILE_RANGE_FLAGS {
-    D3D12_TILE_RANGE_FLAG_NONE = 0x0,
-    D3D12_TILE_RANGE_FLAG_NULL = 0x1,
-    D3D12_TILE_RANGE_FLAG_SKIP = 0x2,
-    D3D12_TILE_RANGE_FLAG_REUSE_SINGLE_TILE = 0x4,
-}}
-
-ENUM!{ enum D3D12_UAV_DIMENSION {
-    D3D12_UAV_DIMENSION_UNKNOWN = 0,
-    D3D12_UAV_DIMENSION_BUFFER = 1,
-    D3D12_UAV_DIMENSION_TEXTURE1D = 2,
-    D3D12_UAV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D12_UAV_DIMENSION_TEXTURE2D = 4,
-    D3D12_UAV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D12_UAV_DIMENSION_TEXTURE3D = 8,
-}}
-
-ENUM!{ enum D3D_ROOT_SIGNATURE_VERSION {
-    D3D_ROOT_SIGNATURE_VERSION_1 = 1,
-}}
-
-
-
-
-
-STRUCT!{struct D3D12_BUFFER_RTV {
-    FirstElement: ::UINT64,
-    NumElements: ::UINT,
-}}
-
-STRUCT!{struct D3D12_BUFFER_SRV {
-    FirstElement: ::UINT64,
-    NumElements: ::UINT,
-    StructureByteStride: ::UINT,
-    Flags: ::D3D12_BUFFER_SRV_FLAGS,
-}}
-
-STRUCT!{struct D3D12_BUFFER_UAV {
-    FirstElement: ::UINT64,
-    NumElements: ::UINT,
-    StructureByteStride: ::UINT,
-    CounterOffsetInBytes: ::UINT64,
-    Flags: ::D3D12_BUFFER_UAV_FLAGS,
-}}
-
-
-
-STRUCT!{struct D3D12_CLEAR_VALUE {
-    Format: ::DXGI_FORMAT,
-    u: [::FLOAT; 4],
-}}
-
-UNION!(D3D12_CLEAR_VALUE, u, DepthStencil, DepthStencil_mut, ::D3D12_DEPTH_STENCIL_VALUE);
-UNION!(D3D12_CLEAR_VALUE, u, Color, Color_mut, [::FLOAT; 4]);
-
-
-
-STRUCT!{struct D3D12_COMMAND_SIGNATURE_DESC {
-    ByteStride: ::UINT,
-    NumArgumentDescs: ::UINT,
-    pArgumentDescs: *const ::D3D12_INDIRECT_ARGUMENT_DESC,
-    NodeMask: ::UINT,
-}}
-
-
-
-STRUCT!{struct D3D12_CONSTANT_BUFFER_VIEW_DESC {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT,
-}}
-
-STRUCT!{struct D3D12_CPU_DESCRIPTOR_HANDLE {
-    ptr: ::SIZE_T,
-}}
-
-
-
-STRUCT!{struct D3D12_DEPTH_STENCIL_VALUE {
-    Depth: ::FLOAT,
-    Stencil: ::UINT8,
-}}
-
-STRUCT!{struct D3D12_DEPTH_STENCIL_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_DSV_DIMENSION,
-    Flags: ::D3D12_DSV_FLAGS,
-    u: ::D3D12_TEX1D_ARRAY_DSV,
-}}
-
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    ::D3D12_TEX2DMS_ARRAY_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, ::D3D12_TEX2DMS_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_DSV);
-UNION!(D3D12_DEPTH_STENCIL_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_DSV);
-
-STRUCT!{struct D3D12_DESCRIPTOR_HEAP_DESC {
-    Type: ::D3D12_DESCRIPTOR_HEAP_TYPE,
-    NumDescriptors: ::UINT,
-    Flags: ::D3D12_DESCRIPTOR_HEAP_FLAGS,
-    NodeMask: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DESCRIPTOR_RANGE {
-    RangeType: ::D3D12_DESCRIPTOR_RANGE_TYPE,
-    NumDescriptors: ::UINT,
-    BaseShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-    OffsetInDescriptorsFromTableStart: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DISCARD_REGION {
-    NumRects: ::UINT,
-    pRects: *const ::D3D12_RECT,
-    FirstSubresource: ::UINT,
-    NumSubresources: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DISPATCH_ARGUMENTS {
-    ThreadGroupCountX: ::UINT,
-    ThreadGroupCountY: ::UINT,
-    ThreadGroupCountZ: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DRAW_ARGUMENTS {
-    VertexCountPerInstance: ::UINT,
-    InstanceCount: ::UINT,
-    StartVertexLocation: ::UINT,
-    StartInstanceLocation: ::UINT,
-}}
-
-STRUCT!{struct D3D12_DRAW_INDEXED_ARGUMENTS {
-    IndexCountPerInstance: ::UINT,
-    InstanceCount: ::UINT,
-    StartIndexLocation: ::UINT,
-    BaseVertexLocation: ::INT,
-    StartInstanceLocation: ::UINT,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_ARCHITECTURE {
-    NodeIndex: ::UINT,
-    TileBasedRenderer: ::BOOL,
-    UMA: ::BOOL,
-    CacheCoherentUMA: ::BOOL,
-}}
-
-
-STRUCT!{struct D3D12_FEATURE_DATA_FEATURE_LEVELS {
-    NumFeatureLevels: ::UINT,
-    pFeatureLevelsRequested: *const ::D3D_FEATURE_LEVEL,
-    MaxSupportedFeatureLevel: ::D3D_FEATURE_LEVEL,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_FORMAT_INFO {
-    Format: ::DXGI_FORMAT,
-    PlaneCount: ::UINT8,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_FORMAT_SUPPORT {
-    Format: ::DXGI_FORMAT,
-    Support1: ::D3D12_FORMAT_SUPPORT1,
-    Support2: ::D3D12_FORMAT_SUPPORT2,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT {
-    MaxGPUVirtualAddressBitsPerResource: ::UINT,
-    MaxGPUVirtualAddressBitsPerProcess: ::UINT,
-}}
-
-STRUCT!{struct D3D12_FEATURE_DATA_MULTISAMPLE_QUALITY_LEVELS {
-    Format: ::DXGI_FORMAT,
-    SampleCount: ::UINT,
-    Flags: ::D3D12_MULTISAMPLE_QUALITY_LEVEL_FLAGS,
-    NumQualityLevels: ::UINT,
-}}
-
-STRUCT!{struct D3D12_GPU_DESCRIPTOR_HANDLE {
-    ptr: ::UINT64,
-}}
-
-
-
-STRUCT!{struct D3D12_HEAP_DESC {
-    SizeInBytes: ::UINT64,
-    Properties: ::D3D12_HEAP_PROPERTIES,
-    Alignment: ::UINT64,
-    Flags: ::D3D12_HEAP_FLAGS,
-}}
-
-STRUCT!{struct D3D12_HEAP_PROPERTIES {
-    Type: ::D3D12_HEAP_TYPE,
-    CPUPageProperty: ::D3D12_CPU_PAGE_PROPERTY,
-    MemoryPoolPreference: ::D3D12_MEMORY_POOL,
-    CreationNodeMask: ::UINT,
-    VisibleNodeMask: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDEX_BUFFER_VIEW {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT,
-    Format: ::DXGI_FORMAT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_VertexBuffer {
-    Slot: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_Constant {
-    RootParameterIndex: ::UINT,
-    DestOffsetIn32BitValues: ::UINT,
-    Num32BitValuesToSet: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_ConstantBufferView {
-    RootParameterIndex: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_ShaderResourceView {
-    RootParameterIndex: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC_UnorderedAccessView {
-    RootParameterIndex: ::UINT,
-}}
-
-STRUCT!{struct D3D12_INDIRECT_ARGUMENT_DESC {
-    Type: ::D3D12_INDIRECT_ARGUMENT_TYPE,
-    u: ::D3D12_INDIRECT_ARGUMENT_DESC_Constant,
-}}
-
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, UnorderedAccessView, UnorderedAccessView_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_UnorderedAccessView);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, ShaderResourceView, ShaderResourceView_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_ShaderResourceView);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, ConstantBufferView, ConstantBufferView_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_ConstantBufferView);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, Constant, Constant_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_Constant);
-UNION!(D3D12_INDIRECT_ARGUMENT_DESC, u, VertexBuffer, VertexBuffer_mut,
-    D3D12_INDIRECT_ARGUMENT_DESC_VertexBuffer);
-
-
-
-
-STRUCT!{struct D3D12_MEMCPY_DEST {
-    pData: *mut ::c_void,
-    RowPitch: ::SIZE_T,
-    SlicePitch: ::SIZE_T,
-}}
-
-STRUCT!{struct D3D12_PACKED_MIP_INFO {
-    NumStandardMips: ::UINT8,
-    NumPackedMips: ::UINT8,
-    NumTilesForPackedMips: ::UINT,
-    StartTileIndexInOverallResource: ::UINT,
-}}
-
-STRUCT!{struct D3D12_PLACED_SUBRESOURCE_FOOTPRINT {
-    Offset: ::UINT64,
-    Footprint: ::D3D12_SUBRESOURCE_FOOTPRINT,
-}}
-
-STRUCT!{struct D3D12_QUERY_DATA_PIPELINE_STATISTICS {
-    IAVertices: ::UINT64,
-    IAPrimitives: ::UINT64,
-    VSInvocations: ::UINT64,
-    GSInvocations: ::UINT64,
-    GSPrimitives: ::UINT64,
-    CInvocations: ::UINT64,
-    CPrimitives: ::UINT64,
-    PSInvocations: ::UINT64,
-    HSInvocations: ::UINT64,
-    DSInvocations: ::UINT64,
-    CSInvocations: ::UINT64,
-}}
-
-STRUCT!{struct D3D12_QUERY_DATA_SO_STATISTICS {
-    NumPrimitivesWritten: ::UINT64,
-    PrimitivesStorageNeeded: ::UINT64,
-}}
-
-STRUCT!{struct D3D12_QUERY_HEAP_DESC {
-    Type: ::D3D12_QUERY_HEAP_TYPE,
-    Count: ::UINT,
-    NodeMask: ::UINT,
-}}
-
-STRUCT!{struct D3D12_RANGE {
-    Begin: ::SIZE_T,
-    End: ::SIZE_T,
-}}
-
-
-
-STRUCT!{struct D3D12_RENDER_TARGET_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_RTV_DIMENSION,
-    u: ::D3D12_BUFFER_RTV,
-}}
-
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture3D, Texture3D_mut, ::D3D12_TEX3D_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    ::D3D12_TEX2DMS_ARRAY_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, ::D3D12_TEX2DMS_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_RTV);
-UNION!(D3D12_RENDER_TARGET_VIEW_DESC, u, Buffer, Buffer_mut, ::D3D12_BUFFER_RTV);
-
-STRUCT!{struct D3D12_RESOURCE_ALIASING_BARRIER {
-    pResourceBefore: *mut ::ID3D12Resource,
-    pResourceAfter: *mut ::ID3D12Resource,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_ALLOCATION_INFO {
-    SizeInBytes: ::UINT64,
-    Alignment: ::UINT64,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_BARRIER {
-    Type: ::D3D12_RESOURCE_BARRIER_TYPE,
-    Flags: ::D3D12_RESOURCE_BARRIER_FLAGS,
-    u: ::D3D12_RESOURCE_TRANSITION_BARRIER,
-}}
-
-UNION!(D3D12_RESOURCE_BARRIER, u, UAV, UAV_mut, ::D3D12_RESOURCE_UAV_BARRIER);
-UNION!(D3D12_RESOURCE_BARRIER, u, Aliasing, Aliasing_mut, ::D3D12_RESOURCE_ALIASING_BARRIER);
-UNION!(D3D12_RESOURCE_BARRIER, u, Transition, Transition_mut, ::D3D12_RESOURCE_TRANSITION_BARRIER);
-
-STRUCT!{struct D3D12_RESOURCE_DESC {
-    Dimension: ::D3D12_RESOURCE_DIMENSION,
-    Alignment: ::UINT64,
-    Width: ::UINT64,
-    Height: ::UINT,
-    DepthOrArraySize: ::UINT16,
-    MipLevels: ::UINT16,
-    Format: ::DXGI_FORMAT,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    Layout: ::D3D12_TEXTURE_LAYOUT,
-    Flags: ::D3D12_RESOURCE_FLAGS,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_TRANSITION_BARRIER {
-    pResource: *mut ::ID3D12Resource,
-    Subresource: ::UINT,
-    StateBefore: ::D3D12_RESOURCE_STATES,
-    StateAfter: ::D3D12_RESOURCE_STATES,
-}}
-
-STRUCT!{struct D3D12_RESOURCE_UAV_BARRIER {
-    pResource: *mut ::ID3D12Resource,
-}}
-
-STRUCT!{struct D3D12_ROOT_CONSTANTS {
-    ShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-    Num32BitValues: ::UINT,
-}}
-
-STRUCT!{struct D3D12_ROOT_DESCRIPTOR {
-    ShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-}}
-
-STRUCT!{struct D3D12_ROOT_DESCRIPTOR_TABLE {
-    NumDescriptorRanges: ::UINT,
-    pDescriptorRanges: *const ::D3D12_DESCRIPTOR_RANGE,
-}}
-
-#[cfg(target_pointer_width = "64")]
-STRUCT!{struct D3D12_ROOT_PARAMETER {
-    ParameterType: ::D3D12_ROOT_PARAMETER_TYPE,
-    u: ::D3D12_ROOT_DESCRIPTOR_TABLE,
-    ShaderVisibility: ::D3D12_SHADER_VISIBILITY,
-}}
-
-#[cfg(target_pointer_width = "32")]
-STRUCT!{struct D3D12_ROOT_PARAMETER {
-    ParameterType: ::D3D12_ROOT_PARAMETER_TYPE,
-    u: ::D3D12_ROOT_CONSTANTS,
-    ShaderVisibility: ::D3D12_SHADER_VISIBILITY,
-}}
-
-UNION!(D3D12_ROOT_PARAMETER, u, Descriptor, Descriptor_mut, ::D3D12_ROOT_DESCRIPTOR);
-UNION!(D3D12_ROOT_PARAMETER, u, Constants, Constants_mut, ::D3D12_ROOT_CONSTANTS);
-UNION!(D3D12_ROOT_PARAMETER, u, DescriptorTable, DescriptorTable_mut,
-    ::D3D12_ROOT_DESCRIPTOR_TABLE);
-
-STRUCT!{struct D3D12_ROOT_SIGNATURE_DESC {
-    NumParameters: ::UINT,
-    pParameters: *const ::D3D12_ROOT_PARAMETER,
-    NumStaticSamplers: ::UINT,
-    pStaticSamplers: *const ::D3D12_STATIC_SAMPLER_DESC,
-    Flags: ::D3D12_ROOT_SIGNATURE_FLAGS,
-}}
-
-STRUCT!{struct D3D12_SAMPLER_DESC {
-    Filter: ::D3D12_FILTER,
-    AddressU: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressV: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressW: ::D3D12_TEXTURE_ADDRESS_MODE,
-    MipLODBias: ::FLOAT,
-    MaxAnisotropy: ::UINT,
-    ComparisonFunc: ::D3D12_COMPARISON_FUNC,
-    BorderColor: [::FLOAT; 4],
-    MinLOD: ::FLOAT,
-    MaxLOD: ::FLOAT,
-}}
-
-
-
-STRUCT!{struct D3D12_SHADER_RESOURCE_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_SRV_DIMENSION,
-    Shader4ComponentMapping: ::UINT,
-    u: ::D3D12_BUFFER_SRV,
-}}
-
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, TextureCubeArray, TextureCubeArray_mut,
-    ::D3D12_TEXCUBE_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, TextureCube, TextureCube_mut, ::D3D12_TEXCUBE_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture3D, Texture3D_mut, ::D3D12_TEX3D_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMSArray, Texture2DMSArray_mut,
-    ::D3D12_TEX2DMS_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2DMS, Texture2DMS_mut, ::D3D12_TEX2DMS_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_SRV);
-UNION!(D3D12_SHADER_RESOURCE_VIEW_DESC, u, Buffer, Buffer_mut, ::D3D12_BUFFER_SRV);
-
-
-
-STRUCT!{struct D3D12_STATIC_SAMPLER_DESC {
-    Filter: ::D3D12_FILTER,
-    AddressU: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressV: ::D3D12_TEXTURE_ADDRESS_MODE,
-    AddressW: ::D3D12_TEXTURE_ADDRESS_MODE,
-    MipLODBias: ::FLOAT,
-    MaxAnisotropy: ::UINT,
-    ComparisonFunc: ::D3D12_COMPARISON_FUNC,
-    BorderColor: ::D3D12_STATIC_BORDER_COLOR,
-    MinLOD: ::FLOAT,
-    MaxLOD: ::FLOAT,
-    ShaderRegister: ::UINT,
-    RegisterSpace: ::UINT,
-    ShaderVisibility: ::D3D12_SHADER_VISIBILITY,
-}}
-
-STRUCT!{struct D3D12_STREAM_OUTPUT_BUFFER_VIEW {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT64,
-    BufferFilledSizeLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-}}
-
-
-
-STRUCT!{struct D3D12_SUBRESOURCE_DATA {
-    pData: *const ::c_void,
-    RowPitch: ::LONG_PTR,
-    SlicePitch: ::LONG_PTR,
-}}
-
-STRUCT!{struct D3D12_SUBRESOURCE_FOOTPRINT {
-    Format: ::DXGI_FORMAT,
-    Width: ::UINT,
-    Height: ::UINT,
-    Depth: ::UINT,
-    RowPitch: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SUBRESOURCE_INFO {
-    Offset: ::UINT64,
-    RowPitch: ::UINT,
-    DepthPitch: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SUBRESOURCE_TILING {
-    WidthInTiles: ::UINT,
-    HeightInTiles: ::UINT16,
-    DepthInTiles: ::UINT16,
-    StartTileIndexInOverallResource: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_DSV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_RTV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_ARRAY_UAV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_DSV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_RTV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX1D_UAV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_ARRAY_DSV {
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_ARRAY_RTV {
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_ARRAY_SRV {
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_DSV {
-    UnusedField_NothingToDefine: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_RTV {
-    UnusedField_NothingToDefine: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2DMS_SRV {
-    UnusedField_NothingToDefine: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_DSV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_RTV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    PlaneSlice: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_ARRAY_UAV {
-    MipSlice: ::UINT,
-    FirstArraySlice: ::UINT,
-    ArraySize: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_DSV {
-    MipSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_RTV {
-    MipSlice: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    PlaneSlice: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX2D_UAV {
-    MipSlice: ::UINT,
-    PlaneSlice: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX3D_RTV {
-    MipSlice: ::UINT,
-    FirstWSlice: ::UINT,
-    WSize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEX3D_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEX3D_UAV {
-    MipSlice: ::UINT,
-    FirstWSlice: ::UINT,
-    WSize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TEXCUBE_ARRAY_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    First2DArrayFace: ::UINT,
-    NumCubes: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEXCUBE_SRV {
-    MostDetailedMip: ::UINT,
-    MipLevels: ::UINT,
-    ResourceMinLODClamp: ::FLOAT,
-}}
-
-STRUCT!{struct D3D12_TEXTURE_COPY_LOCATION {
-    pResource: *mut ::ID3D12Resource,
-    Type: ::D3D12_TEXTURE_COPY_TYPE,
-    u: ::D3D12_PLACED_SUBRESOURCE_FOOTPRINT,
-}}
-
-UNION!(D3D12_TEXTURE_COPY_LOCATION, u, SubresourceIndex, SubresourceIndex_mut, ::UINT);
-UNION!(D3D12_TEXTURE_COPY_LOCATION, u, PlacedFootprint, PlacedFootprint_mut,
-    ::D3D12_PLACED_SUBRESOURCE_FOOTPRINT);
-
-STRUCT!{struct D3D12_TILED_RESOURCE_COORDINATE {
-    X: ::UINT,
-    Y: ::UINT,
-    Z: ::UINT,
-    Subresource: ::UINT,
-}}
-
-STRUCT!{struct D3D12_TILE_REGION_SIZE {
-    NumTiles: ::UINT,
-    UseBox: ::BOOL,
-    Width: ::UINT,
-    Height: ::UINT16,
-    Depth: ::UINT16,
-}}
-
-STRUCT!{struct D3D12_TILE_SHAPE {
-    WidthInTexels: ::UINT,
-    HeightInTexels: ::UINT,
-    DepthInTexels: ::UINT,
-}}
-
-STRUCT!{struct D3D12_UNORDERED_ACCESS_VIEW_DESC {
-    Format: ::DXGI_FORMAT,
-    ViewDimension: ::D3D12_UAV_DIMENSION,
-    u: ::D3D12_BUFFER_UAV,
-}}
-
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture3D, Texture3D_mut, ::D3D12_TEX3D_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture2DArray, Texture2DArray_mut,
-    ::D3D12_TEX2D_ARRAY_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture2D, Texture2D_mut, ::D3D12_TEX2D_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture1DArray, Texture1DArray_mut,
-    ::D3D12_TEX1D_ARRAY_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Texture1D, Texture1D_mut, ::D3D12_TEX1D_UAV);
-UNION!(D3D12_UNORDERED_ACCESS_VIEW_DESC, u, Buffer, Buffer_mut, ::D3D12_BUFFER_UAV);
-
-STRUCT!{struct D3D12_VERTEX_BUFFER_VIEW {
-    BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS,
-    SizeInBytes: ::UINT,
-    StrideInBytes: ::UINT,
-}}
-
-
-
-RIDL!(
-interface ID3D12CommandAllocator(ID3D12CommandAllocatorVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn Reset(&mut self) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12CommandList(ID3D12CommandListVtbl): ID3D12DeviceChild(ID3D12DeviceChildVtbl) {
-    fn GetType(&mut self) -> ::D3D12_COMMAND_LIST_TYPE
-});
-
-RIDL!(
-interface ID3D12CommandQueue(ID3D12CommandQueueVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn UpdateTileMappings(
-        &mut self, pResource: *mut ::ID3D12Resource, NumResourceRegions: ::UINT,
-        pResourceRegionStartCoordinates: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pResourceRegionSizes: *const ::D3D12_TILE_REGION_SIZE, pHeap: *mut ::ID3D12Heap,
-        NumRanges: ::UINT, pRangeFlags: *const ::D3D12_TILE_RANGE_FLAGS,
-        pHeapRangeStartOffsets: *const ::UINT, pRangeTileCounts: *const ::UINT,
-        Flags: ::D3D12_TILE_MAPPING_FLAGS
-    ) -> (),
-    fn CopyTileMappings(
-        &mut self, pDstResource: *mut ::ID3D12Resource,
-        pDstRegionStartCoordinate: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pSrcResource: *mut ::ID3D12Resource,
-        pSrcRegionStartCoordinate: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pRegionSize: *const ::D3D12_TILE_REGION_SIZE, Flags: ::D3D12_TILE_MAPPING_FLAGS
-    ) -> (),
-    fn ExecuteCommandLists(
-        &mut self, NumCommandLists: ::UINT, ppCommandLists: *mut *mut ::ID3D12CommandList
-    ) -> (),
-    fn SetMarker(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn BeginEvent(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn EndEvent(&mut self) -> (),
-    fn Signal(
-        &mut self, pFence: *mut ::ID3D12Fence, Value: ::UINT64
-    ) -> ::HRESULT,
-    fn Wait(
-        &mut self, pFence: *mut ::ID3D12Fence, Value: ::UINT64
-    ) -> ::HRESULT,
-    fn GetTimestampFrequency(&mut self, pFrequency: *mut ::UINT64) -> ::HRESULT,
-    fn GetClockCalibration(
-        &mut self, pGpuTimestamp: *mut ::UINT64, pCpuTimestamp: *mut ::UINT64
-    ) -> ::HRESULT,
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_COMMAND_QUEUE_DESC
-    ) -> *mut ::D3D12_COMMAND_QUEUE_DESC
-});
-
-RIDL!(
-interface ID3D12CommandSignature(ID3D12CommandSignatureVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-});
-
-RIDL!(
-interface ID3D12DescriptorHeap(ID3D12DescriptorHeapVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_DESCRIPTOR_HEAP_DESC
-    ) -> *mut ::D3D12_DESCRIPTOR_HEAP_DESC,
-    fn GetCPUDescriptorHandleForHeapStart(
-        &mut self, __ret_val: *mut ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> *mut ::D3D12_CPU_DESCRIPTOR_HANDLE,
-    fn GetGPUDescriptorHandleForHeapStart(
-        &mut self, __ret_val: *mut ::D3D12_GPU_DESCRIPTOR_HANDLE
-    ) -> *mut ::D3D12_GPU_DESCRIPTOR_HANDLE
-});
-
-
-
-RIDL!(
-interface ID3D12Device(ID3D12DeviceVtbl): ID3D12Object(ID3D12ObjectVtbl) {
-    fn GetNodeCount(&mut self) -> ::UINT,
-    fn CreateCommandQueue(
-        &mut self, pDesc: *const ::D3D12_COMMAND_QUEUE_DESC, riid: ::REFGUID,
-        ppCommandQueue: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateCommandAllocator(
-        &mut self, type_: ::D3D12_COMMAND_LIST_TYPE, riid: ::REFGUID,
-        ppCommandAllocator: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateGraphicsPipelineState(
-        &mut self, pDesc: *const ::D3D12_GRAPHICS_PIPELINE_STATE_DESC, riid: ::REFGUID,
-        ppPipelineState: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateComputePipelineState(
-        &mut self, pDesc: *const ::D3D12_COMPUTE_PIPELINE_STATE_DESC, riid: ::REFGUID,
-        ppPipelineState: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateCommandList(
-        &mut self, nodeMask: ::UINT, type_: ::D3D12_COMMAND_LIST_TYPE,
-        pCommandAllocator: *mut ::ID3D12CommandAllocator,
-        pInitialState: *mut ::ID3D12PipelineState, riid: ::REFGUID,
-        ppCommandList: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CheckFeatureSupport(
-        &mut self, Feature: ::D3D12_FEATURE, pFeatureSupportData: *mut ::c_void,
-        FeatureSupportDataSize: ::UINT
-    ) -> ::HRESULT,
-    fn CreateDescriptorHeap(
-        &mut self, pDescriptorHeapDesc: *const ::D3D12_DESCRIPTOR_HEAP_DESC, riid: ::REFGUID,
-        ppvHeap: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetDescriptorHandleIncrementSize(
-        &mut self, DescriptorHeapType: ::D3D12_DESCRIPTOR_HEAP_TYPE
-    ) -> ::UINT,
-    fn CreateRootSignature(
-        &mut self, nodeMask: ::UINT, pBlobWithRootSignature: *const ::c_void,
-        blobLengthInBytes: ::SIZE_T, riid: ::REFGUID, ppvRootSignature: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateConstantBufferView(
-        &mut self, pDesc: *const ::D3D12_CONSTANT_BUFFER_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateShaderResourceView(
-        &mut self, pResource: *mut ::ID3D12Resource,
-        pDesc: *const ::D3D12_SHADER_RESOURCE_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateUnorderedAccessView(
-        &mut self, pResource: *mut ::ID3D12Resource, pCounterResource: *mut ::ID3D12Resource,
-        pDesc: *const ::D3D12_UNORDERED_ACCESS_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateRenderTargetView(
-        &mut self, pResource: *mut ::ID3D12Resource, pDesc: *const ::D3D12_RENDER_TARGET_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateDepthStencilView(
-        &mut self, pResource: *mut ::ID3D12Resource, pDesc: *const ::D3D12_DEPTH_STENCIL_VIEW_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CreateSampler(
-        &mut self, pDesc: *const ::D3D12_SAMPLER_DESC,
-        DestDescriptor: ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn CopyDescriptors(
-        &mut self, NumDestDescriptorRanges: ::UINT,
-        pDestDescriptorRangeStarts: *const ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        pDestDescriptorRangeSizes: *const ::UINT, NumSrcDescriptorRanges: ::UINT,
-        pSrcDescriptorRangeStarts: *const ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        pSrcDescriptorRangeSizes: *const ::UINT, DescriptorHeapsType: ::D3D12_DESCRIPTOR_HEAP_TYPE
-    ) -> (),
-    fn CopyDescriptorsSimple(
-        &mut self, NumDescriptors: ::UINT, DestDescriptorRangeStart: ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        SrcDescriptorRangeStart: ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        DescriptorHeapsType: ::D3D12_DESCRIPTOR_HEAP_TYPE
-    ) -> (),
-    fn GetResourceAllocationInfo(
-        &mut self, visibleMask: ::UINT, numResourceDescs: ::UINT,
-        pResourceDescs: *const ::D3D12_RESOURCE_DESC,
-        __ret_val: *mut ::D3D12_RESOURCE_ALLOCATION_INFO
-    ) -> *mut ::D3D12_RESOURCE_ALLOCATION_INFO,
-    fn GetCustomHeapProperties(
-        &mut self, nodeMask: ::UINT, heapType: ::D3D12_HEAP_TYPE,
-        __ret_val: *mut ::D3D12_HEAP_PROPERTIES
-    ) -> *mut ::D3D12_HEAP_PROPERTIES,
-    fn CreateCommittedResource(
-        &mut self, pHeapProperties: *const ::D3D12_HEAP_PROPERTIES, HeapFlags: ::D3D12_HEAP_FLAGS,
-        pResourceDesc: *const ::D3D12_RESOURCE_DESC, InitialResourceState: ::D3D12_RESOURCE_STATES,
-        pOptimizedClearValue: *const ::D3D12_CLEAR_VALUE, riidResource: ::REFGUID,
-        ppvResource: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateHeap(
-        &mut self, pDesc: *const ::D3D12_HEAP_DESC, riid: ::REFGUID, ppvHeap: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreatePlacedResource(
-        &mut self, pHeap: *mut ::ID3D12Heap, HeapOffset: ::UINT64,
-        pDesc: *const ::D3D12_RESOURCE_DESC, InitialState: ::D3D12_RESOURCE_STATES,
-        pOptimizedClearValue: *const ::D3D12_CLEAR_VALUE, riid: ::REFGUID,
-        ppvResource: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateReservedResource(
-        &mut self, pDesc: *const ::D3D12_RESOURCE_DESC, InitialState: ::D3D12_RESOURCE_STATES,
-        pOptimizedClearValue: *const ::D3D12_CLEAR_VALUE, riid: ::REFGUID,
-        ppvResource: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn CreateSharedHandle(
-        &mut self, pObject: *mut ::ID3D12DeviceChild, pAttributes: *const ::SECURITY_ATTRIBUTES,
-        Access: ::DWORD, Name: ::LPCWSTR, pHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn OpenSharedHandle(
-        &mut self, NTHandle: ::HANDLE, riid: ::REFGUID, ppvObj: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn OpenSharedHandleByName(
-        &mut self, Name: ::LPCWSTR, Access: ::DWORD, pNTHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn MakeResident(
-        &mut self, NumObjects: ::UINT, ppObjects: *mut *mut ::ID3D12Pageable
-    ) -> ::HRESULT,
-    fn Evict(
-        &mut self, NumObjects: ::UINT, ppObjects: *mut *mut ::ID3D12Pageable
-    ) -> ::HRESULT,
-    fn CreateFence(
-        &mut self, InitialValue: ::UINT64, Flags: ::D3D12_FENCE_FLAGS, riid: ::REFGUID,
-        ppFence: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetDeviceRemovedReason(&mut self) -> ::HRESULT,
-    fn GetCopyableFootprints(
-        &mut self, pResourceDesc: *const ::D3D12_RESOURCE_DESC, FirstSubresource: ::UINT,
-        NumSubresources: ::UINT, BaseOffset: ::UINT64,
-        pLayouts: *mut ::D3D12_PLACED_SUBRESOURCE_FOOTPRINT, pNumRows: *mut ::UINT,
-        pRowSizeInBytes: *mut ::UINT64, pTotalBytes: *mut ::UINT64
-    ) -> (),
-    fn CreateQueryHeap(
-        &mut self, pDesc: *const ::D3D12_QUERY_HEAP_DESC, riid: ::REFGUID,
-        ppvHeap: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn SetStablePowerState(&mut self, Enable: ::BOOL) -> ::HRESULT,
-    fn CreateCommandSignature(
-        &mut self, pDesc: *const ::D3D12_COMMAND_SIGNATURE_DESC,
-        pRootSignature: *mut ::ID3D12RootSignature, riid: ::REFGUID,
-        ppvCommandSignature: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetResourceTiling(
-        &mut self, pTiledResource: *mut ::ID3D12Resource, pNumTilesForEntireResource: *mut ::UINT,
-        pPackedMipDesc: *mut ::D3D12_PACKED_MIP_INFO,
-        pStandardTileShapeForNonPackedMips: *mut ::D3D12_TILE_SHAPE,
-        pNumSubresourceTilings: *mut ::UINT, FirstSubresourceTilingToGet: ::UINT,
-        pSubresourceTilingsForNonPackedMips: *mut ::D3D12_SUBRESOURCE_TILING
-    ) -> (),
-    fn GetAdapterLuid(&mut self, __ret_val: *mut ::LUID) -> *mut ::LUID
-});
-
-RIDL!(
-interface ID3D12Fence(ID3D12FenceVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetCompletedValue(&mut self) -> ::UINT64,
-    fn SetEventOnCompletion(
-        &mut self, Value: ::UINT64, hEvent: ::HANDLE
-    ) -> ::HRESULT,
-    fn Signal(&mut self, Value: ::UINT64) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12GraphicsCommandList(ID3D12GraphicsCommandListVtbl): ID3D12CommandList(ID3D12CommandListVtbl) {
-    fn Close(&mut self) -> ::HRESULT,
-    fn Reset(
-        &mut self, pAllocator: *mut ::ID3D12CommandAllocator,
-        pInitialState: *mut ::ID3D12PipelineState
-    ) -> ::HRESULT,
-    fn ClearState(&mut self, pPipelineState: *mut ::ID3D12PipelineState) -> (),
-    fn DrawInstanced(
-        &mut self, VertexCountPerInstance: ::UINT, InstanceCount: ::UINT,
-        StartVertexLocation: ::UINT, StartInstanceLocation: ::UINT
-    ) -> (),
-    fn DrawIndexedInstanced(
-        &mut self, IndexCountPerInstance: ::UINT, InstanceCount: ::UINT,
-        StartIndexLocation: ::UINT, BaseVertexLocation: ::INT, StartInstanceLocation: ::UINT
-    ) -> (),
-    fn Dispatch(
-        &mut self, ThreadGroupCountX: ::UINT, ThreadGroupCountY: ::UINT, ThreadGroupCountZ: ::UINT
-    ) -> (),
-    fn CopyBufferRegion(
-        &mut self, pDstBuffer: *mut ::ID3D12Resource, DstOffset: ::UINT64,
-        pSrcBuffer: *mut ::ID3D12Resource, SrcOffset: ::UINT64, NumBytes: ::UINT64
-    ) -> (),
-    fn CopyTextureRegion(
-        &mut self, pDst: *const ::D3D12_TEXTURE_COPY_LOCATION, DstX: ::UINT, DstY: ::UINT,
-        DstZ: ::UINT, pSrc: *const ::D3D12_TEXTURE_COPY_LOCATION, pSrcBox: *const ::D3D12_BOX
-    ) -> (),
-    fn CopyResource(
-        &mut self, pDstResource: *mut ::ID3D12Resource, pSrcResource: *mut ::ID3D12Resource
-    ) -> (),
-    fn CopyTiles(
-        &mut self, pTiledResource: *mut ::ID3D12Resource,
-        pTileRegionStartCoordinate: *const ::D3D12_TILED_RESOURCE_COORDINATE,
-        pTileRegionSize: *const ::D3D12_TILE_REGION_SIZE, pBuffer: *mut ::ID3D12Resource,
-        BufferStartOffsetInBytes: ::UINT64, Flags: ::D3D12_TILE_COPY_FLAGS
-    ) -> (),
-    fn ResolveSubresource(
-        &mut self, pDstResource: *mut ::ID3D12Resource, DstSubresource: ::UINT,
-        pSrcResource: *mut ::ID3D12Resource, SrcSubresource: ::UINT, Format: ::DXGI_FORMAT
-    ) -> (),
-    fn IASetPrimitiveTopology(
-        &mut self, PrimitiveTopology: ::D3D12_PRIMITIVE_TOPOLOGY
-    ) -> (),
-    fn RSSetViewports(
-        &mut self, NumViewports: ::UINT, pViewports: *const ::D3D12_VIEWPORT
-    ) -> (),
-    fn RSSetScissorRects(
-        &mut self, NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn OMSetBlendFactor(&mut self, BlendFactor: *const [::FLOAT; 4]) -> (),
-    fn OMSetStencilRef(&mut self, StencilRef: ::UINT) -> (),
-    fn SetPipelineState(
-        &mut self, pPipelineState: *mut ::ID3D12PipelineState
-    ) -> (),
-    fn ResourceBarrier(
-        &mut self, NumBarriers: ::UINT, pBarriers: *const ::D3D12_RESOURCE_BARRIER
-    ) -> (),
-    fn ExecuteBundle(
-        &mut self, pCommandList: *mut ::ID3D12GraphicsCommandList
-    ) -> (),
-    fn SetDescriptorHeaps(
-        &mut self, NumDescriptorHeaps: ::UINT, ppDescriptorHeaps: *mut *mut ::ID3D12DescriptorHeap
-    ) -> (),
-    fn SetComputeRootSignature(
-        &mut self, pRootSignature: *mut ::ID3D12RootSignature
-    ) -> (),
-    fn SetGraphicsRootSignature(
-        &mut self, pRootSignature: *mut ::ID3D12RootSignature
-    ) -> (),
-    fn SetComputeRootDescriptorTable(
-        &mut self, RootParameterIndex: ::UINT, BaseDescriptor: ::D3D12_GPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn SetGraphicsRootDescriptorTable(
-        &mut self, RootParameterIndex: ::UINT, BaseDescriptor: ::D3D12_GPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn SetComputeRoot32BitConstant(
-        &mut self, RootParameterIndex: ::UINT, SrcData: ::UINT, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetGraphicsRoot32BitConstant(
-        &mut self, RootParameterIndex: ::UINT, SrcData: ::UINT, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetComputeRoot32BitConstants(
-        &mut self, RootParameterIndex: ::UINT, Num32BitValuesToSet: ::UINT,
-        pSrcData: *const ::c_void, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetGraphicsRoot32BitConstants(
-        &mut self, RootParameterIndex: ::UINT, Num32BitValuesToSet: ::UINT,
-        pSrcData: *const ::c_void, DestOffsetIn32BitValues: ::UINT
-    ) -> (),
-    fn SetComputeRootConstantBufferView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetGraphicsRootConstantBufferView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetComputeRootShaderResourceView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetGraphicsRootShaderResourceView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetComputeRootUnorderedAccessView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn SetGraphicsRootUnorderedAccessView(
-        &mut self, RootParameterIndex: ::UINT, BufferLocation: ::D3D12_GPU_VIRTUAL_ADDRESS
-    ) -> (),
-    fn IASetIndexBuffer(
-        &mut self, pView: *const ::D3D12_INDEX_BUFFER_VIEW
-    ) -> (),
-    fn IASetVertexBuffers(
-        &mut self, StartSlot: ::UINT, NumViews: ::UINT, pViews: *const ::D3D12_VERTEX_BUFFER_VIEW
-    ) -> (),
-    fn SOSetTargets(
-        &mut self, StartSlot: ::UINT, NumViews: ::UINT,
-        pViews: *const ::D3D12_STREAM_OUTPUT_BUFFER_VIEW
-    ) -> (),
-    fn OMSetRenderTargets(
-        &mut self, NumRenderTargetDescriptors: ::UINT,
-        pRenderTargetDescriptors: *const ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        RTsSingleHandleToDescriptorRange: ::BOOL,
-        pDepthStencilDescriptor: *const ::D3D12_CPU_DESCRIPTOR_HANDLE
-    ) -> (),
-    fn ClearDepthStencilView(
-        &mut self, DepthStencilView: ::D3D12_CPU_DESCRIPTOR_HANDLE,
-        ClearFlags: ::D3D12_CLEAR_FLAGS, Depth: ::FLOAT, Stencil: ::UINT8, NumRects: ::UINT,
-        pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn ClearRenderTargetView(
-        &mut self, RenderTargetView: ::D3D12_CPU_DESCRIPTOR_HANDLE, ColorRGBA: *const [::FLOAT; 4],
-        NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn ClearUnorderedAccessViewUint(
-        &mut self, ViewGPUHandleInCurrentHeap: ::D3D12_GPU_DESCRIPTOR_HANDLE,
-        ViewCPUHandle: ::D3D12_CPU_DESCRIPTOR_HANDLE, pResource: *mut ::ID3D12Resource,
-        Values: *const [::UINT; 4], NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn ClearUnorderedAccessViewFloat(
-        &mut self, ViewGPUHandleInCurrentHeap: ::D3D12_GPU_DESCRIPTOR_HANDLE,
-        ViewCPUHandle: ::D3D12_CPU_DESCRIPTOR_HANDLE, pResource: *mut ::ID3D12Resource,
-        Values: *const [::FLOAT; 4], NumRects: ::UINT, pRects: *const ::D3D12_RECT
-    ) -> (),
-    fn DiscardResource(
-        &mut self, pResource: *mut ::ID3D12Resource, pRegion: *const ::D3D12_DISCARD_REGION
-    ) -> (),
-    fn BeginQuery(
-        &mut self, pQueryHeap: *mut ::ID3D12QueryHeap, Type: ::D3D12_QUERY_TYPE, Index: ::UINT
-    ) -> (),
-    fn EndQuery(
-        &mut self, pQueryHeap: *mut ::ID3D12QueryHeap, Type: ::D3D12_QUERY_TYPE, Index: ::UINT
-    ) -> (),
-    fn ResolveQueryData(
-        &mut self, pQueryHeap: *mut ::ID3D12QueryHeap, Type: ::D3D12_QUERY_TYPE,
-        StartIndex: ::UINT, NumQueries: ::UINT, pDestinationBuffer: *mut ::ID3D12Resource,
-        AlignedDestinationBufferOffset: ::UINT64
-    ) -> (),
-    fn SetPredication(
-        &mut self, pBuffer: *mut ::ID3D12Resource, AlignedBufferOffset: ::UINT64,
-        Operation: ::D3D12_PREDICATION_OP
-    ) -> (),
-    fn SetMarker(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn BeginEvent(
-        &mut self, Metadata: ::UINT, pData: *const ::c_void, Size: ::UINT
-    ) -> (),
-    fn EndEvent(&mut self) -> (),
-    fn ExecuteIndirect(
-        &mut self, pCommandSignature: *mut ::ID3D12CommandSignature, MaxCommandCount: ::UINT,
-        pArgumentBuffer: *mut ::ID3D12Resource, ArgumentBufferOffset: ::UINT64,
-        pCountBuffer: *mut ::ID3D12Resource, CountBufferOffset: ::UINT64
-    ) -> ()
-});
-
-RIDL!(
-interface ID3D12Heap(ID3D12HeapVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_HEAP_DESC
-    ) -> *mut ::D3D12_HEAP_DESC
-});
-
-
-
-RIDL!(
-interface ID3D12Pageable(ID3D12PageableVtbl): ID3D12DeviceChild(ID3D12DeviceChildVtbl) {
-});
-
-RIDL!(
-interface ID3D12PipelineState(ID3D12PipelineStateVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn GetCachedBlob(&mut self, ppBlob: *mut *mut ::ID3DBlob) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12QueryHeap(ID3D12QueryHeapVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-});
-
-RIDL!(
-interface ID3D12Resource(ID3D12ResourceVtbl): ID3D12Pageable(ID3D12PageableVtbl) {
-    fn Map(
-        &mut self, Subresource: ::UINT, pReadRange: *const ::D3D12_RANGE,
-        ppData: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn Unmap(
-        &mut self, Subresource: ::UINT, pWrittenRange: *const ::D3D12_RANGE
-    ) -> (),
-    fn GetDesc(
-        &mut self, __ret_val: *mut ::D3D12_RESOURCE_DESC
-    ) -> *mut ::D3D12_RESOURCE_DESC,
-    fn GetGPUVirtualAddress(&mut self) -> ::D3D12_GPU_VIRTUAL_ADDRESS,
-    fn WriteToSubresource(
-        &mut self, DstSubresource: ::UINT, pDstBox: *const ::D3D12_BOX, pSrcData: *const ::c_void,
-        SrcRowPitch: ::UINT, SrcDepthPitch: ::UINT
-    ) -> ::HRESULT,
-    fn ReadFromSubresource(
-        &mut self, pDstData: *mut ::c_void, DstRowPitch: ::UINT, DstDepthPitch: ::UINT,
-        SrcSubresource: ::UINT, pSrcBox: *const ::D3D12_BOX
-    ) -> ::HRESULT,
-    fn GetHeapProperties(
-        &mut self, pHeapProperties: *mut ::D3D12_HEAP_PROPERTIES,
-        pHeapFlags: *mut ::D3D12_HEAP_FLAGS
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12RootSignatureDeserializer(ID3D12RootSignatureDeserializerVtbl): IUnknown(IUnknownVtbl) {
-    fn GetRootSignatureDesc(&mut self) -> *const ::D3D12_ROOT_SIGNATURE_DESC
-});
-
-
-
-pub type PFN_D3D12_CREATE_DEVICE = extern "system" fn (_ : *mut ::IUnknown, _ : ::D3D_FEATURE_LEVEL, _ : ::REFGUID, _ : *mut *mut ::c_void) -> ::HRESULT;
-pub type PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER = extern "system" fn (pSrcData: ::LPCVOID, SrcDataSizeInBytes: ::SIZE_T, pRootSignatureDeserializerInterface: ::REFGUID, ppRootSignatureDeserializer: *mut *mut ::c_void) -> ::HRESULT;
-pub type PFN_D3D12_GET_DEBUG_INTERFACE = extern "system" fn (_ : ::REFGUID, _ : *mut *mut ::c_void) -> ::HRESULT;
-pub type PFN_D3D12_SERIALIZE_ROOT_SIGNATURE = extern "system" fn (pRootSignature: *const ::D3D12_ROOT_SIGNATURE_DESC, Version: ::D3D_ROOT_SIGNATURE_VERSION, ppBlob: *mut *mut ::ID3DBlob, ppErrorBlob: *mut *mut ::ID3DBlob) -> ::HRESULT;
diff --git a/vendor/winapi-0.2.8/src/d3d12sdklayers.rs b/vendor/winapi-0.2.8/src/d3d12sdklayers.rs
deleted file mode 100644
index f1598867ed..0000000000
--- a/vendor/winapi-0.2.8/src/d3d12sdklayers.rs
+++ /dev/null
@@ -1,1063 +0,0 @@
-// Copyright © 2015, Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-RIDL!{interface ID3D12Debug(ID3D12DebugVtbl): IUnknown(IUnknownVtbl) {
-    fn EnableDebugLayer(&mut self) -> ()
-}}
-FLAGS!{enum D3D12_DEBUG_FEATURE {
-    D3D12_DEBUG_FEATURE_NONE = 0,
-    D3D12_DEBUG_FEATURE_TREAT_BUNDLE_AS_DRAW = 0x1,
-    D3D12_DEBUG_FEATURE_TREAT_BUNDLE_AS_DISPATCH = 0x2,
-}}
-FLAGS!{enum D3D12_RLDO_FLAGS {
-    D3D12_RLDO_NONE = 0x0,
-    D3D12_RLDO_SUMMARY = 0x1,
-    D3D12_RLDO_DETAIL = 0x2,
-    D3D12_RLDO_IGNORE_INTERNAL = 0x4,
-}}
-RIDL!{interface ID3D12DebugDevice(ID3D12DebugDeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn SetFeatureMask(&mut self, Mask: ::D3D12_DEBUG_FEATURE) -> ::HRESULT,
-    fn GetFeatureMask(&mut self) -> ::D3D12_DEBUG_FEATURE,
-    fn ReportLiveDeviceObjects(&mut self, Flags: ::D3D12_RLDO_FLAGS) -> ::HRESULT
-}}
-RIDL!{interface ID3D12DebugCommandQueue(ID3D12DebugCommandQueueVtbl): IUnknown(IUnknownVtbl) {
-    fn AssertResourceState(
-        &mut self, pResource: *mut ::ID3D12Resource, Subresource: ::UINT, State: ::UINT
-    ) -> ::BOOL
-}}
-RIDL!{interface ID3D12DebugCommandList(ID3D12DebugCommandListVtbl): IUnknown(IUnknownVtbl) {
-    fn AssertResourceState(
-        &mut self, pResource: *mut ::ID3D12Resource, Subresource: ::UINT, State: ::UINT
-    ) -> ::BOOL,
-    fn SetFeatureMask(&mut self, Mask: ::D3D12_DEBUG_FEATURE) -> ::HRESULT,
-    fn GetFeatureMask(&mut self) -> ::D3D12_DEBUG_FEATURE
-}}
-ENUM!{enum D3D12_MESSAGE_CATEGORY {
-    D3D12_MESSAGE_CATEGORY_APPLICATION_DEFINED = 0,
-    D3D12_MESSAGE_CATEGORY_MISCELLANEOUS = 1,
-    D3D12_MESSAGE_CATEGORY_INITIALIZATION = 2,
-    D3D12_MESSAGE_CATEGORY_CLEANUP = 3,
-    D3D12_MESSAGE_CATEGORY_COMPILATION = 4,
-    D3D12_MESSAGE_CATEGORY_STATE_CREATION = 5,
-    D3D12_MESSAGE_CATEGORY_STATE_SETTING = 6,
-    D3D12_MESSAGE_CATEGORY_STATE_GETTING = 7,
-    D3D12_MESSAGE_CATEGORY_RESOURCE_MANIPULATION = 8,
-    D3D12_MESSAGE_CATEGORY_EXECUTION = 9,
-    D3D12_MESSAGE_CATEGORY_SHADER = 10,
-}}
-ENUM!{enum D3D12_MESSAGE_SEVERITY {
-    D3D12_MESSAGE_SEVERITY_CORRUPTION = 0,
-    D3D12_MESSAGE_SEVERITY_ERROR = 1,
-    D3D12_MESSAGE_SEVERITY_WARNING = 2,
-    D3D12_MESSAGE_SEVERITY_INFO = 3,
-    D3D12_MESSAGE_SEVERITY_MESSAGE = 4,
-}}
-ENUM!{enum D3D12_MESSAGE_ID {
-    D3D12_MESSAGE_ID_UNKNOWN = 0,
-    D3D12_MESSAGE_ID_STRING_FROM_APPLICATION = 1,
-    D3D12_MESSAGE_ID_CORRUPTED_THIS = 2,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER1 = 3,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER2 = 4,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER3 = 5,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER4 = 6,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER5 = 7,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER6 = 8,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER7 = 9,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER8 = 10,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER9 = 11,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER10 = 12,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER11 = 13,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER12 = 14,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER13 = 15,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER14 = 16,
-    D3D12_MESSAGE_ID_CORRUPTED_PARAMETER15 = 17,
-    D3D12_MESSAGE_ID_CORRUPTED_MULTITHREADING = 18,
-    D3D12_MESSAGE_ID_MESSAGE_REPORTING_OUTOFMEMORY = 19,
-    D3D12_MESSAGE_ID_GETPRIVATEDATA_MOREDATA = 20,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDFREEDATA = 21,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDIUNKNOWN = 22,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_INVALIDFLAGS = 23,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_CHANGINGPARAMS = 24,
-    D3D12_MESSAGE_ID_SETPRIVATEDATA_OUTOFMEMORY = 25,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_UNRECOGNIZEDFORMAT = 26,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDESC = 27,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDFORMAT = 28,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANESLICE = 29,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANESLICE = 30,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDIMENSIONS = 31,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDRESOURCE = 32,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDARG_RETURN = 33,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_OUTOFMEMORY_RETURN = 34,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNRECOGNIZEDFORMAT = 35,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_UNSUPPORTEDFORMAT = 36,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDESC = 37,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDFORMAT = 38,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDVIDEOPLANESLICE = 39,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANESLICE = 40,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDIMENSIONS = 41,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDRESOURCE = 42,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDARG_RETURN = 43,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_OUTOFMEMORY_RETURN = 44,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_UNRECOGNIZEDFORMAT = 45,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDESC = 46,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFORMAT = 47,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDDIMENSIONS = 48,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDRESOURCE = 49,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDARG_RETURN = 50,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_OUTOFMEMORY_RETURN = 51,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_OUTOFMEMORY = 52,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TOOMANYELEMENTS = 53,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDFORMAT = 54,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INCOMPATIBLEFORMAT = 55,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOT = 56,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDINPUTSLOTCLASS = 57,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_STEPRATESLOTCLASSMISMATCH = 58,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSLOTCLASSCHANGE = 59,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDSTEPRATECHANGE = 60,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_INVALIDALIGNMENT = 61,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_DUPLICATESEMANTIC = 62,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_UNPARSEABLEINPUTSIGNATURE = 63,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_NULLSEMANTIC = 64,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_MISSINGELEMENT = 65,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_OUTOFMEMORY = 66,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERBYTECODE = 67,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDSHADERTYPE = 68,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_OUTOFMEMORY = 69,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERBYTECODE = 70,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDSHADERTYPE = 71,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTOFMEMORY = 72,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERBYTECODE = 73,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSHADERTYPE = 74,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMENTRIES = 75,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSTREAMSTRIDEUNUSED = 76,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDDECL = 77,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_EXPECTEDDECL = 78,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_OUTPUTSLOT0EXPECTED = 79,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSLOT = 80,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_ONLYONEELEMENTPERSLOT = 81,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDCOMPONENTCOUNT = 82,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTARTCOMPONENTANDCOMPONENTCOUNT = 83,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDGAPDEFINITION = 84,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_REPEATEDOUTPUT = 85,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDOUTPUTSTREAMSTRIDE = 86,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGSEMANTIC = 87,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MASKMISMATCH = 88,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_CANTHAVEONLYGAPS = 89,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DECLTOOCOMPLEX = 90,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_MISSINGOUTPUTSIGNATURE = 91,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_OUTOFMEMORY = 92,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERBYTECODE = 93,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDSHADERTYPE = 94,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFILLMODE = 95,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDCULLMODE = 96,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDDEPTHBIASCLAMP = 97,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDSLOPESCALEDDEPTHBIAS = 98,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_NULLDESC = 99,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHWRITEMASK = 100,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDDEPTHFUNC = 101,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFAILOP = 102,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILZFAILOP = 103,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILPASSOP = 104,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDFRONTFACESTENCILFUNC = 105,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFAILOP = 106,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILZFAILOP = 107,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILPASSOP = 108,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_INVALIDBACKFACESTENCILFUNC = 109,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILSTATE_NULLDESC = 110,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLEND = 111,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLEND = 112,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOP = 113,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDSRCBLENDALPHA = 114,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDDESTBLENDALPHA = 115,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDBLENDOPALPHA = 116,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDRENDERTARGETWRITEMASK = 117,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_NULLDESC = 118,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDFILTER = 119,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDADDRESSU = 120,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDADDRESSV = 121,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDADDRESSW = 122,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMIPLODBIAS = 123,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMAXANISOTROPY = 124,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDCOMPARISONFUNC = 125,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMINLOD = 126,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_INVALIDMAXLOD = 127,
-    D3D12_MESSAGE_ID_CREATESAMPLERSTATE_NULLDESC = 128,
-    D3D12_MESSAGE_ID_DEVICE_IASETPRIMITIVETOPOLOGY_TOPOLOGY_UNRECOGNIZED = 129,
-    D3D12_MESSAGE_ID_DEVICE_IASETPRIMITIVETOPOLOGY_TOPOLOGY_UNDEFINED = 130,
-    D3D12_MESSAGE_ID_DEVICE_RSSETVIEWPORTS_INVALIDVIEWPORT = 131,
-    D3D12_MESSAGE_ID_DEVICE_RSSETSCISSORRECTS_INVALIDSCISSOR = 132,
-    D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_DENORMFLUSH = 133,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_DENORMFLUSH = 134,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_INVALID = 135,
-    D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSOURCE = 136,
-    D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDDESTINATIONSTATE = 137,
-    D3D12_MESSAGE_ID_COPYRESOURCE_INVALIDSOURCESTATE = 138,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_INVALIDDESTINATIONSUBRESOURCE = 139,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_INVALIDDESTINATIONBOX = 140,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_INVALIDDESTINATIONSTATE = 141,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_DESTINATION_INVALID = 142,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_DESTINATION_SUBRESOURCE_INVALID = 143,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_SOURCE_INVALID = 144,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_SOURCE_SUBRESOURCE_INVALID = 145,
-    D3D12_MESSAGE_ID_DEVICE_RESOLVESUBRESOURCE_FORMAT_INVALID = 146,
-    D3D12_MESSAGE_ID_BUFFER_MAP_INVALIDMAPTYPE = 147,
-    D3D12_MESSAGE_ID_BUFFER_MAP_INVALIDFLAGS = 148,
-    D3D12_MESSAGE_ID_BUFFER_MAP_ALREADYMAPPED = 149,
-    D3D12_MESSAGE_ID_BUFFER_MAP_DEVICEREMOVED_RETURN = 150,
-    D3D12_MESSAGE_ID_BUFFER_UNMAP_NOTMAPPED = 151,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_INVALIDMAPTYPE = 152,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_INVALIDSUBRESOURCE = 153,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_INVALIDFLAGS = 154,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_ALREADYMAPPED = 155,
-    D3D12_MESSAGE_ID_TEXTURE1D_MAP_DEVICEREMOVED_RETURN = 156,
-    D3D12_MESSAGE_ID_TEXTURE1D_UNMAP_INVALIDSUBRESOURCE = 157,
-    D3D12_MESSAGE_ID_TEXTURE1D_UNMAP_NOTMAPPED = 158,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_INVALIDMAPTYPE = 159,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_INVALIDSUBRESOURCE = 160,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_INVALIDFLAGS = 161,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_ALREADYMAPPED = 162,
-    D3D12_MESSAGE_ID_TEXTURE2D_MAP_DEVICEREMOVED_RETURN = 163,
-    D3D12_MESSAGE_ID_TEXTURE2D_UNMAP_INVALIDSUBRESOURCE = 164,
-    D3D12_MESSAGE_ID_TEXTURE2D_UNMAP_NOTMAPPED = 165,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_INVALIDMAPTYPE = 166,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_INVALIDSUBRESOURCE = 167,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_INVALIDFLAGS = 168,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_ALREADYMAPPED = 169,
-    D3D12_MESSAGE_ID_TEXTURE3D_MAP_DEVICEREMOVED_RETURN = 170,
-    D3D12_MESSAGE_ID_TEXTURE3D_UNMAP_INVALIDSUBRESOURCE = 171,
-    D3D12_MESSAGE_ID_TEXTURE3D_UNMAP_NOTMAPPED = 172,
-    D3D12_MESSAGE_ID_CHECKFORMATSUPPORT_FORMAT_DEPRECATED = 173,
-    D3D12_MESSAGE_ID_CHECKMULTISAMPLEQUALITYLEVELS_FORMAT_DEPRECATED = 174,
-    D3D12_MESSAGE_ID_SETEXCEPTIONMODE_UNRECOGNIZEDFLAGS = 175,
-    D3D12_MESSAGE_ID_SETEXCEPTIONMODE_INVALIDARG_RETURN = 176,
-    D3D12_MESSAGE_ID_SETEXCEPTIONMODE_DEVICEREMOVED_RETURN = 177,
-    D3D12_MESSAGE_ID_REF_SIMULATING_INFINITELY_FAST_HARDWARE = 178,
-    D3D12_MESSAGE_ID_REF_THREADING_MODE = 179,
-    D3D12_MESSAGE_ID_REF_UMDRIVER_EXCEPTION = 180,
-    D3D12_MESSAGE_ID_REF_KMDRIVER_EXCEPTION = 181,
-    D3D12_MESSAGE_ID_REF_HARDWARE_EXCEPTION = 182,
-    D3D12_MESSAGE_ID_REF_ACCESSING_INDEXABLE_TEMP_OUT_OF_RANGE = 183,
-    D3D12_MESSAGE_ID_REF_PROBLEM_PARSING_SHADER = 184,
-    D3D12_MESSAGE_ID_REF_OUT_OF_MEMORY = 185,
-    D3D12_MESSAGE_ID_REF_INFO = 186,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_VERTEXPOS_OVERFLOW = 187,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDEXED_INDEXPOS_OVERFLOW = 188,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINSTANCED_VERTEXPOS_OVERFLOW = 189,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINSTANCED_INSTANCEPOS_OVERFLOW = 190,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDEXEDINSTANCED_INSTANCEPOS_OVERFLOW = 191,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDEXEDINSTANCED_INDEXPOS_OVERFLOW = 192,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_VERTEX_SHADER_NOT_SET = 193,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_SEMANTICNAME_NOT_FOUND = 194,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_REGISTERINDEX = 195,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_COMPONENTTYPE = 196,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_REGISTERMASK = 197,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_SYSTEMVALUE = 198,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_NEVERWRITTEN_ALWAYSREADS = 199,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_NOT_SET = 200,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_ROOT_SIGNATURE_MISMATCH = 201,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_NOT_SET = 202,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INPUTLAYOUT_NOT_SET = 203,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_CONSTANT_BUFFER_NOT_SET = 204,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_CONSTANT_BUFFER_TOO_SMALL = 205,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SAMPLER_NOT_SET = 206,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SHADERRESOURCEVIEW_NOT_SET = 207,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VIEW_DIMENSION_MISMATCH = 208,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_STRIDE_TOO_SMALL = 209,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_BUFFER_TOO_SMALL = 210,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_NOT_SET = 211,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_FORMAT_INVALID = 212,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_BUFFER_TOO_SMALL = 213,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_GS_INPUT_PRIMITIVE_MISMATCH = 214,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_RETURN_TYPE_MISMATCH = 215,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_POSITION_NOT_PRESENT = 216,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OUTPUT_STREAM_NOT_SET = 217,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_BOUND_RESOURCE_MAPPED = 218,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INVALID_PRIMITIVETOPOLOGY = 219,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_OFFSET_UNALIGNED = 220,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_VERTEX_STRIDE_UNALIGNED = 221,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_INDEX_OFFSET_UNALIGNED = 222,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OUTPUT_STREAM_OFFSET_UNALIGNED = 223,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_FORMAT_LD_UNSUPPORTED = 224,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_FORMAT_SAMPLE_UNSUPPORTED = 225,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_FORMAT_SAMPLE_C_UNSUPPORTED = 226,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RESOURCE_MULTISAMPLE_UNSUPPORTED = 227,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SO_TARGETS_BOUND_WITHOUT_SOURCE = 228,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_SO_STRIDE_LARGER_THAN_BUFFER = 229,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OM_RENDER_TARGET_DOES_NOT_SUPPORT_BLENDING = 230,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_OM_DUAL_SOURCE_BLENDING_CAN_ONLY_HAVE_RENDER_TARGET_0 = 231,
-    D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_AT_FAULT = 232,
-    D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_POSSIBLY_AT_FAULT = 233,
-    D3D12_MESSAGE_ID_DEVICE_REMOVAL_PROCESS_NOT_AT_FAULT = 234,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_INVALIDARG_RETURN = 235,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_OUTOFMEMORY_RETURN = 236,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_BADINTERFACE_RETURN = 237,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_VIEWPORT_NOT_SET = 238,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TRAILING_DIGIT_IN_SEMANTIC = 239,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_TRAILING_DIGIT_IN_SEMANTIC = 240,
-    D3D12_MESSAGE_ID_DEVICE_RSSETVIEWPORTS_DENORMFLUSH = 241,
-    D3D12_MESSAGE_ID_OMSETRENDERTARGETS_INVALIDVIEW = 242,
-    D3D12_MESSAGE_ID_DEVICE_SETTEXTFILTERSIZE_INVALIDDIMENSIONS = 243,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_SAMPLER_MISMATCH = 244,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_TYPE_MISMATCH = 245,
-    D3D12_MESSAGE_ID_BLENDSTATE_GETDESC_LEGACY = 246,
-    D3D12_MESSAGE_ID_SHADERRESOURCEVIEW_GETDESC_LEGACY = 247,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_PS_OUTPUT_TYPE_MISMATCH = 248,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RESOURCE_FORMAT_GATHER_UNSUPPORTED = 249,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_USE_OF_CENTER_MULTISAMPLE_PATTERN = 250,
-    D3D12_MESSAGE_ID_DEVICE_IASETVERTEXBUFFERS_STRIDE_TOO_LARGE = 251,
-    D3D12_MESSAGE_ID_DEVICE_IASETVERTEXBUFFERS_INVALIDRANGE = 252,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_EMPTY_LAYOUT = 253,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RESOURCE_SAMPLE_COUNT_MISMATCH = 254,
-    D3D12_MESSAGE_ID_LIVE_OBJECT_SUMMARY = 255,
-    D3D12_MESSAGE_ID_LIVE_BUFFER = 256,
-    D3D12_MESSAGE_ID_LIVE_TEXTURE1D = 257,
-    D3D12_MESSAGE_ID_LIVE_TEXTURE2D = 258,
-    D3D12_MESSAGE_ID_LIVE_TEXTURE3D = 259,
-    D3D12_MESSAGE_ID_LIVE_SHADERRESOURCEVIEW = 260,
-    D3D12_MESSAGE_ID_LIVE_RENDERTARGETVIEW = 261,
-    D3D12_MESSAGE_ID_LIVE_DEPTHSTENCILVIEW = 262,
-    D3D12_MESSAGE_ID_LIVE_VERTEXSHADER = 263,
-    D3D12_MESSAGE_ID_LIVE_GEOMETRYSHADER = 264,
-    D3D12_MESSAGE_ID_LIVE_PIXELSHADER = 265,
-    D3D12_MESSAGE_ID_LIVE_INPUTLAYOUT = 266,
-    D3D12_MESSAGE_ID_LIVE_SAMPLER = 267,
-    D3D12_MESSAGE_ID_LIVE_BLENDSTATE = 268,
-    D3D12_MESSAGE_ID_LIVE_DEPTHSTENCILSTATE = 269,
-    D3D12_MESSAGE_ID_LIVE_RASTERIZERSTATE = 270,
-    D3D12_MESSAGE_ID_LIVE_QUERY = 271,
-    D3D12_MESSAGE_ID_LIVE_PREDICATE = 272,
-    D3D12_MESSAGE_ID_LIVE_COUNTER = 273,
-    D3D12_MESSAGE_ID_LIVE_DEVICE = 274,
-    D3D12_MESSAGE_ID_LIVE_SWAPCHAIN = 275,
-    D3D12_MESSAGE_ID_CREATEDEPTHSTENCILVIEW_INVALIDFLAGS = 276,
-    D3D12_MESSAGE_ID_CREATEVERTEXSHADER_INVALIDCLASSLINKAGE = 277,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADER_INVALIDCLASSLINKAGE = 278,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMSTREAMS = 279,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAMTORASTERIZER = 280,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDSTREAMS = 281,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDCLASSLINKAGE = 282,
-    D3D12_MESSAGE_ID_CREATEPIXELSHADER_INVALIDCLASSLINKAGE = 283,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDSTREAM = 284,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDENTRIES = 285,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UNEXPECTEDSTRIDES = 286,
-    D3D12_MESSAGE_ID_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_INVALIDNUMSTRIDES = 287,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDCALL = 288,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_OUTOFMEMORY = 289,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERBYTECODE = 290,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDSHADERTYPE = 291,
-    D3D12_MESSAGE_ID_CREATEHULLSHADER_INVALIDCLASSLINKAGE = 292,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDCALL = 293,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_OUTOFMEMORY = 294,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERBYTECODE = 295,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDSHADERTYPE = 296,
-    D3D12_MESSAGE_ID_CREATEDOMAINSHADER_INVALIDCLASSLINKAGE = 297,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_XOR_DS_MISMATCH = 298,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDIRECT_INVALID_ARG_BUFFER = 299,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDIRECT_OFFSET_UNALIGNED = 300,
-    D3D12_MESSAGE_ID_DEVICE_DRAWINDIRECT_OFFSET_OVERFLOW = 301,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_INVALIDMAPTYPE = 302,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_INVALIDSUBRESOURCE = 303,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_INVALIDFLAGS = 304,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_ALREADYMAPPED = 305,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_DEVICEREMOVED_RETURN = 306,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_OUTOFMEMORY_RETURN = 307,
-    D3D12_MESSAGE_ID_RESOURCE_MAP_WITHOUT_INITIAL_DISCARD = 308,
-    D3D12_MESSAGE_ID_RESOURCE_UNMAP_INVALIDSUBRESOURCE = 309,
-    D3D12_MESSAGE_ID_RESOURCE_UNMAP_NOTMAPPED = 310,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RASTERIZING_CONTROL_POINTS = 311,
-    D3D12_MESSAGE_ID_DEVICE_IASETPRIMITIVETOPOLOGY_TOPOLOGY_UNSUPPORTED = 312,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_DS_SIGNATURE_MISMATCH = 313,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HULL_SHADER_INPUT_TOPOLOGY_MISMATCH = 314,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_DS_CONTROL_POINT_COUNT_MISMATCH = 315,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_HS_DS_TESSELLATOR_DOMAIN_MISMATCH = 316,
-    D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_UNRECOGNIZED_FEATURE = 317,
-    D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_MISMATCHED_DATA_SIZE = 318,
-    D3D12_MESSAGE_ID_DEVICE_CHECKFEATURESUPPORT_INVALIDARG_RETURN = 319,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDCALL = 320,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_OUTOFMEMORY = 321,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDSHADERBYTECODE = 322,
-    D3D12_MESSAGE_ID_CREATECOMPUTESHADER_INVALIDCLASSLINKAGE = 323,
-    D3D12_MESSAGE_ID_DEVICE_CSSETSHADERRESOURCES_VIEWS_EMPTY = 324,
-    D3D12_MESSAGE_ID_CSSETCONSTANTBUFFERS_INVALIDBUFFER = 325,
-    D3D12_MESSAGE_ID_DEVICE_CSSETCONSTANTBUFFERS_BUFFERS_EMPTY = 326,
-    D3D12_MESSAGE_ID_DEVICE_CSSETSAMPLERS_SAMPLERS_EMPTY = 327,
-    D3D12_MESSAGE_ID_DEVICE_CSGETSHADERRESOURCES_VIEWS_EMPTY = 328,
-    D3D12_MESSAGE_ID_DEVICE_CSGETCONSTANTBUFFERS_BUFFERS_EMPTY = 329,
-    D3D12_MESSAGE_ID_DEVICE_CSGETSAMPLERS_SAMPLERS_EMPTY = 330,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 331,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 332,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 333,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 334,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEFLOATOPSNOTSUPPORTED = 335,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEFLOATOPSNOTSUPPORTED = 336,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEFLOATOPSNOTSUPPORTED = 337,
-    D3D12_MESSAGE_ID_CREATEBUFFER_INVALIDSTRUCTURESTRIDE = 338,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDFLAGS = 339,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDRESOURCE = 340,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDESC = 341,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFORMAT = 342,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDVIDEOPLANESLICE = 343,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDPLANESLICE = 344,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDIMENSIONS = 345,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_UNRECOGNIZEDFORMAT = 346,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_OVERLAPPING_OLD_SLOTS = 347,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_NO_OP = 348,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDARG_RETURN = 349,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_OUTOFMEMORY_RETURN = 350,
-    D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEW_DENORMFLUSH = 351,
-    D3D12_MESSAGE_ID_DEVICE_CSSETUNORDEREDACCESSS_VIEWS_EMPTY = 352,
-    D3D12_MESSAGE_ID_DEVICE_CSGETUNORDEREDACCESSS_VIEWS_EMPTY = 353,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDFLAGS = 354,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_INVALID_ARG_BUFFER = 355,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_OFFSET_UNALIGNED = 356,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_OFFSET_OVERFLOW = 357,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_DEPTH_READONLY = 358,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_STENCIL_READONLY = 359,
-    D3D12_MESSAGE_ID_CHECKFEATURESUPPORT_FORMAT_DEPRECATED = 360,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_RETURN_TYPE_MISMATCH = 361,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_NOT_SET = 362,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_UNORDEREDACCESSVIEW_RENDERTARGETVIEW_OVERLAP = 363,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_DIMENSION_MISMATCH = 364,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_APPEND_UNSUPPORTED = 365,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMICS_UNSUPPORTED = 366,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_STRUCTURE_STRIDE_MISMATCH = 367,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_BUFFER_TYPE_MISMATCH = 368,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_RAW_UNSUPPORTED = 369,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_FORMAT_LD_UNSUPPORTED = 370,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_FORMAT_STORE_UNSUPPORTED = 371,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_ADD_UNSUPPORTED = 372,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_BITWISE_OPS_UNSUPPORTED = 373,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_CMPSTORE_CMPEXCHANGE_UNSUPPORTED = 374,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_EXCHANGE_UNSUPPORTED = 375,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_SIGNED_MINMAX_UNSUPPORTED = 376,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_ATOMIC_UNSIGNED_MINMAX_UNSUPPORTED = 377,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_BOUND_RESOURCE_MAPPED = 378,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_THREADGROUPCOUNT_OVERFLOW = 379,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_THREADGROUPCOUNT_ZERO = 380,
-    D3D12_MESSAGE_ID_DEVICE_SHADERRESOURCEVIEW_STRUCTURE_STRIDE_MISMATCH = 381,
-    D3D12_MESSAGE_ID_DEVICE_SHADERRESOURCEVIEW_BUFFER_TYPE_MISMATCH = 382,
-    D3D12_MESSAGE_ID_DEVICE_SHADERRESOURCEVIEW_RAW_UNSUPPORTED = 383,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCH_UNSUPPORTED = 384,
-    D3D12_MESSAGE_ID_DEVICE_DISPATCHINDIRECT_UNSUPPORTED = 385,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_INVALIDOFFSET = 386,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_LARGEOFFSET = 387,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_INVALIDDESTINATIONSTATE = 388,
-    D3D12_MESSAGE_ID_COPYSTRUCTURECOUNT_INVALIDSOURCESTATE = 389,
-    D3D12_MESSAGE_ID_CHECKFORMATSUPPORT_FORMAT_NOT_SUPPORTED = 390,
-    D3D12_MESSAGE_ID_CLEARUNORDEREDACCESSVIEWFLOAT_INVALIDFORMAT = 391,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_COUNTER_UNSUPPORTED = 392,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_PIXEL_SHADER_WITHOUT_RTV_OR_DSV = 393,
-    D3D12_MESSAGE_ID_SHADER_ABORT = 394,
-    D3D12_MESSAGE_ID_SHADER_MESSAGE = 395,
-    D3D12_MESSAGE_ID_SHADER_ERROR = 396,
-    D3D12_MESSAGE_ID_OFFERRESOURCES_INVALIDRESOURCE = 397,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_INVALIDARG_RETURN = 398,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_OUTOFMEMORY_RETURN = 399,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_ACCESSDENIED_RETURN = 400,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALIDFORCEDSAMPLECOUNT = 401,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_USE_OF_FORCED_SAMPLE_COUNT = 402,
-    D3D12_MESSAGE_ID_CREATEBLENDSTATE_INVALIDLOGICOPS = 403,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDDARRAYWITHDECODER = 404,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDDARRAYWITHDECODER = 405,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDDARRAYWITHDECODER = 406,
-    D3D12_MESSAGE_ID_DEVICE_LOCKEDOUT_INTERFACE = 407,
-    D3D12_MESSAGE_ID_OFFERRESOURCES_INVALIDPRIORITY = 408,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDVIEW = 409,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 410,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_SHADEREXTENSIONSNOTSUPPORTED = 411,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 412,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_SHADEREXTENSIONSNOTSUPPORTED = 413,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 414,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_SHADEREXTENSIONSNOTSUPPORTED = 415,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 416,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_SHADEREXTENSIONSNOTSUPPORTED = 417,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_DOUBLEEXTENSIONSNOTSUPPORTED = 418,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_SHADEREXTENSIONSNOTSUPPORTED = 419,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 420,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_SHADEREXTENSIONSNOTSUPPORTED = 421,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_DOUBLEEXTENSIONSNOTSUPPORTED = 422,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_SHADEREXTENSIONSNOTSUPPORTED = 423,
-    D3D12_MESSAGE_ID_DEVICE_SHADER_LINKAGE_MINPRECISION = 424,
-    D3D12_MESSAGE_ID_DEVICE_CREATEVERTEXSHADER_UAVSNOTSUPPORTED = 425,
-    D3D12_MESSAGE_ID_DEVICE_CREATEHULLSHADER_UAVSNOTSUPPORTED = 426,
-    D3D12_MESSAGE_ID_DEVICE_CREATEDOMAINSHADER_UAVSNOTSUPPORTED = 427,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADER_UAVSNOTSUPPORTED = 428,
-    D3D12_MESSAGE_ID_DEVICE_CREATEGEOMETRYSHADERWITHSTREAMOUTPUT_UAVSNOTSUPPORTED = 429,
-    D3D12_MESSAGE_ID_DEVICE_CREATEPIXELSHADER_UAVSNOTSUPPORTED = 430,
-    D3D12_MESSAGE_ID_DEVICE_CREATECOMPUTESHADER_UAVSNOTSUPPORTED = 431,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_INVALIDOFFSET = 432,
-    D3D12_MESSAGE_ID_DEVICE_OMSETRENDERTARGETSANDUNORDEREDACCESSVIEWS_TOOMANYVIEWS = 433,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_NOTSUPPORTED = 434,
-    D3D12_MESSAGE_ID_SWAPDEVICECONTEXTSTATE_NOTSUPPORTED = 435,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_PREFERUPDATESUBRESOURCE1 = 436,
-    D3D12_MESSAGE_ID_GETDC_INACCESSIBLE = 437,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDRECT = 438,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_SAMPLE_MASK_IGNORED_ON_FL9 = 439,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE1_NOT_SUPPORTED = 440,
-    D3D12_MESSAGE_ID_DEVICE_OPEN_SHARED_RESOURCE_BY_NAME_NOT_SUPPORTED = 441,
-    D3D12_MESSAGE_ID_ENQUEUESETEVENT_NOT_SUPPORTED = 442,
-    D3D12_MESSAGE_ID_OFFERRELEASE_NOT_SUPPORTED = 443,
-    D3D12_MESSAGE_ID_OFFERRESOURCES_INACCESSIBLE = 444,
-    D3D12_MESSAGE_ID_CREATEVIDEOPROCESSORINPUTVIEW_INVALIDMSAA = 445,
-    D3D12_MESSAGE_ID_CREATEVIDEOPROCESSOROUTPUTVIEW_INVALIDMSAA = 446,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_INVALIDSOURCERECT = 447,
-    D3D12_MESSAGE_ID_DEVICE_CLEARVIEW_EMPTYRECT = 448,
-    D3D12_MESSAGE_ID_UPDATESUBRESOURCE_EMPTYDESTBOX = 449,
-    D3D12_MESSAGE_ID_COPYSUBRESOURCEREGION_EMPTYSOURCEBOX = 450,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_OM_RENDER_TARGET_DOES_NOT_SUPPORT_LOGIC_OPS = 451,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_DEPTHSTENCILVIEW_NOT_SET = 452,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET = 453,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_RENDERTARGETVIEW_NOT_SET_DUE_TO_FLIP_PRESENT = 454,
-    D3D12_MESSAGE_ID_DEVICE_UNORDEREDACCESSVIEW_NOT_SET_DUE_TO_FLIP_PRESENT = 455,
-    D3D12_MESSAGE_ID_GETDATAFORNEWHARDWAREKEY_NULLPARAM = 456,
-    D3D12_MESSAGE_ID_CHECKCRYPTOSESSIONSTATUS_NULLPARAM = 457,
-    D3D12_MESSAGE_ID_SETEVENTONHARDWARECONTENTPROTECTIONTILT_NULLPARAM = 458,
-    D3D12_MESSAGE_ID_GETVIDEODECODERCAPS_NULLPARAM = 459,
-    D3D12_MESSAGE_ID_GETVIDEODECODERCAPS_ZEROWIDTHHEIGHT = 460,
-    D3D12_MESSAGE_ID_CHECKVIDEODECODERDOWNSAMPLING_NULLPARAM = 461,
-    D3D12_MESSAGE_ID_CHECKVIDEODECODERDOWNSAMPLING_INVALIDCOLORSPACE = 462,
-    D3D12_MESSAGE_ID_CHECKVIDEODECODERDOWNSAMPLING_ZEROWIDTHHEIGHT = 463,
-    D3D12_MESSAGE_ID_VIDEODECODERENABLEDOWNSAMPLING_NULLPARAM = 464,
-    D3D12_MESSAGE_ID_VIDEODECODERENABLEDOWNSAMPLING_UNSUPPORTED = 465,
-    D3D12_MESSAGE_ID_VIDEODECODERUPDATEDOWNSAMPLING_NULLPARAM = 466,
-    D3D12_MESSAGE_ID_VIDEODECODERUPDATEDOWNSAMPLING_UNSUPPORTED = 467,
-    D3D12_MESSAGE_ID_CHECKVIDEOPROCESSORFORMATCONVERSION_NULLPARAM = 468,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETOUTPUTCOLORSPACE1_NULLPARAM = 469,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETOUTPUTCOLORSPACE1_NULLPARAM = 470,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMCOLORSPACE1_NULLPARAM = 471,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMCOLORSPACE1_INVALIDSTREAM = 472,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMMIRROR_NULLPARAM = 473,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMMIRROR_INVALIDSTREAM = 474,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETSTREAMMIRROR_UNSUPPORTED = 475,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETSTREAMCOLORSPACE1_NULLPARAM = 476,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETSTREAMMIRROR_NULLPARAM = 477,
-    D3D12_MESSAGE_ID_RECOMMENDVIDEODECODERDOWNSAMPLING_NULLPARAM = 478,
-    D3D12_MESSAGE_ID_RECOMMENDVIDEODECODERDOWNSAMPLING_INVALIDCOLORSPACE = 479,
-    D3D12_MESSAGE_ID_RECOMMENDVIDEODECODERDOWNSAMPLING_ZEROWIDTHHEIGHT = 480,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORSETOUTPUTSHADERUSAGE_NULLPARAM = 481,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETOUTPUTSHADERUSAGE_NULLPARAM = 482,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_NULLPARAM = 483,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_INVALIDSTREAMCOUNT = 484,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_TARGETRECT = 485,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_INVALIDSOURCERECT = 486,
-    D3D12_MESSAGE_ID_VIDEOPROCESSORGETBEHAVIORHINTS_INVALIDDESTRECT = 487,
-    D3D12_MESSAGE_ID_CREATEBUFFER_INVALIDUSAGE = 488,
-    D3D12_MESSAGE_ID_CREATETEXTURE1D_INVALIDUSAGE = 489,
-    D3D12_MESSAGE_ID_CREATETEXTURE2D_INVALIDUSAGE = 490,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_LEVEL9_STEPRATE_NOT_1 = 491,
-    D3D12_MESSAGE_ID_CREATEINPUTLAYOUT_LEVEL9_INSTANCING_NOT_SUPPORTED = 492,
-    D3D12_MESSAGE_ID_UPDATETILEMAPPINGS_INVALID_PARAMETER = 493,
-    D3D12_MESSAGE_ID_COPYTILEMAPPINGS_INVALID_PARAMETER = 494,
-    D3D12_MESSAGE_ID_COPYTILES_INVALID_PARAMETER = 495,
-    D3D12_MESSAGE_ID_NULL_TILE_MAPPING_ACCESS_WARNING = 496,
-    D3D12_MESSAGE_ID_NULL_TILE_MAPPING_ACCESS_ERROR = 497,
-    D3D12_MESSAGE_ID_DIRTY_TILE_MAPPING_ACCESS = 498,
-    D3D12_MESSAGE_ID_DUPLICATE_TILE_MAPPINGS_IN_COVERED_AREA = 499,
-    D3D12_MESSAGE_ID_TILE_MAPPINGS_IN_COVERED_AREA_DUPLICATED_OUTSIDE = 500,
-    D3D12_MESSAGE_ID_TILE_MAPPINGS_SHARED_BETWEEN_INCOMPATIBLE_RESOURCES = 501,
-    D3D12_MESSAGE_ID_TILE_MAPPINGS_SHARED_BETWEEN_INPUT_AND_OUTPUT = 502,
-    D3D12_MESSAGE_ID_CHECKMULTISAMPLEQUALITYLEVELS_INVALIDFLAGS = 503,
-    D3D12_MESSAGE_ID_GETRESOURCETILING_NONTILED_RESOURCE = 504,
-    D3D12_MESSAGE_ID_NEED_TO_CALL_TILEDRESOURCEBARRIER = 505,
-    D3D12_MESSAGE_ID_CREATEDEVICE_INVALIDARGS = 506,
-    D3D12_MESSAGE_ID_CREATEDEVICE_WARNING = 507,
-    D3D12_MESSAGE_ID_TILED_RESOURCE_TIER_1_BUFFER_TEXTURE_MISMATCH = 508,
-    D3D12_MESSAGE_ID_CREATE_CRYPTOSESSION = 509,
-    D3D12_MESSAGE_ID_CREATE_AUTHENTICATEDCHANNEL = 510,
-    D3D12_MESSAGE_ID_LIVE_CRYPTOSESSION = 511,
-    D3D12_MESSAGE_ID_LIVE_AUTHENTICATEDCHANNEL = 512,
-    D3D12_MESSAGE_ID_DESTROY_CRYPTOSESSION = 513,
-    D3D12_MESSAGE_ID_DESTROY_AUTHENTICATEDCHANNEL = 514,
-    D3D12_MESSAGE_ID_MAP_INVALID_SUBRESOURCE = 515,
-    D3D12_MESSAGE_ID_MAP_INVALID_TYPE = 516,
-    D3D12_MESSAGE_ID_MAP_UNSUPPORTED_TYPE = 517,
-    D3D12_MESSAGE_ID_UNMAP_INVALID_SUBRESOURCE = 518,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_TYPE = 519,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_NULL_POINTER = 520,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SUBRESOURCE = 521,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_RESERVED_BITS = 522,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISSING_BIND_FLAGS = 523,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_MISC_FLAGS = 524,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_MATCHING_STATES = 525,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINATION = 526,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_BEFORE_AFTER_MISMATCH = 527,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_RESOURCE = 528,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_SAMPLE_COUNT = 529,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS = 530,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMBINED_FLAGS = 531,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAGS_FOR_FORMAT = 532,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_SPLIT_BARRIER = 533,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_END = 534,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_UNMATCHED_BEGIN = 535,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_FLAG = 536,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_COMMAND_LIST_TYPE = 537,
-    D3D12_MESSAGE_ID_INVALID_SUBRESOURCE_STATE = 538,
-    D3D12_MESSAGE_ID_INEFFICIENT_PRESENT = 539,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CONTENTION = 540,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET = 541,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_RESET_BUNDLE = 542,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_CANNOT_RESET = 543,
-    D3D12_MESSAGE_ID_COMMAND_LIST_OPEN = 544,
-    D3D12_MESSAGE_ID_QUERY_STATE_MISMATCH = 545,
-    D3D12_MESSAGE_ID_INVALID_BUNDLE_API = 546,
-    D3D12_MESSAGE_ID_COMMAND_LIST_CLOSED = 547,
-    D3D12_MESSAGE_ID_COMMAND_LIST_CLOSED_WITH_INVALID_RESOURCE = 548,
-    D3D12_MESSAGE_ID_WRONG_COMMAND_ALLOCATOR_TYPE = 549,
-    D3D12_MESSAGE_ID_INVALID_INDIRECT_ARGUMENT_BUFFER = 550,
-    D3D12_MESSAGE_ID_COMPUTE_AND_GRAPHICS_PIPELINE = 551,
-    D3D12_MESSAGE_ID_COMMAND_ALLOCATOR_SYNC = 552,
-    D3D12_MESSAGE_ID_COMMAND_LIST_SYNC = 553,
-    D3D12_MESSAGE_ID_SET_DESCRIPTOR_HEAP_INVALID = 554,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_IMAGE_NOT_SUPPORTED = 555,
-    D3D12_MESSAGE_ID_CREATE_COMMAND_ALLOCATOR_IMAGE_NOT_SUPPORTED = 556,
-    D3D12_MESSAGE_ID_CREATE_COMMANDQUEUE = 557,
-    D3D12_MESSAGE_ID_CREATE_COMMANDALLOCATOR = 558,
-    D3D12_MESSAGE_ID_CREATE_PIPELINESTATE = 559,
-    D3D12_MESSAGE_ID_CREATE_COMMANDLIST12 = 560,
-    D3D12_MESSAGE_ID_CREATE_IMAGECOMMANDLIST = 561,
-    D3D12_MESSAGE_ID_CREATE_RESOURCE = 562,
-    D3D12_MESSAGE_ID_CREATE_DESCRIPTORHEAP = 563,
-    D3D12_MESSAGE_ID_CREATE_ROOTSIGNATURE = 564,
-    D3D12_MESSAGE_ID_CREATE_LIBRARY = 565,
-    D3D12_MESSAGE_ID_CREATE_HEAP = 566,
-    D3D12_MESSAGE_ID_CREATE_MONITOREDFENCE = 567,
-    D3D12_MESSAGE_ID_CREATE_QUERYHEAP = 568,
-    D3D12_MESSAGE_ID_CREATE_COMMANDSIGNATURE = 569,
-    D3D12_MESSAGE_ID_LIVE_COMMANDQUEUE = 570,
-    D3D12_MESSAGE_ID_LIVE_COMMANDALLOCATOR = 571,
-    D3D12_MESSAGE_ID_LIVE_PIPELINESTATE = 572,
-    D3D12_MESSAGE_ID_LIVE_COMMANDLIST12 = 573,
-    D3D12_MESSAGE_ID_LIVE_IMAGECOMMANDLIST = 574,
-    D3D12_MESSAGE_ID_LIVE_RESOURCE = 575,
-    D3D12_MESSAGE_ID_LIVE_DESCRIPTORHEAP = 576,
-    D3D12_MESSAGE_ID_LIVE_ROOTSIGNATURE = 577,
-    D3D12_MESSAGE_ID_LIVE_LIBRARY = 578,
-    D3D12_MESSAGE_ID_LIVE_HEAP = 579,
-    D3D12_MESSAGE_ID_LIVE_MONITOREDFENCE = 580,
-    D3D12_MESSAGE_ID_LIVE_QUERYHEAP = 581,
-    D3D12_MESSAGE_ID_LIVE_COMMANDSIGNATURE = 582,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDQUEUE = 583,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDALLOCATOR = 584,
-    D3D12_MESSAGE_ID_DESTROY_PIPELINESTATE = 585,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDLIST12 = 586,
-    D3D12_MESSAGE_ID_DESTROY_IMAGECOMMANDLIST = 587,
-    D3D12_MESSAGE_ID_DESTROY_RESOURCE = 588,
-    D3D12_MESSAGE_ID_DESTROY_DESCRIPTORHEAP = 589,
-    D3D12_MESSAGE_ID_DESTROY_ROOTSIGNATURE = 590,
-    D3D12_MESSAGE_ID_DESTROY_LIBRARY = 591,
-    D3D12_MESSAGE_ID_DESTROY_HEAP = 592,
-    D3D12_MESSAGE_ID_DESTROY_MONITOREDFENCE = 593,
-    D3D12_MESSAGE_ID_DESTROY_QUERYHEAP = 594,
-    D3D12_MESSAGE_ID_DESTROY_COMMANDSIGNATURE = 595,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDHEAPTYPE = 596,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONS = 597,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDMISCFLAGS = 598,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMISCFLAGS = 599,
-    D3D12_MESSAGE_ID_CREATERESOURCE_LARGEALLOCATION = 600,
-    D3D12_MESSAGE_ID_CREATERESOURCE_SMALLALLOCATION = 601,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDARG_RETURN = 602,
-    D3D12_MESSAGE_ID_CREATERESOURCE_OUTOFMEMORY_RETURN = 603,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDESC = 604,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDINITIALSTATE = 605,
-    D3D12_MESSAGE_ID_RESOURCE_HAS_PENDING_INITIAL_DATA = 606,
-    D3D12_MESSAGE_ID_POSSIBLY_INVALID_SUBRESOURCE_STATE = 607,
-    D3D12_MESSAGE_ID_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 608,
-    D3D12_MESSAGE_ID_POSSIBLE_INVALID_USE_OF_NON_RESIDENT_RESOURCE = 609,
-    D3D12_MESSAGE_ID_BUNDLE_PIPELINE_STATE_MISMATCH = 610,
-    D3D12_MESSAGE_ID_PRIMITIVE_TOPOLOGY_MISMATCH_PIPELINE_STATE = 611,
-    D3D12_MESSAGE_ID_RENDER_TARGET_NUMBER_MISMATCH_PIPELINE_STATE = 612,
-    D3D12_MESSAGE_ID_RENDER_TARGET_FORMAT_MISMATCH_PIPELINE_STATE = 613,
-    D3D12_MESSAGE_ID_RENDER_TARGET_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 614,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_FORMAT_MISMATCH_PIPELINE_STATE = 615,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_SAMPLE_DESC_MISMATCH_PIPELINE_STATE = 616,
-    D3D12_MESSAGE_ID_RENDER_TARGET_NUMBER_MISMATCH_BUNDLE_PIPELINE_STATE = 617,
-    D3D12_MESSAGE_ID_RENDER_TARGET_FORMAT_MISMATCH_BUNDLE_PIPELINE_STATE = 618,
-    D3D12_MESSAGE_ID_RENDER_TARGET_SAMPLE_DESC_MISMATCH_BUNDLE_PIPELINE_STATE = 619,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_FORMAT_MISMATCH_BUNDLE_PIPELINE_STATE = 620,
-    D3D12_MESSAGE_ID_DEPTH_STENCIL_SAMPLE_DESC_MISMATCH_BUNDLE_PIPELINE_STATE = 621,
-    D3D12_MESSAGE_ID_CREATESHADER_INVALIDBYTECODE = 622,
-    D3D12_MESSAGE_ID_CREATEHEAP_NULLDESC = 623,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDSIZE = 624,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDHEAPTYPE = 625,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 626,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMEMORYPOOL = 627,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDPROPERTIES = 628,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDALIGNMENT = 629,
-    D3D12_MESSAGE_ID_CREATEHEAP_UNRECOGNIZEDMISCFLAGS = 630,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDMISCFLAGS = 631,
-    D3D12_MESSAGE_ID_CREATEHEAP_INVALIDARG_RETURN = 632,
-    D3D12_MESSAGE_ID_CREATEHEAP_OUTOFMEMORY_RETURN = 633,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAPPROPERTIES = 634,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPTYPE = 635,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDCPUPAGEPROPERTIES = 636,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDMEMORYPOOL = 637,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPPROPERTIES = 638,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_UNRECOGNIZEDHEAPMISCFLAGS = 639,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDHEAPMISCFLAGS = 640,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_INVALIDARG_RETURN = 641,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_OUTOFMEMORY_RETURN = 642,
-    D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_UNRECOGNIZEDHEAPTYPE = 643,
-    D3D12_MESSAGE_ID_GETCUSTOMHEAPPROPERTIES_INVALIDHEAPTYPE = 644,
-    D3D12_MESSAGE_ID_CREATE_DESCRIPTOR_HEAP_INVALID_DESC = 645,
-    D3D12_MESSAGE_ID_INVALID_DESCRIPTOR_HANDLE = 646,
-    D3D12_MESSAGE_ID_CREATERASTERIZERSTATE_INVALID_CONSERVATIVERASTERMODE = 647,
-    D3D12_MESSAGE_ID_DEVICE_DRAW_INVALID_SYSTEMVALUE = 648,
-    D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_RESOURCE = 649,
-    D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_INVALID_DESC = 650,
-    D3D12_MESSAGE_ID_CREATE_CONSTANT_BUFFER_VIEW_LARGE_OFFSET = 651,
-    D3D12_MESSAGE_ID_CREATE_UNORDEREDACCESS_VIEW_INVALID_COUNTER_USAGE = 652,
-    D3D12_MESSAGE_ID_COPY_DESCRIPTORS_INVALID_RANGES = 653,
-    D3D12_MESSAGE_ID_COPY_DESCRIPTORS_WRITE_ONLY_DESCRIPTOR = 654,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RTV_FORMAT_NOT_UNKNOWN = 655,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_RENDER_TARGET_COUNT = 656,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VERTEX_SHADER_NOT_SET = 657,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INPUTLAYOUT_NOT_SET = 658,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_HS_DS_SIGNATURE_MISMATCH = 659,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERINDEX = 660,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_COMPONENTTYPE = 661,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_REGISTERMASK = 662,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SYSTEMVALUE = 663,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_NEVERWRITTEN_ALWAYSREADS = 664,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_MINPRECISION = 665,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_SHADER_LINKAGE_SEMANTICNAME_NOT_FOUND = 666,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_XOR_DS_MISMATCH = 667,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HULL_SHADER_INPUT_TOPOLOGY_MISMATCH = 668,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_CONTROL_POINT_COUNT_MISMATCH = 669,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_DS_TESSELLATOR_DOMAIN_MISMATCH = 670,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_CENTER_MULTISAMPLE_PATTERN = 671,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_USE_OF_FORCED_SAMPLE_COUNT = 672,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_PRIMITIVETOPOLOGY = 673,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SYSTEMVALUE = 674,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_DUAL_SOURCE_BLENDING_CAN_ONLY_HAVE_RENDER_TARGET_0 = 675,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_BLENDING = 676,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_OUTPUT_TYPE_MISMATCH = 677,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_OM_RENDER_TARGET_DOES_NOT_SUPPORT_LOGIC_OPS = 678,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_RENDERTARGETVIEW_NOT_SET = 679,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DEPTHSTENCILVIEW_NOT_SET = 680,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_INPUT_PRIMITIVE_MISMATCH = 681,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_POSITION_NOT_PRESENT = 682,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE_FLAGS = 683,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_INDEX_BUFFER_PROPERTIES = 684,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_INVALID_SAMPLE_DESC = 685,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_HS_ROOT_SIGNATURE_MISMATCH = 686,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_DS_ROOT_SIGNATURE_MISMATCH = 687,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_VS_ROOT_SIGNATURE_MISMATCH = 688,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_GS_ROOT_SIGNATURE_MISMATCH = 689,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_PS_ROOT_SIGNATURE_MISMATCH = 690,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_MISSING_ROOT_SIGNATURE = 691,
-    D3D12_MESSAGE_ID_EXECUTE_BUNDLE_OPEN_BUNDLE = 692,
-    D3D12_MESSAGE_ID_EXECUTE_BUNDLE_DESCRIPTOR_HEAP_MISMATCH = 693,
-    D3D12_MESSAGE_ID_EXECUTE_BUNDLE_TYPE = 694,
-    D3D12_MESSAGE_ID_DRAW_EMPTY_SCISSOR_RECTANGLE = 695,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_BLOB_NOT_FOUND = 696,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_DESERIALIZE_FAILED = 697,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_INVALID_CONFIGURATION = 698,
-    D3D12_MESSAGE_ID_CREATE_ROOT_SIGNATURE_NOT_SUPPORTED_ON_DEVICE = 699,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLRESOURCEPROPERTIES = 700,
-    D3D12_MESSAGE_ID_CREATERESOURCEANDHEAP_NULLHEAP = 701,
-    D3D12_MESSAGE_ID_GETRESOURCEALLOCATIONINFO_INVALIDRDESCS = 702,
-    D3D12_MESSAGE_ID_MAKERESIDENT_NULLOBJECTARRAY = 703,
-    D3D12_MESSAGE_ID_MAKERESIDENT_INVALIDOBJECT = 704,
-    D3D12_MESSAGE_ID_EVICT_NULLOBJECTARRAY = 705,
-    D3D12_MESSAGE_ID_EVICT_INVALIDOBJECT = 706,
-    D3D12_MESSAGE_ID_HEAPS_UNSUPPORTED = 707,
-    D3D12_MESSAGE_ID_SET_DESCRIPTOR_TABLE_INVALID = 708,
-    D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_INVALID = 709,
-    D3D12_MESSAGE_ID_SET_ROOT_CONSTANT_BUFFER_VIEW_INVALID = 710,
-    D3D12_MESSAGE_ID_SET_ROOT_SHADER_RESOURCE_VIEW_INVALID = 711,
-    D3D12_MESSAGE_ID_SET_ROOT_UNORDERED_ACCESS_VIEW_INVALID = 712,
-    D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID_DESC = 713,
-    D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_LARGE_OFFSET = 714,
-    D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID_DESC = 715,
-    D3D12_MESSAGE_ID_SET_INDEX_BUFFER_LARGE_OFFSET = 716,
-    D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID_DESC = 717,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDDIMENSIONALITY = 718,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDLAYOUT = 719,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDDIMENSIONALITY = 720,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDALIGNMENT = 721,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDMIPLEVELS = 722,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDSAMPLEDESC = 723,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDLAYOUT = 724,
-    D3D12_MESSAGE_ID_SET_INDEX_BUFFER_INVALID = 725,
-    D3D12_MESSAGE_ID_SET_VERTEX_BUFFERS_INVALID = 726,
-    D3D12_MESSAGE_ID_SET_STREAM_OUTPUT_BUFFERS_INVALID = 727,
-    D3D12_MESSAGE_ID_SET_RENDER_TARGETS_INVALID = 728,
-    D3D12_MESSAGE_ID_CREATEQUERY_HEAP_INVALID_PARAMETERS = 729,
-    D3D12_MESSAGE_ID_CREATEQUERY_HEAP_JPEG_NOT_SUPPORTED = 730,
-    D3D12_MESSAGE_ID_BEGIN_END_QUERY_INVALID_PARAMETERS = 731,
-    D3D12_MESSAGE_ID_CLOSE_COMMAND_LIST_OPEN_QUERY = 732,
-    D3D12_MESSAGE_ID_RESOLVE_QUERY_DATA_INVALID_PARAMETERS = 733,
-    D3D12_MESSAGE_ID_SET_PREDICATION_INVALID_PARAMETERS = 734,
-    D3D12_MESSAGE_ID_TIMESTAMPS_NOT_SUPPORTED = 735,
-    D3D12_MESSAGE_ID_UNSTABLE_POWER_STATE = 736,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDFORMAT = 737,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDFORMAT = 738,
-    D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDSUBRESOURCERANGE = 739,
-    D3D12_MESSAGE_ID_GETCOPYABLELAYOUT_INVALIDBASEOFFSET = 740,
-    D3D12_MESSAGE_ID_RESOURCE_BARRIER_INVALID_HEAP = 741,
-    D3D12_MESSAGE_ID_CREATE_SAMPLER_INVALID = 742,
-    D3D12_MESSAGE_ID_CREATECOMMANDSIGNATURE_INVALID = 743,
-    D3D12_MESSAGE_ID_EXECUTE_INDIRECT_INVALID_PARAMETERS = 744,
-    D3D12_MESSAGE_ID_GETGPUVIRTUALADDRESS_INVALID_RESOURCE_DIMENSION = 745,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_INVALIDCONTEXTTYPE = 746,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_DECODENOTSUPPORTED = 747,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_ENCODENOTSUPPORTED = 748,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDPLANEINDEX = 749,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_INVALIDVIDEOPLANEINDEX = 750,
-    D3D12_MESSAGE_ID_CREATESHADERRESOURCEVIEW_AMBIGUOUSVIDEOPLANEINDEX = 751,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDPLANEINDEX = 752,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_INVALIDVIDEOPLANEINDEX = 753,
-    D3D12_MESSAGE_ID_CREATERENDERTARGETVIEW_AMBIGUOUSVIDEOPLANEINDEX = 754,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDPLANEINDEX = 755,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_INVALIDVIDEOPLANEINDEX = 756,
-    D3D12_MESSAGE_ID_CREATEUNORDEREDACCESSVIEW_AMBIGUOUSVIDEOPLANEINDEX = 757,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDSCANDATAOFFSET = 758,
-    D3D12_MESSAGE_ID_JPEGDECODE_NOTSUPPORTED = 759,
-    D3D12_MESSAGE_ID_JPEGDECODE_DIMENSIONSTOOLARGE = 760,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDCOMPONENTS = 761,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDCOMPONENTS = 762,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTINATIONNOT2D = 763,
-    D3D12_MESSAGE_ID_JPEGDECODE_TILEDRESOURCESUNSUPPORTED = 764,
-    D3D12_MESSAGE_ID_JPEGDECODE_GUARDRECTSUNSUPPORTED = 765,
-    D3D12_MESSAGE_ID_JPEGDECODE_FORMATUNSUPPORTED = 766,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDSUBRESOURCE = 767,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDMIPLEVEL = 768,
-    D3D12_MESSAGE_ID_JPEGDECODE_EMPTYDESTBOX = 769,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTBOXNOT2D = 770,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTBOXNOTSUB = 771,
-    D3D12_MESSAGE_ID_JPEGDECODE_DESTBOXESINTERSECT = 772,
-    D3D12_MESSAGE_ID_JPEGDECODE_XSUBSAMPLEMISMATCH = 773,
-    D3D12_MESSAGE_ID_JPEGDECODE_YSUBSAMPLEMISMATCH = 774,
-    D3D12_MESSAGE_ID_JPEGDECODE_XSUBSAMPLEODD = 775,
-    D3D12_MESSAGE_ID_JPEGDECODE_YSUBSAMPLEODD = 776,
-    D3D12_MESSAGE_ID_JPEGDECODE_UPSCALEUNSUPPORTED = 777,
-    D3D12_MESSAGE_ID_JPEGDECODE_TIER4DOWNSCALETOLARGE = 778,
-    D3D12_MESSAGE_ID_JPEGDECODE_TIER3DOWNSCALEUNSUPPORTED = 779,
-    D3D12_MESSAGE_ID_JPEGDECODE_CHROMASIZEMISMATCH = 780,
-    D3D12_MESSAGE_ID_JPEGDECODE_LUMACHROMASIZEMISMATCH = 781,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDNUMDESTINATIONS = 782,
-    D3D12_MESSAGE_ID_JPEGDECODE_SUBBOXUNSUPPORTED = 783,
-    D3D12_MESSAGE_ID_JPEGDECODE_1DESTUNSUPPORTEDFORMAT = 784,
-    D3D12_MESSAGE_ID_JPEGDECODE_3DESTUNSUPPORTEDFORMAT = 785,
-    D3D12_MESSAGE_ID_JPEGDECODE_SCALEUNSUPPORTED = 786,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDSOURCESIZE = 787,
-    D3D12_MESSAGE_ID_JPEGDECODE_INVALIDCOPYFLAGS = 788,
-    D3D12_MESSAGE_ID_JPEGDECODE_HAZARD = 789,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERUSAGE = 790,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDSRCBUFFERMISCFLAGS = 791,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPORTEDDSTTEXTUREUSAGE = 792,
-    D3D12_MESSAGE_ID_JPEGDECODE_BACKBUFFERNOTSUPPORTED = 793,
-    D3D12_MESSAGE_ID_JPEGDECODE_UNSUPPRTEDCOPYFLAGS = 794,
-    D3D12_MESSAGE_ID_JPEGENCODE_NOTSUPPORTED = 795,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDSCANDATAOFFSET = 796,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDCOMPONENTS = 797,
-    D3D12_MESSAGE_ID_JPEGENCODE_SOURCENOT2D = 798,
-    D3D12_MESSAGE_ID_JPEGENCODE_TILEDRESOURCESUNSUPPORTED = 799,
-    D3D12_MESSAGE_ID_JPEGENCODE_GUARDRECTSUNSUPPORTED = 800,
-    D3D12_MESSAGE_ID_JPEGENCODE_XSUBSAMPLEMISMATCH = 801,
-    D3D12_MESSAGE_ID_JPEGENCODE_YSUBSAMPLEMISMATCH = 802,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDCOMPONENTS = 803,
-    D3D12_MESSAGE_ID_JPEGENCODE_FORMATUNSUPPORTED = 804,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDSUBRESOURCE = 805,
-    D3D12_MESSAGE_ID_JPEGENCODE_INVALIDMIPLEVEL = 806,
-    D3D12_MESSAGE_ID_JPEGENCODE_DIMENSIONSTOOLARGE = 807,
-    D3D12_MESSAGE_ID_JPEGENCODE_HAZARD = 808,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERUSAGE = 809,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDDSTBUFFERMISCFLAGS = 810,
-    D3D12_MESSAGE_ID_JPEGENCODE_UNSUPPORTEDSRCTEXTUREUSAGE = 811,
-    D3D12_MESSAGE_ID_JPEGENCODE_BACKBUFFERNOTSUPPORTED = 812,
-    D3D12_MESSAGE_ID_CREATEQUERYORPREDICATE_UNSUPPORTEDCONTEXTTTYPEFORQUERY = 813,
-    D3D12_MESSAGE_ID_FLUSH1_INVALIDCONTEXTTYPE = 814,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUE = 815,
-    D3D12_MESSAGE_ID_CREATERESOURCE_UNRECOGNIZEDCLEARVALUEFORMAT = 816,
-    D3D12_MESSAGE_ID_CREATERESOURCE_INVALIDCLEARVALUEFORMAT = 817,
-    D3D12_MESSAGE_ID_CREATERESOURCE_CLEARVALUEDENORMFLUSH = 818,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_INVALIDDEPTH = 819,
-    D3D12_MESSAGE_ID_CLEARRENDERTARGETVIEW_MISMATCHINGCLEARVALUE = 820,
-    D3D12_MESSAGE_ID_CLEARDEPTHSTENCILVIEW_MISMATCHINGCLEARVALUE = 821,
-    D3D12_MESSAGE_ID_MAP_INVALIDHEAP = 822,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDHEAP = 823,
-    D3D12_MESSAGE_ID_MAP_INVALIDRESOURCE = 824,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDRESOURCE = 825,
-    D3D12_MESSAGE_ID_MAP_INVALIDSUBRESOURCE = 826,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDSUBRESOURCE = 827,
-    D3D12_MESSAGE_ID_MAP_INVALIDRANGE = 828,
-    D3D12_MESSAGE_ID_UNMAP_INVALIDRANGE = 829,
-    D3D12_MESSAGE_ID_MAP_NULLRANGE = 830,
-    D3D12_MESSAGE_ID_UNMAP_NULLRANGE = 831,
-    D3D12_MESSAGE_ID_MAP_INVALIDDATAPOINTER = 832,
-    D3D12_MESSAGE_ID_MAP_INVALIDARG_RETURN = 833,
-    D3D12_MESSAGE_ID_MAP_OUTOFMEMORY_RETURN = 834,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_BUNDLENOTSUPPORTED = 835,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_COMMANDLISTMISMATCH = 836,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_OPENCOMMANDLIST = 837,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_FAILEDCOMMANDLIST = 838,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLDST = 839,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDDSTRESOURCEDIMENSION = 840,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_DSTRANGEOUTOFBOUNDS = 841,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_NULLSRC = 842,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDSRCRESOURCEDIMENSION = 843,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_SRCRANGEOUTOFBOUNDS = 844,
-    D3D12_MESSAGE_ID_COPYBUFFERREGION_INVALIDCOPYFLAGS = 845,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLDST = 846,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTTYPE = 847,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCEDIMENSION = 848,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTRESOURCE = 849,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTSUBRESOURCE = 850,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTOFFSET = 851,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDDSTFORMAT = 852,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTFORMAT = 853,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDIMENSIONS = 854,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTROWPITCH = 855,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTPLACEMENT = 856,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTDSPLACEDFOOTPRINTFORMAT = 857,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_DSTREGIONOUTOFBOUNDS = 858,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_NULLSRC = 859,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCTYPE = 860,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCEDIMENSION = 861,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCRESOURCE = 862,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCSUBRESOURCE = 863,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCOFFSET = 864,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_UNRECOGNIZEDSRCFORMAT = 865,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCFORMAT = 866,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDIMENSIONS = 867,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCROWPITCH = 868,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCPLACEMENT = 869,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCDSPLACEDFOOTPRINTFORMAT = 870,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_SRCREGIONOUTOFBOUNDS = 871,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDDSTCOORDINATES = 872,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDSRCBOX = 873,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_FORMATMISMATCH = 874,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_EMPTYBOX = 875,
-    D3D12_MESSAGE_ID_COPYTEXTUREREGION_INVALIDCOPYFLAGS = 876,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SUBRESOURCE_INDEX = 877,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_FORMAT = 878,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_RESOURCE_MISMATCH = 879,
-    D3D12_MESSAGE_ID_RESOLVESUBRESOURCE_INVALID_SAMPLE_COUNT = 880,
-    D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_INVALID_SHADER = 881,
-    D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_CS_ROOT_SIGNATURE_MISMATCH = 882,
-    D3D12_MESSAGE_ID_CREATECOMPUTEPIPELINESTATE_MISSING_ROOT_SIGNATURE = 883,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALIDCACHEDBLOB = 884,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBADAPTERMISMATCH = 885,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDRIVERVERSIONMISMATCH = 886,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBDESCMISMATCH = 887,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_CACHEDBLOBIGNORED = 888,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDHEAP = 889,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDRESOURCE = 890,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDBOX = 891,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_INVALIDSUBRESOURCE = 892,
-    D3D12_MESSAGE_ID_WRITETOSUBRESOURCE_EMPTYBOX = 893,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDHEAP = 894,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDRESOURCE = 895,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDBOX = 896,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_INVALIDSUBRESOURCE = 897,
-    D3D12_MESSAGE_ID_READFROMSUBRESOURCE_EMPTYBOX = 898,
-    D3D12_MESSAGE_ID_TOO_MANY_NODES_SPECIFIED = 899,
-    D3D12_MESSAGE_ID_INVALID_NODE_INDEX = 900,
-    D3D12_MESSAGE_ID_GETHEAPPROPERTIES_INVALIDRESOURCE = 901,
-    D3D12_MESSAGE_ID_NODE_MASK_MISMATCH = 902,
-    D3D12_MESSAGE_ID_COMMAND_LIST_OUTOFMEMORY = 903,
-    D3D12_MESSAGE_ID_COMMAND_LIST_MULTIPLE_SWAPCHAIN_BUFFER_REFERENCES = 904,
-    D3D12_MESSAGE_ID_COMMAND_LIST_TOO_MANY_SWAPCHAIN_REFERENCES = 905,
-    D3D12_MESSAGE_ID_COMMAND_QUEUE_TOO_MANY_SWAPCHAIN_REFERENCES = 906,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_WRONGSWAPCHAINBUFFERREFERENCE = 907,
-    D3D12_MESSAGE_ID_COMMAND_LIST_SETRENDERTARGETS_INVALIDNUMRENDERTARGETS = 908,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_TYPE = 909,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_FLAGS = 910,
-    D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFLAGS = 911,
-    D3D12_MESSAGE_ID_CREATESHAREDRESOURCE_INVALIDFORMAT = 912,
-    D3D12_MESSAGE_ID_CREATESHAREDHEAP_INVALIDFLAGS = 913,
-    D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_UNRECOGNIZEDPROPERTIES = 914,
-    D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDSIZE = 915,
-    D3D12_MESSAGE_ID_REFLECTSHAREDPROPERTIES_INVALIDOBJECT = 916,
-    D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDOBJECT = 917,
-    D3D12_MESSAGE_ID_KEYEDMUTEX_INVALIDKEY = 918,
-    D3D12_MESSAGE_ID_KEYEDMUTEX_WRONGSTATE = 919,
-    D3D12_MESSAGE_ID_CREATE_QUEUE_INVALID_PRIORITY = 920,
-    D3D12_MESSAGE_ID_OBJECT_DELETED_WHILE_STILL_IN_USE = 921,
-    D3D12_MESSAGE_ID_CREATEPIPELINESTATE_INVALID_FLAGS = 922,
-    D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_HAS_NO_RESOURCE = 923,
-    D3D12_MESSAGE_ID_COMMAND_LIST_DRAW_RENDER_TARGET_DELETED = 924,
-    D3D12_MESSAGE_ID_CREATEGRAPHICSPIPELINESTATE_ALL_RENDER_TARGETS_HAVE_UNKNOWN_FORMAT = 925,
-    D3D12_MESSAGE_ID_HEAP_ADDRESS_RANGE_INTERSECTS_MULTIPLE_BUFFERS = 926,
-    D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_GPU_WRITTEN_READBACK_RESOURCE_MAPPED = 927,
-    D3D12_MESSAGE_ID_UNMAP_RANGE_NOT_NEEDED = 928,
-    D3D12_MESSAGE_ID_UNMAP_RANGE_NOT_EMPTY = 929,
-    D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE = 930,
-    D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE = 931,
-    D3D12_MESSAGE_ID_NO_GRAPHICS_API_SUPPORT = 932,
-    D3D12_MESSAGE_ID_NO_COMPUTE_API_SUPPORT = 933,
-    D3D12_MESSAGE_ID_D3D12_MESSAGES_END = 934,
-}}
-STRUCT!{struct D3D12_MESSAGE {
-    Category: D3D12_MESSAGE_CATEGORY,
-    Severity: D3D12_MESSAGE_SEVERITY,
-    ID: D3D12_MESSAGE_ID,
-    pDescription: *const ::c_char,
-    DescriptionByteLength: ::SIZE_T,
-}}
-STRUCT!{struct D3D12_INFO_QUEUE_FILTER_DESC {
-    NumCategories: ::UINT,
-    pCategoryList: *mut D3D12_MESSAGE_CATEGORY,
-    NumSeverities: ::UINT,
-    pSeverityList: *mut D3D12_MESSAGE_SEVERITY,
-    NumIDs: ::UINT,
-    pIDList: *mut D3D12_MESSAGE_ID,
-}}
-STRUCT!{struct D3D12_INFO_QUEUE_FILTER {
-    AllowList: D3D12_INFO_QUEUE_FILTER_DESC,
-    DenyList: D3D12_INFO_QUEUE_FILTER_DESC,
-}}
-pub const D3D12_INFO_QUEUE_DEFAULT_MESSAGE_COUNT_LIMIT: ::UINT = 1024;
-RIDL!{interface ID3D12InfoQueue(ID3D12InfoQueueVtbl): IUnknown(IUnknownVtbl) {
-    fn SetMessageCountLimit(&mut self, MessageCountLimit: ::UINT64) -> ::HRESULT,
-    fn ClearStoredMessages(&mut self) -> (),
-    fn GetMessage(
-        &mut self, MessageIndex: ::UINT64, pMessage: *mut ::D3D12_MESSAGE,
-        pMessageByteLength: *mut ::SIZE_T
-    ) -> ::HRESULT,
-    fn GetNumMessagesAllowedByStorageFilter(&mut self) -> ::UINT64,
-    fn GetNumMessagesDeniedByStorageFilter(&mut self) -> ::UINT64,
-    fn GetNumStoredMessages(&mut self) -> ::UINT64,
-    fn GetNumStoredMessagesAllowedByRetrievalFilter(&mut self) -> ::UINT64,
-    fn GetNumMessagesDiscardedByMessageCountLimit(&mut self) -> ::UINT64,
-    fn GetMessageCountLimit(&mut self) -> ::UINT64,
-    fn AddStorageFilterEntries(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn GetStorageFilter(
-        &mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER, pFilterByteLength: *mut ::SIZE_T
-    ) -> ::HRESULT,
-    fn ClearStorageFilter(&mut self) -> (),
-    fn PushEmptyStorageFilter(&mut self) -> ::HRESULT,
-    fn PushCopyOfStorageFilter(&mut self) -> ::HRESULT,
-    fn PushStorageFilter(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn PopStorageFilter(&mut self) -> (),
-    fn GetStorageFilterStackSize(&mut self) -> ::UINT,
-    fn AddRetrievalFilterEntries(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn GetRetrievalFilter(
-        &mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER, pFilterByteLength: *mut ::SIZE_T
-    ) -> ::HRESULT,
-    fn ClearRetrievalFilter(&mut self) -> (),
-    fn PushEmptyRetrievalFilter(&mut self) -> ::HRESULT,
-    fn PushCopyOfRetrievalFilter(&mut self) -> ::HRESULT,
-    fn PushRetrievalFilter(&mut self, pFilter: *mut ::D3D12_INFO_QUEUE_FILTER) -> ::HRESULT,
-    fn PopRetrievalFilter(&mut self) -> (),
-    fn GetRetrievalFilterStackSize(&mut self) -> ::UINT,
-    fn AddMessage(
-        &mut self, Category: ::D3D12_MESSAGE_CATEGORY, Severity: ::D3D12_MESSAGE_SEVERITY,
-        ID: ::D3D12_MESSAGE_ID, pDescription: ::LPCSTR
-    ) -> ::HRESULT,
-    fn AddApplicationMessage(
-        &mut self, Severity: ::D3D12_MESSAGE_SEVERITY, pDescription: ::LPCSTR
-    ) -> ::HRESULT,
-    fn SetBreakOnCategory(
-        &mut self, Category: ::D3D12_MESSAGE_CATEGORY, bEnable: ::BOOL
-    ) -> ::HRESULT,
-    fn SetBreakOnSeverity(
-        &mut self, Severity: ::D3D12_MESSAGE_SEVERITY, bEnable: ::BOOL
-    ) -> ::HRESULT,
-    fn SetBreakOnID(&mut self, ID: ::D3D12_MESSAGE_ID, bEnable: ::BOOL) -> ::HRESULT,
-    fn GetBreakOnCategory(&mut self, Category: ::D3D12_MESSAGE_CATEGORY) -> ::BOOL,
-    fn GetBreakOnSeverity(&mut self, Severity: ::D3D12_MESSAGE_SEVERITY) -> ::BOOL,
-    fn GetBreakOnID(&mut self, ID: ::D3D12_MESSAGE_ID) -> ::BOOL,
-    fn SetMuteDebugOutput(&mut self, bMute: ::BOOL) -> (),
-    fn GetMuteDebugOutput(&mut self) -> ::BOOL
-}}
diff --git a/vendor/winapi-0.2.8/src/d3d12shader.rs b/vendor/winapi-0.2.8/src/d3d12shader.rs
deleted file mode 100644
index bd210b25d4..0000000000
--- a/vendor/winapi-0.2.8/src/d3d12shader.rs
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright © 2016; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-FLAGS!{ enum D3D12_SHADER_VERSION_TYPE {
-    D3D12_SHVER_PIXEL_SHADER = 0x0,
-    D3D12_SHVER_VERTEX_SHADER = 0x1,
-    D3D12_SHVER_GEOMETRY_SHADER = 0x2,
-    D3D12_SHVER_HULL_SHADER = 0x3,
-    D3D12_SHVER_DOMAIN_SHADER = 0x4,
-    D3D12_SHVER_COMPUTE_SHADER = 0x5,
-    D3D12_SHVER_RESERVED0 = 0xFFF0,
-}}
-
-STRUCT!{struct D3D12_FUNCTION_DESC {
-    Version: ::UINT,
-    Creator: ::LPCSTR,
-    Flags: ::UINT,
-    ConstantBuffers: ::UINT,
-    BoundResources: ::UINT,
-    InstructionCount: ::UINT,
-    TempRegisterCount: ::UINT,
-    TempArrayCount: ::UINT,
-    DefCount: ::UINT,
-    DclCount: ::UINT,
-    TextureNormalInstructions: ::UINT,
-    TextureLoadInstructions: ::UINT,
-    TextureCompInstructions: ::UINT,
-    TextureBiasInstructions: ::UINT,
-    TextureGradientInstructions: ::UINT,
-    FloatInstructionCount: ::UINT,
-    IntInstructionCount: ::UINT,
-    UintInstructionCount: ::UINT,
-    StaticFlowControlCount: ::UINT,
-    DynamicFlowControlCount: ::UINT,
-    MacroInstructionCount: ::UINT,
-    ArrayInstructionCount: ::UINT,
-    MovInstructionCount: ::UINT,
-    MovcInstructionCount: ::UINT,
-    ConversionInstructionCount: ::UINT,
-    BitwiseInstructionCount: ::UINT,
-    MinFeatureLevel: ::D3D_FEATURE_LEVEL,
-    RequiredFeatureFlags: ::UINT64,
-    Name: ::LPCSTR,
-    FunctionParameterCount: ::INT,
-    HasReturn: ::BOOL,
-    Has10Level9VertexShader: ::BOOL,
-    Has10Level9PixelShader: ::BOOL,
-}}
-
-STRUCT!{struct D3D12_LIBRARY_DESC {
-    Creator: ::LPCSTR,
-    Flags: ::UINT,
-    FunctionCount: ::UINT,
-}}
-
-STRUCT!{struct D3D12_PARAMETER_DESC {
-    Name: ::LPCSTR,
-    SemanticName: ::LPCSTR,
-    Type: ::D3D_SHADER_VARIABLE_TYPE,
-    Class: ::D3D_SHADER_VARIABLE_CLASS,
-    Rows: ::UINT,
-    Columns: ::UINT,
-    InterpolationMode: ::D3D_INTERPOLATION_MODE,
-    Flags: ::D3D_PARAMETER_FLAGS,
-    FirstInRegister: ::UINT,
-    FirstInComponent: ::UINT,
-    FirstOutRegister: ::UINT,
-    FirstOutComponent: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_BUFFER_DESC {
-    Name: ::LPCSTR,
-    Type: ::D3D_CBUFFER_TYPE,
-    Variables: ::UINT,
-    Size: ::UINT,
-    uFlags: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_DESC {
-    Version: ::UINT,
-    Creator: ::LPCSTR,
-    Flags: ::UINT,
-    ConstantBuffers: ::UINT,
-    BoundResources: ::UINT,
-    InputParameters: ::UINT,
-    OutputParameters: ::UINT,
-    InstructionCount: ::UINT,
-    TempRegisterCount: ::UINT,
-    TempArrayCount: ::UINT,
-    DefCount: ::UINT,
-    DclCount: ::UINT,
-    TextureNormalInstructions: ::UINT,
-    TextureLoadInstructions: ::UINT,
-    TextureCompInstructions: ::UINT,
-    TextureBiasInstructions: ::UINT,
-    TextureGradientInstructions: ::UINT,
-    FloatInstructionCount: ::UINT,
-    IntInstructionCount: ::UINT,
-    UintInstructionCount: ::UINT,
-    StaticFlowControlCount: ::UINT,
-    DynamicFlowControlCount: ::UINT,
-    MacroInstructionCount: ::UINT,
-    ArrayInstructionCount: ::UINT,
-    CutInstructionCount: ::UINT,
-    EmitInstructionCount: ::UINT,
-    GSOutputTopology: ::D3D_PRIMITIVE_TOPOLOGY,
-    GSMaxOutputVertexCount: ::UINT,
-    InputPrimitive: ::D3D_PRIMITIVE,
-    PatchConstantParameters: ::UINT,
-    cGSInstanceCount: ::UINT,
-    cControlPoints: ::UINT,
-    HSOutputPrimitive: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE,
-    HSPartitioning: ::D3D_TESSELLATOR_PARTITIONING,
-    TessellatorDomain: ::D3D_TESSELLATOR_DOMAIN,
-    cBarrierInstructions: ::UINT,
-    cInterlockedInstructions: ::UINT,
-    cTextureStoreInstructions: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_INPUT_BIND_DESC {
-    Name: ::LPCSTR,
-    Type: ::D3D_SHADER_INPUT_TYPE,
-    BindPoint: ::UINT,
-    BindCount: ::UINT,
-    uFlags: ::UINT,
-    ReturnType: ::D3D_RESOURCE_RETURN_TYPE,
-    Dimension: ::D3D_SRV_DIMENSION,
-    NumSamples: ::UINT,
-    Space: ::UINT,
-    uID: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SHADER_TYPE_DESC {
-    Class: ::D3D_SHADER_VARIABLE_CLASS,
-    Type: ::D3D_SHADER_VARIABLE_TYPE,
-    Rows: ::UINT,
-    Columns: ::UINT,
-    Elements: ::UINT,
-    Members: ::UINT,
-    Offset: ::UINT,
-    Name: ::LPCSTR,
-}}
-
-STRUCT!{struct D3D12_SHADER_VARIABLE_DESC {
-    Name: ::LPCSTR,
-    StartOffset: ::UINT,
-    Size: ::UINT,
-    uFlags: ::UINT,
-    DefaultValue: ::LPVOID,
-    StartTexture: ::UINT,
-    TextureSize: ::UINT,
-    StartSampler: ::UINT,
-    SamplerSize: ::UINT,
-}}
-
-STRUCT!{struct D3D12_SIGNATURE_PARAMETER_DESC {
-    SemanticName: ::LPCSTR,
-    SemanticIndex: ::UINT,
-    Register: ::UINT,
-    SystemValueType: ::D3D_NAME,
-    ComponentType: ::D3D_REGISTER_COMPONENT_TYPE,
-    Mask: ::BYTE,
-    ReadWriteMask: ::BYTE,
-    Stream: ::UINT,
-    MinPrecision: ::D3D_MIN_PRECISION,
-}}
-
-RIDL!(
-interface ID3D12FunctionParameterReflection(ID3D12FunctionParameterReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_PARAMETER_DESC) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12FunctionReflection(ID3D12FunctionReflectionVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_FUNCTION_DESC) -> ::HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, BufferIndex: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: ::UINT, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetVariableByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: ::LPCSTR, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetFunctionParameter(
-        &mut self, ParameterIndex: ::INT
-    ) -> *mut ::ID3D12FunctionParameterReflection
-});
-
-RIDL!(
-interface ID3D12LibraryReflection(ID3D12LibraryReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryInterface(
-        &mut self, iid: *const ::IID, ppv: *mut ::LPVOID
-    ) -> ::HRESULT,
-    fn AddRef(&mut self) -> ::ULONG,
-    fn Release(&mut self) -> ::ULONG,
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_LIBRARY_DESC) -> ::HRESULT,
-    fn GetFunctionByIndex(
-        &mut self, FunctionIndex: ::INT
-    ) -> *mut ::ID3D12FunctionReflection
-});
-
-RIDL!(
-interface ID3D12ShaderReflectionConstantBuffer(ID3D12ShaderReflectionConstantBufferVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_SHADER_BUFFER_DESC) -> ::HRESULT,
-    fn GetVariableByIndex(
-        &mut self, Index: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionVariable,
-    fn GetVariableByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionVariable
-});
-
-RIDL!(
-interface ID3D12ShaderReflectionType(ID3D12ShaderReflectionTypeVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_SHADER_TYPE_DESC) -> ::HRESULT,
-    fn GetMemberTypeByIndex(
-        &mut self, Index: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetMemberTypeByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetMemberTypeName(&mut self, Index: ::UINT) -> ::LPCSTR,
-    fn IsEqual(
-        &mut self, pType: *mut ::ID3D12ShaderReflectionType
-    ) -> ::HRESULT,
-    fn GetSubType(&mut self) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetBaseClass(&mut self) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetNumInterfaces(&mut self) -> ::UINT,
-    fn GetInterfaceByIndex(
-        &mut self, uIndex: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionType,
-    fn IsOfType(
-        &mut self, pType: *mut ::ID3D12ShaderReflectionType
-    ) -> ::HRESULT,
-    fn ImplementsInterface(
-        &mut self, pBase: *mut ::ID3D12ShaderReflectionType
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface ID3D12ShaderReflectionVariable(ID3D12ShaderReflectionVariableVtbl) {
-    fn GetDesc(
-        &mut self, pDesc: *mut ::D3D12_SHADER_VARIABLE_DESC
-    ) -> ::HRESULT,
-    fn GetType(&mut self) -> *mut ::ID3D12ShaderReflectionType,
-    fn GetBuffer(&mut self) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetInterfaceSlot(&mut self, uArrayIndex: ::UINT) -> ::UINT
-});
-
-RIDL!(
-interface ID3D12ShaderReflection(ID3D12ShaderReflectionVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryInterface(
-        &mut self, iid: *const ::IID, ppv: *mut ::LPVOID
-    ) -> ::HRESULT,
-    fn AddRef(&mut self) -> ::ULONG,
-    fn Release(&mut self) -> ::ULONG,
-    fn GetDesc(&mut self, pDesc: *mut ::D3D12_SHADER_DESC) -> ::HRESULT,
-    fn GetConstantBufferByIndex(
-        &mut self, Index: ::UINT
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetConstantBufferByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionConstantBuffer,
-    fn GetResourceBindingDesc(
-        &mut self, ResourceIndex: ::UINT, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetInputParameterDesc(
-        &mut self, ParameterIndex: ::UINT, pDesc: *mut ::D3D12_SIGNATURE_PARAMETER_DESC
-    ) -> ::HRESULT,
-    fn GetOutputParameterDesc(
-        &mut self, ParameterIndex: ::UINT, pDesc: *mut ::D3D12_SIGNATURE_PARAMETER_DESC
-    ) -> ::HRESULT,
-    fn GetPatchConstantParameterDesc(
-        &mut self, ParameterIndex: ::UINT, pDesc: *mut ::D3D12_SIGNATURE_PARAMETER_DESC
-    ) -> ::HRESULT,
-    fn GetVariableByName(
-        &mut self, Name: ::LPCSTR
-    ) -> *mut ::ID3D12ShaderReflectionVariable,
-    fn GetResourceBindingDescByName(
-        &mut self, Name: ::LPCSTR, pDesc: *mut ::D3D12_SHADER_INPUT_BIND_DESC
-    ) -> ::HRESULT,
-    fn GetMovInstructionCount(&mut self) -> ::UINT,
-    fn GetMovcInstructionCount(&mut self) -> ::UINT,
-    fn GetConversionInstructionCount(&mut self) -> ::UINT,
-    fn GetBitwiseInstructionCount(&mut self) -> ::UINT,
-    fn GetGSInputPrimitive(&mut self) -> ::D3D_PRIMITIVE,
-    fn IsSampleFrequencyShader(&mut self) -> ::BOOL,
-    fn GetNumInterfaceSlots(&mut self) -> ::UINT,
-    fn GetMinFeatureLevel(
-        &mut self, pLevel: *mut ::D3D_FEATURE_LEVEL
-    ) -> ::HRESULT,
-    fn GetThreadGroupSize(
-        &mut self, pSizeX: *mut ::UINT, pSizeY: *mut ::UINT, pSizeZ: *mut ::UINT
-    ) -> ::UINT,
-    fn GetRequiresFlags(&mut self) -> ::UINT64
-});
-
-pub type D3D12_CBUFFER_TYPE = ::D3D_CBUFFER_TYPE;
-pub type D3D12_RESOURCE_RETURN_TYPE = ::D3D_RESOURCE_RETURN_TYPE;
-pub type D3D12_TESSELLATOR_DOMAIN = ::D3D_TESSELLATOR_DOMAIN;
-pub type D3D12_TESSELLATOR_OUTPUT_PRIMITIVE = ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE;
-pub type D3D12_TESSELLATOR_PARTITIONING = ::D3D_TESSELLATOR_PARTITIONING;
-pub type LPD3D12FUNCTIONPARAMETERREFLECTION = *mut ::ID3D12FunctionParameterReflection;
-pub type LPD3D12FUNCTIONREFLECTION = *mut ::ID3D12FunctionReflection;
-pub type LPD3D12LIBRARYREFLECTION = *mut ::ID3D12LibraryReflection;
-pub type LPD3D12SHADERREFLECTION = *mut ::ID3D12ShaderReflection;
-pub type LPD3D12SHADERREFLECTIONCONSTANTBUFFER = *mut ::ID3D12ShaderReflectionConstantBuffer;
-pub type LPD3D12SHADERREFLECTIONTYPE = *mut ::ID3D12ShaderReflectionType;
-pub type LPD3D12SHADERREFLECTIONVARIABLE = *mut ::ID3D12ShaderReflectionVariable;
-pub const D3D_SHADER_REQUIRES_INNER_COVERAGE: ::UINT64 = 0x00000400;
-pub const D3D_SHADER_REQUIRES_ROVS: ::UINT64 = 0x00001000;
-pub const D3D_SHADER_REQUIRES_STENCIL_REF: ::UINT64 = 0x00000200;
-pub const D3D_SHADER_REQUIRES_TYPED_UAV_LOAD_ADDITIONAL_FORMATS: ::UINT64 = 0x00000800;
-pub const D3D_SHADER_REQUIRES_VIEWPORT_AND_RT_ARRAY_INDEX_FROM_ANY_SHADER_FEEDING_RASTERIZER: ::UINT64 = 0x00002000;
diff --git a/vendor/winapi-0.2.8/src/d3d9.rs b/vendor/winapi-0.2.8/src/d3d9.rs
deleted file mode 100644
index 26f9031d06..0000000000
--- a/vendor/winapi-0.2.8/src/d3d9.rs
+++ /dev/null
@@ -1,713 +0,0 @@
-// Copyright © 2015, Corey Richardson
-// Licensed under the MIT License <LICENSE.md>
-//! Direct3D include file
-pub const D3D_SDK_VERSION: ::DWORD = 32;
-pub const D3D9b_SDK_VERSION: ::DWORD = 31;
-RIDL!(
-interface IDirect3D9(IDirect3D9Vtbl): IUnknown(IUnknownVtbl) {
-    fn RegisterSoftwareDevice(&mut self, pInitializeFunction: *mut ::VOID) -> ::HRESULT,
-    fn GetAdapterCount(&mut self) -> ::UINT,
-    fn GetAdapterIdentifier(
-        &mut self, Adapter: ::UINT, Flags: ::DWORD, pIdentifier: *mut ::D3DADAPTER_IDENTIFIER9
-    ) -> ::HRESULT,
-    fn GetAdapterModeCount(&mut self, Adapter: ::UINT, Format: ::D3DFORMAT) -> ::UINT,
-    fn EnumAdapterModes(
-        &mut self, Adapter: ::UINT, Format: ::D3DFORMAT, Mode: ::UINT, pMode: *mut ::D3DDISPLAYMODE
-    ) -> ::HRESULT,
-    fn GetAdapterDisplayMode(
-        &mut self, Adapter: ::UINT, pMode: *mut ::D3DDISPLAYMODE
-    ) -> ::HRESULT,
-    fn CheckDeviceType(
-        &mut self, Adapter: ::UINT, DevType: ::D3DDEVTYPE, AdapterFormat: ::D3DFORMAT,
-        BackBufferFormat: ::D3DFORMAT, bWindowed: ::BOOL
-    ) -> ::HRESULT,
-    fn CheckDeviceFormat(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, AdapterFormat: ::D3DFORMAT,
-        Usage: ::DWORD, RType: ::D3DRESOURCETYPE, CheckFormat: ::D3DFORMAT
-    ) -> ::HRESULT,
-    fn CheckDeviceMultiSampleType(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, SurfaceFormat: ::D3DFORMAT,
-        Windowed: ::BOOL, MultiSampleType: ::D3DMULTISAMPLE_TYPE, pQualityLevels: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn CheckDepthStencilMatch(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, AdapterFormat: ::D3DFORMAT,
-        RenderTargetFormat: ::D3DFORMAT, DepthStencilFormat: ::D3DFORMAT
-    ) -> ::HRESULT,
-    fn CheckDeviceFormatConversion(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, SourceFormat: ::D3DFORMAT,
-        TargetFormat: ::D3DFORMAT
-    ) -> ::HRESULT,
-    fn GetDeviceCaps(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, pCaps: *mut ::D3DCAPS9
-    ) -> ::HRESULT,
-    fn GetAdapterMonitor(&mut self, Adapter: ::UINT) -> ::HMONITOR,
-    fn CreateDevice(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, hFocusWindow: ::HWND,
-        BehaviorFlags: ::DWORD, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        ppReturnedDeviceInterface: *mut *mut IDirect3DDevice9
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3D9 = *mut IDirect3D9;
-pub type PDIRECT3D9 = *mut IDirect3D9;
-RIDL!(
-interface IDirect3DDevice9(IDirect3DDevice9Vtbl): IUnknown(IUnknownVtbl) {
-    fn TestCooperativeLevel(&mut self) -> ::HRESULT,
-    fn GetAvailableTextureMem(&mut self) -> ::UINT,
-    fn EvictManagedResources(&mut self) -> ::HRESULT,
-    fn GetDirect3D(&mut self, ppD3D9: *mut *mut IDirect3D9) -> ::HRESULT,
-    fn GetDeviceCaps(&mut self, pCaps: *mut ::D3DCAPS9) -> ::HRESULT,
-    fn GetDisplayMode(&mut self, iSwapChain: ::UINT, pMode: *mut ::D3DDISPLAYMODE) -> ::HRESULT,
-    fn GetCreationParameters(
-        &mut self, pParameters: *mut ::D3DDEVICE_CREATION_PARAMETERS
-    ) -> ::HRESULT,
-    fn SetCursorProperties(
-        &mut self, XHotSpot: ::UINT, YHotSpot: ::UINT, pCursorBitmap: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn SetCursorPosition(&mut self, X: ::INT, Y: ::INT, Flags: ::DWORD) -> (),
-    fn ShowCursor(&mut self, bShow: ::BOOL) -> ::BOOL,
-    fn CreateAdditionalSwapChain(
-        &mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        pSwapChain: *mut *mut IDirect3DSwapChain9
-    ) -> ::HRESULT,
-    fn GetSwapChain(
-        &mut self, iSwapChain: ::UINT, pSwapChain: *mut *mut IDirect3DSwapChain9
-    ) -> ::HRESULT,
-    fn GetNumberOfSwapChains(&mut self) -> ::UINT,
-    fn Reset(&mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS) -> ::HRESULT,
-    fn Present(
-        &mut self, pSourceRect: *const ::RECT, pDestRect: *const ::RECT,
-        hDestWindowOverride: ::HWND, pDirtyRegion: *const ::RGNDATA
-    ) -> ::HRESULT,
-    fn GetBackBuffer(
-        &mut self, iSwapChain: ::UINT, iBackBuffer: ::UINT, Type: ::D3DBACKBUFFER_TYPE,
-        ppBackBuffer: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetRasterStatus(
-        &mut self, iSwapChain: ::UINT, pRasterStatus: *mut ::D3DRASTER_STATUS
-    ) -> ::HRESULT,
-    fn SetDialogBoxMode(&mut self, bEnableDialogs: ::BOOL) -> ::HRESULT,
-    fn SetGammaRamp(
-        &mut self, iSwapChain: ::UINT, Flags: ::DWORD, pRamp: *const ::D3DGAMMARAMP
-    ) -> (),
-    fn GetGammaRamp(&mut self, iSwapChain: ::UINT, pRamp: *mut ::D3DGAMMARAMP) -> (),
-    fn CreateTexture(
-        &mut self, Width: ::UINT, Height: ::UINT, Levels: ::UINT, Usage: ::DWORD,
-        Format: ::D3DFORMAT, Pool: ::D3DPOOL, ppTexture: *mut *mut IDirect3DTexture9,
-        pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateVolumeTexture(
-        &mut self, Width: ::UINT, Height: ::UINT, Depth: ::UINT, Levels: ::UINT, Usage: ::DWORD,
-        Format: ::D3DFORMAT, Pool: ::D3DPOOL, ppVolumeTexture: *mut *mut IDirect3DVolumeTexture9,
-        pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateCubeTexture(
-        &mut self, EdgeLength: ::UINT, Levels: ::UINT, Usage: ::DWORD, Format: ::D3DFORMAT,
-        Pool: ::D3DPOOL, ppCubeTexture: *mut *mut IDirect3DCubeTexture9,
-        pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateVertexBuffer(
-        &mut self, Length: ::UINT, Usage: ::DWORD, FVF: ::DWORD, Pool: ::D3DPOOL,
-        ppVertexBuffer: *mut *mut IDirect3DVertexBuffer9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateIndexBuffer(
-        &mut self, Length: ::UINT, Usage: ::DWORD, Format: ::D3DFORMAT, Pool: ::D3DPOOL,
-        ppIndexBuffer: *mut *mut IDirect3DIndexBuffer9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateRenderTarget(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Lockable: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateDepthStencilSurface(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Discard: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn UpdateSurface(
-        &mut self, pSourceSurface: *mut IDirect3DSurface9, pSourceRect: *const ::RECT,
-        pDestinationSurface: *mut IDirect3DSurface9, pDestPoint: *const ::POINT
-    ) -> ::HRESULT,
-    fn UpdateTexture(
-        &mut self, pSourceTexture: *mut IDirect3DBaseTexture9,
-        pDestinationTexture: *mut IDirect3DBaseTexture9
-    ) -> ::HRESULT,
-    fn GetRenderTargetData(
-        &mut self, pRenderTarget: *mut IDirect3DSurface9, pDestSurface: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetFrontBufferData(
-        &mut self, iSwapChain: ::UINT, pDestSurface: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn StretchRect(
-        &mut self, pSourceSurface: *mut IDirect3DSurface9, pSourceRect: *const ::RECT,
-        pDestSurface: *mut IDirect3DSurface9, pDestRect: *const ::RECT,
-        Filter: ::D3DTEXTUREFILTERTYPE
-    ) -> ::HRESULT,
-    fn ColorFill(
-        &mut self, pSurface: *mut IDirect3DSurface9, pRect: *const ::RECT, color: ::D3DCOLOR
-    ) -> ::HRESULT,
-    fn CreateOffscreenPlainSurface(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT, Pool: ::D3DPOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn SetRenderTarget(
-        &mut self, RenderTargetIndex: ::DWORD, pRenderTarget: *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetRenderTarget(
-        &mut self, RenderTargetIndex: ::DWORD, ppRenderTarget: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn SetDepthStencilSurface(&mut self, pNewZStencil: *mut IDirect3DSurface9) -> ::HRESULT,
-    fn GetDepthStencilSurface(
-        &mut self, ppZStencilSurface: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn BeginScene(&mut self) -> ::HRESULT,
-    fn EndScene(&mut self) -> ::HRESULT,
-    fn Clear(
-        &mut self, Count: ::DWORD, pRects: *const ::D3DRECT, Flags: ::DWORD, Color: ::D3DCOLOR,
-        Z: ::FLOAT, Stencil: ::DWORD
-    ) -> ::HRESULT,
-    fn SetTransform(
-        &mut self, State: ::D3DTRANSFORMSTATETYPE, pMatrix: *const ::D3DMATRIX
-    ) -> ::HRESULT,
-    fn GetTransform(
-        &mut self, State: ::D3DTRANSFORMSTATETYPE, pMatrix: *mut ::D3DMATRIX
-    ) -> ::HRESULT,
-    fn MultiplyTransform(
-        &mut self, arg1: ::D3DTRANSFORMSTATETYPE, arg2: *const ::D3DMATRIX
-    ) -> ::HRESULT,
-    fn SetViewport(&mut self, pViewport: *const ::D3DVIEWPORT9) -> ::HRESULT,
-    fn GetViewport(&mut self, pViewport: *mut ::D3DVIEWPORT9) -> ::HRESULT,
-    fn SetMaterial(&mut self, pMaterial: *const ::D3DMATERIAL9) -> ::HRESULT,
-    fn GetMaterial(&mut self, pMaterial: *mut ::D3DMATERIAL9) -> ::HRESULT,
-    fn SetLight(&mut self, Index: ::DWORD, arg1: *const ::D3DLIGHT9) -> ::HRESULT,
-    fn GetLight(&mut self, Index: ::DWORD, arg1: *mut ::D3DLIGHT9) -> ::HRESULT,
-    fn LightEnable(&mut self, Index: ::DWORD, Enable: ::BOOL) -> ::HRESULT,
-    fn GetLightEnable(&mut self, Index: ::DWORD, pEnable: *mut ::BOOL) -> ::HRESULT,
-    fn SetClipPlane(&mut self, Index: ::DWORD, pPlane: *const ::FLOAT) -> ::HRESULT,
-    fn GetClipPlane(&mut self, Index: ::DWORD, pPlane: *mut ::FLOAT) -> ::HRESULT,
-    fn SetRenderState(&mut self, State: ::D3DRENDERSTATETYPE, Value: ::DWORD) -> ::HRESULT,
-    fn GetRenderState(&mut self, State: ::D3DRENDERSTATETYPE, pValue: *mut ::DWORD) -> ::HRESULT,
-    fn CreateStateBlock(
-        &mut self, Type: ::D3DSTATEBLOCKTYPE, ppSB: *mut *mut IDirect3DStateBlock9
-    ) -> ::HRESULT,
-    fn BeginStateBlock(&mut self) -> ::HRESULT,
-    fn EndStateBlock(&mut self, ppSB: *mut *mut IDirect3DStateBlock9) -> ::HRESULT,
-    fn SetClipStatus(&mut self, pClipStatus: *const ::D3DCLIPSTATUS9) -> ::HRESULT,
-    fn GetClipStatus(&mut self, pClipStatus: *mut ::D3DCLIPSTATUS9) -> ::HRESULT,
-    fn GetTexture(
-        &mut self, Stage: ::DWORD, ppTexture: *mut *mut IDirect3DBaseTexture9
-    ) -> ::HRESULT,
-    fn SetTexture(&mut self, Stage: ::DWORD, pTexture: *mut IDirect3DBaseTexture9) -> ::HRESULT,
-    fn GetTextureStageState(
-        &mut self, Stage: ::DWORD, Type: ::D3DTEXTURESTAGESTATETYPE, pValue: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn SetTextureStageState(
-        &mut self, Stage: ::DWORD, Type: ::D3DTEXTURESTAGESTATETYPE, Value: ::DWORD
-    ) -> ::HRESULT,
-    fn GetSamplerState(
-        &mut self, Sampler: ::DWORD, Type: ::D3DSAMPLERSTATETYPE, pValue: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn SetSamplerState(
-        &mut self, Sampler: ::DWORD, Type: ::D3DSAMPLERSTATETYPE, Value: ::DWORD
-    ) -> ::HRESULT,
-    fn ValidateDevice(&mut self, pNumPasses: *mut ::DWORD) -> ::HRESULT,
-    fn SetPaletteEntries(
-        &mut self, PaletteNumber: ::UINT, pEntries: *const ::PALETTEENTRY
-    ) -> ::HRESULT,
-    fn GetPaletteEntries(
-        &mut self, PaletteNumber: ::UINT, pEntries: *mut ::PALETTEENTRY
-    ) -> ::HRESULT,
-    fn SetCurrentTexturePalette(&mut self, PaletteNumber: ::UINT) -> ::HRESULT,
-    fn GetCurrentTexturePalette(&mut self, PaletteNumber: *mut ::UINT) -> ::HRESULT,
-    fn SetScissorRect(&mut self, pRect: *const ::RECT) -> ::HRESULT,
-    fn GetScissorRect(&mut self, pRect: *mut ::RECT) -> ::HRESULT,
-    fn SetSoftwareVertexProcessing(&mut self, bSoftware: ::BOOL) -> ::HRESULT,
-    fn GetSoftwareVertexProcessing(&mut self) -> ::BOOL,
-    fn SetNPatchMode(&mut self, nSegments: ::FLOAT) -> ::HRESULT,
-    fn GetNPatchMode(&mut self) -> ::FLOAT,
-    fn DrawPrimitive(
-        &mut self, PrimitiveType: ::D3DPRIMITIVETYPE, StartVertex: ::UINT, PrimitiveCount: ::UINT
-    ) -> ::HRESULT,
-    fn DrawIndexedPrimitive(
-        &mut self, arg1: ::D3DPRIMITIVETYPE, BaseVertexIndex: ::INT, MinVertexIndex: ::UINT,
-        NumVertices: ::UINT, startIndex: ::UINT, primCount: ::UINT
-    ) -> ::HRESULT,
-    fn DrawPrimitiveUP(
-        &mut self, PrimitiveType: ::D3DPRIMITIVETYPE, PrimitiveCount: ::UINT,
-        pVertexStreamZeroData: *const ::VOID, VertexStreamZeroStride: ::UINT
-    ) -> ::HRESULT,
-    fn DrawIndexedPrimitiveUP(
-        &mut self, PrimitiveType: ::D3DPRIMITIVETYPE, MinVertexIndex: ::UINT, NumVertices: ::UINT,
-        PrimitiveCount: ::UINT, pIndexData: *const ::VOID, IndexDataFormat: ::D3DFORMAT,
-        pVertexStreamZeroData: *const ::VOID, VertexStreamZeroStride: ::UINT
-    ) -> ::HRESULT,
-    fn ProcessVertices(
-        &mut self, SrcStartIndex: ::UINT, DestIndex: ::UINT, VertexCount: ::UINT,
-        pDestBuffer: *mut IDirect3DVertexBuffer9, pVertexDecl: *mut IDirect3DVertexDeclaration9,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn CreateVertexDeclaration(
-        &mut self, pVertexElements: *const ::D3DVERTEXELEMENT9,
-        ppDecl: *mut *mut IDirect3DVertexDeclaration9
-    ) -> ::HRESULT,
-    fn SetVertexDeclaration(&mut self, pDecl: *mut IDirect3DVertexDeclaration9) -> ::HRESULT,
-    fn GetVertexDeclaration(&mut self, ppDecl: *mut *mut IDirect3DVertexDeclaration9) -> ::HRESULT,
-    fn SetFVF(&mut self, FVF: ::DWORD) -> ::HRESULT,
-    fn GetFVF(&mut self, pFVF: *mut ::DWORD) -> ::HRESULT,
-    fn CreateVertexShader(
-        &mut self, pFunction: *const ::DWORD, ppShader: *mut *mut IDirect3DVertexShader9
-    ) -> ::HRESULT,
-    fn SetVertexShader(&mut self, pShader: *mut IDirect3DVertexShader9) -> ::HRESULT,
-    fn GetVertexShader(&mut self, ppShader: *mut *mut IDirect3DVertexShader9) -> ::HRESULT,
-    fn SetVertexShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetVertexShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetVertexShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetVertexShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetVertexShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetVertexShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetStreamSource(
-        &mut self, StreamNumber: ::UINT, pStreamData: *mut IDirect3DVertexBuffer9,
-        OffsetInBytes: ::UINT, Stride: ::UINT
-    ) -> ::HRESULT,
-    fn GetStreamSource(
-        &mut self, StreamNumber: ::UINT, ppStreamData: *mut *mut IDirect3DVertexBuffer9,
-        pOffsetInBytes: *mut ::UINT, pStride: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetStreamSourceFreq(&mut self, StreamNumber: ::UINT, Setting: ::UINT) -> ::HRESULT,
-    fn GetStreamSourceFreq(&mut self, StreamNumber: ::UINT, pSetting: *mut ::UINT) -> ::HRESULT,
-    fn SetIndices(&mut self, pIndexData: *mut IDirect3DIndexBuffer9) -> ::HRESULT,
-    fn GetIndices(&mut self, ppIndexData: *mut *mut IDirect3DIndexBuffer9) -> ::HRESULT,
-    fn CreatePixelShader(
-        &mut self, pFunction: *const ::DWORD, ppShader: *mut *mut IDirect3DPixelShader9
-    ) -> ::HRESULT,
-    fn SetPixelShader(&mut self, pShader: *mut IDirect3DPixelShader9) -> ::HRESULT,
-    fn GetPixelShader(&mut self, ppShader: *mut *mut IDirect3DPixelShader9) -> ::HRESULT,
-    fn SetPixelShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetPixelShaderConstantF(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::FLOAT, Vector4fCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetPixelShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetPixelShaderConstantI(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::INT, Vector4iCount: ::UINT
-    ) -> ::HRESULT,
-    fn SetPixelShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *const ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn GetPixelShaderConstantB(
-        &mut self, StartRegister: ::UINT, pConstantData: *mut ::BOOL, BoolCount: ::UINT
-    ) -> ::HRESULT,
-    fn DrawRectPatch(
-        &mut self, Handle: ::UINT, pNumSegs: *const ::FLOAT,
-        pRectPatchInfo: *const ::D3DRECTPATCH_INFO
-    ) -> ::HRESULT,
-    fn DrawTriPatch(
-        &mut self, Handle: ::UINT, pNumSegs: *const ::FLOAT,
-        pTriPatchInfo: *const ::D3DTRIPATCH_INFO
-    ) -> ::HRESULT,
-    fn DeletePatch(&mut self, Handle: ::UINT) -> ::HRESULT,
-    fn CreateQuery(
-        &mut self, Type: ::D3DQUERYTYPE, ppQuery: *mut *mut IDirect3DQuery9
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DDEVICE9 = *mut IDirect3DDevice9;
-pub type PDIRECT3DDEVICE9 = *mut IDirect3DDevice9;
-RIDL!(
-interface IDirect3DStateBlock9(IDirect3DStateBlock9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn Capture(&mut self) -> ::HRESULT,
-    fn Apply(&mut self) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSTATEBLOCK9 = *mut IDirect3DStateBlock9;
-pub type PDIRECT3DSTATEBLOCK9 = *mut IDirect3DStateBlock9;
-RIDL!(
-interface IDirect3DSwapChain9(IDirect3DSwapChain9Vtbl): IUnknown(IUnknownVtbl) {
-    fn Present(
-        &mut self, pSourceRect: *const ::RECT, pDestRect: *const ::RECT,
-        hDestWindowOverride: ::HWND, pDirtyRegion: *const ::RGNDATA, dwFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetFrontBufferData(&mut self, pDestSurface: *mut IDirect3DSurface9) -> ::HRESULT,
-    fn GetBackBuffer(
-        &mut self, iBackBuffer: ::UINT, Type: ::D3DBACKBUFFER_TYPE,
-        ppBackBuffer: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn GetRasterStatus(&mut self, pRasterStatus: *mut ::D3DRASTER_STATUS) -> ::HRESULT,
-    fn GetDisplayMode(&mut self, pMode: *mut ::D3DDISPLAYMODE) -> ::HRESULT,
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetPresentParameters(
-        &mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSWAPCHAIN9 = *mut IDirect3DSwapChain9;
-pub type PDIRECT3DSWAPCHAIN9 = *mut IDirect3DSwapChain9;
-RIDL!(
-interface IDirect3DResource9(IDirect3DResource9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn SetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *const ::VOID, SizeOfData: ::DWORD,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *mut ::VOID, pSizeOfData: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn FreePrivateData(&mut self, refguid: *const ::GUID) -> ::HRESULT,
-    fn SetPriority(&mut self, PriorityNew: ::DWORD) -> ::DWORD,
-    fn GetPriority(&mut self) -> ::DWORD,
-    fn PreLoad(&mut self) -> (),
-    fn GetType(&mut self) -> ::D3DRESOURCETYPE
-}
-);
-pub type LPDIRECT3DRESOURCE9 = *mut IDirect3DResource9;
-pub type PDIRECT3DRESOURCE9 = *mut IDirect3DResource9;
-RIDL!(
-interface IDirect3DVertexDeclaration9(IDirect3DVertexDeclaration9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetDeclaration(
-        &mut self, pElement: *mut ::D3DVERTEXELEMENT9, pNumElements: *mut ::UINT
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVERTEXDECLARATION9 = *mut IDirect3DVertexDeclaration9;
-pub type PDIRECT3DVERTEXDECLARATION9 = *mut IDirect3DVertexDeclaration9;
-RIDL!(
-interface IDirect3DVertexShader9(IDirect3DVertexShader9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetFunction(&mut self, arg1: *mut ::VOID, pSizeOfData: *mut ::UINT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVERTEXSHADER9 = *mut IDirect3DVertexShader9;
-pub type PDIRECT3DVERTEXSHADER9 = *mut IDirect3DVertexShader9;
-RIDL!(
-interface IDirect3DPixelShader9(IDirect3DPixelShader9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetFunction(&mut self, arg1: *mut ::VOID, pSizeOfData: *mut ::UINT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DPIXELSHADER9 = *mut IDirect3DPixelShader9;
-pub type PDIRECT3DPIXELSHADER9 = *mut IDirect3DPixelShader9;
-RIDL!(
-interface IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn SetLOD(&mut self, LODNew: ::DWORD) -> ::DWORD,
-    fn GetLOD(&mut self) -> ::DWORD,
-    fn GetLevelCount(&mut self) -> ::DWORD,
-    fn SetAutoGenFilterType(&mut self, FilterType: ::D3DTEXTUREFILTERTYPE) -> ::HRESULT,
-    fn GetAutoGenFilterType(&mut self) -> ::D3DTEXTUREFILTERTYPE,
-    fn GenerateMipSubLevels(&mut self) -> ()
-}
-);
-pub type LPDIRECT3DBASETEXTURE9 = *mut IDirect3DBaseTexture9;
-pub type PDIRECT3DBASETEXTURE9 = *mut IDirect3DBaseTexture9;
-RIDL!(
-interface IDirect3DTexture9(IDirect3DTexture9Vtbl): IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl) {
-    fn GetLevelDesc(&mut self, Level: ::UINT, pDesc: *mut ::D3DSURFACE_DESC) -> ::HRESULT,
-    fn GetSurfaceLevel(
-        &mut self, Level: ::UINT, ppSurfaceLevel: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn LockRect(
-        &mut self, Level: ::UINT, pLockedRect: *mut ::D3DLOCKED_RECT, pRect: *const ::RECT,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRect(&mut self, Level: ::UINT) -> ::HRESULT,
-    fn AddDirtyRect(&mut self, pDirtyRect: *const ::RECT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DTEXTURE9 = *mut IDirect3DTexture9;
-pub type PDIRECT3DTEXTURE9 = *mut IDirect3DTexture9;
-RIDL!(
-interface IDirect3DVolumeTexture9(IDirect3DVolumeTexture9Vtbl): IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl) {
-    fn GetLevelDesc(&mut self, Level: ::UINT, pDesc: *mut ::D3DVOLUME_DESC) -> ::HRESULT,
-    fn GetVolumeLevel(
-        &mut self, Level: ::UINT, ppVolumeLevel: *mut *mut IDirect3DVolume9
-    ) -> ::HRESULT,
-    fn LockBox(
-        &mut self, Level: ::UINT, pLockedVolume: *mut ::D3DLOCKED_BOX, pBox: *const ::D3DBOX,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockBox(&mut self, Level: ::UINT) -> ::HRESULT,
-    fn AddDirtyBox(&mut self, pDirtyBox: *const ::D3DBOX) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVOLUMETEXTURE9 = *mut IDirect3DVolumeTexture9;
-pub type PDIRECT3DVOLUMETEXTURE9 = *mut IDirect3DVolumeTexture9;
-RIDL!(
-interface IDirect3DCubeTexture9(IDirect3DCubeTexture9Vtbl): IDirect3DBaseTexture9(IDirect3DBaseTexture9Vtbl) {
-    fn GetLevelDesc(&mut self, Level: ::UINT, pDesc: *mut ::D3DSURFACE_DESC) -> ::HRESULT,
-    fn GetCubeMapSurface(
-        &mut self, FaceType: ::D3DCUBEMAP_FACES, Level: ::UINT,
-        ppCubeMapSurface: *mut *mut IDirect3DSurface9
-    ) -> ::HRESULT,
-    fn LockRect(
-        &mut self, FaceType: ::D3DCUBEMAP_FACES, Level: ::UINT, pLockedRect: *mut ::D3DLOCKED_RECT,
-        pRect: *const ::RECT, Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRect(&mut self, FaceType: ::D3DCUBEMAP_FACES, Level: ::UINT) -> ::HRESULT,
-    fn AddDirtyRect(
-        &mut self, FaceType: ::D3DCUBEMAP_FACES, pDirtyRect: *const ::RECT
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DCUBETEXTURE9 = *mut IDirect3DCubeTexture9;
-pub type PDIRECT3DCUBETEXTURE9 = *mut IDirect3DCubeTexture9;
-RIDL!(
-interface IDirect3DVertexBuffer9(IDirect3DVertexBuffer9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn Lock(
-        &mut self, OffsetToLock: ::UINT, SizeToLock: ::UINT, ppbData: *mut *mut ::VOID,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn Unlock(&mut self) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DVERTEXBUFFER_DESC) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVERTEXBUFFER9 = *mut IDirect3DVertexBuffer9;
-pub type PDIRECT3DVERTEXBUFFER9 = *mut IDirect3DVertexBuffer9;
-RIDL!(
-interface IDirect3DIndexBuffer9(IDirect3DIndexBuffer9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn Lock(
-        &mut self, OffsetToLock: ::UINT, SizeToLock: ::UINT, ppbData: *mut *mut ::VOID,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn Unlock(&mut self) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DINDEXBUFFER_DESC) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DINDEXBUFFER9 = *mut IDirect3DIndexBuffer9;
-pub type PDIRECT3DINDEXBUFFER9 = *mut IDirect3DIndexBuffer9;
-RIDL!(
-interface IDirect3DSurface9(IDirect3DSurface9Vtbl): IDirect3DResource9(IDirect3DResource9Vtbl) {
-    fn GetContainer(&mut self, riid: *const ::IID, ppContainer: *mut *mut ::VOID) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DSURFACE_DESC) -> ::HRESULT,
-    fn LockRect(
-        &mut self, pLockedRect: *mut ::D3DLOCKED_RECT, pRect: *const ::RECT, Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRect(&mut self) -> ::HRESULT,
-    fn GetDC(&mut self, phdc: *mut ::HDC) -> ::HRESULT,
-    fn ReleaseDC(&mut self, hdc: ::HDC) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSURFACE9 = *mut IDirect3DSurface9;
-pub type PDIRECT3DSURFACE9 = *mut IDirect3DSurface9;
-RIDL!(
-interface IDirect3DVolume9(IDirect3DVolume9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn SetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *const ::VOID, SizeOfData: ::DWORD,
-        Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetPrivateData(
-        &mut self, refguid: *const ::GUID, pData: *mut ::VOID, pSizeOfData: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn FreePrivateData(&mut self, refguid: *const ::GUID) -> ::HRESULT,
-    fn GetContainer(&mut self, riid: *const ::IID, ppContainer: *mut *mut ::VOID) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut ::D3DVOLUME_DESC) -> ::HRESULT,
-    fn LockBox(
-        &mut self, pLockedVolume: *mut ::D3DLOCKED_BOX, pBox: *const ::D3DBOX, Flags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockBox(&mut self) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DVOLUME9 = *mut IDirect3DVolume9;
-pub type PDIRECT3DVOLUME9 = *mut IDirect3DVolume9;
-RIDL!(
-interface IDirect3DQuery9(IDirect3DQuery9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetDevice(&mut self, ppDevice: *mut *mut IDirect3DDevice9) -> ::HRESULT,
-    fn GetType(&mut self) -> ::D3DRESOURCETYPE,
-    fn GetDataSize(&mut self) -> ::DWORD,
-    fn Issue(&mut self, dwIssueFlags: ::DWORD) -> ::HRESULT,
-    fn GetData(
-        &mut self, pData: *mut ::VOID, dwSize: ::DWORD, dwGetDataFlags: ::DWORD
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DQUERY9 = *mut IDirect3DQuery9;
-pub type PDIRECT3DQUERY9 = *mut IDirect3DQuery9;
-pub const D3DCREATE_FPU_PRESERVE: ::DWORD = 0x2;
-pub const D3DCREATE_MULTITHREADED: ::DWORD = 0x4;
-pub const D3DCREATE_PUREDEVICE: ::DWORD = 0x10;
-pub const D3DCREATE_SOFTWARE_VERTEXPROCESSING: ::DWORD = 0x20;
-pub const D3DCREATE_HARDWARE_VERTEXPROCESSING: ::DWORD = 0x40;
-pub const D3DCREATE_MIXED_VERTEXPROCESSING: ::DWORD = 0x80;
-pub const D3DCREATE_DISABLE_DRIVER_MANAGEMENT: ::DWORD = 0x100;
-pub const D3DCREATE_ADAPTERGROUP_DEVICE: ::DWORD = 0x200;
-pub const D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX: ::DWORD = 0x400;
-pub const D3DCREATE_NOWINDOWCHANGES: ::DWORD = 0x800;
-pub const D3DCREATE_DISABLE_PSGP_THREADING: ::DWORD = 0x2000;
-pub const D3DCREATE_ENABLE_PRESENTSTATS: ::DWORD = 0x4000;
-pub const D3DCREATE_DISABLE_PRESENTSTATS: ::DWORD = 0x8000;
-pub const D3DCREATE_SCREENSAVER: ::DWORD = 0x10000000;
-pub const D3DADAPTER_DEFAULT: ::DWORD = 0;
-RIDL!(
-interface IDirect3D9Ex(IDirect3D9ExVtbl): IDirect3D9(IDirect3D9Vtbl) {
-    fn GetAdapterModeCountEx(
-        &mut self, Adapter: ::UINT, pFilter: *const ::D3DDISPLAYMODEFILTER
-    ) -> ::UINT,
-    fn EnumAdapterModesEx(
-        &mut self, Adapter: ::UINT, pFilter: *const ::D3DDISPLAYMODEFILTER, Mode: ::UINT,
-        pMode: *mut ::D3DDISPLAYMODEEX
-    ) -> ::HRESULT,
-    fn GetAdapterDisplayModeEx(
-        &mut self, Adapter: ::UINT, pMode: *mut ::D3DDISPLAYMODEEX,
-        pRotation: *mut ::D3DDISPLAYROTATION
-    ) -> ::HRESULT,
-    fn CreateDeviceEx(
-        &mut self, Adapter: ::UINT, DeviceType: ::D3DDEVTYPE, hFocusWindow: ::HWND,
-        BehaviorFlags: ::DWORD, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        pFullscreenDisplayMode: *mut ::D3DDISPLAYMODEEX,
-        ppReturnedDeviceInterface: *mut *mut IDirect3DDevice9Ex
-    ) -> ::HRESULT,
-    fn GetAdapterLUID(&mut self, Adapter: ::UINT, pLUID: *mut ::LUID) -> ::HRESULT
-}
-);
-pub type LPDIRECT3D9EX = *mut IDirect3D9Ex;
-pub type PDIRECT3D9EX = *mut IDirect3D9Ex;
-RIDL!(
-interface IDirect3DDevice9Ex(IDirect3DDevice9ExVtbl): IDirect3DDevice9(IDirect3DDevice9Vtbl) {
-    fn SetConvolutionMonoKernel(
-        &mut self, width: ::UINT, height: ::UINT, rows: *mut ::FLOAT, columns: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn ComposeRects(
-        &mut self, pSrc: *mut IDirect3DSurface9, pDst: *mut IDirect3DSurface9,
-        pSrcRectDescs: *mut IDirect3DVertexBuffer9, NumRects: ::UINT,
-        pDstRectDescs: *mut IDirect3DVertexBuffer9, Operation: ::D3DCOMPOSERECTSOP, Xoffset: ::INT,
-        Yoffset: ::INT
-    ) -> ::HRESULT,
-    fn PresentEx(
-        &mut self, pSourceRect: *const ::RECT, pDestRect: *const ::RECT,
-        hDestWindowOverride: ::HWND, pDirtyRegion: *const ::RGNDATA, dwFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn GetGPUThreadPriority(&mut self, pPriority: *mut ::INT) -> ::HRESULT,
-    fn SetGPUThreadPriority(&mut self, Priority: ::INT) -> ::HRESULT,
-    fn WaitForVBlank(&mut self, iSwapChain: ::UINT) -> ::HRESULT,
-    fn CheckResourceResidency(
-        &mut self, pResourceArray: *mut *mut IDirect3DResource9, NumResources: ::UINT32
-    ) -> ::HRESULT,
-    fn SetMaximumFrameLatency(&mut self, MaxLatency: ::UINT) -> ::HRESULT,
-    fn GetMaximumFrameLatency(&mut self, pMaxLatency: *mut ::UINT) -> ::HRESULT,
-    fn CheckDeviceState(&mut self, hDestinationWindow: ::HWND) -> ::HRESULT,
-    fn CreateRenderTargetEx(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Lockable: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE, Usage: ::DWORD
-    ) -> ::HRESULT,
-    fn CreateOffscreenPlainSurfaceEx(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT, Pool: ::D3DPOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE, Usage: ::DWORD
-    ) -> ::HRESULT,
-    fn CreateDepthStencilSurfaceEx(
-        &mut self, Width: ::UINT, Height: ::UINT, Format: ::D3DFORMAT,
-        MultiSample: ::D3DMULTISAMPLE_TYPE, MultisampleQuality: ::DWORD, Discard: ::BOOL,
-        ppSurface: *mut *mut IDirect3DSurface9, pSharedHandle: *mut ::HANDLE, Usage: ::DWORD
-    ) -> ::HRESULT,
-    fn ResetEx(
-        &mut self, pPresentationParameters: *mut ::D3DPRESENT_PARAMETERS,
-        pFullscreenDisplayMode: *mut ::D3DDISPLAYMODEEX
-    ) -> ::HRESULT,
-    fn GetDisplayModeEx(
-        &mut self, iSwapChain: ::UINT, pMode: *mut ::D3DDISPLAYMODEEX,
-        pRotation: *mut ::D3DDISPLAYROTATION
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DDEVICE9EX = *mut IDirect3DDevice9Ex;
-pub type PDIRECT3DDEVICE9EX = *mut IDirect3DDevice9Ex;
-RIDL!(
-interface IDirect3DSwapChain9Ex(IDirect3DSwapChain9ExVtbl): IDirect3DSwapChain9(IDirect3DSwapChain9Vtbl) {
-    fn GetLastPresentCount(&mut self, pLastPresentCount: *mut ::UINT) -> ::HRESULT,
-    fn GetPresentStats(&mut self, pPresentationStatistics: *mut ::D3DPRESENTSTATS) -> ::HRESULT,
-    fn GetDisplayModeEx(
-        &mut self, pMode: *mut ::D3DDISPLAYMODEEX, pRotation: *mut ::D3DDISPLAYROTATION
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DSWAPCHAIN9EX = *mut IDirect3DSwapChain9Ex;
-pub type PDIRECT3DSWAPCHAIN9EX = *mut IDirect3DSwapChain9Ex;
-RIDL!(
-interface IDirect3D9ExOverlayExtension(IDirect3D9ExOverlayExtensionVtbl): IUnknown(IUnknownVtbl) {
-    fn CheckDeviceOverlayType(
-        &mut self, Adapter: ::UINT, DevType: ::D3DDEVTYPE, OverlayWidth: ::UINT,
-        OverlayHeight: ::UINT, OverlayFormat: ::D3DFORMAT, pDisplayMode: *mut ::D3DDISPLAYMODEEX,
-        DisplayRotation: ::D3DDISPLAYROTATION, pOverlayCaps: *mut ::D3DOVERLAYCAPS
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3D9EXOVERLAYEXTENSION = *mut IDirect3D9ExOverlayExtension;
-pub type PDIRECT3D9EXOVERLAYEXTENSION = *mut IDirect3D9ExOverlayExtension;
-RIDL!(
-interface IDirect3DDevice9Video(IDirect3DDevice9VideoVtbl): IUnknown(IUnknownVtbl) {
-    fn GetContentProtectionCaps(
-        &mut self, pCryptoType: *const ::GUID, pDecodeProfile: *const ::GUID,
-        pCaps: *mut ::D3DCONTENTPROTECTIONCAPS
-    ) -> ::HRESULT,
-    fn CreateAuthenticatedChannel(
-        &mut self, ChannelType: ::D3DAUTHENTICATEDCHANNELTYPE,
-        ppAuthenticatedChannel: *mut *mut IDirect3DAuthenticatedChannel9,
-        pChannelHandle: *mut ::HANDLE
-    ) -> ::HRESULT,
-    fn CreateCryptoSession(
-        &mut self, pCryptoType: *const ::GUID, pDecodeProfile: *const ::GUID,
-        ppCryptoSession: *mut *mut IDirect3DCryptoSession9, pCryptoHandle: *mut ::HANDLE
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DDEVICE9VIDEO = *mut IDirect3DDevice9Video;
-pub type PDIRECT3DDEVICE9VIDEO = *mut IDirect3DDevice9Video;
-RIDL!(
-interface IDirect3DAuthenticatedChannel9(IDirect3DAuthenticatedChannel9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCertificate(&mut self, CertifacteSize: ::UINT, ppCertificate: *mut ::BYTE) -> ::HRESULT,
-    fn NegotiateKeyExchange(&mut self, DataSize: ::UINT, pData: *mut ::VOID) -> ::HRESULT,
-    fn Query(
-        &mut self, InputSize: ::UINT, pInput: *const ::VOID, OutputSize: ::UINT,
-        pOutput: *mut ::VOID
-    ) -> ::HRESULT,
-    fn Configure(
-        &mut self, InputSize: ::UINT, pInput: *const ::VOID,
-        pOutput: *mut ::D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT
-    ) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DAUTHENTICATEDCHANNEL9 = *mut IDirect3DAuthenticatedChannel9;
-pub type PDIRECT3DAUTHENTICATEDCHANNEL9 = *mut IDirect3DAuthenticatedChannel9;
-RIDL!(
-interface IDirect3DCryptoSession9(IDirect3DCryptoSession9Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetCertificateSize(&mut self, pCertificateSize: *mut ::UINT) -> ::HRESULT,
-    fn GetCertificate(&mut self, CertifacteSize: ::UINT, ppCertificate: *mut ::BYTE) -> ::HRESULT,
-    fn NegotiateKeyExchange(&mut self, DataSize: ::UINT, pData: *mut ::VOID) -> ::HRESULT,
-    fn EncryptionBlt(
-        &mut self, pSrcSurface: *mut IDirect3DSurface9, pDstSurface: *mut IDirect3DSurface9,
-        DstSurfaceSize: ::UINT, pIV: *mut ::VOID
-    ) -> ::HRESULT,
-    fn DecryptionBlt(
-        &mut self, pSrcSurface: *mut IDirect3DSurface9, pDstSurface: *mut IDirect3DSurface9,
-        SrcSurfaceSize: ::UINT, pEncryptedBlockInfo: *mut ::D3DENCRYPTED_BLOCK_INFO,
-        pContentKey: *mut ::VOID, pIV: *mut ::VOID
-    ) -> ::HRESULT,
-    fn GetSurfacePitch(
-        &mut self, pSrcSurface: *mut IDirect3DSurface9, pSurfacePitch: *mut ::UINT
-    ) -> ::HRESULT,
-    fn StartSessionKeyRefresh(
-        &mut self, pRandomNumber: *mut ::VOID, RandomNumberSize: ::UINT
-    ) -> ::HRESULT,
-    fn FinishSessionKeyRefresh(&mut self) -> ::HRESULT,
-    fn GetEncryptionBltKey(&mut self, pReadbackKey: *mut ::VOID, KeySize: ::UINT) -> ::HRESULT
-}
-);
-pub type LPDIRECT3DCRYPTOSESSION9 = *mut IDirect3DCryptoSession9;
-pub type PDIRECT3DCRYPTOSESSION9 = *mut IDirect3DCryptoSession9;
diff --git a/vendor/winapi-0.2.8/src/d3d9caps.rs b/vendor/winapi-0.2.8/src/d3d9caps.rs
deleted file mode 100644
index 74c877d7b6..0000000000
--- a/vendor/winapi-0.2.8/src/d3d9caps.rs
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright © 2015, Corey Richardson
-// Licensed under the MIT License <LICENSE.md>
-//! Direct3D capabilities include file
-STRUCT!{struct D3DVSHADERCAPS2_0 {
-    Caps: ::DWORD,
-    DynamicFlowControlDepth: ::INT,
-    NumTemps: ::INT,
-    StaticFlowControlDepth: ::INT,
-}}
-pub const D3DVS20CAPS_PREDICATION: ::DWORD = 1 << 0;
-pub const D3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 24;
-pub const D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 0;
-pub const D3DVS20_MAX_NUMTEMPS: ::DWORD = 32;
-pub const D3DVS20_MIN_NUMTEMPS: ::DWORD = 12;
-pub const D3DVS20_MAX_STATICFLOWCONTROLDEPTH: ::DWORD = 4;
-pub const D3DVS20_MIN_STATICFLOWCONTROLDEPTH: ::DWORD = 1;
-STRUCT!{struct D3DPSHADERCAPS2_0 {
-    Caps: ::DWORD,
-    DynamicFlowControlDepth: ::INT,
-    NumTemps: ::INT,
-    StaticFlowControlDepth: ::INT,
-    NumInstructionSlots: ::INT,
-}}
-pub const D3DPS20CAPS_ARBITRARYSWIZZLE: ::DWORD = 1 << 0;
-pub const D3DPS20CAPS_GRADIENTINSTRUCTIONS: ::DWORD = 1 << 1;
-pub const D3DPS20CAPS_PREDICATION: ::DWORD = 1 << 2;
-pub const D3DPS20CAPS_NODEPENDENTREADLIMIT: ::DWORD = 1 << 3;
-pub const D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT: ::DWORD = 1 << 4;
-pub const D3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 24;
-pub const D3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH: ::DWORD = 0;
-pub const D3DPS20_MAX_NUMTEMPS: ::DWORD = 32;
-pub const D3DPS20_MIN_NUMTEMPS: ::DWORD = 12;
-pub const D3DPS20_MAX_STATICFLOWCONTROLDEPTH: ::DWORD = 4;
-pub const D3DPS20_MIN_STATICFLOWCONTROLDEPTH: ::DWORD = 0;
-pub const D3DPS20_MAX_NUMINSTRUCTIONSLOTS: ::DWORD = 512;
-pub const D3DPS20_MIN_NUMINSTRUCTIONSLOTS: ::DWORD = 96;
-pub const D3DMIN30SHADERINSTRUCTIONS: ::DWORD = 512;
-pub const D3DMAX30SHADERINSTRUCTIONS: ::DWORD = 32768;
-STRUCT!{struct D3DOVERLAYCAPS {
-    Caps: ::UINT,
-    MaxOverlayDisplayWidth: ::UINT,
-    MaxOverlayDisplayHeight: ::UINT,
-}}
-pub const D3DOVERLAYCAPS_FULLRANGERGB: ::DWORD = 0x00000001;
-pub const D3DOVERLAYCAPS_LIMITEDRANGERGB: ::DWORD = 0x00000002;
-pub const D3DOVERLAYCAPS_YCbCr_BT601: ::DWORD = 0x00000004;
-pub const D3DOVERLAYCAPS_YCbCr_BT709: ::DWORD = 0x00000008;
-pub const D3DOVERLAYCAPS_YCbCr_BT601_xvYCC: ::DWORD = 0x00000010;
-pub const D3DOVERLAYCAPS_YCbCr_BT709_xvYCC: ::DWORD = 0x00000020;
-pub const D3DOVERLAYCAPS_STRETCHX: ::DWORD = 0x00000040;
-pub const D3DOVERLAYCAPS_STRETCHY: ::DWORD = 0x00000080;
-STRUCT!{struct D3DCONTENTPROTECTIONCAPS {
-    Caps: ::DWORD,
-    KeyExchangeType: ::GUID,
-    BufferAlignmentStart: ::UINT,
-    BlockAlignmentSize: ::UINT,
-    ProtectedMemorySize: ::ULONGLONG,
-}}
-pub const D3DCPCAPS_SOFTWARE: ::DWORD = 0x00000001;
-pub const D3DCPCAPS_HARDWARE: ::DWORD = 0x00000002;
-pub const D3DCPCAPS_PROTECTIONALWAYSON: ::DWORD = 0x00000004;
-pub const D3DCPCAPS_PARTIALDECRYPTION: ::DWORD = 0x00000008;
-pub const D3DCPCAPS_CONTENTKEY: ::DWORD = 0x00000010;
-pub const D3DCPCAPS_FRESHENSESSIONKEY: ::DWORD = 0x00000020;
-pub const D3DCPCAPS_ENCRYPTEDREADBACK: ::DWORD = 0x00000040;
-pub const D3DCPCAPS_ENCRYPTEDREADBACKKEY: ::DWORD = 0x00000080;
-pub const D3DCPCAPS_SEQUENTIAL_CTR_IV: ::DWORD = 0x00000100;
-pub const D3DCPCAPS_ENCRYPTSLICEDATAONLY: ::DWORD = 0x00000200;
-STRUCT!{struct D3DCAPS9 {
-    DeviceType: ::D3DDEVTYPE,
-    AdapterOrdinal: ::UINT,
-    Caps: ::DWORD,
-    Caps2: ::DWORD,
-    Caps3: ::DWORD,
-    PresentationIntervals: ::DWORD,
-    CursorCaps: ::DWORD,
-    DevCaps: ::DWORD,
-    PrimitiveMiscCaps: ::DWORD,
-    RasterCaps: ::DWORD,
-    ZCmpCaps: ::DWORD,
-    SrcBlendCaps: ::DWORD,
-    DestBlendCaps: ::DWORD,
-    AlphaCmpCaps: ::DWORD,
-    ShadeCaps: ::DWORD,
-    TextureCaps: ::DWORD,
-    TextureFilterCaps: ::DWORD,
-    CubeTextureFilterCaps: ::DWORD,
-    VolumeTextureFilterCaps: ::DWORD,
-    TextureAddressCaps: ::DWORD,
-    VolumeTextureAddressCaps: ::DWORD,
-    LineCaps: ::DWORD,
-    MaxTextureWidth: ::DWORD,
-    MaxTextureHeight: ::DWORD,
-    MaxVolumeExtent: ::DWORD,
-    MaxTextureRepeat: ::DWORD,
-    MaxTextureAspectRatio: ::DWORD,
-    MaxAnisotropy: ::DWORD,
-    MaxVertexW: ::c_float,
-    GuardBandLeft: ::c_float,
-    GuardBandTop: ::c_float,
-    GuardBandRight: ::c_float,
-    GuardBandBottom: ::c_float,
-    ExtentsAdjust: ::c_float,
-    StencilCaps: ::DWORD,
-    FVFCaps: ::DWORD,
-    TextureOpCaps: ::DWORD,
-    MaxTextureBlendStages: ::DWORD,
-    MaxSimultaneousTextures: ::DWORD,
-    VertexProcessingCaps: ::DWORD,
-    MaxActiveLights: ::DWORD,
-    MaxUserClipPlanes: ::DWORD,
-    MaxVertexBlendMatrices: ::DWORD,
-    MaxVertexBlendMatrixIndex: ::DWORD,
-    MaxPointSize: ::c_float,
-    MaxPrimitiveCount: ::DWORD,
-    MaxVertexIndex: ::DWORD,
-    MaxStreams: ::DWORD,
-    MaxStreamStride: ::DWORD,
-    VertexShaderVersion: ::DWORD,
-    MaxVertexShaderConst: ::DWORD,
-    PixelShaderVersion: ::DWORD,
-    PixelShader1xMaxValue: ::c_float,
-    DevCaps2: ::DWORD,
-    MaxNpatchTessellationLevel: ::c_float,
-    Reserved5: ::DWORD,
-    MasterAdapterOrdinal: ::UINT,
-    AdapterOrdinalInGroup: ::UINT,
-    NumberOfAdaptersInGroup: ::UINT,
-    DeclTypes: ::DWORD,
-    NumSimultaneousRTs: ::DWORD,
-    StretchRectFilterCaps: ::DWORD,
-    VS20Caps: ::D3DVSHADERCAPS2_0,
-    PS20Caps: ::D3DPSHADERCAPS2_0,
-    VertexTextureFilterCaps: ::DWORD,
-    MaxVShaderInstructionsExecuted: ::DWORD,
-    MaxPShaderInstructionsExecuted: ::DWORD,
-    MaxVertexShader30InstructionSlots: ::DWORD,
-    MaxPixelShader30InstructionSlots: ::DWORD,
-}}
-pub const D3DCAPS_OVERLAY: ::DWORD = 0x00000800;
-pub const D3DCAPS_READ_SCANLINE: ::DWORD = 0x00020000;
-pub const D3DCAPS2_FULLSCREENGAMMA: ::DWORD = 0x00020000;
-pub const D3DCAPS2_CANCALIBRATEGAMMA: ::DWORD = 0x00100000;
-pub const D3DCAPS2_RESERVED: ::DWORD = 0x02000000;
-pub const D3DCAPS2_CANMANAGERESOURCE: ::DWORD = 0x10000000;
-pub const D3DCAPS2_DYNAMICTEXTURES: ::DWORD = 0x20000000;
-pub const D3DCAPS2_CANAUTOGENMIPMAP: ::DWORD = 0x40000000;
-pub const D3DCAPS2_CANSHARERESOURCE: ::DWORD = 0x80000000;
-pub const D3DCAPS3_RESERVED: ::DWORD = 0x8000001f;
-pub const D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD: ::DWORD = 0x00000020;
-pub const D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION: ::DWORD = 0x00000080;
-pub const D3DCAPS3_COPY_TO_VIDMEM: ::DWORD = 0x00000100;
-pub const D3DCAPS3_COPY_TO_SYSTEMMEM: ::DWORD = 0x00000200;
-pub const D3DCAPS3_DXVAHD: ::DWORD = 0x00000400;
-pub const D3DCAPS3_DXVAHD_LIMITED: ::DWORD = 0x00000800;
-pub const D3DPRESENT_INTERVAL_DEFAULT: ::DWORD = 0x00000000;
-pub const D3DPRESENT_INTERVAL_ONE: ::DWORD = 0x00000001;
-pub const D3DPRESENT_INTERVAL_TWO: ::DWORD = 0x00000002;
-pub const D3DPRESENT_INTERVAL_THREE: ::DWORD = 0x00000004;
-pub const D3DPRESENT_INTERVAL_FOUR: ::DWORD = 0x00000008;
-pub const D3DPRESENT_INTERVAL_IMMEDIATE: ::DWORD = 0x80000000;
-pub const D3DCURSORCAPS_COLOR: ::DWORD = 0x00000001;
-pub const D3DCURSORCAPS_LOWRES: ::DWORD = 0x00000002;
-pub const D3DDEVCAPS_EXECUTESYSTEMMEMORY: ::DWORD = 0x00000010;
-pub const D3DDEVCAPS_EXECUTEVIDEOMEMORY: ::DWORD = 0x00000020;
-pub const D3DDEVCAPS_TLVERTEXSYSTEMMEMORY: ::DWORD = 0x00000040;
-pub const D3DDEVCAPS_TLVERTEXVIDEOMEMORY: ::DWORD = 0x00000080;
-pub const D3DDEVCAPS_TEXTURESYSTEMMEMORY: ::DWORD = 0x00000100;
-pub const D3DDEVCAPS_TEXTUREVIDEOMEMORY: ::DWORD = 0x00000200;
-pub const D3DDEVCAPS_DRAWPRIMTLVERTEX: ::DWORD = 0x00000400;
-pub const D3DDEVCAPS_CANRENDERAFTERFLIP: ::DWORD = 0x00000800;
-pub const D3DDEVCAPS_TEXTURENONLOCALVIDMEM: ::DWORD = 0x00001000;
-pub const D3DDEVCAPS_DRAWPRIMITIVES2: ::DWORD = 0x00002000;
-pub const D3DDEVCAPS_SEPARATETEXTUREMEMORIES: ::DWORD = 0x00004000;
-pub const D3DDEVCAPS_DRAWPRIMITIVES2EX: ::DWORD = 0x00008000;
-pub const D3DDEVCAPS_HWTRANSFORMANDLIGHT: ::DWORD = 0x00010000;
-pub const D3DDEVCAPS_CANBLTSYSTONONLOCAL: ::DWORD = 0x00020000;
-pub const D3DDEVCAPS_HWRASTERIZATION: ::DWORD = 0x00080000;
-pub const D3DDEVCAPS_PUREDEVICE: ::DWORD = 0x00100000;
-pub const D3DDEVCAPS_QUINTICRTPATCHES: ::DWORD = 0x00200000;
-pub const D3DDEVCAPS_RTPATCHES: ::DWORD = 0x00400000;
-pub const D3DDEVCAPS_RTPATCHHANDLEZERO: ::DWORD = 0x00800000;
-pub const D3DDEVCAPS_NPATCHES: ::DWORD = 0x01000000;
-pub const D3DPMISCCAPS_MASKZ: ::DWORD = 0x00000002;
-pub const D3DPMISCCAPS_CULLNONE: ::DWORD = 0x00000010;
-pub const D3DPMISCCAPS_CULLCW: ::DWORD = 0x00000020;
-pub const D3DPMISCCAPS_CULLCCW: ::DWORD = 0x00000040;
-pub const D3DPMISCCAPS_COLORWRITEENABLE: ::DWORD = 0x00000080;
-pub const D3DPMISCCAPS_CLIPPLANESCALEDPOINTS: ::DWORD = 0x00000100;
-pub const D3DPMISCCAPS_CLIPTLVERTS: ::DWORD = 0x00000200;
-pub const D3DPMISCCAPS_TSSARGTEMP: ::DWORD = 0x00000400;
-pub const D3DPMISCCAPS_BLENDOP: ::DWORD = 0x00000800;
-pub const D3DPMISCCAPS_NULLREFERENCE: ::DWORD = 0x00001000;
-pub const D3DPMISCCAPS_INDEPENDENTWRITEMASKS: ::DWORD = 0x00004000;
-pub const D3DPMISCCAPS_PERSTAGECONSTANT: ::DWORD = 0x00008000;
-pub const D3DPMISCCAPS_FOGANDSPECULARALPHA: ::DWORD = 0x00010000;
-pub const D3DPMISCCAPS_SEPARATEALPHABLEND: ::DWORD = 0x00020000;
-pub const D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS: ::DWORD = 0x00040000;
-pub const D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING: ::DWORD = 0x00080000;
-pub const D3DPMISCCAPS_FOGVERTEXCLAMPED: ::DWORD = 0x00100000;
-pub const D3DPMISCCAPS_POSTBLENDSRGBCONVERT: ::DWORD = 0x00200000;
-pub const D3DLINECAPS_TEXTURE: ::DWORD = 0x00000001;
-pub const D3DLINECAPS_ZTEST: ::DWORD = 0x00000002;
-pub const D3DLINECAPS_BLEND: ::DWORD = 0x00000004;
-pub const D3DLINECAPS_ALPHACMP: ::DWORD = 0x00000008;
-pub const D3DLINECAPS_FOG: ::DWORD = 0x00000010;
-pub const D3DLINECAPS_ANTIALIAS: ::DWORD = 0x00000020;
-pub const D3DPRASTERCAPS_DITHER: ::DWORD = 0x00000001;
-pub const D3DPRASTERCAPS_ZTEST: ::DWORD = 0x00000010;
-pub const D3DPRASTERCAPS_FOGVERTEX: ::DWORD = 0x00000080;
-pub const D3DPRASTERCAPS_FOGTABLE: ::DWORD = 0x00000100;
-pub const D3DPRASTERCAPS_MIPMAPLODBIAS: ::DWORD = 0x00002000;
-pub const D3DPRASTERCAPS_ZBUFFERLESSHSR: ::DWORD = 0x00008000;
-pub const D3DPRASTERCAPS_FOGRANGE: ::DWORD = 0x00010000;
-pub const D3DPRASTERCAPS_ANISOTROPY: ::DWORD = 0x00020000;
-pub const D3DPRASTERCAPS_WBUFFER: ::DWORD = 0x00040000;
-pub const D3DPRASTERCAPS_WFOG: ::DWORD = 0x00100000;
-pub const D3DPRASTERCAPS_ZFOG: ::DWORD = 0x00200000;
-pub const D3DPRASTERCAPS_COLORPERSPECTIVE: ::DWORD = 0x00400000;
-pub const D3DPRASTERCAPS_SCISSORTEST: ::DWORD = 0x01000000;
-pub const D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS: ::DWORD = 0x02000000;
-pub const D3DPRASTERCAPS_DEPTHBIAS: ::DWORD = 0x04000000;
-pub const D3DPRASTERCAPS_MULTISAMPLE_TOGGLE: ::DWORD = 0x08000000;
-pub const D3DPCMPCAPS_NEVER: ::DWORD = 0x00000001;
-pub const D3DPCMPCAPS_LESS: ::DWORD = 0x00000002;
-pub const D3DPCMPCAPS_EQUAL: ::DWORD = 0x00000004;
-pub const D3DPCMPCAPS_LESSEQUAL: ::DWORD = 0x00000008;
-pub const D3DPCMPCAPS_GREATER: ::DWORD = 0x00000010;
-pub const D3DPCMPCAPS_NOTEQUAL: ::DWORD = 0x00000020;
-pub const D3DPCMPCAPS_GREATEREQUAL: ::DWORD = 0x00000040;
-pub const D3DPCMPCAPS_ALWAYS: ::DWORD = 0x00000080;
-pub const D3DPBLENDCAPS_ZERO: ::DWORD = 0x00000001;
-pub const D3DPBLENDCAPS_ONE: ::DWORD = 0x00000002;
-pub const D3DPBLENDCAPS_SRCCOLOR: ::DWORD = 0x00000004;
-pub const D3DPBLENDCAPS_INVSRCCOLOR: ::DWORD = 0x00000008;
-pub const D3DPBLENDCAPS_SRCALPHA: ::DWORD = 0x00000010;
-pub const D3DPBLENDCAPS_INVSRCALPHA: ::DWORD = 0x00000020;
-pub const D3DPBLENDCAPS_DESTALPHA: ::DWORD = 0x00000040;
-pub const D3DPBLENDCAPS_INVDESTALPHA: ::DWORD = 0x00000080;
-pub const D3DPBLENDCAPS_DESTCOLOR: ::DWORD = 0x00000100;
-pub const D3DPBLENDCAPS_INVDESTCOLOR: ::DWORD = 0x00000200;
-pub const D3DPBLENDCAPS_SRCALPHASAT: ::DWORD = 0x00000400;
-pub const D3DPBLENDCAPS_BOTHSRCALPHA: ::DWORD = 0x00000800;
-pub const D3DPBLENDCAPS_BOTHINVSRCALPHA: ::DWORD = 0x00001000;
-pub const D3DPBLENDCAPS_BLENDFACTOR: ::DWORD = 0x00002000;
-pub const D3DPBLENDCAPS_SRCCOLOR2: ::DWORD = 0x00004000;
-pub const D3DPBLENDCAPS_INVSRCCOLOR2: ::DWORD = 0x00008000;
-pub const D3DPSHADECAPS_COLORGOURAUDRGB: ::DWORD = 0x00000008;
-pub const D3DPSHADECAPS_SPECULARGOURAUDRGB: ::DWORD = 0x00000200;
-pub const D3DPSHADECAPS_ALPHAGOURAUDBLEND: ::DWORD = 0x00004000;
-pub const D3DPSHADECAPS_FOGGOURAUD: ::DWORD = 0x00080000;
-pub const D3DPTEXTURECAPS_PERSPECTIVE: ::DWORD = 0x00000001;
-pub const D3DPTEXTURECAPS_POW2: ::DWORD = 0x00000002;
-pub const D3DPTEXTURECAPS_ALPHA: ::DWORD = 0x00000004;
-pub const D3DPTEXTURECAPS_SQUAREONLY: ::DWORD = 0x00000020;
-pub const D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE: ::DWORD = 0x00000040;
-pub const D3DPTEXTURECAPS_ALPHAPALETTE: ::DWORD = 0x00000080;
-pub const D3DPTEXTURECAPS_NONPOW2CONDITIONAL: ::DWORD = 0x00000100;
-pub const D3DPTEXTURECAPS_PROJECTED: ::DWORD = 0x00000400;
-pub const D3DPTEXTURECAPS_CUBEMAP: ::DWORD = 0x00000800;
-pub const D3DPTEXTURECAPS_VOLUMEMAP: ::DWORD = 0x00002000;
-pub const D3DPTEXTURECAPS_MIPMAP: ::DWORD = 0x00004000;
-pub const D3DPTEXTURECAPS_MIPVOLUMEMAP: ::DWORD = 0x00008000;
-pub const D3DPTEXTURECAPS_MIPCUBEMAP: ::DWORD = 0x00010000;
-pub const D3DPTEXTURECAPS_CUBEMAP_POW2: ::DWORD = 0x00020000;
-pub const D3DPTEXTURECAPS_VOLUMEMAP_POW2: ::DWORD = 0x00040000;
-pub const D3DPTEXTURECAPS_NOPROJECTEDBUMPENV: ::DWORD = 0x00200000;
-pub const D3DPTFILTERCAPS_MINFPOINT: ::DWORD = 0x00000100;
-pub const D3DPTFILTERCAPS_MINFLINEAR: ::DWORD = 0x00000200;
-pub const D3DPTFILTERCAPS_MINFANISOTROPIC: ::DWORD = 0x00000400;
-pub const D3DPTFILTERCAPS_MINFPYRAMIDALQUAD: ::DWORD = 0x00000800;
-pub const D3DPTFILTERCAPS_MINFGAUSSIANQUAD: ::DWORD = 0x00001000;
-pub const D3DPTFILTERCAPS_MIPFPOINT: ::DWORD = 0x00010000;
-pub const D3DPTFILTERCAPS_MIPFLINEAR: ::DWORD = 0x00020000;
-pub const D3DPTFILTERCAPS_CONVOLUTIONMONO: ::DWORD = 0x00040000;
-pub const D3DPTFILTERCAPS_MAGFPOINT: ::DWORD = 0x01000000;
-pub const D3DPTFILTERCAPS_MAGFLINEAR: ::DWORD = 0x02000000;
-pub const D3DPTFILTERCAPS_MAGFANISOTROPIC: ::DWORD = 0x04000000;
-pub const D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD: ::DWORD = 0x08000000;
-pub const D3DPTFILTERCAPS_MAGFGAUSSIANQUAD: ::DWORD = 0x10000000;
-pub const D3DPTADDRESSCAPS_WRAP: ::DWORD = 0x00000001;
-pub const D3DPTADDRESSCAPS_MIRROR: ::DWORD = 0x00000002;
-pub const D3DPTADDRESSCAPS_CLAMP: ::DWORD = 0x00000004;
-pub const D3DPTADDRESSCAPS_BORDER: ::DWORD = 0x00000008;
-pub const D3DPTADDRESSCAPS_INDEPENDENTUV: ::DWORD = 0x00000010;
-pub const D3DPTADDRESSCAPS_MIRRORONCE: ::DWORD = 0x00000020;
-pub const D3DSTENCILCAPS_KEEP: ::DWORD = 0x00000001;
-pub const D3DSTENCILCAPS_ZERO: ::DWORD = 0x00000002;
-pub const D3DSTENCILCAPS_REPLACE: ::DWORD = 0x00000004;
-pub const D3DSTENCILCAPS_INCRSAT: ::DWORD = 0x00000008;
-pub const D3DSTENCILCAPS_DECRSAT: ::DWORD = 0x00000010;
-pub const D3DSTENCILCAPS_INVERT: ::DWORD = 0x00000020;
-pub const D3DSTENCILCAPS_INCR: ::DWORD = 0x00000040;
-pub const D3DSTENCILCAPS_DECR: ::DWORD = 0x00000080;
-pub const D3DSTENCILCAPS_TWOSIDED: ::DWORD = 0x00000100;
-pub const D3DTEXOPCAPS_DISABLE: ::DWORD = 0x00000001;
-pub const D3DTEXOPCAPS_SELECTARG1: ::DWORD = 0x00000002;
-pub const D3DTEXOPCAPS_SELECTARG2: ::DWORD = 0x00000004;
-pub const D3DTEXOPCAPS_MODULATE: ::DWORD = 0x00000008;
-pub const D3DTEXOPCAPS_MODULATE2X: ::DWORD = 0x00000010;
-pub const D3DTEXOPCAPS_MODULATE4X: ::DWORD = 0x00000020;
-pub const D3DTEXOPCAPS_ADD: ::DWORD = 0x00000040;
-pub const D3DTEXOPCAPS_ADDSIGNED: ::DWORD = 0x00000080;
-pub const D3DTEXOPCAPS_ADDSIGNED2X: ::DWORD = 0x00000100;
-pub const D3DTEXOPCAPS_SUBTRACT: ::DWORD = 0x00000200;
-pub const D3DTEXOPCAPS_ADDSMOOTH: ::DWORD = 0x00000400;
-pub const D3DTEXOPCAPS_BLENDDIFFUSEALPHA: ::DWORD = 0x00000800;
-pub const D3DTEXOPCAPS_BLENDTEXTUREALPHA: ::DWORD = 0x00001000;
-pub const D3DTEXOPCAPS_BLENDFACTORALPHA: ::DWORD = 0x00002000;
-pub const D3DTEXOPCAPS_BLENDTEXTUREALPHAPM: ::DWORD = 0x00004000;
-pub const D3DTEXOPCAPS_BLENDCURRENTALPHA: ::DWORD = 0x00008000;
-pub const D3DTEXOPCAPS_PREMODULATE: ::DWORD = 0x00010000;
-pub const D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR: ::DWORD = 0x00020000;
-pub const D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA: ::DWORD = 0x00040000;
-pub const D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR: ::DWORD = 0x00080000;
-pub const D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA: ::DWORD = 0x00100000;
-pub const D3DTEXOPCAPS_BUMPENVMAP: ::DWORD = 0x00200000;
-pub const D3DTEXOPCAPS_BUMPENVMAPLUMINANCE: ::DWORD = 0x00400000;
-pub const D3DTEXOPCAPS_DOTPRODUCT3: ::DWORD = 0x00800000;
-pub const D3DTEXOPCAPS_MULTIPLYADD: ::DWORD = 0x01000000;
-pub const D3DTEXOPCAPS_LERP: ::DWORD = 0x02000000;
-pub const D3DFVFCAPS_TEXCOORDCOUNTMASK: ::DWORD = 0x0000ffff;
-pub const D3DFVFCAPS_DONOTSTRIPELEMENTS: ::DWORD = 0x00080000;
-pub const D3DFVFCAPS_PSIZE: ::DWORD = 0x00100000;
-pub const D3DVTXPCAPS_TEXGEN: ::DWORD = 0x00000001;
-pub const D3DVTXPCAPS_MATERIALSOURCE7: ::DWORD = 0x00000002;
-pub const D3DVTXPCAPS_DIRECTIONALLIGHTS: ::DWORD = 0x00000008;
-pub const D3DVTXPCAPS_POSITIONALLIGHTS: ::DWORD = 0x00000010;
-pub const D3DVTXPCAPS_LOCALVIEWER: ::DWORD = 0x00000020;
-pub const D3DVTXPCAPS_TWEENING: ::DWORD = 0x00000040;
-pub const D3DVTXPCAPS_TEXGEN_SPHEREMAP: ::DWORD = 0x00000100;
-pub const D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER: ::DWORD = 0x00000200;
-pub const D3DDEVCAPS2_STREAMOFFSET: ::DWORD = 0x00000001;
-pub const D3DDEVCAPS2_DMAPNPATCH: ::DWORD = 0x00000002;
-pub const D3DDEVCAPS2_ADAPTIVETESSRTPATCH: ::DWORD = 0x00000004;
-pub const D3DDEVCAPS2_ADAPTIVETESSNPATCH: ::DWORD = 0x00000008;
-pub const D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES: ::DWORD = 0x00000010;
-pub const D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH: ::DWORD = 0x00000020;
-pub const D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET: ::DWORD = 0x00000040;
-pub const D3DDTCAPS_UBYTE4: ::DWORD = 0x00000001;
-pub const D3DDTCAPS_UBYTE4N: ::DWORD = 0x00000002;
-pub const D3DDTCAPS_SHORT2N: ::DWORD = 0x00000004;
-pub const D3DDTCAPS_SHORT4N: ::DWORD = 0x00000008;
-pub const D3DDTCAPS_USHORT2N: ::DWORD = 0x00000010;
-pub const D3DDTCAPS_USHORT4N: ::DWORD = 0x00000020;
-pub const D3DDTCAPS_UDEC3: ::DWORD = 0x00000040;
-pub const D3DDTCAPS_DEC3N: ::DWORD = 0x00000080;
-pub const D3DDTCAPS_FLOAT16_2: ::DWORD = 0x00000100;
-pub const D3DDTCAPS_FLOAT16_4: ::DWORD = 0x00000200;
diff --git a/vendor/winapi-0.2.8/src/d3d9types.rs b/vendor/winapi-0.2.8/src/d3d9types.rs
deleted file mode 100644
index 28d0bedfca..0000000000
--- a/vendor/winapi-0.2.8/src/d3d9types.rs
+++ /dev/null
@@ -1,1397 +0,0 @@
-// Copyright © 2015, Corey Richardson
-// Licensed under the MIT License <LICENSE.md>
-//! Direct3D capabilities include file
-pub type D3DCOLOR = ::DWORD;
-STRUCT!{struct D3DVECTOR {
-    x: ::c_float,
-    y: ::c_float,
-    z: ::c_float,
-}}
-STRUCT!{struct D3DCOLORVALUE {
-    r: ::c_float,
-    g: ::c_float,
-    b: ::c_float,
-    a: ::c_float,
-}}
-STRUCT!{struct D3DRECT {
-    x1: ::LONG,
-    y1: ::LONG,
-    x2: ::LONG,
-    y2: ::LONG,
-}}
-STRUCT!{struct D3DMATRIX {
-    m: [[::c_float; 4]; 4],
-}}
-STRUCT!{struct D3DVIEWPORT9 {
-    X: ::DWORD,
-    Y: ::DWORD,
-    Width: ::DWORD,
-    Height: ::DWORD,
-    MinZ: ::c_float,
-    MaxZ: ::c_float,
-}}
-pub const D3DMAXUSERCLIPPLANES: ::DWORD = 32;
-pub const D3DCLIPPLANE0: ::DWORD = (1 << 0);
-pub const D3DCLIPPLANE1: ::DWORD = (1 << 1);
-pub const D3DCLIPPLANE2: ::DWORD = (1 << 2);
-pub const D3DCLIPPLANE3: ::DWORD = (1 << 3);
-pub const D3DCLIPPLANE4: ::DWORD = (1 << 4);
-pub const D3DCLIPPLANE5: ::DWORD = (1 << 5);
-pub const D3DCS_LEFT: ::DWORD = 0x00000001;
-pub const D3DCS_RIGHT: ::DWORD = 0x00000002;
-pub const D3DCS_TOP: ::DWORD = 0x00000004;
-pub const D3DCS_BOTTOM: ::DWORD = 0x00000008;
-pub const D3DCS_FRONT: ::DWORD = 0x00000010;
-pub const D3DCS_BACK: ::DWORD = 0x00000020;
-pub const D3DCS_PLANE0: ::DWORD = 0x00000040;
-pub const D3DCS_PLANE1: ::DWORD = 0x00000080;
-pub const D3DCS_PLANE2: ::DWORD = 0x00000100;
-pub const D3DCS_PLANE3: ::DWORD = 0x00000200;
-pub const D3DCS_PLANE4: ::DWORD = 0x00000400;
-pub const D3DCS_PLANE5: ::DWORD = 0x00000800;
-pub const D3DCS_ALL: ::DWORD = D3DCS_LEFT | D3DCS_RIGHT | D3DCS_TOP | D3DCS_BOTTOM | D3DCS_FRONT
-    | D3DCS_BACK | D3DCS_PLANE0 | D3DCS_PLANE1 | D3DCS_PLANE2 | D3DCS_PLANE3 | D3DCS_PLANE4
-    | D3DCS_PLANE5;
-STRUCT!{struct D3DCLIPSTATUS9 {
-    ClipUnion: ::DWORD,
-    ClipIntersection: ::DWORD,
-}}
-STRUCT!{struct D3DMATERIAL9 {
-    Diffuse: D3DCOLORVALUE,
-    Ambient: D3DCOLORVALUE,
-    Specular: D3DCOLORVALUE,
-    Emissive: D3DCOLORVALUE,
-    Power: ::c_float,
-}}
-ENUM!{enum D3DLIGHTTYPE {
-    D3DLIGHT_POINT = 1,
-    D3DLIGHT_SPOT = 2,
-    D3DLIGHT_DIRECTIONAL = 3,
-}}
-STRUCT!{struct D3DLIGHT9 {
-    Type: D3DLIGHTTYPE,
-    Diffuse: D3DCOLORVALUE,
-    Specular: D3DCOLORVALUE,
-    Ambient: D3DCOLORVALUE,
-    Position: D3DVECTOR,
-    Direction: D3DVECTOR,
-    Range: ::c_float,
-    Falloff: ::c_float,
-    Attenuation0: ::c_float,
-    Attenuation1: ::c_float,
-    Attenuation2: ::c_float,
-    Theta: ::c_float,
-    Phi: ::c_float,
-}}
-pub const D3DCLEAR_TARGET: ::DWORD = 0x1;
-pub const D3DCLEAR_ZBUFFER: ::DWORD = 0x2;
-pub const D3DCLEAR_STENCIL: ::DWORD = 0x4;
-ENUM!{enum D3DSHADEMODE {
-    D3DSHADE_FLAT = 1,
-    D3DSHADE_GOURAUD = 2,
-    D3DSHADE_PHONG = 3,
-}}
-ENUM!{enum D3DFILLMODE {
-    D3DFILL_POINT = 1,
-    D3DFILL_WIREFRAME = 2,
-    D3DFILL_SOLID = 3,
-}}
-ENUM!{enum D3DBLEND {
-    D3DBLEND_ZERO = 1,
-    D3DBLEND_ONE = 2,
-    D3DBLEND_SRCCOLOR = 3,
-    D3DBLEND_INVSRCCOLOR = 4,
-    D3DBLEND_SRCALPHA = 5,
-    D3DBLEND_INVSRCALPHA = 6,
-    D3DBLEND_DESTALPHA = 7,
-    D3DBLEND_INVDESTALPHA = 8,
-    D3DBLEND_DESTCOLOR = 9,
-    D3DBLEND_INVDESTCOLOR = 10,
-    D3DBLEND_SRCALPHASAT = 11,
-    D3DBLEND_BOTHSRCALPHA = 12,
-    D3DBLEND_BOTHINVSRCALPHA = 13,
-    D3DBLEND_BLENDFACTOR = 14,
-    D3DBLEND_INVBLENDFACTOR = 15,
-}}
-ENUM!{enum D3DBLENDOP {
-    D3DBLENDOP_ADD = 1,
-    D3DBLENDOP_SUBTRACT = 2,
-    D3DBLENDOP_REVSUBTRACT = 3,
-    D3DBLENDOP_MIN = 4,
-    D3DBLENDOP_MAX = 5,
-}}
-ENUM!{enum D3DTEXTUREADDRESS {
-    D3DTADDRESS_WRAP = 1,
-    D3DTADDRESS_MIRROR = 2,
-    D3DTADDRESS_CLAMP = 3,
-    D3DTADDRESS_BORDER = 4,
-    D3DTADDRESS_MIRRORONCE = 5,
-}}
-ENUM!{enum D3DCULL {
-    D3DCULL_NONE = 1,
-    D3DCULL_CW = 2,
-    D3DCULL_CCW = 3,
-}}
-ENUM!{enum D3DCMPFUNC {
-    D3DCMP_NEVER = 1,
-    D3DCMP_LESS = 2,
-    D3DCMP_EQUAL = 3,
-    D3DCMP_LESSEQUAL = 4,
-    D3DCMP_GREATER = 5,
-    D3DCMP_NOTEQUAL = 6,
-    D3DCMP_GREATEREQUAL = 7,
-    D3DCMP_ALWAYS = 8,
-}}
-ENUM!{enum D3DSTENCILOP {
-    D3DSTENCILOP_KEEP = 1,
-    D3DSTENCILOP_ZERO = 2,
-    D3DSTENCILOP_REPLACE = 3,
-    D3DSTENCILOP_INCRSAT = 4,
-    D3DSTENCILOP_DECRSAT = 5,
-    D3DSTENCILOP_INVERT = 6,
-    D3DSTENCILOP_INCR = 7,
-    D3DSTENCILOP_DECR = 8,
-}}
-ENUM!{enum D3DFOGMODE {
-    D3DFOG_NONE = 0,
-    D3DFOG_EXP = 1,
-    D3DFOG_EXP2 = 2,
-    D3DFOG_LINEAR = 3,
-}}
-ENUM!{enum D3DZBUFFERTYPE {
-    D3DZB_FALSE = 0,
-    D3DZB_TRUE = 1,
-    D3DZB_USEW = 2,
-}}
-ENUM!{enum D3DPRIMITIVETYPE {
-    D3DPT_POINTLIST = 1,
-    D3DPT_LINELIST = 2,
-    D3DPT_LINESTRIP = 3,
-    D3DPT_TRIANGLELIST = 4,
-    D3DPT_TRIANGLESTRIP = 5,
-    D3DPT_TRIANGLEFAN = 6,
-}}
-ENUM!{enum D3DTRANSFORMSTATETYPE {
-    D3DTS_VIEW = 2,
-    D3DTS_PROJECTION = 3,
-    D3DTS_TEXTURE0 = 16,
-    D3DTS_TEXTURE1 = 17,
-    D3DTS_TEXTURE2 = 18,
-    D3DTS_TEXTURE3 = 19,
-    D3DTS_TEXTURE4 = 20,
-    D3DTS_TEXTURE5 = 21,
-    D3DTS_TEXTURE6 = 22,
-    D3DTS_TEXTURE7 = 23,
-}}
-ENUM!{enum D3DRENDERSTATETYPE {
-    D3DRS_ZENABLE = 7,
-    D3DRS_FILLMODE = 8,
-    D3DRS_SHADEMODE = 9,
-    D3DRS_ZWRITEENABLE = 14,
-    D3DRS_ALPHATESTENABLE = 15,
-    D3DRS_LASTPIXEL = 16,
-    D3DRS_SRCBLEND = 19,
-    D3DRS_DESTBLEND = 20,
-    D3DRS_CULLMODE = 22,
-    D3DRS_ZFUNC = 23,
-    D3DRS_ALPHAREF = 24,
-    D3DRS_ALPHAFUNC = 25,
-    D3DRS_DITHERENABLE = 26,
-    D3DRS_ALPHABLENDENABLE = 27,
-    D3DRS_FOGENABLE = 28,
-    D3DRS_SPECULARENABLE = 29,
-    D3DRS_FOGCOLOR = 34,
-    D3DRS_FOGTABLEMODE = 35,
-    D3DRS_FOGSTART = 36,
-    D3DRS_FOGEND = 37,
-    D3DRS_FOGDENSITY = 38,
-    D3DRS_RANGEFOGENABLE = 48,
-    D3DRS_STENCILENABLE = 52,
-    D3DRS_STENCILFAIL = 53,
-    D3DRS_STENCILZFAIL = 54,
-    D3DRS_STENCILPASS = 55,
-    D3DRS_STENCILFUNC = 56,
-    D3DRS_STENCILREF = 57,
-    D3DRS_STENCILMASK = 58,
-    D3DRS_STENCILWRITEMASK = 59,
-    D3DRS_TEXTUREFACTOR = 60,
-    D3DRS_WRAP0 = 128,
-    D3DRS_WRAP1 = 129,
-    D3DRS_WRAP2 = 130,
-    D3DRS_WRAP3 = 131,
-    D3DRS_WRAP4 = 132,
-    D3DRS_WRAP5 = 133,
-    D3DRS_WRAP6 = 134,
-    D3DRS_WRAP7 = 135,
-    D3DRS_CLIPPING = 136,
-    D3DRS_LIGHTING = 137,
-    D3DRS_AMBIENT = 139,
-    D3DRS_FOGVERTEXMODE = 140,
-    D3DRS_COLORVERTEX = 141,
-    D3DRS_LOCALVIEWER = 142,
-    D3DRS_NORMALIZENORMALS = 143,
-    D3DRS_DIFFUSEMATERIALSOURCE = 145,
-    D3DRS_SPECULARMATERIALSOURCE = 146,
-    D3DRS_AMBIENTMATERIALSOURCE = 147,
-    D3DRS_EMISSIVEMATERIALSOURCE = 148,
-    D3DRS_VERTEXBLEND = 151,
-    D3DRS_CLIPPLANEENABLE = 152,
-    D3DRS_POINTSIZE = 154,
-    D3DRS_POINTSIZE_MIN = 155,
-    D3DRS_POINTSPRITEENABLE = 156,
-    D3DRS_POINTSCALEENABLE = 157,
-    D3DRS_POINTSCALE_A = 158,
-    D3DRS_POINTSCALE_B = 159,
-    D3DRS_POINTSCALE_C = 160,
-    D3DRS_MULTISAMPLEANTIALIAS = 161,
-    D3DRS_MULTISAMPLEMASK = 162,
-    D3DRS_PATCHEDGESTYLE = 163,
-    D3DRS_DEBUGMONITORTOKEN = 165,
-    D3DRS_POINTSIZE_MAX = 166,
-    D3DRS_INDEXEDVERTEXBLENDENABLE = 167,
-    D3DRS_COLORWRITEENABLE = 168,
-    D3DRS_TWEENFACTOR = 170,
-    D3DRS_BLENDOP = 171,
-    D3DRS_POSITIONDEGREE = 172,
-    D3DRS_NORMALDEGREE = 173,
-    D3DRS_SCISSORTESTENABLE = 174,
-    D3DRS_SLOPESCALEDEPTHBIAS = 175,
-    D3DRS_ANTIALIASEDLINEENABLE = 176,
-    D3DRS_MINTESSELLATIONLEVEL = 178,
-    D3DRS_MAXTESSELLATIONLEVEL = 179,
-    D3DRS_ADAPTIVETESS_X = 180,
-    D3DRS_ADAPTIVETESS_Y = 181,
-    D3DRS_ADAPTIVETESS_Z = 182,
-    D3DRS_ADAPTIVETESS_W = 183,
-    D3DRS_ENABLEADAPTIVETESSELLATION = 184,
-    D3DRS_TWOSIDEDSTENCILMODE = 185,
-    D3DRS_CCW_STENCILFAIL = 186,
-    D3DRS_CCW_STENCILZFAIL = 187,
-    D3DRS_CCW_STENCILPASS = 188,
-    D3DRS_CCW_STENCILFUNC = 189,
-    D3DRS_COLORWRITEENABLE1 = 190,
-    D3DRS_COLORWRITEENABLE2 = 191,
-    D3DRS_COLORWRITEENABLE3 = 192,
-    D3DRS_BLENDFACTOR = 193,
-    D3DRS_SRGBWRITEENABLE = 194,
-    D3DRS_DEPTHBIAS = 195,
-    D3DRS_WRAP8 = 198,
-    D3DRS_WRAP9 = 199,
-    D3DRS_WRAP10 = 200,
-    D3DRS_WRAP11 = 201,
-    D3DRS_WRAP12 = 202,
-    D3DRS_WRAP13 = 203,
-    D3DRS_WRAP14 = 204,
-    D3DRS_WRAP15 = 205,
-    D3DRS_SEPARATEALPHABLENDENABLE = 206,
-    D3DRS_SRCBLENDALPHA = 207,
-    D3DRS_DESTBLENDALPHA = 208,
-    D3DRS_BLENDOPALPHA = 209,
-}}
-pub const D3D_MAX_SIMULTANEOUS_RENDERTARGETS: ::DWORD = 4;
-ENUM!{enum D3DMATERIALCOLORSOURCE {
-    D3DMCS_MATERIAL = 0,
-    D3DMCS_COLOR1 = 1,
-    D3DMCS_COLOR2 = 2,
-}}
-pub const D3DRENDERSTATE_WRAPBIAS: ::DWORD = 128;
-pub const D3DWRAP_U: ::DWORD = 0x00000001;
-pub const D3DWRAP_V: ::DWORD = 0x00000002;
-pub const D3DWRAP_W: ::DWORD = 0x00000004;
-pub const D3DWRAPCOORD_0: ::DWORD = 0x00000001;
-pub const D3DWRAPCOORD_1: ::DWORD = 0x00000002;
-pub const D3DWRAPCOORD_2: ::DWORD = 0x00000004;
-pub const D3DWRAPCOORD_3: ::DWORD = 0x00000008;
-pub const D3DCOLORWRITEENABLE_RED: ::DWORD = 1 << 0;
-pub const D3DCOLORWRITEENABLE_GREEN: ::DWORD = 1 << 1;
-pub const D3DCOLORWRITEENABLE_BLUE: ::DWORD = 1 << 2;
-pub const D3DCOLORWRITEENABLE_ALPHA: ::DWORD = 1 << 3;
-ENUM!{enum D3DTEXTURESTAGESTATETYPE {
-    D3DTSS_COLOROP = 1,
-    D3DTSS_COLORARG1 = 2,
-    D3DTSS_COLORARG2 = 3,
-    D3DTSS_ALPHAOP = 4,
-    D3DTSS_ALPHAARG1 = 5,
-    D3DTSS_ALPHAARG2 = 6,
-    D3DTSS_BUMPENVMAT00 = 7,
-    D3DTSS_BUMPENVMAT01 = 8,
-    D3DTSS_BUMPENVMAT10 = 9,
-    D3DTSS_BUMPENVMAT11 = 10,
-    D3DTSS_TEXCOORDINDEX = 11,
-    D3DTSS_BUMPENVLSCALE = 22,
-    D3DTSS_BUMPENVLOFFSET = 23,
-    D3DTSS_TEXTURETRANSFORMFLAGS = 24,
-    D3DTSS_COLORARG0 = 26,
-    D3DTSS_ALPHAARG0 = 27,
-    D3DTSS_RESULTARG = 28,
-    D3DTSS_CONSTANT = 32,
-}}
-ENUM!{enum D3DSAMPLERSTATETYPE {
-    D3DSAMP_ADDRESSU = 1,
-    D3DSAMP_ADDRESSV = 2,
-    D3DSAMP_ADDRESSW = 3,
-    D3DSAMP_BORDERCOLOR = 4,
-    D3DSAMP_MAGFILTER = 5,
-    D3DSAMP_MINFILTER = 6,
-    D3DSAMP_MIPFILTER = 7,
-    D3DSAMP_MIPMAPLODBIAS = 8,
-    D3DSAMP_MAXMIPLEVEL = 9,
-    D3DSAMP_MAXANISOTROPY = 10,
-    D3DSAMP_SRGBTEXTURE = 11,
-    D3DSAMP_ELEMENTINDEX = 12,
-    D3DSAMP_DMAPOFFSET = 13,
-}}
-pub const D3DDMAPSAMPLER: ::DWORD = 256;
-pub const D3DVERTEXTEXTURESAMPLER0: ::DWORD = D3DDMAPSAMPLER + 1;
-pub const D3DVERTEXTEXTURESAMPLER1: ::DWORD = D3DDMAPSAMPLER + 2;
-pub const D3DVERTEXTEXTURESAMPLER2: ::DWORD = D3DDMAPSAMPLER + 3;
-pub const D3DVERTEXTEXTURESAMPLER3: ::DWORD = D3DDMAPSAMPLER + 4;
-pub const D3DTSS_TCI_PASSTHRU: ::DWORD = 0x00000000;
-pub const D3DTSS_TCI_CAMERASPACENORMAL: ::DWORD = 0x00010000;
-pub const D3DTSS_TCI_CAMERASPACEPOSITION: ::DWORD = 0x00020000;
-pub const D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR: ::DWORD = 0x00030000;
-pub const D3DTSS_TCI_SPHEREMAP: ::DWORD = 0x00040000;
-ENUM!{enum D3DTEXTUREOP {
-    D3DTOP_DISABLE = 1,
-    D3DTOP_SELECTARG1 = 2,
-    D3DTOP_SELECTARG2 = 3,
-    D3DTOP_MODULATE = 4,
-    D3DTOP_MODULATE2X = 5,
-    D3DTOP_MODULATE4X = 6,
-    D3DTOP_ADD = 7,
-    D3DTOP_ADDSIGNED = 8,
-    D3DTOP_ADDSIGNED2X = 9,
-    D3DTOP_SUBTRACT = 10,
-    D3DTOP_ADDSMOOTH = 11,
-    D3DTOP_BLENDDIFFUSEALPHA = 12,
-    D3DTOP_BLENDTEXTUREALPHA = 13,
-    D3DTOP_BLENDFACTORALPHA = 14,
-    D3DTOP_BLENDTEXTUREALPHAPM = 15,
-    D3DTOP_BLENDCURRENTALPHA = 16,
-    D3DTOP_PREMODULATE = 17,
-    D3DTOP_MODULATEALPHA_ADDCOLOR = 18,
-    D3DTOP_MODULATECOLOR_ADDALPHA = 19,
-    D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20,
-    D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21,
-    D3DTOP_BUMPENVMAP = 22,
-    D3DTOP_BUMPENVMAPLUMINANCE = 23,
-    D3DTOP_DOTPRODUCT3 = 24,
-    D3DTOP_MULTIPLYADD = 25,
-    D3DTOP_LERP = 26,
-}}
-pub const D3DTA_SELECTMASK: ::DWORD = 0x0000000f;
-pub const D3DTA_DIFFUSE: ::DWORD = 0x00000000;
-pub const D3DTA_CURRENT: ::DWORD = 0x00000001;
-pub const D3DTA_TEXTURE: ::DWORD = 0x00000002;
-pub const D3DTA_TFACTOR: ::DWORD = 0x00000003;
-pub const D3DTA_SPECULAR: ::DWORD = 0x00000004;
-pub const D3DTA_TEMP: ::DWORD = 0x00000005;
-pub const D3DTA_CONSTANT: ::DWORD = 0x00000006;
-pub const D3DTA_COMPLEMENT: ::DWORD = 0x00000010;
-pub const D3DTA_ALPHAREPLICATE: ::DWORD = 0x00000020;
-ENUM!{enum D3DTEXTUREFILTERTYPE {
-    D3DTEXF_NONE = 0,
-    D3DTEXF_POINT = 1,
-    D3DTEXF_LINEAR = 2,
-    D3DTEXF_ANISOTROPIC = 3,
-    D3DTEXF_PYRAMIDALQUAD = 6,
-    D3DTEXF_GAUSSIANQUAD = 7,
-    D3DTEXF_CONVOLUTIONMONO = 8,
-}}
-pub const D3DPV_DONOTCOPYDATA: ::DWORD = 1 << 0;
-pub const D3DFVF_RESERVED0: ::DWORD = 0x001;
-pub const D3DFVF_POSITION_MASK: ::DWORD = 0x400E;
-pub const D3DFVF_XYZ: ::DWORD = 0x002;
-pub const D3DFVF_XYZRHW: ::DWORD = 0x004;
-pub const D3DFVF_XYZB1: ::DWORD = 0x006;
-pub const D3DFVF_XYZB2: ::DWORD = 0x008;
-pub const D3DFVF_XYZB3: ::DWORD = 0x00a;
-pub const D3DFVF_XYZB4: ::DWORD = 0x00c;
-pub const D3DFVF_XYZB5: ::DWORD = 0x00e;
-pub const D3DFVF_XYZW: ::DWORD = 0x4002;
-pub const D3DFVF_NORMAL: ::DWORD = 0x010;
-pub const D3DFVF_PSIZE: ::DWORD = 0x020;
-pub const D3DFVF_DIFFUSE: ::DWORD = 0x040;
-pub const D3DFVF_SPECULAR: ::DWORD = 0x080;
-pub const D3DFVF_TEXCOUNT_MASK: ::DWORD = 0xf00;
-pub const D3DFVF_TEXCOUNT_SHIFT: ::DWORD = 8;
-pub const D3DFVF_TEX0: ::DWORD = 0x000;
-pub const D3DFVF_TEX1: ::DWORD = 0x100;
-pub const D3DFVF_TEX2: ::DWORD = 0x200;
-pub const D3DFVF_TEX3: ::DWORD = 0x300;
-pub const D3DFVF_TEX4: ::DWORD = 0x400;
-pub const D3DFVF_TEX5: ::DWORD = 0x500;
-pub const D3DFVF_TEX6: ::DWORD = 0x600;
-pub const D3DFVF_TEX7: ::DWORD = 0x700;
-pub const D3DFVF_TEX8: ::DWORD = 0x800;
-pub const D3DFVF_LASTBETA_UBYTE4: ::DWORD = 0x1000;
-pub const D3DFVF_LASTBETA_D3DCOLOR: ::DWORD = 0x8000;
-pub const D3DFVF_RESERVED2: ::DWORD = 0x6000;
-ENUM!{enum D3DDECLUSAGE {
-    D3DDECLUSAGE_POSITION = 0,
-    D3DDECLUSAGE_BLENDWEIGHT,
-    D3DDECLUSAGE_BLENDINDICES,
-    D3DDECLUSAGE_NORMAL,
-    D3DDECLUSAGE_PSIZE,
-    D3DDECLUSAGE_TEXCOORD,
-    D3DDECLUSAGE_TANGENT,
-    D3DDECLUSAGE_BINORMAL,
-    D3DDECLUSAGE_TESSFACTOR,
-    D3DDECLUSAGE_POSITIONT,
-    D3DDECLUSAGE_COLOR,
-    D3DDECLUSAGE_FOG,
-    D3DDECLUSAGE_DEPTH,
-    D3DDECLUSAGE_SAMPLE,
-}}
-pub const MAXD3DDECLUSAGE: D3DDECLUSAGE = D3DDECLUSAGE_SAMPLE;
-pub const MAXD3DDECLUSAGEINDEX: ::DWORD = 15;
-pub const MAXD3DDECLLENGTH: ::DWORD = 64;
-ENUM!{enum D3DDECLMETHOD {
-    D3DDECLMETHOD_DEFAULT = 0,
-    D3DDECLMETHOD_PARTIALU,
-    D3DDECLMETHOD_PARTIALV,
-    D3DDECLMETHOD_CROSSUV,
-    D3DDECLMETHOD_UV,
-    D3DDECLMETHOD_LOOKUP,
-    D3DDECLMETHOD_LOOKUPPRESAMPLED,
-}}
-pub const MAXD3DDECLMETHOD: D3DDECLMETHOD = D3DDECLMETHOD_LOOKUPPRESAMPLED;
-ENUM!{enum D3DDECLTYPE {
-    D3DDECLTYPE_FLOAT1 = 0,
-    D3DDECLTYPE_FLOAT2 = 1,
-    D3DDECLTYPE_FLOAT3 = 2,
-    D3DDECLTYPE_FLOAT4 = 3,
-    D3DDECLTYPE_D3DCOLOR = 4,
-    D3DDECLTYPE_UBYTE4 = 5,
-    D3DDECLTYPE_SHORT2 = 6,
-    D3DDECLTYPE_SHORT4 = 7,
-    D3DDECLTYPE_UBYTE4N = 8,
-    D3DDECLTYPE_SHORT2N = 9,
-    D3DDECLTYPE_SHORT4N = 10,
-    D3DDECLTYPE_USHORT2N = 11,
-    D3DDECLTYPE_USHORT4N = 12,
-    D3DDECLTYPE_UDEC3 = 13,
-    D3DDECLTYPE_DEC3N = 14,
-    D3DDECLTYPE_FLOAT16_2 = 15,
-    D3DDECLTYPE_FLOAT16_4 = 16,
-    D3DDECLTYPE_UNUSED = 17,
-}}
-pub const MAXD3DDECLTYPE: D3DDECLTYPE = D3DDECLTYPE_UNUSED;
-STRUCT!{struct D3DVERTEXELEMENT9 {
-    Stream: ::WORD,
-    Offset: ::WORD,
-    Type: ::BYTE,
-    Method: ::BYTE,
-    Usage: ::BYTE,
-    UsageIndex: ::BYTE,
-}}
-pub type LPD3DVERTEXELEMENT9 = *mut D3DVERTEXELEMENT9;
-pub const D3DDECL_END: D3DVERTEXELEMENT9 = D3DVERTEXELEMENT9 {
-    Stream: 0xFF,
-    Offset: 0,
-    Type: D3DDECLTYPE_UNUSED.0 as ::BYTE,
-    Method: 0,
-    Usage: 0,
-    UsageIndex: 0,
-};
-pub const D3DDP_MAXTEXCOORD: ::DWORD = 8;
-pub const D3DSTREAMSOURCE_INDEXEDDATA: ::DWORD = 1 << 30;
-pub const D3DSTREAMSOURCE_INSTANCEDATA: ::DWORD = 2 << 30;
-pub const D3DSI_OPCODE_MASK: ::DWORD = 0x0000FFFF;
-pub const D3DSI_INSTLENGTH_MASK: ::DWORD = 0x0F000000;
-pub const D3DSI_INSTLENGTH_SHIFT: ::DWORD = 24;
-ENUM!{enum D3DSHADER_INSTRUCTION_OPCODE_TYPE {
-    D3DSIO_NOP = 0,
-    D3DSIO_MOV = 1,
-    D3DSIO_ADD = 2,
-    D3DSIO_SUB = 3,
-    D3DSIO_MAD = 4,
-    D3DSIO_MUL = 5,
-    D3DSIO_RCP = 6,
-    D3DSIO_RSQ = 7,
-    D3DSIO_DP3 = 8,
-    D3DSIO_DP4 = 9,
-    D3DSIO_MIN = 10,
-    D3DSIO_MAX = 11,
-    D3DSIO_SLT = 12,
-    D3DSIO_SGE = 13,
-    D3DSIO_EXP = 14,
-    D3DSIO_LOG = 15,
-    D3DSIO_LIT = 16,
-    D3DSIO_DST = 17,
-    D3DSIO_LRP = 18,
-    D3DSIO_FRC = 18,
-    D3DSIO_M4x4 = 20,
-    D3DSIO_M4x3 = 21,
-    D3DSIO_M3x4 = 22,
-    D3DSIO_M3x3 = 23,
-    D3DSIO_M3x2 = 24,
-    D3DSIO_CALL = 25,
-    D3DSIO_CALLNZ = 26,
-    D3DSIO_LOOP = 27,
-    D3DSIO_RET = 28,
-    D3DSIO_ENDLOOP = 29,
-    D3DSIO_LABEL = 30,
-    D3DSIO_DCL = 31,
-    D3DSIO_POW = 32,
-    D3DSIO_CRS = 33,
-    D3DSIO_SGN = 34,
-    D3DSIO_ABS = 35,
-    D3DSIO_NRM = 36,
-    D3DSIO_SINCOS = 37,
-    D3DSIO_REP = 38,
-    D3DSIO_ENDREP = 39,
-    D3DSIO_IF = 40,
-    D3DSIO_IFC = 41,
-    D3DSIO_ELSE = 42,
-    D3DSIO_ENDIF = 43,
-    D3DSIO_BREAK = 44,
-    D3DSIO_BREAKC = 45,
-    D3DSIO_MOVA = 46,
-    D3DSIO_DEFB = 47,
-    D3DSIO_DEFI = 48,
-    D3DSIO_TEXCOORD = 64,
-    D3DSIO_TEXKILL = 65,
-    D3DSIO_TEX = 66,
-    D3DSIO_TEXBEM = 67,
-    D3DSIO_TEXBEML = 68,
-    D3DSIO_TEXREG2AR = 69,
-    D3DSIO_TEXREG2GB = 70,
-    D3DSIO_TEXM3x2PAD = 71,
-    D3DSIO_TEXM3x2TEX = 72,
-    D3DSIO_TEXM3x3PAD = 73,
-    D3DSIO_TEXM3x3TEX = 74,
-    D3DSIO_RESERVED0 = 75,
-    D3DSIO_TEXM3x3SPEC = 76,
-    D3DSIO_TEXM3x3VSPEC = 77,
-    D3DSIO_EXPP = 78,
-    D3DSIO_LOGP = 79,
-    D3DSIO_CND = 80,
-    D3DSIO_DEF = 81,
-    D3DSIO_TEXREG2RGB = 82,
-    D3DSIO_TEXDP3TEX = 83,
-    D3DSIO_TEXM3x2DEPTH = 84,
-    D3DSIO_TEXDP3 = 85,
-    D3DSIO_TEXM3x3 = 86,
-    D3DSIO_TEXDEPTH = 87,
-    D3DSIO_CMP = 88,
-    D3DSIO_BEM = 89,
-    D3DSIO_DP2ADD = 90,
-    D3DSIO_DSX = 91,
-    D3DSIO_DSY = 92,
-    D3DSIO_TEXLDD = 93,
-    D3DSIO_SETP = 94,
-    D3DSIO_TEXLDL = 95,
-    D3DSIO_BREAKP = 96,
-    D3DSIO_PHASE = 0xFFFD,
-    D3DSIO_COMMENT = 0xFFFE,
-    D3DSIO_END = 0xFFFF,
-}}
-pub const D3DSI_COISSUE: ::DWORD = 0x40000000;
-pub const D3DSP_OPCODESPECIFICCONTROL_MASK: ::DWORD = 0x00ff0000;
-pub const D3DSP_OPCODESPECIFICCONTROL_SHIFT: ::DWORD = 16;
-pub const D3DSI_TEXLD_PROJECT: ::DWORD = 0x01 << D3DSP_OPCODESPECIFICCONTROL_SHIFT;
-pub const D3DSI_TEXLD_BIAS: ::DWORD = 0x02 << D3DSP_OPCODESPECIFICCONTROL_SHIFT;
-ENUM!{enum D3DSHADER_COMPARISON {
-    D3DSPC_RESERVED0 = 0,
-    D3DSPC_GT = 1,
-    D3DSPC_EQ = 2,
-    D3DSPC_GE = 3,
-    D3DSPC_LT = 4,
-    D3DSPC_NE = 5,
-    D3DSPC_LE = 6,
-    D3DSPC_RESERVED1 = 7,
-}}
-pub const D3DSHADER_COMPARISON_SHIFT: ::DWORD = D3DSP_OPCODESPECIFICCONTROL_SHIFT;
-pub const D3DSHADER_COMPARISON_MASK: ::DWORD = 0x7 << D3DSHADER_COMPARISON_SHIFT;
-pub const D3DSHADER_INSTRUCTION_PREDICATED: ::DWORD = 0x1 << 28;
-pub const D3DSP_DCL_USAGE_SHIFT: ::DWORD = 0;
-pub const D3DSP_DCL_USAGE_MASK: ::DWORD = 0x0000000f;
-pub const D3DSP_DCL_USAGEINDEX_SHIFT: ::DWORD = 16;
-pub const D3DSP_DCL_USAGEINDEX_MASK: ::DWORD = 0x000f0000;
-pub const D3DSP_TEXTURETYPE_SHIFT: ::DWORD = 27;
-pub const D3DSP_TEXTURETYPE_MASK: ::DWORD = 0x78000000;
-ENUM!{enum D3DSAMPLER_TEXTURE_TYPE {
-    D3DSTT_UNKNOWN = 0 << D3DSP_TEXTURETYPE_SHIFT,
-    D3DSTT_2D = 2 << D3DSP_TEXTURETYPE_SHIFT,
-    D3DSTT_CUBE = 3 << D3DSP_TEXTURETYPE_SHIFT,
-    D3DSTT_VOLUME = 4 << D3DSP_TEXTURETYPE_SHIFT,
-}}
-pub const D3DSP_REGNUM_MASK: ::DWORD = 0x000007FF;
-pub const D3DSP_WRITEMASK_0: ::DWORD = 0x00010000;
-pub const D3DSP_WRITEMASK_1: ::DWORD = 0x00020000;
-pub const D3DSP_WRITEMASK_2: ::DWORD = 0x00040000;
-pub const D3DSP_WRITEMASK_3: ::DWORD = 0x00080000;
-pub const D3DSP_WRITEMASK_ALL: ::DWORD = 0x000F0000;
-pub const D3DSP_DSTMOD_SHIFT: ::DWORD = 20;
-pub const D3DSP_DSTMOD_MASK: ::DWORD = 0x00F00000;
-pub const D3DSPDM_NONE: ::DWORD = 0 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSPDM_SATURATE: ::DWORD = 1 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSPDM_PARTIALPRECISION: ::DWORD = 2 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSPDM_MSAMPCENTROID: ::DWORD = 4 << D3DSP_DSTMOD_SHIFT;
-pub const D3DSP_DSTSHIFT_SHIFT: ::DWORD = 24;
-pub const D3DSP_DSTSHIFT_MASK: ::DWORD = 0x0F000000;
-pub const D3DSP_REGTYPE_SHIFT: ::DWORD = 28;
-pub const D3DSP_REGTYPE_SHIFT2: ::DWORD = 8;
-pub const D3DSP_REGTYPE_MASK: ::DWORD = 0x70000000;
-pub const D3DSP_REGTYPE_MASK2: ::DWORD = 0x00001800;
-ENUM!{enum D3DSHADER_PARAM_REGISTER_TYPE {
-    D3DSPR_TEMP = 0,
-    D3DSPR_INPUT = 1,
-    D3DSPR_CONST = 2,
-    D3DSPR_ADDR = 3,
-    D3DSPR_TEXTURE = 3,
-    D3DSPR_RASTOUT = 4,
-    D3DSPR_ATTROUT = 5,
-    D3DSPR_TEXCRDOUT = 6,
-    D3DSPR_OUTPUT = 6,
-    D3DSPR_CONSTINT = 7,
-    D3DSPR_COLOROUT = 8,
-    D3DSPR_DEPTHOUT = 9,
-    D3DSPR_SAMPLER = 10,
-    D3DSPR_CONST2 = 11,
-    D3DSPR_CONST3 = 12,
-    D3DSPR_CONST4 = 13,
-    D3DSPR_CONSTBOOL = 14,
-    D3DSPR_LOOP = 15,
-    D3DSPR_TEMPFLOAT16 = 16,
-    D3DSPR_MISCTYPE = 17,
-    D3DSPR_LABEL = 18,
-    D3DSPR_PREDICATE = 19,
-}}
-ENUM!{enum D3DSHADER_MISCTYPE_OFFSETS {
-    D3DSMO_POSITION = 0,
-    D3DSMO_FACE = 1,
-}}
-ENUM!{enum D3DVS_RASTOUT_OFFSETS {
-    D3DSRO_POSITION = 0,
-    D3DSRO_FOG,
-    D3DSRO_POINT_SIZE,
-}}
-pub const D3DVS_ADDRESSMODE_SHIFT: ::DWORD = 13;
-pub const D3DVS_ADDRESSMODE_MASK: ::DWORD = 1 << D3DVS_ADDRESSMODE_SHIFT;
-ENUM!{enum D3DVS_ADDRESSMODE_TYPE {
-    D3DVS_ADDRMODE_ABSOLUTE = 0 << D3DVS_ADDRESSMODE_SHIFT,
-    D3DVS_ADDRMODE_RELATIVE = 1 << D3DVS_ADDRESSMODE_SHIFT,
-}}
-pub const D3DSHADER_ADDRESSMODE_SHIFT: ::DWORD = 13;
-pub const D3DSHADER_ADDRESSMODE_MASK: ::DWORD = 1 << D3DSHADER_ADDRESSMODE_SHIFT;
-ENUM!{enum D3DSHADER_ADDRESSMODE_TYPE {
-    D3DSHADER_ADDRMODE_ABSOLUTE = 0 << D3DSHADER_ADDRESSMODE_SHIFT,
-    D3DSHADER_ADDRMODE_RELATIVE = 1 << D3DSHADER_ADDRESSMODE_SHIFT,
-}}
-pub const D3DVS_SWIZZLE_SHIFT: ::DWORD = 16;
-pub const D3DVS_SWIZZLE_MASK: ::DWORD = 0x00FF0000;
-pub const D3DVS_X_X: ::DWORD = 0 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_X_Y: ::DWORD = 1 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_X_Z: ::DWORD = 2 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_X_W: ::DWORD = 3 << D3DVS_SWIZZLE_SHIFT;
-pub const D3DVS_Y_X: ::DWORD = 0 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Y_Y: ::DWORD = 1 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Y_Z: ::DWORD = 2 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Y_W: ::DWORD = 3 << (D3DVS_SWIZZLE_SHIFT + 2);
-pub const D3DVS_Z_X: ::DWORD = 0 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_Z_Y: ::DWORD = 1 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_Z_Z: ::DWORD = 2 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_Z_W: ::DWORD = 3 << (D3DVS_SWIZZLE_SHIFT + 4);
-pub const D3DVS_W_X: ::DWORD = 0 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_W_Y: ::DWORD = 1 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_W_Z: ::DWORD = 2 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_W_W: ::DWORD = 3 << (D3DVS_SWIZZLE_SHIFT + 6);
-pub const D3DVS_NOSWIZZLE: ::DWORD = D3DVS_X_X | D3DVS_Y_Y | D3DVS_Z_Z | D3DVS_W_W;
-pub const D3DSP_SWIZZLE_SHIFT: ::DWORD = 16;
-pub const D3DSP_SWIZZLE_MASK: ::DWORD = 0x00FF0000;
-pub const D3DSP_NOSWIZZLE: ::DWORD = (0 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (1 << (D3DSP_SWIZZLE_SHIFT + 2)) | (2 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (3 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATERED: ::DWORD = (0 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (0 << (D3DSP_SWIZZLE_SHIFT + 2)) | (0 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (0 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATEGREEN: ::DWORD = (1 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (1 << (D3DSP_SWIZZLE_SHIFT + 2)) | (1 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (1 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATEBLUE: ::DWORD = (2 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (2 << (D3DSP_SWIZZLE_SHIFT + 2)) | (2 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (2 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_REPLICATEALPHA: ::DWORD = (3 << (D3DSP_SWIZZLE_SHIFT + 0))
-    | (3 << (D3DSP_SWIZZLE_SHIFT + 2)) | (3 << (D3DSP_SWIZZLE_SHIFT + 4))
-    | (3 << (D3DSP_SWIZZLE_SHIFT + 6));
-pub const D3DSP_SRCMOD_SHIFT: ::DWORD = 24;
-pub const D3DSP_SRCMOD_MASK: ::DWORD = 0x0F000000;
-ENUM!{enum D3DSHADER_PARAM_SRCMOD_TYPE {
-    D3DSPSM_NONE = 0 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_NEG = 1 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_BIAS = 2 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_BIASNEG = 3 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_SIGN = 4 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_SIGNNEG = 5 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_COMP = 6 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_X2 = 7 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_X2NEG = 8 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_DZ = 9 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_DW = 10 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_ABS = 11 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_ABSNEG = 12 << D3DSP_SRCMOD_SHIFT,
-    D3DSPSM_NOT = 13 << D3DSP_SRCMOD_SHIFT,
-}}
-pub const D3DSP_MIN_PRECISION_SHIFT: ::DWORD = 14;
-pub const D3DSP_MIN_PRECISION_MASK: ::DWORD = 0x0000C000;
-ENUM!{enum D3DSHADER_MIN_PRECISION {
-    D3DMP_DEFAULT = 0,
-    D3DMP_16 = 1,
-    D3DMP_2_8 = 2,
-}}
-pub const D3DSI_COMMENTSIZE_SHIFT: ::DWORD = 16;
-pub const D3DSI_COMMENTSIZE_MASK: ::DWORD = 0x7FFF0000;
-pub const D3DPS_END: ::DWORD = 0x0000FFFF;
-pub const D3DVS_END: ::DWORD = 0x0000FFFF;
-ENUM!{enum D3DBASISTYPE {
-    D3DBASIS_BEZIER = 0,
-    D3DBASIS_BSPLINE = 1,
-    D3DBASIS_CATMULL_ROM = 2,
-}}
-ENUM!{enum D3DDEGREETYPE {
-    D3DDEGREE_LINEAR = 1,
-    D3DDEGREE_QUADRATIC = 2,
-    D3DDEGREE_CUBIC = 3,
-    D3DDEGREE_QUINTIC = 5,
-}}
-ENUM!{enum D3DPATCHEDGESTYLE {
-    D3DPATCHEDGE_DISCRETE = 0,
-    D3DPATCHEDGE_CONTINUOUS = 1,
-}}
-ENUM!{enum D3DSTATEBLOCKTYPE {
-    D3DSBT_ALL = 1,
-    D3DSBT_PIXELSTATE = 2,
-    D3DSBT_VERTEXSTATE = 3,
-}}
-FLAGS!{enum D3DVERTEXBLENDFLAGS {
-    D3DVBF_DISABLE = 0,
-    D3DVBF_1WEIGHTS = 1,
-    D3DVBF_2WEIGHTS = 2,
-    D3DVBF_3WEIGHTS = 3,
-    D3DVBF_TWEENING = 255,
-    D3DVBF_0WEIGHTS = 256,
-}}
-ENUM!{enum D3DTEXTURETRANSFORMFLAGS {
-    D3DTTFF_DISABLE = 0,
-    D3DTTFF_COUNT1 = 1,
-    D3DTTFF_COUNT2 = 2,
-    D3DTTFF_COUNT3 = 3,
-    D3DTTFF_COUNT4 = 4,
-    D3DTTFF_PROJECTED = 256,
-}}
-pub const D3DFVF_TEXTUREFORMAT2: ::DWORD = 0;
-pub const D3DFVF_TEXTUREFORMAT1: ::DWORD = 3;
-pub const D3DFVF_TEXTUREFORMAT3: ::DWORD = 1;
-pub const D3DFVF_TEXTUREFORMAT4: ::DWORD = 2;
-ENUM!{enum D3DDEVTYPE {
-    D3DDEVTYPE_HAL = 1,
-    D3DDEVTYPE_REF = 2,
-    D3DDEVTYPE_SW = 3,
-    D3DDEVTYPE_NULLREF = 4,
-}}
-ENUM!{enum D3DMULTISAMPLE_TYPE {
-    D3DMULTISAMPLE_NONE = 0,
-    D3DMULTISAMPLE_NONMASKABLE = 1,
-    D3DMULTISAMPLE_2_SAMPLES = 2,
-    D3DMULTISAMPLE_3_SAMPLES = 3,
-    D3DMULTISAMPLE_4_SAMPLES = 4,
-    D3DMULTISAMPLE_5_SAMPLES = 5,
-    D3DMULTISAMPLE_6_SAMPLES = 6,
-    D3DMULTISAMPLE_7_SAMPLES = 7,
-    D3DMULTISAMPLE_8_SAMPLES = 8,
-    D3DMULTISAMPLE_9_SAMPLES = 9,
-    D3DMULTISAMPLE_10_SAMPLES = 10,
-    D3DMULTISAMPLE_11_SAMPLES = 11,
-    D3DMULTISAMPLE_12_SAMPLES = 12,
-    D3DMULTISAMPLE_13_SAMPLES = 13,
-    D3DMULTISAMPLE_14_SAMPLES = 14,
-    D3DMULTISAMPLE_15_SAMPLES = 15,
-    D3DMULTISAMPLE_16_SAMPLES = 16,
-}}
-ENUM!{enum D3DFORMAT {
-    D3DFMT_UNKNOWN = 0,
-    D3DFMT_R8G8B8 = 20,
-    D3DFMT_A8R8G8B8 = 21,
-    D3DFMT_X8R8G8B8 = 22,
-    D3DFMT_R5G6B5 = 23,
-    D3DFMT_X1R5G5B5 = 24,
-    D3DFMT_A1R5G5B5 = 25,
-    D3DFMT_A4R4G4B4 = 26,
-    D3DFMT_R3G3B2 = 27,
-    D3DFMT_A8 = 28,
-    D3DFMT_A8R3G3B2 = 29,
-    D3DFMT_X4R4G4B4 = 30,
-    D3DFMT_A2B10G10R10 = 31,
-    D3DFMT_A8B8G8R8 = 32,
-    D3DFMT_X8B8G8R8 = 33,
-    D3DFMT_G16R16 = 34,
-    D3DFMT_A2R10G10B10 = 35,
-    D3DFMT_A16B16G16R16 = 36,
-    D3DFMT_A8P8 = 40,
-    D3DFMT_P8 = 41,
-    D3DFMT_L8 = 50,
-    D3DFMT_A8L8 = 51,
-    D3DFMT_A4L4 = 52,
-    D3DFMT_V8U8 = 60,
-    D3DFMT_L6V5U5 = 61,
-    D3DFMT_X8L8V8U8 = 62,
-    D3DFMT_Q8W8V8U8 = 63,
-    D3DFMT_V16U16 = 64,
-    D3DFMT_A2W10V10U10 = 67,
-    D3DFMT_UYVY = MAKEFOURCC!(b'U', b'Y', b'V', b'Y') as u32,
-    D3DFMT_R8G8_B8G8 = MAKEFOURCC!(b'R', b'G', b'B', b'G') as u32,
-    D3DFMT_YUY2 = MAKEFOURCC!(b'Y', b'U', b'Y', b'2') as u32,
-    D3DFMT_G8R8_G8B8 = MAKEFOURCC!(b'G', b'R', b'G', b'B') as u32,
-    D3DFMT_DXT1 = MAKEFOURCC!(b'D', b'X', b'T', b'1') as u32,
-    D3DFMT_DXT2 = MAKEFOURCC!(b'D', b'X', b'T', b'2') as u32,
-    D3DFMT_DXT3 = MAKEFOURCC!(b'D', b'X', b'T', b'3') as u32,
-    D3DFMT_DXT4 = MAKEFOURCC!(b'D', b'X', b'T', b'4') as u32,
-    D3DFMT_DXT5 = MAKEFOURCC!(b'D', b'X', b'T', b'5') as u32,
-    D3DFMT_D16_LOCKABLE = 70,
-    D3DFMT_D32 = 71,
-    D3DFMT_D15S1 = 73,
-    D3DFMT_D24S8 = 75,
-    D3DFMT_D24X8 = 77,
-    D3DFMT_D24X4S4 = 79,
-    D3DFMT_D16 = 80,
-    D3DFMT_D32F_LOCKABLE = 82,
-    D3DFMT_D24FS8 = 83,
-    D3DFMT_D32_LOCKABLE = 84,
-    D3DFMT_S8_LOCKABLE = 85,
-    D3DFMT_L16 = 81,
-    D3DFMT_VERTEXDATA = 100,
-    D3DFMT_INDEX16 = 101,
-    D3DFMT_INDEX32 = 102,
-    D3DFMT_Q16W16V16U16 = 110,
-    D3DFMT_MULTI2_ARGB8 = MAKEFOURCC!(b'M', b'E', b'T', b'1') as u32,
-    D3DFMT_R16F = 111,
-    D3DFMT_G16R16F = 112,
-    D3DFMT_A16B16G16R16F = 113,
-    D3DFMT_R32F = 114,
-    D3DFMT_G32R32F = 115,
-    D3DFMT_A32B32G32R32F = 116,
-    D3DFMT_CxV8U8 = 117,
-    D3DFMT_A1 = 118,
-    D3DFMT_A2B10G10R10_XR_BIAS = 119,
-    D3DFMT_BINARYBUFFER = 199,
-}}
-STRUCT!{struct D3DDISPLAYMODE {
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: ::UINT,
-    Format: D3DFORMAT,
-}}
-STRUCT!{struct D3DDEVICE_CREATION_PARAMETERS {
-    AdapterOrdinal: ::UINT,
-    DeviceType: D3DDEVTYPE,
-    hFocusWindow: ::HWND,
-    BehaviorFlags: ::DWORD,
-}}
-ENUM!{enum D3DSWAPEFFECT {
-    D3DSWAPEFFECT_DISCARD = 1,
-    D3DSWAPEFFECT_FLIP = 2,
-    D3DSWAPEFFECT_COPY = 3,
-    D3DSWAPEFFECT_OVERLAY = 4,
-    D3DSWAPEFFECT_FLIPEX = 5,
-}}
-ENUM!{enum D3DPOOL {
-    D3DPOOL_DEFAULT = 0,
-    D3DPOOL_MANAGED = 1,
-    D3DPOOL_SYSTEMMEM = 2,
-    D3DPOOL_SCRATCH = 3,
-}}
-pub const D3DPRESENT_RATE_DEFAULT: ::DWORD = 0x00000000;
-STRUCT!{struct D3DPRESENT_PARAMETERS {
-    BackBufferWidth: ::UINT,
-    BackBufferHeight: ::UINT,
-    BackBufferFormat: D3DFORMAT,
-    BackBufferCount: ::UINT,
-    MultiSampleType: D3DMULTISAMPLE_TYPE,
-    MultiSampleQuality: ::DWORD,
-    SwapEffect: D3DSWAPEFFECT,
-    hDeviceWindow: ::HWND,
-    Windowed: ::BOOL,
-    EnableAutoDepthStencil: ::BOOL,
-    AutoDepthStencilFormat: D3DFORMAT,
-    Flags: ::DWORD,
-    FullScreen_RefreshRateInHz: ::UINT,
-    PresentationInterval: ::UINT,
-}}
-pub const D3DPRESENTFLAG_LOCKABLE_BACKBUFFER: ::DWORD = 0x00000001;
-pub const D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL: ::DWORD = 0x00000002;
-pub const D3DPRESENTFLAG_DEVICECLIP: ::DWORD = 0x00000004;
-pub const D3DPRESENTFLAG_VIDEO: ::DWORD = 0x00000010;
-pub const D3DPRESENTFLAG_NOAUTOROTATE: ::DWORD = 0x00000020;
-pub const D3DPRESENTFLAG_UNPRUNEDMODE: ::DWORD = 0x00000040;
-pub const D3DPRESENTFLAG_OVERLAY_LIMITEDRGB: ::DWORD = 0x00000080;
-pub const D3DPRESENTFLAG_OVERLAY_YCbCr_BT709: ::DWORD = 0x00000100;
-pub const D3DPRESENTFLAG_OVERLAY_YCbCr_xvYCC: ::DWORD = 0x00000200;
-pub const D3DPRESENTFLAG_RESTRICTED_CONTENT: ::DWORD = 0x00000400;
-pub const D3DPRESENTFLAG_RESTRICT_SHARED_RESOURCE_DRIVER: ::DWORD = 0x00000800;
-STRUCT!{nodebug struct D3DGAMMARAMP {
-    red: [::WORD; 256],
-    green: [::WORD; 256],
-    blue: [::WORD; 256],
-}}
-ENUM!{enum D3DBACKBUFFER_TYPE {
-    D3DBACKBUFFER_TYPE_MONO = 0,
-    D3DBACKBUFFER_TYPE_LEFT = 1,
-    D3DBACKBUFFER_TYPE_RIGHT = 2,
-}}
-ENUM!{enum D3DRESOURCETYPE {
-    D3DRTYPE_SURFACE = 1,
-    D3DRTYPE_VOLUME = 2,
-    D3DRTYPE_TEXTURE = 3,
-    D3DRTYPE_VOLUMETEXTURE = 4,
-    D3DRTYPE_CUBETEXTURE = 5,
-    D3DRTYPE_VERTEXBUFFER = 6,
-    D3DRTYPE_INDEXBUFFER = 7,
-}}
-pub const D3DUSAGE_RENDERTARGET: ::DWORD = 0x00000001;
-pub const D3DUSAGE_DEPTHSTENCIL: ::DWORD = 0x00000002;
-pub const D3DUSAGE_DYNAMIC: ::DWORD = 0x00000200;
-pub const D3DUSAGE_NONSECURE: ::DWORD = 0x00800000;
-pub const D3DUSAGE_AUTOGENMIPMAP: ::DWORD = 0x00000400;
-pub const D3DUSAGE_DMAP: ::DWORD = 0x00004000;
-pub const D3DUSAGE_QUERY_LEGACYBUMPMAP: ::DWORD = 0x00008000;
-pub const D3DUSAGE_QUERY_SRGBREAD: ::DWORD = 0x00010000;
-pub const D3DUSAGE_QUERY_FILTER: ::DWORD = 0x00020000;
-pub const D3DUSAGE_QUERY_SRGBWRITE: ::DWORD = 0x00040000;
-pub const D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING: ::DWORD = 0x00080000;
-pub const D3DUSAGE_QUERY_VERTEXTEXTURE: ::DWORD = 0x00100000;
-pub const D3DUSAGE_QUERY_WRAPANDMIP: ::DWORD = 0x00200000;
-pub const D3DUSAGE_WRITEONLY: ::DWORD = 0x00000008;
-pub const D3DUSAGE_SOFTWAREPROCESSING: ::DWORD = 0x00000010;
-pub const D3DUSAGE_DONOTCLIP: ::DWORD = 0x00000020;
-pub const D3DUSAGE_POINTS: ::DWORD = 0x00000040;
-pub const D3DUSAGE_RTPATCHES: ::DWORD = 0x00000080;
-pub const D3DUSAGE_NPATCHES: ::DWORD = 0x00000100;
-pub const D3DUSAGE_TEXTAPI: ::DWORD = 0x10000000;
-pub const D3DUSAGE_RESTRICTED_CONTENT: ::DWORD = 0x00000800;
-pub const D3DUSAGE_RESTRICT_SHARED_RESOURCE: ::DWORD = 0x00002000;
-pub const D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER: ::DWORD = 0x00001000;
-ENUM!{enum D3DCUBEMAP_FACES {
-    D3DCUBEMAP_FACE_POSITIVE_X = 0,
-    D3DCUBEMAP_FACE_NEGATIVE_X = 1,
-    D3DCUBEMAP_FACE_POSITIVE_Y = 2,
-    D3DCUBEMAP_FACE_NEGATIVE_Y = 3,
-    D3DCUBEMAP_FACE_POSITIVE_Z = 4,
-    D3DCUBEMAP_FACE_NEGATIVE_Z = 5,
-}}
-pub const D3DLOCK_READONLY: ::DWORD = 0x00000010;
-pub const D3DLOCK_DISCARD: ::DWORD = 0x00002000;
-pub const D3DLOCK_NOOVERWRITE: ::DWORD = 0x00001000;
-pub const D3DLOCK_NOSYSLOCK: ::DWORD = 0x00000800;
-pub const D3DLOCK_DONOTWAIT: ::DWORD = 0x00004000;
-pub const D3DLOCK_NO_DIRTY_UPDATE: ::DWORD = 0x00008000;
-STRUCT!{struct D3DVERTEXBUFFER_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    Size: ::UINT,
-    FVF: ::DWORD,
-}}
-STRUCT!{struct D3DINDEXBUFFER_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    Size: ::UINT,
-}}
-STRUCT!{struct D3DSURFACE_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    MultiSampleType: D3DMULTISAMPLE_TYPE,
-    MultiSampleQuality: ::DWORD,
-    Width: ::UINT,
-    Height: ::UINT,
-}}
-STRUCT!{struct D3DVOLUME_DESC {
-    Format: D3DFORMAT,
-    Type: D3DRESOURCETYPE,
-    Usage: ::DWORD,
-    Pool: D3DPOOL,
-    Width: ::UINT,
-    Height: ::UINT,
-    Depth: ::UINT,
-}}
-STRUCT!{struct D3DLOCKED_RECT {
-    Pitch: ::INT,
-    pBits: *mut ::c_void,
-}}
-STRUCT!{struct D3DBOX {
-    Left: ::UINT,
-    Top: ::UINT,
-    Right: ::UINT,
-    Bottom: ::UINT,
-    Front: ::UINT,
-    Back: ::UINT,
-}}
-STRUCT!{struct D3DLOCKED_BOX {
-    RowPitch: ::INT,
-    SlicePitch: ::INT,
-    pBits: *mut ::c_void,
-}}
-STRUCT!{struct D3DRANGE {
-    Offset: ::UINT,
-    Size: ::UINT,
-}}
-STRUCT!{struct D3DRECTPATCH_INFO {
-    StartVertexOffsetWidth: ::UINT,
-    StartVertexOffsetHeight: ::UINT,
-    Width: ::UINT,
-    Height: ::UINT,
-    Stride: ::UINT,
-    Basis: D3DBASISTYPE,
-    Degree: D3DDEGREETYPE,
-}}
-STRUCT!{struct D3DTRIPATCH_INFO {
-    StartVertexOffset: ::UINT,
-    NumVertices: ::UINT,
-    Basis: D3DBASISTYPE,
-    Degree: D3DDEGREETYPE,
-}}
-pub const MAX_DEVICE_IDENTIFIER_STRING: usize = 512;
-STRUCT!{nodebug struct D3DADAPTER_IDENTIFIER9 {
-    Driver: [::c_char; MAX_DEVICE_IDENTIFIER_STRING],
-    Description: [::c_char; MAX_DEVICE_IDENTIFIER_STRING],
-    DeviceName: [::c_char; 32],
-    DriverVersion: ::LARGE_INTEGER,
-    VendorId: ::DWORD,
-    DeviceId: ::DWORD,
-    SubSysId: ::DWORD,
-    Revision: ::DWORD,
-    DeviceIdentifier: ::GUID,
-    WHQLLevel: ::DWORD,
-}}
-STRUCT!{struct D3DRASTER_STATUS {
-    InVBlank: ::BOOL,
-    ScanLine: ::UINT,
-}}
-ENUM!{enum D3DDEBUGMONITORTOKENS {
-    D3DDMT_ENABLE = 0,
-    D3DDMT_DISABLE = 1,
-}}
-ENUM!{enum D3DQUERYTYPE {
-    D3DQUERYTYPE_VCACHE = 4,
-    D3DQUERYTYPE_RESOURCEMANAGER = 5,
-    D3DQUERYTYPE_VERTEXSTATS = 6,
-    D3DQUERYTYPE_EVENT = 8,
-    D3DQUERYTYPE_OCCLUSION = 9,
-    D3DQUERYTYPE_TIMESTAMP = 10,
-    D3DQUERYTYPE_TIMESTAMPDISJOINT = 11,
-    D3DQUERYTYPE_TIMESTAMPFREQ = 12,
-    D3DQUERYTYPE_PIPELINETIMINGS = 13,
-    D3DQUERYTYPE_INTERFACETIMINGS = 14,
-    D3DQUERYTYPE_VERTEXTIMINGS = 15,
-    D3DQUERYTYPE_PIXELTIMINGS = 16,
-    D3DQUERYTYPE_BANDWIDTHTIMINGS = 17,
-    D3DQUERYTYPE_CACHEUTILIZATION = 18,
-    D3DQUERYTYPE_MEMORYPRESSURE = 19,
-}}
-pub const D3DISSUE_END: ::DWORD = 1 << 0;
-pub const D3DISSUE_BEGIN: ::DWORD = 1 << 1;
-pub const D3DGETDATA_FLUSH: ::DWORD = 1 << 0;
-STRUCT!{struct D3DRESOURCESTATS {
-    bThrashing: ::BOOL,
-    ApproxBytesDownloaded: ::DWORD,
-    NumEvicts: ::DWORD,
-    NumVidCreates: ::DWORD,
-    LastPri: ::DWORD,
-    NumUsed: ::DWORD,
-    NumUsedInVidMem: ::DWORD,
-    WorkingSet: ::DWORD,
-    WorkingSetBytes: ::DWORD,
-    TotalManaged: ::DWORD,
-    TotalBytes: ::DWORD,
-}}
-pub const D3DRTYPECOUNT: usize = 8;
-STRUCT!{struct D3DDEVINFO_RESOURCEMANAGER {
-    stats: [D3DRESOURCESTATS; 8 /*D3DRTYPECOUNT, rust bug?*/],
-}}
-pub type LPD3DDEVINFO_RESOURCEMANAGER = *mut D3DDEVINFO_RESOURCEMANAGER;
-STRUCT!{struct D3DDEVINFO_D3DVERTEXSTATS {
-    NumRenderedTriangles: ::DWORD,
-    NumExtraClippingTriangles: ::DWORD,
-}}
-pub type LPD3DDEVINFO_D3DVERTEXSTATS = *mut D3DDEVINFO_D3DVERTEXSTATS;
-STRUCT!{struct D3DDEVINFO_VCACHE {
-    Pattern: ::DWORD,
-    OptMethod: ::DWORD,
-    CacheSize: ::DWORD,
-    MagicNumber: ::DWORD,
-}}
-pub type LPD3DDEVINFO_VCACHE = *mut D3DDEVINFO_VCACHE;
-STRUCT!{struct D3DDEVINFO_D3D9PIPELINETIMINGS {
-    VertexProcessingTimePercent: ::FLOAT,
-    PixelProcessingTimePercent: ::FLOAT,
-    OtherGPUProcessingTimePercent: ::FLOAT,
-    GPUIdleTimePercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9INTERFACETIMINGS {
-    WaitingForGPUToUseApplicationResourceTimePercent: ::FLOAT,
-    WaitingForGPUToAcceptMoreCommandsTimePercent: ::FLOAT,
-    WaitingForGPUToStayWithinLatencyTimePercent: ::FLOAT,
-    WaitingForGPUExclusiveResourceTimePercent: ::FLOAT,
-    WaitingForGPUOtherTimePercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9STAGETIMINGS {
-    MemoryProcessingPercent: ::FLOAT,
-    ComputationProcessingPercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9BANDWIDTHTIMINGS {
-    MaxBandwidthUtilized: ::FLOAT,
-    FrontEndUploadMemoryUtilizedPercent: ::FLOAT,
-    VertexRateUtilizedPercent: ::FLOAT,
-    TriangleSetupRateUtilizedPercent: ::FLOAT,
-    FillRateUtilizedPercent: ::FLOAT,
-}}
-STRUCT!{struct D3DDEVINFO_D3D9CACHEUTILIZATION {
-    TextureCacheHitRate: ::FLOAT,
-    PostTransformVertexCacheHitRate: ::FLOAT,
-}}
-STRUCT!{struct D3DMEMORYPRESSURE {
-    BytesEvictedFromProcess: ::UINT64,
-    SizeOfInefficientAllocation: ::UINT64,
-    LevelOfEfficiency: ::DWORD,
-}}
-ENUM!{enum D3DCOMPOSERECTSOP {
-    D3DCOMPOSERECTS_COPY = 1,
-    D3DCOMPOSERECTS_OR = 2,
-    D3DCOMPOSERECTS_AND = 3,
-    D3DCOMPOSERECTS_NEG = 4,
-}}
-STRUCT!{struct D3DCOMPOSERECTDESC {
-    X: ::USHORT,
-    Y: ::USHORT,
-    Width: ::USHORT,
-    Height: ::USHORT,
-}}
-STRUCT!{struct D3DCOMPOSERECTDESTINATION {
-    SrcRectIndex: ::USHORT,
-    Reserved: ::USHORT,
-    X: ::SHORT,
-    Y: ::SHORT,
-}}
-pub const D3DCOMPOSERECTS_MAXNUMRECTS: ::DWORD = 0xFFFF;
-pub const D3DCONVOLUTIONMONO_MAXWIDTH: ::DWORD = 7;
-pub const D3DCONVOLUTIONMONO_MAXHEIGHT: ::DWORD = D3DCONVOLUTIONMONO_MAXWIDTH;
-pub const D3DFMT_A1_SURFACE_MAXWIDTH: ::DWORD = 8192;
-pub const D3DFMT_A1_SURFACE_MAXHEIGHT: ::DWORD = 2048;
-STRUCT!{struct D3DPRESENTSTATS {
-    PresentCount: ::UINT,
-    PresentRefreshCount: ::UINT,
-    SyncRefreshCount: ::UINT,
-    SyncQPCTime: ::LARGE_INTEGER,
-    SyncGPUTime: ::LARGE_INTEGER,
-}}
-ENUM!{enum D3DSCANLINEORDERING {
-    D3DSCANLINEORDERING_UNKNOWN = 0,
-    D3DSCANLINEORDERING_PROGRESSIVE = 1,
-    D3DSCANLINEORDERING_INTERLACED = 2,
-}}
-STRUCT!{struct D3DDISPLAYMODEEX {
-    Size: ::UINT,
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: ::UINT,
-    Format: D3DFORMAT,
-    ScanLineOrdering: D3DSCANLINEORDERING,
-}}
-STRUCT!{struct D3DDISPLAYMODEFILTER {
-    Size: ::UINT,
-    Format: D3DFORMAT,
-    ScanLineOrdering: D3DSCANLINEORDERING,
-}}
-ENUM!{enum D3DDISPLAYROTATION {
-    D3DDISPLAYROTATION_IDENTITY = 1,
-    D3DDISPLAYROTATION_90 = 2,
-    D3DDISPLAYROTATION_180 = 3,
-    D3DDISPLAYROTATION_270 = 4,
-}}
-pub const D3D9_RESOURCE_PRIORITY_MINIMUM: ::DWORD = 0x28000000;
-pub const D3D9_RESOURCE_PRIORITY_LOW: ::DWORD = 0x50000000;
-pub const D3D9_RESOURCE_PRIORITY_NORMAL: ::DWORD = 0x78000000;
-pub const D3D9_RESOURCE_PRIORITY_HIGH: ::DWORD = 0xa0000000;
-pub const D3D9_RESOURCE_PRIORITY_MAXIMUM: ::DWORD = 0xc8000000;
-pub const D3D_OMAC_SIZE: usize = 16;
-STRUCT!{struct D3D_OMAC {
-    Omac: [::BYTE; D3D_OMAC_SIZE],
-}}
-ENUM!{enum D3DAUTHENTICATEDCHANNELTYPE {
-    D3DAUTHENTICATEDCHANNEL_D3D9 = 1,
-    D3DAUTHENTICATEDCHANNEL_DRIVER_SOFTWARE = 2,
-    D3DAUTHENTICATEDCHANNEL_DRIVER_HARDWARE = 3,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERY_INPUT {
-    QueryType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT {
-    omac: D3D_OMAC,
-    QueryType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-    ReturnCode: ::HRESULT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS {
-    Value: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYPROTECTION_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    ProtectionFlags: D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYCHANNELTYPE_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    ChannelType: D3DAUTHENTICATEDCHANNELTYPE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYDEVICEHANDLE_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DeviceHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    DXVA2DecodeHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DXVA2DecodeHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    DeviceHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESSCOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    NumRestrictedSharedResourceProcesses: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    ProcessIndex: ::UINT,
-}}
-ENUM!{enum D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE {
-    PROCESSIDTYPE_UNKNOWN = 0,
-    PROCESSIDTYPE_DWM = 1,
-    PROCESSIDTYPE_HANDLE = 2,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    ProcessIndex: ::UINT,
-    ProcessIdentifer: D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE,
-    ProcessHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYUNRESTRICTEDPROTECTEDSHAREDRESOURCECOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    NumUnrestrictedProtectedSharedResources: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    NumOutputIDs: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    OutputIDIndex: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    DeviceHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    OutputIDIndex: ::UINT,
-    OutputID: ::UINT64,
-}}
-FLAGS!{enum D3DBUSTYPE {
-    D3DBUSTYPE_OTHER = 0x00000000,
-    D3DBUSTYPE_PCI = 0x00000001,
-    D3DBUSTYPE_PCIX = 0x00000002,
-    D3DBUSTYPE_PCIEXPRESS = 0x00000003,
-    D3DBUSTYPE_AGP = 0x00000004,
-    D3DBUSIMPL_MODIFIER_INSIDE_OF_CHIPSET = 0x00010000,
-    MD3DBUSIMPL_ODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP = 0x00020000,
-    D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET = 0x00030000,
-    D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR = 0x00040000,
-    D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE = 0x00050000,
-    D3DBUSIMPL_MODIFIER_NON_STANDARD = 0x80000000,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    BusType: D3DBUSTYPE,
-    bAccessibleInContiguousBlocks: ::BOOL,
-    bAccessibleInNonContiguousBlocks: ::BOOL,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUIDCOUNT_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    NumEncryptionGuids: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_INPUT {
-    Input: D3DAUTHENTICATEDCHANNEL_QUERY_INPUT,
-    EncryptionGuidIndex: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    EncryptionGuidIndex: ::UINT,
-    EncryptionGuid: ::GUID,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_QUERYUNCOMPRESSEDENCRYPTIONLEVEL_OUTPUT {
-    Output: D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT,
-    EncryptionGuid: ::GUID,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT {
-    omac: D3D_OMAC,
-    ConfigureType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT {
-    omac: D3D_OMAC,
-    ConfigureType: ::GUID,
-    hChannel: ::HANDLE,
-    SequenceNumber: ::UINT,
-    ReturnCode: ::HRESULT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGUREINITIALIZE {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    StartSequenceQuery: ::UINT,
-    StartSequenceConfigure: ::UINT,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGUREPROTECTION {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    Protections: D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURECRYPTOSESSION {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    DXVA2DecodeHandle: ::HANDLE,
-    CryptoSessionHandle: ::HANDLE,
-    DeviceHandle: ::HANDLE,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGURESHAREDRESOURCE {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    ProcessIdentiferType: D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE,
-    ProcessHandle: ::HANDLE,
-    AllowAccess: ::BOOL,
-}}
-STRUCT!{struct D3DAUTHENTICATEDCHANNEL_CONFIGUREUNCOMPRESSEDENCRYPTION {
-    Parameters: D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT,
-    EncryptionGuid: ::GUID,
-}}
-STRUCT!{struct D3DENCRYPTED_BLOCK_INFO {
-    NumEncryptedBytesAtBeginning: ::UINT,
-    NumBytesInSkipPattern: ::UINT,
-    NumBytesInEncryptPattern: ::UINT,
-}}
-STRUCT!{struct D3DAES_CTR_IV {
-    IV: ::UINT64,
-    Count: ::UINT64,
-}}
diff --git a/vendor/winapi-0.2.8/src/d3dcommon.rs b/vendor/winapi-0.2.8/src/d3dcommon.rs
deleted file mode 100644
index 51a1b4e8ed..0000000000
--- a/vendor/winapi-0.2.8/src/d3dcommon.rs
+++ /dev/null
@@ -1,753 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of d3dcommon.h
-ENUM!{enum D3D_DRIVER_TYPE {
-    D3D_DRIVER_TYPE_UNKNOWN,
-    D3D_DRIVER_TYPE_HARDWARE,
-    D3D_DRIVER_TYPE_REFERENCE,
-    D3D_DRIVER_TYPE_NULL,
-    D3D_DRIVER_TYPE_SOFTWARE,
-    D3D_DRIVER_TYPE_WARP,
-}}
-ENUM!{enum D3D_FEATURE_LEVEL {
-    D3D_FEATURE_LEVEL_9_1 = 0x9100,
-    D3D_FEATURE_LEVEL_9_2 = 0x9200,
-    D3D_FEATURE_LEVEL_9_3 = 0x9300,
-    D3D_FEATURE_LEVEL_10_0 = 0xa000,
-    D3D_FEATURE_LEVEL_10_1 = 0xa100,
-    D3D_FEATURE_LEVEL_11_0 = 0xb000,
-    D3D_FEATURE_LEVEL_11_1 = 0xb100,
-    D3D_FEATURE_LEVEL_12_0  = 0xc000,
-    D3D_FEATURE_LEVEL_12_1  = 0xc100,
-}}
-ENUM!{enum D3D_PRIMITIVE_TOPOLOGY {
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED = 0,
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST = 1,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST = 2,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP = 3,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST = 4,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP = 5,
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ = 10,
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ = 11,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ = 12,
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ = 13,
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST = 33,
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST = 34,
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST = 35,
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST = 36,
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST = 37,
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST = 38,
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST = 39,
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST = 40,
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST = 41,
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST = 42,
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST = 43,
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST = 44,
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST = 45,
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST = 46,
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST = 47,
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST = 48,
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST = 49,
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST = 50,
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST = 51,
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST = 52,
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST = 53,
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST = 54,
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST = 55,
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST = 56,
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST = 57,
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST = 58,
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST = 59,
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST = 60,
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST = 61,
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST = 62,
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST = 63,
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST = 64,
-}}
-pub const D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
-pub const D3D10_PRIMITIVE_TOPOLOGY_POINTLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ;
-pub const D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ;
-pub const D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
-pub const D3D11_PRIMITIVE_TOPOLOGY_POINTLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_POINTLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINELIST_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ;
-pub const D3D11_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_1_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_2_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_4_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_5_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_6_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_7_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_8_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_9_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_10_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_11_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_12_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_13_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_14_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_15_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_16_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_17_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_18_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_19_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_20_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_21_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_22_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_23_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_24_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_25_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_26_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_27_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_28_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST;
-pub const D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST: ::D3D_PRIMITIVE_TOPOLOGY =
-    D3D_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST;
-ENUM!{enum D3D_PRIMITIVE {
-    D3D_PRIMITIVE_UNDEFINED = 0,
-    D3D_PRIMITIVE_POINT = 1,
-    D3D_PRIMITIVE_LINE = 2,
-    D3D_PRIMITIVE_TRIANGLE = 3,
-    D3D_PRIMITIVE_LINE_ADJ = 6,
-    D3D_PRIMITIVE_TRIANGLE_ADJ = 7,
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH = 8,
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH = 9,
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH = 10,
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH = 11,
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH = 12,
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH = 13,
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH = 14,
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH = 15,
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH = 16,
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH = 17,
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH = 18,
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH = 19,
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH = 20,
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH = 21,
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH = 22,
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH = 23,
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH = 24,
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH = 25,
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH = 26,
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH = 28,
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH = 29,
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH = 30,
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH = 31,
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH = 32,
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH = 33,
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH = 34,
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH = 35,
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH = 36,
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH = 37,
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH = 38,
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH = 39,
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH = 40,
-}}
-pub const D3D10_PRIMITIVE_UNDEFINED: ::D3D_PRIMITIVE = D3D_PRIMITIVE_UNDEFINED;
-pub const D3D10_PRIMITIVE_POINT: ::D3D_PRIMITIVE = D3D_PRIMITIVE_POINT;
-pub const D3D10_PRIMITIVE_LINE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE;
-pub const D3D10_PRIMITIVE_TRIANGLE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE;
-pub const D3D10_PRIMITIVE_LINE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE_ADJ;
-pub const D3D10_PRIMITIVE_TRIANGLE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE_ADJ;
-pub const D3D11_PRIMITIVE_UNDEFINED: ::D3D_PRIMITIVE = D3D_PRIMITIVE_UNDEFINED;
-pub const D3D11_PRIMITIVE_POINT: ::D3D_PRIMITIVE = D3D_PRIMITIVE_POINT;
-pub const D3D11_PRIMITIVE_LINE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE;
-pub const D3D11_PRIMITIVE_TRIANGLE: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE;
-pub const D3D11_PRIMITIVE_LINE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_LINE_ADJ;
-pub const D3D11_PRIMITIVE_TRIANGLE_ADJ: ::D3D_PRIMITIVE = D3D_PRIMITIVE_TRIANGLE_ADJ;
-pub const D3D11_PRIMITIVE_1_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_1_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_2_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_2_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_3_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_3_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_4_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_4_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_5_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_5_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_6_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_6_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_7_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_7_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_8_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_8_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_9_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_9_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_10_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_10_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_11_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_11_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_12_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_12_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_13_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_13_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_14_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_14_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_15_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_15_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_16_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_16_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_17_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_17_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_18_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_18_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_19_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_19_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_20_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_20_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_21_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_21_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_22_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_22_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_23_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_23_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_24_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_24_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_25_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_25_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_26_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_26_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_27_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_27_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_28_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_28_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_29_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_30_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_31_CONTROL_POINT_PATCH;
-pub const D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH: ::D3D_PRIMITIVE =
-    D3D_PRIMITIVE_32_CONTROL_POINT_PATCH;
-ENUM!{enum D3D_SRV_DIMENSION {
-    D3D_SRV_DIMENSION_UNKNOWN = 0,
-    D3D_SRV_DIMENSION_BUFFER = 1,
-    D3D_SRV_DIMENSION_TEXTURE1D = 2,
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY = 3,
-    D3D_SRV_DIMENSION_TEXTURE2D = 4,
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY = 5,
-    D3D_SRV_DIMENSION_TEXTURE2DMS = 6,
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY = 7,
-    D3D_SRV_DIMENSION_TEXTURE3D = 8,
-    D3D_SRV_DIMENSION_TEXTURECUBE = 9,
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY = 10,
-    D3D_SRV_DIMENSION_BUFFEREX = 11,
-}}
-pub const D3D10_SRV_DIMENSION_UNKNOWN: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_UNKNOWN;
-pub const D3D10_SRV_DIMENSION_BUFFER: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFER;
-pub const D3D10_SRV_DIMENSION_TEXTURE1D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1D;
-pub const D3D10_SRV_DIMENSION_TEXTURE1DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY;
-pub const D3D10_SRV_DIMENSION_TEXTURE2D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2D;
-pub const D3D10_SRV_DIMENSION_TEXTURE2DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY;
-pub const D3D10_SRV_DIMENSION_TEXTURE2DMS: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMS;
-pub const D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;
-pub const D3D10_SRV_DIMENSION_TEXTURE3D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE3D;
-pub const D3D10_SRV_DIMENSION_TEXTURECUBE: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBE;
-pub const D3D10_1_SRV_DIMENSION_UNKNOWN: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_UNKNOWN;
-pub const D3D10_1_SRV_DIMENSION_BUFFER: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFER;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE1D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1D;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2D;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2DMS: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMS;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;
-pub const D3D10_1_SRV_DIMENSION_TEXTURE3D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE3D;
-pub const D3D10_1_SRV_DIMENSION_TEXTURECUBE: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBE;
-pub const D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY;
-pub const D3D11_SRV_DIMENSION_UNKNOWN: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_UNKNOWN;
-pub const D3D11_SRV_DIMENSION_BUFFER: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFER;
-pub const D3D11_SRV_DIMENSION_TEXTURE1D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1D;
-pub const D3D11_SRV_DIMENSION_TEXTURE1DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE1DARRAY;
-pub const D3D11_SRV_DIMENSION_TEXTURE2D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2D;
-pub const D3D11_SRV_DIMENSION_TEXTURE2DARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DARRAY;
-pub const D3D11_SRV_DIMENSION_TEXTURE2DMS: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMS;
-pub const D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE2DMSARRAY;
-pub const D3D11_SRV_DIMENSION_TEXTURE3D: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURE3D;
-pub const D3D11_SRV_DIMENSION_TEXTURECUBE: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBE;
-pub const D3D11_SRV_DIMENSION_TEXTURECUBEARRAY: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_TEXTURECUBEARRAY;
-pub const D3D11_SRV_DIMENSION_BUFFEREX: ::D3D_SRV_DIMENSION =
-    D3D_SRV_DIMENSION_BUFFEREX;
-STRUCT!{struct D3D_SHADER_MACRO {
-    Name: ::LPCSTR,
-    Definition: ::LPCSTR,
-}}
-pub type LPD3D_SHADER_MACRO = *mut D3D_SHADER_MACRO;
-RIDL!(
-interface ID3D10Blob(ID3D10BlobVtbl): IUnknown(IUnknownVtbl) {
-    fn GetBufferPointer(&mut self) -> ::LPVOID,
-    fn GetBufferSize(&mut self) -> ::SIZE_T
-}
-);
-pub type LPD3D10BLOB = *mut ID3D10Blob;
-pub type ID3DBlob = ID3D10Blob;
-pub type LPD3DBLOB = *mut ID3DBlob;
-ENUM!{enum D3D_INCLUDE_TYPE {
-    D3D_INCLUDE_LOCAL = 0,
-    D3D_INCLUDE_SYSTEM,
-}}
-pub const D3D10_INCLUDE_LOCAL: ::D3D_INCLUDE_TYPE = D3D_INCLUDE_LOCAL;
-pub const D3D10_INCLUDE_SYSTEM: ::D3D_INCLUDE_TYPE = D3D_INCLUDE_SYSTEM;
-RIDL!(
-interface ID3DInclude(ID3DIncludeVtbl) {
-    fn Open(
-        &mut self, IncludeType: D3D_INCLUDE_TYPE, pFileName: ::LPCSTR, pParentData: ::LPCVOID,
-        ppData: *mut ::LPCVOID, pBytes: *mut ::UINT
-    ) -> ::HRESULT,
-    fn Close(&mut self, pData: ::LPCVOID) -> ::HRESULT
-}
-);
-pub type LPD3DINCLUDE = *mut ID3DInclude;
-ENUM!{enum D3D_SHADER_VARIABLE_CLASS {
-    D3D_SVC_SCALAR = 0,
-    D3D_SVC_VECTOR,
-    D3D_SVC_MATRIX_ROWS,
-    D3D_SVC_MATRIX_COLUMNS,
-    D3D_SVC_OBJECT,
-    D3D_SVC_STRUCT,
-    D3D_SVC_INTERFACE_CLASS,
-    D3D_SVC_INTERFACE_POINTER,
-}}
-pub const D3D10_SVC_SCALAR: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_SCALAR;
-pub const D3D10_SVC_VECTOR: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_VECTOR;
-pub const D3D10_SVC_MATRIX_ROWS: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_MATRIX_ROWS;
-pub const D3D10_SVC_MATRIX_COLUMNS: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_MATRIX_COLUMNS;
-pub const D3D10_SVC_OBJECT: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_OBJECT;
-pub const D3D10_SVC_STRUCT: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_STRUCT;
-pub const D3D11_SVC_INTERFACE_CLASS: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_INTERFACE_CLASS;
-pub const D3D11_SVC_INTERFACE_POINTER: ::D3D_SHADER_VARIABLE_CLASS = D3D_SVC_INTERFACE_POINTER;
-FLAGS!{enum D3D_SHADER_VARIABLE_FLAGS {
-    D3D_SVF_USERPACKED = 1,
-    D3D_SVF_USED = 2,
-    D3D_SVF_INTERFACE_POINTER = 4,
-    D3D_SVF_INTERFACE_PARAMETER = 8,
-}}
-pub const D3D10_SVF_USERPACKED: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_USERPACKED;
-pub const D3D10_SVF_USED: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_USED;
-pub const D3D11_SVF_INTERFACE_POINTER: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_INTERFACE_POINTER;
-pub const D3D11_SVF_INTERFACE_PARAMETER: ::D3D_SHADER_VARIABLE_FLAGS = D3D_SVF_INTERFACE_PARAMETER;
-ENUM!{enum D3D_SHADER_VARIABLE_TYPE {
-    D3D_SVT_VOID = 0,
-    D3D_SVT_BOOL = 1,
-    D3D_SVT_INT = 2,
-    D3D_SVT_FLOAT = 3,
-    D3D_SVT_STRING = 4,
-    D3D_SVT_TEXTURE = 5,
-    D3D_SVT_TEXTURE1D = 6,
-    D3D_SVT_TEXTURE2D = 7,
-    D3D_SVT_TEXTURE3D = 8,
-    D3D_SVT_TEXTURECUBE = 9,
-    D3D_SVT_SAMPLER = 10,
-    D3D_SVT_SAMPLER1D = 11,
-    D3D_SVT_SAMPLER2D = 12,
-    D3D_SVT_SAMPLER3D = 13,
-    D3D_SVT_SAMPLERCUBE = 14,
-    D3D_SVT_PIXELSHADER = 15,
-    D3D_SVT_VERTEXSHADER = 16,
-    D3D_SVT_PIXELFRAGMENT = 17,
-    D3D_SVT_VERTEXFRAGMENT = 18,
-    D3D_SVT_UINT = 19,
-    D3D_SVT_UINT8 = 20,
-    D3D_SVT_GEOMETRYSHADER = 21,
-    D3D_SVT_RASTERIZER = 22,
-    D3D_SVT_DEPTHSTENCIL = 23,
-    D3D_SVT_BLEND = 24,
-    D3D_SVT_BUFFER = 25,
-    D3D_SVT_CBUFFER = 26,
-    D3D_SVT_TBUFFER = 27,
-    D3D_SVT_TEXTURE1DARRAY = 28,
-    D3D_SVT_TEXTURE2DARRAY = 29,
-    D3D_SVT_RENDERTARGETVIEW = 30,
-    D3D_SVT_DEPTHSTENCILVIEW = 31,
-    D3D_SVT_TEXTURE2DMS = 32,
-    D3D_SVT_TEXTURE2DMSARRAY = 33,
-    D3D_SVT_TEXTURECUBEARRAY = 34,
-    D3D_SVT_HULLSHADER = 35,
-    D3D_SVT_DOMAINSHADER = 36,
-    D3D_SVT_INTERFACE_POINTER = 37,
-    D3D_SVT_COMPUTESHADER = 38,
-    D3D_SVT_DOUBLE = 39,
-    D3D_SVT_RWTEXTURE1D = 40,
-    D3D_SVT_RWTEXTURE1DARRAY = 41,
-    D3D_SVT_RWTEXTURE2D = 42,
-    D3D_SVT_RWTEXTURE2DARRAY = 43,
-    D3D_SVT_RWTEXTURE3D = 44,
-    D3D_SVT_RWBUFFER = 45,
-    D3D_SVT_BYTEADDRESS_BUFFER = 46,
-    D3D_SVT_RWBYTEADDRESS_BUFFER = 47,
-    D3D_SVT_STRUCTURED_BUFFER = 48,
-    D3D_SVT_RWSTRUCTURED_BUFFER = 49,
-    D3D_SVT_APPEND_STRUCTURED_BUFFER = 50,
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER = 51,
-    D3D_SVT_MIN8FLOAT = 52,
-    D3D_SVT_MIN10FLOAT = 53,
-    D3D_SVT_MIN16FLOAT = 54,
-    D3D_SVT_MIN12INT = 55,
-    D3D_SVT_MIN16INT = 56,
-    D3D_SVT_MIN16UINT = 57,
-}}
-pub const D3D10_SVT_VOID: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_VOID;
-pub const D3D10_SVT_BOOL: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BOOL;
-pub const D3D10_SVT_INT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_INT;
-pub const D3D10_SVT_FLOAT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_FLOAT;
-pub const D3D10_SVT_STRING: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_STRING;
-pub const D3D10_SVT_TEXTURE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE;
-pub const D3D10_SVT_TEXTURE1D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE1D;
-pub const D3D10_SVT_TEXTURE2D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2D;
-pub const D3D10_SVT_TEXTURE3D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE3D;
-pub const D3D10_SVT_TEXTURECUBE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURECUBE;
-pub const D3D10_SVT_SAMPLER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER;
-pub const D3D10_SVT_SAMPLER1D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER1D;
-pub const D3D10_SVT_SAMPLER2D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER2D;
-pub const D3D10_SVT_SAMPLER3D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLER3D;
-pub const D3D10_SVT_SAMPLERCUBE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_SAMPLERCUBE;
-pub const D3D10_SVT_PIXELSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_PIXELSHADER;
-pub const D3D10_SVT_VERTEXSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_VERTEXSHADER;
-pub const D3D10_SVT_PIXELFRAGMENT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_PIXELFRAGMENT;
-pub const D3D10_SVT_VERTEXFRAGMENT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_VERTEXFRAGMENT;
-pub const D3D10_SVT_UINT: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_UINT;
-pub const D3D10_SVT_UINT8: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_UINT8;
-pub const D3D10_SVT_GEOMETRYSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_GEOMETRYSHADER;
-pub const D3D10_SVT_RASTERIZER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RASTERIZER;
-pub const D3D10_SVT_DEPTHSTENCIL: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DEPTHSTENCIL;
-pub const D3D10_SVT_BLEND: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BLEND;
-pub const D3D10_SVT_BUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BUFFER;
-pub const D3D10_SVT_CBUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_CBUFFER;
-pub const D3D10_SVT_TBUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TBUFFER;
-pub const D3D10_SVT_TEXTURE1DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE1DARRAY;
-pub const D3D10_SVT_TEXTURE2DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2DARRAY;
-pub const D3D10_SVT_RENDERTARGETVIEW: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RENDERTARGETVIEW;
-pub const D3D10_SVT_DEPTHSTENCILVIEW: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DEPTHSTENCILVIEW;
-pub const D3D10_SVT_TEXTURE2DMS: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2DMS;
-pub const D3D10_SVT_TEXTURE2DMSARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURE2DMSARRAY;
-pub const D3D10_SVT_TEXTURECUBEARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_TEXTURECUBEARRAY;
-pub const D3D11_SVT_HULLSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_HULLSHADER;
-pub const D3D11_SVT_DOMAINSHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DOMAINSHADER;
-pub const D3D11_SVT_INTERFACE_POINTER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_INTERFACE_POINTER;
-pub const D3D11_SVT_COMPUTESHADER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_COMPUTESHADER;
-pub const D3D11_SVT_DOUBLE: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_DOUBLE;
-pub const D3D11_SVT_RWTEXTURE1D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE1D;
-pub const D3D11_SVT_RWTEXTURE1DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE1DARRAY;
-pub const D3D11_SVT_RWTEXTURE2D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE2D;
-pub const D3D11_SVT_RWTEXTURE2DARRAY: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE2DARRAY;
-pub const D3D11_SVT_RWTEXTURE3D: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWTEXTURE3D;
-pub const D3D11_SVT_RWBUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_RWBUFFER;
-pub const D3D11_SVT_BYTEADDRESS_BUFFER: ::D3D_SHADER_VARIABLE_TYPE = D3D_SVT_BYTEADDRESS_BUFFER;
-pub const D3D11_SVT_RWBYTEADDRESS_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_RWBYTEADDRESS_BUFFER;
-pub const D3D11_SVT_STRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_STRUCTURED_BUFFER;
-pub const D3D11_SVT_RWSTRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_RWSTRUCTURED_BUFFER;
-pub const D3D11_SVT_APPEND_STRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_APPEND_STRUCTURED_BUFFER;
-pub const D3D11_SVT_CONSUME_STRUCTURED_BUFFER: ::D3D_SHADER_VARIABLE_TYPE =
-    D3D_SVT_CONSUME_STRUCTURED_BUFFER;
-FLAGS!{enum D3D_SHADER_INPUT_FLAGS {
-    D3D_SIF_USERPACKED = 0x1,
-    D3D_SIF_COMPARISON_SAMPLER = 0x2,
-    D3D_SIF_TEXTURE_COMPONENT_0 = 0x4,
-    D3D_SIF_TEXTURE_COMPONENT_1 = 0x8,
-    D3D_SIF_TEXTURE_COMPONENTS = 0xc,
-    D3D_SIF_UNUSED = 0x10,
-}}
-pub const D3D10_SIF_USERPACKED: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_USERPACKED;
-pub const D3D10_SIF_COMPARISON_SAMPLER: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_COMPARISON_SAMPLER;
-pub const D3D10_SIF_TEXTURE_COMPONENT_0: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_TEXTURE_COMPONENT_0;
-pub const D3D10_SIF_TEXTURE_COMPONENT_1: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_TEXTURE_COMPONENT_1;
-pub const D3D10_SIF_TEXTURE_COMPONENTS: ::D3D_SHADER_INPUT_FLAGS = D3D_SIF_TEXTURE_COMPONENTS;
-ENUM!{enum D3D_SHADER_INPUT_TYPE {
-    D3D_SIT_CBUFFER,
-    D3D_SIT_TBUFFER,
-    D3D_SIT_TEXTURE,
-    D3D_SIT_SAMPLER,
-    D3D_SIT_UAV_RWTYPED,
-    D3D_SIT_STRUCTURED,
-    D3D_SIT_UAV_RWSTRUCTURED,
-    D3D_SIT_BYTEADDRESS,
-    D3D_SIT_UAV_RWBYTEADDRESS,
-    D3D_SIT_UAV_APPEND_STRUCTURED,
-    D3D_SIT_UAV_CONSUME_STRUCTURED,
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER,
-}}
-pub const D3D10_SIT_CBUFFER: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_CBUFFER;
-pub const D3D10_SIT_TBUFFER: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_TBUFFER;
-pub const D3D10_SIT_TEXTURE: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_TEXTURE;
-pub const D3D10_SIT_SAMPLER: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_SAMPLER;
-pub const D3D11_SIT_UAV_RWTYPED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_RWTYPED;
-pub const D3D11_SIT_STRUCTURED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_STRUCTURED;
-pub const D3D11_SIT_UAV_RWSTRUCTURED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_RWSTRUCTURED;
-pub const D3D11_SIT_BYTEADDRESS: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_BYTEADDRESS;
-pub const D3D11_SIT_UAV_RWBYTEADDRESS: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_RWBYTEADDRESS;
-pub const D3D11_SIT_UAV_APPEND_STRUCTURED: ::D3D_SHADER_INPUT_TYPE = D3D_SIT_UAV_APPEND_STRUCTURED;
-pub const D3D11_SIT_UAV_CONSUME_STRUCTURED: ::D3D_SHADER_INPUT_TYPE =
-    D3D_SIT_UAV_CONSUME_STRUCTURED;
-pub const D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER: ::D3D_SHADER_INPUT_TYPE =
-    D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER;
-FLAGS!{enum D3D_SHADER_CBUFFER_FLAGS {
-    D3D_CBF_USERPACKED = 1,
-}}
-pub const D3D10_CBF_USERPACKED: ::D3D_SHADER_CBUFFER_FLAGS = D3D_CBF_USERPACKED;
-ENUM!{enum D3D_CBUFFER_TYPE {
-    D3D_CT_CBUFFER,
-    D3D_CT_TBUFFER,
-    D3D_CT_INTERFACE_POINTERS,
-    D3D_CT_RESOURCE_BIND_INFO,
-}}
-pub const D3D10_CT_CBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_CBUFFER;
-pub const D3D10_CT_TBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_TBUFFER;
-pub const D3D11_CT_CBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_CBUFFER;
-pub const D3D11_CT_TBUFFER: ::D3D_CBUFFER_TYPE = D3D_CT_TBUFFER;
-pub const D3D11_CT_INTERFACE_POINTERS: ::D3D_CBUFFER_TYPE = D3D_CT_INTERFACE_POINTERS;
-pub const D3D11_CT_RESOURCE_BIND_INFO: ::D3D_CBUFFER_TYPE = D3D_CT_RESOURCE_BIND_INFO;
-ENUM!{enum D3D_NAME {
-    D3D_NAME_UNDEFINED = 0,
-    D3D_NAME_POSITION = 1,
-    D3D_NAME_CLIP_DISTANCE = 2,
-    D3D_NAME_CULL_DISTANCE = 3,
-    D3D_NAME_RENDER_TARGET_ARRAY_INDEX = 4,
-    D3D_NAME_VIEWPORT_ARRAY_INDEX = 5,
-    D3D_NAME_VERTEX_ID = 6,
-    D3D_NAME_PRIMITIVE_ID = 7,
-    D3D_NAME_INSTANCE_ID = 8,
-    D3D_NAME_IS_FRONT_FACE = 9,
-    D3D_NAME_SAMPLE_INDEX = 10,
-    D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR = 11,
-    D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR = 12,
-    D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR = 13,
-    D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR = 14,
-    D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR = 15,
-    D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR = 16,
-    D3D_NAME_TARGET = 64,
-    D3D_NAME_DEPTH = 65,
-    D3D_NAME_COVERAGE = 66,
-    D3D_NAME_DEPTH_GREATER_EQUAL = 67,
-    D3D_NAME_DEPTH_LESS_EQUAL = 68,
-}}
-pub const D3D10_NAME_UNDEFINED: D3D_NAME = D3D_NAME_UNDEFINED;
-pub const D3D10_NAME_POSITION: D3D_NAME = D3D_NAME_POSITION;
-pub const D3D10_NAME_CLIP_DISTANCE: D3D_NAME = D3D_NAME_CLIP_DISTANCE;
-pub const D3D10_NAME_CULL_DISTANCE: D3D_NAME = D3D_NAME_CULL_DISTANCE;
-pub const D3D10_NAME_RENDER_TARGET_ARRAY_INDEX: D3D_NAME = D3D_NAME_RENDER_TARGET_ARRAY_INDEX;
-pub const D3D10_NAME_VIEWPORT_ARRAY_INDEX: D3D_NAME = D3D_NAME_VIEWPORT_ARRAY_INDEX;
-pub const D3D10_NAME_VERTEX_ID: D3D_NAME = D3D_NAME_VERTEX_ID;
-pub const D3D10_NAME_PRIMITIVE_ID: D3D_NAME = D3D_NAME_PRIMITIVE_ID;
-pub const D3D10_NAME_INSTANCE_ID: D3D_NAME = D3D_NAME_INSTANCE_ID;
-pub const D3D10_NAME_IS_FRONT_FACE: D3D_NAME = D3D_NAME_IS_FRONT_FACE;
-pub const D3D10_NAME_SAMPLE_INDEX: D3D_NAME = D3D_NAME_SAMPLE_INDEX;
-pub const D3D10_NAME_TARGET: D3D_NAME = D3D_NAME_TARGET;
-pub const D3D10_NAME_DEPTH: D3D_NAME = D3D_NAME_DEPTH;
-pub const D3D10_NAME_COVERAGE: D3D_NAME = D3D_NAME_COVERAGE;
-pub const D3D11_NAME_FINAL_QUAD_EDGE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_QUAD_EDGE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_QUAD_INSIDE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_QUAD_INSIDE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_TRI_EDGE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_TRI_EDGE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_TRI_INSIDE_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_TRI_INSIDE_TESSFACTOR;
-pub const D3D11_NAME_FINAL_LINE_DETAIL_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_LINE_DETAIL_TESSFACTOR;
-pub const D3D11_NAME_FINAL_LINE_DENSITY_TESSFACTOR: D3D_NAME = D3D_NAME_FINAL_LINE_DENSITY_TESSFACTOR;
-pub const D3D11_NAME_DEPTH_GREATER_EQUAL: D3D_NAME = D3D_NAME_DEPTH_GREATER_EQUAL;
-pub const D3D11_NAME_DEPTH_LESS_EQUAL: D3D_NAME = D3D_NAME_DEPTH_LESS_EQUAL;
-ENUM!{enum D3D_RESOURCE_RETURN_TYPE {
-    D3D_RETURN_TYPE_UNORM = 1,
-    D3D_RETURN_TYPE_SNORM = 2,
-    D3D_RETURN_TYPE_SINT = 3,
-    D3D_RETURN_TYPE_UINT = 4,
-    D3D_RETURN_TYPE_FLOAT = 5,
-    D3D_RETURN_TYPE_MIXED = 6,
-    D3D_RETURN_TYPE_DOUBLE = 7,
-    D3D_RETURN_TYPE_CONTINUED = 8,
-}}
-pub const D3D10_RETURN_TYPE_UNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UNORM;
-pub const D3D10_RETURN_TYPE_SNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SNORM;
-pub const D3D10_RETURN_TYPE_SINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SINT;
-pub const D3D10_RETURN_TYPE_UINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UINT;
-pub const D3D10_RETURN_TYPE_FLOAT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_FLOAT;
-pub const D3D10_RETURN_TYPE_MIXED: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_MIXED;
-pub const D3D11_RETURN_TYPE_UNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UNORM;
-pub const D3D11_RETURN_TYPE_SNORM: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SNORM;
-pub const D3D11_RETURN_TYPE_SINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_SINT;
-pub const D3D11_RETURN_TYPE_UINT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_UINT;
-pub const D3D11_RETURN_TYPE_FLOAT: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_FLOAT;
-pub const D3D11_RETURN_TYPE_MIXED: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_MIXED;
-pub const D3D11_RETURN_TYPE_DOUBLE: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_DOUBLE;
-pub const D3D11_RETURN_TYPE_CONTINUED: ::D3D_RESOURCE_RETURN_TYPE = D3D_RETURN_TYPE_CONTINUED;
-ENUM!{enum D3D_REGISTER_COMPONENT_TYPE {
-    D3D_REGISTER_COMPONENT_UNKNOWN = 0,
-    D3D_REGISTER_COMPONENT_UINT32 = 1,
-    D3D_REGISTER_COMPONENT_SINT32 = 2,
-    D3D_REGISTER_COMPONENT_FLOAT32 = 3,
-}}
-pub const D3D10_REGISTER_COMPONENT_UNKNOWN: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_UNKNOWN;
-pub const D3D10_REGISTER_COMPONENT_UINT32: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_UINT32;
-pub const D3D10_REGISTER_COMPONENT_SINT32: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_SINT32;
-pub const D3D10_REGISTER_COMPONENT_FLOAT32: ::D3D_REGISTER_COMPONENT_TYPE =
-    D3D_REGISTER_COMPONENT_FLOAT32;
-ENUM!{enum D3D_TESSELLATOR_DOMAIN {
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED,
-    D3D_TESSELLATOR_DOMAIN_ISOLINE,
-    D3D_TESSELLATOR_DOMAIN_TRI,
-    D3D_TESSELLATOR_DOMAIN_QUAD,
-}}
-pub const D3D11_TESSELLATOR_DOMAIN_UNDEFINED: ::D3D_TESSELLATOR_DOMAIN =
-    D3D_TESSELLATOR_DOMAIN_UNDEFINED;
-pub const D3D11_TESSELLATOR_DOMAIN_ISOLINE: ::D3D_TESSELLATOR_DOMAIN =
-    D3D_TESSELLATOR_DOMAIN_ISOLINE;
-pub const D3D11_TESSELLATOR_DOMAIN_TRI: ::D3D_TESSELLATOR_DOMAIN = D3D_TESSELLATOR_DOMAIN_TRI;
-pub const D3D11_TESSELLATOR_DOMAIN_QUAD: ::D3D_TESSELLATOR_DOMAIN = D3D_TESSELLATOR_DOMAIN_QUAD;
-ENUM!{enum D3D_TESSELLATOR_PARTITIONING {
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED,
-    D3D_TESSELLATOR_PARTITIONING_INTEGER,
-    D3D_TESSELLATOR_PARTITIONING_POW2,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD,
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN,
-}}
-pub const D3D11_TESSELLATOR_PARTITIONING_UNDEFINED: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_UNDEFINED;
-pub const D3D11_TESSELLATOR_PARTITIONING_INTEGER: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_INTEGER;
-pub const D3D11_TESSELLATOR_PARTITIONING_POW2: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_POW2;
-pub const D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD;
-pub const D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN: ::D3D_TESSELLATOR_PARTITIONING =
-    D3D_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN;
-ENUM!{enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE {
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED,
-    D3D_TESSELLATOR_OUTPUT_POINT,
-    D3D_TESSELLATOR_OUTPUT_LINE,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW,
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW,
-}}
-pub const D3D11_TESSELLATOR_OUTPUT_UNDEFINED: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_UNDEFINED;
-pub const D3D11_TESSELLATOR_OUTPUT_POINT: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_POINT;
-pub const D3D11_TESSELLATOR_OUTPUT_LINE: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_LINE;
-pub const D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CW;
-pub const D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW: ::D3D_TESSELLATOR_OUTPUT_PRIMITIVE =
-    D3D_TESSELLATOR_OUTPUT_TRIANGLE_CCW;
-ENUM!{enum D3D_MIN_PRECISION {
-    D3D_MIN_PRECISION_DEFAULT,
-    D3D_MIN_PRECISION_FLOAT_16,
-    D3D_MIN_PRECISION_FLOAT_2_8,
-    D3D_MIN_PRECISION_RESERVED,
-    D3D_MIN_PRECISION_SINT_16,
-    D3D_MIN_PRECISION_UINT_16,
-    D3D_MIN_PRECISION_ANY_16 = 0xf0,
-    D3D_MIN_PRECISION_ANY_10 = 0xf1,
-}}
-ENUM!{enum D3D_INTERPOLATION_MODE {
-    D3D_INTERPOLATION_UNDEFINED,
-    D3D_INTERPOLATION_CONSTANT,
-    D3D_INTERPOLATION_LINEAR,
-    D3D_INTERPOLATION_LINEAR_CENTROID,
-    D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE,
-    D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_CENTROID,
-    D3D_INTERPOLATION_LINEAR_SAMPLE,
-    D3D_INTERPOLATION_LINEAR_NOPERSPECTIVE_SAMPLE,
-}}
-FLAGS!{enum D3D_PARAMETER_FLAGS {
-    D3D_PF_NONE = 0,
-    D3D_PF_IN = 0x1,
-    D3D_PF_OUT = 0x2,
-}}
diff --git a/vendor/winapi-0.2.8/src/d3dcompiler.rs b/vendor/winapi-0.2.8/src/d3dcompiler.rs
deleted file mode 100644
index 6918888f6a..0000000000
--- a/vendor/winapi-0.2.8/src/d3dcompiler.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const D3DCOMPILER_DLL: &'static str = "d3dcompiler_47.dll";
-pub const D3D_COMPILER_VERSION: DWORD = 47;
-pub const D3DCOMPILE_DEBUG: DWORD = 1 << 0;
-pub const D3DCOMPILE_SKIP_VALIDATION: DWORD = 1 << 1;
-pub const D3DCOMPILE_SKIP_OPTIMIZATION: DWORD = 1 << 2;
-pub const D3DCOMPILE_PACK_MATRIX_ROW_MAJOR: DWORD = 1 << 3;
-pub const D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR: DWORD = 1 << 4;
-pub const D3DCOMPILE_PARTIAL_PRECISION: DWORD = 1 << 5;
-pub const D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT: DWORD = 1 << 6;
-pub const D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT: DWORD = 1 << 7;
-pub const D3DCOMPILE_NO_PRESHADER: DWORD = 1 << 8;
-pub const D3DCOMPILE_AVOID_FLOW_CONTROL: DWORD = 1 << 9;
-pub const D3DCOMPILE_PREFER_FLOW_CONTROL: DWORD = 1 << 10;
-pub const D3DCOMPILE_ENABLE_STRICTNESS: DWORD = 1 << 11;
-pub const D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY: DWORD = 1 << 12;
-pub const D3DCOMPILE_IEEE_STRICTNESS: DWORD = 1 << 13;
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL0: DWORD = 1 << 14;
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL1: DWORD = 0;
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL2: DWORD = (1 << 14) | (1 << 15);
-pub const D3DCOMPILE_OPTIMIZATION_LEVEL3: DWORD = 1 << 15;
-pub const D3DCOMPILE_RESERVED16: DWORD = 1 << 16;
-pub const D3DCOMPILE_RESERVED17: DWORD = 1 << 17;
-pub const D3DCOMPILE_WARNINGS_ARE_ERRORS: DWORD = 1 << 18;
-pub const D3DCOMPILE_RESOURCES_MAY_ALIAS: DWORD = 1 << 19;
-pub const D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES: DWORD = 1 << 20;
-pub const D3DCOMPILE_ALL_RESOURCES_BOUND: DWORD = 1 << 21;
-pub const D3DCOMPILE_EFFECT_CHILD_EFFECT: DWORD = 1 << 0;
-pub const D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS: DWORD = 1 << 1;
-pub const D3D_COMPILE_STANDARD_FILE_INCLUDE: *mut ID3DInclude = 1 as *mut ID3DInclude;
-pub const D3DCOMPILE_SECDATA_MERGE_UAV_SLOTS: DWORD = 0x00000001;
-pub const D3DCOMPILE_SECDATA_PRESERVE_TEMPLATE_SLOTS: DWORD = 0x00000002;
-pub const D3DCOMPILE_SECDATA_REQUIRE_TEMPLATE_MATCH: DWORD = 0x00000004;
-pub const D3D_DISASM_ENABLE_COLOR_CODE: DWORD = 0x00000001;
-pub const D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS: DWORD = 0x00000002;
-pub const D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING: DWORD = 0x00000004;
-pub const D3D_DISASM_ENABLE_INSTRUCTION_CYCLE: DWORD = 0x00000008;
-pub const D3D_DISASM_DISABLE_DEBUG_INFO: DWORD = 0x00000010;
-pub const D3D_DISASM_ENABLE_INSTRUCTION_OFFSET: DWORD = 0x00000020;
-pub const D3D_DISASM_INSTRUCTION_ONLY: DWORD = 0x00000040;
-pub const D3D_DISASM_PRINT_HEX_LITERALS: DWORD = 0x00000080;
-pub const D3D_GET_INST_OFFSETS_INCLUDE_NON_EXECUTABLE: DWORD = 0x00000001;
-FLAGS!{enum D3DCOMPILER_STRIP_FLAGS {
-    D3DCOMPILER_STRIP_REFLECTION_DATA = 0x00000001,
-    D3DCOMPILER_STRIP_DEBUG_INFO = 0x00000002,
-    D3DCOMPILER_STRIP_TEST_BLOBS = 0x00000004,
-    D3DCOMPILER_STRIP_PRIVATE_DATA = 0x00000008,
-    D3DCOMPILER_STRIP_ROOT_SIGNATURE = 0x00000010,
-    D3DCOMPILER_STRIP_FORCE_DWORD = 0x7fffffff,
-}}
-ENUM!{enum D3D_BLOB_PART {
-    D3D_BLOB_INPUT_SIGNATURE_BLOB,
-    D3D_BLOB_OUTPUT_SIGNATURE_BLOB,
-    D3D_BLOB_INPUT_AND_OUTPUT_SIGNATURE_BLOB,
-    D3D_BLOB_PATCH_CONSTANT_SIGNATURE_BLOB,
-    D3D_BLOB_ALL_SIGNATURE_BLOB,
-    D3D_BLOB_DEBUG_INFO,
-    D3D_BLOB_LEGACY_SHADER,
-    D3D_BLOB_XNA_PREPASS_SHADER,
-    D3D_BLOB_XNA_SHADER,
-    D3D_BLOB_PDB,
-    D3D_BLOB_PRIVATE_DATA,
-    D3D_BLOB_ROOT_SIGNATURE,
-    D3D_BLOB_TEST_ALTERNATE_SHADER = 0x8000,
-    D3D_BLOB_TEST_COMPILE_DETAILS,
-    D3D_BLOB_TEST_COMPILE_PERF,
-    D3D_BLOB_TEST_COMPILE_REPORT,
-}}
-STRUCT!{struct D3D_SHADER_DATA {
-    pBytecode: LPCVOID,
-    BytecodeLength: SIZE_T,
-}}
diff --git a/vendor/winapi-0.2.8/src/dbghelp.rs b/vendor/winapi-0.2.8/src/dbghelp.rs
deleted file mode 100644
index 8c20d72bf0..0000000000
--- a/vendor/winapi-0.2.8/src/dbghelp.rs
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! DbgHelp include file
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct LOADED_IMAGE {
-    ModuleName: ::PSTR,
-    hFile: ::HANDLE,
-    MappedAddress: ::PUCHAR,
-    FileHeader: ::PIMAGE_NT_HEADERS64,
-    LastRvaSection: ::PIMAGE_SECTION_HEADER,
-    NumberOfSections: ::ULONG,
-    Sections: ::PIMAGE_SECTION_HEADER,
-    Characteristics: ::ULONG,
-    fSystemImage: ::BOOLEAN,
-    fDOSImage: ::BOOLEAN,
-    fReadOnly: ::BOOLEAN,
-    Version: ::UCHAR,
-    Links: ::LIST_ENTRY,
-    SizeOfImage: ::ULONG,
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct LOADED_IMAGE {
-    ModuleName: ::PSTR,
-    hFile: ::HANDLE,
-    MappedAddress: ::PUCHAR,
-    FileHeader: ::PIMAGE_NT_HEADERS32,
-    LastRvaSection: ::PIMAGE_SECTION_HEADER,
-    NumberOfSections: ::ULONG,
-    Sections: ::PIMAGE_SECTION_HEADER,
-    Characteristics: ::ULONG,
-    fSystemImage: ::BOOLEAN,
-    fDOSImage: ::BOOLEAN,
-    fReadOnly: ::BOOLEAN,
-    Version: ::UCHAR,
-    Links: ::LIST_ENTRY,
-    SizeOfImage: ::ULONG,
-}}
-pub const MAX_SYM_NAME: usize = 2000;
-pub const ERROR_IMAGE_NOT_STRIPPED: ::DWORD = 0x8800;
-pub const ERROR_NO_DBG_POINTER: ::DWORD = 0x8801;
-pub const ERROR_NO_PDB_POINTER: ::DWORD = 0x8802;
-pub type PFIND_DEBUG_FILE_CALLBACK = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PFIND_DEBUG_FILE_CALLBACKW = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCWSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PFINDFILEINPATHCALLBACK = Option<unsafe extern "system" fn(
-    filename: ::PCSTR, context: ::PVOID,
-) -> ::BOOL>;
-pub type PFINDFILEINPATHCALLBACKW = Option<unsafe extern "system" fn(
-    filename: ::PCWSTR, context: ::PVOID,
-) -> ::BOOL>;
-pub type PFIND_EXE_FILE_CALLBACK = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PFIND_EXE_FILE_CALLBACKW = Option<unsafe extern "system" fn(
-    FileHandle: ::HANDLE, FileName: ::PCWSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct IMAGE_DEBUG_INFORMATION {
-    List: ::LIST_ENTRY,
-    ReservedSize: ::DWORD,
-    ReservedMappedBase: ::PVOID,
-    ReservedMachine: ::USHORT,
-    ReservedCharacteristics: ::USHORT,
-    ReservedCheckSum: ::DWORD,
-    ImageBase: ::DWORD,
-    SizeOfImage: ::DWORD,
-    ReservedNumberOfSections: ::DWORD,
-    ReservedSections: ::PIMAGE_SECTION_HEADER,
-    ReservedExportedNamesSize: ::DWORD,
-    ReservedExportedNames: ::PSTR,
-    ReservedNumberOfFunctionTableEntries: ::DWORD,
-    ReservedFunctionTableEntries: ::PIMAGE_FUNCTION_ENTRY,
-    ReservedLowestFunctionStartingAddress: ::DWORD,
-    ReservedHighestFunctionEndingAddress: ::DWORD,
-    ReservedNumberOfFpoTableEntries: ::DWORD,
-    ReservedFpoTableEntries: ::PFPO_DATA,
-    SizeOfCoffSymbols: ::DWORD,
-    CoffSymbols: ::PIMAGE_COFF_SYMBOLS_HEADER,
-    ReservedSizeOfCodeViewSymbols: ::DWORD,
-    ReservedCodeViewSymbols: ::PVOID,
-    ImageFilePath: ::PSTR,
-    ImageFileName: ::PSTR,
-    ReservedDebugFilePath: ::PSTR,
-    ReservedTimeDateStamp: ::DWORD,
-    ReservedRomImage: ::BOOL,
-    ReservedDebugDirectory: ::PIMAGE_DEBUG_DIRECTORY,
-    ReservedNumberOfDebugDirectories: ::DWORD,
-    ReservedOriginalFunctionTableBaseAddress: ::DWORD,
-    Reserved: [::DWORD; 2],
-}}
-#[cfg(target_arch = "x86")]
-pub type PIMAGE_DEBUG_INFORMATION = *mut IMAGE_DEBUG_INFORMATION;
-pub type PENUMDIRTREE_CALLBACK = Option<unsafe extern "system" fn(
-    FilePath: ::PCSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub type PENUMDIRTREE_CALLBACKW = Option<unsafe extern "system" fn(
-    FilePath: ::PCWSTR, CallerData: ::PVOID,
-) -> ::BOOL>;
-pub const UNDNAME_COMPLETE: ::DWORD = 0x0000;
-pub const UNDNAME_NO_LEADING_UNDERSCORES: ::DWORD = 0x0001;
-pub const UNDNAME_NO_MS_KEYWORDS: ::DWORD = 0x0002;
-pub const UNDNAME_NO_FUNCTION_RETURNS: ::DWORD = 0x0004;
-pub const UNDNAME_NO_ALLOCATION_MODEL: ::DWORD = 0x0008;
-pub const UNDNAME_NO_ALLOCATION_LANGUAGE: ::DWORD = 0x0010;
-pub const UNDNAME_NO_MS_THISTYPE: ::DWORD = 0x0020;
-pub const UNDNAME_NO_CV_THISTYPE: ::DWORD = 0x0040;
-pub const UNDNAME_NO_THISTYPE: ::DWORD = 0x0060;
-pub const UNDNAME_NO_ACCESS_SPECIFIERS: ::DWORD = 0x0080;
-pub const UNDNAME_NO_THROW_SIGNATURES: ::DWORD = 0x0100;
-pub const UNDNAME_NO_MEMBER_TYPE: ::DWORD = 0x0200;
-pub const UNDNAME_NO_RETURN_UDT_MODEL: ::DWORD = 0x0400;
-pub const UNDNAME_32_BIT_DECODE: ::DWORD = 0x0800;
-pub const UNDNAME_NAME_ONLY: ::DWORD = 0x1000;
-pub const UNDNAME_NO_ARGUMENTS: ::DWORD = 0x2000;
-pub const UNDNAME_NO_SPECIAL_SYMS: ::DWORD = 0x4000;
-pub const DBHHEADER_DEBUGDIRS: ::DWORD = 0x1;
-pub const DBHHEADER_CVMISC: ::DWORD = 0x2;
-pub const DBHHEADER_PDBGUID: ::DWORD = 0x3;
-STRUCT!{struct MODLOAD_DATA {
-    ssize: ::DWORD,
-    ssig: ::DWORD,
-    data: ::PVOID,
-    size: ::DWORD,
-    flags: ::DWORD,
-}}
-pub type PMODLOAD_DATA = *mut MODLOAD_DATA;
-STRUCT!{struct MODLOAD_CVMISC {
-    oCV: ::DWORD,
-    cCV: ::size_t,
-    oMisc: ::DWORD,
-    cMisc: ::size_t,
-    dtImage: ::DWORD,
-    cImage: ::DWORD,
-}}
-pub type PMODLOAD_CVMISC = *mut MODLOAD_CVMISC;
-STRUCT!{struct MODLOAD_PDBGUID_PDBAGE {
-    PdbGuid: ::GUID,
-    PdbAge: ::DWORD,
-}}
-pub type PMODLOAD_PDBGUID_PDBAGE = *mut MODLOAD_PDBGUID_PDBAGE;
-ENUM!{enum ADDRESS_MODE {
-    AddrMode1616,
-    AddrMode1632,
-    AddrModeReal,
-    AddrModeFlat,
-}}
-STRUCT!{struct ADDRESS64 {
-    Offset: ::DWORD64,
-    Segment: ::WORD,
-    Mode: ::ADDRESS_MODE,
-}}
-pub type LPADDRESS64 = *mut ADDRESS64;
-#[cfg(target_arch = "x86_64")]
-pub type ADDRESS = ADDRESS64;
-#[cfg(target_arch = "x86_64")]
-pub type LPADDRESS = LPADDRESS64;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct ADDRESS {
-    Offset: ::DWORD,
-    Segment: ::WORD,
-    Mode: ::ADDRESS_MODE,
-}}
-#[cfg(target_arch = "x86")]
-pub type LPADDRESS = *mut ADDRESS;
-STRUCT!{struct KDHELP64 {
-    Thread: ::DWORD64,
-    ThCallbackStack: ::DWORD,
-    ThCallbackBStore: ::DWORD,
-    NextCallback: ::DWORD,
-    FramePointer: ::DWORD,
-    KiCallUserMode: ::DWORD64,
-    KeUserCallbackDispatcher: ::DWORD64,
-    SystemRangeStart: ::DWORD64,
-    KiUserExceptionDispatcher: ::DWORD64,
-    StackBase: ::DWORD64,
-    StackLimit: ::DWORD64,
-    BuildVersion: ::DWORD,
-    Reserved0: ::DWORD,
-    Reserved1: [::DWORD64; 4],
-}}
-pub type PKDHELP64 = *mut KDHELP64;
-#[cfg(target_arch = "x86_64")]
-pub type KDHELP = KDHELP64;
-#[cfg(target_arch = "x86_64")]
-pub type PKDHELP = PKDHELP64;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct KDHELP {
-    Thread: ::DWORD,
-    ThCallbackStack: ::DWORD,
-    NextCallback: ::DWORD,
-    FramePointer: ::DWORD,
-    KiCallUserMode: ::DWORD,
-    KeUserCallbackDispatcher: ::DWORD,
-    SystemRangeStart: ::DWORD,
-    ThCallbackBStore: ::DWORD,
-    KiUserExceptionDispatcher: ::DWORD,
-    StackBase: ::DWORD,
-    StackLimit: ::DWORD,
-    Reserved: [::DWORD; 5],
-}}
-#[cfg(target_arch = "x86")]
-pub type PKDHELP = *mut KDHELP;
-STRUCT!{struct STACKFRAME64 {
-    AddrPC: ::ADDRESS64,
-    AddrReturn: ::ADDRESS64,
-    AddrFrame: ::ADDRESS64,
-    AddrStack: ::ADDRESS64,
-    AddrBStore: ::ADDRESS64,
-    FuncTableEntry: ::PVOID,
-    Params: [::DWORD64; 4],
-    Far: ::BOOL,
-    Virtual: ::BOOL,
-    Reserved: [::DWORD64; 3],
-    KdHelp: ::KDHELP64,
-}}
-pub type LPSTACKFRAME64 = *mut STACKFRAME64;
-pub const INLINE_FRAME_CONTEXT_INIT: ::DWORD = 0;
-pub const INLINE_FRAME_CONTEXT_IGNORE: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct STACKFRAME_EX {
-    AddrPC: ::ADDRESS64,
-    AddrReturn: ::ADDRESS64,
-    AddrFrame: ::ADDRESS64,
-    AddrStack: ::ADDRESS64,
-    AddrBStore: ::ADDRESS64,
-    FuncTableEntry: ::PVOID,
-    Params: [::DWORD64; 4],
-    Far: ::BOOL,
-    Virtual: ::BOOL,
-    Reserved: [::DWORD64; 3],
-    KdHelp: ::KDHELP64,
-    StackFrameSize: ::DWORD,
-    InlineFrameContext: ::DWORD,
-}}
-pub type LPSTACKFRAME_EX = *mut STACKFRAME_EX;
-#[cfg(target_arch = "x86_64")]
-pub type STACKFRAME = STACKFRAME64;
-#[cfg(target_arch = "x86_64")]
-pub type LPSTACKFRAME = LPSTACKFRAME64;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct STACKFRAME {
-    AddrPC: ::ADDRESS,
-    AddrReturn: ::ADDRESS,
-    AddrFrame: ::ADDRESS,
-    AddrStack: ::ADDRESS,
-    FuncTableEntry: ::PVOID,
-    Params: [::DWORD; 4],
-    Far: ::BOOL,
-    Virtual: ::BOOL,
-    Reserved: [::DWORD; 3],
-    KdHelp: ::KDHELP,
-    AddrBStore: ::ADDRESS,
-}}
-#[cfg(target_arch = "x86")]
-pub type LPSTACKFRAME = *mut STACKFRAME;
-pub type PREAD_PROCESS_MEMORY_ROUTINE64 = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, qwBaseAddress: ::DWORD64, lpBuffer: ::PVOID, nSize: ::DWORD,
-    lpNumberOfBytesRead: ::LPDWORD,
-) -> ::BOOL>;
-pub type PFUNCTION_TABLE_ACCESS_ROUTINE64 = Option<unsafe extern "system" fn(
-    ahProcess: ::HANDLE, AddrBase: ::DWORD64,
-) -> ::PVOID>;
-pub type PGET_MODULE_BASE_ROUTINE64 = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, Address: ::DWORD64,
-) -> ::DWORD64>;
-pub type PTRANSLATE_ADDRESS_ROUTINE64 = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, hThread: ::HANDLE, lpaddr: LPADDRESS64,
-) -> ::DWORD64>;
-pub const SYM_STKWALK_DEFAULT: ::DWORD = 0x00000000;
-pub const SYM_STKWALK_FORCE_FRAMEPTR: ::DWORD = 0x00000001;
-#[cfg(target_arch = "x86_64")]
-pub type PREAD_PROCESS_MEMORY_ROUTINE = PREAD_PROCESS_MEMORY_ROUTINE64;
-#[cfg(target_arch = "x86_64")]
-pub type PFUNCTION_TABLE_ACCESS_ROUTINE = PFUNCTION_TABLE_ACCESS_ROUTINE64;
-#[cfg(target_arch = "x86_64")]
-pub type PGET_MODULE_BASE_ROUTINE = PGET_MODULE_BASE_ROUTINE64;
-#[cfg(target_arch = "x86_64")]
-pub type PTRANSLATE_ADDRESS_ROUTINE = PTRANSLATE_ADDRESS_ROUTINE64;
-#[cfg(target_arch = "x86")]
-pub type PREAD_PROCESS_MEMORY_ROUTINE = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, qwBaseAddress: ::DWORD, lpBuffer: ::PVOID, nSize: ::DWORD,
-    lpNumberOfBytesRead: ::PDWORD,
-) -> ::BOOL>;
-#[cfg(target_arch = "x86")]
-pub type PFUNCTION_TABLE_ACCESS_ROUTINE = Option<unsafe extern "system" fn(
-    ahProcess: ::HANDLE, AddrBase: ::DWORD,
-) -> ::PVOID>;
-#[cfg(target_arch = "x86")]
-pub type PGET_MODULE_BASE_ROUTINE = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, Address: ::DWORD,
-) -> ::DWORD>;
-#[cfg(target_arch = "x86")]
-pub type PTRANSLATE_ADDRESS_ROUTINE = Option<unsafe extern "system" fn(
-    hProcess: ::HANDLE, hThread: ::HANDLE, lpaddr: LPADDRESS,
-) -> ::DWORD>;
-pub const API_VERSION_NUMBER: ::USHORT = 12;
-STRUCT!{struct API_VERSION {
-    MajorVersion: ::USHORT,
-    MinorVersion: ::USHORT,
-    Revision: ::USHORT,
-    Reserved: ::USHORT,
-}}
-pub type LPAPI_VERSION = *mut API_VERSION;
-STRUCT!{struct SYMBOL_INFOW {
-    SizeOfStruct: ::ULONG,
-    TypeIndex: ::ULONG,
-    Reserved: [::ULONG64; 2],
-    Index: ::ULONG,
-    Size: ::ULONG,
-    ModBase: ::ULONG64,
-    Flags: ::ULONG,
-    Value: ::ULONG64,
-    Address: ::ULONG64,
-    Register: ::ULONG,
-    Scope: ::ULONG,
-    Tag: ::ULONG,
-    NameLen: ::ULONG,
-    MaxNameLen: ::ULONG,
-    Name: [::WCHAR; 1],
-}}
-pub type PSYMBOL_INFOW = *mut SYMBOL_INFOW;
-STRUCT!{struct IMAGEHLP_SYMBOL64 {
-    SizeOfStruct: ::DWORD,
-    Address: ::DWORD64,
-    Size: ::DWORD,
-    Flags: ::DWORD,
-    MaxNameLength: ::DWORD,
-    Name: [::CHAR; 1],
-}}
-pub type PIMAGEHLP_SYMBOL64 = *mut IMAGEHLP_SYMBOL64;
-STRUCT!{struct IMAGEHLP_LINEW64 {
-    SizeOfStruct: ::DWORD,
-    Key: ::PVOID,
-    LineNumber: ::DWORD,
-    FileName: ::PWSTR,
-    Address: ::DWORD64,
-}}
-pub type PIMAGEHLP_LINEW64 = *mut IMAGEHLP_LINEW64;
diff --git a/vendor/winapi-0.2.8/src/dcommon.rs b/vendor/winapi-0.2.8/src/dcommon.rs
deleted file mode 100644
index 2c220e351a..0000000000
--- a/vendor/winapi-0.2.8/src/dcommon.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dcommon.h
-ENUM!{enum DWRITE_MEASURING_MODE {
-    DWRITE_MEASURING_MODE_NATURAL = 0,
-    DWRITE_MEASURING_MODE_GDI_CLASSIC = 1,
-    DWRITE_MEASURING_MODE_GDI_NATURAL = 2,
-}}
-ENUM!{enum D2D1_ALPHA_MODE {
-    D2D1_ALPHA_MODE_UNKNOWN = 0,
-    D2D1_ALPHA_MODE_PREMULTIPLIED = 1,
-    D2D1_ALPHA_MODE_STRAIGHT = 2,
-    D2D1_ALPHA_MODE_IGNORE = 3,
-}}
-STRUCT!{struct D2D1_PIXEL_FORMAT {
-    format: ::DXGI_FORMAT,
-    alphaMode: D2D1_ALPHA_MODE,
-}}
diff --git a/vendor/winapi-0.2.8/src/devpropdef.rs b/vendor/winapi-0.2.8/src/devpropdef.rs
deleted file mode 100644
index 3deca43e30..0000000000
--- a/vendor/winapi-0.2.8/src/devpropdef.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Defines property types and keys for the Plug and Play Device Property API
-pub type DEVPROPTYPE = ::ULONG;
-pub type PDEVPROPTYPE = *mut ::ULONG;
-pub const DEVPROP_TYPEMOD_ARRAY: DEVPROPTYPE = 0x00001000;
-pub const DEVPROP_TYPEMOD_LIST: DEVPROPTYPE = 0x00002000;
-pub const DEVPROP_TYPE_EMPTY: DEVPROPTYPE = 0x00000000;
-pub const DEVPROP_TYPE_NULL: DEVPROPTYPE = 0x00000001;
-pub const DEVPROP_TYPE_SBYTE: DEVPROPTYPE = 0x00000002;
-pub const DEVPROP_TYPE_BYTE: DEVPROPTYPE = 0x00000003;
-pub const DEVPROP_TYPE_INT16: DEVPROPTYPE = 0x00000004;
-pub const DEVPROP_TYPE_UINT16: DEVPROPTYPE = 0x00000005;
-pub const DEVPROP_TYPE_INT32: DEVPROPTYPE = 0x00000006;
-pub const DEVPROP_TYPE_UINT32: DEVPROPTYPE = 0x00000007;
-pub const DEVPROP_TYPE_INT64: DEVPROPTYPE = 0x00000008;
-pub const DEVPROP_TYPE_UINT64: DEVPROPTYPE = 0x00000009;
-pub const DEVPROP_TYPE_FLOAT: DEVPROPTYPE = 0x0000000A;
-pub const DEVPROP_TYPE_DOUBLE: DEVPROPTYPE = 0x0000000B;
-pub const DEVPROP_TYPE_DECIMAL: DEVPROPTYPE = 0x0000000C;
-pub const DEVPROP_TYPE_GUID: DEVPROPTYPE = 0x0000000D;
-pub const DEVPROP_TYPE_CURRENCY: DEVPROPTYPE = 0x0000000E;
-pub const DEVPROP_TYPE_DATE: DEVPROPTYPE = 0x0000000F;
-pub const DEVPROP_TYPE_FILETIME: DEVPROPTYPE = 0x00000010;
-pub const DEVPROP_TYPE_BOOLEAN: DEVPROPTYPE = 0x00000011;
-pub const DEVPROP_TYPE_STRING: DEVPROPTYPE = 0x00000012;
-pub const DEVPROP_TYPE_STRING_LIST: DEVPROPTYPE = DEVPROP_TYPE_STRING | DEVPROP_TYPEMOD_LIST;
-pub const DEVPROP_TYPE_SECURITY_DESCRIPTOR: DEVPROPTYPE = 0x00000013;
-pub const DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING: DEVPROPTYPE = 0x00000014;
-pub const DEVPROP_TYPE_DEVPROPKEY: DEVPROPTYPE = 0x00000015;
-pub const DEVPROP_TYPE_DEVPROPTYPE: DEVPROPTYPE = 0x00000016;
-pub const DEVPROP_TYPE_BINARY: DEVPROPTYPE = DEVPROP_TYPE_BYTE | DEVPROP_TYPEMOD_ARRAY;
-pub const DEVPROP_TYPE_ERROR: DEVPROPTYPE = 0x00000017;
-pub const DEVPROP_TYPE_NTSTATUS: DEVPROPTYPE = 0x00000018;
-pub const DEVPROP_TYPE_STRING_INDIRECT: DEVPROPTYPE = 0x00000019;
-pub const MAX_DEVPROP_TYPE: DEVPROPTYPE = 0x00000019;
-pub const MAX_DEVPROP_TYPEMOD: DEVPROPTYPE = 0x00002000;
-pub const DEVPROP_MASK_TYPE: DEVPROPTYPE = 0x00000FFF;
-pub const DEVPROP_MASK_TYPEMOD: DEVPROPTYPE = 0x0000F000;
-pub type DEVPROP_BOOLEAN = ::CHAR;
-pub type PDEVPROP_BOOLEAN = *mut ::CHAR;
-pub const DEVPROP_TRUE: DEVPROP_BOOLEAN = -1;
-pub const DEVPROP_FALSE: DEVPROP_BOOLEAN = 0;
-pub type DEVPROPGUID = ::GUID;
-pub type PDEVPROPGUID = *mut ::GUID;
-pub type DEVPROPID = ::ULONG;
-pub type PDEVPROPID = *mut ::ULONG;
-STRUCT!{struct DEVPROPKEY {
-    fmtid: DEVPROPGUID,
-    pid: DEVPROPID,
-}}
-pub type PDEVPROPKEY = *mut DEVPROPKEY;
-ENUM!{enum DEVPROPSTORE {
-    DEVPROP_STORE_SYSTEM,
-    DEVPROP_STORE_USER,
-}}
-pub type PDEVPROPSTORE = *mut DEVPROPSTORE;
-STRUCT!{struct DEVPROPCOMPKEY {
-    Key: DEVPROPKEY,
-    Store: DEVPROPSTORE,
-    LocaleName: ::PCWSTR,
-}}
-pub type PDEVPROPCOMPKEY = *mut DEVPROPCOMPKEY;
-STRUCT!{struct DEVPROPERTY {
-    CompKey: DEVPROPCOMPKEY,
-    Type: DEVPROPTYPE,
-    BufferSize: ::ULONG,
-    Buffer: ::PVOID,
-}}
-pub type PDEVPROPERTY = *mut DEVPROPERTY;
-pub const DEVPROPID_FIRST_USABLE: DEVPROPID = 2;
diff --git a/vendor/winapi-0.2.8/src/docobj.rs b/vendor/winapi-0.2.8/src/docobj.rs
deleted file mode 100644
index 3d5f9044d9..0000000000
--- a/vendor/winapi-0.2.8/src/docobj.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct OLECMD {
-    cmdID: ::ULONG,
-    cmdf: ::DWORD,
-}}
-STRUCT!{struct OLECMDTEXT {
-    cmdtextf: ::DWORD,
-    cwActual: ::ULONG,
-    cwBuf: ::ULONG,
-    rgwz: [::wchar_t; 0],
-}}
-RIDL!{interface IOleCommandTarget(IOleCommandTargetVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryStatus(
-        &mut self, pguidCmdGroup: *const ::GUID, cCmds: ::ULONG, prgCmds: *mut OLECMD,
-        pCmdText: *mut OLECMDTEXT
-    ) -> ::HRESULT,
-    fn Exec(
-        &mut self, pguidCmdGroup: *const :: GUID, nCmdID: ::DWORD, nCmdexecopt: ::DWORD,
-        pvaIn: *mut ::VARIANT, pvaOut: *mut ::VARIANT
-    ) -> ::HRESULT
-}}
diff --git a/vendor/winapi-0.2.8/src/dpapi.rs b/vendor/winapi-0.2.8/src/dpapi.rs
deleted file mode 100644
index c62e56f3aa..0000000000
--- a/vendor/winapi-0.2.8/src/dpapi.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Data Protection API Prototypes and Definitions
-pub const szFORCE_KEY_PROTECTION: &'static str = "ForceKeyProtection";
-STRUCT!{struct CRYPTPROTECT_PROMPTSTRUCT {
-    cbSize: ::DWORD,
-    dwPromptFlags: ::DWORD,
-    hwndApp: ::HWND,
-    szPrompt: ::LPCWSTR,
-}}
-pub type PCRYPTPROTECT_PROMPTSTRUCT = *mut CRYPTPROTECT_PROMPTSTRUCT;
diff --git a/vendor/winapi-0.2.8/src/dsgetdc.rs b/vendor/winapi-0.2.8/src/dsgetdc.rs
deleted file mode 100644
index 09c81c0fdb..0000000000
--- a/vendor/winapi-0.2.8/src/dsgetdc.rs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! This file contains structures, function prototypes, and definitions for the DsGetDcName API.
-pub const DS_FORCE_REDISCOVERY: ::ULONG = 0x00000001;
-pub const DS_DIRECTORY_SERVICE_REQUIRED: ::ULONG = 0x00000010;
-pub const DS_DIRECTORY_SERVICE_PREFERRED: ::ULONG = 0x00000020;
-pub const DS_GC_SERVER_REQUIRED: ::ULONG = 0x00000040;
-pub const DS_PDC_REQUIRED: ::ULONG = 0x00000080;
-pub const DS_BACKGROUND_ONLY: ::ULONG = 0x00000100;
-pub const DS_IP_REQUIRED: ::ULONG = 0x00000200;
-pub const DS_KDC_REQUIRED: ::ULONG = 0x00000400;
-pub const DS_TIMESERV_REQUIRED: ::ULONG = 0x00000800;
-pub const DS_WRITABLE_REQUIRED: ::ULONG = 0x00001000;
-pub const DS_GOOD_TIMESERV_PREFERRED: ::ULONG = 0x00002000;
-pub const DS_AVOID_SELF: ::ULONG = 0x00004000;
-pub const DS_ONLY_LDAP_NEEDED: ::ULONG = 0x00008000;
-pub const DS_IS_FLAT_NAME: ::ULONG = 0x00010000;
-pub const DS_IS_DNS_NAME: ::ULONG = 0x00020000;
-pub const DS_TRY_NEXTCLOSEST_SITE: ::ULONG = 0x00040000;
-pub const DS_DIRECTORY_SERVICE_6_REQUIRED: ::ULONG = 0x00080000;
-pub const DS_WEB_SERVICE_REQUIRED: ::ULONG = 0x00100000;
-pub const DS_DIRECTORY_SERVICE_8_REQUIRED: ::ULONG = 0x00200000;
-pub const DS_DIRECTORY_SERVICE_9_REQUIRED: ::ULONG = 0x00400000;
-pub const DS_RETURN_DNS_NAME: ::ULONG = 0x40000000;
-pub const DS_RETURN_FLAT_NAME: ::ULONG = 0x80000000;
-pub const DSGETDC_VALID_FLAGS: ::ULONG = DS_FORCE_REDISCOVERY | DS_DIRECTORY_SERVICE_REQUIRED
-    | DS_DIRECTORY_SERVICE_PREFERRED | DS_GC_SERVER_REQUIRED | DS_PDC_REQUIRED | DS_BACKGROUND_ONLY
-    | DS_IP_REQUIRED | DS_KDC_REQUIRED | DS_TIMESERV_REQUIRED | DS_WRITABLE_REQUIRED
-    | DS_GOOD_TIMESERV_PREFERRED | DS_AVOID_SELF | DS_ONLY_LDAP_NEEDED | DS_IS_FLAT_NAME
-    | DS_IS_DNS_NAME | DS_TRY_NEXTCLOSEST_SITE | DS_DIRECTORY_SERVICE_6_REQUIRED
-    | DS_DIRECTORY_SERVICE_8_REQUIRED | DS_DIRECTORY_SERVICE_9_REQUIRED | DS_WEB_SERVICE_REQUIRED
-    | DS_RETURN_FLAT_NAME | DS_RETURN_DNS_NAME;
-STRUCT!{struct DOMAIN_CONTROLLER_INFOA {
-    DomainControllerName: ::LPSTR,
-    DomainControllerAddress: ::LPSTR,
-    DomainControllerAddressType: ::ULONG,
-    DomainGuid: ::GUID,
-    DomainName: ::LPSTR,
-    DnsForestName: ::LPSTR,
-    Flags: ::ULONG,
-    DcSiteName: ::LPSTR,
-    ClientSiteName: ::LPSTR,
-}}
-pub type PDOMAIN_CONTROLLER_INFOA = *mut DOMAIN_CONTROLLER_INFOA;
-STRUCT!{struct DOMAIN_CONTROLLER_INFOW {
-    DomainControllerName: ::LPWSTR,
-    DomainControllerAddress: ::LPWSTR,
-    DomainControllerAddressType: ::ULONG,
-    DomainGuid: ::GUID,
-    DomainName: ::LPWSTR,
-    DnsForestName: ::LPWSTR,
-    Flags: ::ULONG,
-    DcSiteName: ::LPWSTR,
-    ClientSiteName: ::LPWSTR,
-}}
-pub type PDOMAIN_CONTROLLER_INFOW = *mut DOMAIN_CONTROLLER_INFOW;
-pub const DS_INET_ADDRESS: ::ULONG = 1;
-pub const DS_NETBIOS_ADDRESS: ::ULONG = 2;
-pub const DS_PDC_FLAG: ::ULONG = 0x00000001;
-pub const DS_GC_FLAG: ::ULONG = 0x00000004;
-pub const DS_LDAP_FLAG: ::ULONG = 0x00000008;
-pub const DS_DS_FLAG: ::ULONG = 0x00000010;
-pub const DS_KDC_FLAG: ::ULONG = 0x00000020;
-pub const DS_TIMESERV_FLAG: ::ULONG = 0x00000040;
-pub const DS_CLOSEST_FLAG: ::ULONG = 0x00000080;
-pub const DS_WRITABLE_FLAG: ::ULONG = 0x00000100;
-pub const DS_GOOD_TIMESERV_FLAG: ::ULONG = 0x00000200;
-pub const DS_NDNC_FLAG: ::ULONG = 0x00000400;
-pub const DS_SELECT_SECRET_DOMAIN_6_FLAG: ::ULONG = 0x00000800;
-pub const DS_FULL_SECRET_DOMAIN_6_FLAG: ::ULONG = 0x00001000;
-pub const DS_WS_FLAG: ::ULONG = 0x00002000;
-pub const DS_DS_8_FLAG: ::ULONG = 0x00004000;
-pub const DS_DS_9_FLAG: ::ULONG = 0x00008000;
-pub const DS_PING_FLAGS: ::ULONG = 0x000FFFFF;
-pub const DS_DNS_CONTROLLER_FLAG: ::ULONG = 0x20000000;
-pub const DS_DNS_DOMAIN_FLAG: ::ULONG = 0x40000000;
-pub const DS_DNS_FOREST_FLAG: ::ULONG = 0x80000000;
-pub const DS_DOMAIN_IN_FOREST: ::ULONG = 0x0001;
-pub const DS_DOMAIN_DIRECT_OUTBOUND: ::ULONG = 0x0002;
-pub const DS_DOMAIN_TREE_ROOT: ::ULONG = 0x0004;
-pub const DS_DOMAIN_PRIMARY: ::ULONG = 0x0008;
-pub const DS_DOMAIN_NATIVE_MODE: ::ULONG = 0x0010;
-pub const DS_DOMAIN_DIRECT_INBOUND: ::ULONG = 0x0020;
-pub const DS_DOMAIN_VALID_FLAGS: ::ULONG = DS_DOMAIN_IN_FOREST | DS_DOMAIN_DIRECT_OUTBOUND
-    | DS_DOMAIN_TREE_ROOT | DS_DOMAIN_PRIMARY | DS_DOMAIN_NATIVE_MODE | DS_DOMAIN_DIRECT_INBOUND;
-STRUCT!{struct DS_DOMAIN_TRUSTSW {
-    NetbiosDomainName: ::LPWSTR,
-    DnsDomainName: ::LPWSTR,
-    Flags: ::ULONG,
-    ParentIndex: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-    DomainSid: ::PSID,
-    DomainGuid: ::GUID,
-}}
-pub type PDS_DOMAIN_TRUSTSW = *mut DS_DOMAIN_TRUSTSW;
-STRUCT!{struct DS_DOMAIN_TRUSTSA {
-    NetbiosDomainName: ::LPSTR,
-    DnsDomainName: ::LPSTR,
-    Flags: ::ULONG,
-    ParentIndex: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-    DomainSid: ::PSID,
-    DomainGuid: ::GUID,
-}}
-pub type PDS_DOMAIN_TRUSTSA = *mut DS_DOMAIN_TRUSTSA;
-pub const DS_ONLY_DO_SITE_NAME: ::ULONG = 0x01;
-pub const DS_NOTIFY_AFTER_SITE_RECORDS: ::ULONG = 0x02;
-pub const DS_OPEN_VALID_OPTION_FLAGS: ::ULONG = DS_ONLY_DO_SITE_NAME
-    | DS_NOTIFY_AFTER_SITE_RECORDS;
-pub const DS_OPEN_VALID_FLAGS: ::ULONG = DS_FORCE_REDISCOVERY | DS_ONLY_LDAP_NEEDED
-    | DS_KDC_REQUIRED | DS_PDC_REQUIRED | DS_GC_SERVER_REQUIRED | DS_WRITABLE_REQUIRED;
diff --git a/vendor/winapi-0.2.8/src/dsound.rs b/vendor/winapi-0.2.8/src/dsound.rs
deleted file mode 100644
index e8f167fab7..0000000000
--- a/vendor/winapi-0.2.8/src/dsound.rs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! DSound procedure declarations, constant definitions and macros
-STRUCT!{struct DSCAPS {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    dwMinSecondarySampleRate: ::DWORD,
-    dwMaxSecondarySampleRate: ::DWORD,
-    dwPrimaryBuffers: ::DWORD,
-    dwMaxHwMixingAllBuffers: ::DWORD,
-    dwMaxHwMixingStaticBuffers: ::DWORD,
-    dwMaxHwMixingStreamingBuffers: ::DWORD,
-    dwFreeHwMixingAllBuffers: ::DWORD,
-    dwFreeHwMixingStaticBuffers: ::DWORD,
-    dwFreeHwMixingStreamingBuffers: ::DWORD,
-    dwMaxHw3DAllBuffers: ::DWORD,
-    dwMaxHw3DStaticBuffers: ::DWORD,
-    dwMaxHw3DStreamingBuffers: ::DWORD,
-    dwFreeHw3DAllBuffers: ::DWORD,
-    dwFreeHw3DStaticBuffers: ::DWORD,
-    dwFreeHw3DStreamingBuffers: ::DWORD,
-    dwTotalHwMemBytes: ::DWORD,
-    dwFreeHwMemBytes: ::DWORD,
-    dwMaxContigFreeHwMemBytes: ::DWORD,
-    dwUnlockTransferRateHwBuffers: ::DWORD,
-    dwPlayCpuOverheadSwBuffers: ::DWORD,
-    dwReserved1: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-pub type LPDSCAPS = *mut DSCAPS;
-STRUCT!{struct DSBCAPS {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    dwBufferBytes: ::DWORD,
-    dwUnlockTransferRate: ::DWORD,
-    dwPlayCpuOverhead: ::DWORD,
-}}
-pub type LPDSBCAPS = *mut DSBCAPS;
-STRUCT!{struct DSBUFFERDESC {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    dwBufferBytes: ::DWORD,
-    dwReserved: ::DWORD,
-    lpwfxFormat: ::LPWAVEFORMATEX,
-    guid3DAlgorithm: ::GUID,
-}}
-pub type LPCDSBUFFERDESC = *const DSBUFFERDESC;
-RIDL!(
-interface IDirectSoundBuffer(IDirectSoundBufferVtbl): IUnknown(IUnknownVtbl) {
-    fn GetCaps(&mut self, pDSBufferCaps: ::LPDSBCAPS) -> ::HRESULT,
-    fn GetCurrentPosition(
-        &mut self, pdwCurrentPlayCursor: ::LPDWORD, pdwCurrentWriteCursor: ::LPDWORD
-    ) -> ::HRESULT,
-    fn GetFormat(
-        &mut self, pwfxFormat: ::LPWAVEFORMATEX, dwSizeAllocated: ::DWORD,
-        pdwSizeWritten: ::LPDWORD
-    ) -> ::HRESULT,
-    fn GetVolume(&mut self, plVolume: ::LPLONG) -> ::HRESULT,
-    fn GetPan(&mut self, plPan: ::LPLONG) -> ::HRESULT,
-    fn GetFrequency(&mut self, pdwFrequency: ::LPDWORD) -> ::HRESULT,
-    fn GetStatus(&mut self, pdwStatus: ::LPDWORD) -> ::HRESULT,
-    fn Initialize(
-        &mut self, pDirectSound: ::LPDIRECTSOUND, pcDSBufferDesc: ::LPCDSBUFFERDESC
-    ) -> ::HRESULT,
-    fn Lock(
-        &mut self, dwOffset: ::DWORD, dwBytes: ::DWORD, ppvAudioPtr1: *mut ::LPVOID,
-        pdwAudioBytes1: ::LPDWORD, ppvAudioPtr2: *mut ::LPVOID, pdwAudioBytes2: ::LPDWORD,
-        dwFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn Play(&mut self, dwReserved1: ::DWORD, dwPriority: ::DWORD, dwFlags: ::DWORD) -> ::HRESULT,
-    fn SetCurrentPosition(&mut self, dwNewPosition: ::DWORD) -> ::HRESULT,
-    fn SetFormat(&mut self, pcfxFormat: ::LPCWAVEFORMATEX) -> ::HRESULT,
-    fn SetVolume(&mut self, lVolume: ::LONG) -> ::HRESULT,
-    fn SetPan(&mut self, lPan: ::LONG) -> ::HRESULT,
-    fn SetFrequency(&mut self, dwFrequency: ::DWORD) -> ::HRESULT,
-    fn Stop(&mut self) -> ::HRESULT,
-    fn Unlock(
-        &mut self, pvAudioPtr1: ::LPVOID, dwAudioBytes1: ::DWORD, pvAudioPtr2: ::LPVOID,
-        dwAudioBytes2: ::DWORD
-    ) -> ::HRESULT,
-    fn Restore(&mut self) -> ::HRESULT
-}
-);
-pub type LPDIRECTSOUNDBUFFER = *mut IDirectSoundBuffer;
-RIDL!(
-interface IDirectSound(IDirectSoundVtbl): IUnknown(IUnknownVtbl)
-{
-    fn CreateSoundBuffer(
-        &mut self, pcDSBufferDesc: ::LPCDSBUFFERDESC, ppDSBuffer: *mut ::LPDIRECTSOUNDBUFFER,
-        pUnkOuter: ::LPUNKNOWN
-    ) -> ::HRESULT,
-    fn GetCaps(&mut self, pDSCaps: ::LPDSCAPS) -> ::HRESULT,
-    fn DuplicateSoundBuffer(
-        &mut self, pDSBufferOriginal: LPDIRECTSOUNDBUFFER,
-        ppDSBufferDuplicate: *mut ::LPDIRECTSOUNDBUFFER
-    ) -> ::HRESULT,
-    fn SetCooperativeLevel(&mut self, hWnd: ::HWND, dwLevel: ::DWORD) -> ::HRESULT,
-    fn Compact(&mut self) -> ::HRESULT,
-    fn GetSpeakerConfig(&mut self, pdwSpeakerConfig: ::LPDWORD) -> ::HRESULT,
-    fn SetSpeakerConfig(&mut self, dwSpeakerConfig: ::DWORD) -> ::HRESULT,
-    fn Initialize(&mut self, pcGuidDevice: ::LPCGUID) -> ::HRESULT
-}
-);
-pub type LPDIRECTSOUND = *mut IDirectSound;
-pub const DS_OK: ::HRESULT = ::S_OK;
-pub const DSERR_GENERIC: ::HRESULT = ::E_FAIL;
-pub const DSSCL_NORMAL: ::DWORD = 0x00000001;
-pub const DSSCL_PRIORITY: ::DWORD = 0x00000002;
-pub const DSSCL_EXCLUSIVE: ::DWORD = 0x00000003;
-pub const DSSCL_WRITEPRIMARY: ::DWORD = 0x00000004;
-pub const DSBCAPS_PRIMARYBUFFER: ::DWORD = 0x00000001;
-pub const DSBCAPS_STATIC: ::DWORD = 0x00000002;
-pub const DSBCAPS_LOCHARDWARE: ::DWORD = 0x00000004;
-pub const DSBCAPS_LOCSOFTWARE: ::DWORD = 0x00000008;
-pub const DSBCAPS_CTRL3D: ::DWORD = 0x00000010;
-pub const DSBCAPS_CTRLFREQUENCY: ::DWORD = 0x00000020;
-pub const DSBCAPS_CTRLPAN: ::DWORD = 0x00000040;
-pub const DSBCAPS_CTRLVOLUME: ::DWORD = 0x00000080;
-pub const DSBCAPS_CTRLPOSITIONNOTIFY: ::DWORD = 0x00000100;
-pub const DSBCAPS_CTRLFX: ::DWORD = 0x00000200;
-pub const DSBCAPS_STICKYFOCUS: ::DWORD = 0x00004000;
-pub const DSBCAPS_GLOBALFOCUS: ::DWORD = 0x00008000;
-pub const DSBCAPS_GETCURRENTPOSITION2: ::DWORD = 0x00010000;
-pub const DSBCAPS_MUTE3DATMAXDISTANCE: ::DWORD = 0x00020000;
-pub const DSBCAPS_LOCDEFER: ::DWORD = 0x00040000;
-pub const DSBCAPS_TRUEPLAYPOSITION: ::DWORD = 0x00080000;
-pub const DSBPLAY_LOOPING: ::DWORD = 0x00000001;
-pub const DSBPLAY_LOCHARDWARE: ::DWORD = 0x00000002;
-pub const DSBPLAY_LOCSOFTWARE: ::DWORD = 0x00000004;
-pub const DSBPLAY_TERMINATEBY_TIME: ::DWORD = 0x00000008;
-pub const DSBPLAY_TERMINATEBY_DISTANCE: ::DWORD = 0x000000010;
-pub const DSBPLAY_TERMINATEBY_PRIORITY: ::DWORD = 0x000000020;
diff --git a/vendor/winapi-0.2.8/src/dsrole.rs b/vendor/winapi-0.2.8/src/dsrole.rs
deleted file mode 100644
index f9cf81c892..0000000000
--- a/vendor/winapi-0.2.8/src/dsrole.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Contains public interfaces to query the network roles of workstations, servers, and DCs
-ENUM!{enum DSROLE_MACHINE_ROLE {
-    DsRole_RoleStandaloneWorkstation,
-    DsRole_RoleMemberWorkstation,
-    DsRole_RoleStandaloneServer,
-    DsRole_RoleMemberServer,
-    DsRole_RoleBackupDomainController,
-    DsRole_RolePrimaryDomainController,
-}}
-ENUM!{enum DSROLE_SERVER_STATE {
-    DsRoleServerUnknown = 0,
-    DsRoleServerPrimary,
-    DsRoleServerBackup,
-}}
-pub type PDSROLE_SERVER_STATE = *mut DSROLE_SERVER_STATE;
-ENUM!{enum DSROLE_PRIMARY_DOMAIN_INFO_LEVEL {
-    DsRolePrimaryDomainInfoBasic = 1,
-    DsRoleUpgradeStatus,
-    DsRoleOperationState,
-}}
-pub const DSROLE_PRIMARY_DS_RUNNING: ::ULONG = 0x00000001;
-pub const DSROLE_PRIMARY_DS_MIXED_MODE: ::ULONG = 0x00000002;
-pub const DSROLE_UPGRADE_IN_PROGRESS: ::ULONG = 0x00000004;
-pub const DSROLE_PRIMARY_DS_READONLY: ::ULONG = 0x00000008;
-pub const DSROLE_PRIMARY_DOMAIN_GUID_PRESENT: ::ULONG = 0x01000000;
-STRUCT!{struct DSROLE_PRIMARY_DOMAIN_INFO_BASIC {
-    MachineRole: DSROLE_MACHINE_ROLE,
-    Flags: ::ULONG,
-    DomainNameFlat: ::LPWSTR,
-    DomainNameDns: ::LPWSTR,
-    DomainForestName: ::LPWSTR,
-    DomainGuid: ::GUID,
-}}
-pub type PDSROLE_PRIMARY_DOMAIN_INFO_BASIC = *mut DSROLE_PRIMARY_DOMAIN_INFO_BASIC;
-STRUCT!{struct DSROLE_UPGRADE_STATUS_INFO {
-    OperationState: ::ULONG,
-    PreviousServerState: DSROLE_SERVER_STATE,
-}}
-pub type PDSROLE_UPGRADE_STATUS_INFO = *mut DSROLE_UPGRADE_STATUS_INFO;
-ENUM!{enum DSROLE_OPERATION_STATE {
-    DsRoleOperationIdle = 0,
-    DsRoleOperationActive,
-    DsRoleOperationNeedReboot,
-}}
-STRUCT!{struct DSROLE_OPERATION_STATE_INFO {
-    OperationState: DSROLE_OPERATION_STATE,
-}}
-pub type PDSROLE_OPERATION_STATE_INFO = *mut DSROLE_OPERATION_STATE_INFO;
diff --git a/vendor/winapi-0.2.8/src/dwmapi.rs b/vendor/winapi-0.2.8/src/dwmapi.rs
deleted file mode 100644
index f95e8f1d70..0000000000
--- a/vendor/winapi-0.2.8/src/dwmapi.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Procedure declarations, constant definitions, and macros for the NLS component.
-STRUCT!{struct DWM_BLURBEHIND {
-    dwFlags: ::DWORD,
-    fEnable: ::BOOL,
-    hRgnBlur: ::HRGN,
-    fTransitionOnMaximized: ::BOOL,
-}}
diff --git a/vendor/winapi-0.2.8/src/dwrite.rs b/vendor/winapi-0.2.8/src/dwrite.rs
deleted file mode 100644
index 09bbf0d935..0000000000
--- a/vendor/winapi-0.2.8/src/dwrite.rs
+++ /dev/null
@@ -1,1038 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! DirectX Typography Services public API definitions.
-ENUM!{enum DWRITE_FONT_FILE_TYPE {
-    DWRITE_FONT_FILE_TYPE_UNKNOWN,
-    DWRITE_FONT_FILE_TYPE_CFF,
-    DWRITE_FONT_FILE_TYPE_TRUETYPE,
-    DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION,
-    DWRITE_FONT_FILE_TYPE_TYPE1_PFM,
-    DWRITE_FONT_FILE_TYPE_TYPE1_PFB,
-    DWRITE_FONT_FILE_TYPE_VECTOR,
-    DWRITE_FONT_FILE_TYPE_BITMAP,
-}}
-ENUM!{enum DWRITE_FONT_FACE_TYPE {
-    DWRITE_FONT_FACE_TYPE_CFF,
-    DWRITE_FONT_FACE_TYPE_TRUETYPE,
-    DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION,
-    DWRITE_FONT_FACE_TYPE_TYPE1,
-    DWRITE_FONT_FACE_TYPE_VECTOR,
-    DWRITE_FONT_FACE_TYPE_BITMAP,
-    DWRITE_FONT_FACE_TYPE_UNKNOWN,
-    DWRITE_FONT_FACE_TYPE_RAW_CFF,
-}}
-FLAGS!{enum DWRITE_FONT_SIMULATIONS {
-    DWRITE_FONT_SIMULATIONS_NONE = 0x0000,
-    DWRITE_FONT_SIMULATIONS_BOLD = 0x0001,
-    DWRITE_FONT_SIMULATIONS_OBLIQUE = 0x0002,
-}}
-ENUM!{enum DWRITE_FONT_WEIGHT {
-    DWRITE_FONT_WEIGHT_THIN = 100,
-    DWRITE_FONT_WEIGHT_EXTRA_LIGHT = 200,
-    DWRITE_FONT_WEIGHT_ULTRA_LIGHT = 200,
-    DWRITE_FONT_WEIGHT_LIGHT = 300,
-    DWRITE_FONT_WEIGHT_SEMI_LIGHT = 350,
-    DWRITE_FONT_WEIGHT_NORMAL = 400,
-    DWRITE_FONT_WEIGHT_REGULAR = 400,
-    DWRITE_FONT_WEIGHT_MEDIUM = 500,
-    DWRITE_FONT_WEIGHT_DEMI_BOLD = 600,
-    DWRITE_FONT_WEIGHT_SEMI_BOLD = 600,
-    DWRITE_FONT_WEIGHT_BOLD = 700,
-    DWRITE_FONT_WEIGHT_EXTRA_BOLD = 800,
-    DWRITE_FONT_WEIGHT_ULTRA_BOLD = 800,
-    DWRITE_FONT_WEIGHT_BLACK = 900,
-    DWRITE_FONT_WEIGHT_HEAVY = 900,
-    DWRITE_FONT_WEIGHT_EXTRA_BLACK = 950,
-    DWRITE_FONT_WEIGHT_ULTRA_BLACK = 950,
-}}
-ENUM!{enum DWRITE_FONT_STRETCH {
-    DWRITE_FONT_STRETCH_UNDEFINED = 0,
-    DWRITE_FONT_STRETCH_ULTRA_CONDENSED = 1,
-    DWRITE_FONT_STRETCH_EXTRA_CONDENSED = 2,
-    DWRITE_FONT_STRETCH_CONDENSED = 3,
-    DWRITE_FONT_STRETCH_SEMI_CONDENSED = 4,
-    DWRITE_FONT_STRETCH_NORMAL = 5,
-    DWRITE_FONT_STRETCH_MEDIUM = 5,
-    DWRITE_FONT_STRETCH_SEMI_EXPANDED = 6,
-    DWRITE_FONT_STRETCH_EXPANDED = 7,
-    DWRITE_FONT_STRETCH_EXTRA_EXPANDED = 8,
-    DWRITE_FONT_STRETCH_ULTRA_EXPANDED = 9,
-}}
-ENUM!{enum DWRITE_FONT_STYLE {
-    DWRITE_FONT_STYLE_NORMAL,
-    DWRITE_FONT_STYLE_OBLIQUE,
-    DWRITE_FONT_STYLE_ITALIC,
-}}
-ENUM!{enum DWRITE_INFORMATIONAL_STRING_ID {
-    DWRITE_INFORMATIONAL_STRING_NONE,
-    DWRITE_INFORMATIONAL_STRING_COPYRIGHT_NOTICE,
-    DWRITE_INFORMATIONAL_STRING_VERSION_STRINGS,
-    DWRITE_INFORMATIONAL_STRING_TRADEMARK,
-    DWRITE_INFORMATIONAL_STRING_MANUFACTURER,
-    DWRITE_INFORMATIONAL_STRING_DESIGNER,
-    DWRITE_INFORMATIONAL_STRING_DESIGNER_URL,
-    DWRITE_INFORMATIONAL_STRING_DESCRIPTION,
-    DWRITE_INFORMATIONAL_STRING_FONT_VENDOR_URL,
-    DWRITE_INFORMATIONAL_STRING_LICENSE_DESCRIPTION,
-    DWRITE_INFORMATIONAL_STRING_LICENSE_INFO_URL,
-    DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_PREFERRED_FAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_PREFERRED_SUBFAMILY_NAMES,
-    DWRITE_INFORMATIONAL_STRING_SAMPLE_TEXT,
-    DWRITE_INFORMATIONAL_STRING_FULL_NAME,
-    DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME,
-    DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME,
-    DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME,
-    DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG,
-    DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG,
-}}
-STRUCT!{struct DWRITE_FONT_METRICS {
-    designUnitsPerEm: ::UINT16,
-    ascent: ::UINT16,
-    descent: ::UINT16,
-    lineGap: ::INT16,
-    capHeight: ::UINT16,
-    xHeight: ::UINT16,
-    underlinePosition: ::INT16,
-    underlineThickness: ::UINT16,
-    strikethroughPosition: ::INT16,
-    strikethroughThickness: ::UINT16,
-}}
-STRUCT!{struct DWRITE_GLYPH_METRICS {
-    leftSideBearing: ::INT32,
-    advanceWidth: ::UINT32,
-    rightSideBearing: ::INT32,
-    topSideBearing: ::INT32,
-    advanceHeight: ::UINT32,
-    bottomSideBearing: ::INT32,
-    verticalOriginY: ::INT32,
-}}
-STRUCT!{struct DWRITE_GLYPH_OFFSET {
-    advanceOffset: ::FLOAT,
-    ascenderOffset: ::FLOAT,
-}}
-ENUM!{enum DWRITE_FACTORY_TYPE {
-    DWRITE_FACTORY_TYPE_SHARED,
-    DWRITE_FACTORY_TYPE_ISOLATED,
-}}
-#[inline]
-pub fn DWRITE_MAKE_OPENTYPE_TAG(a: u8, b: u8, c: u8, d: u8) -> u32 {
-    ((d as u32) << 24) | ((c as u32) << 16) | ((b as u32) << 8) | (a as u32)
-}
-RIDL!{interface IDWriteFontFileLoader(IDWriteFontFileLoaderVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateStreamFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        fontFileStream: *mut *mut IDWriteFontFileStream
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteLocalFontFileLoader(IDWriteLocalFontFileLoaderVtbl):
-        IDWriteFontFileLoader(IDWriteFontFileLoaderVtbl) {
-    fn GetFilePathLengthFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        filePathLength: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetFilePathFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        filePath: *mut ::WCHAR,
-        filePathSize: ::UINT32
-    ) -> ::HRESULT,
-    fn GetLastWriteTimeFromKey(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        lastWriteTime: *mut ::FILETIME
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFileStream(IDWriteFontFileStreamVtbl): IUnknown(IUnknownVtbl) {
-    fn ReadFileFragment(
-        &mut self, fragmentStart: *mut *const ::c_void, fileOffset: ::UINT64,
-        fragmentSize: ::UINT64, fragmentContext: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn ReleaseFileFragment(&mut self, fragmentContext: *mut ::c_void) -> (),
-    fn GetFileSize(&mut self, fileSize: *mut ::UINT64) -> ::HRESULT,
-    fn GetLastWriteTime(&mut self, lastWriteTime: *mut ::UINT64) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFile(IDWriteFontFileVtbl): IUnknown(IUnknownVtbl) {
-    fn GetReferenceKey(
-        &mut self, fontFileReferenceKey: *mut *const ::c_void,
-        fontFileReferenceKeySize: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetLoader(&mut self, fontFileLoader: *mut *mut IDWriteFontFileLoader) -> ::HRESULT,
-    fn Analyze(
-        &mut self, isSupportedFontType: *mut ::BOOL, fontFileType: *mut DWRITE_FONT_FILE_TYPE,
-        fontFaceType: *mut DWRITE_FONT_FACE_TYPE, numberOfFaces: *mut ::UINT32
-    ) -> ::HRESULT
-}}
-ENUM!{enum DWRITE_PIXEL_GEOMETRY {
-    DWRITE_PIXEL_GEOMETRY_FLAT,
-    DWRITE_PIXEL_GEOMETRY_RGB,
-    DWRITE_PIXEL_GEOMETRY_BGR,
-}}
-ENUM!{enum DWRITE_RENDERING_MODE {
-    DWRITE_RENDERING_MODE_DEFAULT,
-    DWRITE_RENDERING_MODE_ALIASED,
-    DWRITE_RENDERING_MODE_GDI_CLASSIC,
-    DWRITE_RENDERING_MODE_GDI_NATURAL,
-    DWRITE_RENDERING_MODE_NATURAL,
-    DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC,
-    DWRITE_RENDERING_MODE_OUTLINE,
-    DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC = DWRITE_RENDERING_MODE_GDI_CLASSIC.0,
-    DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL = DWRITE_RENDERING_MODE_GDI_NATURAL.0,
-    DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL = DWRITE_RENDERING_MODE_NATURAL.0,
-    DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC = DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC.0,
-}}
-STRUCT!{struct DWRITE_MATRIX {
-    m11: ::FLOAT,
-    m12: ::FLOAT,
-    m21: ::FLOAT,
-    m22: ::FLOAT,
-    dx: ::FLOAT,
-    dy: ::FLOAT,
-}}
-RIDL!{interface IDWriteRenderingParams(IDWriteRenderingParamsVtbl): IUnknown(IUnknownVtbl) {
-    fn GetGamma(&mut self) -> ::FLOAT,
-    fn GetEnhancedContrast(&mut self) -> ::FLOAT,
-    fn GetClearTypeLevel(&mut self) -> ::FLOAT,
-    fn GetPixelGeometry(&mut self) -> DWRITE_PIXEL_GEOMETRY,
-    fn GetRenderingMode(&mut self) -> DWRITE_RENDERING_MODE
-}}
-pub type IDWriteGeometrySink = ::ID2D1SimplifiedGeometrySink;
-RIDL!{interface IDWriteFontFace(IDWriteFontFaceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetType(&mut self) -> DWRITE_FONT_FACE_TYPE,
-    fn GetFiles(
-        &mut self, numberOfFiles: *mut ::UINT32, fontFiles: *mut *mut IDWriteFontFile
-    ) -> ::HRESULT,
-    fn GetIndex(&mut self) -> ::UINT32,
-    fn GetSimulations(&mut self) -> DWRITE_FONT_SIMULATIONS,
-    fn IsSymbolFont(&mut self) -> ::BOOL,
-    fn GetMetrics(&mut self, fontFaceMetrics: *mut DWRITE_FONT_METRICS) -> (),
-    fn GetGlyphCount(&mut self) -> ::UINT16,
-    fn GetDesignGlyphMetrics(
-        &mut self, glyphIndices: *const ::UINT16, glyphCount: ::UINT32,
-        glyphMetrics: *mut DWRITE_GLYPH_METRICS, isSideways: ::BOOL
-    ) -> ::HRESULT,
-    fn GetGlyphIndices(
-        &mut self, codePoints: *const ::UINT32, codePointCount: ::UINT32,
-        glyphIndices: *mut ::UINT16
-    ) -> ::HRESULT,
-    fn TryGetFontTable(
-        &mut self, openTypeTableTag: ::UINT32, tableData: *mut *const ::c_void,
-        tableSize: *mut ::UINT32, tableContext: *mut *mut ::c_void, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn ReleaseFontTable(
-        &mut self, tableContext: *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetGlyphRunOutline(
-        &mut self, emSize: ::FLOAT, glyphIndices: *const ::UINT16, glyphAdvances: *const ::FLOAT,
-        glyphOffsets: *const DWRITE_GLYPH_OFFSET, glyphCount: ::UINT32, isSideways: ::BOOL,
-        isRightToLeft: ::BOOL, geometrySink: *mut IDWriteGeometrySink
-    ) -> ::HRESULT,
-    fn GetRecommendedRenderingMode(
-        &mut self, emSize: ::FLOAT, pixelsPerDip: ::FLOAT, measuringMode: ::DWRITE_MEASURING_MODE,
-        renderingParams: *mut IDWriteRenderingParams, renderingMode: *mut DWRITE_RENDERING_MODE
-    ) -> ::HRESULT,
-    fn GetGdiCompatibleMetrics(
-        &mut self, emSize: ::FLOAT, pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX,
-        fontFaceMetrics: *mut DWRITE_FONT_METRICS
-    ) -> ::HRESULT,
-    fn GetGdiCompatibleGlyphMetrics(
-        &mut self, enSize: ::FLOAT, pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX,
-        useGdiNatrual: ::BOOL, glyphIndices: *const ::UINT16, glyphCount: ::UINT32,
-        glyphMetrics: *mut DWRITE_GLYPH_METRICS, isSideways: ::BOOL
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontCollectionLoader(IDWriteFontCollectionLoaderVtbl):
-        IUnknown(IUnknownVtbl) {
-    fn CreateEnumeratorFromKey(
-        &mut self, factory: *mut IDWriteFactory, collectionKey: *const ::c_void,
-        collectionKeySize: ::UINT32, fontFileEnumerator: *mut *mut IDWriteFontFileEnumerator
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFileEnumerator(IDWriteFontFileEnumeratorVtbl): IUnknown(IUnknownVtbl) {
-    fn MoveNext(&mut self, hasCurrentFile: *mut ::BOOL) -> ::HRESULT,
-    fn GetCurrentFontFile(&mut self, fontFile: *mut *mut IDWriteFontFile) -> ::HRESULT
-}}
-RIDL!{interface IDWriteLocalizedStrings(IDWriteLocalizedStringsVtbl): IUnknown(IUnknownVtbl) {
-    fn GetCount(&mut self) -> ::UINT32,
-    fn FindLocaleName(
-        &mut self, localeName: *const ::WCHAR, index: *mut ::UINT32, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetLocaleNameLength(&mut self, index: ::UINT32, length: *mut ::UINT32) -> ::HRESULT,
-    fn GetLocaleName(
-        &mut self, index: ::UINT32, localeName: *mut ::WCHAR, size: ::UINT32
-    ) -> ::HRESULT,
-    fn GetStringLength(&mut self, index: ::UINT32, length: *mut ::UINT32) -> ::HRESULT,
-    fn GetString(
-        &mut self, index: ::UINT32, stringBuffer: *mut ::WCHAR, size: ::UINT32
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontCollection(IDWriteFontCollectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFontFamilyCount(&mut self) -> ::UINT32,
-    fn GetFontFamily(
-        &mut self, index: ::UINT32, fontFamily: *mut *mut IDWriteFontFamily
-    ) -> ::HRESULT,
-    fn FindFamilyName(
-        &mut self, familyName: *const ::WCHAR, index: *mut ::UINT32, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetFontFromFontFace(
-        &mut self, fontFace: *mut IDWriteFontFace, font: *mut *mut IDWriteFont
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontList(IDWriteFontListVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFontCollection(&mut self, fontCollection: *mut *mut IDWriteFontCollection) -> ::HRESULT,
-    fn GetFontCount(&mut self) -> ::UINT32,
-    fn GetFont(&mut self, index: ::UINT32, font: *mut *mut IDWriteFont) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFontFamily(IDWriteFontFamilyVtbl): IDWriteFontList(IDWriteFontListVtbl) {
-    fn GetFamilyNames(&mut self, names: *mut *mut IDWriteLocalizedStrings) -> ::HRESULT,
-    fn GetFirstMatchingFont(
-        &mut self, weight: DWRITE_FONT_WEIGHT, stretch: DWRITE_FONT_STRETCH,
-        style: DWRITE_FONT_STYLE, matchingFont: *mut *mut IDWriteFont
-    ) -> ::HRESULT,
-    fn GetMatchingFonts(
-        &mut self, weight: DWRITE_FONT_WEIGHT, stretch: DWRITE_FONT_STRETCH,
-        style: DWRITE_FONT_STYLE, matchingFonts: *mut *mut IDWriteFontList
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFont(IDWriteFontVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFontFamily(&mut self, fontFamily: *mut *mut IDWriteFontFamily) -> ::HRESULT,
-    fn GetWeight(&mut self) -> DWRITE_FONT_WEIGHT,
-    fn GetStretch(&mut self) -> DWRITE_FONT_STRETCH,
-    fn GetStyle(&mut self) -> DWRITE_FONT_STYLE,
-    fn IsSymbolFont(&mut self) -> ::BOOL,
-    fn GetFaceNames(&mut self, names: *mut *mut IDWriteLocalizedStrings) -> ::HRESULT,
-    fn GetInformationalStrings(
-        &mut self, informationalStringId: DWRITE_INFORMATIONAL_STRING_ID,
-        informationalStrings: *mut *mut IDWriteLocalizedStrings, exists: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetSimulations(&mut self) -> DWRITE_FONT_SIMULATIONS,
-    fn GetMetrics(&mut self, fontMetrics: *mut DWRITE_FONT_METRICS) -> (),
-    fn HasCharacter(&mut self, unicodeValue: ::UINT32, exists: *mut ::BOOL) -> ::HRESULT,
-    fn CreateFontFace(&mut self, fontFace: *mut *mut IDWriteFontFace) -> ::HRESULT
-}}
-ENUM!{enum DWRITE_READING_DIRECTION {
-    DWRITE_READING_DIRECTION_LEFT_TO_RIGHT = 0,
-    DWRITE_READING_DIRECTION_RIGHT_TO_LEFT = 1,
-    DWRITE_READING_DIRECTION_TOP_TO_BOTTOM = 2,
-    DWRITE_READING_DIRECTION_BOTTOM_TO_TOP = 3,
-}}
-ENUM!{enum DWRITE_FLOW_DIRECTION {
-    DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM = 0,
-    DWRITE_FLOW_DIRECTION_BOTTOM_TO_TOP = 1,
-    DWRITE_FLOW_DIRECTION_LEFT_TO_RIGHT = 2,
-    DWRITE_FLOW_DIRECTION_RIGHT_TO_LEFT = 3,
-}}
-ENUM!{enum DWRITE_TEXT_ALIGNMENT {
-    DWRITE_TEXT_ALIGNMENT_LEADING,
-    DWRITE_TEXT_ALIGNMENT_TRAILING,
-    DWRITE_TEXT_ALIGNMENT_CENTER,
-    DWRITE_TEXT_ALIGNMENT_JUSTIFIED,
-}}
-ENUM!{enum DWRITE_PARAGRAPH_ALIGNMENT {
-    DWRITE_PARAGRAPH_ALIGNMENT_NEAR,
-    DWRITE_PARAGRAPH_ALIGNMENT_FAR,
-    DWRITE_PARAGRAPH_ALIGNMENT_CENTER,
-}}
-ENUM!{enum DWRITE_WORD_WRAPPING {
-    DWRITE_WORD_WRAPPING_WRAP = 0,
-    DWRITE_WORD_WRAPPING_NO_WRAP = 1,
-    DWRITE_WORD_WRAPPING_EMERGENCY_BREAK = 2,
-    DWRITE_WORD_WRAPPING_WHOLE_WORD = 3,
-    DWRITE_WORD_WRAPPING_CHARACTER = 4,
-}}
-ENUM!{enum DWRITE_LINE_SPACING_METHOD {
-    DWRITE_LINE_SPACING_METHOD_DEFAULT,
-    DWRITE_LINE_SPACING_METHOD_UNIFORM,
-    DWRITE_LINE_SPACING_METHOD_PROPORTIONAL,
-}}
-ENUM!{enum DWRITE_TRIMMING_GRANULARITY {
-    DWRITE_TRIMMING_GRANULARITY_NONE,
-    DWRITE_TRIMMING_GRANULARITY_CHARACTER,
-    DWRITE_TRIMMING_GRANULARITY_WORD,
-}}
-ENUM!{enum DWRITE_FONT_FEATURE_TAG {
-    DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS = 0x63726661, // 'afrc'
-    DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS_FROM_CAPITALS = 0x63703263, // 'c2pc'
-    DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS_FROM_CAPITALS = 0x63733263, // 'c2sc'
-    DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES = 0x746c6163, // 'calt'
-    DWRITE_FONT_FEATURE_TAG_CASE_SENSITIVE_FORMS = 0x65736163, // 'case'
-    DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION = 0x706d6363, // 'ccmp'
-    DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES = 0x67696c63, // 'clig'
-    DWRITE_FONT_FEATURE_TAG_CAPITAL_SPACING = 0x70737063, // 'cpsp'
-    DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_SWASH = 0x68777363, // 'cswh'
-    DWRITE_FONT_FEATURE_TAG_CURSIVE_POSITIONING = 0x73727563, // 'curs'
-    DWRITE_FONT_FEATURE_TAG_DEFAULT = 0x746c6664, // 'dflt'
-    DWRITE_FONT_FEATURE_TAG_DISCRETIONARY_LIGATURES = 0x67696c64, // 'dlig'
-    DWRITE_FONT_FEATURE_TAG_EXPERT_FORMS = 0x74707865, // 'expt'
-    DWRITE_FONT_FEATURE_TAG_FRACTIONS = 0x63617266, // 'frac'
-    DWRITE_FONT_FEATURE_TAG_FULL_WIDTH = 0x64697766, // 'fwid'
-    DWRITE_FONT_FEATURE_TAG_HALF_FORMS = 0x666c6168, // 'half'
-    DWRITE_FONT_FEATURE_TAG_HALANT_FORMS = 0x6e6c6168, // 'haln'
-    DWRITE_FONT_FEATURE_TAG_ALTERNATE_HALF_WIDTH = 0x746c6168, // 'halt'
-    DWRITE_FONT_FEATURE_TAG_HISTORICAL_FORMS = 0x74736968, // 'hist'
-    DWRITE_FONT_FEATURE_TAG_HORIZONTAL_KANA_ALTERNATES = 0x616e6b68, // 'hkna'
-    DWRITE_FONT_FEATURE_TAG_HISTORICAL_LIGATURES = 0x67696c68, // 'hlig'
-    DWRITE_FONT_FEATURE_TAG_HALF_WIDTH = 0x64697768, // 'hwid'
-    DWRITE_FONT_FEATURE_TAG_HOJO_KANJI_FORMS = 0x6f6a6f68, // 'hojo'
-    DWRITE_FONT_FEATURE_TAG_JIS04_FORMS = 0x3430706a, // 'jp04'
-    DWRITE_FONT_FEATURE_TAG_JIS78_FORMS = 0x3837706a, // 'jp78'
-    DWRITE_FONT_FEATURE_TAG_JIS83_FORMS = 0x3338706a, // 'jp83'
-    DWRITE_FONT_FEATURE_TAG_JIS90_FORMS = 0x3039706a, // 'jp90'
-    DWRITE_FONT_FEATURE_TAG_KERNING = 0x6e72656b, // 'kern'
-    DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES = 0x6167696c, // 'liga'
-    DWRITE_FONT_FEATURE_TAG_LINING_FIGURES = 0x6d756e6c, // 'lnum'
-    DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS = 0x6c636f6c, // 'locl'
-    DWRITE_FONT_FEATURE_TAG_MARK_POSITIONING = 0x6b72616d, // 'mark'
-    DWRITE_FONT_FEATURE_TAG_MATHEMATICAL_GREEK = 0x6b72676d, // 'mgrk'
-    DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING = 0x6b6d6b6d, // 'mkmk'
-    DWRITE_FONT_FEATURE_TAG_ALTERNATE_ANNOTATION_FORMS = 0x746c616e, // 'nalt'
-    DWRITE_FONT_FEATURE_TAG_NLC_KANJI_FORMS = 0x6b636c6e, // 'nlck'
-    DWRITE_FONT_FEATURE_TAG_OLD_STYLE_FIGURES = 0x6d756e6f, // 'onum'
-    DWRITE_FONT_FEATURE_TAG_ORDINALS = 0x6e64726f, // 'ordn'
-    DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_ALTERNATE_WIDTH = 0x746c6170, // 'palt'
-    DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS = 0x70616370, // 'pcap'
-    DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_FIGURES = 0x6d756e70, // 'pnum'
-    DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_WIDTHS = 0x64697770, // 'pwid'
-    DWRITE_FONT_FEATURE_TAG_QUARTER_WIDTHS = 0x64697771, // 'qwid'
-    DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES = 0x67696c72, // 'rlig'
-    DWRITE_FONT_FEATURE_TAG_RUBY_NOTATION_FORMS = 0x79627572, // 'ruby'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_ALTERNATES = 0x746c6173, // 'salt'
-    DWRITE_FONT_FEATURE_TAG_SCIENTIFIC_INFERIORS = 0x666e6973, // 'sinf'
-    DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS = 0x70636d73, // 'smcp'
-    DWRITE_FONT_FEATURE_TAG_SIMPLIFIED_FORMS = 0x6c706d73, // 'smpl'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_1 = 0x31307373, // 'ss01'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_2 = 0x32307373, // 'ss02'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_3 = 0x33307373, // 'ss03'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_4 = 0x34307373, // 'ss04'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_5 = 0x35307373, // 'ss05'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_6 = 0x36307373, // 'ss06'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_7 = 0x37307373, // 'ss07'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_8 = 0x38307373, // 'ss08'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_9 = 0x39307373, // 'ss09'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_10 = 0x30317373, // 'ss10'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_11 = 0x31317373, // 'ss11'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_12 = 0x32317373, // 'ss12'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_13 = 0x33317373, // 'ss13'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_14 = 0x34317373, // 'ss14'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_15 = 0x35317373, // 'ss15'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_16 = 0x36317373, // 'ss16'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_17 = 0x37317373, // 'ss17'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_18 = 0x38317373, // 'ss18'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_19 = 0x39317373, // 'ss19'
-    DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_20 = 0x30327373, // 'ss20'
-    DWRITE_FONT_FEATURE_TAG_SUBSCRIPT = 0x73627573, // 'subs'
-    DWRITE_FONT_FEATURE_TAG_SUPERSCRIPT = 0x73707573, // 'sups'
-    DWRITE_FONT_FEATURE_TAG_SWASH = 0x68737773, // 'swsh'
-    DWRITE_FONT_FEATURE_TAG_TITLING = 0x6c746974, // 'titl'
-    DWRITE_FONT_FEATURE_TAG_TRADITIONAL_NAME_FORMS = 0x6d616e74, // 'tnam'
-    DWRITE_FONT_FEATURE_TAG_TABULAR_FIGURES = 0x6d756e74, // 'tnum'
-    DWRITE_FONT_FEATURE_TAG_TRADITIONAL_FORMS = 0x64617274, // 'trad'
-    DWRITE_FONT_FEATURE_TAG_THIRD_WIDTHS = 0x64697774, // 'twid'
-    DWRITE_FONT_FEATURE_TAG_UNICASE = 0x63696e75, // 'unic'
-    DWRITE_FONT_FEATURE_TAG_VERTICAL_WRITING = 0x74726576, // 'vert'
-    DWRITE_FONT_FEATURE_TAG_VERTICAL_ALTERNATES_AND_ROTATION = 0x32747276, // 'vrt2'
-    DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO = 0x6f72657a, // 'zero'
-}}
-STRUCT!{struct DWRITE_TEXT_RANGE {
-    startPosition: ::UINT32,
-    length: ::UINT32,
-}}
-STRUCT!{struct DWRITE_FONT_FEATURE {
-    nameTag: DWRITE_FONT_FEATURE_TAG,
-    parameter: ::UINT32,
-}}
-STRUCT!{struct DWRITE_TYPOGRAPHIC_FEATURES {
-    features: *mut DWRITE_FONT_FEATURE,
-    featureCount: ::UINT32,
-}}
-STRUCT!{struct DWRITE_TRIMMING {
-    granularity: DWRITE_TRIMMING_GRANULARITY,
-    delimiter: ::UINT32,
-    delimiterCount: ::UINT32,
-}}
-RIDL!{interface IDWriteTextFormat(IDWriteTextFormatVtbl): IUnknown(IUnknownVtbl) {
-    fn SetTextAlignment(&mut self, textAlignment: DWRITE_TEXT_ALIGNMENT) -> ::HRESULT,
-    fn SetParagraphAlignment(
-        &mut self, paragraphAlignment: DWRITE_PARAGRAPH_ALIGNMENT
-    ) -> ::HRESULT,
-    fn SetWordWrapping(&mut self, wordWrapping: DWRITE_WORD_WRAPPING) -> ::HRESULT,
-    fn SetReadingDirection(&mut self, readingDirection: DWRITE_READING_DIRECTION) -> ::HRESULT,
-    fn SetFlowDirection(&mut self, flowDirection: DWRITE_FLOW_DIRECTION) -> ::HRESULT,
-    fn SetIncrementalTabStop(&mut self, incrementalTabStop: ::FLOAT) -> ::HRESULT,
-    fn SetTrimming(
-        &mut self, trimmingOptions: *const DWRITE_TRIMMING, trimmingSign: *mut IDWriteInlineObject
-    ) -> ::HRESULT,
-    fn SetLineSpacing(
-        &mut self, lineSpacingMethod: DWRITE_LINE_SPACING_METHOD, lineSpacing: ::FLOAT,
-        baseLine: ::FLOAT
-    ) -> ::HRESULT,
-    fn GetTextAlignment(&mut self) -> DWRITE_TEXT_ALIGNMENT,
-    fn GetParagraphAlignment(&mut self) -> DWRITE_PARAGRAPH_ALIGNMENT,
-    fn GetWordWrapping(&mut self) -> DWRITE_WORD_WRAPPING,
-    fn GetReadingDirection(&mut self) -> DWRITE_READING_DIRECTION,
-    fn GetFlowDirection(&mut self) -> DWRITE_FLOW_DIRECTION,
-    fn GetIncrementalTabStop(&mut self) -> ::FLOAT,
-    fn GetTrimming(
-        &mut self, trimmingOptions: *mut DWRITE_TRIMMING,
-        trimmingSign: *mut *mut IDWriteInlineObject
-    ) -> ::HRESULT,
-    fn GetLineSpacing(
-        &mut self, lineSpacingMethod: *mut DWRITE_LINE_SPACING_METHOD, lineSpacing: *mut ::FLOAT,
-        baseline: *mut ::FLOAT
-    ) -> ::HRESULT,
-    fn GetFontCollection(&mut self, fontCollection: *mut *mut IDWriteFontCollection) -> ::HRESULT,
-    fn GetFontFamilyNameLength(&mut self) -> ::UINT32,
-    fn GetFontFamilyName(&mut self, fontFamilyName: *mut ::WCHAR, nameSize: ::UINT32) -> ::HRESULT,
-    fn GetFontWeight(&mut self) -> DWRITE_FONT_WEIGHT,
-    fn GetFontStyle(&mut self) -> DWRITE_FONT_STYLE,
-    fn GetFontStretch(&mut self) -> DWRITE_FONT_STRETCH,
-    fn GetFontSize(&mut self) -> ::FLOAT,
-    fn GetLocaleNameLength(&mut self) -> ::UINT32,
-    fn GetLocaleName(&mut self, localeName: *mut ::WCHAR, nameSize: ::UINT32) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTypography(IDWriteTypographyVtbl): IUnknown(IUnknownVtbl) {
-    fn AddFontFeature(&mut self, fontFeature: DWRITE_FONT_FEATURE) -> ::HRESULT,
-    fn GetFontFeatureCount(&mut self) -> ::UINT32,
-    fn GetFontFeature(
-        &mut self, fontFeatureIndex: ::UINT32, fontFeature: *mut DWRITE_FONT_FEATURE
-    ) -> ::HRESULT
-}}
-FLAGS!{enum DWRITE_SCRIPT_SHAPES {
-    DWRITE_SCRIPT_SHAPES_DEFAULT = 0,
-    DWRITE_SCRIPT_SHAPES_NO_VISUAL = 1,
-}}
-STRUCT!{struct DWRITE_SCRIPT_ANALYSIS {
-    script: ::UINT16,
-    shapes: DWRITE_SCRIPT_SHAPES,
-}}
-ENUM!{enum DWRITE_BREAK_CONDITION {
-    DWRITE_BREAK_CONDITION_NEUTRAL,
-    DWRITE_BREAK_CONDITION_CAN_BREAK,
-    DWRITE_BREAK_CONDITION_MAY_NOT_BREAK,
-    DWRITE_BREAK_CONDITION_MUST_BREAK,
-}}
-STRUCT!{struct DWRITE_LINE_BREAKPOINT {
-    bit_fields: ::UINT8,
-}}
-BITFIELD!{DWRITE_LINE_BREAKPOINT bit_fields: ::UINT8 [
-    breakConditionBefore set_breakConditionBefore[0..2],
-    breakConditionAfter set_breakConditionAfter[2..4],
-    isWhitespace set_isWhitespace[4..5],
-    isSoftHyphen set_isSoftHyphen[5..6],
-    padding set_padding[6..8],
-]}
-ENUM!{enum DWRITE_NUMBER_SUBSTITUTION_METHOD {
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL,
-    DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL,
-}}
-RIDL!{interface IDWriteNumberSubstitution(IDWriteNumberSubstitutionVtbl): IUnknown(IUnknownVtbl) {
-}}
-STRUCT!{struct DWRITE_SHAPING_TEXT_PROPERTIES {
-    bit_fields: ::UINT16,
-}}
-BITFIELD!{DWRITE_SHAPING_TEXT_PROPERTIES bit_fields: ::UINT16 [
-    isShapedAlone set_isShapedAlone[0..1],
-    reserved set_reserved[1..16],
-]}
-STRUCT!{struct DWRITE_SHAPING_GLYPH_PROPERTIES {
-    bit_fields: ::UINT16,
-}}
-BITFIELD!{DWRITE_SHAPING_GLYPH_PROPERTIES bit_fields: ::UINT16 [
-    justification set_justification[0..4],
-    isClusterStart set_isClusterStart[4..5],
-    isDiacritic set_isDiacritic[5..6],
-    isZeroWidthSpace set_isZeroWidthSpace[6..7],
-    reserved set_reserved[7..16],
-]}
-RIDL!{interface IDWriteTextAnalysisSource(IDWriteTextAnalysisSourceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTextAtPosition(
-        &mut self, textPosition: ::UINT32, textString: *mut *const ::WCHAR,
-        textLength: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetTextBeforePosition(
-        &mut self, textPosition: ::UINT32, textString: *mut *const ::WCHAR,
-        textLength: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetParagraphReadingDirection(&mut self) -> DWRITE_READING_DIRECTION,
-    fn GetLocaleName(
-        &mut self, textPosition: ::UINT32, textLength: *mut ::UINT32,
-        localeName: *mut *const ::WCHAR
-    ) -> ::HRESULT,
-    fn GetNumberSubstitution(
-        &mut self, textPosition: ::UINT32, textLength: *mut ::UINT32,
-        numberSubstitution: *mut *mut IDWriteNumberSubstitution
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextAnalysisSink(IDWriteTextAnalysisSinkVtbl): IUnknown(IUnknownVtbl) {
-    fn SetScriptAnalysis(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32,
-        scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS
-    ) -> ::HRESULT,
-    fn SetLineBreakpoints(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32,
-        lineBreakpoints: *const DWRITE_LINE_BREAKPOINT
-    ) -> ::HRESULT,
-    fn SetBidiLevel(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32, explicitLevel: ::UINT8,
-        resolvedLevel: ::UINT8
-    ) -> ::HRESULT,
-    fn SetNumberSubstitution(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32,
-        numberSubstitution: *mut IDWriteNumberSubstitution
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextAnalyzer(IDWriteTextAnalyzerVtbl): IUnknown(IUnknownVtbl) {
-    fn AnalyzeScript(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn AnalyzeBidi(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn AnalyzeNumberSubstitution(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn AnalyzeLineBreakpoints(
-        &mut self, analysisSource: *mut IDWriteTextAnalysisSource, textPosition: ::UINT32,
-        textLength: ::UINT32, analysisSink: *mut IDWriteTextAnalysisSink
-    ) -> ::HRESULT,
-    fn GetGlyphs(
-        &mut self, textString: *const ::WCHAR, textLength: ::UINT32,
-        fontFace: *mut IDWriteFontFace, isSideways: ::BOOL, isRightToLeft: ::BOOL,
-        scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS, localeName: *const ::WCHAR,
-        numberSubstitution: *mut IDWriteNumberSubstitution,
-        features: *mut *const DWRITE_TYPOGRAPHIC_FEATURES, featureRangeLengths: *const ::UINT32,
-        featureRanges: ::UINT32, maxGlyphCount: ::UINT32, clusterMap: *mut ::UINT16,
-        textProps: *mut DWRITE_SHAPING_TEXT_PROPERTIES, glyphIndices: *mut ::UINT16,
-        glyphProps: *mut DWRITE_SHAPING_GLYPH_PROPERTIES, actualGlyphCount: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetGlyphPlacements(
-        &mut self, textString: *const ::WCHAR, clusterMap: *const ::UINT16,
-        textProps: *mut DWRITE_SHAPING_TEXT_PROPERTIES, textLength: ::UINT32,
-        glyphIndices: *const ::UINT16, glyphProps: *const DWRITE_SHAPING_GLYPH_PROPERTIES,
-        glyphCount: ::UINT32, fontFace: *mut IDWriteFontFace, fontEmSize: ::FLOAT,
-        isSideways: ::BOOL, isRightToLeft: ::BOOL, scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS,
-        localeName: *const ::WCHAR, features: *mut *const DWRITE_TYPOGRAPHIC_FEATURES,
-        featureRangeLengths: *const ::UINT32, featureRanges: ::UINT32, glyphAdvances: *mut ::FLOAT,
-        glyphOffsets: *mut DWRITE_GLYPH_OFFSET
-    ) -> ::HRESULT,
-    fn GetGdiCompatibleGlyphPlacements(
-        &mut self, textString: *const ::WCHAR, clusterMap: *const ::UINT16,
-        textProps: *mut DWRITE_SHAPING_TEXT_PROPERTIES, textLength: ::UINT32,
-        glyphIndices: *const ::UINT16, glyphProps: *const DWRITE_SHAPING_GLYPH_PROPERTIES,
-        glyphCount: ::UINT32, fontFace: *mut IDWriteFontFace, fontEmSize: ::FLOAT,
-        pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX, useGdiNatrual: ::BOOL,
-        isSideways: ::BOOL, isRightToLeft: ::BOOL, scriptAnalysis: *const DWRITE_SCRIPT_ANALYSIS,
-        localeName: *const ::WCHAR, features: *mut *const DWRITE_TYPOGRAPHIC_FEATURES,
-        featureRangeLengths: *const ::UINT32, featureRanges: ::UINT32, glyphAdvances: *mut ::FLOAT,
-        glyphOffsets: *mut DWRITE_GLYPH_OFFSET
-    ) -> ::HRESULT
-}}
-STRUCT!{struct DWRITE_GLYPH_RUN {
-    fontFace: *mut IDWriteFontFace,
-    fontEmSize: ::FLOAT,
-    glyphCount: ::UINT32,
-    glyphIndices: *const ::UINT16,
-    glyphAdvances: *const ::FLOAT,
-    glyphOffsets: *const DWRITE_GLYPH_OFFSET,
-    isSideways: ::BOOL,
-    bidiLevel: ::UINT32,
-}}
-STRUCT!{struct DWRITE_GLYPH_RUN_DESCRIPTION {
-    localeName: *const ::WCHAR,
-    string: *const ::WCHAR,
-    stringLength: ::UINT32,
-    clusterMap: *const ::UINT16,
-    textPosition: ::UINT32,
-}}
-STRUCT!{struct DWRITE_UNDERLINE {
-    width: ::FLOAT,
-    thickness: ::FLOAT,
-    offset: ::FLOAT,
-    runHeight: ::FLOAT,
-    readingDirection: DWRITE_READING_DIRECTION,
-    flowDirection: DWRITE_FLOW_DIRECTION,
-    localeName: *const ::WCHAR,
-    measuringMode: ::DWRITE_MEASURING_MODE,
-}}
-STRUCT!{struct DWRITE_STRIKETHROUGH {
-    width: ::FLOAT,
-    thickness: ::FLOAT,
-    offset: ::FLOAT,
-    readingDirection: DWRITE_READING_DIRECTION,
-    flowDirection: DWRITE_FLOW_DIRECTION,
-    localeName: *const ::WCHAR,
-    measuringMode: ::DWRITE_MEASURING_MODE,
-}}
-STRUCT!{struct DWRITE_LINE_METRICS {
-    length: ::UINT32,
-    trailingWhitespaceLength: ::UINT32,
-    newlineLength: ::UINT32,
-    height: ::FLOAT,
-    baseline: ::FLOAT,
-    isTrimmed: ::BOOL,
-}}
-STRUCT!{struct DWRITE_CLUSTER_METRICS {
-    width: ::FLOAT,
-    length: ::UINT16,
-    bit_fields: ::UINT16,
-}}
-BITFIELD!{DWRITE_CLUSTER_METRICS bit_fields: ::UINT16 [
-    canWrapLineAfter set_canWrapLineAfter[0..1],
-    isWhitespace set_isWhitespace[1..2],
-    isNewline set_isNewline[2..3],
-    isSoftHyphen set_isSoftHyphen[3..4],
-    isRightToLeft set_isRightToLeft[4..5],
-    padding set_padding[5..16],
-]}
-STRUCT!{struct DWRITE_TEXT_METRICS {
-    left: ::FLOAT,
-    top: ::FLOAT,
-    width: ::FLOAT,
-    widthIncludingTrailingWhitespace: ::FLOAT,
-    height: ::FLOAT,
-    layoutWidth: ::FLOAT,
-    layoutHeight: ::FLOAT,
-    maxBidiReorderingDepth: ::UINT32,
-    lineCount: ::UINT32,
-}}
-STRUCT!{struct DWRITE_INLINE_OBJECT_METRICS {
-    width: ::FLOAT,
-    height: ::FLOAT,
-    baseline: ::FLOAT,
-    supportsSideways: ::BOOL,
-}}
-STRUCT!{struct DWRITE_OVERHANG_METRICS {
-    left: ::FLOAT,
-    top: ::FLOAT,
-    right: ::FLOAT,
-    bottom: ::FLOAT,
-}}
-STRUCT!{struct DWRITE_HIT_TEST_METRICS {
-    textPosition: ::UINT32,
-    length: ::UINT32,
-    left: ::FLOAT,
-    top: ::FLOAT,
-    width: ::FLOAT,
-    height: ::FLOAT,
-    bidiLevel: ::UINT32,
-    isText: ::BOOL,
-    isTrimmed: ::BOOL,
-}}
-RIDL!{interface IDWriteInlineObject(IDWriteInlineObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn Draw(
-        &mut self, clientDrawingContext: *mut ::c_void, renderer: *mut IDWriteTextRenderer,
-        originX: ::FLOAT, originY: ::FLOAT, isSideways: ::BOOL, isRightToLeft: ::BOOL,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn GetMetrics(&mut self, metrics: *mut DWRITE_INLINE_OBJECT_METRICS) -> ::HRESULT,
-    fn GetOverhangMetrics(&mut self, overhangs: *mut DWRITE_OVERHANG_METRICS) -> ::HRESULT,
-    fn GetBreakConditions(
-        &mut self, breakConditionBefore: *mut DWRITE_BREAK_CONDITION,
-        breakConditionAfter: *mut DWRITE_BREAK_CONDITION
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWritePixelSnapping(IDWritePixelSnappingVtbl): IUnknown(IUnknownVtbl) {
-    fn IsPixelSnappingDisabled(
-        &mut self, clientDrawingContext: *mut ::c_void, isDisabled: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn GetCurrentTransform(
-        &mut self, clientDrawingContext: *mut ::c_void, transform: *mut DWRITE_MATRIX
-    ) -> ::HRESULT,
-    fn GetPixelsPerDip(
-        &mut self, clientDrawingContext: *mut ::c_void, pixelsPerDip: *mut ::FLOAT
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextRenderer(IDWriteTextRendererVtbl):
-        IDWritePixelSnapping(IDWritePixelSnappingVtbl) {
-    fn DrawGlyphRun(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, measuringMode: ::DWRITE_MEASURING_MODE,
-        glyphRun: *const DWRITE_GLYPH_RUN,
-        glyphRunDescription: *const DWRITE_GLYPH_RUN_DESCRIPTION,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn DrawUnderline(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, underline: *const DWRITE_UNDERLINE,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn DrawStrikethrough(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, strikethrough: *const DWRITE_STRIKETHROUGH,
-        clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn DrawInlineObject(
-        &mut self, clientDrawingContext: *mut ::c_void, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, inlineObject: *mut IDWriteInlineObject,
-        isSideways: ::BOOL, isRightToLeft: ::BOOL, clientDrawingEffect: *mut ::IUnknown
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteTextLayout(IDWriteTextLayoutVtbl):
-        IDWriteTextFormat(IDWriteTextFormatVtbl) {
-    fn SetMaxWidth(&mut self, maxWidth: ::FLOAT) -> ::HRESULT,
-    fn SetMaxHeight(&mut self, maxHeight: ::FLOAT) -> ::HRESULT,
-    fn SetFontCollection(
-        &mut self, fontCollection: *mut IDWriteFontCollection, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontFamilyName(
-        &mut self, fontFamilyName: *const ::WCHAR, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontWeight(
-        &mut self, fontWeight: DWRITE_FONT_WEIGHT, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontStyle(
-        &mut self, fontStyle: DWRITE_FONT_STYLE, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontStretch(
-        &mut self, fontStretch: DWRITE_FONT_STRETCH, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetFontSize(&mut self, fontSize: ::FLOAT, textRange: DWRITE_TEXT_RANGE) -> ::HRESULT,
-    fn SetUnderline(&mut self, hasUnderline: ::BOOL, textRange: DWRITE_TEXT_RANGE) -> ::HRESULT,
-    fn SetStrikethrough(
-        &mut self, hasStrikethrough: ::BOOL, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetDrawingEffect(
-        &mut self, drawingEffect: *mut ::IUnknown, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetInlineObject(
-        &mut self, inlineObject: *mut IDWriteInlineObject, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetTypography(
-        &mut self, typography: *mut IDWriteTypography, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn SetLocaleName(
-        &mut self, localeName: *const ::WCHAR, textRange: DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetMaxWidth(&mut self) -> ::FLOAT,
-    fn GetMaxHeight(&mut self) -> ::FLOAT,
-    fn GetFontCollection(
-        &mut self, currentPosition: ::UINT32, fontCollection: *mut *mut IDWriteFontCollection,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontFamilyNameLength(
-        &mut self, currentPosition: ::UINT32, nameLength: *mut ::UINT32,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontFamilyName(
-        &mut self, currentPosition: ::UINT32, fontFamilyName: *mut ::WCHAR,
-        nameSize: ::UINT32, textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontWeight(
-        &mut self, currentPosition: ::UINT32, fontWeight: *mut DWRITE_FONT_WEIGHT,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontStyle(
-        &mut self, currentPosition: ::UINT32, fontStyle: *mut DWRITE_FONT_STYLE,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontStretch(
-        &mut self, currentPosition: ::UINT32, fontStretch: *mut DWRITE_FONT_STRETCH,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetFontSize(
-        &mut self, currentPosition: ::UINT32, fontSize: *mut ::FLOAT,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetUnderline(
-        &mut self, currentPosition: ::UINT32, hasUnderline: *mut ::BOOL,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetStrikethrough(
-        &mut self, currentPosition: ::UINT32, hasStrikethrough: *mut ::BOOL,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetDrawingEffect(
-        &mut self, currentPosition: ::UINT32, drawingEffect: *mut *mut ::IUnknown,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetInlineObject(
-        &mut self, currentPosition: ::UINT32, inlineObject: *mut *mut IDWriteInlineObject,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetTypography(
-        &mut self, currentPosition: ::UINT32, typography: *mut *mut IDWriteTypography,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetLocaleNameLength(
-        &mut self, currentPosition: ::UINT32, nameLength: *mut ::UINT32,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn GetLocaleName(
-        &mut self, currentPosition: ::UINT32, localeName: *mut ::WCHAR, nameSize: ::UINT32,
-        textRange: *mut DWRITE_TEXT_RANGE
-    ) -> ::HRESULT,
-    fn Draw(
-        &mut self, clientDrawingContext: *mut ::c_void, renderer: *mut IDWriteTextRenderer,
-        originX: ::FLOAT, originY: ::FLOAT
-    ) -> ::HRESULT,
-    fn GetLineMetrics(
-        &mut self, lineMetrics: *mut DWRITE_LINE_METRICS, maxLineCount: ::UINT32,
-        actualLineCount: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn GetMetrics(&mut self, textMetrics: *mut DWRITE_TEXT_METRICS) -> ::HRESULT,
-    fn GetOverhangMetrics(&mut self, overhangs: *mut DWRITE_OVERHANG_METRICS) -> ::HRESULT,
-    fn GetClusterMetrics(
-        &mut self, clusterMetrics: *mut DWRITE_CLUSTER_METRICS, maxClusterCount: ::UINT32,
-        actualClusterCount: *mut ::UINT32
-    ) -> ::HRESULT,
-    fn DetermineMinWidth(&mut self, minWidth: *mut ::FLOAT) -> ::HRESULT,
-    fn HitTestPoint(
-        &mut self, pointX: ::FLOAT, pointY: ::FLOAT, isTrailingHit: *mut ::BOOL,
-        isInside: *mut ::BOOL, hitTestMetrics: *mut DWRITE_HIT_TEST_METRICS
-    ) -> ::HRESULT,
-    fn HitTestTextPosition(
-        &mut self, textPosition: ::UINT32, isTrailingHit: ::BOOL, pointX: *mut ::FLOAT,
-        pointY: *mut ::FLOAT, hitTestMetrics: *mut DWRITE_HIT_TEST_METRICS
-    ) -> ::HRESULT,
-    fn HitTestTextRange(
-        &mut self, textPosition: ::UINT32, textLength: ::UINT32, originX: ::FLOAT,
-        originY: ::FLOAT, hitTestMetrics: *mut DWRITE_HIT_TEST_METRICS,
-        maxHitTestMetricsCount: ::UINT32, actualHitTestMetricsCount: *mut ::UINT32
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteBitmapRenderTarget(IDWriteBitmapRenderTargetVtbl): IUnknown(IUnknownVtbl) {
-    fn DrawGlyphRun(
-        &mut self, baselineOriginX: ::FLOAT, baselineOriginY: ::FLOAT,
-        measuringMode: ::DWRITE_MEASURING_MODE, glyphRun: *const ::DWRITE_GLYPH_RUN,
-        renderingParams: *mut IDWriteRenderingParams, textColor: ::COLORREF,
-        blackBoxRect: *mut ::RECT
-    ) -> ::HRESULT,
-    fn GetMemoryDC(&mut self) -> ::HDC,
-    fn GetPixelsPerDip(&mut self) -> ::FLOAT,
-    fn SetPixelsPerDip(&mut self, pixelsPerDip: ::FLOAT) -> ::HRESULT,
-    fn GetCurrentTransform(&mut self, transform: *mut DWRITE_MATRIX) -> ::HRESULT,
-    fn SetCurrentTransform(&mut self, transform: *const DWRITE_MATRIX) -> ::HRESULT,
-    fn GetSize(&mut self, size: *mut ::SIZE) -> ::HRESULT,
-    fn Resize(&mut self, width: ::UINT32, height: ::UINT32) -> ::HRESULT
-}}
-RIDL!{interface IDWriteGdiInterop(IDWriteGdiInteropVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateFontFromLOGFONT(
-        &mut self, logFont: *const ::LOGFONTW, font: *mut *mut IDWriteFont
-    ) -> ::HRESULT,
-    fn ConvertFontToLOGFONT(
-        &mut self, font: *mut IDWriteFont, logFont: *mut ::LOGFONTW, isSystemFont: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn ConvertFontFaceToLOGFONT(
-        &mut self, font: *mut IDWriteFontFace, logFont: *mut ::LOGFONTW
-    ) -> ::HRESULT,
-    fn CreateFontFaceFromHdc(
-        &mut self, hdc: ::HDC, fontFace: *mut *mut IDWriteFontFace
-    ) -> ::HRESULT,
-    fn CreateBitmapRenderTarget(
-        &mut self, hdc: ::HDC, width: ::UINT32, height: ::UINT32,
-        renderTarget: *mut *mut IDWriteBitmapRenderTarget
-    ) -> ::HRESULT
-}}
-ENUM!{enum DWRITE_TEXTURE_TYPE {
-    DWRITE_TEXTURE_ALIASED_1x1 = 0,
-    DWRITE_TEXTURE_CLEARTYPE_3x1 = 1,
-}}
-pub const DWRITE_ALPHA_MAX: ::BYTE = 255;
-RIDL!{interface IDWriteGlyphRunAnalysis(IDWriteGlyphRunAnalysisVtbl): IUnknown(IUnknownVtbl) {
-    fn GetAlphaTextureBounds(
-        &mut self, textureType: DWRITE_TEXTURE_TYPE, textureBounds: *mut ::RECT
-    ) -> ::HRESULT,
-    fn CreateAlphaTexture(
-        &mut self, textureType: DWRITE_TEXTURE_TYPE, textureBounds: *const ::RECT,
-        alphaValues: *mut ::BYTE, bufferSize: ::UINT32
-    ) -> ::HRESULT,
-    fn GetAlphaBlendParams(
-        &mut self, renderingParams: *mut IDWriteRenderingParams, blendGamma: *mut ::FLOAT,
-        blendEnhancedContrast: *mut ::FLOAT, blendClearTypeLevel: *mut ::FLOAT
-    ) -> ::HRESULT
-}}
-RIDL!{interface IDWriteFactory(IDWriteFactoryVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSystemFontCollection(
-        &mut self, fontCollection: *mut *mut IDWriteFontCollection, checkForUpdates: ::BOOL
-    ) -> ::HRESULT,
-    fn CreateCustomFontCollection(
-        &mut self, collectionLoader: *mut IDWriteFontCollectionLoader,
-        collectionKey: *const ::c_void, collectionKeySize: ::UINT32,
-        fontCollection: *mut *mut IDWriteFontCollection
-    ) -> ::HRESULT,
-    fn RegisterFontCollectionLoader(
-        &mut self, fontCollectionLoader: *mut IDWriteFontCollectionLoader
-    ) -> ::HRESULT,
-    fn UnregisterFontCollectionLoader(
-        &mut self, fontCollectionLoader: *mut IDWriteFontCollectionLoader
-    ) -> ::HRESULT,
-    fn CreateFontFileReference(
-        &mut self, filePath: *const ::WCHAR, lastWriteTime: *const ::FILETIME,
-        fontFile: *mut *mut IDWriteFontFile
-    ) -> ::HRESULT,
-    fn CreateCustomFontFileReference(
-        &mut self, fontFileReferenceKey: *const ::c_void, fontFileReferenceKeySize: ::UINT32,
-        fontFileLoader: *mut IDWriteFontFileLoader, fontFile: *mut *mut IDWriteFontFile
-    ) -> ::HRESULT,
-    fn CreateFontFace(
-        &mut self, fontFaceType: DWRITE_FONT_FACE_TYPE, numberOfFiles: ::UINT32,
-        fontFiles: *const *mut IDWriteFontFile, faceIndex: ::UINT32,
-        fontFaceSimulationFlags: DWRITE_FONT_SIMULATIONS, fontFace: *mut *mut IDWriteFontFace
-    ) -> ::HRESULT,
-    fn CreateRenderingParams(
-        &mut self, renderingParams: *mut *mut IDWriteRenderingParams
-    ) -> ::HRESULT,
-    fn CreateMonitorRenderingParams(
-        &mut self, monitor: ::HMONITOR, renderingParams: *mut *mut IDWriteRenderingParams
-    ) -> ::HRESULT,
-    fn CreateCustomRenderingParams(
-        &mut self, gamma: ::FLOAT, enhancedContrast: ::FLOAT, clearTypeLevel: ::FLOAT,
-        pixelGeometry: DWRITE_PIXEL_GEOMETRY, renderingMode: DWRITE_RENDERING_MODE,
-        renderingParams: *mut *mut IDWriteRenderingParams
-    ) -> ::HRESULT,
-    fn RegisterFontFileLoader(
-        &mut self, fontFileLoader: *mut IDWriteFontFileLoader
-    ) -> ::HRESULT,
-    fn UnregisterFontFileLoader(
-        &mut self, fontFileLoader: *mut IDWriteFontFileLoader
-    ) -> ::HRESULT,
-    fn CreateTextFormat(
-        &mut self, fontFamilyName: *const ::WCHAR, fontCollection: *mut IDWriteFontCollection,
-        fontWeight: DWRITE_FONT_WEIGHT, fontStyle: DWRITE_FONT_STYLE,
-        fontStretch: DWRITE_FONT_STRETCH, fontSize: ::FLOAT, localeName: *const ::WCHAR,
-        textFormat: *mut *mut IDWriteTextFormat
-    ) -> ::HRESULT,
-    fn CreateTypography(&mut self, typography: *mut *mut IDWriteTypography) -> ::HRESULT,
-    fn GetGdiInterop(&mut self, gdiInterop: *mut *mut IDWriteGdiInterop) -> ::HRESULT,
-    fn CreateTextLayout(
-        &mut self, string: *const ::WCHAR, stringLength: ::UINT32,
-        textFormat: *mut IDWriteTextFormat, maxWidth: ::FLOAT, maxHeight: ::FLOAT,
-        textLayout: *mut *mut IDWriteTextLayout
-    ) -> ::HRESULT,
-    fn CreateGdiCompatibleTextLayout(
-        &mut self, string: *const ::WCHAR, stringLength: ::UINT32,
-        textFormat: *mut IDWriteTextFormat, layoutWidth: ::FLOAT, layoutHeight: ::FLOAT,
-        pixelsPerDip: ::FLOAT, transform: *const DWRITE_MATRIX, useGdiNatrual: ::BOOL,
-        textLayout: *mut *mut IDWriteTextLayout
-    ) -> ::HRESULT,
-    fn CreateEllipsisTrimmingSign(
-        &mut self, textFormat: *mut IDWriteTextFormat, trimmingSign: *mut *mut IDWriteInlineObject
-    ) -> ::HRESULT,
-    fn CreateTextAnalyzer(&mut self, textAnalyzer: *mut *mut IDWriteTextAnalyzer) -> ::HRESULT,
-    fn CreateNumberSubstitution(
-        &mut self, substitutionMethod: DWRITE_NUMBER_SUBSTITUTION_METHOD,
-        localeName: *const ::WCHAR, ignoreUserOverride: ::BOOL,
-        numberSubstitution: *mut *mut IDWriteNumberSubstitution
-    ) -> ::HRESULT,
-    fn CreateGlyphRunAnalysis(
-        &mut self, glyphRun: *const DWRITE_GLYPH_RUN, pixelsPerDip: ::FLOAT,
-        transform: *const DWRITE_MATRIX, renderingMode: DWRITE_RENDERING_MODE,
-        measuringMode: ::DWRITE_MEASURING_MODE, baselineOriginX: ::FLOAT,
-        baselineOriginY: ::FLOAT, glyphRunAnalysis: *mut *mut IDWriteGlyphRunAnalysis
-    ) -> ::HRESULT
-}}
-pub const FACILITY_DWRITE: ::HRESULT = 0x898;
-pub const DWRITE_ERR_BASE: ::HRESULT = 0x5000;
-#[inline]
-pub fn MAKE_DWRITE_HR(severity: ::HRESULT, code: ::HRESULT) -> ::HRESULT {
-    ::MAKE_HRESULT(severity, FACILITY_DWRITE, DWRITE_ERR_BASE + code)
-}
-#[inline]
-pub fn MAKE_DWRITE_HR_ERR(code: ::HRESULT) -> ::HRESULT {
-    MAKE_DWRITE_HR(::SEVERITY_ERROR, code)
-}
diff --git a/vendor/winapi-0.2.8/src/dxgi.rs b/vendor/winapi-0.2.8/src/dxgi.rs
deleted file mode 100644
index c81821504c..0000000000
--- a/vendor/winapi-0.2.8/src/dxgi.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi.h
-STRUCT!{struct DXGI_FRAME_STATISTICS {
-    PresentCount: ::UINT,
-    PresentRefreshCount: ::UINT,
-    SyncRefreshCount: ::UINT,
-    SyncQPCTime: ::LARGE_INTEGER,
-    SyncGPUTime: ::LARGE_INTEGER,
-}}
-STRUCT!{struct DXGI_MAPPED_RECT {
-    Pitch: ::INT,
-    pBits: *mut ::BYTE,
-}}
-STRUCT!{nodebug struct DXGI_ADAPTER_DESC {
-    Description: [::WCHAR; 128],
-    VectorId: ::UINT,
-    DeviceId: ::UINT,
-    SubSysId: ::UINT,
-    Revision: ::UINT,
-    DedicatedVideoMemory: ::SIZE_T,
-    DedicatedSystemMemory: ::SIZE_T,
-    SharedSystemMemory: ::SIZE_T,
-    AdapterLuid: ::LUID,
-}}
-STRUCT!{nodebug struct DXGI_OUTPUT_DESC {
-    DeviceName: [::WCHAR; 32],
-    DesktopCoordinates: ::RECT,
-    AttachedToDesktop: ::BOOL,
-    Rotation: ::DXGI_MODE_ROTATION,
-    Monitor: ::HMONITOR,
-}}
-STRUCT!{struct DXGI_SHARED_RESOURCE {
-    Handle: ::HANDLE,
-}}
-pub const DXGI_RESOURCE_PRIORITY_MINIMUM: ::DWORD = 0x28000000;
-pub const DXGI_RESOURCE_PRIORITY_LOW: ::DWORD = 0x50000000;
-pub const DXGI_RESOURCE_PRIORITY_NORMAL: ::DWORD = 0x78000000;
-pub const DXGI_RESOURCE_PRIORITY_HIGH: ::DWORD = 0xa0000000;
-pub const DXGI_RESOURCE_PRIORITY_MAXIMUM: ::DWORD = 0xc8000000;
-ENUM!{enum DXGI_RESIDENCY {
-    DXGI_RESIDENCY_FULLY_RESIDENT = 1,
-    DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY = 2,
-    DXGI_RESIDENCY_EVICTED_TO_DISK = 3,
-}}
-STRUCT!{struct DXGI_SURFACE_DESC {
-    Width: ::UINT,
-    Height: ::UINT,
-    Format: ::DXGI_FORMAT,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-}}
-ENUM!{enum DXGI_SWAP_EFFECT {
-    DXGI_SWAP_EFFECT_DISCARD = 0,
-    DXGI_SWAP_EFFECT_SEQUENTIAL = 1,
-    DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL = 3,
-}}
-FLAGS!{enum DXGI_SWAP_CHAIN_FLAG {
-    DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 1,
-    DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 2,
-    DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 4,
-    DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT = 8,
-    DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 16,
-    DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 32,
-    DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 64,
-    DXGI_SWAP_CHAIN_FLAG_FOREGROUND_LAYER = 128,
-    DXGI_SWAP_CHAIN_FLAG_FULLSCREEN_VIDEO = 256,
-    DXGI_SWAP_CHAIN_FLAG_YUV_VIDEO = 512,
-}}
-STRUCT!{struct DXGI_SWAP_CHAIN_DESC {
-    BufferDesc: ::DXGI_MODE_DESC,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    BufferUsage: ::DXGI_USAGE,
-    BufferCount: ::UINT,
-    OutputWindow: ::HWND,
-    Windowed: ::BOOL,
-    SwapEffect: DXGI_SWAP_EFFECT,
-    Flags: ::UINT,
-}}
-RIDL!(
-interface IDXGIObject(IDXGIObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn SetPrivateData(
-        &mut self, Name: ::REFGUID, DataSize: ::UINT, pData: *const ::c_void
-    ) -> ::HRESULT,
-    fn SetPrivateDataInterface(&mut self, Name: ::REFGUID, pUnknown: *const ::IUnknown) -> ::HRESULT,
-    fn GetPrivateData(
-        &mut self, Name: ::REFGUID, pDataSize: *mut ::UINT, pData: *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetParent(
-        &mut self, riid: ::REFIID, ppParent: *mut *mut ::c_void
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetDevice(&mut self, riid: ::REFIID, ppDevice: *mut *mut ::c_void) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIResource(IDXGIResourceVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn GetSharedHandle(&mut self, pSharedHandle: *mut ::HANDLE) -> ::HRESULT,
-    fn GetUsage(&mut self, pUsage: *mut ::DXGI_USAGE) -> ::HRESULT,
-    fn SetEvictionPriority(&mut self, EvictionPriority: ::UINT) -> ::HRESULT,
-    fn GetEvictionPriority(&mut self, pEvictionPriority: *mut ::UINT) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIKeyedMutex(IDXGIKeyedMutexVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn AcquireSync(&mut self, Key: ::UINT64, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn ReleaseSync(&mut self, Key: ::UINT64) -> ::HRESULT
-});
-RIDL!(
-interface IDXGISurface(IDXGISurfaceVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut DXGI_SURFACE_DESC) -> ::HRESULT,
-    fn Map(&mut self, pLockedRect: *mut DXGI_MAPPED_RECT, MapFlags: ::UINT) -> ::HRESULT,
-    fn Unmap(&mut self) -> ::HRESULT
-});
-RIDL!(
-interface IDXGISurface1(IDXGISurface1Vtbl): IDXGISurface(IDXGISurfaceVtbl) {
-    fn GetDC(&mut self, Discard: ::BOOL, phdc: *mut ::HDC) -> ::HRESULT,
-    fn ReleaseDC(&mut self, pDirtyRect: *mut ::RECT) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIAdapter(IDXGIAdapterVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn EnumOutputs(&mut self, Output: ::UINT, ppOutput: *mut *mut IDXGIOutput) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut DXGI_ADAPTER_DESC) -> ::HRESULT,
-    fn CheckInterfaceSupport(
-        &mut self, InterfaceName: ::REFGUID, pUMDVersion: *mut ::LARGE_INTEGER
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIOutput(IDXGIOutputVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut DXGI_OUTPUT_DESC) -> ::HRESULT,
-    fn GetDisplayModeList(
-        &mut self, EnumFormat: ::DXGI_FORMAT, Flags: ::UINT, pNumModes: *mut ::UINT,
-        pDesc: *mut ::DXGI_MODE_DESC
-    ) -> ::HRESULT,
-    fn FindClosestMatchingMode(
-        &mut self, pModeToMatch: *const ::DXGI_MODE_DESC, pClosestMatch: *mut ::DXGI_MODE_DESC,
-        pConcernedDevice: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn WaitForVBlank(&mut self) -> ::HRESULT,
-    fn TakeOwnership(&mut self, pDevice: *mut ::IUnknown, Exclusive: ::BOOL) -> ::HRESULT,
-    fn ReleaseOwnership(&mut self) -> (),
-    fn GetGammaControlCapabilities(
-        &mut self, pGammaCaps: *mut ::DXGI_GAMMA_CONTROL_CAPABILITIES
-    ) -> ::HRESULT,
-    fn SetGammaControl(&mut self, pArray: *const ::DXGI_GAMMA_CONTROL) -> ::HRESULT,
-    fn GetGammaControl(&mut self, pArray: *mut ::DXGI_GAMMA_CONTROL) -> ::HRESULT,
-    fn SetDisplaySurface(&mut self, pScanoutSurface: *mut IDXGISurface) -> ::HRESULT,
-    fn GetDisplaySurfaceData(&mut self, pDestination: *mut IDXGISurface) -> ::HRESULT,
-    fn GetFrameStatistics(&mut self, pStats: *mut DXGI_FRAME_STATISTICS) -> ::HRESULT
-});
-pub const DXGI_MAX_SWAP_CHAIN_BUFFERS: ::DWORD = 16;
-pub const DXGI_PRESENT_TEST: ::DWORD = 0x00000001;
-pub const DXGI_PRESENT_DO_NOT_SEQUENCE: ::DWORD = 0x00000002;
-pub const DXGI_PRESENT_RESTART: ::DWORD = 0x00000004;
-pub const DXGI_PRESENT_DO_NOT_WAIT: ::DWORD = 0x00000008;
-pub const DXGI_PRESENT_STEREO_PREFER_RIGHT: ::DWORD = 0x00000010;
-pub const DXGI_PRESENT_STEREO_TEMPORARY_MONO: ::DWORD = 0x00000020;
-pub const DXGI_PRESENT_RESTRICT_TO_OUTPUT: ::DWORD = 0x00000040;
-pub const DXGI_PRESENT_USE_DURATION: ::DWORD = 0x00000100;
-RIDL!(
-interface IDXGISwapChain(IDXGISwapChainVtbl): IDXGIDeviceSubObject(IDXGIDeviceSubObjectVtbl) {
-    fn Present(&mut self, SyncInterval: ::UINT, Flags: ::UINT) -> ::HRESULT,
-    fn GetBuffer(
-        &mut self, Buffer: ::UINT, riid: ::REFIID, ppSurface: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn SetFullscreenState(&mut self, Fullscreen: ::BOOL, pTarget: *mut IDXGIOutput) -> ::HRESULT,
-    fn GetFullscreenState(
-        &mut self, pFullscreen: *mut ::BOOL, ppTarget: *mut *mut IDXGIOutput
-    ) -> ::HRESULT,
-    fn GetDesc(&mut self, pDesc: *mut DXGI_SWAP_CHAIN_DESC) -> ::HRESULT,
-    fn ResizeBuffers(
-        &mut self, BufferCount: ::UINT, Width: ::UINT, Height: ::UINT, NewFormat: ::DXGI_FORMAT,
-        SwapChainFlags: ::UINT
-    ) -> ::HRESULT,
-    fn ResizeTarget(&mut self, pNewTargetParameters: *const ::DXGI_MODE_DESC) -> ::HRESULT,
-    fn GetContainingOutput(&mut self, ppOutput: *mut *mut IDXGIOutput) -> ::HRESULT,
-    fn GetFrameStatistics(&mut self, pStats: *mut DXGI_FRAME_STATISTICS) -> ::HRESULT,
-    fn GetLastPresentCount(&mut self, pLastPresentCount: *mut ::UINT) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIFactory(IDXGIFactoryVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn EnumAdapters(&mut self, Adapter: ::UINT, ppAdapter: *mut *mut IDXGIAdapter) -> ::HRESULT,
-    fn MakeWindowAssociation(&mut self, WindowHandle: ::HWND, Flags: ::UINT) -> ::HRESULT,
-    fn GetWindowAssociation(&mut self, pWindowHandle: *mut ::HWND) -> ::HRESULT,
-    fn CreateSwapChain(
-        &mut self, pDevice: *mut ::IUnknown, pDesc: *mut DXGI_SWAP_CHAIN_DESC,
-        ppSwapChain: *mut *mut IDXGISwapChain
-    ) -> ::HRESULT,
-    fn CreateSoftwareAdapter(
-        &mut self, Module: ::HMODULE, ppAdapter: *mut *mut IDXGIAdapter
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIDevice(IDXGIDeviceVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetAdapter(&mut self, pAdapter: *mut *mut IDXGIAdapter) -> ::HRESULT,
-    fn CreateSurface(
-        &mut self, pDesc: *const DXGI_SURFACE_DESC, NumSurfaces: ::UINT, Usage: ::DXGI_USAGE,
-        pSharedResource: *const DXGI_SHARED_RESOURCE, ppSurface: *mut *mut IDXGISurface
-    ) -> ::HRESULT,
-    fn QueryResourceResidency(
-        &mut self, ppResources: *const *mut ::IUnknown, pResidencyStatus: *mut DXGI_RESIDENCY,
-        NumResources: ::UINT
-    ) -> ::HRESULT,
-    fn SetGPUThreadPriority(&mut self, Priority: ::INT) -> ::HRESULT,
-    fn GetGPUThreadPriority(&mut self, pPriority: *mut ::INT) -> ::HRESULT
-});
-ENUM!{enum DXGI_ADAPTER_FLAG {
-    DXGI_ADAPTER_FLAG_NONE,
-    DXGI_ADAPTER_FLAG_REMOTE,
-    DXGI_ADAPTER_FLAG_SOFTWARE,
-}}
-STRUCT!{nodebug struct DXGI_ADAPTER_DESC1 {
-    Description: [::WCHAR; 128],
-    VendorId: ::UINT,
-    DeviceId: ::UINT,
-    SubSysId: ::UINT,
-    Revision: ::UINT,
-    DedicatedVideoMemory: ::SIZE_T,
-    DedicatedSystemMemory: ::SIZE_T,
-    SharedSystemMemory: ::SIZE_T,
-    AdapterLuid: ::LUID,
-    Flags: ::UINT,
-}}
-STRUCT!{struct DXGI_DISPLAY_COLOR_SPACE {
-    PrimaryCoordinates: [[::FLOAT; 2]; 8],
-    WhitePoints: [[::FLOAT; 2]; 16],
-}}
-RIDL!(
-interface IDXGIFactory1(IDXGIFactory1Vtbl): IDXGIFactory(IDXGIFactoryVtbl) {
-    fn EnumAdapters1(&mut self, Adapter: ::UINT, ppAdapter: *mut *mut IDXGIAdapter1) -> ::HRESULT,
-    fn IsCurrent(&mut self) -> ::BOOL
-});
-RIDL!(
-interface IDXGIAdapter1(IDXGIAdapter1Vtbl): IDXGIAdapter(IDXGIAdapterVtbl) {
-    fn GetDesc1(&mut self, pDesc: *mut DXGI_ADAPTER_DESC1) -> ::HRESULT
-});
-RIDL!(
-interface IDXGIDevice1(IDXGIDevice1Vtbl): IDXGIDevice(IDXGIDeviceVtbl) {
-    fn SetMaximumFrameLatency(&mut self, MaxLatency: ::UINT) -> ::HRESULT,
-    fn GetMaximumFrameLatency(&mut self, pMaxLatency: *mut ::UINT) -> ::HRESULT
-});
diff --git a/vendor/winapi-0.2.8/src/dxgi1_2.rs b/vendor/winapi-0.2.8/src/dxgi1_2.rs
deleted file mode 100644
index 42082747c2..0000000000
--- a/vendor/winapi-0.2.8/src/dxgi1_2.rs
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright © 2015; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi1_2.h
-
-ENUM!{ enum DXGI_ALPHA_MODE {
-    DXGI_ALPHA_MODE_UNSPECIFIED = 0,
-    DXGI_ALPHA_MODE_PREMULTIPLIED = 1,
-    DXGI_ALPHA_MODE_STRAIGHT = 2,
-    DXGI_ALPHA_MODE_IGNORE = 3,
-    DXGI_ALPHA_MODE_FORCE_DWORD = 0xFFFFFFFF,
-}}
-
-ENUM!{ enum DXGI_COMPUTE_PREEMPTION_GRANULARITY {
-    DXGI_COMPUTE_PREEMPTION_DMA_BUFFER_BOUNDARY = 0,
-    DXGI_COMPUTE_PREEMPTION_DISPATCH_BOUNDARY = 1,
-    DXGI_COMPUTE_PREEMPTION_THREAD_GROUP_BOUNDARY = 2,
-    DXGI_COMPUTE_PREEMPTION_THREAD_BOUNDARY = 3,
-    DXGI_COMPUTE_PREEMPTION_INSTRUCTION_BOUNDARY = 4,
-}}
-
-ENUM!{ enum DXGI_GRAPHICS_PREEMPTION_GRANULARITY {
-    DXGI_GRAPHICS_PREEMPTION_DMA_BUFFER_BOUNDARY = 0,
-    DXGI_GRAPHICS_PREEMPTION_PRIMITIVE_BOUNDARY = 1,
-    DXGI_GRAPHICS_PREEMPTION_TRIANGLE_BOUNDARY = 2,
-    DXGI_GRAPHICS_PREEMPTION_PIXEL_BOUNDARY = 3,
-    DXGI_GRAPHICS_PREEMPTION_INSTRUCTION_BOUNDARY = 4,
-}}
-
-ENUM!{ enum DXGI_OUTDUPL_POINTER_SHAPE_TYPE {
-    DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MONOCHROME = 1,
-    DXGI_OUTDUPL_POINTER_SHAPE_TYPE_COLOR = 2,
-    DXGI_OUTDUPL_POINTER_SHAPE_TYPE_MASKED_COLOR = 4,
-}}
-
-ENUM!{ enum DXGI_SCALING {
-    DXGI_SCALING_STRETCH = 0,
-    DXGI_SCALING_NONE = 1,
-    DXGI_SCALING_ASPECT_RATIO_STRETCH = 2,
-}}
-
-ENUM!{ enum _DXGI_OFFER_RESOURCE_PRIORITY {
-    DXGI_OFFER_RESOURCE_PRIORITY_LOW = 1,
-    DXGI_OFFER_RESOURCE_PRIORITY_NORMAL = 2,
-    DXGI_OFFER_RESOURCE_PRIORITY_HIGH = 3,
-}}
-
-STRUCT!{nodebug struct DXGI_ADAPTER_DESC2 {
-    Description: [::WCHAR; 128],
-    VendorId: ::UINT,
-    DeviceId: ::UINT,
-    SubSysId: ::UINT,
-    Revision: ::UINT,
-    DedicatedVideoMemory: ::SIZE_T,
-    DedicatedSystemMemory: ::SIZE_T,
-    SharedSystemMemory: ::SIZE_T,
-    AdapterLuid: ::LUID,
-    Flags: ::UINT,
-    GraphicsPreemptionGranularity: ::DXGI_GRAPHICS_PREEMPTION_GRANULARITY,
-    ComputePreemptionGranularity: ::DXGI_COMPUTE_PREEMPTION_GRANULARITY,
-}}
-
-STRUCT!{struct DXGI_MODE_DESC1 {
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: ::DXGI_RATIONAL,
-    Format: ::DXGI_FORMAT,
-    ScanlineOrdering: ::DXGI_MODE_SCANLINE_ORDER,
-    Scaling: ::DXGI_MODE_SCALING,
-    Stereo: ::BOOL,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_DESC {
-    ModeDesc: ::DXGI_MODE_DESC,
-    Rotation: ::DXGI_MODE_ROTATION,
-    DesktopImageInSystemMemory: ::BOOL,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_FRAME_INFO {
-    LastPresentTime: ::LARGE_INTEGER,
-    LastMouseUpdateTime: ::LARGE_INTEGER,
-    AccumulatedFrames: ::UINT,
-    RectsCoalesced: ::BOOL,
-    ProtectedContentMaskedOut: ::BOOL,
-    PointerPosition: ::DXGI_OUTDUPL_POINTER_POSITION,
-    TotalMetadataBufferSize: ::UINT,
-    PointerShapeBufferSize: ::UINT,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_MOVE_RECT {
-    SourcePoint: ::POINT,
-    DestinationRect: ::RECT,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_POINTER_POSITION {
-    Position: ::POINT,
-    Visible: ::BOOL,
-}}
-
-STRUCT!{struct DXGI_OUTDUPL_POINTER_SHAPE_INFO {
-    Type: ::UINT,
-    Width: ::UINT,
-    Height: ::UINT,
-    Pitch: ::UINT,
-    HotSpot: ::POINT,
-}}
-
-STRUCT!{struct DXGI_PRESENT_PARAMETERS {
-    DirtyRectsCount: ::UINT,
-    pDirtyRects: *mut ::RECT,
-    pScrollRect: *mut ::RECT,
-    pScrollOffset: *mut ::POINT,
-}}
-
-STRUCT!{struct DXGI_SWAP_CHAIN_DESC1 {
-    Width: ::UINT,
-    Height: ::UINT,
-    Format: ::DXGI_FORMAT,
-    Stereo: ::BOOL,
-    SampleDesc: ::DXGI_SAMPLE_DESC,
-    BufferUsage: ::DXGI_USAGE,
-    BufferCount: ::UINT,
-    Scaling: ::DXGI_SCALING,
-    SwapEffect: ::DXGI_SWAP_EFFECT,
-    AlphaMode: ::DXGI_ALPHA_MODE,
-    Flags: ::UINT,
-}}
-
-STRUCT!{struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC {
-    RefreshRate: ::DXGI_RATIONAL,
-    ScanlineOrdering: ::DXGI_MODE_SCANLINE_ORDER,
-    Scaling: ::DXGI_MODE_SCALING,
-    Windowed: ::BOOL,
-}}
-
-RIDL!(
-interface IDXGIAdapter2(IDXGIAdapter2Vtbl): IDXGIAdapter1(IDXGIAdapter1Vtbl) {
-    fn GetDesc2(&mut self, pDesc: *mut ::DXGI_ADAPTER_DESC2) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIDevice2(IDXGIDevice2Vtbl): IDXGIDevice1(IDXGIDevice1Vtbl) {
-    fn OfferResources(
-        &mut self, NumResources: ::UINT, ppResources: *mut *mut ::IDXGIResource,
-        Priority: ::DXGI_OFFER_RESOURCE_PRIORITY
-    ) -> ::HRESULT,
-    fn ReclaimResources(
-        &mut self, NumResources: ::UINT, ppResources: *mut *mut ::IDXGIResource,
-        pDiscarded: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn EnqueueSetEvent(&mut self, hEvent: ::HANDLE) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIDisplayControl(IDXGIDisplayControlVtbl): IUnknown(IUnknownVtbl) {
-    fn IsStereoEnabled(&mut self) -> ::BOOL,
-    fn SetStereoEnabled(&mut self, enabled: ::BOOL) -> ()
-});
-
-RIDL!(
-interface IDXGIFactory2(IDXGIFactory2Vtbl): IDXGIFactory1(IDXGIFactory1Vtbl) {
-    fn IsWindowedStereoEnabled(&mut self) -> ::BOOL,
-    fn CreateSwapChainForHwnd(
-        &mut self, pDevice: *mut ::IUnknown, hWnd: ::HWND, pDesc: *const ::DXGI_SWAP_CHAIN_DESC1,
-        pFullscreenDesc: *const ::DXGI_SWAP_CHAIN_FULLSCREEN_DESC,
-        pRestrictToOutput: *mut ::IDXGIOutput, ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT,
-    fn CreateSwapChainForCoreWindow(
-        &mut self, pDevice: *mut ::IUnknown, pWindow: *mut ::IUnknown,
-        pDesc: *const ::DXGI_SWAP_CHAIN_DESC1, pRestrictToOutput: *mut ::IDXGIOutput,
-        ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT,
-    fn GetSharedResourceAdapterLuid(
-        &mut self, hResource: ::HANDLE, pLuid: *mut ::LUID
-    ) -> ::HRESULT,
-    fn RegisterStereoStatusWindow(
-        &mut self, WindowHandle: ::HWND, wMsg: ::UINT, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn RegisterStereoStatusEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterStereoStatus(&mut self, dwCookie: ::DWORD) -> (),
-    fn RegisterOcclusionStatusWindow(
-        &mut self, WindowHandle: ::HWND, wMsg: ::UINT, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn RegisterOcclusionStatusEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterOcclusionStatus(&mut self, dwCookie: ::DWORD) -> (),
-    fn CreateSwapChainForComposition(
-        &mut self, pDevice: *mut ::IUnknown, pDesc: *const ::DXGI_SWAP_CHAIN_DESC1,
-        pRestrictToOutput: *mut ::IDXGIOutput, ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutput1(IDXGIOutput1Vtbl): IDXGIOutput(IDXGIOutputVtbl) {
-    fn GetDisplayModeList1(
-        &mut self, EnumFormat: ::DXGI_FORMAT, Flags: ::UINT, pNumModes: *mut ::UINT,
-        pDesc: *mut ::DXGI_MODE_DESC1
-    ) -> ::HRESULT,
-    fn FindClosestMatchingMode1(
-        &mut self, pModeToMatch: *const ::DXGI_MODE_DESC1, pClosestMatch: *mut ::DXGI_MODE_DESC1,
-        pConcernedDevice: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn GetDisplaySurfaceData1(
-        &mut self, pDestination: *mut ::IDXGIResource
-    ) -> ::HRESULT,
-    fn DuplicateOutput(
-        &mut self, pDevice: *mut ::IUnknown,
-        ppOutputDuplication: *mut *mut ::IDXGIOutputDuplication
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutputDuplication(IDXGIOutputDuplicationVtbl): IDXGIObject(IDXGIObjectVtbl) {
-    fn GetDesc(&mut self, pDesc: *mut ::DXGI_OUTDUPL_DESC) -> (),
-    fn AcquireNextFrame(
-        &mut self, TimeoutInMilliseconds: ::UINT, pFrameInfo: *mut ::DXGI_OUTDUPL_FRAME_INFO,
-        ppDesktopResource: *mut *mut ::IDXGIResource
-    ) -> ::HRESULT,
-    fn GetFrameDirtyRects(
-        &mut self, DirtyRectsBufferSize: ::UINT, pDirtyRectsBuffer: *mut ::RECT,
-        pDirtyRectsBufferSizeRequired: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetFrameMoveRects(
-        &mut self, MoveRectsBufferSize: ::UINT, pMoveRectBuffer: *mut ::DXGI_OUTDUPL_MOVE_RECT,
-        pMoveRectsBufferSizeRequired: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetFramePointerShape(
-        &mut self, PointerShapeBufferSize: ::UINT, pPointerShapeBuffer: *mut ::c_void,
-        pPointerShapeBufferSizeRequired: *mut ::UINT,
-        pPointerShapeInfo: *mut ::DXGI_OUTDUPL_POINTER_SHAPE_INFO
-    ) -> ::HRESULT,
-    fn MapDesktopSurface(
-        &mut self, pLockedRect: *mut ::DXGI_MAPPED_RECT
-    ) -> ::HRESULT,
-    fn UnMapDesktopSurface(&mut self) -> ::HRESULT,
-    fn ReleaseFrame(&mut self) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIResource1(IDXGIResource1Vtbl): IDXGIResource(IDXGIResourceVtbl) {
-    fn CreateSubresourceSurface(
-        &mut self, index: ::UINT, ppSurface: *mut *mut ::IDXGISurface2
-    ) -> ::HRESULT,
-    fn CreateSharedHandle(
-        &mut self, pAttributes: *const ::SECURITY_ATTRIBUTES, dwAccess: ::DWORD, lpName: ::LPCWSTR,
-        pHandle: *mut ::HANDLE
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISurface2(IDXGISurface2Vtbl): IDXGISurface1(IDXGISurface1Vtbl) {
-    fn GetResource(
-        &mut self, riid: ::REFGUID, ppParentResource: *mut *mut ::c_void,
-        pSubresourceIndex: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChain1(IDXGISwapChain1Vtbl): IDXGISwapChain(IDXGISwapChainVtbl) {
-    fn GetDesc1(&mut self, pDesc: *mut ::DXGI_SWAP_CHAIN_DESC1) -> ::HRESULT,
-    fn GetFullscreenDesc(
-        &mut self, pDesc: *mut ::DXGI_SWAP_CHAIN_FULLSCREEN_DESC
-    ) -> ::HRESULT,
-    fn GetHwnd(&mut self, pHwnd: *mut ::HWND) -> ::HRESULT,
-    fn GetCoreWindow(
-        &mut self, refiid: ::REFGUID, ppUnk: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn Present1(
-        &mut self, SyncInterval: ::UINT, PresentFlags: ::UINT,
-        pPresentParameters: *const ::DXGI_PRESENT_PARAMETERS
-    ) -> ::HRESULT,
-    fn IsTemporaryMonoSupported(&mut self) -> ::BOOL,
-    fn GetRestrictToOutput(
-        &mut self, ppRestrictToOutput: *mut *mut ::IDXGIOutput
-    ) -> ::HRESULT,
-    fn SetBackgroundColor(&mut self, pColor: *const ::DXGI_RGBA) -> ::HRESULT,
-    fn GetBackgroundColor(&mut self, pColor: *mut ::DXGI_RGBA) -> ::HRESULT,
-    fn SetRotation(&mut self, Rotation: ::DXGI_MODE_ROTATION) -> ::HRESULT,
-    fn GetRotation(&mut self, pRotation: *mut ::DXGI_MODE_ROTATION) -> ::HRESULT
-});
-
-pub type DXGI_OFFER_RESOURCE_PRIORITY = ::_DXGI_OFFER_RESOURCE_PRIORITY;
-pub const DXGI_ENUM_MODES_DISABLED_STEREO: ::UINT = 8;
-pub const DXGI_ENUM_MODES_STEREO: ::UINT = 4;
-pub const DXGI_SHARED_RESOURCE_READ: ::UINT = 0x80000000;
-pub const DXGI_SHARED_RESOURCE_WRITE: ::UINT = 1;
diff --git a/vendor/winapi-0.2.8/src/dxgi1_3.rs b/vendor/winapi-0.2.8/src/dxgi1_3.rs
deleted file mode 100644
index 71acf98c7c..0000000000
--- a/vendor/winapi-0.2.8/src/dxgi1_3.rs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright © 2015; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi1_3.h
-
-ENUM!{ enum DXGI_FRAME_PRESENTATION_MODE {
-    DXGI_FRAME_PRESENTATION_MODE_COMPOSED = 0,
-    DXGI_FRAME_PRESENTATION_MODE_OVERLAY = 1,
-    DXGI_FRAME_PRESENTATION_MODE_NONE = 2,
-    DXGI_FRAME_PRESENTATION_MODE_COMPOSITION_FAILURE = 3,
-}}
-
-FLAGS!{ enum DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS {
-    DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_NOMINAL_RANGE = 0x1,
-    DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_BT709 = 0x2,
-    DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAG_xvYCC = 0x4,
-}}
-
-FLAGS!{ enum DXGI_OVERLAY_SUPPORT_FLAG {
-    DXGI_OVERLAY_SUPPORT_FLAG_DIRECT = 0x1,
-    DXGI_OVERLAY_SUPPORT_FLAG_SCALING = 0x2,
-}}
-
-STRUCT!{struct DXGI_DECODE_SWAP_CHAIN_DESC {
-    Flags: ::UINT,
-}}
-
-STRUCT!{struct DXGI_FRAME_STATISTICS_MEDIA {
-    PresentCount: ::UINT,
-    PresentRefreshCount: ::UINT,
-    SyncRefreshCount: ::UINT,
-    SyncQPCTime: ::LARGE_INTEGER,
-    SyncGPUTime: ::LARGE_INTEGER,
-    CompositionMode: ::DXGI_FRAME_PRESENTATION_MODE,
-    ApprovedPresentDuration: ::UINT,
-}}
-
-STRUCT!{struct DXGI_MATRIX_3X2_F {
-    _11: ::FLOAT,
-    _12: ::FLOAT,
-    _21: ::FLOAT,
-    _22: ::FLOAT,
-    _31: ::FLOAT,
-    _32: ::FLOAT,
-}}
-
-RIDL!(
-interface IDXGIDecodeSwapChain(IDXGIDecodeSwapChainVtbl): IUnknown(IUnknownVtbl) {
-    fn PresentBuffer(
-        &mut self, BufferToPresent: ::UINT, SyncInterval: ::UINT, Flags: ::UINT
-    ) -> ::HRESULT,
-    fn SetSourceRect(&mut self, pRect: *const ::RECT) -> ::HRESULT,
-    fn SetTargetRect(&mut self, pRect: *const ::RECT) -> ::HRESULT,
-    fn SetDestSize(&mut self, Width: ::UINT, Height: ::UINT) -> ::HRESULT,
-    fn GetSourceRect(&mut self, pRect: *mut ::RECT) -> ::HRESULT,
-    fn GetTargetRect(&mut self, pRect: *mut ::RECT) -> ::HRESULT,
-    fn GetDestSize(
-        &mut self, pWidth: *mut ::UINT, pHeight: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetColorSpace(
-        &mut self, ColorSpace: ::DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS
-    ) -> ::HRESULT,
-    fn GetColorSpace(&mut self) -> ::DXGI_MULTIPLANE_OVERLAY_YCbCr_FLAGS
-});
-
-RIDL!(
-interface IDXGIDevice3(IDXGIDevice3Vtbl): IDXGIDevice2(IDXGIDevice2Vtbl) {
-    fn Trim(&mut self) -> ()
-});
-
-RIDL!(
-interface IDXGIFactory3(IDXGIFactory3Vtbl): IDXGIFactory2(IDXGIFactory2Vtbl) {
-    fn GetCreationFlags(&mut self) -> ::UINT
-});
-
-RIDL!(
-interface IDXGIFactoryMedia(IDXGIFactoryMediaVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateSwapChainForCompositionSurfaceHandle(
-        &mut self, pDevice: *mut ::IUnknown, hSurface: ::HANDLE,
-        pDesc: *const ::DXGI_SWAP_CHAIN_DESC1, pRestrictToOutput: *mut ::IDXGIOutput,
-        ppSwapChain: *mut *mut ::IDXGISwapChain1
-    ) -> ::HRESULT,
-    fn CreateDecodeSwapChainForCompositionSurfaceHandle(
-        &mut self, pDevice: *mut ::IUnknown, hSurface: ::HANDLE,
-        pDesc: *mut ::DXGI_DECODE_SWAP_CHAIN_DESC, pYuvDecodeBuffers: *mut ::IDXGIResource,
-        pRestrictToOutput: *mut ::IDXGIOutput, ppSwapChain: *mut *mut ::IDXGIDecodeSwapChain
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutput2(IDXGIOutput2Vtbl): IDXGIOutput1(IDXGIOutput1Vtbl) {
-    fn SupportsOverlays(&mut self) -> ::BOOL
-});
-
-RIDL!(
-interface IDXGIOutput3(IDXGIOutput3Vtbl): IDXGIOutput2(IDXGIOutput2Vtbl) {
-    fn CheckOverlaySupport(
-        &mut self, EnumFormat: ::DXGI_FORMAT, pConcernedDevice: *mut ::IUnknown,
-        pFlags: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChain2(IDXGISwapChain2Vtbl): IDXGISwapChain1(IDXGISwapChain1Vtbl) {
-    fn SetSourceSize(&mut self, Width: ::UINT, Height: ::UINT) -> ::HRESULT,
-    fn GetSourceSize(
-        &mut self, pWidth: *mut ::UINT, pHeight: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetMaximumFrameLatency(&mut self, MaxLatency: ::UINT) -> ::HRESULT,
-    fn GetMaximumFrameLatency(&mut self, pMaxLatency: *mut ::UINT) -> ::HRESULT,
-    fn GetFrameLatencyWaitableObject(&mut self) -> ::HANDLE,
-    fn SetMatrixTransform(
-        &mut self, pMatrix: *const ::DXGI_MATRIX_3X2_F
-    ) -> ::HRESULT,
-    fn GetMatrixTransform(
-        &mut self, pMatrix: *mut ::DXGI_MATRIX_3X2_F
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChainMedia(IDXGISwapChainMediaVtbl): IUnknown(IUnknownVtbl) {
-    fn GetFrameStatisticsMedia(
-        &mut self, pStats: *mut ::DXGI_FRAME_STATISTICS_MEDIA
-    ) -> ::HRESULT,
-    fn SetPresentDuration(&mut self, Duration: ::UINT) -> ::HRESULT,
-    fn CheckPresentDurationSupport(
-        &mut self, DesiredPresentDuration: ::UINT, pClosestSmallerPresentDuration: *mut ::UINT,
-        pClosestLargerPresentDuration: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-pub const DXGI_CREATE_FACTORY_DEBUG: ::UINT = 0x1;
diff --git a/vendor/winapi-0.2.8/src/dxgi1_4.rs b/vendor/winapi-0.2.8/src/dxgi1_4.rs
deleted file mode 100644
index cbca18f186..0000000000
--- a/vendor/winapi-0.2.8/src/dxgi1_4.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright © 2015; Dmitry Roschin
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgi1_4.h
-
-ENUM!{ enum DXGI_MEMORY_SEGMENT_GROUP {
-    DXGI_MEMORY_SEGMENT_GROUP_LOCAL = 0,
-    DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL = 1,
-}}
-
-FLAGS!{ enum DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG {
-    DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1,
-}}
-
-FLAGS!{ enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG {
-    DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1,
-    DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_OVERLAY_PRESENT = 0x2,
-}}
-
-STRUCT!{struct DXGI_QUERY_VIDEO_MEMORY_INFO {
-    Budget: ::UINT64,
-    CurrentUsage: ::UINT64,
-    AvailableForReservation: ::UINT64,
-    CurrentReservation: ::UINT64,
-}}
-
-RIDL!(
-interface IDXGIAdapter3(IDXGIAdapter3Vtbl): IDXGIAdapter2(IDXGIAdapter2Vtbl) {
-    fn RegisterHardwareContentProtectionTeardownStatusEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterHardwareContentProtectionTeardownStatus(
-        &mut self, dwCookie: ::DWORD
-    ) -> (),
-    fn QueryVideoMemoryInfo(
-        &mut self, NodeIndex: ::UINT, MemorySegmentGroup: ::DXGI_MEMORY_SEGMENT_GROUP,
-        pVideoMemoryInfo: *mut ::DXGI_QUERY_VIDEO_MEMORY_INFO
-    ) -> ::HRESULT,
-    fn SetVideoMemoryReservation(
-        &mut self, NodeIndex: ::UINT, MemorySegmentGroup: ::DXGI_MEMORY_SEGMENT_GROUP,
-        Reservation: ::UINT64
-    ) -> ::HRESULT,
-    fn RegisterVideoMemoryBudgetChangeNotificationEvent(
-        &mut self, hEvent: ::HANDLE, pdwCookie: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn UnregisterVideoMemoryBudgetChangeNotification(
-        &mut self, dwCookie: ::DWORD
-    ) -> ()
-});
-
-RIDL!(
-interface IDXGIFactory4(IDXGIFactory4Vtbl): IDXGIFactory3(IDXGIFactory3Vtbl) {
-    fn EnumAdapterByLuid(
-        &mut self, AdapterLuid: ::LUID, riid: ::REFGUID, ppvAdapter: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn EnumWarpAdapter(
-        &mut self, riid: ::REFGUID, ppvAdapter: *mut *mut ::c_void
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGIOutput4(IDXGIOutput4Vtbl): IDXGIOutput3(IDXGIOutput3Vtbl) {
-    fn CheckOverlayColorSpaceSupport(
-        &mut self, Format: ::DXGI_FORMAT, ColorSpace: ::DXGI_COLOR_SPACE_TYPE,
-        pConcernedDevice: *mut ::IUnknown, pFlags: *mut ::UINT
-    ) -> ::HRESULT
-});
-
-RIDL!(
-interface IDXGISwapChain3(IDXGISwapChain3Vtbl): IDXGISwapChain2(IDXGISwapChain2Vtbl) {
-    fn GetCurrentBackBufferIndex(&mut self) -> ::UINT,
-    fn CheckColorSpaceSupport(
-        &mut self, ColorSpace: ::DXGI_COLOR_SPACE_TYPE, pColorSpaceSupport: *mut ::UINT
-    ) -> ::HRESULT,
-    fn SetColorSpace1(
-        &mut self, ColorSpace: ::DXGI_COLOR_SPACE_TYPE
-    ) -> ::HRESULT,
-    fn ResizeBuffers1(
-        &mut self, BufferCount: ::UINT, Width: ::UINT, Height: ::UINT, Format: ::DXGI_FORMAT,
-        SwapChainFlags: ::UINT, pCreationNodeMask: *const ::UINT,
-        ppPresentQueue: *mut *mut ::IUnknown
-    ) -> ::HRESULT
-});
diff --git a/vendor/winapi-0.2.8/src/dxgiformat.rs b/vendor/winapi-0.2.8/src/dxgiformat.rs
deleted file mode 100644
index 3e46fc2eda..0000000000
--- a/vendor/winapi-0.2.8/src/dxgiformat.rs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgiformat.h
-ENUM!{enum DXGI_FORMAT {
-    DXGI_FORMAT_UNKNOWN = 0,
-    DXGI_FORMAT_R32G32B32A32_TYPELESS = 1,
-    DXGI_FORMAT_R32G32B32A32_FLOAT = 2,
-    DXGI_FORMAT_R32G32B32A32_UINT = 3,
-    DXGI_FORMAT_R32G32B32A32_SINT = 4,
-    DXGI_FORMAT_R32G32B32_TYPELESS = 5,
-    DXGI_FORMAT_R32G32B32_FLOAT = 6,
-    DXGI_FORMAT_R32G32B32_UINT = 7,
-    DXGI_FORMAT_R32G32B32_SINT = 8,
-    DXGI_FORMAT_R16G16B16A16_TYPELESS = 9,
-    DXGI_FORMAT_R16G16B16A16_FLOAT = 10,
-    DXGI_FORMAT_R16G16B16A16_UNORM = 11,
-    DXGI_FORMAT_R16G16B16A16_UINT = 12,
-    DXGI_FORMAT_R16G16B16A16_SNORM = 13,
-    DXGI_FORMAT_R16G16B16A16_SINT = 14,
-    DXGI_FORMAT_R32G32_TYPELESS = 15,
-    DXGI_FORMAT_R32G32_FLOAT = 16,
-    DXGI_FORMAT_R32G32_UINT = 17,
-    DXGI_FORMAT_R32G32_SINT = 18,
-    DXGI_FORMAT_R32G8X24_TYPELESS = 19,
-    DXGI_FORMAT_D32_FLOAT_S8X24_UINT = 20,
-    DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS = 21,
-    DXGI_FORMAT_X32_TYPELESS_G8X24_UINT = 22,
-    DXGI_FORMAT_R10G10B10A2_TYPELESS = 23,
-    DXGI_FORMAT_R10G10B10A2_UNORM = 24,
-    DXGI_FORMAT_R10G10B10A2_UINT = 25,
-    DXGI_FORMAT_R11G11B10_FLOAT = 26,
-    DXGI_FORMAT_R8G8B8A8_TYPELESS = 27,
-    DXGI_FORMAT_R8G8B8A8_UNORM = 28,
-    DXGI_FORMAT_R8G8B8A8_UNORM_SRGB = 29,
-    DXGI_FORMAT_R8G8B8A8_UINT = 30,
-    DXGI_FORMAT_R8G8B8A8_SNORM = 31,
-    DXGI_FORMAT_R8G8B8A8_SINT = 32,
-    DXGI_FORMAT_R16G16_TYPELESS = 33,
-    DXGI_FORMAT_R16G16_FLOAT = 34,
-    DXGI_FORMAT_R16G16_UNORM = 35,
-    DXGI_FORMAT_R16G16_UINT = 36,
-    DXGI_FORMAT_R16G16_SNORM = 37,
-    DXGI_FORMAT_R16G16_SINT = 38,
-    DXGI_FORMAT_R32_TYPELESS = 39,
-    DXGI_FORMAT_D32_FLOAT = 40,
-    DXGI_FORMAT_R32_FLOAT = 41,
-    DXGI_FORMAT_R32_UINT = 42,
-    DXGI_FORMAT_R32_SINT = 43,
-    DXGI_FORMAT_R24G8_TYPELESS = 44,
-    DXGI_FORMAT_D24_UNORM_S8_UINT = 45,
-    DXGI_FORMAT_R24_UNORM_X8_TYPELESS = 46,
-    DXGI_FORMAT_X24_TYPELESS_G8_UINT = 47,
-    DXGI_FORMAT_R8G8_TYPELESS = 48,
-    DXGI_FORMAT_R8G8_UNORM = 49,
-    DXGI_FORMAT_R8G8_UINT = 50,
-    DXGI_FORMAT_R8G8_SNORM = 51,
-    DXGI_FORMAT_R8G8_SINT = 52,
-    DXGI_FORMAT_R16_TYPELESS = 53,
-    DXGI_FORMAT_R16_FLOAT = 54,
-    DXGI_FORMAT_D16_UNORM = 55,
-    DXGI_FORMAT_R16_UNORM = 56,
-    DXGI_FORMAT_R16_UINT = 57,
-    DXGI_FORMAT_R16_SNORM = 58,
-    DXGI_FORMAT_R16_SINT = 59,
-    DXGI_FORMAT_R8_TYPELESS = 60,
-    DXGI_FORMAT_R8_UNORM = 61,
-    DXGI_FORMAT_R8_UINT = 62,
-    DXGI_FORMAT_R8_SNORM = 63,
-    DXGI_FORMAT_R8_SINT = 64,
-    DXGI_FORMAT_A8_UNORM = 65,
-    DXGI_FORMAT_R1_UNORM = 66,
-    DXGI_FORMAT_R9G9B9E5_SHAREDEXP = 67,
-    DXGI_FORMAT_R8G8_B8G8_UNORM = 68,
-    DXGI_FORMAT_G8R8_G8B8_UNORM = 69,
-    DXGI_FORMAT_BC1_TYPELESS = 70,
-    DXGI_FORMAT_BC1_UNORM = 71,
-    DXGI_FORMAT_BC1_UNORM_SRGB = 72,
-    DXGI_FORMAT_BC2_TYPELESS = 73,
-    DXGI_FORMAT_BC2_UNORM = 74,
-    DXGI_FORMAT_BC2_UNORM_SRGB = 75,
-    DXGI_FORMAT_BC3_TYPELESS = 76,
-    DXGI_FORMAT_BC3_UNORM = 77,
-    DXGI_FORMAT_BC3_UNORM_SRGB = 78,
-    DXGI_FORMAT_BC4_TYPELESS = 79,
-    DXGI_FORMAT_BC4_UNORM = 80,
-    DXGI_FORMAT_BC4_SNORM = 81,
-    DXGI_FORMAT_BC5_TYPELESS = 82,
-    DXGI_FORMAT_BC5_UNORM = 83,
-    DXGI_FORMAT_BC5_SNORM = 84,
-    DXGI_FORMAT_B5G6R5_UNORM = 85,
-    DXGI_FORMAT_B5G5R5A1_UNORM = 86,
-    DXGI_FORMAT_B8G8R8A8_UNORM = 87,
-    DXGI_FORMAT_B8G8R8X8_UNORM = 88,
-    DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM = 89,
-    DXGI_FORMAT_B8G8R8A8_TYPELESS = 90,
-    DXGI_FORMAT_B8G8R8A8_UNORM_SRGB = 91,
-    DXGI_FORMAT_B8G8R8X8_TYPELESS = 92,
-    DXGI_FORMAT_B8G8R8X8_UNORM_SRGB = 93,
-    DXGI_FORMAT_BC6H_TYPELESS = 94,
-    DXGI_FORMAT_BC6H_UF16 = 95,
-    DXGI_FORMAT_BC6H_SF16 = 96,
-    DXGI_FORMAT_BC7_TYPELESS = 97,
-    DXGI_FORMAT_BC7_UNORM = 98,
-    DXGI_FORMAT_BC7_UNORM_SRGB = 99,
-    DXGI_FORMAT_AYUV = 100,
-    DXGI_FORMAT_Y410 = 101,
-    DXGI_FORMAT_Y416 = 102,
-    DXGI_FORMAT_NV12 = 103,
-    DXGI_FORMAT_P010 = 104,
-    DXGI_FORMAT_P016 = 105,
-    DXGI_FORMAT_420_OPAQUE = 106,
-    DXGI_FORMAT_YUY2 = 107,
-    DXGI_FORMAT_Y210 = 108,
-    DXGI_FORMAT_Y216 = 109,
-    DXGI_FORMAT_NV11 = 110,
-    DXGI_FORMAT_AI44 = 111,
-    DXGI_FORMAT_IA44 = 112,
-    DXGI_FORMAT_P8 = 113,
-    DXGI_FORMAT_A8P8 = 114,
-    DXGI_FORMAT_B4G4R4A4_UNORM = 115,
-    DXGI_FORMAT_P208 = 130,
-    DXGI_FORMAT_V208 = 131,
-    DXGI_FORMAT_V408 = 132,
-}}
diff --git a/vendor/winapi-0.2.8/src/dxgitype.rs b/vendor/winapi-0.2.8/src/dxgitype.rs
deleted file mode 100644
index 6c9a2f5a71..0000000000
--- a/vendor/winapi-0.2.8/src/dxgitype.rs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of dxgitype.h
-pub const DXGI_CPU_ACCESS_NONE: ::DWORD = 0;
-pub const DXGI_CPU_ACCESS_DYNAMIC: ::DWORD = 1;
-pub const DXGI_CPU_ACCESS_READ_WRITE: ::DWORD = 2;
-pub const DXGI_CPU_ACCESS_SCRATCH: ::DWORD = 3;
-pub const DXGI_CPU_ACCESS_FIELD: ::DWORD = 15;
-FLAGS!{enum DXGI_USAGE {
-    DXGI_USAGE_SHADER_INPUT = 1 << (0 + 4),
-    DXGI_USAGE_RENDER_TARGET_OUTPUT = 1 << (1 + 4),
-    DXGI_USAGE_BACK_BUFFER = 1 << (2 + 4),
-    DXGI_USAGE_SHARED = 1 << (3 + 4),
-    DXGI_USAGE_READ_ONLY = 1 << (4 + 4),
-    DXGI_USAGE_DISCARD_ON_PRESENT = 1 << (5 + 4),
-    DXGI_USAGE_UNORDERED_ACCESS = 1 << (6 + 4),
-}}
-STRUCT!{struct DXGI_RGB {
-    Red: f32,
-    Green: f32,
-    Blue: f32,
-}}
-pub type DXGI_RGBA = ::D3DCOLORVALUE;
-STRUCT!{nodebug struct DXGI_GAMMA_CONTROL {
-    Scale: DXGI_RGB,
-    Offset: DXGI_RGB,
-    GammaCurve: [DXGI_RGB; 1025],
-}}
-STRUCT!{nodebug struct DXGI_GAMMA_CONTROL_CAPABILITIES {
-    ScaleAndOffsetSupported: ::BOOL,
-    MaxConvertedValue: f32,
-    MinConvertedValue: f32,
-    NumGammaControlPoints: ::UINT,
-    ControlPointPositions: [f32; 1025],
-}}
-STRUCT!{struct DXGI_RATIONAL {
-    Numerator: ::UINT,
-    Denominator: ::UINT,
-}}
-ENUM!{enum DXGI_MODE_SCANLINE_ORDER {
-    DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED,
-    DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE,
-    DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST,
-    DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST,
-}}
-ENUM!{enum DXGI_MODE_SCALING {
-    DXGI_MODE_SCALING_UNSPECIFIED,
-    DXGI_MODE_SCALING_CENTERED,
-    DXGI_MODE_SCALING_STRETCHED,
-}}
-ENUM!{enum DXGI_MODE_ROTATION {
-    DXGI_MODE_ROTATION_UNSPECIFIED,
-    DXGI_MODE_ROTATION_IDENTITY,
-    DXGI_MODE_ROTATION_ROTATE90,
-    DXGI_MODE_ROTATION_ROTATE180,
-    DXGI_MODE_ROTATION_ROTATE270,
-}}
-STRUCT!{struct DXGI_MODE_DESC {
-    Width: ::UINT,
-    Height: ::UINT,
-    RefreshRate: DXGI_RATIONAL,
-    Format: ::DXGI_FORMAT,
-    ScanlineOrdering: DXGI_MODE_SCANLINE_ORDER,
-    Scaling: DXGI_MODE_SCALING,
-}}
-STRUCT!{struct DXGI_SAMPLE_DESC {
-    Count: ::UINT,
-    Quality: ::UINT,
-}}
-ENUM!{enum DXGI_COLOR_SPACE_TYPE {
-    DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 = 0x0,
-    DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 = 0x1,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 = 0x2,
-    DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020 = 0x3,
-    DXGI_COLOR_SPACE_RESERVED = 0x4,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601 = 0x5,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601 = 0x6,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601 = 0x7,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709 = 0x8,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709 = 0x9,
-    DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020 = 0xA,
-    DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020 = 0xB,
-    DXGI_COLOR_SPACE_CUSTOM = 0xFFFFFFFF,
-}}
-pub const DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN: ::UINT = 0xfffffffe;
-pub const DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN: ::UINT = 0xffffffff;
diff --git a/vendor/winapi-0.2.8/src/errhandlingapi.rs b/vendor/winapi-0.2.8/src/errhandlingapi.rs
deleted file mode 100644
index fbdde40afa..0000000000
--- a/vendor/winapi-0.2.8/src/errhandlingapi.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-errorhandling-l1
-pub type PTOP_LEVEL_EXCEPTION_FILTER = Option<unsafe extern "system" fn(
-    ExceptionInfo: *mut ::EXCEPTION_POINTERS,
-) -> ::LONG>;
-pub type LPTOP_LEVEL_EXCEPTION_FILTER = PTOP_LEVEL_EXCEPTION_FILTER;
diff --git a/vendor/winapi-0.2.8/src/excpt.rs b/vendor/winapi-0.2.8/src/excpt.rs
deleted file mode 100644
index 53ea3ffc5c..0000000000
--- a/vendor/winapi-0.2.8/src/excpt.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-ENUM!{enum EXCEPTION_DISPOSITION {
-    ExceptionContinueExecution = 0,
-    ExceptionContinueSearch = 1,
-    ExceptionNestedException = 2,
-    ExceptionCollidedUnwind = 3,
-}}
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct _EXCEPTION_RECORD;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct _CONTEXT;
-#[cfg(target_arch = "x86_64")] #[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct _DISPATCHER_CONTEXT;
diff --git a/vendor/winapi-0.2.8/src/fileapi.rs b/vendor/winapi-0.2.8/src/fileapi.rs
deleted file mode 100644
index 764a7f65e4..0000000000
--- a/vendor/winapi-0.2.8/src/fileapi.rs
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-file-l1
-pub const CREATE_NEW: ::DWORD = 1;
-pub const CREATE_ALWAYS: ::DWORD = 2;
-pub const OPEN_EXISTING: ::DWORD = 3;
-pub const OPEN_ALWAYS: ::DWORD = 4;
-pub const TRUNCATE_EXISTING: ::DWORD = 5;
-pub const INVALID_FILE_SIZE: ::DWORD = 0xFFFFFFFF;
-pub const INVALID_SET_FILE_POINTER: ::DWORD = 0xFFFFFFFF;
-pub const INVALID_FILE_ATTRIBUTES: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct WIN32_FILE_ATTRIBUTE_DATA {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-}}
-pub type LPWIN32_FILE_ATTRIBUTE_DATA = *mut WIN32_FILE_ATTRIBUTE_DATA;
-STRUCT!{struct BY_HANDLE_FILE_INFORMATION {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    dwVolumeSerialNumber: ::DWORD,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-    nNumberOfLinks: ::DWORD,
-    nFileIndexHigh: ::DWORD,
-    nFileIndexLow: ::DWORD,
-}}
-pub type PBY_HANDLE_FILE_INFORMATION = *mut BY_HANDLE_FILE_INFORMATION;
-pub type LPBY_HANDLE_FILE_INFORMATION = *mut BY_HANDLE_FILE_INFORMATION;
-STRUCT!{struct CREATEFILE2_EXTENDED_PARAMETERS {
-    dwSize: ::DWORD,
-    dwFileAttributes: ::DWORD,
-    dwFileFlags: ::DWORD,
-    dwSecurityQosFlags: ::DWORD,
-    lpSecurityAttributes: ::LPSECURITY_ATTRIBUTES,
-    hTemplateFile: ::HANDLE,
-}}
-pub type PCREATEFILE2_EXTENDED_PARAMETERS = *mut CREATEFILE2_EXTENDED_PARAMETERS;
-pub type LPCREATEFILE2_EXTENDED_PARAMETERS = *mut CREATEFILE2_EXTENDED_PARAMETERS;
-ENUM!{enum PRIORITY_HINT {
-    IoPriorityHintVeryLow = 0,
-    IoPriorityHintLow = 1,
-    IoPriorityHintNormal = 2,
-    MaximumIoPriorityHintType = 3,
-}}
-STRUCT!{struct FILE_BASIC_INFO {
-    CreationTime: ::LARGE_INTEGER,
-    LastAccessTime: ::LARGE_INTEGER,
-    LastWriteTime: ::LARGE_INTEGER,
-    ChangeTime: ::LARGE_INTEGER,
-    FileAttributes: ::DWORD,
-}}
-STRUCT!{struct FILE_STANDARD_INFO {
-    AllocationSize: ::LARGE_INTEGER,
-    EndOfFile: ::LARGE_INTEGER,
-    NumberOfLinks: ::DWORD,
-    DeletePending: ::BOOLEAN,
-    Directory: ::BOOLEAN,
-}}
-STRUCT!{struct FILE_NAME_INFO {
-    FileNameLength: ::DWORD,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_RENAME_INFO {
-    ReplaceIfExists: ::BOOL,
-    RootDirectory: ::HANDLE,
-    FileNameLength: ::DWORD,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_DISPOSITION_INFO {
-    DeleteFile: ::BOOL,
-}}
-STRUCT!{struct FILE_ALLOCATION_INFO {
-    AllocationSize: ::LARGE_INTEGER,
-}}
-STRUCT!{struct FILE_END_OF_FILE_INFO {
-    EndOfFile: ::LARGE_INTEGER,
-}}
-STRUCT!{struct FILE_STREAM_INFO {
-    NextEntryOffset: ::DWORD,
-    StreamNameLength: ::DWORD,
-    StreamSize: ::DWORD,
-    StreamAllocationSize: ::DWORD,
-    StreamName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_COMPRESSION_INFO {
-    CompressedFileSize: ::LARGE_INTEGER,
-    CompressionFormat: ::WORD,
-    CompressionUnitShift: ::UCHAR,
-    ChunkShift: ::UCHAR,
-    ClusterShift: ::UCHAR,
-    Reserved: [::UCHAR; 3],
-}}
-STRUCT!{struct FILE_ATTRIBUTE_TAG_INFO {
-    NextEntryOffset: ::DWORD,
-    ReparseTag: ::DWORD,
-}}
-STRUCT!{struct FILE_ID_BOTH_DIR_INFO {
-    NextEntryOffset: ::DWORD,
-    FileIndex: ::DWORD,
-    CreationTime: ::LARGE_INTEGER,
-    LastAccessTime: ::LARGE_INTEGER,
-    LastWriteTime: ::LARGE_INTEGER,
-    ChangeTime: ::LARGE_INTEGER,
-    EndOfFile: ::LARGE_INTEGER,
-    AllocationSize: ::LARGE_INTEGER,
-    FileAttributes: ::DWORD,
-    FileNameLength: ::DWORD,
-    EaSize: ::DWORD,
-    ShortNameLength: ::CCHAR,
-    ShortName: [::WCHAR; 12],
-    FileId: ::LARGE_INTEGER,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_IO_PRIORITY_HINT_INFO {
-    PriorityHint: ::PRIORITY_HINT,
-}}
-STRUCT!{struct FILE_FULL_DIR_INFO {
-    NextEntryOffset: ::ULONG,
-    FileIndex: ::ULONG,
-    CreationTime: ::LARGE_INTEGER,
-    LastAccessTime: ::LARGE_INTEGER,
-    LastWriteTime: ::LARGE_INTEGER,
-    ChangeTime: ::LARGE_INTEGER,
-    EndOfFile: ::LARGE_INTEGER,
-    AllocationSize: ::LARGE_INTEGER,
-    FileAttributes: ::ULONG,
-    FileNameLength: ::ULONG,
-    EaSize: ::ULONG,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_STORAGE_INFO {
-    LogicalBytesPerSector: ::ULONG,
-    PhysicalBytesPerSectorForAtomicity: ::ULONG,
-    PhysicalBytesPerSectorForPerformance: ::ULONG,
-    FileSystemEffectivePhysicalBytesPerSectorForAtomicity: ::ULONG,
-    Flags: ::ULONG,
-    ByteOffsetForSectorAlignment: ::ULONG,
-    ByteOffsetForPartitionAlignment: ::ULONG,
-}}
-STRUCT!{struct FILE_ALIGNMENT_INFO {
-    AlignmentRequirement: ::ULONG,
-}}
-STRUCT!{struct FILE_ID_INFO {
-    VolumeSerialNumber: ::ULONGLONG,
-    FileId: ::FILE_ID_128,
-}}
diff --git a/vendor/winapi-0.2.8/src/gl.rs b/vendor/winapi-0.2.8/src/gl.rs
deleted file mode 100644
index 006c37e417..0000000000
--- a/vendor/winapi-0.2.8/src/gl.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//48
-pub type GLenum = ::c_uint;
-pub type GLboolean = ::c_uchar;
-pub type GLbitfield = ::c_uint;
-pub type GLbyte = ::c_schar;
-pub type GLshort = ::c_short;
-pub type GLint = ::c_int;
-pub type GLsizei = ::c_int;
-pub type GLubyte = ::c_uchar;
-pub type GLushort = ::c_ushort;
-pub type GLuint = ::c_uint;
-pub type GLfloat = ::c_float;
-pub type GLclampf = ::c_float;
-pub type GLdouble = ::c_double;
-pub type GLclampd = ::c_double;
-pub type GLvoid = ::c_void;
-//63
-//68
-//AccumOp
-pub const GL_ACCUM: GLenum = 0x0100;
-pub const GL_LOAD: GLenum = 0x0101;
-pub const GL_RETURN: GLenum = 0x0102;
-pub const GL_MULT: GLenum = 0x0103;
-pub const GL_ADD: GLenum = 0x0104;
-//AlphaFunction
-pub const GL_NEVER: GLenum = 0x0200;
-pub const GL_LESS: GLenum = 0x0201;
-pub const GL_EQUAL: GLenum = 0x0202;
-pub const GL_LEQUAL: GLenum = 0x0203;
-pub const GL_GREATER: GLenum = 0x0204;
-pub const GL_NOTEQUAL: GLenum = 0x0205;
-pub const GL_GEQUAL: GLenum = 0x0206;
-pub const GL_ALWAYS: GLenum = 0x0207;
diff --git a/vendor/winapi-0.2.8/src/guiddef.rs b/vendor/winapi-0.2.8/src/guiddef.rs
deleted file mode 100644
index 8b436cdda5..0000000000
--- a/vendor/winapi-0.2.8/src/guiddef.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct GUID {
-    Data1: ::c_ulong,
-    Data2: ::c_ushort,
-    Data3: ::c_ushort,
-    Data4: [::c_uchar; 8],
-}}
-pub type LPGUID = *mut GUID;
-pub type LPCGUID = *const GUID;
-pub type IID = GUID;
-pub type LPIID = *mut IID;
-pub type CLSID = GUID;
-pub type LPCLSID = *mut CLSID;
-pub type FMTID = GUID;
-pub type LPFMTID = *mut FMTID;
-pub type REFGUID = *const GUID;
-pub type REFIID = *const IID;
-pub type REFCLSID = *const IID;
-pub type REFFMTID = *const IID;
diff --git a/vendor/winapi-0.2.8/src/heapapi.rs b/vendor/winapi-0.2.8/src/heapapi.rs
deleted file mode 100644
index 6f631c515a..0000000000
--- a/vendor/winapi-0.2.8/src/heapapi.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-heap-l1
-STRUCT!{struct HEAP_SUMMARY {
-    cb: ::DWORD,
-    cbAllocated: ::SIZE_T,
-    cbCommitted: ::SIZE_T,
-    cbReserved: ::SIZE_T,
-    cbMaxReserve: ::SIZE_T,
-}}
-pub type PHEAP_SUMMARY = *mut HEAP_SUMMARY;
-pub type LPHEAP_SUMMARY = PHEAP_SUMMARY;
diff --git a/vendor/winapi-0.2.8/src/hidclass.rs b/vendor/winapi-0.2.8/src/hidclass.rs
deleted file mode 100644
index 0851d5febb..0000000000
--- a/vendor/winapi-0.2.8/src/hidclass.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-DEFINE_GUID!{GUID_DEVINTERFACE_HID, 0x4D1E55B2, 0xF16F, 0x11CF,
-    0x88, 0xCB, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30}
-pub const GUID_CLASS_INPUT: ::GUID = GUID_DEVINTERFACE_HID;
-DEFINE_GUID!{GUID_HID_INTERFACE_NOTIFY, 0x2c4e2e88, 0x25e6, 0x4c33, 0x88, 0x2f, 0x3d, 0x82, 0xe6, 0x07, 0x36, 0x81}
-DEFINE_GUID!{GUID_HID_INTERFACE_HIDPARSE, 0xf5c315a5, 0x69ac, 0x4bc2, 0x92, 0x79, 0xd0, 0xb6, 0x45, 0x76, 0xf4, 0x4b}
-// FIXME devpropkey stuff
-pub const HID_REVISION: ::DWORD = 0x00000001;
-pub const IOCTL_HID_GET_DRIVER_CONFIG: ::DWORD = HID_BUFFER_CTL_CODE!(100);
-pub const IOCTL_HID_SET_DRIVER_CONFIG: ::DWORD = HID_BUFFER_CTL_CODE!(101);
-pub const IOCTL_HID_GET_POLL_FREQUENCY_MSEC: ::DWORD = HID_BUFFER_CTL_CODE!(102);
-pub const IOCTL_HID_SET_POLL_FREQUENCY_MSEC: ::DWORD = HID_BUFFER_CTL_CODE!(103);
-pub const IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: ::DWORD = HID_BUFFER_CTL_CODE!(104);
-pub const IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: ::DWORD = HID_BUFFER_CTL_CODE!(105);
-pub const IOCTL_HID_GET_COLLECTION_INFORMATION: ::DWORD = HID_BUFFER_CTL_CODE!(106);
-pub const IOCTL_HID_ENABLE_WAKE_ON_SX: ::DWORD = HID_BUFFER_CTL_CODE!(107);
-pub const IOCTL_HID_SET_S0_IDLE_TIMEOUT: ::DWORD = HID_BUFFER_CTL_CODE!(108);
-pub const IOCTL_HID_GET_COLLECTION_DESCRIPTOR: ::DWORD = HID_CTL_CODE!(100);
-pub const IOCTL_HID_FLUSH_QUEUE: ::DWORD = HID_CTL_CODE!(101);
-pub const IOCTL_HID_SET_FEATURE: ::DWORD = HID_IN_CTL_CODE!(100);
-pub const IOCTL_HID_SET_OUTPUT_REPORT: ::DWORD = HID_IN_CTL_CODE!(101);
-pub const IOCTL_HID_GET_FEATURE: ::DWORD = HID_OUT_CTL_CODE!(100);
-pub const IOCTL_GET_PHYSICAL_DESCRIPTOR: ::DWORD = HID_OUT_CTL_CODE!(102);
-pub const IOCTL_HID_GET_HARDWARE_ID: ::DWORD = HID_OUT_CTL_CODE!(103);
-pub const IOCTL_HID_GET_INPUT_REPORT: ::DWORD = HID_OUT_CTL_CODE!(104);
-pub const IOCTL_HID_GET_OUTPUT_REPORT: ::DWORD = HID_OUT_CTL_CODE!(105);
-pub const IOCTL_HID_GET_MANUFACTURER_STRING: ::DWORD = HID_OUT_CTL_CODE!(110);
-pub const IOCTL_HID_GET_PRODUCT_STRING: ::DWORD = HID_OUT_CTL_CODE!(111);
-pub const IOCTL_HID_GET_SERIALNUMBER_STRING: ::DWORD = HID_OUT_CTL_CODE!(112);
-pub const IOCTL_HID_GET_INDEXED_STRING: ::DWORD = HID_OUT_CTL_CODE!(120);
-pub const IOCTL_HID_GET_MS_GENRE_DESCRIPTOR: ::DWORD = HID_OUT_CTL_CODE!(121);
-pub const IOCTL_HID_ENABLE_SECURE_READ: ::DWORD = HID_CTL_CODE!(130);
-pub const IOCTL_HID_DISABLE_SECURE_READ: ::DWORD = HID_CTL_CODE!(131);
-pub const IOCTL_HID_DEVICERESET_NOTIFICATION: ::DWORD = HID_CTL_CODE!(140);
-STRUCT!{struct HID_XFER_PACKET {
-    reportBuffer: ::PUCHAR,
-    reportBufferLen: ::ULONG,
-    reportId: ::UCHAR,
-}}
-pub type PHID_XFER_PACKET = *mut HID_XFER_PACKET;
-//FIXME Stuff for NT_INCLUDED
-STRUCT!{struct HID_COLLECTION_INFORMATION {
-    DescriptorSize: ::ULONG,
-    Polled: ::BOOLEAN,
-    Reserved1: [::UCHAR; 1],
-    VendorID: ::USHORT,
-    ProductID: ::USHORT,
-    VersionNumber: ::USHORT,
-}}
-pub type PHID_COLLECTION_INFORMATION = *mut HID_COLLECTION_INFORMATION;
-STRUCT!{struct HID_DRIVER_CONFIG {
-    Size: ::ULONG,
-    RingBufferSize: ::ULONG,
-}}
-pub type PHID_DRIVER_CONFIG = *mut HID_DRIVER_CONFIG;
diff --git a/vendor/winapi-0.2.8/src/hidpi.rs b/vendor/winapi-0.2.8/src/hidpi.rs
deleted file mode 100644
index b2321ea9e9..0000000000
--- a/vendor/winapi-0.2.8/src/hidpi.rs
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-pub const HIDP_LINK_COLLECTION_ROOT: ::USHORT = -1i16 as u16;
-pub const HIDP_LINK_COLLECTION_UNSPECIFIED: ::USHORT = 0;
-ENUM!{enum HIDP_REPORT_TYPE {
-  HidP_Input,
-  HidP_Output,
-  HidP_Feature,
-}}
-STRUCT!{struct USAGE_AND_PAGE {
-    Usage: ::USAGE,
-    UsagePage: ::USAGE,
-}}
-pub type PUSAGE_AND_PAGE = *mut USAGE_AND_PAGE;
-STRUCT!{struct HIDP_BUTTON_CAPS {
-    UsagePage: ::USAGE,
-    ReportID: ::UCHAR,
-    IsAlias: ::BOOLEAN,
-    BitField: ::USHORT,
-    LinkCollection: ::USHORT,
-    LinkUsage: ::USAGE,
-    LinkUsagePage: ::USAGE,
-    IsRange: ::BOOLEAN,
-    IsStringRange: ::BOOLEAN,
-    IsDesignatorRange: ::BOOLEAN,
-    IsAbsolute: ::BOOLEAN,
-    Reserved: [::ULONG; 10],
-    S_un: [u16; 8],
-}}
-UNION!{HIDP_BUTTON_CAPS, S_un, Range, Range_mut, HIDP_RANGE_STRUCT}
-UNION!{HIDP_BUTTON_CAPS, S_un, NotRange, NotRange_mut, HIDP_NOTRANGE_STRUCT}
-pub type PHIDP_BUTTON_CAPS = *mut HIDP_BUTTON_CAPS;
-STRUCT!{struct HIDP_RANGE_STRUCT {
-    UsageMin: ::USAGE,
-    UsageMax: ::USAGE,
-    StringMin: ::USHORT,
-    StringMax: ::USHORT,
-    DesignatorMin: ::USHORT,
-    DesignatorMax: ::USHORT,
-    DataIndexMin: ::USHORT,
-    DataIndexMax: ::USHORT,
-}}
-STRUCT!{struct HIDP_NOTRANGE_STRUCT {
-    Usage: ::USAGE,
-    Reserved1: ::USAGE,
-    StringIndex: ::USHORT,
-    Reserved2: ::USHORT,
-    DesignatorIndex: ::USHORT,
-    Reserved3: ::USHORT,
-    DataIndex: ::USHORT,
-    Reserved4: ::USHORT,
-}}
-STRUCT!{struct HIDP_VALUE_CAPS {
-    UsagePage: ::USAGE,
-    ReportID: ::UCHAR,
-    IsAlias: ::BOOLEAN,
-    BitField: ::USHORT,
-    LinkCollection: ::USHORT,
-    LinkUsage: ::USAGE,
-    LinkUsagePage: ::USAGE,
-    IsRange: ::BOOLEAN,
-    IsStringRange: ::BOOLEAN,
-    IsDesignatorRange: ::BOOLEAN,
-    IsAbsolute: ::BOOLEAN,
-    HasNull: ::BOOLEAN,
-    Reserved: ::UCHAR,
-    BitSize: ::USHORT,
-    ReportCount: ::USHORT,
-    Reserved2: [::USHORT; 5],
-    UnitsExp: ::ULONG,
-    Units: ::ULONG,
-    LogicalMin: ::LONG,
-    LogicalMax: ::LONG,
-    PhysicalMin: ::LONG,
-    PhysicalMax: ::LONG,
-    S_un: [u16; 8],
-}}
-UNION!{HIDP_VALUE_CAPS, S_un, Range, Range_mut, HIDP_RANGE_STRUCT}
-UNION!{HIDP_VALUE_CAPS, S_un, NotRange, NotRange_mut, HIDP_NOTRANGE_STRUCT}
-pub type PHIDP_VALUE_CAPS = *mut HIDP_VALUE_CAPS;
-STRUCT!{struct HIDP_LINK_COLLECTION_NODE {
-    LinkUsage: ::USAGE,
-    LinkUsagePage: ::USAGE,
-    Parent: ::USHORT,
-    NumberOfChildren: ::USHORT,
-    NextSibling: ::USHORT,
-    FirstChild: ::USHORT,
-    bit_fields: ::ULONG,
-    UserContext: ::PVOID,
-}}
-BITFIELD!{HIDP_LINK_COLLECTION_NODE bit_fields: ::ULONG [
-    CollectionType set_CollectionType[0..8],
-    IsAlias set_IsAlias[8..9],
-]}
-pub type PHIDP_LINK_COLLECTION_NODE = *mut HIDP_LINK_COLLECTION_NODE;
-pub type PHIDP_REPORT_DESCRIPTOR = ::PUCHAR;
-pub enum HIDP_PREPARSED_DATA{}
-pub type PHIDP_PREPARSED_DATA = *mut HIDP_PREPARSED_DATA;
-STRUCT!{struct HIDP_CAPS {
-    Usage: ::USAGE,
-    UsagePage: ::USAGE,
-    InputReportByteLength: ::USHORT,
-    OutputReportByteLength: ::USHORT,
-    FeatureReportByteLength: ::USHORT,
-    Reserved: [::USHORT; 17],
-    NumberLinkCollectionNodes: ::USHORT,
-    NumberInputButtonCaps: ::USHORT,
-    NumberInputValueCaps: ::USHORT,
-    NumberInputDataIndices: ::USHORT,
-    NumberOutputButtonCaps: ::USHORT,
-    NumberOutputValueCaps: ::USHORT,
-    NumberOutputDataIndices: ::USHORT,
-    NumberFeatureButtonCaps: ::USHORT,
-    NumberFeatureValueCaps: ::USHORT,
-    NumberFeatureDataIndices: ::USHORT,
-}}
-pub type PHIDP_CAPS = *mut HIDP_CAPS;
-STRUCT!{struct HIDP_DATA {
-    DataIndex: ::USHORT,
-    Reserved: ::USHORT,
-    S_un: [u32; 1],
-}}
-UNION!{HIDP_DATA, S_un, RawValue, RawValue_mut, ::ULONG}
-UNION!{HIDP_DATA, S_un, On, On_mut, ::BOOLEAN}
-pub type PHIDP_DATA = *mut HIDP_DATA;
-STRUCT!{struct HIDP_UNKNOWN_TOKEN {
-    Token: ::UCHAR,
-    Reserved: [::UCHAR; 3],
-    BitField: ::ULONG,
-}}
-pub type PHIDP_UNKNOWN_TOKEN = *mut HIDP_UNKNOWN_TOKEN;
-STRUCT!{struct HIDP_EXTENDED_ATTRIBUTES {
-    NumGlobalUnknowns: ::UCHAR,
-    Reserved: [::UCHAR; 3],
-    GlobalUnknowns: PHIDP_UNKNOWN_TOKEN,
-    Data: [::ULONG; 1],
-}}
-pub type PHIDP_EXTENDED_ATTRIBUTES = *mut HIDP_EXTENDED_ATTRIBUTES;
-ENUM!{enum HIDP_KEYBOARD_DIRECTION {
-    HidP_Keyboard_Break,
-    HidP_Keyboard_Make,
-}}
-STRUCT!{struct HIDP_KEYBOARD_MODIFIER_STATE {
-    ul: ::ULONG,
-}}
-BITFIELD!{HIDP_KEYBOARD_MODIFIER_STATE ul: ::ULONG [
-    LeftControl set_LeftControl[0..1],
-    LeftShift set_LeftShift[1..2],
-    LeftAlt set_LeftAlt[2..3],
-    LeftGUI set_LeftGUI[3..4],
-    RightControl set_RightControl[4..5],
-    RightShift set_RightShift[5..6],
-    RightAlt set_RightAlt[6..7],
-    RigthGUI set_RigthGUI[7..8],
-    CapsLock set_CapsLock[8..9],
-    ScollLock set_ScollLock[9..10],
-    NumLock set_NumLock[10..11],
-]}
-pub type PHIDP_KEYBOARD_MODIFIER_STATE = *mut HIDP_KEYBOARD_MODIFIER_STATE;
-pub type PHIDP_INSERT_SCANCODES = Option<unsafe extern "C" fn(
-    Context: ::PVOID, NewScanCodes: ::PCHAR, Length: ::ULONG,
-) -> ::BOOLEAN>;
-pub const HIDP_STATUS_SUCCESS: ::NTSTATUS = HIDP_ERROR_CODES!(0x0, 0);
-pub const HIDP_STATUS_NULL: ::NTSTATUS = HIDP_ERROR_CODES!(0x8, 1);
-pub const HIDP_STATUS_INVALID_PREPARSED_DATA: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 1);
-pub const HIDP_STATUS_INVALID_REPORT_TYPE: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 2);
-pub const HIDP_STATUS_INVALID_REPORT_LENGTH: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 3);
-pub const HIDP_STATUS_USAGE_NOT_FOUND: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 4);
-pub const HIDP_STATUS_VALUE_OUT_OF_RANGE: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 5);
-pub const HIDP_STATUS_BAD_LOG_PHY_VALUES: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 6);
-pub const HIDP_STATUS_BUFFER_TOO_SMALL: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 7);
-pub const HIDP_STATUS_INTERNAL_ERROR: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 8);
-pub const HIDP_STATUS_I8042_TRANS_UNKNOWN: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 9);
-pub const HIDP_STATUS_INCOMPATIBLE_REPORT_ID: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xA);
-pub const HIDP_STATUS_NOT_VALUE_ARRAY: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xB);
-pub const HIDP_STATUS_IS_VALUE_ARRAY: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xC);
-pub const HIDP_STATUS_DATA_INDEX_NOT_FOUND: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xD);
-pub const HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xE);
-pub const HIDP_STATUS_BUTTON_NOT_PRESSED: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0xF);
-pub const HIDP_STATUS_REPORT_DOES_NOT_EXIST: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0x10);
-pub const HIDP_STATUS_NOT_IMPLEMENTED: ::NTSTATUS = HIDP_ERROR_CODES!(0xC, 0x20);
-pub const HIDP_STATUS_I8242_TRANS_UNKNOWN: ::NTSTATUS = HIDP_STATUS_I8042_TRANS_UNKNOWN;
diff --git a/vendor/winapi-0.2.8/src/hidsdi.rs b/vendor/winapi-0.2.8/src/hidsdi.rs
deleted file mode 100644
index 1b421f038a..0000000000
--- a/vendor/winapi-0.2.8/src/hidsdi.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct HIDD_CONFIGURATION {
-    cookie: ::PVOID,
-    size: ::ULONG,
-    RingBufferSize: ::ULONG,
-}}
-pub type PHIDD_CONFIGURATION = *mut HIDD_CONFIGURATION;
-STRUCT!{struct HIDD_ATTRIBUTES {
-    Size: ::ULONG,
-    VendorID: ::USHORT,
-    ProductID: ::USHORT,
-    VersionNumber: ::USHORT,
-}}
-pub type PHIDD_ATTRIBUTES = *mut HIDD_ATTRIBUTES;
diff --git a/vendor/winapi-0.2.8/src/hidusage.rs b/vendor/winapi-0.2.8/src/hidusage.rs
deleted file mode 100644
index 4d76509ece..0000000000
--- a/vendor/winapi-0.2.8/src/hidusage.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright © 2015, Peter Atashian and Alex Daniel Jones
-// Licensed under the MIT License <LICENSE.md>
-pub type USAGE = ::USHORT;
-pub type PUSAGE = *mut USAGE;
-pub const HID_USAGE_PAGE_UNDEFINED: ::USAGE = 0x00;
-pub const HID_USAGE_PAGE_GENERIC: ::USAGE = 0x01;
-pub const HID_USAGE_PAGE_SIMULATION: ::USAGE = 0x02;
-pub const HID_USAGE_PAGE_VR: ::USAGE = 0x03;
-pub const HID_USAGE_PAGE_SPORT: ::USAGE = 0x04;
-pub const HID_USAGE_PAGE_GAME: ::USAGE = 0x05;
-pub const HID_USAGE_PAGE_KEYBOARD: ::USAGE = 0x07;
-pub const HID_USAGE_PAGE_LED: ::USAGE = 0x08;
-pub const HID_USAGE_PAGE_BUTTON: ::USAGE = 0x09;
-pub const HID_USAGE_PAGE_ORDINAL: ::USAGE = 0x0A;
-pub const HID_USAGE_PAGE_TELEPHONY: ::USAGE = 0x0B;
-pub const HID_USAGE_PAGE_CONSUMER: ::USAGE = 0x0C;
-pub const HID_USAGE_PAGE_DIGITIZER: ::USAGE = 0x0D;
-pub const HID_USAGE_PAGE_UNICODE: ::USAGE = 0x10;
-pub const HID_USAGE_PAGE_ALPHANUMERIC: ::USAGE = 0x14;
-pub const HID_USAGE_PAGE_SENSOR: ::USAGE = 0x20;
-pub const HID_USAGE_PAGE_BARCODE_SCANNER: ::USAGE = 0x8C;
-pub const HID_USAGE_PAGE_WEIGHING_DEVICE: ::USAGE = 0x8D;
-pub const HID_USAGE_PAGE_MAGNETIC_STRIPE_READER: ::USAGE = 0x8E;
-pub const HID_USAGE_PAGE_CAMERA_CONTROL: ::USAGE = 0x90;
-pub const HID_USAGE_PAGE_MICROSOFT_BLUETOOTH_HANDSFREE: ::USAGE = 0xFFF3;
-pub const HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN: ::USAGE = 0xFF00;
-pub const HID_USAGE_PAGE_VENDOR_DEFINED_END: ::USAGE = 0xFFFF;
-pub const HID_USAGE_GENERIC_POINTER: ::USAGE = 0x01;
-pub const HID_USAGE_GENERIC_MOUSE: ::USAGE = 0x02;
-pub const HID_USAGE_GENERIC_JOYSTICK: ::USAGE = 0x04;
-pub const HID_USAGE_GENERIC_GAMEPAD: ::USAGE = 0x05;
-pub const HID_USAGE_GENERIC_KEYBOARD: ::USAGE = 0x06;
-pub const HID_USAGE_GENERIC_KEYPAD: ::USAGE = 0x07;
-pub const HID_USAGE_GENERIC_PORTABLE_DEVICE_CONTROL: ::USAGE = 0x0D;
-pub const HID_USAGE_GENERIC_SYSTEM_CTL: ::USAGE = 0x80;
-pub const HID_USAGE_GENERIC_X: ::USAGE = 0x30;
-pub const HID_USAGE_GENERIC_Y: ::USAGE = 0x31;
-pub const HID_USAGE_GENERIC_Z: ::USAGE = 0x32;
-pub const HID_USAGE_GENERIC_RX: ::USAGE = 0x33;
-pub const HID_USAGE_GENERIC_RY: ::USAGE = 0x34;
-pub const HID_USAGE_GENERIC_RZ: ::USAGE = 0x35;
-pub const HID_USAGE_GENERIC_SLIDER: ::USAGE = 0x36;
-pub const HID_USAGE_GENERIC_DIAL: ::USAGE = 0x37;
-pub const HID_USAGE_GENERIC_WHEEL: ::USAGE = 0x38;
-pub const HID_USAGE_GENERIC_HATSWITCH: ::USAGE = 0x39;
-pub const HID_USAGE_GENERIC_COUNTED_BUFFER: ::USAGE = 0x3A;
-pub const HID_USAGE_GENERIC_BYTE_COUNT: ::USAGE = 0x3B;
-pub const HID_USAGE_GENERIC_MOTION_WAKEUP: ::USAGE = 0x3C;
-pub const HID_USAGE_GENERIC_VX: ::USAGE = 0x40;
-pub const HID_USAGE_GENERIC_VY: ::USAGE = 0x41;
-pub const HID_USAGE_GENERIC_VZ: ::USAGE = 0x42;
-pub const HID_USAGE_GENERIC_VBRX: ::USAGE = 0x43;
-pub const HID_USAGE_GENERIC_VBRY: ::USAGE = 0x44;
-pub const HID_USAGE_GENERIC_VBRZ: ::USAGE = 0x45;
-pub const HID_USAGE_GENERIC_VNO: ::USAGE = 0x46;
-pub const HID_USAGE_GENERIC_RESOLUTION_MULTIPLIER: ::USAGE = 0x48;
-pub const HID_USAGE_GENERIC_SYSCTL_POWER: ::USAGE = 0x81;
-pub const HID_USAGE_GENERIC_SYSCTL_SLEEP: ::USAGE = 0x82;
-pub const HID_USAGE_GENERIC_SYSCTL_WAKE: ::USAGE = 0x83;
-pub const HID_USAGE_GENERIC_SYSCTL_CONTEXT_MENU: ::USAGE = 0x84;
-pub const HID_USAGE_GENERIC_SYSCTL_MAIN_MENU: ::USAGE = 0x85;
-pub const HID_USAGE_GENERIC_SYSCTL_APP_MENU: ::USAGE = 0x86;
-pub const HID_USAGE_GENERIC_SYSCTL_HELP_MENU: ::USAGE = 0x87;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_EXIT: ::USAGE = 0x88;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_SELECT: ::USAGE = 0x89;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_RIGHT: ::USAGE = 0x8A;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_LEFT: ::USAGE = 0x8B;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_UP: ::USAGE = 0x8C;
-pub const HID_USAGE_GENERIC_SYSCTL_MENU_DOWN: ::USAGE = 0x8D;
-pub const HID_USAGE_GENERIC_SYSTEM_DISPLAY_ROTATION_LOCK_BUTTON: ::USAGE = 0xC9;
-pub const HID_USAGE_GENERIC_SYSTEM_DISPLAY_ROTATION_LOCK_SLIDER_SWITCH: ::USAGE = 0xCA;
-pub const HID_USAGE_GENERIC_CONTROL_ENABLE: ::USAGE = 0xCB;
-pub const HID_USAGE_SIMULATION_RUDDER: ::USAGE = 0xBA;
-pub const HID_USAGE_SIMULATION_THROTTLE: ::USAGE = 0xBB;
-pub const HID_USAGE_KEYBOARD_NOEVENT: ::USAGE = 0x00;
-pub const HID_USAGE_KEYBOARD_ROLLOVER: ::USAGE = 0x01;
-pub const HID_USAGE_KEYBOARD_POSTFAIL: ::USAGE = 0x02;
-pub const HID_USAGE_KEYBOARD_UNDEFINED: ::USAGE = 0x03;
-pub const HID_USAGE_KEYBOARD_aA: ::USAGE = 0x04;
-pub const HID_USAGE_KEYBOARD_zZ: ::USAGE = 0x1D;
-pub const HID_USAGE_KEYBOARD_ONE: ::USAGE = 0x1E;
-pub const HID_USAGE_KEYBOARD_ZERO: ::USAGE = 0x27;
-pub const HID_USAGE_KEYBOARD_LCTRL: ::USAGE = 0xE0;
-pub const HID_USAGE_KEYBOARD_LSHFT: ::USAGE = 0xE1;
-pub const HID_USAGE_KEYBOARD_LALT: ::USAGE = 0xE2;
-pub const HID_USAGE_KEYBOARD_LGUI: ::USAGE = 0xE3;
-pub const HID_USAGE_KEYBOARD_RCTRL: ::USAGE = 0xE4;
-pub const HID_USAGE_KEYBOARD_RSHFT: ::USAGE = 0xE5;
-pub const HID_USAGE_KEYBOARD_RALT: ::USAGE = 0xE6;
-pub const HID_USAGE_KEYBOARD_RGUI: ::USAGE = 0xE7;
-pub const HID_USAGE_KEYBOARD_SCROLL_LOCK: ::USAGE = 0x47;
-pub const HID_USAGE_KEYBOARD_NUM_LOCK: ::USAGE = 0x53;
-pub const HID_USAGE_KEYBOARD_CAPS_LOCK: ::USAGE = 0x39;
-pub const HID_USAGE_KEYBOARD_F1: ::USAGE = 0x3A;
-pub const HID_USAGE_KEYBOARD_F2: ::USAGE = 0x3B;
-pub const HID_USAGE_KEYBOARD_F3: ::USAGE = 0x3C;
-pub const HID_USAGE_KEYBOARD_F4: ::USAGE = 0x3D;
-pub const HID_USAGE_KEYBOARD_F5: ::USAGE = 0x3E;
-pub const HID_USAGE_KEYBOARD_F6: ::USAGE = 0x3F;
-pub const HID_USAGE_KEYBOARD_F7: ::USAGE = 0x40;
-pub const HID_USAGE_KEYBOARD_F8: ::USAGE = 0x41;
-pub const HID_USAGE_KEYBOARD_F9: ::USAGE = 0x42;
-pub const HID_USAGE_KEYBOARD_F10: ::USAGE = 0x43;
-pub const HID_USAGE_KEYBOARD_F11: ::USAGE = 0x44;
-pub const HID_USAGE_KEYBOARD_F12: ::USAGE = 0x45;
-pub const HID_USAGE_KEYBOARD_F13: ::USAGE = 0x68;
-pub const HID_USAGE_KEYBOARD_F14: ::USAGE = 0x69;
-pub const HID_USAGE_KEYBOARD_F15: ::USAGE = 0x6A;
-pub const HID_USAGE_KEYBOARD_F16: ::USAGE = 0x6B;
-pub const HID_USAGE_KEYBOARD_F17: ::USAGE = 0x6C;
-pub const HID_USAGE_KEYBOARD_F18: ::USAGE = 0x6D;
-pub const HID_USAGE_KEYBOARD_F19: ::USAGE = 0x6E;
-pub const HID_USAGE_KEYBOARD_F20: ::USAGE = 0x6F;
-pub const HID_USAGE_KEYBOARD_F21: ::USAGE = 0x70;
-pub const HID_USAGE_KEYBOARD_F22: ::USAGE = 0x71;
-pub const HID_USAGE_KEYBOARD_F23: ::USAGE = 0x72;
-pub const HID_USAGE_KEYBOARD_F24: ::USAGE = 0x73;
-pub const HID_USAGE_KEYBOARD_RETURN: ::USAGE = 0x28;
-pub const HID_USAGE_KEYBOARD_ESCAPE: ::USAGE = 0x29;
-pub const HID_USAGE_KEYBOARD_DELETE: ::USAGE = 0x2A;
-pub const HID_USAGE_KEYBOARD_PRINT_SCREEN: ::USAGE = 0x46;
-pub const HID_USAGE_KEYBOARD_DELETE_FORWARD: ::USAGE = 0x4C;
-pub const HID_USAGE_LED_NUM_LOCK: ::USAGE = 0x01;
-pub const HID_USAGE_LED_CAPS_LOCK: ::USAGE = 0x02;
-pub const HID_USAGE_LED_SCROLL_LOCK: ::USAGE = 0x03;
-pub const HID_USAGE_LED_COMPOSE: ::USAGE = 0x04;
-pub const HID_USAGE_LED_KANA: ::USAGE = 0x05;
-pub const HID_USAGE_LED_POWER: ::USAGE = 0x06;
-pub const HID_USAGE_LED_SHIFT: ::USAGE = 0x07;
-pub const HID_USAGE_LED_DO_NOT_DISTURB: ::USAGE = 0x08;
-pub const HID_USAGE_LED_MUTE: ::USAGE = 0x09;
-pub const HID_USAGE_LED_TONE_ENABLE: ::USAGE = 0x0A;
-pub const HID_USAGE_LED_HIGH_CUT_FILTER: ::USAGE = 0x0B;
-pub const HID_USAGE_LED_LOW_CUT_FILTER: ::USAGE = 0x0C;
-pub const HID_USAGE_LED_EQUALIZER_ENABLE: ::USAGE = 0x0D;
-pub const HID_USAGE_LED_SOUND_FIELD_ON: ::USAGE = 0x0E;
-pub const HID_USAGE_LED_SURROUND_FIELD_ON: ::USAGE = 0x0F;
-pub const HID_USAGE_LED_REPEAT: ::USAGE = 0x10;
-pub const HID_USAGE_LED_STEREO: ::USAGE = 0x11;
-pub const HID_USAGE_LED_SAMPLING_RATE_DETECT: ::USAGE = 0x12;
-pub const HID_USAGE_LED_SPINNING: ::USAGE = 0x13;
-pub const HID_USAGE_LED_CAV: ::USAGE = 0x14;
-pub const HID_USAGE_LED_CLV: ::USAGE = 0x15;
-pub const HID_USAGE_LED_RECORDING_FORMAT_DET: ::USAGE = 0x16;
-pub const HID_USAGE_LED_OFF_HOOK: ::USAGE = 0x17;
-pub const HID_USAGE_LED_RING: ::USAGE = 0x18;
-pub const HID_USAGE_LED_MESSAGE_WAITING: ::USAGE = 0x19;
-pub const HID_USAGE_LED_DATA_MODE: ::USAGE = 0x1A;
-pub const HID_USAGE_LED_BATTERY_OPERATION: ::USAGE = 0x1B;
-pub const HID_USAGE_LED_BATTERY_OK: ::USAGE = 0x1C;
-pub const HID_USAGE_LED_BATTERY_LOW: ::USAGE = 0x1D;
-pub const HID_USAGE_LED_SPEAKER: ::USAGE = 0x1E;
-pub const HID_USAGE_LED_HEAD_SET: ::USAGE = 0x1F;
-pub const HID_USAGE_LED_HOLD: ::USAGE = 0x20;
-pub const HID_USAGE_LED_MICROPHONE: ::USAGE = 0x21;
-pub const HID_USAGE_LED_COVERAGE: ::USAGE = 0x22;
-pub const HID_USAGE_LED_NIGHT_MODE: ::USAGE = 0x23;
-pub const HID_USAGE_LED_SEND_CALLS: ::USAGE = 0x24;
-pub const HID_USAGE_LED_CALL_PICKUP: ::USAGE = 0x25;
-pub const HID_USAGE_LED_CONFERENCE: ::USAGE = 0x26;
-pub const HID_USAGE_LED_STAND_BY: ::USAGE = 0x27;
-pub const HID_USAGE_LED_CAMERA_ON: ::USAGE = 0x28;
-pub const HID_USAGE_LED_CAMERA_OFF: ::USAGE = 0x29;
-pub const HID_USAGE_LED_ON_LINE: ::USAGE = 0x2A;
-pub const HID_USAGE_LED_OFF_LINE: ::USAGE = 0x2B;
-pub const HID_USAGE_LED_BUSY: ::USAGE = 0x2C;
-pub const HID_USAGE_LED_READY: ::USAGE = 0x2D;
-pub const HID_USAGE_LED_PAPER_OUT: ::USAGE = 0x2E;
-pub const HID_USAGE_LED_PAPER_JAM: ::USAGE = 0x2F;
-pub const HID_USAGE_LED_REMOTE: ::USAGE = 0x30;
-pub const HID_USAGE_LED_FORWARD: ::USAGE = 0x31;
-pub const HID_USAGE_LED_REVERSE: ::USAGE = 0x32;
-pub const HID_USAGE_LED_STOP: ::USAGE = 0x33;
-pub const HID_USAGE_LED_REWIND: ::USAGE = 0x34;
-pub const HID_USAGE_LED_FAST_FORWARD: ::USAGE = 0x35;
-pub const HID_USAGE_LED_PLAY: ::USAGE = 0x36;
-pub const HID_USAGE_LED_PAUSE: ::USAGE = 0x37;
-pub const HID_USAGE_LED_RECORD: ::USAGE = 0x38;
-pub const HID_USAGE_LED_ERROR: ::USAGE = 0x39;
-pub const HID_USAGE_LED_SELECTED_INDICATOR: ::USAGE = 0x3A;
-pub const HID_USAGE_LED_IN_USE_INDICATOR: ::USAGE = 0x3B;
-pub const HID_USAGE_LED_MULTI_MODE_INDICATOR: ::USAGE = 0x3C;
-pub const HID_USAGE_LED_INDICATOR_ON: ::USAGE = 0x3D;
-pub const HID_USAGE_LED_INDICATOR_FLASH: ::USAGE = 0x3E;
-pub const HID_USAGE_LED_INDICATOR_SLOW_BLINK: ::USAGE = 0x3F;
-pub const HID_USAGE_LED_INDICATOR_FAST_BLINK: ::USAGE = 0x40;
-pub const HID_USAGE_LED_INDICATOR_OFF: ::USAGE = 0x41;
-pub const HID_USAGE_LED_FLASH_ON_TIME: ::USAGE = 0x42;
-pub const HID_USAGE_LED_SLOW_BLINK_ON_TIME: ::USAGE = 0x43;
-pub const HID_USAGE_LED_SLOW_BLINK_OFF_TIME: ::USAGE = 0x44;
-pub const HID_USAGE_LED_FAST_BLINK_ON_TIME: ::USAGE = 0x45;
-pub const HID_USAGE_LED_FAST_BLINK_OFF_TIME: ::USAGE = 0x46;
-pub const HID_USAGE_LED_INDICATOR_COLOR: ::USAGE = 0x47;
-pub const HID_USAGE_LED_RED: ::USAGE = 0x48;
-pub const HID_USAGE_LED_GREEN: ::USAGE = 0x49;
-pub const HID_USAGE_LED_AMBER: ::USAGE = 0x4A;
-pub const HID_USAGE_LED_GENERIC_INDICATOR: ::USAGE = 0x4B;
-pub const HID_USAGE_TELEPHONY_PHONE: ::USAGE = 0x01;
-pub const HID_USAGE_TELEPHONY_ANSWERING_MACHINE: ::USAGE = 0x02;
-pub const HID_USAGE_TELEPHONY_MESSAGE_CONTROLS: ::USAGE = 0x03;
-pub const HID_USAGE_TELEPHONY_HANDSET: ::USAGE = 0x04;
-pub const HID_USAGE_TELEPHONY_HEADSET: ::USAGE = 0x05;
-pub const HID_USAGE_TELEPHONY_KEYPAD: ::USAGE = 0x06;
-pub const HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON: ::USAGE = 0x07;
-pub const HID_USAGE_TELEPHONY_REDIAL: ::USAGE = 0x24;
-pub const HID_USAGE_TELEPHONY_TRANSFER: ::USAGE = 0x25;
-pub const HID_USAGE_TELEPHONY_DROP: ::USAGE = 0x26;
-pub const HID_USAGE_TELEPHONY_LINE: ::USAGE = 0x2A;
-pub const HID_USAGE_TELEPHONY_RING_ENABLE: ::USAGE = 0x2D;
-pub const HID_USAGE_TELEPHONY_SEND: ::USAGE = 0x31;
-pub const HID_USAGE_TELEPHONY_KEYPAD_0: ::USAGE = 0xB0;
-pub const HID_USAGE_TELEPHONY_KEYPAD_D: ::USAGE = 0xBF;
-pub const HID_USAGE_TELEPHONY_HOST_AVAILABLE: ::USAGE = 0xF1;
-pub const HID_USAGE_CONSUMERCTRL: ::USAGE = 0x01;
-pub const HID_USAGE_CONSUMER_CHANNEL_INCREMENT: ::USAGE = 0x9C;
-pub const HID_USAGE_CONSUMER_CHANNEL_DECREMENT: ::USAGE = 0x9D;
-pub const HID_USAGE_CONSUMER_PLAY: ::USAGE = 0xB0;
-pub const HID_USAGE_CONSUMER_PAUSE: ::USAGE = 0xB1;
-pub const HID_USAGE_CONSUMER_RECORD: ::USAGE = 0xB2;
-pub const HID_USAGE_CONSUMER_FAST_FORWARD: ::USAGE = 0xB3;
-pub const HID_USAGE_CONSUMER_REWIND: ::USAGE = 0xB4;
-pub const HID_USAGE_CONSUMER_SCAN_NEXT_TRACK: ::USAGE = 0xB5;
-pub const HID_USAGE_CONSUMER_SCAN_PREV_TRACK: ::USAGE = 0xB6;
-pub const HID_USAGE_CONSUMER_STOP: ::USAGE = 0xB7;
-pub const HID_USAGE_CONSUMER_PLAY_PAUSE: ::USAGE = 0xCD;
-pub const HID_USAGE_CONSUMER_VOLUME: ::USAGE = 0xE0;
-pub const HID_USAGE_CONSUMER_BALANCE: ::USAGE = 0xE1;
-pub const HID_USAGE_CONSUMER_MUTE: ::USAGE = 0xE2;
-pub const HID_USAGE_CONSUMER_BASS: ::USAGE = 0xE3;
-pub const HID_USAGE_CONSUMER_TREBLE: ::USAGE = 0xE4;
-pub const HID_USAGE_CONSUMER_BASS_BOOST: ::USAGE = 0xE5;
-pub const HID_USAGE_CONSUMER_SURROUND_MODE: ::USAGE = 0xE6;
-pub const HID_USAGE_CONSUMER_LOUDNESS: ::USAGE = 0xE7;
-pub const HID_USAGE_CONSUMER_MPX: ::USAGE = 0xE8;
-pub const HID_USAGE_CONSUMER_VOLUME_INCREMENT: ::USAGE = 0xE9;
-pub const HID_USAGE_CONSUMER_VOLUME_DECREMENT: ::USAGE = 0xEA;
-pub const HID_USAGE_CONSUMER_BASS_INCREMENT: ::USAGE = 0x152;
-pub const HID_USAGE_CONSUMER_BASS_DECREMENT: ::USAGE = 0x153;
-pub const HID_USAGE_CONSUMER_TREBLE_INCREMENT: ::USAGE = 0x154;
-pub const HID_USAGE_CONSUMER_TREBLE_DECREMENT: ::USAGE = 0x155;
-pub const HID_USAGE_CONSUMER_AL_CONFIGURATION: ::USAGE = 0x183;
-pub const HID_USAGE_CONSUMER_AL_EMAIL: ::USAGE = 0x18A;
-pub const HID_USAGE_CONSUMER_AL_CALCULATOR: ::USAGE = 0x192;
-pub const HID_USAGE_CONSUMER_AL_BROWSER: ::USAGE = 0x194;
-pub const HID_USAGE_CONSUMER_AC_SEARCH: ::USAGE = 0x221;
-pub const HID_USAGE_CONSUMER_AC_GOTO: ::USAGE = 0x222;
-pub const HID_USAGE_CONSUMER_AC_HOME: ::USAGE = 0x223;
-pub const HID_USAGE_CONSUMER_AC_BACK: ::USAGE = 0x224;
-pub const HID_USAGE_CONSUMER_AC_FORWARD: ::USAGE = 0x225;
-pub const HID_USAGE_CONSUMER_AC_STOP: ::USAGE = 0x226;
-pub const HID_USAGE_CONSUMER_AC_REFRESH: ::USAGE = 0x227;
-pub const HID_USAGE_CONSUMER_AC_PREVIOUS: ::USAGE = 0x228;
-pub const HID_USAGE_CONSUMER_AC_NEXT: ::USAGE = 0x229;
-pub const HID_USAGE_CONSUMER_AC_BOOKMARKS: ::USAGE = 0x22A;
-pub const HID_USAGE_CONSUMER_AC_PAN: ::USAGE = 0x238;
-pub const HID_USAGE_CONSUMER_EXTENDED_KEYBOARD_ATTRIBUTES_COLLECTION: ::USAGE = 0x2C0;
-pub const HID_USAGE_CONSUMER_KEYBOARD_FORM_FACTOR: ::USAGE = 0x2C1;
-pub const HID_USAGE_CONSUMER_KEYBOARD_KEY_TYPE: ::USAGE = 0x2C2;
-pub const HID_USAGE_CONSUMER_KEYBOARD_PHYSICAL_LAYOUT: ::USAGE = 0x2C3;
-pub const HID_USAGE_CONSUMER_VENDOR_SPECIFIC_KEYBOARD_PHYSICAL_LAYOUT: ::USAGE = 0x2C4;
-pub const HID_USAGE_CONSUMER_KEYBOARD_IETF_LANGUAGE_TAG_INDEX: ::USAGE = 0x2C5;
-pub const HID_USAGE_CONSUMER_IMPLEMENTED_KEYBOARD_INPUT_ASSIST_CONTROLS: ::USAGE = 0x2C6;
-pub const HID_USAGE_DIGITIZER_PEN: ::USAGE = 0x02;
-pub const HID_USAGE_DIGITIZER_IN_RANGE: ::USAGE = 0x32;
-pub const HID_USAGE_DIGITIZER_TIP_SWITCH: ::USAGE = 0x42;
-pub const HID_USAGE_DIGITIZER_BARREL_SWITCH: ::USAGE = 0x44;
-pub const HID_USAGE_CAMERA_AUTO_FOCUS: ::USAGE = 0x20;
-pub const HID_USAGE_CAMERA_SHUTTER: ::USAGE = 0x21;
-pub const HID_USAGE_MS_BTH_HF_DIALNUMBER: ::USAGE = 0x21;
-pub const HID_USAGE_MS_BTH_HF_DIALMEMORY: ::USAGE = 0x22;
diff --git a/vendor/winapi-0.2.8/src/hstring.rs b/vendor/winapi-0.2.8/src/hstring.rs
deleted file mode 100644
index 01cfc6d302..0000000000
--- a/vendor/winapi-0.2.8/src/hstring.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This interface definition contains typedefs for Windows Runtime data types.
-DECLARE_HANDLE!(HSTRING, HSTRING__);
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct HSTRING_HEADER {
-    Reserved: [::PVOID; 0], // For alignment
-    Reserved2: [::c_char; 24],
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct HSTRING_HEADER {
-    Reserved: [::PVOID; 0], // For alignment
-    Reserved2: [::c_char; 20],
-}}
-UNION!(HSTRING_HEADER, Reserved2, Reserved1, Reserved1_mut, ::PVOID);
-DECLARE_HANDLE!(HSTRING_BUFFER, HSTRING_BUFFER__);
diff --git a/vendor/winapi-0.2.8/src/http.rs b/vendor/winapi-0.2.8/src/http.rs
deleted file mode 100644
index b0020f9cab..0000000000
--- a/vendor/winapi-0.2.8/src/http.rs
+++ /dev/null
@@ -1,828 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! HTTP API specification
-pub const HTTP_INITIALIZE_SERVER: ::ULONG = 0x00000001;
-pub const HTTP_INITIALIZE_CONFIG: ::ULONG = 0x00000002;
-pub const HTTP_DEMAND_CBT: ::ULONG = 0x00000004;
-ENUM!{enum HTTP_SERVER_PROPERTY {
-    HttpServerAuthenticationProperty,
-    HttpServerLoggingProperty,
-    HttpServerQosProperty,
-    HttpServerTimeoutsProperty,
-    HttpServerQueueLengthProperty,
-    HttpServerStateProperty,
-    HttpServer503VerbosityProperty,
-    HttpServerBindingProperty,
-    HttpServerExtendedAuthenticationProperty,
-    HttpServerListenEndpointProperty,
-    HttpServerChannelBindProperty,
-    HttpServerProtectionLevelProperty,
-}}
-pub type PHTTP_SERVER_PROPERTY = *mut HTTP_SERVER_PROPERTY;
-STRUCT!{struct HTTP_PROPERTY_FLAGS {
-    BitFields: ::ULONG,
-}}
-BITFIELD!(HTTP_PROPERTY_FLAGS BitFields: ::ULONG [
-    Present set_Present[0..1],
-]);
-pub type PHTTP_PROPERTY_FLAGS = *mut HTTP_PROPERTY_FLAGS;
-ENUM!{enum HTTP_ENABLED_STATE {
-    HttpEnabledStateActive,
-    HttpEnabledStateInactive,
-}}
-pub type PHTTP_ENABLED_STATE = *mut HTTP_ENABLED_STATE;
-STRUCT!{struct HTTP_STATE_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    State: HTTP_ENABLED_STATE,
-}}
-pub type PHTTP_STATE_INFO = *mut HTTP_STATE_INFO;
-ENUM!{enum HTTP_503_RESPONSE_VERBOSITY {
-    Http503ResponseVerbosityBasic,
-    Http503ResponseVerbosityLimited,
-    Http503ResponseVerbosityFull,
-}}
-pub type PHTTP_503_RESPONSE_VERBOSITY = *mut HTTP_503_RESPONSE_VERBOSITY;
-ENUM!{enum HTTP_QOS_SETTING_TYPE {
-    HttpQosSettingTypeBandwidth,
-    HttpQosSettingTypeConnectionLimit,
-    HttpQosSettingTypeFlowRate,
-}}
-pub type PHTTP_QOS_SETTING_TYPE = *mut HTTP_QOS_SETTING_TYPE;
-STRUCT!{struct HTTP_QOS_SETTING_INFO {
-    QosType: HTTP_QOS_SETTING_TYPE,
-    QosSetting: ::PVOID,
-}}
-pub type PHTTP_QOS_SETTING_INFO = *mut HTTP_QOS_SETTING_INFO;
-STRUCT!{struct HTTP_CONNECTION_LIMIT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    MaxConnections: ::ULONG,
-}}
-pub type PHTTP_CONNECTION_LIMIT_INFO = *mut HTTP_CONNECTION_LIMIT_INFO;
-STRUCT!{struct HTTP_BANDWIDTH_LIMIT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    MaxBandwidth: ::ULONG,
-}}
-pub type PHTTP_BANDWIDTH_LIMIT_INFO = *mut HTTP_BANDWIDTH_LIMIT_INFO;
-STRUCT!{struct HTTP_FLOWRATE_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    MaxBandwidth: ::ULONG,
-    MaxPeakBandwidth: ::ULONG,
-    BurstSize: ::ULONG,
-}}
-pub type PHTTP_FLOWRATE_INFO = *mut HTTP_FLOWRATE_INFO;
-pub const HTTP_MIN_ALLOWED_BANDWIDTH_THROTTLING_RATE: ::ULONG = 1024;
-pub const HTTP_LIMIT_INFINITE: ::ULONG = !0;
-ENUM!{enum HTTP_SERVICE_CONFIG_TIMEOUT_KEY {
-    IdleConnectionTimeout = 0,
-    HeaderWaitTimeout,
-}}
-pub type PHTTP_SERVICE_CONFIG_TIMEOUT_KEY = *mut HTTP_SERVICE_CONFIG_TIMEOUT_KEY;
-pub type HTTP_SERVICE_CONFIG_TIMEOUT_PARAM = ::USHORT;
-pub type PHTTP_SERVICE_CONFIG_TIMEOUT_PARAM = *mut ::USHORT;
-STRUCT!{struct HTTP_SERVICE_CONFIG_TIMEOUT_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_TIMEOUT_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_TIMEOUT_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_TIMEOUT_SET = *mut HTTP_SERVICE_CONFIG_TIMEOUT_SET;
-STRUCT!{struct HTTP_TIMEOUT_LIMIT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    EntityBody: ::USHORT,
-    DrainEntityBody: ::USHORT,
-    RequestQueue: ::USHORT,
-    IdleConnection: ::USHORT,
-    HeaderWait: ::USHORT,
-    MinSendRate: ::ULONG,
-}}
-pub type PHTTP_TIMEOUT_LIMIT_INFO = *mut HTTP_TIMEOUT_LIMIT_INFO;
-STRUCT!{struct HTTP_LISTEN_ENDPOINT_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    EnableSharing: ::BOOLEAN,
-}}
-pub type PHTTP_LISTEN_ENDPOINT_INFO = *mut HTTP_LISTEN_ENDPOINT_INFO;
-STRUCT!{struct HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS {
-    DomainNameLength: ::USHORT,
-    DomainName: ::PWSTR,
-    RealmLength: ::USHORT,
-    Realm: ::PWSTR,
-}}
-pub type PHTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS = *mut HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS;
-STRUCT!{struct HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS {
-    RealmLength: ::USHORT,
-    Realm: ::PWSTR,
-}}
-pub type PHTTP_SERVER_AUTHENTICATION_BASIC_PARAMS = *mut HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS;
-pub const HTTP_AUTH_ENABLE_BASIC: ::ULONG = 0x00000001;
-pub const HTTP_AUTH_ENABLE_DIGEST: ::ULONG = 0x00000002;
-pub const HTTP_AUTH_ENABLE_NTLM: ::ULONG = 0x00000004;
-pub const HTTP_AUTH_ENABLE_NEGOTIATE: ::ULONG = 0x00000008;
-pub const HTTP_AUTH_ENABLE_KERBEROS: ::ULONG = 0x00000010;
-pub const HTTP_AUTH_ENABLE_ALL: ::ULONG =  HTTP_AUTH_ENABLE_BASIC | HTTP_AUTH_ENABLE_DIGEST |
-    HTTP_AUTH_ENABLE_NTLM | HTTP_AUTH_ENABLE_NEGOTIATE | HTTP_AUTH_ENABLE_KERBEROS;
-pub const HTTP_AUTH_EX_FLAG_ENABLE_KERBEROS_CREDENTIAL_CACHING: ::UCHAR = 0x01;
-pub const HTTP_AUTH_EX_FLAG_CAPTURE_CREDENTIAL: ::UCHAR = 0x02;
-STRUCT!{struct HTTP_SERVER_AUTHENTICATION_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    AuthSchemes: ::ULONG,
-    ReceiveMutualAuth: ::BOOLEAN,
-    ReceiveContextHandle: ::BOOLEAN,
-    DisableNTLMCredentialCaching: ::BOOLEAN,
-    ExFlags: ::UCHAR,
-    DigestParams: HTTP_SERVER_AUTHENTICATION_DIGEST_PARAMS,
-    BasicParams: HTTP_SERVER_AUTHENTICATION_BASIC_PARAMS,
-}}
-pub type PHTTP_SERVER_AUTHENTICATION_INFO = *mut HTTP_SERVER_AUTHENTICATION_INFO;
-ENUM!{enum HTTP_SERVICE_BINDING_TYPE {
-    HttpServiceBindingTypeNone = 0,
-    HttpServiceBindingTypeW,
-    HttpServiceBindingTypeA,
-}}
-STRUCT!{struct HTTP_SERVICE_BINDING_BASE {
-    Type: HTTP_SERVICE_BINDING_TYPE,
-}}
-pub type PHTTP_SERVICE_BINDING_BASE = *mut HTTP_SERVICE_BINDING_BASE;
-STRUCT!{struct HTTP_SERVICE_BINDING_A {
-    Base: HTTP_SERVICE_BINDING_BASE,
-    Buffer: ::PCHAR,
-    BufferSize: ::ULONG,
-}}
-pub type PHTTP_SERVICE_BINDING_A = *mut HTTP_SERVICE_BINDING_A;
-STRUCT!{struct HTTP_SERVICE_BINDING_W {
-    Base: HTTP_SERVICE_BINDING_BASE,
-    Buffer: ::PWCHAR,
-    BufferSize: ::ULONG,
-}}
-pub type PHTTP_SERVICE_BINDING_W = *mut HTTP_SERVICE_BINDING_W;
-ENUM!{enum HTTP_AUTHENTICATION_HARDENING_LEVELS {
-    HttpAuthenticationHardeningLegacy = 0,
-    HttpAuthenticationHardeningMedium,
-    HttpAuthenticationHardeningStrict,
-}}
-pub const HTTP_CHANNEL_BIND_PROXY: ::ULONG = 0x1;
-pub const HTTP_CHANNEL_BIND_PROXY_COHOSTING: ::ULONG = 0x20;
-pub const HTTP_CHANNEL_BIND_NO_SERVICE_NAME_CHECK: ::ULONG = 0x2;
-pub const HTTP_CHANNEL_BIND_DOTLESS_SERVICE: ::ULONG = 0x4;
-pub const HTTP_CHANNEL_BIND_SECURE_CHANNEL_TOKEN: ::ULONG = 0x8;
-pub const HTTP_CHANNEL_BIND_CLIENT_SERVICE: ::ULONG = 0x10;
-STRUCT!{struct HTTP_CHANNEL_BIND_INFO {
-    Hardening: HTTP_AUTHENTICATION_HARDENING_LEVELS,
-    Flags: ::ULONG,
-    ServiceNames: *mut PHTTP_SERVICE_BINDING_BASE,
-    NumberOfServiceNames: ::ULONG,
-}}
-pub type PHTTP_CHANNEL_BIND_INFO = *mut HTTP_CHANNEL_BIND_INFO;
-STRUCT!{struct HTTP_REQUEST_CHANNEL_BIND_STATUS {
-    ServiceName: PHTTP_SERVICE_BINDING_BASE,
-    ChannelToken: ::PUCHAR,
-    ChannelTokenSize: ::ULONG,
-    Flags: ::ULONG,
-}}
-pub type PHTTP_REQUEST_CHANNEL_BIND_STATUS = *mut HTTP_REQUEST_CHANNEL_BIND_STATUS;
-pub const HTTP_LOG_FIELD_DATE: ::ULONG = 0x00000001;
-pub const HTTP_LOG_FIELD_TIME: ::ULONG = 0x00000002;
-pub const HTTP_LOG_FIELD_CLIENT_IP: ::ULONG = 0x00000004;
-pub const HTTP_LOG_FIELD_USER_NAME: ::ULONG = 0x00000008;
-pub const HTTP_LOG_FIELD_SITE_NAME: ::ULONG = 0x00000010;
-pub const HTTP_LOG_FIELD_COMPUTER_NAME: ::ULONG = 0x00000020;
-pub const HTTP_LOG_FIELD_SERVER_IP: ::ULONG = 0x00000040;
-pub const HTTP_LOG_FIELD_METHOD: ::ULONG = 0x00000080;
-pub const HTTP_LOG_FIELD_URI_STEM: ::ULONG = 0x00000100;
-pub const HTTP_LOG_FIELD_URI_QUERY: ::ULONG = 0x00000200;
-pub const HTTP_LOG_FIELD_STATUS: ::ULONG = 0x00000400;
-pub const HTTP_LOG_FIELD_WIN32_STATUS: ::ULONG = 0x00000800;
-pub const HTTP_LOG_FIELD_BYTES_SENT: ::ULONG = 0x00001000;
-pub const HTTP_LOG_FIELD_BYTES_RECV: ::ULONG = 0x00002000;
-pub const HTTP_LOG_FIELD_TIME_TAKEN: ::ULONG = 0x00004000;
-pub const HTTP_LOG_FIELD_SERVER_PORT: ::ULONG = 0x00008000;
-pub const HTTP_LOG_FIELD_USER_AGENT: ::ULONG = 0x00010000;
-pub const HTTP_LOG_FIELD_COOKIE: ::ULONG = 0x00020000;
-pub const HTTP_LOG_FIELD_REFERER: ::ULONG = 0x00040000;
-pub const HTTP_LOG_FIELD_VERSION: ::ULONG = 0x00080000;
-pub const HTTP_LOG_FIELD_HOST: ::ULONG = 0x00100000;
-pub const HTTP_LOG_FIELD_SUB_STATUS: ::ULONG = 0x00200000;
-pub const HTTP_LOG_FIELD_CLIENT_PORT: ::ULONG = 0x00400000;
-pub const HTTP_LOG_FIELD_URI: ::ULONG = 0x00800000;
-pub const HTTP_LOG_FIELD_SITE_ID: ::ULONG = 0x01000000;
-pub const HTTP_LOG_FIELD_REASON: ::ULONG = 0x02000000;
-pub const HTTP_LOG_FIELD_QUEUE_NAME: ::ULONG = 0x04000000;
-ENUM!{enum HTTP_LOGGING_TYPE {
-    HttpLoggingTypeW3C,
-    HttpLoggingTypeIIS,
-    HttpLoggingTypeNCSA,
-    HttpLoggingTypeRaw,
-}}
-ENUM!{enum HTTP_LOGGING_ROLLOVER_TYPE {
-    HttpLoggingRolloverSize,
-    HttpLoggingRolloverDaily,
-    HttpLoggingRolloverWeekly,
-    HttpLoggingRolloverMonthly,
-    HttpLoggingRolloverHourly,
-}}
-pub const HTTP_MIN_ALLOWED_LOG_FILE_ROLLOVER_SIZE: ::ULONG = (1 * 1024 * 1024) as ::ULONG;
-pub const HTTP_LOGGING_FLAG_LOCAL_TIME_ROLLOVER: ::ULONG = 0x00000001;
-pub const HTTP_LOGGING_FLAG_USE_UTF8_CONVERSION: ::ULONG = 0x00000002;
-pub const HTTP_LOGGING_FLAG_LOG_ERRORS_ONLY: ::ULONG = 0x00000004;
-pub const HTTP_LOGGING_FLAG_LOG_SUCCESS_ONLY: ::ULONG = 0x00000008;
-STRUCT!{struct HTTP_LOGGING_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    LoggingFlags: ::ULONG,
-    SoftwareName: ::PCWSTR,
-    SoftwareNameLength: ::USHORT,
-    DirectoryNameLength: ::USHORT,
-    DirectoryName: ::PCWSTR,
-    Format: HTTP_LOGGING_TYPE,
-    Fields: ::ULONG,
-    pExtFields: ::PVOID,
-    NumOfExtFields: ::USHORT,
-    MaxRecordSize: ::USHORT,
-    RolloverType: HTTP_LOGGING_ROLLOVER_TYPE,
-    RolloverSize: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-}}
-pub type PHTTP_LOGGING_INFO = *mut HTTP_LOGGING_INFO;
-STRUCT!{struct HTTP_BINDING_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    RequestQueueHandle: ::HANDLE,
-}}
-pub type PHTTP_BINDING_INFO = *mut HTTP_BINDING_INFO;
-ENUM!{enum HTTP_PROTECTION_LEVEL_TYPE {
-    HttpProtectionLevelUnrestricted,
-    HttpProtectionLevelEdgeRestricted,
-    HttpProtectionLevelRestricted,
-}}
-pub type PHTTP_PROTECTION_LEVEL_TYPE = *mut HTTP_PROTECTION_LEVEL_TYPE;
-STRUCT!{struct HTTP_PROTECTION_LEVEL_INFO {
-    Flags: HTTP_PROPERTY_FLAGS,
-    Level: HTTP_PROTECTION_LEVEL_TYPE,
-}}
-pub type PHTTP_PROTECTION_LEVEL_INFO = *mut HTTP_PROTECTION_LEVEL_INFO;
-pub const HTTP_CREATE_REQUEST_QUEUE_FLAG_OPEN_EXISTING: ::ULONG = 0x00000001;
-pub const HTTP_CREATE_REQUEST_QUEUE_FLAG_CONTROLLER: ::ULONG = 0x00000002;
-pub const HTTP_RECEIVE_REQUEST_FLAG_COPY_BODY: ::ULONG = 0x00000001;
-pub const HTTP_RECEIVE_REQUEST_FLAG_FLUSH_BODY: ::ULONG = 0x00000002;
-pub const HTTP_RECEIVE_REQUEST_ENTITY_BODY_FLAG_FILL_BUFFER: ::ULONG = 0x00000001;
-pub const HTTP_SEND_RESPONSE_FLAG_DISCONNECT: ::ULONG = 0x00000001;
-pub const HTTP_SEND_RESPONSE_FLAG_MORE_DATA: ::ULONG = 0x00000002;
-pub const HTTP_SEND_RESPONSE_FLAG_BUFFER_DATA: ::ULONG = 0x00000004;
-pub const HTTP_SEND_RESPONSE_FLAG_ENABLE_NAGLING: ::ULONG = 0x00000008;
-pub const HTTP_SEND_RESPONSE_FLAG_PROCESS_RANGES: ::ULONG = 0x00000020;
-pub const HTTP_SEND_RESPONSE_FLAG_OPAQUE: ::ULONG = 0x00000040;
-pub const HTTP_FLUSH_RESPONSE_FLAG_RECURSIVE: ::ULONG = 0x00000001;
-pub type HTTP_OPAQUE_ID = ::ULONGLONG;
-pub type PHTTP_OPAQUE_ID = *mut ::ULONGLONG;
-pub type HTTP_REQUEST_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_REQUEST_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_CONNECTION_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_CONNECTION_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_RAW_CONNECTION_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_RAW_CONNECTION_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_URL_GROUP_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_URL_GROUP_ID = *mut HTTP_OPAQUE_ID;
-pub type HTTP_SERVER_SESSION_ID = HTTP_OPAQUE_ID;
-pub type PHTTP_SERVER_SESSION_ID = *mut HTTP_OPAQUE_ID;
-pub const HTTP_BYTE_RANGE_TO_EOF: ::ULONGLONG = !0;
-STRUCT!{struct HTTP_BYTE_RANGE {
-    StartingOffset: ::ULARGE_INTEGER,
-    Length: ::ULARGE_INTEGER,
-}}
-pub type PHTTP_BYTE_RANGE = *mut HTTP_BYTE_RANGE;
-STRUCT!{struct HTTP_VERSION {
-    MajorVersion: ::USHORT,
-    MinorVersion: ::USHORT,
-}}
-pub type PHTTP_VERSION = *mut HTTP_VERSION;
-pub const HTTP_VERSION_UNKNOWN: HTTP_VERSION = HTTP_VERSION { MajorVersion: 0, MinorVersion: 0 };
-pub const HTTP_VERSION_0_9: HTTP_VERSION = HTTP_VERSION { MajorVersion: 0, MinorVersion: 9 };
-pub const HTTP_VERSION_1_0: HTTP_VERSION = HTTP_VERSION { MajorVersion: 1, MinorVersion: 0 };
-pub const HTTP_VERSION_1_1: HTTP_VERSION = HTTP_VERSION { MajorVersion: 1, MinorVersion: 1 };
-#[inline] #[allow(dead_code)]
-pub fn HTTP_SET_VERSION(mut version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) {
-    version.MajorVersion = major;
-    version.MinorVersion = minor;
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.MajorVersion == major && version.MinorVersion == minor
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_GREATER_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.MajorVersion > major || (version.MajorVersion == major && version.MinorVersion > minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_LESS_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.MajorVersion < major || (version.MajorVersion == major && version.MinorVersion < minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_NOT_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    !HTTP_EQUAL_VERSION(version, major, minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_GREATER_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    !HTTP_LESS_VERSION(version, major, minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTP_LESS_EQUAL_VERSION(version: HTTP_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    !HTTP_GREATER_VERSION(version, major, minor)
-}
-ENUM!{enum HTTP_VERB {
-    HttpVerbUnparsed,
-    HttpVerbUnknown,
-    HttpVerbInvalid,
-    HttpVerbOPTIONS,
-    HttpVerbGET,
-    HttpVerbHEAD,
-    HttpVerbPOST,
-    HttpVerbPUT,
-    HttpVerbDELETE,
-    HttpVerbTRACE,
-    HttpVerbCONNECT,
-    HttpVerbTRACK,
-    HttpVerbMOVE,
-    HttpVerbCOPY,
-    HttpVerbPROPFIND,
-    HttpVerbPROPPATCH,
-    HttpVerbMKCOL,
-    HttpVerbLOCK,
-    HttpVerbUNLOCK,
-    HttpVerbSEARCH,
-    HttpVerbMaximum,
-}}
-pub type PHTTP_VERB = *mut HTTP_VERB;
-ENUM!{enum HTTP_HEADER_ID {
-    HttpHeaderCacheControl = 0,
-    HttpHeaderConnection = 1,
-    HttpHeaderDate = 2,
-    HttpHeaderKeepAlive = 3,
-    HttpHeaderPragma = 4,
-    HttpHeaderTrailer = 5,
-    HttpHeaderTransferEncoding = 6,
-    HttpHeaderUpgrade = 7,
-    HttpHeaderVia = 8,
-    HttpHeaderWarning = 9,
-    HttpHeaderAllow = 10,
-    HttpHeaderContentLength = 11,
-    HttpHeaderContentType = 12,
-    HttpHeaderContentEncoding = 13,
-    HttpHeaderContentLanguage = 14,
-    HttpHeaderContentLocation = 15,
-    HttpHeaderContentMd5 = 16,
-    HttpHeaderContentRange = 17,
-    HttpHeaderExpires = 18,
-    HttpHeaderLastModified = 19,
-    HttpHeaderAccept = 20,
-    HttpHeaderAcceptCharset = 21,
-    HttpHeaderAcceptEncoding = 22,
-    HttpHeaderAcceptLanguage = 23,
-    HttpHeaderAuthorization = 24,
-    HttpHeaderCookie = 25,
-    HttpHeaderExpect = 26,
-    HttpHeaderFrom = 27,
-    HttpHeaderHost = 28,
-    HttpHeaderIfMatch = 29,
-    HttpHeaderIfModifiedSince = 30,
-    HttpHeaderIfNoneMatch = 31,
-    HttpHeaderIfRange = 32,
-    HttpHeaderIfUnmodifiedSince = 33,
-    HttpHeaderMaxForwards = 34,
-    HttpHeaderProxyAuthorization = 35,
-    HttpHeaderReferer = 36,
-    HttpHeaderRange = 37,
-    HttpHeaderTe = 38,
-    HttpHeaderTranslate = 39,
-    HttpHeaderUserAgent = 40,
-    HttpHeaderRequestMaximum = 41,
-    HttpHeaderAcceptRanges = 20,
-    HttpHeaderAge = 21,
-    HttpHeaderEtag = 22,
-    HttpHeaderLocation = 23,
-    HttpHeaderProxyAuthenticate = 24,
-    HttpHeaderRetryAfter = 25,
-    HttpHeaderServer = 26,
-    HttpHeaderSetCookie = 27,
-    HttpHeaderVary = 28,
-    HttpHeaderWwwAuthenticate = 29,
-    HttpHeaderResponseMaximum = 30,
-    HttpHeaderMaximum = 41,
-}}
-pub type PHTTP_HEADER_ID = *mut HTTP_HEADER_ID;
-STRUCT!{struct HTTP_KNOWN_HEADER {
-    RawValueLength: ::USHORT,
-    pRawValue: ::PCSTR,
-}}
-pub type PHTTP_KNOWN_HEADER = *mut HTTP_KNOWN_HEADER;
-STRUCT!{struct HTTP_UNKNOWN_HEADER {
-    NameLength: ::USHORT,
-    RawValueLength: ::USHORT,
-    pName: ::PCSTR,
-    pRawValue: ::PCSTR,
-}}
-pub type PHTTP_UNKNOWN_HEADER = *mut HTTP_UNKNOWN_HEADER;
-ENUM!{enum HTTP_LOG_DATA_TYPE {
-    HttpLogDataTypeFields = 0,
-}}
-pub type PHTTP_LOG_DATA_TYPE = *mut HTTP_LOG_DATA_TYPE;
-STRUCT!{struct HTTP_LOG_DATA {
-    Type: HTTP_LOG_DATA_TYPE,
-}}
-pub type PHTTP_LOG_DATA = *mut HTTP_LOG_DATA;
-STRUCT!{struct HTTP_LOG_FIELDS_DATA {
-    Base: HTTP_LOG_DATA,
-    UserNameLength: ::USHORT,
-    UriStemLength: ::USHORT,
-    ClientIpLength: ::USHORT,
-    ServerNameLength: ::USHORT,
-    ServiceNameLength: ::USHORT,
-    ServerIpLength: ::USHORT,
-    MethodLength: ::USHORT,
-    UriQueryLength: ::USHORT,
-    HostLength: ::USHORT,
-    UserAgentLength: ::USHORT,
-    CookieLength: ::USHORT,
-    ReferrerLength: ::USHORT,
-    UserName: ::PWCHAR,
-    UriStem: ::PWCHAR,
-    ClientIp: ::PCHAR,
-    ServerName: ::PCHAR,
-    ServiceName: ::PCHAR,
-    ServerIp: ::PCHAR,
-    Method: ::PCHAR,
-    UriQuery: ::PCHAR,
-    Host: ::PCHAR,
-    UserAgent: ::PCHAR,
-    Cookie: ::PCHAR,
-    Referrer: ::PCHAR,
-    ServerPort: ::USHORT,
-    ProtocolStatus: ::USHORT,
-    Win32Status: ::ULONG,
-    MethodNum: HTTP_VERB,
-    SubStatus: ::USHORT,
-}}
-pub type PHTTP_LOG_FIELDS_DATA = *mut HTTP_LOG_FIELDS_DATA;
-ENUM!{enum HTTP_DATA_CHUNK_TYPE {
-    HttpDataChunkFromMemory,
-    HttpDataChunkFromFileHandle,
-    HttpDataChunkFromFragmentCache,
-    HttpDataChunkFromFragmentCacheEx,
-    HttpDataChunkMaximum,
-}}
-pub type PHTTP_DATA_CHUNK_TYPE = *mut HTTP_DATA_CHUNK_TYPE;
-STRUCT!{struct HTTP_DATA_CHUNK_FromMemory {
-    pBuffer: ::PVOID,
-    BufferLength: ::ULONG,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK_FromFileHandle {
-    ByteRange: HTTP_BYTE_RANGE,
-    FileHandle: ::HANDLE,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK_FromFragmentCache {
-    FragmentNameLength: ::USHORT,
-    pFragmentName: ::PCWSTR,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK_FromFragmentCacheEx {
-    ByteRange: HTTP_BYTE_RANGE,
-    pFragmentName: ::PCWSTR,
-}}
-STRUCT!{struct HTTP_DATA_CHUNK {
-    DataChunkType: HTTP_DATA_CHUNK_TYPE,
-    FromFileHandle: HTTP_DATA_CHUNK_FromFileHandle,
-}}
-UNION!(HTTP_DATA_CHUNK, FromFileHandle, FromMemory, FromMemory_mut, HTTP_DATA_CHUNK_FromMemory);
-UNION!(
-    HTTP_DATA_CHUNK, FromFileHandle, FromFragmentCache, FromFragmentCache_mut,
-    HTTP_DATA_CHUNK_FromFragmentCache
-);
-UNION!(
-    HTTP_DATA_CHUNK, FromFileHandle, FromFragmentCacheEx, FromFragmentCacheEx_mut,
-    HTTP_DATA_CHUNK_FromFragmentCacheEx
-);
-pub type PHTTP_DATA_CHUNK = *mut HTTP_DATA_CHUNK;
-STRUCT!{nodebug struct HTTP_REQUEST_HEADERS {
-    UnknownHeaderCount: ::USHORT,
-    pUnknownHeaders: PHTTP_UNKNOWN_HEADER,
-    TrailerCount: ::USHORT,
-    pTrailers: PHTTP_UNKNOWN_HEADER,
-    KnownHeaders: [HTTP_KNOWN_HEADER; 41], // FIXME HttpHeaderRequestMaximum
-}}
-pub type PHTTP_REQUEST_HEADERS = *mut HTTP_REQUEST_HEADERS;
-STRUCT!{nodebug struct HTTP_RESPONSE_HEADERS {
-    UnknownHeaderCount: ::USHORT,
-    pUnknownHeaders: PHTTP_UNKNOWN_HEADER,
-    TrailerCount: ::USHORT,
-    pTrailers: PHTTP_UNKNOWN_HEADER,
-    KnownHeaders: [HTTP_KNOWN_HEADER; 30], // FIXME HttpHeaderResponseMaximum
-}}
-pub type PHTTP_RESPONSE_HEADERS = *mut HTTP_RESPONSE_HEADERS;
-STRUCT!{struct HTTP_TRANSPORT_ADDRESS {
-    pRemoteAddress: ::PSOCKADDR,
-    pLocalAddress: ::PSOCKADDR,
-}}
-pub type PHTTP_TRANSPORT_ADDRESS = *mut HTTP_TRANSPORT_ADDRESS;
-STRUCT!{struct HTTP_COOKED_URL {
-    FullUrlLength: ::USHORT,
-    HostLength: ::USHORT,
-    AbsPathLength: ::USHORT,
-    QueryStringLength: ::USHORT,
-    pFullUrl: ::PCWSTR,
-    pHost: ::PCWSTR,
-    pAbsPath: ::PCWSTR,
-    pQueryString: ::PCWSTR,
-}}
-pub type PHTTP_COOKED_URL = *mut HTTP_COOKED_URL;
-pub type HTTP_URL_CONTEXT = ::ULONGLONG;
-pub const HTTP_URL_FLAG_REMOVE_ALL: ::ULONG = 0x00000001;
-ENUM!{enum HTTP_AUTH_STATUS {
-    HttpAuthStatusSuccess,
-    HttpAuthStatusNotAuthenticated,
-    HttpAuthStatusFailure,
-}}
-pub type PHTTP_AUTH_STATUS = *mut HTTP_AUTH_STATUS;
-ENUM!{enum HTTP_REQUEST_AUTH_TYPE {
-    HttpRequestAuthTypeNone = 0,
-    HttpRequestAuthTypeBasic,
-    HttpRequestAuthTypeDigest,
-    HttpRequestAuthTypeNTLM,
-    HttpRequestAuthTypeNegotiate,
-    HttpRequestAuthTypeKerberos,
-}}
-pub type PHTTP_REQUEST_AUTH_TYPE = *mut HTTP_REQUEST_AUTH_TYPE;
-STRUCT!{struct HTTP_SSL_CLIENT_CERT_INFO {
-    CertFlags: ::ULONG,
-    CertEncodedSize: ::ULONG,
-    pCertEncoded: ::PUCHAR,
-    Token: ::HANDLE,
-    CertDeniedByMapper: ::BOOLEAN,
-}}
-pub type PHTTP_SSL_CLIENT_CERT_INFO = *mut HTTP_SSL_CLIENT_CERT_INFO;
-pub const HTTP_RECEIVE_SECURE_CHANNEL_TOKEN: ::ULONG = 0x1;
-STRUCT!{struct HTTP_SSL_INFO {
-    ServerCertKeySize: ::USHORT,
-    ConnectionKeySize: ::USHORT,
-    ServerCertIssuerSize: ::ULONG,
-    ServerCertSubjectSize: ::ULONG,
-    pServerCertIssuer: ::PCSTR,
-    pServerCertSubject: ::PCSTR,
-    pClientCertInfo: PHTTP_SSL_CLIENT_CERT_INFO,
-    SslClientCertNegotiated: ::ULONG,
-}}
-pub type PHTTP_SSL_INFO = *mut HTTP_SSL_INFO;
-ENUM!{enum HTTP_REQUEST_INFO_TYPE {
-    HttpRequestInfoTypeAuth,
-    HttpRequestInfoTypeChannelBind,
-}}
-STRUCT!{struct HTTP_REQUEST_INFO {
-    InfoType: HTTP_REQUEST_INFO_TYPE,
-    InfoLength: ::ULONG,
-    pInfo: ::PVOID,
-}}
-pub type PHTTP_REQUEST_INFO = *mut HTTP_REQUEST_INFO;
-pub const HTTP_REQUEST_AUTH_FLAG_TOKEN_FOR_CACHED_CRED: ::ULONG = 0x00000001;
-STRUCT!{struct HTTP_REQUEST_AUTH_INFO {
-    AuthStatus: HTTP_AUTH_STATUS,
-    SecStatus: ::SECURITY_STATUS,
-    Flags: ::ULONG,
-    AuthType: HTTP_REQUEST_AUTH_TYPE,
-    AccessToken: ::HANDLE,
-    ContextAttributes: ::ULONG,
-    PackedContextLength: ::ULONG,
-    PackedContextType: ::ULONG,
-    PackedContext: ::PVOID,
-    MutualAuthDataLength: ::ULONG,
-    pMutualAuthData: ::PCHAR,
-    PackageNameLength: ::USHORT,
-    pPackageName: ::PWSTR,
-}}
-pub type PHTTP_REQUEST_AUTH_INFO = *mut HTTP_REQUEST_AUTH_INFO;
-STRUCT!{nodebug struct HTTP_REQUEST_V1 {
-    Flags: ::ULONG,
-    ConnectionId: HTTP_CONNECTION_ID,
-    RequestId: HTTP_REQUEST_ID,
-    UrlContext: HTTP_URL_CONTEXT,
-    Version: HTTP_VERSION,
-    Verb: HTTP_VERB,
-    UnknownVerbLength: ::USHORT,
-    RawUrlLength: ::USHORT,
-    pUnknownVerb: ::PCSTR,
-    pRawUrl: ::PCSTR,
-    CookedUrl: HTTP_COOKED_URL,
-    Address: HTTP_TRANSPORT_ADDRESS,
-    Headers: HTTP_REQUEST_HEADERS,
-    BytesReceived: ::ULONGLONG,
-    EntityChunkCount: ::USHORT,
-    pEntityChunks: PHTTP_DATA_CHUNK,
-    RawConnectionId: HTTP_RAW_CONNECTION_ID,
-    pSslInfo: PHTTP_SSL_INFO,
-}}
-pub type PHTTP_REQUEST_V1 = *mut HTTP_REQUEST_V1;
-STRUCT!{nodebug struct HTTP_REQUEST_V2 {
-    Base: HTTP_REQUEST_V1,
-    RequestInfoCount: ::USHORT,
-    pRequestInfo: PHTTP_REQUEST_INFO,
-}}
-pub type PHTTP_REQUEST_V2 = *mut HTTP_REQUEST_V2;
-pub type HTTP_REQUEST = HTTP_REQUEST_V2;
-pub type PHTTP_REQUEST = *mut HTTP_REQUEST;
-pub const HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS: ::ULONG = 0x00000001;
-pub const HTTP_REQUEST_FLAG_IP_ROUTED: ::ULONG = 0x00000002;
-STRUCT!{nodebug struct HTTP_RESPONSE_V1 {
-    Flags: ::ULONG,
-    Version: HTTP_VERSION,
-    StatusCode: ::USHORT,
-    ReasonLength: ::USHORT,
-    pReason: ::PCSTR,
-    Headers: HTTP_RESPONSE_HEADERS,
-    EntityChunkCount: ::USHORT,
-    pEntityChunks: PHTTP_DATA_CHUNK,
-}}
-pub type PHTTP_RESPONSE_V1 = *mut HTTP_RESPONSE_V1;
-pub const HTTP_RESPONSE_FLAG_MULTIPLE_ENCODINGS_AVAILABLE: ::ULONG = 0x00000001;
-ENUM!{enum HTTP_RESPONSE_INFO_TYPE {
-    HttpResponseInfoTypeMultipleKnownHeaders,
-    HttpResponseInfoTypeAuthenticationProperty,
-    HttpResponseInfoTypeQoSProperty,
-    HttpResponseInfoTypeChannelBind,
-}}
-pub type PHTTP_RESPONSE_INFO_TYPE = *mut HTTP_RESPONSE_INFO_TYPE;
-STRUCT!{struct HTTP_RESPONSE_INFO {
-    Type: HTTP_RESPONSE_INFO_TYPE,
-    Length: ::ULONG,
-    pInfo: ::PVOID,
-}}
-pub type PHTTP_RESPONSE_INFO = *mut HTTP_RESPONSE_INFO;
-pub const HTTP_RESPONSE_INFO_FLAGS_PRESERVE_ORDER: ::ULONG = 0x00000001;
-STRUCT!{struct HTTP_MULTIPLE_KNOWN_HEADERS {
-    HeaderId: HTTP_HEADER_ID,
-    Flags: ::ULONG,
-    KnownHeaderCount: ::USHORT,
-    KnownHeaders: PHTTP_KNOWN_HEADER,
-}}
-pub type PHTTP_MULTIPLE_KNOWN_HEADERS = *mut HTTP_MULTIPLE_KNOWN_HEADERS;
-STRUCT!{nodebug struct HTTP_RESPONSE_V2 {
-    Base: HTTP_RESPONSE_V1,
-    ResponseInfoCount: ::USHORT,
-    pResponseInfo: PHTTP_RESPONSE_INFO,
-}}
-pub type PHTTP_RESPONSE_V2 = *mut HTTP_RESPONSE_V2;
-pub type HTTP_RESPONSE = HTTP_RESPONSE_V2;
-pub type PHTTP_RESPONSE = *mut HTTP_RESPONSE;
-STRUCT!{struct HTTPAPI_VERSION {
-    HttpApiMajorVersion: ::USHORT,
-    HttpApiMinorVersion: ::USHORT,
-}}
-pub type PHTTPAPI_VERSION = *mut HTTPAPI_VERSION;
-pub const HTTPAPI_VERSION_2: HTTPAPI_VERSION = HTTPAPI_VERSION {
-    HttpApiMajorVersion: 2, HttpApiMinorVersion: 0,
-};
-pub const HTTPAPI_VERSION_1: HTTPAPI_VERSION = HTTPAPI_VERSION {
-    HttpApiMajorVersion: 1, HttpApiMinorVersion: 0,
-};
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_EQUAL_VERSION(version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.HttpApiMajorVersion == major && version.HttpApiMinorVersion == minor
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_GREATER_VERSION(version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.HttpApiMajorVersion > major ||
-    (version.HttpApiMajorVersion == major && version.HttpApiMinorVersion > minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_LESS_VERSION(version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT) -> bool {
-    version.HttpApiMajorVersion < major ||
-    (version.HttpApiMajorVersion == major && version.HttpApiMinorVersion < minor)
-}
-#[inline] #[allow(dead_code)]
-pub fn HTTPAPI_VERSION_GREATER_OR_EQUAL(
-    version: HTTPAPI_VERSION, major: ::USHORT, minor: ::USHORT
-) -> bool {
-    !HTTPAPI_LESS_VERSION(version, major, minor)
-}
-ENUM!{enum HTTP_CACHE_POLICY_TYPE {
-    HttpCachePolicyNocache,
-    HttpCachePolicyUserInvalidates,
-    HttpCachePolicyTimeToLive,
-    HttpCachePolicyMaximum,
-}}
-pub type PHTTP_CACHE_POLICY_TYPE = *mut HTTP_CACHE_POLICY_TYPE;
-STRUCT!{struct HTTP_CACHE_POLICY {
-    Policy: HTTP_CACHE_POLICY_TYPE,
-    SecondsToLive: ::ULONG,
-}}
-pub type PHTTP_CACHE_POLICY = *mut HTTP_CACHE_POLICY;
-ENUM!{enum HTTP_SERVICE_CONFIG_ID {
-    HttpServiceConfigIPListenList,
-    HttpServiceConfigSSLCertInfo,
-    HttpServiceConfigUrlAclInfo,
-    HttpServiceConfigTimeout,
-    HttpServiceConfigCache,
-    HttpServiceConfigSslSniCertInfo,
-    HttpServiceConfigSslCcsCertInfo,
-    HttpServiceConfigMax,
-}}
-pub type PHTTP_SERVICE_CONFIG_ID = *mut HTTP_SERVICE_CONFIG_ID;
-ENUM!{enum HTTP_SERVICE_CONFIG_QUERY_TYPE {
-    HttpServiceConfigQueryExact,
-    HttpServiceConfigQueryNext,
-    HttpServiceConfigQueryMax,
-}}
-pub type PHTTP_SERVICE_CONFIG_QUERY_TYPE = *mut HTTP_SERVICE_CONFIG_QUERY_TYPE;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_KEY {
-    pIpPort: ::PSOCKADDR,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_KEY = *mut HTTP_SERVICE_CONFIG_SSL_KEY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_SNI_KEY {
-    IpPort: ::SOCKADDR_STORAGE,
-    Host: ::PWSTR,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SNI_KEY = *mut HTTP_SERVICE_CONFIG_SSL_SNI_KEY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_CCS_KEY {
-    LocalAddress: ::SOCKADDR_STORAGE,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_CCS_KEY = *mut HTTP_SERVICE_CONFIG_SSL_CCS_KEY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_PARAM {
-    SslHashLength: ::ULONG,
-    pSslHash: ::PVOID,
-    AppId: ::GUID,
-    pSslCertStoreName: ::PWSTR,
-    DefaultCertCheckMode: ::DWORD,
-    DefaultRevocationFreshnessTime: ::DWORD,
-    DefaultRevocationUrlRetrievalTimeout: ::DWORD,
-    pDefaultSslCtlIdentifier: ::PWSTR,
-    pDefaultSslCtlStoreName: ::PWSTR,
-    DefaultFlags: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_PARAM = *mut HTTP_SERVICE_CONFIG_SSL_PARAM;
-pub const HTTP_SERVICE_CONFIG_SSL_FLAG_USE_DS_MAPPER: ::DWORD = 0x00000001;
-pub const HTTP_SERVICE_CONFIG_SSL_FLAG_NEGOTIATE_CLIENT_CERT: ::DWORD = 0x00000002;
-pub const HTTP_SERVICE_CONFIG_SSL_FLAG_NO_RAW_FILTER: ::DWORD = 0x00000004;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_SSL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SET = *mut HTTP_SERVICE_CONFIG_SSL_SET;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_SNI_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_SNI_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_SSL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SNI_SET = *mut HTTP_SERVICE_CONFIG_SSL_SNI_SET;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_CCS_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_CCS_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_SSL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_CCS_SET = *mut HTTP_SERVICE_CONFIG_SSL_CCS_SET;
-STRUCT!{struct HTTP_SERVICE_CONFIG_SSL_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_QUERY = *mut HTTP_SERVICE_CONFIG_SSL_QUERY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_SNI_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_SNI_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_SNI_QUERY = *mut HTTP_SERVICE_CONFIG_SSL_SNI_QUERY;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_SSL_CCS_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_SSL_CCS_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_SSL_CCS_QUERY = *mut HTTP_SERVICE_CONFIG_SSL_CCS_QUERY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_IP_LISTEN_PARAM {
-    AddrLength: ::USHORT,
-    pAddress: ::PSOCKADDR,
-}}
-pub type PHTTP_SERVICE_CONFIG_IP_LISTEN_PARAM = *mut HTTP_SERVICE_CONFIG_IP_LISTEN_PARAM;
-STRUCT!{nodebug struct HTTP_SERVICE_CONFIG_IP_LISTEN_QUERY {
-    AddrCount: ::ULONG,
-    AddrList: [::SOCKADDR_STORAGE; ::ANYSIZE_ARRAY],
-}}
-pub type PHTTP_SERVICE_CONFIG_IP_LISTEN_QUERY = *mut HTTP_SERVICE_CONFIG_IP_LISTEN_QUERY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_KEY {
-    pUrlPrefix: ::PWSTR,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_KEY = *mut HTTP_SERVICE_CONFIG_URLACL_KEY;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_PARAM {
-    pStringSecurityDescriptor: ::PWSTR,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_PARAM = *mut HTTP_SERVICE_CONFIG_URLACL_PARAM;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_URLACL_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_URLACL_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_SET = *mut HTTP_SERVICE_CONFIG_URLACL_SET;
-STRUCT!{struct HTTP_SERVICE_CONFIG_URLACL_QUERY {
-    QueryDesc: HTTP_SERVICE_CONFIG_QUERY_TYPE,
-    KeyDesc: HTTP_SERVICE_CONFIG_URLACL_KEY,
-    dwToken: ::DWORD,
-}}
-pub type PHTTP_SERVICE_CONFIG_URLACL_QUERY = *mut HTTP_SERVICE_CONFIG_URLACL_QUERY;
-ENUM!{enum HTTP_SERVICE_CONFIG_CACHE_KEY {
-    MaxCacheResponseSize = 0,
-    CacheRangeChunkSize,
-}}
-pub type PHTTP_SERVICE_CONFIG_CACHE_KEY = *mut HTTP_SERVICE_CONFIG_CACHE_KEY;
-pub type HTTP_SERVICE_CONFIG_CACHE_PARAM = ::ULONG;
-pub type PHTTP_SERVICE_CONFIG_CACHE_PARAM = *mut ::ULONG;
-STRUCT!{struct HTTP_SERVICE_CONFIG_CACHE_SET {
-    KeyDesc: HTTP_SERVICE_CONFIG_CACHE_KEY,
-    ParamDesc: HTTP_SERVICE_CONFIG_CACHE_PARAM,
-}}
-pub type PHTTP_SERVICE_CONFIG_CACHE_SET = *mut HTTP_SERVICE_CONFIG_CACHE_SET;
diff --git a/vendor/winapi-0.2.8/src/imm.rs b/vendor/winapi-0.2.8/src/imm.rs
deleted file mode 100644
index cadf6cf7ff..0000000000
--- a/vendor/winapi-0.2.8/src/imm.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type LPUINT = *mut ::c_uint;
diff --git a/vendor/winapi-0.2.8/src/inaddr.rs b/vendor/winapi-0.2.8/src/inaddr.rs
deleted file mode 100644
index f89e9babe6..0000000000
--- a/vendor/winapi-0.2.8/src/inaddr.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! IPv4 Internet address
-STRUCT!{struct in_addr_S_un_b {
-    s_b1: ::UCHAR,
-    s_b2: ::UCHAR,
-    s_b3: ::UCHAR,
-    s_b4: ::UCHAR,
-}}
-STRUCT!{struct in_addr_S_un_w {
-    s_w1: ::USHORT,
-    s_w2: ::USHORT,
-}}
-STRUCT!{struct in_addr {
-    S_un: ::ULONG,
-}}
-UNION!(in_addr, S_un, S_un_b, S_un_b_mut, in_addr_S_un_b);
-UNION!(in_addr, S_un, S_un_w, S_un_w_mut, in_addr_S_un_w);
-UNION!(in_addr, S_un, S_addr, S_addr_mut, ::ULONG);
-pub type IN_ADDR = in_addr;
-pub type PIN_ADDR = *mut in_addr;
-pub type LPIN_ADDR = *mut in_addr;
diff --git a/vendor/winapi-0.2.8/src/inspectable.rs b/vendor/winapi-0.2.8/src/inspectable.rs
deleted file mode 100644
index 36575e1e50..0000000000
--- a/vendor/winapi-0.2.8/src/inspectable.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type LPINSPECTABLE = *mut IInspectable;
-ENUM!{enum TrustLevel {
-    BaseTrust = 0,
-    PartialTrust,
-    FullTrust,
-}}
-RIDL!(
-interface IInspectable(IInspectableVtbl): IUnknown(IUnknownVtbl) {
-    fn GetIids(&mut self, iidCount: *mut ::ULONG, iids: *mut *mut ::IID) -> ::HRESULT,
-    fn GetRuntimeClassName(&mut self, className: *mut ::HSTRING) -> ::HRESULT,
-    fn GetTrustLevel(&mut self, trustLevel: *mut TrustLevel) -> ::HRESULT
-}
-);
diff --git a/vendor/winapi-0.2.8/src/ksmedia.rs b/vendor/winapi-0.2.8/src/ksmedia.rs
deleted file mode 100644
index 8ef2700716..0000000000
--- a/vendor/winapi-0.2.8/src/ksmedia.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_ANALOG, 0x6DBA3190, 0x67BD, 0x11CF,
-    0xA0, 0xF7, 0x00, 0x20, 0xAF, 0xD1, 0x56, 0xE4);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_DRM, 0x00000009, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_ALAW, 0x00000006, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_ADPCM, 0x00000002, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-DEFINE_GUID!(KSDATAFORMAT_SUBTYPE_MPEG, 0x00000050, 0x0000, 0x0010,
-    0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
diff --git a/vendor/winapi-0.2.8/src/lib.rs b/vendor/winapi-0.2.8/src/lib.rs
deleted file mode 100644
index 0e99f815a8..0000000000
--- a/vendor/winapi-0.2.8/src/lib.rs
+++ /dev/null
@@ -1,368 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Types and constants for WinAPI bindings.
-#![allow(bad_style)]
-#![warn(trivial_casts, trivial_numeric_casts)]
-#![warn(unused_qualifications, unused)]
-#![cfg(windows)]
-//-------------------------------------------------------------------------------------------------
-// Imports
-//-------------------------------------------------------------------------------------------------
-pub use std::os::raw::{
-    c_void,
-    c_char,
-    c_schar,
-    c_uchar,
-    c_short,
-    c_ushort,
-    c_int,
-    c_uint,
-    c_long,
-    c_ulong,
-    c_longlong,
-    c_ulonglong,
-    c_float,
-    c_double,
-};
-pub use activation::*;
-pub use audioclient::*;
-pub use audiosessiontypes::*;
-pub use basetsd::*;
-pub use bcrypt::*;
-pub use cfg::*;
-pub use cfgmgr32::*;
-pub use combaseapi::*;
-pub use commctrl::*;
-pub use commdlg::*;
-pub use corsym::*;
-pub use d2d1::*;
-pub use d2dbasetypes::*;
-pub use d3d9::*;
-pub use d3d9caps::*;
-pub use d3d9types::*;
-pub use d3d11::*;
-pub use d3d10shader::*;
-pub use d3d11shader::*;
-pub use d3d12::*;
-pub use d3d12sdklayers::*;
-pub use d3d12shader::*;
-pub use d3dcommon::*;
-pub use d3dcompiler::*;
-pub use dbghelp::*;
-pub use dcommon::*;
-pub use devpropdef::*;
-pub use docobj::*;
-pub use dpapi::*;
-pub use dsgetdc::*;
-pub use dsound::*;
-pub use dsrole::*;
-pub use dwmapi::*;
-pub use dwrite::*;
-pub use dxgi::*;
-pub use dxgi1_2::*;
-pub use dxgi1_3::*;
-pub use dxgi1_4::*;
-pub use dxgiformat::*;
-pub use dxgitype::*;
-pub use errhandlingapi::*;
-pub use excpt::*;
-pub use fileapi::*;
-pub use gl::*;
-pub use guiddef::*;
-pub use heapapi::*;
-pub use hidclass::*;
-pub use hidpi::*;
-pub use hidsdi::*;
-pub use hidusage::*;
-pub use hstring::*;
-pub use http::*;
-pub use imm::*;
-pub use inaddr::*;
-pub use inspectable::*;
-pub use ksmedia::*;
-pub use libloaderapi::*;
-pub use lmaccess::*;
-pub use lmcons::*;
-pub use lmdfs::*;
-pub use lmerrlog::*;
-pub use lmjoin::*;
-pub use lsalookup::*;
-pub use memoryapi::*;
-pub use minschannel::*;
-pub use minwinbase::*;
-pub use minwindef::*;
-pub use mmdeviceapi::*;
-pub use mmreg::*;
-pub use mmsystem::*;
-pub use mscat::*;
-pub use mssip::*;
-pub use nb30::*;
-pub use ncrypt::*;
-pub use ntdef::*;
-pub use ntsecapi::*;
-pub use ntstatus::*;
-pub use oaidl::*;
-pub use objbase::*;
-pub use objidl::*;
-pub use objidlbase::*;
-pub use olectl::*;
-pub use pdh::*;
-pub use playsoundapi::*;
-pub use processsnapshot::*;
-pub use processthreadsapi::*;
-pub use propidl::*;
-pub use propsys::*;
-pub use prsht::*;
-pub use psapi::*;
-pub use qos::*;
-pub use reason::*;
-pub use restrictederrorinfo::*;
-pub use roapi::*;
-pub use roerrorapi::*;
-pub use rpc::*;
-pub use rpcdce::*;
-pub use sapi::*;
-pub use schannel::*;
-pub use servprov::*;
-pub use setupapi::*;
-pub use shellapi::*;
-pub use shellscalingapi::*;
-pub use shlguid::*;
-pub use shlobj::*;
-pub use shobjidl::*;
-pub use shtypes::*;
-pub use spapidef::*;
-pub use sqltypes::*;
-pub use sspi::*;
-pub use strmif::*;
-pub use subauth::*;
-pub use synchapi::*;
-pub use sysinfoapi::*;
-pub use threadpoolapi::*;
-pub use timezoneapi::*;
-pub use tlhelp32::*;
-pub use unknwnbase::*;
-pub use urlhist::*;
-pub use urlmon::*;
-pub use usb::*;
-pub use usbspec::*;
-pub use usp10::*;
-pub use vadefs::*;
-pub use vsbackup::*;
-pub use vss::*;
-pub use vsserror::*;
-pub use vswriter::*;
-pub use werapi::*;
-pub use winbase::*;
-pub use wincon::*;
-pub use wincred::*;
-pub use wincrypt::*;
-pub use windowsx::*;
-pub use windef::*;
-pub use windowscodecs::*;
-pub use winerror::*;
-pub use winevt::*;
-pub use wingdi::*;
-pub use winhttp::*;
-pub use winioctl::*;
-pub use winnetwk::*;
-pub use winnls::*;
-pub use winnt::*;
-pub use winreg::*;
-pub use winscard::*;
-pub use winsmcrd::*;
-pub use winsock2::*;
-pub use winspool::*;
-pub use winstring::*;
-pub use winsvc::*;
-pub use winusb::*;
-pub use winusbio::*;
-pub use winuser::*;
-pub use ws2def::*;
-pub use ws2ipdef::*;
-pub use ws2spi::*;
-pub use ws2tcpip::*;
-pub use wtypes::*;
-pub use wtypesbase::*;
-pub use xinput::*;
-//-------------------------------------------------------------------------------------------------
-// Modules
-//-------------------------------------------------------------------------------------------------
-#[macro_use] mod macros;
-pub mod activation;
-pub mod audioclient;
-pub mod audiosessiontypes;
-pub mod basetsd;
-pub mod bcrypt;
-pub mod cfg;
-pub mod cfgmgr32;
-pub mod combaseapi;
-pub mod commctrl;
-pub mod commdlg;
-pub mod corsym;
-pub mod d2d1;
-pub mod d2dbasetypes;
-pub mod d3d9;
-pub mod d3d9caps;
-pub mod d3d9types;
-pub mod d3d11;
-pub mod d3d10shader;
-pub mod d3d11shader;
-pub mod d3d12;
-pub mod d3d12sdklayers;
-pub mod d3d12shader;
-pub mod d3dcommon;
-pub mod d3dcompiler;
-pub mod dbghelp;
-pub mod dcommon;
-pub mod devpropdef;
-pub mod docobj;
-pub mod dpapi;
-pub mod dsgetdc;
-pub mod dsound;
-pub mod dsrole;
-pub mod dwmapi;
-pub mod dwrite;
-pub mod dxgi;
-pub mod dxgi1_2;
-pub mod dxgi1_3;
-pub mod dxgi1_4;
-pub mod dxgiformat;
-pub mod dxgitype;
-pub mod errhandlingapi;
-pub mod excpt;
-pub mod fileapi;
-pub mod gl;
-pub mod guiddef;
-pub mod heapapi;
-pub mod hidclass;
-pub mod hidpi;
-pub mod hidsdi;
-pub mod hidusage;
-pub mod hstring;
-pub mod http;
-pub mod imm;
-pub mod inaddr;
-pub mod inspectable;
-pub mod ksmedia;
-pub mod libloaderapi;
-pub mod lmaccess;
-pub mod lmcons;
-pub mod lmdfs;
-pub mod lmerrlog;
-pub mod lmjoin;
-pub mod lsalookup;
-pub mod memoryapi;
-pub mod minschannel;
-pub mod minwinbase;
-pub mod minwindef;
-pub mod mmdeviceapi;
-pub mod mmreg;
-pub mod mmsystem;
-pub mod mscat;
-pub mod mssip;
-pub mod nb30;
-pub mod ncrypt;
-pub mod ntdef;
-pub mod ntsecapi;
-pub mod ntstatus;
-pub mod oaidl;
-pub mod objbase;
-pub mod objidl;
-pub mod objidlbase;
-pub mod olectl;
-pub mod pdh;
-pub mod playsoundapi;
-pub mod processsnapshot;
-pub mod processthreadsapi;
-pub mod propidl;
-pub mod propsys;
-pub mod prsht;
-pub mod psapi;
-pub mod qos;
-pub mod reason;
-pub mod restrictederrorinfo;
-pub mod roapi;
-pub mod roerrorapi;
-pub mod rpc;
-pub mod rpcdce;
-pub mod sapi;
-pub mod schannel;
-pub mod servprov;
-pub mod setupapi;
-pub mod shellapi;
-pub mod shellscalingapi;
-pub mod shlguid;
-pub mod shlobj;
-pub mod shobjidl;
-pub mod shtypes;
-pub mod spapidef;
-pub mod sqltypes;
-pub mod sspi;
-pub mod strmif;
-pub mod subauth;
-pub mod synchapi;
-pub mod sysinfoapi;
-pub mod threadpoolapi;
-pub mod timezoneapi;
-pub mod tlhelp32;
-pub mod unknwnbase;
-pub mod urlhist;
-pub mod urlmon;
-pub mod usb;
-pub mod usbspec;
-pub mod usp10;
-pub mod vadefs;
-pub mod vsbackup;
-pub mod vss;
-pub mod vsserror;
-pub mod vswriter;
-pub mod werapi;
-pub mod winbase;
-pub mod wincon;
-pub mod wincred;
-pub mod wincrypt;
-pub mod windef;
-pub mod windowscodecs;
-pub mod windowsx;
-pub mod winerror;
-pub mod winevt;
-pub mod wingdi;
-pub mod winhttp;
-pub mod winioctl;
-pub mod winnetwk;
-pub mod winnls;
-pub mod winnt;
-pub mod winreg;
-pub mod winscard;
-pub mod winsmcrd;
-pub mod winsock2;
-pub mod winspool;
-pub mod winstring;
-pub mod winsvc;
-pub mod winusb;
-pub mod winusbio;
-pub mod winuser;
-pub mod ws2def;
-pub mod ws2ipdef;
-pub mod ws2spi;
-pub mod ws2tcpip;
-pub mod wtypes;
-pub mod wtypesbase;
-pub mod xinput;
-//-------------------------------------------------------------------------------------------------
-// Primitive types not provided by std
-//-------------------------------------------------------------------------------------------------
-pub type __int8 = i8;
-pub type __uint8 = u8;
-pub type __int16 = i16;
-pub type __uint16 = u16;
-pub type __int32 = i32;
-pub type __uint32 = u32;
-pub type __int64 = i64;
-pub type __uint64 = u64;
-pub type wchar_t = c_ushort;
-#[cfg(target_arch = "x86")]
-pub type size_t = c_uint;
-#[cfg(target_arch = "x86_64")]
-pub type size_t = __uint64;
diff --git a/vendor/winapi-0.2.8/src/libloaderapi.rs b/vendor/winapi-0.2.8/src/libloaderapi.rs
deleted file mode 100644
index 9b47b0af88..0000000000
--- a/vendor/winapi-0.2.8/src/libloaderapi.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-libraryloader-l1
-pub type DLL_DIRECTORY_COOKIE = ::PVOID;
-pub type PDLL_DIRECTORY_COOKIE = *mut ::PVOID;
-pub type ENUMRESLANGPROCA = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCSTR, lpName: ::LPCSTR, wLanguage: ::WORD, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESLANGPROCW = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCWSTR, lpName: ::LPCWSTR, wLanguage: ::WORD, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESNAMEPROCA = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCSTR, lpName: ::LPSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESNAMEPROCW = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPCWSTR, lpName: ::LPWSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESTYPEPROCA = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
-pub type ENUMRESTYPEPROCW = Option<unsafe extern "system" fn(
-    hModule: ::HMODULE, lpType: ::LPWSTR, lParam: ::LONG_PTR,
-) -> ::BOOL>;
diff --git a/vendor/winapi-0.2.8/src/lmaccess.rs b/vendor/winapi-0.2.8/src/lmaccess.rs
deleted file mode 100644
index 2768f8c32e..0000000000
--- a/vendor/winapi-0.2.8/src/lmaccess.rs
+++ /dev/null
@@ -1,853 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// This file contains structures, function prototypes, and definitions
-// for the NetUser, NetUserModals, NetGroup, NetAccess, and NetLogon API.
-STRUCT!{struct USER_INFO_0 {
-    usri0_name: ::LPWSTR,
-}}
-pub type PUSER_INFO_0 = *mut USER_INFO_0;
-pub type LPUSER_INFO_0 = *mut USER_INFO_0;
-STRUCT!{struct USER_INFO_1 {
-    usri1_name: ::LPWSTR,
-    usri1_password: ::LPWSTR,
-    usri1_password_age: ::DWORD,
-    usri1_priv: ::DWORD,
-    usri1_home_dir: ::LPWSTR,
-    usri1_comment: ::LPWSTR,
-    usri1_flags: ::DWORD,
-    usri1_script_path: ::LPWSTR,
-}}
-pub type PUSER_INFO_1 = *mut USER_INFO_1;
-pub type LPUSER_INFO_1 = *mut USER_INFO_1;
-STRUCT!{struct USER_INFO_2 {
-    usri2_name: ::LPWSTR,
-    usri2_password: ::LPWSTR,
-    usri2_password_age: ::DWORD,
-    usri2_priv: ::DWORD,
-    usri2_home_dir: ::LPWSTR,
-    usri2_comment: ::LPWSTR,
-    usri2_flags: ::DWORD,
-    usri2_script_path: ::LPWSTR,
-    usri2_auth_flags: ::DWORD,
-    usri2_full_name: ::LPWSTR,
-    usri2_usr_comment: ::LPWSTR,
-    usri2_parms: ::LPWSTR,
-    usri2_workstations: ::LPWSTR,
-    usri2_last_logon: ::DWORD,
-    usri2_last_logoff: ::DWORD,
-    usri2_acct_expires: ::DWORD,
-    usri2_max_storage: ::DWORD,
-    usri2_units_per_week: ::DWORD,
-    usri2_logon_hours: ::PBYTE,
-    usri2_bad_pw_count: ::DWORD,
-    usri2_num_logons: ::DWORD,
-    usri2_logon_server: ::LPWSTR,
-    usri2_country_code: ::DWORD,
-    usri2_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_2 = *mut USER_INFO_2;
-pub type LPUSER_INFO_2 = *mut USER_INFO_2;
-STRUCT!{struct USER_INFO_3 {
-    usri3_name: ::LPWSTR,
-    usri3_password: ::LPWSTR,
-    usri3_password_age: ::DWORD,
-    usri3_priv: ::DWORD,
-    usri3_home_dir: ::LPWSTR,
-    usri3_comment: ::LPWSTR,
-    usri3_flags: ::DWORD,
-    usri3_script_path: ::LPWSTR,
-    usri3_auth_flags: ::DWORD,
-    usri3_full_name: ::LPWSTR,
-    usri3_usr_comment: ::LPWSTR,
-    usri3_parms: ::LPWSTR,
-    usri3_workstations: ::LPWSTR,
-    usri3_last_logon: ::DWORD,
-    usri3_last_logoff: ::DWORD,
-    usri3_acct_expires: ::DWORD,
-    usri3_max_storage: ::DWORD,
-    usri3_units_per_week: ::DWORD,
-    usri3_logon_hours: ::PBYTE,
-    usri3_bad_pw_count: ::DWORD,
-    usri3_num_logons: ::DWORD,
-    usri3_logon_server: ::LPWSTR,
-    usri3_country_code: ::DWORD,
-    usri3_code_page: ::DWORD,
-    usri3_user_id: ::DWORD,
-    usri3_primary_group_id: ::DWORD,
-    usri3_profile: ::LPWSTR,
-    usri3_home_dir_drive: ::LPWSTR,
-    usri3_password_expired: ::DWORD,
-}}
-pub type PUSER_INFO_3 = *mut USER_INFO_3;
-pub type LPUSER_INFO_3 = *mut USER_INFO_3;
-STRUCT!{struct USER_INFO_4 {
-    usri4_name: ::LPWSTR,
-    usri4_password: ::LPWSTR,
-    usri4_password_age: ::DWORD,
-    usri4_priv: ::DWORD,
-    usri4_home_dir: ::LPWSTR,
-    usri4_comment: ::LPWSTR,
-    usri4_flags: ::DWORD,
-    usri4_script_path: ::LPWSTR,
-    usri4_auth_flags: ::DWORD,
-    usri4_full_name: ::LPWSTR,
-    usri4_usr_comment: ::LPWSTR,
-    usri4_parms: ::LPWSTR,
-    usri4_workstations: ::LPWSTR,
-    usri4_last_logon: ::DWORD,
-    usri4_last_logoff: ::DWORD,
-    usri4_acct_expires: ::DWORD,
-    usri4_max_storage: ::DWORD,
-    usri4_units_per_week: ::DWORD,
-    usri4_logon_hours: ::PBYTE,
-    usri4_bad_pw_count: ::DWORD,
-    usri4_num_logons: ::DWORD,
-    usri4_logon_server: ::LPWSTR,
-    usri4_country_code: ::DWORD,
-    usri4_code_page: ::DWORD,
-    usri4_user_sid: ::PSID,
-    usri4_primary_group_id: ::DWORD,
-    usri4_profile: ::LPWSTR,
-    usri4_home_dir_drive: ::LPWSTR,
-    usri4_password_expired: ::DWORD,
-}}
-pub type PUSER_INFO_4 = *mut USER_INFO_4;
-pub type LPUSER_INFO_4 = *mut USER_INFO_4;
-STRUCT!{struct USER_INFO_10 {
-    usri10_name: ::LPWSTR,
-    usri10_comment: ::LPWSTR,
-    usri10_usr_comment: ::LPWSTR,
-    usri10_full_name: ::LPWSTR,
-}}
-pub type PUSER_INFO_10 = *mut USER_INFO_10;
-pub type LPUSER_INFO_10 = *mut USER_INFO_10;
-STRUCT!{struct USER_INFO_11 {
-    usri11_name: ::LPWSTR,
-    usri11_comment: ::LPWSTR,
-    usri11_usr_comment: ::LPWSTR,
-    usri11_full_name: ::LPWSTR,
-    usri11_priv: ::DWORD,
-    usri11_auth_flags: ::DWORD,
-    usri11_password_age: ::DWORD,
-    usri11_home_dir: ::LPWSTR,
-    usri11_parms: ::LPWSTR,
-    usri11_last_logon: ::DWORD,
-    usri11_last_logoff: ::DWORD,
-    usri11_bad_pw_count: ::DWORD,
-    usri11_num_logons: ::DWORD,
-    usri11_logon_server: ::LPWSTR,
-    usri11_country_code: ::DWORD,
-    usri11_workstations: ::LPWSTR,
-    usri11_max_storage: ::DWORD,
-    usri11_units_per_week: ::DWORD,
-    usri11_logon_hours: ::PBYTE,
-    usri11_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_11 = *mut USER_INFO_11;
-pub type LPUSER_INFO_11 = *mut USER_INFO_11;
-STRUCT!{struct USER_INFO_20 {
-    usri20_name: ::LPWSTR,
-    usri20_full_name: ::LPWSTR,
-    usri20_comment: ::LPWSTR,
-    usri20_flags: ::DWORD,
-    usri20_user_id: ::DWORD,
-}}
-pub type PUSER_INFO_20 = *mut USER_INFO_20;
-pub type LPUSER_INFO_20 = *mut USER_INFO_20;
-STRUCT!{struct USER_INFO_21 {
-    usri21_password: [::BYTE; ::ENCRYPTED_PWLEN],
-}}
-pub type PUSER_INFO_21 = *mut USER_INFO_21;
-pub type LPUSER_INFO_21 = *mut USER_INFO_21;
-STRUCT!{struct USER_INFO_22 {
-    usri22_name: ::LPWSTR,
-    usri22_password: [::BYTE; ::ENCRYPTED_PWLEN],
-    usri22_password_age: ::DWORD,
-    usri22_priv: ::DWORD,
-    usri22_home_dir: ::LPWSTR,
-    usri22_comment: ::LPWSTR,
-    usri22_flags: ::DWORD,
-    usri22_script_path: ::LPWSTR,
-    usri22_auth_flags: ::DWORD,
-    usri22_full_name: ::LPWSTR,
-    usri22_usr_comment: ::LPWSTR,
-    usri22_parms: ::LPWSTR,
-    usri22_workstations: ::LPWSTR,
-    usri22_last_logon: ::DWORD,
-    usri22_last_logoff: ::DWORD,
-    usri22_acct_expires: ::DWORD,
-    usri22_max_storage: ::DWORD,
-    usri22_units_per_week: ::DWORD,
-    usri22_logon_hours: ::PBYTE,
-    usri22_bad_pw_count: ::DWORD,
-    usri22_num_logons: ::DWORD,
-    usri22_logon_server: ::LPWSTR,
-    usri22_country_code: ::DWORD,
-    usri22_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_22 = *mut USER_INFO_22;
-pub type LPUSER_INFO_22 = *mut USER_INFO_22;
-STRUCT!{struct USER_INFO_23 {
-    usri23_name: ::LPWSTR,
-    usri23_full_name: ::LPWSTR,
-    usri23_comment: ::LPWSTR,
-    usri23_flags: ::DWORD,
-    usri23_user_sid: ::PSID,
-}}
-pub type PUSER_INFO_23 = *mut USER_INFO_23;
-pub type LPUSER_INFO_23 = *mut USER_INFO_23;
-STRUCT!{struct USER_INFO_24 {
-    usri24_internet_identity: ::BOOL,
-    usri24_flags: ::DWORD,
-    usri24_internet_provider_name: ::LPWSTR,
-    usri24_internet_principal_name: ::LPWSTR,
-    usri24_user_sid: ::PSID,
-}}
-pub type PUSER_INFO_24 = *mut USER_INFO_24;
-pub type LPUSER_INFO_24 = *mut USER_INFO_24;
-STRUCT!{struct USER_INFO_1003 {
-    usri1003_password: ::LPWSTR,
-}}
-pub type PUSER_INFO_1003 = *mut USER_INFO_1003;
-pub type LPUSER_INFO_1003 = *mut USER_INFO_1003;
-STRUCT!{struct USER_INFO_1005 {
-    usri1005_priv: ::DWORD,
-}}
-pub type PUSER_INFO_1005 = *mut USER_INFO_1005;
-pub type LPUSER_INFO_1005 = *mut USER_INFO_1005;
-STRUCT!{struct USER_INFO_1006 {
-    usri1006_home_dir: ::LPWSTR,
-}}
-pub type PUSER_INFO_1006 = *mut USER_INFO_1006;
-pub type LPUSER_INFO_1006 = *mut USER_INFO_1006;
-STRUCT!{struct USER_INFO_1007 {
-    usri1007_comment: ::LPWSTR,
-}}
-pub type PUSER_INFO_1007 = *mut USER_INFO_1007;
-pub type LPUSER_INFO_1007 = *mut USER_INFO_1007;
-STRUCT!{struct USER_INFO_1008 {
-    usri1008_flags: ::DWORD,
-}}
-pub type PUSER_INFO_1008 = *mut USER_INFO_1008;
-pub type LPUSER_INFO_1008 = *mut USER_INFO_1008;
-STRUCT!{struct USER_INFO_1009 {
-    usri1009_script_path: ::LPWSTR,
-}}
-pub type PUSER_INFO_1009 = *mut USER_INFO_1009;
-pub type LPUSER_INFO_1009 = *mut USER_INFO_1009;
-STRUCT!{struct USER_INFO_1010 {
-    usri1010_auth_flags: ::DWORD,
-}}
-pub type PUSER_INFO_1010 = *mut USER_INFO_1010;
-pub type LPUSER_INFO_1010 = *mut USER_INFO_1010;
-STRUCT!{struct USER_INFO_1011 {
-    usri1011_full_name: ::LPWSTR,
-}}
-pub type PUSER_INFO_1011 = *mut USER_INFO_1011;
-pub type LPUSER_INFO_1011 = *mut USER_INFO_1011;
-STRUCT!{struct USER_INFO_1012 {
-    usri1012_usr_comment: ::LPWSTR,
-}}
-pub type PUSER_INFO_1012 = *mut USER_INFO_1012;
-pub type LPUSER_INFO_1012 = *mut USER_INFO_1012;
-STRUCT!{struct USER_INFO_1013 {
-    usri1013_parms: ::LPWSTR,
-}}
-pub type PUSER_INFO_1013 = *mut USER_INFO_1013;
-pub type LPUSER_INFO_1013 = *mut USER_INFO_1013;
-STRUCT!{struct USER_INFO_1014 {
-    usri1014_workstations: ::LPWSTR,
-}}
-pub type PUSER_INFO_1014 = *mut USER_INFO_1014;
-pub type LPUSER_INFO_1014 = *mut USER_INFO_1014;
-STRUCT!{struct USER_INFO_1017 {
-    usri1017_acct_expires: ::DWORD,
-}}
-pub type PUSER_INFO_1017 = *mut USER_INFO_1017;
-pub type LPUSER_INFO_1017 = *mut USER_INFO_1017;
-STRUCT!{struct USER_INFO_1018 {
-    usri1018_max_storage: ::DWORD,
-}}
-pub type PUSER_INFO_1018 = *mut USER_INFO_1018;
-pub type LPUSER_INFO_1018 = *mut USER_INFO_1018;
-STRUCT!{struct USER_INFO_1020 {
-    usri1020_units_per_week: ::DWORD,
-    usri1020_logon_hours: ::LPBYTE,
-}}
-pub type PUSER_INFO_1020 = *mut USER_INFO_1020;
-pub type LPUSER_INFO_1020 = *mut USER_INFO_1020;
-STRUCT!{struct USER_INFO_1023 {
-    usri1023_logon_server: ::LPWSTR,
-}}
-pub type PUSER_INFO_1023 = *mut USER_INFO_1023;
-pub type LPUSER_INFO_1023 = *mut USER_INFO_1023;
-STRUCT!{struct USER_INFO_1024 {
-    usri1024_country_code: ::DWORD,
-}}
-pub type PUSER_INFO_1024 = *mut USER_INFO_1024;
-pub type LPUSER_INFO_1024 = *mut USER_INFO_1024;
-STRUCT!{struct USER_INFO_1025 {
-    usri1025_code_page: ::DWORD,
-}}
-pub type PUSER_INFO_1025 = *mut USER_INFO_1025;
-pub type LPUSER_INFO_1025 = *mut USER_INFO_1025;
-STRUCT!{struct USER_INFO_1051 {
-    usri1051_primary_group_id: ::DWORD,
-}}
-pub type PUSER_INFO_1051 = *mut USER_INFO_1051;
-pub type LPUSER_INFO_1051 = *mut USER_INFO_1051;
-STRUCT!{struct USER_INFO_1052 {
-    usri1052_profile: ::LPWSTR,
-}}
-pub type PUSER_INFO_1052 = *mut USER_INFO_1052;
-pub type LPUSER_INFO_1052 = *mut USER_INFO_1052;
-STRUCT!{struct USER_INFO_1053 {
-    usri1053_home_dir_drive: ::LPWSTR,
-}}
-pub type PUSER_INFO_1053 = *mut USER_INFO_1053;
-pub type LPUSER_INFO_1053 = *mut USER_INFO_1053;
-STRUCT!{struct USER_MODALS_INFO_0 {
-    usrmod0_min_passwd_len: ::DWORD,
-    usrmod0_max_passwd_age: ::DWORD,
-    usrmod0_min_passwd_age: ::DWORD,
-    usrmod0_force_logoff: ::DWORD,
-    usrmod0_password_hist_len: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_0 = *mut USER_MODALS_INFO_0;
-pub type LPUSER_MODALS_INFO_0 = *mut USER_MODALS_INFO_0;
-STRUCT!{struct USER_MODALS_INFO_1 {
-    usrmod1_role: ::DWORD,
-    usrmod1_primary: ::LPWSTR,
-}}
-pub type PUSER_MODALS_INFO_1 = *mut USER_MODALS_INFO_1;
-pub type LPUSER_MODALS_INFO_1 = *mut USER_MODALS_INFO_1;
-STRUCT!{struct USER_MODALS_INFO_2 {
-    usrmod2_domain_name: ::LPWSTR,
-    usrmod2_domain_id: ::PSID,
-}}
-pub type PUSER_MODALS_INFO_2 = *mut USER_MODALS_INFO_2;
-pub type LPUSER_MODALS_INFO_2 = *mut USER_MODALS_INFO_2;
-STRUCT!{struct USER_MODALS_INFO_3 {
-    usrmod3_lockout_duration: ::DWORD,
-    usrmod3_lockout_observation_window: ::DWORD,
-    usrmod3_lockout_threshold: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_3 = *mut USER_MODALS_INFO_3;
-pub type LPUSER_MODALS_INFO_3 = *mut USER_MODALS_INFO_3;
-STRUCT!{struct USER_MODALS_INFO_1001 {
-    usrmod1001_min_passwd_len: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1001 = *mut USER_MODALS_INFO_1001;
-pub type LPUSER_MODALS_INFO_1001 = *mut USER_MODALS_INFO_1001;
-STRUCT!{struct USER_MODALS_INFO_1002 {
-    usrmod1002_max_passwd_age: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1002 = *mut USER_MODALS_INFO_1002;
-pub type LPUSER_MODALS_INFO_1002 = *mut USER_MODALS_INFO_1002;
-STRUCT!{struct USER_MODALS_INFO_1003 {
-    usrmod1003_min_passwd_age: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1003 = *mut USER_MODALS_INFO_1003;
-pub type LPUSER_MODALS_INFO_1003 = *mut USER_MODALS_INFO_1003;
-STRUCT!{struct USER_MODALS_INFO_1004 {
-    usrmod1004_force_logoff: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1004 = *mut USER_MODALS_INFO_1004;
-pub type LPUSER_MODALS_INFO_1004 = *mut USER_MODALS_INFO_1004;
-STRUCT!{struct USER_MODALS_INFO_1005 {
-    usrmod1005_password_hist_len: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1005 = *mut USER_MODALS_INFO_1005;
-pub type LPUSER_MODALS_INFO_1005 = *mut USER_MODALS_INFO_1005;
-STRUCT!{struct USER_MODALS_INFO_1006 {
-    usrmod1006_role: ::DWORD,
-}}
-pub type PUSER_MODALS_INFO_1006 = *mut USER_MODALS_INFO_1006;
-pub type LPUSER_MODALS_INFO_1006 = *mut USER_MODALS_INFO_1006;
-STRUCT!{struct USER_MODALS_INFO_1007 {
-    usrmod1007_primary: ::LPWSTR,
-}}
-pub type PUSER_MODALS_INFO_1007 = *mut USER_MODALS_INFO_1007;
-pub type LPUSER_MODALS_INFO_1007 = *mut USER_MODALS_INFO_1007;
-pub const UF_SCRIPT: ::DWORD = 0x0001;
-pub const UF_ACCOUNTDISABLE: ::DWORD = 0x0002;
-pub const UF_HOMEDIR_REQUIRED: ::DWORD = 0x0008;
-pub const UF_LOCKOUT: ::DWORD = 0x0010;
-pub const UF_PASSWD_NOTREQD: ::DWORD = 0x0020;
-pub const UF_PASSWD_CANT_CHANGE: ::DWORD = 0x0040;
-pub const UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED: ::DWORD = 0x0080;
-pub const UF_TEMP_DUPLICATE_ACCOUNT: ::DWORD = 0x0100;
-pub const UF_NORMAL_ACCOUNT: ::DWORD = 0x0200;
-pub const UF_INTERDOMAIN_TRUST_ACCOUNT: ::DWORD = 0x0800;
-pub const UF_WORKSTATION_TRUST_ACCOUNT: ::DWORD = 0x1000;
-pub const UF_SERVER_TRUST_ACCOUNT: ::DWORD = 0x2000;
-pub const UF_MACHINE_ACCOUNT_MASK: ::DWORD = UF_INTERDOMAIN_TRUST_ACCOUNT
-    | UF_WORKSTATION_TRUST_ACCOUNT | UF_SERVER_TRUST_ACCOUNT;
-pub const UF_ACCOUNT_TYPE_MASK: ::DWORD = UF_TEMP_DUPLICATE_ACCOUNT | UF_NORMAL_ACCOUNT
-    | UF_INTERDOMAIN_TRUST_ACCOUNT |  UF_WORKSTATION_TRUST_ACCOUNT |  UF_SERVER_TRUST_ACCOUNT;
-pub const UF_DONT_EXPIRE_PASSWD: ::DWORD = 0x10000;
-pub const UF_MNS_LOGON_ACCOUNT: ::DWORD = 0x20000;
-pub const UF_SMARTCARD_REQUIRED: ::DWORD = 0x40000;
-pub const UF_TRUSTED_FOR_DELEGATION: ::DWORD = 0x80000;
-pub const UF_NOT_DELEGATED: ::DWORD = 0x100000;
-pub const UF_USE_DES_KEY_ONLY: ::DWORD = 0x200000;
-pub const UF_DONT_REQUIRE_PREAUTH: ::DWORD = 0x400000;
-pub const UF_PASSWORD_EXPIRED: ::DWORD = 0x800000;
-pub const UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION: ::DWORD = 0x1000000;
-pub const UF_NO_AUTH_DATA_REQUIRED: ::DWORD = 0x2000000;
-pub const UF_PARTIAL_SECRETS_ACCOUNT: ::DWORD = 0x4000000;
-pub const UF_USE_AES_KEYS: ::DWORD = 0x8000000;
-pub const UF_SETTABLE_BITS: ::DWORD = UF_SCRIPT |  UF_ACCOUNTDISABLE |  UF_LOCKOUT
-    | UF_HOMEDIR_REQUIRED | UF_PASSWD_NOTREQD | UF_PASSWD_CANT_CHANGE | UF_ACCOUNT_TYPE_MASK
-    | UF_DONT_EXPIRE_PASSWD | UF_MNS_LOGON_ACCOUNT | UF_ENCRYPTED_TEXT_PASSWORD_ALLOWED
-    | UF_SMARTCARD_REQUIRED | UF_TRUSTED_FOR_DELEGATION | UF_NOT_DELEGATED | UF_USE_DES_KEY_ONLY
-    | UF_DONT_REQUIRE_PREAUTH | UF_PASSWORD_EXPIRED | UF_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION
-    | UF_NO_AUTH_DATA_REQUIRED | UF_USE_AES_KEYS | UF_PARTIAL_SECRETS_ACCOUNT;
-pub const FILTER_TEMP_DUPLICATE_ACCOUNT: ::DWORD = 0x0001;
-pub const FILTER_NORMAL_ACCOUNT: ::DWORD = 0x0002;
-pub const FILTER_INTERDOMAIN_TRUST_ACCOUNT: ::DWORD = 0x0008;
-pub const FILTER_WORKSTATION_TRUST_ACCOUNT: ::DWORD = 0x0010;
-pub const FILTER_SERVER_TRUST_ACCOUNT: ::DWORD = 0x0020;
-pub const LG_INCLUDE_INDIRECT: ::DWORD = 0x0001;
-pub const AF_OP_PRINT: ::DWORD = 0x1;
-pub const AF_OP_COMM: ::DWORD = 0x2;
-pub const AF_OP_SERVER: ::DWORD = 0x4;
-pub const AF_OP_ACCOUNTS: ::DWORD = 0x8;
-pub const AF_SETTABLE_BITS: ::DWORD = AF_OP_PRINT | AF_OP_COMM | AF_OP_SERVER | AF_OP_ACCOUNTS;
-pub const UAS_ROLE_STANDALONE: ::DWORD = 0;
-pub const UAS_ROLE_MEMBER: ::DWORD = 1;
-pub const UAS_ROLE_BACKUP: ::DWORD = 2;
-pub const UAS_ROLE_PRIMARY: ::DWORD = 3;
-pub const USER_NAME_PARMNUM: ::DWORD = 1;
-pub const USER_PASSWORD_PARMNUM: ::DWORD = 3;
-pub const USER_PASSWORD_AGE_PARMNUM: ::DWORD = 4;
-pub const USER_PRIV_PARMNUM: ::DWORD = 5;
-pub const USER_HOME_DIR_PARMNUM: ::DWORD = 6;
-pub const USER_COMMENT_PARMNUM: ::DWORD = 7;
-pub const USER_FLAGS_PARMNUM: ::DWORD = 8;
-pub const USER_SCRIPT_PATH_PARMNUM: ::DWORD = 9;
-pub const USER_AUTH_FLAGS_PARMNUM: ::DWORD = 10;
-pub const USER_FULL_NAME_PARMNUM: ::DWORD = 11;
-pub const USER_USR_COMMENT_PARMNUM: ::DWORD = 12;
-pub const USER_PARMS_PARMNUM: ::DWORD = 13;
-pub const USER_WORKSTATIONS_PARMNUM: ::DWORD = 14;
-pub const USER_LAST_LOGON_PARMNUM: ::DWORD = 15;
-pub const USER_LAST_LOGOFF_PARMNUM: ::DWORD = 16;
-pub const USER_ACCT_EXPIRES_PARMNUM: ::DWORD = 17;
-pub const USER_MAX_STORAGE_PARMNUM: ::DWORD = 18;
-pub const USER_UNITS_PER_WEEK_PARMNUM: ::DWORD = 19;
-pub const USER_LOGON_HOURS_PARMNUM: ::DWORD = 20;
-pub const USER_PAD_PW_COUNT_PARMNUM: ::DWORD = 21;
-pub const USER_NUM_LOGONS_PARMNUM: ::DWORD = 22;
-pub const USER_LOGON_SERVER_PARMNUM: ::DWORD = 23;
-pub const USER_COUNTRY_CODE_PARMNUM: ::DWORD = 24;
-pub const USER_CODE_PAGE_PARMNUM: ::DWORD = 25;
-pub const USER_PRIMARY_GROUP_PARMNUM: ::DWORD = 51;
-pub const USER_PROFILE: ::DWORD = 52;
-pub const USER_PROFILE_PARMNUM: ::DWORD = 52;
-pub const USER_HOME_DIR_DRIVE_PARMNUM: ::DWORD = 53;
-pub const USER_NAME_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_NAME_PARMNUM;
-pub const USER_PASSWORD_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_PASSWORD_PARMNUM;
-pub const USER_PASSWORD_AGE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_PASSWORD_AGE_PARMNUM;
-pub const USER_PRIV_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_PRIV_PARMNUM;
-pub const USER_HOME_DIR_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_HOME_DIR_PARMNUM;
-pub const USER_COMMENT_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_COMMENT_PARMNUM;
-pub const USER_FLAGS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_FLAGS_PARMNUM;
-pub const USER_SCRIPT_PATH_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_SCRIPT_PATH_PARMNUM;
-pub const USER_AUTH_FLAGS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_AUTH_FLAGS_PARMNUM;
-pub const USER_FULL_NAME_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_FULL_NAME_PARMNUM;
-pub const USER_USR_COMMENT_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_USR_COMMENT_PARMNUM;
-pub const USER_PARMS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_PARMS_PARMNUM;
-pub const USER_WORKSTATIONS_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_WORKSTATIONS_PARMNUM;
-pub const USER_LAST_LOGON_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_LAST_LOGON_PARMNUM;
-pub const USER_LAST_LOGOFF_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_LAST_LOGOFF_PARMNUM;
-pub const USER_ACCT_EXPIRES_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_ACCT_EXPIRES_PARMNUM;
-pub const USER_MAX_STORAGE_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_MAX_STORAGE_PARMNUM;
-pub const USER_UNITS_PER_WEEK_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_UNITS_PER_WEEK_PARMNUM;
-pub const USER_LOGON_HOURS_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_LOGON_HOURS_PARMNUM;
-pub const USER_PAD_PW_COUNT_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_PAD_PW_COUNT_PARMNUM;
-pub const USER_NUM_LOGONS_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_NUM_LOGONS_PARMNUM;
-pub const USER_LOGON_SERVER_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_LOGON_SERVER_PARMNUM;
-pub const USER_COUNTRY_CODE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_COUNTRY_CODE_PARMNUM;
-pub const USER_CODE_PAGE_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + USER_CODE_PAGE_PARMNUM;
-pub const USER_PRIMARY_GROUP_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_PRIMARY_GROUP_PARMNUM;
-pub const USER_HOME_DIR_DRIVE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + USER_HOME_DIR_DRIVE_PARMNUM;
-pub const TIMEQ_FOREVER: ::DWORD = -1i32 as ::DWORD;
-pub const USER_MAXSTORAGE_UNLIMITED: ::DWORD = -1i32 as ::DWORD;
-pub const USER_NO_LOGOFF: ::DWORD = -1i32 as ::DWORD;
-pub const UNITS_PER_DAY: ::DWORD = 24;
-pub const UNITS_PER_WEEK: ::DWORD = UNITS_PER_DAY * 7;
-pub const USER_PRIV_MASK: ::DWORD = 0x3;
-pub const USER_PRIV_GUEST: ::DWORD = 0;
-pub const USER_PRIV_USER: ::DWORD = 1;
-pub const USER_PRIV_ADMIN: ::DWORD = 2;
-pub const MAX_PASSWD_LEN: ::DWORD = ::PWLEN;
-pub const DEF_MIN_PWLEN: ::DWORD = 6;
-pub const DEF_PWUNIQUENESS: ::DWORD = 5;
-pub const DEF_MAX_PWHIST: ::DWORD = 8;
-pub const DEF_MAX_PWAGE: ::DWORD = TIMEQ_FOREVER;
-pub const DEF_MIN_PWAGE: ::DWORD = 0;
-pub const DEF_FORCE_LOGOFF: ::DWORD = 0xffffffff;
-pub const DEF_MAX_BADPW: ::DWORD = 0;
-pub const ONE_DAY: ::DWORD = 1 * 24 * 3600;
-pub const VALIDATED_LOGON: ::DWORD = 0;
-pub const PASSWORD_EXPIRED: ::DWORD = 2;
-pub const NON_VALIDATED_LOGON: ::DWORD = 3;
-pub const VALID_LOGOFF: ::DWORD = 1;
-pub const MODALS_MIN_PASSWD_LEN_PARMNUM: ::DWORD = 1;
-pub const MODALS_MAX_PASSWD_AGE_PARMNUM: ::DWORD = 2;
-pub const MODALS_MIN_PASSWD_AGE_PARMNUM: ::DWORD = 3;
-pub const MODALS_FORCE_LOGOFF_PARMNUM: ::DWORD = 4;
-pub const MODALS_PASSWD_HIST_LEN_PARMNUM: ::DWORD = 5;
-pub const MODALS_ROLE_PARMNUM: ::DWORD = 6;
-pub const MODALS_PRIMARY_PARMNUM: ::DWORD = 7;
-pub const MODALS_DOMAIN_NAME_PARMNUM: ::DWORD = 8;
-pub const MODALS_DOMAIN_ID_PARMNUM: ::DWORD = 9;
-pub const MODALS_LOCKOUT_DURATION_PARMNUM: ::DWORD = 10;
-pub const MODALS_LOCKOUT_OBSERVATION_WINDOW_PARMNUM: ::DWORD = 11;
-pub const MODALS_LOCKOUT_THRESHOLD_PARMNUM: ::DWORD = 12;
-pub const MODALS_MIN_PASSWD_LEN_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_MIN_PASSWD_LEN_PARMNUM;
-pub const MODALS_MAX_PASSWD_AGE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_MAX_PASSWD_AGE_PARMNUM;
-pub const MODALS_MIN_PASSWD_AGE_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_MIN_PASSWD_AGE_PARMNUM;
-pub const MODALS_FORCE_LOGOFF_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_FORCE_LOGOFF_PARMNUM;
-pub const MODALS_PASSWD_HIST_LEN_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_PASSWD_HIST_LEN_PARMNUM;
-pub const MODALS_ROLE_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + MODALS_ROLE_PARMNUM;
-pub const MODALS_PRIMARY_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + MODALS_PRIMARY_PARMNUM;
-pub const MODALS_DOMAIN_NAME_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + MODALS_DOMAIN_NAME_PARMNUM;
-pub const MODALS_DOMAIN_ID_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + MODALS_DOMAIN_ID_PARMNUM;
-STRUCT!{struct GROUP_INFO_0 {
-    grpi0_name: ::LPWSTR,
-}}
-pub type PGROUP_INFO_0 = *mut GROUP_INFO_0;
-pub type LPGROUP_INFO_0 = *mut GROUP_INFO_0;
-STRUCT!{struct GROUP_INFO_1 {
-    grpi1_name: ::LPWSTR,
-    grpi1_comment: ::LPWSTR,
-}}
-pub type PGROUP_INFO_1 = *mut GROUP_INFO_1;
-pub type LPGROUP_INFO_1 = *mut GROUP_INFO_1;
-STRUCT!{struct GROUP_INFO_2 {
-    grpi2_name: ::LPWSTR,
-    grpi2_comment: ::LPWSTR,
-    grpi2_group_id: ::DWORD,
-    grpi2_attributes: ::DWORD,
-}}
-pub type PGROUP_INFO_2 = *mut GROUP_INFO_2;
-STRUCT!{struct GROUP_INFO_3 {
-    grpi3_name: ::LPWSTR,
-    grpi3_comment: ::LPWSTR,
-    grpi3_group_sid: ::PSID,
-    grpi3_attributes: ::DWORD,
-}}
-pub type PGROUP_INFO_3 = *mut GROUP_INFO_3;
-STRUCT!{struct GROUP_INFO_1002 {
-    grpi1002_comment: ::LPWSTR,
-}}
-pub type PGROUP_INFO_1002 = *mut GROUP_INFO_1002;
-pub type LPGROUP_INFO_1002 = *mut GROUP_INFO_1002;
-STRUCT!{struct GROUP_INFO_1005 {
-    grpi1005_attributes: ::DWORD,
-}}
-pub type PGROUP_INFO_1005 = *mut GROUP_INFO_1005;
-pub type LPGROUP_INFO_1005 = *mut GROUP_INFO_1005;
-STRUCT!{struct GROUP_USERS_INFO_0 {
-    grui0_name: ::LPWSTR,
-}}
-pub type PGROUP_USERS_INFO_0 = *mut GROUP_USERS_INFO_0;
-pub type LPGROUP_USERS_INFO_0 = *mut GROUP_USERS_INFO_0;
-STRUCT!{struct GROUP_USERS_INFO_1 {
-    grui1_name: ::LPWSTR,
-    grui1_attributes: ::DWORD,
-}}
-pub type PGROUP_USERS_INFO_1 = *mut GROUP_USERS_INFO_1;
-pub type LPGROUP_USERS_INFO_1 = *mut GROUP_USERS_INFO_1;
-pub const GROUPIDMASK: ::DWORD = 0x8000;
-pub const GROUP_SPECIALGRP_USERS: &'static str = "USERS";
-pub const GROUP_SPECIALGRP_ADMINS: &'static str = "ADMINS";
-pub const GROUP_SPECIALGRP_GUESTS: &'static str = "GUESTS";
-pub const GROUP_SPECIALGRP_LOCAL: &'static str = "LOCAL";
-pub const GROUP_ALL_PARMNUM: ::DWORD = 0;
-pub const GROUP_NAME_PARMNUM: ::DWORD = 1;
-pub const GROUP_COMMENT_PARMNUM: ::DWORD = 2;
-pub const GROUP_ATTRIBUTES_PARMNUM: ::DWORD = 3;
-pub const GROUP_ALL_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_ALL_PARMNUM;
-pub const GROUP_NAME_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_NAME_PARMNUM;
-pub const GROUP_COMMENT_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_COMMENT_PARMNUM;
-pub const GROUP_ATTRIBUTES_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + GROUP_ATTRIBUTES_PARMNUM;
-STRUCT!{struct LOCALGROUP_INFO_0 {
-    lgrpi0_name: ::LPWSTR,
-}}
-pub type PLOCALGROUP_INFO_0 = *mut LOCALGROUP_INFO_0;
-pub type LPLOCALGROUP_INFO_0 = *mut LOCALGROUP_INFO_0;
-STRUCT!{struct LOCALGROUP_INFO_1 {
-    lgrpi1_name: ::LPWSTR,
-    lgrpi1_comment: ::LPWSTR,
-}}
-pub type PLOCALGROUP_INFO_1 = *mut LOCALGROUP_INFO_1;
-pub type LPLOCALGROUP_INFO_1 = *mut LOCALGROUP_INFO_1;
-STRUCT!{struct LOCALGROUP_INFO_1002 {
-    lgrpi1002_comment: ::LPWSTR,
-}}
-pub type PLOCALGROUP_INFO_1002 = *mut LOCALGROUP_INFO_1002;
-pub type LPLOCALGROUP_INFO_1002 = *mut LOCALGROUP_INFO_1002;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_0 {
-    lgrmi0_sid: ::PSID,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_0 = *mut LOCALGROUP_MEMBERS_INFO_0;
-pub type LPLOCALGROUP_MEMBERS_INFO_0 = *mut LOCALGROUP_MEMBERS_INFO_0;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_1 {
-    lgrmi1_sid: ::PSID,
-    lgrmi1_sidusage: ::SID_NAME_USE,
-    lgrmi1_name: ::LPWSTR,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_1 = *mut LOCALGROUP_MEMBERS_INFO_1;
-pub type LPLOCALGROUP_MEMBERS_INFO_1 = *mut LOCALGROUP_MEMBERS_INFO_1;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_2 {
-    lgrmi2_sid: ::PSID,
-    lgrmi2_sidusage: ::SID_NAME_USE,
-    lgrmi2_domainandname: ::LPWSTR,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_2 = *mut LOCALGROUP_MEMBERS_INFO_2;
-pub type LPLOCALGROUP_MEMBERS_INFO_2 = *mut LOCALGROUP_MEMBERS_INFO_2;
-STRUCT!{struct LOCALGROUP_MEMBERS_INFO_3 {
-    lgrmi3_domainandname: ::LPWSTR,
-}}
-pub type PLOCALGROUP_MEMBERS_INFO_3 = *mut LOCALGROUP_MEMBERS_INFO_3;
-pub type LPLOCALGROUP_MEMBERS_INFO_3 = *mut LOCALGROUP_MEMBERS_INFO_3;
-STRUCT!{struct LOCALGROUP_USERS_INFO_0 {
-    lgrui0_name: ::LPWSTR,
-}}
-pub type PLOCALGROUP_USERS_INFO_0 = *mut LOCALGROUP_USERS_INFO_0;
-pub type LPLOCALGROUP_USERS_INFO_0 = *mut LOCALGROUP_USERS_INFO_0;
-pub const LOCALGROUP_NAME_PARMNUM: ::DWORD = 1;
-pub const LOCALGROUP_COMMENT_PARMNUM: ::DWORD = 2;
-STRUCT!{struct NET_DISPLAY_USER {
-    usri1_name: ::LPWSTR,
-    usri1_comment: ::LPWSTR,
-    usri1_flags: ::DWORD,
-    usri1_full_name: ::LPWSTR,
-    usri1_user_id: ::DWORD,
-    usri1_next_index: ::DWORD,
-}}
-pub type PNET_DISPLAY_USER = *mut NET_DISPLAY_USER;
-STRUCT!{struct NET_DISPLAY_MACHINE {
-    usri2_name: ::LPWSTR,
-    usri2_comment: ::LPWSTR,
-    usri2_flags: ::DWORD,
-    usri2_user_id: ::DWORD,
-    usri2_next_index: ::DWORD,
-}}
-pub type PNET_DISPLAY_MACHINE = *mut NET_DISPLAY_MACHINE;
-STRUCT!{struct NET_DISPLAY_GROUP {
-    usri3_name: ::LPWSTR,
-    usri3_comment: ::LPWSTR,
-    grpi3_group_id: ::DWORD,
-    grpi3_attributes: ::DWORD,
-    grpi3_next_index: ::DWORD,
-}}
-pub type PNET_DISPLAY_GROUP = *mut NET_DISPLAY_GROUP;
-STRUCT!{struct ACCESS_INFO_0 {
-    acc0_resource_name: ::LPWSTR,
-}}
-pub type PACCESS_INFO_0 = *mut ACCESS_INFO_0;
-pub type LPACCESS_INFO_0 = *mut ACCESS_INFO_0;
-STRUCT!{struct ACCESS_INFO_1 {
-    acc1_resource_name: ::LPWSTR,
-    acc1_attr: ::DWORD,
-    acc1_count: ::DWORD,
-}}
-pub type PACCESS_INFO_1 = *mut ACCESS_INFO_1;
-pub type LPACCESS_INFO_1 = *mut ACCESS_INFO_1;
-STRUCT!{struct ACCESS_INFO_1002 {
-    acc1002_attr: ::DWORD,
-}}
-pub type PACCESS_INFO_1002 = *mut ACCESS_INFO_1002;
-pub type LPACCESS_INFO_1002 = *mut ACCESS_INFO_1002;
-STRUCT!{struct ACCESS_LIST {
-    acl_ugname: ::LPWSTR,
-    acl_access: ::DWORD,
-}}
-pub type PACCESS_LIST = *mut ACCESS_LIST;
-pub type LPACCESS_LIST = *mut ACCESS_LIST;
-pub const ACCESS_NONE: ::DWORD = 0;
-pub const ACCESS_ALL: ::DWORD = ACCESS_READ | ACCESS_WRITE | ACCESS_CREATE | ACCESS_EXEC
-    | ACCESS_DELETE | ACCESS_ATRIB | ACCESS_PERM;
-pub const ACCESS_READ: ::DWORD = 0x01;
-pub const ACCESS_WRITE: ::DWORD = 0x02;
-pub const ACCESS_CREATE: ::DWORD = 0x04;
-pub const ACCESS_EXEC: ::DWORD = 0x08;
-pub const ACCESS_DELETE: ::DWORD = 0x10;
-pub const ACCESS_ATRIB: ::DWORD = 0x20;
-pub const ACCESS_PERM: ::DWORD = 0x40;
-pub const ACCESS_GROUP: ::DWORD = 0x8000;
-pub const ACCESS_AUDIT: ::DWORD = 0x1;
-pub const ACCESS_SUCCESS_OPEN: ::DWORD = 0x10;
-pub const ACCESS_SUCCESS_WRITE: ::DWORD = 0x20;
-pub const ACCESS_SUCCESS_DELETE: ::DWORD = 0x40;
-pub const ACCESS_SUCCESS_ACL: ::DWORD = 0x80;
-pub const ACCESS_SUCCESS_MASK: ::DWORD = 0xF0;
-pub const ACCESS_FAIL_OPEN: ::DWORD = 0x100;
-pub const ACCESS_FAIL_WRITE: ::DWORD = 0x200;
-pub const ACCESS_FAIL_DELETE: ::DWORD = 0x400;
-pub const ACCESS_FAIL_ACL: ::DWORD = 0x800;
-pub const ACCESS_FAIL_MASK: ::DWORD = 0xF00;
-pub const ACCESS_FAIL_SHIFT: ::DWORD = 4;
-pub const ACCESS_RESOURCE_NAME_PARMNUM: ::DWORD = 1;
-pub const ACCESS_ATTR_PARMNUM: ::DWORD = 2;
-pub const ACCESS_COUNT_PARMNUM: ::DWORD = 3;
-pub const ACCESS_ACCESS_LIST_PARMNUM: ::DWORD = 4;
-pub const ACCESS_RESOURCE_NAME_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + ACCESS_RESOURCE_NAME_PARMNUM;
-pub const ACCESS_ATTR_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + ACCESS_ATTR_PARMNUM;
-pub const ACCESS_COUNT_INFOLEVEL: ::DWORD = ::PARMNUM_BASE_INFOLEVEL + ACCESS_COUNT_PARMNUM;
-pub const ACCESS_ACCESS_LIST_INFOLEVEL: ::DWORD =
-    ::PARMNUM_BASE_INFOLEVEL + ACCESS_ACCESS_LIST_PARMNUM;
-ENUM!{enum NET_VALIDATE_PASSWORD_TYPE {
-    NetValidateAuthentication = 1,
-    NetValidatePasswordChange,
-    NetValidatePasswordReset,
-}}
-pub type PNET_VALIDATE_PASSWORD_TYPE = *mut NET_VALIDATE_PASSWORD_TYPE;
-STRUCT!{struct NET_VALIDATE_PASSWORD_HASH {
-    Length: ::ULONG,
-    Hash: ::LPBYTE,
-}}
-pub type PNET_VALIDATE_PASSWORD_HASH = *mut NET_VALIDATE_PASSWORD_HASH;
-pub const NET_VALIDATE_PASSWORD_LAST_SET: ::ULONG = 0x00000001;
-pub const NET_VALIDATE_BAD_PASSWORD_TIME: ::ULONG = 0x00000002;
-pub const NET_VALIDATE_LOCKOUT_TIME: ::ULONG = 0x00000004;
-pub const NET_VALIDATE_BAD_PASSWORD_COUNT: ::ULONG = 0x00000008;
-pub const NET_VALIDATE_PASSWORD_HISTORY_LENGTH: ::ULONG = 0x00000010;
-pub const NET_VALIDATE_PASSWORD_HISTORY: ::ULONG = 0x00000020;
-STRUCT!{struct NET_VALIDATE_PERSISTED_FIELDS {
-    PresentFields: ::ULONG,
-    PasswordLastSet: ::FILETIME,
-    BadPasswordTime: ::FILETIME,
-    LockoutTime: ::FILETIME,
-    BadPasswordCount: ::ULONG,
-    PasswordHistoryLength: ::ULONG,
-    PasswordHistory: PNET_VALIDATE_PASSWORD_HASH,
-}}
-pub type PNET_VALIDATE_PERSISTED_FIELDS = *mut NET_VALIDATE_PERSISTED_FIELDS;
-STRUCT!{struct NET_VALIDATE_OUTPUT_ARG {
-    ChangedPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    ValidationStatus: ::NET_API_STATUS,
-}}
-pub type PNET_VALIDATE_OUTPUT_ARG = *mut NET_VALIDATE_OUTPUT_ARG;
-STRUCT!{struct NET_VALIDATE_AUTHENTICATION_INPUT_ARG {
-    InputPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    PasswordMatched: ::BOOLEAN,
-}}
-pub type PNET_VALIDATE_AUTHENTICATION_INPUT_ARG = *mut NET_VALIDATE_AUTHENTICATION_INPUT_ARG;
-STRUCT!{struct NET_VALIDATE_PASSWORD_CHANGE_INPUT_ARG {
-    InputPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    ClearPassword: ::LPWSTR,
-    UserAccountName: ::LPWSTR,
-    HashedPassword: NET_VALIDATE_PASSWORD_HASH,
-    PasswordMatch: ::BOOLEAN,
-}}
-pub type PNET_VALIDATE_PASSWORD_CHANGE_INPUT_ARG = *mut NET_VALIDATE_PASSWORD_CHANGE_INPUT_ARG;
-STRUCT!{struct NET_VALIDATE_PASSWORD_RESET_INPUT_ARG {
-    InputPersistedFields: NET_VALIDATE_PERSISTED_FIELDS,
-    ClearPassword: ::LPWSTR,
-    UserAccountName: ::LPWSTR,
-    HashedPassword: NET_VALIDATE_PASSWORD_HASH,
-    PasswordMustChangeAtNextLogon: ::BOOLEAN,
-    ClearLockout: ::BOOLEAN,
-}}
-pub type PNET_VALIDATE_PASSWORD_RESET_INPUT_ARG = *mut NET_VALIDATE_PASSWORD_RESET_INPUT_ARG;
-pub const NETLOGON_CONTROL_QUERY: ::DWORD = 1;
-pub const NETLOGON_CONTROL_REPLICATE: ::DWORD = 2;
-pub const NETLOGON_CONTROL_SYNCHRONIZE: ::DWORD = 3;
-pub const NETLOGON_CONTROL_PDC_REPLICATE: ::DWORD = 4;
-pub const NETLOGON_CONTROL_REDISCOVER: ::DWORD = 5;
-pub const NETLOGON_CONTROL_TC_QUERY: ::DWORD = 6;
-pub const NETLOGON_CONTROL_TRANSPORT_NOTIFY: ::DWORD = 7;
-pub const NETLOGON_CONTROL_FIND_USER: ::DWORD = 8;
-pub const NETLOGON_CONTROL_CHANGE_PASSWORD: ::DWORD = 9;
-pub const NETLOGON_CONTROL_TC_VERIFY: ::DWORD = 10;
-pub const NETLOGON_CONTROL_FORCE_DNS_REG: ::DWORD = 11;
-pub const NETLOGON_CONTROL_QUERY_DNS_REG: ::DWORD = 12;
-pub const NETLOGON_CONTROL_UNLOAD_NETLOGON_DLL: ::DWORD = 0xFFFB;
-pub const NETLOGON_CONTROL_BACKUP_CHANGE_LOG: ::DWORD = 0xFFFC;
-pub const NETLOGON_CONTROL_TRUNCATE_LOG: ::DWORD = 0xFFFD;
-pub const NETLOGON_CONTROL_SET_DBFLAG: ::DWORD = 0xFFFE;
-pub const NETLOGON_CONTROL_BREAKPOINT: ::DWORD = 0xFFFF;
-STRUCT!{struct NETLOGON_INFO_1 {
-    netlog1_flags: ::DWORD,
-    netlog1_pdc_connection_status: ::NET_API_STATUS,
-}}
-pub type PNETLOGON_INFO_1 = *mut NETLOGON_INFO_1;
-STRUCT!{struct NETLOGON_INFO_2 {
-    netlog2_flags: ::DWORD,
-    netlog2_pdc_connection_status: ::NET_API_STATUS,
-    netlog2_trusted_dc_name: ::LPWSTR,
-    netlog2_tc_connection_status: ::NET_API_STATUS,
-}}
-pub type PNETLOGON_INFO_2 = *mut NETLOGON_INFO_2;
-STRUCT!{struct NETLOGON_INFO_3 {
-    netlog3_flags: ::DWORD,
-    netlog3_logon_attempts: ::DWORD,
-    netlog3_reserved1: ::DWORD,
-    netlog3_reserved2: ::DWORD,
-    netlog3_reserved3: ::DWORD,
-    netlog3_reserved4: ::DWORD,
-    netlog3_reserved5: ::DWORD,
-}}
-pub type PNETLOGON_INFO_3 = *mut NETLOGON_INFO_3;
-STRUCT!{struct NETLOGON_INFO_4 {
-    netlog4_trusted_dc_name: ::LPWSTR,
-    netlog4_trusted_domain_name: ::LPWSTR,
-}}
-pub type PNETLOGON_INFO_4 = *mut NETLOGON_INFO_4;
-pub const NETLOGON_REPLICATION_NEEDED: ::DWORD = 0x01;
-pub const NETLOGON_REPLICATION_IN_PROGRESS: ::DWORD = 0x02;
-pub const NETLOGON_FULL_SYNC_REPLICATION: ::DWORD = 0x04;
-pub const NETLOGON_REDO_NEEDED: ::DWORD = 0x08;
-pub const NETLOGON_HAS_IP: ::DWORD = 0x10;
-pub const NETLOGON_HAS_TIMESERV: ::DWORD = 0x20;
-pub const NETLOGON_DNS_UPDATE_FAILURE: ::DWORD = 0x40;
-pub const NETLOGON_VERIFY_STATUS_RETURNED: ::DWORD = 0x80;
-DEFINE_GUID!(ServiceAccountPasswordGUID, 0x262E99C9, 0x6160, 0x4871,
-    0xAC, 0xEC, 0x4E, 0x61, 0x73, 0x6B, 0x6F, 0x21);
-pub const SERVICE_ACCOUNT_FLAG_LINK_TO_HOST_ONLY: ::DWORD = 0x00000001;
-pub const SERVICE_ACCOUNT_FLAG_ADD_AGAINST_RODC: ::DWORD = 0x00000002;
-pub const SERVICE_ACCOUNT_FLAG_UNLINK_FROM_HOST_ONLY: ::DWORD = 0x00000001;
-pub const SERVICE_ACCOUNT_FLAG_REMOVE_OFFLINE: ::DWORD = 0x00000002;
-ENUM!{enum MSA_INFO_LEVEL {
-    MsaInfoLevel0 = 0,
-    MsaInfoLevelMax,
-}}
-pub type PMSA_INFO_LEVEL = *mut MSA_INFO_LEVEL;
-ENUM!{enum MSA_INFO_STATE {
-    MsaInfoNotExist = 1,
-    MsaInfoNotService,
-    MsaInfoCannotInstall,
-    MsaInfoCanInstall,
-    MsaInfoInstalled,
-}}
-pub type PMSA_INFO_STATE = *mut MSA_INFO_STATE;
-STRUCT!{struct MSA_INFO_0 {
-    State: MSA_INFO_STATE,
-}}
-pub type PMSA_INFO_0 = *mut MSA_INFO_0;
-pub type LPMSA_INFO_0 = *mut MSA_INFO_0;
diff --git a/vendor/winapi-0.2.8/src/lmcons.rs b/vendor/winapi-0.2.8/src/lmcons.rs
deleted file mode 100644
index 267db8bfb1..0000000000
--- a/vendor/winapi-0.2.8/src/lmcons.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This file contains constants used throughout the LAN Manager API header files.
-pub const CNLEN: ::DWORD = 15;
-pub const LM20_CNLEN: ::DWORD = 15;
-pub const DNLEN: ::DWORD = CNLEN;
-pub const LM20_DNLEN: ::DWORD = LM20_CNLEN;
-pub const UNCLEN: ::DWORD = CNLEN + 2;
-pub const LM20_UNCLEN: ::DWORD = LM20_CNLEN + 2;
-pub const NNLEN: ::DWORD = 80;
-pub const LM20_NNLEN: ::DWORD = 12;
-pub const RMLEN: ::DWORD = UNCLEN + 1 + NNLEN;
-pub const LM20_RMLEN: ::DWORD = LM20_UNCLEN + 1 + LM20_NNLEN;
-pub const SNLEN: ::DWORD = 80;
-pub const LM20_SNLEN: ::DWORD = 15;
-pub const STXTLEN: ::DWORD = 256;
-pub const LM20_STXTLEN: ::DWORD = 63;
-pub const PATHLEN: ::DWORD = 256;
-pub const LM20_PATHLEN: ::DWORD = 256;
-pub const DEVLEN: ::DWORD = 80;
-pub const LM20_DEVLEN: ::DWORD = 8;
-pub const EVLEN: ::DWORD = 16;
-pub const UNLEN: ::DWORD = 256;
-pub const LM20_UNLEN: ::DWORD = 20;
-pub const GNLEN: ::DWORD = UNLEN;
-pub const LM20_GNLEN: ::DWORD = LM20_UNLEN;
-pub const PWLEN: ::DWORD = 256;
-pub const LM20_PWLEN: ::DWORD = 14;
-pub const SHPWLEN: ::DWORD = 8;
-pub const CLTYPE_LEN: ::DWORD = 12;
-pub const MAXCOMMENTSZ: ::DWORD = 256;
-pub const LM20_MAXCOMMENTSZ: ::DWORD = 48;
-pub const QNLEN: ::DWORD = NNLEN;
-pub const LM20_QNLEN: ::DWORD = LM20_NNLEN;
-pub const ALERTSZ: ::DWORD = 128;
-pub const MAXDEVENTRIES: ::DWORD = 4 * 8; // FIXME: sizeof(int) instead of 4
-pub const NETBIOS_NAME_LEN: ::DWORD = 16;
-pub const MAX_PREFERRED_LENGTH: ::DWORD = -1i32 as ::DWORD;
-pub const CRYPT_KEY_LEN: ::DWORD = 7;
-pub const CRYPT_TXT_LEN: ::DWORD = 8;
-pub const ENCRYPTED_PWLEN: usize = 16;
-pub const SESSION_PWLEN: ::DWORD = 24;
-pub const SESSION_CRYPT_KLEN: ::DWORD = 21;
-pub const PARM_ERROR_UNKNOWN: ::DWORD = -1i32 as ::DWORD;
-pub const PARM_ERROR_NONE: ::DWORD = 0;
-pub const PARMNUM_BASE_INFOLEVEL: ::DWORD = 1000;
-pub type LMSTR = ::LPWSTR;
-pub type LMCSTR = ::LPCWSTR;
-pub type NET_API_STATUS = ::DWORD;
-pub type API_RET_TYPE = NET_API_STATUS;
-pub const PLATFORM_ID_DOS: ::DWORD = 300;
-pub const PLATFORM_ID_OS2: ::DWORD = 400;
-pub const PLATFORM_ID_NT: ::DWORD = 500;
-pub const PLATFORM_ID_OSF: ::DWORD = 600;
-pub const PLATFORM_ID_VMS: ::DWORD = 700;
diff --git a/vendor/winapi-0.2.8/src/lmdfs.rs b/vendor/winapi-0.2.8/src/lmdfs.rs
deleted file mode 100644
index b74c647890..0000000000
--- a/vendor/winapi-0.2.8/src/lmdfs.rs
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// This file contains structures, function prototypes, and definitions for the NetDfs API
-pub const DFS_VOLUME_STATES: ::DWORD = 0xF;
-pub const DFS_VOLUME_STATE_OK: ::DWORD = 1;
-pub const DFS_VOLUME_STATE_INCONSISTENT: ::DWORD = 2;
-pub const DFS_VOLUME_STATE_OFFLINE: ::DWORD = 3;
-pub const DFS_VOLUME_STATE_ONLINE: ::DWORD = 4;
-pub const DFS_VOLUME_STATE_RESYNCHRONIZE: ::DWORD = 0x10;
-pub const DFS_VOLUME_STATE_STANDBY: ::DWORD = 0x20;
-pub const DFS_VOLUME_STATE_FORCE_SYNC: ::DWORD = 0x40;
-pub const DFS_VOLUME_FLAVORS: ::DWORD = 0x0300;
-pub const DFS_VOLUME_FLAVOR_UNUSED1: ::DWORD = 0x0000;
-pub const DFS_VOLUME_FLAVOR_STANDALONE: ::DWORD = 0x0100;
-pub const DFS_VOLUME_FLAVOR_AD_BLOB: ::DWORD = 0x0200;
-pub const DFS_STORAGE_FLAVOR_UNUSED2: ::DWORD = 0x0300;
-pub const DFS_STORAGE_STATES: ::ULONG = 0xF;
-pub const DFS_STORAGE_STATE_OFFLINE: ::ULONG = 1;
-pub const DFS_STORAGE_STATE_ONLINE: ::ULONG = 2;
-pub const DFS_STORAGE_STATE_ACTIVE: ::ULONG = 4;
-ENUM!{enum DFS_TARGET_PRIORITY_CLASS {
-    DfsInvalidPriorityClass = -1i32 as u32,
-    DfsSiteCostNormalPriorityClass = 0,
-    DfsGlobalHighPriorityClass,
-    DfsSiteCostHighPriorityClass,
-    DfsSiteCostLowPriorityClass,
-    DfsGlobalLowPriorityClass,
-}}
-STRUCT!{struct DFS_TARGET_PRIORITY {
-    TargetPriorityClass: DFS_TARGET_PRIORITY_CLASS,
-    TargetPriorityRank: ::USHORT,
-    Reserved: ::USHORT,
-}}
-pub type PDFS_TARGET_PRIORITY = *mut DFS_TARGET_PRIORITY;
-STRUCT!{struct DFS_INFO_1 {
-    EntryPath: ::LPWSTR,
-}}
-pub type PDFS_INFO_1 = *mut DFS_INFO_1;
-pub type LPDFS_INFO_1 = *mut DFS_INFO_1;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_1_32 {
-    EntryPath: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_1_32 = *mut DFS_INFO_1_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_1_32 = *mut DFS_INFO_1_32;
-STRUCT!{struct DFS_INFO_2 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-}}
-pub type PDFS_INFO_2 = *mut DFS_INFO_2;
-pub type LPDFS_INFO_2 = *mut DFS_INFO_2;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_2_32 {
-    EntryPath: ::ULONG,
-    Comment: ::ULONG,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_2_32 = *mut DFS_INFO_2_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_2_32 = *mut DFS_INFO_2_32;
-STRUCT!{struct DFS_STORAGE_INFO {
-    State: ::ULONG,
-    ServerName: ::LPWSTR,
-    ShareName: ::LPWSTR,
-}}
-pub type PDFS_STORAGE_INFO = *mut DFS_STORAGE_INFO;
-pub type LPDFS_STORAGE_INFO = *mut DFS_STORAGE_INFO;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_STORAGE_INFO_0_32 {
-    State: ::ULONG,
-    ServerName: ::ULONG,
-    ShareName: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_STORAGE_INFO_0_32 = *mut DFS_STORAGE_INFO_0_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_STORAGE_INFO_0_32 = *mut DFS_STORAGE_INFO_0_32;
-STRUCT!{struct DFS_STORAGE_INFO_1 {
-    State: ::ULONG,
-    ServerName: ::LPWSTR,
-    ShareName: ::LPWSTR,
-    TargetPriority: DFS_TARGET_PRIORITY,
-}}
-pub type PDFS_STORAGE_INFO_1 = *mut DFS_STORAGE_INFO_1;
-pub type LPDFS_STORAGE_INFO_1 = *mut DFS_STORAGE_INFO_1;
-STRUCT!{struct DFS_INFO_3 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_3 = *mut DFS_INFO_3;
-pub type LPDFS_INFO_3 = *mut DFS_INFO_3;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_3_32 {
-    EntryPath: ::ULONG,
-    Comment: ::ULONG,
-    State: ::DWORD,
-    NumberOfStorages: ::DWORD,
-    Storage: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_3_32 = *mut DFS_INFO_3_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_3_32 = *mut DFS_INFO_3_32;
-STRUCT!{struct DFS_INFO_4 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_4 = *mut DFS_INFO_4;
-pub type LPDFS_INFO_4 = *mut DFS_INFO_4;
-#[cfg(target_arch="x86_64")] STRUCT!{struct DFS_INFO_4_32 {
-    EntryPath: ::ULONG,
-    Comment: ::ULONG,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    NumberOfStorages: ::DWORD,
-    Storage: ::ULONG,
-}}
-#[cfg(target_arch="x86_64")]
-pub type PDFS_INFO_4_32 = *mut DFS_INFO_4_32;
-#[cfg(target_arch="x86_64")]
-pub type LPDFS_INFO_4_32 = *mut DFS_INFO_4_32;
-STRUCT!{struct DFS_INFO_5 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    NumberOfStorages: ::DWORD,
-}}
-pub type PDFS_INFO_5 = *mut DFS_INFO_5;
-pub type LPDFS_INFO_5 = *mut DFS_INFO_5;
-STRUCT!{struct DFS_INFO_6 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_6 = *mut DFS_INFO_6;
-pub type LPDFS_INFO_6 = *mut DFS_INFO_6;
-STRUCT!{struct DFS_INFO_7 {
-    GenerationGuid: ::GUID,
-}}
-pub type PDFS_INFO_7 = *mut DFS_INFO_7;
-pub type LPDFS_INFO_7 = *mut DFS_INFO_7;
-STRUCT!{struct DFS_INFO_8 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-    NumberOfStorages: ::DWORD,
-}}
-pub type PDFS_INFO_8 = *mut DFS_INFO_8;
-pub type LPDFS_INFO_8 = *mut DFS_INFO_8;
-STRUCT!{struct DFS_INFO_9 {
-    EntryPath: ::LPWSTR,
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    Guid: ::GUID,
-    PropertyFlags: ::ULONG,
-    MetadataSize: ::ULONG,
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-    NumberOfStorages: ::DWORD,
-    Storage: LPDFS_STORAGE_INFO,
-}}
-pub type PDFS_INFO_9 = *mut DFS_INFO_9;
-pub type LPDFS_INFO_9 = *mut DFS_INFO_9;
-pub const DFS_PROPERTY_FLAG_INSITE_REFERRALS: ::ULONG = 0x00000001;
-pub const DFS_PROPERTY_FLAG_ROOT_SCALABILITY: ::ULONG = 0x00000002;
-pub const DFS_PROPERTY_FLAG_SITE_COSTING: ::ULONG = 0x00000004;
-pub const DFS_PROPERTY_FLAG_TARGET_FAILBACK: ::ULONG = 0x00000008;
-pub const DFS_PROPERTY_FLAG_CLUSTER_ENABLED: ::ULONG = 0x00000010;
-pub const DFS_PROPERTY_FLAG_ABDE: ::ULONG = 0x00000020;
-pub const DFS_VALID_PROPERTY_FLAGS: ::ULONG = DFS_PROPERTY_FLAG_INSITE_REFERRALS
-    | DFS_PROPERTY_FLAG_ROOT_SCALABILITY | DFS_PROPERTY_FLAG_SITE_COSTING
-    | DFS_PROPERTY_FLAG_TARGET_FAILBACK | DFS_PROPERTY_FLAG_CLUSTER_ENABLED
-    | DFS_PROPERTY_FLAG_ABDE;
-STRUCT!{struct DFS_INFO_50 {
-    NamespaceMajorVersion: ::ULONG,
-    NamespaceMinorVersion: ::ULONG,
-    NamespaceCapabilities: ::ULONGLONG,
-}}
-pub type PDFS_INFO_50 = *mut DFS_INFO_50;
-pub type LPDFS_INFO_50 = *mut DFS_INFO_50;
-STRUCT!{struct DFS_INFO_100 {
-    Comment: ::LPWSTR,
-}}
-pub type PDFS_INFO_100 = *mut DFS_INFO_100;
-pub type LPDFS_INFO_100 = *mut DFS_INFO_100;
-STRUCT!{struct DFS_INFO_101 {
-    State: ::DWORD,
-}}
-pub type PDFS_INFO_101 = *mut DFS_INFO_101;
-pub type LPDFS_INFO_101 = *mut DFS_INFO_101;
-STRUCT!{struct DFS_INFO_102 {
-    Timeout: ::ULONG,
-}}
-pub type PDFS_INFO_102 = *mut DFS_INFO_102;
-pub type LPDFS_INFO_102 = *mut DFS_INFO_102;
-STRUCT!{struct DFS_INFO_103 {
-    PropertyFlagMask: ::ULONG,
-    PropertyFlags: ::ULONG,
-}}
-pub type PDFS_INFO_103 = *mut DFS_INFO_103;
-pub type LPDFS_INFO_103 = *mut DFS_INFO_103;
-STRUCT!{struct DFS_INFO_104 {
-    TargetPriority: DFS_TARGET_PRIORITY,
-}}
-pub type PDFS_INFO_104 = *mut DFS_INFO_104;
-pub type LPDFS_INFO_104 = *mut DFS_INFO_104;
-STRUCT!{struct DFS_INFO_105 {
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    PropertyFlagMask: ::ULONG,
-    PropertyFlags: ::ULONG,
-}}
-pub type PDFS_INFO_105 = *mut DFS_INFO_105;
-pub type LPDFS_INFO_105 = *mut DFS_INFO_105;
-STRUCT!{struct DFS_INFO_106 {
-    State: ::DWORD,
-    TargetPriority: DFS_TARGET_PRIORITY,
-}}
-pub type PDFS_INFO_106 = *mut DFS_INFO_106;
-pub type LPDFS_INFO_106 = *mut DFS_INFO_106;
-STRUCT!{struct DFS_INFO_107 {
-    Comment: ::LPWSTR,
-    State: ::DWORD,
-    Timeout: ::ULONG,
-    PropertyFlagMask: ::ULONG,
-    PropertyFlags: ::ULONG,
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-}}
-pub type PDFS_INFO_107 = *mut DFS_INFO_107;
-pub type LPDFS_INFO_107 = *mut DFS_INFO_107;
-STRUCT!{struct DFS_INFO_150 {
-    SdLengthReserved: ::ULONG,
-    pSecurityDescriptor: ::PSECURITY_DESCRIPTOR,
-}}
-pub type PDFS_INFO_150 = *mut DFS_INFO_150;
-pub type LPDFS_INFO_150 = *mut DFS_INFO_150;
-STRUCT!{struct DFS_INFO_200 {
-    FtDfsName: ::LPWSTR,
-}}
-pub type PDFS_INFO_200 = *mut DFS_INFO_200;
-pub type LPDFS_INFO_200 = *mut DFS_INFO_200;
-STRUCT!{struct DFS_INFO_300 {
-    Flags: ::DWORD,
-    DfsName: ::LPWSTR,
-}}
-pub type PDFS_INFO_300 = *mut DFS_INFO_300;
-pub type LPDFS_INFO_300 = *mut DFS_INFO_300;
-pub const DFS_ADD_VOLUME: ::DWORD = 1;
-pub const DFS_RESTORE_VOLUME: ::DWORD = 2;
-pub const NET_DFS_SETDC_FLAGS: ::DWORD = 0x00000000;
-pub const NET_DFS_SETDC_TIMEOUT: ::DWORD = 0x00000001;
-pub const NET_DFS_SETDC_INITPKT: ::DWORD = 0x00000002;
-STRUCT!{struct DFS_SITENAME_INFO {
-    SiteFlags: ::ULONG,
-    SiteName: ::LPWSTR,
-}}
-pub type PDFS_SITENAME_INFO = *mut DFS_SITENAME_INFO;
-pub type LPDFS_SITENAME_INFO = *mut DFS_SITENAME_INFO;
-pub const DFS_SITE_PRIMARY: ::ULONG = 0x1;
-STRUCT!{struct DFS_SITELIST_INFO {
-    cSites: ::ULONG,
-    Site: [DFS_SITENAME_INFO; 1],
-}}
-pub type PDFS_SITELIST_INFO = *mut DFS_SITELIST_INFO;
-pub type LPDFS_SITELIST_INFO = *mut DFS_SITELIST_INFO;
-ENUM!{enum DFS_NAMESPACE_VERSION_ORIGIN {
-    DFS_NAMESPACE_VERSION_ORIGIN_COMBINED = 0,
-    DFS_NAMESPACE_VERSION_ORIGIN_SERVER,
-    DFS_NAMESPACE_VERSION_ORIGIN_DOMAIN,
-}}
-pub type PDFS_NAMESPACE_VERSION_ORIGIN = *mut DFS_NAMESPACE_VERSION_ORIGIN;
-pub const DFS_NAMESPACE_CAPABILITY_ABDE: ::ULONGLONG = 0x0000000000000001;
-STRUCT!{struct DFS_SUPPORTED_NAMESPACE_VERSION_INFO {
-    DomainDfsMajorVersion: ::ULONG,
-    DomainDfsMinorVersion: ::ULONG,
-    DomainDfsCapabilities: ::ULONGLONG,
-    StandaloneDfsMajorVersion: ::ULONG,
-    StandaloneDfsMinorVersion: ::ULONG,
-    StandaloneDfsCapabilities: ::ULONGLONG,
-}}
-pub type PDFS_SUPPORTED_NAMESPACE_VERSION_INFO = *mut DFS_SUPPORTED_NAMESPACE_VERSION_INFO;
diff --git a/vendor/winapi-0.2.8/src/lmerrlog.rs b/vendor/winapi-0.2.8/src/lmerrlog.rs
deleted file mode 100644
index ebbe3b0fef..0000000000
--- a/vendor/winapi-0.2.8/src/lmerrlog.rs
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct ERROR_LOG {
-    el_len: ::DWORD,
-    el_reserved: ::DWORD,
-    el_time: ::DWORD,
-    el_error: ::DWORD,
-    el_name: ::LPWSTR,
-    el_text: ::LPWSTR,
-    el_data: ::LPBYTE,
-    el_data_size: ::DWORD,
-    el_nstrings: ::DWORD,
-}}
-pub type PERROR_LOG = *mut ERROR_LOG;
-pub type LPERROR_LOG = *mut ERROR_LOG;
-STRUCT!{struct HLOG {
-    time: ::DWORD,
-    last_flags: ::DWORD,
-    offset: ::DWORD,
-    rec_offset: ::DWORD,
-}}
-pub type PHLOG = *mut HLOG;
-pub type LPHLOG = *mut HLOG;
-pub const LOGFLAGS_FORWARD: ::DWORD = 0;
-pub const LOGFLAGS_BACKWARD: ::DWORD = 0x1;
-pub const LOGFLAGS_SEEK: ::DWORD = 0x2;
-pub const ERRLOG_BASE: ::DWORD = 3100;
-pub const NELOG_Internal_Error: ::DWORD = ERRLOG_BASE + 0;
-pub const NELOG_Resource_Shortage: ::DWORD = ERRLOG_BASE + 1;
-pub const NELOG_Unable_To_Lock_Segment: ::DWORD = ERRLOG_BASE + 2;
-pub const NELOG_Unable_To_Unlock_Segment: ::DWORD = ERRLOG_BASE + 3;
-pub const NELOG_Uninstall_Service: ::DWORD = ERRLOG_BASE + 4;
-pub const NELOG_Init_Exec_Fail: ::DWORD = ERRLOG_BASE + 5;
-pub const NELOG_Ncb_Error: ::DWORD = ERRLOG_BASE + 6;
-pub const NELOG_Net_Not_Started: ::DWORD = ERRLOG_BASE + 7;
-pub const NELOG_Ioctl_Error: ::DWORD = ERRLOG_BASE + 8;
-pub const NELOG_System_Semaphore: ::DWORD = ERRLOG_BASE + 9;
-pub const NELOG_Init_OpenCreate_Err: ::DWORD = ERRLOG_BASE + 10;
-pub const NELOG_NetBios: ::DWORD = ERRLOG_BASE + 11;
-pub const NELOG_SMB_Illegal: ::DWORD = ERRLOG_BASE + 12;
-pub const NELOG_Service_Fail: ::DWORD = ERRLOG_BASE + 13;
-pub const NELOG_Entries_Lost: ::DWORD = ERRLOG_BASE + 14;
-pub const NELOG_Init_Seg_Overflow: ::DWORD = ERRLOG_BASE + 20;
-pub const NELOG_Srv_No_Mem_Grow: ::DWORD = ERRLOG_BASE + 21;
-pub const NELOG_Access_File_Bad: ::DWORD = ERRLOG_BASE + 22;
-pub const NELOG_Srvnet_Not_Started: ::DWORD = ERRLOG_BASE + 23;
-pub const NELOG_Init_Chardev_Err: ::DWORD = ERRLOG_BASE + 24;
-pub const NELOG_Remote_API: ::DWORD = ERRLOG_BASE + 25;
-pub const NELOG_Ncb_TooManyErr: ::DWORD = ERRLOG_BASE + 26;
-pub const NELOG_Mailslot_err: ::DWORD = ERRLOG_BASE + 27;
-pub const NELOG_ReleaseMem_Alert: ::DWORD = ERRLOG_BASE + 28;
-pub const NELOG_AT_cannot_write: ::DWORD = ERRLOG_BASE + 29;
-pub const NELOG_Cant_Make_Msg_File: ::DWORD = ERRLOG_BASE + 30;
-pub const NELOG_Exec_Netservr_NoMem: ::DWORD = ERRLOG_BASE + 31;
-pub const NELOG_Server_Lock_Failure: ::DWORD = ERRLOG_BASE + 32;
-pub const NELOG_Msg_Shutdown: ::DWORD = ERRLOG_BASE + 40;
-pub const NELOG_Msg_Sem_Shutdown: ::DWORD = ERRLOG_BASE + 41;
-pub const NELOG_Msg_Log_Err: ::DWORD = ERRLOG_BASE + 50;
-pub const NELOG_VIO_POPUP_ERR: ::DWORD = ERRLOG_BASE + 51;
-pub const NELOG_Msg_Unexpected_SMB_Type: ::DWORD = ERRLOG_BASE + 52;
-pub const NELOG_Wksta_Infoseg: ::DWORD = ERRLOG_BASE + 60;
-pub const NELOG_Wksta_Compname: ::DWORD = ERRLOG_BASE + 61;
-pub const NELOG_Wksta_BiosThreadFailure: ::DWORD = ERRLOG_BASE + 62;
-pub const NELOG_Wksta_IniSeg: ::DWORD = ERRLOG_BASE + 63;
-pub const NELOG_Wksta_HostTab_Full: ::DWORD = ERRLOG_BASE + 64;
-pub const NELOG_Wksta_Bad_Mailslot_SMB: ::DWORD = ERRLOG_BASE + 65;
-pub const NELOG_Wksta_UASInit: ::DWORD = ERRLOG_BASE + 66;
-pub const NELOG_Wksta_SSIRelogon: ::DWORD = ERRLOG_BASE + 67;
-pub const NELOG_Build_Name: ::DWORD = ERRLOG_BASE + 70;
-pub const NELOG_Name_Expansion: ::DWORD = ERRLOG_BASE + 71;
-pub const NELOG_Message_Send: ::DWORD = ERRLOG_BASE + 72;
-pub const NELOG_Mail_Slt_Err: ::DWORD = ERRLOG_BASE + 73;
-pub const NELOG_AT_cannot_read: ::DWORD = ERRLOG_BASE + 74;
-pub const NELOG_AT_sched_err: ::DWORD = ERRLOG_BASE + 75;
-pub const NELOG_AT_schedule_file_created: ::DWORD = ERRLOG_BASE + 76;
-pub const NELOG_Srvnet_NB_Open: ::DWORD = ERRLOG_BASE + 77;
-pub const NELOG_AT_Exec_Err: ::DWORD = ERRLOG_BASE + 78;
-pub const NELOG_Lazy_Write_Err: ::DWORD = ERRLOG_BASE + 80;
-pub const NELOG_HotFix: ::DWORD = ERRLOG_BASE + 81;
-pub const NELOG_HardErr_From_Server: ::DWORD = ERRLOG_BASE + 82;
-pub const NELOG_LocalSecFail1: ::DWORD = ERRLOG_BASE + 83;
-pub const NELOG_LocalSecFail2: ::DWORD = ERRLOG_BASE + 84;
-pub const NELOG_LocalSecFail3: ::DWORD = ERRLOG_BASE + 85;
-pub const NELOG_LocalSecGeneralFail: ::DWORD = ERRLOG_BASE + 86;
-pub const NELOG_NetWkSta_Internal_Error: ::DWORD = ERRLOG_BASE + 90;
-pub const NELOG_NetWkSta_No_Resource: ::DWORD = ERRLOG_BASE + 91;
-pub const NELOG_NetWkSta_SMB_Err: ::DWORD = ERRLOG_BASE + 92;
-pub const NELOG_NetWkSta_VC_Err: ::DWORD = ERRLOG_BASE + 93;
-pub const NELOG_NetWkSta_Stuck_VC_Err: ::DWORD = ERRLOG_BASE + 94;
-pub const NELOG_NetWkSta_NCB_Err: ::DWORD = ERRLOG_BASE + 95;
-pub const NELOG_NetWkSta_Write_Behind_Err: ::DWORD = ERRLOG_BASE + 96;
-pub const NELOG_NetWkSta_Reset_Err: ::DWORD = ERRLOG_BASE + 97;
-pub const NELOG_NetWkSta_Too_Many: ::DWORD = ERRLOG_BASE + 98;
-pub const NELOG_Srv_Thread_Failure: ::DWORD = ERRLOG_BASE + 104;
-pub const NELOG_Srv_Close_Failure: ::DWORD = ERRLOG_BASE + 105;
-pub const NELOG_ReplUserCurDir: ::DWORD = ERRLOG_BASE + 106;
-pub const NELOG_ReplCannotMasterDir: ::DWORD = ERRLOG_BASE + 107;
-pub const NELOG_ReplUpdateError: ::DWORD = ERRLOG_BASE + 108;
-pub const NELOG_ReplLostMaster: ::DWORD = ERRLOG_BASE + 109;
-pub const NELOG_NetlogonAuthDCFail: ::DWORD = ERRLOG_BASE + 110;
-pub const NELOG_ReplLogonFailed: ::DWORD = ERRLOG_BASE + 111;
-pub const NELOG_ReplNetErr: ::DWORD = ERRLOG_BASE + 112;
-pub const NELOG_ReplMaxFiles: ::DWORD = ERRLOG_BASE + 113;
-pub const NELOG_ReplMaxTreeDepth: ::DWORD = ERRLOG_BASE + 114;
-pub const NELOG_ReplBadMsg: ::DWORD = ERRLOG_BASE + 115;
-pub const NELOG_ReplSysErr: ::DWORD = ERRLOG_BASE + 116;
-pub const NELOG_ReplUserLoged: ::DWORD = ERRLOG_BASE + 117;
-pub const NELOG_ReplBadImport: ::DWORD = ERRLOG_BASE + 118;
-pub const NELOG_ReplBadExport: ::DWORD = ERRLOG_BASE + 119;
-pub const NELOG_ReplSignalFileErr: ::DWORD = ERRLOG_BASE + 120;
-pub const NELOG_DiskFT: ::DWORD = ERRLOG_BASE + 121;
-pub const NELOG_ReplAccessDenied: ::DWORD = ERRLOG_BASE + 122;
-pub const NELOG_NetlogonFailedPrimary: ::DWORD = ERRLOG_BASE + 123;
-pub const NELOG_NetlogonPasswdSetFailed: ::DWORD = ERRLOG_BASE + 124;
-pub const NELOG_NetlogonTrackingError: ::DWORD = ERRLOG_BASE + 125;
-pub const NELOG_NetlogonSyncError: ::DWORD = ERRLOG_BASE + 126;
-pub const NELOG_NetlogonRequireSignOrSealError: ::DWORD = ERRLOG_BASE + 127;
-pub const NELOG_UPS_PowerOut: ::DWORD = ERRLOG_BASE + 130;
-pub const NELOG_UPS_Shutdown: ::DWORD = ERRLOG_BASE + 131;
-pub const NELOG_UPS_CmdFileError: ::DWORD = ERRLOG_BASE + 132;
-pub const NELOG_UPS_CannotOpenDriver: ::DWORD = ERRLOG_BASE+133;
-pub const NELOG_UPS_PowerBack: ::DWORD = ERRLOG_BASE + 134;
-pub const NELOG_UPS_CmdFileConfig: ::DWORD = ERRLOG_BASE + 135;
-pub const NELOG_UPS_CmdFileExec: ::DWORD = ERRLOG_BASE + 136;
-pub const NELOG_Missing_Parameter: ::DWORD = ERRLOG_BASE + 150;
-pub const NELOG_Invalid_Config_Line: ::DWORD = ERRLOG_BASE + 151;
-pub const NELOG_Invalid_Config_File: ::DWORD = ERRLOG_BASE + 152;
-pub const NELOG_File_Changed: ::DWORD = ERRLOG_BASE + 153;
-pub const NELOG_Files_Dont_Fit: ::DWORD = ERRLOG_BASE + 154;
-pub const NELOG_Wrong_DLL_Version: ::DWORD = ERRLOG_BASE + 155;
-pub const NELOG_Error_in_DLL: ::DWORD = ERRLOG_BASE + 156;
-pub const NELOG_System_Error: ::DWORD = ERRLOG_BASE + 157;
-pub const NELOG_FT_ErrLog_Too_Large: ::DWORD = ERRLOG_BASE + 158;
-pub const NELOG_FT_Update_In_Progress: ::DWORD = ERRLOG_BASE + 159;
-pub const NELOG_Joined_Domain: ::DWORD = ERRLOG_BASE + 160;
-pub const NELOG_Joined_Workgroup: ::DWORD = ERRLOG_BASE + 161;
-pub const NELOG_OEM_Code: ::DWORD = ERRLOG_BASE + 199;
-pub const ERRLOG2_BASE: ::DWORD = 5700;
-pub const NELOG_NetlogonSSIInitError: ::DWORD = ERRLOG2_BASE + 0;
-pub const NELOG_NetlogonFailedToUpdateTrustList: ::DWORD = ERRLOG2_BASE + 1;
-pub const NELOG_NetlogonFailedToAddRpcInterface: ::DWORD = ERRLOG2_BASE + 2;
-pub const NELOG_NetlogonFailedToReadMailslot: ::DWORD = ERRLOG2_BASE + 3;
-pub const NELOG_NetlogonFailedToRegisterSC: ::DWORD = ERRLOG2_BASE + 4;
-pub const NELOG_NetlogonChangeLogCorrupt: ::DWORD = ERRLOG2_BASE + 5;
-pub const NELOG_NetlogonFailedToCreateShare: ::DWORD = ERRLOG2_BASE + 6;
-pub const NELOG_NetlogonDownLevelLogonFailed: ::DWORD = ERRLOG2_BASE + 7;
-pub const NELOG_NetlogonDownLevelLogoffFailed: ::DWORD = ERRLOG2_BASE + 8;
-pub const NELOG_NetlogonNTLogonFailed: ::DWORD = ERRLOG2_BASE + 9;
-pub const NELOG_NetlogonNTLogoffFailed: ::DWORD = ERRLOG2_BASE + 10;
-pub const NELOG_NetlogonPartialSyncCallSuccess: ::DWORD = ERRLOG2_BASE + 11;
-pub const NELOG_NetlogonPartialSyncCallFailed: ::DWORD = ERRLOG2_BASE + 12;
-pub const NELOG_NetlogonFullSyncCallSuccess: ::DWORD = ERRLOG2_BASE + 13;
-pub const NELOG_NetlogonFullSyncCallFailed: ::DWORD = ERRLOG2_BASE + 14;
-pub const NELOG_NetlogonPartialSyncSuccess: ::DWORD = ERRLOG2_BASE + 15;
-pub const NELOG_NetlogonPartialSyncFailed: ::DWORD = ERRLOG2_BASE + 16;
-pub const NELOG_NetlogonFullSyncSuccess: ::DWORD = ERRLOG2_BASE + 17;
-pub const NELOG_NetlogonFullSyncFailed: ::DWORD = ERRLOG2_BASE + 18;
-pub const NELOG_NetlogonAuthNoDomainController: ::DWORD = ERRLOG2_BASE + 19;
-pub const NELOG_NetlogonAuthNoTrustLsaSecret: ::DWORD = ERRLOG2_BASE + 20;
-pub const NELOG_NetlogonAuthNoTrustSamAccount: ::DWORD = ERRLOG2_BASE + 21;
-pub const NELOG_NetlogonServerAuthFailed: ::DWORD = ERRLOG2_BASE + 22;
-pub const NELOG_NetlogonServerAuthNoTrustSamAccount: ::DWORD = ERRLOG2_BASE + 23;
-pub const NELOG_FailedToRegisterSC: ::DWORD = ERRLOG2_BASE + 24;
-pub const NELOG_FailedToSetServiceStatus: ::DWORD = ERRLOG2_BASE + 25;
-pub const NELOG_FailedToGetComputerName: ::DWORD = ERRLOG2_BASE + 26;
-pub const NELOG_DriverNotLoaded: ::DWORD = ERRLOG2_BASE + 27;
-pub const NELOG_NoTranportLoaded: ::DWORD = ERRLOG2_BASE + 28;
-pub const NELOG_NetlogonFailedDomainDelta: ::DWORD = ERRLOG2_BASE + 29;
-pub const NELOG_NetlogonFailedGlobalGroupDelta: ::DWORD = ERRLOG2_BASE + 30;
-pub const NELOG_NetlogonFailedLocalGroupDelta: ::DWORD = ERRLOG2_BASE + 31;
-pub const NELOG_NetlogonFailedUserDelta: ::DWORD = ERRLOG2_BASE + 32;
-pub const NELOG_NetlogonFailedPolicyDelta: ::DWORD = ERRLOG2_BASE + 33;
-pub const NELOG_NetlogonFailedTrustedDomainDelta: ::DWORD = ERRLOG2_BASE + 34;
-pub const NELOG_NetlogonFailedAccountDelta: ::DWORD = ERRLOG2_BASE + 35;
-pub const NELOG_NetlogonFailedSecretDelta: ::DWORD = ERRLOG2_BASE + 36;
-pub const NELOG_NetlogonSystemError: ::DWORD = ERRLOG2_BASE + 37;
-pub const NELOG_NetlogonDuplicateMachineAccounts: ::DWORD = ERRLOG2_BASE + 38;
-pub const NELOG_NetlogonTooManyGlobalGroups: ::DWORD = ERRLOG2_BASE + 39;
-pub const NELOG_NetlogonBrowserDriver: ::DWORD = ERRLOG2_BASE + 40;
-pub const NELOG_NetlogonAddNameFailure: ::DWORD = ERRLOG2_BASE + 41;
-pub const NELOG_RplMessages: ::DWORD = ERRLOG2_BASE + 42;
-pub const NELOG_RplXnsBoot: ::DWORD = ERRLOG2_BASE + 43;
-pub const NELOG_RplSystem: ::DWORD = ERRLOG2_BASE + 44;
-pub const NELOG_RplWkstaTimeout: ::DWORD = ERRLOG2_BASE + 45;
-pub const NELOG_RplWkstaFileOpen: ::DWORD = ERRLOG2_BASE + 46;
-pub const NELOG_RplWkstaFileRead: ::DWORD = ERRLOG2_BASE + 47;
-pub const NELOG_RplWkstaMemory: ::DWORD = ERRLOG2_BASE + 48;
-pub const NELOG_RplWkstaFileChecksum: ::DWORD = ERRLOG2_BASE + 49;
-pub const NELOG_RplWkstaFileLineCount: ::DWORD = ERRLOG2_BASE + 50;
-pub const NELOG_RplWkstaBbcFile: ::DWORD = ERRLOG2_BASE + 51;
-pub const NELOG_RplWkstaFileSize: ::DWORD = ERRLOG2_BASE + 52;
-pub const NELOG_RplWkstaInternal: ::DWORD = ERRLOG2_BASE + 53;
-pub const NELOG_RplWkstaWrongVersion: ::DWORD = ERRLOG2_BASE + 54;
-pub const NELOG_RplWkstaNetwork: ::DWORD = ERRLOG2_BASE + 55;
-pub const NELOG_RplAdapterResource: ::DWORD = ERRLOG2_BASE + 56;
-pub const NELOG_RplFileCopy: ::DWORD = ERRLOG2_BASE + 57;
-pub const NELOG_RplFileDelete: ::DWORD = ERRLOG2_BASE + 58;
-pub const NELOG_RplFilePerms: ::DWORD = ERRLOG2_BASE + 59;
-pub const NELOG_RplCheckConfigs: ::DWORD = ERRLOG2_BASE + 60;
-pub const NELOG_RplCreateProfiles: ::DWORD = ERRLOG2_BASE + 61;
-pub const NELOG_RplRegistry: ::DWORD = ERRLOG2_BASE + 62;
-pub const NELOG_RplReplaceRPLDISK: ::DWORD = ERRLOG2_BASE + 63;
-pub const NELOG_RplCheckSecurity: ::DWORD = ERRLOG2_BASE + 64;
-pub const NELOG_RplBackupDatabase: ::DWORD = ERRLOG2_BASE + 65;
-pub const NELOG_RplInitDatabase: ::DWORD = ERRLOG2_BASE + 66;
-pub const NELOG_RplRestoreDatabaseFailure: ::DWORD = ERRLOG2_BASE + 67;
-pub const NELOG_RplRestoreDatabaseSuccess: ::DWORD = ERRLOG2_BASE + 68;
-pub const NELOG_RplInitRestoredDatabase: ::DWORD = ERRLOG2_BASE + 69;
-pub const NELOG_NetlogonSessionTypeWrong: ::DWORD = ERRLOG2_BASE + 70;
-pub const NELOG_RplUpgradeDBTo40: ::DWORD = ERRLOG2_BASE + 71;
-pub const NELOG_NetlogonLanmanBdcsNotAllowed: ::DWORD = ERRLOG2_BASE + 72;
-pub const NELOG_NetlogonNoDynamicDns: ::DWORD = ERRLOG2_BASE + 73;
-pub const NELOG_NetlogonDynamicDnsRegisterFailure: ::DWORD = ERRLOG2_BASE + 74;
-pub const NELOG_NetlogonDynamicDnsDeregisterFailure: ::DWORD = ERRLOG2_BASE + 75;
-pub const NELOG_NetlogonFailedFileCreate: ::DWORD = ERRLOG2_BASE + 76;
-pub const NELOG_NetlogonGetSubnetToSite: ::DWORD = ERRLOG2_BASE + 77;
-pub const NELOG_NetlogonNoSiteForClient: ::DWORD = ERRLOG2_BASE + 78;
-pub const NELOG_NetlogonBadSiteName: ::DWORD = ERRLOG2_BASE + 79;
-pub const NELOG_NetlogonBadSubnetName: ::DWORD = ERRLOG2_BASE + 80;
-pub const NELOG_NetlogonDynamicDnsServerFailure: ::DWORD = ERRLOG2_BASE + 81;
-pub const NELOG_NetlogonDynamicDnsFailure: ::DWORD = ERRLOG2_BASE + 82;
-pub const NELOG_NetlogonRpcCallCancelled: ::DWORD = ERRLOG2_BASE + 83;
-pub const NELOG_NetlogonDcSiteCovered: ::DWORD = ERRLOG2_BASE + 84;
-pub const NELOG_NetlogonDcSiteNotCovered: ::DWORD = ERRLOG2_BASE + 85;
-pub const NELOG_NetlogonGcSiteCovered: ::DWORD = ERRLOG2_BASE + 86;
-pub const NELOG_NetlogonGcSiteNotCovered: ::DWORD = ERRLOG2_BASE + 87;
-pub const NELOG_NetlogonFailedSpnUpdate: ::DWORD = ERRLOG2_BASE + 88;
-pub const NELOG_NetlogonFailedDnsHostNameUpdate: ::DWORD = ERRLOG2_BASE + 89;
-pub const NELOG_NetlogonAuthNoUplevelDomainController: ::DWORD = ERRLOG2_BASE + 90;
-pub const NELOG_NetlogonAuthDomainDowngraded: ::DWORD = ERRLOG2_BASE + 91;
-pub const NELOG_NetlogonNdncSiteCovered: ::DWORD = ERRLOG2_BASE + 92;
-pub const NELOG_NetlogonNdncSiteNotCovered: ::DWORD = ERRLOG2_BASE + 93;
-pub const NELOG_NetlogonDcOldSiteCovered: ::DWORD = ERRLOG2_BASE + 94;
-pub const NELOG_NetlogonDcSiteNotCoveredAuto: ::DWORD = ERRLOG2_BASE + 95;
-pub const NELOG_NetlogonGcOldSiteCovered: ::DWORD = ERRLOG2_BASE + 96;
-pub const NELOG_NetlogonGcSiteNotCoveredAuto: ::DWORD = ERRLOG2_BASE + 97;
-pub const NELOG_NetlogonNdncOldSiteCovered: ::DWORD = ERRLOG2_BASE + 98;
-pub const NELOG_NetlogonNdncSiteNotCoveredAuto: ::DWORD = ERRLOG2_BASE + 99;
-pub const NELOG_NetlogonSpnMultipleSamAccountNames: ::DWORD = ERRLOG2_BASE + 100;
-pub const NELOG_NetlogonSpnCrackNamesFailure: ::DWORD = ERRLOG2_BASE + 101;
-pub const NELOG_NetlogonNoAddressToSiteMapping: ::DWORD = ERRLOG2_BASE + 102;
-pub const NELOG_NetlogonInvalidGenericParameterValue: ::DWORD = ERRLOG2_BASE + 103;
-pub const NELOG_NetlogonInvalidDwordParameterValue: ::DWORD = ERRLOG2_BASE + 104;
-pub const NELOG_NetlogonServerAuthFailedNoAccount: ::DWORD = ERRLOG2_BASE + 105;
-pub const NELOG_NetlogonNoDynamicDnsManual: ::DWORD = ERRLOG2_BASE + 106;
-pub const NELOG_NetlogonNoSiteForClients: ::DWORD = ERRLOG2_BASE + 107;
-pub const NELOG_NetlogonDnsDeregAborted: ::DWORD = ERRLOG2_BASE + 108;
-pub const NELOG_NetlogonRpcPortRequestFailure: ::DWORD = ERRLOG2_BASE + 109;
-pub const NELOG_NetlogonPartialSiteMappingForClients: ::DWORD = ERRLOG2_BASE + 110;
-pub const NELOG_NetlogonRemoteDynamicDnsRegisterFailure: ::DWORD = ERRLOG2_BASE + 111;
-pub const NELOG_NetlogonRemoteDynamicDnsDeregisterFailure: ::DWORD = ERRLOG2_BASE + 112;
-pub const NELOG_NetlogonRejectedRemoteDynamicDnsRegister: ::DWORD = ERRLOG2_BASE + 113;
-pub const NELOG_NetlogonRejectedRemoteDynamicDnsDeregister: ::DWORD = ERRLOG2_BASE + 114;
-pub const NELOG_NetlogonRemoteDynamicDnsUpdateRequestFailure: ::DWORD = ERRLOG2_BASE + 115;
-pub const NELOG_NetlogonUserValidationReqInitialTimeOut: ::DWORD = ERRLOG2_BASE + 116;
-pub const NELOG_NetlogonUserValidationReqRecurringTimeOut: ::DWORD = ERRLOG2_BASE + 117;
-pub const NELOG_NetlogonUserValidationReqWaitInitialWarning: ::DWORD = ERRLOG2_BASE + 118;
-pub const NELOG_NetlogonUserValidationReqWaitRecurringWarning: ::DWORD = ERRLOG2_BASE + 119;
-pub const NELOG_NetlogonFailedToAddAuthzRpcInterface: ::DWORD = ERRLOG2_BASE + 120;
-pub const NELOG_NetLogonFailedToInitializeAuthzRm: ::DWORD = ERRLOG2_BASE + 121;
-pub const NELOG_NetLogonFailedToInitializeRPCSD: ::DWORD = ERRLOG2_BASE + 122;
-pub const NELOG_NetlogonMachinePasswdSetSucceeded: ::DWORD = ERRLOG2_BASE + 123;
-pub const NELOG_NetlogonMsaPasswdSetSucceeded: ::DWORD = ERRLOG2_BASE + 124;
diff --git a/vendor/winapi-0.2.8/src/lmjoin.rs b/vendor/winapi-0.2.8/src/lmjoin.rs
deleted file mode 100644
index 12b8a1014b..0000000000
--- a/vendor/winapi-0.2.8/src/lmjoin.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// Definitions and prototypes for the Net setup apis
-ENUM!{enum NETSETUP_NAME_TYPE {
-    NetSetupUnknown = 0,
-    NetSetupMachine,
-    NetSetupWorkgroup,
-    NetSetupDomain,
-    NetSetupNonExistentDomain,
-    NetSetupDnsMachine,
-}}
-pub type PNETSETUP_NAME_TYPE = *mut NETSETUP_NAME_TYPE;
-ENUM!{enum NETSETUP_JOIN_STATUS {
-    NetSetupUnknownStatus = 0,
-    NetSetupUnjoined,
-    NetSetupWorkgroupName,
-    NetSetupDomainName,
-}}
-pub type PNETSETUP_JOIN_STATUS = *mut NETSETUP_JOIN_STATUS;
-pub const NETSETUP_JOIN_DOMAIN: ::DWORD = 0x00000001;
-pub const NETSETUP_ACCT_CREATE: ::DWORD = 0x00000002;
-pub const NETSETUP_ACCT_DELETE: ::DWORD = 0x00000004;
-pub const NETSETUP_WIN9X_UPGRADE: ::DWORD = 0x00000010;
-pub const NETSETUP_DOMAIN_JOIN_IF_JOINED: ::DWORD = 0x00000020;
-pub const NETSETUP_JOIN_UNSECURE: ::DWORD = 0x00000040;
-pub const NETSETUP_MACHINE_PWD_PASSED: ::DWORD = 0x00000080;
-pub const NETSETUP_DEFER_SPN_SET: ::DWORD = 0x00000100;
-pub const NETSETUP_JOIN_DC_ACCOUNT: ::DWORD = 0x00000200;
-pub const NETSETUP_JOIN_WITH_NEW_NAME: ::DWORD = 0x00000400;
-pub const NETSETUP_JOIN_READONLY: ::DWORD = 0x00000800;
-pub const NETSETUP_DNS_NAME_CHANGES_ONLY: ::DWORD = 0x00001000;
-pub const NETSETUP_INSTALL_INVOCATION: ::DWORD = 0x00040000;
-pub const NETSETUP_AMBIGUOUS_DC: ::DWORD = 0x00001000;
-pub const NETSETUP_NO_NETLOGON_CACHE: ::DWORD = 0x00002000;
-pub const NETSETUP_DONT_CONTROL_SERVICES: ::DWORD = 0x00004000;
-pub const NETSETUP_SET_MACHINE_NAME: ::DWORD = 0x00008000;
-pub const NETSETUP_FORCE_SPN_SET: ::DWORD = 0x00010000;
-pub const NETSETUP_NO_ACCT_REUSE: ::DWORD = 0x00020000;
-pub const NETSETUP_ALT_SAMACCOUNTNAME: ::DWORD = 0x00020000;
-pub const NETSETUP_IGNORE_UNSUPPORTED_FLAGS: ::DWORD = 0x10000000;
-pub const NETSETUP_VALID_UNJOIN_FLAGS: ::DWORD = NETSETUP_ACCT_DELETE
-    | NETSETUP_IGNORE_UNSUPPORTED_FLAGS | NETSETUP_JOIN_DC_ACCOUNT;
-pub const NETSETUP_PROCESS_OFFLINE_FLAGS: ::DWORD = NETSETUP_JOIN_DOMAIN
-    | NETSETUP_DOMAIN_JOIN_IF_JOINED | NETSETUP_JOIN_WITH_NEW_NAME | NETSETUP_DONT_CONTROL_SERVICES
-    | NETSETUP_MACHINE_PWD_PASSED;
-pub const NETSETUP_PROVISION_DOWNLEVEL_PRIV_SUPPORT: ::DWORD = 0x00000001;
-pub const NETSETUP_PROVISION_REUSE_ACCOUNT: ::DWORD = 0x00000002;
-pub const NETSETUP_PROVISION_USE_DEFAULT_PASSWORD: ::DWORD = 0x00000004;
-pub const NETSETUP_PROVISION_SKIP_ACCOUNT_SEARCH: ::DWORD = 0x00000008;
-pub const NETSETUP_PROVISION_ROOT_CA_CERTS: ::DWORD = 0x00000010;
-pub const NETSETUP_PROVISION_PERSISTENTSITE: ::DWORD = 0x00000020;
-pub const NETSETUP_PROVISION_ONLINE_CALLER: ::DWORD = 0x40000000;
-pub const NETSETUP_PROVISION_CHECK_PWD_ONLY: ::DWORD = 0x80000000;
-pub const NETSETUP_PROVISIONING_PARAMS_WIN8_VERSION: ::DWORD = 0x00000001;
-pub const NETSETUP_PROVISIONING_PARAMS_CURRENT_VERSION: ::DWORD = 0x00000002;
-STRUCT!{struct NETSETUP_PROVISIONING_PARAMS {
-    dwVersion: ::DWORD,
-    lpDomain: ::LPCWSTR,
-    lpHostName: ::LPCWSTR,
-    lpMachineAccountOU: ::LPCWSTR,
-    lpDcName: ::LPCWSTR,
-    dwProvisionOptions: ::DWORD,
-    aCertTemplateNames: *mut ::LPCWSTR,
-    cCertTemplateNames: ::DWORD,
-    aMachinePolicyNames: *mut ::LPCWSTR,
-    cMachinePolicyNames: ::DWORD,
-    aMachinePolicyPaths: *mut ::LPCWSTR,
-    cMachinePolicyPaths: ::DWORD,
-    lpNetbiosName: ::LPWSTR,
-    lpSiteName: ::LPWSTR,
-    lpPrimaryDNSDomain: ::LPWSTR,
-}}
-pub type PNETSETUP_PROVISIONING_PARAMS = *mut NETSETUP_PROVISIONING_PARAMS;
-ENUM!{enum NET_COMPUTER_NAME_TYPE {
-    NetPrimaryComputerName,
-    NetAlternateComputerNames,
-    NetAllComputerNames,
-    NetComputerNameTypeMax,
-}}
-pub type PNET_COMPUTER_NAME_TYPE = *mut NET_COMPUTER_NAME_TYPE;
diff --git a/vendor/winapi-0.2.8/src/lsalookup.rs b/vendor/winapi-0.2.8/src/lsalookup.rs
deleted file mode 100644
index 039d72a3a0..0000000000
--- a/vendor/winapi-0.2.8/src/lsalookup.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! LSA Policy Lookup API
-STRUCT!{struct LSA_UNICODE_STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PWSTR,
-}}
-pub type PLSA_UNICODE_STRING = *mut LSA_UNICODE_STRING;
-STRUCT!{struct LSA_STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PCHAR,
-}}
-pub type PLSA_STRING = *mut LSA_STRING;
-STRUCT!{struct LSA_OBJECT_ATTRIBUTES {
-    Length: ::ULONG,
-    RootDirectory: ::HANDLE,
-    ObjectName: PLSA_UNICODE_STRING,
-    Attributes: ::ULONG,
-    SecurityDescriptor: ::PVOID,
-    SecurityQualityOfService: ::PVOID,
-}}
-pub type PLSA_OBJECT_ATTRIBUTES = *mut LSA_OBJECT_ATTRIBUTES;
-STRUCT!{struct LSA_TRUST_INFORMATION {
-    Name: LSA_UNICODE_STRING,
-    Sid: ::PSID,
-}}
-pub type PLSA_TRUST_INFORMATION = *mut LSA_TRUST_INFORMATION;
-STRUCT!{struct LSA_REFERENCED_DOMAIN_LIST {
-    Entries: ::ULONG,
-    Domains: PLSA_TRUST_INFORMATION,
-}}
-pub type PLSA_REFERENCED_DOMAIN_LIST = *mut LSA_REFERENCED_DOMAIN_LIST;
-STRUCT!{struct LSA_TRANSLATED_SID2 {
-    Use: ::SID_NAME_USE,
-    Sid: ::PSID,
-    DomainIndex: ::LONG,
-    Flags: ::ULONG,
-}}
-pub type PLSA_TRANSLATED_SID2 = *mut LSA_TRANSLATED_SID2;
-STRUCT!{struct LSA_TRANSLATED_NAME {
-    Use: ::SID_NAME_USE,
-    Name: LSA_UNICODE_STRING,
-    DomainIndex: ::LONG,
-}}
-pub type PLSA_TRANSLATED_NAME = *mut LSA_TRANSLATED_NAME;
-STRUCT!{struct POLICY_ACCOUNT_DOMAIN_INFO {
-    DomainName: LSA_UNICODE_STRING,
-    DomainSid: ::PSID,
-}}
-pub type PPOLICY_ACCOUNT_DOMAIN_INFO = *mut POLICY_ACCOUNT_DOMAIN_INFO;
-STRUCT!{struct POLICY_DNS_DOMAIN_INFO {
-    Name: LSA_UNICODE_STRING,
-    DnsDomainName: LSA_UNICODE_STRING,
-    DnsForestName: LSA_UNICODE_STRING,
-    DomainGuid: ::GUID,
-    Sid: ::PSID,
-}}
-pub type PPOLICY_DNS_DOMAIN_INFO = *mut POLICY_DNS_DOMAIN_INFO;
-pub const LOOKUP_VIEW_LOCAL_INFORMATION: ::ACCESS_MASK = 0x00000001;
-pub const LOOKUP_TRANSLATE_NAMES: ::ACCESS_MASK = 0x00000800;
-ENUM!{enum LSA_LOOKUP_DOMAIN_INFO_CLASS {
-    AccountDomainInformation = 5,
-    DnsDomainInformation = 12,
-}}
-pub type PLSA_LOOKUP_DOMAIN_INFO_CLASS = *mut LSA_LOOKUP_DOMAIN_INFO_CLASS;
-pub type LSA_LOOKUP_HANDLE = ::PVOID;
-pub type PLSA_LOOKUP_HANDLE = *mut ::PVOID;
diff --git a/vendor/winapi-0.2.8/src/macros.rs b/vendor/winapi-0.2.8/src/macros.rs
deleted file mode 100644
index 0bbd6aabff..0000000000
--- a/vendor/winapi-0.2.8/src/macros.rs
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Macros to make things easier to define
-macro_rules! DECLARE_HANDLE {
-    ($name:ident, $inner:ident) => {
-        #[allow(missing_copy_implementations)] pub enum $inner { }
-        pub type $name = *mut $inner;
-    };
-}
-macro_rules! MAKE_HRESULT {
-    ($sev:expr, $fac:expr, $code:expr) => {
-        ($sev << 31) | ($fac << 16) | $code
-    }
-}
-macro_rules! MAKE_SCODE {
-    ($sev:expr, $fac:expr, $code:expr) => {
-        ($sev << 31) | ($fac << 16) | $code
-    }
-}
-macro_rules! HIDP_ERROR_CODES {
-    ($sev:expr, $code:expr) => {
-        ($sev << 28) | (::FACILITY_HID_ERROR_CODE << 16) | $code
-    }
-}
-macro_rules! MAKEFOURCC {
-    ($a:expr, $b:expr, $c:expr, $d:expr) => {
-        ($a as i32) | (($b as i32) << 8) | (($c as i32) << 16) | (($d as i32) << 24)
-    }
-}
-#[macro_export]
-macro_rules! DEFINE_GUID {
-    (
-        $name:ident, $l:expr, $w1:expr, $w2:expr, $b1:expr, $b2:expr, $b3:expr, $b4:expr, $b5:expr,
-        $b6:expr, $b7:expr, $b8:expr
-    ) => {
-        pub const $name: $crate::GUID = $crate::GUID {
-            Data1: $l,
-            Data2: $w1,
-            Data3: $w2,
-            Data4: [$b1, $b2, $b3, $b4, $b5, $b6, $b7, $b8],
-        };
-    }
-}
-macro_rules! CTL_CODE {
-    ($DeviceType:expr, $Function:expr, $Method:expr, $Access:expr) => {
-        ($DeviceType << 16) | ($Access << 14) | ($Function << 2) | $Method
-    }
-}
-macro_rules! HID_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_NEITHER, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! HID_BUFFER_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_BUFFERED, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! HID_IN_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_IN_DIRECT, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! HID_OUT_CTL_CODE {
-    ($id:expr) => {
-        CTL_CODE!(::FILE_DEVICE_KEYBOARD, $id, ::METHOD_OUT_DIRECT, ::FILE_ANY_ACCESS)
-    }
-}
-macro_rules! AUDCLNT_ERR {
-    ($n:expr) => {
-        MAKE_HRESULT!(::SEVERITY_ERROR, ::FACILITY_AUDCLNT, $n)
-    };
-}
-macro_rules! AUDCLNT_SUCCESS {
-    ($n:expr) => {
-        MAKE_SCODE!(::SEVERITY_SUCCESS, ::FACILITY_AUDCLNT, $n)
-    };
-}
-macro_rules! BCRYPT_MAKE_INTERFACE_VERSION {
-    ($major:expr, $minor:expr) => {
-        ::BCRYPT_INTERFACE_VERSION { MajorVersion: $major, MinorVersion: $minor }
-    }
-}
-#[macro_export]
-macro_rules! RIDL {
-    (interface $interface:ident ($vtbl:ident)
-        {$(
-            fn $method:ident(&mut self $(,$p:ident : $t:ty)*) -> $rtr:ty
-        ),+}
-    ) => {
-        #[repr(C)] #[allow(missing_copy_implementations)]
-        pub struct $vtbl {
-            $(pub $method: unsafe extern "system" fn(
-                This: *mut $interface
-                $(,$p: $t)*
-            ) -> $rtr),+
-        }
-        #[repr(C)] #[derive(Debug)] #[allow(missing_copy_implementations)]
-        pub struct $interface {
-            pub lpVtbl: *const $vtbl
-        }
-        impl $interface {
-            #[inline]
-            $(pub unsafe fn $method(&mut self $(,$p: $t)*) -> $rtr {
-                ((*self.lpVtbl).$method)(self $(,$p)*)
-            })+
-        }
-    };
-    (interface $interface:ident ($vtbl:ident) : $pinterface:ident ($pvtbl:ident) {
-    }) => {
-        #[repr(C)] #[allow(missing_copy_implementations)]
-        pub struct $vtbl {
-            pub parent: $crate::$pvtbl
-        }
-        #[repr(C)] #[derive(Debug)] #[allow(missing_copy_implementations)]
-        pub struct $interface {
-            pub lpVtbl: *const $vtbl
-        }
-        impl ::std::ops::Deref for $interface {
-            type Target = $crate::$pinterface;
-            #[inline]
-            fn deref(&self) -> &$crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-        impl ::std::ops::DerefMut for $interface {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut $crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-    };
-    (interface $interface:ident ($vtbl:ident) : $pinterface:ident ($pvtbl:ident)
-        {$(
-            fn $method:ident(&mut self $(,$p:ident : $t:ty)*) -> $rtr:ty
-        ),+}
-    ) => {
-        #[repr(C)] #[allow(missing_copy_implementations)]
-        pub struct $vtbl {
-            pub parent: $crate::$pvtbl
-            $(,pub $method: unsafe extern "system" fn(
-                This: *mut $interface
-                $(,$p: $t)*
-            ) -> $rtr)+
-        }
-        #[repr(C)] #[derive(Debug)] #[allow(missing_copy_implementations)]
-        pub struct $interface {
-            pub lpVtbl: *const $vtbl
-        }
-        impl $interface {
-            #[inline]
-            $(pub unsafe fn $method(&mut self $(,$p: $t)*) -> $rtr {
-                ((*self.lpVtbl).$method)(self $(,$p)*)
-            })+
-        }
-        impl ::std::ops::Deref for $interface {
-            type Target = $crate::$pinterface;
-            #[inline]
-            fn deref(&self) -> &$crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-        impl ::std::ops::DerefMut for $interface {
-            #[inline]
-            fn deref_mut(&mut self) -> &mut $crate::$pinterface {
-                unsafe { ::std::mem::transmute(self) }
-            }
-        }
-    };
-}
-macro_rules! UNION {
-    ($base:ident, $field:ident, $variant:ident, $variantmut:ident, $fieldtype:ty) => {
-        impl $base {
-            #[inline]
-            pub unsafe fn $variant(&self) -> &$fieldtype {
-                ::std::mem::transmute(&self.$field)
-            }
-            #[inline]
-            pub unsafe fn $variantmut(&mut self) -> &mut $fieldtype {
-                ::std::mem::transmute(&mut self.$field)
-            }
-        }
-    }
-}
-macro_rules! BITFIELD {
-    ($base:ident $field:ident: $fieldtype:ty [
-        $($thing:ident $set_thing:ident[$r:expr],)+
-    ]) => {
-        impl $base {$(
-            #[inline]
-            pub fn $thing(&self) -> $fieldtype {
-                let size = ::std::mem::size_of::<$fieldtype>() * 8;
-                self.$field << (size - $r.end) >> (size - $r.end + $r.start)
-            }
-            #[inline]
-            pub fn $set_thing(&mut self, val: $fieldtype) {
-                let mask = ((1 << ($r.end - $r.start)) - 1) << $r.start;
-                self.$field &= !mask;
-                self.$field |= (val << $r.start) & mask;
-            }
-        )+}
-    }
-}
-#[macro_export]
-macro_rules! ENUM {
-    {enum $name:ident { $($variant:ident = $value:expr,)+ }} => {
-        #[repr(C)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-        pub struct $name(pub u32);
-        $(pub const $variant: $name = $name($value);)+
-    };
-    {enum $name:ident { $variant:ident = $value:expr, $($rest:tt)* }} => {
-        #[repr(C)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-        pub struct $name(pub u32);
-        pub const $variant: $name = $name($value);
-        ENUM!{@gen $name, $variant, $($rest)*}
-    };
-    {enum $name:ident { $variant:ident, $($rest:tt)* }} => {
-        ENUM!{enum $name { $variant = 0, $($rest)* }}
-    };
-    {@gen $name:ident, $base:ident,} => {};
-    {@gen $name:ident, $base:ident, $variant:ident = $value:expr, $($rest:tt)*} => {
-        pub const $variant: $name = $name($value);
-        ENUM!{@gen $name, $variant, $($rest)*}
-    };
-    {@gen $name:ident, $base:ident, $variant:ident, $($rest:tt)*} => {
-        pub const $variant: $name = $name($base.0 + 1u32);
-        ENUM!{@gen $name, $variant, $($rest)*}
-    };
-}
-macro_rules! FLAGS {
-    {enum $name:ident { $($variant:ident = $value:expr,)+ }} => {
-        #[repr(C)] #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-        pub struct $name(pub u32);
-        $(pub const $variant: $name = $name($value);)+
-        impl ::std::ops::BitAnd<$name> for $name {
-            type Output = $name;
-            fn bitand(self, o: $name) -> $name { $name(self.0 & o.0) }
-        }
-        impl ::std::ops::BitOr<$name> for $name {
-            type Output = $name;
-            fn bitor(self, o: $name) -> $name { $name(self.0 | o.0) }
-        }
-        impl ::std::ops::BitXor<$name> for $name {
-            type Output = $name;
-            fn bitxor(self, o: $name) -> $name { $name(self.0 ^ o.0) }
-        }
-        impl ::std::ops::Not for $name {
-            type Output = $name;
-            fn not(self) -> $name { $name(!self.0) }
-        }
-    }
-}
-macro_rules! STRUCT {
-    {$(#[$attrs:meta])* nodebug struct $name:ident { $($field:ident: $ftype:ty,)+ }} => {
-        #[repr(C)] $(#[$attrs])*
-        pub struct $name {
-            $(pub $field: $ftype,)+
-        }
-        impl Copy for $name {}
-        impl Clone for $name { fn clone(&self) -> $name { *self } }
-    };
-    {$(#[$attrs:meta])* struct $name:ident { $($field:ident: $ftype:ty,)+ }} => {
-        #[repr(C)] #[derive(Debug)] $(#[$attrs])*
-        pub struct $name {
-            $(pub $field: $ftype,)+
-        }
-        impl Copy for $name {}
-        impl Clone for $name { fn clone(&self) -> $name { *self } }
-    };
-}
diff --git a/vendor/winapi-0.2.8/src/memoryapi.rs b/vendor/winapi-0.2.8/src/memoryapi.rs
deleted file mode 100644
index 30cefea5a6..0000000000
--- a/vendor/winapi-0.2.8/src/memoryapi.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-memory-l1-1-0
-pub const FILE_MAP_WRITE: ::DWORD = ::SECTION_MAP_WRITE;
-pub const FILE_MAP_READ: ::DWORD = ::SECTION_MAP_READ;
-pub const FILE_MAP_ALL_ACCESS: ::DWORD = ::SECTION_ALL_ACCESS;
-pub const FILE_MAP_EXECUTE: ::DWORD = ::SECTION_MAP_EXECUTE_EXPLICIT;
-pub const FILE_MAP_COPY: ::DWORD = 0x00000001;
-pub const FILE_MAP_RESERVE: ::DWORD = 0x80000000;
-ENUM!{enum MEMORY_RESOURCE_NOTIFICATION_TYPE {
-    LowMemoryResourceNotification,
-    HighMemoryResourceNotification,
-}}
-STRUCT!{struct WIN32_MEMORY_RANGE_ENTRY {
-    VirtualAddress: ::PVOID,
-    NumberOfBytes: ::SIZE_T,
-}}
-pub type PWIN32_MEMORY_RANGE_ENTRY = *mut WIN32_MEMORY_RANGE_ENTRY;
-pub type PBAD_MEMORY_CALLBACK_ROUTINE = Option<unsafe extern "system" fn()>;
diff --git a/vendor/winapi-0.2.8/src/minschannel.rs b/vendor/winapi-0.2.8/src/minschannel.rs
deleted file mode 100644
index 828f1be6a7..0000000000
--- a/vendor/winapi-0.2.8/src/minschannel.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Public Definitions for MIN SCHANNEL Security Provider
-
-pub const SECPKG_ATTR_ISSUER_LIST: ::DWORD = 0x50;
-pub const SECPKG_ATTR_REMOTE_CRED: ::DWORD = 0x51;
-pub const SECPKG_ATTR_LOCAL_CRED: ::DWORD = 0x52;
-pub const SECPKG_ATTR_REMOTE_CERT_CONTEXT: ::DWORD = 0x53;
-pub const SECPKG_ATTR_LOCAL_CERT_CONTEXT: ::DWORD = 0x54;
-pub const SECPKG_ATTR_ROOT_STORE: ::DWORD = 0x55;
-pub const SECPKG_ATTR_SUPPORTED_ALGS: ::DWORD = 0x56;
-pub const SECPKG_ATTR_CIPHER_STRENGTHS: ::DWORD = 0x57;
-pub const SECPKG_ATTR_SUPPORTED_PROTOCOLS: ::DWORD = 0x58;
-pub const SECPKG_ATTR_ISSUER_LIST_EX: ::DWORD = 0x59;
-pub const SECPKG_ATTR_CONNECTION_INFO: ::DWORD = 0x5a;
-pub const SECPKG_ATTR_EAP_KEY_BLOCK: ::DWORD = 0x5b;
-pub const SECPKG_ATTR_MAPPED_CRED_ATTR: ::DWORD = 0x5c;
-pub const SECPKG_ATTR_SESSION_INFO: ::DWORD = 0x5d;
-pub const SECPKG_ATTR_APP_DATA: ::DWORD = 0x5e;
-pub const SECPKG_ATTR_REMOTE_CERTIFICATES: ::DWORD = 0x5F;
-pub const SECPKG_ATTR_CLIENT_CERT_POLICY: ::DWORD = 0x60;
-pub const SECPKG_ATTR_CC_POLICY_RESULT: ::DWORD = 0x61;
-pub const SECPKG_ATTR_USE_NCRYPT: ::DWORD = 0x62;
-pub const SECPKG_ATTR_LOCAL_CERT_INFO: ::DWORD = 0x63;
-pub const SECPKG_ATTR_CIPHER_INFO: ::DWORD = 0x64;
-pub const SECPKG_ATTR_EAP_PRF_INFO: ::DWORD = 0x65;
-pub const SECPKG_ATTR_SUPPORTED_SIGNATURES: ::DWORD = 0x66;
-pub const SECPKG_ATTR_REMOTE_CERT_CHAIN: ::DWORD = 0x67;
-pub const SECPKG_ATTR_UI_INFO: ::DWORD = 0x68;
-pub const SECPKG_ATTR_EARLY_START: ::DWORD = 0x69;
-
-STRUCT!{struct SecPkgCred_SupportedAlgs {
-	cSupportedAlgs: ::DWORD,
-	palgSupportedAlgs: ::ALG_ID,
-}}
-
-STRUCT!{struct SecPkgCred_CipherStrengths {
-	dwMinimumCipherStrength: ::DWORD,
-	dwMaximumCipherStrength: ::DWORD,
-}}
-
-STRUCT!{struct SecPkgCred_SupportedProtocols {
-	grbitProtocol: ::DWORD,
-}}
-
-STRUCT!{struct SecPkgCred_ClientCertPolicy {
-	dwFlags: ::DWORD,
-	guidPolicyId: ::GUID,
-	dwCertFlags: ::DWORD,
-	dwUrlRetrievalTimeout: ::DWORD,
-	fCheckRevocationFreshnessTime: ::BOOL,
-	dwRevocationFreshnessTime: ::DWORD,
-	fOmitUsageCheck: ::BOOL,
-	pwszSslCtlStoreName: ::LPWSTR,
-	pwszSslCtlIdentifier: ::LPWSTR,
-}}
\ No newline at end of file
diff --git a/vendor/winapi-0.2.8/src/minwinbase.rs b/vendor/winapi-0.2.8/src/minwinbase.rs
deleted file mode 100644
index f6317fa254..0000000000
--- a/vendor/winapi-0.2.8/src/minwinbase.rs
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows Base APIs
-STRUCT!{struct SECURITY_ATTRIBUTES {
-    nLength: ::DWORD,
-    lpSecurityDescriptor: ::LPVOID,
-    bInheritHandle: ::BOOL,
-}}
-pub type PSECURITY_ATTRIBUTES = *mut SECURITY_ATTRIBUTES;
-pub type LPSECURITY_ATTRIBUTES = *mut SECURITY_ATTRIBUTES;
-STRUCT!{struct OVERLAPPED {
-    Internal: ::ULONG_PTR,
-    InternalHigh: ::ULONG_PTR,
-    Offset: ::DWORD,
-    OffsetHigh: ::DWORD,
-    hEvent: ::HANDLE,
-}}
-UNION!(OVERLAPPED, Offset, Pointer, Pointer_mut, ::PVOID);
-pub type LPOVERLAPPED = *mut OVERLAPPED;
-STRUCT!{struct OVERLAPPED_ENTRY {
-    lpCompletionKey: ::ULONG_PTR,
-    lpOverlapped: LPOVERLAPPED,
-    Internal: ::ULONG_PTR,
-    dwNumberOfBytesTransferred: ::DWORD,
-}}
-pub type LPOVERLAPPED_ENTRY = *mut OVERLAPPED_ENTRY;
-STRUCT!{struct SYSTEMTIME {
-    wYear: ::WORD,
-    wMonth: ::WORD,
-    wDayOfWeek: ::WORD,
-    wDay: ::WORD,
-    wHour: ::WORD,
-    wMinute: ::WORD,
-    wSecond: ::WORD,
-    wMilliseconds: ::WORD,
-}}
-pub type PSYSTEMTIME = *mut SYSTEMTIME;
-pub type LPSYSTEMTIME = *mut SYSTEMTIME;
-STRUCT!{nodebug struct WIN32_FIND_DATAA {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-    dwReserved0: ::DWORD,
-    dwReserved1: ::DWORD,
-    cFileName: [::CHAR; ::MAX_PATH],
-    cAlternateFileName: [::CHAR; 14],
-}}
-pub type PWIN32_FIND_DATAA = *mut WIN32_FIND_DATAA;
-pub type LPWIN32_FIND_DATAA = *mut WIN32_FIND_DATAA;
-STRUCT!{nodebug struct WIN32_FIND_DATAW {
-    dwFileAttributes: ::DWORD,
-    ftCreationTime: ::FILETIME,
-    ftLastAccessTime: ::FILETIME,
-    ftLastWriteTime: ::FILETIME,
-    nFileSizeHigh: ::DWORD,
-    nFileSizeLow: ::DWORD,
-    dwReserved0: ::DWORD,
-    dwReserved1: ::DWORD,
-    cFileName: [::WCHAR; ::MAX_PATH],
-    cAlternateFileName: [::WCHAR; 14],
-}}
-pub type PWIN32_FIND_DATAW = *mut WIN32_FIND_DATAW;
-pub type LPWIN32_FIND_DATAW = *mut WIN32_FIND_DATAW;
-ENUM!{enum FINDEX_INFO_LEVELS {
-    FindExInfoStandard,
-    FindExInfoBasic,
-    FindExInfoMaxInfoLevel,
-}}
-pub const FIND_FIRST_EX_CASE_SENSITIVE: ::DWORD = 0x00000001;
-pub const FIND_FIRST_EX_LARGE_FETCH: ::DWORD = 0x00000002;
-ENUM!{enum FINDEX_SEARCH_OPS {
-    FindExSearchNameMatch,
-    FindExSearchLimitToDirectories,
-    FindExSearchLimitToDevices,
-    FindExSearchMaxSearchOp,
-}}
-ENUM!{enum GET_FILEEX_INFO_LEVELS {
-    GetFileExInfoStandard,
-    GetFileExMaxInfoLevel,
-}}
-ENUM!{enum FILE_INFO_BY_HANDLE_CLASS {
-    FileBasicInfo,
-    FileStandardInfo,
-    FileNameInfo,
-    FileRenameInfo,
-    FileDispositionInfo,
-    FileAllocationInfo,
-    FileEndOfFileInfo,
-    FileStreamInfo,
-    FileCompressionInfo,
-    FileAttributeTagInfo,
-    FileIdBothDirectoryInfo,
-    FileIdBothDirectoryRestartInfo,
-    FileIoPriorityHintInfo,
-    FileRemoteProtocolInfo,
-    FileFullDirectoryInfo,
-    FileFullDirectoryRestartInfo,
-    FileStorageInfo,
-    FileAlignmentInfo,
-    FileIdInfo,
-    FileIdExtdDirectoryInfo,
-    FileIdExtdDirectoryRestartInfo,
-    MaximumFileInfoByHandleClass,
-}}
-pub type PFILE_INFO_BY_HANDLE_CLASS = *mut FILE_INFO_BY_HANDLE_CLASS;
-pub type CRITICAL_SECTION = ::RTL_CRITICAL_SECTION;
-pub type PCRITICAL_SECTION = ::PRTL_CRITICAL_SECTION;
-pub type LPCRITICAL_SECTION = ::PRTL_CRITICAL_SECTION;
-pub type CRITICAL_SECTION_DEBUG = ::RTL_CRITICAL_SECTION_DEBUG;
-pub type PCRITICAL_SECTION_DEBUG = ::PRTL_CRITICAL_SECTION_DEBUG;
-pub type LPCRITICAL_SECTION_DEBUG = ::PRTL_CRITICAL_SECTION_DEBUG;
-pub type LPOVERLAPPED_COMPLETION_ROUTINE = Option<unsafe extern "system" fn(
-    dwErrorCode: ::DWORD, dwNumberOfBytesTransfered: ::DWORD, lpOverlapped: LPOVERLAPPED,
-)>;
-pub const LOCKFILE_FAIL_IMMEDIATELY: ::DWORD = 0x00000001;
-pub const LOCKFILE_EXCLUSIVE_LOCK: ::DWORD = 0x00000002;
-STRUCT!{struct PROCESS_HEAP_ENTRY_Block {
-    hMem: ::HANDLE,
-    dwReserved: [::DWORD; 3],
-}}
-STRUCT!{struct PROCESS_HEAP_ENTRY_Region {
-    dwCommittedSize: ::DWORD,
-    dwUnCommittedSize: ::DWORD,
-    lpFirstBlock: ::LPVOID,
-    lpLastBlock: ::LPVOID,
-}}
-STRUCT!{struct PROCESS_HEAP_ENTRY {
-    lpData: ::PVOID,
-    cbData: ::DWORD,
-    cbOverhead: ::BYTE,
-    iRegionIndex: ::BYTE,
-    wFlags: ::WORD,
-    Region: PROCESS_HEAP_ENTRY_Region,
-}}
-UNION!(PROCESS_HEAP_ENTRY, Region, Block, Block_mut, PROCESS_HEAP_ENTRY_Block);
-pub type LPPROCESS_HEAP_ENTRY = *mut PROCESS_HEAP_ENTRY;
-pub type PPROCESS_HEAP_ENTRY = *mut PROCESS_HEAP_ENTRY;
-pub const PROCESS_HEAP_REGION: ::WORD = 0x0001;
-pub const PROCESS_HEAP_UNCOMMITTED_RANGE: ::WORD = 0x0002;
-pub const PROCESS_HEAP_ENTRY_BUSY: ::WORD = 0x0004;
-pub const PROCESS_HEAP_SEG_ALLOC: ::WORD = 0x0008;
-pub const PROCESS_HEAP_ENTRY_MOVEABLE: ::WORD = 0x0010;
-pub const PROCESS_HEAP_ENTRY_DDESHARE: ::WORD = 0x0020;
-pub type PTHREAD_START_ROUTINE = Option<unsafe extern "system" fn(
-    lpThreadParameter: ::LPVOID,
-) -> ::DWORD>;
-pub type LPTHREAD_START_ROUTINE = PTHREAD_START_ROUTINE;
-pub type LPCONTEXT = ::PCONTEXT;
-STRUCT!{struct REASON_CONTEXT_Detailed {
-    LocalizedReasonModule: ::HMODULE,
-    LocalizedReasonId: ::ULONG,
-    ReasonStringCount: ::ULONG,
-    ReasonStrings: *mut ::LPWSTR,
-}}
-STRUCT!{struct REASON_CONTEXT {
-    Version: ::ULONG,
-    Flags: ::DWORD,
-    Reason: REASON_CONTEXT_Detailed,
-}}
-UNION!(REASON_CONTEXT, Reason, SimpleReasonString, SimpleReasonString_mut, ::LPWSTR);
-pub type PREASON_CONTEXT = *mut REASON_CONTEXT;
-pub const EXCEPTION_DEBUG_EVENT: ::DWORD = 1;
-pub const CREATE_THREAD_DEBUG_EVENT: ::DWORD = 2;
-pub const CREATE_PROCESS_DEBUG_EVENT: ::DWORD = 3;
-pub const EXIT_THREAD_DEBUG_EVENT: ::DWORD = 4;
-pub const EXIT_PROCESS_DEBUG_EVENT: ::DWORD = 5;
-pub const LOAD_DLL_DEBUG_EVENT: ::DWORD = 6;
-pub const UNLOAD_DLL_DEBUG_EVENT: ::DWORD = 7;
-pub const OUTPUT_DEBUG_STRING_EVENT: ::DWORD = 8;
-pub const RIP_EVENT: ::DWORD = 9;
-STRUCT!{struct EXCEPTION_DEBUG_INFO {
-    ExceptionRecord: ::EXCEPTION_RECORD,
-    dwFirstChance: ::DWORD,
-}}
-pub type LPEXCEPTION_DEBUG_INFO = *mut EXCEPTION_DEBUG_INFO;
-STRUCT!{nodebug struct CREATE_THREAD_DEBUG_INFO {
-    hThread: ::HANDLE,
-    lpThreadLocalBase: ::LPVOID,
-    lpStartAddress: LPTHREAD_START_ROUTINE,
-}}
-pub type LPCREATE_THREAD_DEBUG_INFO = *mut CREATE_THREAD_DEBUG_INFO;
-STRUCT!{nodebug struct CREATE_PROCESS_DEBUG_INFO {
-    hFile: ::HANDLE,
-    hProcess: ::HANDLE,
-    hThread: ::HANDLE,
-    lpBaseOfImage: ::LPVOID,
-    dwDebugInfoFileOffset: ::DWORD,
-    nDebugInfoSize: ::DWORD,
-    lpThreadLocalBase: ::LPVOID,
-    lpStartAddress: LPTHREAD_START_ROUTINE,
-    lpImageName: ::LPVOID,
-    fUnicode: ::WORD,
-}}
-pub type LPCREATE_PROCESS_DEBUG_INFO = *mut CREATE_PROCESS_DEBUG_INFO;
-STRUCT!{struct EXIT_THREAD_DEBUG_INFO {
-    dwExitCode: ::DWORD,
-}}
-pub type LPEXIT_THREAD_DEBUG_INFO = *mut EXIT_THREAD_DEBUG_INFO;
-STRUCT!{struct EXIT_PROCESS_DEBUG_INFO {
-    dwExitCode: ::DWORD,
-}}
-pub type LPEXIT_PROCESS_DEBUG_INFO = *mut EXIT_PROCESS_DEBUG_INFO;
-STRUCT!{struct LOAD_DLL_DEBUG_INFO {
-    hFile: ::HANDLE,
-    lpBaseOfDll: ::LPVOID,
-    dwDebugInfoFileOffset: ::DWORD,
-    nDebugInfoSize: ::DWORD,
-    lpImageName: ::LPVOID,
-    fUnicode: ::WORD,
-}}
-pub type LPLOAD_DLL_DEBUG_INFO = *mut LOAD_DLL_DEBUG_INFO;
-STRUCT!{struct UNLOAD_DLL_DEBUG_INFO {
-    lpBaseOfDll: ::LPVOID,
-}}
-pub type LPUNLOAD_DLL_DEBUG_INFO = *mut UNLOAD_DLL_DEBUG_INFO;
-STRUCT!{struct OUTPUT_DEBUG_STRING_INFO {
-    lpDebugStringData: ::LPSTR,
-    fUnicode: ::WORD,
-    nDebugStringLength: ::WORD,
-}}
-pub type LPOUTPUT_DEBUG_STRING_INFO = *mut OUTPUT_DEBUG_STRING_INFO;
-STRUCT!{struct RIP_INFO {
-    dwError: ::DWORD,
-    dwType: ::DWORD,
-}}
-pub type LPRIP_INFO = *mut RIP_INFO;
-#[cfg(target_arch="x86_64")]
-STRUCT!{nodebug struct DEBUG_EVENT {
-    dwDebugEventCode: ::DWORD,
-    dwProcessId: ::DWORD,
-    dwThreadId: ::DWORD,
-    u: [u8; 160],
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{nodebug struct DEBUG_EVENT {
-    dwDebugEventCode: ::DWORD,
-    dwProcessId: ::DWORD,
-    dwThreadId: ::DWORD,
-    u: [u8; 84],
-}}
-UNION!(DEBUG_EVENT, u, Exception, Exception_mut, EXCEPTION_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, CreateThread, CreateThread_mut, CREATE_THREAD_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, CreateProcessInfo, CreateProcessInfo_mut, CREATE_PROCESS_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, ExitThread, ExitThread_mut, EXIT_THREAD_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, ExitProcess, ExitProcess_mut, EXIT_PROCESS_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, LoadDll, LoadDll_mut, LOAD_DLL_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, UnloadDll, UnloadDll_mut, UNLOAD_DLL_DEBUG_INFO);
-UNION!(DEBUG_EVENT, u, DebugString, DebugString_mut, OUTPUT_DEBUG_STRING_INFO);
-UNION!(DEBUG_EVENT, u, RipInfo, RipInfo_mut, RIP_INFO);
-pub type LPDEBUG_EVENT = *mut DEBUG_EVENT;
diff --git a/vendor/winapi-0.2.8/src/minwindef.rs b/vendor/winapi-0.2.8/src/minwindef.rs
deleted file mode 100644
index a5ed01771e..0000000000
--- a/vendor/winapi-0.2.8/src/minwindef.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Basic Windows Type Definitions for minwin partition
-pub type ULONG = ::c_ulong;
-pub type PULONG = *mut ULONG;
-pub type USHORT = ::c_ushort;
-pub type PUSHORT = *mut USHORT;
-pub type UCHAR = ::c_uchar;
-pub type PUCHAR = *mut UCHAR;
-pub type PSZ = *mut ::c_char;
-pub const MAX_PATH: usize = 260;
-pub const FALSE: BOOL = 0;
-pub const TRUE: BOOL = 1;
-pub type DWORD = ::c_ulong;
-pub type BOOL = ::c_int;
-pub type BYTE = ::c_uchar;
-pub type WORD = ::c_ushort;
-pub type FLOAT = ::c_float;
-pub type PFLOAT = *mut FLOAT;
-pub type PBOOL = *mut BOOL;
-pub type LPBOOL = *mut BOOL;
-pub type PBYTE = *mut BYTE;
-pub type LPBYTE = *mut BYTE;
-pub type PINT = *mut ::c_int;
-pub type LPINT = *mut ::c_int;
-pub type PWORD = *mut WORD;
-pub type LPWORD = *mut WORD;
-pub type LPLONG = *mut ::c_long;
-pub type PDWORD = *mut DWORD;
-pub type LPDWORD = *mut DWORD;
-pub type LPVOID = *mut ::c_void;
-pub type LPCVOID = *const ::c_void;
-pub type INT = ::c_int;
-pub type UINT = ::c_uint;
-pub type PUINT = *mut ::c_uint;
-pub type WPARAM = ::UINT_PTR;
-pub type LPARAM = ::LONG_PTR;
-pub type LRESULT = ::LONG_PTR;
-pub fn MAKEWORD(a: BYTE, b: BYTE) -> WORD {
-    (a as WORD) | ((b as WORD) << 8)
-}
-pub fn MAKELONG(a: WORD, b: WORD) -> ::LONG {
-    ((a as DWORD) | ((b as DWORD) << 16)) as ::LONG
-}
-pub fn LOWORD(l: DWORD) -> WORD {
-    (l & 0xffff) as WORD
-}
-pub fn HIWORD(l: DWORD) -> WORD {
-    ((l >> 16) & 0xffff) as WORD
-}
-pub fn LOBYTE(l: WORD) -> BYTE {
-    (l & 0xff) as BYTE
-}
-pub fn HIBYTE(l: WORD) -> BYTE {
-    ((l >> 8) & 0xff) as BYTE
-}
-pub type SPHANDLE = *mut ::HANDLE;
-pub type LPHANDLE = *mut ::HANDLE;
-pub type HGLOBAL = ::HANDLE;
-pub type HLOCAL = ::HANDLE;
-pub type GLOBALHANDLE = ::HANDLE;
-pub type LOCALHANDLE = ::HANDLE;
-/// Pointer to probably a function with unknown type signature.
-pub type FARPROC = *const ::c_void;
-/// Pointer to probably a function with unknown type signature.
-pub type NEARPROC = *const ::c_void;
-/// Pointer to probably a function with unknown type signature.
-pub type PROC = *const ::c_void;
-pub type ATOM = WORD;
-DECLARE_HANDLE!(HKEY, HKEY__);
-pub type PHKEY = *mut HKEY;
-DECLARE_HANDLE!(HMETAFILE, HMETAFILE__);
-DECLARE_HANDLE!(HINSTANCE, HINSTANCE__);
-pub type HMODULE = HINSTANCE;
-DECLARE_HANDLE!(HRGN, HRGN__);
-DECLARE_HANDLE!(HRSRC, HRSRC__);
-DECLARE_HANDLE!(HSPRITE, HSPRITE__);
-DECLARE_HANDLE!(HLSURF, HLSURF__);
-DECLARE_HANDLE!(HSTR, HSTR__);
-DECLARE_HANDLE!(HTASK, HTASK__);
-DECLARE_HANDLE!(HWINSTA, HWINSTA__);
-DECLARE_HANDLE!(HKL, HKL__);
-pub type HFILE = ::c_int;
-STRUCT!{struct FILETIME {
-    dwLowDateTime: DWORD,
-    dwHighDateTime: DWORD,
-}}
-pub type PFILETIME = *mut FILETIME;
-pub type LPFILETIME = *mut FILETIME;
diff --git a/vendor/winapi-0.2.8/src/mmdeviceapi.rs b/vendor/winapi-0.2.8/src/mmdeviceapi.rs
deleted file mode 100644
index 9fc85a7d20..0000000000
--- a/vendor/winapi-0.2.8/src/mmdeviceapi.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-pub const DEVICE_STATE_ACTIVE: ::DWORD = 0x00000001;
-pub const DEVICE_STATE_DISABLED: ::DWORD = 0x00000002;
-pub const DEVICE_STATE_NOTPRESENT: ::DWORD = 0x00000004;
-pub const DEVICE_STATE_UNPLUGGED: ::DWORD = 0x00000008;
-pub const DEVICE_STATEMASK_ALL: ::DWORD = 0x0000000F;
-ENUM!{enum EDataFlow {
-    eRender,
-    eCapture,
-    eAll,
-    EDataFlow_enum_count,
-}}
-ENUM!{enum ERole {
-    eConsole,
-    eMultimedia,
-    eCommunications,
-    ERole_enum_count,
-}}
-DEFINE_GUID!(CLSID_MMDeviceEnumerator, 0xBCDE0395, 0xE52F, 0x467C,
-    0x8E, 0x3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E);
-DEFINE_GUID!(IID_IMMDeviceEnumerator, 0xA95664D2, 0x9614, 0x4F35,
-    0xA7, 0x46, 0xDE, 0x8D, 0xB6, 0x36, 0x17, 0xE6);
-RIDL!(
-interface IMMDevice(IMMDeviceVtbl): IUnknown(IUnknownVtbl) {
-    fn Activate(
-        &mut self, iid: ::REFIID, dwClsCtx: ::DWORD, pActivationParams: *mut ::PROPVARIANT,
-        ppInterface: *mut ::LPVOID
-    ) -> ::HRESULT,
-    fn OpenPropertyStore(
-        &mut self, stgmAccess: ::DWORD, ppProperties: *mut *mut ::IPropertyStore
-    ) -> ::HRESULT,
-    fn GetId(&mut self, ppstrId: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetState(&mut self, pdwState: *mut ::DWORD) -> ::HRESULT
-}
-);
-RIDL!(
-interface IMMDeviceEnumerator(IMMDeviceEnumeratorVtbl): IUnknown(IUnknownVtbl) {
-    fn EnumAudioEndpoints(
-        &mut self, dataFlow: EDataFlow, dwStateMask: ::DWORD,
-        ppDevices: *mut *mut IMMDeviceCollection
-    ) -> ::HRESULT,
-    fn GetDefaultAudioEndpoint(
-        &mut self, dataFlow: EDataFlow, role: ERole, ppEndpoint: *mut *mut IMMDevice
-    ) -> ::HRESULT,
-    fn GetDevice(&mut self, pwstrId: ::LPCWSTR, ppDevices: *mut *mut IMMDevice) -> ::HRESULT,
-    fn RegisterEndpointNotificationCallback(
-        &mut self, pClient: *mut IMMNotificationClient
-    ) -> ::HRESULT,
-    fn UnregisterEndpointNotificationCallback(
-        &mut self, pClient: *mut IMMNotificationClient
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IMMDeviceCollection(IMMDeviceCollectionVtbl): IUnknown(IUnknownVtbl) {
-    fn GetCount(&mut self, pcDevices: *const ::UINT) -> ::HRESULT,
-    fn Item(&mut self, nDevice: ::UINT, ppDevice: *mut *mut IMMDevice) -> ::HRESULT
-}
-);
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMMNotificationClient;
diff --git a/vendor/winapi-0.2.8/src/mmreg.rs b/vendor/winapi-0.2.8/src/mmreg.rs
deleted file mode 100644
index 826d96d50b..0000000000
--- a/vendor/winapi-0.2.8/src/mmreg.rs
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub const WAVE_FORMAT_UNKNOWN: ::WORD = 0x0000;
-pub const WAVE_FORMAT_PCM: ::WORD = 0x0001;
-pub const WAVE_FORMAT_ADPCM: ::WORD = 0x0002;
-pub const WAVE_FORMAT_IEEE_FLOAT: ::WORD = 0x0003;
-pub const WAVE_FORMAT_VSELP: ::WORD = 0x0004;
-pub const WAVE_FORMAT_IBM_CVSD: ::WORD = 0x0005;
-pub const WAVE_FORMAT_ALAW: ::WORD = 0x0006;
-pub const WAVE_FORMAT_MULAW: ::WORD = 0x0007;
-pub const WAVE_FORMAT_DTS: ::WORD = 0x0008;
-pub const WAVE_FORMAT_DRM: ::WORD = 0x0009;
-pub const WAVE_FORMAT_WMAVOICE9: ::WORD = 0x000A;
-pub const WAVE_FORMAT_WMAVOICE10: ::WORD = 0x000B;
-pub const WAVE_FORMAT_OKI_ADPCM: ::WORD = 0x0010;
-pub const WAVE_FORMAT_DVI_ADPCM: ::WORD = 0x0011;
-pub const WAVE_FORMAT_IMA_ADPCM: ::WORD = WAVE_FORMAT_DVI_ADPCM;
-pub const WAVE_FORMAT_MEDIASPACE_ADPCM: ::WORD = 0x0012;
-pub const WAVE_FORMAT_SIERRA_ADPCM: ::WORD = 0x0013;
-pub const WAVE_FORMAT_G723_ADPCM: ::WORD = 0x0014;
-pub const WAVE_FORMAT_DIGISTD: ::WORD = 0x0015;
-pub const WAVE_FORMAT_DIGIFIX: ::WORD = 0x0016;
-pub const WAVE_FORMAT_DIALOGIC_OKI_ADPCM: ::WORD = 0x0017;
-pub const WAVE_FORMAT_MEDIAVISION_ADPCM: ::WORD = 0x0018;
-pub const WAVE_FORMAT_CU_CODEC: ::WORD = 0x0019;
-pub const WAVE_FORMAT_HP_DYN_VOICE: ::WORD = 0x001A;
-pub const WAVE_FORMAT_YAMAHA_ADPCM: ::WORD = 0x0020;
-pub const WAVE_FORMAT_SONARC: ::WORD = 0x0021;
-pub const WAVE_FORMAT_DSPGROUP_TRUESPEECH: ::WORD = 0x0022;
-pub const WAVE_FORMAT_ECHOSC1: ::WORD = 0x0023;
-pub const WAVE_FORMAT_AUDIOFILE_AF36: ::WORD = 0x0024;
-pub const WAVE_FORMAT_APTX: ::WORD = 0x0025;
-pub const WAVE_FORMAT_AUDIOFILE_AF10: ::WORD = 0x0026;
-pub const WAVE_FORMAT_PROSODY_1612: ::WORD = 0x0027;
-pub const WAVE_FORMAT_LRC: ::WORD = 0x0028;
-pub const WAVE_FORMAT_DOLBY_AC2: ::WORD = 0x0030;
-pub const WAVE_FORMAT_GSM610: ::WORD = 0x0031;
-pub const WAVE_FORMAT_MSNAUDIO: ::WORD = 0x0032;
-pub const WAVE_FORMAT_ANTEX_ADPCME: ::WORD = 0x0033;
-pub const WAVE_FORMAT_CONTROL_RES_VQLPC: ::WORD = 0x0034;
-pub const WAVE_FORMAT_DIGIREAL: ::WORD = 0x0035;
-pub const WAVE_FORMAT_DIGIADPCM: ::WORD = 0x0036;
-pub const WAVE_FORMAT_CONTROL_RES_CR10: ::WORD = 0x0037;
-pub const WAVE_FORMAT_NMS_VBXADPCM: ::WORD = 0x0038;
-pub const WAVE_FORMAT_CS_IMAADPCM: ::WORD = 0x0039;
-pub const WAVE_FORMAT_ECHOSC3: ::WORD = 0x003A;
-pub const WAVE_FORMAT_ROCKWELL_ADPCM: ::WORD = 0x003B;
-pub const WAVE_FORMAT_ROCKWELL_DIGITALK: ::WORD = 0x003C;
-pub const WAVE_FORMAT_XEBEC: ::WORD = 0x003D;
-pub const WAVE_FORMAT_G721_ADPCM: ::WORD = 0x0040;
-pub const WAVE_FORMAT_G728_CELP: ::WORD = 0x0041;
-pub const WAVE_FORMAT_MSG723: ::WORD = 0x0042;
-pub const WAVE_FORMAT_INTEL_G723_1: ::WORD = 0x0043;
-pub const WAVE_FORMAT_INTEL_G729: ::WORD = 0x0044;
-pub const WAVE_FORMAT_SHARP_G726: ::WORD = 0x0045;
-pub const WAVE_FORMAT_MPEG: ::WORD = 0x0050;
-pub const WAVE_FORMAT_RT24: ::WORD = 0x0052;
-pub const WAVE_FORMAT_PAC: ::WORD = 0x0053;
-pub const WAVE_FORMAT_MPEGLAYER3: ::WORD = 0x0055;
-pub const WAVE_FORMAT_LUCENT_G723: ::WORD = 0x0059;
-pub const WAVE_FORMAT_CIRRUS: ::WORD = 0x0060;
-pub const WAVE_FORMAT_ESPCM: ::WORD = 0x0061;
-pub const WAVE_FORMAT_VOXWARE: ::WORD = 0x0062;
-pub const WAVE_FORMAT_CANOPUS_ATRAC: ::WORD = 0x0063;
-pub const WAVE_FORMAT_G726_ADPCM: ::WORD = 0x0064;
-pub const WAVE_FORMAT_G722_ADPCM: ::WORD = 0x0065;
-pub const WAVE_FORMAT_DSAT: ::WORD = 0x0066;
-pub const WAVE_FORMAT_DSAT_DISPLAY: ::WORD = 0x0067;
-pub const WAVE_FORMAT_VOXWARE_BYTE_ALIGNED: ::WORD = 0x0069;
-pub const WAVE_FORMAT_VOXWARE_AC8: ::WORD = 0x0070;
-pub const WAVE_FORMAT_VOXWARE_AC10: ::WORD = 0x0071;
-pub const WAVE_FORMAT_VOXWARE_AC16: ::WORD = 0x0072;
-pub const WAVE_FORMAT_VOXWARE_AC20: ::WORD = 0x0073;
-pub const WAVE_FORMAT_VOXWARE_RT24: ::WORD = 0x0074;
-pub const WAVE_FORMAT_VOXWARE_RT29: ::WORD = 0x0075;
-pub const WAVE_FORMAT_VOXWARE_RT29HW: ::WORD = 0x0076;
-pub const WAVE_FORMAT_VOXWARE_VR12: ::WORD = 0x0077;
-pub const WAVE_FORMAT_VOXWARE_VR18: ::WORD = 0x0078;
-pub const WAVE_FORMAT_VOXWARE_TQ40: ::WORD = 0x0079;
-pub const WAVE_FORMAT_VOXWARE_SC3: ::WORD = 0x007A;
-pub const WAVE_FORMAT_VOXWARE_SC3_1: ::WORD = 0x007B;
-pub const WAVE_FORMAT_SOFTSOUND: ::WORD = 0x0080;
-pub const WAVE_FORMAT_VOXWARE_TQ60: ::WORD = 0x0081;
-pub const WAVE_FORMAT_MSRT24: ::WORD = 0x0082;
-pub const WAVE_FORMAT_G729A: ::WORD = 0x0083;
-pub const WAVE_FORMAT_MVI_MVI2: ::WORD = 0x0084;
-pub const WAVE_FORMAT_DF_G726: ::WORD = 0x0085;
-pub const WAVE_FORMAT_DF_GSM610: ::WORD = 0x0086;
-pub const WAVE_FORMAT_ISIAUDIO: ::WORD = 0x0088;
-pub const WAVE_FORMAT_ONLIVE: ::WORD = 0x0089;
-pub const WAVE_FORMAT_MULTITUDE_FT_SX20: ::WORD = 0x008A;
-pub const WAVE_FORMAT_INFOCOM_ITS_G721_ADPCM: ::WORD = 0x008B;
-pub const WAVE_FORMAT_CONVEDIA_G729: ::WORD = 0x008C;
-pub const WAVE_FORMAT_CONGRUENCY: ::WORD = 0x008D;
-pub const WAVE_FORMAT_SBC24: ::WORD = 0x0091;
-pub const WAVE_FORMAT_DOLBY_AC3_SPDIF: ::WORD = 0x0092;
-pub const WAVE_FORMAT_MEDIASONIC_G723: ::WORD = 0x0093;
-pub const WAVE_FORMAT_PROSODY_8KBPS: ::WORD = 0x0094;
-pub const WAVE_FORMAT_ZYXEL_ADPCM: ::WORD = 0x0097;
-pub const WAVE_FORMAT_PHILIPS_LPCBB: ::WORD = 0x0098;
-pub const WAVE_FORMAT_PACKED: ::WORD = 0x0099;
-pub const WAVE_FORMAT_MALDEN_PHONYTALK: ::WORD = 0x00A0;
-pub const WAVE_FORMAT_RACAL_RECORDER_GSM: ::WORD = 0x00A1;
-pub const WAVE_FORMAT_RACAL_RECORDER_G720_A: ::WORD = 0x00A2;
-pub const WAVE_FORMAT_RACAL_RECORDER_G723_1: ::WORD = 0x00A3;
-pub const WAVE_FORMAT_RACAL_RECORDER_TETRA_ACELP: ::WORD = 0x00A4;
-pub const WAVE_FORMAT_NEC_AAC: ::WORD = 0x00B0;
-pub const WAVE_FORMAT_RAW_AAC1: ::WORD = 0x00FF;
-pub const WAVE_FORMAT_RHETOREX_ADPCM: ::WORD = 0x0100;
-pub const WAVE_FORMAT_IRAT: ::WORD = 0x0101;
-pub const WAVE_FORMAT_VIVO_G723: ::WORD = 0x0111;
-pub const WAVE_FORMAT_VIVO_SIREN: ::WORD = 0x0112;
-pub const WAVE_FORMAT_PHILIPS_CELP: ::WORD = 0x0120;
-pub const WAVE_FORMAT_PHILIPS_GRUNDIG: ::WORD = 0x0121;
-pub const WAVE_FORMAT_DIGITAL_G723: ::WORD = 0x0123;
-pub const WAVE_FORMAT_SANYO_LD_ADPCM: ::WORD = 0x0125;
-pub const WAVE_FORMAT_SIPROLAB_ACEPLNET: ::WORD = 0x0130;
-pub const WAVE_FORMAT_SIPROLAB_ACELP4800: ::WORD = 0x0131;
-pub const WAVE_FORMAT_SIPROLAB_ACELP8V3: ::WORD = 0x0132;
-pub const WAVE_FORMAT_SIPROLAB_G729: ::WORD = 0x0133;
-pub const WAVE_FORMAT_SIPROLAB_G729A: ::WORD = 0x0134;
-pub const WAVE_FORMAT_SIPROLAB_KELVIN: ::WORD = 0x0135;
-pub const WAVE_FORMAT_VOICEAGE_AMR: ::WORD = 0x0136;
-pub const WAVE_FORMAT_G726ADPCM: ::WORD = 0x0140;
-pub const WAVE_FORMAT_DICTAPHONE_CELP68: ::WORD = 0x0141;
-pub const WAVE_FORMAT_DICTAPHONE_CELP54: ::WORD = 0x0142;
-pub const WAVE_FORMAT_QUALCOMM_PUREVOICE: ::WORD = 0x0150;
-pub const WAVE_FORMAT_QUALCOMM_HALFRATE: ::WORD = 0x0151;
-pub const WAVE_FORMAT_TUBGSM: ::WORD = 0x0155;
-pub const WAVE_FORMAT_MSAUDIO1: ::WORD = 0x0160;
-pub const WAVE_FORMAT_WMAUDIO2: ::WORD = 0x0161;
-pub const WAVE_FORMAT_WMAUDIO3: ::WORD = 0x0162;
-pub const WAVE_FORMAT_WMAUDIO_LOSSLESS: ::WORD = 0x0163;
-pub const WAVE_FORMAT_WMASPDIF: ::WORD = 0x0164;
-pub const WAVE_FORMAT_UNISYS_NAP_ADPCM: ::WORD = 0x0170;
-pub const WAVE_FORMAT_UNISYS_NAP_ULAW: ::WORD = 0x0171;
-pub const WAVE_FORMAT_UNISYS_NAP_ALAW: ::WORD = 0x0172;
-pub const WAVE_FORMAT_UNISYS_NAP_16K: ::WORD = 0x0173;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC008: ::WORD = 0x0174;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC701_G726L: ::WORD = 0x0175;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC701_CELP54: ::WORD = 0x0176;
-pub const WAVE_FORMAT_SYCOM_ACM_SYC701_CELP68: ::WORD = 0x0177;
-pub const WAVE_FORMAT_KNOWLEDGE_ADVENTURE_ADPCM: ::WORD = 0x0178;
-pub const WAVE_FORMAT_FRAUNHOFER_IIS_MPEG2_AAC: ::WORD = 0x0180;
-pub const WAVE_FORMAT_DTS_DS: ::WORD = 0x0190;
-pub const WAVE_FORMAT_CREATIVE_ADPCM: ::WORD = 0x0200;
-pub const WAVE_FORMAT_CREATIVE_FASTSPEECH8: ::WORD = 0x0202;
-pub const WAVE_FORMAT_CREATIVE_FASTSPEECH10: ::WORD = 0x0203;
-pub const WAVE_FORMAT_UHER_ADPCM: ::WORD = 0x0210;
-pub const WAVE_FORMAT_ULEAD_DV_AUDIO: ::WORD = 0x0215;
-pub const WAVE_FORMAT_ULEAD_DV_AUDIO_1: ::WORD = 0x0216;
-pub const WAVE_FORMAT_QUARTERDECK: ::WORD = 0x0220;
-pub const WAVE_FORMAT_ILINK_VC: ::WORD = 0x0230;
-pub const WAVE_FORMAT_RAW_SPORT: ::WORD = 0x0240;
-pub const WAVE_FORMAT_ESST_AC3: ::WORD = 0x0241;
-pub const WAVE_FORMAT_GENERIC_PASSTHRU: ::WORD = 0x0249;
-pub const WAVE_FORMAT_IPI_HSX: ::WORD = 0x0250;
-pub const WAVE_FORMAT_IPI_RPELP: ::WORD = 0x0251;
-pub const WAVE_FORMAT_CS2: ::WORD = 0x0260;
-pub const WAVE_FORMAT_SONY_SCX: ::WORD = 0x0270;
-pub const WAVE_FORMAT_SONY_SCY: ::WORD = 0x0271;
-pub const WAVE_FORMAT_SONY_ATRAC3: ::WORD = 0x0272;
-pub const WAVE_FORMAT_SONY_SPC: ::WORD = 0x0273;
-pub const WAVE_FORMAT_TELUM_AUDIO: ::WORD = 0x0280;
-pub const WAVE_FORMAT_TELUM_IA_AUDIO: ::WORD = 0x0281;
-pub const WAVE_FORMAT_NORCOM_VOICE_SYSTEMS_ADPCM: ::WORD = 0x0285;
-pub const WAVE_FORMAT_FM_TOWNS_SND: ::WORD = 0x0300;
-pub const WAVE_FORMAT_MICRONAS: ::WORD = 0x0350;
-pub const WAVE_FORMAT_MICRONAS_CELP833: ::WORD = 0x0351;
-pub const WAVE_FORMAT_BTV_DIGITAL: ::WORD = 0x0400;
-pub const WAVE_FORMAT_INTEL_MUSIC_CODER: ::WORD = 0x0401;
-pub const WAVE_FORMAT_INDEO_AUDIO: ::WORD = 0x0402;
-pub const WAVE_FORMAT_QDESIGN_MUSIC: ::WORD = 0x0450;
-pub const WAVE_FORMAT_ON2_VP7_AUDIO: ::WORD = 0x0500;
-pub const WAVE_FORMAT_ON2_VP6_AUDIO: ::WORD = 0x0501;
-pub const WAVE_FORMAT_VME_VMPCM: ::WORD = 0x0680;
-pub const WAVE_FORMAT_TPC: ::WORD = 0x0681;
-pub const WAVE_FORMAT_LIGHTWAVE_LOSSLESS: ::WORD = 0x08AE;
-pub const WAVE_FORMAT_OLIGSM: ::WORD = 0x1000;
-pub const WAVE_FORMAT_OLIADPCM: ::WORD = 0x1001;
-pub const WAVE_FORMAT_OLICELP: ::WORD = 0x1002;
-pub const WAVE_FORMAT_OLISBC: ::WORD = 0x1003;
-pub const WAVE_FORMAT_OLIOPR: ::WORD = 0x1004;
-pub const WAVE_FORMAT_LH_CODEC: ::WORD = 0x1100;
-pub const WAVE_FORMAT_LH_CODEC_CELP: ::WORD = 0x1101;
-pub const WAVE_FORMAT_LH_CODEC_SBC8: ::WORD = 0x1102;
-pub const WAVE_FORMAT_LH_CODEC_SBC12: ::WORD = 0x1103;
-pub const WAVE_FORMAT_LH_CODEC_SBC16: ::WORD = 0x1104;
-pub const WAVE_FORMAT_NORRIS: ::WORD = 0x1400;
-pub const WAVE_FORMAT_ISIAUDIO_2: ::WORD = 0x1401;
-pub const WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS: ::WORD = 0x1500;
-pub const WAVE_FORMAT_MPEG_ADTS_AAC: ::WORD = 0x1600;
-pub const WAVE_FORMAT_MPEG_RAW_AAC: ::WORD = 0x1601;
-pub const WAVE_FORMAT_MPEG_LOAS: ::WORD = 0x1602;
-pub const WAVE_FORMAT_NOKIA_MPEG_ADTS_AAC: ::WORD = 0x1608;
-pub const WAVE_FORMAT_NOKIA_MPEG_RAW_AAC: ::WORD = 0x1609;
-pub const WAVE_FORMAT_VODAFONE_MPEG_ADTS_AAC: ::WORD = 0x160A;
-pub const WAVE_FORMAT_VODAFONE_MPEG_RAW_AAC: ::WORD = 0x160B;
-pub const WAVE_FORMAT_MPEG_HEAAC: ::WORD = 0x1610;
-pub const WAVE_FORMAT_VOXWARE_RT24_SPEECH: ::WORD = 0x181C;
-pub const WAVE_FORMAT_SONICFOUNDRY_LOSSLESS: ::WORD = 0x1971;
-pub const WAVE_FORMAT_INNINGS_TELECOM_ADPCM: ::WORD = 0x1979;
-pub const WAVE_FORMAT_LUCENT_SX8300P: ::WORD = 0x1C07;
-pub const WAVE_FORMAT_LUCENT_SX5363S: ::WORD = 0x1C0C;
-pub const WAVE_FORMAT_CUSEEME: ::WORD = 0x1F03;
-pub const WAVE_FORMAT_NTCSOFT_ALF2CM_ACM: ::WORD = 0x1FC4;
-pub const WAVE_FORMAT_DVM: ::WORD = 0x2000;
-pub const WAVE_FORMAT_DTS2: ::WORD = 0x2001;
-pub const WAVE_FORMAT_MAKEAVIS: ::WORD = 0x3313;
-pub const WAVE_FORMAT_DIVIO_MPEG4_AAC: ::WORD = 0x4143;
-pub const WAVE_FORMAT_NOKIA_ADAPTIVE_MULTIRATE: ::WORD = 0x4201;
-pub const WAVE_FORMAT_DIVIO_G726: ::WORD = 0x4243;
-pub const WAVE_FORMAT_LEAD_SPEECH: ::WORD = 0x434C;
-pub const WAVE_FORMAT_LEAD_VORBIS: ::WORD = 0x564C;
-pub const WAVE_FORMAT_WAVPACK_AUDIO: ::WORD = 0x5756;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_1: ::WORD = 0x674F;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_2: ::WORD = 0x6750;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_3: ::WORD = 0x6751;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_1_PLUS: ::WORD = 0x676F;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_2_PLUS: ::WORD = 0x6770;
-pub const WAVE_FORMAT_OGG_VORBIS_MODE_3_PLUS: ::WORD = 0x6771;
-pub const WAVE_FORMAT_3COM_NBX: ::WORD = 0x7000;
-pub const WAVE_FORMAT_FAAD_AAC: ::WORD = 0x706D;
-pub const WAVE_FORMAT_AMR_NB: ::WORD = 0x7361;
-pub const WAVE_FORMAT_AMR_WB: ::WORD = 0x7362;
-pub const WAVE_FORMAT_AMR_WP: ::WORD = 0x7363;
-pub const WAVE_FORMAT_GSM_AMR_CBR: ::WORD = 0x7A21;
-pub const WAVE_FORMAT_GSM_AMR_VBR_SID: ::WORD = 0x7A22;
-pub const WAVE_FORMAT_COMVERSE_INFOSYS_G723_1: ::WORD = 0xA100;
-pub const WAVE_FORMAT_COMVERSE_INFOSYS_AVQSBC: ::WORD = 0xA101;
-pub const WAVE_FORMAT_COMVERSE_INFOSYS_SBC: ::WORD = 0xA102;
-pub const WAVE_FORMAT_SYMBOL_G729_A: ::WORD = 0xA103;
-pub const WAVE_FORMAT_VOICEAGE_AMR_WB: ::WORD = 0xA104;
-pub const WAVE_FORMAT_INGENIENT_G726: ::WORD = 0xA105;
-pub const WAVE_FORMAT_MPEG4_AAC: ::WORD = 0xA106;
-pub const WAVE_FORMAT_ENCORE_G726: ::WORD = 0xA107;
-pub const WAVE_FORMAT_ZOLL_ASAO: ::WORD = 0xA108;
-pub const WAVE_FORMAT_SPEEX_VOICE: ::WORD = 0xA109;
-pub const WAVE_FORMAT_VIANIX_MASC: ::WORD = 0xA10A;
-pub const WAVE_FORMAT_WM9_SPECTRUM_ANALYZER: ::WORD = 0xA10B;
-pub const WAVE_FORMAT_WMF_SPECTRUM_ANAYZER: ::WORD = 0xA10C;
-pub const WAVE_FORMAT_GSM_610: ::WORD = 0xA10D;
-pub const WAVE_FORMAT_GSM_620: ::WORD = 0xA10E;
-pub const WAVE_FORMAT_GSM_660: ::WORD = 0xA10F;
-pub const WAVE_FORMAT_GSM_690: ::WORD = 0xA110;
-pub const WAVE_FORMAT_GSM_ADAPTIVE_MULTIRATE_WB: ::WORD = 0xA111;
-pub const WAVE_FORMAT_POLYCOM_G722: ::WORD = 0xA112;
-pub const WAVE_FORMAT_POLYCOM_G728: ::WORD = 0xA113;
-pub const WAVE_FORMAT_POLYCOM_G729_A: ::WORD = 0xA114;
-pub const WAVE_FORMAT_POLYCOM_SIREN: ::WORD = 0xA115;
-pub const WAVE_FORMAT_GLOBAL_IP_ILBC: ::WORD = 0xA116;
-pub const WAVE_FORMAT_RADIOTIME_TIME_SHIFT_RADIO: ::WORD = 0xA117;
-pub const WAVE_FORMAT_NICE_ACA: ::WORD = 0xA118;
-pub const WAVE_FORMAT_NICE_ADPCM: ::WORD = 0xA119;
-pub const WAVE_FORMAT_VOCORD_G721: ::WORD = 0xA11A;
-pub const WAVE_FORMAT_VOCORD_G726: ::WORD = 0xA11B;
-pub const WAVE_FORMAT_VOCORD_G722_1: ::WORD = 0xA11C;
-pub const WAVE_FORMAT_VOCORD_G728: ::WORD = 0xA11D;
-pub const WAVE_FORMAT_VOCORD_G729: ::WORD = 0xA11E;
-pub const WAVE_FORMAT_VOCORD_G729_A: ::WORD = 0xA11F;
-pub const WAVE_FORMAT_VOCORD_G723_1: ::WORD = 0xA120;
-pub const WAVE_FORMAT_VOCORD_LBC: ::WORD = 0xA121;
-pub const WAVE_FORMAT_NICE_G728: ::WORD = 0xA122;
-pub const WAVE_FORMAT_FRACE_TELECOM_G729: ::WORD = 0xA123;
-pub const WAVE_FORMAT_CODIAN: ::WORD = 0xA124;
-pub const WAVE_FORMAT_FLAC: ::WORD = 0xF1AC;
-pub const WAVE_FORMAT_EXTENSIBLE: ::WORD = 0xFFFE;
-pub const WAVE_FORMAT_DEVELOPMENT: ::WORD = 0xFFFF;
-//2557
-pub const SPEAKER_FRONT_LEFT: ::DWORD = 0x1;
-pub const SPEAKER_FRONT_RIGHT: ::DWORD = 0x2;
-pub const SPEAKER_FRONT_CENTER: ::DWORD = 0x4;
-pub const SPEAKER_LOW_FREQUENCY: ::DWORD = 0x8;
-pub const SPEAKER_BACK_LEFT: ::DWORD = 0x10;
-pub const SPEAKER_BACK_RIGHT: ::DWORD = 0x20;
-pub const SPEAKER_FRONT_LEFT_OF_CENTER: ::DWORD = 0x40;
-pub const SPEAKER_FRONT_RIGHT_OF_CENTER: ::DWORD = 0x80;
-pub const SPEAKER_BACK_CENTER: ::DWORD = 0x100;
-pub const SPEAKER_SIDE_LEFT: ::DWORD = 0x200;
-pub const SPEAKER_SIDE_RIGHT: ::DWORD = 0x400;
-pub const SPEAKER_TOP_CENTER: ::DWORD = 0x800;
-pub const SPEAKER_TOP_FRONT_LEFT: ::DWORD = 0x1000;
-pub const SPEAKER_TOP_FRONT_CENTER: ::DWORD = 0x2000;
-pub const SPEAKER_TOP_FRONT_RIGHT: ::DWORD = 0x4000;
-pub const SPEAKER_TOP_BACK_LEFT: ::DWORD = 0x8000;
-pub const SPEAKER_TOP_BACK_CENTER: ::DWORD = 0x10000;
-pub const SPEAKER_TOP_BACK_RIGHT: ::DWORD = 0x20000;
-pub const SPEAKER_RESERVED: ::DWORD = 0x7FFC0000;
-pub const SPEAKER_ALL: ::DWORD = 0x80000000;
-STRUCT!{#[repr(packed)] struct WAVEFORMATEX {
-    wFormatTag: ::WORD,
-    nChannels: ::WORD,
-    nSamplesPerSec: ::DWORD,
-    nAvgBytesPerSec: ::DWORD,
-    nBlockAlign: ::WORD,
-    wBitsPerSample: ::WORD,
-    cbSize: ::WORD,
-}}
-STRUCT!{#[repr(packed)] struct WAVEFORMATEXTENSIBLE {
-    Format: ::WAVEFORMATEX,
-    Samples: ::WORD,
-    dwChannelMask: ::DWORD,
-    SubFormat: ::GUID,
-}}
diff --git a/vendor/winapi-0.2.8/src/mmsystem.rs b/vendor/winapi-0.2.8/src/mmsystem.rs
deleted file mode 100644
index c579edad3f..0000000000
--- a/vendor/winapi-0.2.8/src/mmsystem.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! MM procedure declarations, constant definitions and macros
-//109 (Win 7 SDK)
-pub type MMVERSION = ::UINT;
-pub type MMRESULT = ::UINT;
-STRUCT!{struct MMTIME {
-    wType: ::UINT,
-    u: MMTIME_u,
-}}
-pub type PMMTIME = *mut MMTIME;
-pub type NPMMTIME = *mut MMTIME;
-pub type LPMMTIME = *mut MMTIME;
-STRUCT!{struct MMTIME_u {
-    data: [u8; 8],
-}}
-UNION!(MMTIME_u, data, ms, ms_mut, ::DWORD);
-UNION!(MMTIME_u, data, sample, sample_mut, ::DWORD);
-UNION!(MMTIME_u, data, cb, cb_mut, ::DWORD);
-UNION!(MMTIME_u, data, ticks, ticks_mut, ::DWORD);
-UNION!(MMTIME_u, data, smpte, smpte_mut, MMTIME_smpte);
-UNION!(MMTIME_u, data, midi, midi_mut, MMTIME_midi);
-STRUCT!{struct MMTIME_smpte {
-    hour: ::BYTE,
-    min: ::BYTE,
-    sec: ::BYTE,
-    frame: ::BYTE,
-    fps: ::BYTE,
-    dummy: ::BYTE,
-    pad: [::BYTE; 2],
-}}
-STRUCT!{struct MMTIME_midi {
-    songptrpos: ::DWORD,
-}}
-pub const TIME_MS: ::UINT = 0x0001;
-pub const TIME_SAMPLES: ::UINT = 0x0002;
-pub const TIME_BYTES: ::UINT = 0x0004;
-pub const TIME_SMPTE: ::UINT = 0x0008;
-pub const TIME_MIDI: ::UINT = 0x0010;
-pub const TIME_TICKS: ::UINT = 0x0020;
-pub const MM_JOY1MOVE: ::UINT = 0x3A0;
-pub const MM_JOY2MOVE: ::UINT = 0x3A1;
-pub const MM_JOY1ZMOVE: ::UINT = 0x3A2;
-pub const MM_JOY2ZMOVE: ::UINT = 0x3A3;
-pub const MM_JOY1BUTTONDOWN: ::UINT = 0x3B5;
-pub const MM_JOY2BUTTONDOWN: ::UINT = 0x3B6;
-pub const MM_JOY1BUTTONUP: ::UINT = 0x3B7;
-pub const MM_JOY2BUTTONUP: ::UINT = 0x3B8;
-pub const MM_MCINOTIFY: ::UINT = 0x3B9;
-pub const MM_WOM_OPEN: ::UINT = 0x3BB;
-pub const MM_WOM_CLOSE: ::UINT = 0x3BC;
-pub const MM_WOM_DONE: ::UINT = 0x3BD;
-pub const MM_WIM_OPEN: ::UINT = 0x3BE;
-pub const MM_WIM_CLOSE: ::UINT = 0x3BF;
-pub const MM_WIM_DATA: ::UINT = 0x3C0;
-pub const MM_MIM_OPEN: ::UINT = 0x3C1;
-pub const MM_MIM_CLOSE: ::UINT = 0x3C2;
-pub const MM_MIM_DATA: ::UINT = 0x3C3;
-pub const MM_MIM_LONGDATA: ::UINT = 0x3C4;
-pub const MM_MIM_ERROR: ::UINT = 0x3C5;
-pub const MM_MIM_LONGERROR: ::UINT = 0x3C6;
-pub const MM_MOM_OPEN: ::UINT = 0x3C7;
-pub const MM_MOM_CLOSE: ::UINT = 0x3C8;
-pub const MM_MOM_DONE: ::UINT = 0x3C9;
-pub const MMSYSERR_BASE: MMRESULT = 0;
-pub const WAVERR_BASE: MMRESULT = 32;
-pub const MIDIERR_BASE: MMRESULT = 64;
-pub const TIMERR_BASE: MMRESULT = 96;
-pub const JOYERR_BASE: MMRESULT = 160;
-pub const MCIERR_BASE: MMRESULT = 256;
-pub const MIXERR_BASE: MMRESULT = 1024;
-pub const MMSYSERR_NOERROR: MMRESULT = 0;
-pub const MMSYSERR_ERROR: MMRESULT = MMSYSERR_BASE + 1;
-pub const MMSYSERR_BADDEVICEID: MMRESULT = MMSYSERR_BASE + 2;
-pub const MMSYSERR_NOTENABLED: MMRESULT = MMSYSERR_BASE + 3;
-pub const MMSYSERR_ALLOCATED: MMRESULT = MMSYSERR_BASE + 4;
-pub const MMSYSERR_INVALHANDLE: MMRESULT = MMSYSERR_BASE + 5;
-pub const MMSYSERR_NODRIVER: MMRESULT = MMSYSERR_BASE + 6;
-pub const MMSYSERR_NOMEM: MMRESULT = MMSYSERR_BASE + 7;
-pub const MMSYSERR_NOTSUPPORTED: MMRESULT = MMSYSERR_BASE + 8;
-pub const MMSYSERR_BADERRNUM: MMRESULT = MMSYSERR_BASE + 9;
-pub const MMSYSERR_INVALFLAG: MMRESULT = MMSYSERR_BASE + 10;
-pub const MMSYSERR_INVALPARAM: MMRESULT = MMSYSERR_BASE + 11;
-pub const MMSYSERR_HANDLEBUSY: MMRESULT = MMSYSERR_BASE + 12;
-pub const MMSYSERR_INVALIDALIAS: MMRESULT = MMSYSERR_BASE + 13;
-pub const MMSYSERR_BADDB: MMRESULT = MMSYSERR_BASE + 14;
-pub const MMSYSERR_KEYNOTFOUND: MMRESULT = MMSYSERR_BASE + 15;
-pub const MMSYSERR_READERROR: MMRESULT = MMSYSERR_BASE + 16;
-pub const MMSYSERR_WRITEERROR: MMRESULT = MMSYSERR_BASE + 17;
-pub const MMSYSERR_DELETEERROR: MMRESULT = MMSYSERR_BASE + 18;
-pub const MMSYSERR_VALNOTFOUND: MMRESULT = MMSYSERR_BASE + 19;
-pub const MMSYSERR_NODRIVERCB: MMRESULT = MMSYSERR_BASE + 20;
-pub const MMSYSERR_MOREDATA: MMRESULT = MMSYSERR_BASE + 21;
-pub const MMSYSERR_LASTERROR: MMRESULT = MMSYSERR_BASE + 21;
-pub const MIDIERR_UNPREPARED: MMRESULT = MIDIERR_BASE + 0;
-pub const MIDIERR_STILLPLAYING: MMRESULT = MIDIERR_BASE + 1;
-pub const MIDIERR_NOMAP: MMRESULT = MIDIERR_BASE + 2;
-pub const MIDIERR_NOTREADY: MMRESULT = MIDIERR_BASE + 3;
-pub const MIDIERR_NODEVICE: MMRESULT = MIDIERR_BASE + 4;
-pub const MIDIERR_INVALIDSETUP: MMRESULT = MIDIERR_BASE + 5;
-pub const MIDIERR_BADOPENMODE: MMRESULT = MIDIERR_BASE + 6;
-pub const MIDIERR_DONT_CONTINUE: MMRESULT = MIDIERR_BASE + 7;
-pub const MIDIERR_LASTERROR: MMRESULT = MIDIERR_BASE + 7;
-pub const CALLBACK_TYPEMASK: ::DWORD = 0x00070000;
-pub const CALLBACK_NULL: ::DWORD = 0x00000000;
-pub const CALLBACK_WINDOW: ::DWORD = 0x00010000;
-pub const CALLBACK_TASK: ::DWORD = 0x00020000;
-pub const CALLBACK_FUNCTION: ::DWORD = 0x00030000;
-pub const CALLBACK_THREAD: ::DWORD = CALLBACK_TASK;
-pub const CALLBACK_EVENT: ::DWORD = 0x00050000;
-//497 (Win 7 SDK)
-pub const WAVERR_BADFORMAT: MMRESULT = WAVERR_BASE + 0;
-pub const WAVERR_STILLPLAYING: MMRESULT = WAVERR_BASE + 1;
-pub const WAVERR_UNPREPARED: MMRESULT = WAVERR_BASE + 2;
-pub const WAVERR_SYNC: MMRESULT = WAVERR_BASE + 3;
-pub const WAVERR_LASTERROR: MMRESULT = WAVERR_BASE + 3;
-DECLARE_HANDLE!(HWAVEIN, HWAVEIN__);
-DECLARE_HANDLE!(HWAVEOUT, HWAVEOUT__);
-pub type LPHWAVEIN = *mut HWAVEIN;
-pub type LPHWAVEOUT = *mut HWAVEOUT;
-pub const WOM_OPEN: ::UINT = MM_WOM_OPEN;
-pub const WOM_CLOSE: ::UINT = MM_WOM_CLOSE;
-pub const WOM_DONE: ::UINT = MM_WOM_DONE;
-pub const WIM_OPEN: ::UINT = MM_WIM_OPEN;
-pub const WIM_CLOSE: ::UINT = MM_WIM_CLOSE;
-pub const WIM_DATA: ::UINT = MM_WIM_DATA;
-pub const WAVE_MAPPER: ::UINT = 0xFFFFFFFF;
-pub const WAVE_FORMAT_QUERY: ::DWORD = 0x0001;
-pub const WAVE_ALLOWSYNC: ::DWORD = 0x0002;
-pub const WAVE_MAPPED: ::DWORD = 0x0004;
-pub const WAVE_FORMAT_DIRECT: ::DWORD = 0x0008;
-pub const WAVE_FORMAT_DIRECT_QUERY: ::DWORD = WAVE_FORMAT_QUERY | WAVE_FORMAT_DIRECT;
-pub const WAVE_MAPPED_DEFAULT_COMMUNICATION_DEVICE: ::DWORD = 0x0010;
-STRUCT!{struct WAVEHDR {
-    lpData: ::LPSTR,
-    dwBufferLength: ::DWORD,
-    dwBytesRecorded: ::DWORD,
-    dwUser: ::DWORD_PTR,
-    dwFlags: ::DWORD,
-    dwLoops: ::DWORD,
-    lpNext: *mut WAVEHDR,
-    reserved: ::DWORD_PTR,
-}}
-pub type PWAVEHDR = *mut WAVEHDR;
-pub type NPWAVEHDR = *mut WAVEHDR;
-pub type LPWAVEHDR = *mut WAVEHDR;
-STRUCT!{struct WAVEOUTCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: MMVERSION,
-    szPname: [::WCHAR; 32],
-    dwFormats: ::DWORD,
-    wChannels: ::WORD,
-    wReserved1: ::WORD,
-    dwSupport: ::DWORD,
-}}
-pub type PWAVEOUTCAPSW = *mut WAVEOUTCAPSW;
-pub type NPWAVEOUTCAPSW = *mut WAVEOUTCAPSW;
-pub type LPWAVEOUTCAPSW = *mut WAVEOUTCAPSW;
-STRUCT!{struct WAVEINCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: MMVERSION,
-    szPname: [::WCHAR; 32],
-    dwFormats: ::DWORD,
-    wChannels: ::WORD,
-    wReserved1: ::WORD,
-}}
-pub type PWAVEINCAPSW = *mut WAVEINCAPSW;
-pub type NPWAVEINCAPSW = *mut WAVEINCAPSW;
-pub type LPWAVEINCAPSW = *mut WAVEINCAPSW;
-pub const WAVE_INVALIDFORMAT: ::DWORD = 0x00000000;
-pub const WAVE_FORMAT_1M08: ::DWORD = 0x00000001;
-pub const WAVE_FORMAT_1S08: ::DWORD = 0x00000002;
-pub const WAVE_FORMAT_1M16: ::DWORD = 0x00000004;
-pub const WAVE_FORMAT_1S16: ::DWORD = 0x00000008;
-pub const WAVE_FORMAT_2M08: ::DWORD = 0x00000010;
-pub const WAVE_FORMAT_2S08: ::DWORD = 0x00000020;
-pub const WAVE_FORMAT_2M16: ::DWORD = 0x00000040;
-pub const WAVE_FORMAT_2S16: ::DWORD = 0x00000080;
-pub const WAVE_FORMAT_4M08: ::DWORD = 0x00000100;
-pub const WAVE_FORMAT_4S08: ::DWORD = 0x00000200;
-pub const WAVE_FORMAT_4M16: ::DWORD = 0x00000400;
-pub const WAVE_FORMAT_4S16: ::DWORD = 0x00000800;
-pub const WAVE_FORMAT_44M08: ::DWORD = 0x00000100;
-pub const WAVE_FORMAT_44S08: ::DWORD = 0x00000200;
-pub const WAVE_FORMAT_44M16: ::DWORD = 0x00000400;
-pub const WAVE_FORMAT_44S16: ::DWORD = 0x00000800;
-pub const WAVE_FORMAT_48M08: ::DWORD = 0x00001000;
-pub const WAVE_FORMAT_48S08: ::DWORD = 0x00002000;
-pub const WAVE_FORMAT_48M16: ::DWORD = 0x00004000;
-pub const WAVE_FORMAT_48S16: ::DWORD = 0x00008000;
-pub const WAVE_FORMAT_96M08: ::DWORD = 0x00010000;
-pub const WAVE_FORMAT_96S08: ::DWORD = 0x00020000;
-pub const WAVE_FORMAT_96M16: ::DWORD = 0x00040000;
-pub const WAVE_FORMAT_96S16: ::DWORD = 0x00080000;
-//782 (Win 7 SDK)
-pub type PWAVEFORMATEX = *mut ::WAVEFORMATEX;
-pub type NPWAVEFORMATEX = *mut ::WAVEFORMATEX;
-pub type LPWAVEFORMATEX = *mut ::WAVEFORMATEX;
-pub type LPCWAVEFORMATEX = *const ::WAVEFORMATEX;
-//2170 (Win 7 SDK)
-pub const TIMERR_NOERROR: ::MMRESULT = 0;
-pub const TIMERR_NOCANDO: ::MMRESULT = TIMERR_BASE + 1;
-pub const TIMERR_STRUCT: ::MMRESULT = TIMERR_BASE + 33;
-//2198 (Win 7 SDK)
-STRUCT!{struct TIMECAPS {
-    wPeriodMin: ::UINT,
-    wPeriodMax: ::UINT,
-}}
-pub type PTIMECAPS = *mut TIMECAPS;
-pub type NPTIMECAPS = *mut TIMECAPS;
-pub type LPTIMECAPS = *mut TIMECAPS;
-STRUCT!{struct MIDIHDR {
-    lpData: ::LPSTR,
-    dwBufferLength: ::DWORD,
-    dwBytesRecorded: ::DWORD,
-    dwUser: ::DWORD_PTR,
-    dwFlags: ::DWORD,
-    lpNext: *mut MIDIHDR,
-    reserved: ::DWORD_PTR,
-    dwOffset: ::DWORD,
-    dwReserved: [::DWORD_PTR; 4],
-}}
-pub type PMIDIHDR = *mut MIDIHDR;
-pub type NPMIDIHDR = *mut MIDIHDR;
-pub type LPMIDIHDR = *mut MIDIHDR;
-STRUCT!{struct MIDIINCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: MMVERSION,
-    szPname: [::WCHAR; 32],
-    dwSupport: ::DWORD,
-}}
-pub type PMIDIINCAPSW = *mut MIDIINCAPSW;
-pub type NPMIDIINCAPSW = *mut MIDIINCAPSW;
-pub type LPMIDIINCAPSW = *mut MIDIINCAPSW;
-STRUCT!{struct MIDIOUTCAPSW {
-    wMid: ::WORD,
-    wPid: ::WORD,
-    vDriverVersion: ::MMVERSION,
-    szPname: [::WCHAR; 32],
-    wTechnology: ::WORD,
-    wVoices: ::WORD,
-    wNotes: ::WORD,
-    wChannelMask: ::WORD,
-    dwSupport: ::DWORD,
-}}
-pub type PMIDIOUTCAPSW = *mut MIDIOUTCAPSW;
-pub type NPMIDIOUTCAPSW = *mut MIDIOUTCAPSW;
-pub type LPMIDIOUTCAPSW = *mut MIDIOUTCAPSW;
-DECLARE_HANDLE!(HMIDIIN, HMIDIIN__);
-DECLARE_HANDLE!(HMIDIOUT, HMIDIOUT__);
-pub type LPHMIDIIN = *mut HMIDIIN;
-pub type LPHMIDIOUT = *mut HMIDIOUT;
-DECLARE_HANDLE!(HMIDISTRM, HMIDISTRM__);
-DECLARE_HANDLE!(HMIDI, HMIDI__);
-pub type LPHMIDISTRM = *mut HMIDISTRM;
-pub type LPHMIDI = *mut HMIDI;
diff --git a/vendor/winapi-0.2.8/src/mscat.rs b/vendor/winapi-0.2.8/src/mscat.rs
deleted file mode 100644
index cc159de26f..0000000000
--- a/vendor/winapi-0.2.8/src/mscat.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Microsoft Internet Security Catalog API Prototypes and Definitions
-STRUCT!{struct CRYPTCATSTORE {
-    cbStruct: ::DWORD,
-    dwPublicVersion: ::DWORD,
-    pwszP7File: ::LPWSTR,
-    hProv: ::HCRYPTPROV,
-    dwEncodingType: ::DWORD,
-    fdwStoreFlags: ::DWORD,
-    hReserved: ::HANDLE,
-    hAttrs: ::HANDLE,
-    hCryptMsg: ::HCRYPTMSG,
-    hSorted: ::HANDLE,
-}}
-STRUCT!{struct CRYPTCATMEMBER {
-    cbStruct: ::DWORD,
-    pwszReferenceTag: ::LPWSTR,
-    pwszFileName: ::LPWSTR,
-    gSubjectType: ::GUID,
-    fdwMemberFlags: ::DWORD,
-    pIndirectData: *mut ::SIP_INDIRECT_DATA,
-    dwCertVersion: ::DWORD,
-    dwReserved: ::DWORD,
-    hReserved: ::HANDLE,
-    sEncodedIndirectData: ::CRYPT_ATTR_BLOB,
-    sEncodedMemberInfo: ::CRYPT_ATTR_BLOB,
-}}
diff --git a/vendor/winapi-0.2.8/src/mssip.rs b/vendor/winapi-0.2.8/src/mssip.rs
deleted file mode 100644
index 5eeaa7e74a..0000000000
--- a/vendor/winapi-0.2.8/src/mssip.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Microsoft SIP Provider Prototypes and Definitions
-STRUCT!{struct SIP_SUBJECTINFO {
-    cbSize: ::DWORD,
-    pgSubjectType: *mut ::GUID,
-    hFile: ::HANDLE,
-    pwsFileName: ::LPCWSTR,
-    pwsDisplayName: ::LPCWSTR,
-    dwReserved1: ::DWORD,
-    dwIntVersion: ::DWORD,
-    hProv: ::HCRYPTPROV,
-    DigestAlgorithm: ::CRYPT_ALGORITHM_IDENTIFIER,
-    dwFlags: ::DWORD,
-    dwEncodingType: ::DWORD,
-    dwReserved2: ::DWORD,
-    fdwCAPISettings: ::DWORD,
-    fdwSecuritySettings: ::DWORD,
-    dwIndex: ::DWORD,
-    dwUnionChoice: ::DWORD,
-    psFlat: *mut MS_ADDINFO_FLAT,
-    pClientData: ::LPVOID,
-}}
-UNION!(SIP_SUBJECTINFO, psFlat, psCatMember, psCatMember_mut, *mut MS_ADDINFO_CATALOGMEMBER);
-UNION!(SIP_SUBJECTINFO, psFlat, psBlob, psBlob_mut, *mut MS_ADDINFO_BLOB);
-pub type LPSIP_SUBJECTINFO = *mut SIP_SUBJECTINFO;
-STRUCT!{struct MS_ADDINFO_FLAT {
-    cbStruct: ::DWORD,
-    pIndirectData: *mut SIP_INDIRECT_DATA,
-}}
-pub type PMS_ADDINFO_FLAT = *mut MS_ADDINFO_FLAT;
-STRUCT!{struct MS_ADDINFO_CATALOGMEMBER {
-    cbStruct: ::DWORD,
-    pStore: *mut ::CRYPTCATSTORE,
-    pMember: *mut ::CRYPTCATMEMBER,
-}}
-pub type PMS_ADDINFO_CATALOGMEMBER = *mut MS_ADDINFO_CATALOGMEMBER;
-STRUCT!{struct MS_ADDINFO_BLOB {
-    cbStruct: ::DWORD,
-    cbMemObject: ::DWORD,
-    pbMemObject: *mut ::BYTE,
-    cbMemSignedMsg: ::DWORD,
-    pbMemSignedMsg: *mut ::BYTE,
-}}
-pub type PMS_ADDINFO_BLOB = *mut MS_ADDINFO_BLOB;
-STRUCT!{struct SIP_INDIRECT_DATA {
-    Data: ::CRYPT_ATTRIBUTE_TYPE_VALUE,
-    DigestAlgorithm: ::CRYPT_ALGORITHM_IDENTIFIER,
-    Digest: ::CRYPT_HASH_BLOB,
-}}
-pub type PSIP_INDIRECT_DATA = *mut SIP_INDIRECT_DATA;
-STRUCT!{struct SIP_ADD_NEWPROVIDER {
-    cbStruct: ::DWORD,
-    pgSubject: *mut ::GUID,
-    pwszDLLFileName: *mut ::WCHAR,
-    pwszMagicNumber: *mut ::WCHAR,
-    pwszIsFunctionName: *mut ::WCHAR,
-    pwszGetFuncName: *mut ::WCHAR,
-    pwszPutFuncName: *mut ::WCHAR,
-    pwszCreateFuncName: *mut ::WCHAR,
-    pwszVerifyFuncName: *mut ::WCHAR,
-    pwszRemoveFuncName: *mut ::WCHAR,
-    pwszIsFunctionNameFmt2: *mut ::WCHAR,
-    pwszGetCapFuncName: ::PWSTR,
-}}
-pub type PSIP_ADD_NEWPROVIDER = *mut SIP_ADD_NEWPROVIDER;
-STRUCT!{struct SIP_CAP_SET_V3 {
-    cbSize: ::DWORD,
-    dwVersion: ::DWORD,
-    isMultiSign: ::BOOL,
-    dwFlags: ::DWORD,
-}}
-UNION!(SIP_CAP_SET_V3, dwFlags, dwReserved, dwReserved_mut, ::DWORD);
-pub type PSIP_CAP_SET_V3 = *mut SIP_CAP_SET_V3;
-pub type SIP_CAP_SET = PSIP_CAP_SET_V3;
-pub type pCryptSIPGetSignedDataMsg = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, pdwEncodingType: *mut ::DWORD, dwIndex: ::DWORD,
-    pcbSignedDataMsg: *mut ::DWORD, pbSignedDataMsg: *mut ::BYTE,
-) -> ::BOOL>;
-pub type pCryptSIPPutSignedDataMsg = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, dwEncodingType: ::DWORD, pdwIndex: *mut ::DWORD,
-    cbSignedDataMsg: ::DWORD, pbSignedDataMsg: *mut ::BYTE,
-) -> ::BOOL>;
-pub type pCryptSIPCreateIndirectData = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, pcbIndirectData: *mut ::DWORD,
-    pIndirectData: *mut SIP_INDIRECT_DATA,
-) -> ::BOOL>;
-pub type pCryptSIPVerifyIndirectData = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, pIndirectData: *mut SIP_INDIRECT_DATA,
-) -> ::BOOL>;
-pub type pCryptSIPRemoveSignedDataMsg = Option<unsafe extern "system" fn(
-    pSubjectInfo: *mut SIP_SUBJECTINFO, dwIndex: ::DWORD,
-) -> ::BOOL>;
-STRUCT!{nodebug struct SIP_DISPATCH_INFO {
-    cbSize: ::DWORD,
-    hSIP: ::HANDLE,
-    pfGet: pCryptSIPGetSignedDataMsg,
-    pfPut: pCryptSIPPutSignedDataMsg,
-    pfCreate: pCryptSIPCreateIndirectData,
-    pfVerify: pCryptSIPVerifyIndirectData,
-    pfRemove: pCryptSIPRemoveSignedDataMsg,
-}}
-pub type LPSIP_DISPATCH_INFO = *mut SIP_DISPATCH_INFO;
diff --git a/vendor/winapi-0.2.8/src/nb30.rs b/vendor/winapi-0.2.8/src/nb30.rs
deleted file mode 100644
index 26e9dea0ae..0000000000
--- a/vendor/winapi-0.2.8/src/nb30.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// This module contains the definitions for portable NetBIOS 3.0 support.
-pub const NCBNAMSZ: usize = 16;
-pub const MAX_LANA: usize = 254;
-pub type PFPOST = Option<unsafe extern "system" fn(*mut NCB)>;
-#[cfg(target_arch="x86_64")]
-STRUCT!{nodebug struct NCB {
-    ncb_command: ::UCHAR,
-    ncb_retcode: ::UCHAR,
-    ncb_lsn: ::UCHAR,
-    ncb_num: ::UCHAR,
-    ncb_buffer: ::PUCHAR,
-    ncb_length: ::WORD,
-    ncb_callname: [::UCHAR; NCBNAMSZ],
-    ncb_name: [::UCHAR; NCBNAMSZ],
-    ncb_rto: ::UCHAR,
-    ncb_sto: ::UCHAR,
-    ncb_post: PFPOST,
-    ncb_lana_num: ::UCHAR,
-    ncb_cmd_cplt: ::UCHAR,
-    ncb_reserve: [::UCHAR; 18],
-    ncb_event: ::HANDLE,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{nodebug struct NCB {
-    ncb_command: ::UCHAR,
-    ncb_retcode: ::UCHAR,
-    ncb_lsn: ::UCHAR,
-    ncb_num: ::UCHAR,
-    ncb_buffer: ::PUCHAR,
-    ncb_length: ::WORD,
-    ncb_callname: [::UCHAR; NCBNAMSZ],
-    ncb_name: [::UCHAR; NCBNAMSZ],
-    ncb_rto: ::UCHAR,
-    ncb_sto: ::UCHAR,
-    ncb_post: PFPOST,
-    ncb_lana_num: ::UCHAR,
-    ncb_cmd_cplt: ::UCHAR,
-    ncb_reserve: [::UCHAR; 10],
-    ncb_event: ::HANDLE,
-}}
-pub type PNCB = *mut NCB;
-STRUCT!{struct ADAPTER_STATUS {
-    adapter_address: [::UCHAR; 6],
-    rev_major: ::UCHAR,
-    reserved0: ::UCHAR,
-    adapter_type: ::UCHAR,
-    rev_minor: ::UCHAR,
-    duration: ::WORD,
-    frmr_recv: ::WORD,
-    frmr_xmit: ::WORD,
-    iframe_recv_err: ::WORD,
-    xmit_aborts: ::WORD,
-    xmit_success: ::DWORD,
-    recv_success: ::DWORD,
-    iframe_xmit_err: ::WORD,
-    recv_buff_unavail: ::WORD,
-    t1_timeouts: ::WORD,
-    ti_timeouts: ::WORD,
-    reserved1: ::DWORD,
-    free_ncbs: ::WORD,
-    max_cfg_ncbs: ::WORD,
-    max_ncbs: ::WORD,
-    xmit_buf_unavail: ::WORD,
-    max_dgram_size: ::WORD,
-    pending_sess: ::WORD,
-    max_cfg_sess: ::WORD,
-    max_sess: ::WORD,
-    max_sess_pkt_size: ::WORD,
-    name_count: ::WORD,
-}}
-pub type PADAPTER_STATUS = *mut ADAPTER_STATUS;
-STRUCT!{struct NAME_BUFFER {
-    name: [::UCHAR; NCBNAMSZ],
-    name_num: ::UCHAR,
-    name_flags: ::UCHAR,
-}}
-pub type PNAME_BUFFER = *mut NAME_BUFFER;
-pub const NAME_FLAGS_MASK: ::UCHAR = 0x87;
-pub const GROUP_NAME: ::UCHAR = 0x80;
-pub const UNIQUE_NAME: ::UCHAR = 0x00;
-pub const REGISTERING: ::UCHAR = 0x00;
-pub const REGISTERED: ::UCHAR = 0x04;
-pub const DEREGISTERED: ::UCHAR = 0x05;
-pub const DUPLICATE: ::UCHAR = 0x06;
-pub const DUPLICATE_DEREG: ::UCHAR = 0x07;
-STRUCT!{struct SESSION_HEADER {
-    sess_name: ::UCHAR,
-    num_sess: ::UCHAR,
-    rcv_dg_outstanding: ::UCHAR,
-    rcv_any_outstanding: ::UCHAR,
-}}
-pub type PSESSION_HEADER = *mut SESSION_HEADER;
-STRUCT!{struct SESSION_BUFFER {
-    lsn: ::UCHAR,
-    state: ::UCHAR,
-    local_name: [::UCHAR; NCBNAMSZ],
-    remote_name: [::UCHAR; NCBNAMSZ],
-    rcvs_outstanding: ::UCHAR,
-    sends_outstanding: ::UCHAR,
-}}
-pub type PSESSION_BUFFER = *mut SESSION_BUFFER;
-pub const LISTEN_OUTSTANDING: ::UCHAR = 0x01;
-pub const CALL_PENDING: ::UCHAR = 0x02;
-pub const SESSION_ESTABLISHED: ::UCHAR = 0x03;
-pub const HANGUP_PENDING: ::UCHAR = 0x04;
-pub const HANGUP_COMPLETE: ::UCHAR = 0x05;
-pub const SESSION_ABORTED: ::UCHAR = 0x06;
-STRUCT!{nodebug struct LANA_ENUM {
-    length: ::UCHAR,
-    lana: [::UCHAR; MAX_LANA + 1],
-}}
-pub type PLANA_ENUM = *mut LANA_ENUM;
-STRUCT!{struct FIND_NAME_HEADER {
-    node_count: ::WORD,
-    reserved: ::UCHAR,
-    unique_group: ::UCHAR,
-}}
-pub type PFIND_NAME_HEADER = *mut FIND_NAME_HEADER;
-STRUCT!{struct FIND_NAME_BUFFER {
-    length: ::UCHAR,
-    access_control: ::UCHAR,
-    frame_control: ::UCHAR,
-    destination_addr: [::UCHAR; 6],
-    source_addr: [::UCHAR; 6],
-    routing_info: [::UCHAR; 18],
-}}
-pub type PFIND_NAME_BUFFER = *mut FIND_NAME_BUFFER;
-STRUCT!{struct ACTION_HEADER {
-    transport_id: ::ULONG,
-    action_code: ::USHORT,
-    reserved: ::USHORT,
-}}
-pub type PACTION_HEADER = *mut ACTION_HEADER;
-pub const NCBCALL: ::UCHAR = 0x10;
-pub const NCBLISTEN: ::UCHAR = 0x11;
-pub const NCBHANGUP: ::UCHAR = 0x12;
-pub const NCBSEND: ::UCHAR = 0x14;
-pub const NCBRECV: ::UCHAR = 0x15;
-pub const NCBRECVANY: ::UCHAR = 0x16;
-pub const NCBCHAINSEND: ::UCHAR = 0x17;
-pub const NCBDGSEND: ::UCHAR = 0x20;
-pub const NCBDGRECV: ::UCHAR = 0x21;
-pub const NCBDGSENDBC: ::UCHAR = 0x22;
-pub const NCBADDNAME: ::UCHAR = 0x30;
-pub const NCBDELNAME: ::UCHAR = 0x31;
-pub const NCBRESET: ::UCHAR = 0x32;
-pub const NCBASTAT: ::UCHAR = 0x33;
-pub const NCBSSTAT: ::UCHAR = 0x34;
-pub const NCBCANCEL: ::UCHAR = 0x35;
-pub const NCBADDGRNAME: ::UCHAR = 0x36;
-pub const NCBENUM: ::UCHAR = 0x37;
-pub const NCBUNLINK: ::UCHAR = 0x70;
-pub const NCBSENDNA: ::UCHAR = 0x71;
-pub const NCBCHAINSENDNA: ::UCHAR = 0x72;
-pub const NCBLANSTALERT: ::UCHAR = 0x73;
-pub const NCBACTION: ::UCHAR = 0x77;
-pub const NCBFINDNAME: ::UCHAR = 0x78;
-pub const NCBTRACE: ::UCHAR = 0x79;
-pub const ASYNCH: ::UCHAR = 0x80;
-pub const NRC_GOODRET: ::UCHAR = 0x00;
-pub const NRC_BUFLEN: ::UCHAR = 0x01;
-pub const NRC_ILLCMD: ::UCHAR = 0x03;
-pub const NRC_CMDTMO: ::UCHAR = 0x05;
-pub const NRC_INCOMP: ::UCHAR = 0x06;
-pub const NRC_BADDR: ::UCHAR = 0x07;
-pub const NRC_SNUMOUT: ::UCHAR = 0x08;
-pub const NRC_NORES: ::UCHAR = 0x09;
-pub const NRC_SCLOSED: ::UCHAR = 0x0a;
-pub const NRC_CMDCAN: ::UCHAR = 0x0b;
-pub const NRC_DUPNAME: ::UCHAR = 0x0d;
-pub const NRC_NAMTFUL: ::UCHAR = 0x0e;
-pub const NRC_ACTSES: ::UCHAR = 0x0f;
-pub const NRC_LOCTFUL: ::UCHAR = 0x11;
-pub const NRC_REMTFUL: ::UCHAR = 0x12;
-pub const NRC_ILLNN: ::UCHAR = 0x13;
-pub const NRC_NOCALL: ::UCHAR = 0x14;
-pub const NRC_NOWILD: ::UCHAR = 0x15;
-pub const NRC_INUSE: ::UCHAR = 0x16;
-pub const NRC_NAMERR: ::UCHAR = 0x17;
-pub const NRC_SABORT: ::UCHAR = 0x18;
-pub const NRC_NAMCONF: ::UCHAR = 0x19;
-pub const NRC_IFBUSY: ::UCHAR = 0x21;
-pub const NRC_TOOMANY: ::UCHAR = 0x22;
-pub const NRC_BRIDGE: ::UCHAR = 0x23;
-pub const NRC_CANOCCR: ::UCHAR = 0x24;
-pub const NRC_CANCEL: ::UCHAR = 0x26;
-pub const NRC_DUPENV: ::UCHAR = 0x30;
-pub const NRC_ENVNOTDEF: ::UCHAR = 0x34;
-pub const NRC_OSRESNOTAV: ::UCHAR = 0x35;
-pub const NRC_MAXAPPS: ::UCHAR = 0x36;
-pub const NRC_NOSAPS: ::UCHAR = 0x37;
-pub const NRC_NORESOURCES: ::UCHAR = 0x38;
-pub const NRC_INVADDRESS: ::UCHAR = 0x39;
-pub const NRC_INVDDID: ::UCHAR = 0x3B;
-pub const NRC_LOCKFAIL: ::UCHAR = 0x3C;
-pub const NRC_OPENERR: ::UCHAR = 0x3f;
-pub const NRC_SYSTEM: ::UCHAR = 0x40;
-pub const NRC_PENDING: ::UCHAR = 0xff;
diff --git a/vendor/winapi-0.2.8/src/ncrypt.rs b/vendor/winapi-0.2.8/src/ncrypt.rs
deleted file mode 100644
index e7301415cb..0000000000
--- a/vendor/winapi-0.2.8/src/ncrypt.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Cryptographic API Prototypes and Definitions
-//191
-pub type NCRYPT_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_PROV_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_KEY_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_HASH_HANDLE = ::ULONG_PTR;
-pub type NCRYPT_SECRET_HANDLE = ::ULONG_PTR;
diff --git a/vendor/winapi-0.2.8/src/ntdef.rs b/vendor/winapi-0.2.8/src/ntdef.rs
deleted file mode 100644
index 2e6f14b0e2..0000000000
--- a/vendor/winapi-0.2.8/src/ntdef.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Type definitions for the basic types.
-//909
-pub type NTSTATUS = ::LONG;
-pub type PNTSTATUS = *mut NTSTATUS;
-pub type PCNTSTATUS = *const NTSTATUS;
diff --git a/vendor/winapi-0.2.8/src/ntsecapi.rs b/vendor/winapi-0.2.8/src/ntsecapi.rs
deleted file mode 100644
index 893ea9e4ea..0000000000
--- a/vendor/winapi-0.2.8/src/ntsecapi.rs
+++ /dev/null
@@ -1,1589 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the Local Security Authority APIs.
-DEFINE_GUID!(Audit_System_SecurityStateChange, 0x0cce9210, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_SecuritySubsystemExtension, 0x0cce9211, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_Integrity, 0x0cce9212, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_IPSecDriverEvents, 0x0cce9213, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System_Others, 0x0cce9214, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Logon, 0x0cce9215, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Logoff, 0x0cce9216, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_AccountLockout, 0x0cce9217, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_IPSecMainMode, 0x0cce9218, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_IPSecQuickMode, 0x0cce9219, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_IPSecUserMode, 0x0cce921a, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_SpecialLogon, 0x0cce921b, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Others, 0x0cce921c, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_FileSystem, 0x0cce921d, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Registry, 0x0cce921e, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Kernel, 0x0cce921f, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Sam, 0x0cce9220, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_CertificationServices, 0x0cce9221, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_ApplicationGenerated, 0x0cce9222, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Handle, 0x0cce9223, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Share, 0x0cce9224, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_FirewallPacketDrops, 0x0cce9225, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_FirewallConnection, 0x0cce9226, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_Other, 0x0cce9227, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse_Sensitive, 0x0cce9228, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse_NonSensitive, 0x0cce9229, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse_Others, 0x0cce922a, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_ProcessCreation, 0x0cce922b, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_ProcessTermination, 0x0cce922c, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_DpapiActivity, 0x0cce922d, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking_RpcCall, 0x0cce922e, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_AuditPolicy, 0x0cce922f, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_AuthenticationPolicy, 0x0cce9230, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_AuthorizationPolicy, 0x0cce9231, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_MpsscvRulePolicy, 0x0cce9232, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_WfpIPSecPolicy, 0x0cce9233, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange_Others, 0x0cce9234, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_UserAccount, 0x0cce9235, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_ComputerAccount, 0x0cce9236, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_SecurityGroup, 0x0cce9237, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_DistributionGroup, 0x0cce9238, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_ApplicationGroup, 0x0cce9239, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement_Others, 0x0cce923a, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DSAccess_DSAccess, 0x0cce923b, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DsAccess_AdAuditChanges, 0x0cce923c, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Ds_Replication, 0x0cce923d, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Ds_DetailedReplication, 0x0cce923e, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_CredentialValidation, 0x0cce923f, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_Kerberos, 0x0cce9240, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_Others, 0x0cce9241, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon_KerbCredentialValidation, 0x0cce9242, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_NPS, 0x0cce9243, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_DetailedFileShare, 0x0cce9244, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_RemovableStorage, 0x0cce9245, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess_CbacStaging, 0x0cce9246, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon_Claims, 0x0cce9247, 0x69ae, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_System, 0x69979848, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_Logon, 0x69979849, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_ObjectAccess, 0x6997984a, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PrivilegeUse, 0x6997984b, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DetailedTracking, 0x6997984c, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_PolicyChange, 0x6997984d, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountManagement, 0x6997984e, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_DirectoryServiceAccess, 0x6997984f, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-DEFINE_GUID!(Audit_AccountLogon, 0x69979850, 0x797a, 0x11d9,
-    0xbe, 0xd3, 0x50, 0x50, 0x54, 0x50, 0x30, 0x30);
-ENUM!{enum POLICY_AUDIT_EVENT_TYPE {
-    AuditCategorySystem = 0,
-    AuditCategoryLogon,
-    AuditCategoryObjectAccess,
-    AuditCategoryPrivilegeUse,
-    AuditCategoryDetailedTracking,
-    AuditCategoryPolicyChange,
-    AuditCategoryAccountManagement,
-    AuditCategoryDirectoryServiceAccess,
-    AuditCategoryAccountLogon,
-}}
-pub type PPOLICY_AUDIT_EVENT_TYPE = *mut POLICY_AUDIT_EVENT_TYPE;
-pub const POLICY_AUDIT_EVENT_UNCHANGED: POLICY_AUDIT_EVENT_OPTIONS = 0x00000000;
-pub const POLICY_AUDIT_EVENT_SUCCESS: POLICY_AUDIT_EVENT_OPTIONS = 0x00000001;
-pub const POLICY_AUDIT_EVENT_FAILURE: POLICY_AUDIT_EVENT_OPTIONS = 0x00000002;
-pub const POLICY_AUDIT_EVENT_NONE: POLICY_AUDIT_EVENT_OPTIONS = 0x00000004;
-pub const POLICY_AUDIT_EVENT_MASK: POLICY_AUDIT_EVENT_OPTIONS = POLICY_AUDIT_EVENT_SUCCESS
-    | POLICY_AUDIT_EVENT_FAILURE | POLICY_AUDIT_EVENT_UNCHANGED | POLICY_AUDIT_EVENT_NONE;
-pub const POLICY_VIEW_LOCAL_INFORMATION: ::ACCESS_MASK = 0x00000001;
-pub const POLICY_VIEW_AUDIT_INFORMATION: ::ACCESS_MASK = 0x00000002;
-pub const POLICY_GET_PRIVATE_INFORMATION: ::ACCESS_MASK = 0x00000004;
-pub const POLICY_TRUST_ADMIN: ::ACCESS_MASK = 0x00000008;
-pub const POLICY_CREATE_ACCOUNT: ::ACCESS_MASK = 0x00000010;
-pub const POLICY_CREATE_SECRET: ::ACCESS_MASK = 0x00000020;
-pub const POLICY_CREATE_PRIVILEGE: ::ACCESS_MASK = 0x00000040;
-pub const POLICY_SET_DEFAULT_QUOTA_LIMITS: ::ACCESS_MASK = 0x00000080;
-pub const POLICY_SET_AUDIT_REQUIREMENTS: ::ACCESS_MASK = 0x00000100;
-pub const POLICY_AUDIT_LOG_ADMIN: ::ACCESS_MASK = 0x00000200;
-pub const POLICY_SERVER_ADMIN: ::ACCESS_MASK = 0x00000400;
-pub const POLICY_LOOKUP_NAMES: ::ACCESS_MASK = 0x00000800;
-pub const POLICY_NOTIFICATION: ::ACCESS_MASK = 0x00001000;
-pub const POLICY_ALL_ACCESS: ::ACCESS_MASK = ::STANDARD_RIGHTS_REQUIRED
-    | POLICY_VIEW_LOCAL_INFORMATION | POLICY_VIEW_AUDIT_INFORMATION
-    | POLICY_GET_PRIVATE_INFORMATION | POLICY_TRUST_ADMIN | POLICY_CREATE_ACCOUNT
-    | POLICY_CREATE_SECRET | POLICY_CREATE_PRIVILEGE | POLICY_SET_DEFAULT_QUOTA_LIMITS
-    | POLICY_SET_AUDIT_REQUIREMENTS | POLICY_AUDIT_LOG_ADMIN | POLICY_SERVER_ADMIN
-    | POLICY_LOOKUP_NAMES;
-pub const POLICY_READ: ::ACCESS_MASK = ::STANDARD_RIGHTS_READ | POLICY_VIEW_AUDIT_INFORMATION
-    | POLICY_GET_PRIVATE_INFORMATION;
-pub const POLICY_WRITE: ::ACCESS_MASK = ::STANDARD_RIGHTS_WRITE | POLICY_TRUST_ADMIN
-    | POLICY_CREATE_ACCOUNT | POLICY_CREATE_SECRET | POLICY_CREATE_PRIVILEGE
-    | POLICY_SET_DEFAULT_QUOTA_LIMITS | POLICY_SET_AUDIT_REQUIREMENTS | POLICY_AUDIT_LOG_ADMIN
-    | POLICY_SERVER_ADMIN;
-pub const POLICY_EXECUTE: ::ACCESS_MASK = ::STANDARD_RIGHTS_EXECUTE
-    | POLICY_VIEW_LOCAL_INFORMATION | POLICY_LOOKUP_NAMES;
-STRUCT!{struct LSA_TRANSLATED_SID {
-    Use: ::SID_NAME_USE,
-    RelativeId: ::ULONG,
-    DomainIndex: ::LONG,
-}}
-pub type PLSA_TRANSLATED_SID = *mut LSA_TRANSLATED_SID;
-ENUM!{enum POLICY_LSA_SERVER_ROLE {
-    PolicyServerRoleBackup = 2,
-    PolicyServerRolePrimary,
-}}
-pub type PPOLICY_LSA_SERVER_ROLE = *mut POLICY_LSA_SERVER_ROLE;
-pub type POLICY_AUDIT_EVENT_OPTIONS = ::ULONG;
-pub type PPOLICY_AUDIT_EVENT_OPTIONS = *mut ::ULONG;
-ENUM!{enum POLICY_INFORMATION_CLASS {
-    PolicyAuditLogInformation = 1,
-    PolicyAuditEventsInformation,
-    PolicyPrimaryDomainInformation,
-    PolicyPdAccountInformation,
-    PolicyAccountDomainInformation,
-    PolicyLsaServerRoleInformation,
-    PolicyReplicaSourceInformation,
-    PolicyDefaultQuotaInformation,
-    PolicyModificationInformation,
-    PolicyAuditFullSetInformation,
-    PolicyAuditFullQueryInformation,
-    PolicyDnsDomainInformation,
-    PolicyDnsDomainInformationInt,
-    PolicyLocalAccountDomainInformation,
-    PolicyLastEntry,
-}}
-pub type PPOLICY_INFORMATION_CLASS = *mut POLICY_INFORMATION_CLASS;
-STRUCT!{struct POLICY_AUDIT_LOG_INFO {
-    AuditLogPercentFull: ::ULONG,
-    MaximumLogSize: ::ULONG,
-    AuditRetentionPeriod: ::LARGE_INTEGER,
-    AuditLogFullShutdownInProgress: ::BOOLEAN,
-    TimeToShutdown: ::LARGE_INTEGER,
-    NextAuditRecordId: ::ULONG,
-}}
-pub type PPOLICY_AUDIT_LOG_INFO = *mut POLICY_AUDIT_LOG_INFO;
-STRUCT!{struct POLICY_AUDIT_EVENTS_INFO {
-    AuditingMode: ::BOOLEAN,
-    EventAuditingOptions: PPOLICY_AUDIT_EVENT_OPTIONS,
-    MaximumAuditEventCount: ::ULONG,
-}}
-pub type PPOLICY_AUDIT_EVENTS_INFO = *mut POLICY_AUDIT_EVENTS_INFO;
-STRUCT!{struct POLICY_AUDIT_SUBCATEGORIES_INFO {
-    MaximumSubCategoryCount: ::ULONG,
-    EventAuditingOptions: PPOLICY_AUDIT_EVENT_OPTIONS,
-}}
-pub type PPOLICY_AUDIT_SUBCATEGORIES_INFO = *mut POLICY_AUDIT_SUBCATEGORIES_INFO;
-STRUCT!{struct POLICY_AUDIT_CATEGORIES_INFO {
-    MaximumSubCategoryCount: ::ULONG,
-    SubCategoriesInfo: PPOLICY_AUDIT_SUBCATEGORIES_INFO,
-}}
-pub type PPOLICY_AUDIT_CATEGORIES_INFO = *mut POLICY_AUDIT_CATEGORIES_INFO;
-pub const PER_USER_POLICY_UNCHANGED: ::ULONG = 0x00;
-pub const PER_USER_AUDIT_SUCCESS_INCLUDE: ::ULONG = 0x01;
-pub const PER_USER_AUDIT_SUCCESS_EXCLUDE: ::ULONG = 0x02;
-pub const PER_USER_AUDIT_FAILURE_INCLUDE: ::ULONG = 0x04;
-pub const PER_USER_AUDIT_FAILURE_EXCLUDE: ::ULONG = 0x08;
-pub const PER_USER_AUDIT_NONE: ::ULONG = 0x10;
-pub const VALID_PER_USER_AUDIT_POLICY_FLAG: ::ULONG = PER_USER_AUDIT_SUCCESS_INCLUDE
-    | PER_USER_AUDIT_SUCCESS_EXCLUDE | PER_USER_AUDIT_FAILURE_INCLUDE
-    | PER_USER_AUDIT_FAILURE_EXCLUDE | PER_USER_AUDIT_NONE;
-STRUCT!{struct POLICY_PRIMARY_DOMAIN_INFO {
-    Name: ::LSA_UNICODE_STRING,
-    Sid: ::PSID,
-}}
-pub type PPOLICY_PRIMARY_DOMAIN_INFO = *mut POLICY_PRIMARY_DOMAIN_INFO;
-STRUCT!{struct POLICY_PD_ACCOUNT_INFO {
-    Name: ::LSA_UNICODE_STRING,
-}}
-pub type PPOLICY_PD_ACCOUNT_INFO = *mut POLICY_PD_ACCOUNT_INFO;
-STRUCT!{struct POLICY_LSA_SERVER_ROLE_INFO {
-    LsaServerRole: POLICY_LSA_SERVER_ROLE,
-}}
-pub type PPOLICY_LSA_SERVER_ROLE_INFO = *mut POLICY_LSA_SERVER_ROLE_INFO;
-STRUCT!{struct POLICY_REPLICA_SOURCE_INFO {
-    ReplicaSource: ::LSA_UNICODE_STRING,
-    ReplicaAccountName: ::LSA_UNICODE_STRING,
-}}
-pub type PPOLICY_REPLICA_SOURCE_INFO = *mut POLICY_REPLICA_SOURCE_INFO;
-STRUCT!{struct POLICY_DEFAULT_QUOTA_INFO {
-    QuotaLimits: ::QUOTA_LIMITS,
-}}
-pub type PPOLICY_DEFAULT_QUOTA_INFO = *mut POLICY_DEFAULT_QUOTA_INFO;
-STRUCT!{struct POLICY_MODIFICATION_INFO {
-    ModifiedId: ::LARGE_INTEGER,
-    DatabaseCreationTime: ::LARGE_INTEGER,
-}}
-pub type PPOLICY_MODIFICATION_INFO = *mut POLICY_MODIFICATION_INFO;
-STRUCT!{struct POLICY_AUDIT_FULL_SET_INFO {
-    ShutDownOnFull: ::BOOLEAN,
-}}
-pub type PPOLICY_AUDIT_FULL_SET_INFO = *mut POLICY_AUDIT_FULL_SET_INFO;
-STRUCT!{struct POLICY_AUDIT_FULL_QUERY_INFO {
-    ShutDownOnFull: ::BOOLEAN,
-    LogIsFull: ::BOOLEAN,
-}}
-pub type PPOLICY_AUDIT_FULL_QUERY_INFO = *mut POLICY_AUDIT_FULL_QUERY_INFO;
-ENUM!{enum POLICY_DOMAIN_INFORMATION_CLASS {
-    PolicyDomainEfsInformation = 2,
-    PolicyDomainKerberosTicketInformation,
-}}
-pub type PPOLICY_DOMAIN_INFORMATION_CLASS = *mut POLICY_DOMAIN_INFORMATION_CLASS;
-STRUCT!{struct POLICY_DOMAIN_EFS_INFO {
-    InfoLength: ::ULONG,
-    EfsBlob: ::PUCHAR,
-}}
-pub type PPOLICY_DOMAIN_EFS_INFO = *mut POLICY_DOMAIN_EFS_INFO;
-STRUCT!{struct POLICY_DOMAIN_KERBEROS_TICKET_INFO {
-    AuthenticationOptions: ::ULONG,
-    MaxServiceTicketAge: ::LARGE_INTEGER,
-    MaxTicketAge: ::LARGE_INTEGER,
-    MaxRenewAge: ::LARGE_INTEGER,
-    MaxClockSkew: ::LARGE_INTEGER,
-    Reserved: ::LARGE_INTEGER,
-}}
-pub type PPOLICY_DOMAIN_KERBEROS_TICKET_INFO = *mut POLICY_DOMAIN_KERBEROS_TICKET_INFO;
-ENUM!{enum POLICY_NOTIFICATION_INFORMATION_CLASS {
-    PolicyNotifyAuditEventsInformation = 1,
-    PolicyNotifyAccountDomainInformation,
-    PolicyNotifyServerRoleInformation,
-    PolicyNotifyDnsDomainInformation,
-    PolicyNotifyDomainEfsInformation,
-    PolicyNotifyDomainKerberosTicketInformation,
-    PolicyNotifyMachineAccountPasswordInformation,
-    PolicyNotifyGlobalSaclInformation,
-    PolicyNotifyMax,
-}}
-pub type PPOLICY_NOTIFICATION_INFORMATION_CLASS = *mut POLICY_NOTIFICATION_INFORMATION_CLASS;
-pub type LSA_HANDLE = ::PVOID;
-pub type PLSA_HANDLE = *mut ::PVOID;
-ENUM!{enum TRUSTED_INFORMATION_CLASS {
-    TrustedDomainNameInformation = 1,
-    TrustedControllersInformation,
-    TrustedPosixOffsetInformation,
-    TrustedPasswordInformation,
-    TrustedDomainInformationBasic,
-    TrustedDomainInformationEx,
-    TrustedDomainAuthInformation,
-    TrustedDomainFullInformation,
-    TrustedDomainAuthInformationInternal,
-    TrustedDomainFullInformationInternal,
-    TrustedDomainInformationEx2Internal,
-    TrustedDomainFullInformation2Internal,
-    TrustedDomainSupportedEncryptionTypes,
-}}
-pub type PTRUSTED_INFORMATION_CLASS = *mut TRUSTED_INFORMATION_CLASS;
-STRUCT!{struct TRUSTED_DOMAIN_NAME_INFO {
-    Name: ::LSA_UNICODE_STRING,
-}}
-pub type PTRUSTED_DOMAIN_NAME_INFO = *mut TRUSTED_DOMAIN_NAME_INFO;
-STRUCT!{struct TRUSTED_CONTROLLERS_INFO {
-    Entries: ::ULONG,
-    Names: ::PLSA_UNICODE_STRING,
-}}
-pub type PTRUSTED_CONTROLLERS_INFO = *mut TRUSTED_CONTROLLERS_INFO;
-STRUCT!{struct TRUSTED_POSIX_OFFSET_INFO {
-    Offset: ::ULONG,
-}}
-pub type PTRUSTED_POSIX_OFFSET_INFO = *mut TRUSTED_POSIX_OFFSET_INFO;
-STRUCT!{struct TRUSTED_PASSWORD_INFO {
-    Password: ::LSA_UNICODE_STRING,
-    OldPassword: ::LSA_UNICODE_STRING,
-}}
-pub type PTRUSTED_PASSWORD_INFO = *mut TRUSTED_PASSWORD_INFO;
-pub type TRUSTED_DOMAIN_INFORMATION_BASIC = ::LSA_TRUST_INFORMATION;
-pub type PTRUSTED_DOMAIN_INFORMATION_BASIC = ::PLSA_TRUST_INFORMATION;
-pub const TRUST_DIRECTION_DISABLED: ::ULONG = 0x00000000;
-pub const TRUST_DIRECTION_INBOUND: ::ULONG = 0x00000001;
-pub const TRUST_DIRECTION_OUTBOUND: ::ULONG = 0x00000002;
-pub const TRUST_DIRECTION_BIDIRECTIONAL: ::ULONG = TRUST_DIRECTION_INBOUND
-    | TRUST_DIRECTION_OUTBOUND;
-pub const TRUST_TYPE_DOWNLEVEL: ::ULONG = 0x00000001;
-pub const TRUST_TYPE_UPLEVEL: ::ULONG = 0x00000002;
-pub const TRUST_TYPE_MIT: ::ULONG = 0x00000003;
-pub const TRUST_ATTRIBUTE_NON_TRANSITIVE: ::ULONG = 0x00000001;
-pub const TRUST_ATTRIBUTE_UPLEVEL_ONLY: ::ULONG = 0x00000002;
-pub const TRUST_ATTRIBUTE_QUARANTINED_DOMAIN: ::ULONG = 0x00000004;
-pub const TRUST_ATTRIBUTE_FOREST_TRANSITIVE: ::ULONG = 0x00000008;
-pub const TRUST_ATTRIBUTE_CROSS_ORGANIZATION: ::ULONG = 0x00000010;
-pub const TRUST_ATTRIBUTE_WITHIN_FOREST: ::ULONG = 0x00000020;
-pub const TRUST_ATTRIBUTE_TREAT_AS_EXTERNAL: ::ULONG = 0x00000040;
-pub const TRUST_ATTRIBUTE_TRUST_USES_RC4_ENCRYPTION: ::ULONG = 0x00000080;
-pub const TRUST_ATTRIBUTE_TRUST_USES_AES_KEYS: ::ULONG = 0x00000100;
-pub const TRUST_ATTRIBUTE_CROSS_ORGANIZATION_NO_TGT_DELEGATION: ::ULONG = 0x00000200;
-pub const TRUST_ATTRIBUTES_VALID: ::ULONG = 0xFF03FFFF;
-pub const TRUST_ATTRIBUTES_USER: ::ULONG = 0xFF000000;
-STRUCT!{struct TRUSTED_DOMAIN_INFORMATION_EX {
-    Name: ::LSA_UNICODE_STRING,
-    FlatName: ::LSA_UNICODE_STRING,
-    Sid: ::PSID,
-    TrustDirection: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-}}
-pub type PTRUSTED_DOMAIN_INFORMATION_EX = *mut TRUSTED_DOMAIN_INFORMATION_EX;
-STRUCT!{struct TRUSTED_DOMAIN_INFORMATION_EX2 {
-    Name: ::LSA_UNICODE_STRING,
-    FlatName: ::LSA_UNICODE_STRING,
-    Sid: ::PSID,
-    TrustDirection: ::ULONG,
-    TrustType: ::ULONG,
-    TrustAttributes: ::ULONG,
-    ForestTrustLength: ::ULONG,
-    ForestTrustInfo: ::PUCHAR,
-}}
-pub type PTRUSTED_DOMAIN_INFORMATION_EX2 = *mut TRUSTED_DOMAIN_INFORMATION_EX2;
-pub const TRUST_AUTH_TYPE_NONE: ::ULONG = 0;
-pub const TRUST_AUTH_TYPE_NT4OWF: ::ULONG = 1;
-pub const TRUST_AUTH_TYPE_CLEAR: ::ULONG = 2;
-pub const TRUST_AUTH_TYPE_VERSION: ::ULONG = 3;
-STRUCT!{struct LSA_AUTH_INFORMATION {
-    LastUpdateTime: ::LARGE_INTEGER,
-    AuthType: ::ULONG,
-    AuthInfoLength: ::ULONG,
-    AuthInfo: ::PUCHAR,
-}}
-pub type PLSA_AUTH_INFORMATION = *mut LSA_AUTH_INFORMATION;
-STRUCT!{struct TRUSTED_DOMAIN_AUTH_INFORMATION {
-    IncomingAuthInfos: ::ULONG,
-    IncomingAuthenticationInformation: PLSA_AUTH_INFORMATION,
-    IncomingPreviousAuthenticationInformation: PLSA_AUTH_INFORMATION,
-    OutgoingAuthInfos: ::ULONG,
-    OutgoingAuthenticationInformation: PLSA_AUTH_INFORMATION,
-    OutgoingPreviousAuthenticationInformation: PLSA_AUTH_INFORMATION,
-}}
-pub type PTRUSTED_DOMAIN_AUTH_INFORMATION = *mut TRUSTED_DOMAIN_AUTH_INFORMATION;
-STRUCT!{struct TRUSTED_DOMAIN_FULL_INFORMATION {
-    Information: TRUSTED_DOMAIN_INFORMATION_EX,
-    PosixOffset: TRUSTED_POSIX_OFFSET_INFO,
-    AuthInformation: TRUSTED_DOMAIN_AUTH_INFORMATION,
-}}
-pub type PTRUSTED_DOMAIN_FULL_INFORMATION = *mut TRUSTED_DOMAIN_FULL_INFORMATION;
-STRUCT!{struct TRUSTED_DOMAIN_FULL_INFORMATION2 {
-    Information: TRUSTED_DOMAIN_INFORMATION_EX2,
-    PosixOffset: TRUSTED_POSIX_OFFSET_INFO,
-    AuthInformation: TRUSTED_DOMAIN_AUTH_INFORMATION,
-}}
-pub type PTRUSTED_DOMAIN_FULL_INFORMATION2 = *mut TRUSTED_DOMAIN_FULL_INFORMATION2;
-STRUCT!{struct TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES {
-    SupportedEncryptionTypes: ::ULONG,
-}}
-pub type PTRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES =
-    *mut TRUSTED_DOMAIN_SUPPORTED_ENCRYPTION_TYPES;
-ENUM!{enum LSA_FOREST_TRUST_RECORD_TYPE {
-    ForestTrustTopLevelName,
-    ForestTrustTopLevelNameEx,
-    ForestTrustDomainInfo,
-    ForestTrustRecordTypeLast, // = ForestTrustDomainInfo,
-}}
-pub const LSA_FTRECORD_DISABLED_REASONS: ::ULONG = 0x0000FFFF;
-pub const LSA_TLN_DISABLED_NEW: ::ULONG = 0x00000001;
-pub const LSA_TLN_DISABLED_ADMIN: ::ULONG = 0x00000002;
-pub const LSA_TLN_DISABLED_CONFLICT: ::ULONG = 0x00000004;
-pub const LSA_SID_DISABLED_ADMIN: ::ULONG = 0x00000001;
-pub const LSA_SID_DISABLED_CONFLICT: ::ULONG = 0x00000002;
-pub const LSA_NB_DISABLED_ADMIN: ::ULONG = 0x00000004;
-pub const LSA_NB_DISABLED_CONFLICT: ::ULONG = 0x00000008;
-STRUCT!{struct LSA_FOREST_TRUST_DOMAIN_INFO {
-    Sid: ::PSID,
-    DnsName: ::LSA_UNICODE_STRING,
-    NetbiosName: ::LSA_UNICODE_STRING,
-}}
-pub type PLSA_FOREST_TRUST_DOMAIN_INFO = *mut LSA_FOREST_TRUST_DOMAIN_INFO;
-pub const MAX_FOREST_TRUST_BINARY_DATA_SIZE: ::ULONG = 128 * 1024;
-STRUCT!{struct LSA_FOREST_TRUST_BINARY_DATA {
-    Length: ::ULONG,
-    Buffer: ::PUCHAR,
-}}
-pub type PLSA_FOREST_TRUST_BINARY_DATA = *mut LSA_FOREST_TRUST_BINARY_DATA;
-STRUCT!{struct LSA_FOREST_TRUST_RECORD_ForestTrustData {
-    DomainInfo: LSA_FOREST_TRUST_DOMAIN_INFO,
-}}
-UNION!(
-    LSA_FOREST_TRUST_RECORD_ForestTrustData, DomainInfo, TopLevelName, TopLevelName_mut,
-    ::LSA_UNICODE_STRING
-);
-UNION!(
-    LSA_FOREST_TRUST_RECORD_ForestTrustData, DomainInfo, Data, Data_mut,
-    LSA_FOREST_TRUST_BINARY_DATA
-);
-STRUCT!{struct LSA_FOREST_TRUST_RECORD {
-    Flags: ::ULONG,
-    ForestTrustType: LSA_FOREST_TRUST_RECORD_TYPE,
-    Time: ::LARGE_INTEGER,
-    ForestTrustData: LSA_FOREST_TRUST_RECORD_ForestTrustData,
-}}
-pub type PLSA_FOREST_TRUST_RECORD = *mut LSA_FOREST_TRUST_RECORD;
-pub const MAX_RECORDS_IN_FOREST_TRUST_INFO: ::ULONG = 4000;
-STRUCT!{struct LSA_FOREST_TRUST_INFORMATION {
-    RecordCount: ::ULONG,
-    Entries: *mut PLSA_FOREST_TRUST_RECORD,
-}}
-pub type PLSA_FOREST_TRUST_INFORMATION = *mut LSA_FOREST_TRUST_INFORMATION;
-ENUM!{enum LSA_FOREST_TRUST_COLLISION_RECORD_TYPE {
-    CollisionTdo,
-    CollisionXref,
-    CollisionOther,
-}}
-STRUCT!{struct LSA_FOREST_TRUST_COLLISION_RECORD {
-    Index: ::ULONG,
-    Type: LSA_FOREST_TRUST_COLLISION_RECORD_TYPE,
-    Flags: ::ULONG,
-    Name: ::LSA_UNICODE_STRING,
-}}
-pub type PLSA_FOREST_TRUST_COLLISION_RECORD = *mut LSA_FOREST_TRUST_COLLISION_RECORD;
-STRUCT!{struct LSA_FOREST_TRUST_COLLISION_INFORMATION {
-    RecordCount: ::ULONG,
-    Entries: *mut PLSA_FOREST_TRUST_COLLISION_RECORD,
-}}
-pub type PLSA_FOREST_TRUST_COLLISION_INFORMATION = *mut LSA_FOREST_TRUST_COLLISION_INFORMATION;
-pub type LSA_ENUMERATION_HANDLE = ::ULONG;
-pub type PLSA_ENUMERATION_HANDLE = *mut ::ULONG;
-STRUCT!{struct LSA_ENUMERATION_INFORMATION {
-    Sid: ::PSID,
-}}
-pub type PLSA_ENUMERATION_INFORMATION = *mut LSA_ENUMERATION_INFORMATION;
-STRUCT!{struct LSA_LAST_INTER_LOGON_INFO {
-    LastSuccessfulLogon: ::LARGE_INTEGER,
-    LastFailedLogon: ::LARGE_INTEGER,
-    FailedAttemptCountSinceLastSuccessfulLogon: ::ULONG,
-}}
-pub type PLSA_LAST_INTER_LOGON_INFO = *mut LSA_LAST_INTER_LOGON_INFO;
-STRUCT!{struct SECURITY_LOGON_SESSION_DATA {
-    Size: ::ULONG,
-    LogonId: ::LUID,
-    UserName: ::LSA_UNICODE_STRING,
-    LogonDomain: ::LSA_UNICODE_STRING,
-    AuthenticationPackage: ::LSA_UNICODE_STRING,
-    LogonType: ::ULONG,
-    Session: ::ULONG,
-    Sid: ::PSID,
-    LogonTime: ::LARGE_INTEGER,
-    LogonServer: ::LSA_UNICODE_STRING,
-    DnsDomainName: ::LSA_UNICODE_STRING,
-    Upn: ::LSA_UNICODE_STRING,
-    UserFlags: ::ULONG,
-    LastLogonInfo: LSA_LAST_INTER_LOGON_INFO,
-    LogonScript: ::LSA_UNICODE_STRING,
-    ProfilePath: ::LSA_UNICODE_STRING,
-    HomeDirectory: ::LSA_UNICODE_STRING,
-    HomeDirectoryDrive: ::LSA_UNICODE_STRING,
-    LogoffTime: ::LARGE_INTEGER,
-    KickOffTime: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-}}
-pub type PSECURITY_LOGON_SESSION_DATA = *mut SECURITY_LOGON_SESSION_DATA;
-pub const CENTRAL_ACCESS_POLICY_OWNER_RIGHTS_PRESENT_FLAG: ::ULONG = 0x00000001;
-pub const CENTRAL_ACCESS_POLICY_STAGED_OWNER_RIGHTS_PRESENT_FLAG: ::ULONG = 0x00000100;
-pub const CENTRAL_ACCESS_POLICY_STAGED_FLAG: ::ULONG = 0x00010000;
-pub const CENTRAL_ACCESS_POLICY_VALID_FLAG_MASK: ::ULONG =
-    CENTRAL_ACCESS_POLICY_OWNER_RIGHTS_PRESENT_FLAG
-    | CENTRAL_ACCESS_POLICY_STAGED_OWNER_RIGHTS_PRESENT_FLAG | CENTRAL_ACCESS_POLICY_STAGED_FLAG;
-pub const LSASETCAPS_RELOAD_FLAG: ::ULONG = 0x00000001;
-pub const LSASETCAPS_VALID_FLAG_MASK: ::ULONG = LSASETCAPS_RELOAD_FLAG;
-STRUCT!{struct CENTRAL_ACCESS_POLICY_ENTRY {
-    Name: ::LSA_UNICODE_STRING,
-    Description: ::LSA_UNICODE_STRING,
-    ChangeId: ::LSA_UNICODE_STRING,
-    LengthAppliesTo: ::ULONG,
-    AppliesTo: ::PUCHAR,
-    LengthSD: ::ULONG,
-    SD: ::PSECURITY_DESCRIPTOR,
-    LengthStagedSD: ::ULONG,
-    StagedSD: ::PSECURITY_DESCRIPTOR,
-    Flags: ::ULONG,
-}}
-pub type PCENTRAL_ACCESS_POLICY_ENTRY = *mut CENTRAL_ACCESS_POLICY_ENTRY;
-pub type PCCENTRAL_ACCESS_POLICY_ENTRY = *const CENTRAL_ACCESS_POLICY_ENTRY;
-STRUCT!{struct CENTRAL_ACCESS_POLICY {
-    CAPID: ::PSID,
-    Name: ::LSA_UNICODE_STRING,
-    Description: ::LSA_UNICODE_STRING,
-    ChangeId: ::LSA_UNICODE_STRING,
-    Flags: ::ULONG,
-    CAPECount: ::ULONG,
-    CAPEs: *mut PCENTRAL_ACCESS_POLICY_ENTRY,
-}}
-pub type PCENTRAL_ACCESS_POLICY = *mut CENTRAL_ACCESS_POLICY;
-pub type PCCENTRAL_ACCESS_POLICY = *const CENTRAL_ACCESS_POLICY;
-ENUM!{enum NEGOTIATE_MESSAGES {
-    NegEnumPackagePrefixes = 0,
-    NegGetCallerName = 1,
-    NegTransferCredentials = 2,
-    NegCallPackageMax,
-}}
-pub const NEGOTIATE_MAX_PREFIX: usize = 32;
-STRUCT!{struct NEGOTIATE_PACKAGE_PREFIX {
-    PackageId: ::ULONG_PTR,
-    PackageDataA: ::PVOID,
-    PackageDataW: ::PVOID,
-    PrefixLen: ::ULONG_PTR,
-    Prefix: [::UCHAR; NEGOTIATE_MAX_PREFIX],
-}}
-pub type PNEGOTIATE_PACKAGE_PREFIX = *mut NEGOTIATE_PACKAGE_PREFIX;
-STRUCT!{struct NEGOTIATE_PACKAGE_PREFIXES {
-    MessageType: ::ULONG,
-    PrefixCount: ::ULONG,
-    Offset: ::ULONG,
-    Pad: ::ULONG,
-}}
-pub type PNEGOTIATE_PACKAGE_PREFIXES = *mut NEGOTIATE_PACKAGE_PREFIXES;
-STRUCT!{struct NEGOTIATE_CALLER_NAME_REQUEST {
-    MessageType: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PNEGOTIATE_CALLER_NAME_REQUEST = *mut NEGOTIATE_CALLER_NAME_REQUEST;
-STRUCT!{struct NEGOTIATE_CALLER_NAME_RESPONSE {
-    MessageType: ::ULONG,
-    CallerName: ::PWSTR,
-}}
-pub type PNEGOTIATE_CALLER_NAME_RESPONSE = *mut NEGOTIATE_CALLER_NAME_RESPONSE;
-STRUCT!{struct DOMAIN_PASSWORD_INFORMATION {
-    MinPasswordLength: ::USHORT,
-    PasswordHistoryLength: ::USHORT,
-    PasswordProperties: ::ULONG,
-    MaxPasswordAge: ::LARGE_INTEGER,
-    MinPasswordAge: ::LARGE_INTEGER,
-}}
-pub type PDOMAIN_PASSWORD_INFORMATION = *mut DOMAIN_PASSWORD_INFORMATION;
-pub const DOMAIN_PASSWORD_COMPLEX: ::ULONG = 0x00000001;
-pub const DOMAIN_PASSWORD_NO_ANON_CHANGE: ::ULONG = 0x00000002;
-pub const DOMAIN_PASSWORD_NO_CLEAR_CHANGE: ::ULONG = 0x00000004;
-pub const DOMAIN_LOCKOUT_ADMINS: ::ULONG = 0x00000008;
-pub const DOMAIN_PASSWORD_STORE_CLEARTEXT: ::ULONG = 0x00000010;
-pub const DOMAIN_REFUSE_PASSWORD_CHANGE: ::ULONG = 0x00000020;
-pub const DOMAIN_NO_LM_OWF_CHANGE: ::ULONG = 0x00000040;
-pub type PSAM_PASSWORD_NOTIFICATION_ROUTINE = Option<unsafe extern "system" fn(
-    UserName: ::PUNICODE_STRING, RelativeId: ::ULONG, NewPassword: ::PUNICODE_STRING,
-) -> ::NTSTATUS>;
-pub type PSAM_INIT_NOTIFICATION_ROUTINE = Option<unsafe extern "system" fn() -> ::BOOLEAN>;
-pub type PSAM_PASSWORD_FILTER_ROUTINE = Option<unsafe extern "system" fn(
-    AccountName: ::PUNICODE_STRING, FullName: ::PUNICODE_STRING, Password: ::PUNICODE_STRING,
-    SetOperation: ::BOOLEAN,
-) -> ::BOOLEAN>;
-ENUM!{enum MSV1_0_LOGON_SUBMIT_TYPE {
-    MsV1_0InteractiveLogon = 2,
-    MsV1_0Lm20Logon,
-    MsV1_0NetworkLogon,
-    MsV1_0SubAuthLogon,
-    MsV1_0WorkstationUnlockLogon = 7,
-    MsV1_0S4ULogon = 12,
-    MsV1_0VirtualLogon = 82,
-    MsV1_0NoElevationLogon = 83,
-    MsV1_0LuidLogon = 84,
-}}
-pub type PMSV1_0_LOGON_SUBMIT_TYPE = *mut MSV1_0_LOGON_SUBMIT_TYPE;
-ENUM!{enum MSV1_0_PROFILE_BUFFER_TYPE {
-    MsV1_0InteractiveProfile = 2,
-    MsV1_0Lm20LogonProfile,
-    MsV1_0SmartCardProfile,
-}}
-pub type PMSV1_0_PROFILE_BUFFER_TYPE = *mut MSV1_0_PROFILE_BUFFER_TYPE;
-STRUCT!{struct MSV1_0_INTERACTIVE_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-}}
-pub type PMSV1_0_INTERACTIVE_LOGON = *mut MSV1_0_INTERACTIVE_LOGON;
-STRUCT!{struct MSV1_0_INTERACTIVE_PROFILE {
-    MessageType: MSV1_0_PROFILE_BUFFER_TYPE,
-    LogonCount: ::USHORT,
-    BadPasswordCount: ::USHORT,
-    LogonTime: ::LARGE_INTEGER,
-    LogoffTime: ::LARGE_INTEGER,
-    KickOffTime: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-    LogonScript: ::UNICODE_STRING,
-    HomeDirectory: ::UNICODE_STRING,
-    FullName: ::UNICODE_STRING,
-    ProfilePath: ::UNICODE_STRING,
-    HomeDirectoryDrive: ::UNICODE_STRING,
-    LogonServer: ::UNICODE_STRING,
-    UserFlags: ::ULONG,
-}}
-pub type PMSV1_0_INTERACTIVE_PROFILE = *mut MSV1_0_INTERACTIVE_PROFILE;
-pub const MSV1_0_CHALLENGE_LENGTH: usize = 8;
-pub const MSV1_0_USER_SESSION_KEY_LENGTH: usize = 16;
-pub const MSV1_0_LANMAN_SESSION_KEY_LENGTH: usize = 8;
-pub const MSV1_0_CLEARTEXT_PASSWORD_ALLOWED: ::ULONG = 0x02;
-pub const MSV1_0_UPDATE_LOGON_STATISTICS: ::ULONG = 0x04;
-pub const MSV1_0_RETURN_USER_PARAMETERS: ::ULONG = 0x08;
-pub const MSV1_0_DONT_TRY_GUEST_ACCOUNT: ::ULONG = 0x10;
-pub const MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT: ::ULONG = 0x20;
-pub const MSV1_0_RETURN_PASSWORD_EXPIRY: ::ULONG = 0x40;
-pub const MSV1_0_USE_CLIENT_CHALLENGE: ::ULONG = 0x80;
-pub const MSV1_0_TRY_GUEST_ACCOUNT_ONLY: ::ULONG = 0x100;
-pub const MSV1_0_RETURN_PROFILE_PATH: ::ULONG = 0x200;
-pub const MSV1_0_TRY_SPECIFIED_DOMAIN_ONLY: ::ULONG = 0x400;
-pub const MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT: ::ULONG = 0x800;
-pub const MSV1_0_DISABLE_PERSONAL_FALLBACK: ::ULONG = 0x00001000;
-pub const MSV1_0_ALLOW_FORCE_GUEST: ::ULONG = 0x00002000;
-pub const MSV1_0_CLEARTEXT_PASSWORD_SUPPLIED: ::ULONG = 0x00004000;
-pub const MSV1_0_USE_DOMAIN_FOR_ROUTING_ONLY: ::ULONG = 0x00008000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_EX: ::ULONG = 0x00100000;
-pub const MSV1_0_ALLOW_MSVCHAPV2: ::ULONG = 0x00010000;
-pub const MSV1_0_S4U2SELF: ::ULONG = 0x00020000;
-pub const MSV1_0_CHECK_LOGONHOURS_FOR_S4U: ::ULONG = 0x00040000;
-pub const MSV1_0_INTERNET_DOMAIN: ::ULONG = 0x00080000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL: ::ULONG = 0xFF000000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_SHIFT: ::ULONG = 24;
-pub const MSV1_0_MNS_LOGON: ::ULONG = 0x01000000;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_RAS: ::ULONG = 2;
-pub const MSV1_0_SUBAUTHENTICATION_DLL_IIS: ::ULONG = 132;
-STRUCT!{struct MSV1_0_LM20_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Workstation: ::UNICODE_STRING,
-    ChallengeToClient: [::UCHAR; MSV1_0_CHALLENGE_LENGTH],
-    CaseSensitiveChallengeResponse: ::STRING,
-    CaseInsensitiveChallengeResponse: ::STRING,
-    ParameterControl: ::ULONG,
-}}
-pub type PMSV1_0_LM20_LOGON = *mut MSV1_0_LM20_LOGON;
-STRUCT!{struct MSV1_0_SUBAUTH_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Workstation: ::UNICODE_STRING,
-    ChallengeToClient: [::UCHAR; MSV1_0_CHALLENGE_LENGTH],
-    AuthenticationInfo1: ::STRING,
-    AuthenticationInfo2: ::STRING,
-    ParameterControl: ::ULONG,
-    SubAuthPackageId: ::ULONG,
-}}
-pub type PMSV1_0_SUBAUTH_LOGON = *mut MSV1_0_SUBAUTH_LOGON;
-STRUCT!{struct MSV1_0_S4U_LOGON {
-    MessageType: MSV1_0_LOGON_SUBMIT_TYPE,
-    MSV1_0_LOGON_SUBMIT_TYPE: ::ULONG,
-    UserPrincipalName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-}}
-pub type PMSV1_0_S4U_LOGON = *mut MSV1_0_S4U_LOGON;
-pub const LOGON_GUEST: ::ULONG = 0x01;
-pub const LOGON_NOENCRYPTION: ::ULONG = 0x02;
-pub const LOGON_CACHED_ACCOUNT: ::ULONG = 0x04;
-pub const LOGON_USED_LM_PASSWORD: ::ULONG = 0x08;
-pub const LOGON_EXTRA_SIDS: ::ULONG = 0x20;
-pub const LOGON_SUBAUTH_SESSION_KEY: ::ULONG = 0x40;
-pub const LOGON_SERVER_TRUST_ACCOUNT: ::ULONG = 0x80;
-pub const LOGON_NTLMV2_ENABLED: ::ULONG = 0x100;
-pub const LOGON_RESOURCE_GROUPS: ::ULONG = 0x200;
-pub const LOGON_PROFILE_PATH_RETURNED: ::ULONG = 0x400;
-pub const LOGON_NT_V2: ::ULONG = 0x800;
-pub const LOGON_LM_V2: ::ULONG = 0x1000;
-pub const LOGON_NTLM_V2: ::ULONG = 0x2000;
-pub const LOGON_OPTIMIZED: ::ULONG = 0x4000;
-pub const LOGON_WINLOGON: ::ULONG = 0x8000;
-pub const LOGON_PKINIT: ::ULONG = 0x10000;
-pub const LOGON_NO_OPTIMIZED: ::ULONG = 0x20000;
-pub const LOGON_NO_ELEVATION: ::ULONG = 0x40000;
-pub const LOGON_MANAGED_SERVICE: ::ULONG = 0x80000;
-pub const LOGON_GRACE_LOGON: ::ULONG = 0x01000000;
-STRUCT!{struct MSV1_0_LM20_LOGON_PROFILE {
-    MessageType: MSV1_0_PROFILE_BUFFER_TYPE,
-    KickOffTime: ::LARGE_INTEGER,
-    LogoffTime: ::LARGE_INTEGER,
-    UserFlags: ::ULONG,
-    UserSessionKey: [::UCHAR; MSV1_0_USER_SESSION_KEY_LENGTH],
-    LogonDomainName: ::UNICODE_STRING,
-    LanmanSessionKey: [::UCHAR; MSV1_0_LANMAN_SESSION_KEY_LENGTH],
-    LogonServer: ::UNICODE_STRING,
-    UserParameters: ::UNICODE_STRING,
-}}
-pub type PMSV1_0_LM20_LOGON_PROFILE = *mut MSV1_0_LM20_LOGON_PROFILE;
-pub const MSV1_0_OWF_PASSWORD_LENGTH: usize = 16;
-STRUCT!{struct MSV1_0_SUPPLEMENTAL_CREDENTIAL {
-    Version: ::ULONG,
-    Flags: ::ULONG,
-    LmPassword: [::UCHAR; MSV1_0_OWF_PASSWORD_LENGTH],
-    NtPassword: [::UCHAR; MSV1_0_OWF_PASSWORD_LENGTH],
-}}
-pub type PMSV1_0_SUPPLEMENTAL_CREDENTIAL = *mut MSV1_0_SUPPLEMENTAL_CREDENTIAL;
-pub const MSV1_0_NTLM3_RESPONSE_LENGTH: usize = 16;
-pub const MSV1_0_NTLM3_OWF_LENGTH: usize = 16;
-STRUCT!{struct MSV1_0_NTLM3_RESPONSE {
-    Response: [::UCHAR; MSV1_0_NTLM3_RESPONSE_LENGTH],
-    RespType: ::UCHAR,
-    HiRespType: ::UCHAR,
-    Flags: ::USHORT,
-    MsgWord: ::ULONG,
-    TimeStamp: ::ULONGLONG,
-    ChallengeFromClient: [::UCHAR; MSV1_0_CHALLENGE_LENGTH],
-    AvPairsOff: ::ULONG,
-    Buffer: [::UCHAR; 1],
-}}
-pub type PMSV1_0_NTLM3_RESPONSE = *mut MSV1_0_NTLM3_RESPONSE;
-ENUM!{enum MSV1_0_AVID {
-    MsvAvEOL,
-    MsvAvNbComputerName,
-    MsvAvNbDomainName,
-    MsvAvDnsComputerName,
-    MsvAvDnsDomainName,
-    MsvAvDnsTreeName,
-    MsvAvFlags,
-    MsvAvTimestamp,
-    MsvAvRestrictions,
-    MsvAvTargetName,
-    MsvAvChannelBindings,
-}}
-STRUCT!{struct MSV1_0_AV_PAIR {
-    AvId: ::USHORT,
-    AvLen: ::USHORT,
-}}
-pub type PMSV1_0_AV_PAIR = *mut MSV1_0_AV_PAIR;
-ENUM!{enum MSV1_0_PROTOCOL_MESSAGE_TYPE {
-    MsV1_0Lm20ChallengeRequest = 0,
-    MsV1_0Lm20GetChallengeResponse,
-    MsV1_0EnumerateUsers,
-    MsV1_0GetUserInfo,
-    MsV1_0ReLogonUsers,
-    MsV1_0ChangePassword,
-    MsV1_0ChangeCachedPassword,
-    MsV1_0GenericPassthrough,
-    MsV1_0CacheLogon,
-    MsV1_0SubAuth,
-    MsV1_0DeriveCredential,
-    MsV1_0CacheLookup,
-    MsV1_0SetProcessOption,
-    MsV1_0ConfigLocalAliases,
-    MsV1_0ClearCachedCredentials,
-    MsV1_0LookupToken,
-    MsV1_0ValidateAuth,
-    MsV1_0CacheLookupEx,
-    MsV1_0GetCredentialKey,
-    MsV1_0SetThreadOption,
-}}
-pub type PMSV1_0_PROTOCOL_MESSAGE_TYPE = *mut MSV1_0_PROTOCOL_MESSAGE_TYPE;
-STRUCT!{struct MSV1_0_CHANGEPASSWORD_REQUEST {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    DomainName: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    OldPassword: ::UNICODE_STRING,
-    NewPassword: ::UNICODE_STRING,
-    Impersonating: ::BOOLEAN,
-}}
-pub type PMSV1_0_CHANGEPASSWORD_REQUEST = *mut MSV1_0_CHANGEPASSWORD_REQUEST;
-STRUCT!{struct MSV1_0_CHANGEPASSWORD_RESPONSE {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    PasswordInfoValid: ::BOOLEAN,
-    DomainPasswordInfo: DOMAIN_PASSWORD_INFORMATION,
-}}
-pub type PMSV1_0_CHANGEPASSWORD_RESPONSE = *mut MSV1_0_CHANGEPASSWORD_RESPONSE;
-STRUCT!{struct MSV1_0_PASSTHROUGH_REQUEST {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    DomainName: ::UNICODE_STRING,
-    PackageName: ::UNICODE_STRING,
-    DataLength: ::ULONG,
-    LogonData: ::PUCHAR,
-    Pad: ::ULONG,
-}}
-pub type PMSV1_0_PASSTHROUGH_REQUEST = *mut MSV1_0_PASSTHROUGH_REQUEST;
-STRUCT!{struct MSV1_0_PASSTHROUGH_RESPONSE {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    Pad: ::ULONG,
-    DataLength: ::ULONG,
-    ValidationData: ::PUCHAR,
-}}
-pub type PMSV1_0_PASSTHROUGH_RESPONSE = *mut MSV1_0_PASSTHROUGH_RESPONSE;
-STRUCT!{struct MSV1_0_SUBAUTH_REQUEST {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    SubAuthPackageId: ::ULONG,
-    SubAuthInfoLength: ::ULONG,
-    SubAuthSubmitBuffer: ::PUCHAR,
-}}
-pub type PMSV1_0_SUBAUTH_REQUEST = *mut MSV1_0_SUBAUTH_REQUEST;
-STRUCT!{struct MSV1_0_SUBAUTH_RESPONSE {
-    MessageType: MSV1_0_PROTOCOL_MESSAGE_TYPE,
-    SubAuthInfoLength: ::ULONG,
-    SubAuthReturnBuffer: ::PUCHAR,
-}}
-pub type PMSV1_0_SUBAUTH_RESPONSE = *mut MSV1_0_SUBAUTH_RESPONSE;
-pub const RTL_ENCRYPT_MEMORY_SIZE: ::ULONG = 8;
-pub const RTL_ENCRYPT_OPTION_CROSS_PROCESS: ::ULONG = 0x01;
-pub const RTL_ENCRYPT_OPTION_SAME_LOGON: ::ULONG = 0x02;
-pub const KERB_ETYPE_NULL: ::LONG = 0;
-pub const KERB_ETYPE_DES_CBC_CRC: ::LONG = 1;
-pub const KERB_ETYPE_DES_CBC_MD4: ::LONG = 2;
-pub const KERB_ETYPE_DES_CBC_MD5: ::LONG = 3;
-pub const KERB_ETYPE_AES128_CTS_HMAC_SHA1_96: ::LONG = 17;
-pub const KERB_ETYPE_AES256_CTS_HMAC_SHA1_96: ::LONG = 18;
-pub const KERB_ETYPE_RC4_MD4: ::LONG = -128;
-pub const KERB_ETYPE_RC4_PLAIN2: ::LONG = -129;
-pub const KERB_ETYPE_RC4_LM: ::LONG = -130;
-pub const KERB_ETYPE_RC4_SHA: ::LONG = -131;
-pub const KERB_ETYPE_DES_PLAIN: ::LONG = -132;
-pub const KERB_ETYPE_RC4_HMAC_OLD: ::LONG = -133;
-pub const KERB_ETYPE_RC4_PLAIN_OLD: ::LONG = -134;
-pub const KERB_ETYPE_RC4_HMAC_OLD_EXP: ::LONG = -135;
-pub const KERB_ETYPE_RC4_PLAIN_OLD_EXP: ::LONG = -136;
-pub const KERB_ETYPE_RC4_PLAIN: ::LONG = -140;
-pub const KERB_ETYPE_RC4_PLAIN_EXP: ::LONG = -141;
-pub const KERB_ETYPE_AES128_CTS_HMAC_SHA1_96_PLAIN: ::LONG = -148;
-pub const KERB_ETYPE_AES256_CTS_HMAC_SHA1_96_PLAIN: ::LONG = -149;
-pub const KERB_ETYPE_DSA_SHA1_CMS: ::LONG = 9;
-pub const KERB_ETYPE_RSA_MD5_CMS: ::LONG = 10;
-pub const KERB_ETYPE_RSA_SHA1_CMS: ::LONG = 11;
-pub const KERB_ETYPE_RC2_CBC_ENV: ::LONG = 12;
-pub const KERB_ETYPE_RSA_ENV: ::LONG = 13;
-pub const KERB_ETYPE_RSA_ES_OEAP_ENV: ::LONG = 14;
-pub const KERB_ETYPE_DES_EDE3_CBC_ENV: ::LONG = 15;
-pub const KERB_ETYPE_DSA_SIGN: ::LONG = 8;
-pub const KERB_ETYPE_RSA_PRIV: ::LONG = 9;
-pub const KERB_ETYPE_RSA_PUB: ::LONG = 10;
-pub const KERB_ETYPE_RSA_PUB_MD5: ::LONG = 11;
-pub const KERB_ETYPE_RSA_PUB_SHA1: ::LONG = 12;
-pub const KERB_ETYPE_PKCS7_PUB: ::LONG = 13;
-pub const KERB_ETYPE_DES3_CBC_MD5: ::LONG = 5;
-pub const KERB_ETYPE_DES3_CBC_SHA1: ::LONG = 7;
-pub const KERB_ETYPE_DES3_CBC_SHA1_KD: ::LONG = 16;
-pub const KERB_ETYPE_DES_CBC_MD5_NT: ::LONG = 20;
-pub const KERB_ETYPE_RC4_HMAC_NT: ::LONG = 23;
-pub const KERB_ETYPE_RC4_HMAC_NT_EXP: ::LONG = 24;
-pub const KERB_CHECKSUM_NONE: ::LONG = 0;
-pub const KERB_CHECKSUM_CRC32: ::LONG = 1;
-pub const KERB_CHECKSUM_MD4: ::LONG = 2;
-pub const KERB_CHECKSUM_KRB_DES_MAC: ::LONG = 4;
-pub const KERB_CHECKSUM_KRB_DES_MAC_K: ::LONG = 5;
-pub const KERB_CHECKSUM_MD5: ::LONG = 7;
-pub const KERB_CHECKSUM_MD5_DES: ::LONG = 8;
-pub const KERB_CHECKSUM_SHA1_NEW: ::LONG = 14;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES128: ::LONG = 15;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES256: ::LONG = 16;
-pub const KERB_CHECKSUM_LM: ::LONG = -130;
-pub const KERB_CHECKSUM_SHA1: ::LONG = -131;
-pub const KERB_CHECKSUM_REAL_CRC32: ::LONG = -132;
-pub const KERB_CHECKSUM_DES_MAC: ::LONG = -133;
-pub const KERB_CHECKSUM_DES_MAC_MD5: ::LONG = -134;
-pub const KERB_CHECKSUM_MD25: ::LONG = -135;
-pub const KERB_CHECKSUM_RC4_MD5: ::LONG = -136;
-pub const KERB_CHECKSUM_MD5_HMAC: ::LONG = -137;
-pub const KERB_CHECKSUM_HMAC_MD5: ::LONG = -138;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES128_Ki: ::LONG = -150;
-pub const KERB_CHECKSUM_HMAC_SHA1_96_AES256_Ki: ::LONG = -151;
-pub const KERB_TICKET_FLAGS_reserved: ::ULONG = 0x80000000;
-pub const KERB_TICKET_FLAGS_forwardable: ::ULONG = 0x40000000;
-pub const KERB_TICKET_FLAGS_forwarded: ::ULONG = 0x20000000;
-pub const KERB_TICKET_FLAGS_proxiable: ::ULONG = 0x10000000;
-pub const KERB_TICKET_FLAGS_proxy: ::ULONG = 0x08000000;
-pub const KERB_TICKET_FLAGS_may_postdate: ::ULONG = 0x04000000;
-pub const KERB_TICKET_FLAGS_postdated: ::ULONG = 0x02000000;
-pub const KERB_TICKET_FLAGS_invalid: ::ULONG = 0x01000000;
-pub const KERB_TICKET_FLAGS_renewable: ::ULONG = 0x00800000;
-pub const KERB_TICKET_FLAGS_initial: ::ULONG = 0x00400000;
-pub const KERB_TICKET_FLAGS_pre_authent: ::ULONG = 0x00200000;
-pub const KERB_TICKET_FLAGS_hw_authent: ::ULONG = 0x00100000;
-pub const KERB_TICKET_FLAGS_ok_as_delegate: ::ULONG = 0x00040000;
-pub const KERB_TICKET_FLAGS_name_canonicalize: ::ULONG = 0x00010000;
-pub const KERB_TICKET_FLAGS_cname_in_pa_data: ::ULONG = 0x00040000;
-pub const KERB_TICKET_FLAGS_enc_pa_rep: ::ULONG = 0x00010000;
-pub const KERB_TICKET_FLAGS_reserved1: ::ULONG = 0x00000001;
-pub const KRB_NT_UNKNOWN: ::LONG = 0;
-pub const KRB_NT_PRINCIPAL: ::LONG = 1;
-pub const KRB_NT_PRINCIPAL_AND_ID: ::LONG = -131;
-pub const KRB_NT_SRV_INST: ::LONG = 2;
-pub const KRB_NT_SRV_INST_AND_ID: ::LONG = -132;
-pub const KRB_NT_SRV_HST: ::LONG = 3;
-pub const KRB_NT_SRV_XHST: ::LONG = 4;
-pub const KRB_NT_UID: ::LONG = 5;
-pub const KRB_NT_ENTERPRISE_PRINCIPAL: ::LONG = 10;
-pub const KRB_NT_WELLKNOWN: ::LONG = 11;
-pub const KRB_NT_ENT_PRINCIPAL_AND_ID: ::LONG = -130;
-pub const KRB_NT_MS_PRINCIPAL: ::LONG = -128;
-pub const KRB_NT_MS_PRINCIPAL_AND_ID: ::LONG = -129;
-pub const KRB_NT_MS_BRANCH_ID: ::LONG = -133;
-pub const KRB_NT_X500_PRINCIPAL: ::LONG = 6;
-pub const KERB_WRAP_NO_ENCRYPT: ::ULONG = 0x80000001;
-ENUM!{enum KERB_LOGON_SUBMIT_TYPE {
-    KerbInteractiveLogon = 2,
-    KerbSmartCardLogon = 6,
-    KerbWorkstationUnlockLogon = 7,
-    KerbSmartCardUnlockLogon = 8,
-    KerbProxyLogon = 9,
-    KerbTicketLogon = 10,
-    KerbTicketUnlockLogon = 11,
-    KerbS4ULogon = 12,
-    KerbCertificateLogon = 13,
-    KerbCertificateS4ULogon = 14,
-    KerbCertificateUnlockLogon = 15,
-    KerbNoElevationLogon = 83,
-    KerbLuidLogon = 84,
-}}
-pub type PKERB_LOGON_SUBMIT_TYPE = *mut KERB_LOGON_SUBMIT_TYPE;
-STRUCT!{struct KERB_INTERACTIVE_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    LogonDomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-}}
-pub type PKERB_INTERACTIVE_LOGON = *mut KERB_INTERACTIVE_LOGON;
-STRUCT!{struct KERB_INTERACTIVE_UNLOCK_LOGON {
-    Logon: KERB_INTERACTIVE_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_INTERACTIVE_UNLOCK_LOGON = *mut KERB_INTERACTIVE_UNLOCK_LOGON;
-STRUCT!{struct KERB_SMART_CARD_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Pin: ::UNICODE_STRING,
-    CspDataLength: ::ULONG,
-    CspData: ::PUCHAR,
-}}
-pub type PKERB_SMART_CARD_LOGON = *mut KERB_SMART_CARD_LOGON;
-STRUCT!{struct KERB_SMART_CARD_UNLOCK_LOGON {
-    Logon: KERB_SMART_CARD_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_SMART_CARD_UNLOCK_LOGON = *mut KERB_SMART_CARD_UNLOCK_LOGON;
-pub const KERB_CERTIFICATE_LOGON_FLAG_CHECK_DUPLICATES: ::ULONG = 0x1;
-pub const KERB_CERTIFICATE_LOGON_FLAG_USE_CERTIFICATE_INFO: ::ULONG = 0x2;
-STRUCT!{struct KERB_CERTIFICATE_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    DomainName: ::UNICODE_STRING,
-    UserName: ::UNICODE_STRING,
-    Pin: ::UNICODE_STRING,
-    Flags: ::ULONG,
-    CspDataLength: ::ULONG,
-    CspData: ::PUCHAR,
-}}
-pub type PKERB_CERTIFICATE_LOGON = *mut KERB_CERTIFICATE_LOGON;
-STRUCT!{struct KERB_CERTIFICATE_UNLOCK_LOGON {
-    Logon: KERB_CERTIFICATE_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_CERTIFICATE_UNLOCK_LOGON = *mut KERB_CERTIFICATE_UNLOCK_LOGON;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_CHECK_DUPLICATES: ::ULONG = 0x1;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_CHECK_LOGONHOURS: ::ULONG = 0x2;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_FAIL_IF_NT_AUTH_POLICY_REQUIRED: ::ULONG = 0x4;
-pub const KERB_CERTIFICATE_S4U_LOGON_FLAG_IDENTIFY: ::ULONG = 0x8;
-STRUCT!{struct KERB_CERTIFICATE_S4U_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    UserPrincipalName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    CertificateLength: ::ULONG,
-    Certificate: ::PUCHAR,
-}}
-pub type PKERB_CERTIFICATE_S4U_LOGON = *mut KERB_CERTIFICATE_S4U_LOGON;
-STRUCT!{struct KERB_TICKET_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    ServiceTicketLength: ::ULONG,
-    TicketGrantingTicketLength: ::ULONG,
-    ServiceTicket: ::PUCHAR,
-    TicketGrantingTicket: ::PUCHAR,
-}}
-pub type PKERB_TICKET_LOGON = *mut KERB_TICKET_LOGON;
-STRUCT!{struct KERB_TICKET_UNLOCK_LOGON {
-    Logon: KERB_TICKET_LOGON,
-    LogonId: ::LUID,
-}}
-pub type PKERB_TICKET_UNLOCK_LOGON = *mut KERB_TICKET_UNLOCK_LOGON;
-pub const KERB_S4U_LOGON_FLAG_CHECK_LOGONHOURS: ::ULONG = 0x2;
-pub const KERB_S4U_LOGON_FLAG_IDENTIFY: ::ULONG = 0x8;
-STRUCT!{struct KERB_S4U_LOGON {
-    MessageType: KERB_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    ClientUpn: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-}}
-pub type PKERB_S4U_LOGON = *mut KERB_S4U_LOGON;
-ENUM!{enum KERB_PROFILE_BUFFER_TYPE {
-    KerbInteractiveProfile = 2,
-    KerbSmartCardProfile = 4,
-    KerbTicketProfile = 6,
-}}
-pub type PKERB_PROFILE_BUFFER_TYPE = *mut KERB_PROFILE_BUFFER_TYPE;
-STRUCT!{struct KERB_INTERACTIVE_PROFILE {
-    MessageType: KERB_PROFILE_BUFFER_TYPE,
-    LogonCount: ::USHORT,
-    BadPasswordCount: ::USHORT,
-    LogonTime: ::LARGE_INTEGER,
-    LogoffTime: ::LARGE_INTEGER,
-    KickOffTime: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-    LogonScript: ::UNICODE_STRING,
-    HomeDirectory: ::UNICODE_STRING,
-    FullName: ::UNICODE_STRING,
-    ProfilePath: ::UNICODE_STRING,
-    HomeDirectoryDrive: ::UNICODE_STRING,
-    LogonServer: ::UNICODE_STRING,
-    UserFlags: ::ULONG,
-}}
-pub type PKERB_INTERACTIVE_PROFILE = *mut KERB_INTERACTIVE_PROFILE;
-STRUCT!{struct KERB_SMART_CARD_PROFILE {
-    Profile: KERB_INTERACTIVE_PROFILE,
-    CertificateSize: ::ULONG,
-    CertificateData: ::PUCHAR,
-}}
-pub type PKERB_SMART_CARD_PROFILE = *mut KERB_SMART_CARD_PROFILE;
-STRUCT!{struct KERB_CRYPTO_KEY {
-    KeyType: ::LONG,
-    Length: ::ULONG,
-    Value: ::PUCHAR,
-}}
-pub type PKERB_CRYPTO_KEY = *mut KERB_CRYPTO_KEY;
-STRUCT!{struct KERB_CRYPTO_KEY32 {
-    KeyType: ::LONG,
-    Length: ::ULONG,
-    Offset: ::ULONG,
-}}
-pub type PKERB_CRYPTO_KEY32 = *mut KERB_CRYPTO_KEY32;
-STRUCT!{struct KERB_TICKET_PROFILE {
-    Profile: KERB_INTERACTIVE_PROFILE,
-    SessionKey: KERB_CRYPTO_KEY,
-}}
-pub type PKERB_TICKET_PROFILE = *mut KERB_TICKET_PROFILE;
-ENUM!{enum KERB_PROTOCOL_MESSAGE_TYPE {
-    KerbDebugRequestMessage = 0,
-    KerbQueryTicketCacheMessage,
-    KerbChangeMachinePasswordMessage,
-    KerbVerifyPacMessage,
-    KerbRetrieveTicketMessage,
-    KerbUpdateAddressesMessage,
-    KerbPurgeTicketCacheMessage,
-    KerbChangePasswordMessage,
-    KerbRetrieveEncodedTicketMessage,
-    KerbDecryptDataMessage,
-    KerbAddBindingCacheEntryMessage,
-    KerbSetPasswordMessage,
-    KerbSetPasswordExMessage,
-    KerbVerifyCredentialsMessage,
-    KerbQueryTicketCacheExMessage,
-    KerbPurgeTicketCacheExMessage,
-    KerbRefreshSmartcardCredentialsMessage,
-    KerbAddExtraCredentialsMessage,
-    KerbQuerySupplementalCredentialsMessage,
-    KerbTransferCredentialsMessage,
-    KerbQueryTicketCacheEx2Message,
-    KerbSubmitTicketMessage,
-    KerbAddExtraCredentialsExMessage,
-    KerbQueryKdcProxyCacheMessage,
-    KerbPurgeKdcProxyCacheMessage,
-    KerbQueryTicketCacheEx3Message,
-    KerbCleanupMachinePkinitCredsMessage,
-    KerbAddBindingCacheEntryExMessage,
-    KerbQueryBindingCacheMessage,
-    KerbPurgeBindingCacheMessage,
-    KerbPinKdcMessage,
-    KerbUnpinAllKdcsMessage,
-    KerbQueryDomainExtendedPoliciesMessage,
-    KerbQueryS4U2ProxyCacheMessage,
-}}
-pub type PKERB_PROTOCOL_MESSAGE_TYPE = *mut KERB_PROTOCOL_MESSAGE_TYPE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-}}
-pub type PKERB_QUERY_TKT_CACHE_REQUEST = *mut KERB_QUERY_TKT_CACHE_REQUEST;
-STRUCT!{struct KERB_TICKET_CACHE_INFO {
-    ServerName: ::UNICODE_STRING,
-    RealmName: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-}}
-pub type PKERB_TICKET_CACHE_INFO = *mut KERB_TICKET_CACHE_INFO;
-STRUCT!{struct KERB_TICKET_CACHE_INFO_EX {
-    ClientName: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ServerName: ::UNICODE_STRING,
-    ServerRealm: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-}}
-pub type PKERB_TICKET_CACHE_INFO_EX = *mut KERB_TICKET_CACHE_INFO_EX;
-STRUCT!{struct KERB_TICKET_CACHE_INFO_EX2 {
-    ClientName: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ServerName: ::UNICODE_STRING,
-    ServerRealm: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-    SessionKeyType: ::ULONG,
-    BranchId: ::ULONG,
-}}
-pub type PKERB_TICKET_CACHE_INFO_EX2 = *mut KERB_TICKET_CACHE_INFO_EX2;
-STRUCT!{struct KERB_TICKET_CACHE_INFO_EX3 {
-    ClientName: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ServerName: ::UNICODE_STRING,
-    ServerRealm: ::UNICODE_STRING,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewTime: ::LARGE_INTEGER,
-    EncryptionType: ::LONG,
-    TicketFlags: ::ULONG,
-    SessionKeyType: ::ULONG,
-    BranchId: ::ULONG,
-    CacheFlags: ::ULONG,
-    KdcCalled: ::UNICODE_STRING,
-}}
-pub type PKERB_TICKET_CACHE_INFO_EX3 = *mut KERB_TICKET_CACHE_INFO_EX3;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_RESPONSE = *mut KERB_QUERY_TKT_CACHE_RESPONSE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_EX_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO_EX; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_EX_RESPONSE = *mut KERB_QUERY_TKT_CACHE_EX_RESPONSE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_EX2_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO_EX2; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_EX2_RESPONSE = *mut KERB_QUERY_TKT_CACHE_EX2_RESPONSE;
-STRUCT!{struct KERB_QUERY_TKT_CACHE_EX3_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfTickets: ::ULONG,
-    Tickets: [KERB_TICKET_CACHE_INFO_EX3; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_QUERY_TKT_CACHE_EX3_RESPONSE = *mut KERB_QUERY_TKT_CACHE_EX3_RESPONSE;
-pub const KERB_USE_DEFAULT_TICKET_FLAGS: ::ULONG = 0x0;
-pub const KERB_RETRIEVE_TICKET_DEFAULT: ::ULONG = 0x0;
-pub const KERB_RETRIEVE_TICKET_DONT_USE_CACHE: ::ULONG = 0x1;
-pub const KERB_RETRIEVE_TICKET_USE_CACHE_ONLY: ::ULONG = 0x2;
-pub const KERB_RETRIEVE_TICKET_USE_CREDHANDLE: ::ULONG = 0x4;
-pub const KERB_RETRIEVE_TICKET_AS_KERB_CRED: ::ULONG = 0x8;
-pub const KERB_RETRIEVE_TICKET_WITH_SEC_CRED: ::ULONG = 0x10;
-pub const KERB_RETRIEVE_TICKET_CACHE_TICKET: ::ULONG = 0x20;
-pub const KERB_RETRIEVE_TICKET_MAX_LIFETIME: ::ULONG = 0x40;
-STRUCT!{struct KERB_AUTH_DATA {
-    Type: ::ULONG,
-    Length: ::ULONG,
-    Data: ::PUCHAR,
-}}
-pub type PKERB_AUTH_DATA = *mut KERB_AUTH_DATA;
-STRUCT!{struct KERB_NET_ADDRESS {
-    Family: ::ULONG,
-    Length: ::ULONG,
-    Address: ::PUCHAR,
-}}
-pub type PKERB_NET_ADDRESS = *mut KERB_NET_ADDRESS;
-STRUCT!{struct KERB_NET_ADDRESSES {
-    Number: ::ULONG,
-    Addresses: [KERB_NET_ADDRESS; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_NET_ADDRESSES = *mut KERB_NET_ADDRESSES;
-STRUCT!{struct KERB_EXTERNAL_NAME {
-    NameType: ::SHORT,
-    NameCount: ::USHORT,
-    Names: [::UNICODE_STRING; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_EXTERNAL_NAME = *mut KERB_EXTERNAL_NAME;
-STRUCT!{struct KERB_EXTERNAL_TICKET {
-    ServiceName: PKERB_EXTERNAL_NAME,
-    TargetName: PKERB_EXTERNAL_NAME,
-    ClientName: PKERB_EXTERNAL_NAME,
-    DomainName: ::UNICODE_STRING,
-    TargetDomainName: ::UNICODE_STRING,
-    AltTargetDomainName: ::UNICODE_STRING,
-    SessionKey: KERB_CRYPTO_KEY,
-    TicketFlags: ::ULONG,
-    Flags: ::ULONG,
-    KeyExpirationTime: ::LARGE_INTEGER,
-    StartTime: ::LARGE_INTEGER,
-    EndTime: ::LARGE_INTEGER,
-    RenewUntil: ::LARGE_INTEGER,
-    TimeSkew: ::LARGE_INTEGER,
-    EncodedTicketSize: ::ULONG,
-    EncodedTicket: ::PUCHAR,
-}}
-pub type PKERB_EXTERNAL_TICKET = *mut KERB_EXTERNAL_TICKET;
-STRUCT!{struct KERB_RETRIEVE_TKT_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    TargetName: ::UNICODE_STRING,
-    TicketFlags: ::ULONG,
-    CacheOptions: ::ULONG,
-    EncryptionType: ::LONG,
-    CredentialsHandle: ::SecHandle,
-}}
-pub type PKERB_RETRIEVE_TKT_REQUEST = *mut KERB_RETRIEVE_TKT_REQUEST;
-STRUCT!{struct KERB_RETRIEVE_TKT_RESPONSE {
-    Ticket: KERB_EXTERNAL_TICKET,
-}}
-pub type PKERB_RETRIEVE_TKT_RESPONSE = *mut KERB_RETRIEVE_TKT_RESPONSE;
-STRUCT!{struct KERB_PURGE_TKT_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    ServerName: ::UNICODE_STRING,
-    RealmName: ::UNICODE_STRING,
-}}
-pub type PKERB_PURGE_TKT_CACHE_REQUEST = *mut KERB_PURGE_TKT_CACHE_REQUEST;
-pub const KERB_PURGE_ALL_TICKETS: ::ULONG = 1;
-STRUCT!{struct KERB_PURGE_TKT_CACHE_EX_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-    TicketTemplate: KERB_TICKET_CACHE_INFO_EX,
-}}
-pub type PKERB_PURGE_TKT_CACHE_EX_REQUEST = *mut KERB_PURGE_TKT_CACHE_EX_REQUEST;
-STRUCT!{struct KERB_SUBMIT_TKT_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-    Key: KERB_CRYPTO_KEY32,
-    KerbCredSize: ::ULONG,
-    KerbCredOffset: ::ULONG,
-}}
-pub type PKERB_SUBMIT_TKT_REQUEST = *mut KERB_SUBMIT_TKT_REQUEST;
-STRUCT!{struct KERB_QUERY_KDC_PROXY_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PKERB_QUERY_KDC_PROXY_CACHE_REQUEST = *mut KERB_QUERY_KDC_PROXY_CACHE_REQUEST;
-STRUCT!{struct KDC_PROXY_CACHE_ENTRY_DATA {
-    SinceLastUsed: ::ULONG64,
-    DomainName: ::UNICODE_STRING,
-    ProxyServerName: ::UNICODE_STRING,
-    ProxyServerVdir: ::UNICODE_STRING,
-    ProxyServerPort: ::USHORT,
-    LogonId: ::LUID,
-    CredUserName: ::UNICODE_STRING,
-    CredDomainName: ::UNICODE_STRING,
-    GlobalCache: ::BOOLEAN,
-}}
-pub type PKDC_PROXY_CACHE_ENTRY_DATA = *mut KDC_PROXY_CACHE_ENTRY_DATA;
-STRUCT!{struct KERB_QUERY_KDC_PROXY_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfEntries: ::ULONG,
-    Entries: PKDC_PROXY_CACHE_ENTRY_DATA,
-}}
-pub type PKERB_QUERY_KDC_PROXY_CACHE_RESPONSE = *mut KERB_QUERY_KDC_PROXY_CACHE_RESPONSE;
-STRUCT!{struct KERB_PURGE_KDC_PROXY_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PKERB_PURGE_KDC_PROXY_CACHE_REQUEST = *mut KERB_PURGE_KDC_PROXY_CACHE_REQUEST;
-STRUCT!{struct KERB_PURGE_KDC_PROXY_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfPurged: ::ULONG,
-}}
-pub type PKERB_PURGE_KDC_PROXY_CACHE_RESPONSE = *mut KERB_PURGE_KDC_PROXY_CACHE_RESPONSE;
-pub const KERB_S4U2PROXY_CACHE_ENTRY_INFO_FLAG_NEGATIVE: ::ULONG = 0x1;
-STRUCT!{struct KERB_S4U2PROXY_CACHE_ENTRY_INFO {
-    ServerName: ::UNICODE_STRING,
-    Flags: ::ULONG,
-    LastStatus: ::NTSTATUS,
-    Expiry: ::LARGE_INTEGER,
-}}
-pub type PKERB_S4U2PROXY_CACHE_ENTRY_INFO = *mut KERB_S4U2PROXY_CACHE_ENTRY_INFO;
-pub const KERB_S4U2PROXY_CRED_FLAG_NEGATIVE: ::ULONG = 0x1;
-STRUCT!{struct KERB_S4U2PROXY_CRED {
-    UserName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    Flags: ::ULONG,
-    LastStatus: ::NTSTATUS,
-    Expiry: ::LARGE_INTEGER,
-    CountOfEntries: ::ULONG,
-    Entries: PKERB_S4U2PROXY_CACHE_ENTRY_INFO,
-}}
-pub type PKERB_S4U2PROXY_CRED = *mut KERB_S4U2PROXY_CRED;
-STRUCT!{struct KERB_QUERY_S4U2PROXY_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    LogonId: ::LUID,
-}}
-pub type PKERB_QUERY_S4U2PROXY_CACHE_REQUEST = *mut KERB_QUERY_S4U2PROXY_CACHE_REQUEST;
-STRUCT!{struct KERB_QUERY_S4U2PROXY_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfCreds: ::ULONG,
-    Creds: PKERB_S4U2PROXY_CRED,
-}}
-pub type PKERB_QUERY_S4U2PROXY_CACHE_RESPONSE = *mut KERB_QUERY_S4U2PROXY_CACHE_RESPONSE;
-STRUCT!{struct KERB_CHANGEPASSWORD_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    DomainName: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    OldPassword: ::UNICODE_STRING,
-    NewPassword: ::UNICODE_STRING,
-    Impersonating: ::BOOLEAN,
-}}
-pub type PKERB_CHANGEPASSWORD_REQUEST = *mut KERB_CHANGEPASSWORD_REQUEST;
-STRUCT!{struct KERB_SETPASSWORD_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    CredentialsHandle: ::SecHandle,
-    Flags: ::ULONG,
-    DomainName: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-}}
-pub type PKERB_SETPASSWORD_REQUEST = *mut KERB_SETPASSWORD_REQUEST;
-STRUCT!{struct KERB_SETPASSWORD_EX_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    CredentialsHandle: ::SecHandle,
-    Flags: ::ULONG,
-    AccountRealm: ::UNICODE_STRING,
-    AccountName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-    ClientRealm: ::UNICODE_STRING,
-    ClientName: ::UNICODE_STRING,
-    Impersonating: ::BOOLEAN,
-    KdcAddress: ::UNICODE_STRING,
-    KdcAddressType: ::ULONG,
-}}
-pub type PKERB_SETPASSWORD_EX_REQUEST = *mut KERB_SETPASSWORD_EX_REQUEST;
-pub const DS_UNKNOWN_ADDRESS_TYPE: ::ULONG = 0;
-pub const KERB_SETPASS_USE_LOGONID: ::ULONG = 1;
-pub const KERB_SETPASS_USE_CREDHANDLE: ::ULONG = 2;
-STRUCT!{struct KERB_DECRYPT_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-    CryptoType: ::LONG,
-    KeyUsage: ::LONG,
-    Key: KERB_CRYPTO_KEY,
-    EncryptedDataSize: ::ULONG,
-    InitialVectorSize: ::ULONG,
-    InitialVector: ::PUCHAR,
-    EncryptedData: ::PUCHAR,
-}}
-pub type PKERB_DECRYPT_REQUEST = *mut KERB_DECRYPT_REQUEST;
-pub const KERB_DECRYPT_FLAG_DEFAULT_KEY: ::ULONG = 0x00000001;
-STRUCT!{struct KERB_DECRYPT_RESPONSE {
-    DecryptedData: [::UCHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_DECRYPT_RESPONSE = *mut KERB_DECRYPT_RESPONSE;
-STRUCT!{struct KERB_ADD_BINDING_CACHE_ENTRY_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    RealmName: ::UNICODE_STRING,
-    KdcAddress: ::UNICODE_STRING,
-    AddressType: ::ULONG,
-}}
-pub type PKERB_ADD_BINDING_CACHE_ENTRY_REQUEST = *mut KERB_ADD_BINDING_CACHE_ENTRY_REQUEST;
-STRUCT!{struct KERB_REFRESH_SCCRED_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CredentialBlob: ::UNICODE_STRING,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-}}
-pub type PKERB_REFRESH_SCCRED_REQUEST = *mut KERB_REFRESH_SCCRED_REQUEST;
-pub const KERB_REFRESH_SCCRED_RELEASE: ::ULONG = 0x0;
-pub const KERB_REFRESH_SCCRED_GETTGT: ::ULONG = 0x1;
-STRUCT!{struct KERB_ADD_CREDENTIALS_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    UserName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    Password: ::UNICODE_STRING,
-    LogonId: ::LUID,
-    Flags: ::ULONG,
-}}
-pub type PKERB_ADD_CREDENTIALS_REQUEST = *mut KERB_ADD_CREDENTIALS_REQUEST;
-pub const KERB_REQUEST_ADD_CREDENTIAL: ::ULONG = 1;
-pub const KERB_REQUEST_REPLACE_CREDENTIAL: ::ULONG = 2;
-pub const KERB_REQUEST_REMOVE_CREDENTIAL: ::ULONG = 4;
-STRUCT!{struct KERB_ADD_CREDENTIALS_REQUEST_EX {
-    Credentials: KERB_ADD_CREDENTIALS_REQUEST,
-    PrincipalNameCount: ::ULONG,
-    PrincipalNames: [::UNICODE_STRING; ::ANYSIZE_ARRAY],
-}}
-pub type PKERB_ADD_CREDENTIALS_REQUEST_EX = *mut KERB_ADD_CREDENTIALS_REQUEST_EX;
-STRUCT!{struct KERB_TRANSFER_CRED_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    OriginLogonId: ::LUID,
-    DestinationLogonId: ::LUID,
-    Flags: ::ULONG,
-}}
-pub type PKERB_TRANSFER_CRED_REQUEST = *mut KERB_TRANSFER_CRED_REQUEST;
-pub const KERB_TRANSFER_CRED_WITH_TICKETS: ::ULONG = 0x1;
-pub const KERB_TRANSFER_CRED_CLEANUP_CREDENTIALS: ::ULONG = 0x2;
-STRUCT!{struct KERB_CLEANUP_MACHINE_PKINIT_CREDS_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    LogonId: ::LUID,
-}}
-pub type PKERB_CLEANUP_MACHINE_PKINIT_CREDS_REQUEST =
-    *mut KERB_CLEANUP_MACHINE_PKINIT_CREDS_REQUEST;
-STRUCT!{struct KERB_BINDING_CACHE_ENTRY_DATA {
-    DiscoveryTime: ::ULONG64,
-    RealmName: ::UNICODE_STRING,
-    KdcAddress: ::UNICODE_STRING,
-    AddressType: ::ULONG,
-    Flags: ::ULONG,
-    DcFlags: ::ULONG,
-    CacheFlags: ::ULONG,
-    KdcName: ::UNICODE_STRING,
-}}
-pub type PKERB_BINDING_CACHE_ENTRY_DATA = *mut KERB_BINDING_CACHE_ENTRY_DATA;
-STRUCT!{struct KERB_QUERY_BINDING_CACHE_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    CountOfEntries: ::ULONG,
-    Entries: PKERB_BINDING_CACHE_ENTRY_DATA,
-}}
-pub type PKERB_QUERY_BINDING_CACHE_RESPONSE = *mut KERB_QUERY_BINDING_CACHE_RESPONSE;
-STRUCT!{struct KERB_ADD_BINDING_CACHE_ENTRY_EX_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    RealmName: ::UNICODE_STRING,
-    KdcAddress: ::UNICODE_STRING,
-    AddressType: ::ULONG,
-    DcFlags: ::ULONG,
-}}
-pub type PKERB_ADD_BINDING_CACHE_ENTRY_EX_REQUEST = *mut KERB_ADD_BINDING_CACHE_ENTRY_EX_REQUEST;
-STRUCT!{struct KERB_QUERY_BINDING_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-}}
-pub type PKERB_QUERY_BINDING_CACHE_REQUEST = *mut KERB_QUERY_BINDING_CACHE_REQUEST;
-STRUCT!{struct KERB_PURGE_BINDING_CACHE_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-}}
-pub type PKERB_PURGE_BINDING_CACHE_REQUEST = *mut KERB_PURGE_BINDING_CACHE_REQUEST;
-STRUCT!{struct KERB_QUERY_DOMAIN_EXTENDED_POLICIES_REQUEST {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    DomainName: ::UNICODE_STRING,
-}}
-pub type PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_REQUEST =
-    *mut KERB_QUERY_DOMAIN_EXTENDED_POLICIES_REQUEST;
-STRUCT!{struct KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE {
-    MessageType: KERB_PROTOCOL_MESSAGE_TYPE,
-    Flags: ::ULONG,
-    ExtendedPolicies: ::ULONG,
-    DsFlags: ::ULONG,
-}}
-pub type PKERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE =
-    *mut KERB_QUERY_DOMAIN_EXTENDED_POLICIES_RESPONSE;
-ENUM!{enum KERB_CERTIFICATE_INFO_TYPE {
-    CertHashInfo = 1,
-}}
-pub type PKERB_CERTIFICATE_INFO_TYPE = *mut KERB_CERTIFICATE_INFO_TYPE;
-STRUCT!{struct KERB_CERTIFICATE_HASHINFO {
-    StoreNameLength: ::USHORT,
-    HashLength: ::USHORT,
-}}
-pub type PKERB_CERTIFICATE_HASHINFO = *mut KERB_CERTIFICATE_HASHINFO;
-STRUCT!{struct KERB_CERTIFICATE_INFO {
-    CertInfoSize: ::ULONG,
-    InfoType: ::ULONG,
-}}
-pub type PKERB_CERTIFICATE_INFO = *mut KERB_CERTIFICATE_INFO;
-STRUCT!{struct POLICY_AUDIT_SID_ARRAY {
-    UsersCount: ::ULONG,
-    UserSidArray: *mut ::PSID,
-}}
-pub type PPOLICY_AUDIT_SID_ARRAY = *mut POLICY_AUDIT_SID_ARRAY;
-STRUCT!{struct AUDIT_POLICY_INFORMATION {
-    AuditSubCategoryGuid: ::GUID,
-    AuditingInformation: ::ULONG,
-    AuditCategoryGuid: ::GUID,
-}}
-pub type PAUDIT_POLICY_INFORMATION = *mut AUDIT_POLICY_INFORMATION;
-pub type LPAUDIT_POLICY_INFORMATION = PAUDIT_POLICY_INFORMATION;
-pub type PCAUDIT_POLICY_INFORMATION = *const AUDIT_POLICY_INFORMATION;
-pub const AUDIT_SET_SYSTEM_POLICY: ::ULONG = 0x0001;
-pub const AUDIT_QUERY_SYSTEM_POLICY: ::ULONG = 0x0002;
-pub const AUDIT_SET_USER_POLICY: ::ULONG = 0x0004;
-pub const AUDIT_QUERY_USER_POLICY: ::ULONG = 0x0008;
-pub const AUDIT_ENUMERATE_USERS: ::ULONG = 0x0010;
-pub const AUDIT_SET_MISC_POLICY: ::ULONG = 0x0020;
-pub const AUDIT_QUERY_MISC_POLICY: ::ULONG = 0x0040;
-pub const AUDIT_GENERIC_ALL: ::ULONG = ::STANDARD_RIGHTS_REQUIRED | AUDIT_SET_SYSTEM_POLICY
-    | AUDIT_QUERY_SYSTEM_POLICY | AUDIT_SET_USER_POLICY | AUDIT_QUERY_USER_POLICY
-    | AUDIT_ENUMERATE_USERS | AUDIT_SET_MISC_POLICY | AUDIT_QUERY_MISC_POLICY;
-pub const AUDIT_GENERIC_READ: ::ULONG = ::STANDARD_RIGHTS_READ | AUDIT_QUERY_SYSTEM_POLICY
-    | AUDIT_QUERY_USER_POLICY | AUDIT_ENUMERATE_USERS | AUDIT_QUERY_MISC_POLICY;
-pub const AUDIT_GENERIC_WRITE: ::ULONG = ::STANDARD_RIGHTS_WRITE | AUDIT_SET_USER_POLICY
-    | AUDIT_SET_MISC_POLICY | AUDIT_SET_SYSTEM_POLICY;
-pub const AUDIT_GENERIC_EXECUTE: ::ULONG = ::STANDARD_RIGHTS_EXECUTE;
-STRUCT!{struct PKU2U_CERT_BLOB {
-    CertOffset: ::ULONG,
-    CertLength: ::USHORT,
-}}
-pub type PPKU2U_CERT_BLOB = *mut PKU2U_CERT_BLOB;
-pub const PKU2U_CREDUI_CONTEXT_VERSION: ::ULONG64 = 0x4154414454524543;
-STRUCT!{struct PKU2U_CREDUI_CONTEXT {
-    Version: ::ULONG64,
-    cbHeaderLength: ::USHORT,
-    cbStructureLength: ::ULONG,
-    CertArrayCount: ::USHORT,
-    CertArrayOffset: ::ULONG,
-}}
-pub type PPKU2U_CREDUI_CONTEXT = *mut PKU2U_CREDUI_CONTEXT;
-ENUM!{enum PKU2U_LOGON_SUBMIT_TYPE {
-    Pku2uCertificateS4ULogon = 14,
-}}
-pub type PPKU2U_LOGON_SUBMIT_TYPE = *mut PKU2U_LOGON_SUBMIT_TYPE;
-STRUCT!{struct PKU2U_CERTIFICATE_S4U_LOGON {
-    MessageType: PKU2U_LOGON_SUBMIT_TYPE,
-    Flags: ::ULONG,
-    UserPrincipalName: ::UNICODE_STRING,
-    DomainName: ::UNICODE_STRING,
-    CertificateLength: ::ULONG,
-    Certificate: ::PUCHAR,
-}}
-pub type PPKU2U_CERTIFICATE_S4U_LOGON = *mut PKU2U_CERTIFICATE_S4U_LOGON;
diff --git a/vendor/winapi-0.2.8/src/ntstatus.rs b/vendor/winapi-0.2.8/src/ntstatus.rs
deleted file mode 100644
index 4662235585..0000000000
--- a/vendor/winapi-0.2.8/src/ntstatus.rs
+++ /dev/null
@@ -1,2474 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Constant definitions for the NTSTATUS values.
-pub const STATUS_WAIT_0: ::NTSTATUS = 0x00000000;
-pub const FACILITY_VSM: ::NTSTATUS = 0x45;
-pub const FACILITY_VOLSNAP: ::NTSTATUS = 0x50;
-pub const FACILITY_VOLMGR: ::NTSTATUS = 0x38;
-pub const FACILITY_VIRTUALIZATION: ::NTSTATUS = 0x37;
-pub const FACILITY_VIDEO: ::NTSTATUS = 0x1B;
-pub const FACILITY_USB_ERROR_CODE: ::NTSTATUS = 0x10;
-pub const FACILITY_TRANSACTION: ::NTSTATUS = 0x19;
-pub const FACILITY_TPM: ::NTSTATUS = 0x29;
-pub const FACILITY_TERMINAL_SERVER: ::NTSTATUS = 0xA;
-pub const FACILITY_SXS_ERROR_CODE: ::NTSTATUS = 0x15;
-pub const FACILITY_NTSSPI: ::NTSTATUS = 0x9;
-pub const FACILITY_SPACES: ::NTSTATUS = 0xE7;
-pub const FACILITY_SMB: ::NTSTATUS = 0x5D;
-pub const FACILITY_SYSTEM_INTEGRITY: ::NTSTATUS = 0xE9;
-pub const FACILITY_SHARED_VHDX: ::NTSTATUS = 0x5C;
-pub const FACILITY_SECUREBOOT: ::NTSTATUS = 0x43;
-pub const FACILITY_SECURITY_CORE: ::NTSTATUS = 0xE8;
-pub const FACILITY_SDBUS: ::NTSTATUS = 0x51;
-pub const FACILITY_RTPM: ::NTSTATUS = 0x2A;
-pub const FACILITY_RPC_STUBS: ::NTSTATUS = 0x3;
-pub const FACILITY_RPC_RUNTIME: ::NTSTATUS = 0x2;
-pub const FACILITY_RESUME_KEY_FILTER: ::NTSTATUS = 0x40;
-pub const FACILITY_RDBSS: ::NTSTATUS = 0x41;
-pub const FACILITY_NTWIN32: ::NTSTATUS = 0x7;
-pub const FACILITY_WIN32K_NTUSER: ::NTSTATUS = 0x3E;
-pub const FACILITY_WIN32K_NTGDI: ::NTSTATUS = 0x3F;
-pub const FACILITY_NDIS_ERROR_CODE: ::NTSTATUS = 0x23;
-pub const FACILTIY_MUI_ERROR_CODE: ::NTSTATUS = 0xB;
-pub const FACILITY_MONITOR: ::NTSTATUS = 0x1D;
-pub const FACILITY_MAXIMUM_VALUE: ::NTSTATUS = 0xEB;
-pub const FACILITY_LICENSING: ::NTSTATUS = 0xEA;
-pub const FACILITY_IPSEC: ::NTSTATUS = 0x36;
-pub const FACILITY_IO_ERROR_CODE: ::NTSTATUS = 0x4;
-pub const FACILITY_INTERIX: ::NTSTATUS = 0x99;
-pub const FACILITY_HYPERVISOR: ::NTSTATUS = 0x35;
-pub const FACILITY_HID_ERROR_CODE: ::NTSTATUS = 0x11;
-pub const FACILITY_GRAPHICS_KERNEL: ::NTSTATUS = 0x1E;
-pub const FACILITY_FWP_ERROR_CODE: ::NTSTATUS = 0x22;
-pub const FACILITY_FVE_ERROR_CODE: ::NTSTATUS = 0x21;
-pub const FACILITY_FIREWIRE_ERROR_CODE: ::NTSTATUS = 0x12;
-pub const FACILITY_FILTER_MANAGER: ::NTSTATUS = 0x1C;
-pub const FACILITY_DRIVER_FRAMEWORK: ::NTSTATUS = 0x20;
-pub const FACILITY_DEBUGGER: ::NTSTATUS = 0x1;
-pub const FACILITY_COMMONLOG: ::NTSTATUS = 0x1A;
-pub const FACILITY_CODCLASS_ERROR_CODE: ::NTSTATUS = 0x6;
-pub const FACILITY_CLUSTER_ERROR_CODE: ::NTSTATUS = 0x13;
-pub const FACILITY_NTCERT: ::NTSTATUS = 0x8;
-pub const FACILITY_BTH_ATT: ::NTSTATUS = 0x42;
-pub const FACILITY_BCD_ERROR_CODE: ::NTSTATUS = 0x39;
-pub const FACILITY_AUDIO_KERNEL: ::NTSTATUS = 0x44;
-pub const FACILITY_ACPI_ERROR_CODE: ::NTSTATUS = 0x14;
-pub const STATUS_SEVERITY_WARNING: ::NTSTATUS = 0x2;
-pub const STATUS_SEVERITY_SUCCESS: ::NTSTATUS = 0x0;
-pub const STATUS_SEVERITY_INFORMATIONAL: ::NTSTATUS = 0x1;
-pub const STATUS_SEVERITY_ERROR: ::NTSTATUS = 0x3;
-pub const STATUS_SUCCESS: ::NTSTATUS = 0x00000000;
-pub const STATUS_WAIT_1: ::NTSTATUS = 0x00000001;
-pub const STATUS_WAIT_2: ::NTSTATUS = 0x00000002;
-pub const STATUS_WAIT_3: ::NTSTATUS = 0x00000003;
-pub const STATUS_WAIT_63: ::NTSTATUS = 0x0000003F;
-pub const STATUS_ABANDONED: ::NTSTATUS = 0x00000080;
-pub const STATUS_ABANDONED_WAIT_0: ::NTSTATUS = 0x00000080;
-pub const STATUS_ABANDONED_WAIT_63: ::NTSTATUS = 0x000000BF;
-pub const STATUS_USER_APC: ::NTSTATUS = 0x000000C0;
-pub const STATUS_KERNEL_APC: ::NTSTATUS = 0x00000100;
-pub const STATUS_ALERTED: ::NTSTATUS = 0x00000101;
-pub const STATUS_TIMEOUT: ::NTSTATUS = 0x00000102;
-pub const STATUS_PENDING: ::NTSTATUS = 0x00000103;
-pub const STATUS_REPARSE: ::NTSTATUS = 0x00000104;
-pub const STATUS_MORE_ENTRIES: ::NTSTATUS = 0x00000105;
-pub const STATUS_NOT_ALL_ASSIGNED: ::NTSTATUS = 0x00000106;
-pub const STATUS_SOME_NOT_MAPPED: ::NTSTATUS = 0x00000107;
-pub const STATUS_OPLOCK_BREAK_IN_PROGRESS: ::NTSTATUS = 0x00000108;
-pub const STATUS_VOLUME_MOUNTED: ::NTSTATUS = 0x00000109;
-pub const STATUS_RXACT_COMMITTED: ::NTSTATUS = 0x0000010A;
-pub const STATUS_NOTIFY_CLEANUP: ::NTSTATUS = 0x0000010B;
-pub const STATUS_NOTIFY_ENUM_DIR: ::NTSTATUS = 0x0000010C;
-pub const STATUS_NO_QUOTAS_FOR_ACCOUNT: ::NTSTATUS = 0x0000010D;
-pub const STATUS_PRIMARY_TRANSPORT_CONNECT_FAILED: ::NTSTATUS = 0x0000010E;
-pub const STATUS_PAGE_FAULT_TRANSITION: ::NTSTATUS = 0x00000110;
-pub const STATUS_PAGE_FAULT_DEMAND_ZERO: ::NTSTATUS = 0x00000111;
-pub const STATUS_PAGE_FAULT_COPY_ON_WRITE: ::NTSTATUS = 0x00000112;
-pub const STATUS_PAGE_FAULT_GUARD_PAGE: ::NTSTATUS = 0x00000113;
-pub const STATUS_PAGE_FAULT_PAGING_FILE: ::NTSTATUS = 0x00000114;
-pub const STATUS_CACHE_PAGE_LOCKED: ::NTSTATUS = 0x00000115;
-pub const STATUS_CRASH_DUMP: ::NTSTATUS = 0x00000116;
-pub const STATUS_BUFFER_ALL_ZEROS: ::NTSTATUS = 0x00000117;
-pub const STATUS_REPARSE_OBJECT: ::NTSTATUS = 0x00000118;
-pub const STATUS_RESOURCE_REQUIREMENTS_CHANGED: ::NTSTATUS = 0x00000119;
-pub const STATUS_TRANSLATION_COMPLETE: ::NTSTATUS = 0x00000120;
-pub const STATUS_DS_MEMBERSHIP_EVALUATED_LOCALLY: ::NTSTATUS = 0x00000121;
-pub const STATUS_NOTHING_TO_TERMINATE: ::NTSTATUS = 0x00000122;
-pub const STATUS_PROCESS_NOT_IN_JOB: ::NTSTATUS = 0x00000123;
-pub const STATUS_PROCESS_IN_JOB: ::NTSTATUS = 0x00000124;
-pub const STATUS_VOLSNAP_HIBERNATE_READY: ::NTSTATUS = 0x00000125;
-pub const STATUS_FSFILTER_OP_COMPLETED_SUCCESSFULLY: ::NTSTATUS = 0x00000126;
-pub const STATUS_INTERRUPT_VECTOR_ALREADY_CONNECTED: ::NTSTATUS = 0x00000127;
-pub const STATUS_INTERRUPT_STILL_CONNECTED: ::NTSTATUS = 0x00000128;
-pub const STATUS_PROCESS_CLONED: ::NTSTATUS = 0x00000129;
-pub const STATUS_FILE_LOCKED_WITH_ONLY_READERS: ::NTSTATUS = 0x0000012A;
-pub const STATUS_FILE_LOCKED_WITH_WRITERS: ::NTSTATUS = 0x0000012B;
-pub const STATUS_VALID_IMAGE_HASH: ::NTSTATUS = 0x0000012C;
-pub const STATUS_VALID_CATALOG_HASH: ::NTSTATUS = 0x0000012D;
-pub const STATUS_VALID_STRONG_CODE_HASH: ::NTSTATUS = 0x0000012E;
-pub const STATUS_RESOURCEMANAGER_READ_ONLY: ::NTSTATUS = 0x00000202;
-pub const STATUS_RING_PREVIOUSLY_EMPTY: ::NTSTATUS = 0x00000210;
-pub const STATUS_RING_PREVIOUSLY_FULL: ::NTSTATUS = 0x00000211;
-pub const STATUS_RING_PREVIOUSLY_ABOVE_QUOTA: ::NTSTATUS = 0x00000212;
-pub const STATUS_RING_NEWLY_EMPTY: ::NTSTATUS = 0x00000213;
-pub const STATUS_RING_SIGNAL_OPPOSITE_ENDPOINT: ::NTSTATUS = 0x00000214;
-pub const STATUS_OPLOCK_SWITCHED_TO_NEW_HANDLE: ::NTSTATUS = 0x00000215;
-pub const STATUS_OPLOCK_HANDLE_CLOSED: ::NTSTATUS = 0x00000216;
-pub const STATUS_WAIT_FOR_OPLOCK: ::NTSTATUS = 0x00000367;
-pub const DBG_EXCEPTION_HANDLED: ::NTSTATUS = 0x00010001;
-pub const DBG_CONTINUE: ::NTSTATUS = 0x00010002;
-pub const STATUS_FLT_IO_COMPLETE: ::NTSTATUS = 0x001C0001;
-pub const STATUS_OBJECT_NAME_EXISTS: ::NTSTATUS = 0x40000000;
-pub const STATUS_THREAD_WAS_SUSPENDED: ::NTSTATUS = 0x40000001;
-pub const STATUS_WORKING_SET_LIMIT_RANGE: ::NTSTATUS = 0x40000002;
-pub const STATUS_IMAGE_NOT_AT_BASE: ::NTSTATUS = 0x40000003;
-pub const STATUS_RXACT_STATE_CREATED: ::NTSTATUS = 0x40000004;
-pub const STATUS_SEGMENT_NOTIFICATION: ::NTSTATUS = 0x40000005;
-pub const STATUS_LOCAL_USER_SESSION_KEY: ::NTSTATUS = 0x40000006;
-pub const STATUS_BAD_CURRENT_DIRECTORY: ::NTSTATUS = 0x40000007;
-pub const STATUS_SERIAL_MORE_WRITES: ::NTSTATUS = 0x40000008;
-pub const STATUS_REGISTRY_RECOVERED: ::NTSTATUS = 0x40000009;
-pub const STATUS_FT_READ_RECOVERY_FROM_BACKUP: ::NTSTATUS = 0x4000000A;
-pub const STATUS_FT_WRITE_RECOVERY: ::NTSTATUS = 0x4000000B;
-pub const STATUS_SERIAL_COUNTER_TIMEOUT: ::NTSTATUS = 0x4000000C;
-pub const STATUS_NULL_LM_PASSWORD: ::NTSTATUS = 0x4000000D;
-pub const STATUS_IMAGE_MACHINE_TYPE_MISMATCH: ::NTSTATUS = 0x4000000E;
-pub const STATUS_RECEIVE_PARTIAL: ::NTSTATUS = 0x4000000F;
-pub const STATUS_RECEIVE_EXPEDITED: ::NTSTATUS = 0x40000010;
-pub const STATUS_RECEIVE_PARTIAL_EXPEDITED: ::NTSTATUS = 0x40000011;
-pub const STATUS_EVENT_DONE: ::NTSTATUS = 0x40000012;
-pub const STATUS_EVENT_PENDING: ::NTSTATUS = 0x40000013;
-pub const STATUS_CHECKING_FILE_SYSTEM: ::NTSTATUS = 0x40000014;
-pub const STATUS_FATAL_APP_EXIT: ::NTSTATUS = 0x40000015;
-pub const STATUS_PREDEFINED_HANDLE: ::NTSTATUS = 0x40000016;
-pub const STATUS_WAS_UNLOCKED: ::NTSTATUS = 0x40000017;
-pub const STATUS_SERVICE_NOTIFICATION: ::NTSTATUS = 0x40000018;
-pub const STATUS_WAS_LOCKED: ::NTSTATUS = 0x40000019;
-pub const STATUS_LOG_HARD_ERROR: ::NTSTATUS = 0x4000001A;
-pub const STATUS_ALREADY_WIN32: ::NTSTATUS = 0x4000001B;
-pub const STATUS_WX86_UNSIMULATE: ::NTSTATUS = 0x4000001C;
-pub const STATUS_WX86_CONTINUE: ::NTSTATUS = 0x4000001D;
-pub const STATUS_WX86_SINGLE_STEP: ::NTSTATUS = 0x4000001E;
-pub const STATUS_WX86_BREAKPOINT: ::NTSTATUS = 0x4000001F;
-pub const STATUS_WX86_EXCEPTION_CONTINUE: ::NTSTATUS = 0x40000020;
-pub const STATUS_WX86_EXCEPTION_LASTCHANCE: ::NTSTATUS = 0x40000021;
-pub const STATUS_WX86_EXCEPTION_CHAIN: ::NTSTATUS = 0x40000022;
-pub const STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE: ::NTSTATUS = 0x40000023;
-pub const STATUS_NO_YIELD_PERFORMED: ::NTSTATUS = 0x40000024;
-pub const STATUS_TIMER_RESUME_IGNORED: ::NTSTATUS = 0x40000025;
-pub const STATUS_ARBITRATION_UNHANDLED: ::NTSTATUS = 0x40000026;
-pub const STATUS_CARDBUS_NOT_SUPPORTED: ::NTSTATUS = 0x40000027;
-pub const STATUS_WX86_CREATEWX86TIB: ::NTSTATUS = 0x40000028;
-pub const STATUS_MP_PROCESSOR_MISMATCH: ::NTSTATUS = 0x40000029;
-pub const STATUS_HIBERNATED: ::NTSTATUS = 0x4000002A;
-pub const STATUS_RESUME_HIBERNATION: ::NTSTATUS = 0x4000002B;
-pub const STATUS_FIRMWARE_UPDATED: ::NTSTATUS = 0x4000002C;
-pub const STATUS_DRIVERS_LEAKING_LOCKED_PAGES: ::NTSTATUS = 0x4000002D;
-pub const STATUS_MESSAGE_RETRIEVED: ::NTSTATUS = 0x4000002E;
-pub const STATUS_SYSTEM_POWERSTATE_TRANSITION: ::NTSTATUS = 0x4000002F;
-pub const STATUS_ALPC_CHECK_COMPLETION_LIST: ::NTSTATUS = 0x40000030;
-pub const STATUS_SYSTEM_POWERSTATE_COMPLEX_TRANSITION: ::NTSTATUS = 0x40000031;
-pub const STATUS_ACCESS_AUDIT_BY_POLICY: ::NTSTATUS = 0x40000032;
-pub const STATUS_ABANDON_HIBERFILE: ::NTSTATUS = 0x40000033;
-pub const STATUS_BIZRULES_NOT_ENABLED: ::NTSTATUS = 0x40000034;
-pub const STATUS_FT_READ_FROM_COPY: ::NTSTATUS = 0x40000035;
-pub const STATUS_IMAGE_AT_DIFFERENT_BASE: ::NTSTATUS = 0x40000036;
-pub const DBG_REPLY_LATER: ::NTSTATUS = 0x40010001;
-pub const DBG_UNABLE_TO_PROVIDE_HANDLE: ::NTSTATUS = 0x40010002;
-pub const DBG_TERMINATE_THREAD: ::NTSTATUS = 0x40010003;
-pub const DBG_TERMINATE_PROCESS: ::NTSTATUS = 0x40010004;
-pub const DBG_CONTROL_C: ::NTSTATUS = 0x40010005;
-pub const DBG_PRINTEXCEPTION_C: ::NTSTATUS = 0x40010006;
-pub const DBG_RIPEXCEPTION: ::NTSTATUS = 0x40010007;
-pub const DBG_CONTROL_BREAK: ::NTSTATUS = 0x40010008;
-pub const DBG_COMMAND_EXCEPTION: ::NTSTATUS = 0x40010009;
-pub const DBG_PRINTEXCEPTION_WIDE_C: ::NTSTATUS = 0x4001000A;
-pub const STATUS_HEURISTIC_DAMAGE_POSSIBLE: ::NTSTATUS = 0x40190001;
-pub const STATUS_GUARD_PAGE_VIOLATION: ::NTSTATUS = 0x80000001u32 as i32;
-pub const STATUS_DATATYPE_MISALIGNMENT: ::NTSTATUS = 0x80000002u32 as i32;
-pub const STATUS_BREAKPOINT: ::NTSTATUS = 0x80000003u32 as i32;
-pub const STATUS_SINGLE_STEP: ::NTSTATUS = 0x80000004u32 as i32;
-pub const STATUS_BUFFER_OVERFLOW: ::NTSTATUS = 0x80000005u32 as i32;
-pub const STATUS_NO_MORE_FILES: ::NTSTATUS = 0x80000006u32 as i32;
-pub const STATUS_WAKE_SYSTEM_DEBUGGER: ::NTSTATUS = 0x80000007u32 as i32;
-pub const STATUS_HANDLES_CLOSED: ::NTSTATUS = 0x8000000Au32 as i32;
-pub const STATUS_NO_INHERITANCE: ::NTSTATUS = 0x8000000Bu32 as i32;
-pub const STATUS_GUID_SUBSTITUTION_MADE: ::NTSTATUS = 0x8000000Cu32 as i32;
-pub const STATUS_PARTIAL_COPY: ::NTSTATUS = 0x8000000Du32 as i32;
-pub const STATUS_DEVICE_PAPER_EMPTY: ::NTSTATUS = 0x8000000Eu32 as i32;
-pub const STATUS_DEVICE_POWERED_OFF: ::NTSTATUS = 0x8000000Fu32 as i32;
-pub const STATUS_DEVICE_OFF_LINE: ::NTSTATUS = 0x80000010u32 as i32;
-pub const STATUS_DEVICE_BUSY: ::NTSTATUS = 0x80000011u32 as i32;
-pub const STATUS_NO_MORE_EAS: ::NTSTATUS = 0x80000012u32 as i32;
-pub const STATUS_INVALID_EA_NAME: ::NTSTATUS = 0x80000013u32 as i32;
-pub const STATUS_EA_LIST_INCONSISTENT: ::NTSTATUS = 0x80000014u32 as i32;
-pub const STATUS_INVALID_EA_FLAG: ::NTSTATUS = 0x80000015u32 as i32;
-pub const STATUS_VERIFY_REQUIRED: ::NTSTATUS = 0x80000016u32 as i32;
-pub const STATUS_EXTRANEOUS_INFORMATION: ::NTSTATUS = 0x80000017u32 as i32;
-pub const STATUS_RXACT_COMMIT_NECESSARY: ::NTSTATUS = 0x80000018u32 as i32;
-pub const STATUS_NO_MORE_ENTRIES: ::NTSTATUS = 0x8000001Au32 as i32;
-pub const STATUS_FILEMARK_DETECTED: ::NTSTATUS = 0x8000001Bu32 as i32;
-pub const STATUS_MEDIA_CHANGED: ::NTSTATUS = 0x8000001Cu32 as i32;
-pub const STATUS_BUS_RESET: ::NTSTATUS = 0x8000001Du32 as i32;
-pub const STATUS_END_OF_MEDIA: ::NTSTATUS = 0x8000001Eu32 as i32;
-pub const STATUS_BEGINNING_OF_MEDIA: ::NTSTATUS = 0x8000001Fu32 as i32;
-pub const STATUS_MEDIA_CHECK: ::NTSTATUS = 0x80000020u32 as i32;
-pub const STATUS_SETMARK_DETECTED: ::NTSTATUS = 0x80000021u32 as i32;
-pub const STATUS_NO_DATA_DETECTED: ::NTSTATUS = 0x80000022u32 as i32;
-pub const STATUS_REDIRECTOR_HAS_OPEN_HANDLES: ::NTSTATUS = 0x80000023u32 as i32;
-pub const STATUS_SERVER_HAS_OPEN_HANDLES: ::NTSTATUS = 0x80000024u32 as i32;
-pub const STATUS_ALREADY_DISCONNECTED: ::NTSTATUS = 0x80000025u32 as i32;
-pub const STATUS_LONGJUMP: ::NTSTATUS = 0x80000026u32 as i32;
-pub const STATUS_CLEANER_CARTRIDGE_INSTALLED: ::NTSTATUS = 0x80000027u32 as i32;
-pub const STATUS_PLUGPLAY_QUERY_VETOED: ::NTSTATUS = 0x80000028u32 as i32;
-pub const STATUS_UNWIND_CONSOLIDATE: ::NTSTATUS = 0x80000029u32 as i32;
-pub const STATUS_REGISTRY_HIVE_RECOVERED: ::NTSTATUS = 0x8000002Au32 as i32;
-pub const STATUS_DLL_MIGHT_BE_INSECURE: ::NTSTATUS = 0x8000002Bu32 as i32;
-pub const STATUS_DLL_MIGHT_BE_INCOMPATIBLE: ::NTSTATUS = 0x8000002Cu32 as i32;
-pub const STATUS_STOPPED_ON_SYMLINK: ::NTSTATUS = 0x8000002Du32 as i32;
-pub const STATUS_CANNOT_GRANT_REQUESTED_OPLOCK: ::NTSTATUS = 0x8000002Eu32 as i32;
-pub const STATUS_NO_ACE_CONDITION: ::NTSTATUS = 0x8000002Fu32 as i32;
-pub const STATUS_DEVICE_SUPPORT_IN_PROGRESS: ::NTSTATUS = 0x80000030u32 as i32;
-pub const STATUS_DEVICE_POWER_CYCLE_REQUIRED: ::NTSTATUS = 0x80000031u32 as i32;
-pub const DBG_EXCEPTION_NOT_HANDLED: ::NTSTATUS = 0x80010001u32 as i32;
-pub const STATUS_CLUSTER_NODE_ALREADY_UP: ::NTSTATUS = 0x80130001u32 as i32;
-pub const STATUS_CLUSTER_NODE_ALREADY_DOWN: ::NTSTATUS = 0x80130002u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_ALREADY_ONLINE: ::NTSTATUS = 0x80130003u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_ALREADY_OFFLINE: ::NTSTATUS = 0x80130004u32 as i32;
-pub const STATUS_CLUSTER_NODE_ALREADY_MEMBER: ::NTSTATUS = 0x80130005u32 as i32;
-pub const STATUS_FLT_BUFFER_TOO_SMALL: ::NTSTATUS = 0x801C0001u32 as i32;
-pub const STATUS_FVE_PARTIAL_METADATA: ::NTSTATUS = 0x80210001u32 as i32;
-pub const STATUS_FVE_TRANSIENT_STATE: ::NTSTATUS = 0x80210002u32 as i32;
-pub const STATUS_UNSUCCESSFUL: ::NTSTATUS = 0xC0000001u32 as i32;
-pub const STATUS_NOT_IMPLEMENTED: ::NTSTATUS = 0xC0000002u32 as i32;
-pub const STATUS_INVALID_INFO_CLASS: ::NTSTATUS = 0xC0000003u32 as i32;
-pub const STATUS_INFO_LENGTH_MISMATCH: ::NTSTATUS = 0xC0000004u32 as i32;
-pub const STATUS_ACCESS_VIOLATION: ::NTSTATUS = 0xC0000005u32 as i32;
-pub const STATUS_IN_PAGE_ERROR: ::NTSTATUS = 0xC0000006u32 as i32;
-pub const STATUS_PAGEFILE_QUOTA: ::NTSTATUS = 0xC0000007u32 as i32;
-pub const STATUS_INVALID_HANDLE: ::NTSTATUS = 0xC0000008u32 as i32;
-pub const STATUS_BAD_INITIAL_STACK: ::NTSTATUS = 0xC0000009u32 as i32;
-pub const STATUS_BAD_INITIAL_PC: ::NTSTATUS = 0xC000000Au32 as i32;
-pub const STATUS_INVALID_CID: ::NTSTATUS = 0xC000000Bu32 as i32;
-pub const STATUS_TIMER_NOT_CANCELED: ::NTSTATUS = 0xC000000Cu32 as i32;
-pub const STATUS_INVALID_PARAMETER: ::NTSTATUS = 0xC000000Du32 as i32;
-pub const STATUS_NO_SUCH_DEVICE: ::NTSTATUS = 0xC000000Eu32 as i32;
-pub const STATUS_NO_SUCH_FILE: ::NTSTATUS = 0xC000000Fu32 as i32;
-pub const STATUS_INVALID_DEVICE_REQUEST: ::NTSTATUS = 0xC0000010u32 as i32;
-pub const STATUS_END_OF_FILE: ::NTSTATUS = 0xC0000011u32 as i32;
-pub const STATUS_WRONG_VOLUME: ::NTSTATUS = 0xC0000012u32 as i32;
-pub const STATUS_NO_MEDIA_IN_DEVICE: ::NTSTATUS = 0xC0000013u32 as i32;
-pub const STATUS_UNRECOGNIZED_MEDIA: ::NTSTATUS = 0xC0000014u32 as i32;
-pub const STATUS_NONEXISTENT_SECTOR: ::NTSTATUS = 0xC0000015u32 as i32;
-pub const STATUS_MORE_PROCESSING_REQUIRED: ::NTSTATUS = 0xC0000016u32 as i32;
-pub const STATUS_NO_MEMORY: ::NTSTATUS = 0xC0000017u32 as i32;
-pub const STATUS_CONFLICTING_ADDRESSES: ::NTSTATUS = 0xC0000018u32 as i32;
-pub const STATUS_NOT_MAPPED_VIEW: ::NTSTATUS = 0xC0000019u32 as i32;
-pub const STATUS_UNABLE_TO_FREE_VM: ::NTSTATUS = 0xC000001Au32 as i32;
-pub const STATUS_UNABLE_TO_DELETE_SECTION: ::NTSTATUS = 0xC000001Bu32 as i32;
-pub const STATUS_INVALID_SYSTEM_SERVICE: ::NTSTATUS = 0xC000001Cu32 as i32;
-pub const STATUS_ILLEGAL_INSTRUCTION: ::NTSTATUS = 0xC000001Du32 as i32;
-pub const STATUS_INVALID_LOCK_SEQUENCE: ::NTSTATUS = 0xC000001Eu32 as i32;
-pub const STATUS_INVALID_VIEW_SIZE: ::NTSTATUS = 0xC000001Fu32 as i32;
-pub const STATUS_INVALID_FILE_FOR_SECTION: ::NTSTATUS = 0xC0000020u32 as i32;
-pub const STATUS_ALREADY_COMMITTED: ::NTSTATUS = 0xC0000021u32 as i32;
-pub const STATUS_ACCESS_DENIED: ::NTSTATUS = 0xC0000022u32 as i32;
-pub const STATUS_BUFFER_TOO_SMALL: ::NTSTATUS = 0xC0000023u32 as i32;
-pub const STATUS_OBJECT_TYPE_MISMATCH: ::NTSTATUS = 0xC0000024u32 as i32;
-pub const STATUS_NONCONTINUABLE_EXCEPTION: ::NTSTATUS = 0xC0000025u32 as i32;
-pub const STATUS_INVALID_DISPOSITION: ::NTSTATUS = 0xC0000026u32 as i32;
-pub const STATUS_UNWIND: ::NTSTATUS = 0xC0000027u32 as i32;
-pub const STATUS_BAD_STACK: ::NTSTATUS = 0xC0000028u32 as i32;
-pub const STATUS_INVALID_UNWIND_TARGET: ::NTSTATUS = 0xC0000029u32 as i32;
-pub const STATUS_NOT_LOCKED: ::NTSTATUS = 0xC000002Au32 as i32;
-pub const STATUS_PARITY_ERROR: ::NTSTATUS = 0xC000002Bu32 as i32;
-pub const STATUS_UNABLE_TO_DECOMMIT_VM: ::NTSTATUS = 0xC000002Cu32 as i32;
-pub const STATUS_NOT_COMMITTED: ::NTSTATUS = 0xC000002Du32 as i32;
-pub const STATUS_INVALID_PORT_ATTRIBUTES: ::NTSTATUS = 0xC000002Eu32 as i32;
-pub const STATUS_PORT_MESSAGE_TOO_LONG: ::NTSTATUS = 0xC000002Fu32 as i32;
-pub const STATUS_INVALID_PARAMETER_MIX: ::NTSTATUS = 0xC0000030u32 as i32;
-pub const STATUS_INVALID_QUOTA_LOWER: ::NTSTATUS = 0xC0000031u32 as i32;
-pub const STATUS_DISK_CORRUPT_ERROR: ::NTSTATUS = 0xC0000032u32 as i32;
-pub const STATUS_OBJECT_NAME_INVALID: ::NTSTATUS = 0xC0000033u32 as i32;
-pub const STATUS_OBJECT_NAME_NOT_FOUND: ::NTSTATUS = 0xC0000034u32 as i32;
-pub const STATUS_OBJECT_NAME_COLLISION: ::NTSTATUS = 0xC0000035u32 as i32;
-pub const STATUS_PORT_DO_NOT_DISTURB: ::NTSTATUS = 0xC0000036u32 as i32;
-pub const STATUS_PORT_DISCONNECTED: ::NTSTATUS = 0xC0000037u32 as i32;
-pub const STATUS_DEVICE_ALREADY_ATTACHED: ::NTSTATUS = 0xC0000038u32 as i32;
-pub const STATUS_OBJECT_PATH_INVALID: ::NTSTATUS = 0xC0000039u32 as i32;
-pub const STATUS_OBJECT_PATH_NOT_FOUND: ::NTSTATUS = 0xC000003Au32 as i32;
-pub const STATUS_OBJECT_PATH_SYNTAX_BAD: ::NTSTATUS = 0xC000003Bu32 as i32;
-pub const STATUS_DATA_OVERRUN: ::NTSTATUS = 0xC000003Cu32 as i32;
-pub const STATUS_DATA_LATE_ERROR: ::NTSTATUS = 0xC000003Du32 as i32;
-pub const STATUS_DATA_ERROR: ::NTSTATUS = 0xC000003Eu32 as i32;
-pub const STATUS_CRC_ERROR: ::NTSTATUS = 0xC000003Fu32 as i32;
-pub const STATUS_SECTION_TOO_BIG: ::NTSTATUS = 0xC0000040u32 as i32;
-pub const STATUS_PORT_CONNECTION_REFUSED: ::NTSTATUS = 0xC0000041u32 as i32;
-pub const STATUS_INVALID_PORT_HANDLE: ::NTSTATUS = 0xC0000042u32 as i32;
-pub const STATUS_SHARING_VIOLATION: ::NTSTATUS = 0xC0000043u32 as i32;
-pub const STATUS_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000044u32 as i32;
-pub const STATUS_INVALID_PAGE_PROTECTION: ::NTSTATUS = 0xC0000045u32 as i32;
-pub const STATUS_MUTANT_NOT_OWNED: ::NTSTATUS = 0xC0000046u32 as i32;
-pub const STATUS_SEMAPHORE_LIMIT_EXCEEDED: ::NTSTATUS = 0xC0000047u32 as i32;
-pub const STATUS_PORT_ALREADY_SET: ::NTSTATUS = 0xC0000048u32 as i32;
-pub const STATUS_SECTION_NOT_IMAGE: ::NTSTATUS = 0xC0000049u32 as i32;
-pub const STATUS_SUSPEND_COUNT_EXCEEDED: ::NTSTATUS = 0xC000004Au32 as i32;
-pub const STATUS_THREAD_IS_TERMINATING: ::NTSTATUS = 0xC000004Bu32 as i32;
-pub const STATUS_BAD_WORKING_SET_LIMIT: ::NTSTATUS = 0xC000004Cu32 as i32;
-pub const STATUS_INCOMPATIBLE_FILE_MAP: ::NTSTATUS = 0xC000004Du32 as i32;
-pub const STATUS_SECTION_PROTECTION: ::NTSTATUS = 0xC000004Eu32 as i32;
-pub const STATUS_EAS_NOT_SUPPORTED: ::NTSTATUS = 0xC000004Fu32 as i32;
-pub const STATUS_EA_TOO_LARGE: ::NTSTATUS = 0xC0000050u32 as i32;
-pub const STATUS_NONEXISTENT_EA_ENTRY: ::NTSTATUS = 0xC0000051u32 as i32;
-pub const STATUS_NO_EAS_ON_FILE: ::NTSTATUS = 0xC0000052u32 as i32;
-pub const STATUS_EA_CORRUPT_ERROR: ::NTSTATUS = 0xC0000053u32 as i32;
-pub const STATUS_FILE_LOCK_CONFLICT: ::NTSTATUS = 0xC0000054u32 as i32;
-pub const STATUS_LOCK_NOT_GRANTED: ::NTSTATUS = 0xC0000055u32 as i32;
-pub const STATUS_DELETE_PENDING: ::NTSTATUS = 0xC0000056u32 as i32;
-pub const STATUS_CTL_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC0000057u32 as i32;
-pub const STATUS_UNKNOWN_REVISION: ::NTSTATUS = 0xC0000058u32 as i32;
-pub const STATUS_REVISION_MISMATCH: ::NTSTATUS = 0xC0000059u32 as i32;
-pub const STATUS_INVALID_OWNER: ::NTSTATUS = 0xC000005Au32 as i32;
-pub const STATUS_INVALID_PRIMARY_GROUP: ::NTSTATUS = 0xC000005Bu32 as i32;
-pub const STATUS_NO_IMPERSONATION_TOKEN: ::NTSTATUS = 0xC000005Cu32 as i32;
-pub const STATUS_CANT_DISABLE_MANDATORY: ::NTSTATUS = 0xC000005Du32 as i32;
-pub const STATUS_NO_LOGON_SERVERS: ::NTSTATUS = 0xC000005Eu32 as i32;
-pub const STATUS_NO_SUCH_LOGON_SESSION: ::NTSTATUS = 0xC000005Fu32 as i32;
-pub const STATUS_NO_SUCH_PRIVILEGE: ::NTSTATUS = 0xC0000060u32 as i32;
-pub const STATUS_PRIVILEGE_NOT_HELD: ::NTSTATUS = 0xC0000061u32 as i32;
-pub const STATUS_INVALID_ACCOUNT_NAME: ::NTSTATUS = 0xC0000062u32 as i32;
-pub const STATUS_USER_EXISTS: ::NTSTATUS = 0xC0000063u32 as i32;
-pub const STATUS_NO_SUCH_USER: ::NTSTATUS = 0xC0000064u32 as i32;
-pub const STATUS_GROUP_EXISTS: ::NTSTATUS = 0xC0000065u32 as i32;
-pub const STATUS_NO_SUCH_GROUP: ::NTSTATUS = 0xC0000066u32 as i32;
-pub const STATUS_MEMBER_IN_GROUP: ::NTSTATUS = 0xC0000067u32 as i32;
-pub const STATUS_MEMBER_NOT_IN_GROUP: ::NTSTATUS = 0xC0000068u32 as i32;
-pub const STATUS_LAST_ADMIN: ::NTSTATUS = 0xC0000069u32 as i32;
-pub const STATUS_WRONG_PASSWORD: ::NTSTATUS = 0xC000006Au32 as i32;
-pub const STATUS_ILL_FORMED_PASSWORD: ::NTSTATUS = 0xC000006Bu32 as i32;
-pub const STATUS_PASSWORD_RESTRICTION: ::NTSTATUS = 0xC000006Cu32 as i32;
-pub const STATUS_LOGON_FAILURE: ::NTSTATUS = 0xC000006Du32 as i32;
-pub const STATUS_ACCOUNT_RESTRICTION: ::NTSTATUS = 0xC000006Eu32 as i32;
-pub const STATUS_INVALID_LOGON_HOURS: ::NTSTATUS = 0xC000006Fu32 as i32;
-pub const STATUS_INVALID_WORKSTATION: ::NTSTATUS = 0xC0000070u32 as i32;
-pub const STATUS_PASSWORD_EXPIRED: ::NTSTATUS = 0xC0000071u32 as i32;
-pub const STATUS_ACCOUNT_DISABLED: ::NTSTATUS = 0xC0000072u32 as i32;
-pub const STATUS_NONE_MAPPED: ::NTSTATUS = 0xC0000073u32 as i32;
-pub const STATUS_TOO_MANY_LUIDS_REQUESTED: ::NTSTATUS = 0xC0000074u32 as i32;
-pub const STATUS_LUIDS_EXHAUSTED: ::NTSTATUS = 0xC0000075u32 as i32;
-pub const STATUS_INVALID_SUB_AUTHORITY: ::NTSTATUS = 0xC0000076u32 as i32;
-pub const STATUS_INVALID_ACL: ::NTSTATUS = 0xC0000077u32 as i32;
-pub const STATUS_INVALID_SID: ::NTSTATUS = 0xC0000078u32 as i32;
-pub const STATUS_INVALID_SECURITY_DESCR: ::NTSTATUS = 0xC0000079u32 as i32;
-pub const STATUS_PROCEDURE_NOT_FOUND: ::NTSTATUS = 0xC000007Au32 as i32;
-pub const STATUS_INVALID_IMAGE_FORMAT: ::NTSTATUS = 0xC000007Bu32 as i32;
-pub const STATUS_NO_TOKEN: ::NTSTATUS = 0xC000007Cu32 as i32;
-pub const STATUS_BAD_INHERITANCE_ACL: ::NTSTATUS = 0xC000007Du32 as i32;
-pub const STATUS_RANGE_NOT_LOCKED: ::NTSTATUS = 0xC000007Eu32 as i32;
-pub const STATUS_DISK_FULL: ::NTSTATUS = 0xC000007Fu32 as i32;
-pub const STATUS_SERVER_DISABLED: ::NTSTATUS = 0xC0000080u32 as i32;
-pub const STATUS_SERVER_NOT_DISABLED: ::NTSTATUS = 0xC0000081u32 as i32;
-pub const STATUS_TOO_MANY_GUIDS_REQUESTED: ::NTSTATUS = 0xC0000082u32 as i32;
-pub const STATUS_GUIDS_EXHAUSTED: ::NTSTATUS = 0xC0000083u32 as i32;
-pub const STATUS_INVALID_ID_AUTHORITY: ::NTSTATUS = 0xC0000084u32 as i32;
-pub const STATUS_AGENTS_EXHAUSTED: ::NTSTATUS = 0xC0000085u32 as i32;
-pub const STATUS_INVALID_VOLUME_LABEL: ::NTSTATUS = 0xC0000086u32 as i32;
-pub const STATUS_SECTION_NOT_EXTENDED: ::NTSTATUS = 0xC0000087u32 as i32;
-pub const STATUS_NOT_MAPPED_DATA: ::NTSTATUS = 0xC0000088u32 as i32;
-pub const STATUS_RESOURCE_DATA_NOT_FOUND: ::NTSTATUS = 0xC0000089u32 as i32;
-pub const STATUS_RESOURCE_TYPE_NOT_FOUND: ::NTSTATUS = 0xC000008Au32 as i32;
-pub const STATUS_RESOURCE_NAME_NOT_FOUND: ::NTSTATUS = 0xC000008Bu32 as i32;
-pub const STATUS_ARRAY_BOUNDS_EXCEEDED: ::NTSTATUS = 0xC000008Cu32 as i32;
-pub const STATUS_FLOAT_DENORMAL_OPERAND: ::NTSTATUS = 0xC000008Du32 as i32;
-pub const STATUS_FLOAT_DIVIDE_BY_ZERO: ::NTSTATUS = 0xC000008Eu32 as i32;
-pub const STATUS_FLOAT_INEXACT_RESULT: ::NTSTATUS = 0xC000008Fu32 as i32;
-pub const STATUS_FLOAT_INVALID_OPERATION: ::NTSTATUS = 0xC0000090u32 as i32;
-pub const STATUS_FLOAT_OVERFLOW: ::NTSTATUS = 0xC0000091u32 as i32;
-pub const STATUS_FLOAT_STACK_CHECK: ::NTSTATUS = 0xC0000092u32 as i32;
-pub const STATUS_FLOAT_UNDERFLOW: ::NTSTATUS = 0xC0000093u32 as i32;
-pub const STATUS_INTEGER_DIVIDE_BY_ZERO: ::NTSTATUS = 0xC0000094u32 as i32;
-pub const STATUS_INTEGER_OVERFLOW: ::NTSTATUS = 0xC0000095u32 as i32;
-pub const STATUS_PRIVILEGED_INSTRUCTION: ::NTSTATUS = 0xC0000096u32 as i32;
-pub const STATUS_TOO_MANY_PAGING_FILES: ::NTSTATUS = 0xC0000097u32 as i32;
-pub const STATUS_FILE_INVALID: ::NTSTATUS = 0xC0000098u32 as i32;
-pub const STATUS_ALLOTTED_SPACE_EXCEEDED: ::NTSTATUS = 0xC0000099u32 as i32;
-pub const STATUS_INSUFFICIENT_RESOURCES: ::NTSTATUS = 0xC000009Au32 as i32;
-pub const STATUS_DFS_EXIT_PATH_FOUND: ::NTSTATUS = 0xC000009Bu32 as i32;
-pub const STATUS_DEVICE_DATA_ERROR: ::NTSTATUS = 0xC000009Cu32 as i32;
-pub const STATUS_DEVICE_NOT_CONNECTED: ::NTSTATUS = 0xC000009Du32 as i32;
-pub const STATUS_DEVICE_POWER_FAILURE: ::NTSTATUS = 0xC000009Eu32 as i32;
-pub const STATUS_FREE_VM_NOT_AT_BASE: ::NTSTATUS = 0xC000009Fu32 as i32;
-pub const STATUS_MEMORY_NOT_ALLOCATED: ::NTSTATUS = 0xC00000A0u32 as i32;
-pub const STATUS_WORKING_SET_QUOTA: ::NTSTATUS = 0xC00000A1u32 as i32;
-pub const STATUS_MEDIA_WRITE_PROTECTED: ::NTSTATUS = 0xC00000A2u32 as i32;
-pub const STATUS_DEVICE_NOT_READY: ::NTSTATUS = 0xC00000A3u32 as i32;
-pub const STATUS_INVALID_GROUP_ATTRIBUTES: ::NTSTATUS = 0xC00000A4u32 as i32;
-pub const STATUS_BAD_IMPERSONATION_LEVEL: ::NTSTATUS = 0xC00000A5u32 as i32;
-pub const STATUS_CANT_OPEN_ANONYMOUS: ::NTSTATUS = 0xC00000A6u32 as i32;
-pub const STATUS_BAD_VALIDATION_CLASS: ::NTSTATUS = 0xC00000A7u32 as i32;
-pub const STATUS_BAD_TOKEN_TYPE: ::NTSTATUS = 0xC00000A8u32 as i32;
-pub const STATUS_BAD_MASTER_BOOT_RECORD: ::NTSTATUS = 0xC00000A9u32 as i32;
-pub const STATUS_INSTRUCTION_MISALIGNMENT: ::NTSTATUS = 0xC00000AAu32 as i32;
-pub const STATUS_INSTANCE_NOT_AVAILABLE: ::NTSTATUS = 0xC00000ABu32 as i32;
-pub const STATUS_PIPE_NOT_AVAILABLE: ::NTSTATUS = 0xC00000ACu32 as i32;
-pub const STATUS_INVALID_PIPE_STATE: ::NTSTATUS = 0xC00000ADu32 as i32;
-pub const STATUS_PIPE_BUSY: ::NTSTATUS = 0xC00000AEu32 as i32;
-pub const STATUS_ILLEGAL_FUNCTION: ::NTSTATUS = 0xC00000AFu32 as i32;
-pub const STATUS_PIPE_DISCONNECTED: ::NTSTATUS = 0xC00000B0u32 as i32;
-pub const STATUS_PIPE_CLOSING: ::NTSTATUS = 0xC00000B1u32 as i32;
-pub const STATUS_PIPE_CONNECTED: ::NTSTATUS = 0xC00000B2u32 as i32;
-pub const STATUS_PIPE_LISTENING: ::NTSTATUS = 0xC00000B3u32 as i32;
-pub const STATUS_INVALID_READ_MODE: ::NTSTATUS = 0xC00000B4u32 as i32;
-pub const STATUS_IO_TIMEOUT: ::NTSTATUS = 0xC00000B5u32 as i32;
-pub const STATUS_FILE_FORCED_CLOSED: ::NTSTATUS = 0xC00000B6u32 as i32;
-pub const STATUS_PROFILING_NOT_STARTED: ::NTSTATUS = 0xC00000B7u32 as i32;
-pub const STATUS_PROFILING_NOT_STOPPED: ::NTSTATUS = 0xC00000B8u32 as i32;
-pub const STATUS_COULD_NOT_INTERPRET: ::NTSTATUS = 0xC00000B9u32 as i32;
-pub const STATUS_FILE_IS_A_DIRECTORY: ::NTSTATUS = 0xC00000BAu32 as i32;
-pub const STATUS_NOT_SUPPORTED: ::NTSTATUS = 0xC00000BBu32 as i32;
-pub const STATUS_REMOTE_NOT_LISTENING: ::NTSTATUS = 0xC00000BCu32 as i32;
-pub const STATUS_DUPLICATE_NAME: ::NTSTATUS = 0xC00000BDu32 as i32;
-pub const STATUS_BAD_NETWORK_PATH: ::NTSTATUS = 0xC00000BEu32 as i32;
-pub const STATUS_NETWORK_BUSY: ::NTSTATUS = 0xC00000BFu32 as i32;
-pub const STATUS_DEVICE_DOES_NOT_EXIST: ::NTSTATUS = 0xC00000C0u32 as i32;
-pub const STATUS_TOO_MANY_COMMANDS: ::NTSTATUS = 0xC00000C1u32 as i32;
-pub const STATUS_ADAPTER_HARDWARE_ERROR: ::NTSTATUS = 0xC00000C2u32 as i32;
-pub const STATUS_INVALID_NETWORK_RESPONSE: ::NTSTATUS = 0xC00000C3u32 as i32;
-pub const STATUS_UNEXPECTED_NETWORK_ERROR: ::NTSTATUS = 0xC00000C4u32 as i32;
-pub const STATUS_BAD_REMOTE_ADAPTER: ::NTSTATUS = 0xC00000C5u32 as i32;
-pub const STATUS_PRINT_QUEUE_FULL: ::NTSTATUS = 0xC00000C6u32 as i32;
-pub const STATUS_NO_SPOOL_SPACE: ::NTSTATUS = 0xC00000C7u32 as i32;
-pub const STATUS_PRINT_CANCELLED: ::NTSTATUS = 0xC00000C8u32 as i32;
-pub const STATUS_NETWORK_NAME_DELETED: ::NTSTATUS = 0xC00000C9u32 as i32;
-pub const STATUS_NETWORK_ACCESS_DENIED: ::NTSTATUS = 0xC00000CAu32 as i32;
-pub const STATUS_BAD_DEVICE_TYPE: ::NTSTATUS = 0xC00000CBu32 as i32;
-pub const STATUS_BAD_NETWORK_NAME: ::NTSTATUS = 0xC00000CCu32 as i32;
-pub const STATUS_TOO_MANY_NAMES: ::NTSTATUS = 0xC00000CDu32 as i32;
-pub const STATUS_TOO_MANY_SESSIONS: ::NTSTATUS = 0xC00000CEu32 as i32;
-pub const STATUS_SHARING_PAUSED: ::NTSTATUS = 0xC00000CFu32 as i32;
-pub const STATUS_REQUEST_NOT_ACCEPTED: ::NTSTATUS = 0xC00000D0u32 as i32;
-pub const STATUS_REDIRECTOR_PAUSED: ::NTSTATUS = 0xC00000D1u32 as i32;
-pub const STATUS_NET_WRITE_FAULT: ::NTSTATUS = 0xC00000D2u32 as i32;
-pub const STATUS_PROFILING_AT_LIMIT: ::NTSTATUS = 0xC00000D3u32 as i32;
-pub const STATUS_NOT_SAME_DEVICE: ::NTSTATUS = 0xC00000D4u32 as i32;
-pub const STATUS_FILE_RENAMED: ::NTSTATUS = 0xC00000D5u32 as i32;
-pub const STATUS_VIRTUAL_CIRCUIT_CLOSED: ::NTSTATUS = 0xC00000D6u32 as i32;
-pub const STATUS_NO_SECURITY_ON_OBJECT: ::NTSTATUS = 0xC00000D7u32 as i32;
-pub const STATUS_CANT_WAIT: ::NTSTATUS = 0xC00000D8u32 as i32;
-pub const STATUS_PIPE_EMPTY: ::NTSTATUS = 0xC00000D9u32 as i32;
-pub const STATUS_CANT_ACCESS_DOMAIN_INFO: ::NTSTATUS = 0xC00000DAu32 as i32;
-pub const STATUS_CANT_TERMINATE_SELF: ::NTSTATUS = 0xC00000DBu32 as i32;
-pub const STATUS_INVALID_SERVER_STATE: ::NTSTATUS = 0xC00000DCu32 as i32;
-pub const STATUS_INVALID_DOMAIN_STATE: ::NTSTATUS = 0xC00000DDu32 as i32;
-pub const STATUS_INVALID_DOMAIN_ROLE: ::NTSTATUS = 0xC00000DEu32 as i32;
-pub const STATUS_NO_SUCH_DOMAIN: ::NTSTATUS = 0xC00000DFu32 as i32;
-pub const STATUS_DOMAIN_EXISTS: ::NTSTATUS = 0xC00000E0u32 as i32;
-pub const STATUS_DOMAIN_LIMIT_EXCEEDED: ::NTSTATUS = 0xC00000E1u32 as i32;
-pub const STATUS_OPLOCK_NOT_GRANTED: ::NTSTATUS = 0xC00000E2u32 as i32;
-pub const STATUS_INVALID_OPLOCK_PROTOCOL: ::NTSTATUS = 0xC00000E3u32 as i32;
-pub const STATUS_INTERNAL_DB_CORRUPTION: ::NTSTATUS = 0xC00000E4u32 as i32;
-pub const STATUS_INTERNAL_ERROR: ::NTSTATUS = 0xC00000E5u32 as i32;
-pub const STATUS_GENERIC_NOT_MAPPED: ::NTSTATUS = 0xC00000E6u32 as i32;
-pub const STATUS_BAD_DESCRIPTOR_FORMAT: ::NTSTATUS = 0xC00000E7u32 as i32;
-pub const STATUS_INVALID_USER_BUFFER: ::NTSTATUS = 0xC00000E8u32 as i32;
-pub const STATUS_UNEXPECTED_IO_ERROR: ::NTSTATUS = 0xC00000E9u32 as i32;
-pub const STATUS_UNEXPECTED_MM_CREATE_ERR: ::NTSTATUS = 0xC00000EAu32 as i32;
-pub const STATUS_UNEXPECTED_MM_MAP_ERROR: ::NTSTATUS = 0xC00000EBu32 as i32;
-pub const STATUS_UNEXPECTED_MM_EXTEND_ERR: ::NTSTATUS = 0xC00000ECu32 as i32;
-pub const STATUS_NOT_LOGON_PROCESS: ::NTSTATUS = 0xC00000EDu32 as i32;
-pub const STATUS_LOGON_SESSION_EXISTS: ::NTSTATUS = 0xC00000EEu32 as i32;
-pub const STATUS_INVALID_PARAMETER_1: ::NTSTATUS = 0xC00000EFu32 as i32;
-pub const STATUS_INVALID_PARAMETER_2: ::NTSTATUS = 0xC00000F0u32 as i32;
-pub const STATUS_INVALID_PARAMETER_3: ::NTSTATUS = 0xC00000F1u32 as i32;
-pub const STATUS_INVALID_PARAMETER_4: ::NTSTATUS = 0xC00000F2u32 as i32;
-pub const STATUS_INVALID_PARAMETER_5: ::NTSTATUS = 0xC00000F3u32 as i32;
-pub const STATUS_INVALID_PARAMETER_6: ::NTSTATUS = 0xC00000F4u32 as i32;
-pub const STATUS_INVALID_PARAMETER_7: ::NTSTATUS = 0xC00000F5u32 as i32;
-pub const STATUS_INVALID_PARAMETER_8: ::NTSTATUS = 0xC00000F6u32 as i32;
-pub const STATUS_INVALID_PARAMETER_9: ::NTSTATUS = 0xC00000F7u32 as i32;
-pub const STATUS_INVALID_PARAMETER_10: ::NTSTATUS = 0xC00000F8u32 as i32;
-pub const STATUS_INVALID_PARAMETER_11: ::NTSTATUS = 0xC00000F9u32 as i32;
-pub const STATUS_INVALID_PARAMETER_12: ::NTSTATUS = 0xC00000FAu32 as i32;
-pub const STATUS_REDIRECTOR_NOT_STARTED: ::NTSTATUS = 0xC00000FBu32 as i32;
-pub const STATUS_REDIRECTOR_STARTED: ::NTSTATUS = 0xC00000FCu32 as i32;
-pub const STATUS_STACK_OVERFLOW: ::NTSTATUS = 0xC00000FDu32 as i32;
-pub const STATUS_NO_SUCH_PACKAGE: ::NTSTATUS = 0xC00000FEu32 as i32;
-pub const STATUS_BAD_FUNCTION_TABLE: ::NTSTATUS = 0xC00000FFu32 as i32;
-pub const STATUS_VARIABLE_NOT_FOUND: ::NTSTATUS = 0xC0000100u32 as i32;
-pub const STATUS_DIRECTORY_NOT_EMPTY: ::NTSTATUS = 0xC0000101u32 as i32;
-pub const STATUS_FILE_CORRUPT_ERROR: ::NTSTATUS = 0xC0000102u32 as i32;
-pub const STATUS_NOT_A_DIRECTORY: ::NTSTATUS = 0xC0000103u32 as i32;
-pub const STATUS_BAD_LOGON_SESSION_STATE: ::NTSTATUS = 0xC0000104u32 as i32;
-pub const STATUS_LOGON_SESSION_COLLISION: ::NTSTATUS = 0xC0000105u32 as i32;
-pub const STATUS_NAME_TOO_LONG: ::NTSTATUS = 0xC0000106u32 as i32;
-pub const STATUS_FILES_OPEN: ::NTSTATUS = 0xC0000107u32 as i32;
-pub const STATUS_CONNECTION_IN_USE: ::NTSTATUS = 0xC0000108u32 as i32;
-pub const STATUS_MESSAGE_NOT_FOUND: ::NTSTATUS = 0xC0000109u32 as i32;
-pub const STATUS_PROCESS_IS_TERMINATING: ::NTSTATUS = 0xC000010Au32 as i32;
-pub const STATUS_INVALID_LOGON_TYPE: ::NTSTATUS = 0xC000010Bu32 as i32;
-pub const STATUS_NO_GUID_TRANSLATION: ::NTSTATUS = 0xC000010Cu32 as i32;
-pub const STATUS_CANNOT_IMPERSONATE: ::NTSTATUS = 0xC000010Du32 as i32;
-pub const STATUS_IMAGE_ALREADY_LOADED: ::NTSTATUS = 0xC000010Eu32 as i32;
-pub const STATUS_ABIOS_NOT_PRESENT: ::NTSTATUS = 0xC000010Fu32 as i32;
-pub const STATUS_ABIOS_LID_NOT_EXIST: ::NTSTATUS = 0xC0000110u32 as i32;
-pub const STATUS_ABIOS_LID_ALREADY_OWNED: ::NTSTATUS = 0xC0000111u32 as i32;
-pub const STATUS_ABIOS_NOT_LID_OWNER: ::NTSTATUS = 0xC0000112u32 as i32;
-pub const STATUS_ABIOS_INVALID_COMMAND: ::NTSTATUS = 0xC0000113u32 as i32;
-pub const STATUS_ABIOS_INVALID_LID: ::NTSTATUS = 0xC0000114u32 as i32;
-pub const STATUS_ABIOS_SELECTOR_NOT_AVAILABLE: ::NTSTATUS = 0xC0000115u32 as i32;
-pub const STATUS_ABIOS_INVALID_SELECTOR: ::NTSTATUS = 0xC0000116u32 as i32;
-pub const STATUS_NO_LDT: ::NTSTATUS = 0xC0000117u32 as i32;
-pub const STATUS_INVALID_LDT_SIZE: ::NTSTATUS = 0xC0000118u32 as i32;
-pub const STATUS_INVALID_LDT_OFFSET: ::NTSTATUS = 0xC0000119u32 as i32;
-pub const STATUS_INVALID_LDT_DESCRIPTOR: ::NTSTATUS = 0xC000011Au32 as i32;
-pub const STATUS_INVALID_IMAGE_NE_FORMAT: ::NTSTATUS = 0xC000011Bu32 as i32;
-pub const STATUS_RXACT_INVALID_STATE: ::NTSTATUS = 0xC000011Cu32 as i32;
-pub const STATUS_RXACT_COMMIT_FAILURE: ::NTSTATUS = 0xC000011Du32 as i32;
-pub const STATUS_MAPPED_FILE_SIZE_ZERO: ::NTSTATUS = 0xC000011Eu32 as i32;
-pub const STATUS_TOO_MANY_OPENED_FILES: ::NTSTATUS = 0xC000011Fu32 as i32;
-pub const STATUS_CANCELLED: ::NTSTATUS = 0xC0000120u32 as i32;
-pub const STATUS_CANNOT_DELETE: ::NTSTATUS = 0xC0000121u32 as i32;
-pub const STATUS_INVALID_COMPUTER_NAME: ::NTSTATUS = 0xC0000122u32 as i32;
-pub const STATUS_FILE_DELETED: ::NTSTATUS = 0xC0000123u32 as i32;
-pub const STATUS_SPECIAL_ACCOUNT: ::NTSTATUS = 0xC0000124u32 as i32;
-pub const STATUS_SPECIAL_GROUP: ::NTSTATUS = 0xC0000125u32 as i32;
-pub const STATUS_SPECIAL_USER: ::NTSTATUS = 0xC0000126u32 as i32;
-pub const STATUS_MEMBERS_PRIMARY_GROUP: ::NTSTATUS = 0xC0000127u32 as i32;
-pub const STATUS_FILE_CLOSED: ::NTSTATUS = 0xC0000128u32 as i32;
-pub const STATUS_TOO_MANY_THREADS: ::NTSTATUS = 0xC0000129u32 as i32;
-pub const STATUS_THREAD_NOT_IN_PROCESS: ::NTSTATUS = 0xC000012Au32 as i32;
-pub const STATUS_TOKEN_ALREADY_IN_USE: ::NTSTATUS = 0xC000012Bu32 as i32;
-pub const STATUS_PAGEFILE_QUOTA_EXCEEDED: ::NTSTATUS = 0xC000012Cu32 as i32;
-pub const STATUS_COMMITMENT_LIMIT: ::NTSTATUS = 0xC000012Du32 as i32;
-pub const STATUS_INVALID_IMAGE_LE_FORMAT: ::NTSTATUS = 0xC000012Eu32 as i32;
-pub const STATUS_INVALID_IMAGE_NOT_MZ: ::NTSTATUS = 0xC000012Fu32 as i32;
-pub const STATUS_INVALID_IMAGE_PROTECT: ::NTSTATUS = 0xC0000130u32 as i32;
-pub const STATUS_INVALID_IMAGE_WIN_16: ::NTSTATUS = 0xC0000131u32 as i32;
-pub const STATUS_LOGON_SERVER_CONFLICT: ::NTSTATUS = 0xC0000132u32 as i32;
-pub const STATUS_TIME_DIFFERENCE_AT_DC: ::NTSTATUS = 0xC0000133u32 as i32;
-pub const STATUS_SYNCHRONIZATION_REQUIRED: ::NTSTATUS = 0xC0000134u32 as i32;
-pub const STATUS_DLL_NOT_FOUND: ::NTSTATUS = 0xC0000135u32 as i32;
-pub const STATUS_OPEN_FAILED: ::NTSTATUS = 0xC0000136u32 as i32;
-pub const STATUS_IO_PRIVILEGE_FAILED: ::NTSTATUS = 0xC0000137u32 as i32;
-pub const STATUS_ORDINAL_NOT_FOUND: ::NTSTATUS = 0xC0000138u32 as i32;
-pub const STATUS_ENTRYPOINT_NOT_FOUND: ::NTSTATUS = 0xC0000139u32 as i32;
-pub const STATUS_CONTROL_C_EXIT: ::NTSTATUS = 0xC000013Au32 as i32;
-pub const STATUS_LOCAL_DISCONNECT: ::NTSTATUS = 0xC000013Bu32 as i32;
-pub const STATUS_REMOTE_DISCONNECT: ::NTSTATUS = 0xC000013Cu32 as i32;
-pub const STATUS_REMOTE_RESOURCES: ::NTSTATUS = 0xC000013Du32 as i32;
-pub const STATUS_LINK_FAILED: ::NTSTATUS = 0xC000013Eu32 as i32;
-pub const STATUS_LINK_TIMEOUT: ::NTSTATUS = 0xC000013Fu32 as i32;
-pub const STATUS_INVALID_CONNECTION: ::NTSTATUS = 0xC0000140u32 as i32;
-pub const STATUS_INVALID_ADDRESS: ::NTSTATUS = 0xC0000141u32 as i32;
-pub const STATUS_DLL_INIT_FAILED: ::NTSTATUS = 0xC0000142u32 as i32;
-pub const STATUS_MISSING_SYSTEMFILE: ::NTSTATUS = 0xC0000143u32 as i32;
-pub const STATUS_UNHANDLED_EXCEPTION: ::NTSTATUS = 0xC0000144u32 as i32;
-pub const STATUS_APP_INIT_FAILURE: ::NTSTATUS = 0xC0000145u32 as i32;
-pub const STATUS_PAGEFILE_CREATE_FAILED: ::NTSTATUS = 0xC0000146u32 as i32;
-pub const STATUS_NO_PAGEFILE: ::NTSTATUS = 0xC0000147u32 as i32;
-pub const STATUS_INVALID_LEVEL: ::NTSTATUS = 0xC0000148u32 as i32;
-pub const STATUS_WRONG_PASSWORD_CORE: ::NTSTATUS = 0xC0000149u32 as i32;
-pub const STATUS_ILLEGAL_FLOAT_CONTEXT: ::NTSTATUS = 0xC000014Au32 as i32;
-pub const STATUS_PIPE_BROKEN: ::NTSTATUS = 0xC000014Bu32 as i32;
-pub const STATUS_REGISTRY_CORRUPT: ::NTSTATUS = 0xC000014Cu32 as i32;
-pub const STATUS_REGISTRY_IO_FAILED: ::NTSTATUS = 0xC000014Du32 as i32;
-pub const STATUS_NO_EVENT_PAIR: ::NTSTATUS = 0xC000014Eu32 as i32;
-pub const STATUS_UNRECOGNIZED_VOLUME: ::NTSTATUS = 0xC000014Fu32 as i32;
-pub const STATUS_SERIAL_NO_DEVICE_INITED: ::NTSTATUS = 0xC0000150u32 as i32;
-pub const STATUS_NO_SUCH_ALIAS: ::NTSTATUS = 0xC0000151u32 as i32;
-pub const STATUS_MEMBER_NOT_IN_ALIAS: ::NTSTATUS = 0xC0000152u32 as i32;
-pub const STATUS_MEMBER_IN_ALIAS: ::NTSTATUS = 0xC0000153u32 as i32;
-pub const STATUS_ALIAS_EXISTS: ::NTSTATUS = 0xC0000154u32 as i32;
-pub const STATUS_LOGON_NOT_GRANTED: ::NTSTATUS = 0xC0000155u32 as i32;
-pub const STATUS_TOO_MANY_SECRETS: ::NTSTATUS = 0xC0000156u32 as i32;
-pub const STATUS_SECRET_TOO_LONG: ::NTSTATUS = 0xC0000157u32 as i32;
-pub const STATUS_INTERNAL_DB_ERROR: ::NTSTATUS = 0xC0000158u32 as i32;
-pub const STATUS_FULLSCREEN_MODE: ::NTSTATUS = 0xC0000159u32 as i32;
-pub const STATUS_TOO_MANY_CONTEXT_IDS: ::NTSTATUS = 0xC000015Au32 as i32;
-pub const STATUS_LOGON_TYPE_NOT_GRANTED: ::NTSTATUS = 0xC000015Bu32 as i32;
-pub const STATUS_NOT_REGISTRY_FILE: ::NTSTATUS = 0xC000015Cu32 as i32;
-pub const STATUS_NT_CROSS_ENCRYPTION_REQUIRED: ::NTSTATUS = 0xC000015Du32 as i32;
-pub const STATUS_DOMAIN_CTRLR_CONFIG_ERROR: ::NTSTATUS = 0xC000015Eu32 as i32;
-pub const STATUS_FT_MISSING_MEMBER: ::NTSTATUS = 0xC000015Fu32 as i32;
-pub const STATUS_ILL_FORMED_SERVICE_ENTRY: ::NTSTATUS = 0xC0000160u32 as i32;
-pub const STATUS_ILLEGAL_CHARACTER: ::NTSTATUS = 0xC0000161u32 as i32;
-pub const STATUS_UNMAPPABLE_CHARACTER: ::NTSTATUS = 0xC0000162u32 as i32;
-pub const STATUS_UNDEFINED_CHARACTER: ::NTSTATUS = 0xC0000163u32 as i32;
-pub const STATUS_FLOPPY_VOLUME: ::NTSTATUS = 0xC0000164u32 as i32;
-pub const STATUS_FLOPPY_ID_MARK_NOT_FOUND: ::NTSTATUS = 0xC0000165u32 as i32;
-pub const STATUS_FLOPPY_WRONG_CYLINDER: ::NTSTATUS = 0xC0000166u32 as i32;
-pub const STATUS_FLOPPY_UNKNOWN_ERROR: ::NTSTATUS = 0xC0000167u32 as i32;
-pub const STATUS_FLOPPY_BAD_REGISTERS: ::NTSTATUS = 0xC0000168u32 as i32;
-pub const STATUS_DISK_RECALIBRATE_FAILED: ::NTSTATUS = 0xC0000169u32 as i32;
-pub const STATUS_DISK_OPERATION_FAILED: ::NTSTATUS = 0xC000016Au32 as i32;
-pub const STATUS_DISK_RESET_FAILED: ::NTSTATUS = 0xC000016Bu32 as i32;
-pub const STATUS_SHARED_IRQ_BUSY: ::NTSTATUS = 0xC000016Cu32 as i32;
-pub const STATUS_FT_ORPHANING: ::NTSTATUS = 0xC000016Du32 as i32;
-pub const STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT: ::NTSTATUS = 0xC000016Eu32 as i32;
-pub const STATUS_PARTITION_FAILURE: ::NTSTATUS = 0xC0000172u32 as i32;
-pub const STATUS_INVALID_BLOCK_LENGTH: ::NTSTATUS = 0xC0000173u32 as i32;
-pub const STATUS_DEVICE_NOT_PARTITIONED: ::NTSTATUS = 0xC0000174u32 as i32;
-pub const STATUS_UNABLE_TO_LOCK_MEDIA: ::NTSTATUS = 0xC0000175u32 as i32;
-pub const STATUS_UNABLE_TO_UNLOAD_MEDIA: ::NTSTATUS = 0xC0000176u32 as i32;
-pub const STATUS_EOM_OVERFLOW: ::NTSTATUS = 0xC0000177u32 as i32;
-pub const STATUS_NO_MEDIA: ::NTSTATUS = 0xC0000178u32 as i32;
-pub const STATUS_NO_SUCH_MEMBER: ::NTSTATUS = 0xC000017Au32 as i32;
-pub const STATUS_INVALID_MEMBER: ::NTSTATUS = 0xC000017Bu32 as i32;
-pub const STATUS_KEY_DELETED: ::NTSTATUS = 0xC000017Cu32 as i32;
-pub const STATUS_NO_LOG_SPACE: ::NTSTATUS = 0xC000017Du32 as i32;
-pub const STATUS_TOO_MANY_SIDS: ::NTSTATUS = 0xC000017Eu32 as i32;
-pub const STATUS_LM_CROSS_ENCRYPTION_REQUIRED: ::NTSTATUS = 0xC000017Fu32 as i32;
-pub const STATUS_KEY_HAS_CHILDREN: ::NTSTATUS = 0xC0000180u32 as i32;
-pub const STATUS_CHILD_MUST_BE_VOLATILE: ::NTSTATUS = 0xC0000181u32 as i32;
-pub const STATUS_DEVICE_CONFIGURATION_ERROR: ::NTSTATUS = 0xC0000182u32 as i32;
-pub const STATUS_DRIVER_INTERNAL_ERROR: ::NTSTATUS = 0xC0000183u32 as i32;
-pub const STATUS_INVALID_DEVICE_STATE: ::NTSTATUS = 0xC0000184u32 as i32;
-pub const STATUS_IO_DEVICE_ERROR: ::NTSTATUS = 0xC0000185u32 as i32;
-pub const STATUS_DEVICE_PROTOCOL_ERROR: ::NTSTATUS = 0xC0000186u32 as i32;
-pub const STATUS_BACKUP_CONTROLLER: ::NTSTATUS = 0xC0000187u32 as i32;
-pub const STATUS_LOG_FILE_FULL: ::NTSTATUS = 0xC0000188u32 as i32;
-pub const STATUS_TOO_LATE: ::NTSTATUS = 0xC0000189u32 as i32;
-pub const STATUS_NO_TRUST_LSA_SECRET: ::NTSTATUS = 0xC000018Au32 as i32;
-pub const STATUS_NO_TRUST_SAM_ACCOUNT: ::NTSTATUS = 0xC000018Bu32 as i32;
-pub const STATUS_TRUSTED_DOMAIN_FAILURE: ::NTSTATUS = 0xC000018Cu32 as i32;
-pub const STATUS_TRUSTED_RELATIONSHIP_FAILURE: ::NTSTATUS = 0xC000018Du32 as i32;
-pub const STATUS_EVENTLOG_FILE_CORRUPT: ::NTSTATUS = 0xC000018Eu32 as i32;
-pub const STATUS_EVENTLOG_CANT_START: ::NTSTATUS = 0xC000018Fu32 as i32;
-pub const STATUS_TRUST_FAILURE: ::NTSTATUS = 0xC0000190u32 as i32;
-pub const STATUS_MUTANT_LIMIT_EXCEEDED: ::NTSTATUS = 0xC0000191u32 as i32;
-pub const STATUS_NETLOGON_NOT_STARTED: ::NTSTATUS = 0xC0000192u32 as i32;
-pub const STATUS_ACCOUNT_EXPIRED: ::NTSTATUS = 0xC0000193u32 as i32;
-pub const STATUS_POSSIBLE_DEADLOCK: ::NTSTATUS = 0xC0000194u32 as i32;
-pub const STATUS_NETWORK_CREDENTIAL_CONFLICT: ::NTSTATUS = 0xC0000195u32 as i32;
-pub const STATUS_REMOTE_SESSION_LIMIT: ::NTSTATUS = 0xC0000196u32 as i32;
-pub const STATUS_EVENTLOG_FILE_CHANGED: ::NTSTATUS = 0xC0000197u32 as i32;
-pub const STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT: ::NTSTATUS = 0xC0000198u32 as i32;
-pub const STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT: ::NTSTATUS = 0xC0000199u32 as i32;
-pub const STATUS_NOLOGON_SERVER_TRUST_ACCOUNT: ::NTSTATUS = 0xC000019Au32 as i32;
-pub const STATUS_DOMAIN_TRUST_INCONSISTENT: ::NTSTATUS = 0xC000019Bu32 as i32;
-pub const STATUS_FS_DRIVER_REQUIRED: ::NTSTATUS = 0xC000019Cu32 as i32;
-pub const STATUS_IMAGE_ALREADY_LOADED_AS_DLL: ::NTSTATUS = 0xC000019Du32 as i32;
-pub const STATUS_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING: ::NTSTATUS = 0xC000019Eu32 as i32;
-pub const STATUS_SHORT_NAMES_NOT_ENABLED_ON_VOLUME: ::NTSTATUS = 0xC000019Fu32 as i32;
-pub const STATUS_SECURITY_STREAM_IS_INCONSISTENT: ::NTSTATUS = 0xC00001A0u32 as i32;
-pub const STATUS_INVALID_LOCK_RANGE: ::NTSTATUS = 0xC00001A1u32 as i32;
-pub const STATUS_INVALID_ACE_CONDITION: ::NTSTATUS = 0xC00001A2u32 as i32;
-pub const STATUS_IMAGE_SUBSYSTEM_NOT_PRESENT: ::NTSTATUS = 0xC00001A3u32 as i32;
-pub const STATUS_NOTIFICATION_GUID_ALREADY_DEFINED: ::NTSTATUS = 0xC00001A4u32 as i32;
-pub const STATUS_INVALID_EXCEPTION_HANDLER: ::NTSTATUS = 0xC00001A5u32 as i32;
-pub const STATUS_DUPLICATE_PRIVILEGES: ::NTSTATUS = 0xC00001A6u32 as i32;
-pub const STATUS_NOT_ALLOWED_ON_SYSTEM_FILE: ::NTSTATUS = 0xC00001A7u32 as i32;
-pub const STATUS_REPAIR_NEEDED: ::NTSTATUS = 0xC00001A8u32 as i32;
-pub const STATUS_QUOTA_NOT_ENABLED: ::NTSTATUS = 0xC00001A9u32 as i32;
-pub const STATUS_NO_APPLICATION_PACKAGE: ::NTSTATUS = 0xC00001AAu32 as i32;
-pub const STATUS_FILE_METADATA_OPTIMIZATION_IN_PROGRESS: ::NTSTATUS = 0xC00001ABu32 as i32;
-pub const STATUS_NOT_SAME_OBJECT: ::NTSTATUS = 0xC00001ACu32 as i32;
-pub const STATUS_FATAL_MEMORY_EXHAUSTION: ::NTSTATUS = 0xC00001ADu32 as i32;
-pub const STATUS_ERROR_PROCESS_NOT_IN_JOB: ::NTSTATUS = 0xC00001AEu32 as i32;
-pub const STATUS_NETWORK_OPEN_RESTRICTION: ::NTSTATUS = 0xC0000201u32 as i32;
-pub const STATUS_NO_USER_SESSION_KEY: ::NTSTATUS = 0xC0000202u32 as i32;
-pub const STATUS_USER_SESSION_DELETED: ::NTSTATUS = 0xC0000203u32 as i32;
-pub const STATUS_RESOURCE_LANG_NOT_FOUND: ::NTSTATUS = 0xC0000204u32 as i32;
-pub const STATUS_INSUFF_SERVER_RESOURCES: ::NTSTATUS = 0xC0000205u32 as i32;
-pub const STATUS_INVALID_BUFFER_SIZE: ::NTSTATUS = 0xC0000206u32 as i32;
-pub const STATUS_INVALID_ADDRESS_COMPONENT: ::NTSTATUS = 0xC0000207u32 as i32;
-pub const STATUS_INVALID_ADDRESS_WILDCARD: ::NTSTATUS = 0xC0000208u32 as i32;
-pub const STATUS_TOO_MANY_ADDRESSES: ::NTSTATUS = 0xC0000209u32 as i32;
-pub const STATUS_ADDRESS_ALREADY_EXISTS: ::NTSTATUS = 0xC000020Au32 as i32;
-pub const STATUS_ADDRESS_CLOSED: ::NTSTATUS = 0xC000020Bu32 as i32;
-pub const STATUS_CONNECTION_DISCONNECTED: ::NTSTATUS = 0xC000020Cu32 as i32;
-pub const STATUS_CONNECTION_RESET: ::NTSTATUS = 0xC000020Du32 as i32;
-pub const STATUS_TOO_MANY_NODES: ::NTSTATUS = 0xC000020Eu32 as i32;
-pub const STATUS_TRANSACTION_ABORTED: ::NTSTATUS = 0xC000020Fu32 as i32;
-pub const STATUS_TRANSACTION_TIMED_OUT: ::NTSTATUS = 0xC0000210u32 as i32;
-pub const STATUS_TRANSACTION_NO_RELEASE: ::NTSTATUS = 0xC0000211u32 as i32;
-pub const STATUS_TRANSACTION_NO_MATCH: ::NTSTATUS = 0xC0000212u32 as i32;
-pub const STATUS_TRANSACTION_RESPONDED: ::NTSTATUS = 0xC0000213u32 as i32;
-pub const STATUS_TRANSACTION_INVALID_ID: ::NTSTATUS = 0xC0000214u32 as i32;
-pub const STATUS_TRANSACTION_INVALID_TYPE: ::NTSTATUS = 0xC0000215u32 as i32;
-pub const STATUS_NOT_SERVER_SESSION: ::NTSTATUS = 0xC0000216u32 as i32;
-pub const STATUS_NOT_CLIENT_SESSION: ::NTSTATUS = 0xC0000217u32 as i32;
-pub const STATUS_CANNOT_LOAD_REGISTRY_FILE: ::NTSTATUS = 0xC0000218u32 as i32;
-pub const STATUS_DEBUG_ATTACH_FAILED: ::NTSTATUS = 0xC0000219u32 as i32;
-pub const STATUS_SYSTEM_PROCESS_TERMINATED: ::NTSTATUS = 0xC000021Au32 as i32;
-pub const STATUS_DATA_NOT_ACCEPTED: ::NTSTATUS = 0xC000021Bu32 as i32;
-pub const STATUS_NO_BROWSER_SERVERS_FOUND: ::NTSTATUS = 0xC000021Cu32 as i32;
-pub const STATUS_VDM_HARD_ERROR: ::NTSTATUS = 0xC000021Du32 as i32;
-pub const STATUS_DRIVER_CANCEL_TIMEOUT: ::NTSTATUS = 0xC000021Eu32 as i32;
-pub const STATUS_REPLY_MESSAGE_MISMATCH: ::NTSTATUS = 0xC000021Fu32 as i32;
-pub const STATUS_MAPPED_ALIGNMENT: ::NTSTATUS = 0xC0000220u32 as i32;
-pub const STATUS_IMAGE_CHECKSUM_MISMATCH: ::NTSTATUS = 0xC0000221u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA: ::NTSTATUS = 0xC0000222u32 as i32;
-pub const STATUS_CLIENT_SERVER_PARAMETERS_INVALID: ::NTSTATUS = 0xC0000223u32 as i32;
-pub const STATUS_PASSWORD_MUST_CHANGE: ::NTSTATUS = 0xC0000224u32 as i32;
-pub const STATUS_NOT_FOUND: ::NTSTATUS = 0xC0000225u32 as i32;
-pub const STATUS_NOT_TINY_STREAM: ::NTSTATUS = 0xC0000226u32 as i32;
-pub const STATUS_RECOVERY_FAILURE: ::NTSTATUS = 0xC0000227u32 as i32;
-pub const STATUS_STACK_OVERFLOW_READ: ::NTSTATUS = 0xC0000228u32 as i32;
-pub const STATUS_FAIL_CHECK: ::NTSTATUS = 0xC0000229u32 as i32;
-pub const STATUS_DUPLICATE_OBJECTID: ::NTSTATUS = 0xC000022Au32 as i32;
-pub const STATUS_OBJECTID_EXISTS: ::NTSTATUS = 0xC000022Bu32 as i32;
-pub const STATUS_CONVERT_TO_LARGE: ::NTSTATUS = 0xC000022Cu32 as i32;
-pub const STATUS_RETRY: ::NTSTATUS = 0xC000022Du32 as i32;
-pub const STATUS_FOUND_OUT_OF_SCOPE: ::NTSTATUS = 0xC000022Eu32 as i32;
-pub const STATUS_ALLOCATE_BUCKET: ::NTSTATUS = 0xC000022Fu32 as i32;
-pub const STATUS_PROPSET_NOT_FOUND: ::NTSTATUS = 0xC0000230u32 as i32;
-pub const STATUS_MARSHALL_OVERFLOW: ::NTSTATUS = 0xC0000231u32 as i32;
-pub const STATUS_INVALID_VARIANT: ::NTSTATUS = 0xC0000232u32 as i32;
-pub const STATUS_DOMAIN_CONTROLLER_NOT_FOUND: ::NTSTATUS = 0xC0000233u32 as i32;
-pub const STATUS_ACCOUNT_LOCKED_OUT: ::NTSTATUS = 0xC0000234u32 as i32;
-pub const STATUS_HANDLE_NOT_CLOSABLE: ::NTSTATUS = 0xC0000235u32 as i32;
-pub const STATUS_CONNECTION_REFUSED: ::NTSTATUS = 0xC0000236u32 as i32;
-pub const STATUS_GRACEFUL_DISCONNECT: ::NTSTATUS = 0xC0000237u32 as i32;
-pub const STATUS_ADDRESS_ALREADY_ASSOCIATED: ::NTSTATUS = 0xC0000238u32 as i32;
-pub const STATUS_ADDRESS_NOT_ASSOCIATED: ::NTSTATUS = 0xC0000239u32 as i32;
-pub const STATUS_CONNECTION_INVALID: ::NTSTATUS = 0xC000023Au32 as i32;
-pub const STATUS_CONNECTION_ACTIVE: ::NTSTATUS = 0xC000023Bu32 as i32;
-pub const STATUS_NETWORK_UNREACHABLE: ::NTSTATUS = 0xC000023Cu32 as i32;
-pub const STATUS_HOST_UNREACHABLE: ::NTSTATUS = 0xC000023Du32 as i32;
-pub const STATUS_PROTOCOL_UNREACHABLE: ::NTSTATUS = 0xC000023Eu32 as i32;
-pub const STATUS_PORT_UNREACHABLE: ::NTSTATUS = 0xC000023Fu32 as i32;
-pub const STATUS_REQUEST_ABORTED: ::NTSTATUS = 0xC0000240u32 as i32;
-pub const STATUS_CONNECTION_ABORTED: ::NTSTATUS = 0xC0000241u32 as i32;
-pub const STATUS_BAD_COMPRESSION_BUFFER: ::NTSTATUS = 0xC0000242u32 as i32;
-pub const STATUS_USER_MAPPED_FILE: ::NTSTATUS = 0xC0000243u32 as i32;
-pub const STATUS_AUDIT_FAILED: ::NTSTATUS = 0xC0000244u32 as i32;
-pub const STATUS_TIMER_RESOLUTION_NOT_SET: ::NTSTATUS = 0xC0000245u32 as i32;
-pub const STATUS_CONNECTION_COUNT_LIMIT: ::NTSTATUS = 0xC0000246u32 as i32;
-pub const STATUS_LOGIN_TIME_RESTRICTION: ::NTSTATUS = 0xC0000247u32 as i32;
-pub const STATUS_LOGIN_WKSTA_RESTRICTION: ::NTSTATUS = 0xC0000248u32 as i32;
-pub const STATUS_IMAGE_MP_UP_MISMATCH: ::NTSTATUS = 0xC0000249u32 as i32;
-pub const STATUS_INSUFFICIENT_LOGON_INFO: ::NTSTATUS = 0xC0000250u32 as i32;
-pub const STATUS_BAD_DLL_ENTRYPOINT: ::NTSTATUS = 0xC0000251u32 as i32;
-pub const STATUS_BAD_SERVICE_ENTRYPOINT: ::NTSTATUS = 0xC0000252u32 as i32;
-pub const STATUS_LPC_REPLY_LOST: ::NTSTATUS = 0xC0000253u32 as i32;
-pub const STATUS_IP_ADDRESS_CONFLICT1: ::NTSTATUS = 0xC0000254u32 as i32;
-pub const STATUS_IP_ADDRESS_CONFLICT2: ::NTSTATUS = 0xC0000255u32 as i32;
-pub const STATUS_REGISTRY_QUOTA_LIMIT: ::NTSTATUS = 0xC0000256u32 as i32;
-pub const STATUS_PATH_NOT_COVERED: ::NTSTATUS = 0xC0000257u32 as i32;
-pub const STATUS_NO_CALLBACK_ACTIVE: ::NTSTATUS = 0xC0000258u32 as i32;
-pub const STATUS_LICENSE_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000259u32 as i32;
-pub const STATUS_PWD_TOO_SHORT: ::NTSTATUS = 0xC000025Au32 as i32;
-pub const STATUS_PWD_TOO_RECENT: ::NTSTATUS = 0xC000025Bu32 as i32;
-pub const STATUS_PWD_HISTORY_CONFLICT: ::NTSTATUS = 0xC000025Cu32 as i32;
-pub const STATUS_PLUGPLAY_NO_DEVICE: ::NTSTATUS = 0xC000025Eu32 as i32;
-pub const STATUS_UNSUPPORTED_COMPRESSION: ::NTSTATUS = 0xC000025Fu32 as i32;
-pub const STATUS_INVALID_HW_PROFILE: ::NTSTATUS = 0xC0000260u32 as i32;
-pub const STATUS_INVALID_PLUGPLAY_DEVICE_PATH: ::NTSTATUS = 0xC0000261u32 as i32;
-pub const STATUS_DRIVER_ORDINAL_NOT_FOUND: ::NTSTATUS = 0xC0000262u32 as i32;
-pub const STATUS_DRIVER_ENTRYPOINT_NOT_FOUND: ::NTSTATUS = 0xC0000263u32 as i32;
-pub const STATUS_RESOURCE_NOT_OWNED: ::NTSTATUS = 0xC0000264u32 as i32;
-pub const STATUS_TOO_MANY_LINKS: ::NTSTATUS = 0xC0000265u32 as i32;
-pub const STATUS_QUOTA_LIST_INCONSISTENT: ::NTSTATUS = 0xC0000266u32 as i32;
-pub const STATUS_FILE_IS_OFFLINE: ::NTSTATUS = 0xC0000267u32 as i32;
-pub const STATUS_EVALUATION_EXPIRATION: ::NTSTATUS = 0xC0000268u32 as i32;
-pub const STATUS_ILLEGAL_DLL_RELOCATION: ::NTSTATUS = 0xC0000269u32 as i32;
-pub const STATUS_LICENSE_VIOLATION: ::NTSTATUS = 0xC000026Au32 as i32;
-pub const STATUS_DLL_INIT_FAILED_LOGOFF: ::NTSTATUS = 0xC000026Bu32 as i32;
-pub const STATUS_DRIVER_UNABLE_TO_LOAD: ::NTSTATUS = 0xC000026Cu32 as i32;
-pub const STATUS_DFS_UNAVAILABLE: ::NTSTATUS = 0xC000026Du32 as i32;
-pub const STATUS_VOLUME_DISMOUNTED: ::NTSTATUS = 0xC000026Eu32 as i32;
-pub const STATUS_WX86_INTERNAL_ERROR: ::NTSTATUS = 0xC000026Fu32 as i32;
-pub const STATUS_WX86_FLOAT_STACK_CHECK: ::NTSTATUS = 0xC0000270u32 as i32;
-pub const STATUS_VALIDATE_CONTINUE: ::NTSTATUS = 0xC0000271u32 as i32;
-pub const STATUS_NO_MATCH: ::NTSTATUS = 0xC0000272u32 as i32;
-pub const STATUS_NO_MORE_MATCHES: ::NTSTATUS = 0xC0000273u32 as i32;
-pub const STATUS_NOT_A_REPARSE_POINT: ::NTSTATUS = 0xC0000275u32 as i32;
-pub const STATUS_IO_REPARSE_TAG_INVALID: ::NTSTATUS = 0xC0000276u32 as i32;
-pub const STATUS_IO_REPARSE_TAG_MISMATCH: ::NTSTATUS = 0xC0000277u32 as i32;
-pub const STATUS_IO_REPARSE_DATA_INVALID: ::NTSTATUS = 0xC0000278u32 as i32;
-pub const STATUS_IO_REPARSE_TAG_NOT_HANDLED: ::NTSTATUS = 0xC0000279u32 as i32;
-pub const STATUS_PWD_TOO_LONG: ::NTSTATUS = 0xC000027Au32 as i32;
-pub const STATUS_STOWED_EXCEPTION: ::NTSTATUS = 0xC000027Bu32 as i32;
-pub const STATUS_REPARSE_POINT_NOT_RESOLVED: ::NTSTATUS = 0xC0000280u32 as i32;
-pub const STATUS_DIRECTORY_IS_A_REPARSE_POINT: ::NTSTATUS = 0xC0000281u32 as i32;
-pub const STATUS_RANGE_LIST_CONFLICT: ::NTSTATUS = 0xC0000282u32 as i32;
-pub const STATUS_SOURCE_ELEMENT_EMPTY: ::NTSTATUS = 0xC0000283u32 as i32;
-pub const STATUS_DESTINATION_ELEMENT_FULL: ::NTSTATUS = 0xC0000284u32 as i32;
-pub const STATUS_ILLEGAL_ELEMENT_ADDRESS: ::NTSTATUS = 0xC0000285u32 as i32;
-pub const STATUS_MAGAZINE_NOT_PRESENT: ::NTSTATUS = 0xC0000286u32 as i32;
-pub const STATUS_REINITIALIZATION_NEEDED: ::NTSTATUS = 0xC0000287u32 as i32;
-pub const STATUS_DEVICE_REQUIRES_CLEANING: ::NTSTATUS = 0x80000288u32 as i32;
-pub const STATUS_DEVICE_DOOR_OPEN: ::NTSTATUS = 0x80000289u32 as i32;
-pub const STATUS_ENCRYPTION_FAILED: ::NTSTATUS = 0xC000028Au32 as i32;
-pub const STATUS_DECRYPTION_FAILED: ::NTSTATUS = 0xC000028Bu32 as i32;
-pub const STATUS_RANGE_NOT_FOUND: ::NTSTATUS = 0xC000028Cu32 as i32;
-pub const STATUS_NO_RECOVERY_POLICY: ::NTSTATUS = 0xC000028Du32 as i32;
-pub const STATUS_NO_EFS: ::NTSTATUS = 0xC000028Eu32 as i32;
-pub const STATUS_WRONG_EFS: ::NTSTATUS = 0xC000028Fu32 as i32;
-pub const STATUS_NO_USER_KEYS: ::NTSTATUS = 0xC0000290u32 as i32;
-pub const STATUS_FILE_NOT_ENCRYPTED: ::NTSTATUS = 0xC0000291u32 as i32;
-pub const STATUS_NOT_EXPORT_FORMAT: ::NTSTATUS = 0xC0000292u32 as i32;
-pub const STATUS_FILE_ENCRYPTED: ::NTSTATUS = 0xC0000293u32 as i32;
-pub const STATUS_WAKE_SYSTEM: ::NTSTATUS = 0x40000294;
-pub const STATUS_WMI_GUID_NOT_FOUND: ::NTSTATUS = 0xC0000295u32 as i32;
-pub const STATUS_WMI_INSTANCE_NOT_FOUND: ::NTSTATUS = 0xC0000296u32 as i32;
-pub const STATUS_WMI_ITEMID_NOT_FOUND: ::NTSTATUS = 0xC0000297u32 as i32;
-pub const STATUS_WMI_TRY_AGAIN: ::NTSTATUS = 0xC0000298u32 as i32;
-pub const STATUS_SHARED_POLICY: ::NTSTATUS = 0xC0000299u32 as i32;
-pub const STATUS_POLICY_OBJECT_NOT_FOUND: ::NTSTATUS = 0xC000029Au32 as i32;
-pub const STATUS_POLICY_ONLY_IN_DS: ::NTSTATUS = 0xC000029Bu32 as i32;
-pub const STATUS_VOLUME_NOT_UPGRADED: ::NTSTATUS = 0xC000029Cu32 as i32;
-pub const STATUS_REMOTE_STORAGE_NOT_ACTIVE: ::NTSTATUS = 0xC000029Du32 as i32;
-pub const STATUS_REMOTE_STORAGE_MEDIA_ERROR: ::NTSTATUS = 0xC000029Eu32 as i32;
-pub const STATUS_NO_TRACKING_SERVICE: ::NTSTATUS = 0xC000029Fu32 as i32;
-pub const STATUS_SERVER_SID_MISMATCH: ::NTSTATUS = 0xC00002A0u32 as i32;
-pub const STATUS_DS_NO_ATTRIBUTE_OR_VALUE: ::NTSTATUS = 0xC00002A1u32 as i32;
-pub const STATUS_DS_INVALID_ATTRIBUTE_SYNTAX: ::NTSTATUS = 0xC00002A2u32 as i32;
-pub const STATUS_DS_ATTRIBUTE_TYPE_UNDEFINED: ::NTSTATUS = 0xC00002A3u32 as i32;
-pub const STATUS_DS_ATTRIBUTE_OR_VALUE_EXISTS: ::NTSTATUS = 0xC00002A4u32 as i32;
-pub const STATUS_DS_BUSY: ::NTSTATUS = 0xC00002A5u32 as i32;
-pub const STATUS_DS_UNAVAILABLE: ::NTSTATUS = 0xC00002A6u32 as i32;
-pub const STATUS_DS_NO_RIDS_ALLOCATED: ::NTSTATUS = 0xC00002A7u32 as i32;
-pub const STATUS_DS_NO_MORE_RIDS: ::NTSTATUS = 0xC00002A8u32 as i32;
-pub const STATUS_DS_INCORRECT_ROLE_OWNER: ::NTSTATUS = 0xC00002A9u32 as i32;
-pub const STATUS_DS_RIDMGR_INIT_ERROR: ::NTSTATUS = 0xC00002AAu32 as i32;
-pub const STATUS_DS_OBJ_CLASS_VIOLATION: ::NTSTATUS = 0xC00002ABu32 as i32;
-pub const STATUS_DS_CANT_ON_NON_LEAF: ::NTSTATUS = 0xC00002ACu32 as i32;
-pub const STATUS_DS_CANT_ON_RDN: ::NTSTATUS = 0xC00002ADu32 as i32;
-pub const STATUS_DS_CANT_MOD_OBJ_CLASS: ::NTSTATUS = 0xC00002AEu32 as i32;
-pub const STATUS_DS_CROSS_DOM_MOVE_FAILED: ::NTSTATUS = 0xC00002AFu32 as i32;
-pub const STATUS_DS_GC_NOT_AVAILABLE: ::NTSTATUS = 0xC00002B0u32 as i32;
-pub const STATUS_DIRECTORY_SERVICE_REQUIRED: ::NTSTATUS = 0xC00002B1u32 as i32;
-pub const STATUS_REPARSE_ATTRIBUTE_CONFLICT: ::NTSTATUS = 0xC00002B2u32 as i32;
-pub const STATUS_CANT_ENABLE_DENY_ONLY: ::NTSTATUS = 0xC00002B3u32 as i32;
-pub const STATUS_FLOAT_MULTIPLE_FAULTS: ::NTSTATUS = 0xC00002B4u32 as i32;
-pub const STATUS_FLOAT_MULTIPLE_TRAPS: ::NTSTATUS = 0xC00002B5u32 as i32;
-pub const STATUS_DEVICE_REMOVED: ::NTSTATUS = 0xC00002B6u32 as i32;
-pub const STATUS_JOURNAL_DELETE_IN_PROGRESS: ::NTSTATUS = 0xC00002B7u32 as i32;
-pub const STATUS_JOURNAL_NOT_ACTIVE: ::NTSTATUS = 0xC00002B8u32 as i32;
-pub const STATUS_NOINTERFACE: ::NTSTATUS = 0xC00002B9u32 as i32;
-pub const STATUS_DS_RIDMGR_DISABLED: ::NTSTATUS = 0xC00002BAu32 as i32;
-pub const STATUS_DS_ADMIN_LIMIT_EXCEEDED: ::NTSTATUS = 0xC00002C1u32 as i32;
-pub const STATUS_DRIVER_FAILED_SLEEP: ::NTSTATUS = 0xC00002C2u32 as i32;
-pub const STATUS_MUTUAL_AUTHENTICATION_FAILED: ::NTSTATUS = 0xC00002C3u32 as i32;
-pub const STATUS_CORRUPT_SYSTEM_FILE: ::NTSTATUS = 0xC00002C4u32 as i32;
-pub const STATUS_DATATYPE_MISALIGNMENT_ERROR: ::NTSTATUS = 0xC00002C5u32 as i32;
-pub const STATUS_WMI_READ_ONLY: ::NTSTATUS = 0xC00002C6u32 as i32;
-pub const STATUS_WMI_SET_FAILURE: ::NTSTATUS = 0xC00002C7u32 as i32;
-pub const STATUS_COMMITMENT_MINIMUM: ::NTSTATUS = 0xC00002C8u32 as i32;
-pub const STATUS_REG_NAT_CONSUMPTION: ::NTSTATUS = 0xC00002C9u32 as i32;
-pub const STATUS_TRANSPORT_FULL: ::NTSTATUS = 0xC00002CAu32 as i32;
-pub const STATUS_DS_SAM_INIT_FAILURE: ::NTSTATUS = 0xC00002CBu32 as i32;
-pub const STATUS_ONLY_IF_CONNECTED: ::NTSTATUS = 0xC00002CCu32 as i32;
-pub const STATUS_DS_SENSITIVE_GROUP_VIOLATION: ::NTSTATUS = 0xC00002CDu32 as i32;
-pub const STATUS_PNP_RESTART_ENUMERATION: ::NTSTATUS = 0xC00002CEu32 as i32;
-pub const STATUS_JOURNAL_ENTRY_DELETED: ::NTSTATUS = 0xC00002CFu32 as i32;
-pub const STATUS_DS_CANT_MOD_PRIMARYGROUPID: ::NTSTATUS = 0xC00002D0u32 as i32;
-pub const STATUS_SYSTEM_IMAGE_BAD_SIGNATURE: ::NTSTATUS = 0xC00002D1u32 as i32;
-pub const STATUS_PNP_REBOOT_REQUIRED: ::NTSTATUS = 0xC00002D2u32 as i32;
-pub const STATUS_POWER_STATE_INVALID: ::NTSTATUS = 0xC00002D3u32 as i32;
-pub const STATUS_DS_INVALID_GROUP_TYPE: ::NTSTATUS = 0xC00002D4u32 as i32;
-pub const STATUS_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN: ::NTSTATUS = 0xC00002D5u32 as i32;
-pub const STATUS_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN: ::NTSTATUS = 0xC00002D6u32 as i32;
-pub const STATUS_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER: ::NTSTATUS = 0xC00002D7u32 as i32;
-pub const STATUS_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER: ::NTSTATUS = 0xC00002D8u32 as i32;
-pub const STATUS_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER: ::NTSTATUS = 0xC00002D9u32 as i32;
-pub const STATUS_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER: ::NTSTATUS = 0xC00002DAu32 as i32;
-pub const STATUS_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER: ::NTSTATUS = 0xC00002DBu32 as i32;
-pub const STATUS_DS_HAVE_PRIMARY_MEMBERS: ::NTSTATUS = 0xC00002DCu32 as i32;
-pub const STATUS_WMI_NOT_SUPPORTED: ::NTSTATUS = 0xC00002DDu32 as i32;
-pub const STATUS_INSUFFICIENT_POWER: ::NTSTATUS = 0xC00002DEu32 as i32;
-pub const STATUS_SAM_NEED_BOOTKEY_PASSWORD: ::NTSTATUS = 0xC00002DFu32 as i32;
-pub const STATUS_SAM_NEED_BOOTKEY_FLOPPY: ::NTSTATUS = 0xC00002E0u32 as i32;
-pub const STATUS_DS_CANT_START: ::NTSTATUS = 0xC00002E1u32 as i32;
-pub const STATUS_DS_INIT_FAILURE: ::NTSTATUS = 0xC00002E2u32 as i32;
-pub const STATUS_SAM_INIT_FAILURE: ::NTSTATUS = 0xC00002E3u32 as i32;
-pub const STATUS_DS_GC_REQUIRED: ::NTSTATUS = 0xC00002E4u32 as i32;
-pub const STATUS_DS_LOCAL_MEMBER_OF_LOCAL_ONLY: ::NTSTATUS = 0xC00002E5u32 as i32;
-pub const STATUS_DS_NO_FPO_IN_UNIVERSAL_GROUPS: ::NTSTATUS = 0xC00002E6u32 as i32;
-pub const STATUS_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED: ::NTSTATUS = 0xC00002E7u32 as i32;
-pub const STATUS_MULTIPLE_FAULT_VIOLATION: ::NTSTATUS = 0xC00002E8u32 as i32;
-pub const STATUS_CURRENT_DOMAIN_NOT_ALLOWED: ::NTSTATUS = 0xC00002E9u32 as i32;
-pub const STATUS_CANNOT_MAKE: ::NTSTATUS = 0xC00002EAu32 as i32;
-pub const STATUS_SYSTEM_SHUTDOWN: ::NTSTATUS = 0xC00002EBu32 as i32;
-pub const STATUS_DS_INIT_FAILURE_CONSOLE: ::NTSTATUS = 0xC00002ECu32 as i32;
-pub const STATUS_DS_SAM_INIT_FAILURE_CONSOLE: ::NTSTATUS = 0xC00002EDu32 as i32;
-pub const STATUS_UNFINISHED_CONTEXT_DELETED: ::NTSTATUS = 0xC00002EEu32 as i32;
-pub const STATUS_NO_TGT_REPLY: ::NTSTATUS = 0xC00002EFu32 as i32;
-pub const STATUS_OBJECTID_NOT_FOUND: ::NTSTATUS = 0xC00002F0u32 as i32;
-pub const STATUS_NO_IP_ADDRESSES: ::NTSTATUS = 0xC00002F1u32 as i32;
-pub const STATUS_WRONG_CREDENTIAL_HANDLE: ::NTSTATUS = 0xC00002F2u32 as i32;
-pub const STATUS_CRYPTO_SYSTEM_INVALID: ::NTSTATUS = 0xC00002F3u32 as i32;
-pub const STATUS_MAX_REFERRALS_EXCEEDED: ::NTSTATUS = 0xC00002F4u32 as i32;
-pub const STATUS_MUST_BE_KDC: ::NTSTATUS = 0xC00002F5u32 as i32;
-pub const STATUS_STRONG_CRYPTO_NOT_SUPPORTED: ::NTSTATUS = 0xC00002F6u32 as i32;
-pub const STATUS_TOO_MANY_PRINCIPALS: ::NTSTATUS = 0xC00002F7u32 as i32;
-pub const STATUS_NO_PA_DATA: ::NTSTATUS = 0xC00002F8u32 as i32;
-pub const STATUS_PKINIT_NAME_MISMATCH: ::NTSTATUS = 0xC00002F9u32 as i32;
-pub const STATUS_SMARTCARD_LOGON_REQUIRED: ::NTSTATUS = 0xC00002FAu32 as i32;
-pub const STATUS_KDC_INVALID_REQUEST: ::NTSTATUS = 0xC00002FBu32 as i32;
-pub const STATUS_KDC_UNABLE_TO_REFER: ::NTSTATUS = 0xC00002FCu32 as i32;
-pub const STATUS_KDC_UNKNOWN_ETYPE: ::NTSTATUS = 0xC00002FDu32 as i32;
-pub const STATUS_SHUTDOWN_IN_PROGRESS: ::NTSTATUS = 0xC00002FEu32 as i32;
-pub const STATUS_SERVER_SHUTDOWN_IN_PROGRESS: ::NTSTATUS = 0xC00002FFu32 as i32;
-pub const STATUS_NOT_SUPPORTED_ON_SBS: ::NTSTATUS = 0xC0000300u32 as i32;
-pub const STATUS_WMI_GUID_DISCONNECTED: ::NTSTATUS = 0xC0000301u32 as i32;
-pub const STATUS_WMI_ALREADY_DISABLED: ::NTSTATUS = 0xC0000302u32 as i32;
-pub const STATUS_WMI_ALREADY_ENABLED: ::NTSTATUS = 0xC0000303u32 as i32;
-pub const STATUS_MFT_TOO_FRAGMENTED: ::NTSTATUS = 0xC0000304u32 as i32;
-pub const STATUS_COPY_PROTECTION_FAILURE: ::NTSTATUS = 0xC0000305u32 as i32;
-pub const STATUS_CSS_AUTHENTICATION_FAILURE: ::NTSTATUS = 0xC0000306u32 as i32;
-pub const STATUS_CSS_KEY_NOT_PRESENT: ::NTSTATUS = 0xC0000307u32 as i32;
-pub const STATUS_CSS_KEY_NOT_ESTABLISHED: ::NTSTATUS = 0xC0000308u32 as i32;
-pub const STATUS_CSS_SCRAMBLED_SECTOR: ::NTSTATUS = 0xC0000309u32 as i32;
-pub const STATUS_CSS_REGION_MISMATCH: ::NTSTATUS = 0xC000030Au32 as i32;
-pub const STATUS_CSS_RESETS_EXHAUSTED: ::NTSTATUS = 0xC000030Bu32 as i32;
-pub const STATUS_PASSWORD_CHANGE_REQUIRED: ::NTSTATUS = 0xC000030Cu32 as i32;
-pub const STATUS_PKINIT_FAILURE: ::NTSTATUS = 0xC0000320u32 as i32;
-pub const STATUS_SMARTCARD_SUBSYSTEM_FAILURE: ::NTSTATUS = 0xC0000321u32 as i32;
-pub const STATUS_NO_KERB_KEY: ::NTSTATUS = 0xC0000322u32 as i32;
-pub const STATUS_HOST_DOWN: ::NTSTATUS = 0xC0000350u32 as i32;
-pub const STATUS_UNSUPPORTED_PREAUTH: ::NTSTATUS = 0xC0000351u32 as i32;
-pub const STATUS_EFS_ALG_BLOB_TOO_BIG: ::NTSTATUS = 0xC0000352u32 as i32;
-pub const STATUS_PORT_NOT_SET: ::NTSTATUS = 0xC0000353u32 as i32;
-pub const STATUS_DEBUGGER_INACTIVE: ::NTSTATUS = 0xC0000354u32 as i32;
-pub const STATUS_DS_VERSION_CHECK_FAILURE: ::NTSTATUS = 0xC0000355u32 as i32;
-pub const STATUS_AUDITING_DISABLED: ::NTSTATUS = 0xC0000356u32 as i32;
-pub const STATUS_PRENT4_MACHINE_ACCOUNT: ::NTSTATUS = 0xC0000357u32 as i32;
-pub const STATUS_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER: ::NTSTATUS = 0xC0000358u32 as i32;
-pub const STATUS_INVALID_IMAGE_WIN_32: ::NTSTATUS = 0xC0000359u32 as i32;
-pub const STATUS_INVALID_IMAGE_WIN_64: ::NTSTATUS = 0xC000035Au32 as i32;
-pub const STATUS_BAD_BINDINGS: ::NTSTATUS = 0xC000035Bu32 as i32;
-pub const STATUS_NETWORK_SESSION_EXPIRED: ::NTSTATUS = 0xC000035Cu32 as i32;
-pub const STATUS_APPHELP_BLOCK: ::NTSTATUS = 0xC000035Du32 as i32;
-pub const STATUS_ALL_SIDS_FILTERED: ::NTSTATUS = 0xC000035Eu32 as i32;
-pub const STATUS_NOT_SAFE_MODE_DRIVER: ::NTSTATUS = 0xC000035Fu32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_DEFAULT: ::NTSTATUS = 0xC0000361u32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_PATH: ::NTSTATUS = 0xC0000362u32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_PUBLISHER: ::NTSTATUS = 0xC0000363u32 as i32;
-pub const STATUS_ACCESS_DISABLED_BY_POLICY_OTHER: ::NTSTATUS = 0xC0000364u32 as i32;
-pub const STATUS_FAILED_DRIVER_ENTRY: ::NTSTATUS = 0xC0000365u32 as i32;
-pub const STATUS_DEVICE_ENUMERATION_ERROR: ::NTSTATUS = 0xC0000366u32 as i32;
-pub const STATUS_MOUNT_POINT_NOT_RESOLVED: ::NTSTATUS = 0xC0000368u32 as i32;
-pub const STATUS_INVALID_DEVICE_OBJECT_PARAMETER: ::NTSTATUS = 0xC0000369u32 as i32;
-pub const STATUS_MCA_OCCURED: ::NTSTATUS = 0xC000036Au32 as i32;
-pub const STATUS_DRIVER_BLOCKED_CRITICAL: ::NTSTATUS = 0xC000036Bu32 as i32;
-pub const STATUS_DRIVER_BLOCKED: ::NTSTATUS = 0xC000036Cu32 as i32;
-pub const STATUS_DRIVER_DATABASE_ERROR: ::NTSTATUS = 0xC000036Du32 as i32;
-pub const STATUS_SYSTEM_HIVE_TOO_LARGE: ::NTSTATUS = 0xC000036Eu32 as i32;
-pub const STATUS_INVALID_IMPORT_OF_NON_DLL: ::NTSTATUS = 0xC000036Fu32 as i32;
-pub const STATUS_DS_SHUTTING_DOWN: ::NTSTATUS = 0x40000370;
-pub const STATUS_NO_SECRETS: ::NTSTATUS = 0xC0000371u32 as i32;
-pub const STATUS_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY: ::NTSTATUS = 0xC0000372u32 as i32;
-pub const STATUS_FAILED_STACK_SWITCH: ::NTSTATUS = 0xC0000373u32 as i32;
-pub const STATUS_HEAP_CORRUPTION: ::NTSTATUS = 0xC0000374u32 as i32;
-pub const STATUS_SMARTCARD_WRONG_PIN: ::NTSTATUS = 0xC0000380u32 as i32;
-pub const STATUS_SMARTCARD_CARD_BLOCKED: ::NTSTATUS = 0xC0000381u32 as i32;
-pub const STATUS_SMARTCARD_CARD_NOT_AUTHENTICATED: ::NTSTATUS = 0xC0000382u32 as i32;
-pub const STATUS_SMARTCARD_NO_CARD: ::NTSTATUS = 0xC0000383u32 as i32;
-pub const STATUS_SMARTCARD_NO_KEY_CONTAINER: ::NTSTATUS = 0xC0000384u32 as i32;
-pub const STATUS_SMARTCARD_NO_CERTIFICATE: ::NTSTATUS = 0xC0000385u32 as i32;
-pub const STATUS_SMARTCARD_NO_KEYSET: ::NTSTATUS = 0xC0000386u32 as i32;
-pub const STATUS_SMARTCARD_IO_ERROR: ::NTSTATUS = 0xC0000387u32 as i32;
-pub const STATUS_DOWNGRADE_DETECTED: ::NTSTATUS = 0xC0000388u32 as i32;
-pub const STATUS_SMARTCARD_CERT_REVOKED: ::NTSTATUS = 0xC0000389u32 as i32;
-pub const STATUS_ISSUING_CA_UNTRUSTED: ::NTSTATUS = 0xC000038Au32 as i32;
-pub const STATUS_REVOCATION_OFFLINE_C: ::NTSTATUS = 0xC000038Bu32 as i32;
-pub const STATUS_PKINIT_CLIENT_FAILURE: ::NTSTATUS = 0xC000038Cu32 as i32;
-pub const STATUS_SMARTCARD_CERT_EXPIRED: ::NTSTATUS = 0xC000038Du32 as i32;
-pub const STATUS_DRIVER_FAILED_PRIOR_UNLOAD: ::NTSTATUS = 0xC000038Eu32 as i32;
-pub const STATUS_SMARTCARD_SILENT_CONTEXT: ::NTSTATUS = 0xC000038Fu32 as i32;
-pub const STATUS_PER_USER_TRUST_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000401u32 as i32;
-pub const STATUS_ALL_USER_TRUST_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000402u32 as i32;
-pub const STATUS_USER_DELETE_TRUST_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000403u32 as i32;
-pub const STATUS_DS_NAME_NOT_UNIQUE: ::NTSTATUS = 0xC0000404u32 as i32;
-pub const STATUS_DS_DUPLICATE_ID_FOUND: ::NTSTATUS = 0xC0000405u32 as i32;
-pub const STATUS_DS_GROUP_CONVERSION_ERROR: ::NTSTATUS = 0xC0000406u32 as i32;
-pub const STATUS_VOLSNAP_PREPARE_HIBERNATE: ::NTSTATUS = 0xC0000407u32 as i32;
-pub const STATUS_USER2USER_REQUIRED: ::NTSTATUS = 0xC0000408u32 as i32;
-pub const STATUS_STACK_BUFFER_OVERRUN: ::NTSTATUS = 0xC0000409u32 as i32;
-pub const STATUS_NO_S4U_PROT_SUPPORT: ::NTSTATUS = 0xC000040Au32 as i32;
-pub const STATUS_CROSSREALM_DELEGATION_FAILURE: ::NTSTATUS = 0xC000040Bu32 as i32;
-pub const STATUS_REVOCATION_OFFLINE_KDC: ::NTSTATUS = 0xC000040Cu32 as i32;
-pub const STATUS_ISSUING_CA_UNTRUSTED_KDC: ::NTSTATUS = 0xC000040Du32 as i32;
-pub const STATUS_KDC_CERT_EXPIRED: ::NTSTATUS = 0xC000040Eu32 as i32;
-pub const STATUS_KDC_CERT_REVOKED: ::NTSTATUS = 0xC000040Fu32 as i32;
-pub const STATUS_PARAMETER_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000410u32 as i32;
-pub const STATUS_HIBERNATION_FAILURE: ::NTSTATUS = 0xC0000411u32 as i32;
-pub const STATUS_DELAY_LOAD_FAILED: ::NTSTATUS = 0xC0000412u32 as i32;
-pub const STATUS_AUTHENTICATION_FIREWALL_FAILED: ::NTSTATUS = 0xC0000413u32 as i32;
-pub const STATUS_VDM_DISALLOWED: ::NTSTATUS = 0xC0000414u32 as i32;
-pub const STATUS_HUNG_DISPLAY_DRIVER_THREAD: ::NTSTATUS = 0xC0000415u32 as i32;
-pub const STATUS_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE: ::NTSTATUS = 0xC0000416u32 as i32;
-pub const STATUS_INVALID_CRUNTIME_PARAMETER: ::NTSTATUS = 0xC0000417u32 as i32;
-pub const STATUS_NTLM_BLOCKED: ::NTSTATUS = 0xC0000418u32 as i32;
-pub const STATUS_DS_SRC_SID_EXISTS_IN_FOREST: ::NTSTATUS = 0xC0000419u32 as i32;
-pub const STATUS_DS_DOMAIN_NAME_EXISTS_IN_FOREST: ::NTSTATUS = 0xC000041Au32 as i32;
-pub const STATUS_DS_FLAT_NAME_EXISTS_IN_FOREST: ::NTSTATUS = 0xC000041Bu32 as i32;
-pub const STATUS_INVALID_USER_PRINCIPAL_NAME: ::NTSTATUS = 0xC000041Cu32 as i32;
-pub const STATUS_FATAL_USER_CALLBACK_EXCEPTION: ::NTSTATUS = 0xC000041Du32 as i32;
-pub const STATUS_ASSERTION_FAILURE: ::NTSTATUS = 0xC0000420u32 as i32;
-pub const STATUS_VERIFIER_STOP: ::NTSTATUS = 0xC0000421u32 as i32;
-pub const STATUS_CALLBACK_POP_STACK: ::NTSTATUS = 0xC0000423u32 as i32;
-pub const STATUS_INCOMPATIBLE_DRIVER_BLOCKED: ::NTSTATUS = 0xC0000424u32 as i32;
-pub const STATUS_HIVE_UNLOADED: ::NTSTATUS = 0xC0000425u32 as i32;
-pub const STATUS_COMPRESSION_DISABLED: ::NTSTATUS = 0xC0000426u32 as i32;
-pub const STATUS_FILE_SYSTEM_LIMITATION: ::NTSTATUS = 0xC0000427u32 as i32;
-pub const STATUS_INVALID_IMAGE_HASH: ::NTSTATUS = 0xC0000428u32 as i32;
-pub const STATUS_NOT_CAPABLE: ::NTSTATUS = 0xC0000429u32 as i32;
-pub const STATUS_REQUEST_OUT_OF_SEQUENCE: ::NTSTATUS = 0xC000042Au32 as i32;
-pub const STATUS_IMPLEMENTATION_LIMIT: ::NTSTATUS = 0xC000042Bu32 as i32;
-pub const STATUS_ELEVATION_REQUIRED: ::NTSTATUS = 0xC000042Cu32 as i32;
-pub const STATUS_NO_SECURITY_CONTEXT: ::NTSTATUS = 0xC000042Du32 as i32;
-pub const STATUS_PKU2U_CERT_FAILURE: ::NTSTATUS = 0xC000042Fu32 as i32;
-pub const STATUS_BEYOND_VDL: ::NTSTATUS = 0xC0000432u32 as i32;
-pub const STATUS_ENCOUNTERED_WRITE_IN_PROGRESS: ::NTSTATUS = 0xC0000433u32 as i32;
-pub const STATUS_PTE_CHANGED: ::NTSTATUS = 0xC0000434u32 as i32;
-pub const STATUS_PURGE_FAILED: ::NTSTATUS = 0xC0000435u32 as i32;
-pub const STATUS_CRED_REQUIRES_CONFIRMATION: ::NTSTATUS = 0xC0000440u32 as i32;
-pub const STATUS_CS_ENCRYPTION_INVALID_SERVER_RESPONSE: ::NTSTATUS = 0xC0000441u32 as i32;
-pub const STATUS_CS_ENCRYPTION_UNSUPPORTED_SERVER: ::NTSTATUS = 0xC0000442u32 as i32;
-pub const STATUS_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE: ::NTSTATUS = 0xC0000443u32 as i32;
-pub const STATUS_CS_ENCRYPTION_NEW_ENCRYPTED_FILE: ::NTSTATUS = 0xC0000444u32 as i32;
-pub const STATUS_CS_ENCRYPTION_FILE_NOT_CSE: ::NTSTATUS = 0xC0000445u32 as i32;
-pub const STATUS_INVALID_LABEL: ::NTSTATUS = 0xC0000446u32 as i32;
-pub const STATUS_DRIVER_PROCESS_TERMINATED: ::NTSTATUS = 0xC0000450u32 as i32;
-pub const STATUS_AMBIGUOUS_SYSTEM_DEVICE: ::NTSTATUS = 0xC0000451u32 as i32;
-pub const STATUS_SYSTEM_DEVICE_NOT_FOUND: ::NTSTATUS = 0xC0000452u32 as i32;
-pub const STATUS_RESTART_BOOT_APPLICATION: ::NTSTATUS = 0xC0000453u32 as i32;
-pub const STATUS_INSUFFICIENT_NVRAM_RESOURCES: ::NTSTATUS = 0xC0000454u32 as i32;
-pub const STATUS_INVALID_SESSION: ::NTSTATUS = 0xC0000455u32 as i32;
-pub const STATUS_THREAD_ALREADY_IN_SESSION: ::NTSTATUS = 0xC0000456u32 as i32;
-pub const STATUS_THREAD_NOT_IN_SESSION: ::NTSTATUS = 0xC0000457u32 as i32;
-pub const STATUS_INVALID_WEIGHT: ::NTSTATUS = 0xC0000458u32 as i32;
-pub const STATUS_REQUEST_PAUSED: ::NTSTATUS = 0xC0000459u32 as i32;
-pub const STATUS_NO_RANGES_PROCESSED: ::NTSTATUS = 0xC0000460u32 as i32;
-pub const STATUS_DISK_RESOURCES_EXHAUSTED: ::NTSTATUS = 0xC0000461u32 as i32;
-pub const STATUS_NEEDS_REMEDIATION: ::NTSTATUS = 0xC0000462u32 as i32;
-pub const STATUS_DEVICE_FEATURE_NOT_SUPPORTED: ::NTSTATUS = 0xC0000463u32 as i32;
-pub const STATUS_DEVICE_UNREACHABLE: ::NTSTATUS = 0xC0000464u32 as i32;
-pub const STATUS_INVALID_TOKEN: ::NTSTATUS = 0xC0000465u32 as i32;
-pub const STATUS_SERVER_UNAVAILABLE: ::NTSTATUS = 0xC0000466u32 as i32;
-pub const STATUS_FILE_NOT_AVAILABLE: ::NTSTATUS = 0xC0000467u32 as i32;
-pub const STATUS_DEVICE_INSUFFICIENT_RESOURCES: ::NTSTATUS = 0xC0000468u32 as i32;
-pub const STATUS_PACKAGE_UPDATING: ::NTSTATUS = 0xC0000469u32 as i32;
-pub const STATUS_NOT_READ_FROM_COPY: ::NTSTATUS = 0xC000046Au32 as i32;
-pub const STATUS_FT_WRITE_FAILURE: ::NTSTATUS = 0xC000046Bu32 as i32;
-pub const STATUS_FT_DI_SCAN_REQUIRED: ::NTSTATUS = 0xC000046Cu32 as i32;
-pub const STATUS_OBJECT_NOT_EXTERNALLY_BACKED: ::NTSTATUS = 0xC000046Du32 as i32;
-pub const STATUS_EXTERNAL_BACKING_PROVIDER_UNKNOWN: ::NTSTATUS = 0xC000046Eu32 as i32;
-pub const STATUS_COMPRESSION_NOT_BENEFICIAL: ::NTSTATUS = 0xC000046Fu32 as i32;
-pub const STATUS_DATA_CHECKSUM_ERROR: ::NTSTATUS = 0xC0000470u32 as i32;
-pub const STATUS_INTERMIXED_KERNEL_EA_OPERATION: ::NTSTATUS = 0xC0000471u32 as i32;
-pub const STATUS_TRIM_READ_ZERO_NOT_SUPPORTED: ::NTSTATUS = 0xC0000472u32 as i32;
-pub const STATUS_TOO_MANY_SEGMENT_DESCRIPTORS: ::NTSTATUS = 0xC0000473u32 as i32;
-pub const STATUS_INVALID_OFFSET_ALIGNMENT: ::NTSTATUS = 0xC0000474u32 as i32;
-pub const STATUS_INVALID_FIELD_IN_PARAMETER_LIST: ::NTSTATUS = 0xC0000475u32 as i32;
-pub const STATUS_OPERATION_IN_PROGRESS: ::NTSTATUS = 0xC0000476u32 as i32;
-pub const STATUS_INVALID_INITIATOR_TARGET_PATH: ::NTSTATUS = 0xC0000477u32 as i32;
-pub const STATUS_SCRUB_DATA_DISABLED: ::NTSTATUS = 0xC0000478u32 as i32;
-pub const STATUS_NOT_REDUNDANT_STORAGE: ::NTSTATUS = 0xC0000479u32 as i32;
-pub const STATUS_RESIDENT_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000047Au32 as i32;
-pub const STATUS_COMPRESSED_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000047Bu32 as i32;
-pub const STATUS_DIRECTORY_NOT_SUPPORTED: ::NTSTATUS = 0xC000047Cu32 as i32;
-pub const STATUS_IO_OPERATION_TIMEOUT: ::NTSTATUS = 0xC000047Du32 as i32;
-pub const STATUS_SYSTEM_NEEDS_REMEDIATION: ::NTSTATUS = 0xC000047Eu32 as i32;
-pub const STATUS_APPX_INTEGRITY_FAILURE_CLR_NGEN: ::NTSTATUS = 0xC000047Fu32 as i32;
-pub const STATUS_SHARE_UNAVAILABLE: ::NTSTATUS = 0xC0000480u32 as i32;
-pub const STATUS_APISET_NOT_HOSTED: ::NTSTATUS = 0xC0000481u32 as i32;
-pub const STATUS_APISET_NOT_PRESENT: ::NTSTATUS = 0xC0000482u32 as i32;
-pub const STATUS_DEVICE_HARDWARE_ERROR: ::NTSTATUS = 0xC0000483u32 as i32;
-pub const STATUS_FIRMWARE_SLOT_INVALID: ::NTSTATUS = 0xC0000484u32 as i32;
-pub const STATUS_FIRMWARE_IMAGE_INVALID: ::NTSTATUS = 0xC0000485u32 as i32;
-pub const STATUS_STORAGE_TOPOLOGY_ID_MISMATCH: ::NTSTATUS = 0xC0000486u32 as i32;
-pub const STATUS_WIM_NOT_BOOTABLE: ::NTSTATUS = 0xC0000487u32 as i32;
-pub const STATUS_BLOCKED_BY_PARENTAL_CONTROLS: ::NTSTATUS = 0xC0000488u32 as i32;
-pub const STATUS_NEEDS_REGISTRATION: ::NTSTATUS = 0xC0000489u32 as i32;
-pub const STATUS_QUOTA_ACTIVITY: ::NTSTATUS = 0xC000048Au32 as i32;
-pub const STATUS_INVALID_TASK_NAME: ::NTSTATUS = 0xC0000500u32 as i32;
-pub const STATUS_INVALID_TASK_INDEX: ::NTSTATUS = 0xC0000501u32 as i32;
-pub const STATUS_THREAD_ALREADY_IN_TASK: ::NTSTATUS = 0xC0000502u32 as i32;
-pub const STATUS_CALLBACK_BYPASS: ::NTSTATUS = 0xC0000503u32 as i32;
-pub const STATUS_UNDEFINED_SCOPE: ::NTSTATUS = 0xC0000504u32 as i32;
-pub const STATUS_INVALID_CAP: ::NTSTATUS = 0xC0000505u32 as i32;
-pub const STATUS_NOT_GUI_PROCESS: ::NTSTATUS = 0xC0000506u32 as i32;
-pub const STATUS_DEVICE_HUNG: ::NTSTATUS = 0xC0000507u32 as i32;
-pub const STATUS_FAIL_FAST_EXCEPTION: ::NTSTATUS = 0xC0000602u32 as i32;
-pub const STATUS_IMAGE_CERT_REVOKED: ::NTSTATUS = 0xC0000603u32 as i32;
-pub const STATUS_DYNAMIC_CODE_BLOCKED: ::NTSTATUS = 0xC0000604u32 as i32;
-pub const STATUS_IMAGE_CERT_EXPIRED: ::NTSTATUS = 0xC0000605u32 as i32;
-pub const STATUS_PORT_CLOSED: ::NTSTATUS = 0xC0000700u32 as i32;
-pub const STATUS_MESSAGE_LOST: ::NTSTATUS = 0xC0000701u32 as i32;
-pub const STATUS_INVALID_MESSAGE: ::NTSTATUS = 0xC0000702u32 as i32;
-pub const STATUS_REQUEST_CANCELED: ::NTSTATUS = 0xC0000703u32 as i32;
-pub const STATUS_RECURSIVE_DISPATCH: ::NTSTATUS = 0xC0000704u32 as i32;
-pub const STATUS_LPC_RECEIVE_BUFFER_EXPECTED: ::NTSTATUS = 0xC0000705u32 as i32;
-pub const STATUS_LPC_INVALID_CONNECTION_USAGE: ::NTSTATUS = 0xC0000706u32 as i32;
-pub const STATUS_LPC_REQUESTS_NOT_ALLOWED: ::NTSTATUS = 0xC0000707u32 as i32;
-pub const STATUS_RESOURCE_IN_USE: ::NTSTATUS = 0xC0000708u32 as i32;
-pub const STATUS_HARDWARE_MEMORY_ERROR: ::NTSTATUS = 0xC0000709u32 as i32;
-pub const STATUS_THREADPOOL_HANDLE_EXCEPTION: ::NTSTATUS = 0xC000070Au32 as i32;
-pub const STATUS_THREADPOOL_SET_EVENT_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Bu32 as i32;
-pub const STATUS_THREADPOOL_RELEASE_SEMAPHORE_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Cu32 as i32;
-pub const STATUS_THREADPOOL_RELEASE_MUTEX_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Du32 as i32;
-pub const STATUS_THREADPOOL_FREE_LIBRARY_ON_COMPLETION_FAILED: ::NTSTATUS = 0xC000070Eu32 as i32;
-pub const STATUS_THREADPOOL_RELEASED_DURING_OPERATION: ::NTSTATUS = 0xC000070Fu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_WHILE_IMPERSONATING: ::NTSTATUS = 0xC0000710u32 as i32;
-pub const STATUS_APC_RETURNED_WHILE_IMPERSONATING: ::NTSTATUS = 0xC0000711u32 as i32;
-pub const STATUS_PROCESS_IS_PROTECTED: ::NTSTATUS = 0xC0000712u32 as i32;
-pub const STATUS_MCA_EXCEPTION: ::NTSTATUS = 0xC0000713u32 as i32;
-pub const STATUS_CERTIFICATE_MAPPING_NOT_UNIQUE: ::NTSTATUS = 0xC0000714u32 as i32;
-pub const STATUS_SYMLINK_CLASS_DISABLED: ::NTSTATUS = 0xC0000715u32 as i32;
-pub const STATUS_INVALID_IDN_NORMALIZATION: ::NTSTATUS = 0xC0000716u32 as i32;
-pub const STATUS_NO_UNICODE_TRANSLATION: ::NTSTATUS = 0xC0000717u32 as i32;
-pub const STATUS_ALREADY_REGISTERED: ::NTSTATUS = 0xC0000718u32 as i32;
-pub const STATUS_CONTEXT_MISMATCH: ::NTSTATUS = 0xC0000719u32 as i32;
-pub const STATUS_PORT_ALREADY_HAS_COMPLETION_LIST: ::NTSTATUS = 0xC000071Au32 as i32;
-pub const STATUS_CALLBACK_RETURNED_THREAD_PRIORITY: ::NTSTATUS = 0xC000071Bu32 as i32;
-pub const STATUS_INVALID_THREAD: ::NTSTATUS = 0xC000071Cu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_TRANSACTION: ::NTSTATUS = 0xC000071Du32 as i32;
-pub const STATUS_CALLBACK_RETURNED_LDR_LOCK: ::NTSTATUS = 0xC000071Eu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_LANG: ::NTSTATUS = 0xC000071Fu32 as i32;
-pub const STATUS_CALLBACK_RETURNED_PRI_BACK: ::NTSTATUS = 0xC0000720u32 as i32;
-pub const STATUS_CALLBACK_RETURNED_THREAD_AFFINITY: ::NTSTATUS = 0xC0000721u32 as i32;
-pub const STATUS_DISK_REPAIR_DISABLED: ::NTSTATUS = 0xC0000800u32 as i32;
-pub const STATUS_DS_DOMAIN_RENAME_IN_PROGRESS: ::NTSTATUS = 0xC0000801u32 as i32;
-pub const STATUS_DISK_QUOTA_EXCEEDED: ::NTSTATUS = 0xC0000802u32 as i32;
-pub const STATUS_DATA_LOST_REPAIR: ::NTSTATUS = 0x80000803u32 as i32;
-pub const STATUS_CONTENT_BLOCKED: ::NTSTATUS = 0xC0000804u32 as i32;
-pub const STATUS_BAD_CLUSTERS: ::NTSTATUS = 0xC0000805u32 as i32;
-pub const STATUS_VOLUME_DIRTY: ::NTSTATUS = 0xC0000806u32 as i32;
-pub const STATUS_DISK_REPAIR_REDIRECTED: ::NTSTATUS = 0x40000807;
-pub const STATUS_DISK_REPAIR_UNSUCCESSFUL: ::NTSTATUS = 0xC0000808u32 as i32;
-pub const STATUS_CORRUPT_LOG_OVERFULL: ::NTSTATUS = 0xC0000809u32 as i32;
-pub const STATUS_CORRUPT_LOG_CORRUPTED: ::NTSTATUS = 0xC000080Au32 as i32;
-pub const STATUS_CORRUPT_LOG_UNAVAILABLE: ::NTSTATUS = 0xC000080Bu32 as i32;
-pub const STATUS_CORRUPT_LOG_DELETED_FULL: ::NTSTATUS = 0xC000080Cu32 as i32;
-pub const STATUS_CORRUPT_LOG_CLEARED: ::NTSTATUS = 0xC000080Du32 as i32;
-pub const STATUS_ORPHAN_NAME_EXHAUSTED: ::NTSTATUS = 0xC000080Eu32 as i32;
-pub const STATUS_PROACTIVE_SCAN_IN_PROGRESS: ::NTSTATUS = 0xC000080Fu32 as i32;
-pub const STATUS_ENCRYPTED_IO_NOT_POSSIBLE: ::NTSTATUS = 0xC0000810u32 as i32;
-pub const STATUS_CORRUPT_LOG_UPLEVEL_RECORDS: ::NTSTATUS = 0xC0000811u32 as i32;
-pub const STATUS_FILE_CHECKED_OUT: ::NTSTATUS = 0xC0000901u32 as i32;
-pub const STATUS_CHECKOUT_REQUIRED: ::NTSTATUS = 0xC0000902u32 as i32;
-pub const STATUS_BAD_FILE_TYPE: ::NTSTATUS = 0xC0000903u32 as i32;
-pub const STATUS_FILE_TOO_LARGE: ::NTSTATUS = 0xC0000904u32 as i32;
-pub const STATUS_FORMS_AUTH_REQUIRED: ::NTSTATUS = 0xC0000905u32 as i32;
-pub const STATUS_VIRUS_INFECTED: ::NTSTATUS = 0xC0000906u32 as i32;
-pub const STATUS_VIRUS_DELETED: ::NTSTATUS = 0xC0000907u32 as i32;
-pub const STATUS_BAD_MCFG_TABLE: ::NTSTATUS = 0xC0000908u32 as i32;
-pub const STATUS_CANNOT_BREAK_OPLOCK: ::NTSTATUS = 0xC0000909u32 as i32;
-pub const STATUS_BAD_KEY: ::NTSTATUS = 0xC000090Au32 as i32;
-pub const STATUS_BAD_DATA: ::NTSTATUS = 0xC000090Bu32 as i32;
-pub const STATUS_NO_KEY: ::NTSTATUS = 0xC000090Cu32 as i32;
-pub const STATUS_FILE_HANDLE_REVOKED: ::NTSTATUS = 0xC0000910u32 as i32;
-pub const STATUS_WOW_ASSERTION: ::NTSTATUS = 0xC0009898u32 as i32;
-pub const STATUS_INVALID_SIGNATURE: ::NTSTATUS = 0xC000A000u32 as i32;
-pub const STATUS_HMAC_NOT_SUPPORTED: ::NTSTATUS = 0xC000A001u32 as i32;
-pub const STATUS_AUTH_TAG_MISMATCH: ::NTSTATUS = 0xC000A002u32 as i32;
-pub const STATUS_INVALID_STATE_TRANSITION: ::NTSTATUS = 0xC000A003u32 as i32;
-pub const STATUS_INVALID_KERNEL_INFO_VERSION: ::NTSTATUS = 0xC000A004u32 as i32;
-pub const STATUS_INVALID_PEP_INFO_VERSION: ::NTSTATUS = 0xC000A005u32 as i32;
-pub const STATUS_HANDLE_REVOKED: ::NTSTATUS = 0xC000A006u32 as i32;
-pub const STATUS_IPSEC_QUEUE_OVERFLOW: ::NTSTATUS = 0xC000A010u32 as i32;
-pub const STATUS_ND_QUEUE_OVERFLOW: ::NTSTATUS = 0xC000A011u32 as i32;
-pub const STATUS_HOPLIMIT_EXCEEDED: ::NTSTATUS = 0xC000A012u32 as i32;
-pub const STATUS_PROTOCOL_NOT_SUPPORTED: ::NTSTATUS = 0xC000A013u32 as i32;
-pub const STATUS_FASTPATH_REJECTED: ::NTSTATUS = 0xC000A014u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED: ::NTSTATUS = 0xC000A080u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR: ::NTSTATUS = 0xC000A081u32 as i32;
-pub const STATUS_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR: ::NTSTATUS = 0xC000A082u32 as i32;
-pub const STATUS_XML_PARSE_ERROR: ::NTSTATUS = 0xC000A083u32 as i32;
-pub const STATUS_XMLDSIG_ERROR: ::NTSTATUS = 0xC000A084u32 as i32;
-pub const STATUS_WRONG_COMPARTMENT: ::NTSTATUS = 0xC000A085u32 as i32;
-pub const STATUS_AUTHIP_FAILURE: ::NTSTATUS = 0xC000A086u32 as i32;
-pub const STATUS_DS_OID_MAPPED_GROUP_CANT_HAVE_MEMBERS: ::NTSTATUS = 0xC000A087u32 as i32;
-pub const STATUS_DS_OID_NOT_FOUND: ::NTSTATUS = 0xC000A088u32 as i32;
-pub const STATUS_INCORRECT_ACCOUNT_TYPE: ::NTSTATUS = 0xC000A089u32 as i32;
-pub const STATUS_HASH_NOT_SUPPORTED: ::NTSTATUS = 0xC000A100u32 as i32;
-pub const STATUS_HASH_NOT_PRESENT: ::NTSTATUS = 0xC000A101u32 as i32;
-pub const STATUS_SECONDARY_IC_PROVIDER_NOT_REGISTERED: ::NTSTATUS = 0xC000A121u32 as i32;
-pub const STATUS_GPIO_CLIENT_INFORMATION_INVALID: ::NTSTATUS = 0xC000A122u32 as i32;
-pub const STATUS_GPIO_VERSION_NOT_SUPPORTED: ::NTSTATUS = 0xC000A123u32 as i32;
-pub const STATUS_GPIO_INVALID_REGISTRATION_PACKET: ::NTSTATUS = 0xC000A124u32 as i32;
-pub const STATUS_GPIO_OPERATION_DENIED: ::NTSTATUS = 0xC000A125u32 as i32;
-pub const STATUS_GPIO_INCOMPATIBLE_CONNECT_MODE: ::NTSTATUS = 0xC000A126u32 as i32;
-pub const STATUS_GPIO_INTERRUPT_ALREADY_UNMASKED: ::NTSTATUS = 0x8000A127u32 as i32;
-pub const STATUS_CANNOT_SWITCH_RUNLEVEL: ::NTSTATUS = 0xC000A141u32 as i32;
-pub const STATUS_INVALID_RUNLEVEL_SETTING: ::NTSTATUS = 0xC000A142u32 as i32;
-pub const STATUS_RUNLEVEL_SWITCH_TIMEOUT: ::NTSTATUS = 0xC000A143u32 as i32;
-pub const STATUS_SERVICES_FAILED_AUTOSTART: ::NTSTATUS = 0x4000A144;
-pub const STATUS_RUNLEVEL_SWITCH_AGENT_TIMEOUT: ::NTSTATUS = 0xC000A145u32 as i32;
-pub const STATUS_RUNLEVEL_SWITCH_IN_PROGRESS: ::NTSTATUS = 0xC000A146u32 as i32;
-pub const STATUS_NOT_APPCONTAINER: ::NTSTATUS = 0xC000A200u32 as i32;
-pub const STATUS_NOT_SUPPORTED_IN_APPCONTAINER: ::NTSTATUS = 0xC000A201u32 as i32;
-pub const STATUS_INVALID_PACKAGE_SID_LENGTH: ::NTSTATUS = 0xC000A202u32 as i32;
-pub const STATUS_APP_DATA_NOT_FOUND: ::NTSTATUS = 0xC000A281u32 as i32;
-pub const STATUS_APP_DATA_EXPIRED: ::NTSTATUS = 0xC000A282u32 as i32;
-pub const STATUS_APP_DATA_CORRUPT: ::NTSTATUS = 0xC000A283u32 as i32;
-pub const STATUS_APP_DATA_LIMIT_EXCEEDED: ::NTSTATUS = 0xC000A284u32 as i32;
-pub const STATUS_APP_DATA_REBOOT_REQUIRED: ::NTSTATUS = 0xC000A285u32 as i32;
-pub const STATUS_OFFLOAD_READ_FLT_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A1u32 as i32;
-pub const STATUS_OFFLOAD_WRITE_FLT_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A2u32 as i32;
-pub const STATUS_OFFLOAD_READ_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A3u32 as i32;
-pub const STATUS_OFFLOAD_WRITE_FILE_NOT_SUPPORTED: ::NTSTATUS = 0xC000A2A4u32 as i32;
-pub const DBG_NO_STATE_CHANGE: ::NTSTATUS = 0xC0010001u32 as i32;
-pub const DBG_APP_NOT_IDLE: ::NTSTATUS = 0xC0010002u32 as i32;
-pub const RPC_NT_INVALID_STRING_BINDING: ::NTSTATUS = 0xC0020001u32 as i32;
-pub const RPC_NT_WRONG_KIND_OF_BINDING: ::NTSTATUS = 0xC0020002u32 as i32;
-pub const RPC_NT_INVALID_BINDING: ::NTSTATUS = 0xC0020003u32 as i32;
-pub const RPC_NT_PROTSEQ_NOT_SUPPORTED: ::NTSTATUS = 0xC0020004u32 as i32;
-pub const RPC_NT_INVALID_RPC_PROTSEQ: ::NTSTATUS = 0xC0020005u32 as i32;
-pub const RPC_NT_INVALID_STRING_UUID: ::NTSTATUS = 0xC0020006u32 as i32;
-pub const RPC_NT_INVALID_ENDPOINT_FORMAT: ::NTSTATUS = 0xC0020007u32 as i32;
-pub const RPC_NT_INVALID_NET_ADDR: ::NTSTATUS = 0xC0020008u32 as i32;
-pub const RPC_NT_NO_ENDPOINT_FOUND: ::NTSTATUS = 0xC0020009u32 as i32;
-pub const RPC_NT_INVALID_TIMEOUT: ::NTSTATUS = 0xC002000Au32 as i32;
-pub const RPC_NT_OBJECT_NOT_FOUND: ::NTSTATUS = 0xC002000Bu32 as i32;
-pub const RPC_NT_ALREADY_REGISTERED: ::NTSTATUS = 0xC002000Cu32 as i32;
-pub const RPC_NT_TYPE_ALREADY_REGISTERED: ::NTSTATUS = 0xC002000Du32 as i32;
-pub const RPC_NT_ALREADY_LISTENING: ::NTSTATUS = 0xC002000Eu32 as i32;
-pub const RPC_NT_NO_PROTSEQS_REGISTERED: ::NTSTATUS = 0xC002000Fu32 as i32;
-pub const RPC_NT_NOT_LISTENING: ::NTSTATUS = 0xC0020010u32 as i32;
-pub const RPC_NT_UNKNOWN_MGR_TYPE: ::NTSTATUS = 0xC0020011u32 as i32;
-pub const RPC_NT_UNKNOWN_IF: ::NTSTATUS = 0xC0020012u32 as i32;
-pub const RPC_NT_NO_BINDINGS: ::NTSTATUS = 0xC0020013u32 as i32;
-pub const RPC_NT_NO_PROTSEQS: ::NTSTATUS = 0xC0020014u32 as i32;
-pub const RPC_NT_CANT_CREATE_ENDPOINT: ::NTSTATUS = 0xC0020015u32 as i32;
-pub const RPC_NT_OUT_OF_RESOURCES: ::NTSTATUS = 0xC0020016u32 as i32;
-pub const RPC_NT_SERVER_UNAVAILABLE: ::NTSTATUS = 0xC0020017u32 as i32;
-pub const RPC_NT_SERVER_TOO_BUSY: ::NTSTATUS = 0xC0020018u32 as i32;
-pub const RPC_NT_INVALID_NETWORK_OPTIONS: ::NTSTATUS = 0xC0020019u32 as i32;
-pub const RPC_NT_NO_CALL_ACTIVE: ::NTSTATUS = 0xC002001Au32 as i32;
-pub const RPC_NT_CALL_FAILED: ::NTSTATUS = 0xC002001Bu32 as i32;
-pub const RPC_NT_CALL_FAILED_DNE: ::NTSTATUS = 0xC002001Cu32 as i32;
-pub const RPC_NT_PROTOCOL_ERROR: ::NTSTATUS = 0xC002001Du32 as i32;
-pub const RPC_NT_UNSUPPORTED_TRANS_SYN: ::NTSTATUS = 0xC002001Fu32 as i32;
-pub const RPC_NT_UNSUPPORTED_TYPE: ::NTSTATUS = 0xC0020021u32 as i32;
-pub const RPC_NT_INVALID_TAG: ::NTSTATUS = 0xC0020022u32 as i32;
-pub const RPC_NT_INVALID_BOUND: ::NTSTATUS = 0xC0020023u32 as i32;
-pub const RPC_NT_NO_ENTRY_NAME: ::NTSTATUS = 0xC0020024u32 as i32;
-pub const RPC_NT_INVALID_NAME_SYNTAX: ::NTSTATUS = 0xC0020025u32 as i32;
-pub const RPC_NT_UNSUPPORTED_NAME_SYNTAX: ::NTSTATUS = 0xC0020026u32 as i32;
-pub const RPC_NT_UUID_NO_ADDRESS: ::NTSTATUS = 0xC0020028u32 as i32;
-pub const RPC_NT_DUPLICATE_ENDPOINT: ::NTSTATUS = 0xC0020029u32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHN_TYPE: ::NTSTATUS = 0xC002002Au32 as i32;
-pub const RPC_NT_MAX_CALLS_TOO_SMALL: ::NTSTATUS = 0xC002002Bu32 as i32;
-pub const RPC_NT_STRING_TOO_LONG: ::NTSTATUS = 0xC002002Cu32 as i32;
-pub const RPC_NT_PROTSEQ_NOT_FOUND: ::NTSTATUS = 0xC002002Du32 as i32;
-pub const RPC_NT_PROCNUM_OUT_OF_RANGE: ::NTSTATUS = 0xC002002Eu32 as i32;
-pub const RPC_NT_BINDING_HAS_NO_AUTH: ::NTSTATUS = 0xC002002Fu32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHN_SERVICE: ::NTSTATUS = 0xC0020030u32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHN_LEVEL: ::NTSTATUS = 0xC0020031u32 as i32;
-pub const RPC_NT_INVALID_AUTH_IDENTITY: ::NTSTATUS = 0xC0020032u32 as i32;
-pub const RPC_NT_UNKNOWN_AUTHZ_SERVICE: ::NTSTATUS = 0xC0020033u32 as i32;
-pub const EPT_NT_INVALID_ENTRY: ::NTSTATUS = 0xC0020034u32 as i32;
-pub const EPT_NT_CANT_PERFORM_OP: ::NTSTATUS = 0xC0020035u32 as i32;
-pub const EPT_NT_NOT_REGISTERED: ::NTSTATUS = 0xC0020036u32 as i32;
-pub const RPC_NT_NOTHING_TO_EXPORT: ::NTSTATUS = 0xC0020037u32 as i32;
-pub const RPC_NT_INCOMPLETE_NAME: ::NTSTATUS = 0xC0020038u32 as i32;
-pub const RPC_NT_INVALID_VERS_OPTION: ::NTSTATUS = 0xC0020039u32 as i32;
-pub const RPC_NT_NO_MORE_MEMBERS: ::NTSTATUS = 0xC002003Au32 as i32;
-pub const RPC_NT_NOT_ALL_OBJS_UNEXPORTED: ::NTSTATUS = 0xC002003Bu32 as i32;
-pub const RPC_NT_INTERFACE_NOT_FOUND: ::NTSTATUS = 0xC002003Cu32 as i32;
-pub const RPC_NT_ENTRY_ALREADY_EXISTS: ::NTSTATUS = 0xC002003Du32 as i32;
-pub const RPC_NT_ENTRY_NOT_FOUND: ::NTSTATUS = 0xC002003Eu32 as i32;
-pub const RPC_NT_NAME_SERVICE_UNAVAILABLE: ::NTSTATUS = 0xC002003Fu32 as i32;
-pub const RPC_NT_INVALID_NAF_ID: ::NTSTATUS = 0xC0020040u32 as i32;
-pub const RPC_NT_CANNOT_SUPPORT: ::NTSTATUS = 0xC0020041u32 as i32;
-pub const RPC_NT_NO_CONTEXT_AVAILABLE: ::NTSTATUS = 0xC0020042u32 as i32;
-pub const RPC_NT_INTERNAL_ERROR: ::NTSTATUS = 0xC0020043u32 as i32;
-pub const RPC_NT_ZERO_DIVIDE: ::NTSTATUS = 0xC0020044u32 as i32;
-pub const RPC_NT_ADDRESS_ERROR: ::NTSTATUS = 0xC0020045u32 as i32;
-pub const RPC_NT_FP_DIV_ZERO: ::NTSTATUS = 0xC0020046u32 as i32;
-pub const RPC_NT_FP_UNDERFLOW: ::NTSTATUS = 0xC0020047u32 as i32;
-pub const RPC_NT_FP_OVERFLOW: ::NTSTATUS = 0xC0020048u32 as i32;
-pub const RPC_NT_NO_MORE_ENTRIES: ::NTSTATUS = 0xC0030001u32 as i32;
-pub const RPC_NT_SS_CHAR_TRANS_OPEN_FAIL: ::NTSTATUS = 0xC0030002u32 as i32;
-pub const RPC_NT_SS_CHAR_TRANS_SHORT_FILE: ::NTSTATUS = 0xC0030003u32 as i32;
-pub const RPC_NT_SS_IN_NULL_CONTEXT: ::NTSTATUS = 0xC0030004u32 as i32;
-pub const RPC_NT_SS_CONTEXT_MISMATCH: ::NTSTATUS = 0xC0030005u32 as i32;
-pub const RPC_NT_SS_CONTEXT_DAMAGED: ::NTSTATUS = 0xC0030006u32 as i32;
-pub const RPC_NT_SS_HANDLES_MISMATCH: ::NTSTATUS = 0xC0030007u32 as i32;
-pub const RPC_NT_SS_CANNOT_GET_CALL_HANDLE: ::NTSTATUS = 0xC0030008u32 as i32;
-pub const RPC_NT_NULL_REF_POINTER: ::NTSTATUS = 0xC0030009u32 as i32;
-pub const RPC_NT_ENUM_VALUE_OUT_OF_RANGE: ::NTSTATUS = 0xC003000Au32 as i32;
-pub const RPC_NT_BYTE_COUNT_TOO_SMALL: ::NTSTATUS = 0xC003000Bu32 as i32;
-pub const RPC_NT_BAD_STUB_DATA: ::NTSTATUS = 0xC003000Cu32 as i32;
-pub const RPC_NT_CALL_IN_PROGRESS: ::NTSTATUS = 0xC0020049u32 as i32;
-pub const RPC_NT_NO_MORE_BINDINGS: ::NTSTATUS = 0xC002004Au32 as i32;
-pub const RPC_NT_GROUP_MEMBER_NOT_FOUND: ::NTSTATUS = 0xC002004Bu32 as i32;
-pub const EPT_NT_CANT_CREATE: ::NTSTATUS = 0xC002004Cu32 as i32;
-pub const RPC_NT_INVALID_OBJECT: ::NTSTATUS = 0xC002004Du32 as i32;
-pub const RPC_NT_NO_INTERFACES: ::NTSTATUS = 0xC002004Fu32 as i32;
-pub const RPC_NT_CALL_CANCELLED: ::NTSTATUS = 0xC0020050u32 as i32;
-pub const RPC_NT_BINDING_INCOMPLETE: ::NTSTATUS = 0xC0020051u32 as i32;
-pub const RPC_NT_COMM_FAILURE: ::NTSTATUS = 0xC0020052u32 as i32;
-pub const RPC_NT_UNSUPPORTED_AUTHN_LEVEL: ::NTSTATUS = 0xC0020053u32 as i32;
-pub const RPC_NT_NO_PRINC_NAME: ::NTSTATUS = 0xC0020054u32 as i32;
-pub const RPC_NT_NOT_RPC_ERROR: ::NTSTATUS = 0xC0020055u32 as i32;
-pub const RPC_NT_UUID_LOCAL_ONLY: ::NTSTATUS = 0x40020056;
-pub const RPC_NT_SEC_PKG_ERROR: ::NTSTATUS = 0xC0020057u32 as i32;
-pub const RPC_NT_NOT_CANCELLED: ::NTSTATUS = 0xC0020058u32 as i32;
-pub const RPC_NT_INVALID_ES_ACTION: ::NTSTATUS = 0xC0030059u32 as i32;
-pub const RPC_NT_WRONG_ES_VERSION: ::NTSTATUS = 0xC003005Au32 as i32;
-pub const RPC_NT_WRONG_STUB_VERSION: ::NTSTATUS = 0xC003005Bu32 as i32;
-pub const RPC_NT_INVALID_PIPE_OBJECT: ::NTSTATUS = 0xC003005Cu32 as i32;
-pub const RPC_NT_INVALID_PIPE_OPERATION: ::NTSTATUS = 0xC003005Du32 as i32;
-pub const RPC_NT_WRONG_PIPE_VERSION: ::NTSTATUS = 0xC003005Eu32 as i32;
-pub const RPC_NT_PIPE_CLOSED: ::NTSTATUS = 0xC003005Fu32 as i32;
-pub const RPC_NT_PIPE_DISCIPLINE_ERROR: ::NTSTATUS = 0xC0030060u32 as i32;
-pub const RPC_NT_PIPE_EMPTY: ::NTSTATUS = 0xC0030061u32 as i32;
-pub const RPC_NT_INVALID_ASYNC_HANDLE: ::NTSTATUS = 0xC0020062u32 as i32;
-pub const RPC_NT_INVALID_ASYNC_CALL: ::NTSTATUS = 0xC0020063u32 as i32;
-pub const RPC_NT_PROXY_ACCESS_DENIED: ::NTSTATUS = 0xC0020064u32 as i32;
-pub const RPC_NT_COOKIE_AUTH_FAILED: ::NTSTATUS = 0xC0020065u32 as i32;
-pub const RPC_NT_SEND_INCOMPLETE: ::NTSTATUS = 0x400200AF;
-pub const STATUS_ACPI_INVALID_OPCODE: ::NTSTATUS = 0xC0140001u32 as i32;
-pub const STATUS_ACPI_STACK_OVERFLOW: ::NTSTATUS = 0xC0140002u32 as i32;
-pub const STATUS_ACPI_ASSERT_FAILED: ::NTSTATUS = 0xC0140003u32 as i32;
-pub const STATUS_ACPI_INVALID_INDEX: ::NTSTATUS = 0xC0140004u32 as i32;
-pub const STATUS_ACPI_INVALID_ARGUMENT: ::NTSTATUS = 0xC0140005u32 as i32;
-pub const STATUS_ACPI_FATAL: ::NTSTATUS = 0xC0140006u32 as i32;
-pub const STATUS_ACPI_INVALID_SUPERNAME: ::NTSTATUS = 0xC0140007u32 as i32;
-pub const STATUS_ACPI_INVALID_ARGTYPE: ::NTSTATUS = 0xC0140008u32 as i32;
-pub const STATUS_ACPI_INVALID_OBJTYPE: ::NTSTATUS = 0xC0140009u32 as i32;
-pub const STATUS_ACPI_INVALID_TARGETTYPE: ::NTSTATUS = 0xC014000Au32 as i32;
-pub const STATUS_ACPI_INCORRECT_ARGUMENT_COUNT: ::NTSTATUS = 0xC014000Bu32 as i32;
-pub const STATUS_ACPI_ADDRESS_NOT_MAPPED: ::NTSTATUS = 0xC014000Cu32 as i32;
-pub const STATUS_ACPI_INVALID_EVENTTYPE: ::NTSTATUS = 0xC014000Du32 as i32;
-pub const STATUS_ACPI_HANDLER_COLLISION: ::NTSTATUS = 0xC014000Eu32 as i32;
-pub const STATUS_ACPI_INVALID_DATA: ::NTSTATUS = 0xC014000Fu32 as i32;
-pub const STATUS_ACPI_INVALID_REGION: ::NTSTATUS = 0xC0140010u32 as i32;
-pub const STATUS_ACPI_INVALID_ACCESS_SIZE: ::NTSTATUS = 0xC0140011u32 as i32;
-pub const STATUS_ACPI_ACQUIRE_GLOBAL_LOCK: ::NTSTATUS = 0xC0140012u32 as i32;
-pub const STATUS_ACPI_ALREADY_INITIALIZED: ::NTSTATUS = 0xC0140013u32 as i32;
-pub const STATUS_ACPI_NOT_INITIALIZED: ::NTSTATUS = 0xC0140014u32 as i32;
-pub const STATUS_ACPI_INVALID_MUTEX_LEVEL: ::NTSTATUS = 0xC0140015u32 as i32;
-pub const STATUS_ACPI_MUTEX_NOT_OWNED: ::NTSTATUS = 0xC0140016u32 as i32;
-pub const STATUS_ACPI_MUTEX_NOT_OWNER: ::NTSTATUS = 0xC0140017u32 as i32;
-pub const STATUS_ACPI_RS_ACCESS: ::NTSTATUS = 0xC0140018u32 as i32;
-pub const STATUS_ACPI_INVALID_TABLE: ::NTSTATUS = 0xC0140019u32 as i32;
-pub const STATUS_ACPI_REG_HANDLER_FAILED: ::NTSTATUS = 0xC0140020u32 as i32;
-pub const STATUS_ACPI_POWER_REQUEST_FAILED: ::NTSTATUS = 0xC0140021u32 as i32;
-pub const STATUS_CTX_WINSTATION_NAME_INVALID: ::NTSTATUS = 0xC00A0001u32 as i32;
-pub const STATUS_CTX_INVALID_PD: ::NTSTATUS = 0xC00A0002u32 as i32;
-pub const STATUS_CTX_PD_NOT_FOUND: ::NTSTATUS = 0xC00A0003u32 as i32;
-pub const STATUS_CTX_CDM_CONNECT: ::NTSTATUS = 0x400A0004;
-pub const STATUS_CTX_CDM_DISCONNECT: ::NTSTATUS = 0x400A0005;
-pub const STATUS_CTX_CLOSE_PENDING: ::NTSTATUS = 0xC00A0006u32 as i32;
-pub const STATUS_CTX_NO_OUTBUF: ::NTSTATUS = 0xC00A0007u32 as i32;
-pub const STATUS_CTX_MODEM_INF_NOT_FOUND: ::NTSTATUS = 0xC00A0008u32 as i32;
-pub const STATUS_CTX_INVALID_MODEMNAME: ::NTSTATUS = 0xC00A0009u32 as i32;
-pub const STATUS_CTX_RESPONSE_ERROR: ::NTSTATUS = 0xC00A000Au32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_TIMEOUT: ::NTSTATUS = 0xC00A000Bu32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_NO_CARRIER: ::NTSTATUS = 0xC00A000Cu32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_NO_DIALTONE: ::NTSTATUS = 0xC00A000Du32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_BUSY: ::NTSTATUS = 0xC00A000Eu32 as i32;
-pub const STATUS_CTX_MODEM_RESPONSE_VOICE: ::NTSTATUS = 0xC00A000Fu32 as i32;
-pub const STATUS_CTX_TD_ERROR: ::NTSTATUS = 0xC00A0010u32 as i32;
-pub const STATUS_CTX_LICENSE_CLIENT_INVALID: ::NTSTATUS = 0xC00A0012u32 as i32;
-pub const STATUS_CTX_LICENSE_NOT_AVAILABLE: ::NTSTATUS = 0xC00A0013u32 as i32;
-pub const STATUS_CTX_LICENSE_EXPIRED: ::NTSTATUS = 0xC00A0014u32 as i32;
-pub const STATUS_CTX_WINSTATION_NOT_FOUND: ::NTSTATUS = 0xC00A0015u32 as i32;
-pub const STATUS_CTX_WINSTATION_NAME_COLLISION: ::NTSTATUS = 0xC00A0016u32 as i32;
-pub const STATUS_CTX_WINSTATION_BUSY: ::NTSTATUS = 0xC00A0017u32 as i32;
-pub const STATUS_CTX_BAD_VIDEO_MODE: ::NTSTATUS = 0xC00A0018u32 as i32;
-pub const STATUS_CTX_GRAPHICS_INVALID: ::NTSTATUS = 0xC00A0022u32 as i32;
-pub const STATUS_CTX_NOT_CONSOLE: ::NTSTATUS = 0xC00A0024u32 as i32;
-pub const STATUS_CTX_CLIENT_QUERY_TIMEOUT: ::NTSTATUS = 0xC00A0026u32 as i32;
-pub const STATUS_CTX_CONSOLE_DISCONNECT: ::NTSTATUS = 0xC00A0027u32 as i32;
-pub const STATUS_CTX_CONSOLE_CONNECT: ::NTSTATUS = 0xC00A0028u32 as i32;
-pub const STATUS_CTX_SHADOW_DENIED: ::NTSTATUS = 0xC00A002Au32 as i32;
-pub const STATUS_CTX_WINSTATION_ACCESS_DENIED: ::NTSTATUS = 0xC00A002Bu32 as i32;
-pub const STATUS_CTX_INVALID_WD: ::NTSTATUS = 0xC00A002Eu32 as i32;
-pub const STATUS_CTX_WD_NOT_FOUND: ::NTSTATUS = 0xC00A002Fu32 as i32;
-pub const STATUS_CTX_SHADOW_INVALID: ::NTSTATUS = 0xC00A0030u32 as i32;
-pub const STATUS_CTX_SHADOW_DISABLED: ::NTSTATUS = 0xC00A0031u32 as i32;
-pub const STATUS_RDP_PROTOCOL_ERROR: ::NTSTATUS = 0xC00A0032u32 as i32;
-pub const STATUS_CTX_CLIENT_LICENSE_NOT_SET: ::NTSTATUS = 0xC00A0033u32 as i32;
-pub const STATUS_CTX_CLIENT_LICENSE_IN_USE: ::NTSTATUS = 0xC00A0034u32 as i32;
-pub const STATUS_CTX_SHADOW_ENDED_BY_MODE_CHANGE: ::NTSTATUS = 0xC00A0035u32 as i32;
-pub const STATUS_CTX_SHADOW_NOT_RUNNING: ::NTSTATUS = 0xC00A0036u32 as i32;
-pub const STATUS_CTX_LOGON_DISABLED: ::NTSTATUS = 0xC00A0037u32 as i32;
-pub const STATUS_CTX_SECURITY_LAYER_ERROR: ::NTSTATUS = 0xC00A0038u32 as i32;
-pub const STATUS_TS_INCOMPATIBLE_SESSIONS: ::NTSTATUS = 0xC00A0039u32 as i32;
-pub const STATUS_TS_VIDEO_SUBSYSTEM_ERROR: ::NTSTATUS = 0xC00A003Au32 as i32;
-pub const STATUS_PNP_BAD_MPS_TABLE: ::NTSTATUS = 0xC0040035u32 as i32;
-pub const STATUS_PNP_TRANSLATION_FAILED: ::NTSTATUS = 0xC0040036u32 as i32;
-pub const STATUS_PNP_IRQ_TRANSLATION_FAILED: ::NTSTATUS = 0xC0040037u32 as i32;
-pub const STATUS_PNP_INVALID_ID: ::NTSTATUS = 0xC0040038u32 as i32;
-pub const STATUS_IO_REISSUE_AS_CACHED: ::NTSTATUS = 0xC0040039u32 as i32;
-pub const STATUS_MUI_FILE_NOT_FOUND: ::NTSTATUS = 0xC00B0001u32 as i32;
-pub const STATUS_MUI_INVALID_FILE: ::NTSTATUS = 0xC00B0002u32 as i32;
-pub const STATUS_MUI_INVALID_RC_CONFIG: ::NTSTATUS = 0xC00B0003u32 as i32;
-pub const STATUS_MUI_INVALID_LOCALE_NAME: ::NTSTATUS = 0xC00B0004u32 as i32;
-pub const STATUS_MUI_INVALID_ULTIMATEFALLBACK_NAME: ::NTSTATUS = 0xC00B0005u32 as i32;
-pub const STATUS_MUI_FILE_NOT_LOADED: ::NTSTATUS = 0xC00B0006u32 as i32;
-pub const STATUS_RESOURCE_ENUM_USER_STOP: ::NTSTATUS = 0xC00B0007u32 as i32;
-pub const STATUS_FLT_NO_HANDLER_DEFINED: ::NTSTATUS = 0xC01C0001u32 as i32;
-pub const STATUS_FLT_CONTEXT_ALREADY_DEFINED: ::NTSTATUS = 0xC01C0002u32 as i32;
-pub const STATUS_FLT_INVALID_ASYNCHRONOUS_REQUEST: ::NTSTATUS = 0xC01C0003u32 as i32;
-pub const STATUS_FLT_DISALLOW_FAST_IO: ::NTSTATUS = 0xC01C0004u32 as i32;
-pub const STATUS_FLT_INVALID_NAME_REQUEST: ::NTSTATUS = 0xC01C0005u32 as i32;
-pub const STATUS_FLT_NOT_SAFE_TO_POST_OPERATION: ::NTSTATUS = 0xC01C0006u32 as i32;
-pub const STATUS_FLT_NOT_INITIALIZED: ::NTSTATUS = 0xC01C0007u32 as i32;
-pub const STATUS_FLT_FILTER_NOT_READY: ::NTSTATUS = 0xC01C0008u32 as i32;
-pub const STATUS_FLT_POST_OPERATION_CLEANUP: ::NTSTATUS = 0xC01C0009u32 as i32;
-pub const STATUS_FLT_INTERNAL_ERROR: ::NTSTATUS = 0xC01C000Au32 as i32;
-pub const STATUS_FLT_DELETING_OBJECT: ::NTSTATUS = 0xC01C000Bu32 as i32;
-pub const STATUS_FLT_MUST_BE_NONPAGED_POOL: ::NTSTATUS = 0xC01C000Cu32 as i32;
-pub const STATUS_FLT_DUPLICATE_ENTRY: ::NTSTATUS = 0xC01C000Du32 as i32;
-pub const STATUS_FLT_CBDQ_DISABLED: ::NTSTATUS = 0xC01C000Eu32 as i32;
-pub const STATUS_FLT_DO_NOT_ATTACH: ::NTSTATUS = 0xC01C000Fu32 as i32;
-pub const STATUS_FLT_DO_NOT_DETACH: ::NTSTATUS = 0xC01C0010u32 as i32;
-pub const STATUS_FLT_INSTANCE_ALTITUDE_COLLISION: ::NTSTATUS = 0xC01C0011u32 as i32;
-pub const STATUS_FLT_INSTANCE_NAME_COLLISION: ::NTSTATUS = 0xC01C0012u32 as i32;
-pub const STATUS_FLT_FILTER_NOT_FOUND: ::NTSTATUS = 0xC01C0013u32 as i32;
-pub const STATUS_FLT_VOLUME_NOT_FOUND: ::NTSTATUS = 0xC01C0014u32 as i32;
-pub const STATUS_FLT_INSTANCE_NOT_FOUND: ::NTSTATUS = 0xC01C0015u32 as i32;
-pub const STATUS_FLT_CONTEXT_ALLOCATION_NOT_FOUND: ::NTSTATUS = 0xC01C0016u32 as i32;
-pub const STATUS_FLT_INVALID_CONTEXT_REGISTRATION: ::NTSTATUS = 0xC01C0017u32 as i32;
-pub const STATUS_FLT_NAME_CACHE_MISS: ::NTSTATUS = 0xC01C0018u32 as i32;
-pub const STATUS_FLT_NO_DEVICE_OBJECT: ::NTSTATUS = 0xC01C0019u32 as i32;
-pub const STATUS_FLT_VOLUME_ALREADY_MOUNTED: ::NTSTATUS = 0xC01C001Au32 as i32;
-pub const STATUS_FLT_ALREADY_ENLISTED: ::NTSTATUS = 0xC01C001Bu32 as i32;
-pub const STATUS_FLT_CONTEXT_ALREADY_LINKED: ::NTSTATUS = 0xC01C001Cu32 as i32;
-pub const STATUS_FLT_NO_WAITER_FOR_REPLY: ::NTSTATUS = 0xC01C0020u32 as i32;
-pub const STATUS_FLT_REGISTRATION_BUSY: ::NTSTATUS = 0xC01C0023u32 as i32;
-pub const STATUS_SXS_SECTION_NOT_FOUND: ::NTSTATUS = 0xC0150001u32 as i32;
-pub const STATUS_SXS_CANT_GEN_ACTCTX: ::NTSTATUS = 0xC0150002u32 as i32;
-pub const STATUS_SXS_INVALID_ACTCTXDATA_FORMAT: ::NTSTATUS = 0xC0150003u32 as i32;
-pub const STATUS_SXS_ASSEMBLY_NOT_FOUND: ::NTSTATUS = 0xC0150004u32 as i32;
-pub const STATUS_SXS_MANIFEST_FORMAT_ERROR: ::NTSTATUS = 0xC0150005u32 as i32;
-pub const STATUS_SXS_MANIFEST_PARSE_ERROR: ::NTSTATUS = 0xC0150006u32 as i32;
-pub const STATUS_SXS_ACTIVATION_CONTEXT_DISABLED: ::NTSTATUS = 0xC0150007u32 as i32;
-pub const STATUS_SXS_KEY_NOT_FOUND: ::NTSTATUS = 0xC0150008u32 as i32;
-pub const STATUS_SXS_VERSION_CONFLICT: ::NTSTATUS = 0xC0150009u32 as i32;
-pub const STATUS_SXS_WRONG_SECTION_TYPE: ::NTSTATUS = 0xC015000Au32 as i32;
-pub const STATUS_SXS_THREAD_QUERIES_DISABLED: ::NTSTATUS = 0xC015000Bu32 as i32;
-pub const STATUS_SXS_ASSEMBLY_MISSING: ::NTSTATUS = 0xC015000Cu32 as i32;
-pub const STATUS_SXS_RELEASE_ACTIVATION_CONTEXT: ::NTSTATUS = 0x4015000D;
-pub const STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET: ::NTSTATUS = 0xC015000Eu32 as i32;
-pub const STATUS_SXS_EARLY_DEACTIVATION: ::NTSTATUS = 0xC015000Fu32 as i32;
-pub const STATUS_SXS_INVALID_DEACTIVATION: ::NTSTATUS = 0xC0150010u32 as i32;
-pub const STATUS_SXS_MULTIPLE_DEACTIVATION: ::NTSTATUS = 0xC0150011u32 as i32;
-pub const STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY: ::NTSTATUS = 0xC0150012u32 as i32;
-pub const STATUS_SXS_PROCESS_TERMINATION_REQUESTED: ::NTSTATUS = 0xC0150013u32 as i32;
-pub const STATUS_SXS_CORRUPT_ACTIVATION_STACK: ::NTSTATUS = 0xC0150014u32 as i32;
-pub const STATUS_SXS_CORRUPTION: ::NTSTATUS = 0xC0150015u32 as i32;
-pub const STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE: ::NTSTATUS = 0xC0150016u32 as i32;
-pub const STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME: ::NTSTATUS = 0xC0150017u32 as i32;
-pub const STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE: ::NTSTATUS = 0xC0150018u32 as i32;
-pub const STATUS_SXS_IDENTITY_PARSE_ERROR: ::NTSTATUS = 0xC0150019u32 as i32;
-pub const STATUS_SXS_COMPONENT_STORE_CORRUPT: ::NTSTATUS = 0xC015001Au32 as i32;
-pub const STATUS_SXS_FILE_HASH_MISMATCH: ::NTSTATUS = 0xC015001Bu32 as i32;
-pub const STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT: ::NTSTATUS = 0xC015001Cu32 as i32;
-pub const STATUS_SXS_IDENTITIES_DIFFERENT: ::NTSTATUS = 0xC015001Du32 as i32;
-pub const STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT: ::NTSTATUS = 0xC015001Eu32 as i32;
-pub const STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY: ::NTSTATUS = 0xC015001Fu32 as i32;
-pub const STATUS_ADVANCED_INSTALLER_FAILED: ::NTSTATUS = 0xC0150020u32 as i32;
-pub const STATUS_XML_ENCODING_MISMATCH: ::NTSTATUS = 0xC0150021u32 as i32;
-pub const STATUS_SXS_MANIFEST_TOO_BIG: ::NTSTATUS = 0xC0150022u32 as i32;
-pub const STATUS_SXS_SETTING_NOT_REGISTERED: ::NTSTATUS = 0xC0150023u32 as i32;
-pub const STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE: ::NTSTATUS = 0xC0150024u32 as i32;
-pub const STATUS_SMI_PRIMITIVE_INSTALLER_FAILED: ::NTSTATUS = 0xC0150025u32 as i32;
-pub const STATUS_GENERIC_COMMAND_FAILED: ::NTSTATUS = 0xC0150026u32 as i32;
-pub const STATUS_SXS_FILE_HASH_MISSING: ::NTSTATUS = 0xC0150027u32 as i32;
-pub const STATUS_CLUSTER_INVALID_NODE: ::NTSTATUS = 0xC0130001u32 as i32;
-pub const STATUS_CLUSTER_NODE_EXISTS: ::NTSTATUS = 0xC0130002u32 as i32;
-pub const STATUS_CLUSTER_JOIN_IN_PROGRESS: ::NTSTATUS = 0xC0130003u32 as i32;
-pub const STATUS_CLUSTER_NODE_NOT_FOUND: ::NTSTATUS = 0xC0130004u32 as i32;
-pub const STATUS_CLUSTER_LOCAL_NODE_NOT_FOUND: ::NTSTATUS = 0xC0130005u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_EXISTS: ::NTSTATUS = 0xC0130006u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_NOT_FOUND: ::NTSTATUS = 0xC0130007u32 as i32;
-pub const STATUS_CLUSTER_NETINTERFACE_EXISTS: ::NTSTATUS = 0xC0130008u32 as i32;
-pub const STATUS_CLUSTER_NETINTERFACE_NOT_FOUND: ::NTSTATUS = 0xC0130009u32 as i32;
-pub const STATUS_CLUSTER_INVALID_REQUEST: ::NTSTATUS = 0xC013000Au32 as i32;
-pub const STATUS_CLUSTER_INVALID_NETWORK_PROVIDER: ::NTSTATUS = 0xC013000Bu32 as i32;
-pub const STATUS_CLUSTER_NODE_DOWN: ::NTSTATUS = 0xC013000Cu32 as i32;
-pub const STATUS_CLUSTER_NODE_UNREACHABLE: ::NTSTATUS = 0xC013000Du32 as i32;
-pub const STATUS_CLUSTER_NODE_NOT_MEMBER: ::NTSTATUS = 0xC013000Eu32 as i32;
-pub const STATUS_CLUSTER_JOIN_NOT_IN_PROGRESS: ::NTSTATUS = 0xC013000Fu32 as i32;
-pub const STATUS_CLUSTER_INVALID_NETWORK: ::NTSTATUS = 0xC0130010u32 as i32;
-pub const STATUS_CLUSTER_NO_NET_ADAPTERS: ::NTSTATUS = 0xC0130011u32 as i32;
-pub const STATUS_CLUSTER_NODE_UP: ::NTSTATUS = 0xC0130012u32 as i32;
-pub const STATUS_CLUSTER_NODE_PAUSED: ::NTSTATUS = 0xC0130013u32 as i32;
-pub const STATUS_CLUSTER_NODE_NOT_PAUSED: ::NTSTATUS = 0xC0130014u32 as i32;
-pub const STATUS_CLUSTER_NO_SECURITY_CONTEXT: ::NTSTATUS = 0xC0130015u32 as i32;
-pub const STATUS_CLUSTER_NETWORK_NOT_INTERNAL: ::NTSTATUS = 0xC0130016u32 as i32;
-pub const STATUS_CLUSTER_POISONED: ::NTSTATUS = 0xC0130017u32 as i32;
-pub const STATUS_CLUSTER_NON_CSV_PATH: ::NTSTATUS = 0xC0130018u32 as i32;
-pub const STATUS_CLUSTER_CSV_VOLUME_NOT_LOCAL: ::NTSTATUS = 0xC0130019u32 as i32;
-pub const STATUS_CLUSTER_CSV_READ_OPLOCK_BREAK_IN_PROGRESS: ::NTSTATUS = 0xC0130020u32 as i32;
-pub const STATUS_CLUSTER_CSV_AUTO_PAUSE_ERROR: ::NTSTATUS = 0xC0130021u32 as i32;
-pub const STATUS_CLUSTER_CSV_REDIRECTED: ::NTSTATUS = 0xC0130022u32 as i32;
-pub const STATUS_CLUSTER_CSV_NOT_REDIRECTED: ::NTSTATUS = 0xC0130023u32 as i32;
-pub const STATUS_CLUSTER_CSV_VOLUME_DRAINING: ::NTSTATUS = 0xC0130024u32 as i32;
-pub const STATUS_CLUSTER_CSV_SNAPSHOT_CREATION_IN_PROGRESS: ::NTSTATUS = 0xC0130025u32 as i32;
-pub const STATUS_CLUSTER_CSV_VOLUME_DRAINING_SUCCEEDED_DOWNLEVEL: ::NTSTATUS = 0xC0130026u32 as i32;
-pub const STATUS_CLUSTER_CSV_NO_SNAPSHOTS: ::NTSTATUS = 0xC0130027u32 as i32;
-pub const STATUS_CSV_IO_PAUSE_TIMEOUT: ::NTSTATUS = 0xC0130028u32 as i32;
-pub const STATUS_TRANSACTIONAL_CONFLICT: ::NTSTATUS = 0xC0190001u32 as i32;
-pub const STATUS_INVALID_TRANSACTION: ::NTSTATUS = 0xC0190002u32 as i32;
-pub const STATUS_TRANSACTION_NOT_ACTIVE: ::NTSTATUS = 0xC0190003u32 as i32;
-pub const STATUS_TM_INITIALIZATION_FAILED: ::NTSTATUS = 0xC0190004u32 as i32;
-pub const STATUS_RM_NOT_ACTIVE: ::NTSTATUS = 0xC0190005u32 as i32;
-pub const STATUS_RM_METADATA_CORRUPT: ::NTSTATUS = 0xC0190006u32 as i32;
-pub const STATUS_TRANSACTION_NOT_JOINED: ::NTSTATUS = 0xC0190007u32 as i32;
-pub const STATUS_DIRECTORY_NOT_RM: ::NTSTATUS = 0xC0190008u32 as i32;
-pub const STATUS_COULD_NOT_RESIZE_LOG: ::NTSTATUS = 0x80190009u32 as i32;
-pub const STATUS_TRANSACTIONS_UNSUPPORTED_REMOTE: ::NTSTATUS = 0xC019000Au32 as i32;
-pub const STATUS_LOG_RESIZE_INVALID_SIZE: ::NTSTATUS = 0xC019000Bu32 as i32;
-pub const STATUS_REMOTE_FILE_VERSION_MISMATCH: ::NTSTATUS = 0xC019000Cu32 as i32;
-pub const STATUS_CRM_PROTOCOL_ALREADY_EXISTS: ::NTSTATUS = 0xC019000Fu32 as i32;
-pub const STATUS_TRANSACTION_PROPAGATION_FAILED: ::NTSTATUS = 0xC0190010u32 as i32;
-pub const STATUS_CRM_PROTOCOL_NOT_FOUND: ::NTSTATUS = 0xC0190011u32 as i32;
-pub const STATUS_TRANSACTION_SUPERIOR_EXISTS: ::NTSTATUS = 0xC0190012u32 as i32;
-pub const STATUS_TRANSACTION_REQUEST_NOT_VALID: ::NTSTATUS = 0xC0190013u32 as i32;
-pub const STATUS_TRANSACTION_NOT_REQUESTED: ::NTSTATUS = 0xC0190014u32 as i32;
-pub const STATUS_TRANSACTION_ALREADY_ABORTED: ::NTSTATUS = 0xC0190015u32 as i32;
-pub const STATUS_TRANSACTION_ALREADY_COMMITTED: ::NTSTATUS = 0xC0190016u32 as i32;
-pub const STATUS_TRANSACTION_INVALID_MARSHALL_BUFFER: ::NTSTATUS = 0xC0190017u32 as i32;
-pub const STATUS_CURRENT_TRANSACTION_NOT_VALID: ::NTSTATUS = 0xC0190018u32 as i32;
-pub const STATUS_LOG_GROWTH_FAILED: ::NTSTATUS = 0xC0190019u32 as i32;
-pub const STATUS_OBJECT_NO_LONGER_EXISTS: ::NTSTATUS = 0xC0190021u32 as i32;
-pub const STATUS_STREAM_MINIVERSION_NOT_FOUND: ::NTSTATUS = 0xC0190022u32 as i32;
-pub const STATUS_STREAM_MINIVERSION_NOT_VALID: ::NTSTATUS = 0xC0190023u32 as i32;
-pub const STATUS_MINIVERSION_INACCESSIBLE_FROM_SPECIFIED_TRANSACTION: ::NTSTATUS = 0xC0190024u32 as i32;
-pub const STATUS_CANT_OPEN_MINIVERSION_WITH_MODIFY_INTENT: ::NTSTATUS = 0xC0190025u32 as i32;
-pub const STATUS_CANT_CREATE_MORE_STREAM_MINIVERSIONS: ::NTSTATUS = 0xC0190026u32 as i32;
-pub const STATUS_HANDLE_NO_LONGER_VALID: ::NTSTATUS = 0xC0190028u32 as i32;
-pub const STATUS_NO_TXF_METADATA: ::NTSTATUS = 0x80190029u32 as i32;
-pub const STATUS_LOG_CORRUPTION_DETECTED: ::NTSTATUS = 0xC0190030u32 as i32;
-pub const STATUS_CANT_RECOVER_WITH_HANDLE_OPEN: ::NTSTATUS = 0x80190031u32 as i32;
-pub const STATUS_RM_DISCONNECTED: ::NTSTATUS = 0xC0190032u32 as i32;
-pub const STATUS_ENLISTMENT_NOT_SUPERIOR: ::NTSTATUS = 0xC0190033u32 as i32;
-pub const STATUS_RECOVERY_NOT_NEEDED: ::NTSTATUS = 0x40190034;
-pub const STATUS_RM_ALREADY_STARTED: ::NTSTATUS = 0x40190035;
-pub const STATUS_FILE_IDENTITY_NOT_PERSISTENT: ::NTSTATUS = 0xC0190036u32 as i32;
-pub const STATUS_CANT_BREAK_TRANSACTIONAL_DEPENDENCY: ::NTSTATUS = 0xC0190037u32 as i32;
-pub const STATUS_CANT_CROSS_RM_BOUNDARY: ::NTSTATUS = 0xC0190038u32 as i32;
-pub const STATUS_TXF_DIR_NOT_EMPTY: ::NTSTATUS = 0xC0190039u32 as i32;
-pub const STATUS_INDOUBT_TRANSACTIONS_EXIST: ::NTSTATUS = 0xC019003Au32 as i32;
-pub const STATUS_TM_VOLATILE: ::NTSTATUS = 0xC019003Bu32 as i32;
-pub const STATUS_ROLLBACK_TIMER_EXPIRED: ::NTSTATUS = 0xC019003Cu32 as i32;
-pub const STATUS_TXF_ATTRIBUTE_CORRUPT: ::NTSTATUS = 0xC019003Du32 as i32;
-pub const STATUS_EFS_NOT_ALLOWED_IN_TRANSACTION: ::NTSTATUS = 0xC019003Eu32 as i32;
-pub const STATUS_TRANSACTIONAL_OPEN_NOT_ALLOWED: ::NTSTATUS = 0xC019003Fu32 as i32;
-pub const STATUS_TRANSACTED_MAPPING_UNSUPPORTED_REMOTE: ::NTSTATUS = 0xC0190040u32 as i32;
-pub const STATUS_TXF_METADATA_ALREADY_PRESENT: ::NTSTATUS = 0x80190041u32 as i32;
-pub const STATUS_TRANSACTION_SCOPE_CALLBACKS_NOT_SET: ::NTSTATUS = 0x80190042u32 as i32;
-pub const STATUS_TRANSACTION_REQUIRED_PROMOTION: ::NTSTATUS = 0xC0190043u32 as i32;
-pub const STATUS_CANNOT_EXECUTE_FILE_IN_TRANSACTION: ::NTSTATUS = 0xC0190044u32 as i32;
-pub const STATUS_TRANSACTIONS_NOT_FROZEN: ::NTSTATUS = 0xC0190045u32 as i32;
-pub const STATUS_TRANSACTION_FREEZE_IN_PROGRESS: ::NTSTATUS = 0xC0190046u32 as i32;
-pub const STATUS_NOT_SNAPSHOT_VOLUME: ::NTSTATUS = 0xC0190047u32 as i32;
-pub const STATUS_NO_SAVEPOINT_WITH_OPEN_FILES: ::NTSTATUS = 0xC0190048u32 as i32;
-pub const STATUS_SPARSE_NOT_ALLOWED_IN_TRANSACTION: ::NTSTATUS = 0xC0190049u32 as i32;
-pub const STATUS_TM_IDENTITY_MISMATCH: ::NTSTATUS = 0xC019004Au32 as i32;
-pub const STATUS_FLOATED_SECTION: ::NTSTATUS = 0xC019004Bu32 as i32;
-pub const STATUS_CANNOT_ACCEPT_TRANSACTED_WORK: ::NTSTATUS = 0xC019004Cu32 as i32;
-pub const STATUS_CANNOT_ABORT_TRANSACTIONS: ::NTSTATUS = 0xC019004Du32 as i32;
-pub const STATUS_TRANSACTION_NOT_FOUND: ::NTSTATUS = 0xC019004Eu32 as i32;
-pub const STATUS_RESOURCEMANAGER_NOT_FOUND: ::NTSTATUS = 0xC019004Fu32 as i32;
-pub const STATUS_ENLISTMENT_NOT_FOUND: ::NTSTATUS = 0xC0190050u32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_NOT_FOUND: ::NTSTATUS = 0xC0190051u32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_NOT_ONLINE: ::NTSTATUS = 0xC0190052u32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_RECOVERY_NAME_COLLISION: ::NTSTATUS = 0xC0190053u32 as i32;
-pub const STATUS_TRANSACTION_NOT_ROOT: ::NTSTATUS = 0xC0190054u32 as i32;
-pub const STATUS_TRANSACTION_OBJECT_EXPIRED: ::NTSTATUS = 0xC0190055u32 as i32;
-pub const STATUS_COMPRESSION_NOT_ALLOWED_IN_TRANSACTION: ::NTSTATUS = 0xC0190056u32 as i32;
-pub const STATUS_TRANSACTION_RESPONSE_NOT_ENLISTED: ::NTSTATUS = 0xC0190057u32 as i32;
-pub const STATUS_TRANSACTION_RECORD_TOO_LONG: ::NTSTATUS = 0xC0190058u32 as i32;
-pub const STATUS_NO_LINK_TRACKING_IN_TRANSACTION: ::NTSTATUS = 0xC0190059u32 as i32;
-pub const STATUS_OPERATION_NOT_SUPPORTED_IN_TRANSACTION: ::NTSTATUS = 0xC019005Au32 as i32;
-pub const STATUS_TRANSACTION_INTEGRITY_VIOLATED: ::NTSTATUS = 0xC019005Bu32 as i32;
-pub const STATUS_TRANSACTIONMANAGER_IDENTITY_MISMATCH: ::NTSTATUS = 0xC019005Cu32 as i32;
-pub const STATUS_RM_CANNOT_BE_FROZEN_FOR_SNAPSHOT: ::NTSTATUS = 0xC019005Du32 as i32;
-pub const STATUS_TRANSACTION_MUST_WRITETHROUGH: ::NTSTATUS = 0xC019005Eu32 as i32;
-pub const STATUS_TRANSACTION_NO_SUPERIOR: ::NTSTATUS = 0xC019005Fu32 as i32;
-pub const STATUS_EXPIRED_HANDLE: ::NTSTATUS = 0xC0190060u32 as i32;
-pub const STATUS_TRANSACTION_NOT_ENLISTED: ::NTSTATUS = 0xC0190061u32 as i32;
-pub const STATUS_LOG_SECTOR_INVALID: ::NTSTATUS = 0xC01A0001u32 as i32;
-pub const STATUS_LOG_SECTOR_PARITY_INVALID: ::NTSTATUS = 0xC01A0002u32 as i32;
-pub const STATUS_LOG_SECTOR_REMAPPED: ::NTSTATUS = 0xC01A0003u32 as i32;
-pub const STATUS_LOG_BLOCK_INCOMPLETE: ::NTSTATUS = 0xC01A0004u32 as i32;
-pub const STATUS_LOG_INVALID_RANGE: ::NTSTATUS = 0xC01A0005u32 as i32;
-pub const STATUS_LOG_BLOCKS_EXHAUSTED: ::NTSTATUS = 0xC01A0006u32 as i32;
-pub const STATUS_LOG_READ_CONTEXT_INVALID: ::NTSTATUS = 0xC01A0007u32 as i32;
-pub const STATUS_LOG_RESTART_INVALID: ::NTSTATUS = 0xC01A0008u32 as i32;
-pub const STATUS_LOG_BLOCK_VERSION: ::NTSTATUS = 0xC01A0009u32 as i32;
-pub const STATUS_LOG_BLOCK_INVALID: ::NTSTATUS = 0xC01A000Au32 as i32;
-pub const STATUS_LOG_READ_MODE_INVALID: ::NTSTATUS = 0xC01A000Bu32 as i32;
-pub const STATUS_LOG_NO_RESTART: ::NTSTATUS = 0x401A000C;
-pub const STATUS_LOG_METADATA_CORRUPT: ::NTSTATUS = 0xC01A000Du32 as i32;
-pub const STATUS_LOG_METADATA_INVALID: ::NTSTATUS = 0xC01A000Eu32 as i32;
-pub const STATUS_LOG_METADATA_INCONSISTENT: ::NTSTATUS = 0xC01A000Fu32 as i32;
-pub const STATUS_LOG_RESERVATION_INVALID: ::NTSTATUS = 0xC01A0010u32 as i32;
-pub const STATUS_LOG_CANT_DELETE: ::NTSTATUS = 0xC01A0011u32 as i32;
-pub const STATUS_LOG_CONTAINER_LIMIT_EXCEEDED: ::NTSTATUS = 0xC01A0012u32 as i32;
-pub const STATUS_LOG_START_OF_LOG: ::NTSTATUS = 0xC01A0013u32 as i32;
-pub const STATUS_LOG_POLICY_ALREADY_INSTALLED: ::NTSTATUS = 0xC01A0014u32 as i32;
-pub const STATUS_LOG_POLICY_NOT_INSTALLED: ::NTSTATUS = 0xC01A0015u32 as i32;
-pub const STATUS_LOG_POLICY_INVALID: ::NTSTATUS = 0xC01A0016u32 as i32;
-pub const STATUS_LOG_POLICY_CONFLICT: ::NTSTATUS = 0xC01A0017u32 as i32;
-pub const STATUS_LOG_PINNED_ARCHIVE_TAIL: ::NTSTATUS = 0xC01A0018u32 as i32;
-pub const STATUS_LOG_RECORD_NONEXISTENT: ::NTSTATUS = 0xC01A0019u32 as i32;
-pub const STATUS_LOG_RECORDS_RESERVED_INVALID: ::NTSTATUS = 0xC01A001Au32 as i32;
-pub const STATUS_LOG_SPACE_RESERVED_INVALID: ::NTSTATUS = 0xC01A001Bu32 as i32;
-pub const STATUS_LOG_TAIL_INVALID: ::NTSTATUS = 0xC01A001Cu32 as i32;
-pub const STATUS_LOG_FULL: ::NTSTATUS = 0xC01A001Du32 as i32;
-pub const STATUS_LOG_MULTIPLEXED: ::NTSTATUS = 0xC01A001Eu32 as i32;
-pub const STATUS_LOG_DEDICATED: ::NTSTATUS = 0xC01A001Fu32 as i32;
-pub const STATUS_LOG_ARCHIVE_NOT_IN_PROGRESS: ::NTSTATUS = 0xC01A0020u32 as i32;
-pub const STATUS_LOG_ARCHIVE_IN_PROGRESS: ::NTSTATUS = 0xC01A0021u32 as i32;
-pub const STATUS_LOG_EPHEMERAL: ::NTSTATUS = 0xC01A0022u32 as i32;
-pub const STATUS_LOG_NOT_ENOUGH_CONTAINERS: ::NTSTATUS = 0xC01A0023u32 as i32;
-pub const STATUS_LOG_CLIENT_ALREADY_REGISTERED: ::NTSTATUS = 0xC01A0024u32 as i32;
-pub const STATUS_LOG_CLIENT_NOT_REGISTERED: ::NTSTATUS = 0xC01A0025u32 as i32;
-pub const STATUS_LOG_FULL_HANDLER_IN_PROGRESS: ::NTSTATUS = 0xC01A0026u32 as i32;
-pub const STATUS_LOG_CONTAINER_READ_FAILED: ::NTSTATUS = 0xC01A0027u32 as i32;
-pub const STATUS_LOG_CONTAINER_WRITE_FAILED: ::NTSTATUS = 0xC01A0028u32 as i32;
-pub const STATUS_LOG_CONTAINER_OPEN_FAILED: ::NTSTATUS = 0xC01A0029u32 as i32;
-pub const STATUS_LOG_CONTAINER_STATE_INVALID: ::NTSTATUS = 0xC01A002Au32 as i32;
-pub const STATUS_LOG_STATE_INVALID: ::NTSTATUS = 0xC01A002Bu32 as i32;
-pub const STATUS_LOG_PINNED: ::NTSTATUS = 0xC01A002Cu32 as i32;
-pub const STATUS_LOG_METADATA_FLUSH_FAILED: ::NTSTATUS = 0xC01A002Du32 as i32;
-pub const STATUS_LOG_INCONSISTENT_SECURITY: ::NTSTATUS = 0xC01A002Eu32 as i32;
-pub const STATUS_LOG_APPENDED_FLUSH_FAILED: ::NTSTATUS = 0xC01A002Fu32 as i32;
-pub const STATUS_LOG_PINNED_RESERVATION: ::NTSTATUS = 0xC01A0030u32 as i32;
-pub const STATUS_VIDEO_HUNG_DISPLAY_DRIVER_THREAD: ::NTSTATUS = 0xC01B00EAu32 as i32;
-pub const STATUS_VIDEO_HUNG_DISPLAY_DRIVER_THREAD_RECOVERED: ::NTSTATUS = 0x801B00EBu32 as i32;
-pub const STATUS_VIDEO_DRIVER_DEBUG_REPORT_REQUEST: ::NTSTATUS = 0x401B00EC;
-pub const STATUS_MONITOR_NO_DESCRIPTOR: ::NTSTATUS = 0xC01D0001u32 as i32;
-pub const STATUS_MONITOR_UNKNOWN_DESCRIPTOR_FORMAT: ::NTSTATUS = 0xC01D0002u32 as i32;
-pub const STATUS_MONITOR_INVALID_DESCRIPTOR_CHECKSUM: ::NTSTATUS = 0xC01D0003u32 as i32;
-pub const STATUS_MONITOR_INVALID_STANDARD_TIMING_BLOCK: ::NTSTATUS = 0xC01D0004u32 as i32;
-pub const STATUS_MONITOR_WMI_DATABLOCK_REGISTRATION_FAILED: ::NTSTATUS = 0xC01D0005u32 as i32;
-pub const STATUS_MONITOR_INVALID_SERIAL_NUMBER_MONDSC_BLOCK: ::NTSTATUS = 0xC01D0006u32 as i32;
-pub const STATUS_MONITOR_INVALID_USER_FRIENDLY_MONDSC_BLOCK: ::NTSTATUS = 0xC01D0007u32 as i32;
-pub const STATUS_MONITOR_NO_MORE_DESCRIPTOR_DATA: ::NTSTATUS = 0xC01D0008u32 as i32;
-pub const STATUS_MONITOR_INVALID_DETAILED_TIMING_BLOCK: ::NTSTATUS = 0xC01D0009u32 as i32;
-pub const STATUS_MONITOR_INVALID_MANUFACTURE_DATE: ::NTSTATUS = 0xC01D000Au32 as i32;
-pub const STATUS_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER: ::NTSTATUS = 0xC01E0000u32 as i32;
-pub const STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER: ::NTSTATUS = 0xC01E0001u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_DISPLAY_ADAPTER: ::NTSTATUS = 0xC01E0002u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_WAS_RESET: ::NTSTATUS = 0xC01E0003u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_DRIVER_MODEL: ::NTSTATUS = 0xC01E0004u32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_MODE_CHANGED: ::NTSTATUS = 0xC01E0005u32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_OCCLUDED: ::NTSTATUS = 0xC01E0006u32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_DENIED: ::NTSTATUS = 0xC01E0007u32 as i32;
-pub const STATUS_GRAPHICS_CANNOTCOLORCONVERT: ::NTSTATUS = 0xC01E0008u32 as i32;
-pub const STATUS_GRAPHICS_DRIVER_MISMATCH: ::NTSTATUS = 0xC01E0009u32 as i32;
-pub const STATUS_GRAPHICS_PARTIAL_DATA_POPULATED: ::NTSTATUS = 0x401E000A;
-pub const STATUS_GRAPHICS_PRESENT_REDIRECTION_DISABLED: ::NTSTATUS = 0xC01E000Bu32 as i32;
-pub const STATUS_GRAPHICS_PRESENT_UNOCCLUDED: ::NTSTATUS = 0xC01E000Cu32 as i32;
-pub const STATUS_GRAPHICS_WINDOWDC_NOT_AVAILABLE: ::NTSTATUS = 0xC01E000Du32 as i32;
-pub const STATUS_GRAPHICS_WINDOWLESS_PRESENT_DISABLED: ::NTSTATUS = 0xC01E000Eu32 as i32;
-pub const STATUS_GRAPHICS_NO_VIDEO_MEMORY: ::NTSTATUS = 0xC01E0100u32 as i32;
-pub const STATUS_GRAPHICS_CANT_LOCK_MEMORY: ::NTSTATUS = 0xC01E0101u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_BUSY: ::NTSTATUS = 0xC01E0102u32 as i32;
-pub const STATUS_GRAPHICS_TOO_MANY_REFERENCES: ::NTSTATUS = 0xC01E0103u32 as i32;
-pub const STATUS_GRAPHICS_TRY_AGAIN_LATER: ::NTSTATUS = 0xC01E0104u32 as i32;
-pub const STATUS_GRAPHICS_TRY_AGAIN_NOW: ::NTSTATUS = 0xC01E0105u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_INVALID: ::NTSTATUS = 0xC01E0106u32 as i32;
-pub const STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE: ::NTSTATUS = 0xC01E0107u32 as i32;
-pub const STATUS_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED: ::NTSTATUS = 0xC01E0108u32 as i32;
-pub const STATUS_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION: ::NTSTATUS = 0xC01E0109u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ALLOCATION_USAGE: ::NTSTATUS = 0xC01E0110u32 as i32;
-pub const STATUS_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION: ::NTSTATUS = 0xC01E0111u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_CLOSED: ::NTSTATUS = 0xC01E0112u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ALLOCATION_INSTANCE: ::NTSTATUS = 0xC01E0113u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ALLOCATION_HANDLE: ::NTSTATUS = 0xC01E0114u32 as i32;
-pub const STATUS_GRAPHICS_WRONG_ALLOCATION_DEVICE: ::NTSTATUS = 0xC01E0115u32 as i32;
-pub const STATUS_GRAPHICS_ALLOCATION_CONTENT_LOST: ::NTSTATUS = 0xC01E0116u32 as i32;
-pub const STATUS_GRAPHICS_GPU_EXCEPTION_ON_DEVICE: ::NTSTATUS = 0xC01E0200u32 as i32;
-pub const STATUS_GRAPHICS_SKIP_ALLOCATION_PREPARATION: ::NTSTATUS = 0x401E0201;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY: ::NTSTATUS = 0xC01E0300u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0301u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0302u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN: ::NTSTATUS = 0xC01E0303u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE: ::NTSTATUS = 0xC01E0304u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET: ::NTSTATUS = 0xC01E0305u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0306u32 as i32;
-pub const STATUS_GRAPHICS_MODE_NOT_PINNED: ::NTSTATUS = 0x401E0307;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_SOURCEMODESET: ::NTSTATUS = 0xC01E0308u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TARGETMODESET: ::NTSTATUS = 0xC01E0309u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_FREQUENCY: ::NTSTATUS = 0xC01E030Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_ACTIVE_REGION: ::NTSTATUS = 0xC01E030Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_TOTAL_REGION: ::NTSTATUS = 0xC01E030Cu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE: ::NTSTATUS = 0xC01E0310u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE: ::NTSTATUS = 0xC01E0311u32 as i32;
-pub const STATUS_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET: ::NTSTATUS = 0xC01E0312u32 as i32;
-pub const STATUS_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0313u32 as i32;
-pub const STATUS_GRAPHICS_MODE_ALREADY_IN_MODESET: ::NTSTATUS = 0xC01E0314u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET: ::NTSTATUS = 0xC01E0315u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET: ::NTSTATUS = 0xC01E0316u32 as i32;
-pub const STATUS_GRAPHICS_SOURCE_ALREADY_IN_SET: ::NTSTATUS = 0xC01E0317u32 as i32;
-pub const STATUS_GRAPHICS_TARGET_ALREADY_IN_SET: ::NTSTATUS = 0xC01E0318u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_PRESENT_PATH: ::NTSTATUS = 0xC01E0319u32 as i32;
-pub const STATUS_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY: ::NTSTATUS = 0xC01E031Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET: ::NTSTATUS = 0xC01E031Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE: ::NTSTATUS = 0xC01E031Cu32 as i32;
-pub const STATUS_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET: ::NTSTATUS = 0xC01E031Du32 as i32;
-pub const STATUS_GRAPHICS_NO_PREFERRED_MODE: ::NTSTATUS = 0x401E031E;
-pub const STATUS_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET: ::NTSTATUS = 0xC01E031Fu32 as i32;
-pub const STATUS_GRAPHICS_STALE_MODESET: ::NTSTATUS = 0xC01E0320u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_SOURCEMODESET: ::NTSTATUS = 0xC01E0321u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_SOURCE_MODE: ::NTSTATUS = 0xC01E0322u32 as i32;
-pub const STATUS_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN: ::NTSTATUS = 0xC01E0323u32 as i32;
-pub const STATUS_GRAPHICS_MODE_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E0324u32 as i32;
-pub const STATUS_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION: ::NTSTATUS = 0xC01E0325u32 as i32;
-pub const STATUS_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES: ::NTSTATUS = 0xC01E0326u32 as i32;
-pub const STATUS_GRAPHICS_PATH_NOT_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0327u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE: ::NTSTATUS = 0xC01E0328u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET: ::NTSTATUS = 0xC01E0329u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITORDESCRIPTORSET: ::NTSTATUS = 0xC01E032Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITORDESCRIPTOR: ::NTSTATUS = 0xC01E032Bu32 as i32;
-pub const STATUS_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET: ::NTSTATUS = 0xC01E032Cu32 as i32;
-pub const STATUS_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET: ::NTSTATUS = 0xC01E032Du32 as i32;
-pub const STATUS_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E032Eu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE: ::NTSTATUS = 0xC01E032Fu32 as i32;
-pub const STATUS_GRAPHICS_RESOURCES_NOT_RELATED: ::NTSTATUS = 0xC01E0330u32 as i32;
-pub const STATUS_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E0331u32 as i32;
-pub const STATUS_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE: ::NTSTATUS = 0xC01E0332u32 as i32;
-pub const STATUS_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET: ::NTSTATUS = 0xC01E0333u32 as i32;
-pub const STATUS_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER: ::NTSTATUS = 0xC01E0334u32 as i32;
-pub const STATUS_GRAPHICS_NO_VIDPNMGR: ::NTSTATUS = 0xC01E0335u32 as i32;
-pub const STATUS_GRAPHICS_NO_ACTIVE_VIDPN: ::NTSTATUS = 0xC01E0336u32 as i32;
-pub const STATUS_GRAPHICS_STALE_VIDPN_TOPOLOGY: ::NTSTATUS = 0xC01E0337u32 as i32;
-pub const STATUS_GRAPHICS_MONITOR_NOT_CONNECTED: ::NTSTATUS = 0xC01E0338u32 as i32;
-pub const STATUS_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0339u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE: ::NTSTATUS = 0xC01E033Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_VISIBLEREGION_SIZE: ::NTSTATUS = 0xC01E033Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_STRIDE: ::NTSTATUS = 0xC01E033Cu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PIXELFORMAT: ::NTSTATUS = 0xC01E033Du32 as i32;
-pub const STATUS_GRAPHICS_INVALID_COLORBASIS: ::NTSTATUS = 0xC01E033Eu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PIXELVALUEACCESSMODE: ::NTSTATUS = 0xC01E033Fu32 as i32;
-pub const STATUS_GRAPHICS_TARGET_NOT_IN_TOPOLOGY: ::NTSTATUS = 0xC01E0340u32 as i32;
-pub const STATUS_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT: ::NTSTATUS = 0xC01E0341u32 as i32;
-pub const STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: ::NTSTATUS = 0xC01E0342u32 as i32;
-pub const STATUS_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN: ::NTSTATUS = 0xC01E0343u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL: ::NTSTATUS = 0xC01E0344u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION: ::NTSTATUS = 0xC01E0345u32 as i32;
-pub const STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0346u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_GAMMA_RAMP: ::NTSTATUS = 0xC01E0347u32 as i32;
-pub const STATUS_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0348u32 as i32;
-pub const STATUS_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0349u32 as i32;
-pub const STATUS_GRAPHICS_MODE_NOT_IN_MODESET: ::NTSTATUS = 0xC01E034Au32 as i32;
-pub const STATUS_GRAPHICS_DATASET_IS_EMPTY: ::NTSTATUS = 0x401E034B;
-pub const STATUS_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET: ::NTSTATUS = 0x401E034C;
-pub const STATUS_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON: ::NTSTATUS = 0xC01E034Du32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PATH_CONTENT_TYPE: ::NTSTATUS = 0xC01E034Eu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_COPYPROTECTION_TYPE: ::NTSTATUS = 0xC01E034Fu32 as i32;
-pub const STATUS_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS: ::NTSTATUS = 0xC01E0350u32 as i32;
-pub const STATUS_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED: ::NTSTATUS = 0x401E0351;
-pub const STATUS_GRAPHICS_INVALID_SCANLINE_ORDERING: ::NTSTATUS = 0xC01E0352u32 as i32;
-pub const STATUS_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED: ::NTSTATUS = 0xC01E0353u32 as i32;
-pub const STATUS_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS: ::NTSTATUS = 0xC01E0354u32 as i32;
-pub const STATUS_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT: ::NTSTATUS = 0xC01E0355u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM: ::NTSTATUS = 0xC01E0356u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN: ::NTSTATUS = 0xC01E0357u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT: ::NTSTATUS = 0xC01E0358u32 as i32;
-pub const STATUS_GRAPHICS_MAX_NUM_PATHS_REACHED: ::NTSTATUS = 0xC01E0359u32 as i32;
-pub const STATUS_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION: ::NTSTATUS = 0xC01E035Au32 as i32;
-pub const STATUS_GRAPHICS_INVALID_CLIENT_TYPE: ::NTSTATUS = 0xC01E035Bu32 as i32;
-pub const STATUS_GRAPHICS_CLIENTVIDPN_NOT_SET: ::NTSTATUS = 0xC01E035Cu32 as i32;
-pub const STATUS_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED: ::NTSTATUS = 0xC01E0400u32 as i32;
-pub const STATUS_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0401u32 as i32;
-pub const STATUS_GRAPHICS_UNKNOWN_CHILD_STATUS: ::NTSTATUS = 0x401E042F;
-pub const STATUS_GRAPHICS_NOT_A_LINKED_ADAPTER: ::NTSTATUS = 0xC01E0430u32 as i32;
-pub const STATUS_GRAPHICS_LEADLINK_NOT_ENUMERATED: ::NTSTATUS = 0xC01E0431u32 as i32;
-pub const STATUS_GRAPHICS_CHAINLINKS_NOT_ENUMERATED: ::NTSTATUS = 0xC01E0432u32 as i32;
-pub const STATUS_GRAPHICS_ADAPTER_CHAIN_NOT_READY: ::NTSTATUS = 0xC01E0433u32 as i32;
-pub const STATUS_GRAPHICS_CHAINLINKS_NOT_STARTED: ::NTSTATUS = 0xC01E0434u32 as i32;
-pub const STATUS_GRAPHICS_CHAINLINKS_NOT_POWERED_ON: ::NTSTATUS = 0xC01E0435u32 as i32;
-pub const STATUS_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE: ::NTSTATUS = 0xC01E0436u32 as i32;
-pub const STATUS_GRAPHICS_LEADLINK_START_DEFERRED: ::NTSTATUS = 0x401E0437;
-pub const STATUS_GRAPHICS_NOT_POST_DEVICE_DRIVER: ::NTSTATUS = 0xC01E0438u32 as i32;
-pub const STATUS_GRAPHICS_POLLING_TOO_FREQUENTLY: ::NTSTATUS = 0x401E0439;
-pub const STATUS_GRAPHICS_START_DEFERRED: ::NTSTATUS = 0x401E043A;
-pub const STATUS_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED: ::NTSTATUS = 0xC01E043Bu32 as i32;
-pub const STATUS_GRAPHICS_DEPENDABLE_CHILD_STATUS: ::NTSTATUS = 0x401E043C;
-pub const STATUS_GRAPHICS_OPM_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0500u32 as i32;
-pub const STATUS_GRAPHICS_COPP_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0501u32 as i32;
-pub const STATUS_GRAPHICS_UAB_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0502u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS: ::NTSTATUS = 0xC01E0503u32 as i32;
-pub const STATUS_GRAPHICS_OPM_NO_PROTECTED_OUTPUTS_EXIST: ::NTSTATUS = 0xC01E0505u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INTERNAL_ERROR: ::NTSTATUS = 0xC01E050Bu32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_HANDLE: ::NTSTATUS = 0xC01E050Cu32 as i32;
-pub const STATUS_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH: ::NTSTATUS = 0xC01E050Eu32 as i32;
-pub const STATUS_GRAPHICS_OPM_SPANNING_MODE_ENABLED: ::NTSTATUS = 0xC01E050Fu32 as i32;
-pub const STATUS_GRAPHICS_OPM_THEATER_MODE_ENABLED: ::NTSTATUS = 0xC01E0510u32 as i32;
-pub const STATUS_GRAPHICS_PVP_HFS_FAILED: ::NTSTATUS = 0xC01E0511u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_SRM: ::NTSTATUS = 0xC01E0512u32 as i32;
-pub const STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP: ::NTSTATUS = 0xC01E0513u32 as i32;
-pub const STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP: ::NTSTATUS = 0xC01E0514u32 as i32;
-pub const STATUS_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA: ::NTSTATUS = 0xC01E0515u32 as i32;
-pub const STATUS_GRAPHICS_OPM_HDCP_SRM_NEVER_SET: ::NTSTATUS = 0xC01E0516u32 as i32;
-pub const STATUS_GRAPHICS_OPM_RESOLUTION_TOO_HIGH: ::NTSTATUS = 0xC01E0517u32 as i32;
-pub const STATUS_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE: ::NTSTATUS = 0xC01E0518u32 as i32;
-pub const STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_NO_LONGER_EXISTS: ::NTSTATUS = 0xC01E051Au32 as i32;
-pub const STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS: ::NTSTATUS = 0xC01E051Cu32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST: ::NTSTATUS = 0xC01E051Du32 as i32;
-pub const STATUS_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR: ::NTSTATUS = 0xC01E051Eu32 as i32;
-pub const STATUS_GRAPHICS_OPM_PROTECTED_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS: ::NTSTATUS = 0xC01E051Fu32 as i32;
-pub const STATUS_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0520u32 as i32;
-pub const STATUS_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST: ::NTSTATUS = 0xC01E0521u32 as i32;
-pub const STATUS_GRAPHICS_I2C_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0580u32 as i32;
-pub const STATUS_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST: ::NTSTATUS = 0xC01E0581u32 as i32;
-pub const STATUS_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA: ::NTSTATUS = 0xC01E0582u32 as i32;
-pub const STATUS_GRAPHICS_I2C_ERROR_RECEIVING_DATA: ::NTSTATUS = 0xC01E0583u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED: ::NTSTATUS = 0xC01E0584u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_DATA: ::NTSTATUS = 0xC01E0585u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE: ::NTSTATUS = 0xC01E0586u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_CAPABILITIES_STRING: ::NTSTATUS = 0xC01E0587u32 as i32;
-pub const STATUS_GRAPHICS_MCA_INTERNAL_ERROR: ::NTSTATUS = 0xC01E0588u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND: ::NTSTATUS = 0xC01E0589u32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH: ::NTSTATUS = 0xC01E058Au32 as i32;
-pub const STATUS_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM: ::NTSTATUS = 0xC01E058Bu32 as i32;
-pub const STATUS_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE: ::NTSTATUS = 0xC01E058Cu32 as i32;
-pub const STATUS_GRAPHICS_MONITOR_NO_LONGER_EXISTS: ::NTSTATUS = 0xC01E058Du32 as i32;
-pub const STATUS_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED: ::NTSTATUS = 0xC01E05E0u32 as i32;
-pub const STATUS_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME: ::NTSTATUS = 0xC01E05E1u32 as i32;
-pub const STATUS_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP: ::NTSTATUS = 0xC01E05E2u32 as i32;
-pub const STATUS_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED: ::NTSTATUS = 0xC01E05E3u32 as i32;
-pub const STATUS_GRAPHICS_INVALID_POINTER: ::NTSTATUS = 0xC01E05E4u32 as i32;
-pub const STATUS_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE: ::NTSTATUS = 0xC01E05E5u32 as i32;
-pub const STATUS_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL: ::NTSTATUS = 0xC01E05E6u32 as i32;
-pub const STATUS_GRAPHICS_INTERNAL_ERROR: ::NTSTATUS = 0xC01E05E7u32 as i32;
-pub const STATUS_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS: ::NTSTATUS = 0xC01E05E8u32 as i32;
-pub const STATUS_FVE_LOCKED_VOLUME: ::NTSTATUS = 0xC0210000u32 as i32;
-pub const STATUS_FVE_NOT_ENCRYPTED: ::NTSTATUS = 0xC0210001u32 as i32;
-pub const STATUS_FVE_BAD_INFORMATION: ::NTSTATUS = 0xC0210002u32 as i32;
-pub const STATUS_FVE_TOO_SMALL: ::NTSTATUS = 0xC0210003u32 as i32;
-pub const STATUS_FVE_FAILED_WRONG_FS: ::NTSTATUS = 0xC0210004u32 as i32;
-pub const STATUS_FVE_BAD_PARTITION_SIZE: ::NTSTATUS = 0xC0210005u32 as i32;
-pub const STATUS_FVE_FS_NOT_EXTENDED: ::NTSTATUS = 0xC0210006u32 as i32;
-pub const STATUS_FVE_FS_MOUNTED: ::NTSTATUS = 0xC0210007u32 as i32;
-pub const STATUS_FVE_NO_LICENSE: ::NTSTATUS = 0xC0210008u32 as i32;
-pub const STATUS_FVE_ACTION_NOT_ALLOWED: ::NTSTATUS = 0xC0210009u32 as i32;
-pub const STATUS_FVE_BAD_DATA: ::NTSTATUS = 0xC021000Au32 as i32;
-pub const STATUS_FVE_VOLUME_NOT_BOUND: ::NTSTATUS = 0xC021000Bu32 as i32;
-pub const STATUS_FVE_NOT_DATA_VOLUME: ::NTSTATUS = 0xC021000Cu32 as i32;
-pub const STATUS_FVE_CONV_READ_ERROR: ::NTSTATUS = 0xC021000Du32 as i32;
-pub const STATUS_FVE_CONV_WRITE_ERROR: ::NTSTATUS = 0xC021000Eu32 as i32;
-pub const STATUS_FVE_OVERLAPPED_UPDATE: ::NTSTATUS = 0xC021000Fu32 as i32;
-pub const STATUS_FVE_FAILED_SECTOR_SIZE: ::NTSTATUS = 0xC0210010u32 as i32;
-pub const STATUS_FVE_FAILED_AUTHENTICATION: ::NTSTATUS = 0xC0210011u32 as i32;
-pub const STATUS_FVE_NOT_OS_VOLUME: ::NTSTATUS = 0xC0210012u32 as i32;
-pub const STATUS_FVE_KEYFILE_NOT_FOUND: ::NTSTATUS = 0xC0210013u32 as i32;
-pub const STATUS_FVE_KEYFILE_INVALID: ::NTSTATUS = 0xC0210014u32 as i32;
-pub const STATUS_FVE_KEYFILE_NO_VMK: ::NTSTATUS = 0xC0210015u32 as i32;
-pub const STATUS_FVE_TPM_DISABLED: ::NTSTATUS = 0xC0210016u32 as i32;
-pub const STATUS_FVE_TPM_SRK_AUTH_NOT_ZERO: ::NTSTATUS = 0xC0210017u32 as i32;
-pub const STATUS_FVE_TPM_INVALID_PCR: ::NTSTATUS = 0xC0210018u32 as i32;
-pub const STATUS_FVE_TPM_NO_VMK: ::NTSTATUS = 0xC0210019u32 as i32;
-pub const STATUS_FVE_PIN_INVALID: ::NTSTATUS = 0xC021001Au32 as i32;
-pub const STATUS_FVE_AUTH_INVALID_APPLICATION: ::NTSTATUS = 0xC021001Bu32 as i32;
-pub const STATUS_FVE_AUTH_INVALID_CONFIG: ::NTSTATUS = 0xC021001Cu32 as i32;
-pub const STATUS_FVE_DEBUGGER_ENABLED: ::NTSTATUS = 0xC021001Du32 as i32;
-pub const STATUS_FVE_DRY_RUN_FAILED: ::NTSTATUS = 0xC021001Eu32 as i32;
-pub const STATUS_FVE_BAD_METADATA_POINTER: ::NTSTATUS = 0xC021001Fu32 as i32;
-pub const STATUS_FVE_OLD_METADATA_COPY: ::NTSTATUS = 0xC0210020u32 as i32;
-pub const STATUS_FVE_REBOOT_REQUIRED: ::NTSTATUS = 0xC0210021u32 as i32;
-pub const STATUS_FVE_RAW_ACCESS: ::NTSTATUS = 0xC0210022u32 as i32;
-pub const STATUS_FVE_RAW_BLOCKED: ::NTSTATUS = 0xC0210023u32 as i32;
-pub const STATUS_FVE_NO_AUTOUNLOCK_MASTER_KEY: ::NTSTATUS = 0xC0210024u32 as i32;
-pub const STATUS_FVE_MOR_FAILED: ::NTSTATUS = 0xC0210025u32 as i32;
-pub const STATUS_FVE_NO_FEATURE_LICENSE: ::NTSTATUS = 0xC0210026u32 as i32;
-pub const STATUS_FVE_POLICY_USER_DISABLE_RDV_NOT_ALLOWED: ::NTSTATUS = 0xC0210027u32 as i32;
-pub const STATUS_FVE_CONV_RECOVERY_FAILED: ::NTSTATUS = 0xC0210028u32 as i32;
-pub const STATUS_FVE_VIRTUALIZED_SPACE_TOO_BIG: ::NTSTATUS = 0xC0210029u32 as i32;
-pub const STATUS_FVE_INVALID_DATUM_TYPE: ::NTSTATUS = 0xC021002Au32 as i32;
-pub const STATUS_FVE_VOLUME_TOO_SMALL: ::NTSTATUS = 0xC0210030u32 as i32;
-pub const STATUS_FVE_ENH_PIN_INVALID: ::NTSTATUS = 0xC0210031u32 as i32;
-pub const STATUS_FVE_FULL_ENCRYPTION_NOT_ALLOWED_ON_TP_STORAGE: ::NTSTATUS = 0xC0210032u32 as i32;
-pub const STATUS_FVE_WIPE_NOT_ALLOWED_ON_TP_STORAGE: ::NTSTATUS = 0xC0210033u32 as i32;
-pub const STATUS_FVE_NOT_ALLOWED_ON_CSV_STACK: ::NTSTATUS = 0xC0210034u32 as i32;
-pub const STATUS_FVE_NOT_ALLOWED_ON_CLUSTER: ::NTSTATUS = 0xC0210035u32 as i32;
-pub const STATUS_FVE_NOT_ALLOWED_TO_UPGRADE_WHILE_CONVERTING: ::NTSTATUS = 0xC0210036u32 as i32;
-pub const STATUS_FVE_WIPE_CANCEL_NOT_APPLICABLE: ::NTSTATUS = 0xC0210037u32 as i32;
-pub const STATUS_FVE_EDRIVE_DRY_RUN_FAILED: ::NTSTATUS = 0xC0210038u32 as i32;
-pub const STATUS_FVE_SECUREBOOT_DISABLED: ::NTSTATUS = 0xC0210039u32 as i32;
-pub const STATUS_FVE_SECUREBOOT_CONFIG_CHANGE: ::NTSTATUS = 0xC021003Au32 as i32;
-pub const STATUS_FVE_DEVICE_LOCKEDOUT: ::NTSTATUS = 0xC021003Bu32 as i32;
-pub const STATUS_FVE_VOLUME_EXTEND_PREVENTS_EOW_DECRYPT: ::NTSTATUS = 0xC021003Cu32 as i32;
-pub const STATUS_FVE_NOT_DE_VOLUME: ::NTSTATUS = 0xC021003Du32 as i32;
-pub const STATUS_FVE_PROTECTION_DISABLED: ::NTSTATUS = 0xC021003Eu32 as i32;
-pub const STATUS_FVE_PROTECTION_CANNOT_BE_DISABLED: ::NTSTATUS = 0xC021003Fu32 as i32;
-pub const STATUS_FWP_CALLOUT_NOT_FOUND: ::NTSTATUS = 0xC0220001u32 as i32;
-pub const STATUS_FWP_CONDITION_NOT_FOUND: ::NTSTATUS = 0xC0220002u32 as i32;
-pub const STATUS_FWP_FILTER_NOT_FOUND: ::NTSTATUS = 0xC0220003u32 as i32;
-pub const STATUS_FWP_LAYER_NOT_FOUND: ::NTSTATUS = 0xC0220004u32 as i32;
-pub const STATUS_FWP_PROVIDER_NOT_FOUND: ::NTSTATUS = 0xC0220005u32 as i32;
-pub const STATUS_FWP_PROVIDER_CONTEXT_NOT_FOUND: ::NTSTATUS = 0xC0220006u32 as i32;
-pub const STATUS_FWP_SUBLAYER_NOT_FOUND: ::NTSTATUS = 0xC0220007u32 as i32;
-pub const STATUS_FWP_NOT_FOUND: ::NTSTATUS = 0xC0220008u32 as i32;
-pub const STATUS_FWP_ALREADY_EXISTS: ::NTSTATUS = 0xC0220009u32 as i32;
-pub const STATUS_FWP_IN_USE: ::NTSTATUS = 0xC022000Au32 as i32;
-pub const STATUS_FWP_DYNAMIC_SESSION_IN_PROGRESS: ::NTSTATUS = 0xC022000Bu32 as i32;
-pub const STATUS_FWP_WRONG_SESSION: ::NTSTATUS = 0xC022000Cu32 as i32;
-pub const STATUS_FWP_NO_TXN_IN_PROGRESS: ::NTSTATUS = 0xC022000Du32 as i32;
-pub const STATUS_FWP_TXN_IN_PROGRESS: ::NTSTATUS = 0xC022000Eu32 as i32;
-pub const STATUS_FWP_TXN_ABORTED: ::NTSTATUS = 0xC022000Fu32 as i32;
-pub const STATUS_FWP_SESSION_ABORTED: ::NTSTATUS = 0xC0220010u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_TXN: ::NTSTATUS = 0xC0220011u32 as i32;
-pub const STATUS_FWP_TIMEOUT: ::NTSTATUS = 0xC0220012u32 as i32;
-pub const STATUS_FWP_NET_EVENTS_DISABLED: ::NTSTATUS = 0xC0220013u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_LAYER: ::NTSTATUS = 0xC0220014u32 as i32;
-pub const STATUS_FWP_KM_CLIENTS_ONLY: ::NTSTATUS = 0xC0220015u32 as i32;
-pub const STATUS_FWP_LIFETIME_MISMATCH: ::NTSTATUS = 0xC0220016u32 as i32;
-pub const STATUS_FWP_BUILTIN_OBJECT: ::NTSTATUS = 0xC0220017u32 as i32;
-pub const STATUS_FWP_TOO_MANY_CALLOUTS: ::NTSTATUS = 0xC0220018u32 as i32;
-pub const STATUS_FWP_NOTIFICATION_DROPPED: ::NTSTATUS = 0xC0220019u32 as i32;
-pub const STATUS_FWP_TRAFFIC_MISMATCH: ::NTSTATUS = 0xC022001Au32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_SA_STATE: ::NTSTATUS = 0xC022001Bu32 as i32;
-pub const STATUS_FWP_NULL_POINTER: ::NTSTATUS = 0xC022001Cu32 as i32;
-pub const STATUS_FWP_INVALID_ENUMERATOR: ::NTSTATUS = 0xC022001Du32 as i32;
-pub const STATUS_FWP_INVALID_FLAGS: ::NTSTATUS = 0xC022001Eu32 as i32;
-pub const STATUS_FWP_INVALID_NET_MASK: ::NTSTATUS = 0xC022001Fu32 as i32;
-pub const STATUS_FWP_INVALID_RANGE: ::NTSTATUS = 0xC0220020u32 as i32;
-pub const STATUS_FWP_INVALID_INTERVAL: ::NTSTATUS = 0xC0220021u32 as i32;
-pub const STATUS_FWP_ZERO_LENGTH_ARRAY: ::NTSTATUS = 0xC0220022u32 as i32;
-pub const STATUS_FWP_NULL_DISPLAY_NAME: ::NTSTATUS = 0xC0220023u32 as i32;
-pub const STATUS_FWP_INVALID_ACTION_TYPE: ::NTSTATUS = 0xC0220024u32 as i32;
-pub const STATUS_FWP_INVALID_WEIGHT: ::NTSTATUS = 0xC0220025u32 as i32;
-pub const STATUS_FWP_MATCH_TYPE_MISMATCH: ::NTSTATUS = 0xC0220026u32 as i32;
-pub const STATUS_FWP_TYPE_MISMATCH: ::NTSTATUS = 0xC0220027u32 as i32;
-pub const STATUS_FWP_OUT_OF_BOUNDS: ::NTSTATUS = 0xC0220028u32 as i32;
-pub const STATUS_FWP_RESERVED: ::NTSTATUS = 0xC0220029u32 as i32;
-pub const STATUS_FWP_DUPLICATE_CONDITION: ::NTSTATUS = 0xC022002Au32 as i32;
-pub const STATUS_FWP_DUPLICATE_KEYMOD: ::NTSTATUS = 0xC022002Bu32 as i32;
-pub const STATUS_FWP_ACTION_INCOMPATIBLE_WITH_LAYER: ::NTSTATUS = 0xC022002Cu32 as i32;
-pub const STATUS_FWP_ACTION_INCOMPATIBLE_WITH_SUBLAYER: ::NTSTATUS = 0xC022002Du32 as i32;
-pub const STATUS_FWP_CONTEXT_INCOMPATIBLE_WITH_LAYER: ::NTSTATUS = 0xC022002Eu32 as i32;
-pub const STATUS_FWP_CONTEXT_INCOMPATIBLE_WITH_CALLOUT: ::NTSTATUS = 0xC022002Fu32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_AUTH_METHOD: ::NTSTATUS = 0xC0220030u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_DH_GROUP: ::NTSTATUS = 0xC0220031u32 as i32;
-pub const STATUS_FWP_EM_NOT_SUPPORTED: ::NTSTATUS = 0xC0220032u32 as i32;
-pub const STATUS_FWP_NEVER_MATCH: ::NTSTATUS = 0xC0220033u32 as i32;
-pub const STATUS_FWP_PROVIDER_CONTEXT_MISMATCH: ::NTSTATUS = 0xC0220034u32 as i32;
-pub const STATUS_FWP_INVALID_PARAMETER: ::NTSTATUS = 0xC0220035u32 as i32;
-pub const STATUS_FWP_TOO_MANY_SUBLAYERS: ::NTSTATUS = 0xC0220036u32 as i32;
-pub const STATUS_FWP_CALLOUT_NOTIFICATION_FAILED: ::NTSTATUS = 0xC0220037u32 as i32;
-pub const STATUS_FWP_INVALID_AUTH_TRANSFORM: ::NTSTATUS = 0xC0220038u32 as i32;
-pub const STATUS_FWP_INVALID_CIPHER_TRANSFORM: ::NTSTATUS = 0xC0220039u32 as i32;
-pub const STATUS_FWP_INCOMPATIBLE_CIPHER_TRANSFORM: ::NTSTATUS = 0xC022003Au32 as i32;
-pub const STATUS_FWP_INVALID_TRANSFORM_COMBINATION: ::NTSTATUS = 0xC022003Bu32 as i32;
-pub const STATUS_FWP_DUPLICATE_AUTH_METHOD: ::NTSTATUS = 0xC022003Cu32 as i32;
-pub const STATUS_FWP_INVALID_TUNNEL_ENDPOINT: ::NTSTATUS = 0xC022003Du32 as i32;
-pub const STATUS_FWP_L2_DRIVER_NOT_READY: ::NTSTATUS = 0xC022003Eu32 as i32;
-pub const STATUS_FWP_KEY_DICTATOR_ALREADY_REGISTERED: ::NTSTATUS = 0xC022003Fu32 as i32;
-pub const STATUS_FWP_KEY_DICTATION_INVALID_KEYING_MATERIAL: ::NTSTATUS = 0xC0220040u32 as i32;
-pub const STATUS_FWP_CONNECTIONS_DISABLED: ::NTSTATUS = 0xC0220041u32 as i32;
-pub const STATUS_FWP_INVALID_DNS_NAME: ::NTSTATUS = 0xC0220042u32 as i32;
-pub const STATUS_FWP_STILL_ON: ::NTSTATUS = 0xC0220043u32 as i32;
-pub const STATUS_FWP_IKEEXT_NOT_RUNNING: ::NTSTATUS = 0xC0220044u32 as i32;
-pub const STATUS_FWP_TCPIP_NOT_READY: ::NTSTATUS = 0xC0220100u32 as i32;
-pub const STATUS_FWP_INJECT_HANDLE_CLOSING: ::NTSTATUS = 0xC0220101u32 as i32;
-pub const STATUS_FWP_INJECT_HANDLE_STALE: ::NTSTATUS = 0xC0220102u32 as i32;
-pub const STATUS_FWP_CANNOT_PEND: ::NTSTATUS = 0xC0220103u32 as i32;
-pub const STATUS_FWP_DROP_NOICMP: ::NTSTATUS = 0xC0220104u32 as i32;
-pub const STATUS_NDIS_CLOSING: ::NTSTATUS = 0xC0230002u32 as i32;
-pub const STATUS_NDIS_BAD_VERSION: ::NTSTATUS = 0xC0230004u32 as i32;
-pub const STATUS_NDIS_BAD_CHARACTERISTICS: ::NTSTATUS = 0xC0230005u32 as i32;
-pub const STATUS_NDIS_ADAPTER_NOT_FOUND: ::NTSTATUS = 0xC0230006u32 as i32;
-pub const STATUS_NDIS_OPEN_FAILED: ::NTSTATUS = 0xC0230007u32 as i32;
-pub const STATUS_NDIS_DEVICE_FAILED: ::NTSTATUS = 0xC0230008u32 as i32;
-pub const STATUS_NDIS_MULTICAST_FULL: ::NTSTATUS = 0xC0230009u32 as i32;
-pub const STATUS_NDIS_MULTICAST_EXISTS: ::NTSTATUS = 0xC023000Au32 as i32;
-pub const STATUS_NDIS_MULTICAST_NOT_FOUND: ::NTSTATUS = 0xC023000Bu32 as i32;
-pub const STATUS_NDIS_REQUEST_ABORTED: ::NTSTATUS = 0xC023000Cu32 as i32;
-pub const STATUS_NDIS_RESET_IN_PROGRESS: ::NTSTATUS = 0xC023000Du32 as i32;
-pub const STATUS_NDIS_NOT_SUPPORTED: ::NTSTATUS = 0xC02300BBu32 as i32;
-pub const STATUS_NDIS_INVALID_PACKET: ::NTSTATUS = 0xC023000Fu32 as i32;
-pub const STATUS_NDIS_ADAPTER_NOT_READY: ::NTSTATUS = 0xC0230011u32 as i32;
-pub const STATUS_NDIS_INVALID_LENGTH: ::NTSTATUS = 0xC0230014u32 as i32;
-pub const STATUS_NDIS_INVALID_DATA: ::NTSTATUS = 0xC0230015u32 as i32;
-pub const STATUS_NDIS_BUFFER_TOO_SHORT: ::NTSTATUS = 0xC0230016u32 as i32;
-pub const STATUS_NDIS_INVALID_OID: ::NTSTATUS = 0xC0230017u32 as i32;
-pub const STATUS_NDIS_ADAPTER_REMOVED: ::NTSTATUS = 0xC0230018u32 as i32;
-pub const STATUS_NDIS_UNSUPPORTED_MEDIA: ::NTSTATUS = 0xC0230019u32 as i32;
-pub const STATUS_NDIS_GROUP_ADDRESS_IN_USE: ::NTSTATUS = 0xC023001Au32 as i32;
-pub const STATUS_NDIS_FILE_NOT_FOUND: ::NTSTATUS = 0xC023001Bu32 as i32;
-pub const STATUS_NDIS_ERROR_READING_FILE: ::NTSTATUS = 0xC023001Cu32 as i32;
-pub const STATUS_NDIS_ALREADY_MAPPED: ::NTSTATUS = 0xC023001Du32 as i32;
-pub const STATUS_NDIS_RESOURCE_CONFLICT: ::NTSTATUS = 0xC023001Eu32 as i32;
-pub const STATUS_NDIS_MEDIA_DISCONNECTED: ::NTSTATUS = 0xC023001Fu32 as i32;
-pub const STATUS_NDIS_INVALID_ADDRESS: ::NTSTATUS = 0xC0230022u32 as i32;
-pub const STATUS_NDIS_INVALID_DEVICE_REQUEST: ::NTSTATUS = 0xC0230010u32 as i32;
-pub const STATUS_NDIS_PAUSED: ::NTSTATUS = 0xC023002Au32 as i32;
-pub const STATUS_NDIS_INTERFACE_NOT_FOUND: ::NTSTATUS = 0xC023002Bu32 as i32;
-pub const STATUS_NDIS_UNSUPPORTED_REVISION: ::NTSTATUS = 0xC023002Cu32 as i32;
-pub const STATUS_NDIS_INVALID_PORT: ::NTSTATUS = 0xC023002Du32 as i32;
-pub const STATUS_NDIS_INVALID_PORT_STATE: ::NTSTATUS = 0xC023002Eu32 as i32;
-pub const STATUS_NDIS_LOW_POWER_STATE: ::NTSTATUS = 0xC023002Fu32 as i32;
-pub const STATUS_NDIS_REINIT_REQUIRED: ::NTSTATUS = 0xC0230030u32 as i32;
-pub const STATUS_NDIS_DOT11_AUTO_CONFIG_ENABLED: ::NTSTATUS = 0xC0232000u32 as i32;
-pub const STATUS_NDIS_DOT11_MEDIA_IN_USE: ::NTSTATUS = 0xC0232001u32 as i32;
-pub const STATUS_NDIS_DOT11_POWER_STATE_INVALID: ::NTSTATUS = 0xC0232002u32 as i32;
-pub const STATUS_NDIS_PM_WOL_PATTERN_LIST_FULL: ::NTSTATUS = 0xC0232003u32 as i32;
-pub const STATUS_NDIS_PM_PROTOCOL_OFFLOAD_LIST_FULL: ::NTSTATUS = 0xC0232004u32 as i32;
-pub const STATUS_NDIS_INDICATION_REQUIRED: ::NTSTATUS = 0x40230001;
-pub const STATUS_NDIS_OFFLOAD_POLICY: ::NTSTATUS = 0xC023100Fu32 as i32;
-pub const STATUS_NDIS_OFFLOAD_CONNECTION_REJECTED: ::NTSTATUS = 0xC0231012u32 as i32;
-pub const STATUS_NDIS_OFFLOAD_PATH_REJECTED: ::NTSTATUS = 0xC0231013u32 as i32;
-pub const STATUS_TPM_ERROR_MASK: ::NTSTATUS = 0xC0290000u32 as i32;
-pub const STATUS_TPM_AUTHFAIL: ::NTSTATUS = 0xC0290001u32 as i32;
-pub const STATUS_TPM_BADINDEX: ::NTSTATUS = 0xC0290002u32 as i32;
-pub const STATUS_TPM_BAD_PARAMETER: ::NTSTATUS = 0xC0290003u32 as i32;
-pub const STATUS_TPM_AUDITFAILURE: ::NTSTATUS = 0xC0290004u32 as i32;
-pub const STATUS_TPM_CLEAR_DISABLED: ::NTSTATUS = 0xC0290005u32 as i32;
-pub const STATUS_TPM_DEACTIVATED: ::NTSTATUS = 0xC0290006u32 as i32;
-pub const STATUS_TPM_DISABLED: ::NTSTATUS = 0xC0290007u32 as i32;
-pub const STATUS_TPM_DISABLED_CMD: ::NTSTATUS = 0xC0290008u32 as i32;
-pub const STATUS_TPM_FAIL: ::NTSTATUS = 0xC0290009u32 as i32;
-pub const STATUS_TPM_BAD_ORDINAL: ::NTSTATUS = 0xC029000Au32 as i32;
-pub const STATUS_TPM_INSTALL_DISABLED: ::NTSTATUS = 0xC029000Bu32 as i32;
-pub const STATUS_TPM_INVALID_KEYHANDLE: ::NTSTATUS = 0xC029000Cu32 as i32;
-pub const STATUS_TPM_KEYNOTFOUND: ::NTSTATUS = 0xC029000Du32 as i32;
-pub const STATUS_TPM_INAPPROPRIATE_ENC: ::NTSTATUS = 0xC029000Eu32 as i32;
-pub const STATUS_TPM_MIGRATEFAIL: ::NTSTATUS = 0xC029000Fu32 as i32;
-pub const STATUS_TPM_INVALID_PCR_INFO: ::NTSTATUS = 0xC0290010u32 as i32;
-pub const STATUS_TPM_NOSPACE: ::NTSTATUS = 0xC0290011u32 as i32;
-pub const STATUS_TPM_NOSRK: ::NTSTATUS = 0xC0290012u32 as i32;
-pub const STATUS_TPM_NOTSEALED_BLOB: ::NTSTATUS = 0xC0290013u32 as i32;
-pub const STATUS_TPM_OWNER_SET: ::NTSTATUS = 0xC0290014u32 as i32;
-pub const STATUS_TPM_RESOURCES: ::NTSTATUS = 0xC0290015u32 as i32;
-pub const STATUS_TPM_SHORTRANDOM: ::NTSTATUS = 0xC0290016u32 as i32;
-pub const STATUS_TPM_SIZE: ::NTSTATUS = 0xC0290017u32 as i32;
-pub const STATUS_TPM_WRONGPCRVAL: ::NTSTATUS = 0xC0290018u32 as i32;
-pub const STATUS_TPM_BAD_PARAM_SIZE: ::NTSTATUS = 0xC0290019u32 as i32;
-pub const STATUS_TPM_SHA_THREAD: ::NTSTATUS = 0xC029001Au32 as i32;
-pub const STATUS_TPM_SHA_ERROR: ::NTSTATUS = 0xC029001Bu32 as i32;
-pub const STATUS_TPM_FAILEDSELFTEST: ::NTSTATUS = 0xC029001Cu32 as i32;
-pub const STATUS_TPM_AUTH2FAIL: ::NTSTATUS = 0xC029001Du32 as i32;
-pub const STATUS_TPM_BADTAG: ::NTSTATUS = 0xC029001Eu32 as i32;
-pub const STATUS_TPM_IOERROR: ::NTSTATUS = 0xC029001Fu32 as i32;
-pub const STATUS_TPM_ENCRYPT_ERROR: ::NTSTATUS = 0xC0290020u32 as i32;
-pub const STATUS_TPM_DECRYPT_ERROR: ::NTSTATUS = 0xC0290021u32 as i32;
-pub const STATUS_TPM_INVALID_AUTHHANDLE: ::NTSTATUS = 0xC0290022u32 as i32;
-pub const STATUS_TPM_NO_ENDORSEMENT: ::NTSTATUS = 0xC0290023u32 as i32;
-pub const STATUS_TPM_INVALID_KEYUSAGE: ::NTSTATUS = 0xC0290024u32 as i32;
-pub const STATUS_TPM_WRONG_ENTITYTYPE: ::NTSTATUS = 0xC0290025u32 as i32;
-pub const STATUS_TPM_INVALID_POSTINIT: ::NTSTATUS = 0xC0290026u32 as i32;
-pub const STATUS_TPM_INAPPROPRIATE_SIG: ::NTSTATUS = 0xC0290027u32 as i32;
-pub const STATUS_TPM_BAD_KEY_PROPERTY: ::NTSTATUS = 0xC0290028u32 as i32;
-pub const STATUS_TPM_BAD_MIGRATION: ::NTSTATUS = 0xC0290029u32 as i32;
-pub const STATUS_TPM_BAD_SCHEME: ::NTSTATUS = 0xC029002Au32 as i32;
-pub const STATUS_TPM_BAD_DATASIZE: ::NTSTATUS = 0xC029002Bu32 as i32;
-pub const STATUS_TPM_BAD_MODE: ::NTSTATUS = 0xC029002Cu32 as i32;
-pub const STATUS_TPM_BAD_PRESENCE: ::NTSTATUS = 0xC029002Du32 as i32;
-pub const STATUS_TPM_BAD_VERSION: ::NTSTATUS = 0xC029002Eu32 as i32;
-pub const STATUS_TPM_NO_WRAP_TRANSPORT: ::NTSTATUS = 0xC029002Fu32 as i32;
-pub const STATUS_TPM_AUDITFAIL_UNSUCCESSFUL: ::NTSTATUS = 0xC0290030u32 as i32;
-pub const STATUS_TPM_AUDITFAIL_SUCCESSFUL: ::NTSTATUS = 0xC0290031u32 as i32;
-pub const STATUS_TPM_NOTRESETABLE: ::NTSTATUS = 0xC0290032u32 as i32;
-pub const STATUS_TPM_NOTLOCAL: ::NTSTATUS = 0xC0290033u32 as i32;
-pub const STATUS_TPM_BAD_TYPE: ::NTSTATUS = 0xC0290034u32 as i32;
-pub const STATUS_TPM_INVALID_RESOURCE: ::NTSTATUS = 0xC0290035u32 as i32;
-pub const STATUS_TPM_NOTFIPS: ::NTSTATUS = 0xC0290036u32 as i32;
-pub const STATUS_TPM_INVALID_FAMILY: ::NTSTATUS = 0xC0290037u32 as i32;
-pub const STATUS_TPM_NO_NV_PERMISSION: ::NTSTATUS = 0xC0290038u32 as i32;
-pub const STATUS_TPM_REQUIRES_SIGN: ::NTSTATUS = 0xC0290039u32 as i32;
-pub const STATUS_TPM_KEY_NOTSUPPORTED: ::NTSTATUS = 0xC029003Au32 as i32;
-pub const STATUS_TPM_AUTH_CONFLICT: ::NTSTATUS = 0xC029003Bu32 as i32;
-pub const STATUS_TPM_AREA_LOCKED: ::NTSTATUS = 0xC029003Cu32 as i32;
-pub const STATUS_TPM_BAD_LOCALITY: ::NTSTATUS = 0xC029003Du32 as i32;
-pub const STATUS_TPM_READ_ONLY: ::NTSTATUS = 0xC029003Eu32 as i32;
-pub const STATUS_TPM_PER_NOWRITE: ::NTSTATUS = 0xC029003Fu32 as i32;
-pub const STATUS_TPM_FAMILYCOUNT: ::NTSTATUS = 0xC0290040u32 as i32;
-pub const STATUS_TPM_WRITE_LOCKED: ::NTSTATUS = 0xC0290041u32 as i32;
-pub const STATUS_TPM_BAD_ATTRIBUTES: ::NTSTATUS = 0xC0290042u32 as i32;
-pub const STATUS_TPM_INVALID_STRUCTURE: ::NTSTATUS = 0xC0290043u32 as i32;
-pub const STATUS_TPM_KEY_OWNER_CONTROL: ::NTSTATUS = 0xC0290044u32 as i32;
-pub const STATUS_TPM_BAD_COUNTER: ::NTSTATUS = 0xC0290045u32 as i32;
-pub const STATUS_TPM_NOT_FULLWRITE: ::NTSTATUS = 0xC0290046u32 as i32;
-pub const STATUS_TPM_CONTEXT_GAP: ::NTSTATUS = 0xC0290047u32 as i32;
-pub const STATUS_TPM_MAXNVWRITES: ::NTSTATUS = 0xC0290048u32 as i32;
-pub const STATUS_TPM_NOOPERATOR: ::NTSTATUS = 0xC0290049u32 as i32;
-pub const STATUS_TPM_RESOURCEMISSING: ::NTSTATUS = 0xC029004Au32 as i32;
-pub const STATUS_TPM_DELEGATE_LOCK: ::NTSTATUS = 0xC029004Bu32 as i32;
-pub const STATUS_TPM_DELEGATE_FAMILY: ::NTSTATUS = 0xC029004Cu32 as i32;
-pub const STATUS_TPM_DELEGATE_ADMIN: ::NTSTATUS = 0xC029004Du32 as i32;
-pub const STATUS_TPM_TRANSPORT_NOTEXCLUSIVE: ::NTSTATUS = 0xC029004Eu32 as i32;
-pub const STATUS_TPM_OWNER_CONTROL: ::NTSTATUS = 0xC029004Fu32 as i32;
-pub const STATUS_TPM_DAA_RESOURCES: ::NTSTATUS = 0xC0290050u32 as i32;
-pub const STATUS_TPM_DAA_INPUT_DATA0: ::NTSTATUS = 0xC0290051u32 as i32;
-pub const STATUS_TPM_DAA_INPUT_DATA1: ::NTSTATUS = 0xC0290052u32 as i32;
-pub const STATUS_TPM_DAA_ISSUER_SETTINGS: ::NTSTATUS = 0xC0290053u32 as i32;
-pub const STATUS_TPM_DAA_TPM_SETTINGS: ::NTSTATUS = 0xC0290054u32 as i32;
-pub const STATUS_TPM_DAA_STAGE: ::NTSTATUS = 0xC0290055u32 as i32;
-pub const STATUS_TPM_DAA_ISSUER_VALIDITY: ::NTSTATUS = 0xC0290056u32 as i32;
-pub const STATUS_TPM_DAA_WRONG_W: ::NTSTATUS = 0xC0290057u32 as i32;
-pub const STATUS_TPM_BAD_HANDLE: ::NTSTATUS = 0xC0290058u32 as i32;
-pub const STATUS_TPM_BAD_DELEGATE: ::NTSTATUS = 0xC0290059u32 as i32;
-pub const STATUS_TPM_BADCONTEXT: ::NTSTATUS = 0xC029005Au32 as i32;
-pub const STATUS_TPM_TOOMANYCONTEXTS: ::NTSTATUS = 0xC029005Bu32 as i32;
-pub const STATUS_TPM_MA_TICKET_SIGNATURE: ::NTSTATUS = 0xC029005Cu32 as i32;
-pub const STATUS_TPM_MA_DESTINATION: ::NTSTATUS = 0xC029005Du32 as i32;
-pub const STATUS_TPM_MA_SOURCE: ::NTSTATUS = 0xC029005Eu32 as i32;
-pub const STATUS_TPM_MA_AUTHORITY: ::NTSTATUS = 0xC029005Fu32 as i32;
-pub const STATUS_TPM_PERMANENTEK: ::NTSTATUS = 0xC0290061u32 as i32;
-pub const STATUS_TPM_BAD_SIGNATURE: ::NTSTATUS = 0xC0290062u32 as i32;
-pub const STATUS_TPM_NOCONTEXTSPACE: ::NTSTATUS = 0xC0290063u32 as i32;
-pub const STATUS_TPM_COMMAND_BLOCKED: ::NTSTATUS = 0xC0290400u32 as i32;
-pub const STATUS_TPM_INVALID_HANDLE: ::NTSTATUS = 0xC0290401u32 as i32;
-pub const STATUS_TPM_DUPLICATE_VHANDLE: ::NTSTATUS = 0xC0290402u32 as i32;
-pub const STATUS_TPM_EMBEDDED_COMMAND_BLOCKED: ::NTSTATUS = 0xC0290403u32 as i32;
-pub const STATUS_TPM_EMBEDDED_COMMAND_UNSUPPORTED: ::NTSTATUS = 0xC0290404u32 as i32;
-pub const STATUS_TPM_RETRY: ::NTSTATUS = 0xC0290800u32 as i32;
-pub const STATUS_TPM_NEEDS_SELFTEST: ::NTSTATUS = 0xC0290801u32 as i32;
-pub const STATUS_TPM_DOING_SELFTEST: ::NTSTATUS = 0xC0290802u32 as i32;
-pub const STATUS_TPM_DEFEND_LOCK_RUNNING: ::NTSTATUS = 0xC0290803u32 as i32;
-pub const STATUS_TPM_COMMAND_CANCELED: ::NTSTATUS = 0xC0291001u32 as i32;
-pub const STATUS_TPM_TOO_MANY_CONTEXTS: ::NTSTATUS = 0xC0291002u32 as i32;
-pub const STATUS_TPM_NOT_FOUND: ::NTSTATUS = 0xC0291003u32 as i32;
-pub const STATUS_TPM_ACCESS_DENIED: ::NTSTATUS = 0xC0291004u32 as i32;
-pub const STATUS_TPM_INSUFFICIENT_BUFFER: ::NTSTATUS = 0xC0291005u32 as i32;
-pub const STATUS_TPM_PPI_FUNCTION_UNSUPPORTED: ::NTSTATUS = 0xC0291006u32 as i32;
-pub const STATUS_PCP_ERROR_MASK: ::NTSTATUS = 0xC0292000u32 as i32;
-pub const STATUS_PCP_DEVICE_NOT_READY: ::NTSTATUS = 0xC0292001u32 as i32;
-pub const STATUS_PCP_INVALID_HANDLE: ::NTSTATUS = 0xC0292002u32 as i32;
-pub const STATUS_PCP_INVALID_PARAMETER: ::NTSTATUS = 0xC0292003u32 as i32;
-pub const STATUS_PCP_FLAG_NOT_SUPPORTED: ::NTSTATUS = 0xC0292004u32 as i32;
-pub const STATUS_PCP_NOT_SUPPORTED: ::NTSTATUS = 0xC0292005u32 as i32;
-pub const STATUS_PCP_BUFFER_TOO_SMALL: ::NTSTATUS = 0xC0292006u32 as i32;
-pub const STATUS_PCP_INTERNAL_ERROR: ::NTSTATUS = 0xC0292007u32 as i32;
-pub const STATUS_PCP_AUTHENTICATION_FAILED: ::NTSTATUS = 0xC0292008u32 as i32;
-pub const STATUS_PCP_AUTHENTICATION_IGNORED: ::NTSTATUS = 0xC0292009u32 as i32;
-pub const STATUS_PCP_POLICY_NOT_FOUND: ::NTSTATUS = 0xC029200Au32 as i32;
-pub const STATUS_PCP_PROFILE_NOT_FOUND: ::NTSTATUS = 0xC029200Bu32 as i32;
-pub const STATUS_PCP_VALIDATION_FAILED: ::NTSTATUS = 0xC029200Cu32 as i32;
-pub const STATUS_PCP_DEVICE_NOT_FOUND: ::NTSTATUS = 0xC029200Du32 as i32;
-pub const STATUS_RTPM_CONTEXT_CONTINUE: ::NTSTATUS = 0x00293000;
-pub const STATUS_RTPM_CONTEXT_COMPLETE: ::NTSTATUS = 0x00293001;
-pub const STATUS_RTPM_NO_RESULT: ::NTSTATUS = 0xC0293002u32 as i32;
-pub const STATUS_RTPM_PCR_READ_INCOMPLETE: ::NTSTATUS = 0xC0293003u32 as i32;
-pub const STATUS_RTPM_INVALID_CONTEXT: ::NTSTATUS = 0xC0293004u32 as i32;
-pub const STATUS_RTPM_UNSUPPORTED_CMD: ::NTSTATUS = 0xC0293005u32 as i32;
-pub const STATUS_HV_INVALID_HYPERCALL_CODE: ::NTSTATUS = 0xC0350002u32 as i32;
-pub const STATUS_HV_INVALID_HYPERCALL_INPUT: ::NTSTATUS = 0xC0350003u32 as i32;
-pub const STATUS_HV_INVALID_ALIGNMENT: ::NTSTATUS = 0xC0350004u32 as i32;
-pub const STATUS_HV_INVALID_PARAMETER: ::NTSTATUS = 0xC0350005u32 as i32;
-pub const STATUS_HV_ACCESS_DENIED: ::NTSTATUS = 0xC0350006u32 as i32;
-pub const STATUS_HV_INVALID_PARTITION_STATE: ::NTSTATUS = 0xC0350007u32 as i32;
-pub const STATUS_HV_OPERATION_DENIED: ::NTSTATUS = 0xC0350008u32 as i32;
-pub const STATUS_HV_UNKNOWN_PROPERTY: ::NTSTATUS = 0xC0350009u32 as i32;
-pub const STATUS_HV_PROPERTY_VALUE_OUT_OF_RANGE: ::NTSTATUS = 0xC035000Au32 as i32;
-pub const STATUS_HV_INSUFFICIENT_MEMORY: ::NTSTATUS = 0xC035000Bu32 as i32;
-pub const STATUS_HV_PARTITION_TOO_DEEP: ::NTSTATUS = 0xC035000Cu32 as i32;
-pub const STATUS_HV_INVALID_PARTITION_ID: ::NTSTATUS = 0xC035000Du32 as i32;
-pub const STATUS_HV_INVALID_VP_INDEX: ::NTSTATUS = 0xC035000Eu32 as i32;
-pub const STATUS_HV_INVALID_PORT_ID: ::NTSTATUS = 0xC0350011u32 as i32;
-pub const STATUS_HV_INVALID_CONNECTION_ID: ::NTSTATUS = 0xC0350012u32 as i32;
-pub const STATUS_HV_INSUFFICIENT_BUFFERS: ::NTSTATUS = 0xC0350013u32 as i32;
-pub const STATUS_HV_NOT_ACKNOWLEDGED: ::NTSTATUS = 0xC0350014u32 as i32;
-pub const STATUS_HV_ACKNOWLEDGED: ::NTSTATUS = 0xC0350016u32 as i32;
-pub const STATUS_HV_INVALID_SAVE_RESTORE_STATE: ::NTSTATUS = 0xC0350017u32 as i32;
-pub const STATUS_HV_INVALID_SYNIC_STATE: ::NTSTATUS = 0xC0350018u32 as i32;
-pub const STATUS_HV_OBJECT_IN_USE: ::NTSTATUS = 0xC0350019u32 as i32;
-pub const STATUS_HV_INVALID_PROXIMITY_DOMAIN_INFO: ::NTSTATUS = 0xC035001Au32 as i32;
-pub const STATUS_HV_NO_DATA: ::NTSTATUS = 0xC035001Bu32 as i32;
-pub const STATUS_HV_INACTIVE: ::NTSTATUS = 0xC035001Cu32 as i32;
-pub const STATUS_HV_NO_RESOURCES: ::NTSTATUS = 0xC035001Du32 as i32;
-pub const STATUS_HV_FEATURE_UNAVAILABLE: ::NTSTATUS = 0xC035001Eu32 as i32;
-pub const STATUS_HV_INSUFFICIENT_BUFFER: ::NTSTATUS = 0xC0350033u32 as i32;
-pub const STATUS_HV_INSUFFICIENT_DEVICE_DOMAINS: ::NTSTATUS = 0xC0350038u32 as i32;
-pub const STATUS_HV_CPUID_FEATURE_VALIDATION_ERROR: ::NTSTATUS = 0xC035003Cu32 as i32;
-pub const STATUS_HV_CPUID_XSAVE_FEATURE_VALIDATION_ERROR: ::NTSTATUS = 0xC035003Du32 as i32;
-pub const STATUS_HV_PROCESSOR_STARTUP_TIMEOUT: ::NTSTATUS = 0xC035003Eu32 as i32;
-pub const STATUS_HV_SMX_ENABLED: ::NTSTATUS = 0xC035003Fu32 as i32;
-pub const STATUS_HV_INVALID_LP_INDEX: ::NTSTATUS = 0xC0350041u32 as i32;
-pub const STATUS_HV_INVALID_REGISTER_VALUE: ::NTSTATUS = 0xC0350050u32 as i32;
-pub const STATUS_HV_INVALID_VTL_STATE: ::NTSTATUS = 0xC0350051u32 as i32;
-pub const STATUS_HV_NX_NOT_DETECTED: ::NTSTATUS = 0xC0350055u32 as i32;
-pub const STATUS_HV_INVALID_DEVICE_ID: ::NTSTATUS = 0xC0350057u32 as i32;
-pub const STATUS_HV_INVALID_DEVICE_STATE: ::NTSTATUS = 0xC0350058u32 as i32;
-pub const STATUS_HV_PENDING_PAGE_REQUESTS: ::NTSTATUS = 0x00350059;
-pub const STATUS_HV_PAGE_REQUEST_INVALID: ::NTSTATUS = 0xC0350060u32 as i32;
-pub const STATUS_HV_NOT_PRESENT: ::NTSTATUS = 0xC0351000u32 as i32;
-pub const STATUS_VID_DUPLICATE_HANDLER: ::NTSTATUS = 0xC0370001u32 as i32;
-pub const STATUS_VID_TOO_MANY_HANDLERS: ::NTSTATUS = 0xC0370002u32 as i32;
-pub const STATUS_VID_QUEUE_FULL: ::NTSTATUS = 0xC0370003u32 as i32;
-pub const STATUS_VID_HANDLER_NOT_PRESENT: ::NTSTATUS = 0xC0370004u32 as i32;
-pub const STATUS_VID_INVALID_OBJECT_NAME: ::NTSTATUS = 0xC0370005u32 as i32;
-pub const STATUS_VID_PARTITION_NAME_TOO_LONG: ::NTSTATUS = 0xC0370006u32 as i32;
-pub const STATUS_VID_MESSAGE_QUEUE_NAME_TOO_LONG: ::NTSTATUS = 0xC0370007u32 as i32;
-pub const STATUS_VID_PARTITION_ALREADY_EXISTS: ::NTSTATUS = 0xC0370008u32 as i32;
-pub const STATUS_VID_PARTITION_DOES_NOT_EXIST: ::NTSTATUS = 0xC0370009u32 as i32;
-pub const STATUS_VID_PARTITION_NAME_NOT_FOUND: ::NTSTATUS = 0xC037000Au32 as i32;
-pub const STATUS_VID_MESSAGE_QUEUE_ALREADY_EXISTS: ::NTSTATUS = 0xC037000Bu32 as i32;
-pub const STATUS_VID_EXCEEDED_MBP_ENTRY_MAP_LIMIT: ::NTSTATUS = 0xC037000Cu32 as i32;
-pub const STATUS_VID_MB_STILL_REFERENCED: ::NTSTATUS = 0xC037000Du32 as i32;
-pub const STATUS_VID_CHILD_GPA_PAGE_SET_CORRUPTED: ::NTSTATUS = 0xC037000Eu32 as i32;
-pub const STATUS_VID_INVALID_NUMA_SETTINGS: ::NTSTATUS = 0xC037000Fu32 as i32;
-pub const STATUS_VID_INVALID_NUMA_NODE_INDEX: ::NTSTATUS = 0xC0370010u32 as i32;
-pub const STATUS_VID_NOTIFICATION_QUEUE_ALREADY_ASSOCIATED: ::NTSTATUS = 0xC0370011u32 as i32;
-pub const STATUS_VID_INVALID_MEMORY_BLOCK_HANDLE: ::NTSTATUS = 0xC0370012u32 as i32;
-pub const STATUS_VID_PAGE_RANGE_OVERFLOW: ::NTSTATUS = 0xC0370013u32 as i32;
-pub const STATUS_VID_INVALID_MESSAGE_QUEUE_HANDLE: ::NTSTATUS = 0xC0370014u32 as i32;
-pub const STATUS_VID_INVALID_GPA_RANGE_HANDLE: ::NTSTATUS = 0xC0370015u32 as i32;
-pub const STATUS_VID_NO_MEMORY_BLOCK_NOTIFICATION_QUEUE: ::NTSTATUS = 0xC0370016u32 as i32;
-pub const STATUS_VID_MEMORY_BLOCK_LOCK_COUNT_EXCEEDED: ::NTSTATUS = 0xC0370017u32 as i32;
-pub const STATUS_VID_INVALID_PPM_HANDLE: ::NTSTATUS = 0xC0370018u32 as i32;
-pub const STATUS_VID_MBPS_ARE_LOCKED: ::NTSTATUS = 0xC0370019u32 as i32;
-pub const STATUS_VID_MESSAGE_QUEUE_CLOSED: ::NTSTATUS = 0xC037001Au32 as i32;
-pub const STATUS_VID_VIRTUAL_PROCESSOR_LIMIT_EXCEEDED: ::NTSTATUS = 0xC037001Bu32 as i32;
-pub const STATUS_VID_STOP_PENDING: ::NTSTATUS = 0xC037001Cu32 as i32;
-pub const STATUS_VID_INVALID_PROCESSOR_STATE: ::NTSTATUS = 0xC037001Du32 as i32;
-pub const STATUS_VID_EXCEEDED_KM_CONTEXT_COUNT_LIMIT: ::NTSTATUS = 0xC037001Eu32 as i32;
-pub const STATUS_VID_KM_INTERFACE_ALREADY_INITIALIZED: ::NTSTATUS = 0xC037001Fu32 as i32;
-pub const STATUS_VID_MB_PROPERTY_ALREADY_SET_RESET: ::NTSTATUS = 0xC0370020u32 as i32;
-pub const STATUS_VID_MMIO_RANGE_DESTROYED: ::NTSTATUS = 0xC0370021u32 as i32;
-pub const STATUS_VID_INVALID_CHILD_GPA_PAGE_SET: ::NTSTATUS = 0xC0370022u32 as i32;
-pub const STATUS_VID_RESERVE_PAGE_SET_IS_BEING_USED: ::NTSTATUS = 0xC0370023u32 as i32;
-pub const STATUS_VID_RESERVE_PAGE_SET_TOO_SMALL: ::NTSTATUS = 0xC0370024u32 as i32;
-pub const STATUS_VID_MBP_ALREADY_LOCKED_USING_RESERVED_PAGE: ::NTSTATUS = 0xC0370025u32 as i32;
-pub const STATUS_VID_MBP_COUNT_EXCEEDED_LIMIT: ::NTSTATUS = 0xC0370026u32 as i32;
-pub const STATUS_VID_SAVED_STATE_CORRUPT: ::NTSTATUS = 0xC0370027u32 as i32;
-pub const STATUS_VID_SAVED_STATE_UNRECOGNIZED_ITEM: ::NTSTATUS = 0xC0370028u32 as i32;
-pub const STATUS_VID_SAVED_STATE_INCOMPATIBLE: ::NTSTATUS = 0xC0370029u32 as i32;
-pub const STATUS_VID_REMOTE_NODE_PARENT_GPA_PAGES_USED: ::NTSTATUS = 0x80370001u32 as i32;
-pub const STATUS_IPSEC_BAD_SPI: ::NTSTATUS = 0xC0360001u32 as i32;
-pub const STATUS_IPSEC_SA_LIFETIME_EXPIRED: ::NTSTATUS = 0xC0360002u32 as i32;
-pub const STATUS_IPSEC_WRONG_SA: ::NTSTATUS = 0xC0360003u32 as i32;
-pub const STATUS_IPSEC_REPLAY_CHECK_FAILED: ::NTSTATUS = 0xC0360004u32 as i32;
-pub const STATUS_IPSEC_INVALID_PACKET: ::NTSTATUS = 0xC0360005u32 as i32;
-pub const STATUS_IPSEC_INTEGRITY_CHECK_FAILED: ::NTSTATUS = 0xC0360006u32 as i32;
-pub const STATUS_IPSEC_CLEAR_TEXT_DROP: ::NTSTATUS = 0xC0360007u32 as i32;
-pub const STATUS_IPSEC_AUTH_FIREWALL_DROP: ::NTSTATUS = 0xC0360008u32 as i32;
-pub const STATUS_IPSEC_THROTTLE_DROP: ::NTSTATUS = 0xC0360009u32 as i32;
-pub const STATUS_IPSEC_DOSP_BLOCK: ::NTSTATUS = 0xC0368000u32 as i32;
-pub const STATUS_IPSEC_DOSP_RECEIVED_MULTICAST: ::NTSTATUS = 0xC0368001u32 as i32;
-pub const STATUS_IPSEC_DOSP_INVALID_PACKET: ::NTSTATUS = 0xC0368002u32 as i32;
-pub const STATUS_IPSEC_DOSP_STATE_LOOKUP_FAILED: ::NTSTATUS = 0xC0368003u32 as i32;
-pub const STATUS_IPSEC_DOSP_MAX_ENTRIES: ::NTSTATUS = 0xC0368004u32 as i32;
-pub const STATUS_IPSEC_DOSP_KEYMOD_NOT_ALLOWED: ::NTSTATUS = 0xC0368005u32 as i32;
-pub const STATUS_IPSEC_DOSP_MAX_PER_IP_RATELIMIT_QUEUES: ::NTSTATUS = 0xC0368006u32 as i32;
-pub const STATUS_VOLMGR_INCOMPLETE_REGENERATION: ::NTSTATUS = 0x80380001u32 as i32;
-pub const STATUS_VOLMGR_INCOMPLETE_DISK_MIGRATION: ::NTSTATUS = 0x80380002u32 as i32;
-pub const STATUS_VOLMGR_DATABASE_FULL: ::NTSTATUS = 0xC0380001u32 as i32;
-pub const STATUS_VOLMGR_DISK_CONFIGURATION_CORRUPTED: ::NTSTATUS = 0xC0380002u32 as i32;
-pub const STATUS_VOLMGR_DISK_CONFIGURATION_NOT_IN_SYNC: ::NTSTATUS = 0xC0380003u32 as i32;
-pub const STATUS_VOLMGR_PACK_CONFIG_UPDATE_FAILED: ::NTSTATUS = 0xC0380004u32 as i32;
-pub const STATUS_VOLMGR_DISK_CONTAINS_NON_SIMPLE_VOLUME: ::NTSTATUS = 0xC0380005u32 as i32;
-pub const STATUS_VOLMGR_DISK_DUPLICATE: ::NTSTATUS = 0xC0380006u32 as i32;
-pub const STATUS_VOLMGR_DISK_DYNAMIC: ::NTSTATUS = 0xC0380007u32 as i32;
-pub const STATUS_VOLMGR_DISK_ID_INVALID: ::NTSTATUS = 0xC0380008u32 as i32;
-pub const STATUS_VOLMGR_DISK_INVALID: ::NTSTATUS = 0xC0380009u32 as i32;
-pub const STATUS_VOLMGR_DISK_LAST_VOTER: ::NTSTATUS = 0xC038000Au32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_INVALID: ::NTSTATUS = 0xC038000Bu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_NON_BASIC_BETWEEN_BASIC_PARTITIONS: ::NTSTATUS = 0xC038000Cu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_NOT_CYLINDER_ALIGNED: ::NTSTATUS = 0xC038000Du32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_PARTITIONS_TOO_SMALL: ::NTSTATUS = 0xC038000Eu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_PRIMARY_BETWEEN_LOGICAL_PARTITIONS: ::NTSTATUS = 0xC038000Fu32 as i32;
-pub const STATUS_VOLMGR_DISK_LAYOUT_TOO_MANY_PARTITIONS: ::NTSTATUS = 0xC0380010u32 as i32;
-pub const STATUS_VOLMGR_DISK_MISSING: ::NTSTATUS = 0xC0380011u32 as i32;
-pub const STATUS_VOLMGR_DISK_NOT_EMPTY: ::NTSTATUS = 0xC0380012u32 as i32;
-pub const STATUS_VOLMGR_DISK_NOT_ENOUGH_SPACE: ::NTSTATUS = 0xC0380013u32 as i32;
-pub const STATUS_VOLMGR_DISK_REVECTORING_FAILED: ::NTSTATUS = 0xC0380014u32 as i32;
-pub const STATUS_VOLMGR_DISK_SECTOR_SIZE_INVALID: ::NTSTATUS = 0xC0380015u32 as i32;
-pub const STATUS_VOLMGR_DISK_SET_NOT_CONTAINED: ::NTSTATUS = 0xC0380016u32 as i32;
-pub const STATUS_VOLMGR_DISK_USED_BY_MULTIPLE_MEMBERS: ::NTSTATUS = 0xC0380017u32 as i32;
-pub const STATUS_VOLMGR_DISK_USED_BY_MULTIPLE_PLEXES: ::NTSTATUS = 0xC0380018u32 as i32;
-pub const STATUS_VOLMGR_DYNAMIC_DISK_NOT_SUPPORTED: ::NTSTATUS = 0xC0380019u32 as i32;
-pub const STATUS_VOLMGR_EXTENT_ALREADY_USED: ::NTSTATUS = 0xC038001Au32 as i32;
-pub const STATUS_VOLMGR_EXTENT_NOT_CONTIGUOUS: ::NTSTATUS = 0xC038001Bu32 as i32;
-pub const STATUS_VOLMGR_EXTENT_NOT_IN_PUBLIC_REGION: ::NTSTATUS = 0xC038001Cu32 as i32;
-pub const STATUS_VOLMGR_EXTENT_NOT_SECTOR_ALIGNED: ::NTSTATUS = 0xC038001Du32 as i32;
-pub const STATUS_VOLMGR_EXTENT_OVERLAPS_EBR_PARTITION: ::NTSTATUS = 0xC038001Eu32 as i32;
-pub const STATUS_VOLMGR_EXTENT_VOLUME_LENGTHS_DO_NOT_MATCH: ::NTSTATUS = 0xC038001Fu32 as i32;
-pub const STATUS_VOLMGR_FAULT_TOLERANT_NOT_SUPPORTED: ::NTSTATUS = 0xC0380020u32 as i32;
-pub const STATUS_VOLMGR_INTERLEAVE_LENGTH_INVALID: ::NTSTATUS = 0xC0380021u32 as i32;
-pub const STATUS_VOLMGR_MAXIMUM_REGISTERED_USERS: ::NTSTATUS = 0xC0380022u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_IN_SYNC: ::NTSTATUS = 0xC0380023u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_INDEX_DUPLICATE: ::NTSTATUS = 0xC0380024u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_INDEX_INVALID: ::NTSTATUS = 0xC0380025u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_MISSING: ::NTSTATUS = 0xC0380026u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_NOT_DETACHED: ::NTSTATUS = 0xC0380027u32 as i32;
-pub const STATUS_VOLMGR_MEMBER_REGENERATING: ::NTSTATUS = 0xC0380028u32 as i32;
-pub const STATUS_VOLMGR_ALL_DISKS_FAILED: ::NTSTATUS = 0xC0380029u32 as i32;
-pub const STATUS_VOLMGR_NO_REGISTERED_USERS: ::NTSTATUS = 0xC038002Au32 as i32;
-pub const STATUS_VOLMGR_NO_SUCH_USER: ::NTSTATUS = 0xC038002Bu32 as i32;
-pub const STATUS_VOLMGR_NOTIFICATION_RESET: ::NTSTATUS = 0xC038002Cu32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_MEMBERS_INVALID: ::NTSTATUS = 0xC038002Du32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_PLEXES_INVALID: ::NTSTATUS = 0xC038002Eu32 as i32;
-pub const STATUS_VOLMGR_PACK_DUPLICATE: ::NTSTATUS = 0xC038002Fu32 as i32;
-pub const STATUS_VOLMGR_PACK_ID_INVALID: ::NTSTATUS = 0xC0380030u32 as i32;
-pub const STATUS_VOLMGR_PACK_INVALID: ::NTSTATUS = 0xC0380031u32 as i32;
-pub const STATUS_VOLMGR_PACK_NAME_INVALID: ::NTSTATUS = 0xC0380032u32 as i32;
-pub const STATUS_VOLMGR_PACK_OFFLINE: ::NTSTATUS = 0xC0380033u32 as i32;
-pub const STATUS_VOLMGR_PACK_HAS_QUORUM: ::NTSTATUS = 0xC0380034u32 as i32;
-pub const STATUS_VOLMGR_PACK_WITHOUT_QUORUM: ::NTSTATUS = 0xC0380035u32 as i32;
-pub const STATUS_VOLMGR_PARTITION_STYLE_INVALID: ::NTSTATUS = 0xC0380036u32 as i32;
-pub const STATUS_VOLMGR_PARTITION_UPDATE_FAILED: ::NTSTATUS = 0xC0380037u32 as i32;
-pub const STATUS_VOLMGR_PLEX_IN_SYNC: ::NTSTATUS = 0xC0380038u32 as i32;
-pub const STATUS_VOLMGR_PLEX_INDEX_DUPLICATE: ::NTSTATUS = 0xC0380039u32 as i32;
-pub const STATUS_VOLMGR_PLEX_INDEX_INVALID: ::NTSTATUS = 0xC038003Au32 as i32;
-pub const STATUS_VOLMGR_PLEX_LAST_ACTIVE: ::NTSTATUS = 0xC038003Bu32 as i32;
-pub const STATUS_VOLMGR_PLEX_MISSING: ::NTSTATUS = 0xC038003Cu32 as i32;
-pub const STATUS_VOLMGR_PLEX_REGENERATING: ::NTSTATUS = 0xC038003Du32 as i32;
-pub const STATUS_VOLMGR_PLEX_TYPE_INVALID: ::NTSTATUS = 0xC038003Eu32 as i32;
-pub const STATUS_VOLMGR_PLEX_NOT_RAID5: ::NTSTATUS = 0xC038003Fu32 as i32;
-pub const STATUS_VOLMGR_PLEX_NOT_SIMPLE: ::NTSTATUS = 0xC0380040u32 as i32;
-pub const STATUS_VOLMGR_STRUCTURE_SIZE_INVALID: ::NTSTATUS = 0xC0380041u32 as i32;
-pub const STATUS_VOLMGR_TOO_MANY_NOTIFICATION_REQUESTS: ::NTSTATUS = 0xC0380042u32 as i32;
-pub const STATUS_VOLMGR_TRANSACTION_IN_PROGRESS: ::NTSTATUS = 0xC0380043u32 as i32;
-pub const STATUS_VOLMGR_UNEXPECTED_DISK_LAYOUT_CHANGE: ::NTSTATUS = 0xC0380044u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_CONTAINS_MISSING_DISK: ::NTSTATUS = 0xC0380045u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_ID_INVALID: ::NTSTATUS = 0xC0380046u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_LENGTH_INVALID: ::NTSTATUS = 0xC0380047u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_LENGTH_NOT_SECTOR_SIZE_MULTIPLE: ::NTSTATUS = 0xC0380048u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_NOT_MIRRORED: ::NTSTATUS = 0xC0380049u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_NOT_RETAINED: ::NTSTATUS = 0xC038004Au32 as i32;
-pub const STATUS_VOLMGR_VOLUME_OFFLINE: ::NTSTATUS = 0xC038004Bu32 as i32;
-pub const STATUS_VOLMGR_VOLUME_RETAINED: ::NTSTATUS = 0xC038004Cu32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_EXTENTS_INVALID: ::NTSTATUS = 0xC038004Du32 as i32;
-pub const STATUS_VOLMGR_DIFFERENT_SECTOR_SIZE: ::NTSTATUS = 0xC038004Eu32 as i32;
-pub const STATUS_VOLMGR_BAD_BOOT_DISK: ::NTSTATUS = 0xC038004Fu32 as i32;
-pub const STATUS_VOLMGR_PACK_CONFIG_OFFLINE: ::NTSTATUS = 0xC0380050u32 as i32;
-pub const STATUS_VOLMGR_PACK_CONFIG_ONLINE: ::NTSTATUS = 0xC0380051u32 as i32;
-pub const STATUS_VOLMGR_NOT_PRIMARY_PACK: ::NTSTATUS = 0xC0380052u32 as i32;
-pub const STATUS_VOLMGR_PACK_LOG_UPDATE_FAILED: ::NTSTATUS = 0xC0380053u32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_DISKS_IN_PLEX_INVALID: ::NTSTATUS = 0xC0380054u32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_DISKS_IN_MEMBER_INVALID: ::NTSTATUS = 0xC0380055u32 as i32;
-pub const STATUS_VOLMGR_VOLUME_MIRRORED: ::NTSTATUS = 0xC0380056u32 as i32;
-pub const STATUS_VOLMGR_PLEX_NOT_SIMPLE_SPANNED: ::NTSTATUS = 0xC0380057u32 as i32;
-pub const STATUS_VOLMGR_NO_VALID_LOG_COPIES: ::NTSTATUS = 0xC0380058u32 as i32;
-pub const STATUS_VOLMGR_PRIMARY_PACK_PRESENT: ::NTSTATUS = 0xC0380059u32 as i32;
-pub const STATUS_VOLMGR_NUMBER_OF_DISKS_INVALID: ::NTSTATUS = 0xC038005Au32 as i32;
-pub const STATUS_VOLMGR_MIRROR_NOT_SUPPORTED: ::NTSTATUS = 0xC038005Bu32 as i32;
-pub const STATUS_VOLMGR_RAID5_NOT_SUPPORTED: ::NTSTATUS = 0xC038005Cu32 as i32;
-pub const STATUS_BCD_NOT_ALL_ENTRIES_IMPORTED: ::NTSTATUS = 0x80390001u32 as i32;
-pub const STATUS_BCD_TOO_MANY_ELEMENTS: ::NTSTATUS = 0xC0390002u32 as i32;
-pub const STATUS_BCD_NOT_ALL_ENTRIES_SYNCHRONIZED: ::NTSTATUS = 0x80390003u32 as i32;
-pub const STATUS_VHD_DRIVE_FOOTER_MISSING: ::NTSTATUS = 0xC03A0001u32 as i32;
-pub const STATUS_VHD_DRIVE_FOOTER_CHECKSUM_MISMATCH: ::NTSTATUS = 0xC03A0002u32 as i32;
-pub const STATUS_VHD_DRIVE_FOOTER_CORRUPT: ::NTSTATUS = 0xC03A0003u32 as i32;
-pub const STATUS_VHD_FORMAT_UNKNOWN: ::NTSTATUS = 0xC03A0004u32 as i32;
-pub const STATUS_VHD_FORMAT_UNSUPPORTED_VERSION: ::NTSTATUS = 0xC03A0005u32 as i32;
-pub const STATUS_VHD_SPARSE_HEADER_CHECKSUM_MISMATCH: ::NTSTATUS = 0xC03A0006u32 as i32;
-pub const STATUS_VHD_SPARSE_HEADER_UNSUPPORTED_VERSION: ::NTSTATUS = 0xC03A0007u32 as i32;
-pub const STATUS_VHD_SPARSE_HEADER_CORRUPT: ::NTSTATUS = 0xC03A0008u32 as i32;
-pub const STATUS_VHD_BLOCK_ALLOCATION_FAILURE: ::NTSTATUS = 0xC03A0009u32 as i32;
-pub const STATUS_VHD_BLOCK_ALLOCATION_TABLE_CORRUPT: ::NTSTATUS = 0xC03A000Au32 as i32;
-pub const STATUS_VHD_INVALID_BLOCK_SIZE: ::NTSTATUS = 0xC03A000Bu32 as i32;
-pub const STATUS_VHD_BITMAP_MISMATCH: ::NTSTATUS = 0xC03A000Cu32 as i32;
-pub const STATUS_VHD_PARENT_VHD_NOT_FOUND: ::NTSTATUS = 0xC03A000Du32 as i32;
-pub const STATUS_VHD_CHILD_PARENT_ID_MISMATCH: ::NTSTATUS = 0xC03A000Eu32 as i32;
-pub const STATUS_VHD_CHILD_PARENT_TIMESTAMP_MISMATCH: ::NTSTATUS = 0xC03A000Fu32 as i32;
-pub const STATUS_VHD_METADATA_READ_FAILURE: ::NTSTATUS = 0xC03A0010u32 as i32;
-pub const STATUS_VHD_METADATA_WRITE_FAILURE: ::NTSTATUS = 0xC03A0011u32 as i32;
-pub const STATUS_VHD_INVALID_SIZE: ::NTSTATUS = 0xC03A0012u32 as i32;
-pub const STATUS_VHD_INVALID_FILE_SIZE: ::NTSTATUS = 0xC03A0013u32 as i32;
-pub const STATUS_VIRTDISK_PROVIDER_NOT_FOUND: ::NTSTATUS = 0xC03A0014u32 as i32;
-pub const STATUS_VIRTDISK_NOT_VIRTUAL_DISK: ::NTSTATUS = 0xC03A0015u32 as i32;
-pub const STATUS_VHD_PARENT_VHD_ACCESS_DENIED: ::NTSTATUS = 0xC03A0016u32 as i32;
-pub const STATUS_VHD_CHILD_PARENT_SIZE_MISMATCH: ::NTSTATUS = 0xC03A0017u32 as i32;
-pub const STATUS_VHD_DIFFERENCING_CHAIN_CYCLE_DETECTED: ::NTSTATUS = 0xC03A0018u32 as i32;
-pub const STATUS_VHD_DIFFERENCING_CHAIN_ERROR_IN_PARENT: ::NTSTATUS = 0xC03A0019u32 as i32;
-pub const STATUS_VIRTUAL_DISK_LIMITATION: ::NTSTATUS = 0xC03A001Au32 as i32;
-pub const STATUS_VHD_INVALID_TYPE: ::NTSTATUS = 0xC03A001Bu32 as i32;
-pub const STATUS_VHD_INVALID_STATE: ::NTSTATUS = 0xC03A001Cu32 as i32;
-pub const STATUS_VIRTDISK_UNSUPPORTED_DISK_SECTOR_SIZE: ::NTSTATUS = 0xC03A001Du32 as i32;
-pub const STATUS_VIRTDISK_DISK_ALREADY_OWNED: ::NTSTATUS = 0xC03A001Eu32 as i32;
-pub const STATUS_VIRTDISK_DISK_ONLINE_AND_WRITABLE: ::NTSTATUS = 0xC03A001Fu32 as i32;
-pub const STATUS_CTLOG_TRACKING_NOT_INITIALIZED: ::NTSTATUS = 0xC03A0020u32 as i32;
-pub const STATUS_CTLOG_LOGFILE_SIZE_EXCEEDED_MAXSIZE: ::NTSTATUS = 0xC03A0021u32 as i32;
-pub const STATUS_CTLOG_VHD_CHANGED_OFFLINE: ::NTSTATUS = 0xC03A0022u32 as i32;
-pub const STATUS_CTLOG_INVALID_TRACKING_STATE: ::NTSTATUS = 0xC03A0023u32 as i32;
-pub const STATUS_CTLOG_INCONSISTENT_TRACKING_FILE: ::NTSTATUS = 0xC03A0024u32 as i32;
-pub const STATUS_VHD_METADATA_FULL: ::NTSTATUS = 0xC03A0028u32 as i32;
-pub const STATUS_VHD_INVALID_CHANGE_TRACKING_ID: ::NTSTATUS = 0xC03A0029u32 as i32;
-pub const STATUS_VHD_CHANGE_TRACKING_DISABLED: ::NTSTATUS = 0xC03A002Au32 as i32;
-pub const STATUS_VHD_MISSING_CHANGE_TRACKING_INFORMATION: ::NTSTATUS = 0xC03A0030u32 as i32;
-pub const STATUS_VHD_RESIZE_WOULD_TRUNCATE_DATA: ::NTSTATUS = 0xC03A0031u32 as i32;
-pub const STATUS_VHD_COULD_NOT_COMPUTE_MINIMUM_VIRTUAL_SIZE: ::NTSTATUS = 0xC03A0032u32 as i32;
-pub const STATUS_VHD_ALREADY_AT_OR_BELOW_MINIMUM_VIRTUAL_SIZE: ::NTSTATUS = 0xC03A0033u32 as i32;
-pub const STATUS_QUERY_STORAGE_ERROR: ::NTSTATUS = 0x803A0001u32 as i32;
-pub const STATUS_RKF_KEY_NOT_FOUND: ::NTSTATUS = 0xC0400001u32 as i32;
-pub const STATUS_RKF_DUPLICATE_KEY: ::NTSTATUS = 0xC0400002u32 as i32;
-pub const STATUS_RKF_BLOB_FULL: ::NTSTATUS = 0xC0400003u32 as i32;
-pub const STATUS_RKF_STORE_FULL: ::NTSTATUS = 0xC0400004u32 as i32;
-pub const STATUS_RKF_FILE_BLOCKED: ::NTSTATUS = 0xC0400005u32 as i32;
-pub const STATUS_RKF_ACTIVE_KEY: ::NTSTATUS = 0xC0400006u32 as i32;
-pub const STATUS_RDBSS_RESTART_OPERATION: ::NTSTATUS = 0xC0410001u32 as i32;
-pub const STATUS_RDBSS_CONTINUE_OPERATION: ::NTSTATUS = 0xC0410002u32 as i32;
-pub const STATUS_RDBSS_POST_OPERATION: ::NTSTATUS = 0xC0410003u32 as i32;
-pub const STATUS_BTH_ATT_INVALID_HANDLE: ::NTSTATUS = 0xC0420001u32 as i32;
-pub const STATUS_BTH_ATT_READ_NOT_PERMITTED: ::NTSTATUS = 0xC0420002u32 as i32;
-pub const STATUS_BTH_ATT_WRITE_NOT_PERMITTED: ::NTSTATUS = 0xC0420003u32 as i32;
-pub const STATUS_BTH_ATT_INVALID_PDU: ::NTSTATUS = 0xC0420004u32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_AUTHENTICATION: ::NTSTATUS = 0xC0420005u32 as i32;
-pub const STATUS_BTH_ATT_REQUEST_NOT_SUPPORTED: ::NTSTATUS = 0xC0420006u32 as i32;
-pub const STATUS_BTH_ATT_INVALID_OFFSET: ::NTSTATUS = 0xC0420007u32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_AUTHORIZATION: ::NTSTATUS = 0xC0420008u32 as i32;
-pub const STATUS_BTH_ATT_PREPARE_QUEUE_FULL: ::NTSTATUS = 0xC0420009u32 as i32;
-pub const STATUS_BTH_ATT_ATTRIBUTE_NOT_FOUND: ::NTSTATUS = 0xC042000Au32 as i32;
-pub const STATUS_BTH_ATT_ATTRIBUTE_NOT_LONG: ::NTSTATUS = 0xC042000Bu32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_ENCRYPTION_KEY_SIZE: ::NTSTATUS = 0xC042000Cu32 as i32;
-pub const STATUS_BTH_ATT_INVALID_ATTRIBUTE_VALUE_LENGTH: ::NTSTATUS = 0xC042000Du32 as i32;
-pub const STATUS_BTH_ATT_UNLIKELY: ::NTSTATUS = 0xC042000Eu32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_ENCRYPTION: ::NTSTATUS = 0xC042000Fu32 as i32;
-pub const STATUS_BTH_ATT_UNSUPPORTED_GROUP_TYPE: ::NTSTATUS = 0xC0420010u32 as i32;
-pub const STATUS_BTH_ATT_INSUFFICIENT_RESOURCES: ::NTSTATUS = 0xC0420011u32 as i32;
-pub const STATUS_BTH_ATT_UNKNOWN_ERROR: ::NTSTATUS = 0xC0421000u32 as i32;
-pub const STATUS_SECUREBOOT_ROLLBACK_DETECTED: ::NTSTATUS = 0xC0430001u32 as i32;
-pub const STATUS_SECUREBOOT_POLICY_VIOLATION: ::NTSTATUS = 0xC0430002u32 as i32;
-pub const STATUS_SECUREBOOT_INVALID_POLICY: ::NTSTATUS = 0xC0430003u32 as i32;
-pub const STATUS_SECUREBOOT_POLICY_PUBLISHER_NOT_FOUND: ::NTSTATUS = 0xC0430004u32 as i32;
-pub const STATUS_SECUREBOOT_POLICY_NOT_SIGNED: ::NTSTATUS = 0xC0430005u32 as i32;
-pub const STATUS_SECUREBOOT_NOT_ENABLED: ::NTSTATUS = 0x80430006u32 as i32;
-pub const STATUS_SECUREBOOT_FILE_REPLACED: ::NTSTATUS = 0xC0430007u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_ROLLBACK_DETECTED: ::NTSTATUS = 0xC0E90001u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_POLICY_VIOLATION: ::NTSTATUS = 0xC0E90002u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_INVALID_POLICY: ::NTSTATUS = 0xC0E90003u32 as i32;
-pub const STATUS_SYSTEM_INTEGRITY_POLICY_NOT_SIGNED: ::NTSTATUS = 0xC0E90004u32 as i32;
-pub const STATUS_NO_APPLICABLE_APP_LICENSES_FOUND: ::NTSTATUS = 0xC0EA0001u32 as i32;
-pub const STATUS_AUDIO_ENGINE_NODE_NOT_FOUND: ::NTSTATUS = 0xC0440001u32 as i32;
-pub const STATUS_HDAUDIO_EMPTY_CONNECTION_LIST: ::NTSTATUS = 0xC0440002u32 as i32;
-pub const STATUS_HDAUDIO_CONNECTION_LIST_NOT_SUPPORTED: ::NTSTATUS = 0xC0440003u32 as i32;
-pub const STATUS_HDAUDIO_NO_LOGICAL_DEVICES_CREATED: ::NTSTATUS = 0xC0440004u32 as i32;
-pub const STATUS_HDAUDIO_NULL_LINKED_LIST_ENTRY: ::NTSTATUS = 0xC0440005u32 as i32;
-pub const STATUS_SPACES_RESILIENCY_TYPE_INVALID: ::NTSTATUS = 0xC0E70003u32 as i32;
-pub const STATUS_SPACES_DRIVE_SECTOR_SIZE_INVALID: ::NTSTATUS = 0xC0E70004u32 as i32;
-pub const STATUS_SPACES_DRIVE_REDUNDANCY_INVALID: ::NTSTATUS = 0xC0E70006u32 as i32;
-pub const STATUS_SPACES_NUMBER_OF_DATA_COPIES_INVALID: ::NTSTATUS = 0xC0E70007u32 as i32;
-pub const STATUS_SPACES_INTERLEAVE_LENGTH_INVALID: ::NTSTATUS = 0xC0E70009u32 as i32;
-pub const STATUS_SPACES_NUMBER_OF_COLUMNS_INVALID: ::NTSTATUS = 0xC0E7000Au32 as i32;
-pub const STATUS_SPACES_NOT_ENOUGH_DRIVES: ::NTSTATUS = 0xC0E7000Bu32 as i32;
-pub const STATUS_SPACES_EXTENDED_ERROR: ::NTSTATUS = 0xC0E7000Cu32 as i32;
-pub const STATUS_SPACES_PROVISIONING_TYPE_INVALID: ::NTSTATUS = 0xC0E7000Du32 as i32;
-pub const STATUS_SPACES_ALLOCATION_SIZE_INVALID: ::NTSTATUS = 0xC0E7000Eu32 as i32;
-pub const STATUS_SPACES_ENCLOSURE_AWARE_INVALID: ::NTSTATUS = 0xC0E7000Fu32 as i32;
-pub const STATUS_SPACES_WRITE_CACHE_SIZE_INVALID: ::NTSTATUS = 0xC0E70010u32 as i32;
-pub const STATUS_SPACES_NUMBER_OF_GROUPS_INVALID: ::NTSTATUS = 0xC0E70011u32 as i32;
-pub const STATUS_SPACES_DRIVE_OPERATIONAL_STATE_INVALID: ::NTSTATUS = 0xC0E70012u32 as i32;
-pub const STATUS_SPACES_UPDATE_COLUMN_STATE: ::NTSTATUS = 0xC0E70013u32 as i32;
-pub const STATUS_SPACES_MAP_REQUIRED: ::NTSTATUS = 0xC0E70014u32 as i32;
-pub const STATUS_SPACES_UNSUPPORTED_VERSION: ::NTSTATUS = 0xC0E70015u32 as i32;
-pub const STATUS_SPACES_CORRUPT_METADATA: ::NTSTATUS = 0xC0E70016u32 as i32;
-pub const STATUS_SPACES_DRT_FULL: ::NTSTATUS = 0xC0E70017u32 as i32;
-pub const STATUS_SPACES_INCONSISTENCY: ::NTSTATUS = 0xC0E70018u32 as i32;
-pub const STATUS_SPACES_LOG_NOT_READY: ::NTSTATUS = 0xC0E70019u32 as i32;
-pub const STATUS_SPACES_NO_REDUNDANCY: ::NTSTATUS = 0xC0E7001Au32 as i32;
-pub const STATUS_SPACES_DRIVE_NOT_READY: ::NTSTATUS = 0xC0E7001Bu32 as i32;
-pub const STATUS_SPACES_REPAIRED: ::NTSTATUS = 0x00E7001C;
-pub const STATUS_SPACES_PAUSE: ::NTSTATUS = 0x00E7001D;
-pub const STATUS_SPACES_COMPLETE: ::NTSTATUS = 0x00E7001E;
-pub const STATUS_VOLSNAP_BOOTFILE_NOT_VALID: ::NTSTATUS = 0xC0500003u32 as i32;
-pub const STATUS_IO_PREEMPTED: ::NTSTATUS = 0xC0510001u32 as i32;
-pub const STATUS_SVHDX_ERROR_STORED: ::NTSTATUS = 0xC05C0000u32 as i32;
-pub const STATUS_SVHDX_ERROR_NOT_AVAILABLE: ::NTSTATUS = 0xC05CFF00u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_AVAILABLE: ::NTSTATUS = 0xC05CFF01u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_CAPACITY_DATA_CHANGED: ::NTSTATUS = 0xC05CFF02u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_RESERVATIONS_PREEMPTED: ::NTSTATUS = 0xC05CFF03u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_RESERVATIONS_RELEASED: ::NTSTATUS = 0xC05CFF04u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_REGISTRATIONS_PREEMPTED: ::NTSTATUS = 0xC05CFF05u32 as i32;
-pub const STATUS_SVHDX_UNIT_ATTENTION_OPERATING_DEFINITION_CHANGED: ::NTSTATUS = 0xC05CFF06u32 as i32;
-pub const STATUS_SVHDX_RESERVATION_CONFLICT: ::NTSTATUS = 0xC05CFF07u32 as i32;
-pub const STATUS_SVHDX_WRONG_FILE_TYPE: ::NTSTATUS = 0xC05CFF08u32 as i32;
-pub const STATUS_SVHDX_VERSION_MISMATCH: ::NTSTATUS = 0xC05CFF09u32 as i32;
-pub const STATUS_VHD_SHARED: ::NTSTATUS = 0xC05CFF0Au32 as i32;
-pub const STATUS_SVHDX_NO_INITIATOR: ::NTSTATUS = 0xC05CFF0Bu32 as i32;
-pub const STATUS_VHDSET_BACKING_STORAGE_NOT_FOUND: ::NTSTATUS = 0xC05CFF0Cu32 as i32;
-pub const STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP: ::NTSTATUS = 0xC05D0000u32 as i32;
-pub const STATUS_SMB_BAD_CLUSTER_DIALECT: ::NTSTATUS = 0xC05D0001u32 as i32;
-pub const STATUS_SMB_GUEST_LOGON_BLOCKED: ::NTSTATUS = 0xC05D0002u32 as i32;
-pub const STATUS_SECCORE_INVALID_COMMAND: ::NTSTATUS = 0xC0E80000u32 as i32;
-pub const STATUS_VSM_NOT_INITIALIZED: ::NTSTATUS = 0xC0450000u32 as i32;
-pub const STATUS_VSM_DMA_PROTECTION_NOT_IN_USE: ::NTSTATUS = 0xC0450001u32 as i32;
diff --git a/vendor/winapi-0.2.8/src/oaidl.rs b/vendor/winapi-0.2.8/src/oaidl.rs
deleted file mode 100644
index c705060bd4..0000000000
--- a/vendor/winapi-0.2.8/src/oaidl.rs
+++ /dev/null
@@ -1,590 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of OAIdl.h
-pub type wireBRECORD = *mut _wireBRECORD;
-pub type wireVARIANT = *mut _wireVARIANT;
-STRUCT!{struct SAFEARRAYBOUND {
-    cElements: ::ULONG,
-    lLbound: ::LONG,
-}}
-STRUCT!{struct SAFEARR_BSTR {
-    Size: ::ULONG,
-    aBstr: *mut ::wireBSTR,
-}}
-STRUCT!{struct SAFEARR_UNKNOWN {
-    Size: ::ULONG,
-    apUnknown: *mut *mut ::IUnknown,
-}}
-STRUCT!{struct SAFEARR_DISPATCH {
-    Size: ::ULONG,
-    apDispatch: *mut *mut IDispatch,
-}}
-STRUCT!{struct SAFEARR_VARIANT {
-    Size: ::ULONG,
-    aVariant: *mut wireVARIANT,
-}}
-STRUCT!{struct SAFEARR_BRECORD {
-    Size: ::ULONG,
-    aRecord: *mut wireBRECORD,
-}}
-STRUCT!{struct SAFEARR_HAVEIID {
-    Size: ::ULONG,
-    apUnknown: *mut *mut ::IUnknown,
-    iid: ::IID,
-}}
-ENUM!{enum SF_TYPE {
-    SF_ERROR = ::VT_ERROR.0,
-    SF_I1 = ::VT_I1.0,
-    SF_I2 = ::VT_I2.0,
-    SF_I4 = ::VT_I4.0,
-    SF_I8 = ::VT_I8.0,
-    SF_BSTR = ::VT_BSTR.0,
-    SF_UNKNOWN = ::VT_UNKNOWN.0,
-    SF_DISPATCH = ::VT_DISPATCH.0,
-    SF_VARIANT = ::VT_VARIANT.0,
-    SF_RECORD = ::VT_RECORD.0,
-    SF_HAVEIID = ::VT_UNKNOWN.0 | ::VT_RESERVED.0,
-}}
-STRUCT!{struct SAFEARRAYUNION {
-    sfType: ::ULONG,
-    u: __MIDL_IOleAutomationTypes_0001,
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct __MIDL_IOleAutomationTypes_0001 {
-    data0: u32,
-    data1: [u32; 6],
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct __MIDL_IOleAutomationTypes_0001 {
-    data0: u32,
-    data1: [u32; 5],
-}}
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, BstrStr, BstrStr_mut, SAFEARR_BSTR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, UnknownStr, UnknownStr_mut, SAFEARR_UNKNOWN);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, DispatchStr, DispatchStr_mut, SAFEARR_DISPATCH);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, VariantStr, VariantStr_mut, SAFEARR_VARIANT);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, RecordStr, RecordStr_mut, SAFEARR_BRECORD);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, HaveIidStr, HaveIidStr_mut, SAFEARR_HAVEIID);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, ByteStr, ByteStr_mut, ::BYTE_SIZEDARR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, WordStr, WordStr_mut, ::WORD_SIZEDARR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, LongStr, LongStr_mut, ::DWORD_SIZEDARR);
-UNION!(__MIDL_IOleAutomationTypes_0001, data0, HyperStr, HyperStr_mut, ::HYPER_SIZEDARR);
-STRUCT!{struct _wireSAFEARRAY {
-    cDims: ::USHORT,
-    fFeatures: ::USHORT,
-    cbElements: ::ULONG,
-    cLocks: ::ULONG,
-    uArrayStructs: SAFEARRAYUNION,
-    rgsaBound: [SAFEARRAYBOUND; 1],
-}}
-pub type wireSAFEARRAY = *mut _wireSAFEARRAY;
-pub type wirePSAFEARRAY = *mut wireSAFEARRAY;
-STRUCT!{struct SAFEARRAY {
-    cDims: ::USHORT,
-    fFeatures: ::USHORT,
-    cbElements: ::ULONG,
-    cLocks: ::ULONG,
-    pvData: ::PVOID,
-    rgsabound: [SAFEARRAYBOUND; 1],
-}}
-pub type LPSAFEARRAY = *mut SAFEARRAY;
-pub const FADF_AUTO: ::DWORD = 0x1;
-pub const FADF_STATIC: ::DWORD = 0x2;
-pub const FADF_EMBEDDED: ::DWORD = 0x4;
-pub const FADF_FIXEDSIZE: ::DWORD = 0x10;
-pub const FADF_RECORD: ::DWORD = 0x20;
-pub const FADF_HAVEIID: ::DWORD = 0x40;
-pub const FADF_HAVEVARTYPE: ::DWORD = 0x80;
-pub const FADF_BSTR: ::DWORD = 0x100;
-pub const FADF_UNKNOWN: ::DWORD = 0x200;
-pub const FADF_DISPATCH: ::DWORD = 0x400;
-pub const FADF_VARIANT: ::DWORD = 0x800;
-pub const FADF_RESERVED: ::DWORD = 0xf008;
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct VARIANT {
-    data0: u64,
-    data1: u64,
-    data2: u64,
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct VARIANT {
-    data0: u64,
-    data1: u32,
-    data2: u32,
-}}
-UNION!(VARIANT, data0, vt, vt_mut, ::VARTYPE);
-UNION!(VARIANT, data1, llVal, llVal_mut, ::LONGLONG);
-UNION!(VARIANT, data1, lVal, lVal_mut, ::LONG);
-UNION!(VARIANT, data1, bVal, bVal_mut, ::BYTE);
-UNION!(VARIANT, data1, iVal, iVal_mut, ::SHORT);
-UNION!(VARIANT, data1, fltVal, fltVal_mut, ::FLOAT);
-UNION!(VARIANT, data1, dblVal, dblVal_mut, ::DOUBLE);
-UNION!(VARIANT, data1, boolVal, boolVal_mut, ::VARIANT_BOOL);
-UNION!(VARIANT, data1, scode, scode_mut, ::SCODE);
-UNION!(VARIANT, data1, cyVal, cyVal_mut, ::CY);
-UNION!(VARIANT, data1, date, date_mut, ::DATE);
-UNION!(VARIANT, data1, bstrVal, bstrVal_mut, ::BSTR);
-UNION!(VARIANT, data1, punkVal, punkVal_mut, *mut ::IUnknown);
-UNION!(VARIANT, data1, pdispVal, pdispVal_mut, *mut IDispatch);
-UNION!(VARIANT, data1, parray, parray_mut, *mut SAFEARRAY);
-UNION!(VARIANT, data1, pllVal, pllVal_mut, *mut ::LONGLONG);
-UNION!(VARIANT, data1, plVal, plVal_mut, *mut ::LONG);
-UNION!(VARIANT, data1, pbVal, pbVal_mut, *mut ::BYTE);
-UNION!(VARIANT, data1, piVal, piVal_mut, *mut ::SHORT);
-UNION!(VARIANT, data1, pfltVal, pfltVal_mut, *mut ::FLOAT);
-UNION!(VARIANT, data1, pdblVal, pdblVal_mut, *mut ::DOUBLE);
-UNION!(VARIANT, data1, pboolVal, pboolVal_mut, *mut ::VARIANT_BOOL);
-UNION!(VARIANT, data1, pscode, pscode_mut, *mut ::SCODE);
-UNION!(VARIANT, data1, pcyVal, pcyVal_mut, *mut ::CY);
-UNION!(VARIANT, data1, pdate, pdate_mut, *mut ::DATE);
-UNION!(VARIANT, data1, pbstrVal, pbstrVal_mut, *mut ::BSTR);
-UNION!(VARIANT, data1, ppunkVal, ppunkVal_mut, *mut *mut ::IUnknown);
-UNION!(VARIANT, data1, ppdispVal, ppdispVal_mut, *mut *mut IDispatch);
-UNION!(VARIANT, data1, pparray, pparray_mut, *mut *mut SAFEARRAY);
-UNION!(VARIANT, data1, pvarVal, pvarVal_mut, *mut VARIANT);
-UNION!(VARIANT, data1, byref, byref_mut, ::PVOID);
-UNION!(VARIANT, data1, cVal, cVal_mut, ::CHAR);
-UNION!(VARIANT, data1, uiVal, uiVal_mut, ::USHORT);
-UNION!(VARIANT, data1, ulVal, ulVal_mut, ::ULONG);
-UNION!(VARIANT, data1, ullVal, ullVal_mut, ::ULONGLONG);
-UNION!(VARIANT, data1, intVal, intVal_mut, ::INT);
-UNION!(VARIANT, data1, uintVal, uintVal_mut, ::UINT);
-UNION!(VARIANT, data1, pdecVal, pdecVal_mut, *mut ::DECIMAL);
-UNION!(VARIANT, data1, pcVal, pcVal_mut, *mut ::CHAR);
-UNION!(VARIANT, data1, puiVal, puiVal_mut, *mut ::USHORT);
-UNION!(VARIANT, data1, pulVal, pulVal_mut, *mut ::ULONG);
-UNION!(VARIANT, data1, pullVal, pullVal_mut, *mut ::ULONGLONG);
-UNION!(VARIANT, data1, pintVal, pintVal_mut, *mut ::INT);
-UNION!(VARIANT, data1, puintVal, puintVal_mut, *mut ::UINT);
-UNION!(VARIANT, data1, pvRecord, pvRecord_mut, ::PVOID);
-UNION!(VARIANT, data2, pRecInfo, pRecInfo_mut, *mut IRecordInfo);
-UNION!(VARIANT, data0, decVal, decVal_mut, ::DECIMAL);
-pub type LPVARIANT = *mut VARIANT;
-pub type VARIANTARG = VARIANT;
-pub type LPVARIANTARG = *mut VARIANT;
-pub type REFVARIANT = *const VARIANT;
-STRUCT!{struct _wireBRECORD {
-    fFlags: ::ULONG,
-    clSize: ::ULONG,
-    pRecInfo: *mut IRecordInfo,
-    pRecord: *mut ::BYTE,
-}}
-STRUCT!{struct _wireVARIANT {
-    clSize: ::DWORD,
-    rpcReserved: ::DWORD,
-    vt: ::USHORT,
-    wReserved1: ::USHORT,
-    wReserved2: ::USHORT,
-    wReserved3: ::USHORT,
-    data0: u64,
-    data1: u64,
-}}
-UNION!(_wireVARIANT, data0, llVal, llVal_mut, ::LONGLONG);
-UNION!(_wireVARIANT, data0, lVal, lVal_mut, ::LONG);
-UNION!(_wireVARIANT, data0, bVal, bVal_mut, ::BYTE);
-UNION!(_wireVARIANT, data0, iVal, iVal_mut, ::SHORT);
-UNION!(_wireVARIANT, data0, fltVal, fltVal_mut, ::FLOAT);
-UNION!(_wireVARIANT, data0, dblVal, dblVal_mut, ::DOUBLE);
-UNION!(_wireVARIANT, data0, boolVal, boolVal_mut, ::VARIANT_BOOL);
-UNION!(_wireVARIANT, data0, scode, scode_mut, ::SCODE);
-UNION!(_wireVARIANT, data0, cyVal, cyVal_mut, ::CY);
-UNION!(_wireVARIANT, data0, date, date_mut, ::DATE);
-UNION!(_wireVARIANT, data0, bstrVal, bstrVal_mut, ::wireBSTR);
-UNION!(_wireVARIANT, data0, punkVal, punkVal_mut, *mut ::IUnknown);
-UNION!(_wireVARIANT, data0, pdispVal, pdispVal_mut, *mut IDispatch);
-UNION!(_wireVARIANT, data0, parray, parray_mut, wirePSAFEARRAY);
-UNION!(_wireVARIANT, data0, brecVal, brecVal_mut, wireBRECORD);
-UNION!(_wireVARIANT, data0, pllVal, pllVal_mut, *mut ::LONGLONG);
-UNION!(_wireVARIANT, data0, plVal, plVal_mut, *mut ::LONG);
-UNION!(_wireVARIANT, data0, pbVal, pbVal_mut, *mut ::BYTE);
-UNION!(_wireVARIANT, data0, piVal, piVal_mut, *mut ::SHORT);
-UNION!(_wireVARIANT, data0, pfltVal, pfltVal_mut, *mut ::FLOAT);
-UNION!(_wireVARIANT, data0, pdblVal, pdblVal_mut, *mut ::DOUBLE);
-UNION!(_wireVARIANT, data0, pboolVal, pboolVal_mut, *mut ::VARIANT_BOOL);
-UNION!(_wireVARIANT, data0, pscode, pscode_mut, *mut ::SCODE);
-UNION!(_wireVARIANT, data0, pcyVal, pcyVal_mut, *mut ::CY);
-UNION!(_wireVARIANT, data0, pdate, pdate_mut, *mut ::DATE);
-UNION!(_wireVARIANT, data0, pbstrVal, pbstrVal_mut, *mut ::wireBSTR);
-UNION!(_wireVARIANT, data0, ppunkVal, ppunkVal_mut, *mut *mut ::IUnknown);
-UNION!(_wireVARIANT, data0, ppdispVal, ppdispVal_mut, *mut *mut IDispatch);
-UNION!(_wireVARIANT, data0, pparray, pparray_mut, *mut wirePSAFEARRAY);
-UNION!(_wireVARIANT, data0, pvarVal, pvarVal_mut, *mut wireVARIANT);
-UNION!(_wireVARIANT, data0, cVal, cVal_mut, ::CHAR);
-UNION!(_wireVARIANT, data0, uiVal, uiVal_mut, ::USHORT);
-UNION!(_wireVARIANT, data0, ulVal, ulVal_mut, ::ULONG);
-UNION!(_wireVARIANT, data0, ullVal, ullVal_mut, ::ULONGLONG);
-UNION!(_wireVARIANT, data0, intVal, intVal_mut, ::INT);
-UNION!(_wireVARIANT, data0, uintVal, uintVal_mut, ::UINT);
-UNION!(_wireVARIANT, data0, decVal, decVal_mut, ::DECIMAL);
-UNION!(_wireVARIANT, data0, pcVal, pcVal_mut, *mut ::CHAR);
-UNION!(_wireVARIANT, data0, puiVal, puiVal_mut, *mut ::USHORT);
-UNION!(_wireVARIANT, data0, pulVal, pulVal_mut, *mut ::ULONG);
-UNION!(_wireVARIANT, data0, pullVal, pullVal_mut, *mut ::ULONGLONG);
-UNION!(_wireVARIANT, data0, pintVal, pintVal_mut, *mut ::INT);
-UNION!(_wireVARIANT, data0, puintVal, puintVal_mut, *mut ::UINT);
-UNION!(_wireVARIANT, data0, pdecVal, pdecVal_mut, *mut ::DECIMAL);
-pub type DISPID = ::LONG;
-pub type MEMBERID = DISPID;
-pub type HREFTYPE = ::DWORD;
-ENUM!{enum TYPEKIND {
-    TKIND_ENUM = 0,
-    TKIND_RECORD,
-    TKIND_MODULE,
-    TKIND_INTERFACE,
-    TKIND_DISPATCH,
-    TKIND_COCLASS,
-    TKIND_ALIAS,
-    TKIND_UNION,
-    TKIND_MAX,
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct TYPEDESC {
-    data: u64,
-    vt: ::VARTYPE,
-}}
-#[cfg(target_arch = "x86")]
-STRUCT!{struct TYPEDESC {
-    data: u32,
-    vt: ::VARTYPE,
-}}
-UNION!(TYPEDESC, data, lptdesc, lptdesc_mut, *mut TYPEDESC);
-UNION!(TYPEDESC, data, lpadesc, lpadesc_mut, *mut ARRAYDESC);
-UNION!(TYPEDESC, data, hreftype, hreftype_mut, HREFTYPE);
-STRUCT!{struct ARRAYDESC {
-    tdescElem: TYPEDESC,
-    cDims: ::USHORT,
-    rgbounds: [SAFEARRAYBOUND; 1],
-}}
-STRUCT!{struct PARAMDESCEX {
-    cBytes: ::ULONG,
-    varDefaultValue: VARIANTARG,
-}}
-pub type LPPARAMDESCEX = *mut PARAMDESCEX;
-STRUCT!{struct PARAMDESC {
-    pparamdescex: LPPARAMDESCEX,
-    wParamFlags: ::USHORT,
-}}
-pub type LPPARAMDESC = *mut PARAMDESC;
-pub const PARAMFLAG_NONE: ::DWORD = 0;
-pub const PARAMFLAG_FIN: ::DWORD = 0x1;
-pub const PARAMFLAG_FOUT: ::DWORD = 0x2;
-pub const PARAMFLAG_FLCID: ::DWORD = 0x4;
-pub const PARAMFLAG_FRETVAL: ::DWORD = 0x8;
-pub const PARAMFLAG_FOPT: ::DWORD = 0x10;
-pub const PARAMFLAG_FHASDEFAULT: ::DWORD = 0x20;
-pub const PARAMFLAG_FHASCUSTDATA: ::DWORD = 0x40;
-STRUCT!{struct IDLDESC {
-    dwReserved: ::ULONG_PTR,
-    wIDLFlags: ::USHORT,
-}}
-pub type LPIDLDESC = *mut IDLDESC;
-pub const IDLFLAG_NONE: ::DWORD = PARAMFLAG_NONE;
-pub const IDLFLAG_FIN: ::DWORD = PARAMFLAG_FIN;
-pub const IDLFLAG_FOUT: ::DWORD = PARAMFLAG_FOUT;
-pub const IDLFLAG_FLCID: ::DWORD = PARAMFLAG_FLCID;
-pub const IDLFLAG_FRETVAL: ::DWORD = PARAMFLAG_FRETVAL;
-STRUCT!{struct ELEMDESC {
-    tdesc: TYPEDESC,
-    idldesc: IDLDESC,
-}}
-UNION!(ELEMDESC, idldesc, paramdesc, paramdesc_mut, PARAMDESC);
-pub type LPELEMDESC = *mut ELEMDESC;
-STRUCT!{struct TYPEATTR {
-    guid: ::GUID,
-    lcid: ::LCID,
-    dwReserved: ::DWORD,
-    memidConstructor: ::MEMBERID,
-    memidDestructor: ::MEMBERID,
-    lpstrSchema: ::LPOLESTR,
-    cbSizeInstance: ::ULONG,
-    typekind: ::TYPEKIND,
-    cFuncs: ::WORD,
-    cVars: ::WORD,
-    cImplTypes: ::WORD,
-    cbSizeVft: ::WORD,
-    cbAlignment: ::WORD,
-    wTypeFlags: ::WORD,
-    wMajorVerNum: ::WORD,
-    wMinorVerNum: ::WORD,
-    tdescAlias: ::TYPEDESC,
-    idldescType: ::IDLDESC,
-}}
-pub type LPTYPEATTR = *mut TYPEATTR;
-STRUCT!{struct DISPPARAMS {
-    rgvarg: *mut VARIANTARG,
-    rgdispidNamedArgs: *mut DISPID,
-    cArgs: ::UINT,
-    cNamedArgs: ::UINT,
-}}
-STRUCT!{nodebug struct EXCEPINFO {
-    wCode: ::WORD,
-    wReserved: ::WORD,
-    bstrSource: ::BSTR,
-    bstrDescription: ::BSTR,
-    bstrHelpFile: ::BSTR,
-    dwHelpContext: ::DWORD,
-    pvReserved: ::PVOID,
-    pfnDeferredFillIn: Option<unsafe extern "system" fn(einfo: *mut EXCEPINFO) -> ::HRESULT>,
-    scode: ::SCODE,
-}}
-ENUM!{enum CALLCONV {
-    CC_FASTCALL = 0,
-    CC_CDECL = 1,
-    CC_MSCPASCAL,
-    CC_PASCAL,
-    CC_MACPASCAL,
-    CC_STDCALL,
-    CC_FPFASTCALL,
-    CC_SYSCALL,
-    CC_MPWCDECL,
-    CC_MPWPASCAL,
-    CC_MAX,
-}}
-ENUM!{enum FUNCKIND {
-    FUNC_VIRTUAL = 0,
-    FUNC_PUREVIRTUAL,
-    FUNC_NONVIRTUAL,
-    FUNC_STATIC,
-    FUNC_DISPATCH,
-}}
-FLAGS!{enum INVOKEKIND {
-    INVOKE_FUNC = 1,
-    INVOKE_PROPERTYGET = 2,
-    INVOKE_PROPERTYPUT = 4,
-    INVOKE_PROPERTYPUTREF = 8,
-}}
-STRUCT!{struct FUNCDESC {
-    memid: ::MEMBERID,
-    lprgscode: *mut ::SCODE,
-    lprgelemdescParam: *mut ::ELEMDESC,
-    funckind: ::FUNCKIND,
-    invkind: ::INVOKEKIND,
-    callconv: ::CALLCONV,
-    cParams: ::SHORT,
-    cParamsOpt: ::SHORT,
-    oVft: ::SHORT,
-    cScodes: ::SHORT,
-    elemdescFunc: ::ELEMDESC,
-    wFuncFlags: ::WORD,
-}}
-pub type LPFUNCDESC = *mut FUNCDESC;
-ENUM!{enum VARKIND {
-    VAR_PERINSTANCE = 0,
-    VAR_STATIC,
-    VAR_CONST,
-    VAR_DISPATCH,
-}}
-pub const IMPLTYPEFLAG_FDEFAULT: ::DWORD = 0x1;
-pub const IMPLTYPEFLAG_FSOURCE: ::DWORD = 0x2;
-pub const IMPLTYPEFLAG_FRESTRICTED: ::DWORD = 0x4;
-pub const IMPLTYPEFLAG_FDEFAULTVTABLE: ::DWORD = 0x8;
-STRUCT!{struct VARDESC {
-    memid: MEMBERID,
-    lpstrSchema: ::LPOLESTR,
-    lpvarValue: *mut VARIANT,
-    elemdescVar: ::ELEMDESC,
-    wVarFlags: ::WORD,
-    varkind: VARKIND,
-}}
-UNION!(VARDESC, lpvarValue, oInst, oInst_mut, ::ULONG);
-pub type LPVARDESC = *mut VARDESC;
-FLAGS!{enum TYPEFLAGS {
-    TYPEFLAG_FAPPOBJECT = 0x1,
-    TYPEFLAG_FCANCREATE = 0x2,
-    TYPEFLAG_FLICENSED  = 0x4,
-    TYPEFLAG_FPREDECLID = 0x8,
-    TYPEFLAG_FHIDDEN = 0x10,
-    TYPEFLAG_FCONTROL = 0x20,
-    TYPEFLAG_FDUAL = 0x40,
-    TYPEFLAG_FNONEXTENSIBLE = 0x80,
-    TYPEFLAG_FOLEAUTOMATION = 0x100,
-    TYPEFLAG_FRESTRICTED = 0x200,
-    TYPEFLAG_FAGGREGATABLE = 0x400,
-    TYPEFLAG_FREPLACEABLE = 0x800,
-    TYPEFLAG_FDISPATCHABLE = 0x1000,
-    TYPEFLAG_FREVERSEBIND = 0x2000,
-    TYPEFLAG_FPROXY = 0x4000,
-}}
-FLAGS!{enum FUNCFLAGS {
-    FUNCFLAG_FRESTRICTED = 0x1,
-    FUNCFLAG_FSOURCE = 0x2,
-    FUNCFLAG_FBINDABLE = 0x4,
-    FUNCFLAG_FREQUESTEDIT = 0x8,
-    FUNCFLAG_FDISPLAYBIND = 0x10,
-    FUNCFLAG_FDEFAULTBIND = 0x20,
-    FUNCFLAG_FHIDDEN = 0x40,
-    FUNCFLAG_FUSESGETLASTERROR = 0x80,
-    FUNCFLAG_FDEFAULTCOLLELEM = 0x100,
-    FUNCFLAG_FUIDEFAULT = 0x200,
-    FUNCFLAG_FNONBROWSABLE = 0x400,
-    FUNCFLAG_FREPLACEABLE = 0x800,
-    FUNCFLAG_FIMMEDIATEBIND = 0x1000,
-}}
-FLAGS!{enum VARFLAGS {
-    VARFLAG_FREADONLY = 0x1,
-    VARFLAG_FSOURCE = 0x2,
-    VARFLAG_FBINDABLE = 0x4,
-    VARFLAG_FREQUESTEDIT = 0x8,
-    VARFLAG_FDISPLAYBIND = 0x10,
-    VARFLAG_FDEFAULTBIND = 0x20,
-    VARFLAG_FHIDDEN = 0x40,
-    VARFLAG_FRESTRICTED = 0x80,
-    VARFLAG_FDEFAULTCOLLELEM = 0x100,
-    VARFLAG_FUIDEFAULT = 0x200,
-    VARFLAG_FNONBROWSABLE = 0x400,
-    VARFLAG_FREPLACEABLE = 0x800,
-    VARFLAG_FIMMEDIATEBIND = 0x1000,
-}}
-STRUCT!{struct CLEANLOCALSTORAGE {
-    pInterface: *mut ::IUnknown,
-    pStorage: ::PVOID,
-    flags: ::DWORD,
-}}
-STRUCT!{struct CUSTDATAITEM {
-    guid: ::GUID,
-    varValue: VARIANTARG,
-}}
-pub type LPCUSTDATAITEM = *mut CUSTDATAITEM;
-STRUCT!{struct CUSTDATA {
-    cCustData: ::DWORD,
-    prgCustData: LPCUSTDATAITEM,
-}}
-pub type LPCUSTDATA = *mut CUSTDATA;
-pub type LPCREATETYPEINFO = *mut ICreateTypeInfo;
-RIDL!(
-interface ICreateTypeInfo(ICreateTypeInfoVtbl): IUnknown(IUnknownVtbl) {
-    fn SetGuid(&mut self, guid: ::REFGUID) -> ::HRESULT,
-    fn SetTypeFlags(&mut self, uTypeFlags: ::UINT) -> ::HRESULT,
-    fn SetDocString(&mut self, pStrDoc: ::LPOLESTR) -> ::HRESULT,
-    fn SetHelpContext(&mut self, dwHelpContext: ::DWORD) -> ::HRESULT,
-    fn SetVersion(&mut self, wMajorVerNum: ::WORD, wMinorVerNum: ::WORD) -> ::HRESULT,
-    fn AddRefTypeInfo(&mut self, pTInfo: *mut ITypeInfo) -> ::HRESULT,
-    fn AddFuncDesc(&mut self, index: ::UINT, pFuncDesc: *mut FUNCDESC) -> ::HRESULT,
-    fn SetImplTypeFlags(&mut self, index: ::UINT, implTypeFlags: ::INT) -> ::HRESULT,
-    fn SetAlignment(&mut self, cbAlignment: ::WORD) -> ::HRESULT,
-    fn SetSchema(&mut self, pStrSchema: ::LPOLESTR) -> ::HRESULT,
-    fn AddVarDesc(&mut self, index: ::UINT, pVarDesc: *mut VARDESC) -> ::HRESULT,
-    fn SetFuncAndParamNames(
-        &mut self, index: ::UINT, rgszNames: *mut ::LPOLESTR, cNames: ::UINT
-    ) -> ::HRESULT,
-    fn SetVarName(&mut self, index: ::UINT, szName: ::LPOLESTR) -> ::HRESULT,
-    fn SetTypeDescAlias(&mut self, pTDescAlias: *mut TYPEDESC) -> ::HRESULT,
-    fn DefineFuncAsDllEntry(
-        &mut self, index: ::UINT, szDllName: ::LPOLESTR, szProcName: ::LPOLESTR
-    ) -> ::HRESULT,
-    fn SetFuncDocString(&mut self, index: ::UINT, szDocString: ::LPOLESTR) -> ::HRESULT,
-    fn SetVarDocString(&mut self, index: ::UINT, szDocString: ::LPOLESTR) -> ::HRESULT,
-    fn SetFuncHelpContext(&mut self, index: ::UINT, dwHelpContext: ::DWORD) -> ::HRESULT,
-    fn SetVarHelpContext(&mut self, index: ::UINT, dwHelpContext: ::DWORD) -> ::HRESULT,
-    fn SetMops(&mut self, index: ::UINT, bstrMops: ::BSTR) -> ::HRESULT,
-    fn SetTypeIdldesc(&mut self, pIdlDesc: *mut IDLDESC) -> ::HRESULT,
-    fn LayOut(&mut self) -> ::HRESULT
-}
-);
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateTypeInfo2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateTypeLib;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateTypeLib2;
-pub type LPDISPATCH = *mut IDispatch;
-pub const DISPID_UNKNOWN: ::INT = -1;
-pub const DISPID_VALUE: ::INT = 0;
-pub const DISPID_PROPERTYPUT: ::INT = -3;
-pub const DISPID_NEWENUM: ::INT = -4;
-pub const DISPID_EVALUATE: ::INT = -5;
-pub const DISPID_CONSTRUCTOR: ::INT = -6;
-pub const DISPID_DESTRUCTOR: ::INT = -7;
-pub const DISPID_COLLECT: ::INT = -8;
-RIDL!(
-interface IDispatch(IDispatchVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTypeInfoCount(&mut self, pctinfo: *mut ::UINT) -> ::HRESULT,
-    fn GetTypeInfo(
-        &mut self, iTInfo: ::UINT, lcid: ::LCID, ppTInfo: *mut *mut ITypeInfo
-    ) -> ::HRESULT,
-    fn GetIDsOfNames(
-        &mut self, riid: ::REFIID, rgszNames: *mut ::LPOLESTR, cNames: ::UINT, lcid: ::LCID,
-        rgDispId: *mut ::DISPID
-    ) -> ::HRESULT,
-    fn Invoke(
-        &mut self, dispIdMember: ::DISPID, riid: ::REFIID, lcid: ::LCID, wFlags: ::WORD,
-        pDispParams: *mut ::DISPPARAMS, pVarResult: *mut VARIANT, pExcepInfo: *mut ::EXCEPINFO,
-        puArgErr: *mut ::UINT
-    ) -> ::HRESULT
-}
-);
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumVARIANT;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeComp;
-RIDL!(
-interface ITypeInfo(ITypeInfoVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTypeAttr(&mut self, ppTypeAttr: *mut *mut TYPEATTR) -> ::HRESULT,
-    fn GetTypeComp(&mut self, ppTComp: *mut *mut ITypeComp) -> ::HRESULT,
-    fn GetFuncDesc(&mut self, index: ::UINT, ppFunDesc: *mut *mut FUNCDESC) -> ::HRESULT,
-    fn GetVarDesc(&mut self, index: ::UINT, pPVarDesc: *mut *mut VARDESC) -> ::HRESULT,
-    fn GetNames(
-        &mut self, memid: MEMBERID, rgBstrNames: *mut ::BSTR, cMaxNames: ::UINT,
-        pcNames: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetRefTypeOfImplType(&mut self, index: ::UINT, pRefType: *mut HREFTYPE) -> ::HRESULT,
-    fn GetImplTypeFlags(&mut self, index: ::UINT, pImplTypeFlags: *mut ::INT) -> ::HRESULT,
-    fn GetIDsOfNames(
-        &mut self, rgszNames: *mut ::LPOLESTR, cNames: ::UINT, pMemId: *mut MEMBERID
-    ) -> ::HRESULT,
-    fn Invoke(
-        &mut self, pvInstance: ::PVOID, memid: MEMBERID, wFlags: ::WORD,
-        pDispParams: *mut DISPPARAMS, pVarResult: *mut VARIANT, pExcepInfo: *mut EXCEPINFO,
-        puArgErr: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetDocumentation(
-        &mut self, memid: MEMBERID, pBstrName: *mut ::BSTR, pBstrDocString: *mut ::BSTR,
-        pdwHelpContext: *mut ::DWORD, pBstrHelpFile: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetDllEntry(
-        &mut self, memid: MEMBERID, invKind: ::INVOKEKIND, pBstrDllName: *mut ::BSTR,
-        pBstrName: *mut ::BSTR, pwOrdinal: *mut ::WORD
-    ) -> ::HRESULT,
-    fn GetRefTypeInfo(&mut self, hRefType: HREFTYPE, ppTInfo: *mut *mut ITypeInfo) -> ::HRESULT,
-    fn AddressOfMember(
-        &mut self, memid: MEMBERID, invKind: ::INVOKEKIND, ppv: *mut ::PVOID
-    ) -> ::HRESULT,
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut ::IUnknown, riid: ::REFIID, ppvObj: *mut ::PVOID
-    ) -> ::HRESULT,
-    fn GetMops(&mut self, memid: MEMBERID, pBstrMops: *mut ::BSTR) -> ::HRESULT,
-    fn GetContainingTypeLib(
-        &mut self, ppTLib: *mut *mut ITypeLib, pIndex: *mut ::UINT
-    ) -> ::HRESULT,
-    fn ReleaseTypeAttr(&mut self, pTypeAttr: *mut TYPEATTR) -> (),
-    fn ReleaseFuncDesc(&mut self, pFuncDesc: *mut FUNCDESC) -> (),
-    fn ReleaseVarDesc(&mut self, pVarDesc: *mut VARDESC) -> ()
-}
-);
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeInfo2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeLib;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeLib2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeChangeEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IErrorInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICreateErrorInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISupportErrorInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITypeMarshal;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRecordInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IErrorLog;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPropertyBag;
diff --git a/vendor/winapi-0.2.8/src/objbase.rs b/vendor/winapi-0.2.8/src/objbase.rs
deleted file mode 100644
index cfd2b79903..0000000000
--- a/vendor/winapi-0.2.8/src/objbase.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-//! Component object model defintions
-pub const COINIT_APARTMENTTHREADED: ::DWORD = 0x2;
-pub const COINIT_MULTITHREADED: ::DWORD = 0x0;
-pub const COINIT_DISABLE_OLE1DDE: ::DWORD = 0x4;
-pub const COINIT_SPEED_OVER_MEMORY: ::DWORD = 0x8;
diff --git a/vendor/winapi-0.2.8/src/objidl.rs b/vendor/winapi-0.2.8/src/objidl.rs
deleted file mode 100644
index ac49010bcc..0000000000
--- a/vendor/winapi-0.2.8/src/objidl.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-//8402
-STRUCT!{struct BIND_OPTS {
-    cbStruct: ::DWORD,
-    grfFlags: ::DWORD,
-    grfMode: ::DWORD,
-    dwTickCountDeadline: ::DWORD,
-}}
-pub type LPBIND_OPTS = *mut BIND_OPTS;
-//8479
-RIDL!(
-interface IBindCtx(IBindCtxVtbl): IUnknown(IUnknownVtbl) {
-    fn RegisterObjectBound(&mut self, punk: *mut ::IUnknown) -> ::HRESULT,
-    fn RevokeObjectBound(&mut self, punk: *mut ::IUnknown) -> ::HRESULT,
-    fn ReleaseBoundObjects(&mut self) -> ::HRESULT,
-    fn SetBindOptions(&mut self, pbindopts: *mut BIND_OPTS) -> ::HRESULT,
-    fn GetBindOptions(&mut self, pbindopts: *mut BIND_OPTS) -> ::HRESULT,
-    fn GetRunningObjectTable(&mut self, pprot: *mut *mut IRunningObjectTable) -> ::HRESULT,
-    fn RegisterObjectParam(&mut self, pszKey: ::LPOLESTR, punk: *mut ::IUnknown) -> ::HRESULT,
-    fn GetObjectParam(&mut self, pszKey: ::LPOLESTR, ppunk: *mut *mut ::IUnknown) -> ::HRESULT,
-    fn EnumObjectParam(&mut self, ppenum: *mut *mut ::IEnumString) -> ::HRESULT,
-    fn RevokeObjectParam(&mut self, pszKey: ::LPOLESTR) -> ::HRESULT
-}
-);
-//8681
-pub type IEnumMoniker = ::IUnknown; // TODO
-//8958
-RIDL!(
-interface IRunningObjectTable(IRunningObjectTableVtbl): IUnknown(IUnknownVtbl) {
-    fn Register(
-        &mut self, grfFlags: ::DWORD, punkObject: *mut ::IUnknown, pmkObjectName: *mut IMoniker,
-        pdwRegister: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn Revoke(&mut self, dwRegister: ::DWORD) -> ::HRESULT,
-    fn IsRunning(&mut self, pmkObjectName: *mut IMoniker) -> ::HRESULT,
-    fn GetObject(
-        &mut self, pmkObjectName: *mut IMoniker, ppunkObject: *mut *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn NoteChangeTime(&mut self, dwRegister: ::DWORD, pfiletime: *mut ::FILETIME) -> ::HRESULT,
-    fn GetTimeOfLastChange(
-        &mut self, pmkObjectName: *mut IMoniker, pfiletime: *mut ::FILETIME
-    ) -> ::HRESULT,
-    fn EnumRunning(&mut self, ppenumMoniker: *mut *mut IEnumMoniker) -> ::HRESULT
-}
-);
-//9350
-pub type IMoniker = ::IUnknown; // TODO
-pub type EOLE_AUTHENTICATION_CAPABILITIES = ::DWORD;
-pub const EOAC_NONE: ::DWORD = 0;
-pub const EOAC_MUTUAL_AUTH: ::DWORD = 0x1;
-pub const EOAC_STATIC_CLOAKING: ::DWORD = 0x20;
-pub const EOAC_DYNAMIC_CLOAKING: ::DWORD = 0x40;
-pub const EOAC_ANY_AUTHORITY: ::DWORD = 0x80;
-pub const EOAC_MAKE_FULLSIC: ::DWORD = 0x100;
-pub const EOAC_DEFAULT: ::DWORD = 0x800;
-pub const EOAC_SECURE_REFS: ::DWORD = 0x2;
-pub const EOAC_ACCESS_CONTROL: ::DWORD = 0x4;
-pub const EOAC_APPID: ::DWORD = 0x8;
-pub const EOAC_DYNAMIC: ::DWORD = 0x10;
-pub const EOAC_REQUIRE_FULLSIC: ::DWORD = 0x200;
-pub const EOAC_AUTO_IMPERSONATE: ::DWORD = 0x400;
-pub const EOAC_NO_CUSTOM_MARSHAL: ::DWORD = 0x2000;
-pub const EOAC_DISABLE_AAA: ::DWORD = 0x1000;
-STRUCT!{struct SOLE_AUTHENTICATION_SERVICE {
-    dwAuthnSvc: ::DWORD,
-    dwAuthzSvc: ::DWORD,
-    pPrincipalName: *mut ::OLECHAR,
-    hr: ::HRESULT,
-}}
-
-RIDL!(
-interface IApartmentShutdown(IApartmentShutdownVtbl): IUnknown(IUnknownVtbl) {
-    fn OnUninitialize(&mut self, ui64ApartmentIdentifier: ::UINT64) -> ::VOID
-}
-);
-
-RIDL!(
-interface IMarshal(IMarshalVtbl): IUnknown(IUnknownVtbl) {
-    fn GetUnmarshalClass(
-        &mut self, riid: ::REFIID, pv: *const ::VOID, dwDestContext: ::DWORD,
-        pvDestContext: *const ::VOID, mshlflags: ::DWORD, pCid: *mut ::CLSID
-    ) -> ::HRESULT,
-    fn GetMarshalSizeMax(
-        &mut self, riid: ::REFIID, pv: *const ::VOID, dwDestContext: ::DWORD,
-        pvDestContext: *const ::VOID, mshlflags: ::DWORD, pSize: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn MarshalInterface(
-        &mut self, pStm: *const ::IStream, riid: ::REFIID, pv: *const ::VOID,
-        dwDestContext: ::DWORD, pvDestContext: *const ::VOID,
-        mshlflags: ::DWORD
-    ) -> ::HRESULT,
-    fn UnmarshalInterface(
-        &mut self, pStm: *const ::IStream, riid: ::REFIID, ppv: *mut *mut ::VOID
-    ) -> ::HRESULT,
-    fn ReleaseMarshalData(&mut self, pStm: *const ::IStream) -> ::HRESULT,
-    fn DisconnectObject(&mut self, dwReserved: ::DWORD) -> ::HRESULT
-}
-);
\ No newline at end of file
diff --git a/vendor/winapi-0.2.8/src/objidlbase.rs b/vendor/winapi-0.2.8/src/objidlbase.rs
deleted file mode 100644
index f49353f823..0000000000
--- a/vendor/winapi-0.2.8/src/objidlbase.rs
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-RIDL!(
-interface IMalloc(IMallocVtbl): IUnknown(IUnknownVtbl) {
-    fn Alloc(&mut self, cb: ::SIZE_T) -> *mut ::c_void,
-    fn Realloc(&mut self, pv: *mut ::c_void, cb: ::SIZE_T) -> *mut ::c_void,
-    fn Free(&mut self, pv: *mut ::c_void) -> (),
-    fn GetSize(&mut self, pv: *mut ::c_void) -> ::SIZE_T,
-    fn DidAlloc(&mut self, pv: *mut ::c_void) -> ::c_int,
-    fn HeapMinimize(&mut self) -> ()
-}
-);
-pub type LPMALLOC = *mut IMalloc;
-STRUCT!{struct STATSTG {
-    pwcsName: ::LPOLESTR,
-    type_: ::DWORD,
-    cbSize: ::ULARGE_INTEGER,
-    mtime: ::FILETIME,
-    ctime: ::FILETIME,
-    atime: ::FILETIME,
-    grfMode: ::DWORD,
-    grfLocksSupported: ::DWORD,
-    clsid: ::CLSID,
-    grfStateBits: ::DWORD,
-    reserved: ::DWORD,
-}}
-//1945
-pub type IEnumString = ::IUnknown; // TODO
-//2075
-RIDL!(
-interface ISequentialStream(ISequentialStreamVtbl): IUnknown(IUnknownVtbl) {
-    fn Read(&mut self, pv: *mut ::c_void, cb: ::ULONG, pcbRead: *mut ::ULONG) -> ::HRESULT,
-    fn Write(&mut self, pv: *const ::c_void, cb: ::ULONG, pcbWritten: *mut ::ULONG) -> ::HRESULT
-}
-);
-ENUM!{enum STGTY {
-    STGTY_STORAGE = 1,
-    STGTY_STREAM = 2,
-    STGTY_LOCKBYTES = 3,
-    STGTY_PROPERTY = 4,
-}}
-ENUM!{enum STREAM_SEEK {
-    STREAM_SEEK_SET = 0,
-    STREAM_SEEK_CUR = 1,
-    STREAM_SEEK_END = 2,
-}}
-ENUM!{enum LOCKTYPE {
-    LOCK_WRITE = 1,
-    LOCK_EXCLUSIVE = 2,
-    LOCK_ONLYONCE = 4,
-}}
-//2255
-RIDL!(
-interface IStream(IStreamVtbl): ISequentialStream(ISequentialStreamVtbl) {
-    fn Seek(
-        &mut self, dlibMove: ::LARGE_INTEGER, dwOrigin: ::DWORD,
-        plibNewPosition: *mut ::ULARGE_INTEGER
-    ) -> ::HRESULT,
-    fn SetSize(&mut self, libNewSize: ::ULARGE_INTEGER) -> ::HRESULT,
-    fn CopyTo(
-        &mut self, pstm: *mut IStream, cb: ::ULARGE_INTEGER, pcbRead: *mut ::ULARGE_INTEGER,
-        pcbWritten: *mut ::ULARGE_INTEGER
-    ) -> ::HRESULT,
-    fn Commit(&mut self, grfCommitFlags: ::DWORD) -> ::HRESULT,
-    fn Revert(&mut self) -> ::HRESULT,
-    fn LockRegion(
-        &mut self, libOffset: ::ULARGE_INTEGER, cb: ::ULARGE_INTEGER, dwLockType: ::DWORD
-    ) -> ::HRESULT,
-    fn UnlockRegion(
-        &mut self, libOffset: ::ULARGE_INTEGER, cb: ::ULARGE_INTEGER, dwLockType: ::DWORD
-    ) -> ::HRESULT,
-    fn Stat(&mut self, pstatstg: *mut STATSTG, grfStatFlag: ::DWORD) -> ::HRESULT,
-    fn Clone(&mut self, ppstm: *mut *mut IStream) -> ::HRESULT
-}
-);
-pub type LPSTREAM = *mut IStream;
-ENUM!{enum APTTYPEQUALIFIER {
-    APTTYPEQUALIFIER_NONE = 0,
-    APTTYPEQUALIFIER_IMPLICIT_MTA = 1,
-    APTTYPEQUALIFIER_NA_ON_MTA = 2,
-    APTTYPEQUALIFIER_NA_ON_STA = 3,
-    APTTYPEQUALIFIER_NA_ON_IMPLICIT_MTA = 4,
-    APTTYPEQUALIFIER_NA_ON_MAINSTA = 5,
-    APTTYPEQUALIFIER_APPLICATION_STA= 6,
-}}
-ENUM!{enum APTTYPE {
-    APTTYPE_CURRENT = -1i32 as u32,
-    APTTYPE_STA = 0,
-    APTTYPE_MTA = 1,
-    APTTYPE_NA = 2,
-    APTTYPE_MAINSTA = 3,
-}}
diff --git a/vendor/winapi-0.2.8/src/olectl.rs b/vendor/winapi-0.2.8/src/olectl.rs
deleted file mode 100644
index b557621526..0000000000
--- a/vendor/winapi-0.2.8/src/olectl.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! OLE Control interfaces
-//299
-pub const SELFREG_E_FIRST: ::HRESULT = MAKE_SCODE!(::SEVERITY_ERROR, ::FACILITY_ITF, 0x0200);
-pub const SELFREG_E_LAST: ::HRESULT = MAKE_SCODE!(::SEVERITY_ERROR, ::FACILITY_ITF, 0x020F);
-pub const SELFREG_S_FIRST: ::HRESULT = MAKE_SCODE!(::SEVERITY_SUCCESS, ::FACILITY_ITF, 0x0200);
-pub const SELFREG_S_LAST: ::HRESULT = MAKE_SCODE!(::SEVERITY_SUCCESS, ::FACILITY_ITF, 0x020F);
-pub const SELFREG_E_TYPELIB: ::HRESULT = SELFREG_E_FIRST + 0;
-pub const SELFREG_E_CLASS: ::HRESULT = SELFREG_E_FIRST + 1;
diff --git a/vendor/winapi-0.2.8/src/pdh.rs b/vendor/winapi-0.2.8/src/pdh.rs
deleted file mode 100644
index 165fe1e0c5..0000000000
--- a/vendor/winapi-0.2.8/src/pdh.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2016, Klavs Madsen
-// Licensed under the MIT License <LICENSE.md>
-//! Common Performance Data Helper definitions
-pub const PDH_FMT_RAW: ::DWORD = 0x00000010;
-pub const PDH_FMT_ANSI: ::DWORD = 0x00000020;
-pub const PDH_FMT_UNICODE: ::DWORD = 0x00000040;
-pub const PDH_FMT_LONG: ::DWORD = 0x00000100;
-pub const PDH_FMT_DOUBLE: ::DWORD = 0x00000200;
-pub const PDH_FMT_LARGE: ::DWORD = 0x00000400;
-pub const PDH_FMT_NOSCALE: ::DWORD = 0x00001000;
-pub const PDH_FMT_1000: ::DWORD = 0x00002000;
-pub const PDH_FMT_NODATA: ::DWORD = 0x00004000;
-pub const PDH_FMT_NOCAP100: ::DWORD = 0x00008000;
-pub const PERF_DETAIL_COSTLY: ::DWORD = 0x00010000;
-pub const PERF_DETAIL_STANDARD: ::DWORD = 0x0000FFFF;
-
-pub type PDH_STATUS = ::LONG;
-pub type PDH_HQUERY = ::HANDLE;
-pub type HQUERY = PDH_HQUERY;
-pub type PDH_HCOUNTER = ::HANDLE;
-pub type HCOUNTER = PDH_HCOUNTER;
-
-STRUCT!{struct PDH_FMT_COUNTERVALUE {
-    CStatus: ::DWORD,
-    largeValue: ::LONGLONG,
-}}
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, largeValue, largeValue_mut, ::LONGLONG);
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, longValue, longValue_mut, ::LONG);
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, doubleValue, doubleValue_mut, ::DOUBLE); 
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, AnsiStringValue, AnsiStringValue_mut, ::LPCSTR);
-UNION!(PDH_FMT_COUNTERVALUE, largeValue, WideStringValue, WideStringValue_mut, ::LPCWSTR);
-pub type PPDH_FMT_COUNTERVALUE = *mut PDH_FMT_COUNTERVALUE;
-
-STRUCT!{struct PDH_COUNTER_PATH_ELEMENTS_A {
-    szMachineName: ::LPSTR,
-    szObjectName: ::LPSTR,
-    szInstanceName: ::LPSTR,
-    szParentInstance: ::LPSTR,
-    dwInstanceIndex: ::DWORD,
-    szCounterName: ::LPSTR,
-}}
-pub type PPDH_COUNTER_PATH_ELEMENTS_A = *mut PDH_COUNTER_PATH_ELEMENTS_A;
-
-STRUCT!{struct PDH_COUNTER_PATH_ELEMENTS_W {
-    szMachineName: ::LPWSTR,
-    szObjectName: ::LPWSTR,
-    szInstanceName: ::LPWSTR,
-    szParentInstance: ::LPWSTR,
-    dwInstanceIndex: ::DWORD,
-    szCounterName: ::LPWSTR,
-}}
-pub type PPDH_COUNTER_PATH_ELEMENTS_W = *mut PDH_COUNTER_PATH_ELEMENTS_W;
diff --git a/vendor/winapi-0.2.8/src/playsoundapi.rs b/vendor/winapi-0.2.8/src/playsoundapi.rs
deleted file mode 100644
index 99f4501cda..0000000000
--- a/vendor/winapi-0.2.8/src/playsoundapi.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub const SND_SYNC: DWORD = 0x0000;
-pub const SND_ASYNC: DWORD = 0x0001;
-pub const SND_NODEFAULT: DWORD = 0x0002;
-pub const SND_MEMORY: DWORD = 0x0004;
-pub const SND_LOOP: DWORD = 0x0008;
-pub const SND_NOSTOP: DWORD = 0x0010;
-pub const SND_NOWAIT: DWORD = 0x00002000;
-pub const SND_ALIAS: DWORD = 0x00010000;
-pub const SND_ALIAS_ID: DWORD = 0x00110000;
-pub const SND_FILENAME: DWORD = 0x00020000;
-pub const SND_RESOURCE: DWORD = 0x00040004;
-pub const SND_PURGE: DWORD = 0x0040;
-pub const SND_APPLICATION: DWORD = 0x0080;
-pub const SND_SENTRY: DWORD = 0x00080000;
-pub const SND_RING: DWORD = 0x00100000;
-pub const SND_SYSTEM: DWORD = 0x00200000;
diff --git a/vendor/winapi-0.2.8/src/processsnapshot.rs b/vendor/winapi-0.2.8/src/processsnapshot.rs
deleted file mode 100644
index 73ea679bea..0000000000
--- a/vendor/winapi-0.2.8/src/processsnapshot.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Defines the process snapshot API
-FLAGS!{enum PSS_CAPTURE_FLAGS {
-    PSS_CAPTURE_NONE = 0x00000000,
-    PSS_CAPTURE_VA_CLONE = 0x00000001,
-    PSS_CAPTURE_RESERVED_00000002 = 0x00000002,
-    PSS_CAPTURE_HANDLES = 0x00000004,
-    PSS_CAPTURE_HANDLE_NAME_INFORMATION = 0x00000008,
-    PSS_CAPTURE_HANDLE_BASIC_INFORMATION = 0x00000010,
-    PSS_CAPTURE_HANDLE_TYPE_SPECIFIC_INFORMATION = 0x00000020,
-    PSS_CAPTURE_HANDLE_TRACE = 0x00000040,
-    PSS_CAPTURE_THREADS = 0x00000080,
-    PSS_CAPTURE_THREAD_CONTEXT = 0x00000100,
-    PSS_CAPTURE_THREAD_CONTEXT_EXTENDED = 0x00000200,
-    PSS_CAPTURE_RESERVED_00000400 = 0x00000400,
-    PSS_CAPTURE_VA_SPACE = 0x00000800,
-    PSS_CAPTURE_VA_SPACE_SECTION_INFORMATION = 0x00001000,
-    PSS_CREATE_BREAKAWAY_OPTIONAL = 0x04000000,
-    PSS_CREATE_BREAKAWAY = 0x08000000,
-    PSS_CREATE_FORCE_BREAKAWAY = 0x10000000,
-    PSS_CREATE_USE_VM_ALLOCATIONS = 0x20000000,
-    PSS_CREATE_MEASURE_PERFORMANCE = 0x40000000,
-    PSS_CREATE_RELEASE_SECTION = -2147483648i32 as u32,
-}}
-ENUM!{enum PSS_QUERY_INFORMATION_CLASS {
-    PSS_QUERY_PROCESS_INFORMATION = 0,
-    PSS_QUERY_VA_CLONE_INFORMATION = 1,
-    PSS_QUERY_AUXILIARY_PAGES_INFORMATION = 2,
-    PSS_QUERY_VA_SPACE_INFORMATION = 3,
-    PSS_QUERY_HANDLE_INFORMATION = 4,
-    PSS_QUERY_THREAD_INFORMATION = 5,
-    PSS_QUERY_HANDLE_TRACE_INFORMATION = 6,
-    PSS_QUERY_PERFORMANCE_COUNTERS = 7,
-}}
-ENUM!{enum PSS_WALK_INFORMATION_CLASS {
-    PSS_WALK_AUXILIARY_PAGES = 0,
-    PSS_WALK_VA_SPACE = 1,
-    PSS_WALK_HANDLES = 2,
-    PSS_WALK_THREADS = 3,
-}}
-FLAGS!{enum PSS_DUPLICATE_FLAGS {
-    PSS_DUPLICATE_NONE = 0x00,
-    PSS_DUPLICATE_CLOSE_SOURCE = 0x01,
-}}
-DECLARE_HANDLE!(HPSS, HPSS__);
-DECLARE_HANDLE!(HPSSWALK, HPSSWALK__);
-pub type pAllocRoutine = Option<unsafe extern "system" fn(
-    Context: *mut ::c_void, Size: ::DWORD,
-) -> *mut ::c_void>;
-pub type pFreeRoutine = Option<unsafe extern "system" fn(
-    Context: *mut ::c_void, Address: *mut ::c_void,
-)>;
-STRUCT!{nodebug struct PSS_ALLOCATOR {
-    Context: *mut ::c_void,
-    AllocRoutine: pAllocRoutine,
-    FreeRoutine: pFreeRoutine,
-}}
diff --git a/vendor/winapi-0.2.8/src/processthreadsapi.rs b/vendor/winapi-0.2.8/src/processthreadsapi.rs
deleted file mode 100644
index fad58c7e5a..0000000000
--- a/vendor/winapi-0.2.8/src/processthreadsapi.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-STRUCT!{struct PROCESS_INFORMATION {
-    hProcess: ::HANDLE,
-    hThread: ::HANDLE,
-    dwProcessId: ::DWORD,
-    dwThreadId: ::DWORD,
-}}
-pub type PPROCESS_INFORMATION = *mut PROCESS_INFORMATION;
-pub type LPPROCESS_INFORMATION = *mut PROCESS_INFORMATION;
-STRUCT!{struct STARTUPINFOA {
-    cb: ::DWORD,
-    lpReserved: ::LPSTR,
-    lpDesktop: ::LPSTR,
-    lpTitle: ::LPSTR,
-    dwX: ::DWORD,
-    dwY: ::DWORD,
-    dwXSize: ::DWORD,
-    dwYSize: ::DWORD,
-    dwXCountChars: ::DWORD,
-    dwYCountChars: ::DWORD,
-    dwFillAttribute: ::DWORD,
-    dwFlags: ::DWORD,
-    wShowWindow: ::WORD,
-    cbReserved2: ::WORD,
-    lpReserved2: ::LPBYTE,
-    hStdInput: ::HANDLE,
-    hStdOutput: ::HANDLE,
-    hStdError: ::HANDLE,
-}}
-pub type LPSTARTUPINFOA = *mut STARTUPINFOA;
-STRUCT!{struct STARTUPINFOW {
-    cb: ::DWORD,
-    lpReserved: ::LPWSTR,
-    lpDesktop: ::LPWSTR,
-    lpTitle: ::LPWSTR,
-    dwX: ::DWORD,
-    dwY: ::DWORD,
-    dwXSize: ::DWORD,
-    dwYSize: ::DWORD,
-    dwXCountChars: ::DWORD,
-    dwYCountChars: ::DWORD,
-    dwFillAttribute: ::DWORD,
-    dwFlags: ::DWORD,
-    wShowWindow: ::WORD,
-    cbReserved2: ::WORD,
-    lpReserved2: ::LPBYTE,
-    hStdInput: ::HANDLE,
-    hStdOutput: ::HANDLE,
-    hStdError: ::HANDLE,
-}}
-pub type LPSTARTUPINFOW = *mut STARTUPINFOW;
-STRUCT!{struct PROC_THREAD_ATTRIBUTE_LIST {
-    dummy: *mut ::c_void,
-}}
-pub type PPROC_THREAD_ATTRIBUTE_LIST = *mut PROC_THREAD_ATTRIBUTE_LIST;
-pub type LPPROC_THREAD_ATTRIBUTE_LIST = *mut PROC_THREAD_ATTRIBUTE_LIST;
-ENUM!{enum THREAD_INFORMATION_CLASS {
-    ThreadMemoryPriority,
-    ThreadAbsoluteCpuPriority,
-    ThreadInformationClassMax,
-}}
diff --git a/vendor/winapi-0.2.8/src/propidl.rs b/vendor/winapi-0.2.8/src/propidl.rs
deleted file mode 100644
index 802bd182f7..0000000000
--- a/vendor/winapi-0.2.8/src/propidl.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-STRUCT!{struct PROPVARIANT {
-    vt: VARTYPE,
-    wReserved1: WORD,
-    wReserved2: WORD,
-    wReserved3: WORD,
-    data: [u8; 16],
-}}
diff --git a/vendor/winapi-0.2.8/src/propsys.rs b/vendor/winapi-0.2.8/src/propsys.rs
deleted file mode 100644
index 0666fbd48f..0000000000
--- a/vendor/winapi-0.2.8/src/propsys.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type IPropertyDescriptionList = ::IUnknown; // TODO
-pub type IPropertyStore = ::IUnknown; // TODO
diff --git a/vendor/winapi-0.2.8/src/prsht.rs b/vendor/winapi-0.2.8/src/prsht.rs
deleted file mode 100644
index e1795a1bc7..0000000000
--- a/vendor/winapi-0.2.8/src/prsht.rs
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Interface for the Windows Property Sheet Pages
-pub enum PSP {}
-pub type HPROPSHEETPAGE = *mut PSP;
-pub type LPFNPSPCALLBACKA = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, uMsg: ::UINT, ppsp: *mut PROPSHEETPAGEA,
-) -> ::UINT>;
-pub type LPFNPSPCALLBACKW = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, uMsg: ::UINT, ppsp: *mut PROPSHEETPAGEW,
-) -> ::UINT>;
-pub const PSP_DEFAULT: ::DWORD = 0x00000000;
-pub const PSP_DLGINDIRECT: ::DWORD = 0x00000001;
-pub const PSP_USEHICON: ::DWORD = 0x00000002;
-pub const PSP_USEICONID: ::DWORD = 0x00000004;
-pub const PSP_USETITLE: ::DWORD = 0x00000008;
-pub const PSP_RTLREADING: ::DWORD = 0x00000010;
-pub const PSP_HASHELP: ::DWORD = 0x00000020;
-pub const PSP_USEREFPARENT: ::DWORD = 0x00000040;
-pub const PSP_USECALLBACK: ::DWORD = 0x00000080;
-pub const PSP_PREMATURE: ::DWORD = 0x00000400;
-pub const PSP_HIDEHEADER: ::DWORD = 0x00000800;
-pub const PSP_USEHEADERTITLE: ::DWORD = 0x00001000;
-pub const PSP_USEHEADERSUBTITLE: ::DWORD = 0x00002000;
-pub const PSP_USEFUSIONCONTEXT: ::DWORD = 0x00004000;
-pub const PSPCB_ADDREF: ::UINT = 0;
-pub const PSPCB_RELEASE: ::UINT = 1;
-pub const PSPCB_CREATE: ::UINT = 2;
-pub type PROPSHEETPAGE_RESOURCE = ::LPCDLGTEMPLATEA;
-STRUCT!{nodebug struct PROPSHEETPAGEA_V4 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hInstance: ::HINSTANCE,
-    pszTemplate: ::LPCSTR,
-    hIcon: ::HICON,
-    pszTitle: ::LPCSTR,
-    pfnDlgProc: ::DLGPROC,
-    lParam: ::LPARAM,
-    pfnCallback: LPFNPSPCALLBACKA,
-    pcRefParent: *mut ::UINT,
-    pszHeaderTitle: ::LPCSTR,
-    pszHeaderSubTitle: ::LPCSTR,
-    hActCtx: ::HANDLE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETPAGEA_V4, pszTemplate, pResource, pResource_mut, PROPSHEETPAGE_RESOURCE);
-UNION!(PROPSHEETPAGEA_V4, hIcon, pszIcon, pszIcon_mut, ::LPCSTR);
-UNION!(PROPSHEETPAGEA_V4, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCSTR);
-pub type LPPROPSHEETPAGEA_V4 = *mut PROPSHEETPAGEA_V4;
-pub type LPCPROPSHEETPAGEA_V4 = *const PROPSHEETPAGEA_V4;
-STRUCT!{nodebug struct PROPSHEETPAGEW_V4 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hInstance: ::HINSTANCE,
-    pszTemplate: ::LPCWSTR,
-    hIcon: ::HICON,
-    pszTitle: ::LPCWSTR,
-    pfnDlgProc: ::DLGPROC,
-    lParam: ::LPARAM,
-    pfnCallback: LPFNPSPCALLBACKW,
-    pcRefParent: *mut ::UINT,
-    pszHeaderTitle: ::LPCWSTR,
-    pszHeaderSubTitle: ::LPCWSTR,
-    hActCtx: ::HANDLE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETPAGEW_V4, pszTemplate, pResource, pResource_mut, PROPSHEETPAGE_RESOURCE);
-UNION!(PROPSHEETPAGEW_V4, hIcon, pszIcon, pszIcon_mut, ::LPCWSTR);
-UNION!(PROPSHEETPAGEW_V4, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCWSTR);
-pub type LPPROPSHEETPAGEW_V4 = *mut PROPSHEETPAGEW_V4;
-pub type LPCPROPSHEETPAGEW_V4 = *const PROPSHEETPAGEW_V4;
-pub type PROPSHEETPAGEA_LATEST = PROPSHEETPAGEA_V4;
-pub type PROPSHEETPAGEW_LATEST = PROPSHEETPAGEW_V4;
-pub type LPPROPSHEETPAGEA_LATEST = LPPROPSHEETPAGEA_V4;
-pub type LPPROPSHEETPAGEW_LATEST = LPPROPSHEETPAGEW_V4;
-pub type LPCPROPSHEETPAGEA_LATEST = LPCPROPSHEETPAGEA_V4;
-pub type LPCPROPSHEETPAGEW_LATEST = LPCPROPSHEETPAGEW_V4;
-pub type PROPSHEETPAGEA = PROPSHEETPAGEA_V4;
-pub type PROPSHEETPAGEW = PROPSHEETPAGEW_V4;
-pub type LPPROPSHEETPAGEA = LPPROPSHEETPAGEA_V4;
-pub type LPPROPSHEETPAGEW = LPPROPSHEETPAGEW_V4;
-pub type LPCPROPSHEETPAGEA = LPCPROPSHEETPAGEA_V4;
-pub type LPCPROPSHEETPAGEW = LPCPROPSHEETPAGEW_V4;
-pub const PSH_DEFAULT: ::DWORD = 0x00000000;
-pub const PSH_PROPTITLE: ::DWORD = 0x00000001;
-pub const PSH_USEHICON: ::DWORD = 0x00000002;
-pub const PSH_USEICONID: ::DWORD = 0x00000004;
-pub const PSH_PROPSHEETPAGE: ::DWORD = 0x00000008;
-pub const PSH_WIZARDHASFINISH: ::DWORD = 0x00000010;
-pub const PSH_WIZARD: ::DWORD = 0x00000020;
-pub const PSH_USEPSTARTPAGE: ::DWORD = 0x00000040;
-pub const PSH_NOAPPLYNOW: ::DWORD = 0x00000080;
-pub const PSH_USECALLBACK: ::DWORD = 0x00000100;
-pub const PSH_HASHELP: ::DWORD = 0x00000200;
-pub const PSH_MODELESS: ::DWORD = 0x00000400;
-pub const PSH_RTLREADING: ::DWORD = 0x00000800;
-pub const PSH_WIZARDCONTEXTHELP: ::DWORD = 0x00001000;
-pub const PSH_WIZARD97: ::DWORD = 0x01000000;
-pub const PSH_WATERMARK: ::DWORD = 0x00008000;
-pub const PSH_USEHBMWATERMARK: ::DWORD = 0x00010000;
-pub const PSH_USEHPLWATERMARK: ::DWORD = 0x00020000;
-pub const PSH_STRETCHWATERMARK: ::DWORD = 0x00040000;
-pub const PSH_HEADER: ::DWORD = 0x00080000;
-pub const PSH_USEHBMHEADER: ::DWORD = 0x00100000;
-pub const PSH_USEPAGELANG: ::DWORD = 0x00200000;
-pub const PSH_WIZARD_LITE: ::DWORD = 0x00400000;
-pub const PSH_NOCONTEXTHELP: ::DWORD = 0x02000000;
-pub const PSH_AEROWIZARD: ::DWORD = 0x00004000;
-pub const PSH_RESIZABLE: ::DWORD = 0x04000000;
-pub const PSH_HEADERBITMAP: ::DWORD = 0x08000000;
-pub const PSH_NOMARGIN: ::DWORD = 0x10000000;
-pub type PFNPROPSHEETCALLBACK = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::LPARAM,
-) -> ::c_int>;
-STRUCT!{nodebug struct PROPSHEETHEADERA_V2 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hwndParent: ::HWND,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    pszCaption: ::LPCSTR,
-    nPages: ::UINT,
-    pStartPage: ::LPCSTR,
-    ppsp: LPCPROPSHEETPAGEA,
-    pfnCallback: PFNPROPSHEETCALLBACK,
-    hbmWatermark: ::HBITMAP,
-    hplWatermark: ::HPALETTE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETHEADERA_V2, hIcon, pszIcon, pszIcon_mut, ::LPCSTR);
-UNION!(PROPSHEETHEADERA_V2, pStartPage, nStartPage, nStartPage_mut, ::UINT);
-UNION!(PROPSHEETHEADERA_V2, ppsp, phpage, phpage_mut, *mut HPROPSHEETPAGE);
-UNION!(PROPSHEETHEADERA_V2, hbmWatermark, pszbmWatermark, pszbmWatermark_mut, ::LPCSTR);
-UNION!(PROPSHEETHEADERA_V2, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCSTR);
-pub type LPPROPSHEETHEADERA_V2 = *mut PROPSHEETHEADERA_V2;
-pub type LPCPROPSHEETHEADERA_V2 = *const PROPSHEETHEADERA_V2;
-STRUCT!{nodebug struct PROPSHEETHEADERW_V2 {
-    dwSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hwndParent: ::HWND,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    pszCaption: ::LPCWSTR,
-    nPages: ::UINT,
-    pStartPage: ::LPCWSTR,
-    ppsp: LPCPROPSHEETPAGEW,
-    pfnCallback: PFNPROPSHEETCALLBACK,
-    hbmWatermark: ::HBITMAP,
-    hplWatermark: ::HPALETTE,
-    hbmHeader: ::HBITMAP,
-}}
-UNION!(PROPSHEETHEADERW_V2, hIcon, pszIcon, pszIcon_mut, ::LPCWSTR);
-UNION!(PROPSHEETHEADERW_V2, pStartPage, nStartPage, nStartPage_mut, ::UINT);
-UNION!(PROPSHEETHEADERW_V2, ppsp, phpage, phpage_mut, *mut HPROPSHEETPAGE);
-UNION!(PROPSHEETHEADERW_V2, hbmWatermark, pszbmWatermark, pszbmWatermark_mut, ::LPCWSTR);
-UNION!(PROPSHEETHEADERW_V2, hbmHeader, pszbmHeader, pszbmHeader_mut, ::LPCWSTR);
-pub type LPPROPSHEETHEADERW_V2 = *mut PROPSHEETHEADERW_V2;
-pub type LPCPROPSHEETHEADERW_V2 = *const PROPSHEETHEADERW_V2;
-pub type PROPSHEETHEADERA = PROPSHEETHEADERA_V2;
-pub type PROPSHEETHEADERW = PROPSHEETHEADERW_V2;
-pub type LPPROPSHEETHEADERA = LPPROPSHEETHEADERA_V2;
-pub type LPPROPSHEETHEADERW = LPPROPSHEETHEADERW_V2;
-pub type LPCPROPSHEETHEADERA = LPCPROPSHEETHEADERA_V2;
-pub type LPCPROPSHEETHEADERW = LPCPROPSHEETHEADERW_V2;
-pub const PSCB_INITIALIZED: ::UINT = 1;
-pub const PSCB_PRECREATE: ::UINT = 2;
-pub const PSCB_BUTTONPRESSED: ::UINT = 3;
-pub type LPFNADDPROPSHEETPAGE = Option<unsafe extern "system" fn(
-    HPROPSHEETPAGE, ::LPARAM,
-) -> ::BOOL>;
-pub type LPFNADDPROPSHEETPAGES = Option<unsafe extern "system" fn(
-    ::LPVOID, LPFNADDPROPSHEETPAGE, ::LPARAM,
-) -> ::BOOL>;
-STRUCT!{struct PSHNOTIFY {
-    hdr: ::NMHDR,
-    lParam: ::LPARAM,
-}}
-pub type LPPSHNOTIFY = *mut PSHNOTIFY;
-pub const PSN_FIRST: ::UINT = -200i32 as ::UINT;
-pub const PSN_LAST: ::UINT = -299i32 as ::UINT;
-pub const PSN_SETACTIVE: ::UINT = PSN_FIRST - 0;
-pub const PSN_KILLACTIVE: ::UINT = PSN_FIRST - 1;
-pub const PSN_APPLY: ::UINT = PSN_FIRST - 2;
-pub const PSN_RESET: ::UINT = PSN_FIRST - 3;
-pub const PSN_HELP: ::UINT = PSN_FIRST - 5;
-pub const PSN_WIZBACK: ::UINT = PSN_FIRST - 6;
-pub const PSN_WIZNEXT: ::UINT = PSN_FIRST - 7;
-pub const PSN_WIZFINISH: ::UINT = PSN_FIRST - 8;
-pub const PSN_QUERYCANCEL: ::UINT = PSN_FIRST - 9;
-pub const PSN_GETOBJECT: ::UINT = PSN_FIRST - 10;
-pub const PSN_TRANSLATEACCELERATOR: ::UINT = PSN_FIRST - 12;
-pub const PSN_QUERYINITIALFOCUS: ::UINT = PSN_FIRST - 13;
-pub const PSNRET_NOERROR: ::LRESULT = 0;
-pub const PSNRET_INVALID: ::LRESULT = 1;
-pub const PSNRET_INVALID_NOCHANGEPAGE: ::LRESULT = 2;
-pub const PSNRET_MESSAGEHANDLED: ::LRESULT = 3;
-pub const PSM_SETCURSEL: ::UINT = ::WM_USER + 101;
-pub const PSM_REMOVEPAGE: ::UINT = ::WM_USER + 102;
-pub const PSM_ADDPAGE: ::UINT = ::WM_USER + 103;
-pub const PSM_CHANGED: ::UINT = ::WM_USER + 104;
-pub const PSM_RESTARTWINDOWS: ::UINT = ::WM_USER + 105;
-pub const PSM_REBOOTSYSTEM: ::UINT = ::WM_USER + 106;
-pub const PSM_CANCELTOCLOSE: ::UINT = ::WM_USER + 107;
-pub const PSM_QUERYSIBLINGS: ::UINT = ::WM_USER + 108;
-pub const PSM_UNCHANGED: ::UINT = ::WM_USER + 109;
-pub const PSM_APPLY: ::UINT = ::WM_USER + 110;
-pub const PSM_SETTITLEA: ::UINT = ::WM_USER + 111;
-pub const PSM_SETTITLEW: ::UINT = ::WM_USER + 120;
-pub const PSM_SETWIZBUTTONS: ::UINT = ::WM_USER + 112;
-pub const PSWIZB_BACK: ::DWORD = 0x00000001;
-pub const PSWIZB_NEXT: ::DWORD = 0x00000002;
-pub const PSWIZB_FINISH: ::DWORD = 0x00000004;
-pub const PSWIZB_DISABLEDFINISH: ::DWORD = 0x00000008;
-pub const PSWIZB_CANCEL: ::DWORD = 0x00000008;
-pub const PSWIZBF_ELEVATIONREQUIRED: ::WPARAM = 0x00000001;
-pub const PSBTN_BACK: ::c_int = 0;
-pub const PSBTN_NEXT: ::c_int = 1;
-pub const PSBTN_FINISH: ::c_int = 2;
-pub const PSBTN_OK: ::c_int = 3;
-pub const PSBTN_APPLYNOW: ::c_int = 4;
-pub const PSBTN_CANCEL: ::c_int = 5;
-pub const PSBTN_HELP: ::c_int = 6;
-pub const PSBTN_MAX: ::c_int = 6;
-pub const PSM_PRESSBUTTON: ::UINT = ::WM_USER + 113;
-pub const PSM_SETCURSELID: ::UINT = ::WM_USER + 114;
-pub const PSM_SETFINISHTEXTA: ::UINT = ::WM_USER + 115;
-pub const PSM_SETFINISHTEXTW: ::UINT = ::WM_USER + 121;
-pub const PSM_GETTABCONTROL: ::UINT = ::WM_USER + 116;
-pub const PSM_ISDIALOGMESSAGE: ::UINT = ::WM_USER + 117;
-pub const PSM_GETCURRENTPAGEHWND: ::UINT = ::WM_USER + 118;
-pub const PSM_INSERTPAGE: ::UINT = ::WM_USER + 119;
-pub const PSM_SETHEADERTITLEA: ::UINT = ::WM_USER + 125;
-pub const PSM_SETHEADERTITLEW: ::UINT = ::WM_USER + 126;
-pub const PSWIZF_SETCOLOR: ::UINT = (0 - 1) as ::UINT;
-pub const PSM_SETHEADERSUBTITLEA: ::UINT = ::WM_USER + 127;
-pub const PSM_SETHEADERSUBTITLEW: ::UINT = ::WM_USER + 128;
-pub const PSM_HWNDTOINDEX: ::UINT = ::WM_USER + 129;
-pub const PSM_INDEXTOHWND: ::UINT = ::WM_USER + 130;
-pub const PSM_PAGETOINDEX: ::UINT = ::WM_USER + 131;
-pub const PSM_INDEXTOPAGE: ::UINT = ::WM_USER + 132;
-pub const PSM_IDTOINDEX: ::UINT = ::WM_USER + 133;
-pub const PSM_INDEXTOID: ::UINT = ::WM_USER + 134;
-pub const PSM_GETRESULT: ::UINT = ::WM_USER + 135;
-pub const PSM_RECALCPAGESIZES: ::UINT = ::WM_USER + 136;
-pub const PSM_SETNEXTTEXTW: ::UINT = ::WM_USER + 137;
-pub const PSM_SHOWWIZBUTTONS: ::UINT = ::WM_USER + 138;
-pub const PSM_ENABLEWIZBUTTONS: ::UINT = ::WM_USER + 139;
-pub const PSM_SETBUTTONTEXTW: ::UINT = ::WM_USER + 140;
-pub const PSM_SETBUTTONTEXT: ::UINT = PSM_SETBUTTONTEXTW;
-pub const ID_PSRESTARTWINDOWS: ::INT_PTR = 0x2;
-pub const ID_PSREBOOTSYSTEM: ::INT_PTR = ID_PSRESTARTWINDOWS | 0x1;
-pub const WIZ_CXDLG: ::DWORD = 276;
-pub const WIZ_CYDLG: ::DWORD = 140;
-pub const WIZ_CXBMP: ::DWORD = 80;
-pub const WIZ_BODYX: ::DWORD = 92;
-pub const WIZ_BODYCX: ::DWORD = 184;
-pub const PROP_SM_CXDLG: ::c_short = 212;
-pub const PROP_SM_CYDLG: ::c_short = 188;
-pub const PROP_MED_CXDLG: ::c_short = 227;
-pub const PROP_MED_CYDLG: ::c_short = 215;
-pub const PROP_LG_CXDLG: ::c_short = 252;
-pub const PROP_LG_CYDLG: ::c_short = 218;
diff --git a/vendor/winapi-0.2.8/src/psapi.rs b/vendor/winapi-0.2.8/src/psapi.rs
deleted file mode 100644
index 801d35c9e4..0000000000
--- a/vendor/winapi-0.2.8/src/psapi.rs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! API Prototypes and Definitions for PSAPI.DLL
-pub const LIST_MODULES_DEFAULT: ::DWORD = 0x0;
-pub const LIST_MODULES_32BIT: ::DWORD = 0x01;
-pub const LIST_MODULES_64BIT: ::DWORD = 0x02;
-pub const LIST_MODULES_ALL: ::DWORD = LIST_MODULES_32BIT | LIST_MODULES_64BIT;
-STRUCT!{struct MODULEINFO {
-    lpBaseOfDll: ::LPVOID,
-    SizeOfImage: ::DWORD,
-    EntryPoint: ::LPVOID,
-}}
-pub type LPMODULEINFO = *mut MODULEINFO;
-STRUCT!{struct PSAPI_WORKING_SET_BLOCK {
-    Flags: ::ULONG_PTR,
-    BitFields: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-BITFIELD!(PSAPI_WORKING_SET_BLOCK BitFields: ::ULONG_PTR [
-    Protection set_Protection[0..5],
-    ShareCount set_ShareCount[5..8],
-    Shared set_Shared[8..9],
-    Reserved set_Reserved[9..12],
-    VirtualPage set_VirtualPage[12..32],
-]);
-#[cfg(target_arch="x86_64")]
-BITFIELD!(PSAPI_WORKING_SET_BLOCK BitFields: ::ULONG_PTR [
-    Protection set_Protection[0..5],
-    ShareCount set_ShareCount[5..8],
-    Shared set_Shared[8..9],
-    Reserved set_Reserved[9..12],
-    VirtualPage set_VirtualPage[12..64],
-]);
-pub type PPSAPI_WORKING_SET_BLOCK = *mut PSAPI_WORKING_SET_BLOCK;
-STRUCT!{struct PSAPI_WORKING_SET_INFORMATION {
-    NumberOfEntries: ::ULONG_PTR,
-    WorkingSetInfo: [PSAPI_WORKING_SET_BLOCK; 1],
-}}
-pub type PPSAPI_WORKING_SET_INFORMATION = *mut PSAPI_WORKING_SET_INFORMATION;
-STRUCT!{struct PSAPI_WORKING_SET_EX_BLOCK_Invalid {
-    BitFields: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK_Invalid BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    Reserved0 set_Reserved0[1..15],
-    Shared set_Shared[15..16],
-    Reserved1 set_Reserved1[16..31],
-    Bad set_Bad[31..32],
-]);
-#[cfg(target_arch="x86_64")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK_Invalid BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    Reserved0 set_Reserved0[1..15],
-    Shared set_Shared[15..16],
-    Reserved1 set_Reserved1[16..31],
-    Bad set_Bad[31..32],
-    ReservedUlong set_ReservedUlong[32..64],
-]);
-STRUCT!{struct PSAPI_WORKING_SET_EX_BLOCK {
-    Flags: ::ULONG_PTR,
-    BitFields: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    ShareCount set_ShareCount[1..4],
-    Win32Protection set_Win32Protection[4..15],
-    Shared set_Shared[15..16],
-    Node set_Node[16..22],
-    Locked set_Locked[22..23],
-    LargePage set_LargePage[23..24],
-    Reserved set_Reserved[24..31],
-    Bad set_Bad[31..32],
-]);
-#[cfg(target_arch="x86_64")]
-BITFIELD!(PSAPI_WORKING_SET_EX_BLOCK BitFields: ::ULONG_PTR [
-    Valid set_Valid[0..1],
-    ShareCount set_ShareCount[1..4],
-    Win32Protection set_Win32Protection[4..15],
-    Shared set_Shared[15..16],
-    Node set_Node[16..22],
-    Locked set_Locked[22..23],
-    LargePage set_LargePage[23..24],
-    Reserved set_Reserved[24..31],
-    Bad set_Bad[31..32],
-    ReservedUlong set_ReservedUlong[32..64],
-]);
-UNION!(
-    PSAPI_WORKING_SET_EX_BLOCK, BitFields, Invalid, Invalid_mut, PSAPI_WORKING_SET_EX_BLOCK_Invalid
-);
-pub type PPSAPI_WORKING_SET_EX_BLOCK = *mut PSAPI_WORKING_SET_EX_BLOCK;
-STRUCT!{struct PSAPI_WORKING_SET_EX_INFORMATION {
-    VirtualAddress: ::PVOID,
-    VirtualAttributes: PSAPI_WORKING_SET_EX_BLOCK,
-}}
-pub type PPSAPI_WORKING_SET_EX_INFORMATION = *mut PSAPI_WORKING_SET_EX_INFORMATION;
-STRUCT!{struct PSAPI_WS_WATCH_INFORMATION {
-    FaultingPc: ::LPVOID,
-    FaultingVa: ::LPVOID,
-}}
-pub type PPSAPI_WS_WATCH_INFORMATION = *mut PSAPI_WS_WATCH_INFORMATION;
-STRUCT!{struct PSAPI_WS_WATCH_INFORMATION_EX {
-    BasicInfo: PSAPI_WS_WATCH_INFORMATION,
-    FaultingThreadId: ::ULONG_PTR,
-    Flags: ::ULONG_PTR,
-}}
-pub type PPSAPI_WS_WATCH_INFORMATION_EX = *mut PSAPI_WS_WATCH_INFORMATION_EX;
-STRUCT!{struct PROCESS_MEMORY_COUNTERS {
-    cb: ::DWORD,
-    PageFaultCount: ::DWORD,
-    PeakWorkingSetSize: ::SIZE_T,
-    WorkingSetSize: ::SIZE_T,
-    QuotaPeakPagedPoolUsage: ::SIZE_T,
-    QuotaPagedPoolUsage: ::SIZE_T,
-    QuotaPeakNonPagedPoolUsage: ::SIZE_T,
-    QuotaNonPagedPoolUsage: ::SIZE_T,
-    PagefileUsage: ::SIZE_T,
-    PeakPagefileUsage: ::SIZE_T,
-}}
-pub type PPROCESS_MEMORY_COUNTERS = *mut PROCESS_MEMORY_COUNTERS;
-STRUCT!{struct PROCESS_MEMORY_COUNTERS_EX {
-    cb: ::DWORD,
-    PageFaultCount: ::DWORD,
-    PeakWorkingSetSize: ::SIZE_T,
-    WorkingSetSize: ::SIZE_T,
-    QuotaPeakPagedPoolUsage: ::SIZE_T,
-    QuotaPagedPoolUsage: ::SIZE_T,
-    QuotaPeakNonPagedPoolUsage: ::SIZE_T,
-    QuotaNonPagedPoolUsage: ::SIZE_T,
-    PagefileUsage: ::SIZE_T,
-    PeakPagefileUsage: ::SIZE_T,
-    PrivateUsage: ::SIZE_T,
-}}
-pub type PPROCESS_MEMORY_COUNTERS_EX = *mut PROCESS_MEMORY_COUNTERS_EX;
-STRUCT!{struct PERFORMANCE_INFORMATION {
-    cb: ::DWORD,
-    CommitTotal: ::SIZE_T,
-    CommitLimit: ::SIZE_T,
-    CommitPeak: ::SIZE_T,
-    PhysicalTotal: ::SIZE_T,
-    PhysicalAvailable: ::SIZE_T,
-    SystemCache: ::SIZE_T,
-    KernelTotal: ::SIZE_T,
-    KernelPaged: ::SIZE_T,
-    KernelNonpaged: ::SIZE_T,
-    PageSize: ::SIZE_T,
-    HandleCount: ::DWORD,
-    ProcessCount: ::DWORD,
-    ThreadCount: ::DWORD,
-}}
-pub type PPERFORMANCE_INFORMATION = *mut PERFORMANCE_INFORMATION;
-STRUCT!{struct ENUM_PAGE_FILE_INFORMATION {
-    cb: ::DWORD,
-    Reserved: ::DWORD,
-    TotalSize: ::SIZE_T,
-    TotalInUse: ::SIZE_T,
-    PeakUsage: ::SIZE_T,
-}}
-pub type PENUM_PAGE_FILE_INFORMATION = *mut ENUM_PAGE_FILE_INFORMATION;
-pub type PENUM_PAGE_FILE_CALLBACKA = Option<unsafe extern "system" fn(
-    pContext: ::LPVOID, pPageFileInfo: PENUM_PAGE_FILE_INFORMATION, lpFilename: ::LPCSTR,
-) -> ::BOOL>;
-pub type PENUM_PAGE_FILE_CALLBACKW = Option<unsafe extern "system" fn(
-    pContext: ::LPVOID, pPageFileInfo: PENUM_PAGE_FILE_INFORMATION, lpFilename: ::LPCWSTR,
-) -> ::BOOL>;
diff --git a/vendor/winapi-0.2.8/src/qos.rs b/vendor/winapi-0.2.8/src/qos.rs
deleted file mode 100644
index 91026b392e..0000000000
--- a/vendor/winapi-0.2.8/src/qos.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! QoS definitions for NDIS components.
-pub type SERVICETYPE = ::ULONG;
-STRUCT!{struct FLOWSPEC {
-    TokenRate: ::ULONG,
-    TokenBucketSize: ::ULONG,
-    PeakBandwidth: ::ULONG,
-    Latency: ::ULONG,
-    DelayVariation: ::ULONG,
-    ServiceType: SERVICETYPE,
-    MaxSduSize: ::ULONG,
-    MinimumPolicedSize: ::ULONG,
-}}
-pub type PFLOWSPEC = *mut FLOWSPEC;
-pub type LPFLOWSPEC = *mut FLOWSPEC;
diff --git a/vendor/winapi-0.2.8/src/reason.rs b/vendor/winapi-0.2.8/src/reason.rs
deleted file mode 100644
index 66b3ed39d4..0000000000
--- a/vendor/winapi-0.2.8/src/reason.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-// Flags used by the various UIs
-pub const SHTDN_REASON_FLAG_COMMENT_REQUIRED: ::DWORD = 0x01000000;
-pub const SHTDN_REASON_FLAG_DIRTY_PROBLEM_ID_REQUIRED: ::DWORD = 0x02000000;
-pub const SHTDN_REASON_FLAG_CLEAN_UI: ::DWORD = 0x04000000;
-pub const SHTDN_REASON_FLAG_DIRTY_UI: ::DWORD = 0x08000000;
-// Flags that end up in the event log code.
-pub const SHTDN_REASON_FLAG_USER_DEFINED: ::DWORD = 0x40000000;
-pub const SHTDN_REASON_FLAG_PLANNED: ::DWORD = 0x80000000;
-// Microsoft major reasons.
-pub const SHTDN_REASON_MAJOR_OTHER: ::DWORD = 0x00000000;
-pub const SHTDN_REASON_MAJOR_NONE: ::DWORD = 0x00000000;
-pub const SHTDN_REASON_MAJOR_HARDWARE: ::DWORD = 0x00010000;
-pub const SHTDN_REASON_MAJOR_OPERATINGSYSTEM: ::DWORD = 0x00020000;
-pub const SHTDN_REASON_MAJOR_SOFTWARE: ::DWORD = 0x00030000;
-pub const SHTDN_REASON_MAJOR_APPLICATION: ::DWORD = 0x00040000;
-pub const SHTDN_REASON_MAJOR_SYSTEM: ::DWORD = 0x00050000;
-pub const SHTDN_REASON_MAJOR_POWER: ::DWORD = 0x00060000;
-pub const SHTDN_REASON_MAJOR_LEGACY_API: ::DWORD = 0x00070000;
-// Microsoft minor reasons.
-pub const SHTDN_REASON_MINOR_OTHER: ::DWORD = 0x00000000;
-pub const SHTDN_REASON_MINOR_NONE: ::DWORD = 0x000000ff;
-pub const SHTDN_REASON_MINOR_MAINTENANCE: ::DWORD = 0x00000001;
-pub const SHTDN_REASON_MINOR_INSTALLATION: ::DWORD = 0x00000002;
-pub const SHTDN_REASON_MINOR_UPGRADE: ::DWORD = 0x00000003;
-pub const SHTDN_REASON_MINOR_RECONFIG: ::DWORD = 0x00000004;
-pub const SHTDN_REASON_MINOR_HUNG: ::DWORD = 0x00000005;
-pub const SHTDN_REASON_MINOR_UNSTABLE: ::DWORD = 0x00000006;
-pub const SHTDN_REASON_MINOR_DISK: ::DWORD = 0x00000007;
-pub const SHTDN_REASON_MINOR_PROCESSOR: ::DWORD = 0x00000008;
-pub const SHTDN_REASON_MINOR_NETWORKCARD: ::DWORD = 0x00000009;
-pub const SHTDN_REASON_MINOR_POWER_SUPPLY: ::DWORD = 0x0000000a;
-pub const SHTDN_REASON_MINOR_CORDUNPLUGGED: ::DWORD = 0x0000000b;
-pub const SHTDN_REASON_MINOR_ENVIRONMENT: ::DWORD = 0x0000000c;
-pub const SHTDN_REASON_MINOR_HARDWARE_DRIVER: ::DWORD = 0x0000000d;
-pub const SHTDN_REASON_MINOR_OTHERDRIVER: ::DWORD = 0x0000000e;
-pub const SHTDN_REASON_MINOR_BLUESCREEN: ::DWORD = 0x0000000F;
-pub const SHTDN_REASON_MINOR_SERVICEPACK: ::DWORD = 0x00000010;
-pub const SHTDN_REASON_MINOR_HOTFIX: ::DWORD = 0x00000011;
-pub const SHTDN_REASON_MINOR_SECURITYFIX: ::DWORD = 0x00000012;
-pub const SHTDN_REASON_MINOR_SECURITY: ::DWORD = 0x00000013;
-pub const SHTDN_REASON_MINOR_NETWORK_CONNECTIVITY: ::DWORD = 0x00000014;
-pub const SHTDN_REASON_MINOR_WMI: ::DWORD = 0x00000015;
-pub const SHTDN_REASON_MINOR_SERVICEPACK_UNINSTALL: ::DWORD = 0x00000016;
-pub const SHTDN_REASON_MINOR_HOTFIX_UNINSTALL: ::DWORD = 0x00000017;
-pub const SHTDN_REASON_MINOR_SECURITYFIX_UNINSTALL: ::DWORD = 0x00000018;
-pub const SHTDN_REASON_MINOR_MMC: ::DWORD = 0x00000019;
-pub const SHTDN_REASON_MINOR_SYSTEMRESTORE: ::DWORD = 0x0000001a;
-pub const SHTDN_REASON_MINOR_TERMSRV: ::DWORD = 0x00000020;
-pub const SHTDN_REASON_MINOR_DC_PROMOTION: ::DWORD = 0x00000021;
-pub const SHTDN_REASON_MINOR_DC_DEMOTION: ::DWORD = 0x00000022;
-pub const SHTDN_REASON_UNKNOWN: ::DWORD = SHTDN_REASON_MINOR_NONE;
-pub const SHTDN_REASON_LEGACY_API: ::DWORD =
-    (SHTDN_REASON_MAJOR_LEGACY_API | SHTDN_REASON_FLAG_PLANNED);
-// This mask cuts out UI flags.
-pub const SHTDN_REASON_VALID_BIT_MASK: ::DWORD = 0xc0ffffff;
-// Convenience flags.
-pub const PCLEANUI: ::DWORD = (SHTDN_REASON_FLAG_PLANNED | SHTDN_REASON_FLAG_CLEAN_UI);
-pub const UCLEANUI: ::DWORD = (SHTDN_REASON_FLAG_CLEAN_UI);
-pub const PDIRTYUI: ::DWORD = (SHTDN_REASON_FLAG_PLANNED | SHTDN_REASON_FLAG_DIRTY_UI);
-pub const UDIRTYUI: ::DWORD = (SHTDN_REASON_FLAG_DIRTY_UI);
-//89
diff --git a/vendor/winapi-0.2.8/src/restrictederrorinfo.rs b/vendor/winapi-0.2.8/src/restrictederrorinfo.rs
deleted file mode 100644
index 94fbb77bb0..0000000000
--- a/vendor/winapi-0.2.8/src/restrictederrorinfo.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-RIDL!(
-interface IRestrictedErrorInfo(IRestrictedErrorInfoVtbl): IUnknown(IUnknownVtbl) {
-    fn GetErrorDetails(
-        &mut self, description: *mut ::BSTR, error: *mut ::HRESULT,
-        restrictedDescription: *mut ::BSTR, capabilitySid: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetReference(&mut self, reference: *mut ::BSTR) -> ::HRESULT
-}
-);
diff --git a/vendor/winapi-0.2.8/src/roapi.rs b/vendor/winapi-0.2.8/src/roapi.rs
deleted file mode 100644
index db8d5df027..0000000000
--- a/vendor/winapi-0.2.8/src/roapi.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-ENUM!{enum RO_INIT_TYPE {
-    RO_INIT_SINGLETHREADED = 0,
-    RO_INIT_MULTITHREADED = 1,
-}}
-
-pub enum RO_REGISTRATION_COOKIE__{}
-pub type RO_REGISTRATION_COOKIE = *mut RO_REGISTRATION_COOKIE__;
-
-pub type PFNGETACTIVATIONFACTORY = Option<unsafe extern "system" fn(
-    ::HSTRING, *mut *mut ::IActivationFactory,
-) -> ::HRESULT>;
-
-DECLARE_HANDLE!(APARTMENT_SHUTDOWN_REGISTRATION_COOKIE, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE__);
diff --git a/vendor/winapi-0.2.8/src/roerrorapi.rs b/vendor/winapi-0.2.8/src/roerrorapi.rs
deleted file mode 100644
index 9a0cbcc677..0000000000
--- a/vendor/winapi-0.2.8/src/roerrorapi.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-FLAGS!{enum RO_ERROR_REPORTING_FLAGS {
-    RO_ERROR_REPORTING_NONE = 0x00000000,
-    RO_ERROR_REPORTING_SUPPRESSEXCEPTIONS = 0x00000001,
-    RO_ERROR_REPORTING_FORCEEXCEPTIONS = 0x00000002,
-    RO_ERROR_REPORTING_USESETERRORINFO = 0x00000004,
-    RO_ERROR_REPORTING_SUPPRESSSETERRORINFO = 0x00000008,
-}}
-
-pub type PINSPECT_MEMORY_CALLBACK = Option<unsafe extern "system" fn(
-    *const ::VOID, ::UINT_PTR, ::UINT32, *mut ::BYTE,
-) -> ::HRESULT>;
diff --git a/vendor/winapi-0.2.8/src/rpc.rs b/vendor/winapi-0.2.8/src/rpc.rs
deleted file mode 100644
index 0b013d39e9..0000000000
--- a/vendor/winapi-0.2.8/src/rpc.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// Master include file for RPC applications.
-pub type I_RPC_HANDLE = *mut ::c_void;
-pub type RPC_STATUS = ::c_long;
diff --git a/vendor/winapi-0.2.8/src/rpcdce.rs b/vendor/winapi-0.2.8/src/rpcdce.rs
deleted file mode 100644
index 68d88c7a32..0000000000
--- a/vendor/winapi-0.2.8/src/rpcdce.rs
+++ /dev/null
@@ -1,535 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-// This module contains the DCE RPC runtime APIs.
-pub type RPC_CSTR = *mut ::c_uchar;
-pub type RPC_WSTR = *mut ::wchar_t;
-pub type RPC_CWSTR = *const ::wchar_t;
-pub type RPC_BINDING_HANDLE = ::I_RPC_HANDLE;
-pub type handle_t = RPC_BINDING_HANDLE;
-pub type rpc_binding_handle_t = RPC_BINDING_HANDLE;
-pub type UUID = ::GUID;
-pub type uuid_t = UUID;
-STRUCT!{struct RPC_BINDING_VECTOR {
-    Count: ::c_ulong,
-    BindingH: [RPC_BINDING_HANDLE; 1],
-}}
-pub type rpc_binding_vector_t = RPC_BINDING_VECTOR;
-STRUCT!{struct UUID_VECTOR {
-    Count: ::c_ulong,
-    Uuid: [*mut UUID; 1],
-}}
-pub type uuid_vector_t = UUID_VECTOR;
-pub type RPC_IF_HANDLE = *mut ::c_void;
-STRUCT!{struct RPC_IF_ID {
-    Uuid: UUID,
-    VersMajor: ::c_ushort,
-    VersMinor: ::c_ushort,
-}}
-pub const RPC_C_BINDING_INFINITE_TIMEOUT: ::DWORD = 10;
-pub const RPC_C_BINDING_MIN_TIMEOUT: ::DWORD = 0;
-pub const RPC_C_BINDING_DEFAULT_TIMEOUT: ::DWORD = 5;
-pub const RPC_C_BINDING_MAX_TIMEOUT: ::DWORD = 9;
-pub const RPC_C_CANCEL_INFINITE_TIMEOUT: ::c_int = -1;
-pub const RPC_C_LISTEN_MAX_CALLS_DEFAULT: ::DWORD = 1234;
-pub const RPC_C_PROTSEQ_MAX_REQS_DEFAULT: ::DWORD = 10;
-pub const RPC_C_BIND_TO_ALL_NICS: ::DWORD = 1;
-pub const RPC_C_USE_INTERNET_PORT: ::DWORD = 0x1;
-pub const RPC_C_USE_INTRANET_PORT: ::DWORD = 0x2;
-pub const RPC_C_DONT_FAIL: ::DWORD = 0x4;
-pub const RPC_C_RPCHTTP_USE_LOAD_BALANCE: ::DWORD = 0x8;
-pub const RPC_C_MQ_TEMPORARY: ::DWORD = 0x0000;
-pub const RPC_C_MQ_PERMANENT: ::DWORD = 0x0001;
-pub const RPC_C_MQ_CLEAR_ON_OPEN: ::DWORD = 0x0002;
-pub const RPC_C_MQ_USE_EXISTING_SECURITY: ::DWORD = 0x0004;
-pub const RPC_C_MQ_AUTHN_LEVEL_NONE: ::DWORD = 0x0000;
-pub const RPC_C_MQ_AUTHN_LEVEL_PKT_INTEGRITY: ::DWORD = 0x0008;
-pub const RPC_C_MQ_AUTHN_LEVEL_PKT_PRIVACY: ::DWORD = 0x0010;
-pub const RPC_C_OPT_MQ_DELIVERY: ::DWORD = 1;
-pub const RPC_C_OPT_MQ_PRIORITY: ::DWORD = 2;
-pub const RPC_C_OPT_MQ_JOURNAL: ::DWORD = 3;
-pub const RPC_C_OPT_MQ_ACKNOWLEDGE: ::DWORD = 4;
-pub const RPC_C_OPT_MQ_AUTHN_SERVICE: ::DWORD = 5;
-pub const RPC_C_OPT_MQ_AUTHN_LEVEL: ::DWORD = 6;
-pub const RPC_C_OPT_MQ_TIME_TO_REACH_QUEUE: ::DWORD = 7;
-pub const RPC_C_OPT_MQ_TIME_TO_BE_RECEIVED: ::DWORD = 8;
-pub const RPC_C_OPT_BINDING_NONCAUSAL: ::DWORD = 9;
-pub const RPC_C_OPT_SECURITY_CALLBACK: ::DWORD = 10;
-pub const RPC_C_OPT_UNIQUE_BINDING: ::DWORD = 11;
-pub const RPC_C_OPT_CALL_TIMEOUT: ::DWORD = 12;
-pub const RPC_C_OPT_DONT_LINGER: ::DWORD = 13;
-pub const RPC_C_OPT_TRUST_PEER: ::DWORD = 14;
-pub const RPC_C_OPT_ASYNC_BLOCK: ::DWORD = 15;
-pub const RPC_C_OPT_OPTIMIZE_TIME: ::DWORD = 16;
-pub const RPC_C_OPT_MAX_OPTIONS: ::DWORD = 17;
-pub const RPC_C_MQ_EXPRESS: ::DWORD = 0;
-pub const RPC_C_MQ_RECOVERABLE: ::DWORD = 1;
-pub const RPC_C_MQ_JOURNAL_NONE: ::DWORD = 0;
-pub const RPC_C_MQ_JOURNAL_DEADLETTER: ::DWORD = 1;
-pub const RPC_C_MQ_JOURNAL_ALWAYS: ::DWORD = 2;
-pub const RPC_C_FULL_CERT_CHAIN: ::DWORD = 0x0001;
-STRUCT!{struct RPC_PROTSEQ_VECTORA {
-    Count: ::c_uint,
-    Protseq: [*mut ::c_uchar; 1],
-}}
-STRUCT!{struct RPC_PROTSEQ_VECTORW {
-    Count: ::c_uint,
-    Protseq: [*mut ::c_ushort; 1],
-}}
-STRUCT!{struct RPC_POLICY {
-    Length: ::c_uint,
-    EndpointFlags: ::c_ulong,
-    NICFlags: ::c_ulong,
-}}
-pub type PRPC_POLICY = *mut RPC_POLICY;
-pub type RPC_OBJECT_INQ_FN = Option<unsafe extern "system" fn(
-    ObjectUuid: *mut UUID, TypeUuid: *mut UUID, Status: *mut ::RPC_STATUS,
-)>;
-pub type RPC_IF_CALLBACK_FN = Option<unsafe extern "system" fn(
-    InterfaceUuid: RPC_IF_HANDLE, Context: *mut ::c_void,
-) -> ::RPC_STATUS>;
-pub type RPC_SECURITY_CALLBACK_FN = Option<unsafe extern "system" fn(Context: *mut ::c_void)>;
-pub type RPC_MGR_EPV = ::c_void;
-STRUCT!{struct RPC_STATS_VECTOR {
-    Count: ::c_uint,
-    Stats: [::c_ulong; 1],
-}}
-pub const RPC_C_STATS_CALLS_IN: ::c_ulong = 0;
-pub const RPC_C_STATS_CALLS_OUT: ::c_ulong = 1;
-pub const RPC_C_STATS_PKTS_IN: ::c_ulong = 2;
-pub const RPC_C_STATS_PKTS_OUT: ::c_ulong = 3;
-STRUCT!{struct RPC_IF_ID_VECTOR {
-    Count: ::c_ulong,
-    IfId: [*mut RPC_IF_ID; 1],
-}}
-pub type RPC_AUTH_IDENTITY_HANDLE = *mut ::c_void;
-pub type RPC_AUTHZ_HANDLE = *mut ::c_void;
-pub const RPC_C_AUTHN_LEVEL_DEFAULT: ::DWORD = 0;
-pub const RPC_C_AUTHN_LEVEL_NONE: ::DWORD = 1;
-pub const RPC_C_AUTHN_LEVEL_CONNECT: ::DWORD = 2;
-pub const RPC_C_AUTHN_LEVEL_CALL: ::DWORD = 3;
-pub const RPC_C_AUTHN_LEVEL_PKT: ::DWORD = 4;
-pub const RPC_C_AUTHN_LEVEL_PKT_INTEGRITY: ::DWORD = 5;
-pub const RPC_C_AUTHN_LEVEL_PKT_PRIVACY: ::DWORD = 6;
-pub const RPC_C_IMP_LEVEL_DEFAULT: ::DWORD = 0;
-pub const RPC_C_IMP_LEVEL_ANONYMOUS: ::DWORD = 1;
-pub const RPC_C_IMP_LEVEL_IDENTIFY: ::DWORD = 2;
-pub const RPC_C_IMP_LEVEL_IMPERSONATE: ::DWORD = 3;
-pub const RPC_C_IMP_LEVEL_DELEGATE: ::DWORD = 4;
-pub const RPC_C_QOS_IDENTITY_STATIC: ::DWORD = 0;
-pub const RPC_C_QOS_IDENTITY_DYNAMIC: ::DWORD = 1;
-pub const RPC_C_QOS_CAPABILITIES_DEFAULT: ::DWORD = 0x0;
-pub const RPC_C_QOS_CAPABILITIES_MUTUAL_AUTH: ::DWORD = 0x1;
-pub const RPC_C_QOS_CAPABILITIES_MAKE_FULLSIC: ::DWORD = 0x2;
-pub const RPC_C_QOS_CAPABILITIES_ANY_AUTHORITY: ::DWORD = 0x4;
-pub const RPC_C_QOS_CAPABILITIES_IGNORE_DELEGATE_FAILURE: ::DWORD = 0x8;
-pub const RPC_C_QOS_CAPABILITIES_LOCAL_MA_HINT: ::DWORD = 0x10;
-pub const RPC_C_QOS_CAPABILITIES_SCHANNEL_FULL_AUTH_IDENTITY: ::DWORD = 0x20;
-pub const RPC_C_PROTECT_LEVEL_DEFAULT: ::DWORD = RPC_C_AUTHN_LEVEL_DEFAULT;
-pub const RPC_C_PROTECT_LEVEL_NONE: ::DWORD = RPC_C_AUTHN_LEVEL_NONE;
-pub const RPC_C_PROTECT_LEVEL_CONNECT: ::DWORD = RPC_C_AUTHN_LEVEL_CONNECT;
-pub const RPC_C_PROTECT_LEVEL_CALL: ::DWORD = RPC_C_AUTHN_LEVEL_CALL;
-pub const RPC_C_PROTECT_LEVEL_PKT: ::DWORD = RPC_C_AUTHN_LEVEL_PKT;
-pub const RPC_C_PROTECT_LEVEL_PKT_INTEGRITY: ::DWORD = RPC_C_AUTHN_LEVEL_PKT_INTEGRITY;
-pub const RPC_C_PROTECT_LEVEL_PKT_PRIVACY: ::DWORD = RPC_C_AUTHN_LEVEL_PKT_PRIVACY;
-pub const RPC_C_AUTHN_NONE: ::DWORD = 0;
-pub const RPC_C_AUTHN_DCE_PRIVATE: ::DWORD = 1;
-pub const RPC_C_AUTHN_DCE_PUBLIC: ::DWORD = 2;
-pub const RPC_C_AUTHN_DEC_PUBLIC: ::DWORD = 4;
-pub const RPC_C_AUTHN_GSS_NEGOTIATE: ::DWORD = 9;
-pub const RPC_C_AUTHN_WINNT: ::DWORD = 10;
-pub const RPC_C_AUTHN_GSS_SCHANNEL: ::DWORD = 14;
-pub const RPC_C_AUTHN_GSS_KERBEROS: ::DWORD = 16;
-pub const RPC_C_AUTHN_DPA: ::DWORD = 17;
-pub const RPC_C_AUTHN_MSN: ::DWORD = 18;
-pub const RPC_C_AUTHN_DIGEST: ::DWORD = 21;
-pub const RPC_C_AUTHN_KERNEL: ::DWORD = 20;
-pub const RPC_C_AUTHN_NEGO_EXTENDER: ::DWORD = 30;
-pub const RPC_C_AUTHN_PKU2U: ::DWORD = 31;
-pub const RPC_C_AUTHN_LIVE_SSP: ::DWORD = 32;
-pub const RPC_C_AUTHN_LIVEXP_SSP: ::DWORD = 35;
-pub const RPC_C_AUTHN_MSONLINE: ::DWORD = 82;
-pub const RPC_C_AUTHN_MQ: ::DWORD = 100;
-pub const RPC_C_AUTHN_DEFAULT: ::DWORD = 0xFFFFFFFF;
-pub const RPC_C_NO_CREDENTIALS: ::DWORD = 0xFFFFFFFF;
-pub const RPC_C_SECURITY_QOS_VERSION: ::DWORD = 1;
-pub const RPC_C_SECURITY_QOS_VERSION_1: ::DWORD = 1;
-STRUCT!{struct RPC_SECURITY_QOS {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-}}
-pub type PRPC_SECURITY_QOS = *mut RPC_SECURITY_QOS;
-STRUCT!{struct SEC_WINNT_AUTH_IDENTITY_W {
-    User: *mut ::c_ushort,
-    UserLength: ::c_ulong,
-    Domain: *mut ::c_ushort,
-    DomainLength: ::c_ulong,
-    Password: *mut ::c_ushort,
-    PasswordLength: ::c_ulong,
-    Flags: ::c_ulong,
-}}
-pub type PSEC_WINNT_AUTH_IDENTITY_W = *mut SEC_WINNT_AUTH_IDENTITY_W;
-STRUCT!{struct SEC_WINNT_AUTH_IDENTITY_A {
-    User: *mut ::c_uchar,
-    UserLength: ::c_ulong,
-    Domain: *mut ::c_uchar,
-    DomainLength: ::c_ulong,
-    Password: *mut ::c_uchar,
-    PasswordLength: ::c_ulong,
-    Flags: ::c_ulong,
-}}
-pub type PSEC_WINNT_AUTH_IDENTITY_A = *mut SEC_WINNT_AUTH_IDENTITY_A;
-pub const RPC_C_AUTHN_INFO_TYPE_HTTP: ::c_ulong = 1;
-pub const RPC_C_HTTP_AUTHN_TARGET_SERVER: ::c_ulong = 1;
-pub const RPC_C_HTTP_AUTHN_TARGET_PROXY: ::c_ulong = 2;
-pub const RPC_C_HTTP_AUTHN_SCHEME_BASIC: ::c_ulong = 0x00000001;
-pub const RPC_C_HTTP_AUTHN_SCHEME_NTLM: ::c_ulong = 0x00000002;
-pub const RPC_C_HTTP_AUTHN_SCHEME_PASSPORT: ::c_ulong = 0x00000004;
-pub const RPC_C_HTTP_AUTHN_SCHEME_DIGEST: ::c_ulong = 0x00000008;
-pub const RPC_C_HTTP_AUTHN_SCHEME_NEGOTIATE: ::c_ulong = 0x00000010;
-pub const RPC_C_HTTP_AUTHN_SCHEME_CERT: ::c_ulong = 0x00010000;
-pub const RPC_C_HTTP_FLAG_USE_SSL: ::c_ulong = 1;
-pub const RPC_C_HTTP_FLAG_USE_FIRST_AUTH_SCHEME: ::c_ulong = 2;
-pub const RPC_C_HTTP_FLAG_IGNORE_CERT_CN_INVALID: ::c_ulong = 8;
-pub const RPC_C_HTTP_FLAG_ENABLE_CERT_REVOCATION_CHECK: ::c_ulong = 16;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_W {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_ushort,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_W = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_A {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_uchar,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_A = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_ushort,
-    ProxyCredentials: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_W = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V2_W;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A {
-    TransportCredentials: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_uchar,
-    ProxyCredentials: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V2_A = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V2_A;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W {
-    TransportCredentials: RPC_AUTH_IDENTITY_HANDLE,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_ushort,
-    ProxyCredentials: *mut RPC_AUTH_IDENTITY_HANDLE,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_W = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V3_W;
-STRUCT!{struct RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A {
-    TransportCredentials: RPC_AUTH_IDENTITY_HANDLE,
-    Flags: ::c_ulong,
-    AuthenticationTarget: ::c_ulong,
-    NumberOfAuthnSchemes: ::c_ulong,
-    AuthnSchemes: *mut ::c_ulong,
-    ServerCertificateSubject: *mut ::c_uchar,
-    ProxyCredentials: *mut RPC_AUTH_IDENTITY_HANDLE,
-    NumberOfProxyAuthnSchemes: ::c_ulong,
-    ProxyAuthnSchemes: *mut ::c_ulong,
-}}
-pub type PRPC_HTTP_TRANSPORT_CREDENTIALS_V3_A = *mut RPC_HTTP_TRANSPORT_CREDENTIALS_V3_A;
-STRUCT!{struct RPC_SECURITY_QOS_V2_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V2_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V2_W_union,
-}}
-pub type PRPC_SECURITY_QOS_V2_W = *mut RPC_SECURITY_QOS_V2_W;
-STRUCT!{struct RPC_SECURITY_QOS_V2_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V2_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V2_A_union,
-}}
-pub type PRPC_SECURITY_QOS_V2_A = *mut RPC_SECURITY_QOS_V2_A;
-STRUCT!{struct RPC_SECURITY_QOS_V3_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V3_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V3_W_union,
-    Sid: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V3_W = *mut RPC_SECURITY_QOS_V3_W;
-STRUCT!{struct RPC_SECURITY_QOS_V3_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V3_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V3_A_union,
-    Sid: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V3_A = *mut RPC_SECURITY_QOS_V3_A;
-STRUCT!{struct RPC_SECURITY_QOS_V4_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V4_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V4_W_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-}}
-pub type PRPC_SECURITY_QOS_V4_W = *mut RPC_SECURITY_QOS_V4_W;
-STRUCT!{struct RPC_SECURITY_QOS_V4_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V4_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V4_A_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-}}
-pub type PRPC_SECURITY_QOS_V4_A = *mut RPC_SECURITY_QOS_V4_A;
-STRUCT!{struct RPC_SECURITY_QOS_V5_W_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_W,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V5_W {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V5_W_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-    ServerSecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V5_W = *mut RPC_SECURITY_QOS_V5_W;
-STRUCT!{struct RPC_SECURITY_QOS_V5_A_union {
-    HttpCredentials: *mut RPC_HTTP_TRANSPORT_CREDENTIALS_A,
-}}
-STRUCT!{struct RPC_SECURITY_QOS_V5_A {
-    Version: ::c_ulong,
-    Capabilities: ::c_ulong,
-    IdentityTracking: ::c_ulong,
-    ImpersonationType: ::c_ulong,
-    AdditionalSecurityInfoType: ::c_ulong,
-    u: RPC_SECURITY_QOS_V5_A_union,
-    Sid: *mut ::c_void,
-    EffectiveOnly: ::c_uint,
-    ServerSecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_SECURITY_QOS_V5_A = *mut RPC_SECURITY_QOS_V5_A;
-pub const RPC_PROTSEQ_TCP: ::c_ulong = 0x1;
-pub const RPC_PROTSEQ_NMP: ::c_ulong = 0x2;
-pub const RPC_PROTSEQ_LRPC: ::c_ulong = 0x3;
-pub const RPC_PROTSEQ_HTTP: ::c_ulong = 0x4;
-pub const RPC_BHT_OBJECT_UUID_VALID: ::c_ulong = 0x1;
-pub const RPC_BHO_NONCAUSAL: ::c_ulong = 0x1;
-pub const RPC_BHO_DONTLINGER: ::c_ulong = 0x2;
-pub const RPC_BHO_EXCLUSIVE_AND_GUARANTEED: ::c_ulong = 0x4;
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_W_union {
-    Reserved: *mut ::c_ushort,
-}}
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_W {
-    Version: ::c_ulong,
-    Flags: ::c_ulong,
-    ProtocolSequence: ::c_ulong,
-    NetworkAddress: *mut ::c_ushort,
-    StringEndpoint: *mut ::c_ushort,
-    u1: RPC_BINDING_HANDLE_TEMPLATE_V1_W_union,
-    ObjectUuid: UUID,
-}}
-pub type PRPC_BINDING_HANDLE_TEMPLATE_V1_W = *mut RPC_BINDING_HANDLE_TEMPLATE_V1_W;
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_A_union {
-    Reserved: *mut ::c_uchar,
-}}
-STRUCT!{struct RPC_BINDING_HANDLE_TEMPLATE_V1_A {
-    Version: ::c_ulong,
-    Flags: ::c_ulong,
-    ProtocolSequence: ::c_ulong,
-    NetworkAddress: *mut ::c_uchar,
-    StringEndpoint: *mut ::c_uchar,
-    u1: RPC_BINDING_HANDLE_TEMPLATE_V1_A_union,
-    ObjectUuid: UUID,
-}}
-pub type PRPC_BINDING_HANDLE_TEMPLATE_V1_A = *mut RPC_BINDING_HANDLE_TEMPLATE_V1_A;
-STRUCT!{struct RPC_BINDING_HANDLE_SECURITY_V1_W {
-    Version: ::c_ulong,
-    ServerPrincName: *mut ::c_ushort,
-    AuthnLevel: ::c_ulong,
-    AuthnSvc: ::c_ulong,
-    AuthIdentity: *mut SEC_WINNT_AUTH_IDENTITY_W,
-    SecurityQos: *mut RPC_SECURITY_QOS,
-}}
-pub type PRPC_BINDING_HANDLE_SECURITY_V1_W = *mut RPC_BINDING_HANDLE_SECURITY_V1_W;
-STRUCT!{struct RPC_BINDING_HANDLE_SECURITY_V1_A {
-    Version: ::c_ulong,
-    ServerPrincName: *mut ::c_uchar,
-    AuthnLevel: ::c_ulong,
-    AuthnSvc: ::c_ulong,
-    AuthIdentity: *mut SEC_WINNT_AUTH_IDENTITY_A,
-    SecurityQos: *mut RPC_SECURITY_QOS,
-}}
-pub type PRPC_BINDING_HANDLE_SECURITY_V1_A = *mut RPC_BINDING_HANDLE_SECURITY_V1_A;
-STRUCT!{struct RPC_BINDING_HANDLE_OPTIONS_V1 {
-    Version: ::c_ulong,
-    Flags: ::c_ulong,
-    ComTimeout: ::c_ulong,
-    CallTimeout: ::c_ulong,
-}}
-pub type PRPC_BINDING_HANDLE_OPTIONS_V1 = *mut RPC_BINDING_HANDLE_OPTIONS_V1;
-ENUM!{enum RPC_HTTP_REDIRECTOR_STAGE {
-    RPCHTTP_RS_REDIRECT = 1,
-    RPCHTTP_RS_ACCESS_1,
-    RPCHTTP_RS_SESSION,
-    RPCHTTP_RS_ACCESS_2,
-    RPCHTTP_RS_INTERFACE,
-}}
-pub type RPC_NEW_HTTP_PROXY_CHANNEL = Option<unsafe extern "system" fn(
-    RedirectorStage: RPC_HTTP_REDIRECTOR_STAGE, ServerName: RPC_WSTR, ServerPort: RPC_WSTR,
-    RemoteUser: RPC_WSTR, AuthType: RPC_WSTR, ResourceUuid: *mut ::c_void,
-    SessionId: *mut ::c_void, Interface: *mut ::c_void, Reserved: *mut ::c_void, Flags: ::c_ulong,
-    NewServerName: *mut RPC_WSTR, NewServerPort: *mut RPC_WSTR,
-) -> ::RPC_STATUS>;
-pub type RPC_HTTP_PROXY_FREE_STRING = Option<unsafe extern "system" fn(String: RPC_WSTR)>;
-pub const RPC_C_AUTHZ_NONE: ::DWORD = 0;
-pub const RPC_C_AUTHZ_NAME: ::DWORD = 1;
-pub const RPC_C_AUTHZ_DCE: ::DWORD = 2;
-pub const RPC_C_AUTHZ_DEFAULT: ::DWORD = 0xffffffff;
-pub type RPC_AUTH_KEY_RETRIEVAL_FN = Option<unsafe extern "system" fn(
-    Arg: *mut ::c_void, ServerPrincName: RPC_WSTR, KeyVer: ::c_ulong, Key: *mut *mut ::c_void,
-    Status: *mut ::RPC_STATUS,
-)>;
-STRUCT!{struct RPC_CLIENT_INFORMATION1 {
-    UserName: *mut ::c_uchar,
-    ComputerName: *mut ::c_uchar,
-    Privilege: ::c_ushort,
-    AuthFlags: ::c_ulong,
-}}
-pub type PRPC_CLIENT_INFORMATION1 = *mut RPC_CLIENT_INFORMATION1;
-pub type RPC_EP_INQ_HANDLE = *mut ::I_RPC_HANDLE;
-pub const  RPC_C_EP_ALL_ELTS: ::c_ulong = 0;
-pub const  RPC_C_EP_MATCH_BY_IF: ::c_ulong = 1;
-pub const  RPC_C_EP_MATCH_BY_OBJ: ::c_ulong = 2;
-pub const  RPC_C_EP_MATCH_BY_BOTH: ::c_ulong = 3;
-pub const  RPC_C_VERS_ALL: ::c_ulong = 1;
-pub const  RPC_C_VERS_COMPATIBLE: ::c_ulong = 2;
-pub const  RPC_C_VERS_EXACT: ::c_ulong = 3;
-pub const  RPC_C_VERS_MAJOR_ONLY: ::c_ulong = 4;
-pub const  RPC_C_VERS_UPTO: ::c_ulong = 5;
-pub type RPC_MGMT_AUTHORIZATION_FN = Option<unsafe extern "system" fn(
-    ClientBinding: RPC_BINDING_HANDLE, RequestedMgmtOperation: ::c_ulong,
-    Status: *mut ::RPC_STATUS,
-) -> ::c_int>;
-pub const RPC_C_MGMT_INQ_IF_IDS: ::c_ulong = 0;
-pub const RPC_C_MGMT_INQ_PRINC_NAME: ::c_ulong = 1;
-pub const RPC_C_MGMT_INQ_STATS: ::c_ulong = 2;
-pub const RPC_C_MGMT_IS_SERVER_LISTEN: ::c_ulong = 3;
-pub const RPC_C_MGMT_STOP_SERVER_LISTEN: ::c_ulong = 4;
-pub const RPC_IF_AUTOLISTEN: ::c_uint = 0x0001;
-pub const RPC_IF_OLE: ::c_uint = 0x0002;
-pub const RPC_IF_ALLOW_UNKNOWN_AUTHORITY: ::c_uint = 0x0004;
-pub const RPC_IF_ALLOW_SECURE_ONLY: ::c_uint = 0x0008;
-pub const RPC_IF_ALLOW_CALLBACKS_WITH_NO_AUTH: ::c_uint = 0x0010;
-pub const RPC_IF_ALLOW_LOCAL_ONLY: ::c_uint = 0x0020;
-pub const RPC_IF_SEC_NO_CACHE: ::c_uint = 0x0040;
-pub const RPC_IF_SEC_CACHE_PER_PROC: ::c_uint = 0x0080;
-pub const RPC_IF_ASYNC_CALLBACK: ::c_uint = 0x0100;
-pub const RPC_FW_IF_FLAG_DCOM: ::c_uint = 0x0001;
-pub type RPC_INTERFACE_GROUP = *mut ::c_void;
-pub type PRPC_INTERFACE_GROUP = *mut *mut ::c_void;
-STRUCT!{struct RPC_ENDPOINT_TEMPLATEW {
-    Version: ::c_ulong,
-    ProtSeq: RPC_WSTR,
-    Endpoint: RPC_WSTR,
-    SecurityDescriptor: *mut ::c_void,
-    Backlog: ::c_ulong,
-}}
-pub type PRPC_ENDPOINT_TEMPLATEW = *mut RPC_ENDPOINT_TEMPLATEW;
-STRUCT!{struct RPC_ENDPOINT_TEMPLATEA {
-    Version: ::c_ulong,
-    ProtSeq: RPC_CSTR,
-    Endpoint: RPC_CSTR,
-    SecurityDescriptor: *mut ::c_void,
-    Backlog: ::c_ulong,
-}}
-pub type PRPC_ENDPOINT_TEMPLATEA = *mut RPC_ENDPOINT_TEMPLATEA;
-STRUCT!{struct RPC_INTERFACE_TEMPLATEA {
-    Version: ::c_ulong,
-    IfSpec: RPC_IF_HANDLE,
-    MgrTypeUuid: *mut UUID,
-    MgrEpv: *mut RPC_MGR_EPV,
-    Flags: ::c_uint,
-    MaxCalls: ::c_uint,
-    MaxRpcSize: ::c_uint,
-    IfCallback: *mut RPC_IF_CALLBACK_FN,
-    UuidVector: *mut UUID_VECTOR,
-    Annotation: RPC_CSTR,
-    SecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_INTERFACE_TEMPLATEA = *mut RPC_INTERFACE_TEMPLATEA;
-STRUCT!{struct RPC_INTERFACE_TEMPLATEW {
-    Version: ::c_ulong,
-    IfSpec: RPC_IF_HANDLE,
-    MgrTypeUuid: *mut UUID,
-    MgrEpv: *mut RPC_MGR_EPV,
-    Flags: ::c_uint,
-    MaxCalls: ::c_uint,
-    MaxRpcSize: ::c_uint,
-    IfCallback: *mut RPC_IF_CALLBACK_FN,
-    UuidVector: *mut UUID_VECTOR,
-    Annotation: RPC_WSTR,
-    SecurityDescriptor: *mut ::c_void,
-}}
-pub type PRPC_INTERFACE_TEMPLATEW = *mut RPC_INTERFACE_TEMPLATEW;
-pub type RPC_INTERFACE_GROUP_IDLE_CALLBACK_FN = Option<unsafe extern "system" fn(
-    IfGroup: RPC_INTERFACE_GROUP, IdleCallbackContext: *mut ::c_void, IsGroupIdle: ::c_ulong,
-)>;
diff --git a/vendor/winapi-0.2.8/src/sapi.rs b/vendor/winapi-0.2.8/src/sapi.rs
deleted file mode 100644
index ac6ca11e7c..0000000000
--- a/vendor/winapi-0.2.8/src/sapi.rs
+++ /dev/null
@@ -1,2431 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of sapi.h
-ENUM!{enum SPDATAKEYLOCATION {
-    SPDKL_DefaultLocation = 0,
-    SPDKL_CurrentUser = 1,
-    SPDKL_LocalMachine = 2,
-    SPDKL_CurrentConfig = 5,
-}}
-pub const SPDUI_EngineProperties: &'static str = "EngineProperties";
-pub const SPDUI_AddRemoveWord: &'static str = "AddRemoveWord";
-pub const SPDUI_UserTraining: &'static str = "UserTraining";
-pub const SPDUI_MicTraining: &'static str = "MicTraining";
-pub const SPDUI_RecoProfileProperties: &'static str = "RecoProfileProperties";
-pub const SPDUI_AudioProperties: &'static str = "AudioProperties";
-pub const SPDUI_AudioVolume: &'static str = "AudioVolume";
-pub const SPDUI_UserEnrollment: &'static str = "UserEnrollment";
-pub const SPDUI_ShareData: &'static str = "ShareData";
-pub const SPDUI_Tutorial: &'static str = "Tutorial";
-ENUM!{enum SPSTREAMFORMAT {
-     SPSF_Default = -1i32 as u32,
-     SPSF_NoAssignedFormat = 0,
-     SPSF_Text = 1,
-     SPSF_NonStandardFormat = 2,
-     SPSF_ExtendedAudioFormat = 3,
-     SPSF_8kHz8BitMono = 4,
-     SPSF_8kHz8BitStereo = 5,
-     SPSF_8kHz16BitMono = 6,
-     SPSF_8kHz16BitStereo = 7,
-     SPSF_11kHz8BitMono = 8,
-     SPSF_11kHz8BitStereo = 9,
-     SPSF_11kHz16BitMono = 10,
-     SPSF_11kHz16BitStereo = 11,
-     SPSF_12kHz8BitMono = 12,
-     SPSF_12kHz8BitStereo = 13,
-     SPSF_12kHz16BitMono = 14,
-     SPSF_12kHz16BitStereo = 15,
-     SPSF_16kHz8BitMono = 16,
-     SPSF_16kHz8BitStereo = 17,
-     SPSF_16kHz16BitMono = 18,
-     SPSF_16kHz16BitStereo = 19,
-     SPSF_22kHz8BitMono = 20,
-     SPSF_22kHz8BitStereo = 21,
-     SPSF_22kHz16BitMono = 22,
-     SPSF_22kHz16BitStereo = 23,
-     SPSF_24kHz8BitMono = 24,
-     SPSF_24kHz8BitStereo = 25,
-     SPSF_24kHz16BitMono = 26,
-     SPSF_24kHz16BitStereo = 27,
-     SPSF_32kHz8BitMono = 28,
-     SPSF_32kHz8BitStereo = 29,
-     SPSF_32kHz16BitMono = 30,
-     SPSF_32kHz16BitStereo = 31,
-     SPSF_44kHz8BitMono = 32,
-     SPSF_44kHz8BitStereo = 33,
-     SPSF_44kHz16BitMono = 34,
-     SPSF_44kHz16BitStereo = 35,
-     SPSF_48kHz8BitMono = 36,
-     SPSF_48kHz8BitStereo = 37,
-     SPSF_48kHz16BitMono = 38,
-     SPSF_48kHz16BitStereo = 39,
-     SPSF_TrueSpeech_8kHz1BitMono = 40,
-     SPSF_CCITT_ALaw_8kHzMono = 41,
-     SPSF_CCITT_ALaw_8kHzStereo = 42,
-     SPSF_CCITT_ALaw_11kHzMono = 43,
-     SPSF_CCITT_ALaw_11kHzStereo = 44,
-     SPSF_CCITT_ALaw_22kHzMono = 45,
-     SPSF_CCITT_ALaw_22kHzStereo = 46,
-     SPSF_CCITT_ALaw_44kHzMono = 47,
-     SPSF_CCITT_ALaw_44kHzStereo = 48,
-     SPSF_CCITT_uLaw_8kHzMono = 49,
-     SPSF_CCITT_uLaw_8kHzStereo = 50,
-     SPSF_CCITT_uLaw_11kHzMono = 51,
-     SPSF_CCITT_uLaw_11kHzStereo = 52,
-     SPSF_CCITT_uLaw_22kHzMono = 53,
-     SPSF_CCITT_uLaw_22kHzStereo = 54,
-     SPSF_CCITT_uLaw_44kHzMono = 55,
-     SPSF_CCITT_uLaw_44kHzStereo = 56,
-     SPSF_ADPCM_8kHzMono = 57,
-     SPSF_ADPCM_8kHzStereo = 58,
-     SPSF_ADPCM_11kHzMono = 59,
-     SPSF_ADPCM_11kHzStereo = 60,
-     SPSF_ADPCM_22kHzMono = 61,
-     SPSF_ADPCM_22kHzStereo = 62,
-     SPSF_ADPCM_44kHzMono = 63,
-     SPSF_ADPCM_44kHzStereo = 64,
-     SPSF_GSM610_8kHzMono = 65,
-     SPSF_GSM610_11kHzMono = 66,
-     SPSF_GSM610_22kHzMono = 67,
-     SPSF_GSM610_44kHzMono = 68,
-     SPSF_NUM_FORMATS = 69,
-}}
-pub const SPREG_USER_ROOT: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech";
-pub const SPREG_LOCAL_MACHINE_ROOT: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech";
-pub const SPCAT_AUDIOOUT: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioOutput";
-pub const SPCAT_AUDIOIN: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioInput";
-pub const SPCAT_VOICES: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Voices";
-pub const SPCAT_RECOGNIZERS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\Recognizers";
-pub const SPCAT_APPLEXICONS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AppLexicons";
-pub const SPCAT_PHONECONVERTERS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\PhoneConverters";
-pub const SPCAT_TEXTNORMALIZERS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\TextNormalizers";
-pub const SPCAT_RECOPROFILES: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech\\RecoProfiles";
-pub const SPMMSYS_AUDIO_IN_TOKEN_ID: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioInput\\TokenEnums\\MMAudioIn\\";
-pub const SPMMSYS_AUDIO_OUT_TOKEN_ID: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\AudioOutput\\TokenEnums\\MMAudioOut\\";
-pub const SPCURRENT_USER_LEXICON_TOKEN_ID: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech\\CurrentUserLexicon";
-pub const SPCURRENT_USER_SHORTCUT_TOKEN_ID: &'static str = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Speech\\CurrentUserShortcut";
-pub const SPTOKENVALUE_CLSID: &'static str = "CLSID";
-pub const SPTOKENKEY_FILES: &'static str = "Files";
-pub const SPTOKENKEY_UI: &'static str = "UI";
-pub const SPTOKENKEY_ATTRIBUTES: &'static str = "Attributes";
-pub const SPTOKENKEY_RETAINEDAUDIO: &'static str = "SecondsPerRetainedAudioEvent";
-pub const SPTOKENKEY_AUDIO_LATENCY_WARNING: &'static str = "LatencyWarningThreshold";
-pub const SPTOKENKEY_AUDIO_LATENCY_TRUNCATE: &'static str = "LatencyTruncateThreshold";
-pub const SPTOKENKEY_AUDIO_LATENCY_UPDATE_INTERVAL: &'static str = "LatencyUpdateInterval";
-pub const SPVOICECATEGORY_TTSRATE: &'static str = "DefaultTTSRate";
-pub const SPPROP_RESOURCE_USAGE: &'static str = "ResourceUsage";
-pub const SPPROP_HIGH_CONFIDENCE_THRESHOLD: &'static str = "HighConfidenceThreshold";
-pub const SPPROP_NORMAL_CONFIDENCE_THRESHOLD: &'static str = "NormalConfidenceThreshold";
-pub const SPPROP_LOW_CONFIDENCE_THRESHOLD: &'static str = "LowConfidenceThreshold";
-pub const SPPROP_RESPONSE_SPEED: &'static str = "ResponseSpeed";
-pub const SPPROP_COMPLEX_RESPONSE_SPEED: &'static str = "ComplexResponseSpeed";
-pub const SPPROP_ADAPTATION_ON: &'static str = "AdaptationOn";
-pub const SPPROP_PERSISTED_BACKGROUND_ADAPTATION: &'static str = "PersistedBackgroundAdaptation";
-pub const SPPROP_PERSISTED_LANGUAGE_MODEL_ADAPTATION: &'static str = "PersistedLanguageModelAdaptation";
-pub const SPPROP_UX_IS_LISTENING: &'static str = "UXIsListening";
-pub const SPTOPIC_SPELLING: &'static str = "Spelling";
-pub const SPWILDCARD: &'static str = "...";
-pub const SPDICTATION: &'static str = "*";
-pub const SPINFDICTATION: &'static str = "*+";
-pub const SPREG_SAFE_USER_TOKENS: &'static str = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Speech\\UserTokens";
-pub const SP_LOW_CONFIDENCE: i32 = -1;
-pub const SP_NORMAL_CONFIDENCE: i32 = 0;
-pub const SP_HIGH_CONFIDENCE: i32 = 1;
-pub const DEFAULT_WEIGHT: i32 = 1;
-pub const SP_MAX_WORD_LENGTH: i32 = 128;
-pub const SP_MAX_PRON_LENGTH: i32 = 384;
-pub const SP_EMULATE_RESULT: i32 = 0x40000000;
-RIDL!(
-interface ISpNotifyCallback(ISpNotifyCallbackVtbl) {
-    fn NotifyCallback(&mut self, wParam: ::WPARAM, lParam: ::LPARAM) -> ::HRESULT
-}
-);
-pub type SPNOTIFYCALLBACK = unsafe extern "system" fn(wParam: ::WPARAM, lParam: ::LPARAM);
-RIDL!(
-interface ISpNotifySource(ISpNotifySourceVtbl): IUnknown(IUnknownVtbl) {
-    fn SetNotifySink(&mut self, pNotifySink: *mut ISpNotifySink) -> ::HRESULT,
-    fn SetNotifyWindowMessage(
-        &mut self, hWnd: ::HWND, Msg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetNotifyCallbackFunction(
-        &mut self, pfnCallback: SPNOTIFYCALLBACK, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetNotifyCallbackInterface(
-        &mut self, pSpCallback: *mut ISpNotifyCallback, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetNotifyWin32Event(&mut self) -> ::HRESULT,
-    fn WaitForNotifyEvent(&mut self, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn GetNotifyEventHandle(&mut self) -> ::HANDLE
-}
-);
-RIDL!(
-interface ISpNotifySink(ISpNotifySinkVtbl): IUnknown(IUnknownVtbl) {
-    fn Notify(&mut self) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpNotifyTranslator(ISpNotifyTranslatorVtbl): ISpNotifySink(ISpNotifySinkVtbl) {
-    fn InitWindowMessage(
-        &mut self, hWnd: ::HWND, Msg: ::UINT, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn InitCallback(
-        &mut self, pfnCallback: SPNOTIFYCALLBACK, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn InitSpNotifyCallback(
-        &mut self, pSpCallback: *mut ISpNotifyCallback, wParam: ::WPARAM, lParam: ::LPARAM
-    ) -> ::HRESULT,
-    fn InitWin32Event(&mut self, hEvent: ::HANDLE, fCloseHandleOnRelease: ::BOOL) -> ::HRESULT,
-    fn Wait(&mut self, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn GetEventHandle(&mut self) -> ::HANDLE
-}
-);
-RIDL!(
-interface ISpDataKey(ISpDataKeyVtbl): IUnknown(IUnknownVtbl) {
-    fn SetData(
-        &mut self, pszValueName: ::LPCWSTR, cbData: ::ULONG, pData: *const ::BYTE
-    ) -> ::HRESULT,
-    fn GetData(
-        &mut self, pszValueName: ::LPCWSTR, pcbData: *mut ::ULONG, pData: *mut ::BYTE
-    ) -> ::HRESULT,
-    fn SetStringValue(&mut self, pszValueName: ::LPCWSTR, pszValue: ::LPCWSTR) -> ::HRESULT,
-    fn GetStringValue(&mut self, pszValueName: ::LPCWSTR, ppszValue: *mut ::LPWSTR) -> ::HRESULT,
-    fn SetDWORD(&mut self, pszValueName: ::LPCWSTR, dwValue: ::DWORD) -> ::HRESULT,
-    fn GetDWORD(&mut self, pszValueName: ::LPCWSTR, pdwValue: *mut ::DWORD) -> ::HRESULT,
-    fn OpenKey(&mut self, pszSubKeyName: ::LPCWSTR, ppSubKey: *mut *mut ISpDataKey) -> ::HRESULT,
-    fn CreateKey(&mut self, pszSubKey: ::LPCWSTR, ppSubKey: *mut *mut ISpDataKey) -> ::HRESULT,
-    fn DeleteKey(&mut self, pszSubKey: ::LPCWSTR) -> ::HRESULT,
-    fn DeleteValue(&mut self, pszValueName: ::LPCWSTR) -> ::HRESULT,
-    fn EnumKeys(&mut self, Index: ::ULONG, ppszSubKeyName: *mut ::LPWSTR) -> ::HRESULT,
-    fn EnumValues(&mut self, Index: ::ULONG, ppszValueName: *mut ::LPWSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRegDataKey(ISpRegDataKeyVtbl): ISpDataKey(ISpDataKeyVtbl) {
-    fn SetKey(&mut self, hkey: ::HKEY, fReadOnly: ::BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectTokenCategory(ISpObjectTokenCategoryVtbl): ISpDataKey(ISpDataKeyVtbl) {
-    fn SetId(&mut self, pszCategoryId: ::LPCWSTR, fCreateIfNotExist: ::BOOL) -> ::HRESULT,
-    fn GetId(&mut self, ppszCoMemCategoryId: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetDataKey(
-        &mut self, spdkl: SPDATAKEYLOCATION, pppDataKey: *mut *mut ISpDataKey
-    ) -> ::HRESULT,
-    fn EnumTokens(
-        &mut self, pzsReqAttribs: ::LPCWSTR, pszOptAttribs: ::LPCWSTR,
-        ppEnum: *mut *mut IEnumSpObjectTokens
-    ) -> ::HRESULT,
-    fn SetDefaultTokenId(&mut self, pszTokenId: ::LPCWSTR) -> ::HRESULT,
-    fn GetDefaultTokenId(&mut self, ppszCoMemTokenId: *mut ::LPWSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectToken(ISpObjectTokenVtbl): ISpDataKey(ISpDataKeyVtbl) {
-    fn SetId(
-        &mut self, pszCategoryId: ::LPCWSTR, pszTokenId: ::LPCWSTR, fCreateIfNotExist: ::BOOL
-    ) -> ::HRESULT,
-    fn GetId(&mut self, ppszCoMemTokenId: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetCategory(&mut self, ppTokenCategory: *mut *mut ISpObjectTokenCategory) -> ::HRESULT,
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut ::IUnknown, dwClsContext: ::DWORD, riid: ::REFIID,
-        ppvObject: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetStorageFileName(
-        &mut self, clsidCaller: ::REFCLSID, pszValueName: ::LPCWSTR,
-        pszFileNameSpecifier: ::LPCWSTR, nFolder: ::ULONG, ppszFilePath: *mut ::LPWSTR
-    ) -> ::HRESULT,
-    fn RemoveStorageFileName(&mut self, pszKeyName: ::LPCWSTR, fDeleteFile: ::BOOL) -> ::HRESULT,
-    fn Remove(&mut self, pclsidCaller: *const ::CLSID) -> ::HRESULT,
-    fn IsUISupported(
-        &mut self, pszTypeOfUI: ::LPCWSTR, pvExtraData: *mut ::c_void, cbExtraData: ::ULONG,
-        punkObject: *mut ::IUnknown, pfSupported: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hwndParent: ::HWND, pszTitle: ::LPCWSTR, pszTypeOfUI: ::LPCWSTR,
-        pvExtraData: *mut ::c_void, cbExtraData: ::ULONG, punkObject: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn MatchesAttributes(&mut self, pszAttributes: ::LPCWSTR, pfMatches: *mut ::BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectTokenInit(ISpObjectTokenInitVtbl): ISpObjectToken(ISpObjectTokenVtbl) {
-    fn InitFromDataKey(
-        &mut self, pszCategoryId: ::LPCWSTR, pszTokenId: ::LPCWSTR, pDataKey: *mut ISpDataKey
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IEnumSpObjectTokens(IEnumSpObjectTokensVtbl): IUnknown(IUnknownVtbl) {
-    fn Next(
-        &mut self, celt: ::ULONG, pelt: *mut *mut ISpObjectToken, pceltFetched: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Skip(&mut self, celt: ::ULONG) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn Clone(&mut self, ppEnum: *mut *mut IEnumSpObjectTokens) -> ::HRESULT,
-    fn Item(&mut self, Index: ::ULONG, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn GetCount(&mut self, pCount: *mut ::ULONG) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpObjectWithToken(ISpObjectWithTokenVtbl): IUnknown(IUnknownVtbl) {
-    fn SetObjectToken(&mut self, pToken: *mut ISpObjectToken) -> ::HRESULT,
-    fn GetObjectToken(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpResourceManager(ISpResourceManagerVtbl): IServiceProvider(IServiceProviderVtbl) {
-    fn SetObject(&mut self, guidServiceId: ::REFGUID, pUnkObject: *mut ::IUnknown) -> ::HRESULT,
-    fn GetObject(
-        &mut self, guidServiceId: ::REFGUID, ObjectCLSID: ::REFCLSID, ObjectIID: ::REFIID,
-        fReleaseWhenLastExternalRefReleased: ::BOOL, ppObject: *mut *mut ::c_void
-    ) -> ::HRESULT
-}
-);
-ENUM!{enum SPEVENTLPARAMTYPE {
-    SPET_LPARAM_IS_UNDEFINED = 0,
-    SPET_LPARAM_IS_TOKEN,
-    SPET_LPARAM_IS_OBJECT,
-    SPET_LPARAM_IS_POINTER,
-    SPET_LPARAM_IS_STRING,
-}}
-ENUM!{enum SPEVENTENUM {
-    SPEI_UNDEFINED = 0,
-    SPEI_START_INPUT_STREAM = 1,
-    SPEI_END_INPUT_STREAM = 2,
-    SPEI_VOICE_CHANGE = 3,
-    SPEI_TTS_BOOKMARK = 4,
-    SPEI_WORD_BOUNDARY = 5,
-    SPEI_PHONEME = 6,
-    SPEI_SENTENCE_BOUNDARY = 7,
-    SPEI_VISEME = 8,
-    SPEI_TTS_AUDIO_LEVEL = 9,
-    SPEI_TTS_PRIVATE = 15,
-    SPEI_END_SR_STREAM = 34,
-    SPEI_SOUND_START = 35,
-    SPEI_SOUND_END = 36,
-    SPEI_PHRASE_START = 37,
-    SPEI_RECOGNITION = 38,
-    SPEI_HYPOTHESIS = 39,
-    SPEI_SR_BOOKMARK = 40,
-    SPEI_PROPERTY_NUM_CHANGE = 41,
-    SPEI_PROPERTY_STRING_CHANGE = 42,
-    SPEI_FALSE_RECOGNITION = 43,
-    SPEI_INTERFERENCE = 44,
-    SPEI_REQUEST_UI = 45,
-    SPEI_RECO_STATE_CHANGE = 46,
-    SPEI_ADAPTATION = 47,
-    SPEI_START_SR_STREAM = 48,
-    SPEI_RECO_OTHER_CONTEXT = 49,
-    SPEI_SR_AUDIO_LEVEL = 50,
-    SPEI_SR_RETAINEDAUDIO = 51,
-    SPEI_SR_PRIVATE = 52,
-    SPEI_ACTIVE_CATEGORY_CHANGED = 53,
-    SPEI_RESERVED5 = 54,
-    SPEI_RESERVED6 = 55,
-    SPEI_RESERVED1 = 30,
-    SPEI_RESERVED2 = 33,
-    SPEI_RESERVED3 = 63,
-}}
-pub const SPEI_MIN_TTS: SPEVENTENUM = SPEI_START_INPUT_STREAM;
-pub const SPEI_MAX_TTS: SPEVENTENUM = SPEI_TTS_PRIVATE;
-pub const SPEI_MIN_SR: SPEVENTENUM = SPEI_END_SR_STREAM;
-pub const SPEI_MAX_SR: SPEVENTENUM = SPEI_RESERVED6;
-pub const SPFEI_FLAGCHECK: u64 = (1 << SPEI_RESERVED1.0 as u64) | (1 << SPEI_RESERVED2.0 as u64);
-pub const SPFEI_ALL_TTS_EVENTS: u64 = 0x000000000000FFFE | SPFEI_FLAGCHECK;
-pub const SPFEI_ALL_SR_EVENTS: u64 = 0x003FFFFC00000000 | SPFEI_FLAGCHECK;
-pub const SPFEI_ALL_EVENTS: u64 = 0xEFFFFFFFFFFFFFFF;
-#[inline]
-pub fn SPFEI(SPEI_ord: u64) -> u64 {
-    (1 << SPEI_ord) | SPFEI_FLAGCHECK
-}
-STRUCT!{struct SPEVENT {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    wParam: ::WPARAM,
-    lParam: ::LPARAM,
-}}
-STRUCT!{struct SPSERIALIZEDEVENT {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    SerializedwParam: ::ULONG,
-    SerializedlParam: ::LONG,
-}}
-STRUCT!{struct SPSERIALIZEDEVENT64 {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    SerializedwParam: ::ULONGLONG,
-    SerializedlParam: ::LONGLONG,
-}}
-STRUCT!{struct SPEVENTEX {
-    eEventId: ::WORD,
-    elParamType: ::WORD,
-    ulStreamNum: ::ULONG,
-    ullAudioStreamOffset: ::ULONGLONG,
-    wParam: ::WPARAM,
-    lParam: ::LPARAM,
-    ullAudioTimeOffset: ::ULONGLONG,
-}}
-ENUM!{enum SPINTERFERENCE {
-    SPINTERFERENCE_NONE = 0,
-    SPINTERFERENCE_NOISE = 1,
-    SPINTERFERENCE_NOSIGNAL = 2,
-    SPINTERFERENCE_TOOLOUD = 3,
-    SPINTERFERENCE_TOOQUIET = 4,
-    SPINTERFERENCE_TOOFAST = 5,
-    SPINTERFERENCE_TOOSLOW = 6,
-    SPINTERFERENCE_LATENCY_WARNING = 7,
-    SPINTERFERENCE_LATENCY_TRUNCATE_BEGIN = 8,
-    SPINTERFERENCE_LATENCY_TRUNCATE_END = 9,
-}}
-FLAGS!{enum SPENDSRSTREAMFLAGS {
-    SPESF_NONE = 0,
-    SPESF_STREAM_RELEASED = 1 << 0,
-    SPESF_EMULATED = 1 << 1,
-}}
-FLAGS!{enum SPVFEATURE {
-    SPVFEATURE_STRESSED = 1 << 0,
-    SPVFEATURE_EMPHASIS = 1 << 1,
-}}
-ENUM!{enum SPVISEMES {
-    SP_VISEME_0 = 0,
-    SP_VISEME_1,
-    SP_VISEME_2,
-    SP_VISEME_3,
-    SP_VISEME_4,
-    SP_VISEME_5,
-    SP_VISEME_6,
-    SP_VISEME_7,
-    SP_VISEME_8,
-    SP_VISEME_9,
-    SP_VISEME_10,
-    SP_VISEME_11,
-    SP_VISEME_12,
-    SP_VISEME_13,
-    SP_VISEME_14,
-    SP_VISEME_15,
-    SP_VISEME_16,
-    SP_VISEME_17,
-    SP_VISEME_18,
-    SP_VISEME_19,
-    SP_VISEME_20,
-    SP_VISEME_21,
-}}
-STRUCT!{struct SPEVENTSOURCEINFO {
-    ullEventInterest: ::ULONGLONG,
-    ullQueuedInterest: ::ULONGLONG,
-    ulCount: ::ULONG,
-}}
-RIDL!(
-interface ISpEventSource(ISpEventSourceVtbl): ISpNotifySource(ISpNotifySourceVtbl) {
-    fn SetInterest(
-        &mut self, ullEventInterest: ::ULONGLONG, ullQueuedInterest: ::ULONGLONG
-    ) -> ::HRESULT,
-    fn GetEvents(
-        &mut self, ulCount: ::ULONG, pEventArray: *mut SPEVENT, pulFetched: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn GetInfo(&mut self, pInfo: *mut SPEVENTSOURCEINFO) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpEventSource2(ISpEventSource2Vtbl): ISpEventSource(ISpEventSourceVtbl) {
-    fn GetEventsEx(
-        &mut self, ulCount: ::ULONG, pEventArray: *mut SPEVENTEX, pulFetched: *mut ::ULONG
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpEventSink(ISpEventSinkVtbl): IUnknown(IUnknownVtbl) {
-    fn AddEvents(&mut self, pEventArray: *const SPEVENT, ulCount: ::ULONG) -> ::HRESULT,
-    fn GetEventInterest(&mut self, pullEventInterest: *mut ::ULONGLONG) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpStreamFormat(ISpStreamFormatVtbl): IStream(IStreamVtbl) {
-    fn GetFormat(
-        &mut self, pguidFormatId: *mut ::GUID, ppCoMemWaveFormatEx: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT
-}
-);
-ENUM!{enum SPFILEMODE {
-    SPFM_OPEN_READONLY = 0,
-    SPFM_OPEN_READWRITE = 1,
-    SPFM_CREATE = 2,
-    SPFM_CREATE_ALWAYS = 3,
-    SPFM_NUM_MODES = 4,
-}}
-RIDL!(
-interface ISpStream(ISpStreamVtbl): ISpStreamFormat(ISpStreamFormatVtbl) {
-    fn SetBaseStream(
-        &mut self, pStream: *mut ::IStream, rguidFormat: ::REFGUID,
-        pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetBaseStream(&mut self, ppStream: *mut *mut ::IStream) -> ::HRESULT,
-    fn BindToFile(
-        &mut self, pszFileName: ::LPCWSTR, eMode: SPFILEMODE, pFormatId: *const ::GUID,
-        pWaveFormatEx: *const ::WAVEFORMATEX, ullEventInterest: ::ULONGLONG
-    ) -> ::HRESULT,
-    fn Close(&mut self) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpStreamFormatConverter(ISpStreamFormatConverterVtbl)
-    : ISpStreamFormat(ISpStreamFormatVtbl) {
-    fn SetBaseStream(
-        &mut self, pStream: *mut ISpStreamFormat, fSetFormatToBaseStreamFormat: ::BOOL,
-        fWriteToBaseStream: ::BOOL
-    ) -> ::HRESULT,
-    fn GetBaseStream(&mut self, ppStream: *mut *mut ISpStreamFormat) -> ::HRESULT,
-    fn SetFormat(
-        &mut self, rguidFormatIdOfConvertedStream: ::REFGUID,
-        pWaveFormatExOfConvertedStream: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn ResetSeekPosition(&mut self) -> ::HRESULT,
-    fn ScaleConvertedToBaseOffset(
-        &mut self, ullOffsetConvertedStream: ::ULONGLONG, pullOffsetBaseStream: *mut ::ULONGLONG
-    ) -> ::HRESULT,
-    fn ScaleBaseToConvertedOffset(
-        &mut self, ullOffsetBaseStream: ::ULONGLONG, pullOffsetConvertedStream: *mut ::ULONGLONG
-    ) -> ::HRESULT
-}
-);
-ENUM!{enum SPAUDIOSTATE {
-    SPAS_CLOSED = 0,
-    SPAS_STOP = 1,
-    SPAS_PAUSE = 2,
-    SPAS_RUN = 3,
-}}
-STRUCT!{struct SPAUDIOSTATUS {
-    cbFreeBuffSpace: ::LONG,
-    cbNonBlockingIO: ::ULONG,
-    State: SPAUDIOSTATE,
-    CurSeekPos: ::ULONGLONG,
-    CurDevicePos: ::ULONGLONG,
-    dwAudioLevel: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-STRUCT!{struct SPAUDIOBUFFERINFO {
-    ulMsMinNotification: ::ULONG,
-    ulMsBufferSize: ::ULONG,
-    ulMsEventBias: ::ULONG,
-}}
-RIDL!(
-interface ISpAudio(ISpAudioVtbl): ISpStreamFormat(ISpStreamFormatVtbl) {
-    fn SetState(&mut self, NewState: SPAUDIOSTATE, ullReserved: ::ULONGLONG) -> ::HRESULT,
-    fn SetFormat(
-        &mut self, rguidFmtId: ::REFGUID, pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetStatus(&mut self, pStatus: *mut SPAUDIOSTATUS) -> ::HRESULT,
-    fn SetBufferInfo(&mut self, pBuffInfo: *const SPAUDIOBUFFERINFO) -> ::HRESULT,
-    fn GetBufferInfo(&mut self, pBuffInfo: *mut SPAUDIOBUFFERINFO) -> ::HRESULT,
-    fn GetDefaultFormat(
-        &mut self, pFormatId: *mut ::GUID, ppCoMemWaveFormatEx: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn EventHandle(&mut self) -> ::HANDLE,
-    fn GetVolumeLevel(&mut self, pLevel: *mut ::ULONG) -> ::HRESULT,
-    fn SetVolumeLevel(&mut self, Level: ::ULONG) -> ::HRESULT,
-    fn GetBufferNotifySize(&mut self, pcbSize: *mut ::ULONG) -> ::HRESULT,
-    fn SetBufferNotifySize(&mut self, cbSize: ::ULONG) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpMMSysAudio(ISpMMSysAudioVtbl): ISpAudio(ISpAudioVtbl) {
-    fn GetDeviceId(&mut self, puDeviceId: *mut ::UINT) -> ::HRESULT,
-    fn SetDeviceId(&mut self, uDeviceId: ::UINT) -> ::HRESULT,
-    fn GetMMHandle(&mut self, pHandle: *mut *mut ::c_void) -> ::HRESULT,
-    fn GetLineId(&mut self, puLineId: *mut ::UINT) -> ::HRESULT,
-    fn SetLineId(&mut self, uLineId: ::UINT) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpTranscript(ISpTranscriptVtbl): IUnknown(IUnknownVtbl) {
-    fn GetTranscript(&mut self, ppszTranscript: *mut ::LPWSTR) -> ::HRESULT,
-    fn AppendTranscript(&mut self, pszTranscript: ::LPCWSTR) -> ::HRESULT
-}
-);
-FLAGS!{enum SPDISPLYATTRIBUTES {
-    SPAF_ONE_TRAILING_SPACE = 0x2,
-    SPAF_TWO_TRAILING_SPACES = 0x4,
-    SPAF_CONSUME_LEADING_SPACES = 0x8,
-    SPAF_BUFFER_POSITION = 0x10,
-    SPAF_ALL = 0x1f,
-    SPAF_USER_SPECIFIED = 0x80,
-}}
-pub type SPPHONEID = ::WCHAR;
-pub type PSPPHONEID = ::LPWSTR;
-pub type PCSPPHONEID = ::LPCWSTR;
-STRUCT!{struct SPPHRASEELEMENT {
-    ulAudioTimeOffset: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    ulAudioStreamOffset: ::ULONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedStreamOffset: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    pszDisplayText: ::LPCWSTR,
-    pszLexicalForm: ::LPCWSTR,
-    pszPronunciation: *const SPPHONEID,
-    bDisplayAttributes: ::BYTE,
-    RequiredConfidence: ::c_char,
-    ActualConfidence: ::c_char,
-    Reserved: ::BYTE,
-    SREngineConfidence: ::c_float,
-}}
-STRUCT!{struct SPPHRASERULE {
-    pszName: ::LPCWSTR,
-    ulId: ::ULONG,
-    ulFirstElement: ::ULONG,
-    ulCountOfElements: ::ULONG,
-    pNextSibling: *const SPPHRASERULE,
-    pFirstChild: *const SPPHRASERULE,
-    SREngineConfidence: ::c_float,
-    Confidence: ::c_char,
-}}
-ENUM!{enum SPPHRASEPROPERTYUNIONTYPE {
-    SPPPUT_UNUSED = 0,
-    SPPPUT_ARRAY_INDEX,
-}}
-STRUCT!{struct SPPHRASEPROPERTY {
-    pszName: ::LPCWSTR,
-    bType: ::BYTE,
-    bReserved: ::BYTE,
-    usArrayIndex: u16,
-    pszValue: ::LPCWSTR,
-    vValue: ::VARIANT,
-    ulFirstElement: ::ULONG,
-    ulCountOfElements: ::ULONG,
-    pNextSibling: *const SPPHRASEPROPERTY,
-    pFirstChild: *const SPPHRASEPROPERTY,
-    SREngineConfidence: ::c_float,
-    Confidence: ::c_char,
-}}
-UNION!(SPPHRASEPROPERTY, bType, ulId, ulId_mut, ::ULONG);
-STRUCT!{struct SPPHRASEREPLACEMENT {
-    bDisplayAttributes: ::BYTE,
-    pszReplacementText: ::LPCWSTR,
-    ulFirstElement: ::ULONG,
-    ulCountOfElements: ::ULONG,
-}}
-STRUCT!{struct SPSEMANTICERRORINFO {
-    ulLineNumber: ::ULONG,
-    pszScriptLine: ::LPWSTR,
-    pszSource: ::LPWSTR,
-    pszDescription: ::LPWSTR,
-    hrResultCode: ::HRESULT,
-}}
-ENUM!{enum SPSEMANTICFORMAT {
-    SPSMF_SAPI_PROPERTIES = 0,
-    SPSMF_SRGS_SEMANTICINTERPRETATION_MS = 1,
-    SPSMF_SRGS_SAPIPROPERTIES = 2,
-    SPSMF_UPS = 4,
-    SPSMF_SRGS_SEMANTICINTERPRETATION_W3C = 8,
-}}
-STRUCT!{struct SPPHRASE_50 {
-    cbSize: ::ULONG,
-    LangID: ::WORD,
-    wHomophoneGroupId: ::WORD,
-    ullGrammarID: ::ULONGLONG,
-    ftStartTime: ::ULONGLONG,
-    ullAudioStreamPosition: ::ULONGLONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    Rule: ::SPPHRASERULE,
-    pProperties: *const ::SPPHRASEPROPERTY,
-    pElements: *const ::SPPHRASEELEMENT,
-    cReplacements: ::ULONG,
-    pReplacements: *const ::SPPHRASEREPLACEMENT,
-    SREngineID: ::GUID,
-    ulSREnginePrivateDataSize: ::ULONG,
-    pSREnginePrivateData: *const ::BYTE,
-}}
-STRUCT!{struct SPPHRASE_53 {
-    cbSize: ::ULONG,
-    LangID: ::WORD,
-    wHomophoneGroupId: ::WORD,
-    ullGrammarID: ::ULONGLONG,
-    ftStartTime: ::ULONGLONG,
-    ullAudioStreamPosition: ::ULONGLONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    Rule: ::SPPHRASERULE,
-    pProperties: *const ::SPPHRASEPROPERTY,
-    pElements: *const ::SPPHRASEELEMENT,
-    cReplacements: ::ULONG,
-    pReplacements: *const ::SPPHRASEREPLACEMENT,
-    SREngineID: ::GUID,
-    ulSREnginePrivateDataSize: ::ULONG,
-    pSREnginePrivateData: *const ::BYTE,
-    pSML: ::LPWSTR,
-    pSemanticErrorInfo: *mut SPSEMANTICERRORINFO,
-}}
-STRUCT!{struct SPPHRASE {
-    cbSize: ::ULONG,
-    LangID: ::WORD,
-    wHomophoneGroupId: ::WORD,
-    ullGrammarID: ::ULONGLONG,
-    ftStartTime: ::ULONGLONG,
-    ullAudioStreamPosition: ::ULONGLONG,
-    ulAudioSizeBytes: ::ULONG,
-    ulRetainedSizeBytes: ::ULONG,
-    ulAudioSizeTime: ::ULONG,
-    Rule: ::SPPHRASERULE,
-    pProperties: *const ::SPPHRASEPROPERTY,
-    pElements: *const ::SPPHRASEELEMENT,
-    cReplacements: ::ULONG,
-    pReplacements: *const ::SPPHRASEREPLACEMENT,
-    SREngineID: ::GUID,
-    ulSREnginePrivateDataSize: ::ULONG,
-    pSREnginePrivateData: *const ::BYTE,
-    pSML: ::LPWSTR,
-    pSemanticErrorInfo: *mut SPSEMANTICERRORINFO,
-    SemanticTagFormat: SPSEMANTICFORMAT,
-}}
-STRUCT!{struct SPSERIALIZEDPHRASE {
-    ulSerializedSize: ::ULONG,
-}}
-STRUCT!{struct SPRULE {
-    pszRuleName: ::LPCWSTR,
-    ulRuleId: ::ULONG,
-    dwAttributes: ::DWORD,
-}}
-FLAGS!{enum SPVALUETYPE {
-    SPDF_PROPERTY = 0x1,
-    SPDF_REPLACEMENT = 0x2,
-    SPDF_RULE = 0x4,
-    SPDF_DISPLAYTEXT = 0x8,
-    SPDF_LEXICALFORM = 0x10,
-    SPDF_PRONUNCIATION = 0x20,
-    SPDF_AUDIO = 0x40,
-    SPDF_ALTERNATES = 0x80,
-    SPDF_ALL = 0xff,
-}}
-STRUCT!{struct SPBINARYGRAMMAR {
-    ulTotalSerializedSize: ::ULONG,
-}}
-ENUM!{enum SPPHRASERNG {
-    SPPR_ALL_ELEMENTS = -1i32 as u32,
-}}
-pub const SP_GETWHOLEPHRASE: SPPHRASERNG = SPPR_ALL_ELEMENTS;
-pub const SPRR_ALL_ELEMENTS: SPPHRASERNG = SPPR_ALL_ELEMENTS;
-DECLARE_HANDLE!(SPSTATEHANDLE, SPSTATEHANDLE__);
-FLAGS!{enum SPRECOEVENTFLAGS {
-    SPREF_AutoPause = 1 << 0,
-    SPREF_Emulated = 1 << 1,
-    SPREF_SMLTimeout = 1 << 2,
-    SPREF_ExtendableParse = 1 << 3,
-    SPREF_ReSent = 1 << 4,
-    SPREF_Hypothesis = 1 << 5,
-    SPREF_FalseRecognition = 1 << 6,
-}}
-ENUM!{enum SPPARTOFSPEECH {
-    SPPS_NotOverriden = -1i32 as u32,
-    SPPS_Unknown = 0,
-    SPPS_Noun = 0x1000,
-    SPPS_Verb = 0x2000,
-    SPPS_Modifier = 0x3000,
-    SPPS_Function = 0x4000,
-    SPPS_Interjection = 0x5000,
-    SPPS_Noncontent = 0x6000,
-    SPPS_LMA = 0x7000,
-    SPPS_SuppressWord = 0xf000,
-}}
-FLAGS!{enum SPLEXICONTYPE {
-    eLEXTYPE_USER = 1 << 0,
-    eLEXTYPE_APP = 1 << 1,
-    eLEXTYPE_VENDORLEXICON = 1 << 2,
-    eLEXTYPE_LETTERTOSOUND = 1 << 3,
-    eLEXTYPE_MORPHOLOGY = 1 << 4,
-    eLEXTYPE_RESERVED4 = 1 << 5,
-    eLEXTYPE_USER_SHORTCUT = 1 << 6,
-    eLEXTYPE_RESERVED6 = 1 << 7,
-    eLEXTYPE_RESERVED7 = 1 << 8,
-    eLEXTYPE_RESERVED8 = 1 << 9,
-    eLEXTYPE_RESERVED9 = 1 << 10,
-    eLEXTYPE_RESERVED10 = 1 << 11,
-    eLEXTYPE_PRIVATE1 = 1 << 12,
-    eLEXTYPE_PRIVATE2 = 1 << 13,
-    eLEXTYPE_PRIVATE3 = 1 << 14,
-    eLEXTYPE_PRIVATE4 = 1 << 15,
-    eLEXTYPE_PRIVATE5 = 1 << 16,
-    eLEXTYPE_PRIVATE6 = 1 << 17,
-    eLEXTYPE_PRIVATE7 = 1 << 18,
-    eLEXTYPE_PRIVATE8 = 1 << 19,
-    eLEXTYPE_PRIVATE9 = 1 << 20,
-    eLEXTYPE_PRIVATE10 = 1 << 21,
-    eLEXTYPE_PRIVATE11 = 1 << 22,
-    eLEXTYPE_PRIVATE12 = 1 << 23,
-    eLEXTYPE_PRIVATE13 = 1 << 24,
-    eLEXTYPE_PRIVATE14 = 1 << 25,
-    eLEXTYPE_PRIVATE15 = 1 << 26,
-    eLEXTYPE_PRIVATE16 = 1 << 27,
-    eLEXTYPE_PRIVATE17 = 1 << 28,
-    eLEXTYPE_PRIVATE18 = 1 << 29,
-    eLEXTYPE_PRIVATE19 = 1 << 30,
-    eLEXTYPE_PRIVATE20 = 1 << 31,
-}}
-FLAGS!{enum SPWORDTYPE {
-    eWORDTYPE_ADDED = 1 << 0,
-    eWORDTYPE_DELETED = 1 << 1,
-}}
-FLAGS!{enum SPPRONUNCIATIONFLAGS {
-    ePRONFLAG_USED = 1 << 0,
-}}
-STRUCT!{struct SPWORDPRONUNCIATION {
-    pNextWordPronunciation: *mut SPWORDPRONUNCIATION,
-    eLexiconType: SPLEXICONTYPE,
-    LangID: ::WORD,
-    wPronunciationFlags: ::WORD,
-    ePartOfSpeech: SPPARTOFSPEECH,
-    szPronunciation: [SPPHONEID; 1],
-}}
-STRUCT!{struct SPWORDPRONUNCIATIONLIST {
-    ulSize: ::ULONG,
-    pvBuffer: *mut ::BYTE,
-    pFirstWordPronunciation: *mut SPWORDPRONUNCIATION,
-}}
-STRUCT!{struct SPWORD {
-    pNextWord: *mut SPWORD,
-    LangID: ::WORD,
-    wReserved: ::WORD,
-    eWordType: SPWORDTYPE,
-    pszWord: ::LPWSTR,
-    pFirstWordPronunciation: *mut SPWORDPRONUNCIATION,
-}}
-STRUCT!{struct SPWORDLIST {
-    ulSize: ::ULONG,
-    pvBuffer: *mut ::BYTE,
-    pFirstWord: *mut SPWORD,
-}}
-RIDL!(
-interface ISpLexicon(ISpLexiconVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPronunciations(
-        &mut self, pszWord: ::LPCWSTR, LangID: ::WORD, dwFlags: ::DWORD,
-        pWordPronunciationList: *mut SPWORDPRONUNCIATIONLIST
-    ) -> ::HRESULT,
-    fn AddPronunciation(
-        &mut self, pszWord: ::LPCWSTR, LangID: ::WORD, ePartOfSpeech: SPPARTOFSPEECH,
-        pszPronunciation: PCSPPHONEID
-    ) -> ::HRESULT,
-    fn RemovePronunciation(
-        &mut self, pszWord: ::LPCWSTR, LangID: ::WORD, ePartOfSpeech: SPPARTOFSPEECH,
-        pszPronunciation: PCSPPHONEID
-    ) -> ::HRESULT,
-    fn GetGeneration(&mut self, pdwGeneration: *mut ::DWORD) -> ::HRESULT,
-    fn GetGenerationChange(
-        &mut self, dwFlags: ::DWORD, pdwGeneration: *mut ::DWORD, pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT,
-    fn GetWords(
-        &mut self, dwFlags: ::DWORD, pdwGeneration: *mut ::DWORD, pdwCookie: *mut ::DWORD,
-        pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpContainerLexicon(ISpContainerLexiconVtbl): ISpLexicon(ISpLexiconVtbl) {
-    fn AddLexicon(&mut self, pAddLexicon: *mut ISpLexicon, dwFlags: ::DWORD) -> ::HRESULT
-}
-);
-ENUM!{enum SPSHORTCUTTYPE {
-    SPSHT_NotOverriden = -1i32 as u32,
-    SPSHT_Unknown = 0,
-    SPSHT_EMAIL = 0x1000,
-    SPSHT_OTHER = 0x2000,
-    SPPS_RESERVED1 = 0x3000,
-    SPPS_RESERVED2 = 0x4000,
-    SPPS_RESERVED3 = 0x5000,
-    SPPS_RESERVED4 = 0xf000,
-}}
-STRUCT!{struct SPSHORTCUTPAIR {
-    pNextSHORTCUTPAIR: *mut SPSHORTCUTPAIR,
-    LangID: ::WORD,
-    shType: SPSHORTCUTTYPE,
-    pszDisplay: ::LPWSTR,
-    pszSpoken: ::LPWSTR,
-}}
-STRUCT!{struct SPSHORTCUTPAIRLIST {
-    ulSize: ::ULONG,
-    pvBuffer: *mut ::BYTE,
-    pFirstShortcutPair: *mut SPSHORTCUTPAIR,
-}}
-RIDL!(
-interface ISpShortcut(ISpShortcutVtbl): IUnknown(IUnknownVtbl) {
-    fn AddShortcut(
-        &mut self, pszDisplay: ::LPCWSTR, LangID: ::WORD, pszSpoken: ::LPCWSTR,
-        shType: SPSHORTCUTTYPE
-    ) -> ::HRESULT,
-    fn RemoveShortcut(
-        &mut self, pszDisplay: ::LPCWSTR, LangID: ::WORD, pszSpoken: ::LPCWSTR,
-        shType: SPSHORTCUTTYPE
-    ) -> ::HRESULT,
-    fn GetShortcuts(
-        &mut self, LangId: ::WORD, pShortcutpairList: *mut SPSHORTCUTPAIRLIST
-    ) -> ::HRESULT,
-    fn GetGeneration(&mut self, pdwGeneration: *mut ::DWORD) -> ::HRESULT,
-    fn GetWordsFromGenerationChange(
-        &mut self, pdwGeneration: *mut ::DWORD, pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT,
-    fn GetWords(
-        &mut self, pdwGeneration: *mut ::DWORD, pdwCookie: *mut ::DWORD, pWordList: *mut SPWORDLIST
-    ) -> ::HRESULT,
-    fn GetShortcutsForGeneration(
-        &mut self, pdwGeneration: *mut ::DWORD, pdwCookie: *mut ::DWORD,
-        pShortcutpairList: *mut SPSHORTCUTPAIRLIST
-    ) -> ::HRESULT,
-    fn GetGenerationChange(
-        &mut self, pdwGeneration: *mut ::DWORD, pShortcutpairList: *mut SPSHORTCUTPAIRLIST
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhoneConverter(ISpPhoneConverterVtbl): ISpObjectWithToken(ISpObjectWithTokenVtbl) {
-    fn PhoneToId(&mut self, pszPhone: ::LPCWSTR, pId: *mut SPPHONEID) -> ::HRESULT,
-    fn IdToPhone(&mut self, pId: PCSPPHONEID, pszPhone: *mut ::WCHAR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhoneticAlphabetConverter(ISpPhoneticAlphabetConverterVtbl): IUnknown(IUnknownVtbl) {
-    fn GetLangId(&mut self, pLangID: *mut ::WORD) -> ::HRESULT,
-    fn SetLangId(&mut self, LangID: *mut ::WORD) -> ::HRESULT,
-    fn SAPI2UPS(
-        &mut self, pszSAPIId: *const SPPHONEID, pszUPSId: *mut SPPHONEID, cMaxLength: ::DWORD
-    ) -> ::HRESULT,
-    fn UPS2SAPI(
-        &mut self, pszUPSId: *const SPPHONEID, pszSAPIId: *mut SPPHONEID, cMaxLength: ::DWORD
-    ) -> ::HRESULT,
-    fn GetMaxConvertLength(
-        &mut self, cSrcLength: ::DWORD, bSAPI2UPS: ::BOOL, pcMaxDestLength: *mut ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhoneticAlphabetSelection(ISpPhoneticAlphabetSelectionVtbl): IUnknown(IUnknownVtbl) {
-    fn IsAlphabetUPS(&mut self, pfIsUPS: *mut ::BOOL) -> ::HRESULT,
-    fn SetAlphabetToUPS(&mut self, fForceUPS: ::BOOL) -> ::HRESULT
-}
-);
-STRUCT!{struct SPVPITCH {
-    MiddleAdj: ::c_long,
-    RangeAdj: ::c_long,
-}}
-ENUM!{enum SPVACTIONS {
-    SPVA_Speak = 0,
-    SPVA_Silence,
-    SPVA_Pronounce,
-    SPVA_Bookmark,
-    SPVA_SpellOut,
-    SPVA_Section,
-    SPVA_ParseUnknownTag,
-}}
-STRUCT!{struct SPVCONTEXT {
-    pCategory: ::LPCWSTR,
-    pBefore: ::LPCWSTR,
-    pAfter: ::LPCWSTR,
-}}
-STRUCT!{struct SPVSTATE {
-    eAction: SPVACTIONS,
-    LangID: ::WORD,
-    wReserved: ::WORD,
-    EmphAdj: ::c_long,
-    RateAdj: ::c_long,
-    Volume: ::ULONG,
-    PitchAdj: SPVPITCH,
-    SilenceMSecs: ::ULONG,
-    pPhoneIds: *mut SPPHONEID,
-    ePartOfSpeech: SPPARTOFSPEECH,
-    Context: SPVCONTEXT,
-}}
-ENUM!{enum SPRUNSTATE {
-    SPRS_DONE = 1 << 0,
-    SPRS_IS_SPEAKING = 1 << 1,
-}}
-ENUM!{enum SPVLIMITS {
-    SPMIN_VOLUME = 0,
-    SPMAX_VOLUME = 100,
-    SPMIN_RATE = -10i32 as u32,
-    SPMAX_RATE = 10,
-}}
-ENUM!{enum SPVPRIORITY {
-    SPVPRI_NORMAL = 0,
-    SPVPRI_ALERT = 1 << 0,
-    SPVPRI_OVER = 1 << 1,
-}}
-STRUCT!{struct SPVOICESTATUS {
-    ulCurrentStream: ::ULONG,
-    ulLastStreamQueued: ::ULONG,
-    hrLastResult: ::HRESULT,
-    dwRunningState: ::DWORD,
-    ulInputWordPos: ::ULONG,
-    ulInputWordLen: ::ULONG,
-    ulInputSentPos: ::ULONG,
-    ulInputSentLen: ::ULONG,
-    lBookmarkId: ::LONG,
-    PhonemeId: SPPHONEID,
-    VisemeId: SPVISEMES,
-    dwReserved1: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-FLAGS!{enum SPEAKFLAGS {
-    SPF_DEFAULT = 0,
-    SPF_ASYNC = 1 << 0,
-    SPF_PURGEBEFORESPEAK = 1 << 1,
-    SPF_IS_FILENAME = 1 << 2,
-    SPF_IS_XML = 1 << 3,
-    SPF_IS_NOT_XML = 1 << 4,
-    SPF_PERSIST_XML = 1 << 5,
-    SPF_NLP_SPEAK_PUNC = 1 << 6,
-    SPF_PARSE_SAPI = 1 << 7,
-    SPF_PARSE_SSML = 1 << 8,
-}}
-pub const SPF_PARSE_AUTODETECT: SPEAKFLAGS = SPF_DEFAULT;
-pub const SPF_NLP_MASK: SPEAKFLAGS = SPF_NLP_SPEAK_PUNC;
-pub const SPF_PARSE_MASK: i32 = SPF_PARSE_SAPI.0 as i32 | SPF_PARSE_SSML.0 as i32;
-pub const SPF_VOICE_MASK: i32 =
-    SPF_ASYNC.0 as i32 | SPF_PURGEBEFORESPEAK.0 as i32 | SPF_IS_FILENAME.0 as i32 | SPF_IS_XML.0 as i32 |
-    SPF_IS_NOT_XML.0 as i32 | SPF_NLP_MASK.0 as i32 | SPF_PERSIST_XML.0 as i32 | SPF_PARSE_MASK;
-pub const SPF_UNUSED_FLAGS: i32 = !SPF_VOICE_MASK;
-RIDL!(
-interface ISpVoice(ISpVoiceVtbl): ISpEventSource(ISpEventSourceVtbl) {
-    fn SetOutput(&mut self, pUnkOutput: *mut ::IUnknown, fAllowFormatChanges: ::BOOL) -> ::HRESULT,
-    fn GetOutputObjectToken(&mut self, ppObjectToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn GetOutputStream(&mut self, ppStream: *mut *mut ISpStreamFormat) -> ::HRESULT,
-    fn Pause(&mut self) -> ::HRESULT,
-    fn Resume(&mut self) -> ::HRESULT,
-    fn SetVoice(&mut self, pToken: *mut ISpObjectToken) -> ::HRESULT,
-    fn GetVoice(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn Speak(
-        &mut self, pwcs: ::LPCWSTR, dwFlags: ::DWORD, pulStreamNumber: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn SpeakStream(
-        &mut self, pStream: *mut ::IStream, dwFlags: ::DWORD, pulStreamNumber: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn GetStatus(
-        &mut self, pStatus: *mut SPVOICESTATUS, ppszLastBookmark: *mut ::LPWSTR
-    ) -> ::HRESULT,
-    fn Skip(
-        &mut self, pItemType: ::LPCWSTR, lNumItems: ::c_long, pulNumSkipped: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn SetPriority(&mut self, ePriority: SPVPRIORITY) -> ::HRESULT,
-    fn GetPriority(&mut self, pePriority: *mut SPVPRIORITY) -> ::HRESULT,
-    fn SetAlertBoundary(&mut self, eBoundary: SPEVENTENUM) -> ::HRESULT,
-    fn GetAlertBoundary(&mut self, peBoundary: *mut SPEVENTENUM) -> ::HRESULT,
-    fn SetRate(&mut self, RateAdjust: ::c_long) -> ::HRESULT,
-    fn GetRate(&mut self, pRateAdjust: *mut ::c_long) -> ::HRESULT,
-    fn SetVolume(&mut self, usVolume: ::USHORT) -> ::HRESULT,
-    fn GetVolume(&mut self, pusVolume: *mut ::USHORT) -> ::HRESULT,
-    fn WaitUntilDone(&mut self, msTimeout: ::ULONG) -> ::HRESULT,
-    fn SetSyncSpeakTimeout(&mut self, msTimeout: ::ULONG) -> ::HRESULT,
-    fn GetSyncSpeakTimeout(&mut self, pmsTimeout: *mut ::ULONG) -> ::HRESULT,
-    fn SpeakCompleteEvent(&mut self) -> ::HANDLE,
-    fn IsUISupported(
-        &mut self, pszTypeOfUI: ::LPCWSTR, pvExtraData: *mut ::c_void, cbExtraData: ::ULONG,
-        pfSupported: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hwndParent: ::HWND, pszTitle: ::LPCWSTR, pszTypeOfUI: ::LPCWSTR,
-        pvExtraData: *mut ::c_void, cbExtraData: ::ULONG
-    ) -> ::HRESULT
-}
-);
-DEFINE_GUID!(
-    UuidOfISpVoice,
-    0x6C44DF74, 0x72B9, 0x4992, 0xA1, 0xEC, 0xEF, 0x99, 0x6E, 0x04, 0x22, 0xD4
-);
-RIDL!(
-interface ISpPhrase(ISpPhraseVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPhrase(&mut self, ppCoMemPhrase: *mut *mut SPPHRASE) -> ::HRESULT,
-    fn GetSerializedPhrase(&mut self, ppCoMemPhrase: *mut *mut SPSERIALIZEDPHRASE) -> ::HRESULT,
-    fn GetText(
-        &mut self, ulStart: ::ULONG, ulCount: ::ULONG, fUseTextReplacements: ::BOOL,
-        ppszCoMemText: *mut ::LPWSTR, pbDisplayAttributes: *mut ::BYTE
-    ) -> ::HRESULT,
-    fn Discard(&mut self, dwValueTypes: ::DWORD) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpPhraseAlt(ISpPhraseAltVtbl): ISpPhrase(ISpPhraseVtbl) {
-    fn GetAltInfo(
-        &mut self, pParent: *mut *mut ISpPhrase, pulStartElementInParent: *mut ::ULONG,
-        pcElementsInParent: *mut ::ULONG, pcElementsInAlt: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Commit(&mut self) -> ::HRESULT
-}
-);
-ENUM!{enum SPXMLRESULTOPTIONS {
-    SPXRO_SML = 0,
-    SPXRO_Alternates_SML = 1,
-}}
-RIDL!(
-interface ISpPhrase2(ISpPhrase2Vtbl): ISpPhrase(ISpPhraseVtbl) {
-    fn GetXMLResult(
-        &mut self, ppszCoMemXMLResult: *mut ::LPWSTR, Options: SPXMLRESULTOPTIONS
-    ) -> ::HRESULT,
-    fn GetXMLErrorInfo(&mut self, pSemanticErrorInfo: *mut SPSEMANTICERRORINFO) -> ::HRESULT,
-    fn GetAudio(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, ppStream: *mut *mut ISpStreamFormat
-    ) -> ::HRESULT
-}
-);
-STRUCT!{struct SPRECORESULTTIMES {
-    ftStreamTime: ::FILETIME,
-    ullLength: ::ULONGLONG,
-    dwTickCount: ::DWORD,
-    ullStart: ::ULONGLONG,
-}}
-STRUCT!{struct SPSERIALIZEDRESULT {
-    ulSerializedSize: ::ULONG,
-}}
-RIDL!(
-interface ISpRecoResult(ISpRecoResultVtbl): ISpPhrase(ISpPhraseVtbl) {
-    fn GetResultTimes(&mut self, pTimes: *mut SPRECORESULTTIMES) -> ::HRESULT,
-    fn GetAlternates(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, ulRequestCount: ::ULONG,
-        ppPhrases: *mut *mut ISpPhraseAlt, pcPhrasesReturned: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn GetAudio(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, ppStream: *mut *mut ISpStreamFormat
-    ) -> ::HRESULT,
-    fn SpeakAudio(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, dwFlags: ::DWORD,
-        pulStreamNumber: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Serialize(&mut self, ppCoMemSerializedResult: *mut *mut SPSERIALIZEDRESULT) -> ::HRESULT,
-    fn ScaleAudio(
-        &mut self, pAudioFormatId: *const ::GUID, pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetRecoContext(&mut self, ppRecoContext: *mut *mut ISpRecoContext) -> ::HRESULT
-}
-);
-FLAGS!{enum SPCOMMITFLAGS {
-    SPCF_NONE = 0,
-    SPCF_ADD_TO_USER_LEXICON = 1 << 0,
-    SPCF_DEFINITE_CORRECTION = 1 << 1,
-}}
-RIDL!(
-interface ISpRecoResult2(ISpRecoResult2Vtbl): ISpRecoResult(ISpRecoResultVtbl) {
-    fn CommitAlternate(
-        &mut self, pPhraseAlt: *mut ISpPhraseAlt, ppNewResult: *mut *mut ISpRecoResult
-    ) -> ::HRESULT,
-    fn CommitText(
-        &mut self, ulStartElement: ::ULONG, cElements: ::ULONG, pszCorrectedData: ::LPCWSTR,
-        eCommitFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn SetTextFeedback(&mut self, pszFeedback: ::LPCWSTR, fSuccessful: ::BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpXMLRecoResult(ISpXMLRecoResultVtbl): ISpRecoResult(ISpRecoResultVtbl) {
-    fn GetXMLResult(
-        &mut self, ppszCoMemXMLResult: *mut ::LPWSTR, Options: SPXMLRESULTOPTIONS
-    ) -> ::HRESULT,
-    fn GetXMLErrorInfo(&mut self, pSemanticErrorInfo: *mut SPSEMANTICERRORINFO) -> ::HRESULT
-}
-);
-STRUCT!{struct SPTEXTSELECTIONINFO {
-    ulStartActiveOffset: ::ULONG,
-    cchActiveChars: ::ULONG,
-    ulStartSelection: ::ULONG,
-    cchSelection: ::ULONG,
-}}
-ENUM!{enum SPWORDPRONOUNCEABLE {
-    SPWP_UNKNOWN_WORD_UNPRONOUNCEABLE = 0,
-    SPWP_UNKNOWN_WORD_PRONOUNCEABLE = 1,
-    SPWP_KNOWN_WORD_PRONOUNCEABLE = 2,
-}}
-ENUM!{enum SPGRAMMARSTATE {
-    SPGS_DISABLED = 0,
-    SPGS_ENABLED = 1,
-    SPGS_EXCLUSIVE = 3,
-}}
-ENUM!{enum SPCONTEXTSTATE {
-    SPCS_DISABLED = 0,
-    SPCS_ENABLED = 1,
-}}
-ENUM!{enum SPRULESTATE {
-    SPRS_INACTIVE = 0,
-    SPRS_ACTIVE = 1,
-    SPRS_ACTIVE_WITH_AUTO_PAUSE = 3,
-    SPRS_ACTIVE_USER_DELIMITED = 4,
-}}
-pub const SP_STREAMPOS_ASAP: ::INT = 0;
-pub const SP_STREAMPOS_REALTIME: ::INT = -1;
-pub const SPRULETRANS_TEXTBUFFER: SPSTATEHANDLE = -1isize as SPSTATEHANDLE;
-pub const SPRULETRANS_WILDCARD: SPSTATEHANDLE = -2isize as SPSTATEHANDLE;
-pub const SPRULETRANS_DICTATION: SPSTATEHANDLE = -3isize as SPSTATEHANDLE;
-ENUM!{enum SPGRAMMARWORDTYPE {
-    SPWT_DISPLAY = 0,
-    SPWT_LEXICAL = 1,
-    SPWT_PRONUNCIATION = 2,
-    SPWT_LEXICAL_NO_SPECIAL_CHARS = 3,
-}}
-STRUCT!{struct SPPROPERTYINFO {
-    pszName: ::LPCWSTR,
-    ulId: ::ULONG,
-    pszValue: ::LPCWSTR,
-    vValue: ::VARIANT,
-}}
-FLAGS!{enum SPCFGRULEATTRIBUTES {
-    SPRAF_TopLevel = 1 << 0,
-    SPRAF_Active = 1 << 1,
-    SPRAF_Export = 1 << 2,
-    SPRAF_Import = 1 << 3,
-    SPRAF_Interpreter = 1 << 4,
-    SPRAF_Dynamic = 1 << 5,
-    SPRAF_Root = 1 << 6,
-    SPRAF_AutoPause = 1 << 16,
-    SPRAF_UserDelimited = 1 << 17,
-}}
-RIDL!(
-interface ISpGrammarBuilder(ISpGrammarBuilderVtbl): IUnknown(IUnknownVtbl) {
-    fn ResetGrammar(&mut self, NewLanguage: ::WORD) -> ::HRESULT,
-    fn GetRule(
-        &mut self, pszRuleName: ::LPCWSTR, dwRuleId: ::DWORD, dwAttributes: ::DWORD,
-        fCreateIfNotExist: ::BOOL, phInitialState: *mut SPSTATEHANDLE
-    ) -> ::HRESULT,
-    fn ClearRule(&mut self, hState: SPSTATEHANDLE) -> ::HRESULT,
-    fn CreateNewState(&mut self, hState: SPSTATEHANDLE, phState: *mut SPSTATEHANDLE) -> ::HRESULT,
-    fn AddWordTransition(
-        &mut self, hFromState: SPSTATEHANDLE, hToState: SPSTATEHANDLE, psz: ::LPCWSTR,
-        pszSeparators: ::LPCWSTR, eWordType: SPGRAMMARWORDTYPE, Weight: ::c_float,
-        pPropInfo: *const SPPROPERTYINFO
-    ) -> ::HRESULT,
-    fn AddRuleTransition(
-        &mut self, hFromState: SPSTATEHANDLE, hToState: SPSTATEHANDLE, hRule: SPSTATEHANDLE,
-        Weight: ::c_float, pPropInfo: *const SPPROPERTYINFO
-    ) -> ::HRESULT,
-    fn AddResource(
-        &mut self, hRuleState: SPSTATEHANDLE, pszResourceName: ::LPCWSTR,
-        pszResourceValue: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn Commit(&mut self, dwReserved: ::DWORD) -> ::HRESULT
-}
-);
-ENUM!{enum SPLOADOPTIONS {
-    SPLO_STATIC = 0,
-    SPLO_DYNAMIC = 1,
-}}
-RIDL!(
-interface ISpRecoGrammar(ISpRecoGrammarVtbl): ISpGrammarBuilder(ISpGrammarBuilderVtbl) {
-    fn GetGrammarId(&mut self, pullGrammarId: *mut ::ULONGLONG) -> ::HRESULT,
-    fn GetRecoContext(&mut self, ppRecoCtxt: *mut *mut ISpRecoContext) -> ::HRESULT,
-    fn LoadCmdFromFile(&mut self, pszFileName: ::LPCWSTR, Options: SPLOADOPTIONS) -> ::HRESULT,
-    fn LoadCmdFromObject(
-        &mut self, rcid: ::REFCLSID, pszGrammarName: ::LPCWSTR, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn LoadCmdFromResource(
-        &mut self, hModule: ::HMODULE, pszResourceName: ::LPCWSTR, pszResourceType: ::LPCWSTR,
-        wLanguage: ::WORD, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn LoadCmdFromMemory(
-        &mut self, pGrammar: *const SPBINARYGRAMMAR, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn LoadCmdFromProprietaryGrammar(
-        &mut self, rguidParam: ::REFGUID, pszStringParam: ::LPCWSTR, pvDataPrarm: *const ::c_void,
-        cbDataSize: ::ULONG, Options: SPLOADOPTIONS
-    ) -> ::HRESULT,
-    fn SetRuleState(
-        &mut self, pszName: ::LPCWSTR, pReserved: *mut ::c_void, NewState: SPRULESTATE
-    ) -> ::HRESULT,
-    fn SetRuleIdState(&mut self, ulRuleId: ::ULONG, NewState: SPRULESTATE) -> ::HRESULT,
-    fn LoadDictation(&mut self, pszTopicName: ::LPCWSTR, Options: SPLOADOPTIONS) -> ::HRESULT,
-    fn UnloadDictation(&mut self) -> ::HRESULT,
-    fn SetDictationState(&mut self, NewState: SPRULESTATE) -> ::HRESULT,
-    fn SetWordSequenceData(
-        &mut self, pText: *const ::WCHAR, cchText: ::ULONG, pInfo: *const SPTEXTSELECTIONINFO
-    ) -> ::HRESULT,
-    fn SetTextSelection(&mut self, pInfo: *const SPTEXTSELECTIONINFO) -> ::HRESULT,
-    fn IsPronounceable(
-        &mut self, pszWord: ::LPCWSTR, pWordPronounceable: *mut SPWORDPRONOUNCEABLE
-    ) -> ::HRESULT,
-    fn SetGrammarState(&mut self, eGrammarState: SPGRAMMARSTATE) -> ::HRESULT,
-    fn SaveCmd(&mut self, pStream: *mut ::IStream, ppszCoMemErrorText: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetGrammarState(&mut self, peGrammarState: *mut SPGRAMMARSTATE) -> ::HRESULT
-}
-);
-ENUM!{enum SPMATCHINGMODE {
-    AllWords = 0,
-    Subsequence = 1,
-    OrderedSubset = 3,
-    SubsequenceContentRequired = 5,
-    OrderedSubsetContentRequired = 7,
-}}
-ENUM!{enum PHONETICALPHABET {
-    PA_Ipa = 0,
-    PA_Ups = 1,
-    PA_Sapi = 2,
-}}
-RIDL!(
-interface ISpGrammarBuilder2(ISpGrammarBuilder2Vtbl): IUnknown(IUnknownVtbl) {
-    fn AddTextSubset(
-        &mut self, hFromState: SPSTATEHANDLE, hToState: SPSTATEHANDLE, psz: ::LPCWSTR,
-        eMatchMode: SPMATCHINGMODE
-    ) -> ::HRESULT,
-    fn SetPhoneticAlphabet(&mut self, phoneticALphabet: PHONETICALPHABET) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRecoGrammar2(ISpRecoGrammar2Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetRules(&mut self, ppCoMemRules: *mut *mut SPRULE, puNumRules: *mut ::UINT) -> ::HRESULT,
-    fn LoadCmdFromFile2(
-        &mut self, pszFileName: ::LPCWSTR, Options: SPLOADOPTIONS, pszSharingUri: ::LPCWSTR,
-        pszBaseUri: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn LoadCmdFromMemory2(
-        &mut self, pGrammar: *const SPBINARYGRAMMAR, Options: SPLOADOPTIONS,
-        pszSharingUri: ::LPCWSTR, pszBaseUri: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetRulePriority(
-        &mut self, pszRuleName: ::LPCWSTR, ulRuleId: ::ULONG, nRulePriority: ::c_int
-    ) -> ::HRESULT,
-    fn SetRuleWeight(
-        &mut self, pszRuleName: ::LPCWSTR, ulRuleId: ::ULONG, flWeight: ::c_float
-    ) -> ::HRESULT,
-    fn SetDictationWeight(&mut self, flWeight: ::c_float) -> ::HRESULT,
-    fn SetGrammarLoader(&mut self, pLoader: *mut ISpeechResourceLoader) -> ::HRESULT,
-    fn SetSMLSecurityManager(
-        &mut self, pSMLSecurityManager: *mut ::IInternetSecurityManager
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechResourceLoader(ISpeechResourceLoaderVtbl): IDispatch(IDispatchVtbl) {
-    fn LoadResource(
-        &mut self, bstrResourceUri: ::BSTR, fAlwaysReload: ::VARIANT_BOOL,
-        pStream: *mut *mut ::IUnknown, pbstrMIMEType: *mut ::BSTR, pfModified: *mut ::VARIANT_BOOL,
-        pbstrRedirectUrl: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetLocalCopy(
-        &mut self, bstrResourceUri: ::BSTR, pbstrLocalPath: *mut ::BSTR,
-        pbstrMIMEType: *mut ::BSTR, pbstrRedirectUrl: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn ReleaseLocalCopy(&mut self, pbstrLocalPath: ::BSTR) -> ::HRESULT
-}
-);
-STRUCT!{nodebug struct SPRECOCONTEXTSTATUS {
-    eInterference: SPINTERFERENCE,
-    szRequestTypeOfUI: [::WCHAR; 255],
-    dwReserved1: ::DWORD,
-    dwReserved2: ::DWORD,
-}}
-FLAGS!{enum SPBOOKMARKOPTIONS {
-    SPBO_NONE = 0,
-    SPBO_PAUSE = 1 << 0,
-    SPBO_AHEAD = 1 << 1,
-    SPBO_TIME_UNITS = 1 << 2,
-}}
-FLAGS!{enum SPAUDIOOPTIONS {
-    SPAO_NONE = 0,
-    SPAO_RETAIN_AUDIO = 1 << 0,
-}}
-RIDL!(
-interface ISpRecoContext(ISpRecoContextVtbl): ISpEventSource(ISpEventSourceVtbl) {
-    fn GetRecognizer(&mut self, ppRecognizer: *mut *mut ISpRecognizer) -> ::HRESULT,
-    fn CreateGrammer(
-        &mut self, ullGrammarId: ::ULONGLONG, ppGrammar: *mut *mut ISpRecoGrammar
-    ) -> ::HRESULT,
-    fn GetStatus(&mut self, pState: *mut SPRECOCONTEXTSTATUS) -> ::HRESULT,
-    fn GetMaxAlternates(&mut self, pcAlternates: *mut ::ULONG) -> ::HRESULT,
-    fn SetMaxAlternates(&mut self, cAlternates: ::ULONG) -> ::HRESULT,
-    fn SetAudioOptions(
-        &mut self, Options: SPAUDIOOPTIONS, pAudioFormatId: *const ::GUID,
-        pWaveFormatEx: *const ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn GetAudioOptions(
-        &mut self, pOptions: *mut SPAUDIOOPTIONS, pAudioFormatId: *mut ::GUID,
-        ppCoMemWFEX: *mut *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn DeserializeResult(
-        &mut self, pSerializedResult: *const SPSERIALIZEDRESULT, ppResult: *mut *mut ISpRecoResult
-    ) -> ::HRESULT,
-    fn Bookmark(
-        &mut self, Options: SPBOOKMARKOPTIONS, ullStreamPosition: ::ULONGLONG,
-        lparamEvent: ::LPARAM
-    ) -> ::HRESULT,
-    fn SetAdaptionData(&mut self, pAdaptionData: ::LPCWSTR, cch: ::ULONG) -> ::HRESULT,
-    fn Pause(&mut self, dwReserved: ::DWORD) -> ::HRESULT,
-    fn Resume(&mut self, dwReserved: ::DWORD) -> ::HRESULT,
-    fn SetVoice(&mut self, pVoice: *mut ISpVoice, fAllowFormatChanges: ::BOOL) -> ::HRESULT,
-    fn GetVoice(&mut self, ppVoice: *mut *mut ISpVoice) -> ::HRESULT,
-    fn SetVoicePurgeEvent(&mut self, ullEventIntereset: ::ULONGLONG) -> ::HRESULT,
-    fn GetVoicePurgeEvent(&mut self, pullEventIntereset: *mut ::ULONGLONG) -> ::HRESULT,
-    fn SetContextState(&mut self, eContextState: SPCONTEXTSTATE) -> ::HRESULT,
-    fn GetContextState(&mut self, peContextState: *mut SPCONTEXTSTATE) -> ::HRESULT
-}
-);
-FLAGS!{enum SPGRAMMAROPTIONS {
-    SPGO_SAPI = 0x1,
-    SPGO_SRGS = 0x2,
-    SPGO_UPS = 0x4,
-    SPGO_SRGS_MS_SCRIPT = 0x8,
-    SPGO_SRGS_W3C_SCRIPT = 0x100,
-    SPGO_SRGS_STG_SCRIPT = 0x200,
-    SPGO_SRGS_SCRIPT =
-        SPGO_SRGS.0 | SPGO_SRGS_MS_SCRIPT.0 | SPGO_SRGS_W3C_SCRIPT.0 |
-             SPGO_SRGS_STG_SCRIPT.0,
-    SPGO_FILE = 0x10,
-    SPGO_HTTP = 0x20,
-    SPGO_RES = 0x40,
-    SPGO_OBJECT = 0x80,
-    SPGO_DEFAULT = 0x3fb,
-    SPGO_ALL = 0x3ff,
-}}
-FLAGS!{enum SPADAPTATIONSETTINGS {
-    SPADS_Default = 0,
-    SPADS_CurrentRecognizer = 0x1,
-    SPADS_RecoProfile = 0x2,
-    SPADS_Immediate = 0x4,
-    SPADS_Reset = 0x8,
-    SPADS_HighVolumeDataSource = 0x10,
-}}
-ENUM!{enum SPADAPTATIONRELEVANCE {
-    SPAR_Unknown = 0,
-    SPAR_Low = 1,
-    SPAR_Medium = 2,
-    SPAR_High = 3,
-}}
-RIDL!(
-interface ISpRecoContext2(ISpRecoContext2Vtbl): IUnknown(IUnknownVtbl) {
-    fn SetGrammarOptions(&mut self, eGrammarOptions: ::DWORD) -> ::HRESULT,
-    fn GetGrammarOptions(&mut self, peGrammarOptions: *mut ::DWORD) -> ::HRESULT,
-    fn SetAdaptationData2(
-        &mut self, pAdaptationData: ::LPCWSTR, cch: ::ULONG, pTopicName: ::LPCWSTR,
-        eAdaptationSettings: ::DWORD, eRelevance: SPADAPTATIONRELEVANCE
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpProperties(ISpPropertiesVtbl): IUnknown(IUnknownVtbl) {
-    fn SetPropertyNum(&mut self, pName: ::LPCWSTR, lValue: ::LONG) -> ::HRESULT,
-    fn GetPropertyNum(&mut self, pName: ::LPCWSTR, plValue: *mut ::LONG) -> ::HRESULT,
-    fn SetPropertyString(&mut self, pName: ::LPCWSTR, pValue: ::LPCWSTR) -> ::HRESULT,
-    fn GetPropertyString(&mut self, pName: ::LPCWSTR, ppCoMemValue: *mut ::LPWSTR) -> ::HRESULT
-}
-);
-STRUCT!{struct SPRECOGNIZERSTATUS {
-    AudioStatus: SPAUDIOSTATUS,
-    ullRecognitionStreamPos: ::ULONGLONG,
-    ulStreamNumber: ::ULONG,
-    ulNumActive: ::ULONG,
-    clsidEngine: ::CLSID,
-    cLangIDs: ::ULONG,
-    aLangID: [::WORD; 20],
-    ullRecognitionStreamTime: ::ULONGLONG,
-}}
-ENUM!{enum SPWAVEFORMATTYPE {
-    SPWF_INPUT = 0,
-    SPWF_SRENGINE = 1,
-}}
-pub type SPSTREAMFORMATTYPE = SPWAVEFORMATTYPE;
-ENUM!{enum SPRECOSTATE {
-    SPRST_INACTIVE = 0,
-    SPRST_ACTIVE = 1,
-    SPRST_ACTIVE_ALWAYS = 2,
-    SPRST_INACTIVE_WITH_PURGE = 3,
-    SPRST_NUM_STATES = 4,
-}}
-RIDL!(
-interface ISpRecognizer(ISpRecognizerVtbl): ISpProperties(ISpPropertiesVtbl) {
-    fn SetRecognizer(&mut self, pRecognizer: *mut ISpObjectToken) -> ::HRESULT,
-    fn GetRecognizer(&mut self, ppRecognizer: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn SetInput(&mut self, pUnkInput: *mut ::IUnknown, fAllowFormatChanges: ::BOOL) -> ::HRESULT,
-    fn GetInputObjectToken(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn GetInputStream(&mut self, ppStream: *mut *mut ISpStreamFormat) -> ::HRESULT,
-    fn CreateRecoContext(&mut self, ppNewCtxt: *mut *mut ISpRecoContext) -> ::HRESULT,
-    fn GetRecoProfile(&mut self, ppToken: *mut *mut ISpObjectToken) -> ::HRESULT,
-    fn SetRecoProfile(&mut self, pToken: *mut ISpObjectToken) -> ::HRESULT,
-    fn IsSharedInstance(&mut self) -> ::HRESULT,
-    fn GetRecoState(&mut self, pState: *mut SPRECOSTATE) -> ::HRESULT,
-    fn SetRecoState(&mut self, NewState: SPRECOSTATE) -> ::HRESULT,
-    fn GetStatus(&mut self, pStatus: *mut SPRECOGNIZERSTATUS) -> ::HRESULT,
-    fn GetFormat(
-        &mut self, WaveFormatType: SPSTREAMFORMATTYPE, pFormatId: *mut ::GUID,
-        ppCoMemWFEX: *mut ::WAVEFORMATEX
-    ) -> ::HRESULT,
-    fn IsUISupported(
-        &mut self, pszTypeOfUI: ::LPCWSTR, pvExtraData: *mut ::c_void, cbExtraData: ::ULONG,
-        pfSupported: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hwndParent: ::HWND, pszTitle: ::LPCWSTR, pszTypeOfUI: ::LPCWSTR,
-        pvExtraData: *mut ::c_void, cbExtraData: ::ULONG
-    ) -> ::HRESULT,
-    fn EmulateRecognition(&mut self, pPhrase: *mut ISpPhrase) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpSerializeState(ISpSerializeStateVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSerializedState(
-        &mut self, ppbData: *mut *mut ::BYTE, pulSize: *mut ::ULONG, dwReserved: ::DWORD
-    ) -> ::HRESULT,
-    fn SetSerializedState(
-        &mut self, pbData: *mut ::BYTE, ulSize: ::ULONG, dwReserved: ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRecognizer2(ISpRecognizer2Vtbl): IUnknown(IUnknownVtbl) {
-    fn EmulateRecognitionEx(
-        &mut self, pPhrase: *mut ISpPhrase, dwCompareFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn SetTrainingState(
-        &mut self, fDoingTraining: ::BOOL, fAdaptFromTrainingData: ::BOOL
-    ) -> ::HRESULT,
-    fn ResetAcousticModelAdaptation(&mut self) -> ::HRESULT
-}
-);
-ENUM!{enum SPCATEGORYTYPE {
-    SPCT_COMMAND = 0,
-    SPCT_DICTATION,
-    SPCT_SLEEP,
-    SPCT_SUB_COMMAND,
-    SPCT_SUB_DICTATION,
-}}
-RIDL!(
-interface ISpRecoCategory(ISpRecoCategoryVtbl): IUnknown(IUnknownVtbl) {
-    fn GetType(&mut self, peCategoryType: *mut SPCATEGORYTYPE) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpRecognizer3(ISpRecognizer3Vtbl): IUnknown(IUnknownVtbl) {
-    fn GetCategory(
-        &mut self, categoryType: SPCATEGORYTYPE, ppCategory: *mut *mut ISpRecoCategory
-    ) -> ::HRESULT,
-    fn SetActiveCategory(&mut self, pCategory: *mut ISpRecoCategory) -> ::HRESULT,
-    fn GetActiveCategory(&mut self, ppCategory: *mut *mut ISpRecoCategory) -> ::HRESULT
-}
-);
-STRUCT!{struct SPNORMALIZATIONLIST {
-    ulSize: ::ULONG,
-    ppszzNormalizedList: *mut *mut ::WCHAR,
-}}
-RIDL!(
-interface ISpEnginePronunciation(ISpEnginePronunciationVtbl): IUnknown(IUnknownVtbl) {
-    fn Normalize(
-        &mut self, pszWord: ::LPCWSTR, pszLeftContext: ::LPCWSTR, pszRightContext: ::LPCWSTR,
-        LangID: ::WORD, pNormalizationList: *mut SPNORMALIZATIONLIST
-    ) -> ::HRESULT,
-    fn GetPronunciations(
-        &mut self, pszWord: ::LPCWSTR, pszLeftContext: ::LPCWSTR, pszRightContext: ::LPCWSTR,
-        LangID: ::WORD, pEnginePronunciationList: *mut SPWORDPRONUNCIATIONLIST
-    ) -> ::HRESULT
-}
-);
-STRUCT!{struct SPDISPLAYTOKEN {
-    pszLexical: *const ::WCHAR,
-    pszDisplay: *const ::WCHAR,
-    bDisplayAttributes: ::BYTE,
-}}
-STRUCT!{struct SPDISPLAYPHRASE {
-    ulNumTokens: ::ULONG,
-    pTokens: *mut SPDISPLAYTOKEN,
-}}
-RIDL!(
-interface ISpDisplayAlternates(ISpDisplayAlternatesVtbl): IUnknown(IUnknownVtbl) {
-    fn GetDisplayAlternates(
-        &mut self, pPhrase: *const SPDISPLAYPHRASE, cRequestCount: ::ULONG,
-        ppCoMemPhrases: *mut *mut SPDISPLAYPHRASE, pcPhrasesReturned: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn SetFullStopTrailSpace(&mut self, ulTrailSpace: ::ULONG) -> ::HRESULT
-}
-);
-pub type SpeechLanguageId = ::c_long;
-ENUM!{enum DISPID_SpeechDataKey {
-    DISPID_SDKSetBinaryValue = 1,
-    DISPID_SDKGetBinaryValue,
-    DISPID_SDKSetStringValue,
-    DISPID_SDKGetStringValue,
-    DISPID_SDKSetLongValue,
-    DISPID_SDKGetlongValue,
-    DISPID_SDKOpenKey,
-    DISPID_SDKCreateKey,
-    DISPID_SDKDeleteKey,
-    DISPID_SDKDeleteValue,
-    DISPID_SDKEnumKeys,
-    DISPID_SDKEnumValues,
-}}
-ENUM!{enum DISPID_SpeechObjectToken {
-    DISPID_SOTId = 1,
-    DISPID_SOTDataKey,
-    DISPID_SOTCategory,
-    DISPID_SOTGetDescription,
-    DISPID_SOTSetId,
-    DISPID_SOTGetAttribute,
-    DISPID_SOTCreateInstance,
-    DISPID_SOTRemove,
-    DISPID_SOTGetStorageFileName,
-    DISPID_SOTRemoveStorageFileName,
-    DISPID_SOTIsUISupported,
-    DISPID_SOTDisplayUI,
-    DISPID_SOTMatchesAttributes,
-}}
-ENUM!{enum SpeechDataKeyLocation {
-    SDKLDefaultLocation = SPDKL_DefaultLocation.0,
-    SDKLCurrentUser = SPDKL_CurrentUser.0,
-    SDKLLocalMachine = SPDKL_LocalMachine.0,
-    SDKLCurrentConfig = SPDKL_CurrentConfig.0,
-}}
-ENUM!{enum SpeechTokenContext {
-    STCInprocServer = ::CLSCTX_INPROC_SERVER,
-    STCInprocHandler = ::CLSCTX_INPROC_HANDLER,
-    STCLocalServer = ::CLSCTX_LOCAL_SERVER,
-    STCRemoteServer = ::CLSCTX_REMOTE_SERVER,
-    STCAll = ::CLSCTX_INPROC_SERVER | ::CLSCTX_INPROC_HANDLER |
-             ::CLSCTX_LOCAL_SERVER | ::CLSCTX_REMOTE_SERVER,
-}}
-ENUM!{enum SpeechTokenShellFolder {
-    STSF_AppData = 0x1a,
-    STSF_LocalAppData = 0x1c,
-    STSF_CommonAppData = 0x23,
-    STSF_FlagCreate = 0x8000,
-}}
-ENUM!{enum DISPID_SpeechObjectTokens {
-    DISPID_SOTsCount = 1,
-    DISPID_SOTsItem = ::DISPID_VALUE as u32,
-    DISPID_SOTs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechObjectTokenCategory {
-    DISPID_SOTCId = 1,
-    DISPID_SOTCDefault,
-    DISPID_SOTCSetId,
-    DISPID_SOTCGetDataKey,
-    DISPID_SOTCEnumerateTokens,
-}}
-ENUM!{enum SpeechAudioFormatType {
-    SAFTDefault = -1i32 as u32,
-    SAFTNoAssignedFormat = 0,
-    SAFTText = 1,
-    SAFTNonStandardFormat = 2,
-    SAFTExtendedAudioFormat = 3,
-    SAFT8kHz8BitMono = 4,
-    SAFT8kHz8BitStereo = 5,
-    SAFT8kHz16BitMono = 6,
-    SAFT8kHz16BitStereo = 7,
-    SAFT11kHz8BitMono = 8,
-    SAFT11kHz8BitStereo = 9,
-    SAFT11kHz16BitMono = 10,
-    SAFT11kHz16BitStereo = 11,
-    SAFT12kHz8BitMono = 12,
-    SAFT12kHz8BitStereo = 13,
-    SAFT12kHz16BitMono = 14,
-    SAFT12kHz16BitStereo = 15,
-    SAFT16kHz8BitMono = 16,
-    SAFT16kHz8BitStereo = 17,
-    SAFT16kHz16BitMono = 18,
-    SAFT16kHz16BitStereo = 19,
-    SAFT22kHz8BitMono = 20,
-    SAFT22kHz8BitStereo = 21,
-    SAFT22kHz16BitMono = 22,
-    SAFT22kHz16BitStereo = 23,
-    SAFT24kHz8BitMono = 24,
-    SAFT24kHz8BitStereo = 25,
-    SAFT24kHz16BitMono = 26,
-    SAFT24kHz16BitStereo = 27,
-    SAFT32kHz8BitMono = 28,
-    SAFT32kHz8BitStereo = 29,
-    SAFT32kHz16BitMono = 30,
-    SAFT32kHz16BitStereo = 31,
-    SAFT44kHz8BitMono = 32,
-    SAFT44kHz8BitStereo = 33,
-    SAFT44kHz16BitMono = 34,
-    SAFT44kHz16BitStereo = 35,
-    SAFT48kHz8BitMono = 36,
-    SAFT48kHz8BitStereo = 37,
-    SAFT48kHz16BitMono = 38,
-    SAFT48kHz16BitStereo = 39,
-    SAFTTrueSpeech_8kHz1BitMono = 40,
-    SAFTCCITT_ALaw_8kHzMono = 41,
-    SAFTCCITT_ALaw_8kHzStereo = 42,
-    SAFTCCITT_ALaw_11kHzMono = 43,
-    SAFTCCITT_ALaw_11kHzStereo = 44,
-    SAFTCCITT_ALaw_22kHzMono = 45,
-    SAFTCCITT_ALaw_22kHzStereo = 46,
-    SAFTCCITT_ALaw_44kHzMono = 47,
-    SAFTCCITT_ALaw_44kHzStereo = 48,
-    SAFTCCITT_uLaw_8kHzMono = 49,
-    SAFTCCITT_uLaw_8kHzStereo = 50,
-    SAFTCCITT_uLaw_11kHzMono = 51,
-    SAFTCCITT_uLaw_11kHzStereo = 52,
-    SAFTCCITT_uLaw_22kHzMono = 53,
-    SAFTCCITT_uLaw_22kHzStereo = 54,
-    SAFTCCITT_uLaw_44kHzMono = 55,
-    SAFTCCITT_uLaw_44kHzStereo = 56,
-    SAFTADPCM_8kHzMono = 57,
-    SAFTADPCM_8kHzStereo = 58,
-    SAFTADPCM_11kHzMono = 59,
-    SAFTADPCM_11kHzStereo = 60,
-    SAFTADPCM_22kHzMono = 61,
-    SAFTADPCM_22kHzStereo = 62,
-    SAFTADPCM_44kHzMono = 63,
-    SAFTADPCM_44kHzStereo = 64,
-    SAFTGSM610_8kHzMono = 65,
-    SAFTGSM610_11kHzMono = 66,
-    SAFTGSM610_22kHzMono = 67,
-    SAFTGSM610_44kHzMono = 68,
-}}
-ENUM!{enum DISPID_SpeechAudioFormat {
-    DISPID_SAFType = 1,
-    DISPID_SAFGuid,
-    DISPID_SAFGetWaveFormatEx,
-    DISPID_SAFSetWaveFormatEx,
-}}
-ENUM!{enum DISPID_SpeechBaseStream {
-    DISPID_SBSFormat = 1,
-    DISPID_SBSRead,
-    DISPID_SBSWrite,
-    DISPID_SBSSeek,
-}}
-ENUM!{enum SpeechStreamSeekPositionType {
-    SSSPTRelativeToStart = ::STREAM_SEEK_SET.0,
-    SSSPTRelativeToCurrentPosition = ::STREAM_SEEK_CUR.0,
-    SSSPTRelativeToEnd = ::STREAM_SEEK_END.0,
-}}
-ENUM!{enum DISPID_SpeechAudio {
-    DISPID_SAStatus = 200,
-    DISPID_SABufferInfo,
-    DISPID_SADefaultFormat,
-    DISPID_SAVolume,
-    DISPID_SABufferNotifySize,
-    DISPID_SAEventHandle,
-    DISPID_SASetState,
-}}
-ENUM!{enum SpeechAudioState {
-    SASClosed = SPAS_CLOSED.0,
-    SASStop = SPAS_STOP.0,
-    SASPause = SPAS_PAUSE.0,
-    SASRun = SPAS_RUN.0,
-}}
-ENUM!{enum DISPID_SpeechMMSysAudio {
-    DISPID_SMSADeviceId = 300,
-    DISPID_SMSALineId,
-    DISPID_SMSAMMHandle,
-}}
-ENUM!{enum DISPID_SpeechFileStream {
-    DISPID_SFSOpen = 100,
-    DISPID_SFSClose,
-}}
-ENUM!{enum SpeechStreamFileMode {
-    SSFMOpenForRead = SPFM_OPEN_READONLY.0,
-    SSFMOpenReadWrite = SPFM_OPEN_READWRITE.0,
-    SSFMCreate = SPFM_CREATE.0,
-    SSFMCreateForWrite = SPFM_CREATE_ALWAYS.0,
-}}
-ENUM!{enum DISPID_SpeechCustomStream {
-    DISPID_SCSBaseStream = 100,
-}}
-ENUM!{enum DISPID_SpeechMemoryStream {
-    DISPID_SMSSetData = 100,
-    DISPID_SMSGetData,
-}}
-ENUM!{enum DISPID_SpeechAudioStatus {
-    DISPID_SASFreeBufferSpace = 1,
-    DISPID_SASNonBlockingIO,
-    DISPID_SASState,
-    DISPID_SASCurrentSeekPosition,
-    DISPID_SASCurrentDevicePosition,
-}}
-ENUM!{enum DISPID_SpeechAudioBufferInfo {
-    DISPID_SABIMinNotification = 1,
-    DISPID_SABIBufferSize,
-    DISPID_SABIEventBias,
-}}
-ENUM!{enum DISPID_SpeechWaveFormatEx {
-    DISPID_SWFEFormatTag = 1,
-    DISPID_SWFEChannels,
-    DISPID_SWFESamplesPerSec,
-    DISPID_SWFEAvgBytesPerSec,
-    DISPID_SWFEBlockAlign,
-    DISPID_SWFEBitsPerSample,
-    DISPID_SWFEExtraData,
-}}
-ENUM!{enum DISPID_SpeechVoice {
-    DISPID_SVStatus = 1,
-    DISPID_SVVoice,
-    DISPID_SVAudioOutput,
-    DISPID_SVAudioOutputStream,
-    DISPID_SVRate,
-    DISPID_SVVolume,
-    DISPID_SVAllowAudioOuputFormatChangesOnNextSet,
-    DISPID_SVEventInterests,
-    DISPID_SVPriority,
-    DISPID_SVAlertBoundary,
-    DISPID_SVSyncronousSpeakTimeout,
-    DISPID_SVSpeak,
-    DISPID_SVSpeakStream,
-    DISPID_SVPause,
-    DISPID_SVResume,
-    DISPID_SVSkip,
-    DISPID_SVGetVoices,
-    DISPID_SVGetAudioOutputs,
-    DISPID_SVWaitUntilDone,
-    DISPID_SVSpeakCompleteEvent,
-    DISPID_SVIsUISupported,
-    DISPID_SVDisplayUI,
-}}
-ENUM!{enum SpeechVoicePriority {
-    SVPNormal = SPVPRI_NORMAL.0,
-    SVPAlert = SPVPRI_ALERT.0,
-    SVPOver = SPVPRI_OVER.0,
-}}
-FLAGS!{enum SpeechVoiceSpeakFlags {
-    SVSFDefault = SPF_DEFAULT.0,
-    SVSFlagsAsync = SPF_ASYNC.0,
-    SVSFPurgeBeforeSpeak = SPF_PURGEBEFORESPEAK.0,
-    SVSFIsFilename = SPF_IS_FILENAME.0,
-    SVSFIsXML = SPF_IS_XML.0,
-    SVSFIsNotXML = SPF_IS_NOT_XML.0,
-    SVSFPersistXML = SPF_PERSIST_XML.0,
-    SVSFNLPSpeakPunc = SPF_NLP_SPEAK_PUNC.0,
-    SVSFParseSapi = SPF_PARSE_SAPI.0,
-    SVSFParseSsml = SPF_PARSE_SSML.0,
-    SVSFParseMask = SPF_PARSE_MASK as u32,
-    SVSFVoiceMask = SPF_VOICE_MASK as u32,
-    SVSFUnusedFlags = SPF_UNUSED_FLAGS as u32,
-}}
-pub const SVSFParseAutodetect: SpeechVoiceSpeakFlags = SVSFDefault;
-pub const SVSFNLPMask: SpeechVoiceSpeakFlags = SVSFNLPSpeakPunc;
-FLAGS!{enum SpeechVoiceEvents {
-    SVEStartInputStream = 1 << 1,
-    SVEEndInputStream = 1 << 2,
-    SVEVoiceChange = 1 << 3,
-    SVEBookmark = 1 << 4,
-    SVEWordBoundary = 1 << 5,
-    SVEPhoneme = 1 << 6,
-    SVESentenceBoundary = 1 << 7,
-    SVEViseme = 1 << 8,
-    SVEAudioLevel = 1 << 9,
-    SVEPrivate = 1 << 15,
-    SVEAllEvents = 0x83fe,
-}}
-ENUM!{enum DISPID_SpeechVoiceStatus {
-    DISPID_SVSCurrentStreamNumber = 1,
-    DISPID_SVSLastStreamNumberQueued,
-    DISPID_SVSLastResult,
-    DISPID_SVSRunningState,
-    DISPID_SVSInputWordPosition,
-    DISPID_SVSInputWordLength,
-    DISPID_SVSInputSentencePosition,
-    DISPID_SVSInputSentenceLength,
-    DISPID_SVSLastBookmark,
-    DISPID_SVSLastBookmarkId,
-    DISPID_SVSPhonemeId,
-    DISPID_SVSVisemeId,
-}}
-ENUM!{enum SpeechRunState {
-    SRSEDone = SPRS_DONE.0,
-    SRSEIsSpeaking = SPRS_IS_SPEAKING.0,
-}}
-ENUM!{enum SpeechVisemeType {
-    SVP_0 = 0,
-    SVP_1,
-    SVP_2,
-    SVP_3,
-    SVP_4,
-    SVP_5,
-    SVP_6,
-    SVP_7,
-    SVP_8,
-    SVP_9,
-    SVP_10,
-    SVP_11,
-    SVP_12,
-    SVP_13,
-    SVP_14,
-    SVP_15,
-    SVP_16,
-    SVP_17,
-    SVP_18,
-    SVP_19,
-    SVP_20,
-    SVP_21,
-}}
-ENUM!{enum SpeechVisemeFeature {
-    SVF_None = 0,
-    SVF_Stressed = SPVFEATURE_STRESSED.0,
-    SVF_Emphasis = SPVFEATURE_EMPHASIS.0,
-}}
-ENUM!{enum DISPID_SpeechVoiceEvent {
-    DISPID_SVEStreamStart = 1,
-    DISPID_SVEStreamEnd,
-    DISPID_SVEVoiceChange,
-    DISPID_SVEBookmark,
-    DISPID_SVEWord,
-    DISPID_SVEPhoneme,
-    DISPID_SVESentenceBoundary,
-    DISPID_SVEViseme,
-    DISPID_SVEAudioLevel,
-    DISPID_SVEEnginePrivate,
-}}
-ENUM!{enum DISPID_SpeechRecognizer {
-    DISPID_SRRecognizer = 1,
-    DISPID_SRAllowAudioInputFormatChangesOnNextSet,
-    DISPID_SRAudioInput,
-    DISPID_SRAudioInputStream,
-    DISPID_SRIsShared,
-    DISPID_SRState,
-    DISPID_SRStatus,
-    DISPID_SRProfile,
-    DISPID_SREmulateRecognition,
-    DISPID_SRCreateRecoContext,
-    DISPID_SRGetFormat,
-    DISPID_SRSetPropertyNumber,
-    DISPID_SRGetPropertyNumber,
-    DISPID_SRSetPropertyString,
-    DISPID_SRGetPropertyString,
-    DISPID_SRIsUISupported,
-    DISPID_SRDisplayUI,
-    DISPID_SRGetRecognizers,
-    DISPID_SVGetAudioInputs,
-    DISPID_SVGetProfiles,
-}}
-ENUM!{enum SpeechRecognizerState {
-    SRSInactive = SPRST_INACTIVE.0,
-    SRSActive = SPRST_ACTIVE.0,
-    SRSActiveAlways = SPRST_ACTIVE_ALWAYS.0,
-    SRSInactiveWithPurge = SPRST_INACTIVE_WITH_PURGE.0,
-}}
-ENUM!{enum SpeechDisplayAttributes {
-    SDA_No_Trailing_Space = 0,
-    SDA_One_Trailing_Space = SPAF_ONE_TRAILING_SPACE.0,
-    SDA_Two_Trailing_Spaces = SPAF_TWO_TRAILING_SPACES.0,
-    SDA_Consume_Leading_Spaces = SPAF_CONSUME_LEADING_SPACES.0,
-}}
-ENUM!{enum SpeechFormatType {
-    SFTInput = SPWF_INPUT.0,
-    SFTSREngine = SPWF_SRENGINE.0,
-}}
-FLAGS!{enum SpeechEmulationCompareFlags {
-    SECFIgnoreCase = 0x1,
-    SECFIgnoreKanaType = 0x10000,
-    SECFIgnoreWidth = 0x20000,
-    SECFNoSpecialChars = 0x20000000,
-    SECFEmulateResult = 0x40000000,
-    SECFDefault = SECFIgnoreCase.0 | SECFIgnoreKanaType.0 | SECFIgnoreWidth.0,
-}}
-ENUM!{enum DISPID_SpeechRecognizerStatus {
-    DISPID_SRSAudioStatus = 1,
-    DISPID_SRSCurrentStreamPosition,
-    DISPID_SRSCurrentStreamNumber,
-    DISPID_SRSNumberOfActiveRules,
-    DISPID_SRSClsidEngine,
-    DISPID_SRSSupportedLanguages,
-}}
-ENUM!{enum DISPID_SpeechRecoContext {
-    DISPID_SRCRecognizer = 1,
-    DISPID_SRCAudioInInterferenceStatus,
-    DISPID_SRCRequestedUIType,
-    DISPID_SRCVoice,
-    DISPID_SRAllowVoiceFormatMatchingOnNextSet,
-    DISPID_SRCVoicePurgeEvent,
-    DISPID_SRCEventInterests,
-    DISPID_SRCCmdMaxAlternates,
-    DISPID_SRCState,
-    DISPID_SRCRetainedAudio,
-    DISPID_SRCRetainedAudioFormat,
-    DISPID_SRCPause,
-    DISPID_SRCResume,
-    DISPID_SRCCreateGrammar,
-    DISPID_SRCCreateResultFromMemory,
-    DISPID_SRCBookmark,
-    DISPID_SRCSetAdaptationData,
-}}
-ENUM!{enum SpeechRetainedAudioOptions {
-    SRAONone = SPAO_NONE.0,
-    SRAORetainAudio = SPAO_RETAIN_AUDIO.0,
-}}
-ENUM!{enum SpeechBookmarkOptions {
-    SBONone = SPBO_NONE.0,
-    SBOPause = SPBO_PAUSE.0,
-}}
-ENUM!{enum SpeechInterference {
-    SINone = SPINTERFERENCE_NONE.0,
-    SINoise = SPINTERFERENCE_NOISE.0,
-    SINoSignal = SPINTERFERENCE_NOSIGNAL.0,
-    SITooLoud = SPINTERFERENCE_TOOLOUD.0,
-    SITooQuiet = SPINTERFERENCE_TOOQUIET.0,
-    SITooFast = SPINTERFERENCE_TOOFAST.0,
-    SITooSlow = SPINTERFERENCE_TOOSLOW.0,
-}}
-FLAGS!{enum SpeechRecoEvents {
-    SREStreamEnd = 1 << 0,
-    SRESoundStart = 1 << 1,
-    SRESoundEnd = 1 << 2,
-    SREPhraseStart = 1 << 3,
-    SRERecognition = 1 << 4,
-    SREHypothesis = 1 << 5,
-    SREBookmark = 1 << 6,
-    SREPropertyNumChange = 1 << 7,
-    SREPropertyStringChange = 1 << 8,
-    SREFalseRecognition = 1 << 9,
-    SREInterference = 1 << 10,
-    SRERequestUI = 1 << 11,
-    SREStateChange = 1 << 12,
-    SREAdaptation = 1 << 13,
-    SREStreamStart = 1 << 14,
-    SRERecoOtherContext = 1 << 15,
-    SREAudioLevel = 1 << 16,
-    SREPrivate = 1 << 18,
-    SREAllEvents = 0x5ffff,
-}}
-ENUM!{enum SpeechRecoContextState {
-    SRCS_Disabled = SPCS_DISABLED.0,
-    SRCS_Enabled = SPCS_ENABLED.0,
-}}
-ENUM!{enum DISPIDSPRG {
-    DISPID_SRGId = 1,
-    DISPID_SRGRecoContext,
-    DISPID_SRGState,
-    DISPID_SRGRules,
-    DISPID_SRGReset,
-    DISPID_SRGCommit,
-    DISPID_SRGCmdLoadFromFile,
-    DISPID_SRGCmdLoadFromObject,
-    DISPID_SRGCmdLoadFromResource,
-    DISPID_SRGCmdLoadFromMemory,
-    DISPID_SRGCmdLoadFromProprietaryGrammar,
-    DISPID_SRGCmdSetRuleState,
-    DISPID_SRGCmdSetRuleIdState,
-    DISPID_SRGDictationLoad,
-    DISPID_SRGDictationUnload,
-    DISPID_SRGDictationSetState,
-    DISPID_SRGSetWordSequenceData,
-    DISPID_SRGSetTextSelection,
-    DISPID_SRGIsPronounceable,
-}}
-ENUM!{enum SpeechLoadOption {
-    SLOStatic = SPLO_STATIC.0,
-    SLODynamic = SPLO_DYNAMIC.0,
-}}
-ENUM!{enum SpeechWordPronounceable {
-    SWPUnknownWordUnpronounceable = SPWP_UNKNOWN_WORD_UNPRONOUNCEABLE.0,
-    SWPUnknownWordPronounceable = SPWP_UNKNOWN_WORD_PRONOUNCEABLE.0,
-    SWPKnownWordPronounceable = SPWP_KNOWN_WORD_PRONOUNCEABLE.0,
-}}
-ENUM!{enum SpeechGrammarState {
-    SGSEnabled = SPGS_ENABLED.0,
-    SGSDisabled = SPGS_DISABLED.0,
-    SGSExclusive = SPGS_EXCLUSIVE.0,
-}}
-ENUM!{enum SpeechRuleState {
-    SGDSInactive = SPRS_INACTIVE.0,
-    SGDSActive = SPRS_ACTIVE.0,
-    SGDSActiveWithAutoPause = SPRS_ACTIVE_WITH_AUTO_PAUSE.0,
-    SGDSActiveUserDelimited = SPRS_ACTIVE_USER_DELIMITED.0,
-}}
-ENUM!{enum SpeechRuleAttributes {
-    SRATopLevel = SPRAF_TopLevel.0,
-    SRADefaultToActive = SPRAF_Active.0,
-    SRAExport = SPRAF_Export.0,
-    SRAImport = SPRAF_Import.0,
-    SRAInterpreter = SPRAF_Interpreter.0,
-    SRADynamic = SPRAF_Dynamic.0,
-    SRARoot = SPRAF_Root.0,
-}}
-ENUM!{enum SpeechGrammarWordType {
-    SGDisplay = SPWT_DISPLAY.0,
-    SGLexical = SPWT_LEXICAL.0,
-    SGPronounciation = SPWT_PRONUNCIATION.0,
-    SGLexicalNoSpecialChars = SPWT_LEXICAL_NO_SPECIAL_CHARS.0,
-}}
-ENUM!{enum DISPID_SpeechRecoContextEvents {
-    DISPID_SRCEStartStream = 1,
-    DISPID_SRCEEndStream,
-    DISPID_SRCEBookmark,
-    DISPID_SRCESoundStart,
-    DISPID_SRCESoundEnd,
-    DISPID_SRCEPhraseStart,
-    DISPID_SRCERecognition,
-    DISPID_SRCEHypothesis,
-    DISPID_SRCEPropertyNumberChange,
-    DISPID_SRCEPropertyStringChange,
-    DISPID_SRCEFalseRecognition,
-    DISPID_SRCEInterference,
-    DISPID_SRCERequestUI,
-    DISPID_SRCERecognizerStateChange,
-    DISPID_SRCEAdaptation,
-    DISPID_SRCERecognitionForOtherContext,
-    DISPID_SRCEAudioLevel,
-    DISPID_SRCEEnginePrivate,
-}}
-ENUM!{enum SpeechRecognitionType {
-    SRTStandard = 0,
-    SRTAutopause = SPREF_AutoPause.0,
-    SRTEmulated = SPREF_Emulated.0,
-    SRTSMLTimeout = SPREF_SMLTimeout.0,
-    SRTExtendableParse = SPREF_ExtendableParse.0,
-    SRTReSent = SPREF_ReSent.0,
-}}
-ENUM!{enum DISPID_SpeechGrammarRule {
-    DISPID_SGRAttributes = 1,
-    DISPID_SGRInitialState,
-    DISPID_SGRName,
-    DISPID_SGRId,
-    DISPID_SGRClear,
-    DISPID_SGRAddResource,
-    DISPID_SGRAddState,
-}}
-ENUM!{enum DISPID_SpeechGrammarRules {
-    DISPID_SGRsCount = 1,
-    DISPID_SGRsDynamic,
-    DISPID_SGRsAdd,
-    DISPID_SGRsCommit,
-    DISPID_SGRsCommitAndSave,
-    DISPID_SGRsFindRule,
-    DISPID_SGRsItem = ::DISPID_VALUE as u32,
-    DISPID_SGRs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechGrammarRuleState {
-    DISPID_SGRSRule = 1,
-    DISPID_SGRSTransitions,
-    DISPID_SGRSAddWordTransition,
-    DISPID_SGRSAddRuleTransition,
-    DISPID_SGRSAddSpecialTransition,
-}}
-ENUM!{enum SpeechSpecialTransitionType {
-    SSTTWildcard = 1,
-    SSTTDictation,
-    SSTTTextBuffer,
-}}
-ENUM!{enum DISPID_SpeechGrammarRuleStateTransitions {
-    DISPID_SGRSTsCount = 1,
-    DISPID_SGRSTsItem = ::DISPID_VALUE as u32,
-    DISPID_SGRSTs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechGrammarRuleStateTransition {
-    DISPID_SGRSTType = 1,
-    DISPID_SGRSTText,
-    DISPID_SGRSTRule,
-    DISPID_SGRSTWeight,
-    DISPID_SGRSTPropertyName,
-    DISPID_SGRSTPropertyId,
-    DISPID_SGRSTPropertyValue,
-    DISPID_SGRSTNextState,
-}}
-ENUM!{enum SpeechGrammarRuleStateTransitionType {
-    SGRSTTEpsilon = 0,
-    SGRSTTWord,
-    SGRSTTRule,
-    SGRSTTDictation,
-    SGRSTTWildcard,
-    SGRSTTTextBuffer,
-}}
-ENUM!{enum DISPIDSPTSI {
-    DISPIDSPTSI_ActiveOffset = 1,
-    DISPIDSPTSI_ActiveLength,
-    DISPIDSPTSI_SelectionOffset,
-    DISPIDSPTSI_SelectionLength,
-}}
-ENUM!{enum DISPID_SpeechRecoResult {
-    DISPID_SRRRecoContext = 1,
-    DISPID_SRRTimes,
-    DISPID_SRRAudioFormat,
-    DISPID_SRRPhraseInfo,
-    DISPID_SRRAlternates,
-    DISPID_SRRAudio,
-    DISPID_SRRSpeakAudio,
-    DISPID_SRRSaveToMemory,
-    DISPID_SRRDiscardResultInfo,
-}}
-ENUM!{enum SpeechDiscardType {
-    SDTProperty = SPDF_PROPERTY.0,
-    SDTReplacement = SPDF_REPLACEMENT.0,
-    SDTRule = SPDF_RULE.0,
-    SDTDisplayText = SPDF_DISPLAYTEXT.0,
-    SDTLexicalForm = SPDF_LEXICALFORM.0,
-    SDTPronunciation = SPDF_PRONUNCIATION.0,
-    SDTAudio = SPDF_AUDIO.0,
-    SDTAlternates = SPDF_ALTERNATES.0,
-    SDTAll = SPDF_ALL.0,
-}}
-ENUM!{enum DISPID_SpeechXMLRecoResult {
-    DISPID_SRRGetXMLResult,
-    DISPID_SRRGetXMLErrorInfo,
-}}
-ENUM!{enum DISPID_SpeechRecoResult2 {
-    DISPID_SRRSetTextFeedback,
-}}
-ENUM!{enum DISPID_SpeechPhraseBuilder {
-    DISPID_SPPBRestorePhraseFromMemory = 1,
-}}
-ENUM!{enum DISPID_SpeechRecoResultTimes {
-    DISPID_SRRTStreamTime = 1,
-    DISPID_SRRTLength,
-    DISPID_SRRTTickCount,
-    DISPID_SRRTOffsetFromStart,
-}}
-ENUM!{enum DISPID_SpeechPhraseAlternate {
-    DISPID_SPARecoResult = 1,
-    DISPID_SPAStartElementInResult,
-    DISPID_SPANumberOfElementsInResult,
-    DISPID_SPAPhraseInfo,
-    DISPID_SPACommit,
-}}
-ENUM!{enum DISPID_SpeechPhraseAlternates {
-    DISPID_SPAsCount = 1,
-    DISPID_SPAsItem = ::DISPID_VALUE as u32,
-    DISPID_SPAs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseInfo {
-    DISPID_SPILanguageId = 1,
-    DISPID_SPIGrammarId,
-    DISPID_SPIStartTime,
-    DISPID_SPIAudioStreamPosition,
-    DISPID_SPIAudioSizeBytes,
-    DISPID_SPIRetainedSizeBytes,
-    DISPID_SPIAudioSizeTime,
-    DISPID_SPIRule,
-    DISPID_SPIProperties,
-    DISPID_SPIElements,
-    DISPID_SPIReplacements,
-    DISPID_SPIEngineId,
-    DISPID_SPIEnginePrivateData,
-    DISPID_SPISaveToMemory,
-    DISPID_SPIGetText,
-    DISPID_SPIGetDisplayAttributes,
-}}
-ENUM!{enum DISPID_SpeechPhraseElement {
-    DISPID_SPEAudioTimeOffset = 1,
-    DISPID_SPEAudioSizeTime,
-    DISPID_SPEAudioStreamOffset,
-    DISPID_SPEAudioSizeBytes,
-    DISPID_SPERetainedStreamOffset,
-    DISPID_SPERetainedSizeBytes,
-    DISPID_SPEDisplayText,
-    DISPID_SPELexicalForm,
-    DISPID_SPEPronunciation,
-    DISPID_SPEDisplayAttributes,
-    DISPID_SPERequiredConfidence,
-    DISPID_SPEActualConfidence,
-    DISPID_SPEEngineConfidence,
-}}
-ENUM!{enum SpeechEngineConfidence {
-    SECLowConfidence = -1i32 as u32,
-    SECNormalConfidence = 0,
-    SECHighConfidence = 1,
-}}
-ENUM!{enum DISPID_SpeechPhraseElements {
-    DISPID_SPEsCount = 1,
-    DISPID_SPEsItem = ::DISPID_VALUE as u32,
-    DISPID_SPEs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseReplacement {
-    DISPID_SPRDisplayAttributes = 1,
-    DISPID_SPRText,
-    DISPID_SPRFirstElement,
-    DISPID_SPRNumberOfElements,
-}}
-ENUM!{enum DISPID_SpeechPhraseReplacements {
-    DISPID_SPRsCount = 1,
-    DISPID_SPRsItem = ::DISPID_VALUE as u32,
-    DISPID_SPRs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseProperty {
-    DISPID_SPPName = 1,
-    DISPID_SPPId,
-    DISPID_SPPValue,
-    DISPID_SPPFirstElement,
-    DISPID_SPPNumberOfElements,
-    DISPID_SPPEngineConfidence,
-    DISPID_SPPConfidence,
-    DISPID_SPPParent,
-    DISPID_SPPChildren,
-}}
-ENUM!{enum DISPID_SpeechPhraseProperties {
-    DISPID_SPPsCount = 1,
-    DISPID_SPPsItem = ::DISPID_VALUE as u32,
-    DISPID_SPPs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechPhraseRule {
-    DISPID_SPRuleName = 1,
-    DISPID_SPRuleId,
-    DISPID_SPRuleFirstElement,
-    DISPID_SPRuleNumberOfElements,
-    DISPID_SPRuleParent,
-    DISPID_SPRuleChildren,
-    DISPID_SPRuleConfidence,
-    DISPID_SPRuleEngineConfidence,
-}}
-ENUM!{enum DISPID_SpeechPhraseRules {
-    DISPID_SPRulesCount = 1,
-    DISPID_SPRulesItem = ::DISPID_VALUE as u32,
-    DISPID_SPRules_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechLexicon {
-    DISPID_SLGenerationId = 1,
-    DISPID_SLGetWords,
-    DISPID_SLAddPronunciation,
-    DISPID_SLAddPronunciationByPhoneIds,
-    DISPID_SLRemovePronunciation,
-    DISPID_SLRemovePronunciationByPhoneIds,
-    DISPID_SLGetPronunciations,
-    DISPID_SLGetGenerationChange,
-}}
-ENUM!{enum SpeechLexiconType {
-    SLTUser = eLEXTYPE_USER.0,
-    SLTApp = eLEXTYPE_APP.0,
-}}
-ENUM!{enum SpeechPartOfSpeech {
-    SPSNotOverriden = SPPS_NotOverriden.0,
-    SPSUnknown = SPPS_Unknown.0,
-    SPSNoun = SPPS_Noun.0,
-    SPSVerb = SPPS_Verb.0,
-    SPSModifier = SPPS_Modifier.0,
-    SPSFunction = SPPS_Function.0,
-    SPSInterjection = SPPS_Interjection.0,
-    SPSLMA = SPPS_LMA.0,
-    SPSSuppressWord = SPPS_SuppressWord.0,
-}}
-ENUM!{enum DISPID_SpeechLexiconWords {
-    DISPID_SLWsCount = 1,
-    DISPID_SLWsItem = ::DISPID_VALUE as u32,
-    DISPID_SLWs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum SpeechWordType {
-    SWTAdded = eWORDTYPE_ADDED.0,
-    SWTDeleted = eWORDTYPE_DELETED.0,
-}}
-ENUM!{enum DISPID_SpeechLexiconWord {
-    DISPID_SLWLangId = 1,
-    DISPID_SLWType,
-    DISPID_SLWWord,
-    DISPID_SLWPronunciations,
-}}
-ENUM!{enum DISPID_SpeechLexiconProns {
-    DISPID_SLPsCount = 1,
-    DISPID_SLPsItem = ::DISPID_VALUE as u32,
-    DISPID_SLPs_NewEnum = ::DISPID_NEWENUM as u32,
-}}
-ENUM!{enum DISPID_SpeechLexiconPronunciation {
-    DISPID_SLPType = 1,
-    DISPID_SLPLangId,
-    DISPID_SLPPartOfSpeech,
-    DISPID_SLPPhoneIds,
-    DISPID_SLPSymbolic,
-}}
-ENUM!{enum DISPID_SpeechPhoneConverter {
-    DISPID_SPCLangId = 1,
-    DISPID_SPCPhoneToId,
-    DISPID_SPCIdToPhone,
-}}
-RIDL!(
-interface ISpeechDataKey(ISpeechDataKeyVtbl): IDispatch(IDispatchVtbl) {
-    fn SetBinaryValue(&mut self, ValueName: ::BSTR, Value: ::VARIANT) -> ::HRESULT,
-    fn GetBinaryValue(&mut self, ValueName: ::BSTR, Value: *mut ::VARIANT) -> ::HRESULT,
-    fn SetStringValue(&mut self, ValueName: ::BSTR, Value: ::BSTR) -> ::HRESULT,
-    fn GetStringValue(&mut self, ValueName: ::BSTR, Value: *mut ::BSTR) -> ::HRESULT,
-    fn SetLongValue(&mut self, ValueName: ::BSTR, Value: ::c_long) -> ::HRESULT,
-    fn GetLongValue(&mut self, ValueName: ::BSTR, Value: *mut ::c_long) -> ::HRESULT,
-    fn OpenKey(&mut self, SubKeyName: ::BSTR, SubKey: *mut *mut ISpeechDataKey) -> ::HRESULT,
-    fn CreateKey(&mut self, SubKeyName: ::BSTR, SubKey: *mut *mut ISpeechDataKey) -> ::HRESULT,
-    fn DeleteKey(&mut self, SubKeyName: ::BSTR) -> ::HRESULT,
-    fn DeleteValue(&mut self, ValueName: ::BSTR) -> ::HRESULT,
-    fn EnumKeys(&mut self, Index: ::c_long, SubKeyName: *mut ::BSTR) -> ::HRESULT,
-    fn EnumValues(&mut self, Index: ::c_long, ValueName: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechObjectToken(ISpeechObjectTokenVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Id(&mut self, ObjectId: *mut ::BSTR) -> ::HRESULT,
-    fn get_DataKey(&mut self, DataKey: *mut *mut ISpeechDataKey) -> ::HRESULT,
-    fn get_Category(&mut self, Category: *mut *mut ISpeechObjectTokenCategory) -> ::HRESULT,
-    fn GetDescription(&mut self, Locale: ::c_long, Description: *mut ::BSTR) -> ::HRESULT,
-    fn SetId(
-        &mut self, Id: ::BSTR, CategoryId: ::BSTR, CreateIfNotExist: ::VARIANT_BOOL
-    ) -> ::HRESULT,
-    fn GetAttribute(&mut self, AttributeName: ::BSTR, AttributeValue: *mut ::BSTR) -> ::HRESULT,
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut ::IUnknown, ClsContext: SpeechTokenContext,
-        Object: *mut *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn Remove(&mut self, ObjectStorageCLSID: ::BSTR) -> ::HRESULT,
-    fn GetStorageFileName(
-        &mut self, ObjectStorageCLSID: ::BSTR, KeyName: ::BSTR, FileName: ::BSTR, Folder: ::BSTR,
-        FilePath: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn RemoveStorageFileName(
-        &mut self, ObjectStorageCLSID: ::BSTR, KeyName: ::BSTR, DeleteFile: ::VARIANT_BOOL
-    ) -> ::HRESULT,
-    fn IsUISupported(
-        &mut self, TypeOfUI: ::BSTR, ExtraData: *const ::VARIANT, Object: *mut ::IUnknown,
-        Supported: *mut ::VARIANT_BOOL
-    ) -> ::HRESULT,
-    fn DisplayUI(
-        &mut self, hWnd: ::c_long, Title: ::BSTR, TypeOfUI: ::BSTR, ExtraData: *const ::VARIANT,
-        Object: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn MatchesAttributes(&mut self, Attributes: ::BSTR, Matches: *mut ::VARIANT_BOOL) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechObjectTokens(ISpeechObjectTokensVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Count(&mut self, Count: *mut ::c_long) -> ::HRESULT,
-    fn Item(&mut self, Index: ::c_long, Token: *mut *mut ISpeechObjectToken) -> ::HRESULT,
-    fn get__NewEnum(&mut self, ppEnumVARIANT: *mut *mut ::IUnknown) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechObjectTokenCategory(ISpeechObjectTokenCategoryVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Id(&mut self, Id: *mut ::BSTR) -> ::HRESULT,
-    fn put_Default(&mut self, TokenId: ::BSTR) -> ::HRESULT,
-    fn get_Default(&mut self, TokenId: *mut ::BSTR) -> ::HRESULT,
-    fn SetId(&mut self, Id: ::BSTR, CreateIfNotExist: ::VARIANT_BOOL) -> ::HRESULT,
-    fn GetDataKey(
-        &mut self, Location: SpeechDataKeyLocation, DataKey: *mut *mut ISpeechDataKey
-    ) -> ::HRESULT,
-    fn EnumerateTokens(
-        &mut self, RequiredAttributes: ::BSTR, OptionalAttributes: ::BSTR,
-        Tokens: *mut *mut ISpeechObjectTokens
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechAudioBufferInfo(ISpeechAudioBufferInfoVtbl): IDispatch(IDispatchVtbl) {
-    fn get_MinNotification(&mut self, MinNotification: *mut ::c_long) -> ::HRESULT,
-    fn put_MinNotification(&mut self, MinNotification: ::c_long) -> ::HRESULT,
-    fn get_BufferSize(&mut self, BufferSize: *mut ::c_long) -> ::HRESULT,
-    fn put_BufferSize(&mut self, BufferSize: ::c_long) -> ::HRESULT,
-    fn get_EventBias(&mut self, EventBias: *mut ::c_long) -> ::HRESULT,
-    fn put_EventBias(&mut self, EventBias: ::c_long) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechAudioStatus(ISpeechAudioStatusVtbl): IDispatch(IDispatchVtbl) {
-    fn get_FreeBufferSpace(&mut self, FreeBufferSpace: *mut ::c_long) -> ::HRESULT,
-    fn get_NonBlockingIO(&mut self, NonBlockingIO: *mut ::c_long) -> ::HRESULT,
-    fn get_State(&mut self, State: *mut SpeechAudioState) -> ::HRESULT,
-    fn get_CurrentSeekPosition(&mut self, CurrentSeekPosition: *mut ::VARIANT) -> ::HRESULT,
-    fn get_CurrentDevicePosition(&mut self, CurrentDevicePosition: *mut ::VARIANT) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechAudioFormat(ISpeechAudioFormatVtbl): IDispatch(IDispatchVtbl) {
-    fn get_Type(&mut self, AudioFormat: *mut SpeechAudioFormatType) -> ::HRESULT,
-    fn put_Type(&mut self, AudioFormat: SpeechAudioFormatType) -> ::HRESULT,
-    fn get_Guid(&mut self, Guid: *mut ::BSTR) -> ::HRESULT,
-    fn put_Guid(&mut self, Guid: ::BSTR) -> ::HRESULT,
-    fn GetWaveFormatEx(&mut self, SpeechWaveFormatEx: *mut *mut ISpeechWaveFormatEx) -> ::HRESULT,
-    fn SetWaveFormatEx(&mut self, SpeechWaveFormatEx: *mut ISpeechWaveFormatEx) -> ::HRESULT
-}
-);
-RIDL!(
-interface ISpeechWaveFormatEx(ISpeechWaveFormatExVtbl): IDispatch(IDispatchVtbl) {
-    fn get_FormatTag(&mut self, FormatTag: *mut ::c_short) -> ::HRESULT,
-    fn put_FormatTag(&mut self, FormatTag: ::c_short) -> ::HRESULT,
-    fn get_Channels(&mut self, Channels: *mut ::c_short) -> ::HRESULT,
-    fn put_Channels(&mut self, Channels: ::c_short) -> ::HRESULT,
-    fn get_SamplesPerSec(&mut self, SamplesPerSec: *mut ::c_long) -> ::HRESULT,
-    fn put_SamplesPerSec(&mut self, SamplesPerSec: ::c_long) -> ::HRESULT,
-    fn get_AvgBytesPerSec(&mut self, AvgBytesPerSec: *mut ::c_long) -> ::HRESULT,
-    fn put_AvgBytesPerSec(&mut self, AvgBytesPerSec: ::c_long) -> ::HRESULT,
-    fn get_BlockAlign(&mut self, BlockAlign: *mut ::c_short) -> ::HRESULT,
-    fn put_BlockAlign(&mut self, BlockAlign: ::c_short) -> ::HRESULT,
-    fn get_BitsPerSample(&mut self, BitsPerSample: *mut ::c_short) -> ::HRESULT,
-    fn put_BitsPerSample(&mut self, BitsPerSample: ::c_short) -> ::HRESULT,
-    fn get_ExtraData(&mut self, ExtraData: *mut ::VARIANT) -> ::HRESULT,
-    fn put_ExtraData(&mut self, ExtraData: ::VARIANT) -> ::HRESULT
-}
-);
diff --git a/vendor/winapi-0.2.8/src/schannel.rs b/vendor/winapi-0.2.8/src/schannel.rs
deleted file mode 100644
index d57aec82fe..0000000000
--- a/vendor/winapi-0.2.8/src/schannel.rs
+++ /dev/null
@@ -1,333 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Public Definitions for SCHANNEL Security Provider
-pub const UNISP_NAME: &'static str = "Microsoft Unified Security Protocol Provider";
-pub const SSL2SP_NAME: &'static str = "Microsoft SSL 2.0";
-pub const SSL3SP_NAME: &'static str = "Microsoft SSL 3.0";
-pub const TLS1SP_NAME: &'static str = "Microsoft TLS 1.0";
-pub const PCT1SP_NAME: &'static str = "Microsoft PCT 1.0";
-pub const SCHANNEL_NAME: &'static str = "Schannel";
-ENUM!{enum eTlsSignatureAlgorithm {
-    TlsSignatureAlgorithm_Anonymous = 0,
-    TlsSignatureAlgorithm_Rsa = 1,
-    TlsSignatureAlgorithm_Dsa = 2,
-    TlsSignatureAlgorithm_Ecdsa = 3,
-}}
-ENUM!{enum eTlsHashAlgorithm {
-    TlsHashAlgorithm_None = 0,
-    TlsHashAlgorithm_Md5 = 1,
-    TlsHashAlgorithm_Sha1 = 2,
-    TlsHashAlgorithm_Sha224 = 3,
-    TlsHashAlgorithm_Sha256 = 4,
-    TlsHashAlgorithm_Sha384 = 5,
-    TlsHashAlgorithm_Sha512 = 6,
-}}
-pub const UNISP_RPC_ID: ::DWORD = 14;
-STRUCT!{struct SecPkgContext_RemoteCredentialInfo {
-    cbCertificateChain: ::DWORD,
-    pbCertificateChain: ::PBYTE,
-    cCertificates: ::DWORD,
-    fFlags: ::DWORD,
-    dwBits: ::DWORD,
-}}
-pub type PSecPkgContext_RemoteCredentialInfo = *mut SecPkgContext_RemoteCredentialInfo;
-pub type SecPkgContext_RemoteCredenitalInfo = SecPkgContext_RemoteCredentialInfo;
-pub type PSecPkgContext_RemoteCredenitalInfo = *mut SecPkgContext_RemoteCredentialInfo;
-pub const RCRED_STATUS_NOCRED: ::DWORD = 0x00000000;
-pub const RCRED_CRED_EXISTS: ::DWORD = 0x00000001;
-pub const RCRED_STATUS_UNKNOWN_ISSUER: ::DWORD = 0x00000002;
-STRUCT!{struct SecPkgContext_LocalCredentialInfo {
-    cbCertificateChain: ::DWORD,
-    pbCertificateChain: ::PBYTE,
-    cCertificates: ::DWORD,
-    fFlags: ::DWORD,
-    dwBits: ::DWORD,
-}}
-pub type PSecPkgContext_LocalCredentialInfo = *mut SecPkgContext_LocalCredentialInfo;
-pub type SecPkgContext_LocalCredenitalInfo = SecPkgContext_LocalCredentialInfo;
-pub type PSecPkgContext_LocalCredenitalInfo = *mut SecPkgContext_LocalCredentialInfo;
-pub const LCRED_STATUS_NOCRED: ::DWORD = 0x00000000;
-pub const LCRED_CRED_EXISTS: ::DWORD = 0x00000001;
-pub const LCRED_STATUS_UNKNOWN_ISSUER: ::DWORD = 0x00000002;
-STRUCT!{struct SecPkgContext_ClientCertPolicyResult {
-    dwPolicyResult: ::HRESULT,
-    guidPolicyId: ::GUID,
-}}
-pub type PSecPkgContext_ClientCertPolicyResult = *mut SecPkgContext_ClientCertPolicyResult;
-STRUCT!{struct SecPkgContext_IssuerListInfoEx {
-    aIssuers: ::PCERT_NAME_BLOB,
-    cIssuers: ::DWORD,
-}}
-pub type PSecPkgContext_IssuerListInfoEx = *mut SecPkgContext_IssuerListInfoEx;
-STRUCT!{struct SecPkgContext_ConnectionInfo {
-    dwProtocol: ::DWORD,
-    aiCipher: ::ALG_ID,
-    dwCipherStrength: ::DWORD,
-    aiHash: ::ALG_ID,
-    dwHashStrength: ::DWORD,
-    aiExch: ::ALG_ID,
-    dwExchStrength: ::DWORD,
-}}
-pub type PSecPkgContext_ConnectionInfo = *mut SecPkgContext_ConnectionInfo;
-pub const SZ_ALG_MAX_SIZE: usize = 64;
-pub const SECPKGCONTEXT_CIPHERINFO_V1: ::DWORD = 1;
-STRUCT!{nodebug struct SecPkgContext_CipherInfo {
-    dwVersion: ::DWORD,
-    dwProtocol: ::DWORD,
-    dwCipherSuite: ::DWORD,
-    dwBaseCipherSuite: ::DWORD,
-    szCipherSuite: [::WCHAR; SZ_ALG_MAX_SIZE],
-    szCipher: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwCipherLen: ::DWORD,
-    dwCipherBlockLen: ::DWORD,
-    szHash: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwHashLen: ::DWORD,
-    szExchange: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwMinExchangeLen: ::DWORD,
-    dwMaxExchangeLen: ::DWORD,
-    szCertificate: [::WCHAR; SZ_ALG_MAX_SIZE],
-    dwKeyType: ::DWORD,
-}}
-pub type PSecPkgContext_CipherInfo = *mut SecPkgContext_CipherInfo;
-STRUCT!{nodebug struct SecPkgContext_EapKeyBlock {
-    rgbKeys: [::BYTE; 128],
-    rgbIVs: [::BYTE; 64],
-}}
-pub type PSecPkgContext_EapKeyBlock = *mut SecPkgContext_EapKeyBlock;
-STRUCT!{struct SecPkgContext_MappedCredAttr {
-    dwAttribute: ::DWORD,
-    pvBuffer: ::PVOID,
-}}
-pub type PSecPkgContext_MappedCredAttr = *mut SecPkgContext_MappedCredAttr;
-pub const SSL_SESSION_RECONNECT: ::DWORD = 1;
-STRUCT!{struct SecPkgContext_SessionInfo {
-    dwFlags: ::DWORD,
-    cbSessionId: ::DWORD,
-    rgbSessionId: [::BYTE; 32],
-}}
-pub type PSecPkgContext_SessionInfo = *mut SecPkgContext_SessionInfo;
-STRUCT!{struct SecPkgContext_SessionAppData {
-    dwFlags: ::DWORD,
-    cbAppData: ::DWORD,
-    pbAppData: ::PBYTE,
-}}
-pub type PSecPkgContext_SessionAppData = *mut SecPkgContext_SessionAppData;
-STRUCT!{struct SecPkgContext_EapPrfInfo {
-    dwVersion: ::DWORD,
-    cbPrfData: ::DWORD,
-    pbPrfData: ::PBYTE,
-}}
-pub type PSecPkgContext_EapPrfInfo = *mut SecPkgContext_EapPrfInfo;
-STRUCT!{struct SecPkgContext_SupportedSignatures {
-    cSignatureAndHashAlgorithms: ::WORD,
-    pSignatureAndHashAlgorithms: *mut ::WORD,
-}}
-pub type PSecPkgContext_SupportedSignatures = *mut SecPkgContext_SupportedSignatures;
-STRUCT!{struct SecPkgContext_Certificates {
-    cCertificates: ::DWORD,
-    cbCertificateChain: ::DWORD,
-    pbCertificateChain: ::PBYTE,
-}}
-pub type PSecPkgContext_Certificates = *mut SecPkgContext_Certificates;
-STRUCT!{struct SecPkgContext_CertInfo {
-    dwVersion: ::DWORD,
-    cbSubjectName: ::DWORD,
-    pwszSubjectName: ::LPWSTR,
-    cbIssuerName: ::DWORD,
-    pwszIssuerName: ::LPWSTR,
-    dwKeySize: ::DWORD,
-}}
-pub type PSecPkgContext_CertInfo = *mut SecPkgContext_CertInfo;
-pub const KERN_CONTEXT_CERT_INFO_V1: ::DWORD = 0x00000000;
-STRUCT!{struct SecPkgContext_UiInfo {
-    hParentWindow: ::HWND,
-}}
-pub type PSecPkgContext_UiInfo = *mut SecPkgContext_UiInfo;
-STRUCT!{struct SecPkgContext_EarlyStart {
-    dwEarlyStartFlags: ::DWORD,
-}}
-pub type PSecPkgContext_EarlyStart = *mut SecPkgContext_EarlyStart;
-pub const ENABLE_TLS_CLIENT_EARLY_START: ::DWORD = 0x00000001;
-pub const SCH_CRED_V1: ::DWORD = 0x00000001;
-pub const SCH_CRED_V2: ::DWORD = 0x00000002;
-pub const SCH_CRED_VERSION: ::DWORD = 0x00000002;
-pub const SCH_CRED_V3: ::DWORD = 0x00000003;
-pub const SCHANNEL_CRED_VERSION: ::DWORD = 0x00000004;
-pub enum _HMAPPER {}
-STRUCT!{struct SCHANNEL_CRED {
-    dwVersion: ::DWORD,
-    cCreds: ::DWORD,
-    paCred: *mut ::PCCERT_CONTEXT,
-    hRootStore: ::HCERTSTORE,
-    cMappers: ::DWORD,
-    aphMappers: *mut *mut _HMAPPER,
-    cSupportedAlgs: ::DWORD,
-    palgSupportedAlgs: *mut ::ALG_ID,
-    grbitEnabledProtocols: ::DWORD,
-    dwMinimumCipherStrength: ::DWORD,
-    dwMaximumCipherStrength: ::DWORD,
-    dwSessionLifespan: ::DWORD,
-    dwFlags: ::DWORD,
-    dwCredFormat: ::DWORD,
-}}
-pub type PSCHANNEL_CRED = *mut SCHANNEL_CRED;
-pub const SCH_CRED_FORMAT_CERT_CONTEXT: ::DWORD = 0x00000000;
-pub const SCH_CRED_FORMAT_CERT_HASH: ::DWORD = 0x00000001;
-pub const SCH_CRED_FORMAT_CERT_HASH_STORE: ::DWORD = 0x00000002;
-pub const SCH_CRED_MAX_STORE_NAME_SIZE: usize = 128;
-pub const SCH_CRED_MAX_SUPPORTED_ALGS: ::DWORD = 256;
-pub const SCH_CRED_MAX_SUPPORTED_CERTS: ::DWORD = 100;
-STRUCT!{struct SCHANNEL_CERT_HASH {
-    dwLength: ::DWORD,
-    dwFlags: ::DWORD,
-    hProv: ::HCRYPTPROV,
-    ShaHash: [::BYTE; 20],
-}}
-pub type PSCHANNEL_CERT_HASH = *mut SCHANNEL_CERT_HASH;
-STRUCT!{nodebug struct SCHANNEL_CERT_HASH_STORE {
-    dwLength: ::DWORD,
-    dwFlags: ::DWORD,
-    hProv: ::HCRYPTPROV,
-    ShaHash: [::BYTE; 20],
-    pwszStoreName: [::WCHAR; SCH_CRED_MAX_STORE_NAME_SIZE],
-}}
-pub type PSCHANNEL_CERT_HASH_STORE = *mut SCHANNEL_CERT_HASH_STORE;
-pub const SCH_MACHINE_CERT_HASH: ::DWORD = 0x00000001;
-pub const SCH_CRED_NO_SYSTEM_MAPPER: ::DWORD = 0x00000002;
-pub const SCH_CRED_NO_SERVERNAME_CHECK: ::DWORD = 0x00000004;
-pub const SCH_CRED_MANUAL_CRED_VALIDATION: ::DWORD = 0x00000008;
-pub const SCH_CRED_NO_DEFAULT_CREDS: ::DWORD = 0x00000010;
-pub const SCH_CRED_AUTO_CRED_VALIDATION: ::DWORD = 0x00000020;
-pub const SCH_CRED_USE_DEFAULT_CREDS: ::DWORD = 0x00000040;
-pub const SCH_CRED_DISABLE_RECONNECTS: ::DWORD = 0x00000080;
-pub const SCH_CRED_REVOCATION_CHECK_END_CERT: ::DWORD = 0x00000100;
-pub const SCH_CRED_REVOCATION_CHECK_CHAIN: ::DWORD = 0x00000200;
-pub const SCH_CRED_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT: ::DWORD = 0x00000400;
-pub const SCH_CRED_IGNORE_NO_REVOCATION_CHECK: ::DWORD = 0x00000800;
-pub const SCH_CRED_IGNORE_REVOCATION_OFFLINE: ::DWORD = 0x00001000;
-pub const SCH_CRED_RESTRICTED_ROOTS: ::DWORD = 0x00002000;
-pub const SCH_CRED_REVOCATION_CHECK_CACHE_ONLY: ::DWORD = 0x00004000;
-pub const SCH_CRED_CACHE_ONLY_URL_RETRIEVAL: ::DWORD = 0x00008000;
-pub const SCH_CRED_MEMORY_STORE_CERT: ::DWORD = 0x00010000;
-pub const SCH_CRED_CACHE_ONLY_URL_RETRIEVAL_ON_CREATE: ::DWORD = 0x00020000;
-pub const SCH_SEND_ROOT_CERT: ::DWORD = 0x00040000;
-pub const SCH_CRED_SNI_CREDENTIAL: ::DWORD = 0x00080000;
-pub const SCH_CRED_SNI_ENABLE_OCSP: ::DWORD = 0x00100000;
-pub const SCH_SEND_AUX_RECORD: ::DWORD = 0x00200000;
-pub const SCH_USE_STRONG_CRYPTO: ::DWORD = 0x00400000;
-pub const SCHANNEL_RENEGOTIATE: ::DWORD = 0;
-pub const SCHANNEL_SHUTDOWN: ::DWORD = 1;
-pub const SCHANNEL_ALERT: ::DWORD = 2;
-pub const SCHANNEL_SESSION: ::DWORD = 3;
-STRUCT!{struct SCHANNEL_ALERT_TOKEN {
-    dwTokenType: ::DWORD,
-    dwAlertType: ::DWORD,
-    dwAlertNumber: ::DWORD,
-}}
-pub const TLS1_ALERT_WARNING: ::DWORD = 1;
-pub const TLS1_ALERT_FATAL: ::DWORD = 2;
-pub const TLS1_ALERT_CLOSE_NOTIFY: ::DWORD = 0;
-pub const TLS1_ALERT_UNEXPECTED_MESSAGE: ::DWORD = 10;
-pub const TLS1_ALERT_BAD_RECORD_MAC: ::DWORD = 20;
-pub const TLS1_ALERT_DECRYPTION_FAILED: ::DWORD = 21;
-pub const TLS1_ALERT_RECORD_OVERFLOW: ::DWORD = 22;
-pub const TLS1_ALERT_DECOMPRESSION_FAIL: ::DWORD = 30;
-pub const TLS1_ALERT_HANDSHAKE_FAILURE: ::DWORD = 40;
-pub const TLS1_ALERT_BAD_CERTIFICATE: ::DWORD = 42;
-pub const TLS1_ALERT_UNSUPPORTED_CERT: ::DWORD = 43;
-pub const TLS1_ALERT_CERTIFICATE_REVOKED: ::DWORD = 44;
-pub const TLS1_ALERT_CERTIFICATE_EXPIRED: ::DWORD = 45;
-pub const TLS1_ALERT_CERTIFICATE_UNKNOWN: ::DWORD = 46;
-pub const TLS1_ALERT_ILLEGAL_PARAMETER: ::DWORD = 47;
-pub const TLS1_ALERT_UNKNOWN_CA: ::DWORD = 48;
-pub const TLS1_ALERT_ACCESS_DENIED: ::DWORD = 49;
-pub const TLS1_ALERT_DECODE_ERROR: ::DWORD = 50;
-pub const TLS1_ALERT_DECRYPT_ERROR: ::DWORD = 51;
-pub const TLS1_ALERT_EXPORT_RESTRICTION: ::DWORD = 60;
-pub const TLS1_ALERT_PROTOCOL_VERSION: ::DWORD = 70;
-pub const TLS1_ALERT_INSUFFIENT_SECURITY: ::DWORD = 71;
-pub const TLS1_ALERT_INTERNAL_ERROR: ::DWORD = 80;
-pub const TLS1_ALERT_USER_CANCELED: ::DWORD = 90;
-pub const TLS1_ALERT_NO_RENEGOTIATION: ::DWORD = 100;
-pub const TLS1_ALERT_UNSUPPORTED_EXT: ::DWORD = 110;
-pub const TLS1_ALERT_NO_APP_PROTOCOL: ::DWORD = 120;
-pub const SSL_SESSION_ENABLE_RECONNECTS: ::DWORD = 1;
-pub const SSL_SESSION_DISABLE_RECONNECTS: ::DWORD = 2;
-STRUCT!{struct SCHANNEL_SESSION_TOKEN {
-    dwTokenType: ::DWORD,
-    dwFlags: ::DWORD,
-}}
-STRUCT!{nodebug struct SCHANNEL_CLIENT_SIGNATURE {
-    cbLength: ::DWORD,
-    aiHash: ::ALG_ID,
-    cbHash: ::DWORD,
-    HashValue: [::BYTE; 36],
-    CertThumbprint: [::BYTE; 20],
-}}
-pub type PSCHANNEL_CLIENT_SIGNATURE = *mut SCHANNEL_CLIENT_SIGNATURE;
-pub const SP_PROT_PCT1_SERVER: ::DWORD = 0x00000001;
-pub const SP_PROT_PCT1_CLIENT: ::DWORD = 0x00000002;
-pub const SP_PROT_PCT1: ::DWORD = SP_PROT_PCT1_SERVER | SP_PROT_PCT1_CLIENT;
-pub const SP_PROT_SSL2_SERVER: ::DWORD = 0x00000004;
-pub const SP_PROT_SSL2_CLIENT: ::DWORD = 0x00000008;
-pub const SP_PROT_SSL2: ::DWORD = SP_PROT_SSL2_SERVER | SP_PROT_SSL2_CLIENT;
-pub const SP_PROT_SSL3_SERVER: ::DWORD = 0x00000010;
-pub const SP_PROT_SSL3_CLIENT: ::DWORD = 0x00000020;
-pub const SP_PROT_SSL3: ::DWORD = SP_PROT_SSL3_SERVER | SP_PROT_SSL3_CLIENT;
-pub const SP_PROT_TLS1_SERVER: ::DWORD = 0x00000040;
-pub const SP_PROT_TLS1_CLIENT: ::DWORD = 0x00000080;
-pub const SP_PROT_TLS1: ::DWORD = SP_PROT_TLS1_SERVER | SP_PROT_TLS1_CLIENT;
-pub const SP_PROT_SSL3TLS1_CLIENTS: ::DWORD = SP_PROT_TLS1_CLIENT | SP_PROT_SSL3_CLIENT;
-pub const SP_PROT_SSL3TLS1_SERVERS: ::DWORD = SP_PROT_TLS1_SERVER | SP_PROT_SSL3_SERVER;
-pub const SP_PROT_SSL3TLS1: ::DWORD = SP_PROT_SSL3 | SP_PROT_TLS1;
-pub const SP_PROT_UNI_SERVER: ::DWORD = 0x40000000;
-pub const SP_PROT_UNI_CLIENT: ::DWORD = 0x80000000;
-pub const SP_PROT_UNI: ::DWORD = SP_PROT_UNI_SERVER | SP_PROT_UNI_CLIENT;
-pub const SP_PROT_ALL: ::DWORD = 0xffffffff;
-pub const SP_PROT_NONE: ::DWORD = 0;
-pub const SP_PROT_CLIENTS: ::DWORD = SP_PROT_PCT1_CLIENT | SP_PROT_SSL2_CLIENT
-    | SP_PROT_SSL3_CLIENT | SP_PROT_UNI_CLIENT | SP_PROT_TLS1_CLIENT;
-pub const SP_PROT_SERVERS: ::DWORD = SP_PROT_PCT1_SERVER | SP_PROT_SSL2_SERVER
-    | SP_PROT_SSL3_SERVER | SP_PROT_UNI_SERVER | SP_PROT_TLS1_SERVER;
-pub const SP_PROT_TLS1_0_SERVER: ::DWORD = SP_PROT_TLS1_SERVER;
-pub const SP_PROT_TLS1_0_CLIENT: ::DWORD = SP_PROT_TLS1_CLIENT;
-pub const SP_PROT_TLS1_0: ::DWORD = SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_0_CLIENT;
-pub const SP_PROT_TLS1_1_SERVER: ::DWORD = 0x00000100;
-pub const SP_PROT_TLS1_1_CLIENT: ::DWORD = 0x00000200;
-pub const SP_PROT_TLS1_1: ::DWORD = SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_1_CLIENT;
-pub const SP_PROT_TLS1_2_SERVER: ::DWORD = 0x00000400;
-pub const SP_PROT_TLS1_2_CLIENT: ::DWORD = 0x00000800;
-pub const SP_PROT_TLS1_2: ::DWORD = SP_PROT_TLS1_2_SERVER | SP_PROT_TLS1_2_CLIENT;
-pub const SP_PROT_DTLS_SERVER: ::DWORD = 0x00010000;
-pub const SP_PROT_DTLS_CLIENT: ::DWORD = 0x00020000;
-pub const SP_PROT_DTLS: ::DWORD = SP_PROT_DTLS_SERVER | SP_PROT_DTLS_CLIENT;
-pub const SP_PROT_DTLS1_0_SERVER: ::DWORD = SP_PROT_DTLS_SERVER;
-pub const SP_PROT_DTLS1_0_CLIENT: ::DWORD = SP_PROT_DTLS_CLIENT;
-pub const SP_PROT_DTLS1_0: ::DWORD = SP_PROT_DTLS1_0_SERVER | SP_PROT_DTLS1_0_CLIENT;
-pub const SP_PROT_DTLS1_X_SERVER: ::DWORD = SP_PROT_DTLS1_0_SERVER;
-pub const SP_PROT_DTLS1_X_CLIENT: ::DWORD = SP_PROT_DTLS1_0_CLIENT;
-pub const SP_PROT_DTLS1_X: ::DWORD = SP_PROT_DTLS1_X_SERVER | SP_PROT_DTLS1_X_CLIENT;
-pub const SP_PROT_TLS1_1PLUS_SERVER: ::DWORD = SP_PROT_TLS1_1_SERVER | SP_PROT_TLS1_2_SERVER;
-pub const SP_PROT_TLS1_1PLUS_CLIENT: ::DWORD = SP_PROT_TLS1_1_CLIENT | SP_PROT_TLS1_2_CLIENT;
-pub const SP_PROT_TLS1_1PLUS: ::DWORD = SP_PROT_TLS1_1PLUS_SERVER | SP_PROT_TLS1_1PLUS_CLIENT;
-pub const SP_PROT_TLS1_X_SERVER: ::DWORD = SP_PROT_TLS1_0_SERVER | SP_PROT_TLS1_1_SERVER
-    | SP_PROT_TLS1_2_SERVER;
-pub const SP_PROT_TLS1_X_CLIENT: ::DWORD = SP_PROT_TLS1_0_CLIENT | SP_PROT_TLS1_1_CLIENT
-    | SP_PROT_TLS1_2_CLIENT;
-pub const SP_PROT_TLS1_X: ::DWORD = SP_PROT_TLS1_X_SERVER | SP_PROT_TLS1_X_CLIENT;
-pub const SP_PROT_SSL3TLS1_X_CLIENTS: ::DWORD = SP_PROT_TLS1_X_CLIENT | SP_PROT_SSL3_CLIENT;
-pub const SP_PROT_SSL3TLS1_X_SERVERS: ::DWORD = SP_PROT_TLS1_X_SERVER | SP_PROT_SSL3_SERVER;
-pub const SP_PROT_SSL3TLS1_X: ::DWORD = SP_PROT_SSL3 | SP_PROT_TLS1_X;
-pub const SP_PROT_X_CLIENTS: ::DWORD = SP_PROT_CLIENTS | SP_PROT_TLS1_X_CLIENT
-    | SP_PROT_DTLS1_X_CLIENT;
-pub const SP_PROT_X_SERVERS: ::DWORD = SP_PROT_SERVERS | SP_PROT_TLS1_X_SERVER
-    | SP_PROT_DTLS1_X_SERVER;
-//716
-pub const SCHANNEL_SECRET_TYPE_CAPI: ::DWORD = 0x00000001;
-pub const SCHANNEL_SECRET_PRIVKEY: ::DWORD = 0x00000002;
-pub const SCH_CRED_X509_CERTCHAIN: ::DWORD = 0x00000001;
-pub const SCH_CRED_X509_CAPI: ::DWORD = 0x00000002;
-pub const SCH_CRED_CERT_CONTEXT: ::DWORD = 0x00000003;
-//838
-pub const SSL_CRACK_CERTIFICATE_NAME: &'static str = "SslCrackCertificate";
-pub const SSL_FREE_CERTIFICATE_NAME: &'static str = "SslFreeCertificate";
diff --git a/vendor/winapi-0.2.8/src/servprov.rs b/vendor/winapi-0.2.8/src/servprov.rs
deleted file mode 100644
index 8b37ba8b6c..0000000000
--- a/vendor/winapi-0.2.8/src/servprov.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of servprov.h
-pub type LPSERVICEPROVIDER = *mut IServiceProvider;
-RIDL!(
-interface IServiceProvider(IServiceProviderVtbl): IUnknown(IUnknownVtbl) {
-    fn QueryService(
-        &mut self, guidService: ::REFGUID, riid: ::REFIID, ppvObject: *mut *mut ::c_void
-    ) -> ::HRESULT
-}
-);
diff --git a/vendor/winapi-0.2.8/src/setupapi.rs b/vendor/winapi-0.2.8/src/setupapi.rs
deleted file mode 100644
index cf3149d79f..0000000000
--- a/vendor/winapi-0.2.8/src/setupapi.rs
+++ /dev/null
@@ -1,1301 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Windows NT Setup and Device Installer services
-pub const LINE_LEN: usize = 256;
-pub const MAX_INF_STRING_LENGTH: usize = 4096;
-pub const MAX_INF_SECTION_NAME_LENGTH: usize = 255;
-pub const MAX_TITLE_LEN: usize = 60;
-pub const MAX_INSTRUCTION_LEN: usize = 256;
-pub const MAX_LABEL_LEN: usize = 30;
-pub const MAX_SERVICE_NAME_LEN: usize = 256;
-pub const MAX_SUBTITLE_LEN: usize = 256;
-pub const SP_MAX_MACHINENAME_LENGTH: usize = ::MAX_PATH + 3;
-pub type HINF = ::PVOID;
-STRUCT!{struct INFCONTEXT {
-    Inf: ::PVOID,
-    CurrentInf: ::PVOID,
-    Section: ::UINT,
-    Line: ::UINT,
-}}
-pub type PINFCONTEXT = *mut INFCONTEXT;
-STRUCT!{struct SP_INF_INFORMATION {
-    InfStyle: ::DWORD,
-    InfCount: ::DWORD,
-    VersionData: [::BYTE; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_INF_INFORMATION = *mut SP_INF_INFORMATION;
-STRUCT!{struct SP_ALTPLATFORM_INFO_V2 {
-    cbSize: ::DWORD,
-    Platform: ::DWORD,
-    MajorVersion: ::DWORD,
-    MinorVersion: ::DWORD,
-    ProcessorArchitecture: ::WORD,
-    Reserved: ::WORD,
-    FirstValidatedMajorVersion: ::DWORD,
-    FirstValidatedMinorVersion: ::DWORD,
-}}
-UNION!(SP_ALTPLATFORM_INFO_V2, Reserved, Flags, Flags_mut, ::WORD);
-pub type PSP_ALTPLATFORM_INFO_V2 = *mut SP_ALTPLATFORM_INFO_V2;
-STRUCT!{struct SP_ALTPLATFORM_INFO_V1 {
-    cbSize: ::DWORD,
-    Platform: ::DWORD,
-    MajorVersion: ::DWORD,
-    MinorVersion: ::DWORD,
-    ProcessorArchitecture: ::WORD,
-    Reserved: ::WORD,
-}}
-pub type PSP_ALTPLATFORM_INFO_V1 = *mut SP_ALTPLATFORM_INFO_V1;
-pub type SP_ALTPLATFORM_INFO = SP_ALTPLATFORM_INFO_V2;
-pub type PSP_ALTPLATFORM_INFO = PSP_ALTPLATFORM_INFO_V2;
-pub const SP_ALTPLATFORM_FLAGS_VERSION_RANGE: ::WORD = 0x0001;
-STRUCT!{nodebug struct SP_ORIGINAL_FILE_INFO_A {
-    cbSize: ::DWORD,
-    OriginalInfName: [::CHAR; ::MAX_PATH],
-    OriginalCatalogName: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_ORIGINAL_FILE_INFO_A = *mut SP_ORIGINAL_FILE_INFO_A;
-STRUCT!{nodebug struct SP_ORIGINAL_FILE_INFO_W {
-    cbSize: ::DWORD,
-    OriginalInfName: [::WCHAR; ::MAX_PATH],
-    OriginalCatalogName: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_ORIGINAL_FILE_INFO_W = *mut SP_ORIGINAL_FILE_INFO_W;
-pub const INF_STYLE_NONE: ::DWORD = 0x00000000;
-pub const INF_STYLE_OLDNT: ::DWORD = 0x00000001;
-pub const INF_STYLE_WIN4: ::DWORD = 0x00000002;
-pub const INF_STYLE_CACHE_ENABLE: ::DWORD = 0x00000010;
-pub const INF_STYLE_CACHE_DISABLE: ::DWORD = 0x00000020;
-pub const INF_STYLE_CACHE_IGNORE: ::DWORD = 0x00000040;
-pub const DIRID_ABSOLUTE: ::DWORD = -1i32 as ::DWORD;
-pub const DIRID_ABSOLUTE_16BIT: ::DWORD = 0xffff;
-pub const DIRID_NULL: ::DWORD = 0;
-pub const DIRID_SRCPATH: ::DWORD = 1;
-pub const DIRID_WINDOWS: ::DWORD = 10;
-pub const DIRID_SYSTEM: ::DWORD = 11;
-pub const DIRID_DRIVERS: ::DWORD = 12;
-pub const DIRID_IOSUBSYS: ::DWORD = DIRID_DRIVERS;
-pub const DIRID_DRIVER_STORE: ::DWORD = 13;
-pub const DIRID_INF: ::DWORD = 17;
-pub const DIRID_HELP: ::DWORD = 18;
-pub const DIRID_FONTS: ::DWORD = 20;
-pub const DIRID_VIEWERS: ::DWORD = 21;
-pub const DIRID_COLOR: ::DWORD = 23;
-pub const DIRID_APPS: ::DWORD = 24;
-pub const DIRID_SHARED: ::DWORD = 25;
-pub const DIRID_BOOT: ::DWORD = 30;
-pub const DIRID_SYSTEM16: ::DWORD = 50;
-pub const DIRID_SPOOL: ::DWORD = 51;
-pub const DIRID_SPOOLDRIVERS: ::DWORD = 52;
-pub const DIRID_USERPROFILE: ::DWORD = 53;
-pub const DIRID_LOADER: ::DWORD = 54;
-pub const DIRID_PRINTPROCESSOR: ::DWORD = 55;
-pub const DIRID_DEFAULT: ::DWORD = DIRID_SYSTEM;
-pub const DIRID_COMMON_STARTMENU: ::DWORD = 16406;
-pub const DIRID_COMMON_PROGRAMS: ::DWORD = 16407;
-pub const DIRID_COMMON_STARTUP: ::DWORD = 16408;
-pub const DIRID_COMMON_DESKTOPDIRECTORY: ::DWORD = 16409;
-pub const DIRID_COMMON_FAVORITES: ::DWORD = 16415;
-pub const DIRID_COMMON_APPDATA: ::DWORD = 16419;
-pub const DIRID_PROGRAM_FILES: ::DWORD = 16422;
-pub const DIRID_SYSTEM_X86: ::DWORD = 16425;
-pub const DIRID_PROGRAM_FILES_X86: ::DWORD = 16426;
-pub const DIRID_PROGRAM_FILES_COMMON: ::DWORD = 16427;
-pub const DIRID_PROGRAM_FILES_COMMONX86: ::DWORD = 16428;
-pub const DIRID_COMMON_TEMPLATES: ::DWORD = 16429;
-pub const DIRID_COMMON_DOCUMENTS: ::DWORD = 16430;
-pub const DIRID_USER: ::DWORD = 0x8000;
-pub type PSP_FILE_CALLBACK_A = Option<unsafe extern "system" fn(
-    Context: ::PVOID, Notification: ::UINT, Param1: ::UINT_PTR, Param2: ::UINT_PTR,
-) -> ::UINT>;
-pub type PSP_FILE_CALLBACK_W = Option<unsafe extern "system" fn(
-    Context: ::PVOID, Notification: ::UINT, Param1: ::UINT_PTR, Param2: ::UINT_PTR,
-) -> ::UINT>;
-pub const SPFILENOTIFY_STARTQUEUE: ::UINT = 0x00000001;
-pub const SPFILENOTIFY_ENDQUEUE: ::UINT = 0x00000002;
-pub const SPFILENOTIFY_STARTSUBQUEUE: ::UINT = 0x00000003;
-pub const SPFILENOTIFY_ENDSUBQUEUE: ::UINT = 0x00000004;
-pub const SPFILENOTIFY_STARTDELETE: ::UINT = 0x00000005;
-pub const SPFILENOTIFY_ENDDELETE: ::UINT = 0x00000006;
-pub const SPFILENOTIFY_DELETEERROR: ::UINT = 0x00000007;
-pub const SPFILENOTIFY_STARTRENAME: ::UINT = 0x00000008;
-pub const SPFILENOTIFY_ENDRENAME: ::UINT = 0x00000009;
-pub const SPFILENOTIFY_RENAMEERROR: ::UINT = 0x0000000a;
-pub const SPFILENOTIFY_STARTCOPY: ::UINT = 0x0000000b;
-pub const SPFILENOTIFY_ENDCOPY: ::UINT = 0x0000000c;
-pub const SPFILENOTIFY_COPYERROR: ::UINT = 0x0000000d;
-pub const SPFILENOTIFY_NEEDMEDIA: ::UINT = 0x0000000e;
-pub const SPFILENOTIFY_QUEUESCAN: ::UINT = 0x0000000f;
-pub const SPFILENOTIFY_CABINETINFO: ::UINT = 0x00000010;
-pub const SPFILENOTIFY_FILEINCABINET: ::UINT = 0x00000011;
-pub const SPFILENOTIFY_NEEDNEWCABINET: ::UINT = 0x00000012;
-pub const SPFILENOTIFY_FILEEXTRACTED: ::UINT = 0x00000013;
-pub const SPFILENOTIFY_FILEOPDELAYED: ::UINT = 0x00000014;
-pub const SPFILENOTIFY_STARTBACKUP: ::UINT = 0x00000015;
-pub const SPFILENOTIFY_BACKUPERROR: ::UINT = 0x00000016;
-pub const SPFILENOTIFY_ENDBACKUP: ::UINT = 0x00000017;
-pub const SPFILENOTIFY_QUEUESCAN_EX: ::UINT = 0x00000018;
-pub const SPFILENOTIFY_STARTREGISTRATION: ::UINT = 0x00000019;
-pub const SPFILENOTIFY_ENDREGISTRATION: ::UINT = 0x00000020;
-pub const SPFILENOTIFY_QUEUESCAN_SIGNERINFO: ::UINT = 0x00000040;
-pub const SPFILENOTIFY_LANGMISMATCH: ::UINT = 0x00010000;
-pub const SPFILENOTIFY_TARGETEXISTS: ::UINT = 0x00020000;
-pub const SPFILENOTIFY_TARGETNEWER: ::UINT = 0x00040000;
-pub const FILEOP_COPY: ::UINT = 0;
-pub const FILEOP_RENAME: ::UINT = 1;
-pub const FILEOP_DELETE: ::UINT = 2;
-pub const FILEOP_BACKUP: ::UINT = 3;
-pub const FILEOP_ABORT: ::UINT = 0;
-pub const FILEOP_DOIT: ::UINT = 1;
-pub const FILEOP_SKIP: ::UINT = 2;
-pub const FILEOP_RETRY: ::UINT = FILEOP_DOIT;
-pub const FILEOP_NEWPATH: ::UINT = 4;
-pub const COPYFLG_WARN_IF_SKIP: ::UINT = 0x00000001;
-pub const COPYFLG_NOSKIP: ::UINT = 0x00000002;
-pub const COPYFLG_NOVERSIONCHECK: ::UINT = 0x00000004;
-pub const COPYFLG_FORCE_FILE_IN_USE: ::UINT = 0x00000008;
-pub const COPYFLG_NO_OVERWRITE: ::UINT = 0x00000010;
-pub const COPYFLG_NO_VERSION_DIALOG: ::UINT = 0x00000020;
-pub const COPYFLG_OVERWRITE_OLDER_ONLY: ::UINT = 0x00000040;
-pub const COPYFLG_PROTECTED_WINDOWS_DRIVER_FILE: ::UINT = 0x00000100;
-pub const COPYFLG_REPLACEONLY: ::UINT = 0x00000400;
-pub const COPYFLG_NODECOMP: ::UINT = 0x00000800;
-pub const COPYFLG_REPLACE_BOOT_FILE: ::UINT = 0x00001000;
-pub const COPYFLG_NOPRUNE: ::UINT = 0x00002000;
-pub const COPYFLG_IN_USE_TRY_RENAME: ::UINT = 0x00004000;
-pub const DELFLG_IN_USE: ::UINT = 0x00000001;
-pub const DELFLG_IN_USE1: ::UINT = 0x00010000;
-STRUCT!{struct FILEPATHS_A {
-    Target: ::PCSTR,
-    Source: ::PCSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-}}
-pub type PFILEPATHS_A = *mut FILEPATHS_A;
-STRUCT!{struct FILEPATHS_W {
-    Target: ::PCWSTR,
-    Source: ::PCWSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-}}
-pub type PFILEPATHS_W = *mut FILEPATHS_W;
-STRUCT!{struct FILEPATHS_SIGNERINFO_A {
-    Target: ::PCSTR,
-    Source: ::PCSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-    DigitalSigner: ::PCSTR,
-    Version: ::PCSTR,
-    CatalogFile: ::PCSTR,
-}}
-pub type PFILEPATHS_SIGNERINFO_A = *mut FILEPATHS_SIGNERINFO_A;
-STRUCT!{struct FILEPATHS_SIGNERINFO_W {
-    Target: ::PCWSTR,
-    Source: ::PCWSTR,
-    Win32Error: ::UINT,
-    Flags: ::DWORD,
-    DigitalSigner: ::PCWSTR,
-    Version: ::PCWSTR,
-    CatalogFile: ::PCWSTR,
-}}
-pub type PFILEPATHS_SIGNERINFO_W = *mut FILEPATHS_SIGNERINFO_W;
-STRUCT!{struct SOURCE_MEDIA_A {
-    Reserved: ::PCSTR,
-    Tagfile: ::PCSTR,
-    Description: ::PCSTR,
-    SourcePath: ::PCSTR,
-    SourceFile: ::PCSTR,
-    Flags: ::DWORD,
-}}
-pub type PSOURCE_MEDIA_A = *mut SOURCE_MEDIA_A;
-STRUCT!{struct SOURCE_MEDIA_W {
-    Reserved: ::PCWSTR,
-    Tagfile: ::PCWSTR,
-    Description: ::PCWSTR,
-    SourcePath: ::PCWSTR,
-    SourceFile: ::PCWSTR,
-    Flags: ::DWORD,
-}}
-pub type PSOURCE_MEDIA_W = *mut SOURCE_MEDIA_W;
-STRUCT!{struct CABINET_INFO_A {
-    CabinetPath: ::PCSTR,
-    CabinetFile: ::PCSTR,
-    DiskName: ::PCSTR,
-    SetId: ::USHORT,
-    CabinetNumber: ::USHORT,
-}}
-pub type PCABINET_INFO_A = *mut CABINET_INFO_A;
-STRUCT!{struct CABINET_INFO_W {
-    CabinetPath: ::PCWSTR,
-    CabinetFile: ::PCWSTR,
-    DiskName: ::PCWSTR,
-    SetId: ::USHORT,
-    CabinetNumber: ::USHORT,
-}}
-pub type PCABINET_INFO_W = *mut CABINET_INFO_W;
-STRUCT!{nodebug struct FILE_IN_CABINET_INFO_A {
-    NameInCabinet: ::PCSTR,
-    FileSize: ::DWORD,
-    Win32Error: ::DWORD,
-    DosDate: ::WORD,
-    DosTime: ::WORD,
-    DosAttribs: ::WORD,
-    FullTargetName: [::CHAR; ::MAX_PATH],
-}}
-pub type PFILE_IN_CABINET_INFO_A = *mut FILE_IN_CABINET_INFO_A;
-STRUCT!{nodebug struct FILE_IN_CABINET_INFO_W {
-    NameInCabinet: ::PCWSTR,
-    FileSize: ::DWORD,
-    Win32Error: ::DWORD,
-    DosDate: ::WORD,
-    DosTime: ::WORD,
-    DosAttribs: ::WORD,
-    FullTargetName: [::WCHAR; ::MAX_PATH],
-}}
-pub type PFILE_IN_CABINET_INFO_W = *mut FILE_IN_CABINET_INFO_W;
-STRUCT!{struct SP_REGISTER_CONTROL_STATUSA {
-    cbSize: ::DWORD,
-    FileName: ::PCSTR,
-    Win32Error: ::DWORD,
-    FailureCode: ::DWORD,
-}}
-pub type PSP_REGISTER_CONTROL_STATUSA = *mut SP_REGISTER_CONTROL_STATUSA;
-STRUCT!{struct SP_REGISTER_CONTROL_STATUSW {
-    cbSize: ::DWORD,
-    FileName: ::PCWSTR,
-    Win32Error: ::DWORD,
-    FailureCode: ::DWORD,
-}}
-pub type PSP_REGISTER_CONTROL_STATUSW = *mut SP_REGISTER_CONTROL_STATUSW;
-pub const SPREG_SUCCESS: ::DWORD = 0x00000000;
-pub const SPREG_LOADLIBRARY: ::DWORD = 0x00000001;
-pub const SPREG_GETPROCADDR: ::DWORD = 0x00000002;
-pub const SPREG_REGSVR: ::DWORD = 0x00000003;
-pub const SPREG_DLLINSTALL: ::DWORD = 0x00000004;
-pub const SPREG_TIMEOUT: ::DWORD = 0x00000005;
-pub const SPREG_UNKNOWN: ::DWORD = 0xFFFFFFFF;
-pub type HSPFILEQ = ::PVOID;
-STRUCT!{struct SP_FILE_COPY_PARAMS_A {
-    cbSize: ::DWORD,
-    QueueHandle: HSPFILEQ,
-    SourceRootPath: ::PCSTR,
-    SourcePath: ::PCSTR,
-    SourceFilename: ::PCSTR,
-    SourceDescription: ::PCSTR,
-    SourceTagfile: ::PCSTR,
-    TargetDirectory: ::PCSTR,
-    TargetFilename: ::PCSTR,
-    CopyStyle: ::DWORD,
-    LayoutInf: HINF,
-    SecurityDescriptor: ::PCSTR,
-}}
-pub type PSP_FILE_COPY_PARAMS_A = *mut SP_FILE_COPY_PARAMS_A;
-STRUCT!{struct SP_FILE_COPY_PARAMS_W {
-    cbSize: ::DWORD,
-    QueueHandle: HSPFILEQ,
-    SourceRootPath: ::PCWSTR,
-    SourcePath: ::PCWSTR,
-    SourceFilename: ::PCWSTR,
-    SourceDescription: ::PCWSTR,
-    SourceTagfile: ::PCWSTR,
-    TargetDirectory: ::PCWSTR,
-    TargetFilename: ::PCWSTR,
-    CopyStyle: ::DWORD,
-    LayoutInf: HINF,
-    SecurityDescriptor: ::PCWSTR,
-}}
-pub type PSP_FILE_COPY_PARAMS_W = *mut SP_FILE_COPY_PARAMS_W;
-pub type HDSKSPC = ::PVOID;
-pub type HDEVINFO = ::PVOID;
-STRUCT!{struct SP_DEVINFO_DATA {
-    cbSize: ::DWORD,
-    ClassGuid: ::GUID,
-    DevInst: ::DWORD,
-    Reserved: ::ULONG_PTR,
-}}
-pub type PSP_DEVINFO_DATA = *mut SP_DEVINFO_DATA;
-STRUCT!{struct SP_DEVICE_INTERFACE_DATA {
-    cbSize: ::DWORD,
-    InterfaceClassGuid: ::GUID,
-    Flags: ::DWORD,
-    Reserved: ::ULONG_PTR,
-}}
-pub type PSP_DEVICE_INTERFACE_DATA = *mut SP_DEVICE_INTERFACE_DATA;
-pub const SPINT_ACTIVE: ::DWORD = 0x00000001;
-pub const SPINT_DEFAULT: ::DWORD = 0x00000002;
-pub const SPINT_REMOVED: ::DWORD = 0x00000004;
-pub type SP_INTERFACE_DEVICE_DATA = SP_DEVICE_INTERFACE_DATA;
-pub type PSP_INTERFACE_DEVICE_DATA = PSP_DEVICE_INTERFACE_DATA;
-pub const SPID_ACTIVE: ::DWORD = SPINT_ACTIVE;
-pub const SPID_DEFAULT: ::DWORD = SPINT_DEFAULT;
-pub const SPID_REMOVED: ::DWORD = SPINT_REMOVED;
-STRUCT!{struct SP_DEVICE_INTERFACE_DETAIL_DATA_A {
-    cbSize: ::DWORD,
-    DevicePath: [::CHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DEVICE_INTERFACE_DETAIL_DATA_A = *mut SP_DEVICE_INTERFACE_DETAIL_DATA_A;
-STRUCT!{struct SP_DEVICE_INTERFACE_DETAIL_DATA_W {
-    cbSize: ::DWORD,
-    DevicePath: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DEVICE_INTERFACE_DETAIL_DATA_W = *mut SP_DEVICE_INTERFACE_DETAIL_DATA_W;
-STRUCT!{nodebug struct SP_DEVINFO_LIST_DETAIL_DATA_A {
-    cbSize: ::DWORD,
-    ClassGuid: ::GUID,
-    RemoteMachineHandle: ::HANDLE,
-    RemoteMachineName: [::CHAR; SP_MAX_MACHINENAME_LENGTH],
-}}
-pub type PSP_DEVINFO_LIST_DETAIL_DATA_A = *mut SP_DEVINFO_LIST_DETAIL_DATA_A;
-STRUCT!{nodebug struct SP_DEVINFO_LIST_DETAIL_DATA_W {
-    cbSize: ::DWORD,
-    ClassGuid: ::GUID,
-    RemoteMachineHandle: ::HANDLE,
-    RemoteMachineName: [::WCHAR; SP_MAX_MACHINENAME_LENGTH],
-}}
-pub type PSP_DEVINFO_LIST_DETAIL_DATA_W = *mut SP_DEVINFO_LIST_DETAIL_DATA_W;
-pub const DIF_SELECTDEVICE: DI_FUNCTION = 0x00000001;
-pub const DIF_INSTALLDEVICE: DI_FUNCTION = 0x00000002;
-pub const DIF_ASSIGNRESOURCES: DI_FUNCTION = 0x00000003;
-pub const DIF_PROPERTIES: DI_FUNCTION = 0x00000004;
-pub const DIF_REMOVE: DI_FUNCTION = 0x00000005;
-pub const DIF_FIRSTTIMESETUP: DI_FUNCTION = 0x00000006;
-pub const DIF_FOUNDDEVICE: DI_FUNCTION = 0x00000007;
-pub const DIF_SELECTCLASSDRIVERS: DI_FUNCTION = 0x00000008;
-pub const DIF_VALIDATECLASSDRIVERS: DI_FUNCTION = 0x00000009;
-pub const DIF_INSTALLCLASSDRIVERS: DI_FUNCTION = 0x0000000A;
-pub const DIF_CALCDISKSPACE: DI_FUNCTION = 0x0000000B;
-pub const DIF_DESTROYPRIVATEDATA: DI_FUNCTION = 0x0000000C;
-pub const DIF_VALIDATEDRIVER: DI_FUNCTION = 0x0000000D;
-pub const DIF_DETECT: DI_FUNCTION = 0x0000000F;
-pub const DIF_INSTALLWIZARD: DI_FUNCTION = 0x00000010;
-pub const DIF_DESTROYWIZARDDATA: DI_FUNCTION = 0x00000011;
-pub const DIF_PROPERTYCHANGE: DI_FUNCTION = 0x00000012;
-pub const DIF_ENABLECLASS: DI_FUNCTION = 0x00000013;
-pub const DIF_DETECTVERIFY: DI_FUNCTION = 0x00000014;
-pub const DIF_INSTALLDEVICEFILES: DI_FUNCTION = 0x00000015;
-pub const DIF_UNREMOVE: DI_FUNCTION = 0x00000016;
-pub const DIF_SELECTBESTCOMPATDRV: DI_FUNCTION = 0x00000017;
-pub const DIF_ALLOW_INSTALL: DI_FUNCTION = 0x00000018;
-pub const DIF_REGISTERDEVICE: DI_FUNCTION = 0x00000019;
-pub const DIF_NEWDEVICEWIZARD_PRESELECT: DI_FUNCTION = 0x0000001A;
-pub const DIF_NEWDEVICEWIZARD_SELECT: DI_FUNCTION = 0x0000001B;
-pub const DIF_NEWDEVICEWIZARD_PREANALYZE: DI_FUNCTION = 0x0000001C;
-pub const DIF_NEWDEVICEWIZARD_POSTANALYZE: DI_FUNCTION = 0x0000001D;
-pub const DIF_NEWDEVICEWIZARD_FINISHINSTALL: DI_FUNCTION = 0x0000001E;
-pub const DIF_UNUSED1: DI_FUNCTION = 0x0000001F;
-pub const DIF_INSTALLINTERFACES: DI_FUNCTION = 0x00000020;
-pub const DIF_DETECTCANCEL: DI_FUNCTION = 0x00000021;
-pub const DIF_REGISTER_COINSTALLERS: DI_FUNCTION = 0x00000022;
-pub const DIF_ADDPROPERTYPAGE_ADVANCED: DI_FUNCTION = 0x00000023;
-pub const DIF_ADDPROPERTYPAGE_BASIC: DI_FUNCTION = 0x00000024;
-pub const DIF_RESERVED1: DI_FUNCTION = 0x00000025;
-pub const DIF_TROUBLESHOOTER: DI_FUNCTION = 0x00000026;
-pub const DIF_POWERMESSAGEWAKE: DI_FUNCTION = 0x00000027;
-pub const DIF_ADDREMOTEPROPERTYPAGE_ADVANCED: DI_FUNCTION = 0x00000028;
-pub const DIF_UPDATEDRIVER_UI: DI_FUNCTION = 0x00000029;
-pub const DIF_FINISHINSTALL_ACTION: DI_FUNCTION = 0x0000002A;
-pub const DIF_RESERVED2: DI_FUNCTION = 0x00000030;
-pub const DIF_MOVEDEVICE: DI_FUNCTION = 0x0000000E;
-pub type DI_FUNCTION = ::UINT;
-STRUCT!{nodebug struct SP_DEVINSTALL_PARAMS_A {
-    cbSize: ::DWORD,
-    Flags: ::DWORD,
-    FlagsEx: ::DWORD,
-    hwndParent: ::HWND,
-    InstallMsgHandler: PSP_FILE_CALLBACK_A,
-    InstallMsgHandlerContext: ::PVOID,
-    FileQueue: HSPFILEQ,
-    ClassInstallReserved: ::ULONG_PTR,
-    Reserved: ::DWORD,
-    DriverPath: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_DEVINSTALL_PARAMS_A = *mut SP_DEVINSTALL_PARAMS_A;
-STRUCT!{nodebug struct SP_DEVINSTALL_PARAMS_W {
-    cbSize: ::DWORD,
-    Flags: ::DWORD,
-    FlagsEx: ::DWORD,
-    hwndParent: ::HWND,
-    InstallMsgHandler: PSP_FILE_CALLBACK_W,
-    InstallMsgHandlerContext: ::PVOID,
-    FileQueue: HSPFILEQ,
-    ClassInstallReserved: ::ULONG_PTR,
-    Reserved: ::DWORD,
-    DriverPath: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_DEVINSTALL_PARAMS_W = *mut SP_DEVINSTALL_PARAMS_W;
-pub const DI_SHOWOEM: ::DWORD = 0x00000001;
-pub const DI_SHOWCOMPAT: ::DWORD = 0x00000002;
-pub const DI_SHOWCLASS: ::DWORD = 0x00000004;
-pub const DI_SHOWALL: ::DWORD = 0x00000007;
-pub const DI_NOVCP: ::DWORD = 0x00000008;
-pub const DI_DIDCOMPAT: ::DWORD = 0x00000010;
-pub const DI_DIDCLASS: ::DWORD = 0x00000020;
-pub const DI_AUTOASSIGNRES: ::DWORD = 0x00000040;
-pub const DI_NEEDRESTART: ::DWORD = 0x00000080;
-pub const DI_NEEDREBOOT: ::DWORD = 0x00000100;
-pub const DI_NOBROWSE: ::DWORD = 0x00000200;
-pub const DI_MULTMFGS: ::DWORD = 0x00000400;
-pub const DI_DISABLED: ::DWORD = 0x00000800;
-pub const DI_GENERALPAGE_ADDED: ::DWORD = 0x00001000;
-pub const DI_RESOURCEPAGE_ADDED: ::DWORD = 0x00002000;
-pub const DI_PROPERTIES_CHANGE: ::DWORD = 0x00004000;
-pub const DI_INF_IS_SORTED: ::DWORD = 0x00008000;
-pub const DI_ENUMSINGLEINF: ::DWORD = 0x00010000;
-pub const DI_DONOTCALLCONFIGMG: ::DWORD = 0x00020000;
-pub const DI_INSTALLDISABLED: ::DWORD = 0x00040000;
-pub const DI_COMPAT_FROM_CLASS: ::DWORD = 0x00080000;
-pub const DI_CLASSINSTALLPARAMS: ::DWORD = 0x00100000;
-pub const DI_NODI_DEFAULTACTION: ::DWORD = 0x00200000;
-pub const DI_QUIETINSTALL: ::DWORD = 0x00800000;
-pub const DI_NOFILECOPY: ::DWORD = 0x01000000;
-pub const DI_FORCECOPY: ::DWORD = 0x02000000;
-pub const DI_DRIVERPAGE_ADDED: ::DWORD = 0x04000000;
-pub const DI_USECI_SELECTSTRINGS: ::DWORD = 0x08000000;
-pub const DI_OVERRIDE_INFFLAGS: ::DWORD = 0x10000000;
-pub const DI_PROPS_NOCHANGEUSAGE: ::DWORD = 0x20000000;
-pub const DI_NOSELECTICONS: ::DWORD = 0x40000000;
-pub const DI_NOWRITE_IDS: ::DWORD = 0x80000000;
-pub const DI_FLAGSEX_RESERVED2: ::DWORD = 0x00000001;
-pub const DI_FLAGSEX_RESERVED3: ::DWORD = 0x00000002;
-pub const DI_FLAGSEX_CI_FAILED: ::DWORD = 0x00000004;
-pub const DI_FLAGSEX_FINISHINSTALL_ACTION: ::DWORD = 0x00000008;
-pub const DI_FLAGSEX_DIDINFOLIST: ::DWORD = 0x00000010;
-pub const DI_FLAGSEX_DIDCOMPATINFO: ::DWORD = 0x00000020;
-pub const DI_FLAGSEX_FILTERCLASSES: ::DWORD = 0x00000040;
-pub const DI_FLAGSEX_SETFAILEDINSTALL: ::DWORD = 0x00000080;
-pub const DI_FLAGSEX_DEVICECHANGE: ::DWORD = 0x00000100;
-pub const DI_FLAGSEX_ALWAYSWRITEIDS: ::DWORD = 0x00000200;
-pub const DI_FLAGSEX_PROPCHANGE_PENDING: ::DWORD = 0x00000400;
-pub const DI_FLAGSEX_ALLOWEXCLUDEDDRVS: ::DWORD = 0x00000800;
-pub const DI_FLAGSEX_NOUIONQUERYREMOVE: ::DWORD = 0x00001000;
-pub const DI_FLAGSEX_USECLASSFORCOMPAT: ::DWORD = 0x00002000;
-pub const DI_FLAGSEX_RESERVED4: ::DWORD = 0x00004000;
-pub const DI_FLAGSEX_NO_DRVREG_MODIFY: ::DWORD = 0x00008000;
-pub const DI_FLAGSEX_IN_SYSTEM_SETUP: ::DWORD = 0x00010000;
-pub const DI_FLAGSEX_INET_DRIVER: ::DWORD = 0x00020000;
-pub const DI_FLAGSEX_APPENDDRIVERLIST: ::DWORD = 0x00040000;
-pub const DI_FLAGSEX_PREINSTALLBACKUP: ::DWORD = 0x00080000;
-pub const DI_FLAGSEX_BACKUPONREPLACE: ::DWORD = 0x00100000;
-pub const DI_FLAGSEX_DRIVERLIST_FROM_URL: ::DWORD = 0x00200000;
-pub const DI_FLAGSEX_RESERVED1: ::DWORD = 0x00400000;
-pub const DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS: ::DWORD = 0x00800000;
-pub const DI_FLAGSEX_POWERPAGE_ADDED: ::DWORD = 0x01000000;
-pub const DI_FLAGSEX_FILTERSIMILARDRIVERS: ::DWORD = 0x02000000;
-pub const DI_FLAGSEX_INSTALLEDDRIVER: ::DWORD = 0x04000000;
-pub const DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE: ::DWORD = 0x08000000;
-pub const DI_FLAGSEX_ALTPLATFORM_DRVSEARCH: ::DWORD = 0x10000000;
-pub const DI_FLAGSEX_RESTART_DEVICE_ONLY: ::DWORD = 0x20000000;
-pub const DI_FLAGSEX_RECURSIVESEARCH: ::DWORD = 0x40000000;
-pub const DI_FLAGSEX_SEARCH_PUBLISHED_INFS: ::DWORD = 0x80000000;
-STRUCT!{struct SP_CLASSINSTALL_HEADER {
-    cbSize: ::DWORD,
-    InstallFunction: DI_FUNCTION,
-}}
-pub type PSP_CLASSINSTALL_HEADER = *mut SP_CLASSINSTALL_HEADER;
-STRUCT!{struct SP_ENABLECLASS_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    ClassGuid: ::GUID,
-    EnableMessage: ::DWORD,
-}}
-pub type PSP_ENABLECLASS_PARAMS = *mut SP_ENABLECLASS_PARAMS;
-pub const ENABLECLASS_QUERY: ::DWORD = 0;
-pub const ENABLECLASS_SUCCESS: ::DWORD = 1;
-pub const ENABLECLASS_FAILURE: ::DWORD = 2;
-pub const DICS_ENABLE: ::DWORD = 0x00000001;
-pub const DICS_DISABLE: ::DWORD = 0x00000002;
-pub const DICS_PROPCHANGE: ::DWORD = 0x00000003;
-pub const DICS_START: ::DWORD = 0x00000004;
-pub const DICS_STOP: ::DWORD = 0x00000005;
-pub const DICS_FLAG_GLOBAL: ::DWORD = 0x00000001;
-pub const DICS_FLAG_CONFIGSPECIFIC: ::DWORD = 0x00000002;
-pub const DICS_FLAG_CONFIGGENERAL: ::DWORD = 0x00000004;
-STRUCT!{struct SP_PROPCHANGE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    StateChange: ::DWORD,
-    Scope: ::DWORD,
-    HwProfile: ::DWORD,
-}}
-pub type PSP_PROPCHANGE_PARAMS = *mut SP_PROPCHANGE_PARAMS;
-STRUCT!{struct SP_REMOVEDEVICE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Scope: ::DWORD,
-    HwProfile: ::DWORD,
-}}
-pub type PSP_REMOVEDEVICE_PARAMS = *mut SP_REMOVEDEVICE_PARAMS;
-pub const DI_REMOVEDEVICE_GLOBAL: ::DWORD = 0x00000001;
-pub const DI_REMOVEDEVICE_CONFIGSPECIFIC: ::DWORD = 0x00000002;
-STRUCT!{struct SP_UNREMOVEDEVICE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Scope: ::DWORD,
-    HwProfile: ::DWORD,
-}}
-pub type PSP_UNREMOVEDEVICE_PARAMS = *mut SP_UNREMOVEDEVICE_PARAMS;
-pub const DI_UNREMOVEDEVICE_CONFIGSPECIFIC: ::DWORD = 0x00000002;
-STRUCT!{nodebug struct SP_SELECTDEVICE_PARAMS_A {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Title: [::CHAR; MAX_TITLE_LEN],
-    Instructions: [::CHAR; MAX_INSTRUCTION_LEN],
-    ListLabel: [::CHAR; MAX_LABEL_LEN],
-    SubTitle: [::CHAR; MAX_SUBTITLE_LEN],
-    Reserved: [::BYTE; 2],
-}}
-pub type PSP_SELECTDEVICE_PARAMS_A = *mut SP_SELECTDEVICE_PARAMS_A;
-STRUCT!{nodebug struct SP_SELECTDEVICE_PARAMS_W {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Title: [::WCHAR; MAX_TITLE_LEN],
-    Instructions: [::WCHAR; MAX_INSTRUCTION_LEN],
-    ListLabel: [::WCHAR; MAX_LABEL_LEN],
-    SubTitle: [::WCHAR; MAX_SUBTITLE_LEN],
-}}
-pub type PSP_SELECTDEVICE_PARAMS_W = *mut SP_SELECTDEVICE_PARAMS_W;
-pub type PDETECT_PROGRESS_NOTIFY = Option<unsafe extern "system" fn(
-    ProgressNotifyParam: ::PVOID, DetectComplete: ::DWORD,
-) -> ::BOOL>;
-STRUCT!{nodebug struct SP_DETECTDEVICE_PARAMS {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    DetectProgressNotify: PDETECT_PROGRESS_NOTIFY,
-    ProgressNotifyParam: ::PVOID,
-}}
-pub type PSP_DETECTDEVICE_PARAMS = *mut SP_DETECTDEVICE_PARAMS;
-pub const MAX_INSTALLWIZARD_DYNAPAGES: usize = 20;
-STRUCT!{struct SP_INSTALLWIZARD_DATA {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Flags: ::DWORD,
-    DynamicPages: [::HPROPSHEETPAGE; MAX_INSTALLWIZARD_DYNAPAGES],
-    NumDynamicPages: ::DWORD,
-    DynamicPageFlags: ::DWORD,
-    PrivateFlags: ::DWORD,
-    PrivateData: ::LPARAM,
-    hwndWizardDlg: ::HWND,
-}}
-pub type PSP_INSTALLWIZARD_DATA = *mut SP_INSTALLWIZARD_DATA;
-pub const NDW_INSTALLFLAG_DIDFACTDEFS: ::DWORD = 0x00000001;
-pub const NDW_INSTALLFLAG_HARDWAREALLREADYIN: ::DWORD = 0x00000002;
-pub const NDW_INSTALLFLAG_NEEDRESTART: ::DWORD = DI_NEEDRESTART;
-pub const NDW_INSTALLFLAG_NEEDREBOOT: ::DWORD = DI_NEEDREBOOT;
-pub const NDW_INSTALLFLAG_NEEDSHUTDOWN: ::DWORD = 0x00000200;
-pub const NDW_INSTALLFLAG_EXPRESSINTRO: ::DWORD = 0x00000400;
-pub const NDW_INSTALLFLAG_SKIPISDEVINSTALLED: ::DWORD = 0x00000800;
-pub const NDW_INSTALLFLAG_NODETECTEDDEVS: ::DWORD = 0x00001000;
-pub const NDW_INSTALLFLAG_INSTALLSPECIFIC: ::DWORD = 0x00002000;
-pub const NDW_INSTALLFLAG_SKIPCLASSLIST: ::DWORD = 0x00004000;
-pub const NDW_INSTALLFLAG_CI_PICKED_OEM: ::DWORD = 0x00008000;
-pub const NDW_INSTALLFLAG_PCMCIAMODE: ::DWORD = 0x00010000;
-pub const NDW_INSTALLFLAG_PCMCIADEVICE: ::DWORD = 0x00020000;
-pub const NDW_INSTALLFLAG_USERCANCEL: ::DWORD = 0x00040000;
-pub const NDW_INSTALLFLAG_KNOWNCLASS: ::DWORD = 0x00080000;
-pub const DYNAWIZ_FLAG_PAGESADDED: ::DWORD = 0x00000001;
-pub const DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT: ::DWORD = 0x00000008;
-pub const DYNAWIZ_FLAG_INSTALLDET_NEXT: ::DWORD = 0x00000002;
-pub const DYNAWIZ_FLAG_INSTALLDET_PREV: ::DWORD = 0x00000004;
-pub const MIN_IDD_DYNAWIZ_RESOURCE_ID: ::c_int = 10000;
-pub const MAX_IDD_DYNAWIZ_RESOURCE_ID: ::c_int = 11000;
-pub const IDD_DYNAWIZ_FIRSTPAGE: ::c_int = 10000;
-pub const IDD_DYNAWIZ_SELECT_PREVPAGE: ::c_int = 10001;
-pub const IDD_DYNAWIZ_SELECT_NEXTPAGE: ::c_int = 10002;
-pub const IDD_DYNAWIZ_ANALYZE_PREVPAGE: ::c_int = 10003;
-pub const IDD_DYNAWIZ_ANALYZE_NEXTPAGE: ::c_int = 10004;
-pub const IDD_DYNAWIZ_SELECTDEV_PAGE: ::c_int = 10009;
-pub const IDD_DYNAWIZ_ANALYZEDEV_PAGE: ::c_int = 10010;
-pub const IDD_DYNAWIZ_INSTALLDETECTEDDEVS_PAGE: ::c_int = 10011;
-pub const IDD_DYNAWIZ_SELECTCLASS_PAGE: ::c_int = 10012;
-pub const IDD_DYNAWIZ_INSTALLDETECTED_PREVPAGE: ::c_int = 10006;
-pub const IDD_DYNAWIZ_INSTALLDETECTED_NEXTPAGE: ::c_int = 10007;
-pub const IDD_DYNAWIZ_INSTALLDETECTED_NODEVS: ::c_int = 10008;
-STRUCT!{struct SP_NEWDEVICEWIZARD_DATA {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    Flags: ::DWORD,
-    DynamicPages: [::HPROPSHEETPAGE; MAX_INSTALLWIZARD_DYNAPAGES],
-    NumDynamicPages: ::DWORD,
-    hwndWizardDlg: ::HWND,
-}}
-pub type PSP_NEWDEVICEWIZARD_DATA = *mut SP_NEWDEVICEWIZARD_DATA;
-pub type SP_ADDPROPERTYPAGE_DATA = SP_NEWDEVICEWIZARD_DATA;
-pub type PSP_ADDPROPERTYPAGE_DATA = PSP_NEWDEVICEWIZARD_DATA;
-STRUCT!{nodebug struct SP_TROUBLESHOOTER_PARAMS_A {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    ChmFile: [::CHAR; ::MAX_PATH],
-    HtmlTroubleShooter: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_TROUBLESHOOTER_PARAMS_A = *mut SP_TROUBLESHOOTER_PARAMS_A;
-STRUCT!{nodebug struct SP_TROUBLESHOOTER_PARAMS_W {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    ChmFile: [::WCHAR; ::MAX_PATH],
-    HtmlTroubleShooter: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_TROUBLESHOOTER_PARAMS_W = *mut SP_TROUBLESHOOTER_PARAMS_W;
-STRUCT!{nodebug struct SP_POWERMESSAGEWAKE_PARAMS_A {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    PowerMessageWake: [::CHAR; LINE_LEN * 2],
-}}
-pub type PSP_POWERMESSAGEWAKE_PARAMS_A = *mut SP_POWERMESSAGEWAKE_PARAMS_A;
-STRUCT!{nodebug struct SP_POWERMESSAGEWAKE_PARAMS_W {
-    ClassInstallHeader: SP_CLASSINSTALL_HEADER,
-    PowerMessageWake: [::WCHAR; LINE_LEN * 2],
-}}
-pub type PSP_POWERMESSAGEWAKE_PARAMS_W = *mut SP_POWERMESSAGEWAKE_PARAMS_W;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V2_A {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::CHAR; LINE_LEN],
-    MfgName: [::CHAR; LINE_LEN],
-    ProviderName: [::CHAR; LINE_LEN],
-    DriverDate: ::FILETIME,
-    DriverVersion: ::DWORDLONG,
-}}
-pub type PSP_DRVINFO_DATA_V2_A = *mut SP_DRVINFO_DATA_V2_A;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V2_W {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::WCHAR; LINE_LEN],
-    MfgName: [::WCHAR; LINE_LEN],
-    ProviderName: [::WCHAR; LINE_LEN],
-    DriverDate: ::FILETIME,
-    DriverVersion: ::DWORDLONG,
-}}
-pub type PSP_DRVINFO_DATA_V2_W = *mut SP_DRVINFO_DATA_V2_W;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V1_A {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::CHAR; LINE_LEN],
-    MfgName: [::CHAR; LINE_LEN],
-    ProviderName: [::CHAR; LINE_LEN],
-}}
-pub type PSP_DRVINFO_DATA_V1_A = *mut SP_DRVINFO_DATA_V1_A;
-STRUCT!{nodebug struct SP_DRVINFO_DATA_V1_W {
-    cbSize: ::DWORD,
-    DriverType: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    Description: [::WCHAR; LINE_LEN],
-    MfgName: [::WCHAR; LINE_LEN],
-    ProviderName: [::WCHAR; LINE_LEN],
-}}
-pub type PSP_DRVINFO_DATA_V1_W = *mut SP_DRVINFO_DATA_V1_W;
-pub type SP_DRVINFO_DATA_A = SP_DRVINFO_DATA_V2_A;
-pub type PSP_DRVINFO_DATA_A = PSP_DRVINFO_DATA_V2_A;
-pub type SP_DRVINFO_DATA_W = SP_DRVINFO_DATA_V2_W;
-pub type PSP_DRVINFO_DATA_W = PSP_DRVINFO_DATA_V2_W;
-STRUCT!{nodebug struct SP_DRVINFO_DETAIL_DATA_A {
-    cbSize: ::DWORD,
-    InfDate: ::FILETIME,
-    CompatIDsOffset: ::DWORD,
-    CompatIDsLength: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    SectionName: [::CHAR; LINE_LEN],
-    InfFileName: [::CHAR; ::MAX_PATH],
-    DrvDescription: [::CHAR; LINE_LEN],
-    HardwareID: [::CHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DRVINFO_DETAIL_DATA_A = *mut SP_DRVINFO_DETAIL_DATA_A;
-STRUCT!{nodebug struct SP_DRVINFO_DETAIL_DATA_W {
-    cbSize: ::DWORD,
-    InfDate: ::FILETIME,
-    CompatIDsOffset: ::DWORD,
-    CompatIDsLength: ::DWORD,
-    Reserved: ::ULONG_PTR,
-    SectionName: [::WCHAR; LINE_LEN],
-    InfFileName: [::WCHAR; ::MAX_PATH],
-    DrvDescription: [::WCHAR; LINE_LEN],
-    HardwareID: [::WCHAR; ::ANYSIZE_ARRAY],
-}}
-pub type PSP_DRVINFO_DETAIL_DATA_W = *mut SP_DRVINFO_DETAIL_DATA_W;
-STRUCT!{struct SP_DRVINSTALL_PARAMS {
-    cbSize: ::DWORD,
-    Rank: ::DWORD,
-    Flags: ::DWORD,
-    PrivateData: ::DWORD_PTR,
-    Reserved: ::DWORD,
-}}
-pub type PSP_DRVINSTALL_PARAMS = *mut SP_DRVINSTALL_PARAMS;
-pub const DNF_DUPDESC: ::DWORD = 0x00000001;
-pub const DNF_OLDDRIVER: ::DWORD = 0x00000002;
-pub const DNF_EXCLUDEFROMLIST: ::DWORD = 0x00000004;
-pub const DNF_NODRIVER: ::DWORD = 0x00000008;
-pub const DNF_LEGACYINF: ::DWORD = 0x00000010;
-pub const DNF_CLASS_DRIVER: ::DWORD = 0x00000020;
-pub const DNF_COMPATIBLE_DRIVER: ::DWORD = 0x00000040;
-pub const DNF_INET_DRIVER: ::DWORD = 0x00000080;
-pub const DNF_UNUSED1: ::DWORD = 0x00000100;
-pub const DNF_UNUSED2: ::DWORD = 0x00000200;
-pub const DNF_OLD_INET_DRIVER: ::DWORD = 0x00000400;
-pub const DNF_BAD_DRIVER: ::DWORD = 0x00000800;
-pub const DNF_DUPPROVIDER: ::DWORD = 0x00001000;
-pub const DNF_INF_IS_SIGNED: ::DWORD = 0x00002000;
-pub const DNF_OEM_F6_INF: ::DWORD = 0x00004000;
-pub const DNF_DUPDRIVERVER: ::DWORD = 0x00008000;
-pub const DNF_BASIC_DRIVER: ::DWORD = 0x00010000;
-pub const DNF_AUTHENTICODE_SIGNED: ::DWORD = 0x00020000;
-pub const DNF_INSTALLEDDRIVER: ::DWORD = 0x00040000;
-pub const DNF_ALWAYSEXCLUDEFROMLIST: ::DWORD = 0x00080000;
-pub const DNF_INBOX_DRIVER: ::DWORD = 0x00100000;
-pub const DNF_REQUESTADDITIONALSOFTWARE: ::DWORD = 0x00200000;
-pub const DNF_UNUSED_22: ::DWORD = 0x00400000;
-pub const DNF_UNUSED_23: ::DWORD = 0x00800000;
-pub const DNF_UNUSED_24: ::DWORD = 0x01000000;
-pub const DNF_UNUSED_25: ::DWORD = 0x02000000;
-pub const DNF_UNUSED_26: ::DWORD = 0x04000000;
-pub const DNF_UNUSED_27: ::DWORD = 0x08000000;
-pub const DNF_UNUSED_28: ::DWORD = 0x10000000;
-pub const DNF_UNUSED_29: ::DWORD = 0x20000000;
-pub const DNF_UNUSED_30: ::DWORD = 0x40000000;
-pub const DNF_UNUSED_31: ::DWORD = 0x80000000;
-pub type PSP_DETSIG_CMPPROC = Option<unsafe extern "system" fn(
-    DeviceInfoSet: HDEVINFO, NewDeviceData: PSP_DEVINFO_DATA, ExistingDeviceData: PSP_DEVINFO_DATA,
-    CompareContext: ::PVOID,
-) -> ::DWORD>;
-STRUCT!{struct COINSTALLER_CONTEXT_DATA {
-    PostProcessing: ::BOOL,
-    InstallResult: ::DWORD,
-    PrivateData: ::PVOID,
-}}
-pub type PCOINSTALLER_CONTEXT_DATA = *mut COINSTALLER_CONTEXT_DATA;
-STRUCT!{struct SP_CLASSIMAGELIST_DATA {
-    cbSize: ::DWORD,
-    ImageList: ::HIMAGELIST,
-    Reserved: ::ULONG_PTR,
-}}
-pub type PSP_CLASSIMAGELIST_DATA = *mut SP_CLASSIMAGELIST_DATA;
-STRUCT!{struct SP_PROPSHEETPAGE_REQUEST {
-    cbSize: ::DWORD,
-    PageRequested: ::DWORD,
-    DeviceInfoSet: HDEVINFO,
-    DeviceInfoData: PSP_DEVINFO_DATA,
-}}
-pub type PSP_PROPSHEETPAGE_REQUEST = *mut SP_PROPSHEETPAGE_REQUEST;
-pub const SPPSR_SELECT_DEVICE_RESOURCES: ::DWORD = 1;
-pub const SPPSR_ENUM_BASIC_DEVICE_PROPERTIES: ::DWORD = 2;
-pub const SPPSR_ENUM_ADV_DEVICE_PROPERTIES: ::DWORD = 3;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V2_A {
-    cbSize: ::DWORD,
-    FullInfPath: [::CHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-    ReinstallInstance: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V2_A = *mut SP_BACKUP_QUEUE_PARAMS_V2_A;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V2_W {
-    cbSize: ::DWORD,
-    FullInfPath: [::WCHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-    ReinstallInstance: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V2_W = *mut SP_BACKUP_QUEUE_PARAMS_V2_W;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V1_A {
-    cbSize: ::DWORD,
-    FullInfPath: [::CHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V1_A = *mut SP_BACKUP_QUEUE_PARAMS_V1_A;
-STRUCT!{nodebug struct SP_BACKUP_QUEUE_PARAMS_V1_W {
-    cbSize: ::DWORD,
-    FullInfPath: [::WCHAR; ::MAX_PATH],
-    FilenameOffset: ::INT,
-}}
-pub type PSP_BACKUP_QUEUE_PARAMS_V1_W = *mut SP_BACKUP_QUEUE_PARAMS_V1_W;
-pub type SP_BACKUP_QUEUE_PARAMS_A = SP_BACKUP_QUEUE_PARAMS_V2_A;
-pub type PSP_BACKUP_QUEUE_PARAMS_A = PSP_BACKUP_QUEUE_PARAMS_V2_A;
-pub type SP_BACKUP_QUEUE_PARAMS_W = SP_BACKUP_QUEUE_PARAMS_V2_W;
-pub type PSP_BACKUP_QUEUE_PARAMS_W = PSP_BACKUP_QUEUE_PARAMS_V2_W;
-pub const ERROR_EXPECTED_SECTION_NAME: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0;
-pub const ERROR_BAD_SECTION_NAME_LINE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 1;
-pub const ERROR_SECTION_NAME_TOO_LONG: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 2;
-pub const ERROR_GENERAL_SYNTAX: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 3;
-pub const ERROR_WRONG_INF_STYLE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x100;
-pub const ERROR_SECTION_NOT_FOUND: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x101;
-pub const ERROR_LINE_NOT_FOUND: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x102;
-pub const ERROR_NO_BACKUP: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x103;
-pub const ERROR_NO_ASSOCIATED_CLASS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x200;
-pub const ERROR_CLASS_MISMATCH: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x201;
-pub const ERROR_DUPLICATE_FOUND: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x202;
-pub const ERROR_NO_DRIVER_SELECTED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x203;
-pub const ERROR_KEY_DOES_NOT_EXIST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x204;
-pub const ERROR_INVALID_DEVINST_NAME: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x205;
-pub const ERROR_INVALID_CLASS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x206;
-pub const ERROR_DEVINST_ALREADY_EXISTS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x207;
-pub const ERROR_DEVINFO_NOT_REGISTERED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x208;
-pub const ERROR_INVALID_REG_PROPERTY: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x209;
-pub const ERROR_NO_INF: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x20A;
-pub const ERROR_NO_SUCH_DEVINST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x20B;
-pub const ERROR_CANT_LOAD_CLASS_ICON: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x20C;
-pub const ERROR_INVALID_CLASS_INSTALLER: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x20D;
-pub const ERROR_DI_DO_DEFAULT: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x20E;
-pub const ERROR_DI_NOFILECOPY: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x20F;
-pub const ERROR_INVALID_HWPROFILE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x210;
-pub const ERROR_NO_DEVICE_SELECTED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x211;
-pub const ERROR_DEVINFO_LIST_LOCKED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x212;
-pub const ERROR_DEVINFO_DATA_LOCKED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x213;
-pub const ERROR_DI_BAD_PATH: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x214;
-pub const ERROR_NO_CLASSINSTALL_PARAMS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x215;
-pub const ERROR_FILEQUEUE_LOCKED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x216;
-pub const ERROR_BAD_SERVICE_INSTALLSECT: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x217;
-pub const ERROR_NO_CLASS_DRIVER_LIST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x218;
-pub const ERROR_NO_ASSOCIATED_SERVICE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x219;
-pub const ERROR_NO_DEFAULT_DEVICE_INTERFACE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21A;
-pub const ERROR_DEVICE_INTERFACE_ACTIVE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21B;
-pub const ERROR_DEVICE_INTERFACE_REMOVED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21C;
-pub const ERROR_BAD_INTERFACE_INSTALLSECT: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21D;
-pub const ERROR_NO_SUCH_INTERFACE_CLASS: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21E;
-pub const ERROR_INVALID_REFERENCE_STRING: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x21F;
-pub const ERROR_INVALID_MACHINENAME: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x220;
-pub const ERROR_REMOTE_COMM_FAILURE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x221;
-pub const ERROR_MACHINE_UNAVAILABLE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x222;
-pub const ERROR_NO_CONFIGMGR_SERVICES: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x223;
-pub const ERROR_INVALID_PROPPAGE_PROVIDER: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x224;
-pub const ERROR_NO_SUCH_DEVICE_INTERFACE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x225;
-pub const ERROR_DI_POSTPROCESSING_REQUIRED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x226;
-pub const ERROR_INVALID_COINSTALLER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x227;
-pub const ERROR_NO_COMPAT_DRIVERS: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x228;
-pub const ERROR_NO_DEVICE_ICON: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x229;
-pub const ERROR_INVALID_INF_LOGCONFIG: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22A;
-pub const ERROR_DI_DONT_INSTALL: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22B;
-pub const ERROR_INVALID_FILTER_DRIVER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22C;
-pub const ERROR_NON_WINDOWS_NT_DRIVER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22D;
-pub const ERROR_NON_WINDOWS_DRIVER: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22E;
-pub const ERROR_NO_CATALOG_FOR_OEM_INF: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x22F;
-pub const ERROR_DEVINSTALL_QUEUE_NONNATIVE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x230;
-pub const ERROR_NOT_DISABLEABLE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x231;
-pub const ERROR_CANT_REMOVE_DEVINST: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x232;
-pub const ERROR_INVALID_TARGET: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x233;
-pub const ERROR_DRIVER_NONNATIVE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x234;
-pub const ERROR_IN_WOW64: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x235;
-pub const ERROR_SET_SYSTEM_RESTORE_POINT: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x236;
-pub const ERROR_SCE_DISABLED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR | 0x238;
-pub const ERROR_UNKNOWN_EXCEPTION: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x239;
-pub const ERROR_PNP_REGISTRY_ERROR: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x23A;
-pub const ERROR_REMOTE_REQUEST_UNSUPPORTED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x23B;
-pub const ERROR_NOT_AN_INSTALLED_OEM_INF: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x23C;
-pub const ERROR_INF_IN_USE_BY_DEVICES: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x23D;
-pub const ERROR_DI_FUNCTION_OBSOLETE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x23E;
-pub const ERROR_NO_AUTHENTICODE_CATALOG: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x23F;
-pub const ERROR_AUTHENTICODE_DISALLOWED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x240;
-pub const ERROR_AUTHENTICODE_TRUSTED_PUBLISHER: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x241;
-pub const ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x242;
-pub const ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x243;
-pub const ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x244;
-pub const ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x245;
-pub const ERROR_DEVICE_INSTALLER_NOT_READY: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x246;
-pub const ERROR_DRIVER_STORE_ADD_FAILED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x247;
-pub const ERROR_DEVICE_INSTALL_BLOCKED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x248;
-pub const ERROR_DRIVER_INSTALL_BLOCKED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x249;
-pub const ERROR_WRONG_INF_TYPE: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x24A;
-pub const ERROR_FILE_HASH_NOT_IN_CATALOG: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x24B;
-pub const ERROR_DRIVER_STORE_DELETE_FAILED: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x24C;
-pub const ERROR_UNRECOVERABLE_STACK_OVERFLOW: ::DWORD = ::APPLICATION_ERROR_MASK
-    | ::ERROR_SEVERITY_ERROR | 0x300;
-pub const EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW: ::DWORD =
-    ERROR_UNRECOVERABLE_STACK_OVERFLOW;
-pub const ERROR_NO_DEFAULT_INTERFACE_DEVICE: ::DWORD = ERROR_NO_DEFAULT_DEVICE_INTERFACE;
-pub const ERROR_INTERFACE_DEVICE_ACTIVE: ::DWORD = ERROR_DEVICE_INTERFACE_ACTIVE;
-pub const ERROR_INTERFACE_DEVICE_REMOVED: ::DWORD = ERROR_DEVICE_INTERFACE_REMOVED;
-pub const ERROR_NO_SUCH_INTERFACE_DEVICE: ::DWORD = ERROR_NO_SUCH_DEVICE_INTERFACE;
-pub const ERROR_NOT_INSTALLED: ::DWORD = ::APPLICATION_ERROR_MASK | ::ERROR_SEVERITY_ERROR
-    | 0x1000;
-pub const INFINFO_INF_SPEC_IS_HINF: ::DWORD = 1;
-pub const INFINFO_INF_NAME_IS_ABSOLUTE: ::DWORD = 2;
-pub const INFINFO_DEFAULT_SEARCH: ::DWORD = 3;
-pub const INFINFO_REVERSE_DEFAULT_SEARCH: ::DWORD = 4;
-pub const INFINFO_INF_PATH_LIST_SEARCH: ::DWORD = 5;
-pub const FILE_COMPRESSION_NONE: ::UINT = 0;
-pub const FILE_COMPRESSION_WINLZA: ::UINT = 1;
-pub const FILE_COMPRESSION_MSZIP: ::UINT = 2;
-pub const FILE_COMPRESSION_NTCAB: ::UINT = 3;
-pub const SRCLIST_TEMPORARY: ::DWORD = 0x00000001;
-pub const SRCLIST_NOBROWSE: ::DWORD = 0x00000002;
-pub const SRCLIST_SYSTEM: ::DWORD = 0x00000010;
-pub const SRCLIST_USER: ::DWORD = 0x00000020;
-pub const SRCLIST_SYSIFADMIN: ::DWORD = 0x00000040;
-pub const SRCLIST_SUBDIRS: ::DWORD = 0x00000100;
-pub const SRCLIST_APPEND: ::DWORD = 0x00000200;
-pub const SRCLIST_NOSTRIPPLATFORM: ::DWORD = 0x00000400;
-pub const IDF_NOBROWSE: ::DWORD = 0x00000001;
-pub const IDF_NOSKIP: ::DWORD = 0x00000002;
-pub const IDF_NODETAILS: ::DWORD = 0x00000004;
-pub const IDF_NOCOMPRESSED: ::DWORD = 0x00000008;
-pub const IDF_CHECKFIRST: ::DWORD = 0x00000100;
-pub const IDF_NOBEEP: ::DWORD = 0x00000200;
-pub const IDF_NOFOREGROUND: ::DWORD = 0x00000400;
-pub const IDF_WARNIFSKIP: ::DWORD = 0x00000800;
-pub const IDF_NOREMOVABLEMEDIAPROMPT: ::DWORD = 0x00001000;
-pub const IDF_USEDISKNAMEASPROMPT: ::DWORD = 0x00002000;
-pub const IDF_OEMDISK: ::DWORD = 0x80000000;
-pub const DPROMPT_SUCCESS: ::UINT = 0;
-pub const DPROMPT_CANCEL: ::UINT = 1;
-pub const DPROMPT_SKIPFILE: ::UINT = 2;
-pub const DPROMPT_BUFFERTOOSMALL: ::UINT = 3;
-pub const DPROMPT_OUTOFMEMORY: ::UINT = 4;
-pub const SETDIRID_NOT_FULL_PATH: ::DWORD = 0x00000001;
-pub const SRCINFO_PATH: ::UINT = 1;
-pub const SRCINFO_TAGFILE: ::UINT = 2;
-pub const SRCINFO_DESCRIPTION: ::UINT = 3;
-pub const SRCINFO_FLAGS: ::UINT = 4;
-pub const SRCINFO_TAGFILE2: ::UINT = 4;
-pub const SRC_FLAGS_CABFILE: ::UINT = 0x0010;
-pub const SP_COPY_DELETESOURCE: ::DWORD = 0x0000001;
-pub const SP_COPY_REPLACEONLY: ::DWORD = 0x0000002;
-pub const SP_COPY_NEWER: ::DWORD = 0x0000004;
-pub const SP_COPY_NEWER_OR_SAME: ::DWORD = SP_COPY_NEWER;
-pub const SP_COPY_NOOVERWRITE: ::DWORD = 0x0000008;
-pub const SP_COPY_NODECOMP: ::DWORD = 0x0000010;
-pub const SP_COPY_LANGUAGEAWARE: ::DWORD = 0x0000020;
-pub const SP_COPY_SOURCE_ABSOLUTE: ::DWORD = 0x0000040;
-pub const SP_COPY_SOURCEPATH_ABSOLUTE: ::DWORD = 0x0000080;
-pub const SP_COPY_IN_USE_NEEDS_REBOOT: ::DWORD = 0x0000100;
-pub const SP_COPY_FORCE_IN_USE: ::DWORD = 0x0000200;
-pub const SP_COPY_NOSKIP: ::DWORD = 0x0000400;
-pub const SP_FLAG_CABINETCONTINUATION: ::DWORD = 0x0000800;
-pub const SP_COPY_FORCE_NOOVERWRITE: ::DWORD = 0x0001000;
-pub const SP_COPY_FORCE_NEWER: ::DWORD = 0x0002000;
-pub const SP_COPY_WARNIFSKIP: ::DWORD = 0x0004000;
-pub const SP_COPY_NOBROWSE: ::DWORD = 0x0008000;
-pub const SP_COPY_NEWER_ONLY: ::DWORD = 0x0010000;
-pub const SP_COPY_RESERVED: ::DWORD = 0x0020000;
-pub const SP_COPY_OEMINF_CATALOG_ONLY: ::DWORD = 0x0040000;
-pub const SP_COPY_REPLACE_BOOT_FILE: ::DWORD = 0x0080000;
-pub const SP_COPY_NOPRUNE: ::DWORD = 0x0100000;
-pub const SP_COPY_OEM_F6_INF: ::DWORD = 0x0200000;
-pub const SP_COPY_ALREADYDECOMP: ::DWORD = 0x0400000;
-pub const SP_COPY_WINDOWS_SIGNED: ::DWORD = 0x1000000;
-pub const SP_COPY_PNPLOCKED: ::DWORD = 0x2000000;
-pub const SP_COPY_IN_USE_TRY_RENAME: ::DWORD = 0x4000000;
-pub const SP_COPY_INBOX_INF: ::DWORD = 0x8000000;
-pub const SP_COPY_HARDLINK: ::DWORD = 0x10000000;
-pub const SP_BACKUP_BACKUPPASS: ::DWORD = 0x00000001;
-pub const SP_BACKUP_DEMANDPASS: ::DWORD = 0x00000002;
-pub const SP_BACKUP_SPECIAL: ::DWORD = 0x00000004;
-pub const SP_BACKUP_BOOTFILE: ::DWORD = 0x00000008;
-pub const SPQ_SCAN_FILE_PRESENCE: ::DWORD = 0x00000001;
-pub const SPQ_SCAN_FILE_VALIDITY: ::DWORD = 0x00000002;
-pub const SPQ_SCAN_USE_CALLBACK: ::DWORD = 0x00000004;
-pub const SPQ_SCAN_USE_CALLBACKEX: ::DWORD = 0x00000008;
-pub const SPQ_SCAN_INFORM_USER: ::DWORD = 0x00000010;
-pub const SPQ_SCAN_PRUNE_COPY_QUEUE: ::DWORD = 0x00000020;
-pub const SPQ_SCAN_USE_CALLBACK_SIGNERINFO: ::DWORD = 0x00000040;
-pub const SPQ_SCAN_PRUNE_DELREN: ::DWORD = 0x00000080;
-pub const SPQ_SCAN_FILE_PRESENCE_WITHOUT_SOURCE: ::DWORD = 0x00000100;
-pub const SPQ_SCAN_FILE_COMPARISON: ::DWORD = 0x00000200;
-pub const SPQ_SCAN_ACTIVATE_DRP: ::DWORD = 0x00000400;
-pub const SPQ_DELAYED_COPY: ::DWORD = 0x00000001;
-pub const SPQ_FLAG_BACKUP_AWARE: ::DWORD = 0x00000001;
-pub const SPQ_FLAG_ABORT_IF_UNSIGNED: ::DWORD = 0x00000002;
-pub const SPQ_FLAG_FILES_MODIFIED: ::DWORD = 0x00000004;
-pub const SPQ_FLAG_DO_SHUFFLEMOVE: ::DWORD = 0x00000008;
-pub const SPQ_FLAG_VALID: ::DWORD = 0x0000000F;
-pub const SPOST_NONE: ::DWORD = 0;
-pub const SPOST_PATH: ::DWORD = 1;
-pub const SPOST_URL: ::DWORD = 2;
-pub const SPOST_MAX: ::DWORD = 3;
-pub const SUOI_FORCEDELETE: ::DWORD = 0x00000001;
-pub const SUOI_INTERNAL1: ::DWORD = 0x00000002;
-pub const SPDSL_IGNORE_DISK: ::UINT = 0x00000001;
-pub const SPDSL_DISALLOW_NEGATIVE_ADJUST: ::UINT = 0x00000002;
-pub const SPFILEQ_FILE_IN_USE: ::INT = 0x00000001;
-pub const SPFILEQ_REBOOT_RECOMMENDED: ::INT = 0x00000002;
-pub const SPFILEQ_REBOOT_IN_PROGRESS: ::INT = 0x00000004;
-pub const FLG_ADDREG_DELREG_BIT: ::DWORD = 0x00008000;
-pub const FLG_ADDREG_BINVALUETYPE: ::DWORD = 0x00000001;
-pub const FLG_ADDREG_NOCLOBBER: ::DWORD = 0x00000002;
-pub const FLG_ADDREG_DELVAL: ::DWORD = 0x00000004;
-pub const FLG_ADDREG_APPEND: ::DWORD = 0x00000008;
-pub const FLG_ADDREG_KEYONLY: ::DWORD = 0x00000010;
-pub const FLG_ADDREG_OVERWRITEONLY: ::DWORD = 0x00000020;
-pub const FLG_ADDREG_64BITKEY: ::DWORD = 0x00001000;
-pub const FLG_ADDREG_KEYONLY_COMMON: ::DWORD = 0x00002000;
-pub const FLG_ADDREG_32BITKEY: ::DWORD = 0x00004000;
-pub const FLG_ADDREG_TYPE_MASK: ::DWORD = 0xFFFF0000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_ADDREG_TYPE_SZ: ::DWORD = 0x00000000;
-pub const FLG_ADDREG_TYPE_MULTI_SZ: ::DWORD = 0x00010000;
-pub const FLG_ADDREG_TYPE_EXPAND_SZ: ::DWORD = 0x00020000;
-pub const FLG_ADDREG_TYPE_BINARY: ::DWORD = 0x00000000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_ADDREG_TYPE_DWORD: ::DWORD = 0x00010000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_ADDREG_TYPE_NONE: ::DWORD = 0x00020000 | FLG_ADDREG_BINVALUETYPE;
-pub const FLG_DELREG_VALUE: ::DWORD = 0x00000000;
-pub const FLG_DELREG_TYPE_MASK: ::DWORD = FLG_ADDREG_TYPE_MASK;
-pub const FLG_DELREG_TYPE_SZ: ::DWORD = FLG_ADDREG_TYPE_SZ;
-pub const FLG_DELREG_TYPE_MULTI_SZ: ::DWORD = FLG_ADDREG_TYPE_MULTI_SZ;
-pub const FLG_DELREG_TYPE_EXPAND_SZ: ::DWORD = FLG_ADDREG_TYPE_EXPAND_SZ;
-pub const FLG_DELREG_TYPE_BINARY: ::DWORD = FLG_ADDREG_TYPE_BINARY;
-pub const FLG_DELREG_TYPE_DWORD: ::DWORD = FLG_ADDREG_TYPE_DWORD;
-pub const FLG_DELREG_TYPE_NONE: ::DWORD = FLG_ADDREG_TYPE_NONE;
-pub const FLG_DELREG_64BITKEY: ::DWORD = FLG_ADDREG_64BITKEY;
-pub const FLG_DELREG_KEYONLY_COMMON: ::DWORD = FLG_ADDREG_KEYONLY_COMMON;
-pub const FLG_DELREG_32BITKEY: ::DWORD = FLG_ADDREG_32BITKEY;
-pub const FLG_DELREG_OPERATION_MASK: ::DWORD = 0x000000FE;
-pub const FLG_DELREG_MULTI_SZ_DELSTRING: ::DWORD = FLG_DELREG_TYPE_MULTI_SZ | FLG_ADDREG_DELREG_BIT
-    | 0x00000002;
-pub const FLG_BITREG_CLEARBITS: ::DWORD = 0x00000000;
-pub const FLG_BITREG_SETBITS: ::DWORD = 0x00000001;
-pub const FLG_BITREG_64BITKEY: ::DWORD = 0x00001000;
-pub const FLG_BITREG_32BITKEY: ::DWORD = 0x00004000;
-pub const FLG_INI2REG_64BITKEY: ::DWORD = 0x00001000;
-pub const FLG_INI2REG_32BITKEY: ::DWORD = 0x00004000;
-pub const FLG_REGSVR_DLLREGISTER: ::DWORD = 0x00000001;
-pub const FLG_REGSVR_DLLINSTALL: ::DWORD = 0x00000002;
-pub const FLG_PROFITEM_CURRENTUSER: ::DWORD = 0x00000001;
-pub const FLG_PROFITEM_DELETE: ::DWORD = 0x00000002;
-pub const FLG_PROFITEM_GROUP: ::DWORD = 0x00000004;
-pub const FLG_PROFITEM_CSIDL: ::DWORD = 0x00000008;
-pub const FLG_ADDPROPERTY_NOCLOBBER: ::DWORD = 0x00000001;
-pub const FLG_ADDPROPERTY_OVERWRITEONLY: ::DWORD = 0x00000002;
-pub const FLG_ADDPROPERTY_APPEND: ::DWORD = 0x00000004;
-pub const FLG_ADDPROPERTY_OR: ::DWORD = 0x00000008;
-pub const FLG_ADDPROPERTY_AND: ::DWORD = 0x00000010;
-pub const FLG_DELPROPERTY_MULTI_SZ_DELSTRING: ::DWORD = 0x00000001;
-pub const SPINST_LOGCONFIG: ::UINT = 0x00000001;
-pub const SPINST_INIFILES: ::UINT = 0x00000002;
-pub const SPINST_REGISTRY: ::UINT = 0x00000004;
-pub const SPINST_INI2REG: ::UINT = 0x00000008;
-pub const SPINST_FILES: ::UINT = 0x00000010;
-pub const SPINST_BITREG: ::UINT = 0x00000020;
-pub const SPINST_REGSVR: ::UINT = 0x00000040;
-pub const SPINST_UNREGSVR: ::UINT = 0x00000080;
-pub const SPINST_PROFILEITEMS: ::UINT = 0x00000100;
-pub const SPINST_COPYINF: ::UINT = 0x00000200;
-pub const SPINST_PROPERTIES: ::UINT = 0x00000400;
-pub const SPINST_ALL: ::UINT = 0x000007ff;
-pub const SPINST_SINGLESECTION: ::UINT = 0x00010000;
-pub const SPINST_LOGCONFIG_IS_FORCED: ::UINT = 0x00020000;
-pub const SPINST_LOGCONFIGS_ARE_OVERRIDES: ::UINT = 0x00040000;
-pub const SPINST_REGISTERCALLBACKAWARE: ::UINT = 0x00080000;
-pub const SPINST_DEVICEINSTALL: ::UINT = 0x00100000;
-pub const SPSVCINST_TAGTOFRONT: ::DWORD = 0x00000001;
-pub const SPSVCINST_ASSOCSERVICE: ::DWORD = 0x00000002;
-pub const SPSVCINST_DELETEEVENTLOGENTRY: ::DWORD = 0x00000004;
-pub const SPSVCINST_NOCLOBBER_DISPLAYNAME: ::DWORD = 0x00000008;
-pub const SPSVCINST_NOCLOBBER_STARTTYPE: ::DWORD = 0x00000010;
-pub const SPSVCINST_NOCLOBBER_ERRORCONTROL: ::DWORD = 0x00000020;
-pub const SPSVCINST_NOCLOBBER_LOADORDERGROUP: ::DWORD = 0x00000040;
-pub const SPSVCINST_NOCLOBBER_DEPENDENCIES: ::DWORD = 0x00000080;
-pub const SPSVCINST_NOCLOBBER_DESCRIPTION: ::DWORD = 0x00000100;
-pub const SPSVCINST_STOPSERVICE: ::DWORD = 0x00000200;
-pub const SPSVCINST_CLOBBER_SECURITY: ::DWORD = 0x00000400;
-pub const SPSVCINST_STARTSERVICE: ::DWORD = 0x00000800;
-pub const SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES: ::DWORD = 0x00001000;
-pub type HSPFILELOG = ::PVOID;
-pub const SPFILELOG_SYSTEMLOG: ::DWORD = 0x00000001;
-pub const SPFILELOG_FORCENEW: ::DWORD = 0x00000002;
-pub const SPFILELOG_QUERYONLY: ::DWORD = 0x00000004;
-pub const SPFILELOG_OEMFILE: ::DWORD = 0x00000001;
-ENUM!{enum SetupFileLogInfo {
-    SetupFileLogSourceFilename,
-    SetupFileLogChecksum,
-    SetupFileLogDiskTagfile,
-    SetupFileLogDiskDescription,
-    SetupFileLogOtherInfo,
-    SetupFileLogMax,
-}}
-pub type LogSeverity = ::DWORD;
-pub const LogSevInformation: LogSeverity = 0x00000000;
-pub const LogSevWarning: LogSeverity = 0x00000001;
-pub const LogSevError: LogSeverity = 0x00000002;
-pub const LogSevFatalError: LogSeverity = 0x00000003;
-pub const LogSevMaximum: LogSeverity = 0x00000004;
-pub const DICD_GENERATE_ID: ::DWORD = 0x00000001;
-pub const DICD_INHERIT_CLASSDRVS: ::DWORD = 0x00000002;
-pub const DIOD_INHERIT_CLASSDRVS: ::DWORD = 0x00000002;
-pub const DIOD_CANCEL_REMOVE: ::DWORD = 0x00000004;
-pub const DIODI_NO_ADD: ::DWORD = 0x00000001;
-pub const SPRDI_FIND_DUPS: ::DWORD = 0x00000001;
-pub const SPDIT_NODRIVER: ::DWORD = 0x00000000;
-pub const SPDIT_CLASSDRIVER: ::DWORD = 0x00000001;
-pub const SPDIT_COMPATDRIVER: ::DWORD = 0x00000002;
-pub const DIGCF_DEFAULT: ::DWORD = 0x00000001;
-pub const DIGCF_PRESENT: ::DWORD = 0x00000002;
-pub const DIGCF_ALLCLASSES: ::DWORD = 0x00000004;
-pub const DIGCF_PROFILE: ::DWORD = 0x00000008;
-pub const DIGCF_DEVICEINTERFACE: ::DWORD = 0x00000010;
-pub const DIBCI_NOINSTALLCLASS: ::DWORD = 0x00000001;
-pub const DIBCI_NODISPLAYCLASS: ::DWORD = 0x00000002;
-pub const DIOCR_INSTALLER: ::DWORD = 0x00000001;
-pub const DIOCR_INTERFACE: ::DWORD = 0x00000002;
-pub const DIREG_DEV: ::DWORD = 0x00000001;
-pub const DIREG_DRV: ::DWORD = 0x00000002;
-pub const DIREG_BOTH: ::DWORD = 0x00000004;
-pub const DICLASSPROP_INSTALLER: ::DWORD = 0x00000001;
-pub const DICLASSPROP_INTERFACE: ::DWORD = 0x00000002;
-pub const SPDRP_DEVICEDESC: ::DWORD = 0x00000000;
-pub const SPDRP_HARDWAREID: ::DWORD = 0x00000001;
-pub const SPDRP_COMPATIBLEIDS: ::DWORD = 0x00000002;
-pub const SPDRP_UNUSED0: ::DWORD = 0x00000003;
-pub const SPDRP_SERVICE: ::DWORD = 0x00000004;
-pub const SPDRP_UNUSED1: ::DWORD = 0x00000005;
-pub const SPDRP_UNUSED2: ::DWORD = 0x00000006;
-pub const SPDRP_CLASS: ::DWORD = 0x00000007;
-pub const SPDRP_CLASSGUID: ::DWORD = 0x00000008;
-pub const SPDRP_DRIVER: ::DWORD = 0x00000009;
-pub const SPDRP_CONFIGFLAGS: ::DWORD = 0x0000000A;
-pub const SPDRP_MFG: ::DWORD = 0x0000000B;
-pub const SPDRP_FRIENDLYNAME: ::DWORD = 0x0000000C;
-pub const SPDRP_LOCATION_INFORMATION: ::DWORD = 0x0000000D;
-pub const SPDRP_PHYSICAL_DEVICE_OBJECT_NAME: ::DWORD = 0x0000000E;
-pub const SPDRP_CAPABILITIES: ::DWORD = 0x0000000F;
-pub const SPDRP_UI_NUMBER: ::DWORD = 0x00000010;
-pub const SPDRP_UPPERFILTERS: ::DWORD = 0x00000011;
-pub const SPDRP_LOWERFILTERS: ::DWORD = 0x00000012;
-pub const SPDRP_BUSTYPEGUID: ::DWORD = 0x00000013;
-pub const SPDRP_LEGACYBUSTYPE: ::DWORD = 0x00000014;
-pub const SPDRP_BUSNUMBER: ::DWORD = 0x00000015;
-pub const SPDRP_ENUMERATOR_NAME: ::DWORD = 0x00000016;
-pub const SPDRP_SECURITY: ::DWORD = 0x00000017;
-pub const SPDRP_SECURITY_SDS: ::DWORD = 0x00000018;
-pub const SPDRP_DEVTYPE: ::DWORD = 0x00000019;
-pub const SPDRP_EXCLUSIVE: ::DWORD = 0x0000001A;
-pub const SPDRP_CHARACTERISTICS: ::DWORD = 0x0000001B;
-pub const SPDRP_ADDRESS: ::DWORD = 0x0000001C;
-pub const SPDRP_UI_NUMBER_DESC_FORMAT: ::DWORD = 0x0000001D;
-pub const SPDRP_DEVICE_POWER_DATA: ::DWORD = 0x0000001E;
-pub const SPDRP_REMOVAL_POLICY: ::DWORD = 0x0000001F;
-pub const SPDRP_REMOVAL_POLICY_HW_DEFAULT: ::DWORD = 0x00000020;
-pub const SPDRP_REMOVAL_POLICY_OVERRIDE: ::DWORD = 0x00000021;
-pub const SPDRP_INSTALL_STATE: ::DWORD = 0x00000022;
-pub const SPDRP_LOCATION_PATHS: ::DWORD = 0x00000023;
-pub const SPDRP_BASE_CONTAINERID: ::DWORD = 0x00000024;
-pub const SPDRP_MAXIMUM_PROPERTY: ::DWORD = 0x00000025;
-pub const SPCRP_UPPERFILTERS: ::DWORD = 0x00000011;
-pub const SPCRP_LOWERFILTERS: ::DWORD = 0x00000012;
-pub const SPCRP_SECURITY: ::DWORD = 0x00000017;
-pub const SPCRP_SECURITY_SDS: ::DWORD = 0x00000018;
-pub const SPCRP_DEVTYPE: ::DWORD = 0x00000019;
-pub const SPCRP_EXCLUSIVE: ::DWORD = 0x0000001A;
-pub const SPCRP_CHARACTERISTICS: ::DWORD = 0x0000001B;
-pub const SPCRP_MAXIMUM_PROPERTY: ::DWORD = 0x0000001C;
-pub const DMI_MASK: ::DWORD = 0x00000001;
-pub const DMI_BKCOLOR: ::DWORD = 0x00000002;
-pub const DMI_USERECT: ::DWORD = 0x00000004;
-pub const DIGCDP_FLAG_BASIC: ::DWORD = 0x00000001;
-pub const DIGCDP_FLAG_ADVANCED: ::DWORD = 0x00000002;
-pub const DIGCDP_FLAG_REMOTE_BASIC: ::DWORD = 0x00000003;
-pub const DIGCDP_FLAG_REMOTE_ADVANCED: ::DWORD = 0x00000004;
-pub const IDI_RESOURCEFIRST: ::c_int = 159;
-pub const IDI_RESOURCE: ::c_int = 159;
-pub const IDI_RESOURCELAST: ::c_int = 161;
-pub const IDI_RESOURCEOVERLAYFIRST: ::c_int = 161;
-pub const IDI_RESOURCEOVERLAYLAST: ::c_int = 161;
-pub const IDI_CONFLICT: ::c_int = 161;
-pub const IDI_CLASSICON_OVERLAYFIRST: ::c_int = 500;
-pub const IDI_CLASSICON_OVERLAYLAST: ::c_int = 502;
-pub const IDI_PROBLEM_OVL: ::c_int = 500;
-pub const IDI_DISABLED_OVL: ::c_int = 501;
-pub const IDI_FORCED_OVL: ::c_int = 502;
-pub const SPWPT_SELECTDEVICE: ::DWORD = 0x00000001;
-pub const SPWP_USE_DEVINFO_DATA: ::DWORD = 0x00000001;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V1_A {
-    cbSize: ::DWORD,
-    CatalogFile: [::CHAR; ::MAX_PATH],
-    DigitalSigner: [::CHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::CHAR; ::MAX_PATH],
-}}
-pub type PSP_INF_SIGNER_INFO_V1_A = *mut SP_INF_SIGNER_INFO_V1_A;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V1_W {
-    cbSize: ::DWORD,
-    CatalogFile: [::WCHAR; ::MAX_PATH],
-    DigitalSigner: [::WCHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::WCHAR; ::MAX_PATH],
-}}
-pub type PSP_INF_SIGNER_INFO_V1_W = *mut SP_INF_SIGNER_INFO_V1_W;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V2_A {
-    cbSize: ::DWORD,
-    CatalogFile: [::CHAR; ::MAX_PATH],
-    DigitalSigner: [::CHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::CHAR; ::MAX_PATH],
-    SignerScore: ::DWORD,
-}}
-pub type PSP_INF_SIGNER_INFO_V2_A = *mut SP_INF_SIGNER_INFO_V2_A;
-STRUCT!{nodebug struct SP_INF_SIGNER_INFO_V2_W {
-    cbSize: ::DWORD,
-    CatalogFile: [::WCHAR; ::MAX_PATH],
-    DigitalSigner: [::WCHAR; ::MAX_PATH],
-    DigitalSignerVersion: [::WCHAR; ::MAX_PATH],
-    SignerScore: ::DWORD,
-}}
-pub type PSP_INF_SIGNER_INFO_V2_W = *mut SP_INF_SIGNER_INFO_V2_W;
-pub type SP_INF_SIGNER_INFO_A = SP_INF_SIGNER_INFO_V2_A;
-pub type PSP_INF_SIGNER_INFO_A = PSP_INF_SIGNER_INFO_V2_A;
-pub type SP_INF_SIGNER_INFO_W = SP_INF_SIGNER_INFO_V2_W;
-pub type PSP_INF_SIGNER_INFO_W = PSP_INF_SIGNER_INFO_V2_W;
-pub const SIGNERSCORE_UNKNOWN: ::DWORD = 0xFF000000;
-pub const SIGNERSCORE_W9X_SUSPECT: ::DWORD = 0xC0000000;
-pub const SIGNERSCORE_UNSIGNED: ::DWORD = 0x80000000;
-pub const SIGNERSCORE_AUTHENTICODE: ::DWORD = 0x0F000000;
-pub const SIGNERSCORE_WHQL: ::DWORD = 0x0D000005;
-pub const SIGNERSCORE_UNCLASSIFIED: ::DWORD = 0x0D000004;
-pub const SIGNERSCORE_INBOX: ::DWORD = 0x0D000003;
-pub const SIGNERSCORE_LOGO_STANDARD: ::DWORD = 0x0D000002;
-pub const SIGNERSCORE_LOGO_PREMIUM: ::DWORD = 0x0D000001;
-pub const SIGNERSCORE_MASK: ::DWORD = 0xFF000000;
-pub const SIGNERSCORE_SIGNED_MASK: ::DWORD = 0xF0000000;
-pub const DICUSTOMDEVPROP_MERGE_MULTISZ: ::DWORD = 0x00000001;
-pub const SCWMI_CLOBBER_SECURITY: ::DWORD = 0x00000001;
diff --git a/vendor/winapi-0.2.8/src/shellapi.rs b/vendor/winapi-0.2.8/src/shellapi.rs
deleted file mode 100644
index 6f253cfd15..0000000000
--- a/vendor/winapi-0.2.8/src/shellapi.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-// STUB
-DECLARE_HANDLE!(HDROP, HDROP__);
-
-pub const NIM_ADD: ::DWORD = 0x00000000;
-pub const NIM_MODIFY: ::DWORD = 0x00000001;
-pub const NIM_DELETE: ::DWORD = 0x00000002;
-pub const NIM_SETFOCUS: ::DWORD = 0x00000003;
-pub const NIM_SETVERSION: ::DWORD = 0x00000004;
-pub const NIF_MESSAGE: ::UINT = 0x00000001;
-pub const NIF_ICON: ::UINT = 0x00000002;
-pub const NIF_TIP: ::UINT = 0x00000004;
-pub const NIF_STATE: ::UINT = 0x00000008;
-pub const NIF_INFO: ::UINT = 0x00000010;
-pub const NIF_GUID: ::UINT = 0x00000020;
-pub const NIF_REALTIME: ::UINT = 0x00000040;
-pub const NIF_SHOWTIP: ::UINT = 0x00000080;
-pub const NOTIFYICON_VERSION: ::UINT = 3;
-pub const NOTIFYICON_VERSION_4: ::UINT = 4;
-
-STRUCT!{nodebug struct NOTIFYICONDATAA {
-    cbSize: ::DWORD,
-    hWnd: ::HWND,
-    uID: ::UINT,
-    uFlags: ::UINT,
-    uCallbackMessage: ::UINT,
-    hIcon: ::HICON,
-    szTip: [::CHAR; 128],
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    szInfo: [::CHAR; 256],
-    uTimeout: ::UINT,
-    szInfoTitle: [::CHAR; 64],
-    dwInfoFlags: ::DWORD,
-    guidItem: ::GUID,
-    hBalloonIcon: ::HICON,
-}}
-UNION!(NOTIFYICONDATAA, uTimeout, uTimeout, uTimeout_mut, ::UINT);
-UNION!(NOTIFYICONDATAA, uTimeout, uVersion, uVersion_mut, ::UINT);
-pub type PNOTIFYICONDATAA = *mut NOTIFYICONDATAA;
-
-STRUCT!{nodebug struct NOTIFYICONDATAW {
-    cbSize: ::DWORD,
-    hWnd: ::HWND,
-    uID: ::UINT,
-    uFlags: ::UINT,
-    uCallbackMessage: ::UINT,
-    hIcon: ::HICON,
-    szTip: [::WCHAR; 128],
-    dwState: ::DWORD,
-    dwStateMask: ::DWORD,
-    szInfo: [::WCHAR; 256],
-    uTimeout: ::UINT,
-    szInfoTitle: [::WCHAR; 64],
-    dwInfoFlags: ::DWORD,
-    guidItem: ::GUID,
-    hBalloonIcon: ::HICON,
-}}
-UNION!(NOTIFYICONDATAW, uTimeout, uTimeout, uTimeout_mut, ::UINT);
-UNION!(NOTIFYICONDATAW, uTimeout, uVersion, uVersion_mut, ::UINT); // used with NIM_SETVERSION, values 0, 3 and 4
-pub type PNOTIFYICONDATAW = *mut NOTIFYICONDATAW;
diff --git a/vendor/winapi-0.2.8/src/shellscalingapi.rs b/vendor/winapi-0.2.8/src/shellscalingapi.rs
deleted file mode 100644
index d313ddef92..0000000000
--- a/vendor/winapi-0.2.8/src/shellscalingapi.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-// ShellScalingApi.h
-ENUM!{enum PROCESS_DPI_AWARENESS {
-    Process_DPI_Unaware = 0,
-    Process_System_DPI_Aware  = 1,
-    Process_Per_Monitor_DPI_Aware = 2,
-}}
-ENUM!{enum SHELL_UI_COMPONENT {
-    SHELL_UI_COMPONENT_TASKBARS = 0,
-    SHELL_UI_COMPONENT_NOTIFICATIONAREA = 1,
-    SHELL_UI_COMPONENT_DESKBAND = 2,
-}}
-ENUM!{enum MONITOR_DPI_TYPE {
-    MDT_EFFECTIVE_DPI = 0,
-    MDT_ANGULAR_DPI = 1,
-    MDT_RAW_DPI = 2,
-}}
-pub const MDT_DEFAULT: MONITOR_DPI_TYPE = MDT_EFFECTIVE_DPI;
diff --git a/vendor/winapi-0.2.8/src/shlguid.rs b/vendor/winapi-0.2.8/src/shlguid.rs
deleted file mode 100644
index f01b4e4522..0000000000
--- a/vendor/winapi-0.2.8/src/shlguid.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
diff --git a/vendor/winapi-0.2.8/src/shlobj.rs b/vendor/winapi-0.2.8/src/shlobj.rs
deleted file mode 100644
index d551f9215c..0000000000
--- a/vendor/winapi-0.2.8/src/shlobj.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright © 2015, Peter Atashian, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-pub const INVALID_HANDLE_VALUE: ::HANDLE = -1isize as ::HANDLE;
-pub type GPFIDL_FLAGS = ::c_int;
-ENUM!{enum KNOWN_FOLDER_FLAG {
-    KF_FLAG_DEFAULT = 0x00000000,
-    KF_FLAG_NO_APPCONTAINER_REDIRECTION = 0x00010000,
-    KF_FLAG_CREATE = 0x00008000,
-    KF_FLAG_DONT_VERIFY = 0x00004000,
-    KF_FLAG_DONT_UNEXPAND = 0x00002000,
-    KF_FLAG_NO_ALIAS = 0x00001000,
-    KF_FLAG_INIT = 0x00000800,
-    KF_FLAG_DEFAULT_PATH = 0x00000400,
-    KF_FLAG_NOT_PARENT_RELATIVE = 0x00000200,
-    KF_FLAG_SIMPLE_IDLIST = 0x00000100,
-    KF_FLAG_ALIAS_ONLY = 0x80000000,
-}}
-pub const IDO_SHGIOI_SHARE: ::c_int = 0x0FFFFFFF;
-pub const IDO_SHGIOI_LINK: ::c_int = 0x0FFFFFFE;
-// Yes, these values are supposed to overflow. Blame Microsoft.
-pub const IDO_SHGIOI_SLOWFILE: ::c_int = 0xFFFFFFFDu32 as ::c_int;
-pub const IDO_SHGIOI_DEFAULT: ::c_int = 0xFFFFFFFCu32 as ::c_int;
-pub const GPFIDL_DEFAULT: GPFIDL_FLAGS = 0x0000;
-pub const GPFIDL_ALTNAME: GPFIDL_FLAGS = 0x0001;
-pub const GPFIDL_UNCPRINTER: GPFIDL_FLAGS = 0x0002;
-pub const OFASI_EDIT: ::DWORD = 0x0001;
-pub const OFASI_OPENDESKTOP: ::DWORD = 0x0002;
-// 1204
-pub const CSIDL_DESKTOP: ::c_int = 0x0000;
-pub const CSIDL_INTERNET: ::c_int = 0x0001;
-pub const CSIDL_PROGRAMS: ::c_int = 0x0002;
-pub const CSIDL_CONTROLS: ::c_int = 0x0003;
-pub const CSIDL_PRINTERS: ::c_int = 0x0004;
-pub const CSIDL_PERSONAL: ::c_int = 0x0005;
-pub const CSIDL_FAVORITES: ::c_int = 0x0006;
-pub const CSIDL_STARTUP: ::c_int = 0x0007;
-pub const CSIDL_RECENT: ::c_int = 0x0008;
-pub const CSIDL_SENDTO: ::c_int = 0x0009;
-pub const CSIDL_BITBUCKET: ::c_int = 0x000a;
-pub const CSIDL_STARTMENU: ::c_int = 0x000b;
-pub const CSIDL_MYDOCUMENTS: ::c_int = CSIDL_PERSONAL;
-pub const CSIDL_MYMUSIC: ::c_int = 0x000d;
-pub const CSIDL_MYVIDEO: ::c_int = 0x000e;
-pub const CSIDL_DESKTOPDIRECTORY: ::c_int = 0x0010;
-pub const CSIDL_DRIVES: ::c_int = 0x0011;
-pub const CSIDL_NETWORK: ::c_int = 0x0012;
-pub const CSIDL_NETHOOD: ::c_int = 0x0013;
-pub const CSIDL_FONTS: ::c_int = 0x0014;
-pub const CSIDL_TEMPLATES: ::c_int = 0x0015;
-pub const CSIDL_COMMON_STARTMENU: ::c_int = 0x0016;
-pub const CSIDL_COMMON_PROGRAMS: ::c_int = 0x0017;
-pub const CSIDL_COMMON_STARTUP: ::c_int = 0x0018;
-pub const CSIDL_COMMON_DESKTOPDIRECTORY: ::c_int = 0x0019;
-pub const CSIDL_APPDATA: ::c_int = 0x001a;
-pub const CSIDL_PRINTHOOD: ::c_int = 0x001b;
-pub const CSIDL_LOCAL_APPDATA: ::c_int = 0x001c;
-pub const CSIDL_ALTSTARTUP: ::c_int = 0x001d;
-pub const CSIDL_COMMON_ALTSTARTUP: ::c_int = 0x001e;
-pub const CSIDL_COMMON_FAVORITES: ::c_int = 0x001f;
-pub const CSIDL_INTERNET_CACHE: ::c_int = 0x0020;
-pub const CSIDL_COOKIES: ::c_int = 0x0021;
-pub const CSIDL_HISTORY: ::c_int = 0x0022;
-pub const CSIDL_COMMON_APPDATA: ::c_int = 0x0023;
-pub const CSIDL_WINDOWS: ::c_int = 0x0024;
-pub const CSIDL_SYSTEM: ::c_int = 0x0025;
-pub const CSIDL_PROGRAM_FILES: ::c_int = 0x0026;
-pub const CSIDL_MYPICTURES: ::c_int = 0x0027;
-pub const CSIDL_PROFILE: ::c_int = 0x0028;
-pub const CSIDL_SYSTEMX86: ::c_int = 0x0029;
-pub const CSIDL_PROGRAM_FILESX86: ::c_int = 0x002a;
-pub const CSIDL_PROGRAM_FILES_COMMON: ::c_int = 0x002b;
-pub const CSIDL_PROGRAM_FILES_COMMONX86: ::c_int = 0x002c;
-pub const CSIDL_COMMON_TEMPLATES: ::c_int = 0x002d;
-pub const CSIDL_COMMON_DOCUMENTS: ::c_int = 0x002e;
-pub const CSIDL_COMMON_ADMINTOOLS: ::c_int = 0x002f;
-pub const CSIDL_ADMINTOOLS: ::c_int = 0x0030;
-pub const CSIDL_CONNECTIONS: ::c_int = 0x0031;
-pub const CSIDL_COMMON_MUSIC: ::c_int = 0x0035;
-pub const CSIDL_COMMON_PICTURES: ::c_int = 0x0036;
-pub const CSIDL_COMMON_VIDEO: ::c_int = 0x0037;
-pub const CSIDL_RESOURCES: ::c_int = 0x0038;
-pub const CSIDL_RESOURCES_LOCALIZED: ::c_int = 0x0039;
-pub const CSIDL_COMMON_OEM_LINKS: ::c_int = 0x003a;
-pub const CSIDL_CDBURN_AREA: ::c_int = 0x003b;
-pub const CSIDL_COMPUTERSNEARME: ::c_int = 0x003d;
-pub const CSIDL_FLAG_CREATE: ::c_int = 0x8000;
-pub const CSIDL_FLAG_DONT_VERIFY: ::c_int = 0x4000;
-pub const CSIDL_FLAG_DONT_UNEXPAND: ::c_int = 0x2000;
-pub const CSIDL_FLAG_NO_ALIAS: ::c_int = 0x1000;
-pub const CSIDL_FLAG_PER_USER_INIT: ::c_int = 0x0800;
-pub const CSIDL_FLAG_MASK: ::c_int = 0xff00;
-//1312
-pub const SHGFP_TYPE_CURRENT: ::DWORD = 0;
-pub const SHGFP_TYPE_DEFAULT: ::DWORD = 1;
diff --git a/vendor/winapi-0.2.8/src/shobjidl.rs b/vendor/winapi-0.2.8/src/shobjidl.rs
deleted file mode 100644
index ef7caa1c37..0000000000
--- a/vendor/winapi-0.2.8/src/shobjidl.rs
+++ /dev/null
@@ -1,652 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-//Terrible forward declarations that need to be filled in
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenu;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenu2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenu3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExecuteCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRunnableTask;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellTaskScheduler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IQueryCodePage;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistFolder2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistFolder3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPersistIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumFullIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileSyncMergeHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithFolderEnumMode;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IParseAndCreateItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumExtraSearch;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellFolder2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderViewOptions;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellView;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellView2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellView3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderView;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISearchBoxInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderView2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderViewSettings;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewHandlerVisuals;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IVisualProperties;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICommDlgBrowser;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICommDlgBrowser2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICommDlgBrowser3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IColumnManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderFilterSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderFilter;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInputObjectSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInputObject;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInputObject2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellIcon;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellBrowser;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IProfferService;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellItem2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellItemImageFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserAccountChangeCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumShellItems;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferAdviseSink;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferSource;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumResources;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellItemResources;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferDestination;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IStreamAsync;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IStreamUnbufferedInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithSelection;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithBackReferences;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPropertyUI;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICategoryProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICategorizer;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDropTargetHelper;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDragSourceHelper;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDragSourceHelper2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLinkA;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLinkW;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLinkDataList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IResolveShellLink;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IActionProgressDialog;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHWEventHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHWEventHandler2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IQueryCancelAutoPlay;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDynamicHWHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IActionProgress;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellExtInit;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellPropSheetExt;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRemoteComputer;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IQueryContinue;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithCancelEvent;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserNotification;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserNotificationCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUserNotification2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IItemNameLimits;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISearchFolderItemFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExtractImage;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExtractImage2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IThumbnailHandlerFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IParentAndItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDockingWindow;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBandInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBand2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList3;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITaskbarList4;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IStartMenuPinnedList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICDBurn;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IWizardSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IWizardExtension;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IWebWizardExtension;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPublishingWizard;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderViewHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerBrowserEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerBrowser;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAccessibleObject;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IResultsFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumObjects;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IOperationsProgressDialog;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IIOCancelInformation;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileOperation;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INamespaceWalkCB;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INamespaceWalkCB2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INamespaceWalk;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAutoCompleteDropDown;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IBandSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICDBurnExt;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenuSite;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumReadyCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumerableView;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInsertItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMenuBand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFolderBandPriv;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRegTreeItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IImageRecompress;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDeskBar;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMenuPopup;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileIsInUse;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationAssociationRegistration;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationAssociationRegistrationUI;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDelegateFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IBrowserFrameOptions;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INewWindowManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAttachmentExecute;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellMenuCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellMenu;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellRunDll;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IKnownFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IKnownFolderManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISharingConfigurationManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviousVersionsInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IRelatedItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IIdentityName;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDelegateItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICurrentItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITransferMediumItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUseToBrowseItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDisplayItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IViewStateIdentityItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewItem;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDestinationStreamFactory;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INewMenuClient;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithBindCtx;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControl;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControl2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlDropHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeAccessible;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlCustomDraw;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct INameSpaceTreeControlFolderCapabilities;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPreviewHandlerFrame;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ITrayDeskBand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IBandHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerPaneVisibility;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContextMenuCB;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDefaultExtractIconInit;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerCommandState;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumExplorerCommand;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExplorerCommandProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IMarkupCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IControlMarkup;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeNetworkFolder;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IOpenControlPanel;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IComputerInfoChangeNotify;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileSystemBindData;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFileSystemBindData2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ICustomDestinationList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDestinations;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDocumentLists;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithAppUserModelID;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IObjectWithProgID;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IUpdateIDList;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDesktopGadget;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDesktopWallpaper;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHomeGroup;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithPropertyStore;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IOpenSearchSource;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IShellLibrary;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDefaultFolderMenuInitialize;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationActivationManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAssocHandlerInvoker;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAssocHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IEnumAssocHandlers;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDataObjectProvider;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IDataTransferManagerInterop;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFrameworkInputPaneHandler;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IFrameworkInputPane;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAccessibilityDockingServiceCallback;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAccessibilityDockingService;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAppVisibilityEvents;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IAppVisibility;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPackageExecutionStateChangeNotification;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IPackageDebugSettings;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ISuspensionDependencyManager;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExecuteCommandApplicationHostEnvironment;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IExecuteCommandHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDesignModeSettings;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IApplicationDesignModeSettings2;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchTargetMonitor;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchSourceViewSizePreference;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchTargetViewSizePreference;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct ILaunchSourceAppUserModelId;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInitializeWithWindow;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHandlerInfo;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IHandlerActivationHost;
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IContactManagerInterop;
-//4498
-pub type SFGAOF = ::ULONG;
-//9466
-ENUM!{enum SIGDN {
-    SIGDN_NORMALDISPLAY = 0,
-    SIGDN_PARENTRELATIVEPARSING = 0x80018001,
-    SIGDN_DESKTOPABSOLUTEPARSING = 0x80028000,
-    SIGDN_PARENTRELATIVEEDITING = 0x80031001,
-    SIGDN_DESKTOPABSOLUTEEDITING = 0x8004c000,
-    SIGDN_FILESYSPATH = 0x80058000,
-    SIGDN_URL = 0x80068000,
-    SIGDN_PARENTRELATIVEFORADDRESSBAR = 0x8007c001,
-    SIGDN_PARENTRELATIVE = 0x80080001,
-    SIGDN_PARENTRELATIVEFORUI = 0x80094001,
-}}
-ENUM!{enum SICHINTF {
-    SICHINT_DISPLAY = 0,
-    SICHINT_ALLFIELDS = 0x80000000,
-    SICHINT_CANONICAL = 0x10000000,
-    SICHINT_TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000,
-}}
-//9498
-RIDL!(
-interface IShellItem(IShellItemVtbl): IUnknown(IUnknownVtbl) {
-    fn BindToHandler(
-        &mut self, pbc: *mut ::IBindCtx, bhid: ::REFGUID, riid: ::REFIID, ppv: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn GetParent(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn GetDisplayName(&mut self, sigdnName: SIGDN, ppszName: *mut ::LPWSTR) -> ::HRESULT,
-    fn GetAttributes(&mut self, sfgaoMask: SFGAOF, psfgaoAttribs: *mut SFGAOF) -> ::HRESULT,
-    fn Compare(&mut self, psi: *mut IShellItem, hint: SICHINTF, piOrder: *mut ::c_int) -> ::HRESULT
-}
-);
-//11963
-pub type IFileOperationProgressSink = ::IUnknown; // TODO
-pub type IShellItemArray = ::IUnknown; // TODO
-//20869
-RIDL!(
-interface IModalWindow(IModalWindowVtbl): IUnknown(IUnknownVtbl) {
-    fn Show(&mut self, hwndOwner: ::HWND) -> ::HRESULT
-}
-);
-//22307
-ENUM!{enum FDE_OVERWRITE_RESPONSE {
-    FDEOR_DEFAULT = 0,
-    FDEOR_ACCEPT = 1,
-    FDEOR_REFUSE = 2,
-}}
-ENUM!{enum FDE_SHAREVIOLATION_RESPONSE {
-    FDESVR_DEFAULT = 0,
-    FDESVR_ACCEPT = 1,
-    FDESVR_REFUSE = 2,
-}}
-ENUM!{enum FDAP {
-    FDAP_BOTTOM = 0,
-    FDAP_TOP = 1,
-}}
-RIDL!(
-interface IFileDialogEvents(IFileDialogEventsVtbl): IUnknown(IUnknownVtbl) {
-    fn OnFileOk(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnFolderChanging(&mut self, pfd: *mut IFileDialog, psiFolder: *mut IShellItem) -> ::HRESULT,
-    fn OnFolderChange(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnSelectionChange(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnShareViolation(
-        &mut self, pfd: *mut IFileDialog, psi: *mut IShellItem,
-        pResponse: *mut FDE_SHAREVIOLATION_RESPONSE
-    ) -> ::HRESULT,
-    fn OnTypeChange(&mut self, pfd: *mut IFileDialog) -> ::HRESULT,
-    fn OnOverwrite(
-        &mut self, pfd: *mut IFileDialog, psi: *mut IShellItem,
-        pResponse: *mut FDE_OVERWRITE_RESPONSE
-    ) -> ::HRESULT
-}
-);
-FLAGS!{enum FILEOPENDIALOGOPTIONS {
-    FOS_OVERWRITEPROMPT = 0x2,
-    FOS_STRICTFILETYPES = 0x4,
-    FOS_NOCHANGEDIR = 0x8,
-    FOS_PICKFOLDERS = 0x20,
-    FOS_FORCEFILESYSTEM = 0x40,
-    FOS_ALLNONSTORAGEITEMS = 0x80,
-    FOS_NOVALIDATE = 0x100,
-    FOS_ALLOWMULTISELECT = 0x200,
-    FOS_PATHMUSTEXIST = 0x800,
-    FOS_FILEMUSTEXIST = 0x1000,
-    FOS_CREATEPROMPT = 0x2000,
-    FOS_SHAREAWARE = 0x4000,
-    FOS_NOREADONLYRETURN = 0x8000,
-    FOS_NOTESTFILECREATE = 0x10000,
-    FOS_HIDEMRUPLACES = 0x20000,
-    FOS_HIDEPINNEDPLACES = 0x40000,
-    FOS_NODEREFERENCELINKS = 0x100000,
-    FOS_DONTADDTORECENT = 0x2000000,
-    FOS_FORCESHOWHIDDEN = 0x10000000,
-    FOS_DEFAULTNOMINIMODE = 0x20000000,
-    FOS_FORCEPREVIEWPANEON = 0x40000000,
-    FOS_SUPPORTSTREAMABLEITEMS = 0x80000000,
-}}
-RIDL!(
-interface IFileDialog(IFileDialogVtbl): IModalWindow(IModalWindowVtbl) {
-    fn SetFileTypes(
-        &mut self, cFileTypes: ::UINT, rgFilterSpec: *const ::COMDLG_FILTERSPEC
-    ) -> ::HRESULT,
-    fn SetFileTypeIndex(&mut self, iFileType: ::UINT) -> ::HRESULT,
-    fn GetFileTypeIndex(&mut self, piFileType: *mut ::UINT) -> ::HRESULT,
-    fn Advise(&mut self, pfde: *mut IFileDialogEvents, pdwCookie: *mut ::DWORD) -> ::HRESULT,
-    fn Unadvise(&mut self, dwCookie: ::DWORD) -> ::HRESULT,
-    fn SetOptions(&mut self, fos: FILEOPENDIALOGOPTIONS) -> ::HRESULT,
-    fn GetOptions(&mut self, pfos: *mut FILEOPENDIALOGOPTIONS) -> ::HRESULT,
-    fn SetDefaultFolder(&mut self, psi: *mut IShellItem) -> ::HRESULT,
-    fn SetFolder(&mut self, psi: *mut IShellItem) -> ::HRESULT,
-    fn GetFolder(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn GetCurrentSelection(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn SetFileName(&mut self, pszName: ::LPCWSTR) -> ::HRESULT,
-    fn GetFileName(&mut self, pszName: *mut ::LPWSTR) -> ::HRESULT,
-    fn SetTitle(&mut self, pszTitle: ::LPCWSTR) -> ::HRESULT,
-    fn SetOkButtonLabel(&mut self, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn SetFileNameLabel(&mut self, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn GetResult(&mut self, ppsi: *mut *mut IShellItem) -> ::HRESULT,
-    fn AddPlace(&mut self, psi: *mut IShellItem, fdap: FDAP) -> ::HRESULT,
-    fn SetDefaultExtension(&mut self, pszDefaultExtension: ::LPCWSTR) -> ::HRESULT,
-    fn Close(&mut self, hr: ::HRESULT) -> ::HRESULT,
-    fn SetClientGuid(&mut self, guid: ::REFGUID) -> ::HRESULT,
-    fn ClearClientData(&mut self) -> ::HRESULT,
-    fn SetFilter(&mut self, pFilter: *mut IShellItemFilter) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileSaveDialog(IFileSaveDialogVtbl): IFileDialog(IFileDialogVtbl) {
-    fn SetSaveAsItem(&mut self, psi: *mut IShellItem) -> ::HRESULT,
-    fn SetProperties(&mut self, pStore: *mut ::IPropertyStore) -> ::HRESULT,
-    fn SetCollectedProperties(
-        &mut self, pList: *mut ::IPropertyDescriptionList, fAppendDefault: ::BOOL
-    ) -> ::HRESULT,
-    fn GetProperties(&mut self, ppStore: *mut *mut ::IPropertyStore) -> ::HRESULT,
-    fn ApplyProperties(
-        &mut self, psi: *mut IShellItem, pStore: *mut ::IPropertyStore, hwnd: ::HWND,
-        pSink: *mut IFileOperationProgressSink
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileOpenDialog(IFileOpenDialogVtbl): IFileDialog(IFileDialogVtbl) {
-    fn GetResults(&mut self, ppenum: *mut *mut IShellItemArray) -> ::HRESULT,
-    fn GetSelectedItems(&mut self, ppsai: *mut *mut IShellItemArray) -> ::HRESULT
-}
-);
-ENUM!{enum CDCONTROLSTATE {
-    CDCS_INACTIVE = 0x00000000,
-    CDCS_ENABLED = 0x00000001,
-    CDCS_VISIBLE = 0x00000002,
-    CDCS_ENABLEDVISIBLE = 0x00000003,
-}}
-RIDL!(
-interface IFileDialogCustomize(IFileDialogCustomizeVtbl): IUnknown(IUnknownVtbl) {
-    fn EnableOpenDropDown(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddMenu(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn AddPushButton(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn AddComboBox(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddRadioButtonList(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddCheckButton(
-        &mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR, bChecked: ::BOOL
-    ) -> ::HRESULT,
-    fn AddEditBox(&mut self, dwIDCtl: ::DWORD, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn AddSeparator(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn AddText(&mut self, dwIDCtl: ::DWORD, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn SetControlLabel(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn GetControlState(&mut self, dwIDCtl: ::DWORD, pdwState: *mut CDCONTROLSTATE) -> ::HRESULT,
-    fn SetControlState(&mut self, dwIDCtl: ::DWORD, dwState: CDCONTROLSTATE) -> ::HRESULT,
-    fn GetEditBoxText(&mut self, dwIDCtl: ::DWORD, ppszText: *mut *mut ::WCHAR) -> ::HRESULT,
-    fn SetEditBoxText(&mut self, dwIDCtl: ::DWORD, pszText: ::LPCWSTR) -> ::HRESULT,
-    fn GetCheckButtonState(&mut self, dwIDCtl: ::DWORD, pbChecked: *mut ::BOOL) -> ::HRESULT,
-    fn SetCheckButtonState(&mut self, dwIDCtl: ::DWORD, bChecked: ::BOOL) -> ::HRESULT,
-    fn AddControlItem(
-        &mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, pszLabel: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn RemoveControlItem(&mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD) -> ::HRESULT,
-    fn RemoveAllControlItems(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn GetControlItemState(
-        &mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, pdwState: *mut CDCONTROLSTATE
-    ) -> ::HRESULT,
-    fn SetControlItemState(
-        &mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, dwState: CDCONTROLSTATE
-    ) -> ::HRESULT,
-    fn GetSelectedControlItem(&mut self, dwIDCtl: ::DWORD, pdwIDItem: *mut ::DWORD) -> ::HRESULT,
-    fn SetSelectedControlItem(&mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD) -> ::HRESULT,
-    fn StartVisualGroup(&mut self, dwIDCtl: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn EndVisualGroup(&mut self) -> ::HRESULT,
-    fn MakeProminent(&mut self, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn SetControlItemText(&mut self, dwIDCtl: ::DWORD, dwIDItem: ::DWORD, pszLabel: ::LPCWSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileDialogControlEvents(IFileDialogControlEventsVtbl): IUnknown(IUnknownVtbl) {
-    fn OnItemSelected(
-        &mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD, dwIDItem: ::DWORD
-    ) -> ::HRESULT,
-    fn OnButtonClicked(&mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD) -> ::HRESULT,
-    fn OnCheckButtonToggled(
-        &mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD, bChecked: ::BOOL
-    ) -> ::HRESULT,
-    fn OnControlActivating(
-        &mut self, pfdc: *mut IFileDialogCustomize, dwIDCtl: ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IFileDialog2(IFileDialog2Vtbl): IFileDialog(IFileDialogVtbl) {
-    fn SetCancelButtonLabel(&mut self, pszLabel: ::LPCWSTR) -> ::HRESULT,
-    fn SetNavigationRoot(&mut self, psi: IShellItem) -> ::HRESULT
-}
-);
-//27457
-pub type IShellItemFilter = ::IUnknown; // TODO
diff --git a/vendor/winapi-0.2.8/src/shtypes.rs b/vendor/winapi-0.2.8/src/shtypes.rs
deleted file mode 100644
index 0bea4b1f70..0000000000
--- a/vendor/winapi-0.2.8/src/shtypes.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-#[repr(C)] #[allow(missing_copy_implementations)]
-pub struct SHITEMID {
-    pub cb: ::USHORT,
-    pub abID: [::BYTE; 0],
-}
-pub type LPSHITEMID = *mut SHITEMID;
-pub type LPCSHITEMID = *const SHITEMID;
-#[repr(C)]
-pub struct ITEMIDLIST {
-    pub mkid: SHITEMID,
-}
-pub type ITEMIDLIST_RELATIVE = ITEMIDLIST;
-pub type ITEMID_CHILD = ITEMIDLIST;
-pub type ITEMIDLIST_ABSOLUTE = ITEMIDLIST;
-pub type LPITEMIDLIST = *mut ITEMIDLIST;
-pub type LPCITEMIDLIST = *const ITEMIDLIST;
-pub type PIDLIST_ABSOLUTE = *mut ITEMIDLIST_ABSOLUTE;
-pub type PCIDLIST_ABSOLUTE = *const ITEMIDLIST_ABSOLUTE;
-pub type PCUIDLIST_ABSOLUTE = *const ITEMIDLIST_ABSOLUTE;
-pub type PIDLIST_RELATIVE = *mut ITEMIDLIST_RELATIVE;
-pub type PCIDLIST_RELATIVE = *const ITEMIDLIST_RELATIVE;
-pub type PUIDLIST_RELATIVE = *mut ITEMIDLIST_RELATIVE;
-pub type PCUIDLIST_RELATIVE = *const ITEMIDLIST_RELATIVE;
-pub type PITEMID_CHILD = *mut ITEMID_CHILD;
-pub type PCITEMID_CHILD = *const ITEMID_CHILD;
-pub type PUITEMID_CHILD = *mut ITEMID_CHILD;
-pub type PCUITEMID_CHILD = *const ITEMID_CHILD;
-pub type PCUITEMID_CHILD_ARRAY = *const PCUITEMID_CHILD;
-pub type PCUIDLIST_RELATIVE_ARRAY = *const PCUIDLIST_RELATIVE;
-pub type PCIDLIST_ABSOLUTE_ARRAY = *const PCIDLIST_ABSOLUTE;
-pub type PCUIDLIST_ABSOLUTE_ARRAY = *const PCUIDLIST_ABSOLUTE;
-STRUCT!{struct COMDLG_FILTERSPEC {
-    pszName: ::LPCWSTR,
-    pszSpec: ::LPCWSTR,
-}}
-pub type KNOWNFOLDERID = ::GUID;
-pub type REFKNOWNFOLDERID = *const KNOWNFOLDERID;
diff --git a/vendor/winapi-0.2.8/src/spapidef.rs b/vendor/winapi-0.2.8/src/spapidef.rs
deleted file mode 100644
index 05861ddc80..0000000000
--- a/vendor/winapi-0.2.8/src/spapidef.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Windows NT Setup and Device Installer services
-pub type SP_LOG_TOKEN = ::DWORDLONG;
-pub type PSP_LOG_TOKEN = *mut ::DWORDLONG;
-pub const LOGTOKEN_TYPE_MASK: SP_LOG_TOKEN = 3;
-pub const LOGTOKEN_UNSPECIFIED: SP_LOG_TOKEN = 0;
-pub const LOGTOKEN_NO_LOG: SP_LOG_TOKEN = 1;
-pub const LOGTOKEN_SETUPAPI_APPLOG: SP_LOG_TOKEN = 2;
-pub const LOGTOKEN_SETUPAPI_DEVLOG: SP_LOG_TOKEN = 3;
-pub const TXTLOG_SETUPAPI_DEVLOG: ::DWORD = 0x00000001;
-pub const TXTLOG_SETUPAPI_CMDLINE: ::DWORD = 0x00000002;
-pub const TXTLOG_SETUPAPI_BITS: ::DWORD = 0x00000003;
-pub const TXTLOG_ERROR: ::DWORD = 0x1;
-pub const TXTLOG_WARNING: ::DWORD = 0x2;
-pub const TXTLOG_SYSTEM_STATE_CHANGE: ::DWORD = 0x3;
-pub const TXTLOG_SUMMARY: ::DWORD = 0x4;
-pub const TXTLOG_DETAILS: ::DWORD = 0x5;
-pub const TXTLOG_VERBOSE: ::DWORD = 0x6;
-pub const TXTLOG_VERY_VERBOSE: ::DWORD = 0x7;
-pub const TXTLOG_RESERVED_FLAGS: ::DWORD = 0x0000FFF0;
-pub const TXTLOG_TIMESTAMP: ::DWORD = 0x00010000;
-pub const TXTLOG_DEPTH_INCR: ::DWORD = 0x00020000;
-pub const TXTLOG_DEPTH_DECR: ::DWORD = 0x00040000;
-pub const TXTLOG_TAB_1: ::DWORD = 0x00080000;
-pub const TXTLOG_FLUSH_FILE: ::DWORD = 0x00100000;
-#[inline] #[allow(dead_code)]
-pub fn TXTLOG_LEVEL(flags: ::DWORD) -> ::DWORD {
-    return flags & 0xf;
-}
-pub const TXTLOG_DEVINST: ::DWORD = 0x00000001;
-pub const TXTLOG_INF: ::DWORD = 0x00000002;
-pub const TXTLOG_FILEQ: ::DWORD = 0x00000004;
-pub const TXTLOG_COPYFILES: ::DWORD = 0x00000008;
-pub const TXTLOG_SIGVERIF: ::DWORD = 0x00000020;
-pub const TXTLOG_BACKUP: ::DWORD = 0x00000080;
-pub const TXTLOG_UI: ::DWORD = 0x00000100;
-pub const TXTLOG_UTIL: ::DWORD = 0x00000200;
-pub const TXTLOG_INFDB: ::DWORD = 0x00000400;
-pub const TXTLOG_POLICY: ::DWORD = 0x00800000;
-pub const TXTLOG_NEWDEV: ::DWORD = 0x01000000;
-pub const TXTLOG_UMPNPMGR: ::DWORD = 0x02000000;
-pub const TXTLOG_DRIVER_STORE: ::DWORD = 0x04000000;
-pub const TXTLOG_SETUP: ::DWORD = 0x08000000;
-pub const TXTLOG_CMI: ::DWORD = 0x10000000;
-pub const TXTLOG_DEVMGR: ::DWORD = 0x20000000;
-pub const TXTLOG_INSTALLER: ::DWORD = 0x40000000;
-pub const TXTLOG_VENDOR: ::DWORD = 0x80000000;
diff --git a/vendor/winapi-0.2.8/src/sql.rs b/vendor/winapi-0.2.8/src/sql.rs
deleted file mode 100644
index 503fa81629..0000000000
--- a/vendor/winapi-0.2.8/src/sql.rs
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub const SQL_NULL_DATA: SQLLEN = -1;
-pub const SQL_DATA_AT_EXEC: SQLLEN = -2;
-pub const SQL_SUCCESS: SQLRETURN = 0;
-pub const SQL_SUCCESS_WITH_INFO: SQLRETURN = 1;
-pub const SQL_NO_DATA: SQLRETURN = 100;
-pub const SQL_PARAM_DATA_AVAILABLE: SQLRETURN = 101;
-pub const SQL_ERROR: SQLRETURN = -1;
-pub const SQL_INVALID_HANDLE: SQLRETURN = -2;
-pub const SQL_STILL_EXECUTING: SQLRETURN = 2;
-pub const SQL_NEED_DATA: SQLRETURN = 99;
-pub const SQL_NTS: SQLSMALLINT = -3;
-pub const SQL_MAX_MESSAGE_LENGTH: usize = 512;
-pub const SQL_DATE_LEN: usize = 10;
-pub const SQL_TIME_LEN: usize = 8;
-pub const SQL_TIMESTAMP_LEN: usize = 19;
-pub const SQL_HANDLE_ENV: SQLSMALLINT = 1;
-pub const SQL_HANDLE_DBC: SQLSMALLINT = 2;
-pub const SQL_HANDLE_STMT: SQLSMALLINT = 3;
-pub const SQL_HANDLE_DESC: SQLSMALLINT = 4;
-pub const SQL_ATTR_OUTPUT_NTS: SQLINTEGER = 10001;
-pub const SQL_ATTR_AUTO_IPD: SQLINTEGER = 10001;
-pub const SQL_ATTR_METADATA_ID: SQLINTEGER = 10014;
-pub const SQL_ATTR_APP_ROW_DESC: SQLINTEGER = 10010;
-pub const SQL_ATTR_APP_PARAM_DESC: SQLINTEGER = 10011;
-pub const SQL_ATTR_IMP_ROW_DESC: SQLINTEGER = 10012;
-pub const SQL_ATTR_IMP_PARAM_DESC: SQLINTEGER = 10013;
-pub const SQL_ATTR_CURSOR_SCROLLABLE: SQLINTEGER = -1;
-pub const SQL_ATTR_CURSOR_SENSITIVITY: SQLINTEGER = -2;
-
-//Null handle used in place of parent handle when allocating HENV
-pub const SQL_NULL_HANDLE: SQLHANDLE = 0 as SQLHANDLE;
-
-//Special length/indicator values
-
-//Return values from functions
-
-
-//Values of NULLABLE field in descriptor
-pub const SQL_NO_NULLS: SQLSMALLINT = 0;
-pub const SQL_NULLABLE: SQLSMALLINT = 1;
-pub const SQL_NULLABLE_UNKNOWN: SQLSMALLINT = 2;
-
-//Env attribute
-pub const SQL_ATTR_ODBC_VERSION: SQLINTEGER = 200;
-pub const SQL_ATTR_CONNECTION_POOLING: SQLINTEGER = 201;
-pub const SQL_ATTR_CP_MATCH: SQLINTEGER = 202;
-
-//Values for SQL_ATTR_ODBC_VERSION
-pub const SQL_OV_ODBC2: SQLINTEGER = 2;
-pub const SQL_OV_ODBC3: SQLINTEGER = 3;
-pub const SQL_OV_ODBC3_80: SQLINTEGER = 380;
-
-//Connection attributes
-pub const SQL_ACCESS_MODE: SQLINTEGER = 101;
-pub const SQL_AUTOCOMMIT: SQLINTEGER = 102;
-pub const SQL_LOGIN_TIMEOUT: SQLINTEGER = 103;
-pub const SQL_OPT_TRACE: SQLINTEGER = 104;
-pub const SQL_OPT_TRACEFILE: SQLINTEGER = 105;
-pub const SQL_TRANSLATE_DLL: SQLINTEGER = 106;
-pub const SQL_TRANSLATE_OPTION: SQLINTEGER = 107;
-pub const SQL_TXN_ISOLATION: SQLINTEGER = 108;
-pub const SQL_CURRENT_QUALIFIER: SQLINTEGER = 109;
-pub const SQL_ODBC_CURSORS: SQLINTEGER = 110;
-pub const SQL_QUIET_MODE: SQLINTEGER = 111;
-pub const SQL_PACKET_SIZE: SQLINTEGER = 112;
-
-//Connection attributes with new names
-pub const SQL_ATTR_ACCESS_MODE: SQLINTEGER = SQL_ACCESS_MODE;
-pub const SQL_ATTR_AUTOCOMMIT: SQLINTEGER = SQL_AUTOCOMMIT;
-pub const SQL_ATTR_CONNECTION_TIMEOUT: SQLINTEGER = 113;
-pub const SQL_ATTR_CURRENT_CATALOG: SQLINTEGER = SQL_CURRENT_QUALIFIER;
-pub const SQL_ATTR_DISCONNECT_BEHAVIOR: SQLINTEGER = 114;
-pub const SQL_ATTR_ENLIST_IN_DTC: SQLINTEGER = 1207;
-pub const SQL_ATTR_ENLIST_IN_XA: SQLINTEGER = 1208;
-pub const SQL_ATTR_LOGIN_TIMEOUT: SQLINTEGER = SQL_LOGIN_TIMEOUT;
-pub const SQL_ATTR_ODBC_CURSORS: SQLINTEGER = SQL_ODBC_CURSORS;
-pub const SQL_ATTR_PACKET_SIZE: SQLINTEGER = SQL_PACKET_SIZE;
-pub const SQL_ATTR_QUIET_MODE: SQLINTEGER = SQL_QUIET_MODE;
-pub const SQL_ATTR_TRACE: SQLINTEGER = SQL_OPT_TRACE;
-pub const SQL_ATTR_TRACEFILE: SQLINTEGER = SQL_OPT_TRACEFILE;
-pub const SQL_ATTR_TRANSLATE_LIB: SQLINTEGER = SQL_TRANSLATE_DLL;
-pub const SQL_ATTR_TRANSLATE_OPTION: SQLINTEGER = SQL_TRANSLATE_OPTION;
-pub const SQL_ATTR_TXN_ISOLATION: SQLINTEGER = SQL_TXN_ISOLATION;
-pub const SQL_ATTR_CONNECTION_DEAD: SQLINTEGER = 1209;
-
-//Flags for null-terminated string
-pub const SQL_NTS: SQLSMALLINT = -3;
-
-//Options for SQLDriverConnect
-pub const SQL_DRIVER_NOPROMPT: SQLUSMALLINT = 0;
-pub const SQL_DRIVER_COMPLETE: SQLUSMALLINT = 1;
-pub const SQL_DRIVER_PROMPT: SQLUSMALLINT = 2;
-pub const SQL_DRIVER_COMPLETE_REQUIRED: SQLUSMALLINT = 3;
-
-//Whether an attribute is a pointer or not
-pub const SQL_IS_POINTER: SQLINTEGER = -4;
-pub const SQL_IS_UINTEGER: SQLINTEGER = -5;
-pub const SQL_IS_INTEGER: SQLINTEGER = -6;
-pub const SQL_IS_USMALLINT: SQLINTEGER = -7;
-pub const SQL_IS_SMALLINT: SQLINTEGER = -8;
-
-//FreeStmt options
-pub const SQL_CLOSE: SQLUSMALLINT = 0;
-pub const SQL_DROP: SQLUSMALLINT = 1;
-pub const SQL_UNBIND: SQLUSMALLINT = 2;
-pub const SQL_RESET_PARAMS: SQLUSMALLINT = 3;
-
-//C datatype to SQL datatype mapping
-pub const SQL_UNKNOWN_TYPE: SQLSMALLINT = 0;
-pub const SQL_CHAR: SQLSMALLINT = 1;
-pub const SQL_NUMERIC: SQLSMALLINT = 2;
-pub const SQL_DECIMAL: SQLSMALLINT = 3;
-pub const SQL_INTEGER: SQLSMALLINT = 4;
-pub const SQL_SMALLINT: SQLSMALLINT = 5;
-pub const SQL_FLOAT: SQLSMALLINT = 6;
-pub const SQL_REAL: SQLSMALLINT = 7;
-pub const SQL_DOUBLE: SQLSMALLINT = 8;
-pub const SQL_DATETIME: SQLSMALLINT = 9;
-pub const SQL_VARCHAR: SQLSMALLINT = 12;
-
-pub const SQL_TYPE_DATE: SQLSMALLINT = 91;
-pub const SQL_TYPE_TIME: SQLSMALLINT = 92;
-pub const SQL_TYPE_TIMESTAMP: SQLSMALLINT = 93;
-
-pub const SQL_DATE: SQLSMALLINT = 9;
-pub const SQL_INTERVAL: SQLSMALLINT = 10;
-pub const SQL_TIME: SQLSMALLINT = 10;
-pub const SQL_TIMESTAMP: SQLSMALLINT = 11;
-pub const SQL_LONGVARCHAR: SQLSMALLINT = -1;
-pub const SQL_BINARY: SQLSMALLINT = -2;
-pub const SQL_VARBINARY: SQLSMALLINT = -3;
-pub const SQL_LONGVARBINARY: SQLSMALLINT = -4;
-pub const SQL_BIGINT: SQLSMALLINT = -5;
-pub const SQL_TINYINT: SQLSMALLINT = -6;
-pub const SQL_BIT: SQLSMALLINT = -7;
-pub const SQL_GUID: SQLSMALLINT = -11;
-
-pub const SQL_C_CHAR: SQLSMALLINT = SQL_CHAR;
-pub const SQL_C_LONG: SQLSMALLINT = SQL_INTEGER;
-pub const SQL_C_SHORT: SQLSMALLINT = SQL_SMALLINT;
-pub const SQL_C_FLOAT: SQLSMALLINT = SQL_REAL;
-pub const SQL_C_DOUBLE: SQLSMALLINT = SQL_DOUBLE;
-pub const SQL_C_NUMERIC: SQLSMALLINT = SQL_NUMERIC;
-pub const SQL_C_DEFAULT: SQLSMALLINT = 99;
-
-pub const SQL_SIGNED_OFFSET: SQLSMALLINT = -20;
-pub const SQL_UNSIGNED_OFFSET: SQLSMALLINT = -22;
-
-pub const SQL_C_DATE: SQLSMALLINT = SQL_DATE;
-pub const SQL_C_TIME: SQLSMALLINT = SQL_TIME;
-pub const SQL_C_TIMESTAMP: SQLSMALLINT = SQL_TIMESTAMP;
-
-pub const SQL_C_TYPE_DATE: SQLSMALLINT = SQL_TYPE_DATE;
-pub const SQL_C_TYPE_TIME: SQLSMALLINT = SQL_TYPE_TIME;
-pub const SQL_C_TYPE_TIMESTAMP: SQLSMALLINT = SQL_TYPE_TIMESTAMP;
-
-pub const SQL_C_BINARY: SQLSMALLINT = SQL_BINARY;
-pub const SQL_C_BIT: SQLSMALLINT = SQL_BIT;
-pub const SQL_C_SBIGINT: SQLSMALLINT = SQL_BIGINT + SQL_SIGNED_OFFSET;
-pub const SQL_C_UBIGINT: SQLSMALLINT = SQL_BIGINT + SQL_UNSIGNED_OFFSET;
-pub const SQL_C_TINYINT: SQLSMALLINT = SQL_TINYINT;
-pub const SQL_C_SLONG: SQLSMALLINT = SQL_C_LONG + SQL_SIGNED_OFFSET;
-pub const SQL_C_SSHORT: SQLSMALLINT = SQL_C_SHORT + SQL_SIGNED_OFFSET;
-pub const SQL_C_STINYINT: SQLSMALLINT = SQL_TINYINT + SQL_SIGNED_OFFSET;
-pub const SQL_C_ULONG: SQLSMALLINT = SQL_C_LONG + SQL_UNSIGNED_OFFSET;
-pub const SQL_C_USHORT: SQLSMALLINT = SQL_C_SHORT + SQL_UNSIGNED_OFFSET;
-pub const SQL_C_UTINYINT: SQLSMALLINT = SQL_TINYINT + SQL_UNSIGNED_OFFSET;
-
-pub const SQL_C_GUID: SQLSMALLINT = SQL_GUID;
-
-pub const SQL_WCHAR: SQLSMALLINT = -8;
-pub const SQL_WVARCHAR: SQLSMALLINT = -9;
-pub const SQL_WLONGVARCHAR: SQLSMALLINT = -10;
-pub const SQL_C_WCHAR: SQLSMALLINT = SQL_WCHAR;
-
-pub const SQL_TYPE_NULL: SQLSMALLINT = 0;
-
diff --git a/vendor/winapi-0.2.8/src/sqltypes.rs b/vendor/winapi-0.2.8/src/sqltypes.rs
deleted file mode 100644
index a5ded3afcc..0000000000
--- a/vendor/winapi-0.2.8/src/sqltypes.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub type SQLCHAR = ::c_uchar;
-pub type SQLSCHAR = ::c_schar;
-pub type SQLDATE = ::c_uchar;
-pub type SQLDECIMAL = ::c_uchar;
-pub type SQLDOUBLE = ::c_double;
-pub type SQLFLOAT = ::c_double;
-pub type SQLINTEGER = ::c_long;
-pub type SQLUINTEGER = ::c_ulong;
-#[cfg(target_arch = "x86_64")]
-pub type SQLLEN = ::INT64;
-#[cfg(target_arch = "x86_64")]
-pub type SQLULEN = ::UINT64;
-#[cfg(target_arch = "x86_64")]
-pub type SQLSETPOSIROW = ::UINT64;
-#[cfg(target_arch = "x86")]
-pub type SQLLEN = SQLINTEGER;
-#[cfg(target_arch = "x86")]
-pub type SQLULEN = SQLUINTEGER;
-#[cfg(target_arch = "x86")]
-pub type SQLSETPOSIROW = SQLUSMALLINT;
-pub type SQLROWCOUNT = SQLULEN;
-pub type SQLROWSETSIZE = SQLULEN;
-pub type SQLTRANSID = SQLULEN;
-pub type SQLROWOFFSET = SQLLEN;
-pub type SQLNUMERIC = ::c_uchar;
-pub type SQLPOINTER = *mut ::c_void;
-pub type SQLREAL = ::c_float;
-pub type SQLSMALLINT = ::c_short;
-pub type SQLUSMALLINT = ::c_ushort;
-pub type SQLTIME = ::c_uchar;
-pub type SQLTIMESTAMP = ::c_uchar;
-pub type SQLVARCHAR = ::c_uchar;
-pub type SQLRETURN = SQLSMALLINT;
-pub type SQLHANDLE = *mut ::c_void;
-pub type SQLHENV = SQLHANDLE;
-pub type SQLHDBC = SQLHANDLE;
-pub type SQLHSTMT = SQLHANDLE;
-pub type SQLHDESC = SQLHANDLE;
-//pub type UCHAR = ::c_uchar;
-pub type SCHAR = ::c_schar;
-//pub type SQLSCHAR = SCHAR;
-pub type SDWORD = ::c_long;
-pub type SWORD = ::c_short;
-pub type UDWORD = ::c_ulong;
-//pub type UWORD = ::c_ushort;
-//#[cfg(target_arch = "x86")]
-//pub type SQLUINTEGER = ::UDWORD;
-pub type SLONG = ::c_long;
-pub type SSHORT = ::c_short;
-//pub type ULONG = ::c_ulong;
-//pub type USHORT = ::c_ushort;
-pub type SDOUBLE = ::c_double;
-pub type LDOUBLE = ::c_double;
-pub type SFLOAT = ::c_float;
-pub type PTR = *mut ::c_void;
-pub type HENV = *mut ::c_void;
-pub type HDBC = *mut ::c_void;
-pub type HSTMT = *mut ::c_void;
-pub type RETCODE = ::c_short;
-pub type SQLHWND = ::HWND;
-STRUCT!{struct DATE_STRUCT {
-    year: SQLSMALLINT,
-    month: SQLUSMALLINT,
-    day: SQLUSMALLINT,
-}}
-pub type SQL_DATE_STRUCT = DATE_STRUCT;
-STRUCT!{struct TIME_STRUCT {
-    hour: SQLUSMALLINT,
-    minute: SQLUSMALLINT,
-    second: SQLUSMALLINT,
-}}
-pub type SQL_TIME_STRUCT = TIME_STRUCT;
-STRUCT!{struct TIMESTAMP_STRUCT {
-    year: SQLSMALLINT,
-    month: SQLUSMALLINT,
-    day: SQLUSMALLINT,
-    hour: SQLUSMALLINT,
-    minute: SQLUSMALLINT,
-    second: SQLUSMALLINT,
-    fraction: SQLUINTEGER,
-}}
-pub type SQL_TIMESTAMP_STRUCT = TIMESTAMP_STRUCT;
-ENUM!{enum SQLINTERVAL {
-    SQL_IS_YEAR = 1,
-    SQL_IS_MONTH = 2,
-    SQL_IS_DAY = 3,
-    SQL_IS_HOUR = 4,
-    SQL_IS_MINUTE = 5,
-    SQL_IS_SECOND = 6,
-    SQL_IS_YEAR_TO_MONTH = 7,
-    SQL_IS_DAY_TO_HOUR = 8,
-    SQL_IS_DAY_TO_MINUTE = 9,
-    SQL_IS_DAY_TO_SECOND = 10,
-    SQL_IS_HOUR_TO_MINUTE = 11,
-    SQL_IS_HOUR_TO_SECOND = 12,
-    SQL_IS_MINUTE_TO_SECOND = 13,
-}}
-STRUCT!{struct SQL_YEAR_MONTH_STRUCT {
-    year: SQLUINTEGER,
-    month: SQLUINTEGER,
-}}
-STRUCT!{struct SQL_DAY_SECOND_STRUCT {
-    day: SQLUINTEGER,
-    hour: SQLUINTEGER,
-    minute: SQLUINTEGER,
-    second: SQLUINTEGER,
-    fraction: SQLUINTEGER,
-}}
-STRUCT!{struct SQL_INTERVAL_STRUCT {
-    interval_type: SQLINTERVAL,
-    interval_sign: SQLSMALLINT,
-    intval: [u32; 5],
-}}
-UNION!{SQL_INTERVAL_STRUCT, intval, year_month, year_month_mut, SQL_YEAR_MONTH_STRUCT}
-UNION!{SQL_INTERVAL_STRUCT, intval, day_second, day_second_mut, SQL_DAY_SECOND_STRUCT}
-pub type ODBCINT64 = ::__int64;
-pub type SQLBIGINT = ODBCINT64;
-pub type SQLUBIGINT = ::__uint64;
-pub const SQL_MAX_NUMERIC_LEN: usize = 16;
-STRUCT!{struct SQL_NUMERIC_STRUCT {
-    precision: SQLCHAR,
-    scale: SQLSCHAR,
-    sign: SQLCHAR,
-    val: [SQLCHAR; SQL_MAX_NUMERIC_LEN],
-}}
-pub type SQLGUID = ::GUID;
-pub type BOOKMARK = SQLULEN;
-pub type SQLWCHAR = ::wchar_t;
diff --git a/vendor/winapi-0.2.8/src/sspi.rs b/vendor/winapi-0.2.8/src/sspi.rs
deleted file mode 100644
index 688fe70c74..0000000000
--- a/vendor/winapi-0.2.8/src/sspi.rs
+++ /dev/null
@@ -1,657 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Security Support Provider Interface Prototypes and structure definitions
-pub type SEC_WCHAR = ::WCHAR;
-pub type SEC_CHAR = ::CHAR;
-pub type SECURITY_STATUS = ::LONG;
-STRUCT!{struct SecHandle {
-    dwLower: ::ULONG_PTR,
-    dwUpper: ::ULONG_PTR,
-}}
-pub type PSecHandle = *mut SecHandle;
-pub const SEC_DELETED_HANDLE: ::ULONG_PTR = 2;
-pub type CredHandle = SecHandle;
-pub type PCredHandle = PSecHandle;
-pub type CtxtHandle = SecHandle;
-pub type PCtxtHandle = PSecHandle;
-pub type SECURITY_INTEGER = ::LARGE_INTEGER;
-pub type PSECURITY_INTEGER = *mut ::LARGE_INTEGER;
-pub type TimeStamp = SECURITY_INTEGER;
-pub type PTimeStamp = *mut SECURITY_INTEGER;
-STRUCT!{struct SECURITY_STRING {
-    Length: ::c_ushort,
-    MaximumLength: ::c_ushort,
-    Buffer: *mut ::c_ushort,
-}}
-pub type PSECURITY_STRING = *mut SECURITY_STRING;
-STRUCT!{struct SecPkgInfoW {
-    fCapabilities: ::c_ulong,
-    wVersion: ::c_ushort,
-    wRPCID: ::c_ushort,
-    cbMaxToken: ::c_ulong,
-    Name: *mut SEC_WCHAR,
-    Comment: *mut SEC_WCHAR,
-}}
-pub type PSecPkgInfoW = *mut SecPkgInfoW;
-STRUCT!{struct SecPkgInfoA {
-    fCapabilities: ::c_ulong,
-    wVersion: ::c_ushort,
-    wRPCID: ::c_ushort,
-    cbMaxToken: ::c_ulong,
-    Name: *mut SEC_CHAR,
-    Comment: *mut SEC_CHAR,
-}}
-pub type PSecPkgInfoA = *mut SecPkgInfoA;
-pub const SECPKG_FLAG_INTEGRITY: ::c_ulong = 0x00000001;
-pub const SECPKG_FLAG_PRIVACY: ::c_ulong = 0x00000002;
-pub const SECPKG_FLAG_TOKEN_ONLY: ::c_ulong = 0x00000004;
-pub const SECPKG_FLAG_DATAGRAM: ::c_ulong = 0x00000008;
-pub const SECPKG_FLAG_CONNECTION: ::c_ulong = 0x00000010;
-pub const SECPKG_FLAG_MULTI_REQUIRED: ::c_ulong = 0x00000020;
-pub const SECPKG_FLAG_CLIENT_ONLY: ::c_ulong = 0x00000040;
-pub const SECPKG_FLAG_EXTENDED_ERROR: ::c_ulong = 0x00000080;
-pub const SECPKG_FLAG_IMPERSONATION: ::c_ulong = 0x00000100;
-pub const SECPKG_FLAG_ACCEPT_WIN32_NAME: ::c_ulong = 0x00000200;
-pub const SECPKG_FLAG_STREAM: ::c_ulong = 0x00000400;
-pub const SECPKG_FLAG_NEGOTIABLE: ::c_ulong = 0x00000800;
-pub const SECPKG_FLAG_GSS_COMPATIBLE: ::c_ulong = 0x00001000;
-pub const SECPKG_FLAG_LOGON: ::c_ulong = 0x00002000;
-pub const SECPKG_FLAG_ASCII_BUFFERS: ::c_ulong = 0x00004000;
-pub const SECPKG_FLAG_FRAGMENT: ::c_ulong = 0x00008000;
-pub const SECPKG_FLAG_MUTUAL_AUTH: ::c_ulong = 0x00010000;
-pub const SECPKG_FLAG_DELEGATION: ::c_ulong = 0x00020000;
-pub const SECPKG_FLAG_READONLY_WITH_CHECKSUM: ::c_ulong = 0x00040000;
-pub const SECPKG_FLAG_RESTRICTED_TOKENS: ::c_ulong = 0x00080000;
-pub const SECPKG_FLAG_NEGO_EXTENDER: ::c_ulong = 0x00100000;
-pub const SECPKG_FLAG_NEGOTIABLE2: ::c_ulong = 0x00200000;
-pub const SECPKG_FLAG_APPCONTAINER_PASSTHROUGH: ::c_ulong = 0x00400000;
-pub const SECPKG_FLAG_APPCONTAINER_CHECKS: ::c_ulong = 0x00800000;
-pub const SECPKG_ID_NONE: ::c_ulong = 0xFFFF;
-pub const SECPKG_CALLFLAGS_APPCONTAINER: ::c_ulong = 0x00000001;
-pub const SECPKG_CALLFLAGS_APPCONTAINER_AUTHCAPABLE: ::c_ulong = 0x00000002;
-pub const SECPKG_CALLFLAGS_FORCE_SUPPLIED: ::c_ulong = 0x00000004;
-STRUCT!{struct SecBuffer {
-    cbBuffer: ::c_ulong,
-    BufferType: ::c_ulong,
-    pvBuffer: *mut ::c_void,
-}}
-pub type PSecBuffer = *mut SecBuffer;
-STRUCT!{struct SecBufferDesc {
-    ulVersion: ::c_ulong,
-    cBuffers: ::c_ulong,
-    pBuffers: PSecBuffer,
-}}
-pub type PSecBufferDesc = *mut SecBufferDesc;
-pub const SECBUFFER_VERSION: ::c_ulong = 0;
-pub const SECBUFFER_EMPTY: ::c_ulong = 0;
-pub const SECBUFFER_DATA: ::c_ulong = 1;
-pub const SECBUFFER_TOKEN: ::c_ulong = 2;
-pub const SECBUFFER_PKG_PARAMS: ::c_ulong = 3;
-pub const SECBUFFER_MISSING: ::c_ulong = 4;
-pub const SECBUFFER_EXTRA: ::c_ulong = 5;
-pub const SECBUFFER_STREAM_TRAILER: ::c_ulong = 6;
-pub const SECBUFFER_STREAM_HEADER: ::c_ulong = 7;
-pub const SECBUFFER_NEGOTIATION_INFO: ::c_ulong = 8;
-pub const SECBUFFER_PADDING: ::c_ulong = 9;
-pub const SECBUFFER_STREAM: ::c_ulong = 10;
-pub const SECBUFFER_MECHLIST: ::c_ulong = 11;
-pub const SECBUFFER_MECHLIST_SIGNATURE: ::c_ulong = 12;
-pub const SECBUFFER_TARGET: ::c_ulong = 13;
-pub const SECBUFFER_CHANNEL_BINDINGS: ::c_ulong = 14;
-pub const SECBUFFER_CHANGE_PASS_RESPONSE: ::c_ulong = 15;
-pub const SECBUFFER_TARGET_HOST: ::c_ulong = 16;
-pub const SECBUFFER_ALERT: ::c_ulong = 17;
-pub const SECBUFFER_APPLICATION_PROTOCOLS: ::c_ulong = 18;
-pub const SECBUFFER_ATTRMASK: ::c_ulong = 0xF0000000;
-pub const SECBUFFER_READONLY: ::c_ulong = 0x80000000;
-pub const SECBUFFER_READONLY_WITH_CHECKSUM: ::c_ulong = 0x10000000;
-pub const SECBUFFER_RESERVED: ::c_ulong = 0x60000000;
-STRUCT!{struct SEC_NEGOTIATION_INFO {
-    Size: ::c_ulong,
-    NameLength: ::c_ulong,
-    Name: *mut SEC_WCHAR,
-    Reserved: *mut ::c_void,
-}}
-pub type PSEC_NEGOTIATION_INFO = *mut SEC_NEGOTIATION_INFO;
-STRUCT!{struct SEC_CHANNEL_BINDINGS {
-    dwInitiatorAddrType: ::c_ulong,
-    cbInitiatorLength: ::c_ulong,
-    dwInitiatorOffset: ::c_ulong,
-    dwAcceptorAddrType: ::c_ulong,
-    cbAcceptorLength: ::c_ulong,
-    dwAcceptorOffset: ::c_ulong,
-    cbApplicationDataLength: ::c_ulong,
-    dwApplicationDataOffset: ::c_ulong,
-}}
-pub type PSEC_CHANNEL_BINDINGS = *mut SEC_CHANNEL_BINDINGS;
-ENUM!{enum SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT {
-    SecApplicationProtocolNegotiationExt_None,
-    SecApplicationProtocolNegotiationExt_NPN,
-    SecApplicationProtocolNegotiationExt_ALPN,
-}}
-pub type PSEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT = *mut SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT;
-STRUCT!{struct SEC_APPLICATION_PROTOCOL_LIST {
-    ProtoNegoExt: ::SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT,
-    ProtocolListSize: ::c_ushort,
-    ProtocolList: [::c_uchar; 0],
-}}
-STRUCT!{struct SEC_APPLICATION_PROTOCOLS {
-    ProtocolListsSize: ::c_ulong,
-    ProtocolLists: [SEC_APPLICATION_PROTOCOL_LIST; 0],
-}}
-pub type PSEC_APPLICATION_PROTOCOLS = *mut SEC_APPLICATION_PROTOCOLS;
-pub const SECURITY_NATIVE_DREP: ::c_ulong = 0x00000010;
-pub const SECURITY_NETWORK_DREP: ::c_ulong = 0x00000000;
-pub const SECPKG_CRED_INBOUND: ::c_ulong = 0x00000001;
-pub const SECPKG_CRED_OUTBOUND: ::c_ulong = 0x00000002;
-pub const SECPKG_CRED_BOTH: ::c_ulong = 0x00000003;
-pub const SECPKG_CRED_DEFAULT: ::c_ulong = 0x00000004;
-pub const SECPKG_CRED_RESERVED: ::c_ulong = 0xF0000000;
-pub const SECPKG_CRED_AUTOLOGON_RESTRICTED: ::c_ulong = 0x00000010;
-pub const SECPKG_CRED_PROCESS_POLICY_ONLY: ::c_ulong = 0x00000020;
-pub const ISC_REQ_DELEGATE: ::c_ulong = 0x00000001;
-pub const ISC_REQ_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ISC_REQ_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ISC_REQ_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ISC_REQ_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ISC_REQ_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ISC_REQ_PROMPT_FOR_CREDS: ::c_ulong = 0x00000040;
-pub const ISC_REQ_USE_SUPPLIED_CREDS: ::c_ulong = 0x00000080;
-pub const ISC_REQ_ALLOCATE_MEMORY: ::c_ulong = 0x00000100;
-pub const ISC_REQ_USE_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ISC_REQ_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ISC_REQ_CONNECTION: ::c_ulong = 0x00000800;
-pub const ISC_REQ_CALL_LEVEL: ::c_ulong = 0x00001000;
-pub const ISC_REQ_FRAGMENT_SUPPLIED: ::c_ulong = 0x00002000;
-pub const ISC_REQ_EXTENDED_ERROR: ::c_ulong = 0x00004000;
-pub const ISC_REQ_STREAM: ::c_ulong = 0x00008000;
-pub const ISC_REQ_INTEGRITY: ::c_ulong = 0x00010000;
-pub const ISC_REQ_IDENTIFY: ::c_ulong = 0x00020000;
-pub const ISC_REQ_NULL_SESSION: ::c_ulong = 0x00040000;
-pub const ISC_REQ_MANUAL_CRED_VALIDATION: ::c_ulong = 0x00080000;
-pub const ISC_REQ_RESERVED1: ::c_ulong = 0x00100000;
-pub const ISC_REQ_FRAGMENT_TO_FIT: ::c_ulong = 0x00200000;
-pub const ISC_REQ_FORWARD_CREDENTIALS: ::c_ulong = 0x00400000;
-pub const ISC_REQ_NO_INTEGRITY: ::c_ulong = 0x00800000;
-pub const ISC_REQ_USE_HTTP_STYLE: ::c_ulong = 0x01000000;
-pub const ISC_REQ_UNVERIFIED_TARGET_NAME: ::c_ulong = 0x20000000;
-pub const ISC_REQ_CONFIDENTIALITY_ONLY: ::c_ulong = 0x40000000;
-pub const ISC_RET_DELEGATE: ::c_ulong = 0x00000001;
-pub const ISC_RET_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ISC_RET_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ISC_RET_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ISC_RET_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ISC_RET_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ISC_RET_USED_COLLECTED_CREDS: ::c_ulong = 0x00000040;
-pub const ISC_RET_USED_SUPPLIED_CREDS: ::c_ulong = 0x00000080;
-pub const ISC_RET_ALLOCATED_MEMORY: ::c_ulong = 0x00000100;
-pub const ISC_RET_USED_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ISC_RET_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ISC_RET_CONNECTION: ::c_ulong = 0x00000800;
-pub const ISC_RET_INTERMEDIATE_RETURN: ::c_ulong = 0x00001000;
-pub const ISC_RET_CALL_LEVEL: ::c_ulong = 0x00002000;
-pub const ISC_RET_EXTENDED_ERROR: ::c_ulong = 0x00004000;
-pub const ISC_RET_STREAM: ::c_ulong = 0x00008000;
-pub const ISC_RET_INTEGRITY: ::c_ulong = 0x00010000;
-pub const ISC_RET_IDENTIFY: ::c_ulong = 0x00020000;
-pub const ISC_RET_NULL_SESSION: ::c_ulong = 0x00040000;
-pub const ISC_RET_MANUAL_CRED_VALIDATION: ::c_ulong = 0x00080000;
-pub const ISC_RET_RESERVED1: ::c_ulong = 0x00100000;
-pub const ISC_RET_FRAGMENT_ONLY: ::c_ulong = 0x00200000;
-pub const ISC_RET_FORWARD_CREDENTIALS: ::c_ulong = 0x00400000;
-pub const ISC_RET_USED_HTTP_STYLE: ::c_ulong = 0x01000000;
-pub const ISC_RET_NO_ADDITIONAL_TOKEN: ::c_ulong = 0x02000000;
-pub const ISC_RET_REAUTHENTICATION: ::c_ulong = 0x08000000;
-pub const ISC_RET_CONFIDENTIALITY_ONLY: ::c_ulong = 0x40000000;
-pub const ASC_REQ_DELEGATE: ::c_ulong = 0x00000001;
-pub const ASC_REQ_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ASC_REQ_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ASC_REQ_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ASC_REQ_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ASC_REQ_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ASC_REQ_SESSION_TICKET: ::c_ulong = 0x00000040;
-pub const ASC_REQ_ALLOCATE_MEMORY: ::c_ulong = 0x00000100;
-pub const ASC_REQ_USE_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ASC_REQ_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ASC_REQ_CONNECTION: ::c_ulong = 0x00000800;
-pub const ASC_REQ_CALL_LEVEL: ::c_ulong = 0x00001000;
-pub const ASC_REQ_EXTENDED_ERROR: ::c_ulong = 0x00008000;
-pub const ASC_REQ_STREAM: ::c_ulong = 0x00010000;
-pub const ASC_REQ_INTEGRITY: ::c_ulong = 0x00020000;
-pub const ASC_REQ_LICENSING: ::c_ulong = 0x00040000;
-pub const ASC_REQ_IDENTIFY: ::c_ulong = 0x00080000;
-pub const ASC_REQ_ALLOW_NULL_SESSION: ::c_ulong = 0x00100000;
-pub const ASC_REQ_ALLOW_NON_USER_LOGONS: ::c_ulong = 0x00200000;
-pub const ASC_REQ_ALLOW_CONTEXT_REPLAY: ::c_ulong = 0x00400000;
-pub const ASC_REQ_FRAGMENT_TO_FIT: ::c_ulong = 0x00800000;
-pub const ASC_REQ_FRAGMENT_SUPPLIED: ::c_ulong = 0x00002000;
-pub const ASC_REQ_NO_TOKEN: ::c_ulong = 0x01000000;
-pub const ASC_REQ_PROXY_BINDINGS: ::c_ulong = 0x04000000;
-pub const ASC_REQ_ALLOW_MISSING_BINDINGS: ::c_ulong = 0x10000000;
-pub const ASC_RET_DELEGATE: ::c_ulong = 0x00000001;
-pub const ASC_RET_MUTUAL_AUTH: ::c_ulong = 0x00000002;
-pub const ASC_RET_REPLAY_DETECT: ::c_ulong = 0x00000004;
-pub const ASC_RET_SEQUENCE_DETECT: ::c_ulong = 0x00000008;
-pub const ASC_RET_CONFIDENTIALITY: ::c_ulong = 0x00000010;
-pub const ASC_RET_USE_SESSION_KEY: ::c_ulong = 0x00000020;
-pub const ASC_RET_SESSION_TICKET: ::c_ulong = 0x00000040;
-pub const ASC_RET_ALLOCATED_MEMORY: ::c_ulong = 0x00000100;
-pub const ASC_RET_USED_DCE_STYLE: ::c_ulong = 0x00000200;
-pub const ASC_RET_DATAGRAM: ::c_ulong = 0x00000400;
-pub const ASC_RET_CONNECTION: ::c_ulong = 0x00000800;
-pub const ASC_RET_CALL_LEVEL: ::c_ulong = 0x00002000;
-pub const ASC_RET_THIRD_LEG_FAILED: ::c_ulong = 0x00004000;
-pub const ASC_RET_EXTENDED_ERROR: ::c_ulong = 0x00008000;
-pub const ASC_RET_STREAM: ::c_ulong = 0x00010000;
-pub const ASC_RET_INTEGRITY: ::c_ulong = 0x00020000;
-pub const ASC_RET_LICENSING: ::c_ulong = 0x00040000;
-pub const ASC_RET_IDENTIFY: ::c_ulong = 0x00080000;
-pub const ASC_RET_NULL_SESSION: ::c_ulong = 0x00100000;
-pub const ASC_RET_ALLOW_NON_USER_LOGONS: ::c_ulong = 0x00200000;
-pub const ASC_RET_ALLOW_CONTEXT_REPLAY: ::c_ulong = 0x00400000;
-pub const ASC_RET_FRAGMENT_ONLY: ::c_ulong = 0x00800000;
-pub const ASC_RET_NO_TOKEN: ::c_ulong = 0x01000000;
-pub const ASC_RET_NO_ADDITIONAL_TOKEN: ::c_ulong = 0x02000000;
-pub const SECPKG_CRED_ATTR_NAMES: ::c_ulong = 1;
-pub const SECPKG_CRED_ATTR_SSI_PROVIDER: ::c_ulong = 2;
-pub const SECPKG_CRED_ATTR_KDC_PROXY_SETTINGS: ::c_ulong = 3;
-pub const SECPKG_CRED_ATTR_CERT: ::c_ulong = 4;
-STRUCT!{struct SecPkgCredentials_NamesW {
-    sUserName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgCredentials_NamesW = *mut SecPkgCredentials_NamesW;
-STRUCT!{struct SecPkgCredentials_NamesA {
-    sUserName: *mut SEC_CHAR,
-}}
-pub type PSecPkgCredentials_NamesA = *mut SecPkgCredentials_NamesA;
-STRUCT!{struct SecPkgCredentials_SSIProviderW {
-    sProviderName: *mut SEC_WCHAR,
-    ProviderInfoLength: ::c_ulong,
-    ProviderInfo: *mut ::c_char,
-}}
-pub type PSecPkgCredentials_SSIProviderW = *mut SecPkgCredentials_SSIProviderW;
-STRUCT!{struct SecPkgCredentials_SSIProviderA {
-    sProviderName: *mut SEC_CHAR,
-    ProviderInfoLength: ::c_ulong,
-    ProviderInfo: *mut ::c_char,
-}}
-pub type PSecPkgCredentials_SSIProviderA = *mut SecPkgCredentials_SSIProviderA;
-pub const KDC_PROXY_SETTINGS_V1: ::ULONG = 1;
-pub const KDC_PROXY_SETTINGS_FLAGS_FORCEPROXY: ::ULONG = 0x1;
-STRUCT!{struct SecPkgCredentials_KdcProxySettingsW {
-    Version: ::ULONG,
-    Flags: ::ULONG,
-    ProxyServerOffset: ::USHORT,
-    ProxyServerLength: ::USHORT,
-    ClientTlsCredOffset: ::USHORT,
-    ClientTlsCredLength: ::USHORT,
-}}
-pub type PSecPkgCredentials_KdcProxySettingsW = *mut SecPkgCredentials_KdcProxySettingsW;
-STRUCT!{struct SecPkgCredentials_Cert {
-    EncodedCertSize: ::c_ulong,
-    EncodedCert: *mut ::c_uchar,
-}}
-pub type PSecPkgCredentials_Cert = *mut SecPkgCredentials_Cert;
-pub const SECPKG_ATTR_SIZES: ::c_ulong = 0;
-pub const SECPKG_ATTR_NAMES: ::c_ulong = 1;
-pub const SECPKG_ATTR_LIFESPAN: ::c_ulong = 2;
-pub const SECPKG_ATTR_DCE_INFO: ::c_ulong = 3;
-pub const SECPKG_ATTR_STREAM_SIZES: ::c_ulong = 4;
-pub const SECPKG_ATTR_KEY_INFO: ::c_ulong = 5;
-pub const SECPKG_ATTR_AUTHORITY: ::c_ulong = 6;
-pub const SECPKG_ATTR_PROTO_INFO: ::c_ulong = 7;
-pub const SECPKG_ATTR_PASSWORD_EXPIRY: ::c_ulong = 8;
-pub const SECPKG_ATTR_SESSION_KEY: ::c_ulong = 9;
-pub const SECPKG_ATTR_PACKAGE_INFO: ::c_ulong = 10;
-pub const SECPKG_ATTR_USER_FLAGS: ::c_ulong = 11;
-pub const SECPKG_ATTR_NEGOTIATION_INFO: ::c_ulong = 12;
-pub const SECPKG_ATTR_NATIVE_NAMES: ::c_ulong = 13;
-pub const SECPKG_ATTR_FLAGS: ::c_ulong = 14;
-pub const SECPKG_ATTR_USE_VALIDATED: ::c_ulong = 15;
-pub const SECPKG_ATTR_CREDENTIAL_NAME: ::c_ulong = 16;
-pub const SECPKG_ATTR_TARGET_INFORMATION: ::c_ulong = 17;
-pub const SECPKG_ATTR_ACCESS_TOKEN: ::c_ulong = 18;
-pub const SECPKG_ATTR_TARGET: ::c_ulong = 19;
-pub const SECPKG_ATTR_AUTHENTICATION_ID: ::c_ulong = 20;
-pub const SECPKG_ATTR_LOGOFF_TIME: ::c_ulong = 21;
-pub const SECPKG_ATTR_NEGO_KEYS: ::c_ulong = 22;
-pub const SECPKG_ATTR_PROMPTING_NEEDED: ::c_ulong = 24;
-pub const SECPKG_ATTR_UNIQUE_BINDINGS: ::c_ulong = 25;
-pub const SECPKG_ATTR_ENDPOINT_BINDINGS: ::c_ulong = 26;
-pub const SECPKG_ATTR_CLIENT_SPECIFIED_TARGET: ::c_ulong = 27;
-pub const SECPKG_ATTR_LAST_CLIENT_TOKEN_STATUS: ::c_ulong = 30;
-pub const SECPKG_ATTR_NEGO_PKG_INFO: ::c_ulong = 31;
-pub const SECPKG_ATTR_NEGO_STATUS: ::c_ulong = 32;
-pub const SECPKG_ATTR_CONTEXT_DELETED: ::c_ulong = 33;
-pub const SECPKG_ATTR_DTLS_MTU: ::c_ulong = 34;
-pub const SECPKG_ATTR_DATAGRAM_SIZES: ::c_ulong = SECPKG_ATTR_STREAM_SIZES;
-pub const SECPKG_ATTR_SUBJECT_SECURITY_ATTRIBUTES: ::c_ulong = 128;
-pub const SECPKG_ATTR_APPLICATION_PROTOCOL: ::c_ulong = 35;
-STRUCT!{struct SecPkgContext_SubjectAttributes {
-    AttributeInfo: *mut ::c_void,
-}}
-pub type PSecPkgContext_SubjectAttributes = *mut SecPkgContext_SubjectAttributes;
-pub const SECPKG_ATTR_NEGO_INFO_FLAG_NO_KERBEROS: ::c_ulong = 0x1;
-pub const SECPKG_ATTR_NEGO_INFO_FLAG_NO_NTLM: ::c_ulong = 0x2;
-ENUM!{enum SECPKG_CRED_CLASS {
-    SecPkgCredClass_None = 0,
-    SecPkgCredClass_Ephemeral = 10,
-    SecPkgCredClass_PersistedGeneric = 20,
-    SecPkgCredClass_PersistedSpecific = 30,
-    SecPkgCredClass_Explicit = 40,
-}}
-pub type PSECPKG_CRED_CLASS = *mut SECPKG_CRED_CLASS;
-STRUCT!{struct SecPkgContext_CredInfo {
-    CredClass: SECPKG_CRED_CLASS,
-    IsPromptingNeeded: ::c_ulong,
-}}
-pub type PSecPkgContext_CredInfo = *mut SecPkgContext_CredInfo;
-STRUCT!{struct SecPkgContext_NegoPackageInfo {
-    PackageMask: ::c_ulong,
-}}
-pub type PSecPkgContext_NegoPackageInfo = *mut SecPkgContext_NegoPackageInfo;
-STRUCT!{struct SecPkgContext_NegoStatus {
-    LastStatus: ::c_ulong,
-}}
-pub type PSecPkgContext_NegoStatus = *mut SecPkgContext_NegoStatus;
-STRUCT!{struct SecPkgContext_Sizes {
-    cbMaxToken: ::c_ulong,
-    cbMaxSignature: ::c_ulong,
-    cbBlockSize: ::c_ulong,
-    cbSecurityTrailer: ::c_ulong,
-}}
-pub type PSecPkgContext_Sizes = *mut SecPkgContext_Sizes;
-STRUCT!{struct SecPkgContext_StreamSizes {
-    cbHeader: ::c_ulong,
-    cbTrailer: ::c_ulong,
-    cbMaximumMessage: ::c_ulong,
-    cBuffers: ::c_ulong,
-    cbBlockSize: ::c_ulong,
-}}
-pub type PSecPkgContext_StreamSizes = *mut SecPkgContext_StreamSizes;
-pub type SecPkgContext_DatagramSizes = SecPkgContext_StreamSizes;
-pub type PSecPkgContext_DatagramSizes = PSecPkgContext_StreamSizes;
-STRUCT!{struct SecPkgContext_NamesW {
-    sUserName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_NamesW = *mut SecPkgContext_NamesW;
-ENUM!{enum SECPKG_ATTR_LCT_STATUS {
-    SecPkgAttrLastClientTokenYes,
-    SecPkgAttrLastClientTokenNo,
-    SecPkgAttrLastClientTokenMaybe,
-}}
-pub type PSECPKG_ATTR_LCT_STATUS = *mut SECPKG_ATTR_LCT_STATUS;
-STRUCT!{struct SecPkgContext_LastClientTokenStatus {
-    LastClientTokenStatus: SECPKG_ATTR_LCT_STATUS,
-}}
-pub type PSecPkgContext_LastClientTokenStatus = *mut SecPkgContext_LastClientTokenStatus;
-STRUCT!{struct SecPkgContext_NamesA {
-    sUserName: *mut SEC_CHAR,
-}}
-pub type PSecPkgContext_NamesA = *mut SecPkgContext_NamesA;
-STRUCT!{struct SecPkgContext_Lifespan {
-    tsStart: TimeStamp,
-    tsExpiry: TimeStamp,
-}}
-pub type PSecPkgContext_Lifespan = *mut SecPkgContext_Lifespan;
-STRUCT!{struct SecPkgContext_DceInfo {
-    AuthzSvc: ::c_ulong,
-    pPac: *mut ::c_void,
-}}
-pub type PSecPkgContext_DceInfo = *mut SecPkgContext_DceInfo;
-STRUCT!{struct SecPkgContext_KeyInfoA {
-    sSignatureAlgorithmName: *mut ::SEC_CHAR,
-    sEncryptAlgorithmName: *mut ::SEC_CHAR,
-    KeySize: ::c_ulong,
-    SignatureAlgorithm: ::c_ulong,
-    EncryptAlgorithm: ::c_ulong,
-}}
-pub type PSecPkgContext_KeyInfoA = *mut SecPkgContext_KeyInfoA;
-STRUCT!{struct SecPkgContext_KeyInfoW {
-    sSignatureAlgorithmName: *mut ::SEC_WCHAR,
-    sEncryptAlgorithmName: *mut ::SEC_WCHAR,
-    KeySize: ::c_ulong,
-    SignatureAlgorithm: ::c_ulong,
-    EncryptAlgorithm: ::c_ulong,
-}}
-pub type PSecPkgContext_KeyInfoW = *mut SecPkgContext_KeyInfoW;
-STRUCT!{struct SecPkgContext_AuthorityA {
-    sAuthorityName: *mut SEC_CHAR,
-}}
-pub type PSecPkgContext_AuthorityA = *mut SecPkgContext_AuthorityA;
-STRUCT!{struct SecPkgContext_AuthorityW {
-    sAuthorityName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_AuthorityW = *mut SecPkgContext_AuthorityW;
-STRUCT!{struct SecPkgContext_ProtoInfoA {
-    sProtocolName: *mut SEC_CHAR,
-    majorVersion: ::c_ulong,
-    minorVersion: ::c_ulong,
-}}
-pub type PSecPkgContext_ProtoInfoA = *mut SecPkgContext_ProtoInfoA;
-STRUCT!{struct SecPkgContext_ProtoInfoW {
-    sProtocolName: *mut SEC_WCHAR,
-    majorVersion: ::c_ulong,
-    minorVersion: ::c_ulong,
-}}
-pub type PSecPkgContext_ProtoInfoW = *mut SecPkgContext_ProtoInfoW;
-STRUCT!{struct SecPkgContext_PasswordExpiry {
-    tsPasswordExpires: TimeStamp,
-}}
-pub type PSecPkgContext_PasswordExpiry = *mut SecPkgContext_PasswordExpiry;
-STRUCT!{struct SecPkgContext_LogoffTime {
-    tsLogoffTime: TimeStamp,
-}}
-pub type PSecPkgContext_LogoffTime = *mut SecPkgContext_LogoffTime;
-STRUCT!{struct SecPkgContext_SessionKey {
-    SessionKeyLength: ::c_ulong,
-    SessionKey: *mut ::c_uchar,
-}}
-pub type PSecPkgContext_SessionKey = *mut SecPkgContext_SessionKey;
-STRUCT!{struct SecPkgContext_NegoKeys {
-    KeyType: ::c_ulong,
-    KeyLength: ::c_ushort,
-    KeyValue: *mut ::c_uchar,
-    VerifyKeyType: ::c_ulong,
-    VerifyKeyLength: ::c_ushort,
-    VerifyKeyValue: *mut ::c_uchar,
-}}
-pub type PSecPkgContext_NegoKeys = *mut SecPkgContext_NegoKeys;
-STRUCT!{struct SecPkgContext_PackageInfoW {
-    PackageInfo: PSecPkgInfoW,
-}}
-pub type PSecPkgContext_PackageInfoW = *mut SecPkgContext_PackageInfoW;
-STRUCT!{struct SecPkgContext_PackageInfoA {
-    PackageInfo: PSecPkgInfoA,
-}}
-pub type PSecPkgContext_PackageInfoA = *mut SecPkgContext_PackageInfoA;
-STRUCT!{struct SecPkgContext_UserFlags {
-    UserFlags: ::c_ulong,
-}}
-pub type PSecPkgContext_UserFlags = *mut SecPkgContext_UserFlags;
-STRUCT!{struct SecPkgContext_Flags {
-    Flags: ::c_ulong,
-}}
-pub type PSecPkgContext_Flags = *mut SecPkgContext_Flags;
-STRUCT!{struct SecPkgContext_NegotiationInfoA {
-    PackageInfo: PSecPkgInfoA,
-    NegotiationState: ::c_ulong,
-}}
-pub type PSecPkgContext_NegotiationInfoA = *mut SecPkgContext_NegotiationInfoA;
-STRUCT!{struct SecPkgContext_NegotiationInfoW {
-    PackageInfo: PSecPkgInfoW,
-    NegotiationState: ::c_ulong,
-}}
-pub type PSecPkgContext_NegotiationInfoW = *mut SecPkgContext_NegotiationInfoW;
-pub const SECPKG_NEGOTIATION_COMPLETE: ::c_ulong = 0;
-pub const SECPKG_NEGOTIATION_OPTIMISTIC: ::c_ulong = 1;
-pub const SECPKG_NEGOTIATION_IN_PROGRESS: ::c_ulong = 2;
-pub const SECPKG_NEGOTIATION_DIRECT: ::c_ulong = 3;
-pub const SECPKG_NEGOTIATION_TRY_MULTICRED: ::c_ulong = 4;
-STRUCT!{struct SecPkgContext_NativeNamesW {
-    sClientName: SEC_WCHAR,
-    sServerName: SEC_WCHAR,
-}}
-pub type PSecPkgContext_NativeNamesW = *mut SecPkgContext_NativeNamesW;
-STRUCT!{struct SecPkgContext_NativeNamesA {
-    sClientName: SEC_CHAR,
-    sServerName: SEC_CHAR,
-}}
-pub type PSecPkgContext_NativeNamesA = *mut SecPkgContext_NativeNamesA;
-STRUCT!{struct SecPkgContext_CredentialNameW {
-    CredentialType: ::c_ulong,
-    sCredentialName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_CredentialNameW = *mut SecPkgContext_CredentialNameW;
-STRUCT!{struct SecPkgContext_CredentialNameA {
-    CredentialType: ::c_ulong,
-    sCredentialName: *mut SEC_CHAR,
-}}
-pub type PSecPkgContext_CredentialNameA = *mut SecPkgContext_CredentialNameA;
-STRUCT!{struct SecPkgContext_AccessToken {
-    AccessToken: *mut ::c_void,
-}}
-pub type PSecPkgContext_AccessToken = *mut SecPkgContext_AccessToken;
-STRUCT!{struct SecPkgContext_TargetInformation {
-    MarshalledTargetInfoLength: ::c_ulong,
-    MarshalledTargetInfo: *mut ::c_uchar,
-}}
-pub type PSecPkgContext_TargetInformation = *mut SecPkgContext_TargetInformation;
-STRUCT!{struct SecPkgContext_AuthzID {
-    AuthzIDLength: ::c_ulong,
-    AuthzID: *mut ::c_char,
-}}
-pub type PSecPkgContext_AuthzID = *mut SecPkgContext_AuthzID;
-STRUCT!{struct SecPkgContext_Target {
-    TargetLength: ::c_ulong,
-    Target: *mut ::c_char,
-}}
-pub type PSecPkgContext_Target = *mut SecPkgContext_Target;
-STRUCT!{struct SecPkgContext_ClientSpecifiedTarget {
-    sTargetName: *mut SEC_WCHAR,
-}}
-pub type PSecPkgContext_ClientSpecifiedTarget = *mut SecPkgContext_ClientSpecifiedTarget;
-STRUCT!{struct SecPkgContext_Bindings {
-    BindingsLength: ::c_ulong,
-    Bindings: *mut SEC_CHANNEL_BINDINGS,
-}}
-pub type PSecPkgContext_Bindings = *mut SecPkgContext_Bindings;
-ENUM!{enum SEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS {
-    SecApplicationProtocolNegotiationStatus_None,
-    SecApplicationProtocolNegotiationStatus_Success,
-    SecApplicationProtocolNegotiationStatus_SelectedClientOnly,
-}}
-pub type PSEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS =
-    *mut SEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS;
-pub const MAX_PROTOCOL_ID_SIZE: usize = 0xff;
-STRUCT!{nodebug struct SecPkgContext_ApplicationProtocol {
-    ProtoNegoStatus: SEC_APPLICATION_PROTOCOL_NEGOTIATION_STATUS,
-    ProtoNegoExt: SEC_APPLICATION_PROTOCOL_NEGOTIATION_EXT,
-    ProtocolIdSize: ::c_uchar,
-    ProtocolId: [::c_uchar; MAX_PROTOCOL_ID_SIZE],
-}}
-pub type PSecPkgContext_ApplicationProtocol = *mut SecPkgContext_ApplicationProtocol;
-pub type SEC_GET_KEY_FN = Option<unsafe extern "system" fn(
-    Arg: *mut ::c_void, Principal: *mut ::c_void, KeyVer: ::c_ulong, Key: *mut *mut ::c_void,
-    Status: *mut SECURITY_STATUS,
-)>;
-pub const SECPKG_CONTEXT_EXPORT_RESET_NEW: ::c_ulong = 0x00000001;
-pub const SECPKG_CONTEXT_EXPORT_DELETE_OLD: ::c_ulong = 0x00000002;
-pub const SECPKG_CONTEXT_EXPORT_TO_KERNEL: ::c_ulong = 0x00000004;
-pub type ACQUIRE_CREDENTIALS_HANDLE_FN_W = Option<unsafe extern "system" fn(
-    *mut SEC_WCHAR, *mut SEC_WCHAR, ::c_ulong, *mut ::c_void, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PCredHandle, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type ACQUIRE_CREDENTIALS_HANDLE_FN_A = Option<unsafe extern "system" fn(
-    *mut SEC_CHAR, *mut SEC_CHAR, ::c_ulong, *mut ::c_void, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PCredHandle, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type FREE_CREDENTIALS_HANDLE_FN = Option<unsafe extern "system" fn(
-    PCredHandle,
-) -> SECURITY_STATUS>;
-pub type ADD_CREDENTIALS_FN_W = Option<unsafe extern "system" fn(
-    PCredHandle, *mut SEC_WCHAR, *mut SEC_WCHAR, ::c_ulong, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type ADD_CREDENTIALS_FN_A = Option<unsafe extern "system" fn(
-    PCredHandle, *mut SEC_CHAR, *mut SEC_CHAR, ::c_ulong, *mut ::c_void, SEC_GET_KEY_FN,
-    *mut ::c_void, PTimeStamp,
-) -> SECURITY_STATUS>;
-pub type CHANGE_PASSWORD_FN_W = Option<unsafe extern "system" fn(
-    *mut SEC_WCHAR, *mut SEC_WCHAR, *mut SEC_WCHAR, *mut SEC_WCHAR, *mut SEC_WCHAR, ::BOOLEAN,
-    ::c_ulong, PSecBufferDesc,
-) -> SECURITY_STATUS>;
-pub type CHANGE_PASSWORD_FN_A = Option<unsafe extern "system" fn(
-    *mut SEC_CHAR, *mut SEC_CHAR, *mut SEC_CHAR, *mut SEC_CHAR, *mut SEC_CHAR, ::BOOLEAN,
-    ::c_ulong, PSecBufferDesc,
-) -> SECURITY_STATUS>;
-//1844
-ENUM!{enum SecDelegationType {
-    SecFull,
-    SecService,
-    SecTree,
-    SecDirectory,
-    SecObject,
-}}
-pub type PSecDelegationType = *mut SecDelegationType;
-STRUCT!{struct SEC_WINNT_AUTH_BYTE_VECTOR {
-    ByteArrayOffset: ::c_ulong,
-    ByteArrayLength: ::c_ushort,
-}}
-pub type PSEC_WINNT_AUTH_BYTE_VECTOR = *mut SEC_WINNT_AUTH_BYTE_VECTOR;
-STRUCT!{struct SEC_WINNT_AUTH_DATA {
-    CredType: ::GUID,
-    CredData: SEC_WINNT_AUTH_BYTE_VECTOR,
-}}
-pub type PSEC_WINNT_AUTH_DATA = *mut SEC_WINNT_AUTH_DATA;
-STRUCT!{struct SEC_WINNT_AUTH_PACKED_CREDENTIALS {
-    cbHeaderLength: ::c_ushort,
-    cbStructureLength: ::c_ushort,
-    AuthData: SEC_WINNT_AUTH_DATA,
-}}
-pub type PSEC_WINNT_AUTH_PACKED_CREDENTIALS = *mut SEC_WINNT_AUTH_PACKED_CREDENTIALS;
-DEFINE_GUID!(SEC_WINNT_AUTH_DATA_TYPE_PASSWORD, 0x28bfc32f, 0x10f6, 0x4738,
-    0x98, 0xd1, 0x1a, 0xc0, 0x61, 0xdf, 0x71, 0x6a);
-DEFINE_GUID!(SEC_WINNT_AUTH_DATA_TYPE_CERT, 0x235f69ad, 0x73fb, 0x4dbc,
-    0x82, 0x3, 0x6, 0x29, 0xe7, 0x39, 0x33, 0x9b);
-STRUCT!{struct SEC_WINNT_AUTH_DATA_PASSWORD {
-    UnicodePassword: SEC_WINNT_AUTH_BYTE_VECTOR,
-}}
-pub type PSEC_WINNT_AUTH_DATA_PASSWORD = *mut SEC_WINNT_AUTH_DATA_PASSWORD;
-DEFINE_GUID!(SEC_WINNT_AUTH_DATA_TYPE_CSP_DATA, 0x68fd9879, 0x79c, 0x4dfe,
-    0x82, 0x81, 0x57, 0x8a, 0xad, 0xc1, 0xc1, 0x0);
-STRUCT!{struct SEC_WINNT_AUTH_CERTIFICATE_DATA {
-    cbHeaderLength: ::c_ushort,
-    cbStructureLength: ::c_ushort,
-    Certificate: SEC_WINNT_AUTH_BYTE_VECTOR,
-}}
-pub type PSEC_WINNT_AUTH_CERTIFICATE_DATA = *mut SEC_WINNT_AUTH_CERTIFICATE_DATA;
-STRUCT!{struct SEC_WINNT_CREDUI_CONTEXT_VECTOR {
-    CredUIContextArrayOffset: ::ULONG,
-    CredUIContextCount: ::USHORT,
-}}
-pub type PSEC_WINNT_CREDUI_CONTEXT_VECTOR = *mut SEC_WINNT_CREDUI_CONTEXT_VECTOR;
-STRUCT!{struct SEC_WINNT_AUTH_SHORT_VECTOR {
-    ShortArrayOffset: ::ULONG,
-    ShortArrayCount: ::USHORT,
-}}
-pub type PSEC_WINNT_AUTH_SHORT_VECTOR = *mut SEC_WINNT_AUTH_SHORT_VECTOR;
-STRUCT!{struct CREDUIWIN_MARSHALED_CONTEXT {
-    StructureType: ::GUID,
-    cbHeaderLength: ::USHORT,
-    LogonId: ::LUID,
-    MarshaledDataType: ::GUID,
-    MarshaledDataOffset: ::ULONG,
-    MarshaledDataLength: ::USHORT,
-}}
-pub type PCREDUIWIN_MARSHALED_CONTEXT = *mut CREDUIWIN_MARSHALED_CONTEXT;
-STRUCT!{struct SEC_WINNT_CREDUI_CONTEXT {
-    cbHeaderLength: ::USHORT,
-    CredUIContextHandle: ::HANDLE,
-    UIInfo: ::PCREDUI_INFOW,
-    dwAuthError: ::ULONG,
-    pInputAuthIdentity: PSEC_WINNT_AUTH_IDENTITY_OPAQUE,
-    TargetName: ::PUNICODE_STRING,
-}}
-pub type PSEC_WINNT_CREDUI_CONTEXT = *mut SEC_WINNT_CREDUI_CONTEXT;
-pub type PSEC_WINNT_AUTH_IDENTITY_OPAQUE = ::PVOID;
diff --git a/vendor/winapi-0.2.8/src/strmif.rs b/vendor/winapi-0.2.8/src/strmif.rs
deleted file mode 100644
index 0edfe72c99..0000000000
--- a/vendor/winapi-0.2.8/src/strmif.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub type REFERENCE_TIME = LONGLONG;
diff --git a/vendor/winapi-0.2.8/src/subauth.rs b/vendor/winapi-0.2.8/src/subauth.rs
deleted file mode 100644
index d84dc8cad2..0000000000
--- a/vendor/winapi-0.2.8/src/subauth.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Types and macros for Subauthentication Packages.
-STRUCT!{struct UNICODE_STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PWSTR,
-}}
-pub type PUNICODE_STRING = *mut UNICODE_STRING;
-STRUCT!{struct STRING {
-    Length: ::USHORT,
-    MaximumLength: ::USHORT,
-    Buffer: ::PCHAR,
-}}
-pub type PSTRING = *mut STRING;
-STRUCT!{struct OLD_LARGE_INTEGER {
-    LowPart: ::ULONG,
-    HighPart: ::LONG,
-}}
-pub type POLD_LARGE_INTEGER = *mut OLD_LARGE_INTEGER;
-pub type SAM_HANDLE = ::PVOID;
-pub type PSAM_HANDLE = *mut ::PVOID;
-pub const USER_ACCOUNT_DISABLED: ::ULONG = 0x00000001;
-pub const USER_HOME_DIRECTORY_REQUIRED: ::ULONG = 0x00000002;
-pub const USER_PASSWORD_NOT_REQUIRED: ::ULONG = 0x00000004;
-pub const USER_TEMP_DUPLICATE_ACCOUNT: ::ULONG = 0x00000008;
-pub const USER_NORMAL_ACCOUNT: ::ULONG = 0x00000010;
-pub const USER_MNS_LOGON_ACCOUNT: ::ULONG = 0x00000020;
-pub const USER_INTERDOMAIN_TRUST_ACCOUNT: ::ULONG = 0x00000040;
-pub const USER_WORKSTATION_TRUST_ACCOUNT: ::ULONG = 0x00000080;
-pub const USER_SERVER_TRUST_ACCOUNT: ::ULONG = 0x00000100;
-pub const USER_DONT_EXPIRE_PASSWORD: ::ULONG = 0x00000200;
-pub const USER_ACCOUNT_AUTO_LOCKED: ::ULONG = 0x00000400;
-pub const USER_ENCRYPTED_TEXT_PASSWORD_ALLOWED: ::ULONG = 0x00000800;
-pub const USER_SMARTCARD_REQUIRED: ::ULONG = 0x00001000;
-pub const USER_TRUSTED_FOR_DELEGATION: ::ULONG = 0x00002000;
-pub const USER_NOT_DELEGATED: ::ULONG = 0x00004000;
-pub const USER_USE_DES_KEY_ONLY: ::ULONG = 0x00008000;
-pub const USER_DONT_REQUIRE_PREAUTH: ::ULONG = 0x00010000;
-pub const USER_PASSWORD_EXPIRED: ::ULONG = 0x00020000;
-pub const USER_TRUSTED_TO_AUTHENTICATE_FOR_DELEGATION: ::ULONG = 0x00040000;
-pub const USER_NO_AUTH_DATA_REQUIRED: ::ULONG = 0x00080000;
-pub const USER_PARTIAL_SECRETS_ACCOUNT: ::ULONG = 0x00100000;
-pub const USER_USE_AES_KEYS: ::ULONG = 0x00200000;
-pub const NEXT_FREE_ACCOUNT_CONTROL_BIT: ::ULONG = USER_USE_AES_KEYS << 1;
-pub const USER_MACHINE_ACCOUNT_MASK: ::ULONG = USER_INTERDOMAIN_TRUST_ACCOUNT
-    | USER_WORKSTATION_TRUST_ACCOUNT | USER_SERVER_TRUST_ACCOUNT;
-pub const USER_ACCOUNT_TYPE_MASK: ::ULONG = USER_TEMP_DUPLICATE_ACCOUNT | USER_NORMAL_ACCOUNT
-    | USER_MACHINE_ACCOUNT_MASK;
-pub const USER_COMPUTED_ACCOUNT_CONTROL_BITS: ::ULONG = USER_ACCOUNT_AUTO_LOCKED
-| USER_PASSWORD_EXPIRED;
-pub const SAM_DAYS_PER_WEEK: ::USHORT = 7;
-pub const SAM_HOURS_PER_WEEK: ::USHORT = 24 * SAM_DAYS_PER_WEEK;
-pub const SAM_MINUTES_PER_WEEK: ::USHORT = 60 * SAM_HOURS_PER_WEEK;
-STRUCT!{struct LOGON_HOURS {
-    UnitsPerWeek: ::USHORT,
-    LogonHours: ::PUCHAR,
-}}
-pub type PLOGON_HOURS = *mut LOGON_HOURS;
-STRUCT!{struct SR_SECURITY_DESCRIPTOR {
-    Length: ::ULONG,
-    SecurityDescriptor: ::PUCHAR,
-}}
-pub type PSR_SECURITY_DESCRIPTOR = *mut SR_SECURITY_DESCRIPTOR;
-STRUCT!{struct USER_ALL_INFORMATION {
-    LastLogon: ::LARGE_INTEGER,
-    LastLogoff: ::LARGE_INTEGER,
-    PasswordLastSet: ::LARGE_INTEGER,
-    AccountExpires: ::LARGE_INTEGER,
-    PasswordCanChange: ::LARGE_INTEGER,
-    PasswordMustChange: ::LARGE_INTEGER,
-    UserName: UNICODE_STRING,
-    FullName: UNICODE_STRING,
-    HomeDirectory: UNICODE_STRING,
-    HomeDirectoryDrive: UNICODE_STRING,
-    ScriptPath: UNICODE_STRING,
-    ProfilePath: UNICODE_STRING,
-    AdminComment: UNICODE_STRING,
-    WorkStations: UNICODE_STRING,
-    UserComment: UNICODE_STRING,
-    Parameters: UNICODE_STRING,
-    LmPassword: UNICODE_STRING,
-    NtPassword: UNICODE_STRING,
-    PrivateData: UNICODE_STRING,
-    SecurityDescriptor: SR_SECURITY_DESCRIPTOR,
-    UserId: ::ULONG,
-    PrimaryGroupId: ::ULONG,
-    UserAccountControl: ::ULONG,
-    WhichFields: ::ULONG,
-    LogonHours: LOGON_HOURS,
-    BadPasswordCount: ::USHORT,
-    LogonCount: ::USHORT,
-    CountryCode: ::USHORT,
-    CodePage: ::USHORT,
-    LmPasswordPresent: ::BOOLEAN,
-    NtPasswordPresent: ::BOOLEAN,
-    PasswordExpired: ::BOOLEAN,
-    PrivateDataSensitive: ::BOOLEAN,
-}}
-pub type PUSER_ALL_INFORMATION = *mut USER_ALL_INFORMATION;
-pub const USER_ALL_PARAMETERS: ::ULONG = 0x00200000;
-pub const CLEAR_BLOCK_LENGTH: usize = 8;
-STRUCT!{struct CLEAR_BLOCK {
-    data: [::CHAR; CLEAR_BLOCK_LENGTH],
-}}
-pub type PCLEAR_BLOCK = *mut CLEAR_BLOCK;
-pub const CYPHER_BLOCK_LENGTH: usize = 8;
-STRUCT!{struct CYPHER_BLOCK {
-    data: [::CHAR; CYPHER_BLOCK_LENGTH],
-}}
-pub type PCYPHER_BLOCK = *mut CYPHER_BLOCK;
-STRUCT!{struct LM_OWF_PASSWORD {
-    data: [CYPHER_BLOCK; 2],
-}}
-pub type PLM_OWF_PASSWORD = *mut LM_OWF_PASSWORD;
-pub type LM_CHALLENGE = CLEAR_BLOCK;
-pub type PLM_CHALLENGE = *mut LM_CHALLENGE;
-pub type NT_OWF_PASSWORD = LM_OWF_PASSWORD;
-pub type PNT_OWF_PASSWORD = *mut NT_OWF_PASSWORD;
-pub type NT_CHALLENGE = LM_CHALLENGE;
-pub type PNT_CHALLENGE = *mut NT_CHALLENGE;
-pub const USER_SESSION_KEY_LENGTH: usize = CYPHER_BLOCK_LENGTH * 2;
-STRUCT!{struct USER_SESSION_KEY {
-    data: [CYPHER_BLOCK; 2],
-}}
-pub type PUSER_SESSION_KEY = *mut USER_SESSION_KEY;
-ENUM!{enum NETLOGON_LOGON_INFO_CLASS {
-    NetlogonInteractiveInformation = 1,
-    NetlogonNetworkInformation,
-    NetlogonServiceInformation,
-    NetlogonGenericInformation,
-    NetlogonInteractiveTransitiveInformation,
-    NetlogonNetworkTransitiveInformation,
-    NetlogonServiceTransitiveInformation,
-}}
-STRUCT!{struct NETLOGON_LOGON_IDENTITY_INFO {
-    LogonDomainName: UNICODE_STRING,
-    ParameterControl: ::ULONG,
-    LogonId: OLD_LARGE_INTEGER,
-    UserName: UNICODE_STRING,
-    Workstation: UNICODE_STRING,
-}}
-pub type PNETLOGON_LOGON_IDENTITY_INFO = *mut NETLOGON_LOGON_IDENTITY_INFO;
-STRUCT!{struct NETLOGON_INTERACTIVE_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    LmOwfPassword: LM_OWF_PASSWORD,
-    NtOwfPassword: NT_OWF_PASSWORD,
-}}
-pub type PNETLOGON_INTERACTIVE_INFO = *mut NETLOGON_INTERACTIVE_INFO;
-STRUCT!{struct NETLOGON_SERVICE_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    LmOwfPassword: LM_OWF_PASSWORD,
-    NtOwfPassword: NT_OWF_PASSWORD,
-}}
-pub type PNETLOGON_SERVICE_INFO = *mut NETLOGON_SERVICE_INFO;
-STRUCT!{struct NETLOGON_NETWORK_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    LmChallenge: LM_CHALLENGE,
-    NtChallengeResponse: STRING,
-    LmChallengeResponse: STRING,
-}}
-pub type PNETLOGON_NETWORK_INFO = *mut NETLOGON_NETWORK_INFO;
-STRUCT!{struct NETLOGON_GENERIC_INFO {
-    Identity: NETLOGON_LOGON_IDENTITY_INFO,
-    PackageName: UNICODE_STRING,
-    DataLength: ::ULONG,
-    LogonData: ::PUCHAR,
-}}
-pub type PNETLOGON_GENERIC_INFO = *mut NETLOGON_GENERIC_INFO;
-pub const MSV1_0_PASSTHRU: ::ULONG = 0x01;
-pub const MSV1_0_GUEST_LOGON: ::ULONG = 0x02;
-STRUCT!{struct MSV1_0_VALIDATION_INFO {
-    LogoffTime: ::LARGE_INTEGER,
-    KickoffTime: ::LARGE_INTEGER,
-    LogonServer: UNICODE_STRING,
-    LogonDomainName: UNICODE_STRING,
-    SessionKey: USER_SESSION_KEY,
-    Authoritative: ::BOOLEAN,
-    UserFlags: ::ULONG,
-    WhichFields: ::ULONG,
-    UserId: ::ULONG,
-}}
-pub type PMSV1_0_VALIDATION_INFO = *mut MSV1_0_VALIDATION_INFO;
-pub const MSV1_0_VALIDATION_LOGOFF_TIME: ::ULONG = 0x00000001;
-pub const MSV1_0_VALIDATION_KICKOFF_TIME: ::ULONG = 0x00000002;
-pub const MSV1_0_VALIDATION_LOGON_SERVER: ::ULONG = 0x00000004;
-pub const MSV1_0_VALIDATION_LOGON_DOMAIN: ::ULONG = 0x00000008;
-pub const MSV1_0_VALIDATION_SESSION_KEY: ::ULONG = 0x00000010;
-pub const MSV1_0_VALIDATION_USER_FLAGS: ::ULONG = 0x00000020;
-pub const MSV1_0_VALIDATION_USER_ID: ::ULONG = 0x00000040;
-pub const MSV1_0_SUBAUTH_ACCOUNT_DISABLED: ::ULONG = 0x00000001;
-pub const MSV1_0_SUBAUTH_PASSWORD: ::ULONG = 0x00000002;
-pub const MSV1_0_SUBAUTH_WORKSTATIONS: ::ULONG = 0x00000004;
-pub const MSV1_0_SUBAUTH_LOGON_HOURS: ::ULONG = 0x00000008;
-pub const MSV1_0_SUBAUTH_ACCOUNT_EXPIRY: ::ULONG = 0x00000010;
-pub const MSV1_0_SUBAUTH_PASSWORD_EXPIRY: ::ULONG = 0x00000020;
-pub const MSV1_0_SUBAUTH_ACCOUNT_TYPE: ::ULONG = 0x00000040;
-pub const MSV1_0_SUBAUTH_LOCKOUT: ::ULONG = 0x00000080;
diff --git a/vendor/winapi-0.2.8/src/synchapi.rs b/vendor/winapi-0.2.8/src/synchapi.rs
deleted file mode 100644
index 2eb9d1af25..0000000000
--- a/vendor/winapi-0.2.8/src/synchapi.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-synch-l1
-pub type SRWLOCK = ::RTL_SRWLOCK;
-pub type PSRWLOCK = *mut ::RTL_SRWLOCK;
-pub type SYNCHRONIZATION_BARRIER = ::RTL_BARRIER;
-pub type PSYNCHRONIZATION_BARRIER = ::PRTL_BARRIER;
-pub type LPSYNCHRONIZATION_BARRIER = ::PRTL_BARRIER;
-pub type PINIT_ONCE_FN = Option<unsafe extern "system" fn(
-    InitOnce: ::PINIT_ONCE, Parameter: ::PVOID, Context: *mut ::PVOID,
-) -> ::BOOL>;
-pub type PTIMERAPCROUTINE = Option<unsafe extern "system" fn(
-    lpArgToCompletionRoutine: ::LPVOID, dwTimerLowValue: ::DWORD, dwTimerHighValue: ::DWORD,
-)>;
diff --git a/vendor/winapi-0.2.8/src/sysinfoapi.rs b/vendor/winapi-0.2.8/src/sysinfoapi.rs
deleted file mode 100644
index 95c38c64a8..0000000000
--- a/vendor/winapi-0.2.8/src/sysinfoapi.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-sysinfo-l1.
-STRUCT!{struct SYSTEM_INFO {
-    wProcessorArchitecture: ::WORD,
-    wReserved: ::WORD,
-    dwPageSize: ::DWORD,
-    lpMinimumApplicationAddress: ::LPVOID,
-    lpMaximumApplicationAddress: ::LPVOID,
-    dwActiveProcessorMask: ::DWORD_PTR,
-    dwNumberOfProcessors: ::DWORD,
-    dwProcessorType: ::DWORD,
-    dwAllocationGranularity: ::DWORD,
-    wProcessorLevel: ::WORD,
-    wProcessorRevision: ::WORD,
-}}
-UNION!(SYSTEM_INFO, wProcessorArchitecture, dwOemId, dwOemId_mut, ::DWORD);
-pub type LPSYSTEM_INFO = *mut SYSTEM_INFO;
-STRUCT!{struct MEMORYSTATUSEX {
-    dwLength: ::DWORD,
-    dwMemoryLoad: ::DWORD,
-    ullTotalPhys: ::DWORDLONG,
-    ullAvailPhys: ::DWORDLONG,
-    ullTotalPageFile: ::DWORDLONG,
-    ullAvailPageFile: ::DWORDLONG,
-    ullTotalVirtual: ::DWORDLONG,
-    ullAvailVirtual: ::DWORDLONG,
-    ullAvailExtendedVirtual: ::DWORDLONG,
-}}
-pub type LPMEMORYSTATUSEX = *mut MEMORYSTATUSEX;
-ENUM!{enum COMPUTER_NAME_FORMAT {
-    ComputerNameNetBIOS,
-    ComputerNameDnsHostname,
-    ComputerNameDnsDomain,
-    ComputerNameDnsFullyQualified,
-    ComputerNamePhysicalNetBIOS,
-    ComputerNamePhysicalDnsHostname,
-    ComputerNamePhysicalDnsDomain,
-    ComputerNamePhysicalDnsFullyQualified,
-    ComputerNameMax,
-}}
-pub type INIT_ONCE = ::RTL_RUN_ONCE;
-pub type PINIT_ONCE = ::PRTL_RUN_ONCE;
-pub type LPINIT_ONCE = ::PRTL_RUN_ONCE;
-pub type CONDITION_VARIABLE = ::RTL_CONDITION_VARIABLE;
-pub type PCONDITION_VARIABLE = *mut CONDITION_VARIABLE;
diff --git a/vendor/winapi-0.2.8/src/threadpoolapi.rs b/vendor/winapi-0.2.8/src/threadpoolapi.rs
deleted file mode 100644
index ec21aa05bc..0000000000
--- a/vendor/winapi-0.2.8/src/threadpoolapi.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-threadpool-l1.
-pub type PTP_WIN32_IO_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: ::PTP_CALLBACK_INSTANCE, Context: ::PVOID, Overlapped: ::PVOID, IoResult: ::ULONG,
-    NumberOfBytesTransferred: ::ULONG_PTR, Io: ::PTP_IO,
-)>;
diff --git a/vendor/winapi-0.2.8/src/timezoneapi.rs b/vendor/winapi-0.2.8/src/timezoneapi.rs
deleted file mode 100644
index 3c84b209fc..0000000000
--- a/vendor/winapi-0.2.8/src/timezoneapi.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! ApiSet Contract for api-ms-win-core-timezone-l1
-pub const TIME_ZONE_ID_INVALID: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct TIME_ZONE_INFORMATION {
-    Bias: ::LONG,
-    StandardName: [::WCHAR; 32],
-    StandardDate: ::SYSTEMTIME,
-    StandardBias: ::LONG,
-    DaylightName: [::WCHAR; 32],
-    DaylightDate: ::SYSTEMTIME,
-    DaylightBias: ::LONG,
-}}
-pub type PTIME_ZONE_INFORMATION = *mut TIME_ZONE_INFORMATION;
-pub type LPTIME_ZONE_INFORMATION = *mut TIME_ZONE_INFORMATION;
-STRUCT!{nodebug struct DYNAMIC_TIME_ZONE_INFORMATION {
-    Bias: ::LONG,
-    StandardName: [::WCHAR; 32],
-    StandardDate: ::SYSTEMTIME,
-    StandardBias: ::LONG,
-    DaylightName: [::WCHAR; 32],
-    DaylightDate: ::SYSTEMTIME,
-    DaylightBias: ::LONG,
-    TimeZoneKeyName: [::WCHAR; 128],
-    DynamicDaylightTimeDisabled: ::BOOLEAN,
-}}
-pub type PDYNAMIC_TIME_ZONE_INFORMATION = *mut DYNAMIC_TIME_ZONE_INFORMATION;
diff --git a/vendor/winapi-0.2.8/src/tlhelp32.rs b/vendor/winapi-0.2.8/src/tlhelp32.rs
deleted file mode 100644
index 2e809b25d9..0000000000
--- a/vendor/winapi-0.2.8/src/tlhelp32.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright © 2015, Gigih Aji Ibrahim
-// Licensed under the MIT License <LICENSE.md>
-pub const MAX_MODULE_NAME32: usize = 255;
-pub const TH32CS_SNAPHEAPLIST: ::DWORD = 0x00000001;
-pub const TH32CS_SNAPPROCESS: ::DWORD = 0x00000002;
-pub const TH32CS_SNAPTHREAD: ::DWORD = 0x00000004;
-pub const TH32CS_SNAPMODULE: ::DWORD = 0x00000008;
-pub const TH32CS_SNAPMODULE32: ::DWORD = 0x00000010;
-pub const TH32CS_SNAPALL: ::DWORD =
-    (TH32CS_SNAPHEAPLIST | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD | TH32CS_SNAPMODULE);
-pub const TH32CS_INHERIT: ::DWORD = 0x80000000;
-STRUCT!{struct HEAPLIST32 {
-    dwSize: ::SIZE_T,
-    th32ProcessID: ::DWORD,
-    th32HeapID: :: ULONG_PTR,
-    dwFlags: ::DWORD,
-}}
-pub type PHEAPLIST32 = *mut HEAPLIST32;
-pub type LPHEAPLIST32 = *mut HEAPLIST32;
-pub const HF32_DEFAULT: ::DWORD = 1;
-pub const HF32_SHARED: ::DWORD = 2;
-STRUCT!{struct HEAPENTRY32 {
-    dwSize: ::SIZE_T,
-    hHandle: ::HANDLE,
-    dwAddress: ::ULONG_PTR,
-    dwBlockSize: ::SIZE_T,
-    dwFlags: ::DWORD,
-    dwLockCount: ::DWORD,
-    dwResvd: ::DWORD,
-    th32ProcessID: ::DWORD,
-    th32HeapID: ::ULONG_PTR,
-}}
-pub type PHEAPENTRY32 = *mut HEAPENTRY32;
-pub type LPHEAPENTRY32 = *mut HEAPENTRY32;
-pub const LF32_FIXED: ::DWORD = 0x00000001;
-pub const LF32_FREE: ::DWORD = 0x00000002;
-pub const LF32_MOVEABLE: ::DWORD = 0x00000004;
-STRUCT!{nodebug struct PROCESSENTRY32W {
-    dwSize: ::DWORD,
-    cntUsage: ::DWORD,
-    th32ProcessID: ::DWORD,
-    th32DefaultHeapID: ::ULONG_PTR,
-    th32ModuleID: ::DWORD,
-    cntThreads: ::DWORD,
-    th32ParentProcessID: ::DWORD,
-    pcPriClassBase: ::LONG,
-    dwFlags: ::DWORD,
-    szExeFile: [::WCHAR; ::MAX_PATH],
-}}
-pub type PPROCESSENTRY32W = *mut PROCESSENTRY32W;
-pub type LPPROCESSENTRY32W = *mut PROCESSENTRY32W;
-STRUCT!{nodebug struct PROCESSENTRY32 {
-    dwSize: ::DWORD,
-    cntUsage: ::DWORD,
-    th32ProcessID: ::DWORD,
-    th32DefaultHeapID: ::ULONG_PTR,
-    th32ModuleID: ::DWORD,
-    cntThreads: ::DWORD,
-    th32ParentProcessID: ::DWORD,
-    pcPriClassBase: ::LONG,
-    dwFlags: ::DWORD,
-    szExeFile: [::CHAR; ::MAX_PATH],
-}}
-pub type PPROCESSENTRY32 = *mut PROCESSENTRY32;
-pub type LPPROCESSENTRY32 = *mut PROCESSENTRY32;
-STRUCT!{struct THREADENTRY32 {
-    dwSize: ::DWORD,
-    cntUsage: ::DWORD,
-    th32ThreadID: ::DWORD,
-    th32OwnerProcessID: ::DWORD,
-    tpBasePri: ::LONG,
-    tpDeltaPri: ::LONG,
-    dwFlags: ::DWORD,
-}}
-pub type PTHREADENTRY32 = *mut THREADENTRY32;
-pub type LPTHREADENTRY32 = *mut THREADENTRY32;
-STRUCT!{nodebug struct MODULEENTRY32W {
-    dwSize: ::DWORD,
-    th32ModuleID: ::DWORD,
-    th32ProcessID: ::DWORD,
-    GlblcntUsage: ::DWORD,
-    ProccntUsage: ::DWORD,
-    modBaseAddr: *mut ::BYTE,
-    modBaseSize: ::DWORD,
-    hModule: ::HMODULE,
-    szModule: [::WCHAR; ::MAX_MODULE_NAME32 + 1],
-    szExePath: [::WCHAR; ::MAX_PATH],
-}}
-pub type PMODULEENTRY32W = *mut MODULEENTRY32W;
-pub type LPMODULEENTRY32W = *mut MODULEENTRY32W;
-STRUCT!{nodebug struct MODULEENTRY32 {
-    dwSize: ::DWORD,
-    th32ModuleID: ::DWORD,
-    th32ProcessID: ::DWORD,
-    GlblcntUsage: ::DWORD,
-    ProccntUsage: ::DWORD,
-    modBaseAddr: *mut ::BYTE,
-    modBaseSize: ::DWORD,
-    hModule: ::HMODULE,
-    szModule: [::CHAR; ::MAX_MODULE_NAME32 + 1],
-    szExePath: [::CHAR; ::MAX_PATH],
-}}
-pub type PMODULEENTRY32 = *mut MODULEENTRY32;
-pub type LPMODULEENTRY32 = *mut MODULEENTRY32;
diff --git a/vendor/winapi-0.2.8/src/unknwnbase.rs b/vendor/winapi-0.2.8/src/unknwnbase.rs
deleted file mode 100644
index 2112561adb..0000000000
--- a/vendor/winapi-0.2.8/src/unknwnbase.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! this ALWAYS GENERATED file contains the definitions for the interfaces
-RIDL!(
-interface IUnknown(IUnknownVtbl) {
-    fn QueryInterface(&mut self, riid: ::REFIID, ppvObject: *mut *mut ::c_void) -> ::HRESULT,
-    fn AddRef(&mut self) -> ::ULONG,
-    fn Release(&mut self) -> ::ULONG
-}
-);
-pub type LPUNKNOWN = *mut IUnknown;
-RIDL!(
-interface AsyncIUnknown(AsyncIUnknownVtbl): IUnknown(IUnknownVtbl) {
-    fn Begin_QueryInterface(&mut self, riid: ::REFIID) -> ::HRESULT,
-    fn Finish_QueryInterface(&mut self, ppvObject: *mut *mut ::c_void) -> ::HRESULT,
-    fn Begin_AddRef(&mut self) -> ::HRESULT,
-    fn Finish_AddRef(&mut self) -> ::ULONG,
-    fn Begin_Release(&mut self) -> ::HRESULT,
-    fn Finish_Release(&mut self) -> ::ULONG
-}
-);
-RIDL!(
-interface IClassFactory(IClassFactoryVtbl): IUnknown(IUnknownVtbl) {
-    fn CreateInstance(
-        &mut self, pUnkOuter: *mut IUnknown, riid: ::REFIID, ppvObject: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn LockServer(&mut self, fLock: ::BOOL) -> ::HRESULT
-}
-);
diff --git a/vendor/winapi-0.2.8/src/urlhist.rs b/vendor/winapi-0.2.8/src/urlhist.rs
deleted file mode 100644
index b6fc2db155..0000000000
--- a/vendor/winapi-0.2.8/src/urlhist.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Url History Interfaces
-pub const STATURL_QUERYFLAG_ISCACHED: ::DWORD = 0x00010000;
-pub const STATURL_QUERYFLAG_NOURL: ::DWORD = 0x00020000;
-pub const STATURL_QUERYFLAG_NOTITLE: ::DWORD = 0x00040000;
-pub const STATURL_QUERYFLAG_TOPLEVEL: ::DWORD = 0x00080000;
-pub const STATURLFLAG_ISCACHED: ::DWORD = 0x00000001;
-pub const STATURLFLAG_ISTOPLEVEL: ::DWORD = 0x00000002;
-ENUM!{enum ADDURL_FLAG {
-    ADDURL_FIRST = 0,
-    ADDURL_ADDTOHISTORYANDCACHE = 0,
-    ADDURL_ADDTOCACHE = 1,
-    ADDURL_Max = 2147483647,
-}}
-pub type LPENUMSTATURL = *mut IEnumSTATURL;
-STRUCT!{struct STATURL {
-    cbSize: ::DWORD,
-    pwcsUrl: ::LPWSTR,
-    pwcsTitle: ::LPWSTR,
-    ftLastVisited: ::FILETIME,
-    ftLastUpdated: ::FILETIME,
-    ftExpires: ::FILETIME,
-    dwFlags: ::DWORD,
-}}
-pub type LPSTATURL = *mut STATURL;
-RIDL!{interface IEnumSTATURL(IEnumSTATURLVtbl): IUnknown(IUnknownVtbl) {
-    fn Next(&mut self, celt: ::ULONG, rgelt: LPSTATURL, pceltFetched: *mut ::ULONG) -> ::HRESULT,
-    fn Skip(&mut self, celt: ::ULONG) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn Clone(&mut self, ppenum: *mut *mut ::IEnumSTATURL) -> ::HRESULT,
-    fn SetFilter(&mut self, poszFilter: ::LPCOLESTR, dwFlags: ::DWORD) -> ::HRESULT
-}}
-pub type LPURLHISTORYSTG = *mut IUrlHistoryStg;
-RIDL!{interface IUrlHistoryStg(IUrlHistoryStgVtbl): IUnknown(IUnknownVtbl) {
-    fn AddUrl(&mut self, pocsUrl: ::LPCOLESTR) -> ::HRESULT,
-    fn DeleteUrl(&mut self, pocsUrl: ::LPCOLESTR, dwFlags: ::DWORD) -> ::HRESULT,
-    fn QueryUrl(
-        &mut self, pocsUrl: ::LPCOLESTR, dwFlags: ::DWORD, lpSTATURL: LPSTATURL
-    ) -> ::HRESULT,
-    fn BindToObject(
-        &mut self, pocsUrl: ::LPCOLESTR, riid: ::REFIID, ppvOut: *mut *mut ::c_void
-    ) -> ::HRESULT,
-    fn EnumUrls(&mut self, ppEnum: *mut *mut ::IEnumSTATURL) -> ::HRESULT
-}}
-pub type LPURLHISTORYSTG2 = *mut IUrlHistoryStg2;
-RIDL!{interface IUrlHistoryStg2(IUrlHistoryStg2Vtbl): IUrlHistoryStg(IUrlHistoryStgVtbl) {
-    fn AddUrlAndNotify(
-        &mut self, pocsUrl: ::LPCOLESTR, pocsTitle: ::LPCOLESTR, dwFlags: ::DWORD,
-        fWriteHistory: ::BOOL, poctNotify: *mut ::IOleCommandTarget, punkISFolder: *mut ::IUnknown
-    ) -> ::HRESULT,
-    fn ClearHistory(&mut self) -> ::HRESULT
-}}
-pub type LPURLHISTORYNOTIFY = *mut IUrlHistoryNotify;
-RIDL!{interface IUrlHistoryNotify(IUrlHistoryNotifyVtbl):
-    IOleCommandTarget(IOleCommandTargetVtbl) {}}
diff --git a/vendor/winapi-0.2.8/src/urlmon.rs b/vendor/winapi-0.2.8/src/urlmon.rs
deleted file mode 100644
index e0a5e93562..0000000000
--- a/vendor/winapi-0.2.8/src/urlmon.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of Urlmon.h
-// FIXME: Implement these interfaces
-#[repr(C)] #[derive(Clone, Copy, Debug)]
-pub struct IInternetSecurityManager;
diff --git a/vendor/winapi-0.2.8/src/usb.rs b/vendor/winapi-0.2.8/src/usb.rs
deleted file mode 100644
index 5a5904ec5e..0000000000
--- a/vendor/winapi-0.2.8/src/usb.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! USB Definitions.
-ENUM!{enum USBD_PIPE_TYPE {
-    UsbdPipeTypeControl,
-    UsbdPipeTypeIsochronous,
-    UsbdPipeTypeBulk,
-    UsbdPipeTypeInterrupt,
-}}
-
-pub type USBD_STATUS = ::LONG;
-
-STRUCT!{struct USBD_ISO_PACKET_DESCRIPTOR {
-	Offset: ::ULONG,
-	Length: ::ULONG,
-	Status: ::USBD_STATUS,
-}}
-pub type PUSBD_ISO_PACKET_DESCRIPTOR = *mut USBD_ISO_PACKET_DESCRIPTOR;
diff --git a/vendor/winapi-0.2.8/src/usbspec.rs b/vendor/winapi-0.2.8/src/usbspec.rs
deleted file mode 100644
index 6b9605ba47..0000000000
--- a/vendor/winapi-0.2.8/src/usbspec.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! USB Spec Definitions.
-ENUM!{enum USB_DEVICE_SPEED {
-    UsbLowSpeed = 0,
-    UsbFullSpeed,
-    UsbHighSpeed,
-    UsbSuperSpeed,
-}}
-ENUM!{enum USB_DEVICE_TYPE {
-    Usb11Device = 0,
-    Usb20Device,
-}}
-STRUCT!{struct BM_REQUEST_TYPE {
-    _BM: ::UCHAR,
-    B: ::UCHAR,
-}}
-BITFIELD!{BM_REQUEST_TYPE _BM: ::UINT8 [
-    Recipient set_Recipient[0..2],
-    Reserved set_Reserved[2..5],
-    Type set_Type[5..7],
-    Dir set_Dir[7..8],
-]}
-pub type PBM_REQUEST_TYPE = *mut BM_REQUEST_TYPE;
-
-STRUCT!{#[repr(packed)] struct USB_CONFIGURATION_DESCRIPTOR {
-    bLength: ::UCHAR,
-    bDescriptorType: ::UCHAR,
-    wTotalLength: ::USHORT,
-    bNumInterfaces: ::UCHAR,
-    bConfigurationValue: ::UCHAR,
-    iConfiguration: ::UCHAR,
-    bmAttributes: ::UCHAR,
-    MaxPower: ::UCHAR,
-}}
-pub type PUSB_CONFIGURATION_DESCRIPTOR = *mut USB_CONFIGURATION_DESCRIPTOR;
-#[test]
-fn test_USB_CONFIGURATION_DESCRIPTOR_size() {
-    use std::mem::size_of;
-    assert_eq!(size_of::<USB_CONFIGURATION_DESCRIPTOR>(), 9)
-}
diff --git a/vendor/winapi-0.2.8/src/usp10.rs b/vendor/winapi-0.2.8/src/usp10.rs
deleted file mode 100644
index 6c7b42bcd3..0000000000
--- a/vendor/winapi-0.2.8/src/usp10.rs
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright © 2015, Jordan Miner
-// Licensed under the MIT License <LICENSE.md>
-//! Uniscribe structure declarations and constant definitions
-pub const SCRIPT_UNDEFINED: ::WORD = 0;
-pub const USP_E_SCRIPT_NOT_IN_FONT: ::HRESULT = MAKE_HRESULT!(
-    ::SEVERITY_ERROR, ::FACILITY_ITF, 0x200
-);
-DECLARE_HANDLE!(SCRIPT_CACHE, SCRIPT_CACHE__);
-STRUCT!{struct SCRIPT_CONTROL {
-    bit_fields: ::DWORD,
-}}
-BITFIELD!(SCRIPT_CONTROL bit_fields: ::DWORD [
-    uDefaultLanguage set_uDefaultLanguage[0..16],
-    fContextDigits set_fContextDigits[16..17],
-    fInvertPreBoundDir set_fInvertPreBoundDir[17..18],
-    fInvertPostBoundDir set_fInvertPostBoundDir[18..19],
-    fLinkStringBefore set_fLinkStringBefore[19..20],
-    fLinkStringAfter set_fLinkStringAfter[20..21],
-    fNeutralOverride set_fNeutralOverride[21..22],
-    fNumericOverride set_fNumericOverride[22..23],
-    fLegacyBidiClass set_fLegacyBidiClass[23..24],
-    fMergeNeutralItems set_fMergeNeutralItems[24..25],
-    fReserved set_fReserved[25..32],
-]);
-STRUCT!{struct SCRIPT_STATE {
-    bit_fields: ::WORD,
-}}
-BITFIELD!(SCRIPT_STATE bit_fields: ::WORD [
-    uBidiLevel set_uBidiLevel[0..5],
-    fOverrideDirection set_fOverrideDirection[5..6],
-    fInhibitSymSwap set_fInhibitSymSwap[6..7],
-    fCharShape set_fCharShape[7..8],
-    fDigitSubstitute set_fDigitSubstitute[8..9],
-    fInhibitLigate set_fInhibitLigate[9..10],
-    fDisplayZWG set_fDisplayZWG[10..11],
-    fArabicNumContext set_fArabicNumContext[11..12],
-    fGcpClusters set_fGcpClusters[12..13],
-    fReserved set_fReserved[13..14],
-    fEngineReserved set_fEngineReserved[14..16],
-]);
-STRUCT!{struct SCRIPT_ANALYSIS {
-    bit_fields: ::WORD,
-    s: SCRIPT_STATE,
-}}
-BITFIELD!(SCRIPT_ANALYSIS bit_fields: ::WORD [
-    eScript set_eScript[0..10],
-    fRTL set_fRTL[10..11],
-    fLayoutRTL set_fLayoutRTL[11..12],
-    fLinkBefore set_fLinkBefore[12..13],
-    fLinkAfter set_fLinkAfter[13..14],
-    fLogicalOrder set_fLogicalOrder[14..15],
-    fNoGlyphIndex set_fNoGlyphIndex[15..16],
-]);
-STRUCT!{struct SCRIPT_ITEM {
-    iCharPos: ::c_int,
-    a: SCRIPT_ANALYSIS,
-}}
-//490
-pub const SCRIPT_JUSTIFY_NONE: ::WORD = 0;
-pub const SCRIPT_JUSTIFY_ARABIC_BLANK: ::WORD = 1;
-pub const SCRIPT_JUSTIFY_CHARACTER: ::WORD = 2;
-pub const SCRIPT_JUSTIFY_RESERVED1: ::WORD = 3;
-pub const SCRIPT_JUSTIFY_BLANK: ::WORD = 4;
-pub const SCRIPT_JUSTIFY_RESERVED2: ::WORD = 5;
-pub const SCRIPT_JUSTIFY_RESERVED3: ::WORD = 6;
-pub const SCRIPT_JUSTIFY_ARABIC_NORMAL: ::WORD = 7;
-pub const SCRIPT_JUSTIFY_ARABIC_KASHIDA: ::WORD = 8;
-pub const SCRIPT_JUSTIFY_ARABIC_ALEF: ::WORD = 9;
-pub const SCRIPT_JUSTIFY_ARABIC_HA: ::WORD = 10;
-pub const SCRIPT_JUSTIFY_ARABIC_RA: ::WORD = 11;
-pub const SCRIPT_JUSTIFY_ARABIC_BA: ::WORD = 12;
-pub const SCRIPT_JUSTIFY_ARABIC_BARA: ::WORD = 13;
-pub const SCRIPT_JUSTIFY_ARABIC_SEEN: ::WORD = 14;
-pub const SCRIPT_JUSTIFY_ARABIC_SEEN_M: ::WORD = 15;
-STRUCT!{struct SCRIPT_VISATTR {
-    bit_fields: ::WORD,
-}}
-BITFIELD!(SCRIPT_VISATTR bit_fields: ::WORD [
-    uJustification set_uJustification[0..4],
-    fClusterStart set_fClusterStart[4..5],
-    fDiacritic set_fDiacritic[5..6],
-    fZeroWidth set_fZeroWidth[6..7],
-    fReserved set_fReserved[7..8],
-    fShapeReserved set_fShapeReserved[8..16],
-]);
-STRUCT!{struct GOFFSET {
-    du: ::LONG,
-    dv: ::LONG,
-}}
-STRUCT!{struct SCRIPT_LOGATTR {
-    bit_fields: ::BYTE,
-}}
-BITFIELD!(SCRIPT_LOGATTR bit_fields: ::BYTE [
-    fSoftBreak set_fSoftBreak[0..1],
-    fWhiteSpace set_fWhiteSpace[1..2],
-    fCharStop set_fCharStop[2..3],
-    fWordStop set_fWordStop[3..4],
-    fInvalid set_fInvalid[4..5],
-    fReserved set_fReserved[5..8],
-]);
-pub const SGCM_RTL: ::DWORD = 0x00000001;
-STRUCT!{struct SCRIPT_PROPERTIES {
-    bit_fields1: ::DWORD,
-    bit_fields2: ::DWORD,
-}}
-BITFIELD!(SCRIPT_PROPERTIES bit_fields1: ::DWORD [
-    langid set_langid[0..16],
-    fNumeric set_fNumeric[16..17],
-    fComplex set_fComplex[17..18],
-    fNeedsWordBreaking set_fNeedsWordBreaking[18..19],
-    fNeedsCaretInfo set_fNeedsCaretInfo[19..20],
-    bCharSet set_bCharSet[20..28],
-    fControl set_fControl[28..29],
-    fPrivateUseArea set_fPrivateUseArea[29..30],
-    fNeedsCharacterJustify set_fNeedsCharacterJustify[30..31],
-    fInvalidGlyph set_fInvalidGlyph[31..32],
-]);
-BITFIELD!(SCRIPT_PROPERTIES bit_fields2: ::DWORD [
-    fInvalidLogAttr set_fInvalidLogAttr[0..1],
-    fCDM set_fCDM[1..2],
-    fAmbiguousCharSet set_fAmbiguousCharSet[2..3],
-    fClusterSizeVaries set_fClusterSizeVaries[3..4],
-    fRejectInvalid set_fRejectInvalid[4..5],
-]);
-STRUCT!{struct SCRIPT_FONTPROPERTIES {
-    cBytes: ::c_int,
-    wgBlank: ::WORD,
-    wgDefault: ::WORD,
-    wgInvalid: ::WORD,
-    wgKashida: ::WORD,
-    iKashidaWidth: ::c_int,
-}}
-//1440
-pub const SSA_PASSWORD: ::DWORD = 0x00000001;
-pub const SSA_TAB: ::DWORD = 0x00000002;
-pub const SSA_CLIP: ::DWORD = 0x00000004;
-pub const SSA_FIT: ::DWORD = 0x00000008;
-pub const SSA_DZWG: ::DWORD = 0x00000010;
-pub const SSA_FALLBACK: ::DWORD = 0x00000020;
-pub const SSA_BREAK: ::DWORD = 0x00000040;
-pub const SSA_GLYPHS: ::DWORD = 0x00000080;
-pub const SSA_RTL: ::DWORD = 0x00000100;
-pub const SSA_GCP: ::DWORD = 0x00000200;
-pub const SSA_HOTKEY: ::DWORD = 0x00000400;
-pub const SSA_METAFILE: ::DWORD = 0x00000800;
-pub const SSA_LINK: ::DWORD = 0x00001000;
-pub const SSA_HIDEHOTKEY: ::DWORD = 0x00002000;
-pub const SSA_HOTKEYONLY: ::DWORD = 0x00002400;
-pub const SSA_FULLMEASURE: ::DWORD = 0x04000000;
-pub const SSA_LPKANSIFALLBACK: ::DWORD = 0x08000000;
-pub const SSA_PIDX: ::DWORD = 0x10000000;
-pub const SSA_LAYOUTRTL: ::DWORD = 0x20000000;
-pub const SSA_DONTGLYPH: ::DWORD = 0x40000000;
-pub const SSA_NOKASHIDA: ::DWORD = 0x80000000;
-STRUCT!{struct SCRIPT_TABDEF {
-    cTabStops: ::c_int,
-    iScale: ::c_int,
-    pTabStops: *mut ::c_int,
-    iTabOrigin: ::c_int,
-}}
-DECLARE_HANDLE!(SCRIPT_STRING_ANALYSIS, SCRIPT_STRING_ANALYSIS__);
-pub const SIC_COMPLEX: ::DWORD = 1;
-pub const SIC_ASCIIDIGIT: ::DWORD = 2;
-pub const SIC_NEUTRAL: ::DWORD = 4;
-STRUCT!{struct SCRIPT_DIGITSUBSTITUTE {
-    bit_fields1: ::DWORD,
-    bit_fields2: ::DWORD,
-    dwReserved: ::DWORD,
-}}
-BITFIELD!(SCRIPT_DIGITSUBSTITUTE bit_fields1: ::DWORD [
-    NationalDigitLanguage set_NationalDigitLanguage[0..16],
-    TraditionalDigitLanguage set_TraditionalDigitLanguage[16..32],
-]);
-BITFIELD!(SCRIPT_DIGITSUBSTITUTE bit_fields2: ::DWORD [
-    DigitSubstitute set_DigitSubstitute[0..8],
-]);
-pub const SCRIPT_DIGITSUBSTITUTE_CONTEXT: ::BYTE = 0;
-pub const SCRIPT_DIGITSUBSTITUTE_NONE: ::BYTE = 1;
-pub const SCRIPT_DIGITSUBSTITUTE_NATIONAL: ::BYTE = 2;
-pub const SCRIPT_DIGITSUBSTITUTE_TRADITIONAL: ::BYTE = 3;
-pub type OPENTYPE_TAG = ::ULONG;
-pub const SCRIPT_TAG_UNKNOWN: OPENTYPE_TAG = 0x00000000;
-STRUCT!{struct OPENTYPE_FEATURE_RECORD {
-    tagFeature: OPENTYPE_TAG,
-    lParameter: ::LONG,
-}}
-STRUCT!{struct TEXTRANGE_PROPERTIES {
-    potfRecords: *mut OPENTYPE_FEATURE_RECORD,
-    cotfRecords: ::c_int,
-}}
-STRUCT!{struct SCRIPT_CHARPROP {
-    bit_fields: ::WORD,
-}}
-BITFIELD!(SCRIPT_CHARPROP bit_fields: ::WORD [
-    fCanGlyphAlone set_fCanGlyphAlone[0..1],
-    reserved set_reserved[1..16],
-]);
-STRUCT!{struct SCRIPT_GLYPHPROP {
-    sva: SCRIPT_VISATTR,
-    reserved: ::WORD,
-}}
diff --git a/vendor/winapi-0.2.8/src/vadefs.rs b/vendor/winapi-0.2.8/src/vadefs.rs
deleted file mode 100644
index c482026f0e..0000000000
--- a/vendor/winapi-0.2.8/src/vadefs.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Definitions of macro helpers used by <stdarg.h>.  This is the topmost header in the CRT header
-//! lattice, and is always the first CRT header to be included, explicitly or implicitly.
-//! Therefore, this header also has several definitions that are used throughout the CRT.
-//39
-pub type va_list = *mut ::c_char;
diff --git a/vendor/winapi-0.2.8/src/vsbackup.rs b/vendor/winapi-0.2.8/src/vsbackup.rs
deleted file mode 100644
index 5f6036a40d..0000000000
--- a/vendor/winapi-0.2.8/src/vsbackup.rs
+++ /dev/null
@@ -1,303 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS backup interfaces
-DEFINE_GUID!(IID_IVssExamineWriterMetadata, 0x902fcf7f, 0xb7fd, 0x42f8,
-    0x81, 0xf1, 0xb2, 0xe4, 0x00, 0xb1, 0xe5, 0xbd);
-DEFINE_GUID!(IID_IVssExamineWriterMetadataEx, 0x0c0e5ec0, 0xca44, 0x472b,
-    0xb7, 0x02, 0xe6, 0x52, 0xdb, 0x1c, 0x04, 0x51);
-DEFINE_GUID!(IID_IVssBackupComponents, 0x665c1d5f, 0xc218, 0x414d,
-    0xa0, 0x5d, 0x7f, 0xef, 0x5f, 0x9d, 0x5c, 0x86);
-DEFINE_GUID!(IID_IVssBackupComponentsEx, 0x963f03ad, 0x9e4c, 0x4a34,
-    0xac, 0x15, 0xe4, 0xb6, 0x17, 0x4e, 0x50, 0x36);
-STRUCT!{struct VSS_COMPONENTINFO {
-    type_: ::VSS_COMPONENT_TYPE, // type is a keyword in rust
-    bstrLogicalPath: ::BSTR,
-    bstrComponentName: ::BSTR,
-    bstrCaption: ::BSTR,
-    pbIcon: *mut ::BYTE,
-    cbIcon: ::UINT,
-    bRestoreMetadata: bool,
-    bNotifyOnBackupComplete: bool,
-    bSelectable: bool,
-    bSelectableForRestore: bool,
-    dwComponentFlags: ::DWORD,
-    cFileCount: ::UINT,
-    cDatabases: ::UINT,
-    cLogFiles: ::UINT,
-    cDependencies: ::UINT,
-}}
-pub type PVSSCOMPONENTINFO = *const ::VSS_COMPONENTINFO;
-RIDL!(
-interface IVssWMComponent(IVssWMComponentVtbl): IUnknown(IUnknownVtbl) {
-    fn GetComponentInfo(&mut self, ppInfo: *mut ::PVSSCOMPONENTINFO) -> ::HRESULT,
-    fn FreeComponentInfo(&mut self, pInfo: ::PVSSCOMPONENTINFO) -> ::HRESULT,
-    fn GetFile(&mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc) -> ::HRESULT,
-    fn GetDatabaseFile(
-        &mut self, iDBFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetDatabaseLogFile(
-        &mut self, iDbLogFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetDependency(
-        &mut self, iDependency: ::UINT, ppDependency: *mut *mut ::IVssWMDependency
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssExamineWriterMetadata(IVssExamineWriterMetadataVtbl): IUnknown(IUnknownVtbl) {
-    fn GetIdentity(
-        &mut self, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriterName: *mut ::BSTR, pUsage: *mut ::VSS_USAGE_TYPE,
-        pSource: *mut ::VSS_SOURCE_TYPE
-    ) -> ::HRESULT,
-    fn GetFileCounts(&mut self, pcIncludeFiles: *mut ::UINT, pcExcludeFiles: *mut ::UINT,
-        pcComponents: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetIncludeFile(
-        &mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetExcludeFile(
-        &mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetComponent(
-        &mut self, iComponent: ::UINT, ppComponent: *mut *mut ::IVssWMComponent
-    ) -> ::HRESULT,
-    fn GetRestoreMethod(
-        &mut self, pMethod: *mut ::VSS_RESTOREMETHOD_ENUM, pbstrService: *mut ::BSTR,
-        pbstrUserProcedure: *mut ::BSTR, pwriterRestore: *mut ::VSS_WRITERRESTORE_ENUM,
-        pbRebootRequired: *mut bool, pcMappings: *mut ::UINT
-    ) -> ::HRESULT,
-    fn GetAlternateLocationMapping(
-        &mut self, iMapping: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn GetBackupSchema(&mut self, pdwSchemaMask: *mut ::DWORD) -> ::HRESULT,
-    fn GetDocument(&mut self, pDoc: *mut ::c_void) -> ::HRESULT, //TODO IXMLDOMDocument
-    fn SaveAsXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT,
-    fn LoadFromXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssExamineWriterMetadataEx(IVssExamineWriterMetadataExVtbl):
-    IVssExamineWriterMetadata(IVssExamineWriterMetadataVtbl) {
-    fn GetIdentityEx(
-        &mut self, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriterName: *mut ::BSTR, pbstrInstanceName: *mut ::BSTR,
-        pUsage: *mut ::VSS_USAGE_TYPE, pSource: *mut ::VSS_SOURCE_TYPE
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssExamineWriterMetadataEx2(IVssExamineWriterMetadataEx2Vtbl):
-    IVssExamineWriterMetadataEx(IVssExamineWriterMetadataExVtbl) {
-    fn GetVersion(
-        &mut self, pdwMajorVersion: *mut ::DWORD, pdwMinorVersion: *mut ::DWORD
-    ) -> ::HRESULT,
-    fn GetExcludeFromSnapshotCount(&mut self, pcExcludedFromSnapshot: *mut ::UINT) -> ::HRESULT,
-    fn GetExcludeFromSnapshotFile(
-        &mut self, iFile: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT
-}
-);
-#[repr(C)]
-pub struct IVssWriterComponentsExt {
-    pub lpVtbl: *const IVssWriterComponentsExtVtbl,
-}
-#[repr(C)]
-pub struct IVssWriterComponentsExtVtbl {
-    pub parent1: ::IVssWriterComponentsVtbl,
-    pub parent2: ::IUnknownVtbl,
-}
-RIDL!(
-interface IVssBackupComponents(IVssBackupComponentsVtbl): IUnknown(IUnknownVtbl) {
-    fn GetWriterComponentsCount(&mut self, pcComponents: *mut ::UINT) -> ::HRESULT,
-    fn GetWriterComponents(
-        &mut self, iWriter: ::UINT, ppWriter: *mut *mut IVssWriterComponentsExt
-    ) -> ::HRESULT,
-    fn InitializeForBackup(&mut self, bstrXML: ::BSTR) -> ::HRESULT,
-    fn SetBackupState(
-        &mut self, bSelectComponents: bool, bBackupBootableSystemState: bool,
-        backupType: ::VSS_BACKUP_TYPE, bPartialFileSupport: bool
-    ) -> ::HRESULT,
-    fn InitializeForRestore(&mut self, bstrXML: ::BSTR) -> ::HRESULT,
-    fn SetRestoreState(&mut self, restoreType: ::VSS_RESTORE_TYPE) -> ::HRESULT,
-    fn GatherWriterMetadata(&mut self, pAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn GetWriterMetadataCount(&mut self, pcWriters: *mut ::UINT) -> ::HRESULT,
-    fn GetWriterMetadata(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID,
-        ppMetadata: *mut *mut IVssExamineWriterMetadata
-    ) -> ::HRESULT,
-    fn FreeWriterMetadata(&mut self) -> ::HRESULT,
-    fn AddComponent(
-        &mut self, instanceId: ::VSS_ID, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE,
-        wszLogicalPath: ::LPCWSTR, wszComponentName: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn PrepareForBackup(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn AbortBackup(&mut self) -> ::HRESULT,
-    fn GatherWriterStatus(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn GetWriterStatusCount(&mut self, pcWriters: *mut ::UINT) -> ::HRESULT,
-    fn FreeWriterStatus(&mut self) -> ::HRESULT,
-    fn GetWriterStatus(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriter: *mut ::BSTR, pnStatus: *mut ::VSS_WRITER_STATE,
-        phResultFailure: *mut ::HRESULT
-    ) -> ::HRESULT,
-    fn SetBackupSucceeded(
-        &mut self, instanceId: ::VSS_ID, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE,
-        wszLogicalPath: ::LPCWSTR, wszComponentName: ::LPCWSTR, bSucceded: bool
-    ) -> ::HRESULT,
-    fn SetBackupOptions(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszBackupOptions: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetSelectedForRestore(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bSelectedForRestore: bool
-    ) -> ::HRESULT,
-    fn SetRestoreOptions(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszRestoreOptions: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetAdditionalRestores(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bAdditionalRestores: bool
-    ) -> ::HRESULT,
-    fn SetPreviousBackupStamp(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszPreviousBackupStamp: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SaveAsXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT,
-    fn BackupComplete(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn AddAlternativeLocationMapping(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool,
-        wszDestination: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn AddRestoreSubcomponent(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszSubComponentLogicalPath: ::LPCWSTR,
-        wszSubComponentName: ::LPCWSTR, bRepair: bool
-    ) -> ::HRESULT,
-    fn SetFileRestoreStatus(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, status: ::VSS_FILE_RESTORE_STATUS
-    ) -> ::HRESULT,
-    fn AddNewTarget(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszPath: ::LPCWSTR, wszFileName: ::LPCWSTR, bRecursive: bool,
-        wszAlternatePath: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetRangesFilePath(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, iPartialFile: ::UINT, wszRangesFile: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn PreRestore(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn PostRestore(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn SetContext(&mut self, lContext: ::LONG) -> ::HRESULT,
-    fn StartSnapshotSet(&mut self, pSnapshotSetId: *mut ::VSS_ID) -> ::HRESULT,
-    fn AddToSnapshotSet(
-        &mut self, pwszVolumeName: ::VSS_PWSZ, ProviderId: ::VSS_ID, pidSnapshot: *mut ::VSS_ID
-    ) -> ::HRESULT,
-    fn DoSnapshotSet(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn DeleteSnapshots(
-        &mut self, SourceObjectId: ::VSS_ID, eSourceObjectType: ::VSS_OBJECT_TYPE,
-        bForceDelete: ::BOOL, plDeletedSnapshots: *mut ::LONG, pNondeletedSnapshotID: *mut ::VSS_ID
-    ) -> ::HRESULT,
-    fn ImportSnapshots(&mut self, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn BreakSnapshotSet(&mut self, SnapshotSetId: ::VSS_ID) -> ::HRESULT,
-    fn GetSnapshotProperties(
-        &mut self, SnapshotId: ::VSS_ID,
-        pProp: *mut ::VSS_SNAPSHOT_PROP
-    ) -> ::HRESULT,
-    fn Query(&mut self, QueriedObjectId: ::VSS_ID, eQueriedObjectType: ::VSS_OBJECT_TYPE,
-        eReturnedObjectsType: ::VSS_OBJECT_TYPE, ppEnum: *mut *mut ::IVssEnumObject) -> ::HRESULT,
-    fn IsVolumeSupported(
-        &mut self, ProviderId: ::VSS_ID, pwszVolumeName: ::VSS_PWSZ,
-        pbSupportedByThisProvider: *mut ::BOOL
-    ) -> ::HRESULT,
-    fn DisableWriterClasses(
-        &mut self, rgWriterClassId: *const ::VSS_ID, cClassId: ::UINT
-    ) -> ::HRESULT,
-    fn EnableWriterClasses(
-        &mut self, rgWriterClassId: *const ::VSS_ID, cClassId: ::UINT
-    ) -> ::HRESULT,
-    fn DisableWriterInstances(
-        &mut self, rgWriterInstanceId: *const ::VSS_ID, cInstanceId: ::UINT
-    ) -> ::HRESULT,
-    fn ExposeSnapshot(&mut self, SnapshotId: ::VSS_ID, wszPathFromRoot: ::VSS_PWSZ,
-        lAttributes: ::LONG, wszExpose: ::VSS_PWSZ, pwszExposed: ::VSS_PWSZ
-    ) -> ::HRESULT,
-    fn RevertToSnapshot(&mut self, SnapshotId: ::VSS_ID, bForceDismount: ::BOOL) -> ::HRESULT,
-    fn QueryRevertStatus(
-        &mut self, pwszVolume: ::VSS_PWSZ, ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx(IVssBackupComponentsExVtbl):
-    IVssBackupComponents(IVssBackupComponentsVtbl) {
-    fn GetWriterMetadataEx(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID,
-        ppMetadata: *mut *mut ::IVssExamineWriterMetadataEx
-    ) -> ::HRESULT,
-    fn SetSelectedForRestoreEx(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bSelectedForRestore: bool, instanceId: ::VSS_ID
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx2(IVssBackupComponentsEx2Vtbl):
-    IVssBackupComponentsEx(IVssBackupComponentsExVtbl) {
-    fn UnexposeSnapshot(&mut self, snapshotId: ::VSS_ID) -> ::HRESULT,
-    fn SetAuthoritativeRestore(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, bAuth: bool
-    ) -> ::HRESULT,
-    fn SetRollForward(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, rollType: ::VSS_ROLLFORWARD_TYPE,
-        wszRollForwardPoint: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetRestoreName(
-        &mut self, writerId: ::VSS_ID, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszRestoreName: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn BreakSnapshotSetEx(
-        &mut self, SnapshotSetID: ::VSS_ID, dwBreakFlags: ::DWORD, ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT,
-    fn PreFastRecovery(
-        &mut self, SnapshotSetID: ::VSS_ID, dwPreFastRecoveryFlags: ::DWORD,
-        ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT,
-    fn FastRecovery(
-        &mut self, SnapshotSetID: ::VSS_ID, dwFastRecoveryFlags: ::DWORD,
-        ppAsync: *mut *mut ::IVssAsync
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx3(IVssBackupComponentsEx3Vtbl):
-    IVssBackupComponentsEx2(IVssBackupComponentsEx2Vtbl) {
-    fn GetWriterStatusEx(
-        &mut self, iWriter: ::UINT, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID,
-        pbstrWriter: *mut ::BSTR, pnStatus: *mut ::VSS_WRITER_STATE,
-        phrFailureWriter: *mut ::HRESULT, phrApplication: *mut ::HRESULT,
-        pbstrApplicationMessage: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn AddSnapshotToRecoverySet(
-        &mut self, snapshotId: ::VSS_ID, dwFlags: ::DWORD, pwszDestinationVolume: ::VSS_PWSZ
-    ) -> ::HRESULT,
-    fn RecoverSet(&mut self, dwFlags: ::DWORD, ppAsync: *mut *mut ::IVssAsync) -> ::HRESULT,
-    fn GetSessionId(&mut self, idSession: *mut ::VSS_ID) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssBackupComponentsEx4(IVssBackupComponentsEx4Vtbl):
-    IVssBackupComponentsEx3(IVssBackupComponentsEx3Vtbl) {
-    fn GetRootAndLogicalPrefixPaths(
-        &mut self, pwszFilePath: ::VSS_PWSZ, ppwszRootPath: *mut ::VSS_PWSZ,
-        ppwszLogicalPrefix: *mut ::VSS_PWSZ, bNormalizeFQDNforRootPath: ::BOOL
-    ) -> ::HRESULT
-}
-);
-pub const VSS_SW_BOOTABLE_STATE: ::DWORD = 1;
diff --git a/vendor/winapi-0.2.8/src/vss.rs b/vendor/winapi-0.2.8/src/vss.rs
deleted file mode 100644
index 259f181068..0000000000
--- a/vendor/winapi-0.2.8/src/vss.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS header file
-ENUM!{enum VSS_OBJECT_TYPE {
-    VSS_OBJECT_UNKNOWN = 0,
-    VSS_OBJECT_NONE = 1,
-    VSS_OBJECT_SNAPSHOT_SET = 2,
-    VSS_OBJECT_SNAPSHOT = 3,
-    VSS_OBJECT_PROVIDER = 4,
-    VSS_OBJECT_TYPE_COUNT = 5,
-}}
-pub type PVSS_OBJECT_TYPE = *mut VSS_OBJECT_TYPE;
-ENUM!{enum VSS_SNAPSHOT_STATE {
-    VSS_SS_UNKNOWN = 0x00,
-    VSS_SS_PREPARING = 0x01,
-    VSS_SS_PROCESSING_PREPARE = 0x02,
-    VSS_SS_PREPARED = 0x03,
-    VSS_SS_PROCESSING_PRECOMMIT = 0x04,
-    VSS_SS_PRECOMMITTED = 0x05,
-    VSS_SS_PROCESSING_COMMIT = 0x06,
-    VSS_SS_COMMITTED = 0x07,
-    VSS_SS_PROCESSING_POSTCOMMIT = 0x08,
-    VSS_SS_PROCESSING_PREFINALCOMMIT = 0x09,
-    VSS_SS_PREFINALCOMMITTED = 0x0a,
-    VSS_SS_PROCESSING_POSTFINALCOMMIT = 0x0b,
-    VSS_SS_CREATED = 0x0c,
-    VSS_SS_ABORTED = 0x0d,
-    VSS_SS_DELETED = 0x0e,
-    VSS_SS_POSTCOMMITTED = 0x0f,
-    VSS_SS_COUNT = 0x10,
-}}
-pub type PVSS_SNAPSHOT_STATE = *mut VSS_SNAPSHOT_STATE;
-pub type VSS_VOLUME_SNAPSHOT_ATTRIBUTES = ::LONG;
-pub const VSS_VOLSNAP_ATTR_PERSISTENT: ::LONG = 0x00000001;
-pub const VSS_VOLSNAP_ATTR_NO_AUTORECOVERY: ::LONG = 0x00000002;
-pub const VSS_VOLSNAP_ATTR_CLIENT_ACCESSIBLE: ::LONG = 0x00000004;
-pub const VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE: ::LONG = 0x00000008;
-pub const VSS_VOLSNAP_ATTR_NO_WRITERS: ::LONG = 0x00000010;
-pub const VSS_VOLSNAP_ATTR_TRANSPORTABLE: ::LONG = 0x00000020;
-pub const VSS_VOLSNAP_ATTR_NOT_SURFACED: ::LONG = 0x00000040;
-pub const VSS_VOLSNAP_ATTR_NOT_TRANSACTED: ::LONG = 0x00000080;
-pub const VSS_VOLSNAP_ATTR_HARDWARE_ASSISTED: ::LONG = 0x00010000;
-pub const VSS_VOLSNAP_ATTR_DIFFERENTIAL: ::LONG = 0x00020000;
-pub const VSS_VOLSNAP_ATTR_PLEX: ::LONG = 0x00040000;
-pub const VSS_VOLSNAP_ATTR_IMPORTED: ::LONG = 0x00080000;
-pub const VSS_VOLSNAP_ATTR_EXPOSED_LOCALLY: ::LONG = 0x00100000;
-pub const VSS_VOLSNAP_ATTR_EXPOSED_REMOTELY: ::LONG = 0x00200000;
-pub const VSS_VOLSNAP_ATTR_AUTORECOVER: ::LONG = 0x00400000;
-pub const VSS_VOLSNAP_ATTR_ROLLBACK_RECOVERY: ::LONG = 0x00800000;
-pub const VSS_VOLSNAP_ATTR_DELAYED_POSTSNAPSHOT: ::LONG = 0x01000000;
-pub const VSS_VOLSNAP_ATTR_TXF_RECOVERY: ::LONG = 0x02000000;
-pub const VSS_VOLSNAP_ATTR_FILE_SHARE: ::LONG = 0x04000000;
-pub type PVSS_VOLUME_SNAPSHOT_ATTRIBUTES = *mut VSS_VOLUME_SNAPSHOT_ATTRIBUTES;
-pub type VSS_SNAPSHOT_CONTEXT = ::LONG;
-pub type PVSS_SNAPSHOT_CONTEXT = *mut VSS_SNAPSHOT_CONTEXT;
-pub const VSS_CTX_BACKUP: ::LONG = 0;
-pub const VSS_CTX_FILE_SHARE_BACKUP: ::LONG = VSS_VOLSNAP_ATTR_NO_WRITERS;
-pub const VSS_CTX_NAS_ROLLBACK: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE | VSS_VOLSNAP_ATTR_NO_WRITERS;
-pub const VSS_CTX_APP_ROLLBACK: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE;
-pub const VSS_CTX_CLIENT_ACCESSIBLE: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_CLIENT_ACCESSIBLE | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE
-    | VSS_VOLSNAP_ATTR_NO_WRITERS;
-pub const VSS_CTX_CLIENT_ACCESSIBLE_WRITERS: ::LONG = VSS_VOLSNAP_ATTR_PERSISTENT
-    | VSS_VOLSNAP_ATTR_CLIENT_ACCESSIBLE | VSS_VOLSNAP_ATTR_NO_AUTO_RELEASE;
-pub const VSS_CTX_ALL: ::LONG = 0xffffffffu32 as ::LONG;
-pub type VSS_PROVIDER_CAPABILITIES = ::DWORD;
-pub type PVSS_PROVIDER_CAPABILITIES = *mut VSS_PROVIDER_CAPABILITIES;
-pub const VSS_PRV_CAPABILITY_LEGACY: ::DWORD = 0x1;
-pub const VSS_PRV_CAPABILITY_COMPLIANT: ::DWORD = 0x2;
-pub const VSS_PRV_CAPABILITY_LUN_REPOINT: ::DWORD = 0x4;
-pub const VSS_PRV_CAPABILITY_LUN_RESYNC: ::DWORD = 0x8;
-pub const VSS_PRV_CAPABILITY_OFFLINE_CREATION: ::DWORD = 0x10;
-pub const VSS_PRV_CAPABILITY_MULTIPLE_IMPORT: ::DWORD = 0x20;
-pub const VSS_PRV_CAPABILITY_RECYCLING: ::DWORD = 0x40;
-pub const VSS_PRV_CAPABILITY_PLEX: ::DWORD = 0x80;
-pub const VSS_PRV_CAPABILITY_DIFFERENTIAL: ::DWORD = 0x100;
-pub const VSS_PRV_CAPABILITY_CLUSTERED: ::DWORD = 0x200;
-pub type VSS_HARDWARE_OPTIONS = ::DWORD;
-pub type PVSS_HARDWARE_OPTIONS = *mut VSS_HARDWARE_OPTIONS;
-pub const VSS_BREAKEX_FLAG_MASK_LUNS: ::DWORD = 0x1;
-pub const VSS_BREAKEX_FLAG_MAKE_READ_WRITE: ::DWORD = 0x2;
-pub const VSS_BREAKEX_FLAG_REVERT_IDENTITY_ALL: ::DWORD = 0x4;
-pub const VSS_BREAKEX_FLAG_REVERT_IDENTITY_NONE: ::DWORD = 0x8;
-pub const VSS_ONLUNSTATECHANGE_NOTIFY_READ_WRITE: ::DWORD = 0x100;
-pub const VSS_ONLUNSTATECHANGE_NOTIFY_LUN_PRE_RECOVERY: ::DWORD = 0x200;
-pub const VSS_ONLUNSTATECHANGE_NOTIFY_LUN_POST_RECOVERY: ::DWORD = 0x400;
-pub const VSS_ONLUNSTATECHANGE_DO_MASK_LUNS: ::DWORD = 0x800;
-pub type VSS_RECOVERY_OPTIONS = ::DWORD;
-pub type PVSS_RECOVERY_OPTIONS = *mut VSS_RECOVERY_OPTIONS;
-pub const VSS_RECOVERY_REVERT_IDENTITY_ALL: ::DWORD = 0x00000100;
-pub const VSS_RECOVERY_NO_VOLUME_CHECK: ::DWORD = 0x00000200;
-ENUM!{enum VSS_WRITER_STATE {
-    VSS_WS_UNKNOWN = 0,
-    VSS_WS_STABLE = 1,
-    VSS_WS_WAITING_FOR_FREEZE = 2,
-    VSS_WS_WAITING_FOR_THAW = 3,
-    VSS_WS_WAITING_FOR_POST_SNAPSHOT = 4,
-    VSS_WS_WAITING_FOR_BACKUP_COMPLETE = 5,
-    VSS_WS_FAILED_AT_IDENTIFY = 6,
-    VSS_WS_FAILED_AT_PREPARE_BACKUP = 7,
-    VSS_WS_FAILED_AT_PREPARE_SNAPSHOT = 8,
-    VSS_WS_FAILED_AT_FREEZE = 9,
-    VSS_WS_FAILED_AT_THAW = 10,
-    VSS_WS_FAILED_AT_POST_SNAPSHOT = 11,
-    VSS_WS_FAILED_AT_BACKUP_COMPLETE = 12,
-    VSS_WS_FAILED_AT_PRE_RESTORE = 13,
-    VSS_WS_FAILED_AT_POST_RESTORE = 14,
-    VSS_WS_FAILED_AT_BACKUPSHUTDOWN = 15,
-    VSS_WS_COUNT = 16,
-}}
-pub type PVSS_WRITER_STATE = *mut VSS_WRITER_STATE;
-ENUM!{enum VSS_BACKUP_TYPE {
-    VSS_BT_UNDEFINED = 0,
-    VSS_BT_FULL = 1,
-    VSS_BT_INCREMENTAL = 2,
-    VSS_BT_DIFFERENTIAL = 3,
-    VSS_BT_LOG = 4,
-    VSS_BT_COPY = 5,
-    VSS_BT_OTHER = 6,
-}}
-pub type PVSS_BACKUP_TYPE = *mut VSS_BACKUP_TYPE;
-ENUM!{enum VSS_RESTORE_TYPE {
-    VSS_RTYPE_UNDEFINED = 0,
-    VSS_RTYPE_BY_COPY = 1,
-    VSS_RTYPE_IMPORT = 2,
-    VSS_RTYPE_OTHER = 3,
-}}
-pub type PVSS_RESTORE_TYPE = *mut VSS_RESTORE_TYPE;
-ENUM!{enum VSS_ROLLFORWARD_TYPE {
-    VSS_RF_UNDEFINED = 0,
-    VSS_RF_NONE = 1,
-    VSS_RF_ALL = 2,
-    VSS_RF_PARTIAL = 3,
-}}
-pub type PVSS_ROLLFORWARD_TYPE = *mut VSS_ROLLFORWARD_TYPE;
-ENUM!{enum VSS_PROVIDER_TYPE {
-    VSS_PROV_UNKNOWN = 0,
-    VSS_PROV_SYSTEM = 1,
-    VSS_PROV_SOFTWARE = 2,
-    VSS_PROV_HARDWARE = 3,
-    VSS_PROV_FILESHARE = 4,
-}}
-pub type PVSS_PROVIDER_TYPE = *mut VSS_PROVIDER_TYPE;
-ENUM!{enum VSS_APPLICATION_LEVEL {
-    VSS_APP_UNKNOWN = 0,
-    VSS_APP_SYSTEM = 1,
-    VSS_APP_BACK_END = 2,
-    VSS_APP_FRONT_END = 3,
-    VSS_APP_SYSTEM_RM = 4,
-    VSS_APP_AUTO = -1i32 as u32,
-}}
-pub type PVSS_APPLICATION_LEVEL = *mut VSS_APPLICATION_LEVEL;
-ENUM!{enum VSS_SNAPSHOT_PROPERTY_ID {
-    VSS_SPROPID_UNKNOWN = 0,
-    VSS_SPROPID_SNAPSHOT_ID = 0x1,
-    VSS_SPROPID_SNAPSHOT_SET_ID = 0x2,
-    VSS_SPROPID_SNAPSHOTS_COUNT = 0x3,
-    VSS_SPROPID_SNAPSHOT_DEVICE = 0x4,
-    VSS_SPROPID_ORIGINAL_VOLUME = 0x5,
-    VSS_SPROPID_ORIGINATING_MACHINE = 0x6,
-    VSS_SPROPID_SERVICE_MACHINE = 0x7,
-    VSS_SPROPID_EXPOSED_NAME = 0x8,
-    VSS_SPROPID_EXPOSED_PATH = 0x9,
-    VSS_SPROPID_PROVIDER_ID = 0xa,
-    VSS_SPROPID_SNAPSHOT_ATTRIBUTES = 0xb,
-    VSS_SPROPID_CREATION_TIMESTAMP = 0xc,
-    VSS_SPROPID_STATUS = 0xd,
-}}
-pub type PVSS_SNAPSHOT_PROPERTY_ID = *mut VSS_SNAPSHOT_PROPERTY_ID;
-pub type VSS_FILE_SPEC_BACKUP_TYPE = ::DWORD;
-pub type PVSS_FILE_SPEC_BACKUP_TYPE = *mut VSS_FILE_SPEC_BACKUP_TYPE;
-pub const VSS_FSBT_FULL_BACKUP_REQUIRED: ::DWORD = 0x1;
-pub const VSS_FSBT_DIFFERENTIAL_BACKUP_REQUIRED: ::DWORD = 0x2;
-pub const VSS_FSBT_INCREMENTAL_BACKUP_REQUIRED: ::DWORD = 0x4;
-pub const VSS_FSBT_LOG_BACKUP_REQUIRED: ::DWORD = 0x8;
-pub const VSS_FSBT_FULL_SNAPSHOT_REQUIRED: ::DWORD = 0x100;
-pub const VSS_FSBT_DIFFERENTIAL_SNAPSHOT_REQUIRED: ::DWORD = 0x200;
-pub const VSS_FSBT_INCREMENTAL_SNAPSHOT_REQUIRED: ::DWORD = 0x400;
-pub const VSS_FSBT_LOG_SNAPSHOT_REQUIRED: ::DWORD = 0x800;
-pub const VSS_FSBT_CREATED_DURING_BACKUP: ::DWORD = 0x10000;
-pub const VSS_FSBT_ALL_BACKUP_REQUIRED: ::DWORD = 0xf;
-pub const VSS_FSBT_ALL_SNAPSHOT_REQUIRED: ::DWORD = 0xf00;
-pub type VSS_BACKUP_SCHEMA = ::DWORD;
-pub type PVSS_BACKUP_SCHEMA = *mut VSS_BACKUP_SCHEMA;
-pub const VSS_BS_UNDEFINED: ::DWORD = 0;
-pub const VSS_BS_DIFFERENTIAL: ::DWORD = 0x1;
-pub const VSS_BS_INCREMENTAL: ::DWORD = 0x2;
-pub const VSS_BS_EXCLUSIVE_INCREMENTAL_DIFFERENTIAL: ::DWORD = 0x4;
-pub const VSS_BS_LOG: ::DWORD = 0x8;
-pub const VSS_BS_COPY: ::DWORD = 0x10;
-pub const VSS_BS_TIMESTAMPED: ::DWORD = 0x20;
-pub const VSS_BS_LAST_MODIFY: ::DWORD = 0x40;
-pub const VSS_BS_LSN: ::DWORD = 0x80;
-pub const VSS_BS_WRITER_SUPPORTS_NEW_TARGET: ::DWORD = 0x100;
-pub const VSS_BS_WRITER_SUPPORTS_RESTORE_WITH_MOVE: ::DWORD = 0x200;
-pub const VSS_BS_INDEPENDENT_SYSTEM_STATE: ::DWORD = 0x400;
-pub const VSS_BS_ROLLFORWARD_RESTORE: ::DWORD = 0x1000;
-pub const VSS_BS_RESTORE_RENAME: ::DWORD = 0x2000;
-pub const VSS_BS_AUTHORITATIVE_RESTORE: ::DWORD = 0x4000;
-pub const VSS_BS_WRITER_SUPPORTS_PARALLEL_RESTORES: ::DWORD = 0x8000;
-pub type VSS_ID = ::GUID;
-pub type VSS_PWSZ = *mut ::WCHAR;
-pub type VSS_TIMESTAMP = ::LONGLONG;
-STRUCT!{struct VSS_SNAPSHOT_PROP {
-    m_SnapshotId: ::VSS_ID,
-    m_SnapshotSetId: ::VSS_ID,
-    m_lSnapshotsCount: ::LONG,
-    m_pwszSnapshotDeviceObject: ::VSS_PWSZ,
-    m_pwszOriginalVolumeName: ::VSS_PWSZ,
-    m_pwszOriginatingMachine: ::VSS_PWSZ,
-    m_pwszServiceMachine: ::VSS_PWSZ,
-    m_pwszExposedName: ::VSS_PWSZ,
-    m_pwszExposedPath: ::VSS_PWSZ,
-    m_ProviderId: ::VSS_ID,
-    m_lSnapshotAttributes: ::LONG,
-    m_tsCreationTimestamp: ::VSS_TIMESTAMP,
-    m_eStatus: ::VSS_SNAPSHOT_STATE,
-}}
-type PVSS_SNAPSHOT_PROP = *mut VSS_SNAPSHOT_PROP;
-STRUCT!{struct VSS_PROVIDER_PROP {
-    m_ProviderId: ::VSS_ID,
-    m_pwszProviderName: ::VSS_PWSZ,
-    m_eProviderType: ::VSS_PROVIDER_TYPE,
-    m_pwszProviderVersion: ::VSS_PWSZ,
-    m_ProviderVersionId: ::VSS_ID,
-    m_ClassId: ::CLSID,
-}}
-type PVSS_PROVIDER_PROP = *mut VSS_PROVIDER_PROP;
-STRUCT!{struct VSS_OBJECT_UNION {
-    Snap: ::VSS_SNAPSHOT_PROP,
-}}
-UNION!(VSS_OBJECT_UNION, Snap, Prov, Prov_mut, VSS_PROVIDER_PROP);
-STRUCT!{struct VSS_OBJECT_PROP {
-    Type: ::VSS_OBJECT_TYPE,
-    Obj: ::VSS_OBJECT_UNION,
-}}
-type PVSS_OBJECT_PROP = *mut VSS_OBJECT_PROP;
-RIDL!(
-interface IVssEnumObject(IVssEnumObjectVtbl): IUnknown(IUnknownVtbl) {
-    fn Next(
-        &mut self, celt: ::ULONG, rgelt: *mut ::VSS_OBJECT_PROP, pceltFetched: *mut ::ULONG
-    ) -> ::HRESULT,
-    fn Skip(&mut self, celt: ::ULONG) -> ::HRESULT,
-    fn Reset(&mut self) -> ::HRESULT,
-    fn Clone(&mut self, ppenum: *mut *mut ::IVssEnumObject) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssAsync(IVssAsyncVtbl): IUnknown(IUnknownVtbl) {
-    fn Cancel(&mut self) -> ::HRESULT,
-    fn Wait(&mut self, dwMilliseconds: ::DWORD) -> ::HRESULT,
-    fn QueryStatus(&mut self, pHrResult: *mut ::HRESULT, pReserved: *mut ::INT) -> ::HRESULT
-}
-);
diff --git a/vendor/winapi-0.2.8/src/vsserror.rs b/vendor/winapi-0.2.8/src/vsserror.rs
deleted file mode 100644
index ef84af0f08..0000000000
--- a/vendor/winapi-0.2.8/src/vsserror.rs
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS Error header file
-pub const VSS_E_BAD_STATE: ::HRESULT = 0x80042301u32 as i32;
-pub const VSS_E_UNEXPECTED: ::HRESULT = 0x80042302u32 as i32;
-pub const VSS_E_PROVIDER_ALREADY_REGISTERED: ::HRESULT = 0x80042303u32 as i32;
-pub const VSS_E_PROVIDER_NOT_REGISTERED: ::HRESULT = 0x80042304u32 as i32;
-pub const VSS_E_PROVIDER_VETO: ::HRESULT = 0x80042306u32 as i32;
-pub const VSS_E_PROVIDER_IN_USE: ::HRESULT = 0x80042307u32 as i32;
-pub const VSS_E_OBJECT_NOT_FOUND: ::HRESULT = 0x80042308u32 as i32;
-pub const VSS_S_ASYNC_PENDING: ::HRESULT = 0x00042309u32 as i32;
-pub const VSS_S_ASYNC_FINISHED: ::HRESULT = 0x0004230Au32 as i32;
-pub const VSS_S_ASYNC_CANCELLED: ::HRESULT = 0x0004230Bu32 as i32;
-pub const VSS_E_VOLUME_NOT_SUPPORTED: ::HRESULT = 0x8004230Cu32 as i32;
-pub const VSS_E_VOLUME_NOT_SUPPORTED_BY_PROVIDER: ::HRESULT = 0x8004230Eu32 as i32;
-pub const VSS_E_OBJECT_ALREADY_EXISTS: ::HRESULT = 0x8004230Du32 as i32;
-pub const VSS_E_UNEXPECTED_PROVIDER_ERROR: ::HRESULT = 0x8004230Fu32 as i32;
-pub const VSS_E_CORRUPT_XML_DOCUMENT: ::HRESULT = 0x80042310u32 as i32;
-pub const VSS_E_INVALID_XML_DOCUMENT: ::HRESULT = 0x80042311u32 as i32;
-pub const VSS_E_MAXIMUM_NUMBER_OF_VOLUMES_REACHED: ::HRESULT = 0x80042312u32 as i32;
-pub const VSS_E_FLUSH_WRITES_TIMEOUT: ::HRESULT = 0x80042313u32 as i32;
-pub const VSS_E_HOLD_WRITES_TIMEOUT: ::HRESULT = 0x80042314u32 as i32;
-pub const VSS_E_UNEXPECTED_WRITER_ERROR: ::HRESULT = 0x80042315u32 as i32;
-pub const VSS_E_SNAPSHOT_SET_IN_PROGRESS: ::HRESULT = 0x80042316u32 as i32;
-pub const VSS_E_MAXIMUM_NUMBER_OF_SNAPSHOTS_REACHED: ::HRESULT = 0x80042317u32 as i32;
-pub const VSS_E_WRITER_INFRASTRUCTURE: ::HRESULT = 0x80042318u32 as i32;
-pub const VSS_E_WRITER_NOT_RESPONDING: ::HRESULT = 0x80042319u32 as i32;
-pub const VSS_E_WRITER_ALREADY_SUBSCRIBED: ::HRESULT = 0x8004231Au32 as i32;
-pub const VSS_E_UNSUPPORTED_CONTEXT: ::HRESULT = 0x8004231Bu32 as i32;
-pub const VSS_E_VOLUME_IN_USE: ::HRESULT = 0x8004231Du32 as i32;
-pub const VSS_E_MAXIMUM_DIFFAREA_ASSOCIATIONS_REACHED: ::HRESULT = 0x8004231Eu32 as i32;
-pub const VSS_E_INSUFFICIENT_STORAGE: ::HRESULT = 0x8004231Fu32 as i32;
-pub const VSS_E_NO_SNAPSHOTS_IMPORTED: ::HRESULT = 0x80042320u32 as i32;
-pub const VSS_S_SOME_SNAPSHOTS_NOT_IMPORTED: ::HRESULT = 0x00042321u32 as i32;
-pub const VSS_E_SOME_SNAPSHOTS_NOT_IMPORTED: ::HRESULT = 0x80042321u32 as i32;
-pub const VSS_E_MAXIMUM_NUMBER_OF_REMOTE_MACHINES_REACHED: ::HRESULT = 0x80042322u32 as i32;
-pub const VSS_E_REMOTE_SERVER_UNAVAILABLE: ::HRESULT = 0x80042323u32 as i32;
-pub const VSS_E_REMOTE_SERVER_UNSUPPORTED: ::HRESULT = 0x80042324u32 as i32;
-pub const VSS_E_REVERT_IN_PROGRESS: ::HRESULT = 0x80042325u32 as i32;
-pub const VSS_E_REVERT_VOLUME_LOST: ::HRESULT = 0x80042326u32 as i32;
-pub const VSS_E_REBOOT_REQUIRED: ::HRESULT = 0x80042327u32 as i32;
-pub const VSS_E_TRANSACTION_FREEZE_TIMEOUT: ::HRESULT = 0x80042328u32 as i32;
-pub const VSS_E_TRANSACTION_THAW_TIMEOUT: ::HRESULT = 0x80042329u32 as i32;
-pub const VSS_E_VOLUME_NOT_LOCAL: ::HRESULT = 0x8004232Du32 as i32;
-pub const VSS_E_CLUSTER_TIMEOUT: ::HRESULT = 0x8004232Eu32 as i32;
-pub const VSS_E_WRITERERROR_INCONSISTENTSNAPSHOT: ::HRESULT = 0x800423F0u32 as i32;
-pub const VSS_E_WRITERERROR_OUTOFRESOURCES: ::HRESULT = 0x800423F1u32 as i32;
-pub const VSS_E_WRITERERROR_TIMEOUT: ::HRESULT = 0x800423F2u32 as i32;
-pub const VSS_E_WRITERERROR_RETRYABLE: ::HRESULT = 0x800423F3u32 as i32;
-pub const VSS_E_WRITERERROR_NONRETRYABLE: ::HRESULT = 0x800423F4u32 as i32;
-pub const VSS_E_WRITERERROR_RECOVERY_FAILED: ::HRESULT = 0x800423F5u32 as i32;
-pub const VSS_E_BREAK_REVERT_ID_FAILED: ::HRESULT = 0x800423F6u32 as i32;
-pub const VSS_E_LEGACY_PROVIDER: ::HRESULT = 0x800423F7u32 as i32;
-pub const VSS_E_MISSING_DISK: ::HRESULT = 0x800423F8u32 as i32;
-pub const VSS_E_MISSING_HIDDEN_VOLUME: ::HRESULT = 0x800423F9u32 as i32;
-pub const VSS_E_MISSING_VOLUME: ::HRESULT = 0x800423FAu32 as i32;
-pub const VSS_E_AUTORECOVERY_FAILED: ::HRESULT = 0x800423FBu32 as i32;
-pub const VSS_E_DYNAMIC_DISK_ERROR: ::HRESULT = 0x800423FCu32 as i32;
-pub const VSS_E_NONTRANSPORTABLE_BCD: ::HRESULT = 0x800423FDu32 as i32;
-pub const VSS_E_CANNOT_REVERT_DISKID: ::HRESULT = 0x800423FEu32 as i32;
-pub const VSS_E_RESYNC_IN_PROGRESS: ::HRESULT = 0x800423FFu32 as i32;
-pub const VSS_E_CLUSTER_ERROR: ::HRESULT = 0x80042400u32 as i32;
-pub const VSS_E_UNSELECTED_VOLUME: ::HRESULT = 0x8004232Au32 as i32;
-pub const VSS_E_SNAPSHOT_NOT_IN_SET: ::HRESULT = 0x8004232Bu32 as i32;
-pub const VSS_E_NESTED_VOLUME_LIMIT: ::HRESULT = 0x8004232Cu32 as i32;
-pub const VSS_E_NOT_SUPPORTED: ::HRESULT = 0x8004232Fu32 as i32;
-pub const VSS_E_WRITERERROR_PARTIAL_FAILURE: ::HRESULT = 0x80042336u32 as i32;
-pub const VSS_E_ASRERROR_DISK_ASSIGNMENT_FAILED: ::HRESULT = 0x80042401u32 as i32;
-pub const VSS_E_ASRERROR_DISK_RECREATION_FAILED: ::HRESULT = 0x80042402u32 as i32;
-pub const VSS_E_ASRERROR_NO_ARCPATH: ::HRESULT = 0x80042403u32 as i32;
-pub const VSS_E_ASRERROR_MISSING_DYNDISK: ::HRESULT = 0x80042404u32 as i32;
-pub const VSS_E_ASRERROR_SHARED_CRIDISK: ::HRESULT = 0x80042405u32 as i32;
-pub const VSS_E_ASRERROR_DATADISK_RDISK0: ::HRESULT = 0x80042406u32 as i32;
-pub const VSS_E_ASRERROR_RDISK0_TOOSMALL: ::HRESULT = 0x80042407u32 as i32;
-pub const VSS_E_ASRERROR_CRITICAL_DISKS_TOO_SMALL: ::HRESULT = 0x80042408u32 as i32;
-pub const VSS_E_WRITER_STATUS_NOT_AVAILABLE: ::HRESULT = 0x80042409u32 as i32;
-pub const VSS_E_ASRERROR_DYNAMIC_VHD_NOT_SUPPORTED: ::HRESULT = 0x8004240Au32 as i32;
-pub const VSS_E_CRITICAL_VOLUME_ON_INVALID_DISK: ::HRESULT = 0x80042411u32 as i32;
-pub const VSS_E_ASRERROR_RDISK_FOR_SYSTEM_DISK_NOT_FOUND: ::HRESULT = 0x80042412u32 as i32;
-pub const VSS_E_ASRERROR_NO_PHYSICAL_DISK_AVAILABLE: ::HRESULT = 0x80042413u32 as i32;
-pub const VSS_E_ASRERROR_FIXED_PHYSICAL_DISK_AVAILABLE_AFTER_DISK_EXCLUSION: ::HRESULT =
-    0x80042414u32 as i32;
-pub const VSS_E_ASRERROR_CRITICAL_DISK_CANNOT_BE_EXCLUDED: ::HRESULT = 0x80042415u32 as i32;
-pub const VSS_E_ASRERROR_SYSTEM_PARTITION_HIDDEN: ::HRESULT = 0x80042416u32 as i32;
-pub const VSS_E_FSS_TIMEOUT: ::HRESULT = 0x80042417u32 as i32;
diff --git a/vendor/winapi-0.2.8/src/vswriter.rs b/vendor/winapi-0.2.8/src/vswriter.rs
deleted file mode 100644
index fd1509c814..0000000000
--- a/vendor/winapi-0.2.8/src/vswriter.rs
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright © 2015, Brian Vincent
-// Licensed under the MIT License <LICENSE.md>
-//! VSS Writer header file
-ENUM!{enum VSS_USAGE_TYPE {
-    VSS_UT_UNDEFINED = 0,
-    VSS_UT_BOOTABLESYSTEMSTATE = 1,
-    VSS_UT_SYSTEMSERVICE = 2,
-    VSS_UT_USERDATA = 3,
-    VSS_UT_OTHER = 4,
-}}
-ENUM!{enum VSS_SOURCE_TYPE {
-    VSS_ST_UNDEFINED = 0,
-    VSS_ST_TRANSACTEDDB = 1,
-    VSS_ST_NONTRANSACTEDDB = 2,
-    VSS_ST_OTHER = 3,
-}}
-ENUM!{enum VSS_RESTOREMETHOD_ENUM {
-    VSS_RME_UNDEFINED = 0,
-    VSS_RME_RESTORE_IF_NOT_THERE = 1,
-    VSS_RME_RESTORE_IF_CAN_REPLACE = 2,
-    VSS_RME_STOP_RESTORE_START = 3,
-    VSS_RME_RESTORE_TO_ALTERNATE_LOCATION = 4,
-    VSS_RME_RESTORE_AT_REBOOT = 5,
-    VSS_RME_RESTORE_AT_REBOOT_IF_CANNOT_REPLACE = 6,
-    VSS_RME_CUSTOM = 7,
-    VSS_RME_RESTORE_STOP_START = 8,
-}}
-ENUM!{enum VSS_WRITERRESTORE_ENUM {
-    VSS_WRE_UNDEFINED = 0,
-    VSS_WRE_NEVER = 1,
-    VSS_WRE_IF_REPLACE_FAILS = 2,
-    VSS_WRE_ALWAYS = 3,
-}}
-ENUM!{enum VSS_COMPONENT_TYPE {
-    VSS_CT_UNDEFINED = 0,
-    VSS_CT_DATABASE = 1,
-    VSS_CT_FILEGROUP = 2,
-}}
-ENUM!{enum VSS_ALTERNATE_WRITER_STATE {
-    VSS_AWS_UNDEFINED = 0,
-    VSS_AWS_NO_ALTERNATE_WRITER = 1,
-    VSS_AWS_ALTERNATE_WRITER_EXISTS = 2,
-    VSS_AWS_THIS_IS_ALTERNATE_WRITER = 3,
-}}
-pub type VSS_SUBSCRIBE_MASK = ::DWORD;
-pub const VSS_SM_POST_SNAPSHOT_FLAG: ::DWORD = 0x00000001;
-pub const VSS_SM_BACKUP_EVENTS_FLAG: ::DWORD = 0x00000002;
-pub const VSS_SM_RESTORE_EVENTS_FLAG: ::DWORD = 0x00000004;
-pub const VSS_SM_IO_THROTTLING_FLAG: ::DWORD = 0x00000008;
-pub const VSS_SM_ALL_FLAGS: ::DWORD = 0xffffffff;
-ENUM!{enum VSS_RESTORE_TARGET {
-    VSS_RT_UNDEFINED = 0,
-    VSS_RT_ORIGINAL = 1,
-    VSS_RT_ALTERNATE = 2,
-    VSS_RT_DIRECTED = 3,
-    VSS_RT_ORIGINAL_LOCATION = 4,
-}}
-ENUM!{enum VSS_FILE_RESTORE_STATUS {
-    VSS_RS_UNDEFINED = 0,
-    VSS_RS_NONE = 1,
-    VSS_RS_ALL = 2,
-    VSS_RS_FAILED = 3,
-}}
-pub type VSS_COMPONENT_FLAGS = ::DWORD;
-pub const VSS_CF_BACKUP_RECOVERY: ::DWORD = 0x00000001;
-pub const VSS_CF_APP_ROLLBACK_RECOVERY: ::DWORD = 0x00000002;
-pub const VSS_CF_NOT_SYSTEM_STATE: ::DWORD = 0x00000004;
-RIDL!(
-interface IVssWMFiledesc(IVssWMFiledescVtbl): IUnknown(IUnknownVtbl) {
-    fn GetPath(&mut self, pbstrPath: *mut ::BSTR) -> ::HRESULT,
-    fn GetFilespec(&mut self, pbstrFilespec: *mut ::BSTR) -> ::HRESULT,
-    fn GetRecursive(&mut self, pbRecursive: *mut bool) -> ::HRESULT,
-    fn GetAlternateLocation(&mut self, pbstrAlternateLocation: *mut ::BSTR) -> ::HRESULT,
-    fn GetBackupTypeMask(&mut self, pdwTypeMask: *mut ::DWORD) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssWMDependency(IVssWMDependencyVtbl): IUnknown(IUnknownVtbl) {
-    fn GetWriterId(&mut self, pWriterId: *mut ::VSS_ID) -> ::HRESULT,
-    fn GetLogicalPath(&mut self, pbstrLogicalPath: *mut ::BSTR) -> ::HRESULT,
-    fn GetComponentName(&mut self, pbstrComponentName: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssComponent(IVssComponentVtbl): IUnknown(IUnknownVtbl) {
-    fn GetLogicalPath(&mut self, pbstrPath: *mut ::BSTR) -> ::HRESULT,
-    fn GetComponentType(&mut self, pct: *mut ::VSS_COMPONENT_TYPE) -> ::HRESULT,
-    fn GetComponentName(&mut self, pbstrName: *mut ::BSTR) -> ::HRESULT,
-    fn GetBackupSucceeded(&mut self, pbSucceeded: *mut bool) -> ::HRESULT,
-    fn GetAlternateLocationMappingCount(&mut self, pcMappings: *mut ::UINT) -> ::HRESULT,
-    fn GetAlternateLocationMapping(
-        &mut self, iMapping: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn SetBackupMetadata(&mut self, wszData: ::LPCWSTR) -> ::HRESULT,
-    fn GetBackupMetadata(&mut self, pbstrData: *mut ::BSTR) -> ::HRESULT,
-    fn AddPartialFile(
-        &mut self, wszPath: ::LPCWSTR, wszFilename: ::LPCWSTR, wszRanges: ::LPCWSTR,
-        wszMetadata: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn GetPartialFileCount(&mut self, pcPartialFiles: *mut ::UINT) -> ::HRESULT,
-    fn GetPartialFile(
-        &mut self, iPartialFile: ::UINT, pbstrPath: *mut ::BSTR, pbstrFilename: *mut ::BSTR,
-        pbstrRange: *mut ::BSTR, pbstrMetadata: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn IsSelectedForRestore(&mut self, pbSelectedForRestore: *mut bool) -> ::HRESULT,
-    fn GetAdditionalRestores(&mut self, pbAdditionalRestores: *mut bool) -> ::HRESULT,
-    fn GetNewTargetCount(&mut self, pcNewTarget: *mut ::UINT) -> ::HRESULT,
-    fn GetNewTarget(
-        &mut self, iNewTarget: ::UINT, ppFiledesc: *mut *mut ::IVssWMFiledesc
-    ) -> ::HRESULT,
-    fn AddDirectedTarget(
-        &mut self, wszSourcePath: ::LPCWSTR, wszSourceFilename: ::LPCWSTR,
-        wszSourceRangeList: ::LPCWSTR, wszDestinationPath: ::LPCWSTR,
-        wszDestinationFilename: ::LPCWSTR, wszDestinationRangeList: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn GetDirectedTargetCount(&mut self, pcDirectedTarget: *mut ::UINT) -> ::HRESULT,
-    fn GetDirectedTarget(
-        &mut self, iDirectedTarget: ::UINT, pbstrSourcePath: *mut ::BSTR,
-        pbstrSourceFileName: *mut ::BSTR, pbstrSourceRangeList: *mut ::BSTR,
-        pbstrDestinationPath: *mut ::BSTR, pbstrDestinationFilename: *mut ::BSTR,
-        pbstrDestinationRangeList: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn SetRestoreMetadata(&mut self, wszRestoreMetadata: ::LPCWSTR) -> ::HRESULT,
-    fn GetRestoreMetadata(&mut self, pbstrRestoreMetadata: *mut ::BSTR) -> ::HRESULT,
-    fn SetRestoreTarget(&mut self, target: ::VSS_RESTORE_TARGET) -> ::HRESULT,
-    fn GetRestoreTarget(&mut self, pTarget: *mut ::VSS_RESTORE_TARGET) -> ::HRESULT,
-    fn SetPreRestoreFailureMsg(&mut self, wszPreRestoreFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn GetPreRestoreFailureMsg(&mut self, pbstrPreRestoreFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn SetPostRestoreFailureMsg(&mut self, wszPostRestoreFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn GetPostRestoreFailureMsg(&mut self, pbstrPostRestoreFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn SetBackupStamp(&mut self, wszBackupStamp: ::LPCWSTR) -> ::HRESULT,
-    fn GetBackupStamp(&mut self, pbstrBackupStamp: *mut ::BSTR) -> ::HRESULT,
-    fn GetPreviousBackupStamp(&mut self, pbstrBackupStamp: *mut ::BSTR) -> ::HRESULT,
-    fn GetBackupOptions(&mut self, pbstrBackupOptions: *mut ::BSTR) -> ::HRESULT,
-    fn GetRestoreOptions(&mut self, pbstrRestoreOptions: *mut ::BSTR) -> ::HRESULT,
-    fn GetRestoreSubcomponentCount(&mut self, pcRestoreSubcomponent: *mut ::UINT) -> ::HRESULT,
-    fn GetRestoreSubcomponent(
-        &mut self, iComponent: ::UINT, pbstrLogicalPath: *mut ::BSTR,
-        pbstrComponentName: *mut ::BSTR, pbRepair: *mut bool
-    ) -> ::HRESULT,
-    fn GetFileRestoreStatus(&mut self, pStatus: *mut VSS_FILE_RESTORE_STATUS) -> ::HRESULT,
-    fn AddDifferencedFilesByLastModifyTime(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: ::BOOL,
-        ftLastModifyTime: ::FILETIME
-    ) -> ::HRESULT,
-    fn AddDifferencedFilesByLastModifyLSN(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: ::BOOL,
-        bstrLsnString: ::BSTR
-    ) -> ::HRESULT,
-    fn GetDifferencedFilesCount(&mut self, pcDifferencedFiles: *mut ::UINT) -> ::HRESULT,
-    fn GetDifferencedFile(
-        &mut self, iDifferencedFile: ::UINT, pbstrPath: *mut ::BSTR, pbstrFilespec: *mut ::BSTR,
-        pbRecursive: *mut ::BOOL, pbstrLsnString: *mut ::BSTR, pftLastModifyTime: *mut ::FILETIME
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssWriterComponents(IVssWriterComponentsVtbl) {
-    fn GetComponentCount(&mut self, pcComponents: *mut ::UINT) -> ::HRESULT,
-    fn GetWriterInfo(
-        &mut self, pidInstance: *mut ::VSS_ID, pidWriter: *mut ::VSS_ID
-    ) -> ::HRESULT,
-    fn GetComponent(
-        &mut self, iComponent: ::UINT, ppComponent: *mut *mut ::IVssComponent
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssComponentEx(IVssComponentExVtbl): IVssComponent(IVssComponentVtbl) {
-    fn SetPrepareForBackupFailureMsg(&mut self, wszFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn SetPostSnapshotFailureMsg(&mut self, wszFailureMsg: ::LPCWSTR) -> ::HRESULT,
-    fn GetPrepareForBackupFailureMsg(&mut self, pbstrFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn GetPostSnapshotFailureMsg(&mut self, pbstrFailureMsg: *mut ::BSTR) -> ::HRESULT,
-    fn GetAuthoritativeRestore(&mut self, pbAuth: *mut bool) -> ::HRESULT,
-    fn GetRollForward(
-        &mut self, pRollType: *mut ::VSS_ROLLFORWARD_TYPE, pbstrPoint: *mut ::BSTR
-    ) -> ::HRESULT,
-    fn GetRestoreName(&mut self, pbstrName: *mut ::BSTR) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssComponentEx2(IVssComponentEx2Vtbl): IVssComponentEx(IVssComponentExVtbl) {
-    fn SetFailure(
-        &mut self, hr: ::HRESULT, hrApplication: ::HRESULT, wszApplicationMessage: ::LPCWSTR,
-        dwReserved: ::DWORD
-    ) -> ::HRESULT,
-    fn GetFailure(
-        &mut self, phr: *mut ::HRESULT, phrApplication: *mut ::HRESULT,
-        pbstrApplicationMessage: *mut ::BSTR, pdwReserved: *mut ::DWORD
-    ) -> ::HRESULT
-}
-);
-RIDL!(
-interface IVssCreateWriterMetadata(IVssCreateWriterMetadataVtbl) {
-    fn AddIncludeFiles(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool,
-        wszAlternateLocation: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn AddExcludeFiles(
-        &mut self, wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool
-    ) -> ::HRESULT,
-    fn AddComponent(
-        &mut self, ct: ::VSS_COMPONENT_TYPE, wszLogicalPath: ::LPCWSTR,
-        wszComponentName: ::LPCWSTR, wszCaption: ::LPCWSTR, pbIcon: *const ::BYTE, cbIcon: ::UINT,
-        bRestoreMetadata: bool, bNotifyOnBackupComplete: bool, bSelectableForRestore: bool,
-        dwComponentFlags: ::DWORD
-    ) -> ::HRESULT,
-    fn AddDatabaseFiles(
-        &mut self, wszLogicalPath: ::LPCWSTR, wszDatabaseName: ::LPCWSTR, wszPath: ::LPCWSTR,
-        wszFilespec: ::LPCWSTR, dwBackupTypeMask: ::DWORD
-    ) -> ::HRESULT,
-    fn AddDatabaseLogFiles(&mut self, wszLogicalPath: ::LPCWSTR, wszDatabaseName: ::LPCWSTR,
-        wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, dwBackupTypeMask: ::DWORD
-    ) -> ::HRESULT,
-    fn AddFilesToFileGroup(&mut self, wszLogicalPath: ::LPCWSTR, wszGroupName: ::LPCWSTR,
-        wszPath: ::LPCWSTR, wszFilespec: ::LPCWSTR, bRecursive: bool,
-        wszAlternateLocation: ::LPCWSTR, dwBackupTypeMask: ::DWORD
-    ) -> ::HRESULT,
-    fn SetRestoreMethod(&mut self, method: ::VSS_RESTOREMETHOD_ENUM, wszService: ::LPCWSTR,
-        wszUserProcedure: ::LPCWSTR, writerRestore: ::VSS_WRITERRESTORE_ENUM,
-        bRebootRequired: bool
-    ) -> ::HRESULT,
-    fn AddAlternateLocationMapping(&mut self, wszSourcePath: ::LPCWSTR,
-        wszSourceFilespec: ::LPCWSTR, bRecursive: bool, wszDestination: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn AddComponentDependency(&mut self, wszForLogicalPath: ::LPCWSTR,
-        wszForComponentName: ::LPCWSTR, onWriterId: ::VSS_ID, wszOnLogicalPath: ::LPCWSTR,
-        wszOnComponentName: ::LPCWSTR
-    ) -> ::HRESULT,
-    fn SetBackupSchema(&mut self, dwSchemaMask: ::DWORD) -> ::HRESULT,
-    fn GetDocument(&mut self, pDoc: *mut *mut ::VOID) -> ::HRESULT, //TODO IXMLDOMDocument
-    fn SaveAsXML(&mut self, pbstrXML: *mut ::BSTR) -> ::HRESULT
-}
-);
-//IVssCreateWriterMetadataEx
-//IVssWriterImpl
-//IVssCreateExpressWriterMetadata
-//IVssExpressWriter
-//CVssWriter
-//CVssWriterEx
-//CVssWriterEx2
diff --git a/vendor/winapi-0.2.8/src/werapi.rs b/vendor/winapi-0.2.8/src/werapi.rs
deleted file mode 100644
index 33a5a50d7e..0000000000
--- a/vendor/winapi-0.2.8/src/werapi.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Function prototypes for Windows Error Reporting (WER)
-ENUM!{enum WER_REGISTER_FILE_TYPE {
-    WerRegFileTypeUserDocument = 1,
-    WerRegFileTypeOther = 2,
-    WerRegFileTypeMax,
-}}
diff --git a/vendor/winapi-0.2.8/src/winbase.rs b/vendor/winapi-0.2.8/src/winbase.rs
deleted file mode 100644
index 59e3988a17..0000000000
--- a/vendor/winapi-0.2.8/src/winbase.rs
+++ /dev/null
@@ -1,552 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows Base APIs
-pub const FILE_BEGIN: ::DWORD = 0;
-pub const FILE_CURRENT: ::DWORD = 1;
-pub const FILE_END: ::DWORD = 2;
-pub const WAIT_FAILED: ::DWORD = 0xFFFFFFFF;
-pub const WAIT_OBJECT_0: ::DWORD = ::STATUS_WAIT_0 as ::DWORD;
-pub const WAIT_ABANDONED: ::DWORD = ::STATUS_ABANDONED_WAIT_0 as ::DWORD;
-pub const WAIT_ABANDONED_0: ::DWORD = ::STATUS_ABANDONED_WAIT_0 as ::DWORD;
-pub const WAIT_IO_COMPLETION: ::DWORD = ::STATUS_USER_APC as ::DWORD;
-pub const FILE_FLAG_WRITE_THROUGH: ::DWORD = 0x80000000;
-pub const FILE_FLAG_OVERLAPPED: ::DWORD = 0x40000000;
-pub const FILE_FLAG_NO_BUFFERING: ::DWORD = 0x20000000;
-pub const FILE_FLAG_RANDOM_ACCESS: ::DWORD = 0x10000000;
-pub const FILE_FLAG_SEQUENTIAL_SCAN: ::DWORD = 0x08000000;
-pub const FILE_FLAG_DELETE_ON_CLOSE: ::DWORD = 0x04000000;
-pub const FILE_FLAG_BACKUP_SEMANTICS: ::DWORD = 0x02000000;
-pub const FILE_FLAG_POSIX_SEMANTICS: ::DWORD = 0x01000000;
-pub const FILE_FLAG_SESSION_AWARE: ::DWORD = 0x00800000;
-pub const FILE_FLAG_OPEN_REPARSE_POINT: ::DWORD = 0x00200000;
-pub const FILE_FLAG_OPEN_NO_RECALL: ::DWORD = 0x00100000;
-pub const FILE_FLAG_FIRST_PIPE_INSTANCE: ::DWORD = 0x00080000;
-pub const FILE_FLAG_OPEN_REQUIRING_OPLOCK: ::DWORD = 0x00040000;
-pub const PROGRESS_CONTINUE: ::DWORD = 0;
-pub const PROGRESS_CANCEL: ::DWORD = 1;
-pub const PROGRESS_STOP: ::DWORD = 2;
-pub const PROGRESS_QUIET: ::DWORD = 3;
-pub const CALLBACK_CHUNK_FINISHED: ::DWORD = 0x00000000;
-pub const CALLBACK_STREAM_SWITCH: ::DWORD = 0x00000001;
-pub const COPY_FILE_FAIL_IF_EXISTS: ::DWORD = 0x00000001;
-pub const COPY_FILE_RESTARTABLE: ::DWORD = 0x00000002;
-pub const COPY_FILE_OPEN_SOURCE_FOR_WRITE: ::DWORD = 0x00000004;
-pub const COPY_FILE_ALLOW_DECRYPTED_DESTINATION: ::DWORD = 0x00000008;
-pub const COPY_FILE_COPY_SYMLINK: ::DWORD = 0x00000800;
-pub const COPY_FILE_NO_BUFFERING: ::DWORD = 0x00001000;
-pub const COPY_FILE_REQUEST_SECURITY_PRIVILEGES: ::DWORD = 0x00002000;
-pub const COPY_FILE_RESUME_FROM_PAUSE: ::DWORD = 0x00004000;
-pub const COPY_FILE_NO_OFFLOAD: ::DWORD = 0x00040000;
-pub const REPLACEFILE_WRITE_THROUGH: ::DWORD = 0x00000001;
-pub const REPLACEFILE_IGNORE_MERGE_ERRORS: ::DWORD = 0x00000002;
-pub const REPLACEFILE_IGNORE_ACL_ERRORS: ::DWORD = 0x00000004;
-pub const PIPE_ACCESS_INBOUND: ::DWORD = 0x00000001;
-pub const PIPE_ACCESS_OUTBOUND: ::DWORD = 0x00000002;
-pub const PIPE_ACCESS_DUPLEX: ::DWORD = 0x00000003;
-pub const PIPE_CLIENT_END: ::DWORD = 0x00000000;
-pub const PIPE_SERVER_END: ::DWORD = 0x00000001;
-pub const PIPE_WAIT: ::DWORD = 0x00000000;
-pub const PIPE_NOWAIT: ::DWORD = 0x00000001;
-pub const PIPE_READMODE_BYTE: ::DWORD = 0x00000000;
-pub const PIPE_READMODE_MESSAGE: ::DWORD = 0x00000002;
-pub const PIPE_TYPE_BYTE: ::DWORD = 0x00000000;
-pub const PIPE_TYPE_MESSAGE: ::DWORD = 0x00000004;
-pub const PIPE_ACCEPT_REMOTE_CLIENTS: ::DWORD = 0x00000000;
-pub const PIPE_REJECT_REMOTE_CLIENTS: ::DWORD = 0x00000008;
-pub const PIPE_UNLIMITED_INSTANCES: ::DWORD = 255;
-//270
-pub const SECURITY_CONTEXT_TRACKING: ::DWORD = 0x00040000;
-pub const SECURITY_EFFECTIVE_ONLY: ::DWORD = 0x00080000;
-pub const SECURITY_SQOS_PRESENT: ::DWORD = 0x00100000;
-pub const SECURITY_VALID_SQOS_FLAGS: ::DWORD = 0x001F0000;
-//282
-pub type PFIBER_START_ROUTINE = Option<unsafe extern "system" fn(lpFiberParameter: ::LPVOID)>;
-pub type LPFIBER_START_ROUTINE = PFIBER_START_ROUTINE;
-pub type PFIBER_CALLOUT_ROUTINE = Option<unsafe extern "system" fn(
-    lpParameter: ::LPVOID,
-) -> ::LPVOID>;
-//299
-pub type LPLDT_ENTRY = ::LPVOID; // TODO - fix this for 32-bit
-//405
-STRUCT!{struct COMMPROP {
-    wPacketLength: ::WORD,
-    wPacketVersion: ::WORD,
-    dwServiceMask: ::DWORD,
-    dwReserved1: ::DWORD,
-    dwMaxTxQueue: ::DWORD,
-    dwMaxRxQueue: ::DWORD,
-    dwMaxBaud: ::DWORD,
-    dwProvSubType: ::DWORD,
-    dwProvCapabilities: ::DWORD,
-    dwSettableParams: ::DWORD,
-    dwSettableBaud: ::DWORD,
-    wSettableData: ::WORD,
-    wSettableStopParity: ::WORD,
-    dwCurrentTxQueue: ::DWORD,
-    dwCurrentRxQueue: ::DWORD,
-    dwProvSpec1: ::DWORD,
-    dwProvSpec2: ::DWORD,
-    wcProvChar: [::WCHAR; 1],
-}}
-pub type LPCOMMPROP = *mut COMMPROP;
-//432
-STRUCT!{struct COMSTAT {
-    BitFields: ::DWORD,
-    cbInQue: ::DWORD,
-    cbOutQue : ::DWORD,
-}}
-BITFIELD!(COMSTAT BitFields: ::DWORD [
-    fCtsHold set_fCtsHold[0..1],
-    fDsrHold set_fDsrHold[1..2],
-    fRlsdHold set_fRlsdHold[2..3],
-    fXoffHold set_fXoffHold[3..4],
-    fXoffSent set_fXoffSent[4..5],
-    fEof set_fEof[5..6],
-    fTxim set_fTxim[6..7],
-    fReserved set_fReserved[7..32],
-]);
-pub type LPCOMSTAT = *mut COMSTAT;
-//460
-STRUCT!{struct DCB {
-    DCBlength: ::DWORD,
-    BaudRate: ::DWORD,
-    BitFields: ::DWORD,
-    wReserved: ::WORD,
-    XonLim: ::WORD,
-    XoffLim: ::WORD,
-    ByteSize: ::BYTE,
-    Parity: ::BYTE,
-    StopBits: ::BYTE,
-    XonChar: ::c_char,
-    XoffChar: ::c_char,
-    ErrorChar: ::c_char,
-    EofChar: ::c_char,
-    EvtChar: ::c_char,
-    wReserved1: ::WORD,
-}}
-BITFIELD!(DCB BitFields: ::DWORD [
-    fBinary set_fBinary[0..1],
-    fParity set_fParity[1..2],
-    fOutxCtsFlow set_fOutxCtsFlow[2..3],
-    fOutxDsrFlow set_fOutxDsrFlow[3..4],
-    fDtrControl set_fDtrControl[4..6],
-    fDsrSensitivity set_fDsrSensitivity[6..7],
-    fTXContinueOnXoff set_fTXContinueOnXoff[7..8],
-    fOutX set_fOutX[8..9],
-    fInX set_fInX[9..10],
-    fErrorChar set_fErrorChar[10..11],
-    fNull set_fNull[11..12],
-    fRtsControl set_fRtsControl[12..14],
-    fAbortOnError set_fAbortOnError[14..15],
-    fDummy2 set_fDummy2[15..32],
-]);
-pub type LPDCB = *mut DCB;
-STRUCT!{struct COMMTIMEOUTS {
-    ReadIntervalTimeout: ::DWORD,
-    ReadTotalTimeoutMultiplier: ::DWORD,
-    ReadTotalTimeoutConstant: ::DWORD,
-    WriteTotalTimeoutMultiplier: ::DWORD,
-    WriteTotalTimeoutConstant: ::DWORD,
-}}
-pub type LPCOMMTIMEOUTS = *mut COMMTIMEOUTS;
-STRUCT!{struct COMMCONFIG {
-    dwSize: ::DWORD,
-    wVersion: ::WORD,
-    wReserved: ::WORD,
-    dcb: DCB,
-    dwProviderSubType: ::DWORD,
-    dwProviderOffset: ::DWORD,
-    dwProviderSize: ::DWORD,
-    wcProviderData: [::WCHAR; 1],
-}}
-pub type LPCOMMCONFIG = *mut COMMCONFIG;
-//547
-STRUCT!{struct MEMORYSTATUS {
-    dwLength: ::DWORD,
-    dwMemoryLoad: ::DWORD,
-    dwTotalPhys: ::SIZE_T,
-    dwAvailPhys: ::SIZE_T,
-    dwTotalPageFile: ::SIZE_T,
-    dwAvailPageFile: ::SIZE_T,
-    dwTotalVirtual: ::SIZE_T,
-    dwAvailVirtual: ::SIZE_T,
-}}
-pub type LPMEMORYSTATUS = *mut MEMORYSTATUS;
-//568
-pub const DEBUG_PROCESS: ::DWORD = 0x00000001;
-pub const DEBUG_ONLY_THIS_PROCESS: ::DWORD = 0x00000002;
-pub const CREATE_SUSPENDED: ::DWORD = 0x00000004;
-pub const DETACHED_PROCESS: ::DWORD = 0x00000008;
-pub const CREATE_NEW_CONSOLE: ::DWORD = 0x00000010;
-pub const NORMAL_PRIORITY_CLASS: ::DWORD = 0x00000020;
-pub const IDLE_PRIORITY_CLASS: ::DWORD = 0x00000040;
-pub const HIGH_PRIORITY_CLASS: ::DWORD = 0x00000080;
-pub const REALTIME_PRIORITY_CLASS: ::DWORD = 0x00000100;
-pub const CREATE_NEW_PROCESS_GROUP: ::DWORD = 0x00000200;
-pub const CREATE_UNICODE_ENVIRONMENT: ::DWORD = 0x00000400;
-pub const CREATE_SEPARATE_WOW_VDM: ::DWORD = 0x00000800;
-pub const CREATE_SHARED_WOW_VDM: ::DWORD = 0x00001000;
-pub const CREATE_FORCEDOS: ::DWORD = 0x00002000;
-pub const BELOW_NORMAL_PRIORITY_CLASS: ::DWORD = 0x00004000;
-pub const ABOVE_NORMAL_PRIORITY_CLASS: ::DWORD = 0x00008000;
-pub const INHERIT_PARENT_AFFINITY: ::DWORD = 0x00010000;
-pub const INHERIT_CALLER_PRIORITY: ::DWORD = 0x00020000;
-pub const CREATE_PROTECTED_PROCESS: ::DWORD = 0x00040000;
-pub const EXTENDED_STARTUPINFO_PRESENT: ::DWORD = 0x00080000;
-pub const PROCESS_MODE_BACKGROUND_BEGIN: ::DWORD = 0x00100000;
-pub const PROCESS_MODE_BACKGROUND_END: ::DWORD = 0x00200000;
-pub const CREATE_BREAKAWAY_FROM_JOB: ::DWORD = 0x01000000;
-pub const CREATE_PRESERVE_CODE_AUTHZ_LEVEL: ::DWORD = 0x02000000;
-pub const CREATE_DEFAULT_ERROR_MODE: ::DWORD = 0x04000000;
-pub const CREATE_NO_WINDOW: ::DWORD = 0x08000000;
-pub const PROFILE_USER: ::DWORD = 0x10000000;
-pub const PROFILE_KERNEL: ::DWORD = 0x20000000;
-pub const PROFILE_SERVER: ::DWORD = 0x40000000;
-pub const CREATE_IGNORE_SYSTEM_DEFAULT: ::DWORD = 0x80000000;
-//618
-pub const THREAD_PRIORITY_LOWEST: ::DWORD = ::THREAD_BASE_PRIORITY_MIN;
-pub const THREAD_PRIORITY_BELOW_NORMAL: ::DWORD = THREAD_PRIORITY_LOWEST + 1;
-pub const THREAD_PRIORITY_NORMAL: ::DWORD = 0;
-pub const THREAD_PRIORITY_HIGHEST: ::DWORD = ::THREAD_BASE_PRIORITY_MAX;
-pub const THREAD_PRIORITY_ABOVE_NORMAL: ::DWORD = THREAD_PRIORITY_HIGHEST - 1;
-pub const THREAD_PRIORITY_ERROR_RETURN: ::DWORD = ::MAXLONG as ::DWORD;
-pub const THREAD_PRIORITY_TIME_CRITICAL: ::DWORD = ::THREAD_BASE_PRIORITY_LOWRT;
-pub const THREAD_PRIORITY_IDLE: ::DWORD = ::THREAD_BASE_PRIORITY_IDLE;
-pub const THREAD_MODE_BACKGROUND_BEGIN: ::DWORD = 0x00010000;
-pub const THREAD_MODE_BACKGROUND_END: ::DWORD = 0x00020000;
-//666
-pub const DRIVE_UNKNOWN: ::DWORD = 0;
-pub const DRIVE_NO_ROOT_DIR: ::DWORD = 1;
-pub const DRIVE_REMOVABLE: ::DWORD = 2;
-pub const DRIVE_FIXED: ::DWORD = 3;
-pub const DRIVE_REMOTE: ::DWORD = 4;
-pub const DRIVE_CDROM: ::DWORD = 5;
-pub const DRIVE_RAMDISK: ::DWORD = 6;
-pub const FILE_TYPE_UNKNOWN: ::DWORD = 0x0000;
-pub const FILE_TYPE_DISK: ::DWORD = 0x0001;
-pub const FILE_TYPE_CHAR: ::DWORD = 0x0002;
-pub const FILE_TYPE_PIPE: ::DWORD = 0x0003;
-pub const FILE_TYPE_REMOTE: ::DWORD = 0x8000;
-pub const STD_INPUT_HANDLE: ::DWORD = 0xFFFFFFF6;
-pub const STD_OUTPUT_HANDLE: ::DWORD = 0xFFFFFFF5;
-pub const STD_ERROR_HANDLE: ::DWORD = 0xFFFFFFF4;
-pub const NOPARITY: ::DWORD = 0;
-pub const ODDPARITY: ::DWORD = 1;
-pub const EVENPARITY: ::DWORD = 2;
-pub const MARKPARITY: ::DWORD = 3;
-pub const SPACEPARITY: ::DWORD = 4;
-pub const ONESTOPBIT: ::DWORD = 0;
-pub const ONE5STOPBITS: ::DWORD = 1;
-pub const TWOSTOPBITS: ::DWORD = 2;
-pub const IGNORE: ::DWORD = 0;
-pub const INFINITE: ::DWORD = 0xFFFFFFFF;
-//1729
-pub const SEM_FAILCRITICALERRORS: ::UINT = 0x0001;
-pub const SEM_NOGPFAULTERRORBOX: ::UINT = 0x0002;
-pub const SEM_NOALIGNMENTFAULTEXCEPT: ::UINT = 0x0004;
-pub const SEM_NOOPENFILEERRORBOX: ::UINT = 0x8000;
-//2320
-pub const FORMAT_MESSAGE_IGNORE_INSERTS: ::DWORD = 0x00000200;
-pub const FORMAT_MESSAGE_FROM_STRING: ::DWORD = 0x00000400;
-pub const FORMAT_MESSAGE_FROM_HMODULE: ::DWORD = 0x00000800;
-pub const FORMAT_MESSAGE_FROM_SYSTEM: ::DWORD = 0x00001000;
-pub const FORMAT_MESSAGE_ARGUMENT_ARRAY: ::DWORD = 0x00002000;
-pub const FORMAT_MESSAGE_MAX_WIDTH_MASK: ::DWORD = 0x000000FF;
-pub const FORMAT_MESSAGE_ALLOCATE_BUFFER: ::DWORD = 0x00000100;
-//2873
-pub const STARTF_USESHOWWINDOW: ::DWORD = 0x00000001;
-pub const STARTF_USESIZE: ::DWORD = 0x00000002;
-pub const STARTF_USEPOSITION: ::DWORD = 0x00000004;
-pub const STARTF_USECOUNTCHARS: ::DWORD = 0x00000008;
-pub const STARTF_USEFILLATTRIBUTE: ::DWORD = 0x00000010;
-pub const STARTF_RUNFULLSCREEN: ::DWORD = 0x00000020;
-pub const STARTF_FORCEONFEEDBACK: ::DWORD = 0x00000040;
-pub const STARTF_FORCEOFFFEEDBACK: ::DWORD = 0x00000080;
-pub const STARTF_USESTDHANDLES: ::DWORD = 0x00000100;
-pub const STARTF_USEHOTKEY: ::DWORD = 0x00000200;
-pub const STARTF_TITLEISLINKNAME: ::DWORD = 0x00000800;
-pub const STARTF_TITLEISAPPID: ::DWORD = 0x00001000;
-pub const STARTF_PREVENTPINNING: ::DWORD = 0x00002000;
-pub const STARTF_UNTRUSTEDSOURCE: ::DWORD = 0x00008000;
-//5002
-pub type LPPROGRESS_ROUTINE = Option<unsafe extern "system" fn(
-    TotalFileSize: ::LARGE_INTEGER, TotalBytesTransferred: ::LARGE_INTEGER,
-    StreamSize: ::LARGE_INTEGER, StreamBytesTransferred: ::LARGE_INTEGER, dwStreamNumber: ::DWORD,
-    dwCallbackReason: ::DWORD, hSourceFile: ::HANDLE, hDestinationFile: ::HANDLE, lpData: ::LPVOID,
-) -> ::DWORD>;
-//5095
-ENUM!{enum COPYFILE2_MESSAGE_TYPE {
-    COPYFILE2_CALLBACK_NONE = 0,
-    COPYFILE2_CALLBACK_CHUNK_STARTED,
-    COPYFILE2_CALLBACK_CHUNK_FINISHED,
-    COPYFILE2_CALLBACK_STREAM_STARTED,
-    COPYFILE2_CALLBACK_STREAM_FINISHED,
-    COPYFILE2_CALLBACK_POLL_CONTINUE,
-    COPYFILE2_CALLBACK_ERROR,
-    COPYFILE2_CALLBACK_MAX,
-}}
-ENUM!{enum COPYFILE2_MESSAGE_ACTION {
-    COPYFILE2_PROGRESS_CONTINUE = 0,
-    COPYFILE2_PROGRESS_CANCEL,
-    COPYFILE2_PROGRESS_STOP,
-    COPYFILE2_PROGRESS_QUIET,
-    COPYFILE2_PROGRESS_PAUSE,
-}}
-ENUM!{enum COPYFILE2_COPY_PHASE {
-    COPYFILE2_PHASE_NONE = 0,
-    COPYFILE2_PHASE_PREPARE_SOURCE,
-    COPYFILE2_PHASE_PREPARE_DEST,
-    COPYFILE2_PHASE_READ_SOURCE,
-    COPYFILE2_PHASE_WRITE_DESTINATION,
-    COPYFILE2_PHASE_SERVER_COPY,
-    COPYFILE2_PHASE_NAMEGRAFT_COPY,
-    COPYFILE2_PHASE_MAX,
-}}
-//5129
-STRUCT!{struct COPYFILE2_MESSAGE_ChunkStarted {
-    dwStreamNumber: ::DWORD,
-    dwReserved: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliChunkNumber: ::ULARGE_INTEGER,
-    uliChunkSize: ::ULARGE_INTEGER,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_ChunkFinished {
-    dwStreamNumber: ::DWORD,
-    dwFlags: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliChunkNumber: ::ULARGE_INTEGER,
-    uliChunkSize: ::ULARGE_INTEGER,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliStreamBytesTransferred: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-    uliTotalBytesTransferred: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_StreamStarted {
-    dwStreamNumber: ::DWORD,
-    dwReserved: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_StreamFinished {
-    dwStreamNumber: ::DWORD,
-    dwReserved: ::DWORD,
-    hSourceFile: ::HANDLE,
-    hDestinationFile: ::HANDLE,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliStreamBytesTransferred: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-    uliTotalBytesTransferred: ::ULARGE_INTEGER,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_PollContinue {
-    dwReserved: ::DWORD,
-}}
-STRUCT!{struct COPYFILE2_MESSAGE_Error {
-    CopyPhase: COPYFILE2_COPY_PHASE,
-    dwStreamNumber: ::DWORD,
-    hrFailure: ::HRESULT,
-    dwReserved: ::DWORD,
-    uliChunkNumber: ::ULARGE_INTEGER,
-    uliStreamSize: ::ULARGE_INTEGER,
-    uliStreamBytesTransferred: ::ULARGE_INTEGER,
-    uliTotalFileSize: ::ULARGE_INTEGER,
-    uliTotalBytesTransferred: ::ULARGE_INTEGER,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{struct COPYFILE2_MESSAGE {
-    Type: COPYFILE2_MESSAGE_TYPE,
-    dwPadding: ::DWORD,
-    Info: [u64; 8],
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct COPYFILE2_MESSAGE {
-    Type: COPYFILE2_MESSAGE_TYPE,
-    dwPadding: ::DWORD,
-    Info: [u64; 9],
-}}
-UNION!{COPYFILE2_MESSAGE, Info, ChunkStarted, ChunkStarted_mut, COPYFILE2_MESSAGE_ChunkStarted}
-UNION!{COPYFILE2_MESSAGE, Info, ChunkFinished, ChunkFinished_mut, COPYFILE2_MESSAGE_ChunkFinished}
-UNION!{COPYFILE2_MESSAGE, Info, StreamStarted, StreamStarted_mut, COPYFILE2_MESSAGE_StreamStarted}
-UNION!{COPYFILE2_MESSAGE, Info, StreamFinished, StreamFinished_mut,
-    COPYFILE2_MESSAGE_StreamFinished}
-UNION!{COPYFILE2_MESSAGE, Info, PollContinue, PollContinue_mut, COPYFILE2_MESSAGE_PollContinue}
-UNION!{COPYFILE2_MESSAGE, Info, Error, Error_mut, COPYFILE2_MESSAGE_Error}
-pub type PCOPYFILE2_PROGRESS_ROUTINE = Option<unsafe extern "system" fn(
-    pMessage: *const COPYFILE2_MESSAGE, pvCallbackContext: ::PVOID,
-) -> COPYFILE2_MESSAGE_ACTION>;
-STRUCT!{nodebug struct COPYFILE2_EXTENDED_PARAMETERS {
-    dwSize: ::DWORD,
-    dwCopyFlags: ::DWORD,
-    pfCancel: *mut ::BOOL,
-    pProgressRoutine: PCOPYFILE2_PROGRESS_ROUTINE,
-    pvCallbackContext: ::PVOID,
-}}
-//5377
-pub const MOVEFILE_REPLACE_EXISTING: ::DWORD = 0x00000001;
-pub const MOVEFILE_COPY_ALLOWED: ::DWORD = 0x00000002;
-pub const MOVEFILE_DELAY_UNTIL_REBOOT: ::DWORD = 0x00000004;
-pub const MOVEFILE_WRITE_THROUGH: ::DWORD = 0x00000008;
-pub const MOVEFILE_CREATE_HARDLINK: ::DWORD = 0x00000010;
-pub const MOVEFILE_FAIL_IF_NOT_TRACKABLE: ::DWORD = 0x00000020;
-//7176
-pub const HW_PROFILE_GUIDLEN: usize = 39;
-//pub const MAX_PROFILE_LEN: usize = 80;
-pub const DOCKINFO_UNDOCKED: ::DWORD = 0x1;
-pub const DOCKINFO_DOCKED: ::DWORD = 0x2;
-pub const DOCKINFO_USER_SUPPLIED: ::DWORD = 0x4;
-pub const DOCKINFO_USER_UNDOCKED: ::DWORD = DOCKINFO_USER_SUPPLIED | DOCKINFO_UNDOCKED;
-pub const DOCKINFO_USER_DOCKED: ::DWORD = DOCKINFO_USER_SUPPLIED | DOCKINFO_DOCKED;
-STRUCT!{nodebug struct HW_PROFILE_INFOA {
-    dwDockInfo: ::DWORD,
-    szHwProfileGuid: [::CHAR; HW_PROFILE_GUIDLEN],
-    szHwProfileName: [::CHAR; ::MAX_PROFILE_LEN],
-}}
-pub type LPHW_PROFILE_INFOA = *mut HW_PROFILE_INFOA;
-STRUCT!{nodebug struct HW_PROFILE_INFOW {
-    dwDockInfo: ::DWORD,
-    szHwProfileGuid: [::WCHAR; HW_PROFILE_GUIDLEN],
-    szHwProfileName: [::WCHAR; ::MAX_PROFILE_LEN],
-}}
-pub type LPHW_PROFILE_INFOW = *mut HW_PROFILE_INFOW;
-//7574
-STRUCT!{struct ACTCTXA {
-    cbSize: ::ULONG,
-    dwFlags: ::DWORD,
-    lpSource: ::LPCSTR,
-    wProcessorArchitecture: ::USHORT,
-    wLangId: ::LANGID,
-    lpAssemblyDirectory: ::LPCSTR,
-    lpResourceName: ::LPCSTR,
-    lpApplicationName: ::LPCSTR,
-    hModule: ::HMODULE,
-}}
-pub type PACTCTXA = *mut ACTCTXA;
-STRUCT!{struct ACTCTXW {
-    cbSize: ::ULONG,
-    dwFlags: ::DWORD,
-    lpSource: ::LPCWSTR,
-    wProcessorArchitecture: ::USHORT,
-    wLangId: ::LANGID,
-    lpAssemblyDirectory: ::LPCWSTR,
-    lpResourceName: ::LPCWSTR,
-    lpApplicationName: ::LPCWSTR,
-    hModule: ::HMODULE,
-}}
-pub type PACTCTXW = *mut ACTCTXW;
-pub type PCACTCTXA = *const ACTCTXA;
-pub type PCACTCTXW = *const ACTCTXW;
-//
-pub type PUMS_CONTEXT = *mut ::c_void;
-pub type PUMS_COMPLETION_LIST = *mut ::c_void;
-pub type UMS_THREAD_INFO_CLASS = ::RTL_UMS_THREAD_INFO_CLASS;
-pub type PUMS_THREAD_INFO_CLASS = *mut UMS_THREAD_INFO_CLASS;
-pub type PUMS_SCHEDULER_ENTRY_POINT = ::PRTL_UMS_SCHEDULER_ENTRY_POINT;
-STRUCT!{nodebug struct UMS_SCHEDULER_STARTUP_INFO {
-    UmsVersion: ::ULONG,
-    CompletionList: PUMS_COMPLETION_LIST,
-    SchedulerProc: PUMS_SCHEDULER_ENTRY_POINT,
-    SchedulerParam: ::PVOID,
-}}
-pub type PUMS_SCHEDULER_STARTUP_INFO = *mut UMS_SCHEDULER_STARTUP_INFO;
-STRUCT!{struct UMS_SYSTEM_THREAD_INFORMATION {
-    UmsVersion: ::ULONG,
-    BitFields: ::ULONG,
-}}
-BITFIELD!(UMS_SYSTEM_THREAD_INFORMATION BitFields: ::ULONG [
-    IsUmsSchedulerThread set_IsUmsSchedulerThread[0..1],
-    IsUmsWorkerThread set_IsUmsWorkerThread[1..2],
-]);
-UNION!(
-    UMS_SYSTEM_THREAD_INFORMATION, BitFields, ThreadUmsFlags, ThreadUmsFlags_mut,
-    ::ULONG
-);
-pub type PUMS_SYSTEM_THREAD_INFORMATION = *mut UMS_SYSTEM_THREAD_INFORMATION;
-STRUCT!{struct ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA {
-    lpInformation: ::PVOID,
-    lpSectionBase: ::PVOID,
-    ulSectionLength: ::ULONG,
-    lpSectionGlobalDataBase: ::PVOID,
-    ulSectionGlobalDataLength: ::ULONG,
-}}
-pub type PACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA =
-    *mut ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA;
-pub type PCACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA =
-    *const ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA;
-STRUCT!{struct ACTCTX_SECTION_KEYED_DATA {
-    cbSize: ::ULONG,
-    ulDataFormatVersion: ::ULONG,
-    lpData: ::PVOID,
-    ulLength: ::ULONG,
-    lpSectionGlobalData: ::PVOID,
-    ulSectionGlobalDataLength: ::ULONG,
-    lpSectionBase: ::PVOID,
-    ulSectionTotalLength: ::ULONG,
-    hActCtx: ::HANDLE,
-    ulAssemblyRosterIndex: ::ULONG,
-    ulFlags: ::ULONG,
-    AssemblyMetadata: ACTCTX_SECTION_KEYED_DATA_ASSEMBLY_METADATA,
-}}
-pub type PACTCTX_SECTION_KEYED_DATA = *mut ACTCTX_SECTION_KEYED_DATA;
-pub type PCACTCTX_SECTION_KEYED_DATA = *const ACTCTX_SECTION_KEYED_DATA;
-ENUM!{enum STREAM_INFO_LEVELS {
-    FindStreamInfoStandard,
-    FindStreamInfoMaxInfoLevel,
-}}
-ENUM!{enum PROCESS_INFORMATION_CLASS {
-    ProcessMemoryPriority,
-    ProcessInformationClassMax,
-}}
-ENUM!{enum DEP_SYSTEM_POLICY_TYPE {
-    DEPPolicyAlwaysOff = 0,
-    DEPPolicyAlwaysOn,
-    DEPPolicyOptIn,
-    DEPPolicyOptOut,
-    DEPTotalPolicyCount,
-}}
-ENUM!{enum PIPE_ATTRIBUTE_TYPE {
-    PipeAttribute,
-    PipeConnectionAttribute,
-    PipeHandleAttribute,
-}}
-pub type APPLICATION_RECOVERY_CALLBACK = Option<unsafe extern "system" fn(
-    pvParameter: ::PVOID
-) -> ::DWORD>;
-STRUCT!{struct SYSTEM_POWER_STATUS {
-    ACLineStatus: ::BYTE,
-    BatteryFlag: ::BYTE,
-    BatteryLifePercent: ::BYTE,
-    Reserved1: ::BYTE,
-    BatteryLifeTime: ::DWORD,
-    BatteryFullLifeTime: ::DWORD,
-}}
-pub type LPSYSTEM_POWER_STATUS = *mut SYSTEM_POWER_STATUS;
-pub const OFS_MAXPATHNAME: usize = 128;
-STRUCT!{nodebug struct OFSTRUCT {
-    cBytes: ::BYTE,
-    fFixedDisk: ::BYTE,
-    nErrCode: ::WORD,
-    Reserved1: ::WORD,
-    Reserved2: ::WORD,
-    szPathName: [::CHAR; OFS_MAXPATHNAME],
-}}
-pub type POFSTRUCT = *mut OFSTRUCT;
-pub type LPOFSTRUCT = *mut OFSTRUCT;
-ENUM!{enum FILE_ID_TYPE {
-    FileIdType,
-    ObjectIdType,
-    ExtendedFileIdType,
-    MaximumFileIdType,
-}}
-STRUCT!{struct FILE_ID_DESCRIPTOR {
-    dwSize: ::DWORD,
-    Type: FILE_ID_TYPE,
-    ObjectId: ::GUID,
-}}
-UNION!(FILE_ID_DESCRIPTOR, ObjectId, FileId, FileId_mut, ::LARGE_INTEGER);
-UNION!(FILE_ID_DESCRIPTOR, ObjectId, ExtendedFileId, ExtendedFileId_mut, ::FILE_ID_128);
-pub type LPFILE_ID_DESCRIPTOR = *mut FILE_ID_DESCRIPTOR;
diff --git a/vendor/winapi-0.2.8/src/wincon.rs b/vendor/winapi-0.2.8/src/wincon.rs
deleted file mode 100644
index 23c2e74244..0000000000
--- a/vendor/winapi-0.2.8/src/wincon.rs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module contains the public data structures, data types, and procedures exported by the NT
-//! console subsystem.
-STRUCT!{struct COORD {
-    X: ::SHORT,
-    Y: ::SHORT,
-}}
-pub type PCOORD = *mut COORD;
-STRUCT!{struct SMALL_RECT {
-    Left: ::SHORT,
-    Top: ::SHORT,
-    Right: ::SHORT,
-    Bottom: ::SHORT,
-}}
-pub type PSMALL_RECT = *mut SMALL_RECT;
-STRUCT!{struct KEY_EVENT_RECORD {
-    bKeyDown: ::BOOL,
-    wRepeatCount: ::WORD,
-    wVirtualKeyCode: ::WORD,
-    wVirtualScanCode: ::WORD,
-    UnicodeChar: ::WCHAR,
-    dwControlKeyState: ::DWORD,
-}}
-UNION!{KEY_EVENT_RECORD, UnicodeChar, AsciiChar, AsciiChar_mut, ::CHAR}
-pub type PKEY_EVENT_RECORD = *mut KEY_EVENT_RECORD;
-pub const RIGHT_ALT_PRESSED: ::DWORD = 0x0001;
-pub const LEFT_ALT_PRESSED: ::DWORD = 0x0002;
-pub const RIGHT_CTRL_PRESSED: ::DWORD = 0x0004;
-pub const LEFT_CTRL_PRESSED: ::DWORD = 0x0008;
-pub const SHIFT_PRESSED: ::DWORD = 0x0010;
-pub const NUMLOCK_ON: ::DWORD = 0x0020;
-pub const SCROLLLOCK_ON: ::DWORD = 0x0040;
-pub const CAPSLOCK_ON: ::DWORD = 0x0080;
-pub const ENHANCED_KEY: ::DWORD = 0x0100;
-pub const NLS_DBCSCHAR: ::DWORD = 0x00010000;
-pub const NLS_ALPHANUMERIC: ::DWORD = 0x00000000;
-pub const NLS_KATAKANA: ::DWORD = 0x00020000;
-pub const NLS_HIRAGANA: ::DWORD = 0x00040000;
-pub const NLS_ROMAN: ::DWORD = 0x00400000;
-pub const NLS_IME_CONVERSION: ::DWORD = 0x00800000;
-pub const NLS_IME_DISABLE: ::DWORD = 0x20000000;
-STRUCT!{struct MOUSE_EVENT_RECORD {
-    dwMousePosition: COORD,
-    dwButtonState: ::DWORD,
-    dwControlKeyState: ::DWORD,
-    dwEventFlags: ::DWORD,
-}}
-pub type PMOUSE_EVENT_RECORD = *mut MOUSE_EVENT_RECORD;
-pub const FROM_LEFT_1ST_BUTTON_PRESSED: ::DWORD = 0x0001;
-pub const RIGHTMOST_BUTTON_PRESSED: ::DWORD = 0x0002;
-pub const FROM_LEFT_2ND_BUTTON_PRESSED: ::DWORD = 0x0004;
-pub const FROM_LEFT_3RD_BUTTON_PRESSED: ::DWORD = 0x0008;
-pub const FROM_LEFT_4TH_BUTTON_PRESSED: ::DWORD = 0x0010;
-pub const MOUSE_MOVED: ::DWORD = 0x0001;
-pub const DOUBLE_CLICK: ::DWORD = 0x0002;
-pub const MOUSE_WHEELED: ::DWORD = 0x0004;
-pub const MOUSE_HWHEELED: ::DWORD = 0x0008;
-STRUCT!{struct WINDOW_BUFFER_SIZE_RECORD {
-    dwSize: COORD,
-}}
-pub type PWINDOW_BUFFER_SIZE_RECORD = *mut WINDOW_BUFFER_SIZE_RECORD;
-STRUCT!{struct MENU_EVENT_RECORD {
-    dwCommandId: ::UINT,
-}}
-pub type PMENU_EVENT_RECORD = *mut MENU_EVENT_RECORD;
-STRUCT!{struct FOCUS_EVENT_RECORD {
-    bSetFocus: ::BOOL,
-}}
-pub type PFOCUS_EVENT_RECORD = *mut FOCUS_EVENT_RECORD;
-STRUCT!{struct INPUT_RECORD {
-    EventType: ::WORD,
-    Event: [u32; 4],
-}}
-UNION!{INPUT_RECORD, Event, KeyEvent, KeyEvent_mut, KEY_EVENT_RECORD}
-UNION!{INPUT_RECORD, Event, MouseEvent, MouseEvent_mut, MOUSE_EVENT_RECORD}
-UNION!{INPUT_RECORD, Event, WindowBufferSizeEvent, WindowBufferSizeEvent_mut,
-    WINDOW_BUFFER_SIZE_RECORD}
-UNION!{INPUT_RECORD, Event, MenuEvent, MenuEvent_mut, MENU_EVENT_RECORD}
-UNION!{INPUT_RECORD, Event, FocusEvent, FocusEvent_mut, FOCUS_EVENT_RECORD}
-pub type PINPUT_RECORD = *mut INPUT_RECORD;
-pub const KEY_EVENT: ::WORD = 0x0001;
-pub const MOUSE_EVENT: ::WORD = 0x0002;
-pub const WINDOW_BUFFER_SIZE_EVENT: ::WORD = 0x0004;
-pub const MENU_EVENT: ::WORD = 0x0008;
-pub const FOCUS_EVENT: ::WORD = 0x0010;
-STRUCT!{struct CHAR_INFO {
-    UnicodeChar: ::WCHAR,
-    Attributes: ::WORD,
-}}
-UNION!{CHAR_INFO, UnicodeChar, AsciiChar, AsciiChar_mut, ::CHAR}
-pub type PCHAR_INFO = *mut CHAR_INFO;
-pub const FOREGROUND_BLUE: ::DWORD = 0x0001;
-pub const FOREGROUND_GREEN: ::DWORD = 0x0002;
-pub const FOREGROUND_RED: ::DWORD = 0x0004;
-pub const FOREGROUND_INTENSITY: ::DWORD = 0x0008;
-pub const BACKGROUND_BLUE: ::DWORD = 0x0010;
-pub const BACKGROUND_GREEN: ::DWORD = 0x0020;
-pub const BACKGROUND_RED: ::DWORD = 0x0040;
-pub const BACKGROUND_INTENSITY: ::DWORD = 0x0080;
-pub const COMMON_LVB_LEADING_BYTE: ::DWORD = 0x0100;
-pub const COMMON_LVB_TRAILING_BYTE: ::DWORD = 0x0200;
-pub const COMMON_LVB_GRID_HORIZONTAL: ::DWORD = 0x0400;
-pub const COMMON_LVB_GRID_LVERTICAL: ::DWORD = 0x0800;
-pub const COMMON_LVB_GRID_RVERTICAL: ::DWORD = 0x1000;
-pub const COMMON_LVB_REVERSE_VIDEO: ::DWORD = 0x4000;
-pub const COMMON_LVB_UNDERSCORE: ::DWORD = 0x8000;
-pub const COMMON_LVB_SBCSDBCS: ::DWORD = 0x0300;
-STRUCT!{struct CONSOLE_SCREEN_BUFFER_INFO {
-    dwSize: COORD,
-    dwCursorPosition: COORD,
-    wAttributes: ::WORD,
-    srWindow: SMALL_RECT,
-    dwMaximumWindowSize: COORD,
-}}
-pub type PCONSOLE_SCREEN_BUFFER_INFO = *mut CONSOLE_SCREEN_BUFFER_INFO;
-STRUCT!{struct CONSOLE_SCREEN_BUFFER_INFOEX {
-    cbSize: ::ULONG,
-    dwSize: COORD,
-    dwCursorPosition: COORD,
-    wAttributes: ::WORD,
-    srWindow: SMALL_RECT,
-    dwMaximumWindowSize: COORD,
-    wPopupAttributes: ::WORD,
-    bFullscreenSupported: ::BOOL,
-    ColorTable: [::COLORREF; 16],
-}}
-pub type PCONSOLE_SCREEN_BUFFER_INFOEX = *mut CONSOLE_SCREEN_BUFFER_INFOEX;
-STRUCT!{struct CONSOLE_CURSOR_INFO {
-    dwSize: ::DWORD,
-    bVisible: ::BOOL,
-}}
-pub type PCONSOLE_CURSOR_INFO = *mut CONSOLE_CURSOR_INFO;
-STRUCT!{struct CONSOLE_FONT_INFO {
-    nFont: ::DWORD,
-    dwFontSize: ::COORD,
-}}
-pub type PCONSOLE_FONT_INFO = *mut CONSOLE_FONT_INFO;
-STRUCT!{struct CONSOLE_FONT_INFOEX {
-    cbSize: ::ULONG,
-    nFont: ::DWORD,
-    dwFontSize: COORD,
-    FontFamily: ::UINT,
-    FontWeight: ::UINT,
-    FaceName: [::WCHAR; ::LF_FACESIZE],
-}}
-pub type PCONSOLE_FONT_INFOEX = *mut CONSOLE_FONT_INFOEX;
-pub const HISTORY_NO_DUP_FLAG: ::DWORD = 0x1;
-STRUCT!{struct CONSOLE_HISTORY_INFO {
-    cbSize: ::UINT,
-    HistoryBufferSize: ::UINT,
-    NumberOfHistoryBuffers: ::UINT,
-    dwFlags: ::DWORD,
-}}
-pub type PCONSOLE_HISTORY_INFO = *mut CONSOLE_HISTORY_INFO;
-STRUCT!{struct CONSOLE_SELECTION_INFO {
-    dwFlags: ::DWORD,
-    dwSelectionAnchor: COORD,
-    srSelection: SMALL_RECT,
-}}
-pub type PCONSOLE_SELECTION_INFO = *mut CONSOLE_SELECTION_INFO;
-pub const CONSOLE_NO_SELECTION: ::DWORD = 0x0000;
-pub const CONSOLE_SELECTION_IN_PROGRESS: ::DWORD = 0x0001;
-pub const CONSOLE_SELECTION_NOT_EMPTY: ::DWORD = 0x0002;
-pub const CONSOLE_MOUSE_SELECTION: ::DWORD = 0x0004;
-pub const CONSOLE_MOUSE_DOWN: ::DWORD = 0x0008;
-pub type PHANDLER_ROUTINE = Option<unsafe extern "system" fn(CtrlType: ::DWORD) -> ::BOOL>;
-pub const CTRL_C_EVENT: ::DWORD = 0;
-pub const CTRL_BREAK_EVENT: ::DWORD = 1;
-pub const CTRL_CLOSE_EVENT: ::DWORD = 2;
-pub const CTRL_LOGOFF_EVENT: ::DWORD = 5;
-pub const CTRL_SHUTDOWN_EVENT: ::DWORD = 6;
-pub const ENABLE_PROCESSED_INPUT: ::DWORD = 0x0001;
-pub const ENABLE_LINE_INPUT: ::DWORD = 0x0002;
-pub const ENABLE_ECHO_INPUT: ::DWORD = 0x0004;
-pub const ENABLE_WINDOW_INPUT: ::DWORD = 0x0008;
-pub const ENABLE_MOUSE_INPUT: ::DWORD = 0x0010;
-pub const ENABLE_INSERT_MODE: ::DWORD = 0x0020;
-pub const ENABLE_QUICK_EDIT_MODE: ::DWORD = 0x0040;
-pub const ENABLE_EXTENDED_FLAGS: ::DWORD = 0x0080;
-pub const ENABLE_AUTO_POSITION: ::DWORD = 0x0100;
-pub const ENABLE_PROCESSED_OUTPUT: ::DWORD = 0x0001;
-pub const ENABLE_WRAP_AT_EOL_OUTPUT: ::DWORD = 0x0002;
-pub const CONSOLE_REAL_OUTPUT_HANDLE: *mut ::c_void = -2isize as *mut ::c_void;
-pub const CONSOLE_REAL_INPUT_HANDLE: *mut ::c_void = -3isize as *mut ::c_void;
-pub const ATTACH_PARENT_PROCESS: ::DWORD = 0xFFFFFFFF;
-STRUCT!{struct CONSOLE_READCONSOLE_CONTROL {
-    nLength: ::ULONG,
-    nInitialChars: ::ULONG,
-    dwCtrlWakeupMask: ::ULONG,
-    dwControlKeyState: ::ULONG,
-}}
-pub type PCONSOLE_READCONSOLE_CONTROL = *mut CONSOLE_READCONSOLE_CONTROL;
-pub const CONSOLE_TEXTMODE_BUFFER: ::DWORD = 1;
-pub const CONSOLE_FULLSCREEN: ::DWORD = 1;
-pub const CONSOLE_FULLSCREEN_HARDWARE: ::DWORD = 2;
-pub const CONSOLE_FULLSCREEN_MODE: ::DWORD = 1;
-pub const CONSOLE_WINDOWED_MODE: ::DWORD = 2;
diff --git a/vendor/winapi-0.2.8/src/wincred.rs b/vendor/winapi-0.2.8/src/wincred.rs
deleted file mode 100644
index af98bd928d..0000000000
--- a/vendor/winapi-0.2.8/src/wincred.rs
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Authentication API Prototypes and Definitions
-pub const NERR_BASE: ::DWORD = 2100;
-pub const NERR_PasswordExpired: ::DWORD = NERR_BASE+142;
-pub const CRED_MAX_STRING_LENGTH: ::DWORD = 256;
-pub const CRED_MAX_USERNAME_LENGTH: ::DWORD = 256+1+256;
-pub const CRED_MAX_GENERIC_TARGET_NAME_LENGTH: ::DWORD = 32767;
-pub const CRED_MAX_DOMAIN_TARGET_NAME_LENGTH: ::DWORD = 256+1+80;
-pub const CRED_MAX_TARGETNAME_NAMESPACE_LENGTH: ::DWORD = 256;
-pub const CRED_MAX_TARGETNAME_ATTRIBUTE_LENGTH: ::DWORD = 256;
-pub const CRED_MAX_VALUE_SIZE: ::DWORD = 256;
-pub const CRED_MAX_ATTRIBUTES: ::DWORD = 64;
-pub const CRED_LOGON_TYPES_MASK: ::DWORD = 0xF000;
-pub const CRED_FLAGS_PASSWORD_FOR_CERT: ::DWORD = 0x0001;
-pub const CRED_FLAGS_PROMPT_NOW: ::DWORD = 0x0002;
-pub const CRED_FLAGS_USERNAME_TARGET: ::DWORD = 0x0004;
-pub const CRED_FLAGS_OWF_CRED_BLOB: ::DWORD = 0x0008;
-pub const CRED_FLAGS_REQUIRE_CONFIRMATION: ::DWORD = 0x0010;
-pub const CRED_FLAGS_WILDCARD_MATCH: ::DWORD = 0x0020;
-pub const CRED_FLAGS_VALID_FLAGS: ::DWORD = 0xF03F;
-pub const CRED_FLAGS_VALID_INPUT_FLAGS: ::DWORD = 0xF01F;
-pub const CRED_TYPE_GENERIC: ::DWORD = 1;
-pub const CRED_TYPE_DOMAIN_PASSWORD: ::DWORD = 2;
-pub const CRED_TYPE_DOMAIN_CERTIFICATE: ::DWORD = 3;
-pub const CRED_TYPE_DOMAIN_VISIBLE_PASSWORD: ::DWORD = 4;
-pub const CRED_TYPE_GENERIC_CERTIFICATE: ::DWORD = 5;
-pub const CRED_TYPE_DOMAIN_EXTENDED: ::DWORD = 6;
-pub const CRED_TYPE_MAXIMUM: ::DWORD = 7;
-pub const CRED_TYPE_MAXIMUM_EX: ::DWORD = CRED_TYPE_MAXIMUM+1000;
-pub const CRED_MAX_CREDENTIAL_BLOB_SIZE: ::DWORD = 5*512;
-pub const CRED_PERSIST_NONE: ::DWORD = 0;
-pub const CRED_PERSIST_SESSION: ::DWORD = 1;
-pub const CRED_PERSIST_LOCAL_MACHINE: ::DWORD = 2;
-pub const CRED_PERSIST_ENTERPRISE: ::DWORD = 3;
-STRUCT!{struct CREDENTIAL_ATTRIBUTEA {
-    Keyword: ::LPSTR,
-    Flags: ::DWORD,
-    ValueSize: ::DWORD,
-    Value: ::LPBYTE,
-}}
-pub type PCREDENTIAL_ATTRIBUTEA = *mut CREDENTIAL_ATTRIBUTEA;
-STRUCT!{struct CREDENTIAL_ATTRIBUTEW {
-    Keyword: ::LPWSTR,
-    Flags: ::DWORD,
-    ValueSize: ::DWORD,
-    Value: ::LPBYTE,
-}}
-pub type PCREDENTIAL_ATTRIBUTEW = *mut CREDENTIAL_ATTRIBUTEW;
-STRUCT!{struct CREDENTIALA {
-    Flags: ::DWORD,
-    Type: ::DWORD,
-    TargetName: ::LPSTR,
-    Comment: ::LPSTR,
-    LastWritten: ::FILETIME,
-    CredentialBlobSize: ::DWORD,
-    CredentialBlob: ::LPBYTE,
-    Persist: ::DWORD,
-    AttributeCount: ::DWORD,
-    Attributes: PCREDENTIAL_ATTRIBUTEA,
-    TargetAlias: ::LPSTR,
-    UserName: ::LPSTR,
-}}
-pub type PCREDENTIALA = *mut CREDENTIALA;
-STRUCT!{struct CREDENTIALW {
-    Flags: ::DWORD,
-    Type: ::DWORD,
-    TargetName: ::LPWSTR,
-    Comment: ::LPWSTR,
-    LastWritten: ::FILETIME,
-    CredentialBlobSize: ::DWORD,
-    CredentialBlob: ::LPBYTE,
-    Persist: ::DWORD,
-    AttributeCount: ::DWORD,
-    Attributes: PCREDENTIAL_ATTRIBUTEW,
-    TargetAlias: ::LPWSTR,
-    UserName: ::LPWSTR,
-}}
-pub type PCREDENTIALW = *mut CREDENTIALW;
-pub const CRED_TI_SERVER_FORMAT_UNKNOWN: ::ULONG = 0x0001;
-pub const CRED_TI_DOMAIN_FORMAT_UNKNOWN: ::ULONG = 0x0002;
-pub const CRED_TI_ONLY_PASSWORD_REQUIRED: ::ULONG = 0x0004;
-pub const CRED_TI_USERNAME_TARGET: ::ULONG = 0x0008;
-pub const CRED_TI_CREATE_EXPLICIT_CRED: ::ULONG = 0x0010;
-pub const CRED_TI_WORKGROUP_MEMBER: ::ULONG = 0x0020;
-pub const CRED_TI_VALID_FLAGS: ::ULONG = 0xF07F;
-STRUCT!{struct CREDENTIAL_TARGET_INFORMATIONA {
-    TargetName: ::LPSTR,
-    NetbiosServerName: ::LPSTR,
-    DnsServerName: ::LPSTR,
-    NetbiosDomainName: ::LPSTR,
-    DnsDomainName: ::LPSTR,
-    DnsTreeName: ::LPSTR,
-    PackageName: ::LPSTR,
-    Flags: ::ULONG,
-    CredTypeCount: ::DWORD,
-    CredTypes: ::LPDWORD,
-}}
-pub type PCREDENTIAL_TARGET_INFORMATIONA = *mut CREDENTIAL_TARGET_INFORMATIONA;
-STRUCT!{struct CREDENTIAL_TARGET_INFORMATIONW {
-    TargetName: ::LPWSTR,
-    NetbiosServerName: ::LPWSTR,
-    DnsServerName: ::LPWSTR,
-    NetbiosDomainName: ::LPWSTR,
-    DnsDomainName: ::LPWSTR,
-    DnsTreeName: ::LPWSTR,
-    PackageName: ::LPWSTR,
-    Flags: ::ULONG,
-    CredTypeCount: ::DWORD,
-    CredTypes: ::LPDWORD,
-}}
-pub type PCREDENTIAL_TARGET_INFORMATIONW = *mut CREDENTIAL_TARGET_INFORMATIONW;
-pub const CERT_HASH_LENGTH: usize = 20;
-STRUCT!{struct CERT_CREDENTIAL_INFO {
-    cbSize: ::ULONG,
-    rgbHashOfCert: [::UCHAR; CERT_HASH_LENGTH],
-}}
-pub type PCERT_CREDENTIAL_INFO = *mut CERT_CREDENTIAL_INFO;
-STRUCT!{struct USERNAME_TARGET_CREDENTIAL_INFO {
-    UserName: ::LPWSTR,
-}}
-pub type PUSERNAME_TARGET_CREDENTIAL_INFO = *mut USERNAME_TARGET_CREDENTIAL_INFO;
-STRUCT!{struct BINARY_BLOB_CREDENTIAL_INFO {
-    cbBlob: ::ULONG,
-    pbBlob: ::LPBYTE,
-}}
-pub type PBINARY_BLOB_CREDENTIAL_INFO = *mut BINARY_BLOB_CREDENTIAL_INFO;
-ENUM!{enum CRED_MARSHAL_TYPE {
-    CertCredential = 1,
-    UsernameTargetCredential,
-    BinaryBlobCredential,
-    UsernameForPackedCredentials,
-}}
-pub type PCRED_MARSHAL_TYPE = *mut CRED_MARSHAL_TYPE;
-ENUM!{enum CRED_PROTECTION_TYPE {
-    CredUnprotected,
-    CredUserProtection,
-    CredTrustedProtection,
-}}
-pub type PCRED_PROTECTION_TYPE = *mut CRED_PROTECTION_TYPE;
-pub const CRED_PACK_PROTECTED_CREDENTIALS: ::DWORD = 0x1;
-pub const CRED_PACK_WOW_BUFFER: ::DWORD = 0x2;
-pub const CRED_PACK_GENERIC_CREDENTIALS: ::DWORD = 0x4;
-pub const CRED_PACK_ID_PROVIDER_CREDENTIALS: ::DWORD = 0x8;
-STRUCT!{struct CREDUI_INFOA {
-    cbSize: ::DWORD,
-    hwndParent: ::HWND,
-    pszMessageText: ::PCSTR,
-    pszCaptionText: ::PCSTR,
-    hbmBanner: ::HBITMAP,
-}}
-pub type PCREDUI_INFOA = *mut CREDUI_INFOA;
-STRUCT!{struct CREDUI_INFOW {
-    cbSize: ::DWORD,
-    hwndParent: ::HWND,
-    pszMessageText: ::PCWSTR,
-    pszCaptionText: ::PCWSTR,
-    hbmBanner: ::HBITMAP,
-}}
-pub type PCREDUI_INFOW = *mut CREDUI_INFOW;
-pub const CREDUI_MAX_MESSAGE_LENGTH: ::DWORD = 1024;
-pub const CREDUI_MAX_CAPTION_LENGTH: ::DWORD = 128;
-pub const CREDUI_MAX_GENERIC_TARGET_LENGTH: ::DWORD = CRED_MAX_GENERIC_TARGET_NAME_LENGTH;
-pub const CREDUI_MAX_DOMAIN_TARGET_LENGTH: ::DWORD = CRED_MAX_DOMAIN_TARGET_NAME_LENGTH;
-pub const CREDUI_MAX_USERNAME_LENGTH: ::DWORD = CRED_MAX_USERNAME_LENGTH;
-pub const CREDUI_MAX_PASSWORD_LENGTH: ::DWORD = 512 / 2;
-pub const CREDUI_FLAGS_INCORRECT_PASSWORD: ::DWORD = 0x00001;
-pub const CREDUI_FLAGS_DO_NOT_PERSIST: ::DWORD = 0x00002;
-pub const CREDUI_FLAGS_REQUEST_ADMINISTRATOR: ::DWORD = 0x00004;
-pub const CREDUI_FLAGS_EXCLUDE_CERTIFICATES: ::DWORD = 0x00008;
-pub const CREDUI_FLAGS_REQUIRE_CERTIFICATE: ::DWORD = 0x00010;
-pub const CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX: ::DWORD = 0x00040;
-pub const CREDUI_FLAGS_ALWAYS_SHOW_UI: ::DWORD = 0x00080;
-pub const CREDUI_FLAGS_REQUIRE_SMARTCARD: ::DWORD = 0x00100;
-pub const CREDUI_FLAGS_PASSWORD_ONLY_OK: ::DWORD = 0x00200;
-pub const CREDUI_FLAGS_VALIDATE_USERNAME: ::DWORD = 0x00400;
-pub const CREDUI_FLAGS_COMPLETE_USERNAME: ::DWORD = 0x00800;
-pub const CREDUI_FLAGS_PERSIST: ::DWORD = 0x01000;
-pub const CREDUI_FLAGS_SERVER_CREDENTIAL: ::DWORD = 0x04000;
-pub const CREDUI_FLAGS_EXPECT_CONFIRMATION: ::DWORD = 0x20000;
-pub const CREDUI_FLAGS_GENERIC_CREDENTIALS: ::DWORD = 0x40000;
-pub const CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS: ::DWORD = 0x80000;
-pub const CREDUI_FLAGS_KEEP_USERNAME: ::DWORD = 0x100000;
-pub const CREDUI_FLAGS_PROMPT_VALID: ::DWORD = CREDUI_FLAGS_INCORRECT_PASSWORD
-    | CREDUI_FLAGS_DO_NOT_PERSIST | CREDUI_FLAGS_REQUEST_ADMINISTRATOR
-    | CREDUI_FLAGS_EXCLUDE_CERTIFICATES | CREDUI_FLAGS_REQUIRE_CERTIFICATE
-    | CREDUI_FLAGS_SHOW_SAVE_CHECK_BOX | CREDUI_FLAGS_ALWAYS_SHOW_UI
-    | CREDUI_FLAGS_REQUIRE_SMARTCARD | CREDUI_FLAGS_PASSWORD_ONLY_OK
-    | CREDUI_FLAGS_VALIDATE_USERNAME | CREDUI_FLAGS_COMPLETE_USERNAME | CREDUI_FLAGS_PERSIST
-    | CREDUI_FLAGS_SERVER_CREDENTIAL | CREDUI_FLAGS_EXPECT_CONFIRMATION
-    | CREDUI_FLAGS_GENERIC_CREDENTIALS | CREDUI_FLAGS_USERNAME_TARGET_CREDENTIALS
-    | CREDUI_FLAGS_KEEP_USERNAME;
-pub const CREDUIWIN_GENERIC: ::DWORD = 0x00000001;
-pub const CREDUIWIN_CHECKBOX: ::DWORD = 0x00000002;
-pub const CREDUIWIN_AUTHPACKAGE_ONLY: ::DWORD = 0x00000010;
-pub const CREDUIWIN_IN_CRED_ONLY: ::DWORD = 0x00000020;
-pub const CREDUIWIN_ENUMERATE_ADMINS: ::DWORD = 0x00000100;
-pub const CREDUIWIN_ENUMERATE_CURRENT_USER: ::DWORD = 0x00000200;
-pub const CREDUIWIN_SECURE_PROMPT: ::DWORD = 0x00001000;
-pub const CREDUIWIN_PREPROMPTING: ::DWORD = 0x00002000;
-pub const CREDUIWIN_PACK_32_WOW: ::DWORD = 0x10000000;
-pub const CREDUIWIN_VALID_FLAGS: ::DWORD = CREDUIWIN_GENERIC | CREDUIWIN_CHECKBOX
-    | CREDUIWIN_AUTHPACKAGE_ONLY | CREDUIWIN_IN_CRED_ONLY | CREDUIWIN_ENUMERATE_ADMINS
-    | CREDUIWIN_ENUMERATE_CURRENT_USER | CREDUIWIN_SECURE_PROMPT | CREDUIWIN_PREPROMPTING
-    | CREDUIWIN_PACK_32_WOW;
-pub const CRED_PRESERVE_CREDENTIAL_BLOB: ::DWORD = 0x1;
-pub const CRED_ENUMERATE_ALL_CREDENTIALS: ::DWORD = 0x1;
-pub const CRED_CACHE_TARGET_INFORMATION: ::DWORD = 0x1;
-pub const CRED_ALLOW_NAME_RESOLUTION: ::DWORD = 0x1;
diff --git a/vendor/winapi-0.2.8/src/wincrypt.rs b/vendor/winapi-0.2.8/src/wincrypt.rs
deleted file mode 100644
index 5b3e748cc9..0000000000
--- a/vendor/winapi-0.2.8/src/wincrypt.rs
+++ /dev/null
@@ -1,2206 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Cryptographic API Prototypes and Definitions
-//108
-pub const ALG_CLASS_ANY: ALG_ID = 0;
-pub const ALG_CLASS_SIGNATURE: ALG_ID = 1 << 13;
-pub const ALG_CLASS_MSG_ENCRYPT: ALG_ID = 2 << 13;
-pub const ALG_CLASS_DATA_ENCRYPT: ALG_ID = 3 << 13;
-pub const ALG_CLASS_HASH: ALG_ID = 4 << 13;
-pub const ALG_CLASS_KEY_EXCHANGE: ALG_ID = 5 << 13;
-pub const ALG_CLASS_ALL: ALG_ID = 7 << 13;
-pub const ALG_TYPE_ANY: ALG_ID = 0;
-pub const ALG_TYPE_DSS: ALG_ID = 1 << 9;
-pub const ALG_TYPE_RSA: ALG_ID = 2 << 9;
-pub const ALG_TYPE_BLOCK: ALG_ID = 3 << 9;
-pub const ALG_TYPE_STREAM: ALG_ID = 4 << 9;
-pub const ALG_TYPE_DH: ALG_ID = 5 << 9;
-pub const ALG_TYPE_SECURECHANNEL: ALG_ID = 6 << 9;
-pub const ALG_SID_ANY: ALG_ID = 0;
-pub const ALG_SID_RSA_ANY: ALG_ID = 0;
-pub const ALG_SID_RSA_PKCS: ALG_ID = 1;
-pub const ALG_SID_RSA_MSATWORK: ALG_ID = 2;
-pub const ALG_SID_RSA_ENTRUST: ALG_ID = 3;
-pub const ALG_SID_RSA_PGP: ALG_ID = 4;
-pub const ALG_SID_DSS_ANY: ALG_ID = 0;
-pub const ALG_SID_DSS_PKCS: ALG_ID = 1;
-pub const ALG_SID_DSS_DMS: ALG_ID = 2;
-pub const ALG_SID_ECDSA: ALG_ID = 3;
-pub const ALG_SID_DES: ALG_ID = 1;
-pub const ALG_SID_3DES: ALG_ID = 3;
-pub const ALG_SID_DESX: ALG_ID = 4;
-pub const ALG_SID_IDEA: ALG_ID = 5;
-pub const ALG_SID_CAST: ALG_ID = 6;
-pub const ALG_SID_SAFERSK64: ALG_ID = 7;
-pub const ALG_SID_SAFERSK128: ALG_ID = 8;
-pub const ALG_SID_3DES_112: ALG_ID = 9;
-pub const ALG_SID_CYLINK_MEK: ALG_ID = 12;
-pub const ALG_SID_RC5: ALG_ID = 13;
-pub const ALG_SID_AES_128: ALG_ID = 14;
-pub const ALG_SID_AES_192: ALG_ID = 15;
-pub const ALG_SID_AES_256: ALG_ID = 16;
-pub const ALG_SID_AES: ALG_ID = 17;
-pub const ALG_SID_SKIPJACK: ALG_ID = 10;
-pub const ALG_SID_TEK: ALG_ID = 11;
-pub const CRYPT_MODE_CBCI: ALG_ID = 6;
-pub const CRYPT_MODE_CFBP: ALG_ID = 7;
-pub const CRYPT_MODE_OFBP: ALG_ID = 8;
-pub const CRYPT_MODE_CBCOFM: ALG_ID = 9;
-pub const CRYPT_MODE_CBCOFMI: ALG_ID = 10;
-pub const ALG_SID_RC2: ALG_ID = 2;
-pub const ALG_SID_RC4: ALG_ID = 1;
-pub const ALG_SID_SEAL: ALG_ID = 2;
-pub const ALG_SID_DH_SANDF: ALG_ID = 1;
-pub const ALG_SID_DH_EPHEM: ALG_ID = 2;
-pub const ALG_SID_AGREED_KEY_ANY: ALG_ID = 3;
-pub const ALG_SID_KEA: ALG_ID = 4;
-pub const ALG_SID_ECDH: ALG_ID = 5;
-pub const ALG_SID_MD2: ALG_ID = 1;
-pub const ALG_SID_MD4: ALG_ID = 2;
-pub const ALG_SID_MD5: ALG_ID = 3;
-pub const ALG_SID_SHA: ALG_ID = 4;
-pub const ALG_SID_SHA1: ALG_ID = 4;
-pub const ALG_SID_MAC: ALG_ID = 5;
-pub const ALG_SID_RIPEMD: ALG_ID = 6;
-pub const ALG_SID_RIPEMD160: ALG_ID = 7;
-pub const ALG_SID_SSL3SHAMD5: ALG_ID = 8;
-pub const ALG_SID_HMAC: ALG_ID = 9;
-pub const ALG_SID_TLS1PRF: ALG_ID = 10;
-pub const ALG_SID_HASH_REPLACE_OWF: ALG_ID = 11;
-pub const ALG_SID_SHA_256: ALG_ID = 12;
-pub const ALG_SID_SHA_384: ALG_ID = 13;
-pub const ALG_SID_SHA_512: ALG_ID = 14;
-pub const ALG_SID_SSL3_MASTER: ALG_ID = 1;
-pub const ALG_SID_SCHANNEL_MASTER_HASH: ALG_ID = 2;
-pub const ALG_SID_SCHANNEL_MAC_KEY: ALG_ID = 3;
-pub const ALG_SID_PCT1_MASTER: ALG_ID = 4;
-pub const ALG_SID_SSL2_MASTER: ALG_ID = 5;
-pub const ALG_SID_TLS1_MASTER: ALG_ID = 6;
-pub const ALG_SID_SCHANNEL_ENC_KEY: ALG_ID = 7;
-pub const ALG_SID_ECMQV: ALG_ID = 1;
-pub const ALG_SID_EXAMPLE: ALG_ID = 80;
-pub type ALG_ID = ::c_uint;
-pub const CALG_MD2: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD2;
-pub const CALG_MD4: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD4;
-pub const CALG_MD5: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD5;
-pub const CALG_SHA: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA;
-pub const CALG_SHA1: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA1;
-pub const CALG_MAC: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAC;
-pub const CALG_RSA_SIGN: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY;
-pub const CALG_DSS_SIGN: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY;
-pub const CALG_NO_SIGN: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_ANY | ALG_SID_ANY;
-pub const CALG_RSA_KEYX: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY;
-pub const CALG_DES: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES;
-pub const CALG_3DES_112: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES_112;
-pub const CALG_3DES: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_3DES;
-pub const CALG_DESX: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DESX;
-pub const CALG_RC2: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2;
-pub const CALG_RC4: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4;
-pub const CALG_SEAL: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL;
-pub const CALG_DH_SF: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_SANDF;
-pub const CALG_DH_EPHEM: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_DH_EPHEM;
-pub const CALG_AGREEDKEY_ANY: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH
-    | ALG_SID_AGREED_KEY_ANY;
-pub const CALG_KEA_KEYX: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_KEA;
-pub const CALG_HUGHES_MD5: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_MD5;
-pub const CALG_SKIPJACK: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_SKIPJACK;
-pub const CALG_TEK: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_TEK;
-pub const CALG_CYLINK_MEK: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_CYLINK_MEK;
-pub const CALG_SSL3_SHAMD5: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SSL3SHAMD5;
-pub const CALG_SSL3_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SSL3_MASTER;
-pub const CALG_SCHANNEL_MASTER_HASH: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SCHANNEL_MASTER_HASH;
-pub const CALG_SCHANNEL_MAC_KEY: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SCHANNEL_MAC_KEY;
-pub const CALG_SCHANNEL_ENC_KEY: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SCHANNEL_ENC_KEY;
-pub const CALG_PCT1_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_PCT1_MASTER;
-pub const CALG_SSL2_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_SSL2_MASTER;
-pub const CALG_TLS1_MASTER: ALG_ID = ALG_CLASS_MSG_ENCRYPT | ALG_TYPE_SECURECHANNEL
-    | ALG_SID_TLS1_MASTER;
-pub const CALG_RC5: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC5;
-pub const CALG_HMAC: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HMAC;
-pub const CALG_TLS1PRF: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF;
-pub const CALG_HASH_REPLACE_OWF: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_HASH_REPLACE_OWF;
-pub const CALG_AES_128: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_128;
-pub const CALG_AES_192: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_192;
-pub const CALG_AES_256: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_256;
-pub const CALG_AES: ALG_ID = ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES;
-pub const CALG_SHA_256: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_256;
-pub const CALG_SHA_384: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_384;
-pub const CALG_SHA_512: ALG_ID = ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA_512;
-pub const CALG_ECDH: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH;
-pub const CALG_ECMQV: ALG_ID = ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV;
-pub const CALG_ECDSA: ALG_ID = ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_ECDSA;
-pub type HCRYPTPROV = ::ULONG_PTR;
-pub type HCRYPTKEY = ::ULONG_PTR;
-pub type HCRYPTHASH = ::ULONG_PTR;
-pub const CRYPT_VERIFYCONTEXT: ::DWORD = 0xF0000000;
-pub const CRYPT_NEWKEYSET: ::DWORD = 0x00000008;
-pub const CRYPT_DELETEKEYSET: ::DWORD = 0x00000010;
-pub const CRYPT_MACHINE_KEYSET: ::DWORD = 0x00000020;
-pub const CRYPT_SILENT: ::DWORD = 0x00000040;
-pub const CRYPT_DEFAULT_CONTAINER_OPTIONAL: ::DWORD = 0x00000080;
-pub const CRYPT_EXPORTABLE: ::DWORD = 0x00000001;
-pub const CRYPT_USER_PROTECTED: ::DWORD = 0x00000002;
-pub const CRYPT_CREATE_SALT: ::DWORD = 0x00000004;
-pub const CRYPT_UPDATE_KEY: ::DWORD = 0x00000008;
-pub const CRYPT_NO_SALT: ::DWORD = 0x00000010;
-pub const CRYPT_PREGEN: ::DWORD = 0x00000040;
-pub const CRYPT_RECIPIENT: ::DWORD = 0x00000010;
-pub const CRYPT_INITIATOR: ::DWORD = 0x00000040;
-pub const CRYPT_ONLINE: ::DWORD = 0x00000080;
-pub const CRYPT_SF: ::DWORD = 0x00000100;
-pub const CRYPT_CREATE_IV: ::DWORD = 0x00000200;
-pub const CRYPT_KEK: ::DWORD = 0x00000400;
-pub const CRYPT_DATA_KEY: ::DWORD = 0x00000800;
-pub const CRYPT_VOLATILE: ::DWORD = 0x00001000;
-pub const CRYPT_SGCKEY: ::DWORD = 0x00002000;
-pub const CRYPT_USER_PROTECTED_STRONG: ::DWORD = 0x00100000;
-pub const CRYPT_ARCHIVABLE: ::DWORD = 0x00004000;
-pub const CRYPT_FORCE_KEY_PROTECTION_HIGH: ::DWORD = 0x00008000;
-pub const RSA1024BIT_KEY: ::DWORD = 0x04000000;
-pub const CRYPT_SERVER: ::DWORD = 0x00000400;
-pub const KEY_LENGTH_MASK: ::DWORD = 0xFFFF0000;
-pub const CRYPT_Y_ONLY: ::DWORD = 0x00000001;
-pub const CRYPT_SSL2_FALLBACK: ::DWORD = 0x00000002;
-pub const CRYPT_DESTROYKEY: ::DWORD = 0x00000004;
-pub const CRYPT_OAEP: ::DWORD = 0x00000040;
-pub const CRYPT_BLOB_VER3: ::DWORD = 0x00000080;
-pub const CRYPT_IPSEC_HMAC_KEY: ::DWORD = 0x00000100;
-pub const CRYPT_DECRYPT_RSA_NO_PADDING_CHECK: ::DWORD = 0x00000020;
-pub const CRYPT_SECRETDIGEST: ::DWORD = 0x00000001;
-pub const CRYPT_OWF_REPL_LM_HASH: ::DWORD = 0x00000001;
-pub const CRYPT_LITTLE_ENDIAN: ::DWORD = 0x00000001;
-pub const CRYPT_NOHASHOID: ::DWORD = 0x00000001;
-pub const CRYPT_TYPE2_FORMAT: ::DWORD = 0x00000002;
-pub const CRYPT_X931_FORMAT: ::DWORD = 0x00000004;
-pub const CRYPT_MACHINE_DEFAULT: ::DWORD = 0x00000001;
-pub const CRYPT_USER_DEFAULT: ::DWORD = 0x00000002;
-pub const CRYPT_DELETE_DEFAULT: ::DWORD = 0x00000004;
-pub const SIMPLEBLOB: ::DWORD = 0x1;
-pub const PUBLICKEYBLOB: ::DWORD = 0x6;
-pub const PRIVATEKEYBLOB: ::DWORD = 0x7;
-pub const PLAINTEXTKEYBLOB: ::DWORD = 0x8;
-pub const OPAQUEKEYBLOB: ::DWORD = 0x9;
-pub const PUBLICKEYBLOBEX: ::DWORD = 0xA;
-pub const SYMMETRICWRAPKEYBLOB: ::DWORD = 0xB;
-pub const KEYSTATEBLOB: ::DWORD = 0xC;
-pub const AT_KEYEXCHANGE: ::DWORD = 1;
-pub const AT_SIGNATURE: ::DWORD = 2;
-pub const CRYPT_USERDATA: ::DWORD = 1;
-pub const KP_IV: ::DWORD = 1;
-pub const KP_SALT: ::DWORD = 2;
-pub const KP_PADDING: ::DWORD = 3;
-pub const KP_MODE: ::DWORD = 4;
-pub const KP_MODE_BITS: ::DWORD = 5;
-pub const KP_PERMISSIONS: ::DWORD = 6;
-pub const KP_ALGID: ::DWORD = 7;
-pub const KP_BLOCKLEN: ::DWORD = 8;
-pub const KP_KEYLEN: ::DWORD = 9;
-pub const KP_SALT_EX: ::DWORD = 10;
-pub const KP_P: ::DWORD = 11;
-pub const KP_G: ::DWORD = 12;
-pub const KP_Q: ::DWORD = 13;
-pub const KP_X: ::DWORD = 14;
-pub const KP_Y: ::DWORD = 15;
-pub const KP_RA: ::DWORD = 16;
-pub const KP_RB: ::DWORD = 17;
-pub const KP_INFO: ::DWORD = 18;
-pub const KP_EFFECTIVE_KEYLEN: ::DWORD = 19;
-pub const KP_SCHANNEL_ALG: ::DWORD = 20;
-pub const KP_CLIENT_RANDOM: ::DWORD = 21;
-pub const KP_SERVER_RANDOM: ::DWORD = 22;
-pub const KP_RP: ::DWORD = 23;
-pub const KP_PRECOMP_MD5: ::DWORD = 24;
-pub const KP_PRECOMP_SHA: ::DWORD = 25;
-pub const KP_CERTIFICATE: ::DWORD = 26;
-pub const KP_CLEAR_KEY: ::DWORD = 27;
-pub const KP_PUB_EX_LEN: ::DWORD = 28;
-pub const KP_PUB_EX_VAL: ::DWORD = 29;
-pub const KP_KEYVAL: ::DWORD = 30;
-pub const KP_ADMIN_PIN: ::DWORD = 31;
-pub const KP_KEYEXCHANGE_PIN: ::DWORD = 32;
-pub const KP_SIGNATURE_PIN: ::DWORD = 33;
-pub const KP_PREHASH: ::DWORD = 34;
-pub const KP_ROUNDS: ::DWORD = 35;
-pub const KP_OAEP_PARAMS: ::DWORD = 36;
-pub const KP_CMS_KEY_INFO: ::DWORD = 37;
-pub const KP_CMS_DH_KEY_INFO: ::DWORD = 38;
-pub const KP_PUB_PARAMS: ::DWORD = 39;
-pub const KP_VERIFY_PARAMS: ::DWORD = 40;
-pub const KP_HIGHEST_VERSION: ::DWORD = 41;
-pub const KP_GET_USE_COUNT: ::DWORD = 42;
-pub const KP_PIN_ID: ::DWORD = 43;
-pub const KP_PIN_INFO: ::DWORD = 44;
-pub const PKCS5_PADDING: ::DWORD = 1;
-pub const RANDOM_PADDING: ::DWORD = 2;
-pub const ZERO_PADDING: ::DWORD = 3;
-pub const CRYPT_MODE_CBC: ::DWORD = 1;
-pub const CRYPT_MODE_ECB: ::DWORD = 2;
-pub const CRYPT_MODE_OFB: ::DWORD = 3;
-pub const CRYPT_MODE_CFB: ::DWORD = 4;
-pub const CRYPT_MODE_CTS: ::DWORD = 5;
-pub const CRYPT_ENCRYPT: ::DWORD = 0x0001;
-pub const CRYPT_DECRYPT: ::DWORD = 0x0002;
-pub const CRYPT_EXPORT: ::DWORD = 0x0004;
-pub const CRYPT_READ: ::DWORD = 0x0008;
-pub const CRYPT_WRITE: ::DWORD = 0x0010;
-pub const CRYPT_MAC: ::DWORD = 0x0020;
-pub const CRYPT_EXPORT_KEY: ::DWORD = 0x0040;
-pub const CRYPT_IMPORT_KEY: ::DWORD = 0x0080;
-pub const CRYPT_ARCHIVE: ::DWORD = 0x0100;
-pub const HP_ALGID: ::DWORD = 0x0001;
-pub const HP_HASHVAL: ::DWORD = 0x0002;
-pub const HP_HASHSIZE: ::DWORD = 0x0004;
-pub const HP_HMAC_INFO: ::DWORD = 0x0005;
-pub const HP_TLS1PRF_LABEL: ::DWORD = 0x0006;
-pub const HP_TLS1PRF_SEED: ::DWORD = 0x0007;
-pub const CRYPT_FAILED: ::BOOL = ::FALSE;
-pub const CRYPT_SUCCEED: ::BOOL = ::TRUE;
-pub const PP_ENUMALGS: ::DWORD = 1;
-pub const PP_ENUMCONTAINERS: ::DWORD = 2;
-pub const PP_IMPTYPE: ::DWORD = 3;
-pub const PP_NAME: ::DWORD = 4;
-pub const PP_VERSION: ::DWORD = 5;
-pub const PP_CONTAINER: ::DWORD = 6;
-pub const PP_CHANGE_PASSWORD: ::DWORD = 7;
-pub const PP_KEYSET_SEC_DESCR: ::DWORD = 8;
-pub const PP_CERTCHAIN: ::DWORD = 9;
-pub const PP_KEY_TYPE_SUBTYPE: ::DWORD = 10;
-pub const PP_PROVTYPE: ::DWORD = 16;
-pub const PP_KEYSTORAGE: ::DWORD = 17;
-pub const PP_APPLI_CERT: ::DWORD = 18;
-pub const PP_SYM_KEYSIZE: ::DWORD = 19;
-pub const PP_SESSION_KEYSIZE: ::DWORD = 20;
-pub const PP_UI_PROMPT: ::DWORD = 21;
-pub const PP_ENUMALGS_EX: ::DWORD = 22;
-pub const PP_ENUMMANDROOTS: ::DWORD = 25;
-pub const PP_ENUMELECTROOTS: ::DWORD = 26;
-pub const PP_KEYSET_TYPE: ::DWORD = 27;
-pub const PP_ADMIN_PIN: ::DWORD = 31;
-pub const PP_KEYEXCHANGE_PIN: ::DWORD = 32;
-pub const PP_SIGNATURE_PIN: ::DWORD = 33;
-pub const PP_SIG_KEYSIZE_INC: ::DWORD = 34;
-pub const PP_KEYX_KEYSIZE_INC: ::DWORD = 35;
-pub const PP_UNIQUE_CONTAINER: ::DWORD = 36;
-pub const PP_SGC_INFO: ::DWORD = 37;
-pub const PP_USE_HARDWARE_RNG: ::DWORD = 38;
-pub const PP_KEYSPEC: ::DWORD = 39;
-pub const PP_ENUMEX_SIGNING_PROT: ::DWORD = 40;
-pub const PP_CRYPT_COUNT_KEY_USE: ::DWORD = 41;
-pub const PP_USER_CERTSTORE: ::DWORD = 42;
-pub const PP_SMARTCARD_READER: ::DWORD = 43;
-pub const PP_SMARTCARD_GUID: ::DWORD = 45;
-pub const PP_ROOT_CERTSTORE: ::DWORD = 46;
-pub const PP_SMARTCARD_READER_ICON: ::DWORD = 47;
-pub const CRYPT_FIRST: ::DWORD = 1;
-pub const CRYPT_NEXT: ::DWORD = 2;
-pub const CRYPT_SGC_ENUM: ::DWORD = 4;
-pub const CRYPT_IMPL_HARDWARE: ::DWORD = 1;
-pub const CRYPT_IMPL_SOFTWARE: ::DWORD = 2;
-pub const CRYPT_IMPL_MIXED: ::DWORD = 3;
-pub const CRYPT_IMPL_UNKNOWN: ::DWORD = 4;
-pub const CRYPT_IMPL_REMOVABLE: ::DWORD = 8;
-pub const CRYPT_SEC_DESCR: ::DWORD = 0x00000001;
-pub const CRYPT_PSTORE: ::DWORD = 0x00000002;
-pub const CRYPT_UI_PROMPT: ::DWORD = 0x00000004;
-pub const CRYPT_FLAG_PCT1: ::DWORD = 0x0001;
-pub const CRYPT_FLAG_SSL2: ::DWORD = 0x0002;
-pub const CRYPT_FLAG_SSL3: ::DWORD = 0x0004;
-pub const CRYPT_FLAG_TLS1: ::DWORD = 0x0008;
-pub const CRYPT_FLAG_IPSEC: ::DWORD = 0x0010;
-pub const CRYPT_FLAG_SIGNING: ::DWORD = 0x0020;
-pub const CRYPT_SGC: ::DWORD = 0x0001;
-pub const CRYPT_FASTSGC: ::DWORD = 0x0002;
-pub const PP_CLIENT_HWND: ::DWORD = 1;
-pub const PP_CONTEXT_INFO: ::DWORD = 11;
-pub const PP_KEYEXCHANGE_KEYSIZE: ::DWORD = 12;
-pub const PP_SIGNATURE_KEYSIZE: ::DWORD = 13;
-pub const PP_KEYEXCHANGE_ALG: ::DWORD = 14;
-pub const PP_SIGNATURE_ALG: ::DWORD = 15;
-pub const PP_DELETEKEY: ::DWORD = 24;
-pub const PP_PIN_PROMPT_STRING: ::DWORD = 44;
-pub const PP_SECURE_KEYEXCHANGE_PIN: ::DWORD = 47;
-pub const PP_SECURE_SIGNATURE_PIN: ::DWORD = 48;
-pub const PROV_RSA_FULL: ::DWORD = 1;
-pub const PROV_RSA_SIG: ::DWORD = 2;
-pub const PROV_DSS: ::DWORD = 3;
-pub const PROV_FORTEZZA: ::DWORD = 4;
-pub const PROV_MS_EXCHANGE: ::DWORD = 5;
-pub const PROV_SSL: ::DWORD = 6;
-pub const PROV_RSA_SCHANNEL: ::DWORD = 12;
-pub const PROV_DSS_DH: ::DWORD = 13;
-pub const PROV_EC_ECDSA_SIG: ::DWORD = 14;
-pub const PROV_EC_ECNRA_SIG: ::DWORD = 15;
-pub const PROV_EC_ECDSA_FULL: ::DWORD = 16;
-pub const PROV_EC_ECNRA_FULL: ::DWORD = 17;
-pub const PROV_DH_SCHANNEL: ::DWORD = 18;
-pub const PROV_SPYRUS_LYNKS: ::DWORD = 20;
-pub const PROV_RNG: ::DWORD = 21;
-pub const PROV_INTEL_SEC: ::DWORD = 22;
-pub const PROV_REPLACE_OWF: ::DWORD = 23;
-pub const PROV_RSA_AES: ::DWORD = 24;
-pub const MS_DEF_PROV: &'static str = "Microsoft Base Cryptographic Provider v1.0";
-pub const MS_ENHANCED_PROV: &'static str = "Microsoft Enhanced Cryptographic Provider v1.0";
-pub const MS_STRONG_PROV: &'static str = "Microsoft Strong Cryptographic Provider";
-pub const MS_DEF_RSA_SIG_PROV: &'static str = "Microsoft RSA Signature Cryptographic Provider";
-pub const MS_DEF_RSA_SCHANNEL_PROV: &'static str = "Microsoft RSA SChannel Cryptographic Provider";
-pub const MS_DEF_DSS_PROV: &'static str = "Microsoft Base DSS Cryptographic Provider";
-pub const MS_DEF_DSS_DH_PROV: &'static str =
-    "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider";
-pub const MS_ENH_DSS_DH_PROV: &'static str =
-    "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider";
-pub const MS_DEF_DH_SCHANNEL_PROV: &'static str = "Microsoft DH SChannel Cryptographic Provider";
-pub const MS_SCARD_PROV: &'static str = "Microsoft Base Smart Card Crypto Provider";
-pub const MS_ENH_RSA_AES_PROV: &'static str =
-    "Microsoft Enhanced RSA and AES Cryptographic Provider";
-pub const MS_ENH_RSA_AES_PROV_XP: &'static str =
-    "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)";
-pub const MAXUIDLEN: usize = 64;
-pub const EXPO_OFFLOAD_REG_VALUE: &'static str = "ExpoOffload";
-pub const EXPO_OFFLOAD_FUNC_NAME: &'static str = "OffloadModExpo";
-pub const szKEY_CRYPTOAPI_PRIVATE_KEY_OPTIONS: &'static str =
-    "Software\\Policies\\Microsoft\\Cryptography";
-pub const szKEY_CACHE_ENABLED: &'static str = "CachePrivateKeys";
-pub const szKEY_CACHE_SECONDS: &'static str = "PrivateKeyLifetimeSeconds";
-pub const szPRIV_KEY_CACHE_MAX_ITEMS: &'static str = "PrivKeyCacheMaxItems";
-pub const cPRIV_KEY_CACHE_MAX_ITEMS_DEFAULT: ::DWORD = 20;
-pub const szPRIV_KEY_CACHE_PURGE_INTERVAL_SECONDS: &'static str =
-    "PrivKeyCachePurgeIntervalSeconds";
-pub const cPRIV_KEY_CACHE_PURGE_INTERVAL_SECONDS_DEFAULT: ::DWORD = 86400;
-pub const CUR_BLOB_VERSION: ::DWORD = 2;
-STRUCT!{struct CMS_KEY_INFO {
-    dwVersion: ::DWORD,
-    Algid: ALG_ID,
-    pbOID: *mut ::BYTE,
-    cbOID: ::DWORD,
-}}
-pub type PCMS_KEY_INFO = *mut CMS_KEY_INFO;
-STRUCT!{struct HMAC_INFO {
-    HashAlgid: ALG_ID,
-    pbInnerString: *mut ::BYTE,
-    cbInnerString: ::DWORD,
-    pbOuterString: *mut ::BYTE,
-    cbOuterString: ::DWORD,
-}}
-pub type PHMAC_INFO = *mut HMAC_INFO;
-STRUCT!{struct SCHANNEL_ALG {
-    dwUse: ::DWORD,
-    Algid: ALG_ID,
-    cBits: ::DWORD,
-    dwFlags: ::DWORD,
-    dwReserved: ::DWORD,
-}}
-pub type PSCHANNEL_ALG = *mut SCHANNEL_ALG;
-pub const SCHANNEL_MAC_KEY: ::DWORD = 0x00000000;
-pub const SCHANNEL_ENC_KEY: ::DWORD = 0x00000001;
-pub const INTERNATIONAL_USAGE: ::DWORD = 0x00000001;
-STRUCT!{struct PROV_ENUMALGS {
-    aiAlgid: ALG_ID,
-    dwBitLen: ::DWORD,
-    dwNameLen: ::DWORD,
-    szName: [::CHAR; 20],
-}}
-STRUCT!{nodebug struct PROV_ENUMALGS_EX {
-    aiAlgid: ALG_ID,
-    dwDefaultLen: ::DWORD,
-    dwMinLen: ::DWORD,
-    dwMaxLen: ::DWORD,
-    dwProtocols: ::DWORD,
-    dwNameLen: ::DWORD,
-    szName: [::CHAR; 20],
-    dwLongNameLen: ::DWORD,
-    szLongName: [::CHAR; 40],
-}}
-STRUCT!{struct BLOBHEADER {
-    bType: ::BYTE,
-    bVersion: ::BYTE,
-    reserved: ::WORD,
-    aiKeyAlg: ::ALG_ID,
-}}
-pub type PUBLICKEYSTRUC = BLOBHEADER;
-STRUCT!{struct RSAPUBKEY {
-    magic: ::DWORD,
-    bitlen: ::DWORD,
-    pubexp: ::DWORD,
-}}
-STRUCT!{struct DHPUBKEY {
-    magic: ::DWORD,
-    bitlen: ::DWORD,
-}}
-pub type DSSPUBKEY = DHPUBKEY;
-pub type KEAPUBKEY = DHPUBKEY;
-pub type TEKPUBKEY = DHPUBKEY;
-STRUCT!{struct DSSSEED {
-    counter: ::DWORD,
-    seed: [::BYTE; 20],
-}}
-STRUCT!{struct DHPUBKEY_VER3 {
-    magic: ::DWORD,
-    bitlenP: ::DWORD,
-    bitlenQ: ::DWORD,
-    bitlenJ: ::DWORD,
-    DSSSeed: DSSSEED,
-}}
-pub type DSSPUBKEY_VER3 = DHPUBKEY_VER3;
-STRUCT!{struct DHPRIVKEY_VER3 {
-    magic: ::DWORD,
-    bitlenP: ::DWORD,
-    bitlenQ: ::DWORD,
-    bitlenJ: ::DWORD,
-    bitlenX: ::DWORD,
-    DSSSeed: DSSSEED,
-}}
-pub type DSSPRIVKEY_VER3 = DHPRIVKEY_VER3;
-STRUCT!{struct KEY_TYPE_SUBTYPE {
-    dwKeySpec: ::DWORD,
-    Type: ::GUID,
-    Subtype: ::GUID,
-}}
-pub type PKEY_TYPE_SUBTYPE = *mut KEY_TYPE_SUBTYPE;
-STRUCT!{nodebug struct CERT_FORTEZZA_DATA_PROP {
-    SerialNumber: [::c_uchar; 8],
-    CertIndex: ::c_int,
-    CertLabel: [::c_uchar; 36],
-}}
-STRUCT!{nodebug struct CRYPT_RC4_KEY_STATE {
-    Key: [::c_uchar; 16],
-    SBox: [::c_uchar; 256],
-    i: ::c_uchar,
-    j: ::c_uchar,
-}}
-pub type PCRYPT_RC4_KEY_STATE = *mut CRYPT_RC4_KEY_STATE;
-STRUCT!{struct CRYPT_DES_KEY_STATE {
-    Key: [::c_uchar; 8],
-    IV: [::c_uchar; 8],
-    Feedback: [::c_uchar; 8],
-}}
-pub type PCRYPT_DES_KEY_STATE = *mut CRYPT_DES_KEY_STATE;
-STRUCT!{struct CRYPT_3DES_KEY_STATE {
-    Key: [::c_uchar; 24],
-    IV: [::c_uchar; 8],
-    Feedback: [::c_uchar; 8],
-}}
-pub type PCRYPT_3DES_KEY_STATE = *mut CRYPT_3DES_KEY_STATE;
-STRUCT!{struct CRYPT_AES_128_KEY_STATE {
-    Key: [::c_uchar; 16],
-    IV: [::c_uchar; 16],
-    EncryptionState: [[::c_uchar; 16]; 11],
-    DecryptionState: [[::c_uchar; 16]; 11],
-    Feedback: [::c_uchar; 16],
-}}
-pub type PCRYPT_AES_128_KEY_STATE = *mut CRYPT_AES_128_KEY_STATE;
-STRUCT!{struct CRYPT_AES_256_KEY_STATE {
-    Key: [::c_uchar; 32],
-    IV: [::c_uchar; 16],
-    EncryptionState: [[::c_uchar; 16]; 15],
-    DecryptionState: [[::c_uchar; 16]; 15],
-    Feedback: [::c_uchar; 16],
-}}
-pub type PCRYPT_AES_256_KEY_STATE = *mut CRYPT_AES_256_KEY_STATE;
-STRUCT!{struct CRYPTOAPI_BLOB {
-    cbData: ::DWORD,
-    pbData: *mut ::BYTE,
-}}
-pub type CRYPT_INTEGER_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_INTEGER_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_UINT_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_UINT_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_OBJID_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_OBJID_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CERT_NAME_BLOB = CRYPTOAPI_BLOB;
-pub type PCERT_NAME_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CERT_RDN_VALUE_BLOB = CRYPTOAPI_BLOB;
-pub type PCERT_RDN_VALUE_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CERT_BLOB = CRYPTOAPI_BLOB;
-pub type PCERT_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRL_BLOB = CRYPTOAPI_BLOB;
-pub type PCRL_BLOB = *mut CRYPTOAPI_BLOB;
-pub type DATA_BLOB = CRYPTOAPI_BLOB;
-pub type PDATA_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_DATA_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_DATA_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_HASH_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_HASH_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_DIGEST_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_DIGEST_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_DER_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_DER_BLOB = *mut CRYPTOAPI_BLOB;
-pub type CRYPT_ATTR_BLOB = CRYPTOAPI_BLOB;
-pub type PCRYPT_ATTR_BLOB = *mut CRYPTOAPI_BLOB;
-STRUCT!{struct CMS_DH_KEY_INFO {
-    dwVersion: ::DWORD,
-    Algid: ALG_ID,
-    pszContentEncObjId: ::LPSTR,
-    PubInfo: CRYPT_DATA_BLOB,
-    pReserved: *mut ::c_void,
-}}
-pub type PCMS_DH_KEY_INFO = *mut CMS_DH_KEY_INFO;
-pub type HCRYPTPROV_OR_NCRYPT_KEY_HANDLE = ::ULONG_PTR;
-pub type HCRYPTPROV_LEGACY = ::ULONG_PTR;
-STRUCT!{struct CRYPT_BIT_BLOB {
-    cbData: ::DWORD,
-    pbData: *mut ::BYTE,
-    cUnusedBits: ::DWORD,
-}}
-pub type PCRYPT_BIT_BLOB = *mut CRYPT_BIT_BLOB;
-STRUCT!{struct CRYPT_ALGORITHM_IDENTIFIER {
-    pszObjId: ::LPSTR,
-    Parameters: CRYPT_OBJID_BLOB,
-}}
-pub type PCRYPT_ALGORITHM_IDENTIFIER = *mut CRYPT_ALGORITHM_IDENTIFIER;
-pub const szOID_RSA: &'static str = "1.2.840.113549";
-pub const szOID_PKCS: &'static str = "1.2.840.113549.1";
-pub const szOID_RSA_HASH: &'static str = "1.2.840.113549.2";
-pub const szOID_RSA_ENCRYPT: &'static str = "1.2.840.113549.3";
-pub const szOID_PKCS_1: &'static str = "1.2.840.113549.1.1";
-pub const szOID_PKCS_2: &'static str = "1.2.840.113549.1.2";
-pub const szOID_PKCS_3: &'static str = "1.2.840.113549.1.3";
-pub const szOID_PKCS_4: &'static str = "1.2.840.113549.1.4";
-pub const szOID_PKCS_5: &'static str = "1.2.840.113549.1.5";
-pub const szOID_PKCS_6: &'static str = "1.2.840.113549.1.6";
-pub const szOID_PKCS_7: &'static str = "1.2.840.113549.1.7";
-pub const szOID_PKCS_8: &'static str = "1.2.840.113549.1.8";
-pub const szOID_PKCS_9: &'static str = "1.2.840.113549.1.9";
-pub const szOID_PKCS_10: &'static str = "1.2.840.113549.1.10";
-pub const szOID_PKCS_12: &'static str = "1.2.840.113549.1.12";
-pub const szOID_RSA_RSA: &'static str = "1.2.840.113549.1.1.1";
-pub const szOID_RSA_MD2RSA: &'static str = "1.2.840.113549.1.1.2";
-pub const szOID_RSA_MD4RSA: &'static str = "1.2.840.113549.1.1.3";
-pub const szOID_RSA_MD5RSA: &'static str = "1.2.840.113549.1.1.4";
-pub const szOID_RSA_SHA1RSA: &'static str = "1.2.840.113549.1.1.5";
-pub const szOID_RSA_SETOAEP_RSA: &'static str = "1.2.840.113549.1.1.6";
-pub const szOID_RSAES_OAEP: &'static str = "1.2.840.113549.1.1.7";
-pub const szOID_RSA_MGF1: &'static str = "1.2.840.113549.1.1.8";
-pub const szOID_RSA_PSPECIFIED: &'static str = "1.2.840.113549.1.1.9";
-pub const szOID_RSA_SSA_PSS: &'static str = "1.2.840.113549.1.1.10";
-pub const szOID_RSA_SHA256RSA: &'static str = "1.2.840.113549.1.1.11";
-pub const szOID_RSA_SHA384RSA: &'static str = "1.2.840.113549.1.1.12";
-pub const szOID_RSA_SHA512RSA: &'static str = "1.2.840.113549.1.1.13";
-pub const szOID_RSA_DH: &'static str = "1.2.840.113549.1.3.1";
-pub const szOID_RSA_data: &'static str = "1.2.840.113549.1.7.1";
-pub const szOID_RSA_signedData: &'static str = "1.2.840.113549.1.7.2";
-pub const szOID_RSA_envelopedData: &'static str = "1.2.840.113549.1.7.3";
-pub const szOID_RSA_signEnvData: &'static str = "1.2.840.113549.1.7.4";
-pub const szOID_RSA_digestedData: &'static str = "1.2.840.113549.1.7.5";
-pub const szOID_RSA_hashedData: &'static str = "1.2.840.113549.1.7.5";
-pub const szOID_RSA_encryptedData: &'static str = "1.2.840.113549.1.7.6";
-pub const szOID_RSA_emailAddr: &'static str = "1.2.840.113549.1.9.1";
-pub const szOID_RSA_unstructName: &'static str = "1.2.840.113549.1.9.2";
-pub const szOID_RSA_contentType: &'static str = "1.2.840.113549.1.9.3";
-pub const szOID_RSA_messageDigest: &'static str = "1.2.840.113549.1.9.4";
-pub const szOID_RSA_signingTime: &'static str = "1.2.840.113549.1.9.5";
-pub const szOID_RSA_counterSign: &'static str = "1.2.840.113549.1.9.6";
-pub const szOID_RSA_challengePwd: &'static str = "1.2.840.113549.1.9.7";
-pub const szOID_RSA_unstructAddr: &'static str = "1.2.840.113549.1.9.8";
-pub const szOID_RSA_extCertAttrs: &'static str = "1.2.840.113549.1.9.9";
-pub const szOID_RSA_certExtensions: &'static str = "1.2.840.113549.1.9.14";
-pub const szOID_RSA_SMIMECapabilities: &'static str = "1.2.840.113549.1.9.15";
-pub const szOID_RSA_preferSignedData: &'static str = "1.2.840.113549.1.9.15.1";
-pub const szOID_TIMESTAMP_TOKEN: &'static str = "1.2.840.113549.1.9.16.1.4";
-pub const szOID_RFC3161_counterSign: &'static str = "1.3.6.1.4.1.311.3.3.1";
-pub const szOID_RSA_SMIMEalg: &'static str = "1.2.840.113549.1.9.16.3";
-pub const szOID_RSA_SMIMEalgESDH: &'static str = "1.2.840.113549.1.9.16.3.5";
-pub const szOID_RSA_SMIMEalgCMS3DESwrap: &'static str = "1.2.840.113549.1.9.16.3.6";
-pub const szOID_RSA_SMIMEalgCMSRC2wrap: &'static str = "1.2.840.113549.1.9.16.3.7";
-pub const szOID_RSA_MD2: &'static str = "1.2.840.113549.2.2";
-pub const szOID_RSA_MD4: &'static str = "1.2.840.113549.2.4";
-pub const szOID_RSA_MD5: &'static str = "1.2.840.113549.2.5";
-pub const szOID_RSA_RC2CBC: &'static str = "1.2.840.113549.3.2";
-pub const szOID_RSA_RC4: &'static str = "1.2.840.113549.3.4";
-pub const szOID_RSA_DES_EDE3_CBC: &'static str = "1.2.840.113549.3.7";
-pub const szOID_RSA_RC5_CBCPad: &'static str = "1.2.840.113549.3.9";
-pub const szOID_ANSI_X942: &'static str = "1.2.840.10046";
-pub const szOID_ANSI_X942_DH: &'static str = "1.2.840.10046.2.1";
-pub const szOID_X957: &'static str = "1.2.840.10040";
-pub const szOID_X957_DSA: &'static str = "1.2.840.10040.4.1";
-pub const szOID_X957_SHA1DSA: &'static str = "1.2.840.10040.4.3";
-pub const szOID_ECC_PUBLIC_KEY: &'static str = "1.2.840.10045.2.1";
-pub const szOID_ECC_CURVE_P256: &'static str = "1.2.840.10045.3.1.7";
-pub const szOID_ECC_CURVE_P384: &'static str = "1.3.132.0.34";
-pub const szOID_ECC_CURVE_P521: &'static str = "1.3.132.0.35";
-pub const szOID_ECDSA_SHA1: &'static str = "1.2.840.10045.4.1";
-pub const szOID_ECDSA_SPECIFIED: &'static str = "1.2.840.10045.4.3";
-pub const szOID_ECDSA_SHA256: &'static str = "1.2.840.10045.4.3.2";
-pub const szOID_ECDSA_SHA384: &'static str = "1.2.840.10045.4.3.3";
-pub const szOID_ECDSA_SHA512: &'static str = "1.2.840.10045.4.3.4";
-pub const szOID_NIST_AES128_CBC: &'static str = "2.16.840.1.101.3.4.1.2";
-pub const szOID_NIST_AES192_CBC: &'static str = "2.16.840.1.101.3.4.1.22";
-pub const szOID_NIST_AES256_CBC: &'static str = "2.16.840.1.101.3.4.1.42";
-pub const szOID_NIST_AES128_WRAP: &'static str = "2.16.840.1.101.3.4.1.5";
-pub const szOID_NIST_AES192_WRAP: &'static str = "2.16.840.1.101.3.4.1.25";
-pub const szOID_NIST_AES256_WRAP: &'static str = "2.16.840.1.101.3.4.1.45";
-pub const szOID_DH_SINGLE_PASS_STDDH_SHA1_KDF: &'static str = "1.3.133.16.840.63.0.2";
-pub const szOID_DH_SINGLE_PASS_STDDH_SHA256_KDF: &'static str = "1.3.132.1.11.1";
-pub const szOID_DH_SINGLE_PASS_STDDH_SHA384_KDF: &'static str = "1.3.132.1.11.2";
-pub const szOID_DS: &'static str = "2.5";
-pub const szOID_DSALG: &'static str = "2.5.8";
-pub const szOID_DSALG_CRPT: &'static str = "2.5.8.1";
-pub const szOID_DSALG_HASH: &'static str = "2.5.8.2";
-pub const szOID_DSALG_SIGN: &'static str = "2.5.8.3";
-pub const szOID_DSALG_RSA: &'static str = "2.5.8.1.1";
-pub const szOID_OIW: &'static str = "1.3.14";
-pub const szOID_OIWSEC: &'static str = "1.3.14.3.2";
-pub const szOID_OIWSEC_md4RSA: &'static str = "1.3.14.3.2.2";
-pub const szOID_OIWSEC_md5RSA: &'static str = "1.3.14.3.2.3";
-pub const szOID_OIWSEC_md4RSA2: &'static str = "1.3.14.3.2.4";
-pub const szOID_OIWSEC_desECB: &'static str = "1.3.14.3.2.6";
-pub const szOID_OIWSEC_desCBC: &'static str = "1.3.14.3.2.7";
-pub const szOID_OIWSEC_desOFB: &'static str = "1.3.14.3.2.8";
-pub const szOID_OIWSEC_desCFB: &'static str = "1.3.14.3.2.9";
-pub const szOID_OIWSEC_desMAC: &'static str = "1.3.14.3.2.10";
-pub const szOID_OIWSEC_rsaSign: &'static str = "1.3.14.3.2.11";
-pub const szOID_OIWSEC_dsa: &'static str = "1.3.14.3.2.12";
-pub const szOID_OIWSEC_shaDSA: &'static str = "1.3.14.3.2.13";
-pub const szOID_OIWSEC_mdc2RSA: &'static str = "1.3.14.3.2.14";
-pub const szOID_OIWSEC_shaRSA: &'static str = "1.3.14.3.2.15";
-pub const szOID_OIWSEC_dhCommMod: &'static str = "1.3.14.3.2.16";
-pub const szOID_OIWSEC_desEDE: &'static str = "1.3.14.3.2.17";
-pub const szOID_OIWSEC_sha: &'static str = "1.3.14.3.2.18";
-pub const szOID_OIWSEC_mdc2: &'static str = "1.3.14.3.2.19";
-pub const szOID_OIWSEC_dsaComm: &'static str = "1.3.14.3.2.20";
-pub const szOID_OIWSEC_dsaCommSHA: &'static str = "1.3.14.3.2.21";
-pub const szOID_OIWSEC_rsaXchg: &'static str = "1.3.14.3.2.22";
-pub const szOID_OIWSEC_keyHashSeal: &'static str = "1.3.14.3.2.23";
-pub const szOID_OIWSEC_md2RSASign: &'static str = "1.3.14.3.2.24";
-pub const szOID_OIWSEC_md5RSASign: &'static str = "1.3.14.3.2.25";
-pub const szOID_OIWSEC_sha1: &'static str = "1.3.14.3.2.26";
-pub const szOID_OIWSEC_dsaSHA1: &'static str = "1.3.14.3.2.27";
-pub const szOID_OIWSEC_dsaCommSHA1: &'static str = "1.3.14.3.2.28";
-pub const szOID_OIWSEC_sha1RSASign: &'static str = "1.3.14.3.2.29";
-pub const szOID_OIWDIR: &'static str = "1.3.14.7.2";
-pub const szOID_OIWDIR_CRPT: &'static str = "1.3.14.7.2.1";
-pub const szOID_OIWDIR_HASH: &'static str = "1.3.14.7.2.2";
-pub const szOID_OIWDIR_SIGN: &'static str = "1.3.14.7.2.3";
-pub const szOID_OIWDIR_md2: &'static str = "1.3.14.7.2.2.1";
-pub const szOID_OIWDIR_md2RSA: &'static str = "1.3.14.7.2.3.1";
-pub const szOID_INFOSEC: &'static str = "2.16.840.1.101.2.1";
-pub const szOID_INFOSEC_sdnsSignature: &'static str = "2.16.840.1.101.2.1.1.1";
-pub const szOID_INFOSEC_mosaicSignature: &'static str = "2.16.840.1.101.2.1.1.2";
-pub const szOID_INFOSEC_sdnsConfidentiality: &'static str = "2.16.840.1.101.2.1.1.3";
-pub const szOID_INFOSEC_mosaicConfidentiality: &'static str = "2.16.840.1.101.2.1.1.4";
-pub const szOID_INFOSEC_sdnsIntegrity: &'static str = "2.16.840.1.101.2.1.1.5";
-pub const szOID_INFOSEC_mosaicIntegrity: &'static str = "2.16.840.1.101.2.1.1.6";
-pub const szOID_INFOSEC_sdnsTokenProtection: &'static str = "2.16.840.1.101.2.1.1.7";
-pub const szOID_INFOSEC_mosaicTokenProtection: &'static str = "2.16.840.1.101.2.1.1.8";
-pub const szOID_INFOSEC_sdnsKeyManagement: &'static str = "2.16.840.1.101.2.1.1.9";
-pub const szOID_INFOSEC_mosaicKeyManagement: &'static str = "2.16.840.1.101.2.1.1.10";
-pub const szOID_INFOSEC_sdnsKMandSig: &'static str = "2.16.840.1.101.2.1.1.11";
-pub const szOID_INFOSEC_mosaicKMandSig: &'static str = "2.16.840.1.101.2.1.1.12";
-pub const szOID_INFOSEC_SuiteASignature: &'static str = "2.16.840.1.101.2.1.1.13";
-pub const szOID_INFOSEC_SuiteAConfidentiality: &'static str = "2.16.840.1.101.2.1.1.14";
-pub const szOID_INFOSEC_SuiteAIntegrity: &'static str = "2.16.840.1.101.2.1.1.15";
-pub const szOID_INFOSEC_SuiteATokenProtection: &'static str = "2.16.840.1.101.2.1.1.16";
-pub const szOID_INFOSEC_SuiteAKeyManagement: &'static str = "2.16.840.1.101.2.1.1.17";
-pub const szOID_INFOSEC_SuiteAKMandSig: &'static str = "2.16.840.1.101.2.1.1.18";
-pub const szOID_INFOSEC_mosaicUpdatedSig: &'static str = "2.16.840.1.101.2.1.1.19";
-pub const szOID_INFOSEC_mosaicKMandUpdSig: &'static str = "2.16.840.1.101.2.1.1.20";
-pub const szOID_INFOSEC_mosaicUpdatedInteg: &'static str = "2.16.840.1.101.2.1.1.21";
-pub const szOID_NIST_sha256: &'static str = "2.16.840.1.101.3.4.2.1";
-pub const szOID_NIST_sha384: &'static str = "2.16.840.1.101.3.4.2.2";
-pub const szOID_NIST_sha512: &'static str = "2.16.840.1.101.3.4.2.3";
-STRUCT!{struct CRYPT_OBJID_TABLE {
-    dwAlgId: ::DWORD,
-    pszObjId: ::LPCSTR,
-}}
-pub type PCRYPT_OBJID_TABLE = *mut CRYPT_OBJID_TABLE;
-STRUCT!{struct CRYPT_HASH_INFO {
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Hash: CRYPT_HASH_BLOB,
-}}
-pub type PCRYPT_HASH_INFO = *mut CRYPT_HASH_INFO;
-STRUCT!{struct CERT_EXTENSION {
-    pszObjId: ::LPSTR,
-    fCritical: ::BOOL,
-    Value: CRYPT_OBJID_BLOB,
-}}
-pub type PCERT_EXTENSION = *mut CERT_EXTENSION;
-pub type PCCERT_EXTENSION = *const CERT_EXTENSION;
-STRUCT!{struct CRYPT_ATTRIBUTE_TYPE_VALUE {
-    pszObjId: ::LPSTR,
-    Value: CRYPT_OBJID_BLOB,
-}}
-pub type PCRYPT_ATTRIBUTE_TYPE_VALUE = *mut CRYPT_ATTRIBUTE_TYPE_VALUE;
-STRUCT!{struct CRYPT_ATTRIBUTE {
-    pszObjId: ::LPSTR,
-    cValue: ::DWORD,
-    rgValue: PCRYPT_ATTR_BLOB,
-}}
-pub type PCRYPT_ATTRIBUTE = *mut CRYPT_ATTRIBUTE;
-STRUCT!{struct CRYPT_ATTRIBUTES {
-    cAttr: ::DWORD,
-    rgAttr: PCRYPT_ATTRIBUTE,
-}}
-pub type PCRYPT_ATTRIBUTES = *mut CRYPT_ATTRIBUTES;
-STRUCT!{struct CERT_RDN_ATTR {
-    pszObjId: ::LPSTR,
-    dwValueType: ::DWORD,
-    Value: CERT_RDN_VALUE_BLOB,
-}}
-pub type PCERT_RDN_ATTR = *mut CERT_RDN_ATTR;
-pub const szOID_COMMON_NAME: &'static str = "2.5.4.3";
-pub const szOID_SUR_NAME: &'static str = "2.5.4.4";
-pub const szOID_DEVICE_SERIAL_NUMBER: &'static str = "2.5.4.5";
-pub const szOID_COUNTRY_NAME: &'static str = "2.5.4.6";
-pub const szOID_LOCALITY_NAME: &'static str = "2.5.4.7";
-pub const szOID_STATE_OR_PROVINCE_NAME: &'static str = "2.5.4.8";
-pub const szOID_STREET_ADDRESS: &'static str = "2.5.4.9";
-pub const szOID_ORGANIZATION_NAME: &'static str = "2.5.4.10";
-pub const szOID_ORGANIZATIONAL_UNIT_NAME: &'static str = "2.5.4.11";
-pub const szOID_TITLE: &'static str = "2.5.4.12";
-pub const szOID_DESCRIPTION: &'static str = "2.5.4.13";
-pub const szOID_SEARCH_GUIDE: &'static str = "2.5.4.14";
-pub const szOID_BUSINESS_CATEGORY: &'static str = "2.5.4.15";
-pub const szOID_POSTAL_ADDRESS: &'static str = "2.5.4.16";
-pub const szOID_POSTAL_CODE: &'static str = "2.5.4.17";
-pub const szOID_POST_OFFICE_BOX: &'static str = "2.5.4.18";
-pub const szOID_PHYSICAL_DELIVERY_OFFICE_NAME: &'static str = "2.5.4.19";
-pub const szOID_TELEPHONE_NUMBER: &'static str = "2.5.4.20";
-pub const szOID_TELEX_NUMBER: &'static str = "2.5.4.21";
-pub const szOID_TELETEXT_TERMINAL_IDENTIFIER: &'static str = "2.5.4.22";
-pub const szOID_FACSIMILE_TELEPHONE_NUMBER: &'static str = "2.5.4.23";
-pub const szOID_X21_ADDRESS: &'static str = "2.5.4.24";
-pub const szOID_INTERNATIONAL_ISDN_NUMBER: &'static str = "2.5.4.25";
-pub const szOID_REGISTERED_ADDRESS: &'static str = "2.5.4.26";
-pub const szOID_DESTINATION_INDICATOR: &'static str = "2.5.4.27";
-pub const szOID_PREFERRED_DELIVERY_METHOD: &'static str = "2.5.4.28";
-pub const szOID_PRESENTATION_ADDRESS: &'static str = "2.5.4.29";
-pub const szOID_SUPPORTED_APPLICATION_CONTEXT: &'static str = "2.5.4.30";
-pub const szOID_MEMBER: &'static str = "2.5.4.31";
-pub const szOID_OWNER: &'static str = "2.5.4.32";
-pub const szOID_ROLE_OCCUPANT: &'static str = "2.5.4.33";
-pub const szOID_SEE_ALSO: &'static str = "2.5.4.34";
-pub const szOID_USER_PASSWORD: &'static str = "2.5.4.35";
-pub const szOID_USER_CERTIFICATE: &'static str = "2.5.4.36";
-pub const szOID_CA_CERTIFICATE: &'static str = "2.5.4.37";
-pub const szOID_AUTHORITY_REVOCATION_LIST: &'static str = "2.5.4.38";
-pub const szOID_CERTIFICATE_REVOCATION_LIST: &'static str = "2.5.4.39";
-pub const szOID_CROSS_CERTIFICATE_PAIR: &'static str = "2.5.4.40";
-pub const szOID_GIVEN_NAME: &'static str = "2.5.4.42";
-pub const szOID_INITIALS: &'static str = "2.5.4.43";
-pub const szOID_DN_QUALIFIER: &'static str = "2.5.4.46";
-pub const szOID_DOMAIN_COMPONENT: &'static str = "0.9.2342.19200300.100.1.25";
-pub const szOID_PKCS_12_FRIENDLY_NAME_ATTR: &'static str = "1.2.840.113549.1.9.20";
-pub const szOID_PKCS_12_LOCAL_KEY_ID: &'static str = "1.2.840.113549.1.9.21";
-pub const szOID_PKCS_12_KEY_PROVIDER_NAME_ATTR: &'static str = "1.3.6.1.4.1.311.17.1";
-pub const szOID_LOCAL_MACHINE_KEYSET: &'static str = "1.3.6.1.4.1.311.17.2";
-pub const szOID_PKCS_12_EXTENDED_ATTRIBUTES: &'static str = "1.3.6.1.4.1.311.17.3";
-pub const szOID_PKCS_12_PROTECTED_PASSWORD_SECRET_BAG_TYPE_ID: &'static str =
-    "1.3.6.1.4.1.311.17.4";
-pub const szOID_KEYID_RDN: &'static str = "1.3.6.1.4.1.311.10.7.1";
-pub const szOID_EV_RDN_LOCALE: &'static str = "1.3.6.1.4.1.311.60.2.1.1";
-pub const szOID_EV_RDN_STATE_OR_PROVINCE: &'static str = "1.3.6.1.4.1.311.60.2.1.2";
-pub const szOID_EV_RDN_COUNTRY: &'static str = "1.3.6.1.4.1.311.60.2.1.3";
-pub const CERT_RDN_ANY_TYPE: ::DWORD = 0;
-pub const CERT_RDN_ENCODED_BLOB: ::DWORD = 1;
-pub const CERT_RDN_OCTET_STRING: ::DWORD = 2;
-pub const CERT_RDN_NUMERIC_STRING: ::DWORD = 3;
-pub const CERT_RDN_PRINTABLE_STRING: ::DWORD = 4;
-pub const CERT_RDN_TELETEX_STRING: ::DWORD = 5;
-pub const CERT_RDN_T61_STRING: ::DWORD = 5;
-pub const CERT_RDN_VIDEOTEX_STRING: ::DWORD = 6;
-pub const CERT_RDN_IA5_STRING: ::DWORD = 7;
-pub const CERT_RDN_GRAPHIC_STRING: ::DWORD = 8;
-pub const CERT_RDN_VISIBLE_STRING: ::DWORD = 9;
-pub const CERT_RDN_ISO646_STRING: ::DWORD = 9;
-pub const CERT_RDN_GENERAL_STRING: ::DWORD = 10;
-pub const CERT_RDN_UNIVERSAL_STRING: ::DWORD = 11;
-pub const CERT_RDN_INT4_STRING: ::DWORD = 11;
-pub const CERT_RDN_BMP_STRING: ::DWORD = 12;
-pub const CERT_RDN_UNICODE_STRING: ::DWORD = 12;
-pub const CERT_RDN_UTF8_STRING: ::DWORD = 13;
-pub const CERT_RDN_TYPE_MASK: ::DWORD = 0x000000FF;
-pub const CERT_RDN_FLAGS_MASK: ::DWORD = 0xFF000000;
-pub const CERT_RDN_ENABLE_T61_UNICODE_FLAG: ::DWORD = 0x80000000;
-pub const CERT_RDN_ENABLE_UTF8_UNICODE_FLAG: ::DWORD = 0x20000000;
-pub const CERT_RDN_FORCE_UTF8_UNICODE_FLAG: ::DWORD = 0x10000000;
-pub const CERT_RDN_DISABLE_CHECK_TYPE_FLAG: ::DWORD = 0x40000000;
-pub const CERT_RDN_DISABLE_IE4_UTF8_FLAG: ::DWORD = 0x01000000;
-pub const CERT_RDN_ENABLE_PUNYCODE_FLAG: ::DWORD = 0x02000000;
-STRUCT!{struct CERT_RDN {
-    cRDNAttr: ::DWORD,
-    rgRDNAttr: PCERT_RDN_ATTR,
-}}
-pub type PCERT_RDN = *mut CERT_RDN;
-STRUCT!{struct CERT_NAME_INFO {
-    cRDN: ::DWORD,
-    rgRDN: PCERT_RDN,
-}}
-pub type PCERT_NAME_INFO = *mut CERT_NAME_INFO;
-STRUCT!{struct CERT_NAME_VALUE {
-    dwValueType: ::DWORD,
-    Value: CERT_RDN_VALUE_BLOB,
-}}
-pub type PCERT_NAME_VALUE = *mut CERT_NAME_VALUE;
-STRUCT!{struct CERT_PUBLIC_KEY_INFO {
-    Algorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    PublicKey: CRYPT_BIT_BLOB,
-}}
-pub type PCERT_PUBLIC_KEY_INFO = *mut CERT_PUBLIC_KEY_INFO;
-pub const CERT_RSA_PUBLIC_KEY_OBJID: &'static str = szOID_RSA_RSA;
-pub const CERT_DEFAULT_OID_PUBLIC_KEY_SIGN: &'static str = szOID_RSA_RSA;
-pub const CERT_DEFAULT_OID_PUBLIC_KEY_XCHG: &'static str = szOID_RSA_RSA;
-STRUCT!{struct CRYPT_ECC_PRIVATE_KEY_INFO {
-    dwVersion: ::DWORD,
-    PrivateKey: CRYPT_DER_BLOB,
-    szCurveOid: ::LPSTR,
-    PublicKey: CRYPT_BIT_BLOB,
-}}
-pub type PCRYPT_ECC_PRIVATE_KEY_INFO = *mut CRYPT_ECC_PRIVATE_KEY_INFO;
-pub const CRYPT_ECC_PRIVATE_KEY_INFO_v1: ::DWORD = 1;
-STRUCT!{struct CRYPT_PRIVATE_KEY_INFO {
-    Version: ::DWORD,
-    Algorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    PrivateKey: CRYPT_DER_BLOB,
-    pAttributes: PCRYPT_ATTRIBUTES,
-}}
-pub type PCRYPT_PRIVATE_KEY_INFO = *mut CRYPT_PRIVATE_KEY_INFO;
-STRUCT!{struct CRYPT_ENCRYPTED_PRIVATE_KEY_INFO {
-    EncryptionAlgorithm: ::CRYPT_ALGORITHM_IDENTIFIER,
-    EncryptedPrivateKey: ::CRYPT_DATA_BLOB,
-}}
-pub type PCRYPT_ENCRYPTED_PRIVATE_KEY_INFO = *mut CRYPT_ENCRYPTED_PRIVATE_KEY_INFO;
-pub type PCRYPT_DECRYPT_PRIVATE_KEY_FUNC = Option<unsafe extern "system" fn(
-    Algorithm: CRYPT_ALGORITHM_IDENTIFIER, EncryptedPrivateKey: CRYPT_DATA_BLOB,
-    pbClearTextKey: *mut ::BYTE, pcbClearTextKey: *mut ::DWORD, pVoidDecryptFunc: ::LPVOID,
-) -> ::BOOL>;
-pub type PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC = Option<unsafe extern "system" fn(
-    Algorithm: *mut CRYPT_ALGORITHM_IDENTIFIER, pClearTextPrivateKey: *mut CRYPT_DATA_BLOB,
-    pbEncryptedKey: *mut ::BYTE, pcbEncryptedKey: *mut ::DWORD, pVoidEncryptFunc: ::LPVOID,
-) -> ::BOOL>;
-pub type PCRYPT_RESOLVE_HCRYPTPROV_FUNC = Option<unsafe extern "system" fn(
-    pPrivateKeyInfo: *mut CRYPT_PRIVATE_KEY_INFO, phCryptProv: *mut HCRYPTPROV,
-    pVoidResolveFunc: ::LPVOID,
-) -> ::BOOL>;
-STRUCT!{nodebug struct CRYPT_PKCS8_IMPORT_PARAMS {
-    PrivateKey: CRYPT_DIGEST_BLOB,
-    pResolvehCryptProvFunc: PCRYPT_RESOLVE_HCRYPTPROV_FUNC,
-    pVoidResolveFunc: ::LPVOID,
-    pDecryptPrivateKeyFunc: PCRYPT_DECRYPT_PRIVATE_KEY_FUNC,
-    pVoidDecryptFunc: ::LPVOID,
-}}
-pub type PCRYPT_PKCS8_IMPORT_PARAMS = *mut CRYPT_PKCS8_IMPORT_PARAMS;
-pub type CRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = CRYPT_PKCS8_IMPORT_PARAMS;
-pub type PPCRYPT_PRIVATE_KEY_BLOB_AND_PARAMS = *mut CRYPT_PKCS8_IMPORT_PARAMS;
-STRUCT!{nodebug struct CRYPT_PKCS8_EXPORT_PARAMS {
-    hCryptProv: HCRYPTPROV,
-    dwKeySpec: ::DWORD,
-    pszPrivateKeyObjId: ::LPSTR,
-    pEncryptPrivateKeyFunc: PCRYPT_ENCRYPT_PRIVATE_KEY_FUNC,
-    pVoidEncryptFunc: ::LPVOID,
-}}
-pub type PCRYPT_PKCS8_EXPORT_PARAMS = *mut CRYPT_PKCS8_EXPORT_PARAMS;
-STRUCT!{struct CERT_INFO {
-    dwVersion: ::DWORD,
-    SerialNumber: CRYPT_INTEGER_BLOB,
-    SignatureAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Issuer: CERT_NAME_BLOB,
-    NotBefore: ::FILETIME,
-    NotAfter: ::FILETIME,
-    Subject: CERT_NAME_BLOB,
-    SubjectPublicKeyInfo: CERT_PUBLIC_KEY_INFO,
-    IssuerUniqueId: CRYPT_BIT_BLOB,
-    SubjectUniqueId: CRYPT_BIT_BLOB,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCERT_INFO = *mut CERT_INFO;
-pub const CERT_V1: ::DWORD = 0;
-pub const CERT_V2: ::DWORD = 1;
-pub const CERT_V3: ::DWORD = 2;
-pub const CERT_INFO_VERSION_FLAG: ::DWORD = 1;
-pub const CERT_INFO_SERIAL_NUMBER_FLAG: ::DWORD = 2;
-pub const CERT_INFO_SIGNATURE_ALGORITHM_FLAG: ::DWORD = 3;
-pub const CERT_INFO_ISSUER_FLAG: ::DWORD = 4;
-pub const CERT_INFO_NOT_BEFORE_FLAG: ::DWORD = 5;
-pub const CERT_INFO_NOT_AFTER_FLAG: ::DWORD = 6;
-pub const CERT_INFO_SUBJECT_FLAG: ::DWORD = 7;
-pub const CERT_INFO_SUBJECT_PUBLIC_KEY_INFO_FLAG: ::DWORD = 8;
-pub const CERT_INFO_ISSUER_UNIQUE_ID_FLAG: ::DWORD = 9;
-pub const CERT_INFO_SUBJECT_UNIQUE_ID_FLAG: ::DWORD = 10;
-pub const CERT_INFO_EXTENSION_FLAG: ::DWORD = 11;
-STRUCT!{struct CRL_ENTRY {
-    SerialNumber: CRYPT_INTEGER_BLOB,
-    RevocationDate: ::FILETIME,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRL_ENTRY = *mut CRL_ENTRY;
-STRUCT!{struct CRL_INFO {
-    dwVersion: ::DWORD,
-    SignatureAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Issuer: CERT_NAME_BLOB,
-    ThisUpdate: ::FILETIME,
-    NextUpdate: ::FILETIME,
-    cCRLEntry: ::DWORD,
-    rgCRLEntry: PCRL_ENTRY,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRL_INFO = *mut CRL_INFO;
-pub const CRL_V1: ::DWORD = 0;
-pub const CRL_V2: ::DWORD = 1;
-pub const CERT_BUNDLE_CERTIFICATE: ::DWORD = 0;
-pub const CERT_BUNDLE_CRL: ::DWORD = 1;
-STRUCT!{struct CERT_OR_CRL_BLOB {
-    dwChoice: ::DWORD,
-    cbEncoded: ::DWORD,
-    pbEncoded: *mut ::BYTE,
-}}
-pub type PCERT_OR_CRL_BLOB = *mut CERT_OR_CRL_BLOB;
-STRUCT!{struct CERT_OR_CRL_BUNDLE {
-    cItem: ::DWORD,
-    rgItem: PCERT_OR_CRL_BLOB,
-}}
-pub type PCERT_OR_CRL_BUNDLE = *mut CERT_OR_CRL_BUNDLE;
-STRUCT!{struct CERT_REQUEST_INFO {
-    dwVersion: ::DWORD,
-    Subject: CERT_NAME_BLOB,
-    SubjectPublicKeyInfo: CERT_PUBLIC_KEY_INFO,
-    cAttribute: ::DWORD,
-    rgAttribute: PCRYPT_ATTRIBUTE,
-}}
-pub type PCERT_REQUEST_INFO = *mut CERT_REQUEST_INFO;
-pub const CERT_REQUEST_V1: ::DWORD = 0;
-STRUCT!{struct CERT_KEYGEN_REQUEST_INFO {
-    dwVersion: ::DWORD,
-    SubjectPublicKeyInfo: CERT_PUBLIC_KEY_INFO,
-    pwszChallengeString: ::LPWSTR,
-}}
-pub type PCERT_KEYGEN_REQUEST_INFO = *mut CERT_KEYGEN_REQUEST_INFO;
-pub const CERT_KEYGEN_REQUEST_V1: ::DWORD = 0;
-STRUCT!{struct CERT_SIGNED_CONTENT_INFO {
-    ToBeSigned: CRYPT_DER_BLOB,
-    SignatureAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    Signature: CRYPT_BIT_BLOB,
-}}
-pub type PCERT_SIGNED_CONTENT_INFO = *mut CERT_SIGNED_CONTENT_INFO;
-STRUCT!{struct CTL_USAGE {
-    cUsageIdentifier: ::DWORD,
-    rgpszUsageIdentifier: *mut ::LPSTR,
-}}
-pub type PCTL_USAGE = *mut CTL_USAGE;
-pub type CERT_ENHKEY_USAGE = CTL_USAGE;
-pub type PCERT_ENHKEY_USAGE = *mut CERT_ENHKEY_USAGE;
-pub type PCCTL_USAGE = *const CTL_USAGE;
-pub type PCCERT_ENHKEY_USAGE = *const CERT_ENHKEY_USAGE;
-STRUCT!{struct CTL_ENTRY {
-    SubjectIdentifier: CRYPT_DATA_BLOB,
-    cAttribute: ::DWORD,
-    rgAttribute: PCRYPT_ATTRIBUTE,
-}}
-pub type PCTL_ENTRY = *mut CTL_ENTRY;
-STRUCT!{struct CTL_INFO {
-    dwVersion: ::DWORD,
-    SubjectUsage: CTL_USAGE,
-    ListIdentifier: CRYPT_DATA_BLOB,
-    SequenceNumber: CRYPT_INTEGER_BLOB,
-    ThisUpdate: ::FILETIME,
-    NextUpdate: ::FILETIME,
-    SubjectAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    cCTLEntry: ::DWORD,
-    rgCTLEntry: PCTL_ENTRY,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCTL_INFO = *mut CTL_INFO;
-pub const CTL_V1: ::DWORD = 0;
-STRUCT!{struct CRYPT_TIME_STAMP_REQUEST_INFO {
-    pszTimeStampAlgorithm: ::LPSTR,
-    pszContentType: ::LPSTR,
-    Content: CRYPT_OBJID_BLOB,
-    cAttribute: ::DWORD,
-    rgAttribute: PCRYPT_ATTRIBUTE,
-}}
-pub type PCRYPT_TIME_STAMP_REQUEST_INFO = *mut CRYPT_TIME_STAMP_REQUEST_INFO;
-STRUCT!{struct CRYPT_ENROLLMENT_NAME_VALUE_PAIR {
-    pwszName: ::LPWSTR,
-    pwszValue: ::LPWSTR,
-}}
-pub type PCRYPT_ENROLLMENT_NAME_VALUE_PAIR = *mut CRYPT_ENROLLMENT_NAME_VALUE_PAIR;
-STRUCT!{struct CRYPT_CSP_PROVIDER {
-    dwKeySpec: ::DWORD,
-    pwszProviderName: ::LPWSTR,
-    Signature: CRYPT_BIT_BLOB,
-}}
-pub type PCRYPT_CSP_PROVIDER = *mut CRYPT_CSP_PROVIDER;
-pub const CERT_ENCODING_TYPE_MASK: ::DWORD = 0x0000FFFF;
-pub const CMSG_ENCODING_TYPE_MASK: ::DWORD = 0xFFFF0000;
-pub const CRYPT_ASN_ENCODING: ::DWORD = 0x00000001;
-pub const CRYPT_NDR_ENCODING: ::DWORD = 0x00000002;
-pub const X509_ASN_ENCODING: ::DWORD = 0x00000001;
-pub const X509_NDR_ENCODING: ::DWORD = 0x00000002;
-pub const PKCS_7_ASN_ENCODING: ::DWORD = 0x00010000;
-pub const PKCS_7_NDR_ENCODING: ::DWORD = 0x00020000;
-pub const CRYPT_FORMAT_STR_MULTI_LINE: ::DWORD = 0x0001;
-pub const CRYPT_FORMAT_STR_NO_HEX: ::DWORD = 0x0010;
-pub const CRYPT_FORMAT_SIMPLE: ::DWORD = 0x0001;
-pub const CRYPT_FORMAT_X509: ::DWORD = 0x0002;
-pub const CRYPT_FORMAT_OID: ::DWORD = 0x0004;
-pub const CRYPT_FORMAT_RDN_SEMICOLON: ::DWORD = 0x0100;
-pub const CRYPT_FORMAT_RDN_CRLF: ::DWORD = 0x0200;
-pub const CRYPT_FORMAT_RDN_UNQUOTE: ::DWORD = 0x0400;
-pub const CRYPT_FORMAT_RDN_REVERSE: ::DWORD = 0x0800;
-pub const CRYPT_FORMAT_COMMA: ::DWORD = 0x1000;
-pub const CRYPT_FORMAT_SEMICOLON: ::DWORD = CRYPT_FORMAT_RDN_SEMICOLON;
-pub const CRYPT_FORMAT_CRLF: ::DWORD = CRYPT_FORMAT_RDN_CRLF;
-pub type PFN_CRYPT_ALLOC = Option<unsafe extern "system" fn(cbSize: ::size_t)>;
-pub type PFN_CRYPT_FREE = Option<unsafe extern "system" fn(pv: ::LPVOID)>;
-STRUCT!{nodebug struct CRYPT_ENCODE_PARA {
-    cbSize: ::DWORD,
-    pfnAlloc: PFN_CRYPT_ALLOC,
-    pfnFree: PFN_CRYPT_FREE,
-}}
-pub type PCRYPT_ENCODE_PARA = *mut CRYPT_ENCODE_PARA;
-pub const CRYPT_ENCODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG: ::DWORD = 0x8;
-pub const CRYPT_ENCODE_ALLOC_FLAG: ::DWORD = 0x8000;
-pub const CRYPT_UNICODE_NAME_ENCODE_ENABLE_T61_UNICODE_FLAG: ::DWORD =
-    CERT_RDN_ENABLE_T61_UNICODE_FLAG;
-pub const CRYPT_UNICODE_NAME_ENCODE_ENABLE_UTF8_UNICODE_FLAG: ::DWORD =
-    CERT_RDN_ENABLE_UTF8_UNICODE_FLAG;
-pub const CRYPT_UNICODE_NAME_ENCODE_FORCE_UTF8_UNICODE_FLAG: ::DWORD =
-    CERT_RDN_FORCE_UTF8_UNICODE_FLAG;
-pub const CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG: ::DWORD =
-    CERT_RDN_DISABLE_CHECK_TYPE_FLAG;
-pub const CRYPT_SORTED_CTL_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG: ::DWORD = 0x10000;
-pub const CRYPT_ENCODE_ENABLE_PUNYCODE_FLAG: ::DWORD = 0x20000;
-pub const CRYPT_ENCODE_ENABLE_UTF8PERCENT_FLAG: ::DWORD = 0x40000;
-pub const CRYPT_ENCODE_ENABLE_IA5CONVERSION_FLAG: ::DWORD = CRYPT_ENCODE_ENABLE_PUNYCODE_FLAG
-    | CRYPT_ENCODE_ENABLE_UTF8PERCENT_FLAG;
-STRUCT!{nodebug struct CRYPT_DECODE_PARA {
-    cbSize: ::DWORD,
-    pfnAlloc: PFN_CRYPT_ALLOC,
-    pfnFree: PFN_CRYPT_FREE,
-}}
-pub type PCRYPT_DECODE_PARA = *mut CRYPT_DECODE_PARA;
-pub const CRYPT_DECODE_NOCOPY_FLAG: ::DWORD = 0x1;
-pub const CRYPT_DECODE_TO_BE_SIGNED_FLAG: ::DWORD = 0x2;
-pub const CRYPT_DECODE_SHARE_OID_STRING_FLAG: ::DWORD = 0x4;
-pub const CRYPT_DECODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG: ::DWORD = 0x8;
-pub const CRYPT_DECODE_ALLOC_FLAG: ::DWORD = 0x8000;
-pub const CRYPT_UNICODE_NAME_DECODE_DISABLE_IE4_UTF8_FLAG: ::DWORD =
-    CERT_RDN_DISABLE_IE4_UTF8_FLAG;
-pub const CRYPT_DECODE_ENABLE_PUNYCODE_FLAG: ::DWORD = 0x02000000;
-pub const CRYPT_DECODE_ENABLE_UTF8PERCENT_FLAG: ::DWORD = 0x04000000;
-pub const CRYPT_DECODE_ENABLE_IA5CONVERSION_FLAG: ::DWORD = CRYPT_DECODE_ENABLE_PUNYCODE_FLAG
-    | CRYPT_DECODE_ENABLE_UTF8PERCENT_FLAG;
-pub const CRYPT_ENCODE_DECODE_NONE: ::LPCSTR = 0 as ::LPCSTR;
-pub const X509_CERT: ::LPCSTR = 1 as ::LPCSTR;
-pub const X509_CERT_TO_BE_SIGNED: ::LPCSTR = 2 as ::LPCSTR;
-pub const X509_CERT_CRL_TO_BE_SIGNED: ::LPCSTR = 3 as ::LPCSTR;
-pub const X509_CERT_REQUEST_TO_BE_SIGNED: ::LPCSTR = 4 as ::LPCSTR;
-pub const X509_EXTENSIONS: ::LPCSTR = 5 as ::LPCSTR;
-pub const X509_NAME_VALUE: ::LPCSTR = 6 as ::LPCSTR;
-pub const X509_NAME: ::LPCSTR = 7 as ::LPCSTR;
-pub const X509_PUBLIC_KEY_INFO: ::LPCSTR = 8 as ::LPCSTR;
-pub const X509_AUTHORITY_KEY_ID: ::LPCSTR = 9 as ::LPCSTR;
-pub const X509_KEY_ATTRIBUTES: ::LPCSTR = 10 as ::LPCSTR;
-pub const X509_KEY_USAGE_RESTRICTION: ::LPCSTR = 11 as ::LPCSTR;
-pub const X509_ALTERNATE_NAME: ::LPCSTR = 12 as ::LPCSTR;
-pub const X509_BASIC_CONSTRAINTS: ::LPCSTR = 13 as ::LPCSTR;
-pub const X509_KEY_USAGE: ::LPCSTR = 14 as ::LPCSTR;
-pub const X509_BASIC_CONSTRAINTS2: ::LPCSTR = 15 as ::LPCSTR;
-pub const X509_CERT_POLICIES: ::LPCSTR = 16 as ::LPCSTR;
-pub const PKCS_UTC_TIME: ::LPCSTR = 17 as ::LPCSTR;
-pub const PKCS_TIME_REQUEST: ::LPCSTR = 18 as ::LPCSTR;
-pub const RSA_CSP_PUBLICKEYBLOB: ::LPCSTR = 19 as ::LPCSTR;
-pub const X509_UNICODE_NAME: ::LPCSTR = 20 as ::LPCSTR;
-pub const X509_KEYGEN_REQUEST_TO_BE_SIGNED: ::LPCSTR = 21 as ::LPCSTR;
-pub const PKCS_ATTRIBUTE: ::LPCSTR = 22 as ::LPCSTR;
-pub const PKCS_CONTENT_INFO_SEQUENCE_OF_ANY: ::LPCSTR = 23 as ::LPCSTR;
-pub const X509_UNICODE_NAME_VALUE: ::LPCSTR = 24 as ::LPCSTR;
-pub const X509_ANY_STRING: ::LPCSTR = X509_NAME_VALUE;
-pub const X509_UNICODE_ANY_STRING: ::LPCSTR = X509_UNICODE_NAME_VALUE;
-pub const X509_OCTET_STRING: ::LPCSTR = 25 as ::LPCSTR;
-pub const X509_BITS: ::LPCSTR = 26 as ::LPCSTR;
-pub const X509_INTEGER: ::LPCSTR = 27 as ::LPCSTR;
-pub const X509_MULTI_BYTE_INTEGER: ::LPCSTR = 28 as ::LPCSTR;
-pub const X509_ENUMERATED: ::LPCSTR = 29 as ::LPCSTR;
-pub const X509_CHOICE_OF_TIME: ::LPCSTR = 30 as ::LPCSTR;
-pub const X509_AUTHORITY_KEY_ID2: ::LPCSTR = 31 as ::LPCSTR;
-pub const X509_AUTHORITY_INFO_ACCESS: ::LPCSTR = 32 as ::LPCSTR;
-pub const X509_SUBJECT_INFO_ACCESS: ::LPCSTR = X509_AUTHORITY_INFO_ACCESS;
-pub const X509_CRL_REASON_CODE: ::LPCSTR = X509_ENUMERATED;
-pub const PKCS_CONTENT_INFO: ::LPCSTR = 33 as ::LPCSTR;
-pub const X509_SEQUENCE_OF_ANY: ::LPCSTR = 34 as ::LPCSTR;
-pub const X509_CRL_DIST_POINTS: ::LPCSTR = 35 as ::LPCSTR;
-pub const X509_ENHANCED_KEY_USAGE: ::LPCSTR = 36 as ::LPCSTR;
-pub const PKCS_CTL: ::LPCSTR = 37 as ::LPCSTR;
-pub const X509_MULTI_BYTE_UINT: ::LPCSTR = 38 as ::LPCSTR;
-pub const X509_DSS_PUBLICKEY: ::LPCSTR = X509_MULTI_BYTE_UINT;
-pub const X509_DSS_PARAMETERS: ::LPCSTR = 39 as ::LPCSTR;
-pub const X509_DSS_SIGNATURE: ::LPCSTR = 40 as ::LPCSTR;
-pub const PKCS_RC2_CBC_PARAMETERS: ::LPCSTR = 41 as ::LPCSTR;
-pub const PKCS_SMIME_CAPABILITIES: ::LPCSTR = 42 as ::LPCSTR;
-pub const X509_QC_STATEMENTS_EXT: ::LPCSTR = 42 as ::LPCSTR;
-pub const PKCS_RSA_PRIVATE_KEY: ::LPCSTR = 43 as ::LPCSTR;
-pub const PKCS_PRIVATE_KEY_INFO: ::LPCSTR = 44 as ::LPCSTR;
-pub const PKCS_ENCRYPTED_PRIVATE_KEY_INFO: ::LPCSTR = 45 as ::LPCSTR;
-pub const X509_PKIX_POLICY_QUALIFIER_USERNOTICE: ::LPCSTR = 46 as ::LPCSTR;
-pub const X509_DH_PUBLICKEY: ::LPCSTR = X509_MULTI_BYTE_UINT;
-pub const X509_DH_PARAMETERS: ::LPCSTR = 47 as ::LPCSTR;
-pub const PKCS_ATTRIBUTES: ::LPCSTR = 48 as ::LPCSTR;
-pub const PKCS_SORTED_CTL: ::LPCSTR = 49 as ::LPCSTR;
-pub const X509_ECC_SIGNATURE: ::LPCSTR = 47 as ::LPCSTR;
-pub const X942_DH_PARAMETERS: ::LPCSTR = 50 as ::LPCSTR;
-pub const X509_BITS_WITHOUT_TRAILING_ZEROES: ::LPCSTR = 51 as ::LPCSTR;
-pub const X942_OTHER_INFO: ::LPCSTR = 52 as ::LPCSTR;
-pub const X509_CERT_PAIR: ::LPCSTR = 53 as ::LPCSTR;
-pub const X509_ISSUING_DIST_POINT: ::LPCSTR = 54 as ::LPCSTR;
-pub const X509_NAME_CONSTRAINTS: ::LPCSTR = 55 as ::LPCSTR;
-pub const X509_POLICY_MAPPINGS: ::LPCSTR = 56 as ::LPCSTR;
-pub const X509_POLICY_CONSTRAINTS: ::LPCSTR = 57 as ::LPCSTR;
-pub const X509_CROSS_CERT_DIST_POINTS: ::LPCSTR = 58 as ::LPCSTR;
-pub const CMC_DATA: ::LPCSTR = 59 as ::LPCSTR;
-pub const CMC_RESPONSE: ::LPCSTR = 60 as ::LPCSTR;
-pub const CMC_STATUS: ::LPCSTR = 61 as ::LPCSTR;
-pub const CMC_ADD_EXTENSIONS: ::LPCSTR = 62 as ::LPCSTR;
-pub const CMC_ADD_ATTRIBUTES: ::LPCSTR = 63 as ::LPCSTR;
-pub const X509_CERTIFICATE_TEMPLATE: ::LPCSTR = 64 as ::LPCSTR;
-pub const OCSP_SIGNED_REQUEST: ::LPCSTR = 65 as ::LPCSTR;
-pub const OCSP_REQUEST: ::LPCSTR = 66 as ::LPCSTR;
-pub const OCSP_RESPONSE: ::LPCSTR = 67 as ::LPCSTR;
-pub const OCSP_BASIC_SIGNED_RESPONSE: ::LPCSTR = 68 as ::LPCSTR;
-pub const OCSP_BASIC_RESPONSE: ::LPCSTR = 69 as ::LPCSTR;
-pub const X509_LOGOTYPE_EXT: ::LPCSTR = 70 as ::LPCSTR;
-pub const X509_BIOMETRIC_EXT: ::LPCSTR = 71 as ::LPCSTR;
-pub const CNG_RSA_PUBLIC_KEY_BLOB: ::LPCSTR = 72 as ::LPCSTR;
-pub const X509_OBJECT_IDENTIFIER: ::LPCSTR = 73 as ::LPCSTR;
-pub const X509_ALGORITHM_IDENTIFIER: ::LPCSTR = 74 as ::LPCSTR;
-pub const PKCS_RSA_SSA_PSS_PARAMETERS: ::LPCSTR = 75 as ::LPCSTR;
-pub const PKCS_RSAES_OAEP_PARAMETERS: ::LPCSTR = 76 as ::LPCSTR;
-pub const ECC_CMS_SHARED_INFO: ::LPCSTR = 77 as ::LPCSTR;
-pub const TIMESTAMP_REQUEST: ::LPCSTR = 78 as ::LPCSTR;
-pub const TIMESTAMP_RESPONSE: ::LPCSTR = 79 as ::LPCSTR;
-pub const TIMESTAMP_INFO: ::LPCSTR = 80 as ::LPCSTR;
-pub const X509_CERT_BUNDLE: ::LPCSTR = 81 as ::LPCSTR;
-pub const X509_ECC_PRIVATE_KEY: ::LPCSTR = 82 as ::LPCSTR;
-pub const CNG_RSA_PRIVATE_KEY_BLOB: ::LPCSTR = 83 as ::LPCSTR;
-pub const X509_SUBJECT_DIR_ATTRS: ::LPCSTR = 84 as ::LPCSTR;
-pub const PKCS7_SIGNER_INFO: ::LPCSTR = 500 as ::LPCSTR;
-pub const CMS_SIGNER_INFO: ::LPCSTR = 501 as ::LPCSTR;
-pub const szOID_AUTHORITY_KEY_IDENTIFIER: &'static str = "2.5.29.1";
-pub const szOID_KEY_ATTRIBUTES: &'static str = "2.5.29.2";
-pub const szOID_CERT_POLICIES_95: &'static str = "2.5.29.3";
-pub const szOID_KEY_USAGE_RESTRICTION: &'static str = "2.5.29.4";
-pub const szOID_SUBJECT_ALT_NAME: &'static str = "2.5.29.7";
-pub const szOID_ISSUER_ALT_NAME: &'static str = "2.5.29.8";
-pub const szOID_BASIC_CONSTRAINTS: &'static str = "2.5.29.10";
-pub const szOID_KEY_USAGE: &'static str = "2.5.29.15";
-pub const szOID_PRIVATEKEY_USAGE_PERIOD: &'static str = "2.5.29.16";
-pub const szOID_BASIC_CONSTRAINTS2: &'static str = "2.5.29.19";
-pub const szOID_CERT_POLICIES: &'static str = "2.5.29.32";
-pub const szOID_ANY_CERT_POLICY: &'static str = "2.5.29.32.0";
-pub const szOID_INHIBIT_ANY_POLICY: &'static str = "2.5.29.54";
-pub const szOID_AUTHORITY_KEY_IDENTIFIER2: &'static str = "2.5.29.35";
-pub const szOID_SUBJECT_KEY_IDENTIFIER: &'static str = "2.5.29.14";
-pub const szOID_SUBJECT_ALT_NAME2: &'static str = "2.5.29.17";
-pub const szOID_ISSUER_ALT_NAME2: &'static str = "2.5.29.18";
-pub const szOID_CRL_REASON_CODE: &'static str = "2.5.29.21";
-pub const szOID_REASON_CODE_HOLD: &'static str = "2.5.29.23";
-pub const szOID_CRL_DIST_POINTS: &'static str = "2.5.29.31";
-pub const szOID_ENHANCED_KEY_USAGE: &'static str = "2.5.29.37";
-pub const szOID_ANY_ENHANCED_KEY_USAGE: &'static str = "2.5.29.37.0";
-pub const szOID_CRL_NUMBER: &'static str = "2.5.29.20";
-pub const szOID_DELTA_CRL_INDICATOR: &'static str = "2.5.29.27";
-pub const szOID_ISSUING_DIST_POINT: &'static str = "2.5.29.28";
-pub const szOID_FRESHEST_CRL: &'static str = "2.5.29.46";
-pub const szOID_NAME_CONSTRAINTS: &'static str = "2.5.29.30";
-pub const szOID_POLICY_MAPPINGS: &'static str = "2.5.29.33";
-pub const szOID_LEGACY_POLICY_MAPPINGS: &'static str = "2.5.29.5";
-pub const szOID_POLICY_CONSTRAINTS: &'static str = "2.5.29.36";
-pub const szOID_RENEWAL_CERTIFICATE: &'static str = "1.3.6.1.4.1.311.13.1";
-pub const szOID_ENROLLMENT_NAME_VALUE_PAIR: &'static str = "1.3.6.1.4.1.311.13.2.1";
-pub const szOID_ENROLLMENT_CSP_PROVIDER: &'static str = "1.3.6.1.4.1.311.13.2.2";
-pub const szOID_OS_VERSION: &'static str = "1.3.6.1.4.1.311.13.2.3";
-pub const szOID_ENROLLMENT_AGENT: &'static str = "1.3.6.1.4.1.311.20.2.1";
-pub const szOID_PKIX: &'static str = "1.3.6.1.5.5.7";
-pub const szOID_PKIX_PE: &'static str = "1.3.6.1.5.5.7.1";
-pub const szOID_AUTHORITY_INFO_ACCESS: &'static str = "1.3.6.1.5.5.7.1.1";
-pub const szOID_SUBJECT_INFO_ACCESS: &'static str = "1.3.6.1.5.5.7.1.11";
-pub const szOID_BIOMETRIC_EXT: &'static str = "1.3.6.1.5.5.7.1.2";
-pub const szOID_QC_STATEMENTS_EXT: &'static str = "1.3.6.1.5.5.7.1.3";
-pub const szOID_LOGOTYPE_EXT: &'static str = "1.3.6.1.5.5.7.1.12";
-pub const szOID_CERT_EXTENSIONS: &'static str = "1.3.6.1.4.1.311.2.1.14";
-pub const szOID_NEXT_UPDATE_LOCATION: &'static str = "1.3.6.1.4.1.311.10.2";
-pub const szOID_REMOVE_CERTIFICATE: &'static str = "1.3.6.1.4.1.311.10.8.1";
-pub const szOID_CROSS_CERT_DIST_POINTS: &'static str = "1.3.6.1.4.1.311.10.9.1";
-pub const szOID_CTL: &'static str = "1.3.6.1.4.1.311.10.1";
-pub const szOID_SORTED_CTL: &'static str = "1.3.6.1.4.1.311.10.1.1";
-pub const szOID_SERIALIZED: &'static str = "1.3.6.1.4.1.311.10.3.3.1";
-pub const szOID_NT_PRINCIPAL_NAME: &'static str = "1.3.6.1.4.1.311.20.2.3";
-pub const szOID_INTERNATIONALIZED_EMAIL_ADDRESS: &'static str = "1.3.6.1.4.1.311.20.2.4";
-pub const szOID_PRODUCT_UPDATE: &'static str = "1.3.6.1.4.1.311.31.1";
-pub const szOID_ANY_APPLICATION_POLICY: &'static str = "1.3.6.1.4.1.311.10.12.1";
-pub const szOID_AUTO_ENROLL_CTL_USAGE: &'static str = "1.3.6.1.4.1.311.20.1";
-pub const szOID_ENROLL_CERTTYPE_EXTENSION: &'static str = "1.3.6.1.4.1.311.20.2";
-pub const szOID_CERT_MANIFOLD: &'static str = "1.3.6.1.4.1.311.20.3";
-pub const szOID_CERTSRV_CA_VERSION: &'static str = "1.3.6.1.4.1.311.21.1";
-pub const szOID_CERTSRV_PREVIOUS_CERT_HASH: &'static str = "1.3.6.1.4.1.311.21.2";
-pub const szOID_CRL_VIRTUAL_BASE: &'static str = "1.3.6.1.4.1.311.21.3";
-pub const szOID_CRL_NEXT_PUBLISH: &'static str = "1.3.6.1.4.1.311.21.4";
-pub const szOID_KP_CA_EXCHANGE: &'static str = "1.3.6.1.4.1.311.21.5";
-pub const szOID_KP_KEY_RECOVERY_AGENT: &'static str = "1.3.6.1.4.1.311.21.6";
-pub const szOID_CERTIFICATE_TEMPLATE: &'static str = "1.3.6.1.4.1.311.21.7";
-pub const szOID_ENTERPRISE_OID_ROOT: &'static str = "1.3.6.1.4.1.311.21.8";
-pub const szOID_RDN_DUMMY_SIGNER: &'static str = "1.3.6.1.4.1.311.21.9";
-pub const szOID_APPLICATION_CERT_POLICIES: &'static str = "1.3.6.1.4.1.311.21.10";
-pub const szOID_APPLICATION_POLICY_MAPPINGS: &'static str = "1.3.6.1.4.1.311.21.11";
-pub const szOID_APPLICATION_POLICY_CONSTRAINTS: &'static str = "1.3.6.1.4.1.311.21.12";
-pub const szOID_ARCHIVED_KEY_ATTR: &'static str = "1.3.6.1.4.1.311.21.13";
-pub const szOID_CRL_SELF_CDP: &'static str = "1.3.6.1.4.1.311.21.14";
-pub const szOID_REQUIRE_CERT_CHAIN_POLICY: &'static str = "1.3.6.1.4.1.311.21.15";
-pub const szOID_ARCHIVED_KEY_CERT_HASH: &'static str = "1.3.6.1.4.1.311.21.16";
-pub const szOID_ISSUED_CERT_HASH: &'static str = "1.3.6.1.4.1.311.21.17";
-pub const szOID_DS_EMAIL_REPLICATION: &'static str = "1.3.6.1.4.1.311.21.19";
-pub const szOID_REQUEST_CLIENT_INFO: &'static str = "1.3.6.1.4.1.311.21.20";
-pub const szOID_ENCRYPTED_KEY_HASH: &'static str = "1.3.6.1.4.1.311.21.21";
-pub const szOID_CERTSRV_CROSSCA_VERSION: &'static str = "1.3.6.1.4.1.311.21.22";
-pub const szOID_NTDS_REPLICATION: &'static str = "1.3.6.1.4.1.311.25.1";
-pub const szOID_SUBJECT_DIR_ATTRS: &'static str = "2.5.29.9";
-pub const szOID_PKIX_KP: &'static str = "1.3.6.1.5.5.7.3";
-pub const szOID_PKIX_KP_SERVER_AUTH: &'static str = "1.3.6.1.5.5.7.3.1";
-pub const szOID_PKIX_KP_CLIENT_AUTH: &'static str = "1.3.6.1.5.5.7.3.2";
-pub const szOID_PKIX_KP_CODE_SIGNING: &'static str = "1.3.6.1.5.5.7.3.3";
-pub const szOID_PKIX_KP_EMAIL_PROTECTION: &'static str = "1.3.6.1.5.5.7.3.4";
-pub const szOID_PKIX_KP_IPSEC_END_SYSTEM: &'static str = "1.3.6.1.5.5.7.3.5";
-pub const szOID_PKIX_KP_IPSEC_TUNNEL: &'static str = "1.3.6.1.5.5.7.3.6";
-pub const szOID_PKIX_KP_IPSEC_USER: &'static str = "1.3.6.1.5.5.7.3.7";
-pub const szOID_PKIX_KP_TIMESTAMP_SIGNING: &'static str = "1.3.6.1.5.5.7.3.8";
-pub const szOID_PKIX_KP_OCSP_SIGNING: &'static str = "1.3.6.1.5.5.7.3.9";
-pub const szOID_PKIX_OCSP_NOCHECK: &'static str = "1.3.6.1.5.5.7.48.1.5";
-pub const szOID_PKIX_OCSP_NONCE: &'static str = "1.3.6.1.5.5.7.48.1.2";
-pub const szOID_IPSEC_KP_IKE_INTERMEDIATE: &'static str = "1.3.6.1.5.5.8.2.2";
-pub const szOID_PKINIT_KP_KDC: &'static str = "1.3.6.1.5.2.3.5";
-pub const szOID_KP_CTL_USAGE_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.1";
-pub const szOID_KP_TIME_STAMP_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.2";
-pub const szOID_SERVER_GATED_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.3";
-pub const szOID_SGC_NETSCAPE: &'static str = "2.16.840.1.113730.4.1";
-pub const szOID_KP_EFS: &'static str = "1.3.6.1.4.1.311.10.3.4";
-pub const szOID_EFS_RECOVERY: &'static str = "1.3.6.1.4.1.311.10.3.4.1";
-pub const szOID_WHQL_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.5";
-pub const szOID_NT5_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.6";
-pub const szOID_OEM_WHQL_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.7";
-pub const szOID_EMBEDDED_NT_CRYPTO: &'static str = "1.3.6.1.4.1.311.10.3.8";
-pub const szOID_ROOT_LIST_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.9";
-pub const szOID_KP_QUALIFIED_SUBORDINATION: &'static str = "1.3.6.1.4.1.311.10.3.10";
-pub const szOID_KP_KEY_RECOVERY: &'static str = "1.3.6.1.4.1.311.10.3.11";
-pub const szOID_KP_DOCUMENT_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.12";
-pub const szOID_KP_LIFETIME_SIGNING: &'static str = "1.3.6.1.4.1.311.10.3.13";
-pub const szOID_KP_MOBILE_DEVICE_SOFTWARE: &'static str = "1.3.6.1.4.1.311.10.3.14";
-pub const szOID_KP_SMART_DISPLAY: &'static str = "1.3.6.1.4.1.311.10.3.15";
-pub const szOID_KP_CSP_SIGNATURE: &'static str = "1.3.6.1.4.1.311.10.3.16";
-pub const szOID_DRM: &'static str = "1.3.6.1.4.1.311.10.5.1";
-pub const szOID_DRM_INDIVIDUALIZATION: &'static str = "1.3.6.1.4.1.311.10.5.2";
-pub const szOID_LICENSES: &'static str = "1.3.6.1.4.1.311.10.6.1";
-pub const szOID_LICENSE_SERVER: &'static str = "1.3.6.1.4.1.311.10.6.2";
-pub const szOID_KP_SMARTCARD_LOGON: &'static str = "1.3.6.1.4.1.311.20.2.2";
-pub const szOID_KP_KERNEL_MODE_CODE_SIGNING: &'static str = "1.3.6.1.4.1.311.61.1.1";
-pub const szOID_KP_KERNEL_MODE_TRUSTED_BOOT_SIGNING: &'static str = "1.3.6.1.4.1.311.61.4.1";
-pub const szOID_REVOKED_LIST_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.19";
-pub const szOID_WINDOWS_KITS_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.20";
-pub const szOID_WINDOWS_RT_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.21";
-pub const szOID_PROTECTED_PROCESS_LIGHT_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.22";
-pub const szOID_WINDOWS_TCB_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.23";
-pub const szOID_PROTECTED_PROCESS_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.24";
-pub const szOID_WINDOWS_THIRD_PARTY_COMPONENT_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.25";
-pub const szOID_WINDOWS_SOFTWARE_EXTENSION_SIGNER: &'static str = "1.3.6.1.4.1.311.10.3.26";
-pub const szOID_DISALLOWED_LIST: &'static str = "1.3.6.1.4.1.311.10.3.30";
-pub const szOID_SYNC_ROOT_CTL_EXT: &'static str = "1.3.6.1.4.1.311.10.3.50";
-pub const szOID_KP_KERNEL_MODE_HAL_EXTENSION_SIGNING: &'static str = "1.3.6.1.4.1.311.61.5.1";
-pub const szOID_WINDOWS_STORE_SIGNER: &'static str = "1.3.6.1.4.1.311.76.3.1";
-pub const szOID_DYNAMIC_CODE_GEN_SIGNER: &'static str = "1.3.6.1.4.1.311.76.5.1";
-pub const szOID_MICROSOFT_PUBLISHER_SIGNER: &'static str = "1.3.6.1.4.1.311.76.8.1";
-pub const szOID_YESNO_TRUST_ATTR: &'static str = "1.3.6.1.4.1.311.10.4.1";
-pub const szOID_PKIX_POLICY_QUALIFIER_CPS: &'static str = "1.3.6.1.5.5.7.2.1";
-pub const szOID_PKIX_POLICY_QUALIFIER_USERNOTICE: &'static str = "1.3.6.1.5.5.7.2.2";
-pub const szOID_ROOT_PROGRAM_FLAGS: &'static str = "1.3.6.1.4.1.311.60.1.1";
-//6992
-pub type HCRYPTMSG = *mut ::c_void;
-//9353
-pub type HCERTSTORE = *mut ::c_void;
-STRUCT!{struct CERT_CONTEXT {
-    dwCertEncodingType: ::DWORD,
-    pbCertEncoded: *mut ::BYTE,
-    cbCertEncoded: ::DWORD,
-    pCertInfo: ::PCERT_INFO,
-    hCertStore: HCERTSTORE,
-}}
-pub type PCERT_CONTEXT = *mut CERT_CONTEXT;
-pub type PCCERT_CONTEXT = *const CERT_CONTEXT;
-STRUCT!{struct CRL_CONTEXT {
-    dwCertEncodingType: ::DWORD,
-    pbCrlEncoded: *mut ::BYTE,
-    cbCrlEncoded: ::DWORD,
-    pCrlInfo: ::PCRL_INFO,
-    hCertStore: HCERTSTORE,
-}}
-pub type PCRL_CONTEXT = *mut CRL_CONTEXT;
-pub type PCCRL_CONTEXT = *const CRL_CONTEXT;
-STRUCT!{struct CTL_CONTEXT {
-    dwMsgAndCertEncodingType: ::DWORD,
-    pbCtlEncoded: *mut ::BYTE,
-    cbCtlEncoded: ::DWORD,
-    pCtlInfo: ::PCTL_INFO,
-    hCertStore: HCERTSTORE,
-    hCryptMsg: HCRYPTMSG,
-    pbCtlContent: *mut ::BYTE,
-    cbCtlContent: ::DWORD,
-}}
-pub type PCTL_CONTEXT = *mut CTL_CONTEXT;
-pub type PCCTL_CONTEXT = *const CTL_CONTEXT;
-pub const CERT_STORE_PROV_MSG: ::DWORD = 1;
-pub const CERT_STORE_PROV_MEMORY: ::DWORD = 2;
-pub const CERT_STORE_PROV_FILE: ::DWORD = 3;
-pub const CERT_STORE_PROV_REG: ::DWORD = 4;
-pub const CERT_STORE_PROV_PKCS7: ::DWORD = 5;
-pub const CERT_STORE_PROV_SERIALIZED: ::DWORD = 6;
-pub const CERT_STORE_PROV_FILENAME_A: ::DWORD = 7;
-pub const CERT_STORE_PROV_FILENAME_W: ::DWORD = 8;
-pub const CERT_STORE_PROV_FILENAME: ::DWORD = CERT_STORE_PROV_FILENAME_W;
-pub const CERT_STORE_PROV_SYSTEM_A: ::DWORD = 9;
-pub const CERT_STORE_PROV_SYSTEM_W: ::DWORD = 10;
-pub const CERT_STORE_PROV_SYSTEM: ::DWORD = CERT_STORE_PROV_SYSTEM_W;
-pub const CERT_STORE_PROV_COLLECTION: ::DWORD = 11;
-pub const CERT_STORE_PROV_SYSTEM_REGISTRY_A: ::DWORD = 12;
-pub const CERT_STORE_PROV_SYSTEM_REGISTRY_W: ::DWORD = 13;
-pub const CERT_STORE_PROV_SYSTEM_REGISTRY: ::DWORD = CERT_STORE_PROV_SYSTEM_REGISTRY_W;
-pub const CERT_STORE_PROV_PHYSICAL_W: ::DWORD = 14;
-pub const CERT_STORE_PROV_PHYSICAL: ::DWORD = CERT_STORE_PROV_PHYSICAL_W;
-pub const CERT_STORE_PROV_SMART_CARD_W: ::DWORD = 15;
-pub const CERT_STORE_PROV_SMART_CARD: ::DWORD = CERT_STORE_PROV_SMART_CARD_W;
-pub const CERT_STORE_PROV_LDAP_W: ::DWORD = 16;
-pub const CERT_STORE_PROV_LDAP: ::DWORD = CERT_STORE_PROV_LDAP_W;
-pub const CERT_STORE_NO_CRYPT_RELEASE_FLAG: ::DWORD = 0x00000001;
-pub const CERT_STORE_SET_LOCALIZED_NAME_FLAG: ::DWORD = 0x00000002;
-pub const CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG: ::DWORD = 0x00000004;
-pub const CERT_STORE_DELETE_FLAG: ::DWORD = 0x00000010;
-pub const CERT_STORE_SHARE_STORE_FLAG: ::DWORD = 0x00000040;
-pub const CERT_STORE_SHARE_CONTEXT_FLAG: ::DWORD = 0x00000080;
-pub const CERT_STORE_MANIFOLD_FLAG: ::DWORD = 0x00000100;
-pub const CERT_STORE_ENUM_ARCHIVED_FLAG: ::DWORD = 0x00000200;
-pub const CERT_STORE_UPDATE_KEYID_FLAG: ::DWORD = 0x00000400;
-pub const CERT_STORE_BACKUP_RESTORE_FLAG: ::DWORD = 0x00000800;
-pub const CERT_STORE_READONLY_FLAG: ::DWORD = 0x00008000;
-pub const CERT_STORE_OPEN_EXISTING_FLAG: ::DWORD = 0x00004000;
-pub const CERT_STORE_CREATE_NEW_FLAG: ::DWORD = 0x00002000;
-pub const CERT_STORE_MAXIMUM_ALLOWED_FLAG: ::DWORD = 0x00001000;
-pub const CERT_SYSTEM_STORE_UNPROTECTED_FLAG: ::DWORD = 0x40000000;
-pub const CERT_SYSTEM_STORE_LOCATION_MASK: ::DWORD = 0x00FF0000;
-pub const CERT_SYSTEM_STORE_LOCATION_SHIFT: ::DWORD = 16;
-pub const CERT_SYSTEM_STORE_CURRENT_USER_ID: ::DWORD = 1;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_ID: ::DWORD = 2;
-pub const CERT_SYSTEM_STORE_CURRENT_SERVICE_ID: ::DWORD = 4;
-pub const CERT_SYSTEM_STORE_SERVICES_ID: ::DWORD = 5;
-pub const CERT_SYSTEM_STORE_USERS_ID: ::DWORD = 6;
-pub const CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID: ::DWORD = 7;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID: ::DWORD = 8;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID: ::DWORD = 9;
-pub const CERT_SYSTEM_STORE_CURRENT_USER: ::DWORD = CERT_SYSTEM_STORE_CURRENT_USER_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE: ::DWORD = CERT_SYSTEM_STORE_LOCAL_MACHINE_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_CURRENT_SERVICE: ::DWORD = CERT_SYSTEM_STORE_CURRENT_SERVICE_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_SERVICES: ::DWORD = CERT_SYSTEM_STORE_SERVICES_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_USERS: ::DWORD = CERT_SYSTEM_STORE_USERS_ID
-    << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY: ::DWORD =
-    CERT_SYSTEM_STORE_CURRENT_USER_GROUP_POLICY_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY: ::DWORD =
-    CERT_SYSTEM_STORE_LOCAL_MACHINE_GROUP_POLICY_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE: ::DWORD =
-    CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT;
-pub const CERT_NAME_EMAIL_TYPE: ::DWORD = 1;
-pub const CERT_NAME_RDN_TYPE: ::DWORD = 2;
-pub const CERT_NAME_ATTR_TYPE: ::DWORD = 3;
-pub const CERT_NAME_SIMPLE_DISPLAY_TYPE: ::DWORD = 4;
-pub const CERT_NAME_FRIENDLY_DISPLAY_TYPE: ::DWORD = 5;
-pub const CERT_NAME_DNS_TYPE: ::DWORD = 6;
-pub const CERT_NAME_URL_TYPE: ::DWORD = 7;
-pub const CERT_NAME_UPN_TYPE: ::DWORD = 8;
-pub const CERT_SIMPLE_NAME_STR: ::DWORD = 1;
-pub const CERT_OID_NAME_STR: ::DWORD = 2;
-pub const CERT_X500_NAME_STR: ::DWORD = 3;
-
-pub const CERT_NAME_STR_SEMICOLON_FLAG: ::DWORD = 0x40000000;
-pub const CERT_NAME_STR_NO_PLUS_FLAG: ::DWORD = 0x20000000;
-pub const CERT_NAME_STR_NO_QUOTING_FLAG: ::DWORD = 0x10000000;
-pub const CERT_NAME_STR_CRLF_FLAG: ::DWORD = 0x08000000;
-pub const CERT_NAME_STR_COMMA_FLAG: ::DWORD = 0x04000000;
-pub const CERT_NAME_STR_REVERSE_FLAG: ::DWORD = 0x02000000;
-
-pub const CERT_NAME_ISSUER_FLAG: ::DWORD = 0x1;
-pub const CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG: ::DWORD = 0x00010000;
-pub const CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG: ::DWORD = 0x00020000;
-pub const CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG: ::DWORD = 0x00040000;
-pub const CERT_NAME_STR_FORCE_UTF8_DIR_STR_FLAG: ::DWORD = 0x00080000;
-pub const CERT_DELETE_KEYSET_PROP_ID: ::DWORD = 101;
-pub const CERT_COMPARE_MASK: ::DWORD = 0xFFFF;
-pub const CERT_COMPARE_SHIFT: ::DWORD = 16;
-pub const CERT_COMPARE_ANY: ::DWORD = 0;
-pub const CERT_COMPARE_SHA1_HASH: ::DWORD = 1;
-pub const CERT_COMPARE_NAME: ::DWORD = 2;
-pub const CERT_COMPARE_ATTR: ::DWORD = 3;
-pub const CERT_COMPARE_MD5_HASH: ::DWORD = 4;
-pub const CERT_COMPARE_PROPERTY: ::DWORD = 5;
-pub const CERT_COMPARE_PUBLIC_KEY: ::DWORD = 6;
-pub const CERT_COMPARE_HASH: ::DWORD = CERT_COMPARE_SHA1_HASH;
-pub const CERT_COMPARE_NAME_STR_A: ::DWORD = 7;
-pub const CERT_COMPARE_NAME_STR_W: ::DWORD = 8;
-pub const CERT_COMPARE_KEY_SPEC: ::DWORD = 9;
-pub const CERT_COMPARE_ENHKEY_USAGE: ::DWORD = 10;
-pub const CERT_COMPARE_CTL_USAGE: ::DWORD = CERT_COMPARE_ENHKEY_USAGE;
-pub const CERT_COMPARE_SUBJECT_CERT: ::DWORD = 11;
-pub const CERT_COMPARE_ISSUER_OF: ::DWORD = 12;
-pub const CERT_COMPARE_EXISTING: ::DWORD = 13;
-pub const CERT_COMPARE_SIGNATURE_HASH: ::DWORD = 14;
-pub const CERT_COMPARE_KEY_IDENTIFIER: ::DWORD = 15;
-pub const CERT_COMPARE_CERT_ID: ::DWORD = 16;
-pub const CERT_COMPARE_CROSS_CERT_DIST_POINTS: ::DWORD = 17;
-pub const CERT_COMPARE_PUBKEY_MD5_HASH: ::DWORD = 18;
-pub const CERT_FIND_ANY: ::DWORD = CERT_COMPARE_ANY << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_SHA1_HASH: ::DWORD = CERT_COMPARE_SHA1_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_MD5_HASH: ::DWORD = CERT_COMPARE_MD5_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_SIGNATURE_HASH: ::DWORD = CERT_COMPARE_SIGNATURE_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_KEY_IDENTIFIER: ::DWORD = CERT_COMPARE_KEY_IDENTIFIER << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_HASH: ::DWORD = CERT_FIND_SHA1_HASH;
-pub const CERT_FIND_PROPERTY: ::DWORD = CERT_COMPARE_PROPERTY << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_PUBLIC_KEY: ::DWORD = CERT_COMPARE_PUBLIC_KEY << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_SUBJECT_NAME: ::DWORD = (CERT_COMPARE_NAME << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_SUBJECT_ATTR: ::DWORD = (CERT_COMPARE_ATTR << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_ISSUER_NAME: ::DWORD = (CERT_COMPARE_NAME << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_ISSUER_ATTR: ::DWORD = (CERT_COMPARE_ATTR << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_SUBJECT_STR_A: ::DWORD = (CERT_COMPARE_NAME_STR_A << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_SUBJECT_STR_W: ::DWORD = (CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT)
-    | CERT_INFO_SUBJECT_FLAG;
-pub const CERT_FIND_SUBJECT_STR: ::DWORD = CERT_FIND_SUBJECT_STR_W;
-pub const CERT_FIND_ISSUER_STR_A: ::DWORD = (CERT_COMPARE_NAME_STR_A << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_ISSUER_STR_W: ::DWORD = (CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT)
-    | CERT_INFO_ISSUER_FLAG;
-pub const CERT_FIND_ISSUER_STR: ::DWORD = CERT_FIND_ISSUER_STR_W;
-pub const CERT_FIND_KEY_SPEC: ::DWORD = CERT_COMPARE_KEY_SPEC << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_ENHKEY_USAGE: ::DWORD = CERT_COMPARE_ENHKEY_USAGE << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_CTL_USAGE: ::DWORD = CERT_FIND_ENHKEY_USAGE;
-pub const CERT_FIND_SUBJECT_CERT: ::DWORD = CERT_COMPARE_SUBJECT_CERT << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_ISSUER_OF: ::DWORD = CERT_COMPARE_ISSUER_OF << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_EXISTING: ::DWORD = CERT_COMPARE_EXISTING << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_CERT_ID: ::DWORD = CERT_COMPARE_CERT_ID << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_CROSS_CERT_DIST_POINTS: ::DWORD = CERT_COMPARE_CROSS_CERT_DIST_POINTS
-    << CERT_COMPARE_SHIFT;
-pub const CERT_FIND_PUBKEY_MD5_HASH: ::DWORD = CERT_COMPARE_PUBKEY_MD5_HASH << CERT_COMPARE_SHIFT;
-pub const CERT_ENCIPHER_ONLY_KEY_USAGE: ::DWORD = 0x0001;
-pub const CERT_CRL_SIGN_KEY_USAGE: ::DWORD = 0x0002;
-pub const CERT_KEY_CERT_SIGN_KEY_USAGE: ::DWORD = 0x0004;
-pub const CERT_KEY_AGREEMENT_KEY_USAGE: ::DWORD = 0x0008;
-pub const CERT_DATA_ENCIPHERMENT_KEY_USAGE: ::DWORD = 0x0010;
-pub const CERT_KEY_ENCIPHERMENT_KEY_USAGE: ::DWORD = 0x0020;
-pub const CERT_NON_REPUDIATION_KEY_USAGE: ::DWORD = 0x0040;
-pub const CERT_DIGITAL_SIGNATURE_KEY_USAGE: ::DWORD = 0x0080;
-pub const CERT_DECIPHER_ONLY_KEY_USAGE: ::DWORD = 0x8000;
-pub const CERT_STORE_ADD_NEW: ::DWORD = 1;
-pub const CERT_STORE_ADD_USE_EXISTING: ::DWORD = 2;
-pub const CERT_STORE_ADD_REPLACE_EXISTING: ::DWORD = 3;
-pub const CERT_STORE_ADD_ALWAYS: ::DWORD = 4;
-pub const CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES: ::DWORD = 5;
-pub const CERT_STORE_ADD_NEWER: ::DWORD = 6;
-pub const CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES: ::DWORD = 7;
-pub const CERT_STORE_SAVE_AS_STORE: ::DWORD = 1;
-pub const CERT_STORE_SAVE_AS_PKCS7: ::DWORD = 2;
-pub const CERT_STORE_SAVE_TO_FILE: ::DWORD = 1;
-pub const CERT_STORE_SAVE_TO_MEMORY: ::DWORD = 2;
-pub const CERT_STORE_SAVE_TO_FILENAME_A: ::DWORD = 3;
-pub const CERT_STORE_SAVE_TO_FILENAME_W: ::DWORD = 4;
-pub const CERT_STORE_SAVE_TO_FILENAME: ::DWORD = CERT_STORE_SAVE_TO_FILENAME_W;
-pub const CERT_CA_SUBJECT_FLAG: ::DWORD = 0x80;
-pub const CERT_END_ENTITY_SUBJECT_FLAG: ::DWORD = 0x40;
-pub const CERT_CHAIN_POLICY_BASE: ::DWORD = 1;
-pub const CERT_CHAIN_POLICY_AUTHENTICODE: ::DWORD = 2;
-pub const CERT_CHAIN_POLICY_AUTHENTICODE_TS: ::DWORD = 3;
-pub const CERT_CHAIN_POLICY_SSL: ::DWORD = 4;
-pub const CERT_CHAIN_POLICY_BASIC_CONSTRAINTS: ::DWORD = 5;
-pub const CERT_CHAIN_POLICY_NT_AUTH: ::DWORD = 6;
-pub const CERT_CHAIN_POLICY_MICROSOFT_ROOT: ::DWORD = 7;
-pub const CERT_CHAIN_REVOCATION_CHECK_END_CERT: ::DWORD = 0x10000000;
-pub const CERT_CHAIN_REVOCATION_CHECK_CHAIN: ::DWORD = 0x20000000;
-pub const CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT: ::DWORD = 0x40000000;
-pub const CERT_CHAIN_REVOCATION_CHECK_CACHE_ONLY: ::DWORD = 0x80000000;
-pub const CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT: ::DWORD = 0x08000000;
-pub const CERT_TRUST_NO_ERROR: ::DWORD = 0x00000000;
-pub const CERT_TRUST_IS_NOT_TIME_VALID: ::DWORD = 0x00000001;
-pub const CERT_TRUST_IS_NOT_TIME_NESTED: ::DWORD = 0x00000002;
-pub const CERT_TRUST_IS_REVOKED: ::DWORD = 0x00000004;
-pub const CERT_TRUST_IS_NOT_SIGNATURE_VALID: ::DWORD = 0x00000008;
-pub const CERT_TRUST_IS_NOT_VALID_FOR_USAGE: ::DWORD = 0x00000010;
-pub const CERT_TRUST_IS_UNTRUSTED_ROOT: ::DWORD = 0x00000020;
-pub const CERT_TRUST_REVOCATION_STATUS_UNKNOWN: ::DWORD = 0x00000040;
-pub const CERT_TRUST_IS_CYCLIC: ::DWORD = 0x00000080;
-
-pub const CERT_TRUST_INVALID_EXTENSION: ::DWORD = 0x00000100;
-pub const CERT_TRUST_INVALID_POLICY_CONSTRAINTS: ::DWORD = 0x00000200;
-pub const CERT_TRUST_INVALID_BASIC_CONSTRAINTS: ::DWORD = 0x00000400;
-pub const CERT_TRUST_INVALID_NAME_CONSTRAINTS: ::DWORD = 0x00000800;
-pub const CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT: ::DWORD = 0x00001000;
-pub const CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT: ::DWORD = 0x00002000;
-pub const CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT: ::DWORD = 0x00004000;
-pub const CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT: ::DWORD = 0x00008000;
-
-pub const CERT_TRUST_IS_OFFLINE_REVOCATION: ::DWORD = 0x01000000;
-pub const CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY: ::DWORD = 0x02000000;
-pub const CERT_TRUST_IS_PARTIAL_CHAIN: ::DWORD = 0x00010000;
-pub const CERT_TRUST_CTL_IS_NOT_TIME_VALID: ::DWORD = 0x00020000;
-pub const CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID: ::DWORD = 0x00040000;
-pub const CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE: ::DWORD = 0x00080000;
-pub const CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG: ::DWORD = 0x00000001;
-pub const CERT_CHAIN_POLICY_IGNORE_CTL_NOT_TIME_VALID_FLAG: ::DWORD = 0x00000002;
-pub const CERT_CHAIN_POLICY_IGNORE_NOT_TIME_NESTED_FLAG: ::DWORD = 0x00000004;
-pub const CERT_CHAIN_POLICY_IGNORE_INVALID_BASIC_CONSTRAINTS_FLAG: ::DWORD = 0x00000008;
-
-pub const CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG: ::DWORD = 0x00000010;
-pub const CERT_CHAIN_POLICY_IGNORE_WRONG_USAGE_FLAG: ::DWORD = 0x00000020;
-pub const CERT_CHAIN_POLICY_IGNORE_INVALID_NAME_FLAG: ::DWORD = 0x00000040;
-pub const CERT_CHAIN_POLICY_IGNORE_INVALID_POLICY_FLAG: ::DWORD = 0x00000080;
-
-pub const CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG: ::DWORD = 0x00000100;
-pub const CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG: ::DWORD = 0x00000200;
-pub const CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG: ::DWORD = 0x00000400;
-pub const CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG: ::DWORD = 0x00000800;
-
-pub const CERT_CHAIN_POLICY_IGNORE_ALL_REV_UNKNOWN_FLAGS: ::DWORD =
-        CERT_CHAIN_POLICY_IGNORE_END_REV_UNKNOWN_FLAG |
-        CERT_CHAIN_POLICY_IGNORE_CTL_SIGNER_REV_UNKNOWN_FLAG |
-        CERT_CHAIN_POLICY_IGNORE_CA_REV_UNKNOWN_FLAG |
-        CERT_CHAIN_POLICY_IGNORE_ROOT_REV_UNKNOWN_FLAG;
-pub const CERT_TRUST_HAS_EXACT_MATCH_ISSUER: ::DWORD = 0x00000001;
-pub const CERT_TRUST_HAS_KEY_MATCH_ISSUER: ::DWORD = 0x00000002;
-pub const CERT_TRUST_HAS_NAME_MATCH_ISSUER: ::DWORD = 0x00000004;
-pub const CERT_TRUST_IS_SELF_SIGNED: ::DWORD = 0x00000008;
-pub const CERT_TRUST_HAS_PREFERRED_ISSUER: ::DWORD = 0x00000100;
-pub const CERT_TRUST_HAS_ISSUANCE_CHAIN_POLICY: ::DWORD = 0x00000200;
-pub const CERT_TRUST_HAS_VALID_NAME_CONSTRAINTS: ::DWORD = 0x00000400;
-pub const CERT_TRUST_IS_COMPLEX_CHAIN: ::DWORD = 0x00010000;
-pub const CERT_ALT_NAME_OTHER_NAME: ::DWORD = 1;
-pub const CERT_ALT_NAME_RFC822_NAME: ::DWORD = 2;
-pub const CERT_ALT_NAME_DNS_NAME: ::DWORD = 3;
-pub const CERT_ALT_NAME_X400_ADDRESS: ::DWORD = 4;
-pub const CERT_ALT_NAME_DIRECTORY_NAME: ::DWORD = 5;
-pub const CERT_ALT_NAME_EDI_PARTY_NAME: ::DWORD = 6;
-pub const CERT_ALT_NAME_URL: ::DWORD = 7;
-pub const CERT_ALT_NAME_IP_ADDRESS: ::DWORD = 8;
-pub const CERT_ALT_NAME_REGISTERED_ID: ::DWORD = 9;
-pub const CERT_STORE_CTRL_RESYNC: ::DWORD = 1;
-pub const CERT_STORE_CTRL_NOTIFY_CHANGE: ::DWORD = 2;
-pub const CERT_STORE_CTRL_COMMIT: ::DWORD = 3;
-pub const CERT_STORE_CTRL_AUTO_RESYNC: ::DWORD = 4;
-pub const CERT_STORE_CTRL_CANCEL_NOTIFY: ::DWORD = 5;
-pub const CERT_ID_ISSUER_SERIAL_NUMBER: ::DWORD = 1;
-pub const CERT_ID_KEY_IDENTIFIER: ::DWORD = 2;
-pub const CERT_ID_SHA1_HASH: ::DWORD = 3;
-pub const CERT_KEY_PROV_HANDLE_PROP_ID: ::DWORD = 1;
-pub const CERT_KEY_PROV_INFO_PROP_ID: ::DWORD = 2;
-pub const CERT_SHA1_HASH_PROP_ID: ::DWORD = 3;
-pub const CERT_MD5_HASH_PROP_ID: ::DWORD = 4;
-pub const CERT_HASH_PROP_ID: ::DWORD = CERT_SHA1_HASH_PROP_ID;
-pub const CERT_KEY_CONTEXT_PROP_ID: ::DWORD = 5;
-pub const CERT_KEY_SPEC_PROP_ID: ::DWORD = 6;
-pub const CERT_IE30_RESERVED_PROP_ID: ::DWORD = 7;
-pub const CERT_PUBKEY_HASH_RESERVED_PROP_ID: ::DWORD = 8;
-pub const CERT_ENHKEY_USAGE_PROP_ID: ::DWORD = 9;
-pub const CERT_CTL_USAGE_PROP_ID: ::DWORD = CERT_ENHKEY_USAGE_PROP_ID;
-pub const CERT_NEXT_UPDATE_LOCATION_PROP_ID: ::DWORD = 10;
-pub const CERT_FRIENDLY_NAME_PROP_ID: ::DWORD = 11;
-pub const CERT_PVK_FILE_PROP_ID: ::DWORD = 12;
-pub const CERT_DESCRIPTION_PROP_ID: ::DWORD = 13;
-pub const CERT_ACCESS_STATE_PROP_ID: ::DWORD = 14;
-pub const CERT_SIGNATURE_HASH_PROP_ID: ::DWORD = 15;
-pub const CERT_SMART_CARD_DATA_PROP_ID: ::DWORD = 16;
-pub const CERT_EFS_PROP_ID: ::DWORD = 17;
-pub const CERT_FORTEZZA_DATA_PROP_ID: ::DWORD = 18;
-pub const CERT_ARCHIVED_PROP_ID: ::DWORD = 19;
-pub const CERT_KEY_IDENTIFIER_PROP_ID: ::DWORD = 20;
-pub const CERT_AUTO_ENROLL_PROP_ID: ::DWORD = 21;
-pub const CERT_PUBKEY_ALG_PARA_PROP_ID: ::DWORD = 22;
-pub const CERT_CROSS_CERT_DIST_POINTS_PROP_ID: ::DWORD = 23;
-pub const CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: ::DWORD = 24;
-pub const CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: ::DWORD = 25;
-pub const CERT_ENROLLMENT_PROP_ID: ::DWORD = 26;
-pub const CERT_DATE_STAMP_PROP_ID: ::DWORD = 27;
-pub const CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: ::DWORD = 28;
-pub const CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: ::DWORD = 29;
-pub const CERT_EXTENDED_ERROR_INFO_PROP_ID: ::DWORD = 30;
-pub const CERT_RENEWAL_PROP_ID: ::DWORD = 64;
-pub const CERT_ARCHIVED_KEY_HASH_PROP_ID: ::DWORD = 65;
-pub const CERT_AUTO_ENROLL_RETRY_PROP_ID: ::DWORD = 66;
-pub const CERT_AIA_URL_RETRIEVED_PROP_ID: ::DWORD = 67;
-pub const CERT_AUTHORITY_INFO_ACCESS_PROP_ID: ::DWORD = 68;
-pub const CERT_BACKED_UP_PROP_ID: ::DWORD = 69;
-pub const CERT_OCSP_RESPONSE_PROP_ID: ::DWORD = 70;
-pub const CERT_REQUEST_ORIGINATOR_PROP_ID: ::DWORD = 71;
-pub const CERT_SOURCE_LOCATION_PROP_ID: ::DWORD = 72;
-pub const CERT_SOURCE_URL_PROP_ID: ::DWORD = 73;
-pub const CERT_NEW_KEY_PROP_ID: ::DWORD = 74;
-pub const CERT_OCSP_CACHE_PREFIX_PROP_ID: ::DWORD = 75;
-pub const CERT_SMART_CARD_ROOT_INFO_PROP_ID: ::DWORD = 76;
-pub const CERT_NO_AUTO_EXPIRE_CHECK_PROP_ID: ::DWORD = 77;
-pub const CERT_NCRYPT_KEY_HANDLE_PROP_ID: ::DWORD = 78;
-pub const CERT_HCRYPTPROV_OR_NCRYPT_KEY_HANDLE_PROP_ID: ::DWORD = 79;
-pub const CERT_SUBJECT_INFO_ACCESS_PROP_ID: ::DWORD = 80;
-pub const CERT_CA_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID: ::DWORD = 81;
-pub const CERT_CA_DISABLE_CRL_PROP_ID: ::DWORD = 82;
-pub const CERT_ROOT_PROGRAM_CERT_POLICIES_PROP_ID: ::DWORD = 83;
-pub const CERT_ROOT_PROGRAM_NAME_CONSTRAINTS_PROP_ID: ::DWORD = 84;
-pub const CERT_SUBJECT_OCSP_AUTHORITY_INFO_ACCESS_PROP_ID: ::DWORD = 85;
-pub const CERT_SUBJECT_DISABLE_CRL_PROP_ID: ::DWORD = 86;
-pub const CERT_CEP_PROP_ID: ::DWORD = 87;
-pub const CERT_SIGN_HASH_CNG_ALG_PROP_ID: ::DWORD = 89;
-pub const CERT_SCARD_PIN_ID_PROP_ID: ::DWORD = 90;
-pub const CERT_SCARD_PIN_INFO_PROP_ID: ::DWORD = 91;
-pub const CERT_SUBJECT_PUB_KEY_BIT_LENGTH_PROP_ID: ::DWORD = 92;
-pub const CERT_PUB_KEY_CNG_ALG_BIT_LENGTH_PROP_ID: ::DWORD = 93;
-pub const CERT_ISSUER_PUB_KEY_BIT_LENGTH_PROP_ID: ::DWORD = 94;
-pub const CERT_ISSUER_CHAIN_SIGN_HASH_CNG_ALG_PROP_ID: ::DWORD = 95;
-pub const CERT_ISSUER_CHAIN_PUB_KEY_CNG_ALG_BIT_LENGTH_PROP_ID: ::DWORD = 96;
-pub const CERT_NO_EXPIRE_NOTIFICATION_PROP_ID: ::DWORD = 97;
-pub const CERT_AUTH_ROOT_SHA256_HASH_PROP_ID: ::DWORD = 98;
-pub const CERT_NCRYPT_KEY_HANDLE_TRANSFER_PROP_ID: ::DWORD = 99;
-pub const CERT_HCRYPTPROV_TRANSFER_PROP_ID: ::DWORD = 100;
-pub const CERT_SMART_CARD_READER_PROP_ID: ::DWORD = 101;
-pub const CERT_SEND_AS_TRUSTED_ISSUER_PROP_ID: ::DWORD = 102;
-pub const CERT_KEY_REPAIR_ATTEMPTED_PROP_ID: ::DWORD = 103;
-pub const CERT_DISALLOWED_FILETIME_PROP_ID: ::DWORD = 104;
-pub const CERT_ROOT_PROGRAM_CHAIN_POLICIES_PROP_ID: ::DWORD = 105;
-pub const CERT_SMART_CARD_READER_NON_REMOVABLE_PROP_ID: ::DWORD = 106;
-pub const CERT_SHA256_HASH_PROP_ID: ::DWORD = 107;
-pub const CERT_SCEP_SERVER_CERTS_PROP_ID: ::DWORD = 108;
-pub const CERT_SCEP_RA_SIGNATURE_CERT_PROP_ID: ::DWORD = 109;
-pub const CERT_SCEP_RA_ENCRYPTION_CERT_PROP_ID: ::DWORD = 110;
-pub const CERT_SCEP_CA_CERT_PROP_ID: ::DWORD = 111;
-pub const CERT_SCEP_SIGNER_CERT_PROP_ID: ::DWORD = 112;
-pub const CERT_SCEP_NONCE_PROP_ID: ::DWORD = 113;
-pub const CERT_SCEP_ENCRYPT_HASH_CNG_ALG_PROP_ID: ::DWORD = 114;
-pub const CERT_SCEP_FLAGS_PROP_ID: ::DWORD = 115;
-pub const CERT_SCEP_GUID_PROP_ID: ::DWORD = 116;
-pub const CERT_SERIALIZABLE_KEY_CONTEXT_PROP_ID: ::DWORD = 117;
-pub const CERT_ISOLATED_KEY_PROP_ID: ::DWORD = 118;
-pub const CERT_FIRST_RESERVED_PROP_ID: ::DWORD = 119;
-pub const CERT_LAST_RESERVED_PROP_ID: ::DWORD = 0x00007FFF;
-pub const CERT_FIRST_USER_PROP_ID: ::DWORD = 0x00008000;
-pub const CERT_LAST_USER_PROP_ID: ::DWORD = 0x0000FFFF;
-pub const szOID_CERT_PROP_ID_PREFIX: &'static str = "1.3.6.1.4.1.311.10.11.";
-pub const szOID_CERT_KEY_IDENTIFIER_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.20";
-pub const szOID_CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: &'static str
-    = "1.3.6.1.4.1.311.10.11.28";
-pub const szOID_CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.29";
-pub const szOID_CERT_MD5_HASH_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.4";
-pub const szOID_CERT_SIGNATURE_HASH_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.15";
-pub const szOID_DISALLOWED_HASH: &'static str = szOID_CERT_SIGNATURE_HASH_PROP_ID;
-pub const szOID_CERT_DISALLOWED_FILETIME_PROP_ID: &'static str = "1.3.6.1.4.1.311.10.11.104";
-pub const CERT_ACCESS_STATE_WRITE_PERSIST_FLAG: ::DWORD = 0x1;
-pub const CERT_ACCESS_STATE_SYSTEM_STORE_FLAG: ::DWORD = 0x2;
-pub const CERT_ACCESS_STATE_LM_SYSTEM_STORE_FLAG: ::DWORD = 0x4;
-pub const CERT_ACCESS_STATE_GP_SYSTEM_STORE_FLAG: ::DWORD = 0x8;
-pub const CERT_ACCESS_STATE_SHARED_USER_FLAG: ::DWORD = 0x10;
-pub const szOID_ROOT_PROGRAM_AUTO_UPDATE_CA_REVOCATION: &'static str = "1.3.6.1.4.1.311.60.3.1";
-pub const szOID_ROOT_PROGRAM_AUTO_UPDATE_END_REVOCATION: &'static str = "1.3.6.1.4.1.311.60.3.2";
-pub const szOID_ROOT_PROGRAM_NO_OCSP_FAILOVER_TO_CRL: &'static str = "1.3.6.1.4.1.311.60.3.3";
-STRUCT!{struct CRYPT_KEY_PROV_PARAM {
-    dwParam: ::DWORD,
-    pbData: *mut ::BYTE,
-    cbData: ::DWORD,
-    dwFlags: ::DWORD,
-}}
-pub type PCRYPT_KEY_PROV_PARAM = *mut CRYPT_KEY_PROV_PARAM;
-STRUCT!{struct CRYPT_KEY_PROV_INFO {
-    pwszContainerName: ::LPWSTR,
-    pwszProvName: ::LPWSTR,
-    dwProvType: ::DWORD,
-    dwFlags: ::DWORD,
-    cProvParam: ::DWORD,
-    rgProvParam: PCRYPT_KEY_PROV_PARAM,
-    dwKeySpec: ::DWORD,
-}}
-pub type PCRYPT_KEY_PROV_INFO = *mut CRYPT_KEY_PROV_INFO;
-pub const CERT_SET_KEY_PROV_HANDLE_PROP_ID: ::DWORD = 0x00000001;
-pub const CERT_SET_KEY_CONTEXT_PROP_ID: ::DWORD = 0x00000001;
-pub const CERT_NCRYPT_KEY_SPEC: ::DWORD = 0xFFFFFFFF;
-//20213
-pub type HCERT_SERVER_OCSP_RESPONSE = *mut ::c_void;
-STRUCT!{struct CERT_SERVER_OCSP_RESPONSE_CONTEXT {
-    cbSize: ::DWORD,
-    pbEncodedOcspResponse: *mut ::BYTE,
-    cbEncodedOcspResponse: ::DWORD,
-}}
-pub type PCERT_SERVER_OCSP_RESPONSE_CONTEXT = *mut CERT_SERVER_OCSP_RESPONSE_CONTEXT;
-pub type PCCERT_SERVER_OCSP_RESPONSE_CONTEXT = *const CERT_SERVER_OCSP_RESPONSE_CONTEXT;
-
-pub const CERT_CHAIN_CACHE_END_CERT: ::DWORD = 0x00000001;
-pub const CERT_CHAIN_THREAD_STORE_SYNC: ::DWORD = 0x00000002;
-pub const CERT_CHAIN_CACHE_ONLY_URL_RETRIEVAL: ::DWORD = 0x00000004;
-pub const CERT_CHAIN_USE_LOCAL_MACHINE_STORE: ::DWORD = 0x00000008;
-pub const CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE: ::DWORD = 0x00000010;
-pub const CERT_CHAIN_ENABLE_SHARE_STORE: ::DWORD = 0x00000020;
-
-STRUCT!{struct CERT_CHAIN_ENGINE_CONFIG {
-    cbSize: ::DWORD,
-    hRestrictedRoot: HCERTSTORE,
-    hRestrictedTrust: HCERTSTORE,
-    hRestrictedOther: HCERTSTORE,
-    cAdditionalStore: ::DWORD,
-    rghAdditionalStore: *mut HCERTSTORE,
-    dwFlags: ::DWORD,
-    dwUrlRetrievalTimeout: ::DWORD,
-    MaximumCachedCertificates: ::DWORD,
-    CycleDetectionModulus: ::DWORD,
-    // #if (NTDDI_VERSION >= NTDDI_WIN7)
-    hExclusiveRoot: HCERTSTORE,
-    hExclusiveTrustedPeople: HCERTSTORE,
-    // #if (NTDDI_VERSION >= NTDDI_WIN8)
-    dwExclusiveFlags: ::DWORD,
-}}
-pub type PCERT_CHAIN_ENGINE_CONFIG = *mut CERT_CHAIN_ENGINE_CONFIG;
-// 18748
-pub type HCERTCHAINENGINE = ::HANDLE;
-pub type PFN_CERT_CREATE_CONTEXT_SORT_FUNC = Option<unsafe extern "system" fn(
-    cbTotalEncoded: ::DWORD, cbRemainEncoded: ::DWORD, cEntry: ::DWORD, pvSort: *mut ::c_void
-) -> ::BOOL>;
-STRUCT!{nodebug struct CERT_CREATE_CONTEXT_PARA {
-    cbSize: ::DWORD,
-    pfnFree: PFN_CRYPT_FREE,
-    pvFree: *mut ::c_void,
-    pfnSort: PFN_CERT_CREATE_CONTEXT_SORT_FUNC,
-    pvSort: *mut ::c_void,
-}}
-pub type PCERT_CREATE_CONTEXT_PARA = *mut CERT_CREATE_CONTEXT_PARA;
-STRUCT!{struct CERT_EXTENSIONS {
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCERT_EXTENSIONS = *mut CERT_EXTENSIONS;
-STRUCT!{struct CERT_REVOCATION_CRL_INFO {
-    cbSize: ::DWORD,
-    pBaseCrlContext: PCCRL_CONTEXT,
-    pDeltaCrlContext: PCCRL_CONTEXT,
-    pCrlEntry: PCRL_ENTRY,
-    fDeltaCrlEntry: ::BOOL,
-}}
-pub type PCERT_REVOCATION_CRL_INFO = *mut CERT_REVOCATION_CRL_INFO;
-STRUCT!{struct CERT_TRUST_STATUS {
-    dwErrorStatus: ::DWORD,
-    dwInfoStatus: ::DWORD,
-}}
-pub type PCERT_TRUST_STATUS = *mut CERT_TRUST_STATUS;
-STRUCT!{struct CERT_REVOCATION_INFO {
-    cbSize: ::DWORD,
-    dwRevocationResult: ::DWORD,
-    pszRevocationOid: ::LPCSTR,
-    pvOidSpecificInfo: ::LPVOID,
-    fHasFreshnessTime: ::BOOL,
-    dwFreshnessTime: ::DWORD,
-    pCrlInfo: PCERT_REVOCATION_CRL_INFO,
-}}
-pub type PCERT_REVOCATION_INFO = *mut CERT_REVOCATION_INFO;
-STRUCT!{struct CERT_TRUST_LIST_INFO {
-    cbSize: ::DWORD,
-    pCtlEntry: PCTL_ENTRY,
-    pCtlContext: PCCTL_CONTEXT,
-}}
-pub type PCERT_TRUST_LIST_INFO = *mut CERT_TRUST_LIST_INFO;
-STRUCT!{struct CERT_CHAIN_ELEMENT {
-    cbSize: ::DWORD,
-    pCertContext: PCCERT_CONTEXT,
-    TrustStatus: CERT_TRUST_STATUS,
-    pRevocationInfo: PCERT_REVOCATION_INFO,
-    pIssuanceUsage: PCERT_ENHKEY_USAGE,
-    pApplicationUsage: PCERT_ENHKEY_USAGE,
-    pwszExtendedErrorInfo: ::LPWSTR,
-}}
-pub type PCERT_CHAIN_ELEMENT = *mut CERT_CHAIN_ELEMENT;
-pub type PCCERT_CHAIN_ELEMENT = *const CERT_CHAIN_ELEMENT;
-STRUCT!{struct CERT_SIMPLE_CHAIN {
-    cbSize: ::DWORD,
-    TrustStatus: CERT_TRUST_STATUS,
-    cElement: ::DWORD,
-    rgpElement: *mut PCERT_CHAIN_ELEMENT,
-    pTrustListInfo: PCERT_TRUST_LIST_INFO,
-    fHasRevocationFreshnessTime: ::BOOL,
-    dwRevocationFreshnessTime: ::DWORD,
-}}
-pub type PCERT_SIMPLE_CHAIN = *mut CERT_SIMPLE_CHAIN;
-pub type PCCERT_SIMPLE_CHAIN = *const CERT_SIMPLE_CHAIN;
-STRUCT!{struct CERT_CHAIN_CONTEXT {
-    cbSize: ::DWORD,
-    TrustStatus: CERT_TRUST_STATUS,
-    cChain: ::DWORD,
-    rgpChain: *mut PCERT_SIMPLE_CHAIN,
-    cLowerQualityChainContext: ::DWORD,
-    rgpLowerQualityChainContext: *mut PCCERT_CHAIN_CONTEXT,
-    fHasRevocationFreshnessTime: ::BOOL,
-    dwRevocationFreshnessTime: ::DWORD,
-    dwCreateFlags: ::DWORD,
-    ChainId: ::GUID,
-}}
-pub type PCERT_CHAIN_CONTEXT = *mut CERT_CHAIN_CONTEXT;
-pub type PCCERT_CHAIN_CONTEXT = *const CERT_CHAIN_CONTEXT;
-STRUCT!{struct CERT_PHYSICAL_STORE_INFO {
-    cbSize: ::DWORD,
-    pszOpenStoreProvider: ::LPSTR,
-    dwOpenEncodingType: ::DWORD,
-    dwOpenFlags: ::DWORD,
-    OpenParameters: CRYPT_DATA_BLOB,
-    dwFlags: ::DWORD,
-    dwPriority: ::DWORD,
-}}
-pub type PCERT_PHYSICAL_STORE_INFO = *mut CERT_PHYSICAL_STORE_INFO;
-STRUCT!{struct CERT_SYSTEM_STORE_INFO {
-    cbSize: ::DWORD,
-}}
-pub type PCERT_SYSTEM_STORE_INFO = *mut CERT_SYSTEM_STORE_INFO;
-//13401
-pub type PFN_CERT_ENUM_SYSTEM_STORE_LOCATION = Option<unsafe extern "system" fn(
-    pwszStoreLocation: ::LPCWSTR, dwFlags: ::DWORD, pvReserved: *mut ::c_void, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//13408
-pub type PFN_CERT_ENUM_SYSTEM_STORE = Option<unsafe extern "system" fn(
-    pvSystemStore: *const ::c_void, dwFlags: ::DWORD, pStoreInfo: PCERT_SYSTEM_STORE_INFO,
-    pvReserved: *mut ::c_void, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//13416
-pub type PFN_CERT_ENUM_PHYSICAL_STORE = Option<unsafe extern "system" fn(
-    pvSystemStore: *const ::c_void, dwFlags: ::DWORD, pwszStoreName: ::LPCWSTR,
-    pStoreInfo: PCERT_PHYSICAL_STORE_INFO, pvReserved: *mut ::c_void, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-STRUCT!{struct CERT_STRONG_SIGN_SERIALIZED_INFO {
-    dwFlags: ::DWORD,
-    pwszCNGSignHashAlgids: ::LPWSTR,
-    pwszCNGPubKeyMinBitLengths: ::LPWSTR,
-}}
-pub type PCERT_STRONG_SIGN_SERIALIZED_INFO = *mut CERT_STRONG_SIGN_SERIALIZED_INFO;
-STRUCT!{struct CERT_STRONG_SIGN_PARA {
-    cbSize: ::DWORD,
-    dwInfoChoice: ::DWORD,
-    pvInfo: *mut ::c_void,
-}}
-UNION!(
-    CERT_STRONG_SIGN_PARA, pvInfo, pSerializedInfo, pSerializedInfo_mut,
-    PCERT_STRONG_SIGN_SERIALIZED_INFO
-);
-UNION!(CERT_STRONG_SIGN_PARA, pvInfo, pszOID, pszOID_mut, ::LPSTR);
-pub type PCERT_STRONG_SIGN_PARA = *mut CERT_STRONG_SIGN_PARA;
-pub type PCCERT_STRONG_SIGN_PARA = *const CERT_STRONG_SIGN_PARA;
-pub const USAGE_MATCH_TYPE_AND: ::DWORD = 0x00000000;
-pub const USAGE_MATCH_TYPE_OR: ::DWORD = 0x00000001;
-STRUCT!{struct CERT_USAGE_MATCH {
-    dwType: ::DWORD,
-    Usage: CERT_ENHKEY_USAGE,
-}}
-pub type PCERT_USAGE_MATCH = *mut CERT_USAGE_MATCH;
-STRUCT!{struct CERT_CHAIN_PARA {
-    cbSize: ::DWORD,
-    RequestedUsage: CERT_USAGE_MATCH,
-    RequestedIssuancePolicy: CERT_USAGE_MATCH,
-    dwUrlRetrievalTimeout: ::DWORD,
-    fCheckRevocationFreshnessTime: ::BOOL,
-    dwRevocationFreshnessTime: ::DWORD,
-    pftCacheResync: ::LPFILETIME,
-    pStrongSignPara: PCCERT_STRONG_SIGN_PARA,
-    dwStrongSignFlags: ::DWORD,
-}}
-pub type PCERT_CHAIN_PARA = *mut CERT_CHAIN_PARA;
-STRUCT!{struct CERT_SELECT_CHAIN_PARA {
-    hChainEngine: HCERTCHAINENGINE,
-    pTime: ::PFILETIME,
-    hAdditionalStore: HCERTSTORE,
-    pChainPara: PCERT_CHAIN_PARA,
-    dwFlags: ::DWORD,
-}}
-pub type PCERT_SELECT_CHAIN_PARA = *mut CERT_SELECT_CHAIN_PARA;
-pub type PCCERT_SELECT_CHAIN_PARA = *const CERT_SELECT_CHAIN_PARA;
-STRUCT!{struct CERT_SELECT_CRITERIA {
-    dwType: ::DWORD,
-    cPara: ::DWORD,
-    ppPara: *mut *mut ::c_void,
-}}
-pub type PCERT_SELECT_CRITERIA = *mut CERT_SELECT_CRITERIA;
-pub type PCCERT_SELECT_CRITERIA = *const CERT_SELECT_CRITERIA;
-STRUCT!{struct CTL_VERIFY_USAGE_PARA {
-    cbSize: ::DWORD,
-    ListIdentifier: CRYPT_DATA_BLOB,
-    cCtlStore: ::DWORD,
-    rghCtlStore: *mut HCERTSTORE,
-    cSignerStore: ::DWORD,
-    rghSignerStore: *mut HCERTSTORE,
-}}
-pub type PCTL_VERIFY_USAGE_PARA = *mut CTL_VERIFY_USAGE_PARA;
-STRUCT!{struct CTL_VERIFY_USAGE_STATUS {
-    cbSize: ::DWORD,
-    dwError: ::DWORD,
-    dwFlags: ::DWORD,
-    ppCtl: *mut PCCTL_CONTEXT,
-    dwCtlEntryIndex: ::DWORD,
-    ppSigner: *mut PCCERT_CONTEXT,
-    dwSignerIndex: ::DWORD,
-}}
-pub type PCTL_VERIFY_USAGE_STATUS = *mut CTL_VERIFY_USAGE_STATUS;
-STRUCT!{struct CERT_CHAIN_POLICY_PARA {
-    cbSize: ::DWORD,
-    dwFlags: ::DWORD,
-    pvExtraPolicyPara: *mut ::c_void,
-}}
-pub type PCERT_CHAIN_POLICY_PARA = *mut CERT_CHAIN_POLICY_PARA;
-STRUCT!{struct CERT_CHAIN_POLICY_STATUS {
-    cbSize: ::DWORD,
-    dwError: ::DWORD,
-    lChainIndex: ::LONG,
-    lElementIndex: ::LONG,
-    pvExtraPolicyStatus: *mut ::c_void,
-}}
-pub type PCERT_CHAIN_POLICY_STATUS = *mut CERT_CHAIN_POLICY_STATUS;
-STRUCT!{struct CERT_REVOCATION_CHAIN_PARA {
-    cbSize: ::DWORD,
-    hChainEngine: HCERTCHAINENGINE,
-    hAdditionalStore: HCERTSTORE,
-    dwChainFlags: ::DWORD,
-    dwUrlRetrievalTimeout: ::DWORD,
-    pftCurrentTime: ::LPFILETIME,
-    pftCacheResync: ::LPFILETIME,
-}}
-pub type PCERT_REVOCATION_CHAIN_PARA = *mut CERT_REVOCATION_CHAIN_PARA;
-STRUCT!{struct CERT_REVOCATION_PARA {
-    cbSize: ::DWORD,
-    pIssuerCert: PCCERT_CONTEXT,
-    cCertStore: ::DWORD,
-    rgCertStore: *mut HCERTSTORE,
-    hCrlStore: HCERTSTORE,
-    pftTimeToUse: ::LPFILETIME,
-    dwUrlRetrievalTimeout: ::DWORD,
-    fCheckFreshnessTime: ::BOOL,
-    dwFreshnessTime: ::DWORD,
-    pftCurrentTime: ::LPFILETIME,
-    pCrlInfo: PCERT_REVOCATION_CRL_INFO,
-    pftCacheResync: ::LPFILETIME,
-    pChainPara: PCERT_REVOCATION_CHAIN_PARA,
-}}
-pub type PCERT_REVOCATION_PARA = *mut CERT_REVOCATION_PARA;
-STRUCT!{struct CERT_REVOCATION_STATUS {
-    cbSize: ::DWORD,
-    dwIndex: ::DWORD,
-    dwError: ::DWORD,
-    dwReason: ::DWORD,
-    fHasFreshnessTime: ::BOOL,
-    dwFreshnessTime: ::DWORD,
-}}
-pub type PCERT_REVOCATION_STATUS = *mut CERT_REVOCATION_STATUS;
-//16990
-pub type HCRYPTASYNC = ::HANDLE;
-pub type PHCRYPTASYNC = *mut ::HANDLE;
-STRUCT!{struct CRYPT_ENCRYPT_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-    ContentEncryptionAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvEncryptionAuxInfo: *mut ::c_void,
-    dwFlags: ::DWORD,
-    dwInnerContentType: ::DWORD,
-}}
-pub type PCRYPT_ENCRYPT_MESSAGE_PARA = *mut CRYPT_DECRYPT_MESSAGE_PARA;
-STRUCT!{struct CRYPT_DECRYPT_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgAndCertEncodingType: ::DWORD,
-    cCertStore: ::DWORD,
-    rghCertStore: *mut HCERTSTORE,
-    dwFlags: ::DWORD,
-}}
-pub type PCRYPT_DECRYPT_MESSAGE_PARA = *mut CRYPT_DECRYPT_MESSAGE_PARA;
-pub type PFN_CRYPT_GET_SIGNER_CERTIFICATE = Option<unsafe extern "system" fn(
-    pvGetArg: *mut ::c_void, dwCertEncodingType: ::DWORD, pSignerId: PCERT_INFO,
-    hMsgCertStore: HCERTSTORE,
-) -> PCCERT_CONTEXT>;
-STRUCT!{nodebug struct CRYPT_VERIFY_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgAndCertEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-    pfnGetSignerCertificate: PFN_CRYPT_GET_SIGNER_CERTIFICATE,
-    pvGetArg: *mut ::c_void,
-    pStrongSignPara: PCCERT_STRONG_SIGN_PARA,
-}}
-pub type PCRYPT_VERIFY_MESSAGE_PARA = *mut CRYPT_VERIFY_MESSAGE_PARA;
-STRUCT!{struct CRYPT_OID_INFO {
-    cbSize: ::DWORD,
-    oszOID: ::LPCSTR,
-    pwszName: ::LPCWSTR,
-    dwGroupId: ::DWORD,
-    dwValue: ::DWORD,
-    ExtraInfo: CRYPT_DATA_BLOB,
-    pwszCNGAlgid: ::LPCWSTR,
-    pwszCNGExtraAlgid: ::LPCWSTR,
-}}
-UNION!(CRYPT_OID_INFO, dwValue, Algid, Algid_mut, ALG_ID);
-UNION!(CRYPT_OID_INFO, dwValue, dwLength, dwLength_mut, ::DWORD);
-pub type PCRYPT_OID_INFO = *mut CRYPT_OID_INFO;
-pub type PCCRYPT_OID_INFO = *const CRYPT_OID_INFO;
-//18004
-pub type PFN_CRYPT_ENUM_KEYID_PROP = Option<unsafe extern "system" fn(
-    pKeyIdentifier: *const CRYPT_HASH_BLOB, dwFlags: ::DWORD, pvReserved: *mut ::c_void,
-    pvArg: *mut ::c_void, cProp: ::DWORD, rgdwPropId: *mut ::DWORD, rgpvData: *mut *mut ::c_void,
-    rgcbData: *mut ::DWORD,
-) -> ::BOOL>;
-//6379
-pub type PFN_CRYPT_ENUM_OID_FUNC = Option<unsafe extern "system" fn(
-    dwEncodingType: ::DWORD, pszFuncName: ::LPCSTR, pszOID: ::LPCSTR, cValue: ::DWORD,
-    rgdwValueType: *const ::DWORD, rgpwszValueName: *const ::LPCWSTR,
-    rgpbValueData: *const *const ::BYTE, rgcbValueData: *const ::DWORD, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//6675
-pub type PFN_CRYPT_ENUM_OID_INFO = Option<unsafe extern "system" fn(
-    pInfo: PCCRYPT_OID_INFO, pvArg: *mut ::c_void,
-) -> ::BOOL>;
-//6022
-pub type HCRYPTOIDFUNCSET = *mut ::c_void;
-pub type HCRYPTOIDFUNCADDR = *mut ::c_void;
-pub type PFN_CRYPT_ASYNC_PARAM_FREE_FUNC = Option<unsafe extern "system" fn(
-    pszParamOid: ::LPSTR, pvParam: ::LPVOID,
-)>;
-STRUCT!{struct CRYPT_HASH_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-}}
-pub type PCRYPT_HASH_MESSAGE_PARA = *mut CRYPT_HASH_MESSAGE_PARA;
-//14750
-pub type HCRYPTDEFAULTCONTEXT = *mut ::c_void;
-STRUCT!{struct CRYPT_OID_FUNC_ENTRY {
-    pszOID: ::LPCSTR,
-    pvFuncAddr: *mut ::c_void,
-}}
-pub type PCRYPT_OID_FUNC_ENTRY = *mut CRYPT_OID_FUNC_ENTRY;
-STRUCT!{struct CMSG_SIGNER_ENCODE_INFO {
-    cbSize: ::DWORD,
-    pCertInfo: PCERT_INFO,
-    hCryptProv: HCRYPTPROV,
-    dwKeySpec: ::DWORD,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-    cAuthAttr: ::DWORD,
-    rgAuthAttr: PCRYPT_ATTRIBUTE,
-    cUnauthAttr: ::DWORD,
-    rgUnauthAttr: PCRYPT_ATTRIBUTE,
-}}
-UNION!(CMSG_SIGNER_ENCODE_INFO, hCryptProv, hNCryptKey, hNCryptKey_mut, ::NCRYPT_KEY_HANDLE);
-pub type PCMSG_SIGNER_ENCODE_INFO = *mut CMSG_SIGNER_ENCODE_INFO;
-STRUCT!{struct CMSG_SIGNED_ENCODE_INFO {
-    cbSize: ::DWORD,
-    cSigners: ::DWORD,
-    rgSigners: PCMSG_SIGNER_ENCODE_INFO,
-    cCertEncoded: ::DWORD,
-    rgCertEncoded: PCERT_BLOB,
-    cCrlEncoded: ::DWORD,
-    rgCrlEncoded: PCRL_BLOB,
-}}
-pub type PCMSG_SIGNED_ENCODE_INFO = *mut CMSG_SIGNED_ENCODE_INFO;
-//7393
-pub type PFN_CMSG_STREAM_OUTPUT = Option<unsafe extern "system" fn(
-    pvArg: *const ::c_void, pbData: *mut ::BYTE, cbData: ::DWORD, fFinal: ::BOOL,
-) -> ::BOOL>;
-STRUCT!{nodebug struct CMSG_STREAM_INFO {
-    cbContent: ::DWORD,
-    pfnStreamOutput: PFN_CMSG_STREAM_OUTPUT,
-    pvArg: *mut ::c_void,
-}}
-pub type PCMSG_STREAM_INFO = *mut CMSG_STREAM_INFO;
-STRUCT!{struct CRYPT_TIMESTAMP_ACCURACY {
-    dwSeconds: ::DWORD,
-    dwMillis: ::DWORD,
-    dwMicros: ::DWORD,
-}}
-pub type PCRYPT_TIMESTAMP_ACCURACY = *mut CRYPT_TIMESTAMP_ACCURACY;
-STRUCT!{struct CRYPT_TIMESTAMP_INFO {
-    dwVersion: ::DWORD,
-    pszTSAPolicyId: ::LPSTR,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    HashedMessage: CRYPT_DER_BLOB,
-    SerialNumber: CRYPT_INTEGER_BLOB,
-    ftTime: ::FILETIME,
-    pvAccuracy: PCRYPT_TIMESTAMP_ACCURACY,
-    fOrdering: ::BOOL,
-    Nonce: CRYPT_DER_BLOB,
-    Tsa: CRYPT_DER_BLOB,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRYPT_TIMESTAMP_INFO = *mut CRYPT_TIMESTAMP_INFO;
-STRUCT!{struct CRYPT_TIMESTAMP_CONTEXT {
-    cbEncoded: ::DWORD,
-    pbEncoded: *mut ::BYTE,
-    pTimeStamp: PCRYPT_TIMESTAMP_INFO,
-}}
-pub type PCRYPT_TIMESTAMP_CONTEXT = *mut CRYPT_TIMESTAMP_CONTEXT;
-STRUCT!{struct CRYPT_TIMESTAMP_PARA {
-    pszTSAPolicyId: ::LPCSTR,
-    fRequestCerts: ::BOOL,
-    Nonce: CRYPT_INTEGER_BLOB,
-    cExtension: ::DWORD,
-    rgExtension: PCERT_EXTENSION,
-}}
-pub type PCRYPT_TIMESTAMP_PARA = *mut CRYPT_TIMESTAMP_PARA;
-STRUCT!{struct CRYPT_SIGN_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    pSigningCert: PCCERT_CONTEXT,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-    cMsgCert: ::DWORD,
-    rgpMsgCert: *mut PCCERT_CONTEXT,
-    cMsgCrl: ::DWORD,
-    rgpMsgCrl: *mut PCCRL_CONTEXT,
-    cAuthAttr: ::DWORD,
-    rgAuthAttr: PCRYPT_ATTRIBUTE,
-    cUnauthAttr: ::DWORD,
-    rgUnauthAttr: PCRYPT_ATTRIBUTE,
-    dwFlags: ::DWORD,
-    dwInnerContentType: ::DWORD,
-}}
-pub type PCRYPT_SIGN_MESSAGE_PARA = *mut CRYPT_SIGN_MESSAGE_PARA;
-STRUCT!{struct CRYPT_KEY_SIGN_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgAndCertEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV,
-    dwKeySpec: ::DWORD,
-    HashAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-    pvHashAuxInfo: *mut ::c_void,
-    PubKeyAlgorithm: CRYPT_ALGORITHM_IDENTIFIER,
-}}
-UNION!(CRYPT_KEY_SIGN_MESSAGE_PARA, hCryptProv, hNCryptKey, hNCryptKey_mut, ::NCRYPT_KEY_HANDLE);
-pub type PCRYPT_KEY_SIGN_MESSAGE_PARA = *mut CRYPT_KEY_SIGN_MESSAGE_PARA;
-STRUCT!{struct CRYPT_KEY_VERIFY_MESSAGE_PARA {
-    cbSize: ::DWORD,
-    dwMsgEncodingType: ::DWORD,
-    hCryptProv: HCRYPTPROV_LEGACY,
-}}
-pub type PCRYPT_KEY_VERIFY_MESSAGE_PARA = *mut CRYPT_KEY_VERIFY_MESSAGE_PARA;
-STRUCT!{struct HTTPSPolicyCallbackData {
-	cbSize: ::DWORD,
-	dwAuthType: ::DWORD,
-	fdwChecks: ::DWORD,
-	pwszServerName: *mut ::WCHAR,
-}}
-pub type PHTTPSPolicyCallbackData = *mut HTTPSPolicyCallbackData;
-pub type SSL_EXTRA_CERT_CHAIN_POLICY_PARA = HTTPSPolicyCallbackData;
-pub type PSSL_EXTRA_CERT_CHAIN_POLICY_PARA = *mut HTTPSPolicyCallbackData;
-pub const AUTHTYPE_CLIENT: ::DWORD = 1;
-pub const AUTHTYPE_SERVER: ::DWORD = 2;
-pub const CTL_ENTRY_FROM_PROP_CHAIN_FLAG: ::DWORD = 0x1;
-pub const CMSG_ENCODE_SORTED_CTL_FLAG: ::DWORD = 0x1;
-pub const CMSG_ENCODE_HASHED_SUBJECT_IDENTIFIER_FLAG: ::DWORD = 0x2;
diff --git a/vendor/winapi-0.2.8/src/windef.rs b/vendor/winapi-0.2.8/src/windef.rs
deleted file mode 100644
index 6493b48c1f..0000000000
--- a/vendor/winapi-0.2.8/src/windef.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Basic Windows Type Definitions
-DECLARE_HANDLE!(HWND, HWND__);
-DECLARE_HANDLE!(HHOOK, HHOOK__);
-DECLARE_HANDLE!(HEVENT, HEVENT__);
-pub type HGDIOBJ = *mut ::c_void;
-DECLARE_HANDLE!(HACCEL, HACCEL__);
-DECLARE_HANDLE!(HBITMAP, HBITMAP__);
-DECLARE_HANDLE!(HBRUSH, HBRUSH__);
-DECLARE_HANDLE!(HCOLORSPACE, HCOLORSPACE__);
-DECLARE_HANDLE!(HDC, HDC__);
-DECLARE_HANDLE!(HGLRC, HGLRC__);
-DECLARE_HANDLE!(HDESK, HDESK__);
-DECLARE_HANDLE!(HENHMETAFILE, HENHMETAFILE__);
-DECLARE_HANDLE!(HFONT, HFONT__);
-DECLARE_HANDLE!(HICON, HICON__);
-DECLARE_HANDLE!(HMENU, HMENU__);
-DECLARE_HANDLE!(HPALETTE, HPALETTE__);
-DECLARE_HANDLE!(HPEN, HPEN__);
-DECLARE_HANDLE!(HWINEVENTHOOK, HWINEVENTHOOK__);
-DECLARE_HANDLE!(HMONITOR, HMONITOR__);
-DECLARE_HANDLE!(HUMPD, HUMPD__);
-pub type HCURSOR = HICON;
-pub type COLORREF = ::DWORD;
-pub type LPCOLORREF = *mut ::DWORD;
-STRUCT!{struct RECT {
-    left: ::LONG,
-    top: ::LONG,
-    right: ::LONG,
-    bottom: ::LONG,
-}}
-pub type PRECT = *mut RECT;
-pub type NPRECT = *mut RECT;
-pub type LPRECT = *mut RECT;
-pub type LPCRECT = *const RECT;
-STRUCT!{struct RECTL {
-    left: ::LONG,
-    top: ::LONG,
-    right: ::LONG,
-    bottom: ::LONG,
-}}
-pub type PRECTL = *mut RECTL;
-pub type LPRECTL = *mut RECTL;
-pub type LPCRECTL = *const RECTL;
-STRUCT!{struct POINT {
-    x: ::LONG,
-    y: ::LONG,
-}}
-pub type PPOINT = *mut POINT;
-pub type NPPOINT = *mut POINT;
-pub type LPPOINT = *mut POINT;
-STRUCT!{struct POINTL {
-    x: ::LONG,
-    y: ::LONG,
-}}
-pub type PPOINTL = *mut POINTL;
diff --git a/vendor/winapi-0.2.8/src/windowscodecs.rs b/vendor/winapi-0.2.8/src/windowscodecs.rs
deleted file mode 100644
index 37596264c2..0000000000
--- a/vendor/winapi-0.2.8/src/windowscodecs.rs
+++ /dev/null
@@ -1,363 +0,0 @@
-// Copyright © 2015; Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of wincodec.h
-pub type WICColor = ::UINT32;
-pub type WICInProcPointer = *mut ::BYTE;
-pub type REFWICPixelFormatGUID = ::REFGUID;
-pub type WICPixelFormatGUID = ::GUID;
-STRUCT!{struct WICRect {
-    X: ::INT,
-    Y: ::INT,
-    Width: ::INT,
-    Height: ::INT,
-}}
-ENUM!{enum WICColorContextType {
-    WICColorContextUninitialized = 0,
-    WICColorContextProfile = 0x1,
-    WICColorContextExifColorSpace = 0x2,
-}}
-ENUM!{enum WICBitmapCreateCacheOption {
-    WICBitmapNoCache = 0,
-    WICBitmapCacheOnDemand = 0x1,
-    WICBitmapCacheOnLoad = 0x2,
-}}
-ENUM!{enum WICDecodeOptions {
-    WICDecodeMetadataCacheOnDemand = 0,
-    WICDecodeMetadataCacheOnLoad = 0x1,
-}}
-ENUM!{enum WICBitmapEncoderCacheOption {
-    WICBitmapEncoderCacheInMemory = 0,
-    WICBitmapEncoderCacheTempFile = 0x1,
-    WICBitmapEncoderNoCache = 0x2,
-}}
-FLAGS!{enum WICComponentType {
-    WICDecoder = 0x1,
-    WICEncoder = 0x2,
-    WICPixelFormatConverter = 0x4,
-    WICMetadataReader = 0x8,
-    WICMetadataWriter = 0x10,
-    WICPixelFormat = 0x20,
-    WICAllComponents = 0x3f,
-}}
-FLAGS!{enum WICComponentEnumerateOptions {
-    WICComponentEnumerateDefault = 0,
-    WICComponentEnumerateRefresh = 0x1,
-    WICComponentEnumerateDisabled = 0x80000000,
-    WICComponentEnumerateUnsigned = 0x40000000,
-    WICComponentEnumerateBuiltInOnly = 0x20000000,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICBitmapPattern {
-    Position: ::ULARGE_INTEGER,
-    Length: ::ULONG,
-    Pattern: *mut ::BYTE,
-    Mask: *mut ::BYTE,
-    EndOfStream: ::BOOL,
-}}
-ENUM!{enum WICBitmapInterpolationMode {
-    WICBitmapInterpolationModeNearestNeighbor = 0,
-    WICBitmapInterpolationModeLinear = 0x1,
-    WICBitmapInterpolationModeCubic = 0x2,
-    WICBitmapInterpolationModeFant = 0x3,
-}}
-ENUM!{enum WICBitmapPaletteType {
-    WICBitmapPaletteTypeCustom = 0,
-    WICBitmapPaletteTypeMedianCut = 0x1,
-    WICBitmapPaletteTypeFixedBW = 0x2,
-    WICBitmapPaletteTypeFixedHalftone8 = 0x3,
-    WICBitmapPaletteTypeFixedHalftone27 = 0x4,
-    WICBitmapPaletteTypeFixedHalftone64 = 0x5,
-    WICBitmapPaletteTypeFixedHalftone125 = 0x6,
-    WICBitmapPaletteTypeFixedHalftone216 = 0x7,
-    WICBitmapPaletteTypeFixedHalftone252 = 0x8,
-    WICBitmapPaletteTypeFixedHalftone256 = 0x9,
-    WICBitmapPaletteTypeFixedGray4 = 0xa,
-    WICBitmapPaletteTypeFixedGray16 = 0xb,
-    WICBitmapPaletteTypeFixedGray256 = 0xc,
-}}
-pub const WICBitmapPaletteTypeFixedWebPalette: WICBitmapPaletteType =
-    WICBitmapPaletteTypeFixedHalftone216;
-ENUM!{enum WICBitmapDitherType {
-    WICBitmapDitherTypeSolid = 0,
-    WICBitmapDitherTypeOrdered4x4 = 0x1,
-    WICBitmapDitherTypeOrdered8x8 = 0x2,
-    WICBitmapDitherTypeOrdered16x16 = 0x3,
-    WICBitmapDitherTypeSpiral4x4 = 0x4,
-    WICBitmapDitherTypeSpiral8x8 = 0x5,
-    WICBitmapDitherTypeDualSpiral4x4 = 0x6,
-    WICBitmapDitherTypeDualSpiral8x8 = 0x7,
-    WICBitmapDitherTypeErrorDiffusion = 0x8,
-}}
-pub const WICBitmapDitherTypeNone: WICBitmapDitherType = WICBitmapDitherTypeSolid;
-ENUM!{enum WICBitmapAlphaChannelOption {
-    WICBitmapUseAlpha = 0,
-    WICBitmapUsePremultipliedAlpha = 0x1,
-    WICBitmapIgnoreAlpha = 0x2,
-}}
-FLAGS!{enum WICBitmapTransformOptions {
-    WICBitmapTransformRotate0 = 0,
-    WICBitmapTransformRotate90 = 0x1,
-    WICBitmapTransformRotate180 = 0x2,
-    WICBitmapTransformRotate270 = 0x3,
-    WICBitmapTransformFlipHorizontal = 0x8,
-    WICBitmapTransformFlipVertical = 0x10,
-}}
-FLAGS!{enum WICBitmapLockFlags {
-    WICBitmapLockRead = 0x1,
-    WICBitmapLockWrite = 0x2,
-}}
-FLAGS!{enum WICBitmapDecoderCapabilities {
-    WICBitmapDecoderCapabilitySameEncoder = 0x1,
-    WICBitmapDecoderCapabilityCanDecodeAllImages = 0x2,
-    WICBitmapDecoderCapabilityCanDecodeSomeImages = 0x4,
-    WICBitmapDecoderCapabilityCanEnumerateMetadata = 0x8,
-    WICBitmapDecoderCapabilityCanDecodeThumbnail = 0x10,
-}}
-FLAGS!{enum WICProgressOperation {
-    WICProgressOperationCopyPixels = 0x1,
-    WICProgressOperationWritePixels = 0x2,
-    WICProgressOperationAll = 0xffff,
-}}
-FLAGS!{enum WICProgressNotification {
-    WICProgressNotificationBegin = 0x10000,
-    WICProgressNotificationEnd = 0x20000,
-    WICProgressNotificationFrequent = 0x40000,
-    WICProgressNotificationAll = 0xffff0000,
-}}
-FLAGS!{enum WICComponentSigning {
-    WICComponentSigned = 0x1,
-    WICComponentUnsigned = 0x2,
-    WICComponentSafe = 0x4,
-    WICComponentDisabled = 0x80000000,
-}}
-ENUM!{enum WICGifLogicalScreenDescriptorProperties {
-    WICGifLogicalScreenSignature = 0x1,
-    WICGifLogicalScreenDescriptorWidth = 0x2,
-    WICGifLogicalScreenDescriptorHeight = 0x3,
-    WICGifLogicalScreenDescriptorGlobalColorTableFlag = 0x4,
-    WICGifLogicalScreenDescriptorColorResolution = 0x5,
-    WICGifLogicalScreenDescriptorSortFlag = 0x6,
-    WICGifLogicalScreenDescriptorGlobalColorTableSize = 0x7,
-    WICGifLogicalScreenDescriptorBackgroundColorIndex = 0x8,
-    WICGifLogicalScreenDescriptorPixelAspectRatio = 0x9,
-}}
-ENUM!{enum WICGifImageDescriptorProperties {
-    WICGifImageDescriptorLeft = 0x1,
-    WICGifImageDescriptorTop = 0x2,
-    WICGifImageDescriptorWidth = 0x3,
-    WICGifImageDescriptorHeight = 0x4,
-    WICGifImageDescriptorLocalColorTableFlag = 0x5,
-    WICGifImageDescriptorInterlaceFlag = 0x6,
-    WICGifImageDescriptorSortFlag = 0x7,
-    WICGifImageDescriptorLocalColorTableSize = 0x8,
-}}
-ENUM!{enum WICGifGraphicControlExtensionProperties {
-    WICGifGraphicControlExtensionDisposal = 0x1,
-    WICGifGraphicControlExtensionUserInputFlag = 0x2,
-    WICGifGraphicControlExtensionTransparencyFlag = 0x3,
-    WICGifGraphicControlExtensionDelay = 0x4,
-    WICGifGraphicControlExtensionTransparentColorIndex = 0x5,
-}}
-ENUM!{enum WICGifApplicationExtensionProperties {
-    WICGifApplicationExtensionApplication = 0x1,
-    WICGifApplicationExtensionData = 0x2,
-}}
-ENUM!{enum WICGifCommentExtensionProperties {
-    WICGifCommentExtensionText = 0x1,
-}}
-ENUM!{enum WICJpegCommentProperties {
-    WICJpegCommentText = 0x1,
-}}
-ENUM!{enum WICJpegLuminanceProperties {
-    WICJpegLuminanceTable = 0x1,
-}}
-ENUM!{enum WICJpegChrominanceProperties {
-    WICJpegChrominanceTable = 0x1,
-}}
-ENUM!{enum WIC8BIMIptcProperties {
-    WIC8BIMIptcPString = 0,
-    WIC8BIMIptcEmbeddedIPTC = 0x1,
-}}
-ENUM!{enum WIC8BIMResolutionInfoProperties {
-    WIC8BIMResolutionInfoPString = 0x1,
-    WIC8BIMResolutionInfoHResolution = 0x2,
-    WIC8BIMResolutionInfoHResolutionUnit = 0x3,
-    WIC8BIMResolutionInfoWidthUnit = 0x4,
-    WIC8BIMResolutionInfoVResolution = 0x5,
-    WIC8BIMResolutionInfoVResolutionUnit = 0x6,
-    WIC8BIMResolutionInfoHeightUnit = 0x7,
-}}
-ENUM!{enum WIC8BIMIptcDigestProperties {
-    WIC8BIMIptcDigestPString = 0x1,
-    WIC8BIMIptcDigestIptcDigest = 0x2,
-}}
-ENUM!{enum WICPngGamaProperties {
-    WICPngGamaGamma = 0x1,
-}}
-ENUM!{enum WICPngBkgdProperties {
-    WICPngBkgdBackgroundColor = 0x1,
-}}
-ENUM!{enum WICPngItxtProperties {
-    WICPngItxtKeyword = 0x1,
-    WICPngItxtCompressionFlag = 0x2,
-    WICPngItxtLanguageTag = 0x3,
-    WICPngItxtTranslatedKeyword = 0x4,
-    WICPngItxtText = 0x5,
-}}
-ENUM!{enum WICPngChrmProperties {
-    WICPngChrmWhitePointX = 0x1,
-    WICPngChrmWhitePointY = 0x2,
-    WICPngChrmRedX = 0x3,
-    WICPngChrmRedY = 0x4,
-    WICPngChrmGreenX = 0x5,
-    WICPngChrmGreenY = 0x6,
-    WICPngChrmBlueX = 0x7,
-    WICPngChrmBlueY = 0x8,
-}}
-ENUM!{enum WICPngHistProperties {
-    WICPngHistFrequencies = 0x1,
-}}
-ENUM!{enum WICPngIccpProperties {
-    WICPngIccpProfileName = 0x1,
-    WICPngIccpProfileData = 0x2,
-}}
-ENUM!{enum WICPngSrgbProperties {
-    WICPngSrgbRenderingIntent = 0x1,
-}}
-ENUM!{enum WICPngTimeProperties {
-    WICPngTimeYear = 0x1,
-    WICPngTimeMonth = 0x2,
-    WICPngTimeDay = 0x3,
-    WICPngTimeHour = 0x4,
-    WICPngTimeMinute = 0x5,
-    WICPngTimeSecond = 0x6,
-}}
-ENUM!{enum WICSectionAccessLevel {
-    WICSectionAccessLevelRead = 0x1,
-    WICSectionAccessLevelReadWrite = 0x3,
-}}
-ENUM!{enum WICPixelFormatNumericRepresentation {
-    WICPixelFormatNumericRepresentationUnspecified = 0,
-    WICPixelFormatNumericRepresentationIndexed = 0x1,
-    WICPixelFormatNumericRepresentationUnsignedInteger = 0x2,
-    WICPixelFormatNumericRepresentationSignedInteger = 0x3,
-    WICPixelFormatNumericRepresentationFixed = 0x4,
-    WICPixelFormatNumericRepresentationFloat = 0x5,
-}}
-ENUM!{enum WICPlanarOptions {
-    WICPlanarOptionsDefault = 0,
-    WICPlanarOptionsPreserveSubsampling = 0x1,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICImageParameters {
-    PixelFormat: ::D2D1_PIXEL_FORMAT,
-    DpiX: ::FLOAT,
-    DpiY: ::FLOAT,
-    Top: ::FLOAT,
-    Left: ::FLOAT,
-    PixelWidth: ::FLOAT,
-    PixelHeight: ::FLOAT,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICBitmapPlaneDescription {
-    Format: WICPixelFormatGUID,
-    Width: ::UINT,
-    Height: ::UINT,
-}}
-#[allow(unused_qualifications)]
-STRUCT!{struct WICBitmapPlane {
-    Format: WICPixelFormatGUID,
-    pbBuffer: *mut ::BYTE,
-    cbStride: ::UINT,
-    cbBufferSize: ::UINT,
-}}
-RIDL!(
-interface IWICPalette(IWICPaletteVtbl): IUnknown(IUnknownVtbl) {
-    fn InitializePredefined(
-        &mut self, ePaletteType: WICBitmapPaletteType, fAddTransparentColor: ::BOOL
-    ) -> ::HRESULT,
-    fn InitializeCustom(&mut self, pColors: *mut WICColor, cCount: ::UINT) -> ::HRESULT,
-    fn InitializeFromBitmap(
-        &mut self, pISurface: *mut IWICBitmapSource, cCount: ::UINT, fAddTransparentColor: ::BOOL
-    ) -> ::HRESULT,
-    fn InitializeFromPalette(&mut self, pIPalette: *mut IWICPalette) -> ::HRESULT,
-    fn GetType(&mut self, pePaletteType: *mut WICBitmapPaletteType) -> ::HRESULT,
-    fn GetColorCount(&mut self, pcCount: *mut ::UINT) -> ::HRESULT,
-    fn GetColors(
-        &mut self, cCount: ::UINT, pColros: *mut WICColor, pcActualColors: *mut ::UINT
-    ) -> ::HRESULT,
-    fn IsBlackWhite(&mut self, pfIsBlackWhite: *mut ::BOOL) -> ::HRESULT,
-    fn IsGrayscale(&mut self, pfIsGrayscale: *mut ::BOOL) -> ::HRESULT,
-    fn HasAlpha(&mut self, pfHasAlpha: *mut ::BOOL) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapSource(IWICBitmapSourceVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSize(&mut self, puiWidth: *mut ::UINT, puiHeight: ::UINT) -> ::HRESULT,
-    fn GetPixelFormat(&mut self, pPixelFormat: *mut WICPixelFormatGUID) -> ::HRESULT,
-    fn GetResolution(&mut self, pDpiX: *mut f64, pDpiY: *mut f64) -> ::HRESULT,
-    fn CopyPalette(&mut self, pIPalette: *mut IWICPalette) -> ::HRESULT,
-    fn CopyPixels(
-        &mut self, prc: *const WICRect, cbStride: ::UINT, cbBufferSize: ::UINT,
-        pbBuffer: *mut ::BYTE
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICFormatConverter(IWICFormatConverterVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, pISource: *mut IWICBitmapSource, dstFormat: REFWICPixelFormatGUID,
-        dither: WICBitmapDitherType, pIPalette: *mut IWICPalette, alphaThreasholdPercent: f64,
-        paletteTranslate: WICBitmapPaletteType
-    ) -> ::HRESULT,
-    fn CanConvert(
-        &mut self, srcPixelFormat: REFWICPixelFormatGUID, dstPixelFormat: REFWICPixelFormatGUID,
-        pfCanConvert: *mut ::BOOL
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICPlanarFormatConverter(IWICPlanarFormatConverterVtbl)
-    : IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, ppPlanes: *mut *mut IWICBitmapSource, cPlanes: ::UINT,
-        dstFormat: REFWICPixelFormatGUID, dither: WICBitmapDitherType, pIPalette: *mut IWICPalette,
-        alphaThreasholdPercent: f64, paletteTranslate: WICBitmapPaletteType
-    ) -> ::HRESULT,
-    fn CanConvert(
-        &mut self, pSrcPixelFormats: *const WICPixelFormatGUID, cSrcPlanes: ::UINT,
-        dstPixelFormat: REFWICPixelFormatGUID, pfCanConvert: *mut ::BOOL
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapScaler(IWICBitmapScalerVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, pISource: *mut IWICBitmapSource, uiWidth: ::UINT, uiHeight: ::UINT,
-        mode: WICBitmapInterpolationMode
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapClipper(IWICBitmapClipperVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(&mut self, pISource: *mut IWICBitmapSource, prc: *const WICRect) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapFlipRotator(IWICBitmapFlipRotatorVtbl)
-    : IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Initialize(
-        &mut self, pISource: *mut IWICBitmapSource, options: WICBitmapTransformOptions
-    ) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmapLock(IWICBitmapLockVtbl): IUnknown(IUnknownVtbl) {
-    fn GetSize(&mut self, puiWidth: *mut ::UINT, puiHeight: *mut ::UINT) -> ::HRESULT,
-    fn GetStride(&mut self, pcbStride: *mut ::UINT) -> ::HRESULT,
-    fn GetDataPointer(
-        &mut self, pcbBufferSize: *mut ::UINT, ppbData: *mut WICInProcPointer
-    ) -> ::HRESULT,
-    fn GetPixelFormat(&mut self, pPixelFormat: *mut WICPixelFormatGUID) -> ::HRESULT
-});
-RIDL!(
-interface IWICBitmap(IWICBitmapVtbl): IWICBitmapSource(IWICBitmapSourceVtbl) {
-    fn Lock(
-        &mut self, prcLock: *const WICRect, flags: ::DWORD, ppILock: *mut *mut IWICBitmapLock
-    ) -> ::HRESULT,
-    fn SetPalette(&mut self, pIPalette: *mut IWICPalette) -> ::HRESULT,
-    fn SetResolution(&mut self, dpiX: f64, dpiY: f64) -> ::HRESULT
-});
diff --git a/vendor/winapi-0.2.8/src/windowsx.rs b/vendor/winapi-0.2.8/src/windowsx.rs
deleted file mode 100644
index 0441e63a40..0000000000
--- a/vendor/winapi-0.2.8/src/windowsx.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Macro APIs, window message crackers, and control APIs
-//1233
-pub fn GET_X_LPARAM(lp: ::LPARAM) -> ::c_int {
-    ::LOWORD(lp as ::DWORD) as ::c_short as ::c_int
-}
-pub fn GET_Y_LPARAM(lp: ::LPARAM) -> ::c_int {
-    ::HIWORD(lp as ::DWORD) as ::c_short as ::c_int
-}
-#[test]
-fn test_get_x_lparam() {
-    assert_eq!(GET_X_LPARAM(0xDEAD1234u32 as ::LPARAM), 0x1234);
-    assert_eq!(GET_X_LPARAM(0xBEEFffffu32 as ::LPARAM), -1);
-    assert_eq!(GET_X_LPARAM(0xCAFEFB2Eu32 as ::LPARAM), -1234);
-}
-#[test]
-fn test_get_y_lparam() {
-    assert_eq!(GET_Y_LPARAM(0x1234DEADu32 as ::LPARAM), 0x1234);
-    assert_eq!(GET_Y_LPARAM(0xffffBEEFu32 as ::LPARAM), -1);
-    assert_eq!(GET_Y_LPARAM(0xFB2ECAFEu32 as ::LPARAM), -1234);
-}
diff --git a/vendor/winapi-0.2.8/src/winerror.rs b/vendor/winapi-0.2.8/src/winerror.rs
deleted file mode 100644
index 6792cf8521..0000000000
--- a/vendor/winapi-0.2.8/src/winerror.rs
+++ /dev/null
@@ -1,6065 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! error code definitions for the Win32 API functions
-#[inline]
-pub fn SUCCEEDED(hr: HRESULT) -> bool {
-    hr >= 0
-}
-pub const FACILITY_XPS: HRESULT = 82;
-pub const FACILITY_XAML: HRESULT = 43;
-pub const FACILITY_USN: HRESULT = 129;
-pub const FACILITY_BLBUI: HRESULT = 128;
-pub const FACILITY_SPP: HRESULT = 256;
-pub const FACILITY_WSB_ONLINE: HRESULT = 133;
-pub const FACILITY_DLS: HRESULT = 153;
-pub const FACILITY_BLB_CLI: HRESULT = 121;
-pub const FACILITY_BLB: HRESULT = 120;
-pub const FACILITY_WSBAPP: HRESULT = 122;
-pub const FACILITY_WPN: HRESULT = 62;
-pub const FACILITY_WMAAECMA: HRESULT = 1996;
-pub const FACILITY_WINRM: HRESULT = 51;
-pub const FACILITY_WINPE: HRESULT = 61;
-pub const FACILITY_WINDOWSUPDATE: HRESULT = 36;
-pub const FACILITY_WINDOWS_STORE: HRESULT = 63;
-pub const FACILITY_WINDOWS_SETUP: HRESULT = 48;
-pub const FACILITY_WINDOWS_DEFENDER: HRESULT = 80;
-pub const FACILITY_WINDOWS_CE: HRESULT = 24;
-pub const FACILITY_WINDOWS: HRESULT = 8;
-pub const FACILITY_WINCODEC_DWRITE_DWM: HRESULT = 2200;
-pub const FACILITY_WIA: HRESULT = 33;
-pub const FACILITY_WER: HRESULT = 27;
-pub const FACILITY_WEP: HRESULT = 2049;
-pub const FACILITY_WEB_SOCKET: HRESULT = 886;
-pub const FACILITY_WEB: HRESULT = 885;
-pub const FACILITY_USERMODE_VOLSNAP: HRESULT = 130;
-pub const FACILITY_USERMODE_VOLMGR: HRESULT = 56;
-pub const FACILITY_VISUALCPP: HRESULT = 109;
-pub const FACILITY_USERMODE_VIRTUALIZATION: HRESULT = 55;
-pub const FACILITY_USERMODE_VHD: HRESULT = 58;
-pub const FACILITY_URT: HRESULT = 19;
-pub const FACILITY_UMI: HRESULT = 22;
-pub const FACILITY_UI: HRESULT = 42;
-pub const FACILITY_TPM_SOFTWARE: HRESULT = 41;
-pub const FACILITY_TPM_SERVICES: HRESULT = 40;
-pub const FACILITY_TIERING: HRESULT = 131;
-pub const FACILITY_SYNCENGINE: HRESULT = 2050;
-pub const FACILITY_SXS: HRESULT = 23;
-pub const FACILITY_STORAGE: HRESULT = 3;
-pub const FACILITY_STATE_MANAGEMENT: HRESULT = 34;
-pub const FACILITY_SSPI: HRESULT = 9;
-pub const FACILITY_USERMODE_SPACES: HRESULT = 231;
-pub const FACILITY_SOS: HRESULT = 160;
-pub const FACILITY_SCARD: HRESULT = 16;
-pub const FACILITY_SHELL: HRESULT = 39;
-pub const FACILITY_SETUPAPI: HRESULT = 15;
-pub const FACILITY_SECURITY: HRESULT = 9;
-pub const FACILITY_SDIAG: HRESULT = 60;
-pub const FACILITY_USERMODE_SDBUS: HRESULT = 2305;
-pub const FACILITY_RPC: HRESULT = 1;
-pub const FACILITY_RESTORE: HRESULT = 256;
-pub const FACILITY_SCRIPT: HRESULT = 112;
-pub const FACILITY_PARSE: HRESULT = 113;
-pub const FACILITY_RAS: HRESULT = 83;
-pub const FACILITY_POWERSHELL: HRESULT = 84;
-pub const FACILITY_PLA: HRESULT = 48;
-pub const FACILITY_PIDGENX: HRESULT = 2561;
-pub const FACILITY_P2P_INT: HRESULT = 98;
-pub const FACILITY_P2P: HRESULT = 99;
-pub const FACILITY_OPC: HRESULT = 81;
-pub const FACILITY_ONLINE_ID: HRESULT = 134;
-pub const FACILITY_WIN32: HRESULT = 7;
-pub const FACILITY_CONTROL: HRESULT = 10;
-pub const FACILITY_WEBSERVICES: HRESULT = 61;
-pub const FACILITY_NULL: HRESULT = 0;
-pub const FACILITY_NDIS: HRESULT = 52;
-pub const FACILITY_NAP: HRESULT = 39;
-pub const FACILITY_MOBILE: HRESULT = 1793;
-pub const FACILITY_METADIRECTORY: HRESULT = 35;
-pub const FACILITY_MSMQ: HRESULT = 14;
-pub const FACILITY_MEDIASERVER: HRESULT = 13;
-pub const FACILITY_MBN: HRESULT = 84;
-pub const FACILITY_LINGUISTIC_SERVICES: HRESULT = 305;
-pub const FACILITY_LEAP: HRESULT = 2184;
-pub const FACILITY_JSCRIPT: HRESULT = 2306;
-pub const FACILITY_INTERNET: HRESULT = 12;
-pub const FACILITY_ITF: HRESULT = 4;
-pub const FACILITY_INPUT: HRESULT = 64;
-pub const FACILITY_USERMODE_HYPERVISOR: HRESULT = 53;
-pub const FACILITY_ACCELERATOR: HRESULT = 1536;
-pub const FACILITY_HTTP: HRESULT = 25;
-pub const FACILITY_GRAPHICS: HRESULT = 38;
-pub const FACILITY_FWP: HRESULT = 50;
-pub const FACILITY_FVE: HRESULT = 49;
-pub const FACILITY_USERMODE_FILTER_MANAGER: HRESULT = 31;
-pub const FACILITY_EAS: HRESULT = 85;
-pub const FACILITY_EAP: HRESULT = 66;
-pub const FACILITY_DXGI_DDI: HRESULT = 2171;
-pub const FACILITY_DXGI: HRESULT = 2170;
-pub const FACILITY_DPLAY: HRESULT = 21;
-pub const FACILITY_DMSERVER: HRESULT = 256;
-pub const FACILITY_DISPATCH: HRESULT = 2;
-pub const FACILITY_DIRECTORYSERVICE: HRESULT = 37;
-pub const FACILITY_DIRECTMUSIC: HRESULT = 2168;
-pub const FACILITY_DIRECT3D11: HRESULT = 2172;
-pub const FACILITY_DIRECT3D10: HRESULT = 2169;
-pub const FACILITY_DIRECT2D: HRESULT = 2201;
-pub const FACILITY_DAF: HRESULT = 100;
-pub const FACILITY_DEPLOYMENT_SERVICES_UTIL: HRESULT = 260;
-pub const FACILITY_DEPLOYMENT_SERVICES_TRANSPORT_MANAGEMENT: HRESULT = 272;
-pub const FACILITY_DEPLOYMENT_SERVICES_TFTP: HRESULT = 264;
-pub const FACILITY_DEPLOYMENT_SERVICES_PXE: HRESULT = 263;
-pub const FACILITY_DEPLOYMENT_SERVICES_MULTICAST_SERVER: HRESULT = 289;
-pub const FACILITY_DEPLOYMENT_SERVICES_MULTICAST_CLIENT: HRESULT = 290;
-pub const FACILITY_DEPLOYMENT_SERVICES_MANAGEMENT: HRESULT = 259;
-pub const FACILITY_DEPLOYMENT_SERVICES_IMAGING: HRESULT = 258;
-pub const FACILITY_DEPLOYMENT_SERVICES_DRIVER_PROVISIONING: HRESULT = 278;
-pub const FACILITY_DEPLOYMENT_SERVICES_SERVER: HRESULT = 257;
-pub const FACILITY_DEPLOYMENT_SERVICES_CONTENT_PROVIDER: HRESULT = 293;
-pub const FACILITY_DEPLOYMENT_SERVICES_BINLSVC: HRESULT = 261;
-pub const FACILITY_DEFRAG: HRESULT = 2304;
-pub const FACILITY_DEBUGGERS: HRESULT = 176;
-pub const FACILITY_CONFIGURATION: HRESULT = 33;
-pub const FACILITY_COMPLUS: HRESULT = 17;
-pub const FACILITY_USERMODE_COMMONLOG: HRESULT = 26;
-pub const FACILITY_CMI: HRESULT = 54;
-pub const FACILITY_CERT: HRESULT = 11;
-pub const FACILITY_BLUETOOTH_ATT: HRESULT = 101;
-pub const FACILITY_BCD: HRESULT = 57;
-pub const FACILITY_BACKGROUNDCOPY: HRESULT = 32;
-pub const FACILITY_AUDIOSTREAMING: HRESULT = 1094;
-pub const FACILITY_AUDCLNT: HRESULT = 2185;
-pub const FACILITY_AUDIO: HRESULT = 102;
-pub const FACILITY_ACTION_QUEUE: HRESULT = 44;
-pub const FACILITY_ACS: HRESULT = 20;
-pub const FACILITY_AAF: HRESULT = 18;
-pub const ERROR_SUCCESS: ::DWORD = 0;
-pub const NO_ERROR: ::DWORD = 0;
-pub const SEC_E_OK: HRESULT = 0;
-pub const ERROR_INVALID_FUNCTION: ::DWORD = 1;
-pub const ERROR_FILE_NOT_FOUND: ::DWORD = 2;
-pub const ERROR_PATH_NOT_FOUND: ::DWORD = 3;
-pub const ERROR_TOO_MANY_OPEN_FILES: ::DWORD = 4;
-pub const ERROR_ACCESS_DENIED: ::DWORD = 5;
-pub const ERROR_INVALID_HANDLE: ::DWORD = 6;
-pub const ERROR_ARENA_TRASHED: ::DWORD = 7;
-pub const ERROR_NOT_ENOUGH_MEMORY: ::DWORD = 8;
-pub const ERROR_INVALID_BLOCK: ::DWORD = 9;
-pub const ERROR_BAD_ENVIRONMENT: ::DWORD = 10;
-pub const ERROR_BAD_FORMAT: ::DWORD = 11;
-pub const ERROR_INVALID_ACCESS: ::DWORD = 12;
-pub const ERROR_INVALID_DATA: ::DWORD = 13;
-pub const ERROR_OUTOFMEMORY: ::DWORD = 14;
-pub const ERROR_INVALID_DRIVE: ::DWORD = 15;
-pub const ERROR_CURRENT_DIRECTORY: ::DWORD = 16;
-pub const ERROR_NOT_SAME_DEVICE: ::DWORD = 17;
-pub const ERROR_NO_MORE_FILES: ::DWORD = 18;
-pub const ERROR_WRITE_PROTECT: ::DWORD = 19;
-pub const ERROR_BAD_UNIT: ::DWORD = 20;
-pub const ERROR_NOT_READY: ::DWORD = 21;
-pub const ERROR_BAD_COMMAND: ::DWORD = 22;
-pub const ERROR_CRC: ::DWORD = 23;
-pub const ERROR_BAD_LENGTH: ::DWORD = 24;
-pub const ERROR_SEEK: ::DWORD = 25;
-pub const ERROR_NOT_DOS_DISK: ::DWORD = 26;
-pub const ERROR_SECTOR_NOT_FOUND: ::DWORD = 27;
-pub const ERROR_OUT_OF_PAPER: ::DWORD = 28;
-pub const ERROR_WRITE_FAULT: ::DWORD = 29;
-pub const ERROR_READ_FAULT: ::DWORD = 30;
-pub const ERROR_GEN_FAILURE: ::DWORD = 31;
-pub const ERROR_SHARING_VIOLATION: ::DWORD = 32;
-pub const ERROR_LOCK_VIOLATION: ::DWORD = 33;
-pub const ERROR_WRONG_DISK: ::DWORD = 34;
-pub const ERROR_SHARING_BUFFER_EXCEEDED: ::DWORD = 36;
-pub const ERROR_HANDLE_EOF: ::DWORD = 38;
-pub const ERROR_HANDLE_DISK_FULL: ::DWORD = 39;
-pub const ERROR_NOT_SUPPORTED: ::DWORD = 50;
-pub const ERROR_REM_NOT_LIST: ::DWORD = 51;
-pub const ERROR_DUP_NAME: ::DWORD = 52;
-pub const ERROR_BAD_NETPATH: ::DWORD = 53;
-pub const ERROR_NETWORK_BUSY: ::DWORD = 54;
-pub const ERROR_DEV_NOT_EXIST: ::DWORD = 55;
-pub const ERROR_TOO_MANY_CMDS: ::DWORD = 56;
-pub const ERROR_ADAP_HDW_ERR: ::DWORD = 57;
-pub const ERROR_BAD_NET_RESP: ::DWORD = 58;
-pub const ERROR_UNEXP_NET_ERR: ::DWORD = 59;
-pub const ERROR_BAD_REM_ADAP: ::DWORD = 60;
-pub const ERROR_PRINTQ_FULL: ::DWORD = 61;
-pub const ERROR_NO_SPOOL_SPACE: ::DWORD = 62;
-pub const ERROR_PRINT_CANCELLED: ::DWORD = 63;
-pub const ERROR_NETNAME_DELETED: ::DWORD = 64;
-pub const ERROR_NETWORK_ACCESS_DENIED: ::DWORD = 65;
-pub const ERROR_BAD_DEV_TYPE: ::DWORD = 66;
-pub const ERROR_BAD_NET_NAME: ::DWORD = 67;
-pub const ERROR_TOO_MANY_NAMES: ::DWORD = 68;
-pub const ERROR_TOO_MANY_SESS: ::DWORD = 69;
-pub const ERROR_SHARING_PAUSED: ::DWORD = 70;
-pub const ERROR_REQ_NOT_ACCEP: ::DWORD = 71;
-pub const ERROR_REDIR_PAUSED: ::DWORD = 72;
-pub const ERROR_FILE_EXISTS: ::DWORD = 80;
-pub const ERROR_CANNOT_MAKE: ::DWORD = 82;
-pub const ERROR_FAIL_I24: ::DWORD = 83;
-pub const ERROR_OUT_OF_STRUCTURES: ::DWORD = 84;
-pub const ERROR_ALREADY_ASSIGNED: ::DWORD = 85;
-pub const ERROR_INVALID_PASSWORD: ::DWORD = 86;
-pub const ERROR_INVALID_PARAMETER: ::DWORD = 87;
-pub const ERROR_NET_WRITE_FAULT: ::DWORD = 88;
-pub const ERROR_NO_PROC_SLOTS: ::DWORD = 89;
-pub const ERROR_TOO_MANY_SEMAPHORES: ::DWORD = 100;
-pub const ERROR_EXCL_SEM_ALREADY_OWNED: ::DWORD = 101;
-pub const ERROR_SEM_IS_SET: ::DWORD = 102;
-pub const ERROR_TOO_MANY_SEM_REQUESTS: ::DWORD = 103;
-pub const ERROR_INVALID_AT_INTERRUPT_TIME: ::DWORD = 104;
-pub const ERROR_SEM_OWNER_DIED: ::DWORD = 105;
-pub const ERROR_SEM_USER_LIMIT: ::DWORD = 106;
-pub const ERROR_DISK_CHANGE: ::DWORD = 107;
-pub const ERROR_DRIVE_LOCKED: ::DWORD = 108;
-pub const ERROR_BROKEN_PIPE: ::DWORD = 109;
-pub const ERROR_OPEN_FAILED: ::DWORD = 110;
-pub const ERROR_BUFFER_OVERFLOW: ::DWORD = 111;
-pub const ERROR_DISK_FULL: ::DWORD = 112;
-pub const ERROR_NO_MORE_SEARCH_HANDLES: ::DWORD = 113;
-pub const ERROR_INVALID_TARGET_HANDLE: ::DWORD = 114;
-pub const ERROR_INVALID_CATEGORY: ::DWORD = 117;
-pub const ERROR_INVALID_VERIFY_SWITCH: ::DWORD = 118;
-pub const ERROR_BAD_DRIVER_LEVEL: ::DWORD = 119;
-pub const ERROR_CALL_NOT_IMPLEMENTED: ::DWORD = 120;
-pub const ERROR_SEM_TIMEOUT: ::DWORD = 121;
-pub const ERROR_INSUFFICIENT_BUFFER: ::DWORD = 122;
-pub const ERROR_INVALID_NAME: ::DWORD = 123;
-pub const ERROR_INVALID_LEVEL: ::DWORD = 124;
-pub const ERROR_NO_VOLUME_LABEL: ::DWORD = 125;
-pub const ERROR_MOD_NOT_FOUND: ::DWORD = 126;
-pub const ERROR_PROC_NOT_FOUND: ::DWORD = 127;
-pub const ERROR_WAIT_NO_CHILDREN: ::DWORD = 128;
-pub const ERROR_CHILD_NOT_COMPLETE: ::DWORD = 129;
-pub const ERROR_DIRECT_ACCESS_HANDLE: ::DWORD = 130;
-pub const ERROR_NEGATIVE_SEEK: ::DWORD = 131;
-pub const ERROR_SEEK_ON_DEVICE: ::DWORD = 132;
-pub const ERROR_IS_JOIN_TARGET: ::DWORD = 133;
-pub const ERROR_IS_JOINED: ::DWORD = 134;
-pub const ERROR_IS_SUBSTED: ::DWORD = 135;
-pub const ERROR_NOT_JOINED: ::DWORD = 136;
-pub const ERROR_NOT_SUBSTED: ::DWORD = 137;
-pub const ERROR_JOIN_TO_JOIN: ::DWORD = 138;
-pub const ERROR_SUBST_TO_SUBST: ::DWORD = 139;
-pub const ERROR_JOIN_TO_SUBST: ::DWORD = 140;
-pub const ERROR_SUBST_TO_JOIN: ::DWORD = 141;
-pub const ERROR_BUSY_DRIVE: ::DWORD = 142;
-pub const ERROR_SAME_DRIVE: ::DWORD = 143;
-pub const ERROR_DIR_NOT_ROOT: ::DWORD = 144;
-pub const ERROR_DIR_NOT_EMPTY: ::DWORD = 145;
-pub const ERROR_IS_SUBST_PATH: ::DWORD = 146;
-pub const ERROR_IS_JOIN_PATH: ::DWORD = 147;
-pub const ERROR_PATH_BUSY: ::DWORD = 148;
-pub const ERROR_IS_SUBST_TARGET: ::DWORD = 149;
-pub const ERROR_SYSTEM_TRACE: ::DWORD = 150;
-pub const ERROR_INVALID_EVENT_COUNT: ::DWORD = 151;
-pub const ERROR_TOO_MANY_MUXWAITERS: ::DWORD = 152;
-pub const ERROR_INVALID_LIST_FORMAT: ::DWORD = 153;
-pub const ERROR_LABEL_TOO_LONG: ::DWORD = 154;
-pub const ERROR_TOO_MANY_TCBS: ::DWORD = 155;
-pub const ERROR_SIGNAL_REFUSED: ::DWORD = 156;
-pub const ERROR_DISCARDED: ::DWORD = 157;
-pub const ERROR_NOT_LOCKED: ::DWORD = 158;
-pub const ERROR_BAD_THREADID_ADDR: ::DWORD = 159;
-pub const ERROR_BAD_ARGUMENTS: ::DWORD = 160;
-pub const ERROR_BAD_PATHNAME: ::DWORD = 161;
-pub const ERROR_SIGNAL_PENDING: ::DWORD = 162;
-pub const ERROR_MAX_THRDS_REACHED: ::DWORD = 164;
-pub const ERROR_LOCK_FAILED: ::DWORD = 167;
-pub const ERROR_BUSY: ::DWORD = 170;
-pub const ERROR_DEVICE_SUPPORT_IN_PROGRESS: ::DWORD = 171;
-pub const ERROR_CANCEL_VIOLATION: ::DWORD = 173;
-pub const ERROR_ATOMIC_LOCKS_NOT_SUPPORTED: ::DWORD = 174;
-pub const ERROR_INVALID_SEGMENT_NUMBER: ::DWORD = 180;
-pub const ERROR_INVALID_ORDINAL: ::DWORD = 182;
-pub const ERROR_ALREADY_EXISTS: ::DWORD = 183;
-pub const ERROR_INVALID_FLAG_NUMBER: ::DWORD = 186;
-pub const ERROR_SEM_NOT_FOUND: ::DWORD = 187;
-pub const ERROR_INVALID_STARTING_CODESEG: ::DWORD = 188;
-pub const ERROR_INVALID_STACKSEG: ::DWORD = 189;
-pub const ERROR_INVALID_MODULETYPE: ::DWORD = 190;
-pub const ERROR_INVALID_EXE_SIGNATURE: ::DWORD = 191;
-pub const ERROR_EXE_MARKED_INVALID: ::DWORD = 192;
-pub const ERROR_BAD_EXE_FORMAT: ::DWORD = 193;
-pub const ERROR_ITERATED_DATA_EXCEEDS_64k: ::DWORD = 194;
-pub const ERROR_INVALID_MINALLOCSIZE: ::DWORD = 195;
-pub const ERROR_DYNLINK_FROM_INVALID_RING: ::DWORD = 196;
-pub const ERROR_IOPL_NOT_ENABLED: ::DWORD = 197;
-pub const ERROR_INVALID_SEGDPL: ::DWORD = 198;
-pub const ERROR_AUTODATASEG_EXCEEDS_64k: ::DWORD = 199;
-pub const ERROR_RING2SEG_MUST_BE_MOVABLE: ::DWORD = 200;
-pub const ERROR_RELOC_CHAIN_XEEDS_SEGLIM: ::DWORD = 201;
-pub const ERROR_INFLOOP_IN_RELOC_CHAIN: ::DWORD = 202;
-pub const ERROR_ENVVAR_NOT_FOUND: ::DWORD = 203;
-pub const ERROR_NO_SIGNAL_SENT: ::DWORD = 205;
-pub const ERROR_FILENAME_EXCED_RANGE: ::DWORD = 206;
-pub const ERROR_RING2_STACK_IN_USE: ::DWORD = 207;
-pub const ERROR_META_EXPANSION_TOO_LONG: ::DWORD = 208;
-pub const ERROR_INVALID_SIGNAL_NUMBER: ::DWORD = 209;
-pub const ERROR_THREAD_1_INACTIVE: ::DWORD = 210;
-pub const ERROR_LOCKED: ::DWORD = 212;
-pub const ERROR_TOO_MANY_MODULES: ::DWORD = 214;
-pub const ERROR_NESTING_NOT_ALLOWED: ::DWORD = 215;
-pub const ERROR_EXE_MACHINE_TYPE_MISMATCH: ::DWORD = 216;
-pub const ERROR_EXE_CANNOT_MODIFY_SIGNED_BINARY: ::DWORD = 217;
-pub const ERROR_EXE_CANNOT_MODIFY_STRONG_SIGNED_BINARY: ::DWORD = 218;
-pub const ERROR_FILE_CHECKED_OUT: ::DWORD = 220;
-pub const ERROR_CHECKOUT_REQUIRED: ::DWORD = 221;
-pub const ERROR_BAD_FILE_TYPE: ::DWORD = 222;
-pub const ERROR_FILE_TOO_LARGE: ::DWORD = 223;
-pub const ERROR_FORMS_AUTH_REQUIRED: ::DWORD = 224;
-pub const ERROR_VIRUS_INFECTED: ::DWORD = 225;
-pub const ERROR_VIRUS_DELETED: ::DWORD = 226;
-pub const ERROR_PIPE_LOCAL: ::DWORD = 229;
-pub const ERROR_BAD_PIPE: ::DWORD = 230;
-pub const ERROR_PIPE_BUSY: ::DWORD = 231;
-pub const ERROR_NO_DATA: ::DWORD = 232;
-pub const ERROR_PIPE_NOT_CONNECTED: ::DWORD = 233;
-pub const ERROR_MORE_DATA: ::DWORD = 234;
-pub const ERROR_VC_DISCONNECTED: ::DWORD = 240;
-pub const ERROR_INVALID_EA_NAME: ::DWORD = 254;
-pub const ERROR_EA_LIST_INCONSISTENT: ::DWORD = 255;
-pub const WAIT_TIMEOUT: ::DWORD = 258;
-pub const ERROR_NO_MORE_ITEMS: ::DWORD = 259;
-pub const ERROR_CANNOT_COPY: ::DWORD = 266;
-pub const ERROR_DIRECTORY: ::DWORD = 267;
-pub const ERROR_EAS_DIDNT_FIT: ::DWORD = 275;
-pub const ERROR_EA_FILE_CORRUPT: ::DWORD = 276;
-pub const ERROR_EA_TABLE_FULL: ::DWORD = 277;
-pub const ERROR_INVALID_EA_HANDLE: ::DWORD = 278;
-pub const ERROR_EAS_NOT_SUPPORTED: ::DWORD = 282;
-pub const ERROR_NOT_OWNER: ::DWORD = 288;
-pub const ERROR_TOO_MANY_POSTS: ::DWORD = 298;
-pub const ERROR_PARTIAL_COPY: ::DWORD = 299;
-pub const ERROR_OPLOCK_NOT_GRANTED: ::DWORD = 300;
-pub const ERROR_INVALID_OPLOCK_PROTOCOL: ::DWORD = 301;
-pub const ERROR_DISK_TOO_FRAGMENTED: ::DWORD = 302;
-pub const ERROR_DELETE_PENDING: ::DWORD = 303;
-pub const ERROR_INCOMPATIBLE_WITH_GLOBAL_SHORT_NAME_REGISTRY_SETTING: ::DWORD = 304;
-pub const ERROR_SHORT_NAMES_NOT_ENABLED_ON_VOLUME: ::DWORD = 305;
-pub const ERROR_SECURITY_STREAM_IS_INCONSISTENT: ::DWORD = 306;
-pub const ERROR_INVALID_LOCK_RANGE: ::DWORD = 307;
-pub const ERROR_IMAGE_SUBSYSTEM_NOT_PRESENT: ::DWORD = 308;
-pub const ERROR_NOTIFICATION_GUID_ALREADY_DEFINED: ::DWORD = 309;
-pub const ERROR_INVALID_EXCEPTION_HANDLER: ::DWORD = 310;
-pub const ERROR_DUPLICATE_PRIVILEGES: ::DWORD = 311;
-pub const ERROR_NO_RANGES_PROCESSED: ::DWORD = 312;
-pub const ERROR_NOT_ALLOWED_ON_SYSTEM_FILE: ::DWORD = 313;
-pub const ERROR_DISK_RESOURCES_EXHAUSTED: ::DWORD = 314;
-pub const ERROR_INVALID_TOKEN: ::DWORD = 315;
-pub const ERROR_DEVICE_FEATURE_NOT_SUPPORTED: ::DWORD = 316;
-pub const ERROR_MR_MID_NOT_FOUND: ::DWORD = 317;
-pub const ERROR_SCOPE_NOT_FOUND: ::DWORD = 318;
-pub const ERROR_UNDEFINED_SCOPE: ::DWORD = 319;
-pub const ERROR_INVALID_CAP: ::DWORD = 320;
-pub const ERROR_DEVICE_UNREACHABLE: ::DWORD = 321;
-pub const ERROR_DEVICE_NO_RESOURCES: ::DWORD = 322;
-pub const ERROR_DATA_CHECKSUM_ERROR: ::DWORD = 323;
-pub const ERROR_INTERMIXED_KERNEL_EA_OPERATION: ::DWORD = 324;
-pub const ERROR_FILE_LEVEL_TRIM_NOT_SUPPORTED: ::DWORD = 326;
-pub const ERROR_OFFSET_ALIGNMENT_VIOLATION: ::DWORD = 327;
-pub const ERROR_INVALID_FIELD_IN_PARAMETER_LIST: ::DWORD = 328;
-pub const ERROR_OPERATION_IN_PROGRESS: ::DWORD = 329;
-pub const ERROR_BAD_DEVICE_PATH: ::DWORD = 330;
-pub const ERROR_TOO_MANY_DESCRIPTORS: ::DWORD = 331;
-pub const ERROR_SCRUB_DATA_DISABLED: ::DWORD = 332;
-pub const ERROR_NOT_REDUNDANT_STORAGE: ::DWORD = 333;
-pub const ERROR_RESIDENT_FILE_NOT_SUPPORTED: ::DWORD = 334;
-pub const ERROR_COMPRESSED_FILE_NOT_SUPPORTED: ::DWORD = 335;
-pub const ERROR_DIRECTORY_NOT_SUPPORTED: ::DWORD = 336;
-pub const ERROR_NOT_READ_FROM_COPY: ::DWORD = 337;
-pub const ERROR_FT_WRITE_FAILURE: ::DWORD = 338;
-pub const ERROR_FT_DI_SCAN_REQUIRED: ::DWORD = 339;
-pub const ERROR_INVALID_KERNEL_INFO_VERSION: ::DWORD = 340;
-pub const ERROR_INVALID_PEP_INFO_VERSION: ::DWORD = 341;
-pub const ERROR_OBJECT_NOT_EXTERNALLY_BACKED: ::DWORD = 342;
-pub const ERROR_EXTERNAL_BACKING_PROVIDER_UNKNOWN: ::DWORD = 343;
-pub const ERROR_FAIL_NOACTION_REBOOT: ::DWORD = 350;
-pub const ERROR_FAIL_SHUTDOWN: ::DWORD = 351;
-pub const ERROR_FAIL_RESTART: ::DWORD = 352;
-pub const ERROR_MAX_SESSIONS_REACHED: ::DWORD = 353;
-pub const ERROR_THREAD_MODE_ALREADY_BACKGROUND: ::DWORD = 400;
-pub const ERROR_THREAD_MODE_NOT_BACKGROUND: ::DWORD = 401;
-pub const ERROR_PROCESS_MODE_ALREADY_BACKGROUND: ::DWORD = 402;
-pub const ERROR_PROCESS_MODE_NOT_BACKGROUND: ::DWORD = 403;
-pub const ERROR_DEVICE_HARDWARE_ERROR: ::DWORD = 483;
-pub const ERROR_INVALID_ADDRESS: ::DWORD = 487;
-pub const ERROR_USER_PROFILE_LOAD: ::DWORD = 500;
-pub const ERROR_ARITHMETIC_OVERFLOW: ::DWORD = 534;
-pub const ERROR_PIPE_CONNECTED: ::DWORD = 535;
-pub const ERROR_PIPE_LISTENING: ::DWORD = 536;
-pub const ERROR_VERIFIER_STOP: ::DWORD = 537;
-pub const ERROR_ABIOS_ERROR: ::DWORD = 538;
-pub const ERROR_WX86_WARNING: ::DWORD = 539;
-pub const ERROR_WX86_ERROR: ::DWORD = 540;
-pub const ERROR_TIMER_NOT_CANCELED: ::DWORD = 541;
-pub const ERROR_UNWIND: ::DWORD = 542;
-pub const ERROR_BAD_STACK: ::DWORD = 543;
-pub const ERROR_INVALID_UNWIND_TARGET: ::DWORD = 544;
-pub const ERROR_INVALID_PORT_ATTRIBUTES: ::DWORD = 545;
-pub const ERROR_PORT_MESSAGE_TOO_LONG: ::DWORD = 546;
-pub const ERROR_INVALID_QUOTA_LOWER: ::DWORD = 547;
-pub const ERROR_DEVICE_ALREADY_ATTACHED: ::DWORD = 548;
-pub const ERROR_INSTRUCTION_MISALIGNMENT: ::DWORD = 549;
-pub const ERROR_PROFILING_NOT_STARTED: ::DWORD = 550;
-pub const ERROR_PROFILING_NOT_STOPPED: ::DWORD = 551;
-pub const ERROR_COULD_NOT_INTERPRET: ::DWORD = 552;
-pub const ERROR_PROFILING_AT_LIMIT: ::DWORD = 553;
-pub const ERROR_CANT_WAIT: ::DWORD = 554;
-pub const ERROR_CANT_TERMINATE_SELF: ::DWORD = 555;
-pub const ERROR_UNEXPECTED_MM_CREATE_ERR: ::DWORD = 556;
-pub const ERROR_UNEXPECTED_MM_MAP_ERROR: ::DWORD = 557;
-pub const ERROR_UNEXPECTED_MM_EXTEND_ERR: ::DWORD = 558;
-pub const ERROR_BAD_FUNCTION_TABLE: ::DWORD = 559;
-pub const ERROR_NO_GUID_TRANSLATION: ::DWORD = 560;
-pub const ERROR_INVALID_LDT_SIZE: ::DWORD = 561;
-pub const ERROR_INVALID_LDT_OFFSET: ::DWORD = 563;
-pub const ERROR_INVALID_LDT_DESCRIPTOR: ::DWORD = 564;
-pub const ERROR_TOO_MANY_THREADS: ::DWORD = 565;
-pub const ERROR_THREAD_NOT_IN_PROCESS: ::DWORD = 566;
-pub const ERROR_PAGEFILE_QUOTA_EXCEEDED: ::DWORD = 567;
-pub const ERROR_LOGON_SERVER_CONFLICT: ::DWORD = 568;
-pub const ERROR_SYNCHRONIZATION_REQUIRED: ::DWORD = 569;
-pub const ERROR_NET_OPEN_FAILED: ::DWORD = 570;
-pub const ERROR_IO_PRIVILEGE_FAILED: ::DWORD = 571;
-pub const ERROR_CONTROL_C_EXIT: ::DWORD = 572;
-pub const ERROR_MISSING_SYSTEMFILE: ::DWORD = 573;
-pub const ERROR_UNHANDLED_EXCEPTION: ::DWORD = 574;
-pub const ERROR_APP_INIT_FAILURE: ::DWORD = 575;
-pub const ERROR_PAGEFILE_CREATE_FAILED: ::DWORD = 576;
-pub const ERROR_INVALID_IMAGE_HASH: ::DWORD = 577;
-pub const ERROR_NO_PAGEFILE: ::DWORD = 578;
-pub const ERROR_ILLEGAL_FLOAT_CONTEXT: ::DWORD = 579;
-pub const ERROR_NO_EVENT_PAIR: ::DWORD = 580;
-pub const ERROR_DOMAIN_CTRLR_CONFIG_ERROR: ::DWORD = 581;
-pub const ERROR_ILLEGAL_CHARACTER: ::DWORD = 582;
-pub const ERROR_UNDEFINED_CHARACTER: ::DWORD = 583;
-pub const ERROR_FLOPPY_VOLUME: ::DWORD = 584;
-pub const ERROR_BIOS_FAILED_TO_CONNECT_INTERRUPT: ::DWORD = 585;
-pub const ERROR_BACKUP_CONTROLLER: ::DWORD = 586;
-pub const ERROR_MUTANT_LIMIT_EXCEEDED: ::DWORD = 587;
-pub const ERROR_FS_DRIVER_REQUIRED: ::DWORD = 588;
-pub const ERROR_CANNOT_LOAD_REGISTRY_FILE: ::DWORD = 589;
-pub const ERROR_DEBUG_ATTACH_FAILED: ::DWORD = 590;
-pub const ERROR_SYSTEM_PROCESS_TERMINATED: ::DWORD = 591;
-pub const ERROR_DATA_NOT_ACCEPTED: ::DWORD = 592;
-pub const ERROR_VDM_HARD_ERROR: ::DWORD = 593;
-pub const ERROR_DRIVER_CANCEL_TIMEOUT: ::DWORD = 594;
-pub const ERROR_REPLY_MESSAGE_MISMATCH: ::DWORD = 595;
-pub const ERROR_LOST_WRITEBEHIND_DATA: ::DWORD = 596;
-pub const ERROR_CLIENT_SERVER_PARAMETERS_INVALID: ::DWORD = 597;
-pub const ERROR_NOT_TINY_STREAM: ::DWORD = 598;
-pub const ERROR_STACK_OVERFLOW_READ: ::DWORD = 599;
-pub const ERROR_CONVERT_TO_LARGE: ::DWORD = 600;
-pub const ERROR_FOUND_OUT_OF_SCOPE: ::DWORD = 601;
-pub const ERROR_ALLOCATE_BUCKET: ::DWORD = 602;
-pub const ERROR_MARSHALL_OVERFLOW: ::DWORD = 603;
-pub const ERROR_INVALID_VARIANT: ::DWORD = 604;
-pub const ERROR_BAD_COMPRESSION_BUFFER: ::DWORD = 605;
-pub const ERROR_AUDIT_FAILED: ::DWORD = 606;
-pub const ERROR_TIMER_RESOLUTION_NOT_SET: ::DWORD = 607;
-pub const ERROR_INSUFFICIENT_LOGON_INFO: ::DWORD = 608;
-pub const ERROR_BAD_DLL_ENTRYPOINT: ::DWORD = 609;
-pub const ERROR_BAD_SERVICE_ENTRYPOINT: ::DWORD = 610;
-pub const ERROR_IP_ADDRESS_CONFLICT1: ::DWORD = 611;
-pub const ERROR_IP_ADDRESS_CONFLICT2: ::DWORD = 612;
-pub const ERROR_REGISTRY_QUOTA_LIMIT: ::DWORD = 613;
-pub const ERROR_NO_CALLBACK_ACTIVE: ::DWORD = 614;
-pub const ERROR_PWD_TOO_SHORT: ::DWORD = 615;
-pub const ERROR_PWD_TOO_RECENT: ::DWORD = 616;
-pub const ERROR_PWD_HISTORY_CONFLICT: ::DWORD = 617;
-pub const ERROR_UNSUPPORTED_COMPRESSION: ::DWORD = 618;
-pub const ERROR_INVALID_HW_PROFILE: ::DWORD = 619;
-pub const ERROR_INVALID_PLUGPLAY_DEVICE_PATH: ::DWORD = 620;
-pub const ERROR_QUOTA_LIST_INCONSISTENT: ::DWORD = 621;
-pub const ERROR_EVALUATION_EXPIRATION: ::DWORD = 622;
-pub const ERROR_ILLEGAL_DLL_RELOCATION: ::DWORD = 623;
-pub const ERROR_DLL_INIT_FAILED_LOGOFF: ::DWORD = 624;
-pub const ERROR_VALIDATE_CONTINUE: ::DWORD = 625;
-pub const ERROR_NO_MORE_MATCHES: ::DWORD = 626;
-pub const ERROR_RANGE_LIST_CONFLICT: ::DWORD = 627;
-pub const ERROR_SERVER_SID_MISMATCH: ::DWORD = 628;
-pub const ERROR_CANT_ENABLE_DENY_ONLY: ::DWORD = 629;
-pub const ERROR_FLOAT_MULTIPLE_FAULTS: ::DWORD = 630;
-pub const ERROR_FLOAT_MULTIPLE_TRAPS: ::DWORD = 631;
-pub const ERROR_NOINTERFACE: ::DWORD = 632;
-pub const ERROR_DRIVER_FAILED_SLEEP: ::DWORD = 633;
-pub const ERROR_CORRUPT_SYSTEM_FILE: ::DWORD = 634;
-pub const ERROR_COMMITMENT_MINIMUM: ::DWORD = 635;
-pub const ERROR_PNP_RESTART_ENUMERATION: ::DWORD = 636;
-pub const ERROR_SYSTEM_IMAGE_BAD_SIGNATURE: ::DWORD = 637;
-pub const ERROR_PNP_REBOOT_REQUIRED: ::DWORD = 638;
-pub const ERROR_INSUFFICIENT_POWER: ::DWORD = 639;
-pub const ERROR_MULTIPLE_FAULT_VIOLATION: ::DWORD = 640;
-pub const ERROR_SYSTEM_SHUTDOWN: ::DWORD = 641;
-pub const ERROR_PORT_NOT_SET: ::DWORD = 642;
-pub const ERROR_DS_VERSION_CHECK_FAILURE: ::DWORD = 643;
-pub const ERROR_RANGE_NOT_FOUND: ::DWORD = 644;
-pub const ERROR_NOT_SAFE_MODE_DRIVER: ::DWORD = 646;
-pub const ERROR_FAILED_DRIVER_ENTRY: ::DWORD = 647;
-pub const ERROR_DEVICE_ENUMERATION_ERROR: ::DWORD = 648;
-pub const ERROR_MOUNT_POINT_NOT_RESOLVED: ::DWORD = 649;
-pub const ERROR_INVALID_DEVICE_OBJECT_PARAMETER: ::DWORD = 650;
-pub const ERROR_MCA_OCCURED: ::DWORD = 651;
-pub const ERROR_DRIVER_DATABASE_ERROR: ::DWORD = 652;
-pub const ERROR_SYSTEM_HIVE_TOO_LARGE: ::DWORD = 653;
-pub const ERROR_DRIVER_FAILED_PRIOR_UNLOAD: ::DWORD = 654;
-pub const ERROR_VOLSNAP_PREPARE_HIBERNATE: ::DWORD = 655;
-pub const ERROR_HIBERNATION_FAILURE: ::DWORD = 656;
-pub const ERROR_PWD_TOO_LONG: ::DWORD = 657;
-pub const ERROR_FILE_SYSTEM_LIMITATION: ::DWORD = 665;
-pub const ERROR_ASSERTION_FAILURE: ::DWORD = 668;
-pub const ERROR_ACPI_ERROR: ::DWORD = 669;
-pub const ERROR_WOW_ASSERTION: ::DWORD = 670;
-pub const ERROR_PNP_BAD_MPS_TABLE: ::DWORD = 671;
-pub const ERROR_PNP_TRANSLATION_FAILED: ::DWORD = 672;
-pub const ERROR_PNP_IRQ_TRANSLATION_FAILED: ::DWORD = 673;
-pub const ERROR_PNP_INVALID_ID: ::DWORD = 674;
-pub const ERROR_WAKE_SYSTEM_DEBUGGER: ::DWORD = 675;
-pub const ERROR_HANDLES_CLOSED: ::DWORD = 676;
-pub const ERROR_EXTRANEOUS_INFORMATION: ::DWORD = 677;
-pub const ERROR_RXACT_COMMIT_NECESSARY: ::DWORD = 678;
-pub const ERROR_MEDIA_CHECK: ::DWORD = 679;
-pub const ERROR_GUID_SUBSTITUTION_MADE: ::DWORD = 680;
-pub const ERROR_STOPPED_ON_SYMLINK: ::DWORD = 681;
-pub const ERROR_LONGJUMP: ::DWORD = 682;
-pub const ERROR_PLUGPLAY_QUERY_VETOED: ::DWORD = 683;
-pub const ERROR_UNWIND_CONSOLIDATE: ::DWORD = 684;
-pub const ERROR_REGISTRY_HIVE_RECOVERED: ::DWORD = 685;
-pub const ERROR_DLL_MIGHT_BE_INSECURE: ::DWORD = 686;
-pub const ERROR_DLL_MIGHT_BE_INCOMPATIBLE: ::DWORD = 687;
-pub const ERROR_DBG_EXCEPTION_NOT_HANDLED: ::DWORD = 688;
-pub const ERROR_DBG_REPLY_LATER: ::DWORD = 689;
-pub const ERROR_DBG_UNABLE_TO_PROVIDE_HANDLE: ::DWORD = 690;
-pub const ERROR_DBG_TERMINATE_THREAD: ::DWORD = 691;
-pub const ERROR_DBG_TERMINATE_PROCESS: ::DWORD = 692;
-pub const ERROR_DBG_CONTROL_C: ::DWORD = 693;
-pub const ERROR_DBG_PRINTEXCEPTION_C: ::DWORD = 694;
-pub const ERROR_DBG_RIPEXCEPTION: ::DWORD = 695;
-pub const ERROR_DBG_CONTROL_BREAK: ::DWORD = 696;
-pub const ERROR_DBG_COMMAND_EXCEPTION: ::DWORD = 697;
-pub const ERROR_OBJECT_NAME_EXISTS: ::DWORD = 698;
-pub const ERROR_THREAD_WAS_SUSPENDED: ::DWORD = 699;
-pub const ERROR_IMAGE_NOT_AT_BASE: ::DWORD = 700;
-pub const ERROR_RXACT_STATE_CREATED: ::DWORD = 701;
-pub const ERROR_SEGMENT_NOTIFICATION: ::DWORD = 702;
-pub const ERROR_BAD_CURRENT_DIRECTORY: ::DWORD = 703;
-pub const ERROR_FT_READ_RECOVERY_FROM_BACKUP: ::DWORD = 704;
-pub const ERROR_FT_WRITE_RECOVERY: ::DWORD = 705;
-pub const ERROR_IMAGE_MACHINE_TYPE_MISMATCH: ::DWORD = 706;
-pub const ERROR_RECEIVE_PARTIAL: ::DWORD = 707;
-pub const ERROR_RECEIVE_EXPEDITED: ::DWORD = 708;
-pub const ERROR_RECEIVE_PARTIAL_EXPEDITED: ::DWORD = 709;
-pub const ERROR_EVENT_DONE: ::DWORD = 710;
-pub const ERROR_EVENT_PENDING: ::DWORD = 711;
-pub const ERROR_CHECKING_FILE_SYSTEM: ::DWORD = 712;
-pub const ERROR_FATAL_APP_EXIT: ::DWORD = 713;
-pub const ERROR_PREDEFINED_HANDLE: ::DWORD = 714;
-pub const ERROR_WAS_UNLOCKED: ::DWORD = 715;
-pub const ERROR_SERVICE_NOTIFICATION: ::DWORD = 716;
-pub const ERROR_WAS_LOCKED: ::DWORD = 717;
-pub const ERROR_LOG_HARD_ERROR: ::DWORD = 718;
-pub const ERROR_ALREADY_WIN32: ::DWORD = 719;
-pub const ERROR_IMAGE_MACHINE_TYPE_MISMATCH_EXE: ::DWORD = 720;
-pub const ERROR_NO_YIELD_PERFORMED: ::DWORD = 721;
-pub const ERROR_TIMER_RESUME_IGNORED: ::DWORD = 722;
-pub const ERROR_ARBITRATION_UNHANDLED: ::DWORD = 723;
-pub const ERROR_CARDBUS_NOT_SUPPORTED: ::DWORD = 724;
-pub const ERROR_MP_PROCESSOR_MISMATCH: ::DWORD = 725;
-pub const ERROR_HIBERNATED: ::DWORD = 726;
-pub const ERROR_RESUME_HIBERNATION: ::DWORD = 727;
-pub const ERROR_FIRMWARE_UPDATED: ::DWORD = 728;
-pub const ERROR_DRIVERS_LEAKING_LOCKED_PAGES: ::DWORD = 729;
-pub const ERROR_WAKE_SYSTEM: ::DWORD = 730;
-pub const ERROR_WAIT_1: ::DWORD = 731;
-pub const ERROR_WAIT_2: ::DWORD = 732;
-pub const ERROR_WAIT_3: ::DWORD = 733;
-pub const ERROR_WAIT_63: ::DWORD = 734;
-pub const ERROR_ABANDONED_WAIT_0: ::DWORD = 735;
-pub const ERROR_ABANDONED_WAIT_63: ::DWORD = 736;
-pub const ERROR_USER_APC: ::DWORD = 737;
-pub const ERROR_KERNEL_APC: ::DWORD = 738;
-pub const ERROR_ALERTED: ::DWORD = 739;
-pub const ERROR_ELEVATION_REQUIRED: ::DWORD = 740;
-pub const ERROR_REPARSE: ::DWORD = 741;
-pub const ERROR_OPLOCK_BREAK_IN_PROGRESS: ::DWORD = 742;
-pub const ERROR_VOLUME_MOUNTED: ::DWORD = 743;
-pub const ERROR_RXACT_COMMITTED: ::DWORD = 744;
-pub const ERROR_NOTIFY_CLEANUP: ::DWORD = 745;
-pub const ERROR_PRIMARY_TRANSPORT_CONNECT_FAILED: ::DWORD = 746;
-pub const ERROR_PAGE_FAULT_TRANSITION: ::DWORD = 747;
-pub const ERROR_PAGE_FAULT_DEMAND_ZERO: ::DWORD = 748;
-pub const ERROR_PAGE_FAULT_COPY_ON_WRITE: ::DWORD = 749;
-pub const ERROR_PAGE_FAULT_GUARD_PAGE: ::DWORD = 750;
-pub const ERROR_PAGE_FAULT_PAGING_FILE: ::DWORD = 751;
-pub const ERROR_CACHE_PAGE_LOCKED: ::DWORD = 752;
-pub const ERROR_CRASH_DUMP: ::DWORD = 753;
-pub const ERROR_BUFFER_ALL_ZEROS: ::DWORD = 754;
-pub const ERROR_REPARSE_OBJECT: ::DWORD = 755;
-pub const ERROR_RESOURCE_REQUIREMENTS_CHANGED: ::DWORD = 756;
-pub const ERROR_TRANSLATION_COMPLETE: ::DWORD = 757;
-pub const ERROR_NOTHING_TO_TERMINATE: ::DWORD = 758;
-pub const ERROR_PROCESS_NOT_IN_JOB: ::DWORD = 759;
-pub const ERROR_PROCESS_IN_JOB: ::DWORD = 760;
-pub const ERROR_VOLSNAP_HIBERNATE_READY: ::DWORD = 761;
-pub const ERROR_FSFILTER_OP_COMPLETED_SUCCESSFULLY: ::DWORD = 762;
-pub const ERROR_INTERRUPT_VECTOR_ALREADY_CONNECTED: ::DWORD = 763;
-pub const ERROR_INTERRUPT_STILL_CONNECTED: ::DWORD = 764;
-pub const ERROR_WAIT_FOR_OPLOCK: ::DWORD = 765;
-pub const ERROR_DBG_EXCEPTION_HANDLED: ::DWORD = 766;
-pub const ERROR_DBG_CONTINUE: ::DWORD = 767;
-pub const ERROR_CALLBACK_POP_STACK: ::DWORD = 768;
-pub const ERROR_COMPRESSION_DISABLED: ::DWORD = 769;
-pub const ERROR_CANTFETCHBACKWARDS: ::DWORD = 770;
-pub const ERROR_CANTSCROLLBACKWARDS: ::DWORD = 771;
-pub const ERROR_ROWSNOTRELEASED: ::DWORD = 772;
-pub const ERROR_BAD_ACCESSOR_FLAGS: ::DWORD = 773;
-pub const ERROR_ERRORS_ENCOUNTERED: ::DWORD = 774;
-pub const ERROR_NOT_CAPABLE: ::DWORD = 775;
-pub const ERROR_REQUEST_OUT_OF_SEQUENCE: ::DWORD = 776;
-pub const ERROR_VERSION_PARSE_ERROR: ::DWORD = 777;
-pub const ERROR_BADSTARTPOSITION: ::DWORD = 778;
-pub const ERROR_MEMORY_HARDWARE: ::DWORD = 779;
-pub const ERROR_DISK_REPAIR_DISABLED: ::DWORD = 780;
-pub const ERROR_INSUFFICIENT_RESOURCE_FOR_SPECIFIED_SHARED_SECTION_SIZE: ::DWORD = 781;
-pub const ERROR_SYSTEM_POWERSTATE_TRANSITION: ::DWORD = 782;
-pub const ERROR_SYSTEM_POWERSTATE_COMPLEX_TRANSITION: ::DWORD = 783;
-pub const ERROR_MCA_EXCEPTION: ::DWORD = 784;
-pub const ERROR_ACCESS_AUDIT_BY_POLICY: ::DWORD = 785;
-pub const ERROR_ACCESS_DISABLED_NO_SAFER_UI_BY_POLICY: ::DWORD = 786;
-pub const ERROR_ABANDON_HIBERFILE: ::DWORD = 787;
-pub const ERROR_LOST_WRITEBEHIND_DATA_NETWORK_DISCONNECTED: ::DWORD = 788;
-pub const ERROR_LOST_WRITEBEHIND_DATA_NETWORK_SERVER_ERROR: ::DWORD = 789;
-pub const ERROR_LOST_WRITEBEHIND_DATA_LOCAL_DISK_ERROR: ::DWORD = 790;
-pub const ERROR_BAD_MCFG_TABLE: ::DWORD = 791;
-pub const ERROR_DISK_REPAIR_REDIRECTED: ::DWORD = 792;
-pub const ERROR_DISK_REPAIR_UNSUCCESSFUL: ::DWORD = 793;
-pub const ERROR_CORRUPT_LOG_OVERFULL: ::DWORD = 794;
-pub const ERROR_CORRUPT_LOG_CORRUPTED: ::DWORD = 795;
-pub const ERROR_CORRUPT_LOG_UNAVAILABLE: ::DWORD = 796;
-pub const ERROR_CORRUPT_LOG_DELETED_FULL: ::DWORD = 797;
-pub const ERROR_CORRUPT_LOG_CLEARED: ::DWORD = 798;
-pub const ERROR_ORPHAN_NAME_EXHAUSTED: ::DWORD = 799;
-pub const ERROR_OPLOCK_SWITCHED_TO_NEW_HANDLE: ::DWORD = 800;
-pub const ERROR_CANNOT_GRANT_REQUESTED_OPLOCK: ::DWORD = 801;
-pub const ERROR_CANNOT_BREAK_OPLOCK: ::DWORD = 802;
-pub const ERROR_OPLOCK_HANDLE_CLOSED: ::DWORD = 803;
-pub const ERROR_NO_ACE_CONDITION: ::DWORD = 804;
-pub const ERROR_INVALID_ACE_CONDITION: ::DWORD = 805;
-pub const ERROR_FILE_HANDLE_REVOKED: ::DWORD = 806;
-pub const ERROR_IMAGE_AT_DIFFERENT_BASE: ::DWORD = 807;
-pub const ERROR_ENCRYPTED_IO_NOT_POSSIBLE: ::DWORD = 808;
-pub const ERROR_EA_ACCESS_DENIED: ::DWORD = 994;
-pub const ERROR_OPERATION_ABORTED: ::DWORD = 995;
-pub const ERROR_IO_INCOMPLETE: ::DWORD = 996;
-pub const ERROR_IO_PENDING: ::DWORD = 997;
-pub const ERROR_NOACCESS: ::DWORD = 998;
-pub const ERROR_SWAPERROR: ::DWORD = 999;
-pub const ERROR_STACK_OVERFLOW: ::DWORD = 1001;
-pub const ERROR_INVALID_MESSAGE: ::DWORD = 1002;
-pub const ERROR_CAN_NOT_COMPLETE: ::DWORD = 1003;
-pub const ERROR_INVALID_FLAGS: ::DWORD = 1004;
-pub const ERROR_UNRECOGNIZED_VOLUME: ::DWORD = 1005;
-pub const ERROR_FILE_INVALID: ::DWORD = 1006;
-pub const ERROR_FULLSCREEN_MODE: ::DWORD = 1007;
-pub const ERROR_NO_TOKEN: ::DWORD = 1008;
-pub const ERROR_BADDB: ::DWORD = 1009;
-pub const ERROR_BADKEY: ::DWORD = 1010;
-pub const ERROR_CANTOPEN: ::DWORD = 1011;
-pub const ERROR_CANTREAD: ::DWORD = 1012;
-pub const ERROR_CANTWRITE: ::DWORD = 1013;
-pub const ERROR_REGISTRY_RECOVERED: ::DWORD = 1014;
-pub const ERROR_REGISTRY_CORRUPT: ::DWORD = 1015;
-pub const ERROR_REGISTRY_IO_FAILED: ::DWORD = 1016;
-pub const ERROR_NOT_REGISTRY_FILE: ::DWORD = 1017;
-pub const ERROR_KEY_DELETED: ::DWORD = 1018;
-pub const ERROR_NO_LOG_SPACE: ::DWORD = 1019;
-pub const ERROR_KEY_HAS_CHILDREN: ::DWORD = 1020;
-pub const ERROR_CHILD_MUST_BE_VOLATILE: ::DWORD = 1021;
-pub const ERROR_NOTIFY_ENUM_DIR: ::DWORD = 1022;
-pub const ERROR_DEPENDENT_SERVICES_RUNNING: ::DWORD = 1051;
-pub const ERROR_INVALID_SERVICE_CONTROL: ::DWORD = 1052;
-pub const ERROR_SERVICE_REQUEST_TIMEOUT: ::DWORD = 1053;
-pub const ERROR_SERVICE_NO_THREAD: ::DWORD = 1054;
-pub const ERROR_SERVICE_DATABASE_LOCKED: ::DWORD = 1055;
-pub const ERROR_SERVICE_ALREADY_RUNNING: ::DWORD = 1056;
-pub const ERROR_INVALID_SERVICE_ACCOUNT: ::DWORD = 1057;
-pub const ERROR_SERVICE_DISABLED: ::DWORD = 1058;
-pub const ERROR_CIRCULAR_DEPENDENCY: ::DWORD = 1059;
-pub const ERROR_SERVICE_DOES_NOT_EXIST: ::DWORD = 1060;
-pub const ERROR_SERVICE_CANNOT_ACCEPT_CTRL: ::DWORD = 1061;
-pub const ERROR_SERVICE_NOT_ACTIVE: ::DWORD = 1062;
-pub const ERROR_FAILED_SERVICE_CONTROLLER_CONNECT: ::DWORD = 1063;
-pub const ERROR_EXCEPTION_IN_SERVICE: ::DWORD = 1064;
-pub const ERROR_DATABASE_DOES_NOT_EXIST: ::DWORD = 1065;
-pub const ERROR_SERVICE_SPECIFIC_ERROR: ::DWORD = 1066;
-pub const ERROR_PROCESS_ABORTED: ::DWORD = 1067;
-pub const ERROR_SERVICE_DEPENDENCY_FAIL: ::DWORD = 1068;
-pub const ERROR_SERVICE_LOGON_FAILED: ::DWORD = 1069;
-pub const ERROR_SERVICE_START_HANG: ::DWORD = 1070;
-pub const ERROR_INVALID_SERVICE_LOCK: ::DWORD = 1071;
-pub const ERROR_SERVICE_MARKED_FOR_DELETE: ::DWORD = 1072;
-pub const ERROR_SERVICE_EXISTS: ::DWORD = 1073;
-pub const ERROR_ALREADY_RUNNING_LKG: ::DWORD = 1074;
-pub const ERROR_SERVICE_DEPENDENCY_DELETED: ::DWORD = 1075;
-pub const ERROR_BOOT_ALREADY_ACCEPTED: ::DWORD = 1076;
-pub const ERROR_SERVICE_NEVER_STARTED: ::DWORD = 1077;
-pub const ERROR_DUPLICATE_SERVICE_NAME: ::DWORD = 1078;
-pub const ERROR_DIFFERENT_SERVICE_ACCOUNT: ::DWORD = 1079;
-pub const ERROR_CANNOT_DETECT_DRIVER_FAILURE: ::DWORD = 1080;
-pub const ERROR_CANNOT_DETECT_PROCESS_ABORT: ::DWORD = 1081;
-pub const ERROR_NO_RECOVERY_PROGRAM: ::DWORD = 1082;
-pub const ERROR_SERVICE_NOT_IN_EXE: ::DWORD = 1083;
-pub const ERROR_NOT_SAFEBOOT_SERVICE: ::DWORD = 1084;
-pub const ERROR_END_OF_MEDIA: ::DWORD = 1100;
-pub const ERROR_FILEMARK_DETECTED: ::DWORD = 1101;
-pub const ERROR_BEGINNING_OF_MEDIA: ::DWORD = 1102;
-pub const ERROR_SETMARK_DETECTED: ::DWORD = 1103;
-pub const ERROR_NO_DATA_DETECTED: ::DWORD = 1104;
-pub const ERROR_PARTITION_FAILURE: ::DWORD = 1105;
-pub const ERROR_INVALID_BLOCK_LENGTH: ::DWORD = 1106;
-pub const ERROR_DEVICE_NOT_PARTITIONED: ::DWORD = 1107;
-pub const ERROR_UNABLE_TO_LOCK_MEDIA: ::DWORD = 1108;
-pub const ERROR_UNABLE_TO_UNLOAD_MEDIA: ::DWORD = 1109;
-pub const ERROR_MEDIA_CHANGED: ::DWORD = 1110;
-pub const ERROR_BUS_RESET: ::DWORD = 1111;
-pub const ERROR_NO_MEDIA_IN_DRIVE: ::DWORD = 1112;
-pub const ERROR_NO_UNICODE_TRANSLATION: ::DWORD = 1113;
-pub const ERROR_DLL_INIT_FAILED: ::DWORD = 1114;
-pub const ERROR_SHUTDOWN_IN_PROGRESS: ::DWORD = 1115;
-pub const ERROR_NO_SHUTDOWN_IN_PROGRESS: ::DWORD = 1116;
-pub const ERROR_IO_DEVICE: ::DWORD = 1117;
-pub const ERROR_SERIAL_NO_DEVICE: ::DWORD = 1118;
-pub const ERROR_IRQ_BUSY: ::DWORD = 1119;
-pub const ERROR_MORE_WRITES: ::DWORD = 1120;
-pub const ERROR_COUNTER_TIMEOUT: ::DWORD = 1121;
-pub const ERROR_FLOPPY_ID_MARK_NOT_FOUND: ::DWORD = 1122;
-pub const ERROR_FLOPPY_WRONG_CYLINDER: ::DWORD = 1123;
-pub const ERROR_FLOPPY_UNKNOWN_ERROR: ::DWORD = 1124;
-pub const ERROR_FLOPPY_BAD_REGISTERS: ::DWORD = 1125;
-pub const ERROR_DISK_RECALIBRATE_FAILED: ::DWORD = 1126;
-pub const ERROR_DISK_OPERATION_FAILED: ::DWORD = 1127;
-pub const ERROR_DISK_RESET_FAILED: ::DWORD = 1128;
-pub const ERROR_EOM_OVERFLOW: ::DWORD = 1129;
-pub const ERROR_NOT_ENOUGH_SERVER_MEMORY: ::DWORD = 1130;
-pub const ERROR_POSSIBLE_DEADLOCK: ::DWORD = 1131;
-pub const ERROR_MAPPED_ALIGNMENT: ::DWORD = 1132;
-pub const ERROR_SET_POWER_STATE_VETOED: ::DWORD = 1140;
-pub const ERROR_SET_POWER_STATE_FAILED: ::DWORD = 1141;
-pub const ERROR_TOO_MANY_LINKS: ::DWORD = 1142;
-pub const ERROR_OLD_WIN_VERSION: ::DWORD = 1150;
-pub const ERROR_APP_WRONG_OS: ::DWORD = 1151;
-pub const ERROR_SINGLE_INSTANCE_APP: ::DWORD = 1152;
-pub const ERROR_RMODE_APP: ::DWORD = 1153;
-pub const ERROR_INVALID_DLL: ::DWORD = 1154;
-pub const ERROR_NO_ASSOCIATION: ::DWORD = 1155;
-pub const ERROR_DDE_FAIL: ::DWORD = 1156;
-pub const ERROR_DLL_NOT_FOUND: ::DWORD = 1157;
-pub const ERROR_NO_MORE_USER_HANDLES: ::DWORD = 1158;
-pub const ERROR_MESSAGE_SYNC_ONLY: ::DWORD = 1159;
-pub const ERROR_SOURCE_ELEMENT_EMPTY: ::DWORD = 1160;
-pub const ERROR_DESTINATION_ELEMENT_FULL: ::DWORD = 1161;
-pub const ERROR_ILLEGAL_ELEMENT_ADDRESS: ::DWORD = 1162;
-pub const ERROR_MAGAZINE_NOT_PRESENT: ::DWORD = 1163;
-pub const ERROR_DEVICE_REINITIALIZATION_NEEDED: ::DWORD = 1164;
-pub const ERROR_DEVICE_REQUIRES_CLEANING: ::DWORD = 1165;
-pub const ERROR_DEVICE_DOOR_OPEN: ::DWORD = 1166;
-pub const ERROR_DEVICE_NOT_CONNECTED: ::DWORD = 1167;
-pub const ERROR_NOT_FOUND: ::DWORD = 1168;
-pub const ERROR_NO_MATCH: ::DWORD = 1169;
-pub const ERROR_SET_NOT_FOUND: ::DWORD = 1170;
-pub const ERROR_POINT_NOT_FOUND: ::DWORD = 1171;
-pub const ERROR_NO_TRACKING_SERVICE: ::DWORD = 1172;
-pub const ERROR_NO_VOLUME_ID: ::DWORD = 1173;
-pub const ERROR_UNABLE_TO_REMOVE_REPLACED: ::DWORD = 1175;
-pub const ERROR_UNABLE_TO_MOVE_REPLACEMENT: ::DWORD = 1176;
-pub const ERROR_UNABLE_TO_MOVE_REPLACEMENT_2: ::DWORD = 1177;
-pub const ERROR_JOURNAL_DELETE_IN_PROGRESS: ::DWORD = 1178;
-pub const ERROR_JOURNAL_NOT_ACTIVE: ::DWORD = 1179;
-pub const ERROR_POTENTIAL_FILE_FOUND: ::DWORD = 1180;
-pub const ERROR_JOURNAL_ENTRY_DELETED: ::DWORD = 1181;
-pub const ERROR_SHUTDOWN_IS_SCHEDULED: ::DWORD = 1190;
-pub const ERROR_SHUTDOWN_USERS_LOGGED_ON: ::DWORD = 1191;
-pub const ERROR_BAD_DEVICE: ::DWORD = 1200;
-pub const ERROR_CONNECTION_UNAVAIL: ::DWORD = 1201;
-pub const ERROR_DEVICE_ALREADY_REMEMBERED: ::DWORD = 1202;
-pub const ERROR_NO_NET_OR_BAD_PATH: ::DWORD = 1203;
-pub const ERROR_BAD_PROVIDER: ::DWORD = 1204;
-pub const ERROR_CANNOT_OPEN_PROFILE: ::DWORD = 1205;
-pub const ERROR_BAD_PROFILE: ::DWORD = 1206;
-pub const ERROR_NOT_CONTAINER: ::DWORD = 1207;
-pub const ERROR_EXTENDED_ERROR: ::DWORD = 1208;
-pub const ERROR_INVALID_GROUPNAME: ::DWORD = 1209;
-pub const ERROR_INVALID_COMPUTERNAME: ::DWORD = 1210;
-pub const ERROR_INVALID_EVENTNAME: ::DWORD = 1211;
-pub const ERROR_INVALID_DOMAINNAME: ::DWORD = 1212;
-pub const ERROR_INVALID_SERVICENAME: ::DWORD = 1213;
-pub const ERROR_INVALID_NETNAME: ::DWORD = 1214;
-pub const ERROR_INVALID_SHARENAME: ::DWORD = 1215;
-pub const ERROR_INVALID_PASSWORDNAME: ::DWORD = 1216;
-pub const ERROR_INVALID_MESSAGENAME: ::DWORD = 1217;
-pub const ERROR_INVALID_MESSAGEDEST: ::DWORD = 1218;
-pub const ERROR_SESSION_CREDENTIAL_CONFLICT: ::DWORD = 1219;
-pub const ERROR_REMOTE_SESSION_LIMIT_EXCEEDED: ::DWORD = 1220;
-pub const ERROR_DUP_DOMAINNAME: ::DWORD = 1221;
-pub const ERROR_NO_NETWORK: ::DWORD = 1222;
-pub const ERROR_CANCELLED: ::DWORD = 1223;
-pub const ERROR_USER_MAPPED_FILE: ::DWORD = 1224;
-pub const ERROR_CONNECTION_REFUSED: ::DWORD = 1225;
-pub const ERROR_GRACEFUL_DISCONNECT: ::DWORD = 1226;
-pub const ERROR_ADDRESS_ALREADY_ASSOCIATED: ::DWORD = 1227;
-pub const ERROR_ADDRESS_NOT_ASSOCIATED: ::DWORD = 1228;
-pub const ERROR_CONNECTION_INVALID: ::DWORD = 1229;
-pub const ERROR_CONNECTION_ACTIVE: ::DWORD = 1230;
-pub const ERROR_NETWORK_UNREACHABLE: ::DWORD = 1231;
-pub const ERROR_HOST_UNREACHABLE: ::DWORD = 1232;
-pub const ERROR_PROTOCOL_UNREACHABLE: ::DWORD = 1233;
-pub const ERROR_PORT_UNREACHABLE: ::DWORD = 1234;
-pub const ERROR_REQUEST_ABORTED: ::DWORD = 1235;
-pub const ERROR_CONNECTION_ABORTED: ::DWORD = 1236;
-pub const ERROR_RETRY: ::DWORD = 1237;
-pub const ERROR_CONNECTION_COUNT_LIMIT: ::DWORD = 1238;
-pub const ERROR_LOGIN_TIME_RESTRICTION: ::DWORD = 1239;
-pub const ERROR_LOGIN_WKSTA_RESTRICTION: ::DWORD = 1240;
-pub const ERROR_INCORRECT_ADDRESS: ::DWORD = 1241;
-pub const ERROR_ALREADY_REGISTERED: ::DWORD = 1242;
-pub const ERROR_SERVICE_NOT_FOUND: ::DWORD = 1243;
-pub const ERROR_NOT_AUTHENTICATED: ::DWORD = 1244;
-pub const ERROR_NOT_LOGGED_ON: ::DWORD = 1245;
-pub const ERROR_CONTINUE: ::DWORD = 1246;
-pub const ERROR_ALREADY_INITIALIZED: ::DWORD = 1247;
-pub const ERROR_NO_MORE_DEVICES: ::DWORD = 1248;
-pub const ERROR_NO_SUCH_SITE: ::DWORD = 1249;
-pub const ERROR_DOMAIN_CONTROLLER_EXISTS: ::DWORD = 1250;
-pub const ERROR_ONLY_IF_CONNECTED: ::DWORD = 1251;
-pub const ERROR_OVERRIDE_NOCHANGES: ::DWORD = 1252;
-pub const ERROR_BAD_USER_PROFILE: ::DWORD = 1253;
-pub const ERROR_NOT_SUPPORTED_ON_SBS: ::DWORD = 1254;
-pub const ERROR_SERVER_SHUTDOWN_IN_PROGRESS: ::DWORD = 1255;
-pub const ERROR_HOST_DOWN: ::DWORD = 1256;
-pub const ERROR_NON_ACCOUNT_SID: ::DWORD = 1257;
-pub const ERROR_NON_DOMAIN_SID: ::DWORD = 1258;
-pub const ERROR_APPHELP_BLOCK: ::DWORD = 1259;
-pub const ERROR_ACCESS_DISABLED_BY_POLICY: ::DWORD = 1260;
-pub const ERROR_REG_NAT_CONSUMPTION: ::DWORD = 1261;
-pub const ERROR_CSCSHARE_OFFLINE: ::DWORD = 1262;
-pub const ERROR_PKINIT_FAILURE: ::DWORD = 1263;
-pub const ERROR_SMARTCARD_SUBSYSTEM_FAILURE: ::DWORD = 1264;
-pub const ERROR_DOWNGRADE_DETECTED: ::DWORD = 1265;
-pub const ERROR_MACHINE_LOCKED: ::DWORD = 1271;
-pub const ERROR_CALLBACK_SUPPLIED_INVALID_DATA: ::DWORD = 1273;
-pub const ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED: ::DWORD = 1274;
-pub const ERROR_DRIVER_BLOCKED: ::DWORD = 1275;
-pub const ERROR_INVALID_IMPORT_OF_NON_DLL: ::DWORD = 1276;
-pub const ERROR_ACCESS_DISABLED_WEBBLADE: ::DWORD = 1277;
-pub const ERROR_ACCESS_DISABLED_WEBBLADE_TAMPER: ::DWORD = 1278;
-pub const ERROR_RECOVERY_FAILURE: ::DWORD = 1279;
-pub const ERROR_ALREADY_FIBER: ::DWORD = 1280;
-pub const ERROR_ALREADY_THREAD: ::DWORD = 1281;
-pub const ERROR_STACK_BUFFER_OVERRUN: ::DWORD = 1282;
-pub const ERROR_PARAMETER_QUOTA_EXCEEDED: ::DWORD = 1283;
-pub const ERROR_DEBUGGER_INACTIVE: ::DWORD = 1284;
-pub const ERROR_DELAY_LOAD_FAILED: ::DWORD = 1285;
-pub const ERROR_VDM_DISALLOWED: ::DWORD = 1286;
-pub const ERROR_UNIDENTIFIED_ERROR: ::DWORD = 1287;
-pub const ERROR_INVALID_CRUNTIME_PARAMETER: ::DWORD = 1288;
-pub const ERROR_BEYOND_VDL: ::DWORD = 1289;
-pub const ERROR_INCOMPATIBLE_SERVICE_SID_TYPE: ::DWORD = 1290;
-pub const ERROR_DRIVER_PROCESS_TERMINATED: ::DWORD = 1291;
-pub const ERROR_IMPLEMENTATION_LIMIT: ::DWORD = 1292;
-pub const ERROR_PROCESS_IS_PROTECTED: ::DWORD = 1293;
-pub const ERROR_SERVICE_NOTIFY_CLIENT_LAGGING: ::DWORD = 1294;
-pub const ERROR_DISK_QUOTA_EXCEEDED: ::DWORD = 1295;
-pub const ERROR_CONTENT_BLOCKED: ::DWORD = 1296;
-pub const ERROR_INCOMPATIBLE_SERVICE_PRIVILEGE: ::DWORD = 1297;
-pub const ERROR_APP_HANG: ::DWORD = 1298;
-pub const ERROR_INVALID_LABEL: ::DWORD = 1299;
-pub const ERROR_NOT_ALL_ASSIGNED: ::DWORD = 1300;
-pub const ERROR_SOME_NOT_MAPPED: ::DWORD = 1301;
-pub const ERROR_NO_QUOTAS_FOR_ACCOUNT: ::DWORD = 1302;
-pub const ERROR_LOCAL_USER_SESSION_KEY: ::DWORD = 1303;
-pub const ERROR_NULL_LM_PASSWORD: ::DWORD = 1304;
-pub const ERROR_UNKNOWN_REVISION: ::DWORD = 1305;
-pub const ERROR_REVISION_MISMATCH: ::DWORD = 1306;
-pub const ERROR_INVALID_OWNER: ::DWORD = 1307;
-pub const ERROR_INVALID_PRIMARY_GROUP: ::DWORD = 1308;
-pub const ERROR_NO_IMPERSONATION_TOKEN: ::DWORD = 1309;
-pub const ERROR_CANT_DISABLE_MANDATORY: ::DWORD = 1310;
-pub const ERROR_NO_LOGON_SERVERS: ::DWORD = 1311;
-pub const ERROR_NO_SUCH_LOGON_SESSION: ::DWORD = 1312;
-pub const ERROR_NO_SUCH_PRIVILEGE: ::DWORD = 1313;
-pub const ERROR_PRIVILEGE_NOT_HELD: ::DWORD = 1314;
-pub const ERROR_INVALID_ACCOUNT_NAME: ::DWORD = 1315;
-pub const ERROR_USER_EXISTS: ::DWORD = 1316;
-pub const ERROR_NO_SUCH_USER: ::DWORD = 1317;
-pub const ERROR_GROUP_EXISTS: ::DWORD = 1318;
-pub const ERROR_NO_SUCH_GROUP: ::DWORD = 1319;
-pub const ERROR_MEMBER_IN_GROUP: ::DWORD = 1320;
-pub const ERROR_MEMBER_NOT_IN_GROUP: ::DWORD = 1321;
-pub const ERROR_LAST_ADMIN: ::DWORD = 1322;
-pub const ERROR_WRONG_PASSWORD: ::DWORD = 1323;
-pub const ERROR_ILL_FORMED_PASSWORD: ::DWORD = 1324;
-pub const ERROR_PASSWORD_RESTRICTION: ::DWORD = 1325;
-pub const ERROR_LOGON_FAILURE: ::DWORD = 1326;
-pub const ERROR_ACCOUNT_RESTRICTION: ::DWORD = 1327;
-pub const ERROR_INVALID_LOGON_HOURS: ::DWORD = 1328;
-pub const ERROR_INVALID_WORKSTATION: ::DWORD = 1329;
-pub const ERROR_PASSWORD_EXPIRED: ::DWORD = 1330;
-pub const ERROR_ACCOUNT_DISABLED: ::DWORD = 1331;
-pub const ERROR_NONE_MAPPED: ::DWORD = 1332;
-pub const ERROR_TOO_MANY_LUIDS_REQUESTED: ::DWORD = 1333;
-pub const ERROR_LUIDS_EXHAUSTED: ::DWORD = 1334;
-pub const ERROR_INVALID_SUB_AUTHORITY: ::DWORD = 1335;
-pub const ERROR_INVALID_ACL: ::DWORD = 1336;
-pub const ERROR_INVALID_SID: ::DWORD = 1337;
-pub const ERROR_INVALID_SECURITY_DESCR: ::DWORD = 1338;
-pub const ERROR_BAD_INHERITANCE_ACL: ::DWORD = 1340;
-pub const ERROR_SERVER_DISABLED: ::DWORD = 1341;
-pub const ERROR_SERVER_NOT_DISABLED: ::DWORD = 1342;
-pub const ERROR_INVALID_ID_AUTHORITY: ::DWORD = 1343;
-pub const ERROR_ALLOTTED_SPACE_EXCEEDED: ::DWORD = 1344;
-pub const ERROR_INVALID_GROUP_ATTRIBUTES: ::DWORD = 1345;
-pub const ERROR_BAD_IMPERSONATION_LEVEL: ::DWORD = 1346;
-pub const ERROR_CANT_OPEN_ANONYMOUS: ::DWORD = 1347;
-pub const ERROR_BAD_VALIDATION_CLASS: ::DWORD = 1348;
-pub const ERROR_BAD_TOKEN_TYPE: ::DWORD = 1349;
-pub const ERROR_NO_SECURITY_ON_OBJECT: ::DWORD = 1350;
-pub const ERROR_CANT_ACCESS_DOMAIN_INFO: ::DWORD = 1351;
-pub const ERROR_INVALID_SERVER_STATE: ::DWORD = 1352;
-pub const ERROR_INVALID_DOMAIN_STATE: ::DWORD = 1353;
-pub const ERROR_INVALID_DOMAIN_ROLE: ::DWORD = 1354;
-pub const ERROR_NO_SUCH_DOMAIN: ::DWORD = 1355;
-pub const ERROR_DOMAIN_EXISTS: ::DWORD = 1356;
-pub const ERROR_DOMAIN_LIMIT_EXCEEDED: ::DWORD = 1357;
-pub const ERROR_INTERNAL_DB_CORRUPTION: ::DWORD = 1358;
-pub const ERROR_INTERNAL_ERROR: ::DWORD = 1359;
-pub const ERROR_GENERIC_NOT_MAPPED: ::DWORD = 1360;
-pub const ERROR_BAD_DESCRIPTOR_FORMAT: ::DWORD = 1361;
-pub const ERROR_NOT_LOGON_PROCESS: ::DWORD = 1362;
-pub const ERROR_LOGON_SESSION_EXISTS: ::DWORD = 1363;
-pub const ERROR_NO_SUCH_PACKAGE: ::DWORD = 1364;
-pub const ERROR_BAD_LOGON_SESSION_STATE: ::DWORD = 1365;
-pub const ERROR_LOGON_SESSION_COLLISION: ::DWORD = 1366;
-pub const ERROR_INVALID_LOGON_TYPE: ::DWORD = 1367;
-pub const ERROR_CANNOT_IMPERSONATE: ::DWORD = 1368;
-pub const ERROR_RXACT_INVALID_STATE: ::DWORD = 1369;
-pub const ERROR_RXACT_COMMIT_FAILURE: ::DWORD = 1370;
-pub const ERROR_SPECIAL_ACCOUNT: ::DWORD = 1371;
-pub const ERROR_SPECIAL_GROUP: ::DWORD = 1372;
-pub const ERROR_SPECIAL_USER: ::DWORD = 1373;
-pub const ERROR_MEMBERS_PRIMARY_GROUP: ::DWORD = 1374;
-pub const ERROR_TOKEN_ALREADY_IN_USE: ::DWORD = 1375;
-pub const ERROR_NO_SUCH_ALIAS: ::DWORD = 1376;
-pub const ERROR_MEMBER_NOT_IN_ALIAS: ::DWORD = 1377;
-pub const ERROR_MEMBER_IN_ALIAS: ::DWORD = 1378;
-pub const ERROR_ALIAS_EXISTS: ::DWORD = 1379;
-pub const ERROR_LOGON_NOT_GRANTED: ::DWORD = 1380;
-pub const ERROR_TOO_MANY_SECRETS: ::DWORD = 1381;
-pub const ERROR_SECRET_TOO_LONG: ::DWORD = 1382;
-pub const ERROR_INTERNAL_DB_ERROR: ::DWORD = 1383;
-pub const ERROR_TOO_MANY_CONTEXT_IDS: ::DWORD = 1384;
-pub const ERROR_LOGON_TYPE_NOT_GRANTED: ::DWORD = 1385;
-pub const ERROR_NT_CROSS_ENCRYPTION_REQUIRED: ::DWORD = 1386;
-pub const ERROR_NO_SUCH_MEMBER: ::DWORD = 1387;
-pub const ERROR_INVALID_MEMBER: ::DWORD = 1388;
-pub const ERROR_TOO_MANY_SIDS: ::DWORD = 1389;
-pub const ERROR_LM_CROSS_ENCRYPTION_REQUIRED: ::DWORD = 1390;
-pub const ERROR_NO_INHERITANCE: ::DWORD = 1391;
-pub const ERROR_FILE_CORRUPT: ::DWORD = 1392;
-pub const ERROR_DISK_CORRUPT: ::DWORD = 1393;
-pub const ERROR_NO_USER_SESSION_KEY: ::DWORD = 1394;
-pub const ERROR_LICENSE_QUOTA_EXCEEDED: ::DWORD = 1395;
-pub const ERROR_WRONG_TARGET_NAME: ::DWORD = 1396;
-pub const ERROR_MUTUAL_AUTH_FAILED: ::DWORD = 1397;
-pub const ERROR_TIME_SKEW: ::DWORD = 1398;
-pub const ERROR_CURRENT_DOMAIN_NOT_ALLOWED: ::DWORD = 1399;
-pub const ERROR_INVALID_WINDOW_HANDLE: ::DWORD = 1400;
-pub const ERROR_INVALID_MENU_HANDLE: ::DWORD = 1401;
-pub const ERROR_INVALID_CURSOR_HANDLE: ::DWORD = 1402;
-pub const ERROR_INVALID_ACCEL_HANDLE: ::DWORD = 1403;
-pub const ERROR_INVALID_HOOK_HANDLE: ::DWORD = 1404;
-pub const ERROR_INVALID_DWP_HANDLE: ::DWORD = 1405;
-pub const ERROR_TLW_WITH_WSCHILD: ::DWORD = 1406;
-pub const ERROR_CANNOT_FIND_WND_CLASS: ::DWORD = 1407;
-pub const ERROR_WINDOW_OF_OTHER_THREAD: ::DWORD = 1408;
-pub const ERROR_HOTKEY_ALREADY_REGISTERED: ::DWORD = 1409;
-pub const ERROR_CLASS_ALREADY_EXISTS: ::DWORD = 1410;
-pub const ERROR_CLASS_DOES_NOT_EXIST: ::DWORD = 1411;
-pub const ERROR_CLASS_HAS_WINDOWS: ::DWORD = 1412;
-pub const ERROR_INVALID_INDEX: ::DWORD = 1413;
-pub const ERROR_INVALID_ICON_HANDLE: ::DWORD = 1414;
-pub const ERROR_PRIVATE_DIALOG_INDEX: ::DWORD = 1415;
-pub const ERROR_LISTBOX_ID_NOT_FOUND: ::DWORD = 1416;
-pub const ERROR_NO_WILDCARD_CHARACTERS: ::DWORD = 1417;
-pub const ERROR_CLIPBOARD_NOT_OPEN: ::DWORD = 1418;
-pub const ERROR_HOTKEY_NOT_REGISTERED: ::DWORD = 1419;
-pub const ERROR_WINDOW_NOT_DIALOG: ::DWORD = 1420;
-pub const ERROR_CONTROL_ID_NOT_FOUND: ::DWORD = 1421;
-pub const ERROR_INVALID_COMBOBOX_MESSAGE: ::DWORD = 1422;
-pub const ERROR_WINDOW_NOT_COMBOBOX: ::DWORD = 1423;
-pub const ERROR_INVALID_EDIT_HEIGHT: ::DWORD = 1424;
-pub const ERROR_DC_NOT_FOUND: ::DWORD = 1425;
-pub const ERROR_INVALID_HOOK_FILTER: ::DWORD = 1426;
-pub const ERROR_INVALID_FILTER_PROC: ::DWORD = 1427;
-pub const ERROR_HOOK_NEEDS_HMOD: ::DWORD = 1428;
-pub const ERROR_GLOBAL_ONLY_HOOK: ::DWORD = 1429;
-pub const ERROR_JOURNAL_HOOK_SET: ::DWORD = 1430;
-pub const ERROR_HOOK_NOT_INSTALLED: ::DWORD = 1431;
-pub const ERROR_INVALID_LB_MESSAGE: ::DWORD = 1432;
-pub const ERROR_SETCOUNT_ON_BAD_LB: ::DWORD = 1433;
-pub const ERROR_LB_WITHOUT_TABSTOPS: ::DWORD = 1434;
-pub const ERROR_DESTROY_OBJECT_OF_OTHER_THREAD: ::DWORD = 1435;
-pub const ERROR_CHILD_WINDOW_MENU: ::DWORD = 1436;
-pub const ERROR_NO_SYSTEM_MENU: ::DWORD = 1437;
-pub const ERROR_INVALID_MSGBOX_STYLE: ::DWORD = 1438;
-pub const ERROR_INVALID_SPI_VALUE: ::DWORD = 1439;
-pub const ERROR_SCREEN_ALREADY_LOCKED: ::DWORD = 1440;
-pub const ERROR_HWNDS_HAVE_DIFF_PARENT: ::DWORD = 1441;
-pub const ERROR_NOT_CHILD_WINDOW: ::DWORD = 1442;
-pub const ERROR_INVALID_GW_COMMAND: ::DWORD = 1443;
-pub const ERROR_INVALID_THREAD_ID: ::DWORD = 1444;
-pub const ERROR_NON_MDICHILD_WINDOW: ::DWORD = 1445;
-pub const ERROR_POPUP_ALREADY_ACTIVE: ::DWORD = 1446;
-pub const ERROR_NO_SCROLLBARS: ::DWORD = 1447;
-pub const ERROR_INVALID_SCROLLBAR_RANGE: ::DWORD = 1448;
-pub const ERROR_INVALID_SHOWWIN_COMMAND: ::DWORD = 1449;
-pub const ERROR_NO_SYSTEM_RESOURCES: ::DWORD = 1450;
-pub const ERROR_NONPAGED_SYSTEM_RESOURCES: ::DWORD = 1451;
-pub const ERROR_PAGED_SYSTEM_RESOURCES: ::DWORD = 1452;
-pub const ERROR_WORKING_SET_QUOTA: ::DWORD = 1453;
-pub const ERROR_PAGEFILE_QUOTA: ::DWORD = 1454;
-pub const ERROR_COMMITMENT_LIMIT: ::DWORD = 1455;
-pub const ERROR_MENU_ITEM_NOT_FOUND: ::DWORD = 1456;
-pub const ERROR_INVALID_KEYBOARD_HANDLE: ::DWORD = 1457;
-pub const ERROR_HOOK_TYPE_NOT_ALLOWED: ::DWORD = 1458;
-pub const ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION: ::DWORD = 1459;
-pub const ERROR_TIMEOUT: ::DWORD = 1460;
-pub const ERROR_INVALID_MONITOR_HANDLE: ::DWORD = 1461;
-pub const ERROR_INCORRECT_SIZE: ::DWORD = 1462;
-pub const ERROR_SYMLINK_CLASS_DISABLED: ::DWORD = 1463;
-pub const ERROR_SYMLINK_NOT_SUPPORTED: ::DWORD = 1464;
-pub const ERROR_XML_PARSE_ERROR: ::DWORD = 1465;
-pub const ERROR_XMLDSIG_ERROR: ::DWORD = 1466;
-pub const ERROR_RESTART_APPLICATION: ::DWORD = 1467;
-pub const ERROR_WRONG_COMPARTMENT: ::DWORD = 1468;
-pub const ERROR_AUTHIP_FAILURE: ::DWORD = 1469;
-pub const ERROR_NO_NVRAM_RESOURCES: ::DWORD = 1470;
-pub const ERROR_NOT_GUI_PROCESS: ::DWORD = 1471;
-pub const ERROR_EVENTLOG_FILE_CORRUPT: ::DWORD = 1500;
-pub const ERROR_EVENTLOG_CANT_START: ::DWORD = 1501;
-pub const ERROR_LOG_FILE_FULL: ::DWORD = 1502;
-pub const ERROR_EVENTLOG_FILE_CHANGED: ::DWORD = 1503;
-pub const ERROR_INVALID_TASK_NAME: ::DWORD = 1550;
-pub const ERROR_INVALID_TASK_INDEX: ::DWORD = 1551;
-pub const ERROR_THREAD_ALREADY_IN_TASK: ::DWORD = 1552;
-pub const ERROR_INSTALL_SERVICE_FAILURE: ::DWORD = 1601;
-pub const ERROR_INSTALL_USEREXIT: ::DWORD = 1602;
-pub const ERROR_INSTALL_FAILURE: ::DWORD = 1603;
-pub const ERROR_INSTALL_SUSPEND: ::DWORD = 1604;
-pub const ERROR_UNKNOWN_PRODUCT: ::DWORD = 1605;
-pub const ERROR_UNKNOWN_FEATURE: ::DWORD = 1606;
-pub const ERROR_UNKNOWN_COMPONENT: ::DWORD = 1607;
-pub const ERROR_UNKNOWN_PROPERTY: ::DWORD = 1608;
-pub const ERROR_INVALID_HANDLE_STATE: ::DWORD = 1609;
-pub const ERROR_BAD_CONFIGURATION: ::DWORD = 1610;
-pub const ERROR_INDEX_ABSENT: ::DWORD = 1611;
-pub const ERROR_INSTALL_SOURCE_ABSENT: ::DWORD = 1612;
-pub const ERROR_INSTALL_PACKAGE_VERSION: ::DWORD = 1613;
-pub const ERROR_PRODUCT_UNINSTALLED: ::DWORD = 1614;
-pub const ERROR_BAD_QUERY_SYNTAX: ::DWORD = 1615;
-pub const ERROR_INVALID_FIELD: ::DWORD = 1616;
-pub const ERROR_DEVICE_REMOVED: ::DWORD = 1617;
-pub const ERROR_INSTALL_ALREADY_RUNNING: ::DWORD = 1618;
-pub const ERROR_INSTALL_PACKAGE_OPEN_FAILED: ::DWORD = 1619;
-pub const ERROR_INSTALL_PACKAGE_INVALID: ::DWORD = 1620;
-pub const ERROR_INSTALL_UI_FAILURE: ::DWORD = 1621;
-pub const ERROR_INSTALL_LOG_FAILURE: ::DWORD = 1622;
-pub const ERROR_INSTALL_LANGUAGE_UNSUPPORTED: ::DWORD = 1623;
-pub const ERROR_INSTALL_TRANSFORM_FAILURE: ::DWORD = 1624;
-pub const ERROR_INSTALL_PACKAGE_REJECTED: ::DWORD = 1625;
-pub const ERROR_FUNCTION_NOT_CALLED: ::DWORD = 1626;
-pub const ERROR_FUNCTION_FAILED: ::DWORD = 1627;
-pub const ERROR_INVALID_TABLE: ::DWORD = 1628;
-pub const ERROR_DATATYPE_MISMATCH: ::DWORD = 1629;
-pub const ERROR_UNSUPPORTED_TYPE: ::DWORD = 1630;
-pub const ERROR_CREATE_FAILED: ::DWORD = 1631;
-pub const ERROR_INSTALL_TEMP_UNWRITABLE: ::DWORD = 1632;
-pub const ERROR_INSTALL_PLATFORM_UNSUPPORTED: ::DWORD = 1633;
-pub const ERROR_INSTALL_NOTUSED: ::DWORD = 1634;
-pub const ERROR_PATCH_PACKAGE_OPEN_FAILED: ::DWORD = 1635;
-pub const ERROR_PATCH_PACKAGE_INVALID: ::DWORD = 1636;
-pub const ERROR_PATCH_PACKAGE_UNSUPPORTED: ::DWORD = 1637;
-pub const ERROR_PRODUCT_VERSION: ::DWORD = 1638;
-pub const ERROR_INVALID_COMMAND_LINE: ::DWORD = 1639;
-pub const ERROR_INSTALL_REMOTE_DISALLOWED: ::DWORD = 1640;
-pub const ERROR_SUCCESS_REBOOT_INITIATED: ::DWORD = 1641;
-pub const ERROR_PATCH_TARGET_NOT_FOUND: ::DWORD = 1642;
-pub const ERROR_PATCH_PACKAGE_REJECTED: ::DWORD = 1643;
-pub const ERROR_INSTALL_TRANSFORM_REJECTED: ::DWORD = 1644;
-pub const ERROR_INSTALL_REMOTE_PROHIBITED: ::DWORD = 1645;
-pub const ERROR_PATCH_REMOVAL_UNSUPPORTED: ::DWORD = 1646;
-pub const ERROR_UNKNOWN_PATCH: ::DWORD = 1647;
-pub const ERROR_PATCH_NO_SEQUENCE: ::DWORD = 1648;
-pub const ERROR_PATCH_REMOVAL_DISALLOWED: ::DWORD = 1649;
-pub const ERROR_INVALID_PATCH_XML: ::DWORD = 1650;
-pub const ERROR_PATCH_MANAGED_ADVERTISED_PRODUCT: ::DWORD = 1651;
-pub const ERROR_INSTALL_SERVICE_SAFEBOOT: ::DWORD = 1652;
-pub const ERROR_FAIL_FAST_EXCEPTION: ::DWORD = 1653;
-pub const ERROR_INSTALL_REJECTED: ::DWORD = 1654;
-pub const ERROR_DYNAMIC_CODE_BLOCKED: ::DWORD = 1655;
-pub const RPC_S_INVALID_STRING_BINDING: ::DWORD = 1700;
-pub const RPC_S_WRONG_KIND_OF_BINDING: ::DWORD = 1701;
-pub const RPC_S_INVALID_BINDING: ::DWORD = 1702;
-pub const RPC_S_PROTSEQ_NOT_SUPPORTED: ::DWORD = 1703;
-pub const RPC_S_INVALID_RPC_PROTSEQ: ::DWORD = 1704;
-pub const RPC_S_INVALID_STRING_UUID: ::DWORD = 1705;
-pub const RPC_S_INVALID_ENDPOINT_FORMAT: ::DWORD = 1706;
-pub const RPC_S_INVALID_NET_ADDR: ::DWORD = 1707;
-pub const RPC_S_NO_ENDPOINT_FOUND: ::DWORD = 1708;
-pub const RPC_S_INVALID_TIMEOUT: ::DWORD = 1709;
-pub const RPC_S_OBJECT_NOT_FOUND: ::DWORD = 1710;
-pub const RPC_S_ALREADY_REGISTERED: ::DWORD = 1711;
-pub const RPC_S_TYPE_ALREADY_REGISTERED: ::DWORD = 1712;
-pub const RPC_S_ALREADY_LISTENING: ::DWORD = 1713;
-pub const RPC_S_NO_PROTSEQS_REGISTERED: ::DWORD = 1714;
-pub const RPC_S_NOT_LISTENING: ::DWORD = 1715;
-pub const RPC_S_UNKNOWN_MGR_TYPE: ::DWORD = 1716;
-pub const RPC_S_UNKNOWN_IF: ::DWORD = 1717;
-pub const RPC_S_NO_BINDINGS: ::DWORD = 1718;
-pub const RPC_S_NO_PROTSEQS: ::DWORD = 1719;
-pub const RPC_S_CANT_CREATE_ENDPOINT: ::DWORD = 1720;
-pub const RPC_S_OUT_OF_RESOURCES: ::DWORD = 1721;
-pub const RPC_S_SERVER_UNAVAILABLE: ::DWORD = 1722;
-pub const RPC_S_SERVER_TOO_BUSY: ::DWORD = 1723;
-pub const RPC_S_INVALID_NETWORK_OPTIONS: ::DWORD = 1724;
-pub const RPC_S_NO_CALL_ACTIVE: ::DWORD = 1725;
-pub const RPC_S_CALL_FAILED: ::DWORD = 1726;
-pub const RPC_S_CALL_FAILED_DNE: ::DWORD = 1727;
-pub const RPC_S_PROTOCOL_ERROR: ::DWORD = 1728;
-pub const RPC_S_PROXY_ACCESS_DENIED: ::DWORD = 1729;
-pub const RPC_S_UNSUPPORTED_TRANS_SYN: ::DWORD = 1730;
-pub const RPC_S_UNSUPPORTED_TYPE: ::DWORD = 1732;
-pub const RPC_S_INVALID_TAG: ::DWORD = 1733;
-pub const RPC_S_INVALID_BOUND: ::DWORD = 1734;
-pub const RPC_S_NO_ENTRY_NAME: ::DWORD = 1735;
-pub const RPC_S_INVALID_NAME_SYNTAX: ::DWORD = 1736;
-pub const RPC_S_UNSUPPORTED_NAME_SYNTAX: ::DWORD = 1737;
-pub const RPC_S_UUID_NO_ADDRESS: ::DWORD = 1739;
-pub const RPC_S_DUPLICATE_ENDPOINT: ::DWORD = 1740;
-pub const RPC_S_UNKNOWN_AUTHN_TYPE: ::DWORD = 1741;
-pub const RPC_S_MAX_CALLS_TOO_SMALL: ::DWORD = 1742;
-pub const RPC_S_STRING_TOO_LONG: ::DWORD = 1743;
-pub const RPC_S_PROTSEQ_NOT_FOUND: ::DWORD = 1744;
-pub const RPC_S_PROCNUM_OUT_OF_RANGE: ::DWORD = 1745;
-pub const RPC_S_BINDING_HAS_NO_AUTH: ::DWORD = 1746;
-pub const RPC_S_UNKNOWN_AUTHN_SERVICE: ::DWORD = 1747;
-pub const RPC_S_UNKNOWN_AUTHN_LEVEL: ::DWORD = 1748;
-pub const RPC_S_INVALID_AUTH_IDENTITY: ::DWORD = 1749;
-pub const RPC_S_UNKNOWN_AUTHZ_SERVICE: ::DWORD = 1750;
-pub const EPT_S_INVALID_ENTRY: ::DWORD = 1751;
-pub const EPT_S_CANT_PERFORM_OP: ::DWORD = 1752;
-pub const EPT_S_NOT_REGISTERED: ::DWORD = 1753;
-pub const RPC_S_NOTHING_TO_EXPORT: ::DWORD = 1754;
-pub const RPC_S_INCOMPLETE_NAME: ::DWORD = 1755;
-pub const RPC_S_INVALID_VERS_OPTION: ::DWORD = 1756;
-pub const RPC_S_NO_MORE_MEMBERS: ::DWORD = 1757;
-pub const RPC_S_NOT_ALL_OBJS_UNEXPORTED: ::DWORD = 1758;
-pub const RPC_S_INTERFACE_NOT_FOUND: ::DWORD = 1759;
-pub const RPC_S_ENTRY_ALREADY_EXISTS: ::DWORD = 1760;
-pub const RPC_S_ENTRY_NOT_FOUND: ::DWORD = 1761;
-pub const RPC_S_NAME_SERVICE_UNAVAILABLE: ::DWORD = 1762;
-pub const RPC_S_INVALID_NAF_ID: ::DWORD = 1763;
-pub const RPC_S_CANNOT_SUPPORT: ::DWORD = 1764;
-pub const RPC_S_NO_CONTEXT_AVAILABLE: ::DWORD = 1765;
-pub const RPC_S_INTERNAL_ERROR: ::DWORD = 1766;
-pub const RPC_S_ZERO_DIVIDE: ::DWORD = 1767;
-pub const RPC_S_ADDRESS_ERROR: ::DWORD = 1768;
-pub const RPC_S_FP_DIV_ZERO: ::DWORD = 1769;
-pub const RPC_S_FP_UNDERFLOW: ::DWORD = 1770;
-pub const RPC_S_FP_OVERFLOW: ::DWORD = 1771;
-pub const RPC_X_NO_MORE_ENTRIES: ::DWORD = 1772;
-pub const RPC_X_SS_CHAR_TRANS_OPEN_FAIL: ::DWORD = 1773;
-pub const RPC_X_SS_CHAR_TRANS_SHORT_FILE: ::DWORD = 1774;
-pub const RPC_X_SS_IN_NULL_CONTEXT: ::DWORD = 1775;
-pub const RPC_X_SS_CONTEXT_DAMAGED: ::DWORD = 1777;
-pub const RPC_X_SS_HANDLES_MISMATCH: ::DWORD = 1778;
-pub const RPC_X_SS_CANNOT_GET_CALL_HANDLE: ::DWORD = 1779;
-pub const RPC_X_NULL_REF_POINTER: ::DWORD = 1780;
-pub const RPC_X_ENUM_VALUE_OUT_OF_RANGE: ::DWORD = 1781;
-pub const RPC_X_BYTE_COUNT_TOO_SMALL: ::DWORD = 1782;
-pub const RPC_X_BAD_STUB_DATA: ::DWORD = 1783;
-pub const ERROR_INVALID_USER_BUFFER: ::DWORD = 1784;
-pub const ERROR_UNRECOGNIZED_MEDIA: ::DWORD = 1785;
-pub const ERROR_NO_TRUST_LSA_SECRET: ::DWORD = 1786;
-pub const ERROR_NO_TRUST_SAM_ACCOUNT: ::DWORD = 1787;
-pub const ERROR_TRUSTED_DOMAIN_FAILURE: ::DWORD = 1788;
-pub const ERROR_TRUSTED_RELATIONSHIP_FAILURE: ::DWORD = 1789;
-pub const ERROR_TRUST_FAILURE: ::DWORD = 1790;
-pub const RPC_S_CALL_IN_PROGRESS: ::DWORD = 1791;
-pub const ERROR_NETLOGON_NOT_STARTED: ::DWORD = 1792;
-pub const ERROR_ACCOUNT_EXPIRED: ::DWORD = 1793;
-pub const ERROR_REDIRECTOR_HAS_OPEN_HANDLES: ::DWORD = 1794;
-pub const ERROR_PRINTER_DRIVER_ALREADY_INSTALLED: ::DWORD = 1795;
-pub const ERROR_UNKNOWN_PORT: ::DWORD = 1796;
-pub const ERROR_UNKNOWN_PRINTER_DRIVER: ::DWORD = 1797;
-pub const ERROR_UNKNOWN_PRINTPROCESSOR: ::DWORD = 1798;
-pub const ERROR_INVALID_SEPARATOR_FILE: ::DWORD = 1799;
-pub const ERROR_INVALID_PRIORITY: ::DWORD = 1800;
-pub const ERROR_INVALID_PRINTER_NAME: ::DWORD = 1801;
-pub const ERROR_PRINTER_ALREADY_EXISTS: ::DWORD = 1802;
-pub const ERROR_INVALID_PRINTER_COMMAND: ::DWORD = 1803;
-pub const ERROR_INVALID_DATATYPE: ::DWORD = 1804;
-pub const ERROR_INVALID_ENVIRONMENT: ::DWORD = 1805;
-pub const RPC_S_NO_MORE_BINDINGS: ::DWORD = 1806;
-pub const ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT: ::DWORD = 1807;
-pub const ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT: ::DWORD = 1808;
-pub const ERROR_NOLOGON_SERVER_TRUST_ACCOUNT: ::DWORD = 1809;
-pub const ERROR_DOMAIN_TRUST_INCONSISTENT: ::DWORD = 1810;
-pub const ERROR_SERVER_HAS_OPEN_HANDLES: ::DWORD = 1811;
-pub const ERROR_RESOURCE_DATA_NOT_FOUND: ::DWORD = 1812;
-pub const ERROR_RESOURCE_TYPE_NOT_FOUND: ::DWORD = 1813;
-pub const ERROR_RESOURCE_NAME_NOT_FOUND: ::DWORD = 1814;
-pub const ERROR_RESOURCE_LANG_NOT_FOUND: ::DWORD = 1815;
-pub const ERROR_NOT_ENOUGH_QUOTA: ::DWORD = 1816;
-pub const RPC_S_NO_INTERFACES: ::DWORD = 1817;
-pub const RPC_S_CALL_CANCELLED: ::DWORD = 1818;
-pub const RPC_S_BINDING_INCOMPLETE: ::DWORD = 1819;
-pub const RPC_S_COMM_FAILURE: ::DWORD = 1820;
-pub const RPC_S_UNSUPPORTED_AUTHN_LEVEL: ::DWORD = 1821;
-pub const RPC_S_NO_PRINC_NAME: ::DWORD = 1822;
-pub const RPC_S_NOT_RPC_ERROR: ::DWORD = 1823;
-pub const RPC_S_UUID_LOCAL_ONLY: ::DWORD = 1824;
-pub const RPC_S_SEC_PKG_ERROR: ::DWORD = 1825;
-pub const RPC_S_NOT_CANCELLED: ::DWORD = 1826;
-pub const RPC_X_INVALID_ES_ACTION: ::DWORD = 1827;
-pub const RPC_X_WRONG_ES_VERSION: ::DWORD = 1828;
-pub const RPC_X_WRONG_STUB_VERSION: ::DWORD = 1829;
-pub const RPC_X_INVALID_PIPE_OBJECT: ::DWORD = 1830;
-pub const RPC_X_WRONG_PIPE_ORDER: ::DWORD = 1831;
-pub const RPC_X_WRONG_PIPE_VERSION: ::DWORD = 1832;
-pub const RPC_S_COOKIE_AUTH_FAILED: ::DWORD = 1833;
-pub const RPC_S_GROUP_MEMBER_NOT_FOUND: ::DWORD = 1898;
-pub const EPT_S_CANT_CREATE: ::DWORD = 1899;
-pub const RPC_S_INVALID_OBJECT: ::DWORD = 1900;
-pub const ERROR_INVALID_TIME: ::DWORD = 1901;
-pub const ERROR_INVALID_FORM_NAME: ::DWORD = 1902;
-pub const ERROR_INVALID_FORM_SIZE: ::DWORD = 1903;
-pub const ERROR_ALREADY_WAITING: ::DWORD = 1904;
-pub const ERROR_PRINTER_DELETED: ::DWORD = 1905;
-pub const ERROR_INVALID_PRINTER_STATE: ::DWORD = 1906;
-pub const ERROR_PASSWORD_MUST_CHANGE: ::DWORD = 1907;
-pub const ERROR_DOMAIN_CONTROLLER_NOT_FOUND: ::DWORD = 1908;
-pub const ERROR_ACCOUNT_LOCKED_OUT: ::DWORD = 1909;
-pub const OR_INVALID_OXID: ::DWORD = 1910;
-pub const OR_INVALID_OID: ::DWORD = 1911;
-pub const OR_INVALID_SET: ::DWORD = 1912;
-pub const RPC_S_SEND_INCOMPLETE: ::DWORD = 1913;
-pub const RPC_S_INVALID_ASYNC_HANDLE: ::DWORD = 1914;
-pub const RPC_S_INVALID_ASYNC_CALL: ::DWORD = 1915;
-pub const RPC_X_PIPE_CLOSED: ::DWORD = 1916;
-pub const RPC_X_PIPE_DISCIPLINE_ERROR: ::DWORD = 1917;
-pub const RPC_X_PIPE_EMPTY: ::DWORD = 1918;
-pub const ERROR_NO_SITENAME: ::DWORD = 1919;
-pub const ERROR_CANT_ACCESS_FILE: ::DWORD = 1920;
-pub const ERROR_CANT_RESOLVE_FILENAME: ::DWORD = 1921;
-pub const RPC_S_ENTRY_TYPE_MISMATCH: ::DWORD = 1922;
-pub const RPC_S_NOT_ALL_OBJS_EXPORTED: ::DWORD = 1923;
-pub const RPC_S_INTERFACE_NOT_EXPORTED: ::DWORD = 1924;
-pub const RPC_S_PROFILE_NOT_ADDED: ::DWORD = 1925;
-pub const RPC_S_PRF_ELT_NOT_ADDED: ::DWORD = 1926;
-pub const RPC_S_PRF_ELT_NOT_REMOVED: ::DWORD = 1927;
-pub const RPC_S_GRP_ELT_NOT_ADDED: ::DWORD = 1928;
-pub const RPC_S_GRP_ELT_NOT_REMOVED: ::DWORD = 1929;
-pub const ERROR_KM_DRIVER_BLOCKED: ::DWORD = 1930;
-pub const ERROR_CONTEXT_EXPIRED: ::DWORD = 1931;
-pub const ERROR_PER_USER_TRUST_QUOTA_EXCEEDED: ::DWORD = 1932;
-pub const ERROR_ALL_USER_TRUST_QUOTA_EXCEEDED: ::DWORD = 1933;
-pub const ERROR_USER_DELETE_TRUST_QUOTA_EXCEEDED: ::DWORD = 1934;
-pub const ERROR_AUTHENTICATION_FIREWALL_FAILED: ::DWORD = 1935;
-pub const ERROR_REMOTE_PRINT_CONNECTIONS_BLOCKED: ::DWORD = 1936;
-pub const ERROR_NTLM_BLOCKED: ::DWORD = 1937;
-pub const ERROR_PASSWORD_CHANGE_REQUIRED: ::DWORD = 1938;
-pub const ERROR_INVALID_PIXEL_FORMAT: ::DWORD = 2000;
-pub const ERROR_BAD_DRIVER: ::DWORD = 2001;
-pub const ERROR_INVALID_WINDOW_STYLE: ::DWORD = 2002;
-pub const ERROR_METAFILE_NOT_SUPPORTED: ::DWORD = 2003;
-pub const ERROR_TRANSFORM_NOT_SUPPORTED: ::DWORD = 2004;
-pub const ERROR_CLIPPING_NOT_SUPPORTED: ::DWORD = 2005;
-pub const ERROR_INVALID_CMM: ::DWORD = 2010;
-pub const ERROR_INVALID_PROFILE: ::DWORD = 2011;
-pub const ERROR_TAG_NOT_FOUND: ::DWORD = 2012;
-pub const ERROR_TAG_NOT_PRESENT: ::DWORD = 2013;
-pub const ERROR_DUPLICATE_TAG: ::DWORD = 2014;
-pub const ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE: ::DWORD = 2015;
-pub const ERROR_PROFILE_NOT_FOUND: ::DWORD = 2016;
-pub const ERROR_INVALID_COLORSPACE: ::DWORD = 2017;
-pub const ERROR_ICM_NOT_ENABLED: ::DWORD = 2018;
-pub const ERROR_DELETING_ICM_XFORM: ::DWORD = 2019;
-pub const ERROR_INVALID_TRANSFORM: ::DWORD = 2020;
-pub const ERROR_COLORSPACE_MISMATCH: ::DWORD = 2021;
-pub const ERROR_INVALID_COLORINDEX: ::DWORD = 2022;
-pub const ERROR_PROFILE_DOES_NOT_MATCH_DEVICE: ::DWORD = 2023;
-pub const ERROR_CONNECTED_OTHER_PASSWORD: ::DWORD = 2108;
-pub const ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT: ::DWORD = 2109;
-pub const ERROR_BAD_USERNAME: ::DWORD = 2202;
-pub const ERROR_NOT_CONNECTED: ::DWORD = 2250;
-pub const ERROR_OPEN_FILES: ::DWORD = 2401;
-pub const ERROR_ACTIVE_CONNECTIONS: ::DWORD = 2402;
-pub const ERROR_DEVICE_IN_USE: ::DWORD = 2404;
-pub const ERROR_UNKNOWN_PRINT_MONITOR: ::DWORD = 3000;
-pub const ERROR_PRINTER_DRIVER_IN_USE: ::DWORD = 3001;
-pub const ERROR_SPOOL_FILE_NOT_FOUND: ::DWORD = 3002;
-pub const ERROR_SPL_NO_STARTDOC: ::DWORD = 3003;
-pub const ERROR_SPL_NO_ADDJOB: ::DWORD = 3004;
-pub const ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED: ::DWORD = 3005;
-pub const ERROR_PRINT_MONITOR_ALREADY_INSTALLED: ::DWORD = 3006;
-pub const ERROR_INVALID_PRINT_MONITOR: ::DWORD = 3007;
-pub const ERROR_PRINT_MONITOR_IN_USE: ::DWORD = 3008;
-pub const ERROR_PRINTER_HAS_JOBS_QUEUED: ::DWORD = 3009;
-pub const ERROR_SUCCESS_REBOOT_REQUIRED: ::DWORD = 3010;
-pub const ERROR_SUCCESS_RESTART_REQUIRED: ::DWORD = 3011;
-pub const ERROR_PRINTER_NOT_FOUND: ::DWORD = 3012;
-pub const ERROR_PRINTER_DRIVER_WARNED: ::DWORD = 3013;
-pub const ERROR_PRINTER_DRIVER_BLOCKED: ::DWORD = 3014;
-pub const ERROR_PRINTER_DRIVER_PACKAGE_IN_USE: ::DWORD = 3015;
-pub const ERROR_CORE_DRIVER_PACKAGE_NOT_FOUND: ::DWORD = 3016;
-pub const ERROR_FAIL_REBOOT_REQUIRED: ::DWORD = 3017;
-pub const ERROR_FAIL_REBOOT_INITIATED: ::DWORD = 3018;
-pub const ERROR_PRINTER_DRIVER_DOWNLOAD_NEEDED: ::DWORD = 3019;
-pub const ERROR_PRINT_JOB_RESTART_REQUIRED: ::DWORD = 3020;
-pub const ERROR_INVALID_PRINTER_DRIVER_MANIFEST: ::DWORD = 3021;
-pub const ERROR_PRINTER_NOT_SHAREABLE: ::DWORD = 3022;
-pub const ERROR_REQUEST_PAUSED: ::DWORD = 3050;
-pub const ERROR_IO_REISSUE_AS_CACHED: ::DWORD = 3950;
-pub const ERROR_WINS_INTERNAL: ::DWORD = 4000;
-pub const ERROR_CAN_NOT_DEL_LOCAL_WINS: ::DWORD = 4001;
-pub const ERROR_STATIC_INIT: ::DWORD = 4002;
-pub const ERROR_INC_BACKUP: ::DWORD = 4003;
-pub const ERROR_FULL_BACKUP: ::DWORD = 4004;
-pub const ERROR_REC_NON_EXISTENT: ::DWORD = 4005;
-pub const ERROR_RPL_NOT_ALLOWED: ::DWORD = 4006;
-pub const PEERDIST_ERROR_CONTENTINFO_VERSION_UNSUPPORTED: ::DWORD = 4050;
-pub const PEERDIST_ERROR_CANNOT_PARSE_CONTENTINFO: ::DWORD = 4051;
-pub const PEERDIST_ERROR_MISSING_DATA: ::DWORD = 4052;
-pub const PEERDIST_ERROR_NO_MORE: ::DWORD = 4053;
-pub const PEERDIST_ERROR_NOT_INITIALIZED: ::DWORD = 4054;
-pub const PEERDIST_ERROR_ALREADY_INITIALIZED: ::DWORD = 4055;
-pub const PEERDIST_ERROR_SHUTDOWN_IN_PROGRESS: ::DWORD = 4056;
-pub const PEERDIST_ERROR_INVALIDATED: ::DWORD = 4057;
-pub const PEERDIST_ERROR_ALREADY_EXISTS: ::DWORD = 4058;
-pub const PEERDIST_ERROR_OPERATION_NOTFOUND: ::DWORD = 4059;
-pub const PEERDIST_ERROR_ALREADY_COMPLETED: ::DWORD = 4060;
-pub const PEERDIST_ERROR_OUT_OF_BOUNDS: ::DWORD = 4061;
-pub const PEERDIST_ERROR_VERSION_UNSUPPORTED: ::DWORD = 4062;
-pub const PEERDIST_ERROR_INVALID_CONFIGURATION: ::DWORD = 4063;
-pub const PEERDIST_ERROR_NOT_LICENSED: ::DWORD = 4064;
-pub const PEERDIST_ERROR_SERVICE_UNAVAILABLE: ::DWORD = 4065;
-pub const PEERDIST_ERROR_TRUST_FAILURE: ::DWORD = 4066;
-pub const ERROR_DHCP_ADDRESS_CONFLICT: ::DWORD = 4100;
-pub const ERROR_WMI_GUID_NOT_FOUND: ::DWORD = 4200;
-pub const ERROR_WMI_INSTANCE_NOT_FOUND: ::DWORD = 4201;
-pub const ERROR_WMI_ITEMID_NOT_FOUND: ::DWORD = 4202;
-pub const ERROR_WMI_TRY_AGAIN: ::DWORD = 4203;
-pub const ERROR_WMI_DP_NOT_FOUND: ::DWORD = 4204;
-pub const ERROR_WMI_UNRESOLVED_INSTANCE_REF: ::DWORD = 4205;
-pub const ERROR_WMI_ALREADY_ENABLED: ::DWORD = 4206;
-pub const ERROR_WMI_GUID_DISCONNECTED: ::DWORD = 4207;
-pub const ERROR_WMI_SERVER_UNAVAILABLE: ::DWORD = 4208;
-pub const ERROR_WMI_DP_FAILED: ::DWORD = 4209;
-pub const ERROR_WMI_INVALID_MOF: ::DWORD = 4210;
-pub const ERROR_WMI_INVALID_REGINFO: ::DWORD = 4211;
-pub const ERROR_WMI_ALREADY_DISABLED: ::DWORD = 4212;
-pub const ERROR_WMI_READ_ONLY: ::DWORD = 4213;
-pub const ERROR_WMI_SET_FAILURE: ::DWORD = 4214;
-pub const ERROR_NOT_APPCONTAINER: ::DWORD = 4250;
-pub const ERROR_APPCONTAINER_REQUIRED: ::DWORD = 4251;
-pub const ERROR_NOT_SUPPORTED_IN_APPCONTAINER: ::DWORD = 4252;
-pub const ERROR_INVALID_PACKAGE_SID_LENGTH: ::DWORD = 4253;
-pub const ERROR_INVALID_MEDIA: ::DWORD = 4300;
-pub const ERROR_INVALID_LIBRARY: ::DWORD = 4301;
-pub const ERROR_INVALID_MEDIA_POOL: ::DWORD = 4302;
-pub const ERROR_DRIVE_MEDIA_MISMATCH: ::DWORD = 4303;
-pub const ERROR_MEDIA_OFFLINE: ::DWORD = 4304;
-pub const ERROR_LIBRARY_OFFLINE: ::DWORD = 4305;
-pub const ERROR_EMPTY: ::DWORD = 4306;
-pub const ERROR_NOT_EMPTY: ::DWORD = 4307;
-pub const ERROR_MEDIA_UNAVAILABLE: ::DWORD = 4308;
-pub const ERROR_RESOURCE_DISABLED: ::DWORD = 4309;
-pub const ERROR_INVALID_CLEANER: ::DWORD = 4310;
-pub const ERROR_UNABLE_TO_CLEAN: ::DWORD = 4311;
-pub const ERROR_OBJECT_NOT_FOUND: ::DWORD = 4312;
-pub const ERROR_DATABASE_FAILURE: ::DWORD = 4313;
-pub const ERROR_DATABASE_FULL: ::DWORD = 4314;
-pub const ERROR_MEDIA_INCOMPATIBLE: ::DWORD = 4315;
-pub const ERROR_RESOURCE_NOT_PRESENT: ::DWORD = 4316;
-pub const ERROR_INVALID_OPERATION: ::DWORD = 4317;
-pub const ERROR_MEDIA_NOT_AVAILABLE: ::DWORD = 4318;
-pub const ERROR_DEVICE_NOT_AVAILABLE: ::DWORD = 4319;
-pub const ERROR_REQUEST_REFUSED: ::DWORD = 4320;
-pub const ERROR_INVALID_DRIVE_OBJECT: ::DWORD = 4321;
-pub const ERROR_LIBRARY_FULL: ::DWORD = 4322;
-pub const ERROR_MEDIUM_NOT_ACCESSIBLE: ::DWORD = 4323;
-pub const ERROR_UNABLE_TO_LOAD_MEDIUM: ::DWORD = 4324;
-pub const ERROR_UNABLE_TO_INVENTORY_DRIVE: ::DWORD = 4325;
-pub const ERROR_UNABLE_TO_INVENTORY_SLOT: ::DWORD = 4326;
-pub const ERROR_UNABLE_TO_INVENTORY_TRANSPORT: ::DWORD = 4327;
-pub const ERROR_TRANSPORT_FULL: ::DWORD = 4328;
-pub const ERROR_CONTROLLING_IEPORT: ::DWORD = 4329;
-pub const ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA: ::DWORD = 4330;
-pub const ERROR_CLEANER_SLOT_SET: ::DWORD = 4331;
-pub const ERROR_CLEANER_SLOT_NOT_SET: ::DWORD = 4332;
-pub const ERROR_CLEANER_CARTRIDGE_SPENT: ::DWORD = 4333;
-pub const ERROR_UNEXPECTED_OMID: ::DWORD = 4334;
-pub const ERROR_CANT_DELETE_LAST_ITEM: ::DWORD = 4335;
-pub const ERROR_MESSAGE_EXCEEDS_MAX_SIZE: ::DWORD = 4336;
-pub const ERROR_VOLUME_CONTAINS_SYS_FILES: ::DWORD = 4337;
-pub const ERROR_INDIGENOUS_TYPE: ::DWORD = 4338;
-pub const ERROR_NO_SUPPORTING_DRIVES: ::DWORD = 4339;
-pub const ERROR_CLEANER_CARTRIDGE_INSTALLED: ::DWORD = 4340;
-pub const ERROR_IEPORT_FULL: ::DWORD = 4341;
-pub const ERROR_FILE_OFFLINE: ::DWORD = 4350;
-pub const ERROR_REMOTE_STORAGE_NOT_ACTIVE: ::DWORD = 4351;
-pub const ERROR_REMOTE_STORAGE_MEDIA_ERROR: ::DWORD = 4352;
-pub const ERROR_NOT_A_REPARSE_POINT: ::DWORD = 4390;
-pub const ERROR_REPARSE_ATTRIBUTE_CONFLICT: ::DWORD = 4391;
-pub const ERROR_INVALID_REPARSE_DATA: ::DWORD = 4392;
-pub const ERROR_REPARSE_TAG_INVALID: ::DWORD = 4393;
-pub const ERROR_REPARSE_TAG_MISMATCH: ::DWORD = 4394;
-pub const ERROR_APP_DATA_NOT_FOUND: ::DWORD = 4400;
-pub const ERROR_APP_DATA_EXPIRED: ::DWORD = 4401;
-pub const ERROR_APP_DATA_CORRUPT: ::DWORD = 4402;
-pub const ERROR_APP_DATA_LIMIT_EXCEEDED: ::DWORD = 4403;
-pub const ERROR_APP_DATA_REBOOT_REQUIRED: ::DWORD = 4404;
-pub const ERROR_SECUREBOOT_ROLLBACK_DETECTED: ::DWORD = 4420;
-pub const ERROR_SECUREBOOT_POLICY_VIOLATION: ::DWORD = 4421;
-pub const ERROR_SECUREBOOT_INVALID_POLICY: ::DWORD = 4422;
-pub const ERROR_SECUREBOOT_POLICY_PUBLISHER_NOT_FOUND: ::DWORD = 4423;
-pub const ERROR_SECUREBOOT_POLICY_NOT_SIGNED: ::DWORD = 4424;
-pub const ERROR_SECUREBOOT_NOT_ENABLED: ::DWORD = 4425;
-pub const ERROR_SECUREBOOT_FILE_REPLACED: ::DWORD = 4426;
-pub const ERROR_OFFLOAD_READ_FLT_NOT_SUPPORTED: ::DWORD = 4440;
-pub const ERROR_OFFLOAD_WRITE_FLT_NOT_SUPPORTED: ::DWORD = 4441;
-pub const ERROR_OFFLOAD_READ_FILE_NOT_SUPPORTED: ::DWORD = 4442;
-pub const ERROR_OFFLOAD_WRITE_FILE_NOT_SUPPORTED: ::DWORD = 4443;
-pub const ERROR_VOLUME_NOT_SIS_ENABLED: ::DWORD = 4500;
-pub const ERROR_DEPENDENT_RESOURCE_EXISTS: ::DWORD = 5001;
-pub const ERROR_DEPENDENCY_NOT_FOUND: ::DWORD = 5002;
-pub const ERROR_DEPENDENCY_ALREADY_EXISTS: ::DWORD = 5003;
-pub const ERROR_RESOURCE_NOT_ONLINE: ::DWORD = 5004;
-pub const ERROR_HOST_NODE_NOT_AVAILABLE: ::DWORD = 5005;
-pub const ERROR_RESOURCE_NOT_AVAILABLE: ::DWORD = 5006;
-pub const ERROR_RESOURCE_NOT_FOUND: ::DWORD = 5007;
-pub const ERROR_SHUTDOWN_CLUSTER: ::DWORD = 5008;
-pub const ERROR_CANT_EVICT_ACTIVE_NODE: ::DWORD = 5009;
-pub const ERROR_OBJECT_ALREADY_EXISTS: ::DWORD = 5010;
-pub const ERROR_OBJECT_IN_LIST: ::DWORD = 5011;
-pub const ERROR_GROUP_NOT_AVAILABLE: ::DWORD = 5012;
-pub const ERROR_GROUP_NOT_FOUND: ::DWORD = 5013;
-pub const ERROR_GROUP_NOT_ONLINE: ::DWORD = 5014;
-pub const ERROR_HOST_NODE_NOT_RESOURCE_OWNER: ::DWORD = 5015;
-pub const ERROR_HOST_NODE_NOT_GROUP_OWNER: ::DWORD = 5016;
-pub const ERROR_RESMON_CREATE_FAILED: ::DWORD = 5017;
-pub const ERROR_RESMON_ONLINE_FAILED: ::DWORD = 5018;
-pub const ERROR_RESOURCE_ONLINE: ::DWORD = 5019;
-pub const ERROR_QUORUM_RESOURCE: ::DWORD = 5020;
-pub const ERROR_NOT_QUORUM_CAPABLE: ::DWORD = 5021;
-pub const ERROR_CLUSTER_SHUTTING_DOWN: ::DWORD = 5022;
-pub const ERROR_INVALID_STATE: ::DWORD = 5023;
-pub const ERROR_RESOURCE_PROPERTIES_STORED: ::DWORD = 5024;
-pub const ERROR_NOT_QUORUM_CLASS: ::DWORD = 5025;
-pub const ERROR_CORE_RESOURCE: ::DWORD = 5026;
-pub const ERROR_QUORUM_RESOURCE_ONLINE_FAILED: ::DWORD = 5027;
-pub const ERROR_QUORUMLOG_OPEN_FAILED: ::DWORD = 5028;
-pub const ERROR_CLUSTERLOG_CORRUPT: ::DWORD = 5029;
-pub const ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE: ::DWORD = 5030;
-pub const ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE: ::DWORD = 5031;
-pub const ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND: ::DWORD = 5032;
-pub const ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE: ::DWORD = 5033;
-pub const ERROR_QUORUM_OWNER_ALIVE: ::DWORD = 5034;
-pub const ERROR_NETWORK_NOT_AVAILABLE: ::DWORD = 5035;
-pub const ERROR_NODE_NOT_AVAILABLE: ::DWORD = 5036;
-pub const ERROR_ALL_NODES_NOT_AVAILABLE: ::DWORD = 5037;
-pub const ERROR_RESOURCE_FAILED: ::DWORD = 5038;
-pub const ERROR_CLUSTER_INVALID_NODE: ::DWORD = 5039;
-pub const ERROR_CLUSTER_NODE_EXISTS: ::DWORD = 5040;
-pub const ERROR_CLUSTER_JOIN_IN_PROGRESS: ::DWORD = 5041;
-pub const ERROR_CLUSTER_NODE_NOT_FOUND: ::DWORD = 5042;
-pub const ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND: ::DWORD = 5043;
-pub const ERROR_CLUSTER_NETWORK_EXISTS: ::DWORD = 5044;
-pub const ERROR_CLUSTER_NETWORK_NOT_FOUND: ::DWORD = 5045;
-pub const ERROR_CLUSTER_NETINTERFACE_EXISTS: ::DWORD = 5046;
-pub const ERROR_CLUSTER_NETINTERFACE_NOT_FOUND: ::DWORD = 5047;
-pub const ERROR_CLUSTER_INVALID_REQUEST: ::DWORD = 5048;
-pub const ERROR_CLUSTER_INVALID_NETWORK_PROVIDER: ::DWORD = 5049;
-pub const ERROR_CLUSTER_NODE_DOWN: ::DWORD = 5050;
-pub const ERROR_CLUSTER_NODE_UNREACHABLE: ::DWORD = 5051;
-pub const ERROR_CLUSTER_NODE_NOT_MEMBER: ::DWORD = 5052;
-pub const ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS: ::DWORD = 5053;
-pub const ERROR_CLUSTER_INVALID_NETWORK: ::DWORD = 5054;
-pub const ERROR_CLUSTER_NODE_UP: ::DWORD = 5056;
-pub const ERROR_CLUSTER_IPADDR_IN_USE: ::DWORD = 5057;
-pub const ERROR_CLUSTER_NODE_NOT_PAUSED: ::DWORD = 5058;
-pub const ERROR_CLUSTER_NO_SECURITY_CONTEXT: ::DWORD = 5059;
-pub const ERROR_CLUSTER_NETWORK_NOT_INTERNAL: ::DWORD = 5060;
-pub const ERROR_CLUSTER_NODE_ALREADY_UP: ::DWORD = 5061;
-pub const ERROR_CLUSTER_NODE_ALREADY_DOWN: ::DWORD = 5062;
-pub const ERROR_CLUSTER_NETWORK_ALREADY_ONLINE: ::DWORD = 5063;
-pub const ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE: ::DWORD = 5064;
-pub const ERROR_CLUSTER_NODE_ALREADY_MEMBER: ::DWORD = 5065;
-pub const ERROR_CLUSTER_LAST_INTERNAL_NETWORK: ::DWORD = 5066;
-pub const ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS: ::DWORD = 5067;
-pub const ERROR_INVALID_OPERATION_ON_QUORUM: ::DWORD = 5068;
-pub const ERROR_DEPENDENCY_NOT_ALLOWED: ::DWORD = 5069;
-pub const ERROR_CLUSTER_NODE_PAUSED: ::DWORD = 5070;
-pub const ERROR_NODE_CANT_HOST_RESOURCE: ::DWORD = 5071;
-pub const ERROR_CLUSTER_NODE_NOT_READY: ::DWORD = 5072;
-pub const ERROR_CLUSTER_NODE_SHUTTING_DOWN: ::DWORD = 5073;
-pub const ERROR_CLUSTER_JOIN_ABORTED: ::DWORD = 5074;
-pub const ERROR_CLUSTER_INCOMPATIBLE_VERSIONS: ::DWORD = 5075;
-pub const ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED: ::DWORD = 5076;
-pub const ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED: ::DWORD = 5077;
-pub const ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND: ::DWORD = 5078;
-pub const ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED: ::DWORD = 5079;
-pub const ERROR_CLUSTER_RESNAME_NOT_FOUND: ::DWORD = 5080;
-pub const ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED: ::DWORD = 5081;
-pub const ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST: ::DWORD = 5082;
-pub const ERROR_CLUSTER_DATABASE_SEQMISMATCH: ::DWORD = 5083;
-pub const ERROR_RESMON_INVALID_STATE: ::DWORD = 5084;
-pub const ERROR_CLUSTER_GUM_NOT_LOCKER: ::DWORD = 5085;
-pub const ERROR_QUORUM_DISK_NOT_FOUND: ::DWORD = 5086;
-pub const ERROR_DATABASE_BACKUP_CORRUPT: ::DWORD = 5087;
-pub const ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT: ::DWORD = 5088;
-pub const ERROR_RESOURCE_PROPERTY_UNCHANGEABLE: ::DWORD = 5089;
-pub const ERROR_NO_ADMIN_ACCESS_POINT: ::DWORD = 5090;
-pub const ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE: ::DWORD = 5890;
-pub const ERROR_CLUSTER_QUORUMLOG_NOT_FOUND: ::DWORD = 5891;
-pub const ERROR_CLUSTER_MEMBERSHIP_HALT: ::DWORD = 5892;
-pub const ERROR_CLUSTER_INSTANCE_ID_MISMATCH: ::DWORD = 5893;
-pub const ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP: ::DWORD = 5894;
-pub const ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH: ::DWORD = 5895;
-pub const ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP: ::DWORD = 5896;
-pub const ERROR_CLUSTER_PARAMETER_MISMATCH: ::DWORD = 5897;
-pub const ERROR_NODE_CANNOT_BE_CLUSTERED: ::DWORD = 5898;
-pub const ERROR_CLUSTER_WRONG_OS_VERSION: ::DWORD = 5899;
-pub const ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME: ::DWORD = 5900;
-pub const ERROR_CLUSCFG_ALREADY_COMMITTED: ::DWORD = 5901;
-pub const ERROR_CLUSCFG_ROLLBACK_FAILED: ::DWORD = 5902;
-pub const ERROR_CLUSCFG_SYSTEM_DISK_DRIVE_LETTER_CONFLICT: ::DWORD = 5903;
-pub const ERROR_CLUSTER_OLD_VERSION: ::DWORD = 5904;
-pub const ERROR_CLUSTER_MISMATCHED_COMPUTER_ACCT_NAME: ::DWORD = 5905;
-pub const ERROR_CLUSTER_NO_NET_ADAPTERS: ::DWORD = 5906;
-pub const ERROR_CLUSTER_POISONED: ::DWORD = 5907;
-pub const ERROR_CLUSTER_GROUP_MOVING: ::DWORD = 5908;
-pub const ERROR_CLUSTER_RESOURCE_TYPE_BUSY: ::DWORD = 5909;
-pub const ERROR_RESOURCE_CALL_TIMED_OUT: ::DWORD = 5910;
-pub const ERROR_INVALID_CLUSTER_IPV6_ADDRESS: ::DWORD = 5911;
-pub const ERROR_CLUSTER_INTERNAL_INVALID_FUNCTION: ::DWORD = 5912;
-pub const ERROR_CLUSTER_PARAMETER_OUT_OF_BOUNDS: ::DWORD = 5913;
-pub const ERROR_CLUSTER_PARTIAL_SEND: ::DWORD = 5914;
-pub const ERROR_CLUSTER_REGISTRY_INVALID_FUNCTION: ::DWORD = 5915;
-pub const ERROR_CLUSTER_INVALID_STRING_TERMINATION: ::DWORD = 5916;
-pub const ERROR_CLUSTER_INVALID_STRING_FORMAT: ::DWORD = 5917;
-pub const ERROR_CLUSTER_DATABASE_TRANSACTION_IN_PROGRESS: ::DWORD = 5918;
-pub const ERROR_CLUSTER_DATABASE_TRANSACTION_NOT_IN_PROGRESS: ::DWORD = 5919;
-pub const ERROR_CLUSTER_NULL_DATA: ::DWORD = 5920;
-pub const ERROR_CLUSTER_PARTIAL_READ: ::DWORD = 5921;
-pub const ERROR_CLUSTER_PARTIAL_WRITE: ::DWORD = 5922;
-pub const ERROR_CLUSTER_CANT_DESERIALIZE_DATA: ::DWORD = 5923;
-pub const ERROR_DEPENDENT_RESOURCE_PROPERTY_CONFLICT: ::DWORD = 5924;
-pub const ERROR_CLUSTER_NO_QUORUM: ::DWORD = 5925;
-pub const ERROR_CLUSTER_INVALID_IPV6_NETWORK: ::DWORD = 5926;
-pub const ERROR_CLUSTER_INVALID_IPV6_TUNNEL_NETWORK: ::DWORD = 5927;
-pub const ERROR_QUORUM_NOT_ALLOWED_IN_THIS_GROUP: ::DWORD = 5928;
-pub const ERROR_DEPENDENCY_TREE_TOO_COMPLEX: ::DWORD = 5929;
-pub const ERROR_EXCEPTION_IN_RESOURCE_CALL: ::DWORD = 5930;
-pub const ERROR_CLUSTER_RHS_FAILED_INITIALIZATION: ::DWORD = 5931;
-pub const ERROR_CLUSTER_NOT_INSTALLED: ::DWORD = 5932;
-pub const ERROR_CLUSTER_RESOURCES_MUST_BE_ONLINE_ON_THE_SAME_NODE: ::DWORD = 5933;
-pub const ERROR_CLUSTER_MAX_NODES_IN_CLUSTER: ::DWORD = 5934;
-pub const ERROR_CLUSTER_TOO_MANY_NODES: ::DWORD = 5935;
-pub const ERROR_CLUSTER_OBJECT_ALREADY_USED: ::DWORD = 5936;
-pub const ERROR_NONCORE_GROUPS_FOUND: ::DWORD = 5937;
-pub const ERROR_FILE_SHARE_RESOURCE_CONFLICT: ::DWORD = 5938;
-pub const ERROR_CLUSTER_EVICT_INVALID_REQUEST: ::DWORD = 5939;
-pub const ERROR_CLUSTER_SINGLETON_RESOURCE: ::DWORD = 5940;
-pub const ERROR_CLUSTER_GROUP_SINGLETON_RESOURCE: ::DWORD = 5941;
-pub const ERROR_CLUSTER_RESOURCE_PROVIDER_FAILED: ::DWORD = 5942;
-pub const ERROR_CLUSTER_RESOURCE_CONFIGURATION_ERROR: ::DWORD = 5943;
-pub const ERROR_CLUSTER_GROUP_BUSY: ::DWORD = 5944;
-pub const ERROR_CLUSTER_NOT_SHARED_VOLUME: ::DWORD = 5945;
-pub const ERROR_CLUSTER_INVALID_SECURITY_DESCRIPTOR: ::DWORD = 5946;
-pub const ERROR_CLUSTER_SHARED_VOLUMES_IN_USE: ::DWORD = 5947;
-pub const ERROR_CLUSTER_USE_SHARED_VOLUMES_API: ::DWORD = 5948;
-pub const ERROR_CLUSTER_BACKUP_IN_PROGRESS: ::DWORD = 5949;
-pub const ERROR_NON_CSV_PATH: ::DWORD = 5950;
-pub const ERROR_CSV_VOLUME_NOT_LOCAL: ::DWORD = 5951;
-pub const ERROR_CLUSTER_WATCHDOG_TERMINATING: ::DWORD = 5952;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_MOVE_INCOMPATIBLE_NODES: ::DWORD = 5953;
-pub const ERROR_CLUSTER_INVALID_NODE_WEIGHT: ::DWORD = 5954;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_CALL: ::DWORD = 5955;
-pub const ERROR_RESMON_SYSTEM_RESOURCES_LACKING: ::DWORD = 5956;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_MOVE_NOT_ENOUGH_RESOURCES_ON_DESTINATION: ::DWORD = 5957;
-pub const ERROR_CLUSTER_RESOURCE_VETOED_MOVE_NOT_ENOUGH_RESOURCES_ON_SOURCE: ::DWORD = 5958;
-pub const ERROR_CLUSTER_GROUP_QUEUED: ::DWORD = 5959;
-pub const ERROR_CLUSTER_RESOURCE_LOCKED_STATUS: ::DWORD = 5960;
-pub const ERROR_CLUSTER_SHARED_VOLUME_FAILOVER_NOT_ALLOWED: ::DWORD = 5961;
-pub const ERROR_CLUSTER_NODE_DRAIN_IN_PROGRESS: ::DWORD = 5962;
-pub const ERROR_CLUSTER_DISK_NOT_CONNECTED: ::DWORD = 5963;
-pub const ERROR_DISK_NOT_CSV_CAPABLE: ::DWORD = 5964;
-pub const ERROR_RESOURCE_NOT_IN_AVAILABLE_STORAGE: ::DWORD = 5965;
-pub const ERROR_CLUSTER_SHARED_VOLUME_REDIRECTED: ::DWORD = 5966;
-pub const ERROR_CLUSTER_SHARED_VOLUME_NOT_REDIRECTED: ::DWORD = 5967;
-pub const ERROR_CLUSTER_CANNOT_RETURN_PROPERTIES: ::DWORD = 5968;
-pub const ERROR_CLUSTER_RESOURCE_CONTAINS_UNSUPPORTED_DIFF_AREA_FOR_SHARED_VOLUMES: ::DWORD = 5969;
-pub const ERROR_CLUSTER_RESOURCE_IS_IN_MAINTENANCE_MODE: ::DWORD = 5970;
-pub const ERROR_CLUSTER_AFFINITY_CONFLICT: ::DWORD = 5971;
-pub const ERROR_CLUSTER_RESOURCE_IS_REPLICA_VIRTUAL_MACHINE: ::DWORD = 5972;
-pub const ERROR_ENCRYPTION_FAILED: ::DWORD = 6000;
-pub const ERROR_DECRYPTION_FAILED: ::DWORD = 6001;
-pub const ERROR_FILE_ENCRYPTED: ::DWORD = 6002;
-pub const ERROR_NO_RECOVERY_POLICY: ::DWORD = 6003;
-pub const ERROR_NO_EFS: ::DWORD = 6004;
-pub const ERROR_WRONG_EFS: ::DWORD = 6005;
-pub const ERROR_NO_USER_KEYS: ::DWORD = 6006;
-pub const ERROR_FILE_NOT_ENCRYPTED: ::DWORD = 6007;
-pub const ERROR_NOT_EXPORT_FORMAT: ::DWORD = 6008;
-pub const ERROR_FILE_READ_ONLY: ::DWORD = 6009;
-pub const ERROR_DIR_EFS_DISALLOWED: ::DWORD = 6010;
-pub const ERROR_EFS_SERVER_NOT_TRUSTED: ::DWORD = 6011;
-pub const ERROR_BAD_RECOVERY_POLICY: ::DWORD = 6012;
-pub const ERROR_EFS_ALG_BLOB_TOO_BIG: ::DWORD = 6013;
-pub const ERROR_VOLUME_NOT_SUPPORT_EFS: ::DWORD = 6014;
-pub const ERROR_EFS_DISABLED: ::DWORD = 6015;
-pub const ERROR_EFS_VERSION_NOT_SUPPORT: ::DWORD = 6016;
-pub const ERROR_CS_ENCRYPTION_INVALID_SERVER_RESPONSE: ::DWORD = 6017;
-pub const ERROR_CS_ENCRYPTION_UNSUPPORTED_SERVER: ::DWORD = 6018;
-pub const ERROR_CS_ENCRYPTION_EXISTING_ENCRYPTED_FILE: ::DWORD = 6019;
-pub const ERROR_CS_ENCRYPTION_NEW_ENCRYPTED_FILE: ::DWORD = 6020;
-pub const ERROR_CS_ENCRYPTION_FILE_NOT_CSE: ::DWORD = 6021;
-pub const ERROR_ENCRYPTION_POLICY_DENIES_OPERATION: ::DWORD = 6022;
-pub const ERROR_NO_BROWSER_SERVERS_FOUND: ::DWORD = 6118;
-pub const SCHED_E_SERVICE_NOT_LOCALSYSTEM: ::DWORD = 6200;
-pub const ERROR_LOG_SECTOR_INVALID: ::DWORD = 6600;
-pub const ERROR_LOG_SECTOR_PARITY_INVALID: ::DWORD = 6601;
-pub const ERROR_LOG_SECTOR_REMAPPED: ::DWORD = 6602;
-pub const ERROR_LOG_BLOCK_INCOMPLETE: ::DWORD = 6603;
-pub const ERROR_LOG_INVALID_RANGE: ::DWORD = 6604;
-pub const ERROR_LOG_BLOCKS_EXHAUSTED: ::DWORD = 6605;
-pub const ERROR_LOG_READ_CONTEXT_INVALID: ::DWORD = 6606;
-pub const ERROR_LOG_RESTART_INVALID: ::DWORD = 6607;
-pub const ERROR_LOG_BLOCK_VERSION: ::DWORD = 6608;
-pub const ERROR_LOG_BLOCK_INVALID: ::DWORD = 6609;
-pub const ERROR_LOG_READ_MODE_INVALID: ::DWORD = 6610;
-pub const ERROR_LOG_NO_RESTART: ::DWORD = 6611;
-pub const ERROR_LOG_METADATA_CORRUPT: ::DWORD = 6612;
-pub const ERROR_LOG_METADATA_INVALID: ::DWORD = 6613;
-pub const ERROR_LOG_METADATA_INCONSISTENT: ::DWORD = 6614;
-pub const ERROR_LOG_RESERVATION_INVALID: ::DWORD = 6615;
-pub const ERROR_LOG_CANT_DELETE: ::DWORD = 6616;
-pub const ERROR_LOG_CONTAINER_LIMIT_EXCEEDED: ::DWORD = 6617;
-pub const ERROR_LOG_START_OF_LOG: ::DWORD = 6618;
-pub const ERROR_LOG_POLICY_ALREADY_INSTALLED: ::DWORD = 6619;
-pub const ERROR_LOG_POLICY_NOT_INSTALLED: ::DWORD = 6620;
-pub const ERROR_LOG_POLICY_INVALID: ::DWORD = 6621;
-pub const ERROR_LOG_POLICY_CONFLICT: ::DWORD = 6622;
-pub const ERROR_LOG_PINNED_ARCHIVE_TAIL: ::DWORD = 6623;
-pub const ERROR_LOG_RECORD_NONEXISTENT: ::DWORD = 6624;
-pub const ERROR_LOG_RECORDS_RESERVED_INVALID: ::DWORD = 6625;
-pub const ERROR_LOG_SPACE_RESERVED_INVALID: ::DWORD = 6626;
-pub const ERROR_LOG_TAIL_INVALID: ::DWORD = 6627;
-pub const ERROR_LOG_FULL: ::DWORD = 6628;
-pub const ERROR_COULD_NOT_RESIZE_LOG: ::DWORD = 6629;
-pub const ERROR_LOG_MULTIPLEXED: ::DWORD = 6630;
-pub const ERROR_LOG_DEDICATED: ::DWORD = 6631;
-pub const ERROR_LOG_ARCHIVE_NOT_IN_PROGRESS: ::DWORD = 6632;
-pub const ERROR_LOG_ARCHIVE_IN_PROGRESS: ::DWORD = 6633;
-pub const ERROR_LOG_EPHEMERAL: ::DWORD = 6634;
-pub const ERROR_LOG_NOT_ENOUGH_CONTAINERS: ::DWORD = 6635;
-pub const ERROR_LOG_CLIENT_ALREADY_REGISTERED: ::DWORD = 6636;
-pub const ERROR_LOG_CLIENT_NOT_REGISTERED: ::DWORD = 6637;
-pub const ERROR_LOG_FULL_HANDLER_IN_PROGRESS: ::DWORD = 6638;
-pub const ERROR_LOG_CONTAINER_READ_FAILED: ::DWORD = 6639;
-pub const ERROR_LOG_CONTAINER_WRITE_FAILED: ::DWORD = 6640;
-pub const ERROR_LOG_CONTAINER_OPEN_FAILED: ::DWORD = 6641;
-pub const ERROR_LOG_CONTAINER_STATE_INVALID: ::DWORD = 6642;
-pub const ERROR_LOG_STATE_INVALID: ::DWORD = 6643;
-pub const ERROR_LOG_PINNED: ::DWORD = 6644;
-pub const ERROR_LOG_METADATA_FLUSH_FAILED: ::DWORD = 6645;
-pub const ERROR_LOG_INCONSISTENT_SECURITY: ::DWORD = 6646;
-pub const ERROR_LOG_APPENDED_FLUSH_FAILED: ::DWORD = 6647;
-pub const ERROR_LOG_PINNED_RESERVATION: ::DWORD = 6648;
-pub const ERROR_INVALID_TRANSACTION: ::DWORD = 6700;
-pub const ERROR_TRANSACTION_NOT_ACTIVE: ::DWORD = 6701;
-pub const ERROR_TRANSACTION_REQUEST_NOT_VALID: ::DWORD = 6702;
-pub const ERROR_TRANSACTION_NOT_REQUESTED: ::DWORD = 6703;
-pub const ERROR_TRANSACTION_ALREADY_ABORTED: ::DWORD = 6704;
-pub const ERROR_TRANSACTION_ALREADY_COMMITTED: ::DWORD = 6705;
-pub const ERROR_TM_INITIALIZATION_FAILED: ::DWORD = 6706;
-pub const ERROR_RESOURCEMANAGER_READ_ONLY: ::DWORD = 6707;
-pub const ERROR_TRANSACTION_NOT_JOINED: ::DWORD = 6708;
-pub const ERROR_TRANSACTION_SUPERIOR_EXISTS: ::DWORD = 6709;
-pub const ERROR_CRM_PROTOCOL_ALREADY_EXISTS: ::DWORD = 6710;
-pub const ERROR_TRANSACTION_PROPAGATION_FAILED: ::DWORD = 6711;
-pub const ERROR_CRM_PROTOCOL_NOT_FOUND: ::DWORD = 6712;
-pub const ERROR_TRANSACTION_INVALID_MARSHALL_BUFFER: ::DWORD = 6713;
-pub const ERROR_CURRENT_TRANSACTION_NOT_VALID: ::DWORD = 6714;
-pub const ERROR_TRANSACTION_NOT_FOUND: ::DWORD = 6715;
-pub const ERROR_RESOURCEMANAGER_NOT_FOUND: ::DWORD = 6716;
-pub const ERROR_ENLISTMENT_NOT_FOUND: ::DWORD = 6717;
-pub const ERROR_TRANSACTIONMANAGER_NOT_FOUND: ::DWORD = 6718;
-pub const ERROR_TRANSACTIONMANAGER_NOT_ONLINE: ::DWORD = 6719;
-pub const ERROR_TRANSACTIONMANAGER_RECOVERY_NAME_COLLISION: ::DWORD = 6720;
-pub const ERROR_TRANSACTION_NOT_ROOT: ::DWORD = 6721;
-pub const ERROR_TRANSACTION_OBJECT_EXPIRED: ::DWORD = 6722;
-pub const ERROR_TRANSACTION_RESPONSE_NOT_ENLISTED: ::DWORD = 6723;
-pub const ERROR_TRANSACTION_RECORD_TOO_LONG: ::DWORD = 6724;
-pub const ERROR_IMPLICIT_TRANSACTION_NOT_SUPPORTED: ::DWORD = 6725;
-pub const ERROR_TRANSACTION_INTEGRITY_VIOLATED: ::DWORD = 6726;
-pub const ERROR_TRANSACTIONMANAGER_IDENTITY_MISMATCH: ::DWORD = 6727;
-pub const ERROR_RM_CANNOT_BE_FROZEN_FOR_SNAPSHOT: ::DWORD = 6728;
-pub const ERROR_TRANSACTION_MUST_WRITETHROUGH: ::DWORD = 6729;
-pub const ERROR_TRANSACTION_NO_SUPERIOR: ::DWORD = 6730;
-pub const ERROR_HEURISTIC_DAMAGE_POSSIBLE: ::DWORD = 6731;
-pub const ERROR_TRANSACTIONAL_CONFLICT: ::DWORD = 6800;
-pub const ERROR_RM_NOT_ACTIVE: ::DWORD = 6801;
-pub const ERROR_RM_METADATA_CORRUPT: ::DWORD = 6802;
-pub const ERROR_DIRECTORY_NOT_RM: ::DWORD = 6803;
-pub const ERROR_TRANSACTIONS_UNSUPPORTED_REMOTE: ::DWORD = 6805;
-pub const ERROR_LOG_RESIZE_INVALID_SIZE: ::DWORD = 6806;
-pub const ERROR_OBJECT_NO_LONGER_EXISTS: ::DWORD = 6807;
-pub const ERROR_STREAM_MINIVERSION_NOT_FOUND: ::DWORD = 6808;
-pub const ERROR_STREAM_MINIVERSION_NOT_VALID: ::DWORD = 6809;
-pub const ERROR_MINIVERSION_INACCESSIBLE_FROM_SPECIFIED_TRANSACTION: ::DWORD = 6810;
-pub const ERROR_CANT_OPEN_MINIVERSION_WITH_MODIFY_INTENT: ::DWORD = 6811;
-pub const ERROR_CANT_CREATE_MORE_STREAM_MINIVERSIONS: ::DWORD = 6812;
-pub const ERROR_REMOTE_FILE_VERSION_MISMATCH: ::DWORD = 6814;
-pub const ERROR_HANDLE_NO_LONGER_VALID: ::DWORD = 6815;
-pub const ERROR_NO_TXF_METADATA: ::DWORD = 6816;
-pub const ERROR_LOG_CORRUPTION_DETECTED: ::DWORD = 6817;
-pub const ERROR_CANT_RECOVER_WITH_HANDLE_OPEN: ::DWORD = 6818;
-pub const ERROR_RM_DISCONNECTED: ::DWORD = 6819;
-pub const ERROR_ENLISTMENT_NOT_SUPERIOR: ::DWORD = 6820;
-pub const ERROR_RECOVERY_NOT_NEEDED: ::DWORD = 6821;
-pub const ERROR_RM_ALREADY_STARTED: ::DWORD = 6822;
-pub const ERROR_FILE_IDENTITY_NOT_PERSISTENT: ::DWORD = 6823;
-pub const ERROR_CANT_BREAK_TRANSACTIONAL_DEPENDENCY: ::DWORD = 6824;
-pub const ERROR_CANT_CROSS_RM_BOUNDARY: ::DWORD = 6825;
-pub const ERROR_TXF_DIR_NOT_EMPTY: ::DWORD = 6826;
-pub const ERROR_INDOUBT_TRANSACTIONS_EXIST: ::DWORD = 6827;
-pub const ERROR_TM_VOLATILE: ::DWORD = 6828;
-pub const ERROR_ROLLBACK_TIMER_EXPIRED: ::DWORD = 6829;
-pub const ERROR_TXF_ATTRIBUTE_CORRUPT: ::DWORD = 6830;
-pub const ERROR_EFS_NOT_ALLOWED_IN_TRANSACTION: ::DWORD = 6831;
-pub const ERROR_TRANSACTIONAL_OPEN_NOT_ALLOWED: ::DWORD = 6832;
-pub const ERROR_LOG_GROWTH_FAILED: ::DWORD = 6833;
-pub const ERROR_TRANSACTED_MAPPING_UNSUPPORTED_REMOTE: ::DWORD = 6834;
-pub const ERROR_TXF_METADATA_ALREADY_PRESENT: ::DWORD = 6835;
-pub const ERROR_TRANSACTION_SCOPE_CALLBACKS_NOT_SET: ::DWORD = 6836;
-pub const ERROR_TRANSACTION_REQUIRED_PROMOTION: ::DWORD = 6837;
-pub const ERROR_CANNOT_EXECUTE_FILE_IN_TRANSACTION: ::DWORD = 6838;
-pub const ERROR_TRANSACTIONS_NOT_FROZEN: ::DWORD = 6839;
-pub const ERROR_TRANSACTION_FREEZE_IN_PROGRESS: ::DWORD = 6840;
-pub const ERROR_NOT_SNAPSHOT_VOLUME: ::DWORD = 6841;
-pub const ERROR_NO_SAVEPOINT_WITH_OPEN_FILES: ::DWORD = 6842;
-pub const ERROR_DATA_LOST_REPAIR: ::DWORD = 6843;
-pub const ERROR_SPARSE_NOT_ALLOWED_IN_TRANSACTION: ::DWORD = 6844;
-pub const ERROR_TM_IDENTITY_MISMATCH: ::DWORD = 6845;
-pub const ERROR_FLOATED_SECTION: ::DWORD = 6846;
-pub const ERROR_CANNOT_ACCEPT_TRANSACTED_WORK: ::DWORD = 6847;
-pub const ERROR_CANNOT_ABORT_TRANSACTIONS: ::DWORD = 6848;
-pub const ERROR_BAD_CLUSTERS: ::DWORD = 6849;
-pub const ERROR_COMPRESSION_NOT_ALLOWED_IN_TRANSACTION: ::DWORD = 6850;
-pub const ERROR_VOLUME_DIRTY: ::DWORD = 6851;
-pub const ERROR_NO_LINK_TRACKING_IN_TRANSACTION: ::DWORD = 6852;
-pub const ERROR_OPERATION_NOT_SUPPORTED_IN_TRANSACTION: ::DWORD = 6853;
-pub const ERROR_EXPIRED_HANDLE: ::DWORD = 6854;
-pub const ERROR_TRANSACTION_NOT_ENLISTED: ::DWORD = 6855;
-pub const ERROR_CTX_WINSTATION_NAME_INVALID: ::DWORD = 7001;
-pub const ERROR_CTX_INVALID_PD: ::DWORD = 7002;
-pub const ERROR_CTX_PD_NOT_FOUND: ::DWORD = 7003;
-pub const ERROR_CTX_WD_NOT_FOUND: ::DWORD = 7004;
-pub const ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY: ::DWORD = 7005;
-pub const ERROR_CTX_SERVICE_NAME_COLLISION: ::DWORD = 7006;
-pub const ERROR_CTX_CLOSE_PENDING: ::DWORD = 7007;
-pub const ERROR_CTX_NO_OUTBUF: ::DWORD = 7008;
-pub const ERROR_CTX_MODEM_INF_NOT_FOUND: ::DWORD = 7009;
-pub const ERROR_CTX_INVALID_MODEMNAME: ::DWORD = 7010;
-pub const ERROR_CTX_MODEM_RESPONSE_ERROR: ::DWORD = 7011;
-pub const ERROR_CTX_MODEM_RESPONSE_TIMEOUT: ::DWORD = 7012;
-pub const ERROR_CTX_MODEM_RESPONSE_NO_CARRIER: ::DWORD = 7013;
-pub const ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE: ::DWORD = 7014;
-pub const ERROR_CTX_MODEM_RESPONSE_BUSY: ::DWORD = 7015;
-pub const ERROR_CTX_MODEM_RESPONSE_VOICE: ::DWORD = 7016;
-pub const ERROR_CTX_TD_ERROR: ::DWORD = 7017;
-pub const ERROR_CTX_WINSTATION_NOT_FOUND: ::DWORD = 7022;
-pub const ERROR_CTX_WINSTATION_ALREADY_EXISTS: ::DWORD = 7023;
-pub const ERROR_CTX_WINSTATION_BUSY: ::DWORD = 7024;
-pub const ERROR_CTX_BAD_VIDEO_MODE: ::DWORD = 7025;
-pub const ERROR_CTX_GRAPHICS_INVALID: ::DWORD = 7035;
-pub const ERROR_CTX_LOGON_DISABLED: ::DWORD = 7037;
-pub const ERROR_CTX_NOT_CONSOLE: ::DWORD = 7038;
-pub const ERROR_CTX_CLIENT_QUERY_TIMEOUT: ::DWORD = 7040;
-pub const ERROR_CTX_CONSOLE_DISCONNECT: ::DWORD = 7041;
-pub const ERROR_CTX_CONSOLE_CONNECT: ::DWORD = 7042;
-pub const ERROR_CTX_SHADOW_DENIED: ::DWORD = 7044;
-pub const ERROR_CTX_WINSTATION_ACCESS_DENIED: ::DWORD = 7045;
-pub const ERROR_CTX_INVALID_WD: ::DWORD = 7049;
-pub const ERROR_CTX_SHADOW_INVALID: ::DWORD = 7050;
-pub const ERROR_CTX_SHADOW_DISABLED: ::DWORD = 7051;
-pub const ERROR_CTX_CLIENT_LICENSE_IN_USE: ::DWORD = 7052;
-pub const ERROR_CTX_CLIENT_LICENSE_NOT_SET: ::DWORD = 7053;
-pub const ERROR_CTX_LICENSE_NOT_AVAILABLE: ::DWORD = 7054;
-pub const ERROR_CTX_LICENSE_CLIENT_INVALID: ::DWORD = 7055;
-pub const ERROR_CTX_LICENSE_EXPIRED: ::DWORD = 7056;
-pub const ERROR_CTX_SHADOW_NOT_RUNNING: ::DWORD = 7057;
-pub const ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE: ::DWORD = 7058;
-pub const ERROR_ACTIVATION_COUNT_EXCEEDED: ::DWORD = 7059;
-pub const ERROR_CTX_WINSTATIONS_DISABLED: ::DWORD = 7060;
-pub const ERROR_CTX_ENCRYPTION_LEVEL_REQUIRED: ::DWORD = 7061;
-pub const ERROR_CTX_SESSION_IN_USE: ::DWORD = 7062;
-pub const ERROR_CTX_NO_FORCE_LOGOFF: ::DWORD = 7063;
-pub const ERROR_CTX_ACCOUNT_RESTRICTION: ::DWORD = 7064;
-pub const ERROR_RDP_PROTOCOL_ERROR: ::DWORD = 7065;
-pub const ERROR_CTX_CDM_CONNECT: ::DWORD = 7066;
-pub const ERROR_CTX_CDM_DISCONNECT: ::DWORD = 7067;
-pub const ERROR_CTX_SECURITY_LAYER_ERROR: ::DWORD = 7068;
-pub const ERROR_TS_INCOMPATIBLE_SESSIONS: ::DWORD = 7069;
-pub const ERROR_TS_VIDEO_SUBSYSTEM_ERROR: ::DWORD = 7070;
-pub const FRS_ERR_INVALID_API_SEQUENCE: ::DWORD = 8001;
-pub const FRS_ERR_STARTING_SERVICE: ::DWORD = 8002;
-pub const FRS_ERR_STOPPING_SERVICE: ::DWORD = 8003;
-pub const FRS_ERR_INTERNAL_API: ::DWORD = 8004;
-pub const FRS_ERR_INTERNAL: ::DWORD = 8005;
-pub const FRS_ERR_SERVICE_COMM: ::DWORD = 8006;
-pub const FRS_ERR_INSUFFICIENT_PRIV: ::DWORD = 8007;
-pub const FRS_ERR_AUTHENTICATION: ::DWORD = 8008;
-pub const FRS_ERR_PARENT_INSUFFICIENT_PRIV: ::DWORD = 8009;
-pub const FRS_ERR_PARENT_AUTHENTICATION: ::DWORD = 8010;
-pub const FRS_ERR_CHILD_TO_PARENT_COMM: ::DWORD = 8011;
-pub const FRS_ERR_PARENT_TO_CHILD_COMM: ::DWORD = 8012;
-pub const FRS_ERR_SYSVOL_POPULATE: ::DWORD = 8013;
-pub const FRS_ERR_SYSVOL_POPULATE_TIMEOUT: ::DWORD = 8014;
-pub const FRS_ERR_SYSVOL_IS_BUSY: ::DWORD = 8015;
-pub const FRS_ERR_SYSVOL_DEMOTE: ::DWORD = 8016;
-pub const FRS_ERR_INVALID_SERVICE_PARAMETER: ::DWORD = 8017;
-pub const DS_S_SUCCESS: ::DWORD = NO_ERROR;
-pub const ERROR_DS_NOT_INSTALLED: ::DWORD = 8200;
-pub const ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY: ::DWORD = 8201;
-pub const ERROR_DS_NO_ATTRIBUTE_OR_VALUE: ::DWORD = 8202;
-pub const ERROR_DS_INVALID_ATTRIBUTE_SYNTAX: ::DWORD = 8203;
-pub const ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED: ::DWORD = 8204;
-pub const ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS: ::DWORD = 8205;
-pub const ERROR_DS_BUSY: ::DWORD = 8206;
-pub const ERROR_DS_UNAVAILABLE: ::DWORD = 8207;
-pub const ERROR_DS_NO_RIDS_ALLOCATED: ::DWORD = 8208;
-pub const ERROR_DS_NO_MORE_RIDS: ::DWORD = 8209;
-pub const ERROR_DS_INCORRECT_ROLE_OWNER: ::DWORD = 8210;
-pub const ERROR_DS_RIDMGR_INIT_ERROR: ::DWORD = 8211;
-pub const ERROR_DS_OBJ_CLASS_VIOLATION: ::DWORD = 8212;
-pub const ERROR_DS_CANT_ON_NON_LEAF: ::DWORD = 8213;
-pub const ERROR_DS_CANT_ON_RDN: ::DWORD = 8214;
-pub const ERROR_DS_CANT_MOD_OBJ_CLASS: ::DWORD = 8215;
-pub const ERROR_DS_CROSS_DOM_MOVE_ERROR: ::DWORD = 8216;
-pub const ERROR_DS_GC_NOT_AVAILABLE: ::DWORD = 8217;
-pub const ERROR_SHARED_POLICY: ::DWORD = 8218;
-pub const ERROR_POLICY_OBJECT_NOT_FOUND: ::DWORD = 8219;
-pub const ERROR_POLICY_ONLY_IN_DS: ::DWORD = 8220;
-pub const ERROR_PROMOTION_ACTIVE: ::DWORD = 8221;
-pub const ERROR_NO_PROMOTION_ACTIVE: ::DWORD = 8222;
-pub const ERROR_DS_OPERATIONS_ERROR: ::DWORD = 8224;
-pub const ERROR_DS_PROTOCOL_ERROR: ::DWORD = 8225;
-pub const ERROR_DS_TIMELIMIT_EXCEEDED: ::DWORD = 8226;
-pub const ERROR_DS_SIZELIMIT_EXCEEDED: ::DWORD = 8227;
-pub const ERROR_DS_ADMIN_LIMIT_EXCEEDED: ::DWORD = 8228;
-pub const ERROR_DS_COMPARE_FALSE: ::DWORD = 8229;
-pub const ERROR_DS_COMPARE_TRUE: ::DWORD = 8230;
-pub const ERROR_DS_AUTH_METHOD_NOT_SUPPORTED: ::DWORD = 8231;
-pub const ERROR_DS_STRONG_AUTH_REQUIRED: ::DWORD = 8232;
-pub const ERROR_DS_INAPPROPRIATE_AUTH: ::DWORD = 8233;
-pub const ERROR_DS_AUTH_UNKNOWN: ::DWORD = 8234;
-pub const ERROR_DS_REFERRAL: ::DWORD = 8235;
-pub const ERROR_DS_UNAVAILABLE_CRIT_EXTENSION: ::DWORD = 8236;
-pub const ERROR_DS_CONFIDENTIALITY_REQUIRED: ::DWORD = 8237;
-pub const ERROR_DS_INAPPROPRIATE_MATCHING: ::DWORD = 8238;
-pub const ERROR_DS_CONSTRAINT_VIOLATION: ::DWORD = 8239;
-pub const ERROR_DS_NO_SUCH_OBJECT: ::DWORD = 8240;
-pub const ERROR_DS_ALIAS_PROBLEM: ::DWORD = 8241;
-pub const ERROR_DS_INVALID_DN_SYNTAX: ::DWORD = 8242;
-pub const ERROR_DS_IS_LEAF: ::DWORD = 8243;
-pub const ERROR_DS_ALIAS_DEREF_PROBLEM: ::DWORD = 8244;
-pub const ERROR_DS_UNWILLING_TO_PERFORM: ::DWORD = 8245;
-pub const ERROR_DS_LOOP_DETECT: ::DWORD = 8246;
-pub const ERROR_DS_NAMING_VIOLATION: ::DWORD = 8247;
-pub const ERROR_DS_OBJECT_RESULTS_TOO_LARGE: ::DWORD = 8248;
-pub const ERROR_DS_AFFECTS_MULTIPLE_DSAS: ::DWORD = 8249;
-pub const ERROR_DS_SERVER_DOWN: ::DWORD = 8250;
-pub const ERROR_DS_LOCAL_ERROR: ::DWORD = 8251;
-pub const ERROR_DS_ENCODING_ERROR: ::DWORD = 8252;
-pub const ERROR_DS_DECODING_ERROR: ::DWORD = 8253;
-pub const ERROR_DS_FILTER_UNKNOWN: ::DWORD = 8254;
-pub const ERROR_DS_PARAM_ERROR: ::DWORD = 8255;
-pub const ERROR_DS_NOT_SUPPORTED: ::DWORD = 8256;
-pub const ERROR_DS_NO_RESULTS_RETURNED: ::DWORD = 8257;
-pub const ERROR_DS_CONTROL_NOT_FOUND: ::DWORD = 8258;
-pub const ERROR_DS_CLIENT_LOOP: ::DWORD = 8259;
-pub const ERROR_DS_REFERRAL_LIMIT_EXCEEDED: ::DWORD = 8260;
-pub const ERROR_DS_SORT_CONTROL_MISSING: ::DWORD = 8261;
-pub const ERROR_DS_OFFSET_RANGE_ERROR: ::DWORD = 8262;
-pub const ERROR_DS_RIDMGR_DISABLED: ::DWORD = 8263;
-pub const ERROR_DS_ROOT_MUST_BE_NC: ::DWORD = 8301;
-pub const ERROR_DS_ADD_REPLICA_INHIBITED: ::DWORD = 8302;
-pub const ERROR_DS_ATT_NOT_DEF_IN_SCHEMA: ::DWORD = 8303;
-pub const ERROR_DS_MAX_OBJ_SIZE_EXCEEDED: ::DWORD = 8304;
-pub const ERROR_DS_OBJ_STRING_NAME_EXISTS: ::DWORD = 8305;
-pub const ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA: ::DWORD = 8306;
-pub const ERROR_DS_RDN_DOESNT_MATCH_SCHEMA: ::DWORD = 8307;
-pub const ERROR_DS_NO_REQUESTED_ATTS_FOUND: ::DWORD = 8308;
-pub const ERROR_DS_USER_BUFFER_TO_SMALL: ::DWORD = 8309;
-pub const ERROR_DS_ATT_IS_NOT_ON_OBJ: ::DWORD = 8310;
-pub const ERROR_DS_ILLEGAL_MOD_OPERATION: ::DWORD = 8311;
-pub const ERROR_DS_OBJ_TOO_LARGE: ::DWORD = 8312;
-pub const ERROR_DS_BAD_INSTANCE_TYPE: ::DWORD = 8313;
-pub const ERROR_DS_MASTERDSA_REQUIRED: ::DWORD = 8314;
-pub const ERROR_DS_OBJECT_CLASS_REQUIRED: ::DWORD = 8315;
-pub const ERROR_DS_MISSING_REQUIRED_ATT: ::DWORD = 8316;
-pub const ERROR_DS_ATT_NOT_DEF_FOR_CLASS: ::DWORD = 8317;
-pub const ERROR_DS_ATT_ALREADY_EXISTS: ::DWORD = 8318;
-pub const ERROR_DS_CANT_ADD_ATT_VALUES: ::DWORD = 8320;
-pub const ERROR_DS_SINGLE_VALUE_CONSTRAINT: ::DWORD = 8321;
-pub const ERROR_DS_RANGE_CONSTRAINT: ::DWORD = 8322;
-pub const ERROR_DS_ATT_VAL_ALREADY_EXISTS: ::DWORD = 8323;
-pub const ERROR_DS_CANT_REM_MISSING_ATT: ::DWORD = 8324;
-pub const ERROR_DS_CANT_REM_MISSING_ATT_VAL: ::DWORD = 8325;
-pub const ERROR_DS_ROOT_CANT_BE_SUBREF: ::DWORD = 8326;
-pub const ERROR_DS_NO_CHAINING: ::DWORD = 8327;
-pub const ERROR_DS_NO_CHAINED_EVAL: ::DWORD = 8328;
-pub const ERROR_DS_NO_PARENT_OBJECT: ::DWORD = 8329;
-pub const ERROR_DS_PARENT_IS_AN_ALIAS: ::DWORD = 8330;
-pub const ERROR_DS_CANT_MIX_MASTER_AND_REPS: ::DWORD = 8331;
-pub const ERROR_DS_CHILDREN_EXIST: ::DWORD = 8332;
-pub const ERROR_DS_OBJ_NOT_FOUND: ::DWORD = 8333;
-pub const ERROR_DS_ALIASED_OBJ_MISSING: ::DWORD = 8334;
-pub const ERROR_DS_BAD_NAME_SYNTAX: ::DWORD = 8335;
-pub const ERROR_DS_ALIAS_POINTS_TO_ALIAS: ::DWORD = 8336;
-pub const ERROR_DS_CANT_DEREF_ALIAS: ::DWORD = 8337;
-pub const ERROR_DS_OUT_OF_SCOPE: ::DWORD = 8338;
-pub const ERROR_DS_OBJECT_BEING_REMOVED: ::DWORD = 8339;
-pub const ERROR_DS_CANT_DELETE_DSA_OBJ: ::DWORD = 8340;
-pub const ERROR_DS_GENERIC_ERROR: ::DWORD = 8341;
-pub const ERROR_DS_DSA_MUST_BE_INT_MASTER: ::DWORD = 8342;
-pub const ERROR_DS_CLASS_NOT_DSA: ::DWORD = 8343;
-pub const ERROR_DS_INSUFF_ACCESS_RIGHTS: ::DWORD = 8344;
-pub const ERROR_DS_ILLEGAL_SUPERIOR: ::DWORD = 8345;
-pub const ERROR_DS_ATTRIBUTE_OWNED_BY_SAM: ::DWORD = 8346;
-pub const ERROR_DS_NAME_TOO_MANY_PARTS: ::DWORD = 8347;
-pub const ERROR_DS_NAME_TOO_LONG: ::DWORD = 8348;
-pub const ERROR_DS_NAME_VALUE_TOO_LONG: ::DWORD = 8349;
-pub const ERROR_DS_NAME_UNPARSEABLE: ::DWORD = 8350;
-pub const ERROR_DS_NAME_TYPE_UNKNOWN: ::DWORD = 8351;
-pub const ERROR_DS_NOT_AN_OBJECT: ::DWORD = 8352;
-pub const ERROR_DS_SEC_DESC_TOO_SHORT: ::DWORD = 8353;
-pub const ERROR_DS_SEC_DESC_INVALID: ::DWORD = 8354;
-pub const ERROR_DS_NO_DELETED_NAME: ::DWORD = 8355;
-pub const ERROR_DS_SUBREF_MUST_HAVE_PARENT: ::DWORD = 8356;
-pub const ERROR_DS_NCNAME_MUST_BE_NC: ::DWORD = 8357;
-pub const ERROR_DS_CANT_ADD_SYSTEM_ONLY: ::DWORD = 8358;
-pub const ERROR_DS_CLASS_MUST_BE_CONCRETE: ::DWORD = 8359;
-pub const ERROR_DS_INVALID_DMD: ::DWORD = 8360;
-pub const ERROR_DS_OBJ_GUID_EXISTS: ::DWORD = 8361;
-pub const ERROR_DS_NOT_ON_BACKLINK: ::DWORD = 8362;
-pub const ERROR_DS_NO_CROSSREF_FOR_NC: ::DWORD = 8363;
-pub const ERROR_DS_SHUTTING_DOWN: ::DWORD = 8364;
-pub const ERROR_DS_UNKNOWN_OPERATION: ::DWORD = 8365;
-pub const ERROR_DS_INVALID_ROLE_OWNER: ::DWORD = 8366;
-pub const ERROR_DS_COULDNT_CONTACT_FSMO: ::DWORD = 8367;
-pub const ERROR_DS_CROSS_NC_DN_RENAME: ::DWORD = 8368;
-pub const ERROR_DS_CANT_MOD_SYSTEM_ONLY: ::DWORD = 8369;
-pub const ERROR_DS_REPLICATOR_ONLY: ::DWORD = 8370;
-pub const ERROR_DS_OBJ_CLASS_NOT_DEFINED: ::DWORD = 8371;
-pub const ERROR_DS_OBJ_CLASS_NOT_SUBCLASS: ::DWORD = 8372;
-pub const ERROR_DS_NAME_REFERENCE_INVALID: ::DWORD = 8373;
-pub const ERROR_DS_CROSS_REF_EXISTS: ::DWORD = 8374;
-pub const ERROR_DS_CANT_DEL_MASTER_CROSSREF: ::DWORD = 8375;
-pub const ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD: ::DWORD = 8376;
-pub const ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX: ::DWORD = 8377;
-pub const ERROR_DS_DUP_RDN: ::DWORD = 8378;
-pub const ERROR_DS_DUP_OID: ::DWORD = 8379;
-pub const ERROR_DS_DUP_MAPI_ID: ::DWORD = 8380;
-pub const ERROR_DS_DUP_SCHEMA_ID_GUID: ::DWORD = 8381;
-pub const ERROR_DS_DUP_LDAP_DISPLAY_NAME: ::DWORD = 8382;
-pub const ERROR_DS_SEMANTIC_ATT_TEST: ::DWORD = 8383;
-pub const ERROR_DS_SYNTAX_MISMATCH: ::DWORD = 8384;
-pub const ERROR_DS_EXISTS_IN_MUST_HAVE: ::DWORD = 8385;
-pub const ERROR_DS_EXISTS_IN_MAY_HAVE: ::DWORD = 8386;
-pub const ERROR_DS_NONEXISTENT_MAY_HAVE: ::DWORD = 8387;
-pub const ERROR_DS_NONEXISTENT_MUST_HAVE: ::DWORD = 8388;
-pub const ERROR_DS_AUX_CLS_TEST_FAIL: ::DWORD = 8389;
-pub const ERROR_DS_NONEXISTENT_POSS_SUP: ::DWORD = 8390;
-pub const ERROR_DS_SUB_CLS_TEST_FAIL: ::DWORD = 8391;
-pub const ERROR_DS_BAD_RDN_ATT_ID_SYNTAX: ::DWORD = 8392;
-pub const ERROR_DS_EXISTS_IN_AUX_CLS: ::DWORD = 8393;
-pub const ERROR_DS_EXISTS_IN_SUB_CLS: ::DWORD = 8394;
-pub const ERROR_DS_EXISTS_IN_POSS_SUP: ::DWORD = 8395;
-pub const ERROR_DS_RECALCSCHEMA_FAILED: ::DWORD = 8396;
-pub const ERROR_DS_TREE_DELETE_NOT_FINISHED: ::DWORD = 8397;
-pub const ERROR_DS_CANT_DELETE: ::DWORD = 8398;
-pub const ERROR_DS_ATT_SCHEMA_REQ_ID: ::DWORD = 8399;
-pub const ERROR_DS_BAD_ATT_SCHEMA_SYNTAX: ::DWORD = 8400;
-pub const ERROR_DS_CANT_CACHE_ATT: ::DWORD = 8401;
-pub const ERROR_DS_CANT_CACHE_CLASS: ::DWORD = 8402;
-pub const ERROR_DS_CANT_REMOVE_ATT_CACHE: ::DWORD = 8403;
-pub const ERROR_DS_CANT_REMOVE_CLASS_CACHE: ::DWORD = 8404;
-pub const ERROR_DS_CANT_RETRIEVE_DN: ::DWORD = 8405;
-pub const ERROR_DS_MISSING_SUPREF: ::DWORD = 8406;
-pub const ERROR_DS_CANT_RETRIEVE_INSTANCE: ::DWORD = 8407;
-pub const ERROR_DS_CODE_INCONSISTENCY: ::DWORD = 8408;
-pub const ERROR_DS_DATABASE_ERROR: ::DWORD = 8409;
-pub const ERROR_DS_GOVERNSID_MISSING: ::DWORD = 8410;
-pub const ERROR_DS_MISSING_EXPECTED_ATT: ::DWORD = 8411;
-pub const ERROR_DS_NCNAME_MISSING_CR_REF: ::DWORD = 8412;
-pub const ERROR_DS_SECURITY_CHECKING_ERROR: ::DWORD = 8413;
-pub const ERROR_DS_SCHEMA_NOT_LOADED: ::DWORD = 8414;
-pub const ERROR_DS_SCHEMA_ALLOC_FAILED: ::DWORD = 8415;
-pub const ERROR_DS_ATT_SCHEMA_REQ_SYNTAX: ::DWORD = 8416;
-pub const ERROR_DS_GCVERIFY_ERROR: ::DWORD = 8417;
-pub const ERROR_DS_DRA_SCHEMA_MISMATCH: ::DWORD = 8418;
-pub const ERROR_DS_CANT_FIND_DSA_OBJ: ::DWORD = 8419;
-pub const ERROR_DS_CANT_FIND_EXPECTED_NC: ::DWORD = 8420;
-pub const ERROR_DS_CANT_FIND_NC_IN_CACHE: ::DWORD = 8421;
-pub const ERROR_DS_CANT_RETRIEVE_CHILD: ::DWORD = 8422;
-pub const ERROR_DS_SECURITY_ILLEGAL_MODIFY: ::DWORD = 8423;
-pub const ERROR_DS_CANT_REPLACE_HIDDEN_REC: ::DWORD = 8424;
-pub const ERROR_DS_BAD_HIERARCHY_FILE: ::DWORD = 8425;
-pub const ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED: ::DWORD = 8426;
-pub const ERROR_DS_CONFIG_PARAM_MISSING: ::DWORD = 8427;
-pub const ERROR_DS_COUNTING_AB_INDICES_FAILED: ::DWORD = 8428;
-pub const ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED: ::DWORD = 8429;
-pub const ERROR_DS_INTERNAL_FAILURE: ::DWORD = 8430;
-pub const ERROR_DS_UNKNOWN_ERROR: ::DWORD = 8431;
-pub const ERROR_DS_ROOT_REQUIRES_CLASS_TOP: ::DWORD = 8432;
-pub const ERROR_DS_REFUSING_FSMO_ROLES: ::DWORD = 8433;
-pub const ERROR_DS_MISSING_FSMO_SETTINGS: ::DWORD = 8434;
-pub const ERROR_DS_UNABLE_TO_SURRENDER_ROLES: ::DWORD = 8435;
-pub const ERROR_DS_DRA_GENERIC: ::DWORD = 8436;
-pub const ERROR_DS_DRA_INVALID_PARAMETER: ::DWORD = 8437;
-pub const ERROR_DS_DRA_BUSY: ::DWORD = 8438;
-pub const ERROR_DS_DRA_BAD_DN: ::DWORD = 8439;
-pub const ERROR_DS_DRA_BAD_NC: ::DWORD = 8440;
-pub const ERROR_DS_DRA_DN_EXISTS: ::DWORD = 8441;
-pub const ERROR_DS_DRA_INTERNAL_ERROR: ::DWORD = 8442;
-pub const ERROR_DS_DRA_INCONSISTENT_DIT: ::DWORD = 8443;
-pub const ERROR_DS_DRA_CONNECTION_FAILED: ::DWORD = 8444;
-pub const ERROR_DS_DRA_BAD_INSTANCE_TYPE: ::DWORD = 8445;
-pub const ERROR_DS_DRA_OUT_OF_MEM: ::DWORD = 8446;
-pub const ERROR_DS_DRA_MAIL_PROBLEM: ::DWORD = 8447;
-pub const ERROR_DS_DRA_REF_ALREADY_EXISTS: ::DWORD = 8448;
-pub const ERROR_DS_DRA_REF_NOT_FOUND: ::DWORD = 8449;
-pub const ERROR_DS_DRA_OBJ_IS_REP_SOURCE: ::DWORD = 8450;
-pub const ERROR_DS_DRA_DB_ERROR: ::DWORD = 8451;
-pub const ERROR_DS_DRA_NO_REPLICA: ::DWORD = 8452;
-pub const ERROR_DS_DRA_ACCESS_DENIED: ::DWORD = 8453;
-pub const ERROR_DS_DRA_NOT_SUPPORTED: ::DWORD = 8454;
-pub const ERROR_DS_DRA_RPC_CANCELLED: ::DWORD = 8455;
-pub const ERROR_DS_DRA_SOURCE_DISABLED: ::DWORD = 8456;
-pub const ERROR_DS_DRA_SINK_DISABLED: ::DWORD = 8457;
-pub const ERROR_DS_DRA_NAME_COLLISION: ::DWORD = 8458;
-pub const ERROR_DS_DRA_SOURCE_REINSTALLED: ::DWORD = 8459;
-pub const ERROR_DS_DRA_MISSING_PARENT: ::DWORD = 8460;
-pub const ERROR_DS_DRA_PREEMPTED: ::DWORD = 8461;
-pub const ERROR_DS_DRA_ABANDON_SYNC: ::DWORD = 8462;
-pub const ERROR_DS_DRA_SHUTDOWN: ::DWORD = 8463;
-pub const ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET: ::DWORD = 8464;
-pub const ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA: ::DWORD = 8465;
-pub const ERROR_DS_DRA_EXTN_CONNECTION_FAILED: ::DWORD = 8466;
-pub const ERROR_DS_INSTALL_SCHEMA_MISMATCH: ::DWORD = 8467;
-pub const ERROR_DS_DUP_LINK_ID: ::DWORD = 8468;
-pub const ERROR_DS_NAME_ERROR_RESOLVING: ::DWORD = 8469;
-pub const ERROR_DS_NAME_ERROR_NOT_FOUND: ::DWORD = 8470;
-pub const ERROR_DS_NAME_ERROR_NOT_UNIQUE: ::DWORD = 8471;
-pub const ERROR_DS_NAME_ERROR_NO_MAPPING: ::DWORD = 8472;
-pub const ERROR_DS_NAME_ERROR_DOMAIN_ONLY: ::DWORD = 8473;
-pub const ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING: ::DWORD = 8474;
-pub const ERROR_DS_CONSTRUCTED_ATT_MOD: ::DWORD = 8475;
-pub const ERROR_DS_WRONG_OM_OBJ_CLASS: ::DWORD = 8476;
-pub const ERROR_DS_DRA_REPL_PENDING: ::DWORD = 8477;
-pub const ERROR_DS_DS_REQUIRED: ::DWORD = 8478;
-pub const ERROR_DS_INVALID_LDAP_DISPLAY_NAME: ::DWORD = 8479;
-pub const ERROR_DS_NON_BASE_SEARCH: ::DWORD = 8480;
-pub const ERROR_DS_CANT_RETRIEVE_ATTS: ::DWORD = 8481;
-pub const ERROR_DS_BACKLINK_WITHOUT_LINK: ::DWORD = 8482;
-pub const ERROR_DS_EPOCH_MISMATCH: ::DWORD = 8483;
-pub const ERROR_DS_SRC_NAME_MISMATCH: ::DWORD = 8484;
-pub const ERROR_DS_SRC_AND_DST_NC_IDENTICAL: ::DWORD = 8485;
-pub const ERROR_DS_DST_NC_MISMATCH: ::DWORD = 8486;
-pub const ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC: ::DWORD = 8487;
-pub const ERROR_DS_SRC_GUID_MISMATCH: ::DWORD = 8488;
-pub const ERROR_DS_CANT_MOVE_DELETED_OBJECT: ::DWORD = 8489;
-pub const ERROR_DS_PDC_OPERATION_IN_PROGRESS: ::DWORD = 8490;
-pub const ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD: ::DWORD = 8491;
-pub const ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION: ::DWORD = 8492;
-pub const ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS: ::DWORD = 8493;
-pub const ERROR_DS_NC_MUST_HAVE_NC_PARENT: ::DWORD = 8494;
-pub const ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE: ::DWORD = 8495;
-pub const ERROR_DS_DST_DOMAIN_NOT_NATIVE: ::DWORD = 8496;
-pub const ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER: ::DWORD = 8497;
-pub const ERROR_DS_CANT_MOVE_ACCOUNT_GROUP: ::DWORD = 8498;
-pub const ERROR_DS_CANT_MOVE_RESOURCE_GROUP: ::DWORD = 8499;
-pub const ERROR_DS_INVALID_SEARCH_FLAG: ::DWORD = 8500;
-pub const ERROR_DS_NO_TREE_DELETE_ABOVE_NC: ::DWORD = 8501;
-pub const ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE: ::DWORD = 8502;
-pub const ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE: ::DWORD = 8503;
-pub const ERROR_DS_SAM_INIT_FAILURE: ::DWORD = 8504;
-pub const ERROR_DS_SENSITIVE_GROUP_VIOLATION: ::DWORD = 8505;
-pub const ERROR_DS_CANT_MOD_PRIMARYGROUPID: ::DWORD = 8506;
-pub const ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD: ::DWORD = 8507;
-pub const ERROR_DS_NONSAFE_SCHEMA_CHANGE: ::DWORD = 8508;
-pub const ERROR_DS_SCHEMA_UPDATE_DISALLOWED: ::DWORD = 8509;
-pub const ERROR_DS_CANT_CREATE_UNDER_SCHEMA: ::DWORD = 8510;
-pub const ERROR_DS_INSTALL_NO_SRC_SCH_VERSION: ::DWORD = 8511;
-pub const ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE: ::DWORD = 8512;
-pub const ERROR_DS_INVALID_GROUP_TYPE: ::DWORD = 8513;
-pub const ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN: ::DWORD = 8514;
-pub const ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN: ::DWORD = 8515;
-pub const ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER: ::DWORD = 8516;
-pub const ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER: ::DWORD = 8517;
-pub const ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER: ::DWORD = 8518;
-pub const ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER: ::DWORD = 8519;
-pub const ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER: ::DWORD = 8520;
-pub const ERROR_DS_HAVE_PRIMARY_MEMBERS: ::DWORD = 8521;
-pub const ERROR_DS_STRING_SD_CONVERSION_FAILED: ::DWORD = 8522;
-pub const ERROR_DS_NAMING_MASTER_GC: ::DWORD = 8523;
-pub const ERROR_DS_DNS_LOOKUP_FAILURE: ::DWORD = 8524;
-pub const ERROR_DS_COULDNT_UPDATE_SPNS: ::DWORD = 8525;
-pub const ERROR_DS_CANT_RETRIEVE_SD: ::DWORD = 8526;
-pub const ERROR_DS_KEY_NOT_UNIQUE: ::DWORD = 8527;
-pub const ERROR_DS_WRONG_LINKED_ATT_SYNTAX: ::DWORD = 8528;
-pub const ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD: ::DWORD = 8529;
-pub const ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY: ::DWORD = 8530;
-pub const ERROR_DS_CANT_START: ::DWORD = 8531;
-pub const ERROR_DS_INIT_FAILURE: ::DWORD = 8532;
-pub const ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION: ::DWORD = 8533;
-pub const ERROR_DS_SOURCE_DOMAIN_IN_FOREST: ::DWORD = 8534;
-pub const ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST: ::DWORD = 8535;
-pub const ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED: ::DWORD = 8536;
-pub const ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN: ::DWORD = 8537;
-pub const ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER: ::DWORD = 8538;
-pub const ERROR_DS_SRC_SID_EXISTS_IN_FOREST: ::DWORD = 8539;
-pub const ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH: ::DWORD = 8540;
-pub const ERROR_SAM_INIT_FAILURE: ::DWORD = 8541;
-pub const ERROR_DS_DRA_SCHEMA_INFO_SHIP: ::DWORD = 8542;
-pub const ERROR_DS_DRA_SCHEMA_CONFLICT: ::DWORD = 8543;
-pub const ERROR_DS_DRA_EARLIER_SCHEMA_CONFLICT: ::DWORD = 8544;
-pub const ERROR_DS_DRA_OBJ_NC_MISMATCH: ::DWORD = 8545;
-pub const ERROR_DS_NC_STILL_HAS_DSAS: ::DWORD = 8546;
-pub const ERROR_DS_GC_REQUIRED: ::DWORD = 8547;
-pub const ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY: ::DWORD = 8548;
-pub const ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS: ::DWORD = 8549;
-pub const ERROR_DS_CANT_ADD_TO_GC: ::DWORD = 8550;
-pub const ERROR_DS_NO_CHECKPOINT_WITH_PDC: ::DWORD = 8551;
-pub const ERROR_DS_SOURCE_AUDITING_NOT_ENABLED: ::DWORD = 8552;
-pub const ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC: ::DWORD = 8553;
-pub const ERROR_DS_INVALID_NAME_FOR_SPN: ::DWORD = 8554;
-pub const ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS: ::DWORD = 8555;
-pub const ERROR_DS_UNICODEPWD_NOT_IN_QUOTES: ::DWORD = 8556;
-pub const ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED: ::DWORD = 8557;
-pub const ERROR_DS_MUST_BE_RUN_ON_DST_DC: ::DWORD = 8558;
-pub const ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER: ::DWORD = 8559;
-pub const ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ: ::DWORD = 8560;
-pub const ERROR_DS_INIT_FAILURE_CONSOLE: ::DWORD = 8561;
-pub const ERROR_DS_SAM_INIT_FAILURE_CONSOLE: ::DWORD = 8562;
-pub const ERROR_DS_FOREST_VERSION_TOO_HIGH: ::DWORD = 8563;
-pub const ERROR_DS_DOMAIN_VERSION_TOO_HIGH: ::DWORD = 8564;
-pub const ERROR_DS_FOREST_VERSION_TOO_LOW: ::DWORD = 8565;
-pub const ERROR_DS_DOMAIN_VERSION_TOO_LOW: ::DWORD = 8566;
-pub const ERROR_DS_INCOMPATIBLE_VERSION: ::DWORD = 8567;
-pub const ERROR_DS_LOW_DSA_VERSION: ::DWORD = 8568;
-pub const ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN: ::DWORD = 8569;
-pub const ERROR_DS_NOT_SUPPORTED_SORT_ORDER: ::DWORD = 8570;
-pub const ERROR_DS_NAME_NOT_UNIQUE: ::DWORD = 8571;
-pub const ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4: ::DWORD = 8572;
-pub const ERROR_DS_OUT_OF_VERSION_STORE: ::DWORD = 8573;
-pub const ERROR_DS_INCOMPATIBLE_CONTROLS_USED: ::DWORD = 8574;
-pub const ERROR_DS_NO_REF_DOMAIN: ::DWORD = 8575;
-pub const ERROR_DS_RESERVED_LINK_ID: ::DWORD = 8576;
-pub const ERROR_DS_LINK_ID_NOT_AVAILABLE: ::DWORD = 8577;
-pub const ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER: ::DWORD = 8578;
-pub const ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE: ::DWORD = 8579;
-pub const ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC: ::DWORD = 8580;
-pub const ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG: ::DWORD = 8581;
-pub const ERROR_DS_MODIFYDN_WRONG_GRANDPARENT: ::DWORD = 8582;
-pub const ERROR_DS_NAME_ERROR_TRUST_REFERRAL: ::DWORD = 8583;
-pub const ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER: ::DWORD = 8584;
-pub const ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD: ::DWORD = 8585;
-pub const ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE_V2: ::DWORD = 8586;
-pub const ERROR_DS_THREAD_LIMIT_EXCEEDED: ::DWORD = 8587;
-pub const ERROR_DS_NOT_CLOSEST: ::DWORD = 8588;
-pub const ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF: ::DWORD = 8589;
-pub const ERROR_DS_SINGLE_USER_MODE_FAILED: ::DWORD = 8590;
-pub const ERROR_DS_NTDSCRIPT_SYNTAX_ERROR: ::DWORD = 8591;
-pub const ERROR_DS_NTDSCRIPT_PROCESS_ERROR: ::DWORD = 8592;
-pub const ERROR_DS_DIFFERENT_REPL_EPOCHS: ::DWORD = 8593;
-pub const ERROR_DS_DRS_EXTENSIONS_CHANGED: ::DWORD = 8594;
-pub const ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR: ::DWORD = 8595;
-pub const ERROR_DS_NO_MSDS_INTID: ::DWORD = 8596;
-pub const ERROR_DS_DUP_MSDS_INTID: ::DWORD = 8597;
-pub const ERROR_DS_EXISTS_IN_RDNATTID: ::DWORD = 8598;
-pub const ERROR_DS_AUTHORIZATION_FAILED: ::DWORD = 8599;
-pub const ERROR_DS_INVALID_SCRIPT: ::DWORD = 8600;
-pub const ERROR_DS_REMOTE_CROSSREF_OP_FAILED: ::DWORD = 8601;
-pub const ERROR_DS_CROSS_REF_BUSY: ::DWORD = 8602;
-pub const ERROR_DS_CANT_DERIVE_SPN_FOR_DELETED_DOMAIN: ::DWORD = 8603;
-pub const ERROR_DS_CANT_DEMOTE_WITH_WRITEABLE_NC: ::DWORD = 8604;
-pub const ERROR_DS_DUPLICATE_ID_FOUND: ::DWORD = 8605;
-pub const ERROR_DS_INSUFFICIENT_ATTR_TO_CREATE_OBJECT: ::DWORD = 8606;
-pub const ERROR_DS_GROUP_CONVERSION_ERROR: ::DWORD = 8607;
-pub const ERROR_DS_CANT_MOVE_APP_BASIC_GROUP: ::DWORD = 8608;
-pub const ERROR_DS_CANT_MOVE_APP_QUERY_GROUP: ::DWORD = 8609;
-pub const ERROR_DS_ROLE_NOT_VERIFIED: ::DWORD = 8610;
-pub const ERROR_DS_WKO_CONTAINER_CANNOT_BE_SPECIAL: ::DWORD = 8611;
-pub const ERROR_DS_DOMAIN_RENAME_IN_PROGRESS: ::DWORD = 8612;
-pub const ERROR_DS_EXISTING_AD_CHILD_NC: ::DWORD = 8613;
-pub const ERROR_DS_REPL_LIFETIME_EXCEEDED: ::DWORD = 8614;
-pub const ERROR_DS_DISALLOWED_IN_SYSTEM_CONTAINER: ::DWORD = 8615;
-pub const ERROR_DS_LDAP_SEND_QUEUE_FULL: ::DWORD = 8616;
-pub const ERROR_DS_DRA_OUT_SCHEDULE_WINDOW: ::DWORD = 8617;
-pub const ERROR_DS_POLICY_NOT_KNOWN: ::DWORD = 8618;
-pub const ERROR_NO_SITE_SETTINGS_OBJECT: ::DWORD = 8619;
-pub const ERROR_NO_SECRETS: ::DWORD = 8620;
-pub const ERROR_NO_WRITABLE_DC_FOUND: ::DWORD = 8621;
-pub const ERROR_DS_NO_SERVER_OBJECT: ::DWORD = 8622;
-pub const ERROR_DS_NO_NTDSA_OBJECT: ::DWORD = 8623;
-pub const ERROR_DS_NON_ASQ_SEARCH: ::DWORD = 8624;
-pub const ERROR_DS_AUDIT_FAILURE: ::DWORD = 8625;
-pub const ERROR_DS_INVALID_SEARCH_FLAG_SUBTREE: ::DWORD = 8626;
-pub const ERROR_DS_INVALID_SEARCH_FLAG_TUPLE: ::DWORD = 8627;
-pub const ERROR_DS_HIERARCHY_TABLE_TOO_DEEP: ::DWORD = 8628;
-pub const ERROR_DS_DRA_CORRUPT_UTD_VECTOR: ::DWORD = 8629;
-pub const ERROR_DS_DRA_SECRETS_DENIED: ::DWORD = 8630;
-pub const ERROR_DS_RESERVED_MAPI_ID: ::DWORD = 8631;
-pub const ERROR_DS_MAPI_ID_NOT_AVAILABLE: ::DWORD = 8632;
-pub const ERROR_DS_DRA_MISSING_KRBTGT_SECRET: ::DWORD = 8633;
-pub const ERROR_DS_DOMAIN_NAME_EXISTS_IN_FOREST: ::DWORD = 8634;
-pub const ERROR_DS_FLAT_NAME_EXISTS_IN_FOREST: ::DWORD = 8635;
-pub const ERROR_INVALID_USER_PRINCIPAL_NAME: ::DWORD = 8636;
-pub const ERROR_DS_OID_MAPPED_GROUP_CANT_HAVE_MEMBERS: ::DWORD = 8637;
-pub const ERROR_DS_OID_NOT_FOUND: ::DWORD = 8638;
-pub const ERROR_DS_DRA_RECYCLED_TARGET: ::DWORD = 8639;
-pub const ERROR_DS_DISALLOWED_NC_REDIRECT: ::DWORD = 8640;
-pub const ERROR_DS_HIGH_ADLDS_FFL: ::DWORD = 8641;
-pub const ERROR_DS_HIGH_DSA_VERSION: ::DWORD = 8642;
-pub const ERROR_DS_LOW_ADLDS_FFL: ::DWORD = 8643;
-pub const ERROR_DOMAIN_SID_SAME_AS_LOCAL_WORKSTATION: ::DWORD = 8644;
-pub const ERROR_DS_UNDELETE_SAM_VALIDATION_FAILED: ::DWORD = 8645;
-pub const ERROR_INCORRECT_ACCOUNT_TYPE: ::DWORD = 8646;
-pub const ERROR_DS_SPN_VALUE_NOT_UNIQUE_IN_FOREST: ::DWORD = 8647;
-pub const ERROR_DS_UPN_VALUE_NOT_UNIQUE_IN_FOREST: ::DWORD = 8648;
-pub const DNS_ERROR_RESPONSE_CODES_BASE: ::DWORD = 9000;
-pub const DNS_ERROR_RCODE_NO_ERROR: ::DWORD = NO_ERROR;
-pub const DNS_ERROR_MASK: ::DWORD = 0x00002328;
-pub const DNS_ERROR_RCODE_FORMAT_ERROR: ::DWORD = 9001;
-pub const DNS_ERROR_RCODE_SERVER_FAILURE: ::DWORD = 9002;
-pub const DNS_ERROR_RCODE_NAME_ERROR: ::DWORD = 9003;
-pub const DNS_ERROR_RCODE_NOT_IMPLEMENTED: ::DWORD = 9004;
-pub const DNS_ERROR_RCODE_REFUSED: ::DWORD = 9005;
-pub const DNS_ERROR_RCODE_YXDOMAIN: ::DWORD = 9006;
-pub const DNS_ERROR_RCODE_YXRRSET: ::DWORD = 9007;
-pub const DNS_ERROR_RCODE_NXRRSET: ::DWORD = 9008;
-pub const DNS_ERROR_RCODE_NOTAUTH: ::DWORD = 9009;
-pub const DNS_ERROR_RCODE_NOTZONE: ::DWORD = 9010;
-pub const DNS_ERROR_RCODE_BADSIG: ::DWORD = 9016;
-pub const DNS_ERROR_RCODE_BADKEY: ::DWORD = 9017;
-pub const DNS_ERROR_RCODE_BADTIME: ::DWORD = 9018;
-pub const DNS_ERROR_RCODE_LAST: ::DWORD = DNS_ERROR_RCODE_BADTIME;
-pub const DNS_ERROR_DNSSEC_BASE: ::DWORD = 9100;
-pub const DNS_ERROR_KEYMASTER_REQUIRED: ::DWORD = 9101;
-pub const DNS_ERROR_NOT_ALLOWED_ON_SIGNED_ZONE: ::DWORD = 9102;
-pub const DNS_ERROR_NSEC3_INCOMPATIBLE_WITH_RSA_SHA1: ::DWORD = 9103;
-pub const DNS_ERROR_NOT_ENOUGH_SIGNING_KEY_DESCRIPTORS: ::DWORD = 9104;
-pub const DNS_ERROR_UNSUPPORTED_ALGORITHM: ::DWORD = 9105;
-pub const DNS_ERROR_INVALID_KEY_SIZE: ::DWORD = 9106;
-pub const DNS_ERROR_SIGNING_KEY_NOT_ACCESSIBLE: ::DWORD = 9107;
-pub const DNS_ERROR_KSP_DOES_NOT_SUPPORT_PROTECTION: ::DWORD = 9108;
-pub const DNS_ERROR_UNEXPECTED_DATA_PROTECTION_ERROR: ::DWORD = 9109;
-pub const DNS_ERROR_UNEXPECTED_CNG_ERROR: ::DWORD = 9110;
-pub const DNS_ERROR_UNKNOWN_SIGNING_PARAMETER_VERSION: ::DWORD = 9111;
-pub const DNS_ERROR_KSP_NOT_ACCESSIBLE: ::DWORD = 9112;
-pub const DNS_ERROR_TOO_MANY_SKDS: ::DWORD = 9113;
-pub const DNS_ERROR_INVALID_ROLLOVER_PERIOD: ::DWORD = 9114;
-pub const DNS_ERROR_INVALID_INITIAL_ROLLOVER_OFFSET: ::DWORD = 9115;
-pub const DNS_ERROR_ROLLOVER_IN_PROGRESS: ::DWORD = 9116;
-pub const DNS_ERROR_STANDBY_KEY_NOT_PRESENT: ::DWORD = 9117;
-pub const DNS_ERROR_NOT_ALLOWED_ON_ZSK: ::DWORD = 9118;
-pub const DNS_ERROR_NOT_ALLOWED_ON_ACTIVE_SKD: ::DWORD = 9119;
-pub const DNS_ERROR_ROLLOVER_ALREADY_QUEUED: ::DWORD = 9120;
-pub const DNS_ERROR_NOT_ALLOWED_ON_UNSIGNED_ZONE: ::DWORD = 9121;
-pub const DNS_ERROR_BAD_KEYMASTER: ::DWORD = 9122;
-pub const DNS_ERROR_INVALID_SIGNATURE_VALIDITY_PERIOD: ::DWORD = 9123;
-pub const DNS_ERROR_INVALID_NSEC3_ITERATION_COUNT: ::DWORD = 9124;
-pub const DNS_ERROR_DNSSEC_IS_DISABLED: ::DWORD = 9125;
-pub const DNS_ERROR_INVALID_XML: ::DWORD = 9126;
-pub const DNS_ERROR_NO_VALID_TRUST_ANCHORS: ::DWORD = 9127;
-pub const DNS_ERROR_ROLLOVER_NOT_POKEABLE: ::DWORD = 9128;
-pub const DNS_ERROR_NSEC3_NAME_COLLISION: ::DWORD = 9129;
-pub const DNS_ERROR_NSEC_INCOMPATIBLE_WITH_NSEC3_RSA_SHA1: ::DWORD = 9130;
-pub const DNS_ERROR_PACKET_FMT_BASE: ::DWORD = 9500;
-pub const DNS_INFO_NO_RECORDS: ::DWORD = 9501;
-pub const DNS_ERROR_BAD_PACKET: ::DWORD = 9502;
-pub const DNS_ERROR_NO_PACKET: ::DWORD = 9503;
-pub const DNS_ERROR_RCODE: ::DWORD = 9504;
-pub const DNS_ERROR_UNSECURE_PACKET: ::DWORD = 9505;
-pub const DNS_STATUS_PACKET_UNSECURE: ::DWORD = DNS_ERROR_UNSECURE_PACKET;
-pub const DNS_REQUEST_PENDING: ::DWORD = 9506;
-pub const DNS_ERROR_NO_MEMORY: ::DWORD = ERROR_OUTOFMEMORY;
-pub const DNS_ERROR_INVALID_NAME: ::DWORD = ERROR_INVALID_NAME;
-pub const DNS_ERROR_INVALID_DATA: ::DWORD = ERROR_INVALID_DATA;
-pub const DNS_ERROR_GENERAL_API_BASE: ::DWORD = 9550;
-pub const DNS_ERROR_INVALID_TYPE: ::DWORD = 9551;
-pub const DNS_ERROR_INVALID_IP_ADDRESS: ::DWORD = 9552;
-pub const DNS_ERROR_INVALID_PROPERTY: ::DWORD = 9553;
-pub const DNS_ERROR_TRY_AGAIN_LATER: ::DWORD = 9554;
-pub const DNS_ERROR_NOT_UNIQUE: ::DWORD = 9555;
-pub const DNS_ERROR_NON_RFC_NAME: ::DWORD = 9556;
-pub const DNS_STATUS_FQDN: ::DWORD = 9557;
-pub const DNS_STATUS_DOTTED_NAME: ::DWORD = 9558;
-pub const DNS_STATUS_SINGLE_PART_NAME: ::DWORD = 9559;
-pub const DNS_ERROR_INVALID_NAME_CHAR: ::DWORD = 9560;
-pub const DNS_ERROR_NUMERIC_NAME: ::DWORD = 9561;
-pub const DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER: ::DWORD = 9562;
-pub const DNS_ERROR_NOT_ALLOWED_UNDER_DELEGATION: ::DWORD = 9563;
-pub const DNS_ERROR_CANNOT_FIND_ROOT_HINTS: ::DWORD = 9564;
-pub const DNS_ERROR_INCONSISTENT_ROOT_HINTS: ::DWORD = 9565;
-pub const DNS_ERROR_DWORD_VALUE_TOO_SMALL: ::DWORD = 9566;
-pub const DNS_ERROR_DWORD_VALUE_TOO_LARGE: ::DWORD = 9567;
-pub const DNS_ERROR_BACKGROUND_LOADING: ::DWORD = 9568;
-pub const DNS_ERROR_NOT_ALLOWED_ON_RODC: ::DWORD = 9569;
-pub const DNS_ERROR_NOT_ALLOWED_UNDER_DNAME: ::DWORD = 9570;
-pub const DNS_ERROR_DELEGATION_REQUIRED: ::DWORD = 9571;
-pub const DNS_ERROR_INVALID_POLICY_TABLE: ::DWORD = 9572;
-pub const DNS_ERROR_ZONE_BASE: ::DWORD = 9600;
-pub const DNS_ERROR_ZONE_DOES_NOT_EXIST: ::DWORD = 9601;
-pub const DNS_ERROR_NO_ZONE_INFO: ::DWORD = 9602;
-pub const DNS_ERROR_INVALID_ZONE_OPERATION: ::DWORD = 9603;
-pub const DNS_ERROR_ZONE_CONFIGURATION_ERROR: ::DWORD = 9604;
-pub const DNS_ERROR_ZONE_HAS_NO_SOA_RECORD: ::DWORD = 9605;
-pub const DNS_ERROR_ZONE_HAS_NO_NS_RECORDS: ::DWORD = 9606;
-pub const DNS_ERROR_ZONE_LOCKED: ::DWORD = 9607;
-pub const DNS_ERROR_ZONE_CREATION_FAILED: ::DWORD = 9608;
-pub const DNS_ERROR_ZONE_ALREADY_EXISTS: ::DWORD = 9609;
-pub const DNS_ERROR_AUTOZONE_ALREADY_EXISTS: ::DWORD = 9610;
-pub const DNS_ERROR_INVALID_ZONE_TYPE: ::DWORD = 9611;
-pub const DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP: ::DWORD = 9612;
-pub const DNS_ERROR_ZONE_NOT_SECONDARY: ::DWORD = 9613;
-pub const DNS_ERROR_NEED_SECONDARY_ADDRESSES: ::DWORD = 9614;
-pub const DNS_ERROR_WINS_INIT_FAILED: ::DWORD = 9615;
-pub const DNS_ERROR_NEED_WINS_SERVERS: ::DWORD = 9616;
-pub const DNS_ERROR_NBSTAT_INIT_FAILED: ::DWORD = 9617;
-pub const DNS_ERROR_SOA_DELETE_INVALID: ::DWORD = 9618;
-pub const DNS_ERROR_FORWARDER_ALREADY_EXISTS: ::DWORD = 9619;
-pub const DNS_ERROR_ZONE_REQUIRES_MASTER_IP: ::DWORD = 9620;
-pub const DNS_ERROR_ZONE_IS_SHUTDOWN: ::DWORD = 9621;
-pub const DNS_ERROR_ZONE_LOCKED_FOR_SIGNING: ::DWORD = 9622;
-pub const DNS_ERROR_DATAFILE_BASE: ::DWORD = 9650;
-pub const DNS_ERROR_PRIMARY_REQUIRES_DATAFILE: ::DWORD = 9651;
-pub const DNS_ERROR_INVALID_DATAFILE_NAME: ::DWORD = 9652;
-pub const DNS_ERROR_DATAFILE_OPEN_FAILURE: ::DWORD = 9653;
-pub const DNS_ERROR_FILE_WRITEBACK_FAILED: ::DWORD = 9654;
-pub const DNS_ERROR_DATAFILE_PARSING: ::DWORD = 9655;
-pub const DNS_ERROR_DATABASE_BASE: ::DWORD = 9700;
-pub const DNS_ERROR_RECORD_DOES_NOT_EXIST: ::DWORD = 9701;
-pub const DNS_ERROR_RECORD_FORMAT: ::DWORD = 9702;
-pub const DNS_ERROR_NODE_CREATION_FAILED: ::DWORD = 9703;
-pub const DNS_ERROR_UNKNOWN_RECORD_TYPE: ::DWORD = 9704;
-pub const DNS_ERROR_RECORD_TIMED_OUT: ::DWORD = 9705;
-pub const DNS_ERROR_NAME_NOT_IN_ZONE: ::DWORD = 9706;
-pub const DNS_ERROR_CNAME_LOOP: ::DWORD = 9707;
-pub const DNS_ERROR_NODE_IS_CNAME: ::DWORD = 9708;
-pub const DNS_ERROR_CNAME_COLLISION: ::DWORD = 9709;
-pub const DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT: ::DWORD = 9710;
-pub const DNS_ERROR_RECORD_ALREADY_EXISTS: ::DWORD = 9711;
-pub const DNS_ERROR_SECONDARY_DATA: ::DWORD = 9712;
-pub const DNS_ERROR_NO_CREATE_CACHE_DATA: ::DWORD = 9713;
-pub const DNS_ERROR_NAME_DOES_NOT_EXIST: ::DWORD = 9714;
-pub const DNS_WARNING_PTR_CREATE_FAILED: ::DWORD = 9715;
-pub const DNS_WARNING_DOMAIN_UNDELETED: ::DWORD = 9716;
-pub const DNS_ERROR_DS_UNAVAILABLE: ::DWORD = 9717;
-pub const DNS_ERROR_DS_ZONE_ALREADY_EXISTS: ::DWORD = 9718;
-pub const DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE: ::DWORD = 9719;
-pub const DNS_ERROR_NODE_IS_DNAME: ::DWORD = 9720;
-pub const DNS_ERROR_DNAME_COLLISION: ::DWORD = 9721;
-pub const DNS_ERROR_ALIAS_LOOP: ::DWORD = 9722;
-pub const DNS_ERROR_OPERATION_BASE: ::DWORD = 9750;
-pub const DNS_INFO_AXFR_COMPLETE: ::DWORD = 9751;
-pub const DNS_ERROR_AXFR: ::DWORD = 9752;
-pub const DNS_INFO_ADDED_LOCAL_WINS: ::DWORD = 9753;
-pub const DNS_ERROR_SECURE_BASE: ::DWORD = 9800;
-pub const DNS_STATUS_CONTINUE_NEEDED: ::DWORD = 9801;
-pub const DNS_ERROR_SETUP_BASE: ::DWORD = 9850;
-pub const DNS_ERROR_NO_TCPIP: ::DWORD = 9851;
-pub const DNS_ERROR_NO_DNS_SERVERS: ::DWORD = 9852;
-pub const DNS_ERROR_DP_BASE: ::DWORD = 9900;
-pub const DNS_ERROR_DP_DOES_NOT_EXIST: ::DWORD = 9901;
-pub const DNS_ERROR_DP_ALREADY_EXISTS: ::DWORD = 9902;
-pub const DNS_ERROR_DP_NOT_ENLISTED: ::DWORD = 9903;
-pub const DNS_ERROR_DP_ALREADY_ENLISTED: ::DWORD = 9904;
-pub const DNS_ERROR_DP_NOT_AVAILABLE: ::DWORD = 9905;
-pub const DNS_ERROR_DP_FSMO_ERROR: ::DWORD = 9906;
-pub const DNS_ERROR_ZONESCOPE_ALREADY_EXISTS: ::DWORD = 9951;
-pub const DNS_ERROR_ZONESCOPE_DOES_NOT_EXIST: ::DWORD = 9952;
-pub const DNS_ERROR_DEFAULT_ZONESCOPE: ::DWORD = 9953;
-pub const DNS_ERROR_INVALID_ZONESCOPE_NAME: ::DWORD = 9954;
-pub const DNS_ERROR_NOT_ALLOWED_WITH_ZONESCOPES: ::DWORD = 9955;
-pub const DNS_ERROR_LOAD_ZONESCOPE_FAILED: ::DWORD = 9956;
-pub const DNS_ERROR_ZONESCOPE_FILE_WRITEBACK_FAILED: ::DWORD = 9957;
-pub const DNS_ERROR_INVALID_SCOPE_NAME: ::DWORD = 9958;
-pub const DNS_ERROR_SCOPE_DOES_NOT_EXIST: ::DWORD = 9959;
-pub const DNS_ERROR_DEFAULT_SCOPE: ::DWORD = 9960;
-pub const DNS_ERROR_INVALID_SCOPE_OPERATION: ::DWORD = 9961;
-pub const DNS_ERROR_SCOPE_LOCKED: ::DWORD = 9962;
-pub const DNS_ERROR_SCOPE_ALREADY_EXISTS: ::DWORD = 9963;
-pub const WSABASEERR: ::DWORD = 10000;
-pub const WSAEINTR: ::DWORD = 10004;
-pub const WSAEBADF: ::DWORD = 10009;
-pub const WSAEACCES: ::DWORD = 10013;
-pub const WSAEFAULT: ::DWORD = 10014;
-pub const WSAEINVAL: ::DWORD = 10022;
-pub const WSAEMFILE: ::DWORD = 10024;
-pub const WSAEWOULDBLOCK: ::DWORD = 10035;
-pub const WSAEINPROGRESS: ::DWORD = 10036;
-pub const WSAEALREADY: ::DWORD = 10037;
-pub const WSAENOTSOCK: ::DWORD = 10038;
-pub const WSAEDESTADDRREQ: ::DWORD = 10039;
-pub const WSAEMSGSIZE: ::DWORD = 10040;
-pub const WSAEPROTOTYPE: ::DWORD = 10041;
-pub const WSAENOPROTOOPT: ::DWORD = 10042;
-pub const WSAEPROTONOSUPPORT: ::DWORD = 10043;
-pub const WSAESOCKTNOSUPPORT: ::DWORD = 10044;
-pub const WSAEOPNOTSUPP: ::DWORD = 10045;
-pub const WSAEPFNOSUPPORT: ::DWORD = 10046;
-pub const WSAEAFNOSUPPORT: ::DWORD = 10047;
-pub const WSAEADDRINUSE: ::DWORD = 10048;
-pub const WSAEADDRNOTAVAIL: ::DWORD = 10049;
-pub const WSAENETDOWN: ::DWORD = 10050;
-pub const WSAENETUNREACH: ::DWORD = 10051;
-pub const WSAENETRESET: ::DWORD = 10052;
-pub const WSAECONNABORTED: ::DWORD = 10053;
-pub const WSAECONNRESET: ::DWORD = 10054;
-pub const WSAENOBUFS: ::DWORD = 10055;
-pub const WSAEISCONN: ::DWORD = 10056;
-pub const WSAENOTCONN: ::DWORD = 10057;
-pub const WSAESHUTDOWN: ::DWORD = 10058;
-pub const WSAETOOMANYREFS: ::DWORD = 10059;
-pub const WSAETIMEDOUT: ::DWORD = 10060;
-pub const WSAECONNREFUSED: ::DWORD = 10061;
-pub const WSAELOOP: ::DWORD = 10062;
-pub const WSAENAMETOOLONG: ::DWORD = 10063;
-pub const WSAEHOSTDOWN: ::DWORD = 10064;
-pub const WSAEHOSTUNREACH: ::DWORD = 10065;
-pub const WSAENOTEMPTY: ::DWORD = 10066;
-pub const WSAEPROCLIM: ::DWORD = 10067;
-pub const WSAEUSERS: ::DWORD = 10068;
-pub const WSAEDQUOT: ::DWORD = 10069;
-pub const WSAESTALE: ::DWORD = 10070;
-pub const WSAEREMOTE: ::DWORD = 10071;
-pub const WSASYSNOTREADY: ::DWORD = 10091;
-pub const WSAVERNOTSUPPORTED: ::DWORD = 10092;
-pub const WSANOTINITIALISED: ::DWORD = 10093;
-pub const WSAEDISCON: ::DWORD = 10101;
-pub const WSAENOMORE: ::DWORD = 10102;
-pub const WSAECANCELLED: ::DWORD = 10103;
-pub const WSAEINVALIDPROCTABLE: ::DWORD = 10104;
-pub const WSAEINVALIDPROVIDER: ::DWORD = 10105;
-pub const WSAEPROVIDERFAILEDINIT: ::DWORD = 10106;
-pub const WSASYSCALLFAILURE: ::DWORD = 10107;
-pub const WSASERVICE_NOT_FOUND: ::DWORD = 10108;
-pub const WSATYPE_NOT_FOUND: ::DWORD = 10109;
-pub const WSA_E_NO_MORE: ::DWORD = 10110;
-pub const WSA_E_CANCELLED: ::DWORD = 10111;
-pub const WSAEREFUSED: ::DWORD = 10112;
-pub const WSAHOST_NOT_FOUND: ::DWORD = 11001;
-pub const WSATRY_AGAIN: ::DWORD = 11002;
-pub const WSANO_RECOVERY: ::DWORD = 11003;
-pub const WSANO_DATA: ::DWORD = 11004;
-pub const WSA_QOS_RECEIVERS: ::DWORD = 11005;
-pub const WSA_QOS_SENDERS: ::DWORD = 11006;
-pub const WSA_QOS_NO_SENDERS: ::DWORD = 11007;
-pub const WSA_QOS_NO_RECEIVERS: ::DWORD = 11008;
-pub const WSA_QOS_REQUEST_CONFIRMED: ::DWORD = 11009;
-pub const WSA_QOS_ADMISSION_FAILURE: ::DWORD = 11010;
-pub const WSA_QOS_POLICY_FAILURE: ::DWORD = 11011;
-pub const WSA_QOS_BAD_STYLE: ::DWORD = 11012;
-pub const WSA_QOS_BAD_OBJECT: ::DWORD = 11013;
-pub const WSA_QOS_TRAFFIC_CTRL_ERROR: ::DWORD = 11014;
-pub const WSA_QOS_GENERIC_ERROR: ::DWORD = 11015;
-pub const WSA_QOS_ESERVICETYPE: ::DWORD = 11016;
-pub const WSA_QOS_EFLOWSPEC: ::DWORD = 11017;
-pub const WSA_QOS_EPROVSPECBUF: ::DWORD = 11018;
-pub const WSA_QOS_EFILTERSTYLE: ::DWORD = 11019;
-pub const WSA_QOS_EFILTERTYPE: ::DWORD = 11020;
-pub const WSA_QOS_EFILTERCOUNT: ::DWORD = 11021;
-pub const WSA_QOS_EOBJLENGTH: ::DWORD = 11022;
-pub const WSA_QOS_EFLOWCOUNT: ::DWORD = 11023;
-pub const WSA_QOS_EUNKOWNPSOBJ: ::DWORD = 11024;
-pub const WSA_QOS_EPOLICYOBJ: ::DWORD = 11025;
-pub const WSA_QOS_EFLOWDESC: ::DWORD = 11026;
-pub const WSA_QOS_EPSFLOWSPEC: ::DWORD = 11027;
-pub const WSA_QOS_EPSFILTERSPEC: ::DWORD = 11028;
-pub const WSA_QOS_ESDMODEOBJ: ::DWORD = 11029;
-pub const WSA_QOS_ESHAPERATEOBJ: ::DWORD = 11030;
-pub const WSA_QOS_RESERVED_PETYPE: ::DWORD = 11031;
-pub const WSA_SECURE_HOST_NOT_FOUND: ::DWORD = 11032;
-pub const WSA_IPSEC_NAME_POLICY_ERROR: ::DWORD = 11033;
-pub const ERROR_IPSEC_QM_POLICY_EXISTS: ::DWORD = 13000;
-pub const ERROR_IPSEC_QM_POLICY_NOT_FOUND: ::DWORD = 13001;
-pub const ERROR_IPSEC_QM_POLICY_IN_USE: ::DWORD = 13002;
-pub const ERROR_IPSEC_MM_POLICY_EXISTS: ::DWORD = 13003;
-pub const ERROR_IPSEC_MM_POLICY_NOT_FOUND: ::DWORD = 13004;
-pub const ERROR_IPSEC_MM_POLICY_IN_USE: ::DWORD = 13005;
-pub const ERROR_IPSEC_MM_FILTER_EXISTS: ::DWORD = 13006;
-pub const ERROR_IPSEC_MM_FILTER_NOT_FOUND: ::DWORD = 13007;
-pub const ERROR_IPSEC_TRANSPORT_FILTER_EXISTS: ::DWORD = 13008;
-pub const ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND: ::DWORD = 13009;
-pub const ERROR_IPSEC_MM_AUTH_EXISTS: ::DWORD = 13010;
-pub const ERROR_IPSEC_MM_AUTH_NOT_FOUND: ::DWORD = 13011;
-pub const ERROR_IPSEC_MM_AUTH_IN_USE: ::DWORD = 13012;
-pub const ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND: ::DWORD = 13013;
-pub const ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND: ::DWORD = 13014;
-pub const ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND: ::DWORD = 13015;
-pub const ERROR_IPSEC_TUNNEL_FILTER_EXISTS: ::DWORD = 13016;
-pub const ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND: ::DWORD = 13017;
-pub const ERROR_IPSEC_MM_FILTER_PENDING_DELETION: ::DWORD = 13018;
-pub const ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION: ::DWORD = 13019;
-pub const ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION: ::DWORD = 13020;
-pub const ERROR_IPSEC_MM_POLICY_PENDING_DELETION: ::DWORD = 13021;
-pub const ERROR_IPSEC_MM_AUTH_PENDING_DELETION: ::DWORD = 13022;
-pub const ERROR_IPSEC_QM_POLICY_PENDING_DELETION: ::DWORD = 13023;
-pub const WARNING_IPSEC_MM_POLICY_PRUNED: ::DWORD = 13024;
-pub const WARNING_IPSEC_QM_POLICY_PRUNED: ::DWORD = 13025;
-pub const ERROR_IPSEC_IKE_NEG_STATUS_BEGIN: ::DWORD = 13800;
-pub const ERROR_IPSEC_IKE_AUTH_FAIL: ::DWORD = 13801;
-pub const ERROR_IPSEC_IKE_ATTRIB_FAIL: ::DWORD = 13802;
-pub const ERROR_IPSEC_IKE_NEGOTIATION_PENDING: ::DWORD = 13803;
-pub const ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR: ::DWORD = 13804;
-pub const ERROR_IPSEC_IKE_TIMED_OUT: ::DWORD = 13805;
-pub const ERROR_IPSEC_IKE_NO_CERT: ::DWORD = 13806;
-pub const ERROR_IPSEC_IKE_SA_DELETED: ::DWORD = 13807;
-pub const ERROR_IPSEC_IKE_SA_REAPED: ::DWORD = 13808;
-pub const ERROR_IPSEC_IKE_MM_ACQUIRE_DROP: ::DWORD = 13809;
-pub const ERROR_IPSEC_IKE_QM_ACQUIRE_DROP: ::DWORD = 13810;
-pub const ERROR_IPSEC_IKE_QUEUE_DROP_MM: ::DWORD = 13811;
-pub const ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM: ::DWORD = 13812;
-pub const ERROR_IPSEC_IKE_DROP_NO_RESPONSE: ::DWORD = 13813;
-pub const ERROR_IPSEC_IKE_MM_DELAY_DROP: ::DWORD = 13814;
-pub const ERROR_IPSEC_IKE_QM_DELAY_DROP: ::DWORD = 13815;
-pub const ERROR_IPSEC_IKE_ERROR: ::DWORD = 13816;
-pub const ERROR_IPSEC_IKE_CRL_FAILED: ::DWORD = 13817;
-pub const ERROR_IPSEC_IKE_INVALID_KEY_USAGE: ::DWORD = 13818;
-pub const ERROR_IPSEC_IKE_INVALID_CERT_TYPE: ::DWORD = 13819;
-pub const ERROR_IPSEC_IKE_NO_PRIVATE_KEY: ::DWORD = 13820;
-pub const ERROR_IPSEC_IKE_SIMULTANEOUS_REKEY: ::DWORD = 13821;
-pub const ERROR_IPSEC_IKE_DH_FAIL: ::DWORD = 13822;
-pub const ERROR_IPSEC_IKE_CRITICAL_PAYLOAD_NOT_RECOGNIZED: ::DWORD = 13823;
-pub const ERROR_IPSEC_IKE_INVALID_HEADER: ::DWORD = 13824;
-pub const ERROR_IPSEC_IKE_NO_POLICY: ::DWORD = 13825;
-pub const ERROR_IPSEC_IKE_INVALID_SIGNATURE: ::DWORD = 13826;
-pub const ERROR_IPSEC_IKE_KERBEROS_ERROR: ::DWORD = 13827;
-pub const ERROR_IPSEC_IKE_NO_PUBLIC_KEY: ::DWORD = 13828;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR: ::DWORD = 13829;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_SA: ::DWORD = 13830;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_PROP: ::DWORD = 13831;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_TRANS: ::DWORD = 13832;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_KE: ::DWORD = 13833;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_ID: ::DWORD = 13834;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_CERT: ::DWORD = 13835;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ: ::DWORD = 13836;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_HASH: ::DWORD = 13837;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_SIG: ::DWORD = 13838;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_NONCE: ::DWORD = 13839;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY: ::DWORD = 13840;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_DELETE: ::DWORD = 13841;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR: ::DWORD = 13842;
-pub const ERROR_IPSEC_IKE_INVALID_PAYLOAD: ::DWORD = 13843;
-pub const ERROR_IPSEC_IKE_LOAD_SOFT_SA: ::DWORD = 13844;
-pub const ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN: ::DWORD = 13845;
-pub const ERROR_IPSEC_IKE_INVALID_COOKIE: ::DWORD = 13846;
-pub const ERROR_IPSEC_IKE_NO_PEER_CERT: ::DWORD = 13847;
-pub const ERROR_IPSEC_IKE_PEER_CRL_FAILED: ::DWORD = 13848;
-pub const ERROR_IPSEC_IKE_POLICY_CHANGE: ::DWORD = 13849;
-pub const ERROR_IPSEC_IKE_NO_MM_POLICY: ::DWORD = 13850;
-pub const ERROR_IPSEC_IKE_NOTCBPRIV: ::DWORD = 13851;
-pub const ERROR_IPSEC_IKE_SECLOADFAIL: ::DWORD = 13852;
-pub const ERROR_IPSEC_IKE_FAILSSPINIT: ::DWORD = 13853;
-pub const ERROR_IPSEC_IKE_FAILQUERYSSP: ::DWORD = 13854;
-pub const ERROR_IPSEC_IKE_SRVACQFAIL: ::DWORD = 13855;
-pub const ERROR_IPSEC_IKE_SRVQUERYCRED: ::DWORD = 13856;
-pub const ERROR_IPSEC_IKE_GETSPIFAIL: ::DWORD = 13857;
-pub const ERROR_IPSEC_IKE_INVALID_FILTER: ::DWORD = 13858;
-pub const ERROR_IPSEC_IKE_OUT_OF_MEMORY: ::DWORD = 13859;
-pub const ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED: ::DWORD = 13860;
-pub const ERROR_IPSEC_IKE_INVALID_POLICY: ::DWORD = 13861;
-pub const ERROR_IPSEC_IKE_UNKNOWN_DOI: ::DWORD = 13862;
-pub const ERROR_IPSEC_IKE_INVALID_SITUATION: ::DWORD = 13863;
-pub const ERROR_IPSEC_IKE_DH_FAILURE: ::DWORD = 13864;
-pub const ERROR_IPSEC_IKE_INVALID_GROUP: ::DWORD = 13865;
-pub const ERROR_IPSEC_IKE_ENCRYPT: ::DWORD = 13866;
-pub const ERROR_IPSEC_IKE_DECRYPT: ::DWORD = 13867;
-pub const ERROR_IPSEC_IKE_POLICY_MATCH: ::DWORD = 13868;
-pub const ERROR_IPSEC_IKE_UNSUPPORTED_ID: ::DWORD = 13869;
-pub const ERROR_IPSEC_IKE_INVALID_HASH: ::DWORD = 13870;
-pub const ERROR_IPSEC_IKE_INVALID_HASH_ALG: ::DWORD = 13871;
-pub const ERROR_IPSEC_IKE_INVALID_HASH_SIZE: ::DWORD = 13872;
-pub const ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG: ::DWORD = 13873;
-pub const ERROR_IPSEC_IKE_INVALID_AUTH_ALG: ::DWORD = 13874;
-pub const ERROR_IPSEC_IKE_INVALID_SIG: ::DWORD = 13875;
-pub const ERROR_IPSEC_IKE_LOAD_FAILED: ::DWORD = 13876;
-pub const ERROR_IPSEC_IKE_RPC_DELETE: ::DWORD = 13877;
-pub const ERROR_IPSEC_IKE_BENIGN_REINIT: ::DWORD = 13878;
-pub const ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY: ::DWORD = 13879;
-pub const ERROR_IPSEC_IKE_INVALID_MAJOR_VERSION: ::DWORD = 13880;
-pub const ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN: ::DWORD = 13881;
-pub const ERROR_IPSEC_IKE_MM_LIMIT: ::DWORD = 13882;
-pub const ERROR_IPSEC_IKE_NEGOTIATION_DISABLED: ::DWORD = 13883;
-pub const ERROR_IPSEC_IKE_QM_LIMIT: ::DWORD = 13884;
-pub const ERROR_IPSEC_IKE_MM_EXPIRED: ::DWORD = 13885;
-pub const ERROR_IPSEC_IKE_PEER_MM_ASSUMED_INVALID: ::DWORD = 13886;
-pub const ERROR_IPSEC_IKE_CERT_CHAIN_POLICY_MISMATCH: ::DWORD = 13887;
-pub const ERROR_IPSEC_IKE_UNEXPECTED_MESSAGE_ID: ::DWORD = 13888;
-pub const ERROR_IPSEC_IKE_INVALID_AUTH_PAYLOAD: ::DWORD = 13889;
-pub const ERROR_IPSEC_IKE_DOS_COOKIE_SENT: ::DWORD = 13890;
-pub const ERROR_IPSEC_IKE_SHUTTING_DOWN: ::DWORD = 13891;
-pub const ERROR_IPSEC_IKE_CGA_AUTH_FAILED: ::DWORD = 13892;
-pub const ERROR_IPSEC_IKE_PROCESS_ERR_NATOA: ::DWORD = 13893;
-pub const ERROR_IPSEC_IKE_INVALID_MM_FOR_QM: ::DWORD = 13894;
-pub const ERROR_IPSEC_IKE_QM_EXPIRED: ::DWORD = 13895;
-pub const ERROR_IPSEC_IKE_TOO_MANY_FILTERS: ::DWORD = 13896;
-pub const ERROR_IPSEC_IKE_NEG_STATUS_END: ::DWORD = 13897;
-pub const ERROR_IPSEC_IKE_KILL_DUMMY_NAP_TUNNEL: ::DWORD = 13898;
-pub const ERROR_IPSEC_IKE_INNER_IP_ASSIGNMENT_FAILURE: ::DWORD = 13899;
-pub const ERROR_IPSEC_IKE_REQUIRE_CP_PAYLOAD_MISSING: ::DWORD = 13900;
-pub const ERROR_IPSEC_KEY_MODULE_IMPERSONATION_NEGOTIATION_PENDING: ::DWORD = 13901;
-pub const ERROR_IPSEC_IKE_COEXISTENCE_SUPPRESS: ::DWORD = 13902;
-pub const ERROR_IPSEC_IKE_RATELIMIT_DROP: ::DWORD = 13903;
-pub const ERROR_IPSEC_IKE_PEER_DOESNT_SUPPORT_MOBIKE: ::DWORD = 13904;
-pub const ERROR_IPSEC_IKE_AUTHORIZATION_FAILURE: ::DWORD = 13905;
-pub const ERROR_IPSEC_IKE_STRONG_CRED_AUTHORIZATION_FAILURE: ::DWORD = 13906;
-pub const ERROR_IPSEC_IKE_AUTHORIZATION_FAILURE_WITH_OPTIONAL_RETRY: ::DWORD = 13907;
-pub const ERROR_IPSEC_IKE_STRONG_CRED_AUTHORIZATION_AND_CERTMAP_FAILURE: ::DWORD = 13908;
-pub const ERROR_IPSEC_IKE_NEG_STATUS_EXTENDED_END: ::DWORD = 13909;
-pub const ERROR_IPSEC_BAD_SPI: ::DWORD = 13910;
-pub const ERROR_IPSEC_SA_LIFETIME_EXPIRED: ::DWORD = 13911;
-pub const ERROR_IPSEC_WRONG_SA: ::DWORD = 13912;
-pub const ERROR_IPSEC_REPLAY_CHECK_FAILED: ::DWORD = 13913;
-pub const ERROR_IPSEC_INVALID_PACKET: ::DWORD = 13914;
-pub const ERROR_IPSEC_INTEGRITY_CHECK_FAILED: ::DWORD = 13915;
-pub const ERROR_IPSEC_CLEAR_TEXT_DROP: ::DWORD = 13916;
-pub const ERROR_IPSEC_AUTH_FIREWALL_DROP: ::DWORD = 13917;
-pub const ERROR_IPSEC_THROTTLE_DROP: ::DWORD = 13918;
-pub const ERROR_IPSEC_DOSP_BLOCK: ::DWORD = 13925;
-pub const ERROR_IPSEC_DOSP_RECEIVED_MULTICAST: ::DWORD = 13926;
-pub const ERROR_IPSEC_DOSP_INVALID_PACKET: ::DWORD = 13927;
-pub const ERROR_IPSEC_DOSP_STATE_LOOKUP_FAILED: ::DWORD = 13928;
-pub const ERROR_IPSEC_DOSP_MAX_ENTRIES: ::DWORD = 13929;
-pub const ERROR_IPSEC_DOSP_KEYMOD_NOT_ALLOWED: ::DWORD = 13930;
-pub const ERROR_IPSEC_DOSP_NOT_INSTALLED: ::DWORD = 13931;
-pub const ERROR_IPSEC_DOSP_MAX_PER_IP_RATELIMIT_QUEUES: ::DWORD = 13932;
-pub const ERROR_SXS_SECTION_NOT_FOUND: ::DWORD = 14000;
-pub const ERROR_SXS_CANT_GEN_ACTCTX: ::DWORD = 14001;
-pub const ERROR_SXS_INVALID_ACTCTXDATA_FORMAT: ::DWORD = 14002;
-pub const ERROR_SXS_ASSEMBLY_NOT_FOUND: ::DWORD = 14003;
-pub const ERROR_SXS_MANIFEST_FORMAT_ERROR: ::DWORD = 14004;
-pub const ERROR_SXS_MANIFEST_PARSE_ERROR: ::DWORD = 14005;
-pub const ERROR_SXS_ACTIVATION_CONTEXT_DISABLED: ::DWORD = 14006;
-pub const ERROR_SXS_KEY_NOT_FOUND: ::DWORD = 14007;
-pub const ERROR_SXS_VERSION_CONFLICT: ::DWORD = 14008;
-pub const ERROR_SXS_WRONG_SECTION_TYPE: ::DWORD = 14009;
-pub const ERROR_SXS_THREAD_QUERIES_DISABLED: ::DWORD = 14010;
-pub const ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET: ::DWORD = 14011;
-pub const ERROR_SXS_UNKNOWN_ENCODING_GROUP: ::DWORD = 14012;
-pub const ERROR_SXS_UNKNOWN_ENCODING: ::DWORD = 14013;
-pub const ERROR_SXS_INVALID_XML_NAMESPACE_URI: ::DWORD = 14014;
-pub const ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED: ::DWORD = 14015;
-pub const ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED: ::DWORD = 14016;
-pub const ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE: ::DWORD = 14017;
-pub const ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE: ::DWORD = 14018;
-pub const ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE: ::DWORD = 14019;
-pub const ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT: ::DWORD = 14020;
-pub const ERROR_SXS_DUPLICATE_DLL_NAME: ::DWORD = 14021;
-pub const ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME: ::DWORD = 14022;
-pub const ERROR_SXS_DUPLICATE_CLSID: ::DWORD = 14023;
-pub const ERROR_SXS_DUPLICATE_IID: ::DWORD = 14024;
-pub const ERROR_SXS_DUPLICATE_TLBID: ::DWORD = 14025;
-pub const ERROR_SXS_DUPLICATE_PROGID: ::DWORD = 14026;
-pub const ERROR_SXS_DUPLICATE_ASSEMBLY_NAME: ::DWORD = 14027;
-pub const ERROR_SXS_FILE_HASH_MISMATCH: ::DWORD = 14028;
-pub const ERROR_SXS_POLICY_PARSE_ERROR: ::DWORD = 14029;
-pub const ERROR_SXS_XML_E_MISSINGQUOTE: ::DWORD = 14030;
-pub const ERROR_SXS_XML_E_COMMENTSYNTAX: ::DWORD = 14031;
-pub const ERROR_SXS_XML_E_BADSTARTNAMECHAR: ::DWORD = 14032;
-pub const ERROR_SXS_XML_E_BADNAMECHAR: ::DWORD = 14033;
-pub const ERROR_SXS_XML_E_BADCHARINSTRING: ::DWORD = 14034;
-pub const ERROR_SXS_XML_E_XMLDECLSYNTAX: ::DWORD = 14035;
-pub const ERROR_SXS_XML_E_BADCHARDATA: ::DWORD = 14036;
-pub const ERROR_SXS_XML_E_MISSINGWHITESPACE: ::DWORD = 14037;
-pub const ERROR_SXS_XML_E_EXPECTINGTAGEND: ::DWORD = 14038;
-pub const ERROR_SXS_XML_E_MISSINGSEMICOLON: ::DWORD = 14039;
-pub const ERROR_SXS_XML_E_UNBALANCEDPAREN: ::DWORD = 14040;
-pub const ERROR_SXS_XML_E_INTERNALERROR: ::DWORD = 14041;
-pub const ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE: ::DWORD = 14042;
-pub const ERROR_SXS_XML_E_INCOMPLETE_ENCODING: ::DWORD = 14043;
-pub const ERROR_SXS_XML_E_MISSING_PAREN: ::DWORD = 14044;
-pub const ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE: ::DWORD = 14045;
-pub const ERROR_SXS_XML_E_MULTIPLE_COLONS: ::DWORD = 14046;
-pub const ERROR_SXS_XML_E_INVALID_DECIMAL: ::DWORD = 14047;
-pub const ERROR_SXS_XML_E_INVALID_HEXIDECIMAL: ::DWORD = 14048;
-pub const ERROR_SXS_XML_E_INVALID_UNICODE: ::DWORD = 14049;
-pub const ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK: ::DWORD = 14050;
-pub const ERROR_SXS_XML_E_UNEXPECTEDENDTAG: ::DWORD = 14051;
-pub const ERROR_SXS_XML_E_UNCLOSEDTAG: ::DWORD = 14052;
-pub const ERROR_SXS_XML_E_DUPLICATEATTRIBUTE: ::DWORD = 14053;
-pub const ERROR_SXS_XML_E_MULTIPLEROOTS: ::DWORD = 14054;
-pub const ERROR_SXS_XML_E_INVALIDATROOTLEVEL: ::DWORD = 14055;
-pub const ERROR_SXS_XML_E_BADXMLDECL: ::DWORD = 14056;
-pub const ERROR_SXS_XML_E_MISSINGROOT: ::DWORD = 14057;
-pub const ERROR_SXS_XML_E_UNEXPECTEDEOF: ::DWORD = 14058;
-pub const ERROR_SXS_XML_E_BADPEREFINSUBSET: ::DWORD = 14059;
-pub const ERROR_SXS_XML_E_UNCLOSEDSTARTTAG: ::DWORD = 14060;
-pub const ERROR_SXS_XML_E_UNCLOSEDENDTAG: ::DWORD = 14061;
-pub const ERROR_SXS_XML_E_UNCLOSEDSTRING: ::DWORD = 14062;
-pub const ERROR_SXS_XML_E_UNCLOSEDCOMMENT: ::DWORD = 14063;
-pub const ERROR_SXS_XML_E_UNCLOSEDDECL: ::DWORD = 14064;
-pub const ERROR_SXS_XML_E_UNCLOSEDCDATA: ::DWORD = 14065;
-pub const ERROR_SXS_XML_E_RESERVEDNAMESPACE: ::DWORD = 14066;
-pub const ERROR_SXS_XML_E_INVALIDENCODING: ::DWORD = 14067;
-pub const ERROR_SXS_XML_E_INVALIDSWITCH: ::DWORD = 14068;
-pub const ERROR_SXS_XML_E_BADXMLCASE: ::DWORD = 14069;
-pub const ERROR_SXS_XML_E_INVALID_STANDALONE: ::DWORD = 14070;
-pub const ERROR_SXS_XML_E_UNEXPECTED_STANDALONE: ::DWORD = 14071;
-pub const ERROR_SXS_XML_E_INVALID_VERSION: ::DWORD = 14072;
-pub const ERROR_SXS_XML_E_MISSINGEQUALS: ::DWORD = 14073;
-pub const ERROR_SXS_PROTECTION_RECOVERY_FAILED: ::DWORD = 14074;
-pub const ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT: ::DWORD = 14075;
-pub const ERROR_SXS_PROTECTION_CATALOG_NOT_VALID: ::DWORD = 14076;
-pub const ERROR_SXS_UNTRANSLATABLE_HRESULT: ::DWORD = 14077;
-pub const ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING: ::DWORD = 14078;
-pub const ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE: ::DWORD = 14079;
-pub const ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME: ::DWORD = 14080;
-pub const ERROR_SXS_ASSEMBLY_MISSING: ::DWORD = 14081;
-pub const ERROR_SXS_CORRUPT_ACTIVATION_STACK: ::DWORD = 14082;
-pub const ERROR_SXS_CORRUPTION: ::DWORD = 14083;
-pub const ERROR_SXS_EARLY_DEACTIVATION: ::DWORD = 14084;
-pub const ERROR_SXS_INVALID_DEACTIVATION: ::DWORD = 14085;
-pub const ERROR_SXS_MULTIPLE_DEACTIVATION: ::DWORD = 14086;
-pub const ERROR_SXS_PROCESS_TERMINATION_REQUESTED: ::DWORD = 14087;
-pub const ERROR_SXS_RELEASE_ACTIVATION_CONTEXT: ::DWORD = 14088;
-pub const ERROR_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY: ::DWORD = 14089;
-pub const ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE: ::DWORD = 14090;
-pub const ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME: ::DWORD = 14091;
-pub const ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE: ::DWORD = 14092;
-pub const ERROR_SXS_IDENTITY_PARSE_ERROR: ::DWORD = 14093;
-pub const ERROR_MALFORMED_SUBSTITUTION_STRING: ::DWORD = 14094;
-pub const ERROR_SXS_INCORRECT_PUBLIC_KEY_TOKEN: ::DWORD = 14095;
-pub const ERROR_UNMAPPED_SUBSTITUTION_STRING: ::DWORD = 14096;
-pub const ERROR_SXS_ASSEMBLY_NOT_LOCKED: ::DWORD = 14097;
-pub const ERROR_SXS_COMPONENT_STORE_CORRUPT: ::DWORD = 14098;
-pub const ERROR_ADVANCED_INSTALLER_FAILED: ::DWORD = 14099;
-pub const ERROR_XML_ENCODING_MISMATCH: ::DWORD = 14100;
-pub const ERROR_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT: ::DWORD = 14101;
-pub const ERROR_SXS_IDENTITIES_DIFFERENT: ::DWORD = 14102;
-pub const ERROR_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT: ::DWORD = 14103;
-pub const ERROR_SXS_FILE_NOT_PART_OF_ASSEMBLY: ::DWORD = 14104;
-pub const ERROR_SXS_MANIFEST_TOO_BIG: ::DWORD = 14105;
-pub const ERROR_SXS_SETTING_NOT_REGISTERED: ::DWORD = 14106;
-pub const ERROR_SXS_TRANSACTION_CLOSURE_INCOMPLETE: ::DWORD = 14107;
-pub const ERROR_SMI_PRIMITIVE_INSTALLER_FAILED: ::DWORD = 14108;
-pub const ERROR_GENERIC_COMMAND_FAILED: ::DWORD = 14109;
-pub const ERROR_SXS_FILE_HASH_MISSING: ::DWORD = 14110;
-pub const ERROR_EVT_INVALID_CHANNEL_PATH: ::DWORD = 15000;
-pub const ERROR_EVT_INVALID_QUERY: ::DWORD = 15001;
-pub const ERROR_EVT_PUBLISHER_METADATA_NOT_FOUND: ::DWORD = 15002;
-pub const ERROR_EVT_EVENT_TEMPLATE_NOT_FOUND: ::DWORD = 15003;
-pub const ERROR_EVT_INVALID_PUBLISHER_NAME: ::DWORD = 15004;
-pub const ERROR_EVT_INVALID_EVENT_DATA: ::DWORD = 15005;
-pub const ERROR_EVT_CHANNEL_NOT_FOUND: ::DWORD = 15007;
-pub const ERROR_EVT_MALFORMED_XML_TEXT: ::DWORD = 15008;
-pub const ERROR_EVT_SUBSCRIPTION_TO_DIRECT_CHANNEL: ::DWORD = 15009;
-pub const ERROR_EVT_CONFIGURATION_ERROR: ::DWORD = 15010;
-pub const ERROR_EVT_QUERY_RESULT_STALE: ::DWORD = 15011;
-pub const ERROR_EVT_QUERY_RESULT_INVALID_POSITION: ::DWORD = 15012;
-pub const ERROR_EVT_NON_VALIDATING_MSXML: ::DWORD = 15013;
-pub const ERROR_EVT_FILTER_ALREADYSCOPED: ::DWORD = 15014;
-pub const ERROR_EVT_FILTER_NOTELTSET: ::DWORD = 15015;
-pub const ERROR_EVT_FILTER_INVARG: ::DWORD = 15016;
-pub const ERROR_EVT_FILTER_INVTEST: ::DWORD = 15017;
-pub const ERROR_EVT_FILTER_INVTYPE: ::DWORD = 15018;
-pub const ERROR_EVT_FILTER_PARSEERR: ::DWORD = 15019;
-pub const ERROR_EVT_FILTER_UNSUPPORTEDOP: ::DWORD = 15020;
-pub const ERROR_EVT_FILTER_UNEXPECTEDTOKEN: ::DWORD = 15021;
-pub const ERROR_EVT_INVALID_OPERATION_OVER_ENABLED_DIRECT_CHANNEL: ::DWORD = 15022;
-pub const ERROR_EVT_INVALID_CHANNEL_PROPERTY_VALUE: ::DWORD = 15023;
-pub const ERROR_EVT_INVALID_PUBLISHER_PROPERTY_VALUE: ::DWORD = 15024;
-pub const ERROR_EVT_CHANNEL_CANNOT_ACTIVATE: ::DWORD = 15025;
-pub const ERROR_EVT_FILTER_TOO_COMPLEX: ::DWORD = 15026;
-pub const ERROR_EVT_MESSAGE_NOT_FOUND: ::DWORD = 15027;
-pub const ERROR_EVT_MESSAGE_ID_NOT_FOUND: ::DWORD = 15028;
-pub const ERROR_EVT_UNRESOLVED_VALUE_INSERT: ::DWORD = 15029;
-pub const ERROR_EVT_UNRESOLVED_PARAMETER_INSERT: ::DWORD = 15030;
-pub const ERROR_EVT_MAX_INSERTS_REACHED: ::DWORD = 15031;
-pub const ERROR_EVT_EVENT_DEFINITION_NOT_FOUND: ::DWORD = 15032;
-pub const ERROR_EVT_MESSAGE_LOCALE_NOT_FOUND: ::DWORD = 15033;
-pub const ERROR_EVT_VERSION_TOO_OLD: ::DWORD = 15034;
-pub const ERROR_EVT_VERSION_TOO_NEW: ::DWORD = 15035;
-pub const ERROR_EVT_CANNOT_OPEN_CHANNEL_OF_QUERY: ::DWORD = 15036;
-pub const ERROR_EVT_PUBLISHER_DISABLED: ::DWORD = 15037;
-pub const ERROR_EVT_FILTER_OUT_OF_RANGE: ::DWORD = 15038;
-pub const ERROR_EC_SUBSCRIPTION_CANNOT_ACTIVATE: ::DWORD = 15080;
-pub const ERROR_EC_LOG_DISABLED: ::DWORD = 15081;
-pub const ERROR_EC_CIRCULAR_FORWARDING: ::DWORD = 15082;
-pub const ERROR_EC_CREDSTORE_FULL: ::DWORD = 15083;
-pub const ERROR_EC_CRED_NOT_FOUND: ::DWORD = 15084;
-pub const ERROR_EC_NO_ACTIVE_CHANNEL: ::DWORD = 15085;
-pub const ERROR_MUI_FILE_NOT_FOUND: ::DWORD = 15100;
-pub const ERROR_MUI_INVALID_FILE: ::DWORD = 15101;
-pub const ERROR_MUI_INVALID_RC_CONFIG: ::DWORD = 15102;
-pub const ERROR_MUI_INVALID_LOCALE_NAME: ::DWORD = 15103;
-pub const ERROR_MUI_INVALID_ULTIMATEFALLBACK_NAME: ::DWORD = 15104;
-pub const ERROR_MUI_FILE_NOT_LOADED: ::DWORD = 15105;
-pub const ERROR_RESOURCE_ENUM_USER_STOP: ::DWORD = 15106;
-pub const ERROR_MUI_INTLSETTINGS_UILANG_NOT_INSTALLED: ::DWORD = 15107;
-pub const ERROR_MUI_INTLSETTINGS_INVALID_LOCALE_NAME: ::DWORD = 15108;
-pub const ERROR_MRM_RUNTIME_NO_DEFAULT_OR_NEUTRAL_RESOURCE: ::DWORD = 15110;
-pub const ERROR_MRM_INVALID_PRICONFIG: ::DWORD = 15111;
-pub const ERROR_MRM_INVALID_FILE_TYPE: ::DWORD = 15112;
-pub const ERROR_MRM_UNKNOWN_QUALIFIER: ::DWORD = 15113;
-pub const ERROR_MRM_INVALID_QUALIFIER_VALUE: ::DWORD = 15114;
-pub const ERROR_MRM_NO_CANDIDATE: ::DWORD = 15115;
-pub const ERROR_MRM_NO_MATCH_OR_DEFAULT_CANDIDATE: ::DWORD = 15116;
-pub const ERROR_MRM_RESOURCE_TYPE_MISMATCH: ::DWORD = 15117;
-pub const ERROR_MRM_DUPLICATE_MAP_NAME: ::DWORD = 15118;
-pub const ERROR_MRM_DUPLICATE_ENTRY: ::DWORD = 15119;
-pub const ERROR_MRM_INVALID_RESOURCE_IDENTIFIER: ::DWORD = 15120;
-pub const ERROR_MRM_FILEPATH_TOO_LONG: ::DWORD = 15121;
-pub const ERROR_MRM_UNSUPPORTED_DIRECTORY_TYPE: ::DWORD = 15122;
-pub const ERROR_MRM_INVALID_PRI_FILE: ::DWORD = 15126;
-pub const ERROR_MRM_NAMED_RESOURCE_NOT_FOUND: ::DWORD = 15127;
-pub const ERROR_MRM_MAP_NOT_FOUND: ::DWORD = 15135;
-pub const ERROR_MRM_UNSUPPORTED_PROFILE_TYPE: ::DWORD = 15136;
-pub const ERROR_MRM_INVALID_QUALIFIER_OPERATOR: ::DWORD = 15137;
-pub const ERROR_MRM_INDETERMINATE_QUALIFIER_VALUE: ::DWORD = 15138;
-pub const ERROR_MRM_AUTOMERGE_ENABLED: ::DWORD = 15139;
-pub const ERROR_MRM_TOO_MANY_RESOURCES: ::DWORD = 15140;
-pub const ERROR_MRM_UNSUPPORTED_FILE_TYPE_FOR_MERGE: ::DWORD = 15141;
-pub const ERROR_MRM_UNSUPPORTED_FILE_TYPE_FOR_LOAD_UNLOAD_PRI_FILE: ::DWORD = 15142;
-pub const ERROR_MRM_NO_CURRENT_VIEW_ON_THREAD: ::DWORD = 15143;
-pub const ERROR_DIFFERENT_PROFILE_RESOURCE_MANAGER_EXIST: ::DWORD = 15144;
-pub const ERROR_OPERATION_NOT_ALLOWED_FROM_SYSTEM_COMPONENT: ::DWORD = 15145;
-pub const ERROR_MRM_DIRECT_REF_TO_NON_DEFAULT_RESOURCE: ::DWORD = 15146;
-pub const ERROR_MRM_GENERATION_COUNT_MISMATCH: ::DWORD = 15147;
-pub const ERROR_MCA_INVALID_CAPABILITIES_STRING: ::DWORD = 15200;
-pub const ERROR_MCA_INVALID_VCP_VERSION: ::DWORD = 15201;
-pub const ERROR_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION: ::DWORD = 15202;
-pub const ERROR_MCA_MCCS_VERSION_MISMATCH: ::DWORD = 15203;
-pub const ERROR_MCA_UNSUPPORTED_MCCS_VERSION: ::DWORD = 15204;
-pub const ERROR_MCA_INTERNAL_ERROR: ::DWORD = 15205;
-pub const ERROR_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED: ::DWORD = 15206;
-pub const ERROR_MCA_UNSUPPORTED_COLOR_TEMPERATURE: ::DWORD = 15207;
-pub const ERROR_AMBIGUOUS_SYSTEM_DEVICE: ::DWORD = 15250;
-pub const ERROR_SYSTEM_DEVICE_NOT_FOUND: ::DWORD = 15299;
-pub const ERROR_HASH_NOT_SUPPORTED: ::DWORD = 15300;
-pub const ERROR_HASH_NOT_PRESENT: ::DWORD = 15301;
-pub const ERROR_SECONDARY_IC_PROVIDER_NOT_REGISTERED: ::DWORD = 15321;
-pub const ERROR_GPIO_CLIENT_INFORMATION_INVALID: ::DWORD = 15322;
-pub const ERROR_GPIO_VERSION_NOT_SUPPORTED: ::DWORD = 15323;
-pub const ERROR_GPIO_INVALID_REGISTRATION_PACKET: ::DWORD = 15324;
-pub const ERROR_GPIO_OPERATION_DENIED: ::DWORD = 15325;
-pub const ERROR_GPIO_INCOMPATIBLE_CONNECT_MODE: ::DWORD = 15326;
-pub const ERROR_GPIO_INTERRUPT_ALREADY_UNMASKED: ::DWORD = 15327;
-pub const ERROR_CANNOT_SWITCH_RUNLEVEL: ::DWORD = 15400;
-pub const ERROR_INVALID_RUNLEVEL_SETTING: ::DWORD = 15401;
-pub const ERROR_RUNLEVEL_SWITCH_TIMEOUT: ::DWORD = 15402;
-pub const ERROR_RUNLEVEL_SWITCH_AGENT_TIMEOUT: ::DWORD = 15403;
-pub const ERROR_RUNLEVEL_SWITCH_IN_PROGRESS: ::DWORD = 15404;
-pub const ERROR_SERVICES_FAILED_AUTOSTART: ::DWORD = 15405;
-pub const ERROR_COM_TASK_STOP_PENDING: ::DWORD = 15501;
-pub const ERROR_INSTALL_OPEN_PACKAGE_FAILED: ::DWORD = 15600;
-pub const ERROR_INSTALL_PACKAGE_NOT_FOUND: ::DWORD = 15601;
-pub const ERROR_INSTALL_INVALID_PACKAGE: ::DWORD = 15602;
-pub const ERROR_INSTALL_RESOLVE_DEPENDENCY_FAILED: ::DWORD = 15603;
-pub const ERROR_INSTALL_OUT_OF_DISK_SPACE: ::DWORD = 15604;
-pub const ERROR_INSTALL_NETWORK_FAILURE: ::DWORD = 15605;
-pub const ERROR_INSTALL_REGISTRATION_FAILURE: ::DWORD = 15606;
-pub const ERROR_INSTALL_DEREGISTRATION_FAILURE: ::DWORD = 15607;
-pub const ERROR_INSTALL_CANCEL: ::DWORD = 15608;
-pub const ERROR_INSTALL_FAILED: ::DWORD = 15609;
-pub const ERROR_REMOVE_FAILED: ::DWORD = 15610;
-pub const ERROR_PACKAGE_ALREADY_EXISTS: ::DWORD = 15611;
-pub const ERROR_NEEDS_REMEDIATION: ::DWORD = 15612;
-pub const ERROR_INSTALL_PREREQUISITE_FAILED: ::DWORD = 15613;
-pub const ERROR_PACKAGE_REPOSITORY_CORRUPTED: ::DWORD = 15614;
-pub const ERROR_INSTALL_POLICY_FAILURE: ::DWORD = 15615;
-pub const ERROR_PACKAGE_UPDATING: ::DWORD = 15616;
-pub const ERROR_DEPLOYMENT_BLOCKED_BY_POLICY: ::DWORD = 15617;
-pub const ERROR_PACKAGES_IN_USE: ::DWORD = 15618;
-pub const ERROR_RECOVERY_FILE_CORRUPT: ::DWORD = 15619;
-pub const ERROR_INVALID_STAGED_SIGNATURE: ::DWORD = 15620;
-pub const ERROR_DELETING_EXISTING_APPLICATIONDATA_STORE_FAILED: ::DWORD = 15621;
-pub const ERROR_INSTALL_PACKAGE_DOWNGRADE: ::DWORD = 15622;
-pub const ERROR_SYSTEM_NEEDS_REMEDIATION: ::DWORD = 15623;
-pub const ERROR_APPX_INTEGRITY_FAILURE_CLR_NGEN: ::DWORD = 15624;
-pub const ERROR_RESILIENCY_FILE_CORRUPT: ::DWORD = 15625;
-pub const ERROR_INSTALL_FIREWALL_SERVICE_NOT_RUNNING: ::DWORD = 15626;
-pub const APPMODEL_ERROR_NO_PACKAGE: ::DWORD = 15700;
-pub const APPMODEL_ERROR_PACKAGE_RUNTIME_CORRUPT: ::DWORD = 15701;
-pub const APPMODEL_ERROR_PACKAGE_IDENTITY_CORRUPT: ::DWORD = 15702;
-pub const APPMODEL_ERROR_NO_APPLICATION: ::DWORD = 15703;
-pub const APPMODEL_ERROR_DYNAMIC_PROPERTY_READ_FAILED: ::DWORD = 15704;
-pub const APPMODEL_ERROR_DYNAMIC_PROPERTY_INVALID: ::DWORD = 15705;
-pub const ERROR_STATE_LOAD_STORE_FAILED: ::DWORD = 15800;
-pub const ERROR_STATE_GET_VERSION_FAILED: ::DWORD = 15801;
-pub const ERROR_STATE_SET_VERSION_FAILED: ::DWORD = 15802;
-pub const ERROR_STATE_STRUCTURED_RESET_FAILED: ::DWORD = 15803;
-pub const ERROR_STATE_OPEN_CONTAINER_FAILED: ::DWORD = 15804;
-pub const ERROR_STATE_CREATE_CONTAINER_FAILED: ::DWORD = 15805;
-pub const ERROR_STATE_DELETE_CONTAINER_FAILED: ::DWORD = 15806;
-pub const ERROR_STATE_READ_SETTING_FAILED: ::DWORD = 15807;
-pub const ERROR_STATE_WRITE_SETTING_FAILED: ::DWORD = 15808;
-pub const ERROR_STATE_DELETE_SETTING_FAILED: ::DWORD = 15809;
-pub const ERROR_STATE_QUERY_SETTING_FAILED: ::DWORD = 15810;
-pub const ERROR_STATE_READ_COMPOSITE_SETTING_FAILED: ::DWORD = 15811;
-pub const ERROR_STATE_WRITE_COMPOSITE_SETTING_FAILED: ::DWORD = 15812;
-pub const ERROR_STATE_ENUMERATE_CONTAINER_FAILED: ::DWORD = 15813;
-pub const ERROR_STATE_ENUMERATE_SETTINGS_FAILED: ::DWORD = 15814;
-pub const ERROR_STATE_COMPOSITE_SETTING_VALUE_SIZE_LIMIT_EXCEEDED: ::DWORD = 15815;
-pub const ERROR_STATE_SETTING_VALUE_SIZE_LIMIT_EXCEEDED: ::DWORD = 15816;
-pub const ERROR_STATE_SETTING_NAME_SIZE_LIMIT_EXCEEDED: ::DWORD = 15817;
-pub const ERROR_STATE_CONTAINER_NAME_SIZE_LIMIT_EXCEEDED: ::DWORD = 15818;
-pub const ERROR_API_UNAVAILABLE: ::DWORD = 15841;
-pub const STORE_ERROR_UNLICENSED: ::DWORD = 15861;
-pub const STORE_ERROR_UNLICENSED_USER: ::DWORD = 15862;
-pub const STORE_ERROR_PENDING_COM_TRANSACTION: ::DWORD = 15863;
-pub const STORE_ERROR_LICENSE_REVOKED: ::DWORD = 15864;
-pub const SEVERITY_SUCCESS: HRESULT = 0;
-pub const SEVERITY_ERROR: HRESULT = 1;
-#[inline]
-pub fn MAKE_HRESULT(sev: HRESULT, fac: HRESULT, code: HRESULT) -> HRESULT {
-    (sev << 31) | (fac << 16) | code
-}
-pub type HRESULT = ::c_long;
-pub const NOERROR: HRESULT = 0;
-pub const E_UNEXPECTED: HRESULT = 0x8000FFFFu32 as HRESULT;
-pub const E_NOTIMPL: HRESULT = 0x80004001u32 as HRESULT;
-pub const E_OUTOFMEMORY: HRESULT = 0x8007000Eu32 as HRESULT;
-pub const E_INVALIDARG: HRESULT = 0x80070057u32 as HRESULT;
-pub const E_NOINTERFACE: HRESULT = 0x80004002u32 as HRESULT;
-pub const E_POINTER: HRESULT = 0x80004003u32 as HRESULT;
-pub const E_HANDLE: HRESULT = 0x80070006u32 as HRESULT;
-pub const E_ABORT: HRESULT = 0x80004004u32 as HRESULT;
-pub const E_FAIL: HRESULT = 0x80004005u32 as HRESULT;
-pub const E_ACCESSDENIED: HRESULT = 0x80070005u32 as HRESULT;
-pub const E_PENDING: HRESULT = 0x8000000Au32 as HRESULT;
-pub const E_BOUNDS: HRESULT = 0x8000000Bu32 as HRESULT;
-pub const E_CHANGED_STATE: HRESULT = 0x8000000Cu32 as HRESULT;
-pub const E_ILLEGAL_STATE_CHANGE: HRESULT = 0x8000000Du32 as HRESULT;
-pub const E_ILLEGAL_METHOD_CALL: HRESULT = 0x8000000Eu32 as HRESULT;
-pub const RO_E_METADATA_NAME_NOT_FOUND: HRESULT = 0x8000000Fu32 as HRESULT;
-pub const RO_E_METADATA_NAME_IS_NAMESPACE: HRESULT = 0x80000010u32 as HRESULT;
-pub const RO_E_METADATA_INVALID_TYPE_FORMAT: HRESULT = 0x80000011u32 as HRESULT;
-pub const RO_E_INVALID_METADATA_FILE: HRESULT = 0x80000012u32 as HRESULT;
-pub const RO_E_CLOSED: HRESULT = 0x80000013u32 as HRESULT;
-pub const RO_E_EXCLUSIVE_WRITE: HRESULT = 0x80000014u32 as HRESULT;
-pub const RO_E_CHANGE_NOTIFICATION_IN_PROGRESS: HRESULT = 0x80000015u32 as HRESULT;
-pub const RO_E_ERROR_STRING_NOT_FOUND: HRESULT = 0x80000016u32 as HRESULT;
-pub const E_STRING_NOT_NULL_TERMINATED: HRESULT = 0x80000017u32 as HRESULT;
-pub const E_ILLEGAL_DELEGATE_ASSIGNMENT: HRESULT = 0x80000018u32 as HRESULT;
-pub const E_ASYNC_OPERATION_NOT_STARTED: HRESULT = 0x80000019u32 as HRESULT;
-pub const E_APPLICATION_EXITING: HRESULT = 0x8000001Au32 as HRESULT;
-pub const E_APPLICATION_VIEW_EXITING: HRESULT = 0x8000001Bu32 as HRESULT;
-pub const RO_E_MUST_BE_AGILE: HRESULT = 0x8000001Cu32 as HRESULT;
-pub const RO_E_UNSUPPORTED_FROM_MTA: HRESULT = 0x8000001Du32 as HRESULT;
-pub const RO_E_COMMITTED: HRESULT = 0x8000001Eu32 as HRESULT;
-pub const RO_E_BLOCKED_CROSS_ASTA_CALL: HRESULT = 0x8000001Fu32 as HRESULT;
-pub const CO_E_INIT_TLS: HRESULT = 0x80004006u32 as HRESULT;
-pub const CO_E_INIT_SHARED_ALLOCATOR: HRESULT = 0x80004007u32 as HRESULT;
-pub const CO_E_INIT_MEMORY_ALLOCATOR: HRESULT = 0x80004008u32 as HRESULT;
-pub const CO_E_INIT_CLASS_CACHE: HRESULT = 0x80004009u32 as HRESULT;
-pub const CO_E_INIT_RPC_CHANNEL: HRESULT = 0x8000400Au32 as HRESULT;
-pub const CO_E_INIT_TLS_SET_CHANNEL_CONTROL: HRESULT = 0x8000400Bu32 as HRESULT;
-pub const CO_E_INIT_TLS_CHANNEL_CONTROL: HRESULT = 0x8000400Cu32 as HRESULT;
-pub const CO_E_INIT_UNACCEPTED_USER_ALLOCATOR: HRESULT = 0x8000400Du32 as HRESULT;
-pub const CO_E_INIT_SCM_MUTEX_EXISTS: HRESULT = 0x8000400Eu32 as HRESULT;
-pub const CO_E_INIT_SCM_FILE_MAPPING_EXISTS: HRESULT = 0x8000400Fu32 as HRESULT;
-pub const CO_E_INIT_SCM_MAP_VIEW_OF_FILE: HRESULT = 0x80004010u32 as HRESULT;
-pub const CO_E_INIT_SCM_EXEC_FAILURE: HRESULT = 0x80004011u32 as HRESULT;
-pub const CO_E_INIT_ONLY_SINGLE_THREADED: HRESULT = 0x80004012u32 as HRESULT;
-pub const CO_E_CANT_REMOTE: HRESULT = 0x80004013u32 as HRESULT;
-pub const CO_E_BAD_SERVER_NAME: HRESULT = 0x80004014u32 as HRESULT;
-pub const CO_E_WRONG_SERVER_IDENTITY: HRESULT = 0x80004015u32 as HRESULT;
-pub const CO_E_OLE1DDE_DISABLED: HRESULT = 0x80004016u32 as HRESULT;
-pub const CO_E_RUNAS_SYNTAX: HRESULT = 0x80004017u32 as HRESULT;
-pub const CO_E_CREATEPROCESS_FAILURE: HRESULT = 0x80004018u32 as HRESULT;
-pub const CO_E_RUNAS_CREATEPROCESS_FAILURE: HRESULT = 0x80004019u32 as HRESULT;
-pub const CO_E_RUNAS_LOGON_FAILURE: HRESULT = 0x8000401Au32 as HRESULT;
-pub const CO_E_LAUNCH_PERMSSION_DENIED: HRESULT = 0x8000401Bu32 as HRESULT;
-pub const CO_E_START_SERVICE_FAILURE: HRESULT = 0x8000401Cu32 as HRESULT;
-pub const CO_E_REMOTE_COMMUNICATION_FAILURE: HRESULT = 0x8000401Du32 as HRESULT;
-pub const CO_E_SERVER_START_TIMEOUT: HRESULT = 0x8000401Eu32 as HRESULT;
-pub const CO_E_CLSREG_INCONSISTENT: HRESULT = 0x8000401Fu32 as HRESULT;
-pub const CO_E_IIDREG_INCONSISTENT: HRESULT = 0x80004020u32 as HRESULT;
-pub const CO_E_NOT_SUPPORTED: HRESULT = 0x80004021u32 as HRESULT;
-pub const CO_E_RELOAD_DLL: HRESULT = 0x80004022u32 as HRESULT;
-pub const CO_E_MSI_ERROR: HRESULT = 0x80004023u32 as HRESULT;
-pub const CO_E_ATTEMPT_TO_CREATE_OUTSIDE_CLIENT_CONTEXT: HRESULT = 0x80004024u32 as HRESULT;
-pub const CO_E_SERVER_PAUSED: HRESULT = 0x80004025u32 as HRESULT;
-pub const CO_E_SERVER_NOT_PAUSED: HRESULT = 0x80004026u32 as HRESULT;
-pub const CO_E_CLASS_DISABLED: HRESULT = 0x80004027u32 as HRESULT;
-pub const CO_E_CLRNOTAVAILABLE: HRESULT = 0x80004028u32 as HRESULT;
-pub const CO_E_ASYNC_WORK_REJECTED: HRESULT = 0x80004029u32 as HRESULT;
-pub const CO_E_SERVER_INIT_TIMEOUT: HRESULT = 0x8000402Au32 as HRESULT;
-pub const CO_E_NO_SECCTX_IN_ACTIVATE: HRESULT = 0x8000402Bu32 as HRESULT;
-pub const CO_E_TRACKER_CONFIG: HRESULT = 0x80004030u32 as HRESULT;
-pub const CO_E_THREADPOOL_CONFIG: HRESULT = 0x80004031u32 as HRESULT;
-pub const CO_E_SXS_CONFIG: HRESULT = 0x80004032u32 as HRESULT;
-pub const CO_E_MALFORMED_SPN: HRESULT = 0x80004033u32 as HRESULT;
-pub const CO_E_UNREVOKED_REGISTRATION_ON_APARTMENT_SHUTDOWN: HRESULT = 0x80004034u32 as HRESULT;
-pub const CO_E_PREMATURE_STUB_RUNDOWN: HRESULT = 0x80004035u32 as HRESULT;
-pub const S_OK: HRESULT = 0;
-pub const S_FALSE: HRESULT = 1;
-pub const OLE_E_FIRST: HRESULT = 0x80040000u32 as HRESULT;
-pub const OLE_E_LAST: HRESULT = 0x800400FFu32 as HRESULT;
-pub const OLE_S_FIRST: HRESULT = 0x00040000;
-pub const OLE_S_LAST: HRESULT = 0x000400FF;
-pub const OLE_E_OLEVERB: HRESULT = 0x80040000u32 as HRESULT;
-pub const OLE_E_ADVF: HRESULT = 0x80040001u32 as HRESULT;
-pub const OLE_E_ENUM_NOMORE: HRESULT = 0x80040002u32 as HRESULT;
-pub const OLE_E_ADVISENOTSUPPORTED: HRESULT = 0x80040003u32 as HRESULT;
-pub const OLE_E_NOCONNECTION: HRESULT = 0x80040004u32 as HRESULT;
-pub const OLE_E_NOTRUNNING: HRESULT = 0x80040005u32 as HRESULT;
-pub const OLE_E_NOCACHE: HRESULT = 0x80040006u32 as HRESULT;
-pub const OLE_E_BLANK: HRESULT = 0x80040007u32 as HRESULT;
-pub const OLE_E_CLASSDIFF: HRESULT = 0x80040008u32 as HRESULT;
-pub const OLE_E_CANT_GETMONIKER: HRESULT = 0x80040009u32 as HRESULT;
-pub const OLE_E_CANT_BINDTOSOURCE: HRESULT = 0x8004000Au32 as HRESULT;
-pub const OLE_E_STATIC: HRESULT = 0x8004000Bu32 as HRESULT;
-pub const OLE_E_PROMPTSAVECANCELLED: HRESULT = 0x8004000Cu32 as HRESULT;
-pub const OLE_E_INVALIDRECT: HRESULT = 0x8004000Du32 as HRESULT;
-pub const OLE_E_WRONGCOMPOBJ: HRESULT = 0x8004000Eu32 as HRESULT;
-pub const OLE_E_INVALIDHWND: HRESULT = 0x8004000Fu32 as HRESULT;
-pub const OLE_E_NOT_INPLACEACTIVE: HRESULT = 0x80040010u32 as HRESULT;
-pub const OLE_E_CANTCONVERT: HRESULT = 0x80040011u32 as HRESULT;
-pub const OLE_E_NOSTORAGE: HRESULT = 0x80040012u32 as HRESULT;
-pub const DV_E_FORMATETC: HRESULT = 0x80040064u32 as HRESULT;
-pub const DV_E_DVTARGETDEVICE: HRESULT = 0x80040065u32 as HRESULT;
-pub const DV_E_STGMEDIUM: HRESULT = 0x80040066u32 as HRESULT;
-pub const DV_E_STATDATA: HRESULT = 0x80040067u32 as HRESULT;
-pub const DV_E_LINDEX: HRESULT = 0x80040068u32 as HRESULT;
-pub const DV_E_TYMED: HRESULT = 0x80040069u32 as HRESULT;
-pub const DV_E_CLIPFORMAT: HRESULT = 0x8004006Au32 as HRESULT;
-pub const DV_E_DVASPECT: HRESULT = 0x8004006Bu32 as HRESULT;
-pub const DV_E_DVTARGETDEVICE_SIZE: HRESULT = 0x8004006Cu32 as HRESULT;
-pub const DV_E_NOIVIEWOBJECT: HRESULT = 0x8004006Du32 as HRESULT;
-pub const DRAGDROP_E_FIRST: HRESULT = 0x80040100u32 as HRESULT;
-pub const DRAGDROP_E_LAST: HRESULT = 0x8004010Fu32 as HRESULT;
-pub const DRAGDROP_S_FIRST: HRESULT = 0x00040100;
-pub const DRAGDROP_S_LAST: HRESULT = 0x0004010F;
-pub const DRAGDROP_E_NOTREGISTERED: HRESULT = 0x80040100u32 as HRESULT;
-pub const DRAGDROP_E_ALREADYREGISTERED: HRESULT = 0x80040101u32 as HRESULT;
-pub const DRAGDROP_E_INVALIDHWND: HRESULT = 0x80040102u32 as HRESULT;
-pub const DRAGDROP_E_CONCURRENT_DRAG_ATTEMPTED: HRESULT = 0x80040103u32 as HRESULT;
-pub const CLASSFACTORY_E_FIRST: HRESULT = 0x80040110u32 as HRESULT;
-pub const CLASSFACTORY_E_LAST: HRESULT = 0x8004011Fu32 as HRESULT;
-pub const CLASSFACTORY_S_FIRST: HRESULT = 0x00040110;
-pub const CLASSFACTORY_S_LAST: HRESULT = 0x0004011F;
-pub const CLASS_E_NOAGGREGATION: HRESULT = 0x80040110u32 as HRESULT;
-pub const CLASS_E_CLASSNOTAVAILABLE: HRESULT = 0x80040111u32 as HRESULT;
-pub const CLASS_E_NOTLICENSED: HRESULT = 0x80040112u32 as HRESULT;
-pub const MARSHAL_E_FIRST: HRESULT = 0x80040120u32 as HRESULT;
-pub const MARSHAL_E_LAST: HRESULT = 0x8004012Fu32 as HRESULT;
-pub const MARSHAL_S_FIRST: HRESULT = 0x00040120;
-pub const MARSHAL_S_LAST: HRESULT = 0x0004012F;
-pub const DATA_E_FIRST: HRESULT = 0x80040130u32 as HRESULT;
-pub const DATA_E_LAST: HRESULT = 0x8004013Fu32 as HRESULT;
-pub const DATA_S_FIRST: HRESULT = 0x00040130;
-pub const DATA_S_LAST: HRESULT = 0x0004013F;
-pub const VIEW_E_FIRST: HRESULT = 0x80040140u32 as HRESULT;
-pub const VIEW_E_LAST: HRESULT = 0x8004014Fu32 as HRESULT;
-pub const VIEW_S_FIRST: HRESULT = 0x00040140;
-pub const VIEW_S_LAST: HRESULT = 0x0004014F;
-pub const VIEW_E_DRAW: HRESULT = 0x80040140u32 as HRESULT;
-pub const REGDB_E_FIRST: HRESULT = 0x80040150u32 as HRESULT;
-pub const REGDB_E_LAST: HRESULT = 0x8004015Fu32 as HRESULT;
-pub const REGDB_S_FIRST: HRESULT = 0x00040150;
-pub const REGDB_S_LAST: HRESULT = 0x0004015F;
-pub const REGDB_E_READREGDB: HRESULT = 0x80040150u32 as HRESULT;
-pub const REGDB_E_WRITEREGDB: HRESULT = 0x80040151u32 as HRESULT;
-pub const REGDB_E_KEYMISSING: HRESULT = 0x80040152u32 as HRESULT;
-pub const REGDB_E_INVALIDVALUE: HRESULT = 0x80040153u32 as HRESULT;
-pub const REGDB_E_CLASSNOTREG: HRESULT = 0x80040154u32 as HRESULT;
-pub const REGDB_E_IIDNOTREG: HRESULT = 0x80040155u32 as HRESULT;
-pub const REGDB_E_BADTHREADINGMODEL: HRESULT = 0x80040156u32 as HRESULT;
-pub const CAT_E_FIRST: HRESULT = 0x80040160u32 as HRESULT;
-pub const CAT_E_LAST: HRESULT = 0x80040161u32 as HRESULT;
-pub const CAT_E_CATIDNOEXIST: HRESULT = 0x80040160u32 as HRESULT;
-pub const CAT_E_NODESCRIPTION: HRESULT = 0x80040161u32 as HRESULT;
-pub const CS_E_FIRST: HRESULT = 0x80040164u32 as HRESULT;
-pub const CS_E_LAST: HRESULT = 0x8004016Fu32 as HRESULT;
-pub const CS_E_PACKAGE_NOTFOUND: HRESULT = 0x80040164u32 as HRESULT;
-pub const CS_E_NOT_DELETABLE: HRESULT = 0x80040165u32 as HRESULT;
-pub const CS_E_CLASS_NOTFOUND: HRESULT = 0x80040166u32 as HRESULT;
-pub const CS_E_INVALID_VERSION: HRESULT = 0x80040167u32 as HRESULT;
-pub const CS_E_NO_CLASSSTORE: HRESULT = 0x80040168u32 as HRESULT;
-pub const CS_E_OBJECT_NOTFOUND: HRESULT = 0x80040169u32 as HRESULT;
-pub const CS_E_OBJECT_ALREADY_EXISTS: HRESULT = 0x8004016Au32 as HRESULT;
-pub const CS_E_INVALID_PATH: HRESULT = 0x8004016Bu32 as HRESULT;
-pub const CS_E_NETWORK_ERROR: HRESULT = 0x8004016Cu32 as HRESULT;
-pub const CS_E_ADMIN_LIMIT_EXCEEDED: HRESULT = 0x8004016Du32 as HRESULT;
-pub const CS_E_SCHEMA_MISMATCH: HRESULT = 0x8004016Eu32 as HRESULT;
-pub const CS_E_INTERNAL_ERROR: HRESULT = 0x8004016Fu32 as HRESULT;
-pub const CACHE_E_FIRST: HRESULT = 0x80040170u32 as HRESULT;
-pub const CACHE_E_LAST: HRESULT = 0x8004017Fu32 as HRESULT;
-pub const CACHE_S_FIRST: HRESULT = 0x00040170;
-pub const CACHE_S_LAST: HRESULT = 0x0004017F;
-pub const CACHE_E_NOCACHE_UPDATED: HRESULT = 0x80040170u32 as HRESULT;
-pub const OLEOBJ_E_FIRST: HRESULT = 0x80040180u32 as HRESULT;
-pub const OLEOBJ_E_LAST: HRESULT = 0x8004018Fu32 as HRESULT;
-pub const OLEOBJ_S_FIRST: HRESULT = 0x00040180;
-pub const OLEOBJ_S_LAST: HRESULT = 0x0004018F;
-pub const OLEOBJ_E_NOVERBS: HRESULT = 0x80040180u32 as HRESULT;
-pub const OLEOBJ_E_INVALIDVERB: HRESULT = 0x80040181u32 as HRESULT;
-pub const CLIENTSITE_E_FIRST: HRESULT = 0x80040190u32 as HRESULT;
-pub const CLIENTSITE_E_LAST: HRESULT = 0x8004019Fu32 as HRESULT;
-pub const CLIENTSITE_S_FIRST: HRESULT = 0x00040190;
-pub const CLIENTSITE_S_LAST: HRESULT = 0x0004019F;
-pub const INPLACE_E_NOTUNDOABLE: HRESULT = 0x800401A0u32 as HRESULT;
-pub const INPLACE_E_NOTOOLSPACE: HRESULT = 0x800401A1u32 as HRESULT;
-pub const INPLACE_E_FIRST: HRESULT = 0x800401A0u32 as HRESULT;
-pub const INPLACE_E_LAST: HRESULT = 0x800401AFu32 as HRESULT;
-pub const INPLACE_S_FIRST: HRESULT = 0x000401A0;
-pub const INPLACE_S_LAST: HRESULT = 0x000401AF;
-pub const ENUM_E_FIRST: HRESULT = 0x800401B0u32 as HRESULT;
-pub const ENUM_E_LAST: HRESULT = 0x800401BFu32 as HRESULT;
-pub const ENUM_S_FIRST: HRESULT = 0x000401B0;
-pub const ENUM_S_LAST: HRESULT = 0x000401BF;
-pub const CONVERT10_E_FIRST: HRESULT = 0x800401C0u32 as HRESULT;
-pub const CONVERT10_E_LAST: HRESULT = 0x800401CFu32 as HRESULT;
-pub const CONVERT10_S_FIRST: HRESULT = 0x000401C0;
-pub const CONVERT10_S_LAST: HRESULT = 0x000401CF;
-pub const CONVERT10_E_OLESTREAM_GET: HRESULT = 0x800401C0u32 as HRESULT;
-pub const CONVERT10_E_OLESTREAM_PUT: HRESULT = 0x800401C1u32 as HRESULT;
-pub const CONVERT10_E_OLESTREAM_FMT: HRESULT = 0x800401C2u32 as HRESULT;
-pub const CONVERT10_E_OLESTREAM_BITMAP_TO_DIB: HRESULT = 0x800401C3u32 as HRESULT;
-pub const CONVERT10_E_STG_FMT: HRESULT = 0x800401C4u32 as HRESULT;
-pub const CONVERT10_E_STG_NO_STD_STREAM: HRESULT = 0x800401C5u32 as HRESULT;
-pub const CONVERT10_E_STG_DIB_TO_BITMAP: HRESULT = 0x800401C6u32 as HRESULT;
-pub const CLIPBRD_E_FIRST: HRESULT = 0x800401D0u32 as HRESULT;
-pub const CLIPBRD_E_LAST: HRESULT = 0x800401DFu32 as HRESULT;
-pub const CLIPBRD_S_FIRST: HRESULT = 0x000401D0;
-pub const CLIPBRD_S_LAST: HRESULT = 0x000401DF;
-pub const CLIPBRD_E_CANT_OPEN: HRESULT = 0x800401D0u32 as HRESULT;
-pub const CLIPBRD_E_CANT_EMPTY: HRESULT = 0x800401D1u32 as HRESULT;
-pub const CLIPBRD_E_CANT_SET: HRESULT = 0x800401D2u32 as HRESULT;
-pub const CLIPBRD_E_BAD_DATA: HRESULT = 0x800401D3u32 as HRESULT;
-pub const CLIPBRD_E_CANT_CLOSE: HRESULT = 0x800401D4u32 as HRESULT;
-pub const MK_E_FIRST: HRESULT = 0x800401E0u32 as HRESULT;
-pub const MK_E_LAST: HRESULT = 0x800401EFu32 as HRESULT;
-pub const MK_S_FIRST: HRESULT = 0x000401E0;
-pub const MK_S_LAST: HRESULT = 0x000401EF;
-pub const MK_E_CONNECTMANUALLY: HRESULT = 0x800401E0u32 as HRESULT;
-pub const MK_E_EXCEEDEDDEADLINE: HRESULT = 0x800401E1u32 as HRESULT;
-pub const MK_E_NEEDGENERIC: HRESULT = 0x800401E2u32 as HRESULT;
-pub const MK_E_UNAVAILABLE: HRESULT = 0x800401E3u32 as HRESULT;
-pub const MK_E_SYNTAX: HRESULT = 0x800401E4u32 as HRESULT;
-pub const MK_E_NOOBJECT: HRESULT = 0x800401E5u32 as HRESULT;
-pub const MK_E_INVALIDEXTENSION: HRESULT = 0x800401E6u32 as HRESULT;
-pub const MK_E_INTERMEDIATEINTERFACENOTSUPPORTED: HRESULT = 0x800401E7u32 as HRESULT;
-pub const MK_E_NOTBINDABLE: HRESULT = 0x800401E8u32 as HRESULT;
-pub const MK_E_NOTBOUND: HRESULT = 0x800401E9u32 as HRESULT;
-pub const MK_E_CANTOPENFILE: HRESULT = 0x800401EAu32 as HRESULT;
-pub const MK_E_MUSTBOTHERUSER: HRESULT = 0x800401EBu32 as HRESULT;
-pub const MK_E_NOINVERSE: HRESULT = 0x800401ECu32 as HRESULT;
-pub const MK_E_NOSTORAGE: HRESULT = 0x800401EDu32 as HRESULT;
-pub const MK_E_NOPREFIX: HRESULT = 0x800401EEu32 as HRESULT;
-pub const MK_E_ENUMERATION_FAILED: HRESULT = 0x800401EFu32 as HRESULT;
-pub const CO_E_FIRST: HRESULT = 0x800401F0u32 as HRESULT;
-pub const CO_E_LAST: HRESULT = 0x800401FFu32 as HRESULT;
-pub const CO_S_FIRST: HRESULT = 0x000401F0;
-pub const CO_S_LAST: HRESULT = 0x000401FF;
-pub const CO_E_NOTINITIALIZED: HRESULT = 0x800401F0u32 as HRESULT;
-pub const CO_E_ALREADYINITIALIZED: HRESULT = 0x800401F1u32 as HRESULT;
-pub const CO_E_CANTDETERMINECLASS: HRESULT = 0x800401F2u32 as HRESULT;
-pub const CO_E_CLASSSTRING: HRESULT = 0x800401F3u32 as HRESULT;
-pub const CO_E_IIDSTRING: HRESULT = 0x800401F4u32 as HRESULT;
-pub const CO_E_APPNOTFOUND: HRESULT = 0x800401F5u32 as HRESULT;
-pub const CO_E_APPSINGLEUSE: HRESULT = 0x800401F6u32 as HRESULT;
-pub const CO_E_ERRORINAPP: HRESULT = 0x800401F7u32 as HRESULT;
-pub const CO_E_DLLNOTFOUND: HRESULT = 0x800401F8u32 as HRESULT;
-pub const CO_E_ERRORINDLL: HRESULT = 0x800401F9u32 as HRESULT;
-pub const CO_E_WRONGOSFORAPP: HRESULT = 0x800401FAu32 as HRESULT;
-pub const CO_E_OBJNOTREG: HRESULT = 0x800401FBu32 as HRESULT;
-pub const CO_E_OBJISREG: HRESULT = 0x800401FCu32 as HRESULT;
-pub const CO_E_OBJNOTCONNECTED: HRESULT = 0x800401FDu32 as HRESULT;
-pub const CO_E_APPDIDNTREG: HRESULT = 0x800401FEu32 as HRESULT;
-pub const CO_E_RELEASED: HRESULT = 0x800401FFu32 as HRESULT;
-pub const EVENT_E_FIRST: HRESULT = 0x80040200u32 as HRESULT;
-pub const EVENT_E_LAST: HRESULT = 0x8004021Fu32 as HRESULT;
-pub const EVENT_S_FIRST: HRESULT = 0x00040200;
-pub const EVENT_S_LAST: HRESULT = 0x0004021F;
-pub const EVENT_S_SOME_SUBSCRIBERS_FAILED: HRESULT = 0x00040200;
-pub const EVENT_E_ALL_SUBSCRIBERS_FAILED: HRESULT = 0x80040201u32 as HRESULT;
-pub const EVENT_S_NOSUBSCRIBERS: HRESULT = 0x00040202;
-pub const EVENT_E_QUERYSYNTAX: HRESULT = 0x80040203u32 as HRESULT;
-pub const EVENT_E_QUERYFIELD: HRESULT = 0x80040204u32 as HRESULT;
-pub const EVENT_E_INTERNALEXCEPTION: HRESULT = 0x80040205u32 as HRESULT;
-pub const EVENT_E_INTERNALERROR: HRESULT = 0x80040206u32 as HRESULT;
-pub const EVENT_E_INVALID_PER_USER_SID: HRESULT = 0x80040207u32 as HRESULT;
-pub const EVENT_E_USER_EXCEPTION: HRESULT = 0x80040208u32 as HRESULT;
-pub const EVENT_E_TOO_MANY_METHODS: HRESULT = 0x80040209u32 as HRESULT;
-pub const EVENT_E_MISSING_EVENTCLASS: HRESULT = 0x8004020Au32 as HRESULT;
-pub const EVENT_E_NOT_ALL_REMOVED: HRESULT = 0x8004020Bu32 as HRESULT;
-pub const EVENT_E_COMPLUS_NOT_INSTALLED: HRESULT = 0x8004020Cu32 as HRESULT;
-pub const EVENT_E_CANT_MODIFY_OR_DELETE_UNCONFIGURED_OBJECT: HRESULT = 0x8004020Du32 as HRESULT;
-pub const EVENT_E_CANT_MODIFY_OR_DELETE_CONFIGURED_OBJECT: HRESULT = 0x8004020Eu32 as HRESULT;
-pub const EVENT_E_INVALID_EVENT_CLASS_PARTITION: HRESULT = 0x8004020Fu32 as HRESULT;
-pub const EVENT_E_PER_USER_SID_NOT_LOGGED_ON: HRESULT = 0x80040210u32 as HRESULT;
-pub const TPC_E_INVALID_PROPERTY: HRESULT = 0x80040241u32 as HRESULT;
-pub const TPC_E_NO_DEFAULT_TABLET: HRESULT = 0x80040212u32 as HRESULT;
-pub const TPC_E_UNKNOWN_PROPERTY: HRESULT = 0x8004021Bu32 as HRESULT;
-pub const TPC_E_INVALID_INPUT_RECT: HRESULT = 0x80040219u32 as HRESULT;
-pub const TPC_E_INVALID_STROKE: HRESULT = 0x80040222u32 as HRESULT;
-pub const TPC_E_INITIALIZE_FAIL: HRESULT = 0x80040223u32 as HRESULT;
-pub const TPC_E_NOT_RELEVANT: HRESULT = 0x80040232u32 as HRESULT;
-pub const TPC_E_INVALID_PACKET_DESCRIPTION: HRESULT = 0x80040233u32 as HRESULT;
-pub const TPC_E_RECOGNIZER_NOT_REGISTERED: HRESULT = 0x80040235u32 as HRESULT;
-pub const TPC_E_INVALID_RIGHTS: HRESULT = 0x80040236u32 as HRESULT;
-pub const TPC_E_OUT_OF_ORDER_CALL: HRESULT = 0x80040237u32 as HRESULT;
-pub const TPC_E_QUEUE_FULL: HRESULT = 0x80040238u32 as HRESULT;
-pub const TPC_E_INVALID_CONFIGURATION: HRESULT = 0x80040239u32 as HRESULT;
-pub const TPC_E_INVALID_DATA_FROM_RECOGNIZER: HRESULT = 0x8004023Au32 as HRESULT;
-pub const TPC_S_TRUNCATED: HRESULT = 0x00040252;
-pub const TPC_S_INTERRUPTED: HRESULT = 0x00040253;
-pub const TPC_S_NO_DATA_TO_PROCESS: HRESULT = 0x00040254;
-pub const XACT_E_FIRST: HRESULT = 0x8004D000u32 as HRESULT;
-pub const XACT_E_LAST: HRESULT = 0x8004D02Bu32 as HRESULT;
-pub const XACT_S_FIRST: HRESULT = 0x0004D000;
-pub const XACT_S_LAST: HRESULT = 0x0004D010;
-pub const XACT_E_ALREADYOTHERSINGLEPHASE: HRESULT = 0x8004D000u32 as HRESULT;
-pub const XACT_E_CANTRETAIN: HRESULT = 0x8004D001u32 as HRESULT;
-pub const XACT_E_COMMITFAILED: HRESULT = 0x8004D002u32 as HRESULT;
-pub const XACT_E_COMMITPREVENTED: HRESULT = 0x8004D003u32 as HRESULT;
-pub const XACT_E_HEURISTICABORT: HRESULT = 0x8004D004u32 as HRESULT;
-pub const XACT_E_HEURISTICCOMMIT: HRESULT = 0x8004D005u32 as HRESULT;
-pub const XACT_E_HEURISTICDAMAGE: HRESULT = 0x8004D006u32 as HRESULT;
-pub const XACT_E_HEURISTICDANGER: HRESULT = 0x8004D007u32 as HRESULT;
-pub const XACT_E_ISOLATIONLEVEL: HRESULT = 0x8004D008u32 as HRESULT;
-pub const XACT_E_NOASYNC: HRESULT = 0x8004D009u32 as HRESULT;
-pub const XACT_E_NOENLIST: HRESULT = 0x8004D00Au32 as HRESULT;
-pub const XACT_E_NOISORETAIN: HRESULT = 0x8004D00Bu32 as HRESULT;
-pub const XACT_E_NORESOURCE: HRESULT = 0x8004D00Cu32 as HRESULT;
-pub const XACT_E_NOTCURRENT: HRESULT = 0x8004D00Du32 as HRESULT;
-pub const XACT_E_NOTRANSACTION: HRESULT = 0x8004D00Eu32 as HRESULT;
-pub const XACT_E_NOTSUPPORTED: HRESULT = 0x8004D00Fu32 as HRESULT;
-pub const XACT_E_UNKNOWNRMGRID: HRESULT = 0x8004D010u32 as HRESULT;
-pub const XACT_E_WRONGSTATE: HRESULT = 0x8004D011u32 as HRESULT;
-pub const XACT_E_WRONGUOW: HRESULT = 0x8004D012u32 as HRESULT;
-pub const XACT_E_XTIONEXISTS: HRESULT = 0x8004D013u32 as HRESULT;
-pub const XACT_E_NOIMPORTOBJECT: HRESULT = 0x8004D014u32 as HRESULT;
-pub const XACT_E_INVALIDCOOKIE: HRESULT = 0x8004D015u32 as HRESULT;
-pub const XACT_E_INDOUBT: HRESULT = 0x8004D016u32 as HRESULT;
-pub const XACT_E_NOTIMEOUT: HRESULT = 0x8004D017u32 as HRESULT;
-pub const XACT_E_ALREADYINPROGRESS: HRESULT = 0x8004D018u32 as HRESULT;
-pub const XACT_E_ABORTED: HRESULT = 0x8004D019u32 as HRESULT;
-pub const XACT_E_LOGFULL: HRESULT = 0x8004D01Au32 as HRESULT;
-pub const XACT_E_TMNOTAVAILABLE: HRESULT = 0x8004D01Bu32 as HRESULT;
-pub const XACT_E_CONNECTION_DOWN: HRESULT = 0x8004D01Cu32 as HRESULT;
-pub const XACT_E_CONNECTION_DENIED: HRESULT = 0x8004D01Du32 as HRESULT;
-pub const XACT_E_REENLISTTIMEOUT: HRESULT = 0x8004D01Eu32 as HRESULT;
-pub const XACT_E_TIP_CONNECT_FAILED: HRESULT = 0x8004D01Fu32 as HRESULT;
-pub const XACT_E_TIP_PROTOCOL_ERROR: HRESULT = 0x8004D020u32 as HRESULT;
-pub const XACT_E_TIP_PULL_FAILED: HRESULT = 0x8004D021u32 as HRESULT;
-pub const XACT_E_DEST_TMNOTAVAILABLE: HRESULT = 0x8004D022u32 as HRESULT;
-pub const XACT_E_TIP_DISABLED: HRESULT = 0x8004D023u32 as HRESULT;
-pub const XACT_E_NETWORK_TX_DISABLED: HRESULT = 0x8004D024u32 as HRESULT;
-pub const XACT_E_PARTNER_NETWORK_TX_DISABLED: HRESULT = 0x8004D025u32 as HRESULT;
-pub const XACT_E_XA_TX_DISABLED: HRESULT = 0x8004D026u32 as HRESULT;
-pub const XACT_E_UNABLE_TO_READ_DTC_CONFIG: HRESULT = 0x8004D027u32 as HRESULT;
-pub const XACT_E_UNABLE_TO_LOAD_DTC_PROXY: HRESULT = 0x8004D028u32 as HRESULT;
-pub const XACT_E_ABORTING: HRESULT = 0x8004D029u32 as HRESULT;
-pub const XACT_E_PUSH_COMM_FAILURE: HRESULT = 0x8004D02Au32 as HRESULT;
-pub const XACT_E_PULL_COMM_FAILURE: HRESULT = 0x8004D02Bu32 as HRESULT;
-pub const XACT_E_LU_TX_DISABLED: HRESULT = 0x8004D02Cu32 as HRESULT;
-pub const XACT_E_CLERKNOTFOUND: HRESULT = 0x8004D080u32 as HRESULT;
-pub const XACT_E_CLERKEXISTS: HRESULT = 0x8004D081u32 as HRESULT;
-pub const XACT_E_RECOVERYINPROGRESS: HRESULT = 0x8004D082u32 as HRESULT;
-pub const XACT_E_TRANSACTIONCLOSED: HRESULT = 0x8004D083u32 as HRESULT;
-pub const XACT_E_INVALIDLSN: HRESULT = 0x8004D084u32 as HRESULT;
-pub const XACT_E_REPLAYREQUEST: HRESULT = 0x8004D085u32 as HRESULT;
-pub const XACT_S_ASYNC: HRESULT = 0x0004D000;
-pub const XACT_S_DEFECT: HRESULT = 0x0004D001;
-pub const XACT_S_READONLY: HRESULT = 0x0004D002;
-pub const XACT_S_SOMENORETAIN: HRESULT = 0x0004D003;
-pub const XACT_S_OKINFORM: HRESULT = 0x0004D004;
-pub const XACT_S_MADECHANGESCONTENT: HRESULT = 0x0004D005;
-pub const XACT_S_MADECHANGESINFORM: HRESULT = 0x0004D006;
-pub const XACT_S_ALLNORETAIN: HRESULT = 0x0004D007;
-pub const XACT_S_ABORTING: HRESULT = 0x0004D008;
-pub const XACT_S_SINGLEPHASE: HRESULT = 0x0004D009;
-pub const XACT_S_LOCALLY_OK: HRESULT = 0x0004D00A;
-pub const XACT_S_LASTRESOURCEMANAGER: HRESULT = 0x0004D010;
-pub const CONTEXT_E_FIRST: HRESULT = 0x8004E000u32 as HRESULT;
-pub const CONTEXT_E_LAST: HRESULT = 0x8004E02Fu32 as HRESULT;
-pub const CONTEXT_S_FIRST: HRESULT = 0x0004E000;
-pub const CONTEXT_S_LAST: HRESULT = 0x0004E02F;
-pub const CONTEXT_E_ABORTED: HRESULT = 0x8004E002u32 as HRESULT;
-pub const CONTEXT_E_ABORTING: HRESULT = 0x8004E003u32 as HRESULT;
-pub const CONTEXT_E_NOCONTEXT: HRESULT = 0x8004E004u32 as HRESULT;
-pub const CONTEXT_E_WOULD_DEADLOCK: HRESULT = 0x8004E005u32 as HRESULT;
-pub const CONTEXT_E_SYNCH_TIMEOUT: HRESULT = 0x8004E006u32 as HRESULT;
-pub const CONTEXT_E_OLDREF: HRESULT = 0x8004E007u32 as HRESULT;
-pub const CONTEXT_E_ROLENOTFOUND: HRESULT = 0x8004E00Cu32 as HRESULT;
-pub const CONTEXT_E_TMNOTAVAILABLE: HRESULT = 0x8004E00Fu32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED: HRESULT = 0x8004E021u32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED_EVENTLOGGED: HRESULT = 0x8004E022u32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED_CATALOGERROR: HRESULT = 0x8004E023u32 as HRESULT;
-pub const CO_E_ACTIVATIONFAILED_TIMEOUT: HRESULT = 0x8004E024u32 as HRESULT;
-pub const CO_E_INITIALIZATIONFAILED: HRESULT = 0x8004E025u32 as HRESULT;
-pub const CONTEXT_E_NOJIT: HRESULT = 0x8004E026u32 as HRESULT;
-pub const CONTEXT_E_NOTRANSACTION: HRESULT = 0x8004E027u32 as HRESULT;
-pub const CO_E_THREADINGMODEL_CHANGED: HRESULT = 0x8004E028u32 as HRESULT;
-pub const CO_E_NOIISINTRINSICS: HRESULT = 0x8004E029u32 as HRESULT;
-pub const CO_E_NOCOOKIES: HRESULT = 0x8004E02Au32 as HRESULT;
-pub const CO_E_DBERROR: HRESULT = 0x8004E02Bu32 as HRESULT;
-pub const CO_E_NOTPOOLED: HRESULT = 0x8004E02Cu32 as HRESULT;
-pub const CO_E_NOTCONSTRUCTED: HRESULT = 0x8004E02Du32 as HRESULT;
-pub const CO_E_NOSYNCHRONIZATION: HRESULT = 0x8004E02Eu32 as HRESULT;
-pub const CO_E_ISOLEVELMISMATCH: HRESULT = 0x8004E02Fu32 as HRESULT;
-pub const CO_E_CALL_OUT_OF_TX_SCOPE_NOT_ALLOWED: HRESULT = 0x8004E030u32 as HRESULT;
-pub const CO_E_EXIT_TRANSACTION_SCOPE_NOT_CALLED: HRESULT = 0x8004E031u32 as HRESULT;
-pub const OLE_S_USEREG: HRESULT = 0x00040000;
-pub const OLE_S_STATIC: HRESULT = 0x00040001;
-pub const OLE_S_MAC_CLIPFORMAT: HRESULT = 0x00040002;
-pub const DRAGDROP_S_DROP: HRESULT = 0x00040100;
-pub const DRAGDROP_S_CANCEL: HRESULT = 0x00040101;
-pub const DRAGDROP_S_USEDEFAULTCURSORS: HRESULT = 0x00040102;
-pub const DATA_S_SAMEFORMATETC: HRESULT = 0x00040130;
-pub const VIEW_S_ALREADY_FROZEN: HRESULT = 0x00040140;
-pub const CACHE_S_FORMATETC_NOTSUPPORTED: HRESULT = 0x00040170;
-pub const CACHE_S_SAMECACHE: HRESULT = 0x00040171;
-pub const CACHE_S_SOMECACHES_NOTUPDATED: HRESULT = 0x00040172;
-pub const OLEOBJ_S_INVALIDVERB: HRESULT = 0x00040180;
-pub const OLEOBJ_S_CANNOT_DOVERB_NOW: HRESULT = 0x00040181;
-pub const OLEOBJ_S_INVALIDHWND: HRESULT = 0x00040182;
-pub const INPLACE_S_TRUNCATED: HRESULT = 0x000401A0;
-pub const CONVERT10_S_NO_PRESENTATION: HRESULT = 0x000401C0;
-pub const MK_S_REDUCED_TO_SELF: HRESULT = 0x000401E2;
-pub const MK_S_ME: HRESULT = 0x000401E4;
-pub const MK_S_HIM: HRESULT = 0x000401E5;
-pub const MK_S_US: HRESULT = 0x000401E6;
-pub const MK_S_MONIKERALREADYREGISTERED: HRESULT = 0x000401E7;
-pub const SCHED_S_TASK_READY: HRESULT = 0x00041300;
-pub const SCHED_S_TASK_RUNNING: HRESULT = 0x00041301;
-pub const SCHED_S_TASK_DISABLED: HRESULT = 0x00041302;
-pub const SCHED_S_TASK_HAS_NOT_RUN: HRESULT = 0x00041303;
-pub const SCHED_S_TASK_NO_MORE_RUNS: HRESULT = 0x00041304;
-pub const SCHED_S_TASK_NOT_SCHEDULED: HRESULT = 0x00041305;
-pub const SCHED_S_TASK_TERMINATED: HRESULT = 0x00041306;
-pub const SCHED_S_TASK_NO_VALID_TRIGGERS: HRESULT = 0x00041307;
-pub const SCHED_S_EVENT_TRIGGER: HRESULT = 0x00041308;
-pub const SCHED_E_TRIGGER_NOT_FOUND: HRESULT = 0x80041309u32 as HRESULT;
-pub const SCHED_E_TASK_NOT_READY: HRESULT = 0x8004130Au32 as HRESULT;
-pub const SCHED_E_TASK_NOT_RUNNING: HRESULT = 0x8004130Bu32 as HRESULT;
-pub const SCHED_E_SERVICE_NOT_INSTALLED: HRESULT = 0x8004130Cu32 as HRESULT;
-pub const SCHED_E_CANNOT_OPEN_TASK: HRESULT = 0x8004130Du32 as HRESULT;
-pub const SCHED_E_INVALID_TASK: HRESULT = 0x8004130Eu32 as HRESULT;
-pub const SCHED_E_ACCOUNT_INFORMATION_NOT_SET: HRESULT = 0x8004130Fu32 as HRESULT;
-pub const SCHED_E_ACCOUNT_NAME_NOT_FOUND: HRESULT = 0x80041310u32 as HRESULT;
-pub const SCHED_E_ACCOUNT_DBASE_CORRUPT: HRESULT = 0x80041311u32 as HRESULT;
-pub const SCHED_E_NO_SECURITY_SERVICES: HRESULT = 0x80041312u32 as HRESULT;
-pub const SCHED_E_UNKNOWN_OBJECT_VERSION: HRESULT = 0x80041313u32 as HRESULT;
-pub const SCHED_E_UNSUPPORTED_ACCOUNT_OPTION: HRESULT = 0x80041314u32 as HRESULT;
-pub const SCHED_E_SERVICE_NOT_RUNNING: HRESULT = 0x80041315u32 as HRESULT;
-pub const SCHED_E_UNEXPECTEDNODE: HRESULT = 0x80041316u32 as HRESULT;
-pub const SCHED_E_NAMESPACE: HRESULT = 0x80041317u32 as HRESULT;
-pub const SCHED_E_INVALIDVALUE: HRESULT = 0x80041318u32 as HRESULT;
-pub const SCHED_E_MISSINGNODE: HRESULT = 0x80041319u32 as HRESULT;
-pub const SCHED_E_MALFORMEDXML: HRESULT = 0x8004131Au32 as HRESULT;
-pub const SCHED_S_SOME_TRIGGERS_FAILED: HRESULT = 0x0004131B;
-pub const SCHED_S_BATCH_LOGON_PROBLEM: HRESULT = 0x0004131C;
-pub const SCHED_E_TOO_MANY_NODES: HRESULT = 0x8004131Du32 as HRESULT;
-pub const SCHED_E_PAST_END_BOUNDARY: HRESULT = 0x8004131Eu32 as HRESULT;
-pub const SCHED_E_ALREADY_RUNNING: HRESULT = 0x8004131Fu32 as HRESULT;
-pub const SCHED_E_USER_NOT_LOGGED_ON: HRESULT = 0x80041320u32 as HRESULT;
-pub const SCHED_E_INVALID_TASK_HASH: HRESULT = 0x80041321u32 as HRESULT;
-pub const SCHED_E_SERVICE_NOT_AVAILABLE: HRESULT = 0x80041322u32 as HRESULT;
-pub const SCHED_E_SERVICE_TOO_BUSY: HRESULT = 0x80041323u32 as HRESULT;
-pub const SCHED_E_TASK_ATTEMPTED: HRESULT = 0x80041324u32 as HRESULT;
-pub const SCHED_S_TASK_QUEUED: HRESULT = 0x00041325;
-pub const SCHED_E_TASK_DISABLED: HRESULT = 0x80041326u32 as HRESULT;
-pub const SCHED_E_TASK_NOT_V1_COMPAT: HRESULT = 0x80041327u32 as HRESULT;
-pub const SCHED_E_START_ON_DEMAND: HRESULT = 0x80041328u32 as HRESULT;
-pub const SCHED_E_TASK_NOT_UBPM_COMPAT: HRESULT = 0x80041329u32 as HRESULT;
-pub const SCHED_E_DEPRECATED_FEATURE_USED: HRESULT = 0x80041330u32 as HRESULT;
-pub const CO_E_CLASS_CREATE_FAILED: HRESULT = 0x80080001u32 as HRESULT;
-pub const CO_E_SCM_ERROR: HRESULT = 0x80080002u32 as HRESULT;
-pub const CO_E_SCM_RPC_FAILURE: HRESULT = 0x80080003u32 as HRESULT;
-pub const CO_E_BAD_PATH: HRESULT = 0x80080004u32 as HRESULT;
-pub const CO_E_SERVER_EXEC_FAILURE: HRESULT = 0x80080005u32 as HRESULT;
-pub const CO_E_OBJSRV_RPC_FAILURE: HRESULT = 0x80080006u32 as HRESULT;
-pub const MK_E_NO_NORMALIZED: HRESULT = 0x80080007u32 as HRESULT;
-pub const CO_E_SERVER_STOPPING: HRESULT = 0x80080008u32 as HRESULT;
-pub const MEM_E_INVALID_ROOT: HRESULT = 0x80080009u32 as HRESULT;
-pub const MEM_E_INVALID_LINK: HRESULT = 0x80080010u32 as HRESULT;
-pub const MEM_E_INVALID_SIZE: HRESULT = 0x80080011u32 as HRESULT;
-pub const CO_S_NOTALLINTERFACES: HRESULT = 0x00080012;
-pub const CO_S_MACHINENAMENOTFOUND: HRESULT = 0x00080013;
-pub const CO_E_MISSING_DISPLAYNAME: HRESULT = 0x80080015u32 as HRESULT;
-pub const CO_E_RUNAS_VALUE_MUST_BE_AAA: HRESULT = 0x80080016u32 as HRESULT;
-pub const CO_E_ELEVATION_DISABLED: HRESULT = 0x80080017u32 as HRESULT;
-pub const APPX_E_PACKAGING_INTERNAL: HRESULT = 0x80080200u32 as HRESULT;
-pub const APPX_E_INTERLEAVING_NOT_ALLOWED: HRESULT = 0x80080201u32 as HRESULT;
-pub const APPX_E_RELATIONSHIPS_NOT_ALLOWED: HRESULT = 0x80080202u32 as HRESULT;
-pub const APPX_E_MISSING_REQUIRED_FILE: HRESULT = 0x80080203u32 as HRESULT;
-pub const APPX_E_INVALID_MANIFEST: HRESULT = 0x80080204u32 as HRESULT;
-pub const APPX_E_INVALID_BLOCKMAP: HRESULT = 0x80080205u32 as HRESULT;
-pub const APPX_E_CORRUPT_CONTENT: HRESULT = 0x80080206u32 as HRESULT;
-pub const APPX_E_BLOCK_HASH_INVALID: HRESULT = 0x80080207u32 as HRESULT;
-pub const APPX_E_REQUESTED_RANGE_TOO_LARGE: HRESULT = 0x80080208u32 as HRESULT;
-pub const APPX_E_INVALID_SIP_CLIENT_DATA: HRESULT = 0x80080209u32 as HRESULT;
-pub const BT_E_SPURIOUS_ACTIVATION: HRESULT = 0x80080300u32 as HRESULT;
-pub const DISP_E_UNKNOWNINTERFACE: HRESULT = 0x80020001u32 as HRESULT;
-pub const DISP_E_MEMBERNOTFOUND: HRESULT = 0x80020003u32 as HRESULT;
-pub const DISP_E_PARAMNOTFOUND: HRESULT = 0x80020004u32 as HRESULT;
-pub const DISP_E_TYPEMISMATCH: HRESULT = 0x80020005u32 as HRESULT;
-pub const DISP_E_UNKNOWNNAME: HRESULT = 0x80020006u32 as HRESULT;
-pub const DISP_E_NONAMEDARGS: HRESULT = 0x80020007u32 as HRESULT;
-pub const DISP_E_BADVARTYPE: HRESULT = 0x80020008u32 as HRESULT;
-pub const DISP_E_EXCEPTION: HRESULT = 0x80020009u32 as HRESULT;
-pub const DISP_E_OVERFLOW: HRESULT = 0x8002000Au32 as HRESULT;
-pub const DISP_E_BADINDEX: HRESULT = 0x8002000Bu32 as HRESULT;
-pub const DISP_E_UNKNOWNLCID: HRESULT = 0x8002000Cu32 as HRESULT;
-pub const DISP_E_ARRAYISLOCKED: HRESULT = 0x8002000Du32 as HRESULT;
-pub const DISP_E_BADPARAMCOUNT: HRESULT = 0x8002000Eu32 as HRESULT;
-pub const DISP_E_PARAMNOTOPTIONAL: HRESULT = 0x8002000Fu32 as HRESULT;
-pub const DISP_E_BADCALLEE: HRESULT = 0x80020010u32 as HRESULT;
-pub const DISP_E_NOTACOLLECTION: HRESULT = 0x80020011u32 as HRESULT;
-pub const DISP_E_DIVBYZERO: HRESULT = 0x80020012u32 as HRESULT;
-pub const DISP_E_BUFFERTOOSMALL: HRESULT = 0x80020013u32 as HRESULT;
-pub const TYPE_E_BUFFERTOOSMALL: HRESULT = 0x80028016u32 as HRESULT;
-pub const TYPE_E_FIELDNOTFOUND: HRESULT = 0x80028017u32 as HRESULT;
-pub const TYPE_E_INVDATAREAD: HRESULT = 0x80028018u32 as HRESULT;
-pub const TYPE_E_UNSUPFORMAT: HRESULT = 0x80028019u32 as HRESULT;
-pub const TYPE_E_REGISTRYACCESS: HRESULT = 0x8002801Cu32 as HRESULT;
-pub const TYPE_E_LIBNOTREGISTERED: HRESULT = 0x8002801Du32 as HRESULT;
-pub const TYPE_E_UNDEFINEDTYPE: HRESULT = 0x80028027u32 as HRESULT;
-pub const TYPE_E_QUALIFIEDNAMEDISALLOWED: HRESULT = 0x80028028u32 as HRESULT;
-pub const TYPE_E_INVALIDSTATE: HRESULT = 0x80028029u32 as HRESULT;
-pub const TYPE_E_WRONGTYPEKIND: HRESULT = 0x8002802Au32 as HRESULT;
-pub const TYPE_E_ELEMENTNOTFOUND: HRESULT = 0x8002802Bu32 as HRESULT;
-pub const TYPE_E_AMBIGUOUSNAME: HRESULT = 0x8002802Cu32 as HRESULT;
-pub const TYPE_E_NAMECONFLICT: HRESULT = 0x8002802Du32 as HRESULT;
-pub const TYPE_E_UNKNOWNLCID: HRESULT = 0x8002802Eu32 as HRESULT;
-pub const TYPE_E_DLLFUNCTIONNOTFOUND: HRESULT = 0x8002802Fu32 as HRESULT;
-pub const TYPE_E_BADMODULEKIND: HRESULT = 0x800288BDu32 as HRESULT;
-pub const TYPE_E_SIZETOOBIG: HRESULT = 0x800288C5u32 as HRESULT;
-pub const TYPE_E_DUPLICATEID: HRESULT = 0x800288C6u32 as HRESULT;
-pub const TYPE_E_INVALIDID: HRESULT = 0x800288CFu32 as HRESULT;
-pub const TYPE_E_TYPEMISMATCH: HRESULT = 0x80028CA0u32 as HRESULT;
-pub const TYPE_E_OUTOFBOUNDS: HRESULT = 0x80028CA1u32 as HRESULT;
-pub const TYPE_E_IOERROR: HRESULT = 0x80028CA2u32 as HRESULT;
-pub const TYPE_E_CANTCREATETMPFILE: HRESULT = 0x80028CA3u32 as HRESULT;
-pub const TYPE_E_CANTLOADLIBRARY: HRESULT = 0x80029C4Au32 as HRESULT;
-pub const TYPE_E_INCONSISTENTPROPFUNCS: HRESULT = 0x80029C83u32 as HRESULT;
-pub const TYPE_E_CIRCULARTYPE: HRESULT = 0x80029C84u32 as HRESULT;
-pub const STG_E_INVALIDFUNCTION: HRESULT = 0x80030001u32 as HRESULT;
-pub const STG_E_FILENOTFOUND: HRESULT = 0x80030002u32 as HRESULT;
-pub const STG_E_PATHNOTFOUND: HRESULT = 0x80030003u32 as HRESULT;
-pub const STG_E_TOOMANYOPENFILES: HRESULT = 0x80030004u32 as HRESULT;
-pub const STG_E_ACCESSDENIED: HRESULT = 0x80030005u32 as HRESULT;
-pub const STG_E_INVALIDHANDLE: HRESULT = 0x80030006u32 as HRESULT;
-pub const STG_E_INSUFFICIENTMEMORY: HRESULT = 0x80030008u32 as HRESULT;
-pub const STG_E_INVALIDPOINTER: HRESULT = 0x80030009u32 as HRESULT;
-pub const STG_E_NOMOREFILES: HRESULT = 0x80030012u32 as HRESULT;
-pub const STG_E_DISKISWRITEPROTECTED: HRESULT = 0x80030013u32 as HRESULT;
-pub const STG_E_SEEKERROR: HRESULT = 0x80030019u32 as HRESULT;
-pub const STG_E_WRITEFAULT: HRESULT = 0x8003001Du32 as HRESULT;
-pub const STG_E_READFAULT: HRESULT = 0x8003001Eu32 as HRESULT;
-pub const STG_E_SHAREVIOLATION: HRESULT = 0x80030020u32 as HRESULT;
-pub const STG_E_LOCKVIOLATION: HRESULT = 0x80030021u32 as HRESULT;
-pub const STG_E_FILEALREADYEXISTS: HRESULT = 0x80030050u32 as HRESULT;
-pub const STG_E_INVALIDPARAMETER: HRESULT = 0x80030057u32 as HRESULT;
-pub const STG_E_MEDIUMFULL: HRESULT = 0x80030070u32 as HRESULT;
-pub const STG_E_PROPSETMISMATCHED: HRESULT = 0x800300F0u32 as HRESULT;
-pub const STG_E_ABNORMALAPIEXIT: HRESULT = 0x800300FAu32 as HRESULT;
-pub const STG_E_INVALIDHEADER: HRESULT = 0x800300FBu32 as HRESULT;
-pub const STG_E_INVALIDNAME: HRESULT = 0x800300FCu32 as HRESULT;
-pub const STG_E_UNKNOWN: HRESULT = 0x800300FDu32 as HRESULT;
-pub const STG_E_UNIMPLEMENTEDFUNCTION: HRESULT = 0x800300FEu32 as HRESULT;
-pub const STG_E_INVALIDFLAG: HRESULT = 0x800300FFu32 as HRESULT;
-pub const STG_E_INUSE: HRESULT = 0x80030100u32 as HRESULT;
-pub const STG_E_NOTCURRENT: HRESULT = 0x80030101u32 as HRESULT;
-pub const STG_E_REVERTED: HRESULT = 0x80030102u32 as HRESULT;
-pub const STG_E_CANTSAVE: HRESULT = 0x80030103u32 as HRESULT;
-pub const STG_E_OLDFORMAT: HRESULT = 0x80030104u32 as HRESULT;
-pub const STG_E_OLDDLL: HRESULT = 0x80030105u32 as HRESULT;
-pub const STG_E_SHAREREQUIRED: HRESULT = 0x80030106u32 as HRESULT;
-pub const STG_E_NOTFILEBASEDSTORAGE: HRESULT = 0x80030107u32 as HRESULT;
-pub const STG_E_EXTANTMARSHALLINGS: HRESULT = 0x80030108u32 as HRESULT;
-pub const STG_E_DOCFILECORRUPT: HRESULT = 0x80030109u32 as HRESULT;
-pub const STG_E_BADBASEADDRESS: HRESULT = 0x80030110u32 as HRESULT;
-pub const STG_E_DOCFILETOOLARGE: HRESULT = 0x80030111u32 as HRESULT;
-pub const STG_E_NOTSIMPLEFORMAT: HRESULT = 0x80030112u32 as HRESULT;
-pub const STG_E_INCOMPLETE: HRESULT = 0x80030201u32 as HRESULT;
-pub const STG_E_TERMINATED: HRESULT = 0x80030202u32 as HRESULT;
-pub const STG_S_CONVERTED: HRESULT = 0x00030200;
-pub const STG_S_BLOCK: HRESULT = 0x00030201;
-pub const STG_S_RETRYNOW: HRESULT = 0x00030202;
-pub const STG_S_MONITORING: HRESULT = 0x00030203;
-pub const STG_S_MULTIPLEOPENS: HRESULT = 0x00030204;
-pub const STG_S_CONSOLIDATIONFAILED: HRESULT = 0x00030205;
-pub const STG_S_CANNOTCONSOLIDATE: HRESULT = 0x00030206;
-pub const STG_E_STATUS_COPY_PROTECTION_FAILURE: HRESULT = 0x80030305u32 as HRESULT;
-pub const STG_E_CSS_AUTHENTICATION_FAILURE: HRESULT = 0x80030306u32 as HRESULT;
-pub const STG_E_CSS_KEY_NOT_PRESENT: HRESULT = 0x80030307u32 as HRESULT;
-pub const STG_E_CSS_KEY_NOT_ESTABLISHED: HRESULT = 0x80030308u32 as HRESULT;
-pub const STG_E_CSS_SCRAMBLED_SECTOR: HRESULT = 0x80030309u32 as HRESULT;
-pub const STG_E_CSS_REGION_MISMATCH: HRESULT = 0x8003030Au32 as HRESULT;
-pub const STG_E_RESETS_EXHAUSTED: HRESULT = 0x8003030Bu32 as HRESULT;
-pub const RPC_E_CALL_REJECTED: HRESULT = 0x80010001u32 as HRESULT;
-pub const RPC_E_CALL_CANCELED: HRESULT = 0x80010002u32 as HRESULT;
-pub const RPC_E_CANTPOST_INSENDCALL: HRESULT = 0x80010003u32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_INASYNCCALL: HRESULT = 0x80010004u32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_INEXTERNALCALL: HRESULT = 0x80010005u32 as HRESULT;
-pub const RPC_E_CONNECTION_TERMINATED: HRESULT = 0x80010006u32 as HRESULT;
-pub const RPC_E_SERVER_DIED: HRESULT = 0x80010007u32 as HRESULT;
-pub const RPC_E_CLIENT_DIED: HRESULT = 0x80010008u32 as HRESULT;
-pub const RPC_E_INVALID_DATAPACKET: HRESULT = 0x80010009u32 as HRESULT;
-pub const RPC_E_CANTTRANSMIT_CALL: HRESULT = 0x8001000Au32 as HRESULT;
-pub const RPC_E_CLIENT_CANTMARSHAL_DATA: HRESULT = 0x8001000Bu32 as HRESULT;
-pub const RPC_E_CLIENT_CANTUNMARSHAL_DATA: HRESULT = 0x8001000Cu32 as HRESULT;
-pub const RPC_E_SERVER_CANTMARSHAL_DATA: HRESULT = 0x8001000Du32 as HRESULT;
-pub const RPC_E_SERVER_CANTUNMARSHAL_DATA: HRESULT = 0x8001000Eu32 as HRESULT;
-pub const RPC_E_INVALID_DATA: HRESULT = 0x8001000Fu32 as HRESULT;
-pub const RPC_E_INVALID_PARAMETER: HRESULT = 0x80010010u32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_AGAIN: HRESULT = 0x80010011u32 as HRESULT;
-pub const RPC_E_SERVER_DIED_DNE: HRESULT = 0x80010012u32 as HRESULT;
-pub const RPC_E_SYS_CALL_FAILED: HRESULT = 0x80010100u32 as HRESULT;
-pub const RPC_E_OUT_OF_RESOURCES: HRESULT = 0x80010101u32 as HRESULT;
-pub const RPC_E_ATTEMPTED_MULTITHREAD: HRESULT = 0x80010102u32 as HRESULT;
-pub const RPC_E_NOT_REGISTERED: HRESULT = 0x80010103u32 as HRESULT;
-pub const RPC_E_FAULT: HRESULT = 0x80010104u32 as HRESULT;
-pub const RPC_E_SERVERFAULT: HRESULT = 0x80010105u32 as HRESULT;
-pub const RPC_E_CHANGED_MODE: HRESULT = 0x80010106u32 as HRESULT;
-pub const RPC_E_INVALIDMETHOD: HRESULT = 0x80010107u32 as HRESULT;
-pub const RPC_E_DISCONNECTED: HRESULT = 0x80010108u32 as HRESULT;
-pub const RPC_E_RETRY: HRESULT = 0x80010109u32 as HRESULT;
-pub const RPC_E_SERVERCALL_RETRYLATER: HRESULT = 0x8001010Au32 as HRESULT;
-pub const RPC_E_SERVERCALL_REJECTED: HRESULT = 0x8001010Bu32 as HRESULT;
-pub const RPC_E_INVALID_CALLDATA: HRESULT = 0x8001010Cu32 as HRESULT;
-pub const RPC_E_CANTCALLOUT_ININPUTSYNCCALL: HRESULT = 0x8001010Du32 as HRESULT;
-pub const RPC_E_WRONG_THREAD: HRESULT = 0x8001010Eu32 as HRESULT;
-pub const RPC_E_THREAD_NOT_INIT: HRESULT = 0x8001010Fu32 as HRESULT;
-pub const RPC_E_VERSION_MISMATCH: HRESULT = 0x80010110u32 as HRESULT;
-pub const RPC_E_INVALID_HEADER: HRESULT = 0x80010111u32 as HRESULT;
-pub const RPC_E_INVALID_EXTENSION: HRESULT = 0x80010112u32 as HRESULT;
-pub const RPC_E_INVALID_IPID: HRESULT = 0x80010113u32 as HRESULT;
-pub const RPC_E_INVALID_OBJECT: HRESULT = 0x80010114u32 as HRESULT;
-pub const RPC_S_CALLPENDING: HRESULT = 0x80010115u32 as HRESULT;
-pub const RPC_S_WAITONTIMER: HRESULT = 0x80010116u32 as HRESULT;
-pub const RPC_E_CALL_COMPLETE: HRESULT = 0x80010117u32 as HRESULT;
-pub const RPC_E_UNSECURE_CALL: HRESULT = 0x80010118u32 as HRESULT;
-pub const RPC_E_TOO_LATE: HRESULT = 0x80010119u32 as HRESULT;
-pub const RPC_E_NO_GOOD_SECURITY_PACKAGES: HRESULT = 0x8001011Au32 as HRESULT;
-pub const RPC_E_ACCESS_DENIED: HRESULT = 0x8001011Bu32 as HRESULT;
-pub const RPC_E_REMOTE_DISABLED: HRESULT = 0x8001011Cu32 as HRESULT;
-pub const RPC_E_INVALID_OBJREF: HRESULT = 0x8001011Du32 as HRESULT;
-pub const RPC_E_NO_CONTEXT: HRESULT = 0x8001011Eu32 as HRESULT;
-pub const RPC_E_TIMEOUT: HRESULT = 0x8001011Fu32 as HRESULT;
-pub const RPC_E_NO_SYNC: HRESULT = 0x80010120u32 as HRESULT;
-pub const RPC_E_FULLSIC_REQUIRED: HRESULT = 0x80010121u32 as HRESULT;
-pub const RPC_E_INVALID_STD_NAME: HRESULT = 0x80010122u32 as HRESULT;
-pub const CO_E_FAILEDTOIMPERSONATE: HRESULT = 0x80010123u32 as HRESULT;
-pub const CO_E_FAILEDTOGETSECCTX: HRESULT = 0x80010124u32 as HRESULT;
-pub const CO_E_FAILEDTOOPENTHREADTOKEN: HRESULT = 0x80010125u32 as HRESULT;
-pub const CO_E_FAILEDTOGETTOKENINFO: HRESULT = 0x80010126u32 as HRESULT;
-pub const CO_E_TRUSTEEDOESNTMATCHCLIENT: HRESULT = 0x80010127u32 as HRESULT;
-pub const CO_E_FAILEDTOQUERYCLIENTBLANKET: HRESULT = 0x80010128u32 as HRESULT;
-pub const CO_E_FAILEDTOSETDACL: HRESULT = 0x80010129u32 as HRESULT;
-pub const CO_E_ACCESSCHECKFAILED: HRESULT = 0x8001012Au32 as HRESULT;
-pub const CO_E_NETACCESSAPIFAILED: HRESULT = 0x8001012Bu32 as HRESULT;
-pub const CO_E_WRONGTRUSTEENAMESYNTAX: HRESULT = 0x8001012Cu32 as HRESULT;
-pub const CO_E_INVALIDSID: HRESULT = 0x8001012Du32 as HRESULT;
-pub const CO_E_CONVERSIONFAILED: HRESULT = 0x8001012Eu32 as HRESULT;
-pub const CO_E_NOMATCHINGSIDFOUND: HRESULT = 0x8001012Fu32 as HRESULT;
-pub const CO_E_LOOKUPACCSIDFAILED: HRESULT = 0x80010130u32 as HRESULT;
-pub const CO_E_NOMATCHINGNAMEFOUND: HRESULT = 0x80010131u32 as HRESULT;
-pub const CO_E_LOOKUPACCNAMEFAILED: HRESULT = 0x80010132u32 as HRESULT;
-pub const CO_E_SETSERLHNDLFAILED: HRESULT = 0x80010133u32 as HRESULT;
-pub const CO_E_FAILEDTOGETWINDIR: HRESULT = 0x80010134u32 as HRESULT;
-pub const CO_E_PATHTOOLONG: HRESULT = 0x80010135u32 as HRESULT;
-pub const CO_E_FAILEDTOGENUUID: HRESULT = 0x80010136u32 as HRESULT;
-pub const CO_E_FAILEDTOCREATEFILE: HRESULT = 0x80010137u32 as HRESULT;
-pub const CO_E_FAILEDTOCLOSEHANDLE: HRESULT = 0x80010138u32 as HRESULT;
-pub const CO_E_EXCEEDSYSACLLIMIT: HRESULT = 0x80010139u32 as HRESULT;
-pub const CO_E_ACESINWRONGORDER: HRESULT = 0x8001013Au32 as HRESULT;
-pub const CO_E_INCOMPATIBLESTREAMVERSION: HRESULT = 0x8001013Bu32 as HRESULT;
-pub const CO_E_FAILEDTOOPENPROCESSTOKEN: HRESULT = 0x8001013Cu32 as HRESULT;
-pub const CO_E_DECODEFAILED: HRESULT = 0x8001013Du32 as HRESULT;
-pub const CO_E_ACNOTINITIALIZED: HRESULT = 0x8001013Fu32 as HRESULT;
-pub const CO_E_CANCEL_DISABLED: HRESULT = 0x80010140u32 as HRESULT;
-pub const RPC_E_UNEXPECTED: HRESULT = 0x8001FFFFu32 as HRESULT;
-pub const ERROR_AUDITING_DISABLED: HRESULT = 0xC0090001u32 as HRESULT;
-pub const ERROR_ALL_SIDS_FILTERED: HRESULT = 0xC0090002u32 as HRESULT;
-pub const ERROR_BIZRULES_NOT_ENABLED: HRESULT = 0xC0090003u32 as HRESULT;
-pub const NTE_BAD_UID: HRESULT = 0x80090001u32 as HRESULT;
-pub const NTE_BAD_HASH: HRESULT = 0x80090002u32 as HRESULT;
-pub const NTE_BAD_KEY: HRESULT = 0x80090003u32 as HRESULT;
-pub const NTE_BAD_LEN: HRESULT = 0x80090004u32 as HRESULT;
-pub const NTE_BAD_DATA: HRESULT = 0x80090005u32 as HRESULT;
-pub const NTE_BAD_SIGNATURE: HRESULT = 0x80090006u32 as HRESULT;
-pub const NTE_BAD_VER: HRESULT = 0x80090007u32 as HRESULT;
-pub const NTE_BAD_ALGID: HRESULT = 0x80090008u32 as HRESULT;
-pub const NTE_BAD_FLAGS: HRESULT = 0x80090009u32 as HRESULT;
-pub const NTE_BAD_TYPE: HRESULT = 0x8009000Au32 as HRESULT;
-pub const NTE_BAD_KEY_STATE: HRESULT = 0x8009000Bu32 as HRESULT;
-pub const NTE_BAD_HASH_STATE: HRESULT = 0x8009000Cu32 as HRESULT;
-pub const NTE_NO_KEY: HRESULT = 0x8009000Du32 as HRESULT;
-pub const NTE_NO_MEMORY: HRESULT = 0x8009000Eu32 as HRESULT;
-pub const NTE_EXISTS: HRESULT = 0x8009000Fu32 as HRESULT;
-pub const NTE_PERM: HRESULT = 0x80090010u32 as HRESULT;
-pub const NTE_NOT_FOUND: HRESULT = 0x80090011u32 as HRESULT;
-pub const NTE_DOUBLE_ENCRYPT: HRESULT = 0x80090012u32 as HRESULT;
-pub const NTE_BAD_PROVIDER: HRESULT = 0x80090013u32 as HRESULT;
-pub const NTE_BAD_PROV_TYPE: HRESULT = 0x80090014u32 as HRESULT;
-pub const NTE_BAD_PUBLIC_KEY: HRESULT = 0x80090015u32 as HRESULT;
-pub const NTE_BAD_KEYSET: HRESULT = 0x80090016u32 as HRESULT;
-pub const NTE_PROV_TYPE_NOT_DEF: HRESULT = 0x80090017u32 as HRESULT;
-pub const NTE_PROV_TYPE_ENTRY_BAD: HRESULT = 0x80090018u32 as HRESULT;
-pub const NTE_KEYSET_NOT_DEF: HRESULT = 0x80090019u32 as HRESULT;
-pub const NTE_KEYSET_ENTRY_BAD: HRESULT = 0x8009001Au32 as HRESULT;
-pub const NTE_PROV_TYPE_NO_MATCH: HRESULT = 0x8009001Bu32 as HRESULT;
-pub const NTE_SIGNATURE_FILE_BAD: HRESULT = 0x8009001Cu32 as HRESULT;
-pub const NTE_PROVIDER_DLL_FAIL: HRESULT = 0x8009001Du32 as HRESULT;
-pub const NTE_PROV_DLL_NOT_FOUND: HRESULT = 0x8009001Eu32 as HRESULT;
-pub const NTE_BAD_KEYSET_PARAM: HRESULT = 0x8009001Fu32 as HRESULT;
-pub const NTE_FAIL: HRESULT = 0x80090020u32 as HRESULT;
-pub const NTE_SYS_ERR: HRESULT = 0x80090021u32 as HRESULT;
-pub const NTE_SILENT_CONTEXT: HRESULT = 0x80090022u32 as HRESULT;
-pub const NTE_TOKEN_KEYSET_STORAGE_FULL: HRESULT = 0x80090023u32 as HRESULT;
-pub const NTE_TEMPORARY_PROFILE: HRESULT = 0x80090024u32 as HRESULT;
-pub const NTE_FIXEDPARAMETER: HRESULT = 0x80090025u32 as HRESULT;
-pub const NTE_INVALID_HANDLE: HRESULT = 0x80090026u32 as HRESULT;
-pub const NTE_INVALID_PARAMETER: HRESULT = 0x80090027u32 as HRESULT;
-pub const NTE_BUFFER_TOO_SMALL: HRESULT = 0x80090028u32 as HRESULT;
-pub const NTE_NOT_SUPPORTED: HRESULT = 0x80090029u32 as HRESULT;
-pub const NTE_NO_MORE_ITEMS: HRESULT = 0x8009002Au32 as HRESULT;
-pub const NTE_BUFFERS_OVERLAP: HRESULT = 0x8009002Bu32 as HRESULT;
-pub const NTE_DECRYPTION_FAILURE: HRESULT = 0x8009002Cu32 as HRESULT;
-pub const NTE_INTERNAL_ERROR: HRESULT = 0x8009002Du32 as HRESULT;
-pub const NTE_UI_REQUIRED: HRESULT = 0x8009002Eu32 as HRESULT;
-pub const NTE_HMAC_NOT_SUPPORTED: HRESULT = 0x8009002Fu32 as HRESULT;
-pub const NTE_DEVICE_NOT_READY: HRESULT = 0x80090030u32 as HRESULT;
-pub const NTE_AUTHENTICATION_IGNORED: HRESULT = 0x80090031u32 as HRESULT;
-pub const NTE_VALIDATION_FAILED: HRESULT = 0x80090032u32 as HRESULT;
-pub const NTE_INCORRECT_PASSWORD: HRESULT = 0x80090033u32 as HRESULT;
-pub const NTE_ENCRYPTION_FAILURE: HRESULT = 0x80090034u32 as HRESULT;
-pub const NTE_DEVICE_NOT_FOUND: HRESULT = 0x80090035u32 as HRESULT;
-pub const SEC_E_INSUFFICIENT_MEMORY: HRESULT = 0x80090300u32 as HRESULT;
-pub const SEC_E_INVALID_HANDLE: HRESULT = 0x80090301u32 as HRESULT;
-pub const SEC_E_UNSUPPORTED_FUNCTION: HRESULT = 0x80090302u32 as HRESULT;
-pub const SEC_E_TARGET_UNKNOWN: HRESULT = 0x80090303u32 as HRESULT;
-pub const SEC_E_INTERNAL_ERROR: HRESULT = 0x80090304u32 as HRESULT;
-pub const SEC_E_SECPKG_NOT_FOUND: HRESULT = 0x80090305u32 as HRESULT;
-pub const SEC_E_NOT_OWNER: HRESULT = 0x80090306u32 as HRESULT;
-pub const SEC_E_CANNOT_INSTALL: HRESULT = 0x80090307u32 as HRESULT;
-pub const SEC_E_INVALID_TOKEN: HRESULT = 0x80090308u32 as HRESULT;
-pub const SEC_E_CANNOT_PACK: HRESULT = 0x80090309u32 as HRESULT;
-pub const SEC_E_QOP_NOT_SUPPORTED: HRESULT = 0x8009030Au32 as HRESULT;
-pub const SEC_E_NO_IMPERSONATION: HRESULT = 0x8009030Bu32 as HRESULT;
-pub const SEC_E_LOGON_DENIED: HRESULT = 0x8009030Cu32 as HRESULT;
-pub const SEC_E_UNKNOWN_CREDENTIALS: HRESULT = 0x8009030Du32 as HRESULT;
-pub const SEC_E_NO_CREDENTIALS: HRESULT = 0x8009030Eu32 as HRESULT;
-pub const SEC_E_MESSAGE_ALTERED: HRESULT = 0x8009030Fu32 as HRESULT;
-pub const SEC_E_OUT_OF_SEQUENCE: HRESULT = 0x80090310u32 as HRESULT;
-pub const SEC_E_NO_AUTHENTICATING_AUTHORITY: HRESULT = 0x80090311u32 as HRESULT;
-pub const SEC_I_CONTINUE_NEEDED: HRESULT = 0x00090312;
-pub const SEC_I_COMPLETE_NEEDED: HRESULT = 0x00090313;
-pub const SEC_I_COMPLETE_AND_CONTINUE: HRESULT = 0x00090314;
-pub const SEC_I_LOCAL_LOGON: HRESULT = 0x00090315;
-pub const SEC_E_BAD_PKGID: HRESULT = 0x80090316u32 as HRESULT;
-pub const SEC_E_CONTEXT_EXPIRED: HRESULT = 0x80090317u32 as HRESULT;
-pub const SEC_I_CONTEXT_EXPIRED: HRESULT = 0x00090317;
-pub const SEC_E_INCOMPLETE_MESSAGE: HRESULT = 0x80090318u32 as HRESULT;
-pub const SEC_E_INCOMPLETE_CREDENTIALS: HRESULT = 0x80090320u32 as HRESULT;
-pub const SEC_E_BUFFER_TOO_SMALL: HRESULT = 0x80090321u32 as HRESULT;
-pub const SEC_I_INCOMPLETE_CREDENTIALS: HRESULT = 0x00090320;
-pub const SEC_I_RENEGOTIATE: HRESULT = 0x00090321;
-pub const SEC_E_WRONG_PRINCIPAL: HRESULT = 0x80090322u32 as HRESULT;
-pub const SEC_I_NO_LSA_CONTEXT: HRESULT = 0x00090323;
-pub const SEC_E_TIME_SKEW: HRESULT = 0x80090324u32 as HRESULT;
-pub const SEC_E_UNTRUSTED_ROOT: HRESULT = 0x80090325u32 as HRESULT;
-pub const SEC_E_ILLEGAL_MESSAGE: HRESULT = 0x80090326u32 as HRESULT;
-pub const SEC_E_CERT_UNKNOWN: HRESULT = 0x80090327u32 as HRESULT;
-pub const SEC_E_CERT_EXPIRED: HRESULT = 0x80090328u32 as HRESULT;
-pub const SEC_E_ENCRYPT_FAILURE: HRESULT = 0x80090329u32 as HRESULT;
-pub const SEC_E_DECRYPT_FAILURE: HRESULT = 0x80090330u32 as HRESULT;
-pub const SEC_E_ALGORITHM_MISMATCH: HRESULT = 0x80090331u32 as HRESULT;
-pub const SEC_E_SECURITY_QOS_FAILED: HRESULT = 0x80090332u32 as HRESULT;
-pub const SEC_E_UNFINISHED_CONTEXT_DELETED: HRESULT = 0x80090333u32 as HRESULT;
-pub const SEC_E_NO_TGT_REPLY: HRESULT = 0x80090334u32 as HRESULT;
-pub const SEC_E_NO_IP_ADDRESSES: HRESULT = 0x80090335u32 as HRESULT;
-pub const SEC_E_WRONG_CREDENTIAL_HANDLE: HRESULT = 0x80090336u32 as HRESULT;
-pub const SEC_E_CRYPTO_SYSTEM_INVALID: HRESULT = 0x80090337u32 as HRESULT;
-pub const SEC_E_MAX_REFERRALS_EXCEEDED: HRESULT = 0x80090338u32 as HRESULT;
-pub const SEC_E_MUST_BE_KDC: HRESULT = 0x80090339u32 as HRESULT;
-pub const SEC_E_STRONG_CRYPTO_NOT_SUPPORTED: HRESULT = 0x8009033Au32 as HRESULT;
-pub const SEC_E_TOO_MANY_PRINCIPALS: HRESULT = 0x8009033Bu32 as HRESULT;
-pub const SEC_E_NO_PA_DATA: HRESULT = 0x8009033Cu32 as HRESULT;
-pub const SEC_E_PKINIT_NAME_MISMATCH: HRESULT = 0x8009033Du32 as HRESULT;
-pub const SEC_E_SMARTCARD_LOGON_REQUIRED: HRESULT = 0x8009033Eu32 as HRESULT;
-pub const SEC_E_SHUTDOWN_IN_PROGRESS: HRESULT = 0x8009033Fu32 as HRESULT;
-pub const SEC_E_KDC_INVALID_REQUEST: HRESULT = 0x80090340u32 as HRESULT;
-pub const SEC_E_KDC_UNABLE_TO_REFER: HRESULT = 0x80090341u32 as HRESULT;
-pub const SEC_E_KDC_UNKNOWN_ETYPE: HRESULT = 0x80090342u32 as HRESULT;
-pub const SEC_E_UNSUPPORTED_PREAUTH: HRESULT = 0x80090343u32 as HRESULT;
-pub const SEC_E_DELEGATION_REQUIRED: HRESULT = 0x80090345u32 as HRESULT;
-pub const SEC_E_BAD_BINDINGS: HRESULT = 0x80090346u32 as HRESULT;
-pub const SEC_E_MULTIPLE_ACCOUNTS: HRESULT = 0x80090347u32 as HRESULT;
-pub const SEC_E_NO_KERB_KEY: HRESULT = 0x80090348u32 as HRESULT;
-pub const SEC_E_CERT_WRONG_USAGE: HRESULT = 0x80090349u32 as HRESULT;
-pub const SEC_E_DOWNGRADE_DETECTED: HRESULT = 0x80090350u32 as HRESULT;
-pub const SEC_E_SMARTCARD_CERT_REVOKED: HRESULT = 0x80090351u32 as HRESULT;
-pub const SEC_E_ISSUING_CA_UNTRUSTED: HRESULT = 0x80090352u32 as HRESULT;
-pub const SEC_E_REVOCATION_OFFLINE_C: HRESULT = 0x80090353u32 as HRESULT;
-pub const SEC_E_PKINIT_CLIENT_FAILURE: HRESULT = 0x80090354u32 as HRESULT;
-pub const SEC_E_SMARTCARD_CERT_EXPIRED: HRESULT = 0x80090355u32 as HRESULT;
-pub const SEC_E_NO_S4U_PROT_SUPPORT: HRESULT = 0x80090356u32 as HRESULT;
-pub const SEC_E_CROSSREALM_DELEGATION_FAILURE: HRESULT = 0x80090357u32 as HRESULT;
-pub const SEC_E_REVOCATION_OFFLINE_KDC: HRESULT = 0x80090358u32 as HRESULT;
-pub const SEC_E_ISSUING_CA_UNTRUSTED_KDC: HRESULT = 0x80090359u32 as HRESULT;
-pub const SEC_E_KDC_CERT_EXPIRED: HRESULT = 0x8009035Au32 as HRESULT;
-pub const SEC_E_KDC_CERT_REVOKED: HRESULT = 0x8009035Bu32 as HRESULT;
-pub const SEC_I_SIGNATURE_NEEDED: HRESULT = 0x0009035C;
-pub const SEC_E_INVALID_PARAMETER: HRESULT = 0x8009035Du32 as HRESULT;
-pub const SEC_E_DELEGATION_POLICY: HRESULT = 0x8009035Eu32 as HRESULT;
-pub const SEC_E_POLICY_NLTM_ONLY: HRESULT = 0x8009035Fu32 as HRESULT;
-pub const SEC_I_NO_RENEGOTIATION: HRESULT = 0x00090360;
-pub const SEC_E_NO_CONTEXT: HRESULT = 0x80090361u32 as HRESULT;
-pub const SEC_E_PKU2U_CERT_FAILURE: HRESULT = 0x80090362u32 as HRESULT;
-pub const SEC_E_MUTUAL_AUTH_FAILED: HRESULT = 0x80090363u32 as HRESULT;
-pub const SEC_I_MESSAGE_FRAGMENT: HRESULT = 0x00090364;
-pub const SEC_E_ONLY_HTTPS_ALLOWED: HRESULT = 0x80090365u32 as HRESULT;
-pub const SEC_I_CONTINUE_NEEDED_MESSAGE_OK: HRESULT = 0x00090366;
-pub const SEC_E_APPLICATION_PROTOCOL_MISMATCH: HRESULT = 0x80090367u32 as HRESULT;
-pub const SEC_E_NO_SPM: HRESULT = SEC_E_INTERNAL_ERROR;
-pub const SEC_E_NOT_SUPPORTED: HRESULT = SEC_E_UNSUPPORTED_FUNCTION;
-pub const CRYPT_E_MSG_ERROR: HRESULT = 0x80091001u32 as HRESULT;
-pub const CRYPT_E_UNKNOWN_ALGO: HRESULT = 0x80091002u32 as HRESULT;
-pub const CRYPT_E_OID_FORMAT: HRESULT = 0x80091003u32 as HRESULT;
-pub const CRYPT_E_INVALID_MSG_TYPE: HRESULT = 0x80091004u32 as HRESULT;
-pub const CRYPT_E_UNEXPECTED_ENCODING: HRESULT = 0x80091005u32 as HRESULT;
-pub const CRYPT_E_AUTH_ATTR_MISSING: HRESULT = 0x80091006u32 as HRESULT;
-pub const CRYPT_E_HASH_VALUE: HRESULT = 0x80091007u32 as HRESULT;
-pub const CRYPT_E_INVALID_INDEX: HRESULT = 0x80091008u32 as HRESULT;
-pub const CRYPT_E_ALREADY_DECRYPTED: HRESULT = 0x80091009u32 as HRESULT;
-pub const CRYPT_E_NOT_DECRYPTED: HRESULT = 0x8009100Au32 as HRESULT;
-pub const CRYPT_E_RECIPIENT_NOT_FOUND: HRESULT = 0x8009100Bu32 as HRESULT;
-pub const CRYPT_E_CONTROL_TYPE: HRESULT = 0x8009100Cu32 as HRESULT;
-pub const CRYPT_E_ISSUER_SERIALNUMBER: HRESULT = 0x8009100Du32 as HRESULT;
-pub const CRYPT_E_SIGNER_NOT_FOUND: HRESULT = 0x8009100Eu32 as HRESULT;
-pub const CRYPT_E_ATTRIBUTES_MISSING: HRESULT = 0x8009100Fu32 as HRESULT;
-pub const CRYPT_E_STREAM_MSG_NOT_READY: HRESULT = 0x80091010u32 as HRESULT;
-pub const CRYPT_E_STREAM_INSUFFICIENT_DATA: HRESULT = 0x80091011u32 as HRESULT;
-pub const CRYPT_I_NEW_PROTECTION_REQUIRED: HRESULT = 0x00091012;
-pub const CRYPT_E_BAD_LEN: HRESULT = 0x80092001u32 as HRESULT;
-pub const CRYPT_E_BAD_ENCODE: HRESULT = 0x80092002u32 as HRESULT;
-pub const CRYPT_E_FILE_ERROR: HRESULT = 0x80092003u32 as HRESULT;
-pub const CRYPT_E_NOT_FOUND: HRESULT = 0x80092004u32 as HRESULT;
-pub const CRYPT_E_EXISTS: HRESULT = 0x80092005u32 as HRESULT;
-pub const CRYPT_E_NO_PROVIDER: HRESULT = 0x80092006u32 as HRESULT;
-pub const CRYPT_E_SELF_SIGNED: HRESULT = 0x80092007u32 as HRESULT;
-pub const CRYPT_E_DELETED_PREV: HRESULT = 0x80092008u32 as HRESULT;
-pub const CRYPT_E_NO_MATCH: HRESULT = 0x80092009u32 as HRESULT;
-pub const CRYPT_E_UNEXPECTED_MSG_TYPE: HRESULT = 0x8009200Au32 as HRESULT;
-pub const CRYPT_E_NO_KEY_PROPERTY: HRESULT = 0x8009200Bu32 as HRESULT;
-pub const CRYPT_E_NO_DECRYPT_CERT: HRESULT = 0x8009200Cu32 as HRESULT;
-pub const CRYPT_E_BAD_MSG: HRESULT = 0x8009200Du32 as HRESULT;
-pub const CRYPT_E_NO_SIGNER: HRESULT = 0x8009200Eu32 as HRESULT;
-pub const CRYPT_E_PENDING_CLOSE: HRESULT = 0x8009200Fu32 as HRESULT;
-pub const CRYPT_E_REVOKED: HRESULT = 0x80092010u32 as HRESULT;
-pub const CRYPT_E_NO_REVOCATION_DLL: HRESULT = 0x80092011u32 as HRESULT;
-pub const CRYPT_E_NO_REVOCATION_CHECK: HRESULT = 0x80092012u32 as HRESULT;
-pub const CRYPT_E_REVOCATION_OFFLINE: HRESULT = 0x80092013u32 as HRESULT;
-pub const CRYPT_E_NOT_IN_REVOCATION_DATABASE: HRESULT = 0x80092014u32 as HRESULT;
-pub const CRYPT_E_INVALID_NUMERIC_STRING: HRESULT = 0x80092020u32 as HRESULT;
-pub const CRYPT_E_INVALID_PRINTABLE_STRING: HRESULT = 0x80092021u32 as HRESULT;
-pub const CRYPT_E_INVALID_IA5_STRING: HRESULT = 0x80092022u32 as HRESULT;
-pub const CRYPT_E_INVALID_X500_STRING: HRESULT = 0x80092023u32 as HRESULT;
-pub const CRYPT_E_NOT_CHAR_STRING: HRESULT = 0x80092024u32 as HRESULT;
-pub const CRYPT_E_FILERESIZED: HRESULT = 0x80092025u32 as HRESULT;
-pub const CRYPT_E_SECURITY_SETTINGS: HRESULT = 0x80092026u32 as HRESULT;
-pub const CRYPT_E_NO_VERIFY_USAGE_DLL: HRESULT = 0x80092027u32 as HRESULT;
-pub const CRYPT_E_NO_VERIFY_USAGE_CHECK: HRESULT = 0x80092028u32 as HRESULT;
-pub const CRYPT_E_VERIFY_USAGE_OFFLINE: HRESULT = 0x80092029u32 as HRESULT;
-pub const CRYPT_E_NOT_IN_CTL: HRESULT = 0x8009202Au32 as HRESULT;
-pub const CRYPT_E_NO_TRUSTED_SIGNER: HRESULT = 0x8009202Bu32 as HRESULT;
-pub const CRYPT_E_MISSING_PUBKEY_PARA: HRESULT = 0x8009202Cu32 as HRESULT;
-pub const CRYPT_E_OBJECT_LOCATOR_OBJECT_NOT_FOUND: HRESULT = 0x8009202Du32 as HRESULT;
-pub const CRYPT_E_OSS_ERROR: HRESULT = 0x80093000u32 as HRESULT;
-pub const OSS_MORE_BUF: HRESULT = 0x80093001u32 as HRESULT;
-pub const OSS_NEGATIVE_UINTEGER: HRESULT = 0x80093002u32 as HRESULT;
-pub const OSS_PDU_RANGE: HRESULT = 0x80093003u32 as HRESULT;
-pub const OSS_MORE_INPUT: HRESULT = 0x80093004u32 as HRESULT;
-pub const OSS_DATA_ERROR: HRESULT = 0x80093005u32 as HRESULT;
-pub const OSS_BAD_ARG: HRESULT = 0x80093006u32 as HRESULT;
-pub const OSS_BAD_VERSION: HRESULT = 0x80093007u32 as HRESULT;
-pub const OSS_OUT_MEMORY: HRESULT = 0x80093008u32 as HRESULT;
-pub const OSS_PDU_MISMATCH: HRESULT = 0x80093009u32 as HRESULT;
-pub const OSS_LIMITED: HRESULT = 0x8009300Au32 as HRESULT;
-pub const OSS_BAD_PTR: HRESULT = 0x8009300Bu32 as HRESULT;
-pub const OSS_BAD_TIME: HRESULT = 0x8009300Cu32 as HRESULT;
-pub const OSS_INDEFINITE_NOT_SUPPORTED: HRESULT = 0x8009300Du32 as HRESULT;
-pub const OSS_MEM_ERROR: HRESULT = 0x8009300Eu32 as HRESULT;
-pub const OSS_BAD_TABLE: HRESULT = 0x8009300Fu32 as HRESULT;
-pub const OSS_TOO_LONG: HRESULT = 0x80093010u32 as HRESULT;
-pub const OSS_CONSTRAINT_VIOLATED: HRESULT = 0x80093011u32 as HRESULT;
-pub const OSS_FATAL_ERROR: HRESULT = 0x80093012u32 as HRESULT;
-pub const OSS_ACCESS_SERIALIZATION_ERROR: HRESULT = 0x80093013u32 as HRESULT;
-pub const OSS_NULL_TBL: HRESULT = 0x80093014u32 as HRESULT;
-pub const OSS_NULL_FCN: HRESULT = 0x80093015u32 as HRESULT;
-pub const OSS_BAD_ENCRULES: HRESULT = 0x80093016u32 as HRESULT;
-pub const OSS_UNAVAIL_ENCRULES: HRESULT = 0x80093017u32 as HRESULT;
-pub const OSS_CANT_OPEN_TRACE_WINDOW: HRESULT = 0x80093018u32 as HRESULT;
-pub const OSS_UNIMPLEMENTED: HRESULT = 0x80093019u32 as HRESULT;
-pub const OSS_OID_DLL_NOT_LINKED: HRESULT = 0x8009301Au32 as HRESULT;
-pub const OSS_CANT_OPEN_TRACE_FILE: HRESULT = 0x8009301Bu32 as HRESULT;
-pub const OSS_TRACE_FILE_ALREADY_OPEN: HRESULT = 0x8009301Cu32 as HRESULT;
-pub const OSS_TABLE_MISMATCH: HRESULT = 0x8009301Du32 as HRESULT;
-pub const OSS_TYPE_NOT_SUPPORTED: HRESULT = 0x8009301Eu32 as HRESULT;
-pub const OSS_REAL_DLL_NOT_LINKED: HRESULT = 0x8009301Fu32 as HRESULT;
-pub const OSS_REAL_CODE_NOT_LINKED: HRESULT = 0x80093020u32 as HRESULT;
-pub const OSS_OUT_OF_RANGE: HRESULT = 0x80093021u32 as HRESULT;
-pub const OSS_COPIER_DLL_NOT_LINKED: HRESULT = 0x80093022u32 as HRESULT;
-pub const OSS_CONSTRAINT_DLL_NOT_LINKED: HRESULT = 0x80093023u32 as HRESULT;
-pub const OSS_COMPARATOR_DLL_NOT_LINKED: HRESULT = 0x80093024u32 as HRESULT;
-pub const OSS_COMPARATOR_CODE_NOT_LINKED: HRESULT = 0x80093025u32 as HRESULT;
-pub const OSS_MEM_MGR_DLL_NOT_LINKED: HRESULT = 0x80093026u32 as HRESULT;
-pub const OSS_PDV_DLL_NOT_LINKED: HRESULT = 0x80093027u32 as HRESULT;
-pub const OSS_PDV_CODE_NOT_LINKED: HRESULT = 0x80093028u32 as HRESULT;
-pub const OSS_API_DLL_NOT_LINKED: HRESULT = 0x80093029u32 as HRESULT;
-pub const OSS_BERDER_DLL_NOT_LINKED: HRESULT = 0x8009302Au32 as HRESULT;
-pub const OSS_PER_DLL_NOT_LINKED: HRESULT = 0x8009302Bu32 as HRESULT;
-pub const OSS_OPEN_TYPE_ERROR: HRESULT = 0x8009302Cu32 as HRESULT;
-pub const OSS_MUTEX_NOT_CREATED: HRESULT = 0x8009302Du32 as HRESULT;
-pub const OSS_CANT_CLOSE_TRACE_FILE: HRESULT = 0x8009302Eu32 as HRESULT;
-pub const CRYPT_E_ASN1_ERROR: HRESULT = 0x80093100u32 as HRESULT;
-pub const CRYPT_E_ASN1_INTERNAL: HRESULT = 0x80093101u32 as HRESULT;
-pub const CRYPT_E_ASN1_EOD: HRESULT = 0x80093102u32 as HRESULT;
-pub const CRYPT_E_ASN1_CORRUPT: HRESULT = 0x80093103u32 as HRESULT;
-pub const CRYPT_E_ASN1_LARGE: HRESULT = 0x80093104u32 as HRESULT;
-pub const CRYPT_E_ASN1_CONSTRAINT: HRESULT = 0x80093105u32 as HRESULT;
-pub const CRYPT_E_ASN1_MEMORY: HRESULT = 0x80093106u32 as HRESULT;
-pub const CRYPT_E_ASN1_OVERFLOW: HRESULT = 0x80093107u32 as HRESULT;
-pub const CRYPT_E_ASN1_BADPDU: HRESULT = 0x80093108u32 as HRESULT;
-pub const CRYPT_E_ASN1_BADARGS: HRESULT = 0x80093109u32 as HRESULT;
-pub const CRYPT_E_ASN1_BADREAL: HRESULT = 0x8009310Au32 as HRESULT;
-pub const CRYPT_E_ASN1_BADTAG: HRESULT = 0x8009310Bu32 as HRESULT;
-pub const CRYPT_E_ASN1_CHOICE: HRESULT = 0x8009310Cu32 as HRESULT;
-pub const CRYPT_E_ASN1_RULE: HRESULT = 0x8009310Du32 as HRESULT;
-pub const CRYPT_E_ASN1_UTF8: HRESULT = 0x8009310Eu32 as HRESULT;
-pub const CRYPT_E_ASN1_PDU_TYPE: HRESULT = 0x80093133u32 as HRESULT;
-pub const CRYPT_E_ASN1_NYI: HRESULT = 0x80093134u32 as HRESULT;
-pub const CRYPT_E_ASN1_EXTENDED: HRESULT = 0x80093201u32 as HRESULT;
-pub const CRYPT_E_ASN1_NOEOD: HRESULT = 0x80093202u32 as HRESULT;
-pub const CERTSRV_E_BAD_REQUESTSUBJECT: HRESULT = 0x80094001u32 as HRESULT;
-pub const CERTSRV_E_NO_REQUEST: HRESULT = 0x80094002u32 as HRESULT;
-pub const CERTSRV_E_BAD_REQUESTSTATUS: HRESULT = 0x80094003u32 as HRESULT;
-pub const CERTSRV_E_PROPERTY_EMPTY: HRESULT = 0x80094004u32 as HRESULT;
-pub const CERTSRV_E_INVALID_CA_CERTIFICATE: HRESULT = 0x80094005u32 as HRESULT;
-pub const CERTSRV_E_SERVER_SUSPENDED: HRESULT = 0x80094006u32 as HRESULT;
-pub const CERTSRV_E_ENCODING_LENGTH: HRESULT = 0x80094007u32 as HRESULT;
-pub const CERTSRV_E_ROLECONFLICT: HRESULT = 0x80094008u32 as HRESULT;
-pub const CERTSRV_E_RESTRICTEDOFFICER: HRESULT = 0x80094009u32 as HRESULT;
-pub const CERTSRV_E_KEY_ARCHIVAL_NOT_CONFIGURED: HRESULT = 0x8009400Au32 as HRESULT;
-pub const CERTSRV_E_NO_VALID_KRA: HRESULT = 0x8009400Bu32 as HRESULT;
-pub const CERTSRV_E_BAD_REQUEST_KEY_ARCHIVAL: HRESULT = 0x8009400Cu32 as HRESULT;
-pub const CERTSRV_E_NO_CAADMIN_DEFINED: HRESULT = 0x8009400Du32 as HRESULT;
-pub const CERTSRV_E_BAD_RENEWAL_CERT_ATTRIBUTE: HRESULT = 0x8009400Eu32 as HRESULT;
-pub const CERTSRV_E_NO_DB_SESSIONS: HRESULT = 0x8009400Fu32 as HRESULT;
-pub const CERTSRV_E_ALIGNMENT_FAULT: HRESULT = 0x80094010u32 as HRESULT;
-pub const CERTSRV_E_ENROLL_DENIED: HRESULT = 0x80094011u32 as HRESULT;
-pub const CERTSRV_E_TEMPLATE_DENIED: HRESULT = 0x80094012u32 as HRESULT;
-pub const CERTSRV_E_DOWNLEVEL_DC_SSL_OR_UPGRADE: HRESULT = 0x80094013u32 as HRESULT;
-pub const CERTSRV_E_ADMIN_DENIED_REQUEST: HRESULT = 0x80094014u32 as HRESULT;
-pub const CERTSRV_E_NO_POLICY_SERVER: HRESULT = 0x80094015u32 as HRESULT;
-pub const CERTSRV_E_WEAK_SIGNATURE_OR_KEY: HRESULT = 0x80094016u32 as HRESULT;
-pub const CERTSRV_E_KEY_ATTESTATION_NOT_SUPPORTED: HRESULT = 0x80094017u32 as HRESULT;
-pub const CERTSRV_E_ENCRYPTION_CERT_REQUIRED: HRESULT = 0x80094018u32 as HRESULT;
-pub const CERTSRV_E_UNSUPPORTED_CERT_TYPE: HRESULT = 0x80094800u32 as HRESULT;
-pub const CERTSRV_E_NO_CERT_TYPE: HRESULT = 0x80094801u32 as HRESULT;
-pub const CERTSRV_E_TEMPLATE_CONFLICT: HRESULT = 0x80094802u32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_ALT_NAME_REQUIRED: HRESULT = 0x80094803u32 as HRESULT;
-pub const CERTSRV_E_ARCHIVED_KEY_REQUIRED: HRESULT = 0x80094804u32 as HRESULT;
-pub const CERTSRV_E_SMIME_REQUIRED: HRESULT = 0x80094805u32 as HRESULT;
-pub const CERTSRV_E_BAD_RENEWAL_SUBJECT: HRESULT = 0x80094806u32 as HRESULT;
-pub const CERTSRV_E_BAD_TEMPLATE_VERSION: HRESULT = 0x80094807u32 as HRESULT;
-pub const CERTSRV_E_TEMPLATE_POLICY_REQUIRED: HRESULT = 0x80094808u32 as HRESULT;
-pub const CERTSRV_E_SIGNATURE_POLICY_REQUIRED: HRESULT = 0x80094809u32 as HRESULT;
-pub const CERTSRV_E_SIGNATURE_COUNT: HRESULT = 0x8009480Au32 as HRESULT;
-pub const CERTSRV_E_SIGNATURE_REJECTED: HRESULT = 0x8009480Bu32 as HRESULT;
-pub const CERTSRV_E_ISSUANCE_POLICY_REQUIRED: HRESULT = 0x8009480Cu32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_UPN_REQUIRED: HRESULT = 0x8009480Du32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_DIRECTORY_GUID_REQUIRED: HRESULT = 0x8009480Eu32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_DNS_REQUIRED: HRESULT = 0x8009480Fu32 as HRESULT;
-pub const CERTSRV_E_ARCHIVED_KEY_UNEXPECTED: HRESULT = 0x80094810u32 as HRESULT;
-pub const CERTSRV_E_KEY_LENGTH: HRESULT = 0x80094811u32 as HRESULT;
-pub const CERTSRV_E_SUBJECT_EMAIL_REQUIRED: HRESULT = 0x80094812u32 as HRESULT;
-pub const CERTSRV_E_UNKNOWN_CERT_TYPE: HRESULT = 0x80094813u32 as HRESULT;
-pub const CERTSRV_E_CERT_TYPE_OVERLAP: HRESULT = 0x80094814u32 as HRESULT;
-pub const CERTSRV_E_TOO_MANY_SIGNATURES: HRESULT = 0x80094815u32 as HRESULT;
-pub const CERTSRV_E_RENEWAL_BAD_PUBLIC_KEY: HRESULT = 0x80094816u32 as HRESULT;
-pub const CERTSRV_E_INVALID_EK: HRESULT = 0x80094817u32 as HRESULT;
-pub const CERTSRV_E_INVALID_IDBINDING: HRESULT = 0x80094818u32 as HRESULT;
-pub const CERTSRV_E_INVALID_ATTESTATION: HRESULT = 0x80094819u32 as HRESULT;
-pub const CERTSRV_E_KEY_ATTESTATION: HRESULT = 0x8009481Au32 as HRESULT;
-pub const CERTSRV_E_CORRUPT_KEY_ATTESTATION: HRESULT = 0x8009481Bu32 as HRESULT;
-pub const CERTSRV_E_EXPIRED_CHALLENGE: HRESULT = 0x8009481Cu32 as HRESULT;
-pub const CERTSRV_E_INVALID_RESPONSE: HRESULT = 0x8009481Du32 as HRESULT;
-pub const CERTSRV_E_INVALID_REQUESTID: HRESULT = 0x8009481Eu32 as HRESULT;
-pub const XENROLL_E_KEY_NOT_EXPORTABLE: HRESULT = 0x80095000u32 as HRESULT;
-pub const XENROLL_E_CANNOT_ADD_ROOT_CERT: HRESULT = 0x80095001u32 as HRESULT;
-pub const XENROLL_E_RESPONSE_KA_HASH_NOT_FOUND: HRESULT = 0x80095002u32 as HRESULT;
-pub const XENROLL_E_RESPONSE_UNEXPECTED_KA_HASH: HRESULT = 0x80095003u32 as HRESULT;
-pub const XENROLL_E_RESPONSE_KA_HASH_MISMATCH: HRESULT = 0x80095004u32 as HRESULT;
-pub const XENROLL_E_KEYSPEC_SMIME_MISMATCH: HRESULT = 0x80095005u32 as HRESULT;
-pub const TRUST_E_SYSTEM_ERROR: HRESULT = 0x80096001u32 as HRESULT;
-pub const TRUST_E_NO_SIGNER_CERT: HRESULT = 0x80096002u32 as HRESULT;
-pub const TRUST_E_COUNTER_SIGNER: HRESULT = 0x80096003u32 as HRESULT;
-pub const TRUST_E_CERT_SIGNATURE: HRESULT = 0x80096004u32 as HRESULT;
-pub const TRUST_E_TIME_STAMP: HRESULT = 0x80096005u32 as HRESULT;
-pub const TRUST_E_BAD_DIGEST: HRESULT = 0x80096010u32 as HRESULT;
-pub const TRUST_E_BASIC_CONSTRAINTS: HRESULT = 0x80096019u32 as HRESULT;
-pub const TRUST_E_FINANCIAL_CRITERIA: HRESULT = 0x8009601Eu32 as HRESULT;
-pub const MSSIPOTF_E_OUTOFMEMRANGE: HRESULT = 0x80097001u32 as HRESULT;
-pub const MSSIPOTF_E_CANTGETOBJECT: HRESULT = 0x80097002u32 as HRESULT;
-pub const MSSIPOTF_E_NOHEADTABLE: HRESULT = 0x80097003u32 as HRESULT;
-pub const MSSIPOTF_E_BAD_MAGICNUMBER: HRESULT = 0x80097004u32 as HRESULT;
-pub const MSSIPOTF_E_BAD_OFFSET_TABLE: HRESULT = 0x80097005u32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_TAGORDER: HRESULT = 0x80097006u32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_LONGWORD: HRESULT = 0x80097007u32 as HRESULT;
-pub const MSSIPOTF_E_BAD_FIRST_TABLE_PLACEMENT: HRESULT = 0x80097008u32 as HRESULT;
-pub const MSSIPOTF_E_TABLES_OVERLAP: HRESULT = 0x80097009u32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_PADBYTES: HRESULT = 0x8009700Au32 as HRESULT;
-pub const MSSIPOTF_E_FILETOOSMALL: HRESULT = 0x8009700Bu32 as HRESULT;
-pub const MSSIPOTF_E_TABLE_CHECKSUM: HRESULT = 0x8009700Cu32 as HRESULT;
-pub const MSSIPOTF_E_FILE_CHECKSUM: HRESULT = 0x8009700Du32 as HRESULT;
-pub const MSSIPOTF_E_FAILED_POLICY: HRESULT = 0x80097010u32 as HRESULT;
-pub const MSSIPOTF_E_FAILED_HINTS_CHECK: HRESULT = 0x80097011u32 as HRESULT;
-pub const MSSIPOTF_E_NOT_OPENTYPE: HRESULT = 0x80097012u32 as HRESULT;
-pub const MSSIPOTF_E_FILE: HRESULT = 0x80097013u32 as HRESULT;
-pub const MSSIPOTF_E_CRYPT: HRESULT = 0x80097014u32 as HRESULT;
-pub const MSSIPOTF_E_BADVERSION: HRESULT = 0x80097015u32 as HRESULT;
-pub const MSSIPOTF_E_DSIG_STRUCTURE: HRESULT = 0x80097016u32 as HRESULT;
-pub const MSSIPOTF_E_PCONST_CHECK: HRESULT = 0x80097017u32 as HRESULT;
-pub const MSSIPOTF_E_STRUCTURE: HRESULT = 0x80097018u32 as HRESULT;
-pub const ERROR_CRED_REQUIRES_CONFIRMATION: HRESULT = 0x80097019u32 as HRESULT;
-pub const NTE_OP_OK: HRESULT = 0;
-pub const TRUST_E_PROVIDER_UNKNOWN: HRESULT = 0x800B0001u32 as HRESULT;
-pub const TRUST_E_ACTION_UNKNOWN: HRESULT = 0x800B0002u32 as HRESULT;
-pub const TRUST_E_SUBJECT_FORM_UNKNOWN: HRESULT = 0x800B0003u32 as HRESULT;
-pub const TRUST_E_SUBJECT_NOT_TRUSTED: HRESULT = 0x800B0004u32 as HRESULT;
-pub const DIGSIG_E_ENCODE: HRESULT = 0x800B0005u32 as HRESULT;
-pub const DIGSIG_E_DECODE: HRESULT = 0x800B0006u32 as HRESULT;
-pub const DIGSIG_E_EXTENSIBILITY: HRESULT = 0x800B0007u32 as HRESULT;
-pub const DIGSIG_E_CRYPTO: HRESULT = 0x800B0008u32 as HRESULT;
-pub const PERSIST_E_SIZEDEFINITE: HRESULT = 0x800B0009u32 as HRESULT;
-pub const PERSIST_E_SIZEINDEFINITE: HRESULT = 0x800B000Au32 as HRESULT;
-pub const PERSIST_E_NOTSELFSIZING: HRESULT = 0x800B000Bu32 as HRESULT;
-pub const TRUST_E_NOSIGNATURE: HRESULT = 0x800B0100u32 as HRESULT;
-pub const CERT_E_EXPIRED: HRESULT = 0x800B0101u32 as HRESULT;
-pub const CERT_E_VALIDITYPERIODNESTING: HRESULT = 0x800B0102u32 as HRESULT;
-pub const CERT_E_ROLE: HRESULT = 0x800B0103u32 as HRESULT;
-pub const CERT_E_PATHLENCONST: HRESULT = 0x800B0104u32 as HRESULT;
-pub const CERT_E_CRITICAL: HRESULT = 0x800B0105u32 as HRESULT;
-pub const CERT_E_PURPOSE: HRESULT = 0x800B0106u32 as HRESULT;
-pub const CERT_E_ISSUERCHAINING: HRESULT = 0x800B0107u32 as HRESULT;
-pub const CERT_E_MALFORMED: HRESULT = 0x800B0108u32 as HRESULT;
-pub const CERT_E_UNTRUSTEDROOT: HRESULT = 0x800B0109u32 as HRESULT;
-pub const CERT_E_CHAINING: HRESULT = 0x800B010Au32 as HRESULT;
-pub const TRUST_E_FAIL: HRESULT = 0x800B010Bu32 as HRESULT;
-pub const CERT_E_REVOKED: HRESULT = 0x800B010Cu32 as HRESULT;
-pub const CERT_E_UNTRUSTEDTESTROOT: HRESULT = 0x800B010Du32 as HRESULT;
-pub const CERT_E_REVOCATION_FAILURE: HRESULT = 0x800B010Eu32 as HRESULT;
-pub const CERT_E_CN_NO_MATCH: HRESULT = 0x800B010Fu32 as HRESULT;
-pub const CERT_E_WRONG_USAGE: HRESULT = 0x800B0110u32 as HRESULT;
-pub const TRUST_E_EXPLICIT_DISTRUST: HRESULT = 0x800B0111u32 as HRESULT;
-pub const CERT_E_UNTRUSTEDCA: HRESULT = 0x800B0112u32 as HRESULT;
-pub const CERT_E_INVALID_POLICY: HRESULT = 0x800B0113u32 as HRESULT;
-pub const CERT_E_INVALID_NAME: HRESULT = 0x800B0114u32 as HRESULT;
-pub const SPAPI_E_EXPECTED_SECTION_NAME: HRESULT = 0x800F0000u32 as HRESULT;
-pub const SPAPI_E_BAD_SECTION_NAME_LINE: HRESULT = 0x800F0001u32 as HRESULT;
-pub const SPAPI_E_SECTION_NAME_TOO_LONG: HRESULT = 0x800F0002u32 as HRESULT;
-pub const SPAPI_E_GENERAL_SYNTAX: HRESULT = 0x800F0003u32 as HRESULT;
-pub const SPAPI_E_WRONG_INF_STYLE: HRESULT = 0x800F0100u32 as HRESULT;
-pub const SPAPI_E_SECTION_NOT_FOUND: HRESULT = 0x800F0101u32 as HRESULT;
-pub const SPAPI_E_LINE_NOT_FOUND: HRESULT = 0x800F0102u32 as HRESULT;
-pub const SPAPI_E_NO_BACKUP: HRESULT = 0x800F0103u32 as HRESULT;
-pub const SPAPI_E_NO_ASSOCIATED_CLASS: HRESULT = 0x800F0200u32 as HRESULT;
-pub const SPAPI_E_CLASS_MISMATCH: HRESULT = 0x800F0201u32 as HRESULT;
-pub const SPAPI_E_DUPLICATE_FOUND: HRESULT = 0x800F0202u32 as HRESULT;
-pub const SPAPI_E_NO_DRIVER_SELECTED: HRESULT = 0x800F0203u32 as HRESULT;
-pub const SPAPI_E_KEY_DOES_NOT_EXIST: HRESULT = 0x800F0204u32 as HRESULT;
-pub const SPAPI_E_INVALID_DEVINST_NAME: HRESULT = 0x800F0205u32 as HRESULT;
-pub const SPAPI_E_INVALID_CLASS: HRESULT = 0x800F0206u32 as HRESULT;
-pub const SPAPI_E_DEVINST_ALREADY_EXISTS: HRESULT = 0x800F0207u32 as HRESULT;
-pub const SPAPI_E_DEVINFO_NOT_REGISTERED: HRESULT = 0x800F0208u32 as HRESULT;
-pub const SPAPI_E_INVALID_REG_PROPERTY: HRESULT = 0x800F0209u32 as HRESULT;
-pub const SPAPI_E_NO_INF: HRESULT = 0x800F020Au32 as HRESULT;
-pub const SPAPI_E_NO_SUCH_DEVINST: HRESULT = 0x800F020Bu32 as HRESULT;
-pub const SPAPI_E_CANT_LOAD_CLASS_ICON: HRESULT = 0x800F020Cu32 as HRESULT;
-pub const SPAPI_E_INVALID_CLASS_INSTALLER: HRESULT = 0x800F020Du32 as HRESULT;
-pub const SPAPI_E_DI_DO_DEFAULT: HRESULT = 0x800F020Eu32 as HRESULT;
-pub const SPAPI_E_DI_NOFILECOPY: HRESULT = 0x800F020Fu32 as HRESULT;
-pub const SPAPI_E_INVALID_HWPROFILE: HRESULT = 0x800F0210u32 as HRESULT;
-pub const SPAPI_E_NO_DEVICE_SELECTED: HRESULT = 0x800F0211u32 as HRESULT;
-pub const SPAPI_E_DEVINFO_LIST_LOCKED: HRESULT = 0x800F0212u32 as HRESULT;
-pub const SPAPI_E_DEVINFO_DATA_LOCKED: HRESULT = 0x800F0213u32 as HRESULT;
-pub const SPAPI_E_DI_BAD_PATH: HRESULT = 0x800F0214u32 as HRESULT;
-pub const SPAPI_E_NO_CLASSINSTALL_PARAMS: HRESULT = 0x800F0215u32 as HRESULT;
-pub const SPAPI_E_FILEQUEUE_LOCKED: HRESULT = 0x800F0216u32 as HRESULT;
-pub const SPAPI_E_BAD_SERVICE_INSTALLSECT: HRESULT = 0x800F0217u32 as HRESULT;
-pub const SPAPI_E_NO_CLASS_DRIVER_LIST: HRESULT = 0x800F0218u32 as HRESULT;
-pub const SPAPI_E_NO_ASSOCIATED_SERVICE: HRESULT = 0x800F0219u32 as HRESULT;
-pub const SPAPI_E_NO_DEFAULT_DEVICE_INTERFACE: HRESULT = 0x800F021Au32 as HRESULT;
-pub const SPAPI_E_DEVICE_INTERFACE_ACTIVE: HRESULT = 0x800F021Bu32 as HRESULT;
-pub const SPAPI_E_DEVICE_INTERFACE_REMOVED: HRESULT = 0x800F021Cu32 as HRESULT;
-pub const SPAPI_E_BAD_INTERFACE_INSTALLSECT: HRESULT = 0x800F021Du32 as HRESULT;
-pub const SPAPI_E_NO_SUCH_INTERFACE_CLASS: HRESULT = 0x800F021Eu32 as HRESULT;
-pub const SPAPI_E_INVALID_REFERENCE_STRING: HRESULT = 0x800F021Fu32 as HRESULT;
-pub const SPAPI_E_INVALID_MACHINENAME: HRESULT = 0x800F0220u32 as HRESULT;
-pub const SPAPI_E_REMOTE_COMM_FAILURE: HRESULT = 0x800F0221u32 as HRESULT;
-pub const SPAPI_E_MACHINE_UNAVAILABLE: HRESULT = 0x800F0222u32 as HRESULT;
-pub const SPAPI_E_NO_CONFIGMGR_SERVICES: HRESULT = 0x800F0223u32 as HRESULT;
-pub const SPAPI_E_INVALID_PROPPAGE_PROVIDER: HRESULT = 0x800F0224u32 as HRESULT;
-pub const SPAPI_E_NO_SUCH_DEVICE_INTERFACE: HRESULT = 0x800F0225u32 as HRESULT;
-pub const SPAPI_E_DI_POSTPROCESSING_REQUIRED: HRESULT = 0x800F0226u32 as HRESULT;
-pub const SPAPI_E_INVALID_COINSTALLER: HRESULT = 0x800F0227u32 as HRESULT;
-pub const SPAPI_E_NO_COMPAT_DRIVERS: HRESULT = 0x800F0228u32 as HRESULT;
-pub const SPAPI_E_NO_DEVICE_ICON: HRESULT = 0x800F0229u32 as HRESULT;
-pub const SPAPI_E_INVALID_INF_LOGCONFIG: HRESULT = 0x800F022Au32 as HRESULT;
-pub const SPAPI_E_DI_DONT_INSTALL: HRESULT = 0x800F022Bu32 as HRESULT;
-pub const SPAPI_E_INVALID_FILTER_DRIVER: HRESULT = 0x800F022Cu32 as HRESULT;
-pub const SPAPI_E_NON_WINDOWS_NT_DRIVER: HRESULT = 0x800F022Du32 as HRESULT;
-pub const SPAPI_E_NON_WINDOWS_DRIVER: HRESULT = 0x800F022Eu32 as HRESULT;
-pub const SPAPI_E_NO_CATALOG_FOR_OEM_INF: HRESULT = 0x800F022Fu32 as HRESULT;
-pub const SPAPI_E_DEVINSTALL_QUEUE_NONNATIVE: HRESULT = 0x800F0230u32 as HRESULT;
-pub const SPAPI_E_NOT_DISABLEABLE: HRESULT = 0x800F0231u32 as HRESULT;
-pub const SPAPI_E_CANT_REMOVE_DEVINST: HRESULT = 0x800F0232u32 as HRESULT;
-pub const SPAPI_E_INVALID_TARGET: HRESULT = 0x800F0233u32 as HRESULT;
-pub const SPAPI_E_DRIVER_NONNATIVE: HRESULT = 0x800F0234u32 as HRESULT;
-pub const SPAPI_E_IN_WOW64: HRESULT = 0x800F0235u32 as HRESULT;
-pub const SPAPI_E_SET_SYSTEM_RESTORE_POINT: HRESULT = 0x800F0236u32 as HRESULT;
-pub const SPAPI_E_INCORRECTLY_COPIED_INF: HRESULT = 0x800F0237u32 as HRESULT;
-pub const SPAPI_E_SCE_DISABLED: HRESULT = 0x800F0238u32 as HRESULT;
-pub const SPAPI_E_UNKNOWN_EXCEPTION: HRESULT = 0x800F0239u32 as HRESULT;
-pub const SPAPI_E_PNP_REGISTRY_ERROR: HRESULT = 0x800F023Au32 as HRESULT;
-pub const SPAPI_E_REMOTE_REQUEST_UNSUPPORTED: HRESULT = 0x800F023Bu32 as HRESULT;
-pub const SPAPI_E_NOT_AN_INSTALLED_OEM_INF: HRESULT = 0x800F023Cu32 as HRESULT;
-pub const SPAPI_E_INF_IN_USE_BY_DEVICES: HRESULT = 0x800F023Du32 as HRESULT;
-pub const SPAPI_E_DI_FUNCTION_OBSOLETE: HRESULT = 0x800F023Eu32 as HRESULT;
-pub const SPAPI_E_NO_AUTHENTICODE_CATALOG: HRESULT = 0x800F023Fu32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_DISALLOWED: HRESULT = 0x800F0240u32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_TRUSTED_PUBLISHER: HRESULT = 0x800F0241u32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_TRUST_NOT_ESTABLISHED: HRESULT = 0x800F0242u32 as HRESULT;
-pub const SPAPI_E_AUTHENTICODE_PUBLISHER_NOT_TRUSTED: HRESULT = 0x800F0243u32 as HRESULT;
-pub const SPAPI_E_SIGNATURE_OSATTRIBUTE_MISMATCH: HRESULT = 0x800F0244u32 as HRESULT;
-pub const SPAPI_E_ONLY_VALIDATE_VIA_AUTHENTICODE: HRESULT = 0x800F0245u32 as HRESULT;
-pub const SPAPI_E_DEVICE_INSTALLER_NOT_READY: HRESULT = 0x800F0246u32 as HRESULT;
-pub const SPAPI_E_DRIVER_STORE_ADD_FAILED: HRESULT = 0x800F0247u32 as HRESULT;
-pub const SPAPI_E_DEVICE_INSTALL_BLOCKED: HRESULT = 0x800F0248u32 as HRESULT;
-pub const SPAPI_E_DRIVER_INSTALL_BLOCKED: HRESULT = 0x800F0249u32 as HRESULT;
-pub const SPAPI_E_WRONG_INF_TYPE: HRESULT = 0x800F024Au32 as HRESULT;
-pub const SPAPI_E_FILE_HASH_NOT_IN_CATALOG: HRESULT = 0x800F024Bu32 as HRESULT;
-pub const SPAPI_E_DRIVER_STORE_DELETE_FAILED: HRESULT = 0x800F024Cu32 as HRESULT;
-pub const SPAPI_E_UNRECOVERABLE_STACK_OVERFLOW: HRESULT = 0x800F0300u32 as HRESULT;
-pub const SPAPI_E_ERROR_NOT_INSTALLED: HRESULT = 0x800F1000u32 as HRESULT;
-pub const SCARD_S_SUCCESS: HRESULT = NO_ERROR as HRESULT;
-pub const SCARD_F_INTERNAL_ERROR: HRESULT = 0x80100001u32 as HRESULT;
-pub const SCARD_E_CANCELLED: HRESULT = 0x80100002u32 as HRESULT;
-pub const SCARD_E_INVALID_HANDLE: HRESULT = 0x80100003u32 as HRESULT;
-pub const SCARD_E_INVALID_PARAMETER: HRESULT = 0x80100004u32 as HRESULT;
-pub const SCARD_E_INVALID_TARGET: HRESULT = 0x80100005u32 as HRESULT;
-pub const SCARD_E_NO_MEMORY: HRESULT = 0x80100006u32 as HRESULT;
-pub const SCARD_F_WAITED_TOO_LONG: HRESULT = 0x80100007u32 as HRESULT;
-pub const SCARD_E_INSUFFICIENT_BUFFER: HRESULT = 0x80100008u32 as HRESULT;
-pub const SCARD_E_UNKNOWN_READER: HRESULT = 0x80100009u32 as HRESULT;
-pub const SCARD_E_TIMEOUT: HRESULT = 0x8010000Au32 as HRESULT;
-pub const SCARD_E_SHARING_VIOLATION: HRESULT = 0x8010000Bu32 as HRESULT;
-pub const SCARD_E_NO_SMARTCARD: HRESULT = 0x8010000Cu32 as HRESULT;
-pub const SCARD_E_UNKNOWN_CARD: HRESULT = 0x8010000Du32 as HRESULT;
-pub const SCARD_E_CANT_DISPOSE: HRESULT = 0x8010000Eu32 as HRESULT;
-pub const SCARD_E_PROTO_MISMATCH: HRESULT = 0x8010000Fu32 as HRESULT;
-pub const SCARD_E_NOT_READY: HRESULT = 0x80100010u32 as HRESULT;
-pub const SCARD_E_INVALID_VALUE: HRESULT = 0x80100011u32 as HRESULT;
-pub const SCARD_E_SYSTEM_CANCELLED: HRESULT = 0x80100012u32 as HRESULT;
-pub const SCARD_F_COMM_ERROR: HRESULT = 0x80100013u32 as HRESULT;
-pub const SCARD_F_UNKNOWN_ERROR: HRESULT = 0x80100014u32 as HRESULT;
-pub const SCARD_E_INVALID_ATR: HRESULT = 0x80100015u32 as HRESULT;
-pub const SCARD_E_NOT_TRANSACTED: HRESULT = 0x80100016u32 as HRESULT;
-pub const SCARD_E_READER_UNAVAILABLE: HRESULT = 0x80100017u32 as HRESULT;
-pub const SCARD_P_SHUTDOWN: HRESULT = 0x80100018u32 as HRESULT;
-pub const SCARD_E_PCI_TOO_SMALL: HRESULT = 0x80100019u32 as HRESULT;
-pub const SCARD_E_READER_UNSUPPORTED: HRESULT = 0x8010001Au32 as HRESULT;
-pub const SCARD_E_DUPLICATE_READER: HRESULT = 0x8010001Bu32 as HRESULT;
-pub const SCARD_E_CARD_UNSUPPORTED: HRESULT = 0x8010001Cu32 as HRESULT;
-pub const SCARD_E_NO_SERVICE: HRESULT = 0x8010001Du32 as HRESULT;
-pub const SCARD_E_SERVICE_STOPPED: HRESULT = 0x8010001Eu32 as HRESULT;
-pub const SCARD_E_UNEXPECTED: HRESULT = 0x8010001Fu32 as HRESULT;
-pub const SCARD_E_ICC_INSTALLATION: HRESULT = 0x80100020u32 as HRESULT;
-pub const SCARD_E_ICC_CREATEORDER: HRESULT = 0x80100021u32 as HRESULT;
-pub const SCARD_E_UNSUPPORTED_FEATURE: HRESULT = 0x80100022u32 as HRESULT;
-pub const SCARD_E_DIR_NOT_FOUND: HRESULT = 0x80100023u32 as HRESULT;
-pub const SCARD_E_FILE_NOT_FOUND: HRESULT = 0x80100024u32 as HRESULT;
-pub const SCARD_E_NO_DIR: HRESULT = 0x80100025u32 as HRESULT;
-pub const SCARD_E_NO_FILE: HRESULT = 0x80100026u32 as HRESULT;
-pub const SCARD_E_NO_ACCESS: HRESULT = 0x80100027u32 as HRESULT;
-pub const SCARD_E_WRITE_TOO_MANY: HRESULT = 0x80100028u32 as HRESULT;
-pub const SCARD_E_BAD_SEEK: HRESULT = 0x80100029u32 as HRESULT;
-pub const SCARD_E_INVALID_CHV: HRESULT = 0x8010002Au32 as HRESULT;
-pub const SCARD_E_UNKNOWN_RES_MNG: HRESULT = 0x8010002Bu32 as HRESULT;
-pub const SCARD_E_NO_SUCH_CERTIFICATE: HRESULT = 0x8010002Cu32 as HRESULT;
-pub const SCARD_E_CERTIFICATE_UNAVAILABLE: HRESULT = 0x8010002Du32 as HRESULT;
-pub const SCARD_E_NO_READERS_AVAILABLE: HRESULT = 0x8010002Eu32 as HRESULT;
-pub const SCARD_E_COMM_DATA_LOST: HRESULT = 0x8010002Fu32 as HRESULT;
-pub const SCARD_E_NO_KEY_CONTAINER: HRESULT = 0x80100030u32 as HRESULT;
-pub const SCARD_E_SERVER_TOO_BUSY: HRESULT = 0x80100031u32 as HRESULT;
-pub const SCARD_E_PIN_CACHE_EXPIRED: HRESULT = 0x80100032u32 as HRESULT;
-pub const SCARD_E_NO_PIN_CACHE: HRESULT = 0x80100033u32 as HRESULT;
-pub const SCARD_E_READ_ONLY_CARD: HRESULT = 0x80100034u32 as HRESULT;
-pub const SCARD_W_UNSUPPORTED_CARD: HRESULT = 0x80100065u32 as HRESULT;
-pub const SCARD_W_UNRESPONSIVE_CARD: HRESULT = 0x80100066u32 as HRESULT;
-pub const SCARD_W_UNPOWERED_CARD: HRESULT = 0x80100067u32 as HRESULT;
-pub const SCARD_W_RESET_CARD: HRESULT = 0x80100068u32 as HRESULT;
-pub const SCARD_W_REMOVED_CARD: HRESULT = 0x80100069u32 as HRESULT;
-pub const SCARD_W_SECURITY_VIOLATION: HRESULT = 0x8010006Au32 as HRESULT;
-pub const SCARD_W_WRONG_CHV: HRESULT = 0x8010006Bu32 as HRESULT;
-pub const SCARD_W_CHV_BLOCKED: HRESULT = 0x8010006Cu32 as HRESULT;
-pub const SCARD_W_EOF: HRESULT = 0x8010006Du32 as HRESULT;
-pub const SCARD_W_CANCELLED_BY_USER: HRESULT = 0x8010006Eu32 as HRESULT;
-pub const SCARD_W_CARD_NOT_AUTHENTICATED: HRESULT = 0x8010006Fu32 as HRESULT;
-pub const SCARD_W_CACHE_ITEM_NOT_FOUND: HRESULT = 0x80100070u32 as HRESULT;
-pub const SCARD_W_CACHE_ITEM_STALE: HRESULT = 0x80100071u32 as HRESULT;
-pub const SCARD_W_CACHE_ITEM_TOO_BIG: HRESULT = 0x80100072u32 as HRESULT;
-pub const COMADMIN_E_OBJECTERRORS: HRESULT = 0x80110401u32 as HRESULT;
-pub const COMADMIN_E_OBJECTINVALID: HRESULT = 0x80110402u32 as HRESULT;
-pub const COMADMIN_E_KEYMISSING: HRESULT = 0x80110403u32 as HRESULT;
-pub const COMADMIN_E_ALREADYINSTALLED: HRESULT = 0x80110404u32 as HRESULT;
-pub const COMADMIN_E_APP_FILE_WRITEFAIL: HRESULT = 0x80110407u32 as HRESULT;
-pub const COMADMIN_E_APP_FILE_READFAIL: HRESULT = 0x80110408u32 as HRESULT;
-pub const COMADMIN_E_APP_FILE_VERSION: HRESULT = 0x80110409u32 as HRESULT;
-pub const COMADMIN_E_BADPATH: HRESULT = 0x8011040Au32 as HRESULT;
-pub const COMADMIN_E_APPLICATIONEXISTS: HRESULT = 0x8011040Bu32 as HRESULT;
-pub const COMADMIN_E_ROLEEXISTS: HRESULT = 0x8011040Cu32 as HRESULT;
-pub const COMADMIN_E_CANTCOPYFILE: HRESULT = 0x8011040Du32 as HRESULT;
-pub const COMADMIN_E_NOUSER: HRESULT = 0x8011040Fu32 as HRESULT;
-pub const COMADMIN_E_INVALIDUSERIDS: HRESULT = 0x80110410u32 as HRESULT;
-pub const COMADMIN_E_NOREGISTRYCLSID: HRESULT = 0x80110411u32 as HRESULT;
-pub const COMADMIN_E_BADREGISTRYPROGID: HRESULT = 0x80110412u32 as HRESULT;
-pub const COMADMIN_E_AUTHENTICATIONLEVEL: HRESULT = 0x80110413u32 as HRESULT;
-pub const COMADMIN_E_USERPASSWDNOTVALID: HRESULT = 0x80110414u32 as HRESULT;
-pub const COMADMIN_E_CLSIDORIIDMISMATCH: HRESULT = 0x80110418u32 as HRESULT;
-pub const COMADMIN_E_REMOTEINTERFACE: HRESULT = 0x80110419u32 as HRESULT;
-pub const COMADMIN_E_DLLREGISTERSERVER: HRESULT = 0x8011041Au32 as HRESULT;
-pub const COMADMIN_E_NOSERVERSHARE: HRESULT = 0x8011041Bu32 as HRESULT;
-pub const COMADMIN_E_DLLLOADFAILED: HRESULT = 0x8011041Du32 as HRESULT;
-pub const COMADMIN_E_BADREGISTRYLIBID: HRESULT = 0x8011041Eu32 as HRESULT;
-pub const COMADMIN_E_APPDIRNOTFOUND: HRESULT = 0x8011041Fu32 as HRESULT;
-pub const COMADMIN_E_REGISTRARFAILED: HRESULT = 0x80110423u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_DOESNOTEXIST: HRESULT = 0x80110424u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_LOADDLLFAIL: HRESULT = 0x80110425u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_GETCLASSOBJ: HRESULT = 0x80110426u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_CLASSNOTAVAIL: HRESULT = 0x80110427u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_BADTLB: HRESULT = 0x80110428u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_NOTINSTALLABLE: HRESULT = 0x80110429u32 as HRESULT;
-pub const COMADMIN_E_NOTCHANGEABLE: HRESULT = 0x8011042Au32 as HRESULT;
-pub const COMADMIN_E_NOTDELETEABLE: HRESULT = 0x8011042Bu32 as HRESULT;
-pub const COMADMIN_E_SESSION: HRESULT = 0x8011042Cu32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_LOCKED: HRESULT = 0x8011042Du32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_BAD_DEST: HRESULT = 0x8011042Eu32 as HRESULT;
-pub const COMADMIN_E_REGISTERTLB: HRESULT = 0x80110430u32 as HRESULT;
-pub const COMADMIN_E_SYSTEMAPP: HRESULT = 0x80110433u32 as HRESULT;
-pub const COMADMIN_E_COMPFILE_NOREGISTRAR: HRESULT = 0x80110434u32 as HRESULT;
-pub const COMADMIN_E_COREQCOMPINSTALLED: HRESULT = 0x80110435u32 as HRESULT;
-pub const COMADMIN_E_SERVICENOTINSTALLED: HRESULT = 0x80110436u32 as HRESULT;
-pub const COMADMIN_E_PROPERTYSAVEFAILED: HRESULT = 0x80110437u32 as HRESULT;
-pub const COMADMIN_E_OBJECTEXISTS: HRESULT = 0x80110438u32 as HRESULT;
-pub const COMADMIN_E_COMPONENTEXISTS: HRESULT = 0x80110439u32 as HRESULT;
-pub const COMADMIN_E_REGFILE_CORRUPT: HRESULT = 0x8011043Bu32 as HRESULT;
-pub const COMADMIN_E_PROPERTY_OVERFLOW: HRESULT = 0x8011043Cu32 as HRESULT;
-pub const COMADMIN_E_NOTINREGISTRY: HRESULT = 0x8011043Eu32 as HRESULT;
-pub const COMADMIN_E_OBJECTNOTPOOLABLE: HRESULT = 0x8011043Fu32 as HRESULT;
-pub const COMADMIN_E_APPLID_MATCHES_CLSID: HRESULT = 0x80110446u32 as HRESULT;
-pub const COMADMIN_E_ROLE_DOES_NOT_EXIST: HRESULT = 0x80110447u32 as HRESULT;
-pub const COMADMIN_E_START_APP_NEEDS_COMPONENTS: HRESULT = 0x80110448u32 as HRESULT;
-pub const COMADMIN_E_REQUIRES_DIFFERENT_PLATFORM: HRESULT = 0x80110449u32 as HRESULT;
-pub const COMADMIN_E_CAN_NOT_EXPORT_APP_PROXY: HRESULT = 0x8011044Au32 as HRESULT;
-pub const COMADMIN_E_CAN_NOT_START_APP: HRESULT = 0x8011044Bu32 as HRESULT;
-pub const COMADMIN_E_CAN_NOT_EXPORT_SYS_APP: HRESULT = 0x8011044Cu32 as HRESULT;
-pub const COMADMIN_E_CANT_SUBSCRIBE_TO_COMPONENT: HRESULT = 0x8011044Du32 as HRESULT;
-pub const COMADMIN_E_EVENTCLASS_CANT_BE_SUBSCRIBER: HRESULT = 0x8011044Eu32 as HRESULT;
-pub const COMADMIN_E_LIB_APP_PROXY_INCOMPATIBLE: HRESULT = 0x8011044Fu32 as HRESULT;
-pub const COMADMIN_E_BASE_PARTITION_ONLY: HRESULT = 0x80110450u32 as HRESULT;
-pub const COMADMIN_E_START_APP_DISABLED: HRESULT = 0x80110451u32 as HRESULT;
-pub const COMADMIN_E_CAT_DUPLICATE_PARTITION_NAME: HRESULT = 0x80110457u32 as HRESULT;
-pub const COMADMIN_E_CAT_INVALID_PARTITION_NAME: HRESULT = 0x80110458u32 as HRESULT;
-pub const COMADMIN_E_CAT_PARTITION_IN_USE: HRESULT = 0x80110459u32 as HRESULT;
-pub const COMADMIN_E_FILE_PARTITION_DUPLICATE_FILES: HRESULT = 0x8011045Au32 as HRESULT;
-pub const COMADMIN_E_CAT_IMPORTED_COMPONENTS_NOT_ALLOWED: HRESULT = 0x8011045Bu32 as HRESULT;
-pub const COMADMIN_E_AMBIGUOUS_APPLICATION_NAME: HRESULT = 0x8011045Cu32 as HRESULT;
-pub const COMADMIN_E_AMBIGUOUS_PARTITION_NAME: HRESULT = 0x8011045Du32 as HRESULT;
-pub const COMADMIN_E_REGDB_NOTINITIALIZED: HRESULT = 0x80110472u32 as HRESULT;
-pub const COMADMIN_E_REGDB_NOTOPEN: HRESULT = 0x80110473u32 as HRESULT;
-pub const COMADMIN_E_REGDB_SYSTEMERR: HRESULT = 0x80110474u32 as HRESULT;
-pub const COMADMIN_E_REGDB_ALREADYRUNNING: HRESULT = 0x80110475u32 as HRESULT;
-pub const COMADMIN_E_MIG_VERSIONNOTSUPPORTED: HRESULT = 0x80110480u32 as HRESULT;
-pub const COMADMIN_E_MIG_SCHEMANOTFOUND: HRESULT = 0x80110481u32 as HRESULT;
-pub const COMADMIN_E_CAT_BITNESSMISMATCH: HRESULT = 0x80110482u32 as HRESULT;
-pub const COMADMIN_E_CAT_UNACCEPTABLEBITNESS: HRESULT = 0x80110483u32 as HRESULT;
-pub const COMADMIN_E_CAT_WRONGAPPBITNESS: HRESULT = 0x80110484u32 as HRESULT;
-pub const COMADMIN_E_CAT_PAUSE_RESUME_NOT_SUPPORTED: HRESULT = 0x80110485u32 as HRESULT;
-pub const COMADMIN_E_CAT_SERVERFAULT: HRESULT = 0x80110486u32 as HRESULT;
-pub const COMQC_E_APPLICATION_NOT_QUEUED: HRESULT = 0x80110600u32 as HRESULT;
-pub const COMQC_E_NO_QUEUEABLE_INTERFACES: HRESULT = 0x80110601u32 as HRESULT;
-pub const COMQC_E_QUEUING_SERVICE_NOT_AVAILABLE: HRESULT = 0x80110602u32 as HRESULT;
-pub const COMQC_E_NO_IPERSISTSTREAM: HRESULT = 0x80110603u32 as HRESULT;
-pub const COMQC_E_BAD_MESSAGE: HRESULT = 0x80110604u32 as HRESULT;
-pub const COMQC_E_UNAUTHENTICATED: HRESULT = 0x80110605u32 as HRESULT;
-pub const COMQC_E_UNTRUSTED_ENQUEUER: HRESULT = 0x80110606u32 as HRESULT;
-pub const MSDTC_E_DUPLICATE_RESOURCE: HRESULT = 0x80110701u32 as HRESULT;
-pub const COMADMIN_E_OBJECT_PARENT_MISSING: HRESULT = 0x80110808u32 as HRESULT;
-pub const COMADMIN_E_OBJECT_DOES_NOT_EXIST: HRESULT = 0x80110809u32 as HRESULT;
-pub const COMADMIN_E_APP_NOT_RUNNING: HRESULT = 0x8011080Au32 as HRESULT;
-pub const COMADMIN_E_INVALID_PARTITION: HRESULT = 0x8011080Bu32 as HRESULT;
-pub const COMADMIN_E_SVCAPP_NOT_POOLABLE_OR_RECYCLABLE: HRESULT = 0x8011080Du32 as HRESULT;
-pub const COMADMIN_E_USER_IN_SET: HRESULT = 0x8011080Eu32 as HRESULT;
-pub const COMADMIN_E_CANTRECYCLELIBRARYAPPS: HRESULT = 0x8011080Fu32 as HRESULT;
-pub const COMADMIN_E_CANTRECYCLESERVICEAPPS: HRESULT = 0x80110811u32 as HRESULT;
-pub const COMADMIN_E_PROCESSALREADYRECYCLED: HRESULT = 0x80110812u32 as HRESULT;
-pub const COMADMIN_E_PAUSEDPROCESSMAYNOTBERECYCLED: HRESULT = 0x80110813u32 as HRESULT;
-pub const COMADMIN_E_CANTMAKEINPROCSERVICE: HRESULT = 0x80110814u32 as HRESULT;
-pub const COMADMIN_E_PROGIDINUSEBYCLSID: HRESULT = 0x80110815u32 as HRESULT;
-pub const COMADMIN_E_DEFAULT_PARTITION_NOT_IN_SET: HRESULT = 0x80110816u32 as HRESULT;
-pub const COMADMIN_E_RECYCLEDPROCESSMAYNOTBEPAUSED: HRESULT = 0x80110817u32 as HRESULT;
-pub const COMADMIN_E_PARTITION_ACCESSDENIED: HRESULT = 0x80110818u32 as HRESULT;
-pub const COMADMIN_E_PARTITION_MSI_ONLY: HRESULT = 0x80110819u32 as HRESULT;
-pub const COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_1_0_FORMAT: HRESULT = 0x8011081Au32 as HRESULT;
-pub const COMADMIN_E_LEGACYCOMPS_NOT_ALLOWED_IN_NONBASE_PARTITIONS: HRESULT = 0x8011081Bu32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_SOURCE: HRESULT = 0x8011081Cu32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_DEST: HRESULT = 0x8011081Du32 as HRESULT;
-pub const COMADMIN_E_COMP_MOVE_PRIVATE: HRESULT = 0x8011081Eu32 as HRESULT;
-pub const COMADMIN_E_BASEPARTITION_REQUIRED_IN_SET: HRESULT = 0x8011081Fu32 as HRESULT;
-pub const COMADMIN_E_CANNOT_ALIAS_EVENTCLASS: HRESULT = 0x80110820u32 as HRESULT;
-pub const COMADMIN_E_PRIVATE_ACCESSDENIED: HRESULT = 0x80110821u32 as HRESULT;
-pub const COMADMIN_E_SAFERINVALID: HRESULT = 0x80110822u32 as HRESULT;
-pub const COMADMIN_E_REGISTRY_ACCESSDENIED: HRESULT = 0x80110823u32 as HRESULT;
-pub const COMADMIN_E_PARTITIONS_DISABLED: HRESULT = 0x80110824u32 as HRESULT;
-pub const WER_S_REPORT_DEBUG: HRESULT = 0x001B0000;
-pub const WER_S_REPORT_UPLOADED: HRESULT = 0x001B0001;
-pub const WER_S_REPORT_QUEUED: HRESULT = 0x001B0002;
-pub const WER_S_DISABLED: HRESULT = 0x001B0003;
-pub const WER_S_SUSPENDED_UPLOAD: HRESULT = 0x001B0004;
-pub const WER_S_DISABLED_QUEUE: HRESULT = 0x001B0005;
-pub const WER_S_DISABLED_ARCHIVE: HRESULT = 0x001B0006;
-pub const WER_S_REPORT_ASYNC: HRESULT = 0x001B0007;
-pub const WER_S_IGNORE_ASSERT_INSTANCE: HRESULT = 0x001B0008;
-pub const WER_S_IGNORE_ALL_ASSERTS: HRESULT = 0x001B0009;
-pub const WER_S_ASSERT_CONTINUE: HRESULT = 0x001B000A;
-pub const WER_S_THROTTLED: HRESULT = 0x001B000B;
-pub const WER_E_CRASH_FAILURE: HRESULT = 0x801B8000u32 as HRESULT;
-pub const WER_E_CANCELED: HRESULT = 0x801B8001u32 as HRESULT;
-pub const WER_E_NETWORK_FAILURE: HRESULT = 0x801B8002u32 as HRESULT;
-pub const WER_E_NOT_INITIALIZED: HRESULT = 0x801B8003u32 as HRESULT;
-pub const WER_E_ALREADY_REPORTING: HRESULT = 0x801B8004u32 as HRESULT;
-pub const WER_E_DUMP_THROTTLED: HRESULT = 0x801B8005u32 as HRESULT;
-pub const ERROR_FLT_IO_COMPLETE: HRESULT = 0x001F0001;
-pub const ERROR_FLT_NO_HANDLER_DEFINED: HRESULT = 0x801F0001u32 as HRESULT;
-pub const ERROR_FLT_CONTEXT_ALREADY_DEFINED: HRESULT = 0x801F0002u32 as HRESULT;
-pub const ERROR_FLT_INVALID_ASYNCHRONOUS_REQUEST: HRESULT = 0x801F0003u32 as HRESULT;
-pub const ERROR_FLT_DISALLOW_FAST_IO: HRESULT = 0x801F0004u32 as HRESULT;
-pub const ERROR_FLT_INVALID_NAME_REQUEST: HRESULT = 0x801F0005u32 as HRESULT;
-pub const ERROR_FLT_NOT_SAFE_TO_POST_OPERATION: HRESULT = 0x801F0006u32 as HRESULT;
-pub const ERROR_FLT_NOT_INITIALIZED: HRESULT = 0x801F0007u32 as HRESULT;
-pub const ERROR_FLT_FILTER_NOT_READY: HRESULT = 0x801F0008u32 as HRESULT;
-pub const ERROR_FLT_POST_OPERATION_CLEANUP: HRESULT = 0x801F0009u32 as HRESULT;
-pub const ERROR_FLT_INTERNAL_ERROR: HRESULT = 0x801F000Au32 as HRESULT;
-pub const ERROR_FLT_DELETING_OBJECT: HRESULT = 0x801F000Bu32 as HRESULT;
-pub const ERROR_FLT_MUST_BE_NONPAGED_POOL: HRESULT = 0x801F000Cu32 as HRESULT;
-pub const ERROR_FLT_DUPLICATE_ENTRY: HRESULT = 0x801F000Du32 as HRESULT;
-pub const ERROR_FLT_CBDQ_DISABLED: HRESULT = 0x801F000Eu32 as HRESULT;
-pub const ERROR_FLT_DO_NOT_ATTACH: HRESULT = 0x801F000Fu32 as HRESULT;
-pub const ERROR_FLT_DO_NOT_DETACH: HRESULT = 0x801F0010u32 as HRESULT;
-pub const ERROR_FLT_INSTANCE_ALTITUDE_COLLISION: HRESULT = 0x801F0011u32 as HRESULT;
-pub const ERROR_FLT_INSTANCE_NAME_COLLISION: HRESULT = 0x801F0012u32 as HRESULT;
-pub const ERROR_FLT_FILTER_NOT_FOUND: HRESULT = 0x801F0013u32 as HRESULT;
-pub const ERROR_FLT_VOLUME_NOT_FOUND: HRESULT = 0x801F0014u32 as HRESULT;
-pub const ERROR_FLT_INSTANCE_NOT_FOUND: HRESULT = 0x801F0015u32 as HRESULT;
-pub const ERROR_FLT_CONTEXT_ALLOCATION_NOT_FOUND: HRESULT = 0x801F0016u32 as HRESULT;
-pub const ERROR_FLT_INVALID_CONTEXT_REGISTRATION: HRESULT = 0x801F0017u32 as HRESULT;
-pub const ERROR_FLT_NAME_CACHE_MISS: HRESULT = 0x801F0018u32 as HRESULT;
-pub const ERROR_FLT_NO_DEVICE_OBJECT: HRESULT = 0x801F0019u32 as HRESULT;
-pub const ERROR_FLT_VOLUME_ALREADY_MOUNTED: HRESULT = 0x801F001Au32 as HRESULT;
-pub const ERROR_FLT_ALREADY_ENLISTED: HRESULT = 0x801F001Bu32 as HRESULT;
-pub const ERROR_FLT_CONTEXT_ALREADY_LINKED: HRESULT = 0x801F001Cu32 as HRESULT;
-pub const ERROR_FLT_NO_WAITER_FOR_REPLY: HRESULT = 0x801F0020u32 as HRESULT;
-pub const ERROR_FLT_REGISTRATION_BUSY: HRESULT = 0x801F0023u32 as HRESULT;
-pub const ERROR_HUNG_DISPLAY_DRIVER_THREAD: HRESULT = 0x80260001u32 as HRESULT;
-pub const DWM_E_COMPOSITIONDISABLED: HRESULT = 0x80263001u32 as HRESULT;
-pub const DWM_E_REMOTING_NOT_SUPPORTED: HRESULT = 0x80263002u32 as HRESULT;
-pub const DWM_E_NO_REDIRECTION_SURFACE_AVAILABLE: HRESULT = 0x80263003u32 as HRESULT;
-pub const DWM_E_NOT_QUEUING_PRESENTS: HRESULT = 0x80263004u32 as HRESULT;
-pub const DWM_E_ADAPTER_NOT_FOUND: HRESULT = 0x80263005u32 as HRESULT;
-pub const DWM_S_GDI_REDIRECTION_SURFACE: HRESULT = 0x00263005;
-pub const DWM_E_TEXTURE_TOO_LARGE: HRESULT = 0x80263007u32 as HRESULT;
-pub const ERROR_MONITOR_NO_DESCRIPTOR: HRESULT = 0x80261001u32 as HRESULT;
-pub const ERROR_MONITOR_UNKNOWN_DESCRIPTOR_FORMAT: HRESULT = 0x80261002u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_DESCRIPTOR_CHECKSUM: HRESULT = 0xC0261003u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_STANDARD_TIMING_BLOCK: HRESULT = 0xC0261004u32 as HRESULT;
-pub const ERROR_MONITOR_WMI_DATABLOCK_REGISTRATION_FAILED: HRESULT = 0xC0261005u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_SERIAL_NUMBER_MONDSC_BLOCK: HRESULT = 0xC0261006u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_USER_FRIENDLY_MONDSC_BLOCK: HRESULT = 0xC0261007u32 as HRESULT;
-pub const ERROR_MONITOR_NO_MORE_DESCRIPTOR_DATA: HRESULT = 0xC0261008u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_DETAILED_TIMING_BLOCK: HRESULT = 0xC0261009u32 as HRESULT;
-pub const ERROR_MONITOR_INVALID_MANUFACTURE_DATE: HRESULT = 0xC026100Au32 as HRESULT;
-pub const ERROR_GRAPHICS_NOT_EXCLUSIVE_MODE_OWNER: HRESULT = 0xC0262000u32 as HRESULT;
-pub const ERROR_GRAPHICS_INSUFFICIENT_DMA_BUFFER: HRESULT = 0xC0262001u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_DISPLAY_ADAPTER: HRESULT = 0xC0262002u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_WAS_RESET: HRESULT = 0xC0262003u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_DRIVER_MODEL: HRESULT = 0xC0262004u32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_MODE_CHANGED: HRESULT = 0xC0262005u32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_OCCLUDED: HRESULT = 0xC0262006u32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_DENIED: HRESULT = 0xC0262007u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANNOTCOLORCONVERT: HRESULT = 0xC0262008u32 as HRESULT;
-pub const ERROR_GRAPHICS_DRIVER_MISMATCH: HRESULT = 0xC0262009u32 as HRESULT;
-pub const ERROR_GRAPHICS_PARTIAL_DATA_POPULATED: HRESULT = 0x4026200A;
-pub const ERROR_GRAPHICS_PRESENT_REDIRECTION_DISABLED: HRESULT = 0xC026200Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_PRESENT_UNOCCLUDED: HRESULT = 0xC026200Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_WINDOWDC_NOT_AVAILABLE: HRESULT = 0xC026200Du32 as HRESULT;
-pub const ERROR_GRAPHICS_WINDOWLESS_PRESENT_DISABLED: HRESULT = 0xC026200Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_VIDEO_MEMORY: HRESULT = 0xC0262100u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_LOCK_MEMORY: HRESULT = 0xC0262101u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_BUSY: HRESULT = 0xC0262102u32 as HRESULT;
-pub const ERROR_GRAPHICS_TOO_MANY_REFERENCES: HRESULT = 0xC0262103u32 as HRESULT;
-pub const ERROR_GRAPHICS_TRY_AGAIN_LATER: HRESULT = 0xC0262104u32 as HRESULT;
-pub const ERROR_GRAPHICS_TRY_AGAIN_NOW: HRESULT = 0xC0262105u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_INVALID: HRESULT = 0xC0262106u32 as HRESULT;
-pub const ERROR_GRAPHICS_UNSWIZZLING_APERTURE_UNAVAILABLE: HRESULT = 0xC0262107u32 as HRESULT;
-pub const ERROR_GRAPHICS_UNSWIZZLING_APERTURE_UNSUPPORTED: HRESULT = 0xC0262108u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_EVICT_PINNED_ALLOCATION: HRESULT = 0xC0262109u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ALLOCATION_USAGE: HRESULT = 0xC0262110u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_RENDER_LOCKED_ALLOCATION: HRESULT = 0xC0262111u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_CLOSED: HRESULT = 0xC0262112u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ALLOCATION_INSTANCE: HRESULT = 0xC0262113u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ALLOCATION_HANDLE: HRESULT = 0xC0262114u32 as HRESULT;
-pub const ERROR_GRAPHICS_WRONG_ALLOCATION_DEVICE: HRESULT = 0xC0262115u32 as HRESULT;
-pub const ERROR_GRAPHICS_ALLOCATION_CONTENT_LOST: HRESULT = 0xC0262116u32 as HRESULT;
-pub const ERROR_GRAPHICS_GPU_EXCEPTION_ON_DEVICE: HRESULT = 0xC0262200u32 as HRESULT;
-pub const ERROR_GRAPHICS_SKIP_ALLOCATION_PREPARATION: HRESULT = 0x40262201;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TOPOLOGY: HRESULT = 0xC0262300u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_TOPOLOGY_NOT_SUPPORTED: HRESULT = 0xC0262301u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_TOPOLOGY_CURRENTLY_NOT_SUPPORTED: HRESULT = 0xC0262302u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN: HRESULT = 0xC0262303u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE: HRESULT = 0xC0262304u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET: HRESULT = 0xC0262305u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_MODALITY_NOT_SUPPORTED: HRESULT = 0xC0262306u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_NOT_PINNED: HRESULT = 0x00262307;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_SOURCEMODESET: HRESULT = 0xC0262308u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TARGETMODESET: HRESULT = 0xC0262309u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_FREQUENCY: HRESULT = 0xC026230Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_ACTIVE_REGION: HRESULT = 0xC026230Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_TOTAL_REGION: HRESULT = 0xC026230Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_SOURCE_MODE: HRESULT = 0xC0262310u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEO_PRESENT_TARGET_MODE: HRESULT = 0xC0262311u32 as HRESULT;
-pub const ERROR_GRAPHICS_PINNED_MODE_MUST_REMAIN_IN_SET: HRESULT = 0xC0262312u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_ALREADY_IN_TOPOLOGY: HRESULT = 0xC0262313u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_ALREADY_IN_MODESET: HRESULT = 0xC0262314u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEOPRESENTSOURCESET: HRESULT = 0xC0262315u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDEOPRESENTTARGETSET: HRESULT = 0xC0262316u32 as HRESULT;
-pub const ERROR_GRAPHICS_SOURCE_ALREADY_IN_SET: HRESULT = 0xC0262317u32 as HRESULT;
-pub const ERROR_GRAPHICS_TARGET_ALREADY_IN_SET: HRESULT = 0xC0262318u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_PRESENT_PATH: HRESULT = 0xC0262319u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_RECOMMENDED_VIDPN_TOPOLOGY: HRESULT = 0xC026231Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGESET: HRESULT = 0xC026231Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE: HRESULT = 0xC026231Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_FREQUENCYRANGE_NOT_IN_SET: HRESULT = 0xC026231Du32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_PREFERRED_MODE: HRESULT = 0x0026231E;
-pub const ERROR_GRAPHICS_FREQUENCYRANGE_ALREADY_IN_SET: HRESULT = 0xC026231Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_STALE_MODESET: HRESULT = 0xC0262320u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_SOURCEMODESET: HRESULT = 0xC0262321u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_SOURCE_MODE: HRESULT = 0xC0262322u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_RECOMMENDED_FUNCTIONAL_VIDPN: HRESULT = 0xC0262323u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_ID_MUST_BE_UNIQUE: HRESULT = 0xC0262324u32 as HRESULT;
-pub const ERROR_GRAPHICS_EMPTY_ADAPTER_MONITOR_MODE_SUPPORT_INTERSECTION: HRESULT = 0xC0262325u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDEO_PRESENT_TARGETS_LESS_THAN_SOURCES: HRESULT = 0xC0262326u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_NOT_IN_TOPOLOGY: HRESULT = 0xC0262327u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_SOURCE: HRESULT = 0xC0262328u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_MUST_HAVE_AT_LEAST_ONE_TARGET: HRESULT = 0xC0262329u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITORDESCRIPTORSET: HRESULT = 0xC026232Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITORDESCRIPTOR: HRESULT = 0xC026232Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITORDESCRIPTOR_NOT_IN_SET: HRESULT = 0xC026232Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITORDESCRIPTOR_ALREADY_IN_SET: HRESULT = 0xC026232Du32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITORDESCRIPTOR_ID_MUST_BE_UNIQUE: HRESULT = 0xC026232Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TARGET_SUBSET_TYPE: HRESULT = 0xC026232Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_RESOURCES_NOT_RELATED: HRESULT = 0xC0262330u32 as HRESULT;
-pub const ERROR_GRAPHICS_SOURCE_ID_MUST_BE_UNIQUE: HRESULT = 0xC0262331u32 as HRESULT;
-pub const ERROR_GRAPHICS_TARGET_ID_MUST_BE_UNIQUE: HRESULT = 0xC0262332u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_AVAILABLE_VIDPN_TARGET: HRESULT = 0xC0262333u32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITOR_COULD_NOT_BE_ASSOCIATED_WITH_ADAPTER: HRESULT = 0xC0262334u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_VIDPNMGR: HRESULT = 0xC0262335u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_ACTIVE_VIDPN: HRESULT = 0xC0262336u32 as HRESULT;
-pub const ERROR_GRAPHICS_STALE_VIDPN_TOPOLOGY: HRESULT = 0xC0262337u32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITOR_NOT_CONNECTED: HRESULT = 0xC0262338u32 as HRESULT;
-pub const ERROR_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY: HRESULT = 0xC0262339u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PRIMARYSURFACE_SIZE: HRESULT = 0xC026233Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_VISIBLEREGION_SIZE: HRESULT = 0xC026233Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_STRIDE: HRESULT = 0xC026233Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PIXELFORMAT: HRESULT = 0xC026233Du32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_COLORBASIS: HRESULT = 0xC026233Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PIXELVALUEACCESSMODE: HRESULT = 0xC026233Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_TARGET_NOT_IN_TOPOLOGY: HRESULT = 0xC0262340u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_DISPLAY_MODE_MANAGEMENT_SUPPORT: HRESULT = 0xC0262341u32 as HRESULT;
-pub const ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE: HRESULT = 0xC0262342u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANT_ACCESS_ACTIVE_VIDPN: HRESULT = 0xC0262343u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PATH_IMPORTANCE_ORDINAL: HRESULT = 0xC0262344u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PATH_CONTENT_GEOMETRY_TRANSFORMATION: HRESULT = 0xC0262345u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_SUPPORTED: HRESULT = 0xC0262346u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_GAMMA_RAMP: HRESULT = 0xC0262347u32 as HRESULT;
-pub const ERROR_GRAPHICS_GAMMA_RAMP_NOT_SUPPORTED: HRESULT = 0xC0262348u32 as HRESULT;
-pub const ERROR_GRAPHICS_MULTISAMPLING_NOT_SUPPORTED: HRESULT = 0xC0262349u32 as HRESULT;
-pub const ERROR_GRAPHICS_MODE_NOT_IN_MODESET: HRESULT = 0xC026234Au32 as HRESULT;
-pub const ERROR_GRAPHICS_DATASET_IS_EMPTY: HRESULT = 0x0026234B;
-pub const ERROR_GRAPHICS_NO_MORE_ELEMENTS_IN_DATASET: HRESULT = 0x0026234C;
-pub const ERROR_GRAPHICS_INVALID_VIDPN_TOPOLOGY_RECOMMENDATION_REASON: HRESULT = 0xC026234Du32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PATH_CONTENT_TYPE: HRESULT = 0xC026234Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_COPYPROTECTION_TYPE: HRESULT = 0xC026234Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_UNASSIGNED_MODESET_ALREADY_EXISTS: HRESULT = 0xC0262350u32 as HRESULT;
-pub const ERROR_GRAPHICS_PATH_CONTENT_GEOMETRY_TRANSFORMATION_NOT_PINNED: HRESULT = 0x00262351;
-pub const ERROR_GRAPHICS_INVALID_SCANLINE_ORDERING: HRESULT = 0xC0262352u32 as HRESULT;
-pub const ERROR_GRAPHICS_TOPOLOGY_CHANGES_NOT_ALLOWED: HRESULT = 0xC0262353u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_AVAILABLE_IMPORTANCE_ORDINALS: HRESULT = 0xC0262354u32 as HRESULT;
-pub const ERROR_GRAPHICS_INCOMPATIBLE_PRIVATE_FORMAT: HRESULT = 0xC0262355u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MODE_PRUNING_ALGORITHM: HRESULT = 0xC0262356u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_CAPABILITY_ORIGIN: HRESULT = 0xC0262357u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_MONITOR_FREQUENCYRANGE_CONSTRAINT: HRESULT = 0xC0262358u32 as HRESULT;
-pub const ERROR_GRAPHICS_MAX_NUM_PATHS_REACHED: HRESULT = 0xC0262359u32 as HRESULT;
-pub const ERROR_GRAPHICS_CANCEL_VIDPN_TOPOLOGY_AUGMENTATION: HRESULT = 0xC026235Au32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_CLIENT_TYPE: HRESULT = 0xC026235Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_CLIENTVIDPN_NOT_SET: HRESULT = 0xC026235Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_SPECIFIED_CHILD_ALREADY_CONNECTED: HRESULT = 0xC0262400u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHILD_DESCRIPTOR_NOT_SUPPORTED: HRESULT = 0xC0262401u32 as HRESULT;
-pub const ERROR_GRAPHICS_UNKNOWN_CHILD_STATUS: HRESULT = 0x4026242F;
-pub const ERROR_GRAPHICS_NOT_A_LINKED_ADAPTER: HRESULT = 0xC0262430u32 as HRESULT;
-pub const ERROR_GRAPHICS_LEADLINK_NOT_ENUMERATED: HRESULT = 0xC0262431u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHAINLINKS_NOT_ENUMERATED: HRESULT = 0xC0262432u32 as HRESULT;
-pub const ERROR_GRAPHICS_ADAPTER_CHAIN_NOT_READY: HRESULT = 0xC0262433u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHAINLINKS_NOT_STARTED: HRESULT = 0xC0262434u32 as HRESULT;
-pub const ERROR_GRAPHICS_CHAINLINKS_NOT_POWERED_ON: HRESULT = 0xC0262435u32 as HRESULT;
-pub const ERROR_GRAPHICS_INCONSISTENT_DEVICE_LINK_STATE: HRESULT = 0xC0262436u32 as HRESULT;
-pub const ERROR_GRAPHICS_LEADLINK_START_DEFERRED: HRESULT = 0x40262437;
-pub const ERROR_GRAPHICS_NOT_POST_DEVICE_DRIVER: HRESULT = 0xC0262438u32 as HRESULT;
-pub const ERROR_GRAPHICS_POLLING_TOO_FREQUENTLY: HRESULT = 0x40262439;
-pub const ERROR_GRAPHICS_START_DEFERRED: HRESULT = 0x4026243A;
-pub const ERROR_GRAPHICS_ADAPTER_ACCESS_NOT_EXCLUDED: HRESULT = 0xC026243Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_NOT_SUPPORTED: HRESULT = 0xC0262500u32 as HRESULT;
-pub const ERROR_GRAPHICS_COPP_NOT_SUPPORTED: HRESULT = 0xC0262501u32 as HRESULT;
-pub const ERROR_GRAPHICS_UAB_NOT_SUPPORTED: HRESULT = 0xC0262502u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_ENCRYPTED_PARAMETERS: HRESULT = 0xC0262503u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_NO_VIDEO_OUTPUTS_EXIST: HRESULT = 0xC0262505u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INTERNAL_ERROR: HRESULT = 0xC026250Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_HANDLE: HRESULT = 0xC026250Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_PVP_INVALID_CERTIFICATE_LENGTH: HRESULT = 0xC026250Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_SPANNING_MODE_ENABLED: HRESULT = 0xC026250Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_THEATER_MODE_ENABLED: HRESULT = 0xC0262510u32 as HRESULT;
-pub const ERROR_GRAPHICS_PVP_HFS_FAILED: HRESULT = 0xC0262511u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_SRM: HRESULT = 0xC0262512u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_HDCP: HRESULT = 0xC0262513u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_ACP: HRESULT = 0xC0262514u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_OUTPUT_DOES_NOT_SUPPORT_CGMSA: HRESULT = 0xC0262515u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_HDCP_SRM_NEVER_SET: HRESULT = 0xC0262516u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_RESOLUTION_TOO_HIGH: HRESULT = 0xC0262517u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_ALL_HDCP_HARDWARE_ALREADY_IN_USE: HRESULT = 0xC0262518u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_NO_LONGER_EXISTS: HRESULT = 0xC026251Au32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_SESSION_TYPE_CHANGE_IN_PROGRESS: HRESULT = 0xC026251Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_DOES_NOT_HAVE_COPP_SEMANTICS: HRESULT = 0xC026251Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_INFORMATION_REQUEST: HRESULT = 0xC026251Du32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_DRIVER_INTERNAL_ERROR: HRESULT = 0xC026251Eu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_VIDEO_OUTPUT_DOES_NOT_HAVE_OPM_SEMANTICS: HRESULT = 0xC026251Fu32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_SIGNALING_NOT_SUPPORTED: HRESULT = 0xC0262520u32 as HRESULT;
-pub const ERROR_GRAPHICS_OPM_INVALID_CONFIGURATION_REQUEST: HRESULT = 0xC0262521u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_NOT_SUPPORTED: HRESULT = 0xC0262580u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_DEVICE_DOES_NOT_EXIST: HRESULT = 0xC0262581u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_ERROR_TRANSMITTING_DATA: HRESULT = 0xC0262582u32 as HRESULT;
-pub const ERROR_GRAPHICS_I2C_ERROR_RECEIVING_DATA: HRESULT = 0xC0262583u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_VCP_NOT_SUPPORTED: HRESULT = 0xC0262584u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_DATA: HRESULT = 0xC0262585u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_MONITOR_RETURNED_INVALID_TIMING_STATUS_BYTE: HRESULT = 0xC0262586u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INVALID_CAPABILITIES_STRING: HRESULT = 0xC0262587u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INTERNAL_ERROR: HRESULT = 0xC0262588u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_COMMAND: HRESULT = 0xC0262589u32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_LENGTH: HRESULT = 0xC026258Au32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_INVALID_MESSAGE_CHECKSUM: HRESULT = 0xC026258Bu32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_PHYSICAL_MONITOR_HANDLE: HRESULT = 0xC026258Cu32 as HRESULT;
-pub const ERROR_GRAPHICS_MONITOR_NO_LONGER_EXISTS: HRESULT = 0xC026258Du32 as HRESULT;
-pub const ERROR_GRAPHICS_DDCCI_CURRENT_CURRENT_VALUE_GREATER_THAN_MAXIMUM_VALUE: HRESULT = 0xC02625D8u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INVALID_VCP_VERSION: HRESULT = 0xC02625D9u32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_MONITOR_VIOLATES_MCCS_SPECIFICATION: HRESULT = 0xC02625DAu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_MCCS_VERSION_MISMATCH: HRESULT = 0xC02625DBu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_UNSUPPORTED_MCCS_VERSION: HRESULT = 0xC02625DCu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_INVALID_TECHNOLOGY_TYPE_RETURNED: HRESULT = 0xC02625DEu32 as HRESULT;
-pub const ERROR_GRAPHICS_MCA_UNSUPPORTED_COLOR_TEMPERATURE: HRESULT = 0xC02625DFu32 as HRESULT;
-pub const ERROR_GRAPHICS_ONLY_CONSOLE_SESSION_SUPPORTED: HRESULT = 0xC02625E0u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_DISPLAY_DEVICE_CORRESPONDS_TO_NAME: HRESULT = 0xC02625E1u32 as HRESULT;
-pub const ERROR_GRAPHICS_DISPLAY_DEVICE_NOT_ATTACHED_TO_DESKTOP: HRESULT = 0xC02625E2u32 as HRESULT;
-pub const ERROR_GRAPHICS_MIRRORING_DEVICES_NOT_SUPPORTED: HRESULT = 0xC02625E3u32 as HRESULT;
-pub const ERROR_GRAPHICS_INVALID_POINTER: HRESULT = 0xC02625E4u32 as HRESULT;
-pub const ERROR_GRAPHICS_NO_MONITORS_CORRESPOND_TO_DISPLAY_DEVICE: HRESULT = 0xC02625E5u32 as HRESULT;
-pub const ERROR_GRAPHICS_PARAMETER_ARRAY_TOO_SMALL: HRESULT = 0xC02625E6u32 as HRESULT;
-pub const ERROR_GRAPHICS_INTERNAL_ERROR: HRESULT = 0xC02625E7u32 as HRESULT;
-pub const ERROR_GRAPHICS_SESSION_TYPE_CHANGE_IN_PROGRESS: HRESULT = 0xC02605E8u32 as HRESULT;
-pub const NAP_E_INVALID_PACKET: HRESULT = 0x80270001u32 as HRESULT;
-pub const NAP_E_MISSING_SOH: HRESULT = 0x80270002u32 as HRESULT;
-pub const NAP_E_CONFLICTING_ID: HRESULT = 0x80270003u32 as HRESULT;
-pub const NAP_E_NO_CACHED_SOH: HRESULT = 0x80270004u32 as HRESULT;
-pub const NAP_E_STILL_BOUND: HRESULT = 0x80270005u32 as HRESULT;
-pub const NAP_E_NOT_REGISTERED: HRESULT = 0x80270006u32 as HRESULT;
-pub const NAP_E_NOT_INITIALIZED: HRESULT = 0x80270007u32 as HRESULT;
-pub const NAP_E_MISMATCHED_ID: HRESULT = 0x80270008u32 as HRESULT;
-pub const NAP_E_NOT_PENDING: HRESULT = 0x80270009u32 as HRESULT;
-pub const NAP_E_ID_NOT_FOUND: HRESULT = 0x8027000Au32 as HRESULT;
-pub const NAP_E_MAXSIZE_TOO_SMALL: HRESULT = 0x8027000Bu32 as HRESULT;
-pub const NAP_E_SERVICE_NOT_RUNNING: HRESULT = 0x8027000Cu32 as HRESULT;
-pub const NAP_S_CERT_ALREADY_PRESENT: HRESULT = 0x0027000D;
-pub const NAP_E_ENTITY_DISABLED: HRESULT = 0x8027000Eu32 as HRESULT;
-pub const NAP_E_NETSH_GROUPPOLICY_ERROR: HRESULT = 0x8027000Fu32 as HRESULT;
-pub const NAP_E_TOO_MANY_CALLS: HRESULT = 0x80270010u32 as HRESULT;
-pub const NAP_E_SHV_CONFIG_EXISTED: HRESULT = 0x80270011u32 as HRESULT;
-pub const NAP_E_SHV_CONFIG_NOT_FOUND: HRESULT = 0x80270012u32 as HRESULT;
-pub const NAP_E_SHV_TIMEOUT: HRESULT = 0x80270013u32 as HRESULT;
-pub const TPM_E_ERROR_MASK: HRESULT = 0x80280000u32 as HRESULT;
-pub const TPM_E_AUTHFAIL: HRESULT = 0x80280001u32 as HRESULT;
-pub const TPM_E_BADINDEX: HRESULT = 0x80280002u32 as HRESULT;
-pub const TPM_E_BAD_PARAMETER: HRESULT = 0x80280003u32 as HRESULT;
-pub const TPM_E_AUDITFAILURE: HRESULT = 0x80280004u32 as HRESULT;
-pub const TPM_E_CLEAR_DISABLED: HRESULT = 0x80280005u32 as HRESULT;
-pub const TPM_E_DEACTIVATED: HRESULT = 0x80280006u32 as HRESULT;
-pub const TPM_E_DISABLED: HRESULT = 0x80280007u32 as HRESULT;
-pub const TPM_E_DISABLED_CMD: HRESULT = 0x80280008u32 as HRESULT;
-pub const TPM_E_FAIL: HRESULT = 0x80280009u32 as HRESULT;
-pub const TPM_E_BAD_ORDINAL: HRESULT = 0x8028000Au32 as HRESULT;
-pub const TPM_E_INSTALL_DISABLED: HRESULT = 0x8028000Bu32 as HRESULT;
-pub const TPM_E_INVALID_KEYHANDLE: HRESULT = 0x8028000Cu32 as HRESULT;
-pub const TPM_E_KEYNOTFOUND: HRESULT = 0x8028000Du32 as HRESULT;
-pub const TPM_E_INAPPROPRIATE_ENC: HRESULT = 0x8028000Eu32 as HRESULT;
-pub const TPM_E_MIGRATEFAIL: HRESULT = 0x8028000Fu32 as HRESULT;
-pub const TPM_E_INVALID_PCR_INFO: HRESULT = 0x80280010u32 as HRESULT;
-pub const TPM_E_NOSPACE: HRESULT = 0x80280011u32 as HRESULT;
-pub const TPM_E_NOSRK: HRESULT = 0x80280012u32 as HRESULT;
-pub const TPM_E_NOTSEALED_BLOB: HRESULT = 0x80280013u32 as HRESULT;
-pub const TPM_E_OWNER_SET: HRESULT = 0x80280014u32 as HRESULT;
-pub const TPM_E_RESOURCES: HRESULT = 0x80280015u32 as HRESULT;
-pub const TPM_E_SHORTRANDOM: HRESULT = 0x80280016u32 as HRESULT;
-pub const TPM_E_SIZE: HRESULT = 0x80280017u32 as HRESULT;
-pub const TPM_E_WRONGPCRVAL: HRESULT = 0x80280018u32 as HRESULT;
-pub const TPM_E_BAD_PARAM_SIZE: HRESULT = 0x80280019u32 as HRESULT;
-pub const TPM_E_SHA_THREAD: HRESULT = 0x8028001Au32 as HRESULT;
-pub const TPM_E_SHA_ERROR: HRESULT = 0x8028001Bu32 as HRESULT;
-pub const TPM_E_FAILEDSELFTEST: HRESULT = 0x8028001Cu32 as HRESULT;
-pub const TPM_E_AUTH2FAIL: HRESULT = 0x8028001Du32 as HRESULT;
-pub const TPM_E_BADTAG: HRESULT = 0x8028001Eu32 as HRESULT;
-pub const TPM_E_IOERROR: HRESULT = 0x8028001Fu32 as HRESULT;
-pub const TPM_E_ENCRYPT_ERROR: HRESULT = 0x80280020u32 as HRESULT;
-pub const TPM_E_DECRYPT_ERROR: HRESULT = 0x80280021u32 as HRESULT;
-pub const TPM_E_INVALID_AUTHHANDLE: HRESULT = 0x80280022u32 as HRESULT;
-pub const TPM_E_NO_ENDORSEMENT: HRESULT = 0x80280023u32 as HRESULT;
-pub const TPM_E_INVALID_KEYUSAGE: HRESULT = 0x80280024u32 as HRESULT;
-pub const TPM_E_WRONG_ENTITYTYPE: HRESULT = 0x80280025u32 as HRESULT;
-pub const TPM_E_INVALID_POSTINIT: HRESULT = 0x80280026u32 as HRESULT;
-pub const TPM_E_INAPPROPRIATE_SIG: HRESULT = 0x80280027u32 as HRESULT;
-pub const TPM_E_BAD_KEY_PROPERTY: HRESULT = 0x80280028u32 as HRESULT;
-pub const TPM_E_BAD_MIGRATION: HRESULT = 0x80280029u32 as HRESULT;
-pub const TPM_E_BAD_SCHEME: HRESULT = 0x8028002Au32 as HRESULT;
-pub const TPM_E_BAD_DATASIZE: HRESULT = 0x8028002Bu32 as HRESULT;
-pub const TPM_E_BAD_MODE: HRESULT = 0x8028002Cu32 as HRESULT;
-pub const TPM_E_BAD_PRESENCE: HRESULT = 0x8028002Du32 as HRESULT;
-pub const TPM_E_BAD_VERSION: HRESULT = 0x8028002Eu32 as HRESULT;
-pub const TPM_E_NO_WRAP_TRANSPORT: HRESULT = 0x8028002Fu32 as HRESULT;
-pub const TPM_E_AUDITFAIL_UNSUCCESSFUL: HRESULT = 0x80280030u32 as HRESULT;
-pub const TPM_E_AUDITFAIL_SUCCESSFUL: HRESULT = 0x80280031u32 as HRESULT;
-pub const TPM_E_NOTRESETABLE: HRESULT = 0x80280032u32 as HRESULT;
-pub const TPM_E_NOTLOCAL: HRESULT = 0x80280033u32 as HRESULT;
-pub const TPM_E_BAD_TYPE: HRESULT = 0x80280034u32 as HRESULT;
-pub const TPM_E_INVALID_RESOURCE: HRESULT = 0x80280035u32 as HRESULT;
-pub const TPM_E_NOTFIPS: HRESULT = 0x80280036u32 as HRESULT;
-pub const TPM_E_INVALID_FAMILY: HRESULT = 0x80280037u32 as HRESULT;
-pub const TPM_E_NO_NV_PERMISSION: HRESULT = 0x80280038u32 as HRESULT;
-pub const TPM_E_REQUIRES_SIGN: HRESULT = 0x80280039u32 as HRESULT;
-pub const TPM_E_KEY_NOTSUPPORTED: HRESULT = 0x8028003Au32 as HRESULT;
-pub const TPM_E_AUTH_CONFLICT: HRESULT = 0x8028003Bu32 as HRESULT;
-pub const TPM_E_AREA_LOCKED: HRESULT = 0x8028003Cu32 as HRESULT;
-pub const TPM_E_BAD_LOCALITY: HRESULT = 0x8028003Du32 as HRESULT;
-pub const TPM_E_READ_ONLY: HRESULT = 0x8028003Eu32 as HRESULT;
-pub const TPM_E_PER_NOWRITE: HRESULT = 0x8028003Fu32 as HRESULT;
-pub const TPM_E_FAMILYCOUNT: HRESULT = 0x80280040u32 as HRESULT;
-pub const TPM_E_WRITE_LOCKED: HRESULT = 0x80280041u32 as HRESULT;
-pub const TPM_E_BAD_ATTRIBUTES: HRESULT = 0x80280042u32 as HRESULT;
-pub const TPM_E_INVALID_STRUCTURE: HRESULT = 0x80280043u32 as HRESULT;
-pub const TPM_E_KEY_OWNER_CONTROL: HRESULT = 0x80280044u32 as HRESULT;
-pub const TPM_E_BAD_COUNTER: HRESULT = 0x80280045u32 as HRESULT;
-pub const TPM_E_NOT_FULLWRITE: HRESULT = 0x80280046u32 as HRESULT;
-pub const TPM_E_CONTEXT_GAP: HRESULT = 0x80280047u32 as HRESULT;
-pub const TPM_E_MAXNVWRITES: HRESULT = 0x80280048u32 as HRESULT;
-pub const TPM_E_NOOPERATOR: HRESULT = 0x80280049u32 as HRESULT;
-pub const TPM_E_RESOURCEMISSING: HRESULT = 0x8028004Au32 as HRESULT;
-pub const TPM_E_DELEGATE_LOCK: HRESULT = 0x8028004Bu32 as HRESULT;
-pub const TPM_E_DELEGATE_FAMILY: HRESULT = 0x8028004Cu32 as HRESULT;
-pub const TPM_E_DELEGATE_ADMIN: HRESULT = 0x8028004Du32 as HRESULT;
-pub const TPM_E_TRANSPORT_NOTEXCLUSIVE: HRESULT = 0x8028004Eu32 as HRESULT;
-pub const TPM_E_OWNER_CONTROL: HRESULT = 0x8028004Fu32 as HRESULT;
-pub const TPM_E_DAA_RESOURCES: HRESULT = 0x80280050u32 as HRESULT;
-pub const TPM_E_DAA_INPUT_DATA0: HRESULT = 0x80280051u32 as HRESULT;
-pub const TPM_E_DAA_INPUT_DATA1: HRESULT = 0x80280052u32 as HRESULT;
-pub const TPM_E_DAA_ISSUER_SETTINGS: HRESULT = 0x80280053u32 as HRESULT;
-pub const TPM_E_DAA_TPM_SETTINGS: HRESULT = 0x80280054u32 as HRESULT;
-pub const TPM_E_DAA_STAGE: HRESULT = 0x80280055u32 as HRESULT;
-pub const TPM_E_DAA_ISSUER_VALIDITY: HRESULT = 0x80280056u32 as HRESULT;
-pub const TPM_E_DAA_WRONG_W: HRESULT = 0x80280057u32 as HRESULT;
-pub const TPM_E_BAD_HANDLE: HRESULT = 0x80280058u32 as HRESULT;
-pub const TPM_E_BAD_DELEGATE: HRESULT = 0x80280059u32 as HRESULT;
-pub const TPM_E_BADCONTEXT: HRESULT = 0x8028005Au32 as HRESULT;
-pub const TPM_E_TOOMANYCONTEXTS: HRESULT = 0x8028005Bu32 as HRESULT;
-pub const TPM_E_MA_TICKET_SIGNATURE: HRESULT = 0x8028005Cu32 as HRESULT;
-pub const TPM_E_MA_DESTINATION: HRESULT = 0x8028005Du32 as HRESULT;
-pub const TPM_E_MA_SOURCE: HRESULT = 0x8028005Eu32 as HRESULT;
-pub const TPM_E_MA_AUTHORITY: HRESULT = 0x8028005Fu32 as HRESULT;
-pub const TPM_E_PERMANENTEK: HRESULT = 0x80280061u32 as HRESULT;
-pub const TPM_E_BAD_SIGNATURE: HRESULT = 0x80280062u32 as HRESULT;
-pub const TPM_E_NOCONTEXTSPACE: HRESULT = 0x80280063u32 as HRESULT;
-pub const TPM_E_COMMAND_BLOCKED: HRESULT = 0x80280400u32 as HRESULT;
-pub const TPM_E_INVALID_HANDLE: HRESULT = 0x80280401u32 as HRESULT;
-pub const TPM_E_DUPLICATE_VHANDLE: HRESULT = 0x80280402u32 as HRESULT;
-pub const TPM_E_EMBEDDED_COMMAND_BLOCKED: HRESULT = 0x80280403u32 as HRESULT;
-pub const TPM_E_EMBEDDED_COMMAND_UNSUPPORTED: HRESULT = 0x80280404u32 as HRESULT;
-pub const TPM_E_RETRY: HRESULT = 0x80280800u32 as HRESULT;
-pub const TPM_E_NEEDS_SELFTEST: HRESULT = 0x80280801u32 as HRESULT;
-pub const TPM_E_DOING_SELFTEST: HRESULT = 0x80280802u32 as HRESULT;
-pub const TPM_E_DEFEND_LOCK_RUNNING: HRESULT = 0x80280803u32 as HRESULT;
-pub const TBS_E_INTERNAL_ERROR: HRESULT = 0x80284001u32 as HRESULT;
-pub const TBS_E_BAD_PARAMETER: HRESULT = 0x80284002u32 as HRESULT;
-pub const TBS_E_INVALID_OUTPUT_POINTER: HRESULT = 0x80284003u32 as HRESULT;
-pub const TBS_E_INVALID_CONTEXT: HRESULT = 0x80284004u32 as HRESULT;
-pub const TBS_E_INSUFFICIENT_BUFFER: HRESULT = 0x80284005u32 as HRESULT;
-pub const TBS_E_IOERROR: HRESULT = 0x80284006u32 as HRESULT;
-pub const TBS_E_INVALID_CONTEXT_PARAM: HRESULT = 0x80284007u32 as HRESULT;
-pub const TBS_E_SERVICE_NOT_RUNNING: HRESULT = 0x80284008u32 as HRESULT;
-pub const TBS_E_TOO_MANY_TBS_CONTEXTS: HRESULT = 0x80284009u32 as HRESULT;
-pub const TBS_E_TOO_MANY_RESOURCES: HRESULT = 0x8028400Au32 as HRESULT;
-pub const TBS_E_SERVICE_START_PENDING: HRESULT = 0x8028400Bu32 as HRESULT;
-pub const TBS_E_PPI_NOT_SUPPORTED: HRESULT = 0x8028400Cu32 as HRESULT;
-pub const TBS_E_COMMAND_CANCELED: HRESULT = 0x8028400Du32 as HRESULT;
-pub const TBS_E_BUFFER_TOO_LARGE: HRESULT = 0x8028400Eu32 as HRESULT;
-pub const TBS_E_TPM_NOT_FOUND: HRESULT = 0x8028400Fu32 as HRESULT;
-pub const TBS_E_SERVICE_DISABLED: HRESULT = 0x80284010u32 as HRESULT;
-pub const TBS_E_NO_EVENT_LOG: HRESULT = 0x80284011u32 as HRESULT;
-pub const TBS_E_ACCESS_DENIED: HRESULT = 0x80284012u32 as HRESULT;
-pub const TBS_E_PROVISIONING_NOT_ALLOWED: HRESULT = 0x80284013u32 as HRESULT;
-pub const TBS_E_PPI_FUNCTION_UNSUPPORTED: HRESULT = 0x80284014u32 as HRESULT;
-pub const TBS_E_OWNERAUTH_NOT_FOUND: HRESULT = 0x80284015u32 as HRESULT;
-pub const TBS_E_PROVISIONING_INCOMPLETE: HRESULT = 0x80284016u32 as HRESULT;
-pub const TPMAPI_E_INVALID_STATE: HRESULT = 0x80290100u32 as HRESULT;
-pub const TPMAPI_E_NOT_ENOUGH_DATA: HRESULT = 0x80290101u32 as HRESULT;
-pub const TPMAPI_E_TOO_MUCH_DATA: HRESULT = 0x80290102u32 as HRESULT;
-pub const TPMAPI_E_INVALID_OUTPUT_POINTER: HRESULT = 0x80290103u32 as HRESULT;
-pub const TPMAPI_E_INVALID_PARAMETER: HRESULT = 0x80290104u32 as HRESULT;
-pub const TPMAPI_E_OUT_OF_MEMORY: HRESULT = 0x80290105u32 as HRESULT;
-pub const TPMAPI_E_BUFFER_TOO_SMALL: HRESULT = 0x80290106u32 as HRESULT;
-pub const TPMAPI_E_INTERNAL_ERROR: HRESULT = 0x80290107u32 as HRESULT;
-pub const TPMAPI_E_ACCESS_DENIED: HRESULT = 0x80290108u32 as HRESULT;
-pub const TPMAPI_E_AUTHORIZATION_FAILED: HRESULT = 0x80290109u32 as HRESULT;
-pub const TPMAPI_E_INVALID_CONTEXT_HANDLE: HRESULT = 0x8029010Au32 as HRESULT;
-pub const TPMAPI_E_TBS_COMMUNICATION_ERROR: HRESULT = 0x8029010Bu32 as HRESULT;
-pub const TPMAPI_E_TPM_COMMAND_ERROR: HRESULT = 0x8029010Cu32 as HRESULT;
-pub const TPMAPI_E_MESSAGE_TOO_LARGE: HRESULT = 0x8029010Du32 as HRESULT;
-pub const TPMAPI_E_INVALID_ENCODING: HRESULT = 0x8029010Eu32 as HRESULT;
-pub const TPMAPI_E_INVALID_KEY_SIZE: HRESULT = 0x8029010Fu32 as HRESULT;
-pub const TPMAPI_E_ENCRYPTION_FAILED: HRESULT = 0x80290110u32 as HRESULT;
-pub const TPMAPI_E_INVALID_KEY_PARAMS: HRESULT = 0x80290111u32 as HRESULT;
-pub const TPMAPI_E_INVALID_MIGRATION_AUTHORIZATION_BLOB: HRESULT = 0x80290112u32 as HRESULT;
-pub const TPMAPI_E_INVALID_PCR_INDEX: HRESULT = 0x80290113u32 as HRESULT;
-pub const TPMAPI_E_INVALID_DELEGATE_BLOB: HRESULT = 0x80290114u32 as HRESULT;
-pub const TPMAPI_E_INVALID_CONTEXT_PARAMS: HRESULT = 0x80290115u32 as HRESULT;
-pub const TPMAPI_E_INVALID_KEY_BLOB: HRESULT = 0x80290116u32 as HRESULT;
-pub const TPMAPI_E_INVALID_PCR_DATA: HRESULT = 0x80290117u32 as HRESULT;
-pub const TPMAPI_E_INVALID_OWNER_AUTH: HRESULT = 0x80290118u32 as HRESULT;
-pub const TPMAPI_E_FIPS_RNG_CHECK_FAILED: HRESULT = 0x80290119u32 as HRESULT;
-pub const TPMAPI_E_EMPTY_TCG_LOG: HRESULT = 0x8029011Au32 as HRESULT;
-pub const TPMAPI_E_INVALID_TCG_LOG_ENTRY: HRESULT = 0x8029011Bu32 as HRESULT;
-pub const TPMAPI_E_TCG_SEPARATOR_ABSENT: HRESULT = 0x8029011Cu32 as HRESULT;
-pub const TPMAPI_E_TCG_INVALID_DIGEST_ENTRY: HRESULT = 0x8029011Du32 as HRESULT;
-pub const TPMAPI_E_POLICY_DENIES_OPERATION: HRESULT = 0x8029011Eu32 as HRESULT;
-pub const TBSIMP_E_BUFFER_TOO_SMALL: HRESULT = 0x80290200u32 as HRESULT;
-pub const TBSIMP_E_CLEANUP_FAILED: HRESULT = 0x80290201u32 as HRESULT;
-pub const TBSIMP_E_INVALID_CONTEXT_HANDLE: HRESULT = 0x80290202u32 as HRESULT;
-pub const TBSIMP_E_INVALID_CONTEXT_PARAM: HRESULT = 0x80290203u32 as HRESULT;
-pub const TBSIMP_E_TPM_ERROR: HRESULT = 0x80290204u32 as HRESULT;
-pub const TBSIMP_E_HASH_BAD_KEY: HRESULT = 0x80290205u32 as HRESULT;
-pub const TBSIMP_E_DUPLICATE_VHANDLE: HRESULT = 0x80290206u32 as HRESULT;
-pub const TBSIMP_E_INVALID_OUTPUT_POINTER: HRESULT = 0x80290207u32 as HRESULT;
-pub const TBSIMP_E_INVALID_PARAMETER: HRESULT = 0x80290208u32 as HRESULT;
-pub const TBSIMP_E_RPC_INIT_FAILED: HRESULT = 0x80290209u32 as HRESULT;
-pub const TBSIMP_E_SCHEDULER_NOT_RUNNING: HRESULT = 0x8029020Au32 as HRESULT;
-pub const TBSIMP_E_COMMAND_CANCELED: HRESULT = 0x8029020Bu32 as HRESULT;
-pub const TBSIMP_E_OUT_OF_MEMORY: HRESULT = 0x8029020Cu32 as HRESULT;
-pub const TBSIMP_E_LIST_NO_MORE_ITEMS: HRESULT = 0x8029020Du32 as HRESULT;
-pub const TBSIMP_E_LIST_NOT_FOUND: HRESULT = 0x8029020Eu32 as HRESULT;
-pub const TBSIMP_E_NOT_ENOUGH_SPACE: HRESULT = 0x8029020Fu32 as HRESULT;
-pub const TBSIMP_E_NOT_ENOUGH_TPM_CONTEXTS: HRESULT = 0x80290210u32 as HRESULT;
-pub const TBSIMP_E_COMMAND_FAILED: HRESULT = 0x80290211u32 as HRESULT;
-pub const TBSIMP_E_UNKNOWN_ORDINAL: HRESULT = 0x80290212u32 as HRESULT;
-pub const TBSIMP_E_RESOURCE_EXPIRED: HRESULT = 0x80290213u32 as HRESULT;
-pub const TBSIMP_E_INVALID_RESOURCE: HRESULT = 0x80290214u32 as HRESULT;
-pub const TBSIMP_E_NOTHING_TO_UNLOAD: HRESULT = 0x80290215u32 as HRESULT;
-pub const TBSIMP_E_HASH_TABLE_FULL: HRESULT = 0x80290216u32 as HRESULT;
-pub const TBSIMP_E_TOO_MANY_TBS_CONTEXTS: HRESULT = 0x80290217u32 as HRESULT;
-pub const TBSIMP_E_TOO_MANY_RESOURCES: HRESULT = 0x80290218u32 as HRESULT;
-pub const TBSIMP_E_PPI_NOT_SUPPORTED: HRESULT = 0x80290219u32 as HRESULT;
-pub const TBSIMP_E_TPM_INCOMPATIBLE: HRESULT = 0x8029021Au32 as HRESULT;
-pub const TBSIMP_E_NO_EVENT_LOG: HRESULT = 0x8029021Bu32 as HRESULT;
-pub const TPM_E_PPI_ACPI_FAILURE: HRESULT = 0x80290300u32 as HRESULT;
-pub const TPM_E_PPI_USER_ABORT: HRESULT = 0x80290301u32 as HRESULT;
-pub const TPM_E_PPI_BIOS_FAILURE: HRESULT = 0x80290302u32 as HRESULT;
-pub const TPM_E_PPI_NOT_SUPPORTED: HRESULT = 0x80290303u32 as HRESULT;
-pub const TPM_E_PPI_BLOCKED_IN_BIOS: HRESULT = 0x80290304u32 as HRESULT;
-pub const TPM_E_PCP_ERROR_MASK: HRESULT = 0x80290400u32 as HRESULT;
-pub const TPM_E_PCP_DEVICE_NOT_READY: HRESULT = 0x80290401u32 as HRESULT;
-pub const TPM_E_PCP_INVALID_HANDLE: HRESULT = 0x80290402u32 as HRESULT;
-pub const TPM_E_PCP_INVALID_PARAMETER: HRESULT = 0x80290403u32 as HRESULT;
-pub const TPM_E_PCP_FLAG_NOT_SUPPORTED: HRESULT = 0x80290404u32 as HRESULT;
-pub const TPM_E_PCP_NOT_SUPPORTED: HRESULT = 0x80290405u32 as HRESULT;
-pub const TPM_E_PCP_BUFFER_TOO_SMALL: HRESULT = 0x80290406u32 as HRESULT;
-pub const TPM_E_PCP_INTERNAL_ERROR: HRESULT = 0x80290407u32 as HRESULT;
-pub const TPM_E_PCP_AUTHENTICATION_FAILED: HRESULT = 0x80290408u32 as HRESULT;
-pub const TPM_E_PCP_AUTHENTICATION_IGNORED: HRESULT = 0x80290409u32 as HRESULT;
-pub const TPM_E_PCP_POLICY_NOT_FOUND: HRESULT = 0x8029040Au32 as HRESULT;
-pub const TPM_E_PCP_PROFILE_NOT_FOUND: HRESULT = 0x8029040Bu32 as HRESULT;
-pub const TPM_E_PCP_VALIDATION_FAILED: HRESULT = 0x8029040Cu32 as HRESULT;
-pub const PLA_E_DCS_NOT_FOUND: HRESULT = 0x80300002u32 as HRESULT;
-pub const PLA_E_DCS_IN_USE: HRESULT = 0x803000AAu32 as HRESULT;
-pub const PLA_E_TOO_MANY_FOLDERS: HRESULT = 0x80300045u32 as HRESULT;
-pub const PLA_E_NO_MIN_DISK: HRESULT = 0x80300070u32 as HRESULT;
-pub const PLA_E_DCS_ALREADY_EXISTS: HRESULT = 0x803000B7u32 as HRESULT;
-pub const PLA_S_PROPERTY_IGNORED: HRESULT = 0x00300100;
-pub const PLA_E_PROPERTY_CONFLICT: HRESULT = 0x80300101u32 as HRESULT;
-pub const PLA_E_DCS_SINGLETON_REQUIRED: HRESULT = 0x80300102u32 as HRESULT;
-pub const PLA_E_CREDENTIALS_REQUIRED: HRESULT = 0x80300103u32 as HRESULT;
-pub const PLA_E_DCS_NOT_RUNNING: HRESULT = 0x80300104u32 as HRESULT;
-pub const PLA_E_CONFLICT_INCL_EXCL_API: HRESULT = 0x80300105u32 as HRESULT;
-pub const PLA_E_NETWORK_EXE_NOT_VALID: HRESULT = 0x80300106u32 as HRESULT;
-pub const PLA_E_EXE_ALREADY_CONFIGURED: HRESULT = 0x80300107u32 as HRESULT;
-pub const PLA_E_EXE_PATH_NOT_VALID: HRESULT = 0x80300108u32 as HRESULT;
-pub const PLA_E_DC_ALREADY_EXISTS: HRESULT = 0x80300109u32 as HRESULT;
-pub const PLA_E_DCS_START_WAIT_TIMEOUT: HRESULT = 0x8030010Au32 as HRESULT;
-pub const PLA_E_DC_START_WAIT_TIMEOUT: HRESULT = 0x8030010Bu32 as HRESULT;
-pub const PLA_E_REPORT_WAIT_TIMEOUT: HRESULT = 0x8030010Cu32 as HRESULT;
-pub const PLA_E_NO_DUPLICATES: HRESULT = 0x8030010Du32 as HRESULT;
-pub const PLA_E_EXE_FULL_PATH_REQUIRED: HRESULT = 0x8030010Eu32 as HRESULT;
-pub const PLA_E_INVALID_SESSION_NAME: HRESULT = 0x8030010Fu32 as HRESULT;
-pub const PLA_E_PLA_CHANNEL_NOT_ENABLED: HRESULT = 0x80300110u32 as HRESULT;
-pub const PLA_E_TASKSCHED_CHANNEL_NOT_ENABLED: HRESULT = 0x80300111u32 as HRESULT;
-pub const PLA_E_RULES_MANAGER_FAILED: HRESULT = 0x80300112u32 as HRESULT;
-pub const PLA_E_CABAPI_FAILURE: HRESULT = 0x80300113u32 as HRESULT;
-pub const FVE_E_LOCKED_VOLUME: HRESULT = 0x80310000u32 as HRESULT;
-pub const FVE_E_NOT_ENCRYPTED: HRESULT = 0x80310001u32 as HRESULT;
-pub const FVE_E_NO_TPM_BIOS: HRESULT = 0x80310002u32 as HRESULT;
-pub const FVE_E_NO_MBR_METRIC: HRESULT = 0x80310003u32 as HRESULT;
-pub const FVE_E_NO_BOOTSECTOR_METRIC: HRESULT = 0x80310004u32 as HRESULT;
-pub const FVE_E_NO_BOOTMGR_METRIC: HRESULT = 0x80310005u32 as HRESULT;
-pub const FVE_E_WRONG_BOOTMGR: HRESULT = 0x80310006u32 as HRESULT;
-pub const FVE_E_SECURE_KEY_REQUIRED: HRESULT = 0x80310007u32 as HRESULT;
-pub const FVE_E_NOT_ACTIVATED: HRESULT = 0x80310008u32 as HRESULT;
-pub const FVE_E_ACTION_NOT_ALLOWED: HRESULT = 0x80310009u32 as HRESULT;
-pub const FVE_E_AD_SCHEMA_NOT_INSTALLED: HRESULT = 0x8031000Au32 as HRESULT;
-pub const FVE_E_AD_INVALID_DATATYPE: HRESULT = 0x8031000Bu32 as HRESULT;
-pub const FVE_E_AD_INVALID_DATASIZE: HRESULT = 0x8031000Cu32 as HRESULT;
-pub const FVE_E_AD_NO_VALUES: HRESULT = 0x8031000Du32 as HRESULT;
-pub const FVE_E_AD_ATTR_NOT_SET: HRESULT = 0x8031000Eu32 as HRESULT;
-pub const FVE_E_AD_GUID_NOT_FOUND: HRESULT = 0x8031000Fu32 as HRESULT;
-pub const FVE_E_BAD_INFORMATION: HRESULT = 0x80310010u32 as HRESULT;
-pub const FVE_E_TOO_SMALL: HRESULT = 0x80310011u32 as HRESULT;
-pub const FVE_E_SYSTEM_VOLUME: HRESULT = 0x80310012u32 as HRESULT;
-pub const FVE_E_FAILED_WRONG_FS: HRESULT = 0x80310013u32 as HRESULT;
-pub const FVE_E_BAD_PARTITION_SIZE: HRESULT = 0x80310014u32 as HRESULT;
-pub const FVE_E_NOT_SUPPORTED: HRESULT = 0x80310015u32 as HRESULT;
-pub const FVE_E_BAD_DATA: HRESULT = 0x80310016u32 as HRESULT;
-pub const FVE_E_VOLUME_NOT_BOUND: HRESULT = 0x80310017u32 as HRESULT;
-pub const FVE_E_TPM_NOT_OWNED: HRESULT = 0x80310018u32 as HRESULT;
-pub const FVE_E_NOT_DATA_VOLUME: HRESULT = 0x80310019u32 as HRESULT;
-pub const FVE_E_AD_INSUFFICIENT_BUFFER: HRESULT = 0x8031001Au32 as HRESULT;
-pub const FVE_E_CONV_READ: HRESULT = 0x8031001Bu32 as HRESULT;
-pub const FVE_E_CONV_WRITE: HRESULT = 0x8031001Cu32 as HRESULT;
-pub const FVE_E_KEY_REQUIRED: HRESULT = 0x8031001Du32 as HRESULT;
-pub const FVE_E_CLUSTERING_NOT_SUPPORTED: HRESULT = 0x8031001Eu32 as HRESULT;
-pub const FVE_E_VOLUME_BOUND_ALREADY: HRESULT = 0x8031001Fu32 as HRESULT;
-pub const FVE_E_OS_NOT_PROTECTED: HRESULT = 0x80310020u32 as HRESULT;
-pub const FVE_E_PROTECTION_DISABLED: HRESULT = 0x80310021u32 as HRESULT;
-pub const FVE_E_RECOVERY_KEY_REQUIRED: HRESULT = 0x80310022u32 as HRESULT;
-pub const FVE_E_FOREIGN_VOLUME: HRESULT = 0x80310023u32 as HRESULT;
-pub const FVE_E_OVERLAPPED_UPDATE: HRESULT = 0x80310024u32 as HRESULT;
-pub const FVE_E_TPM_SRK_AUTH_NOT_ZERO: HRESULT = 0x80310025u32 as HRESULT;
-pub const FVE_E_FAILED_SECTOR_SIZE: HRESULT = 0x80310026u32 as HRESULT;
-pub const FVE_E_FAILED_AUTHENTICATION: HRESULT = 0x80310027u32 as HRESULT;
-pub const FVE_E_NOT_OS_VOLUME: HRESULT = 0x80310028u32 as HRESULT;
-pub const FVE_E_AUTOUNLOCK_ENABLED: HRESULT = 0x80310029u32 as HRESULT;
-pub const FVE_E_WRONG_BOOTSECTOR: HRESULT = 0x8031002Au32 as HRESULT;
-pub const FVE_E_WRONG_SYSTEM_FS: HRESULT = 0x8031002Bu32 as HRESULT;
-pub const FVE_E_POLICY_PASSWORD_REQUIRED: HRESULT = 0x8031002Cu32 as HRESULT;
-pub const FVE_E_CANNOT_SET_FVEK_ENCRYPTED: HRESULT = 0x8031002Du32 as HRESULT;
-pub const FVE_E_CANNOT_ENCRYPT_NO_KEY: HRESULT = 0x8031002Eu32 as HRESULT;
-pub const FVE_E_BOOTABLE_CDDVD: HRESULT = 0x80310030u32 as HRESULT;
-pub const FVE_E_PROTECTOR_EXISTS: HRESULT = 0x80310031u32 as HRESULT;
-pub const FVE_E_RELATIVE_PATH: HRESULT = 0x80310032u32 as HRESULT;
-pub const FVE_E_PROTECTOR_NOT_FOUND: HRESULT = 0x80310033u32 as HRESULT;
-pub const FVE_E_INVALID_KEY_FORMAT: HRESULT = 0x80310034u32 as HRESULT;
-pub const FVE_E_INVALID_PASSWORD_FORMAT: HRESULT = 0x80310035u32 as HRESULT;
-pub const FVE_E_FIPS_RNG_CHECK_FAILED: HRESULT = 0x80310036u32 as HRESULT;
-pub const FVE_E_FIPS_PREVENTS_RECOVERY_PASSWORD: HRESULT = 0x80310037u32 as HRESULT;
-pub const FVE_E_FIPS_PREVENTS_EXTERNAL_KEY_EXPORT: HRESULT = 0x80310038u32 as HRESULT;
-pub const FVE_E_NOT_DECRYPTED: HRESULT = 0x80310039u32 as HRESULT;
-pub const FVE_E_INVALID_PROTECTOR_TYPE: HRESULT = 0x8031003Au32 as HRESULT;
-pub const FVE_E_NO_PROTECTORS_TO_TEST: HRESULT = 0x8031003Bu32 as HRESULT;
-pub const FVE_E_KEYFILE_NOT_FOUND: HRESULT = 0x8031003Cu32 as HRESULT;
-pub const FVE_E_KEYFILE_INVALID: HRESULT = 0x8031003Du32 as HRESULT;
-pub const FVE_E_KEYFILE_NO_VMK: HRESULT = 0x8031003Eu32 as HRESULT;
-pub const FVE_E_TPM_DISABLED: HRESULT = 0x8031003Fu32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_IN_SAFE_MODE: HRESULT = 0x80310040u32 as HRESULT;
-pub const FVE_E_TPM_INVALID_PCR: HRESULT = 0x80310041u32 as HRESULT;
-pub const FVE_E_TPM_NO_VMK: HRESULT = 0x80310042u32 as HRESULT;
-pub const FVE_E_PIN_INVALID: HRESULT = 0x80310043u32 as HRESULT;
-pub const FVE_E_AUTH_INVALID_APPLICATION: HRESULT = 0x80310044u32 as HRESULT;
-pub const FVE_E_AUTH_INVALID_CONFIG: HRESULT = 0x80310045u32 as HRESULT;
-pub const FVE_E_FIPS_DISABLE_PROTECTION_NOT_ALLOWED: HRESULT = 0x80310046u32 as HRESULT;
-pub const FVE_E_FS_NOT_EXTENDED: HRESULT = 0x80310047u32 as HRESULT;
-pub const FVE_E_FIRMWARE_TYPE_NOT_SUPPORTED: HRESULT = 0x80310048u32 as HRESULT;
-pub const FVE_E_NO_LICENSE: HRESULT = 0x80310049u32 as HRESULT;
-pub const FVE_E_NOT_ON_STACK: HRESULT = 0x8031004Au32 as HRESULT;
-pub const FVE_E_FS_MOUNTED: HRESULT = 0x8031004Bu32 as HRESULT;
-pub const FVE_E_TOKEN_NOT_IMPERSONATED: HRESULT = 0x8031004Cu32 as HRESULT;
-pub const FVE_E_DRY_RUN_FAILED: HRESULT = 0x8031004Du32 as HRESULT;
-pub const FVE_E_REBOOT_REQUIRED: HRESULT = 0x8031004Eu32 as HRESULT;
-pub const FVE_E_DEBUGGER_ENABLED: HRESULT = 0x8031004Fu32 as HRESULT;
-pub const FVE_E_RAW_ACCESS: HRESULT = 0x80310050u32 as HRESULT;
-pub const FVE_E_RAW_BLOCKED: HRESULT = 0x80310051u32 as HRESULT;
-pub const FVE_E_BCD_APPLICATIONS_PATH_INCORRECT: HRESULT = 0x80310052u32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_IN_VERSION: HRESULT = 0x80310053u32 as HRESULT;
-pub const FVE_E_NO_AUTOUNLOCK_MASTER_KEY: HRESULT = 0x80310054u32 as HRESULT;
-pub const FVE_E_MOR_FAILED: HRESULT = 0x80310055u32 as HRESULT;
-pub const FVE_E_HIDDEN_VOLUME: HRESULT = 0x80310056u32 as HRESULT;
-pub const FVE_E_TRANSIENT_STATE: HRESULT = 0x80310057u32 as HRESULT;
-pub const FVE_E_PUBKEY_NOT_ALLOWED: HRESULT = 0x80310058u32 as HRESULT;
-pub const FVE_E_VOLUME_HANDLE_OPEN: HRESULT = 0x80310059u32 as HRESULT;
-pub const FVE_E_NO_FEATURE_LICENSE: HRESULT = 0x8031005Au32 as HRESULT;
-pub const FVE_E_INVALID_STARTUP_OPTIONS: HRESULT = 0x8031005Bu32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_PASSWORD_NOT_ALLOWED: HRESULT = 0x8031005Cu32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_PASSWORD_REQUIRED: HRESULT = 0x8031005Du32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_KEY_NOT_ALLOWED: HRESULT = 0x8031005Eu32 as HRESULT;
-pub const FVE_E_POLICY_RECOVERY_KEY_REQUIRED: HRESULT = 0x8031005Fu32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_NOT_ALLOWED: HRESULT = 0x80310060u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_REQUIRED: HRESULT = 0x80310061u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_KEY_NOT_ALLOWED: HRESULT = 0x80310062u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_KEY_REQUIRED: HRESULT = 0x80310063u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_KEY_NOT_ALLOWED: HRESULT = 0x80310064u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_PIN_KEY_REQUIRED: HRESULT = 0x80310065u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_TPM_NOT_ALLOWED: HRESULT = 0x80310066u32 as HRESULT;
-pub const FVE_E_POLICY_STARTUP_TPM_REQUIRED: HRESULT = 0x80310067u32 as HRESULT;
-pub const FVE_E_POLICY_INVALID_PIN_LENGTH: HRESULT = 0x80310068u32 as HRESULT;
-pub const FVE_E_KEY_PROTECTOR_NOT_SUPPORTED: HRESULT = 0x80310069u32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_NOT_ALLOWED: HRESULT = 0x8031006Au32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_REQUIRED: HRESULT = 0x8031006Bu32 as HRESULT;
-pub const FVE_E_FIPS_PREVENTS_PASSPHRASE: HRESULT = 0x8031006Cu32 as HRESULT;
-pub const FVE_E_OS_VOLUME_PASSPHRASE_NOT_ALLOWED: HRESULT = 0x8031006Du32 as HRESULT;
-pub const FVE_E_INVALID_BITLOCKER_OID: HRESULT = 0x8031006Eu32 as HRESULT;
-pub const FVE_E_VOLUME_TOO_SMALL: HRESULT = 0x8031006Fu32 as HRESULT;
-pub const FVE_E_DV_NOT_SUPPORTED_ON_FS: HRESULT = 0x80310070u32 as HRESULT;
-pub const FVE_E_DV_NOT_ALLOWED_BY_GP: HRESULT = 0x80310071u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CERTIFICATE_NOT_ALLOWED: HRESULT = 0x80310072u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CERTIFICATE_REQUIRED: HRESULT = 0x80310073u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CERT_MUST_BE_HW: HRESULT = 0x80310074u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CONFIGURE_FDV_AUTOUNLOCK_NOT_ALLOWED: HRESULT = 0x80310075u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CONFIGURE_RDV_AUTOUNLOCK_NOT_ALLOWED: HRESULT = 0x80310076u32 as HRESULT;
-pub const FVE_E_POLICY_USER_CONFIGURE_RDV_NOT_ALLOWED: HRESULT = 0x80310077u32 as HRESULT;
-pub const FVE_E_POLICY_USER_ENABLE_RDV_NOT_ALLOWED: HRESULT = 0x80310078u32 as HRESULT;
-pub const FVE_E_POLICY_USER_DISABLE_RDV_NOT_ALLOWED: HRESULT = 0x80310079u32 as HRESULT;
-pub const FVE_E_POLICY_INVALID_PASSPHRASE_LENGTH: HRESULT = 0x80310080u32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_TOO_SIMPLE: HRESULT = 0x80310081u32 as HRESULT;
-pub const FVE_E_RECOVERY_PARTITION: HRESULT = 0x80310082u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_FDV_RK_OFF_AUK_ON: HRESULT = 0x80310083u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_RDV_RK_OFF_AUK_ON: HRESULT = 0x80310084u32 as HRESULT;
-pub const FVE_E_NON_BITLOCKER_OID: HRESULT = 0x80310085u32 as HRESULT;
-pub const FVE_E_POLICY_PROHIBITS_SELFSIGNED: HRESULT = 0x80310086u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_RO_AND_STARTUP_KEY_REQUIRED: HRESULT = 0x80310087u32 as HRESULT;
-pub const FVE_E_CONV_RECOVERY_FAILED: HRESULT = 0x80310088u32 as HRESULT;
-pub const FVE_E_VIRTUALIZED_SPACE_TOO_BIG: HRESULT = 0x80310089u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_OSV_RP_OFF_ADB_ON: HRESULT = 0x80310090u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_FDV_RP_OFF_ADB_ON: HRESULT = 0x80310091u32 as HRESULT;
-pub const FVE_E_POLICY_CONFLICT_RDV_RP_OFF_ADB_ON: HRESULT = 0x80310092u32 as HRESULT;
-pub const FVE_E_NON_BITLOCKER_KU: HRESULT = 0x80310093u32 as HRESULT;
-pub const FVE_E_PRIVATEKEY_AUTH_FAILED: HRESULT = 0x80310094u32 as HRESULT;
-pub const FVE_E_REMOVAL_OF_DRA_FAILED: HRESULT = 0x80310095u32 as HRESULT;
-pub const FVE_E_OPERATION_NOT_SUPPORTED_ON_VISTA_VOLUME: HRESULT = 0x80310096u32 as HRESULT;
-pub const FVE_E_CANT_LOCK_AUTOUNLOCK_ENABLED_VOLUME: HRESULT = 0x80310097u32 as HRESULT;
-pub const FVE_E_FIPS_HASH_KDF_NOT_ALLOWED: HRESULT = 0x80310098u32 as HRESULT;
-pub const FVE_E_ENH_PIN_INVALID: HRESULT = 0x80310099u32 as HRESULT;
-pub const FVE_E_INVALID_PIN_CHARS: HRESULT = 0x8031009Au32 as HRESULT;
-pub const FVE_E_INVALID_DATUM_TYPE: HRESULT = 0x8031009Bu32 as HRESULT;
-pub const FVE_E_EFI_ONLY: HRESULT = 0x8031009Cu32 as HRESULT;
-pub const FVE_E_MULTIPLE_NKP_CERTS: HRESULT = 0x8031009Du32 as HRESULT;
-pub const FVE_E_REMOVAL_OF_NKP_FAILED: HRESULT = 0x8031009Eu32 as HRESULT;
-pub const FVE_E_INVALID_NKP_CERT: HRESULT = 0x8031009Fu32 as HRESULT;
-pub const FVE_E_NO_EXISTING_PIN: HRESULT = 0x803100A0u32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_PIN_MISMATCH: HRESULT = 0x803100A1u32 as HRESULT;
-pub const FVE_E_PIN_PROTECTOR_CHANGE_BY_STD_USER_DISALLOWED: HRESULT = 0x803100A2u32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_MAX_PIN_CHANGE_ATTEMPTS_REACHED: HRESULT = 0x803100A3u32 as HRESULT;
-pub const FVE_E_POLICY_PASSPHRASE_REQUIRES_ASCII: HRESULT = 0x803100A4u32 as HRESULT;
-pub const FVE_E_FULL_ENCRYPTION_NOT_ALLOWED_ON_TP_STORAGE: HRESULT = 0x803100A5u32 as HRESULT;
-pub const FVE_E_WIPE_NOT_ALLOWED_ON_TP_STORAGE: HRESULT = 0x803100A6u32 as HRESULT;
-pub const FVE_E_KEY_LENGTH_NOT_SUPPORTED_BY_EDRIVE: HRESULT = 0x803100A7u32 as HRESULT;
-pub const FVE_E_NO_EXISTING_PASSPHRASE: HRESULT = 0x803100A8u32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_PASSPHRASE_MISMATCH: HRESULT = 0x803100A9u32 as HRESULT;
-pub const FVE_E_PASSPHRASE_TOO_LONG: HRESULT = 0x803100AAu32 as HRESULT;
-pub const FVE_E_NO_PASSPHRASE_WITH_TPM: HRESULT = 0x803100ABu32 as HRESULT;
-pub const FVE_E_NO_TPM_WITH_PASSPHRASE: HRESULT = 0x803100ACu32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_ON_CSV_STACK: HRESULT = 0x803100ADu32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_ON_CLUSTER: HRESULT = 0x803100AEu32 as HRESULT;
-pub const FVE_E_EDRIVE_NO_FAILOVER_TO_SW: HRESULT = 0x803100AFu32 as HRESULT;
-pub const FVE_E_EDRIVE_BAND_IN_USE: HRESULT = 0x803100B0u32 as HRESULT;
-pub const FVE_E_EDRIVE_DISALLOWED_BY_GP: HRESULT = 0x803100B1u32 as HRESULT;
-pub const FVE_E_EDRIVE_INCOMPATIBLE_VOLUME: HRESULT = 0x803100B2u32 as HRESULT;
-pub const FVE_E_NOT_ALLOWED_TO_UPGRADE_WHILE_CONVERTING: HRESULT = 0x803100B3u32 as HRESULT;
-pub const FVE_E_EDRIVE_DV_NOT_SUPPORTED: HRESULT = 0x803100B4u32 as HRESULT;
-pub const FVE_E_NO_PREBOOT_KEYBOARD_DETECTED: HRESULT = 0x803100B5u32 as HRESULT;
-pub const FVE_E_NO_PREBOOT_KEYBOARD_OR_WINRE_DETECTED: HRESULT = 0x803100B6u32 as HRESULT;
-pub const FVE_E_POLICY_REQUIRES_STARTUP_PIN_ON_TOUCH_DEVICE: HRESULT = 0x803100B7u32 as HRESULT;
-pub const FVE_E_POLICY_REQUIRES_RECOVERY_PASSWORD_ON_TOUCH_DEVICE: HRESULT = 0x803100B8u32 as HRESULT;
-pub const FVE_E_WIPE_CANCEL_NOT_APPLICABLE: HRESULT = 0x803100B9u32 as HRESULT;
-pub const FVE_E_SECUREBOOT_DISABLED: HRESULT = 0x803100BAu32 as HRESULT;
-pub const FVE_E_SECUREBOOT_CONFIGURATION_INVALID: HRESULT = 0x803100BBu32 as HRESULT;
-pub const FVE_E_EDRIVE_DRY_RUN_FAILED: HRESULT = 0x803100BCu32 as HRESULT;
-pub const FVE_E_SHADOW_COPY_PRESENT: HRESULT = 0x803100BDu32 as HRESULT;
-pub const FVE_E_POLICY_INVALID_ENHANCED_BCD_SETTINGS: HRESULT = 0x803100BEu32 as HRESULT;
-pub const FVE_E_EDRIVE_INCOMPATIBLE_FIRMWARE: HRESULT = 0x803100BFu32 as HRESULT;
-pub const FVE_E_PROTECTOR_CHANGE_MAX_PASSPHRASE_CHANGE_ATTEMPTS_REACHED: HRESULT = 0x803100C0u32 as HRESULT;
-pub const FVE_E_PASSPHRASE_PROTECTOR_CHANGE_BY_STD_USER_DISALLOWED: HRESULT = 0x803100C1u32 as HRESULT;
-pub const FVE_E_LIVEID_ACCOUNT_SUSPENDED: HRESULT = 0x803100C2u32 as HRESULT;
-pub const FVE_E_LIVEID_ACCOUNT_BLOCKED: HRESULT = 0x803100C3u32 as HRESULT;
-pub const FVE_E_NOT_PROVISIONED_ON_ALL_VOLUMES: HRESULT = 0x803100C4u32 as HRESULT;
-pub const FVE_E_DE_FIXED_DATA_NOT_SUPPORTED: HRESULT = 0x803100C5u32 as HRESULT;
-pub const FVE_E_DE_HARDWARE_NOT_COMPLIANT: HRESULT = 0x803100C6u32 as HRESULT;
-pub const FVE_E_DE_WINRE_NOT_CONFIGURED: HRESULT = 0x803100C7u32 as HRESULT;
-pub const FVE_E_DE_PROTECTION_SUSPENDED: HRESULT = 0x803100C8u32 as HRESULT;
-pub const FVE_E_DE_OS_VOLUME_NOT_PROTECTED: HRESULT = 0x803100C9u32 as HRESULT;
-pub const FVE_E_DE_DEVICE_LOCKEDOUT: HRESULT = 0x803100CAu32 as HRESULT;
-pub const FVE_E_DE_PROTECTION_NOT_YET_ENABLED: HRESULT = 0x803100CBu32 as HRESULT;
-pub const FVE_E_INVALID_PIN_CHARS_DETAILED: HRESULT = 0x803100CCu32 as HRESULT;
-pub const FVE_E_DEVICE_LOCKOUT_COUNTER_UNAVAILABLE: HRESULT = 0x803100CDu32 as HRESULT;
-pub const FVE_E_DEVICELOCKOUT_COUNTER_MISMATCH: HRESULT = 0x803100CEu32 as HRESULT;
-pub const FVE_E_BUFFER_TOO_LARGE: HRESULT = 0x803100CFu32 as HRESULT;
-pub const FVE_E_NO_SUCH_CAPABILITY_ON_TARGET: HRESULT = 0x803100D0u32 as HRESULT;
-pub const FVE_E_DE_PREVENTED_FOR_OS: HRESULT = 0x803100D1u32 as HRESULT;
-pub const FVE_E_DE_VOLUME_OPTED_OUT: HRESULT = 0x803100D2u32 as HRESULT;
-pub const FVE_E_DE_VOLUME_NOT_SUPPORTED: HRESULT = 0x803100D3u32 as HRESULT;
-pub const FVE_E_EOW_NOT_SUPPORTED_IN_VERSION: HRESULT = 0x803100D4u32 as HRESULT;
-pub const FVE_E_ADBACKUP_NOT_ENABLED: HRESULT = 0x803100D5u32 as HRESULT;
-pub const FVE_E_VOLUME_EXTEND_PREVENTS_EOW_DECRYPT: HRESULT = 0x803100D6u32 as HRESULT;
-pub const FVE_E_NOT_DE_VOLUME: HRESULT = 0x803100D7u32 as HRESULT;
-pub const FVE_E_PROTECTION_CANNOT_BE_DISABLED: HRESULT = 0x803100D8u32 as HRESULT;
-pub const FWP_E_CALLOUT_NOT_FOUND: HRESULT = 0x80320001u32 as HRESULT;
-pub const FWP_E_CONDITION_NOT_FOUND: HRESULT = 0x80320002u32 as HRESULT;
-pub const FWP_E_FILTER_NOT_FOUND: HRESULT = 0x80320003u32 as HRESULT;
-pub const FWP_E_LAYER_NOT_FOUND: HRESULT = 0x80320004u32 as HRESULT;
-pub const FWP_E_PROVIDER_NOT_FOUND: HRESULT = 0x80320005u32 as HRESULT;
-pub const FWP_E_PROVIDER_CONTEXT_NOT_FOUND: HRESULT = 0x80320006u32 as HRESULT;
-pub const FWP_E_SUBLAYER_NOT_FOUND: HRESULT = 0x80320007u32 as HRESULT;
-pub const FWP_E_NOT_FOUND: HRESULT = 0x80320008u32 as HRESULT;
-pub const FWP_E_ALREADY_EXISTS: HRESULT = 0x80320009u32 as HRESULT;
-pub const FWP_E_IN_USE: HRESULT = 0x8032000Au32 as HRESULT;
-pub const FWP_E_DYNAMIC_SESSION_IN_PROGRESS: HRESULT = 0x8032000Bu32 as HRESULT;
-pub const FWP_E_WRONG_SESSION: HRESULT = 0x8032000Cu32 as HRESULT;
-pub const FWP_E_NO_TXN_IN_PROGRESS: HRESULT = 0x8032000Du32 as HRESULT;
-pub const FWP_E_TXN_IN_PROGRESS: HRESULT = 0x8032000Eu32 as HRESULT;
-pub const FWP_E_TXN_ABORTED: HRESULT = 0x8032000Fu32 as HRESULT;
-pub const FWP_E_SESSION_ABORTED: HRESULT = 0x80320010u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_TXN: HRESULT = 0x80320011u32 as HRESULT;
-pub const FWP_E_TIMEOUT: HRESULT = 0x80320012u32 as HRESULT;
-pub const FWP_E_NET_EVENTS_DISABLED: HRESULT = 0x80320013u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_LAYER: HRESULT = 0x80320014u32 as HRESULT;
-pub const FWP_E_KM_CLIENTS_ONLY: HRESULT = 0x80320015u32 as HRESULT;
-pub const FWP_E_LIFETIME_MISMATCH: HRESULT = 0x80320016u32 as HRESULT;
-pub const FWP_E_BUILTIN_OBJECT: HRESULT = 0x80320017u32 as HRESULT;
-pub const FWP_E_TOO_MANY_CALLOUTS: HRESULT = 0x80320018u32 as HRESULT;
-pub const FWP_E_NOTIFICATION_DROPPED: HRESULT = 0x80320019u32 as HRESULT;
-pub const FWP_E_TRAFFIC_MISMATCH: HRESULT = 0x8032001Au32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_SA_STATE: HRESULT = 0x8032001Bu32 as HRESULT;
-pub const FWP_E_NULL_POINTER: HRESULT = 0x8032001Cu32 as HRESULT;
-pub const FWP_E_INVALID_ENUMERATOR: HRESULT = 0x8032001Du32 as HRESULT;
-pub const FWP_E_INVALID_FLAGS: HRESULT = 0x8032001Eu32 as HRESULT;
-pub const FWP_E_INVALID_NET_MASK: HRESULT = 0x8032001Fu32 as HRESULT;
-pub const FWP_E_INVALID_RANGE: HRESULT = 0x80320020u32 as HRESULT;
-pub const FWP_E_INVALID_INTERVAL: HRESULT = 0x80320021u32 as HRESULT;
-pub const FWP_E_ZERO_LENGTH_ARRAY: HRESULT = 0x80320022u32 as HRESULT;
-pub const FWP_E_NULL_DISPLAY_NAME: HRESULT = 0x80320023u32 as HRESULT;
-pub const FWP_E_INVALID_ACTION_TYPE: HRESULT = 0x80320024u32 as HRESULT;
-pub const FWP_E_INVALID_WEIGHT: HRESULT = 0x80320025u32 as HRESULT;
-pub const FWP_E_MATCH_TYPE_MISMATCH: HRESULT = 0x80320026u32 as HRESULT;
-pub const FWP_E_TYPE_MISMATCH: HRESULT = 0x80320027u32 as HRESULT;
-pub const FWP_E_OUT_OF_BOUNDS: HRESULT = 0x80320028u32 as HRESULT;
-pub const FWP_E_RESERVED: HRESULT = 0x80320029u32 as HRESULT;
-pub const FWP_E_DUPLICATE_CONDITION: HRESULT = 0x8032002Au32 as HRESULT;
-pub const FWP_E_DUPLICATE_KEYMOD: HRESULT = 0x8032002Bu32 as HRESULT;
-pub const FWP_E_ACTION_INCOMPATIBLE_WITH_LAYER: HRESULT = 0x8032002Cu32 as HRESULT;
-pub const FWP_E_ACTION_INCOMPATIBLE_WITH_SUBLAYER: HRESULT = 0x8032002Du32 as HRESULT;
-pub const FWP_E_CONTEXT_INCOMPATIBLE_WITH_LAYER: HRESULT = 0x8032002Eu32 as HRESULT;
-pub const FWP_E_CONTEXT_INCOMPATIBLE_WITH_CALLOUT: HRESULT = 0x8032002Fu32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_AUTH_METHOD: HRESULT = 0x80320030u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_DH_GROUP: HRESULT = 0x80320031u32 as HRESULT;
-pub const FWP_E_EM_NOT_SUPPORTED: HRESULT = 0x80320032u32 as HRESULT;
-pub const FWP_E_NEVER_MATCH: HRESULT = 0x80320033u32 as HRESULT;
-pub const FWP_E_PROVIDER_CONTEXT_MISMATCH: HRESULT = 0x80320034u32 as HRESULT;
-pub const FWP_E_INVALID_PARAMETER: HRESULT = 0x80320035u32 as HRESULT;
-pub const FWP_E_TOO_MANY_SUBLAYERS: HRESULT = 0x80320036u32 as HRESULT;
-pub const FWP_E_CALLOUT_NOTIFICATION_FAILED: HRESULT = 0x80320037u32 as HRESULT;
-pub const FWP_E_INVALID_AUTH_TRANSFORM: HRESULT = 0x80320038u32 as HRESULT;
-pub const FWP_E_INVALID_CIPHER_TRANSFORM: HRESULT = 0x80320039u32 as HRESULT;
-pub const FWP_E_INCOMPATIBLE_CIPHER_TRANSFORM: HRESULT = 0x8032003Au32 as HRESULT;
-pub const FWP_E_INVALID_TRANSFORM_COMBINATION: HRESULT = 0x8032003Bu32 as HRESULT;
-pub const FWP_E_DUPLICATE_AUTH_METHOD: HRESULT = 0x8032003Cu32 as HRESULT;
-pub const FWP_E_INVALID_TUNNEL_ENDPOINT: HRESULT = 0x8032003Du32 as HRESULT;
-pub const FWP_E_L2_DRIVER_NOT_READY: HRESULT = 0x8032003Eu32 as HRESULT;
-pub const FWP_E_KEY_DICTATOR_ALREADY_REGISTERED: HRESULT = 0x8032003Fu32 as HRESULT;
-pub const FWP_E_KEY_DICTATION_INVALID_KEYING_MATERIAL: HRESULT = 0x80320040u32 as HRESULT;
-pub const FWP_E_CONNECTIONS_DISABLED: HRESULT = 0x80320041u32 as HRESULT;
-pub const FWP_E_INVALID_DNS_NAME: HRESULT = 0x80320042u32 as HRESULT;
-pub const FWP_E_STILL_ON: HRESULT = 0x80320043u32 as HRESULT;
-pub const FWP_E_IKEEXT_NOT_RUNNING: HRESULT = 0x80320044u32 as HRESULT;
-pub const FWP_E_DROP_NOICMP: HRESULT = 0x80320104u32 as HRESULT;
-pub const WS_S_ASYNC: HRESULT = 0x003D0000;
-pub const WS_S_END: HRESULT = 0x003D0001;
-pub const WS_E_INVALID_FORMAT: HRESULT = 0x803D0000u32 as HRESULT;
-pub const WS_E_OBJECT_FAULTED: HRESULT = 0x803D0001u32 as HRESULT;
-pub const WS_E_NUMERIC_OVERFLOW: HRESULT = 0x803D0002u32 as HRESULT;
-pub const WS_E_INVALID_OPERATION: HRESULT = 0x803D0003u32 as HRESULT;
-pub const WS_E_OPERATION_ABORTED: HRESULT = 0x803D0004u32 as HRESULT;
-pub const WS_E_ENDPOINT_ACCESS_DENIED: HRESULT = 0x803D0005u32 as HRESULT;
-pub const WS_E_OPERATION_TIMED_OUT: HRESULT = 0x803D0006u32 as HRESULT;
-pub const WS_E_OPERATION_ABANDONED: HRESULT = 0x803D0007u32 as HRESULT;
-pub const WS_E_QUOTA_EXCEEDED: HRESULT = 0x803D0008u32 as HRESULT;
-pub const WS_E_NO_TRANSLATION_AVAILABLE: HRESULT = 0x803D0009u32 as HRESULT;
-pub const WS_E_SECURITY_VERIFICATION_FAILURE: HRESULT = 0x803D000Au32 as HRESULT;
-pub const WS_E_ADDRESS_IN_USE: HRESULT = 0x803D000Bu32 as HRESULT;
-pub const WS_E_ADDRESS_NOT_AVAILABLE: HRESULT = 0x803D000Cu32 as HRESULT;
-pub const WS_E_ENDPOINT_NOT_FOUND: HRESULT = 0x803D000Du32 as HRESULT;
-pub const WS_E_ENDPOINT_NOT_AVAILABLE: HRESULT = 0x803D000Eu32 as HRESULT;
-pub const WS_E_ENDPOINT_FAILURE: HRESULT = 0x803D000Fu32 as HRESULT;
-pub const WS_E_ENDPOINT_UNREACHABLE: HRESULT = 0x803D0010u32 as HRESULT;
-pub const WS_E_ENDPOINT_ACTION_NOT_SUPPORTED: HRESULT = 0x803D0011u32 as HRESULT;
-pub const WS_E_ENDPOINT_TOO_BUSY: HRESULT = 0x803D0012u32 as HRESULT;
-pub const WS_E_ENDPOINT_FAULT_RECEIVED: HRESULT = 0x803D0013u32 as HRESULT;
-pub const WS_E_ENDPOINT_DISCONNECTED: HRESULT = 0x803D0014u32 as HRESULT;
-pub const WS_E_PROXY_FAILURE: HRESULT = 0x803D0015u32 as HRESULT;
-pub const WS_E_PROXY_ACCESS_DENIED: HRESULT = 0x803D0016u32 as HRESULT;
-pub const WS_E_NOT_SUPPORTED: HRESULT = 0x803D0017u32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_BASIC_AUTH: HRESULT = 0x803D0018u32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_DIGEST_AUTH: HRESULT = 0x803D0019u32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_NTLM_AUTH: HRESULT = 0x803D001Au32 as HRESULT;
-pub const WS_E_PROXY_REQUIRES_NEGOTIATE_AUTH: HRESULT = 0x803D001Bu32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_BASIC_AUTH: HRESULT = 0x803D001Cu32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_DIGEST_AUTH: HRESULT = 0x803D001Du32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_NTLM_AUTH: HRESULT = 0x803D001Eu32 as HRESULT;
-pub const WS_E_SERVER_REQUIRES_NEGOTIATE_AUTH: HRESULT = 0x803D001Fu32 as HRESULT;
-pub const WS_E_INVALID_ENDPOINT_URL: HRESULT = 0x803D0020u32 as HRESULT;
-pub const WS_E_OTHER: HRESULT = 0x803D0021u32 as HRESULT;
-pub const WS_E_SECURITY_TOKEN_EXPIRED: HRESULT = 0x803D0022u32 as HRESULT;
-pub const WS_E_SECURITY_SYSTEM_FAILURE: HRESULT = 0x803D0023u32 as HRESULT;
-pub const ERROR_NDIS_INTERFACE_CLOSING: HRESULT = 0x80340002u32 as HRESULT;
-pub const ERROR_NDIS_BAD_VERSION: HRESULT = 0x80340004u32 as HRESULT;
-pub const ERROR_NDIS_BAD_CHARACTERISTICS: HRESULT = 0x80340005u32 as HRESULT;
-pub const ERROR_NDIS_ADAPTER_NOT_FOUND: HRESULT = 0x80340006u32 as HRESULT;
-pub const ERROR_NDIS_OPEN_FAILED: HRESULT = 0x80340007u32 as HRESULT;
-pub const ERROR_NDIS_DEVICE_FAILED: HRESULT = 0x80340008u32 as HRESULT;
-pub const ERROR_NDIS_MULTICAST_FULL: HRESULT = 0x80340009u32 as HRESULT;
-pub const ERROR_NDIS_MULTICAST_EXISTS: HRESULT = 0x8034000Au32 as HRESULT;
-pub const ERROR_NDIS_MULTICAST_NOT_FOUND: HRESULT = 0x8034000Bu32 as HRESULT;
-pub const ERROR_NDIS_REQUEST_ABORTED: HRESULT = 0x8034000Cu32 as HRESULT;
-pub const ERROR_NDIS_RESET_IN_PROGRESS: HRESULT = 0x8034000Du32 as HRESULT;
-pub const ERROR_NDIS_NOT_SUPPORTED: HRESULT = 0x803400BBu32 as HRESULT;
-pub const ERROR_NDIS_INVALID_PACKET: HRESULT = 0x8034000Fu32 as HRESULT;
-pub const ERROR_NDIS_ADAPTER_NOT_READY: HRESULT = 0x80340011u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_LENGTH: HRESULT = 0x80340014u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_DATA: HRESULT = 0x80340015u32 as HRESULT;
-pub const ERROR_NDIS_BUFFER_TOO_SHORT: HRESULT = 0x80340016u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_OID: HRESULT = 0x80340017u32 as HRESULT;
-pub const ERROR_NDIS_ADAPTER_REMOVED: HRESULT = 0x80340018u32 as HRESULT;
-pub const ERROR_NDIS_UNSUPPORTED_MEDIA: HRESULT = 0x80340019u32 as HRESULT;
-pub const ERROR_NDIS_GROUP_ADDRESS_IN_USE: HRESULT = 0x8034001Au32 as HRESULT;
-pub const ERROR_NDIS_FILE_NOT_FOUND: HRESULT = 0x8034001Bu32 as HRESULT;
-pub const ERROR_NDIS_ERROR_READING_FILE: HRESULT = 0x8034001Cu32 as HRESULT;
-pub const ERROR_NDIS_ALREADY_MAPPED: HRESULT = 0x8034001Du32 as HRESULT;
-pub const ERROR_NDIS_RESOURCE_CONFLICT: HRESULT = 0x8034001Eu32 as HRESULT;
-pub const ERROR_NDIS_MEDIA_DISCONNECTED: HRESULT = 0x8034001Fu32 as HRESULT;
-pub const ERROR_NDIS_INVALID_ADDRESS: HRESULT = 0x80340022u32 as HRESULT;
-pub const ERROR_NDIS_INVALID_DEVICE_REQUEST: HRESULT = 0x80340010u32 as HRESULT;
-pub const ERROR_NDIS_PAUSED: HRESULT = 0x8034002Au32 as HRESULT;
-pub const ERROR_NDIS_INTERFACE_NOT_FOUND: HRESULT = 0x8034002Bu32 as HRESULT;
-pub const ERROR_NDIS_UNSUPPORTED_REVISION: HRESULT = 0x8034002Cu32 as HRESULT;
-pub const ERROR_NDIS_INVALID_PORT: HRESULT = 0x8034002Du32 as HRESULT;
-pub const ERROR_NDIS_INVALID_PORT_STATE: HRESULT = 0x8034002Eu32 as HRESULT;
-pub const ERROR_NDIS_LOW_POWER_STATE: HRESULT = 0x8034002Fu32 as HRESULT;
-pub const ERROR_NDIS_REINIT_REQUIRED: HRESULT = 0x80340030u32 as HRESULT;
-pub const ERROR_NDIS_DOT11_AUTO_CONFIG_ENABLED: HRESULT = 0x80342000u32 as HRESULT;
-pub const ERROR_NDIS_DOT11_MEDIA_IN_USE: HRESULT = 0x80342001u32 as HRESULT;
-pub const ERROR_NDIS_DOT11_POWER_STATE_INVALID: HRESULT = 0x80342002u32 as HRESULT;
-pub const ERROR_NDIS_PM_WOL_PATTERN_LIST_FULL: HRESULT = 0x80342003u32 as HRESULT;
-pub const ERROR_NDIS_PM_PROTOCOL_OFFLOAD_LIST_FULL: HRESULT = 0x80342004u32 as HRESULT;
-pub const ERROR_NDIS_INDICATION_REQUIRED: HRESULT = 0x00340001;
-pub const ERROR_NDIS_OFFLOAD_POLICY: HRESULT = 0xC034100Fu32 as HRESULT;
-pub const ERROR_NDIS_OFFLOAD_CONNECTION_REJECTED: HRESULT = 0xC0341012u32 as HRESULT;
-pub const ERROR_NDIS_OFFLOAD_PATH_REJECTED: HRESULT = 0xC0341013u32 as HRESULT;
-pub const ERROR_HV_INVALID_HYPERCALL_CODE: HRESULT = 0xC0350002u32 as HRESULT;
-pub const ERROR_HV_INVALID_HYPERCALL_INPUT: HRESULT = 0xC0350003u32 as HRESULT;
-pub const ERROR_HV_INVALID_ALIGNMENT: HRESULT = 0xC0350004u32 as HRESULT;
-pub const ERROR_HV_INVALID_PARAMETER: HRESULT = 0xC0350005u32 as HRESULT;
-pub const ERROR_HV_ACCESS_DENIED: HRESULT = 0xC0350006u32 as HRESULT;
-pub const ERROR_HV_INVALID_PARTITION_STATE: HRESULT = 0xC0350007u32 as HRESULT;
-pub const ERROR_HV_OPERATION_DENIED: HRESULT = 0xC0350008u32 as HRESULT;
-pub const ERROR_HV_UNKNOWN_PROPERTY: HRESULT = 0xC0350009u32 as HRESULT;
-pub const ERROR_HV_PROPERTY_VALUE_OUT_OF_RANGE: HRESULT = 0xC035000Au32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_MEMORY: HRESULT = 0xC035000Bu32 as HRESULT;
-pub const ERROR_HV_PARTITION_TOO_DEEP: HRESULT = 0xC035000Cu32 as HRESULT;
-pub const ERROR_HV_INVALID_PARTITION_ID: HRESULT = 0xC035000Du32 as HRESULT;
-pub const ERROR_HV_INVALID_VP_INDEX: HRESULT = 0xC035000Eu32 as HRESULT;
-pub const ERROR_HV_INVALID_PORT_ID: HRESULT = 0xC0350011u32 as HRESULT;
-pub const ERROR_HV_INVALID_CONNECTION_ID: HRESULT = 0xC0350012u32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_BUFFERS: HRESULT = 0xC0350013u32 as HRESULT;
-pub const ERROR_HV_NOT_ACKNOWLEDGED: HRESULT = 0xC0350014u32 as HRESULT;
-pub const ERROR_HV_ACKNOWLEDGED: HRESULT = 0xC0350016u32 as HRESULT;
-pub const ERROR_HV_INVALID_SAVE_RESTORE_STATE: HRESULT = 0xC0350017u32 as HRESULT;
-pub const ERROR_HV_INVALID_SYNIC_STATE: HRESULT = 0xC0350018u32 as HRESULT;
-pub const ERROR_HV_OBJECT_IN_USE: HRESULT = 0xC0350019u32 as HRESULT;
-pub const ERROR_HV_INVALID_PROXIMITY_DOMAIN_INFO: HRESULT = 0xC035001Au32 as HRESULT;
-pub const ERROR_HV_NO_DATA: HRESULT = 0xC035001Bu32 as HRESULT;
-pub const ERROR_HV_INACTIVE: HRESULT = 0xC035001Cu32 as HRESULT;
-pub const ERROR_HV_NO_RESOURCES: HRESULT = 0xC035001Du32 as HRESULT;
-pub const ERROR_HV_FEATURE_UNAVAILABLE: HRESULT = 0xC035001Eu32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_BUFFER: HRESULT = 0xC0350033u32 as HRESULT;
-pub const ERROR_HV_INSUFFICIENT_DEVICE_DOMAINS: HRESULT = 0xC0350038u32 as HRESULT;
-pub const ERROR_HV_INVALID_LP_INDEX: HRESULT = 0xC0350041u32 as HRESULT;
-pub const ERROR_HV_NOT_PRESENT: HRESULT = 0xC0351000u32 as HRESULT;
-pub const ERROR_VID_DUPLICATE_HANDLER: HRESULT = 0xC0370001u32 as HRESULT;
-pub const ERROR_VID_TOO_MANY_HANDLERS: HRESULT = 0xC0370002u32 as HRESULT;
-pub const ERROR_VID_QUEUE_FULL: HRESULT = 0xC0370003u32 as HRESULT;
-pub const ERROR_VID_HANDLER_NOT_PRESENT: HRESULT = 0xC0370004u32 as HRESULT;
-pub const ERROR_VID_INVALID_OBJECT_NAME: HRESULT = 0xC0370005u32 as HRESULT;
-pub const ERROR_VID_PARTITION_NAME_TOO_LONG: HRESULT = 0xC0370006u32 as HRESULT;
-pub const ERROR_VID_MESSAGE_QUEUE_NAME_TOO_LONG: HRESULT = 0xC0370007u32 as HRESULT;
-pub const ERROR_VID_PARTITION_ALREADY_EXISTS: HRESULT = 0xC0370008u32 as HRESULT;
-pub const ERROR_VID_PARTITION_DOES_NOT_EXIST: HRESULT = 0xC0370009u32 as HRESULT;
-pub const ERROR_VID_PARTITION_NAME_NOT_FOUND: HRESULT = 0xC037000Au32 as HRESULT;
-pub const ERROR_VID_MESSAGE_QUEUE_ALREADY_EXISTS: HRESULT = 0xC037000Bu32 as HRESULT;
-pub const ERROR_VID_EXCEEDED_MBP_ENTRY_MAP_LIMIT: HRESULT = 0xC037000Cu32 as HRESULT;
-pub const ERROR_VID_MB_STILL_REFERENCED: HRESULT = 0xC037000Du32 as HRESULT;
-pub const ERROR_VID_CHILD_GPA_PAGE_SET_CORRUPTED: HRESULT = 0xC037000Eu32 as HRESULT;
-pub const ERROR_VID_INVALID_NUMA_SETTINGS: HRESULT = 0xC037000Fu32 as HRESULT;
-pub const ERROR_VID_INVALID_NUMA_NODE_INDEX: HRESULT = 0xC0370010u32 as HRESULT;
-pub const ERROR_VID_NOTIFICATION_QUEUE_ALREADY_ASSOCIATED: HRESULT = 0xC0370011u32 as HRESULT;
-pub const ERROR_VID_INVALID_MEMORY_BLOCK_HANDLE: HRESULT = 0xC0370012u32 as HRESULT;
-pub const ERROR_VID_PAGE_RANGE_OVERFLOW: HRESULT = 0xC0370013u32 as HRESULT;
-pub const ERROR_VID_INVALID_MESSAGE_QUEUE_HANDLE: HRESULT = 0xC0370014u32 as HRESULT;
-pub const ERROR_VID_INVALID_GPA_RANGE_HANDLE: HRESULT = 0xC0370015u32 as HRESULT;
-pub const ERROR_VID_NO_MEMORY_BLOCK_NOTIFICATION_QUEUE: HRESULT = 0xC0370016u32 as HRESULT;
-pub const ERROR_VID_MEMORY_BLOCK_LOCK_COUNT_EXCEEDED: HRESULT = 0xC0370017u32 as HRESULT;
-pub const ERROR_VID_INVALID_PPM_HANDLE: HRESULT = 0xC0370018u32 as HRESULT;
-pub const ERROR_VID_MBPS_ARE_LOCKED: HRESULT = 0xC0370019u32 as HRESULT;
-pub const ERROR_VID_MESSAGE_QUEUE_CLOSED: HRESULT = 0xC037001Au32 as HRESULT;
-pub const ERROR_VID_VIRTUAL_PROCESSOR_LIMIT_EXCEEDED: HRESULT = 0xC037001Bu32 as HRESULT;
-pub const ERROR_VID_STOP_PENDING: HRESULT = 0xC037001Cu32 as HRESULT;
-pub const ERROR_VID_INVALID_PROCESSOR_STATE: HRESULT = 0xC037001Du32 as HRESULT;
-pub const ERROR_VID_EXCEEDED_KM_CONTEXT_COUNT_LIMIT: HRESULT = 0xC037001Eu32 as HRESULT;
-pub const ERROR_VID_KM_INTERFACE_ALREADY_INITIALIZED: HRESULT = 0xC037001Fu32 as HRESULT;
-pub const ERROR_VID_MB_PROPERTY_ALREADY_SET_RESET: HRESULT = 0xC0370020u32 as HRESULT;
-pub const ERROR_VID_MMIO_RANGE_DESTROYED: HRESULT = 0xC0370021u32 as HRESULT;
-pub const ERROR_VID_INVALID_CHILD_GPA_PAGE_SET: HRESULT = 0xC0370022u32 as HRESULT;
-pub const ERROR_VID_RESERVE_PAGE_SET_IS_BEING_USED: HRESULT = 0xC0370023u32 as HRESULT;
-pub const ERROR_VID_RESERVE_PAGE_SET_TOO_SMALL: HRESULT = 0xC0370024u32 as HRESULT;
-pub const ERROR_VID_MBP_ALREADY_LOCKED_USING_RESERVED_PAGE: HRESULT = 0xC0370025u32 as HRESULT;
-pub const ERROR_VID_MBP_COUNT_EXCEEDED_LIMIT: HRESULT = 0xC0370026u32 as HRESULT;
-pub const ERROR_VID_SAVED_STATE_CORRUPT: HRESULT = 0xC0370027u32 as HRESULT;
-pub const ERROR_VID_SAVED_STATE_UNRECOGNIZED_ITEM: HRESULT = 0xC0370028u32 as HRESULT;
-pub const ERROR_VID_SAVED_STATE_INCOMPATIBLE: HRESULT = 0xC0370029u32 as HRESULT;
-pub const ERROR_VID_REMOTE_NODE_PARENT_GPA_PAGES_USED: HRESULT = 0x80370001u32 as HRESULT;
-pub const ERROR_VOLMGR_INCOMPLETE_REGENERATION: HRESULT = 0x80380001u32 as HRESULT;
-pub const ERROR_VOLMGR_INCOMPLETE_DISK_MIGRATION: HRESULT = 0x80380002u32 as HRESULT;
-pub const ERROR_VOLMGR_DATABASE_FULL: HRESULT = 0xC0380001u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_CONFIGURATION_CORRUPTED: HRESULT = 0xC0380002u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_CONFIGURATION_NOT_IN_SYNC: HRESULT = 0xC0380003u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_CONFIG_UPDATE_FAILED: HRESULT = 0xC0380004u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_CONTAINS_NON_SIMPLE_VOLUME: HRESULT = 0xC0380005u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_DUPLICATE: HRESULT = 0xC0380006u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_DYNAMIC: HRESULT = 0xC0380007u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_ID_INVALID: HRESULT = 0xC0380008u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_INVALID: HRESULT = 0xC0380009u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAST_VOTER: HRESULT = 0xC038000Au32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_INVALID: HRESULT = 0xC038000Bu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_NON_BASIC_BETWEEN_BASIC_PARTITIONS: HRESULT = 0xC038000Cu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_NOT_CYLINDER_ALIGNED: HRESULT = 0xC038000Du32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_PARTITIONS_TOO_SMALL: HRESULT = 0xC038000Eu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_PRIMARY_BETWEEN_LOGICAL_PARTITIONS: HRESULT = 0xC038000Fu32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_LAYOUT_TOO_MANY_PARTITIONS: HRESULT = 0xC0380010u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_MISSING: HRESULT = 0xC0380011u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_NOT_EMPTY: HRESULT = 0xC0380012u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_NOT_ENOUGH_SPACE: HRESULT = 0xC0380013u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_REVECTORING_FAILED: HRESULT = 0xC0380014u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_SECTOR_SIZE_INVALID: HRESULT = 0xC0380015u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_SET_NOT_CONTAINED: HRESULT = 0xC0380016u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_USED_BY_MULTIPLE_MEMBERS: HRESULT = 0xC0380017u32 as HRESULT;
-pub const ERROR_VOLMGR_DISK_USED_BY_MULTIPLE_PLEXES: HRESULT = 0xC0380018u32 as HRESULT;
-pub const ERROR_VOLMGR_DYNAMIC_DISK_NOT_SUPPORTED: HRESULT = 0xC0380019u32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_ALREADY_USED: HRESULT = 0xC038001Au32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_NOT_CONTIGUOUS: HRESULT = 0xC038001Bu32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_NOT_IN_PUBLIC_REGION: HRESULT = 0xC038001Cu32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_NOT_SECTOR_ALIGNED: HRESULT = 0xC038001Du32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_OVERLAPS_EBR_PARTITION: HRESULT = 0xC038001Eu32 as HRESULT;
-pub const ERROR_VOLMGR_EXTENT_VOLUME_LENGTHS_DO_NOT_MATCH: HRESULT = 0xC038001Fu32 as HRESULT;
-pub const ERROR_VOLMGR_FAULT_TOLERANT_NOT_SUPPORTED: HRESULT = 0xC0380020u32 as HRESULT;
-pub const ERROR_VOLMGR_INTERLEAVE_LENGTH_INVALID: HRESULT = 0xC0380021u32 as HRESULT;
-pub const ERROR_VOLMGR_MAXIMUM_REGISTERED_USERS: HRESULT = 0xC0380022u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_IN_SYNC: HRESULT = 0xC0380023u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_INDEX_DUPLICATE: HRESULT = 0xC0380024u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_INDEX_INVALID: HRESULT = 0xC0380025u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_MISSING: HRESULT = 0xC0380026u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_NOT_DETACHED: HRESULT = 0xC0380027u32 as HRESULT;
-pub const ERROR_VOLMGR_MEMBER_REGENERATING: HRESULT = 0xC0380028u32 as HRESULT;
-pub const ERROR_VOLMGR_ALL_DISKS_FAILED: HRESULT = 0xC0380029u32 as HRESULT;
-pub const ERROR_VOLMGR_NO_REGISTERED_USERS: HRESULT = 0xC038002Au32 as HRESULT;
-pub const ERROR_VOLMGR_NO_SUCH_USER: HRESULT = 0xC038002Bu32 as HRESULT;
-pub const ERROR_VOLMGR_NOTIFICATION_RESET: HRESULT = 0xC038002Cu32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_MEMBERS_INVALID: HRESULT = 0xC038002Du32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_PLEXES_INVALID: HRESULT = 0xC038002Eu32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_DUPLICATE: HRESULT = 0xC038002Fu32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_ID_INVALID: HRESULT = 0xC0380030u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_INVALID: HRESULT = 0xC0380031u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_NAME_INVALID: HRESULT = 0xC0380032u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_OFFLINE: HRESULT = 0xC0380033u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_HAS_QUORUM: HRESULT = 0xC0380034u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_WITHOUT_QUORUM: HRESULT = 0xC0380035u32 as HRESULT;
-pub const ERROR_VOLMGR_PARTITION_STYLE_INVALID: HRESULT = 0xC0380036u32 as HRESULT;
-pub const ERROR_VOLMGR_PARTITION_UPDATE_FAILED: HRESULT = 0xC0380037u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_IN_SYNC: HRESULT = 0xC0380038u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_INDEX_DUPLICATE: HRESULT = 0xC0380039u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_INDEX_INVALID: HRESULT = 0xC038003Au32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_LAST_ACTIVE: HRESULT = 0xC038003Bu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_MISSING: HRESULT = 0xC038003Cu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_REGENERATING: HRESULT = 0xC038003Du32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_TYPE_INVALID: HRESULT = 0xC038003Eu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_NOT_RAID5: HRESULT = 0xC038003Fu32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_NOT_SIMPLE: HRESULT = 0xC0380040u32 as HRESULT;
-pub const ERROR_VOLMGR_STRUCTURE_SIZE_INVALID: HRESULT = 0xC0380041u32 as HRESULT;
-pub const ERROR_VOLMGR_TOO_MANY_NOTIFICATION_REQUESTS: HRESULT = 0xC0380042u32 as HRESULT;
-pub const ERROR_VOLMGR_TRANSACTION_IN_PROGRESS: HRESULT = 0xC0380043u32 as HRESULT;
-pub const ERROR_VOLMGR_UNEXPECTED_DISK_LAYOUT_CHANGE: HRESULT = 0xC0380044u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_CONTAINS_MISSING_DISK: HRESULT = 0xC0380045u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_ID_INVALID: HRESULT = 0xC0380046u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_LENGTH_INVALID: HRESULT = 0xC0380047u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_LENGTH_NOT_SECTOR_SIZE_MULTIPLE: HRESULT = 0xC0380048u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_NOT_MIRRORED: HRESULT = 0xC0380049u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_NOT_RETAINED: HRESULT = 0xC038004Au32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_OFFLINE: HRESULT = 0xC038004Bu32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_RETAINED: HRESULT = 0xC038004Cu32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_EXTENTS_INVALID: HRESULT = 0xC038004Du32 as HRESULT;
-pub const ERROR_VOLMGR_DIFFERENT_SECTOR_SIZE: HRESULT = 0xC038004Eu32 as HRESULT;
-pub const ERROR_VOLMGR_BAD_BOOT_DISK: HRESULT = 0xC038004Fu32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_CONFIG_OFFLINE: HRESULT = 0xC0380050u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_CONFIG_ONLINE: HRESULT = 0xC0380051u32 as HRESULT;
-pub const ERROR_VOLMGR_NOT_PRIMARY_PACK: HRESULT = 0xC0380052u32 as HRESULT;
-pub const ERROR_VOLMGR_PACK_LOG_UPDATE_FAILED: HRESULT = 0xC0380053u32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_DISKS_IN_PLEX_INVALID: HRESULT = 0xC0380054u32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_DISKS_IN_MEMBER_INVALID: HRESULT = 0xC0380055u32 as HRESULT;
-pub const ERROR_VOLMGR_VOLUME_MIRRORED: HRESULT = 0xC0380056u32 as HRESULT;
-pub const ERROR_VOLMGR_PLEX_NOT_SIMPLE_SPANNED: HRESULT = 0xC0380057u32 as HRESULT;
-pub const ERROR_VOLMGR_NO_VALID_LOG_COPIES: HRESULT = 0xC0380058u32 as HRESULT;
-pub const ERROR_VOLMGR_PRIMARY_PACK_PRESENT: HRESULT = 0xC0380059u32 as HRESULT;
-pub const ERROR_VOLMGR_NUMBER_OF_DISKS_INVALID: HRESULT = 0xC038005Au32 as HRESULT;
-pub const ERROR_VOLMGR_MIRROR_NOT_SUPPORTED: HRESULT = 0xC038005Bu32 as HRESULT;
-pub const ERROR_VOLMGR_RAID5_NOT_SUPPORTED: HRESULT = 0xC038005Cu32 as HRESULT;
-pub const ERROR_BCD_NOT_ALL_ENTRIES_IMPORTED: HRESULT = 0x80390001u32 as HRESULT;
-pub const ERROR_BCD_TOO_MANY_ELEMENTS: HRESULT = 0xC0390002u32 as HRESULT;
-pub const ERROR_BCD_NOT_ALL_ENTRIES_SYNCHRONIZED: HRESULT = 0x80390003u32 as HRESULT;
-pub const ERROR_VHD_DRIVE_FOOTER_MISSING: HRESULT = 0xC03A0001u32 as HRESULT;
-pub const ERROR_VHD_DRIVE_FOOTER_CHECKSUM_MISMATCH: HRESULT = 0xC03A0002u32 as HRESULT;
-pub const ERROR_VHD_DRIVE_FOOTER_CORRUPT: HRESULT = 0xC03A0003u32 as HRESULT;
-pub const ERROR_VHD_FORMAT_UNKNOWN: HRESULT = 0xC03A0004u32 as HRESULT;
-pub const ERROR_VHD_FORMAT_UNSUPPORTED_VERSION: HRESULT = 0xC03A0005u32 as HRESULT;
-pub const ERROR_VHD_SPARSE_HEADER_CHECKSUM_MISMATCH: HRESULT = 0xC03A0006u32 as HRESULT;
-pub const ERROR_VHD_SPARSE_HEADER_UNSUPPORTED_VERSION: HRESULT = 0xC03A0007u32 as HRESULT;
-pub const ERROR_VHD_SPARSE_HEADER_CORRUPT: HRESULT = 0xC03A0008u32 as HRESULT;
-pub const ERROR_VHD_BLOCK_ALLOCATION_FAILURE: HRESULT = 0xC03A0009u32 as HRESULT;
-pub const ERROR_VHD_BLOCK_ALLOCATION_TABLE_CORRUPT: HRESULT = 0xC03A000Au32 as HRESULT;
-pub const ERROR_VHD_INVALID_BLOCK_SIZE: HRESULT = 0xC03A000Bu32 as HRESULT;
-pub const ERROR_VHD_BITMAP_MISMATCH: HRESULT = 0xC03A000Cu32 as HRESULT;
-pub const ERROR_VHD_PARENT_VHD_NOT_FOUND: HRESULT = 0xC03A000Du32 as HRESULT;
-pub const ERROR_VHD_CHILD_PARENT_ID_MISMATCH: HRESULT = 0xC03A000Eu32 as HRESULT;
-pub const ERROR_VHD_CHILD_PARENT_TIMESTAMP_MISMATCH: HRESULT = 0xC03A000Fu32 as HRESULT;
-pub const ERROR_VHD_METADATA_READ_FAILURE: HRESULT = 0xC03A0010u32 as HRESULT;
-pub const ERROR_VHD_METADATA_WRITE_FAILURE: HRESULT = 0xC03A0011u32 as HRESULT;
-pub const ERROR_VHD_INVALID_SIZE: HRESULT = 0xC03A0012u32 as HRESULT;
-pub const ERROR_VHD_INVALID_FILE_SIZE: HRESULT = 0xC03A0013u32 as HRESULT;
-pub const ERROR_VIRTDISK_PROVIDER_NOT_FOUND: HRESULT = 0xC03A0014u32 as HRESULT;
-pub const ERROR_VIRTDISK_NOT_VIRTUAL_DISK: HRESULT = 0xC03A0015u32 as HRESULT;
-pub const ERROR_VHD_PARENT_VHD_ACCESS_DENIED: HRESULT = 0xC03A0016u32 as HRESULT;
-pub const ERROR_VHD_CHILD_PARENT_SIZE_MISMATCH: HRESULT = 0xC03A0017u32 as HRESULT;
-pub const ERROR_VHD_DIFFERENCING_CHAIN_CYCLE_DETECTED: HRESULT = 0xC03A0018u32 as HRESULT;
-pub const ERROR_VHD_DIFFERENCING_CHAIN_ERROR_IN_PARENT: HRESULT = 0xC03A0019u32 as HRESULT;
-pub const ERROR_VIRTUAL_DISK_LIMITATION: HRESULT = 0xC03A001Au32 as HRESULT;
-pub const ERROR_VHD_INVALID_TYPE: HRESULT = 0xC03A001Bu32 as HRESULT;
-pub const ERROR_VHD_INVALID_STATE: HRESULT = 0xC03A001Cu32 as HRESULT;
-pub const ERROR_VIRTDISK_UNSUPPORTED_DISK_SECTOR_SIZE: HRESULT = 0xC03A001Du32 as HRESULT;
-pub const ERROR_VIRTDISK_DISK_ALREADY_OWNED: HRESULT = 0xC03A001Eu32 as HRESULT;
-pub const ERROR_VIRTDISK_DISK_ONLINE_AND_WRITABLE: HRESULT = 0xC03A001Fu32 as HRESULT;
-pub const ERROR_CTLOG_TRACKING_NOT_INITIALIZED: HRESULT = 0xC03A0020u32 as HRESULT;
-pub const ERROR_CTLOG_LOGFILE_SIZE_EXCEEDED_MAXSIZE: HRESULT = 0xC03A0021u32 as HRESULT;
-pub const ERROR_CTLOG_VHD_CHANGED_OFFLINE: HRESULT = 0xC03A0022u32 as HRESULT;
-pub const ERROR_CTLOG_INVALID_TRACKING_STATE: HRESULT = 0xC03A0023u32 as HRESULT;
-pub const ERROR_CTLOG_INCONSISTENT_TRACKING_FILE: HRESULT = 0xC03A0024u32 as HRESULT;
-pub const ERROR_VHD_RESIZE_WOULD_TRUNCATE_DATA: HRESULT = 0xC03A0025u32 as HRESULT;
-pub const ERROR_VHD_COULD_NOT_COMPUTE_MINIMUM_VIRTUAL_SIZE: HRESULT = 0xC03A0026u32 as HRESULT;
-pub const ERROR_VHD_ALREADY_AT_OR_BELOW_MINIMUM_VIRTUAL_SIZE: HRESULT = 0xC03A0027u32 as HRESULT;
-pub const ERROR_VHD_METADATA_FULL: HRESULT = 0xC03A0028u32 as HRESULT;
-pub const ERROR_QUERY_STORAGE_ERROR: HRESULT = 0x803A0001u32 as HRESULT;
-pub const SDIAG_E_CANCELLED: HRESULT = 0x803C0100u32 as HRESULT;
-pub const SDIAG_E_SCRIPT: HRESULT = 0x803C0101u32 as HRESULT;
-pub const SDIAG_E_POWERSHELL: HRESULT = 0x803C0102u32 as HRESULT;
-pub const SDIAG_E_MANAGEDHOST: HRESULT = 0x803C0103u32 as HRESULT;
-pub const SDIAG_E_NOVERIFIER: HRESULT = 0x803C0104u32 as HRESULT;
-pub const SDIAG_S_CANNOTRUN: HRESULT = 0x003C0105;
-pub const SDIAG_E_DISABLED: HRESULT = 0x803C0106u32 as HRESULT;
-pub const SDIAG_E_TRUST: HRESULT = 0x803C0107u32 as HRESULT;
-pub const SDIAG_E_CANNOTRUN: HRESULT = 0x803C0108u32 as HRESULT;
-pub const SDIAG_E_VERSION: HRESULT = 0x803C0109u32 as HRESULT;
-pub const SDIAG_E_RESOURCE: HRESULT = 0x803C010Au32 as HRESULT;
-pub const SDIAG_E_ROOTCAUSE: HRESULT = 0x803C010Bu32 as HRESULT;
-pub const WPN_E_CHANNEL_CLOSED: HRESULT = 0x803E0100u32 as HRESULT;
-pub const WPN_E_CHANNEL_REQUEST_NOT_COMPLETE: HRESULT = 0x803E0101u32 as HRESULT;
-pub const WPN_E_INVALID_APP: HRESULT = 0x803E0102u32 as HRESULT;
-pub const WPN_E_OUTSTANDING_CHANNEL_REQUEST: HRESULT = 0x803E0103u32 as HRESULT;
-pub const WPN_E_DUPLICATE_CHANNEL: HRESULT = 0x803E0104u32 as HRESULT;
-pub const WPN_E_PLATFORM_UNAVAILABLE: HRESULT = 0x803E0105u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_POSTED: HRESULT = 0x803E0106u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_HIDDEN: HRESULT = 0x803E0107u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_NOT_POSTED: HRESULT = 0x803E0108u32 as HRESULT;
-pub const WPN_E_CLOUD_DISABLED: HRESULT = 0x803E0109u32 as HRESULT;
-pub const WPN_E_CLOUD_INCAPABLE: HRESULT = 0x803E0110u32 as HRESULT;
-pub const WPN_E_CLOUD_AUTH_UNAVAILABLE: HRESULT = 0x803E011Au32 as HRESULT;
-pub const WPN_E_CLOUD_SERVICE_UNAVAILABLE: HRESULT = 0x803E011Bu32 as HRESULT;
-pub const WPN_E_FAILED_LOCK_SCREEN_UPDATE_INTIALIZATION: HRESULT = 0x803E011Cu32 as HRESULT;
-pub const WPN_E_NOTIFICATION_DISABLED: HRESULT = 0x803E0111u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_INCAPABLE: HRESULT = 0x803E0112u32 as HRESULT;
-pub const WPN_E_INTERNET_INCAPABLE: HRESULT = 0x803E0113u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_TYPE_DISABLED: HRESULT = 0x803E0114u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_SIZE: HRESULT = 0x803E0115u32 as HRESULT;
-pub const WPN_E_TAG_SIZE: HRESULT = 0x803E0116u32 as HRESULT;
-pub const WPN_E_ACCESS_DENIED: HRESULT = 0x803E0117u32 as HRESULT;
-pub const WPN_E_DUPLICATE_REGISTRATION: HRESULT = 0x803E0118u32 as HRESULT;
-pub const WPN_E_PUSH_NOTIFICATION_INCAPABLE: HRESULT = 0x803E0119u32 as HRESULT;
-pub const WPN_E_DEV_ID_SIZE: HRESULT = 0x803E0120u32 as HRESULT;
-pub const WPN_E_TAG_ALPHANUMERIC: HRESULT = 0x803E012Au32 as HRESULT;
-pub const WPN_E_INVALID_HTTP_STATUS_CODE: HRESULT = 0x803E012Bu32 as HRESULT;
-pub const WPN_E_OUT_OF_SESSION: HRESULT = 0x803E0200u32 as HRESULT;
-pub const WPN_E_POWER_SAVE: HRESULT = 0x803E0201u32 as HRESULT;
-pub const WPN_E_IMAGE_NOT_FOUND_IN_CACHE: HRESULT = 0x803E0202u32 as HRESULT;
-pub const WPN_E_ALL_URL_NOT_COMPLETED: HRESULT = 0x803E0203u32 as HRESULT;
-pub const WPN_E_INVALID_CLOUD_IMAGE: HRESULT = 0x803E0204u32 as HRESULT;
-pub const WPN_E_NOTIFICATION_ID_MATCHED: HRESULT = 0x803E0205u32 as HRESULT;
-pub const WPN_E_CALLBACK_ALREADY_REGISTERED: HRESULT = 0x803E0206u32 as HRESULT;
-pub const WPN_E_TOAST_NOTIFICATION_DROPPED: HRESULT = 0x803E0207u32 as HRESULT;
-pub const WPN_E_STORAGE_LOCKED: HRESULT = 0x803E0208u32 as HRESULT;
-pub const E_MBN_CONTEXT_NOT_ACTIVATED: HRESULT = 0x80548201u32 as HRESULT;
-pub const E_MBN_BAD_SIM: HRESULT = 0x80548202u32 as HRESULT;
-pub const E_MBN_DATA_CLASS_NOT_AVAILABLE: HRESULT = 0x80548203u32 as HRESULT;
-pub const E_MBN_INVALID_ACCESS_STRING: HRESULT = 0x80548204u32 as HRESULT;
-pub const E_MBN_MAX_ACTIVATED_CONTEXTS: HRESULT = 0x80548205u32 as HRESULT;
-pub const E_MBN_PACKET_SVC_DETACHED: HRESULT = 0x80548206u32 as HRESULT;
-pub const E_MBN_PROVIDER_NOT_VISIBLE: HRESULT = 0x80548207u32 as HRESULT;
-pub const E_MBN_RADIO_POWER_OFF: HRESULT = 0x80548208u32 as HRESULT;
-pub const E_MBN_SERVICE_NOT_ACTIVATED: HRESULT = 0x80548209u32 as HRESULT;
-pub const E_MBN_SIM_NOT_INSERTED: HRESULT = 0x8054820Au32 as HRESULT;
-pub const E_MBN_VOICE_CALL_IN_PROGRESS: HRESULT = 0x8054820Bu32 as HRESULT;
-pub const E_MBN_INVALID_CACHE: HRESULT = 0x8054820Cu32 as HRESULT;
-pub const E_MBN_NOT_REGISTERED: HRESULT = 0x8054820Du32 as HRESULT;
-pub const E_MBN_PROVIDERS_NOT_FOUND: HRESULT = 0x8054820Eu32 as HRESULT;
-pub const E_MBN_PIN_NOT_SUPPORTED: HRESULT = 0x8054820Fu32 as HRESULT;
-pub const E_MBN_PIN_REQUIRED: HRESULT = 0x80548210u32 as HRESULT;
-pub const E_MBN_PIN_DISABLED: HRESULT = 0x80548211u32 as HRESULT;
-pub const E_MBN_FAILURE: HRESULT = 0x80548212u32 as HRESULT;
-pub const E_MBN_INVALID_PROFILE: HRESULT = 0x80548218u32 as HRESULT;
-pub const E_MBN_DEFAULT_PROFILE_EXIST: HRESULT = 0x80548219u32 as HRESULT;
-pub const E_MBN_SMS_ENCODING_NOT_SUPPORTED: HRESULT = 0x80548220u32 as HRESULT;
-pub const E_MBN_SMS_FILTER_NOT_SUPPORTED: HRESULT = 0x80548221u32 as HRESULT;
-pub const E_MBN_SMS_INVALID_MEMORY_INDEX: HRESULT = 0x80548222u32 as HRESULT;
-pub const E_MBN_SMS_LANG_NOT_SUPPORTED: HRESULT = 0x80548223u32 as HRESULT;
-pub const E_MBN_SMS_MEMORY_FAILURE: HRESULT = 0x80548224u32 as HRESULT;
-pub const E_MBN_SMS_NETWORK_TIMEOUT: HRESULT = 0x80548225u32 as HRESULT;
-pub const E_MBN_SMS_UNKNOWN_SMSC_ADDRESS: HRESULT = 0x80548226u32 as HRESULT;
-pub const E_MBN_SMS_FORMAT_NOT_SUPPORTED: HRESULT = 0x80548227u32 as HRESULT;
-pub const E_MBN_SMS_OPERATION_NOT_ALLOWED: HRESULT = 0x80548228u32 as HRESULT;
-pub const E_MBN_SMS_MEMORY_FULL: HRESULT = 0x80548229u32 as HRESULT;
-pub const PEER_E_IPV6_NOT_INSTALLED: HRESULT = 0x80630001u32 as HRESULT;
-pub const PEER_E_NOT_INITIALIZED: HRESULT = 0x80630002u32 as HRESULT;
-pub const PEER_E_CANNOT_START_SERVICE: HRESULT = 0x80630003u32 as HRESULT;
-pub const PEER_E_NOT_LICENSED: HRESULT = 0x80630004u32 as HRESULT;
-pub const PEER_E_INVALID_GRAPH: HRESULT = 0x80630010u32 as HRESULT;
-pub const PEER_E_DBNAME_CHANGED: HRESULT = 0x80630011u32 as HRESULT;
-pub const PEER_E_DUPLICATE_GRAPH: HRESULT = 0x80630012u32 as HRESULT;
-pub const PEER_E_GRAPH_NOT_READY: HRESULT = 0x80630013u32 as HRESULT;
-pub const PEER_E_GRAPH_SHUTTING_DOWN: HRESULT = 0x80630014u32 as HRESULT;
-pub const PEER_E_GRAPH_IN_USE: HRESULT = 0x80630015u32 as HRESULT;
-pub const PEER_E_INVALID_DATABASE: HRESULT = 0x80630016u32 as HRESULT;
-pub const PEER_E_TOO_MANY_ATTRIBUTES: HRESULT = 0x80630017u32 as HRESULT;
-pub const PEER_E_CONNECTION_NOT_FOUND: HRESULT = 0x80630103u32 as HRESULT;
-pub const PEER_E_CONNECT_SELF: HRESULT = 0x80630106u32 as HRESULT;
-pub const PEER_E_ALREADY_LISTENING: HRESULT = 0x80630107u32 as HRESULT;
-pub const PEER_E_NODE_NOT_FOUND: HRESULT = 0x80630108u32 as HRESULT;
-pub const PEER_E_CONNECTION_FAILED: HRESULT = 0x80630109u32 as HRESULT;
-pub const PEER_E_CONNECTION_NOT_AUTHENTICATED: HRESULT = 0x8063010Au32 as HRESULT;
-pub const PEER_E_CONNECTION_REFUSED: HRESULT = 0x8063010Bu32 as HRESULT;
-pub const PEER_E_CLASSIFIER_TOO_LONG: HRESULT = 0x80630201u32 as HRESULT;
-pub const PEER_E_TOO_MANY_IDENTITIES: HRESULT = 0x80630202u32 as HRESULT;
-pub const PEER_E_NO_KEY_ACCESS: HRESULT = 0x80630203u32 as HRESULT;
-pub const PEER_E_GROUPS_EXIST: HRESULT = 0x80630204u32 as HRESULT;
-pub const PEER_E_RECORD_NOT_FOUND: HRESULT = 0x80630301u32 as HRESULT;
-pub const PEER_E_DATABASE_ACCESSDENIED: HRESULT = 0x80630302u32 as HRESULT;
-pub const PEER_E_DBINITIALIZATION_FAILED: HRESULT = 0x80630303u32 as HRESULT;
-pub const PEER_E_MAX_RECORD_SIZE_EXCEEDED: HRESULT = 0x80630304u32 as HRESULT;
-pub const PEER_E_DATABASE_ALREADY_PRESENT: HRESULT = 0x80630305u32 as HRESULT;
-pub const PEER_E_DATABASE_NOT_PRESENT: HRESULT = 0x80630306u32 as HRESULT;
-pub const PEER_E_IDENTITY_NOT_FOUND: HRESULT = 0x80630401u32 as HRESULT;
-pub const PEER_E_EVENT_HANDLE_NOT_FOUND: HRESULT = 0x80630501u32 as HRESULT;
-pub const PEER_E_INVALID_SEARCH: HRESULT = 0x80630601u32 as HRESULT;
-pub const PEER_E_INVALID_ATTRIBUTES: HRESULT = 0x80630602u32 as HRESULT;
-pub const PEER_E_INVITATION_NOT_TRUSTED: HRESULT = 0x80630701u32 as HRESULT;
-pub const PEER_E_CHAIN_TOO_LONG: HRESULT = 0x80630703u32 as HRESULT;
-pub const PEER_E_INVALID_TIME_PERIOD: HRESULT = 0x80630705u32 as HRESULT;
-pub const PEER_E_CIRCULAR_CHAIN_DETECTED: HRESULT = 0x80630706u32 as HRESULT;
-pub const PEER_E_CERT_STORE_CORRUPTED: HRESULT = 0x80630801u32 as HRESULT;
-pub const PEER_E_NO_CLOUD: HRESULT = 0x80631001u32 as HRESULT;
-pub const PEER_E_CLOUD_NAME_AMBIGUOUS: HRESULT = 0x80631005u32 as HRESULT;
-pub const PEER_E_INVALID_RECORD: HRESULT = 0x80632010u32 as HRESULT;
-pub const PEER_E_NOT_AUTHORIZED: HRESULT = 0x80632020u32 as HRESULT;
-pub const PEER_E_PASSWORD_DOES_NOT_MEET_POLICY: HRESULT = 0x80632021u32 as HRESULT;
-pub const PEER_E_DEFERRED_VALIDATION: HRESULT = 0x80632030u32 as HRESULT;
-pub const PEER_E_INVALID_GROUP_PROPERTIES: HRESULT = 0x80632040u32 as HRESULT;
-pub const PEER_E_INVALID_PEER_NAME: HRESULT = 0x80632050u32 as HRESULT;
-pub const PEER_E_INVALID_CLASSIFIER: HRESULT = 0x80632060u32 as HRESULT;
-pub const PEER_E_INVALID_FRIENDLY_NAME: HRESULT = 0x80632070u32 as HRESULT;
-pub const PEER_E_INVALID_ROLE_PROPERTY: HRESULT = 0x80632071u32 as HRESULT;
-pub const PEER_E_INVALID_CLASSIFIER_PROPERTY: HRESULT = 0x80632072u32 as HRESULT;
-pub const PEER_E_INVALID_RECORD_EXPIRATION: HRESULT = 0x80632080u32 as HRESULT;
-pub const PEER_E_INVALID_CREDENTIAL_INFO: HRESULT = 0x80632081u32 as HRESULT;
-pub const PEER_E_INVALID_CREDENTIAL: HRESULT = 0x80632082u32 as HRESULT;
-pub const PEER_E_INVALID_RECORD_SIZE: HRESULT = 0x80632083u32 as HRESULT;
-pub const PEER_E_UNSUPPORTED_VERSION: HRESULT = 0x80632090u32 as HRESULT;
-pub const PEER_E_GROUP_NOT_READY: HRESULT = 0x80632091u32 as HRESULT;
-pub const PEER_E_GROUP_IN_USE: HRESULT = 0x80632092u32 as HRESULT;
-pub const PEER_E_INVALID_GROUP: HRESULT = 0x80632093u32 as HRESULT;
-pub const PEER_E_NO_MEMBERS_FOUND: HRESULT = 0x80632094u32 as HRESULT;
-pub const PEER_E_NO_MEMBER_CONNECTIONS: HRESULT = 0x80632095u32 as HRESULT;
-pub const PEER_E_UNABLE_TO_LISTEN: HRESULT = 0x80632096u32 as HRESULT;
-pub const PEER_E_IDENTITY_DELETED: HRESULT = 0x806320A0u32 as HRESULT;
-pub const PEER_E_SERVICE_NOT_AVAILABLE: HRESULT = 0x806320A1u32 as HRESULT;
-pub const PEER_E_CONTACT_NOT_FOUND: HRESULT = 0x80636001u32 as HRESULT;
-pub const PEER_S_GRAPH_DATA_CREATED: HRESULT = 0x00630001;
-pub const PEER_S_NO_EVENT_DATA: HRESULT = 0x00630002;
-pub const PEER_S_ALREADY_CONNECTED: HRESULT = 0x00632000;
-pub const PEER_S_SUBSCRIPTION_EXISTS: HRESULT = 0x00636000;
-pub const PEER_S_NO_CONNECTIVITY: HRESULT = 0x00630005;
-pub const PEER_S_ALREADY_A_MEMBER: HRESULT = 0x00630006;
-pub const PEER_E_CANNOT_CONVERT_PEER_NAME: HRESULT = 0x80634001u32 as HRESULT;
-pub const PEER_E_INVALID_PEER_HOST_NAME: HRESULT = 0x80634002u32 as HRESULT;
-pub const PEER_E_NO_MORE: HRESULT = 0x80634003u32 as HRESULT;
-pub const PEER_E_PNRP_DUPLICATE_PEER_NAME: HRESULT = 0x80634005u32 as HRESULT;
-pub const PEER_E_INVITE_CANCELLED: HRESULT = 0x80637000u32 as HRESULT;
-pub const PEER_E_INVITE_RESPONSE_NOT_AVAILABLE: HRESULT = 0x80637001u32 as HRESULT;
-pub const PEER_E_NOT_SIGNED_IN: HRESULT = 0x80637003u32 as HRESULT;
-pub const PEER_E_PRIVACY_DECLINED: HRESULT = 0x80637004u32 as HRESULT;
-pub const PEER_E_TIMEOUT: HRESULT = 0x80637005u32 as HRESULT;
-pub const PEER_E_INVALID_ADDRESS: HRESULT = 0x80637007u32 as HRESULT;
-pub const PEER_E_FW_EXCEPTION_DISABLED: HRESULT = 0x80637008u32 as HRESULT;
-pub const PEER_E_FW_BLOCKED_BY_POLICY: HRESULT = 0x80637009u32 as HRESULT;
-pub const PEER_E_FW_BLOCKED_BY_SHIELDS_UP: HRESULT = 0x8063700Au32 as HRESULT;
-pub const PEER_E_FW_DECLINED: HRESULT = 0x8063700Bu32 as HRESULT;
-pub const UI_E_CREATE_FAILED: HRESULT = 0x802A0001u32 as HRESULT;
-pub const UI_E_SHUTDOWN_CALLED: HRESULT = 0x802A0002u32 as HRESULT;
-pub const UI_E_ILLEGAL_REENTRANCY: HRESULT = 0x802A0003u32 as HRESULT;
-pub const UI_E_OBJECT_SEALED: HRESULT = 0x802A0004u32 as HRESULT;
-pub const UI_E_VALUE_NOT_SET: HRESULT = 0x802A0005u32 as HRESULT;
-pub const UI_E_VALUE_NOT_DETERMINED: HRESULT = 0x802A0006u32 as HRESULT;
-pub const UI_E_INVALID_OUTPUT: HRESULT = 0x802A0007u32 as HRESULT;
-pub const UI_E_BOOLEAN_EXPECTED: HRESULT = 0x802A0008u32 as HRESULT;
-pub const UI_E_DIFFERENT_OWNER: HRESULT = 0x802A0009u32 as HRESULT;
-pub const UI_E_AMBIGUOUS_MATCH: HRESULT = 0x802A000Au32 as HRESULT;
-pub const UI_E_FP_OVERFLOW: HRESULT = 0x802A000Bu32 as HRESULT;
-pub const UI_E_WRONG_THREAD: HRESULT = 0x802A000Cu32 as HRESULT;
-pub const UI_E_STORYBOARD_ACTIVE: HRESULT = 0x802A0101u32 as HRESULT;
-pub const UI_E_STORYBOARD_NOT_PLAYING: HRESULT = 0x802A0102u32 as HRESULT;
-pub const UI_E_START_KEYFRAME_AFTER_END: HRESULT = 0x802A0103u32 as HRESULT;
-pub const UI_E_END_KEYFRAME_NOT_DETERMINED: HRESULT = 0x802A0104u32 as HRESULT;
-pub const UI_E_LOOPS_OVERLAP: HRESULT = 0x802A0105u32 as HRESULT;
-pub const UI_E_TRANSITION_ALREADY_USED: HRESULT = 0x802A0106u32 as HRESULT;
-pub const UI_E_TRANSITION_NOT_IN_STORYBOARD: HRESULT = 0x802A0107u32 as HRESULT;
-pub const UI_E_TRANSITION_ECLIPSED: HRESULT = 0x802A0108u32 as HRESULT;
-pub const UI_E_TIME_BEFORE_LAST_UPDATE: HRESULT = 0x802A0109u32 as HRESULT;
-pub const UI_E_TIMER_CLIENT_ALREADY_CONNECTED: HRESULT = 0x802A010Au32 as HRESULT;
-pub const UI_E_INVALID_DIMENSION: HRESULT = 0x802A010Bu32 as HRESULT;
-pub const UI_E_PRIMITIVE_OUT_OF_BOUNDS: HRESULT = 0x802A010Cu32 as HRESULT;
-pub const UI_E_WINDOW_CLOSED: HRESULT = 0x802A0201u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_HANDLE: HRESULT = 0x80650001u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_READ_NOT_PERMITTED: HRESULT = 0x80650002u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_WRITE_NOT_PERMITTED: HRESULT = 0x80650003u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_PDU: HRESULT = 0x80650004u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_AUTHENTICATION: HRESULT = 0x80650005u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_REQUEST_NOT_SUPPORTED: HRESULT = 0x80650006u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_OFFSET: HRESULT = 0x80650007u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_AUTHORIZATION: HRESULT = 0x80650008u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_PREPARE_QUEUE_FULL: HRESULT = 0x80650009u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_ATTRIBUTE_NOT_FOUND: HRESULT = 0x8065000Au32 as HRESULT;
-pub const E_BLUETOOTH_ATT_ATTRIBUTE_NOT_LONG: HRESULT = 0x8065000Bu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_ENCRYPTION_KEY_SIZE: HRESULT = 0x8065000Cu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INVALID_ATTRIBUTE_VALUE_LENGTH: HRESULT = 0x8065000Du32 as HRESULT;
-pub const E_BLUETOOTH_ATT_UNLIKELY: HRESULT = 0x8065000Eu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_ENCRYPTION: HRESULT = 0x8065000Fu32 as HRESULT;
-pub const E_BLUETOOTH_ATT_UNSUPPORTED_GROUP_TYPE: HRESULT = 0x80650010u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_INSUFFICIENT_RESOURCES: HRESULT = 0x80650011u32 as HRESULT;
-pub const E_BLUETOOTH_ATT_UNKNOWN_ERROR: HRESULT = 0x80651000u32 as HRESULT;
-pub const E_AUDIO_ENGINE_NODE_NOT_FOUND: HRESULT = 0x80660001u32 as HRESULT;
-pub const E_HDAUDIO_EMPTY_CONNECTION_LIST: HRESULT = 0x80660002u32 as HRESULT;
-pub const E_HDAUDIO_CONNECTION_LIST_NOT_SUPPORTED: HRESULT = 0x80660003u32 as HRESULT;
-pub const E_HDAUDIO_NO_LOGICAL_DEVICES_CREATED: HRESULT = 0x80660004u32 as HRESULT;
-pub const E_HDAUDIO_NULL_LINKED_LIST_ENTRY: HRESULT = 0x80660005u32 as HRESULT;
-pub const ERROR_SPACES_POOL_WAS_DELETED: HRESULT = 0x00E70001;
-pub const ERROR_SPACES_RESILIENCY_TYPE_INVALID: HRESULT = 0x80E70003u32 as HRESULT;
-pub const ERROR_SPACES_DRIVE_SECTOR_SIZE_INVALID: HRESULT = 0x80E70004u32 as HRESULT;
-pub const ERROR_SPACES_DRIVE_REDUNDANCY_INVALID: HRESULT = 0x80E70006u32 as HRESULT;
-pub const ERROR_SPACES_NUMBER_OF_DATA_COPIES_INVALID: HRESULT = 0x80E70007u32 as HRESULT;
-pub const ERROR_SPACES_PARITY_LAYOUT_INVALID: HRESULT = 0x80E70008u32 as HRESULT;
-pub const ERROR_SPACES_INTERLEAVE_LENGTH_INVALID: HRESULT = 0x80E70009u32 as HRESULT;
-pub const ERROR_SPACES_NUMBER_OF_COLUMNS_INVALID: HRESULT = 0x80E7000Au32 as HRESULT;
-pub const ERROR_SPACES_NOT_ENOUGH_DRIVES: HRESULT = 0x80E7000Bu32 as HRESULT;
-pub const ERROR_VOLSNAP_BOOTFILE_NOT_VALID: HRESULT = 0x80820001u32 as HRESULT;
-pub const ERROR_TIERING_NOT_SUPPORTED_ON_VOLUME: HRESULT = 0x80830001u32 as HRESULT;
-pub const ERROR_TIERING_VOLUME_DISMOUNT_IN_PROGRESS: HRESULT = 0x80830002u32 as HRESULT;
-pub const ERROR_TIERING_STORAGE_TIER_NOT_FOUND: HRESULT = 0x80830003u32 as HRESULT;
-pub const ERROR_TIERING_INVALID_FILE_ID: HRESULT = 0x80830004u32 as HRESULT;
-pub const ERROR_TIERING_WRONG_CLUSTER_NODE: HRESULT = 0x80830005u32 as HRESULT;
-pub const ERROR_TIERING_ALREADY_PROCESSING: HRESULT = 0x80830006u32 as HRESULT;
-pub const ERROR_TIERING_CANNOT_PIN_OBJECT: HRESULT = 0x80830007u32 as HRESULT;
-pub const DXGI_STATUS_OCCLUDED: HRESULT = 0x087A0001;
-pub const DXGI_STATUS_CLIPPED: HRESULT = 0x087A0002;
-pub const DXGI_STATUS_NO_REDIRECTION: HRESULT = 0x087A0004;
-pub const DXGI_STATUS_NO_DESKTOP_ACCESS: HRESULT = 0x087A0005;
-pub const DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE: HRESULT = 0x087A0006;
-pub const DXGI_STATUS_MODE_CHANGED: HRESULT = 0x087A0007;
-pub const DXGI_STATUS_MODE_CHANGE_IN_PROGRESS: HRESULT = 0x087A0008;
-pub const DXGI_ERROR_INVALID_CALL: HRESULT = 0x887A0001u32 as HRESULT;
-pub const DXGI_ERROR_NOT_FOUND: HRESULT = 0x887A0002u32 as HRESULT;
-pub const DXGI_ERROR_MORE_DATA: HRESULT = 0x887A0003u32 as HRESULT;
-pub const DXGI_ERROR_UNSUPPORTED: HRESULT = 0x887A0004u32 as HRESULT;
-pub const DXGI_ERROR_DEVICE_REMOVED: HRESULT = 0x887A0005u32 as HRESULT;
-pub const DXGI_ERROR_DEVICE_HUNG: HRESULT = 0x887A0006u32 as HRESULT;
-pub const DXGI_ERROR_DEVICE_RESET: HRESULT = 0x887A0007u32 as HRESULT;
-pub const DXGI_ERROR_WAS_STILL_DRAWING: HRESULT = 0x887A000Au32 as HRESULT;
-pub const DXGI_ERROR_FRAME_STATISTICS_DISJOINT: HRESULT = 0x887A000Bu32 as HRESULT;
-pub const DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE: HRESULT = 0x887A000Cu32 as HRESULT;
-pub const DXGI_ERROR_DRIVER_INTERNAL_ERROR: HRESULT = 0x887A0020u32 as HRESULT;
-pub const DXGI_ERROR_NONEXCLUSIVE: HRESULT = 0x887A0021u32 as HRESULT;
-pub const DXGI_ERROR_NOT_CURRENTLY_AVAILABLE: HRESULT = 0x887A0022u32 as HRESULT;
-pub const DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED: HRESULT = 0x887A0023u32 as HRESULT;
-pub const DXGI_ERROR_REMOTE_OUTOFMEMORY: HRESULT = 0x887A0024u32 as HRESULT;
-pub const DXGI_ERROR_ACCESS_LOST: HRESULT = 0x887A0026u32 as HRESULT;
-pub const DXGI_ERROR_WAIT_TIMEOUT: HRESULT = 0x887A0027u32 as HRESULT;
-pub const DXGI_ERROR_SESSION_DISCONNECTED: HRESULT = 0x887A0028u32 as HRESULT;
-pub const DXGI_ERROR_RESTRICT_TO_OUTPUT_STALE: HRESULT = 0x887A0029u32 as HRESULT;
-pub const DXGI_ERROR_CANNOT_PROTECT_CONTENT: HRESULT = 0x887A002Au32 as HRESULT;
-pub const DXGI_ERROR_ACCESS_DENIED: HRESULT = 0x887A002Bu32 as HRESULT;
-pub const DXGI_ERROR_NAME_ALREADY_EXISTS: HRESULT = 0x887A002Cu32 as HRESULT;
-pub const DXGI_ERROR_SDK_COMPONENT_MISSING: HRESULT = 0x887A002Du32 as HRESULT;
-pub const DXGI_STATUS_UNOCCLUDED: HRESULT = 0x087A0009;
-pub const DXGI_STATUS_DDA_WAS_STILL_DRAWING: HRESULT = 0x087A000A;
-pub const DXGI_ERROR_MODE_CHANGE_IN_PROGRESS: HRESULT = 0x887A0025u32 as HRESULT;
-pub const DXGI_DDI_ERR_WASSTILLDRAWING: HRESULT = 0x887B0001u32 as HRESULT;
-pub const DXGI_DDI_ERR_UNSUPPORTED: HRESULT = 0x887B0002u32 as HRESULT;
-pub const DXGI_DDI_ERR_NONEXCLUSIVE: HRESULT = 0x887B0003u32 as HRESULT;
-pub const D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS: HRESULT = 0x88790001u32 as HRESULT;
-pub const D3D10_ERROR_FILE_NOT_FOUND: HRESULT = 0x88790002u32 as HRESULT;
-pub const D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS: HRESULT = 0x887C0001u32 as HRESULT;
-pub const D3D11_ERROR_FILE_NOT_FOUND: HRESULT = 0x887C0002u32 as HRESULT;
-pub const D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS: HRESULT = 0x887C0003u32 as HRESULT;
-pub const D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD: HRESULT = 0x887C0004u32 as HRESULT;
-pub const D2DERR_WRONG_STATE: HRESULT = 0x88990001u32 as HRESULT;
-pub const D2DERR_NOT_INITIALIZED: HRESULT = 0x88990002u32 as HRESULT;
-pub const D2DERR_UNSUPPORTED_OPERATION: HRESULT = 0x88990003u32 as HRESULT;
-pub const D2DERR_SCANNER_FAILED: HRESULT = 0x88990004u32 as HRESULT;
-pub const D2DERR_SCREEN_ACCESS_DENIED: HRESULT = 0x88990005u32 as HRESULT;
-pub const D2DERR_DISPLAY_STATE_INVALID: HRESULT = 0x88990006u32 as HRESULT;
-pub const D2DERR_ZERO_VECTOR: HRESULT = 0x88990007u32 as HRESULT;
-pub const D2DERR_INTERNAL_ERROR: HRESULT = 0x88990008u32 as HRESULT;
-pub const D2DERR_DISPLAY_FORMAT_NOT_SUPPORTED: HRESULT = 0x88990009u32 as HRESULT;
-pub const D2DERR_INVALID_CALL: HRESULT = 0x8899000Au32 as HRESULT;
-pub const D2DERR_NO_HARDWARE_DEVICE: HRESULT = 0x8899000Bu32 as HRESULT;
-pub const D2DERR_RECREATE_TARGET: HRESULT = 0x8899000Cu32 as HRESULT;
-pub const D2DERR_TOO_MANY_SHADER_ELEMENTS: HRESULT = 0x8899000Du32 as HRESULT;
-pub const D2DERR_SHADER_COMPILE_FAILED: HRESULT = 0x8899000Eu32 as HRESULT;
-pub const D2DERR_MAX_TEXTURE_SIZE_EXCEEDED: HRESULT = 0x8899000Fu32 as HRESULT;
-pub const D2DERR_UNSUPPORTED_VERSION: HRESULT = 0x88990010u32 as HRESULT;
-pub const D2DERR_BAD_NUMBER: HRESULT = 0x88990011u32 as HRESULT;
-pub const D2DERR_WRONG_FACTORY: HRESULT = 0x88990012u32 as HRESULT;
-pub const D2DERR_LAYER_ALREADY_IN_USE: HRESULT = 0x88990013u32 as HRESULT;
-pub const D2DERR_POP_CALL_DID_NOT_MATCH_PUSH: HRESULT = 0x88990014u32 as HRESULT;
-pub const D2DERR_WRONG_RESOURCE_DOMAIN: HRESULT = 0x88990015u32 as HRESULT;
-pub const D2DERR_PUSH_POP_UNBALANCED: HRESULT = 0x88990016u32 as HRESULT;
-pub const D2DERR_RENDER_TARGET_HAS_LAYER_OR_CLIPRECT: HRESULT = 0x88990017u32 as HRESULT;
-pub const D2DERR_INCOMPATIBLE_BRUSH_TYPES: HRESULT = 0x88990018u32 as HRESULT;
-pub const D2DERR_WIN32_ERROR: HRESULT = 0x88990019u32 as HRESULT;
-pub const D2DERR_TARGET_NOT_GDI_COMPATIBLE: HRESULT = 0x8899001Au32 as HRESULT;
-pub const D2DERR_TEXT_EFFECT_IS_WRONG_TYPE: HRESULT = 0x8899001Bu32 as HRESULT;
-pub const D2DERR_TEXT_RENDERER_NOT_RELEASED: HRESULT = 0x8899001Cu32 as HRESULT;
-pub const D2DERR_EXCEEDS_MAX_BITMAP_SIZE: HRESULT = 0x8899001Du32 as HRESULT;
-pub const D2DERR_INVALID_GRAPH_CONFIGURATION: HRESULT = 0x8899001Eu32 as HRESULT;
-pub const D2DERR_INVALID_INTERNAL_GRAPH_CONFIGURATION: HRESULT = 0x8899001Fu32 as HRESULT;
-pub const D2DERR_CYCLIC_GRAPH: HRESULT = 0x88990020u32 as HRESULT;
-pub const D2DERR_BITMAP_CANNOT_DRAW: HRESULT = 0x88990021u32 as HRESULT;
-pub const D2DERR_OUTSTANDING_BITMAP_REFERENCES: HRESULT = 0x88990022u32 as HRESULT;
-pub const D2DERR_ORIGINAL_TARGET_NOT_BOUND: HRESULT = 0x88990023u32 as HRESULT;
-pub const D2DERR_INVALID_TARGET: HRESULT = 0x88990024u32 as HRESULT;
-pub const D2DERR_BITMAP_BOUND_AS_TARGET: HRESULT = 0x88990025u32 as HRESULT;
-pub const D2DERR_INSUFFICIENT_DEVICE_CAPABILITIES: HRESULT = 0x88990026u32 as HRESULT;
-pub const D2DERR_INTERMEDIATE_TOO_LARGE: HRESULT = 0x88990027u32 as HRESULT;
-pub const D2DERR_EFFECT_IS_NOT_REGISTERED: HRESULT = 0x88990028u32 as HRESULT;
-pub const D2DERR_INVALID_PROPERTY: HRESULT = 0x88990029u32 as HRESULT;
-pub const D2DERR_NO_SUBPROPERTIES: HRESULT = 0x8899002Au32 as HRESULT;
-pub const D2DERR_PRINT_JOB_CLOSED: HRESULT = 0x8899002Bu32 as HRESULT;
-pub const D2DERR_PRINT_FORMAT_NOT_SUPPORTED: HRESULT = 0x8899002Cu32 as HRESULT;
-pub const D2DERR_TOO_MANY_TRANSFORM_INPUTS: HRESULT = 0x8899002Du32 as HRESULT;
-pub const DWRITE_E_FILEFORMAT: HRESULT = 0x88985000u32 as HRESULT;
-pub const DWRITE_E_UNEXPECTED: HRESULT = 0x88985001u32 as HRESULT;
-pub const DWRITE_E_NOFONT: HRESULT = 0x88985002u32 as HRESULT;
-pub const DWRITE_E_FILENOTFOUND: HRESULT = 0x88985003u32 as HRESULT;
-pub const DWRITE_E_FILEACCESS: HRESULT = 0x88985004u32 as HRESULT;
-pub const DWRITE_E_FONTCOLLECTIONOBSOLETE: HRESULT = 0x88985005u32 as HRESULT;
-pub const DWRITE_E_ALREADYREGISTERED: HRESULT = 0x88985006u32 as HRESULT;
-pub const DWRITE_E_CACHEFORMAT: HRESULT = 0x88985007u32 as HRESULT;
-pub const DWRITE_E_CACHEVERSION: HRESULT = 0x88985008u32 as HRESULT;
-pub const DWRITE_E_UNSUPPORTEDOPERATION: HRESULT = 0x88985009u32 as HRESULT;
-pub const DWRITE_E_TEXTRENDERERINCOMPATIBLE: HRESULT = 0x8898500Au32 as HRESULT;
-pub const DWRITE_E_FLOWDIRECTIONCONFLICTS: HRESULT = 0x8898500Bu32 as HRESULT;
-pub const DWRITE_E_NOCOLOR: HRESULT = 0x8898500Cu32 as HRESULT;
-pub const WINCODEC_ERR_WRONGSTATE: HRESULT = 0x88982F04u32 as HRESULT;
-pub const WINCODEC_ERR_VALUEOUTOFRANGE: HRESULT = 0x88982F05u32 as HRESULT;
-pub const WINCODEC_ERR_UNKNOWNIMAGEFORMAT: HRESULT = 0x88982F07u32 as HRESULT;
-pub const WINCODEC_ERR_UNSUPPORTEDVERSION: HRESULT = 0x88982F0Bu32 as HRESULT;
-pub const WINCODEC_ERR_NOTINITIALIZED: HRESULT = 0x88982F0Cu32 as HRESULT;
-pub const WINCODEC_ERR_ALREADYLOCKED: HRESULT = 0x88982F0Du32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYNOTFOUND: HRESULT = 0x88982F40u32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYNOTSUPPORTED: HRESULT = 0x88982F41u32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYSIZE: HRESULT = 0x88982F42u32 as HRESULT;
-pub const WINCODEC_ERR_CODECPRESENT: HRESULT = 0x88982F43u32 as HRESULT;
-pub const WINCODEC_ERR_CODECNOTHUMBNAIL: HRESULT = 0x88982F44u32 as HRESULT;
-pub const WINCODEC_ERR_PALETTEUNAVAILABLE: HRESULT = 0x88982F45u32 as HRESULT;
-pub const WINCODEC_ERR_CODECTOOMANYSCANLINES: HRESULT = 0x88982F46u32 as HRESULT;
-pub const WINCODEC_ERR_INTERNALERROR: HRESULT = 0x88982F48u32 as HRESULT;
-pub const WINCODEC_ERR_SOURCERECTDOESNOTMATCHDIMENSIONS: HRESULT = 0x88982F49u32 as HRESULT;
-pub const WINCODEC_ERR_COMPONENTNOTFOUND: HRESULT = 0x88982F50u32 as HRESULT;
-pub const WINCODEC_ERR_IMAGESIZEOUTOFRANGE: HRESULT = 0x88982F51u32 as HRESULT;
-pub const WINCODEC_ERR_TOOMUCHMETADATA: HRESULT = 0x88982F52u32 as HRESULT;
-pub const WINCODEC_ERR_BADIMAGE: HRESULT = 0x88982F60u32 as HRESULT;
-pub const WINCODEC_ERR_BADHEADER: HRESULT = 0x88982F61u32 as HRESULT;
-pub const WINCODEC_ERR_FRAMEMISSING: HRESULT = 0x88982F62u32 as HRESULT;
-pub const WINCODEC_ERR_BADMETADATAHEADER: HRESULT = 0x88982F63u32 as HRESULT;
-pub const WINCODEC_ERR_BADSTREAMDATA: HRESULT = 0x88982F70u32 as HRESULT;
-pub const WINCODEC_ERR_STREAMWRITE: HRESULT = 0x88982F71u32 as HRESULT;
-pub const WINCODEC_ERR_STREAMREAD: HRESULT = 0x88982F72u32 as HRESULT;
-pub const WINCODEC_ERR_STREAMNOTAVAILABLE: HRESULT = 0x88982F73u32 as HRESULT;
-pub const WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT: HRESULT = 0x88982F80u32 as HRESULT;
-pub const WINCODEC_ERR_UNSUPPORTEDOPERATION: HRESULT = 0x88982F81u32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDREGISTRATION: HRESULT = 0x88982F8Au32 as HRESULT;
-pub const WINCODEC_ERR_COMPONENTINITIALIZEFAILURE: HRESULT = 0x88982F8Bu32 as HRESULT;
-pub const WINCODEC_ERR_INSUFFICIENTBUFFER: HRESULT = 0x88982F8Cu32 as HRESULT;
-pub const WINCODEC_ERR_DUPLICATEMETADATAPRESENT: HRESULT = 0x88982F8Du32 as HRESULT;
-pub const WINCODEC_ERR_PROPERTYUNEXPECTEDTYPE: HRESULT = 0x88982F8Eu32 as HRESULT;
-pub const WINCODEC_ERR_UNEXPECTEDSIZE: HRESULT = 0x88982F8Fu32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDQUERYREQUEST: HRESULT = 0x88982F90u32 as HRESULT;
-pub const WINCODEC_ERR_UNEXPECTEDMETADATATYPE: HRESULT = 0x88982F91u32 as HRESULT;
-pub const WINCODEC_ERR_REQUESTONLYVALIDATMETADATAROOT: HRESULT = 0x88982F92u32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDQUERYCHARACTER: HRESULT = 0x88982F93u32 as HRESULT;
-pub const WINCODEC_ERR_WIN32ERROR: HRESULT = 0x88982F94u32 as HRESULT;
-pub const WINCODEC_ERR_INVALIDPROGRESSIVELEVEL: HRESULT = 0x88982F95u32 as HRESULT;
-pub const MILERR_OBJECTBUSY: HRESULT = 0x88980001u32 as HRESULT;
-pub const MILERR_INSUFFICIENTBUFFER: HRESULT = 0x88980002u32 as HRESULT;
-pub const MILERR_WIN32ERROR: HRESULT = 0x88980003u32 as HRESULT;
-pub const MILERR_SCANNER_FAILED: HRESULT = 0x88980004u32 as HRESULT;
-pub const MILERR_SCREENACCESSDENIED: HRESULT = 0x88980005u32 as HRESULT;
-pub const MILERR_DISPLAYSTATEINVALID: HRESULT = 0x88980006u32 as HRESULT;
-pub const MILERR_NONINVERTIBLEMATRIX: HRESULT = 0x88980007u32 as HRESULT;
-pub const MILERR_ZEROVECTOR: HRESULT = 0x88980008u32 as HRESULT;
-pub const MILERR_TERMINATED: HRESULT = 0x88980009u32 as HRESULT;
-pub const MILERR_BADNUMBER: HRESULT = 0x8898000Au32 as HRESULT;
-pub const MILERR_INTERNALERROR: HRESULT = 0x88980080u32 as HRESULT;
-pub const MILERR_DISPLAYFORMATNOTSUPPORTED: HRESULT = 0x88980084u32 as HRESULT;
-pub const MILERR_INVALIDCALL: HRESULT = 0x88980085u32 as HRESULT;
-pub const MILERR_ALREADYLOCKED: HRESULT = 0x88980086u32 as HRESULT;
-pub const MILERR_NOTLOCKED: HRESULT = 0x88980087u32 as HRESULT;
-pub const MILERR_DEVICECANNOTRENDERTEXT: HRESULT = 0x88980088u32 as HRESULT;
-pub const MILERR_GLYPHBITMAPMISSED: HRESULT = 0x88980089u32 as HRESULT;
-pub const MILERR_MALFORMEDGLYPHCACHE: HRESULT = 0x8898008Au32 as HRESULT;
-pub const MILERR_GENERIC_IGNORE: HRESULT = 0x8898008Bu32 as HRESULT;
-pub const MILERR_MALFORMED_GUIDELINE_DATA: HRESULT = 0x8898008Cu32 as HRESULT;
-pub const MILERR_NO_HARDWARE_DEVICE: HRESULT = 0x8898008Du32 as HRESULT;
-pub const MILERR_NEED_RECREATE_AND_PRESENT: HRESULT = 0x8898008Eu32 as HRESULT;
-pub const MILERR_ALREADY_INITIALIZED: HRESULT = 0x8898008Fu32 as HRESULT;
-pub const MILERR_MISMATCHED_SIZE: HRESULT = 0x88980090u32 as HRESULT;
-pub const MILERR_NO_REDIRECTION_SURFACE_AVAILABLE: HRESULT = 0x88980091u32 as HRESULT;
-pub const MILERR_REMOTING_NOT_SUPPORTED: HRESULT = 0x88980092u32 as HRESULT;
-pub const MILERR_QUEUED_PRESENT_NOT_SUPPORTED: HRESULT = 0x88980093u32 as HRESULT;
-pub const MILERR_NOT_QUEUING_PRESENTS: HRESULT = 0x88980094u32 as HRESULT;
-pub const MILERR_NO_REDIRECTION_SURFACE_RETRY_LATER: HRESULT = 0x88980095u32 as HRESULT;
-pub const MILERR_TOOMANYSHADERELEMNTS: HRESULT = 0x88980096u32 as HRESULT;
-pub const MILERR_MROW_READLOCK_FAILED: HRESULT = 0x88980097u32 as HRESULT;
-pub const MILERR_MROW_UPDATE_FAILED: HRESULT = 0x88980098u32 as HRESULT;
-pub const MILERR_SHADER_COMPILE_FAILED: HRESULT = 0x88980099u32 as HRESULT;
-pub const MILERR_MAX_TEXTURE_SIZE_EXCEEDED: HRESULT = 0x8898009Au32 as HRESULT;
-pub const MILERR_QPC_TIME_WENT_BACKWARD: HRESULT = 0x8898009Bu32 as HRESULT;
-pub const MILERR_DXGI_ENUMERATION_OUT_OF_SYNC: HRESULT = 0x8898009Du32 as HRESULT;
-pub const MILERR_ADAPTER_NOT_FOUND: HRESULT = 0x8898009Eu32 as HRESULT;
-pub const MILERR_COLORSPACE_NOT_SUPPORTED: HRESULT = 0x8898009Fu32 as HRESULT;
-pub const MILERR_PREFILTER_NOT_SUPPORTED: HRESULT = 0x889800A0u32 as HRESULT;
-pub const MILERR_DISPLAYID_ACCESS_DENIED: HRESULT = 0x889800A1u32 as HRESULT;
-pub const UCEERR_INVALIDPACKETHEADER: HRESULT = 0x88980400u32 as HRESULT;
-pub const UCEERR_UNKNOWNPACKET: HRESULT = 0x88980401u32 as HRESULT;
-pub const UCEERR_ILLEGALPACKET: HRESULT = 0x88980402u32 as HRESULT;
-pub const UCEERR_MALFORMEDPACKET: HRESULT = 0x88980403u32 as HRESULT;
-pub const UCEERR_ILLEGALHANDLE: HRESULT = 0x88980404u32 as HRESULT;
-pub const UCEERR_HANDLELOOKUPFAILED: HRESULT = 0x88980405u32 as HRESULT;
-pub const UCEERR_RENDERTHREADFAILURE: HRESULT = 0x88980406u32 as HRESULT;
-pub const UCEERR_CTXSTACKFRSTTARGETNULL: HRESULT = 0x88980407u32 as HRESULT;
-pub const UCEERR_CONNECTIONIDLOOKUPFAILED: HRESULT = 0x88980408u32 as HRESULT;
-pub const UCEERR_BLOCKSFULL: HRESULT = 0x88980409u32 as HRESULT;
-pub const UCEERR_MEMORYFAILURE: HRESULT = 0x8898040Au32 as HRESULT;
-pub const UCEERR_PACKETRECORDOUTOFRANGE: HRESULT = 0x8898040Bu32 as HRESULT;
-pub const UCEERR_ILLEGALRECORDTYPE: HRESULT = 0x8898040Cu32 as HRESULT;
-pub const UCEERR_OUTOFHANDLES: HRESULT = 0x8898040Du32 as HRESULT;
-pub const UCEERR_UNCHANGABLE_UPDATE_ATTEMPTED: HRESULT = 0x8898040Eu32 as HRESULT;
-pub const UCEERR_NO_MULTIPLE_WORKER_THREADS: HRESULT = 0x8898040Fu32 as HRESULT;
-pub const UCEERR_REMOTINGNOTSUPPORTED: HRESULT = 0x88980410u32 as HRESULT;
-pub const UCEERR_MISSINGENDCOMMAND: HRESULT = 0x88980411u32 as HRESULT;
-pub const UCEERR_MISSINGBEGINCOMMAND: HRESULT = 0x88980412u32 as HRESULT;
-pub const UCEERR_CHANNELSYNCTIMEDOUT: HRESULT = 0x88980413u32 as HRESULT;
-pub const UCEERR_CHANNELSYNCABANDONED: HRESULT = 0x88980414u32 as HRESULT;
-pub const UCEERR_UNSUPPORTEDTRANSPORTVERSION: HRESULT = 0x88980415u32 as HRESULT;
-pub const UCEERR_TRANSPORTUNAVAILABLE: HRESULT = 0x88980416u32 as HRESULT;
-pub const UCEERR_FEEDBACK_UNSUPPORTED: HRESULT = 0x88980417u32 as HRESULT;
-pub const UCEERR_COMMANDTRANSPORTDENIED: HRESULT = 0x88980418u32 as HRESULT;
-pub const UCEERR_GRAPHICSSTREAMUNAVAILABLE: HRESULT = 0x88980419u32 as HRESULT;
-pub const UCEERR_GRAPHICSSTREAMALREADYOPEN: HRESULT = 0x88980420u32 as HRESULT;
-pub const UCEERR_TRANSPORTDISCONNECTED: HRESULT = 0x88980421u32 as HRESULT;
-pub const UCEERR_TRANSPORTOVERLOADED: HRESULT = 0x88980422u32 as HRESULT;
-pub const UCEERR_PARTITION_ZOMBIED: HRESULT = 0x88980423u32 as HRESULT;
-pub const MILAVERR_NOCLOCK: HRESULT = 0x88980500u32 as HRESULT;
-pub const MILAVERR_NOMEDIATYPE: HRESULT = 0x88980501u32 as HRESULT;
-pub const MILAVERR_NOVIDEOMIXER: HRESULT = 0x88980502u32 as HRESULT;
-pub const MILAVERR_NOVIDEOPRESENTER: HRESULT = 0x88980503u32 as HRESULT;
-pub const MILAVERR_NOREADYFRAMES: HRESULT = 0x88980504u32 as HRESULT;
-pub const MILAVERR_MODULENOTLOADED: HRESULT = 0x88980505u32 as HRESULT;
-pub const MILAVERR_WMPFACTORYNOTREGISTERED: HRESULT = 0x88980506u32 as HRESULT;
-pub const MILAVERR_INVALIDWMPVERSION: HRESULT = 0x88980507u32 as HRESULT;
-pub const MILAVERR_INSUFFICIENTVIDEORESOURCES: HRESULT = 0x88980508u32 as HRESULT;
-pub const MILAVERR_VIDEOACCELERATIONNOTAVAILABLE: HRESULT = 0x88980509u32 as HRESULT;
-pub const MILAVERR_REQUESTEDTEXTURETOOBIG: HRESULT = 0x8898050Au32 as HRESULT;
-pub const MILAVERR_SEEKFAILED: HRESULT = 0x8898050Bu32 as HRESULT;
-pub const MILAVERR_UNEXPECTEDWMPFAILURE: HRESULT = 0x8898050Cu32 as HRESULT;
-pub const MILAVERR_MEDIAPLAYERCLOSED: HRESULT = 0x8898050Du32 as HRESULT;
-pub const MILAVERR_UNKNOWNHARDWAREERROR: HRESULT = 0x8898050Eu32 as HRESULT;
-pub const MILEFFECTSERR_UNKNOWNPROPERTY: HRESULT = 0x8898060Eu32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTNOTPARTOFGROUP: HRESULT = 0x8898060Fu32 as HRESULT;
-pub const MILEFFECTSERR_NOINPUTSOURCEATTACHED: HRESULT = 0x88980610u32 as HRESULT;
-pub const MILEFFECTSERR_CONNECTORNOTCONNECTED: HRESULT = 0x88980611u32 as HRESULT;
-pub const MILEFFECTSERR_CONNECTORNOTASSOCIATEDWITHEFFECT: HRESULT = 0x88980612u32 as HRESULT;
-pub const MILEFFECTSERR_RESERVED: HRESULT = 0x88980613u32 as HRESULT;
-pub const MILEFFECTSERR_CYCLEDETECTED: HRESULT = 0x88980614u32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTINMORETHANONEGRAPH: HRESULT = 0x88980615u32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTALREADYINAGRAPH: HRESULT = 0x88980616u32 as HRESULT;
-pub const MILEFFECTSERR_EFFECTHASNOCHILDREN: HRESULT = 0x88980617u32 as HRESULT;
-pub const MILEFFECTSERR_ALREADYATTACHEDTOLISTENER: HRESULT = 0x88980618u32 as HRESULT;
-pub const MILEFFECTSERR_NOTAFFINETRANSFORM: HRESULT = 0x88980619u32 as HRESULT;
-pub const MILEFFECTSERR_EMPTYBOUNDS: HRESULT = 0x8898061Au32 as HRESULT;
-pub const MILEFFECTSERR_OUTPUTSIZETOOLARGE: HRESULT = 0x8898061Bu32 as HRESULT;
-pub const DWMERR_STATE_TRANSITION_FAILED: HRESULT = 0x88980700u32 as HRESULT;
-pub const DWMERR_THEME_FAILED: HRESULT = 0x88980701u32 as HRESULT;
-pub const DWMERR_CATASTROPHIC_FAILURE: HRESULT = 0x88980702u32 as HRESULT;
-pub const DCOMPOSITION_ERROR_WINDOW_ALREADY_COMPOSED: HRESULT = 0x88980800u32 as HRESULT;
-pub const DCOMPOSITION_ERROR_SURFACE_BEING_RENDERED: HRESULT = 0x88980801u32 as HRESULT;
-pub const DCOMPOSITION_ERROR_SURFACE_NOT_BEING_RENDERED: HRESULT = 0x88980802u32 as HRESULT;
-pub const ONL_E_INVALID_AUTHENTICATION_TARGET: HRESULT = 0x80860001u32 as HRESULT;
-pub const ONL_E_ACCESS_DENIED_BY_TOU: HRESULT = 0x80860002u32 as HRESULT;
-pub const ONL_E_INVALID_APPLICATION: HRESULT = 0x80860003u32 as HRESULT;
-pub const ONL_E_PASSWORD_UPDATE_REQUIRED: HRESULT = 0x80860004u32 as HRESULT;
-pub const ONL_E_ACCOUNT_UPDATE_REQUIRED: HRESULT = 0x80860005u32 as HRESULT;
-pub const ONL_E_FORCESIGNIN: HRESULT = 0x80860006u32 as HRESULT;
-pub const ONL_E_ACCOUNT_LOCKED: HRESULT = 0x80860007u32 as HRESULT;
-pub const ONL_E_PARENTAL_CONSENT_REQUIRED: HRESULT = 0x80860008u32 as HRESULT;
-pub const ONL_E_EMAIL_VERIFICATION_REQUIRED: HRESULT = 0x80860009u32 as HRESULT;
-pub const ONL_E_ACCOUNT_SUSPENDED_COMPROIMISE: HRESULT = 0x8086000Au32 as HRESULT;
-pub const ONL_E_ACCOUNT_SUSPENDED_ABUSE: HRESULT = 0x8086000Bu32 as HRESULT;
-pub const ONL_E_ACTION_REQUIRED: HRESULT = 0x8086000Cu32 as HRESULT;
-pub const ONL_CONNECTION_COUNT_LIMIT: HRESULT = 0x8086000Du32 as HRESULT;
-pub const ONL_E_CONNECTED_ACCOUNT_CAN_NOT_SIGNOUT: HRESULT = 0x8086000Eu32 as HRESULT;
-pub const ONL_E_USER_AUTHENTICATION_REQUIRED: HRESULT = 0x8086000Fu32 as HRESULT;
-pub const ONL_E_REQUEST_THROTTLED: HRESULT = 0x80860010u32 as HRESULT;
-pub const FA_E_MAX_PERSISTED_ITEMS_REACHED: HRESULT = 0x80270220u32 as HRESULT;
-pub const FA_E_HOMEGROUP_NOT_AVAILABLE: HRESULT = 0x80270222u32 as HRESULT;
-pub const E_MONITOR_RESOLUTION_TOO_LOW: HRESULT = 0x80270250u32 as HRESULT;
-pub const E_ELEVATED_ACTIVATION_NOT_SUPPORTED: HRESULT = 0x80270251u32 as HRESULT;
-pub const E_UAC_DISABLED: HRESULT = 0x80270252u32 as HRESULT;
-pub const E_FULL_ADMIN_NOT_SUPPORTED: HRESULT = 0x80270253u32 as HRESULT;
-pub const E_APPLICATION_NOT_REGISTERED: HRESULT = 0x80270254u32 as HRESULT;
-pub const E_MULTIPLE_EXTENSIONS_FOR_APPLICATION: HRESULT = 0x80270255u32 as HRESULT;
-pub const E_MULTIPLE_PACKAGES_FOR_FAMILY: HRESULT = 0x80270256u32 as HRESULT;
-pub const E_APPLICATION_MANAGER_NOT_RUNNING: HRESULT = 0x80270257u32 as HRESULT;
-pub const S_STORE_LAUNCHED_FOR_REMEDIATION: HRESULT = 0x00270258;
-pub const S_APPLICATION_ACTIVATION_ERROR_HANDLED_BY_DIALOG: HRESULT = 0x00270259;
-pub const E_APPLICATION_ACTIVATION_TIMED_OUT: HRESULT = 0x8027025Au32 as HRESULT;
-pub const E_APPLICATION_ACTIVATION_EXEC_FAILURE: HRESULT = 0x8027025Bu32 as HRESULT;
-pub const E_APPLICATION_TEMPORARY_LICENSE_ERROR: HRESULT = 0x8027025Cu32 as HRESULT;
-pub const E_APPLICATION_TRIAL_LICENSE_EXPIRED: HRESULT = 0x8027025Du32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_FILE_SYSTEM_NOT_SUPPORTED: HRESULT = 0x80270260u32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_OVERLAP: HRESULT = 0x80270261u32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_CANNOT_INDEX: HRESULT = 0x80270262u32 as HRESULT;
-pub const E_SKYDRIVE_FILE_NOT_UPLOADED: HRESULT = 0x80270263u32 as HRESULT;
-pub const E_SKYDRIVE_UPDATE_AVAILABILITY_FAIL: HRESULT = 0x80270264u32 as HRESULT;
-pub const E_SKYDRIVE_ROOT_TARGET_VOLUME_ROOT_NOT_SUPPORTED: HRESULT = 0x80270265u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_SIZE_OVER_LIMIT: HRESULT = 0x8802B001u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_SIZE_EXCEEDS_REMAINING_QUOTA: HRESULT = 0x8802B002u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_FILE_NAME: HRESULT = 0x8802B003u32 as HRESULT;
-pub const E_SYNCENGINE_FOLDER_ITEM_COUNT_LIMIT_EXCEEDED: HRESULT = 0x8802B004u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_SYNC_PARTNER_ERROR: HRESULT = 0x8802B005u32 as HRESULT;
-pub const E_SYNCENGINE_SYNC_PAUSED_BY_SERVICE: HRESULT = 0x8802B006u32 as HRESULT;
-pub const E_SYNCENGINE_FILE_IDENTIFIER_UNKNOWN: HRESULT = 0x8802C002u32 as HRESULT;
-pub const E_SYNCENGINE_SERVICE_AUTHENTICATION_FAILED: HRESULT = 0x8802C003u32 as HRESULT;
-pub const E_SYNCENGINE_UNKNOWN_SERVICE_ERROR: HRESULT = 0x8802C004u32 as HRESULT;
-pub const E_SYNCENGINE_SERVICE_RETURNED_UNEXPECTED_SIZE: HRESULT = 0x8802C005u32 as HRESULT;
-pub const E_SYNCENGINE_REQUEST_BLOCKED_BY_SERVICE: HRESULT = 0x8802C006u32 as HRESULT;
-pub const E_SYNCENGINE_REQUEST_BLOCKED_DUE_TO_CLIENT_ERROR: HRESULT = 0x8802C007u32 as HRESULT;
-pub const E_SYNCENGINE_FOLDER_INACCESSIBLE: HRESULT = 0x8802D001u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_FOLDER_NAME: HRESULT = 0x8802D002u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_MARKET: HRESULT = 0x8802D003u32 as HRESULT;
-pub const E_SYNCENGINE_PATH_LENGTH_LIMIT_EXCEEDED: HRESULT = 0x8802D004u32 as HRESULT;
-pub const E_SYNCENGINE_REMOTE_PATH_LENGTH_LIMIT_EXCEEDED: HRESULT = 0x8802D005u32 as HRESULT;
-pub const E_SYNCENGINE_CLIENT_UPDATE_NEEDED: HRESULT = 0x8802D006u32 as HRESULT;
-pub const E_SYNCENGINE_PROXY_AUTHENTICATION_REQUIRED: HRESULT = 0x8802D007u32 as HRESULT;
-pub const E_SYNCENGINE_STORAGE_SERVICE_PROVISIONING_FAILED: HRESULT = 0x8802D008u32 as HRESULT;
-pub const E_SYNCENGINE_UNSUPPORTED_REPARSE_POINT: HRESULT = 0x8802D009u32 as HRESULT;
-pub const E_SYNCENGINE_STORAGE_SERVICE_BLOCKED: HRESULT = 0x8802D00Au32 as HRESULT;
-pub const E_SYNCENGINE_FOLDER_IN_REDIRECTION: HRESULT = 0x8802D00Bu32 as HRESULT;
-pub const EAS_E_POLICY_NOT_MANAGED_BY_OS: HRESULT = 0x80550001u32 as HRESULT;
-pub const EAS_E_POLICY_COMPLIANT_WITH_ACTIONS: HRESULT = 0x80550002u32 as HRESULT;
-pub const EAS_E_REQUESTED_POLICY_NOT_ENFORCEABLE: HRESULT = 0x80550003u32 as HRESULT;
-pub const EAS_E_CURRENT_USER_HAS_BLANK_PASSWORD: HRESULT = 0x80550004u32 as HRESULT;
-pub const EAS_E_REQUESTED_POLICY_PASSWORD_EXPIRATION_INCOMPATIBLE: HRESULT = 0x80550005u32 as HRESULT;
-pub const EAS_E_USER_CANNOT_CHANGE_PASSWORD: HRESULT = 0x80550006u32 as HRESULT;
-pub const EAS_E_ADMINS_HAVE_BLANK_PASSWORD: HRESULT = 0x80550007u32 as HRESULT;
-pub const EAS_E_ADMINS_CANNOT_CHANGE_PASSWORD: HRESULT = 0x80550008u32 as HRESULT;
-pub const EAS_E_LOCAL_CONTROLLED_USERS_CANNOT_CHANGE_PASSWORD: HRESULT = 0x80550009u32 as HRESULT;
-pub const EAS_E_PASSWORD_POLICY_NOT_ENFORCEABLE_FOR_CONNECTED_ADMINS: HRESULT = 0x8055000Au32 as HRESULT;
-pub const EAS_E_CONNECTED_ADMINS_NEED_TO_CHANGE_PASSWORD: HRESULT = 0x8055000Bu32 as HRESULT;
-pub const EAS_E_PASSWORD_POLICY_NOT_ENFORCEABLE_FOR_CURRENT_CONNECTED_USER: HRESULT = 0x8055000Cu32 as HRESULT;
-pub const EAS_E_CURRENT_CONNECTED_USER_NEED_TO_CHANGE_PASSWORD: HRESULT = 0x8055000Du32 as HRESULT;
-pub const WEB_E_UNSUPPORTED_FORMAT: HRESULT = 0x83750001u32 as HRESULT;
-pub const WEB_E_INVALID_XML: HRESULT = 0x83750002u32 as HRESULT;
-pub const WEB_E_MISSING_REQUIRED_ELEMENT: HRESULT = 0x83750003u32 as HRESULT;
-pub const WEB_E_MISSING_REQUIRED_ATTRIBUTE: HRESULT = 0x83750004u32 as HRESULT;
-pub const WEB_E_UNEXPECTED_CONTENT: HRESULT = 0x83750005u32 as HRESULT;
-pub const WEB_E_RESOURCE_TOO_LARGE: HRESULT = 0x83750006u32 as HRESULT;
-pub const WEB_E_INVALID_JSON_STRING: HRESULT = 0x83750007u32 as HRESULT;
-pub const WEB_E_INVALID_JSON_NUMBER: HRESULT = 0x83750008u32 as HRESULT;
-pub const WEB_E_JSON_VALUE_NOT_FOUND: HRESULT = 0x83750009u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED: HRESULT = 0x80190001u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED_REDIRECTION: HRESULT = 0x80190003u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED_CLIENT_ERROR: HRESULT = 0x80190004u32 as HRESULT;
-pub const HTTP_E_STATUS_UNEXPECTED_SERVER_ERROR: HRESULT = 0x80190005u32 as HRESULT;
-pub const HTTP_E_STATUS_AMBIGUOUS: HRESULT = 0x8019012Cu32 as HRESULT;
-pub const HTTP_E_STATUS_MOVED: HRESULT = 0x8019012Du32 as HRESULT;
-pub const HTTP_E_STATUS_REDIRECT: HRESULT = 0x8019012Eu32 as HRESULT;
-pub const HTTP_E_STATUS_REDIRECT_METHOD: HRESULT = 0x8019012Fu32 as HRESULT;
-pub const HTTP_E_STATUS_NOT_MODIFIED: HRESULT = 0x80190130u32 as HRESULT;
-pub const HTTP_E_STATUS_USE_PROXY: HRESULT = 0x80190131u32 as HRESULT;
-pub const HTTP_E_STATUS_REDIRECT_KEEP_VERB: HRESULT = 0x80190133u32 as HRESULT;
-pub const HTTP_E_STATUS_BAD_REQUEST: HRESULT = 0x80190190u32 as HRESULT;
-pub const HTTP_E_STATUS_DENIED: HRESULT = 0x80190191u32 as HRESULT;
-pub const HTTP_E_STATUS_PAYMENT_REQ: HRESULT = 0x80190192u32 as HRESULT;
-pub const HTTP_E_STATUS_FORBIDDEN: HRESULT = 0x80190193u32 as HRESULT;
-pub const HTTP_E_STATUS_NOT_FOUND: HRESULT = 0x80190194u32 as HRESULT;
-pub const HTTP_E_STATUS_BAD_METHOD: HRESULT = 0x80190195u32 as HRESULT;
-pub const HTTP_E_STATUS_NONE_ACCEPTABLE: HRESULT = 0x80190196u32 as HRESULT;
-pub const HTTP_E_STATUS_PROXY_AUTH_REQ: HRESULT = 0x80190197u32 as HRESULT;
-pub const HTTP_E_STATUS_REQUEST_TIMEOUT: HRESULT = 0x80190198u32 as HRESULT;
-pub const HTTP_E_STATUS_CONFLICT: HRESULT = 0x80190199u32 as HRESULT;
-pub const HTTP_E_STATUS_GONE: HRESULT = 0x8019019Au32 as HRESULT;
-pub const HTTP_E_STATUS_LENGTH_REQUIRED: HRESULT = 0x8019019Bu32 as HRESULT;
-pub const HTTP_E_STATUS_PRECOND_FAILED: HRESULT = 0x8019019Cu32 as HRESULT;
-pub const HTTP_E_STATUS_REQUEST_TOO_LARGE: HRESULT = 0x8019019Du32 as HRESULT;
-pub const HTTP_E_STATUS_URI_TOO_LONG: HRESULT = 0x8019019Eu32 as HRESULT;
-pub const HTTP_E_STATUS_UNSUPPORTED_MEDIA: HRESULT = 0x8019019Fu32 as HRESULT;
-pub const HTTP_E_STATUS_RANGE_NOT_SATISFIABLE: HRESULT = 0x801901A0u32 as HRESULT;
-pub const HTTP_E_STATUS_EXPECTATION_FAILED: HRESULT = 0x801901A1u32 as HRESULT;
-pub const HTTP_E_STATUS_SERVER_ERROR: HRESULT = 0x801901F4u32 as HRESULT;
-pub const HTTP_E_STATUS_NOT_SUPPORTED: HRESULT = 0x801901F5u32 as HRESULT;
-pub const HTTP_E_STATUS_BAD_GATEWAY: HRESULT = 0x801901F6u32 as HRESULT;
-pub const HTTP_E_STATUS_SERVICE_UNAVAIL: HRESULT = 0x801901F7u32 as HRESULT;
-pub const HTTP_E_STATUS_GATEWAY_TIMEOUT: HRESULT = 0x801901F8u32 as HRESULT;
-pub const HTTP_E_STATUS_VERSION_NOT_SUP: HRESULT = 0x801901F9u32 as HRESULT;
-pub const E_INVALID_PROTOCOL_OPERATION: HRESULT = 0x83760001u32 as HRESULT;
-pub const E_INVALID_PROTOCOL_FORMAT: HRESULT = 0x83760002u32 as HRESULT;
-pub const E_PROTOCOL_EXTENSIONS_NOT_SUPPORTED: HRESULT = 0x83760003u32 as HRESULT;
-pub const E_SUBPROTOCOL_NOT_SUPPORTED: HRESULT = 0x83760004u32 as HRESULT;
-pub const E_PROTOCOL_VERSION_NOT_SUPPORTED: HRESULT = 0x83760005u32 as HRESULT;
-pub const INPUT_E_OUT_OF_ORDER: HRESULT = 0x80400000u32 as HRESULT;
-pub const INPUT_E_REENTRANCY: HRESULT = 0x80400001u32 as HRESULT;
-pub const INPUT_E_MULTIMODAL: HRESULT = 0x80400002u32 as HRESULT;
-pub const INPUT_E_PACKET: HRESULT = 0x80400003u32 as HRESULT;
-pub const INPUT_E_FRAME: HRESULT = 0x80400004u32 as HRESULT;
-pub const INPUT_E_HISTORY: HRESULT = 0x80400005u32 as HRESULT;
-pub const INPUT_E_DEVICE_INFO: HRESULT = 0x80400006u32 as HRESULT;
-pub const INPUT_E_TRANSFORM: HRESULT = 0x80400007u32 as HRESULT;
-pub const INPUT_E_DEVICE_PROPERTY: HRESULT = 0x80400008u32 as HRESULT;
-pub const INET_E_INVALID_URL: HRESULT = 0x800C0002u32 as HRESULT;
-pub const INET_E_NO_SESSION: HRESULT = 0x800C0003u32 as HRESULT;
-pub const INET_E_CANNOT_CONNECT: HRESULT = 0x800C0004u32 as HRESULT;
-pub const INET_E_RESOURCE_NOT_FOUND: HRESULT = 0x800C0005u32 as HRESULT;
-pub const INET_E_OBJECT_NOT_FOUND: HRESULT = 0x800C0006u32 as HRESULT;
-pub const INET_E_DATA_NOT_AVAILABLE: HRESULT = 0x800C0007u32 as HRESULT;
-pub const INET_E_DOWNLOAD_FAILURE: HRESULT = 0x800C0008u32 as HRESULT;
-pub const INET_E_AUTHENTICATION_REQUIRED: HRESULT = 0x800C0009u32 as HRESULT;
-pub const INET_E_NO_VALID_MEDIA: HRESULT = 0x800C000Au32 as HRESULT;
-pub const INET_E_CONNECTION_TIMEOUT: HRESULT = 0x800C000Bu32 as HRESULT;
-pub const INET_E_INVALID_REQUEST: HRESULT = 0x800C000Cu32 as HRESULT;
-pub const INET_E_UNKNOWN_PROTOCOL: HRESULT = 0x800C000Du32 as HRESULT;
-pub const INET_E_SECURITY_PROBLEM: HRESULT = 0x800C000Eu32 as HRESULT;
-pub const INET_E_CANNOT_LOAD_DATA: HRESULT = 0x800C000Fu32 as HRESULT;
-pub const INET_E_CANNOT_INSTANTIATE_OBJECT: HRESULT = 0x800C0010u32 as HRESULT;
-pub const INET_E_INVALID_CERTIFICATE: HRESULT = 0x800C0019u32 as HRESULT;
-pub const INET_E_REDIRECT_FAILED: HRESULT = 0x800C0014u32 as HRESULT;
-pub const INET_E_REDIRECT_TO_DIR: HRESULT = 0x800C0015u32 as HRESULT;
-pub const ERROR_DBG_CREATE_PROCESS_FAILURE_LOCKDOWN: HRESULT = 0x80B00001u32 as HRESULT;
-pub const ERROR_DBG_ATTACH_PROCESS_FAILURE_LOCKDOWN: HRESULT = 0x80B00002u32 as HRESULT;
-pub const ERROR_DBG_CONNECT_SERVER_FAILURE_LOCKDOWN: HRESULT = 0x80B00003u32 as HRESULT;
-pub const ERROR_DBG_START_SERVER_FAILURE_LOCKDOWN: HRESULT = 0x80B00004u32 as HRESULT;
-pub const ERROR_IO_PREEMPTED: HRESULT = 0x89010001u32 as HRESULT;
-pub const JSCRIPT_E_CANTEXECUTE: HRESULT = 0x89020001u32 as HRESULT;
-pub const WEP_E_NOT_PROVISIONED_ON_ALL_VOLUMES: HRESULT = 0x88010001u32 as HRESULT;
-pub const WEP_E_FIXED_DATA_NOT_SUPPORTED: HRESULT = 0x88010002u32 as HRESULT;
-pub const WEP_E_HARDWARE_NOT_COMPLIANT: HRESULT = 0x88010003u32 as HRESULT;
-pub const WEP_E_LOCK_NOT_CONFIGURED: HRESULT = 0x88010004u32 as HRESULT;
-pub const WEP_E_PROTECTION_SUSPENDED: HRESULT = 0x88010005u32 as HRESULT;
-pub const WEP_E_NO_LICENSE: HRESULT = 0x88010006u32 as HRESULT;
-pub const WEP_E_OS_NOT_PROTECTED: HRESULT = 0x88010007u32 as HRESULT;
-pub const WEP_E_UNEXPECTED_FAIL: HRESULT = 0x88010008u32 as HRESULT;
-pub const WEP_E_BUFFER_TOO_LARGE: HRESULT = 0x88010009u32 as HRESULT;
-pub const ERROR_SVHDX_ERROR_STORED: HRESULT = 0xC05C0000u32 as HRESULT;
-pub const ERROR_SVHDX_ERROR_NOT_AVAILABLE: HRESULT = 0xC05CFF00u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_AVAILABLE: HRESULT = 0xC05CFF01u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_CAPACITY_DATA_CHANGED: HRESULT = 0xC05CFF02u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_RESERVATIONS_PREEMPTED: HRESULT = 0xC05CFF03u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_RESERVATIONS_RELEASED: HRESULT = 0xC05CFF04u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_REGISTRATIONS_PREEMPTED: HRESULT = 0xC05CFF05u32 as HRESULT;
-pub const ERROR_SVHDX_UNIT_ATTENTION_OPERATING_DEFINITION_CHANGED: HRESULT = 0xC05CFF06u32 as HRESULT;
-pub const ERROR_SVHDX_RESERVATION_CONFLICT: HRESULT = 0xC05CFF07u32 as HRESULT;
-pub const ERROR_SVHDX_WRONG_FILE_TYPE: HRESULT = 0xC05CFF08u32 as HRESULT;
-pub const ERROR_SVHDX_VERSION_MISMATCH: HRESULT = 0xC05CFF09u32 as HRESULT;
-pub const ERROR_VHD_SHARED: HRESULT = 0xC05CFF0Au32 as HRESULT;
-pub const WININET_E_OUT_OF_HANDLES: HRESULT = 0x80072EE1u32 as HRESULT;
-pub const WININET_E_TIMEOUT: HRESULT = 0x80072EE2u32 as HRESULT;
-pub const WININET_E_EXTENDED_ERROR: HRESULT = 0x80072EE3u32 as HRESULT;
-pub const WININET_E_INTERNAL_ERROR: HRESULT = 0x80072EE4u32 as HRESULT;
-pub const WININET_E_INVALID_URL: HRESULT = 0x80072EE5u32 as HRESULT;
-pub const WININET_E_UNRECOGNIZED_SCHEME: HRESULT = 0x80072EE6u32 as HRESULT;
-pub const WININET_E_NAME_NOT_RESOLVED: HRESULT = 0x80072EE7u32 as HRESULT;
-pub const WININET_E_PROTOCOL_NOT_FOUND: HRESULT = 0x80072EE8u32 as HRESULT;
-pub const WININET_E_INVALID_OPTION: HRESULT = 0x80072EE9u32 as HRESULT;
-pub const WININET_E_BAD_OPTION_LENGTH: HRESULT = 0x80072EEAu32 as HRESULT;
-pub const WININET_E_OPTION_NOT_SETTABLE: HRESULT = 0x80072EEBu32 as HRESULT;
-pub const WININET_E_SHUTDOWN: HRESULT = 0x80072EECu32 as HRESULT;
-pub const WININET_E_INCORRECT_USER_NAME: HRESULT = 0x80072EEDu32 as HRESULT;
-pub const WININET_E_INCORRECT_PASSWORD: HRESULT = 0x80072EEEu32 as HRESULT;
-pub const WININET_E_LOGIN_FAILURE: HRESULT = 0x80072EEFu32 as HRESULT;
-pub const WININET_E_INVALID_OPERATION: HRESULT = 0x80072EF0u32 as HRESULT;
-pub const WININET_E_OPERATION_CANCELLED: HRESULT = 0x80072EF1u32 as HRESULT;
-pub const WININET_E_INCORRECT_HANDLE_TYPE: HRESULT = 0x80072EF2u32 as HRESULT;
-pub const WININET_E_INCORRECT_HANDLE_STATE: HRESULT = 0x80072EF3u32 as HRESULT;
-pub const WININET_E_NOT_PROXY_REQUEST: HRESULT = 0x80072EF4u32 as HRESULT;
-pub const WININET_E_REGISTRY_VALUE_NOT_FOUND: HRESULT = 0x80072EF5u32 as HRESULT;
-pub const WININET_E_BAD_REGISTRY_PARAMETER: HRESULT = 0x80072EF6u32 as HRESULT;
-pub const WININET_E_NO_DIRECT_ACCESS: HRESULT = 0x80072EF7u32 as HRESULT;
-pub const WININET_E_NO_CONTEXT: HRESULT = 0x80072EF8u32 as HRESULT;
-pub const WININET_E_NO_CALLBACK: HRESULT = 0x80072EF9u32 as HRESULT;
-pub const WININET_E_REQUEST_PENDING: HRESULT = 0x80072EFAu32 as HRESULT;
-pub const WININET_E_INCORRECT_FORMAT: HRESULT = 0x80072EFBu32 as HRESULT;
-pub const WININET_E_ITEM_NOT_FOUND: HRESULT = 0x80072EFCu32 as HRESULT;
-pub const WININET_E_CANNOT_CONNECT: HRESULT = 0x80072EFDu32 as HRESULT;
-pub const WININET_E_CONNECTION_ABORTED: HRESULT = 0x80072EFEu32 as HRESULT;
-pub const WININET_E_CONNECTION_RESET: HRESULT = 0x80072EFFu32 as HRESULT;
-pub const WININET_E_FORCE_RETRY: HRESULT = 0x80072F00u32 as HRESULT;
-pub const WININET_E_INVALID_PROXY_REQUEST: HRESULT = 0x80072F01u32 as HRESULT;
-pub const WININET_E_NEED_UI: HRESULT = 0x80072F02u32 as HRESULT;
-pub const WININET_E_HANDLE_EXISTS: HRESULT = 0x80072F04u32 as HRESULT;
-pub const WININET_E_SEC_CERT_DATE_INVALID: HRESULT = 0x80072F05u32 as HRESULT;
-pub const WININET_E_SEC_CERT_CN_INVALID: HRESULT = 0x80072F06u32 as HRESULT;
-pub const WININET_E_HTTP_TO_HTTPS_ON_REDIR: HRESULT = 0x80072F07u32 as HRESULT;
-pub const WININET_E_HTTPS_TO_HTTP_ON_REDIR: HRESULT = 0x80072F08u32 as HRESULT;
-pub const WININET_E_MIXED_SECURITY: HRESULT = 0x80072F09u32 as HRESULT;
-pub const WININET_E_CHG_POST_IS_NON_SECURE: HRESULT = 0x80072F0Au32 as HRESULT;
-pub const WININET_E_POST_IS_NON_SECURE: HRESULT = 0x80072F0Bu32 as HRESULT;
-pub const WININET_E_CLIENT_AUTH_CERT_NEEDED: HRESULT = 0x80072F0Cu32 as HRESULT;
-pub const WININET_E_INVALID_CA: HRESULT = 0x80072F0Du32 as HRESULT;
-pub const WININET_E_CLIENT_AUTH_NOT_SETUP: HRESULT = 0x80072F0Eu32 as HRESULT;
-pub const WININET_E_ASYNC_THREAD_FAILED: HRESULT = 0x80072F0Fu32 as HRESULT;
-pub const WININET_E_REDIRECT_SCHEME_CHANGE: HRESULT = 0x80072F10u32 as HRESULT;
-pub const WININET_E_DIALOG_PENDING: HRESULT = 0x80072F11u32 as HRESULT;
-pub const WININET_E_RETRY_DIALOG: HRESULT = 0x80072F12u32 as HRESULT;
-pub const WININET_E_NO_NEW_CONTAINERS: HRESULT = 0x80072F13u32 as HRESULT;
-pub const WININET_E_HTTPS_HTTP_SUBMIT_REDIR: HRESULT = 0x80072F14u32 as HRESULT;
-pub const WININET_E_SEC_CERT_ERRORS: HRESULT = 0x80072F17u32 as HRESULT;
-pub const WININET_E_SEC_CERT_REV_FAILED: HRESULT = 0x80072F19u32 as HRESULT;
-pub const WININET_E_HEADER_NOT_FOUND: HRESULT = 0x80072F76u32 as HRESULT;
-pub const WININET_E_DOWNLEVEL_SERVER: HRESULT = 0x80072F77u32 as HRESULT;
-pub const WININET_E_INVALID_SERVER_RESPONSE: HRESULT = 0x80072F78u32 as HRESULT;
-pub const WININET_E_INVALID_HEADER: HRESULT = 0x80072F79u32 as HRESULT;
-pub const WININET_E_INVALID_QUERY_REQUEST: HRESULT = 0x80072F7Au32 as HRESULT;
-pub const WININET_E_HEADER_ALREADY_EXISTS: HRESULT = 0x80072F7Bu32 as HRESULT;
-pub const WININET_E_REDIRECT_FAILED: HRESULT = 0x80072F7Cu32 as HRESULT;
-pub const WININET_E_SECURITY_CHANNEL_ERROR: HRESULT = 0x80072F7Du32 as HRESULT;
-pub const WININET_E_UNABLE_TO_CACHE_FILE: HRESULT = 0x80072F7Eu32 as HRESULT;
-pub const WININET_E_TCPIP_NOT_INSTALLED: HRESULT = 0x80072F7Fu32 as HRESULT;
-pub const WININET_E_DISCONNECTED: HRESULT = 0x80072F83u32 as HRESULT;
-pub const WININET_E_SERVER_UNREACHABLE: HRESULT = 0x80072F84u32 as HRESULT;
-pub const WININET_E_PROXY_SERVER_UNREACHABLE: HRESULT = 0x80072F85u32 as HRESULT;
-pub const WININET_E_BAD_AUTO_PROXY_SCRIPT: HRESULT = 0x80072F86u32 as HRESULT;
-pub const WININET_E_UNABLE_TO_DOWNLOAD_SCRIPT: HRESULT = 0x80072F87u32 as HRESULT;
-pub const WININET_E_SEC_INVALID_CERT: HRESULT = 0x80072F89u32 as HRESULT;
-pub const WININET_E_SEC_CERT_REVOKED: HRESULT = 0x80072F8Au32 as HRESULT;
-pub const WININET_E_FAILED_DUETOSECURITYCHECK: HRESULT = 0x80072F8Bu32 as HRESULT;
-pub const WININET_E_NOT_INITIALIZED: HRESULT = 0x80072F8Cu32 as HRESULT;
-pub const WININET_E_LOGIN_FAILURE_DISPLAY_ENTITY_BODY: HRESULT = 0x80072F8Eu32 as HRESULT;
-pub const WININET_E_DECODING_FAILED: HRESULT = 0x80072F8Fu32 as HRESULT;
-pub const WININET_E_NOT_REDIRECTED: HRESULT = 0x80072F80u32 as HRESULT;
-pub const WININET_E_COOKIE_NEEDS_CONFIRMATION: HRESULT = 0x80072F81u32 as HRESULT;
-pub const WININET_E_COOKIE_DECLINED: HRESULT = 0x80072F82u32 as HRESULT;
-pub const WININET_E_REDIRECT_NEEDS_CONFIRMATION: HRESULT = 0x80072F88u32 as HRESULT;
diff --git a/vendor/winapi-0.2.8/src/winevt.rs b/vendor/winapi-0.2.8/src/winevt.rs
deleted file mode 100644
index 3f2d6a03a7..0000000000
--- a/vendor/winapi-0.2.8/src/winevt.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Windows Events API
-pub type EVT_HANDLE = ::HANDLE;
-pub type PEVT_HANDLE = *mut ::HANDLE;
-ENUM!{enum EVT_VARIANT_TYPE {
-    EvtVarTypeNull = 0,
-    EvtVarTypeString = 1,
-    EvtVarTypeAnsiString = 2,
-    EvtVarTypeSByte = 3,
-    EvtVarTypeByte = 4,
-    EvtVarTypeInt16 = 5,
-    EvtVarTypeUInt16 = 6,
-    EvtVarTypeInt32 = 7,
-    EvtVarTypeUInt32 = 8,
-    EvtVarTypeInt64 = 9,
-    EvtVarTypeUInt64 = 10,
-    EvtVarTypeSingle = 11,
-    EvtVarTypeDouble = 12,
-    EvtVarTypeBoolean = 13,
-    EvtVarTypeBinary = 14,
-    EvtVarTypeGuid = 15,
-    EvtVarTypeSizeT = 16,
-    EvtVarTypeFileTime = 17,
-    EvtVarTypeSysTime = 18,
-    EvtVarTypeSid = 19,
-    EvtVarTypeHexInt32 = 20,
-    EvtVarTypeHexInt64 = 21,
-    EvtVarTypeEvtHandle = 32,
-    EvtVarTypeEvtXml = 35,
-}}
-pub const EVT_VARIANT_TYPE_MASK: ::DWORD = 0x7f;
-pub const EVT_VARIANT_TYPE_ARRAY: ::DWORD = 128;
-STRUCT!{struct EVT_VARIANT {
-    u: u64,
-    Count: ::DWORD,
-    Type: ::DWORD,
-}}
-// TODO - All the UNION! for each variant
-// TODO - The rest of this header
diff --git a/vendor/winapi-0.2.8/src/wingdi.rs b/vendor/winapi-0.2.8/src/wingdi.rs
deleted file mode 100644
index edc5850ed5..0000000000
--- a/vendor/winapi-0.2.8/src/wingdi.rs
+++ /dev/null
@@ -1,1238 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! GDI procedure declarations, constant definitions and macros
-pub const DISPLAY_DEVICE_ATTACHED_TO_DESKTOP: ::DWORD = 0x00000001;
-pub const DISPLAY_DEVICE_MULTI_DRIVER: ::DWORD = 0x00000002;
-pub const DISPLAY_DEVICE_PRIMARY_DEVICE: ::DWORD = 0x00000004;
-pub const DISPLAY_DEVICE_MIRRORING_DRIVER: ::DWORD = 0x00000008;
-pub const DISPLAY_DEVICE_VGA_COMPATIBLE: ::DWORD = 0x00000010;
-pub const DISPLAY_DEVICE_REMOVABLE: ::DWORD = 0x00000020;
-pub const DISPLAY_DEVICE_ACC_DRIVER: ::DWORD = 0x00000040;
-pub const DISPLAY_DEVICE_MODESPRUNED: ::DWORD = 0x08000000;
-pub const DISPLAY_DEVICE_REMOTE: ::DWORD = 0x04000000;
-pub const DISPLAY_DEVICE_DISCONNECT: ::DWORD = 0x02000000;
-pub const DISPLAY_DEVICE_TS_COMPATIBLE: ::DWORD = 0x00200000;
-pub const DISPLAY_DEVICE_UNSAFE_MODES_ON: ::DWORD = 0x00080000;
-pub const DISPLAY_DEVICE_ACTIVE: ::DWORD = 0x00000001;
-pub const DISPLAY_DEVICE_ATTACHED: ::DWORD = 0x00000002;
-pub const DM_ORIENTATION: ::DWORD = 0x00000001;
-pub const DM_PAPERSIZE: ::DWORD = 0x00000002;
-pub const DM_PAPERLENGTH: ::DWORD = 0x00000004;
-pub const DM_PAPERWIDTH: ::DWORD = 0x00000008;
-pub const DM_SCALE: ::DWORD = 0x00000010;
-pub const DM_POSITION: ::DWORD = 0x00000020;
-pub const DM_NUP: ::DWORD = 0x00000040;
-pub const DM_DISPLAYORIENTATION: ::DWORD = 0x00000080;
-pub const DM_COPIES: ::DWORD = 0x00000100;
-pub const DM_DEFAULTSOURCE: ::DWORD = 0x00000200;
-pub const DM_PRINTQUALITY: ::DWORD = 0x00000400;
-pub const DM_COLOR: ::DWORD = 0x00000800;
-pub const DM_DUPLEX: ::DWORD = 0x00001000;
-pub const DM_YRESOLUTION: ::DWORD = 0x00002000;
-pub const DM_TTOPTION: ::DWORD = 0x00004000;
-pub const DM_COLLATE: ::DWORD = 0x00008000;
-pub const DM_FORMNAME: ::DWORD = 0x00010000;
-pub const DM_LOGPIXELS: ::DWORD = 0x00020000;
-pub const DM_BITSPERPEL: ::DWORD = 0x00040000;
-pub const DM_PELSWIDTH: ::DWORD = 0x00080000;
-pub const DM_PELSHEIGHT: ::DWORD = 0x00100000;
-pub const DM_DISPLAYFLAGS: ::DWORD = 0x00200000;
-pub const DM_DISPLAYFREQUENCY: ::DWORD = 0x00400000;
-pub const DM_ICMMETHOD: ::DWORD = 0x00800000;
-pub const DM_ICMINTENT: ::DWORD = 0x01000000;
-pub const DM_MEDIATYPE: ::DWORD = 0x02000000;
-pub const DM_DITHERTYPE: ::DWORD = 0x04000000;
-pub const DM_PANNINGWIDTH: ::DWORD = 0x08000000;
-pub const DM_PANNINGHEIGHT: ::DWORD = 0x10000000;
-pub const DM_DISPLAYFIXEDOUTPUT: ::DWORD = 0x20000000;
-pub const PFD_TYPE_RGBA: ::BYTE = 0;
-pub const PFD_TYPE_COLORINDEX: ::BYTE = 1;
-pub const PFD_MAIN_PLANE: ::BYTE = 0;
-pub const PFD_OVERLAY_PLANE: ::BYTE = 1;
-pub const PFD_UNDERLAY_PLANE: ::BYTE = 0xFF;
-pub const PFD_DOUBLEBUFFER: ::DWORD = 0x00000001;
-pub const PFD_STEREO: ::DWORD = 0x00000002;
-pub const PFD_DRAW_TO_WINDOW: ::DWORD = 0x00000004;
-pub const PFD_DRAW_TO_BITMAP: ::DWORD = 0x00000008;
-pub const PFD_SUPPORT_GDI: ::DWORD = 0x00000010;
-pub const PFD_SUPPORT_OPENGL: ::DWORD = 0x00000020;
-pub const PFD_GENERIC_FORMAT: ::DWORD = 0x00000040;
-pub const PFD_NEED_PALETTE: ::DWORD = 0x00000080;
-pub const PFD_NEED_SYSTEM_PALETTE: ::DWORD = 0x00000100;
-pub const PFD_SWAP_EXCHANGE: ::DWORD = 0x00000200;
-pub const PFD_SWAP_COPY: ::DWORD = 0x00000400;
-pub const PFD_SWAP_LAYER_BUFFERS: ::DWORD = 0x00000800;
-pub const PFD_GENERIC_ACCELERATED: ::DWORD = 0x00001000;
-pub const PFD_SUPPORT_DIRECTDRAW: ::DWORD = 0x00002000;
-pub const PFD_DIRECT3D_ACCELERATED: ::DWORD = 0x00004000;
-pub const PFD_SUPPORT_COMPOSITION: ::DWORD = 0x00008000;
-pub const PFD_DEPTH_DONTCARE: ::DWORD = 0x20000000;
-pub const PFD_DOUBLEBUFFER_DONTCARE: ::DWORD = 0x40000000;
-pub const PFD_STEREO_DONTCARE: ::DWORD = 0x80000000;
-pub const CCHFORMNAME: usize = 32;
-STRUCT!{struct DEVMODEA {
-    dmDeviceName: [::CHAR; ::CCHDEVICENAME],
-    dmSpecVersion: ::WORD,
-    dmDriverVersion: ::WORD,
-    dmSize: ::WORD,
-    dmDriverExtra: ::WORD,
-    dmFields: ::DWORD,
-    union1: [u8; 16],
-    dmColor: ::c_short,
-    dmDuplex: ::c_short,
-    dmYResolution: ::c_short,
-    dmTTOption: ::c_short,
-    dmCollate: ::c_short,
-    dmFormName: [::CHAR; CCHFORMNAME],
-    dmLogPixels: ::WORD,
-    dmBitsPerPel: ::DWORD,
-    dmPelsWidth: ::DWORD,
-    dmPelsHeight: ::DWORD,
-    dmDisplayFlags: ::DWORD,
-    dmDisplayFrequency: ::DWORD,
-    dmICMMethod: ::DWORD,
-    dmICMIntent: ::DWORD,
-    dmMediaType: ::DWORD,
-    dmDitherType: ::DWORD,
-    dmReserved1: ::DWORD,
-    dmReserved2: ::DWORD,
-    dmPanningWidth: ::DWORD,
-    dmPanningHeight: ::DWORD,
-}}
-pub type PDEVMODEA = *mut DEVMODEA;
-pub type NPDEVMODEA = *mut DEVMODEA;
-pub type LPDEVMODEA = *mut DEVMODEA;
-STRUCT!{struct DEVMODEW {
-    dmDeviceName: [::WCHAR; ::CCHDEVICENAME],
-    dmSpecVersion: ::WORD,
-    dmDriverVersion: ::WORD,
-    dmSize: ::WORD,
-    dmDriverExtra: ::WORD,
-    dmFields: ::DWORD,
-    union1: [u8; 16],
-    dmColor: ::c_short,
-    dmDuplex: ::c_short,
-    dmYResolution: ::c_short,
-    dmTTOption: ::c_short,
-    dmCollate: ::c_short,
-    dmFormName: [::WCHAR; CCHFORMNAME],
-    dmLogPixels: ::WORD,
-    dmBitsPerPel: ::DWORD,
-    dmPelsWidth: ::DWORD,
-    dmPelsHeight: ::DWORD,
-    dmDisplayFlags: ::DWORD,
-    dmDisplayFrequency: ::DWORD,
-    dmICMMethod: ::DWORD,
-    dmICMIntent: ::DWORD,
-    dmMediaType: ::DWORD,
-    dmDitherType: ::DWORD,
-    dmReserved1: ::DWORD,
-    dmReserved2: ::DWORD,
-    dmPanningWidth: ::DWORD,
-    dmPanningHeight: ::DWORD,
-}}
-pub type PDEVMODEW = *mut DEVMODEW;
-pub type NPDEVMODEW = *mut DEVMODEW;
-pub type LPDEVMODEW = *mut DEVMODEW;
-STRUCT!{nodebug struct DISPLAY_DEVICEW {
-    cb: ::DWORD,
-    DeviceName: [::WCHAR; 32],
-    DeviceString: [::WCHAR; 128],
-    StateFlags: ::DWORD,
-    DeviceID: [::WCHAR; 128],
-    DeviceKey: [::WCHAR; 128],
-}}
-pub type PDISPLAY_DEVICEW = *mut DISPLAY_DEVICEW;
-pub type LPDISPLAY_DEVICEW = *mut DISPLAY_DEVICEW;
-STRUCT!{nodebug struct DISPLAY_DEVICEA {
-    cb: ::DWORD,
-    DeviceName: [::CHAR; 32],
-    DeviceString: [::CHAR; 128],
-    StateFlags: ::DWORD,
-    DeviceID: [::CHAR; 128],
-    DeviceKey: [::CHAR; 128],
-}}
-pub type PDISPLAY_DEVICEA = *mut DISPLAY_DEVICEA;
-pub type LPDISPLAY_DEVICEA = *mut DISPLAY_DEVICEA;
-STRUCT!{struct PIXELFORMATDESCRIPTOR {
-    nSize: ::WORD,
-    nVersion: ::WORD,
-    dwFlags: ::DWORD,
-    iPixelType: ::BYTE,
-    cColorBits: ::BYTE,
-    cRedBits: ::BYTE,
-    cRedShift: ::BYTE,
-    cGreenBits: ::BYTE,
-    cGreenShift: ::BYTE,
-    cBlueBits: ::BYTE,
-    cBlueShift: ::BYTE,
-    cAlphaBits: ::BYTE,
-    cAlphaShift: ::BYTE,
-    cAccumBits: ::BYTE,
-    cAccumRedBits: ::BYTE,
-    cAccumGreenBits: ::BYTE,
-    cAccumBlueBits: ::BYTE,
-    cAccumAlphaBits: ::BYTE,
-    cDepthBits: ::BYTE,
-    cStencilBits: ::BYTE,
-    cAuxBuffers: ::BYTE,
-    iLayerType: ::BYTE,
-    bReserved: ::BYTE,
-    dwLayerMask: ::DWORD,
-    dwVisibleMask: ::DWORD,
-    dwDamageMask: ::DWORD,
-}}
-pub type PPIXELFORMATDESCRIPTOR = *mut PIXELFORMATDESCRIPTOR;
-pub type LPPIXELFORMATDESCRIPTOR = *mut PIXELFORMATDESCRIPTOR;
-pub const R2_BLACK: ::c_int = 1;
-pub const R2_NOTMERGEPEN: ::c_int = 2;
-pub const R2_MASKNOTPEN: ::c_int = 3;
-pub const R2_NOTCOPYPEN: ::c_int = 4;
-pub const R2_MASKPENNOT: ::c_int = 5;
-pub const R2_NOT: ::c_int = 6;
-pub const R2_XORPEN: ::c_int = 7;
-pub const R2_NOTMASKPEN: ::c_int = 8;
-pub const R2_MASKPEN: ::c_int = 9;
-pub const R2_NOTXORPEN: ::c_int = 10;
-pub const R2_NOP: ::c_int = 11;
-pub const R2_MERGENOTPEN: ::c_int = 12;
-pub const R2_COPYPEN: ::c_int = 13;
-pub const R2_MERGEPENNOT: ::c_int = 14;
-pub const R2_MERGEPEN: ::c_int = 15;
-pub const R2_WHITE: ::c_int = 16;
-pub const R2_LAST: ::c_int = 16;
-//83
-pub const SRCCOPY: ::DWORD = 0x00CC0020;
-pub const SRCPAINT: ::DWORD = 0x00EE0086;
-pub const SRCAND: ::DWORD = 0x008800C6;
-pub const SRCINVERT: ::DWORD = 0x00660046;
-pub const SRCERASE: ::DWORD = 0x00440328;
-pub const NOTSRCCOPY: ::DWORD = 0x00330008;
-pub const NOTSRCERASE: ::DWORD = 0x001100A6;
-pub const MERGECOPY: ::DWORD = 0x00C000CA;
-pub const MERGEPAINT: ::DWORD = 0x00BB0226;
-pub const PATCOPY: ::DWORD = 0x00F00021;
-pub const PATPAINT: ::DWORD = 0x00FB0A09;
-pub const PATINVERT: ::DWORD = 0x005A0049;
-pub const DSTINVERT: ::DWORD = 0x00550009;
-pub const BLACKNESS: ::DWORD = 0x00000042;
-pub const WHITENESS: ::DWORD = 0x00FF0062;
-//121
-// fnCombineMode values for CombineRgn
-pub const RGN_AND: ::c_int = 1;
-pub const RGN_OR: ::c_int = 2;
-pub const RGN_XOR: ::c_int = 3;
-pub const RGN_DIFF: ::c_int = 4;
-pub const RGN_COPY: ::c_int = 5;
-pub const RGN_MIN: ::c_int = RGN_AND;
-pub const RGN_MAX: ::c_int = RGN_COPY;
-//572 (Win 7 SDK)
-STRUCT!{struct BITMAP {
-    bmType: ::LONG,
-    bmWidth: ::LONG,
-    bmHeight: ::LONG,
-    bmWidthBytes: ::LONG,
-    bmPlanes: ::WORD,
-    bmBitsPixel: ::WORD,
-    bmBits: ::LPVOID,
-}}
-pub type PBITMAP = *mut BITMAP;
-pub type NPBITMAP = *mut BITMAP;
-pub type LPBITMAP = *mut BITMAP;
-STRUCT!{struct RGBQUAD {
-    rgbBlue: ::BYTE,
-    rgbGreen: ::BYTE,
-    rgbRed: ::BYTE,
-    rgbReserved: ::BYTE,
-}}
-pub type LPRGBQUAD = *mut RGBQUAD;
-pub const CS_ENABLE: ::DWORD = 0x00000001;
-pub const CS_DISABLE: ::DWORD = 0x00000002;
-pub const CS_DELETE_TRANSFORM: ::DWORD = 0x00000003;
-pub const LCS_SIGNATURE: ::DWORD = 0x5053_4F43; // 'PSOC'
-pub const LCS_sRGB: LCSCSTYPE = 0x7352_4742; // 'sRGB'
-pub const LCS_WINDOWS_COLOR_SPACE: LCSCSTYPE = 0x5769_6E20; // 'Win '
-pub type LCSCSTYPE = ::LONG;
-pub const LCS_CALIBRATED_RGB: LCSCSTYPE = 0x00000000;
-pub type LCSGAMUTMATCH = ::LONG;
-pub const LCS_GM_BUSINESS: LCSGAMUTMATCH = 0x00000001;
-pub const LCS_GM_GRAPHICS: LCSGAMUTMATCH = 0x00000002;
-pub const LCS_GM_IMAGES: LCSGAMUTMATCH = 0x00000004;
-pub const LCS_GM_ABS_COLORIMETRIC: LCSGAMUTMATCH = 0x00000008;
-pub const CM_OUT_OF_GAMUT: ::BYTE = 255;
-pub const CM_IN_GAMUT: ::BYTE = 0;
-pub const ICM_ADDPROFILE: ::UINT = 1;
-pub const ICM_DELETEPROFILE: ::UINT = 2;
-pub const ICM_QUERYPROFILE: ::UINT = 3;
-pub const ICM_SETDEFAULTPROFILE: ::UINT = 4;
-pub const ICM_REGISTERICMATCHER: ::UINT = 5;
-pub const ICM_UNREGISTERICMATCHER: ::UINT = 6;
-pub const ICM_QUERYMATCH: ::UINT = 7;
-pub type FXPT16DOT16 = ::c_long;
-pub type LPFXPT16DOT16 = *mut ::c_long;
-pub type FXPT2DOT30 = ::c_long;
-pub type LPFXPT2DOT30 = *mut ::c_long;
-STRUCT!{struct CIEXYZ {
-    ciexyzX: FXPT2DOT30,
-    ciexyzY: FXPT2DOT30,
-    ciexyzZ: FXPT2DOT30,
-}}
-pub type LPCIEXYZ = *mut CIEXYZ;
-STRUCT!{struct CIEXYZTRIPLE {
-    ciexyzRed: CIEXYZ,
-    ciexyzGreen: CIEXYZ,
-    ciexyzBlue: CIEXYZ,
-}}
-pub type LPCIEXYZTRIPLE = *mut CIEXYZTRIPLE;
-//716 (Win 7 SDK)
-STRUCT!{struct BITMAPINFOHEADER {
-    biSize: ::DWORD,
-    biWidth: ::LONG,
-    biHeight: ::LONG,
-    biPlanes: ::WORD,
-    biBitCount: ::WORD,
-    biCompression: ::DWORD,
-    biSizeImage: ::DWORD,
-    biXPelsPerMeter: ::LONG,
-    biYPelsPerMeter: ::LONG,
-    biClrUsed: ::DWORD,
-    biClrImportant: ::DWORD,
-}}
-pub type LPBITMAPINFOHEADER = *mut BITMAPINFOHEADER;
-pub type PBITMAPINFOHEADER = *mut BITMAPINFOHEADER;
-STRUCT!{struct BITMAPV5HEADER {
-    bV5Size: ::DWORD,
-    bV5Width: ::LONG,
-    bV5Height: ::LONG,
-    bV5Planes: ::WORD,
-    bV5BitCount: ::WORD,
-    bV5Compression: ::DWORD,
-    bV5SizeImage: ::DWORD,
-    bV5XPelsPerMeter: ::LONG,
-    bV5YPelsPerMeter: ::LONG,
-    bV5ClrUsed: ::DWORD,
-    bV5ClrImportant: ::DWORD,
-    bV5RedMask: ::DWORD,
-    bV5GreenMask: ::DWORD,
-    bV5BlueMask: ::DWORD,
-    bV5AlphaMask: ::DWORD,
-    bV5CSType: ::LONG, // LONG to match LOGCOLORSPACE
-    bV5Endpoints: CIEXYZTRIPLE,
-    bV5GammaRed: ::DWORD,
-    bV5GammaGreen: ::DWORD,
-    bV5GammaBlue: ::DWORD,
-    bV5Intent: ::LONG, // LONG to match LOGCOLORSPACE
-    bV5ProfileData: ::DWORD,
-    bV5ProfileSize: ::DWORD,
-    bV5Reserved: ::DWORD,
-}}
-pub type LPBITMAPV5HEADER = *mut BITMAPV5HEADER;
-pub type PBITMAPV5HEADER = *mut BITMAPV5HEADER;
-pub const PROFILE_LINKED: ::LONG = 0x4C49_4E4B; // 'LINK'
-pub const PROFILE_EMBEDDED: ::LONG = 0x4D42_4544; // 'MBED'
-pub const BI_RGB: ::DWORD = 0;
-pub const BI_RLE8: ::DWORD = 1;
-pub const BI_RLE4: ::DWORD = 2;
-pub const BI_BITFIELDS: ::DWORD = 3;
-pub const BI_JPEG: ::DWORD = 4;
-pub const BI_PNG: ::DWORD = 5;
-STRUCT!{struct BITMAPINFO {
-    bmiHeader: BITMAPINFOHEADER,
-    bmiColors: [RGBQUAD; 0],
-}}
-pub type LPBITMAPINFO = *mut BITMAPINFO;
-pub type PBITMAPINFO = *mut BITMAPINFO;
-//1438
-pub const LF_FACESIZE: usize = 32;
-STRUCT!{nodebug struct LOGFONTA {
-    lfHeight: ::LONG,
-    lfWidth: ::LONG,
-    lfEscapement: ::LONG,
-    lfOrientation: ::LONG,
-    lfWeight: ::LONG,
-    lfItalic: ::BYTE,
-    lfUnderline: ::BYTE,
-    lfStrikeOut: ::BYTE,
-    lfCharSet: ::BYTE,
-    lfOutPrecision: ::BYTE,
-    lfClipPrecision: ::BYTE,
-    lfQuality: ::BYTE,
-    lfPitchAndFamily: ::BYTE,
-    lfFaceName: [::CHAR; LF_FACESIZE],
-}}
-pub type LPLOGFONTA = *mut LOGFONTA;
-STRUCT!{nodebug struct LOGFONTW {
-    lfHeight: ::LONG,
-    lfWidth: ::LONG,
-    lfEscapement: ::LONG,
-    lfOrientation: ::LONG,
-    lfWeight: ::LONG,
-    lfItalic: ::BYTE,
-    lfUnderline: ::BYTE,
-    lfStrikeOut: ::BYTE,
-    lfCharSet: ::BYTE,
-    lfOutPrecision: ::BYTE,
-    lfClipPrecision: ::BYTE,
-    lfQuality: ::BYTE,
-    lfPitchAndFamily: ::BYTE,
-    lfFaceName: [::WCHAR; LF_FACESIZE],
-}}
-pub type LPLOGFONTW = *mut LOGFONTW;
-//1595
-#[inline]
-pub fn RGB (r: ::BYTE, g: ::BYTE, b: ::BYTE) -> ::COLORREF {
-  r as ::COLORREF | ((g as ::COLORREF) << 8) | ((b as ::COLORREF) << 16)
-}
-//
-pub const DRIVERVERSION: ::c_int = 0;
-pub const TECHNOLOGY: ::c_int = 2;
-pub const HORZSIZE: ::c_int = 4;
-pub const VERTSIZE: ::c_int = 6;
-pub const HORZRES: ::c_int = 8;
-pub const VERTRES: ::c_int = 10;
-pub const BITSPIXEL: ::c_int = 12;
-pub const PLANES: ::c_int = 14;
-pub const NUMBRUSHES: ::c_int = 16;
-pub const NUMPENS: ::c_int = 18;
-pub const NUMMARKERS: ::c_int = 20;
-pub const NUMFONTS: ::c_int = 22;
-pub const NUMCOLORS: ::c_int = 24;
-pub const PDEVICESIZE: ::c_int = 26;
-pub const CURVECAPS: ::c_int = 28;
-pub const LINECAPS: ::c_int = 30;
-pub const POLYGONALCAPS: ::c_int = 32;
-pub const TEXTCAPS: ::c_int = 34;
-pub const CLIPCAPS: ::c_int = 36;
-pub const RASTERCAPS: ::c_int = 38;
-pub const ASPECTX: ::c_int = 40;
-pub const ASPECTY: ::c_int = 42;
-pub const ASPECTXY: ::c_int = 44;
-pub const LOGPIXELSX: ::c_int = 88;
-pub const LOGPIXELSY: ::c_int = 90;
-pub const SIZEPALETTE: ::c_int = 104;
-pub const NUMRESERVED: ::c_int = 106;
-pub const COLORRES: ::c_int = 108;
-pub const PHYSICALWIDTH: ::c_int = 110;
-pub const PHYSICALHEIGHT: ::c_int = 111;
-pub const PHYSICALOFFSETX: ::c_int = 112;
-pub const PHYSICALOFFSETY: ::c_int = 113;
-pub const SCALINGFACTORX: ::c_int = 114;
-pub const SCALINGFACTORY: ::c_int = 115;
-pub const VREFRESH: ::c_int = 116;
-pub const DESKTOPVERTRES: ::c_int = 117;
-pub const DESKTOPHORZRES: ::c_int = 118;
-pub const BLTALIGNMENT: ::c_int = 119;
-pub const SHADEBLENDCAPS: ::c_int = 120;
-pub const COLORMGMTCAPS: ::c_int = 121;
-//1906
-pub const DIB_RGB_COLORS: ::UINT = 0;
-pub const DIB_PAL_COLORS: ::UINT = 1;
-pub const CBM_INIT: ::DWORD = 4;
-STRUCT!{struct RGNDATAHEADER {
-    dwSize: ::DWORD,
-    iType: ::DWORD,
-    nCount: ::DWORD,
-    nRgnSize: ::DWORD,
-    rcBound: ::RECT,
-}}
-pub type PRGNDATAHEADER = *mut RGNDATAHEADER;
-STRUCT!{nodebug struct RGNDATA {
-    rdh: RGNDATAHEADER,
-    Buffer: [::c_char; 0],
-}}
-pub type PRGNDATA = *mut RGNDATA;
-pub type NPRGNDATA = *mut RGNDATA;
-pub type LPRGNDATA = *mut RGNDATA;
-STRUCT!{struct PALETTEENTRY {
-    peRed: ::BYTE,
-    peGreen: ::BYTE,
-    peBlue: ::BYTE,
-    peFlags: ::BYTE,
-}}
-pub type PPALETTEENTRY = *mut PALETTEENTRY;
-pub type LPPALETTEENTRY = *mut PALETTEENTRY;
-//2824 (Win 7 SDK)
-STRUCT!{struct ABC {
-    abcA: ::c_int,
-    abcB: ::UINT,
-    abcC: ::c_int,
-}}
-pub type PABC = *mut ABC;
-pub type NPABC = *mut ABC;
-pub type LPABC = *mut ABC;
-STRUCT!{struct ABCFLOAT {
-    abcfA: ::FLOAT,
-    abcfB: ::FLOAT,
-    abcfC: ::FLOAT,
-}}
-pub type PABCFLOAT = *mut ABCFLOAT;
-pub type NPABCFLOAT = *mut ABCFLOAT;
-pub type LPABCFLOAT = *mut ABCFLOAT;
-//3581
-pub type LINEDDAPROC = Option<unsafe extern "system" fn(::c_int, ::c_int, ::LPARAM)>;
-STRUCT!{struct XFORM {
-    eM11: ::FLOAT,
-    eM12: ::FLOAT,
-    eM21: ::FLOAT,
-    eM22: ::FLOAT,
-    eDx: ::FLOAT,
-    eDy: ::FLOAT,
-}}
-pub type PXFORM = *mut XFORM;
-pub type LPXFORM = *mut XFORM;
-STRUCT!{struct LOGBRUSH {
-    lbStyle: ::UINT,
-    lbColor: ::COLORREF,
-    lbHatch: ::ULONG_PTR,
-}}
-pub type PLOGBRUSH = *mut LOGBRUSH;
-STRUCT!{nodebug struct LOGCOLORSPACEA {
-    lcsSignature: ::DWORD,
-    lcsVersion: ::DWORD,
-    lcsSize: ::DWORD,
-    lcsCSType: LCSCSTYPE,
-    lcsIntent: LCSGAMUTMATCH,
-    lcsEndpoints: CIEXYZTRIPLE,
-    lcsGammaRed: ::DWORD,
-    lcsGammaGreen: ::DWORD,
-    lcsGammaBlue: ::DWORD,
-    lcsFilename: [::CHAR; ::MAX_PATH],
-}}
-pub type LPLOGCOLORSPACEA = *mut LOGCOLORSPACEA;
-STRUCT!{nodebug struct LOGCOLORSPACEW {
-    lcsSignature: ::DWORD,
-    lcsVersion: ::DWORD,
-    lcsSize: ::DWORD,
-    lcsCSType: LCSCSTYPE,
-    lcsIntent: LCSGAMUTMATCH,
-    lcsEndpoints: CIEXYZTRIPLE,
-    lcsGammaRed: ::DWORD,
-    lcsGammaGreen: ::DWORD,
-    lcsGammaBlue: ::DWORD,
-    lcsFilename: [::WCHAR; ::MAX_PATH],
-}}
-pub type LPLOGCOLORSPACEW = *mut LOGCOLORSPACEW;
-pub const LF_FULLFACESIZE: usize = 64;
-STRUCT!{nodebug struct ENUMLOGFONTEXA {
-    elfLogFont: LOGFONTA,
-    elfFullName: [::BYTE; LF_FULLFACESIZE],
-    elfStyle: [::BYTE; LF_FACESIZE],
-    elfScript: [::BYTE; LF_FACESIZE],
-}}
-pub type LPENUMLOGFONTEXA = *mut ENUMLOGFONTEXA;
-STRUCT!{nodebug struct ENUMLOGFONTEXW {
-    elfLogFont: LOGFONTW,
-    elfFullName: [::WCHAR; LF_FULLFACESIZE],
-    elfStyle: [::WCHAR; LF_FACESIZE],
-    elfScript: [::WCHAR; LF_FACESIZE],
-}}
-pub type LPENUMLOGFONTEXW = *mut ENUMLOGFONTEXW;
-pub const MM_MAX_NUMAXES: usize = 16;
-STRUCT!{struct DESIGNVECTOR {
-    dvReserved: ::DWORD,
-    dvNumAxes: ::DWORD,
-    dvValues: [::LONG; MM_MAX_NUMAXES],
-}}
-pub type PDESIGNVECTOR = *mut DESIGNVECTOR;
-pub type LPDESIGNVECTOR = *mut DESIGNVECTOR;
-STRUCT!{nodebug struct ENUMLOGFONTEXDVA {
-    elfEnumLogfontEx: ENUMLOGFONTEXA,
-    elfDesignVector: DESIGNVECTOR,
-}}
-pub type PENUMLOGFONTEXDVA = *mut ENUMLOGFONTEXDVA;
-pub type LPENUMLOGFONTEXDVA = *mut ENUMLOGFONTEXDVA;
-STRUCT!{nodebug struct ENUMLOGFONTEXDVW {
-    elfEnumLogfontEx: ENUMLOGFONTEXW,
-    elfDesignVector: DESIGNVECTOR,
-}}
-pub type PENUMLOGFONTEXDVW = *mut ENUMLOGFONTEXDVW;
-pub type LPENUMLOGFONTEXDVW = *mut ENUMLOGFONTEXDVW;
-STRUCT!{struct LOGPALETTE {
-    palVersion: ::WORD,
-    palNumEntries: ::WORD,
-    palPalEntry: [PALETTEENTRY; 1],
-}}
-pub type PLOGPALETTE = *mut LOGPALETTE;
-pub type NPLOGPALETTE = *mut LOGPALETTE;
-pub type LPLOGPALETTE = *mut LOGPALETTE;
-STRUCT!{struct LOGPEN {
-    lopnStyle: ::UINT,
-    lopnWidth: ::POINT,
-    lopnColor: ::COLORREF,
-}}
-pub type PLOGPEN = *mut LOGPEN;
-pub type NPLOGPEN = *mut LOGPEN;
-pub type LPLOGPEN = *mut LOGPEN;
-STRUCT!{struct BLENDFUNCTION {
-    BlendOp: ::BYTE,
-    BlendFlags: ::BYTE,
-    SourceConstantAlpha: ::BYTE,
-    AlphaFormat: ::BYTE,
-}}
-pub type PBLENDFUNCTION = *mut BLENDFUNCTION;
-pub const TMPF_FIXED_PITCH: ::BYTE = 0x01;
-pub const TMPF_VECTOR: ::BYTE = 0x02;
-pub const TMPF_DEVICE: ::BYTE = 0x08;
-pub const TMPF_TRUETYPE: ::BYTE = 0x04;
-STRUCT!{struct TEXTMETRICA {
-    tmHeight: ::LONG,
-    tmAscent: ::LONG,
-    tmDescent: ::LONG,
-    tmInternalLeading: ::LONG,
-    tmExternalLeading: ::LONG,
-    tmAveCharWidth: ::LONG,
-    tmMaxCharWidth: ::LONG,
-    tmWeight: ::LONG,
-    tmOverhang: ::LONG,
-    tmDigitizedAspectX: ::LONG,
-    tmDigitizedAspectY: ::LONG,
-    tmFirstChar: ::BYTE,
-    tmLastChar: ::BYTE,
-    tmDefaultChar: ::BYTE,
-    tmBreakChar: ::BYTE,
-    tmItalic: ::BYTE,
-    tmUnderlined: ::BYTE,
-    tmStruckOut: ::BYTE,
-    tmPitchAndFamily: ::BYTE,
-    tmCharSet: ::BYTE,
-}}
-pub type PTEXTMETRICA = *mut TEXTMETRICA;
-pub type NPTEXTMETRICA = *mut TEXTMETRICA;
-pub type LPTEXTMETRICA = *mut TEXTMETRICA;
-STRUCT!{struct TEXTMETRICW {
-    tmHeight: ::LONG,
-    tmAscent: ::LONG,
-    tmDescent: ::LONG,
-    tmInternalLeading: ::LONG,
-    tmExternalLeading: ::LONG,
-    tmAveCharWidth: ::LONG,
-    tmMaxCharWidth: ::LONG,
-    tmWeight: ::LONG,
-    tmOverhang: ::LONG,
-    tmDigitizedAspectX: ::LONG,
-    tmDigitizedAspectY: ::LONG,
-    tmFirstChar: ::WCHAR,
-    tmLastChar: ::WCHAR,
-    tmDefaultChar: ::WCHAR,
-    tmBreakChar: ::WCHAR,
-    tmItalic: ::BYTE,
-    tmUnderlined: ::BYTE,
-    tmStruckOut: ::BYTE,
-    tmPitchAndFamily: ::BYTE,
-    tmCharSet: ::BYTE,
-}}
-pub type PTEXTMETRICW = *mut TEXTMETRICW;
-pub type NPTEXTMETRICW = *mut TEXTMETRICW;
-pub type LPTEXTMETRICW = *mut TEXTMETRICW;
-pub const TA_NOUPDATECP: ::UINT = 0;
-pub const TA_UPDATECP: ::UINT = 1;
-pub const TA_LEFT: ::UINT = 0;
-pub const TA_RIGHT: ::UINT = 2;
-pub const TA_CENTER: ::UINT = 6;
-pub const TA_TOP: ::UINT = 0;
-pub const TA_BOTTOM: ::UINT = 8;
-pub const TA_BASELINE: ::UINT = 24;
-pub const TA_RTLREADING: ::UINT = 256;
-pub const TA_MASK: ::UINT = TA_BASELINE + TA_CENTER + TA_UPDATECP + TA_RTLREADING;
-pub const WHITE_BRUSH: ::c_int = 0;
-pub const LTGRAY_BRUSH: ::c_int = 1;
-pub const GRAY_BRUSH: ::c_int = 2;
-pub const DKGRAY_BRUSH: ::c_int = 3;
-pub const BLACK_BRUSH: ::c_int = 4;
-pub const NULL_BRUSH: ::c_int = 5;
-pub const HOLLOW_BRUSH: ::c_int = 5;
-pub const WHITE_PEN: ::c_int = 6;
-pub const BLACK_PEN: ::c_int = 7;
-pub const NULL_PEN: ::c_int = 8;
-pub const OEM_FIXED_FONT: ::c_int = 10;
-pub const ANSI_FIXED_FONT: ::c_int = 11;
-pub const ANSI_VAR_FONT: ::c_int = 12;
-pub const SYSTEM_FONT: ::c_int = 13;
-pub const DEVICE_DEFAULT_FONT: ::c_int = 14;
-pub const DEFAULT_PALETTE: ::c_int = 15;
-pub const SYSTEM_FIXED_FONT: ::c_int = 16;
-pub const DEFAULT_GUI_FONT: ::c_int = 17;
-pub const DC_BRUSH: ::c_int = 18;
-pub const DC_PEN: ::c_int = 19;
-pub const STOCK_LAST: ::c_int = 19;pub const PS_SOLID: ::c_int = 0;
-pub const PS_DASH: ::c_int = 1;
-pub const PS_DOT: ::c_int = 2;
-pub const PS_DASHDOT: ::c_int = 3;
-pub const PS_DASHDOTDOT: ::c_int = 4;
-pub const PS_NULL: ::c_int = 5;
-pub const PS_INSIDEFRAME: ::c_int = 6;
-pub const PS_USERSTYLE: ::c_int = 7;
-pub const PS_ALTERNATE: ::c_int = 8;
-pub const TRANSPARENT: ::c_int = 1;
-pub const OPAQUE: ::c_int = 2;
-pub const BKMODE_LAST: ::c_int = 2;
-pub const MM_TEXT: ::c_int = 1;
-pub const MM_LOMETRIC: ::c_int = 2;
-pub const MM_HIMETRIC: ::c_int = 3;
-pub const MM_LOENGLISH: ::c_int = 4;
-pub const MM_HIENGLISH: ::c_int = 5;
-pub const MM_TWIPS: ::c_int = 6;
-pub const MM_ISOTROPIC: ::c_int = 7;
-pub const MM_ANISOTROPIC: ::c_int = 8;
-pub const ALTERNATE: ::c_int = 1;
-pub const WINDING: ::c_int = 2;
-pub const POLYFILL_LAST: ::c_int = 2;
-pub const OUT_DEFAULT_PRECIS: ::DWORD = 0;
-pub const OUT_STRING_PRECIS: ::DWORD = 1;
-pub const OUT_CHARACTER_PRECIS: ::DWORD = 2;
-pub const OUT_STROKE_PRECIS: ::DWORD = 3;
-pub const OUT_TT_PRECIS: ::DWORD = 4;
-pub const OUT_DEVICE_PRECIS: ::DWORD = 5;
-pub const OUT_RASTER_PRECIS: ::DWORD = 6;
-pub const OUT_TT_ONLY_PRECIS: ::DWORD = 7;
-pub const OUT_OUTLINE_PRECIS: ::DWORD = 8;
-pub const OUT_SCREEN_OUTLINE_PRECIS: ::DWORD = 9;
-pub const OUT_PS_ONLY_PRECIS: ::DWORD = 10;
-pub const CLIP_DEFAULT_PRECIS: ::DWORD = 0;
-pub const CLIP_CHARACTER_PRECIS: ::DWORD = 1;
-pub const CLIP_STROKE_PRECIS: ::DWORD = 2;
-pub const CLIP_MASK: ::DWORD = 0xf;
-pub const CLIP_LH_ANGLES: ::DWORD = 1 << 4;
-pub const CLIP_TT_ALWAYS: ::DWORD = 2 << 4;
-pub const CLIP_DFA_DISABLE: ::DWORD = 4 << 4;
-pub const CLIP_EMBEDDED: ::DWORD = 8 << 4;
-pub const DEFAULT_QUALITY: ::DWORD = 0;
-pub const DRAFT_QUALITY: ::DWORD = 1;
-pub const PROOF_QUALITY: ::DWORD = 2;
-pub const NONANTIALIASED_QUALITY: ::DWORD = 3;
-pub const ANTIALIASED_QUALITY: ::DWORD = 4;
-pub const CLEARTYPE_QUALITY: ::DWORD = 5;
-pub const CLEARTYPE_NATURAL_QUALITY: ::DWORD = 6;
-pub const DEFAULT_PITCH: ::DWORD = 0;
-pub const FIXED_PITCH: ::DWORD = 1;
-pub const VARIABLE_PITCH: ::DWORD = 2;
-pub const FF_DONTCARE: ::DWORD = 0 << 4;
-pub const FF_ROMAN: ::DWORD = 1 << 4;
-pub const FF_SWISS: ::DWORD = 2 << 4;
-pub const FF_MODERN: ::DWORD = 3 << 4;
-pub const FF_SCRIPT: ::DWORD = 4 << 4;
-pub const FF_DECORATIVE: ::DWORD = 5 << 4;
-pub const MONO_FONT: ::DWORD = 8;
-pub const ANSI_CHARSET: ::DWORD = 0;
-pub const DEFAULT_CHARSET: ::DWORD = 1;
-pub const SYMBOL_CHARSET: ::DWORD = 2;
-pub const SHIFTJIS_CHARSET: ::DWORD = 128;
-pub const HANGEUL_CHARSET: ::DWORD = 129;
-pub const HANGUL_CHARSET: ::DWORD = 129;
-pub const GB2312_CHARSET: ::DWORD = 134;
-pub const CHINESEBIG5_CHARSET: ::DWORD = 136;
-pub const OEM_CHARSET: ::DWORD = 255;
-pub const JOHAB_CHARSET: ::DWORD = 130;
-pub const HEBREW_CHARSET: ::DWORD = 177;
-pub const ARABIC_CHARSET: ::DWORD = 178;
-pub const GREEK_CHARSET: ::DWORD = 161;
-pub const TURKISH_CHARSET: ::DWORD = 162;
-pub const VIETNAMESE_CHARSET: ::DWORD = 163;
-pub const THAI_CHARSET: ::DWORD = 222;
-pub const EASTEUROPE_CHARSET: ::DWORD = 238;
-pub const RUSSIAN_CHARSET: ::DWORD = 204;
-pub const MAC_CHARSET: ::DWORD = 77;
-pub const BALTIC_CHARSET: ::DWORD = 186;
-pub const FS_LATIN1: ::DWORD = 0x00000001;
-pub const FS_LATIN2: ::DWORD = 0x00000002;
-pub const FS_CYRILLIC: ::DWORD = 0x00000004;
-pub const FS_GREEK: ::DWORD = 0x00000008;
-pub const FS_TURKISH: ::DWORD = 0x00000010;
-pub const FS_HEBREW: ::DWORD = 0x00000020;
-pub const FS_ARABIC: ::DWORD = 0x00000040;
-pub const FS_BALTIC: ::DWORD = 0x00000080;
-pub const FS_VIETNAMESE: ::DWORD = 0x00000100;
-pub const FS_THAI: ::DWORD = 0x00010000;
-pub const FS_JISJAPAN: ::DWORD = 0x00020000;
-pub const FS_CHINESESIMP: ::DWORD = 0x00040000;
-pub const FS_WANSUNG: ::DWORD = 0x00080000;
-pub const FS_CHINESETRAD: ::DWORD = 0x00100000;
-pub const FS_JOHAB: ::DWORD = 0x00200000;
-pub const FS_SYMBOL: ::DWORD = 0x80000000;
-pub const FW_DONTCARE: ::c_int = 0;
-pub const FW_THIN: ::c_int = 100;
-pub const FW_EXTRALIGHT: ::c_int = 200;
-pub const FW_LIGHT: ::c_int = 300;
-pub const FW_NORMAL: ::c_int = 400;
-pub const FW_MEDIUM: ::c_int = 500;
-pub const FW_SEMIBOLD: ::c_int = 600;
-pub const FW_BOLD: ::c_int = 700;
-pub const FW_EXTRABOLD: ::c_int = 800;
-pub const FW_HEAVY: ::c_int = 900;
-pub const FW_ULTRALIGHT: ::c_int = FW_EXTRALIGHT;
-pub const FW_REGULAR: ::c_int = FW_NORMAL;
-pub const FW_DEMIBOLD: ::c_int = FW_SEMIBOLD;
-pub const FW_ULTRABOLD: ::c_int = FW_EXTRABOLD;
-pub const FW_BLACK: ::c_int = FW_HEAVY;
-pub type COLOR16 = ::c_ushort;
-STRUCT!{struct TRIVERTEX {
-    x: ::LONG,
-    y: ::LONG,
-    Red: COLOR16,
-    Green: COLOR16,
-    Blue: COLOR16,
-    Alpha: COLOR16,
-}}
-pub type PTRIVERTEX = *mut TRIVERTEX;
-pub type LPTRIVERTEX = *mut TRIVERTEX;
-STRUCT!{struct GRADIENT_RECT {
-    UpperLeft: ::ULONG,
-    LowerRight: ::ULONG,
-}}
-pub type PGRADIENT_RECT = *mut GRADIENT_RECT;
-pub type LPGRADIENT_RECT = *mut GRADIENT_RECT;
-/* Object Definitions for EnumObjects() */
-pub const OBJ_PEN: ::UINT = 1;
-pub const OBJ_BRUSH: ::UINT = 2;
-pub const OBJ_DC: ::UINT = 3;
-pub const OBJ_METADC: ::UINT = 4;
-pub const OBJ_PAL: ::UINT = 5;
-pub const OBJ_FONT: ::UINT = 6;
-pub const OBJ_BITMAP: ::UINT = 7;
-pub const OBJ_REGION: ::UINT = 8;
-pub const OBJ_METAFILE: ::UINT = 9;
-pub const OBJ_MEMDC: ::UINT = 10;
-pub const OBJ_EXTPEN: ::UINT = 11;
-pub const OBJ_ENHMETADC: ::UINT = 12;
-pub const OBJ_ENHMETAFILE: ::UINT = 13;
-pub const OBJ_COLORSPACE: ::UINT = 14;
-pub const GDI_OBJ_LAST: ::UINT = OBJ_COLORSPACE;
-STRUCT!{struct COLORADJUSTMENT {
-    caSize: ::WORD,
-    caFlags: ::WORD,
-    caIlluminantIndex: ::WORD,
-    caRedGamma: ::WORD,
-    caGreenGamma: ::WORD,
-    caBlueGamma: ::WORD,
-    caReferenceBlack: ::WORD,
-    caReferenceWhite: ::WORD,
-    caContrast: ::SHORT,
-    caBrightness: ::SHORT,
-    caColorfulness: ::SHORT,
-    caRedGreenTint: ::SHORT,
-}}
-pub type PCOLORADJUSTMENT = *mut COLORADJUSTMENT;
-pub type LPCOLORADJUSTMENT = *mut COLORADJUSTMENT;
-pub type OLDFONTENUMPROCA = Option<unsafe extern "system" fn(
-    *const LOGFONTA, *const ::VOID, ::DWORD, ::LPARAM
-) -> ::c_int>;
-pub type OLDFONTENUMPROCW = Option<unsafe extern "system" fn(
-    *const LOGFONTW, *const ::VOID, ::DWORD, ::LPARAM
-) -> ::c_int>;
-pub type FONTENUMPROCA = OLDFONTENUMPROCA;
-pub type FONTENUMPROCW = OLDFONTENUMPROCW;
-STRUCT!{struct WCRANGE {
-    wcLow: ::WCHAR,
-    cGlyphs: ::USHORT,
-}}
-pub type PWCRANGE = *mut WCRANGE;
-pub type LPWCRANGE = *mut WCRANGE;
-STRUCT!{struct GLYPHSET {
-    cbThis: ::DWORD,
-    flAccel: ::DWORD,
-    cGlyphsSupported: ::DWORD,
-    cRanges: ::DWORD,
-    ranges: [WCRANGE;1],
-}}
-pub type PGLYPHSET = *mut GLYPHSET;
-pub type LPGLYPHSET = *mut GLYPHSET;
-pub type ABORTPROC = Option<unsafe extern "system" fn(::HDC, ::c_int) -> ::BOOL>;
-STRUCT!{struct DOCINFOA {
-    cbSize: ::c_int,
-    lpszDocName: ::LPCSTR,
-    lpszOutput: ::LPCSTR,
-    lpszDatatype: ::LPCSTR,
-    fwType: ::DWORD,
-}}
-pub type LPDOCINFOA = *mut DOCINFOA;
-STRUCT!{struct DOCINFOW {
-    cbSize: ::c_int,
-    lpszDocName: ::LPCWSTR,
-    lpszOutput: ::LPCWSTR,
-    lpszDatatype: ::LPCWSTR,
-    fwType: ::DWORD,
-}}
-pub type LPDOCINFOW = *mut DOCINFOW;
-pub type ICMENUMPROCA = Option<unsafe extern "system" fn(::LPSTR, ::LPARAM) -> ::c_int>;
-pub type ICMENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR, ::LPARAM) -> ::c_int>;
-STRUCT!{struct HANDLETABLE {
-    objectHandle: [::HGDIOBJ; 1],
-}}
-pub type LPHANDLETABLE = *mut HANDLETABLE;
-pub type PHANDLETABLE = *mut HANDLETABLE;
-STRUCT!{struct METARECORD {
-    rdSize: ::DWORD,
-    rdFunction: ::WORD,
-    rdParm: [::WORD; 1],
-}}
-pub type PMETARECORD = *mut METARECORD;
-pub type LPMETARECORD = *mut METARECORD;
-pub type MFENUMPROC = Option<unsafe extern "system" fn(
-    hdc: ::HDC, lpht: *mut ::HANDLETABLE, lpMR: *mut ::METARECORD, nObj: ::c_int, param: ::LPARAM
-) -> ::c_int>;
-pub type GOBJENUMPROC = Option<unsafe extern "system" fn(::LPVOID, ::LPARAM) -> ::c_int>;
-STRUCT!{struct GCP_RESULTSA {
-    lStructSize: ::DWORD,
-    lpOutString: ::LPSTR,
-    lpOrder: *const ::UINT,
-    lpDx: *const ::c_int,
-    lpCaretPos: *const ::c_int,
-    lpClass: ::LPSTR,
-    lpGlyphs: ::LPWSTR,
-    nGlyphs: ::UINT,
-    nMaxFit: ::c_int,
-}}
-pub type LPGCP_RESULTSA = *mut GCP_RESULTSA;
-STRUCT!{struct GCP_RESULTSW {
-    lStructSize: ::DWORD,
-    lpOutString: ::LPWSTR,
-    lpOrder: *const ::UINT,
-    lpDx: *const ::c_int,
-    lpCaretPos: *const ::c_int,
-    lpClass: ::LPSTR,
-    lpGlyphs: ::LPWSTR,
-    nGlyphs: ::UINT,
-    nMaxFit: ::c_int,
-}}
-pub type LPGCP_RESULTSW = *mut GCP_RESULTSW;
-STRUCT!{struct FONTSIGNATURE {
-    fsUsb: [::DWORD; 4],
-    fsCsb: [::DWORD; 2],
-}}
-pub type LPFONTSIGNATURE = *mut FONTSIGNATURE;
-pub type PFONTSIGNATURE = *mut FONTSIGNATURE;
-STRUCT!{struct POLYTEXTA {
-    x: ::c_int,
-    y: ::c_int,
-    n: ::UINT,
-    lpstr: ::LPCSTR,
-    uiFlags: ::UINT,
-    rcl: ::RECT,
-    pdx: *const ::c_int,
-}}
-pub type PPOLYTEXTA = *mut POLYTEXTA;
-pub type NPPOLYTEXTA = *mut POLYTEXTA;
-pub type LPPOLYTEXTA = *mut POLYTEXTA;
-STRUCT!{struct POLYTEXTW {
-    x: ::c_int,
-    y: ::c_int,
-    n: ::UINT,
-    lpstr: ::LPCWSTR,
-    uiFlags: ::UINT,
-    rcl: ::RECT,
-    pdx: *const ::c_int,
-}}
-pub type PPOLYTEXTW = *mut POLYTEXTW;
-pub type NPPOLYTEXTW = *mut POLYTEXTW;
-pub type LPPOLYTEXTW = *mut POLYTEXTW;
-STRUCT!{struct CHARSETINFO {
-    ciCharset: ::UINT,
-    ciACP: ::UINT,
-    fs: ::FONTSIGNATURE,
-}}
-pub type PCHARSETINFO = *mut CHARSETINFO;
-pub type NPCHARSETINFO = *mut CHARSETINFO;
-pub type LPCHARSETINFO = *mut CHARSETINFO;
-pub const GRADIENT_FILL_RECT_H: ::ULONG = 0x00000000;
-pub const GRADIENT_FILL_RECT_V: ::ULONG = 0x00000001;
-pub const GRADIENT_FILL_TRIANGLE: ::ULONG = 0x00000002;
-pub const GRADIENT_FILL_OP_FLAG: ::ULONG = 0x000000ff;
-STRUCT!{struct LAYERPLANEDESCRIPTOR {
-    nSize: ::WORD,
-    nVersion: ::WORD,
-    dwFlags: ::DWORD,
-    iPixelType: ::BYTE,
-    cColorBits: ::BYTE,
-    cRedBits: ::BYTE,
-    cRedShift: ::BYTE,
-    cGreenBits: ::BYTE,
-    cGreenShift: ::BYTE,
-    cBlueBits: ::BYTE,
-    cBlueShift: ::BYTE,
-    cAlphaBits: ::BYTE,
-    cAlphaShift: ::BYTE,
-    cAccumBits: ::BYTE,
-    cAccumRedBits: ::BYTE,
-    cAccumGreenBits: ::BYTE,
-    cAccumBlueBits: ::BYTE,
-    cAccumAlphaBits: ::BYTE,
-    cDepthBits: ::BYTE,
-    cStencilBits: ::BYTE,
-    cAuxBuffers: ::BYTE,
-    iLayerPlane: ::BYTE,
-    bReserved: ::BYTE,
-    crTransparent: ::COLORREF,
-}}
-pub type PLAYERPLANEDESCRIPTOR = *mut LAYERPLANEDESCRIPTOR;
-pub type LPLAYERPLANEDESCRIPTOR = *mut LAYERPLANEDESCRIPTOR;
-STRUCT!{struct ENHMETAHEADER {
-    iType: ::DWORD,
-    nSize: ::DWORD,
-    rclBounds: ::RECTL,
-    rclFrame: ::RECTL,
-    dSignature: ::DWORD,
-    nVersion: ::DWORD,
-    nBytes: ::DWORD,
-    nRecords: ::DWORD,
-    nHandles: ::WORD,
-    sReserved: ::WORD,
-    nDescription: ::DWORD,
-    offDescription: ::DWORD,
-    nPalEntries: ::DWORD,
-    szlDevice: ::SIZEL,
-    szlMillimeters: ::SIZEL,
-    cbPixelFormat: ::DWORD,
-    offPixelFormat: ::DWORD,
-    bOpenGL: ::DWORD,
-    szlMicrometers: ::SIZEL,
-}}
-pub type PENHMETAHEADER = *mut ENHMETAHEADER;
-pub type LPENHMETAHEADER = *mut ENHMETAHEADER;
-STRUCT!{struct FIXED {
-    fract: ::WORD,
-    value: ::c_short,
-}}
-STRUCT!{struct MAT2 {
-    eM11: FIXED,
-    eM12: FIXED,
-    eM21: FIXED,
-    eM22: FIXED,
-}}
-pub type LPMAT2 = *mut MAT2;
-STRUCT!{struct GLYPHMETRICS {
-    gmBlackBoxX: ::UINT,
-    gmBlackBoxY: ::UINT,
-    gmptGlyphOrigin: ::POINT,
-    gmCellIncX: ::c_short,
-    gmCellIncY: ::c_short,
-}}
-pub type LPGLYPHMETRICS = *mut GLYPHMETRICS;
-STRUCT!{struct KERNINGPAIR {
-     wFirst: ::WORD,
-     wSecond: ::WORD,
-     iKernAmount: ::c_int,
-}}
-pub type LPKERNINGPAIR = *mut KERNINGPAIR;
-STRUCT!{struct PANOSE {
-    bFamilyType: ::BYTE,
-    bSerifStyle: ::BYTE,
-    bWeight: ::BYTE,
-    bProportion: ::BYTE,
-    bContrast: ::BYTE,
-    bStrokeVariation: ::BYTE,
-    bArmStyle: ::BYTE,
-    bLetterform: ::BYTE,
-    bMidline: ::BYTE,
-    bXHeight: ::BYTE,
-}}
-pub type LPPANOSE = *mut PANOSE;
-STRUCT!{struct OUTLINETEXTMETRICA {
-    otmSize: ::UINT,
-    otmTextMetrics: TEXTMETRICA,
-    otmFiller: ::BYTE,
-    otmPanoseNumber: ::PANOSE,
-    otmfsSelection: ::UINT,
-    otmfsType: ::UINT,
-    otmsCharSlopeRise: ::c_int,
-    otmsCharSlopeRun: ::c_int,
-    otmItalicAngle: ::c_int,
-    otmEMSquare: ::UINT,
-    otmAscent: ::c_int,
-    otmDescent: ::c_int,
-    otmLineGap: ::UINT,
-    otmsCapEmHeight: ::UINT,
-    otmsXHeight: ::UINT,
-    otmrcFontBox: ::RECT,
-    otmMacAscent: ::c_int,
-    otmMacDescent: ::c_int,
-    otmMacLineGap: ::UINT,
-    otmusMinimumPPEM: ::UINT,
-    otmptSubscriptSize: ::POINT,
-    otmptSubscriptOffset: ::POINT,
-    otmptSuperscriptSize: ::POINT,
-    otmptSuperscriptOffset: ::POINT,
-    otmsStrikeoutSize: ::UINT,
-    otmsStrikeoutPosition: ::c_int,
-    otmsUnderscoreSize: ::c_int,
-    otmsUnderscorePosition: ::c_int,
-    otmpFamilyName: ::PSTR,
-    otmpFaceName: ::PSTR,
-    otmpStyleName: ::PSTR,
-    otmpFullName: ::PSTR,
-}}
-pub type POUTLINETEXTMETRICA = *mut OUTLINETEXTMETRICA;
-pub type NPOUTLINETEXTMETRICA = *mut OUTLINETEXTMETRICA;
-pub type LPOUTLINETEXTMETRICA = *mut OUTLINETEXTMETRICA;
-STRUCT!{struct OUTLINETEXTMETRICW {
-    otmSize: ::UINT,
-    otmTextMetrics: TEXTMETRICW,
-    otmFiller: ::BYTE,
-    otmPanoseNumber: ::PANOSE,
-    otmfsSelection: ::UINT,
-    otmfsType: ::UINT,
-    otmsCharSlopeRise: ::c_int,
-    otmsCharSlopeRun: ::c_int,
-    otmItalicAngle: ::c_int,
-    otmEMSquare: ::UINT,
-    otmAscent: ::c_int,
-    otmDescent: ::c_int,
-    otmLineGap: ::UINT,
-    otmsCapEmHeight: ::UINT,
-    otmsXHeight: ::UINT,
-    otmrcFontBox: ::RECT,
-    otmMacAscent: ::c_int,
-    otmMacDescent: ::c_int,
-    otmMacLineGap: ::UINT,
-    otmusMinimumPPEM: ::UINT,
-    otmptSubscriptSize: ::POINT,
-    otmptSubscriptOffset: ::POINT,
-    otmptSuperscriptSize: ::POINT,
-    otmptSuperscriptOffset: ::POINT,
-    otmsStrikeoutSize: ::UINT,
-    otmsStrikeoutPosition: ::c_int,
-    otmsUnderscoreSize: ::c_int,
-    otmsUnderscorePosition: ::c_int,
-    otmpFamilyName: ::PSTR,
-    otmpFaceName: ::PSTR,
-    otmpStyleName: ::PSTR,
-    otmpFullName: ::PSTR,
-}}
-pub type POUTLINETEXTMETRICW = *mut OUTLINETEXTMETRICW;
-pub type NPOUTLINETEXTMETRICW = *mut OUTLINETEXTMETRICW;
-pub type LPOUTLINETEXTMETRICW = *mut OUTLINETEXTMETRICW;
-STRUCT!{struct RASTERIZER_STATUS {
-    nSize: ::c_short,
-    wFlags: ::c_short,
-    nLanguageID: ::c_short,
-}}
-pub type LPRASTERIZER_STATUS = *mut RASTERIZER_STATUS;
-STRUCT!{struct ENHMETARECORD {
-    iType: ::DWORD,
-    nSize: ::DWORD,
-    dParm: [::DWORD; 1],
-}}
-pub type PENHMETARECORD = *mut ENHMETARECORD;
-pub type LPENHMETARECORD = *mut ENHMETARECORD;
-STRUCT!{struct METAFILEPICT {
-    mm: ::LONG,
-    xExt: ::LONG,
-    yExt: ::LONG,
-    hMF: ::HMETAFILE,
-}}
-pub type LPMETAFILEPICT = *mut METAFILEPICT;
-STRUCT!{struct POINTFLOAT {
-    x: ::FLOAT,
-    y: ::FLOAT,
-}}
-pub type PPOINTFLOAT = *mut POINTFLOAT;
-STRUCT!{struct GLYPHMETRICSFLOAT {
-    gmfBlackBoxX: ::FLOAT,
-    gmfBlackBoxY: ::FLOAT,
-    gmfptGlyphOrigin: POINTFLOAT,
-    gmfCellIncX: ::FLOAT,
-    gmfCellIncY: ::FLOAT,
-}}
-pub type PGLYPHMETRICSFLOAT = *mut GLYPHMETRICSFLOAT;
-pub type LPGLYPHMETRICSFLOAT = *mut GLYPHMETRICSFLOAT;
-pub const DT_PLOTTER: ::c_int = 0;
-pub const DT_RASDISPLAY: ::c_int = 1;
-pub const DT_RASPRINTER: ::c_int = 2;
-pub const DT_RASCAMERA: ::c_int = 3;
-pub const DT_CHARSTREAM: ::c_int = 4;
-pub const DT_METAFILE: ::c_int = 5;
-pub const DT_DISPFILE: ::c_int = 6;
-pub const CLR_INVALID: ::COLORREF = 0xFFFFFFFF;
-pub const ETO_OPAQUE: ::UINT = 0x0002;
-pub const ETO_CLIPPED: ::UINT = 0x0004;
-pub const ETO_GLYPH_INDEX: ::UINT = 0x0010;
-pub const ETO_RTLREADING: ::UINT = 0x0080;
-pub const ETO_NUMERICSLOCAL: ::UINT = 0x0400;
-pub const ETO_NUMERICSLATIN: ::UINT = 0x0800;
-pub const ETO_IGNORELANGUAGE: ::UINT = 0x1000;
-pub const ETO_PDY: ::UINT = 0x2000;
-pub const ETO_REVERSE_INDEX_MAP: ::UINT = 0x10000;
-STRUCT!{struct EXTLOGPEN {
-    elpPenStyle: ::DWORD,
-    elpWidth: ::DWORD,
-    elpBrushStyle: ::UINT,
-    elpColor: ::COLORREF,
-    elpHatch: ::ULONG_PTR,
-    elpNumEntries: ::DWORD,
-    elpStyleEntry: [::DWORD; 1],
-}}
-pub type PEXTLOGPEN = *mut EXTLOGPEN;
-pub type NPEXTLOGPEN = *mut EXTLOGPEN;
-pub type LPEXTLOGPEN = *mut EXTLOGPEN;
-pub type ENHMFENUMPROC = Option<unsafe extern "system" fn(
-    hdc: ::HDC, lpht: HANDLETABLE, lpmr: *const ENHMETARECORD, nHandles: ::c_int, data: ::LPARAM
-) -> ::c_int>;
-/* Metafile Functions */
-pub const META_SETBKCOLOR: ::WORD = 0x0201;
-pub const META_SETBKMODE: ::WORD = 0x0102;
-pub const META_SETMAPMODE: ::WORD = 0x0103;
-pub const META_SETROP2: ::WORD = 0x0104;
-pub const META_SETRELABS: ::WORD = 0x0105;
-pub const META_SETPOLYFILLMODE: ::WORD = 0x0106;
-pub const META_SETSTRETCHBLTMODE: ::WORD = 0x0107;
-pub const META_SETTEXTCHAREXTRA: ::WORD = 0x0108;
-pub const META_SETTEXTCOLOR: ::WORD = 0x0209;
-pub const META_SETTEXTJUSTIFICATION: ::WORD = 0x020A;
-pub const META_SETWINDOWORG: ::WORD = 0x020B;
-pub const META_SETWINDOWEXT: ::WORD = 0x020C;
-pub const META_SETVIEWPORTORG: ::WORD = 0x020D;
-pub const META_SETVIEWPORTEXT: ::WORD = 0x020E;
-pub const META_OFFSETWINDOWORG: ::WORD = 0x020F;
-pub const META_SCALEWINDOWEXT: ::WORD = 0x0410;
-pub const META_OFFSETVIEWPORTORG: ::WORD = 0x0211;
-pub const META_SCALEVIEWPORTEXT: ::WORD = 0x0412;
-pub const META_LINETO: ::WORD = 0x0213;
-pub const META_MOVETO: ::WORD = 0x0214;
-pub const META_EXCLUDECLIPRECT: ::WORD = 0x0415;
-pub const META_INTERSECTCLIPRECT: ::WORD = 0x0416;
-pub const META_ARC: ::WORD = 0x0817;
-pub const META_ELLIPSE: ::WORD = 0x0418;
-pub const META_FLOODFILL: ::WORD = 0x0419;
-pub const META_PIE: ::WORD = 0x081A;
-pub const META_RECTANGLE: ::WORD = 0x041B;
-pub const META_ROUNDRECT: ::WORD = 0x061C;
-pub const META_PATBLT: ::WORD = 0x061D;
-pub const META_SAVEDC: ::WORD = 0x001E;
-pub const META_SETPIXEL: ::WORD = 0x041F;
-pub const META_OFFSETCLIPRGN: ::WORD = 0x0220;
-pub const META_TEXTOUT: ::WORD = 0x0521;
-pub const META_BITBLT: ::WORD = 0x0922;
-pub const META_STRETCHBLT: ::WORD = 0x0B23;
-pub const META_POLYGON: ::WORD = 0x0324;
-pub const META_POLYLINE: ::WORD = 0x0325;
-pub const META_ESCAPE: ::WORD = 0x0626;
-pub const META_RESTOREDC: ::WORD = 0x0127;
-pub const META_FILLREGION: ::WORD = 0x0228;
-pub const META_FRAMEREGION: ::WORD = 0x0429;
-pub const META_INVERTREGION: ::WORD = 0x012A;
-pub const META_PAINTREGION: ::WORD = 0x012B;
-pub const META_SELECTCLIPREGION: ::WORD = 0x012C;
-pub const META_SELECTOBJECT: ::WORD = 0x012D;
-pub const META_SETTEXTALIGN: ::WORD = 0x012E;
-pub const META_CHORD: ::WORD = 0x0830;
-pub const META_SETMAPPERFLAGS: ::WORD = 0x0231;
-pub const META_EXTTEXTOUT: ::WORD = 0x0a32;
-pub const META_SETDIBTODEV: ::WORD = 0x0d33;
-pub const META_SELECTPALETTE: ::WORD = 0x0234;
-pub const META_REALIZEPALETTE: ::WORD = 0x0035;
-pub const META_ANIMATEPALETTE: ::WORD = 0x0436;
-pub const META_SETPALENTRIES: ::WORD = 0x0037;
-pub const META_POLYPOLYGON: ::WORD = 0x0538;
-pub const META_RESIZEPALETTE: ::WORD = 0x0139;
-pub const META_DIBBITBLT: ::WORD = 0x0940;
-pub const META_DIBSTRETCHBLT: ::WORD = 0x0b41;
-pub const META_DIBCREATEPATTERNBRUSH: ::WORD = 0x0142;
-pub const META_STRETCHDIB: ::WORD = 0x0f43;
-pub const META_EXTFLOODFILL: ::WORD = 0x0548;
-pub const META_SETLAYOUT: ::WORD = 0x0149;
-pub const META_DELETEOBJECT: ::WORD = 0x01f0;
-pub const META_CREATEPALETTE: ::WORD = 0x00f7;
-pub const META_CREATEPATTERNBRUSH: ::WORD = 0x01F9;
-pub const META_CREATEPENINDIRECT: ::WORD = 0x02FA;
-pub const META_CREATEFONTINDIRECT: ::WORD = 0x02FB;
-pub const META_CREATEBRUSHINDIRECT: ::WORD = 0x02FC;
-pub const META_CREATEREGION: ::WORD = 0x06FF;
diff --git a/vendor/winapi-0.2.8/src/winhttp.rs b/vendor/winapi-0.2.8/src/winhttp.rs
deleted file mode 100644
index e8ca6f646b..0000000000
--- a/vendor/winapi-0.2.8/src/winhttp.rs
+++ /dev/null
@@ -1,441 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Windows HTTP Services API constant definitions and macros
-//54
-pub type HINTERNET = ::LPVOID;
-pub type LPHINTERNET = *mut HINTERNET;
-pub type INTERNET_PORT = ::WORD;
-pub type LPINTERNET_PORT = *mut INTERNET_PORT;
-pub const INTERNET_DEFAULT_PORT: INTERNET_PORT = 0;
-pub const INTERNET_DEFAULT_HTTP_PORT: INTERNET_PORT = 80;
-pub const INTERNET_DEFAULT_HTTPS_PORT: INTERNET_PORT = 443;
-pub const WINHTTP_FLAG_ASYNC: ::DWORD = 0x10000000;
-pub const WINHTTP_FLAG_SECURE: ::DWORD = 0x00800000;
-pub const WINHTTP_FLAG_ESCAPE_PERCENT: ::DWORD = 0x00000004;
-pub const WINHTTP_FLAG_NULL_CODEPAGE: ::DWORD = 0x00000008;
-pub const WINHTTP_FLAG_BYPASS_PROXY_CACHE: ::DWORD = 0x00000100;
-pub const WINHTTP_FLAG_REFRESH: ::DWORD = WINHTTP_FLAG_BYPASS_PROXY_CACHE;
-pub const WINHTTP_FLAG_ESCAPE_DISABLE: ::DWORD = 0x00000040;
-pub const WINHTTP_FLAG_ESCAPE_DISABLE_QUERY: ::DWORD = 0x00000080;
-STRUCT!{struct WINHTTP_ASYNC_RESULT {
-    dwResult: ::DWORD_PTR,
-    dwError: ::DWORD,
-}}
-pub type LPWINHTTP_ASYNC_RESULT = *mut WINHTTP_ASYNC_RESULT;
-pub type INTERNET_SCHEME = ::c_int;
-pub type LPINTERNET_SCHEME = *mut ::c_int;
-pub const INTERNET_SCHEME_HTTP: INTERNET_SCHEME = 1;
-pub const INTERNET_SCHEME_HTTPS: INTERNET_SCHEME = 2;
-pub const INTERNET_SCHEME_FTP: INTERNET_SCHEME = 3;
-pub const INTERNET_SCHEME_SOCKS: INTERNET_SCHEME = 4;
-STRUCT!{struct URL_COMPONENTS {
-    dwStructSize: ::DWORD,
-    lpszScheme: ::LPWSTR,
-    dwSchemeLength: ::DWORD,
-    nScheme: INTERNET_SCHEME,
-    lpszHostName: ::LPWSTR,
-    dwHostNameLength: ::DWORD,
-    nPort: INTERNET_PORT,
-    lpszUserName: ::LPWSTR,
-    dwUserNameLength: ::DWORD,
-    lpszPassword: ::LPWSTR,
-    dwPasswordLength: ::DWORD,
-    lpszUrlPath: ::LPWSTR,
-    dwUrlPathLength: ::DWORD,
-    lpszExtraInfo: ::LPWSTR,
-    dwExtraInfoLength: ::DWORD,
-}}
-pub type LPURL_COMPONENTS = *mut URL_COMPONENTS;
-pub type URL_COMPONENTSW = URL_COMPONENTS;
-pub type LPURL_COMPONENTSW = LPURL_COMPONENTS;
-STRUCT!{struct WINHTTP_PROXY_INFO {
-    dwAccessType: ::DWORD,
-    lpszProxy: ::LPWSTR,
-    lpszProxyBypass: ::LPWSTR,
-}}
-pub type LPWINHTTP_PROXY_INFO = *mut WINHTTP_PROXY_INFO;
-pub type WINHTTP_PROXY_INFOW = WINHTTP_PROXY_INFO;
-pub type LPWINHTTP_PROXY_INFOW = LPWINHTTP_PROXY_INFO;
-STRUCT!{struct WINHTTP_AUTOPROXY_OPTIONS {
-    dwFlags: ::DWORD,
-    dwAutoDetectFlags: ::DWORD,
-    lpszAutoConfigUrl: ::LPCWSTR,
-    lpvReserved: ::LPVOID,
-    dwReserved: ::DWORD,
-    fAutoLogonIfChallenged: ::BOOL,
-}}
-pub const WINHTTP_AUTOPROXY_AUTO_DETECT: ::DWORD = 0x00000001;
-pub const WINHTTP_AUTOPROXY_CONFIG_URL: ::DWORD = 0x00000002;
-pub const WINHTTP_AUTOPROXY_HOST_KEEPCASE: ::DWORD = 0x00000004;
-pub const WINHTTP_AUTOPROXY_HOST_LOWERCASE: ::DWORD = 0x00000008;
-pub const WINHTTP_AUTOPROXY_RUN_INPROCESS: ::DWORD = 0x00010000;
-pub const WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY: ::DWORD = 0x00020000;
-pub const WINHTTP_AUTOPROXY_NO_DIRECTACCESS: ::DWORD = 0x00040000;
-pub const WINHTTP_AUTOPROXY_NO_CACHE_CLIENT: ::DWORD = 0x00080000;
-pub const WINHTTP_AUTOPROXY_NO_CACHE_SVC: ::DWORD = 0x00100000;
-pub const WINHTTP_AUTOPROXY_SORT_RESULTS: ::DWORD = 0x00400000;
-pub const WINHTTP_AUTO_DETECT_TYPE_DHCP: ::DWORD = 0x00000001;
-pub const WINHTTP_AUTO_DETECT_TYPE_DNS_A: ::DWORD = 0x00000002;
-STRUCT!{struct WINHTTP_PROXY_RESULT_ENTRY {
-    fProxy: ::BOOL,
-    fBypass: ::BOOL,
-    ProxyScheme: INTERNET_SCHEME,
-    pwszProxy: ::PWSTR,
-    ProxyPort: INTERNET_PORT,
-}}
-STRUCT!{struct WINHTTP_PROXY_RESULT {
-    cEntries: ::DWORD,
-    pEntries: *mut WINHTTP_PROXY_RESULT_ENTRY,
-}}
-pub const WINHTTP_FIRST_OPTION: ::DWORD = WINHTTP_OPTION_CALLBACK;
-pub const WINHTTP_OPTION_CALLBACK: ::DWORD = 1;
-pub const WINHTTP_OPTION_RESOLVE_TIMEOUT: ::DWORD = 2;
-pub const WINHTTP_OPTION_CONNECT_TIMEOUT: ::DWORD = 3;
-pub const WINHTTP_OPTION_CONNECT_RETRIES: ::DWORD = 4;
-pub const WINHTTP_OPTION_SEND_TIMEOUT: ::DWORD = 5;
-pub const WINHTTP_OPTION_RECEIVE_TIMEOUT: ::DWORD = 6;
-pub const WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT: ::DWORD = 7;
-pub const WINHTTP_OPTION_HANDLE_TYPE: ::DWORD = 9;
-pub const WINHTTP_OPTION_READ_BUFFER_SIZE: ::DWORD = 12;
-pub const WINHTTP_OPTION_WRITE_BUFFER_SIZE: ::DWORD = 13;
-pub const WINHTTP_OPTION_PARENT_HANDLE: ::DWORD = 21;
-pub const WINHTTP_OPTION_EXTENDED_ERROR: ::DWORD = 24;
-pub const WINHTTP_OPTION_SECURITY_FLAGS: ::DWORD = 31;
-pub const WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: ::DWORD = 32;
-pub const WINHTTP_OPTION_URL: ::DWORD = 34;
-pub const WINHTTP_OPTION_SECURITY_KEY_BITNESS: ::DWORD = 36;
-pub const WINHTTP_OPTION_PROXY: ::DWORD = 38;
-pub const WINHTTP_OPTION_PROXY_RESULT_ENTRY: ::DWORD = 39;
-pub const WINHTTP_OPTION_USER_AGENT: ::DWORD = 41;
-pub const WINHTTP_OPTION_CONTEXT_VALUE: ::DWORD = 45;
-pub const WINHTTP_OPTION_CLIENT_CERT_CONTEXT: ::DWORD = 47;
-pub const WINHTTP_OPTION_REQUEST_PRIORITY: ::DWORD = 58;
-pub const WINHTTP_OPTION_HTTP_VERSION: ::DWORD = 59;
-pub const WINHTTP_OPTION_DISABLE_FEATURE: ::DWORD = 63;
-pub const WINHTTP_OPTION_CODEPAGE: ::DWORD = 68;
-pub const WINHTTP_OPTION_MAX_CONNS_PER_SERVER: ::DWORD = 73;
-pub const WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER: ::DWORD = 74;
-pub const WINHTTP_OPTION_AUTOLOGON_POLICY: ::DWORD = 77;
-pub const WINHTTP_OPTION_SERVER_CERT_CONTEXT: ::DWORD = 78;
-pub const WINHTTP_OPTION_ENABLE_FEATURE: ::DWORD = 79;
-pub const WINHTTP_OPTION_WORKER_THREAD_COUNT: ::DWORD = 80;
-pub const WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT: ::DWORD = 81;
-pub const WINHTTP_OPTION_PASSPORT_COBRANDING_URL: ::DWORD = 82;
-pub const WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH: ::DWORD = 83;
-pub const WINHTTP_OPTION_SECURE_PROTOCOLS: ::DWORD = 84;
-pub const WINHTTP_OPTION_ENABLETRACING: ::DWORD = 85;
-pub const WINHTTP_OPTION_PASSPORT_SIGN_OUT: ::DWORD = 86;
-pub const WINHTTP_OPTION_PASSPORT_RETURN_URL: ::DWORD = 87;
-pub const WINHTTP_OPTION_REDIRECT_POLICY: ::DWORD = 88;
-pub const WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS: ::DWORD = 89;
-pub const WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE: ::DWORD = 90;
-pub const WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE: ::DWORD = 91;
-pub const WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE: ::DWORD = 92;
-pub const WINHTTP_OPTION_CONNECTION_INFO: ::DWORD = 93;
-pub const WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST: ::DWORD = 94;
-pub const WINHTTP_OPTION_SPN: ::DWORD = 96;
-pub const WINHTTP_OPTION_GLOBAL_PROXY_CREDS: ::DWORD = 97;
-pub const WINHTTP_OPTION_GLOBAL_SERVER_CREDS: ::DWORD = 98;
-pub const WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT: ::DWORD = 99;
-pub const WINHTTP_OPTION_REJECT_USERPWD_IN_URL: ::DWORD = 100;
-pub const WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS: ::DWORD = 101;
-pub const WINHTTP_OPTION_RECEIVE_PROXY_CONNECT_RESPONSE: ::DWORD = 103;
-pub const WINHTTP_OPTION_IS_PROXY_CONNECT_RESPONSE: ::DWORD = 104;
-pub const WINHTTP_OPTION_SERVER_SPN_USED: ::DWORD = 106;
-pub const WINHTTP_OPTION_PROXY_SPN_USED: ::DWORD = 107;
-pub const WINHTTP_OPTION_SERVER_CBT: ::DWORD = 108;
-pub const WINHTTP_OPTION_UNSAFE_HEADER_PARSING: ::DWORD = 110;
-pub const WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS: ::DWORD = 111;
-pub const WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET: ::DWORD = 114;
-pub const WINHTTP_OPTION_WEB_SOCKET_CLOSE_TIMEOUT: ::DWORD = 115;
-pub const WINHTTP_OPTION_WEB_SOCKET_KEEPALIVE_INTERVAL: ::DWORD = 116;
-pub const WINHTTP_OPTION_DECOMPRESSION: ::DWORD = 118;
-pub const WINHTTP_OPTION_WEB_SOCKET_RECEIVE_BUFFER_SIZE: ::DWORD = 122;
-pub const WINHTTP_OPTION_WEB_SOCKET_SEND_BUFFER_SIZE: ::DWORD = 123;
-pub const WINHTTP_LAST_OPTION: ::DWORD = WINHTTP_OPTION_WEB_SOCKET_SEND_BUFFER_SIZE;
-pub const WINHTTP_OPTION_USERNAME: ::DWORD = 0x1000;
-pub const WINHTTP_OPTION_PASSWORD: ::DWORD = 0x1001;
-pub const WINHTTP_OPTION_PROXY_USERNAME: ::DWORD = 0x1002;
-pub const WINHTTP_OPTION_PROXY_PASSWORD: ::DWORD = 0x1003;
-//552
-pub type WINHTTP_STATUS_CALLBACK = Option<unsafe extern "system" fn(
-    hInternet: HINTERNET, dwContext: ::DWORD_PTR, dwInternetStatus: ::DWORD,
-    lpvStatusInformation: ::LPVOID, dwStatusInformationLength: ::DWORD,
-)>;
-pub type LPWINHTTP_STATUS_CALLBACK = *mut WINHTTP_STATUS_CALLBACK;
-pub const WINHTTP_CALLBACK_STATUS_RESOLVING_NAME: ::DWORD = 0x00000001;
-pub const WINHTTP_CALLBACK_STATUS_NAME_RESOLVED: ::DWORD = 0x00000002;
-pub const WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER: ::DWORD = 0x00000004;
-pub const WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER: ::DWORD = 0x00000008;
-pub const WINHTTP_CALLBACK_STATUS_SENDING_REQUEST: ::DWORD = 0x00000010;
-pub const WINHTTP_CALLBACK_STATUS_REQUEST_SENT: ::DWORD = 0x00000020;
-pub const WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE: ::DWORD = 0x00000040;
-pub const WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED: ::DWORD = 0x00000080;
-pub const WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION: ::DWORD = 0x00000100;
-pub const WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED: ::DWORD = 0x00000200;
-pub const WINHTTP_CALLBACK_STATUS_HANDLE_CREATED: ::DWORD = 0x00000400;
-pub const WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING: ::DWORD = 0x00000800;
-pub const WINHTTP_CALLBACK_STATUS_DETECTING_PROXY: ::DWORD = 0x00001000;
-pub const WINHTTP_CALLBACK_STATUS_REDIRECT: ::DWORD = 0x00004000;
-pub const WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE: ::DWORD = 0x00008000;
-pub const WINHTTP_CALLBACK_STATUS_SECURE_FAILURE: ::DWORD = 0x00010000;
-pub const WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: ::DWORD = 0x00020000;
-pub const WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE: ::DWORD = 0x00040000;
-pub const WINHTTP_CALLBACK_STATUS_READ_COMPLETE: ::DWORD = 0x00080000;
-pub const WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE: ::DWORD = 0x00100000;
-pub const WINHTTP_CALLBACK_STATUS_REQUEST_ERROR: ::DWORD = 0x00200000;
-pub const WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: ::DWORD = 0x00400000;
-pub const WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE: ::DWORD = 0x01000000;
-pub const WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE: ::DWORD = 0x02000000;
-pub const WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE: ::DWORD = 0x04000000;
-pub const WINHTTP_CALLBACK_FLAG_RESOLVE_NAME: ::DWORD = WINHTTP_CALLBACK_STATUS_RESOLVING_NAME
-    | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED;
-pub const WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER;
-pub const WINHTTP_CALLBACK_FLAG_SEND_REQUEST: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT;
-pub const WINHTTP_CALLBACK_FLAG_RECEIVE_RESPONSE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE | WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED;
-pub const WINHTTP_CALLBACK_FLAG_CLOSE_CONNECTION: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION | WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED;
-pub const WINHTTP_CALLBACK_FLAG_HANDLES: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_HANDLE_CREATED | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING;
-pub const WINHTTP_CALLBACK_FLAG_DETECTING_PROXY: ::DWORD = WINHTTP_CALLBACK_STATUS_DETECTING_PROXY;
-pub const WINHTTP_CALLBACK_FLAG_REDIRECT: ::DWORD = WINHTTP_CALLBACK_STATUS_REDIRECT;
-pub const WINHTTP_CALLBACK_FLAG_INTERMEDIATE_RESPONSE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE;
-pub const WINHTTP_CALLBACK_FLAG_SECURE_FAILURE: ::DWORD = WINHTTP_CALLBACK_STATUS_SECURE_FAILURE;
-pub const WINHTTP_CALLBACK_FLAG_SENDREQUEST_COMPLETE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_HEADERS_AVAILABLE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE;
-pub const WINHTTP_CALLBACK_FLAG_DATA_AVAILABLE: ::DWORD = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE;
-pub const WINHTTP_CALLBACK_FLAG_READ_COMPLETE: ::DWORD = WINHTTP_CALLBACK_STATUS_READ_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE: ::DWORD = WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_REQUEST_ERROR: ::DWORD = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR;
-pub const WINHTTP_CALLBACK_FLAG_GETPROXYFORURL_COMPLETE: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS: ::DWORD =
-    WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE
-    | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE | WINHTTP_CALLBACK_STATUS_READ_COMPLETE
-    | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR
-    | WINHTTP_CALLBACK_STATUS_GETPROXYFORURL_COMPLETE;
-pub const WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS: ::DWORD = 0xffffffff;
-pub const WINHTTP_QUERY_MIME_VERSION: ::DWORD = 0;
-pub const WINHTTP_QUERY_CONTENT_TYPE: ::DWORD = 1;
-pub const WINHTTP_QUERY_CONTENT_TRANSFER_ENCODING: ::DWORD = 2;
-pub const WINHTTP_QUERY_CONTENT_ID: ::DWORD = 3;
-pub const WINHTTP_QUERY_CONTENT_DESCRIPTION: ::DWORD = 4;
-pub const WINHTTP_QUERY_CONTENT_LENGTH: ::DWORD = 5;
-pub const WINHTTP_QUERY_CONTENT_LANGUAGE: ::DWORD = 6;
-pub const WINHTTP_QUERY_ALLOW: ::DWORD = 7;
-pub const WINHTTP_QUERY_PUBLIC: ::DWORD = 8;
-pub const WINHTTP_QUERY_DATE: ::DWORD = 9;
-pub const WINHTTP_QUERY_EXPIRES: ::DWORD = 10;
-pub const WINHTTP_QUERY_LAST_MODIFIED: ::DWORD = 11;
-pub const WINHTTP_QUERY_MESSAGE_ID: ::DWORD = 12;
-pub const WINHTTP_QUERY_URI: ::DWORD = 13;
-pub const WINHTTP_QUERY_DERIVED_FROM: ::DWORD = 14;
-pub const WINHTTP_QUERY_COST: ::DWORD = 15;
-pub const WINHTTP_QUERY_LINK: ::DWORD = 16;
-pub const WINHTTP_QUERY_PRAGMA: ::DWORD = 17;
-pub const WINHTTP_QUERY_VERSION: ::DWORD = 18;
-pub const WINHTTP_QUERY_STATUS_CODE: ::DWORD = 19;
-pub const WINHTTP_QUERY_STATUS_TEXT: ::DWORD = 20;
-pub const WINHTTP_QUERY_RAW_HEADERS: ::DWORD = 21;
-pub const WINHTTP_QUERY_RAW_HEADERS_CRLF: ::DWORD = 22;
-pub const WINHTTP_QUERY_CONNECTION: ::DWORD = 23;
-pub const WINHTTP_QUERY_ACCEPT: ::DWORD = 24;
-pub const WINHTTP_QUERY_ACCEPT_CHARSET: ::DWORD = 25;
-pub const WINHTTP_QUERY_ACCEPT_ENCODING: ::DWORD = 26;
-pub const WINHTTP_QUERY_ACCEPT_LANGUAGE: ::DWORD = 27;
-pub const WINHTTP_QUERY_AUTHORIZATION: ::DWORD = 28;
-pub const WINHTTP_QUERY_CONTENT_ENCODING: ::DWORD = 29;
-pub const WINHTTP_QUERY_FORWARDED: ::DWORD = 30;
-pub const WINHTTP_QUERY_FROM: ::DWORD = 31;
-pub const WINHTTP_QUERY_IF_MODIFIED_SINCE: ::DWORD = 32;
-pub const WINHTTP_QUERY_LOCATION: ::DWORD = 33;
-pub const WINHTTP_QUERY_ORIG_URI: ::DWORD = 34;
-pub const WINHTTP_QUERY_REFERER: ::DWORD = 35;
-pub const WINHTTP_QUERY_RETRY_AFTER: ::DWORD = 36;
-pub const WINHTTP_QUERY_SERVER: ::DWORD = 37;
-pub const WINHTTP_QUERY_TITLE: ::DWORD = 38;
-pub const WINHTTP_QUERY_USER_AGENT: ::DWORD = 39;
-pub const WINHTTP_QUERY_WWW_AUTHENTICATE: ::DWORD = 40;
-pub const WINHTTP_QUERY_PROXY_AUTHENTICATE: ::DWORD = 41;
-pub const WINHTTP_QUERY_ACCEPT_RANGES: ::DWORD = 42;
-pub const WINHTTP_QUERY_SET_COOKIE: ::DWORD = 43;
-pub const WINHTTP_QUERY_COOKIE: ::DWORD = 44;
-pub const WINHTTP_QUERY_REQUEST_METHOD: ::DWORD = 45;
-pub const WINHTTP_QUERY_REFRESH: ::DWORD = 46;
-pub const WINHTTP_QUERY_CONTENT_DISPOSITION: ::DWORD = 47;
-pub const WINHTTP_QUERY_AGE: ::DWORD = 48;
-pub const WINHTTP_QUERY_CACHE_CONTROL: ::DWORD = 49;
-pub const WINHTTP_QUERY_CONTENT_BASE: ::DWORD = 50;
-pub const WINHTTP_QUERY_CONTENT_LOCATION: ::DWORD = 51;
-pub const WINHTTP_QUERY_CONTENT_MD5: ::DWORD = 52;
-pub const WINHTTP_QUERY_CONTENT_RANGE: ::DWORD = 53;
-pub const WINHTTP_QUERY_ETAG: ::DWORD = 54;
-pub const WINHTTP_QUERY_HOST: ::DWORD = 55;
-pub const WINHTTP_QUERY_IF_MATCH: ::DWORD = 56;
-pub const WINHTTP_QUERY_IF_NONE_MATCH: ::DWORD = 57;
-pub const WINHTTP_QUERY_IF_RANGE: ::DWORD = 58;
-pub const WINHTTP_QUERY_IF_UNMODIFIED_SINCE: ::DWORD = 59;
-pub const WINHTTP_QUERY_MAX_FORWARDS: ::DWORD = 60;
-pub const WINHTTP_QUERY_PROXY_AUTHORIZATION: ::DWORD = 61;
-pub const WINHTTP_QUERY_RANGE: ::DWORD = 62;
-pub const WINHTTP_QUERY_TRANSFER_ENCODING: ::DWORD = 63;
-pub const WINHTTP_QUERY_UPGRADE: ::DWORD = 64;
-pub const WINHTTP_QUERY_VARY: ::DWORD = 65;
-pub const WINHTTP_QUERY_VIA: ::DWORD = 66;
-pub const WINHTTP_QUERY_WARNING: ::DWORD = 67;
-pub const WINHTTP_QUERY_EXPECT: ::DWORD = 68;
-pub const WINHTTP_QUERY_PROXY_CONNECTION: ::DWORD = 69;
-pub const WINHTTP_QUERY_UNLESS_MODIFIED_SINCE: ::DWORD = 70;
-pub const WINHTTP_QUERY_PROXY_SUPPORT: ::DWORD = 75;
-pub const WINHTTP_QUERY_AUTHENTICATION_INFO: ::DWORD = 76;
-pub const WINHTTP_QUERY_PASSPORT_URLS: ::DWORD = 77;
-pub const WINHTTP_QUERY_PASSPORT_CONFIG: ::DWORD = 78;
-pub const WINHTTP_QUERY_MAX: ::DWORD = 78;
-pub const WINHTTP_QUERY_CUSTOM: ::DWORD = 65535;
-pub const WINHTTP_QUERY_FLAG_REQUEST_HEADERS: ::DWORD = 0x80000000;
-pub const WINHTTP_QUERY_FLAG_SYSTEMTIME: ::DWORD = 0x40000000;
-pub const WINHTTP_QUERY_FLAG_NUMBER: ::DWORD = 0x20000000;
-pub const HTTP_STATUS_CONTINUE: ::DWORD = 100;
-pub const HTTP_STATUS_SWITCH_PROTOCOLS: ::DWORD = 101;
-pub const HTTP_STATUS_OK: ::DWORD = 200;
-pub const HTTP_STATUS_CREATED: ::DWORD = 201;
-pub const HTTP_STATUS_ACCEPTED: ::DWORD = 202;
-pub const HTTP_STATUS_PARTIAL: ::DWORD = 203;
-pub const HTTP_STATUS_NO_CONTENT: ::DWORD = 204;
-pub const HTTP_STATUS_RESET_CONTENT: ::DWORD = 205;
-pub const HTTP_STATUS_PARTIAL_CONTENT: ::DWORD = 206;
-pub const HTTP_STATUS_WEBDAV_MULTI_STATUS: ::DWORD = 207;
-pub const HTTP_STATUS_AMBIGUOUS: ::DWORD = 300;
-pub const HTTP_STATUS_MOVED: ::DWORD = 301;
-pub const HTTP_STATUS_REDIRECT: ::DWORD = 302;
-pub const HTTP_STATUS_REDIRECT_METHOD: ::DWORD = 303;
-pub const HTTP_STATUS_NOT_MODIFIED: ::DWORD = 304;
-pub const HTTP_STATUS_USE_PROXY: ::DWORD = 305;
-pub const HTTP_STATUS_REDIRECT_KEEP_VERB: ::DWORD = 307;
-pub const HTTP_STATUS_BAD_REQUEST: ::DWORD = 400;
-pub const HTTP_STATUS_DENIED: ::DWORD = 401;
-pub const HTTP_STATUS_PAYMENT_REQ: ::DWORD = 402;
-pub const HTTP_STATUS_FORBIDDEN: ::DWORD = 403;
-pub const HTTP_STATUS_NOT_FOUND: ::DWORD = 404;
-pub const HTTP_STATUS_BAD_METHOD: ::DWORD = 405;
-pub const HTTP_STATUS_NONE_ACCEPTABLE: ::DWORD = 406;
-pub const HTTP_STATUS_PROXY_AUTH_REQ: ::DWORD = 407;
-pub const HTTP_STATUS_REQUEST_TIMEOUT: ::DWORD = 408;
-pub const HTTP_STATUS_CONFLICT: ::DWORD = 409;
-pub const HTTP_STATUS_GONE: ::DWORD = 410;
-pub const HTTP_STATUS_LENGTH_REQUIRED: ::DWORD = 411;
-pub const HTTP_STATUS_PRECOND_FAILED: ::DWORD = 412;
-pub const HTTP_STATUS_REQUEST_TOO_LARGE: ::DWORD = 413;
-pub const HTTP_STATUS_URI_TOO_LONG: ::DWORD = 414;
-pub const HTTP_STATUS_UNSUPPORTED_MEDIA: ::DWORD = 415;
-pub const HTTP_STATUS_RETRY_WITH: ::DWORD = 449;
-pub const HTTP_STATUS_SERVER_ERROR: ::DWORD = 500;
-pub const HTTP_STATUS_NOT_SUPPORTED: ::DWORD = 501;
-pub const HTTP_STATUS_BAD_GATEWAY: ::DWORD = 502;
-pub const HTTP_STATUS_SERVICE_UNAVAIL: ::DWORD = 503;
-pub const HTTP_STATUS_GATEWAY_TIMEOUT: ::DWORD = 504;
-pub const HTTP_STATUS_VERSION_NOT_SUP: ::DWORD = 505;
-pub const HTTP_STATUS_FIRST: ::DWORD = HTTP_STATUS_CONTINUE;
-pub const HTTP_STATUS_LAST: ::DWORD = HTTP_STATUS_VERSION_NOT_SUP;
-pub const WINHTTP_ACCESS_TYPE_DEFAULT_PROXY: ::DWORD = 0;
-pub const WINHTTP_ACCESS_TYPE_NO_PROXY: ::DWORD = 1;
-pub const WINHTTP_ACCESS_TYPE_NAMED_PROXY: ::DWORD = 3;
-pub const WINHTTP_ACCESS_TYPE_AUTOMATIC_PROXY: ::DWORD = 4;
-pub const WINHTTP_ERROR_BASE: ::DWORD = 12000;
-pub const ERROR_WINHTTP_OUT_OF_HANDLES: ::DWORD = WINHTTP_ERROR_BASE + 1;
-pub const ERROR_WINHTTP_TIMEOUT: ::DWORD = WINHTTP_ERROR_BASE + 2;
-pub const ERROR_WINHTTP_INTERNAL_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 4;
-pub const ERROR_WINHTTP_INVALID_URL: ::DWORD = WINHTTP_ERROR_BASE + 5;
-pub const ERROR_WINHTTP_UNRECOGNIZED_SCHEME: ::DWORD = WINHTTP_ERROR_BASE + 6;
-pub const ERROR_WINHTTP_NAME_NOT_RESOLVED: ::DWORD = WINHTTP_ERROR_BASE + 7;
-pub const ERROR_WINHTTP_INVALID_OPTION: ::DWORD = WINHTTP_ERROR_BASE + 9;
-pub const ERROR_WINHTTP_OPTION_NOT_SETTABLE: ::DWORD = WINHTTP_ERROR_BASE + 11;
-pub const ERROR_WINHTTP_SHUTDOWN: ::DWORD = WINHTTP_ERROR_BASE + 12;
-pub const ERROR_WINHTTP_LOGIN_FAILURE: ::DWORD = WINHTTP_ERROR_BASE + 15;
-pub const ERROR_WINHTTP_OPERATION_CANCELLED: ::DWORD = WINHTTP_ERROR_BASE + 17;
-pub const ERROR_WINHTTP_INCORRECT_HANDLE_TYPE: ::DWORD = WINHTTP_ERROR_BASE + 18;
-pub const ERROR_WINHTTP_INCORRECT_HANDLE_STATE: ::DWORD = WINHTTP_ERROR_BASE + 19;
-pub const ERROR_WINHTTP_CANNOT_CONNECT: ::DWORD = WINHTTP_ERROR_BASE + 29;
-pub const ERROR_WINHTTP_CONNECTION_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 30;
-pub const ERROR_WINHTTP_RESEND_REQUEST: ::DWORD = WINHTTP_ERROR_BASE + 32;
-pub const ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED: ::DWORD = WINHTTP_ERROR_BASE + 44;
-pub const ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN: ::DWORD = WINHTTP_ERROR_BASE + 100;
-pub const ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND: ::DWORD = WINHTTP_ERROR_BASE + 101;
-pub const ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND: ::DWORD = WINHTTP_ERROR_BASE + 102;
-pub const ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN: ::DWORD = WINHTTP_ERROR_BASE + 103;
-pub const ERROR_WINHTTP_HEADER_NOT_FOUND: ::DWORD = WINHTTP_ERROR_BASE + 150;
-pub const ERROR_WINHTTP_INVALID_SERVER_RESPONSE: ::DWORD = WINHTTP_ERROR_BASE + 152;
-pub const ERROR_WINHTTP_INVALID_HEADER: ::DWORD = WINHTTP_ERROR_BASE + 153;
-pub const ERROR_WINHTTP_INVALID_QUERY_REQUEST: ::DWORD = WINHTTP_ERROR_BASE + 154;
-pub const ERROR_WINHTTP_HEADER_ALREADY_EXISTS: ::DWORD = WINHTTP_ERROR_BASE + 155;
-pub const ERROR_WINHTTP_REDIRECT_FAILED: ::DWORD = WINHTTP_ERROR_BASE + 156;
-pub const ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 178;
-pub const ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT: ::DWORD = WINHTTP_ERROR_BASE + 166;
-pub const ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT: ::DWORD = WINHTTP_ERROR_BASE + 167;
-pub const ERROR_WINHTTP_UNHANDLED_SCRIPT_TYPE: ::DWORD = WINHTTP_ERROR_BASE + 176;
-pub const ERROR_WINHTTP_SCRIPT_EXECUTION_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 177;
-pub const ERROR_WINHTTP_NOT_INITIALIZED: ::DWORD = WINHTTP_ERROR_BASE + 172;
-pub const ERROR_WINHTTP_SECURE_FAILURE: ::DWORD = WINHTTP_ERROR_BASE + 175;
-pub const ERROR_WINHTTP_SECURE_CERT_DATE_INVALID: ::DWORD = WINHTTP_ERROR_BASE + 37;
-pub const ERROR_WINHTTP_SECURE_CERT_CN_INVALID: ::DWORD = WINHTTP_ERROR_BASE + 38;
-pub const ERROR_WINHTTP_SECURE_INVALID_CA: ::DWORD = WINHTTP_ERROR_BASE + 45;
-pub const ERROR_WINHTTP_SECURE_CERT_REV_FAILED: ::DWORD = WINHTTP_ERROR_BASE + 57;
-pub const ERROR_WINHTTP_SECURE_CHANNEL_ERROR: ::DWORD = WINHTTP_ERROR_BASE + 157;
-pub const ERROR_WINHTTP_SECURE_INVALID_CERT: ::DWORD = WINHTTP_ERROR_BASE + 169;
-pub const ERROR_WINHTTP_SECURE_CERT_REVOKED: ::DWORD = WINHTTP_ERROR_BASE + 170;
-pub const ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE: ::DWORD = WINHTTP_ERROR_BASE + 179;
-pub const ERROR_WINHTTP_AUTODETECTION_FAILED: ::DWORD = WINHTTP_ERROR_BASE + 180;
-pub const ERROR_WINHTTP_HEADER_COUNT_EXCEEDED: ::DWORD = WINHTTP_ERROR_BASE + 181;
-pub const ERROR_WINHTTP_HEADER_SIZE_OVERFLOW: ::DWORD = WINHTTP_ERROR_BASE + 182;
-pub const ERROR_WINHTTP_CHUNKED_ENCODING_HEADER_SIZE_OVERFLOW: ::DWORD = WINHTTP_ERROR_BASE + 183;
-pub const ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW: ::DWORD = WINHTTP_ERROR_BASE + 184;
-pub const ERROR_WINHTTP_CLIENT_CERT_NO_PRIVATE_KEY: ::DWORD = WINHTTP_ERROR_BASE + 185;
-pub const ERROR_WINHTTP_CLIENT_CERT_NO_ACCESS_PRIVATE_KEY: ::DWORD = WINHTTP_ERROR_BASE + 186;
-pub const WINHTTP_ERROR_LAST: ::DWORD = WINHTTP_ERROR_BASE + 186;
-pub const WINHTTP_RESET_STATE: ::DWORD = 0x00000001;
-pub const WINHTTP_RESET_SWPAD_CURRENT_NETWORK: ::DWORD = 0x00000002;
-pub const WINHTTP_RESET_SWPAD_ALL: ::DWORD = 0x00000004;
-pub const WINHTTP_RESET_SCRIPT_CACHE: ::DWORD = 0x00000008;
-pub const WINHTTP_RESET_ALL: ::DWORD = 0x0000FFFF;
-pub const WINHTTP_RESET_NOTIFY_NETWORK_CHANGED: ::DWORD = 0x00010000;
-pub const WINHTTP_RESET_OUT_OF_PROC: ::DWORD = 0x00020000;
-STRUCT!{struct WINHTTP_CURRENT_USER_IE_PROXY_CONFIG {
-    fAutoDetect: ::BOOL,
-    lpszAutoConfigUrl: ::LPWSTR,
-    lpszProxy: ::LPWSTR,
-    lpszProxyBypass: ::LPWSTR,
-}}
-//1370
-ENUM!{enum WINHTTP_WEB_SOCKET_OPERATION {
-    WINHTTP_WEB_SOCKET_SEND_OPERATION = 0,
-    WINHTTP_WEB_SOCKET_RECEIVE_OPERATION = 1,
-    WINHTTP_WEB_SOCKET_CLOSE_OPERATION = 2,
-    WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION = 3,
-}}
-ENUM!{enum WINHTTP_WEB_SOCKET_BUFFER_TYPE {
-    WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE = 0,
-    WINHTTP_WEB_SOCKET_BINARY_FRAGMENT_BUFFER_TYPE = 1,
-    WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE = 2,
-    WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE = 3,
-    WINHTTP_WEB_SOCKET_CLOSE_BUFFER_TYPE = 4,
-}}
-ENUM!{enum WINHTTP_WEB_SOCKET_CLOSE_STATUS {
-    WINHTTP_WEB_SOCKET_SUCCESS_CLOSE_STATUS = 1000,
-    WINHTTP_WEB_SOCKET_ENDPOINT_TERMINATED_CLOSE_STATUS = 1001,
-    WINHTTP_WEB_SOCKET_PROTOCOL_ERROR_CLOSE_STATUS = 1002,
-    WINHTTP_WEB_SOCKET_INVALID_DATA_TYPE_CLOSE_STATUS = 1003,
-    WINHTTP_WEB_SOCKET_EMPTY_CLOSE_STATUS = 1005,
-    WINHTTP_WEB_SOCKET_ABORTED_CLOSE_STATUS = 1006,
-    WINHTTP_WEB_SOCKET_INVALID_PAYLOAD_CLOSE_STATUS = 1007,
-    WINHTTP_WEB_SOCKET_POLICY_VIOLATION_CLOSE_STATUS = 1008,
-    WINHTTP_WEB_SOCKET_MESSAGE_TOO_BIG_CLOSE_STATUS = 1009,
-    WINHTTP_WEB_SOCKET_UNSUPPORTED_EXTENSIONS_CLOSE_STATUS = 1010,
-    WINHTTP_WEB_SOCKET_SERVER_ERROR_CLOSE_STATUS = 1011,
-    WINHTTP_WEB_SOCKET_SECURE_HANDSHAKE_ERROR_CLOSE_STATUS = 1015,
-}}
diff --git a/vendor/winapi-0.2.8/src/winioctl.rs b/vendor/winapi-0.2.8/src/winioctl.rs
deleted file mode 100644
index de3b96107c..0000000000
--- a/vendor/winapi-0.2.8/src/winioctl.rs
+++ /dev/null
@@ -1,754 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows Device I/O control codes.
-//123
-pub const FILE_DEVICE_BEEP: ::DWORD = 0x00000001;
-pub const FILE_DEVICE_CD_ROM: ::DWORD = 0x00000002;
-pub const FILE_DEVICE_CD_ROM_FILE_SYSTEM: ::DWORD = 0x00000003;
-pub const FILE_DEVICE_CONTROLLER: ::DWORD = 0x00000004;
-pub const FILE_DEVICE_DATALINK: ::DWORD = 0x00000005;
-pub const FILE_DEVICE_DFS: ::DWORD = 0x00000006;
-pub const FILE_DEVICE_DISK: ::DWORD = 0x00000007;
-pub const FILE_DEVICE_DISK_FILE_SYSTEM: ::DWORD = 0x00000008;
-pub const FILE_DEVICE_FILE_SYSTEM: ::DWORD = 0x00000009;
-pub const FILE_DEVICE_INPORT_PORT: ::DWORD = 0x0000000a;
-pub const FILE_DEVICE_KEYBOARD: ::DWORD = 0x0000000b;
-pub const FILE_DEVICE_MAILSLOT: ::DWORD = 0x0000000c;
-pub const FILE_DEVICE_MIDI_IN: ::DWORD = 0x0000000d;
-pub const FILE_DEVICE_MIDI_OUT: ::DWORD = 0x0000000e;
-pub const FILE_DEVICE_MOUSE: ::DWORD = 0x0000000f;
-pub const FILE_DEVICE_MULTI_UNC_PROVIDER: ::DWORD = 0x00000010;
-pub const FILE_DEVICE_NAMED_PIPE: ::DWORD = 0x00000011;
-pub const FILE_DEVICE_NETWORK: ::DWORD = 0x00000012;
-pub const FILE_DEVICE_NETWORK_BROWSER: ::DWORD = 0x00000013;
-pub const FILE_DEVICE_NETWORK_FILE_SYSTEM: ::DWORD = 0x00000014;
-pub const FILE_DEVICE_NULL: ::DWORD = 0x00000015;
-pub const FILE_DEVICE_PARALLEL_PORT: ::DWORD = 0x00000016;
-pub const FILE_DEVICE_PHYSICAL_NETCARD: ::DWORD = 0x00000017;
-pub const FILE_DEVICE_PRINTER: ::DWORD = 0x00000018;
-pub const FILE_DEVICE_SCANNER: ::DWORD = 0x00000019;
-pub const FILE_DEVICE_SERIAL_MOUSE_PORT: ::DWORD = 0x0000001a;
-pub const FILE_DEVICE_SERIAL_PORT: ::DWORD = 0x0000001b;
-pub const FILE_DEVICE_SCREEN: ::DWORD = 0x0000001c;
-pub const FILE_DEVICE_SOUND: ::DWORD = 0x0000001d;
-pub const FILE_DEVICE_STREAMS: ::DWORD = 0x0000001e;
-pub const FILE_DEVICE_TAPE: ::DWORD = 0x0000001f;
-pub const FILE_DEVICE_TAPE_FILE_SYSTEM: ::DWORD = 0x00000020;
-pub const FILE_DEVICE_TRANSPORT: ::DWORD = 0x00000021;
-pub const FILE_DEVICE_UNKNOWN: ::DWORD = 0x00000022;
-pub const FILE_DEVICE_VIDEO: ::DWORD = 0x00000023;
-pub const FILE_DEVICE_VIRTUAL_DISK: ::DWORD = 0x00000024;
-pub const FILE_DEVICE_WAVE_IN: ::DWORD = 0x00000025;
-pub const FILE_DEVICE_WAVE_OUT: ::DWORD = 0x00000026;
-pub const FILE_DEVICE_8042_PORT: ::DWORD = 0x00000027;
-pub const FILE_DEVICE_NETWORK_REDIRECTOR: ::DWORD = 0x00000028;
-pub const FILE_DEVICE_BATTERY: ::DWORD = 0x00000029;
-pub const FILE_DEVICE_BUS_EXTENDER: ::DWORD = 0x0000002a;
-pub const FILE_DEVICE_MODEM: ::DWORD = 0x0000002b;
-pub const FILE_DEVICE_VDM: ::DWORD = 0x0000002c;
-pub const FILE_DEVICE_MASS_STORAGE: ::DWORD = 0x0000002d;
-pub const FILE_DEVICE_SMB: ::DWORD = 0x0000002e;
-pub const FILE_DEVICE_KS: ::DWORD = 0x0000002f;
-pub const FILE_DEVICE_CHANGER: ::DWORD = 0x00000030;
-pub const FILE_DEVICE_SMARTCARD: ::DWORD = 0x00000031;
-pub const FILE_DEVICE_ACPI: ::DWORD = 0x00000032;
-pub const FILE_DEVICE_DVD: ::DWORD = 0x00000033;
-pub const FILE_DEVICE_FULLSCREEN_VIDEO: ::DWORD = 0x00000034;
-pub const FILE_DEVICE_DFS_FILE_SYSTEM: ::DWORD = 0x00000035;
-pub const FILE_DEVICE_DFS_VOLUME: ::DWORD = 0x00000036;
-pub const FILE_DEVICE_SERENUM: ::DWORD = 0x00000037;
-pub const FILE_DEVICE_TERMSRV: ::DWORD = 0x00000038;
-pub const FILE_DEVICE_KSEC: ::DWORD = 0x00000039;
-pub const FILE_DEVICE_FIPS: ::DWORD = 0x0000003A;
-pub const FILE_DEVICE_INFINIBAND: ::DWORD = 0x0000003B;
-pub const FILE_DEVICE_VMBUS: ::DWORD = 0x0000003E;
-pub const FILE_DEVICE_CRYPT_PROVIDER: ::DWORD = 0x0000003F;
-pub const FILE_DEVICE_WPD: ::DWORD = 0x00000040;
-pub const FILE_DEVICE_BLUETOOTH: ::DWORD = 0x00000041;
-pub const FILE_DEVICE_MT_COMPOSITE: ::DWORD = 0x00000042;
-pub const FILE_DEVICE_MT_TRANSPORT: ::DWORD = 0x00000043;
-pub const FILE_DEVICE_BIOMETRIC: ::DWORD = 0x00000044;
-pub const FILE_DEVICE_PMI: ::DWORD = 0x00000045;
-pub const FILE_DEVICE_EHSTOR: ::DWORD = 0x00000046;
-pub const FILE_DEVICE_DEVAPI: ::DWORD = 0x00000047;
-pub const FILE_DEVICE_GPIO: ::DWORD = 0x00000048;
-pub const FILE_DEVICE_USBEX: ::DWORD = 0x00000049;
-pub const FILE_DEVICE_CONSOLE: ::DWORD = 0x00000050;
-pub const FILE_DEVICE_NFP: ::DWORD = 0x00000051;
-pub const FILE_DEVICE_SYSENV: ::DWORD = 0x00000052;
-pub const FILE_DEVICE_VIRTUAL_BLOCK: ::DWORD = 0x00000053;
-pub const FILE_DEVICE_POINT_OF_SERVICE: ::DWORD = 0x00000054;
-//224
-pub const METHOD_BUFFERED: ::DWORD = 0;
-pub const METHOD_IN_DIRECT: ::DWORD = 1;
-pub const METHOD_OUT_DIRECT: ::DWORD = 2;
-pub const METHOD_NEITHER: ::DWORD = 3;
-//253
-pub const FILE_ANY_ACCESS: ::DWORD = 0;
-pub const FILE_SPECIAL_ACCESS: ::DWORD = FILE_ANY_ACCESS;
-pub const FILE_READ_ACCESS: ::DWORD = 0x0001;
-pub const FILE_WRITE_ACCESS: ::DWORD = 0x0002;
-//281
-pub const IOCTL_STORAGE_BASE: ::DWORD = FILE_DEVICE_MASS_STORAGE;
-pub const IOCTL_STORAGE_CHECK_VERIFY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0200,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_CHECK_VERIFY2: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0200,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_MEDIA_REMOVAL: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0201,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_EJECT_MEDIA: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0202,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_LOAD_MEDIA: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0203,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_LOAD_MEDIA2: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0203,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_RESERVE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_RELEASE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_FIND_NEW_DEVICES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0206,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_EJECTION_CONTROL: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0250,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_MCN_CONTROL: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0251,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_MEDIA_TYPES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0300,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_MEDIA_TYPES_EX: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0301,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0304,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_HOTPLUG_INFO: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0305,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_SET_HOTPLUG_INFO: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0306,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_RESET_BUS: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_RESET_DEVICE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0401,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_BREAK_RESERVATION: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0405,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_PERSISTENT_RESERVE_IN: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0406,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_PERSISTENT_RESERVE_OUT: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0407,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_GET_DEVICE_NUMBER: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0420,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_PREDICT_FAILURE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0440,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_FAILURE_PREDICTION_CONFIG: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0441,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_READ_CAPACITY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0450,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_GET_DEVICE_TELEMETRY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0470,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_DEVICE_TELEMETRY_NOTIFY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0471,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_DEVICE_TELEMETRY_QUERY_CAPS: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE,
-    0x0472, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_GET_DEVICE_TELEMETRY_RAW: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0473,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_QUERY_PROPERTY: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0500,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_MANAGE_DATA_SET_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0501,
-    METHOD_BUFFERED, FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_GET_LB_PROVISIONING_MAP_RESOURCES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE,
-    0x0502, METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_GET_BC_PROPERTIES: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0600,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_STORAGE_ALLOCATE_BC_STREAM: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0601,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_FREE_BC_STREAM: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0602,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_CHECK_PRIORITY_HINT_SUPPORT: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE,
-    0x0620, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_START_DATA_INTEGRITY_CHECK: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0621,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_STOP_DATA_INTEGRITY_CHECK: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0622,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const OBSOLETE_IOCTL_STORAGE_RESET_BUS: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0400,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const OBSOLETE_IOCTL_STORAGE_RESET_DEVICE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0401,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_STORAGE_ENABLE_IDLE_POWER: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0720,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_GET_IDLE_POWERUP_REASON: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0721,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_POWER_ACTIVE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0722,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_POWER_IDLE: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0723,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_STORAGE_EVENT_NOTIFICATION: ::DWORD = CTL_CODE!(IOCTL_STORAGE_BASE, 0x0724,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-//2627
-pub const IOCTL_DISK_BASE: ::DWORD = FILE_DEVICE_DISK;
-pub const IOCTL_DISK_GET_DRIVE_GEOMETRY: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0000,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_GET_PARTITION_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0001,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_SET_PARTITION_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0002,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_DRIVE_LAYOUT: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0003,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_SET_DRIVE_LAYOUT: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0004,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_VERIFY: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0005, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_FORMAT_TRACKS: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0006, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_REASSIGN_BLOCKS: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0007, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_PERFORMANCE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0008, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_IS_WRITABLE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0009, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_LOGGING: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000a, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_FORMAT_TRACKS_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000b,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_HISTOGRAM_STRUCTURE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000c,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_HISTOGRAM_DATA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000d, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_HISTOGRAM_RESET: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000e, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_REQUEST_STRUCTURE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x000f,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_REQUEST_DATA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0010, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_PERFORMANCE_OFF: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0018, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_CONTROLLER_NUMBER: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0011,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const SMART_GET_VERSION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0020, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const SMART_SEND_DRIVE_COMMAND: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const SMART_RCV_DRIVE_DATA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0022, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_PARTITION_INFO_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0012,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_SET_PARTITION_INFO_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0013,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_DRIVE_LAYOUT_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0014,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_SET_DRIVE_LAYOUT_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0015,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_CREATE_DISK: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0016, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_LENGTH_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0017, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_GET_DRIVE_GEOMETRY_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0028,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_REASSIGN_BLOCKS_EX: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0029,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_UPDATE_DRIVE_SIZE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0032,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GROW_PARTITION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_CACHE_INFORMATION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0035,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_SET_CACHE_INFORMATION: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0036,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_GET_WRITE_CACHE_STATE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0037,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const OBSOLETE_DISK_GET_WRITE_CACHE_STATE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0037,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_DELETE_DRIVE_LAYOUT: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0040,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_UPDATE_PROPERTIES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0050,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_FORMAT_DRIVE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_SENSE_DEVICE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x00f8, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_CHECK_VERIFY: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0200, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_MEDIA_REMOVAL: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0201, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_EJECT_MEDIA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0202, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_LOAD_MEDIA: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0203, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_RESERVE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0204, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_RELEASE: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0205, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const IOCTL_DISK_FIND_NEW_DEVICES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0206,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_DISK_GET_MEDIA_TYPES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0300, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_DISK_GET_DISK_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x003c,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const IOCTL_DISK_SET_DISK_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x003d,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_DISK_RESET_SNAPSHOT_INFO: ::DWORD = CTL_CODE!(IOCTL_DISK_BASE, 0x0084,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-//3907
-pub const IOCTL_CHANGER_BASE: ::DWORD = FILE_DEVICE_CHANGER;
-pub const IOCTL_CHANGER_GET_PARAMETERS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0000,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_GET_STATUS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0001,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_GET_PRODUCT_DATA: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0002,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_SET_ACCESS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0004,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_CHANGER_GET_ELEMENT_STATUS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0005,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_CHANGER_INITIALIZE_ELEMENT_STATUS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0006,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_SET_POSITION: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0007,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_EXCHANGE_MEDIUM: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0008,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_MOVE_MEDIUM: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x0009,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_REINITIALIZE_TRANSPORT: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x000A,
-    METHOD_BUFFERED, FILE_READ_ACCESS);
-pub const IOCTL_CHANGER_QUERY_VOLUME_TAGS: ::DWORD = CTL_CODE!(IOCTL_CHANGER_BASE, 0x000B,
-    METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_SERIAL_LSRMST_INSERT: ::DWORD = CTL_CODE!(FILE_DEVICE_SERIAL_PORT, 31,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_EXPOSE_HARDWARE: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 128,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_REMOVE_HARDWARE: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 129,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_PORT_DESC: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 130,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-pub const IOCTL_SERENUM_GET_PORT_NAME: ::DWORD = CTL_CODE!(FILE_DEVICE_SERENUM, 131,
-    METHOD_BUFFERED,FILE_ANY_ACCESS);
-//4690
-pub const FSCTL_REQUEST_OPLOCK_LEVEL_1: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 0,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_OPLOCK_LEVEL_2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 1,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_BATCH_OPLOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 2,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OPLOCK_BREAK_ACKNOWLEDGE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 3,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OPBATCH_ACK_CLOSE_PENDING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 4,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OPLOCK_BREAK_NOTIFY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 5,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_LOCK_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 6, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_UNLOCK_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 7, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_DISMOUNT_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_IS_VOLUME_MOUNTED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 10,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_IS_PATHNAME_VALID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 11,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_MARK_VOLUME_DIRTY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 12,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_RETRIEVAL_POINTERS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 14,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_GET_COMPRESSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 15, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_COMPRESSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 16, METHOD_BUFFERED,
-    ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_SET_BOOTLOADER_ACCESSED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 19,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_MARK_AS_SYSTEM_HIVE: ::DWORD = FSCTL_SET_BOOTLOADER_ACCESSED;
-pub const FSCTL_OPLOCK_BREAK_ACK_NO_2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 20,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_INVALIDATE_VOLUMES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 21,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_FAT_BPB: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 22, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_FILTER_OPLOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 23,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_FILESYSTEM_GET_STATISTICS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 24,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_NTFS_VOLUME_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 25,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_NTFS_FILE_RECORD: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 26,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_VOLUME_BITMAP: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 27, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_GET_RETRIEVAL_POINTERS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 28,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_MOVE_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 29, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_IS_VOLUME_DIRTY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 30, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_ALLOW_EXTENDED_DASD_IO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 32,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_FIND_FILES_BY_SID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 35, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 38, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_GET_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 39, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 40, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_REPARSE_POINT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 41,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_GET_REPARSE_POINT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 42,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_REPARSE_POINT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 43,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_ENUM_USN_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 44,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_SECURITY_ID_CHECK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 45, METHOD_NEITHER,
-    ::FILE_READ_DATA);
-pub const FSCTL_READ_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 46, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_OBJECT_ID_EXTENDED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 47,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_CREATE_OR_GET_OBJECT_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 48,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_SPARSE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 49, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_ZERO_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 50, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_QUERY_ALLOCATED_RANGES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 51,
-    METHOD_NEITHER, ::FILE_READ_DATA);
-pub const FSCTL_ENABLE_UPGRADE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 52, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_SET_ENCRYPTION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 53, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_ENCRYPTION_FSCTL_IO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 54,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_WRITE_RAW_ENCRYPTED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 55,
-    METHOD_NEITHER, FILE_SPECIAL_ACCESS);
-pub const FSCTL_READ_RAW_ENCRYPTED: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 56,
-    METHOD_NEITHER, FILE_SPECIAL_ACCESS);
-pub const FSCTL_CREATE_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 57,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_READ_FILE_USN_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 58,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_WRITE_USN_CLOSE_RECORD: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 59,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_EXTEND_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 60, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 61,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_USN_JOURNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 62,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_MARK_HANDLE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SIS_COPYFILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 64, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SIS_LINK_FILES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 65, METHOD_BUFFERED,
-    ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_RECALL_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 69, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_READ_FROM_PLEX: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 71, METHOD_OUT_DIRECT,
-    ::FILE_READ_DATA);
-pub const FSCTL_FILE_PREFETCH: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 72, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_MAKE_MEDIA_COMPATIBLE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 76,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_SET_DEFECT_MANAGEMENT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 77,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_QUERY_SPARING_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 78,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_ON_DISK_VOLUME_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 79,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_VOLUME_COMPRESSION_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 80,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_TXFS_MODIFY_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 81, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_QUERY_RM_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 82,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_ROLLFORWARD_REDO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 84,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_ROLLFORWARD_UNDO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 85,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_START_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 86, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_SHUTDOWN_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 87, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_READ_BACKUP_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 88,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_WRITE_BACKUP_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 89,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_CREATE_SECONDARY_RM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 90,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_GET_METADATA_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 91,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_GET_TRANSACTED_VERSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 92,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_SAVEPOINT_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 94,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_CREATE_MINIVERSION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 95,
-    METHOD_BUFFERED, ::FILE_WRITE_DATA);
-pub const FSCTL_TXFS_TRANSACTION_ACTIVE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 99,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_SET_ZERO_ON_DEALLOCATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 101,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 102, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_GET_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 103, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_WAIT_FOR_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 104, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_INITIATE_REPAIR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 106, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSC_INTERNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 107, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SHRINK_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 108, METHOD_BUFFERED,
-    FILE_SPECIAL_ACCESS);
-pub const FSCTL_SET_SHORT_NAME_BEHAVIOR: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 109,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DFSR_SET_GHOST_HANDLE_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 110,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_TXFS_LIST_TRANSACTION_LOCKED_FILES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM,
-    120, METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_TXFS_LIST_TRANSACTIONS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 121,
-    METHOD_BUFFERED, ::FILE_READ_DATA);
-pub const FSCTL_QUERY_PAGEFILE_ENCRYPTION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 122,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_RESET_VOLUME_ALLOCATION_HINTS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 123,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_DEPENDENT_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 124,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SD_GLOBAL_CHANGE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 125,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_TXFS_READ_BACKUP_INFORMATION2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 126,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_LOOKUP_STREAM_FROM_CLUSTER: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 127,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_TXFS_WRITE_BACKUP_INFORMATION2: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 128,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_FILE_TYPE_NOTIFICATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 129,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_FILE_LEVEL_TRIM: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 130, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_GET_BOOT_AREA_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 140,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_RETRIEVAL_POINTER_BASE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 141,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_PERSISTENT_VOLUME_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 142,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_PERSISTENT_VOLUME_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 143,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_REQUEST_OPLOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 144, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSV_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 145,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_IS_CSV_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 146, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_FILE_SYSTEM_RECOGNITION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 147,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_GET_VOLUME_PATH_NAME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 148,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_GET_VOLUME_NAME_FOR_VOLUME_MOUNT_POINT: ::DWORD = CTL_CODE!(
-    FILE_DEVICE_FILE_SYSTEM, 149, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_GET_VOLUME_PATH_NAMES_FOR_VOLUME_NAME: ::DWORD = CTL_CODE!(
-    FILE_DEVICE_FILE_SYSTEM, 150, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_IS_FILE_ON_CSV_VOLUME: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 151,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CORRUPTION_HANDLING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 152,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_OFFLOAD_READ: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 153, METHOD_BUFFERED,
-    FILE_READ_ACCESS);
-pub const FSCTL_OFFLOAD_WRITE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 154, METHOD_BUFFERED,
-    FILE_WRITE_ACCESS);
-pub const FSCTL_CSV_INTERNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 155, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SET_PURGE_FAILURE_MODE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 156,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_FILE_LAYOUT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 157,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_IS_VOLUME_OWNED_BYCSVFS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 158,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_GET_INTEGRITY_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 159,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_INTEGRITY_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 160,
-    METHOD_BUFFERED, ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_QUERY_FILE_REGIONS: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 161,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DEDUP_FILE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 165, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_DEDUP_QUERY_FILE_HASHES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 166,
-    METHOD_NEITHER, ::FILE_READ_DATA);
-pub const FSCTL_DEDUP_QUERY_RANGE_STATE: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 167,
-    METHOD_NEITHER, ::FILE_READ_DATA);
-pub const FSCTL_DEDUP_QUERY_REPARSE_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 168,
-    METHOD_NEITHER, FILE_ANY_ACCESS);
-pub const FSCTL_RKF_INTERNAL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 171, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_SCRUB_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 172, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_REPAIR_COPIES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 173, METHOD_BUFFERED,
-    ::FILE_READ_DATA | ::FILE_WRITE_DATA);
-pub const FSCTL_DISABLE_LOCAL_BUFFERING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 174,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_MGMT_LOCK: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 175, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSV_QUERY_DOWN_LEVEL_FILE_SYSTEM_CHARACTERISTICS: ::DWORD = CTL_CODE!(
-    FILE_DEVICE_FILE_SYSTEM, 176, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_ADVANCE_FILE_ID: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 177, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_CSV_SYNC_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 178,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_QUERY_VETO_FILE_DIRECT_IO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 179,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_WRITE_USN_REASON: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 180,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_CONTROL: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 181, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const FSCTL_GET_REFS_VOLUME_DATA: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 182,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_CSV_H_BREAKING_SYNC_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM,
-    185, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_STORAGE_CLASSES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 187,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_REGION_INFO: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 188,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_USN_TRACK_MODIFIED_RANGES: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 189,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_QUERY_SHARED_VIRTUAL_DISK_SUPPORT: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM,
-    192, METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SVHDX_SYNC_TUNNEL_REQUEST: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 193,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SVHDX_SET_INITIATOR_INFORMATION: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 194,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_SET_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 195,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_GET_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 196,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_DELETE_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 197,
-    METHOD_BUFFERED, FILE_SPECIAL_ACCESS);
-pub const FSCTL_ENUM_EXTERNAL_BACKING: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 198,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-pub const FSCTL_ENUM_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 199, METHOD_NEITHER,
-    FILE_ANY_ACCESS);
-pub const FSCTL_ADD_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 204, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_REMOVE_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 205, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-pub const FSCTL_UPDATE_OVERLAY: ::DWORD = CTL_CODE!(FILE_DEVICE_FILE_SYSTEM, 206, METHOD_BUFFERED,
-    ::FILE_WRITE_DATA);
-// FILE_DEVICE_AVIO is defined nowhere
-//pub const IOCTL_AVIO_ALLOCATE_STREAM: ::DWORD = CTL_CODE!(FILE_DEVICE_AVIO, 1, METHOD_BUFFERED,
-//    FILE_SPECIAL_ACCESS);
-//pub const IOCTL_AVIO_FREE_STREAM: ::DWORD = CTL_CODE!(FILE_DEVICE_AVIO, 2, METHOD_BUFFERED,
-//    FILE_SPECIAL_ACCESS);
-//pub const IOCTL_AVIO_MODIFY_STREAM: ::DWORD = CTL_CODE!(FILE_DEVICE_AVIO, 3, METHOD_BUFFERED,
-//    FILE_SPECIAL_ACCESS);
-STRUCT!{struct PATHNAME_BUFFER {
-    PathNameLength: ::DWORD,
-    Name: [::WCHAR; 1],
-}}
-pub type PPATHNAME_BUFFER = *mut PATHNAME_BUFFER;
-STRUCT!{nodebug struct FSCTL_QUERY_FAT_BPB_BUFFER {
-    First0x24BytesOfBootSector: [::BYTE; 0x24],
-}}
-pub type PFSCTL_QUERY_FAT_BPB_BUFFER = *mut FSCTL_QUERY_FAT_BPB_BUFFER;
-STRUCT!{struct NTFS_VOLUME_DATA_BUFFER {
-    VolumeSerialNumber: ::LARGE_INTEGER,
-    NumberSectors: ::LARGE_INTEGER,
-    TotalClusters: ::LARGE_INTEGER,
-    FreeClusters: ::LARGE_INTEGER,
-    TotalReserved: ::LARGE_INTEGER,
-    BytesPerSector: ::DWORD,
-    BytesPerCluster: ::DWORD,
-    BytesPerFileRecordSegment: ::DWORD,
-    ClustersPerFileRecordSegment: ::DWORD,
-    MftValidDataLength: ::LARGE_INTEGER,
-    MftStartLcn: ::LARGE_INTEGER,
-    Mft2StartLcn: ::LARGE_INTEGER,
-    MftZoneStart: ::LARGE_INTEGER,
-    MftZoneEnd: ::LARGE_INTEGER,
-}}
-pub type PNTFS_VOLUME_DATA_BUFFER = *mut NTFS_VOLUME_DATA_BUFFER;
-STRUCT!{struct NTFS_EXTENDED_VOLUME_DATA {
-    ByteCount: ::DWORD,
-    MajorVersion: ::WORD,
-    MinorVersion: ::WORD,
-    BytesPerPhysicalSector: ::DWORD,
-    LfsMajorVersion: ::WORD,
-    LfsMinorVersion: ::WORD,
-}}
-pub type PNTFS_EXTENDED_VOLUME_DATA = *mut NTFS_EXTENDED_VOLUME_DATA;
-STRUCT!{struct REFS_VOLUME_DATA_BUFFER {
-    ByteCount: ::DWORD,
-    MajorVersion: ::DWORD,
-    MinorVersion: ::DWORD,
-    BytesPerPhysicalSector: ::DWORD,
-    VolumeSerialNumber: ::LARGE_INTEGER,
-    NumberSectors: ::LARGE_INTEGER,
-    TotalClusters: ::LARGE_INTEGER,
-    FreeClusters: ::LARGE_INTEGER,
-    TotalReserved: ::LARGE_INTEGER,
-    BytesPerSector: ::DWORD,
-    BytesPerCluster: ::DWORD,
-    MaximumSizeOfResidentFile: ::LARGE_INTEGER,
-    Reserved: [::LARGE_INTEGER; 10],
-}}
-pub type PREFS_VOLUME_DATA_BUFFER = *mut REFS_VOLUME_DATA_BUFFER;
-STRUCT!{struct STARTING_LCN_INPUT_BUFFER {
-    StartingLcn: ::LARGE_INTEGER,
-}}
-pub type PSTARTING_LCN_INPUT_BUFFER = *mut STARTING_LCN_INPUT_BUFFER;
-STRUCT!{struct VOLUME_BITMAP_BUFFER {
-    StartingLcn: ::LARGE_INTEGER,
-    BitmapSize: ::LARGE_INTEGER,
-    Buffer: [::BYTE; 1],
-}}
-pub type PVOLUME_BITMAP_BUFFER = *mut VOLUME_BITMAP_BUFFER;
-STRUCT!{struct STARTING_VCN_INPUT_BUFFER {
-    StartingVcn: ::LARGE_INTEGER,
-}}
-pub type PSTARTING_VCN_INPUT_BUFFER = *mut STARTING_VCN_INPUT_BUFFER;
-STRUCT!{struct RETRIEVAL_POINTERS_BUFFER_INTERNAL {
-    NextVcn: ::LARGE_INTEGER,
-    Lcn: ::LARGE_INTEGER,
-}}
-STRUCT!{struct RETRIEVAL_POINTERS_BUFFER {
-    ExtentCount: ::DWORD,
-    StartingVcn: ::LARGE_INTEGER,
-    Extents: [RETRIEVAL_POINTERS_BUFFER_INTERNAL; 1],
-}}
-pub type PRETRIEVAL_POINTERS_BUFFER = *mut RETRIEVAL_POINTERS_BUFFER;
-STRUCT!{struct NTFS_FILE_RECORD_INPUT_BUFFER {
-    FileReferenceNumber: ::LARGE_INTEGER,
-}}
-pub type PNTFS_FILE_RECORD_INPUT_BUFFER = *mut NTFS_FILE_RECORD_INPUT_BUFFER;
-STRUCT!{struct NTFS_FILE_RECORD_OUTPUT_BUFFER {
-    FileReferenceNumber: ::LARGE_INTEGER,
-    FileRecordLength: ::DWORD,
-    FileRecordBuffer: [::BYTE; 1],
-}}
-pub type PNTFS_FILE_RECORD_OUTPUT_BUFFER = *mut NTFS_FILE_RECORD_OUTPUT_BUFFER;
-STRUCT!{struct MOVE_FILE_DATA {
-    FileHandle: ::HANDLE,
-    StartingVcn: ::LARGE_INTEGER,
-    StartingLcn: ::LARGE_INTEGER,
-    ClusterCount: ::DWORD,
-}}
-pub type PMOVE_FILE_DATA = *mut MOVE_FILE_DATA;
-STRUCT!{struct MOVE_FILE_RECORD_DATA {
-    FileHandle: ::HANDLE,
-    SourceFileRecord: ::LARGE_INTEGER,
-    TargetFileRecord: ::LARGE_INTEGER,
-}}
-pub type PMOVE_FILE_RECORD_DATA = *mut MOVE_FILE_RECORD_DATA;
-//9207
-pub const IOCTL_VOLUME_BASE: ::DWORD = 0x00000056;
-pub const IOCTL_VOLUME_GET_VOLUME_DISK_EXTENTS: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 0,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
-STRUCT!{struct DISK_EXTENT {
-    DiskNumber: ::DWORD,
-    StartingOffset: ::LARGE_INTEGER,
-    ExtentLength: ::LARGE_INTEGER,
-}}
-pub type PDISK_EXTENT = *mut DISK_EXTENT;
-STRUCT!{struct VOLUME_DISK_EXTENTS {
-    NumberOfDiskExtents: ::DWORD,
-    Extents: [DISK_EXTENT; ::ANYSIZE_ARRAY],
-}}
-pub type PVOLUME_DISK_EXTENTS = *mut VOLUME_DISK_EXTENTS;
-pub const IOCTL_VOLUME_ONLINE: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 2, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_VOLUME_OFFLINE: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 3, METHOD_BUFFERED,
-    FILE_READ_ACCESS | FILE_WRITE_ACCESS);
-pub const IOCTL_VOLUME_IS_CLUSTERED: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 12, METHOD_BUFFERED,
-    FILE_ANY_ACCESS);
-pub const IOCTL_VOLUME_GET_GPT_ATTRIBUTES: ::DWORD = CTL_CODE!(IOCTL_VOLUME_BASE, 14,
-    METHOD_BUFFERED, FILE_ANY_ACCESS);
diff --git a/vendor/winapi-0.2.8/src/winnetwk.rs b/vendor/winapi-0.2.8/src/winnetwk.rs
deleted file mode 100644
index 665d283ba8..0000000000
--- a/vendor/winapi-0.2.8/src/winnetwk.rs
+++ /dev/null
@@ -1,275 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Standard WINNET Header File for WIN32
-pub const WNNC_NET_MSNET: ::DWORD = 0x00010000;
-pub const WNNC_NET_SMB: ::DWORD = 0x00020000;
-pub const WNNC_NET_NETWARE: ::DWORD = 0x00030000;
-pub const WNNC_NET_VINES: ::DWORD = 0x00040000;
-pub const WNNC_NET_10NET: ::DWORD = 0x00050000;
-pub const WNNC_NET_LOCUS: ::DWORD = 0x00060000;
-pub const WNNC_NET_SUN_PC_NFS: ::DWORD = 0x00070000;
-pub const WNNC_NET_LANSTEP: ::DWORD = 0x00080000;
-pub const WNNC_NET_9TILES: ::DWORD = 0x00090000;
-pub const WNNC_NET_LANTASTIC: ::DWORD = 0x000A0000;
-pub const WNNC_NET_AS400: ::DWORD = 0x000B0000;
-pub const WNNC_NET_FTP_NFS: ::DWORD = 0x000C0000;
-pub const WNNC_NET_PATHWORKS: ::DWORD = 0x000D0000;
-pub const WNNC_NET_LIFENET: ::DWORD = 0x000E0000;
-pub const WNNC_NET_POWERLAN: ::DWORD = 0x000F0000;
-pub const WNNC_NET_BWNFS: ::DWORD = 0x00100000;
-pub const WNNC_NET_COGENT: ::DWORD = 0x00110000;
-pub const WNNC_NET_FARALLON: ::DWORD = 0x00120000;
-pub const WNNC_NET_APPLETALK: ::DWORD = 0x00130000;
-pub const WNNC_NET_INTERGRAPH: ::DWORD = 0x00140000;
-pub const WNNC_NET_SYMFONET: ::DWORD = 0x00150000;
-pub const WNNC_NET_CLEARCASE: ::DWORD = 0x00160000;
-pub const WNNC_NET_FRONTIER: ::DWORD = 0x00170000;
-pub const WNNC_NET_BMC: ::DWORD = 0x00180000;
-pub const WNNC_NET_DCE: ::DWORD = 0x00190000;
-pub const WNNC_NET_AVID: ::DWORD = 0x001A0000;
-pub const WNNC_NET_DOCUSPACE: ::DWORD = 0x001B0000;
-pub const WNNC_NET_MANGOSOFT: ::DWORD = 0x001C0000;
-pub const WNNC_NET_SERNET: ::DWORD = 0x001D0000;
-pub const WNNC_NET_RIVERFRONT1: ::DWORD = 0x001E0000;
-pub const WNNC_NET_RIVERFRONT2: ::DWORD = 0x001F0000;
-pub const WNNC_NET_DECORB: ::DWORD = 0x00200000;
-pub const WNNC_NET_PROTSTOR: ::DWORD = 0x00210000;
-pub const WNNC_NET_FJ_REDIR: ::DWORD = 0x00220000;
-pub const WNNC_NET_DISTINCT: ::DWORD = 0x00230000;
-pub const WNNC_NET_TWINS: ::DWORD = 0x00240000;
-pub const WNNC_NET_RDR2SAMPLE: ::DWORD = 0x00250000;
-pub const WNNC_NET_CSC: ::DWORD = 0x00260000;
-pub const WNNC_NET_3IN1: ::DWORD = 0x00270000;
-pub const WNNC_NET_EXTENDNET: ::DWORD = 0x00290000;
-pub const WNNC_NET_STAC: ::DWORD = 0x002A0000;
-pub const WNNC_NET_FOXBAT: ::DWORD = 0x002B0000;
-pub const WNNC_NET_YAHOO: ::DWORD = 0x002C0000;
-pub const WNNC_NET_EXIFS: ::DWORD = 0x002D0000;
-pub const WNNC_NET_DAV: ::DWORD = 0x002E0000;
-pub const WNNC_NET_KNOWARE: ::DWORD = 0x002F0000;
-pub const WNNC_NET_OBJECT_DIRE: ::DWORD = 0x00300000;
-pub const WNNC_NET_MASFAX: ::DWORD = 0x00310000;
-pub const WNNC_NET_HOB_NFS: ::DWORD = 0x00320000;
-pub const WNNC_NET_SHIVA: ::DWORD = 0x00330000;
-pub const WNNC_NET_IBMAL: ::DWORD = 0x00340000;
-pub const WNNC_NET_LOCK: ::DWORD = 0x00350000;
-pub const WNNC_NET_TERMSRV: ::DWORD = 0x00360000;
-pub const WNNC_NET_SRT: ::DWORD = 0x00370000;
-pub const WNNC_NET_QUINCY: ::DWORD = 0x00380000;
-pub const WNNC_NET_OPENAFS: ::DWORD = 0x00390000;
-pub const WNNC_NET_AVID1: ::DWORD = 0x003A0000;
-pub const WNNC_NET_DFS: ::DWORD = 0x003B0000;
-pub const WNNC_NET_KWNP: ::DWORD = 0x003C0000;
-pub const WNNC_NET_ZENWORKS: ::DWORD = 0x003D0000;
-pub const WNNC_NET_DRIVEONWEB: ::DWORD = 0x003E0000;
-pub const WNNC_NET_VMWARE: ::DWORD = 0x003F0000;
-pub const WNNC_NET_RSFX: ::DWORD = 0x00400000;
-pub const WNNC_NET_MFILES: ::DWORD = 0x00410000;
-pub const WNNC_NET_MS_NFS: ::DWORD = 0x00420000;
-pub const WNNC_NET_GOOGLE: ::DWORD = 0x00430000;
-pub const WNNC_NET_NDFS: ::DWORD = 0x00440000;
-pub const WNNC_NET_DOCUSHARE: ::DWORD = 0x00450000;
-pub const WNNC_CRED_MANAGER: ::DWORD = 0xFFFF0000;
-pub const WNNC_NET_LANMAN: ::DWORD = WNNC_NET_SMB;
-pub const RESOURCE_CONNECTED: ::DWORD = 0x00000001;
-pub const RESOURCE_GLOBALNET: ::DWORD = 0x00000002;
-pub const RESOURCE_REMEMBERED: ::DWORD = 0x00000003;
-pub const RESOURCE_RECENT: ::DWORD = 0x00000004;
-pub const RESOURCE_CONTEXT: ::DWORD = 0x00000005;
-pub const RESOURCETYPE_ANY: ::DWORD = 0x00000000;
-pub const RESOURCETYPE_DISK: ::DWORD = 0x00000001;
-pub const RESOURCETYPE_PRINT: ::DWORD = 0x00000002;
-pub const RESOURCETYPE_RESERVED: ::DWORD = 0x00000008;
-pub const RESOURCETYPE_UNKNOWN: ::DWORD = 0xFFFFFFFF;
-pub const RESOURCEUSAGE_CONNECTABLE: ::DWORD = 0x00000001;
-pub const RESOURCEUSAGE_CONTAINER: ::DWORD = 0x00000002;
-pub const RESOURCEUSAGE_NOLOCALDEVICE: ::DWORD = 0x00000004;
-pub const RESOURCEUSAGE_SIBLING: ::DWORD = 0x00000008;
-pub const RESOURCEUSAGE_ATTACHED: ::DWORD = 0x00000010;
-pub const RESOURCEUSAGE_ALL: ::DWORD = RESOURCEUSAGE_CONNECTABLE | RESOURCEUSAGE_CONTAINER
-    | RESOURCEUSAGE_ATTACHED;
-pub const RESOURCEUSAGE_RESERVED: ::DWORD = 0x80000000;
-pub const RESOURCEDISPLAYTYPE_GENERIC: ::DWORD = 0x00000000;
-pub const RESOURCEDISPLAYTYPE_DOMAIN: ::DWORD = 0x00000001;
-pub const RESOURCEDISPLAYTYPE_SERVER: ::DWORD = 0x00000002;
-pub const RESOURCEDISPLAYTYPE_SHARE: ::DWORD = 0x00000003;
-pub const RESOURCEDISPLAYTYPE_FILE: ::DWORD = 0x00000004;
-pub const RESOURCEDISPLAYTYPE_GROUP: ::DWORD = 0x00000005;
-pub const RESOURCEDISPLAYTYPE_NETWORK: ::DWORD = 0x00000006;
-pub const RESOURCEDISPLAYTYPE_ROOT: ::DWORD = 0x00000007;
-pub const RESOURCEDISPLAYTYPE_SHAREADMIN: ::DWORD = 0x00000008;
-pub const RESOURCEDISPLAYTYPE_DIRECTORY: ::DWORD = 0x00000009;
-pub const RESOURCEDISPLAYTYPE_TREE: ::DWORD = 0x0000000A;
-pub const RESOURCEDISPLAYTYPE_NDSCONTAINER: ::DWORD = 0x0000000B;
-STRUCT!{struct NETRESOURCEA {
-    dwScope: ::DWORD,
-    dwType: ::DWORD,
-    dwDisplayType: ::DWORD,
-    dwUsage: ::DWORD,
-    lpLocalName: ::LPSTR,
-    lpRemoteName: ::LPSTR,
-    lpComment: ::LPSTR,
-    lpProvider: ::LPSTR,
-}}
-pub type LPNETRESOURCEA = *mut NETRESOURCEA;
-STRUCT!{struct NETRESOURCEW {
-    dwScope: ::DWORD,
-    dwType: ::DWORD,
-    dwDisplayType: ::DWORD,
-    dwUsage: ::DWORD,
-    lpLocalName: ::LPWSTR,
-    lpRemoteName: ::LPWSTR,
-    lpComment: ::LPWSTR,
-    lpProvider: ::LPWSTR,
-}}
-pub type LPNETRESOURCEW = *mut NETRESOURCEW;
-pub const NETPROPERTY_PERSISTENT: ::DWORD = 1;
-pub const CONNECT_UPDATE_PROFILE: ::DWORD = 0x00000001;
-pub const CONNECT_UPDATE_RECENT: ::DWORD = 0x00000002;
-pub const CONNECT_TEMPORARY: ::DWORD = 0x00000004;
-pub const CONNECT_INTERACTIVE: ::DWORD = 0x00000008;
-pub const CONNECT_PROMPT: ::DWORD = 0x00000010;
-pub const CONNECT_NEED_DRIVE: ::DWORD = 0x00000020;
-pub const CONNECT_REFCOUNT: ::DWORD = 0x00000040;
-pub const CONNECT_REDIRECT: ::DWORD = 0x00000080;
-pub const CONNECT_LOCALDRIVE: ::DWORD = 0x00000100;
-pub const CONNECT_CURRENT_MEDIA: ::DWORD = 0x00000200;
-pub const CONNECT_DEFERRED: ::DWORD = 0x00000400;
-pub const CONNECT_RESERVED: ::DWORD = 0xFF000000;
-pub const CONNECT_COMMANDLINE: ::DWORD = 0x00000800;
-pub const CONNECT_CMD_SAVECRED: ::DWORD = 0x00001000;
-pub const CONNECT_CRED_RESET: ::DWORD = 0x00002000;
-STRUCT!{struct CONNECTDLGSTRUCTA {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpConnRes: ::LPNETRESOURCEA,
-    dwFlags: ::DWORD,
-    dwDevNum: ::DWORD,
-}}
-pub type LPCONNECTDLGSTRUCTA = *mut CONNECTDLGSTRUCTA;
-STRUCT!{struct CONNECTDLGSTRUCTW {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpConnRes: ::LPNETRESOURCEW,
-    dwFlags: ::DWORD,
-    dwDevNum: ::DWORD,
-}}
-pub type LPCONNECTDLGSTRUCTW = *mut CONNECTDLGSTRUCTW;
-pub const CONNDLG_RO_PATH: ::DWORD = 0x00000001;
-pub const CONNDLG_CONN_POINT: ::DWORD = 0x00000002;
-pub const CONNDLG_USE_MRU: ::DWORD = 0x00000004;
-pub const CONNDLG_HIDE_BOX: ::DWORD = 0x00000008;
-pub const CONNDLG_PERSIST: ::DWORD = 0x00000010;
-pub const CONNDLG_NOT_PERSIST: ::DWORD = 0x00000020;
-STRUCT!{struct DISCDLGSTRUCTA {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpLocalName: ::LPSTR,
-    lpRemoteName: ::LPSTR,
-    dwFlags: ::DWORD,
-}}
-pub type LPDISCDLGSTRUCTA = *mut DISCDLGSTRUCTA;
-STRUCT!{struct DISCDLGSTRUCTW {
-    cbStructure: ::DWORD,
-    hwndOwner: ::HWND,
-    lpLocalName: ::LPWSTR,
-    lpRemoteName: ::LPWSTR,
-    dwFlags: ::DWORD,
-}}
-pub type LPDISCDLGSTRUCTW = *mut DISCDLGSTRUCTW;
-pub const DISC_UPDATE_PROFILE: ::DWORD = 0x00000001;
-pub const DISC_NO_FORCE: ::DWORD = 0x00000040;
-pub const UNIVERSAL_NAME_INFO_LEVEL: ::DWORD = 0x00000001;
-pub const REMOTE_NAME_INFO_LEVEL: ::DWORD = 0x00000002;
-STRUCT!{struct UNIVERSAL_NAME_INFOA {
-    lpUniversalName: ::LPSTR,
-}}
-pub type LPUNIVERSAL_NAME_INFOA = *mut UNIVERSAL_NAME_INFOA;
-STRUCT!{struct UNIVERSAL_NAME_INFOW {
-    lpUniversalName: ::LPWSTR,
-}}
-pub type LPUNIVERSAL_NAME_INFOW = *mut UNIVERSAL_NAME_INFOW;
-STRUCT!{struct REMOTE_NAME_INFOA {
-    lpUniversalName: ::LPSTR,
-    lpConnectionName: ::LPSTR,
-    lpRemainingPath: ::LPSTR,
-}}
-pub type LPREMOTE_NAME_INFOA = *mut REMOTE_NAME_INFOA;
-STRUCT!{struct REMOTE_NAME_INFOW {
-    lpUniversalName: ::LPWSTR,
-    lpConnectionName: ::LPWSTR,
-    lpRemainingPath: ::LPWSTR,
-}}
-pub type LPREMOTE_NAME_INFOW = *mut REMOTE_NAME_INFOW;
-pub const WNFMT_MULTILINE: ::DWORD = 0x01;
-pub const WNFMT_ABBREVIATED: ::DWORD = 0x02;
-pub const WNFMT_INENUM: ::DWORD = 0x10;
-pub const WNFMT_CONNECTION: ::DWORD = 0x20;
-STRUCT!{struct NETINFOSTRUCT {
-    cbStructure: ::DWORD,
-    dwProviderVersion: ::DWORD,
-    dwStatus: ::DWORD,
-    dwCharacteristics: ::DWORD,
-    dwHandle: ::ULONG_PTR,
-    wNetType: ::WORD,
-    dwPrinters: ::DWORD,
-    dwDrives: ::DWORD,
-}}
-pub type LPNETINFOSTRUCT = *mut NETINFOSTRUCT;
-pub const NETINFO_DLL16: ::DWORD = 0x00000001;
-pub const NETINFO_DISKRED: ::DWORD = 0x00000004;
-pub const NETINFO_PRINTERRED: ::DWORD = 0x00000008;
-pub const WN_SUCCESS: ::DWORD = ::NO_ERROR;
-pub const WN_NO_ERROR: ::DWORD = ::NO_ERROR;
-pub const WN_NOT_SUPPORTED: ::DWORD = ::ERROR_NOT_SUPPORTED;
-pub const WN_CANCEL: ::DWORD = ::ERROR_CANCELLED;
-pub const WN_RETRY: ::DWORD = ::ERROR_RETRY;
-pub const WN_NET_ERROR: ::DWORD = ::ERROR_UNEXP_NET_ERR;
-pub const WN_MORE_DATA: ::DWORD = ::ERROR_MORE_DATA;
-pub const WN_BAD_POINTER: ::DWORD = ::ERROR_INVALID_ADDRESS;
-pub const WN_BAD_VALUE: ::DWORD = ::ERROR_INVALID_PARAMETER;
-pub const WN_BAD_USER: ::DWORD = ::ERROR_BAD_USERNAME;
-pub const WN_BAD_PASSWORD: ::DWORD = ::ERROR_INVALID_PASSWORD;
-pub const WN_ACCESS_DENIED: ::DWORD = ::ERROR_ACCESS_DENIED;
-pub const WN_FUNCTION_BUSY: ::DWORD = ::ERROR_BUSY;
-pub const WN_WINDOWS_ERROR: ::DWORD = ::ERROR_UNEXP_NET_ERR;
-pub const WN_OUT_OF_MEMORY: ::DWORD = ::ERROR_NOT_ENOUGH_MEMORY;
-pub const WN_NO_NETWORK: ::DWORD = ::ERROR_NO_NETWORK;
-pub const WN_EXTENDED_ERROR: ::DWORD = ::ERROR_EXTENDED_ERROR;
-pub const WN_BAD_LEVEL: ::DWORD = ::ERROR_INVALID_LEVEL;
-pub const WN_BAD_HANDLE: ::DWORD = ::ERROR_INVALID_HANDLE;
-pub const WN_NOT_INITIALIZING: ::DWORD = ::ERROR_ALREADY_INITIALIZED;
-pub const WN_NO_MORE_DEVICES: ::DWORD = ::ERROR_NO_MORE_DEVICES;
-pub const WN_NOT_CONNECTED: ::DWORD = ::ERROR_NOT_CONNECTED;
-pub const WN_OPEN_FILES: ::DWORD = ::ERROR_OPEN_FILES;
-pub const WN_DEVICE_IN_USE: ::DWORD = ::ERROR_DEVICE_IN_USE;
-pub const WN_BAD_NETNAME: ::DWORD = ::ERROR_BAD_NET_NAME;
-pub const WN_BAD_LOCALNAME: ::DWORD = ::ERROR_BAD_DEVICE;
-pub const WN_ALREADY_CONNECTED: ::DWORD = ::ERROR_ALREADY_ASSIGNED;
-pub const WN_DEVICE_ERROR: ::DWORD = ::ERROR_GEN_FAILURE;
-pub const WN_CONNECTION_CLOSED: ::DWORD = ::ERROR_CONNECTION_UNAVAIL;
-pub const WN_NO_NET_OR_BAD_PATH: ::DWORD = ::ERROR_NO_NET_OR_BAD_PATH;
-pub const WN_BAD_PROVIDER: ::DWORD = ::ERROR_BAD_PROVIDER;
-pub const WN_CANNOT_OPEN_PROFILE: ::DWORD = ::ERROR_CANNOT_OPEN_PROFILE;
-pub const WN_BAD_PROFILE: ::DWORD = ::ERROR_BAD_PROFILE;
-pub const WN_BAD_DEV_TYPE: ::DWORD = ::ERROR_BAD_DEV_TYPE;
-pub const WN_DEVICE_ALREADY_REMEMBERED: ::DWORD = ::ERROR_DEVICE_ALREADY_REMEMBERED;
-pub const WN_CONNECTED_OTHER_PASSWORD: ::DWORD = ::ERROR_CONNECTED_OTHER_PASSWORD;
-pub const WN_CONNECTED_OTHER_PASSWORD_DEFAULT: ::DWORD = ::ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT;
-pub const WN_NO_MORE_ENTRIES: ::DWORD = ::ERROR_NO_MORE_ITEMS;
-pub const WN_NOT_CONTAINER: ::DWORD = ::ERROR_NOT_CONTAINER;
-pub const WN_NOT_AUTHENTICATED: ::DWORD = ::ERROR_NOT_AUTHENTICATED;
-pub const WN_NOT_LOGGED_ON: ::DWORD = ::ERROR_NOT_LOGGED_ON;
-pub const WN_NOT_VALIDATED: ::DWORD = ::ERROR_NO_LOGON_SERVERS;
-STRUCT!{struct NETCONNECTINFOSTRUCT {
-    cbStructure: ::DWORD,
-    dwFlags: ::DWORD,
-    dwSpeed: ::DWORD,
-    dwDelay: ::DWORD,
-    dwOptDataSize: ::DWORD,
-}}
-pub type LPNETCONNECTINFOSTRUCT = *mut NETCONNECTINFOSTRUCT;
-pub const WNCON_FORNETCARD: ::DWORD = 0x00000001;
-pub const WNCON_NOTROUTED: ::DWORD = 0x00000002;
-pub const WNCON_SLOWLINK: ::DWORD = 0x00000004;
-pub const WNCON_DYNAMIC: ::DWORD = 0x00000008;
diff --git a/vendor/winapi-0.2.8/src/winnls.rs b/vendor/winapi-0.2.8/src/winnls.rs
deleted file mode 100644
index b27e2f0ae8..0000000000
--- a/vendor/winapi-0.2.8/src/winnls.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Procedure declarations, constant definitions, and macros for the NLS component.
-pub const CP_ACP: ::DWORD = 0;
-pub const CP_OEMCP: ::DWORD = 1;
-pub const CP_MACCP: ::DWORD = 2;
-pub const CP_THREAD_ACP: ::DWORD = 3;
-pub const CP_SYMBOL: ::DWORD = 42;
-pub const CP_UTF7: ::DWORD = 65000;
-pub const CP_UTF8: ::DWORD = 65001;
-pub const MAX_LEADBYTES: usize = 12;
-pub const MAX_DEFAULTCHAR: usize = 2;
-pub type LGRPID = ::DWORD;
-pub type LCTYPE = ::DWORD;
-pub type CALTYPE = ::DWORD;
-pub type CALID = ::DWORD;
-pub type GEOID = ::LONG;
-pub type GEOTYPE = ::DWORD;
-pub type GEOCLASS = ::DWORD;
-STRUCT!{struct NLSVERSIONINFO {
-    dwNLSVersionInfoSize: ::DWORD,
-    dwNLSVersion: ::DWORD,
-    dwDefinedVersion: ::DWORD,
-    dwEffectiveId: ::DWORD,
-    guidCustomVersion: ::GUID,
-}}
-pub type LPNLSVERSIONINFO = *mut NLSVERSIONINFO;
-STRUCT!{struct NLSVERSIONINFOEX {
-    dwNLSVersionInfoSize: ::DWORD,
-    dwNLSVersion: ::DWORD,
-    dwDefinedVersion: ::DWORD,
-    dwEffectiveId: ::DWORD,
-    guidCustomVersion: ::GUID,
-}}
-pub type LPNLSVERSIONINFOEX = *mut NLSVERSIONINFOEX;
-ENUM!{enum NORM_FORM {
-    NormalizationOther = 0,
-    NormalizationC = 0x1,
-    NormalizationD = 0x2,
-    NormalizationKC = 0x5,
-    NormalizationKD = 0x6,
-}}
-pub type LANGUAGEGROUP_ENUMPROCA = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LPSTR, ::LPSTR, ::DWORD, ::LONG_PTR,
-) -> ::BOOL>;
-pub type LANGGROUPLOCALE_ENUMPROCA = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LCID, ::LPSTR, ::LONG_PTR,
-) -> ::BOOL>;
-pub type UILANGUAGE_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR, ::LONG_PTR) -> ::BOOL>;
-pub type CODEPAGE_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCEXA = Option<unsafe extern "system" fn(::LPSTR, ::CALID) -> ::BOOL>;
-pub type TIMEFMT_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCEXA = Option<unsafe extern "system" fn(::LPSTR, ::CALID) -> ::BOOL>;
-pub type LOCALE_ENUMPROCA = Option<unsafe extern "system" fn(::LPSTR) -> ::BOOL>;
-pub type LOCALE_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type LANGUAGEGROUP_ENUMPROCW = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LPWSTR, ::LPWSTR, ::DWORD, ::LONG_PTR,
-) -> ::BOOL>;
-pub type LANGGROUPLOCALE_ENUMPROCW = Option<unsafe extern "system" fn(
-    ::LGRPID, ::LCID, ::LPWSTR, ::LONG_PTR,
-) -> ::BOOL>;
-pub type UILANGUAGE_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR, ::LONG_PTR) -> ::BOOL>;
-pub type CODEPAGE_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCEXW = Option<unsafe extern "system" fn(::LPWSTR, ::CALID) -> ::BOOL>;
-pub type TIMEFMT_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR) -> ::BOOL>;
-pub type CALINFO_ENUMPROCEXW = Option<unsafe extern "system" fn(::LPWSTR, ::CALID) -> ::BOOL>;
-pub type GEO_ENUMPROC = Option<unsafe extern "system" fn(GEOID) -> ::BOOL>;
-STRUCT!{struct CPINFO {
-    MaxCharSize: ::UINT,
-    DefaultChar: [::BYTE; MAX_DEFAULTCHAR],
-    LeadByte: [::BYTE; MAX_LEADBYTES],
-}}
-pub type LPCPINFO = *mut CPINFO;
-STRUCT!{nodebug struct CPINFOEXA {
-    MaxCharSize: ::UINT,
-    DefaultChar: [::BYTE; MAX_DEFAULTCHAR],
-    LeadByte: [::BYTE; MAX_LEADBYTES],
-    UnicodeDefaultChar: ::WCHAR,
-    CodePage: ::UINT,
-    CodePageName: [::CHAR; ::MAX_PATH],
-}}
-pub type LPCPINFOEXA = *mut CPINFOEXA;
-STRUCT!{nodebug struct CPINFOEXW {
-    MaxCharSize: ::UINT,
-    DefaultChar: [::BYTE; MAX_DEFAULTCHAR],
-    LeadByte: [::BYTE; MAX_LEADBYTES],
-    UnicodeDefaultChar: ::WCHAR,
-    CodePage: ::UINT,
-    CodePageName: [::WCHAR; ::MAX_PATH],
-}}
-pub type LPCPINFOEXW = *mut CPINFOEXW;
-STRUCT!{struct NUMBERFMTA {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPSTR,
-    lpThousandSep: ::LPSTR,
-    NegativeOrder: ::UINT,
-}}
-pub type LPNUMBERFMTA = *mut NUMBERFMTA;
-STRUCT!{struct NUMBERFMTW {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPWSTR,
-    lpThousandSep: ::LPWSTR,
-    NegativeOrder: ::UINT,
-}}
-pub type LPNUMBERFMTW = *mut NUMBERFMTW;
-STRUCT!{struct CURRENCYFMTA {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPSTR,
-    lpThousandSep: ::LPSTR,
-    NegativeOrder: ::UINT,
-    PositiveOrder: ::UINT,
-    lpCurrencySymbol: ::LPSTR,
-}}
-pub type LPCURRENCYFMTA = *mut CURRENCYFMTA;
-STRUCT!{struct CURRENCYFMTW {
-    NumDigits: ::UINT,
-    LeadingZero: ::UINT,
-    Grouping: ::UINT,
-    lpDecimalSep: ::LPWSTR,
-    lpThousandSep: ::LPWSTR,
-    NegativeOrder: ::UINT,
-    PositiveOrder: ::UINT,
-    lpCurrencySymbol: ::LPWSTR,
-}}
-pub type LPCURRENCYFMTW = *mut CURRENCYFMTW;
-pub type NLS_FUNCTION = ::DWORD;
-STRUCT!{struct FILEMUIINFO {
-    dwSize: ::DWORD,
-    dwVersion: ::DWORD,
-    dwFileType: ::DWORD,
-    pChecksum: [::BYTE; 16],
-    pServiceChecksum: [::BYTE; 16],
-    dwLanguageNameOffset: ::DWORD,
-    dwTypeIDMainSize: ::DWORD,
-    dwTypeIDMainOffset: ::DWORD,
-    dwTypeNameMainOffset: ::DWORD,
-    dwTypeIDMUISize: ::DWORD,
-    dwTypeIDMUIOffset: ::DWORD,
-    dwTypeNameMUIOffset: ::DWORD,
-    abBuffer: [::BYTE; 8],
-}}
-pub type PFILEMUIINFO = *mut FILEMUIINFO;
-pub type CALINFO_ENUMPROCEXEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::CALID, ::LPWSTR, ::LPARAM,
-) -> ::BOOL>;
-pub type DATEFMT_ENUMPROCEXEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::CALID, ::LPARAM,
-) -> ::BOOL>;
-pub type TIMEFMT_ENUMPROCEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::LPARAM,
-) -> ::BOOL>;
-pub type LOCALE_ENUMPROCEX = Option<unsafe extern "system" fn(
-    ::LPWSTR, ::DWORD, ::LPARAM,
-) -> ::BOOL>;
diff --git a/vendor/winapi-0.2.8/src/winnt.rs b/vendor/winapi-0.2.8/src/winnt.rs
deleted file mode 100644
index cce242e9b7..0000000000
--- a/vendor/winapi-0.2.8/src/winnt.rs
+++ /dev/null
@@ -1,2368 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This module defines the 32-Bit Windows types and constants that are defined by NT, but exposed
-//! through the Win32 API.
-pub const ANYSIZE_ARRAY: usize = 1;
-//341
-pub type PVOID = *mut ::c_void;
-pub type PVOID64 = u64; // This is a 64-bit pointer, even when in 32-bit
-//382
-pub type VOID = ::c_void;
-pub type CHAR = ::c_char;
-pub type SHORT = ::c_short;
-pub type LONG = ::c_long;
-// pub type INT = ::c_int; // Already defined by minwindef.h
-pub type WCHAR = ::wchar_t;
-pub type PWCHAR = *mut WCHAR;
-pub type LPWCH = *mut WCHAR;
-pub type PWCH = *mut WCHAR;
-pub type LPCWCH = *const WCHAR;
-pub type PCWCH = *const WCHAR;
-pub type NWPSTR = *mut WCHAR;
-pub type LPWSTR = *mut WCHAR;
-pub type PWSTR = *mut WCHAR;
-pub type PZPWSTR = *mut PWSTR;
-pub type PCZPWSTR = *const PWSTR;
-pub type LPUWSTR = *mut WCHAR;
-pub type PUWSTR = *mut WCHAR;
-pub type LPCWSTR = *const WCHAR;
-pub type PCWSTR = *const WCHAR;
-pub type PZPCWSTR= *mut PCWSTR;
-pub type PCZPCWSTR = *const PCWSTR;
-pub type LPCUWSTR = *const WCHAR;
-pub type PCUWSTR = *const WCHAR;
-pub type PZZWSTR= *mut WCHAR;
-pub type PCZZWSTR = *const WCHAR;
-pub type PUZZWSTR = *mut WCHAR;
-pub type PCUZZWSTR = *const WCHAR;
-pub type PNZWCH = *mut WCHAR;
-pub type PCNZWCH = *const WCHAR;
-pub type PUNZWCH = *mut WCHAR;
-pub type PCUNZWCH = *const WCHAR;
-pub type LPCWCHAR = *const WCHAR;
-pub type PCWCHAR = *const WCHAR;
-pub type LPCUWCHAR = *const WCHAR;
-pub type PCUWCHAR = *const WCHAR;
-pub type UCSCHAR = ::c_ulong;
-pub type PUCSCHAR = *mut UCSCHAR;
-pub type PCUCSCHAR = *const UCSCHAR;
-pub type PUCSSTR = *mut UCSCHAR;
-pub type PUUCSSTR = *mut UCSCHAR;
-pub type PCUCSSTR = *const UCSCHAR;
-pub type PCUUCSSTR = *const UCSCHAR;
-pub type PUUCSCHAR = *mut UCSCHAR;
-pub type PCUUCSCHAR = *const UCSCHAR;
-pub type PCHAR = *mut CHAR;
-pub type LPCH = *mut CHAR;
-pub type PCH = *mut CHAR;
-pub type LPCCH = *const CHAR;
-pub type PCCH = *const CHAR;
-pub type NPSTR = *mut CHAR;
-pub type LPSTR = *mut CHAR;
-pub type PSTR = *mut CHAR;
-pub type PZPSTR = *mut PSTR;
-pub type PCZPSTR = *const PSTR;
-pub type LPCSTR = *const CHAR;
-pub type PCSTR = *const CHAR;
-pub type PZPCSTR = *mut PCSTR;
-pub type PCZPCSTR = *const PCSTR;
-pub type PZZSTR = *mut CHAR;
-pub type PCZZSTR = *const CHAR;
-pub type PNZCH = *mut CHAR;
-pub type PCNZCH = *const CHAR;
-// Skipping TCHAR things
-pub type PSHORT = *mut SHORT;
-pub type PLONG = *mut LONG;
-STRUCT!{struct PROCESSOR_NUMBER {
-    Group: ::WORD,
-    Number: ::BYTE,
-    Reserved: ::BYTE,
-}}
-pub type PPROCESSOR_NUMBER = *mut PROCESSOR_NUMBER;
-STRUCT!{struct GROUP_AFFINITY {
-    Mask: ::KAFFINITY,
-    Group: ::WORD,
-    Reserved: [::WORD; 3],
-}}
-pub type PGROUP_AFFINITY = *mut GROUP_AFFINITY;
-pub type HANDLE = *mut ::c_void;
-pub type PHANDLE = *mut HANDLE;
-pub type FCHAR = ::BYTE;
-pub type FSHORT = ::WORD;
-pub type FLONG = ::DWORD;
-//667
-pub type CCHAR = ::c_char;
-pub type LCID = ::DWORD;
-pub type PLCID = ::PDWORD;
-pub type LANGID = ::WORD;
-ENUM!{enum COMPARTMENT_ID {
-    UNSPECIFIED_COMPARTMENT_ID = 0,
-    DEFAULT_COMPARTMENT_ID = 1,
-}}
-pub type PCOMPARTMENT_ID = *mut COMPARTMENT_ID;
-pub const APPLICATION_ERROR_MASK: ::DWORD = 0x20000000;
-pub const ERROR_SEVERITY_SUCCESS: ::DWORD = 0x00000000;
-pub const ERROR_SEVERITY_INFORMATIONAL: ::DWORD = 0x40000000;
-pub const ERROR_SEVERITY_WARNING: ::DWORD = 0x80000000;
-pub const ERROR_SEVERITY_ERROR: ::DWORD = 0xC0000000;
-//710
-STRUCT!{struct FLOAT128 {
-    LowPart: ::__int64,
-    HighPart: ::__int64,
-}}
-pub type PFLOAT128 = *mut FLOAT128;
-pub type LONGLONG = ::__int64;
-pub type ULONGLONG = ::__uint64;
-pub type PLONGLONG = *mut LONGLONG;
-pub type PULONGLONG = *mut ULONGLONG;
-pub type USN = LONGLONG;
-pub type LARGE_INTEGER = LONGLONG;
-pub type PLARGE_INTEGER = *mut LARGE_INTEGER;
-pub type ULARGE_INTEGER = ULONGLONG;
-pub type PULARGE_INTEGER= *mut ULARGE_INTEGER;
-pub type RTL_REFERENCE_COUNT = ::LONG_PTR;
-pub type PRTL_REFERENCE_COUNT = *mut ::LONG_PTR;
-STRUCT!{struct LUID {
-    LowPart: ::DWORD,
-    HighPart: LONG,
-}}
-pub type PLUID = *mut LUID;
-pub type DWORDLONG = ULONGLONG;
-pub type PDWORDLONG = *mut DWORDLONG;
-//1042
-pub type BOOLEAN = ::BYTE;
-pub type PBOOLEAN = *mut BOOLEAN;
-STRUCT!{struct LIST_ENTRY {
-    Flink: *mut LIST_ENTRY,
-    Blink: *mut LIST_ENTRY,
-}}
-pub type PLIST_ENTRY = *mut LIST_ENTRY;
-STRUCT!{struct SINGLE_LIST_ENTRY {
-    Next: *mut SINGLE_LIST_ENTRY,
-}}
-pub type PSINGLE_LIST_ENTRY = *mut SINGLE_LIST_ENTRY;
-STRUCT!{struct LIST_ENTRY32 {
-    Flink: ::DWORD,
-    Blink: ::DWORD,
-}}
-pub type PLIST_ENTRY32 = *mut LIST_ENTRY32;
-STRUCT!{struct LIST_ENTRY64 {
-    Flink: ULONGLONG,
-    Blink: ULONGLONG,
-}}
-pub type PLIST_ENTRY64 = *mut LIST_ENTRY64;
-STRUCT!{struct OBJECTID {
-    Lineage: ::GUID,
-    Uniquifier: ::DWORD,
-}}
-pub const MINCHAR: ::CHAR = 0x80u8 as ::CHAR;
-pub const MAXCHAR: ::CHAR = 0x7f;
-pub const MINSHORT: ::SHORT = 0x8000u16 as ::SHORT;
-pub const MAXSHORT: ::SHORT = 0x7fff;
-pub const MINLONG: ::LONG = 0x80000000u32 as ::LONG;
-pub const MAXLONG: ::LONG = 0x7fffffff;
-pub const MAXBYTE: ::BYTE = 0xff;
-pub const MAXWORD: ::WORD = 0xffff;
-pub const MAXDWORD: ::DWORD = 0xffffffff;
-//1300
-pub type PEXCEPTION_ROUTINE = Option<unsafe extern "system" fn(
-    ExceptionRecord: *mut EXCEPTION_RECORD, EstablisherFrame: PVOID, ContextRecord: *mut CONTEXT,
-    DispatcherContext: PVOID,
-) -> ::EXCEPTION_DISPOSITION>;
-//1498
-pub const LANG_NEUTRAL: ::WORD = 0x00;
-pub const LANG_INVARIANT: ::WORD = 0x7f;
-pub const LANG_AFRIKAANS: ::WORD = 0x36;
-pub const LANG_ALBANIAN: ::WORD = 0x1c;
-pub const LANG_ALSATIAN: ::WORD = 0x84;
-pub const LANG_AMHARIC: ::WORD = 0x5e;
-pub const LANG_ARABIC: ::WORD = 0x01;
-pub const LANG_ARMENIAN: ::WORD = 0x2b;
-pub const LANG_ASSAMESE: ::WORD = 0x4d;
-pub const LANG_AZERI: ::WORD = 0x2c;
-pub const LANG_AZERBAIJANI: ::WORD = 0x2c;
-pub const LANG_BANGLA: ::WORD = 0x45;
-pub const LANG_BASHKIR: ::WORD = 0x6d;
-pub const LANG_BASQUE: ::WORD = 0x2d;
-pub const LANG_BELARUSIAN: ::WORD = 0x23;
-pub const LANG_BENGALI: ::WORD = 0x45;
-pub const LANG_BRETON: ::WORD = 0x7e;
-pub const LANG_BOSNIAN: ::WORD = 0x1a;
-pub const LANG_BOSNIAN_NEUTRAL: ::WORD = 0x781a;
-pub const LANG_BULGARIAN: ::WORD = 0x02;
-pub const LANG_CATALAN: ::WORD = 0x03;
-pub const LANG_CENTRAL_KURDISH: ::WORD = 0x92;
-pub const LANG_CHEROKEE: ::WORD = 0x5c;
-pub const LANG_CHINESE: ::WORD = 0x04;
-pub const LANG_CHINESE_SIMPLIFIED: ::WORD = 0x04;
-pub const LANG_CHINESE_TRADITIONAL: ::WORD = 0x7c04;
-pub const LANG_CORSICAN: ::WORD = 0x83;
-pub const LANG_CROATIAN: ::WORD = 0x1a;
-pub const LANG_CZECH: ::WORD = 0x05;
-pub const LANG_DANISH: ::WORD = 0x06;
-pub const LANG_DARI: ::WORD = 0x8c;
-pub const LANG_DIVEHI: ::WORD = 0x65;
-pub const LANG_DUTCH: ::WORD = 0x13;
-pub const LANG_ENGLISH: ::WORD = 0x09;
-pub const LANG_ESTONIAN: ::WORD = 0x25;
-pub const LANG_FAEROESE: ::WORD = 0x38;
-pub const LANG_FARSI: ::WORD = 0x29;
-pub const LANG_FILIPINO: ::WORD = 0x64;
-pub const LANG_FINNISH: ::WORD = 0x0b;
-pub const LANG_FRENCH: ::WORD = 0x0c;
-pub const LANG_FRISIAN: ::WORD = 0x62;
-pub const LANG_FULAH: ::WORD = 0x67;
-pub const LANG_GALICIAN: ::WORD = 0x56;
-pub const LANG_GEORGIAN: ::WORD = 0x37;
-pub const LANG_GERMAN: ::WORD = 0x07;
-pub const LANG_GREEK: ::WORD = 0x08;
-pub const LANG_GREENLANDIC: ::WORD = 0x6f;
-pub const LANG_GUJARATI: ::WORD = 0x47;
-pub const LANG_HAUSA: ::WORD = 0x68;
-pub const LANG_HAWAIIAN: ::WORD = 0x75;
-pub const LANG_HEBREW: ::WORD = 0x0d;
-pub const LANG_HINDI: ::WORD = 0x39;
-pub const LANG_HUNGARIAN: ::WORD = 0x0e;
-pub const LANG_ICELANDIC: ::WORD = 0x0f;
-pub const LANG_IGBO: ::WORD = 0x70;
-pub const LANG_INDONESIAN: ::WORD = 0x21;
-pub const LANG_INUKTITUT: ::WORD = 0x5d;
-pub const LANG_IRISH: ::WORD = 0x3c;
-pub const LANG_ITALIAN: ::WORD = 0x10;
-pub const LANG_JAPANESE: ::WORD = 0x11;
-pub const LANG_KANNADA: ::WORD = 0x4b;
-pub const LANG_KASHMIRI: ::WORD = 0x60;
-pub const LANG_KAZAK: ::WORD = 0x3f;
-pub const LANG_KHMER: ::WORD = 0x53;
-pub const LANG_KICHE: ::WORD = 0x86;
-pub const LANG_KINYARWANDA: ::WORD = 0x87;
-pub const LANG_KONKANI: ::WORD = 0x57;
-pub const LANG_KOREAN: ::WORD = 0x12;
-pub const LANG_KYRGYZ: ::WORD = 0x40;
-pub const LANG_LAO: ::WORD = 0x54;
-pub const LANG_LATVIAN: ::WORD = 0x26;
-pub const LANG_LITHUANIAN: ::WORD = 0x27;
-pub const LANG_LOWER_SORBIAN: ::WORD = 0x2e;
-pub const LANG_LUXEMBOURGISH: ::WORD = 0x6e;
-pub const LANG_MACEDONIAN: ::WORD = 0x2f;
-pub const LANG_MALAY: ::WORD = 0x3e;
-pub const LANG_MALAYALAM: ::WORD = 0x4c;
-pub const LANG_MALTESE: ::WORD = 0x3a;
-pub const LANG_MANIPURI: ::WORD = 0x58;
-pub const LANG_MAORI: ::WORD = 0x81;
-pub const LANG_MAPUDUNGUN: ::WORD = 0x7a;
-pub const LANG_MARATHI: ::WORD = 0x4e;
-pub const LANG_MOHAWK: ::WORD = 0x7c;
-pub const LANG_MONGOLIAN: ::WORD = 0x50;
-pub const LANG_NEPALI: ::WORD = 0x61;
-pub const LANG_NORWEGIAN: ::WORD = 0x14;
-pub const LANG_OCCITAN: ::WORD = 0x82;
-pub const LANG_ODIA: ::WORD = 0x48;
-pub const LANG_ORIYA: ::WORD = 0x48;
-pub const LANG_PASHTO: ::WORD = 0x63;
-pub const LANG_PERSIAN: ::WORD = 0x29;
-pub const LANG_POLISH: ::WORD = 0x15;
-pub const LANG_PORTUGUESE: ::WORD = 0x16;
-pub const LANG_PULAR: ::WORD = 0x67;
-pub const LANG_PUNJABI: ::WORD = 0x46;
-pub const LANG_QUECHUA: ::WORD = 0x6b;
-pub const LANG_ROMANIAN: ::WORD = 0x18;
-pub const LANG_ROMANSH: ::WORD = 0x17;
-pub const LANG_RUSSIAN: ::WORD = 0x19;
-pub const LANG_SAKHA: ::WORD = 0x85;
-pub const LANG_SAMI: ::WORD = 0x3b;
-pub const LANG_SANSKRIT: ::WORD = 0x4f;
-pub const LANG_SCOTTISH_GAELIC: ::WORD = 0x91;
-pub const LANG_SERBIAN: ::WORD = 0x1a;
-pub const LANG_SERBIAN_NEUTRAL: ::WORD = 0x7c1a;
-pub const LANG_SINDHI: ::WORD = 0x59;
-pub const LANG_SINHALESE: ::WORD = 0x5b;
-pub const LANG_SLOVAK: ::WORD = 0x1b;
-pub const LANG_SLOVENIAN: ::WORD = 0x24;
-pub const LANG_SOTHO: ::WORD = 0x6c;
-pub const LANG_SPANISH: ::WORD = 0x0a;
-pub const LANG_SWAHILI: ::WORD = 0x41;
-pub const LANG_SWEDISH: ::WORD = 0x1d;
-pub const LANG_SYRIAC: ::WORD = 0x5a;
-pub const LANG_TAJIK: ::WORD = 0x28;
-pub const LANG_TAMAZIGHT: ::WORD = 0x5f;
-pub const LANG_TAMIL: ::WORD = 0x49;
-pub const LANG_TATAR: ::WORD = 0x44;
-pub const LANG_TELUGU: ::WORD = 0x4a;
-pub const LANG_THAI: ::WORD = 0x1e;
-pub const LANG_TIBETAN: ::WORD = 0x51;
-pub const LANG_TIGRIGNA: ::WORD = 0x73;
-pub const LANG_TIGRINYA: ::WORD = 0x73;
-pub const LANG_TSWANA: ::WORD = 0x32;
-pub const LANG_TURKISH: ::WORD = 0x1f;
-pub const LANG_TURKMEN: ::WORD = 0x42;
-pub const LANG_UIGHUR: ::WORD = 0x80;
-pub const LANG_UKRAINIAN: ::WORD = 0x22;
-pub const LANG_UPPER_SORBIAN: ::WORD = 0x2e;
-pub const LANG_URDU: ::WORD = 0x20;
-pub const LANG_UZBEK: ::WORD = 0x43;
-pub const LANG_VALENCIAN: ::WORD = 0x03;
-pub const LANG_VIETNAMESE: ::WORD = 0x2a;
-pub const LANG_WELSH: ::WORD = 0x52;
-pub const LANG_WOLOF: ::WORD = 0x88;
-pub const LANG_XHOSA: ::WORD = 0x34;
-pub const LANG_YAKUT: ::WORD = 0x85;
-pub const LANG_YI: ::WORD = 0x78;
-pub const LANG_YORUBA: ::WORD = 0x6a;
-pub const LANG_ZULU: ::WORD = 0x35;
-//1651
-pub const SUBLANG_NEUTRAL: ::WORD = 0x00;
-pub const SUBLANG_DEFAULT: ::WORD = 0x01;
-pub const SUBLANG_SYS_DEFAULT: ::WORD = 0x02;
-pub const SUBLANG_CUSTOM_DEFAULT: ::WORD = 0x03;
-pub const SUBLANG_CUSTOM_UNSPECIFIED: ::WORD = 0x04;
-pub const SUBLANG_UI_CUSTOM_DEFAULT: ::WORD = 0x05;
-pub const SUBLANG_AFRIKAANS_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_ALBANIAN_ALBANIA: ::WORD = 0x01;
-pub const SUBLANG_ALSATIAN_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_AMHARIC_ETHIOPIA: ::WORD = 0x01;
-pub const SUBLANG_ARABIC_SAUDI_ARABIA: ::WORD = 0x01;
-pub const SUBLANG_ARABIC_IRAQ: ::WORD = 0x02;
-pub const SUBLANG_ARABIC_EGYPT: ::WORD = 0x03;
-pub const SUBLANG_ARABIC_LIBYA: ::WORD = 0x04;
-pub const SUBLANG_ARABIC_ALGERIA: ::WORD = 0x05;
-pub const SUBLANG_ARABIC_MOROCCO: ::WORD = 0x06;
-pub const SUBLANG_ARABIC_TUNISIA: ::WORD = 0x07;
-pub const SUBLANG_ARABIC_OMAN: ::WORD = 0x08;
-pub const SUBLANG_ARABIC_YEMEN: ::WORD = 0x09;
-pub const SUBLANG_ARABIC_SYRIA: ::WORD = 0x0a;
-pub const SUBLANG_ARABIC_JORDAN: ::WORD = 0x0b;
-pub const SUBLANG_ARABIC_LEBANON: ::WORD = 0x0c;
-pub const SUBLANG_ARABIC_KUWAIT: ::WORD = 0x0d;
-pub const SUBLANG_ARABIC_UAE: ::WORD = 0x0e;
-pub const SUBLANG_ARABIC_BAHRAIN: ::WORD = 0x0f;
-pub const SUBLANG_ARABIC_QATAR: ::WORD = 0x10;
-pub const SUBLANG_ARMENIAN_ARMENIA: ::WORD = 0x01;
-pub const SUBLANG_ASSAMESE_INDIA: ::WORD = 0x01;
-pub const SUBLANG_AZERI_LATIN: ::WORD = 0x01;
-pub const SUBLANG_AZERI_CYRILLIC: ::WORD = 0x02;
-pub const SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN: ::WORD = 0x01;
-pub const SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC: ::WORD = 0x02;
-pub const SUBLANG_BANGLA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_BANGLA_BANGLADESH: ::WORD = 0x02;
-pub const SUBLANG_BASHKIR_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_BASQUE_BASQUE: ::WORD = 0x01;
-pub const SUBLANG_BELARUSIAN_BELARUS: ::WORD = 0x01;
-pub const SUBLANG_BENGALI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_BENGALI_BANGLADESH: ::WORD = 0x02;
-pub const SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN: ::WORD = 0x05;
-pub const SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC: ::WORD = 0x08;
-pub const SUBLANG_BRETON_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_BULGARIAN_BULGARIA: ::WORD = 0x01;
-pub const SUBLANG_CATALAN_CATALAN: ::WORD = 0x01;
-pub const SUBLANG_CENTRAL_KURDISH_IRAQ: ::WORD = 0x01;
-pub const SUBLANG_CHEROKEE_CHEROKEE: ::WORD = 0x01;
-pub const SUBLANG_CHINESE_TRADITIONAL: ::WORD = 0x01;
-pub const SUBLANG_CHINESE_SIMPLIFIED: ::WORD = 0x02;
-pub const SUBLANG_CHINESE_HONGKONG: ::WORD = 0x03;
-pub const SUBLANG_CHINESE_SINGAPORE: ::WORD = 0x04;
-pub const SUBLANG_CHINESE_MACAU: ::WORD = 0x05;
-pub const SUBLANG_CORSICAN_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_CZECH_CZECH_REPUBLIC: ::WORD = 0x01;
-pub const SUBLANG_CROATIAN_CROATIA: ::WORD = 0x01;
-pub const SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN: ::WORD = 0x04;
-pub const SUBLANG_DANISH_DENMARK: ::WORD = 0x01;
-pub const SUBLANG_DARI_AFGHANISTAN: ::WORD = 0x01;
-pub const SUBLANG_DIVEHI_MALDIVES: ::WORD = 0x01;
-pub const SUBLANG_DUTCH: ::WORD = 0x01;
-pub const SUBLANG_DUTCH_BELGIAN: ::WORD = 0x02;
-pub const SUBLANG_ENGLISH_US: ::WORD = 0x01;
-pub const SUBLANG_ENGLISH_UK: ::WORD = 0x02;
-pub const SUBLANG_ENGLISH_AUS: ::WORD = 0x03;
-pub const SUBLANG_ENGLISH_CAN: ::WORD = 0x04;
-pub const SUBLANG_ENGLISH_NZ: ::WORD = 0x05;
-pub const SUBLANG_ENGLISH_EIRE: ::WORD = 0x06;
-pub const SUBLANG_ENGLISH_SOUTH_AFRICA: ::WORD = 0x07;
-pub const SUBLANG_ENGLISH_JAMAICA: ::WORD = 0x08;
-pub const SUBLANG_ENGLISH_CARIBBEAN: ::WORD = 0x09;
-pub const SUBLANG_ENGLISH_BELIZE: ::WORD = 0x0a;
-pub const SUBLANG_ENGLISH_TRINIDAD: ::WORD = 0x0b;
-pub const SUBLANG_ENGLISH_ZIMBABWE: ::WORD = 0x0c;
-pub const SUBLANG_ENGLISH_PHILIPPINES: ::WORD = 0x0d;
-pub const SUBLANG_ENGLISH_INDIA: ::WORD = 0x10;
-pub const SUBLANG_ENGLISH_MALAYSIA: ::WORD = 0x11;
-pub const SUBLANG_ENGLISH_SINGAPORE: ::WORD = 0x12;
-pub const SUBLANG_ESTONIAN_ESTONIA: ::WORD = 0x01;
-pub const SUBLANG_FAEROESE_FAROE_ISLANDS: ::WORD = 0x01;
-pub const SUBLANG_FILIPINO_PHILIPPINES: ::WORD = 0x01;
-pub const SUBLANG_FINNISH_FINLAND: ::WORD = 0x01;
-pub const SUBLANG_FRENCH: ::WORD = 0x01;
-pub const SUBLANG_FRENCH_BELGIAN: ::WORD = 0x02;
-pub const SUBLANG_FRENCH_CANADIAN: ::WORD = 0x03;
-pub const SUBLANG_FRENCH_SWISS: ::WORD = 0x04;
-pub const SUBLANG_FRENCH_LUXEMBOURG: ::WORD = 0x05;
-pub const SUBLANG_FRENCH_MONACO: ::WORD = 0x06;
-pub const SUBLANG_FRISIAN_NETHERLANDS: ::WORD = 0x01;
-pub const SUBLANG_FULAH_SENEGAL: ::WORD = 0x02;
-pub const SUBLANG_GALICIAN_GALICIAN: ::WORD = 0x01;
-pub const SUBLANG_GEORGIAN_GEORGIA: ::WORD = 0x01;
-pub const SUBLANG_GERMAN: ::WORD = 0x01;
-pub const SUBLANG_GERMAN_SWISS: ::WORD = 0x02;
-pub const SUBLANG_GERMAN_AUSTRIAN: ::WORD = 0x03;
-pub const SUBLANG_GERMAN_LUXEMBOURG: ::WORD = 0x04;
-pub const SUBLANG_GERMAN_LIECHTENSTEIN: ::WORD = 0x05;
-pub const SUBLANG_GREEK_GREECE: ::WORD = 0x01;
-pub const SUBLANG_GREENLANDIC_GREENLAND: ::WORD = 0x01;
-pub const SUBLANG_GUJARATI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_HAUSA_NIGERIA_LATIN: ::WORD = 0x01;
-pub const SUBLANG_HAWAIIAN_US: ::WORD = 0x01;
-pub const SUBLANG_HEBREW_ISRAEL: ::WORD = 0x01;
-pub const SUBLANG_HINDI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_HUNGARIAN_HUNGARY: ::WORD = 0x01;
-pub const SUBLANG_ICELANDIC_ICELAND: ::WORD = 0x01;
-pub const SUBLANG_IGBO_NIGERIA: ::WORD = 0x01;
-pub const SUBLANG_INDONESIAN_INDONESIA: ::WORD = 0x01;
-pub const SUBLANG_INUKTITUT_CANADA: ::WORD = 0x01;
-pub const SUBLANG_INUKTITUT_CANADA_LATIN: ::WORD = 0x02;
-pub const SUBLANG_IRISH_IRELAND: ::WORD = 0x02;
-pub const SUBLANG_ITALIAN: ::WORD = 0x01;
-pub const SUBLANG_ITALIAN_SWISS: ::WORD = 0x02;
-pub const SUBLANG_JAPANESE_JAPAN: ::WORD = 0x01;
-pub const SUBLANG_KANNADA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_KASHMIRI_SASIA: ::WORD = 0x02;
-pub const SUBLANG_KASHMIRI_INDIA: ::WORD = 0x02;
-pub const SUBLANG_KAZAK_KAZAKHSTAN: ::WORD = 0x01;
-pub const SUBLANG_KHMER_CAMBODIA: ::WORD = 0x01;
-pub const SUBLANG_KICHE_GUATEMALA: ::WORD = 0x01;
-pub const SUBLANG_KINYARWANDA_RWANDA: ::WORD = 0x01;
-pub const SUBLANG_KONKANI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_KOREAN: ::WORD = 0x01;
-pub const SUBLANG_KYRGYZ_KYRGYZSTAN: ::WORD = 0x01;
-pub const SUBLANG_LAO_LAO: ::WORD = 0x01;
-pub const SUBLANG_LATVIAN_LATVIA: ::WORD = 0x01;
-pub const SUBLANG_LITHUANIAN: ::WORD = 0x01;
-pub const SUBLANG_LOWER_SORBIAN_GERMANY: ::WORD = 0x02;
-pub const SUBLANG_LUXEMBOURGISH_LUXEMBOURG: ::WORD = 0x01;
-pub const SUBLANG_MACEDONIAN_MACEDONIA: ::WORD = 0x01;
-pub const SUBLANG_MALAY_MALAYSIA: ::WORD = 0x01;
-pub const SUBLANG_MALAY_BRUNEI_DARUSSALAM: ::WORD = 0x02;
-pub const SUBLANG_MALAYALAM_INDIA: ::WORD = 0x01;
-pub const SUBLANG_MALTESE_MALTA: ::WORD = 0x01;
-pub const SUBLANG_MAORI_NEW_ZEALAND: ::WORD = 0x01;
-pub const SUBLANG_MAPUDUNGUN_CHILE: ::WORD = 0x01;
-pub const SUBLANG_MARATHI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_MOHAWK_MOHAWK: ::WORD = 0x01;
-pub const SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA: ::WORD = 0x01;
-pub const SUBLANG_MONGOLIAN_PRC: ::WORD = 0x02;
-pub const SUBLANG_NEPALI_INDIA: ::WORD = 0x02;
-pub const SUBLANG_NEPALI_NEPAL: ::WORD = 0x01;
-pub const SUBLANG_NORWEGIAN_BOKMAL: ::WORD = 0x01;
-pub const SUBLANG_NORWEGIAN_NYNORSK: ::WORD = 0x02;
-pub const SUBLANG_OCCITAN_FRANCE: ::WORD = 0x01;
-pub const SUBLANG_ODIA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_ORIYA_INDIA: ::WORD = 0x01;
-pub const SUBLANG_PASHTO_AFGHANISTAN: ::WORD = 0x01;
-pub const SUBLANG_PERSIAN_IRAN: ::WORD = 0x01;
-pub const SUBLANG_POLISH_POLAND: ::WORD = 0x01;
-pub const SUBLANG_PORTUGUESE: ::WORD = 0x02;
-pub const SUBLANG_PORTUGUESE_BRAZILIAN: ::WORD = 0x01;
-pub const SUBLANG_PULAR_SENEGAL: ::WORD = 0x02;
-pub const SUBLANG_PUNJABI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_PUNJABI_PAKISTAN: ::WORD = 0x02;
-pub const SUBLANG_QUECHUA_BOLIVIA: ::WORD = 0x01;
-pub const SUBLANG_QUECHUA_ECUADOR: ::WORD = 0x02;
-pub const SUBLANG_QUECHUA_PERU: ::WORD = 0x03;
-pub const SUBLANG_ROMANIAN_ROMANIA: ::WORD = 0x01;
-pub const SUBLANG_ROMANSH_SWITZERLAND: ::WORD = 0x01;
-pub const SUBLANG_RUSSIAN_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_SAKHA_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_SAMI_NORTHERN_NORWAY: ::WORD = 0x01;
-pub const SUBLANG_SAMI_NORTHERN_SWEDEN: ::WORD = 0x02;
-pub const SUBLANG_SAMI_NORTHERN_FINLAND: ::WORD = 0x03;
-pub const SUBLANG_SAMI_LULE_NORWAY: ::WORD = 0x04;
-pub const SUBLANG_SAMI_LULE_SWEDEN: ::WORD = 0x05;
-pub const SUBLANG_SAMI_SOUTHERN_NORWAY: ::WORD = 0x06;
-pub const SUBLANG_SAMI_SOUTHERN_SWEDEN: ::WORD = 0x07;
-pub const SUBLANG_SAMI_SKOLT_FINLAND: ::WORD = 0x08;
-pub const SUBLANG_SAMI_INARI_FINLAND: ::WORD = 0x09;
-pub const SUBLANG_SANSKRIT_INDIA: ::WORD = 0x01;
-pub const SUBLANG_SCOTTISH_GAELIC: ::WORD = 0x01;
-pub const SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_LATIN: ::WORD = 0x06;
-pub const SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC: ::WORD = 0x07;
-pub const SUBLANG_SERBIAN_MONTENEGRO_LATIN: ::WORD = 0x0b;
-pub const SUBLANG_SERBIAN_MONTENEGRO_CYRILLIC: ::WORD = 0x0c;
-pub const SUBLANG_SERBIAN_SERBIA_LATIN: ::WORD = 0x09;
-pub const SUBLANG_SERBIAN_SERBIA_CYRILLIC: ::WORD = 0x0a;
-pub const SUBLANG_SERBIAN_CROATIA: ::WORD = 0x01;
-pub const SUBLANG_SERBIAN_LATIN: ::WORD = 0x02;
-pub const SUBLANG_SERBIAN_CYRILLIC: ::WORD = 0x03;
-pub const SUBLANG_SINDHI_INDIA: ::WORD = 0x01;
-pub const SUBLANG_SINDHI_PAKISTAN: ::WORD = 0x02;
-pub const SUBLANG_SINDHI_AFGHANISTAN: ::WORD = 0x02;
-pub const SUBLANG_SINHALESE_SRI_LANKA: ::WORD = 0x01;
-pub const SUBLANG_SOTHO_NORTHERN_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_SLOVAK_SLOVAKIA: ::WORD = 0x01;
-pub const SUBLANG_SLOVENIAN_SLOVENIA: ::WORD = 0x01;
-pub const SUBLANG_SPANISH: ::WORD = 0x01;
-pub const SUBLANG_SPANISH_MEXICAN: ::WORD = 0x02;
-pub const SUBLANG_SPANISH_MODERN: ::WORD = 0x03;
-pub const SUBLANG_SPANISH_GUATEMALA: ::WORD = 0x04;
-pub const SUBLANG_SPANISH_COSTA_RICA: ::WORD = 0x05;
-pub const SUBLANG_SPANISH_PANAMA: ::WORD = 0x06;
-pub const SUBLANG_SPANISH_DOMINICAN_REPUBLIC: ::WORD = 0x07;
-pub const SUBLANG_SPANISH_VENEZUELA: ::WORD = 0x08;
-pub const SUBLANG_SPANISH_COLOMBIA: ::WORD = 0x09;
-pub const SUBLANG_SPANISH_PERU: ::WORD = 0x0a;
-pub const SUBLANG_SPANISH_ARGENTINA: ::WORD = 0x0b;
-pub const SUBLANG_SPANISH_ECUADOR: ::WORD = 0x0c;
-pub const SUBLANG_SPANISH_CHILE: ::WORD = 0x0d;
-pub const SUBLANG_SPANISH_URUGUAY: ::WORD = 0x0e;
-pub const SUBLANG_SPANISH_PARAGUAY: ::WORD = 0x0f;
-pub const SUBLANG_SPANISH_BOLIVIA: ::WORD = 0x10;
-pub const SUBLANG_SPANISH_EL_SALVADOR: ::WORD = 0x11;
-pub const SUBLANG_SPANISH_HONDURAS: ::WORD = 0x12;
-pub const SUBLANG_SPANISH_NICARAGUA: ::WORD = 0x13;
-pub const SUBLANG_SPANISH_PUERTO_RICO: ::WORD = 0x14;
-pub const SUBLANG_SPANISH_US: ::WORD = 0x15;
-pub const SUBLANG_SWAHILI_KENYA: ::WORD = 0x01;
-pub const SUBLANG_SWEDISH: ::WORD = 0x01;
-pub const SUBLANG_SWEDISH_FINLAND: ::WORD = 0x02;
-pub const SUBLANG_SYRIAC_SYRIA: ::WORD = 0x01;
-pub const SUBLANG_TAJIK_TAJIKISTAN: ::WORD = 0x01;
-pub const SUBLANG_TAMAZIGHT_ALGERIA_LATIN: ::WORD = 0x02;
-pub const SUBLANG_TAMAZIGHT_MOROCCO_TIFINAGH: ::WORD = 0x04;
-pub const SUBLANG_TAMIL_INDIA: ::WORD = 0x01;
-pub const SUBLANG_TAMIL_SRI_LANKA: ::WORD = 0x02;
-pub const SUBLANG_TATAR_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_TELUGU_INDIA: ::WORD = 0x01;
-pub const SUBLANG_THAI_THAILAND: ::WORD = 0x01;
-pub const SUBLANG_TIBETAN_PRC: ::WORD = 0x01;
-pub const SUBLANG_TIGRIGNA_ERITREA: ::WORD = 0x02;
-pub const SUBLANG_TIGRINYA_ERITREA: ::WORD = 0x02;
-pub const SUBLANG_TIGRINYA_ETHIOPIA: ::WORD = 0x01;
-pub const SUBLANG_TSWANA_BOTSWANA: ::WORD = 0x02;
-pub const SUBLANG_TSWANA_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_TURKISH_TURKEY: ::WORD = 0x01;
-pub const SUBLANG_TURKMEN_TURKMENISTAN: ::WORD = 0x01;
-pub const SUBLANG_UIGHUR_PRC: ::WORD = 0x01;
-pub const SUBLANG_UKRAINIAN_UKRAINE: ::WORD = 0x01;
-pub const SUBLANG_UPPER_SORBIAN_GERMANY: ::WORD = 0x01;
-pub const SUBLANG_URDU_PAKISTAN: ::WORD = 0x01;
-pub const SUBLANG_URDU_INDIA: ::WORD = 0x02;
-pub const SUBLANG_UZBEK_LATIN: ::WORD = 0x01;
-pub const SUBLANG_UZBEK_CYRILLIC: ::WORD = 0x02;
-pub const SUBLANG_VALENCIAN_VALENCIA: ::WORD = 0x02;
-pub const SUBLANG_VIETNAMESE_VIETNAM: ::WORD = 0x01;
-pub const SUBLANG_WELSH_UNITED_KINGDOM: ::WORD = 0x01;
-pub const SUBLANG_WOLOF_SENEGAL: ::WORD = 0x01;
-pub const SUBLANG_XHOSA_SOUTH_AFRICA: ::WORD = 0x01;
-pub const SUBLANG_YAKUT_RUSSIA: ::WORD = 0x01;
-pub const SUBLANG_YI_PRC: ::WORD = 0x01;
-pub const SUBLANG_YORUBA_NIGERIA: ::WORD = 0x01;
-pub const SUBLANG_ZULU_SOUTH_AFRICA: ::WORD = 0x01;
-//1962
-// FIXME: Once feature(const_fn) or some CTFE alternative becomes stable, MAKELANGID! can go
-// unless we want to #[macro_export] it ...
-macro_rules! MAKELANGID { ($p:expr, $s:expr) => ($s << 10 | $p) }
-pub fn MAKELANGID(p: ::WORD, s: ::WORD) -> ::LANGID { MAKELANGID!(p, s) }
-pub fn PRIMARYLANGID(lgid: ::LANGID) -> ::WORD { lgid & 0x3ff }
-pub fn SUBLANGID(lgid: ::LANGID) -> ::WORD { lgid >> 10 }
-//2019
-pub const LANG_SYSTEM_DEFAULT: LANGID = MAKELANGID!(LANG_NEUTRAL, SUBLANG_SYS_DEFAULT);
-pub const LANG_USER_DEFAULT: LANGID = MAKELANGID!(LANG_NEUTRAL, SUBLANG_DEFAULT);
-//2214
-pub const MAXIMUM_WAIT_OBJECTS: ::DWORD = 64;
-pub const MAXIMUM_SUSPEND_COUNT: ::CHAR = MAXCHAR;
-//2277
-pub type KSPIN_LOCK = ::ULONG_PTR;
-pub type PKSPIN_LOCK = *mut KSPIN_LOCK;
-STRUCT!{struct M128A { // FIXME align 16
-    Low: ULONGLONG,
-    High: LONGLONG,
-}}
-pub type PM128A = *mut M128A;
-#[cfg(target_arch = "x86")]
-STRUCT!{nodebug struct XSAVE_FORMAT { // FIXME align 16
-    ControlWord: ::WORD,
-    StatusWord: ::WORD,
-    TagWord: ::BYTE,
-    Reserved1: ::BYTE,
-    ErrorOpcode: ::WORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::WORD,
-    Reserved2: ::WORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::WORD,
-    Reserved3: ::WORD,
-    MxCsr: ::DWORD,
-    MxCsr_Mask: ::DWORD,
-    FloatRegisters: [M128A; 8],
-    XmmRegisters: [M128A; 8],
-    Reserved4: [::BYTE; 224],
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{nodebug struct XSAVE_FORMAT { // FIXME align 16
-    ControlWord: ::WORD,
-    StatusWord: ::WORD,
-    TagWord: ::BYTE,
-    Reserved1: ::BYTE,
-    ErrorOpcode: ::WORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::WORD,
-    Reserved2: ::WORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::WORD,
-    Reserved3: ::WORD,
-    MxCsr: ::DWORD,
-    MxCsr_Mask: ::DWORD,
-    FloatRegisters: [M128A; 8],
-    XmmRegisters: [M128A; 16],
-    Reserved4: [::BYTE; 96],
-}}
-//3563
-#[cfg(target_arch = "x86")]
-pub const SIZE_OF_80387_REGISTERS: usize = 80;
-#[cfg(target_arch = "x86")]
-STRUCT!{nodebug struct FLOATING_SAVE_AREA {
-    ControlWord: ::DWORD,
-    StatusWord: ::DWORD,
-    TagWord: ::DWORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::DWORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::DWORD,
-    RegisterArea: [::BYTE; SIZE_OF_80387_REGISTERS],
-    Spare0: ::DWORD,
-}}
-#[cfg(target_arch = "x86")]
-pub type PFLOATING_SAVE_AREA = *mut FLOATING_SAVE_AREA;
-#[cfg(target_arch = "x86")]
-pub const MAXIMUM_SUPPORTED_EXTENSION: usize = 512;
-#[cfg(target_arch = "x86")]
-STRUCT!{nodebug struct CONTEXT {
-    ContextFlags: ::DWORD,
-    Dr0: ::DWORD,
-    Dr1: ::DWORD,
-    Dr2: ::DWORD,
-    Dr3: ::DWORD,
-    Dr6: ::DWORD,
-    Dr7: ::DWORD,
-    FloatSave: FLOATING_SAVE_AREA,
-    SegGs: ::DWORD,
-    SegFs: ::DWORD,
-    SegEs: ::DWORD,
-    SegDs: ::DWORD,
-    Edi: ::DWORD,
-    Esi: ::DWORD,
-    Ebx: ::DWORD,
-    Edx: ::DWORD,
-    Ecx: ::DWORD,
-    Eax: ::DWORD,
-    Ebp: ::DWORD,
-    Eip: ::DWORD,
-    SegCs: ::DWORD,
-    EFlags: ::DWORD,
-    Esp: ::DWORD,
-    SegSs: ::DWORD,
-    ExtendedRegisters: [::BYTE; MAXIMUM_SUPPORTED_EXTENSION],
-}}
-#[cfg(target_arch = "x86_64")]
-pub type XMM_SAVE_AREA32 = XSAVE_FORMAT;
-pub type PXMM_SAVE_AREA32 = *mut XSAVE_FORMAT;
-// FIXME - Align 16
-#[cfg(target_arch = "x86_64")]
-STRUCT!{nodebug struct CONTEXT {
-    P1Home: ::DWORD64,
-    P2Home: ::DWORD64,
-    P3Home: ::DWORD64,
-    P4Home: ::DWORD64,
-    P5Home: ::DWORD64,
-    P6Home: ::DWORD64,
-    ContextFlags: ::DWORD,
-    MxCsr: ::DWORD,
-    SegCs: ::WORD,
-    SegDs: ::WORD,
-    SegEs: ::WORD,
-    SegFs: ::WORD,
-    SegGs: ::WORD,
-    SegSs: ::WORD,
-    EFlags: ::DWORD,
-    Dr0: ::DWORD64,
-    Dr1: ::DWORD64,
-    Dr2: ::DWORD64,
-    Dr3: ::DWORD64,
-    Dr6: ::DWORD64,
-    Dr7: ::DWORD64,
-    Rax: ::DWORD64,
-    Rcx: ::DWORD64,
-    Rdx: ::DWORD64,
-    Rbx: ::DWORD64,
-    Rsp: ::DWORD64,
-    Rbp: ::DWORD64,
-    Rsi: ::DWORD64,
-    Rdi: ::DWORD64,
-    R8: ::DWORD64,
-    R9: ::DWORD64,
-    R10: ::DWORD64,
-    R11: ::DWORD64,
-    R12: ::DWORD64,
-    R13: ::DWORD64,
-    R14: ::DWORD64,
-    R15: ::DWORD64,
-    Rip: ::DWORD64,
-    FltSave: XMM_SAVE_AREA32,
-    VectorRegister: [::M128A; 26],
-    VectorControl: ::DWORD64,
-    DebugControl: ::DWORD64,
-    LastBranchToRip: ::DWORD64,
-    LastBranchFromRip: ::DWORD64,
-    LastExceptionToRip: ::DWORD64,
-    LastExceptionFromRip: ::DWORD64,
-}}
-pub type PCONTEXT = *mut CONTEXT;
-#[test]
-fn test_CONTEXT_size() {
-    use std::mem::size_of;
-    if cfg!(target_arch = "x86_64") {
-        assert_eq!(size_of::<CONTEXT>(), 1232)
-    } else if cfg!(target_arch = "x86") {
-        assert_eq!(size_of::<CONTEXT>(), 716)
-    }
-}
-pub type RUNTIME_FUNCTION = IMAGE_RUNTIME_FUNCTION_ENTRY;
-pub type PRUNTIME_FUNCTION = *mut RUNTIME_FUNCTION;
-pub const UNWIND_HISTORY_TABLE_SIZE: usize = 12;
-STRUCT!{struct UNWIND_HISTORY_TABLE_ENTRY {
-    ImageBase: ::DWORD64,
-    FunctionEntry: PRUNTIME_FUNCTION,
-}}
-pub type PUNWIND_HISTORY_TABLE_ENTRY = *mut UNWIND_HISTORY_TABLE_ENTRY;
-STRUCT!{struct UNWIND_HISTORY_TABLE {
-    Count: ::DWORD,
-    LocalHint: ::BYTE,
-    GlobalHint: ::BYTE,
-    Search: ::BYTE,
-    Once: ::BYTE,
-    LowAddress: ::DWORD64,
-    HighAddress: ::DWORD64,
-    Entry: [UNWIND_HISTORY_TABLE_ENTRY; UNWIND_HISTORY_TABLE_SIZE],
-}}
-pub type PUNWIND_HISTORY_TABLE = *mut UNWIND_HISTORY_TABLE;
-pub type PGET_RUNTIME_FUNCTION_CALLBACK = Option<unsafe extern "system" fn(
-    ControlPc: ::DWORD64, Context: ::PVOID,
-) -> PRUNTIME_FUNCTION>;
-STRUCT!{struct KNONVOLATILE_CONTEXT_POINTERS_u1 {
-    Xmm0: PM128A,
-    Xmm1: PM128A,
-    Xmm2: PM128A,
-    Xmm3: PM128A,
-    Xmm4: PM128A,
-    Xmm5: PM128A,
-    Xmm6: PM128A,
-    Xmm7: PM128A,
-    Xmm8: PM128A,
-    Xmm9: PM128A,
-    Xmm10: PM128A,
-    Xmm11: PM128A,
-    Xmm12: PM128A,
-    Xmm14: PM128A,
-    Xmm15: PM128A,
-}}
-STRUCT!{struct KNONVOLATILE_CONTEXT_POINTERS_u2 {
-    Rax: ::DWORD64,
-    Rcx: ::DWORD64,
-    Rdx: ::DWORD64,
-    Rbx: ::DWORD64,
-    Rsp: ::DWORD64,
-    Rbp: ::DWORD64,
-    Rsi: ::DWORD64,
-    Rdi: ::DWORD64,
-    R8: ::DWORD64,
-    R9: ::DWORD64,
-    R10: ::DWORD64,
-    R11: ::DWORD64,
-    R12: ::DWORD64,
-    R13: ::DWORD64,
-    R14: ::DWORD64,
-    R15: ::DWORD64,
-}}
-STRUCT!{struct KNONVOLATILE_CONTEXT_POINTERS {
-    FloatingContext: [PM128A; 16],
-    IntegerContext: [::PDWORD64; 16],
-}}
-// FIXME: all unions are untagged
-UNION!(
-    KNONVOLATILE_CONTEXT_POINTERS, FloatingContext, Xmms, Xmms_mut,
-    KNONVOLATILE_CONTEXT_POINTERS_u1
-);
-UNION!(
-    KNONVOLATILE_CONTEXT_POINTERS, IntegerContext, Regs, Regs_mut,
-    KNONVOLATILE_CONTEXT_POINTERS_u2
-);
-pub type PKNONVOLATILE_CONTEXT_POINTERS = *mut KNONVOLATILE_CONTEXT_POINTERS;
-//8983
-pub const EXCEPTION_MAXIMUM_PARAMETERS: usize = 15;
-STRUCT!{struct EXCEPTION_RECORD {
-    ExceptionCode: ::DWORD,
-    ExceptionFlags: ::DWORD,
-    ExceptionRecord: *mut EXCEPTION_RECORD,
-    ExceptionAddress: ::PVOID,
-    NumberParameters: ::DWORD,
-    ExceptionInformation: [::ULONG_PTR; EXCEPTION_MAXIMUM_PARAMETERS],
-}}
-pub type PEXCEPTION_RECORD = *mut EXCEPTION_RECORD;
-//9023
-STRUCT!{struct EXCEPTION_POINTERS {
-    ExceptionRecord: PEXCEPTION_RECORD,
-    ContextRecord: PCONTEXT,
-}}
-pub type PEXCEPTION_POINTERS = *mut EXCEPTION_POINTERS;
-pub type PACCESS_TOKEN = ::PVOID;
-pub type PSECURITY_DESCRIPTOR = ::PVOID;
-pub type PSID = ::PVOID;
-pub type PCLAIMS_BLOB = ::PVOID;
-//9091
-pub type ACCESS_MASK = ::DWORD;
-pub type PACCESS_MASK = *mut ACCESS_MASK;
-pub const DELETE: ::DWORD = 0x00010000;
-pub const READ_CONTROL: ::DWORD = 0x00020000;
-pub const WRITE_DAC: ::DWORD = 0x00040000;
-pub const WRITE_OWNER: ::DWORD = 0x00080000;
-pub const SYNCHRONIZE: ::DWORD = 0x00100000;
-pub const STANDARD_RIGHTS_REQUIRED: ::DWORD = 0x000F0000;
-pub const STANDARD_RIGHTS_READ: ::DWORD = READ_CONTROL;
-pub const STANDARD_RIGHTS_WRITE: ::DWORD = READ_CONTROL;
-pub const STANDARD_RIGHTS_EXECUTE: ::DWORD = READ_CONTROL;
-pub const STANDARD_RIGHTS_ALL: ::DWORD = 0x001F0000;
-pub const SPECIFIC_RIGHTS_ALL: ::DWORD = 0x0000FFFF;
-pub const ACCESS_SYSTEM_SECURITY: ::DWORD = 0x01000000;
-pub const MAXIMUM_ALLOWED: ::DWORD = 0x02000000;
-pub const GENERIC_READ: ::DWORD = 0x80000000;
-pub const GENERIC_WRITE: ::DWORD = 0x40000000;
-pub const GENERIC_EXECUTE: ::DWORD = 0x20000000;
-pub const GENERIC_ALL: ::DWORD = 0x10000000;
-//9170
-STRUCT!{struct LUID_AND_ATTRIBUTES {
-    Luid: LUID,
-    Attributes: ::DWORD,
-}}
-pub type PLUID_AND_ATTRIBUTES = *mut LUID_AND_ATTRIBUTES;
-//9243
-ENUM!{enum SID_NAME_USE {
-    SidTypeUser = 1,
-    SidTypeGroup,
-    SidTypeDomain,
-    SidTypeAlias,
-    SidTypeWellKnownGroup,
-    SidTypeDeletedAccount,
-    SidTypeInvalid,
-    SidTypeUnknown,
-    SidTypeComputer,
-    SidTypeLabel,
-}}
-pub type PSID_NAME_USE = *mut SID_NAME_USE;
-STRUCT!{struct SID_AND_ATTRIBUTES {
-    Sid: PSID,
-    Attributes: ::DWORD,
-}}
-pub type PSID_AND_ATTRIBUTES = *mut SID_AND_ATTRIBUTES;
-//9802
-pub const ACL_REVISION: ::BYTE = 2;
-pub const ACL_REVISION_DS: ::BYTE = 4;
-pub const ACL_REVISION1: ::BYTE = 1;
-pub const MIN_ACL_REVISION: ::BYTE = ACL_REVISION2;
-pub const ACL_REVISION2: ::BYTE = 2;
-pub const ACL_REVISION3: ::BYTE = 3;
-pub const ACL_REVISION4: ::BYTE = 4;
-pub const MAX_ACL_REVISION: ::BYTE = ACL_REVISION4;
-STRUCT!{struct ACL {
-    AclRevision: ::BYTE,
-    Sbz1: ::BYTE,
-    AclSize: ::WORD,
-    AceCount: ::WORD,
-    Sbz2: ::WORD,
-}}
-pub type PACL = *mut ACL;
-//9888
-pub const SE_PRIVILEGE_ENABLED_BY_DEFAULT: ::DWORD = 0x00000001;
-pub const SE_PRIVILEGE_ENABLED: ::DWORD = 0x00000002;
-pub const SE_PRIVILEGE_REMOVED: ::DWORD = 0x00000004;
-pub const SE_PRIVILEGE_USED_FOR_ACCESS: ::DWORD = 0x80000000;
-pub const SE_PRIVILEGE_VALID_ATTRIBUTES: ::DWORD = SE_PRIVILEGE_ENABLED_BY_DEFAULT | SE_PRIVILEGE_ENABLED | SE_PRIVILEGE_REMOVED | SE_PRIVILEGE_USED_FOR_ACCESS;
-pub const PRIVILEGE_SET_ALL_NECESSARY: ::DWORD = 1;
-//10689
-pub const TOKEN_ASSIGN_PRIMARY: ::DWORD = 0x0001;
-pub const TOKEN_DUPLICATE: ::DWORD = 0x0002;
-pub const TOKEN_IMPERSONATE: ::DWORD = 0x0004;
-pub const TOKEN_QUERY: ::DWORD = 0x0008;
-pub const TOKEN_QUERY_SOURCE: ::DWORD = 0x0010;
-pub const TOKEN_ADJUST_PRIVILEGES: ::DWORD = 0x0020;
-pub const TOKEN_ADJUST_GROUPS: ::DWORD = 0x0040;
-pub const TOKEN_ADJUST_DEFAULT: ::DWORD = 0x0080;
-pub const TOKEN_ADJUST_SESSIONID: ::DWORD = 0x0100;
-pub const TOKEN_ALL_ACCESS_P: ::DWORD = STANDARD_RIGHTS_REQUIRED | TOKEN_ASSIGN_PRIMARY
-    | TOKEN_DUPLICATE | TOKEN_IMPERSONATE | TOKEN_QUERY | TOKEN_QUERY_SOURCE
-    | TOKEN_ADJUST_PRIVILEGES | TOKEN_ADJUST_GROUPS | TOKEN_ADJUST_DEFAULT;
-pub const TOKEN_ALL_ACCESS: ::DWORD = TOKEN_ALL_ACCESS_P | TOKEN_ADJUST_SESSIONID;
-pub const TOKEN_READ: ::DWORD = STANDARD_RIGHTS_READ | TOKEN_QUERY;
-pub const TOKEN_WRITE: ::DWORD = STANDARD_RIGHTS_WRITE | TOKEN_ADJUST_PRIVILEGES
-    | TOKEN_ADJUST_GROUPS | TOKEN_ADJUST_DEFAULT;
-pub const TOKEN_EXECUTE: ::DWORD = STANDARD_RIGHTS_EXECUTE;
-//10823
-STRUCT!{nodebug struct TOKEN_PRIVILEGES {
-    PrivilegeCount: ::DWORD,
-    Privileges: [LUID_AND_ATTRIBUTES; 0],
-}}
-pub type PTOKEN_PRIVILEGES = *mut TOKEN_PRIVILEGES;
-//10965
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_INVALID: ::WORD = 0x00;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_INT64: ::WORD = 0x01;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_UINT64: ::WORD = 0x02;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_STRING: ::WORD = 0x03;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE {
-    Version: ::DWORD64,
-    Name: ::PWSTR,
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE = *mut CLAIM_SECURITY_ATTRIBUTE_FQBN_VALUE;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_FQBN: ::WORD = 0x04;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_SID: ::WORD = 0x05;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_BOOLEAN: ::WORD = 0x06;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE {
-    pValue: ::PVOID,
-    ValueLength: ::DWORD,
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE =
-    *mut CLAIM_SECURITY_ATTRIBUTE_OCTET_STRING_VALUE;
-pub const CLAIM_SECURITY_ATTRIBUTE_TYPE_OCTET_STRING: ::WORD = 0x10;
-pub const CLAIM_SECURITY_ATTRIBUTE_NON_INHERITABLE: ::DWORD = 0x0001;
-pub const CLAIM_SECURITY_ATTRIBUTE_VALUE_CASE_SENSITIVE: ::DWORD = 0x0002;
-pub const CLAIM_SECURITY_ATTRIBUTE_USE_FOR_DENY_ONLY: ::DWORD = 0x0004;
-pub const CLAIM_SECURITY_ATTRIBUTE_DISABLED_BY_DEFAULT: ::DWORD = 0x0008;
-pub const CLAIM_SECURITY_ATTRIBUTE_DISABLED: ::DWORD = 0x0010;
-pub const CLAIM_SECURITY_ATTRIBUTE_MANDATORY: ::DWORD = 0x0020;
-pub const CLAIM_SECURITY_ATTRIBUTE_VALID_FLAGS: ::DWORD = CLAIM_SECURITY_ATTRIBUTE_NON_INHERITABLE
-    | CLAIM_SECURITY_ATTRIBUTE_VALUE_CASE_SENSITIVE | CLAIM_SECURITY_ATTRIBUTE_USE_FOR_DENY_ONLY
-    | CLAIM_SECURITY_ATTRIBUTE_DISABLED_BY_DEFAULT | CLAIM_SECURITY_ATTRIBUTE_DISABLED
-    | CLAIM_SECURITY_ATTRIBUTE_MANDATORY;
-pub const CLAIM_SECURITY_ATTRIBUTE_CUSTOM_FLAGS: ::DWORD = 0xFFFF0000;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_V1 {
-    Name: ::PWSTR,
-    ValueType: ::WORD,
-    Reserved: ::WORD,
-    Flags: ::DWORD,
-    ValueCount: ::DWORD,
-    // Put data here
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_V1 = *mut CLAIM_SECURITY_ATTRIBUTE_V1;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 {
-    Name: ::DWORD,
-    ValueType: ::WORD,
-    Reserved: ::WORD,
-    Flags: ::DWORD,
-    ValueCount: ::DWORD,
-    // Put array here
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1 = *mut CLAIM_SECURITY_ATTRIBUTE_RELATIVE_V1;
-pub const CLAIM_SECURITY_ATTRIBUTES_INFORMATION_VERSION_V1: ::WORD = 1;
-pub const CLAIM_SECURITY_ATTRIBUTES_INFORMATION_VERSION: ::WORD =
-    CLAIM_SECURITY_ATTRIBUTES_INFORMATION_VERSION_V1;
-STRUCT!{struct CLAIM_SECURITY_ATTRIBUTES_INFORMATION {
-    Version: ::WORD,
-    Reserved: ::WORD,
-    AttributeCount: ::DWORD,
-    pAttributeV1: PCLAIM_SECURITY_ATTRIBUTE_V1,
-}}
-pub type PCLAIM_SECURITY_ATTRIBUTES_INFORMATION = *mut CLAIM_SECURITY_ATTRIBUTES_INFORMATION;
-//11257
-pub type SECURITY_INFORMATION = ::DWORD;
-pub type PSECURITY_INFORMATION = *mut ::DWORD;
-pub const OWNER_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000001;
-pub const GROUP_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000002;
-pub const DACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000004;
-pub const SACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000008;
-pub const LABEL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000010;
-pub const ATTRIBUTE_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000020;
-pub const SCOPE_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000040;
-pub const PROCESS_TRUST_LABEL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00000080;
-pub const BACKUP_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x00010000;
-pub const PROTECTED_DACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x80000000;
-pub const PROTECTED_SACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x40000000;
-pub const UNPROTECTED_DACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x20000000;
-pub const UNPROTECTED_SACL_SECURITY_INFORMATION: SECURITY_INFORMATION = 0x10000000;
-ENUM!{enum SE_LEARNING_MODE_DATA_TYPE {
-    SeLearningModeInvalidType = 0,
-    SeLearningModeSettings,
-    SeLearningModeMax,
-}}
-STRUCT!{struct SECURITY_CAPABILITIES {
-    AppContainerSid: PSID,
-    Capabilities: PSID_AND_ATTRIBUTES,
-    CapabilityCount: ::DWORD,
-    Reserved: ::DWORD,
-}}
-pub type PSECURITY_CAPABILITIES = *mut SECURITY_CAPABILITIES;
-pub type LPSECURITY_CAPABILITIES = *mut SECURITY_CAPABILITIES;
-pub const PROCESS_TERMINATE: ::DWORD = 0x0001;
-pub const PROCESS_CREATE_THREAD: ::DWORD = 0x0002;
-pub const PROCESS_SET_SESSIONID: ::DWORD = 0x0004;
-pub const PROCESS_VM_OPERATION: ::DWORD = 0x0008;
-pub const PROCESS_VM_READ: ::DWORD = 0x0010;
-pub const PROCESS_VM_WRITE: ::DWORD = 0x0020;
-pub const PROCESS_DUP_HANDLE: ::DWORD = 0x0040;
-pub const PROCESS_CREATE_PROCESS: ::DWORD = 0x0080;
-pub const PROCESS_SET_QUOTA: ::DWORD = 0x0100;
-pub const PROCESS_SET_INFORMATION: ::DWORD = 0x0200;
-pub const PROCESS_QUERY_INFORMATION: ::DWORD = 0x0400;
-pub const PROCESS_SUSPEND_RESUME: ::DWORD = 0x0800;
-pub const PROCESS_QUERY_LIMITED_INFORMATION: ::DWORD = 0x1000;
-pub const PROCESS_SET_LIMITED_INFORMATION: ::DWORD = 0x2000;
-pub const PROCESS_ALL_ACCESS: ::DWORD = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFFF;
-//11007
-pub const THREAD_BASE_PRIORITY_LOWRT: ::DWORD = 15;
-pub const THREAD_BASE_PRIORITY_MAX: ::DWORD = 2;
-pub const THREAD_BASE_PRIORITY_MIN: ::DWORD = -2i32 as ::DWORD;
-pub const THREAD_BASE_PRIORITY_IDLE: ::DWORD = -15i32 as ::DWORD;
-//11018
-STRUCT!{struct QUOTA_LIMITS {
-    PagedPoolLimit: ::SIZE_T,
-    NonPagedPoolLimit: ::SIZE_T,
-    MinimumWorkingSetSize: ::SIZE_T,
-    MaximumWorkingSetSize: ::SIZE_T,
-    PagefileLimit: ::SIZE_T,
-    TimeLimit: ::LARGE_INTEGER,
-}}
-pub type PQUOTA_LIMITS = *mut QUOTA_LIMITS;
-pub const QUOTA_LIMITS_HARDWS_MIN_ENABLE: ::DWORD = 0x00000001;
-pub const QUOTA_LIMITS_HARDWS_MIN_DISABLE: ::DWORD = 0x00000002;
-pub const QUOTA_LIMITS_HARDWS_MAX_ENABLE: ::DWORD = 0x00000004;
-pub const QUOTA_LIMITS_HARDWS_MAX_DISABLE: ::DWORD = 0x00000008;
-pub const QUOTA_LIMITS_USE_DEFAULT_LIMITS: ::DWORD = 0x00000010;
-STRUCT!{struct RATE_QUOTA_LIMIT {
-    RateData: ::DWORD,
-    BitFields: ::DWORD,
-}}
-BITFIELD!(RATE_QUOTA_LIMIT BitFields: ::DWORD [
-    RatePercent set_RatePercent[0..7],
-    Reserved0 set_Reserved0[7..32],
-]);
-pub type PRATE_QUOTA_LIMIT = *mut RATE_QUOTA_LIMIT;
-STRUCT!{struct QUOTA_LIMITS_EX {
-    PagedPoolLimit: ::SIZE_T,
-    NonPagedPoolLimit: ::SIZE_T,
-    MinimumWorkingSetSize: ::SIZE_T,
-    MaximumWorkingSetSize: ::SIZE_T,
-    PagefileLimit: ::SIZE_T,
-    TimeLimit: ::LARGE_INTEGER,
-    WorkingSetLimit: ::SIZE_T,
-    Reserved2: ::SIZE_T,
-    Reserved3: ::SIZE_T,
-    Reserved4: ::SIZE_T,
-    Flags: ::DWORD,
-    CpuRateLimit: RATE_QUOTA_LIMIT,
-}}
-pub type PQUOTA_LIMITS_EX = *mut QUOTA_LIMITS_EX;
-STRUCT!{struct IO_COUNTERS {
-    ReadOperationCount: ::ULONGLONG,
-    WriteOperationCount: ::ULONGLONG,
-    OtherOperationCount: ::ULONGLONG,
-    ReadTransferCount: ::ULONGLONG,
-    WriteTransferCount: ::ULONGLONG,
-    OtherTransferCount: ::ULONGLONG,
-}}
-pub type PIO_COUNTERS = *mut IO_COUNTERS;
-//11192
-STRUCT!{struct JOBOBJECT_BASIC_LIMIT_INFORMATION {
-    PerProcessUserTimeLimit: ::LARGE_INTEGER,
-    PerJobUserTimeLimit: ::LARGE_INTEGER,
-    LimitFlags: ::DWORD,
-    MinimumWorkingSetSize: ::SIZE_T,
-    MaximumWorkingSetSize: ::SIZE_T,
-    ActiveProcessLimit: ::DWORD,
-    Affinity: ::ULONG_PTR,
-    PriorityClass: ::DWORD,
-    SchedulingClass: ::DWORD,
-}}
-pub type PJOBOBJECT_BASIC_LIMIT_INFORMATION = *mut JOBOBJECT_BASIC_LIMIT_INFORMATION;
-STRUCT!{struct JOBOBJECT_EXTENDED_LIMIT_INFORMATION {
-    BasicLimitInformation: JOBOBJECT_BASIC_LIMIT_INFORMATION,
-    IoInfo: IO_COUNTERS,
-    ProcessMemoryLimit: ::SIZE_T,
-    JobMemoryLimit: ::SIZE_T,
-    PeakProcessMemoryUsed: ::SIZE_T,
-    PeakJobMemoryUsed: ::SIZE_T,
-}}
-pub type PJOBOBJECT_EXTENDED_LIMIT_INFORMATION = *mut JOBOBJECT_EXTENDED_LIMIT_INFORMATION;
-STRUCT!{struct JOBOBJECT_BASIC_PROCESS_ID_LIST {
-    NumberOfAssignedProcesses: ::DWORD,
-    NumberOfProcessIdsInList: ::DWORD,
-    ProcessIdList: [::ULONG_PTR; 0],
-}}
-//11712
-pub const JOB_OBJECT_TERMINATE_AT_END_OF_JOB: ::DWORD = 0;
-pub const JOB_OBJECT_POST_AT_END_OF_JOB: ::DWORD = 1;
-pub const JOB_OBJECT_MSG_END_OF_JOB_TIME: ::DWORD = 1;
-pub const JOB_OBJECT_MSG_END_OF_PROCESS_TIME: ::DWORD = 2;
-pub const JOB_OBJECT_MSG_ACTIVE_PROCESS_LIMIT: ::DWORD = 3;
-pub const JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO: ::DWORD = 4;
-pub const JOB_OBJECT_MSG_NEW_PROCESS: ::DWORD = 6;
-pub const JOB_OBJECT_MSG_EXIT_PROCESS: ::DWORD = 7;
-pub const JOB_OBJECT_MSG_ABNORMAL_EXIT_PROCESS: ::DWORD = 8;
-pub const JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT: ::DWORD = 9;
-pub const JOB_OBJECT_MSG_JOB_MEMORY_LIMIT: ::DWORD = 10;
-pub const JOB_OBJECT_MSG_NOTIFICATION_LIMIT: ::DWORD = 11;
-pub const JOB_OBJECT_MSG_JOB_CYCLE_TIME_LIMIT: ::DWORD = 12;
-pub const JOB_OBJECT_MSG_MINIMUM: ::DWORD = 1;
-pub const JOB_OBJECT_MSG_MAXIMUM: ::DWORD = 12;
-pub const JOB_OBJECT_VALID_COMPLETION_FILTER: ::DWORD = ((1 << (JOB_OBJECT_MSG_MAXIMUM + 1)) - 1)
-    - ((1 << JOB_OBJECT_MSG_MINIMUM) - 1);
-pub const JOB_OBJECT_LIMIT_WORKINGSET: ::DWORD = 0x00000001;
-pub const JOB_OBJECT_LIMIT_PROCESS_TIME: ::DWORD = 0x00000002;
-pub const JOB_OBJECT_LIMIT_JOB_TIME: ::DWORD = 0x00000004;
-pub const JOB_OBJECT_LIMIT_ACTIVE_PROCESS: ::DWORD = 0x00000008;
-pub const JOB_OBJECT_LIMIT_AFFINITY: ::DWORD = 0x00000010;
-pub const JOB_OBJECT_LIMIT_PRIORITY_CLASS: ::DWORD = 0x00000020;
-pub const JOB_OBJECT_LIMIT_PRESERVE_JOB_TIME: ::DWORD = 0x00000040;
-pub const JOB_OBJECT_LIMIT_SCHEDULING_CLASS: ::DWORD = 0x00000080;
-pub const JOB_OBJECT_LIMIT_PROCESS_MEMORY: ::DWORD = 0x00000100;
-pub const JOB_OBJECT_LIMIT_JOB_MEMORY: ::DWORD = 0x00000200;
-pub const JOB_OBJECT_LIMIT_DIE_ON_UNHANDLED_EXCEPTION: ::DWORD = 0x00000400;
-pub const JOB_OBJECT_LIMIT_BREAKAWAY_OK: ::DWORD = 0x00000800;
-pub const JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK: ::DWORD = 0x00001000;
-pub const JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE: ::DWORD = 0x00002000;
-pub const JOB_OBJECT_LIMIT_SUBSET_AFFINITY: ::DWORD = 0x00004000;
-pub const JOB_OBJECT_LIMIT_JOB_READ_BYTES: ::DWORD = 0x00010000;
-pub const JOB_OBJECT_LIMIT_JOB_WRITE_BYTES: ::DWORD = 0x00020000;
-pub const JOB_OBJECT_LIMIT_RATE_CONTROL: ::DWORD = 0x00040000;
-pub const JOB_OBJECT_LIMIT_RESERVED3: ::DWORD = 0x00008000;
-pub const JOB_OBJECT_LIMIT_VALID_FLAGS: ::DWORD = 0x0007ffff;
-pub const JOB_OBJECT_BASIC_LIMIT_VALID_FLAGS: ::DWORD = 0x000000ff;
-pub const JOB_OBJECT_EXTENDED_LIMIT_VALID_FLAGS: ::DWORD = 0x00007fff;
-pub const JOB_OBJECT_NOTIFICATION_LIMIT_VALID_FLAGS: ::DWORD = 0x00070204;
-pub const JOB_OBJECT_RESERVED_LIMIT_VALID_FLAGS: ::DWORD = 0x0007ffff;
-pub const JOB_OBJECT_UILIMIT_NONE: ::DWORD = 0x00000000;
-pub const JOB_OBJECT_UILIMIT_HANDLES: ::DWORD = 0x00000001;
-pub const JOB_OBJECT_UILIMIT_READCLIPBOARD: ::DWORD = 0x00000002;
-pub const JOB_OBJECT_UILIMIT_WRITECLIPBOARD: ::DWORD = 0x00000004;
-pub const JOB_OBJECT_UILIMIT_SYSTEMPARAMETERS: ::DWORD = 0x00000008;
-pub const JOB_OBJECT_UILIMIT_DISPLAYSETTINGS: ::DWORD = 0x00000010;
-pub const JOB_OBJECT_UILIMIT_GLOBALATOMS: ::DWORD = 0x00000020;
-pub const JOB_OBJECT_UILIMIT_DESKTOP: ::DWORD = 0x00000040;
-pub const JOB_OBJECT_UILIMIT_EXITWINDOWS: ::DWORD = 0x00000080;
-pub const JOB_OBJECT_UILIMIT_ALL: ::DWORD = 0x000000FF;
-pub const JOB_OBJECT_UI_VALID_FLAGS: ::DWORD = 0x000000FF;
-pub const JOB_OBJECT_SECURITY_NO_ADMIN: ::DWORD = 0x00000001;
-pub const JOB_OBJECT_SECURITY_RESTRICTED_TOKEN: ::DWORD = 0x00000002;
-pub const JOB_OBJECT_SECURITY_ONLY_TOKEN: ::DWORD = 0x00000004;
-pub const JOB_OBJECT_SECURITY_FILTER_TOKENS: ::DWORD = 0x00000008;
-pub const JOB_OBJECT_SECURITY_VALID_FLAGS: ::DWORD = 0x0000000f;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_ENABLE: ::DWORD = 0x1;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_WEIGHT_BASED: ::DWORD = 0x2;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_HARD_CAP: ::DWORD = 0x4;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_NOTIFY: ::DWORD = 0x8;
-pub const JOB_OBJECT_CPU_RATE_CONTROL_VALID_FLAGS: ::DWORD = 0xf;
-ENUM!{enum JOBOBJECTINFOCLASS {
-    JobObjectBasicAccountingInformation = 1,
-    JobObjectBasicLimitInformation,
-    JobObjectBasicProcessIdList,
-    JobObjectBasicUIRestrictions,
-    JobObjectSecurityLimitInformation,
-    JobObjectEndOfJobTimeInformation,
-    JobObjectAssociateCompletionPortInformation,
-    JobObjectBasicAndIoAccountingInformation,
-    JobObjectExtendedLimitInformation,
-    JobObjectJobSetInformation,
-    JobObjectGroupInformation,
-    JobObjectNotificationLimitInformation,
-    JobObjectLimitViolationInformation,
-    JobObjectGroupInformationEx,
-    JobObjectCpuRateControlInformation,
-    JobObjectCompletionFilter,
-    JobObjectCompletionCounter,
-    JobObjectReserved1Information = 18,
-    JobObjectReserved2Information,
-    JobObjectReserved3Information,
-    JobObjectReserved4Information,
-    JobObjectReserved5Information,
-    JobObjectReserved6Information,
-    JobObjectReserved7Information,
-    JobObjectReserved8Information,
-    JobObjectReserved9Information,
-    MaxJobObjectInfoClass,
-}}
-//12063
-pub const SECTION_QUERY: ::DWORD = 0x0001;
-pub const SECTION_MAP_WRITE: ::DWORD = 0x0002;
-pub const SECTION_MAP_READ: ::DWORD = 0x0004;
-pub const SECTION_MAP_EXECUTE: ::DWORD = 0x0008;
-pub const SECTION_EXTEND_SIZE: ::DWORD = 0x0010;
-pub const SECTION_MAP_EXECUTE_EXPLICIT: ::DWORD = 0x0020;
-pub const SECTION_ALL_ACCESS: ::DWORD = STANDARD_RIGHTS_REQUIRED | SECTION_QUERY
-    | SECTION_MAP_WRITE | SECTION_MAP_READ | SECTION_MAP_EXECUTE | SECTION_EXTEND_SIZE;
-//12100
-pub const PAGE_NOACCESS: ::DWORD = 0x01;
-pub const PAGE_READONLY: ::DWORD = 0x02;
-pub const PAGE_READWRITE: ::DWORD = 0x04;
-pub const PAGE_WRITECOPY: ::DWORD = 0x08;
-pub const PAGE_EXECUTE: ::DWORD = 0x10;
-pub const PAGE_EXECUTE_READ: ::DWORD = 0x20;
-pub const PAGE_EXECUTE_READWRITE: ::DWORD = 0x40;
-pub const PAGE_EXECUTE_WRITECOPY: ::DWORD = 0x80;
-pub const PAGE_GUARD: ::DWORD = 0x100;
-pub const PAGE_NOCACHE: ::DWORD = 0x200;
-pub const PAGE_WRITECOMBINE: ::DWORD = 0x400;
-pub const PAGE_REVERT_TO_FILE_MAP: ::DWORD = 0x80000000;
-pub const PAGE_TARGETS_NO_UPDATE: ::DWORD = 0x40000000;
-pub const PAGE_TARGETS_INVALID: ::DWORD = 0x40000000;
-pub const MEM_COMMIT: ::DWORD = 0x1000;
-pub const MEM_RESERVE: ::DWORD = 0x2000;
-pub const MEM_DECOMMIT: ::DWORD = 0x4000;
-pub const MEM_RELEASE: ::DWORD = 0x8000;
-pub const MEM_FREE: ::DWORD = 0x10000;
-pub const MEM_PRIVATE: ::DWORD = 0x20000;
-pub const MEM_MAPPED: ::DWORD = 0x40000;
-pub const MEM_RESET: ::DWORD = 0x80000;
-pub const MEM_TOP_DOWN: ::DWORD = 0x100000;
-pub const MEM_WRITE_WATCH: ::DWORD = 0x200000;
-pub const MEM_PHYSICAL: ::DWORD = 0x400000;
-pub const MEM_ROTATE: ::DWORD = 0x800000;
-pub const MEM_DIFFERENT_IMAGE_BASE_OK: ::DWORD = 0x800000;
-pub const MEM_RESET_UNDO: ::DWORD = 0x1000000;
-pub const MEM_LARGE_PAGES: ::DWORD = 0x20000000;
-pub const MEM_4MB_PAGES: ::DWORD = 0x80000000;
-pub const SEC_FILE: ::DWORD = 0x800000;
-pub const SEC_IMAGE: ::DWORD = 0x1000000;
-pub const SEC_PROTECTED_IMAGE: ::DWORD = 0x2000000;
-pub const SEC_RESERVE: ::DWORD = 0x4000000;
-pub const SEC_COMMIT: ::DWORD = 0x8000000;
-pub const SEC_NOCACHE: ::DWORD = 0x10000000;
-pub const SEC_WRITECOMBINE: ::DWORD = 0x40000000;
-pub const SEC_LARGE_PAGES: ::DWORD = 0x80000000;
-pub const SEC_IMAGE_NO_EXECUTE: ::DWORD = (SEC_IMAGE | SEC_NOCACHE);
-pub const MEM_IMAGE: ::DWORD = SEC_IMAGE;
-pub const WRITE_WATCH_FLAG_RESET: ::DWORD = 0x01;
-pub const MEM_UNMAP_WITH_TRANSIENT_BOOST: ::DWORD = 0x01;
-//12217
-pub const FILE_READ_DATA: ::DWORD = 0x0001;
-pub const FILE_LIST_DIRECTORY: ::DWORD = 0x0001;
-pub const FILE_WRITE_DATA: ::DWORD = 0x0002;
-pub const FILE_ADD_FILE: ::DWORD = 0x0002;
-pub const FILE_APPEND_DATA: ::DWORD = 0x0004;
-pub const FILE_ADD_SUBDIRECTORY: ::DWORD = 0x0004;
-pub const FILE_CREATE_PIPE_INSTANCE: ::DWORD = 0x0004;
-pub const FILE_READ_EA: ::DWORD = 0x0008;
-pub const FILE_WRITE_EA: ::DWORD = 0x0010;
-pub const FILE_EXECUTE: ::DWORD = 0x0020;
-pub const FILE_TRAVERSE: ::DWORD = 0x0020;
-pub const FILE_DELETE_CHILD: ::DWORD = 0x0040;
-pub const FILE_READ_ATTRIBUTES: ::DWORD = 0x0080;
-pub const FILE_WRITE_ATTRIBUTES: ::DWORD = 0x0100;
-pub const FILE_ALL_ACCESS: ::DWORD = STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1FF;
-pub const FILE_GENERIC_READ: ::DWORD = STANDARD_RIGHTS_READ | FILE_READ_DATA
-    | FILE_READ_ATTRIBUTES | FILE_READ_EA | SYNCHRONIZE;
-pub const FILE_GENERIC_WRITE: ::DWORD = STANDARD_RIGHTS_WRITE | FILE_WRITE_DATA
-    | FILE_WRITE_ATTRIBUTES | FILE_WRITE_EA | FILE_APPEND_DATA | SYNCHRONIZE;
-pub const FILE_GENERIC_EXECUTE: ::DWORD = STANDARD_RIGHTS_EXECUTE | FILE_READ_ATTRIBUTES
-    | FILE_EXECUTE | SYNCHRONIZE;
-pub const FILE_SHARE_READ: ::DWORD = 0x00000001;
-pub const FILE_SHARE_WRITE: ::DWORD = 0x00000002;
-pub const FILE_SHARE_DELETE: ::DWORD = 0x00000004;
-pub const FILE_ATTRIBUTE_READONLY: ::DWORD = 0x00000001;
-pub const FILE_ATTRIBUTE_HIDDEN: ::DWORD = 0x00000002;
-pub const FILE_ATTRIBUTE_SYSTEM: ::DWORD = 0x00000004;
-pub const FILE_ATTRIBUTE_DIRECTORY: ::DWORD = 0x00000010;
-pub const FILE_ATTRIBUTE_ARCHIVE: ::DWORD = 0x00000020;
-pub const FILE_ATTRIBUTE_DEVICE: ::DWORD = 0x00000040;
-pub const FILE_ATTRIBUTE_NORMAL: ::DWORD = 0x00000080;
-pub const FILE_ATTRIBUTE_TEMPORARY: ::DWORD = 0x00000100;
-pub const FILE_ATTRIBUTE_SPARSE_FILE: ::DWORD = 0x00000200;
-pub const FILE_ATTRIBUTE_REPARSE_POINT: ::DWORD = 0x00000400;
-pub const FILE_ATTRIBUTE_COMPRESSED: ::DWORD = 0x00000800;
-pub const FILE_ATTRIBUTE_OFFLINE: ::DWORD = 0x00001000;
-pub const FILE_ATTRIBUTE_NOT_CONTENT_INDEXED: ::DWORD = 0x00002000;
-pub const FILE_ATTRIBUTE_ENCRYPTED: ::DWORD = 0x00004000;
-pub const FILE_ATTRIBUTE_INTEGRITY_STREAM: ::DWORD = 0x00008000;
-pub const FILE_ATTRIBUTE_VIRTUAL: ::DWORD = 0x00010000;
-pub const FILE_ATTRIBUTE_NO_SCRUB_DATA: ::DWORD = 0x00020000;
-pub const FILE_ATTRIBUTE_EA: ::DWORD = 0x00040000;
-pub const FILE_NOTIFY_CHANGE_FILE_NAME: ::DWORD = 0x00000001;
-pub const FILE_NOTIFY_CHANGE_DIR_NAME: ::DWORD = 0x00000002;
-pub const FILE_NOTIFY_CHANGE_ATTRIBUTES: ::DWORD = 0x00000004;
-pub const FILE_NOTIFY_CHANGE_SIZE: ::DWORD = 0x00000008;
-pub const FILE_NOTIFY_CHANGE_LAST_WRITE: ::DWORD = 0x00000010;
-pub const FILE_NOTIFY_CHANGE_LAST_ACCESS: ::DWORD = 0x00000020;
-pub const FILE_NOTIFY_CHANGE_CREATION: ::DWORD = 0x00000040;
-pub const FILE_NOTIFY_CHANGE_SECURITY: ::DWORD = 0x00000100;
-pub const FILE_ACTION_ADDED: ::DWORD = 0x00000001;
-pub const FILE_ACTION_REMOVED: ::DWORD = 0x00000002;
-pub const FILE_ACTION_MODIFIED: ::DWORD = 0x00000003;
-pub const FILE_ACTION_RENAMED_OLD_NAME: ::DWORD = 0x00000004;
-pub const FILE_ACTION_RENAMED_NEW_NAME: ::DWORD = 0x00000005;
-pub const MAILSLOT_NO_MESSAGE: ::DWORD = 0xFFFFFFFF;
-pub const MAILSLOT_WAIT_FOREVER: ::DWORD = 0xFFFFFFFF;
-pub const FILE_CASE_SENSITIVE_SEARCH: ::DWORD = 0x00000001;
-pub const FILE_CASE_PRESERVED_NAMES: ::DWORD = 0x00000002;
-pub const FILE_UNICODE_ON_DISK: ::DWORD = 0x00000004;
-pub const FILE_PERSISTENT_ACLS: ::DWORD = 0x00000008;
-pub const FILE_FILE_COMPRESSION: ::DWORD = 0x00000010;
-pub const FILE_VOLUME_QUOTAS: ::DWORD = 0x00000020;
-pub const FILE_SUPPORTS_SPARSE_FILES: ::DWORD = 0x00000040;
-pub const FILE_SUPPORTS_REPARSE_POINTS: ::DWORD = 0x00000080;
-pub const FILE_SUPPORTS_REMOTE_STORAGE: ::DWORD = 0x00000100;
-pub const FILE_VOLUME_IS_COMPRESSED: ::DWORD = 0x00008000;
-pub const FILE_SUPPORTS_OBJECT_IDS: ::DWORD = 0x00010000;
-pub const FILE_SUPPORTS_ENCRYPTION: ::DWORD = 0x00020000;
-pub const FILE_NAMED_STREAMS: ::DWORD = 0x00040000;
-pub const FILE_READ_ONLY_VOLUME: ::DWORD = 0x00080000;
-pub const FILE_SEQUENTIAL_WRITE_ONCE: ::DWORD = 0x00100000;
-pub const FILE_SUPPORTS_TRANSACTIONS: ::DWORD = 0x00200000;
-pub const FILE_SUPPORTS_HARD_LINKS: ::DWORD = 0x00400000;
-pub const FILE_SUPPORTS_EXTENDED_ATTRIBUTES: ::DWORD = 0x00800000;
-pub const FILE_SUPPORTS_OPEN_BY_FILE_ID: ::DWORD = 0x01000000;
-pub const FILE_SUPPORTS_USN_JOURNAL: ::DWORD = 0x02000000;
-pub const FILE_SUPPORTS_INTEGRITY_STREAMS: ::DWORD = 0x04000000;
-pub const FILE_INVALID_FILE_ID: ::LONGLONG = -1;
-STRUCT!{struct FILE_ID_128 {
-    Identifier: [::BYTE; 16],
-}}
-pub type PFILE_ID_128 = *mut FILE_ID_128;
-STRUCT!{struct FILE_NOTIFY_INFORMATION {
-    NextEntryOffset: ::DWORD,
-    Action: ::DWORD,
-    FileNameLength: ::DWORD,
-    FileName: [::WCHAR; 0],
-}}
-STRUCT!{struct FILE_SEGMENT_ELEMENT {
-    Buffer: ::PVOID64,
-    Alignment: ::ULONGLONG,
-}}
-pub type PFILE_SEGMENT_ELEMENT = *mut FILE_SEGMENT_ELEMENT;
-//12475
-pub const IO_REPARSE_TAG_MOUNT_POINT: ::DWORD = 0xA0000003;
-pub const IO_REPARSE_TAG_HSM: ::DWORD = 0xC0000004;
-pub const IO_REPARSE_TAG_HSM2: ::DWORD = 0x80000006;
-pub const IO_REPARSE_TAG_SIS: ::DWORD = 0x80000007;
-pub const IO_REPARSE_TAG_WIM: ::DWORD = 0x80000008;
-pub const IO_REPARSE_TAG_CSV: ::DWORD = 0x80000009;
-pub const IO_REPARSE_TAG_DFS: ::DWORD = 0x8000000A;
-pub const IO_REPARSE_TAG_SYMLINK: ::DWORD = 0xA000000C;
-pub const IO_REPARSE_TAG_DFSR: ::DWORD = 0x80000012;
-pub const IO_REPARSE_TAG_DEDUP: ::DWORD = 0x80000013;
-pub const IO_REPARSE_TAG_NFS: ::DWORD = 0x80000014;
-pub const IO_REPARSE_TAG_FILE_PLACEHOLDER: ::DWORD = 0x80000015;
-pub const IO_REPARSE_TAG_WOF: ::DWORD = 0x80000017;
-//12788
-pub const DUPLICATE_CLOSE_SOURCE: ::DWORD = 0x00000001;
-pub const DUPLICATE_SAME_ACCESS: ::DWORD = 0x00000002;
-//14708
-STRUCT!{struct PROCESSOR_POWER_POLICY_INFO {
-    TimeCheck: ::DWORD,
-    DemoteLimit: ::DWORD,
-    PromoteLimit: ::DWORD,
-    DemotePercent: ::BYTE,
-    PromotePercent: ::BYTE,
-    Spare: [::BYTE; 2],
-    Reserved: ::DWORD,
-}}
-BITFIELD!(PROCESSOR_POWER_POLICY_INFO Reserved: ::DWORD [
-    AllowDemotion set_AllowDemotion[0..1],
-    AllowPromotion set_AllowPromotion[1..2],
-]);
-pub type PPROCESSOR_POWER_POLICY_INFO = *mut PROCESSOR_POWER_POLICY_INFO;
-//15000
-STRUCT!{struct IMAGE_FILE_HEADER {
-    Machine: ::WORD,
-    NumberOfSections: ::WORD,
-    TimeDateStamp: ::DWORD,
-    PointerToSymbolTable: ::DWORD,
-    NumberOfSymbols: ::DWORD,
-    SizeOfOptionalHeader: ::WORD,
-    Characteristics: ::WORD,
-}}
-pub type PIMAGE_FILE_HEADER = *mut IMAGE_FILE_HEADER;
-pub const IMAGE_SIZEOF_FILE_HEADER: usize = 20;
-pub const IMAGE_FILE_RELOCS_STRIPPED: ::WORD = 0x0001;
-pub const IMAGE_FILE_EXECUTABLE_IMAGE: ::WORD = 0x0002;
-pub const IMAGE_FILE_LINE_NUMS_STRIPPED: ::WORD = 0x0004;
-pub const IMAGE_FILE_LOCAL_SYMS_STRIPPED: ::WORD = 0x0008;
-pub const IMAGE_FILE_AGGRESIVE_WS_TRIM: ::WORD = 0x0010;
-pub const IMAGE_FILE_LARGE_ADDRESS_AWARE: ::WORD = 0x0020;
-pub const IMAGE_FILE_BYTES_REVERSED_LO: ::WORD = 0x0080;
-pub const IMAGE_FILE_32BIT_MACHINE: ::WORD = 0x0100;
-pub const IMAGE_FILE_DEBUG_STRIPPED: ::WORD = 0x0200;
-pub const IMAGE_FILE_REMOVABLE_RUN_FROM_SWAP: ::WORD = 0x0400;
-pub const IMAGE_FILE_NET_RUN_FROM_SWAP: ::WORD = 0x0800;
-pub const IMAGE_FILE_SYSTEM: ::WORD = 0x1000;
-pub const IMAGE_FILE_DLL: ::WORD = 0x2000;
-pub const IMAGE_FILE_UP_SYSTEM_ONLY: ::WORD = 0x4000;
-pub const IMAGE_FILE_BYTES_REVERSED_HI: ::WORD = 0x8000;
-pub const IMAGE_FILE_MACHINE_UNKNOWN: ::WORD = 0;
-pub const IMAGE_FILE_MACHINE_I386: ::WORD = 0x014c;
-pub const IMAGE_FILE_MACHINE_R3000: ::WORD = 0x0162;
-pub const IMAGE_FILE_MACHINE_R4000: ::WORD = 0x0166;
-pub const IMAGE_FILE_MACHINE_R10000: ::WORD = 0x0168;
-pub const IMAGE_FILE_MACHINE_WCEMIPSV2: ::WORD = 0x0169;
-pub const IMAGE_FILE_MACHINE_ALPHA: ::WORD = 0x0184;
-pub const IMAGE_FILE_MACHINE_SH3: ::WORD = 0x01a2;
-pub const IMAGE_FILE_MACHINE_SH3DSP: ::WORD = 0x01a3;
-pub const IMAGE_FILE_MACHINE_SH3E: ::WORD = 0x01a4;
-pub const IMAGE_FILE_MACHINE_SH4: ::WORD = 0x01a6;
-pub const IMAGE_FILE_MACHINE_SH5: ::WORD = 0x01a8;
-pub const IMAGE_FILE_MACHINE_ARM: ::WORD = 0x01c0;
-pub const IMAGE_FILE_MACHINE_THUMB: ::WORD = 0x01c2;
-pub const IMAGE_FILE_MACHINE_ARMNT: ::WORD = 0x01c4;
-pub const IMAGE_FILE_MACHINE_AM33: ::WORD = 0x01d3;
-pub const IMAGE_FILE_MACHINE_POWERPC: ::WORD = 0x01F0;
-pub const IMAGE_FILE_MACHINE_POWERPCFP: ::WORD = 0x01f1;
-pub const IMAGE_FILE_MACHINE_IA64: ::WORD = 0x0200;
-pub const IMAGE_FILE_MACHINE_MIPS16: ::WORD = 0x0266;
-pub const IMAGE_FILE_MACHINE_ALPHA64: ::WORD = 0x0284;
-pub const IMAGE_FILE_MACHINE_MIPSFPU: ::WORD = 0x0366;
-pub const IMAGE_FILE_MACHINE_MIPSFPU16: ::WORD = 0x0466;
-pub const IMAGE_FILE_MACHINE_AXP64: ::WORD = IMAGE_FILE_MACHINE_ALPHA64;
-pub const IMAGE_FILE_MACHINE_TRICORE: ::WORD = 0x0520;
-pub const IMAGE_FILE_MACHINE_CEF: ::WORD = 0x0CEF;
-pub const IMAGE_FILE_MACHINE_EBC: ::WORD = 0x0EBC;
-pub const IMAGE_FILE_MACHINE_AMD64: ::WORD = 0x8664;
-pub const IMAGE_FILE_MACHINE_M32R: ::WORD = 0x9041;
-pub const IMAGE_FILE_MACHINE_CEE: ::WORD = 0xC0EE;
-STRUCT!{struct IMAGE_DATA_DIRECTORY {
-    VirtualAddress: ::DWORD,
-    Size: ::DWORD,
-}}
-pub type PIMAGE_DATA_DIRECTORY = *mut IMAGE_DATA_DIRECTORY;
-pub const IMAGE_NUMBEROF_DIRECTORY_ENTRIES: usize = 16;
-STRUCT!{struct IMAGE_OPTIONAL_HEADER32 {
-    Magic: ::WORD,
-    MajorLinkerVersion: ::BYTE,
-    MinorLinkerVersion: ::BYTE,
-    SizeOfCode: ::DWORD,
-    SizeOfInitializedData: ::DWORD,
-    SizeOfUninitializedData: ::DWORD,
-    AddressOfEntryPoint: ::DWORD,
-    BaseOfCode: ::DWORD,
-    BaseOfData: ::DWORD,
-    ImageBase: ::DWORD,
-    SectionAlignment: ::DWORD,
-    FileAlignment: ::DWORD,
-    MajorOperatingSystemVersion: ::WORD,
-    MinorOperatingSystemVersion: ::WORD,
-    MajorImageVersion: ::WORD,
-    MinorImageVersion: ::WORD,
-    MajorSubsystemVersion: ::WORD,
-    MinorSubsystemVersion: ::WORD,
-    Win32VersionValue: ::DWORD,
-    SizeOfImage: ::DWORD,
-    SizeOfHeaders: ::DWORD,
-    CheckSum: ::DWORD,
-    Subsystem: ::WORD,
-    DllCharacteristics: ::WORD,
-    SizeOfStackReserve: ::DWORD,
-    SizeOfStackCommit: ::DWORD,
-    SizeOfHeapReserve: ::DWORD,
-    SizeOfHeapCommit: ::DWORD,
-    LoaderFlags: ::DWORD,
-    NumberOfRvaAndSizes: ::DWORD,
-    DataDirectory: [IMAGE_DATA_DIRECTORY; IMAGE_NUMBEROF_DIRECTORY_ENTRIES],
-}}
-pub type PIMAGE_OPTIONAL_HEADER32 = *mut IMAGE_OPTIONAL_HEADER32;
-STRUCT!{struct IMAGE_ROM_OPTIONAL_HEADER {
-    Magic: ::WORD,
-    MajorLinkerVersion: ::BYTE,
-    MinorLinkerVersion: ::BYTE,
-    SizeOfCode: ::DWORD,
-    SizeOfInitializedData: ::DWORD,
-    SizeOfUninitializedData: ::DWORD,
-    AddressOfEntryPoint: ::DWORD,
-    BaseOfCode: ::DWORD,
-    BaseOfData: ::DWORD,
-    BaseOfBss: ::DWORD,
-    GprMask: ::DWORD,
-    CprMask: [::DWORD; 4],
-    GpValue: ::DWORD,
-}}
-pub type PIMAGE_ROM_OPTIONAL_HEADER = *mut IMAGE_ROM_OPTIONAL_HEADER;
-STRUCT!{struct IMAGE_OPTIONAL_HEADER64 {
-    Magic: ::WORD,
-    MajorLinkerVersion: ::BYTE,
-    MinorLinkerVersion: ::BYTE,
-    SizeOfCode: ::DWORD,
-    SizeOfInitializedData: ::DWORD,
-    SizeOfUninitializedData: ::DWORD,
-    AddressOfEntryPoint: ::DWORD,
-    BaseOfCode: ::DWORD,
-    ImageBase: ::ULONGLONG,
-    SectionAlignment: ::DWORD,
-    FileAlignment: ::DWORD,
-    MajorOperatingSystemVersion: ::WORD,
-    MinorOperatingSystemVersion: ::WORD,
-    MajorImageVersion: ::WORD,
-    MinorImageVersion: ::WORD,
-    MajorSubsystemVersion: ::WORD,
-    MinorSubsystemVersion: ::WORD,
-    Win32VersionValue: ::DWORD,
-    SizeOfImage: ::DWORD,
-    SizeOfHeaders: ::DWORD,
-    CheckSum: ::DWORD,
-    Subsystem: ::WORD,
-    DllCharacteristics: ::WORD,
-    SizeOfStackReserve: ULONGLONG,
-    SizeOfStackCommit: ULONGLONG,
-    SizeOfHeapReserve: ULONGLONG,
-    SizeOfHeapCommit: ULONGLONG,
-    LoaderFlags: ::DWORD,
-    NumberOfRvaAndSizes: ::DWORD,
-    DataDirectory: [IMAGE_DATA_DIRECTORY; IMAGE_NUMBEROF_DIRECTORY_ENTRIES],
-}}
-pub type PIMAGE_OPTIONAL_HEADER64 = *mut IMAGE_OPTIONAL_HEADER64;
-pub const IMAGE_NT_OPTIONAL_HDR32_MAGIC: ::WORD = 0x10b;
-pub const IMAGE_NT_OPTIONAL_HDR64_MAGIC: ::WORD = 0x20b;
-pub const IMAGE_ROM_OPTIONAL_HDR_MAGIC: ::WORD = 0x107;
-#[cfg(target_arch = "x86_64")]
-pub type IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER64;
-#[cfg(target_arch = "x86_64")]
-pub type PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER64;
-#[cfg(target_arch = "x86")]
-pub type IMAGE_OPTIONAL_HEADER = IMAGE_OPTIONAL_HEADER32;
-#[cfg(target_arch = "x86")]
-pub type PIMAGE_OPTIONAL_HEADER = PIMAGE_OPTIONAL_HEADER32;
-STRUCT!{struct IMAGE_NT_HEADERS64 {
-    Signature: ::DWORD,
-    FileHeader: IMAGE_FILE_HEADER,
-    OptionalHeader: IMAGE_OPTIONAL_HEADER64,
-}}
-pub type PIMAGE_NT_HEADERS64 = *mut IMAGE_NT_HEADERS64;
-STRUCT!{struct IMAGE_NT_HEADERS32 {
-    Signature: ::DWORD,
-    FileHeader: IMAGE_FILE_HEADER,
-    OptionalHeader: IMAGE_OPTIONAL_HEADER32,
-}}
-pub type PIMAGE_NT_HEADERS32 = *mut IMAGE_NT_HEADERS32;
-STRUCT!{struct IMAGE_ROM_HEADERS {
-    FileHeader: IMAGE_FILE_HEADER,
-    OptionalHeader: IMAGE_ROM_OPTIONAL_HEADER,
-}}
-pub type PIMAGE_ROM_HEADERS = *mut IMAGE_ROM_HEADERS;
-#[cfg(target_arch = "x86_64")]
-pub type IMAGE_NT_HEADERS = IMAGE_NT_HEADERS64;
-#[cfg(target_arch = "x86_64")]
-pub type PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS64;
-#[cfg(target_arch = "x86")]
-pub type IMAGE_NT_HEADERS = IMAGE_NT_HEADERS32;
-#[cfg(target_arch = "x86")]
-pub type PIMAGE_NT_HEADERS = PIMAGE_NT_HEADERS32;
-pub const IMAGE_SUBSYSTEM_UNKNOWN: ::WORD = 0;
-pub const IMAGE_SUBSYSTEM_NATIVE: ::WORD = 1;
-pub const IMAGE_SUBSYSTEM_WINDOWS_GUI: ::WORD = 2;
-pub const IMAGE_SUBSYSTEM_WINDOWS_CUI: ::WORD = 3;
-pub const IMAGE_SUBSYSTEM_OS2_CUI: ::WORD = 5;
-pub const IMAGE_SUBSYSTEM_POSIX_CUI: ::WORD = 7;
-pub const IMAGE_SUBSYSTEM_NATIVE_WINDOWS: ::WORD = 8;
-pub const IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: ::WORD = 9;
-pub const IMAGE_SUBSYSTEM_EFI_APPLICATION: ::WORD = 10;
-pub const IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: ::WORD = 11;
-pub const IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: ::WORD = 12;
-pub const IMAGE_SUBSYSTEM_EFI_ROM: ::WORD = 13;
-pub const IMAGE_SUBSYSTEM_XBOX: ::WORD = 14;
-pub const IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION: ::WORD = 16;
-pub const IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA: ::WORD = 0x0020;
-pub const IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE: ::WORD = 0x0040;
-pub const IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY: ::WORD = 0x0080;
-pub const IMAGE_DLLCHARACTERISTICS_NX_COMPAT: ::WORD = 0x0100;
-pub const IMAGE_DLLCHARACTERISTICS_NO_ISOLATION: ::WORD = 0x0200;
-pub const IMAGE_DLLCHARACTERISTICS_NO_SEH: ::WORD = 0x0400;
-pub const IMAGE_DLLCHARACTERISTICS_NO_BIND: ::WORD = 0x0800;
-pub const IMAGE_DLLCHARACTERISTICS_APPCONTAINER: ::WORD = 0x1000;
-pub const IMAGE_DLLCHARACTERISTICS_WDM_DRIVER: ::WORD = 0x2000;
-pub const IMAGE_DLLCHARACTERISTICS_GUARD_CF: ::WORD = 0x4000;
-pub const IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE: ::WORD = 0x8000;
-pub const IMAGE_DIRECTORY_ENTRY_EXPORT: ::WORD = 0;
-pub const IMAGE_DIRECTORY_ENTRY_IMPORT: ::WORD = 1;
-pub const IMAGE_DIRECTORY_ENTRY_RESOURCE: ::WORD = 2;
-pub const IMAGE_DIRECTORY_ENTRY_EXCEPTION: ::WORD = 3;
-pub const IMAGE_DIRECTORY_ENTRY_SECURITY: ::WORD = 4;
-pub const IMAGE_DIRECTORY_ENTRY_BASERELOC: ::WORD = 5;
-pub const IMAGE_DIRECTORY_ENTRY_DEBUG: ::WORD = 6;
-pub const IMAGE_DIRECTORY_ENTRY_ARCHITECTURE: ::WORD = 7;
-pub const IMAGE_DIRECTORY_ENTRY_GLOBALPTR: ::WORD = 8;
-pub const IMAGE_DIRECTORY_ENTRY_TLS: ::WORD = 9;
-pub const IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG: ::WORD = 10;
-pub const IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT: ::WORD = 11;
-pub const IMAGE_DIRECTORY_ENTRY_IAT: ::WORD = 12;
-pub const IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT: ::WORD = 13;
-pub const IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR: ::WORD = 14;
-STRUCT!{struct ANON_OBJECT_HEADER {
-    Sig1: ::WORD,
-    Sig2: ::WORD,
-    Version: ::WORD,
-    Machine: ::WORD,
-    TimeDateStamp: ::DWORD,
-    ClassID: ::CLSID,
-    SizeOfData: ::DWORD,
-}}
-STRUCT!{struct ANON_OBJECT_HEADER_V2 {
-    Sig1: ::WORD,
-    Sig2: ::WORD,
-    Version: ::WORD,
-    Machine: ::WORD,
-    TimeDateStamp: ::DWORD,
-    ClassID: ::CLSID,
-    SizeOfData: ::DWORD,
-    Flags: ::DWORD,
-    MetaDataSize: ::DWORD,
-    MetaDataOffset: ::DWORD,
-}}
-STRUCT!{struct ANON_OBJECT_HEADER_BIGOBJ {
-    Sig1: ::WORD,
-    Sig2: ::WORD,
-    Version: ::WORD,
-    Machine: ::WORD,
-    TimeDateStamp: ::DWORD,
-    ClassID: ::CLSID,
-    SizeOfData: ::DWORD,
-    Flags: ::DWORD,
-    MetaDataSize: ::DWORD,
-    MetaDataOffset: ::DWORD,
-    NumberOfSections: ::DWORD,
-    PointerToSymbolTable: ::DWORD,
-    NumberOfSymbols: ::DWORD,
-}}
-pub const IMAGE_SIZEOF_SHORT_NAME: usize = 8;
-STRUCT!{struct IMAGE_SECTION_HEADER {
-    Name: [::BYTE; IMAGE_SIZEOF_SHORT_NAME],
-    PhysicalAddressOrVirtualSize: ::DWORD,
-    VirtualAddress: ::DWORD,
-    SizeOfRawData: ::DWORD,
-    PointerToRawData: ::DWORD,
-    PointerToRelocations: ::DWORD,
-    PointerToLinenumbers: ::DWORD,
-    NumberOfRelocations: ::WORD,
-    NumberOfLinenumbers: ::WORD,
-    Characteristics: ::DWORD,
-}}
-pub type PIMAGE_SECTION_HEADER = *mut IMAGE_SECTION_HEADER;
-pub const IMAGE_SIZEOF_SECTION_HEADER: usize = 40;
-pub const IMAGE_SCN_TYPE_NO_PAD: ::DWORD = 0x00000008;
-pub const IMAGE_SCN_CNT_CODE: ::DWORD = 0x00000020;
-pub const IMAGE_SCN_CNT_INITIALIZED_DATA: ::DWORD = 0x00000040;
-pub const IMAGE_SCN_CNT_UNINITIALIZED_DATA: ::DWORD = 0x00000080;
-pub const IMAGE_SCN_LNK_OTHER: ::DWORD = 0x00000100;
-pub const IMAGE_SCN_LNK_INFO: ::DWORD = 0x00000200;
-pub const IMAGE_SCN_LNK_REMOVE: ::DWORD = 0x00000800;
-pub const IMAGE_SCN_LNK_COMDAT: ::DWORD = 0x00001000;
-pub const IMAGE_SCN_NO_DEFER_SPEC_EXC: ::DWORD = 0x00004000;
-pub const IMAGE_SCN_GPREL: ::DWORD = 0x00008000;
-pub const IMAGE_SCN_MEM_FARDATA: ::DWORD = 0x00008000;
-pub const IMAGE_SCN_MEM_PURGEABLE: ::DWORD = 0x00020000;
-pub const IMAGE_SCN_MEM_16BIT: ::DWORD = 0x00020000;
-pub const IMAGE_SCN_MEM_LOCKED: ::DWORD = 0x00040000;
-pub const IMAGE_SCN_MEM_PRELOAD: ::DWORD = 0x00080000;
-pub const IMAGE_SCN_ALIGN_1BYTES: ::DWORD = 0x00100000;
-pub const IMAGE_SCN_ALIGN_2BYTES: ::DWORD = 0x00200000;
-pub const IMAGE_SCN_ALIGN_4BYTES: ::DWORD = 0x00300000;
-pub const IMAGE_SCN_ALIGN_8BYTES: ::DWORD = 0x00400000;
-pub const IMAGE_SCN_ALIGN_16BYTES: ::DWORD = 0x00500000;
-pub const IMAGE_SCN_ALIGN_32BYTES: ::DWORD = 0x00600000;
-pub const IMAGE_SCN_ALIGN_64BYTES: ::DWORD = 0x00700000;
-pub const IMAGE_SCN_ALIGN_128BYTES: ::DWORD = 0x00800000;
-pub const IMAGE_SCN_ALIGN_256BYTES: ::DWORD = 0x00900000;
-pub const IMAGE_SCN_ALIGN_512BYTES: ::DWORD = 0x00A00000;
-pub const IMAGE_SCN_ALIGN_1024BYTES: ::DWORD = 0x00B00000;
-pub const IMAGE_SCN_ALIGN_2048BYTES: ::DWORD = 0x00C00000;
-pub const IMAGE_SCN_ALIGN_4096BYTES: ::DWORD = 0x00D00000;
-pub const IMAGE_SCN_ALIGN_8192BYTES: ::DWORD = 0x00E00000;
-pub const IMAGE_SCN_ALIGN_MASK: ::DWORD = 0x00F00000;
-pub const IMAGE_SCN_LNK_NRELOC_OVFL: ::DWORD = 0x01000000;
-pub const IMAGE_SCN_MEM_DISCARDABLE: ::DWORD = 0x02000000;
-pub const IMAGE_SCN_MEM_NOT_CACHED: ::DWORD = 0x04000000;
-pub const IMAGE_SCN_MEM_NOT_PAGED: ::DWORD = 0x08000000;
-pub const IMAGE_SCN_MEM_SHARED: ::DWORD = 0x10000000;
-pub const IMAGE_SCN_MEM_EXECUTE: ::DWORD = 0x20000000;
-pub const IMAGE_SCN_MEM_READ: ::DWORD = 0x40000000;
-pub const IMAGE_SCN_MEM_WRITE: ::DWORD = 0x80000000;
-pub const IMAGE_SCN_SCALE_INDEX: ::DWORD = 0x00000001;
-//16590
-STRUCT!{struct IMAGE_DEBUG_DIRECTORY {
-    Characteristics: ::DWORD,
-    TimeDateStamp: ::DWORD,
-    MajorVersion: ::WORD,
-    MinorVersion: ::WORD,
-    Type: ::DWORD,
-    SizeOfData: ::DWORD,
-    AddressOfRawData: ::DWORD,
-    PointerToRawData: ::DWORD,
-}}
-pub type PIMAGE_DEBUG_DIRECTORY = *mut IMAGE_DEBUG_DIRECTORY;
-pub const IMAGE_DEBUG_TYPE_UNKNOWN: ::DWORD = 0;
-pub const IMAGE_DEBUG_TYPE_COFF: ::DWORD = 1;
-pub const IMAGE_DEBUG_TYPE_CODEVIEW: ::DWORD = 2;
-pub const IMAGE_DEBUG_TYPE_FPO: ::DWORD = 3;
-pub const IMAGE_DEBUG_TYPE_MISC: ::DWORD = 4;
-pub const IMAGE_DEBUG_TYPE_EXCEPTION: ::DWORD = 5;
-pub const IMAGE_DEBUG_TYPE_FIXUP: ::DWORD = 6;
-pub const IMAGE_DEBUG_TYPE_OMAP_TO_SRC: ::DWORD = 7;
-pub const IMAGE_DEBUG_TYPE_OMAP_FROM_SRC: ::DWORD = 8;
-pub const IMAGE_DEBUG_TYPE_BORLAND: ::DWORD = 9;
-pub const IMAGE_DEBUG_TYPE_RESERVED10: ::DWORD = 10;
-pub const IMAGE_DEBUG_TYPE_CLSID: ::DWORD = 11;
-STRUCT!{struct IMAGE_COFF_SYMBOLS_HEADER {
-    NumberOfSymbols: ::DWORD,
-    LvaToFirstSymbol: ::DWORD,
-    NumberOfLinenumbers: ::DWORD,
-    LvaToFirstLinenumber: ::DWORD,
-    RvaToFirstByteOfCode: ::DWORD,
-    RvaToLastByteOfCode: ::DWORD,
-    RvaToFirstByteOfData: ::DWORD,
-    RvaToLastByteOfData: ::DWORD,
-}}
-pub type PIMAGE_COFF_SYMBOLS_HEADER = *mut IMAGE_COFF_SYMBOLS_HEADER;
-STRUCT!{struct IMAGE_RUNTIME_FUNCTION_ENTRY {
-    BeginAddress: ::DWORD,
-    EndAddress: ::DWORD,
-    UnwindInfoAddress: ::DWORD,
-}}
-UNION!(IMAGE_RUNTIME_FUNCTION_ENTRY, UnwindInfoAddress, UnwindData, UnwindData_mut, ::DWORD);
-pub type PIMAGE_RUNTIME_FUNCTION_ENTRY = *mut IMAGE_RUNTIME_FUNCTION_ENTRY;
-pub const FRAME_FPO: ::WORD = 0;
-pub const FRAME_TRAP: ::WORD = 1;
-pub const FRAME_TSS: ::WORD = 2;
-pub const FRAME_NONFPO: ::WORD = 3;
-STRUCT!{struct FPO_DATA {
-    ulOffStart: ::DWORD,
-    cbProcSize: ::DWORD,
-    cdwLocals: ::DWORD,
-    cdwParams: ::WORD,
-    bitfield: ::WORD,
-}}
-pub type PFPO_DATA = *mut FPO_DATA;
-pub const SIZEOF_RFPO_DATA: usize = 16;
-pub const IMAGE_DEBUG_MISC_EXENAME: ::DWORD = 1;
-STRUCT!{struct IMAGE_DEBUG_MISC {
-    DataType: ::DWORD,
-    Length: ::DWORD,
-    Unicode: ::BOOLEAN,
-    Reserved: [::BYTE; 3],
-    Data: [::BYTE; 0],
-}}
-pub type PIMAGE_DEBUG_MISC = *mut IMAGE_DEBUG_MISC;
-STRUCT!{struct IMAGE_FUNCTION_ENTRY {
-    StartingAddress: ::DWORD,
-    EndingAddress: ::DWORD,
-    EndOfPrologue: ::DWORD,
-}}
-pub type PIMAGE_FUNCTION_ENTRY = *mut IMAGE_FUNCTION_ENTRY;
-STRUCT!{struct IMAGE_FUNCTION_ENTRY64 {
-    StartingAddress: ::ULONGLONG,
-    EndingAddress: ::ULONGLONG,
-    EndOfPrologueOrUnwindInfoAddress: ::ULONGLONG,
-}}
-pub type PIMAGE_FUNCTION_ENTRY64 = *mut IMAGE_FUNCTION_ENTRY64;
-//18245
-pub const HEAP_NO_SERIALIZE: ::DWORD = 0x00000001;
-pub const HEAP_GROWABLE: ::DWORD = 0x00000002;
-pub const HEAP_GENERATE_EXCEPTIONS: ::DWORD = 0x00000004;
-pub const HEAP_ZERO_MEMORY: ::DWORD = 0x00000008;
-pub const HEAP_REALLOC_IN_PLACE_ONLY: ::DWORD = 0x00000010;
-pub const HEAP_TAIL_CHECKING_ENABLED: ::DWORD = 0x00000020;
-pub const HEAP_FREE_CHECKING_ENABLED: ::DWORD = 0x00000040;
-pub const HEAP_DISABLE_COALESCE_ON_FREE: ::DWORD = 0x00000080;
-pub const HEAP_CREATE_ALIGN_16: ::DWORD = 0x00010000;
-pub const HEAP_CREATE_ENABLE_TRACING: ::DWORD = 0x00020000;
-pub const HEAP_CREATE_ENABLE_EXECUTE: ::DWORD = 0x00040000;
-pub const HEAP_MAXIMUM_TAG: ::DWORD = 0x0FFF;
-pub const HEAP_PSEUDO_TAG_FLAG: ::DWORD = 0x8000;
-pub const HEAP_TAG_SHIFT: ::DWORD = 18;
-//18145
-STRUCT!{struct RTL_CRITICAL_SECTION_DEBUG {
-    Type: ::WORD,
-    CreatorBackTraceIndex: ::WORD,
-    CriticalSection: *mut ::RTL_CRITICAL_SECTION,
-    ProcessLocksList: ::LIST_ENTRY,
-    EntryCount: ::DWORD,
-    ContentionCount: ::DWORD,
-    Flags: ::DWORD,
-    CreatorBackTraceIndexHigh: ::WORD,
-    SpareWORD: ::WORD,
-}}
-pub type PRTL_CRITICAL_SECTION_DEBUG = *mut RTL_CRITICAL_SECTION_DEBUG;
-pub type RTL_RESOURCE_DEBUG = RTL_CRITICAL_SECTION_DEBUG;
-pub type PRTL_RESOURCE_DEBUG = *mut RTL_CRITICAL_SECTION_DEBUG;
-pub const RTL_CRITSECT_TYPE: ::WORD = 0;
-pub const RTL_RESOURCE_TYPE: ::WORD = 1;
-pub const RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO: ::ULONG_PTR = 0x01000000;
-pub const RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN: ::ULONG_PTR = 0x02000000;
-pub const RTL_CRITICAL_SECTION_FLAG_STATIC_INIT: ::ULONG_PTR = 0x04000000;
-pub const RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE: ::ULONG_PTR = 0x08000000;
-pub const RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO: ::ULONG_PTR = 0x10000000;
-pub const RTL_CRITICAL_SECTION_ALL_FLAG_BITS: ::ULONG_PTR = 0xFF000000;
-pub const RTL_CRITICAL_SECTION_FLAG_RESERVED: ::ULONG_PTR = RTL_CRITICAL_SECTION_ALL_FLAG_BITS & !(RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO | RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN | RTL_CRITICAL_SECTION_FLAG_STATIC_INIT | RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE | RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
-pub const RTL_CRITICAL_SECTION_DEBUG_FLAG_STATIC_INIT: ::DWORD = 0x00000001;
-STRUCT!{struct RTL_CRITICAL_SECTION {
-    DebugInfo: ::PRTL_CRITICAL_SECTION_DEBUG,
-    LockCount: ::LONG,
-    RecursionCount: ::LONG,
-    OwningThread: ::HANDLE,
-    LockSemaphore: ::HANDLE,
-    SpinCount: ::ULONG_PTR,
-}}
-pub type PRTL_CRITICAL_SECTION = *mut RTL_CRITICAL_SECTION;
-STRUCT!{struct RTL_SRWLOCK {
-    Ptr: ::PVOID,
-}}
-pub type PRTL_SRWLOCK = *mut RTL_SRWLOCK;
-pub const RTL_SRWLOCK_INIT: RTL_SRWLOCK = RTL_SRWLOCK { Ptr: 0 as PVOID };
-STRUCT!{struct RTL_CONDITION_VARIABLE {
-    Ptr: ::PVOID,
-}}
-pub type PRTL_CONDITION_VARIABLE = *mut RTL_CONDITION_VARIABLE;
-pub const RTL_CONDITION_VARIABLE_INIT: RTL_CONDITION_VARIABLE = RTL_CONDITION_VARIABLE {
-    Ptr: 0 as PVOID
-};
-//18204
-pub type PAPCFUNC = Option<unsafe extern "system" fn(Parameter: ::ULONG_PTR)>;
-pub type PVECTORED_EXCEPTION_HANDLER = Option<unsafe extern "system" fn(
-    ExceptionInfo: *mut EXCEPTION_POINTERS,
-) -> ::LONG>;
-ENUM!{enum HEAP_INFORMATION_CLASS {
-    HeapCompatibilityInformation = 0,
-    HeapEnableTerminationOnCorruption = 1,
-    HeapOptimizeResources = 3,
-}}
-//pub use self::HEAP_INFORMATION_CLASS::*;
-pub const HEAP_OPTIMIZE_RESOURCES_CURRENT_VERSION: ::DWORD = 1;
-STRUCT!{struct HEAP_OPTIMIZE_RESOURCES_INFORMATION {
-    Version: ::DWORD,
-    Flags: ::DWORD,
-}}
-pub type PHEAP_OPTIMIZE_RESOURCES_INFORMATION = *mut HEAP_OPTIMIZE_RESOURCES_INFORMATION;
-pub const WT_EXECUTEDEFAULT: ::ULONG = 0x00000000;
-pub const WT_EXECUTEINIOTHREAD: ::ULONG = 0x00000001;
-pub const WT_EXECUTEINUITHREAD: ::ULONG = 0x00000002;
-pub const WT_EXECUTEINWAITTHREAD: ::ULONG = 0x00000004;
-pub const WT_EXECUTEONLYONCE: ::ULONG = 0x00000008;
-pub const WT_EXECUTEINTIMERTHREAD: ::ULONG = 0x00000020;
-pub const WT_EXECUTELONGFUNCTION: ::ULONG = 0x00000010;
-pub const WT_EXECUTEINPERSISTENTIOTHREAD: ::ULONG = 0x00000040;
-pub const WT_EXECUTEINPERSISTENTTHREAD: ::ULONG = 0x00000080;
-pub const WT_TRANSFER_IMPERSONATION: ::ULONG = 0x00000100;
-pub type WAITORTIMERCALLBACKFUNC = Option<unsafe extern "system" fn(::PVOID, ::BOOLEAN)>;
-pub type WORKERCALLBACKFUNC = Option<unsafe extern "system" fn(::PVOID)>;
-pub type APC_CALLBACK_FUNCTION = Option<unsafe extern "system" fn(::DWORD, ::PVOID, ::PVOID)>;
-pub type WAITORTIMERCALLBACK = WAITORTIMERCALLBACKFUNC;
-pub type PFLS_CALLBACK_FUNCTION = Option<unsafe extern "system" fn(lpFlsData: ::PVOID)>;
-pub type PSECURE_MEMORY_CACHE_CALLBACK = Option<unsafe extern "system" fn(
-    Addr: ::PVOID, Range: ::SIZE_T,
-) -> ::BOOLEAN>;
-pub const WT_EXECUTEINLONGTHREAD: ::ULONG = 0x00000010;
-pub const WT_EXECUTEDELETEWAIT: ::ULONG = 0x00000008;
-//18570
-pub const KEY_QUERY_VALUE: ::REGSAM = 0x0001;
-pub const KEY_SET_VALUE: ::REGSAM = 0x0002;
-pub const KEY_CREATE_SUB_KEY: ::REGSAM = 0x0004;
-pub const KEY_ENUMERATE_SUB_KEYS: ::REGSAM = 0x0008;
-pub const KEY_NOTIFY: ::REGSAM = 0x0010;
-pub const KEY_CREATE_LINK: ::REGSAM = 0x0020;
-pub const KEY_WOW64_32KEY: ::REGSAM = 0x0200;
-pub const KEY_WOW64_64KEY: ::REGSAM = 0x0100;
-pub const KEY_WOW64_RES: ::REGSAM = 0x0300;
-pub const KEY_READ: ::REGSAM = (
-        STANDARD_RIGHTS_READ |
-        KEY_QUERY_VALUE |
-        KEY_ENUMERATE_SUB_KEYS |
-        KEY_NOTIFY
-    ) & (!SYNCHRONIZE);
-pub const KEY_WRITE: ::REGSAM = (STANDARD_RIGHTS_WRITE | KEY_SET_VALUE | KEY_CREATE_SUB_KEY) & (!SYNCHRONIZE);
-pub const KEY_EXECUTE: ::REGSAM = KEY_READ & (!SYNCHRONIZE);
-pub const KEY_ALL_ACCESS: ::REGSAM = (
-        STANDARD_RIGHTS_ALL |
-        KEY_QUERY_VALUE |
-        KEY_SET_VALUE |
-        KEY_CREATE_SUB_KEY |
-        KEY_ENUMERATE_SUB_KEYS |
-        KEY_NOTIFY |
-        KEY_CREATE_LINK
-    ) & (!SYNCHRONIZE);
-pub const REG_CREATED_NEW_KEY: ::DWORD = 0x00000001;
-pub const REG_OPENED_EXISTING_KEY: ::DWORD = 0x00000002;
-pub const REG_NOTIFY_CHANGE_NAME: ::DWORD = 0x00000001;
-pub const REG_NOTIFY_CHANGE_ATTRIBUTES: ::DWORD = 0x00000002;
-pub const REG_NOTIFY_CHANGE_LAST_SET: ::DWORD = 0x00000004;
-pub const REG_NOTIFY_CHANGE_SECURITY: ::DWORD = 0x00000008;
-pub const REG_LEGAL_CHANGE_FILTER: ::DWORD = REG_NOTIFY_CHANGE_NAME |
-    REG_NOTIFY_CHANGE_ATTRIBUTES |
-    REG_NOTIFY_CHANGE_LAST_SET |
-    REG_NOTIFY_CHANGE_SECURITY;
-pub const REG_NOTIFY_THREAD_AGNOSTIC: ::DWORD = 0x10000000; //supported only on Windows 8 and later
-pub const REG_OPTION_RESERVED: ::DWORD = 0x00000000;
-pub const REG_OPTION_NON_VOLATILE: ::DWORD = 0x00000000;
-pub const REG_OPTION_VOLATILE: ::DWORD = 0x00000001;
-pub const REG_OPTION_CREATE_LINK: ::DWORD = 0x00000002;
-pub const REG_OPTION_BACKUP_RESTORE: ::DWORD = 0x00000004;
-pub const REG_OPTION_OPEN_LINK: ::DWORD = 0x00000008;
-pub const REG_NONE: ::DWORD = 0;
-pub const REG_SZ: ::DWORD = 1;
-pub const REG_EXPAND_SZ: ::DWORD = 2;
-pub const REG_BINARY: ::DWORD = 3;
-pub const REG_DWORD: ::DWORD = 4;
-pub const REG_DWORD_LITTLE_ENDIAN: ::DWORD = 4;
-pub const REG_DWORD_BIG_ENDIAN: ::DWORD = 5;
-pub const REG_LINK: ::DWORD = 6;
-pub const REG_MULTI_SZ: ::DWORD = 7;
-pub const REG_RESOURCE_LIST: ::DWORD = 8;
-pub const REG_FULL_RESOURCE_DESCRIPTOR: ::DWORD = 9;
-pub const REG_RESOURCE_REQUIREMENTS_LIST: ::DWORD = 10;
-pub const REG_QWORD: ::DWORD = 11;
-pub const REG_QWORD_LITTLE_ENDIAN: ::DWORD = 11;
-//18720
-pub const SERVICE_KERNEL_DRIVER: ::DWORD = 0x00000001;
-pub const SERVICE_FILE_SYSTEM_DRIVER: ::DWORD = 0x00000002;
-pub const SERVICE_ADAPTER: ::DWORD = 0x00000004;
-pub const SERVICE_RECOGNIZER_DRIVER: ::DWORD = 0x00000008;
-pub const SERVICE_DRIVER: ::DWORD = SERVICE_KERNEL_DRIVER | SERVICE_FILE_SYSTEM_DRIVER
-    | SERVICE_RECOGNIZER_DRIVER;
-pub const SERVICE_WIN32_OWN_PROCESS: ::DWORD = 0x00000010;
-pub const SERVICE_WIN32_SHARE_PROCESS: ::DWORD = 0x00000020;
-pub const SERVICE_WIN32: ::DWORD = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS;
-pub const SERVICE_INTERACTIVE_PROCESS: ::DWORD = 0x00000100;
-pub const SERVICE_TYPE_ALL: ::DWORD = SERVICE_WIN32 | SERVICE_ADAPTER | SERVICE_DRIVER
-    | SERVICE_INTERACTIVE_PROCESS;
-STRUCT!{struct TP_CALLBACK_INSTANCE {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_CALLBACK_INSTANCE = *mut TP_CALLBACK_INSTANCE;
-STRUCT!{struct TP_IO {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_IO = *mut TP_IO;
-STRUCT!{struct TP_POOL {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_POOL = *mut TP_POOL;
-STRUCT!{struct TP_CLEANUP_GROUP {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_CLEANUP_GROUP = *mut TP_CLEANUP_GROUP;
-STRUCT!{struct TP_TIMER {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_TIMER = *mut TP_TIMER;
-STRUCT!{struct TP_WAIT {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_WAIT = *mut TP_WAIT;
-STRUCT!{struct TP_WORK {
-    dummy: *mut ::c_void,
-}}
-pub type PTP_WORK = *mut TP_WORK;
-STRUCT!{struct ACTIVATION_CONTEXT {
-    dummy: *mut ::c_void,
-}}
-ENUM!{enum TP_CALLBACK_PRIORITY {
-    TP_CALLBACK_PRIORITY_HIGH,
-    TP_CALLBACK_PRIORITY_NORMAL,
-    TP_CALLBACK_PRIORITY_LOW,
-    TP_CALLBACK_PRIORITY_INVALID,
-    TP_CALLBACK_PRIORITY_COUNT = 4,
-}}
-pub type PTP_CLEANUP_GROUP_CANCEL_CALLBACK = Option<unsafe extern "system" fn(
-    ObjectContext: ::PVOID, CleanupContext: ::PVOID,
-)>;
-pub type PTP_SIMPLE_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID,
-)>;
-pub type PTP_WORK_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID, Work: PTP_WORK,
-)>;
-pub type PTP_TIMER_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID, Timer: PTP_TIMER,
-)>;
-pub type TP_WAIT_RESULT = ::DWORD;
-pub type PTP_WAIT_CALLBACK = Option<unsafe extern "system" fn(
-    Instance: PTP_CALLBACK_INSTANCE, Context: ::PVOID, Wait: PTP_WAIT, WaitResult: TP_WAIT_RESULT,
-)>;
-pub type TP_VERSION = ::DWORD;
-pub type PTP_VERSION = *mut ::DWORD;
-STRUCT!{struct TP_POOL_STACK_INFORMATION {
-    StackReserve: ::SIZE_T,
-    StackCommit: ::SIZE_T,
-}}
-pub type PTP_POOL_STACK_INFORMATION = *mut TP_POOL_STACK_INFORMATION;
-STRUCT!{struct TP_CALLBACK_ENVIRON_V3_s {
-    BitFields: ::DWORD,
-}}
-BITFIELD!(TP_CALLBACK_ENVIRON_V3_s BitFields: ::DWORD [
-    LongFunction set_LongFunction[0..1],
-    Persistent set_Persistent[1..2],
-    Private set_Private[2..32],
-]);
-STRUCT!{nodebug struct TP_CALLBACK_ENVIRON_V3 {
-    Version: TP_VERSION,
-    Pool: PTP_POOL,
-    CleanupGroup: PTP_CLEANUP_GROUP,
-    CleanupGroupCancelCallback: PTP_CLEANUP_GROUP_CANCEL_CALLBACK,
-    RaceDll: ::PVOID,
-    ActivationContext: *mut ACTIVATION_CONTEXT,
-    FinalizationCallback: PTP_SIMPLE_CALLBACK,
-    u: ::DWORD,
-    CallbackPriority: TP_CALLBACK_PRIORITY,
-    Size: ::DWORD,
-}}
-UNION!(TP_CALLBACK_ENVIRON_V3, u, Flags, Flags_mut, ::DWORD);
-UNION!(TP_CALLBACK_ENVIRON_V3, u, s, s_mut, TP_CALLBACK_ENVIRON_V3_s);
-pub type TP_CALLBACK_ENVIRON = TP_CALLBACK_ENVIRON_V3;
-pub type PTP_CALLBACK_ENVIRON = *mut TP_CALLBACK_ENVIRON_V3;
-STRUCT!{struct JOB_SET_ARRAY {
-    JobHandle: ::HANDLE,
-    MemberLevel: ::DWORD,
-    Flags: ::DWORD,
-}}
-pub type PJOB_SET_ARRAY = *mut JOB_SET_ARRAY;
-STRUCT!{struct RTL_BARRIER {
-    Reserved1: ::DWORD,
-    Reserved2: ::DWORD,
-    Reserved3: [::ULONG_PTR; 2],
-    Reserved4: ::DWORD,
-    Reserved5: ::DWORD,
-}}
-pub type PRTL_BARRIER = *mut RTL_BARRIER;
-STRUCT!{struct RTL_RUN_ONCE {
-    Ptr: ::PVOID,
-}}
-pub type PRTL_RUN_ONCE = *mut RTL_RUN_ONCE;
-ENUM!{enum RTL_UMS_THREAD_INFO_CLASS {
-    UmsThreadInvalidInfoClass = 0,
-    UmsThreadUserContext,
-    UmsThreadPriority,              // Reserved
-    UmsThreadAffinity,              // Reserved
-    UmsThreadTeb,
-    UmsThreadIsSuspended,
-    UmsThreadIsTerminated,
-    UmsThreadMaxInfoClass,
-}}
-ENUM!{enum RTL_UMS_SCHEDULER_REASON {
-    UmsSchedulerStartup = 0,
-    UmsSchedulerThreadBlocked,
-    UmsSchedulerThreadYield,
-}}
-pub type PRTL_UMS_SCHEDULER_ENTRY_POINT = Option<unsafe extern "system" fn(
-    Reason: RTL_UMS_SCHEDULER_REASON, ActivationPayload: ::ULONG_PTR, SchedulerParam: ::PVOID,
-)>;
-ENUM!{enum FIRMWARE_TYPE {
-    FirmwareTypeUnknown,
-    FirmwareTypeBios,
-    FirmwareTypeUefi,
-    FirmwareTypeMax,
-}}
-pub type PFIRMWARE_TYPE = *mut FIRMWARE_TYPE;
-ENUM!{enum LOGICAL_PROCESSOR_RELATIONSHIP {
-    RelationProcessorCore,
-    RelationNumaNode,
-    RelationCache,
-    RelationProcessorPackage,
-    RelationGroup,
-    RelationAll = 0xffff,
-}}
-ENUM!{enum PROCESSOR_CACHE_TYPE {
-    CacheUnified,
-    CacheInstruction,
-    CacheData,
-    CacheTrace,
-}}
-STRUCT!{struct CACHE_DESCRIPTOR {
-    Level: ::BYTE,
-    Associativity: ::BYTE,
-    LineSize: ::WORD,
-    Size: ::DWORD,
-    Type: PROCESSOR_CACHE_TYPE,
-}}
-pub type PCACHE_DESCRIPTOR = *mut CACHE_DESCRIPTOR;
-STRUCT!{struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION_ProcessorCore {
-    Flags: ::BYTE,
-}}
-STRUCT!{struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION_NumaNode {
-    NodeNumber: ::DWORD,
-}}
-STRUCT!{struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION {
-    ProcessorMask: ::ULONG_PTR,
-    Relationship: LOGICAL_PROCESSOR_RELATIONSHIP,
-    Reserved: [::ULONGLONG; 2],
-}}
-UNION!(
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION, Reserved, ProcessorCore, ProcessorCore_mut,
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_ProcessorCore
-);
-UNION!(
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION, Reserved, NumaNode, NumaNode_mut,
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_NumaNode
-);
-UNION!(SYSTEM_LOGICAL_PROCESSOR_INFORMATION, Reserved, Cache, Cache_mut, CACHE_DESCRIPTOR);
-pub type PSYSTEM_LOGICAL_PROCESSOR_INFORMATION = *mut SYSTEM_LOGICAL_PROCESSOR_INFORMATION;
-STRUCT!{struct SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION {
-    CycleTime: ::DWORD64,
-}}
-pub type PSYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION = *mut SYSTEM_PROCESSOR_CYCLE_TIME_INFORMATION;
-ENUM!{enum HARDWARE_COUNTER_TYPE {
-    PMCCounter,
-    MaxHardwareCounterType,
-}}
-pub type PHARDWARE_COUNTER_TYPE = *mut HARDWARE_COUNTER_TYPE;
-ENUM!{enum PROCESS_MITIGATION_POLICY {
-    ProcessDEPPolicy,
-    ProcessASLRPolicy,
-    ProcessDynamicCodePolicy,
-    ProcessStrictHandleCheckPolicy,
-    ProcessSystemCallDisablePolicy,
-    ProcessMitigationOptionsMask,
-    ProcessExtensionPointDisablePolicy,
-    ProcessReserved1Policy,
-    ProcessSignaturePolicy,
-    MaxProcessMitigationPolicy,
-}}
-STRUCT!{nodebug struct OSVERSIONINFOA {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::CHAR; 128],
-}}
-pub type POSVERSIONINFOA = *mut OSVERSIONINFOA;
-pub type LPOSVERSIONINFOA = *mut OSVERSIONINFOA;
-STRUCT!{nodebug struct OSVERSIONINFOW {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::WCHAR; 128],
-}}
-pub type POSVERSIONINFOW = *mut OSVERSIONINFOW;
-pub type LPOSVERSIONINFOW = *mut OSVERSIONINFOW;
-STRUCT!{nodebug struct OSVERSIONINFOEXA {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::CHAR; 128],
-    wServicePackMajor: ::WORD,
-    wServicePackMinor: ::WORD,
-    wSuiteMask: ::WORD,
-    wProductType: ::BYTE,
-    wReserved: ::BYTE,
-}}
-pub type POSVERSIONINFOEXA = *mut OSVERSIONINFOEXA;
-pub type LPOSVERSIONINFOEXA = *mut OSVERSIONINFOEXA;
-STRUCT!{nodebug struct OSVERSIONINFOEXW {
-    dwOSVersionInfoSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    dwBuildNumber: ::DWORD,
-    dwPlatformId: ::DWORD,
-    szCSDVersion: [::WCHAR; 128],
-    wServicePackMajor: ::WORD,
-    wServicePackMinor: ::WORD,
-    wSuiteMask: ::WORD,
-    wProductType: ::BYTE,
-    wReserved: ::BYTE,
-}}
-pub type POSVERSIONINFOEXW = *mut OSVERSIONINFOEXW;
-pub type LPOSVERSIONINFOEXW = *mut OSVERSIONINFOEXW;
-STRUCT!{struct SLIST_ENTRY {
-    Next: *mut SLIST_ENTRY,
-}}
-pub type PSLIST_ENTRY = *mut SLIST_ENTRY;
-STRUCT!{struct SLIST_HEADER_HeaderX64 {
-    BitFields1: ::ULONGLONG,
-    BitFields2: ::ULONGLONG,
-}}
-BITFIELD!(SLIST_HEADER_HeaderX64 BitFields1: ::ULONGLONG [
-    Depth set_Depth[0..16],
-    Sequence set_Sequence[16..64],
-]);
-BITFIELD!(SLIST_HEADER_HeaderX64 BitFields2: ::ULONGLONG [
-    Reserved set_Reserved[0..4],
-    NextEntry set_NextEntry[4..64],
-]);
-STRUCT!{struct SLIST_HEADER {
-    Alignment: ::ULONGLONG,
-    Region: ::ULONGLONG,
-}}
-UNION!(SLIST_HEADER, Alignment, HeaderX64, HeaderX64_mut, SLIST_HEADER_HeaderX64);
-pub type PSLIST_HEADER = *mut SLIST_HEADER;
-ENUM!{enum SYSTEM_POWER_STATE {
-    PowerSystemUnspecified = 0,
-    PowerSystemWorking = 1,
-    PowerSystemSleeping1 = 2,
-    PowerSystemSleeping2 = 3,
-    PowerSystemSleeping3 = 4,
-    PowerSystemHibernate = 5,
-    PowerSystemShutdown = 6,
-    PowerSystemMaximum = 7,
-}}
-pub type PSYSTEM_POWER_STATE = *mut SYSTEM_POWER_STATE;
-ENUM!{enum POWER_ACTION {
-    PowerActionNone = 0,
-    PowerActionReserved,
-    PowerActionSleep,
-    PowerActionHibernate,
-    PowerActionShutdown,
-    PowerActionShutdownReset,
-    PowerActionShutdownOff,
-    PowerActionWarmEject,
-}}
-pub type PPOWER_ACTION = *mut POWER_ACTION;
-ENUM!{enum DEVICE_POWER_STATE {
-    PowerDeviceUnspecified = 0,
-    PowerDeviceD0,
-    PowerDeviceD1,
-    PowerDeviceD2,
-    PowerDeviceD3,
-    PowerDeviceMaximum,
-}}
-pub type PDEVICE_POWER_STATE = *mut DEVICE_POWER_STATE;
-ENUM!{enum MONITOR_DISPLAY_STATE {
-    PowerMonitorOff = 0,
-    PowerMonitorOn,
-    PowerMonitorDim,
-}}
-pub type PMONITOR_DISPLAY_STATE = *mut MONITOR_DISPLAY_STATE;
-ENUM!{enum USER_ACTIVITY_PRESENCE {
-    PowerUserPresent = 0,
-    PowerUserNotPresent,
-    PowerUserInactive,
-    PowerUserMaximum,
-    //PowerUserInvalid = 3,
-}}
-pub type PUSER_ACTIVITY_PRESENCE = *mut USER_ACTIVITY_PRESENCE;
-pub type EXECUTION_STATE = ::DWORD;
-pub type PEXECUTION_STATE = *mut ::DWORD;
-ENUM!{enum LATENCY_TIME {
-    LT_DONT_CARE,
-    LT_LOWEST_LATENCY,
-}}
-ENUM!{enum POWER_REQUEST_TYPE {
-    PowerRequestDisplayRequired,
-    PowerRequestSystemRequired,
-    PowerRequestAwayModeRequired,
-    PowerRequestExecutionRequired,
-}}
-pub type PPOWER_REQUEST_TYPE = *mut POWER_REQUEST_TYPE;
-pub const MAX_HW_COUNTERS: usize = 16;
-STRUCT!{struct HARDWARE_COUNTER_DATA {
-    Type: HARDWARE_COUNTER_TYPE,
-    Reserved: ::DWORD,
-    Value: ::DWORD64,
-}}
-pub type PHARDWARE_COUNTER_DATA = *mut HARDWARE_COUNTER_DATA;
-STRUCT!{struct PERFORMANCE_DATA {
-    Size: ::WORD,
-    Version: ::BYTE,
-    HwCountersCount: ::BYTE,
-    ContextSwitchCount: ::DWORD,
-    WaitReasonBitMap: ::DWORD64,
-    CycleTime: ::DWORD64,
-    RetryCount: ::DWORD,
-    Reserved: ::DWORD,
-    HwCounters: [HARDWARE_COUNTER_DATA; MAX_HW_COUNTERS],
-}}
-pub type PPERFORMANCE_DATA = *mut PERFORMANCE_DATA;
-STRUCT!{struct MEMORY_BASIC_INFORMATION {
-    BaseAddress: ::PVOID,
-    AllocationBase: ::PVOID,
-    AllocationProtect: ::DWORD,
-    RegionSize: ::SIZE_T,
-    State: ::DWORD,
-    Protect: ::DWORD,
-    Type: ::DWORD,
-}}
-pub type PMEMORY_BASIC_INFORMATION = *mut MEMORY_BASIC_INFORMATION;
-STRUCT!{struct MEMORY_BASIC_INFORMATION32 {
-    BaseAddress: ::DWORD,
-    AllocationBase: ::DWORD,
-    AllocationProtect: ::DWORD,
-    RegionSize: ::DWORD,
-    State: ::DWORD,
-    Protect: ::DWORD,
-    Type: ::DWORD,
-}}
-pub type PMEMORY_BASIC_INFORMATION32 = *mut MEMORY_BASIC_INFORMATION32;
-STRUCT!{struct MEMORY_BASIC_INFORMATION64 { // FIXME: align 16
-    BaseAddress: ::ULONGLONG,
-    AllocationBase: ::ULONGLONG,
-    AllocationProtect: ::DWORD,
-    __alignment1: ::DWORD,
-    RegionSize: ::ULONGLONG,
-    State: ::DWORD,
-    Protect: ::DWORD,
-    Type: ::DWORD,
-    __alignment2: ::DWORD,
-}}
-pub type PMEMORY_BASIC_INFORMATION64 = *mut MEMORY_BASIC_INFORMATION64;
-pub const WOW64_SIZE_OF_80387_REGISTERS: usize = 80;
-pub const WOW64_MAXIMUM_SUPPORTED_EXTENSION: usize = 512;
-STRUCT!{nodebug struct WOW64_FLOATING_SAVE_AREA {
-    ControlWord: ::DWORD,
-    StatusWord: ::DWORD,
-    TagWord: ::DWORD,
-    ErrorOffset: ::DWORD,
-    ErrorSelector: ::DWORD,
-    DataOffset: ::DWORD,
-    DataSelector: ::DWORD,
-    RegisterArea: [::BYTE; WOW64_SIZE_OF_80387_REGISTERS],
-    Cr0NpxState: ::DWORD,
-}}
-pub type PWOW64_FLOATING_SAVE_AREA = *mut WOW64_FLOATING_SAVE_AREA;
-STRUCT!{nodebug struct WOW64_CONTEXT {
-    ContextFlags: ::DWORD,
-    Dr0: ::DWORD,
-    Dr1: ::DWORD,
-    Dr2: ::DWORD,
-    Dr3: ::DWORD,
-    Dr4: ::DWORD,
-    Dr5: ::DWORD,
-    Dr6: ::DWORD,
-    Dr7: ::DWORD,
-    FloatSave: WOW64_FLOATING_SAVE_AREA,
-    SegGs: ::DWORD,
-    SegFs: ::DWORD,
-    SegEs: ::DWORD,
-    SegDs: ::DWORD,
-    Edi: ::DWORD,
-    Esi: ::DWORD,
-    Ebx: ::DWORD,
-    Edx: ::DWORD,
-    Ecx: ::DWORD,
-    Eax: ::DWORD,
-    Ebp: ::DWORD,
-    Eip: ::DWORD,
-    SegCs: ::DWORD,
-    EFlags: ::DWORD,
-    Esp: ::DWORD,
-    SegSs: ::DWORD,
-    ExtendedRegisters: [::BYTE; WOW64_MAXIMUM_SUPPORTED_EXTENSION],
-}}
-pub type PWOW64_CONTEXT = *mut WOW64_CONTEXT;
-STRUCT!{struct WOW64_LDT_ENTRY_Bytes {
-    BaseMid: ::BYTE,
-    Flags1: ::BYTE,
-    Flags2: ::BYTE,
-    BaseHi: ::BYTE,
-}}
-STRUCT!{struct WOW64_LDT_ENTRY_Bits {
-    BitFields: ::DWORD,
-}}
-BITFIELD!(WOW64_LDT_ENTRY_Bits BitFields: ::DWORD [
-    BaseMid set_BaseMid[0..8],
-    Type set_Type[8..13],
-    Dpl set_Dpl[13..15],
-    Pres set_Pres[15..16],
-    LimitHi set_LimitHi[16..20],
-    Sys set_Sys[20..21],
-    Reserved_0 set_Reserved_0[21..22],
-    Default_Big set_Default_Big[22..23],
-    Granularity set_Granularity[23..24],
-    BaseHi set_BaseHi[24..32],
-]);
-STRUCT!{struct WOW64_LDT_ENTRY {
-    LimitLow: ::WORD,
-    BaseLow: ::WORD,
-    HighWord: ::DWORD,
-}}
-UNION!(WOW64_LDT_ENTRY, HighWord, Bytes, Bytes_mut, WOW64_LDT_ENTRY_Bytes);
-UNION!(WOW64_LDT_ENTRY, HighWord, Bits, Bits_mut, WOW64_LDT_ENTRY_Bits);
-pub type PWOW64_LDT_ENTRY = *mut WOW64_LDT_ENTRY;
diff --git a/vendor/winapi-0.2.8/src/winreg.rs b/vendor/winapi-0.2.8/src/winreg.rs
deleted file mode 100644
index 91ef168ca9..0000000000
--- a/vendor/winapi-0.2.8/src/winreg.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright © 2016, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-use super::*;
-pub type REGSAM = ACCESS_MASK;
-STRUCT!{struct VALENTA {
-    ve_valuename: LPSTR,
-    ve_valuelen: DWORD,
-    ve_valueptr: DWORD_PTR,
-    ve_type: DWORD,
-}}
-pub type PVALENTA = *mut VALENTA;
-STRUCT!{struct VALENTW {
-    ve_valuename: LPWSTR,
-    ve_valuelen: DWORD,
-    ve_valueptr: DWORD_PTR,
-    ve_type: DWORD,
-}}
-pub type PVALENTW = *mut VALENTW;
-pub const HKEY_CLASSES_ROOT: HKEY = 0x80000000 as HKEY;
-pub const HKEY_CURRENT_USER: HKEY = 0x80000001 as HKEY;
-pub const HKEY_LOCAL_MACHINE: HKEY = 0x80000002 as HKEY;
-pub const HKEY_USERS: HKEY = 0x80000003 as HKEY;
-pub const HKEY_PERFORMANCE_DATA: HKEY = 0x80000004 as HKEY;
-pub const HKEY_PERFORMANCE_TEXT: HKEY = 0x80000050 as HKEY;
-pub const HKEY_PERFORMANCE_NLSTEXT: HKEY = 0x80000060 as HKEY;
-pub const HKEY_CURRENT_CONFIG: HKEY = 0x80000005 as HKEY;
-pub const HKEY_DYN_DATA: HKEY = 0x80000006 as HKEY;
-pub const HKEY_CURRENT_USER_LOCAL_SETTINGS: HKEY = 0x80000007 as HKEY;
-pub const REG_MUI_STRING_TRUNCATE: DWORD = 0x00000001;
-pub const RRF_RT_REG_NONE: DWORD = 0x00000001;
-pub const RRF_RT_REG_SZ: DWORD = 0x00000002;
-pub const RRF_RT_REG_EXPAND_SZ: DWORD = 0x00000004;
-pub const RRF_RT_REG_BINARY: DWORD = 0x00000008;
-pub const RRF_RT_REG_DWORD: DWORD = 0x00000010;
-pub const RRF_RT_REG_MULTI_SZ: DWORD = 0x00000020;
-pub const RRF_RT_REG_QWORD: DWORD = 0x00000040;
-pub const RRF_RT_DWORD: DWORD = RRF_RT_REG_BINARY|RRF_RT_REG_DWORD;
-pub const RRF_RT_QWORD: DWORD = RRF_RT_REG_BINARY|RRF_RT_REG_QWORD;
-pub const RRF_RT_ANY: DWORD = 0x0000ffff;
-pub const RRF_NOEXPAND: DWORD = 0x10000000;
-pub const RRF_ZEROONFAILURE: DWORD = 0x20000000;
diff --git a/vendor/winapi-0.2.8/src/winscard.rs b/vendor/winapi-0.2.8/src/winscard.rs
deleted file mode 100644
index 7d20c2d999..0000000000
--- a/vendor/winapi-0.2.8/src/winscard.rs
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Data Protection API Prototypes and Definitions
-// This header file provides the definitions and symbols necessary for an
-// Application or Smart Card Service Provider to access the Smartcard Subsystem.
-pub type LPCBYTE = *const ::BYTE;
-pub type SCARDCONTEXT = ::ULONG_PTR;
-pub type PSCARDCONTEXT = *mut SCARDCONTEXT;
-pub type LPSCARDCONTEXT = *mut SCARDCONTEXT;
-pub type SCARDHANDLE = ::ULONG_PTR;
-pub type PSCARDHANDLE = *mut SCARDHANDLE;
-pub type LPSCARDHANDLE = *mut SCARDHANDLE;
-pub const SCARD_AUTOALLOCATE: ::DWORD = -1i32 as ::DWORD;
-pub const SCARD_SCOPE_USER: ::DWORD = 0;
-pub const SCARD_SCOPE_TERMINAL: ::DWORD = 1;
-pub const SCARD_SCOPE_SYSTEM: ::DWORD = 2;
-pub const SCARD_PROVIDER_PRIMARY: ::DWORD = 1;
-pub const SCARD_PROVIDER_CSP: ::DWORD = 2;
-pub const SCARD_PROVIDER_KSP: ::DWORD = 3;
-STRUCT!{nodebug struct SCARD_READERSTATEA {
-    szReader: ::LPCSTR,
-    pvUserData: ::LPVOID,
-    dwCurrentState: ::DWORD,
-    dwEventState: ::DWORD,
-    cbAtr: ::DWORD,
-    rgbAtr: [::BYTE; 36],
-}}
-pub type PSCARD_READERSTATEA = *mut SCARD_READERSTATEA;
-pub type LPSCARD_READERSTATEA = *mut SCARD_READERSTATEA;
-STRUCT!{nodebug struct SCARD_READERSTATEW {
-    szReader: ::LPCWSTR,
-    pvUserData: ::LPVOID,
-    dwCurrentState: ::DWORD,
-    dwEventState: ::DWORD,
-    cbAtr: ::DWORD,
-    rgbAtr: [::BYTE; 36],
-}}
-pub type PSCARD_READERSTATEW = *mut SCARD_READERSTATEW;
-pub type LPSCARD_READERSTATEW = *mut SCARD_READERSTATEW;
-pub type SCARD_READERSTATE_A = SCARD_READERSTATEA;
-pub type SCARD_READERSTATE_W = SCARD_READERSTATEW;
-pub type PSCARD_READERSTATE_A = PSCARD_READERSTATEA;
-pub type PSCARD_READERSTATE_W = PSCARD_READERSTATEW;
-pub type LPSCARD_READERSTATE_A = LPSCARD_READERSTATEA;
-pub type LPSCARD_READERSTATE_W = LPSCARD_READERSTATEW;
-pub const SCARD_STATE_UNAWARE: ::DWORD = 0x00000000;
-pub const SCARD_STATE_IGNORE: ::DWORD = 0x00000001;
-pub const SCARD_STATE_CHANGED: ::DWORD = 0x00000002;
-pub const SCARD_STATE_UNKNOWN: ::DWORD = 0x00000004;
-pub const SCARD_STATE_UNAVAILABLE: ::DWORD = 0x00000008;
-pub const SCARD_STATE_EMPTY: ::DWORD = 0x00000010;
-pub const SCARD_STATE_PRESENT: ::DWORD = 0x00000020;
-pub const SCARD_STATE_ATRMATCH: ::DWORD = 0x00000040;
-pub const SCARD_STATE_EXCLUSIVE: ::DWORD = 0x00000080;
-pub const SCARD_STATE_INUSE: ::DWORD = 0x00000100;
-pub const SCARD_STATE_MUTE: ::DWORD = 0x00000200;
-pub const SCARD_STATE_UNPOWERED: ::DWORD = 0x00000400;
-STRUCT!{nodebug struct SCARD_ATRMASK {
-    cbAtr: ::DWORD,
-    rgbAtr: [::BYTE; 36],
-    rgbMask: [::BYTE; 36],
-}}
-pub type PSCARD_ATRMASK = *mut SCARD_ATRMASK;
-pub type LPSCARD_ATRMASK = *mut SCARD_ATRMASK;
-pub const SCARD_SHARE_EXCLUSIVE: ::DWORD = 1;
-pub const SCARD_SHARE_SHARED: ::DWORD = 2;
-pub const SCARD_SHARE_DIRECT: ::DWORD = 3;
-pub const SCARD_LEAVE_CARD: ::DWORD = 0;
-pub const SCARD_RESET_CARD: ::DWORD = 1;
-pub const SCARD_UNPOWER_CARD: ::DWORD = 2;
-pub const SCARD_EJECT_CARD: ::DWORD = 3;
-pub const SC_DLG_MINIMAL_UI: ::DWORD = 0x01;
-pub const SC_DLG_NO_UI: ::DWORD = 0x02;
-pub const SC_DLG_FORCE_UI: ::DWORD = 0x04;
-pub const SCERR_NOCARDNAME: ::DWORD = 0x4000;
-pub const SCERR_NOGUIDS: ::DWORD = 0x8000;
-pub type LPOCNCONNPROCA = Option<unsafe extern "system" fn(
-    SCARDCONTEXT, ::LPSTR, ::LPSTR, ::PVOID,
-) -> SCARDHANDLE>;
-pub type LPOCNCONNPROCW = Option<unsafe extern "system" fn(
-    SCARDCONTEXT, ::LPWSTR, ::LPWSTR, ::PVOID,
-) -> SCARDHANDLE>;
-pub type LPOCNCHKPROC = Option<unsafe extern "system" fn(
-    SCARDCONTEXT, SCARDHANDLE, ::PVOID,
-) -> ::BOOL>;
-pub type LPOCNDSCPROC = Option<unsafe extern "system" fn(SCARDCONTEXT, SCARDHANDLE, ::PVOID)>;
-STRUCT!{nodebug struct OPENCARD_SEARCH_CRITERIAA {
-    dwStructSize: ::DWORD,
-    lpstrGroupNames: ::LPSTR,
-    nMaxGroupNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrCardNames: ::LPSTR,
-    nMaxCardNames: ::DWORD,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnConnect: LPOCNCONNPROCA,
-    lpfnDisconnect: LPOCNDSCPROC,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-}}
-pub type POPENCARD_SEARCH_CRITERIAA = *mut OPENCARD_SEARCH_CRITERIAA;
-pub type LPOPENCARD_SEARCH_CRITERIAA = *mut OPENCARD_SEARCH_CRITERIAA;
-STRUCT!{nodebug struct OPENCARD_SEARCH_CRITERIAW {
-    dwStructSize: ::DWORD,
-    lpstrGroupNames: ::LPWSTR,
-    nMaxGroupNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrCardNames: ::LPWSTR,
-    nMaxCardNames: ::DWORD,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnConnect: LPOCNCONNPROCW,
-    lpfnDisconnect: LPOCNDSCPROC,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-}}
-pub type POPENCARD_SEARCH_CRITERIAW = *mut OPENCARD_SEARCH_CRITERIAW;
-pub type LPOPENCARD_SEARCH_CRITERIAW = *mut OPENCARD_SEARCH_CRITERIAW;
-STRUCT!{nodebug struct OPENCARDNAME_EXA {
-    dwStructSize: ::DWORD,
-    hSCardContext: SCARDCONTEXT,
-    hwndOwner: ::HWND,
-    dwFlags: ::DWORD,
-    lpstrTitle: ::LPCSTR,
-    lpstrSearchDesc: ::LPCSTR,
-    hIcon: ::HICON,
-    pOpenCardSearchCriteria: POPENCARD_SEARCH_CRITERIAA,
-    lpfnConnect: LPOCNCONNPROCA,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    lpstrRdr: ::LPSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPSTR,
-    nMaxCard: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAME_EXA = *mut OPENCARDNAME_EXA;
-pub type LPOPENCARDNAME_EXA = *mut OPENCARDNAME_EXA;
-STRUCT!{nodebug struct OPENCARDNAME_EXW {
-    dwStructSize: ::DWORD,
-    hSCardContext: SCARDCONTEXT,
-    hwndOwner: ::HWND,
-    dwFlags: ::DWORD,
-    lpstrTitle: ::LPCWSTR,
-    lpstrSearchDesc: ::LPCWSTR,
-    hIcon: ::HICON,
-    pOpenCardSearchCriteria: POPENCARD_SEARCH_CRITERIAW,
-    lpfnConnect: LPOCNCONNPROCW,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    lpstrRdr: ::LPWSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPWSTR,
-    nMaxCard: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAME_EXW = *mut OPENCARDNAME_EXW;
-pub type LPOPENCARDNAME_EXW = *mut OPENCARDNAME_EXW;
-pub type OPENCARDNAMEA_EX = OPENCARDNAME_EXA;
-pub type OPENCARDNAMEW_EX = OPENCARDNAME_EXW;
-pub type POPENCARDNAMEA_EX = POPENCARDNAME_EXA;
-pub type POPENCARDNAMEW_EX = POPENCARDNAME_EXW;
-pub type LPOPENCARDNAMEA_EX = LPOPENCARDNAME_EXA;
-pub type LPOPENCARDNAMEW_EX = LPOPENCARDNAME_EXW;
-pub const SCARD_READER_SEL_AUTH_PACKAGE: ::DWORD = -629i32 as ::DWORD;
-ENUM!{enum READER_SEL_REQUEST_MATCH_TYPE {
-    RSR_MATCH_TYPE_READER_AND_CONTAINER = 1,
-    RSR_MATCH_TYPE_SERIAL_NUMBER,
-    RSR_MATCH_TYPE_ALL_CARDS,
-}}
-STRUCT!{struct READER_SEL_REQUEST_ReaderAndContainerParameter {
-    cbReaderNameOffset: ::DWORD,
-    cchReaderNameLength: ::DWORD,
-    cbContainerNameOffset: ::DWORD,
-    cchContainerNameLength: ::DWORD,
-    dwDesiredCardModuleVersion: ::DWORD,
-    dwCspFlags: ::DWORD,
-}}
-STRUCT!{struct READER_SEL_REQUEST_SerialNumberParameter {
-    cbSerialNumberOffset: ::DWORD,
-    cbSerialNumberLength: ::DWORD,
-    dwDesiredCardModuleVersion: ::DWORD,
-}}
-STRUCT!{struct READER_SEL_REQUEST {
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    MatchType: READER_SEL_REQUEST_MATCH_TYPE,
-    ReaderAndContainerParameter: READER_SEL_REQUEST_ReaderAndContainerParameter,
-}}
-UNION!(
-    READER_SEL_REQUEST, ReaderAndContainerParameter, SerialNumberParameter,
-    SerialNumberParameter_mut, READER_SEL_REQUEST_SerialNumberParameter
-);
-pub type PREADER_SEL_REQUEST = *mut READER_SEL_REQUEST;
-STRUCT!{struct READER_SEL_RESPONSE {
-    cbReaderNameOffset: ::DWORD,
-    cchReaderNameLength: ::DWORD,
-    cbCardNameOffset: ::DWORD,
-    cchCardNameLength: ::DWORD,
-}}
-pub type PREADER_SEL_RESPONSE = *mut READER_SEL_RESPONSE;
-STRUCT!{nodebug struct OPENCARDNAMEA {
-    dwStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hSCardContext: SCARDCONTEXT,
-    lpstrGroupNames: ::LPSTR,
-    nMaxGroupNames: ::DWORD,
-    lpstrCardNames: ::LPSTR,
-    nMaxCardNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrRdr: ::LPSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPSTR,
-    nMaxCard: ::DWORD,
-    lpstrTitle: ::LPCSTR,
-    dwFlags: ::DWORD,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    lpfnConnect: LPOCNCONNPROCA,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnDisconnect: LPOCNDSCPROC,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAMEA = *mut OPENCARDNAMEA;
-pub type LPOPENCARDNAMEA = *mut OPENCARDNAMEA;
-STRUCT!{nodebug struct OPENCARDNAMEW {
-    dwStructSize: ::DWORD,
-    hwndOwner: ::HWND,
-    hSCardContext: SCARDCONTEXT,
-    lpstrGroupNames: ::LPWSTR,
-    nMaxGroupNames: ::DWORD,
-    lpstrCardNames: ::LPWSTR,
-    nMaxCardNames: ::DWORD,
-    rgguidInterfaces: ::LPCGUID,
-    cguidInterfaces: ::DWORD,
-    lpstrRdr: ::LPWSTR,
-    nMaxRdr: ::DWORD,
-    lpstrCard: ::LPWSTR,
-    nMaxCard: ::DWORD,
-    lpstrTitle: ::LPCWSTR,
-    dwFlags: ::DWORD,
-    pvUserData: ::LPVOID,
-    dwShareMode: ::DWORD,
-    dwPreferredProtocols: ::DWORD,
-    dwActiveProtocol: ::DWORD,
-    lpfnConnect: LPOCNCONNPROCW,
-    lpfnCheck: LPOCNCHKPROC,
-    lpfnDisconnect: LPOCNDSCPROC,
-    hCardHandle: SCARDHANDLE,
-}}
-pub type POPENCARDNAMEW = *mut OPENCARDNAMEW;
-pub type LPOPENCARDNAMEW = *mut OPENCARDNAMEW;
-pub type OPENCARDNAME_A = OPENCARDNAMEA;
-pub type OPENCARDNAME_W = OPENCARDNAMEW;
-pub type POPENCARDNAME_A = POPENCARDNAMEA;
-pub type POPENCARDNAME_W = POPENCARDNAMEW;
-pub type LPOPENCARDNAME_A = LPOPENCARDNAMEA;
-pub type LPOPENCARDNAME_W = LPOPENCARDNAMEW;
-pub const SCARD_AUDIT_CHV_FAILURE: ::DWORD = 0x0;
-pub const SCARD_AUDIT_CHV_SUCCESS: ::DWORD = 0x1;
diff --git a/vendor/winapi-0.2.8/src/winsmcrd.rs b/vendor/winapi-0.2.8/src/winsmcrd.rs
deleted file mode 100644
index 28f347492d..0000000000
--- a/vendor/winapi-0.2.8/src/winsmcrd.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-// Smart Card class/port IOCTL codes.
-pub type UWORD = ::WORD;
-DEFINE_GUID!(GUID_DEVINTERFACE_SMARTCARD_READER, 0x50DD5230, 0xBA8A, 0x11D1,
-    0xBF, 0x5D, 0x00, 0x00, 0xF8, 0x05, 0xF5, 0x30);
-pub const SCARD_ATR_LENGTHL: ::DWORD = 33;
-pub const SCARD_PROTOCOL_UNDEFINED: ::DWORD = 0x00000000;
-pub const SCARD_PROTOCOL_T0: ::DWORD = 0x00000001;
-pub const SCARD_PROTOCOL_T1: ::DWORD = 0x00000002;
-pub const SCARD_PROTOCOL_RAW: ::DWORD = 0x00010000;
-pub const SCARD_PROTOCOL_Tx: ::DWORD = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
-pub const SCARD_PROTOCOL_DEFAULT: ::DWORD = 0x80000000;
-pub const SCARD_PROTOCOL_OPTIMAL: ::DWORD = 0x00000000;
-pub const SCARD_POWER_DOWN: ::DWORD = 0;
-pub const SCARD_COLD_RESET: ::DWORD = 1;
-pub const SCARD_WARM_RESET: ::DWORD = 2;
-pub const IOCTL_SMARTCARD_POWER: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 1, ::METHOD_BUFFERED,
-    ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_ATTRIBUTE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 2,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_SET_ATTRIBUTE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 3,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_CONFISCATE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 4,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_TRANSMIT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 5,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_EJECT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 6, ::METHOD_BUFFERED,
-    ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_SWALLOW: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 7,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_IS_PRESENT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 10,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_IS_ABSENT: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 11,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_SET_PROTOCOL: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 12,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_STATE: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 14,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_LAST_ERROR: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 15,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const IOCTL_SMARTCARD_GET_PERF_CNTR: ::DWORD = CTL_CODE!(::FILE_DEVICE_SMARTCARD, 16,
-    ::METHOD_BUFFERED, ::FILE_ANY_ACCESS);
-pub const MAXIMUM_ATTR_STRING_LENGTH: ::DWORD = 32;
-pub const MAXIMUM_SMARTCARD_READERS: ::DWORD = 10;
-pub const SCARD_CLASS_VENDOR_INFO: ::ULONG = 1;
-pub const SCARD_CLASS_COMMUNICATIONS: ::ULONG = 2;
-pub const SCARD_CLASS_PROTOCOL: ::ULONG = 3;
-pub const SCARD_CLASS_POWER_MGMT: ::ULONG = 4;
-pub const SCARD_CLASS_SECURITY: ::ULONG = 5;
-pub const SCARD_CLASS_MECHANICAL: ::ULONG = 6;
-pub const SCARD_CLASS_VENDOR_DEFINED: ::ULONG = 7;
-pub const SCARD_CLASS_IFD_PROTOCOL: ::ULONG = 8;
-pub const SCARD_CLASS_ICC_STATE: ::ULONG = 9;
-pub const SCARD_CLASS_PERF: ::ULONG = 0x7ffe;
-pub const SCARD_CLASS_SYSTEM: ::ULONG = 0x7fff;
-pub const SCARD_ATTR_VENDOR_NAME: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0100;
-pub const SCARD_ATTR_VENDOR_IFD_TYPE: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0101;
-pub const SCARD_ATTR_VENDOR_IFD_VERSION: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0102;
-pub const SCARD_ATTR_VENDOR_IFD_SERIAL_NO: ::ULONG = SCARD_CLASS_VENDOR_INFO << 16 | 0x0103;
-pub const SCARD_ATTR_CHANNEL_ID: ::ULONG = SCARD_CLASS_COMMUNICATIONS << 16 | 0x0110;
-pub const SCARD_ATTR_PROTOCOL_TYPES: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0120;
-pub const SCARD_ATTR_DEFAULT_CLK: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0121;
-pub const SCARD_ATTR_MAX_CLK: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0122;
-pub const SCARD_ATTR_DEFAULT_DATA_RATE: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0123;
-pub const SCARD_ATTR_MAX_DATA_RATE: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0124;
-pub const SCARD_ATTR_MAX_IFSD: ::ULONG = SCARD_CLASS_PROTOCOL << 16 | 0x0125;
-pub const SCARD_ATTR_POWER_MGMT_SUPPORT: ::ULONG = SCARD_CLASS_POWER_MGMT << 16 | 0x0131;
-pub const SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE: ::ULONG = SCARD_CLASS_SECURITY << 16 | 0x0140;
-pub const SCARD_ATTR_USER_AUTH_INPUT_DEVICE: ::ULONG = SCARD_CLASS_SECURITY << 16 | 0x0142;
-pub const SCARD_ATTR_CHARACTERISTICS: ::ULONG = SCARD_CLASS_MECHANICAL << 16 | 0x0150;
-pub const SCARD_ATTR_CURRENT_PROTOCOL_TYPE: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0201;
-pub const SCARD_ATTR_CURRENT_CLK: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0202;
-pub const SCARD_ATTR_CURRENT_F: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0203;
-pub const SCARD_ATTR_CURRENT_D: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0204;
-pub const SCARD_ATTR_CURRENT_N: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0205;
-pub const SCARD_ATTR_CURRENT_W: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0206;
-pub const SCARD_ATTR_CURRENT_IFSC: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0207;
-pub const SCARD_ATTR_CURRENT_IFSD: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0208;
-pub const SCARD_ATTR_CURRENT_BWT: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x0209;
-pub const SCARD_ATTR_CURRENT_CWT: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x020a;
-pub const SCARD_ATTR_CURRENT_EBC_ENCODING: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x020b;
-pub const SCARD_ATTR_EXTENDED_BWT: ::ULONG = SCARD_CLASS_IFD_PROTOCOL << 16 | 0x020c;
-pub const SCARD_ATTR_ICC_PRESENCE: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0300;
-pub const SCARD_ATTR_ICC_INTERFACE_STATUS: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0301;
-pub const SCARD_ATTR_CURRENT_IO_STATE: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0302;
-pub const SCARD_ATTR_ATR_STRING: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0303;
-pub const SCARD_ATTR_ICC_TYPE_PER_ATR: ::ULONG = SCARD_CLASS_ICC_STATE << 16 | 0x0304;
-pub const SCARD_ATTR_ESC_RESET: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA000;
-pub const SCARD_ATTR_ESC_CANCEL: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA003;
-pub const SCARD_ATTR_ESC_AUTHREQUEST: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA005;
-pub const SCARD_ATTR_MAXINPUT: ::ULONG = SCARD_CLASS_VENDOR_DEFINED << 16 | 0xA007;
-pub const SCARD_ATTR_DEVICE_UNIT: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0001;
-pub const SCARD_ATTR_DEVICE_IN_USE: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0002;
-pub const SCARD_ATTR_DEVICE_FRIENDLY_NAME_A: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0003;
-pub const SCARD_ATTR_DEVICE_SYSTEM_NAME_A: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0004;
-pub const SCARD_ATTR_DEVICE_FRIENDLY_NAME_W: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0005;
-pub const SCARD_ATTR_DEVICE_SYSTEM_NAME_W: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0006;
-pub const SCARD_ATTR_SUPRESS_T1_IFS_REQUEST: ::ULONG = SCARD_CLASS_SYSTEM << 16 | 0x0007;
-pub const SCARD_PERF_NUM_TRANSMISSIONS: ::ULONG = SCARD_CLASS_PERF << 16 | 0x0001;
-pub const SCARD_PERF_BYTES_TRANSMITTED: ::ULONG = SCARD_CLASS_PERF << 16 | 0x0002;
-pub const SCARD_PERF_TRANSMISSION_TIME: ::ULONG = SCARD_CLASS_PERF << 16 | 0x0003;
-pub const SCARD_T0_HEADER_LENGTH: ::DWORD = 7;
-pub const SCARD_T0_CMD_LENGTH: ::DWORD = 5;
-pub const SCARD_T1_PROLOGUE_LENGTH: ::DWORD = 3;
-pub const SCARD_T1_EPILOGUE_LENGTH: ::DWORD = 2;
-pub const SCARD_T1_MAX_IFS: ::DWORD = 254;
-pub const SCARD_UNKNOWN: ::ULONG = 0;
-pub const SCARD_ABSENT: ::ULONG = 1;
-pub const SCARD_PRESENT: ::ULONG = 2;
-pub const SCARD_SWALLOWED: ::ULONG = 3;
-pub const SCARD_POWERED: ::ULONG = 4;
-pub const SCARD_NEGOTIABLE: ::ULONG = 5;
-pub const SCARD_SPECIFIC: ::ULONG = 6;
-STRUCT!{struct SCARD_IO_REQUEST {
-    dwProtocol: ::DWORD,
-    cbPciLength: ::DWORD,
-}}
-pub type PSCARD_IO_REQUEST = *mut SCARD_IO_REQUEST;
-pub type LPSCARD_IO_REQUEST = *mut SCARD_IO_REQUEST;
-pub type LPCSCARD_IO_REQUEST = *const SCARD_IO_REQUEST;
-STRUCT!{struct SCARD_T0_COMMAND {
-    bCla: ::BYTE,
-    bIns: ::BYTE,
-    bP1: ::BYTE,
-    bP2: ::BYTE,
-    bP3: ::BYTE,
-}}
-pub type LPSCARD_T0_COMMAND = *mut SCARD_T0_COMMAND;
-STRUCT!{struct SCARD_T0_REQUEST {
-    ioRequest: SCARD_IO_REQUEST,
-    bSw1: ::BYTE,
-    bSw2: ::BYTE,
-    CmdBytes: SCARD_T0_COMMAND,
-}}
-UNION!(SCARD_T0_REQUEST, CmdBytes, rgbHeader, rgbHeader_mut, [::BYTE; 5]);
-pub type PSCARD_T0_REQUEST = *mut SCARD_T0_REQUEST;
-pub type LPSCARD_T0_REQUEST = *mut SCARD_T0_REQUEST;
-STRUCT!{struct SCARD_T1_REQUEST {
-    ioRequest: SCARD_IO_REQUEST,
-}}
-pub type PSCARD_T1_REQUEST = *mut SCARD_T1_REQUEST;
-pub type LPSCARD_T1_REQUEST = *mut SCARD_T1_REQUEST;
-pub const SCARD_READER_SWALLOWS: ::ULONG = 0x00000001;
-pub const SCARD_READER_EJECTS: ::ULONG = 0x00000002;
-pub const SCARD_READER_CONFISCATES: ::ULONG = 0x00000004;
-pub const SCARD_READER_TYPE_SERIAL: ::ULONG = 0x01;
-pub const SCARD_READER_TYPE_PARALELL: ::ULONG = 0x02;
-pub const SCARD_READER_TYPE_KEYBOARD: ::ULONG = 0x04;
-pub const SCARD_READER_TYPE_SCSI: ::ULONG = 0x08;
-pub const SCARD_READER_TYPE_IDE: ::ULONG = 0x10;
-pub const SCARD_READER_TYPE_USB: ::ULONG = 0x20;
-pub const SCARD_READER_TYPE_PCMCIA: ::ULONG = 0x40;
-pub const SCARD_READER_TYPE_TPM: ::ULONG = 0x80;
-pub const SCARD_READER_TYPE_NFC: ::ULONG = 0x100;
-pub const SCARD_READER_TYPE_UICC: ::ULONG = 0x200;
-pub const SCARD_READER_TYPE_VENDOR: ::ULONG = 0xF0;
diff --git a/vendor/winapi-0.2.8/src/winsock2.rs b/vendor/winapi-0.2.8/src/winsock2.rs
deleted file mode 100644
index 05b62f2c43..0000000000
--- a/vendor/winapi-0.2.8/src/winsock2.rs
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! definitions to be used with the WinSock 2 DLL and WinSock 2 applications.
-//!
-//! This header file corresponds to version 2.2.x of the WinSock API specification.
-pub const WINSOCK_VERSION: ::WORD = 2 | (2 << 8);
-pub type u_char = ::c_uchar;
-pub type u_short = ::c_ushort;
-pub type u_int = ::c_uint;
-pub type u_long = ::c_ulong;
-pub type u_int64 = ::__uint64;
-pub type SOCKET = ::UINT_PTR;
-pub type GROUP = ::c_uint;
-pub const FD_SETSIZE: usize = 64;
-pub const FD_MAX_EVENTS: usize = 10;
-STRUCT!{nodebug struct fd_set {
-    fd_count: u_int,
-    fd_array: [SOCKET; FD_SETSIZE],
-}}
-STRUCT!{struct timeval {
-    tv_sec: ::c_long,
-    tv_usec: ::c_long,
-}}
-STRUCT!{struct hostent {
-    h_name: *mut ::c_char,
-    h_aliases: *mut *mut ::c_char,
-    h_addrtype: ::c_short,
-    h_length: ::c_short,
-    h_addr_list: *mut *mut ::c_char,
-}}
-STRUCT!{struct netent {
-    n_name: *mut ::c_char,
-    n_aliases: *mut *mut ::c_char,
-    n_addrtype: ::c_short,
-    n_net: u_long,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{struct servent {
-    s_name: *mut ::c_char,
-    s_aliases: *mut *mut ::c_char,
-    s_port: ::c_short,
-    s_proto: *mut ::c_char,
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct servent {
-    s_name: *mut ::c_char,
-    s_aliases: *mut *mut ::c_char,
-    s_proto: *mut ::c_char,
-    s_port: ::c_short,
-}}
-STRUCT!{struct protoent {
-    p_name: *mut ::c_char,
-    p_aliases: *mut *mut ::c_char,
-    p_proto: ::c_short,
-}}
-pub const WSADESCRIPTION_LEN: usize = 256;
-pub const WSASYS_STATUS_LEN: usize = 128;
-#[cfg(target_arch="x86")]
-STRUCT!{nodebug struct WSADATA {
-    wVersion: ::WORD,
-    wHighVersion: ::WORD,
-    szDescription: [::c_char; WSADESCRIPTION_LEN + 1],
-    szSystemStatus: [::c_char; WSASYS_STATUS_LEN + 1],
-    iMaxSockets: ::c_ushort,
-    iMaxUdpDg: ::c_ushort,
-    lpVendorInfo: *mut ::c_char,
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{nodebug struct WSADATA {
-    wVersion: ::WORD,
-    wHighVersion: ::WORD,
-    iMaxSockets: ::c_ushort,
-    iMaxUdpDg: ::c_ushort,
-    lpVendorInfo: *mut ::c_char,
-    szDescription: [::c_char; WSADESCRIPTION_LEN + 1],
-    szSystemStatus: [::c_char; WSASYS_STATUS_LEN + 1],
-}}
-pub type LPWSADATA = *mut WSADATA;
-//391
-pub const INVALID_SOCKET: SOCKET = !0;
-pub const SOCKET_ERROR: ::c_int = -1;
-STRUCT!{struct sockproto {
-    sp_family: u_short,
-    sp_protocol: u_short,
-}}
-pub const PF_UNSPEC: ::c_int = ::AF_UNSPEC;
-pub const PF_UNIX: ::c_int = ::AF_UNIX;
-pub const PF_INET: ::c_int = ::AF_INET;
-pub const PF_IMPLINK: ::c_int = ::AF_IMPLINK;
-pub const PF_PUP: ::c_int = ::AF_PUP;
-pub const PF_CHAOS: ::c_int = ::AF_CHAOS;
-pub const PF_NS: ::c_int = ::AF_NS;
-pub const PF_IPX: ::c_int = ::AF_IPX;
-pub const PF_ISO: ::c_int = ::AF_ISO;
-pub const PF_OSI: ::c_int = ::AF_OSI;
-pub const PF_ECMA: ::c_int = ::AF_ECMA;
-pub const PF_DATAKIT: ::c_int = ::AF_DATAKIT;
-pub const PF_CCITT: ::c_int = ::AF_CCITT;
-pub const PF_SNA: ::c_int = ::AF_SNA;
-pub const PF_DECnet: ::c_int = ::AF_DECnet;
-pub const PF_DLI: ::c_int = ::AF_DLI;
-pub const PF_LAT: ::c_int = ::AF_LAT;
-pub const PF_HYLINK: ::c_int = ::AF_HYLINK;
-pub const PF_APPLETALK: ::c_int = ::AF_APPLETALK;
-pub const PF_VOICEVIEW: ::c_int = ::AF_VOICEVIEW;
-pub const PF_FIREFOX: ::c_int = ::AF_FIREFOX;
-pub const PF_UNKNOWN1: ::c_int = ::AF_UNKNOWN1;
-pub const PF_BAN: ::c_int = ::AF_BAN;
-pub const PF_ATM: ::c_int = ::AF_ATM;
-pub const PF_INET6: ::c_int = ::AF_INET6;
-pub const PF_BTH: ::c_int = ::AF_BTH;
-pub const PF_MAX: ::c_int = ::AF_MAX;
-STRUCT!{struct linger {
-    l_onoff: u_short,
-    l_linger: u_short,
-}}
-pub const SOMAXCONN: ::c_int = 0x7fffffff;
-pub type WSAEVENT = ::HANDLE;
-pub type LPWSAEVENT = ::LPHANDLE;
-pub type WSAOVERLAPPED = ::OVERLAPPED;
-pub type LPWSAOVERLAPPED = *mut ::OVERLAPPED;
-pub const WSA_IO_PENDING: ::DWORD = ::ERROR_IO_PENDING;
-pub const WSA_IO_INCOMPLETE: ::DWORD = ::ERROR_IO_INCOMPLETE;
-pub const WSA_INVALID_HANDLE: ::DWORD = ::ERROR_INVALID_HANDLE;
-pub const WSA_INVALID_PARAMETER: ::DWORD = ::ERROR_INVALID_PARAMETER;
-pub const WSA_NOT_ENOUGH_MEMORY: ::DWORD = ::ERROR_NOT_ENOUGH_MEMORY;
-pub const WSA_OPERATION_ABORTED: ::DWORD = ::ERROR_OPERATION_ABORTED;
-STRUCT!{struct QOS {
-    SendingFlowspec: ::FLOWSPEC,
-    FLOWSPEC: ::FLOWSPEC,
-    ProviderSpecific: ::WSABUF,
-}}
-pub type LPQOS = *mut QOS;
-STRUCT!{struct WSANETWORKEVENTS {
-    lNetworkEvents: ::c_long,
-    iErrorCode: [::c_int; FD_MAX_EVENTS],
-}}
-pub type LPWSANETWORKEVENTS = *mut WSANETWORKEVENTS;
-pub const MAX_PROTOCOL_CHAIN: usize = 7;
-STRUCT!{struct WSAPROTOCOLCHAIN {
-    ChainLen: ::c_int,
-    ChainEntries: [::DWORD; MAX_PROTOCOL_CHAIN],
-}}
-pub type LPWSAPROTOCOLCHAIN = *mut WSAPROTOCOLCHAIN;
-pub const WSAPROTOCOL_LEN: usize = 255;
-STRUCT!{nodebug struct WSAPROTOCOL_INFOA {
-    dwServiceFlags1: ::DWORD,
-    dwServiceFlags2: ::DWORD,
-    dwServiceFlags3: ::DWORD,
-    dwServiceFlags4: ::DWORD,
-    dwServiceFlags5: ::DWORD,
-    ProviderId: ::GUID,
-    dwCatalogEntryId: ::DWORD,
-    ProtocolChain: WSAPROTOCOLCHAIN,
-    iVersion: ::c_int,
-    iAddressFamily: ::c_int,
-    iMaxSockAddr: ::c_int,
-    iMinSockAddr: ::c_int,
-    iSocketType: ::c_int,
-    iProtocol: ::c_int,
-    iProtocolMaxOffset: ::c_int,
-    iNetworkByteOrder: ::c_int,
-    iSecurityScheme: ::c_int,
-    dwMessageSize: ::DWORD,
-    dwProviderReserved: ::DWORD,
-    szProtocol: [::CHAR; WSAPROTOCOL_LEN + 1],
-}}
-pub type LPWSAPROTOCOL_INFOA = *mut WSAPROTOCOL_INFOA;
-STRUCT!{nodebug struct WSAPROTOCOL_INFOW {
-    dwServiceFlags1: ::DWORD,
-    dwServiceFlags2: ::DWORD,
-    dwServiceFlags3: ::DWORD,
-    dwServiceFlags4: ::DWORD,
-    dwServiceFlags5: ::DWORD,
-    ProviderId: ::GUID,
-    dwCatalogEntryId: ::DWORD,
-    ProtocolChain: WSAPROTOCOLCHAIN,
-    iVersion: ::c_int,
-    iAddressFamily: ::c_int,
-    iMaxSockAddr: ::c_int,
-    iMinSockAddr: ::c_int,
-    iSocketType: ::c_int,
-    iProtocol: ::c_int,
-    iProtocolMaxOffset: ::c_int,
-    iNetworkByteOrder: ::c_int,
-    iSecurityScheme: ::c_int,
-    dwMessageSize: ::DWORD,
-    dwProviderReserved: ::DWORD,
-    szProtocol: [::WCHAR; WSAPROTOCOL_LEN + 1],
-}}
-pub type LPWSAPROTOCOL_INFOW = *mut WSAPROTOCOL_INFOW;
-pub type LPCONDITIONPROC = Option<unsafe extern "system" fn(
-    lpCallerId: ::LPWSABUF, lpCallerData: ::LPWSABUF, lpSQOS: LPQOS, lpGQOS: LPQOS,
-    lpCalleeId: ::LPWSABUF, lpCalleeData: ::LPWSABUF, g: *mut GROUP, dwCallbackData: ::DWORD,
-) -> ::c_int>;
-pub type LPWSAOVERLAPPED_COMPLETION_ROUTINE = Option<unsafe extern "system" fn(
-    dwError: ::DWORD, cbTransferred: ::DWORD, lpOverlapped: LPWSAOVERLAPPED, dwFlags: ::DWORD,
-)>;
-ENUM!{enum WSACOMPLETIONTYPE {
-    NSP_NOTIFY_IMMEDIATELY = 0,
-    NSP_NOTIFY_HWND,
-    NSP_NOTIFY_EVENT,
-    NSP_NOTIFY_PORT,
-    NSP_NOTIFY_APC,
-}}
-pub type PWSACOMPLETIONTYPE = *mut WSACOMPLETIONTYPE;
-pub type LPWSACOMPLETIONTYPE = *mut WSACOMPLETIONTYPE;
-STRUCT!{struct WSACOMPLETION_WindowMessage {
-    hWnd: ::HWND,
-    uMsg: ::UINT,
-    context: ::WPARAM,
-}}
-STRUCT!{struct WSACOMPLETION_Event {
-    lpOverlapped: LPWSAOVERLAPPED,
-}}
-STRUCT!{nodebug struct WSACOMPLETION_Apc {
-    lpOverlapped: LPWSAOVERLAPPED,
-    lpfnCompletionProc: LPWSAOVERLAPPED_COMPLETION_ROUTINE,
-}}
-STRUCT!{struct WSACOMPLETION_Port {
-    lpOverlapped: LPWSAOVERLAPPED,
-    hPort: ::HANDLE,
-    Key: ::ULONG_PTR,
-}}
-#[cfg(target_arch="x86")]
-STRUCT!{struct WSACOMPLETION {
-    Type: WSACOMPLETIONTYPE,
-    Parameters: [u8; 12],
-}}
-#[cfg(target_arch="x86_64")]
-STRUCT!{struct WSACOMPLETION {
-    Type: WSACOMPLETIONTYPE,
-    Parameters: [u8; 24],
-}}
-UNION!(WSACOMPLETION, Parameters, WindowMessage, WindowMessage_mut, WSACOMPLETION_WindowMessage);
-UNION!(WSACOMPLETION, Parameters, Event, Event_mut, WSACOMPLETION_Event);
-UNION!(WSACOMPLETION, Parameters, Apc, Apc_mut, WSACOMPLETION_Apc);
-UNION!(WSACOMPLETION, Parameters, Port, Port_mut, WSACOMPLETION_Port);
-pub type PWSACOMPLETION = *mut WSACOMPLETION;
-pub type LPWSACOMPLETION = *mut WSACOMPLETION;
-STRUCT!{struct AFPROTOCOLS {
-    iAddressFamily: ::INT,
-    iProtocol: ::INT,
-}}
-pub type PAFPROTOCOLS = *mut AFPROTOCOLS;
-pub type LPAFPROTOCOLS = *mut AFPROTOCOLS;
-ENUM!{enum WSAECOMPARATOR {
-    COMP_EQUAL = 0,
-    COMP_NOTLESS,
-}}
-pub type PWSAECOMPARATOR = *mut WSAECOMPARATOR;
-pub type LPWSAECOMPARATOR = *mut WSAECOMPARATOR;
-STRUCT!{struct WSAVERSION {
-    dwVersion: ::DWORD,
-    ecHow: WSAECOMPARATOR,
-}}
-pub type PWSAVERSION = *mut WSAVERSION;
-pub type LPWSAVERSION = *mut WSAVERSION;
-STRUCT!{struct WSAQUERYSETA {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPSTR,
-    lpServiceClassId: ::LPGUID,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSETA = *mut WSAQUERYSETA;
-pub type LPWSAQUERYSETA = *mut WSAQUERYSETA;
-STRUCT!{struct WSAQUERYSETW {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPWSTR,
-    lpServiceClassId: ::LPGUID,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPWSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPWSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPWSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSETW = *mut WSAQUERYSETW;
-pub type LPWSAQUERYSETW = *mut WSAQUERYSETW;
-STRUCT!{struct WSAQUERYSET2A {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPSTR,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSET2A = *mut WSAQUERYSET2A;
-pub type LPWSAQUERYSET2A = *mut WSAQUERYSET2A;
-STRUCT!{struct WSAQUERYSET2W {
-    dwSize: ::DWORD,
-    lpszServiceInstanceName: ::LPWSTR,
-    lpVersion: LPWSAVERSION,
-    lpszComment: ::LPWSTR,
-    dwNameSpace: ::DWORD,
-    lpNSProviderId: ::LPGUID,
-    lpszContext: ::LPWSTR,
-    dwNumberOfProtocols: ::DWORD,
-    lpafpProtocols: LPAFPROTOCOLS,
-    lpszQueryString: ::LPWSTR,
-    dwNumberOfCsAddrs: ::DWORD,
-    lpcsaBuffer: ::LPCSADDR_INFO,
-    dwOutputFlags: ::DWORD,
-    lpBlob: ::LPBLOB,
-}}
-pub type PWSAQUERYSET2W = *mut WSAQUERYSET2W;
-pub type LPWSAQUERYSET2W = *mut WSAQUERYSET2W;
-ENUM!{enum WSAESETSERVICEOP {
-    RNRSERVICE_REGISTER = 0,
-    RNRSERVICE_DEREGISTER,
-    RNRSERVICE_DELETE,
-}}
-pub type PWSAESETSERVICEOP = *mut WSAESETSERVICEOP;
-pub type LPWSAESETSERVICEOP = *mut WSAESETSERVICEOP;
-STRUCT!{struct WSANSCLASSINFOA {
-    lpszName: ::LPSTR,
-    dwNameSpace: ::DWORD,
-    dwValueType: ::DWORD,
-    dwValueSize: ::DWORD,
-    lpValue: ::LPVOID,
-}}
-pub type PWSANSCLASSINFOA = *mut WSANSCLASSINFOA;
-pub type LPWSANSCLASSINFOA = *mut WSANSCLASSINFOA;
-STRUCT!{struct WSANSCLASSINFOW {
-    lpszName: ::LPWSTR,
-    dwNameSpace: ::DWORD,
-    dwValueType: ::DWORD,
-    dwValueSize: ::DWORD,
-    lpValue: ::LPVOID,
-}}
-pub type PWSANSCLASSINFOW = *mut WSANSCLASSINFOW;
-pub type LPWSANSCLASSINFOW = *mut WSANSCLASSINFOW;
-STRUCT!{struct WSASERVICECLASSINFOA {
-    lpServiceClassId: ::LPGUID,
-    lpszServiceClassName: ::LPSTR,
-    dwCount: ::DWORD,
-    lpClassInfos: LPWSANSCLASSINFOA,
-}}
-pub type PWSASERVICECLASSINFOA = *mut WSASERVICECLASSINFOA;
-pub type LPWSASERVICECLASSINFOA = *mut WSASERVICECLASSINFOA;
-STRUCT!{struct WSASERVICECLASSINFOW {
-    lpServiceClassId: ::LPGUID,
-    lpszServiceClassName: ::LPWSTR,
-    dwCount: ::DWORD,
-    lpClassInfos: LPWSANSCLASSINFOW,
-}}
-pub type PWSASERVICECLASSINFOW = *mut WSASERVICECLASSINFOW;
-pub type LPWSASERVICECLASSINFOW = *mut WSASERVICECLASSINFOW;
-STRUCT!{struct WSANAMESPACE_INFOA {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPSTR,
-}}
-pub type PWSANAMESPACE_INFOA = *mut WSANAMESPACE_INFOA;
-pub type LPWSANAMESPACE_INFOA = *mut WSANAMESPACE_INFOA;
-STRUCT!{struct WSANAMESPACE_INFOW {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPWSTR,
-}}
-pub type PWSANAMESPACE_INFOW = *mut WSANAMESPACE_INFOW;
-pub type LPWSANAMESPACE_INFOW = *mut WSANAMESPACE_INFOW;
-STRUCT!{struct WSANAMESPACE_INFOEXA {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPSTR,
-    ProviderSpecific: ::BLOB,
-}}
-pub type PWSANAMESPACE_INFOEXA = *mut WSANAMESPACE_INFOEXA;
-pub type LPWSANAMESPACE_INFOEXA = *mut WSANAMESPACE_INFOEXA;
-STRUCT!{struct WSANAMESPACE_INFOEXW {
-    NSProviderId: ::GUID,
-    dwNameSpace: ::DWORD,
-    fActive: ::BOOL,
-    dwVersion: ::DWORD,
-    lpszIdentifier: ::LPWSTR,
-    ProviderSpecific: ::BLOB,
-}}
-pub type PWSANAMESPACE_INFOEXW = *mut WSANAMESPACE_INFOEXW;
-pub type LPWSANAMESPACE_INFOEXW = *mut WSANAMESPACE_INFOEXW;
-pub const POLLRDNORM: ::SHORT = 0x0100;
-pub const POLLRDBAND: ::SHORT = 0x0200;
-pub const POLLIN: ::SHORT = POLLRDNORM | POLLRDBAND;
-pub const POLLPRI: ::SHORT = 0x0400;
-pub const POLLWRNORM: ::SHORT = 0x0010;
-pub const POLLOUT: ::SHORT = POLLWRNORM;
-pub const POLLWRBAND: ::SHORT = 0x0020;
-pub const POLLERR: ::SHORT = 0x0001;
-pub const POLLHUP: ::SHORT = 0x0002;
-pub const POLLNVAL: ::SHORT = 0x0004;
-STRUCT!{struct WSAPOLLFD {
-    fd: ::SOCKET,
-    events: ::SHORT,
-    revents: ::SHORT,
-}}
-pub type PWSAPOLLFD = *mut WSAPOLLFD;
-pub type LPWSAPOLLFD = *mut WSAPOLLFD;
-pub const FIONBIO: ::c_ulong = 0x8004667e;
diff --git a/vendor/winapi-0.2.8/src/winspool.rs b/vendor/winapi-0.2.8/src/winspool.rs
deleted file mode 100644
index eec339cc15..0000000000
--- a/vendor/winapi-0.2.8/src/winspool.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Winspool header file
-STRUCT!{struct PRINTER_DEFAULTSA {
-    pDataType: ::LPSTR,
-    pDevMode: ::LPDEVMODEA,
-    DesiredAccess: ::ACCESS_MASK,
-}}
-pub type PPRINTER_DEFAULTSA = *mut PRINTER_DEFAULTSA;
-pub type LPPRINTER_DEFAULTSA = *mut PRINTER_DEFAULTSA;
-STRUCT!{struct PRINTER_DEFAULTSW {
-    pDataType: ::LPWSTR,
-    pDevMode: ::LPDEVMODEW,
-    DesiredAccess: ::ACCESS_MASK,
-}}
-pub type PPRINTER_DEFAULTSW = *mut PRINTER_DEFAULTSW;
-pub type LPPRINTER_DEFAULTSW = *mut PRINTER_DEFAULTSW;
-STRUCT!{struct PRINTER_OPTIONSA {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-}}
-pub type PPRINTER_OPTIONSA = *mut PRINTER_OPTIONSA;
-pub type LPPRINTER_OPTIONSA = *mut PRINTER_OPTIONSA;
-STRUCT!{struct PRINTER_OPTIONSW {
-    cbSize: ::UINT,
-    dwFlags: ::DWORD,
-}}
-pub type PPRINTER_OPTIONSW = *mut PRINTER_OPTIONSW;
-pub type LPPRINTER_OPTIONSW = *mut PRINTER_OPTIONSW;
diff --git a/vendor/winapi-0.2.8/src/winstring.rs b/vendor/winapi-0.2.8/src/winstring.rs
deleted file mode 100644
index 74053d4e85..0000000000
--- a/vendor/winapi-0.2.8/src/winstring.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub type PINSPECT_HSTRING_CALLBACK = Option<unsafe extern "system" fn(
-    *const ::VOID, ::UINT_PTR, ::UINT32, *mut ::BYTE,
-) -> ::HRESULT>;
diff --git a/vendor/winapi-0.2.8/src/winsvc.rs b/vendor/winapi-0.2.8/src/winsvc.rs
deleted file mode 100644
index 93513668a8..0000000000
--- a/vendor/winapi-0.2.8/src/winsvc.rs
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! Header file for the Service Control Manager
-//80
-pub const SERVICE_NO_CHANGE: ::DWORD = 0xffffffff;
-pub const SERVICE_ACTIVE: ::DWORD = 0x00000001;
-pub const SERVICE_INACTIVE: ::DWORD = 0x00000002;
-pub const SERVICE_STATE_ALL: ::DWORD = SERVICE_ACTIVE | SERVICE_INACTIVE;
-pub const SERVICE_CONTROL_STOP: ::DWORD = 0x00000001;
-pub const SERVICE_CONTROL_PAUSE: ::DWORD = 0x00000002;
-pub const SERVICE_CONTROL_CONTINUE: ::DWORD = 0x00000003;
-pub const SERVICE_CONTROL_INTERROGATE: ::DWORD = 0x00000004;
-pub const SERVICE_CONTROL_SHUTDOWN: ::DWORD = 0x00000005;
-pub const SERVICE_CONTROL_PARAMCHANGE: ::DWORD = 0x00000006;
-pub const SERVICE_CONTROL_NETBINDADD: ::DWORD = 0x00000007;
-pub const SERVICE_CONTROL_NETBINDREMOVE: ::DWORD = 0x00000008;
-pub const SERVICE_CONTROL_NETBINDENABLE: ::DWORD = 0x00000009;
-pub const SERVICE_CONTROL_NETBINDDISABLE: ::DWORD = 0x0000000A;
-pub const SERVICE_CONTROL_DEVICEEVENT: ::DWORD = 0x0000000B;
-pub const SERVICE_CONTROL_HARDWAREPROFILECHANGE: ::DWORD = 0x0000000C;
-pub const SERVICE_CONTROL_POWEREVENT: ::DWORD = 0x0000000D;
-pub const SERVICE_CONTROL_SESSIONCHANGE: ::DWORD = 0x0000000E;
-pub const SERVICE_CONTROL_PRESHUTDOWN: ::DWORD = 0x0000000F;
-pub const SERVICE_CONTROL_TIMECHANGE: ::DWORD = 0x00000010;
-pub const SERVICE_CONTROL_TRIGGEREVENT: ::DWORD = 0x00000020;
-pub const SERVICE_STOPPED: ::DWORD = 0x00000001;
-pub const SERVICE_START_PENDING: ::DWORD = 0x00000002;
-pub const SERVICE_STOP_PENDING: ::DWORD = 0x00000003;
-pub const SERVICE_RUNNING: ::DWORD = 0x00000004;
-pub const SERVICE_CONTINUE_PENDING: ::DWORD = 0x00000005;
-pub const SERVICE_PAUSE_PENDING: ::DWORD = 0x00000006;
-pub const SERVICE_PAUSED: ::DWORD = 0x00000007;
-pub const SERVICE_ACCEPT_STOP: ::DWORD = 0x00000001;
-pub const SERVICE_ACCEPT_PAUSE_CONTINUE: ::DWORD = 0x00000002;
-pub const SERVICE_ACCEPT_SHUTDOWN: ::DWORD = 0x00000004;
-pub const SERVICE_ACCEPT_PARAMCHANGE: ::DWORD = 0x00000008;
-pub const SERVICE_ACCEPT_NETBINDCHANGE: ::DWORD = 0x00000010;
-pub const SERVICE_ACCEPT_HARDWAREPROFILECHANGE: ::DWORD = 0x00000020;
-pub const SERVICE_ACCEPT_POWEREVENT: ::DWORD = 0x00000040;
-pub const SERVICE_ACCEPT_SESSIONCHANGE: ::DWORD = 0x00000080;
-pub const SERVICE_ACCEPT_PRESHUTDOWN: ::DWORD = 0x00000100;
-pub const SERVICE_ACCEPT_TIMECHANGE: ::DWORD = 0x00000200;
-pub const SERVICE_ACCEPT_TRIGGEREVENT: ::DWORD = 0x00000400;
-pub const SC_MANAGER_CONNECT: ::DWORD = 0x0001;
-pub const SC_MANAGER_CREATE_SERVICE: ::DWORD = 0x0002;
-pub const SC_MANAGER_ENUMERATE_SERVICE: ::DWORD = 0x0004;
-pub const SC_MANAGER_LOCK: ::DWORD = 0x0008;
-pub const SC_MANAGER_QUERY_LOCK_STATUS: ::DWORD = 0x0010;
-pub const SC_MANAGER_MODIFY_BOOT_CONFIG: ::DWORD = 0x0020;
-pub const SC_MANAGER_ALL_ACCESS: ::DWORD = ::STANDARD_RIGHTS_REQUIRED | SC_MANAGER_CONNECT
-    | SC_MANAGER_CREATE_SERVICE | SC_MANAGER_ENUMERATE_SERVICE | SC_MANAGER_LOCK
-    | SC_MANAGER_QUERY_LOCK_STATUS | SC_MANAGER_MODIFY_BOOT_CONFIG;
-pub const SERVICE_QUERY_CONFIG: ::DWORD = 0x0001;
-pub const SERVICE_CHANGE_CONFIG: ::DWORD = 0x0002;
-pub const SERVICE_QUERY_STATUS: ::DWORD = 0x0004;
-pub const SERVICE_ENUMERATE_DEPENDENTS: ::DWORD = 0x0008;
-pub const SERVICE_START: ::DWORD = 0x0010;
-pub const SERVICE_STOP: ::DWORD = 0x0020;
-pub const SERVICE_PAUSE_CONTINUE: ::DWORD = 0x0040;
-pub const SERVICE_INTERROGATE: ::DWORD = 0x0080;
-pub const SERVICE_USER_DEFINED_CONTROL: ::DWORD = 0x0100;
-pub const SERVICE_ALL_ACCESS: ::DWORD = ::STANDARD_RIGHTS_REQUIRED | SERVICE_QUERY_CONFIG
-    | SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_START
-    | SERVICE_STOP | SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_USER_DEFINED_CONTROL;
-pub const SERVICE_RUNS_IN_SYSTEM_PROCESS: ::DWORD = 0x00000001;
-pub const SERVICE_CONFIG_DESCRIPTION: ::DWORD = 1;
-pub const SERVICE_CONFIG_FAILURE_ACTIONS: ::DWORD = 2;
-pub const SERVICE_CONFIG_DELAYED_AUTO_START_INFO: ::DWORD = 3;
-pub const SERVICE_CONFIG_FAILURE_ACTIONS_FLAG: ::DWORD = 4;
-pub const SERVICE_CONFIG_SERVICE_SID_INFO: ::DWORD = 5;
-pub const SERVICE_CONFIG_REQUIRED_PRIVILEGES_INFO: ::DWORD = 6;
-pub const SERVICE_CONFIG_PRESHUTDOWN_INFO: ::DWORD = 7;
-pub const SERVICE_CONFIG_TRIGGER_INFO: ::DWORD = 8;
-pub const SERVICE_CONFIG_PREFERRED_NODE: ::DWORD = 9;
-pub const SERVICE_CONFIG_LAUNCH_PROTECTED: ::DWORD = 12;
-pub const SERVICE_NOTIFY_STATUS_CHANGE_1: ::DWORD = 1;
-pub const SERVICE_NOTIFY_STATUS_CHANGE_2: ::DWORD = 2;
-pub const SERVICE_NOTIFY_STATUS_CHANGE: ::DWORD = SERVICE_NOTIFY_STATUS_CHANGE_2;
-pub const SERVICE_NOTIFY_STOPPED: ::DWORD = 0x00000001;
-pub const SERVICE_NOTIFY_START_PENDING: ::DWORD = 0x00000002;
-pub const SERVICE_NOTIFY_STOP_PENDING: ::DWORD = 0x00000004;
-pub const SERVICE_NOTIFY_RUNNING: ::DWORD = 0x00000008;
-pub const SERVICE_NOTIFY_CONTINUE_PENDING: ::DWORD = 0x00000010;
-pub const SERVICE_NOTIFY_PAUSE_PENDING: ::DWORD = 0x00000020;
-pub const SERVICE_NOTIFY_PAUSED: ::DWORD = 0x00000040;
-pub const SERVICE_NOTIFY_CREATED: ::DWORD = 0x00000080;
-pub const SERVICE_NOTIFY_DELETED: ::DWORD = 0x00000100;
-pub const SERVICE_NOTIFY_DELETE_PENDING: ::DWORD = 0x00000200;
-pub const SERVICE_STOP_REASON_FLAG_MIN: ::DWORD = 0x00000000;
-pub const SERVICE_STOP_REASON_FLAG_UNPLANNED: ::DWORD = 0x10000000;
-pub const SERVICE_STOP_REASON_FLAG_CUSTOM: ::DWORD = 0x20000000;
-pub const SERVICE_STOP_REASON_FLAG_PLANNED: ::DWORD = 0x40000000;
-pub const SERVICE_STOP_REASON_FLAG_MAX: ::DWORD = 0x80000000;
-pub const SERVICE_STOP_REASON_MAJOR_MIN: ::DWORD = 0x00000000;
-pub const SERVICE_STOP_REASON_MAJOR_OTHER: ::DWORD = 0x00010000;
-pub const SERVICE_STOP_REASON_MAJOR_HARDWARE: ::DWORD = 0x00020000;
-pub const SERVICE_STOP_REASON_MAJOR_OPERATINGSYSTEM: ::DWORD = 0x00030000;
-pub const SERVICE_STOP_REASON_MAJOR_SOFTWARE: ::DWORD = 0x00040000;
-pub const SERVICE_STOP_REASON_MAJOR_APPLICATION: ::DWORD = 0x00050000;
-pub const SERVICE_STOP_REASON_MAJOR_NONE: ::DWORD = 0x00060000;
-pub const SERVICE_STOP_REASON_MAJOR_MAX: ::DWORD = 0x00070000;
-pub const SERVICE_STOP_REASON_MAJOR_MIN_CUSTOM: ::DWORD = 0x00400000;
-pub const SERVICE_STOP_REASON_MAJOR_MAX_CUSTOM: ::DWORD = 0x00ff0000;
-pub const SERVICE_STOP_REASON_MINOR_MIN: ::DWORD = 0x00000000;
-pub const SERVICE_STOP_REASON_MINOR_OTHER: ::DWORD = 0x00000001;
-pub const SERVICE_STOP_REASON_MINOR_MAINTENANCE: ::DWORD = 0x00000002;
-pub const SERVICE_STOP_REASON_MINOR_INSTALLATION: ::DWORD = 0x00000003;
-pub const SERVICE_STOP_REASON_MINOR_UPGRADE: ::DWORD = 0x00000004;
-pub const SERVICE_STOP_REASON_MINOR_RECONFIG: ::DWORD = 0x00000005;
-pub const SERVICE_STOP_REASON_MINOR_HUNG: ::DWORD = 0x00000006;
-pub const SERVICE_STOP_REASON_MINOR_UNSTABLE: ::DWORD = 0x00000007;
-pub const SERVICE_STOP_REASON_MINOR_DISK: ::DWORD = 0x00000008;
-pub const SERVICE_STOP_REASON_MINOR_NETWORKCARD: ::DWORD = 0x00000009;
-pub const SERVICE_STOP_REASON_MINOR_ENVIRONMENT: ::DWORD = 0x0000000a;
-pub const SERVICE_STOP_REASON_MINOR_HARDWARE_DRIVER: ::DWORD = 0x0000000b;
-pub const SERVICE_STOP_REASON_MINOR_OTHERDRIVER: ::DWORD = 0x0000000c;
-pub const SERVICE_STOP_REASON_MINOR_SERVICEPACK: ::DWORD = 0x0000000d;
-pub const SERVICE_STOP_REASON_MINOR_SOFTWARE_UPDATE: ::DWORD = 0x0000000e;
-pub const SERVICE_STOP_REASON_MINOR_SECURITYFIX: ::DWORD = 0x0000000f;
-pub const SERVICE_STOP_REASON_MINOR_SECURITY: ::DWORD = 0x00000010;
-pub const SERVICE_STOP_REASON_MINOR_NETWORK_CONNECTIVITY: ::DWORD = 0x00000011;
-pub const SERVICE_STOP_REASON_MINOR_WMI: ::DWORD = 0x00000012;
-pub const SERVICE_STOP_REASON_MINOR_SERVICEPACK_UNINSTALL: ::DWORD = 0x00000013;
-pub const SERVICE_STOP_REASON_MINOR_SOFTWARE_UPDATE_UNINSTALL: ::DWORD = 0x00000014;
-pub const SERVICE_STOP_REASON_MINOR_SECURITYFIX_UNINSTALL: ::DWORD = 0x00000015;
-pub const SERVICE_STOP_REASON_MINOR_MMC: ::DWORD = 0x00000016;
-pub const SERVICE_STOP_REASON_MINOR_NONE: ::DWORD = 0x00000017;
-pub const SERVICE_STOP_REASON_MINOR_MAX: ::DWORD = 0x00000018;
-pub const SERVICE_STOP_REASON_MINOR_MIN_CUSTOM: ::DWORD = 0x00000100;
-pub const SERVICE_STOP_REASON_MINOR_MAX_CUSTOM: ::DWORD = 0x0000FFFF;
-pub const SERVICE_CONTROL_STATUS_REASON_INFO: ::DWORD = 1;
-pub const SERVICE_SID_TYPE_NONE: ::DWORD = 0x00000000;
-pub const SERVICE_SID_TYPE_UNRESTRICTED: ::DWORD = 0x00000001;
-pub const SERVICE_SID_TYPE_RESTRICTED: ::DWORD = 0x00000002 | SERVICE_SID_TYPE_UNRESTRICTED;
-pub const SERVICE_TRIGGER_TYPE_DEVICE_INTERFACE_ARRIVAL: ::DWORD = 1;
-pub const SERVICE_TRIGGER_TYPE_IP_ADDRESS_AVAILABILITY: ::DWORD = 2;
-pub const SERVICE_TRIGGER_TYPE_DOMAIN_JOIN: ::DWORD = 3;
-pub const SERVICE_TRIGGER_TYPE_FIREWALL_PORT_EVENT: ::DWORD = 4;
-pub const SERVICE_TRIGGER_TYPE_GROUP_POLICY: ::DWORD = 5;
-pub const SERVICE_TRIGGER_TYPE_NETWORK_ENDPOINT: ::DWORD = 6;
-pub const SERVICE_TRIGGER_TYPE_CUSTOM_SYSTEM_STATE_CHANGE: ::DWORD = 7;
-pub const SERVICE_TRIGGER_TYPE_CUSTOM: ::DWORD = 20;
-pub const SERVICE_TRIGGER_DATA_TYPE_BINARY: ::DWORD = 1;
-pub const SERVICE_TRIGGER_DATA_TYPE_STRING: ::DWORD = 2;
-pub const SERVICE_TRIGGER_DATA_TYPE_LEVEL: ::DWORD = 3;
-pub const SERVICE_TRIGGER_DATA_TYPE_KEYWORD_ANY: ::DWORD = 4;
-pub const SERVICE_TRIGGER_DATA_TYPE_KEYWORD_ALL: ::DWORD = 5;
-pub const SERVICE_START_REASON_DEMAND: ::DWORD = 0x00000001;
-pub const SERVICE_START_REASON_AUTO: ::DWORD = 0x00000002;
-pub const SERVICE_START_REASON_TRIGGER: ::DWORD = 0x00000004;
-pub const SERVICE_START_REASON_RESTART_ON_FAILURE: ::DWORD = 0x00000008;
-pub const SERVICE_START_REASON_DELAYEDAUTO: ::DWORD = 0x00000010;
-pub const SERVICE_DYNAMIC_INFORMATION_LEVEL_START_REASON: ::DWORD = 1;
-pub const SERVICE_LAUNCH_PROTECTED_NONE: ::DWORD = 0;
-pub const SERVICE_LAUNCH_PROTECTED_WINDOWS: ::DWORD = 1;
-pub const SERVICE_LAUNCH_PROTECTED_WINDOWS_LIGHT: ::DWORD = 2;
-pub const SERVICE_LAUNCH_PROTECTED_ANTIMALWARE_LIGHT: ::DWORD = 3;
-//678
-DECLARE_HANDLE!(SC_HANDLE, SC_HANDLE__);
-pub type LPSC_HANDLE = *mut SC_HANDLE;
-DECLARE_HANDLE!(SERVICE_STATUS_HANDLE, SERVICE_STATUS_HANDLE__);
-ENUM!{enum SC_STATUS_TYPE {
-    SC_STATUS_PROCESS_INFO = 0,
-}}
-ENUM!{enum _SC_ENUM_TYPE {
-    SC_ENUM_PROCESS_INFO = 0,
-}}
-//700
-STRUCT!{struct SERVICE_STATUS {
-    dwServiceType: ::DWORD,
-    dwCurrentState: ::DWORD,
-    dwControlsAccepted: ::DWORD,
-    dwWin32ExitCode: ::DWORD,
-    dwServiceSpecificExitCode: ::DWORD,
-    dwCheckPoint: ::DWORD,
-    dwWaitHint: ::DWORD,
-}}
-pub type LPSERVICE_STATUS = *mut SERVICE_STATUS;
-//848
-pub type LPSERVICE_MAIN_FUNCTIONW = Option<unsafe extern "system" fn(
-    dwNumServicesArgs: ::DWORD, lpServiceArgVectors: *mut ::LPWSTR,
-)>;
-pub type LPSERVICE_MAIN_FUNCTIONA = Option<unsafe extern "system" fn(
-    dwNumServicesArgs: ::DWORD, lpServiceArgVectors: *mut ::LPSTR,
-)>;
-STRUCT!{nodebug struct SERVICE_TABLE_ENTRYA {
-    lpServiceName: ::LPCSTR,
-    lpServiceProc: LPSERVICE_MAIN_FUNCTIONA,
-}}
-pub type LPSERVICE_TABLE_ENTRYA = *mut SERVICE_TABLE_ENTRYA;
-STRUCT!{nodebug struct SERVICE_TABLE_ENTRYW {
-    lpServiceName: ::LPCWSTR,
-    lpServiceProc: LPSERVICE_MAIN_FUNCTIONW,
-}}
-pub type LPSERVICE_TABLE_ENTRYW = *mut SERVICE_TABLE_ENTRYW;
-//900
-pub type LPHANDLER_FUNCTION = Option<unsafe extern "system" fn(dwControl: ::DWORD)>;
-pub type LPHANDLER_FUNCTION_EX = Option<unsafe extern "system" fn(
-    dwControl: ::DWORD, dwEventType: ::DWORD, lpEventData: ::LPVOID, lpContext: ::LPVOID,
-) -> ::DWORD>;
diff --git a/vendor/winapi-0.2.8/src/winusb.rs b/vendor/winapi-0.2.8/src/winusb.rs
deleted file mode 100644
index 2fbb619975..0000000000
--- a/vendor/winapi-0.2.8/src/winusb.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! FFI bindings to winusb.
-pub type WINUSB_INTERFACE_HANDLE = ::PVOID;
-pub type PWINUSB_INTERFACE_HANDLE = *mut ::PVOID;
-pub type WINUSB_ISOCH_BUFFER_HANDLE = ::PVOID;
-pub type PWINUSB_ISOCH_BUFFER_HANDLE = *mut ::PVOID;
-STRUCT!{#[repr(packed)] struct WINUSB_SETUP_PACKET {
-	RequestType: ::UCHAR,
-	Request: ::UCHAR,
-	Value: ::USHORT,
-	Index: ::USHORT,
-	Length: ::USHORT,
-}}
-pub type PWINUSB_SETUP_PACKET = *mut WINUSB_SETUP_PACKET;
-
-STRUCT!{struct USB_INTERFACE_DESCRIPTOR {
-	bLength: ::UCHAR,
-	bDescriptorType: ::UCHAR,
-	bInterfaceNumber: ::UCHAR,
-	bAlternateSetting: ::UCHAR,
-	bNumEndpoints: ::UCHAR,
-	bInterfaceClass: ::UCHAR,
-	bInterfaceSubClass: ::UCHAR,
-	bInterfaceProtocol: ::UCHAR,
-	iInterface: ::UCHAR,
-}}
-pub type PUSB_INTERFACE_DESCRIPTOR = *mut USB_INTERFACE_DESCRIPTOR;
-#[test]
-fn test_USB_INTERFACE_DESCRIPTOR_size() {
-    use std::mem::size_of;
-    assert_eq!(size_of::<USB_INTERFACE_DESCRIPTOR>(), 9)
-}
diff --git a/vendor/winapi-0.2.8/src/winusbio.rs b/vendor/winapi-0.2.8/src/winusbio.rs
deleted file mode 100644
index 3dedf2265f..0000000000
--- a/vendor/winapi-0.2.8/src/winusbio.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2016, bitbegin
-// Licensed under the MIT License <LICENSE.md>
-//! USBIO Definitions.
-STRUCT!{struct WINUSB_PIPE_INFORMATION {
-	PipeType: ::USBD_PIPE_TYPE,
-	PipeId: ::UCHAR,
-	MaximumPacketSize: ::USHORT,
-	Interval: ::UCHAR,
-}}
-pub type PWINUSB_PIPE_INFORMATION = *mut WINUSB_PIPE_INFORMATION;
-STRUCT!{struct WINUSB_PIPE_INFORMATION_EX {
-	PipeType: ::USBD_PIPE_TYPE,
-	PipeId: ::UCHAR,
-	MaximumPacketSize: ::USHORT,
-	Interval: ::UCHAR,
-	MaximumBytesPerInterval: ::ULONG,
-}}
-pub type PWINUSB_PIPE_INFORMATION_EX = *mut WINUSB_PIPE_INFORMATION_EX;
diff --git a/vendor/winapi-0.2.8/src/winuser.rs b/vendor/winapi-0.2.8/src/winuser.rs
deleted file mode 100644
index 5769489112..0000000000
--- a/vendor/winapi-0.2.8/src/winuser.rs
+++ /dev/null
@@ -1,2334 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! USER procedure declarations, constant definitions and macros
-
-// Edit Control Styles
-//
-pub const ES_LEFT: ::DWORD = 0x0000;
-pub const ES_CENTER: ::DWORD = 0x0001;
-pub const ES_RIGHT: ::DWORD = 0x0002;
-pub const ES_MULTILINE: ::DWORD = 0x0004;
-pub const ES_UPPERCASE: ::DWORD = 0x0008;
-pub const ES_LOWERCASE: ::DWORD = 0x0010;
-pub const ES_PASSWORD: ::DWORD = 0x0020;
-pub const ES_AUTOVSCROLL: ::DWORD = 0x0040;
-pub const ES_AUTOHSCROLL: ::DWORD = 0x0080;
-pub const ES_NOHIDESEL: ::DWORD = 0x0100;
-pub const ES_OEMCONVERT: ::DWORD = 0x0400;
-pub const ES_READONLY: ::DWORD = 0x0800;
-pub const ES_WANTRETURN: ::DWORD = 0x1000;
-pub const ES_NUMBER: ::DWORD = 0x2000;
-
-// Edit Control Notification Codes
-//
-pub const EN_SETFOCUS: ::WORD = 0x0100;
-pub const EN_KILLFOCUS: ::WORD = 0x0200;
-pub const EN_CHANGE: ::WORD = 0x0300;
-pub const EN_UPDATE: ::WORD = 0x0400;
-pub const EN_ERRSPACE: ::WORD = 0x0500;
-pub const EN_MAXTEXT: ::WORD = 0x0501;
-pub const EN_HSCROLL: ::WORD = 0x0601;
-pub const EN_VSCROLL: ::WORD = 0x0602;
-
-pub const EN_ALIGN_LTR_EC: ::WORD = 0x0700;
-pub const EN_ALIGN_RTL_EC: ::WORD = 0x0701;
-
-// Edit control EM_SETMARGIN parameters
-pub const EC_LEFTMARGIN: ::WORD = 0x0001;
-pub const EC_RIGHTMARGIN: ::WORD = 0x0002;
-pub const EC_USEFONTINFO: ::WORD = 0xffff;
-
-// wParam of EM_GET/SETIMESTATUS
-pub const EMSIS_COMPOSITIONSTRING: ::WORD = 0x0001;
-
-// lParam for EMSIS_COMPOSITIONSTRING
-pub const EIMES_GETCOMPSTRATONCE: ::WORD = 0x0001;
-pub const EIMES_CANCELCOMPSTRINFOCUS: ::WORD = 0x0002;
-pub const EIMES_COMPLETECOMPSTRKILLFOCUS: ::WORD = 0x0004;
-
-// Edit Control Messages
-//
-pub const EM_GETSEL: ::WORD = 0x00B0;
-pub const EM_SETSEL: ::WORD = 0x00B1;
-pub const EM_GETRECT: ::WORD = 0x00B2;
-pub const EM_SETRECT: ::WORD = 0x00B3;
-pub const EM_SETRECTNP: ::WORD = 0x00B4;
-pub const EM_SCROLL: ::WORD = 0x00B5;
-pub const EM_LINESCROLL: ::WORD = 0x00B6;
-pub const EM_SCROLLCARET: ::WORD = 0x00B7;
-pub const EM_GETMODIFY: ::WORD = 0x00B8;
-pub const EM_SETMODIFY: ::WORD = 0x00B9;
-pub const EM_GETLINECOUNT: ::WORD = 0x00BA;
-pub const EM_LINEINDEX: ::WORD = 0x00BB;
-pub const EM_SETHANDLE: ::WORD = 0x00BC;
-pub const EM_GETHANDLE: ::WORD = 0x00BD;
-pub const EM_GETTHUMB: ::WORD = 0x00BE;
-pub const EM_LINELENGTH: ::WORD = 0x00C1;
-pub const EM_REPLACESEL: ::WORD = 0x00C2;
-pub const EM_GETLINE: ::WORD = 0x00C4;
-pub const EM_LIMITTEXT: ::WORD = 0x00C5;
-pub const EM_CANUNDO: ::WORD = 0x00C6;
-pub const EM_UNDO: ::WORD = 0x00C7;
-pub const EM_FMTLINES: ::WORD = 0x00C8;
-pub const EM_LINEFROMCHAR: ::WORD = 0x00C9;
-pub const EM_SETTABSTOPS: ::WORD = 0x00CB;
-pub const EM_SETPASSWORDCHAR: ::WORD = 0x00CC;
-pub const EM_EMPTYUNDOBUFFER: ::WORD = 0x00CD;
-pub const EM_GETFIRSTVISIBLELINE: ::WORD = 0x00CE;
-pub const EM_SETREADONLY: ::WORD = 0x00CF;
-pub const EM_SETWORDBREAKPROC: ::WORD = 0x00D0;
-pub const EM_GETWORDBREAKPROC: ::WORD = 0x00D1;
-pub const EM_GETPASSWORDCHAR: ::WORD = 0x00D2;
-
-pub const EM_SETMARGINS: ::WORD = 0x00D3;
-pub const EM_GETMARGINS: ::WORD = 0x00D4;
-pub const EM_SETLIMITTEXT: ::WORD = EM_LIMITTEXT;
-pub const EM_GETLIMITTEXT: ::WORD = 0x00D5;
-pub const EM_POSFROMCHAR: ::WORD = 0x00D6;
-pub const EM_CHARFROMPOS: ::WORD = 0x00D7;
-
-pub const EM_SETIMESTATUS: ::WORD = 0x00D8;
-pub const EM_GETIMESTATUS: ::WORD = 0x00D9;
-
-// EDITWORDBREAKPROC code values
-//
-pub const WB_LEFT: ::WORD = 0;
-pub const WB_RIGHT: ::WORD = 1;
-pub const WB_ISDELIMITER: ::WORD = 2;
-
-pub const BN_CLICKED: ::WORD = 0;
-pub const BN_PAINT: ::WORD = 1;
-pub const BN_HILITE: ::WORD = 2;
-pub const BN_UNHILITE: ::WORD = 3;
-pub const BN_DISABLE: ::WORD = 4;
-pub const BN_DOUBLECLICKED: ::WORD = 5;
-pub const BN_PUSHED: ::WORD = BN_HILITE;
-pub const BN_UNPUSHED: ::WORD = BN_UNHILITE;
-pub const BN_DBLCLK: ::WORD = BN_DOUBLECLICKED;
-pub const BN_SETFOCUS: ::WORD = 6;
-pub const BN_KILLFOCUS: ::WORD = 7;
-pub const BS_PUSHBUTTON: ::DWORD = 0x00000000;
-pub const BS_DEFPUSHBUTTON: ::DWORD = 0x00000001;
-pub const BS_CHECKBOX: ::DWORD = 0x00000002;
-pub const BS_AUTOCHECKBOX: ::DWORD = 0x00000003;
-pub const BS_RADIOBUTTON: ::DWORD = 0x00000004;
-pub const BS_3STATE: ::DWORD = 0x00000005;
-pub const BS_AUTO3STATE: ::DWORD = 0x00000006;
-pub const BS_GROUPBOX: ::DWORD = 0x00000007;
-pub const BS_USERBUTTON: ::DWORD = 0x00000008;
-pub const BS_AUTORADIOBUTTON: ::DWORD = 0x00000009;
-pub const BS_PUSHBOX: ::DWORD = 0x0000000A;
-pub const BS_OWNERDRAW: ::DWORD = 0x0000000B;
-pub const BS_TYPEMASK: ::DWORD = 0x0000000F;
-pub const BS_LEFTTEXT: ::DWORD = 0x00000020;
-pub const BS_TEXT: ::DWORD = 0x00000000;
-pub const BS_ICON: ::DWORD = 0x00000040;
-pub const BS_BITMAP: ::DWORD = 0x00000080;
-pub const BS_LEFT: ::DWORD = 0x00000100;
-pub const BS_RIGHT: ::DWORD = 0x00000200;
-pub const BS_CENTER: ::DWORD = 0x00000300;
-pub const BS_TOP: ::DWORD = 0x00000400;
-pub const BS_BOTTOM: ::DWORD = 0x00000800;
-pub const BS_VCENTER: ::DWORD = 0x00000C00;
-pub const BS_PUSHLIKE: ::DWORD = 0x00001000;
-pub const BS_MULTILINE: ::DWORD = 0x00002000;
-pub const BS_NOTIFY: ::DWORD = 0x00004000;
-pub const BS_FLAT: ::DWORD = 0x00008000;
-pub const BS_RIGHTBUTTON: ::DWORD = BS_LEFTTEXT;
-pub const CCHILDREN_SCROLLBAR: usize = 5;
-pub const CDS_UPDATEREGISTRY: ::DWORD = 0x00000001;
-pub const CDS_TEST: ::DWORD = 0x00000002;
-pub const CDS_FULLSCREEN: ::DWORD = 0x00000004;
-pub const CDS_GLOBAL: ::DWORD = 0x00000008;
-pub const CDS_SET_PRIMARY: ::DWORD = 0x00000010;
-pub const CDS_VIDEOPARAMETERS: ::DWORD = 0x00000020;
-pub const CDS_ENABLE_UNSAFE_MODES: ::DWORD = 0x00000100;
-pub const CDS_DISABLE_UNSAFE_MODES: ::DWORD = 0x00000200;
-pub const CDS_RESET: ::DWORD = 0x40000000;
-pub const CDS_RESET_EX: ::DWORD = 0x20000000;
-pub const CDS_NORESET: ::DWORD = 0x10000000;
-pub const CF_TEXT: ::UINT = 1;
-pub const CF_BITMAP: ::UINT = 2;
-pub const CF_METAFILEPICT: ::UINT = 3;
-pub const CF_SYLK: ::UINT = 4;
-pub const CF_DIF: ::UINT = 5;
-pub const CF_TIFF: ::UINT = 6;
-pub const CF_OEMTEXT: ::UINT = 7;
-pub const CF_DIB: ::UINT = 8;
-pub const CF_PALETTE: ::UINT = 9;
-pub const CF_PENDATA: ::UINT = 10;
-pub const CF_RIFF: ::UINT = 11;
-pub const CF_WAVE: ::UINT = 12;
-pub const CF_UNICODETEXT: ::UINT = 13;
-pub const CF_ENHMETAFILE: ::UINT = 14;
-pub const CF_HDROP: ::UINT = 15;
-pub const CF_LOCALE: ::UINT = 16;
-pub const CF_DIBV5: ::UINT = 17;
-pub const CF_OWNERDISPLAY: ::UINT = 0x0080;
-pub const CF_DSPTEXT: ::UINT = 0x0081;
-pub const CF_DSPBITMAP: ::UINT = 0x0082;
-pub const CF_DSPENHMETAFILE: ::UINT = 0x008E;
-pub const CF_DSPMETAFILEPICT: ::UINT = 0x0083;
-pub const CF_PRIVATEFIRST: ::UINT = 0x0200;
-pub const CF_PRIVATELAST: ::UINT = 0x02FF;
-pub const CF_GDIOBJFIRST: ::UINT = 0x0300;
-pub const CF_GDIOBJLAST: ::UINT = 0x03FF;
-pub const CS_VREDRAW: ::DWORD = 0x0001;
-pub const CS_HREDRAW: ::DWORD = 0x0002;
-pub const CS_DBLCLKS: ::DWORD = 0x0008;
-pub const CS_OWNDC: ::DWORD = 0x0020;
-pub const CS_CLASSDC: ::DWORD = 0x0040;
-pub const CS_PARENTDC: ::DWORD = 0x0080;
-pub const CS_NOCLOSE: ::DWORD = 0x0200;
-pub const CS_SAVEBITS: ::DWORD = 0x0800;
-pub const CS_BYTEALIGNCLIENT: ::DWORD = 0x1000;
-pub const CS_BYTEALIGNWINDOW: ::DWORD = 0x2000;
-pub const CS_GLOBALCLASS: ::DWORD = 0x4000;
-pub const CS_IME: ::DWORD = 0x00010000;
-pub const CS_DROPSHADOW: ::DWORD = 0x00020000;
-pub const DFC_CAPTION: ::UINT = 1;
-pub const DFC_MENU: ::UINT = 2;
-pub const DFC_SCROLL: ::UINT = 3;
-pub const DFC_BUTTON: ::UINT = 4;
-pub const DFCS_CAPTIONCLOSE: ::UINT = 0x0000;
-pub const DFCS_CAPTIONMIN: ::UINT = 0x0001;
-pub const DFCS_CAPTIONMAX: ::UINT = 0x0002;
-pub const DFCS_CAPTIONRESTORE: ::UINT = 0x0003;
-pub const DFCS_CAPTIONHELP: ::UINT = 0x0004;
-pub const DFCS_MENUARROW: ::UINT = 0x0000;
-pub const DFCS_MENUCHECK: ::UINT = 0x0001;
-pub const DFCS_MENUBULLET: ::UINT = 0x0002;
-pub const DFCS_MENUARROWRIGHT: ::UINT = 0x0004;
-pub const DFCS_SCROLLUP: ::UINT = 0x0000;
-pub const DFCS_SCROLLDOWN: ::UINT = 0x0001;
-pub const DFCS_SCROLLLEFT: ::UINT = 0x0002;
-pub const DFCS_SCROLLRIGHT: ::UINT = 0x0003;
-pub const DFCS_SCROLLCOMBOBOX: ::UINT = 0x0005;
-pub const DFCS_SCROLLSIZEGRIP: ::UINT = 0x0008;
-pub const DFCS_SCROLLSIZEGRIPRIGHT: ::UINT = 0x0010;
-pub const DFCS_BUTTONCHECK: ::UINT = 0x0000;
-pub const DFCS_BUTTONRADIOIMAGE: ::UINT = 0x0001;
-pub const DFCS_BUTTONRADIOMASK: ::UINT = 0x0002;
-pub const DFCS_BUTTONRADIO: ::UINT = 0x0004;
-pub const DFCS_BUTTON3STATE: ::UINT = 0x0008;
-pub const DFCS_BUTTONPUSH: ::UINT = 0x0010;
-pub const DFCS_INACTIVE: ::UINT = 0x0100;
-pub const DFCS_PUSHED: ::UINT = 0x0200;
-pub const DFCS_CHECKED: ::UINT = 0x0400;
-// if WINVER >= 0x0500
-pub const DFCS_TRANSPARENT: ::UINT = 0x0800;
-pub const DFCS_HOT: ::UINT = 0x1000;
-// end if WINVER >= 0x0500
-pub const DFCS_ADJUSTRECT: ::UINT = 0x2000;
-pub const DFCS_FLAT: ::UINT = 0x4000;
-pub const DFCS_MONO: ::UINT = 0x8000;
-pub const CW_USEDEFAULT: ::c_int = 0x80000000u32 as ::c_int;
-pub const DISP_CHANGE_SUCCESSFUL: ::LONG = 0;
-pub const DISP_CHANGE_RESTART: ::LONG = 1;
-pub const DISP_CHANGE_FAILED: ::LONG = -1;
-pub const DISP_CHANGE_BADMODE: ::LONG = -2;
-pub const DISP_CHANGE_NOTUPDATED: ::LONG = -3;
-pub const DISP_CHANGE_BADFLAGS: ::LONG = -4;
-pub const DISP_CHANGE_BADPARAM: ::LONG = -5;
-pub const DISP_CHANGE_BADDUALVIEW: ::LONG = -6;
-pub const EDD_GET_DEVICE_INTERFACE_NAME: ::DWORD = 0x00000001;
-pub const ENUM_CURRENT_SETTINGS: ::DWORD = 0xFFFFFFFF;
-pub const ENUM_REGISTRY_SETTINGS: ::DWORD = 0xFFFFFFFE;
-pub const GW_HWNDFIRST: ::UINT = 0;
-pub const GW_HWNDLAST: ::UINT = 1;
-pub const GW_HWNDNEXT: ::UINT = 2;
-pub const GW_HWNDPREV: ::UINT = 3;
-pub const GW_OWNER: ::UINT = 4;
-pub const GW_CHILD: ::UINT = 5;
-pub const GW_ENABLEDPOPUP: ::UINT = 6;
-pub const GW_MAX: ::UINT = 6;
-pub const HTERROR: ::c_int = -2;
-pub const HTTRANSPARENT: ::c_int = -1;
-pub const HTNOWHERE: ::c_int = 0;
-pub const HTCLIENT: ::c_int = 1;
-pub const HTCAPTION: ::c_int = 2;
-pub const HTSYSMENU: ::c_int = 3;
-pub const HTGROWBOX: ::c_int = 4;
-pub const HTSIZE: ::c_int = HTGROWBOX;
-pub const HTMENU: ::c_int = 5;
-pub const HTHSCROLL: ::c_int = 6;
-pub const HTVSCROLL: ::c_int = 7;
-pub const HTMINBUTTON: ::c_int = 8;
-pub const HTMAXBUTTON: ::c_int = 9;
-pub const HTLEFT: ::c_int = 10;
-pub const HTRIGHT: ::c_int = 11;
-pub const HTTOP: ::c_int = 12;
-pub const HTTOPLEFT: ::c_int = 13;
-pub const HTTOPRIGHT: ::c_int = 14;
-pub const HTBOTTOM: ::c_int = 15;
-pub const HTBOTTOMLEFT: ::c_int = 16;
-pub const HTBOTTOMRIGHT: ::c_int = 17;
-pub const HTBORDER: ::c_int = 18;
-pub const HTREDUCE: ::c_int = HTMINBUTTON;
-pub const HTZOOM: ::c_int = HTMAXBUTTON;
-pub const HTSIZEFIRST: ::c_int = HTLEFT;
-pub const HTSIZELAST: ::c_int = HTBOTTOMRIGHT;
-pub const HTOBJECT: ::c_int = 19;
-pub const HTCLOSE: ::c_int = 20;
-pub const HTHELP: ::c_int = 21;
-pub const LSFW_LOCK: ::UINT = 1;
-pub const LSFW_UNLOCK: ::UINT = 2;
-pub const MDITILE_VERTICAL: ::UINT = 0x0000;
-pub const MDITILE_HORIZONTAL: ::UINT = 0x0001;
-pub const MDITILE_SKIPDISABLED: ::UINT = 0x0002;
-pub const MDITILE_ZORDER: ::UINT = 0x0004;
-pub const MB_OK: ::DWORD = 0x00000000;
-pub const MB_OKCANCEL: ::DWORD = 0x00000001;
-pub const MB_ABORTRETRYIGNORE: ::DWORD = 0x00000002;
-pub const MB_YESNOCANCEL: ::DWORD = 0x00000003;
-pub const MB_YESNO: ::DWORD = 0x00000004;
-pub const MB_RETRYCANCEL: ::DWORD = 0x00000005;
-pub const MB_CANCELTRYCONTINUE: ::DWORD = 0x00000006;
-pub const MB_ICONHAND: ::DWORD = 0x00000010;
-pub const MB_ICONQUESTION: ::DWORD = 0x00000020;
-pub const MB_ICONEXCLAMATION: ::DWORD = 0x00000030;
-pub const MB_ICONASTERISK: ::DWORD = 0x00000040;
-pub const MB_USERICON: ::DWORD = 0x00000080;
-pub const MB_ICONWARNING: ::DWORD = MB_ICONEXCLAMATION;
-pub const MB_ICONERROR: ::DWORD = MB_ICONHAND;
-pub const MB_ICONINFORMATION: ::DWORD = MB_ICONASTERISK;
-pub const MB_ICONSTOP: ::DWORD = MB_ICONHAND;
-pub const MB_DEFBUTTON1: ::DWORD = 0x00000000;
-pub const MB_DEFBUTTON2: ::DWORD = 0x00000100;
-pub const MB_DEFBUTTON3: ::DWORD = 0x00000200;
-pub const MB_DEFBUTTON4: ::DWORD = 0x00000300;
-pub const MB_APPLMODAL: ::DWORD = 0x00000000;
-pub const MB_SYSTEMMODAL: ::DWORD = 0x00001000;
-pub const MB_TASKMODAL: ::DWORD = 0x00002000;
-pub const MB_HELP: ::DWORD = 0x00004000;
-pub const MB_NOFOCUS: ::DWORD = 0x00008000;
-pub const MB_SETFOREGROUND: ::DWORD = 0x00010000;
-pub const MB_DEFAULT_DESKTOP_ONLY: ::DWORD = 0x00020000;
-pub const MB_TOPMOST: ::DWORD = 0x00040000;
-pub const MB_RIGHT: ::DWORD = 0x00080000;
-pub const MB_RTLREADING: ::DWORD = 0x00100000;
-pub const MB_SERVICE_NOTIFICATION: ::DWORD = 0x00200000;
-pub const MB_SERVICE_NOTIFICATION_NT3X: ::DWORD = 0x00040000;
-pub const MB_TYPEMASK: ::DWORD = 0x0000000F;
-pub const MB_ICONMASK: ::DWORD = 0x000000F0;
-pub const MB_DEFMASK: ::DWORD = 0x00000F00;
-pub const MB_MODEMASK: ::DWORD = 0x00003000;
-pub const MB_MISCMASK: ::DWORD = 0x0000C000;
-pub const MF_BITMAP: ::UINT = 0x00000004;
-pub const MF_CHECKED: ::UINT = 0x00000008;
-pub const MF_DISABLED: ::UINT = 0x00000002;
-pub const MF_ENABLED: ::UINT = 0x00000000;
-pub const MF_GRAYED: ::UINT = 0x00000001;
-pub const MF_MENUBARBREAK: ::UINT = 0x00000020;
-pub const MF_MENUBREAK: ::UINT = 0x00000040;
-pub const MF_OWNERDRAW: ::UINT = 0x00000100;
-pub const MF_POPUP: ::UINT = 0x00000010;
-pub const MF_SEPARATOR: ::UINT = 0x00000800;
-pub const MF_STRING: ::UINT = 0x00000000;
-pub const MF_UNCHECKED: ::UINT = 0x00000000;
-pub const SB_HORZ: ::c_int = 0;
-pub const SB_VERT: ::c_int = 1;
-pub const SB_CTL: ::c_int = 2;
-pub const SB_BOTH: ::c_int = 3;
-pub const SW_HIDE: ::c_int = 0;
-pub const SW_SHOWNORMAL: ::c_int = 1;
-pub const SW_NORMAL: ::c_int = 1;
-pub const SW_SHOWMINIMIZED: ::c_int = 2;
-pub const SW_SHOWMAXIMIZED: ::c_int = 3;
-pub const SW_MAXIMIZE: ::c_int = 3;
-pub const SW_SHOWNOACTIVATE: ::c_int = 4;
-pub const SW_SHOW: ::c_int = 5;
-pub const SW_MINIMIZE: ::c_int = 6;
-pub const SW_SHOWMINNOACTIVE: ::c_int = 7;
-pub const SW_SHOWNA: ::c_int = 8;
-pub const SW_RESTORE: ::c_int = 9;
-pub const SW_SHOWDEFAULT: ::c_int = 10;
-pub const SW_FORCEMINIMIZE: ::c_int = 11;
-pub const SW_MAX: ::c_int = 11;
-pub const SWP_NOSIZE: ::UINT = 0x0001;
-pub const SWP_NOMOVE: ::UINT = 0x0002;
-pub const SWP_NOZORDER: ::UINT = 0x0004;
-pub const SWP_NOREDRAW: ::UINT = 0x0008;
-pub const SWP_NOACTIVATE: ::UINT = 0x0010;
-pub const SWP_FRAMECHANGED: ::UINT = 0x0020;
-pub const SWP_SHOWWINDOW: ::UINT = 0x0040;
-pub const SWP_HIDEWINDOW: ::UINT = 0x0080;
-pub const SWP_NOCOPYBITS: ::UINT = 0x0100;
-pub const SWP_NOOWNERZORDER: ::UINT = 0x0200;
-pub const SWP_NOSENDCHANGING: ::UINT = 0x0400;
-pub const SWP_DRAWFRAME: ::UINT = SWP_FRAMECHANGED;
-pub const SWP_NOREPOSITION: ::UINT = SWP_NOOWNERZORDER;
-pub const SWP_DEFERERASE: ::UINT = 0x2000;
-pub const SWP_ASYNCWINDOWPOS: ::UINT = 0x4000;
-pub const VK_LBUTTON: ::c_int = 0x01;
-pub const VK_RBUTTON: ::c_int = 0x02;
-pub const VK_CANCEL: ::c_int = 0x03;
-pub const VK_MBUTTON: ::c_int = 0x04;
-pub const VK_XBUTTON1: ::c_int = 0x05;
-pub const VK_XBUTTON2: ::c_int = 0x06;
-pub const VK_BACK: ::c_int = 0x08;
-pub const VK_TAB: ::c_int = 0x09;
-pub const VK_CLEAR: ::c_int = 0x0C;
-pub const VK_RETURN: ::c_int = 0x0D;
-pub const VK_SHIFT: ::c_int = 0x10;
-pub const VK_CONTROL: ::c_int = 0x11;
-pub const VK_MENU: ::c_int = 0x12;
-pub const VK_PAUSE: ::c_int = 0x13;
-pub const VK_CAPITAL: ::c_int = 0x14;
-pub const VK_KANA: ::c_int = 0x15;
-pub const VK_HANGUEL: ::c_int = 0x15;
-pub const VK_HANGUL: ::c_int = 0x15;
-pub const VK_JUNJA: ::c_int = 0x17;
-pub const VK_FINAL: ::c_int = 0x18;
-pub const VK_HANJA: ::c_int = 0x19;
-pub const VK_KANJI: ::c_int = 0x19;
-pub const VK_ESCAPE: ::c_int = 0x1B;
-pub const VK_CONVERT: ::c_int = 0x1C;
-pub const VK_NONCONVERT: ::c_int = 0x1D;
-pub const VK_ACCEPT: ::c_int = 0x1E;
-pub const VK_MODECHANGE: ::c_int = 0x1F;
-pub const VK_SPACE: ::c_int = 0x20;
-pub const VK_PRIOR: ::c_int = 0x21;
-pub const VK_NEXT: ::c_int = 0x22;
-pub const VK_END: ::c_int = 0x23;
-pub const VK_HOME: ::c_int = 0x24;
-pub const VK_LEFT: ::c_int = 0x25;
-pub const VK_UP: ::c_int = 0x26;
-pub const VK_RIGHT: ::c_int = 0x27;
-pub const VK_DOWN: ::c_int = 0x28;
-pub const VK_SELECT: ::c_int = 0x29;
-pub const VK_PRINT: ::c_int = 0x2A;
-pub const VK_EXECUTE: ::c_int = 0x2B;
-pub const VK_SNAPSHOT: ::c_int = 0x2C;
-pub const VK_INSERT: ::c_int = 0x2D;
-pub const VK_DELETE: ::c_int = 0x2E;
-pub const VK_HELP: ::c_int = 0x2F;
-pub const VK_LWIN: ::c_int = 0x5B;
-pub const VK_RWIN: ::c_int = 0x5C;
-pub const VK_APPS: ::c_int = 0x5D;
-pub const VK_SLEEP: ::c_int = 0x5F;
-pub const VK_NUMPAD0: ::c_int = 0x60;
-pub const VK_NUMPAD1: ::c_int = 0x61;
-pub const VK_NUMPAD2: ::c_int = 0x62;
-pub const VK_NUMPAD3: ::c_int = 0x63;
-pub const VK_NUMPAD4: ::c_int = 0x64;
-pub const VK_NUMPAD5: ::c_int = 0x65;
-pub const VK_NUMPAD6: ::c_int = 0x66;
-pub const VK_NUMPAD7: ::c_int = 0x67;
-pub const VK_NUMPAD8: ::c_int = 0x68;
-pub const VK_NUMPAD9: ::c_int = 0x69;
-pub const VK_MULTIPLY: ::c_int = 0x6A;
-pub const VK_ADD: ::c_int = 0x6B;
-pub const VK_SEPARATOR: ::c_int = 0x6C;
-pub const VK_SUBTRACT: ::c_int = 0x6D;
-pub const VK_DECIMAL: ::c_int = 0x6E;
-pub const VK_DIVIDE: ::c_int = 0x6F;
-pub const VK_F1: ::c_int = 0x70;
-pub const VK_F2: ::c_int = 0x71;
-pub const VK_F3: ::c_int = 0x72;
-pub const VK_F4: ::c_int = 0x73;
-pub const VK_F5: ::c_int = 0x74;
-pub const VK_F6: ::c_int = 0x75;
-pub const VK_F7: ::c_int = 0x76;
-pub const VK_F8: ::c_int = 0x77;
-pub const VK_F9: ::c_int = 0x78;
-pub const VK_F10: ::c_int = 0x79;
-pub const VK_F11: ::c_int = 0x7A;
-pub const VK_F12: ::c_int = 0x7B;
-pub const VK_F13: ::c_int = 0x7C;
-pub const VK_F14: ::c_int = 0x7D;
-pub const VK_F15: ::c_int = 0x7E;
-pub const VK_F16: ::c_int = 0x7F;
-pub const VK_F17: ::c_int = 0x80;
-pub const VK_F18: ::c_int = 0x81;
-pub const VK_F19: ::c_int = 0x82;
-pub const VK_F20: ::c_int = 0x83;
-pub const VK_F21: ::c_int = 0x84;
-pub const VK_F22: ::c_int = 0x85;
-pub const VK_F23: ::c_int = 0x86;
-pub const VK_F24: ::c_int = 0x87;
-pub const VK_NUMLOCK: ::c_int = 0x90;
-pub const VK_SCROLL: ::c_int = 0x91;
-pub const VK_OEM_NEC_EQUAL: ::c_int = 0x92;
-pub const VK_OEM_FJ_JISHO: ::c_int = 0x92;
-pub const VK_OEM_FJ_MASSHOU: ::c_int = 0x93;
-pub const VK_OEM_FJ_TOUROKU: ::c_int = 0x94;
-pub const VK_OEM_FJ_LOYA: ::c_int = 0x95;
-pub const VK_OEM_FJ_ROYA: ::c_int = 0x96;
-pub const VK_LSHIFT: ::c_int = 0xA0;
-pub const VK_RSHIFT: ::c_int = 0xA1;
-pub const VK_LCONTROL: ::c_int = 0xA2;
-pub const VK_RCONTROL: ::c_int = 0xA3;
-pub const VK_LMENU: ::c_int = 0xA4;
-pub const VK_RMENU: ::c_int = 0xA5;
-pub const VK_BROWSER_BACK: ::c_int = 0xA6;
-pub const VK_BROWSER_FORWARD: ::c_int = 0xA7;
-pub const VK_BROWSER_REFRESH: ::c_int = 0xA8;
-pub const VK_BROWSER_STOP: ::c_int = 0xA9;
-pub const VK_BROWSER_SEARCH: ::c_int = 0xAA;
-pub const VK_BROWSER_FAVORITES: ::c_int = 0xAB;
-pub const VK_BROWSER_HOME: ::c_int = 0xAC;
-pub const VK_VOLUME_MUTE: ::c_int = 0xAD;
-pub const VK_VOLUME_DOWN: ::c_int = 0xAE;
-pub const VK_VOLUME_UP: ::c_int = 0xAF;
-pub const VK_MEDIA_NEXT_TRACK: ::c_int = 0xB0;
-pub const VK_MEDIA_PREV_TRACK: ::c_int = 0xB1;
-pub const VK_MEDIA_STOP: ::c_int = 0xB2;
-pub const VK_MEDIA_PLAY_PAUSE: ::c_int = 0xB3;
-pub const VK_LAUNCH_MAIL: ::c_int = 0xB4;
-pub const VK_LAUNCH_MEDIA_SELECT: ::c_int = 0xB5;
-pub const VK_LAUNCH_APP1: ::c_int = 0xB6;
-pub const VK_LAUNCH_APP2: ::c_int = 0xB7;
-pub const VK_OEM_1: ::c_int = 0xBA;
-pub const VK_OEM_PLUS: ::c_int = 0xBB;
-pub const VK_OEM_COMMA: ::c_int = 0xBC;
-pub const VK_OEM_MINUS: ::c_int = 0xBD;
-pub const VK_OEM_PERIOD: ::c_int = 0xBE;
-pub const VK_OEM_2: ::c_int = 0xBF;
-pub const VK_OEM_3: ::c_int = 0xC0;
-pub const VK_OEM_4: ::c_int = 0xDB;
-pub const VK_OEM_5: ::c_int = 0xDC;
-pub const VK_OEM_6: ::c_int = 0xDD;
-pub const VK_OEM_7: ::c_int = 0xDE;
-pub const VK_OEM_8: ::c_int = 0xDF;
-pub const VK_OEM_AX: ::c_int = 0xE1;
-pub const VK_OEM_102: ::c_int = 0xE2;
-pub const VK_ICO_HELP: ::c_int = 0xE3;
-pub const VK_ICO_00: ::c_int = 0xE4;
-pub const VK_PROCESSKEY: ::c_int = 0xE5;
-pub const VK_ICO_CLEAR: ::c_int = 0xE6;
-pub const VK_PACKET: ::c_int = 0xE7;
-pub const VK_OEM_RESET: ::c_int = 0xE9;
-pub const VK_OEM_JUMP: ::c_int = 0xEA;
-pub const VK_OEM_PA1: ::c_int = 0xEB;
-pub const VK_OEM_PA2: ::c_int = 0xEC;
-pub const VK_OEM_PA3: ::c_int = 0xED;
-pub const VK_OEM_WSCTRL: ::c_int = 0xEE;
-pub const VK_OEM_CUSEL: ::c_int = 0xEF;
-pub const VK_OEM_ATTN: ::c_int = 0xF0;
-pub const VK_OEM_FINISH: ::c_int = 0xF1;
-pub const VK_OEM_COPY: ::c_int = 0xF2;
-pub const VK_OEM_AUTO: ::c_int = 0xF3;
-pub const VK_OEM_ENLW: ::c_int = 0xF4;
-pub const VK_OEM_BACKTAB: ::c_int = 0xF5;
-pub const VK_ATTN: ::c_int = 0xF6;
-pub const VK_CRSEL: ::c_int = 0xF7;
-pub const VK_EXSEL: ::c_int = 0xF8;
-pub const VK_EREOF: ::c_int = 0xF9;
-pub const VK_PLAY: ::c_int = 0xFA;
-pub const VK_ZOOM: ::c_int = 0xFB;
-pub const VK_NONAME: ::c_int = 0xFC;
-pub const VK_PA1: ::c_int = 0xFD;
-pub const VK_OEM_CLEAR: ::c_int = 0xFE;
-// if _WIN32_WINNT >= 0x0500
-pub const APPCOMMAND_BROWSER_BACKWARD: ::c_short = 1;
-pub const APPCOMMAND_BROWSER_FORWARD: ::c_short = 2;
-pub const APPCOMMAND_BROWSER_REFRESH: ::c_short = 3;
-pub const APPCOMMAND_BROWSER_STOP: ::c_short = 4;
-pub const APPCOMMAND_BROWSER_SEARCH: ::c_short = 5;
-pub const APPCOMMAND_BROWSER_FAVORITES: ::c_short = 6;
-pub const APPCOMMAND_BROWSER_HOME: ::c_short = 7;
-pub const APPCOMMAND_VOLUME_MUTE: ::c_short = 8;
-pub const APPCOMMAND_VOLUME_DOWN: ::c_short = 9;
-pub const APPCOMMAND_VOLUME_UP: ::c_short = 10;
-pub const APPCOMMAND_MEDIA_NEXTTRACK: ::c_short = 11;
-pub const APPCOMMAND_MEDIA_PREVIOUSTRACK: ::c_short = 12;
-pub const APPCOMMAND_MEDIA_STOP: ::c_short = 13;
-pub const APPCOMMAND_MEDIA_PLAY_PAUSE: ::c_short = 14;
-pub const APPCOMMAND_LAUNCH_MAIL: ::c_short = 15;
-pub const APPCOMMAND_LAUNCH_MEDIA_SELECT: ::c_short = 16;
-pub const APPCOMMAND_LAUNCH_APP1: ::c_short = 17;
-pub const APPCOMMAND_LAUNCH_APP2: ::c_short = 18;
-pub const APPCOMMAND_BASS_DOWN: ::c_short = 19;
-pub const APPCOMMAND_BASS_BOOST: ::c_short = 20;
-pub const APPCOMMAND_BASS_UP: ::c_short = 21;
-pub const APPCOMMAND_TREBLE_DOWN: ::c_short = 22;
-pub const APPCOMMAND_TREBLE_UP: ::c_short = 23;
-// if _WIN32_WINNT >= 0x0501
-pub const APPCOMMAND_MICROPHONE_VOLUME_MUTE: ::c_short = 24;
-pub const APPCOMMAND_MICROPHONE_VOLUME_DOWN: ::c_short = 25;
-pub const APPCOMMAND_MICROPHONE_VOLUME_UP: ::c_short = 26;
-pub const APPCOMMAND_HELP: ::c_short = 27;
-pub const APPCOMMAND_FIND: ::c_short = 28;
-pub const APPCOMMAND_NEW: ::c_short = 29;
-pub const APPCOMMAND_OPEN: ::c_short = 30;
-pub const APPCOMMAND_CLOSE: ::c_short = 31;
-pub const APPCOMMAND_SAVE: ::c_short = 32;
-pub const APPCOMMAND_PRINT: ::c_short = 33;
-pub const APPCOMMAND_UNDO: ::c_short = 34;
-pub const APPCOMMAND_REDO: ::c_short = 35;
-pub const APPCOMMAND_COPY: ::c_short = 36;
-pub const APPCOMMAND_CUT: ::c_short = 37;
-pub const APPCOMMAND_PASTE: ::c_short = 38;
-pub const APPCOMMAND_REPLY_TO_MAIL: ::c_short = 39;
-pub const APPCOMMAND_FORWARD_MAIL: ::c_short = 40;
-pub const APPCOMMAND_SEND_MAIL: ::c_short = 41;
-pub const APPCOMMAND_SPELL_CHECK: ::c_short = 42;
-pub const APPCOMMAND_DICTATE_OR_COMMAND_CONTROL_TOGGLE: ::c_short = 43;
-pub const APPCOMMAND_MIC_ON_OFF_TOGGLE: ::c_short = 44;
-pub const APPCOMMAND_CORRECTION_LIST: ::c_short = 45;
-pub const APPCOMMAND_MEDIA_PLAY: ::c_short = 46;
-pub const APPCOMMAND_MEDIA_PAUSE: ::c_short = 47;
-pub const APPCOMMAND_MEDIA_RECORD: ::c_short = 48;
-pub const APPCOMMAND_MEDIA_FAST_FORWARD: ::c_short = 49;
-pub const APPCOMMAND_MEDIA_REWIND: ::c_short = 50;
-pub const APPCOMMAND_MEDIA_CHANNEL_UP: ::c_short = 51;
-pub const APPCOMMAND_MEDIA_CHANNEL_DOWN: ::c_short = 52;
-// end if _WIN32_WINNT >= 0x0501
-// if _WIN32_WINNT >= 0x0600
-pub const APPCOMMAND_DELETE: ::c_short = 53;
-pub const APPCOMMAND_DWM_FLIP3D: ::c_short = 54;
-// end if _WIN32_WINNT >= 0x0600
-pub const WM_NULL: ::UINT = 0x0000;
-pub const WM_CREATE: ::UINT = 0x0001;
-pub const WM_DESTROY: ::UINT = 0x0002;
-pub const WM_MOVE: ::UINT = 0x0003;
-pub const WM_SIZE: ::UINT = 0x0005;
-pub const WM_ACTIVATE: ::UINT = 0x0006;
-pub const WM_SETFOCUS: ::UINT = 0x0007;
-pub const WM_KILLFOCUS: ::UINT = 0x0008;
-pub const WM_ENABLE: ::UINT = 0x000A;
-pub const WM_SETREDRAW: ::UINT = 0x000B;
-pub const WM_SETTEXT: ::UINT = 0x000C;
-pub const WM_GETTEXT: ::UINT = 0x000D;
-pub const WM_GETTEXTLENGTH: ::UINT = 0x000E;
-pub const WM_PAINT: ::UINT = 0x000F;
-pub const WM_CLOSE: ::UINT = 0x0010;
-pub const WM_QUERYENDSESSION: ::UINT = 0x0011;
-pub const WM_QUERYOPEN: ::UINT = 0x0013;
-pub const WM_ENDSESSION: ::UINT = 0x0016;
-pub const WM_QUIT: ::UINT = 0x0012;
-pub const WM_ERASEBKGND: ::UINT = 0x0014;
-pub const WM_SYSCOLORCHANGE: ::UINT = 0x0015;
-pub const WM_SHOWWINDOW: ::UINT = 0x0018;
-pub const WM_WININICHANGE: ::UINT = 0x001A;
-pub const WM_SETTINGCHANGE: ::UINT = WM_WININICHANGE;
-pub const WM_DEVMODECHANGE: ::UINT = 0x001B;
-pub const WM_ACTIVATEAPP: ::UINT = 0x001C;
-pub const WM_FONTCHANGE: ::UINT = 0x001D;
-pub const WM_TIMECHANGE: ::UINT = 0x001E;
-pub const WM_CANCELMODE: ::UINT = 0x001F;
-pub const WM_SETCURSOR: ::UINT = 0x0020;
-pub const WM_MOUSEACTIVATE: ::UINT = 0x0021;
-pub const WM_CHILDACTIVATE: ::UINT = 0x0022;
-pub const WM_QUEUESYNC: ::UINT = 0x0023;
-pub const WM_GETMINMAXINFO: ::UINT = 0x0024;
-pub const WM_PAINTICON: ::UINT = 0x0026;
-pub const WM_ICONERASEBKGND: ::UINT = 0x0027;
-pub const WM_NEXTDLGCTL: ::UINT = 0x0028;
-pub const WM_SPOOLERSTATUS: ::UINT = 0x002A;
-pub const WM_DRAWITEM: ::UINT = 0x002B;
-pub const WM_MEASUREITEM: ::UINT = 0x002C;
-pub const WM_DELETEITEM: ::UINT = 0x002D;
-pub const WM_VKEYTOITEM: ::UINT = 0x002E;
-pub const WM_CHARTOITEM: ::UINT = 0x002F;
-pub const WM_SETFONT: ::UINT = 0x0030;
-pub const WM_GETFONT: ::UINT = 0x0031;
-pub const WM_SETHOTKEY: ::UINT = 0x0032;
-pub const WM_GETHOTKEY: ::UINT = 0x0033;
-pub const WM_QUERYDRAGICON: ::UINT = 0x0037;
-pub const WM_COMPAREITEM: ::UINT = 0x0039;
-pub const WM_GETOBJECT: ::UINT = 0x003D;
-pub const WM_COMPACTING: ::UINT = 0x0041;
-pub const WM_COMMNOTIFY: ::UINT = 0x0044;
-pub const WM_WINDOWPOSCHANGING: ::UINT = 0x0046;
-pub const WM_WINDOWPOSCHANGED: ::UINT = 0x0047;
-pub const WM_POWER: ::UINT = 0x0048;
-pub const WM_COPYDATA: ::UINT = 0x004A;
-pub const WM_CANCELJOURNAL: ::UINT = 0x004B;
-pub const WM_NOTIFY: ::UINT = 0x004E;
-pub const WM_INPUTLANGCHANGEREQUEST: ::UINT = 0x0050;
-pub const WM_INPUTLANGCHANGE: ::UINT = 0x0051;
-pub const WM_TCARD: ::UINT = 0x0052;
-pub const WM_HELP: ::UINT = 0x0053;
-pub const WM_USERCHANGED: ::UINT = 0x0054;
-pub const WM_NOTIFYFORMAT: ::UINT = 0x0055;
-pub const WM_CONTEXTMENU: ::UINT = 0x007B;
-pub const WM_STYLECHANGING: ::UINT = 0x007C;
-pub const WM_STYLECHANGED: ::UINT = 0x007D;
-pub const WM_DISPLAYCHANGE: ::UINT = 0x007E;
-pub const WM_GETICON: ::UINT = 0x007F;
-pub const WM_SETICON: ::UINT = 0x0080;
-pub const WM_NCCREATE: ::UINT = 0x0081;
-pub const WM_NCDESTROY: ::UINT = 0x0082;
-pub const WM_NCCALCSIZE: ::UINT = 0x0083;
-pub const WM_NCHITTEST: ::UINT = 0x0084;
-pub const WM_NCPAINT: ::UINT = 0x0085;
-pub const WM_NCACTIVATE: ::UINT = 0x0086;
-pub const WM_GETDLGCODE: ::UINT = 0x0087;
-pub const WM_SYNCPAINT: ::UINT = 0x0088;
-pub const WM_NCMOUSEMOVE: ::UINT = 0x00A0;
-pub const WM_NCLBUTTONDOWN: ::UINT = 0x00A1;
-pub const WM_NCLBUTTONUP: ::UINT = 0x00A2;
-pub const WM_NCLBUTTONDBLCLK: ::UINT = 0x00A3;
-pub const WM_NCRBUTTONDOWN: ::UINT = 0x00A4;
-pub const WM_NCRBUTTONUP: ::UINT = 0x00A5;
-pub const WM_NCRBUTTONDBLCLK: ::UINT = 0x00A6;
-pub const WM_NCMBUTTONDOWN: ::UINT = 0x00A7;
-pub const WM_NCMBUTTONUP: ::UINT = 0x00A8;
-pub const WM_NCMBUTTONDBLCLK: ::UINT = 0x00A9;
-pub const WM_NCXBUTTONDOWN: ::UINT = 0x00AB;
-pub const WM_NCXBUTTONUP: ::UINT = 0x00AC;
-pub const WM_NCXBUTTONDBLCLK: ::UINT = 0x00AD;
-pub const WM_INPUT_DEVICE_CHANGE: ::UINT = 0x00FE;
-pub const WM_INPUT: ::UINT = 0x00FF;
-pub const WM_KEYFIRST: ::UINT = 0x0100;
-pub const WM_KEYDOWN: ::UINT = 0x0100;
-pub const WM_KEYUP: ::UINT = 0x0101;
-pub const WM_CHAR: ::UINT = 0x0102;
-pub const WM_DEADCHAR: ::UINT = 0x0103;
-pub const WM_SYSKEYDOWN: ::UINT = 0x0104;
-pub const WM_SYSKEYUP: ::UINT = 0x0105;
-pub const WM_SYSCHAR: ::UINT = 0x0106;
-pub const WM_SYSDEADCHAR: ::UINT = 0x0107;
-pub const WM_UNICHAR: ::UINT = 0x0109;
-pub const WM_KEYLAST: ::UINT = 0x0109;
-pub const WM_IME_STARTCOMPOSITION: ::UINT = 0x010D;
-pub const WM_IME_ENDCOMPOSITION: ::UINT = 0x010E;
-pub const WM_IME_COMPOSITION: ::UINT = 0x010F;
-pub const WM_IME_KEYLAST: ::UINT = 0x010F;
-pub const WM_INITDIALOG: ::UINT = 0x0110;
-pub const WM_COMMAND: ::UINT = 0x0111;
-pub const WM_SYSCOMMAND: ::UINT = 0x0112;
-pub const WM_TIMER: ::UINT = 0x0113;
-pub const WM_HSCROLL: ::UINT = 0x0114;
-pub const WM_VSCROLL: ::UINT = 0x0115;
-pub const WM_INITMENU: ::UINT = 0x0116;
-pub const WM_INITMENUPOPUP: ::UINT = 0x0117;
-pub const WM_GESTURE: ::UINT = 0x0119;
-pub const WM_GESTURENOTIFY: ::UINT = 0x011A;
-pub const WM_MENUSELECT: ::UINT = 0x011F;
-pub const WM_MENUCHAR: ::UINT = 0x0120;
-pub const WM_ENTERIDLE: ::UINT = 0x0121;
-pub const WM_MENURBUTTONUP: ::UINT = 0x0122;
-pub const WM_MENUDRAG: ::UINT = 0x0123;
-pub const WM_MENUGETOBJECT: ::UINT = 0x0124;
-pub const WM_UNINITMENUPOPUP: ::UINT = 0x0125;
-pub const WM_MENUCOMMAND: ::UINT = 0x0126;
-pub const WM_CHANGEUISTATE: ::UINT = 0x0127;
-pub const WM_UPDATEUISTATE: ::UINT = 0x0128;
-pub const WM_QUERYUISTATE: ::UINT = 0x0129;
-pub const WM_CTLCOLORMSGBOX: ::UINT = 0x0132;
-pub const WM_CTLCOLOREDIT: ::UINT = 0x0133;
-pub const WM_CTLCOLORLISTBOX: ::UINT = 0x0134;
-pub const WM_CTLCOLORBTN: ::UINT = 0x0135;
-pub const WM_CTLCOLORDLG: ::UINT = 0x0136;
-pub const WM_CTLCOLORSCROLLBAR: ::UINT = 0x0137;
-pub const WM_CTLCOLORSTATIC: ::UINT = 0x0138;
-pub const WM_MOUSEFIRST: ::UINT = 0x0200;
-pub const WM_MOUSEMOVE: ::UINT = 0x0200;
-pub const WM_LBUTTONDOWN: ::UINT = 0x0201;
-pub const WM_LBUTTONUP: ::UINT = 0x0202;
-pub const WM_LBUTTONDBLCLK: ::UINT = 0x0203;
-pub const WM_RBUTTONDOWN: ::UINT = 0x0204;
-pub const WM_RBUTTONUP: ::UINT = 0x0205;
-pub const WM_RBUTTONDBLCLK: ::UINT = 0x0206;
-pub const WM_MBUTTONDOWN: ::UINT = 0x0207;
-pub const WM_MBUTTONUP: ::UINT = 0x0208;
-pub const WM_MBUTTONDBLCLK: ::UINT = 0x0209;
-pub const WM_MOUSEWHEEL: ::UINT = 0x020A;
-pub const WM_XBUTTONDOWN: ::UINT = 0x020B;
-pub const WM_XBUTTONUP: ::UINT = 0x020C;
-pub const WM_XBUTTONDBLCLK: ::UINT = 0x020D;
-pub const WM_MOUSEHWHEEL: ::UINT = 0x020E;
-pub const WM_MOUSELAST: ::UINT = 0x020E;
-pub const WM_PARENTNOTIFY: ::UINT = 0x0210;
-pub const WM_ENTERMENULOOP: ::UINT = 0x0211;
-pub const WM_EXITMENULOOP: ::UINT = 0x0212;
-pub const WM_NEXTMENU: ::UINT = 0x0213;
-pub const WM_SIZING: ::UINT = 0x0214;
-pub const WM_CAPTURECHANGED: ::UINT = 0x0215;
-pub const WM_MOVING: ::UINT = 0x0216;
-pub const WM_POWERBROADCAST: ::UINT = 0x0218;
-pub const WM_DEVICECHANGE: ::UINT = 0x0219;
-pub const WM_MDICREATE: ::UINT = 0x0220;
-pub const WM_MDIDESTROY: ::UINT = 0x0221;
-pub const WM_MDIACTIVATE: ::UINT = 0x0222;
-pub const WM_MDIRESTORE: ::UINT = 0x0223;
-pub const WM_MDINEXT: ::UINT = 0x0224;
-pub const WM_MDIMAXIMIZE: ::UINT = 0x0225;
-pub const WM_MDITILE: ::UINT = 0x0226;
-pub const WM_MDICASCADE: ::UINT = 0x0227;
-pub const WM_MDIICONARRANGE: ::UINT = 0x0228;
-pub const WM_MDIGETACTIVE: ::UINT = 0x0229;
-pub const WM_MDISETMENU: ::UINT = 0x0230;
-pub const WM_ENTERSIZEMOVE: ::UINT = 0x0231;
-pub const WM_EXITSIZEMOVE: ::UINT = 0x0232;
-pub const WM_DROPFILES: ::UINT = 0x0233;
-pub const WM_MDIREFRESHMENU: ::UINT = 0x0234;
-pub const WM_POINTERDEVICECHANGE: ::UINT = 0x238;
-pub const WM_POINTERDEVICEINRANGE: ::UINT = 0x239;
-pub const WM_POINTERDEVICEOUTOFRANGE: ::UINT = 0x23A;
-pub const WM_TOUCH: ::UINT = 0x0240;
-pub const WM_NCPOINTERUPDATE: ::UINT = 0x0241;
-pub const WM_NCPOINTERDOWN: ::UINT = 0x0242;
-pub const WM_NCPOINTERUP: ::UINT = 0x0243;
-pub const WM_POINTERUPDATE: ::UINT = 0x0245;
-pub const WM_POINTERDOWN: ::UINT = 0x0246;
-pub const WM_POINTERUP: ::UINT = 0x0247;
-pub const WM_POINTERENTER: ::UINT = 0x0249;
-pub const WM_POINTERLEAVE: ::UINT = 0x024A;
-pub const WM_POINTERACTIVATE: ::UINT = 0x024B;
-pub const WM_POINTERCAPTURECHANGED: ::UINT = 0x024C;
-pub const WM_TOUCHHITTESTING: ::UINT = 0x024D;
-pub const WM_POINTERWHEEL: ::UINT = 0x024E;
-pub const WM_POINTERHWHEEL: ::UINT = 0x024F;
-pub const WM_IME_SETCONTEXT: ::UINT = 0x0281;
-pub const WM_IME_NOTIFY: ::UINT = 0x0282;
-pub const WM_IME_CONTROL: ::UINT = 0x0283;
-pub const WM_IME_COMPOSITIONFULL: ::UINT = 0x0284;
-pub const WM_IME_SELECT: ::UINT = 0x0285;
-pub const WM_IME_CHAR: ::UINT = 0x0286;
-pub const WM_IME_REQUEST: ::UINT = 0x0288;
-pub const WM_IME_KEYDOWN: ::UINT = 0x0290;
-pub const WM_IME_KEYUP: ::UINT = 0x0291;
-pub const WM_MOUSEHOVER: ::UINT = 0x02A1;
-pub const WM_MOUSELEAVE: ::UINT = 0x02A3;
-pub const WM_NCMOUSEHOVER: ::UINT = 0x02A0;
-pub const WM_NCMOUSELEAVE: ::UINT = 0x02A2;
-pub const WM_WTSSESSION_CHANGE: ::UINT = 0x02B1;
-pub const WM_TABLET_FIRST: ::UINT = 0x02c0;
-pub const WM_TABLET_LAST: ::UINT = 0x02df;
-pub const WM_DPICHANGED: ::UINT = 0x02E0;
-pub const WM_CUT: ::UINT = 0x0300;
-pub const WM_COPY: ::UINT = 0x0301;
-pub const WM_PASTE: ::UINT = 0x0302;
-pub const WM_CLEAR: ::UINT = 0x0303;
-pub const WM_UNDO: ::UINT = 0x0304;
-pub const WM_RENDERFORMAT: ::UINT = 0x0305;
-pub const WM_RENDERALLFORMATS: ::UINT = 0x0306;
-pub const WM_DESTROYCLIPBOARD: ::UINT = 0x0307;
-pub const WM_DRAWCLIPBOARD: ::UINT = 0x0308;
-pub const WM_PAINTCLIPBOARD: ::UINT = 0x0309;
-pub const WM_VSCROLLCLIPBOARD: ::UINT = 0x030A;
-pub const WM_SIZECLIPBOARD: ::UINT = 0x030B;
-pub const WM_ASKCBFORMATNAME: ::UINT = 0x030C;
-pub const WM_CHANGECBCHAIN: ::UINT = 0x030D;
-pub const WM_HSCROLLCLIPBOARD: ::UINT = 0x030E;
-pub const WM_QUERYNEWPALETTE: ::UINT = 0x030F;
-pub const WM_PALETTEISCHANGING: ::UINT = 0x0310;
-pub const WM_PALETTECHANGED: ::UINT = 0x0311;
-pub const WM_HOTKEY: ::UINT = 0x0312;
-pub const WM_PRINT: ::UINT = 0x0317;
-pub const WM_PRINTCLIENT: ::UINT = 0x0318;
-pub const WM_APPCOMMAND: ::UINT = 0x0319;
-pub const WM_THEMECHANGED: ::UINT = 0x031A;
-pub const WM_CLIPBOARDUPDATE: ::UINT = 0x031D;
-pub const WM_DWMCOMPOSITIONCHANGED: ::UINT = 0x031E;
-pub const WM_DWMNCRENDERINGCHANGED: ::UINT = 0x031F;
-pub const WM_DWMCOLORIZATIONCOLORCHANGED: ::UINT = 0x0320;
-pub const WM_DWMWINDOWMAXIMIZEDCHANGE: ::UINT = 0x0321;
-pub const WM_DWMSENDICONICTHUMBNAIL: ::UINT = 0x0323;
-pub const WM_DWMSENDICONICLIVEPREVIEWBITMAP: ::UINT = 0x0326;
-pub const WM_GETTITLEBARINFOEX: ::UINT = 0x033F;
-pub const WM_HANDHELDFIRST: ::UINT = 0x0358;
-pub const WM_HANDHELDLAST: ::UINT = 0x035F;
-pub const WM_AFXFIRST: ::UINT = 0x0360;
-pub const WM_AFXLAST: ::UINT = 0x037F;
-pub const WM_PENWINFIRST: ::UINT = 0x0380;
-pub const WM_PENWINLAST: ::UINT = 0x038F;
-pub const WM_APP: ::UINT = 0x8000;
-pub const WM_USER: ::UINT = 0x0400;
-pub const WMSZ_LEFT: ::UINT = 1;
-pub const WMSZ_RIGHT: ::UINT = 2;
-pub const WMSZ_TOP: ::UINT = 3;
-pub const WMSZ_TOPLEFT: ::UINT = 4;
-pub const WMSZ_TOPRIGHT: ::UINT = 5;
-pub const WMSZ_BOTTOM: ::UINT = 6;
-pub const WMSZ_BOTTOMLEFT: ::UINT = 7;
-pub const WMSZ_BOTTOMRIGHT: ::UINT = 8;
-pub const SMTO_NORMAL: ::UINT = 0x0000;
-pub const SMTO_BLOCK: ::UINT = 0x0001;
-pub const SMTO_ABORTIFHUNG: ::UINT = 0x0002;
-pub const SMTO_NOTIMEOUTIFNOTHUNG: ::UINT = 0x0008;
-pub const SMTO_ERRORONEXIT: ::UINT = 0x0020;
-pub const MA_ACTIVATE: ::UINT = 1;
-pub const MA_ACTIVATEANDEAT: ::UINT = 2;
-pub const MA_NOACTIVATE: ::UINT = 3;
-pub const MA_NOACTIVATEANDEAT: ::UINT = 4;
-pub const ICON_SMALL: ::UINT = 0;
-pub const ICON_BIG: ::UINT = 1;
-pub const ICON_SMALL2: ::UINT = 2;
-pub const SIZE_RESTORED: ::UINT = 0;
-pub const SIZE_MINIMIZED: ::UINT = 1;
-pub const SIZE_MAXIMIZED: ::UINT = 2;
-pub const SIZE_MAXSHOW: ::UINT = 3;
-pub const SIZE_MAXHIDE: ::UINT = 4;
-pub const SIZENORMAL: ::UINT = SIZE_RESTORED;
-pub const SIZEICONIC: ::UINT = SIZE_MINIMIZED;
-pub const SIZEFULLSCREEN: ::UINT = SIZE_MAXIMIZED;
-pub const SIZEZOOMSHOW: ::UINT = SIZE_MAXSHOW;
-pub const SIZEZOOMHIDE: ::UINT = SIZE_MAXHIDE;
-STRUCT!{struct NCCALCSIZE_PARAMS {
-    rgrc: [::RECT; 3],
-    lppos: PWINDOWPOS,
-}}
-pub type PNCCALCSIZE_PARAMS = *mut NCCALCSIZE_PARAMS;
-pub type NPNCCALCSIZE_PARAMS = *mut NCCALCSIZE_PARAMS;
-pub type LPNCCALCSIZE_PARAMS = *mut NCCALCSIZE_PARAMS;
-pub const WVR_ALIGNTOP: ::UINT = 0x0010;
-pub const WVR_ALIGNLEFT: ::UINT = 0x0020;
-pub const WVR_ALIGNBOTTOM: ::UINT = 0x0040;
-pub const WVR_ALIGNRIGHT: ::UINT = 0x0080;
-pub const WVR_HREDRAW: ::UINT = 0x0100;
-pub const WVR_VREDRAW: ::UINT = 0x0200;
-pub const WVR_REDRAW: ::UINT = WVR_HREDRAW | WVR_VREDRAW;
-pub const WVR_VALIDRECTS: ::UINT = 0x0400;
-pub const HOVER_DEFAULT: ::UINT = 0xFFFFFFFF;
-pub const WS_OVERLAPPED: ::DWORD = 0x00000000;
-pub const WS_POPUP: ::DWORD = 0x80000000;
-pub const WS_CHILD: ::DWORD = 0x40000000;
-pub const WS_MINIMIZE: ::DWORD = 0x20000000;
-pub const WS_VISIBLE: ::DWORD = 0x10000000;
-pub const WS_DISABLED: ::DWORD = 0x08000000;
-pub const WS_CLIPSIBLINGS: ::DWORD = 0x04000000;
-pub const WS_CLIPCHILDREN: ::DWORD = 0x02000000;
-pub const WS_MAXIMIZE: ::DWORD = 0x01000000;
-pub const WS_CAPTION: ::DWORD = 0x00C00000;
-pub const WS_BORDER: ::DWORD = 0x00800000;
-pub const WS_DLGFRAME: ::DWORD = 0x00400000;
-pub const WS_VSCROLL: ::DWORD = 0x00200000;
-pub const WS_HSCROLL: ::DWORD = 0x00100000;
-pub const WS_SYSMENU: ::DWORD = 0x00080000;
-pub const WS_THICKFRAME: ::DWORD = 0x00040000;
-pub const WS_GROUP: ::DWORD = 0x00020000;
-pub const WS_TABSTOP: ::DWORD = 0x00010000;
-pub const WS_MINIMIZEBOX: ::DWORD = 0x00020000;
-pub const WS_MAXIMIZEBOX: ::DWORD = 0x00010000;
-pub const WS_TILED: ::DWORD = WS_OVERLAPPED;
-pub const WS_ICONIC: ::DWORD = WS_MINIMIZE;
-pub const WS_SIZEBOX: ::DWORD = WS_THICKFRAME;
-pub const WS_TILEDWINDOW: ::DWORD = WS_OVERLAPPEDWINDOW;
-pub const WS_OVERLAPPEDWINDOW: ::DWORD = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
-pub const WS_POPUPWINDOW: ::DWORD = WS_POPUP | WS_BORDER | WS_SYSMENU;
-pub const WS_CHILDWINDOW: ::DWORD = WS_CHILD;
-pub const WS_EX_DLGMODALFRAME: ::DWORD = 0x00000001;
-pub const WS_EX_NOPARENTNOTIFY: ::DWORD = 0x00000004;
-pub const WS_EX_TOPMOST: ::DWORD = 0x00000008;
-pub const WS_EX_ACCEPTFILES: ::DWORD = 0x00000010;
-pub const WS_EX_TRANSPARENT: ::DWORD = 0x00000020;
-pub const WS_EX_MDICHILD: ::DWORD = 0x00000040;
-pub const WS_EX_TOOLWINDOW: ::DWORD = 0x00000080;
-pub const WS_EX_WINDOWEDGE: ::DWORD = 0x00000100;
-pub const WS_EX_CLIENTEDGE: ::DWORD = 0x00000200;
-pub const WS_EX_CONTEXTHELP: ::DWORD = 0x00000400;
-pub const WS_EX_RIGHT: ::DWORD = 0x00001000;
-pub const WS_EX_LEFT: ::DWORD = 0x00000000;
-pub const WS_EX_RTLREADING: ::DWORD = 0x00002000;
-pub const WS_EX_LTRREADING: ::DWORD = 0x00000000;
-pub const WS_EX_LEFTSCROLLBAR: ::DWORD = 0x00004000;
-pub const WS_EX_RIGHTSCROLLBAR: ::DWORD = 0x00000000;
-pub const WS_EX_CONTROLPARENT: ::DWORD = 0x00010000;
-pub const WS_EX_STATICEDGE: ::DWORD = 0x00020000;
-pub const WS_EX_APPWINDOW: ::DWORD = 0x00040000;
-pub const WS_EX_OVERLAPPEDWINDOW: ::DWORD = WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE;
-pub const WS_EX_PALETTEWINDOW: ::DWORD = WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST;
-pub const WS_EX_LAYERED: ::DWORD = 0x00080000;
-pub const WS_EX_NOINHERITLAYOUT: ::DWORD = 0x00100000;
-pub const WS_EX_NOREDIRECTIONBITMAP: ::DWORD = 0x00200000;
-pub const WS_EX_LAYOUTRTL: ::DWORD = 0x00400000;
-pub const WS_EX_COMPOSITED: ::DWORD = 0x02000000;
-pub const WS_EX_NOACTIVATE: ::DWORD = 0x08000000;
-pub type NAMEENUMPROCA = Option<unsafe extern "system" fn(::LPSTR, ::LPARAM) -> ::BOOL>;
-pub type NAMEENUMPROCW = Option<unsafe extern "system" fn(::LPWSTR, ::LPARAM) -> ::BOOL>;
-pub type DESKTOPENUMPROCA = NAMEENUMPROCA;
-pub type DESKTOPENUMPROCW = NAMEENUMPROCW;
-pub type WINSTAENUMPROCA = NAMEENUMPROCA;
-pub type WINSTAENUMPROCW = NAMEENUMPROCW;
-pub type WNDENUMPROC = Option<unsafe extern "system" fn(::HWND, ::LPARAM) -> ::BOOL>;
-pub type WNDPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::LRESULT>;
-pub type DLGPROC = Option<unsafe extern "system" fn(
-    ::HWND, ::UINT, ::WPARAM, ::LPARAM,
-) -> ::INT_PTR>;
-pub type HOOKPROC = Option<unsafe extern "system" fn(
-    code: ::c_int, wParam: ::WPARAM, lParam: ::LPARAM,
-) -> ::LRESULT>;
-pub type TimerProc = Option<unsafe extern "system" fn(
-    hwnd: ::HWND, uMsg: ::UINT, idEvent: ::UINT_PTR, dwTime: ::DWORD,
-)>;
-pub type DRAWSTATEPROC = Option<unsafe extern "system" fn(
-    ::HDC, ::LPARAM, ::WPARAM, ::c_int, ::c_int,
-) -> ::BOOL>;
-pub type PROPENUMPROCA = Option<unsafe extern "system" fn(::HWND, ::LPCSTR, ::HANDLE) -> ::BOOL>;
-pub type PROPENUMPROCW = Option<unsafe extern "system" fn(::HWND, ::LPCWSTR, ::HANDLE) -> ::BOOL>;
-pub type GRAYSTRINGPROC = Option<unsafe extern "system" fn(::HDC, ::LPARAM, ::c_int) -> ::BOOL>;
-pub type MSGBOXCALLBACK = Option<unsafe extern "system" fn(LPHELPINFO)>;
-pub type WINEVENTPROC = Option<unsafe extern "system" fn(
-    ::HWINEVENTHOOK, ::DWORD, ::HWND, ::LONG, ::LONG, ::DWORD, ::DWORD,
-)>;
-pub type HDEVNOTIFY = ::PVOID;
-pub type MENUTEMPLATEA = ::VOID;
-pub type MENUTEMPLATEW = ::VOID;
-STRUCT!{struct MSG {
-    hwnd: ::HWND,
-    message: ::UINT,
-    wParam: ::WPARAM,
-    lParam: ::LPARAM,
-    time: ::DWORD,
-    pt: ::POINT,
-}}
-pub type PMSG = *mut MSG;
-pub type NPMSG = *mut MSG;
-pub type LPMSG = *mut MSG;
-STRUCT!{struct PAINTSTRUCT {
-    hdc: ::HDC,
-    fErase: ::BOOL,
-    rcPaint: ::RECT,
-    fRestore: ::BOOL,
-    fIncUpdate: ::BOOL,
-    rgbReserved: [::BYTE; 32],
-}}
-pub type PPAINTSTRUCT = *mut PAINTSTRUCT;
-pub type NPPAINTSTRUCT = *mut PAINTSTRUCT;
-pub type LPPAINTSTRUCT = *mut PAINTSTRUCT;
-STRUCT!{struct WINDOWPLACEMENT {
-    length: ::UINT,
-    flags: ::UINT,
-    showCmd: ::UINT,
-    ptMinPosition: ::POINT,
-    ptMaxPosition: ::POINT,
-    rcNormalPosition: ::RECT,
-}}
-pub type PWINDOWPLACEMENT = *mut WINDOWPLACEMENT;
-pub type LPWINDOWPLACEMENT = *mut WINDOWPLACEMENT;
-STRUCT!{nodebug struct WNDCLASSEXW {
-    cbSize: ::UINT,
-    style: ::UINT,
-    lpfnWndProc: WNDPROC,
-    cbClsExtra: ::c_int,
-    cbWndExtra: ::c_int,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    hCursor: ::HCURSOR,
-    hbrBackground: ::HBRUSH,
-    lpszMenuName: ::LPCWSTR,
-    lpszClassName: ::LPCWSTR,
-    hIconSm: ::HICON,
-}}
-pub type PWNDCLASSEXW = *mut WNDCLASSEXW;
-pub type NPWNDCLASSEXW = *mut WNDCLASSEXW;
-pub type LPWNDCLASSEXW = *mut WNDCLASSEXW;
-STRUCT!{nodebug struct WNDCLASSW {
-    style: ::UINT,
-    lpfnWndProc: WNDPROC,
-    cbClsExtra: ::c_int,
-    cbWndExtra: ::c_int,
-    hInstance: ::HINSTANCE,
-    hIcon: ::HICON,
-    hCursor: ::HCURSOR,
-    hbrBackground: ::HBRUSH,
-    lpszMenuName: ::LPCWSTR,
-    lpszClassName: ::LPCWSTR,
-}}
-pub type PWNDCLASSW = *mut WNDCLASSW;
-pub type NPWNDCLASSW = *mut WNDCLASSW;
-pub type LPWNDCLASSW = *mut WNDCLASSW;
-STRUCT!{struct MINMAXINFO {
-    ptReserved: ::POINT,
-    ptMaxSize: ::POINT,
-    ptMaxPosition: ::POINT,
-    ptMinTrackSize: ::POINT,
-    ptMaxTrackSize: ::POINT,
-}}
-STRUCT!{struct SCROLLBARINFO {
-    cbSize: ::DWORD,
-    rcScrollBar: ::RECT,
-    dxyLineButton: ::c_int,
-    xyThumbTop: ::c_int,
-    xyThumbBottom: ::c_int,
-    reserved: ::c_int,
-    rgstate: [::DWORD; CCHILDREN_SCROLLBAR + 1],
-}}
-pub type PSCROLLBARINFO = *mut SCROLLBARINFO;
-pub type LPSCROLLBARINFO = *mut SCROLLBARINFO;
-STRUCT!{struct SCROLLINFO {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    nMin: ::c_int,
-    nMax: ::c_int,
-    nPage: ::UINT,
-    nPos: ::c_int,
-    nTrackPos: ::c_int,
-}}
-pub type LPSCROLLINFO = *mut SCROLLINFO;
-pub type LPCSCROLLINFO = *const SCROLLINFO;
-STRUCT!{struct SIZE {
-    cx: ::LONG,
-    cy: ::LONG,
-}}
-pub type PSIZE = *mut SIZE;
-pub type LPSIZE = *mut SIZE;
-pub type SIZEL = SIZE;
-pub type PSIZEL = *mut SIZEL;
-pub type LPSIZEL = *mut SIZEL;
-//1913
-pub const UNICODE_NOCHAR: ::WPARAM = 0xffff;
-pub type HDWP = *mut ::HANDLE;
-//2193
-pub const WHEEL_DELTA: ::DWORD = 120;
-//2206
-pub const XBUTTON1: ::DWORD = 0x0001;
-pub const XBUTTON2: ::DWORD = 0x0002;
-//2392
-pub const MK_LBUTTON: ::WPARAM = 0x0001;
-pub const MK_RBUTTON: ::WPARAM = 0x0002;
-pub const MK_SHIFT: ::WPARAM = 0x0004;
-pub const MK_CONTROL: ::WPARAM = 0x0008;
-pub const MK_MBUTTON: ::WPARAM = 0x0010;
-pub const MK_XBUTTON1: ::WPARAM = 0x0020;
-pub const MK_XBUTTON2: ::WPARAM = 0x0040;
-//2408
-pub const TME_HOVER: ::DWORD = 0x0000_0001;
-pub const TME_LEAVE: ::DWORD = 0x0000_0002;
-pub const TME_NONCLIENT: ::DWORD = 0x0000_0010;
-pub const TME_QUERY: ::DWORD = 0x4000_0000;
-pub const TME_CANCEL: ::DWORD = 0x8000_0000;
-pub const HWND_BROADCAST: ::HWND = 0xFFFF as ::HWND;
-pub const HWND_MESSAGE: ::HWND = -3isize as ::HWND;
-STRUCT!{struct TRACKMOUSEEVENT {
-    cbSize: ::DWORD,
-    dwFlags: ::DWORD,
-    hwndTrack: ::HWND,
-    dwHoverTime: ::DWORD,
-}}
-pub type LPTRACKMOUSEEVENT = *mut TRACKMOUSEEVENT;
-//2575
-STRUCT!{nodebug struct WINDOWPOS {
-    hwnd: ::HWND,
-    hwndInsertAfter: ::HWND,
-    x: ::c_int,
-    y: ::c_int,
-    cx: ::c_int,
-    cy: ::c_int,
-    flags: ::UINT,
-}}
-pub type LPWINDOWPOS = *mut WINDOWPOS;
-pub type PWINDOWPOS = *mut WINDOWPOS;
-//3082
-STRUCT!{struct CREATESTRUCTA {
-    lpCreateParams: ::LPVOID,
-    hInstance: ::HINSTANCE,
-    hMenu: ::HMENU,
-    hwndParent: ::HWND,
-    cy: ::c_int,
-    cx: ::c_int,
-    y: ::c_int,
-    x: ::c_int,
-    style: ::LONG,
-    lpszName: ::LPCSTR,
-    lpszClass: ::LPCSTR,
-    dwExStyle: ::DWORD,
-}}
-pub type LPCREATESTRUCTA = *mut CREATESTRUCTA;
-STRUCT!{struct CREATESTRUCTW {
-    lpCreateParams: ::LPVOID,
-    hInstance: ::HINSTANCE,
-    hMenu: ::HMENU,
-    hwndParent: ::HWND,
-    cy: ::c_int,
-    cx: ::c_int,
-    y: ::c_int,
-    x: ::c_int,
-    style: ::LONG,
-    lpszName: ::LPCWSTR,
-    lpszClass: ::LPCWSTR,
-    dwExStyle: ::DWORD,
-}}
-pub type LPCREATESTRUCTW = *mut CREATESTRUCTW;
-//3145
-STRUCT!{struct NMHDR {
-    hwndFrom: ::HWND,
-    idFrom: ::UINT_PTR,
-    code: ::UINT,  // NM_ code
-}}
-pub type LPNMHDR = *mut NMHDR;
-//3400
-pub const PM_NOREMOVE: ::UINT = 0x0000;
-pub const PM_REMOVE: ::UINT = 0x0001;
-pub const PM_NOYIELD: ::UINT = 0x0002;
-pub const PM_QS_INPUT: ::UINT = QS_INPUT << 16;
-pub const PM_QS_POSTMESSAGE: ::UINT = (QS_POSTMESSAGE | QS_HOTKEY | QS_TIMER) << 16;
-pub const PM_QS_PAINT: ::UINT = QS_PAINT << 16;
-pub const PM_QS_SENDMESSAGE: ::UINT = QS_SENDMESSAGE << 16;
-//
-pub const LWA_COLORKEY: ::DWORD = 0x00000001;
-pub const LWA_ALPHA: ::DWORD = 0x00000002;
-//3469
-pub const EWX_LOGOFF: ::UINT = 0x00000000;
-pub const EWX_SHUTDOWN: ::UINT = 0x00000001;
-pub const EWX_REBOOT: ::UINT = 0x00000002;
-pub const EWX_FORCE: ::UINT = 0x00000004;
-pub const EWX_POWEROFF: ::UINT = 0x00000008;
-pub const EWX_FORCEIFHUNG: ::UINT = 0x00000010;
-pub const EWX_QUICKRESOLVE: ::UINT = 0x00000020;
-pub const EWX_RESTARTAPPS: ::UINT = 0x00000040;
-pub const EWX_HYBRID_SHUTDOWN: ::UINT = 0x00400000;
-pub const EWX_BOOTOPTIONS: ::UINT = 0x01000000;
-//4054 (Win 7 SDK)
-STRUCT!{struct FLASHWINFO {
-    cbSize: ::UINT,
-    hwnd: ::HWND,
-    dwFlags: ::DWORD,
-    uCount: ::UINT,
-    dwTimeout: ::DWORD,
-}}
-pub type PFLASHWINFO = *mut FLASHWINFO;
-pub const FLASHW_STOP: ::DWORD = 0;
-pub const FLASHW_CAPTION: ::DWORD = 0x00000001;
-pub const FLASHW_TRAY: ::DWORD = 0x00000002;
-pub const FLASHW_ALL: ::DWORD = FLASHW_CAPTION | FLASHW_TRAY;
-pub const FLASHW_TIMER: ::DWORD = 0x00000004;
-pub const FLASHW_TIMERNOFG: ::DWORD = 0x0000000C;
-// 4674
-pub const HWND_TOP: ::HWND = 0 as ::HWND;
-pub const HWND_BOTTOM: ::HWND = 1 as ::HWND;
-pub const HWND_TOPMOST: ::HWND = -1isize as ::HWND;
-pub const HWND_NOTOPMOST: ::HWND = -2isize as ::HWND;
-//5499
-pub const MAPVK_VK_TO_VSC: ::UINT = 0;
-pub const MAPVK_VSC_TO_VK: ::UINT = 1;
-pub const MAPVK_VK_TO_CHAR: ::UINT = 2;
-pub const MAPVK_VSC_TO_VK_EX: ::UINT = 3;
-pub const MAPVK_VK_TO_VSC_EX: ::UINT = 4;
-//5741
-pub const KEYEVENTF_EXTENDEDKEY: ::DWORD = 0x0001;
-pub const KEYEVENTF_KEYUP: ::DWORD = 0x0002;
-pub const KEYEVENTF_UNICODE: ::DWORD = 0x0004;
-pub const KEYEVENTF_SCANCODE: ::DWORD = 0x0008;
-pub const MOUSEEVENTF_MOVE: ::DWORD = 0x0001;
-pub const MOUSEEVENTF_LEFTDOWN: ::DWORD = 0x0002;
-pub const MOUSEEVENTF_LEFTUP: ::DWORD = 0x0004;
-pub const MOUSEEVENTF_RIGHTDOWN: ::DWORD = 0x0008;
-pub const MOUSEEVENTF_RIGHTUP: ::DWORD = 0x0010;
-pub const MOUSEEVENTF_MIDDLEDOWN: ::DWORD = 0x0020;
-pub const MOUSEEVENTF_MIDDLEUP: ::DWORD = 0x0040;
-pub const MOUSEEVENTF_XDOWN: ::DWORD = 0x0080;
-pub const MOUSEEVENTF_XUP: ::DWORD = 0x0100;
-pub const MOUSEEVENTF_WHEEL: ::DWORD = 0x0800;
-pub const MOUSEEVENTF_HWHEEL: ::DWORD = 0x01000;
-pub const MOUSEEVENTF_MOVE_NOCOALESCE: ::DWORD = 0x2000;
-pub const MOUSEEVENTF_VIRTUALDESK: ::DWORD = 0x4000;
-pub const MOUSEEVENTF_ABSOLUTE: ::DWORD = 0x8000;
-STRUCT!{struct MOUSEINPUT {
-    dx: ::LONG,
-    dy: ::LONG,
-    mouseData: ::DWORD,
-    dwFlags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PMOUSEINPUT = *mut MOUSEINPUT;
-pub type LPMOUSEINPUT = *mut MOUSEINPUT;
-STRUCT!{struct KEYBDINPUT {
-    wVk: ::WORD,
-    wScan: ::WORD,
-    dwFlags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PKEYBDINPUT = *mut KEYBDINPUT;
-pub type LPKEYBDINPUT = *mut KEYBDINPUT;
-STRUCT!{struct HARDWAREINPUT {
-    uMsg: ::DWORD,
-    wParamL: ::WORD,
-    wParamH: ::WORD,
-}}
-pub type PHARDWAREINPUT = *mut HARDWAREINPUT;
-pub type LPHARDWAREINPUT= *mut HARDWAREINPUT;
-pub const INPUT_MOUSE: ::DWORD = 0;
-pub const INPUT_KEYBOARD: ::DWORD = 1;
-pub const INPUT_HARDWARE: ::DWORD = 2;
-#[cfg(target_arch = "x86")]
-STRUCT!{struct INPUT {
-    type_: ::DWORD,
-    u: [u32; 6],
-}}
-#[cfg(target_arch = "x86_64")]
-STRUCT!{struct INPUT {
-    type_: ::DWORD,
-    u: [u64; 4],
-}}
-UNION!{INPUT, u, mi, mi_mut, MOUSEINPUT}
-UNION!{INPUT, u, ki, ki_mut, KEYBDINPUT}
-UNION!{INPUT, u, hi, hi_mut, HARDWAREINPUT}
-pub type PINPUT = *mut INPUT;
-pub type LPINPUT = *mut INPUT;
-// if WINVER >= 0x0601
-DECLARE_HANDLE!(HTOUCHINPUT, HTOUCHINPUT__);
-STRUCT!{struct TOUCHINPUT {
-    x: ::LONG,
-    y: ::LONG,
-    hSource: ::HANDLE,
-    dwID: ::DWORD,
-    dwFlags: ::DWORD,
-    dwMask: ::DWORD,
-    dwTime: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-    cxContact: ::DWORD,
-    cyContact: ::DWORD,
-}}
-pub type PTOUCHINPUT = *mut TOUCHINPUT;
-pub type PCTOUCHINPUT = *const TOUCHINPUT;
-//Touch input flag values (TOUCHINPUT.dwFlags)
-pub const TOUCHEVENTF_MOVE: ::DWORD = 0x0001;
-pub const TOUCHEVENTF_DOWN: ::DWORD = 0x0002;
-pub const TOUCHEVENTF_UP: ::DWORD = 0x0004;
-pub const TOUCHEVENTF_INRANGE: ::DWORD = 0x0008;
-pub const TOUCHEVENTF_PRIMARY: ::DWORD = 0x0010;
-pub const TOUCHEVENTF_NOCOALESCE: ::DWORD = 0x0020;
-pub const TOUCHEVENTF_PEN: ::DWORD = 0x0040;
-pub const TOUCHEVENTF_PALM: ::DWORD = 0x0080;
-//Touch input mask values (TOUCHINPUT.dwMask)
-pub const TOUCHINPUTMASKF_TIMEFROMSYSTEM: ::DWORD = 0x0001;
-pub const TOUCHINPUTMASKF_EXTRAINFO: ::DWORD = 0x0002;
-pub const TOUCHINPUTMASKF_CONTACTAREA: ::DWORD = 0x0004;
-//RegisterTouchWindow flag values
-pub const TWF_FINETOUCH: ::ULONG = 0x00000001;
-pub const TWF_WANTPALM: ::ULONG = 0x00000002;
-// end if WINVER >= 0x0601
-//Indices for GetWindowLong etc.
-pub const GWL_EXSTYLE: ::c_int = -20;
-pub const GWL_STYLE: ::c_int = -16;
-pub const GWL_WNDPROC: ::c_int = -4;
-pub const GWLP_WNDPROC: ::c_int = -4;
-pub const GWL_HINSTANCE: ::c_int = -6;
-pub const GWLP_HINSTANCE: ::c_int = -6;
-pub const GWL_HWNDPARENT: ::c_int = -8;
-pub const GWLP_HWNDPARENT: ::c_int = -8;
-pub const GWL_ID: ::c_int = -12;
-pub const GWLP_ID: ::c_int = -12;
-pub const GWL_USERDATA: ::c_int = -21;
-pub const GWLP_USERDATA: ::c_int = -21;
-//5976
-ENUM!{enum POINTER_INPUT_TYPE {
-    PT_POINTER = 0x00000001,
-    PT_TOUCH = 0x00000002,
-    PT_PEN = 0x00000003,
-    PT_MOUSE = 0x00000004,
-    PT_TOUCHPAD = 0x00000005,
-}}
-//6566
-// flags for MsgWaitForMultipleObjectsEx
-pub const MWMO_WAITALL: ::DWORD = 0x0001;
-pub const MWMO_ALERTABLE: ::DWORD = 0x0002;
-pub const MWMO_INPUTAVAILABLE: ::DWORD = 0x0004;
-//6573
-pub const QS_KEY: ::UINT = 0x0001;
-pub const QS_MOUSEMOVE: ::UINT = 0x0002;
-pub const QS_MOUSEBUTTON: ::UINT = 0x0004;
-pub const QS_POSTMESSAGE: ::UINT = 0x0008;
-pub const QS_TIMER: ::UINT = 0x0010;
-pub const QS_PAINT: ::UINT = 0x0020;
-pub const QS_SENDMESSAGE: ::UINT = 0x0040;
-pub const QS_HOTKEY: ::UINT = 0x0080;
-pub const QS_ALLPOSTMESSAGE: ::UINT = 0x0100;
-pub const QS_RAWINPUT: ::UINT = 0x0400;
-pub const QS_TOUCH: ::UINT = 0x0800;
-pub const QS_POINTER: ::UINT = 0x1000;
-pub const QS_MOUSE: ::UINT = QS_MOUSEMOVE | QS_MOUSEBUTTON;
-pub const QS_INPUT: ::UINT = QS_MOUSE | QS_KEY | QS_RAWINPUT | QS_TOUCH | QS_POINTER;
-pub const QS_ALLEVENTS: ::UINT = QS_INPUT | QS_POSTMESSAGE | QS_TIMER | QS_PAINT | QS_HOTKEY;
-pub const QS_ALLINPUT: ::UINT = QS_INPUT | QS_POSTMESSAGE | QS_TIMER
-    | QS_PAINT | QS_HOTKEY | QS_SENDMESSAGE;
-//6789
-pub const SM_CXSCREEN: ::c_int = 0;
-pub const SM_CYSCREEN: ::c_int = 1;
-pub const SM_CXVSCROLL: ::c_int = 2;
-pub const SM_CYHSCROLL: ::c_int = 3;
-pub const SM_CYCAPTION: ::c_int = 4;
-pub const SM_CXBORDER: ::c_int = 5;
-pub const SM_CYBORDER: ::c_int = 6;
-pub const SM_CXDLGFRAME: ::c_int = 7;
-pub const SM_CYDLGFRAME: ::c_int = 8;
-pub const SM_CYVTHUMB: ::c_int = 9;
-pub const SM_CXHTHUMB: ::c_int = 10;
-pub const SM_CXICON: ::c_int = 11;
-pub const SM_CYICON: ::c_int = 12;
-pub const SM_CXCURSOR: ::c_int = 13;
-pub const SM_CYCURSOR: ::c_int = 14;
-pub const SM_CYMENU: ::c_int = 15;
-pub const SM_CXFULLSCREEN: ::c_int = 16;
-pub const SM_CYFULLSCREEN: ::c_int = 17;
-pub const SM_CYKANJIWINDOW: ::c_int = 18;
-pub const SM_MOUSEPRESENT: ::c_int = 19;
-pub const SM_CYVSCROLL: ::c_int = 20;
-pub const SM_CXHSCROLL: ::c_int = 21;
-pub const SM_DEBUG: ::c_int = 22;
-pub const SM_SWAPBUTTON: ::c_int = 23;
-pub const SM_RESERVED1: ::c_int = 24;
-pub const SM_RESERVED2: ::c_int = 25;
-pub const SM_RESERVED3: ::c_int = 26;
-pub const SM_RESERVED4: ::c_int = 27;
-pub const SM_CXMIN: ::c_int = 28;
-pub const SM_CYMIN: ::c_int = 29;
-pub const SM_CXSIZE: ::c_int = 30;
-pub const SM_CYSIZE: ::c_int = 31;
-pub const SM_CXFRAME: ::c_int = 32;
-pub const SM_CYFRAME: ::c_int = 33;
-pub const SM_CXMINTRACK: ::c_int = 34;
-pub const SM_CYMINTRACK: ::c_int = 35;
-pub const SM_CXDOUBLECLK: ::c_int = 36;
-pub const SM_CYDOUBLECLK: ::c_int = 37;
-pub const SM_CXICONSPACING: ::c_int = 38;
-pub const SM_CYICONSPACING: ::c_int = 39;
-pub const SM_MENUDROPALIGNMENT: ::c_int = 40;
-pub const SM_PENWINDOWS: ::c_int = 41;
-pub const SM_DBCSENABLED: ::c_int = 42;
-pub const SM_CMOUSEBUTTONS: ::c_int = 43;
-pub const SM_CXFIXEDFRAME: ::c_int = SM_CXDLGFRAME;
-pub const SM_CYFIXEDFRAME: ::c_int = SM_CYDLGFRAME;
-pub const SM_CXSIZEFRAME: ::c_int = SM_CXFRAME;
-pub const SM_CYSIZEFRAME: ::c_int = SM_CYFRAME;
-pub const SM_SECURE: ::c_int = 44;
-pub const SM_CXEDGE: ::c_int = 45;
-pub const SM_CYEDGE: ::c_int = 46;
-pub const SM_CXMINSPACING: ::c_int = 47;
-pub const SM_CYMINSPACING: ::c_int = 48;
-pub const SM_CXSMICON: ::c_int = 49;
-pub const SM_CYSMICON: ::c_int = 50;
-pub const SM_CYSMCAPTION: ::c_int = 51;
-pub const SM_CXSMSIZE: ::c_int = 52;
-pub const SM_CYSMSIZE: ::c_int = 53;
-pub const SM_CXMENUSIZE: ::c_int = 54;
-pub const SM_CYMENUSIZE: ::c_int = 55;
-pub const SM_ARRANGE: ::c_int = 56;
-pub const SM_CXMINIMIZED: ::c_int = 57;
-pub const SM_CYMINIMIZED: ::c_int = 58;
-pub const SM_CXMAXTRACK: ::c_int = 59;
-pub const SM_CYMAXTRACK: ::c_int = 60;
-pub const SM_CXMAXIMIZED: ::c_int = 61;
-pub const SM_CYMAXIMIZED: ::c_int = 62;
-pub const SM_NETWORK: ::c_int = 63;
-pub const SM_CLEANBOOT: ::c_int = 67;
-pub const SM_CXDRAG: ::c_int = 68;
-pub const SM_CYDRAG: ::c_int = 69;
-pub const SM_SHOWSOUNDS: ::c_int = 70;
-pub const SM_CXMENUCHECK: ::c_int = 71;
-pub const SM_CYMENUCHECK: ::c_int = 72;
-pub const SM_SLOWMACHINE: ::c_int = 73;
-pub const SM_MIDEASTENABLED: ::c_int = 74;
-pub const SM_MOUSEWHEELPRESENT: ::c_int = 75;
-pub const SM_XVIRTUALSCREEN: ::c_int = 76;
-pub const SM_YVIRTUALSCREEN: ::c_int = 77;
-pub const SM_CXVIRTUALSCREEN: ::c_int = 78;
-pub const SM_CYVIRTUALSCREEN: ::c_int = 79;
-pub const SM_CMONITORS: ::c_int = 80;
-pub const SM_SAMEDISPLAYFORMAT: ::c_int = 81;
-pub const SM_IMMENABLED: ::c_int = 82;
-pub const SM_CXFOCUSBORDER: ::c_int = 83;
-pub const SM_CYFOCUSBORDER: ::c_int = 84;
-pub const SM_TABLETPC: ::c_int = 86;
-pub const SM_MEDIACENTER: ::c_int = 87;
-pub const SM_STARTER: ::c_int = 88;
-pub const SM_SERVERR2: ::c_int = 89;
-pub const SM_MOUSEHORIZONTALWHEELPRESENT: ::c_int = 91;
-pub const SM_CXPADDEDBORDER: ::c_int = 92;
-pub const SM_DIGITIZER: ::c_int = 94;
-pub const SM_MAXIMUMTOUCHES: ::c_int = 95;
-pub const SM_CMETRICS: ::c_int = 97;
-pub const SM_REMOTESESSION: ::c_int = 0x1000;
-pub const SM_SHUTTINGDOWN: ::c_int = 0x2000;
-pub const SM_REMOTECONTROL: ::c_int = 0x2001;
-pub const SM_CARETBLINKINGENABLED: ::c_int = 0x2002;
-pub const SM_CONVERTIBLESLATEMODE: ::c_int = 0x2003;
-pub const SM_SYSTEMDOCKED: ::c_int = 0x2004;
-//8855 (Win 7 SDK)
-STRUCT!{struct ICONINFO {
-    fIcon: ::BOOL,
-    xHotspot: ::DWORD,
-    yHotspot: ::DWORD,
-    hbmMask: ::HBITMAP,
-    hbmColor: ::HBITMAP,
-}}
-pub type PICONINFO = *mut ICONINFO;
-//9066
-// Color indexes for use in GetSysColor and SetSysColor
-// 0-18 (after incrementing) are also valid in RegisterClass's WNDCLASS
-pub const COLOR_SCROLLBAR: ::c_int = 0;
-pub const COLOR_BACKGROUND: ::c_int = 1;
-pub const COLOR_ACTIVECAPTION: ::c_int = 2;
-pub const COLOR_INACTIVECAPTION: ::c_int = 3;
-pub const COLOR_MENU: ::c_int = 4;
-pub const COLOR_WINDOW: ::c_int = 5;
-pub const COLOR_WINDOWFRAME: ::c_int = 6;
-pub const COLOR_MENUTEXT: ::c_int = 7;
-pub const COLOR_WINDOWTEXT: ::c_int = 8;
-pub const COLOR_CAPTIONTEXT: ::c_int = 9;
-pub const COLOR_ACTIVEBORDER: ::c_int = 10;
-pub const COLOR_INACTIVEBORDER: ::c_int = 11;
-pub const COLOR_APPWORKSPACE: ::c_int = 12;
-pub const COLOR_HIGHLIGHT: ::c_int = 13;
-pub const COLOR_HIGHLIGHTTEXT: ::c_int = 14;
-pub const COLOR_BTNFACE: ::c_int = 15;
-pub const COLOR_BTNSHADOW: ::c_int = 16;
-pub const COLOR_GRAYTEXT: ::c_int = 17;
-pub const COLOR_BTNTEXT: ::c_int = 18;
-pub const COLOR_INACTIVECAPTIONTEXT: ::c_int = 19;
-pub const COLOR_BTNHIGHLIGHT: ::c_int = 20;
-// Introduced in Windows 95 (winver 0x0400):
-pub const COLOR_3DDKSHADOW: ::c_int = 21;
-pub const COLOR_3DLIGHT: ::c_int = 22;
-pub const COLOR_INFOTEXT: ::c_int = 23;
-pub const COLOR_INFOBK: ::c_int = 24;
-pub const COLOR_DESKTOP: ::c_int = COLOR_BACKGROUND;
-pub const COLOR_3DFACE: ::c_int = COLOR_BTNFACE;
-pub const COLOR_3DSHADOW: ::c_int = COLOR_BTNSHADOW;
-pub const COLOR_3DHIGHLIGHT: ::c_int = COLOR_BTNHIGHLIGHT;
-pub const COLOR_3DHILIGHT: ::c_int = COLOR_BTNHIGHLIGHT;
-pub const COLOR_BTNHILIGHT: ::c_int = COLOR_BTNHIGHLIGHT;
-// Introduced in Windows 2000 (winver 0x0500)
-pub const COLOR_HOTLIGHT: ::c_int = 26;
-pub const COLOR_GRADIENTACTIVECAPTION: ::c_int = 27;
-pub const COLOR_GRADIENTINACTIVECAPTION: ::c_int = 28;
-// Introduced in Windows XP (winver 0x0501)
-pub const COLOR_MENUHILIGHT: ::c_int = 29;
-pub const COLOR_MENUBAR: ::c_int = 30;
-//10069
-pub const IDC_ARROW: ::LPCWSTR = 32512 as ::LPCWSTR;
-pub const IDC_IBEAM: ::LPCWSTR = 32513 as ::LPCWSTR;
-pub const IDC_WAIT: ::LPCWSTR = 32514 as ::LPCWSTR;
-pub const IDC_CROSS: ::LPCWSTR = 32515 as ::LPCWSTR;
-pub const IDC_UPARROW: ::LPCWSTR = 32516 as ::LPCWSTR;
-pub const IDC_SIZE: ::LPCWSTR = 32640 as ::LPCWSTR;
-pub const IDC_ICON: ::LPCWSTR = 32641 as ::LPCWSTR;
-pub const IDC_SIZENWSE: ::LPCWSTR = 32642 as ::LPCWSTR;
-pub const IDC_SIZENESW: ::LPCWSTR = 32643 as ::LPCWSTR;
-pub const IDC_SIZEWE: ::LPCWSTR = 32644 as ::LPCWSTR;
-pub const IDC_SIZENS: ::LPCWSTR = 32645 as ::LPCWSTR;
-pub const IDC_SIZEALL: ::LPCWSTR = 32646 as ::LPCWSTR;
-pub const IDC_NO: ::LPCWSTR = 32648 as ::LPCWSTR;
-pub const IDC_HAND: ::LPCWSTR = 32649 as ::LPCWSTR;
-pub const IDC_APPSTARTING: ::LPCWSTR = 32650 as ::LPCWSTR;
-pub const IDC_HELP: ::LPCWSTR = 32651 as ::LPCWSTR;
-//10492
-pub const IDI_APPLICATION: ::LPCWSTR = 32512 as ::LPCWSTR;
-pub const IDI_HAND: ::LPCWSTR = 32513 as ::LPCWSTR;
-pub const IDI_QUESTION: ::LPCWSTR = 32514 as ::LPCWSTR;
-pub const IDI_EXCLAMATION: ::LPCWSTR = 32515 as ::LPCWSTR;
-pub const IDI_ASTERISK: ::LPCWSTR = 32516 as ::LPCWSTR;
-pub const IDI_WINLOGO: ::LPCWSTR = 32517 as ::LPCWSTR;
-pub const IDI_SHIELD: ::LPCWSTR = 32518 as ::LPCWSTR;
-pub const IDI_WARNING: ::LPCWSTR = IDI_EXCLAMATION;
-pub const IDI_ERROR: ::LPCWSTR = IDI_HAND;
-pub const IDI_INFORMATION: ::LPCWSTR = IDI_ASTERISK;
-pub const SPI_GETBEEP: ::UINT = 0x0001;
-pub const SPI_SETBEEP: ::UINT = 0x0002;
-pub const SPI_GETMOUSE: ::UINT = 0x0003;
-pub const SPI_SETMOUSE: ::UINT = 0x0004;
-pub const SPI_GETBORDER: ::UINT = 0x0005;
-pub const SPI_SETBORDER: ::UINT = 0x0006;
-pub const SPI_GETKEYBOARDSPEED: ::UINT = 0x000A;
-pub const SPI_SETKEYBOARDSPEED: ::UINT = 0x000B;
-pub const SPI_LANGDRIVER: ::UINT = 0x000C;
-pub const SPI_ICONHORIZONTALSPACING: ::UINT = 0x000D;
-pub const SPI_GETSCREENSAVETIMEOUT: ::UINT = 0x000E;
-pub const SPI_SETSCREENSAVETIMEOUT: ::UINT = 0x000F;
-pub const SPI_GETSCREENSAVEACTIVE: ::UINT = 0x0010;
-pub const SPI_SETSCREENSAVEACTIVE: ::UINT = 0x0011;
-pub const SPI_GETGRIDGRANULARITY: ::UINT = 0x0012;
-pub const SPI_SETGRIDGRANULARITY: ::UINT = 0x0013;
-pub const SPI_SETDESKWALLPAPER: ::UINT = 0x0014;
-pub const SPI_SETDESKPATTERN: ::UINT = 0x0015;
-pub const SPI_GETKEYBOARDDELAY: ::UINT = 0x0016;
-pub const SPI_SETKEYBOARDDELAY: ::UINT = 0x0017;
-pub const SPI_ICONVERTICALSPACING: ::UINT = 0x0018;
-pub const SPI_GETICONTITLEWRAP: ::UINT = 0x0019;
-pub const SPI_SETICONTITLEWRAP: ::UINT = 0x001A;
-pub const SPI_GETMENUDROPALIGNMENT: ::UINT = 0x001B;
-pub const SPI_SETMENUDROPALIGNMENT: ::UINT = 0x001C;
-pub const SPI_SETDOUBLECLKWIDTH: ::UINT = 0x001D;
-pub const SPI_SETDOUBLECLKHEIGHT: ::UINT = 0x001E;
-pub const SPI_GETICONTITLELOGFONT: ::UINT = 0x001F;
-pub const SPI_SETDOUBLECLICKTIME: ::UINT = 0x0020;
-pub const SPI_SETMOUSEBUTTONSWAP: ::UINT = 0x0021;
-pub const SPI_SETICONTITLELOGFONT: ::UINT = 0x0022;
-pub const SPI_GETFASTTASKSWITCH: ::UINT = 0x0023;
-pub const SPI_SETFASTTASKSWITCH: ::UINT = 0x0024;
-pub const SPI_SETDRAGFULLWINDOWS: ::UINT = 0x0025;
-pub const SPI_GETDRAGFULLWINDOWS: ::UINT = 0x0026;
-pub const SPI_GETNONCLIENTMETRICS: ::UINT = 0x0029;
-pub const SPI_SETNONCLIENTMETRICS: ::UINT = 0x002A;
-pub const SPI_GETMINIMIZEDMETRICS: ::UINT = 0x002B;
-pub const SPI_SETMINIMIZEDMETRICS: ::UINT = 0x002C;
-pub const SPI_GETICONMETRICS: ::UINT = 0x002D;
-pub const SPI_SETICONMETRICS: ::UINT = 0x002E;
-pub const SPI_SETWORKAREA: ::UINT = 0x002F;
-pub const SPI_GETWORKAREA: ::UINT = 0x0030;
-pub const SPI_SETPENWINDOWS: ::UINT = 0x0031;
-pub const SPI_GETHIGHCONTRAST: ::UINT = 0x0042;
-pub const SPI_SETHIGHCONTRAST: ::UINT = 0x0043;
-pub const SPI_GETKEYBOARDPREF: ::UINT = 0x0044;
-pub const SPI_SETKEYBOARDPREF: ::UINT = 0x0045;
-pub const SPI_GETSCREENREADER: ::UINT = 0x0046;
-pub const SPI_SETSCREENREADER: ::UINT = 0x0047;
-pub const SPI_GETANIMATION: ::UINT = 0x0048;
-pub const SPI_SETANIMATION: ::UINT = 0x0049;
-pub const SPI_GETFONTSMOOTHING: ::UINT = 0x004A;
-pub const SPI_SETFONTSMOOTHING: ::UINT = 0x004B;
-pub const SPI_SETDRAGWIDTH: ::UINT = 0x004C;
-pub const SPI_SETDRAGHEIGHT: ::UINT = 0x004D;
-pub const SPI_SETHANDHELD: ::UINT = 0x004E;
-pub const SPI_GETLOWPOWERTIMEOUT: ::UINT = 0x004F;
-pub const SPI_GETPOWEROFFTIMEOUT: ::UINT = 0x0050;
-pub const SPI_SETLOWPOWERTIMEOUT: ::UINT = 0x0051;
-pub const SPI_SETPOWEROFFTIMEOUT: ::UINT = 0x0052;
-pub const SPI_GETLOWPOWERACTIVE: ::UINT = 0x0053;
-pub const SPI_GETPOWEROFFACTIVE: ::UINT = 0x0054;
-pub const SPI_SETLOWPOWERACTIVE: ::UINT = 0x0055;
-pub const SPI_SETPOWEROFFACTIVE: ::UINT = 0x0056;
-pub const SPI_SETCURSORS: ::UINT = 0x0057;
-pub const SPI_SETICONS: ::UINT = 0x0058;
-pub const SPI_GETDEFAULTINPUTLANG: ::UINT = 0x0059;
-pub const SPI_SETDEFAULTINPUTLANG: ::UINT = 0x005A;
-pub const SPI_SETLANGTOGGLE: ::UINT = 0x005B;
-pub const SPI_GETWINDOWSEXTENSION: ::UINT = 0x005C;
-pub const SPI_SETMOUSETRAILS: ::UINT = 0x005D;
-pub const SPI_GETMOUSETRAILS: ::UINT = 0x005E;
-pub const SPI_SETSCREENSAVERRUNNING: ::UINT = 0x0061;
-pub const SPI_SCREENSAVERRUNNING: ::UINT = SPI_SETSCREENSAVERRUNNING;
-pub const SPI_GETFILTERKEYS: ::UINT = 0x0032;
-pub const SPI_SETFILTERKEYS: ::UINT = 0x0033;
-pub const SPI_GETTOGGLEKEYS: ::UINT = 0x0034;
-pub const SPI_SETTOGGLEKEYS: ::UINT = 0x0035;
-pub const SPI_GETMOUSEKEYS: ::UINT = 0x0036;
-pub const SPI_SETMOUSEKEYS: ::UINT = 0x0037;
-pub const SPI_GETSHOWSOUNDS: ::UINT = 0x0038;
-pub const SPI_SETSHOWSOUNDS: ::UINT = 0x0039;
-pub const SPI_GETSTICKYKEYS: ::UINT = 0x003A;
-pub const SPI_SETSTICKYKEYS: ::UINT = 0x003B;
-pub const SPI_GETACCESSTIMEOUT: ::UINT = 0x003C;
-pub const SPI_SETACCESSTIMEOUT: ::UINT = 0x003D;
-pub const SPI_GETSERIALKEYS: ::UINT = 0x003E;
-pub const SPI_SETSERIALKEYS: ::UINT = 0x003F;
-pub const SPI_GETSOUNDSENTRY: ::UINT = 0x0040;
-pub const SPI_SETSOUNDSENTRY: ::UINT = 0x0041;
-pub const SPI_GETSNAPTODEFBUTTON: ::UINT = 0x005F;
-pub const SPI_SETSNAPTODEFBUTTON: ::UINT = 0x0060;
-pub const SPI_GETMOUSEHOVERWIDTH: ::UINT = 0x0062;
-pub const SPI_SETMOUSEHOVERWIDTH: ::UINT = 0x0063;
-pub const SPI_GETMOUSEHOVERHEIGHT: ::UINT = 0x0064;
-pub const SPI_SETMOUSEHOVERHEIGHT: ::UINT = 0x0065;
-pub const SPI_GETMOUSEHOVERTIME: ::UINT = 0x0066;
-pub const SPI_SETMOUSEHOVERTIME: ::UINT = 0x0067;
-pub const SPI_GETWHEELSCROLLLINES: ::UINT = 0x0068;
-pub const SPI_SETWHEELSCROLLLINES: ::UINT = 0x0069;
-pub const SPI_GETMENUSHOWDELAY: ::UINT = 0x006A;
-pub const SPI_SETMENUSHOWDELAY: ::UINT = 0x006B;
-pub const SPI_GETWHEELSCROLLCHARS: ::UINT = 0x006C;
-pub const SPI_SETWHEELSCROLLCHARS: ::UINT = 0x006D;
-pub const SPI_GETSHOWIMEUI: ::UINT = 0x006E;
-pub const SPI_SETSHOWIMEUI: ::UINT = 0x006F;
-pub const SPI_GETMOUSESPEED: ::UINT = 0x0070;
-pub const SPI_SETMOUSESPEED: ::UINT = 0x0071;
-pub const SPI_GETSCREENSAVERRUNNING: ::UINT = 0x0072;
-pub const SPI_GETDESKWALLPAPER: ::UINT = 0x0073;
-pub const SPI_GETAUDIODESCRIPTION: ::UINT = 0x0074;
-pub const SPI_SETAUDIODESCRIPTION: ::UINT = 0x0075;
-pub const SPI_GETSCREENSAVESECURE: ::UINT = 0x0076;
-pub const SPI_SETSCREENSAVESECURE: ::UINT = 0x0077;
-pub const SPI_GETHUNGAPPTIMEOUT: ::UINT = 0x0078;
-pub const SPI_SETHUNGAPPTIMEOUT: ::UINT = 0x0079;
-pub const SPI_GETWAITTOKILLTIMEOUT: ::UINT = 0x007A;
-pub const SPI_SETWAITTOKILLTIMEOUT: ::UINT = 0x007B;
-pub const SPI_GETWAITTOKILLSERVICETIMEOUT: ::UINT = 0x007C;
-pub const SPI_SETWAITTOKILLSERVICETIMEOUT: ::UINT = 0x007D;
-pub const SPI_GETMOUSEDOCKTHRESHOLD: ::UINT = 0x007E;
-pub const SPI_SETMOUSEDOCKTHRESHOLD: ::UINT = 0x007F;
-pub const SPI_GETPENDOCKTHRESHOLD: ::UINT = 0x0080;
-pub const SPI_SETPENDOCKTHRESHOLD: ::UINT = 0x0081;
-pub const SPI_GETWINARRANGING: ::UINT = 0x0082;
-pub const SPI_SETWINARRANGING: ::UINT = 0x0083;
-pub const SPI_GETMOUSEDRAGOUTTHRESHOLD: ::UINT = 0x0084;
-pub const SPI_SETMOUSEDRAGOUTTHRESHOLD: ::UINT = 0x0085;
-pub const SPI_GETPENDRAGOUTTHRESHOLD: ::UINT = 0x0086;
-pub const SPI_SETPENDRAGOUTTHRESHOLD: ::UINT = 0x0087;
-pub const SPI_GETMOUSESIDEMOVETHRESHOLD: ::UINT = 0x0088;
-pub const SPI_SETMOUSESIDEMOVETHRESHOLD: ::UINT = 0x0089;
-pub const SPI_GETPENSIDEMOVETHRESHOLD: ::UINT = 0x008A;
-pub const SPI_SETPENSIDEMOVETHRESHOLD: ::UINT = 0x008B;
-pub const SPI_GETDRAGFROMMAXIMIZE: ::UINT = 0x008C;
-pub const SPI_SETDRAGFROMMAXIMIZE: ::UINT = 0x008D;
-pub const SPI_GETSNAPSIZING: ::UINT = 0x008E;
-pub const SPI_SETSNAPSIZING: ::UINT = 0x008F;
-pub const SPI_GETDOCKMOVING: ::UINT = 0x0090;
-pub const SPI_SETDOCKMOVING: ::UINT = 0x0091;
-pub const SPI_GETACTIVEWINDOWTRACKING: ::UINT = 0x1000;
-pub const SPI_SETACTIVEWINDOWTRACKING: ::UINT = 0x1001;
-pub const SPI_GETMENUANIMATION: ::UINT = 0x1002;
-pub const SPI_SETMENUANIMATION: ::UINT = 0x1003;
-pub const SPI_GETCOMBOBOXANIMATION: ::UINT = 0x1004;
-pub const SPI_SETCOMBOBOXANIMATION: ::UINT = 0x1005;
-pub const SPI_GETLISTBOXSMOOTHSCROLLING: ::UINT = 0x1006;
-pub const SPI_SETLISTBOXSMOOTHSCROLLING: ::UINT = 0x1007;
-pub const SPI_GETGRADIENTCAPTIONS: ::UINT = 0x1008;
-pub const SPI_SETGRADIENTCAPTIONS: ::UINT = 0x1009;
-pub const SPI_GETKEYBOARDCUES: ::UINT = 0x100A;
-pub const SPI_SETKEYBOARDCUES: ::UINT = 0x100B;
-pub const SPI_GETMENUUNDERLINES: ::UINT = SPI_GETKEYBOARDCUES;
-pub const SPI_SETMENUUNDERLINES: ::UINT = SPI_SETKEYBOARDCUES;
-pub const SPI_GETACTIVEWNDTRKZORDER: ::UINT = 0x100C;
-pub const SPI_SETACTIVEWNDTRKZORDER: ::UINT = 0x100D;
-pub const SPI_GETHOTTRACKING: ::UINT = 0x100E;
-pub const SPI_SETHOTTRACKING: ::UINT = 0x100F;
-pub const SPI_GETMENUFADE: ::UINT = 0x1012;
-pub const SPI_SETMENUFADE: ::UINT = 0x1013;
-pub const SPI_GETSELECTIONFADE: ::UINT = 0x1014;
-pub const SPI_SETSELECTIONFADE: ::UINT = 0x1015;
-pub const SPI_GETTOOLTIPANIMATION: ::UINT = 0x1016;
-pub const SPI_SETTOOLTIPANIMATION: ::UINT = 0x1017;
-pub const SPI_GETTOOLTIPFADE: ::UINT = 0x1018;
-pub const SPI_SETTOOLTIPFADE: ::UINT = 0x1019;
-pub const SPI_GETCURSORSHADOW: ::UINT = 0x101A;
-pub const SPI_SETCURSORSHADOW: ::UINT = 0x101B;
-pub const SPI_GETMOUSESONAR: ::UINT = 0x101C;
-pub const SPI_SETMOUSESONAR: ::UINT = 0x101D;
-pub const SPI_GETMOUSECLICKLOCK: ::UINT = 0x101E;
-pub const SPI_SETMOUSECLICKLOCK: ::UINT = 0x101F;
-pub const SPI_GETMOUSEVANISH: ::UINT = 0x1020;
-pub const SPI_SETMOUSEVANISH: ::UINT = 0x1021;
-pub const SPI_GETFLATMENU: ::UINT = 0x1022;
-pub const SPI_SETFLATMENU: ::UINT = 0x1023;
-pub const SPI_GETDROPSHADOW: ::UINT = 0x1024;
-pub const SPI_SETDROPSHADOW: ::UINT = 0x1025;
-pub const SPI_GETBLOCKSENDINPUTRESETS: ::UINT = 0x1026;
-pub const SPI_SETBLOCKSENDINPUTRESETS: ::UINT = 0x1027;
-pub const SPI_GETUIEFFECTS: ::UINT = 0x103E;
-pub const SPI_SETUIEFFECTS: ::UINT = 0x103F;
-pub const SPI_GETDISABLEOVERLAPPEDCONTENT: ::UINT = 0x1040;
-pub const SPI_SETDISABLEOVERLAPPEDCONTENT: ::UINT = 0x1041;
-pub const SPI_GETCLIENTAREAANIMATION: ::UINT = 0x1042;
-pub const SPI_SETCLIENTAREAANIMATION: ::UINT = 0x1043;
-pub const SPI_GETCLEARTYPE: ::UINT = 0x1048;
-pub const SPI_SETCLEARTYPE: ::UINT = 0x1049;
-pub const SPI_GETSPEECHRECOGNITION: ::UINT = 0x104A;
-pub const SPI_SETSPEECHRECOGNITION: ::UINT = 0x104B;
-pub const SPI_GETFOREGROUNDLOCKTIMEOUT: ::UINT = 0x2000;
-pub const SPI_SETFOREGROUNDLOCKTIMEOUT: ::UINT = 0x2001;
-pub const SPI_GETACTIVEWNDTRKTIMEOUT: ::UINT = 0x2002;
-pub const SPI_SETACTIVEWNDTRKTIMEOUT: ::UINT = 0x2003;
-pub const SPI_GETFOREGROUNDFLASHCOUNT: ::UINT = 0x2004;
-pub const SPI_SETFOREGROUNDFLASHCOUNT: ::UINT = 0x2005;
-pub const SPI_GETCARETWIDTH: ::UINT = 0x2006;
-pub const SPI_SETCARETWIDTH: ::UINT = 0x2007;
-pub const SPI_GETMOUSECLICKLOCKTIME: ::UINT = 0x2008;
-pub const SPI_SETMOUSECLICKLOCKTIME: ::UINT = 0x2009;
-pub const SPI_GETFONTSMOOTHINGTYPE: ::UINT = 0x200A;
-pub const SPI_SETFONTSMOOTHINGTYPE: ::UINT = 0x200B;
-pub const FE_FONTSMOOTHINGSTANDARD: ::UINT = 0x0001;
-pub const FE_FONTSMOOTHINGCLEARTYPE: ::UINT = 0x0002;
-pub const SPI_GETFONTSMOOTHINGCONTRAST: ::UINT = 0x200C;
-pub const SPI_SETFONTSMOOTHINGCONTRAST: ::UINT = 0x200D;
-pub const SPI_GETFOCUSBORDERWIDTH: ::UINT = 0x200E;
-pub const SPI_SETFOCUSBORDERWIDTH: ::UINT = 0x200F;
-pub const SPI_GETFOCUSBORDERHEIGHT: ::UINT = 0x2010;
-pub const SPI_SETFOCUSBORDERHEIGHT: ::UINT = 0x2011;
-pub const SPI_GETFONTSMOOTHINGORIENTATION: ::UINT = 0x2012;
-pub const SPI_SETFONTSMOOTHINGORIENTATION: ::UINT = 0x2013;
-pub const FE_FONTSMOOTHINGORIENTATIONBGR: ::UINT = 0x0000;
-pub const FE_FONTSMOOTHINGORIENTATIONRGB: ::UINT = 0x0001;
-pub const SPI_GETMINIMUMHITRADIUS: ::UINT = 0x2014;
-pub const SPI_SETMINIMUMHITRADIUS: ::UINT = 0x2015;
-pub const SPI_GETMESSAGEDURATION: ::UINT = 0x2016;
-pub const SPI_SETMESSAGEDURATION: ::UINT = 0x2017;
-//11264
-pub const CB_GETEDITSEL: ::UINT = 0x0140;
-pub const CB_LIMITTEXT: ::UINT = 0x0141;
-pub const CB_SETEDITSEL: ::UINT = 0x0142;
-pub const CB_ADDSTRING: ::UINT = 0x0143;
-pub const CB_DELETESTRING: ::UINT = 0x0144;
-pub const CB_DIR: ::UINT = 0x0145;
-pub const CB_GETCOUNT: ::UINT = 0x0146;
-pub const CB_GETCURSEL: ::UINT = 0x0147;
-pub const CB_GETLBTEXT: ::UINT = 0x0148;
-pub const CB_GETLBTEXTLEN: ::UINT = 0x0149;
-pub const CB_INSERTSTRING: ::UINT = 0x014A;
-pub const CB_RESETCONTENT: ::UINT = 0x014B;
-pub const CB_FINDSTRING: ::UINT = 0x014C;
-pub const CB_SELECTSTRING: ::UINT = 0x014D;
-pub const CB_SETCURSEL: ::UINT = 0x014E;
-pub const CB_SHOWDROPDOWN: ::UINT = 0x014F;
-pub const CB_GETITEMDATA: ::UINT = 0x0150;
-pub const CB_SETITEMDATA: ::UINT = 0x0151;
-pub const CB_GETDROPPEDCONTROLRECT: ::UINT = 0x0152;
-pub const CB_SETITEMHEIGHT: ::UINT = 0x0153;
-pub const CB_GETITEMHEIGHT: ::UINT = 0x0154;
-pub const CB_SETEXTENDEDUI: ::UINT = 0x0155;
-pub const CB_GETEXTENDEDUI: ::UINT = 0x0156;
-pub const CB_GETDROPPEDSTATE: ::UINT = 0x0157;
-pub const CB_FINDSTRINGEXACT: ::UINT = 0x0158;
-pub const CB_SETLOCALE: ::UINT = 0x0159;
-pub const CB_GETLOCALE: ::UINT = 0x015A;
-pub const CB_GETTOPINDEX: ::UINT = 0x015b;
-pub const CB_SETTOPINDEX: ::UINT = 0x015c;
-pub const CB_GETHORIZONTALEXTENT: ::UINT = 0x015d;
-pub const CB_SETHORIZONTALEXTENT: ::UINT = 0x015e;
-pub const CB_GETDROPPEDWIDTH: ::UINT = 0x015f;
-pub const CB_SETDROPPEDWIDTH: ::UINT = 0x0160;
-pub const CB_INITSTORAGE: ::UINT = 0x0161;
-//12141
-STRUCT!{nodebug struct NONCLIENTMETRICSA {
-    cbSize: ::UINT,
-    iBorderWidth: ::c_int,
-    iScrollWidth: ::c_int,
-    iScrollHeight: ::c_int,
-    iCaptionWidth: ::c_int,
-    iCaptionHeight: ::c_int,
-    lfCaptionFont: ::LOGFONTA,
-    iSmCaptionWidth: ::c_int,
-    iSmCaptionHeight: ::c_int,
-    lfSmCaptionFont: ::LOGFONTA,
-    iMenuWidth: ::c_int,
-    iMenuHeight: ::c_int,
-    lfMenuFont: ::LOGFONTA,
-    lfStatusFont: ::LOGFONTA,
-    lfMessageFont: ::LOGFONTA,
-    iPaddedBorderWidth: ::c_int,
-}}
-pub type LPNONCLIENTMETRICSA = *mut NONCLIENTMETRICSA;
-STRUCT!{nodebug struct NONCLIENTMETRICSW {
-    cbSize: ::UINT,
-    iBorderWidth: ::c_int,
-    iScrollWidth: ::c_int,
-    iScrollHeight: ::c_int,
-    iCaptionWidth: ::c_int,
-    iCaptionHeight: ::c_int,
-    lfCaptionFont: ::LOGFONTW,
-    iSmCaptionWidth: ::c_int,
-    iSmCaptionHeight: ::c_int,
-    lfSmCaptionFont: ::LOGFONTW,
-    iMenuWidth: ::c_int,
-    iMenuHeight: ::c_int,
-    lfMenuFont: ::LOGFONTW,
-    lfStatusFont: ::LOGFONTW,
-    lfMessageFont: ::LOGFONTW,
-    iPaddedBorderWidth: ::c_int,
-}}
-pub type LPNONCLIENTMETRICSW = *mut NONCLIENTMETRICSW;
-//12869
-pub const MONITOR_DEFAULTTONULL: ::DWORD = 0x00000000;
-pub const MONITOR_DEFAULTTOPRIMARY: ::DWORD = 0x00000001;
-pub const MONITOR_DEFAULTTONEAREST: ::DWORD = 0x00000002;
-//12900
-pub const MONITORINFOF_PRIMARY: ::DWORD = 1;
-pub const CCHDEVICENAME: usize = 32;
-STRUCT!{struct MONITORINFO {
-    cbSize: ::DWORD,
-    rcMonitor: ::RECT,
-    rcWork: ::RECT,
-    dwFlags: ::DWORD,
-}}
-pub type LPMONITORINFO = *mut MONITORINFO;
-STRUCT!{struct MONITORINFOEXA {
-    cbSize: ::DWORD,
-    rcMonitor: ::RECT,
-    rcWork: ::RECT,
-    dwFlags: ::DWORD,
-    szDevice: [::CHAR; ::CCHDEVICENAME],
-}}
-pub type LPMONITORINFOEXA = *mut MONITORINFOEXA;
-STRUCT!{struct MONITORINFOEXW {
-    cbSize: ::DWORD,
-    rcMonitor: ::RECT,
-    rcWork: ::RECT,
-    dwFlags: ::DWORD,
-    szDevice: [::WCHAR; ::CCHDEVICENAME],
-}}
-pub type LPMONITORINFOEXW = *mut MONITORINFOEXW;
-//12971
-pub type MONITORENUMPROC = Option<unsafe extern "system" fn(
-    ::HMONITOR, ::HDC, ::LPRECT, ::LPARAM,
-) -> ::BOOL>;
-//14098
-DECLARE_HANDLE!(HRAWINPUT, HRAWINPUT__);
-pub fn GET_RAWINPUT_CODE_WPARAM(wParam: ::WPARAM) -> ::WPARAM { wParam & 0xff }
-pub const RIM_INPUT: ::WPARAM = 0;
-pub const RIM_INPUTSINK: ::WPARAM = 1;
-STRUCT!{struct RAWINPUTHEADER {
-    dwType: ::DWORD,
-    dwSize: ::DWORD,
-    hDevice: ::HANDLE,
-    wParam: ::WPARAM,
-}}
-pub type PRAWINPUTHEADER = *mut RAWINPUTHEADER;
-pub type LPRAWINPUTHEADER = *mut RAWINPUTHEADER;
-pub const RIM_TYPEMOUSE: ::DWORD = 0;
-pub const RIM_TYPEKEYBOARD: ::DWORD = 1;
-pub const RIM_TYPEHID: ::DWORD = 2;
-STRUCT!{struct RAWMOUSE {
-    usFlags: ::USHORT,
-    memory_padding: ::USHORT, // 16bit Padding for 32bit align in following union
-    usButtonFlags: ::USHORT,
-    usButtonData: ::USHORT,
-    ulRawButtons: ::ULONG,
-    lLastX: ::LONG,
-    lLastY: ::LONG,
-    ulExtraInformation: ::ULONG,
-}}
-pub type PRAWMOUSE = *mut RAWMOUSE;
-pub type LPRAWMOUSE = *mut RAWMOUSE;
-pub const RI_MOUSE_LEFT_BUTTON_DOWN: ::USHORT = 0x0001;
-pub const RI_MOUSE_LEFT_BUTTON_UP: ::USHORT = 0x0002;
-pub const RI_MOUSE_RIGHT_BUTTON_DOWN: ::USHORT = 0x0004;
-pub const RI_MOUSE_RIGHT_BUTTON_UP: ::USHORT = 0x0008;
-pub const RI_MOUSE_MIDDLE_BUTTON_DOWN: ::USHORT = 0x0010;
-pub const RI_MOUSE_MIDDLE_BUTTON_UP: ::USHORT = 0x0020;
-pub const RI_MOUSE_BUTTON_1_DOWN: ::USHORT = RI_MOUSE_LEFT_BUTTON_DOWN;
-pub const RI_MOUSE_BUTTON_1_UP: ::USHORT = RI_MOUSE_LEFT_BUTTON_UP;
-pub const RI_MOUSE_BUTTON_2_DOWN: ::USHORT = RI_MOUSE_RIGHT_BUTTON_DOWN;
-pub const RI_MOUSE_BUTTON_2_UP: ::USHORT = RI_MOUSE_RIGHT_BUTTON_UP;
-pub const RI_MOUSE_BUTTON_3_DOWN: ::USHORT = RI_MOUSE_MIDDLE_BUTTON_DOWN;
-pub const RI_MOUSE_BUTTON_3_UP: ::USHORT = RI_MOUSE_MIDDLE_BUTTON_UP;
-pub const RI_MOUSE_BUTTON_4_DOWN: ::USHORT = 0x0040;
-pub const RI_MOUSE_BUTTON_4_UP: ::USHORT = 0x0080;
-pub const RI_MOUSE_BUTTON_5_DOWN: ::USHORT = 0x0100;
-pub const RI_MOUSE_BUTTON_5_UP: ::USHORT = 0x0200;
-pub const RI_MOUSE_WHEEL: ::USHORT = 0x0400;
-pub const MOUSE_MOVE_RELATIVE: ::USHORT = 0;
-pub const MOUSE_MOVE_ABSOLUTE: ::USHORT = 1;
-pub const MOUSE_VIRTUAL_DESKTOP: ::USHORT = 0x02;
-pub const MOUSE_ATTRIBUTES_CHANGED: ::USHORT = 0x04;
-pub const MOUSE_MOVE_NOCOALESCE: ::USHORT = 0x08;
-STRUCT!{struct RAWKEYBOARD {
-    MakeCode: ::USHORT,
-    Flags: ::USHORT,
-    Reserved: ::USHORT,
-    VKey: ::USHORT,
-    Message: ::UINT,
-    ExtraInformation: ::ULONG,
-}}
-pub type PRAWKEYBOARD = *mut RAWKEYBOARD;
-pub type LPRAWKEYBOARD = *mut RAWKEYBOARD;
-pub const KEYBOARD_OVERRUN_MAKE_CODE: ::DWORD = 0xFF;
-pub const RI_KEY_MAKE: ::DWORD = 0;
-pub const RI_KEY_BREAK: ::DWORD = 1;
-pub const RI_KEY_E0: ::DWORD = 2;
-pub const RI_KEY_E1: ::DWORD = 4;
-pub const RI_KEY_TERMSRV_SET_LED: ::DWORD = 8;
-pub const RI_KEY_TERMSRV_SHADOW: ::DWORD = 0x10;
-STRUCT!{struct RAWHID {
-    dwSizeHid: ::DWORD,
-    dwCount: ::DWORD,
-    bRawData: [::BYTE; 0],
-}}
-pub type PRAWHID = *mut RAWHID;
-pub type LPRAWHID = *mut RAWHID;
-STRUCT!{struct RAWINPUT {
-    header: RAWINPUTHEADER,
-    mouse: RAWMOUSE,
-}}
-UNION!(RAWINPUT, mouse, mouse, mouse_mut, RAWMOUSE);
-UNION!(RAWINPUT, mouse, keyboard, keyboard_mut, RAWKEYBOARD);
-UNION!(RAWINPUT, mouse, hid, hid_mut, RAWHID);
-#[test]
-fn test_RAWINPUT() {
-    use std::mem::{size_of, align_of};
-    assert!(size_of::<RAWMOUSE>() >= size_of::<RAWMOUSE>());
-    assert!(size_of::<RAWMOUSE>() >= size_of::<RAWKEYBOARD>());
-    assert!(size_of::<RAWMOUSE>() >= size_of::<RAWHID>());
-    assert!(align_of::<RAWMOUSE>() >= align_of::<RAWMOUSE>());
-    assert!(align_of::<RAWMOUSE>() >= align_of::<RAWKEYBOARD>());
-    assert!(align_of::<RAWMOUSE>() >= align_of::<RAWHID>());
-}
-pub type PRAWINPUT = *mut RAWINPUT;
-pub type LPRAWINPUT = *mut RAWINPUT;
-pub const RID_INPUT: ::DWORD = 0x10000003;
-pub const RID_HEADER: ::DWORD = 0x10000005;
-pub const RIDI_PREPARSEDDATA: ::DWORD = 0x20000005;
-pub const RIDI_DEVICENAME: ::DWORD = 0x20000007;
-pub const RIDI_DEVICEINFO: ::DWORD = 0x2000000b;
-STRUCT!{struct RID_DEVICE_INFO_MOUSE {
-    dwId: ::DWORD,
-    dwNumberOfButtons: ::DWORD,
-    dwSampleRate: ::DWORD,
-    fHasHorizontalWheel: ::BOOL,
-}}
-pub type PRID_DEVICE_INFO_MOUSE = *mut RID_DEVICE_INFO_MOUSE;
-STRUCT!{struct RID_DEVICE_INFO_KEYBOARD {
-    dwType: ::DWORD,
-    dwSubType: ::DWORD,
-    dwKeyboardMode: ::DWORD,
-    dwNumberOfFunctionKeys: ::DWORD,
-    dwNumberOfIndicators: ::DWORD,
-    dwNumberOfKeysTotal: ::DWORD,
-}}
-pub type PRID_DEVICE_INFO_KEYBOARD = *mut RID_DEVICE_INFO_KEYBOARD;
-STRUCT!{struct RID_DEVICE_INFO_HID {
-    dwVendorId: ::DWORD,
-    dwProductId: ::DWORD,
-    dwVersionNumber: ::DWORD,
-    usUsagePage: ::USHORT,
-    usUsage: ::USHORT,
-}}
-pub type PRID_DEVICE_INFO_HID = *mut RID_DEVICE_INFO_HID;
-STRUCT!{struct RID_DEVICE_INFO {
-    cbSize: ::DWORD,
-    dwType: ::DWORD,
-    keyboard: RID_DEVICE_INFO_KEYBOARD,
-}}
-UNION!(RID_DEVICE_INFO, keyboard, mouse, mouse_mut, RID_DEVICE_INFO_MOUSE);
-UNION!(RID_DEVICE_INFO, keyboard, keyboard, keyboard_mut, RID_DEVICE_INFO_KEYBOARD);
-UNION!(RID_DEVICE_INFO, keyboard, hid, hid_mut, RID_DEVICE_INFO_HID);
-#[test]
-fn test_RID_DEVICE_INFO() {
-    use std::mem::{size_of, align_of};
-    assert!(size_of::<RID_DEVICE_INFO_KEYBOARD>() >= size_of::<RID_DEVICE_INFO_MOUSE>());
-    assert!(size_of::<RID_DEVICE_INFO_KEYBOARD>() >= size_of::<RID_DEVICE_INFO_KEYBOARD>());
-    assert!(size_of::<RID_DEVICE_INFO_KEYBOARD>() >= size_of::<RID_DEVICE_INFO_HID>());
-    assert!(align_of::<RID_DEVICE_INFO_KEYBOARD>() >= align_of::<RID_DEVICE_INFO_MOUSE>());
-    assert!(align_of::<RID_DEVICE_INFO_KEYBOARD>()
-        >= align_of::<RID_DEVICE_INFO_KEYBOARD>());
-    assert!(align_of::<RID_DEVICE_INFO_KEYBOARD>() >= align_of::<RID_DEVICE_INFO_HID>());
-}
-pub type PRID_DEVICE_INFO = *mut RID_DEVICE_INFO;
-pub type LPRID_DEVICE_INFO = *mut RID_DEVICE_INFO;
-STRUCT!{struct RAWINPUTDEVICE {
-    usUsagePage: ::USHORT,
-    usUsage: ::USHORT,
-    dwFlags: ::DWORD,
-    hwndTarget: ::HWND,
-}}
-pub type PRAWINPUTDEVICE = *mut RAWINPUTDEVICE;
-pub type LPRAWINPUTDEVICE = *mut RAWINPUTDEVICE;
-pub type PCRAWINPUTDEVICE = *const RAWINPUTDEVICE;
-pub const RIDEV_REMOVE: ::DWORD = 0x00000001;
-pub const RIDEV_EXCLUDE: ::DWORD = 0x00000010;
-pub const RIDEV_PAGEONLY: ::DWORD = 0x00000020;
-pub const RIDEV_NOLEGACY: ::DWORD = 0x00000030;
-pub const RIDEV_INPUTSINK: ::DWORD = 0x00000100;
-pub const RIDEV_CAPTUREMOUSE: ::DWORD = 0x00000200;
-pub const RIDEV_NOHOTKEYS: ::DWORD = 0x00000200;
-pub const RIDEV_APPKEYS: ::DWORD = 0x00000400;
-pub const RIDEV_EXINPUTSINK: ::DWORD = 0x00001000;
-pub const RIDEV_DEVNOTIFY: ::DWORD = 0x00002000;
-pub const RIDEV_EXMODEMASK: ::DWORD = 0x000000F0;
-pub const GIDC_ARRIVAL: ::DWORD = 1;
-pub const GIDC_REMOVAL: ::DWORD = 2;
-STRUCT!{struct RAWINPUTDEVICELIST {
-    hDevice: ::HANDLE,
-    dwType: ::DWORD,
-}}
-pub type PRAWINPUTDEVICELIST = *mut RAWINPUTDEVICELIST;
-STRUCT!{struct CHANGEFILTERSTRUCT {
-    cbSize: ::DWORD,
-    ExtStatus: ::DWORD,
-}}
-pub type PCHANGEFILTERSTRUCT = *mut CHANGEFILTERSTRUCT;
-STRUCT!{struct DLGTEMPLATE {
-    style: ::DWORD,
-    dwExtendedStyle: ::DWORD,
-    cdit: ::WORD,
-    x: ::c_short,
-    y: ::c_short,
-    cx: ::c_short,
-    cy: ::c_short,
-}}
-pub type LPDLGTEMPLATEA = *mut DLGTEMPLATE;
-pub type LPDLGTEMPLATEW = *mut DLGTEMPLATE;
-pub type LPCDLGTEMPLATEA = *const DLGTEMPLATE;
-pub type LPCDLGTEMPLATEW = *const DLGTEMPLATE;
-STRUCT!{struct DRAWTEXTPARAMS {
-    cbSize: ::UINT,
-    iTabLength: ::c_int,
-    iLeftMargin: ::c_int,
-    iRightMargin: ::c_int,
-    uiLengthDrawn: ::UINT,
-}}
-pub type LPDRAWTEXTPARAMS = *mut DRAWTEXTPARAMS;
-STRUCT!{struct ACCEL {
-    fVirt: ::BYTE,
-    key: ::WORD,
-    cmd: ::WORD,
-}}
-pub type LPACCEL = *mut ACCEL;
-STRUCT!{struct MENUITEMINFOA {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fType: ::UINT,
-    fState: ::UINT,
-    wID: ::UINT,
-    hSubMenu: ::HMENU,
-    hbmpChecked: ::HBITMAP,
-    hbmpUnchecked: ::HBITMAP,
-    dwItemData: ::ULONG_PTR,
-    dwTypeData: ::LPSTR,
-    cch: ::UINT,
-    hbmpItem: ::HBITMAP,
-}}
-pub type LPMENUITEMINFOA = *mut MENUITEMINFOA;
-pub type LPCMENUITEMINFOA = *const MENUITEMINFOA;
-STRUCT!{struct MENUITEMINFOW {
-    cbSize: ::UINT,
-    fMask: ::UINT,
-    fType: ::UINT,
-    fState: ::UINT,
-    wID: ::UINT,
-    hSubMenu: ::HMENU,
-    hbmpChecked: ::HBITMAP,
-    hbmpUnchecked: ::HBITMAP,
-    dwItemData: ::ULONG_PTR,
-    dwTypeData: ::LPWSTR,
-    cch: ::UINT,
-    hbmpItem: ::HBITMAP,
-}}
-pub type LPMENUITEMINFOW = *mut MENUITEMINFOW;
-pub type LPCMENUITEMINFOW = *const MENUITEMINFOW;
-STRUCT!{nodebug struct MSGBOXPARAMSA {
-    cbSize: ::UINT,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpszText: ::LPCSTR,
-    lpszCaption: ::LPCSTR,
-    dwStyle: ::DWORD,
-    lpszIcon: ::LPCSTR,
-    dwContextHelpId: ::DWORD_PTR,
-    lpfnMsgBoxCallback: ::MSGBOXCALLBACK,
-    dwLanguageId: ::DWORD,
-}}
-pub type PMSGBOXPARAMSA = *mut MSGBOXPARAMSA;
-pub type LPMSGBOXPARAMSA = *mut MSGBOXPARAMSA;
-STRUCT!{nodebug struct MSGBOXPARAMSW {
-    cbSize: ::UINT,
-    hwndOwner: ::HWND,
-    hInstance: ::HINSTANCE,
-    lpszText: ::LPCWSTR,
-    lpszCaption: ::LPCWSTR,
-    dwStyle: ::DWORD,
-    lpszIcon: ::LPCWSTR,
-    dwContextHelpId: ::DWORD_PTR,
-    lpfnMsgBoxCallback: ::MSGBOXCALLBACK,
-    dwLanguageId: ::DWORD,
-}}
-pub type PMSGBOXPARAMSW = *mut MSGBOXPARAMSW;
-pub type LPMSGBOXPARAMSW = *mut MSGBOXPARAMSW;
-STRUCT!{struct HELPINFO {
-    cbSize: ::UINT,
-    iContextType: ::c_int,
-    iCtrlId: ::c_int,
-    hItemHandle: ::HANDLE,
-    dwContextId: ::DWORD,
-    MousePos: ::POINT,
-}}
-pub type LPHELPINFO = *mut HELPINFO;
-#[allow(trivial_numeric_casts)]
-pub fn GET_WHEEL_DELTA_WPARAM(wParam: ::WPARAM) -> ::c_short {
-    ::HIWORD(wParam as ::DWORD) as ::c_short
-}
-#[allow(trivial_numeric_casts)]
-pub fn GET_KEYSTATE_WPARAM(wparam: ::WPARAM) -> ::c_int {
-    ::LOWORD(wparam as ::DWORD) as ::c_short as ::c_int
-}
-#[allow(trivial_numeric_casts)]
-pub fn GET_XBUTTON_WPARAM(wparam: ::WPARAM) -> ::c_int {
-    ::HIWORD(wparam as ::DWORD) as ::c_int
-}
-pub const SIF_RANGE: ::UINT = 0x0001;
-pub const SIF_PAGE: ::UINT = 0x0002;
-pub const SIF_POS: ::UINT = 0x0004;
-pub const SIF_DISABLENOSCROLL: ::UINT = 0x0008;
-pub const SIF_TRACKPOS: ::UINT = 0x0010;
-pub const SIF_ALL: ::UINT = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS;
-pub const SW_SCROLLCHILDREN: ::UINT = 0x0001;
-pub const SW_INVALIDATE: ::UINT = 0x0002;
-pub const SW_ERASE: ::UINT = 0x0004;
-pub const SW_SMOOTHSCROLL: ::UINT = 0x0010;
-pub const SB_LINEUP: ::c_int = 0;
-pub const SB_LINELEFT: ::c_int = 0;
-pub const SB_LINEDOWN: ::c_int = 1;
-pub const SB_LINERIGHT: ::c_int = 1;
-pub const SB_PAGEUP: ::c_int = 2;
-pub const SB_PAGELEFT: ::c_int = 2;
-pub const SB_PAGEDOWN: ::c_int = 3;
-pub const SB_PAGERIGHT: ::c_int = 3;
-pub const SB_THUMBPOSITION: ::c_int = 4;
-pub const SB_THUMBTRACK: ::c_int = 5;
-pub const SB_TOP: ::c_int = 6;
-pub const SB_LEFT: ::c_int = 6;
-pub const SB_BOTTOM: ::c_int = 7;
-pub const SB_RIGHT: ::c_int = 7;
-pub const SB_ENDSCROLL: ::c_int = 8;
-pub const LR_DEFAULTCOLOR: ::UINT = 0x00000000;
-pub const LR_MONOCHROME: ::UINT = 0x00000001;
-pub const LR_COLOR: ::UINT = 0x00000002;
-pub const LR_COPYRETURNORG: ::UINT = 0x00000004;
-pub const LR_COPYDELETEORG: ::UINT = 0x00000008;
-pub const LR_LOADFROMFILE: ::UINT = 0x00000010;
-pub const LR_LOADTRANSPARENT: ::UINT = 0x00000020;
-pub const LR_DEFAULTSIZE: ::UINT = 0x00000040;
-pub const LR_VGACOLOR: ::UINT = 0x00000080;
-pub const LR_LOADMAP3DCOLORS: ::UINT = 0x00001000;
-pub const LR_CREATEDIBSECTION: ::UINT = 0x00002000;
-pub const LR_COPYFROMRESOURCE: ::UINT = 0x00004000;
-pub const LR_SHARED: ::UINT = 0x00008000;
-pub const IMAGE_BITMAP: ::UINT = 0;
-pub const IMAGE_ICON: ::UINT = 1;
-pub const IMAGE_CURSOR: ::UINT = 2;
-pub const IMAGE_ENHMETAFILE: ::UINT = 3;
-pub const DT_TOP: ::UINT = 0x00000000;
-pub const DT_LEFT: ::UINT = 0x00000000;
-pub const DT_CENTER: ::UINT = 0x00000001;
-pub const DT_RIGHT: ::UINT = 0x00000002;
-pub const DT_VCENTER: ::UINT = 0x00000004;
-pub const DT_BOTTOM: ::UINT = 0x00000008;
-pub const DT_WORDBREAK: ::UINT = 0x00000010;
-pub const DT_SINGLELINE: ::UINT = 0x00000020;
-pub const DT_EXPANDTABS: ::UINT = 0x00000040;
-pub const DT_TABSTOP: ::UINT = 0x00000080;
-pub const DT_NOCLIP: ::UINT = 0x00000100;
-pub const DT_EXTERNALLEADING: ::UINT = 0x00000200;
-pub const DT_CALCRECT: ::UINT = 0x00000400;
-pub const DT_NOPREFIX: ::UINT = 0x00000800;
-pub const DT_INTERNAL: ::UINT = 0x00001000;
-pub const DT_EDITCONTROL: ::UINT = 0x00002000;
-pub const DT_PATH_ELLIPSIS: ::UINT = 0x00004000;
-pub const DT_END_ELLIPSIS: ::UINT = 0x00008000;
-pub const DT_MODIFYSTRING: ::UINT = 0x00010000;
-pub const DT_RTLREADING: ::UINT = 0x00020000;
-pub const DT_WORD_ELLIPSIS: ::UINT = 0x00040000;
-pub const DT_NOFULLWIDTHCHARBREAK: ::UINT = 0x00080000;
-pub const DT_HIDEPREFIX: ::UINT = 0x00100000;
-pub const DT_PREFIXONLY: ::UINT = 0x00200000;
-STRUCT!{struct KBDLLHOOKSTRUCT {
-    vkCode: ::DWORD,
-    scanCode: ::DWORD,
-    flags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PKBDLLHOOKSTRUCT = *mut KBDLLHOOKSTRUCT;
-pub type LPKBDLLHOOKSTRUCT = *mut KBDLLHOOKSTRUCT;
-STRUCT!{struct MSLLHOOKSTRUCT {
-    pt: ::POINT,
-    mouseData: ::DWORD,
-    flags: ::DWORD,
-    time: ::DWORD,
-    dwExtraInfo: ::ULONG_PTR,
-}}
-pub type PMSLLHOOKSTRUCT = *mut MSLLHOOKSTRUCT;
-pub type LPMSLLHOOKSTRUCT = *mut MSLLHOOKSTRUCT;
-pub const WH_MIN: ::c_int = -1;
-pub const WH_MSGFILTER: ::c_int = -1;
-pub const WH_JOURNALRECORD: ::c_int = 0;
-pub const WH_JOURNALPLAYBACK: ::c_int = 1;
-pub const WH_KEYBOARD: ::c_int = 2;
-pub const WH_GETMESSAGE: ::c_int = 3;
-pub const WH_CALLWNDPROC: ::c_int = 4;
-pub const WH_CBT: ::c_int = 5;
-pub const WH_SYSMSGFILTER: ::c_int = 6;
-pub const WH_MOUSE: ::c_int = 7;
-pub const WH_HARDWARE: ::c_int = 8;
-pub const WH_DEBUG: ::c_int = 9;
-pub const WH_SHELL: ::c_int = 10;
-pub const WH_FOREGROUNDIDLE: ::c_int = 11;
-pub const WH_CALLWNDPROCRET: ::c_int = 12;
-pub const WH_KEYBOARD_LL: ::c_int = 13;
-pub const WH_MOUSE_LL: ::c_int = 14;
-pub const WH_MAX: ::c_int = 14;
-pub const WH_MINHOOK: ::c_int = WH_MIN;
-pub const WH_MAXHOOK: ::c_int = WH_MAX;
-pub const KLF_ACTIVATE: ::UINT = 1;
-pub const KLF_SUBSTITUTE_OK: ::UINT = 2;
-pub const KLF_UNLOADPREVIOUS: ::UINT = 4;
-pub const KLF_REORDER: ::UINT = 8;
-pub const KLF_REPLACELANG: ::UINT = 16;
-pub const KLF_NOTELLSHELL: ::UINT = 128;
-pub const KLF_SETFORPROCESS: ::UINT = 256;
-//RedrawWindow() flags
-pub const RDW_INVALIDATE: ::UINT = 0x0001;
-pub const RDW_INTERNALPAINT: ::UINT = 0x0002;
-pub const RDW_ERASE: ::UINT = 0x0004;
-pub const RDW_VALIDATE: ::UINT = 0x0008;
-pub const RDW_NOINTERNALPAINT: ::UINT = 0x0010;
-pub const RDW_NOERASE: ::UINT = 0x0020;
-pub const RDW_NOCHILDREN: ::UINT = 0x0040;
-pub const RDW_ALLCHILDREN: ::UINT = 0x0080;
-pub const RDW_UPDATENOW: ::UINT = 0x0100;
-pub const RDW_ERASENOW: ::UINT = 0x0200;
-pub const RDW_FRAME: ::UINT = 0x0400;
-pub const RDW_NOFRAME: ::UINT = 0x0800;
-STRUCT!{struct MEASUREITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    itemID: ::UINT,
-    itemWidth: ::UINT,
-    itemHeight: ::UINT,
-    itemData: ::ULONG_PTR,
-}}
-pub type LPMEASUREITEMSTRUCT = *mut MEASUREITEMSTRUCT;
-STRUCT!{struct DRAWITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    itemID: ::UINT,
-    itemAction: ::UINT,
-    itemState: ::UINT,
-    hwndItem: ::HWND,
-    hDC: ::HDC,
-    rcItem: ::RECT,
-    itemData: ::ULONG_PTR,
-}}
-pub type LPDRAWITEMSTRUCT = *mut DRAWITEMSTRUCT;
-STRUCT!{struct DELETEITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    itemID: ::UINT,
-    hwndItem: ::HWND,
-    itemData: ::ULONG_PTR,
-}}
-pub type LPDELETEITEMSTRUCT = *mut DELETEITEMSTRUCT;
-STRUCT!{struct COMPAREITEMSTRUCT {
-    CtlType: ::UINT,
-    CtlID: ::UINT,
-    hwndItem: ::HWND,
-    itemID1: ::UINT,
-    itemData1: ::ULONG_PTR,
-    itemID2: ::UINT,
-    itemData2: ::ULONG_PTR,
-    dwLocaleId: ::DWORD,
-}}
-pub type LPCOMPAREITEMSTRUCT = *mut COMPAREITEMSTRUCT;
-/* Image type */
-pub const DST_COMPLEX: ::UINT = 0x0000;
-pub const DST_TEXT: ::UINT = 0x0001;
-pub const DST_PREFIXTEXT: ::UINT = 0x0002;
-pub const DST_ICON: ::UINT = 0x0003;
-pub const DST_BITMAP: ::UINT = 0x0004;
-pub const DI_MASK: ::UINT = 0x0001;
-pub const DI_IMAGE: ::UINT = 0x0002;
-pub const DI_NORMAL: ::UINT = 0x0003;
-pub const DI_COMPAT: ::UINT = 0x0004;
-pub const DI_DEFAULTSIZE: ::UINT = 0x0008;
-// if WINVER >= 0x0601
-// GetSystemMetrics(SM_DIGITIZER) flag values
-pub const NID_INTEGRATED_TOUCH: ::UINT = 0x00000001;
-pub const NID_EXTERNAL_TOUCH: ::UINT = 0x00000002;
-pub const NID_INTEGRATED_PEN: ::UINT = 0x00000004;
-pub const NID_EXTERNAL_PEN: ::UINT = 0x00000008;
-pub const NID_MULTI_INPUT: ::UINT = 0x00000040;
-pub const NID_READY: ::UINT = 0x00000080;
-// end if WINVER >= 0x0601
-
-// System Menu Command Values
-//
-pub const SC_SIZE: ::WPARAM = 0xF000;
-pub const SC_MOVE: ::WPARAM = 0xF010;
-pub const SC_MINIMIZE: ::WPARAM = 0xF020;
-pub const SC_MAXIMIZE: ::WPARAM = 0xF030;
-pub const SC_NEXTWINDOW: ::WPARAM = 0xF040;
-pub const SC_PREVWINDOW: ::WPARAM = 0xF050;
-pub const SC_CLOSE: ::WPARAM = 0xF060;
-pub const SC_VSCROLL: ::WPARAM = 0xF070;
-pub const SC_HSCROLL: ::WPARAM = 0xF080;
-pub const SC_MOUSEMENU: ::WPARAM = 0xF090;
-pub const SC_KEYMENU: ::WPARAM = 0xF100;
-pub const SC_ARRANGE: ::WPARAM = 0xF110;
-pub const SC_RESTORE: ::WPARAM = 0xF120;
-pub const SC_TASKLIST: ::WPARAM = 0xF130;
-pub const SC_SCREENSAVE: ::WPARAM = 0xF140;
-pub const SC_HOTKEY: ::WPARAM = 0xF150;
-// if WINVER >= 0x0400
-pub const SC_DEFAULT: ::WPARAM = 0xF160;
-pub const SC_MONITORPOWER: ::WPARAM = 0xF170;
-pub const SC_CONTEXTHELP: ::WPARAM = 0xF180;
-pub const SC_SEPARATOR: ::WPARAM = 0xF00F;
-// endif WINVER >= 0x0400
diff --git a/vendor/winapi-0.2.8/src/ws2def.rs b/vendor/winapi-0.2.8/src/ws2def.rs
deleted file mode 100644
index dcc4aaa6f1..0000000000
--- a/vendor/winapi-0.2.8/src/ws2def.rs
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! This file contains the core definitions for the Winsock2 specification that can be used by
-//! both user-mode and kernel mode modules.
-pub type ADDRESS_FAMILY = ::USHORT;
-pub const AF_UNSPEC: ::c_int = 0;
-pub const AF_UNIX: ::c_int = 1;
-pub const AF_INET: ::c_int = 2;
-pub const AF_IMPLINK: ::c_int = 3;
-pub const AF_PUP: ::c_int = 4;
-pub const AF_CHAOS: ::c_int = 5;
-pub const AF_NS: ::c_int = 6;
-pub const AF_IPX: ::c_int = AF_NS;
-pub const AF_ISO: ::c_int = 7;
-pub const AF_OSI: ::c_int = AF_ISO;
-pub const AF_ECMA: ::c_int = 8;
-pub const AF_DATAKIT: ::c_int = 9;
-pub const AF_CCITT: ::c_int = 10;
-pub const AF_SNA: ::c_int = 11;
-pub const AF_DECnet: ::c_int = 12;
-pub const AF_DLI: ::c_int = 13;
-pub const AF_LAT: ::c_int = 14;
-pub const AF_HYLINK: ::c_int = 15;
-pub const AF_APPLETALK: ::c_int = 16;
-pub const AF_NETBIOS: ::c_int = 17;
-pub const AF_VOICEVIEW: ::c_int = 18;
-pub const AF_FIREFOX: ::c_int = 19;
-pub const AF_UNKNOWN1: ::c_int = 20;
-pub const AF_BAN: ::c_int = 21;
-pub const AF_ATM: ::c_int = 22;
-pub const AF_INET6: ::c_int = 23;
-pub const AF_CLUSTER: ::c_int = 24;
-pub const AF_12844: ::c_int = 25;
-pub const AF_IRDA: ::c_int = 26;
-pub const AF_NETDES: ::c_int = 28;
-pub const AF_TCNPROCESS: ::c_int = 29;
-pub const AF_TCNMESSAGE: ::c_int = 30;
-pub const AF_ICLFXBM: ::c_int = 31;
-pub const AF_BTH: ::c_int = 32;
-pub const AF_LINK: ::c_int = 33;
-pub const AF_MAX: ::c_int = 34;
-pub const SOCK_STREAM: ::c_int = 1;
-pub const SOCK_DGRAM: ::c_int = 2;
-pub const SOCK_RAW: ::c_int = 3;
-pub const SOCK_RDM: ::c_int = 4;
-pub const SOCK_SEQPACKET: ::c_int = 5;
-pub const SOL_SOCKET: ::c_int = 0xffff;
-pub const SO_DEBUG: ::c_int = 0x0001;
-pub const SO_ACCEPTCONN: ::c_int = 0x0002;
-pub const SO_REUSEADDR: ::c_int = 0x0004;
-pub const SO_KEEPALIVE: ::c_int = 0x0008;
-pub const SO_DONTROUTE: ::c_int = 0x0010;
-pub const SO_BROADCAST: ::c_int = 0x0020;
-pub const SO_USELOOPBACK: ::c_int = 0x0040;
-pub const SO_LINGER: ::c_int = 0x0080;
-pub const SO_OOBINLINE: ::c_int = 0x0100;
-pub const SO_DONTLINGER: ::c_int = !SO_LINGER;
-pub const SO_EXCLUSIVEADDRUSE: ::c_int = !SO_REUSEADDR;
-pub const SO_SNDBUF: ::c_int = 0x1001;
-pub const SO_RCVBUF: ::c_int = 0x1002;
-pub const SO_SNDLOWAT: ::c_int = 0x1003;
-pub const SO_RCVLOWAT: ::c_int = 0x1004;
-pub const SO_SNDTIMEO: ::c_int = 0x1005;
-pub const SO_RCVTIMEO: ::c_int = 0x1006;
-pub const SO_ERROR: ::c_int = 0x1007;
-pub const SO_TYPE: ::c_int = 0x1008;
-pub const SO_BSP_STATE: ::c_int = 0x1009;
-pub const SO_GROUP_ID: ::c_int = 0x2001;
-pub const SO_GROUP_PRIORITY: ::c_int = 0x2002;
-pub const SO_MAX_MSG_SIZE: ::c_int = 0x2003;
-pub const SO_CONDITIONAL_ACCEPT: ::c_int = 0x3002;
-pub const SO_PAUSE_ACCEPT: ::c_int = 0x3003;
-pub const SO_COMPARTMENT_ID: ::c_int = 0x3004;
-pub const SO_RANDOMIZE_PORT: ::c_int = 0x3005;
-pub const SO_PORT_SCALABILITY: ::c_int = 0x3006;
-pub const WSK_SO_BASE: ::c_int = 0x4000;
-pub const TCP_NODELAY: ::c_int = 0x0001;
-STRUCT!{struct SOCKADDR {
-    sa_family: ADDRESS_FAMILY,
-    sa_data: [::CHAR; 14],
-}}
-pub type PSOCKADDR = *mut SOCKADDR;
-pub type LPSOCKADDR = *mut SOCKADDR;
-STRUCT!{struct SOCKET_ADDRESS {
-    lpSockaddr: LPSOCKADDR,
-    iSockaddrLength: ::INT,
-}}
-pub type PSOCKET_ADDRESS = *mut SOCKET_ADDRESS;
-pub type LPSOCKET_ADDRESS = *mut SOCKET_ADDRESS;
-STRUCT!{nodebug struct SOCKET_ADDRESS_LIST {
-    iAddressCount: ::INT,
-    Address: [SOCKET_ADDRESS; 0],
-}}
-pub type PSOCKET_ADDRESS_LIST = *mut SOCKET_ADDRESS_LIST;
-pub type LPSOCKET_ADDRESS_LIST = *mut SOCKET_ADDRESS_LIST;
-STRUCT!{struct CSADDR_INFO {
-    LocalAddr: SOCKET_ADDRESS,
-    RemoteAddr: SOCKET_ADDRESS,
-    iSocketType: ::INT,
-    iProtocol: ::INT,
-}}
-pub type PCSADDR_INFO = *mut CSADDR_INFO;
-pub type LPCSADDR_INFO = *mut CSADDR_INFO;
-STRUCT!{nodebug struct SOCKADDR_STORAGE_LH {
-    ss_family: ADDRESS_FAMILY,
-    __ss_pad1: [::CHAR; 6],
-    __ss_align: ::__int64,
-    __ss_pad2: [::CHAR; 112],
-}}
-pub type PSOCKADDR_STORAGE_LH = *mut SOCKADDR_STORAGE_LH;
-pub type LPSOCKADDR_STORAGE_LH = *mut SOCKADDR_STORAGE_LH;
-STRUCT!{nodebug struct SOCKADDR_STORAGE_XP {
-    ss_family: ::c_short,
-    __ss_pad1: [::CHAR; 6],
-    __ss_align: ::__int64,
-    __ss_pad2: [::CHAR; 112],
-}}
-pub type PSOCKADDR_STORAGE_XP = *mut SOCKADDR_STORAGE_XP;
-pub type LPSOCKADDR_STORAGE_XP = *mut SOCKADDR_STORAGE_XP;
-pub type SOCKADDR_STORAGE = SOCKADDR_STORAGE_LH;
-pub type PSOCKADDR_STORAGE = *mut SOCKADDR_STORAGE;
-pub type LPSOCKADDR_STORAGE = *mut SOCKADDR_STORAGE;
-STRUCT!{struct SOCKET_PROCESSOR_AFFINITY {
-    Processor: ::PROCESSOR_NUMBER,
-    NumaNodeId: ::USHORT,
-    Reserved: ::USHORT,
-}}
-pub type PSOCKET_PROCESSOR_AFFINITY = *mut SOCKET_PROCESSOR_AFFINITY;
-pub const IOC_UNIX: ::DWORD = 0x00000000;
-pub const IOC_WS2: ::DWORD = 0x08000000;
-pub const IOC_PROTOCOL: ::DWORD = 0x10000000;
-pub const IOC_VENDOR: ::DWORD = 0x18000000;
-pub const IOC_WSK: ::DWORD = IOC_WS2 | 0x07000000;
-macro_rules! _WSAIO { ($x:expr, $y:expr) => { IOC_VOID | $x | $y } }
-macro_rules! _WSAIOR { ($x:expr, $y:expr) => { IOC_OUT | $x | $y } }
-macro_rules! _WSAIOW { ($x:expr, $y:expr) => { IOC_IN | $x | $y } }
-macro_rules! _WSAIORW { ($x:expr, $y:expr) => { IOC_INOUT | $x | $y } }
-pub const SIO_ASSOCIATE_HANDLE: ::DWORD = _WSAIOW!(IOC_WS2, 1);
-pub const SIO_ENABLE_CIRCULAR_QUEUEING: ::DWORD = _WSAIO!(IOC_WS2, 2);
-pub const SIO_FIND_ROUTE: ::DWORD = _WSAIOR!(IOC_WS2, 3);
-pub const SIO_FLUSH: ::DWORD = _WSAIO!(IOC_WS2, 4);
-pub const SIO_GET_BROADCAST_ADDRESS: ::DWORD = _WSAIOR!(IOC_WS2, 5);
-pub const SIO_GET_EXTENSION_FUNCTION_POINTER: ::DWORD = _WSAIORW!(IOC_WS2, 6);
-pub const SIO_GET_QOS: ::DWORD = _WSAIORW!(IOC_WS2, 7);
-pub const SIO_GET_GROUP_QOS: ::DWORD = _WSAIORW!(IOC_WS2, 8);
-pub const SIO_MULTIPOINT_LOOPBACK: ::DWORD = _WSAIOW!(IOC_WS2, 9);
-pub const SIO_MULTICAST_SCOPE: ::DWORD = _WSAIOW!(IOC_WS2, 10);
-pub const SIO_SET_QOS: ::DWORD = _WSAIOW!(IOC_WS2, 11);
-pub const SIO_SET_GROUP_QOS: ::DWORD = _WSAIOW!(IOC_WS2, 12);
-pub const SIO_TRANSLATE_HANDLE: ::DWORD = _WSAIORW!(IOC_WS2, 13);
-pub const SIO_ROUTING_INTERFACE_QUERY: ::DWORD = _WSAIORW!(IOC_WS2, 20);
-pub const SIO_ROUTING_INTERFACE_CHANGE: ::DWORD = _WSAIOW!(IOC_WS2, 21);
-pub const SIO_ADDRESS_LIST_QUERY: ::DWORD = _WSAIOR!(IOC_WS2, 22);
-pub const SIO_ADDRESS_LIST_CHANGE: ::DWORD = _WSAIO!(IOC_WS2, 23);
-pub const SIO_QUERY_TARGET_PNP_HANDLE: ::DWORD = _WSAIOR!(IOC_WS2, 24);
-pub const SIO_QUERY_RSS_PROCESSOR_INFO: ::DWORD = _WSAIOR!(IOC_WS2, 37);
-pub const SIO_ADDRESS_LIST_SORT: ::DWORD = _WSAIORW!(IOC_WS2, 25);
-pub const SIO_RESERVED_1: ::DWORD = _WSAIOW!(IOC_WS2, 26);
-pub const SIO_RESERVED_2: ::DWORD = _WSAIOW!(IOC_WS2, 33);
-pub const SIO_GET_MULTIPLE_EXTENSION_FUNCTION_POINTER: ::DWORD = _WSAIORW!(IOC_WS2, 36);
-pub const IPPROTO_IP: ::c_int = 0;
-ENUM!{enum IPPROTO {
-    IPPROTO_HOPOPTS = 0,  // IPv6 Hop-by-Hop options
-    IPPROTO_ICMP = 1,
-    IPPROTO_IGMP = 2,
-    IPPROTO_GGP = 3,
-    IPPROTO_IPV4 = 4,
-    IPPROTO_ST = 5,
-    IPPROTO_TCP = 6,
-    IPPROTO_CBT = 7,
-    IPPROTO_EGP = 8,
-    IPPROTO_IGP = 9,
-    IPPROTO_PUP = 12,
-    IPPROTO_UDP = 17,
-    IPPROTO_IDP = 22,
-    IPPROTO_RDP = 27,
-    IPPROTO_IPV6 = 41, // IPv6 header
-    IPPROTO_ROUTING = 43, // IPv6 Routing header
-    IPPROTO_FRAGMENT = 44, // IPv6 fragmentation header
-    IPPROTO_ESP = 50, // encapsulating security payload
-    IPPROTO_AH = 51, // authentication header
-    IPPROTO_ICMPV6 = 58, // ICMPv6
-    IPPROTO_NONE = 59, // IPv6 no next header
-    IPPROTO_DSTOPTS = 60, // IPv6 Destination options
-    IPPROTO_ND = 77,
-    IPPROTO_ICLFXBM = 78,
-    IPPROTO_PIM = 103,
-    IPPROTO_PGM = 113,
-    IPPROTO_L2TP = 115,
-    IPPROTO_SCTP = 132,
-    IPPROTO_RAW = 255,
-    IPPROTO_MAX = 256,
-    IPPROTO_RESERVED_RAW  = 257,
-    IPPROTO_RESERVED_IPSEC = 258,
-    IPPROTO_RESERVED_IPSECOFFLOAD = 259,
-    IPPROTO_RESERVED_WNV = 260,
-    IPPROTO_RESERVED_MAX = 261,
-}}
-pub type PIPPROTO = *mut IPPROTO;
-STRUCT!{struct SOCKADDR_IN {
-    sin_family: ADDRESS_FAMILY,
-    sin_port: ::USHORT,
-    sin_addr: ::IN_ADDR,
-    sin_zero: [::CHAR; 8],
-}}
-pub type PSOCKADDR_IN = *mut SOCKADDR_IN;
-//645
-pub const IOCPARM_MASK: ::DWORD = 0x7f;
-pub const IOC_VOID: ::DWORD = 0x20000000;
-pub const IOC_OUT: ::DWORD = 0x40000000;
-pub const IOC_IN: ::DWORD = 0x80000000;
-pub const IOC_INOUT: ::DWORD = IOC_IN | IOC_OUT;
-STRUCT!{struct WSABUF {
-    len: ::ULONG,
-    buf: *mut ::CHAR,
-}}
-pub type LPWSABUF = *mut WSABUF;
-STRUCT!{struct WSAMSG {
-    name: LPSOCKADDR,
-    namelen: ::INT,
-    lpBuffers: LPWSABUF,
-    dwBufferCount: ::ULONG,
-    Control: WSABUF,
-    dwFlags: ::ULONG,
-}}
-pub type PWSAMSG = *mut WSAMSG;
-pub type LPWSAMSG = *mut WSAMSG;
-STRUCT!{struct ADDRINFOA {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: *mut ::c_char,
-    ai_addr: *mut SOCKADDR,
-    ai_next: *mut ADDRINFOA,
-}}
-pub type PADDRINFOA = *mut ADDRINFOA;
-STRUCT!{struct ADDRINFOW {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: ::PWSTR,
-    ai_addr: *mut SOCKADDR,
-    ai_next: *mut ADDRINFOW,
-}}
-pub type PADDRINFOW = *mut ADDRINFOW;
-STRUCT!{struct ADDRINFOEXA {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: *mut ::c_char,
-    ai_addr: *mut SOCKADDR,
-    ai_blob: *mut ::c_void,
-    ai_bloblen: ::size_t,
-    ai_provider: ::LPGUID,
-    ai_next: *mut ADDRINFOEXW,
-}}
-pub type PADDRINFOEXA = *mut ADDRINFOEXA;
-pub type LPADDRINFOEXA = *mut ADDRINFOEXA;
-STRUCT!{struct ADDRINFOEXW {
-    ai_flags: ::c_int,
-    ai_family: ::c_int,
-    ai_socktype: ::c_int,
-    ai_protocol: ::c_int,
-    ai_addrlen: ::size_t,
-    ai_canonname: ::PWSTR,
-    ai_addr: *mut SOCKADDR,
-    ai_blob: *mut ::c_void,
-    ai_bloblen: ::size_t,
-    ai_provider: ::LPGUID,
-    ai_next: *mut ADDRINFOEXW,
-}}
-pub type PADDRINFOEXW = *mut ADDRINFOEXW;
-pub type LPADDRINFOEXW = *mut ADDRINFOEXW;
diff --git a/vendor/winapi-0.2.8/src/ws2ipdef.rs b/vendor/winapi-0.2.8/src/ws2ipdef.rs
deleted file mode 100644
index 86d3ffae29..0000000000
--- a/vendor/winapi-0.2.8/src/ws2ipdef.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub const IPV6_HOPOPTS: ::c_int = 1;
-pub const IPV6_HDRINCL: ::c_int = 2;
-pub const IPV6_UNICAST_HOPS: ::c_int = 4;
-pub const IPV6_MULTICAST_IF: ::c_int = 9;
-pub const IPV6_MULTICAST_HOPS: ::c_int = 10;
-pub const IPV6_MULTICAST_LOOP: ::c_int = 11;
-pub const IPV6_ADD_MEMBERSHIP: ::c_int = 12;
-pub const IPV6_JOIN_GROUP: ::c_int = IPV6_ADD_MEMBERSHIP;
-pub const IPV6_DROP_MEMBERSHIP: ::c_int = 13;
-pub const IPV6_LEAVE_GROUP: ::c_int = IPV6_DROP_MEMBERSHIP;
-pub const IPV6_DONTFRAG: ::c_int = 14;
-pub const IPV6_PKTINFO: ::c_int = 19;
-pub const IPV6_HOPLIMIT: ::c_int = 21;
-pub const IPV6_PROTECTION_LEVEL: ::c_int = 23;
-pub const IPV6_RECVIF: ::c_int = 24;
-pub const IPV6_RECVDSTADDR: ::c_int = 25;
-pub const IPV6_CHECKSUM: ::c_int = 26;
-pub const IPV6_V6ONLY: ::c_int = 27;
-pub const IPV6_IFLIST: ::c_int = 28;
-pub const IPV6_ADD_IFLIST: ::c_int = 29;
-pub const IPV6_DEL_IFLIST: ::c_int = 30;
-pub const IPV6_UNICAST_IF: ::c_int = 31;
-pub const IPV6_RTHDR: ::c_int = 32;
-pub const IPV6_RECVRTHDR: ::c_int = 38;
-pub const IPV6_TCLASS: ::c_int = 39;
-pub const IPV6_RECVTCLASS: ::c_int = 40;
-STRUCT!{struct ipv6_mreq {
-    ipv6mr_multiaddr: in6_addr,
-    ipv6mr_interface: ::c_uint,
-}}
-STRUCT!{struct in6_addr {
-    s6_addr: [u8; 16],
-}}
-STRUCT!{struct sockaddr_in6 {
-    sin6_family: ::c_short,
-    sin6_port: ::c_ushort,
-    sin6_flowinfo: ::c_ulong,
-    sin6_addr: in6_addr,
-    sin6_scope_id: ::c_ulong,
-}}
diff --git a/vendor/winapi-0.2.8/src/ws2spi.rs b/vendor/winapi-0.2.8/src/ws2spi.rs
deleted file mode 100644
index 9df67c191e..0000000000
--- a/vendor/winapi-0.2.8/src/ws2spi.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! Definitions to be used with the WinSock service provider
-pub const WSPDESCRIPTION_LEN: usize = 255;
-STRUCT!{nodebug struct WSPDATA {
-    wVersion: ::WORD,
-    wHighVersion: ::WORD,
-    szDescription: [::WCHAR; WSPDESCRIPTION_LEN + 1],
-}}
-pub type LPWSPDATA = *mut WSPDATA;
-STRUCT!{struct WSATHREADID {
-    ThreadHandle: ::HANDLE,
-    Reserved: ::DWORD_PTR,
-}}
-pub type LPWSATHREADID = *mut WSATHREADID;
-pub type LPNSPV2STARTUP = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, ppvClientSessionArg: *mut ::LPVOID,
-) -> ::INT>;
-pub type LPNSPV2CLEANUP = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, pvClientSessionArg: ::LPVOID,
-) -> ::INT>;
-pub type LPNSPV2LOOKUPSERVICEBEGIN = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, lpqsRestrictions: ::LPWSAQUERYSET2W, dwControlFlags: ::DWORD,
-    lpvClientSessionArg: ::LPVOID, lphLookup: ::LPHANDLE,
-) -> ::INT>;
-pub type LPNSPV2LOOKUPSERVICENEXTEX = Option<unsafe extern "system" fn(
-    hAsyncCall: ::HANDLE, hLookup: ::HANDLE, dwControlFlags: ::DWORD, lpdwBufferLength: ::LPDWORD,
-    lpqsResults: ::LPWSAQUERYSET2W
-)>;
-pub type LPNSPV2LOOKUPSERVICEEND = Option<unsafe extern "system" fn(hLookup: ::HANDLE) -> ::INT>;
-pub type LPNSPV2SETSERVICEEX = Option<unsafe extern "system" fn(
-    hAsyncCall: ::HANDLE, lpProviderId: ::LPGUID, lpqsRegInfo: ::LPWSAQUERYSET2W,
-    essOperation: ::WSAESETSERVICEOP, dwControlFlags: ::DWORD, lpvClientSessionArg: ::LPVOID,
-)>;
-pub type LPNSPV2CLIENTSESSIONRUNDOWN = Option<unsafe extern "system" fn(
-    lpProviderId: ::LPGUID, pvClientSessionArg: ::LPVOID,
-)>;
-STRUCT!{nodebug struct NSPV2_ROUTINE {
-    cbSize: ::DWORD,
-    dwMajorVersion: ::DWORD,
-    dwMinorVersion: ::DWORD,
-    NSPv2Startup: LPNSPV2STARTUP,
-    NSPv2Cleanup: LPNSPV2CLEANUP,
-    NSPv2LookupServiceBegin: LPNSPV2LOOKUPSERVICEBEGIN,
-    NSPv2LookupServiceNextEx: LPNSPV2LOOKUPSERVICENEXTEX,
-    NSPv2LookupServiceEnd: LPNSPV2LOOKUPSERVICEEND,
-    NSPv2SetServiceEx: LPNSPV2SETSERVICEEX,
-    NSPv2ClientSessionRundown: LPNSPV2CLIENTSESSIONRUNDOWN,
-}}
-pub type PNSPV2_ROUTINE = *mut NSPV2_ROUTINE;
-pub type LPNSPV2_ROUTINE = *mut NSPV2_ROUTINE;
-pub type PCNSPV2_ROUTINE = *const NSPV2_ROUTINE;
-pub type LPCNSPV2_ROUTINE = *const NSPV2_ROUTINE;
-ENUM!{enum WSC_PROVIDER_INFO_TYPE {
-    ProviderInfoLspCategories,
-    ProviderInfoAudit,
-}}
diff --git a/vendor/winapi-0.2.8/src/ws2tcpip.rs b/vendor/winapi-0.2.8/src/ws2tcpip.rs
deleted file mode 100644
index d60c84178c..0000000000
--- a/vendor/winapi-0.2.8/src/ws2tcpip.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © 2015, skdltmxn
-// Licensed under the MIT License <LICENSE.md>
-//! WinSock2 Extension for TCP/IP protocols
-pub type LPLOOKUPSERVICE_COMPLETION_ROUTINE = Option<unsafe extern "system" fn(
-    dwError: ::DWORD, dwBytes: ::DWORD, lpOverlapped: ::LPWSAOVERLAPPED,
-)>;
-pub type socklen_t = ::c_int;
-STRUCT!{struct ip_mreq {
-    imr_multiaddr: ::in_addr,
-    imr_interface: ::in_addr,
-}}
-pub const IP_OPTIONS: ::c_int = 1;
-pub const IP_HDRINCL: ::c_int = 2;
-pub const IP_TOS: ::c_int = 3;
-pub const IP_TTL: ::c_int = 4;
-pub const IP_MULTICAST_IF: ::c_int = 9;
-pub const IP_MULTICAST_TTL: ::c_int = 10;
-pub const IP_MULTICAST_LOOP: ::c_int = 11;
-pub const IP_ADD_MEMBERSHIP: ::c_int = 12;
-pub const IP_DROP_MEMBERSHIP: ::c_int = 13;
-pub const IP_DONTFRAGMENT: ::c_int = 14;
-pub const IP_ADD_SOURCE_MEMBERSHIP: ::c_int = 15;
-pub const IP_DROP_SOURCE_MEMBERSHIP: ::c_int = 16;
-pub const IP_BLOCK_SOURCE: ::c_int = 17;
-pub const IP_UNBLOCK_SOURCE: ::c_int = 18;
-pub const IP_PKTINFO: ::c_int = 19;
-pub const IP_RECEIVE_BROADCAST: ::c_int = 22;
diff --git a/vendor/winapi-0.2.8/src/wtypes.rs b/vendor/winapi-0.2.8/src/wtypes.rs
deleted file mode 100644
index 36c8059ac8..0000000000
--- a/vendor/winapi-0.2.8/src/wtypes.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright © 2015, Connor Hilarides
-// Licensed under the MIT License <LICENSE.md>
-//! Mappings for the contents of wstypes.h
-ENUM!{enum VARENUM {
-    VT_EMPTY = 0,
-    VT_NULL = 1,
-    VT_I2 = 2,
-    VT_I4 = 3,
-    VT_R4 = 4,
-    VT_R8 = 5,
-    VT_CY = 6,
-    VT_DATE = 7,
-    VT_BSTR = 8,
-    VT_DISPATCH = 9,
-    VT_ERROR = 10,
-    VT_BOOL = 11,
-    VT_VARIANT = 12,
-    VT_UNKNOWN = 13,
-    VT_DECIMAL = 14,
-    VT_I1 = 16,
-    VT_UI1 = 17,
-    VT_UI2 = 18,
-    VT_UI4 = 19,
-    VT_I8 = 20,
-    VT_UI8 = 21,
-    VT_INT = 22,
-    VT_UINT = 23,
-    VT_VOID = 24,
-    VT_HRESULT = 25,
-    VT_PTR = 26,
-    VT_SAFEARRAY = 27,
-    VT_CARRAY = 28,
-    VT_USERDEFINED = 29,
-    VT_LPSTR = 30,
-    VT_LPWSTR = 31,
-    VT_RECORD = 36,
-    VT_INT_PTR = 37,
-    VT_UINT_PTR = 38,
-    VT_FILETIME = 64,
-    VT_BLOB = 65,
-    VT_STREAM = 66,
-    VT_STORAGE = 67,
-    VT_STREAMED_OBJECT = 68,
-    VT_STORED_OBJECT = 69,
-    VT_BLOB_OBJECT = 70,
-    VT_CF = 71,
-    VT_CLSID = 72,
-    VT_VERSIONED_STREAM = 73,
-    VT_BSTR_BLOB = 0xfff,
-    VT_VECTOR = 0x1000,
-    VT_ARRAY = 0x2000,
-    VT_BYREF = 0x4000,
-    VT_RESERVED = 0x8000,
-    VT_ILLEGAL = 0xffff,
-}}
-pub const VT_ILLEGALMASKED: VARENUM = VT_BSTR_BLOB;
-pub const VT_TYPEMASK: VARENUM = VT_BSTR_BLOB;
-pub type DATE = ::c_double;
-STRUCT!{struct CY {
-    int64: ::LONGLONG,
-}}
-STRUCT!{struct DECIMAL {
-    wReserved: ::USHORT,
-    scale: ::BYTE,
-    sign: ::BYTE,
-    Hi32: ::ULONG,
-    Lo64: ::ULONGLONG,
-}}
-pub const DECIMAL_NEG: ::BYTE = 0x80;
-pub type LPDECIMAL = *mut DECIMAL;
-pub type VARTYPE = ::c_ushort;
-pub type wireBSTR = *mut ::FLAGGED_WORD_BLOB;
-pub type BSTR = *mut ::OLECHAR;
-pub type LPBSTR = *mut BSTR;
-pub type VARIANT_BOOL = ::c_short;
diff --git a/vendor/winapi-0.2.8/src/wtypesbase.rs b/vendor/winapi-0.2.8/src/wtypesbase.rs
deleted file mode 100644
index 8683c53813..0000000000
--- a/vendor/winapi-0.2.8/src/wtypesbase.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//114
-pub type OLECHAR = ::WCHAR;
-pub type LPOLESTR = *mut OLECHAR;
-pub type LPCOLESTR = *const OLECHAR;
-//147
-pub type DOUBLE = ::c_double;
-//281
-pub type SCODE = ::LONG;
-pub type PSCODE = *mut SCODE;
-STRUCT!{struct BLOB {
-    cbSize: ::ULONG,
-    pBlobData: *mut ::BYTE,
-}}
-pub type LPBLOB = *mut BLOB;
-STRUCT!{struct FLAGGED_WORD_BLOB {
-    fFlags: ::ULONG,
-    clSize: ::ULONG,
-    asData: [::c_ushort; 1],
-}}
-STRUCT!{struct BYTE_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut ::BYTE,
-}}
-STRUCT!{struct WORD_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut ::c_ushort,
-}}
-STRUCT!{struct DWORD_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut ::ULONG,
-}}
-STRUCT!{struct HYPER_SIZEDARR {
-    clSize: ::ULONG,
-    pData: *mut i64,
-}}
diff --git a/vendor/winapi-0.2.8/src/xinput.rs b/vendor/winapi-0.2.8/src/xinput.rs
deleted file mode 100644
index d18d4659aa..0000000000
--- a/vendor/winapi-0.2.8/src/xinput.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-//! XInput procedure declarations, constant definitions and macros
-pub const XINPUT_DEVTYPE_GAMEPAD: ::BYTE = 0x01;
-pub const XINPUT_DEVSUBTYPE_GAMEPAD: ::BYTE = 0x01;
-pub const XINPUT_DEVSUBTYPE_WHEEL: ::BYTE = 0x02;
-pub const XINPUT_DEVSUBTYPE_ARCADE_STICK: ::BYTE = 0x03;
-pub const XINPUT_DEVSUBTYPE_FLIGHT_SICK: ::BYTE = 0x04;
-pub const XINPUT_DEVSUBTYPE_DANCE_PAD: ::BYTE = 0x05;
-pub const XINPUT_DEVSUBTYPE_GUITAR: ::BYTE = 0x06;
-pub const XINPUT_DEVSUBTYPE_DRUM_KIT: ::BYTE = 0x08;
-pub const XINPUT_CAPS_VOICE_SUPPORTED: ::WORD = 0x0004;
-pub const XINPUT_GAMEPAD_DPAD_UP: ::WORD = 0x0001;
-pub const XINPUT_GAMEPAD_DPAD_DOWN: ::WORD = 0x0002;
-pub const XINPUT_GAMEPAD_DPAD_LEFT: ::WORD = 0x0004;
-pub const XINPUT_GAMEPAD_DPAD_RIGHT: ::WORD = 0x0008;
-pub const XINPUT_GAMEPAD_START: ::WORD = 0x0010;
-pub const XINPUT_GAMEPAD_BACK: ::WORD = 0x0020;
-pub const XINPUT_GAMEPAD_LEFT_THUMB: ::WORD = 0x0040;
-pub const XINPUT_GAMEPAD_RIGHT_THUMB: ::WORD = 0x0080;
-pub const XINPUT_GAMEPAD_LEFT_SHOULDER: ::WORD = 0x0100;
-pub const XINPUT_GAMEPAD_RIGHT_SHOULDER: ::WORD = 0x0200;
-pub const XINPUT_GAMEPAD_A: ::WORD = 0x1000;
-pub const XINPUT_GAMEPAD_B: ::WORD = 0x2000;
-pub const XINPUT_GAMEPAD_X: ::WORD = 0x4000;
-pub const XINPUT_GAMEPAD_Y: ::WORD = 0x8000;
-pub const XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE: ::SHORT = 7849;
-pub const XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE: ::SHORT = 8689;
-pub const XINPUT_GAMEPAD_TRIGGER_THRESHOLD: ::BYTE = 30;
-pub const XINPUT_FLAG_GAMEPAD: ::DWORD = 0x00000001;
-pub const BATTERY_DEVTYPE_GAMEPAD: ::BYTE = 0x00;
-pub const BATTERY_DEVTYPE_HEADSET: ::BYTE = 0x01;
-pub const BATTERY_TYPE_DISCONNECTED: ::BYTE = 0x00;
-pub const BATTERY_TYPE_WIRED: ::BYTE = 0x01;
-pub const BATTERY_TYPE_ALKALINE: ::BYTE = 0x02;
-pub const BATTERY_TYPE_NIMH: ::BYTE = 0x03;
-pub const BATTERY_TYPE_UNKNOWN: ::BYTE = 0xFF;
-pub const BATTERY_LEVEL_EMPTY: ::BYTE = 0x00;
-pub const BATTERY_LEVEL_LOW: ::BYTE = 0x01;
-pub const BATTERY_LEVEL_MEDIUM: ::BYTE = 0x02;
-pub const BATTERY_LEVEL_FULL: ::BYTE = 0x03;
-pub const XUSER_MAX_COUNT: ::DWORD = 4;
-pub const XUSER_INDEX_ANY: ::DWORD = 0x000000FF;
-pub const VK_PAD_A: ::WORD = 0x5800;
-pub const VK_PAD_B: ::WORD = 0x5801;
-pub const VK_PAD_X: ::WORD = 0x5802;
-pub const VK_PAD_Y: ::WORD = 0x5803;
-pub const VK_PAD_RSHOULDER: ::WORD = 0x5804;
-pub const VK_PAD_LSHOULDER: ::WORD = 0x5805;
-pub const VK_PAD_LTRIGGER: ::WORD = 0x5806;
-pub const VK_PAD_RTRIGGER: ::WORD = 0x5807;
-pub const VK_PAD_DPAD_UP: ::WORD = 0x5810;
-pub const VK_PAD_DPAD_DOWN: ::WORD = 0x5811;
-pub const VK_PAD_DPAD_LEFT: ::WORD = 0x5812;
-pub const VK_PAD_DPAD_RIGHT: ::WORD = 0x5813;
-pub const VK_PAD_START: ::WORD = 0x5814;
-pub const VK_PAD_BACK: ::WORD = 0x5815;
-pub const VK_PAD_LTHUMB_PRESS: ::WORD = 0x5816;
-pub const VK_PAD_RTHUMB_PRESS: ::WORD = 0x5817;
-pub const VK_PAD_LTHUMB_UP: ::WORD = 0x5820;
-pub const VK_PAD_LTHUMB_DOWN: ::WORD = 0x5821;
-pub const VK_PAD_LTHUMB_RIGHT: ::WORD = 0x5822;
-pub const VK_PAD_LTHUMB_LEFT: ::WORD = 0x5823;
-pub const VK_PAD_LTHUMB_UPLEFT: ::WORD = 0x5824;
-pub const VK_PAD_LTHUMB_UPRIGHT: ::WORD = 0x5825;
-pub const VK_PAD_LTHUMB_DOWNRIGHT: ::WORD = 0x5826;
-pub const VK_PAD_LTHUMB_DOWNLEFT: ::WORD = 0x5827;
-pub const VK_PAD_RTHUMB_UP: ::WORD = 0x5830;
-pub const VK_PAD_RTHUMB_DOWN: ::WORD = 0x5831;
-pub const VK_PAD_RTHUMB_RIGHT: ::WORD = 0x5832;
-pub const VK_PAD_RTHUMB_LEFT: ::WORD = 0x5833;
-pub const VK_PAD_RTHUMB_UPLEFT: ::WORD = 0x5834;
-pub const VK_PAD_RTHUMB_UPRIGHT: ::WORD = 0x5835;
-pub const VK_PAD_RTHUMB_DOWNRIGHT: ::WORD = 0x5836;
-pub const VK_PAD_RTHUMB_DOWNLEFT: ::WORD = 0x5837;
-pub const XINPUT_KEYSTROKE_KEYDOWN: ::WORD = 0x0001;
-pub const XINPUT_KEYSTROKE_KEYUP: ::WORD = 0x0002;
-pub const XINPUT_KEYSTROKE_REPEAT: ::WORD = 0x0004;
-STRUCT!{struct XINPUT_GAMEPAD {
-    wButtons: ::WORD,
-    bLeftTrigger: ::BYTE,
-    bRightTrigger: ::BYTE,
-    sThumbLX: ::SHORT,
-    sThumbLY: ::SHORT,
-    sThumbRX: ::SHORT,
-    sThumbRY: ::SHORT,
-}}
-pub type PXINPUT_GAMEPAD = *mut XINPUT_GAMEPAD;
-STRUCT!{struct XINPUT_STATE {
-    dwPacketNumber: ::DWORD,
-    Gamepad: ::XINPUT_GAMEPAD,
-}}
-pub type PXINPUT_STATE = *mut XINPUT_STATE;
-STRUCT!{struct XINPUT_VIBRATION {
-    wLeftMotorSpeed: ::WORD,
-    wRightMotorSpeed: ::WORD,
-}}
-pub type PXINPUT_VIBRATION = *mut XINPUT_VIBRATION;
-STRUCT!{struct XINPUT_CAPABILITIES {
-    Type: ::BYTE,
-    SubType: ::BYTE,
-    Flags: ::WORD,
-    Gamepad: ::XINPUT_GAMEPAD,
-    Vibration: ::XINPUT_VIBRATION,
-}}
-pub type PXINPUT_CAPABILITIES = *mut XINPUT_CAPABILITIES;
-STRUCT!{struct XINPUT_BATTERY_INFORMATION {
-    BatteryType: ::BYTE,
-    BatteryLevel: ::BYTE,
-}}
-pub type PXINPUT_BATTERY_INFORMATION = *mut XINPUT_BATTERY_INFORMATION;
-STRUCT!{struct XINPUT_KEYSTROKE {
-    VirtualKey: ::WORD,
-    Unicode: ::WCHAR,
-    UserIndex: ::BYTE,
-    HidCode: ::BYTE,
-}}
-pub type PXINPUT_KEYSTROKE = *mut XINPUT_KEYSTROKE;
diff --git a/vendor/winapi-build/.cargo-checksum.json b/vendor/winapi-build/.cargo-checksum.json
deleted file mode 100644
index 4d5fc4c7ad..0000000000
--- a/vendor/winapi-build/.cargo-checksum.json
+++ /dev/null
@@ -1 +0,0 @@
-{"files":{"Cargo.toml":"982633c62ba05c95429b1768896a54c9a032a40fbd1e11049a9b087e9fd89176","src/lib.rs":"1d88932534b784973d3d87ac18cd8f2a0294ce5166cf30488c68ca90443e1750"},"package":"2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"}
\ No newline at end of file
diff --git a/vendor/winapi-build/Cargo.toml b/vendor/winapi-build/Cargo.toml
deleted file mode 100644
index e1be0b184d..0000000000
--- a/vendor/winapi-build/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "winapi-build"
-version = "0.1.1"
-authors = ["Peter Atashian <retep998@gmail.com>"]
-description = "Common code for build.rs in WinAPI -sys crates."
-repository = "https://github.com/retep998/winapi-rs"
-keywords = ["Windows", "FFI", "WinSDK"]
-license = "MIT"
-
-[lib]
-name = "build"
diff --git a/vendor/winapi-build/src/lib.rs b/vendor/winapi-build/src/lib.rs
deleted file mode 100644
index fab0c6cdc5..0000000000
--- a/vendor/winapi-build/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright © 2015, Peter Atashian
-// Licensed under the MIT License <LICENSE.md>
-pub fn link(name: &str, bundled: bool) {
-    use std::env::var;
-    let target = var("TARGET").unwrap();
-    let target: Vec<_> = target.split('-').collect();
-    if target.get(2) == Some(&"windows") {
-        println!("cargo:rustc-link-lib=dylib={}", name);
-        if bundled && target.get(3) == Some(&"gnu") {
-            let dir = var("CARGO_MANIFEST_DIR").unwrap();
-            println!("cargo:rustc-link-search=native={}/{}", dir, target[0]);
-        }
-    }
-}
diff --git a/version b/version
index 3eab4d62da..98beaaf588 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.42.0 (b8cedc004 2020-03-09)
\ No newline at end of file
+1.43.0 (4fb7144ed 2020-04-20)
\ No newline at end of file
-- 
2.39.2